From d7cd9d9e28f70ad9a8d2a8aa02a0d61f27fcbbc5 Mon Sep 17 00:00:00 2001 From: shibbo Date: Sat, 22 Nov 2025 15:33:49 -0500 Subject: [PATCH] `clang-format` and `Doxyfile` returns --- .clang-format | 20 + Doxyfile | 34 + include/Game/Animation/AnmPlayer.hpp | 18 +- include/Game/Animation/BckCtrl.hpp | 42 +- include/Game/Animation/BvaPlayer.hpp | 2 +- include/Game/Animation/LayoutAnmPlayer.hpp | 8 +- include/Game/Animation/XanimeCore.hpp | 114 +- include/Game/Animation/XanimePlayer.hpp | 124 +- include/Game/Animation/XanimeResource.hpp | 102 +- include/Game/AreaObj/AreaForm.hpp | 76 +- include/Game/AreaObj/AreaObj.hpp | 57 +- include/Game/AreaObj/AreaObjContainer.hpp | 12 +- include/Game/AreaObj/AreaObjFollower.hpp | 8 +- include/Game/AreaObj/AstroChangeStageCube.hpp | 7 +- include/Game/AreaObj/AudioEffectArea.hpp | 7 +- include/Game/AreaObj/BgmProhibitArea.hpp | 23 +- include/Game/AreaObj/BigBubbleCameraArea.hpp | 10 +- include/Game/AreaObj/BigBubbleGoalArea.hpp | 20 +- include/Game/AreaObj/BloomArea.hpp | 12 +- include/Game/AreaObj/CameraRepulsiveArea.hpp | 18 +- include/Game/AreaObj/ChangeBgmCube.hpp | 4 +- include/Game/AreaObj/CollisionArea.hpp | 46 +- include/Game/AreaObj/CubeCamera.hpp | 15 +- include/Game/AreaObj/DeathArea.hpp | 8 +- include/Game/AreaObj/DepthOfFieldArea.hpp | 8 +- include/Game/AreaObj/FollowCollisionArea.hpp | 26 +- include/Game/AreaObj/GlaringLightArea.hpp | 12 +- include/Game/AreaObj/HazeCube.hpp | 6 +- include/Game/AreaObj/ImageEffectArea.hpp | 8 +- include/Game/AreaObj/LightArea.hpp | 6 +- include/Game/AreaObj/LightAreaHolder.hpp | 4 +- .../Game/AreaObj/MercatorTransformCube.hpp | 20 +- include/Game/AreaObj/MessageArea.hpp | 6 +- include/Game/AreaObj/PlayerSeArea.hpp | 8 +- include/Game/AreaObj/QuakeEffectArea.hpp | 2 +- include/Game/AreaObj/RestartCube.hpp | 14 +- include/Game/AreaObj/ScreenBlurArea.hpp | 8 +- include/Game/AreaObj/SimpleBloomArea.hpp | 12 +- include/Game/AreaObj/SoundEmitterCube.hpp | 10 +- include/Game/AreaObj/SoundEmitterSphere.hpp | 12 +- include/Game/AreaObj/SpinGuidanceArea.hpp | 4 +- include/Game/AreaObj/SunLightArea.hpp | 4 +- include/Game/AreaObj/SwitchArea.hpp | 10 +- include/Game/AreaObj/WarpCube.hpp | 25 +- include/Game/AreaObj/WaterArea.hpp | 6 +- include/Game/AudioLib/AudAnmSoundObject.hpp | 16 +- include/Game/AudioLib/AudEffector.hpp | 2 +- include/Game/AudioLib/AudRemixMgr.hpp | 34 +- include/Game/AudioLib/AudRemixSequencer.hpp | 32 +- .../Game/AudioLib/AudSoundNameConverter.hpp | 7 +- include/Game/AudioLib/AudSoundObject.hpp | 38 +- include/Game/AudioLib/AudSpeakerWrap.hpp | 2 +- include/Game/AudioLib/AudSystem.hpp | 31 +- include/Game/AudioLib/AudSystemWrapper.hpp | 26 +- include/Game/AudioLib/AudWrap.hpp | 10 +- include/Game/Boss/BossAccessor.hpp | 4 +- include/Game/Boss/BossBegomanHead.hpp | 10 +- include/Game/Boss/BossKameck.hpp | 75 +- include/Game/Boss/BossKameckAction.hpp | 14 +- include/Game/Boss/BossKameckBarrier.hpp | 6 +- include/Game/Boss/BossKameckBattleDemo.hpp | 14 +- include/Game/Boss/BossKameckBattlePattarn.hpp | 12 +- include/Game/Boss/BossKameckMoveRail.hpp | 10 +- include/Game/Boss/BossKameckSequencer.hpp | 22 +- include/Game/Boss/BossKameckStateBattle.hpp | 38 +- include/Game/Boss/BossKameckVs1.hpp | 8 +- include/Game/Boss/BossKameckVs2.hpp | 10 +- include/Game/Boss/BossStinkBug.hpp | 2 +- include/Game/Boss/Koopa.hpp | 8 +- include/Game/Boss/KoopaFunction.hpp | 2 +- include/Game/Boss/SkeletalFishBaby.hpp | 36 +- include/Game/Boss/SkeletalFishBabyRail.hpp | 6 +- .../Game/Boss/SkeletalFishBabyRailHolder.hpp | 30 +- include/Game/Boss/SkeletalFishBoss.hpp | 185 +- .../Boss/SkeletalFishBossBattleDirector.hpp | 20 +- include/Game/Boss/SkeletalFishBossFunc.hpp | 4 +- include/Game/Boss/SkeletalFishBossInfo.hpp | 35 +- include/Game/Boss/SkeletalFishBossRail.hpp | 14 +- .../Game/Boss/SkeletalFishBossRailHolder.hpp | 12 +- include/Game/Boss/SkeletalFishGuard.hpp | 58 +- include/Game/Boss/SkeletalFishGuardHolder.hpp | 20 +- include/Game/Boss/SkeletalFishJointCalc.hpp | 2 +- include/Game/Boss/SkeletalFishRailControl.hpp | 20 +- include/Game/Boss/TripodBoss.hpp | 218 +- include/Game/Boss/TripodBossAccesser.hpp | 40 +- .../Game/Boss/TripodBossBaseJointPosition.hpp | 10 +- include/Game/Boss/TripodBossBreakMovement.hpp | 30 +- include/Game/Boss/TripodBossCoin.hpp | 8 +- include/Game/Boss/TripodBossCore.hpp | 18 +- include/Game/Boss/TripodBossFixParts.hpp | 22 +- include/Game/Boss/TripodBossFixPartsBase.hpp | 26 +- include/Game/Boss/TripodBossGuardWall.hpp | 44 +- include/Game/Boss/TripodBossGuardWallPart.hpp | 30 +- .../Boss/TripodBossKillerGeneraterCircle.hpp | 24 +- .../Game/Boss/TripodBossKillerGenerator.hpp | 56 +- include/Game/Boss/TripodBossKinokoOneUp.hpp | 16 +- include/Game/Boss/TripodBossLeg.hpp | 154 +- include/Game/Boss/TripodBossMovableArea.hpp | 27 +- include/Game/Boss/TripodBossRailMoveParts.hpp | 8 +- include/Game/Boss/TripodBossRotateParts.hpp | 8 +- include/Game/Boss/TripodBossShell.hpp | 12 +- include/Game/Boss/TripodBossStepPoint.hpp | 24 +- include/Game/Boss/TripodBossStepSequence.hpp | 20 +- include/Game/Boss/TripodBossStepStartArea.hpp | 6 +- include/Game/Camera/CamHeliEffector.hpp | 2 +- include/Game/Camera/CamKarikariEffector.hpp | 2 +- include/Game/Camera/CamTranslatorAnim.hpp | 10 +- include/Game/Camera/CamTranslatorBehind.hpp | 12 +- .../Game/Camera/CamTranslatorBlackHole.hpp | 12 +- .../Game/Camera/CamTranslatorCharmedFix.hpp | 12 +- .../Camera/CamTranslatorCharmedTripodBoss.hpp | 12 +- .../Camera/CamTranslatorCharmedVecReg.hpp | 12 +- .../CamTranslatorCharmedVecRegTower.hpp | 12 +- .../Game/Camera/CamTranslatorCubePlanet.hpp | 12 +- include/Game/Camera/CamTranslatorDPD.hpp | 12 +- include/Game/Camera/CamTranslatorDead.hpp | 8 +- include/Game/Camera/CamTranslatorFix.hpp | 12 +- .../Game/Camera/CamTranslatorFixedPoint.hpp | 12 +- .../Game/Camera/CamTranslatorFixedThere.hpp | 12 +- include/Game/Camera/CamTranslatorFollow.hpp | 8 +- .../Game/Camera/CamTranslatorFooFighter.hpp | 8 +- .../Camera/CamTranslatorFooFighterPlanet.hpp | 8 +- .../Game/Camera/CamTranslatorFrontAndBack.hpp | 12 +- include/Game/Camera/CamTranslatorGround.hpp | 12 +- .../Camera/CamTranslatorInnerCylinder.hpp | 12 +- .../Game/Camera/CamTranslatorInwardSphere.hpp | 12 +- .../Game/Camera/CamTranslatorInwardTower.hpp | 12 +- .../Game/Camera/CamTranslatorMedianPlanet.hpp | 8 +- .../Game/Camera/CamTranslatorMedianTower.hpp | 12 +- .../Camera/CamTranslatorMtxRegParallel.hpp | 12 +- .../Game/Camera/CamTranslatorObjParallel.hpp | 12 +- include/Game/Camera/CamTranslatorParallel.hpp | 12 +- .../Game/Camera/CamTranslatorRaceFollow.hpp | 12 +- include/Game/Camera/CamTranslatorRailDemo.hpp | 12 +- .../Game/Camera/CamTranslatorRailFollow.hpp | 12 +- .../Game/Camera/CamTranslatorRailWatch.hpp | 12 +- include/Game/Camera/CamTranslatorSlide.hpp | 12 +- include/Game/Camera/CamTranslatorSpiral.hpp | 12 +- include/Game/Camera/CamTranslatorTalk.hpp | 12 +- include/Game/Camera/CamTranslatorTower.hpp | 12 +- include/Game/Camera/CamTranslatorTowerPos.hpp | 12 +- .../Game/Camera/CamTranslatorTripodBoss.hpp | 12 +- .../Camera/CamTranslatorTripodBossJoint.hpp | 12 +- .../Game/Camera/CamTranslatorTripodPlanet.hpp | 12 +- include/Game/Camera/CamTranslatorTrundle.hpp | 12 +- .../Camera/CamTranslatorTwistedPassage.hpp | 12 +- .../Game/Camera/CamTranslatorWaterFollow.hpp | 8 +- .../Game/Camera/CamTranslatorWaterPlanet.hpp | 8 +- .../Camera/CamTranslatorWaterPlanetBoss.hpp | 8 +- .../Game/Camera/CamTranslatorWonderPlanet.hpp | 8 +- include/Game/Camera/Camera.hpp | 54 +- include/Game/Camera/CameraAnim.hpp | 148 +- include/Game/Camera/CameraBehind.hpp | 18 +- include/Game/Camera/CameraBlackHole.hpp | 12 +- include/Game/Camera/CameraCalc.hpp | 6 +- include/Game/Camera/CameraCharmedFix.hpp | 8 +- .../Game/Camera/CameraCharmedTripodBoss.hpp | 12 +- include/Game/Camera/CameraCharmedVecReg.hpp | 22 +- .../Game/Camera/CameraCharmedVecRegTower.hpp | 24 +- include/Game/Camera/CameraContext.hpp | 44 +- include/Game/Camera/CameraCover.hpp | 16 +- include/Game/Camera/CameraCubePlanet.hpp | 14 +- include/Game/Camera/CameraDPD.hpp | 44 +- include/Game/Camera/CameraDead.hpp | 16 +- include/Game/Camera/CameraDirector.hpp | 238 +- include/Game/Camera/CameraFix.hpp | 30 +- include/Game/Camera/CameraFixedPoint.hpp | 12 +- include/Game/Camera/CameraFixedThere.hpp | 34 +- include/Game/Camera/CameraFollow.hpp | 42 +- include/Game/Camera/CameraFooFighter.hpp | 8 +- .../Game/Camera/CameraFooFighterPlanet.hpp | 16 +- include/Game/Camera/CameraFrontAndBack.hpp | 18 +- include/Game/Camera/CameraGround.hpp | 28 +- include/Game/Camera/CameraHeightArrange.hpp | 86 +- include/Game/Camera/CameraHolder.hpp | 24 +- include/Game/Camera/CameraInnerCylinder.hpp | 26 +- include/Game/Camera/CameraInwardSphere.hpp | 16 +- include/Game/Camera/CameraInwardTower.hpp | 32 +- include/Game/Camera/CameraLocalUtil.hpp | 88 +- include/Game/Camera/CameraMan.hpp | 29 +- include/Game/Camera/CameraManEvent.hpp | 85 +- include/Game/Camera/CameraManGame.hpp | 108 +- include/Game/Camera/CameraManPause.hpp | 18 +- include/Game/Camera/CameraManSubjective.hpp | 8 +- include/Game/Camera/CameraMedianPlanet.hpp | 42 +- include/Game/Camera/CameraMedianTower.hpp | 42 +- include/Game/Camera/CameraMtxRegParallel.hpp | 18 +- include/Game/Camera/CameraObjParallel.hpp | 14 +- include/Game/Camera/CameraParallel.hpp | 28 +- include/Game/Camera/CameraParamChunk.hpp | 128 +- .../Game/Camera/CameraParamChunkHolder.hpp | 34 +- include/Game/Camera/CameraParamChunkID.hpp | 22 +- include/Game/Camera/CameraParamString.hpp | 10 +- include/Game/Camera/CameraPolygonCodeUtil.hpp | 4 +- include/Game/Camera/CameraPoseParam.hpp | 16 +- include/Game/Camera/CameraRaceFollow.hpp | 18 +- include/Game/Camera/CameraRailDemo.hpp | 18 +- include/Game/Camera/CameraRailFollow.hpp | 10 +- include/Game/Camera/CameraRailHolder.hpp | 7 +- include/Game/Camera/CameraRailWatch.hpp | 8 +- include/Game/Camera/CameraRegisterHolder.hpp | 40 +- include/Game/Camera/CameraRotChecker.hpp | 4 +- .../Game/Camera/CameraShakePatternImpl.hpp | 21 +- include/Game/Camera/CameraShakeTask.hpp | 18 +- include/Game/Camera/CameraShaker.hpp | 22 +- include/Game/Camera/CameraSlide.hpp | 12 +- include/Game/Camera/CameraSpiral.hpp | 20 +- include/Game/Camera/CameraSubjective.hpp | 18 +- include/Game/Camera/CameraTalk.hpp | 14 +- include/Game/Camera/CameraTargetArg.hpp | 22 +- include/Game/Camera/CameraTargetDemoActor.hpp | 5 +- include/Game/Camera/CameraTargetHolder.hpp | 20 +- include/Game/Camera/CameraTargetMtx.hpp | 44 +- include/Game/Camera/CameraTargetObj.hpp | 163 +- include/Game/Camera/CameraTower.hpp | 38 +- include/Game/Camera/CameraTowerBase.hpp | 6 +- include/Game/Camera/CameraTowerPos.hpp | 28 +- include/Game/Camera/CameraTripodBoss.hpp | 8 +- include/Game/Camera/CameraTripodBossJoint.hpp | 30 +- include/Game/Camera/CameraTripodPlanet.hpp | 16 +- include/Game/Camera/CameraTrundle.hpp | 20 +- include/Game/Camera/CameraTwistedPassage.hpp | 16 +- .../Game/Camera/CameraViewInterpolator.hpp | 76 +- include/Game/Camera/CameraWaterFollow.hpp | 14 +- include/Game/Camera/CameraWaterPlanet.hpp | 14 +- include/Game/Camera/CameraWaterPlanetBoss.hpp | 52 +- include/Game/Camera/CameraWonderPlanet.hpp | 20 +- include/Game/Camera/DotCamParams.hpp | 35 +- include/Game/Camera/GameCameraCreator.hpp | 14 +- include/Game/Camera/OnlyCamera.hpp | 42 +- include/Game/Demo/AstroDemoFunction.hpp | 24 +- include/Game/Demo/DemoActionKeeper.hpp | 50 +- include/Game/Demo/DemoCameraFunction.hpp | 2 +- include/Game/Demo/DemoCameraKeeper.hpp | 16 +- include/Game/Demo/DemoCastGroup.hpp | 12 +- include/Game/Demo/DemoCastGroupHolder.hpp | 6 +- include/Game/Demo/DemoCastSubGroup.hpp | 8 +- include/Game/Demo/DemoCtrlBase.hpp | 14 +- include/Game/Demo/DemoDirector.hpp | 40 +- include/Game/Demo/DemoExecutor.hpp | 32 +- include/Game/Demo/DemoExecutorFunction.hpp | 34 +- include/Game/Demo/DemoFunction.hpp | 88 +- include/Game/Demo/DemoPadRumbler.hpp | 10 +- .../Game/Demo/DemoParamCommonDataTable.hpp | 16 +- include/Game/Demo/DemoPlayerKeeper.hpp | 16 +- include/Game/Demo/DemoPositionController.hpp | 10 +- include/Game/Demo/DemoSimpleCastHolder.hpp | 12 +- include/Game/Demo/DemoStartRequestHolder.hpp | 12 +- include/Game/Demo/DemoSubPartKeeper.hpp | 30 +- include/Game/Demo/DemoTalkAnimCtrl.hpp | 64 +- include/Game/Demo/DemoTimeKeeper.hpp | 24 +- include/Game/Demo/PrologueDirector.hpp | 16 +- include/Game/Effect/AstroEffectObj.hpp | 4 +- include/Game/Effect/EffectSystem.hpp | 16 +- include/Game/Effect/EffectSystemUtil.hpp | 64 +- include/Game/Effect/MultiEmitter.hpp | 16 +- include/Game/Effect/ParticleEmitter.hpp | 4 +- include/Game/Effect/ParticleEmitterHolder.hpp | 8 +- .../Game/Effect/ParticleResourceHolder.hpp | 23 +- include/Game/Effect/SimpleEffectObj.hpp | 14 +- include/Game/Effect/SingleEmitter.hpp | 12 +- include/Game/Enemy/AnimScaleController.hpp | 8 +- include/Game/Enemy/AnimStampController.hpp | 2 +- include/Game/Enemy/BallBeamer.hpp | 35 +- include/Game/Enemy/BasaBasa.hpp | 48 +- include/Game/Enemy/Birikyu.hpp | 56 +- include/Game/Enemy/BombTeresa.hpp | 51 +- include/Game/Enemy/Dossun.hpp | 20 +- include/Game/Enemy/ElectricPressureBullet.hpp | 12 +- include/Game/Enemy/EyeBeamer.hpp | 44 +- include/Game/Enemy/FireBall.hpp | 14 +- include/Game/Enemy/HomingKiller.hpp | 60 +- include/Game/Enemy/IceMerameraKing.hpp | 109 +- include/Game/Enemy/ItemGenerator.hpp | 6 +- include/Game/Enemy/Jiraira.hpp | 14 +- include/Game/Enemy/Kameck.hpp | 2 +- include/Game/Enemy/KameckBeam.hpp | 26 +- include/Game/Enemy/KameckBeamHolder.hpp | 4 +- include/Game/Enemy/KariKariDirector.hpp | 4 +- include/Game/Enemy/Karon.hpp | 26 +- include/Game/Enemy/Kuribo.hpp | 54 +- include/Game/Enemy/Meramera.hpp | 6 +- include/Game/Enemy/MoguStone.hpp | 50 +- include/Game/Enemy/PackunPetit.hpp | 24 +- include/Game/Enemy/Poihana.hpp | 138 +- include/Game/Enemy/RingBeam.hpp | 62 +- include/Game/Enemy/RingBeamer.hpp | 10 +- include/Game/Enemy/SearchBeamer.hpp | 52 +- include/Game/Enemy/SpinHitController.hpp | 28 +- include/Game/Enemy/TerritoryMover.hpp | 6 +- .../Game/Enemy/WalkerStateBindStarPointer.hpp | 10 +- include/Game/Enemy/WalkerStateBlowDamage.hpp | 6 +- include/Game/Enemy/WalkerStateChase.hpp | 10 +- include/Game/Enemy/WalkerStateFindPlayer.hpp | 10 +- include/Game/Enemy/WalkerStateFunction.hpp | 4 +- include/Game/Enemy/WalkerStateStagger.hpp | 16 +- include/Game/Enemy/WalkerStateWander.hpp | 14 +- include/Game/GameAudio/AudEffectDirector.hpp | 4 +- include/Game/GameAudio/AudSeKeeper.hpp | 18 +- include/Game/GameAudio/AudStageBgmTable.hpp | 4 +- include/Game/GameAudio/AudTalkSoundData.hpp | 9 +- include/Game/GameAudio/AudTamakoroBgmCtrl.hpp | 1 - include/Game/Gravity/ConeGravity.hpp | 28 +- include/Game/Gravity/CubeGravity.hpp | 26 +- include/Game/Gravity/DiskGravity.hpp | 37 +- include/Game/Gravity/DiskTorusGravity.hpp | 36 +- include/Game/Gravity/GlobalGravityObj.hpp | 40 +- include/Game/Gravity/GraviryFollower.hpp | 10 +- include/Game/Gravity/GravityCreator.hpp | 140 +- include/Game/Gravity/GravityInfo.hpp | 10 +- include/Game/Gravity/ParallelGravity.hpp | 76 +- include/Game/Gravity/PlanetGravity.hpp | 46 +- include/Game/Gravity/PlanetGravityManager.hpp | 62 +- include/Game/Gravity/PointGravity.hpp | 10 +- include/Game/Gravity/SegmentGravity.hpp | 42 +- include/Game/Gravity/WireGravity.hpp | 10 +- include/Game/LiveActor/ActiveActorList.hpp | 9 +- include/Game/LiveActor/ActorAnimKeeper.hpp | 22 +- include/Game/LiveActor/ActorCameraInfo.hpp | 2 +- include/Game/LiveActor/ActorJointCtrl.hpp | 22 +- include/Game/LiveActor/ActorLightCtrl.hpp | 44 +- .../Game/LiveActor/ActorPadAndCameraCtrl.hpp | 4 +- include/Game/LiveActor/ActorStateBase.hpp | 18 +- include/Game/LiveActor/ActorStateKeeper.hpp | 29 +- include/Game/LiveActor/AllLiveActorGroup.hpp | 10 +- .../Game/LiveActor/AnimationRandomPlayer.hpp | 20 +- include/Game/LiveActor/Binder.hpp | 49 +- .../Game/LiveActor/ClippingActorHolder.hpp | 28 +- include/Game/LiveActor/ClippingActorInfo.hpp | 34 +- include/Game/LiveActor/ClippingDirector.hpp | 20 +- .../Game/LiveActor/ClippingGroupHolder.hpp | 24 +- include/Game/LiveActor/ClippingJudge.hpp | 14 +- include/Game/LiveActor/DisplayListMaker.hpp | 68 +- include/Game/LiveActor/DynamicJointCtrl.hpp | 64 +- include/Game/LiveActor/EffectKeeper.hpp | 58 +- include/Game/LiveActor/FaceJointCtrl.hpp | 22 +- include/Game/LiveActor/FlashingCtrl.hpp | 18 +- include/Game/LiveActor/HitSensor.hpp | 18 +- include/Game/LiveActor/HitSensorInfo.hpp | 20 +- include/Game/LiveActor/HitSensorKeeper.hpp | 38 +- include/Game/LiveActor/IKJointCtrl.hpp | 98 +- include/Game/LiveActor/LiveActor.hpp | 46 +- include/Game/LiveActor/LiveActorFlag.hpp | 18 +- include/Game/LiveActor/LiveActorGroup.hpp | 18 +- .../Game/LiveActor/LiveActorGroupArray.hpp | 36 +- include/Game/LiveActor/LodCtrl.hpp | 64 +- include/Game/LiveActor/MaterialCtrl.hpp | 42 +- .../Game/LiveActor/MessageSensorHolder.hpp | 4 +- include/Game/LiveActor/MirrorActor.hpp | 16 +- include/Game/LiveActor/MirrorCamera.hpp | 20 +- .../Game/LiveActor/MirrorReflectionModel.hpp | 8 +- include/Game/LiveActor/ModelManager.hpp | 112 +- include/Game/LiveActor/ModelObj.hpp | 12 +- include/Game/LiveActor/Nerve.hpp | 202 +- include/Game/LiveActor/PartsModel.hpp | 24 +- include/Game/LiveActor/RailRider.hpp | 68 +- include/Game/LiveActor/SensorHitChecker.hpp | 26 +- include/Game/LiveActor/ShadowController.hpp | 186 +- include/Game/LiveActor/ShadowDrawer.hpp | 8 +- include/Game/LiveActor/ShadowSurfaceBox.hpp | 4 +- .../Game/LiveActor/ShadowSurfaceCircle.hpp | 2 +- .../Game/LiveActor/ShadowSurfaceDrawer.hpp | 6 +- include/Game/LiveActor/ShadowSurfaceOval.hpp | 4 +- include/Game/LiveActor/ShadowVolumeBox.hpp | 4 +- .../Game/LiveActor/ShadowVolumeCylinder.hpp | 2 +- include/Game/LiveActor/ShadowVolumeDrawer.hpp | 16 +- .../Game/LiveActor/ShadowVolumeFlatModel.hpp | 4 +- include/Game/LiveActor/ShadowVolumeLine.hpp | 12 +- include/Game/LiveActor/ShadowVolumeModel.hpp | 6 +- include/Game/LiveActor/ShadowVolumeOval.hpp | 4 +- .../Game/LiveActor/ShadowVolumeOvalPole.hpp | 4 +- include/Game/LiveActor/ShadowVolumeSphere.hpp | 2 +- include/Game/LiveActor/Spine.hpp | 18 +- include/Game/LiveActor/SpotMarkLight.hpp | 2 +- include/Game/LiveActor/ViewGroupCtrl.hpp | 16 +- include/Game/LiveActor/VolumeModelDrawer.hpp | 9 +- .../Game/Map/ActorAppearSwitchListener.hpp | 11 +- include/Game/Map/Air.hpp | 24 +- include/Game/Map/BezierRail.hpp | 61 +- .../Game/Map/CollisionCategorizedKeeper.hpp | 66 +- include/Game/Map/CollisionCode.hpp | 40 +- include/Game/Map/CollisionDirector.hpp | 8 +- include/Game/Map/CollisionParts.hpp | 103 +- include/Game/Map/FileSelectEffect.hpp | 6 +- include/Game/Map/FileSelectFunc.hpp | 2 +- include/Game/Map/FileSelectIconID.hpp | 4 +- include/Game/Map/GroundChecker.hpp | 2 +- include/Game/Map/Halo.hpp | 35 +- include/Game/Map/HitInfo.hpp | 62 +- include/Game/Map/KCollision.hpp | 110 +- include/Game/Map/KoopaBattleMapPlate.hpp | 2 +- include/Game/Map/KoopaBattleMapStair.hpp | 34 +- include/Game/Map/LavaShellTower.hpp | 8 +- include/Game/Map/LavaSunPlanet.hpp | 10 +- include/Game/Map/LightDataHolder.hpp | 52 +- include/Game/Map/LightDirector.hpp | 16 +- include/Game/Map/LightFunction.hpp | 30 +- include/Game/Map/LightPointCtrl.hpp | 26 +- include/Game/Map/LightZoneDataHolder.hpp | 20 +- include/Game/Map/NamePosHolder.hpp | 20 +- include/Game/Map/OceanRing.hpp | 80 +- include/Game/Map/OceanRingBloomDrawer.hpp | 7 +- include/Game/Map/OceanRingDrawer.hpp | 60 +- include/Game/Map/OceanRingPipe.hpp | 26 +- include/Game/Map/PlanetMapCreator.hpp | 32 +- .../Game/Map/PlanetMapWithoutHighModel.hpp | 6 +- include/Game/Map/QuakeEffectGenerator.hpp | 2 +- include/Game/Map/RaceManager.hpp | 48 +- include/Game/Map/RaceRail.hpp | 22 +- include/Game/Map/RailGraph.hpp | 22 +- include/Game/Map/RailGraphEdge.hpp | 10 +- include/Game/Map/RailGraphIter.hpp | 30 +- include/Game/Map/RailGraphNode.hpp | 4 +- include/Game/Map/RailPart.hpp | 25 +- include/Game/Map/ScenarioSelectStar.hpp | 22 +- include/Game/Map/SeaGull.hpp | 44 +- include/Game/Map/Sky.hpp | 18 +- include/Game/Map/SleepController.hpp | 4 +- include/Game/Map/SleepControllerHolder.hpp | 4 +- include/Game/Map/SpaceInner.hpp | 6 +- include/Game/Map/SphereSelector.hpp | 53 +- include/Game/Map/StageSwitch.hpp | 42 +- include/Game/Map/SunshadeMapHolder.hpp | 4 +- include/Game/Map/SunshadeMapParts.hpp | 8 +- include/Game/Map/SwitchSynchronizer.hpp | 8 +- include/Game/Map/SwitchWatcher.hpp | 12 +- include/Game/Map/SwitchWatcherHolder.hpp | 16 +- include/Game/Map/TimerSwitch.hpp | 8 +- include/Game/Map/WaterAreaHolder.hpp | 22 +- include/Game/Map/WaterInfo.hpp | 24 +- include/Game/Map/WaterPoint.hpp | 20 +- include/Game/Map/WaterRoad.hpp | 30 +- include/Game/MapObj/AirBubble.hpp | 28 +- include/Game/MapObj/AirBubbleGenerator.hpp | 10 +- include/Game/MapObj/AirBubbleHolder.hpp | 12 +- include/Game/MapObj/AnmModelObj.hpp | 54 +- include/Game/MapObj/ArrowSwitch.hpp | 30 +- include/Game/MapObj/ArrowSwitchMulti.hpp | 36 +- .../Game/MapObj/ArrowSwitchMultiHolder.hpp | 8 +- include/Game/MapObj/AssemblyBlock.hpp | 26 +- include/Game/MapObj/AstroCore.hpp | 10 +- include/Game/MapObj/AstroCountDownPlate.hpp | 8 +- include/Game/MapObj/AstroDemoFunction.hpp | 8 +- include/Game/MapObj/AstroDome.hpp | 8 +- include/Game/MapObj/AstroDomeAsteroid.hpp | 10 +- include/Game/MapObj/AstroDomeBlueStar.hpp | 25 +- .../Game/MapObj/AstroDomeCameraController.hpp | 23 +- include/Game/MapObj/AstroDomeComet.hpp | 12 +- .../Game/MapObj/AstroDomeDemoAstroGalaxy.hpp | 6 +- .../Game/MapObj/AstroDomeGalaxySelector.hpp | 47 +- include/Game/MapObj/AstroDomeOrbit.hpp | 8 +- include/Game/MapObj/AstroMapBoard.hpp | 6 +- include/Game/MapObj/AstroMapObj.hpp | 94 +- include/Game/MapObj/AstroMapObjFunction.hpp | 40 +- include/Game/MapObj/AstroOverlookObj.hpp | 2 +- include/Game/MapObj/BallOpener.hpp | 22 +- include/Game/MapObj/BallRail.hpp | 28 +- include/Game/MapObj/Banekiti.hpp | 14 +- include/Game/MapObj/BattleShipElevator.hpp | 8 +- include/Game/MapObj/BeamGoRoundPlanet.hpp | 24 +- include/Game/MapObj/BeeFlowerHover.hpp | 20 +- include/Game/MapObj/BenefitItemInvincible.hpp | 10 +- include/Game/MapObj/BenefitItemLifeUp.hpp | 8 +- include/Game/MapObj/BenefitItemObj.hpp | 108 +- include/Game/MapObj/BigBubbleDrawer.hpp | 12 +- include/Game/MapObj/BigBubbleMoveLimitter.hpp | 22 +- include/Game/MapObj/BigFan.hpp | 23 +- include/Game/MapObj/BigFanHolder.hpp | 6 +- include/Game/MapObj/BlackHole.hpp | 28 +- include/Game/MapObj/BlueChip.hpp | 4 +- include/Game/MapObj/BreakableCage.hpp | 42 +- include/Game/MapObj/BrightObj.hpp | 22 +- include/Game/MapObj/BumpAppearPlanet.hpp | 6 +- include/Game/MapObj/Candlestand.hpp | 34 +- .../Game/MapObj/CannonFortressBreakStep.hpp | 8 +- include/Game/MapObj/CapsuleCage.hpp | 24 +- include/Game/MapObj/ChipBase.hpp | 73 +- include/Game/MapObj/ChipCounter.hpp | 18 +- include/Game/MapObj/ChipGroup.hpp | 48 +- include/Game/MapObj/ChipHolder.hpp | 34 +- include/Game/MapObj/ChooChooTrain.hpp | 14 +- include/Game/MapObj/CircleCoinGroup.hpp | 14 +- include/Game/MapObj/ClipArea.hpp | 10 +- include/Game/MapObj/ClipAreaDrop.hpp | 2 +- include/Game/MapObj/ClipAreaDropHolder.hpp | 7 +- include/Game/MapObj/ClipAreaDropLaser.hpp | 20 +- include/Game/MapObj/ClipAreaHolder.hpp | 2 +- include/Game/MapObj/ClipAreaMovable.hpp | 14 +- include/Game/MapObj/ClipAreaShape.hpp | 26 +- include/Game/MapObj/ClipFieldMapParts.hpp | 4 +- include/Game/MapObj/ClipFieldSwitch.hpp | 4 +- include/Game/MapObj/CocoNut.hpp | 144 +- include/Game/MapObj/CoconutTree.hpp | 4 +- include/Game/MapObj/Coin.hpp | 118 +- include/Game/MapObj/CoinBox.hpp | 8 +- include/Game/MapObj/CoinGroup.hpp | 25 +- include/Game/MapObj/CoinHolder.hpp | 33 +- include/Game/MapObj/CoinReplica.hpp | 6 +- include/Game/MapObj/CoinRotater.hpp | 12 +- include/Game/MapObj/CoinSpot.hpp | 10 +- include/Game/MapObj/CollapsePlane.hpp | 18 +- include/Game/MapObj/CollectCounter.hpp | 8 +- include/Game/MapObj/CollisionBlocker.hpp | 6 +- include/Game/MapObj/CrystalCage.hpp | 58 +- include/Game/MapObj/CrystalCageMoving.hpp | 26 +- include/Game/MapObj/CrystalSwitch.hpp | 14 +- include/Game/MapObj/CutBushModelObj.hpp | 6 +- include/Game/MapObj/DashRing.hpp | 32 +- include/Game/MapObj/DeadLeaves.hpp | 12 +- include/Game/MapObj/DesertLandMoveSwitch.hpp | 36 +- include/Game/MapObj/DesertMovingLand.hpp | 34 +- include/Game/MapObj/DummyDisplayModel.hpp | 8 +- include/Game/MapObj/DynamicCollisionObj.hpp | 29 +- include/Game/MapObj/EarthenPipe.hpp | 114 +- include/Game/MapObj/ExterminationChecker.hpp | 41 +- include/Game/MapObj/FallOutFieldDraw.hpp | 4 +- include/Game/MapObj/FallingSmallRock.hpp | 8 +- include/Game/MapObj/FireBar.hpp | 28 +- include/Game/MapObj/FirePressure.hpp | 10 +- include/Game/MapObj/FirePressureBullet.hpp | 18 +- .../Game/MapObj/FirePressureBulletHolder.hpp | 6 +- include/Game/MapObj/FirePressureRadiate.hpp | 50 +- include/Game/MapObj/FlameGun.hpp | 12 +- include/Game/MapObj/FlipPanel.hpp | 38 +- include/Game/MapObj/FloaterFloatingForce.hpp | 16 +- .../MapObj/FloaterFloatingForceTypeNormal.hpp | 20 +- include/Game/MapObj/FloaterFunction.hpp | 6 +- include/Game/MapObj/Fountain.hpp | 12 +- include/Game/MapObj/FountainBig.hpp | 14 +- include/Game/MapObj/GCapture.hpp | 73 +- include/Game/MapObj/GCaptureRibbon.hpp | 25 +- include/Game/MapObj/GeneralMapParts.hpp | 41 +- include/Game/MapObj/GreenCaterpillarBig.hpp | 36 +- include/Game/MapObj/HatchWaterPlanet.hpp | 12 +- include/Game/MapObj/HeavensDoorDemoObj.hpp | 14 +- include/Game/MapObj/HipDropMoveObj.hpp | 16 +- include/Game/MapObj/HipDropRock.hpp | 24 +- include/Game/MapObj/HipDropSwitch.hpp | 24 +- include/Game/MapObj/IceStep.hpp | 28 +- include/Game/MapObj/InvisiblePolygonObj.hpp | 8 +- .../MapObj/InvisiblePolygonObjGCapture.hpp | 7 +- include/Game/MapObj/ItemAppearStone.hpp | 4 +- include/Game/MapObj/ItemBlock.hpp | 56 +- include/Game/MapObj/KeySwitch.hpp | 16 +- include/Game/MapObj/KillerGunnerSingle.hpp | 8 +- include/Game/MapObj/LargeChain.hpp | 14 +- include/Game/MapObj/LargeChainParts.hpp | 4 +- .../Game/MapObj/LavaBallRisingPlanetLava.hpp | 6 +- include/Game/MapObj/LavaGalaxyParts.hpp | 8 +- include/Game/MapObj/LavaHomeVolcanoFlow.hpp | 4 +- include/Game/MapObj/LavaJamboSunPlanet.hpp | 8 +- include/Game/MapObj/LavaSteam.hpp | 8 +- include/Game/MapObj/LotusLeaf.hpp | 8 +- include/Game/MapObj/MagicBell.hpp | 18 +- include/Game/MapObj/ManholeCover.hpp | 13 +- include/Game/MapObj/MapObjActor.hpp | 110 +- include/Game/MapObj/MapObjActorInitInfo.hpp | 128 +- include/Game/MapObj/MapObjConnector.hpp | 12 +- include/Game/MapObj/MapParts.hpp | 8 +- .../Game/MapObj/MapPartsAppearController.hpp | 12 +- include/Game/MapObj/MapPartsBreaker.hpp | 9 +- include/Game/MapObj/MapPartsFloatingForce.hpp | 48 +- include/Game/MapObj/MapPartsFunction.hpp | 23 +- .../Game/MapObj/MapPartsRailGuideDrawer.hpp | 14 +- .../Game/MapObj/MapPartsRailGuideHolder.hpp | 8 +- .../Game/MapObj/MapPartsRailGuidePoint.hpp | 8 +- include/Game/MapObj/MapPartsRailMover.hpp | 34 +- .../MapObj/MapPartsRailPointPassChecker.hpp | 5 +- include/Game/MapObj/MapPartsRailPosture.hpp | 6 +- include/Game/MapObj/MapPartsRailRotator.hpp | 20 +- include/Game/MapObj/MapPartsRotator.hpp | 46 +- include/Game/MapObj/MarblePlanet.hpp | 46 +- .../Game/MapObj/MarioLauncherAttractor.hpp | 20 +- include/Game/MapObj/MechaKoopaPartsArm.hpp | 12 +- include/Game/MapObj/MechaKoopaPartsHead.hpp | 16 +- include/Game/MapObj/MercatorFixParts.hpp | 8 +- include/Game/MapObj/MercatorRailMoveParts.hpp | 22 +- include/Game/MapObj/MercatorRotateParts.hpp | 14 +- include/Game/MapObj/MeteoContainer.hpp | 12 +- include/Game/MapObj/MiniatureGalaxy.hpp | 64 +- include/Game/MapObj/MiniatureGalaxyHolder.hpp | 4 +- include/Game/MapObj/NeedlePlant.hpp | 14 +- include/Game/MapObj/NormalMapBase.hpp | 94 +- include/Game/MapObj/NormalMapTestObj.hpp | 4 +- include/Game/MapObj/Note.hpp | 28 +- include/Game/MapObj/NoteFairy.hpp | 54 +- include/Game/MapObj/PTimerSwitch.hpp | 48 +- include/Game/MapObj/PalmIsland.hpp | 10 +- .../Game/MapObj/PeachCastleGardenPlanet.hpp | 10 +- include/Game/MapObj/PhantomShipBridge.hpp | 6 +- include/Game/MapObj/PicketSwitch.hpp | 8 +- include/Game/MapObj/PowerStar.hpp | 120 +- include/Game/MapObj/PowerStarAppearPoint.hpp | 6 +- include/Game/MapObj/PowerStarHolder.hpp | 26 +- include/Game/MapObj/PressureBase.hpp | 55 +- include/Game/MapObj/PrizeRing.hpp | 27 +- include/Game/MapObj/PunchingKinoko.hpp | 42 +- include/Game/MapObj/PurpleCoinHolder.hpp | 8 +- include/Game/MapObj/PurpleCoinStarter.hpp | 10 +- .../MapObj/QuarterRollGravityRoomArrow.hpp | 18 +- include/Game/MapObj/RailMoveObj.hpp | 59 +- include/Game/MapObj/RainCloud.hpp | 30 +- .../Game/MapObj/ReverseGravityRoomPlanet.hpp | 8 +- include/Game/MapObj/RevolvingWay.hpp | 8 +- include/Game/MapObj/Rock.hpp | 124 +- include/Game/MapObj/RockCreator.hpp | 2 +- include/Game/MapObj/RosettaChair.hpp | 8 +- include/Game/MapObj/RosettaPictureBook.hpp | 4 +- include/Game/MapObj/RotateMoveObj.hpp | 18 +- .../Game/MapObj/SandCapsuleInsidePlanet.hpp | 6 +- include/Game/MapObj/ScrewSwitch.hpp | 12 +- .../Game/MapObj/SeaBottomTriplePropeller.hpp | 6 +- include/Game/MapObj/ShootingStar.hpp | 12 +- include/Game/MapObj/SimpleClipPartsObj.hpp | 14 +- include/Game/MapObj/SimpleFloaterObj.hpp | 10 +- include/Game/MapObj/SimpleMapObj.hpp | 92 +- include/Game/MapObj/SimpleNormalMapObj.hpp | 5 +- include/Game/MapObj/SimpleTimerObj.hpp | 10 +- include/Game/MapObj/SnowCapsulePlanet.hpp | 10 +- include/Game/MapObj/SnowMan.hpp | 12 +- include/Game/MapObj/SnowplowSwitch.hpp | 6 +- include/Game/MapObj/SoundEmitter.hpp | 8 +- include/Game/MapObj/SpaceMine.hpp | 18 +- include/Game/MapObj/SphereRailDash.hpp | 24 +- include/Game/MapObj/SpiderMapBlock.hpp | 4 +- include/Game/MapObj/SpinDriver.hpp | 76 +- include/Game/MapObj/SpinDriverCamera.hpp | 26 +- include/Game/MapObj/SpinDriverOperateRing.hpp | 30 +- include/Game/MapObj/SpinDriverPathDrawer.hpp | 44 +- include/Game/MapObj/SpinDriverShootPath.hpp | 24 +- include/Game/MapObj/SpinDriverUtil.hpp | 2 +- include/Game/MapObj/SpinLeverSwitch.hpp | 14 +- include/Game/MapObj/StageEffectDataTable.hpp | 361 +- include/Game/MapObj/StarPieceDirector.hpp | 4 +- include/Game/MapObj/StarPieceGroup.hpp | 41 +- .../Game/MapObj/SubmarineVolcanoBigColumn.hpp | 14 +- include/Game/MapObj/Sun.hpp | 4 +- include/Game/MapObj/SuperSpinDriver.hpp | 138 +- include/Game/MapObj/SurprisedGalaxy.hpp | 10 +- include/Game/MapObj/Swinger.hpp | 30 +- include/Game/MapObj/SwitchBox.hpp | 36 +- include/Game/MapObj/TimeAppearObj.hpp | 6 +- include/Game/MapObj/TransparentWall.hpp | 6 +- include/Game/MapObj/TreasureBoxCracked.hpp | 48 +- include/Game/MapObj/TreasureSpot.hpp | 8 +- include/Game/MapObj/UFOBase.hpp | 44 +- include/Game/MapObj/UFOKinoko.hpp | 12 +- include/Game/MapObj/ValveSwitch.hpp | 16 +- include/Game/MapObj/WatchTowerRotateStep.hpp | 14 +- include/Game/MapObj/WaterLeakPipe.hpp | 22 +- include/Game/MapObj/WaterPressureBullet.hpp | 36 +- .../Game/MapObj/WaterPressureBulletHolder.hpp | 6 +- include/Game/MapObj/WaveFloatingForce.hpp | 14 +- include/Game/MapObj/WoodBox.hpp | 40 +- include/Game/MapObj/YellowChip.hpp | 2 +- include/Game/NPC/Butler.hpp | 64 +- include/Game/NPC/ButlerExplain.hpp | 8 +- include/Game/NPC/ButlerMap.hpp | 10 +- .../Game/NPC/ButlerStateStarPieceReaction.hpp | 8 +- include/Game/NPC/CollectTico.hpp | 24 +- .../Game/NPC/CometEventExecutorTimeLimit.hpp | 2 +- include/Game/NPC/CometEventKeeper.hpp | 18 +- include/Game/NPC/EventDirector.hpp | 26 +- include/Game/NPC/HoneyBee.hpp | 24 +- include/Game/NPC/HoneyQueen.hpp | 28 +- include/Game/NPC/KoopaJr.hpp | 4 +- include/Game/NPC/LuigiNPC.hpp | 52 +- include/Game/NPC/MiiDatabase.hpp | 2 +- include/Game/NPC/MiiFaceIconHolder.hpp | 2 +- include/Game/NPC/MiiFaceParts.hpp | 12 +- include/Game/NPC/MiiFacePartsHolder.hpp | 20 +- include/Game/NPC/NPCActor.hpp | 258 +- include/Game/NPC/NPCActorItem.hpp | 7 +- include/Game/NPC/NPCParameter.hpp | 26 +- include/Game/NPC/NPCSupportRail.hpp | 6 +- include/Game/NPC/Peach.hpp | 4 +- include/Game/NPC/Penguin.hpp | 10 +- include/Game/NPC/PenguinMaster.hpp | 8 +- include/Game/NPC/PenguinStudent.hpp | 14 +- include/Game/NPC/PowerStarEventKeeper.hpp | 30 +- include/Game/NPC/RabbitStateCaught.hpp | 28 +- include/Game/NPC/RabbitStateWaitStart.hpp | 42 +- include/Game/NPC/SignBoard.hpp | 6 +- include/Game/NPC/StrayTico.hpp | 36 +- include/Game/NPC/TalkBalloon.hpp | 6 +- include/Game/NPC/TalkDirector.hpp | 152 +- include/Game/NPC/TalkMessageCtrl.hpp | 95 +- include/Game/NPC/TalkMessageFunc.hpp | 23 +- include/Game/NPC/TalkMessageInfo.hpp | 12 +- include/Game/NPC/TalkNodeCtrl.hpp | 72 +- include/Game/NPC/TalkState.hpp | 74 +- include/Game/NPC/TalkTextFormer.hpp | 14 +- include/Game/NPC/Tico.hpp | 72 +- include/Game/NPC/TicoAstro.hpp | 4 +- include/Game/NPC/TicoComet.hpp | 12 +- include/Game/NPC/TicoDemoGetPower.hpp | 4 +- include/Game/NPC/TicoDomeLecture.hpp | 4 +- include/Game/NPC/TicoFat.hpp | 116 +- include/Game/NPC/TicoGalaxy.hpp | 10 +- include/Game/NPC/TicoRail.hpp | 14 +- include/Game/NPC/TicoReading.hpp | 6 +- include/Game/NPC/TicoShop.hpp | 12 +- include/Game/NPC/TicoStarRing.hpp | 12 +- include/Game/NPC/TrickRabbit.hpp | 191 +- include/Game/NPC/TrickRabbitFreeRun.hpp | 52 +- include/Game/NWC24/LuigiMailDirector.hpp | 2 +- include/Game/NWC24/NWC24Function.hpp | 2 +- include/Game/NWC24/NWC24Messenger.hpp | 78 +- include/Game/NWC24/NWC24SendThread.hpp | 36 +- include/Game/NWC24/NWC24System.hpp | 6 +- include/Game/NWC24/ReceiverTagMail.hpp | 8 +- include/Game/NWC24/UTF16Util.hpp | 4 +- .../Game/NameObj/ModelChangableObjFactory.hpp | 14 +- .../Game/NameObj/MovementOnOffGroupHolder.hpp | 12 +- include/Game/NameObj/NameObj.hpp | 6 +- include/Game/NameObj/NameObjAdaptor.hpp | 16 +- .../NameObj/NameObjArchiveListCollector.hpp | 6 +- include/Game/NameObj/NameObjCategoryList.hpp | 35 +- include/Game/NameObj/NameObjExecuteHolder.hpp | 82 +- include/Game/NameObj/NameObjFactory.hpp | 30 +- include/Game/NameObj/NameObjFinder.hpp | 2 +- include/Game/NameObj/NameObjGroup.hpp | 10 +- include/Game/NameObj/NameObjHolder.hpp | 16 +- include/Game/NameObj/NameObjListExecutor.hpp | 30 +- include/Game/NameObj/NameObjRegister.hpp | 4 +- include/Game/Player/DLchanger.hpp | 2 +- include/Game/Player/FireMarioBall.hpp | 10 +- include/Game/Player/GroupChecker.hpp | 18 +- include/Game/Player/J3DModelX.hpp | 92 +- include/Game/Player/Mario.hpp | 1002 +- include/Game/Player/MarioAbyssDamage.hpp | 2 +- include/Game/Player/MarioAccess.hpp | 2 +- include/Game/Player/MarioActor.hpp | 825 +- include/Game/Player/MarioAnimator.hpp | 81 +- include/Game/Player/MarioAnimatorData.hpp | 8334 +++++++------- include/Game/Player/MarioBlown.hpp | 2 +- include/Game/Player/MarioBump.hpp | 2 +- include/Game/Player/MarioBury.hpp | 2 +- include/Game/Player/MarioClimb.hpp | 2 +- include/Game/Player/MarioConst.hpp | 14 +- include/Game/Player/MarioCrush.hpp | 2 +- include/Game/Player/MarioDamage.hpp | 16 +- include/Game/Player/MarioDarkDamage.hpp | 2 +- include/Game/Player/MarioEffect.hpp | 24 +- include/Game/Player/MarioFaint.hpp | 2 +- include/Game/Player/MarioFireDamage.hpp | 2 +- include/Game/Player/MarioFireDance.hpp | 2 +- include/Game/Player/MarioFireRun.hpp | 2 +- include/Game/Player/MarioFlip.hpp | 2 +- include/Game/Player/MarioFlow.hpp | 2 +- include/Game/Player/MarioFoo.hpp | 2 +- include/Game/Player/MarioFpView.hpp | 2 +- include/Game/Player/MarioFreeze.hpp | 2 +- include/Game/Player/MarioFrontStep.hpp | 2 +- include/Game/Player/MarioHang.hpp | 9 +- include/Game/Player/MarioHolder.hpp | 8 +- include/Game/Player/MarioMagic.hpp | 2 +- include/Game/Player/MarioMapCode.hpp | 2 +- include/Game/Player/MarioMessenger.hpp | 6 +- include/Game/Player/MarioModule.hpp | 185 +- include/Game/Player/MarioMove.hpp | 2 +- include/Game/Player/MarioNullBck.hpp | 10 +- include/Game/Player/MarioParalyze.hpp | 2 +- include/Game/Player/MarioRabbit.hpp | 2 +- include/Game/Player/MarioRecovery.hpp | 2 +- include/Game/Player/MarioSideStep.hpp | 2 +- include/Game/Player/MarioSkate.hpp | 2 +- include/Game/Player/MarioSlider.hpp | 2 +- include/Game/Player/MarioState.hpp | 14 +- include/Game/Player/MarioStep.hpp | 2 +- include/Game/Player/MarioStick.hpp | 2 +- include/Game/Player/MarioStun.hpp | 4 +- include/Game/Player/MarioSukekiyo.hpp | 2 +- include/Game/Player/MarioSwim.hpp | 198 +- include/Game/Player/MarioTalk.hpp | 2 +- include/Game/Player/MarioTeresa.hpp | 2 +- include/Game/Player/MarioWait.hpp | 2 +- include/Game/Player/MarioWall.hpp | 14 +- include/Game/Player/MarioWarp.hpp | 2 +- include/Game/Player/RushEndInfo.hpp | 2 +- .../Game/RhythmLib/AudBgmTempoAdjuster.hpp | 28 +- include/Game/RhythmLib/AudRhythmSeqParser.hpp | 4 +- include/Game/Ride/BigBubble.hpp | 88 +- include/Game/Ride/Pole.hpp | 62 +- .../Game/Ride/SphereAccelSensorController.hpp | 14 +- include/Game/Ride/SphereController.hpp | 4 +- include/Game/Ride/SpherePadController.hpp | 7 +- include/Game/Ride/SurfRay.hpp | 51 +- include/Game/Ride/SurfRayTutorial.hpp | 10 +- include/Game/Ride/Tamakoro.hpp | 46 +- include/Game/Ride/TamakoroTutorial.hpp | 8 +- include/Game/Scene/GameScene.hpp | 90 +- include/Game/Scene/GameSceneFunction.hpp | 2 +- include/Game/Scene/GameScenePauseControl.hpp | 12 +- .../GameSceneScenarioOpeningCameraState.hpp | 4 +- include/Game/Scene/IntermissionScene.hpp | 6 +- include/Game/Scene/LogoScene.hpp | 4 +- include/Game/Scene/MultiSceneActor.hpp | 78 +- include/Game/Scene/MultiSceneEffectKeeper.hpp | 18 +- include/Game/Scene/PlacementInfoOrdered.hpp | 54 +- include/Game/Scene/PlacementStateChecker.hpp | 4 +- include/Game/Scene/PlayTimerScene.hpp | 6 +- include/Game/Scene/ScenarioSelectScene.hpp | 28 +- include/Game/Scene/Scene.hpp | 8 +- include/Game/Scene/SceneDataInitializer.hpp | 4 +- include/Game/Scene/SceneFactory.hpp | 2 +- include/Game/Scene/SceneFunction.hpp | 2 +- .../Game/Scene/SceneNameObjListExecutor.hpp | 6 +- .../Scene/SceneNameObjMovementController.hpp | 8 +- include/Game/Scene/SceneObjHolder.hpp | 2 +- include/Game/Scene/ScenePlayingResult.hpp | 2 +- include/Game/Scene/StageDataHolder.hpp | 104 +- include/Game/Scene/StageFileLoader.hpp | 16 +- include/Game/Scene/StageResourceLoader.hpp | 2 +- include/Game/Scene/StopSceneController.hpp | 4 +- include/Game/Screen/BackButton.hpp | 4 +- include/Game/Screen/BloomEffect.hpp | 12 +- include/Game/Screen/BloomEffectSimple.hpp | 6 +- include/Game/Screen/BombTimerLayout.hpp | 8 +- include/Game/Screen/BrosButton.hpp | 2 +- include/Game/Screen/ButtonPaneController.hpp | 34 +- include/Game/Screen/CameraInfo.hpp | 2 +- include/Game/Screen/CaptureScreenDirector.hpp | 20 +- include/Game/Screen/CenterScreenBlur.hpp | 2 +- include/Game/Screen/CoinCounter.hpp | 12 +- include/Game/Screen/CometRetryButton.hpp | 2 +- include/Game/Screen/CopyFilterNegater.hpp | 2 +- include/Game/Screen/CountUpPaneRumbler.hpp | 4 +- include/Game/Screen/CounterLayoutAppearer.hpp | 8 +- .../Game/Screen/CounterLayoutController.hpp | 36 +- include/Game/Screen/CustomTagProcessor.hpp | 3 +- include/Game/Screen/DepthOfFieldBlur.hpp | 6 +- include/Game/Screen/ErrorMessageWindow.hpp | 6 +- include/Game/Screen/FileSelectButton.hpp | 2 +- include/Game/Screen/FileSelectInfo.hpp | 28 +- include/Game/Screen/FileSelectNumber.hpp | 8 +- include/Game/Screen/FullnessMeter.hpp | 12 +- include/Game/Screen/GalaxyConfirmLayout.hpp | 2 +- include/Game/Screen/GalaxyMapCometIcon.hpp | 6 +- include/Game/Screen/GalaxyMapController.hpp | 18 +- include/Game/Screen/GalaxyMapDomeIcon.hpp | 14 +- include/Game/Screen/GalaxyMapGalaxyPlain.hpp | 8 +- include/Game/Screen/GalaxyMapMarioIcon.hpp | 2 +- include/Game/Screen/GalaxyMapSelectButton.hpp | 2 +- include/Game/Screen/GalaxyMapTicoIcon.hpp | 8 +- include/Game/Screen/GalaxyNamePlate.hpp | 22 +- include/Game/Screen/GalaxyNamePlateDrawer.hpp | 4 +- include/Game/Screen/GalaxySelectInfo.hpp | 30 +- include/Game/Screen/GamePauseSequence.hpp | 8 +- include/Game/Screen/GameSceneLayoutHolder.hpp | 56 +- .../Game/Screen/GameStageClearSequence.hpp | 6 +- include/Game/Screen/HomeButtonLayout.hpp | 6 +- include/Game/Screen/IconAButton.hpp | 8 +- include/Game/Screen/IconComet.hpp | 4 +- include/Game/Screen/ImageEffectBase.hpp | 2 +- include/Game/Screen/ImageEffectDirector.hpp | 26 +- include/Game/Screen/ImageEffectLocalUtil.hpp | 4 +- include/Game/Screen/ImageEffectState.hpp | 61 +- .../Game/Screen/ImageEffectSystemHolder.hpp | 10 +- include/Game/Screen/InformationMessage.hpp | 2 +- include/Game/Screen/InformationObserver.hpp | 8 +- include/Game/Screen/IsbnManager.hpp | 36 +- include/Game/Screen/LayoutActor.hpp | 40 +- include/Game/Screen/LayoutManager.hpp | 96 +- include/Game/Screen/LayoutPaneCtrl.hpp | 27 +- include/Game/Screen/LensFlare.hpp | 34 +- include/Game/Screen/LogoFader.hpp | 4 +- include/Game/Screen/LuigiLetter.hpp | 16 +- include/Game/Screen/Manual2P.hpp | 10 +- include/Game/Screen/MarioMeter.hpp | 10 +- include/Game/Screen/MarioSubMeter.hpp | 10 +- .../Screen/MessageTagSkipTagProcessor.hpp | 23 +- include/Game/Screen/MeterLayout.hpp | 28 +- include/Game/Screen/MiiConfirmIcon.hpp | 2 +- include/Game/Screen/MiiSelect.hpp | 106 +- include/Game/Screen/MiiSelectIcon.hpp | 46 +- include/Game/Screen/MoviePlayerSimple.hpp | 34 +- include/Game/Screen/MoviePlayingSequence.hpp | 12 +- include/Game/Screen/MovieSubtitles.hpp | 4 +- .../Game/Screen/MovieSubtitlesDataTable.hpp | 14 +- include/Game/Screen/NoteCounter.hpp | 2 +- include/Game/Screen/OdhConverter.hpp | 16 +- include/Game/Screen/PaneEffectKeeper.hpp | 4 +- include/Game/Screen/PauseMenu.hpp | 14 +- include/Game/Screen/PeachLetter.hpp | 6 +- .../Game/Screen/PictureBookCloseButton.hpp | 2 +- include/Game/Screen/PictureBookLayout.hpp | 50 +- include/Game/Screen/PlayerActionGuidance.hpp | 14 +- include/Game/Screen/PlayerLeft.hpp | 6 +- include/Game/Screen/PlayerMissLeft.hpp | 2 +- include/Game/Screen/ProloguePictureBook.hpp | 2 +- include/Game/Screen/PurpleCoinCounter.hpp | 10 +- include/Game/Screen/ScenarioSelectLayout.hpp | 76 +- include/Game/Screen/SceneWipeHolder.hpp | 10 +- include/Game/Screen/ScreenBlurEffect.hpp | 6 +- include/Game/Screen/ScreenPreserver.hpp | 2 +- include/Game/Screen/SimpleLayout.hpp | 4 +- include/Game/Screen/StaffRoll.hpp | 62 +- include/Game/Screen/StageResultInformer.hpp | 12 +- include/Game/Screen/StarCounter.hpp | 4 +- include/Game/Screen/StarPieceCounter.hpp | 14 +- include/Game/Screen/StarPointerController.hpp | 34 +- include/Game/Screen/StarPointerDirector.hpp | 62 +- include/Game/Screen/SubMeterLayout.hpp | 8 +- include/Game/Screen/SuddenDeathMeter.hpp | 22 +- include/Game/Screen/SurfingGuidance.hpp | 4 +- include/Game/Screen/SysInfoWindow.hpp | 44 +- .../Game/Screen/THPSimplePlayerWrapper.hpp | 130 +- include/Game/Screen/TimeLimitLayout.hpp | 46 +- include/Game/Screen/TitleSequenceProduct.hpp | 12 +- include/Game/Screen/WipeFade.hpp | 6 +- include/Game/Screen/WipeHolderBase.hpp | 26 +- include/Game/Screen/WipeLayoutBase.hpp | 5 +- include/Game/Screen/WipeRing.hpp | 12 +- include/Game/Screen/YesNoController.hpp | 10 +- include/Game/Screen/YesNoLayout.hpp | 2 +- include/Game/SingletonHolder.hpp | 8 +- include/Game/Speaker/SpkData.hpp | 10 +- include/Game/Speaker/SpkMixingBuffer.hpp | 6 +- include/Game/Speaker/SpkSound.hpp | 42 +- include/Game/Speaker/SpkSpeakerCtrl.hpp | 28 +- include/Game/Speaker/SpkSystem.hpp | 18 +- include/Game/Speaker/SpkTable.hpp | 18 +- include/Game/Speaker/SpkWave.hpp | 10 +- .../Game/System/AlreadyDoneFlagInGalaxy.hpp | 12 +- include/Game/System/ArchiveHolder.hpp | 26 +- include/Game/System/AudSystemWrapper.hpp | 28 +- include/Game/System/BinaryDataChunkHolder.hpp | 24 +- .../Game/System/BinaryDataContentAccessor.hpp | 20 +- include/Game/System/ConfigDataHolder.hpp | 44 +- include/Game/System/ConfigDataMii.hpp | 12 +- include/Game/System/ConfigDataMisc.hpp | 24 +- include/Game/System/DrawBufferExecuter.hpp | 16 +- include/Game/System/DrawBufferGroup.hpp | 20 +- include/Game/System/DrawBufferHolder.hpp | 18 +- include/Game/System/DrawSyncManager.hpp | 42 +- include/Game/System/ErrorArchive.hpp | 3357 +++--- include/Game/System/FileHolder.hpp | 34 +- include/Game/System/FileLoader.hpp | 42 +- include/Game/System/FileLoaderThread.hpp | 16 +- include/Game/System/FileRipper.hpp | 14 +- .../System/FindingLuigiEventScheduler.hpp | 10 +- include/Game/System/FunctionAsyncExecutor.hpp | 52 +- include/Game/System/GalaxyCometScheduler.hpp | 38 +- include/Game/System/GalaxyMoveArgument.hpp | 12 +- include/Game/System/GalaxyStatusAccessor.hpp | 48 +- include/Game/System/GameDataConst.hpp | 22 +- include/Game/System/GameDataFunction.hpp | 152 +- include/Game/System/GameDataHolder.hpp | 108 +- .../Game/System/GameDataTemporaryInGalaxy.hpp | 24 +- include/Game/System/GameEventFlag.hpp | 38 +- include/Game/System/GameEventFlagChecker.hpp | 16 +- include/Game/System/GameEventFlagStorage.hpp | 14 +- include/Game/System/GameEventFlagTable.hpp | 53 +- include/Game/System/GameSequenceDirector.hpp | 18 +- include/Game/System/GameSequenceFunction.hpp | 116 +- include/Game/System/GameSequenceProgress.hpp | 62 +- include/Game/System/GameSystem.hpp | 24 +- .../Game/System/GameSystemDimmingWatcher.hpp | 4 +- .../Game/System/GameSystemErrorWatcher.hpp | 46 +- include/Game/System/GameSystemException.hpp | 2 +- include/Game/System/GameSystemFontHolder.hpp | 12 +- include/Game/System/GameSystemFunction.hpp | 2 +- include/Game/System/GameSystemObjHolder.hpp | 72 +- .../System/GameSystemResetAndPowerProcess.hpp | 42 +- .../Game/System/GameSystemSceneController.hpp | 124 +- .../GameSystemStationedArchiveLoader.hpp | 22 +- include/Game/System/HeapMemoryWatcher.hpp | 48 +- include/Game/System/HomeButtonMenuWrapper.hpp | 21 +- .../Game/System/HomeButtonStateNotifier.hpp | 2 +- include/Game/System/Language.hpp | 2 +- include/Game/System/LayoutHolder.hpp | 26 +- include/Game/System/MainLoopFramework.hpp | 89 +- include/Game/System/MessageHolder.hpp | 49 +- include/Game/System/NANDErrorSequence.hpp | 12 +- include/Game/System/NANDManager.hpp | 52 +- include/Game/System/NANDManagerThread.hpp | 6 +- include/Game/System/NerveExecutor.hpp | 2 +- include/Game/System/OSThreadWrapper.hpp | 20 +- include/Game/System/ResourceHolder.hpp | 55 +- include/Game/System/ResourceHolderManager.hpp | 28 +- include/Game/System/ResourceInfo.hpp | 38 +- include/Game/System/SaveDataBannerCreator.hpp | 16 +- .../Game/System/SaveDataHandleSequence.hpp | 142 +- include/Game/System/SaveDataHandler.hpp | 62 +- include/Game/System/ScenarioDataParser.hpp | 42 +- .../System/StageResultSequenceChecker.hpp | 30 +- .../System/StarPointerOnOffController.hpp | 8 +- .../Game/System/StationedArchiveLoader.hpp | 12 +- include/Game/System/StationedFileInfo.hpp | 6 +- include/Game/System/StorySequenceExecutor.hpp | 96 +- include/Game/System/SysConfigFile.hpp | 28 +- include/Game/System/UserFile.hpp | 56 +- include/Game/System/WPad.hpp | 52 +- include/Game/System/WPadAcceleration.hpp | 4 +- include/Game/System/WPadHVSwing.hpp | 28 +- include/Game/System/WPadHolder.hpp | 34 +- include/Game/System/WPadInfoChecker.hpp | 10 +- include/Game/System/WPadLeaveWatcher.hpp | 4 +- include/Game/System/WPadPointer.hpp | 50 +- include/Game/System/WPadRumble.hpp | 40 +- include/Game/System/WPadRumbleData.hpp | 16 +- include/Game/System/WPadStick.hpp | 20 +- include/Game/Util/ActorCameraUtil.hpp | 78 +- include/Game/Util/ActorMovementUtil.hpp | 282 +- include/Game/Util/ActorSensorUtil.hpp | 410 +- include/Game/Util/ActorShadowLocalUtil.hpp | 64 +- include/Game/Util/ActorShadowUtil.hpp | 160 +- include/Game/Util/ActorStateUtil.hpp | 2 +- include/Game/Util/ActorSwitchUtil.hpp | 72 +- include/Game/Util/AreaObjUtil.hpp | 40 +- include/Game/Util/Array.hpp | 21 +- .../Util/BaseMatrixFollowTargetHolder.hpp | 49 +- include/Game/Util/BitArray.hpp | 2 +- include/Game/Util/BothDirList.hpp | 20 +- include/Game/Util/CameraUtil.hpp | 119 +- include/Game/Util/Color.hpp | 12 +- include/Game/Util/DemoUtil.hpp | 158 +- include/Game/Util/DirectDraw.hpp | 10 +- include/Game/Util/DrawUtil.hpp | 55 +- include/Game/Util/EffectUtil.hpp | 72 +- include/Game/Util/EventUtil.hpp | 354 +- include/Game/Util/FileUtil.hpp | 82 +- include/Game/Util/FixedPosition.hpp | 30 +- include/Game/Util/FootPrint.hpp | 30 +- include/Game/Util/Functor.hpp | 66 +- include/Game/Util/GamePadUtil.hpp | 4 +- include/Game/Util/GeometryBindUtil.hpp | 10 +- include/Game/Util/GravityUtil.hpp | 38 +- include/Game/Util/HashUtil.hpp | 20 +- include/Game/Util/IKJoint.hpp | 24 +- include/Game/Util/JMapIdInfo.hpp | 13 +- include/Game/Util/JMapInfo.hpp | 74 +- include/Game/Util/JMapLinkInfo.hpp | 6 +- include/Game/Util/JMapUtil.hpp | 184 +- include/Game/Util/JointController.hpp | 51 +- include/Game/Util/JointUtil.hpp | 66 +- include/Game/Util/LayoutUtil.hpp | 304 +- include/Game/Util/LightUtil.hpp | 6 +- include/Game/Util/LiveActorUtil.hpp | 172 +- include/Game/Util/MapPartsUtil.hpp | 74 +- include/Game/Util/MapUtil.hpp | 47 +- include/Game/Util/MathUtil.hpp | 68 +- include/Game/Util/MemoryUtil.hpp | 34 +- include/Game/Util/MessageUtil.hpp | 14 +- include/Game/Util/ModelUtil.hpp | 64 +- include/Game/Util/MtxUtil.hpp | 160 +- include/Game/Util/MultiEventCamera.hpp | 22 +- include/Game/Util/MutexHolder.hpp | 8 +- include/Game/Util/NPCUtil.hpp | 74 +- include/Game/Util/NerveUtil.hpp | 2 +- include/Game/Util/ObjUtil.hpp | 350 +- include/Game/Util/ParabolicPath.hpp | 28 +- include/Game/Util/PlayerUtil.hpp | 346 +- include/Game/Util/RailGraphUtil.hpp | 30 +- include/Game/Util/RailUtil.hpp | 146 +- include/Game/Util/RenderMode.hpp | 28 +- include/Game/Util/RumbleCalculator.hpp | 14 +- include/Game/Util/SceneUtil.hpp | 138 +- include/Game/Util/SchedulerUtil.hpp | 2 +- include/Game/Util/ScreenUtil.hpp | 224 +- include/Game/Util/SequenceUtil.hpp | 2 +- include/Game/Util/SoundUtil.hpp | 56 +- include/Game/Util/StarPointerUtil.hpp | 210 +- include/Game/Util/StringUtil.hpp | 4 +- .../Game/Util/SwitchEventFunctorListener.hpp | 8 +- include/Game/Util/SystemUtil.hpp | 66 +- include/Game/Util/TalkUtil.hpp | 118 +- include/Game/Util/TriangleFilter.hpp | 34 +- include/Game/Util/VectorUtil.hpp | 10 +- include/Inline.hpp | 8 +- include/math_types.hpp | 3 +- libs/JSystem/include/Inline.hpp | 8 +- .../JSystem/J2DGraph/J2DGrafContext.hpp | 53 +- .../JSystem/J2DGraph/J2DOrthoGraph.hpp | 4 +- .../JSystem/J3DGraphAnimator/J3DAnimation.hpp | 23 +- .../JSystem/J3DGraphAnimator/J3DJoint.hpp | 26 +- .../JSystem/J3DGraphAnimator/J3DJointTree.hpp | 34 +- .../J3DGraphAnimator/J3DMaterialAttach.hpp | 20 +- .../JSystem/J3DGraphAnimator/J3DModel.hpp | 40 +- .../JSystem/J3DGraphAnimator/J3DModelData.hpp | 20 +- .../JSystem/J3DGraphAnimator/J3DMtxBuffer.hpp | 22 +- .../JSystem/J3DGraphAnimator/J3DMtxCalc.hpp | 9 +- .../JSystem/J3DGraphBase/J3DDrawBuffer.hpp | 18 +- .../JSystem/J3DGraphBase/J3DDrawPacket.hpp | 12 +- .../JSystem/J3DGraphBase/J3DMatBlock.hpp | 146 +- .../JSystem/J3DGraphBase/J3DMatPacket.hpp | 28 +- .../JSystem/J3DGraphBase/J3DMaterial.hpp | 166 +- .../JSystem/J3DGraphBase/J3DPacket.hpp | 15 +- .../include/JSystem/J3DGraphBase/J3DShape.hpp | 47 +- .../JSystem/J3DGraphBase/J3DShapePacket.hpp | 8 +- .../JSystem/J3DGraphBase/J3DStruct.hpp | 61 +- .../include/JSystem/J3DGraphBase/J3DSys.hpp | 16 +- .../JSystem/J3DGraphBase/J3DTransform.hpp | 6 +- .../JSystem/J3DGraphBase/J3DVertex.hpp | 14 +- .../JSystem/J3DGraphLoader/J3DAnmLoader.hpp | 4 +- .../JSystem/J3DGraphLoader/J3DModelLoader.hpp | 90 +- .../JSystem/JAudio2/JAISoundHandles.hpp | 9 +- .../include/JSystem/JAudio2/JASAiCtrl.hpp | 2 +- .../JSystem/JAudio2/JASAudioReseter.hpp | 4 +- .../include/JSystem/JAudio2/JASBank.hpp | 1 - .../include/JSystem/JAudio2/JASCalc.hpp | 2 +- .../include/JSystem/JAudio2/JASChannel.hpp | 42 +- .../include/JSystem/JAudio2/JASDriverIF.hpp | 6 +- .../JSystem/JAudio2/JASDspInterface.hpp | 4 +- .../include/JSystem/JAudio2/JASGlobal.hpp | 2 +- .../include/JSystem/JAudio2/JASHeapCtrl.hpp | 31 +- .../include/JSystem/JAudio2/JASOscillator.hpp | 12 +- .../include/JSystem/JAudio2/JASReport.hpp | 2 +- .../include/JSystem/JAudio2/JASSeqCtrl.hpp | 73 +- .../include/JSystem/JAudio2/JASSeqParser.hpp | 181 +- .../include/JSystem/JAudio2/JASSeqReader.hpp | 27 +- .../JSystem/JAudio2/JASSeqRegisterParam.hpp | 22 +- .../include/JSystem/JAudio2/JASTaskThread.hpp | 6 +- .../include/JSystem/JAudio2/JASTrack.hpp | 351 +- .../include/JSystem/JAudio2/JASTrackPort.hpp | 4 +- .../JSystem/JAudio2/JAUSoundAnimator.hpp | 18 +- .../JSystem/JAudio2/JAUSoundObject.hpp | 23 +- .../include/JSystem/JGadget/hashcode.hpp | 2 +- .../include/JSystem/JGadget/linklist.hpp | 175 +- .../include/JSystem/JGadget/predicate.hpp | 36 +- .../include/JSystem/JGeometry/TBox.hpp | 37 +- .../include/JSystem/JGeometry/THex.hpp | 9 +- .../include/JSystem/JGeometry/TMatrix.hpp | 222 +- .../include/JSystem/JGeometry/TPartition3.hpp | 8 +- .../include/JSystem/JGeometry/TQuat.hpp | 47 +- .../include/JSystem/JGeometry/TUtil.hpp | 7 +- .../include/JSystem/JGeometry/TVec.hpp | 189 +- .../include/JSystem/JKernel/JKRAram.hpp | 2 +- .../JSystem/JKernel/JKRAramArchive.hpp | 14 +- .../include/JSystem/JKernel/JKRAramPiece.hpp | 12 +- .../include/JSystem/JKernel/JKRArchive.hpp | 169 +- .../JSystem/JKernel/JKRCompArchive.hpp | 10 +- .../include/JSystem/JKernel/JKRDecomp.hpp | 42 +- .../include/JSystem/JKernel/JKRDisposer.hpp | 4 +- .../include/JSystem/JKernel/JKRDvdArchive.hpp | 14 +- .../include/JSystem/JKernel/JKRDvdRipper.hpp | 8 +- .../include/JSystem/JKernel/JKRExpHeap.hpp | 92 +- .../include/JSystem/JKernel/JKRFileFinder.hpp | 24 +- .../include/JSystem/JKernel/JKRFileLoader.hpp | 46 +- .../include/JSystem/JKernel/JKRHeap.hpp | 129 +- .../include/JSystem/JKernel/JKRMemArchive.hpp | 28 +- .../include/JSystem/JKernel/JKRSolidHeap.hpp | 3 +- .../include/JSystem/JKernel/JKRThread.hpp | 37 +- .../include/JSystem/JKernel/JKRUnitHeap.hpp | 3 +- .../JSystem/JMath/JMATrigonometric.hpp | 47 +- libs/JSystem/include/JSystem/JMath/JMath.hpp | 98 +- libs/JSystem/include/JSystem/JMath/random.hpp | 6 +- .../include/JSystem/JParticle/JPAEmitter.hpp | 98 +- .../JSystem/JParticle/JPAEmitterCallback.hpp | 10 +- .../JSystem/JParticle/JPAEmitterManager.hpp | 30 +- .../JSystem/JParticle/JPAParticleCallBack.hpp | 6 +- .../JSystem/JParticle/JPAResourceManager.hpp | 14 +- .../JParticle/MultiEmitterCallBack.hpp | 2 +- .../JSystem/JSupport/JSUInputStream.hpp | 8 +- .../include/JSystem/JSupport/JSUIosBase.hpp | 1 - .../include/JSystem/JSupport/JSUList.hpp | 203 +- .../JSystem/JSupport/JSUMemoryInputStream.hpp | 17 +- .../JSupport/JSUMemoryOutputStream.hpp | 15 +- .../JSystem/JSupport/JSUOutputStream.hpp | 5 +- .../JSystem/JSupport/JSURandomInputStream.hpp | 2 +- .../JSupport/JSURandomOutputStream.hpp | 8 +- .../include/JSystem/JUtility/JUTConsole.hpp | 74 +- .../JSystem/JUtility/JUTDirectPrint.hpp | 35 +- .../include/JSystem/JUtility/JUTException.hpp | 71 +- .../include/JSystem/JUtility/JUTNameTab.hpp | 18 +- .../include/JSystem/JUtility/JUTPalette.hpp | 16 +- .../include/JSystem/JUtility/JUTTexture.hpp | 70 +- .../include/JSystem/JUtility/JUTVideo.hpp | 40 +- .../include/JSystem/JUtility/JUTXfb.hpp | 12 +- .../include/JSystem/JUtility/TColor.hpp | 4 +- libs/MSL_C++/include/functional.hpp | 27 +- src/Game/Animation/AnmPlayer.cpp | 26 +- src/Game/Animation/BckCtrl.cpp | 12 +- src/Game/Animation/BpkPlayer.cpp | 6 +- src/Game/Animation/BrkPlayer.cpp | 6 +- src/Game/Animation/BtkPlayer.cpp | 6 +- src/Game/Animation/BtpPlayer.cpp | 6 +- src/Game/Animation/BvaPlayer.cpp | 8 +- src/Game/Animation/LayoutAnmPlayer.cpp | 15 +- src/Game/Animation/XanimeCore.cpp | 5 +- src/Game/Animation/XanimePlayer.cpp | 2 +- src/Game/Animation/XanimeResource.cpp | 3 +- src/Game/AreaObj/AreaForm.cpp | 90 +- src/Game/AreaObj/AreaFormDrawer.cpp | 2 +- src/Game/AreaObj/AreaObj.cpp | 57 +- src/Game/AreaObj/AreaObjContainer.cpp | 416 +- src/Game/AreaObj/AreaObjFollower.cpp | 12 +- src/Game/AreaObj/AstroChangeStageCube.cpp | 132 +- src/Game/AreaObj/AudioEffectArea.cpp | 30 +- src/Game/AreaObj/BgmProhibitArea.cpp | 22 +- src/Game/AreaObj/BigBubbleCameraArea.cpp | 18 +- src/Game/AreaObj/BigBubbleGoalArea.cpp | 13 +- src/Game/AreaObj/BloomArea.cpp | 10 +- src/Game/AreaObj/CameraRepulsiveArea.cpp | 9 +- src/Game/AreaObj/ChangeBgmCube.cpp | 6 +- src/Game/AreaObj/CollisionArea.cpp | 30 +- src/Game/AreaObj/CubeCamera.cpp | 19 +- src/Game/AreaObj/DeathArea.cpp | 11 +- src/Game/AreaObj/DepthOfFieldArea.cpp | 9 +- src/Game/AreaObj/GlaringLightArea.cpp | 16 +- src/Game/AreaObj/HazeCube.cpp | 10 +- src/Game/AreaObj/ImageEffectArea.cpp | 9 +- src/Game/AreaObj/LightArea.cpp | 6 +- src/Game/AreaObj/LightAreaHolder.cpp | 15 +- src/Game/AreaObj/MercatorTransformCube.cpp | 16 +- src/Game/AreaObj/MessageArea.cpp | 6 +- src/Game/AreaObj/PlayerSeArea.cpp | 9 +- src/Game/AreaObj/QuakeEffectArea.cpp | 4 +- src/Game/AreaObj/RestartCube.cpp | 8 +- src/Game/AreaObj/ScreenBlurArea.cpp | 9 +- src/Game/AreaObj/SimpleBloomArea.cpp | 8 +- src/Game/AreaObj/SoundEmitterCube.cpp | 17 +- src/Game/AreaObj/SoundEmitterSphere.cpp | 12 +- src/Game/AreaObj/SpinGuidanceArea.cpp | 12 +- src/Game/AreaObj/SunLightArea.cpp | 9 +- src/Game/AreaObj/SwitchArea.cpp | 14 +- src/Game/AreaObj/WarpCube.cpp | 9 +- src/Game/AreaObj/WaterArea.cpp | 11 +- src/Game/AudioLib/AudRemixMgr.cpp | 33 +- src/Game/AudioLib/AudRemixSequencer.cpp | 94 +- src/Game/Boss/BossAccessor.cpp | 10 +- src/Game/Boss/BossBegomanHead.cpp | 29 +- src/Game/Boss/BossKameck.cpp | 49 +- src/Game/Boss/BossKameckAction.cpp | 15 +- src/Game/Boss/BossKameckBarrier.cpp | 7 +- src/Game/Boss/BossKameckBattleDemo.cpp | 37 +- src/Game/Boss/BossKameckBattlePattarn.cpp | 4 +- src/Game/Boss/BossKameckMoveRail.cpp | 8 +- src/Game/Boss/BossKameckSequencer.cpp | 15 +- src/Game/Boss/BossKameckStateBattle.cpp | 74 +- src/Game/Boss/BossKameckVs1.cpp | 26 +- src/Game/Boss/BossKameckVs2.cpp | 29 +- src/Game/Boss/KoopaSensorCtrl.cpp | 6 +- src/Game/Boss/SkeletalFishBaby.cpp | 90 +- src/Game/Boss/SkeletalFishBabyRail.cpp | 6 +- src/Game/Boss/SkeletalFishBabyRailHolder.cpp | 21 +- src/Game/Boss/SkeletalFishBoss.cpp | 175 +- .../Boss/SkeletalFishBossBattleDirector.cpp | 9 +- src/Game/Boss/SkeletalFishBossFunc.cpp | 4 +- src/Game/Boss/SkeletalFishBossInfo.cpp | 17 +- src/Game/Boss/SkeletalFishBossRail.cpp | 9 +- src/Game/Boss/SkeletalFishBossRailHolder.cpp | 8 +- src/Game/Boss/SkeletalFishGuard.cpp | 102 +- src/Game/Boss/SkeletalFishGuardHolder.cpp | 22 +- src/Game/Boss/SkeletalFishJointCalc.cpp | 10 +- src/Game/Boss/SkeletalFishRailControl.cpp | 136 +- src/Game/Boss/TripodBoss.cpp | 248 +- src/Game/Boss/TripodBossAccesser.cpp | 46 +- src/Game/Boss/TripodBossBaseJointPosition.cpp | 6 +- src/Game/Boss/TripodBossBreakMovement.cpp | 42 +- src/Game/Boss/TripodBossCoin.cpp | 24 +- src/Game/Boss/TripodBossCore.cpp | 19 +- src/Game/Boss/TripodBossFixParts.cpp | 90 +- src/Game/Boss/TripodBossFixPartsBase.cpp | 15 +- src/Game/Boss/TripodBossGuardWall.cpp | 38 +- src/Game/Boss/TripodBossGuardWallPart.cpp | 17 +- src/Game/Boss/TripodBossKillerGenerater.cpp | 37 +- .../Boss/TripodBossKillerGeneraterCircle.cpp | 52 +- src/Game/Boss/TripodBossKinokoOneUp.cpp | 10 +- src/Game/Boss/TripodBossLeg.cpp | 156 +- src/Game/Boss/TripodBossMovableArea.cpp | 32 +- src/Game/Boss/TripodBossRailMoveParts.cpp | 8 +- src/Game/Boss/TripodBossRotateParts.cpp | 11 +- src/Game/Boss/TripodBossShell.cpp | 11 +- src/Game/Boss/TripodBossStepPoint.cpp | 12 +- src/Game/Boss/TripodBossStepSequence.cpp | 4 +- src/Game/Boss/TripodBossStepStartArea.cpp | 6 +- src/Game/Camera/CamTranslatorAnim.cpp | 12 +- src/Game/Camera/CamTranslatorBehind.cpp | 30 +- src/Game/Camera/CamTranslatorBlackHole.cpp | 18 +- src/Game/Camera/CamTranslatorCharmedFix.cpp | 31 +- .../Camera/CamTranslatorCharmedTripodBoss.cpp | 25 +- .../Camera/CamTranslatorCharmedVecReg.cpp | 58 +- .../CamTranslatorCharmedVecRegTower.cpp | 56 +- src/Game/Camera/CamTranslatorCubePlanet.cpp | 28 +- src/Game/Camera/CamTranslatorDPD.cpp | 64 +- src/Game/Camera/CamTranslatorDead.cpp | 36 +- src/Game/Camera/CamTranslatorFix.cpp | 22 +- src/Game/Camera/CamTranslatorFixedPoint.cpp | 10 +- src/Game/Camera/CamTranslatorFixedThere.cpp | 20 +- src/Game/Camera/CamTranslatorFollow.cpp | 29 +- src/Game/Camera/CamTranslatorFooFighter.cpp | 32 +- .../Camera/CamTranslatorFooFighterPlanet.cpp | 32 +- src/Game/Camera/CamTranslatorFrontAndBack.cpp | 49 +- src/Game/Camera/CamTranslatorGround.cpp | 26 +- .../Camera/CamTranslatorInnerCylinder.cpp | 45 +- src/Game/Camera/CamTranslatorInwardSphere.cpp | 28 +- src/Game/Camera/CamTranslatorInwardTower.cpp | 37 +- src/Game/Camera/CamTranslatorMedianPlanet.cpp | 60 +- src/Game/Camera/CamTranslatorMedianTower.cpp | 44 +- .../Camera/CamTranslatorMtxRegParallel.cpp | 26 +- src/Game/Camera/CamTranslatorObjParallel.cpp | 28 +- src/Game/Camera/CamTranslatorParallel.cpp | 30 +- src/Game/Camera/CamTranslatorRaceFollow.cpp | 40 +- src/Game/Camera/CamTranslatorRailDemo.cpp | 19 +- src/Game/Camera/CamTranslatorRailFollow.cpp | 21 +- src/Game/Camera/CamTranslatorRailWatch.cpp | 21 +- src/Game/Camera/CamTranslatorSlide.cpp | 4 +- src/Game/Camera/CamTranslatorSpiral.cpp | 60 +- src/Game/Camera/CamTranslatorTalk.cpp | 17 +- src/Game/Camera/CamTranslatorTower.cpp | 32 +- src/Game/Camera/CamTranslatorTowerPos.cpp | 38 +- src/Game/Camera/CamTranslatorTripodBoss.cpp | 36 +- .../Camera/CamTranslatorTripodBossJoint.cpp | 38 +- src/Game/Camera/CamTranslatorTripodPlanet.cpp | 37 +- src/Game/Camera/CamTranslatorTrundle.cpp | 48 +- .../Camera/CamTranslatorTwistedPassage.cpp | 17 +- src/Game/Camera/CamTranslatorWaterFollow.cpp | 32 +- src/Game/Camera/CamTranslatorWaterPlanet.cpp | 32 +- .../Camera/CamTranslatorWaterPlanetBoss.cpp | 72 +- src/Game/Camera/CamTranslatorWonderPlanet.cpp | 32 +- src/Game/Camera/Camera.cpp | 23 +- src/Game/Camera/CameraAnim.cpp | 104 +- src/Game/Camera/CameraBehind.cpp | 6 +- src/Game/Camera/CameraBlackHole.cpp | 6 +- src/Game/Camera/CameraCharmedFix.cpp | 6 +- src/Game/Camera/CameraCharmedTripodBoss.cpp | 20 +- src/Game/Camera/CameraCharmedVecReg.cpp | 6 +- src/Game/Camera/CameraCharmedVecRegTower.cpp | 6 +- src/Game/Camera/CameraContext.cpp | 8 +- src/Game/Camera/CameraCover.cpp | 8 +- src/Game/Camera/CameraCubePlanet.cpp | 6 +- src/Game/Camera/CameraDPD.cpp | 6 +- src/Game/Camera/CameraDead.cpp | 6 +- src/Game/Camera/CameraDirector.cpp | 156 +- src/Game/Camera/CameraFix.cpp | 6 +- src/Game/Camera/CameraFixedPoint.cpp | 6 +- src/Game/Camera/CameraFixedThere.cpp | 6 +- src/Game/Camera/CameraFollow.cpp | 6 +- src/Game/Camera/CameraFooFighter.cpp | 6 +- src/Game/Camera/CameraFooFighterPlanet.cpp | 6 +- src/Game/Camera/CameraFrontAndBack.cpp | 6 +- src/Game/Camera/CameraGround.cpp | 6 +- src/Game/Camera/CameraHeightArrange.cpp | 21 +- src/Game/Camera/CameraHolder.cpp | 305 +- src/Game/Camera/CameraInnerCylinder.cpp | 6 +- src/Game/Camera/CameraInwardSphere.cpp | 6 +- src/Game/Camera/CameraInwardTower.cpp | 6 +- src/Game/Camera/CameraMan.cpp | 17 +- src/Game/Camera/CameraManEvent.cpp | 123 +- src/Game/Camera/CameraManGame.cpp | 196 +- src/Game/Camera/CameraManPause.cpp | 11 +- src/Game/Camera/CameraManSubjective.cpp | 8 +- src/Game/Camera/CameraMedianPlanet.cpp | 6 +- src/Game/Camera/CameraMedianTower.cpp | 6 +- src/Game/Camera/CameraMtxRegParallel.cpp | 6 +- src/Game/Camera/CameraObjParallel.cpp | 6 +- src/Game/Camera/CameraParallel.cpp | 6 +- src/Game/Camera/CameraParamChunk.cpp | 81 +- src/Game/Camera/CameraParamChunkHolder.cpp | 69 +- src/Game/Camera/CameraParamChunkID.cpp | 49 +- src/Game/Camera/CameraParamString.cpp | 11 +- src/Game/Camera/CameraPoseParam.cpp | 4 +- src/Game/Camera/CameraRaceFollow.cpp | 6 +- src/Game/Camera/CameraRailDemo.cpp | 27 +- src/Game/Camera/CameraRailFollow.cpp | 6 +- src/Game/Camera/CameraRailHolder.cpp | 3 +- src/Game/Camera/CameraRailWatch.cpp | 6 +- src/Game/Camera/CameraRegisterHolder.cpp | 27 +- src/Game/Camera/CameraShakePatternImpl.cpp | 18 +- src/Game/Camera/CameraShakeTask.cpp | 18 +- src/Game/Camera/CameraShaker.cpp | 40 +- src/Game/Camera/CameraSlide.cpp | 6 +- src/Game/Camera/CameraSpiral.cpp | 6 +- src/Game/Camera/CameraSubjective.cpp | 6 +- src/Game/Camera/CameraTalk.cpp | 6 +- src/Game/Camera/CameraTargetArg.cpp | 24 +- src/Game/Camera/CameraTargetHolder.cpp | 13 +- src/Game/Camera/CameraTargetMtx.cpp | 42 +- src/Game/Camera/CameraTargetObj.cpp | 50 +- src/Game/Camera/CameraTower.cpp | 6 +- src/Game/Camera/CameraTowerBase.cpp | 4 +- src/Game/Camera/CameraTowerPos.cpp | 6 +- src/Game/Camera/CameraTripodBoss.cpp | 6 +- src/Game/Camera/CameraTripodBossJoint.cpp | 6 +- src/Game/Camera/CameraTripodPlanet.cpp | 6 +- src/Game/Camera/CameraTrundle.cpp | 6 +- src/Game/Camera/CameraTwistedPassage.cpp | 6 +- src/Game/Camera/CameraWaterFollow.cpp | 9 +- src/Game/Camera/CameraWaterPlanet.cpp | 6 +- src/Game/Camera/CameraWaterPlanetBoss.cpp | 6 +- src/Game/Camera/CameraWonderPlanet.cpp | 6 +- src/Game/Camera/DotCamParams.cpp | 35 +- src/Game/Camera/GameCameraCreator.cpp | 4 +- src/Game/Camera/OnlyCamera.cpp | 4 +- src/Game/Demo/AstroDemoFunction.cpp | 4 +- src/Game/Demo/DemoActionKeeper.cpp | 19 +- src/Game/Demo/DemoCameraFunction.cpp | 2 +- src/Game/Demo/DemoCastGroup.cpp | 11 +- src/Game/Demo/DemoCastGroupHolder.cpp | 11 +- src/Game/Demo/DemoCastSubGroup.cpp | 8 +- src/Game/Demo/DemoCtrlBase.cpp | 4 +- src/Game/Demo/DemoExecutorFunction.cpp | 44 +- src/Game/Demo/DemoFunction.cpp | 71 +- src/Game/Demo/DemoPadRumbler.cpp | 12 +- src/Game/Demo/DemoParamCommonDataTable.cpp | 34 +- src/Game/Demo/DemoPlayerKeeper.cpp | 6 +- src/Game/Demo/DemoPositionController.cpp | 9 +- src/Game/Demo/DemoSimpleCastHolder.cpp | 6 +- src/Game/Demo/DemoStartRequestHolder.cpp | 3 +- src/Game/Demo/DemoSubPartKeeper.cpp | 8 +- src/Game/Demo/DemoTalkAnimCtrl.cpp | 2 +- src/Game/Demo/PrologueDirector.cpp | 49 +- src/Game/Effect/AstroEffectObj.cpp | 6 +- src/Game/Effect/EffectSystem.cpp | 3 +- .../Effect/MultiEmitterParticleCallBack.cpp | 3 - src/Game/Effect/ParticleEmitter.cpp | 10 +- src/Game/Effect/RandomEffectObj.cpp | 16 +- src/Game/Effect/SimpleEffectObj.cpp | 36 +- src/Game/Effect/SingleEmitter.cpp | 4 +- src/Game/Enemy/BallBeamer.cpp | 74 +- src/Game/Enemy/BasaBasa.cpp | 180 +- src/Game/Enemy/Birikyu.cpp | 89 +- src/Game/Enemy/BombTeresa.cpp | 129 +- src/Game/Enemy/Dossun.cpp | 20 +- src/Game/Enemy/ElectricPressureBullet.cpp | 33 +- src/Game/Enemy/EyeBeamer.cpp | 119 +- src/Game/Enemy/FireBall.cpp | 24 +- src/Game/Enemy/IceMerameraKing.cpp | 242 +- src/Game/Enemy/ItemGenerator.cpp | 13 +- src/Game/Enemy/Jiraira.cpp | 51 +- src/Game/Enemy/Karon.cpp | 59 +- src/Game/Enemy/Kuribo.cpp | 137 +- src/Game/Enemy/PackunPetit.cpp | 68 +- src/Game/Enemy/Poihana.cpp | 1002 +- src/Game/Enemy/RingBeam.cpp | 309 +- src/Game/Enemy/RingBeamer.cpp | 61 +- src/Game/Enemy/SearchBeamer.cpp | 2 +- src/Game/Enemy/SpinHitController.cpp | 29 +- src/Game/Enemy/TerritoryMover.cpp | 4 +- src/Game/Enemy/WalkerStateBindStarPointer.cpp | 17 +- src/Game/Enemy/WalkerStateBlowDamage.cpp | 11 +- src/Game/Enemy/WalkerStateChase.cpp | 13 +- src/Game/Enemy/WalkerStateFunction.cpp | 3 +- src/Game/GameAudio/AudEffectDirector.cpp | 29 +- src/Game/Gravity/ConeGravity.cpp | 115 +- src/Game/Gravity/CubeGravity.cpp | 295 +- src/Game/Gravity/DiskGravity.cpp | 51 +- src/Game/Gravity/DiskTorusGravity.cpp | 75 +- src/Game/Gravity/GlobalGravityObj.cpp | 175 +- src/Game/Gravity/GraviryFollower.cpp | 44 +- src/Game/Gravity/GravityCreator.cpp | 519 +- src/Game/Gravity/GravityInfo.cpp | 20 +- src/Game/Gravity/ParallelGravity.cpp | 43 +- src/Game/Gravity/PlanetGravity.cpp | 16 +- src/Game/Gravity/PlanetGravityManager.cpp | 165 +- src/Game/Gravity/PointGravity.cpp | 77 +- src/Game/Gravity/SegmentGravity.cpp | 106 +- src/Game/Gravity/WireGravity.cpp | 27 +- src/Game/LiveActor/ActiveActorList.cpp | 5 +- src/Game/LiveActor/ActorCameraInfo.cpp | 15 +- src/Game/LiveActor/ActorJointCtrl.cpp | 10 +- src/Game/LiveActor/ActorLightCtrl.cpp | 22 +- src/Game/LiveActor/ActorStateKeeper.cpp | 49 +- src/Game/LiveActor/AllLiveActorGroup.cpp | 12 +- src/Game/LiveActor/AnimationRandomPlayer.cpp | 6 +- src/Game/LiveActor/Binder.cpp | 10 +- src/Game/LiveActor/ClippingActorHolder.cpp | 45 +- src/Game/LiveActor/ClippingActorInfo.cpp | 22 +- src/Game/LiveActor/ClippingDirector.cpp | 25 +- src/Game/LiveActor/ClippingGroupHolder.cpp | 23 +- src/Game/LiveActor/ClippingJudge.cpp | 11 +- src/Game/LiveActor/DynamicJointCtrl.cpp | 29 +- src/Game/LiveActor/FaceJointCtrl.cpp | 2 +- src/Game/LiveActor/FlashingCtrl.cpp | 16 +- src/Game/LiveActor/HitSensor.cpp | 23 +- src/Game/LiveActor/HitSensorInfo.cpp | 3 +- src/Game/LiveActor/HitSensorKeeper.cpp | 14 +- src/Game/LiveActor/IKJointCtrl.cpp | 22 +- src/Game/LiveActor/LiveActor.cpp | 51 +- src/Game/LiveActor/LiveActorGroup.cpp | 6 +- src/Game/LiveActor/LiveActorGroupArray.cpp | 19 +- src/Game/LiveActor/LodCtrl.cpp | 39 +- src/Game/LiveActor/MaterialCtrl.cpp | 20 +- src/Game/LiveActor/MessageSensorHolder.cpp | 8 +- src/Game/LiveActor/MirrorActor.cpp | 21 +- src/Game/LiveActor/MirrorCamera.cpp | 15 +- src/Game/LiveActor/MirrorReflectionModel.cpp | 15 +- src/Game/LiveActor/ModelManager.cpp | 29 +- src/Game/LiveActor/ModelObj.cpp | 29 +- src/Game/LiveActor/Nerve.cpp | 2 +- src/Game/LiveActor/PartsModel.cpp | 27 +- src/Game/LiveActor/RailRider.cpp | 57 +- src/Game/LiveActor/SensorHitChecker.cpp | 54 +- src/Game/LiveActor/ShadowController.cpp | 56 +- src/Game/LiveActor/ShadowDrawer.cpp | 6 +- src/Game/LiveActor/ShadowSurfaceDrawer.cpp | 4 +- src/Game/LiveActor/ShadowVolumeBox.cpp | 3 +- src/Game/LiveActor/ShadowVolumeCylinder.cpp | 3 +- src/Game/LiveActor/ShadowVolumeDrawer.cpp | 15 +- src/Game/LiveActor/ShadowVolumeLine.cpp | 8 +- src/Game/LiveActor/ShadowVolumeModel.cpp | 5 +- src/Game/LiveActor/ShadowVolumeOval.cpp | 7 +- src/Game/LiveActor/ShadowVolumeOvalPole.cpp | 6 +- src/Game/LiveActor/ShadowVolumeSphere.cpp | 6 +- src/Game/LiveActor/Spine.cpp | 18 +- src/Game/LiveActor/SpotMarkLight.cpp | 7 +- src/Game/LiveActor/ViewGroupCtrl.cpp | 7 +- src/Game/LiveActor/VolumeModelDrawer.cpp | 8 +- src/Game/Map/ActorAppearSwitchListener.cpp | 10 +- src/Game/Map/Air.cpp | 44 +- src/Game/Map/BezierRail.cpp | 38 +- src/Game/Map/CollisionCategorizedKeeper.cpp | 8 +- src/Game/Map/CollisionCode.cpp | 38 +- src/Game/Map/CollisionDirector.cpp | 10 +- src/Game/Map/CollisionParts.cpp | 50 +- src/Game/Map/FileSelectEffect.cpp | 9 +- src/Game/Map/FileSelectFunc.cpp | 11 +- src/Game/Map/FileSelectIconID.cpp | 7 +- src/Game/Map/GroundChecker.cpp | 4 +- src/Game/Map/Halo.cpp | 48 +- src/Game/Map/HitInfo.cpp | 158 +- src/Game/Map/KCollision.cpp | 128 +- src/Game/Map/KCollisionPlus.cpp | 4 +- src/Game/Map/KoopaBattleMapPlate.cpp | 8 +- src/Game/Map/KoopaBattleMapStair.cpp | 52 +- src/Game/Map/LavaShellTower.cpp | 13 +- src/Game/Map/LavaSunPlanet.cpp | 14 +- src/Game/Map/LightDataHolder.cpp | 2 +- src/Game/Map/LightDirector.cpp | 3 +- src/Game/Map/LightFunction.cpp | 2 +- src/Game/Map/LightZoneDataHolder.cpp | 6 +- src/Game/Map/NamePosHolder.cpp | 7 +- src/Game/Map/OceanRing.cpp | 105 +- src/Game/Map/OceanRingBloomDrawer.cpp | 6 +- src/Game/Map/OceanRingDrawer.cpp | 35 +- src/Game/Map/OceanSphere.cpp | 4 +- src/Game/Map/PlanetMapCreator.cpp | 197 +- src/Game/Map/PlanetMapWithoutHighModel.cpp | 9 +- src/Game/Map/QuakeEffectGenerator.cpp | 15 +- src/Game/Map/RaceManager.cpp | 74 +- src/Game/Map/RaceRail.cpp | 22 +- src/Game/Map/RailGraph.cpp | 11 +- src/Game/Map/RailGraphEdge.cpp | 7 +- src/Game/Map/RailGraphIter.cpp | 12 +- src/Game/Map/RailPart.cpp | 25 +- src/Game/Map/ScenarioSelectStar.cpp | 47 +- src/Game/Map/SeaGull.cpp | 56 +- src/Game/Map/Sky.cpp | 33 +- src/Game/Map/SleepController.cpp | 13 +- src/Game/Map/SpaceInner.cpp | 16 +- src/Game/Map/SphereSelector.cpp | 3 +- src/Game/Map/StageSwitch.cpp | 67 +- src/Game/Map/SunshadeMapHolder.cpp | 10 +- src/Game/Map/SunshadeMapParts.cpp | 10 +- src/Game/Map/SwitchSynchronizer.cpp | 9 +- src/Game/Map/TimerSwitch.cpp | 6 +- src/Game/Map/WaterInfo.cpp | 2 +- src/Game/Map/WaterPoint.cpp | 5 +- src/Game/Map/WaterRoad.cpp | 30 +- src/Game/MapObj/AirBubble.cpp | 34 +- src/Game/MapObj/AirBubbleGenerator.cpp | 14 +- src/Game/MapObj/AirBubbleHolder.cpp | 14 +- src/Game/MapObj/AnmModelObj.cpp | 77 +- src/Game/MapObj/ArrowSwitch.cpp | 164 +- src/Game/MapObj/ArrowSwitchMulti.cpp | 39 +- src/Game/MapObj/ArrowSwitchMultiHolder.cpp | 14 +- src/Game/MapObj/AssemblyBlock.cpp | 37 +- src/Game/MapObj/AstroCore.cpp | 26 +- src/Game/MapObj/AstroCountDownPlate.cpp | 25 +- src/Game/MapObj/AstroDome.cpp | 19 +- src/Game/MapObj/AstroDomeAsteroid.cpp | 8 +- src/Game/MapObj/AstroDomeBlueStar.cpp | 14 +- src/Game/MapObj/AstroDomeCameraController.cpp | 14 +- src/Game/MapObj/AstroDomeComet.cpp | 16 +- src/Game/MapObj/AstroDomeDemoAstroGalaxy.cpp | 15 +- src/Game/MapObj/AstroDomeGalaxySelector.cpp | 31 +- src/Game/MapObj/AstroDomeOrbit.cpp | 43 +- src/Game/MapObj/AstroMapBoard.cpp | 12 +- src/Game/MapObj/AstroMapObj.cpp | 42 +- src/Game/MapObj/AstroMapObjFunction.cpp | 80 +- src/Game/MapObj/AstroOverlookObj.cpp | 7 +- src/Game/MapObj/BallOpener.cpp | 14 +- src/Game/MapObj/BallRail.cpp | 24 +- src/Game/MapObj/Banekiti.cpp | 45 +- src/Game/MapObj/BattleShipElevator.cpp | 23 +- src/Game/MapObj/BeamGoRoundPlanet.cpp | 20 +- src/Game/MapObj/BeeFlowerHover.cpp | 53 +- src/Game/MapObj/BenefitItemInvincible.cpp | 17 +- src/Game/MapObj/BenefitItemLifeUp.cpp | 10 +- src/Game/MapObj/BenefitItemObj.cpp | 208 +- src/Game/MapObj/BigBubbleDrawer.cpp | 10 +- src/Game/MapObj/BigBubbleMoveLimitter.cpp | 19 +- src/Game/MapObj/BigFan.cpp | 26 +- src/Game/MapObj/BigFanHolder.cpp | 12 +- src/Game/MapObj/BlackHole.cpp | 44 +- src/Game/MapObj/BlueChip.cpp | 5 +- src/Game/MapObj/BreakableCage.cpp | 95 +- src/Game/MapObj/BumpAppearPlanet.cpp | 8 +- src/Game/MapObj/Candlestand.cpp | 113 +- src/Game/MapObj/CannonFortressBreakStep.cpp | 15 +- src/Game/MapObj/CapsuleCage.cpp | 29 +- src/Game/MapObj/ChipBase.cpp | 63 +- src/Game/MapObj/ChipCounter.cpp | 30 +- src/Game/MapObj/ChipGroup.cpp | 13 +- src/Game/MapObj/ChipHolder.cpp | 49 +- src/Game/MapObj/ChooChooTrain.cpp | 10 +- src/Game/MapObj/CircleCoinGroup.cpp | 13 +- src/Game/MapObj/ClipArea.cpp | 11 +- src/Game/MapObj/ClipAreaDrop.cpp | 6 +- src/Game/MapObj/ClipAreaDropHolder.cpp | 9 +- src/Game/MapObj/ClipAreaDropLaser.cpp | 17 +- src/Game/MapObj/ClipAreaHolder.cpp | 12 +- src/Game/MapObj/ClipAreaMovable.cpp | 7 +- src/Game/MapObj/ClipAreaShape.cpp | 32 +- src/Game/MapObj/ClipFieldMapParts.cpp | 10 +- src/Game/MapObj/ClipFieldSwitch.cpp | 10 +- src/Game/MapObj/CocoNut.cpp | 1503 ++- src/Game/MapObj/CoconutTree.cpp | 7 +- src/Game/MapObj/Coin.cpp | 151 +- src/Game/MapObj/CoinBox.cpp | 23 +- src/Game/MapObj/CoinGroup.cpp | 43 +- src/Game/MapObj/CoinHolder.cpp | 29 +- src/Game/MapObj/CoinReplica.cpp | 9 +- src/Game/MapObj/CoinRotater.cpp | 6 +- src/Game/MapObj/CoinSpot.cpp | 23 +- src/Game/MapObj/CollapsePlane.cpp | 18 +- src/Game/MapObj/CollectCounter.cpp | 19 +- src/Game/MapObj/CollisionBlocker.cpp | 11 +- src/Game/MapObj/CrystalCage.cpp | 90 +- src/Game/MapObj/CrystalCageMoving.cpp | 69 +- src/Game/MapObj/CrystalSwitch.cpp | 25 +- src/Game/MapObj/CutBushModelObj.cpp | 9 +- src/Game/MapObj/DashRing.cpp | 15 +- src/Game/MapObj/DeadLeaves.cpp | 21 +- src/Game/MapObj/DesertLandMoveSwitch.cpp | 35 +- src/Game/MapObj/DesertMovingLand.cpp | 43 +- src/Game/MapObj/DynamicCollisionObj.cpp | 5 +- src/Game/MapObj/EarthenPipe.cpp | 72 +- src/Game/MapObj/ExterminationChecker.cpp | 24 +- src/Game/MapObj/FallingSmallRock.cpp | 11 +- src/Game/MapObj/FireBar.cpp | 28 +- src/Game/MapObj/FirePressure.cpp | 21 +- src/Game/MapObj/FirePressureBullet.cpp | 20 +- src/Game/MapObj/FirePressureBulletHolder.cpp | 7 +- src/Game/MapObj/FirePressureRadiate.cpp | 38 +- src/Game/MapObj/FlameGun.cpp | 49 +- src/Game/MapObj/FlipPanel.cpp | 129 +- src/Game/MapObj/FloaterFloatingForce.cpp | 10 +- .../MapObj/FloaterFloatingForceTypeNormal.cpp | 21 +- src/Game/MapObj/FloaterFunction.cpp | 165 +- src/Game/MapObj/Fountain.cpp | 37 +- src/Game/MapObj/FountainBig.cpp | 25 +- src/Game/MapObj/GCapture.cpp | 21 +- src/Game/MapObj/GeneralMapParts.cpp | 56 +- src/Game/MapObj/GreenCaterpillarBig.cpp | 55 +- src/Game/MapObj/HatchWaterPlanet.cpp | 15 +- src/Game/MapObj/HeavensDoorDemoObj.cpp | 30 +- src/Game/MapObj/HipDropMoveObj.cpp | 47 +- src/Game/MapObj/HipDropRock.cpp | 58 +- src/Game/MapObj/HipDropSwitch.cpp | 20 +- src/Game/MapObj/IceStep.cpp | 44 +- src/Game/MapObj/InvisiblePolygonObj.cpp | 21 +- .../MapObj/InvisiblePolygonObjGCapture.cpp | 6 +- src/Game/MapObj/ItemAppearStone.cpp | 12 +- src/Game/MapObj/ItemBlock.cpp | 381 +- src/Game/MapObj/KeySwitch.cpp | 33 +- src/Game/MapObj/KillerGunnerSingle.cpp | 11 +- src/Game/MapObj/LargeChain.cpp | 18 +- src/Game/MapObj/LargeChainParts.cpp | 12 +- src/Game/MapObj/LavaBallRisingPlanetLava.cpp | 12 +- src/Game/MapObj/LavaGalaxyParts.cpp | 8 +- src/Game/MapObj/LavaHomeVolcanoFlow.cpp | 17 +- src/Game/MapObj/LavaJamboSunPlanet.cpp | 10 +- src/Game/MapObj/LavaSteam.cpp | 63 +- src/Game/MapObj/LotusLeaf.cpp | 18 +- src/Game/MapObj/MagicBell.cpp | 24 +- src/Game/MapObj/ManholeCover.cpp | 4 +- src/Game/MapObj/MapObjActor.cpp | 107 +- src/Game/MapObj/MapObjActorInitInfo.cpp | 17 +- src/Game/MapObj/MapObjConnector.cpp | 2 +- src/Game/MapObj/MapParts.cpp | 16 +- src/Game/MapObj/MapPartsAppearController.cpp | 23 +- src/Game/MapObj/MapPartsBreaker.cpp | 9 +- src/Game/MapObj/MapPartsFloatingForce.cpp | 34 +- src/Game/MapObj/MapPartsFunction.cpp | 9 +- src/Game/MapObj/MapPartsRailGuideDrawer.cpp | 7 +- src/Game/MapObj/MapPartsRailGuideHolder.cpp | 7 +- src/Game/MapObj/MapPartsRailGuidePoint.cpp | 9 +- .../MapObj/MapPartsRailPointPassChecker.cpp | 9 +- src/Game/MapObj/MapPartsRotator.cpp | 86 +- src/Game/MapObj/MarblePlanet.cpp | 113 +- src/Game/MapObj/MarioLauncherAttractor.cpp | 62 +- src/Game/MapObj/MechaKoopaPartsArm.cpp | 47 +- src/Game/MapObj/MechaKoopaPartsHead.cpp | 38 +- src/Game/MapObj/MercatorFixParts.cpp | 11 +- src/Game/MapObj/MercatorRailMoveParts.cpp | 16 +- src/Game/MapObj/MercatorRotateParts.cpp | 19 +- src/Game/MapObj/MeteoContainer.cpp | 21 +- src/Game/MapObj/MiniatureGalaxy.cpp | 4 +- src/Game/MapObj/NeedlePlant.cpp | 25 +- src/Game/MapObj/NormalMapBase.cpp | 148 +- src/Game/MapObj/NormalMapTestObj.cpp | 9 +- src/Game/MapObj/Note.cpp | 16 +- src/Game/MapObj/NoteFairy.cpp | 135 +- src/Game/MapObj/PTimerSwitch.cpp | 211 +- src/Game/MapObj/PalmIsland.cpp | 9 +- src/Game/MapObj/PeachCastleGardenPlanet.cpp | 13 +- src/Game/MapObj/PhantomShipBridge.cpp | 29 +- src/Game/MapObj/PicketSwitch.cpp | 39 +- src/Game/MapObj/PowerStar.cpp | 207 +- src/Game/MapObj/PowerStarAppearPoint.cpp | 6 +- src/Game/MapObj/PowerStarHolder.cpp | 18 +- src/Game/MapObj/PressureBase.cpp | 81 +- src/Game/MapObj/PrizeRing.cpp | 75 +- src/Game/MapObj/PunchingKinoko.cpp | 104 +- src/Game/MapObj/PurpleCoinHolder.cpp | 10 +- src/Game/MapObj/PurpleCoinStarter.cpp | 10 +- .../MapObj/QuarterRollGravityRoomArrow.cpp | 9 +- src/Game/MapObj/RailMoveObj.cpp | 73 +- src/Game/MapObj/RainCloud.cpp | 50 +- src/Game/MapObj/ReverseGravityRoomPlanet.cpp | 21 +- src/Game/MapObj/RevolvingWay.cpp | 12 +- src/Game/MapObj/Rock.cpp | 141 +- src/Game/MapObj/RosettaChair.cpp | 11 +- src/Game/MapObj/RosettaPictureBook.cpp | 20 +- src/Game/MapObj/RotateMoveObj.cpp | 22 +- src/Game/MapObj/SandCapsuleInsidePlanet.cpp | 9 +- src/Game/MapObj/ScrewSwitch.cpp | 13 +- src/Game/MapObj/ShootingStar.cpp | 21 +- src/Game/MapObj/SimpleClipPartsObj.cpp | 15 +- src/Game/MapObj/SimpleFloaterObj.cpp | 17 +- src/Game/MapObj/SimpleMapObj.cpp | 75 +- src/Game/MapObj/SimpleNormalMapObj.cpp | 9 +- src/Game/MapObj/SimpleTimerObj.cpp | 13 +- src/Game/MapObj/SnowCapsulePlanet.cpp | 26 +- src/Game/MapObj/SnowMan.cpp | 23 +- src/Game/MapObj/SnowplowSwitch.cpp | 11 +- src/Game/MapObj/SoundEmitter.cpp | 84 +- src/Game/MapObj/SpaceMine.cpp | 19 +- src/Game/MapObj/SpiderMapBlock.cpp | 14 +- src/Game/MapObj/SpinDriver.cpp | 88 +- src/Game/MapObj/SpinDriverCamera.cpp | 26 +- src/Game/MapObj/SpinDriverOperateRing.cpp | 44 +- src/Game/MapObj/SpinDriverPathDrawer.cpp | 34 +- src/Game/MapObj/SpinDriverShootPath.cpp | 31 +- src/Game/MapObj/SpinLeverSwitch.cpp | 53 +- src/Game/MapObj/SubmarineVolcanoBigColumn.cpp | 15 +- src/Game/MapObj/Sun.cpp | 7 +- src/Game/MapObj/SuperSpinDriver.cpp | 31 +- src/Game/MapObj/SurprisedGalaxy.cpp | 48 +- src/Game/MapObj/Swinger.cpp | 11 +- src/Game/MapObj/SwitchBox.cpp | 259 +- src/Game/MapObj/TimeAppearObj.cpp | 13 +- src/Game/MapObj/TransparentWall.cpp | 9 +- src/Game/MapObj/TreasureBoxCracked.cpp | 4 +- src/Game/MapObj/TreasureSpot.cpp | 26 +- src/Game/MapObj/UFOBase.cpp | 81 +- src/Game/MapObj/UFOKinoko.cpp | 29 +- src/Game/MapObj/ValveSwitch.cpp | 18 +- src/Game/MapObj/WatchTowerRotateStep.cpp | 26 +- src/Game/MapObj/WaterLeakPipe.cpp | 29 +- src/Game/MapObj/WaterPressureBullet.cpp | 61 +- src/Game/MapObj/WaterPressureBulletHolder.cpp | 7 +- src/Game/MapObj/WaveFloatingForce.cpp | 2 +- src/Game/MapObj/YellowChip.cpp | 5 +- src/Game/NPC/Butler.cpp | 198 +- src/Game/NPC/ButlerExplain.cpp | 8 +- src/Game/NPC/ButlerMap.cpp | 56 +- src/Game/NPC/ButlerStateStarPieceReaction.cpp | 15 +- src/Game/NPC/CollectTico.cpp | 9 +- src/Game/NPC/CometEventExecutorTimeLimit.cpp | 10 +- src/Game/NPC/CometEventKeeper.cpp | 16 +- src/Game/NPC/EventDirector.cpp | 20 +- src/Game/NPC/HoneyBee.cpp | 157 +- src/Game/NPC/HoneyQueen.cpp | 25 +- src/Game/NPC/KinopioAstro.cpp | 5 +- src/Game/NPC/KoopaJr.cpp | 16 +- src/Game/NPC/LuigiNPC.cpp | 126 +- src/Game/NPC/MiiDatabase.cpp | 1 - src/Game/NPC/MiiFaceIcon.cpp | 36 +- src/Game/NPC/MiiFaceIconHolder.cpp | 13 +- src/Game/NPC/MiiFaceParts.cpp | 27 +- src/Game/NPC/MiiFacePartsHolder.cpp | 37 +- src/Game/NPC/MiiFaceRecipe.cpp | 13 +- src/Game/NPC/NPCActor.cpp | 17 +- src/Game/NPC/NPCSupportRail.cpp | 5 +- src/Game/NPC/Peach.cpp | 7 +- src/Game/NPC/PenguinMaster.cpp | 28 +- src/Game/NPC/PenguinStudent.cpp | 30 +- src/Game/NPC/PowerStarEventKeeper.cpp | 8 +- src/Game/NPC/RosettaReading.cpp | 21 +- src/Game/NPC/SignBoard.cpp | 12 +- src/Game/NPC/StageStateKeeper.cpp | 6 +- src/Game/NPC/TalkMessageCtrl.cpp | 162 +- src/Game/NPC/TalkMessageInfo.cpp | 18 +- src/Game/NPC/TalkNodeCtrl.cpp | 42 +- src/Game/NPC/TalkState.cpp | 55 +- src/Game/NPC/Tico.cpp | 134 +- src/Game/NPC/TicoAstro.cpp | 39 +- src/Game/NPC/TicoComet.cpp | 35 +- src/Game/NPC/TicoDemoGetPower.cpp | 10 +- src/Game/NPC/TicoDomeLecture.cpp | 19 +- src/Game/NPC/TicoFat.cpp | 193 +- src/Game/NPC/TicoGalaxy.cpp | 13 +- src/Game/NPC/TicoRail.cpp | 48 +- src/Game/NPC/TicoReading.cpp | 7 +- src/Game/NPC/TicoShop.cpp | 6 +- src/Game/NPC/TicoStarRing.cpp | 38 +- src/Game/NPC/TimeAttackEventKeeper.cpp | 7 +- src/Game/NPC/TrickRabbit.cpp | 177 +- src/Game/NPC/TrickRabbitFreeRun.cpp | 22 +- src/Game/NWC24/LuigiMailDirector.cpp | 44 +- src/Game/NWC24/NWC24Function.cpp | 12 +- src/Game/NWC24/NWC24Messenger.cpp | 175 +- src/Game/NWC24/NWC24SendThread.cpp | 28 +- src/Game/NWC24/NWC24System.cpp | 42 +- src/Game/NWC24/ReceiverTagMail.cpp | 14 +- src/Game/NWC24/UTF16Util.cpp | 4 +- src/Game/NameObj/ModelChangableObjFactory.cpp | 81 +- src/Game/NameObj/MovementOnOffGroupHolder.cpp | 16 +- src/Game/NameObj/NameObj.cpp | 16 +- src/Game/NameObj/NameObjAdaptor.cpp | 20 +- .../NameObj/NameObjArchiveListCollector.cpp | 2 +- src/Game/NameObj/NameObjCategoryList.cpp | 30 +- src/Game/NameObj/NameObjExecuteHolder.cpp | 93 +- src/Game/NameObj/NameObjFactory.cpp | 9653 ++++++++++++++--- src/Game/NameObj/NameObjFinder.cpp | 2 +- src/Game/NameObj/NameObjGroup.cpp | 5 +- src/Game/NameObj/NameObjHolder.cpp | 4 +- src/Game/NameObj/NameObjListExecutor.cpp | 32 +- src/Game/NameObj/NameObjRegister.cpp | 8 +- src/Game/Player/FireMarioBall.cpp | 34 +- src/Game/Player/GroupChecker.cpp | 18 +- src/Game/Player/Mario.cpp | 160 +- src/Game/Player/MarioActor.cpp | 334 +- src/Game/Player/MarioActorBlackHole.cpp | 79 +- src/Game/Player/MarioActorClap.cpp | 12 +- src/Game/Player/MarioActorDraw.cpp | 13 +- src/Game/Player/MarioActorInit.cpp | 3 +- src/Game/Player/MarioAnimator.cpp | 37 +- src/Game/Player/MarioConst.cpp | 6 +- src/Game/Player/MarioDamageStun.cpp | 8 +- src/Game/Player/MarioEffect.cpp | 6 +- src/Game/Player/MarioHolder.cpp | 12 +- src/Game/Player/MarioInit.cpp | 3 +- src/Game/Player/MarioMessenger.cpp | 8 +- src/Game/Player/MarioModule.cpp | 203 +- src/Game/Player/MarioMove2D.cpp | 3 +- src/Game/Player/MarioNullBck.cpp | 11 +- src/Game/Player/MarioSlip.cpp | 3 +- src/Game/Player/MarioSound.cpp | 2772 +++-- src/Game/Player/MarioState.cpp | 4 +- src/Game/Player/MarioSwim.cpp | 79 +- src/Game/Player/MarioSwimDamage.cpp | 6 +- src/Game/Player/MarioTask.cpp | 3 +- src/Game/RhythmLib/AudBgmTempoAdjuster.cpp | 4 +- src/Game/Ride/BigBubble.cpp | 17 +- src/Game/Ride/Pole.cpp | 220 +- src/Game/Ride/SphereAccelSensorController.cpp | 58 +- src/Game/Ride/SphereController.cpp | 7 +- src/Game/Ride/SpherePadController.cpp | 18 +- src/Game/Ride/SurfRay.cpp | 278 +- src/Game/Ride/SurfRayTutorial.cpp | 85 +- src/Game/Ride/Tamakoro.cpp | 305 +- src/Game/Ride/TamakoroTutorial.cpp | 83 +- src/Game/Scene/GameScene.cpp | 111 +- src/Game/Scene/GameSceneFunction.cpp | 4 +- src/Game/Scene/GameScenePauseControl.cpp | 8 +- .../GameSceneScenarioOpeningCameraState.cpp | 13 +- src/Game/Scene/IntermissionScene.cpp | 9 +- src/Game/Scene/LogoScene.cpp | 34 +- src/Game/Scene/MultiSceneActor.cpp | 25 +- src/Game/Scene/PlacementStateChecker.cpp | 10 +- src/Game/Scene/PlayTimerScene.cpp | 21 +- src/Game/Scene/ScenarioSelectScene.cpp | 51 +- src/Game/Scene/Scene.cpp | 10 +- src/Game/Scene/SceneDataInitializer.cpp | 6 +- src/Game/Scene/SceneExecutor.cpp | 7 +- src/Game/Scene/SceneFactory.cpp | 6 +- src/Game/Scene/SceneFunction.cpp | 3 +- src/Game/Scene/SceneNameObjListExecutor.cpp | 1066 +- .../Scene/SceneNameObjMovementController.cpp | 37 +- src/Game/Scene/SceneObjHolder.cpp | 2 +- src/Game/Scene/ScenePlayingResult.cpp | 13 +- src/Game/Scene/StageDataHolder.cpp | 83 +- src/Game/Scene/StageFileLoader.cpp | 14 +- src/Game/Scene/StageResourceLoader.cpp | 2 +- src/Game/Scene/StopSceneController.cpp | 13 +- src/Game/Screen/BackButton.cpp | 12 +- src/Game/Screen/BatteryInfo.cpp | 46 +- src/Game/Screen/BombTimerLayout.cpp | 13 +- src/Game/Screen/BrosButton.cpp | 15 +- src/Game/Screen/ButtonPaneController.cpp | 65 +- src/Game/Screen/CameraInfo.cpp | 36 +- src/Game/Screen/CaptureScreenDirector.cpp | 33 +- src/Game/Screen/CenterScreenBlur.cpp | 22 +- src/Game/Screen/CinemaFrame.cpp | 25 +- src/Game/Screen/CoinCounter.cpp | 35 +- src/Game/Screen/CometRetryButton.cpp | 23 +- src/Game/Screen/CountUpPaneRumbler.cpp | 9 +- src/Game/Screen/CounterLayoutAppearer.cpp | 16 +- src/Game/Screen/CounterLayoutController.cpp | 52 +- src/Game/Screen/EncouragePal60Window.cpp | 7 +- src/Game/Screen/ErrorMessageWindow.cpp | 18 +- src/Game/Screen/FileSelectButton.cpp | 11 +- src/Game/Screen/FileSelectInfo.cpp | 102 +- src/Game/Screen/FileSelectNumber.cpp | 48 +- src/Game/Screen/FullnessMeter.cpp | 19 +- src/Game/Screen/GalaxyCometScreenFilter.cpp | 7 +- src/Game/Screen/GalaxyConfirmLayout.cpp | 21 +- src/Game/Screen/GalaxyMapBackground.cpp | 5 +- src/Game/Screen/GalaxyMapCometIcon.cpp | 16 +- src/Game/Screen/GalaxyMapDomeIcon.cpp | 60 +- src/Game/Screen/GalaxyMapGalaxyPlain.cpp | 33 +- src/Game/Screen/GalaxyMapMarioIcon.cpp | 12 +- src/Game/Screen/GalaxyMapSelectButton.cpp | 16 +- src/Game/Screen/GalaxyMapTicoIcon.cpp | 24 +- src/Game/Screen/GalaxyMapTitle.cpp | 9 +- src/Game/Screen/GalaxyNamePlate.cpp | 29 +- src/Game/Screen/GalaxySelectBackButton.cpp | 8 +- src/Game/Screen/GamePauseSequence.cpp | 19 +- src/Game/Screen/GameSceneLayoutHolder.cpp | 31 +- src/Game/Screen/GameStageClearSequence.cpp | 13 +- src/Game/Screen/IconAButton.cpp | 23 +- src/Game/Screen/IconComet.cpp | 11 +- src/Game/Screen/ImageEffectBase.cpp | 20 +- src/Game/Screen/InformationMessage.cpp | 14 +- src/Game/Screen/InformationObserver.cpp | 32 +- src/Game/Screen/IsbnManager.cpp | 30 +- src/Game/Screen/LayoutActor.cpp | 26 +- src/Game/Screen/LayoutPaneCtrl.cpp | 21 +- src/Game/Screen/LogoFader.cpp | 16 +- src/Game/Screen/LuigiLetter.cpp | 21 +- src/Game/Screen/Manual2P.cpp | 32 +- src/Game/Screen/MarioMeter.cpp | 12 +- src/Game/Screen/MarioSubMeter.cpp | 7 +- .../Screen/MessageTagSkipTagProcessor.cpp | 14 +- src/Game/Screen/MiiConfirmIcon.cpp | 8 +- src/Game/Screen/MiiSelect.cpp | 43 +- src/Game/Screen/MiiSelectIcon.cpp | 39 +- src/Game/Screen/MissLayout.cpp | 10 +- src/Game/Screen/MoviePlayerSimple.cpp | 51 +- src/Game/Screen/MoviePlayingSequence.cpp | 46 +- src/Game/Screen/MovieStarter.cpp | 12 +- src/Game/Screen/MovieSubtitles.cpp | 15 +- src/Game/Screen/MovieSubtitlesDataTable.cpp | 38 +- src/Game/Screen/NoteCounter.cpp | 31 +- src/Game/Screen/OdhConverter.cpp | 37 +- src/Game/Screen/OneUpBoard.cpp | 14 +- src/Game/Screen/PauseMenu.cpp | 73 +- src/Game/Screen/PeachLetter.cpp | 10 +- src/Game/Screen/PictureBookCloseButton.cpp | 12 +- src/Game/Screen/PictureBookLayout.cpp | 164 +- src/Game/Screen/PlayerActionGuidance.cpp | 48 +- src/Game/Screen/PlayerLeft.cpp | 18 +- src/Game/Screen/PlayerMissLeft.cpp | 16 +- src/Game/Screen/PrologueLetter.cpp | 9 +- src/Game/Screen/ProloguePictureBook.cpp | 15 +- src/Game/Screen/PurpleCoinCounter.cpp | 27 +- src/Game/Screen/SaveIcon.cpp | 7 +- src/Game/Screen/ScenarioSelectLayout.cpp | 123 +- src/Game/Screen/ScenarioTitle.cpp | 9 +- src/Game/Screen/SceneWipeHolder.cpp | 7 +- src/Game/Screen/ScreenPreserver.cpp | 7 +- src/Game/Screen/SimpleLayout.cpp | 10 +- src/Game/Screen/StaffRoll.cpp | 111 +- src/Game/Screen/StageResultInformer.cpp | 59 +- src/Game/Screen/StarCounter.cpp | 13 +- src/Game/Screen/StarPieceCounter.cpp | 83 +- src/Game/Screen/SubMeterLayout.cpp | 78 +- src/Game/Screen/SuddenDeathMeter.cpp | 29 +- src/Game/Screen/SurfingGuidance.cpp | 16 +- src/Game/Screen/SysInfoWindow.cpp | 35 +- src/Game/Screen/THPSimplePlayerWrapper.cpp | 375 +- src/Game/Screen/TimeLimitLayout.cpp | 35 +- src/Game/Screen/TitleSequenceProduct.cpp | 43 +- src/Game/Screen/WipeFade.cpp | 11 +- src/Game/Screen/WipeGameOver.cpp | 9 +- src/Game/Screen/WipeHolderBase.cpp | 9 +- src/Game/Screen/WipeKoopa.cpp | 15 +- src/Game/Screen/YesNoController.cpp | 45 +- src/Game/Screen/YesNoLayout.cpp | 10 +- src/Game/Speaker/SpkData.cpp | 2 +- src/Game/Speaker/SpkMixingBuffer.cpp | 6 +- src/Game/Speaker/SpkSound.cpp | 22 +- src/Game/Speaker/SpkSpeakerCtrl.cpp | 100 +- src/Game/Speaker/SpkSystem.cpp | 16 +- src/Game/Speaker/SpkTable.cpp | 2 +- src/Game/Speaker/SpkWave.cpp | 6 +- src/Game/System/AlreadyDoneFlagInGalaxy.cpp | 17 +- src/Game/System/ArchiveHolder.cpp | 20 +- src/Game/System/BinaryDataChunkHolder.cpp | 2 +- src/Game/System/ConfigDataHolder.cpp | 16 +- src/Game/System/ConfigDataMii.cpp | 15 +- src/Game/System/ConfigDataMisc.cpp | 19 +- src/Game/System/DrawBufferGroup.cpp | 17 +- src/Game/System/DrawSyncManager.cpp | 1 - src/Game/System/FileHolder.cpp | 21 +- src/Game/System/FileLoader.cpp | 18 +- src/Game/System/FileLoaderThread.cpp | 14 +- src/Game/System/FileRipper.cpp | 114 +- .../System/FindingLuigiEventScheduler.cpp | 331 +- src/Game/System/FunctionAsyncExecutor.cpp | 67 +- src/Game/System/GalaxyCometScheduler.cpp | 371 +- src/Game/System/GalaxyCometState.cpp | 17 +- src/Game/System/GalaxyMoveArgument.cpp | 18 +- src/Game/System/GalaxyStatusAccessor.cpp | 83 +- src/Game/System/GameDataConst.cpp | 28 +- src/Game/System/GameEventFlag.cpp | 3 +- src/Game/System/GameEventFlagChecker.cpp | 100 +- src/Game/System/GameEventFlagStorage.cpp | 36 +- src/Game/System/GameEventFlagTable.cpp | 655 +- src/Game/System/GameSequenceDirector.cpp | 11 +- src/Game/System/GameSequenceFunction.cpp | 18 +- src/Game/System/GameSequenceProgress.cpp | 83 +- src/Game/System/GameSystem.cpp | 61 +- src/Game/System/GameSystemDimmingWatcher.cpp | 12 +- src/Game/System/GameSystemException.cpp | 10 +- src/Game/System/GameSystemFrameControl.cpp | 8 +- src/Game/System/GameSystemFunction.cpp | 11 +- src/Game/System/GameSystemObjHolder.cpp | 29 +- .../System/GameSystemResetAndPowerProcess.cpp | 39 +- src/Game/System/GameSystemSceneController.cpp | 146 +- .../GameSystemStationedArchiveLoader.cpp | 71 +- src/Game/System/HeapMemoryWatcher.cpp | 57 +- src/Game/System/HomeButtonMenuWrapper.cpp | 46 +- src/Game/System/HomeButtonStateNotifier.cpp | 7 +- src/Game/System/Language.cpp | 28 +- src/Game/System/LayoutHolder.cpp | 6 +- src/Game/System/LuigiLeftSupplier.cpp | 9 +- src/Game/System/MainLoopFramework.cpp | 137 +- src/Game/System/MessageHolder.cpp | 8 +- src/Game/System/NANDErrorSequence.cpp | 61 +- src/Game/System/NANDManager.cpp | 27 +- src/Game/System/NANDManagerThread.cpp | 24 +- src/Game/System/NerveExecutor.cpp | 5 +- src/Game/System/OSThreadWrapper.cpp | 12 +- src/Game/System/PauseButtonCheckerInGame.cpp | 14 +- src/Game/System/ResourceHolder.cpp | 6 +- src/Game/System/ResourceHolderManager.cpp | 47 +- src/Game/System/ResourceInfo.cpp | 20 +- src/Game/System/SaveDataHandleSequence.cpp | 110 +- src/Game/System/ScenarioDataParser.cpp | 11 +- src/Game/System/ScenarioProgressTestRun.cpp | 5 +- .../System/StageResultSequenceChecker.cpp | 11 +- src/Game/System/StationedArchiveLoader.cpp | 3 +- src/Game/System/StationedFileInfo.cpp | 1148 +- src/Game/System/SysConfigFile.cpp | 24 +- src/Game/System/UserFile.cpp | 21 +- src/Game/System/WPad.cpp | 48 +- src/Game/System/WPadButton.cpp | 20 +- src/Game/System/WPadHolder.cpp | 20 +- src/Game/System/WPadInfoChecker.cpp | 11 +- src/Game/System/WPadLeaveWatcher.cpp | 10 +- src/Game/System/WPadPointer.cpp | 14 +- src/Game/System/WPadRumble.cpp | 38 +- src/Game/System/WPadRumbleData.cpp | 5 +- src/Game/System/WPadStick.cpp | 40 +- src/Game/Util/ActorCameraUtil.cpp | 65 +- src/Game/Util/ActorMovementUtil.cpp | 369 +- src/Game/Util/ActorSensorUtil.cpp | 27 +- src/Game/Util/ActorShadowLocalUtil.cpp | 26 +- src/Game/Util/ActorShadowUtil.cpp | 159 +- src/Game/Util/ActorStateUtil.cpp | 2 +- src/Game/Util/ActorSwitchUtil.cpp | 82 +- src/Game/Util/AreaObjUtil.cpp | 48 +- .../Util/BaseMatrixFollowTargetHolder.cpp | 7 +- src/Game/Util/BitArray.cpp | 12 +- src/Game/Util/BothDirList.cpp | 30 +- src/Game/Util/CameraUtil.cpp | 85 +- src/Game/Util/DemoUtil.cpp | 133 +- src/Game/Util/DrawUtil.cpp | 4 +- src/Game/Util/EffectUtil.cpp | 113 +- src/Game/Util/EventUtil.cpp | 71 +- src/Game/Util/FileUtil.cpp | 188 +- src/Game/Util/FixedPosition.cpp | 10 +- src/Game/Util/GamePadUtil.cpp | 28 +- src/Game/Util/GravityUtil.cpp | 262 +- src/Game/Util/HashUtil.cpp | 30 +- src/Game/Util/IKJoint.cpp | 22 +- src/Game/Util/JMapInfo.cpp | 95 +- src/Game/Util/JMapUtil.cpp | 245 +- src/Game/Util/JointController.cpp | 4 +- src/Game/Util/JointUtil.cpp | 66 +- src/Game/Util/LayoutUtil.cpp | 12 +- src/Game/Util/LiveActorUtil.cpp | 300 +- src/Game/Util/MathUtil.cpp | 142 +- src/Game/Util/MemoryUtil.cpp | 21 +- src/Game/Util/ModelUtil.cpp | 18 +- src/Game/Util/MtxUtil.cpp | 18 +- src/Game/Util/NPCUtil.cpp | 61 +- src/Game/Util/NerveUtil.cpp | 2 +- src/Game/Util/ObjUtil.cpp | 194 +- src/Game/Util/ParabolicPath.cpp | 10 +- src/Game/Util/PostureHolder.cpp | 9 +- src/Game/Util/RumbleCalculator.cpp | 4 +- src/Game/Util/SceneUtil.cpp | 18 +- src/Game/Util/ScreenUtil.cpp | 26 +- src/Game/Util/SpringValue.cpp | 6 +- src/Game/Util/StringUtil.cpp | 24 +- src/Game/Util/SwitchEventFunctorListener.cpp | 4 +- src/Game/Util/SystemUtil.cpp | 9 +- src/Game/Util/TriggerChecker.cpp | 7 +- src/Game/Util/ValueControl.cpp | 12 +- src/JSystem/J3DGraphBase/J3DMaterial.cpp | 1 - src/JSystem/J3DGraphBase/J3DVertex.cpp | 1 - src/JSystem/J3DGraphLoader/J3DModelLoader.cpp | 2 +- src/JSystem/JAudio2/JASSeqCtrl.cpp | 160 +- src/JSystem/JAudio2/JASSeqParser.cpp | 1310 ++- src/JSystem/JAudio2/JASSeqReader.cpp | 128 +- src/JSystem/JAudio2/JASTrack.cpp | 475 +- src/JSystem/JAudio2/JASTrackPort.cpp | 2 +- src/JSystem/JGadget/hashcode.cpp | 14 +- src/JSystem/JGadget/linklist.cpp | 35 +- src/JSystem/JKernel/JKRAramArchive.cpp | 3 +- src/JSystem/JKernel/JKRArchivePri.cpp | 68 +- src/JSystem/JKernel/JKRArchivePub.cpp | 127 +- src/JSystem/JKernel/JKRDecomp.cpp | 75 +- src/JSystem/JKernel/JKRDisposer.cpp | 3 +- src/JSystem/JKernel/JKRDvdArchive.cpp | 3 +- src/JSystem/JKernel/JKRExpHeap.cpp | 40 +- src/JSystem/JKernel/JKRFileFinder.cpp | 3 +- src/JSystem/JKernel/JKRFileLoader.cpp | 18 +- src/JSystem/JKernel/JKRHeap.cpp | 85 +- src/JSystem/JKernel/JKRMemArchive.cpp | 127 +- src/JSystem/JKernel/JKRThread.cpp | 12 +- src/JSystem/JMath/random.cpp | 5 +- src/JSystem/JSupport/JSUInputStream.cpp | 2 +- src/JSystem/JSupport/JSUList.cpp | 27 +- src/JSystem/JSupport/JSUMemoryStream.cpp | 44 +- src/JSystem/JUtility/JUTConsole.cpp | 10 +- src/JSystem/JUtility/JUTException.cpp | 35 +- src/JSystem/JUtility/JUTTexture.cpp | 14 +- .../utils/gc/MWCriticalSection_gc.cpp | 6 +- src/RVL_SDK/os/init/__ppc_eabi_init.cpp | 44 +- src/Runtime/Gecko_ExceptionPPC.cpp | 11 +- src/Runtime/NMWException.cpp | 51 +- src/Runtime/__init_cpp_exceptions.cpp | 5 +- src/nw4r/lyt/lyt_animation.cpp | 19 +- src/nw4r/lyt/lyt_arcResourceAccessor.cpp | 37 +- src/nw4r/lyt/lyt_common.cpp | 32 +- src/nw4r/lyt/lyt_drawInfo.cpp | 8 +- src/nw4r/lyt/lyt_group.cpp | 14 +- src/nw4r/lyt/lyt_init.cpp | 4 +- src/nw4r/lyt/lyt_layout.cpp | 167 +- src/nw4r/lyt/lyt_resourceAccessor.cpp | 6 +- src/nw4r/lyt/lyt_texMap.cpp | 38 +- src/nw4r/ut/ut_CharStrmReader.cpp | 20 +- src/nw4r/ut/ut_LinkList.cpp | 43 +- src/nw4r/ut/ut_TagProcessorBase.cpp | 16 +- src/nw4r/ut/ut_binaryFileFormat.cpp | 6 +- 2143 files changed, 54267 insertions(+), 49946 deletions(-) create mode 100644 .clang-format create mode 100644 Doxyfile diff --git a/.clang-format b/.clang-format new file mode 100644 index 000000000..8a7176546 --- /dev/null +++ b/.clang-format @@ -0,0 +1,20 @@ +BasedOnStyle: LLVM +Language: Cpp +IndentWidth: 4 +TabWidth: 4 +UseTab: Never +ColumnLimit: 0 +PointerAlignment: Left +BreakBeforeBraces: Attach +AllowShortFunctionsOnASingleLine: Empty +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AccessModifierOffset: -4 +SortIncludes: false +NamespaceIndentation: All +IndentCaseLabels: false +SpaceBeforeParens: ControlStatements +SpacesInParentheses: false +SpacesInAngles: false +AlignConsecutiveDeclarations: true +AlignTrailingComments: true diff --git a/Doxyfile b/Doxyfile new file mode 100644 index 000000000..2c43342d3 --- /dev/null +++ b/Doxyfile @@ -0,0 +1,34 @@ +# Doxyfile 1.9.5 + +PROJECT_NAME = SMG-Decomp +PROJECT_BRIEF = "A decompilation of Super Mario Galaxy 1" +OUTPUT_DIRECTORY = doxygen +HTML_OUTPUT = . +EXTRACT_PRIVATE = YES +EXTRACT_PRIV_VIRTUAL = YES +EXTRACT_STATIC = YES +INPUT = src\Game \ + include\Game \ + README.md +FILE_PATTERNS = *.c \ + *.cpp \ + *.h \ + *.hpp \ + *.hpp \ + *.s +RECURSIVE = YES +USE_MDFILE_AS_MAINPAGE = README.md +HTML_COLORSTYLE = TOGGLE +GENERATE_LATEX = NO +HAVE_DOT = NO +COLLABORATION_GRAPH = NO +DIRECTORY_GRAPH = NO +INCLUDE_GRAPH = NO +INCLUDED_BY_GRAPH = NO +DOT_IMAGE_FORMAT = svg +SHOW_INCLUDE_FILES = NO +SHOW_USED_FILES = NO +SOURCE_BROWSER = YES +SOURCE_TOOLTIPS = YES +SORT_MEMBER_DOCS = NO +CALL_GRAPH = NO diff --git a/include/Game/Animation/AnmPlayer.hpp b/include/Game/Animation/AnmPlayer.hpp index e33c3aa98..49ad8aa77 100644 --- a/include/Game/Animation/AnmPlayer.hpp +++ b/include/Game/Animation/AnmPlayer.hpp @@ -9,29 +9,29 @@ class ResourceHolder; class AnmPlayerBase { public: - AnmPlayerBase(const ResTable *); + AnmPlayerBase(const ResTable*); - virtual void changeAnimation(J3DAnmBase *); + virtual void changeAnimation(J3DAnmBase*); virtual void stopAnimation(); void update(); void reflectFrame(); - void start(const char *); + void start(const char*); void stop(); - bool isPlaying(const char *) const; + bool isPlaying(const char*) const; bool isStop() const; - /* 0x4 */ J3DAnmBase* mAnmRes; + /* 0x4 */ J3DAnmBase* mAnmRes; /* 0x8 */ const ResTable* mResTable; - /* 0xC */ J3DFrameCtrl mFrameCtrl; + /* 0xC */ J3DFrameCtrl mFrameCtrl; }; class MaterialAnmPlayerBase : public AnmPlayerBase { public: - MaterialAnmPlayerBase(const ResTable *, J3DModelData *); + MaterialAnmPlayerBase(const ResTable*, J3DModelData*); - virtual void attach(J3DAnmBase *, J3DModelData *) = 0; - virtual void detach(J3DAnmBase *, J3DModelData *) = 0; + virtual void attach(J3DAnmBase*, J3DModelData*) = 0; + virtual void detach(J3DAnmBase*, J3DModelData*) = 0; void beginDiff(); void endDiff(); diff --git a/include/Game/Animation/BckCtrl.hpp b/include/Game/Animation/BckCtrl.hpp index b7630fea4..16dfbddfa 100644 --- a/include/Game/Animation/BckCtrl.hpp +++ b/include/Game/Animation/BckCtrl.hpp @@ -4,40 +4,40 @@ class XanimePlayer; -class BckCtrlData { +class BckCtrlData { public: // some callers inline this and some do not - BckCtrlData() : _0(""), mPlayFrame(-1), mStartFrame(-1), mEndFrame(-1), mRepeatFrame(-1), mInterpole(-1), mLoopMode(0xff) {} + BckCtrlData() + : _0(""), mPlayFrame(-1), mStartFrame(-1), mEndFrame(-1), mRepeatFrame(-1), mInterpole(-1), mLoopMode(0xff) {} - void operator=(const BckCtrlData &); + void operator=(const BckCtrlData&); const char* _0; - s16 mPlayFrame; // 0x4 - s16 mStartFrame; // 0x6 - s16 mEndFrame; // 0x8 - s16 mRepeatFrame; // 0xA - s16 mInterpole; // 0xC - u8 mLoopMode; // 0xE - u8 _F; - u8 _10; - u8 _11; + s16 mPlayFrame; // 0x4 + s16 mStartFrame; // 0x6 + s16 mEndFrame; // 0x8 + s16 mRepeatFrame; // 0xA + s16 mInterpole; // 0xC + u8 mLoopMode; // 0xE + u8 _F; + u8 _10; + u8 _11; }; class BckCtrlFunction { public: - static void reflectBckCtrlData(const BckCtrlData &, XanimePlayer *); + static void reflectBckCtrlData(const BckCtrlData&, XanimePlayer*); }; class BckCtrl { public: + BckCtrlData* find(const char*) const; + void add(const BckCtrlData&); + void overWrite(const BckCtrlData&); + void changeBckSetting(const char*, XanimePlayer*) const; - BckCtrlData* find(const char *) const; - void add(const BckCtrlData &); - void overWrite(const BckCtrlData &); - void changeBckSetting(const char *, XanimePlayer *) const; - - BckCtrlData mDefaultCtrlData; // 0x0 + BckCtrlData mDefaultCtrlData; // 0x0 BckCtrlData* mControlData; // 0x14 - u32 mControlDataCount; // 0x18 - u32 _1C; + u32 mControlDataCount; // 0x18 + u32 _1C; }; diff --git a/include/Game/Animation/BvaPlayer.hpp b/include/Game/Animation/BvaPlayer.hpp index 22bf09424..9127c88bb 100644 --- a/include/Game/Animation/BvaPlayer.hpp +++ b/include/Game/Animation/BvaPlayer.hpp @@ -10,7 +10,7 @@ class BvaPlayer : public AnmPlayerBase { public: BvaPlayer(const ResTable*, J3DModel*); - void calc(); + void calc(); J3DAnmVisibilityFull* getAnmVisibility(); private: diff --git a/include/Game/Animation/LayoutAnmPlayer.hpp b/include/Game/Animation/LayoutAnmPlayer.hpp index e67022d0a..a70886f62 100644 --- a/include/Game/Animation/LayoutAnmPlayer.hpp +++ b/include/Game/Animation/LayoutAnmPlayer.hpp @@ -6,7 +6,7 @@ namespace nw4r { namespace lyt { class AnimTransform; }; -}; +}; // namespace nw4r class LayoutManager; @@ -21,8 +21,8 @@ public: bool isStop() const; - /* 0x04 */ const char* mAnimName; + /* 0x04 */ const char* mAnimName; /* 0x08 */ nw4r::lyt::AnimTransform* mAnimTransform; - /* 0x0C */ const LayoutManager* mManager; - /* 0x10 */ J3DFrameCtrl mFrameCtrl; + /* 0x0C */ const LayoutManager* mManager; + /* 0x10 */ J3DFrameCtrl mFrameCtrl; }; diff --git a/include/Game/Animation/XanimeCore.hpp b/include/Game/Animation/XanimeCore.hpp index 5a61f8859..4f3c2e6a3 100644 --- a/include/Game/Animation/XanimeCore.hpp +++ b/include/Game/Animation/XanimeCore.hpp @@ -9,50 +9,50 @@ class XtransformInfo { public: XtransformInfo(); - XtransformInfo& operator=(const XtransformInfo &); + XtransformInfo& operator=(const XtransformInfo&); TVec3f _0; TVec3f _C; - f32 _18; - f32 _1C; - f32 _20; - f32 _24; + f32 _18; + f32 _1C; + f32 _20; + f32 _24; }; class XjointTransform { public: XjointTransform(); - u32 _0; - s16 _4; - f32 _8; - f32 _C; - f32 _10; - f32 _14; - f32 _18; - f32 _1C; - f32 _20; - f32 _24; - f32 _28; - f32 _2C; - f32 _30; - f32 _34; - f32 _38; - f32 _3C; - f32 _40; - f32 _44; - f32 _48; - f32 _4C; - u16 _50; - u16 _52; - u16 _54; - u16 _56; - f32 _58; - f32 _5C; - f32 _60; + u32 _0; + s16 _4; + f32 _8; + f32 _C; + f32 _10; + f32 _14; + f32 _18; + f32 _1C; + f32 _20; + f32 _24; + f32 _28; + f32 _2C; + f32 _30; + f32 _34; + f32 _38; + f32 _3C; + f32 _40; + f32 _44; + f32 _48; + f32 _4C; + u16 _50; + u16 _52; + u16 _54; + u16 _56; + f32 _58; + f32 _5C; + f32 _60; MtxPtr _64; - u32 _68; - u32 _6C; + u32 _68; + u32 _6C; }; class XjointInfo { @@ -61,9 +61,9 @@ public: XtransformInfo _0; XtransformInfo _28; - TVec3f _50; - f32 _5C; - f32 _60; + TVec3f _50; + f32 _5C; + f32 _60; }; class XanimeTrack { @@ -71,42 +71,42 @@ public: void init(); u32 _0; - f32 mWeight; // 0x4 + f32 mWeight; // 0x4 f32 _8; - u8 _C; + u8 _C; }; class XanimeCore : public J3DMtxCalc { public: XanimeCore(u32, u32, u8); - XanimeCore(u32, XanimeCore *); + XanimeCore(u32, XanimeCore*); virtual ~XanimeCore(); virtual void setWeight(u8, f32); - virtual void init(const Vec &, const Mtx &); + virtual void init(const Vec&, const Mtx&); virtual void calc(); - void shareJointTransform(const XanimeCore *); + void shareJointTransform(const XanimeCore*); void doFreeze(); - void setBck(u32, J3DAnmTransform *); + void setBck(u32, J3DAnmTransform*); - void enableJointTransform(J3DModelData *); + void enableJointTransform(J3DModelData*); void initMember(u32); XjointTransform* getJointTransform(u32); - u8 _4; - u8 mTrackCount; // 0x5 - u8 _6; - u32 mJointCount; // 0x8 - u16 _C; - XjointInfo* mJointList; // 0x10 - XjointTransform* mTransformList; // 0x14 // this is an array - XanimeTrack* mTrackList; // 0x18 - f32 _1C; - f32 _20; - f32 _24; - u8 _28; - u8 _29; + u8 _4; + u8 mTrackCount; // 0x5 + u8 _6; + u32 mJointCount; // 0x8 + u16 _C; + XjointInfo* mJointList; // 0x10 + XjointTransform* mTransformList; // 0x14 // this is an array + XanimeTrack* mTrackList; // 0x18 + f32 _1C; + f32 _20; + f32 _24; + u8 _28; + u8 _29; }; diff --git a/include/Game/Animation/XanimePlayer.hpp b/include/Game/Animation/XanimePlayer.hpp index faff26147..ede955de0 100644 --- a/include/Game/Animation/XanimePlayer.hpp +++ b/include/Game/Animation/XanimePlayer.hpp @@ -23,72 +23,74 @@ public: XanimePlayer(J3DModel*, XanimeResourceTable*); XanimePlayer(J3DModel*, XanimeResourceTable*, XanimePlayer*); - void init(); - void stopAnimation(); - void stopAnimation(const char*); - void changeTrackAnimation(u8, const char*); - void changeTrackAnimation(u8, u32); - void changeAnimationBck(const char*); - bool changeSimpleBck(const char*); - void changeAnimation(const char*); - void changeAnimationByHash(u32); - void swapFrameCtrl(const XanimeGroupInfo*); - void changeAnimation(const XanimeGroupInfo*); - void prepareAnimation(const XanimeGroupInfo*); - void runNextAnimation(); - void changeAnimationSimple(J3DAnmTransform*); - void changeSpeed(f32); - void changeInterpoleFrame(s32); - bool changeTrackWeight(u32, f32); - void calcAnm(u16); - void setModel(J3DModel*); - void overWriteMtxCalc(u16); - void clearMtxCalc(u16); - void clearAnm(u16); - void updateBeforeMovement(); - void updateAfterMovement(); - void updateInterpoleRatio(); - void getMainAnimationTrans(u32, TVec3f*) const; - bool isRun(const char*) const; - bool isTerminate(const char*) const; - bool isTerminate() const; - void setDefaultAnimation(const char*); - void runDefaultAnimation(); - bool isAnimationRunSimple() const; - const char* getCurrentAnimationName() const; - const char* getDefaultAnimationName() const; - const char* getCurrentBckName() const; - const char* getNameStringPointer(const char*) const; - bool checkPass(f32) const; + void init(); + void stopAnimation(); + void stopAnimation(const char*); + void changeTrackAnimation(u8, const char*); + void changeTrackAnimation(u8, u32); + void changeAnimationBck(const char*); + bool changeSimpleBck(const char*); + void changeAnimation(const char*); + void changeAnimationByHash(u32); + void swapFrameCtrl(const XanimeGroupInfo*); + void changeAnimation(const XanimeGroupInfo*); + void prepareAnimation(const XanimeGroupInfo*); + void runNextAnimation(); + void changeAnimationSimple(J3DAnmTransform*); + void changeSpeed(f32); + void changeInterpoleFrame(s32); + bool changeTrackWeight(u32, f32); + void calcAnm(u16); + void setModel(J3DModel*); + void overWriteMtxCalc(u16); + void clearMtxCalc(u16); + void clearAnm(u16); + void updateBeforeMovement(); + void updateAfterMovement(); + void updateInterpoleRatio(); + void getMainAnimationTrans(u32, TVec3f*) const; + bool isRun(const char*) const; + bool isTerminate(const char*) const; + bool isTerminate() const; + void setDefaultAnimation(const char*); + void runDefaultAnimation(); + bool isAnimationRunSimple() const; + const char* getCurrentAnimationName() const; + const char* getDefaultAnimationName() const; + const char* getCurrentBckName() const; + const char* getNameStringPointer(const char*) const; + bool checkPass(f32) const; const XanimeGroupInfo* getSimpleGroup() const; - void duplicateSimpleGroup(); - void changeCurrentAnimation(const XanimeGroupInfo*); + void duplicateSimpleGroup(); + void changeCurrentAnimation(const XanimeGroupInfo*); - inline XanimeCore* getCore() { return mCore; } + inline XanimeCore* getCore() { + return mCore; + } - /* 0x00 */ J3DModel* mModel; - /* 0x04 */ J3DModelData* mModelData; - /* 0x08 */ f32 _08; - /* 0x0C */ f32 _0C; - /* 0x10 */ f32 _10[4]; - /* 0x20 */ XanimeFrameCtrl* _20; - /* 0x24 */ XanimeFrameCtrl _24[2]; - /* 0x54 */ u8 _54; - /* 0x55 */ u8 _55; - /* 0x58 */ const char* mCurrentBckName; + /* 0x00 */ J3DModel* mModel; + /* 0x04 */ J3DModelData* mModelData; + /* 0x08 */ f32 _08; + /* 0x0C */ f32 _0C; + /* 0x10 */ f32 _10[4]; + /* 0x20 */ XanimeFrameCtrl* _20; + /* 0x24 */ XanimeFrameCtrl _24[2]; + /* 0x54 */ u8 _54; + /* 0x55 */ u8 _55; + /* 0x58 */ const char* mCurrentBckName; /* 0x5C */ const XanimeGroupInfo* mDefaultAnimation; /* 0x60 */ const XanimeGroupInfo* mCurrentAnimation; /* 0x64 */ const XanimeGroupInfo* mPrevAnimation; /* 0x68 */ const XanimeGroupInfo* _68; - /* 0x6C */ XanimeCore* mCore; - /* 0x70 */ XanimeResourceTable* mResourceTable; - /* 0x74 */ XanimeGroupInfo* _74; - /* 0x78 */ s32 _78; - /* 0x7C */ u8 _7C; - /* 0x7D */ u8 _7D; - /* 0x7E */ u8 _7E; - /* 0x7F */ u8 _7F; - /* 0x80 */ u8 _80; - /* 0x84 */ f32 _84; - /* 0x88 */ u8 _88; + /* 0x6C */ XanimeCore* mCore; + /* 0x70 */ XanimeResourceTable* mResourceTable; + /* 0x74 */ XanimeGroupInfo* _74; + /* 0x78 */ s32 _78; + /* 0x7C */ u8 _7C; + /* 0x7D */ u8 _7D; + /* 0x7E */ u8 _7E; + /* 0x7F */ u8 _7F; + /* 0x80 */ u8 _80; + /* 0x84 */ f32 _84; + /* 0x88 */ u8 _88; }; diff --git a/include/Game/Animation/XanimeResource.hpp b/include/Game/Animation/XanimeResource.hpp index 785cdcd42..c89dc446e 100644 --- a/include/Game/Animation/XanimeResource.hpp +++ b/include/Game/Animation/XanimeResource.hpp @@ -6,90 +6,90 @@ class ResourceHolder; class XanimeSwapTable { public: - const char *original; - const char *swapped; + const char* original; + const char* swapped; }; class XanimeBckTable { public: - const char *animationName; + const char* animationName; }; class XanimeGroupInfo { public: - XanimeBckTable mParent; // 0x0 - f32 _4; - u32 _8; - f32 _C; - f32 _10; - f32 _14; - u32 _18; - u8 _1C; - u8 _1D; - u32 _20[4]; - f32 _30[4]; - u32 _40; - u32 _44; - const char *_48; + XanimeBckTable mParent; // 0x0 + f32 _4; + u32 _8; + f32 _C; + f32 _10; + f32 _14; + u32 _18; + u8 _1C; + u8 _1D; + u32 _20[4]; + f32 _30[4]; + u32 _40; + u32 _44; + const char* _48; void init(); }; class XanimeSingleBckTable { public: - XanimeBckTable parent; // 0x0 + XanimeBckTable parent; // 0x0 - const char *fileName; // 0x4 - u32 animationHash; // 0x8 - u32 fileHash; // 0xC + const char* fileName; // 0x4 + u32 animationHash; // 0x8 + u32 fileHash; // 0xC }; class XanimeDoubleBckTable { public: - XanimeBckTable parent; // 0x0 + XanimeBckTable parent; // 0x0 - const char *fileName1; // 0x4 - f32 _8; + const char* fileName1; // 0x4 + f32 _8; - const char *fileName2; // 0xC - f32 _10; + const char* fileName2; // 0xC + f32 _10; }; class XanimeTripleBckTable { public: - XanimeBckTable parent; // 0x0 + XanimeBckTable parent; // 0x0 - const char *fileName1; // 0x4 - f32 _8; + const char* fileName1; // 0x4 + f32 _8; - const char *fileName2; // 0xC - f32 _10; + const char* fileName2; // 0xC + f32 _10; - const char *fileName3; // 0x14; - f32 _18; + const char* fileName3; // 0x14; + f32 _18; }; class XanimeQuadBckTable { public: - XanimeBckTable parent; // 0x0 + XanimeBckTable parent; // 0x0 - const char *fileName1; // 0x4 - f32 _8; + const char* fileName1; // 0x4 + f32 _8; - const char *fileName2; // 0xC - f32 _10; + const char* fileName2; // 0xC + f32 _10; - const char *fileName3; // 0x14; - f32 _18; + const char* fileName3; // 0x14; + f32 _18; - const char *fileName4; // 0x1C; - f32 _20; + const char* fileName4; // 0x1C; + f32 _20; }; // Size is 0x14 class XanimeOfsInfo { public: - XanimeBckTable parent; // 0x0 + XanimeBckTable parent; // 0x0 f32 _4; f32 _8; @@ -100,9 +100,9 @@ public: // size is 0x18 class XanimeAuxInfo { public: - XanimeBckTable parent; // 0x0 + XanimeBckTable parent; // 0x0 - u8 _4; + u8 _4; u32 _8; // Unreferenced members @@ -113,17 +113,17 @@ class XanimeResourceTable { public: XanimeResourceTable( - ResourceHolder *, + ResourceHolder*, - XanimeGroupInfo *, XanimeAuxInfo *, XanimeOfsInfo *, + XanimeGroupInfo*, XanimeAuxInfo*, XanimeOfsInfo*, - XanimeBckTable *, XanimeBckTable *, XanimeBckTable *, XanimeBckTable *, + XanimeBckTable*, XanimeBckTable*, XanimeBckTable*, XanimeBckTable*, - XanimeSwapTable *); + XanimeSwapTable*); - XanimeResourceTable(ResourceHolder *); + XanimeResourceTable(ResourceHolder*); - const XanimeGroupInfo *getGroupInfo(const char *) const; + const XanimeGroupInfo* getGroupInfo(const char*) const; u8 _0[0x78]; }; diff --git a/include/Game/AreaObj/AreaForm.hpp b/include/Game/AreaObj/AreaForm.hpp index f9b5921f7..a8178945c 100644 --- a/include/Game/AreaObj/AreaForm.hpp +++ b/include/Game/AreaObj/AreaForm.hpp @@ -6,8 +6,8 @@ class AreaForm { public: - virtual void init(const JMapInfoIter &); - virtual bool isInVolume(const TVec3f &) const; + virtual void init(const JMapInfoIter&); + virtual bool isInVolume(const TVec3f&) const; TPos3f* _4; }; @@ -16,67 +16,67 @@ class AreaFormCube : public AreaForm { public: AreaFormCube(int); - virtual void init(const JMapInfoIter &); - virtual bool isInVolume(const TVec3f &) const; + virtual void init(const JMapInfoIter&); + virtual bool isInVolume(const TVec3f&) const; - void calcWorldPos(TVec3f *) const; - void calcWorldBox(TDirBox3f *) const; - void calcLocalPos(TVec3f *, const TVec3f &) const; - f32 getBaseSize(); + void calcWorldPos(TVec3f*) const; + void calcWorldBox(TDirBox3f*) const; + void calcLocalPos(TVec3f*, const TVec3f&) const; + f32 getBaseSize(); void updateBoxParam(); - void calcWorldMtx(TPos3f *) const; + void calcWorldMtx(TPos3f*) const; - int _8; - TVec3f mTranslation; // 0xC - TVec3f mRotation; // 0x18 - TVec3f mScale; // 0x24 - TBox3f mBounding; // 0x30 - Mtx _48; + int _8; + TVec3f mTranslation; // 0xC + TVec3f mRotation; // 0x18 + TVec3f mScale; // 0x24 + TBox3f mBounding; // 0x30 + Mtx _48; }; class AreaFormSphere : public AreaForm { public: AreaFormSphere(); - virtual void init(const JMapInfoIter &); - virtual bool isInVolume(const TVec3f &) const; + virtual void init(const JMapInfoIter&); + virtual bool isInVolume(const TVec3f&) const; - void calcUpVec(TVec3f *) const; - void calcPos(TVec3f *) const; + void calcUpVec(TVec3f*) const; + void calcPos(TVec3f*) const; - TVec3f mTranslation; // 0x8 - f32 _14; - TVec3f mUp; // 0x18 + TVec3f mTranslation; // 0x8 + f32 _14; + TVec3f mUp; // 0x18 }; class AreaFormBowl : public AreaForm { public: AreaFormBowl(); - virtual void init(const JMapInfoIter &); - virtual bool isInVolume(const TVec3f &) const; + virtual void init(const JMapInfoIter&); + virtual bool isInVolume(const TVec3f&) const; - void calcUpVec(const TVec3f &); + void calcUpVec(const TVec3f&); - TVec3f mTranslation; // 0x8 - TVec3f mUp; // 0x14 - f32 _20; + TVec3f mTranslation; // 0x8 + TVec3f mUp; // 0x14 + f32 _20; }; class AreaFormCylinder : public AreaForm { public: AreaFormCylinder(); - virtual void init(const JMapInfoIter &); - virtual bool isInVolume(const TVec3f &) const; + virtual void init(const JMapInfoIter&); + virtual bool isInVolume(const TVec3f&) const; - void calcPos(TVec3f *) const; - void calcCenterPos(TVec3f *) const; - void calcUpVec(TVec3f *) const; - void calcDir(const TVec3f &); + void calcPos(TVec3f*) const; + void calcCenterPos(TVec3f*) const; + void calcUpVec(TVec3f*) const; + void calcDir(const TVec3f&); - TVec3f mTranslation; // 0x8 - TVec3f mRotation; // 0x14 - f32 _20; - f32 _24; + TVec3f mTranslation; // 0x8 + TVec3f mRotation; // 0x14 + f32 _20; + f32 _24; }; \ No newline at end of file diff --git a/include/Game/AreaObj/AreaObj.hpp b/include/Game/AreaObj/AreaObj.hpp index d6f8177e7..de0770c1c 100644 --- a/include/Game/AreaObj/AreaObj.hpp +++ b/include/Game/AreaObj/AreaObj.hpp @@ -11,24 +11,23 @@ class StageSwitchCtrl; class AreaObj : public NameObj { public: - AreaObj(int, const char *); + AreaObj(int, const char*); virtual ~AreaObj() { - } - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - virtual bool isInVolume(const TVec3f &) const; + virtual bool isInVolume(const TVec3f&) const; virtual const char* getManagerName() const; - void onSwitchA(); - void offSwitchA(); - bool isOnSwitchA() const; - bool isOnSwitchB() const; - bool isValidSwitchA() const; - bool isValidSwitchB() const; - void setFollowMtx(const TPos3f *); + void onSwitchA(); + void offSwitchA(); + bool isOnSwitchA() const; + bool isOnSwitchB() const; + bool isValidSwitchA() const; + bool isValidSwitchB() const; + void setFollowMtx(const TPos3f*); TPos3f* getFollowMtx() const; void validate(); @@ -39,31 +38,31 @@ public: void awake(); void sleep(); - AreaForm* mForm; // 0xC - int mType; // 0x10 - bool mIsValid; // 0x14 - bool _15; - bool mIsAwake; // 0x16 - s32 mObjArg0; // 0x18 - s32 mObjArg1; // 0x1C - s32 mObjArg2; // 0x20 - s32 mObjArg3; // 0x24 - s32 mObjArg4; // 0x28 - s32 mObjArg5; // 0x2C - s32 mObjArg6; // 0x30 - s32 mObjArg7; // 0x34 + AreaForm* mForm; // 0xC + int mType; // 0x10 + bool mIsValid; // 0x14 + bool _15; + bool mIsAwake; // 0x16 + s32 mObjArg0; // 0x18 + s32 mObjArg1; // 0x1C + s32 mObjArg2; // 0x20 + s32 mObjArg3; // 0x24 + s32 mObjArg4; // 0x28 + s32 mObjArg5; // 0x2C + s32 mObjArg6; // 0x30 + s32 mObjArg7; // 0x34 StageSwitchCtrl* mSwitchCtrl; // 0x38 }; class AreaObjMgr : public NameObj { public: - AreaObjMgr(s32, const char *); + AreaObjMgr(s32, const char*); virtual ~AreaObjMgr(); - void entry(AreaObj *); - AreaObj* find_in(const TVec3f &) const; + void entry(AreaObj*); + AreaObj* find_in(const TVec3f&) const; - MR::Vector > mArray; // 0xC - s32 _18; + MR::Vector> mArray; // 0xC + s32 _18; }; diff --git a/include/Game/AreaObj/AreaObjContainer.hpp b/include/Game/AreaObj/AreaObjContainer.hpp index 27d3f8493..1b0d32e54 100644 --- a/include/Game/AreaObj/AreaObjContainer.hpp +++ b/include/Game/AreaObj/AreaObjContainer.hpp @@ -6,11 +6,11 @@ class AreaObj; class AreaObjMgr; -typedef AreaObjMgr* (*ManagerCreatorFuncPtr)(s32, const char *); +typedef AreaObjMgr* (*ManagerCreatorFuncPtr)(s32, const char*); struct Name2CreateManagerFunc { - /* 0x0 */ const char* mName; - /* 0x4 */ s32 _4; + /* 0x0 */ const char* mName; + /* 0x4 */ s32 _4; /* 0x8 */ ManagerCreatorFuncPtr mCreateFunc; }; @@ -27,12 +27,12 @@ public: /// @param rIter The reference to an iterator over a `JMapInfo`. virtual void init(const JMapInfoIter& rIter); - AreaObjMgr* getManager(const char *) const; - AreaObj* getAreaObj(const char *, const TVec3f &) const; + AreaObjMgr* getManager(const char*) const; + AreaObj* getAreaObj(const char*, const TVec3f&) const; private: /* 0x00C */ AreaObjMgr* mManagerArray[0x50]; - /* 0x14C */ u32 mNumManagers; + /* 0x14C */ u32 mNumManagers; }; namespace MR { diff --git a/include/Game/AreaObj/AreaObjFollower.hpp b/include/Game/AreaObj/AreaObjFollower.hpp index d07212541..cbdf58d33 100644 --- a/include/Game/AreaObj/AreaObjFollower.hpp +++ b/include/Game/AreaObj/AreaObjFollower.hpp @@ -6,14 +6,14 @@ class AreaObjFollower : public BaseMatrixFollower { public: - AreaObjFollower(AreaObj *, const JMapInfoIter &); + AreaObjFollower(AreaObj*, const JMapInfoIter&); virtual void update(); - TPos3f mFollowMtx; // 0x14 - AreaObj* mObj; // 0x44 + TPos3f mFollowMtx; // 0x14 + AreaObj* mObj; // 0x44 }; namespace MR { - bool addBaseMatrixFollowerAreaObj(AreaObj *, const JMapInfoIter &); + bool addBaseMatrixFollowerAreaObj(AreaObj*, const JMapInfoIter&); }; diff --git a/include/Game/AreaObj/AstroChangeStageCube.hpp b/include/Game/AreaObj/AstroChangeStageCube.hpp index 6737c8862..aa845c895 100644 --- a/include/Game/AreaObj/AstroChangeStageCube.hpp +++ b/include/Game/AreaObj/AstroChangeStageCube.hpp @@ -4,15 +4,14 @@ class AstroChangeStageCube : public AreaObj { public: - AstroChangeStageCube(int, const char *); + AstroChangeStageCube(int, const char*); virtual ~AstroChangeStageCube() { - } - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); - virtual bool isInVolume(const TVec3f &) const; + virtual bool isInVolume(const TVec3f&) const; u32 _3C; u32 _40; diff --git a/include/Game/AreaObj/AudioEffectArea.hpp b/include/Game/AreaObj/AudioEffectArea.hpp index c17c8d29c..7d25bbf97 100644 --- a/include/Game/AreaObj/AudioEffectArea.hpp +++ b/include/Game/AreaObj/AudioEffectArea.hpp @@ -4,14 +4,13 @@ class AudioEffectArea : public AreaObj { public: - AudioEffectArea(int, const char *); + AudioEffectArea(int, const char*); virtual ~AudioEffectArea() { - } - virtual void init(const JMapInfoIter &); - virtual void movement(); + virtual void init(const JMapInfoIter&); + virtual void movement(); virtual const char* getManagerName() const; s32 _3C; diff --git a/include/Game/AreaObj/BgmProhibitArea.hpp b/include/Game/AreaObj/BgmProhibitArea.hpp index 2362732f6..c7b734902 100644 --- a/include/Game/AreaObj/BgmProhibitArea.hpp +++ b/include/Game/AreaObj/BgmProhibitArea.hpp @@ -5,29 +5,28 @@ struct BgmMuteSet { const char* mGalaxyName; - u32 _4; - u32 _8; + u32 _4; + u32 _8; }; namespace { static BgmMuteSet sBgmMuteSet[2] = { - { "OceanPhantomCaveGalaxy", 7, 1 }, - { "SoundMapCodeTest", 7, 1 } - }; + {"OceanPhantomCaveGalaxy", 7, 1}, + {"SoundMapCodeTest", 7, 1}}; - BgmMuteSet* findDataElement(const char *); -}; + BgmMuteSet* findDataElement(const char*); +}; // namespace class BgmProhibitArea : public AreaObj { public: - BgmProhibitArea(int, const char *); + BgmProhibitArea(int, const char*); virtual ~BgmProhibitArea(); - virtual void init(const JMapInfoIter &); - virtual void movement(); + virtual void init(const JMapInfoIter&); + virtual void movement(); virtual const char* getManagerName() const; - u8 _3C; - u8 _3D; + u8 _3C; + u8 _3D; TVec3f _40; }; \ No newline at end of file diff --git a/include/Game/AreaObj/BigBubbleCameraArea.hpp b/include/Game/AreaObj/BigBubbleCameraArea.hpp index b13674926..a16f94666 100644 --- a/include/Game/AreaObj/BigBubbleCameraArea.hpp +++ b/include/Game/AreaObj/BigBubbleCameraArea.hpp @@ -5,19 +5,19 @@ class BigBubbleSwitchArea : public SwitchArea { public: - BigBubbleSwitchArea(int, const char *); + BigBubbleSwitchArea(int, const char*); virtual ~BigBubbleSwitchArea(); - virtual bool isInVolume(const TVec3f &) const; - virtual const char *getManagerName() const; + virtual bool isInVolume(const TVec3f&) const; + virtual const char* getManagerName() const; }; class BigBubbleCameraArea : public CubeCameraArea { public: - BigBubbleCameraArea(int, const char *); + BigBubbleCameraArea(int, const char*); virtual ~BigBubbleCameraArea(); - virtual bool isInVolume(const TVec3f &) const; + virtual bool isInVolume(const TVec3f&) const; virtual const char* getManagerName() const; }; \ No newline at end of file diff --git a/include/Game/AreaObj/BigBubbleGoalArea.hpp b/include/Game/AreaObj/BigBubbleGoalArea.hpp index ec62d47ef..c5ee1c94b 100644 --- a/include/Game/AreaObj/BigBubbleGoalArea.hpp +++ b/include/Game/AreaObj/BigBubbleGoalArea.hpp @@ -6,18 +6,18 @@ class BigBubble; class BigBubbleGoalArea : public AreaObj { public: - BigBubbleGoalArea(int, const char *); + BigBubbleGoalArea(int, const char*); virtual ~BigBubbleGoalArea(); - virtual void init(const JMapInfoIter &); - virtual void movement(); - virtual void draw() const; - virtual const char *getManagerName() const; + virtual void init(const JMapInfoIter&); + virtual void movement(); + virtual void draw() const; + virtual const char* getManagerName() const; - void addBubble(BigBubble *); + void addBubble(BigBubble*); - TVec3f mTranslation; // 0x3C - f32 _48; - f32 _4C; - f32 _50; + TVec3f mTranslation; // 0x3C + f32 _48; + f32 _4C; + f32 _50; }; diff --git a/include/Game/AreaObj/BloomArea.hpp b/include/Game/AreaObj/BloomArea.hpp index 98533ced6..92f5ef8e3 100644 --- a/include/Game/AreaObj/BloomArea.hpp +++ b/include/Game/AreaObj/BloomArea.hpp @@ -4,15 +4,15 @@ class BloomArea : public ImageEffectArea { public: - BloomArea(int, const char *); + BloomArea(int, const char*); virtual ~BloomArea(); - virtual void init(const JMapInfoIter &); - virtual const char *getManagerName() const; + virtual void init(const JMapInfoIter&); + virtual const char* getManagerName() const; - u8 _40; - u8 _41; - u8 _42[2]; + u8 _40; + u8 _41; + u8 _42[2]; s32 _44; s32 _48; }; diff --git a/include/Game/AreaObj/CameraRepulsiveArea.hpp b/include/Game/AreaObj/CameraRepulsiveArea.hpp index 1f76eb561..644697e1c 100644 --- a/include/Game/AreaObj/CameraRepulsiveArea.hpp +++ b/include/Game/AreaObj/CameraRepulsiveArea.hpp @@ -4,35 +4,35 @@ class CameraRepulsiveArea : public AreaObj { public: - inline CameraRepulsiveArea(int type, const char *pName) : AreaObj(type, pName) { - + inline CameraRepulsiveArea(int type, const char* pName) + : AreaObj(type, pName) { } virtual ~CameraRepulsiveArea(); virtual const char* getManagerName() const; - virtual TVec3f getRepulsion(const TVec3f &) = 0; + virtual TVec3f getRepulsion(const TVec3f&) = 0; }; class CameraRepulsiveSphere : public CameraRepulsiveArea { public: - inline CameraRepulsiveSphere(const char *pName) : CameraRepulsiveArea(2, pName) { - + inline CameraRepulsiveSphere(const char* pName) + : CameraRepulsiveArea(2, pName) { } virtual ~CameraRepulsiveSphere(); - virtual TVec3f getRepulsion(const TVec3f &); + virtual TVec3f getRepulsion(const TVec3f&); }; class CameraRepulsiveCylinder : public CameraRepulsiveArea { public: - inline CameraRepulsiveCylinder(const char *pName) : CameraRepulsiveArea(3, pName) { - + inline CameraRepulsiveCylinder(const char* pName) + : CameraRepulsiveArea(3, pName) { } virtual ~CameraRepulsiveCylinder(); - virtual TVec3f getRepulsion(const TVec3f &); + virtual TVec3f getRepulsion(const TVec3f&); }; diff --git a/include/Game/AreaObj/ChangeBgmCube.hpp b/include/Game/AreaObj/ChangeBgmCube.hpp index cc75b3f14..a8c85f5a1 100644 --- a/include/Game/AreaObj/ChangeBgmCube.hpp +++ b/include/Game/AreaObj/ChangeBgmCube.hpp @@ -4,10 +4,10 @@ class ChangeBgmCube : public AreaObj { public: - ChangeBgmCube(int, const char *); + ChangeBgmCube(int, const char*); virtual ~ChangeBgmCube(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); u8 _3C; diff --git a/include/Game/AreaObj/CollisionArea.hpp b/include/Game/AreaObj/CollisionArea.hpp index 73d8c1500..32adbf47e 100644 --- a/include/Game/AreaObj/CollisionArea.hpp +++ b/include/Game/AreaObj/CollisionArea.hpp @@ -8,41 +8,41 @@ public: AreaPolygon(); virtual ~AreaPolygon(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - void setMtx(MtxPtr, const TVec3f &, f32 a3); + void setMtx(MtxPtr, const TVec3f&, f32 a3); void setSurfaceAndSync(s32); void setSurface(s32); void invalidate(); void validate(); - u8 _120[4]; - AreaForm *mForm; // 0x124 - MtxPtr _128; - TVec3f _12C; - f32 _138; + u8 _120[4]; + AreaForm* mForm; // 0x124 + MtxPtr _128; + TVec3f _12C; + f32 _138; }; class CollisionArea : public AreaObj { public: - CollisionArea(int, const char *); + CollisionArea(int, const char*); virtual ~CollisionArea(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); - - bool hitCheck(const TVec3f &, f32, TVec3f *, TVec3f *); - u32 _3C; - f32 _40; - TVec3f _44; - s32 _50; - s32 _54; - bool _58; - u8 _59[3]; - s32 _5C; - s32 _60; - AreaPolygon *mPolygon; // 0x64 - bool mIsValid; // 0x68 - u8 _69[3]; + bool hitCheck(const TVec3f&, f32, TVec3f*, TVec3f*); + + u32 _3C; + f32 _40; + TVec3f _44; + s32 _50; + s32 _54; + bool _58; + u8 _59[3]; + s32 _5C; + s32 _60; + AreaPolygon* mPolygon; // 0x64 + bool mIsValid; // 0x68 + u8 _69[3]; }; \ No newline at end of file diff --git a/include/Game/AreaObj/CubeCamera.hpp b/include/Game/AreaObj/CubeCamera.hpp index 8127a6773..09e31f230 100644 --- a/include/Game/AreaObj/CubeCamera.hpp +++ b/include/Game/AreaObj/CubeCamera.hpp @@ -11,20 +11,19 @@ public: CATEGORY_UNKNOWN_3 = 3, CATEGORY_UNKNOWN_4 = 4 }; - - CubeCameraArea(int, const char *); + + CubeCameraArea(int, const char*); virtual ~CubeCameraArea() { - } - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); - virtual bool isInVolume(const TVec3f &) const; - virtual s32 getCategoryArg() const; + virtual bool isInVolume(const TVec3f&) const; + virtual s32 getCategoryArg() const; bool isValidCameraID() const; - u16 getCameraID() const; + u16 getCameraID() const; static void setCurrentCategory(s32); @@ -36,7 +35,7 @@ public: class CubeCameraMgr : public AreaObjMgr { public: - CubeCameraMgr(s32, const char *); + CubeCameraMgr(s32, const char*); virtual ~CubeCameraMgr(); diff --git a/include/Game/AreaObj/DeathArea.hpp b/include/Game/AreaObj/DeathArea.hpp index fbbf58d57..0bda9263e 100644 --- a/include/Game/AreaObj/DeathArea.hpp +++ b/include/Game/AreaObj/DeathArea.hpp @@ -5,12 +5,12 @@ class DeathArea : public AreaObj { public: - DeathArea(int, const char *); + DeathArea(int, const char*); virtual ~DeathArea(); - virtual void init(const JMapInfoIter &); - virtual void movement(); - virtual bool isInVolume(const TVec3f &) const; + virtual void init(const JMapInfoIter&); + virtual void movement(); + virtual bool isInVolume(const TVec3f&) const; virtual const char* getManagerName() const; s32 getDeathType() const NO_INLINE; diff --git a/include/Game/AreaObj/DepthOfFieldArea.hpp b/include/Game/AreaObj/DepthOfFieldArea.hpp index a6754a333..0d5a8711e 100644 --- a/include/Game/AreaObj/DepthOfFieldArea.hpp +++ b/include/Game/AreaObj/DepthOfFieldArea.hpp @@ -4,11 +4,11 @@ class DepthOfFieldArea : public ImageEffectArea { public: - DepthOfFieldArea(int, const char *); + DepthOfFieldArea(int, const char*); virtual ~DepthOfFieldArea(); - virtual void init(const JMapInfoIter &); - virtual const char *getManagerName() const; + virtual void init(const JMapInfoIter&); + virtual const char* getManagerName() const; virtual bool isSyncWithPlayer() const; @@ -17,5 +17,5 @@ public: s32 getBlurMinDist() const; bool mIsPlayerSync; // 0x40 - u8 _41[3]; + u8 _41[3]; }; \ No newline at end of file diff --git a/include/Game/AreaObj/FollowCollisionArea.hpp b/include/Game/AreaObj/FollowCollisionArea.hpp index cfaaf5126..75bb80650 100644 --- a/include/Game/AreaObj/FollowCollisionArea.hpp +++ b/include/Game/AreaObj/FollowCollisionArea.hpp @@ -7,22 +7,22 @@ class AreaPolygon; class FollowCollisionArea : public NameObj { public: - FollowCollisionArea(const TVec3f &, MtxPtr, f32); + FollowCollisionArea(const TVec3f&, MtxPtr, f32); virtual ~FollowCollisionArea(); virtual void movement(); - u32 _C; - f32 _10; - u32 _14; - u32 _18; - u32 _1C; - s32 _20; - s32 _24; - u8 _28; - u32 _2C; + u32 _C; + f32 _10; + u32 _14; + u32 _18; + u32 _1C; + s32 _20; + s32 _24; + u8 _28; + u32 _2C; AreaPolygon* _30; - MtxPtr _34; - TVec3f _38; - f32 _44; + MtxPtr _34; + TVec3f _38; + f32 _44; }; diff --git a/include/Game/AreaObj/GlaringLightArea.hpp b/include/Game/AreaObj/GlaringLightArea.hpp index 38f4863a4..626cc6ec9 100644 --- a/include/Game/AreaObj/GlaringLightArea.hpp +++ b/include/Game/AreaObj/GlaringLightArea.hpp @@ -6,21 +6,21 @@ class AudSoundObject; class GlaringLightArea : public AreaObj { public: - GlaringLightArea(int, const char *); + GlaringLightArea(int, const char*); virtual ~GlaringLightArea(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); - virtual const char *getManagerName() const; + virtual const char* getManagerName() const; - AudSoundObject *mSound; // 0x3C - TVec3f mPos; // 0x40 + AudSoundObject* mSound; // 0x3C + TVec3f mPos; // 0x40 }; class GlaringLightAreaMgr : public AreaObjMgr { public: - GlaringLightAreaMgr(s32, const char *); + GlaringLightAreaMgr(s32, const char*); virtual ~GlaringLightAreaMgr(); }; \ No newline at end of file diff --git a/include/Game/AreaObj/HazeCube.hpp b/include/Game/AreaObj/HazeCube.hpp index 44f62d20e..f1747358b 100644 --- a/include/Game/AreaObj/HazeCube.hpp +++ b/include/Game/AreaObj/HazeCube.hpp @@ -4,11 +4,11 @@ class HazeCube : public AreaObj { public: - HazeCube(int, const char *); + HazeCube(int, const char*); virtual ~HazeCube(); - virtual void init(const JMapInfoIter &); - virtual const char *getManagerName() const; + virtual void init(const JMapInfoIter&); + virtual const char* getManagerName() const; f32 _3C; }; diff --git a/include/Game/AreaObj/ImageEffectArea.hpp b/include/Game/AreaObj/ImageEffectArea.hpp index cf47aad7b..88a681c21 100644 --- a/include/Game/AreaObj/ImageEffectArea.hpp +++ b/include/Game/AreaObj/ImageEffectArea.hpp @@ -11,23 +11,21 @@ public: IMAGE_EFFECT_TYPE_DOF = 3 }; - ImageEffectArea(EImageEffectType, int, const char *); + ImageEffectArea(EImageEffectType, int, const char*); virtual ~ImageEffectArea() { - } - virtual bool isSyncWithPlayer() const { return false; } - s32 mEffectType; // 0x3C + s32 mEffectType; // 0x3C }; class ImageEffectAreaMgr : public AreaObjMgr { public: - ImageEffectAreaMgr(s32, const char *); + ImageEffectAreaMgr(s32, const char*); virtual ~ImageEffectAreaMgr(); virtual void initAfterPlacement(); diff --git a/include/Game/AreaObj/LightArea.hpp b/include/Game/AreaObj/LightArea.hpp index 19dfe936d..a25c559d4 100644 --- a/include/Game/AreaObj/LightArea.hpp +++ b/include/Game/AreaObj/LightArea.hpp @@ -4,12 +4,12 @@ class LightArea : public AreaObj { public: - LightArea(int, const char *); + LightArea(int, const char*); virtual ~LightArea(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual const char* getManagerName() const; - s32 mPlacedZoneID; // 0x3C + s32 mPlacedZoneID; // 0x3C }; \ No newline at end of file diff --git a/include/Game/AreaObj/LightAreaHolder.hpp b/include/Game/AreaObj/LightAreaHolder.hpp index 02d0338ab..459c40079 100644 --- a/include/Game/AreaObj/LightAreaHolder.hpp +++ b/include/Game/AreaObj/LightAreaHolder.hpp @@ -7,11 +7,11 @@ class ZoneLightID; class LightAreaHolder : public AreaObjMgr { public: - LightAreaHolder(s32, const char *); + LightAreaHolder(s32, const char*); virtual ~LightAreaHolder(); virtual void initAfterPlacement(); - bool tryFindLightID(const TVec3f &, ZoneLightID *) const; + bool tryFindLightID(const TVec3f&, ZoneLightID*) const; void sort(); }; \ No newline at end of file diff --git a/include/Game/AreaObj/MercatorTransformCube.hpp b/include/Game/AreaObj/MercatorTransformCube.hpp index f42bc9da4..8b3aae55e 100644 --- a/include/Game/AreaObj/MercatorTransformCube.hpp +++ b/include/Game/AreaObj/MercatorTransformCube.hpp @@ -5,23 +5,23 @@ class MercatorTransformCube : public AreaObj { public: - MercatorTransformCube(int, const char *); + MercatorTransformCube(int, const char*); virtual ~MercatorTransformCube(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - void convertTransAndRotate(TVec3f *, TPos3f *, const TVec3f &, bool) const; - f32 getSphereRadius() const; - void calcUV(TVec2f *, const TVec3f &) const; - void calcLocalBoxSize(TVec3f *) const; + void convertTransAndRotate(TVec3f*, TPos3f*, const TVec3f&, bool) const; + f32 getSphereRadius() const; + void calcUV(TVec2f*, const TVec3f&) const; + void calcLocalBoxSize(TVec3f*) const; TMtx34f _3C; }; namespace MR { - void initDefaultPosForMercator(LiveActor *, const JMapInfoIter &, bool); + void initDefaultPosForMercator(LiveActor*, const JMapInfoIter&, bool); - void convertMercatorPlaneToSphereTransAndRotate(TVec3f *, TPos3f *, const TVec3f &, bool); + void convertMercatorPlaneToSphereTransAndRotate(TVec3f*, TPos3f*, const TVec3f&, bool); - MapPartsRailMover* createMapPartsRailMoverForMercator(LiveActor *, const JMapInfoIter &, bool); -}; + MapPartsRailMover* createMapPartsRailMoverForMercator(LiveActor*, const JMapInfoIter&, bool); +}; // namespace MR diff --git a/include/Game/AreaObj/MessageArea.hpp b/include/Game/AreaObj/MessageArea.hpp index 633e125ff..4f7c228f3 100644 --- a/include/Game/AreaObj/MessageArea.hpp +++ b/include/Game/AreaObj/MessageArea.hpp @@ -4,10 +4,10 @@ class MessageArea : public AreaObj { public: - MessageArea(int, const char *); + MessageArea(int, const char*); ~MessageArea(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - s32 mZoneID; // 0x3C + s32 mZoneID; // 0x3C }; diff --git a/include/Game/AreaObj/PlayerSeArea.hpp b/include/Game/AreaObj/PlayerSeArea.hpp index d016ed06f..f59daa9f0 100644 --- a/include/Game/AreaObj/PlayerSeArea.hpp +++ b/include/Game/AreaObj/PlayerSeArea.hpp @@ -4,12 +4,12 @@ class PlayerSeArea : public AreaObj { public: - PlayerSeArea(int, const char *); + PlayerSeArea(int, const char*); virtual ~PlayerSeArea(); - virtual void init(const JMapInfoIter &); - virtual void movement(); - virtual const char *getManagerName() const; + virtual void init(const JMapInfoIter&); + virtual void movement(); + virtual const char* getManagerName() const; s32 _3C; }; diff --git a/include/Game/AreaObj/QuakeEffectArea.hpp b/include/Game/AreaObj/QuakeEffectArea.hpp index a3f14de29..0c451b6f5 100644 --- a/include/Game/AreaObj/QuakeEffectArea.hpp +++ b/include/Game/AreaObj/QuakeEffectArea.hpp @@ -4,6 +4,6 @@ class QuakeEffectArea : public AreaObj { public: - QuakeEffectArea(int, const char *); + QuakeEffectArea(int, const char*); virtual ~QuakeEffectArea(); }; \ No newline at end of file diff --git a/include/Game/AreaObj/RestartCube.hpp b/include/Game/AreaObj/RestartCube.hpp index 8599d8429..ae74d81bc 100644 --- a/include/Game/AreaObj/RestartCube.hpp +++ b/include/Game/AreaObj/RestartCube.hpp @@ -6,17 +6,17 @@ class JMapIdInfo; class RestartCube : public AreaObj { public: - RestartCube(int, const char *); + RestartCube(int, const char*); virtual ~RestartCube(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); void updatePlayerRestartIdInfo(); void changeBgm(); - JMapIdInfo *mIdInfo; // 0x3C - s32 _40; - s32 _44; - bool _48; - u8 _49[3]; + JMapIdInfo* mIdInfo; // 0x3C + s32 _40; + s32 _44; + bool _48; + u8 _49[3]; }; diff --git a/include/Game/AreaObj/ScreenBlurArea.hpp b/include/Game/AreaObj/ScreenBlurArea.hpp index 8b9f7023e..f29fb560d 100644 --- a/include/Game/AreaObj/ScreenBlurArea.hpp +++ b/include/Game/AreaObj/ScreenBlurArea.hpp @@ -4,15 +4,15 @@ class ScreenBlurArea : public ImageEffectArea { public: - ScreenBlurArea(int, const char *); + ScreenBlurArea(int, const char*); virtual ~ScreenBlurArea(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - virtual const char *getManagerName() const; + virtual const char* getManagerName() const; virtual bool isSyncWithPlayer() const; bool mIsPlayerSync; - u8 _41[3]; + u8 _41[3]; }; diff --git a/include/Game/AreaObj/SimpleBloomArea.hpp b/include/Game/AreaObj/SimpleBloomArea.hpp index 9f73800c3..c504df776 100644 --- a/include/Game/AreaObj/SimpleBloomArea.hpp +++ b/include/Game/AreaObj/SimpleBloomArea.hpp @@ -4,15 +4,15 @@ class SimpleBloomArea : public ImageEffectArea { public: - SimpleBloomArea(int, const char *); + SimpleBloomArea(int, const char*); virtual ~SimpleBloomArea(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - virtual const char *getManagerName() const; + virtual const char* getManagerName() const; u32 _40; - u8 _44; - u8 _45; - u8 _46[2]; + u8 _44; + u8 _45; + u8 _46[2]; }; diff --git a/include/Game/AreaObj/SoundEmitterCube.hpp b/include/Game/AreaObj/SoundEmitterCube.hpp index 7eb3b46a4..5586167f1 100644 --- a/include/Game/AreaObj/SoundEmitterCube.hpp +++ b/include/Game/AreaObj/SoundEmitterCube.hpp @@ -6,13 +6,13 @@ class AudAnmSoundObject; class SoundEmitterCube : public AreaObj { public: - SoundEmitterCube(int, const char *); + SoundEmitterCube(int, const char*); virtual ~SoundEmitterCube(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); - AudAnmSoundObject *mSoundObj; // 0x3C - TVec3f _40; - const char *mSoundName; // 0x4C + AudAnmSoundObject* mSoundObj; // 0x3C + TVec3f _40; + const char* mSoundName; // 0x4C }; diff --git a/include/Game/AreaObj/SoundEmitterSphere.hpp b/include/Game/AreaObj/SoundEmitterSphere.hpp index b8f42648d..e7a2c9d2c 100644 --- a/include/Game/AreaObj/SoundEmitterSphere.hpp +++ b/include/Game/AreaObj/SoundEmitterSphere.hpp @@ -6,14 +6,14 @@ class AudAnmSoundObject; class SoundEmitterSphere : public AreaObj { public: - SoundEmitterSphere(int, const char *); + SoundEmitterSphere(int, const char*); virtual ~SoundEmitterSphere(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); - AudAnmSoundObject *mSoundObj; // 0x3C - TVec3f _40; - const char *mSoundName; // 0x4C - s32 mSoundIndex; // 0x50 + AudAnmSoundObject* mSoundObj; // 0x3C + TVec3f _40; + const char* mSoundName; // 0x4C + s32 mSoundIndex; // 0x50 }; diff --git a/include/Game/AreaObj/SpinGuidanceArea.hpp b/include/Game/AreaObj/SpinGuidanceArea.hpp index d22977efe..3fb5ca413 100644 --- a/include/Game/AreaObj/SpinGuidanceArea.hpp +++ b/include/Game/AreaObj/SpinGuidanceArea.hpp @@ -4,8 +4,8 @@ class SpinGuidanceArea : public AreaObj { public: - SpinGuidanceArea(int, const char *); + SpinGuidanceArea(int, const char*); virtual ~SpinGuidanceArea(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); }; diff --git a/include/Game/AreaObj/SunLightArea.hpp b/include/Game/AreaObj/SunLightArea.hpp index 6f488820b..54fe85228 100644 --- a/include/Game/AreaObj/SunLightArea.hpp +++ b/include/Game/AreaObj/SunLightArea.hpp @@ -4,8 +4,8 @@ class SunLightArea : public AreaObj { public: - SunLightArea(int, const char *); + SunLightArea(int, const char*); virtual ~SunLightArea(); - virtual const char *getManagerName() const; + virtual const char* getManagerName() const; }; diff --git a/include/Game/AreaObj/SwitchArea.hpp b/include/Game/AreaObj/SwitchArea.hpp index b89dc6e38..2ece12a1f 100644 --- a/include/Game/AreaObj/SwitchArea.hpp +++ b/include/Game/AreaObj/SwitchArea.hpp @@ -4,11 +4,11 @@ class SwitchArea : public AreaObj { public: - SwitchArea(int, const char *); + SwitchArea(int, const char*); + + virtual void init(const JMapInfoIter&); + virtual void movement(); + virtual const char* getManagerName() const; - virtual void init(const JMapInfoIter &); - virtual void movement(); - virtual const char *getManagerName() const; - bool isUpdate() const; }; \ No newline at end of file diff --git a/include/Game/AreaObj/WarpCube.hpp b/include/Game/AreaObj/WarpCube.hpp index 2cefe95f8..9b0ac6f7d 100644 --- a/include/Game/AreaObj/WarpCube.hpp +++ b/include/Game/AreaObj/WarpCube.hpp @@ -7,36 +7,37 @@ class JMapIdInfo; class WarpCube : public AreaObj { public: - inline WarpCube(int type, const char *pName) : AreaObj(type, pName) { + inline WarpCube(int type, const char* pName) + : AreaObj(type, pName) { mMapIdInfo = nullptr; } virtual ~WarpCube(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); virtual void draw() const; - JMapIdInfo *mMapIdInfo; // 0x3C - ActorCameraInfo *mCameraInfo; // 0x40 - char *mEventName; // 0x44 - u16 _48; - u8 _4A[2]; + JMapIdInfo* mMapIdInfo; // 0x3C + ActorCameraInfo* mCameraInfo; // 0x40 + char* mEventName; // 0x44 + u16 _48; + u8 _4A[2]; }; class WarpCubeMgr : public AreaObjMgr { public: - inline WarpCubeMgr(s32 type, const char *pName) : AreaObjMgr(type, pName) { + inline WarpCubeMgr(s32 type, const char* pName) + : AreaObjMgr(type, pName) { mWarpCube = 0; } virtual ~WarpCubeMgr() { - } - void setInvalidateTimer(AreaObj *, u16); - void startEventCamera(const AreaObj *); + void setInvalidateTimer(AreaObj*, u16); + void startEventCamera(const AreaObj*); void endEventCamera(); - const WarpCube* mWarpCube; // 0x1C + const WarpCube* mWarpCube; // 0x1C }; \ No newline at end of file diff --git a/include/Game/AreaObj/WaterArea.hpp b/include/Game/AreaObj/WaterArea.hpp index 035f0d13c..83e24afea 100644 --- a/include/Game/AreaObj/WaterArea.hpp +++ b/include/Game/AreaObj/WaterArea.hpp @@ -4,17 +4,17 @@ class WaterArea : public AreaObj { public: - WaterArea(int, const char *); + WaterArea(int, const char*); virtual ~WaterArea(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); s32 _3C; }; class WaterAreaMgr : public AreaObjMgr { public: - WaterAreaMgr(s32, const char *); + WaterAreaMgr(s32, const char*); virtual ~WaterAreaMgr(); }; \ No newline at end of file diff --git a/include/Game/AudioLib/AudAnmSoundObject.hpp b/include/Game/AudioLib/AudAnmSoundObject.hpp index e7c66e1d6..331dc80ae 100644 --- a/include/Game/AudioLib/AudAnmSoundObject.hpp +++ b/include/Game/AudioLib/AudAnmSoundObject.hpp @@ -9,16 +9,16 @@ class JAUSoundAnimationSound; class AudAnmSoundObject : public AudSoundObject, JAUSoundAnimator { public: - AudAnmSoundObject(TVec3f *, u8, JKRHeap *); + AudAnmSoundObject(TVec3f*, u8, JKRHeap*); void update(f32); - void modifySoundParams(JASSoundParams *, const JAUSoundAnimationSound *, f32); - void playsSound(const JAUSoundAnimationSound *, const TVec3f &, f32); - s32 getSoundID(const JAUSoundAnimationSound *, const TVec3f &, f32); - u32* getFreeHandle(const JAUSoundAnimationSound *); + void modifySoundParams(JASSoundParams*, const JAUSoundAnimationSound*, f32); + void playsSound(const JAUSoundAnimationSound*, const TVec3f&, f32); + s32 getSoundID(const JAUSoundAnimationSound*, const TVec3f&, f32); + u32* getFreeHandle(const JAUSoundAnimationSound*); void skip(f32); void setStartPos(f32); - void updateAnimSound(f32, const TVec3f &, JAISoundStarter *); - void startAnimSound(const TVec3f &, f32, JAISoundStarter *); - void releaseHandleIfNecessary(JAISoundHandle *, u32); + void updateAnimSound(f32, const TVec3f&, JAISoundStarter*); + void startAnimSound(const TVec3f&, f32, JAISoundStarter*); + void releaseHandleIfNecessary(JAISoundHandle*, u32); }; diff --git a/include/Game/AudioLib/AudEffector.hpp b/include/Game/AudioLib/AudEffector.hpp index 0162b0582..69ea0b82c 100644 --- a/include/Game/AudioLib/AudEffector.hpp +++ b/include/Game/AudioLib/AudEffector.hpp @@ -7,7 +7,7 @@ class AudEffector { public: AudEffector(); - void initFxLine(JKRHeap *); + void initFxLine(JKRHeap*); void setFxSend(f32); void setCutoff(s32); void setSpecialFx(s32); diff --git a/include/Game/AudioLib/AudRemixMgr.hpp b/include/Game/AudioLib/AudRemixMgr.hpp index 73460cd83..7aa007801 100644 --- a/include/Game/AudioLib/AudRemixMgr.hpp +++ b/include/Game/AudioLib/AudRemixMgr.hpp @@ -5,29 +5,29 @@ class JKRHeap; struct RemixTrack { - s32 _0; - u32 *_4; + s32 _0; + u32* _4; }; struct RemixNoteGroupData { - /* 0x0 */ s32 mIndex; - /* 0x4 */ s32 mTrackCount; - /* 0x8 */ u32 mNoteCount; - u32 *_C; - /* 0x10 */ RemixTrack *mRemixTracks; + /* 0x0 */ s32 mIndex; + /* 0x4 */ s32 mTrackCount; + /* 0x8 */ u32 mNoteCount; + u32* _C; + /* 0x10 */ RemixTrack* mRemixTracks; }; class AudRemixMgr { public: - AudRemixMgr(JKRHeap *pHeap); - void init(); - void update(); - void setRemixSeqResource(void *ptr); - RemixNoteGroupData *getRemixNoteGroupDataFromMelodyNo(s32 melodyNo) const; + AudRemixMgr(JKRHeap* pHeap); + void init(); + void update(); + void setRemixSeqResource(void* ptr); + RemixNoteGroupData* getRemixNoteGroupDataFromMelodyNo(s32 melodyNo) const; - /* 0x0 */ JKRHeap *mHeap; - /* 0x4 */ RemixNoteGroupData *mGroups; - /* 0x8 */ s32 mGroupCount; - /* 0xC */ AudSoundObject *mSoundObj; - /* 0x10 */ AudRemixSequencer *mRemixSeq; + /* 0x0 */ JKRHeap* mHeap; + /* 0x4 */ RemixNoteGroupData* mGroups; + /* 0x8 */ s32 mGroupCount; + /* 0xC */ AudSoundObject* mSoundObj; + /* 0x10 */ AudRemixSequencer* mRemixSeq; }; diff --git a/include/Game/AudioLib/AudRemixSequencer.hpp b/include/Game/AudioLib/AudRemixSequencer.hpp index 4eaa02197..66418da9e 100644 --- a/include/Game/AudioLib/AudRemixSequencer.hpp +++ b/include/Game/AudioLib/AudRemixSequencer.hpp @@ -16,25 +16,25 @@ struct RemixNoteData { class AudRmxSeqNoteOnTimer { public: AudRmxSeqNoteOnTimer(); - void initData(); - void setData(const RemixNoteTrackData*, const RemixNoteData*); - bool update(f32); - JAISoundID getFreeSeID(); - f32 _0; - f32 _4; - const RemixNoteData *_8; - const RemixNoteTrackData *_C; + void initData(); + void setData(const RemixNoteTrackData*, const RemixNoteData*); + bool update(f32); + JAISoundID getFreeSeID(); + f32 _0; + f32 _4; + const RemixNoteData* _8; + const RemixNoteTrackData* _C; }; class AudRemixSequencer { public: AudRemixSequencer(); - void initNoteOnBuff(); - void update(); - void setTempo(f32) NO_INLINE; - AudRmxSeqNoteOnTimer *newNoteOnTimer(); - void addNoteData(const RemixNoteTrackData*, const RemixNoteData*); - AudRmxSeqNoteOnTimer _0[0x20]; - f32 _200; - f32 _204; + void initNoteOnBuff(); + void update(); + void setTempo(f32) NO_INLINE; + AudRmxSeqNoteOnTimer* newNoteOnTimer(); + void addNoteData(const RemixNoteTrackData*, const RemixNoteData*); + AudRmxSeqNoteOnTimer _0[0x20]; + f32 _200; + f32 _204; }; diff --git a/include/Game/AudioLib/AudSoundNameConverter.hpp b/include/Game/AudioLib/AudSoundNameConverter.hpp index 9b9be0ecb..2c30ac583 100644 --- a/include/Game/AudioLib/AudSoundNameConverter.hpp +++ b/include/Game/AudioLib/AudSoundNameConverter.hpp @@ -4,9 +4,8 @@ class JAISoundID; -class AudSoundNameConverter -{ +class AudSoundNameConverter { public: - JAISoundID getSoundID(const char *) const; - JAISoundID getSoundID(const char *, u32) const; + JAISoundID getSoundID(const char*) const; + JAISoundID getSoundID(const char*, u32) const; }; diff --git a/include/Game/AudioLib/AudSoundObject.hpp b/include/Game/AudioLib/AudSoundObject.hpp index bc556a939..b0ae88338 100644 --- a/include/Game/AudioLib/AudSoundObject.hpp +++ b/include/Game/AudioLib/AudSoundObject.hpp @@ -8,20 +8,20 @@ class JKRHeap; class AudSoundObject : public JAUSoundObject, JKRDisposer { public: - AudSoundObject(TVec3f *, u8, JKRHeap *); + AudSoundObject(TVec3f*, u8, JKRHeap*); virtual ~AudSoundObject(); - virtual JAISoundHandle *startSound(JAISoundID); - virtual JAISoundHandle *startLevelSound(JAISoundID); + virtual JAISoundHandle* startSound(JAISoundID); + virtual JAISoundHandle* startLevelSound(JAISoundID); void addToSoundObjHolder(); - void setTrans(TVec3f *); - void writePort(JAISoundHandle *, u32, u16); + void setTrans(TVec3f*); + void writePort(JAISoundHandle*, u32, u16); void isLimitedSound(JAISoundID); - void startLevelSound(const char *); + void startLevelSound(const char*); void startSoundParam(JAISoundID, s32, s32); void startLevelSoundParam(JAISoundID, s32, s32); - void startLevelSoundParam(const char *, s32, s32); + void startLevelSoundParam(const char*, s32, s32); void modifyLimitedSound(JAISoundID); void isPlayingID(JAISoundID); void releaseHandle(JAISoundID); @@ -29,22 +29,22 @@ public: void setMapCodeExtra(s32); void getMapCode() const; void clearMapCode(); - void convertNameToLevelSEID(const char *); + void convertNameToLevelSEID(const char*); void limitVoiceOne(JAISoundID); void stopCategorySound(u32, u32); - void setMapCodeToPort(JAISoundHandle *, JAISoundID); - void setCutoffToPort(JAISoundHandle *, JAISoundID); + void setMapCodeToPort(JAISoundHandle*, JAISoundID); + void setCutoffToPort(JAISoundHandle*, JAISoundID); void convertSoundIdFromSeVersion(JAISoundID) const; - void modifySe_Kawamura(JAISoundHandle *, s32); + void modifySe_Kawamura(JAISoundHandle*, s32); void modifyLimitedSound_Kawamura(JAISoundID); - void modifySe_Takezawa(JAISoundHandle *, s32, s32); + void modifySe_Takezawa(JAISoundHandle*, s32, s32); void modifyLimitedSound_Takezawa(JAISoundID); - void modifySe_Gohara(JAISoundHandle *, s32, s32); + void modifySe_Gohara(JAISoundHandle*, s32, s32); - u32 _30; - u32 _34; - u32 _38; - void *mHashDatas; // 0x3C - JKRHeap *mHeap; // 0x40 - u32 _44; + u32 _30; + u32 _34; + u32 _38; + void* mHashDatas; // 0x3C + JKRHeap* mHeap; // 0x40 + u32 _44; }; diff --git a/include/Game/AudioLib/AudSpeakerWrap.hpp b/include/Game/AudioLib/AudSpeakerWrap.hpp index 71f4cfaee..ca061cbc0 100644 --- a/include/Game/AudioLib/AudSpeakerWrap.hpp +++ b/include/Game/AudioLib/AudSpeakerWrap.hpp @@ -4,6 +4,6 @@ class AudSpeakerWrap { public: - static u32 getRequiredHeapSize(); + static u32 getRequiredHeapSize(); static const char* getResName(); }; \ No newline at end of file diff --git a/include/Game/AudioLib/AudSystem.hpp b/include/Game/AudioLib/AudSystem.hpp index ca1cb3e19..46b4ecd9a 100644 --- a/include/Game/AudioLib/AudSystem.hpp +++ b/include/Game/AudioLib/AudSystem.hpp @@ -9,7 +9,6 @@ class JKRArchive; class AudSystem : public JAUSoundMgr { public: - inline void setVar(u32 var) { _830 = var; } @@ -21,19 +20,19 @@ public: return mAudEffector; } - u8 _814; - u8 _815; - u8 _816; - JASAudioReseter mReseter; // 0x818 - u8 _828; - u8 _829; - u8 _82A; - u8 _82B; - u8 _82C; - u32 _830; - u32 _834; - u32 _838; - u32 _83C; - u8 _840[0xAC8]; - AudEffector* mAudEffector; // 0x1308 + u8 _814; + u8 _815; + u8 _816; + JASAudioReseter mReseter; // 0x818 + u8 _828; + u8 _829; + u8 _82A; + u8 _82B; + u8 _82C; + u32 _830; + u32 _834; + u32 _838; + u32 _83C; + u8 _840[0xAC8]; + AudEffector* mAudEffector; // 0x1308 }; diff --git a/include/Game/AudioLib/AudSystemWrapper.hpp b/include/Game/AudioLib/AudSystemWrapper.hpp index 9b4485b8a..8131f3e04 100644 --- a/include/Game/AudioLib/AudSystemWrapper.hpp +++ b/include/Game/AudioLib/AudSystemWrapper.hpp @@ -10,7 +10,7 @@ class AudSystem; class AudSystemWrapper { public: - AudSystemWrapper(JKRSolidHeap *, JKRHeap *); + AudSystemWrapper(JKRSolidHeap*, JKRHeap*); void createAudioSystem(); bool isResetDone(); @@ -21,17 +21,17 @@ public: void updateAudioSystem(); - AudSystem* mSystem; // 0x0 + AudSystem* mSystem; // 0x0 JKRSolidHeap* _4; - JKRHeap* _8; - void* mSMRData; // 0xC - JKRArchive* mJaiSeqArchive; // 0x10 - JKRArchive* mJaiCordArchive; // 0x14 - JKRArchive* mJaiMeArchive; // 0x18 - JKRArchive* mJaiRemixSeqArchive; // 0x1C - JKRExpHeap* _20; - void* mSpeakerData; // 0x24 - u8 _28; - u8 _29; - u8 _2A; + JKRHeap* _8; + void* mSMRData; // 0xC + JKRArchive* mJaiSeqArchive; // 0x10 + JKRArchive* mJaiCordArchive; // 0x14 + JKRArchive* mJaiMeArchive; // 0x18 + JKRArchive* mJaiRemixSeqArchive; // 0x1C + JKRExpHeap* _20; + void* mSpeakerData; // 0x24 + u8 _28; + u8 _29; + u8 _2A; }; \ No newline at end of file diff --git a/include/Game/AudioLib/AudWrap.hpp b/include/Game/AudioLib/AudWrap.hpp index 4aa52f1be..c6002e530 100644 --- a/include/Game/AudioLib/AudWrap.hpp +++ b/include/Game/AudioLib/AudWrap.hpp @@ -9,7 +9,7 @@ // temp class AudBgmMgr { public: - u8 _0[0x10]; + u8 _0[0x10]; u32 _10; }; @@ -18,7 +18,7 @@ class AudSceneMgr; class AudWrap { public: static AudBgmMgr* getBgmMgr(); - static AudBgm* getStageBgm(); + static AudBgm* getStageBgm(); static AudSystem* getSystem(); @@ -28,7 +28,7 @@ public: static void startStageBgm(u32, bool); - static AudRemixSequencer *getRemixSequencer(); - static AudSoundObject *getRemixSeqObject(); - static AudSoundObject *getSystemSeObject(); + static AudRemixSequencer* getRemixSequencer(); + static AudSoundObject* getRemixSeqObject(); + static AudSoundObject* getSystemSeObject(); }; diff --git a/include/Game/Boss/BossAccessor.hpp b/include/Game/Boss/BossAccessor.hpp index 828da034c..7aded11cc 100644 --- a/include/Game/Boss/BossAccessor.hpp +++ b/include/Game/Boss/BossAccessor.hpp @@ -28,5 +28,5 @@ private: namespace BossAccess { Koopa* getBossAccessorKoopa(); - void setBossAccessorKoopa(Koopa* pKoopa); -}; + void setBossAccessorKoopa(Koopa* pKoopa); +}; // namespace BossAccess diff --git a/include/Game/Boss/BossBegomanHead.hpp b/include/Game/Boss/BossBegomanHead.hpp index ada9777b1..81b6c7405 100644 --- a/include/Game/Boss/BossBegomanHead.hpp +++ b/include/Game/Boss/BossBegomanHead.hpp @@ -2,16 +2,16 @@ #include "Game/LiveActor/PartsModel.hpp" -template +template class JointControlDelegator; class JointControllerInfo; class BossBegomanHead : public PartsModel { public: - BossBegomanHead(LiveActor *, MtxPtr); + BossBegomanHead(LiveActor*, MtxPtr); virtual ~BossBegomanHead(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calcAndSetBaseMtx(); bool isSwitchOn(); @@ -29,9 +29,9 @@ public: void exeSwitchOff(); void exeTurn(); void exeTurnEnd(); - bool calcJointEdge(TPos3f *, const JointControllerInfo &); + bool calcJointEdge(TPos3f*, const JointControllerInfo&); private: - /* 0x9C */ f32 _9C; + /* 0x9C */ f32 _9C; /* 0xA0 */ JointControlDelegator* mJointDelegator; }; diff --git a/include/Game/Boss/BossKameck.hpp b/include/Game/Boss/BossKameck.hpp index 9d1c4f674..a957b3cc4 100644 --- a/include/Game/Boss/BossKameck.hpp +++ b/include/Game/Boss/BossKameck.hpp @@ -14,51 +14,52 @@ class BossKameckBeamEventListener; class BossKameck : public LiveActor { public: - BossKameck(const char *, const char *); + BossKameck(const char*, const char*); virtual ~BossKameck(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void makeActorDead(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); BossKameckMoveRail* getMoveRail(s32); - void startSequence(); - void startDemoAppearKameck(); - void endDemoAppearKameck(); - void appearKameck(); - void deadKameck(); - s32 getLivingKameckNum() const; - void appearStarPieceToPlayer(s32); - void endDemo(); - void setPose(MtxPtr); - void killAllBeam(); - void updatePose(); - void initKameckHolder(const JMapInfoIter &); - void initMoveRail(const JMapInfoIter &); - void appearStarPieceToUp(s32); - void startDemo(); - void hitBeam(s32); + void startSequence(); + void startDemoAppearKameck(); + void endDemoAppearKameck(); + void appearKameck(); + void deadKameck(); + s32 getLivingKameckNum() const; + void appearStarPieceToPlayer(s32); + void endDemo(); + void setPose(MtxPtr); + void killAllBeam(); + void updatePose(); + void initKameckHolder(const JMapInfoIter&); + void initMoveRail(const JMapInfoIter&); + void appearStarPieceToUp(s32); + void startDemo(); + void hitBeam(s32); - const char* _8C; - TQuat4f _90; - TVec3f _A0; - BossKameckSequencer* mSequencer; // 0xAC - KameckHolder* mKameckHolder; // 0xB0 - ActorJointCtrl* mJointCtrl; // 0xB4 - ActiveActorList* mActorList; // 0xB8 - BossKameckBeamEventListener* mBeamListener; // 0xBC - BossKameckMoveRail** mMoveRail; // 0xC0 - s32 _C4; - TVec3f _C8; - s32 _D4; + const char* _8C; + TQuat4f _90; + TVec3f _A0; + BossKameckSequencer* mSequencer; // 0xAC + KameckHolder* mKameckHolder; // 0xB0 + ActorJointCtrl* mJointCtrl; // 0xB4 + ActiveActorList* mActorList; // 0xB8 + BossKameckBeamEventListener* mBeamListener; // 0xBC + BossKameckMoveRail** mMoveRail; // 0xC0 + s32 _C4; + TVec3f _C8; + s32 _D4; }; class BossKameckBeamEventListener : public KameckBeamEventListener { public: - inline BossKameckBeamEventListener(BossKameck *pBoss) : KameckBeamEventListener() { + inline BossKameckBeamEventListener(BossKameck* pBoss) + : KameckBeamEventListener() { mBossKameck = pBoss; } @@ -66,10 +67,10 @@ public: mBossKameck->hitBeam(type); } - BossKameck* mBossKameck; // 0x4 + BossKameck* mBossKameck; // 0x4 }; namespace MR { - NameObj* createBossKameck1(const char *); - NameObj* createBossKameck2(const char *); -}; + NameObj* createBossKameck1(const char*); + NameObj* createBossKameck2(const char*); +}; // namespace MR diff --git a/include/Game/Boss/BossKameckAction.hpp b/include/Game/Boss/BossKameckAction.hpp index 6c4bf90cc..fdb6d26bc 100644 --- a/include/Game/Boss/BossKameckAction.hpp +++ b/include/Game/Boss/BossKameckAction.hpp @@ -7,14 +7,14 @@ class BossKameck; class BossKameckAction : public ActorStateBase { public: - BossKameckAction(const char *, BossKameck *); + BossKameckAction(const char*, BossKameck*); virtual ~BossKameckAction(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgPush(HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgPush(HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - BossKameck* mBossKameck; // 0xC + BossKameck* mBossKameck; // 0xC }; \ No newline at end of file diff --git a/include/Game/Boss/BossKameckBarrier.hpp b/include/Game/Boss/BossKameckBarrier.hpp index 2174e4a5b..aea3bce45 100644 --- a/include/Game/Boss/BossKameckBarrier.hpp +++ b/include/Game/Boss/BossKameckBarrier.hpp @@ -4,13 +4,13 @@ class BossKameckBarrier : public LiveActor { public: - BossKameckBarrier(const char *, const char *); + BossKameckBarrier(const char*, const char*); virtual ~BossKameckBarrier(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); void exeWait(); - const char* mBossName; // 0x8C + const char* mBossName; // 0x8C }; diff --git a/include/Game/Boss/BossKameckBattleDemo.hpp b/include/Game/Boss/BossKameckBattleDemo.hpp index 596a29efb..d1ce98a4d 100644 --- a/include/Game/Boss/BossKameckBattleDemo.hpp +++ b/include/Game/Boss/BossKameckBattleDemo.hpp @@ -11,21 +11,21 @@ public: BossKameckDemoPosition(); virtual ~BossKameckDemoPosition(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - ActorCameraInfo* mCameraInfo; // 0x8C + ActorCameraInfo* mCameraInfo; // 0x8C }; class BossKameckBattleDemo : public BossKameckAction { public: - BossKameckBattleDemo(BossKameck *, const JMapInfoIter &); + BossKameckBattleDemo(BossKameck*, const JMapInfoIter&); virtual ~BossKameckBattleDemo(); virtual void init(); virtual void appear(); virtual void kill(); - void startTryDemo(const char *, const Nerve *); + void startTryDemo(const char*, const Nerve*); void exeTryStartDemo(); void startDemoAppearVs1(); void startDemoAppearVs2(); @@ -43,7 +43,7 @@ public: void exeDownVs2(); void updateCastPose(); - BossKameckDemoPosition* mDemoPos; // 0x10 - const Nerve* mDemoNerve; // 0x14 - const char* mCurDemoName; // 0x18 + BossKameckDemoPosition* mDemoPos; // 0x10 + const Nerve* mDemoNerve; // 0x14 + const char* mCurDemoName; // 0x18 }; diff --git a/include/Game/Boss/BossKameckBattlePattarn.hpp b/include/Game/Boss/BossKameckBattlePattarn.hpp index 9fcd3dd86..264c59ab1 100644 --- a/include/Game/Boss/BossKameckBattlePattarn.hpp +++ b/include/Game/Boss/BossKameckBattlePattarn.hpp @@ -4,14 +4,14 @@ class BossKameckBattlePattarn { public: - BossKameckBattlePattarn(s32 *, bool); + BossKameckBattlePattarn(s32*, bool); - void initPattarn(s32 *); - s32 goNextPattarn(); + void initPattarn(s32*); + s32 goNextPattarn(); s32* _0; - s32 _4; - u32 _8; - s32 _C; + s32 _4; + u32 _8; + s32 _C; bool _10; }; \ No newline at end of file diff --git a/include/Game/Boss/BossKameckMoveRail.hpp b/include/Game/Boss/BossKameckMoveRail.hpp index ae7da78a5..07c60d564 100644 --- a/include/Game/Boss/BossKameckMoveRail.hpp +++ b/include/Game/Boss/BossKameckMoveRail.hpp @@ -4,16 +4,16 @@ class BossKameckMoveRail : public LiveActor { public: - BossKameckMoveRail(const char *); + BossKameckMoveRail(const char*); virtual ~BossKameckMoveRail(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); inline s32 getIdx(s32) const; - void calcMovePosition(TVec3f *, s32) const; - s32 calcRandomIndex(s32) const; - s32 calcRandomStoppableIndex(s32) const; + void calcMovePosition(TVec3f*, s32) const; + s32 calcRandomIndex(s32) const; + s32 calcRandomStoppableIndex(s32) const; s32 _8C; s32 _90; diff --git a/include/Game/Boss/BossKameckSequencer.hpp b/include/Game/Boss/BossKameckSequencer.hpp index 986a39aa9..8138eac20 100644 --- a/include/Game/Boss/BossKameckSequencer.hpp +++ b/include/Game/Boss/BossKameckSequencer.hpp @@ -9,25 +9,23 @@ class BossKameckBattleDemo; class BossKameckSequencer : public NerveExecutor { public: - BossKameckSequencer(const char *); + BossKameckSequencer(const char*); inline virtual ~BossKameckSequencer() { - } virtual void start() { - } - virtual void init(BossKameck *, const JMapInfoIter &); + virtual void init(BossKameck*, const JMapInfoIter&); virtual void update(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgPush(HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgPush(HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - BossKameck* mBossKameck; // 0x8 - BossKameckAction* _C; // not really sure what this is. - BossKameckBattleDemo* mBattleDemo; // 0x10 + BossKameck* mBossKameck; // 0x8 + BossKameckAction* _C; // not really sure what this is. + BossKameckBattleDemo* mBattleDemo; // 0x10 }; \ No newline at end of file diff --git a/include/Game/Boss/BossKameckStateBattle.hpp b/include/Game/Boss/BossKameckStateBattle.hpp index c48415647..2a11b7854 100644 --- a/include/Game/Boss/BossKameckStateBattle.hpp +++ b/include/Game/Boss/BossKameckStateBattle.hpp @@ -12,19 +12,19 @@ class KameckBeam; class BossKameckStateBattle : public ActorStateBase { public: - BossKameckStateBattle(BossKameck *); + BossKameckStateBattle(BossKameck*); virtual ~BossKameckStateBattle(); virtual void init(); virtual void appear(); virtual void control(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); - void setMoveRail(BossKameckMoveRail *); - void setBattlePattarn(BossKameckBattlePattarn *); - bool requestDamage(HitSensor *, HitSensor *); - bool requestGuard(HitSensor *, HitSensor *); + void setMoveRail(BossKameckMoveRail*); + void setBattlePattarn(BossKameckBattlePattarn*); + bool requestDamage(HitSensor*, HitSensor*); + bool requestGuard(HitSensor*, HitSensor*); bool tryAttackWait(); bool trySummonKameck(); bool tryChargeBram(); @@ -46,16 +46,16 @@ public: bool isEnableDamage() const; bool isEnableGuard() const; - BossKameck* mBossKameck; // 0xC - BossKameckMoveRail* mMoveRail; // 0x10 - BossKameckBattlePattarn* mBattlePattarn; // 0x14 - KameckBeam* mBeam; // 0x18 - KameckBeamEventListener* mBeamListener; // 0x1C - TVec3f _20; - s32 _2C; - s32 _30; - s32 _34; - s32 _38; - u8 _3C; - u8 _3D; + BossKameck* mBossKameck; // 0xC + BossKameckMoveRail* mMoveRail; // 0x10 + BossKameckBattlePattarn* mBattlePattarn; // 0x14 + KameckBeam* mBeam; // 0x18 + KameckBeamEventListener* mBeamListener; // 0x1C + TVec3f _20; + s32 _2C; + s32 _30; + s32 _34; + s32 _38; + u8 _3C; + u8 _3D; }; diff --git a/include/Game/Boss/BossKameckVs1.hpp b/include/Game/Boss/BossKameckVs1.hpp index 0a5394af4..62049fb5c 100644 --- a/include/Game/Boss/BossKameckVs1.hpp +++ b/include/Game/Boss/BossKameckVs1.hpp @@ -10,9 +10,9 @@ public: virtual ~BossKameckVs1(); virtual void start(); - virtual void init(BossKameck *, const JMapInfoIter &); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual void init(BossKameck*, const JMapInfoIter&); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); void exeOpeningDemo(); void exeBattleLv1(); @@ -22,5 +22,5 @@ public: void exeEndDemo(); bool isBattle() const; - BossKameckStateBattle* mStateBattle; // 0x14 + BossKameckStateBattle* mStateBattle; // 0x14 }; diff --git a/include/Game/Boss/BossKameckVs2.hpp b/include/Game/Boss/BossKameckVs2.hpp index 579e9a6ad..eca1cfa1c 100644 --- a/include/Game/Boss/BossKameckVs2.hpp +++ b/include/Game/Boss/BossKameckVs2.hpp @@ -11,9 +11,9 @@ public: virtual ~BossKameckVs2(); virtual void start(); - virtual void init(BossKameck *, const JMapInfoIter &); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual void init(BossKameck*, const JMapInfoIter&); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); void exeOpeningDemo(); void exeBattleLv1(); @@ -24,6 +24,6 @@ public: void exeEndDemo(); bool isBattle() const; - BossKameckStateBattle* mStateBattle; // 0x14 - BossKameckBarrier* mBarrier; // 0x18 + BossKameckStateBattle* mStateBattle; // 0x14 + BossKameckBarrier* mBarrier; // 0x18 }; diff --git a/include/Game/Boss/BossStinkBug.hpp b/include/Game/Boss/BossStinkBug.hpp index e52a88edd..f1ec591fd 100644 --- a/include/Game/Boss/BossStinkBug.hpp +++ b/include/Game/Boss/BossStinkBug.hpp @@ -1,5 +1,5 @@ #pragma once namespace JMath { - void gekko_ps_copy12(void *, const void *); + void gekko_ps_copy12(void*, const void*); }; \ No newline at end of file diff --git a/include/Game/Boss/Koopa.hpp b/include/Game/Boss/Koopa.hpp index 25aba020d..20c7ca569 100644 --- a/include/Game/Boss/Koopa.hpp +++ b/include/Game/Boss/Koopa.hpp @@ -23,9 +23,9 @@ public: virtual bool receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); private: - /* 0x8C */ TVec3f _8C; - /* 0x98 */ KoopaSequencer* mSequencer; + /* 0x8C */ TVec3f _8C; + /* 0x98 */ KoopaSequencer* mSequencer; /* 0x9C */ KoopaSensorCtrl* mSensorCtrl; - /* 0xA0 */ KoopaParts* mParts; - /* 0xA4 */ ActorJointCtrl* mJointCtrl; + /* 0xA0 */ KoopaParts* mParts; + /* 0xA4 */ ActorJointCtrl* mJointCtrl; }; diff --git a/include/Game/Boss/KoopaFunction.hpp b/include/Game/Boss/KoopaFunction.hpp index 0623d5bf3..a7b36de76 100644 --- a/include/Game/Boss/KoopaFunction.hpp +++ b/include/Game/Boss/KoopaFunction.hpp @@ -3,5 +3,5 @@ #include "Game/Map/KoopaBattleMapStair.hpp" namespace KoopaFunction { - s32 registerBattleMapStair(KoopaBattleMapStair *); + s32 registerBattleMapStair(KoopaBattleMapStair*); }; diff --git a/include/Game/Boss/SkeletalFishBaby.hpp b/include/Game/Boss/SkeletalFishBaby.hpp index 2fc72b356..242388048 100644 --- a/include/Game/Boss/SkeletalFishBaby.hpp +++ b/include/Game/Boss/SkeletalFishBaby.hpp @@ -9,41 +9,41 @@ class SkeletalFishRailControl; class SkeletalFishBaby : public LiveActor { public: - SkeletalFishBaby(const char *); + SkeletalFishBaby(const char*); virtual ~SkeletalFishBaby(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calcAnim(); virtual void appear(); virtual void makeActorAppeared(); virtual void kill(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeSwim(); void exeBind(); void endBind(); void exeBreak(); void exeDead(); - bool calcJoint(TPos3f *, const JointControllerInfo &); - bool damage(const TVec3f &, bool); - void initRail(const JMapInfoIter &); + bool calcJoint(TPos3f*, const JointControllerInfo&); + bool damage(const TVec3f&, bool); + void initRail(const JMapInfoIter&); void initJoint(); void initSensor(); bool isAttackable() const; bool isStarPointerPointing() const; - JointController* mControllers[4]; // 0x8C - s32* mJointIndicies; // 0x9C - f32 _A0; - f32 _A4; - SkeletalFishRailControl* mRailControl; // 0xA8 - TPos3f _AC; - f32 _DC; - AnimScaleController* mScaleController; // 0xE0 - LiveActor* mStarPieceTargets[4]; // 0xE4 + JointController* mControllers[4]; // 0x8C + s32* mJointIndicies; // 0x9C + f32 _A0; + f32 _A4; + SkeletalFishRailControl* mRailControl; // 0xA8 + TPos3f _AC; + f32 _DC; + AnimScaleController* mScaleController; // 0xE0 + LiveActor* mStarPieceTargets[4]; // 0xE4 }; diff --git a/include/Game/Boss/SkeletalFishBabyRail.hpp b/include/Game/Boss/SkeletalFishBabyRail.hpp index e23db84f7..34a66dcc9 100644 --- a/include/Game/Boss/SkeletalFishBabyRail.hpp +++ b/include/Game/Boss/SkeletalFishBabyRail.hpp @@ -6,10 +6,10 @@ class SkeletalFishBabyRailHolder; class SkeletalFishBabyRail : public LiveActor { public: - SkeletalFishBabyRail(const char *); - + SkeletalFishBabyRail(const char*); + virtual ~SkeletalFishBabyRail(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); s32 _8C; }; \ No newline at end of file diff --git a/include/Game/Boss/SkeletalFishBabyRailHolder.hpp b/include/Game/Boss/SkeletalFishBabyRailHolder.hpp index 632784f93..0ea281f71 100644 --- a/include/Game/Boss/SkeletalFishBabyRailHolder.hpp +++ b/include/Game/Boss/SkeletalFishBabyRailHolder.hpp @@ -8,9 +8,9 @@ class SkeletalFishBabyRailSetLinkNode { public: SkeletalFishBabyRailSetLinkNode(); - SkeletalFishBabyRail* _0; - SkeletalFishBabyRail* _4; - u8 _8; + SkeletalFishBabyRail* _0; + SkeletalFishBabyRail* _4; + u8 _8; SkeletalFishBabyRailSetLinkNode* _C; SkeletalFishBabyRailSetLinkNode* _10; }; @@ -19,17 +19,17 @@ class SkeletalFishBabyRailGroupNode { public: SkeletalFishBabyRailGroupNode(s32); - void addChild(SkeletalFishBabyRail *); + void addChild(SkeletalFishBabyRail*); void createChild(); void tidy(); - s32 _0; - u32 mNumNodes; // 0x4 - u32 _8; - u32 _C; - SkeletalFishBabyRailGroupNode* _10; - SkeletalFishBabyRailGroupNode* _14; + s32 _0; + u32 mNumNodes; // 0x4 + u32 _8; + u32 _C; + SkeletalFishBabyRailGroupNode* _10; + SkeletalFishBabyRailGroupNode* _14; SkeletalFishBabyRailSetLinkNode* _18; SkeletalFishBabyRailSetLinkNode* _1C; SkeletalFishBabyRailSetLinkNode* _20; @@ -38,18 +38,18 @@ public: class SkeletalFishBabyRailHolder : public NameObj { public: - SkeletalFishBabyRailHolder(const char *); + SkeletalFishBabyRailHolder(const char*); virtual ~SkeletalFishBabyRailHolder(); virtual void initAfterPlacement(); - void add(SkeletalFishBabyRail *); + void add(SkeletalFishBabyRail*); SkeletalFishBabyRailGroupNode* createGroup(s32); - SkeletalFishBabyRailGroupNode* mNodes; // 0xC + SkeletalFishBabyRailGroupNode* mNodes; // 0xC }; namespace MR { - void createSkeletalFishBabyRailHolder(); + void createSkeletalFishBabyRailHolder(); SkeletalFishBabyRailHolder* getSkeletalFishBabyRailHolder(); -}; \ No newline at end of file +}; // namespace MR \ No newline at end of file diff --git a/include/Game/Boss/SkeletalFishBoss.hpp b/include/Game/Boss/SkeletalFishBoss.hpp index 89c287c41..a20c7525a 100644 --- a/include/Game/Boss/SkeletalFishBoss.hpp +++ b/include/Game/Boss/SkeletalFishBoss.hpp @@ -17,7 +17,6 @@ class SkeletalFishBossRail; class SkeletalFishBoss : public LiveActor { public: - struct SensorToCollider { const char* mJointName; const char* mColliderName; @@ -32,15 +31,15 @@ public: struct HitPos { const char* mName; const char* mSensorName; - Vec mOffset; + Vec mOffset; }; typedef void (SkeletalFishBoss::*SceneFunc)(void); - SkeletalFishBoss(const char *); + SkeletalFishBoss(const char*); virtual ~SkeletalFishBoss(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void calcAnim(); virtual void appear(); @@ -49,120 +48,120 @@ public: virtual void control(); virtual void calcAndSetBaseMtx(); - bool calcJoint(TPos3f *, const JointControllerInfo &); - void damage(const HitSensor *, const TVec3f &); - void exeSwim(); - void exeOpen(); - void exeOpenWait(); - void exeClose(); - void exeBite(); - void exeDamage(); - void exeDown(); - void exeDeadDamage(); - void exeDead(); - void exeAppearWait(); - void exeAppearDemo(); - void exePowerUpDemo(); - void exeDeadDemo(); - void exeBreakDemo(); - void exeDemoWait(); - void notifyAttack(SkeletalFishGuard *); - LiveActor* getCurrentRail(); - f32 getBodyThickness() const; + bool calcJoint(TPos3f*, const JointControllerInfo&); + void damage(const HitSensor*, const TVec3f&); + void exeSwim(); + void exeOpen(); + void exeOpenWait(); + void exeClose(); + void exeBite(); + void exeDamage(); + void exeDown(); + void exeDeadDamage(); + void exeDead(); + void exeAppearWait(); + void exeAppearDemo(); + void exePowerUpDemo(); + void exeDeadDemo(); + void exeBreakDemo(); + void exeDemoWait(); + void notifyAttack(SkeletalFishGuard*); + LiveActor* getCurrentRail(); + f32 getBodyThickness() const; SkeletalFishBossHead* getHeadActor() const; - void initLevelStatus(); - void initJoint(); - void initCollision(); - void initHead(); - void initScarFlash(); - void initBreakModel(); - void initSwitch(const JMapInfoIter &); - void createGuards(); - void initShadow(); - void initCamera(); - void validateCollision(); - void invalidateCollision(); - void getMouthSensorCenterPos(TVec3f &, f32) const; - void updateCollision(); - void powerUp(); - void startDamageAnim(); - void calcPlanetCenterPosition(); - bool calcGravityCenter(TVec3f *, const TVec3f &, const TVec3f &); - void resetRail(); - void updateBgm(); - LiveActor* getCurrentBossRail(); - void stopScene(const char *, const Nerve *, SceneFunc); - void startCamera(const char *); - void resetCamera(); - void playDamageBrk(); - void startAppearDemo(); - void endAppearDemo(); - void startPowerUpDemo(); - void endPowerUpDemo(); - void startDeadDemo(); - void endBreakDemo(); - bool isEnableToBeDamaged() const; + void initLevelStatus(); + void initJoint(); + void initCollision(); + void initHead(); + void initScarFlash(); + void initBreakModel(); + void initSwitch(const JMapInfoIter&); + void createGuards(); + void initShadow(); + void initCamera(); + void validateCollision(); + void invalidateCollision(); + void getMouthSensorCenterPos(TVec3f&, f32) const; + void updateCollision(); + void powerUp(); + void startDamageAnim(); + void calcPlanetCenterPosition(); + bool calcGravityCenter(TVec3f*, const TVec3f&, const TVec3f&); + void resetRail(); + void updateBgm(); + LiveActor* getCurrentBossRail(); + void stopScene(const char*, const Nerve*, SceneFunc); + void startCamera(const char*); + void resetCamera(); + void playDamageBrk(); + void startAppearDemo(); + void endAppearDemo(); + void startPowerUpDemo(); + void endPowerUpDemo(); + void startDeadDemo(); + void endBreakDemo(); + bool isEnableToBeDamaged() const; SkeletalFishBossInfo::LevelStatus* getLevelStatus() const { return mBossInfo->getLevelStatus(_110); } - JointController* mControllers[0xD]; - s32* mJointIndicies; // 0xC0 - CollisionParts** mPartsArray; // 0xC4 - SkeletalFishBossHead* mBossHead; // 0xC8 - SkeletalFishBossScarFlash* mScarFlash; // 0xCC - ModelObj* mBreakModel; // 0xD0 - const HitSensor* _D4; - TPos3f _D8; - SkeletalFishRailControl* mRailControl; // 0x108 - SkeletalFishBossBattleDirector* mBossDirector; // 0x10C - s32 _110; - s32 _114; - u32 _118; - CameraTargetMtx* mCameraTargetMtx; // 0x11C - TPos3f _120; - TPos3f _150; - TVec3f _180; - SceneFunc mSceneFunc; // 0x18C - const char* mCurScene; // 0x198 - const Nerve* mSceneNerve; // 0x19C - s32 _1A0; - s32 _1A4; - SkeletalFishBossInfo* mBossInfo; // 0x1A8 - SkeletalFishGuardHolder* mGuardHolder; // 0x1AC - u32 _1B0; - s32 _1B4; + JointController* mControllers[0xD]; + s32* mJointIndicies; // 0xC0 + CollisionParts** mPartsArray; // 0xC4 + SkeletalFishBossHead* mBossHead; // 0xC8 + SkeletalFishBossScarFlash* mScarFlash; // 0xCC + ModelObj* mBreakModel; // 0xD0 + const HitSensor* _D4; + TPos3f _D8; + SkeletalFishRailControl* mRailControl; // 0x108 + SkeletalFishBossBattleDirector* mBossDirector; // 0x10C + s32 _110; + s32 _114; + u32 _118; + CameraTargetMtx* mCameraTargetMtx; // 0x11C + TPos3f _120; + TPos3f _150; + TVec3f _180; + SceneFunc mSceneFunc; // 0x18C + const char* mCurScene; // 0x198 + const Nerve* mSceneNerve; // 0x19C + s32 _1A0; + s32 _1A4; + SkeletalFishBossInfo* mBossInfo; // 0x1A8 + SkeletalFishGuardHolder* mGuardHolder; // 0x1AC + u32 _1B0; + s32 _1B4; }; class SkeletalFishBossScarFlash : public PartsModel { public: - SkeletalFishBossScarFlash(LiveActor *); + SkeletalFishBossScarFlash(LiveActor*); virtual ~SkeletalFishBossScarFlash(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void control(); }; class SkeletalFishBossHead : public PartsModel { public: - SkeletalFishBossHead(LiveActor *); + SkeletalFishBossHead(LiveActor*); virtual ~SkeletalFishBossHead(); virtual void movement(); virtual void calcAnim(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + void updateCollisionMtx(); void createSubModel(); - TMtx34f _9C; + TMtx34f _9C; CollisionParts* _CC; - TMtx34f _D0; + TMtx34f _D0; CollisionParts* _100; - ModelObj* mLightModels[2]; // 0x104 - ModelObj* mBloomModels[2]; // 0x10C - u8 _114; + ModelObj* mLightModels[2]; // 0x104 + ModelObj* mBloomModels[2]; // 0x10C + u8 _114; }; diff --git a/include/Game/Boss/SkeletalFishBossBattleDirector.hpp b/include/Game/Boss/SkeletalFishBossBattleDirector.hpp index e4de1e293..3ee6806ce 100644 --- a/include/Game/Boss/SkeletalFishBossBattleDirector.hpp +++ b/include/Game/Boss/SkeletalFishBossBattleDirector.hpp @@ -8,16 +8,16 @@ class SubmarineVolcanoBigColumn; class SkeletalFishBossBattleDirector : public NameObj { public: - SkeletalFishBossBattleDirector(SkeletalFishBoss *); + SkeletalFishBossBattleDirector(SkeletalFishBoss*); virtual ~SkeletalFishBossBattleDirector(); virtual void movement(); - + void initiate(); void startPowerUpDemo1(); void startPowerUpDemo2(); - void playGuardAnim(const char *, s32); - void tryColumnCollision(HitSensor *); + void playGuardAnim(const char*, s32); + void tryColumnCollision(HitSensor*); void pauseOffCast(); void endPowerUpDemo1(); void endPowerUpDemo2(); @@ -25,10 +25,10 @@ public: void appearBirdLouse(); void killBirdLouse(); - SkeletalFishBoss* mFishBoss; // 0xC - SubmarineVolcanoBigColumn* mColumns[0x20]; // 0x10 - s32 _90; - LiveActor* _94[0x10]; - s32 _D4; - ModelObj* mGuardModels[4]; // 0xD8 + SkeletalFishBoss* mFishBoss; // 0xC + SubmarineVolcanoBigColumn* mColumns[0x20]; // 0x10 + s32 _90; + LiveActor* _94[0x10]; + s32 _D4; + ModelObj* mGuardModels[4]; // 0xD8 }; \ No newline at end of file diff --git a/include/Game/Boss/SkeletalFishBossFunc.hpp b/include/Game/Boss/SkeletalFishBossFunc.hpp index a881e1a2d..0a97a974b 100644 --- a/include/Game/Boss/SkeletalFishBossFunc.hpp +++ b/include/Game/Boss/SkeletalFishBossFunc.hpp @@ -5,6 +5,6 @@ class SkeletalFishBossFunc { public: - static s32 getNearestGuardPosID(const TVec3f &); - static bool copyGuardPos(TVec3f *, s32); + static s32 getNearestGuardPosID(const TVec3f&); + static bool copyGuardPos(TVec3f*, s32); }; \ No newline at end of file diff --git a/include/Game/Boss/SkeletalFishBossInfo.hpp b/include/Game/Boss/SkeletalFishBossInfo.hpp index 903684435..73d9e8d58 100644 --- a/include/Game/Boss/SkeletalFishBossInfo.hpp +++ b/include/Game/Boss/SkeletalFishBossInfo.hpp @@ -7,13 +7,12 @@ class SkeletalFishBoss; class SkeletalFishBossInfo : public NameObj { public: - class GuardStatus { public: GuardStatus(); - TVec3f mGuardPosLevel; // 0x0 - s32 mGuardWaitLevelID; // 0xC + TVec3f mGuardPosLevel; // 0x0 + s32 mGuardWaitLevelID; // 0xC }; struct LevelStatus { @@ -22,26 +21,26 @@ public: return &mStatusArray[idx]; } - s32 mEnergyLevel; // 0x0 - f32 mSpeedLevel; // 0x4 - s32 mRailIDLevel; // 0x8 - f32 mGuardOffsLevel; // 0xC - s32 mGuardAppearNumLevel; // 0x10 - SkeletalFishBossInfo::GuardStatus* mStatusArray; // 0x14 + s32 mEnergyLevel; // 0x0 + f32 mSpeedLevel; // 0x4 + s32 mRailIDLevel; // 0x8 + f32 mGuardOffsLevel; // 0xC + s32 mGuardAppearNumLevel; // 0x10 + SkeletalFishBossInfo::GuardStatus* mStatusArray; // 0x14 }; - SkeletalFishBossInfo(SkeletalFishBoss *, s32, s32, const char *); + SkeletalFishBossInfo(SkeletalFishBoss*, s32, s32, const char*); virtual ~SkeletalFishBossInfo(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); LevelStatus* getLevelStatus(s32) const; - void createLevelStatus(); - void loadLevelStatus(const JMapInfoIter &); - void loadGuardStatus(const JMapInfoIter &, s32, s32); + void createLevelStatus(); + void loadLevelStatus(const JMapInfoIter&); + void loadGuardStatus(const JMapInfoIter&, s32, s32); - SkeletalFishBoss* mFishBoss; // 0xC - s32 mLevelNum; // 0x10 - s32 mGuardNum; // 0x14 - LevelStatus* mLevelStatusArray; // 0x18 + SkeletalFishBoss* mFishBoss; // 0xC + s32 mLevelNum; // 0x10 + s32 mGuardNum; // 0x14 + LevelStatus* mLevelStatusArray; // 0x18 }; \ No newline at end of file diff --git a/include/Game/Boss/SkeletalFishBossRail.hpp b/include/Game/Boss/SkeletalFishBossRail.hpp index b9b1ecdd6..c17bb5ac0 100644 --- a/include/Game/Boss/SkeletalFishBossRail.hpp +++ b/include/Game/Boss/SkeletalFishBossRail.hpp @@ -4,20 +4,20 @@ class SkeletalFishBossRail : public LiveActor { public: - SkeletalFishBossRail(const char *); + SkeletalFishBossRail(const char*); virtual ~SkeletalFishBossRail(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); bool isFillUpPoint(s32) const; - s32 getFillUpNamePos(s32) const; + s32 getFillUpNamePos(s32) const; void createFillUpFlag(); void createFillUpNamePosID(); void linkFillUpNamePosID(); - s32 _8C; - bool* mFillUpFlags; // 0x90 - s32* mNamePosIDs; // 0x94 - f32 _98; + s32 _8C; + bool* mFillUpFlags; // 0x90 + s32* mNamePosIDs; // 0x94 + f32 _98; }; \ No newline at end of file diff --git a/include/Game/Boss/SkeletalFishBossRailHolder.hpp b/include/Game/Boss/SkeletalFishBossRailHolder.hpp index dfca4b573..3a6c43bc3 100644 --- a/include/Game/Boss/SkeletalFishBossRailHolder.hpp +++ b/include/Game/Boss/SkeletalFishBossRailHolder.hpp @@ -6,19 +6,19 @@ class SkeletalFishBossRail; class SkeletalFishBossRailHolder : public NameObj { public: - SkeletalFishBossRailHolder(const char *); + SkeletalFishBossRailHolder(const char*); virtual ~SkeletalFishBossRailHolder(); - void add(SkeletalFishBossRail *); + void add(SkeletalFishBossRail*); SkeletalFishBossRail* getInOrder(s32) const; SkeletalFishBossRail* getByID(s32) const; - s32 mNumRails; // 0xC - SkeletalFishBossRail* mRails[3]; // 0x10 + s32 mNumRails; // 0xC + SkeletalFishBossRail* mRails[3]; // 0x10 }; namespace MR { SkeletalFishBossRailHolder* getSkeletalFishBossRailHolder(); - void createSkeletalFishBossRailHolder(); -}; \ No newline at end of file + void createSkeletalFishBossRailHolder(); +}; // namespace MR \ No newline at end of file diff --git a/include/Game/Boss/SkeletalFishGuard.hpp b/include/Game/Boss/SkeletalFishGuard.hpp index 25c4e64ff..942220607 100644 --- a/include/Game/Boss/SkeletalFishGuard.hpp +++ b/include/Game/Boss/SkeletalFishGuard.hpp @@ -7,16 +7,16 @@ class SkeletalFishBoss; class SkeletalFishGuard : public LiveActor { public: - SkeletalFishGuard(SkeletalFishBoss *, const char *); + SkeletalFishGuard(SkeletalFishBoss*, const char*); virtual ~SkeletalFishGuard(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void appear(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); void exeWait(); void exeAppear(); @@ -35,37 +35,37 @@ public: void waitAttack(s32); void initSensor(); void calcTransAndFront(); - void rotateHorizontal(const TVec3f &, f32); - void rotateVertical(const TVec3f &, f32); + void rotateHorizontal(const TVec3f&, f32); + void rotateVertical(const TVec3f&, f32); bool tryShiftApart(); bool tryShiftStraight(); bool tryShiftKill(); - void turn(TVec3f *, const TVec3f &, const TVec3f &, f32); + void turn(TVec3f*, const TVec3f&, const TVec3f&, f32); void lookToPlayer(f32, f32); - void calcTarget(TVec3f *, TVec3f *, TVec3f *, s32); + void calcTarget(TVec3f*, TVec3f*, TVec3f*, s32); bool isInScreen() const; bool isPlayerInAttackRange() const; bool isLineOfSightClear() const; - bool tryShiftNumb(const Nerve *); + bool tryShiftNumb(const Nerve*); - u32 _8C; - SkeletalFishBoss* mFishBoss; // 0x90 - TVec3f _94; - u32 _A0; - TVec3f _A4; - f32 _B0; - f32 _B4; - f32 _B8; - f32 _BC; - s32 mAttackDelay; // 0xC0 - f32 _C4; - f32 _C8; - const Nerve* _CC; - TVec3f _D0; - TVec3f _DC; - TVec3f _E8; - TVec3f _F4; - TVec3f _100; - TVec3f _10C; - AnimScaleController* mScaleController; // 0x118 + u32 _8C; + SkeletalFishBoss* mFishBoss; // 0x90 + TVec3f _94; + u32 _A0; + TVec3f _A4; + f32 _B0; + f32 _B4; + f32 _B8; + f32 _BC; + s32 mAttackDelay; // 0xC0 + f32 _C4; + f32 _C8; + const Nerve* _CC; + TVec3f _D0; + TVec3f _DC; + TVec3f _E8; + TVec3f _F4; + TVec3f _100; + TVec3f _10C; + AnimScaleController* mScaleController; // 0x118 }; diff --git a/include/Game/Boss/SkeletalFishGuardHolder.hpp b/include/Game/Boss/SkeletalFishGuardHolder.hpp index f62f83f6d..096e58068 100644 --- a/include/Game/Boss/SkeletalFishGuardHolder.hpp +++ b/include/Game/Boss/SkeletalFishGuardHolder.hpp @@ -8,7 +8,7 @@ class SkeletalFishBossRail; class SkeletalFishGuardHolder : public NameObj { public: - SkeletalFishGuardHolder(SkeletalFishBoss *, s32, const char *); + SkeletalFishGuardHolder(SkeletalFishBoss*, s32, const char*); virtual ~SkeletalFishGuardHolder(); virtual void movement(); @@ -16,20 +16,20 @@ public: void forceAppearAll(); void forceKillAll(); void killAll(); - void notifyAttack(SkeletalFishGuard *); + void notifyAttack(SkeletalFishGuard*); void invalidate(); void validate(); void checkRailChangedAndReset(); - s32 countAppearableGuard() const; - s32 countGuardAlive() const; + s32 countAppearableGuard() const; + s32 countGuardAlive() const; void checkDistanceAndAppear(s32); void appearGuard(s32, s32); void createAndInitGuard(); - SkeletalFishBoss* mFishBoss; // 0xC - SkeletalFishBossRail* mBossRail; // 0x10 - s32 mNumGuards; // 0x14 - SkeletalFishGuard** mGuards; // 0x18 - f32 _1C; - u8 _20; + SkeletalFishBoss* mFishBoss; // 0xC + SkeletalFishBossRail* mBossRail; // 0x10 + s32 mNumGuards; // 0x14 + SkeletalFishGuard** mGuards; // 0x18 + f32 _1C; + u8 _20; }; \ No newline at end of file diff --git a/include/Game/Boss/SkeletalFishJointCalc.hpp b/include/Game/Boss/SkeletalFishJointCalc.hpp index b932a6d24..d80693949 100644 --- a/include/Game/Boss/SkeletalFishJointCalc.hpp +++ b/include/Game/Boss/SkeletalFishJointCalc.hpp @@ -5,5 +5,5 @@ class SkeletalFishJointCalc { public: - static void calcJoint(TPos3f *, const TPos3f *, SkeletalFishRailControl *, const JointControllerInfo &); + static void calcJoint(TPos3f*, const TPos3f*, SkeletalFishRailControl*, const JointControllerInfo&); }; \ No newline at end of file diff --git a/include/Game/Boss/SkeletalFishRailControl.hpp b/include/Game/Boss/SkeletalFishRailControl.hpp index 296a4070c..4b23917ed 100644 --- a/include/Game/Boss/SkeletalFishRailControl.hpp +++ b/include/Game/Boss/SkeletalFishRailControl.hpp @@ -4,24 +4,24 @@ struct SkeletalFishRailInfo { LiveActor* _0; - f32 _4; + f32 _4; }; class SkeletalFishRailControl { public: SkeletalFishRailControl(); - void setRailActor(LiveActor *, LiveActor *, bool); + void setRailActor(LiveActor*, LiveActor*, bool); void update(); - void getRailInfo(SkeletalFishRailInfo *, f32); - void getPos(TVec3f *, f32); - void getMtx(TPos3f *, f32); + void getRailInfo(SkeletalFishRailInfo*, f32); + void getPos(TVec3f*, f32); + void getMtx(TPos3f*, f32); - u32 _0; + u32 _0; LiveActor* _4; LiveActor* _8; - f32 _C; - f32 _10; - f32 _14; - bool _18; + f32 _C; + f32 _10; + f32 _14; + bool _18; }; \ No newline at end of file diff --git a/include/Game/Boss/TripodBoss.hpp b/include/Game/Boss/TripodBoss.hpp index a1a1ace53..610cd2f22 100644 --- a/include/Game/Boss/TripodBoss.hpp +++ b/include/Game/Boss/TripodBoss.hpp @@ -17,9 +17,9 @@ public: _0.identity(); } - void setAttachBaseMatrix(const TPos3f &); + void setAttachBaseMatrix(const TPos3f&); - TMtx34f _0; + TMtx34f _0; const TPos3f* _30; }; @@ -41,84 +41,84 @@ public: Part_EndJoint = 6 }; - TripodBoss(const char *); + TripodBoss(const char*); virtual ~TripodBoss(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void kill(); virtual void control(); virtual void calcAndSetBaseMtx(); - void initEventCamera(const JMapInfoIter &); - void initLeg(const JMapInfoIter &); - void initLegIKPlacement(); - void initMovableArea(const TPos3f &); - void initBodyPosition(); - void initBoneInfo(); - void initPose(); - bool tryStartStep(); - bool tryChangeSequence(); - bool tryEndSequence(); - bool tryNextSequence(); - bool tryDamage(); - bool tryWaitStep(); - bool tryNextStep(); - bool tryLeaveLegOutOfPlayer(); - bool tryEndLeaveLegOutOfPlayer(); - bool tryEndDamage(); - bool tryBreak(); - void requestOpeningDemo(); - bool tryDamageDemo(); - void requestEndDamageDemo(); - void exeWait(); - void exeStep(); - void exeWaitStep(); - void exeChangeSequence(); - void exeLeaveLegOutOfPlayer(); - void exeDamage(); - void exeStartDemo(); - void exeDamageDemo(); - void exePainDemo(); - void exeBreakDownDemo(); - void exeExplosionDemo(); - inline void exeNonActive(); - inline void exeTryStartDemo(); - bool isStopLeg(s32) const; - bool isStopAllLeg() const; - bool isStarted() const; - bool isDemo() const; - bool isStartDemo() const NO_INLINE; - bool isDamageDemo() const NO_INLINE; - bool isEndDemo() const; - bool isEndPainDemo() const NO_INLINE; - bool isEndBreakDownDemo() const NO_INLINE; - bool isEndExplosionDemo() const NO_INLINE; - bool isBroken() const; - bool isRideMario() const; - bool isLeaveMarioNow() const; - void setJointAttachBaseMatrix(const TPos3f &, s32); - void addStepPoint(TripodBossStepPoint *); - void getBodyMatrix(TPos3f *) const; - void getJointMatrix(TPos3f *, s32) const; - void getJointAttachMatrix(TPos3f *, s32) const; - void requestStartStepSequence(s32); + void initEventCamera(const JMapInfoIter&); + void initLeg(const JMapInfoIter&); + void initLegIKPlacement(); + void initMovableArea(const TPos3f&); + void initBodyPosition(); + void initBoneInfo(); + void initPose(); + bool tryStartStep(); + bool tryChangeSequence(); + bool tryEndSequence(); + bool tryNextSequence(); + bool tryDamage(); + bool tryWaitStep(); + bool tryNextStep(); + bool tryLeaveLegOutOfPlayer(); + bool tryEndLeaveLegOutOfPlayer(); + bool tryEndDamage(); + bool tryBreak(); + void requestOpeningDemo(); + bool tryDamageDemo(); + void requestEndDamageDemo(); + void exeWait(); + void exeStep(); + void exeWaitStep(); + void exeChangeSequence(); + void exeLeaveLegOutOfPlayer(); + void exeDamage(); + void exeStartDemo(); + void exeDamageDemo(); + void exePainDemo(); + void exeBreakDownDemo(); + void exeExplosionDemo(); + inline void exeNonActive(); + inline void exeTryStartDemo(); + bool isStopLeg(s32) const; + bool isStopAllLeg() const; + bool isStarted() const; + bool isDemo() const; + bool isStartDemo() const NO_INLINE; + bool isDamageDemo() const NO_INLINE; + bool isEndDemo() const; + bool isEndPainDemo() const NO_INLINE; + bool isEndBreakDownDemo() const NO_INLINE; + bool isEndExplosionDemo() const NO_INLINE; + bool isBroken() const; + bool isRideMario() const; + bool isLeaveMarioNow() const; + void setJointAttachBaseMatrix(const TPos3f&, s32); + void addStepPoint(TripodBossStepPoint*); + void getBodyMatrix(TPos3f*) const; + void getJointMatrix(TPos3f*, s32) const; + void getJointAttachMatrix(TPos3f*, s32) const; + void requestStartStepSequence(s32); TripodBossStepSequence* getCurrentStepSequence(); TripodBossStepSequence* getNextStepSequence(); - void calcLegUpVector(TVec3f *, const TVec3f &); - void calcDemoMovement(); - void calcBodyMovement(); - void calcLegMovement(); - void addAccelToWeightPosition(); - void calcClippingSphere(); - void clippingModel(); - void startDemo(); - void endDemo(const char *); - void checkRideMario(); - const TPos3f* getLegMatrixPtr(PART_ID, SUB_PART_ID) const; - void changeBgmState(); - static s32 getPartIDFromBoneID(s32); - void setAttachBaseMatrix(const TPos3f &); + void calcLegUpVector(TVec3f*, const TVec3f&); + void calcDemoMovement(); + void calcBodyMovement(); + void calcLegMovement(); + void addAccelToWeightPosition(); + void calcClippingSphere(); + void clippingModel(); + void startDemo(); + void endDemo(const char*); + void checkRideMario(); + const TPos3f* getLegMatrixPtr(PART_ID, SUB_PART_ID) const; + void changeBgmState(); + static s32 getPartIDFromBoneID(s32); + void setAttachBaseMatrix(const TPos3f&); inline TripodBossLeg* getLeg(s32 idx) const { return mLegs[idx]; @@ -132,44 +132,44 @@ public: return (_634 == 0) || (_634 == 1); } - TPos3f mBodyMtx; // 0x8C - TPos3f _BC; - TPos3f _EC; - ModelObj* mLowModel; // 0x11C - TripodBossBone mBossBones[0x16]; // 0x120 - TripodBossLeg* mLegs[3]; // 0x598 - TripodBossStepPoint* mStepPoints[3]; // 0x5A4 - TripodBossMovableArea* mMovableArea; // 0x5B0 - TripodBossStepSequence* mStepSequence; // 0x5B4 - DummyDisplayModel* mDummyModel; // 0x5B8 - TVec3f _5BC; - TVec3f _5C8; - TVec3f _5D4; - TVec3f _5E0; - TVec3f _5EC; - f32 _5F8; - f32 _5FC; - f32 _600; - f32 _604; - f32 _608; - f32 _60C; - f32 _610; - f32 _614; - f32 _618; - f32 _61C; - f32 _620; - s32 mCurrentStepSeq; // 0x624 - s32 mNextStepSeq; // 0x628 - s32 _62C; - s32 _630; - s32 _634; - u8 _638; - s32 _63C; - u8 _640; - ActorCameraInfo* mEventCamera; // 0x644 + TPos3f mBodyMtx; // 0x8C + TPos3f _BC; + TPos3f _EC; + ModelObj* mLowModel; // 0x11C + TripodBossBone mBossBones[0x16]; // 0x120 + TripodBossLeg* mLegs[3]; // 0x598 + TripodBossStepPoint* mStepPoints[3]; // 0x5A4 + TripodBossMovableArea* mMovableArea; // 0x5B0 + TripodBossStepSequence* mStepSequence; // 0x5B4 + DummyDisplayModel* mDummyModel; // 0x5B8 + TVec3f _5BC; + TVec3f _5C8; + TVec3f _5D4; + TVec3f _5E0; + TVec3f _5EC; + f32 _5F8; + f32 _5FC; + f32 _600; + f32 _604; + f32 _608; + f32 _60C; + f32 _610; + f32 _614; + f32 _618; + f32 _61C; + f32 _620; + s32 mCurrentStepSeq; // 0x624 + s32 mNextStepSeq; // 0x628 + s32 _62C; + s32 _630; + s32 _634; + u8 _638; + s32 _63C; + u8 _640; + ActorCameraInfo* mEventCamera; // 0x644 }; namespace MR { - NameObj* createTripodBoss(const char *); - NameObj* createTripod2Boss(const char *); -}; + NameObj* createTripodBoss(const char*); + NameObj* createTripod2Boss(const char*); +}; // namespace MR diff --git a/include/Game/Boss/TripodBossAccesser.hpp b/include/Game/Boss/TripodBossAccesser.hpp index 28269e04e..b64cdd2af 100644 --- a/include/Game/Boss/TripodBossAccesser.hpp +++ b/include/Game/Boss/TripodBossAccesser.hpp @@ -4,27 +4,27 @@ class TripodBossAccesser : public NameObj { public: - TripodBossAccesser(const char *); + TripodBossAccesser(const char*); virtual ~TripodBossAccesser(); - void setTriPodBoss(TripodBoss *); - void addTripodBossParts(LiveActor *); - void showTripodBossParts(); - void hideTripodBossParts(); - void activeTripodBossParts(); - bool isTripoddBossParts(const NameObj *) const; + void setTriPodBoss(TripodBoss*); + void addTripodBossParts(LiveActor*); + void showTripodBossParts(); + void hideTripodBossParts(); + void activeTripodBossParts(); + bool isTripoddBossParts(const NameObj*) const; static TripodBossAccesser* createSceneObj(); - TripodBoss* mBoss; // 0xC - LiveActor* mParts[0x100]; // 0x10 - s32 mNumParts; // 0x410 + TripodBoss* mBoss; // 0xC + LiveActor* mParts[0x100]; // 0x10 + s32 mNumParts; // 0x410 }; namespace MR { - void addTripodBossParts(LiveActor *); - void addTripodBossPartsMovement(NameObj *); - bool isTripoddBossParts(const NameObj *); + void addTripodBossParts(LiveActor*); + void addTripodBossPartsMovement(NameObj*); + bool isTripoddBossParts(const NameObj*); void showTripodBossParts(); void hideTripodBossParts(); void activeTripodBossParts(); @@ -40,13 +40,13 @@ namespace MR { bool isRideMarioTripodBoss(); bool tryDamageDemoTripodBoss(); void requestEndDamageDemoTripodBoss(); - u32 getTripodBossGravityHostID(); - void setTripodBossJointAttachBaseMatrix(const TPos3f &, s32); + u32 getTripodBossGravityHostID(); + void setTripodBossJointAttachBaseMatrix(const TPos3f&, s32); void requestStartTripodBossStepSequence(s32); - void addTripodBossStepPoint(TripodBossStepPoint *); - void getTripodBossJointMatrix(TPos3f *, s32); - void getTripodBossAttachJointMatrix(TPos3f *, s32) NO_INLINE; - void concatTripodBossAttachJointMatrix(TPos3f *, s32); + void addTripodBossStepPoint(TripodBossStepPoint*); + void getTripodBossJointMatrix(TPos3f*, s32); + void getTripodBossAttachJointMatrix(TPos3f*, s32) NO_INLINE; + void concatTripodBossAttachJointMatrix(TPos3f*, s32); bool isSteppingTripodBossLegID(s32) NO_INLINE; bool isSteppingTripodBossJointID(s32); -}; +}; // namespace MR diff --git a/include/Game/Boss/TripodBossBaseJointPosition.hpp b/include/Game/Boss/TripodBossBaseJointPosition.hpp index 54995a4bc..b7e368401 100644 --- a/include/Game/Boss/TripodBossBaseJointPosition.hpp +++ b/include/Game/Boss/TripodBossBaseJointPosition.hpp @@ -6,14 +6,14 @@ class TripodBossBaseJointPosition : public LiveActor { public: - TripodBossBaseJointPosition(const char *); + TripodBossBaseJointPosition(const char*); virtual ~TripodBossBaseJointPosition(); - virtual void init(const JMapInfoIter &); - virtual void initAfterPlacement(); + virtual void init(const JMapInfoIter&); + virtual void initAfterPlacement(); virtual MtxPtr getBaseMtx() const; - virtual void control(); + virtual void control(); - s32 _8C; + s32 _8C; TPos3f _90; }; diff --git a/include/Game/Boss/TripodBossBreakMovement.hpp b/include/Game/Boss/TripodBossBreakMovement.hpp index 1c4e1dbbd..28f9cccf4 100644 --- a/include/Game/Boss/TripodBossBreakMovement.hpp +++ b/include/Game/Boss/TripodBossBreakMovement.hpp @@ -5,27 +5,27 @@ class TripodBossBreakMovement : public LiveActor { public: - TripodBossBreakMovement(const char *); + TripodBossBreakMovement(const char*); virtual ~TripodBossBreakMovement(); virtual void movement(); - void start(const TPos3f &, s32); + void start(const TPos3f&, s32); void setBreakDownLevel(s32); void exeStartBreak(); void exeBreak(); - void exeWait() { } + void exeWait() {} - TPos3f _8C; - SpringValue* mSpring; // 0xBC - TVec3f _C0; - TVec3f _CC; - TVec3f _D8; - TVec3f _E4; - f32 _F0; - f32 _F4; - f32 _F8; - u32 _FC; - s32 _100; - u32 _104; + TPos3f _8C; + SpringValue* mSpring; // 0xBC + TVec3f _C0; + TVec3f _CC; + TVec3f _D8; + TVec3f _E4; + f32 _F0; + f32 _F4; + f32 _F8; + u32 _FC; + s32 _100; + u32 _104; }; diff --git a/include/Game/Boss/TripodBossCoin.hpp b/include/Game/Boss/TripodBossCoin.hpp index 73b2851d9..255feaf08 100644 --- a/include/Game/Boss/TripodBossCoin.hpp +++ b/include/Game/Boss/TripodBossCoin.hpp @@ -8,17 +8,17 @@ class Spine; class TripodBossCoin : public NameObj { public: - TripodBossCoin(const char *); + TripodBossCoin(const char*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); void exeNonActive(); void exeActive(); void exeEnd(); - /* 0x0C */ Coin* mCoin; + /* 0x0C */ Coin* mCoin; /* 0x10 */ Spine* mSpine; /* 0x14 */ TPos3f _14; - /* 0x44 */ s32 _44; + /* 0x44 */ s32 _44; }; diff --git a/include/Game/Boss/TripodBossCore.hpp b/include/Game/Boss/TripodBossCore.hpp index 3dc0f121d..d72427503 100644 --- a/include/Game/Boss/TripodBossCore.hpp +++ b/include/Game/Boss/TripodBossCore.hpp @@ -5,20 +5,20 @@ class TripodBossCore : public TripodBossFixPartsBase { public: - TripodBossCore(const char *); + TripodBossCore(const char*); virtual ~TripodBossCore(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); virtual void activateTripodBoss(); - void exeWait(); - void exeDamageDemo(); - void exeWarning(); - void exeBreak(); + void exeWait(); + void exeDamageDemo(); + void exeWarning(); + void exeBreak(); inline void exeNonActive(); - ModelObj* mBreakModel; // 0xE4 - ModelObj* mBloomModel; // 0xE8 + ModelObj* mBreakModel; // 0xE4 + ModelObj* mBloomModel; // 0xE8 }; diff --git a/include/Game/Boss/TripodBossFixParts.hpp b/include/Game/Boss/TripodBossFixParts.hpp index 41ea9b687..14517a483 100644 --- a/include/Game/Boss/TripodBossFixParts.hpp +++ b/include/Game/Boss/TripodBossFixParts.hpp @@ -5,24 +5,24 @@ class TripodBossFixParts : public TripodBossFixPartsBase { public: - TripodBossFixParts(const char *); + TripodBossFixParts(const char*); virtual ~TripodBossFixParts(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); virtual void activateTripodBoss(); virtual void exeWaitOwn(); - void initSensor(const JMapInfoIter &); - void exeStartDemo(); - void exeWait(); - void exeBreak(); + void initSensor(const JMapInfoIter&); + void exeStartDemo(); + void exeWait(); + void exeBreak(); inline void exeNonActive(); - s32 _E4; - s32 _E8; - bool mHasCollision; // 0xEC + s32 _E4; + s32 _E8; + bool mHasCollision; // 0xEC bool _ED; - u8 _EE; - bool mIsPlayingWarning; // 0xEF + u8 _EE; + bool mIsPlayingWarning; // 0xEF }; diff --git a/include/Game/Boss/TripodBossFixPartsBase.hpp b/include/Game/Boss/TripodBossFixPartsBase.hpp index 52d3db883..9d7f4646c 100644 --- a/include/Game/Boss/TripodBossFixPartsBase.hpp +++ b/include/Game/Boss/TripodBossFixPartsBase.hpp @@ -7,30 +7,30 @@ class TripodBossFixPartsBase : public LiveActor { public: - TripodBossFixPartsBase(const char *); + TripodBossFixPartsBase(const char*); virtual ~TripodBossFixPartsBase(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void makeActorDead(); virtual void calcAndSetBaseMtx(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); - virtual void calcTripodLocalMatrix(TPos3f *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); + virtual void calcTripodLocalMatrix(TPos3f*); virtual void activateTripodBoss(); void initClippingSphere(); - void setClippingSphere(const TVec3f &, f32); + void setClippingSphere(const TVec3f&, f32); void startBreakMovement(); void updateBreakMovementMatrix(); void updateTripodMatrix(); void initBreakMovement(s32); - TPos3f _8C; - TVec3f _BC; - TripodBossBreakMovement* mBreakMovement; // 0xC8 - s32 _CC; - TVec3f _D0; - f32 mClippingDistance; // 0xDC - u8 _E0; - u8 _E1; + TPos3f _8C; + TVec3f _BC; + TripodBossBreakMovement* mBreakMovement; // 0xC8 + s32 _CC; + TVec3f _D0; + f32 mClippingDistance; // 0xDC + u8 _E0; + u8 _E1; }; diff --git a/include/Game/Boss/TripodBossGuardWall.hpp b/include/Game/Boss/TripodBossGuardWall.hpp index 61722ae01..e83bc23c3 100644 --- a/include/Game/Boss/TripodBossGuardWall.hpp +++ b/include/Game/Boss/TripodBossGuardWall.hpp @@ -4,32 +4,32 @@ #include "Game/LiveActor/HitSensor.hpp" #include "Game/LiveActor/LiveActor.hpp" -class TripodBossGuardWall :public LiveActor { +class TripodBossGuardWall : public LiveActor { public: - TripodBossGuardWall(const char *); + TripodBossGuardWall(const char*); - virtual void init(const JMapInfoIter &); - virtual void makeActorAppeared(); - virtual void kill(); - virtual void makeActorDead(); + virtual void init(const JMapInfoIter&); + virtual void makeActorAppeared(); + virtual void kill(); + virtual void makeActorDead(); virtual MtxPtr getBaseMtx() const; - virtual void control(); - virtual void calcAndSetBaseMtx(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void control(); + virtual void calcAndSetBaseMtx(); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void initParts(); - void requestStart(); - void exeRotate(); - void updateMatrix(); - void updateCameraTarget(); - void exeDemo(); + void initParts(); + void requestStart(); + void exeRotate(); + void updateMatrix(); + void updateCameraTarget(); + void exeDemo(); inline void exeTryDemo(); - void exeWait() { } + void exeWait() {} - CameraTargetMtx* mCameraTargetMtx; // 0x8C - TripodBossGuardWallPart mWallParts[8]; // 0x90 - TPos3f mBaseMtx; // 0x550 - TVec3f _580; - s32 _58C; - ActorCameraInfo* mCameraInfo; // 0x590 + CameraTargetMtx* mCameraTargetMtx; // 0x8C + TripodBossGuardWallPart mWallParts[8]; // 0x90 + TPos3f mBaseMtx; // 0x550 + TVec3f _580; + s32 _58C; + ActorCameraInfo* mCameraInfo; // 0x590 }; diff --git a/include/Game/Boss/TripodBossGuardWallPart.hpp b/include/Game/Boss/TripodBossGuardWallPart.hpp index f88e45fd4..b1af865ca 100644 --- a/include/Game/Boss/TripodBossGuardWallPart.hpp +++ b/include/Game/Boss/TripodBossGuardWallPart.hpp @@ -5,28 +5,28 @@ class TripodBossGuardWallPart : public LiveActor { public: - TripodBossGuardWallPart(const char *pName = "三脚ボスコア防壁部品"); + TripodBossGuardWallPart(const char* pName = "三脚ボスコア防壁部品"); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void makeActorAppeared(); virtual void kill(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); - - void requestStartDemo(); - bool requestBreak(); - bool isEndDemo() const; - void exeBreak(); - void exeRepair(); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); + + void requestStartDemo(); + bool requestBreak(); + bool isEndDemo() const; + void exeBreak(); + void exeRepair(); inline void exeActive(); inline void exeDemo(); inline void exeNonActive(); - void setHostMatrix(const TPos3f *); - void setPlacementAngle(f32); - void setStartTiming(s32); + void setHostMatrix(const TPos3f*); + void setPlacementAngle(f32); + void setStartTiming(s32); - const TPos3f* mHostMtx; // 0x8C - f32 mPlacementAngle; // 0x90 - s32 mStartTiming; // 0x94 + const TPos3f* mHostMtx; // 0x8C + f32 mPlacementAngle; // 0x90 + s32 mStartTiming; // 0x94 }; diff --git a/include/Game/Boss/TripodBossKillerGeneraterCircle.hpp b/include/Game/Boss/TripodBossKillerGeneraterCircle.hpp index 8b929d11f..03f7c6cd3 100644 --- a/include/Game/Boss/TripodBossKillerGeneraterCircle.hpp +++ b/include/Game/Boss/TripodBossKillerGeneraterCircle.hpp @@ -5,21 +5,21 @@ class TripodBossKillerGeneraterCircle : public NameObj { public: - TripodBossKillerGeneraterCircle(const char *); + TripodBossKillerGeneraterCircle(const char*); virtual ~TripodBossKillerGeneraterCircle(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); void placementGenerater(); - TripodBossKillerGenerater* mGenerators; // 0xC - TVec3f mPosition; // 0x10 - TVec3f mRotation; // 0x1C - const f32* mAngleTable; // 0x28 - s32 mNumAngles; // 0x2C - f32 _30; - f32 _34; - f32 _38; - f32 _3C; - u32 _40; + TripodBossKillerGenerater* mGenerators; // 0xC + TVec3f mPosition; // 0x10 + TVec3f mRotation; // 0x1C + const f32* mAngleTable; // 0x28 + s32 mNumAngles; // 0x2C + f32 _30; + f32 _34; + f32 _38; + f32 _3C; + u32 _40; }; diff --git a/include/Game/Boss/TripodBossKillerGenerator.hpp b/include/Game/Boss/TripodBossKillerGenerator.hpp index 339f2f890..bf6bb2f16 100644 --- a/include/Game/Boss/TripodBossKillerGenerator.hpp +++ b/include/Game/Boss/TripodBossKillerGenerator.hpp @@ -7,40 +7,40 @@ class HomingKiller; class TripodBossKillerGenerater : public TripodBossFixPartsBase { public: - TripodBossKillerGenerater(const char *pName = "三脚ボスキラー発生源"); + TripodBossKillerGenerater(const char* pName = "三脚ボスキラー発生源"); virtual ~TripodBossKillerGenerater(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); - virtual void calcTripodLocalMatrix(TPos3f *); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); + virtual void calcTripodLocalMatrix(TPos3f*); virtual void activateTripodBoss(); - void setLocalMatrix(const TPos3f &); - void setActiveLebel(s32); - void setHasCollision(bool); - bool tryShootSetting(); - bool tryShoot(); - bool tryCoolDown(); - bool tryReady(); - bool tryBreak(); - bool tryAbort(); - bool requestBreak(); - void exeShowDemo(); - void exeReady(); - void exeShootSetting(); - void exeShoot(); - void exeCoolDown(); - void exeStop(); - void exeRestart(); - void exeBreak(); + void setLocalMatrix(const TPos3f&); + void setActiveLebel(s32); + void setHasCollision(bool); + bool tryShootSetting(); + bool tryShoot(); + bool tryCoolDown(); + bool tryReady(); + bool tryBreak(); + bool tryAbort(); + bool requestBreak(); + void exeShowDemo(); + void exeReady(); + void exeShootSetting(); + void exeShoot(); + void exeCoolDown(); + void exeStop(); + void exeRestart(); + void exeBreak(); inline void exeHide(); inline void exeNonActive(); - TPos3f _E4; - HomingKiller* mKiller; // 0x114 - f32 _118; - s32 mActiveLabel; // 0x11C - bool mHasCollision; // 0x120 - u8 _121; + TPos3f _E4; + HomingKiller* mKiller; // 0x114 + f32 _118; + s32 mActiveLabel; // 0x11C + bool mHasCollision; // 0x120 + u8 _121; }; diff --git a/include/Game/Boss/TripodBossKinokoOneUp.hpp b/include/Game/Boss/TripodBossKinokoOneUp.hpp index 85eab26bc..3ed70d7de 100644 --- a/include/Game/Boss/TripodBossKinokoOneUp.hpp +++ b/include/Game/Boss/TripodBossKinokoOneUp.hpp @@ -6,18 +6,18 @@ class BenefitItemOneUp; class TripodBossKinokoOneUp : public LiveActor { public: - TripodBossKinokoOneUp(const char *); + TripodBossKinokoOneUp(const char*); virtual ~TripodBossKinokoOneUp(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual MtxPtr getBaseMtx() const; - virtual void control(); + virtual void control(); void exeActive(); void exeEnd(); - - TPos3f _8C; - TPos3f _BC; - BenefitItemOneUp* mOneUp; // 0xEC - s32 _F0; + + TPos3f _8C; + TPos3f _BC; + BenefitItemOneUp* mOneUp; // 0xEC + s32 _F0; }; diff --git a/include/Game/Boss/TripodBossLeg.hpp b/include/Game/Boss/TripodBossLeg.hpp index f37503379..01971ba14 100644 --- a/include/Game/Boss/TripodBossLeg.hpp +++ b/include/Game/Boss/TripodBossLeg.hpp @@ -12,23 +12,23 @@ class TripodBossStepPoint; class TripodBossLeg : public LiveActor { public: - TripodBossLeg(const char *); + TripodBossLeg(const char*); virtual ~TripodBossLeg(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void makeActorAppeared(); virtual void makeActorDead(); virtual void control(); - virtual void attackSensor(HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); - void initShadow(const char *); - void setBody(TripodBoss *); - void setMovableArea(TripodBossMovableArea *); - void setIKParam(f32, f32, const TVec3f &, const TVec3f &, const TVec3f &); - void setStepTarget(TripodBossStepPoint *); - void setWait(); - void setForceEndPoint(const TVec3f &); - void setDemoEffectTiming(bool); + void initShadow(const char*); + void setBody(TripodBoss*); + void setMovableArea(TripodBossMovableArea*); + void setIKParam(f32, f32, const TVec3f&, const TVec3f&, const TVec3f&); + void setStepTarget(TripodBossStepPoint*); + void setWait(); + void setForceEndPoint(const TVec3f&); + void setDemoEffectTiming(bool); const TPos3f& getRootJointMatrix() const; const TPos3f& getMiddleJointMatrix() const; const TPos3f& getEndJointMatrix() const; @@ -36,74 +36,74 @@ public: const TPos3f& getRootLocalYZMatrix() const; const TPos3f& getAnkleLocalXMatrix() const; const TPos3f& getAnkleLocalXZMatrix() const; - void requestStepTarget(TripodBossStepPoint *); - void requestLeaveOut(); - void requestBreak(); - void requestStartDemo(); - void requestEndDemo(); - bool isLanding() const; - bool isDamage() const; - bool isStop() const; - bool isBroken() const; - bool isPressPlayer() const; - bool canStep() const; - bool canCancelStep() const; - bool canWeighting() const; - void exeDemo(); - void exeUp(); - void exeLeaveOut(); - void exeMove(); - void exeMoveToLandingPos(); - void exeStampSign(); - void exeLanding(); - void exeDamageVibration(); - void exeBreak(); - inline void exeDamage(); - inline void exeHold(); - void addToTargetPower(const TVec3f &, f32); - void addIKLimitPower(); - void addAccelUpLeg(TripodBossStepPoint *, f32); - f32 calcLegHeight(TripodBossStepPoint *) const NO_INLINE; - void updatePose(); - void updateIKPose(); - bool bindEndPosition(); - void separateLocalAxisRootJoint(const TPos3f &); - void separateAnkleJointLocalAxis(); - void updateAnkleUp(f32); - void updateAnkleSlerpToBasePose(); - void updateAnkleLanding(); - void updateAnkleShadowMatrix(); + void requestStepTarget(TripodBossStepPoint*); + void requestLeaveOut(); + void requestBreak(); + void requestStartDemo(); + void requestEndDemo(); + bool isLanding() const; + bool isDamage() const; + bool isStop() const; + bool isBroken() const; + bool isPressPlayer() const; + bool canStep() const; + bool canCancelStep() const; + bool canWeighting() const; + void exeDemo(); + void exeUp(); + void exeLeaveOut(); + void exeMove(); + void exeMoveToLandingPos(); + void exeStampSign(); + void exeLanding(); + void exeDamageVibration(); + void exeBreak(); + inline void exeDamage(); + inline void exeHold(); + void addToTargetPower(const TVec3f&, f32); + void addIKLimitPower(); + void addAccelUpLeg(TripodBossStepPoint*, f32); + f32 calcLegHeight(TripodBossStepPoint*) const NO_INLINE; + void updatePose(); + void updateIKPose(); + bool bindEndPosition(); + void separateLocalAxisRootJoint(const TPos3f&); + void separateAnkleJointLocalAxis(); + void updateAnkleUp(f32); + void updateAnkleSlerpToBasePose(); + void updateAnkleLanding(); + void updateAnkleShadowMatrix(); - TripodBoss* mBoss; // 0x8C - TripodBossMovableArea* mMoveArea; // 0x90 - TripodBossStepPoint* _94; - TripodBossStepPoint* _98; - IKJoint* mJoint; // 0x9C - TPos3f _A0; - TPos3f mRootLocalYMtx; // 0xD0 - TPos3f mRootLocalYZMtx; // 0x100 - TPos3f mAnkleLocalXMtx; // 0x130 - TPos3f mAnkleLocalXZMtx; // 0x160 - TPos3f mEndJointMtx; // 0x190 - TPos3f _1C0; - TQuat4f _1F0; - TQuat4f _200; - TVec3f _210; - TVec3f _21C; - TVec3f mForceEndPoint; // 0x228 - TVec3f _234; - TVec3f _240; - u32 _24C; - f32 _250; - u8 _254; - bool mIsPressPlayer; // 0x255 - u8 _256; - u8 _257; - s32 mDemoTiming; // 0x258 - AudAnmSoundObject* _25C; - AudAnmSoundObject* _260; + TripodBoss* mBoss; // 0x8C + TripodBossMovableArea* mMoveArea; // 0x90 + TripodBossStepPoint* _94; + TripodBossStepPoint* _98; + IKJoint* mJoint; // 0x9C + TPos3f _A0; + TPos3f mRootLocalYMtx; // 0xD0 + TPos3f mRootLocalYZMtx; // 0x100 + TPos3f mAnkleLocalXMtx; // 0x130 + TPos3f mAnkleLocalXZMtx; // 0x160 + TPos3f mEndJointMtx; // 0x190 + TPos3f _1C0; + TQuat4f _1F0; + TQuat4f _200; + TVec3f _210; + TVec3f _21C; + TVec3f mForceEndPoint; // 0x228 + TVec3f _234; + TVec3f _240; + u32 _24C; + f32 _250; + u8 _254; + bool mIsPressPlayer; // 0x255 + u8 _256; + u8 _257; + s32 mDemoTiming; // 0x258 + AudAnmSoundObject* _25C; + AudAnmSoundObject* _260; }; namespace MR { - void separateMatrixRotateYZX(TPos3f *, TPos3f *, const TPos3f &, const TPos3f &); + void separateMatrixRotateYZX(TPos3f*, TPos3f*, const TPos3f&, const TPos3f&); }; diff --git a/include/Game/Boss/TripodBossMovableArea.hpp b/include/Game/Boss/TripodBossMovableArea.hpp index caebb1790..d4d816fd7 100644 --- a/include/Game/Boss/TripodBossMovableArea.hpp +++ b/include/Game/Boss/TripodBossMovableArea.hpp @@ -16,21 +16,20 @@ class TripodBossMovableArea { public: TripodBossMovableArea(); - virtual bool collideSphere(HitResult *, const TVec3f &, f32, const TVec3f &) const; - virtual void calcNearLandingPosition(TVec3f *, const TVec3f &) const; - virtual void calcLandingNormal(TVec3f *, const TVec3f &) const; - virtual void calcLandingFront(TVec3f *, const TVec3f &) const; + virtual bool collideSphere(HitResult*, const TVec3f&, f32, const TVec3f&) const; + virtual void calcNearLandingPosition(TVec3f*, const TVec3f&) const; + virtual void calcLandingNormal(TVec3f*, const TVec3f&) const; + virtual void calcLandingFront(TVec3f*, const TVec3f&) const; - void setCenter(const TVec3f &); - void setBaseAxis(const TVec3f &); - void setFrontVector(const TVec3f &); + void setCenter(const TVec3f&); + void setBaseAxis(const TVec3f&); + void setFrontVector(const TVec3f&); void setRadius(f32); - - TVec3f mCenter; // 0x04 - TVec3f mBaseAxis; // 0x10 - TVec3f mFront; // 0x1C - f32 mRadius; // 0x28 - f32 _2C; - f32 _30; + TVec3f mCenter; // 0x04 + TVec3f mBaseAxis; // 0x10 + TVec3f mFront; // 0x1C + f32 mRadius; // 0x28 + f32 _2C; + f32 _30; }; diff --git a/include/Game/Boss/TripodBossRailMoveParts.hpp b/include/Game/Boss/TripodBossRailMoveParts.hpp index 4368ffbbc..aa39b229e 100644 --- a/include/Game/Boss/TripodBossRailMoveParts.hpp +++ b/include/Game/Boss/TripodBossRailMoveParts.hpp @@ -6,14 +6,14 @@ class MapPartsRailMover; class TripodBossRailMoveParts : public TripodBossFixParts { public: - TripodBossRailMoveParts(const char *); + TripodBossRailMoveParts(const char*); virtual ~TripodBossRailMoveParts(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void makeActorDead(); - virtual void calcTripodLocalMatrix(TPos3f *); + virtual void calcTripodLocalMatrix(TPos3f*); virtual void activateTripodBoss(); virtual void exeWaitOwn(); - MapPartsRailMover* mRailMover; // 0xF0 + MapPartsRailMover* mRailMover; // 0xF0 }; diff --git a/include/Game/Boss/TripodBossRotateParts.hpp b/include/Game/Boss/TripodBossRotateParts.hpp index ebe04e411..8853bb7cc 100644 --- a/include/Game/Boss/TripodBossRotateParts.hpp +++ b/include/Game/Boss/TripodBossRotateParts.hpp @@ -6,14 +6,14 @@ class MapPartsRotator; class TripodBossRotateParts : public TripodBossFixParts { public: - TripodBossRotateParts(const char *); + TripodBossRotateParts(const char*); virtual ~TripodBossRotateParts(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void makeActorDead(); - virtual void calcTripodLocalMatrix(TPos3f *); + virtual void calcTripodLocalMatrix(TPos3f*); virtual void activateTripodBoss(); virtual void exeWaitOwn(); - MapPartsRotator* mRotator; // 0xF0 + MapPartsRotator* mRotator; // 0xF0 }; diff --git a/include/Game/Boss/TripodBossShell.hpp b/include/Game/Boss/TripodBossShell.hpp index 86690ebf2..870ac56fc 100644 --- a/include/Game/Boss/TripodBossShell.hpp +++ b/include/Game/Boss/TripodBossShell.hpp @@ -5,17 +5,17 @@ class TripodBossShell : public TripodBossFixPartsBase { public: - TripodBossShell(const char *); + TripodBossShell(const char*); virtual ~TripodBossShell(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); virtual void activateTripodBoss(); - void exeBreak(); + void exeBreak(); inline void exeWait(); inline void exeNonActive(); - - ModelObj* mBreakModel; // 0xE4 + + ModelObj* mBreakModel; // 0xE4 }; diff --git a/include/Game/Boss/TripodBossStepPoint.hpp b/include/Game/Boss/TripodBossStepPoint.hpp index a5b137ee0..c84bd2fd5 100644 --- a/include/Game/Boss/TripodBossStepPoint.hpp +++ b/include/Game/Boss/TripodBossStepPoint.hpp @@ -4,21 +4,21 @@ class TripodBossStepPoint : public LiveActor { public: - TripodBossStepPoint(const char *); + TripodBossStepPoint(const char*); virtual ~TripodBossStepPoint(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); - void setStepPosition(const TVec3f &); - void setStepNormal(const TVec3f &); - void setStepFront(const TVec3f &); + void setStepPosition(const TVec3f&); + void setStepNormal(const TVec3f&); + void setStepFront(const TVec3f&); - TVec3f mStepPosition; // 0x8C - TVec3f mStepNormal; // 0x98 - TVec3f mStepFront; // 0xA4 - s32 mLeg; // 0xB0 - s32 _B4; - s32 _B8; - s32 mWaitTime; // 0xBC + TVec3f mStepPosition; // 0x8C + TVec3f mStepNormal; // 0x98 + TVec3f mStepFront; // 0xA4 + s32 mLeg; // 0xB0 + s32 _B4; + s32 _B8; + s32 mWaitTime; // 0xBC }; diff --git a/include/Game/Boss/TripodBossStepSequence.hpp b/include/Game/Boss/TripodBossStepSequence.hpp index f04611a46..b5a75da84 100644 --- a/include/Game/Boss/TripodBossStepSequence.hpp +++ b/include/Game/Boss/TripodBossStepSequence.hpp @@ -8,16 +8,16 @@ class TripodBossStepSequence { public: TripodBossStepSequence(); - void addStepPoint(TripodBossStepPoint *); - s32 getCurrentLeg() const; - s32 getCurrentWaitTime() const; + void addStepPoint(TripodBossStepPoint*); + s32 getCurrentLeg() const; + s32 getCurrentWaitTime() const; TripodBossStepPoint* getCurrentStepPoint(); - void nextStep(); - bool isEmpty() const; - void reset(); + void nextStep(); + bool isEmpty() const; + void reset(); - TripodBossStepPoint* mStepPoints[0x20]; // 0x00 - s32 mCurrentPoint; // 0x80 - s32 mPointNum; // 0x84 - u8 _88; + TripodBossStepPoint* mStepPoints[0x20]; // 0x00 + s32 mCurrentPoint; // 0x80 + s32 mPointNum; // 0x84 + u8 _88; }; diff --git a/include/Game/Boss/TripodBossStepStartArea.hpp b/include/Game/Boss/TripodBossStepStartArea.hpp index 51afe552c..d7ba66c7a 100644 --- a/include/Game/Boss/TripodBossStepStartArea.hpp +++ b/include/Game/Boss/TripodBossStepStartArea.hpp @@ -4,11 +4,11 @@ class TripodBossStepStartArea : public AreaObj { public: - TripodBossStepStartArea(int, const char *); + TripodBossStepStartArea(int, const char*); virtual ~TripodBossStepStartArea(); - virtual void init(const JMapInfoIter &); - virtual void movement(); + virtual void init(const JMapInfoIter&); + virtual void movement(); virtual const char* getManagerName() const; s32 _3C; diff --git a/include/Game/Camera/CamHeliEffector.hpp b/include/Game/Camera/CamHeliEffector.hpp index efeab0bb6..9e8aeb65d 100644 --- a/include/Game/Camera/CamHeliEffector.hpp +++ b/include/Game/Camera/CamHeliEffector.hpp @@ -8,7 +8,7 @@ class CamHeliEffector { public: CamHeliEffector(); - void update(CameraMan *); + void update(CameraMan*); u32 _0; f32 _4; diff --git a/include/Game/Camera/CamKarikariEffector.hpp b/include/Game/Camera/CamKarikariEffector.hpp index d1ed5afc6..af34c00a2 100644 --- a/include/Game/Camera/CamKarikariEffector.hpp +++ b/include/Game/Camera/CamKarikariEffector.hpp @@ -8,7 +8,7 @@ class CamKarikariEffector { public: CamKarikariEffector(); - void update(CameraMan *); + void update(CameraMan*); u32 _0; }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorAnim.hpp b/include/Game/Camera/CamTranslatorAnim.hpp index 8478c7058..b5281109e 100644 --- a/include/Game/Camera/CamTranslatorAnim.hpp +++ b/include/Game/Camera/CamTranslatorAnim.hpp @@ -6,14 +6,14 @@ class CameraParamChunk; class CamTranslatorAnim : public CamTranslatorBase { public: - inline CamTranslatorAnim(CameraAnim *pCamera) { + inline CamTranslatorAnim(CameraAnim* pCamera) { mCamera = pCamera; } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - u32 getAnimFrame(const CameraParamChunk *) const; + u32 getAnimFrame(const CameraParamChunk*) const; - CameraAnim *mCamera; // 0x4 + CameraAnim* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorBehind.hpp b/include/Game/Camera/CamTranslatorBehind.hpp index 29be373e8..903bba55e 100644 --- a/include/Game/Camera/CamTranslatorBehind.hpp +++ b/include/Game/Camera/CamTranslatorBehind.hpp @@ -4,12 +4,12 @@ class CamTranslatorBehind : public CamTranslatorBase { public: - inline CamTranslatorBehind(CameraBehind *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorBehind(CameraBehind* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraBehind *mCamera; // 0x4 + CameraBehind* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorBlackHole.hpp b/include/Game/Camera/CamTranslatorBlackHole.hpp index 5f1b5e70c..e008f6e51 100644 --- a/include/Game/Camera/CamTranslatorBlackHole.hpp +++ b/include/Game/Camera/CamTranslatorBlackHole.hpp @@ -4,12 +4,12 @@ class CamTranslatorBlackHole : public CamTranslatorBase { public: - inline CamTranslatorBlackHole(CameraBlackHole *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorBlackHole(CameraBlackHole* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraBlackHole *mCamera; // 0x4 + CameraBlackHole* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorCharmedFix.hpp b/include/Game/Camera/CamTranslatorCharmedFix.hpp index ff92a8017..b270d0d64 100644 --- a/include/Game/Camera/CamTranslatorCharmedFix.hpp +++ b/include/Game/Camera/CamTranslatorCharmedFix.hpp @@ -4,12 +4,12 @@ class CamTranslatorCharmedFix : public CamTranslatorBase { public: - inline CamTranslatorCharmedFix(CameraCharmedFix *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorCharmedFix(CameraCharmedFix* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraCharmedFix *mCamera; // 0x4 + CameraCharmedFix* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorCharmedTripodBoss.hpp b/include/Game/Camera/CamTranslatorCharmedTripodBoss.hpp index 860b9d9cb..6abf23fd0 100644 --- a/include/Game/Camera/CamTranslatorCharmedTripodBoss.hpp +++ b/include/Game/Camera/CamTranslatorCharmedTripodBoss.hpp @@ -4,12 +4,12 @@ class CamTranslatorCharmedTripodBoss : public CamTranslatorBase { public: - inline CamTranslatorCharmedTripodBoss(CameraCharmedTripodBoss *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorCharmedTripodBoss(CameraCharmedTripodBoss* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraCharmedTripodBoss *mCamera; // 0x4 + CameraCharmedTripodBoss* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorCharmedVecReg.hpp b/include/Game/Camera/CamTranslatorCharmedVecReg.hpp index 100045b6d..d6c701d72 100644 --- a/include/Game/Camera/CamTranslatorCharmedVecReg.hpp +++ b/include/Game/Camera/CamTranslatorCharmedVecReg.hpp @@ -4,12 +4,12 @@ class CamTranslatorCharmedVecReg : public CamTranslatorBase { public: - inline CamTranslatorCharmedVecReg(CameraCharmedVecReg *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorCharmedVecReg(CameraCharmedVecReg* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraCharmedVecReg *mCamera; // 0x4 + CameraCharmedVecReg* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorCharmedVecRegTower.hpp b/include/Game/Camera/CamTranslatorCharmedVecRegTower.hpp index 79eb39ca1..d7b620bfb 100644 --- a/include/Game/Camera/CamTranslatorCharmedVecRegTower.hpp +++ b/include/Game/Camera/CamTranslatorCharmedVecRegTower.hpp @@ -4,12 +4,12 @@ class CamTranslatorCharmedVecRegTower : public CamTranslatorBase { public: - inline CamTranslatorCharmedVecRegTower(CameraCharmedVecRegTower *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorCharmedVecRegTower(CameraCharmedVecRegTower* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraCharmedVecRegTower *mCamera; // 0x4 + CameraCharmedVecRegTower* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorCubePlanet.hpp b/include/Game/Camera/CamTranslatorCubePlanet.hpp index 848d481b4..26021f224 100644 --- a/include/Game/Camera/CamTranslatorCubePlanet.hpp +++ b/include/Game/Camera/CamTranslatorCubePlanet.hpp @@ -4,12 +4,12 @@ class CamTranslatorCubePlanet : public CamTranslatorBase { public: - inline CamTranslatorCubePlanet(CameraCubePlanet *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorCubePlanet(CameraCubePlanet* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraCubePlanet *mCamera; // 0x4 + CameraCubePlanet* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorDPD.hpp b/include/Game/Camera/CamTranslatorDPD.hpp index 0d93e185a..8dfe37d1c 100644 --- a/include/Game/Camera/CamTranslatorDPD.hpp +++ b/include/Game/Camera/CamTranslatorDPD.hpp @@ -4,12 +4,12 @@ class CamTranslatorDPD : public CamTranslatorBase { public: - inline CamTranslatorDPD(CameraDPD *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorDPD(CameraDPD* pCamera) { + mCamera = pCamera; + } - void setParam(const CameraParamChunk *); - Camera *getCamera() const; + void setParam(const CameraParamChunk*); + Camera* getCamera() const; - CameraDPD *mCamera; // 0x4 + CameraDPD* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorDead.hpp b/include/Game/Camera/CamTranslatorDead.hpp index 709857135..c374a3580 100644 --- a/include/Game/Camera/CamTranslatorDead.hpp +++ b/include/Game/Camera/CamTranslatorDead.hpp @@ -4,10 +4,10 @@ class CamTranslatorDead : public CamTranslatorBase { public: - CamTranslatorDead(CameraDead *); + CamTranslatorDead(CameraDead*); - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraDead *mCamera; // 0x4 + CameraDead* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorFix.hpp b/include/Game/Camera/CamTranslatorFix.hpp index ad894ef3a..828f3940f 100644 --- a/include/Game/Camera/CamTranslatorFix.hpp +++ b/include/Game/Camera/CamTranslatorFix.hpp @@ -4,12 +4,12 @@ class CamTranslatorFix : public CamTranslatorBase { public: - inline CamTranslatorFix(CameraFix *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorFix(CameraFix* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraFix *mCamera; // 0x4 + CameraFix* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorFixedPoint.hpp b/include/Game/Camera/CamTranslatorFixedPoint.hpp index 324d77c4f..eb6fd9eb9 100644 --- a/include/Game/Camera/CamTranslatorFixedPoint.hpp +++ b/include/Game/Camera/CamTranslatorFixedPoint.hpp @@ -4,12 +4,12 @@ class CamTranslatorFixedPoint : public CamTranslatorBase { public: - inline CamTranslatorFixedPoint(CameraFixedPoint *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorFixedPoint(CameraFixedPoint* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraFixedPoint *mCamera; // 0x4 + CameraFixedPoint* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorFixedThere.hpp b/include/Game/Camera/CamTranslatorFixedThere.hpp index 569471805..3bd4ac035 100644 --- a/include/Game/Camera/CamTranslatorFixedThere.hpp +++ b/include/Game/Camera/CamTranslatorFixedThere.hpp @@ -4,12 +4,12 @@ class CamTranslatorFixedThere : public CamTranslatorBase { public: - inline CamTranslatorFixedThere(CameraFixedThere *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorFixedThere(CameraFixedThere* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraFixedThere *mCamera; // 0x4 + CameraFixedThere* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorFollow.hpp b/include/Game/Camera/CamTranslatorFollow.hpp index 23fa4bc33..19d047be4 100644 --- a/include/Game/Camera/CamTranslatorFollow.hpp +++ b/include/Game/Camera/CamTranslatorFollow.hpp @@ -4,10 +4,10 @@ class CamTranslatorFollow : public CamTranslatorBase { public: - CamTranslatorFollow(CameraFollow *); + CamTranslatorFollow(CameraFollow*); - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraFollow *mCamera; // 0x4 + CameraFollow* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorFooFighter.hpp b/include/Game/Camera/CamTranslatorFooFighter.hpp index 61999138f..99fa5ee30 100644 --- a/include/Game/Camera/CamTranslatorFooFighter.hpp +++ b/include/Game/Camera/CamTranslatorFooFighter.hpp @@ -4,10 +4,10 @@ class CamTranslatorFooFighter : public CamTranslatorBase { public: - CamTranslatorFooFighter(CameraFooFighter *); + CamTranslatorFooFighter(CameraFooFighter*); - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraFooFighter *mCamera; // 0x4 + CameraFooFighter* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorFooFighterPlanet.hpp b/include/Game/Camera/CamTranslatorFooFighterPlanet.hpp index 76928f955..0aa2b4063 100644 --- a/include/Game/Camera/CamTranslatorFooFighterPlanet.hpp +++ b/include/Game/Camera/CamTranslatorFooFighterPlanet.hpp @@ -4,10 +4,10 @@ class CamTranslatorFooFighterPlanet : public CamTranslatorBase { public: - CamTranslatorFooFighterPlanet(CameraFooFighterPlanet *); + CamTranslatorFooFighterPlanet(CameraFooFighterPlanet*); - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraFooFighterPlanet *mCamera; // 0x4 + CameraFooFighterPlanet* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorFrontAndBack.hpp b/include/Game/Camera/CamTranslatorFrontAndBack.hpp index a0110a86a..58a31b73a 100644 --- a/include/Game/Camera/CamTranslatorFrontAndBack.hpp +++ b/include/Game/Camera/CamTranslatorFrontAndBack.hpp @@ -4,12 +4,12 @@ class CamTranslatorFrontAndBack : public CamTranslatorBase { public: - CamTranslatorFrontAndBack(CameraFrontAndBack *pCamera) { - mCamera = pCamera; - } + CamTranslatorFrontAndBack(CameraFrontAndBack* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraFrontAndBack *mCamera; // 0x4 + CameraFrontAndBack* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorGround.hpp b/include/Game/Camera/CamTranslatorGround.hpp index ad4ffb09d..e0b50e77c 100644 --- a/include/Game/Camera/CamTranslatorGround.hpp +++ b/include/Game/Camera/CamTranslatorGround.hpp @@ -4,12 +4,12 @@ class CamTranslatorGround : public CamTranslatorBase { public: - inline CamTranslatorGround(CameraGround *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorGround(CameraGround* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraGround *mCamera; + CameraGround* mCamera; }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorInnerCylinder.hpp b/include/Game/Camera/CamTranslatorInnerCylinder.hpp index 5abb00dcf..a8c9bea2e 100644 --- a/include/Game/Camera/CamTranslatorInnerCylinder.hpp +++ b/include/Game/Camera/CamTranslatorInnerCylinder.hpp @@ -4,12 +4,12 @@ class CamTranslatorInnerCylinder : public CamTranslatorBase { public: - inline CamTranslatorInnerCylinder(CameraInnerCylinder *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorInnerCylinder(CameraInnerCylinder* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraInnerCylinder *mCamera; // 0x4 + CameraInnerCylinder* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorInwardSphere.hpp b/include/Game/Camera/CamTranslatorInwardSphere.hpp index 1e0625f68..1e24addfe 100644 --- a/include/Game/Camera/CamTranslatorInwardSphere.hpp +++ b/include/Game/Camera/CamTranslatorInwardSphere.hpp @@ -4,12 +4,12 @@ class CamTranslatorInwardSphere : public CamTranslatorBase { public: - inline CamTranslatorInwardSphere(CameraInwardSphere *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorInwardSphere(CameraInwardSphere* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraInwardSphere *mCamera; // 0x4 + CameraInwardSphere* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorInwardTower.hpp b/include/Game/Camera/CamTranslatorInwardTower.hpp index 0a086fe01..f72dfa48d 100644 --- a/include/Game/Camera/CamTranslatorInwardTower.hpp +++ b/include/Game/Camera/CamTranslatorInwardTower.hpp @@ -4,12 +4,12 @@ class CamTranslatorInwardTower : public CamTranslatorBase { public: - inline CamTranslatorInwardTower(CameraInwardTower *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorInwardTower(CameraInwardTower* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraInwardTower *mCamera; // 0x4 + CameraInwardTower* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorMedianPlanet.hpp b/include/Game/Camera/CamTranslatorMedianPlanet.hpp index a535bb0cd..3d2ec1520 100644 --- a/include/Game/Camera/CamTranslatorMedianPlanet.hpp +++ b/include/Game/Camera/CamTranslatorMedianPlanet.hpp @@ -4,10 +4,10 @@ class CamTranslatorMedianPlanet : public CamTranslatorBase { public: - CamTranslatorMedianPlanet(CameraMedianPlanet *); + CamTranslatorMedianPlanet(CameraMedianPlanet*); - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraMedianPlanet *mCamera; // 0x4 + CameraMedianPlanet* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorMedianTower.hpp b/include/Game/Camera/CamTranslatorMedianTower.hpp index d7818c56d..e26c157a9 100644 --- a/include/Game/Camera/CamTranslatorMedianTower.hpp +++ b/include/Game/Camera/CamTranslatorMedianTower.hpp @@ -4,12 +4,12 @@ class CamTranslatorMedianTower : public CamTranslatorBase { public: - inline CamTranslatorMedianTower(CameraMedianTower *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorMedianTower(CameraMedianTower* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraMedianTower *mCamera; // 0x4 + CameraMedianTower* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorMtxRegParallel.hpp b/include/Game/Camera/CamTranslatorMtxRegParallel.hpp index 24e7be743..a38edec20 100644 --- a/include/Game/Camera/CamTranslatorMtxRegParallel.hpp +++ b/include/Game/Camera/CamTranslatorMtxRegParallel.hpp @@ -4,12 +4,12 @@ class CamTranslatorMtxRegParallel : public CamTranslatorBase { public: - inline CamTranslatorMtxRegParallel(CameraMtxRegParallel *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorMtxRegParallel(CameraMtxRegParallel* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraMtxRegParallel *mCamera; // 0x4 + CameraMtxRegParallel* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorObjParallel.hpp b/include/Game/Camera/CamTranslatorObjParallel.hpp index b5e1bba40..b48ed6887 100644 --- a/include/Game/Camera/CamTranslatorObjParallel.hpp +++ b/include/Game/Camera/CamTranslatorObjParallel.hpp @@ -4,12 +4,12 @@ class CamTranslatorObjParallel : public CamTranslatorBase { public: - inline CamTranslatorObjParallel(CameraObjParallel *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorObjParallel(CameraObjParallel* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraObjParallel *mCamera; // 0x4 + CameraObjParallel* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorParallel.hpp b/include/Game/Camera/CamTranslatorParallel.hpp index e3574379e..72598eabf 100644 --- a/include/Game/Camera/CamTranslatorParallel.hpp +++ b/include/Game/Camera/CamTranslatorParallel.hpp @@ -4,12 +4,12 @@ class CamTranslatorParallel : public CamTranslatorBase { public: - inline CamTranslatorParallel(CameraParallel *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorParallel(CameraParallel* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraParallel *mCamera; // 0x4 + CameraParallel* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorRaceFollow.hpp b/include/Game/Camera/CamTranslatorRaceFollow.hpp index fb8052027..b65089f77 100644 --- a/include/Game/Camera/CamTranslatorRaceFollow.hpp +++ b/include/Game/Camera/CamTranslatorRaceFollow.hpp @@ -4,12 +4,12 @@ class CamTranslatorRaceFollow : public CamTranslatorBase { public: - inline CamTranslatorRaceFollow(CameraRaceFollow *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorRaceFollow(CameraRaceFollow* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraRaceFollow *mCamera; // 0x4 + CameraRaceFollow* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorRailDemo.hpp b/include/Game/Camera/CamTranslatorRailDemo.hpp index 9bb0e1563..f8066e63c 100644 --- a/include/Game/Camera/CamTranslatorRailDemo.hpp +++ b/include/Game/Camera/CamTranslatorRailDemo.hpp @@ -4,12 +4,12 @@ class CamTranslatorRailDemo : public CamTranslatorBase { public: - inline CamTranslatorRailDemo(CameraRailDemo *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorRailDemo(CameraRailDemo* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraRailDemo *mCamera; // 0x4 + CameraRailDemo* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorRailFollow.hpp b/include/Game/Camera/CamTranslatorRailFollow.hpp index 46c33130a..6a161deca 100644 --- a/include/Game/Camera/CamTranslatorRailFollow.hpp +++ b/include/Game/Camera/CamTranslatorRailFollow.hpp @@ -4,12 +4,12 @@ class CamTranslatorRailFollow : public CamTranslatorBase { public: - inline CamTranslatorRailFollow(CameraRailFollow *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorRailFollow(CameraRailFollow* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraRailFollow *mCamera; // 0x4 + CameraRailFollow* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorRailWatch.hpp b/include/Game/Camera/CamTranslatorRailWatch.hpp index 41d279436..502aa3d88 100644 --- a/include/Game/Camera/CamTranslatorRailWatch.hpp +++ b/include/Game/Camera/CamTranslatorRailWatch.hpp @@ -4,12 +4,12 @@ class CamTranslatorRailWatch : public CamTranslatorBase { public: - inline CamTranslatorRailWatch(CameraRailWatch *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorRailWatch(CameraRailWatch* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraRailWatch *mCamera; // 0x4 + CameraRailWatch* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorSlide.hpp b/include/Game/Camera/CamTranslatorSlide.hpp index 0791d86a8..6caedd34c 100644 --- a/include/Game/Camera/CamTranslatorSlide.hpp +++ b/include/Game/Camera/CamTranslatorSlide.hpp @@ -4,12 +4,12 @@ class CamTranslatorSlide : public CamTranslatorBase { public: - inline CamTranslatorSlide(CameraSlide *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorSlide(CameraSlide* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraSlide *mCamera; // 0x4 + CameraSlide* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorSpiral.hpp b/include/Game/Camera/CamTranslatorSpiral.hpp index dce22b827..6426c078a 100644 --- a/include/Game/Camera/CamTranslatorSpiral.hpp +++ b/include/Game/Camera/CamTranslatorSpiral.hpp @@ -4,12 +4,12 @@ class CamTranslatorSpiral : public CamTranslatorBase { public: - inline CamTranslatorSpiral(CameraSpiral *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorSpiral(CameraSpiral* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraSpiral *mCamera; // 0x4 + CameraSpiral* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorTalk.hpp b/include/Game/Camera/CamTranslatorTalk.hpp index b3d30e756..0d4e3beaa 100644 --- a/include/Game/Camera/CamTranslatorTalk.hpp +++ b/include/Game/Camera/CamTranslatorTalk.hpp @@ -4,12 +4,12 @@ class CamTranslatorTalk : public CamTranslatorBase { public: - inline CamTranslatorTalk(CameraTalk *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorTalk(CameraTalk* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraTalk *mCamera; // 0x4 + CameraTalk* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorTower.hpp b/include/Game/Camera/CamTranslatorTower.hpp index 1a7fbebb7..d022ce758 100644 --- a/include/Game/Camera/CamTranslatorTower.hpp +++ b/include/Game/Camera/CamTranslatorTower.hpp @@ -4,12 +4,12 @@ class CamTranslatorTower : public CamTranslatorBase { public: - inline CamTranslatorTower(CameraTower *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorTower(CameraTower* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraTower *mCamera; // 0x4 + CameraTower* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorTowerPos.hpp b/include/Game/Camera/CamTranslatorTowerPos.hpp index 584488f62..2f18affca 100644 --- a/include/Game/Camera/CamTranslatorTowerPos.hpp +++ b/include/Game/Camera/CamTranslatorTowerPos.hpp @@ -4,12 +4,12 @@ class CamTranslatorTowerPos : public CamTranslatorBase { public: - inline CamTranslatorTowerPos(CameraTowerPos *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorTowerPos(CameraTowerPos* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraTowerPos *mCamera; // 0x4 + CameraTowerPos* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorTripodBoss.hpp b/include/Game/Camera/CamTranslatorTripodBoss.hpp index 094196814..c897f6801 100644 --- a/include/Game/Camera/CamTranslatorTripodBoss.hpp +++ b/include/Game/Camera/CamTranslatorTripodBoss.hpp @@ -4,12 +4,12 @@ class CamTranslatorTripodBoss : public CamTranslatorBase { public: - inline CamTranslatorTripodBoss(CameraTripodBoss *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorTripodBoss(CameraTripodBoss* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraTripodBoss *mCamera; // 0x4 + CameraTripodBoss* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorTripodBossJoint.hpp b/include/Game/Camera/CamTranslatorTripodBossJoint.hpp index fc1f67fb3..fe813ed79 100644 --- a/include/Game/Camera/CamTranslatorTripodBossJoint.hpp +++ b/include/Game/Camera/CamTranslatorTripodBossJoint.hpp @@ -4,12 +4,12 @@ class CamTranslatorTripodBossJoint : public CamTranslatorBase { public: - inline CamTranslatorTripodBossJoint(CameraTripodBossJoint *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorTripodBossJoint(CameraTripodBossJoint* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraTripodBossJoint *mCamera; // 0x4 + CameraTripodBossJoint* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorTripodPlanet.hpp b/include/Game/Camera/CamTranslatorTripodPlanet.hpp index 2e2bc135e..8588060b9 100644 --- a/include/Game/Camera/CamTranslatorTripodPlanet.hpp +++ b/include/Game/Camera/CamTranslatorTripodPlanet.hpp @@ -4,12 +4,12 @@ class CamTranslatorTripodPlanet : public CamTranslatorBase { public: - inline CamTranslatorTripodPlanet(CameraTripodPlanet *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorTripodPlanet(CameraTripodPlanet* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraTripodPlanet *mCamera; // 0x4 + CameraTripodPlanet* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorTrundle.hpp b/include/Game/Camera/CamTranslatorTrundle.hpp index 0dfa064e5..0f9368768 100644 --- a/include/Game/Camera/CamTranslatorTrundle.hpp +++ b/include/Game/Camera/CamTranslatorTrundle.hpp @@ -4,12 +4,12 @@ class CamTranslatorTrundle : public CamTranslatorBase { public: - inline CamTranslatorTrundle(CameraTrundle *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorTrundle(CameraTrundle* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraTrundle *mCamera; // 0x4 + CameraTrundle* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorTwistedPassage.hpp b/include/Game/Camera/CamTranslatorTwistedPassage.hpp index d0f021922..cb92b44ca 100644 --- a/include/Game/Camera/CamTranslatorTwistedPassage.hpp +++ b/include/Game/Camera/CamTranslatorTwistedPassage.hpp @@ -4,12 +4,12 @@ class CamTranslatorTwistedPassage : public CamTranslatorBase { public: - inline CamTranslatorTwistedPassage(CameraTwistedPassage *pCamera) { - mCamera = pCamera; - } + inline CamTranslatorTwistedPassage(CameraTwistedPassage* pCamera) { + mCamera = pCamera; + } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraTwistedPassage *mCamera; // 0x4 + CameraTwistedPassage* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorWaterFollow.hpp b/include/Game/Camera/CamTranslatorWaterFollow.hpp index 591ed0bc9..3a05a3331 100644 --- a/include/Game/Camera/CamTranslatorWaterFollow.hpp +++ b/include/Game/Camera/CamTranslatorWaterFollow.hpp @@ -4,10 +4,10 @@ class CamTranslatorWaterFollow : public CamTranslatorBase { public: - CamTranslatorWaterFollow(CameraWaterFollow *); + CamTranslatorWaterFollow(CameraWaterFollow*); - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraWaterFollow *mCamera; // 0x4 + CameraWaterFollow* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorWaterPlanet.hpp b/include/Game/Camera/CamTranslatorWaterPlanet.hpp index e4753ed5a..5aa53c937 100644 --- a/include/Game/Camera/CamTranslatorWaterPlanet.hpp +++ b/include/Game/Camera/CamTranslatorWaterPlanet.hpp @@ -4,10 +4,10 @@ class CamTranslatorWaterPlanet : public CamTranslatorBase { public: - CamTranslatorWaterPlanet(CameraWaterPlanet *); + CamTranslatorWaterPlanet(CameraWaterPlanet*); - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraWaterPlanet *mCamera; // 0x4 + CameraWaterPlanet* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorWaterPlanetBoss.hpp b/include/Game/Camera/CamTranslatorWaterPlanetBoss.hpp index 9340bcd5e..a543c4979 100644 --- a/include/Game/Camera/CamTranslatorWaterPlanetBoss.hpp +++ b/include/Game/Camera/CamTranslatorWaterPlanetBoss.hpp @@ -4,10 +4,10 @@ class CamTranslatorWaterPlanetBoss : public CamTranslatorBase { public: - CamTranslatorWaterPlanetBoss(CameraWaterPlanetBoss *); + CamTranslatorWaterPlanetBoss(CameraWaterPlanetBoss*); - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraWaterPlanetBoss *mCamera; // 0x4 + CameraWaterPlanetBoss* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/CamTranslatorWonderPlanet.hpp b/include/Game/Camera/CamTranslatorWonderPlanet.hpp index 141828b97..67af4f9f8 100644 --- a/include/Game/Camera/CamTranslatorWonderPlanet.hpp +++ b/include/Game/Camera/CamTranslatorWonderPlanet.hpp @@ -4,10 +4,10 @@ class CamTranslatorWonderPlanet : public CamTranslatorBase { public: - CamTranslatorWonderPlanet(CameraWonderPlanet *); + CamTranslatorWonderPlanet(CameraWonderPlanet*); - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - CameraWonderPlanet *mCamera; // 0x4 + CameraWonderPlanet* mCamera; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Camera/Camera.hpp b/include/Game/Camera/Camera.hpp index 752da8459..3aa61e02e 100644 --- a/include/Game/Camera/Camera.hpp +++ b/include/Game/Camera/Camera.hpp @@ -14,54 +14,52 @@ class CameraTargetObj; class CamTranslatorBase { public: inline CamTranslatorBase() { - } - virtual void setParam(const CameraParamChunk *) = 0; - virtual Camera *getCamera() const = 0; + virtual void setParam(const CameraParamChunk*) = 0; + virtual Camera* getCamera() const = 0; }; class CamTranslatorDummy : public CamTranslatorBase { public: - inline CamTranslatorDummy(Camera *pCamera) { + inline CamTranslatorDummy(Camera* pCamera) { mCamera = pCamera; } - virtual void setParam(const CameraParamChunk *); - virtual Camera *getCamera() const; + virtual void setParam(const CameraParamChunk*); + virtual Camera* getCamera() const; - Camera *mCamera; // 0x4 + Camera* mCamera; // 0x4 }; class Camera : public NameObj { public: - Camera(const char *); + Camera(const char*); virtual inline ~Camera() { - } - virtual void reset(); - virtual CameraTargetObj* calc() = 0; - virtual bool isInterpolationOff() const; - virtual bool isCollisionOff() const; - virtual bool isZeroFrameMoveOff() const; - virtual bool isSubjectiveCameraOff() const; - virtual bool isCorrectingErpPositionOff() const; - virtual void roundLeft(); - virtual void roundRight(); - virtual bool isEnableToRoundLeft() const; - virtual bool isEnableToRoundRight() const; - virtual bool isEnableToReset() const; - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc() = 0; + virtual bool isInterpolationOff() const; + virtual bool isCollisionOff() const; + virtual bool isZeroFrameMoveOff() const; + virtual bool isSubjectiveCameraOff() const; + virtual bool isCorrectingErpPositionOff() const; + virtual void roundLeft(); + virtual void roundRight(); + virtual bool isEnableToRoundLeft() const; + virtual bool isEnableToRoundRight() const; + virtual bool isEnableToReset() const; + virtual CamTranslatorBase* createTranslator(); void setZoneMtx(s32); void createVPanObj(); - CameraMan *mCameraMan; // 0xC - CameraPoseParam *mPosParam; // 0x10 - CameraHeightArrange *mVPan; // 0x14 - bool mIsLOfsErpOff; // 0x18 - u8 _19[3]; - TMtx34f mZoneMatrix; // 0x1C + CameraMan* mCameraMan; // 0xC + CameraPoseParam* mPosParam; // 0x10 + CameraHeightArrange* mVPan; // 0x14 + bool mIsLOfsErpOff; // 0x18 + u8 _19[3]; + TMtx34f mZoneMatrix; // 0x1C }; \ No newline at end of file diff --git a/include/Game/Camera/CameraAnim.hpp b/include/Game/Camera/CameraAnim.hpp index de33d5227..a9fb2c5c3 100644 --- a/include/Game/Camera/CameraAnim.hpp +++ b/include/Game/Camera/CameraAnim.hpp @@ -4,64 +4,62 @@ #include "revolution.h" struct CanmFileHeader { - u8 mMagic[4]; // 0x0 - u8 mType[4]; // 0x4 + u8 mMagic[4]; // 0x0 + u8 mType[4]; // 0x4 s32 _8; s32 _C; s32 _10; s32 _14; - u32 mNrFrames; // 0x18 - u32 mValueOffset; // 0x1C + u32 mNrFrames; // 0x18 + u32 mValueOffset; // 0x1C }; struct CanmKeyFrameComponentInfo { - u32 mCount; // 0x0 - u32 mOffset; // 0x4 - u32 mType; // 0x8 + u32 mCount; // 0x0 + u32 mOffset; // 0x4 + u32 mType; // 0x8 }; struct CanmKeyFrameInfo { - CanmKeyFrameComponentInfo mPosX; // 0x0 - CanmKeyFrameComponentInfo mPosY; // 0xC - CanmKeyFrameComponentInfo mPosZ; // 0x18 - CanmKeyFrameComponentInfo mWatchPosX; // 0x24 - CanmKeyFrameComponentInfo mWatchPosY; // 0x30 - CanmKeyFrameComponentInfo mWatchPosZ; // 0x3C - CanmKeyFrameComponentInfo mTwist; // 0x48 - CanmKeyFrameComponentInfo mFovy; // 0x54 + CanmKeyFrameComponentInfo mPosX; // 0x0 + CanmKeyFrameComponentInfo mPosY; // 0xC + CanmKeyFrameComponentInfo mPosZ; // 0x18 + CanmKeyFrameComponentInfo mWatchPosX; // 0x24 + CanmKeyFrameComponentInfo mWatchPosY; // 0x30 + CanmKeyFrameComponentInfo mWatchPosZ; // 0x3C + CanmKeyFrameComponentInfo mTwist; // 0x48 + CanmKeyFrameComponentInfo mFovy; // 0x54 }; struct CamnFrameComponentInfo { - u32 mCount; // 0x0 - u32 mOffset; // 0x4 + u32 mCount; // 0x0 + u32 mOffset; // 0x4 }; struct CanmFrameInfo { - CamnFrameComponentInfo mPosX; // 0x0 - CamnFrameComponentInfo mPosY; // 0x8 - CamnFrameComponentInfo mPosZ; // 0x10 - CamnFrameComponentInfo mWatchPosX; // 0x18 - CamnFrameComponentInfo mWatchPosY; // 0x20 - CamnFrameComponentInfo mWatchPosZ; // 0x28 - CamnFrameComponentInfo mTwist; // 0x30 - CamnFrameComponentInfo mFovy; // 0x38 + CamnFrameComponentInfo mPosX; // 0x0 + CamnFrameComponentInfo mPosY; // 0x8 + CamnFrameComponentInfo mPosZ; // 0x10 + CamnFrameComponentInfo mWatchPosX; // 0x18 + CamnFrameComponentInfo mWatchPosY; // 0x20 + CamnFrameComponentInfo mWatchPosZ; // 0x28 + CamnFrameComponentInfo mTwist; // 0x30 + CamnFrameComponentInfo mFovy; // 0x38 }; class BaseCamAnmDataAccessor { public: inline BaseCamAnmDataAccessor() { - } virtual inline ~BaseCamAnmDataAccessor() { - } - virtual void set(void *, void *) = 0; - virtual void getPos(TVec3f *, f32) const = 0; - virtual void getWatchPos(TVec3f *, f32) const = 0; - virtual f32 getTwist(f32) const = 0; - virtual f32 getFovy(f32) const = 0; + virtual void set(void*, void*) = 0; + virtual void getPos(TVec3f*, f32) const = 0; + virtual void getWatchPos(TVec3f*, f32) const = 0; + virtual f32 getTwist(f32) const = 0; + virtual f32 getFovy(f32) const = 0; }; class KeyCamAnmDataAccessor : public BaseCamAnmDataAccessor { @@ -72,12 +70,12 @@ public: } virtual ~KeyCamAnmDataAccessor(); - - virtual void set(void *, void *); - virtual void getPos(TVec3f *, f32) const; - virtual void getWatchPos(TVec3f *, f32) const; - virtual f32 getTwist(f32) const; - virtual f32 getFovy(f32) const; + + virtual void set(void*, void*); + virtual void getPos(TVec3f*, f32) const; + virtual void getWatchPos(TVec3f*, f32) const; + virtual f32 getTwist(f32) const; + virtual f32 getFovy(f32) const; f32 get(f32, u32, u32, u32) const; u32 searchKeyFrameIndex(f32, u32, u32, u32) const; @@ -85,8 +83,8 @@ public: f32 get4f(f32, u32, u32) const; f32 calcHermite(f32, f32, f32, f32, f32, f32, f32) const; - CanmKeyFrameInfo *mInfo; // 0x4 - f32 *mValues; // 0x8 + CanmKeyFrameInfo* mInfo; // 0x4 + f32* mValues; // 0x8 }; class CamAnmDataAccessor : public BaseCamAnmDataAccessor { @@ -97,49 +95,49 @@ public: } virtual ~CamAnmDataAccessor(); - - virtual void set(void *, void *); - virtual void getPos(TVec3f *, f32) const; - virtual void getWatchPos(TVec3f *, f32) const; - virtual f32 getTwist(f32) const; - virtual f32 getFovy(f32) const; + + virtual void set(void*, void*); + virtual void getPos(TVec3f*, f32) const; + virtual void getWatchPos(TVec3f*, f32) const; + virtual f32 getTwist(f32) const; + virtual f32 getFovy(f32) const; f32 get(f32, u32, u32) const; - CanmFrameInfo *mInfo; // 0x4 - f32 *mValues; // 0x8 + CanmFrameInfo* mInfo; // 0x4 + f32* mValues; // 0x8 }; class CameraAnim : public Camera { public: - CameraAnim(const char *); + CameraAnim(const char*); virtual ~CameraAnim(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual bool isZeroFrameMoveOff() const; - virtual bool isCollisionOff() const; - virtual bool isInterpolationOff() const; - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual bool isZeroFrameMoveOff() const; + virtual bool isCollisionOff() const; + virtual bool isInterpolationOff() const; + virtual CamTranslatorBase* createTranslator(); - void setParam(u8 *, f32); - bool isAnimEnd() const; - static u32 getAnimFrame(u8 *); - bool loadBin(u8 *); - - s32 _4C; - s32 _50; - u32 mNrFrames; // 0x54 - u8 mIsKey; // 0x58 - u8 _59[3]; - f32 mSpeed; // 0x5C - f32 mCurrentFrame; // 0x60 - BaseCamAnmDataAccessor *mFileDataAccessor; // 0x64 - CamAnmDataAccessor *mDataAccessor; // 0x68 - KeyCamAnmDataAccessor *mKeyDataAccessor; // 0x6C - u32 mNrValues; - s32 _74; - u8 *mFileData; // 0x78 - u8 _7C; - u8 _7D[3]; + void setParam(u8*, f32); + bool isAnimEnd() const; + static u32 getAnimFrame(u8*); + bool loadBin(u8*); + + s32 _4C; + s32 _50; + u32 mNrFrames; // 0x54 + u8 mIsKey; // 0x58 + u8 _59[3]; + f32 mSpeed; // 0x5C + f32 mCurrentFrame; // 0x60 + BaseCamAnmDataAccessor* mFileDataAccessor; // 0x64 + CamAnmDataAccessor* mDataAccessor; // 0x68 + KeyCamAnmDataAccessor* mKeyDataAccessor; // 0x6C + u32 mNrValues; + s32 _74; + u8* mFileData; // 0x78 + u8 _7C; + u8 _7D[3]; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraBehind.hpp b/include/Game/Camera/CameraBehind.hpp index aa1f5ff2e..1ca0c7417 100644 --- a/include/Game/Camera/CameraBehind.hpp +++ b/include/Game/Camera/CameraBehind.hpp @@ -4,17 +4,17 @@ class CameraBehind : public Camera { public: - CameraBehind(const char *); + CameraBehind(const char*); virtual ~CameraBehind(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); - + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); + void calcPosAndUp(); - f32 mAngleB; // 0x4C - f32 mAngleA; // 0x50 - f32 mDist; // 0x54 - f32 mAxisX; // 0x58 + f32 mAngleB; // 0x4C + f32 mAngleA; // 0x50 + f32 mDist; // 0x54 + f32 mAxisX; // 0x58 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraBlackHole.hpp b/include/Game/Camera/CameraBlackHole.hpp index 06d84d516..8afcb4e8a 100644 --- a/include/Game/Camera/CameraBlackHole.hpp +++ b/include/Game/Camera/CameraBlackHole.hpp @@ -4,15 +4,15 @@ class CameraBlackHole : public Camera { public: - CameraBlackHole(const char *); + CameraBlackHole(const char*); virtual ~CameraBlackHole(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); - f32 _4C; - f32 _50; + f32 _4C; + f32 _50; TVec3f mWPoint; // 0x54 TVec3f mAxis; // 0x60 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraCalc.hpp b/include/Game/Camera/CameraCalc.hpp index fa22b0595..a6a0dc4f6 100644 --- a/include/Game/Camera/CameraCalc.hpp +++ b/include/Game/Camera/CameraCalc.hpp @@ -3,6 +3,6 @@ #include "JSystem/JGeometry/TVec.hpp" namespace MR { - void polarToCross(const TVec3f &, TVec3f *, f32, f32, f32); - void crossToPolar(const TVec3f &, const TVec3f &, f32 *, f32 *, f32 *); -} + void polarToCross(const TVec3f&, TVec3f*, f32, f32, f32); + void crossToPolar(const TVec3f&, const TVec3f&, f32*, f32*, f32*); +} // namespace MR diff --git a/include/Game/Camera/CameraCharmedFix.hpp b/include/Game/Camera/CameraCharmedFix.hpp index bb367f31b..9c014119d 100644 --- a/include/Game/Camera/CameraCharmedFix.hpp +++ b/include/Game/Camera/CameraCharmedFix.hpp @@ -4,12 +4,12 @@ class CameraCharmedFix : public Camera { public: - CameraCharmedFix(const char *); + CameraCharmedFix(const char*); virtual ~CameraCharmedFix(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); TVec3f mAxis; // 0x4C TVec3f mUp; // 0x58 diff --git a/include/Game/Camera/CameraCharmedTripodBoss.hpp b/include/Game/Camera/CameraCharmedTripodBoss.hpp index fc6f83df3..a54469e94 100644 --- a/include/Game/Camera/CameraCharmedTripodBoss.hpp +++ b/include/Game/Camera/CameraCharmedTripodBoss.hpp @@ -4,16 +4,16 @@ class CameraCharmedTripodBoss : public Camera { public: - CameraCharmedTripodBoss(const char *); + CameraCharmedTripodBoss(const char*); virtual ~CameraCharmedTripodBoss(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); - void setParam(s32, TVec3f, const TVec3f &, const TVec2f &); + void setParam(s32, TVec3f, const TVec3f&, const TVec2f&); - s32 _4C; + s32 _4C; TVec3f _50; TVec3f _5C; TVec2f _68; diff --git a/include/Game/Camera/CameraCharmedVecReg.hpp b/include/Game/Camera/CameraCharmedVecReg.hpp index f9b368be3..fb8a01b3b 100644 --- a/include/Game/Camera/CameraCharmedVecReg.hpp +++ b/include/Game/Camera/CameraCharmedVecReg.hpp @@ -4,18 +4,18 @@ class CameraCharmedVecReg : public Camera { public: - CameraCharmedVecReg(const char *); + CameraCharmedVecReg(const char*); virtual ~CameraCharmedVecReg(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); - const char *mString; // 0x4C - f32 mDist; // 0x50 - f32 mAxisX; // 0x54 - f32 mAxisZ; // 0x58 - f32 mAxisY; // 0x5C - f32 mAngleA; // 0x60 - f32 mAngleB; // 0x64 + const char* mString; // 0x4C + f32 mDist; // 0x50 + f32 mAxisX; // 0x54 + f32 mAxisZ; // 0x58 + f32 mAxisY; // 0x5C + f32 mAngleA; // 0x60 + f32 mAngleB; // 0x64 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraCharmedVecRegTower.hpp b/include/Game/Camera/CameraCharmedVecRegTower.hpp index 6ebdd87d2..bd2104046 100644 --- a/include/Game/Camera/CameraCharmedVecRegTower.hpp +++ b/include/Game/Camera/CameraCharmedVecRegTower.hpp @@ -4,19 +4,19 @@ class CameraCharmedVecRegTower : public Camera { public: - CameraCharmedVecRegTower(const char *); + CameraCharmedVecRegTower(const char*); virtual ~CameraCharmedVecRegTower(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); - TVec3f mWPoint; // 0x4C - TVec3f mAxis; // 0x58 - f32 mAngleA; // 0x64 - f32 mAngleB; // 0x68 - f32 mDist; // 0x6C - bool _70; - u8 _71[3]; - const char *mString; // 0x74 + TVec3f mWPoint; // 0x4C + TVec3f mAxis; // 0x58 + f32 mAngleA; // 0x64 + f32 mAngleB; // 0x68 + f32 mDist; // 0x6C + bool _70; + u8 _71[3]; + const char* mString; // 0x74 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraContext.hpp b/include/Game/Camera/CameraContext.hpp index 150c603de..1a58b7fcc 100644 --- a/include/Game/Camera/CameraContext.hpp +++ b/include/Game/Camera/CameraContext.hpp @@ -8,29 +8,29 @@ public: CameraContext(); virtual ~CameraContext(); - void initParams(); - const TPos3f *getViewMtx() const; - const TPos3f *getInvViewMtx() const; - f32 getAspect() const; - void setViewMtx(const TPos3f &, bool, bool, const TVec3f &); - void setNearZ(f32); - void setFovy(f32); - void setShakeOffset(f32, f32); - void updateProjectionMtx(); + void initParams(); + const TPos3f* getViewMtx() const; + const TPos3f* getInvViewMtx() const; + f32 getAspect() const; + void setViewMtx(const TPos3f&, bool, bool, const TVec3f&); + void setNearZ(f32); + void setFovy(f32); + void setShakeOffset(f32, f32); + void updateProjectionMtx(); - TPos3f mView; // 0xC - TPos3f mViewInv; // 0x3C - TPos3f mProjection; // 0x6C - f32 _9C; - f32 _A0; - f32 _A4; - f32 _A8; - f32 _AC; - f32 mNearZ; // 0xB0 - f32 mFarZ; // 0xB4 - f32 mFovy; // 0xB8 - f32 mShakeOffsetX; // 0xBC - f32 mShakeOffsetY; // 0xC0 + TPos3f mView; // 0xC + TPos3f mViewInv; // 0x3C + TPos3f mProjection; // 0x6C + f32 _9C; + f32 _A0; + f32 _A4; + f32 _A8; + f32 _AC; + f32 mNearZ; // 0xB0 + f32 mFarZ; // 0xB4 + f32 mFovy; // 0xB8 + f32 mShakeOffsetX; // 0xBC + f32 mShakeOffsetY; // 0xC0 }; namespace MR { diff --git a/include/Game/Camera/CameraCover.hpp b/include/Game/Camera/CameraCover.hpp index 9c46d2261..598129651 100644 --- a/include/Game/Camera/CameraCover.hpp +++ b/include/Game/Camera/CameraCover.hpp @@ -6,7 +6,7 @@ class CameraCover : public NameObj { public: - CameraCover(const char *); + CameraCover(const char*); virtual ~CameraCover(); virtual void movement(); @@ -20,11 +20,11 @@ public: return _3C; } - TMtx34f _C; - volatile s32 _3C; - u8 _40; - bool _41; - u8 _42[2]; - u32 _44; - CaptureScreenActor* mActor; // 0x48 + TMtx34f _C; + volatile s32 _3C; + u8 _40; + bool _41; + u8 _42[2]; + u32 _44; + CaptureScreenActor* mActor; // 0x48 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraCubePlanet.hpp b/include/Game/Camera/CameraCubePlanet.hpp index 12ec0c055..8c9ed8ae2 100644 --- a/include/Game/Camera/CameraCubePlanet.hpp +++ b/include/Game/Camera/CameraCubePlanet.hpp @@ -4,16 +4,16 @@ class CameraCubePlanet : public Camera { public: - CameraCubePlanet(const char *); + CameraCubePlanet(const char*); virtual ~CameraCubePlanet(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); - f32 mDist; // 0x4C - f32 mAngleA; // 0x50 - f32 mAngleB; // 0x54 + f32 mDist; // 0x4C + f32 mAngleA; // 0x50 + f32 mAngleB; // 0x54 f32 _58; f32 _5C; f32 _60; diff --git a/include/Game/Camera/CameraDPD.hpp b/include/Game/Camera/CameraDPD.hpp index 029c09ac8..1ca620402 100644 --- a/include/Game/Camera/CameraDPD.hpp +++ b/include/Game/Camera/CameraDPD.hpp @@ -5,30 +5,30 @@ class CameraDPD : public Camera { public: - CameraDPD(const char *); + CameraDPD(const char*); virtual ~CameraDPD(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); - f32 _4C; - f32 _50; - f32 _54; - f32 _58; - f32 _5C; + f32 _4C; + f32 _50; + f32 _54; + f32 _58; + f32 _5C; TMtx34f _60; - bool _90; - u8 _91[3]; - u32 _94; - f32 mDist; // 0x98 - f32 _9C; - f32 mAngleA; // 0xA0 - f32 mAngleB; // 0xA4 - f32 mWPointZ; // 0xA8 - f32 mWPointX; // 0xAC - f32 mWPointY; // 0xB0 - bool _B4; - u8 _B5[3]; - f32 mUpX; // 0xB8 + bool _90; + u8 _91[3]; + u32 _94; + f32 mDist; // 0x98 + f32 _9C; + f32 mAngleA; // 0xA0 + f32 mAngleB; // 0xA4 + f32 mWPointZ; // 0xA8 + f32 mWPointX; // 0xAC + f32 mWPointY; // 0xB0 + bool _B4; + u8 _B5[3]; + f32 mUpX; // 0xB8 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraDead.hpp b/include/Game/Camera/CameraDead.hpp index ce71b6b53..fdaad43d1 100644 --- a/include/Game/Camera/CameraDead.hpp +++ b/include/Game/Camera/CameraDead.hpp @@ -5,16 +5,16 @@ class CameraDead : public Camera { public: - CameraDead(const char *); - virtual ~CameraDead(); + CameraDead(const char*); + virtual ~CameraDead(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual bool isInterpolationOff() const; - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual bool isInterpolationOff() const; + virtual CamTranslatorBase* createTranslator(); - u8 _4C[4]; - f32 mDist; // 0x50 + u8 _4C[4]; + f32 mDist; // 0x50 s32 _54; s32 _58; u32 _5C; diff --git a/include/Game/Camera/CameraDirector.hpp b/include/Game/Camera/CameraDirector.hpp index 012128eb5..1cad726f8 100644 --- a/include/Game/Camera/CameraDirector.hpp +++ b/include/Game/Camera/CameraDirector.hpp @@ -30,16 +30,16 @@ class MarioActor; class OnlyCamera; namespace MR { - CameraDirector *getCameraDirector(); + CameraDirector* getCameraDirector(); } class CameraParamChunkID_Tmp : public CameraParamChunkID { public: - inline CameraParamChunkID_Tmp() : CameraParamChunkID() { - + inline CameraParamChunkID_Tmp() + : CameraParamChunkID() { } - - virtual char *getBuffer(u32); + + virtual char* getBuffer(u32); char mBuffer[0x100]; // 0xC }; @@ -51,87 +51,87 @@ public: class CameraManStack { public: inline CameraManStack() { - mElements = new CameraMan *[CAMERA_MAN_CAPACITY]; + mElements = new CameraMan*[CAMERA_MAN_CAPACITY]; mCapacity = CAMERA_MAN_CAPACITY; mCount = 0; - mElements = new CameraMan *[CAMERA_MAN_CAPACITY]; + mElements = new CameraMan*[CAMERA_MAN_CAPACITY]; } - CameraMan **mElements; - u32 mCapacity; - u32 mCount; + CameraMan** mElements; + u32 mCapacity; + u32 mCount; }; - CameraDirector(const char *); - virtual ~CameraDirector(); + CameraDirector(const char*); + virtual ~CameraDirector(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); - void setTarget(CameraTargetObj *); - CameraTargetObj *getTarget(); - void push(CameraMan *); - CameraMan *pop(); - void backLastMtx(); - CameraMan *getCurrentCameraMan() const; - void updateCameraMan(); - void calcPose(); - void calcSubjective(); // TODO - bool isInterpolationOff(); - void switchAntiOscillation(); - void createViewMtx(); - void checkStartCondition(); - void startEvent(s32, const char *, const CameraTargetArg &, s32); - void endEvent(s32, const char *, bool, s32); - void endEventAtLanding(s32, const char *, s32); // TODO, need more info on _5C - CameraParamChunkEvent *getEventParameter(s32, const char *); - void requestToResetCameraMan(); - void setInterpolation(u32); - void cover(u32); - void closeCreatingCameraChunk(); - void initCameraCodeCollection(const char *, s32); - void registerCameraCode(u32); - void termCameraCodeCollection(); - void declareEvent(s32, const char *); - void started(); - void setTargetActor(const LiveActor *); - void setTargetPlayer(const MarioActor *); - bool isRotatingHard() const; - bool isSubjectiveCamera() const; - bool isEnableToControl() const; - bool isEnableToRoundLeft() const; - bool isEnableToRoundRight() const; - bool isEnableToReset() const; - bool isEventCameraActive(s32, const char *) const; - bool isEventCameraActive() const; - void startStartPosCamera(bool); - bool isInterpolatingNearlyEnd() const; - bool isForceCameraChange() const; - f32 getDefaultFovy() const; - void startStartAnimCamera(); - bool isStartAnimCameraEnd() const; - u32 getStartAnimCameraFrame() const; - void endStartAnimCamera(); - void startTalkCamera(const TVec3f &, const TVec3f &, f32, f32, s32); - void endTalkCamera(bool, s32); - void startSubjectiveCamera(s32); - void endSubjectiveCamera(s32); - bool isAnimCameraEnd(s32, const char *) const; - u32 getAnimCameraFrame(s32, const char *) const; - void pauseOnAnimCamera(s32, const char *); - void pauseOffAnimCamera(s32, const char *); - void zoomInGameCamera(); - void zoomOutGameCamera(); - void checkEndOfEventCamera(); // TODO - void controlCameraSE(); // TODO - void removeEndEventAtLanding(s32, const char *); // TODO - void calcViewMtxFromPoseParam(TPos3f *, const CameraPoseParam *); // TODO - bool isPlayableCameraSE(bool); - void resetCameraMan(); - void createStartAnimCamera(); - void createTalkCamera(); - void createSubjectiveCamera(); - + void setTarget(CameraTargetObj*); + CameraTargetObj* getTarget(); + void push(CameraMan*); + CameraMan* pop(); + void backLastMtx(); + CameraMan* getCurrentCameraMan() const; + void updateCameraMan(); + void calcPose(); + void calcSubjective(); // TODO + bool isInterpolationOff(); + void switchAntiOscillation(); + void createViewMtx(); + void checkStartCondition(); + void startEvent(s32, const char*, const CameraTargetArg&, s32); + void endEvent(s32, const char*, bool, s32); + void endEventAtLanding(s32, const char*, s32); // TODO, need more info on _5C + CameraParamChunkEvent* getEventParameter(s32, const char*); + void requestToResetCameraMan(); + void setInterpolation(u32); + void cover(u32); + void closeCreatingCameraChunk(); + void initCameraCodeCollection(const char*, s32); + void registerCameraCode(u32); + void termCameraCodeCollection(); + void declareEvent(s32, const char*); + void started(); + void setTargetActor(const LiveActor*); + void setTargetPlayer(const MarioActor*); + bool isRotatingHard() const; + bool isSubjectiveCamera() const; + bool isEnableToControl() const; + bool isEnableToRoundLeft() const; + bool isEnableToRoundRight() const; + bool isEnableToReset() const; + bool isEventCameraActive(s32, const char*) const; + bool isEventCameraActive() const; + void startStartPosCamera(bool); + bool isInterpolatingNearlyEnd() const; + bool isForceCameraChange() const; + f32 getDefaultFovy() const; + void startStartAnimCamera(); + bool isStartAnimCameraEnd() const; + u32 getStartAnimCameraFrame() const; + void endStartAnimCamera(); + void startTalkCamera(const TVec3f&, const TVec3f&, f32, f32, s32); + void endTalkCamera(bool, s32); + void startSubjectiveCamera(s32); + void endSubjectiveCamera(s32); + bool isAnimCameraEnd(s32, const char*) const; + u32 getAnimCameraFrame(s32, const char*) const; + void pauseOnAnimCamera(s32, const char*); + void pauseOffAnimCamera(s32, const char*); + void zoomInGameCamera(); + void zoomOutGameCamera(); + void checkEndOfEventCamera(); // TODO + void controlCameraSE(); // TODO + void removeEndEventAtLanding(s32, const char*); // TODO + void calcViewMtxFromPoseParam(TPos3f*, const CameraPoseParam*); // TODO + bool isPlayableCameraSE(bool); + void resetCameraMan(); + void createStartAnimCamera(); + void createTalkCamera(); + void createSubjectiveCamera(); + // 0x15C[0] and _15C[1] seems to be a struct of size 0x88 with the following layout: // 0x00: mZoneID // 0x04: mName @@ -139,46 +139,46 @@ public: // These are the only members which have been found accessed - CameraTargetObj *_C; - CameraManStack *mStack; // 0x10 - OnlyCamera *mOnlyCamera; // 0x14 - CameraPoseParam *mPoseParam1; // 0x18 - CameraPoseParam *mPoseParam2; // 0x1C - CameraHolder *mHolder; // 0x20 - CameraParamChunkHolder *mChunkHolder; // 0x24 - GameCameraCreator *mCameraCreator; // 0x28 - CameraRailHolder *mRailHolder; // 0x2C - CameraRegisterHolder *mRegisterHolder; // 0x30 - CameraTargetHolder *mTargetHolder; // 0x34 - CameraShaker *mShaker; // 0x38 - CameraViewInterpolator *mViewInterpolator; // 0x3C - CameraCover *mCover; // 0x40 - CameraRotChecker *mRotChecker; // 0x44 - CameraManGame *mCameraManGame; // 0x48 - CameraManEvent *mCameraManEvent; // 0x4C - CameraManPause *mCameraManPause; // 0x50 - CameraManSubjective *mCameraManSubjective; // 0x54 - bool _58; - u8 _59[3]; - s32 _5C[2][34]; - u32 _16C; - bool _170; - u8 _171[3]; - s32 _174; - bool mStartCameraCreated; // 0x178 - u8 _179[3]; - CameraTargetMtx *mTargetMatrix; // 0x17C - TMtx34f _180; - bool mRequestCameraManReset; // 0x1B0 - bool _1B1; - bool mIsSubjectiveCamera; // 0x1B2 - bool _1B3; - s32 _1B4; - u8 _1B8[4]; - f32 _1BC; - TPos3f _1C0; - bool _1F0; - bool _1F1; - bool _1F2; - u8 _1F3; + CameraTargetObj* _C; + CameraManStack* mStack; // 0x10 + OnlyCamera* mOnlyCamera; // 0x14 + CameraPoseParam* mPoseParam1; // 0x18 + CameraPoseParam* mPoseParam2; // 0x1C + CameraHolder* mHolder; // 0x20 + CameraParamChunkHolder* mChunkHolder; // 0x24 + GameCameraCreator* mCameraCreator; // 0x28 + CameraRailHolder* mRailHolder; // 0x2C + CameraRegisterHolder* mRegisterHolder; // 0x30 + CameraTargetHolder* mTargetHolder; // 0x34 + CameraShaker* mShaker; // 0x38 + CameraViewInterpolator* mViewInterpolator; // 0x3C + CameraCover* mCover; // 0x40 + CameraRotChecker* mRotChecker; // 0x44 + CameraManGame* mCameraManGame; // 0x48 + CameraManEvent* mCameraManEvent; // 0x4C + CameraManPause* mCameraManPause; // 0x50 + CameraManSubjective* mCameraManSubjective; // 0x54 + bool _58; + u8 _59[3]; + s32 _5C[2][34]; + u32 _16C; + bool _170; + u8 _171[3]; + s32 _174; + bool mStartCameraCreated; // 0x178 + u8 _179[3]; + CameraTargetMtx* mTargetMatrix; // 0x17C + TMtx34f _180; + bool mRequestCameraManReset; // 0x1B0 + bool _1B1; + bool mIsSubjectiveCamera; // 0x1B2 + bool _1B3; + s32 _1B4; + u8 _1B8[4]; + f32 _1BC; + TPos3f _1C0; + bool _1F0; + bool _1F1; + bool _1F2; + u8 _1F3; }; diff --git a/include/Game/Camera/CameraFix.hpp b/include/Game/Camera/CameraFix.hpp index 3f95f834b..0fa578b26 100644 --- a/include/Game/Camera/CameraFix.hpp +++ b/include/Game/Camera/CameraFix.hpp @@ -6,23 +6,23 @@ class CameraTargetMtx; class CameraFix : public Camera { public: - CameraFix(const char *); + CameraFix(const char*); virtual ~CameraFix(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); - void setParam(const TVec3f &, const TVec3f &, const TVec3f &); + void setParam(const TVec3f&, const TVec3f&, const TVec3f&); - f32 _4C; - f32 _50; - f32 _54; - f32 _58; - f32 _5C; - f32 _60; - f32 _64; - f32 _68; - f32 _6C; - CameraTargetMtx *mTarget; + f32 _4C; + f32 _50; + f32 _54; + f32 _58; + f32 _5C; + f32 _60; + f32 _64; + f32 _68; + f32 _6C; + CameraTargetMtx* mTarget; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraFixedPoint.hpp b/include/Game/Camera/CameraFixedPoint.hpp index 0b3e1d989..295c8a1da 100644 --- a/include/Game/Camera/CameraFixedPoint.hpp +++ b/include/Game/Camera/CameraFixedPoint.hpp @@ -4,17 +4,17 @@ class CameraFixedPoint : public Camera { public: - CameraFixedPoint(const char *); + CameraFixedPoint(const char*); virtual ~CameraFixedPoint(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); - void setParam(const TVec3f &, u32); + void setParam(const TVec3f&, u32); f32 _4C; f32 _50; f32 _54; - u8 _58[4]; + u8 _58[4]; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraFixedThere.hpp b/include/Game/Camera/CameraFixedThere.hpp index 87f1fc84a..b512f0b27 100644 --- a/include/Game/Camera/CameraFixedThere.hpp +++ b/include/Game/Camera/CameraFixedThere.hpp @@ -4,28 +4,28 @@ class CameraFixedThere : public Camera { public: - CameraFixedThere(const char *); + CameraFixedThere(const char*); virtual ~CameraFixedThere(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual bool isCorrectingErpPositionOff() const; - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual bool isCorrectingErpPositionOff() const; + virtual CamTranslatorBase* createTranslator(); void copyStatusFromPrevCamera(); - void calcEyeDir(TVec3f *); + void calcEyeDir(TVec3f*); void makeAxisAndRoll(); - void updateUpVec(const TVec3f &); - void updateNormalUpVec(const TVec3f &); + void updateUpVec(const TVec3f&); + void updateNormalUpVec(const TVec3f&); - u32 _4C; + u32 _4C; bool _50; - u8 _51[3]; - f32 _54; - f32 _58; - f32 _5C; - f32 _60; - f32 _64; - f32 _68; - f32 _6C; + u8 _51[3]; + f32 _54; + f32 _58; + f32 _5C; + f32 _60; + f32 _64; + f32 _68; + f32 _6C; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraFollow.hpp b/include/Game/Camera/CameraFollow.hpp index 0776a9eb1..ae534d342 100644 --- a/include/Game/Camera/CameraFollow.hpp +++ b/include/Game/Camera/CameraFollow.hpp @@ -4,33 +4,33 @@ class CameraFollow : public Camera { public: - CameraFollow(const char *); + CameraFollow(const char*); virtual ~CameraFollow(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual bool isEnableToRoundLeft() const; - virtual bool isEnableToRoundRight() const; - virtual bool isEnableToReset() const; - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual bool isEnableToRoundLeft() const; + virtual bool isEnableToRoundRight() const; + virtual bool isEnableToReset() const; + virtual CamTranslatorBase* createTranslator(); void setParam(f32, f32, f32, f32, f32, bool); void calcIdealPos(); void calcRotPos(); - void constrainDistance(TVec3f *, const TVec3f &); - void constrainAngleX(f32 *); - void constrainAngleY(f32 *, const TVec3f &, f32); - f32 getMagnitudeOfMovingRound() const; - void checkShiftStateToRound(const TVec3f &, const TVec3f &); + void constrainDistance(TVec3f*, const TVec3f&); + void constrainAngleX(f32*); + void constrainAngleY(f32*, const TVec3f&, f32); + f32 getMagnitudeOfMovingRound() const; + void checkShiftStateToRound(const TVec3f&, const TVec3f&); void arrangeHeight(); void reflectRotOffset(); bool isWallForward() const; void arrangeLookUp(); - void checkAscent(TVec3f *) const; + void checkAscent(TVec3f*) const; void arrangeLookDown(); - void checkDescent(TVec3f *) const; + void checkDescent(TVec3f*) const; void startRound(f32, f32); - void checkValidityOfRound(const TVec3f &, const TVec3f &); + void checkValidityOfRound(const TVec3f&, const TVec3f&); bool isUpsideDownByRoll() const; f32 _4C; @@ -45,12 +45,12 @@ public: f32 _70; f32 _74; f32 _78; - u8 _7C; - u8 _7D; - u8 _7E[2]; + u8 _7C; + u8 _7D; + u8 _7E[2]; f32 _80; f32 _84; - u8 _88; - u8 _89; - u8 _8A[2]; + u8 _88; + u8 _89; + u8 _8A[2]; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraFooFighter.hpp b/include/Game/Camera/CameraFooFighter.hpp index d596b7acb..fcca34b89 100644 --- a/include/Game/Camera/CameraFooFighter.hpp +++ b/include/Game/Camera/CameraFooFighter.hpp @@ -4,12 +4,12 @@ class CameraFooFighter : public Camera { public: - CameraFooFighter(const char *); + CameraFooFighter(const char*); virtual ~CameraFooFighter(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); f32 mAxisY; // 0x4C f32 mAxisX; // 0x50 diff --git a/include/Game/Camera/CameraFooFighterPlanet.hpp b/include/Game/Camera/CameraFooFighterPlanet.hpp index f46a8810d..c6198c819 100644 --- a/include/Game/Camera/CameraFooFighterPlanet.hpp +++ b/include/Game/Camera/CameraFooFighterPlanet.hpp @@ -4,16 +4,16 @@ class CameraFooFighterPlanet : public Camera { public: - CameraFooFighterPlanet(const char *); + CameraFooFighterPlanet(const char*); virtual ~CameraFooFighterPlanet(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); - void goRoundBehind(TVec3f &, TVec3f &, TVec3f &); + void goRoundBehind(TVec3f&, TVec3f&, TVec3f&); - f32 mAxisX; // 0x4C - f32 mAxisY; // 0x50 - f32 mAngleA; // 0x54 + f32 mAxisX; // 0x4C + f32 mAxisY; // 0x50 + f32 mAngleA; // 0x54 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraFrontAndBack.hpp b/include/Game/Camera/CameraFrontAndBack.hpp index ea10b57fc..bef060185 100644 --- a/include/Game/Camera/CameraFrontAndBack.hpp +++ b/include/Game/Camera/CameraFrontAndBack.hpp @@ -5,19 +5,19 @@ class CameraFrontAndBack : public Camera { public: - CameraFrontAndBack(const char *); + CameraFrontAndBack(const char*); virtual ~CameraFrontAndBack(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); - void calcBaseQuat(TQuat4f *, const TQuat4f &); - void calcDipQuat(TQuat4f *, const TQuat4f &, const TQuat4f &); + void calcBaseQuat(TQuat4f*, const TQuat4f&); + void calcDipQuat(TQuat4f*, const TQuat4f&, const TQuat4f&); TVec3f mWPoint; // 0x4C TVec3f mAxis; // 0x58 - f32 mAngleA; // 0x64 - f32 mAngleB; // 0x68 - f32 mDist; // 0x6C + f32 mAngleA; // 0x64 + f32 mAngleB; // 0x68 + f32 mDist; // 0x6C }; \ No newline at end of file diff --git a/include/Game/Camera/CameraGround.hpp b/include/Game/Camera/CameraGround.hpp index 26a12d1b6..1ff6d859f 100644 --- a/include/Game/Camera/CameraGround.hpp +++ b/include/Game/Camera/CameraGround.hpp @@ -4,22 +4,22 @@ class CameraGround : public Camera { public: - CameraGround(const char *); + CameraGround(const char*); virtual ~CameraGround(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); - f32 mAngleA; // 0x4C - f32 mAngleB; // 0x50 - f32 mDist; // 0x54 - f32 mUpX; // 0x58 - f32 mUpY; // 0x5C - f32 mUpZ; // 0x60 - f32 _64; - f32 _68; - f32 _6C; + f32 mAngleA; // 0x4C + f32 mAngleB; // 0x50 + f32 mDist; // 0x54 + f32 mUpX; // 0x58 + f32 mUpY; // 0x5C + f32 mUpZ; // 0x60 + f32 _64; + f32 _68; + f32 _6C; bool _70; - u8 _71[3]; + u8 _71[3]; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraHeightArrange.hpp b/include/Game/Camera/CameraHeightArrange.hpp index 7f629df64..36cf65331 100644 --- a/include/Game/Camera/CameraHeightArrange.hpp +++ b/include/Game/Camera/CameraHeightArrange.hpp @@ -7,53 +7,53 @@ class CameraPoseParam; class CameraHeightArrange : public NameObj { public: - CameraHeightArrange(Camera *); + CameraHeightArrange(Camera*); void resetJump(); void resetParameter(); - void chase(); - void updateHeightAndOffset(); - TVec3f *getGlobalAxis(); + void chase(); + void updateHeightAndOffset(); + TVec3f* getGlobalAxis(); - Camera *mCamera; // 0xC - u8 _10; - u8 _11; - u8 _12; - u8 _13; - CameraPoseParam *_14; - CameraPoseParam *_18; - u8 _1C[12]; - f32 _28; - f32 _2C; - f32 _30; - f32 _34; - f32 _38; - f32 _3C; - u32 _40; - u32 _44; - u8 _48[4]; - u8 _4C; - u8 _4D[3]; - s32 _50; - u32 _54; - u32 _58; - u32 _5C; - u8 _60; - u8 _61[3]; - TVec3f mGlobalAxis; // 0x64 - f32 _70; - f32 _74; - f32 mUpper; // 0x78 - f32 mLower; // 0x7C - u32 mGndInt; // 0x80 - f32 mUPlay; // 0x84 - f32 mLPlay; // 0x88 - u32 mPushDelay; // 0x8C - u32 mPushDelayLow; // 0x90 - u32 mUDown; // 0x94 - u8 mVPanUse; // 0x98 - u8 _99[3]; - TVec3f mVPanAxis; // 0x9C + Camera* mCamera; // 0xC + u8 _10; + u8 _11; + u8 _12; + u8 _13; + CameraPoseParam* _14; + CameraPoseParam* _18; + u8 _1C[12]; + f32 _28; + f32 _2C; + f32 _30; + f32 _34; + f32 _38; + f32 _3C; + u32 _40; + u32 _44; + u8 _48[4]; + u8 _4C; + u8 _4D[3]; + s32 _50; + u32 _54; + u32 _58; + u32 _5C; + u8 _60; + u8 _61[3]; + TVec3f mGlobalAxis; // 0x64 + f32 _70; + f32 _74; + f32 mUpper; // 0x78 + f32 mLower; // 0x7C + u32 mGndInt; // 0x80 + f32 mUPlay; // 0x84 + f32 mLPlay; // 0x88 + u32 mPushDelay; // 0x8C + u32 mPushDelayLow; // 0x90 + u32 mUDown; // 0x94 + u8 mVPanUse; // 0x98 + u8 _99[3]; + TVec3f mVPanAxis; // 0x9C }; \ No newline at end of file diff --git a/include/Game/Camera/CameraHolder.hpp b/include/Game/Camera/CameraHolder.hpp index e6617c5ca..0203491bb 100644 --- a/include/Game/Camera/CameraHolder.hpp +++ b/include/Game/Camera/CameraHolder.hpp @@ -7,19 +7,19 @@ class CamTranslatorBase; class CameraHolder : public NameObj { public: - CameraHolder(const char *); + CameraHolder(const char*); virtual ~CameraHolder(); - CamTranslatorBase *getTranslator(s32); - s32 getIndexOf(const char *) const; - Camera *getDefaultCamera(); - s32 getIndexOfDefault() const; - s32 getIndexOf(Camera *) const; - void createCameras(); - Camera *getCameraInner(s32) const; + CamTranslatorBase* getTranslator(s32); + s32 getIndexOf(const char*) const; + Camera* getDefaultCamera(); + s32 getIndexOfDefault() const; + s32 getIndexOf(Camera*) const; + void createCameras(); + Camera* getCameraInner(s32) const; - s32 mDefaultCameraIndex; // 0xC - Camera **mCameras; // 0x10 - CamTranslatorBase **mTranslators; // 0x14 - CamTranslatorBase *mDefaultTranslator; // 0x18 + s32 mDefaultCameraIndex; // 0xC + Camera** mCameras; // 0x10 + CamTranslatorBase** mTranslators; // 0x14 + CamTranslatorBase* mDefaultTranslator; // 0x18 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraInnerCylinder.hpp b/include/Game/Camera/CameraInnerCylinder.hpp index 6b83af966..9c90e36e8 100644 --- a/include/Game/Camera/CameraInnerCylinder.hpp +++ b/include/Game/Camera/CameraInnerCylinder.hpp @@ -4,22 +4,22 @@ class CameraInnerCylinder : public Camera { public: - CameraInnerCylinder(const char *); + CameraInnerCylinder(const char*); virtual ~CameraInnerCylinder(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); TVec3f mWPoint; // 0x4C TVec3f mAxis; // 0x58 - f32 mAngleA; // 0x64 - f32 mAngleB; // 0x68 - f32 mDist; // 0x6C - f32 mUpX; // 0x70 - f32 _74; - f32 _78; - f32 _7C; - bool _80; - u8 _81[3]; + f32 mAngleA; // 0x64 + f32 mAngleB; // 0x68 + f32 mDist; // 0x6C + f32 mUpX; // 0x70 + f32 _74; + f32 _78; + f32 _7C; + bool _80; + u8 _81[3]; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraInwardSphere.hpp b/include/Game/Camera/CameraInwardSphere.hpp index 8873968b9..abfd32d42 100644 --- a/include/Game/Camera/CameraInwardSphere.hpp +++ b/include/Game/Camera/CameraInwardSphere.hpp @@ -4,23 +4,23 @@ class CameraInwardSphere : public Camera { public: - CameraInwardSphere(const char *); + CameraInwardSphere(const char*); virtual ~CameraInwardSphere(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); void calcGravityCenter(); - f32 mDist; // 0x4C - f32 mAngleA; // 0x50 - f32 mAngleB; // 0x54 + f32 mDist; // 0x4C + f32 mAngleA; // 0x50 + f32 mAngleB; // 0x54 f32 _58; f32 _5C; f32 _60; f32 _64; f32 _68; f32 _6C; - u8 _70[12]; + u8 _70[12]; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraInwardTower.hpp b/include/Game/Camera/CameraInwardTower.hpp index 44240d98f..45f68df55 100644 --- a/include/Game/Camera/CameraInwardTower.hpp +++ b/include/Game/Camera/CameraInwardTower.hpp @@ -4,25 +4,25 @@ class CameraInwardTower : public Camera { public: - CameraInwardTower(const char *); + CameraInwardTower(const char*); virtual ~CameraInwardTower(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual bool isEnableToReset() const; - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual bool isEnableToReset() const; + virtual CamTranslatorBase* createTranslator(); void calcIdealPose(); - TVec3f mWPoint; // 0x4C - TVec3f mAxis; // 0x58 - f32 mAngleB; // 0x64 - f32 mAngleA; // 0x68 - f32 mDist; // 0x6C - f32 _70; - f32 _74; - f32 _78; - f32 _7C; - u8 _80; - u8 _81[3]; + TVec3f mWPoint; // 0x4C + TVec3f mAxis; // 0x58 + f32 mAngleB; // 0x64 + f32 mAngleA; // 0x68 + f32 mDist; // 0x6C + f32 _70; + f32 _74; + f32 _78; + f32 _7C; + u8 _80; + u8 _81[3]; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraLocalUtil.hpp b/include/Game/Camera/CameraLocalUtil.hpp index ac093f07a..df7c8bf83 100644 --- a/include/Game/Camera/CameraLocalUtil.hpp +++ b/include/Game/Camera/CameraLocalUtil.hpp @@ -8,70 +8,70 @@ class CameraMan; class CameraTargetObj; namespace CameraLocalUtil { - const char *getDummyVecRegName(); + const char* getDummyVecRegName(); - CameraDirector *getCameraDirector(); - CameraTargetObj *getTarget(const CameraMan *); - CameraTargetObj* getTarget(const Camera *); - - void calcSafePose(CameraMan *, Camera *); + CameraDirector* getCameraDirector(); + CameraTargetObj* getTarget(const CameraMan*); + CameraTargetObj* getTarget(const Camera*); - TVec3f *getPos(const Camera *); - TVec3f *getWatchPos(const Camera *); - TVec3f *getUpVec(const Camera *); - TVec3f *getWatchUpVec(const Camera *); + void calcSafePose(CameraMan*, Camera*); - void setPos(Camera *, const TVec3f &); + TVec3f* getPos(const Camera*); + TVec3f* getWatchPos(const Camera*); + TVec3f* getUpVec(const Camera*); + TVec3f* getWatchUpVec(const Camera*); - void setWatchPos(Camera *, const TVec3f &); + void setPos(Camera*, const TVec3f&); - void setWatchUpVec(Camera *, const TVec3f &); + void setWatchPos(Camera*, const TVec3f&); - void setUpVecAndWatchUpVec(Camera *, const TVec3f &); + void setWatchUpVec(Camera*, const TVec3f&); - f32 getFovy(const Camera *); - f32 getRoll(const Camera *); + void setUpVecAndWatchUpVec(Camera*, const TVec3f&); - void setFovy(Camera *, f32); - void setRoll(Camera *, f32); - - TVec3f *getGlobalOffset(const Camera *); - TVec3f *getLocalOffset(const Camera *); + f32 getFovy(const Camera*); + f32 getRoll(const Camera*); - void setGlobalOffset(Camera *, const TVec3f &); - void setLocalOffset(Camera *, const TVec3f &); - void setFrontOffset(Camera *, f32); - void setUpperOffset(Camera *, f32); + void setFovy(Camera*, f32); + void setRoll(Camera*, f32); - TVec3f *getPos(const CameraMan *); - TVec3f *getWatchPos(const CameraMan *); + TVec3f* getGlobalOffset(const Camera*); + TVec3f* getLocalOffset(const Camera*); - TVec3f* getUpVec(const CameraMan *); + void setGlobalOffset(Camera*, const TVec3f&); + void setLocalOffset(Camera*, const TVec3f&); + void setFrontOffset(Camera*, f32); + void setUpperOffset(Camera*, f32); - f32 getFovy(const CameraMan *); + TVec3f* getPos(const CameraMan*); + TVec3f* getWatchPos(const CameraMan*); - void setPos(CameraMan *, const TVec3f &); - void setWatchPos(CameraMan *, const TVec3f &); - void setUpVec(CameraMan *, const TVec3f &); - void setWatchUpVec(CameraMan *, const TVec3f &); - void setUsedTarget(const CameraMan *, CameraTargetObj *); + TVec3f* getUpVec(const CameraMan*); - void setUpVec(Camera *, const TVec3f &); + f32 getFovy(const CameraMan*); - void setFovy(CameraMan *, f32); - void setRoll(CameraMan *, f32); + void setPos(CameraMan*, const TVec3f&); + void setWatchPos(CameraMan*, const TVec3f&); + void setUpVec(CameraMan*, const TVec3f&); + void setWatchUpVec(CameraMan*, const TVec3f&); + void setUsedTarget(const CameraMan*, CameraTargetObj*); - TVec3f *getLocalOffset(CameraMan *); + void setUpVec(Camera*, const TVec3f&); - void setGlobalOffset(CameraMan *, const TVec3f &); - void setLocalOffset(CameraMan *, const TVec3f &); - void setFrontOffset(CameraMan *, f32); - void setUpperOffset(CameraMan *, f32); + void setFovy(CameraMan*, f32); + void setRoll(CameraMan*, f32); - void makeWatchPoint(TVec3f *, Camera *, CameraTargetObj *, f32); + TVec3f* getLocalOffset(CameraMan*); + + void setGlobalOffset(CameraMan*, const TVec3f&); + void setLocalOffset(CameraMan*, const TVec3f&); + void setFrontOffset(CameraMan*, f32); + void setUpperOffset(CameraMan*, f32); + + void makeWatchPoint(TVec3f*, Camera*, CameraTargetObj*, f32); bool tryCameraReset(); bool testCameraPadTriggerRoundLeft(); bool testCameraPadTriggerRoundRight(); -}; +}; // namespace CameraLocalUtil diff --git a/include/Game/Camera/CameraMan.hpp b/include/Game/Camera/CameraMan.hpp index feeb715a5..1d7837e55 100644 --- a/include/Game/Camera/CameraMan.hpp +++ b/include/Game/Camera/CameraMan.hpp @@ -8,13 +8,12 @@ class CameraPoseParam; class CameraMan : public NameObj { public: - CameraMan(const char *); - - virtual inline ~CameraMan() { + CameraMan(const char*); + virtual inline ~CameraMan() { } - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); virtual void calc(); @@ -31,15 +30,15 @@ public: virtual void roundLeft(); virtual void roundRight(); - void owned(CameraDirector *); - void released(CameraDirector *); - void activate(CameraDirector *); - void deactivate(CameraDirector *); - - CameraDirector *mDirector; // 0xC - CameraPoseParam *mPoseParam; // 0x10 - bool mIsActivated; // 0x14 - bool _15; - u8 _16[2]; - TMtx34f mMatrix; // 0x18 + void owned(CameraDirector*); + void released(CameraDirector*); + void activate(CameraDirector*); + void deactivate(CameraDirector*); + + CameraDirector* mDirector; // 0xC + CameraPoseParam* mPoseParam; // 0x10 + bool mIsActivated; // 0x14 + bool _15; + u8 _16[2]; + TMtx34f mMatrix; // 0x18 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraManEvent.hpp b/include/Game/Camera/CameraManEvent.hpp index c32af9455..870e8e68e 100644 --- a/include/Game/Camera/CameraManEvent.hpp +++ b/include/Game/Camera/CameraManEvent.hpp @@ -21,25 +21,24 @@ public: public: ChunkFIFOItem(); - CameraParamChunkEvent *mChunk; // 0x0 - CameraTargetArg mTargetArg; // 0x4 - u32 _14; + CameraParamChunkEvent* mChunk; // 0x0 + CameraTargetArg mTargetArg; // 0x4 + u32 _14; }; - + class ChunkFIFOItemPair { public: inline ChunkFIFOItemPair() { - } - ChunkFIFOItem mFirst; // 0x0 - ChunkFIFOItem mSecond; // 0x18 + ChunkFIFOItem mFirst; // 0x0 + ChunkFIFOItem mSecond; // 0x18 }; - CameraManEvent(CameraHolder *, CameraParamChunkHolder *, const char *); + CameraManEvent(CameraHolder*, CameraParamChunkHolder*, const char*); virtual ~CameraManEvent(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calc(); virtual void notifyActivate(); @@ -49,39 +48,39 @@ public: virtual bool isZeroFrameMoveOff() const; virtual bool isCorrectingErpPositionOff() const; - void start(s32, const char *, const CameraTargetArg &, s32); - void end(s32, const char *, s32); - bool isEventActive(s32, const char *) const; - bool isActive() const; - bool doesNextChunkHaveInterpolation() const; - u32 getAnimCameraFrame(s32, const char *) const; - void pauseOnAnimCamera(s32, const char *); - void pauseOffAnimCamera(s32, const char *); - void updateChunkFIFO(); - void applyChunk(); - void checkReset(ChunkFIFOItem *); - void changeCamera(); - void setExtraParam(); - void setVPanParam(); - void resetCameraIfRequested(); - void setSafePose(); - CameraParamChunkEvent *findChunk(s32, const char *) const NO_INLINE; - void requestChunk(CameraParamChunkEvent *, EPriority, const CameraTargetArg &, s32); - bool cleanChunkFIFO(CameraParamChunk *); - bool isChunkFIFOEmpty() const; - void sendStartInterpolateFrame(CameraParamChunkEvent *, s32); - s32 getInterpolateFrame(CameraParamChunkEvent *, s32) const; - void sendFinishInterpolateFrame(CameraParamChunkEvent *, s32); - s32 searchPriority(CameraParamChunk *) const; - bool isInFIFO(CameraParamChunk *) const; - bool isAnimCameraEnd(s32, const char *) const; + void start(s32, const char*, const CameraTargetArg&, s32); + void end(s32, const char*, s32); + bool isEventActive(s32, const char*) const; + bool isActive() const; + bool doesNextChunkHaveInterpolation() const; + u32 getAnimCameraFrame(s32, const char*) const; + void pauseOnAnimCamera(s32, const char*); + void pauseOffAnimCamera(s32, const char*); + void updateChunkFIFO(); + void applyChunk(); + void checkReset(ChunkFIFOItem*); + void changeCamera(); + void setExtraParam(); + void setVPanParam(); + void resetCameraIfRequested(); + void setSafePose(); + CameraParamChunkEvent* findChunk(s32, const char*) const NO_INLINE; + void requestChunk(CameraParamChunkEvent*, EPriority, const CameraTargetArg&, s32); + bool cleanChunkFIFO(CameraParamChunk*); + bool isChunkFIFOEmpty() const; + void sendStartInterpolateFrame(CameraParamChunkEvent*, s32); + s32 getInterpolateFrame(CameraParamChunkEvent*, s32) const; + void sendFinishInterpolateFrame(CameraParamChunkEvent*, s32); + s32 searchPriority(CameraParamChunk*) const; + bool isInFIFO(CameraParamChunk*) const; + bool isAnimCameraEnd(s32, const char*) const; - CameraHolder *mHolder; // 0x48 - CameraParamChunkHolder *mChunkHolder; // 0x4C - Camera *mCamera; // 0x50 - ChunkFIFOItemPair mItems[NR_FIFO_ITEMS]; // 0x54 - CameraParamChunkEvent *mChunk; // 0xB4 - u32 _B8; - bool _BC; - u8 _BD[3]; + CameraHolder* mHolder; // 0x48 + CameraParamChunkHolder* mChunkHolder; // 0x4C + Camera* mCamera; // 0x50 + ChunkFIFOItemPair mItems[NR_FIFO_ITEMS]; // 0x54 + CameraParamChunkEvent* mChunk; // 0xB4 + u32 _B8; + bool _BC; + u8 _BD[3]; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraManGame.hpp b/include/Game/Camera/CameraManGame.hpp index 5502fa003..515b7d05f 100644 --- a/include/Game/Camera/CameraManGame.hpp +++ b/include/Game/Camera/CameraManGame.hpp @@ -13,10 +13,10 @@ class CamHeliEffector; class CameraManGame : public CameraMan { public: - CameraManGame(CameraHolder *, CameraParamChunkHolder *, const char *); + CameraManGame(CameraHolder*, CameraParamChunkHolder*, const char*); virtual ~CameraManGame(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calc(); virtual void notifyActivate(); @@ -30,57 +30,57 @@ public: virtual bool isEnableToRoundLeft() const; virtual bool isEnableToRoundRight() const; - void closeCreatingCameraChunk(); - void startStartPosCamera(bool); - void endStartPosCamera(); - void zoomIn(); - void zoomOut(); - void selectCameraChunk(); - void setChunk(const CameraParamChunkID &); - void setNullCamera(); - CameraParamChunk *tryToReplaceChunkToDefault(CameraParamChunk *); - void requestResetIfNecessary(CameraParamChunk *); - bool isNecessaryToReset(CameraParamChunk *) const; - bool isCurrentChunkEnableEndInterp() const; - void replaceCurrentChunkAndCamera(CameraParamChunk *); - void applyParameter(); - void checkReset(); - void setSafePose(); - void keepAwayWatchPos(TVec3f *, const TVec3f &); - void calcSafeUpVec(TVec3f *, const TVec3f &, const TVec3f &); // TODO - void createDefaultCamera(); - void createDefaultWaterCamera(); - void createDefaultWaterSurfaceCamera(); - void createDefaultFooFighterCamera(); - void createStartAnimCamera(); - void createZoomCamera(); - void checkStateShift(); - bool tryShiftToGCapture(); - bool tryShiftToSwimOrWaterSurface(); - bool tryShiftToFooFighter(); - void updateNormal(); // TODO - void updateSwim(); - void updateWaterSurface(); - void updateGCapture(); - void updateFooFighter(); - bool setCubeChunk(CubeCameraArea::ECategory); - bool tryStartPosCamera(); - bool tryZoomCamera(); - bool isZoomCamera() const; + void closeCreatingCameraChunk(); + void startStartPosCamera(bool); + void endStartPosCamera(); + void zoomIn(); + void zoomOut(); + void selectCameraChunk(); + void setChunk(const CameraParamChunkID&); + void setNullCamera(); + CameraParamChunk* tryToReplaceChunkToDefault(CameraParamChunk*); + void requestResetIfNecessary(CameraParamChunk*); + bool isNecessaryToReset(CameraParamChunk*) const; + bool isCurrentChunkEnableEndInterp() const; + void replaceCurrentChunkAndCamera(CameraParamChunk*); + void applyParameter(); + void checkReset(); + void setSafePose(); + void keepAwayWatchPos(TVec3f*, const TVec3f&); + void calcSafeUpVec(TVec3f*, const TVec3f&, const TVec3f&); // TODO + void createDefaultCamera(); + void createDefaultWaterCamera(); + void createDefaultWaterSurfaceCamera(); + void createDefaultFooFighterCamera(); + void createStartAnimCamera(); + void createZoomCamera(); + void checkStateShift(); + bool tryShiftToGCapture(); + bool tryShiftToSwimOrWaterSurface(); + bool tryShiftToFooFighter(); + void updateNormal(); // TODO + void updateSwim(); + void updateWaterSurface(); + void updateGCapture(); + void updateFooFighter(); + bool setCubeChunk(CubeCameraArea::ECategory); + bool tryStartPosCamera(); + bool tryZoomCamera(); + bool isZoomCamera() const; - CameraHolder *mHolder; // 0x48 - CameraParamChunkHolder *mChunkHolder; // 0x4C - Camera *mCamera; // 0x50 - CameraParamChunk *mChunk; // 0x54 - u8 _58; - u8 _59[3]; - u32 _5C; - CamKarikariEffector *mKarikari; // 0x60 - CamHeliEffector *mHeli; // 0x64 - u32 mTypeState; // 0x68 - u8 _6C; - u8 _6D[3]; - s32 _70; - bool mZoomedIn; // 0x74 - u8 _75[3]; + CameraHolder* mHolder; // 0x48 + CameraParamChunkHolder* mChunkHolder; // 0x4C + Camera* mCamera; // 0x50 + CameraParamChunk* mChunk; // 0x54 + u8 _58; + u8 _59[3]; + u32 _5C; + CamKarikariEffector* mKarikari; // 0x60 + CamHeliEffector* mHeli; // 0x64 + u32 mTypeState; // 0x68 + u8 _6C; + u8 _6D[3]; + s32 _70; + bool mZoomedIn; // 0x74 + u8 _75[3]; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraManPause.hpp b/include/Game/Camera/CameraManPause.hpp index 5ae84e559..7509bbe7c 100644 --- a/include/Game/Camera/CameraManPause.hpp +++ b/include/Game/Camera/CameraManPause.hpp @@ -5,20 +5,20 @@ class CameraManPause : public CameraMan { public: - CameraManPause(const char *); + CameraManPause(const char*); virtual ~CameraManPause(); - - virtual void init(const JMapInfoIter &); - - virtual void calc(); // TODO + + virtual void init(const JMapInfoIter&); + + virtual void calc(); // TODO virtual void notifyActivate(); // TODO virtual void notifyDeactivate(); virtual bool isCollisionOff() const; virtual bool isZeroFrameMoveOff() const; - f32 _48; - f32 _4C; - f32 _50; - f32 _54; + f32 _48; + f32 _4C; + f32 _50; + f32 _54; TVec3f _58; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraManSubjective.hpp b/include/Game/Camera/CameraManSubjective.hpp index f69fd9701..109bb5317 100644 --- a/include/Game/Camera/CameraManSubjective.hpp +++ b/include/Game/Camera/CameraManSubjective.hpp @@ -6,14 +6,14 @@ class CameraSubjective; class CameraManSubjective : public CameraMan { public: - CameraManSubjective(const char *); + CameraManSubjective(const char*); virtual ~CameraManSubjective(); - - virtual void init(const JMapInfoIter &); + + virtual void init(const JMapInfoIter&); virtual void calc(); virtual void notifyActivate(); virtual void notifyDeactivate(); - CameraSubjective *mCamera; // 0x48 + CameraSubjective* mCamera; // 0x48 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraMedianPlanet.hpp b/include/Game/Camera/CameraMedianPlanet.hpp index c526c47e7..f70b3cd18 100644 --- a/include/Game/Camera/CameraMedianPlanet.hpp +++ b/include/Game/Camera/CameraMedianPlanet.hpp @@ -5,30 +5,30 @@ class CameraMedianPlanet : public Camera { public: - CameraMedianPlanet(const char *); + CameraMedianPlanet(const char*); virtual ~CameraMedianPlanet(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); - void getPrevFront(TVec3f *); - void constrainDipAngle(TVec3f *); - void makeTargetMtx(TPos3f *); - void peepMtx(TPos3f *); - void rotate33(TPos3f *, const TVec3f &, f32); - void constrainLength(TVec3f *); + void getPrevFront(TVec3f*); + void constrainDipAngle(TVec3f*); + void makeTargetMtx(TPos3f*); + void peepMtx(TPos3f*); + void rotate33(TPos3f*, const TVec3f&, f32); + void constrainLength(TVec3f*); void getMaxRate(); - void getRegisterUpVec(TVec3f *); - void calcWatchPos(TVec3f *); - void calcUpVec(TVec3f *, const TVec3f &, const TVec3f &); + void getRegisterUpVec(TVec3f*); + void calcWatchPos(TVec3f*); + void calcUpVec(TVec3f*, const TVec3f&, const TVec3f&); - const char *mString; // 0x4C - f32 mAxisX; // 0x50 - f32 mAxisY; // 0x54 - f32 mAngleA; // 0x58 - f32 mAngleB; // 0x5C - f32 mDist; // 0x60 - f32 mAxisZ; // 0x64 - f32 mWPointX; // 0x68 + const char* mString; // 0x4C + f32 mAxisX; // 0x50 + f32 mAxisY; // 0x54 + f32 mAngleA; // 0x58 + f32 mAngleB; // 0x5C + f32 mDist; // 0x60 + f32 mAxisZ; // 0x64 + f32 mWPointX; // 0x68 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraMedianTower.hpp b/include/Game/Camera/CameraMedianTower.hpp index deabf37c4..552600c94 100644 --- a/include/Game/Camera/CameraMedianTower.hpp +++ b/include/Game/Camera/CameraMedianTower.hpp @@ -4,29 +4,29 @@ class CameraMedianTower : public Camera { public: - CameraMedianTower(const char *); + CameraMedianTower(const char*); virtual ~CameraMedianTower(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); - void calcFovyPos(TVec3f *, const TVec3f &, const TVec3f &, const TVec3f &); - void limitAngularVelocity(TVec3f *, TVec3f *, const TVec3f &, const TVec3f &, const TVec3f &); - void calcDistance(TVec3f *, const TVec3f &); - void updateReset(const TVec3f &, const TVec3f &, const TVec3f &); + void calcFovyPos(TVec3f*, const TVec3f&, const TVec3f&, const TVec3f&); + void limitAngularVelocity(TVec3f*, TVec3f*, const TVec3f&, const TVec3f&, const TVec3f&); + void calcDistance(TVec3f*, const TVec3f&); + void updateReset(const TVec3f&, const TVec3f&, const TVec3f&); - const char *mString; // 0x4C - TVec3f mWPoint; // 0x50 - TVec3f mAxis; // 0x5C - f32 mAngleA; // 0x68 - f32 mUpX; // 0x6C - f32 mUpY; // 0x70 - f32 mUpZ; // 0x74 - f32 _78; - f32 _7C; - f32 _80; - u8 _84; - u8 _85[3]; - u32 _88; + const char* mString; // 0x4C + TVec3f mWPoint; // 0x50 + TVec3f mAxis; // 0x5C + f32 mAngleA; // 0x68 + f32 mUpX; // 0x6C + f32 mUpY; // 0x70 + f32 mUpZ; // 0x74 + f32 _78; + f32 _7C; + f32 _80; + u8 _84; + u8 _85[3]; + u32 _88; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraMtxRegParallel.hpp b/include/Game/Camera/CameraMtxRegParallel.hpp index 090c86a2f..3bfb1a9b1 100644 --- a/include/Game/Camera/CameraMtxRegParallel.hpp +++ b/include/Game/Camera/CameraMtxRegParallel.hpp @@ -4,18 +4,18 @@ class CameraMtxRegParallel : public Camera { public: - CameraMtxRegParallel(const char *); + CameraMtxRegParallel(const char*); virtual ~CameraMtxRegParallel(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); void calcIdealPose(); - const char *mString; // 0x4C - f32 mAngleB; // 0x50 - f32 mAngleA; // 0x54 - f32 mDist; // 0x58 - TVec3f mWPoint; // 0x5C + const char* mString; // 0x4C + f32 mAngleB; // 0x50 + f32 mAngleA; // 0x54 + f32 mDist; // 0x58 + TVec3f mWPoint; // 0x5C }; \ No newline at end of file diff --git a/include/Game/Camera/CameraObjParallel.hpp b/include/Game/Camera/CameraObjParallel.hpp index be4f86771..806fa797d 100644 --- a/include/Game/Camera/CameraObjParallel.hpp +++ b/include/Game/Camera/CameraObjParallel.hpp @@ -4,14 +4,14 @@ class CameraObjParallel : public Camera { public: - CameraObjParallel(const char *); + CameraObjParallel(const char*); virtual ~CameraObjParallel(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); - f32 mAngleA; // 0x4C - f32 mAngleB; // 0x50 - f32 mDist; // 0x54 + f32 mAngleA; // 0x4C + f32 mAngleB; // 0x50 + f32 mDist; // 0x54 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraParallel.hpp b/include/Game/Camera/CameraParallel.hpp index abe843192..3e37d3bd1 100644 --- a/include/Game/Camera/CameraParallel.hpp +++ b/include/Game/Camera/CameraParallel.hpp @@ -4,26 +4,26 @@ class CameraParallel : public Camera { public: - CameraParallel(const char *); + CameraParallel(const char*); virtual ~CameraParallel(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); - virtual bool isEnableToRoundLeft() const; - virtual bool isEnableToRoundRight() const; - virtual bool isEnableToReset() const; + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); + virtual bool isEnableToRoundLeft() const; + virtual bool isEnableToRoundRight() const; + virtual bool isEnableToReset() const; void calcIdealPose(); void calcRound(); - f32 mAngleB; // 0x4C - f32 mAngleA; // 0x50 - f32 mDist; // 0x54 + f32 mAngleB; // 0x4C + f32 mAngleA; // 0x50 + f32 mDist; // 0x54 bool _58; bool _59; - u8 _5A[2]; - f32 _5C; - f32 _60; - f32 _64; + u8 _5A[2]; + f32 _5C; + f32 _60; + f32 _64; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraParamChunk.hpp b/include/Game/Camera/CameraParamChunk.hpp index 4498b85ae..63c170123 100644 --- a/include/Game/Camera/CameraParamChunk.hpp +++ b/include/Game/Camera/CameraParamChunk.hpp @@ -11,17 +11,17 @@ class CameraGeneralParam { public: CameraGeneralParam(); - CameraGeneralParam &operator=(const CameraGeneralParam &); + CameraGeneralParam& operator=(const CameraGeneralParam&); - f32 mDist; // 0x0 - TVec3f mAxis; // 0x4 - TVec3f mWPoint; // 0x10 - TVec3f mUp; // 0x1C - f32 mAngleA; // 0x28 - f32 mAngleB; // 0x2C - s32 mNum1; // 0x30 - s32 mNum2; // 0x34 - CameraParamString mString; // 0x38 + f32 mDist; // 0x0 + TVec3f mAxis; // 0x4 + TVec3f mWPoint; // 0x10 + TVec3f mUp; // 0x1C + f32 mAngleA; // 0x28 + f32 mAngleB; // 0x2C + s32 mNum1; // 0x30 + s32 mNum2; // 0x34 + CameraParamString mString; // 0x38 }; class CameraParamChunk { @@ -32,86 +32,86 @@ public: void init(); - TVec3f mWOffset; // 0x0 - f32 mLOffset; // 0xC - f32 mLOffsetV; // 0x10 - f32 mRoll; // 0x14 - f32 mFovy; // 0x18 - s32 mCamInt; // 0x1C - u16 mFlag; // 0x20 - u8 _22[2]; // 0x22 - f32 mUpper; // 0x24 - f32 mLower; // 0x28 - s32 mGndInt; // 0x2C - f32 mUPlay; // 0x30 - f32 mLPlay; // 0x34 - s32 mPushDelay; // 0x38 - s32 mPushDelayLow; // 0x3C - s32 mUDown; // 0x40 - s32 mVPanUse; // 0x44 - TVec3f mVPanAxis; // 0x48 + TVec3f mWOffset; // 0x0 + f32 mLOffset; // 0xC + f32 mLOffsetV; // 0x10 + f32 mRoll; // 0x14 + f32 mFovy; // 0x18 + s32 mCamInt; // 0x1C + u16 mFlag; // 0x20 + u8 _22[2]; // 0x22 + f32 mUpper; // 0x24 + f32 mLower; // 0x28 + s32 mGndInt; // 0x2C + f32 mUPlay; // 0x30 + f32 mLPlay; // 0x34 + s32 mPushDelay; // 0x38 + s32 mPushDelayLow; // 0x3C + s32 mUDown; // 0x40 + s32 mVPanUse; // 0x44 + TVec3f mVPanAxis; // 0x48 }; - CameraParamChunk(CameraHolder *, const CameraParamChunkID &); + CameraParamChunk(CameraHolder*, const CameraParamChunkID&); - virtual void copy(const CameraParamChunk *); - virtual void load(DotCamReader *, CameraHolder *); - virtual void initiate(); - virtual const char *getClassName() const; + virtual void copy(const CameraParamChunk*); + virtual void load(DotCamReader*, CameraHolder*); + virtual void initiate(); + virtual const char* getClassName() const; - s32 getZoneID() const; + s32 getZoneID() const; bool isOnNoReset() const; bool isOnUseFovy() const; bool isLOfsErpOff() const; bool isAntiBlurOff() const; bool isCollisionOff() const; bool isSubjectiveCameraOff() const; - void getVPanAxis(TVec3f *) const; + void getVPanAxis(TVec3f*) const; - void setCameraType(const char *, const CameraHolder *); + void setCameraType(const char*, const CameraHolder*); void setUseFovy(bool); void setLOfsErpOff(bool); void setCollisionOff(bool); - void arrangeCamTypeName(u32, const char **); + void arrangeCamTypeName(u32, const char**); - CameraParamChunkID *mParamChunkID; // 0x4 - u8 mCameraTypeIndex; // 0x8 - u8 _9[3]; - ExParam mExParam; // 0xC - CameraGeneralParam *mGeneralParam; // 0x60 - bool _64; + CameraParamChunkID* mParamChunkID; // 0x4 + u8 mCameraTypeIndex; // 0x8 + u8 _9[3]; + ExParam mExParam; // 0xC + CameraGeneralParam* mGeneralParam; // 0x60 + bool _64; }; class CameraParamChunkGame : public CameraParamChunk { public: - CameraParamChunkGame(CameraHolder *, const CameraParamChunkID &); - - virtual void copy(const CameraParamChunk *); - virtual void load(DotCamReader *, CameraHolder *); - virtual void initiate(); - virtual const char *getClassName() const; + CameraParamChunkGame(CameraHolder*, const CameraParamChunkID&); - u8 mThru; // 0x65 - u8 mEnableEndErpFrame; // 0x66 - u8 _67; - u32 mCamEndInt; // 0x68 + virtual void copy(const CameraParamChunk*); + virtual void load(DotCamReader*, CameraHolder*); + virtual void initiate(); + virtual const char* getClassName() const; + + u8 mThru; // 0x65 + u8 mEnableEndErpFrame; // 0x66 + u8 _67; + u32 mCamEndInt; // 0x68 }; class CameraParamChunkEvent : public CameraParamChunk { public: - CameraParamChunkEvent(CameraHolder *, const CameraParamChunkID &); + CameraParamChunkEvent(CameraHolder*, const CameraParamChunkID&); - virtual void copy(const CameraParamChunk *); - virtual void load(DotCamReader *, CameraHolder *); - virtual void initiate(); - virtual const char *getClassName() const; + virtual void copy(const CameraParamChunk*); + virtual void load(DotCamReader*, CameraHolder*); + virtual void initiate(); + virtual const char* getClassName() const; - u8 mEnableErpFrame; // 0x65 - u8 _66[2]; + u8 mEnableErpFrame; // 0x65 + u8 _66[2]; u32 mEvFrame; // 0x68 - u8 mEnableEndErpFrame; // 0x6C - u8 _6D[3]; - u32 mCamEndInt; // 0x70 - u32 mEvPriority; // 0x74 + u8 mEnableEndErpFrame; // 0x6C + u8 _6D[3]; + u32 mCamEndInt; // 0x70 + u32 mEvPriority; // 0x74 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraParamChunkHolder.hpp b/include/Game/Camera/CameraParamChunkHolder.hpp index 5c3a66ce1..e9187b746 100644 --- a/include/Game/Camera/CameraParamChunkHolder.hpp +++ b/include/Game/Camera/CameraParamChunkHolder.hpp @@ -9,24 +9,24 @@ class JKRHeap; class CameraParamChunkHolder : public NameObj { public: - CameraParamChunkHolder(CameraHolder *pCameraHolder, const char *pName); + CameraParamChunkHolder(CameraHolder* pCameraHolder, const char* pName); virtual ~CameraParamChunkHolder(); - CameraParamChunk *createChunk(const CameraParamChunkID &, JKRHeap *); - CameraParamChunk *getChunk(const CameraParamChunkID &); - void sort(); - void loadCameraParameters(); - bool isNewAttribute(const CameraParamChunkID &); - CameraParamChunk *findChunk(const CameraParamChunkID &); - CameraParamChunk *findChunk(s32, const char *); - void loadFile(s32); - void arrangeChunk(CameraParamChunk *); + CameraParamChunk* createChunk(const CameraParamChunkID&, JKRHeap*); + CameraParamChunk* getChunk(const CameraParamChunkID&); + void sort(); + void loadCameraParameters(); + bool isNewAttribute(const CameraParamChunkID&); + CameraParamChunk* findChunk(const CameraParamChunkID&); + CameraParamChunk* findChunk(s32, const char*); + void loadFile(s32); + void arrangeChunk(CameraParamChunk*); - CameraHolder *mCameraHolder; // 0xC - u32 mChunkCapacity; // 0x10 - u32 mNrChunks; // 0x14 - CameraParamChunk **mChunks; // 0x18 - u32 mCameraVersion; // 0x1C - u8 mIsSorted; // 0x20 - u8 _21[3]; + CameraHolder* mCameraHolder; // 0xC + u32 mChunkCapacity; // 0x10 + u32 mNrChunks; // 0x14 + CameraParamChunk** mChunks; // 0x18 + u32 mCameraVersion; // 0x1C + u8 mIsSorted; // 0x20 + u8 _21[3]; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraParamChunkID.hpp b/include/Game/Camera/CameraParamChunkID.hpp index a4aa3d873..bc19dcb41 100644 --- a/include/Game/Camera/CameraParamChunkID.hpp +++ b/include/Game/Camera/CameraParamChunkID.hpp @@ -5,21 +5,21 @@ class CameraParamChunkID { public: CameraParamChunkID(); - CameraParamChunkID(const CameraParamChunkID &); + CameraParamChunkID(const CameraParamChunkID&); - bool operator>(const CameraParamChunkID &) const; - bool operator==(const CameraParamChunkID &) const; + bool operator>(const CameraParamChunkID&) const; + bool operator==(const CameraParamChunkID&) const; - virtual char *getBuffer(u32); + virtual char* getBuffer(u32); - bool equals(s32, const char *) const; + bool equals(s32, const char*) const; void createCubeID(s32, u16); - void createGroupID(s32, const char *, u32, u32); - void createOtherID(s32, const char *); - void createEventID(s32, const char *); + void createGroupID(s32, const char*, u32, u32); + void createOtherID(s32, const char*); + void createEventID(s32, const char*); void createStartID(s32, u16); - s8 mZoneID; // 0x4 - u8 _5[3]; - char *mName; // 0x8 + s8 mZoneID; // 0x4 + u8 _5[3]; + char* mName; // 0x8 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraParamString.hpp b/include/Game/Camera/CameraParamString.hpp index 81c2dc8e3..d6b6166c9 100644 --- a/include/Game/Camera/CameraParamString.hpp +++ b/include/Game/Camera/CameraParamString.hpp @@ -4,11 +4,11 @@ class CameraParamString { public: CameraParamString(); - CameraParamString &operator=(const CameraParamString &); + CameraParamString& operator=(const CameraParamString&); - void setCharPtr(const char *); - const char *getCharPtr() const; - void copy(const char *); + void setCharPtr(const char*); + const char* getCharPtr() const; + void copy(const char*); - const char *mString; // 0x0 + const char* mString; // 0x0 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraPolygonCodeUtil.hpp b/include/Game/Camera/CameraPolygonCodeUtil.hpp index 1793fd0d8..d69f4119f 100644 --- a/include/Game/Camera/CameraPolygonCodeUtil.hpp +++ b/include/Game/Camera/CameraPolygonCodeUtil.hpp @@ -3,6 +3,6 @@ #include namespace MR { - void initCameraCodeCollection(const char *, s32); + void initCameraCodeCollection(const char*, s32); void termCameraCodeCollection(); -} \ No newline at end of file +} // namespace MR \ No newline at end of file diff --git a/include/Game/Camera/CameraPoseParam.hpp b/include/Game/Camera/CameraPoseParam.hpp index 7e791b40f..b5d4cb873 100644 --- a/include/Game/Camera/CameraPoseParam.hpp +++ b/include/Game/Camera/CameraPoseParam.hpp @@ -7,16 +7,16 @@ class CameraPoseParam { public: CameraPoseParam(); - void copyFrom(const CameraPoseParam &); + void copyFrom(const CameraPoseParam&); - TVec3f _0; - TVec3f mWatchPos; // 0xC + TVec3f _0; + TVec3f mWatchPos; // 0xC TVec3f _18; TVec3f _24; - f32 _30; + f32 _30; TVec3f _34; - TVec3f _40; - f32 _4C; - f32 _50; - f32 _54; + TVec3f _40; + f32 _4C; + f32 _50; + f32 _54; }; diff --git a/include/Game/Camera/CameraRaceFollow.hpp b/include/Game/Camera/CameraRaceFollow.hpp index e5d04f44d..0c3d820ab 100644 --- a/include/Game/Camera/CameraRaceFollow.hpp +++ b/include/Game/Camera/CameraRaceFollow.hpp @@ -4,19 +4,19 @@ class CameraRaceFollow : public Camera { public: - CameraRaceFollow(const char *); + CameraRaceFollow(const char*); virtual ~CameraRaceFollow(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); void goRound(); - f32 mWPointX; // 0x4C - f32 mWPointY; // 0x50 - f32 mAngleA; // 0x54 + f32 mWPointX; // 0x4C + f32 mWPointY; // 0x50 + f32 mAngleA; // 0x54 bool _58; - u8 _59[3]; - f32 mWPointZ; // 0x5C + u8 _59[3]; + f32 mWPointZ; // 0x5C }; \ No newline at end of file diff --git a/include/Game/Camera/CameraRailDemo.hpp b/include/Game/Camera/CameraRailDemo.hpp index 03f4e7894..40248518c 100644 --- a/include/Game/Camera/CameraRailDemo.hpp +++ b/include/Game/Camera/CameraRailDemo.hpp @@ -4,12 +4,12 @@ class CameraRailDemo : public Camera { public: - CameraRailDemo(const char *); + CameraRailDemo(const char*); virtual ~CameraRailDemo(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); void setParam(s32, s32, s32, s32, f32); void calcLinear(); @@ -17,9 +17,9 @@ public: void calcDamp(); u32* _4C; - s32 _50; - s32 _54; - u32 _58; - f32 _5C; - f32 _60; + s32 _50; + s32 _54; + u32 _58; + f32 _5C; + f32 _60; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraRailFollow.hpp b/include/Game/Camera/CameraRailFollow.hpp index 313a685ca..67f3301c2 100644 --- a/include/Game/Camera/CameraRailFollow.hpp +++ b/include/Game/Camera/CameraRailFollow.hpp @@ -4,12 +4,12 @@ class CameraRailFollow : public Camera { public: - CameraRailFollow(const char *); + CameraRailFollow(const char*); virtual ~CameraRailFollow(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); void setParam(s32, s32, f32, f32, f32, s32); @@ -19,5 +19,5 @@ public: f32 _58; f32 _5C; f32 _60; - u8 _64[4]; + u8 _64[4]; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraRailHolder.hpp b/include/Game/Camera/CameraRailHolder.hpp index f5a93ff56..5f8ec99d9 100644 --- a/include/Game/Camera/CameraRailHolder.hpp +++ b/include/Game/Camera/CameraRailHolder.hpp @@ -14,18 +14,17 @@ public: class RailSet { public: - - RailSet &operator=(const RailSet &); + RailSet& operator=(const RailSet&); u32 _0; u32 _4; }; - CameraRailHolder(const char *); + CameraRailHolder(const char*); ~CameraRailHolder(); // getRider(s32, s32) const; // find(s32, s32) const; - ZoneRail *mRails; // 0xC + ZoneRail* mRails; // 0xC }; \ No newline at end of file diff --git a/include/Game/Camera/CameraRailWatch.hpp b/include/Game/Camera/CameraRailWatch.hpp index bf839116e..daa64b301 100644 --- a/include/Game/Camera/CameraRailWatch.hpp +++ b/include/Game/Camera/CameraRailWatch.hpp @@ -4,12 +4,12 @@ class CameraRailWatch : public Camera { public: - CameraRailWatch(const char *); + CameraRailWatch(const char*); virtual ~CameraRailWatch(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); void setParam(s32, s32, s32, f32, f32, f32); diff --git a/include/Game/Camera/CameraRegisterHolder.hpp b/include/Game/Camera/CameraRegisterHolder.hpp index 60966e6b2..f56bc1380 100644 --- a/include/Game/Camera/CameraRegisterHolder.hpp +++ b/include/Game/Camera/CameraRegisterHolder.hpp @@ -8,33 +8,33 @@ class CameraRegisterHolder : public NameObj { public: - CameraRegisterHolder(const char *); + CameraRegisterHolder(const char*); - void declareMtxReg(const char *, MtxPtr); - MtxPtr getMtx(const char *) const; + void declareMtxReg(const char*, MtxPtr); + MtxPtr getMtx(const char*) const; - void declareVecReg(const char *, const TVec3f *); - const TVec3f *getVec(const char *) const; - void declareFloatReg(const char *, const f32 *); - const char *getDummyVecRegName() const; + void declareVecReg(const char*, const TVec3f*); + const TVec3f* getVec(const char*) const; + void declareFloatReg(const char*, const f32*); + const char* getDummyVecRegName() const; void initMtx(); void initVec(); void initFloat(); void initDummyRegister(); - s32 searchName(const char *const *, u32, const char *) const; + s32 searchName(const char* const*, u32, const char*) const; - u32 mNrMatrices; // 0xC - MtxPtr mMatrices[NR_REGISTERS]; // 0x10 - const char *mMatrixNames[NR_REGISTERS]; // 0x110 - u32 mNrVectors; // 0x210 - const TVec3f *mVectors[NR_REGISTERS]; // 0x214 - const char *mVectorNames[NR_REGISTERS]; // 0x314 - u32 mNrFloats; // 0x414 - const f32 *mFloats[NR_REGISTERS]; // 0x418 - const char *mFloatNames[NR_REGISTERS]; // 0x518 - TMtx34f mDummyMatrix; // 0x618 - TVec3f mDummyVector; // 0x648 - f32 mDummyFloat; // 0x654 + u32 mNrMatrices; // 0xC + MtxPtr mMatrices[NR_REGISTERS]; // 0x10 + const char* mMatrixNames[NR_REGISTERS]; // 0x110 + u32 mNrVectors; // 0x210 + const TVec3f* mVectors[NR_REGISTERS]; // 0x214 + const char* mVectorNames[NR_REGISTERS]; // 0x314 + u32 mNrFloats; // 0x414 + const f32* mFloats[NR_REGISTERS]; // 0x418 + const char* mFloatNames[NR_REGISTERS]; // 0x518 + TMtx34f mDummyMatrix; // 0x618 + TVec3f mDummyVector; // 0x648 + f32 mDummyFloat; // 0x654 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraRotChecker.hpp b/include/Game/Camera/CameraRotChecker.hpp index 9c640b50f..b03f97300 100644 --- a/include/Game/Camera/CameraRotChecker.hpp +++ b/include/Game/Camera/CameraRotChecker.hpp @@ -9,6 +9,6 @@ public: void update(); TMtx34f _0; - bool _30; - u8 _31[3]; + bool _30; + u8 _31[3]; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraShakePatternImpl.hpp b/include/Game/Camera/CameraShakePatternImpl.hpp index 11d7837ae..a39b47f95 100644 --- a/include/Game/Camera/CameraShakePatternImpl.hpp +++ b/include/Game/Camera/CameraShakePatternImpl.hpp @@ -9,14 +9,13 @@ public: } virtual inline ~CameraShakePattern() { - } virtual bool isEnd() const = 0; - virtual void getOffset(TVec2f *) const = 0; + virtual void getOffset(TVec2f*) const = 0; virtual void start() = 0; virtual void update() = 0; - + u32 _4; }; @@ -26,15 +25,15 @@ public: virtual ~CameraShakePatternSingly(); virtual bool isEnd() const; - virtual void getOffset(TVec2f *) const; + virtual void getOffset(TVec2f*) const; virtual void start(); virtual void update(); - void setDirection(const TVec2f &); + void setDirection(const TVec2f&); - f32 _8; - TVec2f mOffset; // 0xC - TVec2f mDirection; // 0x14 + f32 _8; + TVec2f mOffset; // 0xC + TVec2f mDirection; // 0x14 }; class CameraShakePatternVerticalSin : public CameraShakePattern { @@ -43,11 +42,11 @@ public: virtual ~CameraShakePatternVerticalSin(); virtual bool isEnd() const; - virtual void getOffset(TVec2f *) const; + virtual void getOffset(TVec2f*) const; virtual void start(); virtual void update(); - f32 _8; - f32 _C; + f32 _8; + f32 _C; TVec2f mOffset; // 0x10 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraShakeTask.hpp b/include/Game/Camera/CameraShakeTask.hpp index 4e960cc40..2efc85a25 100644 --- a/include/Game/Camera/CameraShakeTask.hpp +++ b/include/Game/Camera/CameraShakeTask.hpp @@ -4,23 +4,23 @@ class CameraShakePattern; class CameraShakeTask { public: - CameraShakeTask(CameraShakePattern *); + CameraShakeTask(CameraShakePattern*); void start(u32, u32); void startInfinity(u32); void endForce(); void movement(); - void getOffset(TVec2f *) const; + void getOffset(TVec2f*) const; bool isEnd() const; void startCommon(u32); void updatePattern(); void updateInterval(); - CameraShakePattern *mPattern; // 0x0 - bool mHasEnded; // 0x4 - bool mIsInfinite; // 0x5 - u8 _6[2]; - u32 _8; - u32 _C; - u32 _10; + CameraShakePattern* mPattern; // 0x0 + bool mHasEnded; // 0x4 + bool mIsInfinite; // 0x5 + u8 _6[2]; + u32 _8; + u32 _C; + u32 _10; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraShaker.hpp b/include/Game/Camera/CameraShaker.hpp index 98c673cfd..ad814a61c 100644 --- a/include/Game/Camera/CameraShaker.hpp +++ b/include/Game/Camera/CameraShaker.hpp @@ -21,14 +21,14 @@ public: SINGLY_VERTICAL_POWER_VERY_STRONG = 6 }; - CameraShaker(const char *); + CameraShaker(const char*); virtual ~CameraShaker(); virtual void movement(); void shakeVertical(ESinglyVerticalPower); - void shakeInfinity(NameObj *, f32, f32); - void stopShakingInfinity(NameObj *); + void shakeInfinity(NameObj*, f32, f32); + void stopShakingInfinity(NameObj*); void createSinglyVerticalTask(); void createSinglyHorizontalTask(); void createInfinityTask(); @@ -36,14 +36,14 @@ public: void updateSinglyHorizontalTask(); void updateInfinityTask(); void setOffset(); - void addSinglyVerticalTaskOffset(TVec2f *); - void addSinglyHorizontalTaskOffset(TVec2f *); - void addInfinityTaskOffset(TVec2f *); - void adjustOffsetToScreen(TVec2f *); // TODO + void addSinglyVerticalTaskOffset(TVec2f*); + void addSinglyHorizontalTaskOffset(TVec2f*); + void addInfinityTaskOffset(TVec2f*); + void adjustOffsetToScreen(TVec2f*); // TODO void startInfinity(u32, f32, f32); - CameraShakeTask *mVerticalTasks[NR_VERTICAL_TASKS]; // 0xC - CameraShakeTask *mHorizontalTasks[NR_HORIZONTAL_TASKS]; // 0x28 - CameraShakeTask *mInfinityTasks[NR_INFINITY_TASKS]; // 0x34 - NameObj *mInfinityNameObjs[NR_INFINITY_TASKS]; // 0x44 + CameraShakeTask* mVerticalTasks[NR_VERTICAL_TASKS]; // 0xC + CameraShakeTask* mHorizontalTasks[NR_HORIZONTAL_TASKS]; // 0x28 + CameraShakeTask* mInfinityTasks[NR_INFINITY_TASKS]; // 0x34 + NameObj* mInfinityNameObjs[NR_INFINITY_TASKS]; // 0x44 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraSlide.hpp b/include/Game/Camera/CameraSlide.hpp index 8b3aa2f9c..639237bf7 100644 --- a/include/Game/Camera/CameraSlide.hpp +++ b/include/Game/Camera/CameraSlide.hpp @@ -4,16 +4,16 @@ class CameraSlide : public Camera { public: - CameraSlide(const char *); + CameraSlide(const char*); virtual ~CameraSlide(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); TVec3f mAxis; // 0x4C TVec3f mUp; // 0x58 TVec3f mWPoint; // 0x64 - f32 mAngleA; // 0x70 - f32 mDist; // 0x74 + f32 mAngleA; // 0x70 + f32 mDist; // 0x74 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraSpiral.hpp b/include/Game/Camera/CameraSpiral.hpp index ad47b4a70..63a8ec0b6 100644 --- a/include/Game/Camera/CameraSpiral.hpp +++ b/include/Game/Camera/CameraSpiral.hpp @@ -4,21 +4,21 @@ class CameraSpiral : public Camera { public: - CameraSpiral(const char *); + CameraSpiral(const char*); virtual ~CameraSpiral(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); s32 _4C; u32 _50; s32 _54; s32 _58; - f32 mWPointY; // 0x5C - f32 mAxisY; // 0x60 - f32 mWPointZ; // 0x64 - f32 mAxisZ; // 0x68 - f32 mWPointX; // 0x6C - f32 mAxisX; // 0x70 + f32 mWPointY; // 0x5C + f32 mAxisY; // 0x60 + f32 mWPointZ; // 0x64 + f32 mAxisZ; // 0x68 + f32 mWPointX; // 0x6C + f32 mAxisX; // 0x70 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraSubjective.hpp b/include/Game/Camera/CameraSubjective.hpp index ce66a0c5c..e31e8549d 100644 --- a/include/Game/Camera/CameraSubjective.hpp +++ b/include/Game/Camera/CameraSubjective.hpp @@ -4,17 +4,17 @@ class CameraSubjective : public Camera { public: - CameraSubjective(const char *); + CameraSubjective(const char*); virtual ~CameraSubjective(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual bool isCollisionOff() const; - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual bool isCollisionOff() const; + virtual CamTranslatorBase* createTranslator(); - f32 _4C; - f32 _50; - f32 _54; - f32 _58; + f32 _4C; + f32 _50; + f32 _54; + f32 _58; TMtx34f _5C; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraTalk.hpp b/include/Game/Camera/CameraTalk.hpp index 0bb903b23..387db9db9 100644 --- a/include/Game/Camera/CameraTalk.hpp +++ b/include/Game/Camera/CameraTalk.hpp @@ -4,14 +4,14 @@ class CameraTalk : public Camera { public: - CameraTalk(const char *); + CameraTalk(const char*); virtual ~CameraTalk(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); - void setParam(const TVec3f &, const TVec3f &, f32, f32); + void setParam(const TVec3f&, const TVec3f&, f32, f32); f32 _4C; f32 _50; @@ -21,6 +21,6 @@ public: f32 _60; f32 _64; f32 _68; - u8 _6C; - u8 _6D[3]; + u8 _6C; + u8 _6D[3]; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraTargetArg.hpp b/include/Game/Camera/CameraTargetArg.hpp index db1d3cb69..3a4bd6292 100644 --- a/include/Game/Camera/CameraTargetArg.hpp +++ b/include/Game/Camera/CameraTargetArg.hpp @@ -11,40 +11,40 @@ class MarioActor; class CameraTargetArg { public: CameraTargetArg(); - CameraTargetArg(const LiveActor *); + CameraTargetArg(const LiveActor*); - CameraTargetArg(CameraTargetMtx *pTargetMtx) NO_INLINE { + CameraTargetArg(CameraTargetMtx* pTargetMtx) NO_INLINE { mTargetObj = nullptr; mTargetMtx = pTargetMtx; mLiveActor = nullptr; mMarioActor = nullptr; } - + inline INLINE_FUNC_DECL_NO_ARG(CameraTargetArg) { mTargetObj = nullptr; mTargetMtx = nullptr; mLiveActor = nullptr; mMarioActor = nullptr; } - - inline INLINE_FUNC_DECL(CameraTargetArg, CameraTargetMtx *pTargetMtx) { + + inline INLINE_FUNC_DECL(CameraTargetArg, CameraTargetMtx* pTargetMtx) { mTargetObj = nullptr; mTargetMtx = pTargetMtx; mLiveActor = nullptr; mMarioActor = nullptr; } - inline CameraTargetArg(CameraTargetObj *pTargetObj, CameraTargetMtx *pMtx, const LiveActor *pActor, MarioActor *pMario) { + inline CameraTargetArg(CameraTargetObj* pTargetObj, CameraTargetMtx* pMtx, const LiveActor* pActor, MarioActor* pMario) { mTargetObj = pTargetObj; mTargetMtx = pMtx; mLiveActor = pActor; mMarioActor = pMario; } - + void setTarget() const; - CameraTargetObj *mTargetObj; // 0x0 - CameraTargetMtx *mTargetMtx; // 0x4 - const LiveActor *mLiveActor; // 0x8 - MarioActor *mMarioActor; // 0xC + CameraTargetObj* mTargetObj; // 0x0 + CameraTargetMtx* mTargetMtx; // 0x4 + const LiveActor* mLiveActor; // 0x8 + MarioActor* mMarioActor; // 0xC }; \ No newline at end of file diff --git a/include/Game/Camera/CameraTargetDemoActor.hpp b/include/Game/Camera/CameraTargetDemoActor.hpp index 332fcbc15..4cd94aae0 100644 --- a/include/Game/Camera/CameraTargetDemoActor.hpp +++ b/include/Game/Camera/CameraTargetDemoActor.hpp @@ -3,7 +3,6 @@ #include "Game/LiveActor/LiveActor.hpp" class CameraTargetDemoActor : public LiveActor { - public: - CameraTargetDemoActor(MtxPtr, const char *); - +public: + CameraTargetDemoActor(MtxPtr, const char*); }; \ No newline at end of file diff --git a/include/Game/Camera/CameraTargetHolder.hpp b/include/Game/Camera/CameraTargetHolder.hpp index e4a660bff..d50013ccd 100644 --- a/include/Game/Camera/CameraTargetHolder.hpp +++ b/include/Game/Camera/CameraTargetHolder.hpp @@ -13,15 +13,15 @@ public: CameraTargetHolder(); virtual ~CameraTargetHolder(); - void movement(); - CameraTargetObj *get(); - void set(CameraTargetObj *); - void set(const LiveActor *); - void set(const MarioActor *); - bool isOnGround() const; - bool isMoving() const; + void movement(); + CameraTargetObj* get(); + void set(CameraTargetObj*); + void set(const LiveActor*); + void set(const MarioActor*); + bool isOnGround() const; + bool isMoving() const; - CameraTargetObj *mTarget; // 0x4 - CameraTargetActor *mTargetActor; // 0x8 - CameraTargetPlayer *mTargetPlayer; // 0xC + CameraTargetObj* mTarget; // 0x4 + CameraTargetActor* mTargetActor; // 0x8 + CameraTargetPlayer* mTargetPlayer; // 0xC }; diff --git a/include/Game/Camera/CameraTargetMtx.hpp b/include/Game/Camera/CameraTargetMtx.hpp index 5f46aa8b6..c7af60b0d 100644 --- a/include/Game/Camera/CameraTargetMtx.hpp +++ b/include/Game/Camera/CameraTargetMtx.hpp @@ -5,25 +5,25 @@ class CameraTargetMtx : public CameraTargetObj { public: - CameraTargetMtx(const char *); + CameraTargetMtx(const char*); virtual ~CameraTargetMtx(); - + virtual void movement(); - virtual const TVec3f *getPosition() const; - virtual const TVec3f *getUpVec() const; - virtual const TVec3f *getFrontVec() const; - virtual const TVec3f *getSideVec() const; - virtual const TVec3f *getLastMove() const; - virtual const TVec3f *getGroundPos() const; - virtual const TVec3f *getGravityVector() const; + virtual const TVec3f* getPosition() const; + virtual const TVec3f* getUpVec() const; + virtual const TVec3f* getFrontVec() const; + virtual const TVec3f* getSideVec() const; + virtual const TVec3f* getLastMove() const; + virtual const TVec3f* getGroundPos() const; + virtual const TVec3f* getGravityVector() const; + + virtual CubeCameraArea* getCubeCameraArea() const; - virtual CubeCameraArea *getCubeCameraArea() const; - void invalidateLastMove(); void setMtx(register MtxPtr mtx) NO_INLINE { - register TMtx34f &dst = mMatrix; + register TMtx34f& dst = mMatrix; __asm { psq_l f0, 0x00(mtx), 0x0, 0 @@ -41,14 +41,14 @@ public: } } - TMtx34f mMatrix; // 0x10 - TVec3f mPosition; // 0x40 - TVec3f mLastMove; // 0x4C - TVec3f mGravityVector; // 0x58 - TVec3f mUp; // 0x64 - TVec3f mFront; // 0x70 - TVec3f mSide; // 0x7C - bool mInvalidLastMove; // 0x88 - u8 _89[3]; - CubeCameraArea *mCameraArea; // 0x8C + TMtx34f mMatrix; // 0x10 + TVec3f mPosition; // 0x40 + TVec3f mLastMove; // 0x4C + TVec3f mGravityVector; // 0x58 + TVec3f mUp; // 0x64 + TVec3f mFront; // 0x70 + TVec3f mSide; // 0x7C + bool mInvalidLastMove; // 0x88 + u8 _89[3]; + CubeCameraArea* mCameraArea; // 0x8C }; \ No newline at end of file diff --git a/include/Game/Camera/CameraTargetObj.hpp b/include/Game/Camera/CameraTargetObj.hpp index 27b0910c3..f0ae16bda 100644 --- a/include/Game/Camera/CameraTargetObj.hpp +++ b/include/Game/Camera/CameraTargetObj.hpp @@ -11,112 +11,111 @@ class Triangle; class CameraTargetObj : public NameObj { public: - CameraTargetObj(const char *); + CameraTargetObj(const char*); virtual inline ~CameraTargetObj() { - } - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - virtual const TVec3f *getPosition() const = 0; - virtual const TVec3f *getUpVec() const = 0; - virtual const TVec3f *getFrontVec() const = 0; - virtual const TVec3f *getSideVec() const = 0; - virtual const TVec3f *getLastMove() const = 0; - virtual const TVec3f *getGroundPos() const = 0; - virtual const TVec3f *getGravityVector() const = 0; + virtual const TVec3f* getPosition() const = 0; + virtual const TVec3f* getUpVec() const = 0; + virtual const TVec3f* getFrontVec() const = 0; + virtual const TVec3f* getSideVec() const = 0; + virtual const TVec3f* getLastMove() const = 0; + virtual const TVec3f* getGroundPos() const = 0; + virtual const TVec3f* getGravityVector() const = 0; - virtual f32 getRadius() const; - virtual bool isTurning() const; - virtual bool isJumping() const; - virtual bool isLongDrop() const; - virtual bool isFastDrop() const; - virtual bool isFastRise() const; - virtual bool isWaterMode() const; - virtual bool isOnWaterSurface() const; - virtual bool isBeeMode() const; - virtual bool isFooFighterMode() const; - virtual u32 getSpecialMode() const; - virtual bool isCameraStateOn(u32) const; - virtual CubeCameraArea *getCubeCameraArea() const; - virtual Triangle *getGroundTriangle() const; - virtual GravityInfo *getGravityInfo() const; - virtual void enableCameraWall(); - virtual void disableCameraWall(); - virtual void setCameraWall(bool); - virtual bool isDebugMode() const; - virtual TMtx34f *getMapBaseMtx() const; - virtual void resetStatus(); + virtual f32 getRadius() const; + virtual bool isTurning() const; + virtual bool isJumping() const; + virtual bool isLongDrop() const; + virtual bool isFastDrop() const; + virtual bool isFastRise() const; + virtual bool isWaterMode() const; + virtual bool isOnWaterSurface() const; + virtual bool isBeeMode() const; + virtual bool isFooFighterMode() const; + virtual u32 getSpecialMode() const; + virtual bool isCameraStateOn(u32) const; + virtual CubeCameraArea* getCubeCameraArea() const; + virtual Triangle* getGroundTriangle() const; + virtual GravityInfo* getGravityInfo() const; + virtual void enableCameraWall(); + virtual void disableCameraWall(); + virtual void setCameraWall(bool); + virtual bool isDebugMode() const; + virtual TMtx34f* getMapBaseMtx() const; + virtual void resetStatus(); - bool mCameraWall; // 0xC - u8 _D[3]; + bool mCameraWall; // 0xC + u8 _D[3]; }; class CameraTargetActor : public CameraTargetObj { public: - CameraTargetActor(const char *); + CameraTargetActor(const char*); virtual ~CameraTargetActor(); virtual void movement(); - virtual const TVec3f *getPosition() const; - virtual const TVec3f *getUpVec() const; - virtual const TVec3f *getFrontVec() const; - virtual const TVec3f *getSideVec() const; - virtual const TVec3f *getLastMove() const; - virtual const TVec3f *getGroundPos() const; - virtual const TVec3f *getGravityVector() const; + virtual const TVec3f* getPosition() const; + virtual const TVec3f* getUpVec() const; + virtual const TVec3f* getFrontVec() const; + virtual const TVec3f* getSideVec() const; + virtual const TVec3f* getLastMove() const; + virtual const TVec3f* getGroundPos() const; + virtual const TVec3f* getGravityVector() const; - virtual f32 getRadius() const; + virtual f32 getRadius() const; virtual CubeCameraArea* getCubeCameraArea() const; - virtual Triangle *getGroundTriangle() const; + virtual Triangle* getGroundTriangle() const; - const LiveActor *mActor; // 0x10 - TVec3f mUp; // 0x14 - TVec3f mFront; // 0x20 - TVec3f mSide; // 0x2C - CubeCameraArea *mCameraArea; // 0x38 + const LiveActor* mActor; // 0x10 + TVec3f mUp; // 0x14 + TVec3f mFront; // 0x20 + TVec3f mSide; // 0x2C + CubeCameraArea* mCameraArea; // 0x38 }; class CameraTargetPlayer : public CameraTargetObj { public: - CameraTargetPlayer(const char *); + CameraTargetPlayer(const char*); virtual ~CameraTargetPlayer(); - virtual const TVec3f *getPosition() const; - virtual const TVec3f *getUpVec() const; - virtual const TVec3f *getFrontVec() const; - virtual const TVec3f *getSideVec() const; - virtual const TVec3f *getLastMove() const; - virtual const TVec3f *getGroundPos() const; - virtual const TVec3f *getGravityVector() const; + virtual const TVec3f* getPosition() const; + virtual const TVec3f* getUpVec() const; + virtual const TVec3f* getFrontVec() const; + virtual const TVec3f* getSideVec() const; + virtual const TVec3f* getLastMove() const; + virtual const TVec3f* getGroundPos() const; + virtual const TVec3f* getGravityVector() const; - virtual bool isTurning() const; - virtual bool isJumping() const; - virtual bool isLongDrop() const; - virtual bool isFastDrop() const; - virtual bool isFastRise() const; - virtual bool isWaterMode() const; - virtual bool isOnWaterSurface() const; - virtual bool isFooFighterMode() const; - virtual u32 getSpecialMode() const; - virtual bool isCameraStateOn(u32) const; - virtual CubeCameraArea *getCubeCameraArea() const; - virtual Triangle *getGroundTriangle() const; - virtual GravityInfo *getGravityInfo() const; - virtual bool isDebugMode() const; - virtual TMtx34f *getMapBaseMtx() const; + virtual bool isTurning() const; + virtual bool isJumping() const; + virtual bool isLongDrop() const; + virtual bool isFastDrop() const; + virtual bool isFastRise() const; + virtual bool isWaterMode() const; + virtual bool isOnWaterSurface() const; + virtual bool isFooFighterMode() const; + virtual u32 getSpecialMode() const; + virtual bool isCameraStateOn(u32) const; + virtual CubeCameraArea* getCubeCameraArea() const; + virtual Triangle* getGroundTriangle() const; + virtual GravityInfo* getGravityInfo() const; + virtual bool isDebugMode() const; + virtual TMtx34f* getMapBaseMtx() const; - const MarioActor *mActor; // 0x10 - TVec3f mSide; // 0x14 - TVec3f mUp; // 0x20 - TVec3f mFront; // 0x2C - TVec3f mGravity; // 0x38 - TVec3f mGroundPos; // 0x44 - CubeCameraArea *mCameraArea; // 0x50 - Triangle *mGroundTriangle; // 0x54 - u16 _58; - bool _5A; - u8 _5B; + const MarioActor* mActor; // 0x10 + TVec3f mSide; // 0x14 + TVec3f mUp; // 0x20 + TVec3f mFront; // 0x2C + TVec3f mGravity; // 0x38 + TVec3f mGroundPos; // 0x44 + CubeCameraArea* mCameraArea; // 0x50 + Triangle* mGroundTriangle; // 0x54 + u16 _58; + bool _5A; + u8 _5B; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraTower.hpp b/include/Game/Camera/CameraTower.hpp index 57ff3faf2..4c0d0f77a 100644 --- a/include/Game/Camera/CameraTower.hpp +++ b/include/Game/Camera/CameraTower.hpp @@ -4,14 +4,14 @@ class CameraTower : public Camera { public: - CameraTower(const char *); + CameraTower(const char*); virtual ~CameraTower(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual bool isEnableToRoundLeft() const; - virtual bool isEnableToRoundRight() const; - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual bool isEnableToRoundLeft() const; + virtual bool isEnableToRoundRight() const; + virtual CamTranslatorBase* createTranslator(); void arrangeRoundingPose(); void arrangeHorizontalPose(); @@ -20,17 +20,17 @@ public: TVec3f mWPoint; // 0x4C TVec3f mAxis; // 0x58 - f32 mAngleB; // 0x64 - f32 mAngleA; // 0x68 - f32 mDist; // 0x6C - f32 _70; - f32 _74; - f32 _78; - u8 _7C; - u8 _7D[3]; - u32 _80; - f32 _84; - u8 _88; - u8 _89; - u8 _8A[2]; + f32 mAngleB; // 0x64 + f32 mAngleA; // 0x68 + f32 mDist; // 0x6C + f32 _70; + f32 _74; + f32 _78; + u8 _7C; + u8 _7D[3]; + u32 _80; + f32 _84; + u8 _88; + u8 _89; + u8 _8A[2]; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraTowerBase.hpp b/include/Game/Camera/CameraTowerBase.hpp index 06c4384e0..01be4ce3f 100644 --- a/include/Game/Camera/CameraTowerBase.hpp +++ b/include/Game/Camera/CameraTowerBase.hpp @@ -4,11 +4,11 @@ class CameraTowerBase : public Camera { public: - CameraTowerBase(const char *); + CameraTowerBase(const char*); virtual ~CameraTowerBase(); - virtual void reset(); - virtual CameraTargetObj *calc(); + virtual void reset(); + virtual CameraTargetObj* calc(); void calcIdealPoseOfTowerBase(); void resetBegin(); diff --git a/include/Game/Camera/CameraTowerPos.hpp b/include/Game/Camera/CameraTowerPos.hpp index 169f78d96..a3e576c5f 100644 --- a/include/Game/Camera/CameraTowerPos.hpp +++ b/include/Game/Camera/CameraTowerPos.hpp @@ -4,25 +4,25 @@ class CameraTowerPos : public CameraTowerBase { public: - CameraTowerPos(const char *); + CameraTowerPos(const char*); virtual ~CameraTowerPos(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual bool isEnableToReset() const; - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual bool isEnableToReset() const; + virtual CamTranslatorBase* createTranslator(); void calcIdealPose(bool); - void arrangeHorizontalPose(const TVec3f &, TVec3f &); - void arrangeWatchPos(TVec3f &, const TVec3f &); + void arrangeHorizontalPose(const TVec3f&, TVec3f&); + void arrangeWatchPos(TVec3f&, const TVec3f&); TVec3f mWPoint; // 0x6C TVec3f mAxis; // 0x78 - f32 mAngleA; // 0x84 - f32 mAngleB; // 0x88 - f32 mUpX; // 0x8C - f32 mUpY; // 0x90 - f32 _94; - f32 _98; - f32 _9C; + f32 mAngleA; // 0x84 + f32 mAngleB; // 0x88 + f32 mUpX; // 0x8C + f32 mUpY; // 0x90 + f32 _94; + f32 _98; + f32 _9C; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraTripodBoss.hpp b/include/Game/Camera/CameraTripodBoss.hpp index daa577e3a..cf2937b9e 100644 --- a/include/Game/Camera/CameraTripodBoss.hpp +++ b/include/Game/Camera/CameraTripodBoss.hpp @@ -4,13 +4,13 @@ class CameraTripodBoss : public CameraTower { public: - CameraTripodBoss(const char *); + CameraTripodBoss(const char*); virtual ~CameraTripodBoss(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); void arrangeRound(); - f32 upZ; // 0x8C + f32 upZ; // 0x8C }; \ No newline at end of file diff --git a/include/Game/Camera/CameraTripodBossJoint.hpp b/include/Game/Camera/CameraTripodBossJoint.hpp index b6409d8bb..11c24259f 100644 --- a/include/Game/Camera/CameraTripodBossJoint.hpp +++ b/include/Game/Camera/CameraTripodBossJoint.hpp @@ -4,25 +4,25 @@ class CameraTripodBossJoint : public Camera { public: - CameraTripodBossJoint(const char *); + CameraTripodBossJoint(const char*); virtual ~CameraTripodBossJoint(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual bool isEnableToReset() const; - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual bool isEnableToReset() const; + virtual CamTranslatorBase* createTranslator(); void calcIdealPose(); - f32 mAngleB; // 0x4C - f32 mAngleA; // 0x50 - f32 mDist; // 0x54 - s32 _58; - f32 mAxisX; // 0x5C - f32 mAxisY; // 0x60 - f32 mAxisZ; // 0x64 + f32 mAngleB; // 0x4C + f32 mAngleA; // 0x50 + f32 mDist; // 0x54 + s32 _58; + f32 mAxisX; // 0x5C + f32 mAxisY; // 0x60 + f32 mAxisZ; // 0x64 bool _68; - u8 _69[3]; - f32 _6C; - f32 _70; + u8 _69[3]; + f32 _6C; + f32 _70; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraTripodPlanet.hpp b/include/Game/Camera/CameraTripodPlanet.hpp index 0aa0cbae4..e7434da0b 100644 --- a/include/Game/Camera/CameraTripodPlanet.hpp +++ b/include/Game/Camera/CameraTripodPlanet.hpp @@ -4,17 +4,17 @@ class CameraTripodPlanet : public Camera { public: - CameraTripodPlanet(const char *); + CameraTripodPlanet(const char*); virtual ~CameraTripodPlanet(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); TVec3f mAxis; // 0x4C TVec3f mWPoint; // 0x58 - f32 mAngleA; // 0x64 - f32 mAngleB; // 0x68 - f32 mDist; // 0x6C - u8 _70[4]; + f32 mAngleA; // 0x64 + f32 mAngleB; // 0x68 + f32 mDist; // 0x6C + u8 _70[4]; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraTrundle.hpp b/include/Game/Camera/CameraTrundle.hpp index 1da6d483c..6c6bff444 100644 --- a/include/Game/Camera/CameraTrundle.hpp +++ b/include/Game/Camera/CameraTrundle.hpp @@ -4,17 +4,17 @@ class CameraTrundle : public Camera { public: - CameraTrundle(const char *); + CameraTrundle(const char*); virtual ~CameraTrundle(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); - TVec3f mWPoint; // 0x4C - TVec3f mAxis; // 0x58 - f32 mDist; // 0x64 - f32 mAngleA; // 0x68 - f32 mAngleB; // 0x6C - f32 mUpX; // 0x70 + TVec3f mWPoint; // 0x4C + TVec3f mAxis; // 0x58 + f32 mDist; // 0x64 + f32 mAngleA; // 0x68 + f32 mAngleB; // 0x6C + f32 mUpX; // 0x70 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraTwistedPassage.hpp b/include/Game/Camera/CameraTwistedPassage.hpp index 8db0546b4..cae57626a 100644 --- a/include/Game/Camera/CameraTwistedPassage.hpp +++ b/include/Game/Camera/CameraTwistedPassage.hpp @@ -4,21 +4,21 @@ class CameraTwistedPassage : public Camera { public: - CameraTwistedPassage(const char *); + CameraTwistedPassage(const char*); virtual ~CameraTwistedPassage(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); void setParam(s32, s32, f32, f32); void initStartPos(); - void calcNearestCoord(const TVec3f &) const; - void calcNearestCoordBetweenTwoRailCoord(f32, f32, const TVec3f &) const; + void calcNearestCoord(const TVec3f&) const; + void calcNearestCoordBetweenTwoRailCoord(f32, f32, const TVec3f&) const; u32 _4C; f32 _50; f32 _54; - u8 _58; - u8 _59[3]; + u8 _58; + u8 _59[3]; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraViewInterpolator.hpp b/include/Game/Camera/CameraViewInterpolator.hpp index 8450c022e..43635f56b 100644 --- a/include/Game/Camera/CameraViewInterpolator.hpp +++ b/include/Game/Camera/CameraViewInterpolator.hpp @@ -8,52 +8,52 @@ class CameraViewInterpolator { public: CameraViewInterpolator(); - void updateCameraMtx(MtxPtr, const TVec3f &, const CameraTargetObj *, f32); + void updateCameraMtx(MtxPtr, const TVec3f&, const CameraTargetObj*, f32); void setInterpolation(u32); bool isInterpolating() const; bool isInterpolatingNearlyEnd() const; void lookAtCenter(); - void calcCollision(const TPos3f &); - void calcBinder(TVec3f *, const TVec3f &, const TVec3f &); + void calcCollision(const TPos3f&); + void calcBinder(TVec3f*, const TVec3f&, const TVec3f&); void reduceOscillation(); - void updateCalcState(const CameraTargetObj *); - void interpolateCameraSwitching(MtxPtr, const TVec3f &, f32); + void updateCalcState(const CameraTargetObj*); + void interpolateCameraSwitching(MtxPtr, const TVec3f&, f32); void checkNearlyEnd(MtxPtr); void translateByRepulsion(); - u32 _0; - u32 _4; - bool _8; - bool _9; - bool _A; - u8 _B; + u32 _0; + u32 _4; + bool _8; + bool _9; + bool _A; + u8 _B; TMtx34f _C; TMtx34f _3C; - f32 _6C; - f32 _70; - f32 _74; - f32 _78; - bool _7C; - bool _7D; - u8 _7E[2]; - f32 _80; - f32 _84; - bool _88; - bool _89; - bool _8A; - u8 _8B; - u32 _8C; - u32 _90; - u32 _94; - f32 _98; - f32 _9C; - f32 _A0; - f32 _A4; - f32 _A8; - f32 _AC; - bool _B0; - u8 _B1[3]; - f32 _B4; - f32 _B8; - f32 _BC; + f32 _6C; + f32 _70; + f32 _74; + f32 _78; + bool _7C; + bool _7D; + u8 _7E[2]; + f32 _80; + f32 _84; + bool _88; + bool _89; + bool _8A; + u8 _8B; + u32 _8C; + u32 _90; + u32 _94; + f32 _98; + f32 _9C; + f32 _A0; + f32 _A4; + f32 _A8; + f32 _AC; + bool _B0; + u8 _B1[3]; + f32 _B4; + f32 _B8; + f32 _BC; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraWaterFollow.hpp b/include/Game/Camera/CameraWaterFollow.hpp index c1fa82623..f416a3668 100644 --- a/include/Game/Camera/CameraWaterFollow.hpp +++ b/include/Game/Camera/CameraWaterFollow.hpp @@ -4,13 +4,13 @@ class CameraWaterFollow : public Camera { public: - CameraWaterFollow(const char *); + CameraWaterFollow(const char*); virtual ~CameraWaterFollow(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual bool isEnableToReset() const; - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual bool isEnableToReset() const; + virtual CamTranslatorBase* createTranslator(); f32 mAxisY; // 0x4C f32 mAxisX; // 0x50 @@ -20,8 +20,8 @@ public: f32 _60; f32 _64; f32 _68; - u8 _6C; - u8 _6D[3]; + u8 _6C; + u8 _6D[3]; u32 _70; f32 _74; f32 _78; diff --git a/include/Game/Camera/CameraWaterPlanet.hpp b/include/Game/Camera/CameraWaterPlanet.hpp index 659e7d0e9..617b374cf 100644 --- a/include/Game/Camera/CameraWaterPlanet.hpp +++ b/include/Game/Camera/CameraWaterPlanet.hpp @@ -4,14 +4,14 @@ class CameraWaterPlanet : public Camera { public: - CameraWaterPlanet(const char *); + CameraWaterPlanet(const char*); virtual ~CameraWaterPlanet(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual CamTranslatorBase* createTranslator(); - f32 mAxisX; // 0x4C - f32 mAxisY; // 0x50 - f32 mAngleA; // 0x54 + f32 mAxisX; // 0x4C + f32 mAxisY; // 0x50 + f32 mAngleA; // 0x54 }; \ No newline at end of file diff --git a/include/Game/Camera/CameraWaterPlanetBoss.hpp b/include/Game/Camera/CameraWaterPlanetBoss.hpp index 66b5e9616..3c129afd2 100644 --- a/include/Game/Camera/CameraWaterPlanetBoss.hpp +++ b/include/Game/Camera/CameraWaterPlanetBoss.hpp @@ -4,35 +4,35 @@ class CameraWaterPlanetBoss : public Camera { public: - CameraWaterPlanetBoss(const char *); + CameraWaterPlanetBoss(const char*); virtual ~CameraWaterPlanetBoss(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual bool isEnableToReset() const; - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual bool isEnableToReset() const; + virtual CamTranslatorBase* createTranslator(); - f32 mAxisY; // 0x4C - f32 mAxisX; // 0x50 - f32 mDist; // 0x54 - f32 _58; - u32 _5C; - f32 _60; - f32 _64; - f32 _68; + f32 mAxisY; // 0x4C + f32 mAxisX; // 0x50 + f32 mDist; // 0x54 + f32 _58; + u32 _5C; + f32 _60; + f32 _64; + f32 _68; bool _6C; - u8 _6D[3]; - f32 mWPointX; // 0x70 - f32 mWPointY; // 0x74 - f32 mWPointZ; // 0x78 - f32 mAxisZ; // 0x7C - f32 mUpY; // 0x80 - f32 mUpX; // 0x84 - f32 mUpZ; // 0x88 + u8 _6D[3]; + f32 mWPointX; // 0x70 + f32 mWPointY; // 0x74 + f32 mWPointZ; // 0x78 + f32 mAxisZ; // 0x7C + f32 mUpY; // 0x80 + f32 mUpX; // 0x84 + f32 mUpZ; // 0x88 bool _8C; - u8 _8D[3]; - u32 _90; - f32 _94; - f32 _98; - f32 _9C; + u8 _8D[3]; + u32 _90; + f32 _94; + f32 _98; + f32 _9C; }; \ No newline at end of file diff --git a/include/Game/Camera/CameraWonderPlanet.hpp b/include/Game/Camera/CameraWonderPlanet.hpp index 18d173a77..c935b13a3 100644 --- a/include/Game/Camera/CameraWonderPlanet.hpp +++ b/include/Game/Camera/CameraWonderPlanet.hpp @@ -4,22 +4,22 @@ class CameraWonderPlanet : public Camera { public: - CameraWonderPlanet(const char *); + CameraWonderPlanet(const char*); virtual ~CameraWonderPlanet(); - virtual void reset(); - virtual CameraTargetObj *calc(); - virtual bool isEnableToReset() const; - virtual CamTranslatorBase *createTranslator(); + virtual void reset(); + virtual CameraTargetObj* calc(); + virtual bool isEnableToReset() const; + virtual CamTranslatorBase* createTranslator(); void updateCameraReset(); void rotateCamera(); void checkReset(); - f32 mAxisX; - f32 mAxisY; - f32 mAngleA; + f32 mAxisX; + f32 mAxisY; + f32 mAngleA; bool _58; - u8 _59[3]; - u32 _5C; + u8 _59[3]; + u32 _5C; }; \ No newline at end of file diff --git a/include/Game/Camera/DotCamParams.hpp b/include/Game/Camera/DotCamParams.hpp index c8d2da097..e2312480d 100644 --- a/include/Game/Camera/DotCamParams.hpp +++ b/include/Game/Camera/DotCamParams.hpp @@ -7,37 +7,36 @@ class DotCamReader { public: inline DotCamReader() { - } - + virtual ~DotCamReader(); - virtual u32 getVersion() const = 0; + virtual u32 getVersion() const = 0; virtual bool hasMoreChunk() const = 0; virtual void nextToChunk() = 0; - virtual bool getValueInt(const char *, s32 *) = 0; - virtual bool getValueFloat(const char *, f32 *) = 0; - virtual bool getValueVec(const char *, TVec3f *) = 0; - virtual bool getValueString(const char *, const char **) = 0; + virtual bool getValueInt(const char*, s32*) = 0; + virtual bool getValueFloat(const char*, f32*) = 0; + virtual bool getValueVec(const char*, TVec3f*) = 0; + virtual bool getValueString(const char*, const char**) = 0; }; class DotCamReaderInBin : public DotCamReader { public: - DotCamReaderInBin(const void *); + DotCamReaderInBin(const void*); virtual ~DotCamReaderInBin(); - virtual u32 getVersion() const; + virtual u32 getVersion() const; virtual bool hasMoreChunk() const; virtual void nextToChunk(); - virtual bool getValueInt(const char *, s32 *); - virtual bool getValueFloat(const char *, f32 *); - virtual bool getValueVec(const char *, TVec3f *); - virtual bool getValueString(const char *, const char **); + virtual bool getValueInt(const char*, s32*); + virtual bool getValueFloat(const char*, f32*); + virtual bool getValueVec(const char*, TVec3f*); + virtual bool getValueString(const char*, const char**); - void init(const void *); + void init(const void*); - u32 mVersion; // 0x4 - u8 *_8; - JMapInfo mMapInfo; // 0xC - JMapInfoIter mMapIter; // 0x14 + u32 mVersion; // 0x4 + u8* _8; + JMapInfo mMapInfo; // 0xC + JMapInfoIter mMapIter; // 0x14 }; \ No newline at end of file diff --git a/include/Game/Camera/GameCameraCreator.hpp b/include/Game/Camera/GameCameraCreator.hpp index a932cd5f2..28cae7f28 100644 --- a/include/Game/Camera/GameCameraCreator.hpp +++ b/include/Game/Camera/GameCameraCreator.hpp @@ -6,16 +6,16 @@ class CameraParamChunkHolder; class GameCameraCreator { public: - GameCameraCreator(CameraParamChunkHolder *); + GameCameraCreator(CameraParamChunkHolder*); - void initCameraCodeCollection(const char *, s32); + void initCameraCodeCollection(const char*, s32); void registerCameraCode(u32); void termCameraCodeCollection(); void scanStartPos(); // TODO - void scanArea(); // TODO + void scanArea(); // TODO - CameraParamChunkHolder *mChunkHolder; // 0x0 - const char *_4; - s32 _8; - u8 mCodes[0x100]; // 0xC + CameraParamChunkHolder* mChunkHolder; // 0x0 + const char* _4; + s32 _8; + u8 mCodes[0x100]; // 0xC }; \ No newline at end of file diff --git a/include/Game/Camera/OnlyCamera.hpp b/include/Game/Camera/OnlyCamera.hpp index cdeab748d..b560b2152 100644 --- a/include/Game/Camera/OnlyCamera.hpp +++ b/include/Game/Camera/OnlyCamera.hpp @@ -8,31 +8,31 @@ class CameraPoseParam; class OnlyCamera : public NameObj { public: - OnlyCamera(const char *); + OnlyCamera(const char*); virtual ~OnlyCamera(); - void calcPose(CameraMan *); + void calcPose(CameraMan*); //calcStartPose(CameraMan *); //calcSafePose(CameraMan *); //moveToIdealPosition(TVec3f *); - CameraPoseParam *mPoseParam; // 0xC - bool _10; - bool _11; - u8 _12[2]; - f32 _14; - f32 _18; - f32 _1C; - f32 _20; - u8 _24[4]; - u32 _28; - bool _2C; - bool _2D; - u8 _2E[2]; - f32 _30; - f32 _34; - f32 _38; - bool _3C; - bool _3D; - u8 _3E[2]; + CameraPoseParam* mPoseParam; // 0xC + bool _10; + bool _11; + u8 _12[2]; + f32 _14; + f32 _18; + f32 _1C; + f32 _20; + u8 _24[4]; + u32 _28; + bool _2C; + bool _2D; + u8 _2E[2]; + f32 _30; + f32 _34; + f32 _38; + bool _3C; + bool _3D; + u8 _3E[2]; }; \ No newline at end of file diff --git a/include/Game/Demo/AstroDemoFunction.hpp b/include/Game/Demo/AstroDemoFunction.hpp index e2941c0c8..a21b57e80 100644 --- a/include/Game/Demo/AstroDemoFunction.hpp +++ b/include/Game/Demo/AstroDemoFunction.hpp @@ -8,16 +8,16 @@ namespace MR { }; namespace AstroDemoFunction { - int getOpenedAstroDomeNum(); + int getOpenedAstroDomeNum(); const char* getGrandStarReturnDemoName(int); - int getActiveGrandStarReturnDemoIndex(); - void tryRegisterDemo(LiveActor*, const char*, const JMapInfoIter&); - void tryRegisterAstroDemoAll(LiveActor*, const JMapInfoIter&); - void tryRegisterGrandStarReturn(LiveActor*, const JMapInfoIter&); - void tryRegisterGrandStarReturnWithFunction(LiveActor*, const JMapInfoIter&, const MR::FunctorBase&); - void tryRegisterGrandStarReturnAndSimpleCast(LiveActor*, const JMapInfoIter&); - void tryRegisterGrandStarReturnWithFunctionAndSimpleCast(LiveActor*, const JMapInfoIter&, const MR::FunctorBase&); - bool tryRegisterSimpleCastIfAstroGalaxy(LiveActor*); - void tryRegisterDemoForTico(LiveActor*, const JMapInfoIter&); - void tryRegisterDemoForLuigiAndKinopio(LiveActor*, const JMapInfoIter&); -}; + int getActiveGrandStarReturnDemoIndex(); + void tryRegisterDemo(LiveActor*, const char*, const JMapInfoIter&); + void tryRegisterAstroDemoAll(LiveActor*, const JMapInfoIter&); + void tryRegisterGrandStarReturn(LiveActor*, const JMapInfoIter&); + void tryRegisterGrandStarReturnWithFunction(LiveActor*, const JMapInfoIter&, const MR::FunctorBase&); + void tryRegisterGrandStarReturnAndSimpleCast(LiveActor*, const JMapInfoIter&); + void tryRegisterGrandStarReturnWithFunctionAndSimpleCast(LiveActor*, const JMapInfoIter&, const MR::FunctorBase&); + bool tryRegisterSimpleCastIfAstroGalaxy(LiveActor*); + void tryRegisterDemoForTico(LiveActor*, const JMapInfoIter&); + void tryRegisterDemoForLuigiAndKinopio(LiveActor*, const JMapInfoIter&); +}; // namespace AstroDemoFunction diff --git a/include/Game/Demo/DemoActionKeeper.hpp b/include/Game/Demo/DemoActionKeeper.hpp index ea71629f7..9a6a45483 100644 --- a/include/Game/Demo/DemoActionKeeper.hpp +++ b/include/Game/Demo/DemoActionKeeper.hpp @@ -11,40 +11,40 @@ class DemoActionInfo { public: DemoActionInfo(); - void registerCast(LiveActor *); - void registerFunctor(const LiveActor *, const MR::FunctorBase &); - void registerNerve(const LiveActor *, const Nerve *); + void registerCast(LiveActor*); + void registerFunctor(const LiveActor*, const MR::FunctorBase&); + void registerNerve(const LiveActor*, const Nerve*); void executeActionFirst() const; void executeActionLast() const; - const char* mPartName; // 0x00 - const char* mCastName; // 0x04 - s32 mCastID; // 0x08 - s32 mActionType; // 0x0C - const char* mPosName; // 0x10 - const char* mAnimName; // 0x14 - u32 _18; - s32 mCastCount; // 0x1C - LiveActor** mCastList; // 0x20 - MR::FunctorBase** mFunctors; // 0x24 - const Nerve** mNerves; // 0x28 + const char* mPartName; // 0x00 + const char* mCastName; // 0x04 + s32 mCastID; // 0x08 + s32 mActionType; // 0x0C + const char* mPosName; // 0x10 + const char* mAnimName; // 0x14 + u32 _18; + s32 mCastCount; // 0x1C + LiveActor** mCastList; // 0x20 + MR::FunctorBase** mFunctors; // 0x24 + const Nerve** mNerves; // 0x28 }; class DemoActionKeeper { public: - DemoActionKeeper(const DemoExecutor *); + DemoActionKeeper(const DemoExecutor*); - void initCast(LiveActor *, const JMapInfoIter &); - void registerFunctor(const LiveActor *, const MR::FunctorBase &, const char *); - void registerNerve(const LiveActor *, const Nerve *, const char *); + void initCast(LiveActor*, const JMapInfoIter&); + void registerFunctor(const LiveActor*, const MR::FunctorBase&, const char*); + void registerNerve(const LiveActor*, const Nerve*, const char*); void update(); - bool isRegisteredDemoActionAppear(const LiveActor *) const; - bool isRegisteredDemoActionFunctor(const LiveActor *) const; - bool isRegisteredDemoActionNerve(const LiveActor *) const; - bool isRegisteredDemoAction(const LiveActor *, s32) const; + bool isRegisteredDemoActionAppear(const LiveActor*) const; + bool isRegisteredDemoActionFunctor(const LiveActor*) const; + bool isRegisteredDemoActionNerve(const LiveActor*) const; + bool isRegisteredDemoAction(const LiveActor*, s32) const; - const DemoExecutor* mDemoExecutor; // 0x00 - s32 mNumInfos; // 0x04 - DemoActionInfo** mInfoArray; // 0x08 + const DemoExecutor* mDemoExecutor; // 0x00 + s32 mNumInfos; // 0x04 + DemoActionInfo** mInfoArray; // 0x08 }; diff --git a/include/Game/Demo/DemoCameraFunction.hpp b/include/Game/Demo/DemoCameraFunction.hpp index dfd47d48d..fd78edd70 100644 --- a/include/Game/Demo/DemoCameraFunction.hpp +++ b/include/Game/Demo/DemoCameraFunction.hpp @@ -8,4 +8,4 @@ namespace DemoCameraFunction { bool isCameraTargetMario(const DemoCameraInfo*); bool setStringNullIfEmpty(const char**); void makeAnimCameraName(char*, u32, const DemoCameraInfo*); -}; +}; // namespace DemoCameraFunction diff --git a/include/Game/Demo/DemoCameraKeeper.hpp b/include/Game/Demo/DemoCameraKeeper.hpp index 4ad01a5c0..631bfca24 100644 --- a/include/Game/Demo/DemoCameraKeeper.hpp +++ b/include/Game/Demo/DemoCameraKeeper.hpp @@ -9,13 +9,13 @@ class DemoCameraInfo { public: DemoCameraInfo(); - u32 _0; - const char* _4; - s32 _8; - const char* _C; - s32 _10; - s32 _14; - const char* _1C; + u32 _0; + const char* _4; + s32 _8; + const char* _C; + s32 _10; + s32 _14; + const char* _1C; ActorCameraInfo* _20; - LiveActor* _24; + LiveActor* _24; }; diff --git a/include/Game/Demo/DemoCastGroup.hpp b/include/Game/Demo/DemoCastGroup.hpp index ef0dfb0d4..1fee342b4 100644 --- a/include/Game/Demo/DemoCastGroup.hpp +++ b/include/Game/Demo/DemoCastGroup.hpp @@ -8,15 +8,15 @@ class LiveActor; class DemoCastGroup : public NameObj { public: - DemoCastGroup(const char *); + DemoCastGroup(const char*); virtual ~DemoCastGroup() {} - virtual void init(const JMapInfoIter &); - virtual bool tryRegisterDemoActor(LiveActor *, const JMapInfoIter &, const JMapIdInfo &); - virtual bool tryRegisterDemoActor(LiveActor *, const char *, const JMapInfoIter &); - virtual void registerDemoActor(LiveActor *, const JMapInfoIter &); + virtual void init(const JMapInfoIter&); + virtual bool tryRegisterDemoActor(LiveActor*, const JMapInfoIter&, const JMapIdInfo&); + virtual bool tryRegisterDemoActor(LiveActor*, const char*, const JMapInfoIter&); + virtual void registerDemoActor(LiveActor*, const JMapInfoIter&); - JMapIdInfo* mInfo; // 0xC + JMapIdInfo* mInfo; // 0xC LiveActorGroup* mGroup; // 0x10 }; diff --git a/include/Game/Demo/DemoCastGroupHolder.hpp b/include/Game/Demo/DemoCastGroupHolder.hpp index ceb384dfc..6b2b270b6 100644 --- a/include/Game/Demo/DemoCastGroupHolder.hpp +++ b/include/Game/Demo/DemoCastGroupHolder.hpp @@ -10,8 +10,8 @@ public: virtual ~DemoCastGroupHolder(); - bool tryRegisterDemoActor(LiveActor *, const JMapInfoIter &, const JMapIdInfo &) const; - bool tryRegisterDemoActor(LiveActor *, const char *, const JMapInfoIter &) const; + bool tryRegisterDemoActor(LiveActor*, const JMapInfoIter&, const JMapIdInfo&) const; + bool tryRegisterDemoActor(LiveActor*, const char*, const JMapInfoIter&) const; DemoCastGroup* getCastGroup(int) const; - DemoCastGroup* findCastGroup(const char *) const; + DemoCastGroup* findCastGroup(const char*) const; }; \ No newline at end of file diff --git a/include/Game/Demo/DemoCastSubGroup.hpp b/include/Game/Demo/DemoCastSubGroup.hpp index 4d6f8e9cc..ded0ae2c5 100644 --- a/include/Game/Demo/DemoCastSubGroup.hpp +++ b/include/Game/Demo/DemoCastSubGroup.hpp @@ -5,11 +5,11 @@ class DemoCastSubGroup : DemoCastGroup { public: - DemoCastSubGroup(const char *); + DemoCastSubGroup(const char*); virtual ~DemoCastSubGroup(); - virtual void init(const JMapInfoIter &); - virtual bool tryRegisterDemoActor(LiveActor *, const JMapInfoIter &, const JMapIdInfo &); + virtual void init(const JMapInfoIter&); + virtual bool tryRegisterDemoActor(LiveActor*, const JMapInfoIter&, const JMapIdInfo&); - DemoExecutor* mExecutor; // 0x14 + DemoExecutor* mExecutor; // 0x14 }; diff --git a/include/Game/Demo/DemoCtrlBase.hpp b/include/Game/Demo/DemoCtrlBase.hpp index 1145b6e05..d492e5c7b 100644 --- a/include/Game/Demo/DemoCtrlBase.hpp +++ b/include/Game/Demo/DemoCtrlBase.hpp @@ -7,18 +7,18 @@ class LiveActor; class DemoCtrlBase { public: - DemoCtrlBase(LiveActor *, const char *); + DemoCtrlBase(LiveActor*, const char*); - void init(const JMapInfoIter &); + void init(const JMapInfoIter&); void end(); void update(); bool isDone() const; bool isExistEndFrame() const; bool tryStart(); - LiveActor* mActor; // 0x0 - ActorCameraInfo* mCameraInfo; // 0x04 - const char* mDemoName; // 0x08 - s32 mCurrentFrame; // 0x0C - bool _10; + LiveActor* mActor; // 0x0 + ActorCameraInfo* mCameraInfo; // 0x04 + const char* mDemoName; // 0x08 + s32 mCurrentFrame; // 0x0C + bool _10; }; diff --git a/include/Game/Demo/DemoDirector.hpp b/include/Game/Demo/DemoDirector.hpp index 52c84d7cd..8c41d6f83 100644 --- a/include/Game/Demo/DemoDirector.hpp +++ b/include/Game/Demo/DemoDirector.hpp @@ -12,33 +12,33 @@ class DemoStartRequestHolder; class DemoDirector : public NameObj { public: - DemoDirector(const char *); + DemoDirector(const char*); virtual ~DemoDirector(); virtual void movement(); - bool registerDemoCast (LiveActor *, const JMapInfoIter &); - bool registerDemoCast (LiveActor *, const char *, const JMapInfoIter &); - void registerDemoSimpleCast(LiveActor *); - void registerDemoSimpleCast(LayoutActor *); - void registerDemoSimpleCast(NameObj *); + bool registerDemoCast(LiveActor*, const JMapInfoIter&); + bool registerDemoCast(LiveActor*, const char*, const JMapInfoIter&); + void registerDemoSimpleCast(LiveActor*); + void registerDemoSimpleCast(LayoutActor*); + void registerDemoSimpleCast(NameObj*); - void endDemo(NameObj *, const char *, bool); + void endDemo(NameObj*, const char*, bool); - bool isExistTimeKeepDemo(const char *) const; + bool isExistTimeKeepDemo(const char*) const; char* getCurrentDemoName() const; - bool mIsActive; // 0xC - DemoExecutor* mExecutor; // 0x10 - u8 _14; - DemoCastGroupHolder* _18; - DemoCastGroupHolder* _1C; - DemoSimpleCastHolder* _20; - ResourceHolder* mResourceHolder; // 0x24 - DemoStartRequestHolder* mStartReqHolder; // 0x28 - NameObj* _2C; - const char* _30; - s32 _34; - bool _38; + bool mIsActive; // 0xC + DemoExecutor* mExecutor; // 0x10 + u8 _14; + DemoCastGroupHolder* _18; + DemoCastGroupHolder* _1C; + DemoSimpleCastHolder* _20; + ResourceHolder* mResourceHolder; // 0x24 + DemoStartRequestHolder* mStartReqHolder; // 0x28 + NameObj* _2C; + const char* _30; + s32 _34; + bool _38; }; diff --git a/include/Game/Demo/DemoExecutor.hpp b/include/Game/Demo/DemoExecutor.hpp index 52aa832ae..d0063e81e 100644 --- a/include/Game/Demo/DemoExecutor.hpp +++ b/include/Game/Demo/DemoExecutor.hpp @@ -10,23 +10,23 @@ class DemoSubPartKeeper; class DemoExecutor : public DemoCastGroup { public: - DemoExecutor(const char *); + DemoExecutor(const char*); bool tryStartProperDemoSystem(); - bool tryStartDemoSystemPart(const char *, s32); - bool tryStartProperDemoSystemPart(const char *); + bool tryStartDemoSystemPart(const char*, s32); + bool tryStartProperDemoSystemPart(const char*); void pause(); void resume(); - void addTalkAnimCtrl(DemoTalkAnimCtrl *); - void addTalkMessageCtrl(LiveActor *, TalkMessageCtrl *); - void findTalkMessageCtrl(const LiveActor *) const; - void setTalkMessageCtrl(const LiveActor *, TalkMessageCtrl *); + void addTalkAnimCtrl(DemoTalkAnimCtrl*); + void addTalkMessageCtrl(LiveActor*, TalkMessageCtrl*); + void findTalkMessageCtrl(const LiveActor*) const; + void setTalkMessageCtrl(const LiveActor*, TalkMessageCtrl*); - inline s32 getSubPartStep(const char *pName) { - DemoSubPartInfo *subpart; - DemoSubPartKeeper *subpartkeeper = mSubPartKeeper; + inline s32 getSubPartStep(const char* pName) { + DemoSubPartInfo* subpart; + DemoSubPartKeeper* subpartkeeper = mSubPartKeeper; for (int i = 0; i < subpartkeeper->mNumSubPartInfos; i++) { subpart = &subpartkeeper->mSubPartInfos[i]; if (MR::isEqualString(pName, subpart->mMainPartName) && MR::isEqualSubString(subpart->mSubPartName, "会話アニメループ")) { @@ -36,10 +36,10 @@ public: return 0; } - const char *mSheetName; // 0x14 - DemoTimeKeeper *mTimeKeeper; // 0x18 - DemoSubPartKeeper *mSubPartKeeper; // 0x1C - void *_20; - void *_24; - DemoActionKeeper *mActionKeeper; // 0x28 + const char* mSheetName; // 0x14 + DemoTimeKeeper* mTimeKeeper; // 0x18 + DemoSubPartKeeper* mSubPartKeeper; // 0x1C + void* _20; + void* _24; + DemoActionKeeper* mActionKeeper; // 0x28 }; diff --git a/include/Game/Demo/DemoExecutorFunction.hpp b/include/Game/Demo/DemoExecutorFunction.hpp index b4956e847..b5a5b3a88 100644 --- a/include/Game/Demo/DemoExecutorFunction.hpp +++ b/include/Game/Demo/DemoExecutorFunction.hpp @@ -6,25 +6,25 @@ class LiveActor; class TalkMessageCtrl; namespace DemoExecutorFunction { - void registerDemoActionFunction(const DemoExecutor *, const LiveActor *, const MR::FunctorBase &, const char *); - void registerDemoActionNerve(const DemoExecutor *, const LiveActor *, const Nerve *, const char *); + void registerDemoActionFunction(const DemoExecutor*, const LiveActor*, const MR::FunctorBase&, const char*); + void registerDemoActionNerve(const DemoExecutor*, const LiveActor*, const Nerve*, const char*); - bool isExistDemoPart(const DemoExecutor *, const char *); - bool isExistDemoPartMain(const DemoExecutor *, const char *); - bool isExistDemoPartSub(const DemoExecutor *, const char *); + bool isExistDemoPart(const DemoExecutor*, const char*); + bool isExistDemoPartMain(const DemoExecutor*, const char*); + bool isExistDemoPartSub(const DemoExecutor*, const char*); - bool isRegisteredDemoCast(const DemoExecutor *, const LiveActor *); - bool isRegisteredDemoActionAppear(const DemoExecutor *, const LiveActor *); - bool isRegisteredDemoActionFunctor(const DemoExecutor *, const LiveActor *); - bool isRegisteredDemoActionNerve(const DemoExecutor *, const LiveActor *); + bool isRegisteredDemoCast(const DemoExecutor*, const LiveActor*); + bool isRegisteredDemoActionAppear(const DemoExecutor*, const LiveActor*); + bool isRegisteredDemoActionFunctor(const DemoExecutor*, const LiveActor*); + bool isRegisteredDemoActionNerve(const DemoExecutor*, const LiveActor*); - bool tryCreateDemoTalkAnimCtrlForActor(DemoExecutor *, LiveActor *, const char *, const char *); - bool tryCreateDemoTalkAnimCtrlForScene(DemoExecutor *, LiveActor *, const JMapInfoIter &, const char *, const char *, s32, s32); + bool tryCreateDemoTalkAnimCtrlForActor(DemoExecutor*, LiveActor*, const char*, const char*); + bool tryCreateDemoTalkAnimCtrlForScene(DemoExecutor*, LiveActor*, const JMapInfoIter&, const char*, const char*, s32, s32); - void registerDemoTalkMessageCtrl(DemoExecutor *, LiveActor *, TalkMessageCtrl *); - void setDemoTalkMessageCtrl(DemoExecutor *, const LiveActor *, TalkMessageCtrl *); + void registerDemoTalkMessageCtrl(DemoExecutor*, LiveActor*, TalkMessageCtrl*); + void setDemoTalkMessageCtrl(DemoExecutor*, const LiveActor*, TalkMessageCtrl*); - void pauseTimeKeepDemo(DemoExecutor *); - void resumeTimeKeepDemo(DemoExecutor *); - bool isPauseTimeKeepDemo(const DemoExecutor *); -}; + void pauseTimeKeepDemo(DemoExecutor*); + void resumeTimeKeepDemo(DemoExecutor*); + bool isPauseTimeKeepDemo(const DemoExecutor*); +}; // namespace DemoExecutorFunction diff --git a/include/Game/Demo/DemoFunction.hpp b/include/Game/Demo/DemoFunction.hpp index 4f36ef63e..0dd159f34 100644 --- a/include/Game/Demo/DemoFunction.hpp +++ b/include/Game/Demo/DemoFunction.hpp @@ -9,65 +9,65 @@ class DemoCastGroupHolder; class DemoExecutor; namespace DemoFunction { - DemoDirector* getDemoDirector(); + DemoDirector* getDemoDirector(); DemoCastGroupHolder* getDemoCastSubGroupHolder(); - void registerDemoSimpleCastAllFunction(LiveActor *); - void registerDemoSimpleCastAllFunction(LayoutActor *); - void registerDemoSimpleCastAllFunction(NameObj *); - void registerDemoActionFunctorFunction(const LiveActor *, const MR::FunctorBase &, const char *); - void registerDemoActionFunctorFunction(const LiveActor *, const MR::FunctorBase &, const char *, const char *); - void registerDemoActionNerveFunction(const LiveActor *, const Nerve *, const char *); + void registerDemoSimpleCastAllFunction(LiveActor*); + void registerDemoSimpleCastAllFunction(LayoutActor*); + void registerDemoSimpleCastAllFunction(NameObj*); + void registerDemoActionFunctorFunction(const LiveActor*, const MR::FunctorBase&, const char*); + void registerDemoActionFunctorFunction(const LiveActor*, const MR::FunctorBase&, const char*, const char*); + void registerDemoActionNerveFunction(const LiveActor*, const Nerve*, const char*); - bool tryCreateDemoTalkAnimCtrlForActor(LiveActor *, const char *, const char *); - bool tryCreateDemoTalkAnimCtrlForActorDirect(LiveActor *, const char *, const char *, const char *); + bool tryCreateDemoTalkAnimCtrlForActor(LiveActor*, const char*, const char*); + bool tryCreateDemoTalkAnimCtrlForActorDirect(LiveActor*, const char*, const char*, const char*); - bool tryCreateDemoTalkAnimCtrlForScene(LiveActor *, const JMapInfoIter &, const char *, const char *, s32, s32); + bool tryCreateDemoTalkAnimCtrlForScene(LiveActor*, const JMapInfoIter&, const char*, const char*, s32, s32); - bool tryStartDemoRegistered(LiveActor *, const char *); - bool tryStartDemoRegisteredMarioPuppetable(LiveActor *, const char *); + bool tryStartDemoRegistered(LiveActor*, const char*); + bool tryStartDemoRegisteredMarioPuppetable(LiveActor*, const char*); - void registerDemoExecutor(DemoExecutor *); - DemoExecutor* findDemoExecutor(const char *); - DemoExecutor* findDemoExecutor(const LiveActor *); - DemoExecutor* findDemoExecutorActive(const LiveActor *); + void registerDemoExecutor(DemoExecutor*); + DemoExecutor* findDemoExecutor(const char*); + DemoExecutor* findDemoExecutor(const LiveActor*); + DemoExecutor* findDemoExecutorActive(const LiveActor*); - bool isDemoCast(const DemoExecutor *, const LiveActor *); - bool isExistDemoPart(const DemoExecutor *, const char *); + bool isDemoCast(const DemoExecutor*, const LiveActor*); + bool isExistDemoPart(const DemoExecutor*, const char*); - bool isDemoPartActiveFunction(const char *); - s32 getDemoPartStepFunction(const char *); - s32 getDemoPartTotalStepFunction(const char *); - bool isDemoLastPartLastStep(); - bool isDemoSuspendOrLastPartLastStep(); - const char *getCurrentDemoPartNameMain(const char *); + bool isDemoPartActiveFunction(const char*); + s32 getDemoPartStepFunction(const char*); + s32 getDemoPartTotalStepFunction(const char*); + bool isDemoLastPartLastStep(); + bool isDemoSuspendOrLastPartLastStep(); + const char* getCurrentDemoPartNameMain(const char*); - bool isTargetDemoCast(LiveActor *, const JMapInfoIter &, const char *, s32); + bool isTargetDemoCast(LiveActor*, const JMapInfoIter&, const char*, s32); - bool isRegisteredDemoActionAppear(const LiveActor *); - bool isRegisteredDemoActionFunctor(const LiveActor *); - bool isRegisteredDemoActionFunctor(const LiveActor *, const char *); - bool isRegisteredDemoActionNerve(const LiveActor *); + bool isRegisteredDemoActionAppear(const LiveActor*); + bool isRegisteredDemoActionFunctor(const LiveActor*); + bool isRegisteredDemoActionFunctor(const LiveActor*, const char*); + bool isRegisteredDemoActionNerve(const LiveActor*); - void requestDemoCastMovementOn(LiveActor *); - bool isRegisteredDemoCast(const LiveActor *, const char *); + void requestDemoCastMovementOn(LiveActor*); + bool isRegisteredDemoCast(const LiveActor*, const char*); - void pauseTimeKeepDemo(LiveActor *); - void resumeTimeKeepDemo(LiveActor *); - bool isPauseTimeKeepDemo(LiveActor *); + void pauseTimeKeepDemo(LiveActor*); + void resumeTimeKeepDemo(LiveActor*); + bool isPauseTimeKeepDemo(LiveActor*); - void pauseTimeKeepDemo(const char *); - void resumeTimeKeepDemo(const char *); - bool isPauseTimeKeepDemo(const char *); + void pauseTimeKeepDemo(const char*); + void resumeTimeKeepDemo(const char*); + bool isPauseTimeKeepDemo(const char*); - bool tryCreateDemoTalkAnimCtrlForSceneDirect(LiveActor *, const char *, const JMapInfoIter &, const char *, const char *, s32, s32); - void registerDemoTalkMessageCtrl(LiveActor *, TalkMessageCtrl *); - void registerDemoTalkMessageCtrlDirect(LiveActor *, TalkMessageCtrl *, const char *); - void setDemoTalkMessageCtrlDirect(const LiveActor *, TalkMessageCtrl *, const char *); + bool tryCreateDemoTalkAnimCtrlForSceneDirect(LiveActor*, const char*, const JMapInfoIter&, const char*, const char*, s32, s32); + void registerDemoTalkMessageCtrl(LiveActor*, TalkMessageCtrl*); + void registerDemoTalkMessageCtrlDirect(LiveActor*, TalkMessageCtrl*, const char*); + void setDemoTalkMessageCtrlDirect(const LiveActor*, TalkMessageCtrl*, const char*); ResourceHolder* loadDemoArchive(); - s32 createSheetParser(const DemoExecutor *, const char *, JMapInfo **); + s32 createSheetParser(const DemoExecutor*, const char*, JMapInfo**); - bool isDemoPartTalk(const char *); -}; + bool isDemoPartTalk(const char*); +}; // namespace DemoFunction diff --git a/include/Game/Demo/DemoPadRumbler.hpp b/include/Game/Demo/DemoPadRumbler.hpp index 305a0664b..04a83f51d 100644 --- a/include/Game/Demo/DemoPadRumbler.hpp +++ b/include/Game/Demo/DemoPadRumbler.hpp @@ -4,16 +4,16 @@ class PadRumbleInfo { public: - s32 mStartFrame; // 0x0 - const char *mName; // 0x4 + s32 mStartFrame; // 0x0 + const char* mName; // 0x4 }; class DemoPadRumbler { public: - DemoPadRumbler(const char *); + DemoPadRumbler(const char*); void update(s32); - s32 mNumPadRumbleEntries; // 0x0 + s32 mNumPadRumbleEntries; // 0x0 PadRumbleInfo* mPadRumbleEntries; // 0x4 - s32 _8; + s32 _8; }; diff --git a/include/Game/Demo/DemoParamCommonDataTable.hpp b/include/Game/Demo/DemoParamCommonDataTable.hpp index dc3eb02a8..ecc10a1f2 100644 --- a/include/Game/Demo/DemoParamCommonDataTable.hpp +++ b/include/Game/Demo/DemoParamCommonDataTable.hpp @@ -4,11 +4,11 @@ namespace MR { namespace Demo { - f32 getCameraShakeIntensity(const char *); - f32 getCameraShakeSpeed(const char *); - const char* getPadRumble(const char *); - bool isExistCameraShaking(const char *); - bool isExistPadRumble(const char *); - const char* getStartEffect(const char *); - }; -}; + f32 getCameraShakeIntensity(const char*); + f32 getCameraShakeSpeed(const char*); + const char* getPadRumble(const char*); + bool isExistCameraShaking(const char*); + bool isExistPadRumble(const char*); + const char* getStartEffect(const char*); + }; // namespace Demo +}; // namespace MR diff --git a/include/Game/Demo/DemoPlayerKeeper.hpp b/include/Game/Demo/DemoPlayerKeeper.hpp index 4ec4365c6..e159326bb 100644 --- a/include/Game/Demo/DemoPlayerKeeper.hpp +++ b/include/Game/Demo/DemoPlayerKeeper.hpp @@ -6,19 +6,19 @@ class DemoPlayerInfo { public: DemoPlayerInfo(); - const char *mPartName; // 0x0 - const char *mPosName; // 0x4 - const char *mBckName; // 0x8 + const char* mPartName; // 0x0 + const char* mPosName; // 0x4 + const char* mBckName; // 0x8 }; class DemoPlayerKeeper { public: - DemoPlayerKeeper(const DemoExecutor *); + DemoPlayerKeeper(const DemoExecutor*); void update(); bool isExistPosName() const; - void executePlayer(const DemoPlayerInfo *) const; + void executePlayer(const DemoPlayerInfo*) const; - const DemoExecutor *mExecutor; // 0x0 - s32 mNumPlayerInfos; // 0x4 - DemoPlayerInfo *mPlayerInfos; // 0x8 + const DemoExecutor* mExecutor; // 0x0 + s32 mNumPlayerInfos; // 0x4 + DemoPlayerInfo* mPlayerInfos; // 0x8 }; diff --git a/include/Game/Demo/DemoPositionController.hpp b/include/Game/Demo/DemoPositionController.hpp index d9a322f39..47aa92c2d 100644 --- a/include/Game/Demo/DemoPositionController.hpp +++ b/include/Game/Demo/DemoPositionController.hpp @@ -4,14 +4,14 @@ class DemoPositionController : LiveActor { public: - DemoPositionController(const char *, const JMapInfoIter &); + DemoPositionController(const char*, const JMapInfoIter&); virtual ~DemoPositionController(); virtual void control(); - void initAnimCamera(const char *); - void startDemo(const char *); - void endDemo(const char *); + void initAnimCamera(const char*); + void startDemo(const char*); + void endDemo(const char*); - ActorCameraInfo* pCameraInfo; // 0x8C + ActorCameraInfo* pCameraInfo; // 0x8C }; diff --git a/include/Game/Demo/DemoSimpleCastHolder.hpp b/include/Game/Demo/DemoSimpleCastHolder.hpp index 90a395e02..802785d50 100644 --- a/include/Game/Demo/DemoSimpleCastHolder.hpp +++ b/include/Game/Demo/DemoSimpleCastHolder.hpp @@ -10,13 +10,13 @@ class DemoSimpleCastHolder { public: DemoSimpleCastHolder(s32, s32, s32); - void registerActor(LiveActor *); - void registerActor(LayoutActor *); - void registerNameObj(NameObj *); + void registerActor(LiveActor*); + void registerActor(LayoutActor*); + void registerNameObj(NameObj*); void movementOnAllCasts(); private: - MR::Vector > mLiveActors; // 0x0 - MR::Vector > mLayoutActors; // 0xC - MR::Vector > mNameObjs; // 0x18 + MR::Vector> mLiveActors; // 0x0 + MR::Vector> mLayoutActors; // 0xC + MR::Vector> mNameObjs; // 0x18 }; diff --git a/include/Game/Demo/DemoStartRequestHolder.hpp b/include/Game/Demo/DemoStartRequestHolder.hpp index ef0cea665..2bb5337fb 100644 --- a/include/Game/Demo/DemoStartRequestHolder.hpp +++ b/include/Game/Demo/DemoStartRequestHolder.hpp @@ -27,12 +27,12 @@ class DemoStartRequestHolder { public: DemoStartRequestHolder(); - DemoStartInfo* mStartInfos[0x10]; // 0x0 - u32 _40; - const DemoStartInfo* _44; - u8 _48[0x84-0x48]; + DemoStartInfo* mStartInfos[0x10]; // 0x0 + u32 _40; + const DemoStartInfo* _44; + u8 _48[0x84 - 0x48]; MR::FixedRingBuffer::iterator _84; MR::FixedRingBuffer::iterator _94; - u32 _9C; - NameObj* _A0; + u32 _9C; + NameObj* _A0; }; \ No newline at end of file diff --git a/include/Game/Demo/DemoSubPartKeeper.hpp b/include/Game/Demo/DemoSubPartKeeper.hpp index 7a9a088a7..ae1e1ccc4 100644 --- a/include/Game/Demo/DemoSubPartKeeper.hpp +++ b/include/Game/Demo/DemoSubPartKeeper.hpp @@ -8,25 +8,25 @@ class DemoSubPartInfo { public: DemoSubPartInfo(); - const char *mSubPartName; // 0x0 - s32 mSubPartTotalStep; // 0x4 - const char *mMainPartName; // 0x8 - s32 mMainPartStep; // 0xC - s32 _10; + const char* mSubPartName; // 0x0 + s32 mSubPartTotalStep; // 0x4 + const char* mMainPartName; // 0x8 + s32 mMainPartStep; // 0xC + s32 _10; }; class DemoSubPartKeeper { public: - DemoSubPartKeeper(const DemoExecutor *); + DemoSubPartKeeper(const DemoExecutor*); - void update(); - void end(); - bool isDemoPartActive(const char *) const; - s32 getDemoPartStep(const char *) const; - s32 getDemoPartTotalStep(const char *) const; - DemoSubPartInfo* findSubPart(const char *) const; + void update(); + void end(); + bool isDemoPartActive(const char*) const; + s32 getDemoPartStep(const char*) const; + s32 getDemoPartTotalStep(const char*) const; + DemoSubPartInfo* findSubPart(const char*) const; - const DemoExecutor *mExecutor; // 0x0 - s32 mNumSubPartInfos; // 0x4 - DemoSubPartInfo *mSubPartInfos; // 0x8 + const DemoExecutor* mExecutor; // 0x0 + s32 mNumSubPartInfos; // 0x4 + DemoSubPartInfo* mSubPartInfos; // 0x8 }; diff --git a/include/Game/Demo/DemoTalkAnimCtrl.hpp b/include/Game/Demo/DemoTalkAnimCtrl.hpp index 34e41a468..edc254d82 100644 --- a/include/Game/Demo/DemoTalkAnimCtrl.hpp +++ b/include/Game/Demo/DemoTalkAnimCtrl.hpp @@ -7,46 +7,46 @@ class DemoTalkAnimCtrl : NerveExecutor { public: - DemoTalkAnimCtrl(LiveActor *, const char *, const char *); + DemoTalkAnimCtrl(LiveActor*, const char*, const char*); virtual ~DemoTalkAnimCtrl(); - void initForScene(const char *, const char *, const JMapInfoIter &); + void initForScene(const char*, const char*, const JMapInfoIter&); void updateCamera(); - void createBckCtrlData(BckCtrlData *, s32) const; - void initForActor(const char *); + void createBckCtrlData(BckCtrlData*, s32) const; + void initForActor(const char*); void startDemo(); bool updateDemo(); void startAnim(); void startCamera(); - void updateAnim(const BckCtrlData &); + void updateAnim(const BckCtrlData&); void updatePause(); void endCamera(); - void setupStartDemoPart(const char *); + void setupStartDemoPart(const char*); - LiveActor *mActor; // 0x8 - const char *_C; - const char *_10; - const char *_14; - const char *_18; - const char *_1C; - ActorCameraInfo *mCameraInfo; // 0x20 - s32 _24; - s32 _28; - s32 _2C; - s32 _30; - bool _34; - bool _35; - bool _36; - s32 _38; - s32 _3C; - s32 _40; - s32 _44; - bool _48; - bool mHaveCamera; - bool _4A; - bool mHaveBtk; // 0x4B - bool mHaveBpk; // 0x4C - bool mHaveBtp; // 0x4D - bool mHaveBrk; // 0x4E - bool mHaveBva; // 0x4F + LiveActor* mActor; // 0x8 + const char* _C; + const char* _10; + const char* _14; + const char* _18; + const char* _1C; + ActorCameraInfo* mCameraInfo; // 0x20 + s32 _24; + s32 _28; + s32 _2C; + s32 _30; + bool _34; + bool _35; + bool _36; + s32 _38; + s32 _3C; + s32 _40; + s32 _44; + bool _48; + bool mHaveCamera; + bool _4A; + bool mHaveBtk; // 0x4B + bool mHaveBpk; // 0x4C + bool mHaveBtp; // 0x4D + bool mHaveBrk; // 0x4E + bool mHaveBva; // 0x4F }; diff --git a/include/Game/Demo/DemoTimeKeeper.hpp b/include/Game/Demo/DemoTimeKeeper.hpp index badc02ab7..1063bc0ae 100644 --- a/include/Game/Demo/DemoTimeKeeper.hpp +++ b/include/Game/Demo/DemoTimeKeeper.hpp @@ -4,24 +4,24 @@ class DemoTimePartInfo { public: - const char *mName; // _0 - s32 mTotalSteps; // _4 - u8 _8; + const char* mName; // _0 + s32 mTotalSteps; // _4 + u8 _8; }; class DemoTimeKeeper { public: bool isExistSuspendFlagCurrentPart() const; bool isPartLast() const; - void setCurrentPart(const char *); + void setCurrentPart(const char*); bool isCurrentDemoPartLastStep() const; - u32 _0; - DemoTimePartInfo *mMainPartInfos; // _4 - DemoTimePartInfo *mSubPartInfos; // _8 - s32 mNumPartInfos; - u32 _10; - s32 mCurrentStep; // _14 - s32 _18; - bool mIsPaused; // _1C + u32 _0; + DemoTimePartInfo* mMainPartInfos; // _4 + DemoTimePartInfo* mSubPartInfos; // _8 + s32 mNumPartInfos; + u32 _10; + s32 mCurrentStep; // _14 + s32 _18; + bool mIsPaused; // _1C }; diff --git a/include/Game/Demo/PrologueDirector.hpp b/include/Game/Demo/PrologueDirector.hpp index 0fd8d47bf..b0fa627ad 100644 --- a/include/Game/Demo/PrologueDirector.hpp +++ b/include/Game/Demo/PrologueDirector.hpp @@ -38,12 +38,12 @@ public: private: /* 0x8C */ ProloguePictureBook* mPictureBook; - /* 0x90 */ PrologueLetter* mLetter; - /* 0x94 */ ModelObj* mScenery; - /* 0x98 */ ModelObj* mMarioPosDummyModel; - /* 0x9C */ CameraTargetMtx* mCameraTarget; - /* 0xA0 */ TMtx34f _A0; - /* 0xD0 */ bool _D0; + /* 0x90 */ PrologueLetter* mLetter; + /* 0x94 */ ModelObj* mScenery; + /* 0x98 */ ModelObj* mMarioPosDummyModel; + /* 0x9C */ CameraTargetMtx* mCameraTarget; + /* 0xA0 */ TMtx34f _A0; + /* 0xD0 */ bool _D0; }; class PrologueHolder : public NameObj { @@ -61,5 +61,5 @@ private: namespace MR { PrologueHolder* getPrologueHolder(); - void startPrologue(); -}; + void startPrologue(); +}; // namespace MR diff --git a/include/Game/Effect/AstroEffectObj.hpp b/include/Game/Effect/AstroEffectObj.hpp index cd678c1d6..b9f5329e9 100644 --- a/include/Game/Effect/AstroEffectObj.hpp +++ b/include/Game/Effect/AstroEffectObj.hpp @@ -5,9 +5,9 @@ class AstroEffectObj : public SimpleEffectObj { public: AstroEffectObj(const char*); - + virtual ~AstroEffectObj(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); virtual void setStateMove(); diff --git a/include/Game/Effect/EffectSystem.hpp b/include/Game/Effect/EffectSystem.hpp index 904009d77..7fbde0982 100644 --- a/include/Game/Effect/EffectSystem.hpp +++ b/include/Game/Effect/EffectSystem.hpp @@ -20,17 +20,17 @@ public: virtual void init(const JMapInfoIter& rIter); ParticleEmitter* createEmitter(u16, u8, u8); - void forceDeleteEmitter(ParticleEmitter*) const; - void forceDeleteSingleEmitter(SingleEmitter*) const; - void createSingleEmitter(SingleEmitter*, MultiEmitterCallBackBase*, MultiEmitterParticleCallBack*); - void entry(ParticleResourceHolder*, u32, u32); + void forceDeleteEmitter(ParticleEmitter*) const; + void forceDeleteSingleEmitter(SingleEmitter*) const; + void createSingleEmitter(SingleEmitter*, MultiEmitterCallBackBase*, MultiEmitterParticleCallBack*); + void entry(ParticleResourceHolder*, u32, u32); - /* 0x0C */ JPAEmitterManager* mEmitterManager; + /* 0x0C */ JPAEmitterManager* mEmitterManager; /* 0x10 */ ParticleEmitterHolder* mEmitterHolder; - /* 0x14 */ ParticleDrawExecutor* mDrawExec; - /* 0x18 */ ParticleCalcExecutor* mCalcExec; + /* 0x14 */ ParticleDrawExecutor* mDrawExec; + /* 0x18 */ ParticleCalcExecutor* mCalcExec; /* 0x1C */ AutoEffectGroupHolder* mGroupHolder; - /* 0x20 */ bool _20; + /* 0x20 */ bool _20; }; namespace MR { diff --git a/include/Game/Effect/EffectSystemUtil.hpp b/include/Game/Effect/EffectSystemUtil.hpp index 94804349a..523347845 100644 --- a/include/Game/Effect/EffectSystemUtil.hpp +++ b/include/Game/Effect/EffectSystemUtil.hpp @@ -21,36 +21,36 @@ class SingleEmitter; namespace MR { namespace Effect { - void requestMovementOnAllEmitters(); - void requestMovementOffAllLoopEmitters(); - void checkEffectSceneUpdate(const EffectSystem*); - void movementEffectNormal(const EffectSystem*); - void drawEffect3D(const EffectSystem*, const TPos3f&); - void drawEffect2D(const EffectSystem*); - void forceDeleteAllEmitters(const EffectSystem*); - bool isExistInResource(u16*, const char*); - bool isEffect2D(const MultiEmitter*); - void initEffectSyncBck(EffectKeeper*, const ModelManager*, const char*, const char*, s32, float, float, bool); - void addEffectSyncBck(MultiEmitter*, const ModelManager*, const char*); - int getAutoEffectNum(const char*); - JMapInfo* getAutoEffectListBinary(); - void setupMultiEmitter(EffectKeeper*, const ModelManager*, const AutoEffectInfo*); - void setupMultiEmitterSyncBck(EffectKeeper*, const ModelManager*, const AutoEffectInfo*); - void registerAutoEffectInfoGroup(EffectKeeper*, const LiveActor*, const char*); - void requestMovementOn(EffectKeeper*); - void registerAutoEffectInfoGroup(PaneEffectKeeper*, const LayoutActor*, const char*); - void registerAutoEffectInfoGroup(PaneEffectKeeper*, const EffectSystem*, const LayoutActor*, const char*); - void addAutoEffect(EffectKeeper*, const LiveActor*, const AutoEffectInfo*); - void addAutoEffect(PaneEffectKeeper*, const LayoutActor*, const AutoEffectInfo*); - void addAutoEffect(MultiSceneEffectKeeper*, const MultiSceneActor*, const AutoEffectInfo*); - void registerAutoEffectInfoGroup(MultiSceneEffectKeeper*, const EffectSystem*, const MultiSceneActor*, const char*); - void deleteParticleEmitter(ParticleEmitter*); - void setLinkSingleEmitter(ParticleEmitter*, SingleEmitter*); - SingleEmitter* getLinkSingleEmitter(const JPABaseEmitter*); - void forceDeleteAllOneTimeEmitter(); - void createParticleEmitter(ParticleEmitter*, JPAEmitterManager*, const TVec3f&, u16, u8, u8); - bool isExistInResource(u16*, const char*, s32); - const char* getEffectAttributeName(s32); + void requestMovementOnAllEmitters(); + void requestMovementOffAllLoopEmitters(); + void checkEffectSceneUpdate(const EffectSystem*); + void movementEffectNormal(const EffectSystem*); + void drawEffect3D(const EffectSystem*, const TPos3f&); + void drawEffect2D(const EffectSystem*); + void forceDeleteAllEmitters(const EffectSystem*); + bool isExistInResource(u16*, const char*); + bool isEffect2D(const MultiEmitter*); + void initEffectSyncBck(EffectKeeper*, const ModelManager*, const char*, const char*, s32, float, float, bool); + void addEffectSyncBck(MultiEmitter*, const ModelManager*, const char*); + int getAutoEffectNum(const char*); + JMapInfo* getAutoEffectListBinary(); + void setupMultiEmitter(EffectKeeper*, const ModelManager*, const AutoEffectInfo*); + void setupMultiEmitterSyncBck(EffectKeeper*, const ModelManager*, const AutoEffectInfo*); + void registerAutoEffectInfoGroup(EffectKeeper*, const LiveActor*, const char*); + void requestMovementOn(EffectKeeper*); + void registerAutoEffectInfoGroup(PaneEffectKeeper*, const LayoutActor*, const char*); + void registerAutoEffectInfoGroup(PaneEffectKeeper*, const EffectSystem*, const LayoutActor*, const char*); + void addAutoEffect(EffectKeeper*, const LiveActor*, const AutoEffectInfo*); + void addAutoEffect(PaneEffectKeeper*, const LayoutActor*, const AutoEffectInfo*); + void addAutoEffect(MultiSceneEffectKeeper*, const MultiSceneActor*, const AutoEffectInfo*); + void registerAutoEffectInfoGroup(MultiSceneEffectKeeper*, const EffectSystem*, const MultiSceneActor*, const char*); + void deleteParticleEmitter(ParticleEmitter*); + void setLinkSingleEmitter(ParticleEmitter*, SingleEmitter*); + SingleEmitter* getLinkSingleEmitter(const JPABaseEmitter*); + void forceDeleteAllOneTimeEmitter(); + void createParticleEmitter(ParticleEmitter*, JPAEmitterManager*, const TVec3f&, u16, u8, u8); + bool isExistInResource(u16*, const char*, s32); + const char* getEffectAttributeName(s32); AutoEffectInfo* createAutoEffect(const char*, const char*); - }; -}; + }; // namespace Effect +}; // namespace MR diff --git a/include/Game/Effect/MultiEmitter.hpp b/include/Game/Effect/MultiEmitter.hpp index 1ecd3bf31..0a3946e53 100644 --- a/include/Game/Effect/MultiEmitter.hpp +++ b/include/Game/Effect/MultiEmitter.hpp @@ -9,25 +9,25 @@ class JPAParticleCallBack; class MultiEmitter { public: - void forceDelete(EffectSystem *); - void create(EffectSystem *); + void forceDelete(EffectSystem*); + void create(EffectSystem*); void setHostMtx(MtxPtr); - void setHostSRT(const TVec3f *, const TVec3f *, const TVec3f *); + void setHostSRT(const TVec3f*, const TVec3f*, const TVec3f*); void setGlobalSRTMatrix(const MtxPtr, s32); void setBaseScale(f32); - void setLocalScale(const TVec3f &, s32); - void setGlobalScale(const TVec3f &, s32); + void setLocalScale(const TVec3f&, s32); + void setGlobalScale(const TVec3f&, s32); void setGlobalPrmColor(u8, u8, u8, s32); void setGlobalEnvColor(u8, u8, u8, s32); - void setGlobalTranslation(const TVec3f &, s32); + void setGlobalTranslation(const TVec3f&, s32); - void createEmitterWithCallBack(MultiEmitterCallBackBase *); + void createEmitterWithCallBack(MultiEmitterCallBackBase*); - void setParticleCallBackPtr(JPAParticleCallBack *, s32); + void setParticleCallBackPtr(JPAParticleCallBack*, s32); bool isValid() const; diff --git a/include/Game/Effect/ParticleEmitter.hpp b/include/Game/Effect/ParticleEmitter.hpp index 7afb4755e..901be36ef 100644 --- a/include/Game/Effect/ParticleEmitter.hpp +++ b/include/Game/Effect/ParticleEmitter.hpp @@ -22,6 +22,6 @@ public: void setGlobalEnvColor(u8, u8, u8); /* 0x0 */ JPABaseEmitter* mEmitter; - /* 0x4 */ bool mPaused; - /* 0x5 */ bool mStopped; // Not sure if it is stopped, but good chance it is. + /* 0x4 */ bool mPaused; + /* 0x5 */ bool mStopped; // Not sure if it is stopped, but good chance it is. }; diff --git a/include/Game/Effect/ParticleEmitterHolder.hpp b/include/Game/Effect/ParticleEmitterHolder.hpp index 7ff47aad2..6e17ffe58 100644 --- a/include/Game/Effect/ParticleEmitterHolder.hpp +++ b/include/Game/Effect/ParticleEmitterHolder.hpp @@ -7,9 +7,9 @@ class EffectSystem; class ParticleEmitterHolder { public: - ParticleEmitterHolder(EffectSystem const *, int); + ParticleEmitterHolder(EffectSystem const*, int); - EffectSystem const* mEffectSystem; // 0x0 - MR::AssignableArray mEmitters; // 0x4 - int mNumEmitters; // 0x8 + EffectSystem const* mEffectSystem; // 0x0 + MR::AssignableArray mEmitters; // 0x4 + int mNumEmitters; // 0x8 }; \ No newline at end of file diff --git a/include/Game/Effect/ParticleResourceHolder.hpp b/include/Game/Effect/ParticleResourceHolder.hpp index 2c74ee4d2..cc7a171c7 100644 --- a/include/Game/Effect/ParticleResourceHolder.hpp +++ b/include/Game/Effect/ParticleResourceHolder.hpp @@ -8,23 +8,22 @@ class ResTIMG; class ParticleResourceHolder { public: - struct Particle { const char* mGroupName; // 0x0 - int mCount; // 0x4 + int mCount; // 0x4 }; - ParticleResourceHolder(const char *); + ParticleResourceHolder(const char*); - void countAutoEffectNum(); - void swapTexture(const ResTIMG *, const char *); - bool isExistInResource(const char *, u16 *) const; + void countAutoEffectNum(); + void swapTexture(const ResTIMG*, const char*); + bool isExistInResource(const char*, u16*) const; JMapInfo* getAutoEffectListBinary() const; - int getAutoEffectNum(const char *) const; + int getAutoEffectNum(const char*) const; - JPAResourceManager* mResourceMgr; // 0x0 - JMapInfo* mAutoEffectList; // 0x4 - JMapInfo* mParticleNames; // 0x8 - Particle mParticles[512]; // 0xC - int mNumParticles; // 0x100C + JPAResourceManager* mResourceMgr; // 0x0 + JMapInfo* mAutoEffectList; // 0x4 + JMapInfo* mParticleNames; // 0x8 + Particle mParticles[512]; // 0xC + int mNumParticles; // 0x100C }; \ No newline at end of file diff --git a/include/Game/Effect/SimpleEffectObj.hpp b/include/Game/Effect/SimpleEffectObj.hpp index ba3513137..ec817e463 100644 --- a/include/Game/Effect/SimpleEffectObj.hpp +++ b/include/Game/Effect/SimpleEffectObj.hpp @@ -8,11 +8,11 @@ class SimpleEffectObj : public LiveActor { public: SimpleEffectObj(const char*); - virtual ~SimpleEffectObj() { }; - virtual void init(const JMapInfoIter &); + virtual ~SimpleEffectObj(){}; + virtual void init(const JMapInfoIter&); virtual void startClipped(); virtual void endClipped(); - + virtual f32 getClippingRadius() const { return 500.0f; }; @@ -23,7 +23,7 @@ public: virtual TVec3f* getClippingCenterOffset() const { TVec3f vec; - vec.set(0.0f,0.0f,0.0f); + vec.set(0.0f, 0.0f, 0.0f); return &vec; }; @@ -39,14 +39,14 @@ public: void exeMove(); const char* _8C; - TVec3f _90; + TVec3f _90; }; typedef struct { const char* _0; const char* _4; const char* _8; - s32 _C; + s32 _C; const char* _10; - s32 _14; + s32 _14; } s_effectDataTable; diff --git a/include/Game/Effect/SingleEmitter.hpp b/include/Game/Effect/SingleEmitter.hpp index 9332e55e8..7c00bec38 100644 --- a/include/Game/Effect/SingleEmitter.hpp +++ b/include/Game/Effect/SingleEmitter.hpp @@ -16,14 +16,14 @@ public: void init(u16); void deleteEmitter(); - void scanParticleEmitter(EffectSystem *); + void scanParticleEmitter(EffectSystem*); bool isOneTime() const; bool isValid() const; - void link(ParticleEmitter *); + void link(ParticleEmitter*); void unlink(); - ParticleEmitter* mEmitter; // 0x0 - u16 _4; // 0x4 - u8 mGroupId; // 0x6 - s8 mSpawn; // 0x7 + ParticleEmitter* mEmitter; // 0x0 + u16 _4; // 0x4 + u8 mGroupId; // 0x6 + s8 mSpawn; // 0x7 }; \ No newline at end of file diff --git a/include/Game/Enemy/AnimScaleController.hpp b/include/Game/Enemy/AnimScaleController.hpp index ddeddba72..dd1d67ec2 100644 --- a/include/Game/Enemy/AnimScaleController.hpp +++ b/include/Game/Enemy/AnimScaleController.hpp @@ -24,7 +24,7 @@ public: class AnimScaleController : public NerveExecutor { public: - AnimScaleController(AnimScaleParam *); + AnimScaleController(AnimScaleParam*); virtual ~AnimScaleController(); @@ -35,11 +35,11 @@ public: void setParamTight(); void startHitReaction(); void startDpdHitVibration(); - bool isHitReaction(s32) const; + bool isHitReaction(s32) const; void stopAndReset(); AnimScaleParam* _8; - TVec3f _C; - f32 _18; + TVec3f _C; + f32 _18; }; diff --git a/include/Game/Enemy/AnimStampController.hpp b/include/Game/Enemy/AnimStampController.hpp index d4ee9c03f..085c65d13 100644 --- a/include/Game/Enemy/AnimStampController.hpp +++ b/include/Game/Enemy/AnimStampController.hpp @@ -10,7 +10,7 @@ public: virtual ~AnimStampController(); void init(s32, f32, f32, f32, f32, f32, f32); - void startAnim(const TVec3f &); + void startAnim(const TVec3f&); void exeAnim(); bool isAnimEnd() const; diff --git a/include/Game/Enemy/BallBeamer.hpp b/include/Game/Enemy/BallBeamer.hpp index 872d4ed36..beaac3452 100644 --- a/include/Game/Enemy/BallBeamer.hpp +++ b/include/Game/Enemy/BallBeamer.hpp @@ -7,27 +7,26 @@ class RingBeam; class BallBeamer : public LiveActor { public: - BallBeamer(const char *); - - virtual void init(const JMapInfoIter &); - virtual void attackSensor(HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver); + BallBeamer(const char*); - static void makeArchiveList(NameObjArchiveListCollector *, const JMapInfoIter &); - void syncSwitchOnA(); - void syncSwitchOffA(); - void syncSwitchOnB(); - void setupAttack(); - bool tryAttack(); - void exeWait(); - void exeAttack(); - void exeInter(); + virtual void init(const JMapInfoIter&); + virtual void attackSensor(HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); + + static void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&); + void syncSwitchOnA(); + void syncSwitchOffA(); + void syncSwitchOnB(); + void setupAttack(); + bool tryAttack(); + void exeWait(); + void exeAttack(); + void exeInter(); RingBeam** mBeams; - bool _90; + bool _90; // needed to get _98 at correct offset - u8 _94[4]; // unused? + u8 _94[4]; // unused? TMtx34f _98; - }; diff --git a/include/Game/Enemy/BasaBasa.hpp b/include/Game/Enemy/BasaBasa.hpp index 2652d0bb7..accb83c1c 100644 --- a/include/Game/Enemy/BasaBasa.hpp +++ b/include/Game/Enemy/BasaBasa.hpp @@ -8,19 +8,19 @@ class BasaBasa : public LiveActor { public: - BasaBasa(const char *); + BasaBasa(const char*); virtual ~BasaBasa(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void kill(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPush(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPush(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeWait(); void exeAirWait(); @@ -51,21 +51,21 @@ public: bool isNearTarget(f32) const; bool isNrvEnableStun() const; - ModelObj* mHangModel; // 0x8C - AnimScaleController* mScaleController; // 0x90 - AnimStampController* mStampController; // 0x94 - SpinHitController* mSpinHitController; // 0x98 - TVec3f _9C; - f32 _A8; - f32 _AC; - u32 _B0; - const TVec3f* _B4; - f32 _B8; - TVec3f _BC; - bool mIsIceModel; // 0xC8 - TVec3f _CC; - TVec3f _D8; - f32 _E4; - s32 _E8; - u8 _EC; + ModelObj* mHangModel; // 0x8C + AnimScaleController* mScaleController; // 0x90 + AnimStampController* mStampController; // 0x94 + SpinHitController* mSpinHitController; // 0x98 + TVec3f _9C; + f32 _A8; + f32 _AC; + u32 _B0; + const TVec3f* _B4; + f32 _B8; + TVec3f _BC; + bool mIsIceModel; // 0xC8 + TVec3f _CC; + TVec3f _D8; + f32 _E4; + s32 _E8; + u8 _EC; }; diff --git a/include/Game/Enemy/Birikyu.hpp b/include/Game/Enemy/Birikyu.hpp index 7e69ac8d1..cf00f3db1 100644 --- a/include/Game/Enemy/Birikyu.hpp +++ b/include/Game/Enemy/Birikyu.hpp @@ -4,21 +4,21 @@ class Birikyu : public LiveActor { public: - Birikyu(const char *); + Birikyu(const char*); - virtual void init(const JMapInfoIter &); - virtual void initAfterPlacement(); - virtual void appear(); - virtual void startClipped(); - virtual void endClipped(); - virtual void attackSensor(HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver); - virtual f32 getHitRadius() const; - virtual char *getCenterJointName() const; + virtual void init(const JMapInfoIter&); + virtual void initAfterPlacement(); + virtual void appear(); + virtual void startClipped(); + virtual void endClipped(); + virtual void attackSensor(HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); + virtual f32 getHitRadius() const; + virtual char* getCenterJointName() const; - void initFromJmpArgs(const JMapInfoIter &); - void initRail(const JMapInfoIter &); + void initFromJmpArgs(const JMapInfoIter&); + void initRail(const JMapInfoIter&); void initCollision(); void initShadow(); bool tryStopPointing(); @@ -30,25 +30,25 @@ public: void exeAttackWait(); void exeStopPointing(); - const char* _8C; - TVec3f _90; - TVec3f _9C; - bool _A8; - bool _A9; - TVec3f _AC; - TVec3f _B8; - f32 _C4; - f32 _C8; -}; + const char* _8C; + TVec3f _90; + TVec3f _9C; + bool _A8; + bool _A9; + TVec3f _AC; + TVec3f _B8; + f32 _C4; + f32 _C8; +}; class BirikyuWithFace : public Birikyu { public: - BirikyuWithFace(const char *); + BirikyuWithFace(const char*); - virtual void init(const JMapInfoIter &); - virtual void calcAndSetBaseMtx(); - virtual f32 getHitRadius() const; - virtual char *getCenterJointName() const; + virtual void init(const JMapInfoIter&); + virtual void calcAndSetBaseMtx(); + virtual f32 getHitRadius() const; + virtual char* getCenterJointName() const; bool _CC; }; diff --git a/include/Game/Enemy/BombTeresa.hpp b/include/Game/Enemy/BombTeresa.hpp index d3ef2fc09..49884d766 100644 --- a/include/Game/Enemy/BombTeresa.hpp +++ b/include/Game/Enemy/BombTeresa.hpp @@ -12,7 +12,7 @@ class BombTeresa : public LiveActor { public: - BombTeresa(const char *); + BombTeresa(const char*); virtual ~BombTeresa(); virtual void init(const JMapInfoIter&); @@ -20,12 +20,12 @@ public: virtual void makeActorAppeared(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPush(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); - + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPush(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); + void initTongue(); void initSensor(); void initFromJMapParam(const JMapInfoIter&); @@ -55,8 +55,8 @@ public: bool tryRevival(); bool requestDrift(); bool requestDisperse(); - bool appearNormal(const TVec3f &, const TVec3f &); - bool appearShadow(const TVec3f &, const TVec3f &); + bool appearNormal(const TVec3f&, const TVec3f&); + bool appearShadow(const TVec3f&, const TVec3f&); bool rootTongueMtxCallBack(TPos3f*, const JointControllerInfo&); bool endTongueMtxCallBack(TPos3f*, const JointControllerInfo&); void updateNormalVelocity(); @@ -77,26 +77,25 @@ public: mScale.y *= scale; mScale.z *= scale; } - + inline bool isOutOfRange(f32 dist) { return !MR::isNearPlayer(this, dist); } /*0x8C*/ JointControlDelegator* mJointDelegator; /*0x90*/ JointControlDelegator* mJointDelegator2; - /*0x94*/ AnimScaleController* mScaleController; - /*0x98*/ WalkerStateBindStarPointer* mBindStarPointer; - TQuat4f _9C; - TVec3f _AC; - TVec3f _B8; - TVec3f _C4; - TVec3f _D0; - f32 _DC; - f32 _E0; - f32 _E4; - s32 _E8; - bool _EC; - /*0xED*/ bool mDisableRespawning; - bool _EE; - bool _EF; - + /*0x94*/ AnimScaleController* mScaleController; + /*0x98*/ WalkerStateBindStarPointer* mBindStarPointer; + TQuat4f _9C; + TVec3f _AC; + TVec3f _B8; + TVec3f _C4; + TVec3f _D0; + f32 _DC; + f32 _E0; + f32 _E4; + s32 _E8; + bool _EC; + /*0xED*/ bool mDisableRespawning; + bool _EE; + bool _EF; }; diff --git a/include/Game/Enemy/Dossun.hpp b/include/Game/Enemy/Dossun.hpp index e7b6222c8..0e2cc5a29 100644 --- a/include/Game/Enemy/Dossun.hpp +++ b/include/Game/Enemy/Dossun.hpp @@ -5,15 +5,15 @@ class Dossun : public LiveActor { public: - Dossun(const char *); + Dossun(const char*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); - void initMapToolInfo(const JMapInfoIter &); + void initMapToolInfo(const JMapInfoIter&); void initShadow(); void calcParameters(); - s32 getUpperFrame() const; + s32 getUpperFrame() const; void exeReady(); void exeUpper(); void exeFallSign(); @@ -23,10 +23,10 @@ public: TVec3f _8C; TVec3f _98; - s32 mFallingTime; // 0xA4 - s32 mHoldTime; // 0xA8 - f32 mMovementDist; // 0xAC - s32 mRisenWaitTime; // 0xB0 - s32 mShadowType; // 0xB4 - bool mHasShadow; // 0xB8 + s32 mFallingTime; // 0xA4 + s32 mHoldTime; // 0xA8 + f32 mMovementDist; // 0xAC + s32 mRisenWaitTime; // 0xB0 + s32 mShadowType; // 0xB4 + bool mHasShadow; // 0xB8 }; diff --git a/include/Game/Enemy/ElectricPressureBullet.hpp b/include/Game/Enemy/ElectricPressureBullet.hpp index 8bf47d0ac..59c7da69d 100644 --- a/include/Game/Enemy/ElectricPressureBullet.hpp +++ b/include/Game/Enemy/ElectricPressureBullet.hpp @@ -7,17 +7,17 @@ class ElectricPressureBullet : public LiveActor { public: - ElectricPressureBullet(const char *); + ElectricPressureBullet(const char*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); virtual void control(); - virtual void attackSensor(HitSensor *,HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); - void shotElectricBullet(LiveActor *, const TPos3f &, const f32 &); + void shotElectricBullet(LiveActor*, const TPos3f&, const f32&); void exeFly(); - TVec3f _8C; + TVec3f _8C; LiveActor* _98; - f32 _9C; + f32 _9C; }; diff --git a/include/Game/Enemy/EyeBeamer.hpp b/include/Game/Enemy/EyeBeamer.hpp index 45aab6afa..efbe1954f 100644 --- a/include/Game/Enemy/EyeBeamer.hpp +++ b/include/Game/Enemy/EyeBeamer.hpp @@ -4,14 +4,13 @@ #include "JSystem/JGeometry/TMatrix.hpp" #include "Game/LiveActor/ModelObj.hpp" - class VolumeModelDrawer; class ModelObj; class MapPartsRailMover; class EyeBeamer : public LiveActor { public: - EyeBeamer(const char *); + EyeBeamer(const char*); virtual ~EyeBeamer(); virtual void init(const JMapInfoIter& rIter); @@ -40,26 +39,25 @@ public: bool isInBeamRange(const TVec3f& rVec) const; bool isOnBeam() const; - MapPartsRailMover* mRailMover; // 0x8C - ModelObj* mBeamBloom; // 0x90 - ModelObj* mBeamMdl; // 0x94 - VolumeModelDrawer* mBeamVolumeDrawer; // 0x98 - TMtx34f _9C; - TQuat4f _CC; - TQuat4f _DC; - TVec3f _EC; - TVec3f _F8; - TVec3f _104; - TPos3f mWaterSurfaceMtx; // 0x110 - TVec3f _140; - u32 _14C; - u32 _150; - u32 _154; - u32 _158; - f32 _15C; - f32 _160; - bool mIsInMercatorCube; // 0x164 - + MapPartsRailMover* mRailMover; // 0x8C + ModelObj* mBeamBloom; // 0x90 + ModelObj* mBeamMdl; // 0x94 + VolumeModelDrawer* mBeamVolumeDrawer; // 0x98 + TMtx34f _9C; + TQuat4f _CC; + TQuat4f _DC; + TVec3f _EC; + TVec3f _F8; + TVec3f _104; + TPos3f mWaterSurfaceMtx; // 0x110 + TVec3f _140; + u32 _14C; + u32 _150; + u32 _154; + u32 _158; + f32 _15C; + f32 _160; + bool mIsInMercatorCube; // 0x164 }; namespace NrvEyeBeamer { NERVE_DECL_NULL(EyeBeamerNrvDemoStartWait); @@ -70,4 +68,4 @@ namespace NrvEyeBeamer { NERVE_DECL_EXE(EyeBeamerNrvTurn, EyeBeamer, Turn); NERVE_DECL_EXE(EyeBeamerNrvGotoPatrol, EyeBeamer, GotoPatrol); NERVE_DECL_EXE(EyeBeamerNrvPatrol, EyeBeamer, Patrol); -}; +}; // namespace NrvEyeBeamer diff --git a/include/Game/Enemy/FireBall.hpp b/include/Game/Enemy/FireBall.hpp index 15d8e4933..316268a07 100644 --- a/include/Game/Enemy/FireBall.hpp +++ b/include/Game/Enemy/FireBall.hpp @@ -7,23 +7,23 @@ class FireBall : public LiveActor { public: FireBall(const char*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void kill(); virtual void control(); virtual void calcAndSetBaseMtx(); virtual void attackSensor(HitSensor*, HitSensor*); virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); - - void appearAndThrow(const TVec3f &, f32, f32); + + void appearAndThrow(const TVec3f&, f32, f32); HitSensor* isBindedAny() const; - void setVelocityToPlayer(f32); - void calcReflectVelocity(); - bool tryToKill(); + void setVelocityToPlayer(f32); + void calcReflectVelocity(); + bool tryToKill(); void exeThrow(); void exeReflect(); LiveActor* _8C; - TVec3f _90; + TVec3f _90; }; diff --git a/include/Game/Enemy/HomingKiller.hpp b/include/Game/Enemy/HomingKiller.hpp index 47208a6cf..d8fa214dd 100644 --- a/include/Game/Enemy/HomingKiller.hpp +++ b/include/Game/Enemy/HomingKiller.hpp @@ -5,42 +5,42 @@ class HomingKiller : public LiveActor { public: - HomingKiller(const char *); + HomingKiller(const char*); virtual ~HomingKiller(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void appear(const TVec3f &, const TVec3f &); + void appear(const TVec3f&, const TVec3f&); bool isMoveStart() const; - s32 _8C; - f32 mChaseStartDist; // 0x90 - f32 mChaseEndDist; // 0x94 - u32 _98; - u32 _9C; - TVec3f _A0; - TVec3f _AC; - TVec3f _B8; - TVec3f _C4; - TVec3f _D0; - TMtx34f _DC; - TVec3f _110; - u32 _118; - u32 _11C; - u32 _120; - u32 _124; - TMtx34f _128; - HitSensor* _158; - u8 _15C; - u8 _15D; - u8 _15E; - PartsModel* mPropeller; // 0x160 - ModelObj* mTorpedoLight; // 0x164 + s32 _8C; + f32 mChaseStartDist; // 0x90 + f32 mChaseEndDist; // 0x94 + u32 _98; + u32 _9C; + TVec3f _A0; + TVec3f _AC; + TVec3f _B8; + TVec3f _C4; + TVec3f _D0; + TMtx34f _DC; + TVec3f _110; + u32 _118; + u32 _11C; + u32 _120; + u32 _124; + TMtx34f _128; + HitSensor* _158; + u8 _15C; + u8 _15D; + u8 _15E; + PartsModel* mPropeller; // 0x160 + ModelObj* mTorpedoLight; // 0x164 }; diff --git a/include/Game/Enemy/IceMerameraKing.hpp b/include/Game/Enemy/IceMerameraKing.hpp index 6723234a5..bb4277606 100644 --- a/include/Game/Enemy/IceMerameraKing.hpp +++ b/include/Game/Enemy/IceMerameraKing.hpp @@ -4,7 +4,8 @@ #include "Game/LiveActor/LiveActor.hpp" class CameraTargetDemoActor; -template class JointControlDelegator; +template +class JointControlDelegator; class JointControllerInfo; class Meramera; class SpinPullParticleCallBack; @@ -12,66 +13,66 @@ class ThrowingIce; class IceMerameraKing : public LiveActor { public: - IceMerameraKing(const char *); + IceMerameraKing(const char*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void kill(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void exeSearch(); - void exeThrow(); - void endThrow(); - void tearDownThrow(); - void exeExtinguish(); - void exeEscape(); - void endEscape(); - void exeEscapeJump(); - void exeDamage(); - void exePreRecover(); - void exeRecover(); - void exePreAttack(); - void exeAttack(); - void exeAttackAfter(); - void exeAngryDemo(); - void exeDeathDemoWait(); - void exeDeathDemo(); - void addVelocityToInitPos(); - bool isDeadAllIce(); - bool isEnableThrow(); + void exeSearch(); + void exeThrow(); + void endThrow(); + void tearDownThrow(); + void exeExtinguish(); + void exeEscape(); + void endEscape(); + void exeEscapeJump(); + void exeDamage(); + void exePreRecover(); + void exeRecover(); + void exePreAttack(); + void exeAttack(); + void exeAttackAfter(); + void exeAngryDemo(); + void exeDeathDemoWait(); + void exeDeathDemo(); + void addVelocityToInitPos(); + bool isDeadAllIce(); + bool isEnableThrow(); ThrowingIce* getDeadWeaponAndAppear(); - bool calcJoint(TPos3f *, const JointControllerInfo &); + bool calcJoint(TPos3f*, const JointControllerInfo&); - FixedPosition* mFixedPos; //_8C - ThrowingIce* _90; - Meramera* _94; - SpinPullParticleCallBack* mSpinParticle; //_98 - ThrowingIce** mActor; //_9C - s32 _A0; - s32 _A4; - LiveActor* _A8; - LiveActor* _AC; - TVec3f _B0; - TVec3f _BC; - TVec3f _C8; - TVec3f _D4; - s32 _E0; - s32 _E4; - u32 _E8; - s32 _EC; - s32 _F0; - MR::Vector > mModelArray; //_F4 - TQuat4f _100; - TVec3f _110; - f32 _11C; - bool _120; - bool _121; - CameraTargetDemoActor* _F8; - JointControlDelegator* mJointController; //_FC + FixedPosition* mFixedPos; //_8C + ThrowingIce* _90; + Meramera* _94; + SpinPullParticleCallBack* mSpinParticle; //_98 + ThrowingIce** mActor; //_9C + s32 _A0; + s32 _A4; + LiveActor* _A8; + LiveActor* _AC; + TVec3f _B0; + TVec3f _BC; + TVec3f _C8; + TVec3f _D4; + s32 _E0; + s32 _E4; + u32 _E8; + s32 _EC; + s32 _F0; + MR::Vector> mModelArray; //_F4 + TQuat4f _100; + TVec3f _110; + f32 _11C; + bool _120; + bool _121; + CameraTargetDemoActor* _F8; + JointControlDelegator* mJointController; //_FC }; class IceMerameraKingShockWave : public ModelObj { @@ -80,5 +81,5 @@ public: virtual void appear(); virtual void control(); - virtual void attackSensor(HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); }; diff --git a/include/Game/Enemy/ItemGenerator.hpp b/include/Game/Enemy/ItemGenerator.hpp index 484858441..4a8210c7e 100644 --- a/include/Game/Enemy/ItemGenerator.hpp +++ b/include/Game/Enemy/ItemGenerator.hpp @@ -15,9 +15,9 @@ public: void setTypeNone(); void setTypeCoin(s32); void setTypeStarPeace(s32); - void generate(const LiveActor *); + void generate(const LiveActor*); bool isUseFarSE() const; - s32 mNumType; // 0x00 - u8 mType; // 0x04 + s32 mNumType; // 0x00 + u8 mType; // 0x04 }; diff --git a/include/Game/Enemy/Jiraira.hpp b/include/Game/Enemy/Jiraira.hpp index c8243758d..272e17caf 100644 --- a/include/Game/Enemy/Jiraira.hpp +++ b/include/Game/Enemy/Jiraira.hpp @@ -4,16 +4,16 @@ class Jiraira : public LiveActor { public: - Jiraira(const char *); + Jiraira(const char*); virtual ~Jiraira(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void kill(); virtual void control(); - virtual void attackSensor(HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver); + virtual void attackSensor(HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); void exeWait(); void exeStepped(); @@ -21,6 +21,6 @@ public: void exePreRecover(); void exeRecover(); - CollisionParts *_8C; - f32 _90; + CollisionParts* _8C; + f32 _90; }; diff --git a/include/Game/Enemy/Kameck.hpp b/include/Game/Enemy/Kameck.hpp index 44db52a90..0c4cbb828 100644 --- a/include/Game/Enemy/Kameck.hpp +++ b/include/Game/Enemy/Kameck.hpp @@ -4,7 +4,7 @@ class Kameck : public LiveActor { public: - Kameck(const char *); + Kameck(const char*); void setBeamType(s32); diff --git a/include/Game/Enemy/KameckBeam.hpp b/include/Game/Enemy/KameckBeam.hpp index c3b419b54..63ab4f60a 100644 --- a/include/Game/Enemy/KameckBeam.hpp +++ b/include/Game/Enemy/KameckBeam.hpp @@ -11,35 +11,35 @@ public: class KameckBeamCollisionFilter { public: - KameckBeamCollisionFilter(const TVec3f *, f32); + KameckBeamCollisionFilter(const TVec3f*, f32); - virtual bool isInvalidParts(const CollisionParts *) const; + virtual bool isInvalidParts(const CollisionParts*) const; TVec3f* _4; - f32 _8; + f32 _8; }; class KameckBeam : public LiveActor { public: - KameckBeam(const char *); + KameckBeam(const char*); virtual ~KameckBeam(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calcAnim(); virtual void kill(); virtual void control(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void setEventListener(KameckBeamEventListener *); + void setEventListener(KameckBeamEventListener*); void requestShootToPlayerGround(f32); - u32 _8C; - u32 _90; - u32 _94; - u32 _98; - u32 _9C; + u32 _8C; + u32 _90; + u32 _94; + u32 _98; + u32 _9C; MtxPtr _A0; TVec3f _A4; TVec3f _B0; diff --git a/include/Game/Enemy/KameckBeamHolder.hpp b/include/Game/Enemy/KameckBeamHolder.hpp index a446ce78b..7db4e951c 100644 --- a/include/Game/Enemy/KameckBeamHolder.hpp +++ b/include/Game/Enemy/KameckBeamHolder.hpp @@ -11,5 +11,5 @@ namespace MR { void createKameckFireBallHolder(); void createKameckBeamTurtleHolder(); - KameckBeam* startFollowKameckBeam(s32, MtxPtr, f32, const TVec3f &, KameckBeamEventListener *); -}; \ No newline at end of file + KameckBeam* startFollowKameckBeam(s32, MtxPtr, f32, const TVec3f&, KameckBeamEventListener*); +}; // namespace MR \ No newline at end of file diff --git a/include/Game/Enemy/KariKariDirector.hpp b/include/Game/Enemy/KariKariDirector.hpp index fcb60d4c3..e59d4566d 100644 --- a/include/Game/Enemy/KariKariDirector.hpp +++ b/include/Game/Enemy/KariKariDirector.hpp @@ -1,6 +1,6 @@ #pragma once namespace MR { - s32 getKarikariClingNum(); + s32 getKarikariClingNum(); void removeAllClingingKarikari(); -}; +}; // namespace MR diff --git a/include/Game/Enemy/Karon.hpp b/include/Game/Enemy/Karon.hpp index 2a7ed4d51..fbedda1b9 100644 --- a/include/Game/Enemy/Karon.hpp +++ b/include/Game/Enemy/Karon.hpp @@ -16,19 +16,19 @@ struct KaronParam { class Karon : public LiveActor { public: - Karon(const char *); + Karon(const char*); virtual ~Karon(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void kill(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPush(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPush(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeFixWait(); void exeWait(); @@ -48,13 +48,13 @@ public: void endBindStarPointer(); bool isFallNextMove(bool); - inline void moveAndTurn(const KaronParam *pParam) { + inline void moveAndTurn(const KaronParam* pParam) { MR::moveAndTurnToPlayer(this, pParam->_0, pParam->_4, pParam->_8, pParam->_C); } - TerritoryMover* mTerritoryMover; // 0x8C - u32 _90; - u8 _94; - AnimScaleController* mScaleController; // 0x98 - WalkerStateBindStarPointer* mStateStarPointer; // 0x9C + TerritoryMover* mTerritoryMover; // 0x8C + u32 _90; + u8 _94; + AnimScaleController* mScaleController; // 0x98 + WalkerStateBindStarPointer* mStateStarPointer; // 0x9C }; diff --git a/include/Game/Enemy/Kuribo.hpp b/include/Game/Enemy/Kuribo.hpp index d5084e6a1..864e70984 100644 --- a/include/Game/Enemy/Kuribo.hpp +++ b/include/Game/Enemy/Kuribo.hpp @@ -15,36 +15,36 @@ class WalkerStateFindPlayer; class Kuribo : public LiveActor { public: - Kuribo(const char *); + Kuribo(const char*); virtual ~Kuribo(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void makeActorAppeared(); virtual void kill(); virtual void makeActorDead(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPush(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPush(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void initState(); void initSensor(); - void initAppearState(const JMapInfoIter &); + void initAppearState(const JMapInfoIter&); bool requestDead(); - bool requestFlatDown(HitSensor *, HitSensor *); - bool requestHipDropDown(HitSensor *, HitSensor *); + bool requestFlatDown(HitSensor*, HitSensor*); + bool requestHipDropDown(HitSensor*, HitSensor*); bool requestPressDown(); - bool requestStagger(HitSensor *, HitSensor *); - bool requestBlowDown(HitSensor *, HitSensor *); + bool requestStagger(HitSensor*, HitSensor*); + bool requestBlowDown(HitSensor*, HitSensor*); bool requestAttackSuccess(); void onNoGravitySupport(); - void setUp(const TVec3f &, const TQuat4f &, const TVec3f &); - void appearBlowed(const TVec3f &, const TQuat4f &, const TVec3f &); - void appearHipDropped(const TVec3f &, const TQuat4f &); + void setUp(const TVec3f&, const TQuat4f&, const TVec3f&); + void appearBlowed(const TVec3f&, const TQuat4f&, const TVec3f&); + void appearHipDropped(const TVec3f&, const TQuat4f&); bool tryNonActive(); bool tryActive(); bool tryEndBlow(); @@ -78,19 +78,19 @@ public: bool isEnablePanch() const; bool isEnablePushMove() const; - AnimScaleController* mScaleController; // 0x8C - ItemGenerator* mItemGenerator; // 0x90 - WalkerStateWander* mStateWander; // 0x94 - WalkerStateFindPlayer* mStateFindPlayer; // 0x98 - WalkerStateBindStarPointer* mBindStarPointer; // 0x9C - WalkerStateStagger* mStateStagger; // 0xA0 - WalkerStateChase* mStateChase; // 0xA4 - TQuat4f _A8; - TVec3f _B8; - bool _C4; - u8 _C5; + AnimScaleController* mScaleController; // 0x8C + ItemGenerator* mItemGenerator; // 0x90 + WalkerStateWander* mStateWander; // 0x94 + WalkerStateFindPlayer* mStateFindPlayer; // 0x98 + WalkerStateBindStarPointer* mBindStarPointer; // 0x9C + WalkerStateStagger* mStateStagger; // 0xA0 + WalkerStateChase* mStateChase; // 0xA4 + TQuat4f _A8; + TVec3f _B8; + bool _C4; + u8 _C5; }; namespace MR { - LiveActor* createNoItemKuriboActor(const char *); + LiveActor* createNoItemKuriboActor(const char*); }; diff --git a/include/Game/Enemy/Meramera.hpp b/include/Game/Enemy/Meramera.hpp index 49da16d37..d09629a70 100644 --- a/include/Game/Enemy/Meramera.hpp +++ b/include/Game/Enemy/Meramera.hpp @@ -5,6 +5,6 @@ class IceMerameraKing; class Meramera : public LiveActor { - public: - Meramera(const char *); -}; \ No newline at end of file +public: + Meramera(const char*); +}; \ No newline at end of file diff --git a/include/Game/Enemy/MoguStone.hpp b/include/Game/Enemy/MoguStone.hpp index b7518a7c2..e73d63160 100644 --- a/include/Game/Enemy/MoguStone.hpp +++ b/include/Game/Enemy/MoguStone.hpp @@ -5,43 +5,41 @@ #include "Game/Util/ParabolicPath.hpp" namespace { - static f32 hAddHeight = 200.0f; + static f32 hAddHeight = 200.0f; }; class MoguStone : public ModelObj { - public: - MoguStone(const char *, const char *); +public: + MoguStone(const char*, const char*); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - //incomplete class + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + //incomplete class - TVec4f _90; - TVec4f _A0; - TVec3f _B0; - f32 _BC; - bool _C0; + TVec4f _90; + TVec4f _A0; + TVec3f _B0; + f32 _BC; + bool _C0; }; class ThrowingIce : public MoguStone { - public: - ThrowingIce(const char *); +public: + ThrowingIce(const char*); - virtual void init(const JMapInfoIter &); - virtual void doBehavior(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual void startBreakSound(); - virtual void startThrowLevelSound(); + virtual void init(const JMapInfoIter&); + virtual void doBehavior(); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual void startBreakSound(); + virtual void startThrowLevelSound(); - void emitIce(const TVec3f &, const TVec3f &, f32, const TVec3f &); + void emitIce(const TVec3f&, const TVec3f&, f32, const TVec3f&); - ParabolicPath* mPath; //_C4 - - + ParabolicPath* mPath; //_C4 }; -namespace NrvMoguStone { - NERVE(MoguStoneNrvTaken); - NERVE(MoguStoneNrvThrow); +namespace NrvMoguStone { + NERVE(MoguStoneNrvTaken); + NERVE(MoguStoneNrvThrow); //incomplete -}; +}; // namespace NrvMoguStone diff --git a/include/Game/Enemy/PackunPetit.hpp b/include/Game/Enemy/PackunPetit.hpp index 0512ae09b..f69af3eaf 100644 --- a/include/Game/Enemy/PackunPetit.hpp +++ b/include/Game/Enemy/PackunPetit.hpp @@ -7,18 +7,18 @@ class WalkerStateBindStarPointer; class PackunPetit : public LiveActor { public: - PackunPetit(const char *); + PackunPetit(const char*); virtual ~PackunPetit(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void kill(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeNonActive(); void endNonActive(); @@ -40,15 +40,15 @@ public: void endDPDSwoon(); void initBlowModel(); - void punchDown(HitSensor *, HitSensor *); + void punchDown(HitSensor*, HitSensor*); void selectNrvWait(); bool tryNonActive(); bool tryTurn(); bool tryDPDSwoon(); - AnimScaleController* mScaleController; // 0x8C - WalkerStateBindStarPointer* mStarPointerState; // 0x90 - TVec3f _94; - ModelObj* mBlownModel; // 0xA0 - bool mDontTurn; // 0xA4 + AnimScaleController* mScaleController; // 0x8C + WalkerStateBindStarPointer* mStarPointerState; // 0x90 + TVec3f _94; + ModelObj* mBlownModel; // 0xA0 + bool mDontTurn; // 0xA4 }; diff --git a/include/Game/Enemy/Poihana.hpp b/include/Game/Enemy/Poihana.hpp index 58e5bae73..7b1cd639f 100644 --- a/include/Game/Enemy/Poihana.hpp +++ b/include/Game/Enemy/Poihana.hpp @@ -8,77 +8,77 @@ class WalkerStateBindStarPointer; class Poihana : public LiveActor { public: - Poihana(const char *pName); + Poihana(const char* pName); - virtual ~Poihana(); - virtual void init(const JMapInfoIter &rIter); - virtual void initAfterPlacement(); - virtual void control(); - virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver); + virtual ~Poihana(); + virtual void init(const JMapInfoIter& rIter); + virtual void initAfterPlacement(); + virtual void control(); + virtual void calcAndSetBaseMtx(); + virtual void attackSensor(HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveMsgPush(HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); - void exeNonActive(); - void endNonActive(); - void exeWait(); - void exeWalkAround(); - void exeSleepStart(); - void exeSleep(); - void exeGetUp(); - void exeSearch(); - void exeChasePlayer(); - void exeShootUpCharge(); - void exeShootUp(); - void endShootUp() NO_INLINE; - void exeGoBack(); - void exeShock(); - void exeSwoonLand(); - void exeSwoon(); - void exeRecover(); - void exeShake(); - void exeDrown(); - void exeHide(); - void exeAppear(); - void exeDPDSwoon(); - void endDPDSwoon() NO_INLINE; + void exeNonActive(); + void endNonActive(); + void exeWait(); + void exeWalkAround(); + void exeSleepStart(); + void exeSleep(); + void exeGetUp(); + void exeSearch(); + void exeChasePlayer(); + void exeShootUpCharge(); + void exeShootUp(); + void endShootUp() NO_INLINE; + void exeGoBack(); + void exeShock(); + void exeSwoonLand(); + void exeSwoon(); + void exeRecover(); + void exeShake(); + void exeDrown(); + void exeHide(); + void exeAppear(); + void exeDPDSwoon(); + void endDPDSwoon() NO_INLINE; - bool tryToStartBind(HitSensor *pSender); - void updateBindActorMtx(); - void endBind(); - void startBound(); - void calcBound(); - void contactMario(HitSensor *pSender, HitSensor *pReceiver); - void controlVelocity(); - void calcMyGravity(); - bool tryNonActive(); - bool tryDrown(); - bool tryDPDSwoon(); - bool tryShock(); - bool tryHipDropShock(); - bool isNerveTypeWalkOrWait() const; - bool isNeedForBackHome() const; - bool isNeedForGetUp() const; - bool isBackAttack(HitSensor *pMySensor) const NO_INLINE; + bool tryToStartBind(HitSensor* pSender); + void updateBindActorMtx(); + void endBind(); + void startBound(); + void calcBound(); + void contactMario(HitSensor* pSender, HitSensor* pReceiver); + void controlVelocity(); + void calcMyGravity(); + bool tryNonActive(); + bool tryDrown(); + bool tryDPDSwoon(); + bool tryShock(); + bool tryHipDropShock(); + bool isNerveTypeWalkOrWait() const; + bool isNeedForBackHome() const; + bool isNeedForGetUp() const; + bool isBackAttack(HitSensor* pMySensor) const NO_INLINE; - AnimScaleController* mAnimScaleCtrl; // 0x8C - WalkerStateBindStarPointer* mBindStarPointer; // 0x90 - ActorCameraInfo* mCamInfo; // 0x94 - LiveActor* mBindedActor; // 0x98 - f32 mLaunchIntensity; // 0x9C - TVec3f mRespawnPos; // 0xA0 - f32 _AC; // 0xAC - f32 _B0; // 0xB0 - TVec3f mHomePos; // 0xB4 - f32 _C0; // 0xC0 - s32 mBoundTimer; // 0xC4 - s32 mRandDir; // 0xC8 - s32 mBehavior; // 0xCC - bool mCanDrown; // 0xD0 - ModelObj* mWaterColumn; // 0xD4 - TVec3f mFrontVec; // 0xD8 - bool mIsActive; // 0xE4 - u8 _E5; // 0xE5 + AnimScaleController* mAnimScaleCtrl; // 0x8C + WalkerStateBindStarPointer* mBindStarPointer; // 0x90 + ActorCameraInfo* mCamInfo; // 0x94 + LiveActor* mBindedActor; // 0x98 + f32 mLaunchIntensity; // 0x9C + TVec3f mRespawnPos; // 0xA0 + f32 _AC; // 0xAC + f32 _B0; // 0xB0 + TVec3f mHomePos; // 0xB4 + f32 _C0; // 0xC0 + s32 mBoundTimer; // 0xC4 + s32 mRandDir; // 0xC8 + s32 mBehavior; // 0xCC + bool mCanDrown; // 0xD0 + ModelObj* mWaterColumn; // 0xD4 + TVec3f mFrontVec; // 0xD8 + bool mIsActive; // 0xE4 + u8 _E5; // 0xE5 }; diff --git a/include/Game/Enemy/RingBeam.hpp b/include/Game/Enemy/RingBeam.hpp index 2c754a1c3..59a750edd 100644 --- a/include/Game/Enemy/RingBeam.hpp +++ b/include/Game/Enemy/RingBeam.hpp @@ -5,46 +5,46 @@ class RingBeamShadowDrawer : public ShadowVolumeDrawer { public: - RingBeamShadowDrawer(const LiveActor *); + RingBeamShadowDrawer(const LiveActor*); - virtual ~RingBeamShadowDrawer(); + virtual ~RingBeamShadowDrawer(); virtual void loadModelDrawMtx() const; - virtual void drawShape() const; + virtual void drawShape() const; virtual bool isDraw() const; - const LiveActor * _1c; - f32 _20; + const LiveActor* _1c; + f32 _20; }; class RingBeam : public LiveActor { public: - RingBeam(const char *, LiveActor *, bool , bool); + RingBeam(const char*, LiveActor*, bool, bool); - virtual ~RingBeam(); - virtual void init(const JMapInfoIter &rIter); - virtual void appear(); - virtual void kill(); - virtual void attackSensor(HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver); + virtual ~RingBeam(); + virtual void init(const JMapInfoIter& rIter); + virtual void appear(); + virtual void kill(); + virtual void attackSensor(HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); - void setSpeed(f32 speed); - void setLife(s32 life); - void setColor(f32 color); - void setRadius(f32 radius); - void initPos(const LiveActor * actor); - void startBrk(const char *); - void exeSpread(); + void setSpeed(f32 speed); + void setLife(s32 life); + void setColor(f32 color); + void setRadius(f32 radius); + void initPos(const LiveActor* actor); + void startBrk(const char*); + void exeSpread(); - LiveActor* _8c; - ModelObj* mBloomModel; - f32 mSpeed; - s32 mLife; - bool _9c; - bool _9d; - RingBeamShadowDrawer* _a0; - ModelObj* _a4; - TVec3f _a8; - TVec3f _b4; - TVec3f _c0; - TVec3f _cc; + LiveActor* _8c; + ModelObj* mBloomModel; + f32 mSpeed; + s32 mLife; + bool _9c; + bool _9d; + RingBeamShadowDrawer* _a0; + ModelObj* _a4; + TVec3f _a8; + TVec3f _b4; + TVec3f _c0; + TVec3f _cc; }; diff --git a/include/Game/Enemy/RingBeamer.hpp b/include/Game/Enemy/RingBeamer.hpp index 95747103c..f12d41a0a 100644 --- a/include/Game/Enemy/RingBeamer.hpp +++ b/include/Game/Enemy/RingBeamer.hpp @@ -6,12 +6,12 @@ class RingBeam; class RingBeamer : public LiveActor { public: - RingBeamer(const char *); + RingBeamer(const char*); - virtual void init(const JMapInfoIter &); - virtual void attackSensor(HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver); + virtual void init(const JMapInfoIter&); + virtual void attackSensor(HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); void syncSwitchOffB(); void setupAttack(); diff --git a/include/Game/Enemy/SearchBeamer.hpp b/include/Game/Enemy/SearchBeamer.hpp index 5419c122d..1041c1aa4 100644 --- a/include/Game/Enemy/SearchBeamer.hpp +++ b/include/Game/Enemy/SearchBeamer.hpp @@ -9,16 +9,16 @@ class WalkerStateBindStarPointer; class SearchBeamer : public LiveActor { public: - SearchBeamer(const char *); + SearchBeamer(const char*); virtual ~SearchBeamer(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void updateHitSensor(HitSensor *); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void updateHitSensor(HitSensor*); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeNonActive(); void exeCloseWaitFar(); @@ -35,35 +35,35 @@ public: void exeDPDSwoon(); void endDPDSwoon(); void exeStopForPlayerOff(); - bool calcJointPropeller(TPos3f *, const JointControllerInfo &); - bool calcJointBeamStart(TPos3f *, const JointControllerInfo &); - bool calcJointBeamEnd(TPos3f *, const JointControllerInfo &); + bool calcJointPropeller(TPos3f*, const JointControllerInfo&); + bool calcJointBeamStart(TPos3f*, const JointControllerInfo&); + bool calcJointBeamEnd(TPos3f*, const JointControllerInfo&); void updatePropeller(); void updateBeamEffect(bool); void updateBeamShadow(); void initBeamPos(); void reformDirection(bool); void bowToPlayer(); - bool checkBeamDistiny(TVec3f *, TVec3f) const; + bool checkBeamDistiny(TVec3f*, TVec3f) const; bool isPlayerInTerritory() const; bool tryNonActive(); bool tryStopStart(); bool tryDPDSwoon(); - AnimScaleController* mScaleController; // 0x8C - WalkerStateBindStarPointer* mBindStarPointer; // 0x90 - TVec3f _94; - TVec3f _A0; - f32 _AC; - f32 _B0; - JointController* mPropellerJointCtrl; // 0xB4 - TMtx34f _B8; - TMtx34f _E8; - JointController* mBeanStartJointCtrl; // 0x118 - JointController* mBeamEndJointCtrl; // 0x11C - TVec3f _120; - TVec3f _12C; - f32 _138; - f32 _13C; - f32 _140; + AnimScaleController* mScaleController; // 0x8C + WalkerStateBindStarPointer* mBindStarPointer; // 0x90 + TVec3f _94; + TVec3f _A0; + f32 _AC; + f32 _B0; + JointController* mPropellerJointCtrl; // 0xB4 + TMtx34f _B8; + TMtx34f _E8; + JointController* mBeanStartJointCtrl; // 0x118 + JointController* mBeamEndJointCtrl; // 0x11C + TVec3f _120; + TVec3f _12C; + f32 _138; + f32 _13C; + f32 _140; }; diff --git a/include/Game/Enemy/SpinHitController.hpp b/include/Game/Enemy/SpinHitController.hpp index 71148e18c..1648e4929 100644 --- a/include/Game/Enemy/SpinHitController.hpp +++ b/include/Game/Enemy/SpinHitController.hpp @@ -8,22 +8,22 @@ class LiveActor; class SpinHitController { public: - SpinHitController(const NameObj *, s32, bool); - SpinHitController(const NameObj *, s32, s32, s32, f32, f32, f32, s32, bool); + SpinHitController(const NameObj*, s32, bool); + SpinHitController(const NameObj*, s32, s32, s32, f32, f32, f32, s32, bool); - void setParameter(const NameObj *, s32, s32, s32, f32, f32, f32, s32, bool); - void start(LiveActor *, const TVec3f &, const TVec3f &); - void startWithoutStopScene(LiveActor *, const TVec3f &, const TVec3f &); - bool execute(LiveActor *); - void emitItem(LiveActor *); + void setParameter(const NameObj*, s32, s32, s32, f32, f32, f32, s32, bool); + void start(LiveActor*, const TVec3f&, const TVec3f&); + void startWithoutStopScene(LiveActor*, const TVec3f&, const TVec3f&); + bool execute(LiveActor*); + void emitItem(LiveActor*); - s32 _0; - s32 _4; - s32 _8; - f32 _C; - f32 _10; - f32 _14; + s32 _0; + s32 _4; + s32 _8; + f32 _C; + f32 _10; + f32 _14; bool _18; bool _19; - u32 _1C; + u32 _1C; }; diff --git a/include/Game/Enemy/TerritoryMover.hpp b/include/Game/Enemy/TerritoryMover.hpp index 667065d1a..2c1d6d8af 100644 --- a/include/Game/Enemy/TerritoryMover.hpp +++ b/include/Game/Enemy/TerritoryMover.hpp @@ -9,10 +9,10 @@ class TerritoryMover { public: TerritoryMover(f32); - void decideNextTargetPos(const LiveActor *); - bool isReachedTarget(const LiveActor *, f32); + void decideNextTargetPos(const LiveActor*); + bool isReachedTarget(const LiveActor*, f32); - f32 _0; + f32 _0; TVec3f _4; TVec3f _10; }; diff --git a/include/Game/Enemy/WalkerStateBindStarPointer.hpp b/include/Game/Enemy/WalkerStateBindStarPointer.hpp index cd4935143..7cd6b6801 100644 --- a/include/Game/Enemy/WalkerStateBindStarPointer.hpp +++ b/include/Game/Enemy/WalkerStateBindStarPointer.hpp @@ -7,7 +7,7 @@ class AnimScaleController; class WalkerStateBindStarPointer : public ActorStateBase { public: - WalkerStateBindStarPointer(LiveActor *, AnimScaleController *); + WalkerStateBindStarPointer(LiveActor*, AnimScaleController*); virtual ~WalkerStateBindStarPointer(); virtual void appear(); @@ -16,8 +16,8 @@ public: bool tryStartPointBind() const; void exeBind(); - /* 0xC */ LiveActor* mHostActor; ///< The host actor that is bound. - /* 0x10 */ AnimScaleController* mScaleController; ///< The controller for scaling the actor during animations. - /* 0x14 */ s32 mUpdateCounter; ///< Counter that is incremented in exeBind. Once it exceeds 5, it updates the actor. - /* 0x18 */ bool mHasEffect; ///< Does the host actor contain the "Touch" effect name? + /* 0xC */ LiveActor* mHostActor; ///< The host actor that is bound. + /* 0x10 */ AnimScaleController* mScaleController; ///< The controller for scaling the actor during animations. + /* 0x14 */ s32 mUpdateCounter; ///< Counter that is incremented in exeBind. Once it exceeds 5, it updates the actor. + /* 0x18 */ bool mHasEffect; ///< Does the host actor contain the "Touch" effect name? }; diff --git a/include/Game/Enemy/WalkerStateBlowDamage.hpp b/include/Game/Enemy/WalkerStateBlowDamage.hpp index d7f6db57c..4dd668f0a 100644 --- a/include/Game/Enemy/WalkerStateBlowDamage.hpp +++ b/include/Game/Enemy/WalkerStateBlowDamage.hpp @@ -6,7 +6,7 @@ #include "revolution/types.h" class WalkerStateBlowDamageParam { - public: +public: int _0; }; @@ -21,6 +21,6 @@ public: void exeBlowLand(); LiveActor* mParentActor; - TVec3f* _10; - TVec3f _14; + TVec3f* _10; + TVec3f _14; }; diff --git a/include/Game/Enemy/WalkerStateChase.hpp b/include/Game/Enemy/WalkerStateChase.hpp index 2267c5b44..4d93a7b4d 100644 --- a/include/Game/Enemy/WalkerStateChase.hpp +++ b/include/Game/Enemy/WalkerStateChase.hpp @@ -19,7 +19,7 @@ public: class WalkerStateChase : public ActorStateBase { public: - WalkerStateChase(LiveActor *, TVec3f *, WalkerStateParam *, WalkerStateChaseParam *); + WalkerStateChase(LiveActor*, TVec3f*, WalkerStateParam*, WalkerStateChaseParam*); virtual ~WalkerStateChase(); virtual void appear(); @@ -28,8 +28,8 @@ public: void exeEnd(); bool isRunning() const; - LiveActor* mParentActor; // 0xC - WalkerStateParam* mStateParam; // 0x10 - WalkerStateChaseParam* mChaseParam; // 0x14 - TVec3f* _18; + LiveActor* mParentActor; // 0xC + WalkerStateParam* mStateParam; // 0x10 + WalkerStateChaseParam* mChaseParam; // 0x14 + TVec3f* _18; }; diff --git a/include/Game/Enemy/WalkerStateFindPlayer.hpp b/include/Game/Enemy/WalkerStateFindPlayer.hpp index 412531733..c993faf28 100644 --- a/include/Game/Enemy/WalkerStateFindPlayer.hpp +++ b/include/Game/Enemy/WalkerStateFindPlayer.hpp @@ -17,7 +17,7 @@ public: class WalkerStateFindPlayer : public ActorStateBase { public: - WalkerStateFindPlayer(LiveActor *, TVec3f * , WalkerStateParam *, WalkerStateFindPlayerParam *); + WalkerStateFindPlayer(LiveActor*, TVec3f*, WalkerStateParam*, WalkerStateFindPlayerParam*); virtual ~WalkerStateFindPlayer(); virtual void appear(); @@ -30,8 +30,8 @@ public: bool isFindJumpBegin() const; bool isLandStart() const; - LiveActor* mParent; // 0x0C - TVec3f* _10; - WalkerStateParam* mStateParam; // 0x14 - WalkerStateFindPlayerParam* mFindPlayerParam; // 0x18 + LiveActor* mParent; // 0x0C + TVec3f* _10; + WalkerStateParam* mStateParam; // 0x14 + WalkerStateFindPlayerParam* mFindPlayerParam; // 0x18 }; diff --git a/include/Game/Enemy/WalkerStateFunction.hpp b/include/Game/Enemy/WalkerStateFunction.hpp index 48c5e7de8..f2bebce26 100644 --- a/include/Game/Enemy/WalkerStateFunction.hpp +++ b/include/Game/Enemy/WalkerStateFunction.hpp @@ -7,7 +7,7 @@ class WalkerStateParam; class WalkerStateFunction { public: - static bool isInSightPlayer(const LiveActor *, const TVec3f &, const WalkerStateParam *); + static bool isInSightPlayer(const LiveActor*, const TVec3f&, const WalkerStateParam*); - static void calcPassiveMovement(LiveActor *, const WalkerStateParam *); + static void calcPassiveMovement(LiveActor*, const WalkerStateParam*); }; diff --git a/include/Game/Enemy/WalkerStateStagger.hpp b/include/Game/Enemy/WalkerStateStagger.hpp index 2f6d2f2ff..e0e738b7f 100644 --- a/include/Game/Enemy/WalkerStateStagger.hpp +++ b/include/Game/Enemy/WalkerStateStagger.hpp @@ -27,12 +27,12 @@ public: class WalkerStateStagger : public ActorStateBase { public: - WalkerStateStagger(LiveActor *, TVec3f *, WalkerStateParam *, WalkerStateStaggerParam *); + WalkerStateStagger(LiveActor*, TVec3f*, WalkerStateParam*, WalkerStateStaggerParam*); virtual ~WalkerStateStagger(); virtual void appear(); - void setPunchDirection(HitSensor *, HitSensor *); + void setPunchDirection(HitSensor*, HitSensor*); void exeStagger(); void exeStaggerEnd(); void reboundWall(); @@ -42,10 +42,10 @@ public: bool isSwooning(s32) const; bool isSpinning(s32, s32) const; bool isRecoverStart() const; - - LiveActor* mParent; // 0x0C - WalkerStateParam* mStateParam; // 0x10 - WalkerStateStaggerParam* mStaggerParam; // 0x14 - TVec3f _18; - TVec3f* _24; + + LiveActor* mParent; // 0x0C + WalkerStateParam* mStateParam; // 0x10 + WalkerStateStaggerParam* mStaggerParam; // 0x14 + TVec3f _18; + TVec3f* _24; }; diff --git a/include/Game/Enemy/WalkerStateWander.hpp b/include/Game/Enemy/WalkerStateWander.hpp index 068125bc4..22ad1b856 100644 --- a/include/Game/Enemy/WalkerStateWander.hpp +++ b/include/Game/Enemy/WalkerStateWander.hpp @@ -19,18 +19,18 @@ public: class WalkerStateWander : public ActorStateBase { public: - WalkerStateWander(LiveActor *, TVec3f *, WalkerStateParam *, WalkerStateWanderParam *); + WalkerStateWander(LiveActor*, TVec3f*, WalkerStateParam*, WalkerStateWanderParam*); virtual ~WalkerStateWander(); virtual void appear(); - void setWanderCenter(const TVec3f &); + void setWanderCenter(const TVec3f&); void exeWait(); void exeWalk(); - LiveActor* mParent; // 0x0C - TVec3f* _10; - TerritoryMover* mTerritoryMover; // 0x14 - WalkerStateParam* mStateParam; // 0x18 - WalkerStateWanderParam* mWanderParam; // 0x1C + LiveActor* mParent; // 0x0C + TVec3f* _10; + TerritoryMover* mTerritoryMover; // 0x14 + WalkerStateParam* mStateParam; // 0x18 + WalkerStateWanderParam* mWanderParam; // 0x1C }; diff --git a/include/Game/GameAudio/AudEffectDirector.hpp b/include/Game/GameAudio/AudEffectDirector.hpp index 4ac63b7f3..438e6ce12 100644 --- a/include/Game/GameAudio/AudEffectDirector.hpp +++ b/include/Game/GameAudio/AudEffectDirector.hpp @@ -7,8 +7,8 @@ public: AudEffectDirector(); virtual ~AudEffectDirector(); - - virtual void init(const JMapInfoIter &rIter); + + virtual void init(const JMapInfoIter& rIter); virtual void movement(); void setEffectType(s32, s32); diff --git a/include/Game/GameAudio/AudSeKeeper.hpp b/include/Game/GameAudio/AudSeKeeper.hpp index e8f685c5c..938e45a78 100644 --- a/include/Game/GameAudio/AudSeKeeper.hpp +++ b/include/Game/GameAudio/AudSeKeeper.hpp @@ -15,21 +15,21 @@ public: void add(J3DJoint*, u16); void updateJointPos(); - AudSoundObject* _0; // 0x00 - J3DJoint* _4; // 0x04 - TVec3f _8; // 0x08 - u16 _14; // 0x0C + AudSoundObject* _0; // 0x00 + J3DJoint* _4; // 0x04 + TVec3f _8; // 0x08 + u16 _14; // 0x0C }; class AudSeKeeper : public JKRDisposer { public: - AudSeKeeper(LiveActor *, int); + AudSeKeeper(LiveActor*, int); ~AudSeKeeper(); - void update(); - void makeBox(const char *, const char *); - void playLevel(const char *, const char *); - AudSeKeeperBox *getBoxEqualName(const char *); + void update(); + void makeBox(const char*, const char*); + void playLevel(const char*, const char*); + AudSeKeeperBox* getBoxEqualName(const char*); //TODO }; \ No newline at end of file diff --git a/include/Game/GameAudio/AudStageBgmTable.hpp b/include/Game/GameAudio/AudStageBgmTable.hpp index d0e1c7de1..08ff3610c 100644 --- a/include/Game/GameAudio/AudStageBgmTable.hpp +++ b/include/Game/GameAudio/AudStageBgmTable.hpp @@ -4,7 +4,7 @@ class AudStageBgmTable { public: - static u32 getBgmId(const char *, s32); + static u32 getBgmId(const char*, s32); - static s32 getBgmState(const char *, s32); + static s32 getBgmState(const char*, s32); }; \ No newline at end of file diff --git a/include/Game/GameAudio/AudTalkSoundData.hpp b/include/Game/GameAudio/AudTalkSoundData.hpp index 63846b37f..bd71163df 100644 --- a/include/Game/GameAudio/AudTalkSoundData.hpp +++ b/include/Game/GameAudio/AudTalkSoundData.hpp @@ -4,11 +4,14 @@ class JAISoundID { public: - JAISoundID() { + JAISoundID(){ }; - JAISoundID(u32 id) : mID(id) {} - JAISoundID(JAISoundID const& other) { mID = other.mID; } + JAISoundID(u32 id) + : mID(id) {} + JAISoundID(JAISoundID const& other) { + mID = other.mID; + } /* 0x0 */ u32 mID; }; diff --git a/include/Game/GameAudio/AudTamakoroBgmCtrl.hpp b/include/Game/GameAudio/AudTamakoroBgmCtrl.hpp index 92304f0f6..4874d641e 100644 --- a/include/Game/GameAudio/AudTamakoroBgmCtrl.hpp +++ b/include/Game/GameAudio/AudTamakoroBgmCtrl.hpp @@ -1,6 +1,5 @@ #pragma once - #include class JAISoundHandle; diff --git a/include/Game/Gravity/ConeGravity.hpp b/include/Game/Gravity/ConeGravity.hpp index 9f2a904b6..32df438d9 100644 --- a/include/Game/Gravity/ConeGravity.hpp +++ b/include/Game/Gravity/ConeGravity.hpp @@ -4,26 +4,26 @@ class ConeGravity : public PlanetGravity { public: - ConeGravity(); + ConeGravity(); - virtual void updateMtx(const TPos3f &rMtx); - virtual bool calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f &rPosition) const; + virtual void updateMtx(const TPos3f& rMtx); + virtual bool calcOwnGravityVector(TVec3f* pDest, f32* pScalar, const TVec3f& rPosition) const; - void setLocalMatrix(const TPos3f &rMtx); - void setEnableBottom(bool val); - void setTopCutRate(f32 val); + void setLocalMatrix(const TPos3f& rMtx); + void setEnableBottom(bool val); + void setTopCutRate(f32 val); /* * The x column represents the radius vector. The y column represents the central axis vector, * point from the center of the base of the cone to the apex. The translation column represents * the location of the center of the base of the cone, and the z column is unused. */ - TPos3f mLocalMtx; // 0x28 - TPos3f mWorldMtx; // 0x58 - - f32 mValidDegree; // 0x88; set in ctor but never used - f32 mValidCos; // 0x8C; set in ctor but never used - f32 mWorldRadius; // 0x90 - bool mEnableBottom; // 0x94 - f32 mTopCutRate; // 0x98 + TPos3f mLocalMtx; // 0x28 + TPos3f mWorldMtx; // 0x58 + + f32 mValidDegree; // 0x88; set in ctor but never used + f32 mValidCos; // 0x8C; set in ctor but never used + f32 mWorldRadius; // 0x90 + bool mEnableBottom; // 0x94 + f32 mTopCutRate; // 0x98 }; diff --git a/include/Game/Gravity/CubeGravity.hpp b/include/Game/Gravity/CubeGravity.hpp index b7d7a23a1..ae9093063 100644 --- a/include/Game/Gravity/CubeGravity.hpp +++ b/include/Game/Gravity/CubeGravity.hpp @@ -6,11 +6,11 @@ class CubeGravity : public PlanetGravity { public: CubeGravity(); - virtual void updateMtx(const TPos3f &rMtx); - virtual bool calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f &rPosition) const; + virtual void updateMtx(const TPos3f& rMtx); + virtual bool calcOwnGravityVector(TVec3f* pDest, f32* pScalar, const TVec3f& rPosition) const; + + void setCube(const TPos3f&); - void setCube(const TPos3f &); - /* * Area as in region, not area as in Area = Base * h * @@ -24,15 +24,15 @@ public: * * `calcGravityArea` returns the encoded region */ - int calcGravityArea(const TVec3f &rPosition) const; - bool calcFaceGravity(const TVec3f &rPosition, s32, TVec3f *pDest, f32 *pScalar) const; - bool calcEdgeGravity(const TVec3f &rPosition, s32, TVec3f *pDest, f32 *pScalar) const; - bool calcCornerGravity(const TVec3f &rPosition, s32, TVec3f *pDest, f32 *pScalar) const; - + int calcGravityArea(const TVec3f& rPosition) const; + bool calcFaceGravity(const TVec3f& rPosition, s32, TVec3f* pDest, f32* pScalar) const; + bool calcEdgeGravity(const TVec3f& rPosition, s32, TVec3f* pDest, f32* pScalar) const; + bool calcCornerGravity(const TVec3f& rPosition, s32, TVec3f* pDest, f32* pScalar) const; + TPos3f mCube; // 0x28 TPos3f mPosition; // 0x58 - f32 lenX; // 0x88 - f32 lenY; // 0x8C - f32 lenZ; // 0x90 - u8 mActiveFaces; // 0x94 + f32 lenX; // 0x88 + f32 lenY; // 0x8C + f32 lenZ; // 0x90 + u8 mActiveFaces; // 0x94 }; diff --git a/include/Game/Gravity/DiskGravity.hpp b/include/Game/Gravity/DiskGravity.hpp index 8dc6dcd85..543d280b3 100644 --- a/include/Game/Gravity/DiskGravity.hpp +++ b/include/Game/Gravity/DiskGravity.hpp @@ -6,41 +6,40 @@ class DiskGravity : public PlanetGravity { public: DiskGravity(); - virtual void updateMtx(const TPos3f &rMtx); - virtual bool calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f &rPosition) const; + virtual void updateMtx(const TPos3f& rMtx); + virtual bool calcOwnGravityVector(TVec3f* pDest, f32* pScalar, const TVec3f& rPosition) const; void updateLocalParam(); - void setLocalPosition(const TVec3f &rLocalPos); - void setLocalDirection(const TVec3f &rLocalDir); - void setSideDirection(const TVec3f &rSideDir); + void setLocalPosition(const TVec3f& rLocalPos); + void setLocalDirection(const TVec3f& rLocalDir); + void setSideDirection(const TVec3f& rSideDir); void setRadius(f32 val); void setValidDegee(f32 val); void setBothSide(bool val); void setEnableEdgeGravity(bool val); // Position - TVec3f mLocalPosition; // 0x28 - TVec3f mWorldPosition; // 0x34 + TVec3f mLocalPosition; // 0x28 + TVec3f mWorldPosition; // 0x34 // Unit normal vector to the circular surface of the disk - TVec3f mLocalNormal; // 0x40 - TVec3f mWorldNormal; // 0x4C + TVec3f mLocalNormal; // 0x40 + TVec3f mWorldNormal; // 0x4C - TVec3f mSideDirection; // 0x58 + TVec3f mSideDirection; // 0x58 - - TVec3f mOppositeSideVecOrtho; // 0x64 - TVec3f mWorldOppositeSideVecOrtho; // 0x70 + TVec3f mOppositeSideVecOrtho; // 0x64 + TVec3f mWorldOppositeSideVecOrtho; // 0x70 // Radius of the circular face of the disk - f32 mLocalRadius; // 0x7C - f32 mWorldRadius; // 0x80 + f32 mLocalRadius; // 0x7C + f32 mWorldRadius; // 0x80 // Number of degrees of the circle gravity applies to - f32 mValidDegree; // 0x84 - f32 mValidCos; // 0x88 + f32 mValidDegree; // 0x84 + f32 mValidCos; // 0x88 - bool mEnableBothSide; // 0x8C - bool mEnableEdgeGravity; // 0x8D + bool mEnableBothSide; // 0x8C + bool mEnableEdgeGravity; // 0x8D }; diff --git a/include/Game/Gravity/DiskTorusGravity.hpp b/include/Game/Gravity/DiskTorusGravity.hpp index 8647d9c20..76f0124c7 100644 --- a/include/Game/Gravity/DiskTorusGravity.hpp +++ b/include/Game/Gravity/DiskTorusGravity.hpp @@ -4,25 +4,25 @@ class DiskTorusGravity : public PlanetGravity { public: - DiskTorusGravity(); + DiskTorusGravity(); - virtual void updateMtx(const TPos3f &rMtx); - virtual bool calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f &rPosition) const; + virtual void updateMtx(const TPos3f& rMtx); + virtual bool calcOwnGravityVector(TVec3f* pDest, f32* pScalar, const TVec3f& rPosition) const; - void setPosition(const TVec3f &rPosition); - void setDirection(const TVec3f &rDirection); - void setRadius(f32 val); - void setDiskRadius(f32 val); - void setEdgeType(s32 val); - void setBothSide(bool val); + void setPosition(const TVec3f& rPosition); + void setDirection(const TVec3f& rDirection); + void setRadius(f32 val); + void setDiskRadius(f32 val); + void setEdgeType(s32 val); + void setBothSide(bool val); - TVec3f mLocalPosition; // 0x28 - TVec3f mTranslation; // 0x34 - TVec3f mLocalDirection; // 0x40 - TVec3f mRotation; // 0x4C - f32 mRadius; // 0x58 - f32 mWorldRadius; // 0x5C - f32 mDiskRadius; // 0x60 - s32 mEdgeType; // 0x64 - bool mEnableBothSide; // 0x68 + TVec3f mLocalPosition; // 0x28 + TVec3f mTranslation; // 0x34 + TVec3f mLocalDirection; // 0x40 + TVec3f mRotation; // 0x4C + f32 mRadius; // 0x58 + f32 mWorldRadius; // 0x5C + f32 mDiskRadius; // 0x60 + s32 mEdgeType; // 0x64 + bool mEnableBothSide; // 0x68 }; diff --git a/include/Game/Gravity/GlobalGravityObj.hpp b/include/Game/Gravity/GlobalGravityObj.hpp index b10b3e9d4..ce63fa9bd 100644 --- a/include/Game/Gravity/GlobalGravityObj.hpp +++ b/include/Game/Gravity/GlobalGravityObj.hpp @@ -5,29 +5,29 @@ class GlobalGravityObj : public LiveActor { public: - GlobalGravityObj(const char *pName); + GlobalGravityObj(const char* pName); - virtual ~GlobalGravityObj() {} - virtual void init(const JMapInfoIter &rIter); - virtual void movement(); - virtual void makeActorAppeared(); - virtual void makeActorDead(); + virtual ~GlobalGravityObj() {} + virtual void init(const JMapInfoIter& rIter); + virtual void movement(); + virtual void makeActorAppeared(); + virtual void makeActorDead(); - void updateSwitch(); - PlanetGravity* getGravity(); + void updateSwitch(); + PlanetGravity* getGravity(); - GravityCreator* mGravityCreator; // 0x8C + GravityCreator* mGravityCreator; // 0x8C }; namespace MR { - NameObj* createGlobalCubeGravityObj(const char *pName); - NameObj* createGlobalConeGravityObj(const char *pName); - NameObj* createGlobalDiskGravityObj(const char *pName); - NameObj* createGlobalDiskTorusGravityObj(const char *pName); - NameObj* createGlobalPlaneGravityObj(const char *pName); - NameObj* createGlobalPlaneInBoxGravityObj(const char *pName); - NameObj* createGlobalPlaneInCylinderGravityObj(const char *pName); - NameObj* createGlobalPointGravityObj(const char *pName); - NameObj* createGlobalSegmentGravityObj(const char *pName); - NameObj* createGlobalWireGravityObj(const char *pName); -}; + NameObj* createGlobalCubeGravityObj(const char* pName); + NameObj* createGlobalConeGravityObj(const char* pName); + NameObj* createGlobalDiskGravityObj(const char* pName); + NameObj* createGlobalDiskTorusGravityObj(const char* pName); + NameObj* createGlobalPlaneGravityObj(const char* pName); + NameObj* createGlobalPlaneInBoxGravityObj(const char* pName); + NameObj* createGlobalPlaneInCylinderGravityObj(const char* pName); + NameObj* createGlobalPointGravityObj(const char* pName); + NameObj* createGlobalSegmentGravityObj(const char* pName); + NameObj* createGlobalWireGravityObj(const char* pName); +}; // namespace MR diff --git a/include/Game/Gravity/GraviryFollower.hpp b/include/Game/Gravity/GraviryFollower.hpp index 7be3b2fb5..3b707efd8 100644 --- a/include/Game/Gravity/GraviryFollower.hpp +++ b/include/Game/Gravity/GraviryFollower.hpp @@ -7,14 +7,14 @@ class GlobalGravityObj; class GraviryFollower : public BaseMatrixFollower { public: - GraviryFollower(GlobalGravityObj *pGravityObj, const JMapInfoIter &rIter); + GraviryFollower(GlobalGravityObj* pGravityObj, const JMapInfoIter& rIter); - virtual void setGravityFollowHost(const NameObj *pHost); - virtual void update(); + virtual void setGravityFollowHost(const NameObj* pHost); + virtual void update(); - PlanetGravity* mGravity; // 0x14 + PlanetGravity* mGravity; // 0x14 }; namespace MR { - bool addBaseMatrixFollowerGravity(GlobalGravityObj *pGravityObj, const JMapInfoIter &rIter); + bool addBaseMatrixFollowerGravity(GlobalGravityObj* pGravityObj, const JMapInfoIter& rIter); }; diff --git a/include/Game/Gravity/GravityCreator.hpp b/include/Game/Gravity/GravityCreator.hpp index 6e4cd7472..381540f82 100644 --- a/include/Game/Gravity/GravityCreator.hpp +++ b/include/Game/Gravity/GravityCreator.hpp @@ -13,131 +13,141 @@ class GravityCreator { public: - GravityCreator(); + GravityCreator(); - virtual PlanetGravity* getGravity() = 0; - virtual PlanetGravity* createInstance() = 0; - virtual void settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale) {} - virtual void settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2) {} - virtual void settingFromJMapOtherParam(const JMapInfoIter &rIter) {} + virtual PlanetGravity* getGravity() = 0; + virtual PlanetGravity* createInstance() = 0; + virtual void settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale) {} + virtual void settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2) {} + virtual void settingFromJMapOtherParam(const JMapInfoIter& rIter) {} - PlanetGravity* createFromJMap(const JMapInfoIter &rIter); + PlanetGravity* createFromJMap(const JMapInfoIter& rIter); }; class CubeGravityCreator : public GravityCreator { public: - inline CubeGravityCreator() : GravityCreator(), mGravityInstance(nullptr) {} + inline CubeGravityCreator() + : GravityCreator(), mGravityInstance(nullptr) {} - virtual PlanetGravity* getGravity(); - virtual PlanetGravity* createInstance(); - virtual void settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale); - virtual void settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2); + virtual PlanetGravity* getGravity(); + virtual PlanetGravity* createInstance(); + virtual void settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale); + virtual void settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2); - CubeGravity* mGravityInstance; // 0x4 + CubeGravity* mGravityInstance; // 0x4 }; class DiskGravityCreator : public GravityCreator { public: - inline DiskGravityCreator() : GravityCreator(), mGravityInstance(nullptr) {} + inline DiskGravityCreator() + : GravityCreator(), mGravityInstance(nullptr) {} - virtual PlanetGravity* getGravity(); - virtual PlanetGravity* createInstance(); - virtual void settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale); - virtual void settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2); + virtual PlanetGravity* getGravity(); + virtual PlanetGravity* createInstance(); + virtual void settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale); + virtual void settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2); - DiskGravity* mGravityInstance; // 0x4 + DiskGravity* mGravityInstance; // 0x4 }; class DiskTorusGravityCreator : public GravityCreator { public: - inline DiskTorusGravityCreator() : GravityCreator(), mGravityInstance(nullptr) {} + inline DiskTorusGravityCreator() + : GravityCreator(), mGravityInstance(nullptr) {} - virtual PlanetGravity* getGravity(); - virtual PlanetGravity* createInstance(); - virtual void settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale); - virtual void settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2); + virtual PlanetGravity* getGravity(); + virtual PlanetGravity* createInstance(); + virtual void settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale); + virtual void settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2); - DiskTorusGravity* mGravityInstance; // 0x4 + DiskTorusGravity* mGravityInstance; // 0x4 }; class ConeGravityCreator : public GravityCreator { public: - inline ConeGravityCreator() : GravityCreator(), mGravityInstance(nullptr) {} + inline ConeGravityCreator() + : GravityCreator(), mGravityInstance(nullptr) {} - virtual PlanetGravity* getGravity(); - virtual PlanetGravity* createInstance(); - virtual void settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale); - virtual void settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2); + virtual PlanetGravity* getGravity(); + virtual PlanetGravity* createInstance(); + virtual void settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale); + virtual void settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2); - ConeGravity* mGravityInstance; // 0x4 + ConeGravity* mGravityInstance; // 0x4 }; class PlaneGravityCreator : public GravityCreator { public: - inline PlaneGravityCreator() : GravityCreator(), mGravityInstance(nullptr) {} + inline PlaneGravityCreator() + : GravityCreator(), mGravityInstance(nullptr) {} - virtual PlanetGravity* getGravity(); - virtual PlanetGravity* createInstance(); - virtual void settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale); + virtual PlanetGravity* getGravity(); + virtual PlanetGravity* createInstance(); + virtual void settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale); - ParallelGravity* mGravityInstance; // 0x4 + ParallelGravity* mGravityInstance; // 0x4 }; class PlaneInBoxGravityCreator : public GravityCreator { public: - inline PlaneInBoxGravityCreator() : GravityCreator(), mGravityInstance(nullptr) {} + inline PlaneInBoxGravityCreator() + : GravityCreator(), mGravityInstance(nullptr) {} - virtual PlanetGravity* getGravity(); - virtual PlanetGravity* createInstance(); - virtual void settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale); - virtual void settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2); + virtual PlanetGravity* getGravity(); + virtual PlanetGravity* createInstance(); + virtual void settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale); + virtual void settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2); - ParallelGravity* mGravityInstance; // 0x4 + ParallelGravity* mGravityInstance; // 0x4 }; class PlaneInCylinderGravityCreator : public GravityCreator { public: - inline PlaneInCylinderGravityCreator() : GravityCreator(), mGravityInstance(nullptr) {} + inline PlaneInCylinderGravityCreator() + : GravityCreator(), mGravityInstance(nullptr) {} - virtual PlanetGravity* getGravity(); - virtual PlanetGravity* createInstance(); - virtual void settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale); - virtual void settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2); + virtual PlanetGravity* getGravity(); + virtual PlanetGravity* createInstance(); + virtual void settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale); + virtual void settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2); - ParallelGravity* mGravityInstance; // 0x4 + ParallelGravity* mGravityInstance; // 0x4 }; class PointGravityCreator : public GravityCreator { public: - inline PointGravityCreator() : GravityCreator(), mGravityInstance(nullptr) {} + inline PointGravityCreator() + : GravityCreator(), mGravityInstance(nullptr) {} - virtual PlanetGravity* getGravity(); - virtual PlanetGravity* createInstance(); - virtual void settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale); + virtual PlanetGravity* getGravity(); + virtual PlanetGravity* createInstance(); + virtual void settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale); - PointGravity* mGravityInstance; // 0x4 + PointGravity* mGravityInstance; // 0x4 }; class SegmentGravityCreator : public GravityCreator { public: - inline SegmentGravityCreator() : GravityCreator(), mGravityInstance(nullptr) {} + inline SegmentGravityCreator() + : GravityCreator(), mGravityInstance(nullptr) {} - virtual PlanetGravity* getGravity(); - virtual PlanetGravity* createInstance(); - virtual void settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale); - virtual void settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2); + virtual PlanetGravity* getGravity(); + virtual PlanetGravity* createInstance(); + virtual void settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale); + virtual void settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2); - SegmentGravity* mGravityInstance; // 0x4 + SegmentGravity* mGravityInstance; // 0x4 }; class WireGravityCreator : public GravityCreator { public: - inline WireGravityCreator() : GravityCreator(), mRailRider(nullptr), mGravityInstance(nullptr) {} + inline WireGravityCreator() + : GravityCreator(), mRailRider(nullptr), mGravityInstance(nullptr) {} - virtual PlanetGravity* getGravity(); - virtual PlanetGravity* createInstance(); - virtual void settingFromJMapOtherParam(const JMapInfoIter &rIter); + virtual PlanetGravity* getGravity(); + virtual PlanetGravity* createInstance(); + virtual void settingFromJMapOtherParam(const JMapInfoIter& rIter); - RailRider* mRailRider; // 0x4 - WireGravity* mGravityInstance; // 0x8 + RailRider* mRailRider; // 0x4 + WireGravity* mGravityInstance; // 0x8 }; diff --git a/include/Game/Gravity/GravityInfo.hpp b/include/Game/Gravity/GravityInfo.hpp index 5ef30b67b..bf52f23e4 100644 --- a/include/Game/Gravity/GravityInfo.hpp +++ b/include/Game/Gravity/GravityInfo.hpp @@ -5,11 +5,11 @@ class GravityInfo { public: - GravityInfo(); + GravityInfo(); - void init(); + void init(); - TVec3f mGravityVector; // 0x0 - s32 mLargestPriority; // 0xC - PlanetGravity* mGravityInstance; // 0x10 + TVec3f mGravityVector; // 0x0 + s32 mLargestPriority; // 0xC + PlanetGravity* mGravityInstance; // 0x10 }; diff --git a/include/Game/Gravity/ParallelGravity.hpp b/include/Game/Gravity/ParallelGravity.hpp index 6cf1fb20f..095d39e20 100644 --- a/include/Game/Gravity/ParallelGravity.hpp +++ b/include/Game/Gravity/ParallelGravity.hpp @@ -4,47 +4,47 @@ class ParallelGravity : public PlanetGravity { public: - enum RANGE_TYPE { - RangeType_Sphere = 0, - RangeType_Box = 1, - RangeType_Cylinder = 2 - }; + enum RANGE_TYPE { + RangeType_Sphere = 0, + RangeType_Box = 1, + RangeType_Cylinder = 2 + }; - enum DISTANCE_CALC_TYPE { - DistanceCalcType_Default = -1, - DistanceCalcType_X = 0, - DistanceCalcType_Y = 1, - DistanceCalcType_Z = 2 - }; + enum DISTANCE_CALC_TYPE { + DistanceCalcType_Default = -1, + DistanceCalcType_X = 0, + DistanceCalcType_Y = 1, + DistanceCalcType_Z = 2 + }; - ParallelGravity(); + ParallelGravity(); - virtual void updateMtx(const TPos3f &rMtx); - virtual bool calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f &rPosition) const; + virtual void updateMtx(const TPos3f& rMtx); + virtual bool calcOwnGravityVector(TVec3f* pDest, f32* pScalar, const TVec3f& rPosition) const; - void setPlane(const TVec3f &rPlaneUp, const TVec3f &rPlanePos); - void setRangeBox(const TPos3f &); - void setRangeCylinder(f32 radius, f32 height); - void setRangeType(RANGE_TYPE rangeType); - void setBaseDistance(f32 val); - void setDistanceCalcType(DISTANCE_CALC_TYPE distanceCalcType); - bool isInSphereRange(const TVec3f &rPosition, f32 *pScalar) const; - bool isInBoxRange(const TVec3f &rPosition, f32 *pScalar) const; - bool isInCylinderRange(const TVec3f &rPosition, f32 *pScalar) const; - bool isInRange(const TVec3f &rPosition, f32 *pScalar) const; + void setPlane(const TVec3f& rPlaneUp, const TVec3f& rPlanePos); + void setRangeBox(const TPos3f&); + void setRangeCylinder(f32 radius, f32 height); + void setRangeType(RANGE_TYPE rangeType); + void setBaseDistance(f32 val); + void setDistanceCalcType(DISTANCE_CALC_TYPE distanceCalcType); + bool isInSphereRange(const TVec3f& rPosition, f32* pScalar) const; + bool isInBoxRange(const TVec3f& rPosition, f32* pScalar) const; + bool isInCylinderRange(const TVec3f& rPosition, f32* pScalar) const; + bool isInRange(const TVec3f& rPosition, f32* pScalar) const; - TPos3f mLocalMtx; // 0x28 - TPos3f mWorldMtx; // 0x58 - f32 mExtentX; // 0x88 - f32 mExtentY; // 0x8C - f32 mExtentZ; // 0x90 - TVec3f mPlanePosition; // 0x94 - TVec3f mPlaneUpVec; // 0xA0 - TVec3f mWorldPlanePosition; // 0xAC - TVec3f mWorldPlaneUpVec; // 0xB8 - f32 mCylinderHeight; // 0xC4 - f32 mCylinderRadius; // 0xC8 - f32 mBaseDistance; // 0xCC - RANGE_TYPE mRangeType; // 0xD0 - DISTANCE_CALC_TYPE mDistanceCalcType; // 0xD4 + TPos3f mLocalMtx; // 0x28 + TPos3f mWorldMtx; // 0x58 + f32 mExtentX; // 0x88 + f32 mExtentY; // 0x8C + f32 mExtentZ; // 0x90 + TVec3f mPlanePosition; // 0x94 + TVec3f mPlaneUpVec; // 0xA0 + TVec3f mWorldPlanePosition; // 0xAC + TVec3f mWorldPlaneUpVec; // 0xB8 + f32 mCylinderHeight; // 0xC4 + f32 mCylinderRadius; // 0xC8 + f32 mBaseDistance; // 0xCC + RANGE_TYPE mRangeType; // 0xD0 + DISTANCE_CALC_TYPE mDistanceCalcType; // 0xD4 }; diff --git a/include/Game/Gravity/PlanetGravity.hpp b/include/Game/Gravity/PlanetGravity.hpp index b8dd9d5e5..696b76d40 100644 --- a/include/Game/Gravity/PlanetGravity.hpp +++ b/include/Game/Gravity/PlanetGravity.hpp @@ -17,33 +17,33 @@ class NameObj; class PlanetGravity { public: - PlanetGravity(); + PlanetGravity(); - virtual void updateMtx(const TPos3f &rMtx) {} + virtual void updateMtx(const TPos3f& rMtx) {} - virtual bool calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f &rPosition) const { - return false; - } + virtual bool calcOwnGravityVector(TVec3f* pDest, f32* pScalar, const TVec3f& rPosition) const { + return false; + } - bool calcGravity(TVec3f *pDest, const TVec3f &rPosition) const; - bool calcGravityFromMassPosition(TVec3f *pDirection, f32 *pScalar, const TVec3f &rPosition, const TVec3f &rMassPosition) const; + bool calcGravity(TVec3f* pDest, const TVec3f& rPosition) const; + bool calcGravityFromMassPosition(TVec3f* pDirection, f32* pScalar, const TVec3f& rPosition, const TVec3f& rMassPosition) const; - bool isInRangeSquare(f32 radius) const; - bool isInRangeDistance(f32 radius) const; + bool isInRangeSquare(f32 radius) const; + bool isInRangeDistance(f32 radius) const; - void setPriority(s32 priority); - void updateIdentityMtx(); + void setPriority(s32 priority); + void updateIdentityMtx(); - f32 mRange; // 0x4 - f32 mDistant; // 0x8 - s32 mPriority; // 0xC - s32 mGravityId; // 0x10, read from the stage files but never used - const void* mHost; // 0x14, host object pointer, can be any pointer - u32 mGravityType; // 0x18, gravity type bits - s32 mGravityPower; // 0x1C, gravity power type - bool mActivated; // 0x20, corresponding GlobalGravityObj has switch activated? - bool mIsInverse; // 0x21, invert gravity vector? - bool mValidFollower; // 0x22 - bool mIsRegistered; // 0x23, is registered by PlanetGravityManager? - bool mAppeared; // 0x24, corresponding GlobalGravityObj has appeared? + f32 mRange; // 0x4 + f32 mDistant; // 0x8 + s32 mPriority; // 0xC + s32 mGravityId; // 0x10, read from the stage files but never used + const void* mHost; // 0x14, host object pointer, can be any pointer + u32 mGravityType; // 0x18, gravity type bits + s32 mGravityPower; // 0x1C, gravity power type + bool mActivated; // 0x20, corresponding GlobalGravityObj has switch activated? + bool mIsInverse; // 0x21, invert gravity vector? + bool mValidFollower; // 0x22 + bool mIsRegistered; // 0x23, is registered by PlanetGravityManager? + bool mAppeared; // 0x24, corresponding GlobalGravityObj has appeared? }; diff --git a/include/Game/Gravity/PlanetGravityManager.hpp b/include/Game/Gravity/PlanetGravityManager.hpp index 582a69cb8..e5ee9717b 100644 --- a/include/Game/Gravity/PlanetGravityManager.hpp +++ b/include/Game/Gravity/PlanetGravityManager.hpp @@ -8,43 +8,43 @@ /// gravity vector at a specified position in a stage's space. class PlanetGravityManager : public NameObj { public: - /// @brief Constructs a new PlanetGravityManager instance. - /// @param pName The new name assigned to the object. - PlanetGravityManager(const char *pName); + /// @brief Constructs a new PlanetGravityManager instance. + /// @param pName The new name assigned to the object. + PlanetGravityManager(const char* pName); - virtual ~PlanetGravityManager() {} + virtual ~PlanetGravityManager() {} - /// @brief Effectively does nothing. - /// @param rIter Reference to the JMapInfoIter that supplies BCSV information. - virtual void init(const JMapInfoIter &rIter); + /// @brief Effectively does nothing. + /// @param rIter Reference to the JMapInfoIter that supplies BCSV information. + virtual void init(const JMapInfoIter& rIter); - /// @brief Calculates the total gravity vector at the specified position in space. If the object that requests gravity - /// matches the host of one or more gravity instances, these instances won't be taken into account when calculating - /// the total gravity vector. Furthermore, gravity instances that do not affect the specified gravity contexts will be - /// ignored as well. - /// - /// @param pGravity The 3D vector to store the total gravity vector in. - /// @param pInfo Holder to be filled with information about highest priority gravity affecting the position. - /// @param rPosition The position in space to calculate the gravity at. - /// @param gravityType The affected gravity context (normal, shadow, magnet, etc.) - /// @param requester The pointer of the object requesting the gravity vector. - bool calcTotalGravityVector(TVec3f *pGravity, GravityInfo *pInfo, const TVec3f &rPosition, u32 gravityType, u32 requester) const; + /// @brief Calculates the total gravity vector at the specified position in space. If the object that requests gravity + /// matches the host of one or more gravity instances, these instances won't be taken into account when calculating + /// the total gravity vector. Furthermore, gravity instances that do not affect the specified gravity contexts will be + /// ignored as well. + /// + /// @param pGravity The 3D vector to store the total gravity vector in. + /// @param pInfo Holder to be filled with information about highest priority gravity affecting the position. + /// @param rPosition The position in space to calculate the gravity at. + /// @param gravityType The affected gravity context (normal, shadow, magnet, etc.) + /// @param requester The pointer of the object requesting the gravity vector. + bool calcTotalGravityVector(TVec3f* pGravity, GravityInfo* pInfo, const TVec3f& rPosition, u32 gravityType, u32 requester) const; - /// @brief Registers a PlanetGravity instance to the array of gravities. The higher the gravity's priority is, the - /// closer it will be placed towards the array's beginning. - /// - /// @param pGravity The PlanetGravity instance to be registered. - void registerGravity(PlanetGravity *pGravity); + /// @brief Registers a PlanetGravity instance to the array of gravities. The higher the gravity's priority is, the + /// closer it will be placed towards the array's beginning. + /// + /// @param pGravity The PlanetGravity instance to be registered. + void registerGravity(PlanetGravity* pGravity); private: - /// @brief Sorts all PlanetGravity instances by their priority in reverse order. The higher the priority is, the lower - /// it gets positioned in the array. - void sortGravities(); + /// @brief Sorts all PlanetGravity instances by their priority in reverse order. The higher the priority is, the lower + /// it gets positioned in the array. + void sortGravities(); - /// @brief Swaps the PlanetGravity instance at the specified index with the one instance right before it. - /// @param i The index of the instance to be bubbled down. - void bubbleDown(int i); + /// @brief Swaps the PlanetGravity instance at the specified index with the one instance right before it. + /// @param i The index of the instance to be bubbled down. + void bubbleDown(int i); - /* 0x00C*/ PlanetGravity* mGravities[128]; // > mPoints; // 0x28 + MR::Vector> mPoints; // 0x28 }; diff --git a/include/Game/LiveActor/ActiveActorList.hpp b/include/Game/LiveActor/ActiveActorList.hpp index 2f99ecd5a..f6c36857c 100644 --- a/include/Game/LiveActor/ActiveActorList.hpp +++ b/include/Game/LiveActor/ActiveActorList.hpp @@ -9,18 +9,17 @@ class ActiveActorList { public: ActiveActorList(int); - bool hasTooMany() const - { + bool hasTooMany() const { return (mCurCount >= mMaxCount); } bool isFull() const; - void addActor(LiveActor *); + void addActor(LiveActor*); void removeDeadActor(); void clear(); void killAll(); LiveActor** mActorList; // 0x0 - s32 mCurCount; // 0x4 - int mMaxCount; // 0x8 + s32 mCurCount; // 0x4 + int mMaxCount; // 0x8 }; \ No newline at end of file diff --git a/include/Game/LiveActor/ActorAnimKeeper.hpp b/include/Game/LiveActor/ActorAnimKeeper.hpp index dab935c96..5170f7207 100644 --- a/include/Game/LiveActor/ActorAnimKeeper.hpp +++ b/include/Game/LiveActor/ActorAnimKeeper.hpp @@ -5,23 +5,23 @@ class LiveActor; struct ActorAnimDataInfo { - const char* mName; // 0x0 - f32 mStartFrame; // 0x4 - u8 mIsKeepAnim; // 0x8 + const char* mName; // 0x0 + f32 mStartFrame; // 0x4 + u8 mIsKeepAnim; // 0x8 }; class ActorAnimKeeper { public: - ActorAnimKeeper(LiveActor *); + ActorAnimKeeper(LiveActor*); - void start(const char *); + void start(const char*); void update(); - bool isPlaying(const char *) const; + bool isPlaying(const char*) const; - static ActorAnimKeeper* tryCreate(LiveActor *); + static ActorAnimKeeper* tryCreate(LiveActor*); - LiveActor* mActor; // 0x0 - u32 _4; - u32 _8; - u32 _C; + LiveActor* mActor; // 0x0 + u32 _4; + u32 _8; + u32 _C; }; \ No newline at end of file diff --git a/include/Game/LiveActor/ActorCameraInfo.hpp b/include/Game/LiveActor/ActorCameraInfo.hpp index 2de3fb461..2334c6930 100644 --- a/include/Game/LiveActor/ActorCameraInfo.hpp +++ b/include/Game/LiveActor/ActorCameraInfo.hpp @@ -4,7 +4,7 @@ class ActorCameraInfo { public: - ActorCameraInfo(const JMapInfoIter &); + ActorCameraInfo(const JMapInfoIter&); ActorCameraInfo(s32, s32); /* 0x0 */ s32 mCameraSetID; diff --git a/include/Game/LiveActor/ActorJointCtrl.hpp b/include/Game/LiveActor/ActorJointCtrl.hpp index 219d79b13..5af6beb78 100644 --- a/include/Game/LiveActor/ActorJointCtrl.hpp +++ b/include/Game/LiveActor/ActorJointCtrl.hpp @@ -10,25 +10,25 @@ class LiveActor; class ActorJointCtrl { public: - ActorJointCtrl(LiveActor *); + ActorJointCtrl(LiveActor*); - void startDynamicCtrl(const char *, s32); - void endDynamicCtrl(const char *, s32); + void startDynamicCtrl(const char*, s32); + void endDynamicCtrl(const char*, s32); void resetDynamicCtrl(); void startFaceCtrl(s32); void endFaceCtrl(s32); - void setIKEndPosition(const char *, const TVec3f &, f32); - void setIKEndDirection(const char *, const TVec3f &, f32); + void setIKEndPosition(const char*, const TVec3f&, f32); + void setIKEndDirection(const char*, const TVec3f&, f32); void endIKCtrlAll(); void update(); void startUpdate(); void endUpdate(); void setCallBackFunction(); - LiveActor* mActor; // 0x0 - DynamicJointCtrlKeeper* mJointCtrlKeeper; // 0x4 - FaceJointCtrl* mFaceJointCtrl; // 0x8 - IKJointCtrlHolder* mJointCtrlHolder; // 0xC - u8 _10; - u8 _11; + LiveActor* mActor; // 0x0 + DynamicJointCtrlKeeper* mJointCtrlKeeper; // 0x4 + FaceJointCtrl* mFaceJointCtrl; // 0x8 + IKJointCtrlHolder* mJointCtrlHolder; // 0xC + u8 _10; + u8 _11; }; \ No newline at end of file diff --git a/include/Game/LiveActor/ActorLightCtrl.hpp b/include/Game/LiveActor/ActorLightCtrl.hpp index b6d88b040..51a9e5560 100644 --- a/include/Game/LiveActor/ActorLightCtrl.hpp +++ b/include/Game/LiveActor/ActorLightCtrl.hpp @@ -7,29 +7,29 @@ class LiveActor; class ActorLightCtrl { public: - ActorLightCtrl(const LiveActor *); + ActorLightCtrl(const LiveActor*); - void init(int, bool); - void update(bool); - void loadLight() const; - void reset(); - void copy(const ActorLightCtrl *); - bool isSameLight(const ActorLightCtrl *) const; + void init(int, bool); + void update(bool); + void loadLight() const; + void reset(); + void copy(const ActorLightCtrl*); + bool isSameLight(const ActorLightCtrl*) const; const ActorLightInfo* getActorLight() const; - void initActorLightInfo(); - void tryFindNewAreaLight(bool); - void updateLightBlend(); - void resetCurrentLightInfo(); - const ActorLightInfo* getTargetActorLight(const AreaLightInfo *) const; + void initActorLightInfo(); + void tryFindNewAreaLight(bool); + void updateLightBlend(); + void resetCurrentLightInfo(); + const ActorLightInfo* getTargetActorLight(const AreaLightInfo*) const; - const LiveActor* mActor; // 0x0 - s32 _4; - u32 _8; - u8 _C; - AreaLightInfo* mAreaLightInf; // 0x10 - ZoneLightID mLightID; // 0x14 - u32 _1C; - ActorLightInfo mLightInfo; // 0x20 - s32 mInterpolate; // 0x50 - s32 _54; + const LiveActor* mActor; // 0x0 + s32 _4; + u32 _8; + u8 _C; + AreaLightInfo* mAreaLightInf; // 0x10 + ZoneLightID mLightID; // 0x14 + u32 _1C; + ActorLightInfo mLightInfo; // 0x20 + s32 mInterpolate; // 0x50 + s32 _54; }; \ No newline at end of file diff --git a/include/Game/LiveActor/ActorPadAndCameraCtrl.hpp b/include/Game/LiveActor/ActorPadAndCameraCtrl.hpp index 0632bbfa1..3c77b5b14 100644 --- a/include/Game/LiveActor/ActorPadAndCameraCtrl.hpp +++ b/include/Game/LiveActor/ActorPadAndCameraCtrl.hpp @@ -6,6 +6,6 @@ class ModelManager; class ActorPadAndCameraCtrl { public: - static ActorPadAndCameraCtrl* tryCreate(const ModelManager *, const TVec3f *); - void update(); + static ActorPadAndCameraCtrl* tryCreate(const ModelManager*, const TVec3f*); + void update(); }; \ No newline at end of file diff --git a/include/Game/LiveActor/ActorStateBase.hpp b/include/Game/LiveActor/ActorStateBase.hpp index 1bfc98b52..6f74be776 100644 --- a/include/Game/LiveActor/ActorStateBase.hpp +++ b/include/Game/LiveActor/ActorStateBase.hpp @@ -4,18 +4,14 @@ class ActorStateBaseInterface : public NerveExecutor { public: - ActorStateBaseInterface(const char *pName) : - NerveExecutor(pName) - { - + ActorStateBaseInterface(const char* pName) + : NerveExecutor(pName) { } virtual ~ActorStateBaseInterface() { - } virtual void init() { - } virtual void appear() { @@ -29,22 +25,18 @@ public: virtual bool update(); virtual void control() { - } /* 0x8 */ bool mIsDead; }; -template +template class ActorStateBase : public ActorStateBaseInterface { public: - ActorStateBase(const char *pName) : - ActorStateBaseInterface(pName) - { - + ActorStateBase(const char* pName) + : ActorStateBaseInterface(pName) { } virtual ~ActorStateBase() { - } }; diff --git a/include/Game/LiveActor/ActorStateKeeper.hpp b/include/Game/LiveActor/ActorStateKeeper.hpp index 8652eb61a..cf17c8f9b 100644 --- a/include/Game/LiveActor/ActorStateKeeper.hpp +++ b/include/Game/LiveActor/ActorStateKeeper.hpp @@ -5,22 +5,23 @@ class ActorStateKeeper { private: - struct State { - ActorStateBaseInterface* mInterface; - const Nerve* mNerve; - const char* mName; - }; + struct State { + ActorStateBaseInterface* mInterface; + const Nerve* mNerve; + const char* mName; + }; + public: ActorStateKeeper(int capacity); - void addState(ActorStateBaseInterface *, const Nerve *, const char *); - bool updateCurrentState(); - void startState(const Nerve *); - void endState(const Nerve *); - State* findStateInfo(const Nerve *); + void addState(ActorStateBaseInterface*, const Nerve*, const char*); + bool updateCurrentState(); + void startState(const Nerve*); + void endState(const Nerve*); + State* findStateInfo(const Nerve*); - s32 mStatesCapacity; - s32 mLength; - State* mStates; // 0x8 - State* mCurrentState; // 0xC + s32 mStatesCapacity; + s32 mLength; + State* mStates; // 0x8 + State* mCurrentState; // 0xC }; diff --git a/include/Game/LiveActor/AllLiveActorGroup.hpp b/include/Game/LiveActor/AllLiveActorGroup.hpp index 2af72516d..61c7e314d 100644 --- a/include/Game/LiveActor/AllLiveActorGroup.hpp +++ b/include/Game/LiveActor/AllLiveActorGroup.hpp @@ -8,14 +8,14 @@ public: virtual ~AllLiveActorGroup(); - void initActorSystemInfo(const JMapInfoIter &); + void initActorSystemInfo(const JMapInfoIter&); s32 _18; }; namespace MR { AllLiveActorGroup* getAllLiveActorGroup(); - void startInitLiveActorSystemInfo(); - void initLiveActorSystemInfo(const JMapInfoIter &); - void endInitLiveActorSystemInfo(); -}; + void startInitLiveActorSystemInfo(); + void initLiveActorSystemInfo(const JMapInfoIter&); + void endInitLiveActorSystemInfo(); +}; // namespace MR diff --git a/include/Game/LiveActor/AnimationRandomPlayer.hpp b/include/Game/LiveActor/AnimationRandomPlayer.hpp index 6592e2359..af5b24e98 100644 --- a/include/Game/LiveActor/AnimationRandomPlayer.hpp +++ b/include/Game/LiveActor/AnimationRandomPlayer.hpp @@ -5,7 +5,7 @@ class AnimationRandomPlayer : public NerveExecutor { public: - AnimationRandomPlayer(const LiveActor *, const char *, const char *, s32, f32); + AnimationRandomPlayer(const LiveActor*, const char*, const char*, s32, f32); virtual ~AnimationRandomPlayer(); @@ -13,25 +13,25 @@ public: void exeWait(); void exePlay(); - const LiveActor* mActor; // 0x8 - const char* _C; - const char* _10; - s32 _14; - s32 _18; - f32 _1C; + const LiveActor* mActor; // 0x8 + const char* _C; + const char* _10; + s32 _14; + s32 _18; + f32 _1C; }; namespace NrvAnimationRandomPlayer { NERVE(HostTypeWait); NERVE(HostTypePlay); - void HostTypePlay::execute(Spine *pSpine) const { + void HostTypePlay::execute(Spine* pSpine) const { AnimationRandomPlayer* player = reinterpret_cast(pSpine->mExecutor); player->exePlay(); } - void HostTypeWait::execute(Spine *pSpine) const { + void HostTypeWait::execute(Spine* pSpine) const { AnimationRandomPlayer* player = reinterpret_cast(pSpine->mExecutor); player->exeWait(); } -}; \ No newline at end of file +}; // namespace NrvAnimationRandomPlayer \ No newline at end of file diff --git a/include/Game/LiveActor/Binder.hpp b/include/Game/LiveActor/Binder.hpp index 0660ace7f..cfb7335d1 100644 --- a/include/Game/LiveActor/Binder.hpp +++ b/include/Game/LiveActor/Binder.hpp @@ -5,43 +5,42 @@ class BinderParent { public: - inline BinderParent(MtxPtr mtx) - { + inline BinderParent(MtxPtr mtx) { _C = mtx; _0 = 0; _4 = 0; _8 = 0; } - int _0; - int _4; - int _8; + int _0; + int _4; + int _8; MtxPtr _C; }; class Binder : BinderParent { public: - Binder(MtxPtr, const TVec3f *, const TVec3f *, f32, f32, u32); - void clear(); - void setTriangleFilter(TriangleFilterBase *); - const Triangle *getPlane(int) const; - u32 copyPlaneArrayAndSortingSensor(HitInfo **, u32); + Binder(MtxPtr, const TVec3f*, const TVec3f*, f32, f32, u32); + void clear(); + void setTriangleFilter(TriangleFilterBase*); + const Triangle* getPlane(int) const; + u32 copyPlaneArrayAndSortingSensor(HitInfo**, u32); - const TVec3f *_10; - const TVec3f *_14; - f32 mRadius; // 0x18 - f32 _1C; - const TVec3f* mOffsetVec; // 0x20 - u32 _24; - int mPlaneNum; // 0x28 - HitInfo *mPlaneInfos; // 0x2C - TVec3f mFixReactionVector; // 0x30 - HitInfo mGroundInfo; // 0x3c - f32 _C8; - HitInfo mWallInfo; // 0xcc - f32 _158; - HitInfo mRoofInfo; // 0x15c - f32 _1E8; + const TVec3f* _10; + const TVec3f* _14; + f32 mRadius; // 0x18 + f32 _1C; + const TVec3f* mOffsetVec; // 0x20 + u32 _24; + int mPlaneNum; // 0x28 + HitInfo* mPlaneInfos; // 0x2C + TVec3f mFixReactionVector; // 0x30 + HitInfo mGroundInfo; // 0x3c + f32 _C8; + HitInfo mWallInfo; // 0xcc + f32 _158; + HitInfo mRoofInfo; // 0x15c + f32 _1E8; struct { bool _0 : 1; diff --git a/include/Game/LiveActor/ClippingActorHolder.hpp b/include/Game/LiveActor/ClippingActorHolder.hpp index 8317373e0..2203327da 100644 --- a/include/Game/LiveActor/ClippingActorHolder.hpp +++ b/include/Game/LiveActor/ClippingActorHolder.hpp @@ -16,23 +16,23 @@ public: virtual ~ClippingActorHolder(); virtual void movement(); - void registerActor(LiveActor *); - void initSystemInfo(LiveActor *, const JMapInfoIter &); - void initViewGroupTable(); - void entryLodCtrl(LodCtrl *, const JMapInfoIter &); - void validateClipping(LiveActor *); - void invalidateClipping(LiveActor *); - void addToClippingTarget(LiveActor *); - void removeFromClippingTarget(LiveActor *); - ClippingActorInfo* startGroupClipping(LiveActor *, const JMapInfoIter &); - void setTypeToSphere(LiveActor *, f32, const TVec3f *); - void setFarClipLevel(LiveActor *, s32); - ClippingActorInfo* find(const LiveActor *) const; + void registerActor(LiveActor*); + void initSystemInfo(LiveActor*, const JMapInfoIter&); + void initViewGroupTable(); + void entryLodCtrl(LodCtrl*, const JMapInfoIter&); + void validateClipping(LiveActor*); + void invalidateClipping(LiveActor*); + void addToClippingTarget(LiveActor*); + void removeFromClippingTarget(LiveActor*); + ClippingActorInfo* startGroupClipping(LiveActor*, const JMapInfoIter&); + void setTypeToSphere(LiveActor*, f32, const TVec3f*); + void setFarClipLevel(LiveActor*, s32); + ClippingActorInfo* find(const LiveActor*) const; - u32 _C; + u32 _C; ClippingActorInfoList* _10; ClippingActorInfoList* _14; ClippingActorInfoList* _18; ClippingActorInfoList* _1C; - ViewGroupCtrl* mViewGroupCtrl; // 0x20 + ViewGroupCtrl* mViewGroupCtrl; // 0x20 }; \ No newline at end of file diff --git a/include/Game/LiveActor/ClippingActorInfo.hpp b/include/Game/LiveActor/ClippingActorInfo.hpp index 6c824c89a..c1457f02c 100644 --- a/include/Game/LiveActor/ClippingActorInfo.hpp +++ b/include/Game/LiveActor/ClippingActorInfo.hpp @@ -8,20 +8,20 @@ class LiveActor; class ClippingActorInfo { public: - ClippingActorInfo(LiveActor *); + ClippingActorInfo(LiveActor*); void judgeClipping(); bool isJudgedToClip() const; bool isGroupClipping() const; - void setTypeToSphere(f32, const TVec3f *); - void setGroupClippingNo(const JMapInfoIter &); + void setTypeToSphere(f32, const TVec3f*); + void setGroupClippingNo(const JMapInfoIter&); - LiveActor* mActor; // 0x0 - const TVec3f* _4; - f32 _8; - JMapIdInfo* mInfo; // 0xC - s16 mFarClipLevel; // 0x10 - s16 _12; + LiveActor* mActor; // 0x0 + const TVec3f* _4; + f32 _8; + JMapIdInfo* mInfo; // 0xC + s16 mFarClipLevel; // 0x10 + s16 _12; ViewGroupCtrlDataEntry* _14; }; @@ -29,14 +29,14 @@ class ClippingActorInfoList { public: ClippingActorInfoList(int); - void add(ClippingActorInfo *); - ClippingActorInfo* find(const LiveActor *, s32 *) const; - ClippingActorInfo* findOrNone(const LiveActor *) const; - bool isInList(const LiveActor *) const; + void add(ClippingActorInfo*); + ClippingActorInfo* find(const LiveActor*, s32*) const; + ClippingActorInfo* findOrNone(const LiveActor*) const; + bool isInList(const LiveActor*) const; - ClippingActorInfo* remove(LiveActor *); + ClippingActorInfo* remove(LiveActor*); - int _0; - s32 _4; - ClippingActorInfo** mClippingActorList; // 0x8 + int _0; + s32 _4; + ClippingActorInfo** mClippingActorList; // 0x8 }; \ No newline at end of file diff --git a/include/Game/LiveActor/ClippingDirector.hpp b/include/Game/LiveActor/ClippingDirector.hpp index 83917cca4..92c57f6ee 100644 --- a/include/Game/LiveActor/ClippingDirector.hpp +++ b/include/Game/LiveActor/ClippingDirector.hpp @@ -16,18 +16,18 @@ public: virtual void movement(); void endInitActorSystemInfo(); - void registerActor(LiveActor *); - void initActorSystemInfo(LiveActor *, const JMapInfoIter &); - void joinToGroupClipping(LiveActor *, const JMapInfoIter &, int); - void entryLodCtrl(LodCtrl *, const JMapInfoIter &); + void registerActor(LiveActor*); + void initActorSystemInfo(LiveActor*, const JMapInfoIter&); + void joinToGroupClipping(LiveActor*, const JMapInfoIter&, int); + void entryLodCtrl(LodCtrl*, const JMapInfoIter&); - ClippingJudge* mJudge; // 0xC - ClippingActorHolder* mActorHolder; // 0x10 - ClippingGroupHolder* mGroupHolder; // 0x14 + ClippingJudge* mJudge; // 0xC + ClippingActorHolder* mActorHolder; // 0x10 + ClippingGroupHolder* mGroupHolder; // 0x14 }; namespace MR { ClippingDirector* getClippingDirector(); - void addToClippingTarget(LiveActor *); - void removeFromClippingTarget(LiveActor *); -}; + void addToClippingTarget(LiveActor*); + void removeFromClippingTarget(LiveActor*); +}; // namespace MR diff --git a/include/Game/LiveActor/ClippingGroupHolder.hpp b/include/Game/LiveActor/ClippingGroupHolder.hpp index 518c4ef9c..2f80e2727 100644 --- a/include/Game/LiveActor/ClippingGroupHolder.hpp +++ b/include/Game/LiveActor/ClippingGroupHolder.hpp @@ -7,21 +7,21 @@ class ClippingActorInfo; class ClippingInfoGroup : public NameObj { public: - ClippingInfoGroup(const char *, int); + ClippingInfoGroup(const char*, int); virtual ~ClippingInfoGroup(); - void setGroupNo(const JMapInfoIter &); - void registerInfo(ClippingActorInfo *); + void setGroupNo(const JMapInfoIter&); + void registerInfo(ClippingActorInfo*); bool isClippedNowAll() const; void startClippedAll(); void endClippedAll(); - int _C; - s32 _10; + int _C; + s32 _10; ClippingActorInfo** _14; - JMapIdInfo* _18; - u8 _1C; + JMapIdInfo* _18; + u8 _1C; }; class ClippingGroupHolder : public NameObj { @@ -31,11 +31,11 @@ public: virtual ~ClippingGroupHolder(); virtual void movement(); - void createAndAdd(ClippingActorInfo *, const JMapInfoIter &, int); - ClippingInfoGroup* createGroup(ClippingActorInfo *, const JMapInfoIter &, int); + void createAndAdd(ClippingActorInfo*, const JMapInfoIter&, int); + ClippingInfoGroup* createGroup(ClippingActorInfo*, const JMapInfoIter&, int); - ClippingInfoGroup* findGroup(const JMapInfoIter &); + ClippingInfoGroup* findGroup(const JMapInfoIter&); - s32 mNumGroups; // 0xC - ClippingInfoGroup** mInfoGroups; // 0x10 + s32 mNumGroups; // 0xC + ClippingInfoGroup** mInfoGroups; // 0x10 }; \ No newline at end of file diff --git a/include/Game/LiveActor/ClippingJudge.hpp b/include/Game/LiveActor/ClippingJudge.hpp index 6a4e32d5f..15e46564b 100644 --- a/include/Game/LiveActor/ClippingJudge.hpp +++ b/include/Game/LiveActor/ClippingJudge.hpp @@ -5,20 +5,20 @@ class ClippingJudge : public NameObj { public: - ClippingJudge(const char *); + ClippingJudge(const char*); virtual ~ClippingJudge(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); - bool isJudgedToClipFrustum(const TVec3f &, f32) const; - bool isJudgedToClipFrustum(const TVec3f &, f32, s32) const; - void calcViewingVolume(THex3f *, f32); + bool isJudgedToClipFrustum(const TVec3f&, f32) const; + bool isJudgedToClipFrustum(const TVec3f&, f32, s32) const; + void calcViewingVolume(THex3f*, f32); - THex3f mFrustum; // 0xC + THex3f mFrustum; // 0xC THex3f mClipFrustums[0x8]; - f32 mClipDistances[0x8]; + f32 mClipDistances[0x8]; }; namespace MR { diff --git a/include/Game/LiveActor/DisplayListMaker.hpp b/include/Game/LiveActor/DisplayListMaker.hpp index 094cf671d..272fbf488 100644 --- a/include/Game/LiveActor/DisplayListMaker.hpp +++ b/include/Game/LiveActor/DisplayListMaker.hpp @@ -20,40 +20,40 @@ class DisplayListMaker { public: DisplayListMaker(J3DModel*, const ResourceHolder*); - void update(); - void diff(); - void newDifferedDisplayList(); - bool isValidDiff(); - void onPrgFlag(u16, u32); - void onCurFlag(u16, u32); - u32 getDiffFlag(s32) const; - FogCtrl* addFogCtrl(bool); - MatColorCtrl* addMatColorCtrl(const char*, u32, const J3DGXColor*); - TexMtxCtrl* addTexMtxCtrl(const char*); - ProjmapEffectMtxSetter* addProjmapEffectMtxSetter(); - MirrorReflectionMtxSetter* addMirrorReflectionMtxSetter(); - void onCurFlagBpk(const J3DAnmBase *); - void offCurFlagBpk(const J3DAnmBase *); - void onCurFlagBtp(const J3DAnmBase *); - void offCurFlagBtp(const J3DAnmBase *); - void onCurFlagBtk(const J3DAnmBase *); - void offCurFlagBtk(const J3DAnmBase *); - void onCurFlagBrk(const J3DAnmBase *); - void offCurFlagBrk(const J3DAnmBase *); - void push(MaterialCtrl*); - void onBothFlag(u16, u32); - void onBothFlagAll(u32); - void checkMaterial(); - void checkViewProjmapEffectMtx(); - ViewProjmapEffectMtxSetter* addViewProjmapEffectMtxSetter(); + void update(); + void diff(); + void newDifferedDisplayList(); + bool isValidDiff(); + void onPrgFlag(u16, u32); + void onCurFlag(u16, u32); + u32 getDiffFlag(s32) const; + FogCtrl* addFogCtrl(bool); + MatColorCtrl* addMatColorCtrl(const char*, u32, const J3DGXColor*); + TexMtxCtrl* addTexMtxCtrl(const char*); + ProjmapEffectMtxSetter* addProjmapEffectMtxSetter(); + MirrorReflectionMtxSetter* addMirrorReflectionMtxSetter(); + void onCurFlagBpk(const J3DAnmBase*); + void offCurFlagBpk(const J3DAnmBase*); + void onCurFlagBtp(const J3DAnmBase*); + void offCurFlagBtp(const J3DAnmBase*); + void onCurFlagBtk(const J3DAnmBase*); + void offCurFlagBtk(const J3DAnmBase*); + void onCurFlagBrk(const J3DAnmBase*); + void offCurFlagBrk(const J3DAnmBase*); + void push(MaterialCtrl*); + void onBothFlag(u16, u32); + void onBothFlagAll(u32); + void checkMaterial(); + void checkViewProjmapEffectMtx(); + ViewProjmapEffectMtxSetter* addViewProjmapEffectMtxSetter(); MarioShadowProjmapMtxSetter* addMarioShadowProjmapMtxSetter(); - void checkTexture(); - bool isExistDiffMaterial(const J3DModelData*); + void checkTexture(); + bool isExistDiffMaterial(const J3DModelData*); - /* 0x00 */ MR::Vector > mMaterialCtrl; - /* 0x0C */ u32 mPrgFlag; - /* 0x10 */ u32 mCurFlag; - /* 0x14 */ J3DModel* mModel; - /* 0x18 */ FogCtrl* mFogCtrl; - /* 0x1C */ ResourceHolder* mResHolder; + /* 0x00 */ MR::Vector> mMaterialCtrl; + /* 0x0C */ u32 mPrgFlag; + /* 0x10 */ u32 mCurFlag; + /* 0x14 */ J3DModel* mModel; + /* 0x18 */ FogCtrl* mFogCtrl; + /* 0x1C */ ResourceHolder* mResHolder; }; diff --git a/include/Game/LiveActor/DynamicJointCtrl.hpp b/include/Game/LiveActor/DynamicJointCtrl.hpp index 2d6127fd2..fd2f6e5fb 100644 --- a/include/Game/LiveActor/DynamicJointCtrl.hpp +++ b/include/Game/LiveActor/DynamicJointCtrl.hpp @@ -20,61 +20,61 @@ public: }; struct DynamicJointCtrlParam { - f32 mGravity; // 0x0 - f32 mFriction; // 0x4 - f32 mAccelRatetoBckPos; // 0x8 - f32 mBendMaxDegree; // 0xC - const char* mJointName; // 0x10 + f32 mGravity; // 0x0 + f32 mFriction; // 0x4 + f32 mAccelRatetoBckPos; // 0x8 + f32 mBendMaxDegree; // 0xC + const char* mJointName; // 0x10 }; class DynamicJointCtrlNode; class DynamicJointCtrl { public: - DynamicJointCtrl(LiveActor *, const char *, const DynamicJointCtrlParam *); + DynamicJointCtrl(LiveActor*, const char*, const DynamicJointCtrlParam*); void init(); void update(); void reset(); void setCallBackFunction(); - LiveActor* mActor; // 0x0 - const char* mName; // 0x4 - u32 _8; - DynamicJointCtrlNode** mCtrlNodes; // 0xC - DynamicJointCtrlParam* mParams; // 0x10 - JointCtrlRate* mControlRate; // 0x14 + LiveActor* mActor; // 0x0 + const char* mName; // 0x4 + u32 _8; + DynamicJointCtrlNode** mCtrlNodes; // 0xC + DynamicJointCtrlParam* mParams; // 0x10 + JointCtrlRate* mControlRate; // 0x14 }; class DynamicJointCtrlNode { public: - DynamicJointCtrlNode(const DynamicJointCtrl *, MtxPtr, f32); + DynamicJointCtrlNode(const DynamicJointCtrl*, MtxPtr, f32); - void update(LiveActor *, const DynamicJointCtrlNode *); + void update(LiveActor*, const DynamicJointCtrlNode*); void reset(); - f32 _0; - TVec3f _4; - TVec3f _10; - TVec3f _1C; - MtxPtr _28; - u32 _2C; - u32 _30; - DynamicJointCtrl* mParentControl; // 0x34 + f32 _0; + TVec3f _4; + TVec3f _10; + TVec3f _1C; + MtxPtr _28; + u32 _2C; + u32 _30; + DynamicJointCtrl* mParentControl; // 0x34 }; class DynamicJointCtrlKeeper { public: - DynamicJointCtrlKeeper(LiveActor *); + DynamicJointCtrlKeeper(LiveActor*); - void update(); - void setCallBackFunction(); - void startCtrl(const char *, s32); - void endCtrl(const char *, s32); - void reset(); - DynamicJointCtrl* findJointCtrl(const char *); + void update(); + void setCallBackFunction(); + void startCtrl(const char*, s32); + void endCtrl(const char*, s32); + void reset(); + DynamicJointCtrl* findJointCtrl(const char*); - LiveActor* mActor; // 0x0 - s32 _4; - DynamicJointCtrl** mControls; // 0x8 + LiveActor* mActor; // 0x0 + s32 _4; + DynamicJointCtrl** mControls; // 0x8 }; \ No newline at end of file diff --git a/include/Game/LiveActor/EffectKeeper.hpp b/include/Game/LiveActor/EffectKeeper.hpp index 36a985f7a..5a4bb816e 100644 --- a/include/Game/LiveActor/EffectKeeper.hpp +++ b/include/Game/LiveActor/EffectKeeper.hpp @@ -11,18 +11,18 @@ class LiveActor; class EffectKeeper { public: - EffectKeeper(const char *, ResourceHolder *, int, const char *); + EffectKeeper(const char*, ResourceHolder*, int, const char*); - void init(LiveActor *); + void init(LiveActor*); void initAfterPlacementForAttributeEffect(MtxPtr); void setBinder(const Binder*); - void addEffect(const char *, LiveActor *); - void registerEffect(const char *, const TVec3f *, const TVec3f *, const TVec3f *, const char *); - void registerEffect(const char *, MtxPtr, const char *, const char *); - void registerEffect(const char *, MtxPtr, const TVec3f *, const char *, const char *); - void registerEffectWithoutSRT(const char *, const char *); + void addEffect(const char*, LiveActor*); + void registerEffect(const char*, const TVec3f*, const TVec3f*, const TVec3f*, const char*); + void registerEffect(const char*, MtxPtr, const char*, const char*); + void registerEffect(const char*, MtxPtr, const TVec3f*, const char*, const char*); + void registerEffectWithoutSRT(const char*, const char*); - void changeEffectName(const char *, const char *); + void changeEffectName(const char*, const char*); void enableSort(); void playEmitterOffClipped(); @@ -30,33 +30,33 @@ public: void clear(); - MultiEmitter* getEmitter(const char *) const; - MultiEmitter* createEmitter(const char *); - void deleteEmitter(const char *); - void forceDeleteEmitter(const char *); - void deleteEmitterAll(); - void forceDeleteEmitterAll(); + MultiEmitter* getEmitter(const char*) const; + MultiEmitter* createEmitter(const char*); + void deleteEmitter(const char*); + void forceDeleteEmitter(const char*); + void deleteEmitterAll(); + void forceDeleteEmitterAll(); - bool isRegisteredEmitter(const char *) const; + bool isRegisteredEmitter(const char*) const; void update(); void onDraw(); void offDraw(); - void updateFloorCode(const Triangle *); + void updateFloorCode(const Triangle*); - const char* _0; - ResourceHolder* mResourceHolder; // 0x4 - const char* mResourceName; // 0x8 - u32 _C; - u32 _10; - u32 _14; - u32 _18; - u32 _1C; - u32 _20; - u32 _24; - u32 _28; - u32 _2C; - u8 _30; + const char* _0; + ResourceHolder* mResourceHolder; // 0x4 + const char* mResourceName; // 0x8 + u32 _C; + u32 _10; + u32 _14; + u32 _18; + u32 _1C; + u32 _20; + u32 _24; + u32 _28; + u32 _2C; + u8 _30; }; diff --git a/include/Game/LiveActor/FaceJointCtrl.hpp b/include/Game/LiveActor/FaceJointCtrl.hpp index 82b9a14ba..64346481b 100644 --- a/include/Game/LiveActor/FaceJointCtrl.hpp +++ b/include/Game/LiveActor/FaceJointCtrl.hpp @@ -8,7 +8,7 @@ class LiveActor; class FaceJointCtrl { public: - FaceJointCtrl(LiveActor *); + FaceJointCtrl(LiveActor*); void init(); void startCtrl(s32); @@ -16,14 +16,14 @@ public: void update(); void setCallBackFunction(); - LiveActor* mHostActor; // 0x0 - f32 _4; - f32 _8; - f32 _C; - f32 _10; - f32 _14; - f32 _18; - f32 _1C; - JointController* mJointController; // 0x20 - JointCtrlRate* mJointCtrlRate; // 0x24 + LiveActor* mHostActor; // 0x0 + f32 _4; + f32 _8; + f32 _C; + f32 _10; + f32 _14; + f32 _18; + f32 _1C; + JointController* mJointController; // 0x20 + JointCtrlRate* mJointCtrlRate; // 0x24 }; \ No newline at end of file diff --git a/include/Game/LiveActor/FlashingCtrl.hpp b/include/Game/LiveActor/FlashingCtrl.hpp index 16f5ae637..0287d3e67 100644 --- a/include/Game/LiveActor/FlashingCtrl.hpp +++ b/include/Game/LiveActor/FlashingCtrl.hpp @@ -4,23 +4,23 @@ class FlashingCtrl : public NameObj { public: - FlashingCtrl(LiveActor *, bool); + FlashingCtrl(LiveActor*, bool); virtual ~FlashingCtrl(); virtual void movement(); void start(int); void end(); - s32 getCurrentInterval() const; + s32 getCurrentInterval() const; bool isNowFlashing() const; bool isNowOn() const; void updateFlashing(); - LiveActor *mActor; // 0xC - bool mToggleDraw; // 0x10 - bool mIsEnded; // 0x11 - u8 mOverrideInterval; // 0x12 - u8 _13; // padding - s32 mTimer; // 0x14 - s32 mFlashStartTime; // 0x18 + LiveActor* mActor; // 0xC + bool mToggleDraw; // 0x10 + bool mIsEnded; // 0x11 + u8 mOverrideInterval; // 0x12 + u8 _13; // padding + s32 mTimer; // 0x14 + s32 mFlashStartTime; // 0x18 }; \ No newline at end of file diff --git a/include/Game/LiveActor/HitSensor.hpp b/include/Game/LiveActor/HitSensor.hpp index b56811344..878984a16 100644 --- a/include/Game/LiveActor/HitSensor.hpp +++ b/include/Game/LiveActor/HitSensor.hpp @@ -19,14 +19,14 @@ public: void invalidateBySystem(); void addHitSensor(HitSensor* pSensor); - /* 0x00 */ u32 mType; - /* 0x04 */ TVec3f mPosition; - /* 0x10 */ f32 mRadius; - /* 0x14 */ u16 mSensorCount; - /* 0x16 */ u16 mGroupSize; - /* 0x18 */ HitSensor** mSensors; + /* 0x00 */ u32 mType; + /* 0x04 */ TVec3f mPosition; + /* 0x10 */ f32 mRadius; + /* 0x14 */ u16 mSensorCount; + /* 0x16 */ u16 mGroupSize; + /* 0x18 */ HitSensor** mSensors; /* 0x1C */ SensorGroup* mSensorGroup; - /* 0x20 */ bool mValidBySystem; - /* 0x21 */ bool mValidByHost; - /* 0x24 */ LiveActor* mHost; + /* 0x20 */ bool mValidBySystem; + /* 0x21 */ bool mValidByHost; + /* 0x24 */ LiveActor* mHost; }; diff --git a/include/Game/LiveActor/HitSensorInfo.hpp b/include/Game/LiveActor/HitSensorInfo.hpp index 7b65c4907..fa0630029 100644 --- a/include/Game/LiveActor/HitSensorInfo.hpp +++ b/include/Game/LiveActor/HitSensorInfo.hpp @@ -7,19 +7,19 @@ class HitSensor; class HitSensorInfo { public: - HitSensorInfo(const char *, HitSensor *, const TVec3f *, MtxPtr, const TVec3f &, bool); + HitSensorInfo(const char*, HitSensor*, const TVec3f*, MtxPtr, const TVec3f&, bool); void update(); void doObjCol(); - const char* mName; // 0x0 - s32 mHashCode; // 0x4 - HitSensor* mSensor; // 0x8 - TVec3f _C; + const char* mName; // 0x0 + s32 mHashCode; // 0x4 + HitSensor* mSensor; // 0x8 + TVec3f _C; const TVec3f* _18; - MtxPtr _1C; - bool _20; - u8 _21; // 0xPadding - u8 _22; - u8 _23; + MtxPtr _1C; + bool _20; + u8 _21; // 0xPadding + u8 _22; + u8 _23; }; diff --git a/include/Game/LiveActor/HitSensorKeeper.hpp b/include/Game/LiveActor/HitSensorKeeper.hpp index 91d14dc50..6e8d680bf 100644 --- a/include/Game/LiveActor/HitSensorKeeper.hpp +++ b/include/Game/LiveActor/HitSensorKeeper.hpp @@ -11,27 +11,27 @@ class HitSensorKeeper { public: HitSensorKeeper(int); - HitSensor* add(const char *, u32, u16, f32, LiveActor *, const TVec3f &); - HitSensor* addPos(const char *, u32, u16, f32, LiveActor *, const TVec3f *, const TVec3f &); - HitSensor* addMtx(const char *, u32, u16, f32, LiveActor *, Mtx, const TVec3f &); - HitSensor* addCallback(const char *, u32, u16, f32, LiveActor *); + HitSensor* add(const char*, u32, u16, f32, LiveActor*, const TVec3f&); + HitSensor* addPos(const char*, u32, u16, f32, LiveActor*, const TVec3f*, const TVec3f&); + HitSensor* addMtx(const char*, u32, u16, f32, LiveActor*, Mtx, const TVec3f&); + HitSensor* addCallback(const char*, u32, u16, f32, LiveActor*); - HitSensor* getSensor(const char *) const; - void update(); - void doObjCol(); - void clear(); - void validate(); - void invalidate(); - void validateBySystem(); - void invalidateBySystem(); + HitSensor* getSensor(const char*) const; + void update(); + void doObjCol(); + void clear(); + void validate(); + void invalidate(); + void validateBySystem(); + void invalidateBySystem(); HitSensorInfo* getNthSensorInfo(int) const; - HitSensorInfo* getSensorInfo(const char *) const; + HitSensorInfo* getSensorInfo(const char*) const; - void registHitSensorInfo(HitSensorInfo *); + void registHitSensorInfo(HitSensorInfo*); - s32 mSensorInfosSize; // 0x0 - s32 mSensorCount; // 0x4 - HitSensorInfo** mSensorInfos; // 0x8 - HitSensor* mTaking; // 0xc - HitSensor* mTaken; // 0x10 + s32 mSensorInfosSize; // 0x0 + s32 mSensorCount; // 0x4 + HitSensorInfo** mSensorInfos; // 0x8 + HitSensor* mTaking; // 0xc + HitSensor* mTaken; // 0x10 }; diff --git a/include/Game/LiveActor/IKJointCtrl.hpp b/include/Game/LiveActor/IKJointCtrl.hpp index d55fa7eba..b7c49fead 100644 --- a/include/Game/LiveActor/IKJointCtrl.hpp +++ b/include/Game/LiveActor/IKJointCtrl.hpp @@ -8,78 +8,78 @@ class LiveActor; struct IKJointCtrlParam { - const char* mName; // 0x0 - f32 mNearLimitRate; // 0x4 - f32 mFarLimitRate; // 0x8 - f32 mEndDirMaxDegree; // 0xC - f32 mEndLocalDirX; // 0x10 - f32 mEndLocalDirY; // 0x14 - f32 mEndLocalDirZ; // 0x18 + const char* mName; // 0x0 + f32 mNearLimitRate; // 0x4 + f32 mFarLimitRate; // 0x8 + f32 mEndDirMaxDegree; // 0xC + f32 mEndLocalDirX; // 0x10 + f32 mEndLocalDirY; // 0x14 + f32 mEndLocalDirZ; // 0x18 }; class IKJointCtrl { public: - IKJointCtrl(LiveActor *); + IKJointCtrl(LiveActor*); - void init(const IKJointCtrlParam &); - void setEndPosition(const TVec3f &, f32); - void setEndDirection(const TVec3f &, f32); + void init(const IKJointCtrlParam&); + void setEndPosition(const TVec3f&, f32); + void setEndDirection(const TVec3f&, f32); void endCtrl(); void setCallBackFunction(); - bool updateRootJointCallBack(TPos3f *, const JointControllerInfo &); - bool updateMiddleJointCallBack(TPos3f *, const JointControllerInfo &); + bool updateRootJointCallBack(TPos3f*, const JointControllerInfo&); + bool updateMiddleJointCallBack(TPos3f*, const JointControllerInfo&); void disableCallBack(); void enableCallBack(); - const char* mName; // 0x0 - TMtx34f _4; - TMtx34f _34; - LiveActor* mActor; // 0x64 - IKJoint* mJoint; // 0x68 - JointControlDelegator* mRootCtrl; // 0x6C - JointControlDelegator* mMiddleCtrl; // 0x70 - JointControlDelegator* mEndCtrl; // 0x74 - TVec3f _78; - TVec3f mEndLocalDir; // 0x84 - f32 _90; - f32 _94; - f32 _98; - f32 mNearLimitRate; // 0x9C - f32 mFarLimitRate; // 0xA0 - f32 mEndDirMaxDegree; // 0xA4 - f32 _A8; - f32 _AC; - u16 _B0; - u16 _B2; - u16 _B4; - u8 _B6; + const char* mName; // 0x0 + TMtx34f _4; + TMtx34f _34; + LiveActor* mActor; // 0x64 + IKJoint* mJoint; // 0x68 + JointControlDelegator* mRootCtrl; // 0x6C + JointControlDelegator* mMiddleCtrl; // 0x70 + JointControlDelegator* mEndCtrl; // 0x74 + TVec3f _78; + TVec3f mEndLocalDir; // 0x84 + f32 _90; + f32 _94; + f32 _98; + f32 mNearLimitRate; // 0x9C + f32 mFarLimitRate; // 0xA0 + f32 mEndDirMaxDegree; // 0xA4 + f32 _A8; + f32 _AC; + u16 _B0; + u16 _B2; + u16 _B4; + u8 _B6; }; -class IKJointCtrlHolder { +class IKJointCtrlHolder { public: - IKJointCtrlHolder(LiveActor *, u32); + IKJointCtrlHolder(LiveActor*, u32); - void addCtrl(const IKJointCtrlParam &); + void addCtrl(const IKJointCtrlParam&); - void setEndPosition(const char *, const TVec3f &, f32); - void setEndDirection(const char *, const TVec3f &, f32); + void setEndPosition(const char*, const TVec3f&, f32); + void setEndDirection(const char*, const TVec3f&, f32); void startUpdate(); - void endUpdate(); - void endCtrlAll(); - void setCallBackFunction(); - IKJointCtrl* findIKJointCtrl(const char *); + void endUpdate(); + void endCtrlAll(); + void setCallBackFunction(); + IKJointCtrl* findIKJointCtrl(const char*); IKJointCtrl** mControls; // 0x0 - s32 mNumControls; // 0x4 - s32 _8; - LiveActor* mActor; // 0xC - u8 _10; + s32 mNumControls; // 0x4 + s32 _8; + LiveActor* mActor; // 0xC + u8 _10; }; class ActorJoint { public: - static IKJointCtrlHolder* createIKJointCtrlHolder(LiveActor *); + static IKJointCtrlHolder* createIKJointCtrlHolder(LiveActor*); }; \ No newline at end of file diff --git a/include/Game/LiveActor/LiveActor.hpp b/include/Game/LiveActor/LiveActor.hpp index 3d807c69a..a6941fd20 100644 --- a/include/Game/LiveActor/LiveActor.hpp +++ b/include/Game/LiveActor/LiveActor.hpp @@ -47,9 +47,9 @@ public: /// @returns A MtxPtr to the base matrix. NULL if there is no model present. virtual MtxPtr getBaseMtx() const; virtual MtxPtr getTakingMtx() const; - virtual void startClipped(); - virtual void endClipped(); - virtual void control(); + virtual void startClipped(); + virtual void endClipped(); + virtual void control(); /// @brief Calculates and sets the base matrix of the actor. virtual void calcAndSetBaseMtx(); @@ -67,26 +67,26 @@ public: void calcAnmMtx(); void setNerve(const Nerve* pNerve); bool isNerve(const Nerve* pNerve) const; - s32 getNerveStep() const; + s32 getNerveStep() const; /// @brief Gets a sensor. /// @param pSensorName The name of the sensor to get. /// @returns The sensor that contains the name given. Returns the result of HitSensorKeeper::getSensor or NULL if there is no HitSensorKeeper created. HitSensor* getSensor(const char* pSensorName) const; - void initModelManagerWithAnm(const char* pModelArcName, const char* pAnimArcName, bool); - void initNerve(const Nerve *); - void initHitSensor(int); - void initBinder(f32, f32, u32); - void initRailRider(const JMapInfoIter& rIter); - void initEffectKeeper(int, const char *, bool); - void initSound(int, bool); - void initShadowControllerList(u32); - void initActorCollisionParts(const char *, HitSensor *, ResourceHolder *, MtxPtr, bool, bool); - void initStageSwitch(const JMapInfoIter& rIter); - void initActorStarPointerTarget(f32, const TVec3f *, MtxPtr, TVec3f); - void initActorLightCtrl(); - void addToSoundObjHolder(); - void updateBinder(); + void initModelManagerWithAnm(const char* pModelArcName, const char* pAnimArcName, bool); + void initNerve(const Nerve*); + void initHitSensor(int); + void initBinder(f32, f32, u32); + void initRailRider(const JMapInfoIter& rIter); + void initEffectKeeper(int, const char*, bool); + void initSound(int, bool); + void initShadowControllerList(u32); + void initActorCollisionParts(const char*, HitSensor*, ResourceHolder*, MtxPtr, bool, bool); + void initStageSwitch(const JMapInfoIter& rIter); + void initActorStarPointerTarget(f32, const TVec3f*, MtxPtr, TVec3f); + void initActorLightCtrl(); + void addToSoundObjHolder(); + void updateBinder(); /// @brief The three-dimensional location vector. /* 0x0C */ TVec3f mPosition; @@ -117,20 +117,20 @@ public: /* 0x58 */ Binder* mBinder; /// @brief A pointer to a `RailRider` instance, used for allowing the actor to ride on paths. - /* 0x5C */ RailRider* mRailRider; - /* 0x60 */ EffectKeeper* mEffectKeeper; + /* 0x5C */ RailRider* mRailRider; + /* 0x60 */ EffectKeeper* mEffectKeeper; /* 0x64 */ AudAnmSoundObject* mSoundObject; /// @brief Flags relating to drawing, animation calculation, etc. /* 0x68 */ LiveActorFlag mFlag; /* 0x74 */ ShadowControllerList* mShadowControllerList; - /* 0x78 */ CollisionParts* mCollisionParts; + /* 0x78 */ CollisionParts* mCollisionParts; /// @brief A pointer to a `StageSwitchCtrl` instance, used for activating and deactivating switches. /* 0x7C */ StageSwitchCtrl* mStageSwitchCtrl; - /* 0x80 */ StarPointerTarget* mStarPointerTarget; - /* 0x84 */ ActorLightCtrl* mActorLightCtrl; + /* 0x80 */ StarPointerTarget* mStarPointerTarget; + /* 0x84 */ ActorLightCtrl* mActorLightCtrl; /* 0x88 */ ActorPadAndCameraCtrl* mCameraCtrl; }; diff --git a/include/Game/LiveActor/LiveActorFlag.hpp b/include/Game/LiveActor/LiveActorFlag.hpp index 07060a723..7db1c6660 100644 --- a/include/Game/LiveActor/LiveActorFlag.hpp +++ b/include/Game/LiveActor/LiveActorFlag.hpp @@ -4,13 +4,13 @@ class LiveActorFlag { public: LiveActorFlag(); - bool mIsDead; // 0x0 - bool mIsStoppedAnim; // 0x1 - bool mIsNoCalcAnim; // 0x2 - bool mIsNoCalcView; // 0x3 - bool mIsHiddenModel; // 0x4 - bool mIsNoBind; // 0x5 - bool mIsCalcGravity; // 0x6 - bool mIsClipped; // 0x7 - bool mIsInvalidClipping; // 0x8 + bool mIsDead; // 0x0 + bool mIsStoppedAnim; // 0x1 + bool mIsNoCalcAnim; // 0x2 + bool mIsNoCalcView; // 0x3 + bool mIsHiddenModel; // 0x4 + bool mIsNoBind; // 0x5 + bool mIsCalcGravity; // 0x6 + bool mIsClipped; // 0x7 + bool mIsInvalidClipping; // 0x8 }; \ No newline at end of file diff --git a/include/Game/LiveActor/LiveActorGroup.hpp b/include/Game/LiveActor/LiveActorGroup.hpp index e6e210294..33aaa0a67 100644 --- a/include/Game/LiveActor/LiveActorGroup.hpp +++ b/include/Game/LiveActor/LiveActorGroup.hpp @@ -6,25 +6,24 @@ class LiveActor; class LiveActorGroup : public NameObjGroup { public: - LiveActorGroup(const char *, int); + LiveActorGroup(const char*, int); virtual ~LiveActorGroup() { - } - void registerActor(LiveActor *); + void registerActor(LiveActor*); LiveActor* getActor(int) const; LiveActor* getDeadActor() const; - s32 getLivingActorNum() const; - void appearAll(); - void killAll(); + s32 getLivingActorNum() const; + void appearAll(); + void killAll(); }; -template +template class DeriveActorGroup : public LiveActorGroup { public: - inline DeriveActorGroup(const char *pName, int maxCount) : LiveActorGroup(pName, maxCount) { - + inline DeriveActorGroup(const char* pName, int maxCount) + : LiveActorGroup(pName, maxCount) { } T* getDeadMember() const NO_INLINE { @@ -36,6 +35,5 @@ public: } ~DeriveActorGroup() { - } }; \ No newline at end of file diff --git a/include/Game/LiveActor/LiveActorGroupArray.hpp b/include/Game/LiveActor/LiveActorGroupArray.hpp index 076dceec1..f769d7a59 100644 --- a/include/Game/LiveActor/LiveActorGroupArray.hpp +++ b/include/Game/LiveActor/LiveActorGroupArray.hpp @@ -7,36 +7,36 @@ class HitSensor; class MsgSharedGroup : public LiveActorGroup { public: - MsgSharedGroup(const char *, s32, const JMapInfoIter &); - + MsgSharedGroup(const char*, s32, const JMapInfoIter&); + virtual ~MsgSharedGroup(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); - void sendMsgToGroupMember(u32, HitSensor *, const char *); + void sendMsgToGroupMember(u32, HitSensor*, const char*); - JMapIdInfo* mIDInfo; // 0x18 - s32 _1C; - HitSensor* _20; + JMapIdInfo* mIDInfo; // 0x18 + s32 _1C; + HitSensor* _20; const char* _24; - char _28[0x30]; + char _28[0x30]; }; class LiveActorGroupArray : public NameObj { public: - LiveActorGroupArray(const char *pName); + LiveActorGroupArray(const char* pName); virtual ~LiveActorGroupArray(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - LiveActorGroup* getLiveActorGroup(const LiveActor *) const; - MsgSharedGroup* createGroup(const JMapInfoIter &, const char *, s32); - LiveActorGroup* findGroup(const LiveActor *) const; - LiveActorGroup* findGroup(const JMapInfoIter &); - LiveActorGroup* entry(LiveActor *, const JMapInfoIter &, const char *, s32); - - MsgSharedGroup* mGroups[0x20]; // 0xC - s32 mNumGroups; // 0x8C + LiveActorGroup* getLiveActorGroup(const LiveActor*) const; + MsgSharedGroup* createGroup(const JMapInfoIter&, const char*, s32); + LiveActorGroup* findGroup(const LiveActor*) const; + LiveActorGroup* findGroup(const JMapInfoIter&); + LiveActorGroup* entry(LiveActor*, const JMapInfoIter&, const char*, s32); + + MsgSharedGroup* mGroups[0x20]; // 0xC + s32 mNumGroups; // 0x8C }; \ No newline at end of file diff --git a/include/Game/LiveActor/LodCtrl.hpp b/include/Game/LiveActor/LodCtrl.hpp index b8d08e507..2f05685c7 100644 --- a/include/Game/LiveActor/LodCtrl.hpp +++ b/include/Game/LiveActor/LodCtrl.hpp @@ -6,9 +6,9 @@ class ActorLightCtrl; class LiveActor; class ModelObj; -class LodCtrl { +class LodCtrl { public: - LodCtrl(LiveActor *, const JMapInfoIter &); + LodCtrl(LiveActor*, const JMapInfoIter&); void offSyncShadowHost(); void appear(); @@ -18,42 +18,42 @@ public: void update(); bool isShowLowModel() const; void setDistanceToMiddle(f32); - f32 calcDistanceToCamera() const; + f32 calcDistanceToCamera() const; void setDistanceToLow(f32); void setDistanceToMiddleAndLow(f32, f32); - void setClippingTypeSphereContainsModelBoundingBox(f32); - void setFarClipping(f32); - void invalidateClipping(); - void showHighModel(); - void showMiddleModel(); - void showLowModel(); - void hideAllModel(); - void setViewCtrlPtr(const bool *, const bool *, const bool *, const bool *); - void createLodModel(int, int, int); - void syncMaterialAnimation(); - void syncJointAnimation(); - void initLightCtrl(); + void setClippingTypeSphereContainsModelBoundingBox(f32); + void setFarClipping(f32); + void invalidateClipping(); + void showHighModel(); + void showMiddleModel(); + void showLowModel(); + void hideAllModel(); + void setViewCtrlPtr(const bool*, const bool*, const bool*, const bool*); + void createLodModel(int, int, int); + void syncMaterialAnimation(); + void syncJointAnimation(); + void initLightCtrl(); ModelObj* initLodModel(int, int, int, bool) const; - f32 _0; - f32 _4; - LiveActor* _8; - LiveActor* mActor; // 0xC - ModelObj* _10; - ModelObj* _14; - u8 _18; - u8 _19; - u8 _1A; - u8 _1B; - const bool* _1C; - const bool* _20; - const bool* _24; - const bool* _28; - s16 mViewGroupID; // 0x2C - ActorLightCtrl* mActorLightCtrl; // 0x30 + f32 _0; + f32 _4; + LiveActor* _8; + LiveActor* mActor; // 0xC + ModelObj* _10; + ModelObj* _14; + u8 _18; + u8 _19; + u8 _1A; + u8 _1B; + const bool* _1C; + const bool* _20; + const bool* _24; + const bool* _28; + s16 mViewGroupID; // 0x2C + ActorLightCtrl* mActorLightCtrl; // 0x30 }; class LodCtrlFunction { - static bool isExistLodLowModel(const char *); + static bool isExistLodLowModel(const char*); }; diff --git a/include/Game/LiveActor/MaterialCtrl.hpp b/include/Game/LiveActor/MaterialCtrl.hpp index 075a796a6..bf766754e 100644 --- a/include/Game/LiveActor/MaterialCtrl.hpp +++ b/include/Game/LiveActor/MaterialCtrl.hpp @@ -6,58 +6,58 @@ class MaterialCtrl { public: - MaterialCtrl(J3DModelData *, const char *); + MaterialCtrl(J3DModelData*, const char*); virtual void update(); - virtual void updateMaterial(J3DMaterial *); + virtual void updateMaterial(J3DMaterial*); - J3DModelData* mModelData; // 0x4 - J3DMaterial* mMaterial; // 0x8 + J3DModelData* mModelData; // 0x4 + J3DMaterial* mMaterial; // 0x8 }; class FogCtrl : public MaterialCtrl { public: - FogCtrl(J3DModelData *, bool); + FogCtrl(J3DModelData*, bool); virtual void update(); - J3DFogInfo mFogInfo; // 0xC - s32 mNumMaterials; // 0x38 - J3DMaterial** mMaterials; // 0x3C + J3DFogInfo mFogInfo; // 0xC + s32 mNumMaterials; // 0x38 + J3DMaterial** mMaterials; // 0x3C }; class MatColorCtrl : public MaterialCtrl { public: - MatColorCtrl(J3DModelData *, const char *, u32, const J3DGXColor *); + MatColorCtrl(J3DModelData*, const char*, u32, const J3DGXColor*); - virtual void updateMaterial(J3DMaterial *); - - u32 mColorChoice; // 0xC - const J3DGXColor* mColor; // 0x10 + virtual void updateMaterial(J3DMaterial*); + + u32 mColorChoice; // 0xC + const J3DGXColor* mColor; // 0x10 }; class ViewProjmapEffectMtxSetter : public MaterialCtrl { public: - ViewProjmapEffectMtxSetter(J3DModelData *); - + ViewProjmapEffectMtxSetter(J3DModelData*); + virtual void update(); - J3DTexMtxInfo** mMatricies; // 0xC - s32 mNumMatricies; // 0x10 + J3DTexMtxInfo** mMatricies; // 0xC + s32 mNumMatricies; // 0x10 }; class TexMtxCtrl : public MaterialCtrl { public: - TexMtxCtrl(J3DModelData *, const char *); + TexMtxCtrl(J3DModelData*, const char*); - void setTexMtx(u32, J3DTexMtx *); + void setTexMtx(u32, J3DTexMtx*); - J3DTexMtx* mMatricies[8]; // 0xC + J3DTexMtx* mMatricies[8]; // 0xC }; class ProjmapEffectMtxSetter { public: void updateMtxUseBaseMtx(); - void updateMtxUseBaseMtxWithLocalOffset(const TVec3f &); + void updateMtxUseBaseMtxWithLocalOffset(const TVec3f&); }; \ No newline at end of file diff --git a/include/Game/LiveActor/MessageSensorHolder.hpp b/include/Game/LiveActor/MessageSensorHolder.hpp index 42301b147..e310be28d 100644 --- a/include/Game/LiveActor/MessageSensorHolder.hpp +++ b/include/Game/LiveActor/MessageSensorHolder.hpp @@ -4,7 +4,7 @@ class MessageSensorHolder : public LiveActor { public: - MessageSensorHolder(const char *); + MessageSensorHolder(const char*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); }; diff --git a/include/Game/LiveActor/MirrorActor.hpp b/include/Game/LiveActor/MirrorActor.hpp index c3a2fe7b3..830fa07d8 100644 --- a/include/Game/LiveActor/MirrorActor.hpp +++ b/include/Game/LiveActor/MirrorActor.hpp @@ -4,22 +4,22 @@ class MirrorActor : public LiveActor { public: - MirrorActor(LiveActor *, const char *, const char *); + MirrorActor(LiveActor*, const char*, const char*); virtual ~MirrorActor(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); virtual void calcAnim(); virtual void calcViewAndEntry(); - bool isHostInTheOtherSideOfMirror() const; + bool isHostInTheOtherSideOfMirror() const; TVec3f& getHostCenterPos() const; LiveActor* _8C; - u32 _90; - u32 _94; - u32 _98; - f32 _9C; - bool _A0; + u32 _90; + u32 _94; + u32 _98; + f32 _9C; + bool _A0; }; \ No newline at end of file diff --git a/include/Game/LiveActor/MirrorCamera.hpp b/include/Game/LiveActor/MirrorCamera.hpp index 5eb7605e4..1f3f112e6 100644 --- a/include/Game/LiveActor/MirrorCamera.hpp +++ b/include/Game/LiveActor/MirrorCamera.hpp @@ -7,27 +7,27 @@ class J3DModelData; class MirrorCamera : public NameObj { public: - MirrorCamera(const char *); + MirrorCamera(const char*); virtual ~MirrorCamera(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); - void setMirrorMapInfo(const TVec3f &, const TVec3f &); - void setMirrorMapInfo(J3DModelData *); + void setMirrorMapInfo(const TVec3f&, const TVec3f&); + void setMirrorMapInfo(J3DModelData*); void updateViewMtx(); void updateModelTexMtx(); - f32 getDistance(const TVec3f &) const; + f32 getDistance(const TVec3f&) const; TVec3f _C; TVec3f _18; - f32 _24; - TPos3f mViewMtx; // 0x28 - TPos3f mModelTexMtx; // 0x58 + f32 _24; + TPos3f mViewMtx; // 0x28 + TPos3f mModelTexMtx; // 0x58 }; namespace MR { MirrorCamera* getMirrorCamera(); - f32 getDistanceToMirror(const TVec3f &); -}; + f32 getDistanceToMirror(const TVec3f&); +}; // namespace MR diff --git a/include/Game/LiveActor/MirrorReflectionModel.hpp b/include/Game/LiveActor/MirrorReflectionModel.hpp index 5f8232c5d..c9a3b58e3 100644 --- a/include/Game/LiveActor/MirrorReflectionModel.hpp +++ b/include/Game/LiveActor/MirrorReflectionModel.hpp @@ -4,16 +4,16 @@ class MirrorReflectionModel : public LiveActor { public: - MirrorReflectionModel(const LiveActor *, const char *, const char *, MtxPtr); + MirrorReflectionModel(const LiveActor*, const char*, const char*, MtxPtr); virtual ~MirrorReflectionModel(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); virtual void calcAnim(); virtual void calcViewAndEntry(); virtual void calcAndSetBaseMtx(); const LiveActor* _8C; - MtxPtr _90; - u8 _94; + MtxPtr _90; + u8 _94; }; diff --git a/include/Game/LiveActor/ModelManager.hpp b/include/Game/LiveActor/ModelManager.hpp index 5889a6c44..344adbe0e 100644 --- a/include/Game/LiveActor/ModelManager.hpp +++ b/include/Game/LiveActor/ModelManager.hpp @@ -22,63 +22,63 @@ public: /// @brief Creates a new `ModelManager`. ModelManager(); - void update(); - void calcAnim(); - void calcView(); - void entry(); - void newDifferedDLBuffer(); - void updateDL(bool); - void startBck(const char*, const char*); - void startBckWithInterpole(const char*, s32); - void startBtk(const char*); - void startBrk(const char*); - void startBtp(const char*); - void startBpk(const char*); - void startBva(const char*); - void stopBtk(); - void stopBrk(); - void stopBtp(); - void stopBpk(); - void stopBva(); - J3DFrameCtrl* getBckCtrl() const; - J3DFrameCtrl* getBtkCtrl() const; - J3DFrameCtrl* getBrkCtrl() const; - J3DFrameCtrl* getBtpCtrl() const; - J3DFrameCtrl* getBpkCtrl() const; - J3DFrameCtrl* getBvaCtrl() const; - bool isBckStopped() const; - bool isBtkStopped() const; - bool isBrkStopped() const; - bool isBtpStopped() const; - bool isBpkStopped() const; - bool isBvaStopped() const; - bool isBtkPlaying(const char*) const; - bool isBrkPlaying(const char*) const; - bool isBpkPlaying(const char*) const; - bool isBtpPlaying(const char*) const; - bool isBvaPlaying(const char*) const; - void initJointTransform(); + void update(); + void calcAnim(); + void calcView(); + void entry(); + void newDifferedDLBuffer(); + void updateDL(bool); + void startBck(const char*, const char*); + void startBckWithInterpole(const char*, s32); + void startBtk(const char*); + void startBrk(const char*); + void startBtp(const char*); + void startBpk(const char*); + void startBva(const char*); + void stopBtk(); + void stopBrk(); + void stopBtp(); + void stopBpk(); + void stopBva(); + J3DFrameCtrl* getBckCtrl() const; + J3DFrameCtrl* getBtkCtrl() const; + J3DFrameCtrl* getBrkCtrl() const; + J3DFrameCtrl* getBtpCtrl() const; + J3DFrameCtrl* getBpkCtrl() const; + J3DFrameCtrl* getBvaCtrl() const; + bool isBckStopped() const; + bool isBtkStopped() const; + bool isBrkStopped() const; + bool isBtpStopped() const; + bool isBpkStopped() const; + bool isBvaStopped() const; + bool isBtkPlaying(const char*) const; + bool isBrkPlaying(const char*) const; + bool isBpkPlaying(const char*) const; + bool isBtpPlaying(const char*) const; + bool isBvaPlaying(const char*) const; + void initJointTransform(); XjointTransform* getJointTransform(const char*); - ResourceHolder* getResourceHolder() const; - ResourceHolder* getModelResourceHolder() const; - J3DModel* getJ3DModel() const; - J3DModelData* getJ3DModelData() const; - const char* getPlayingBckName() const; - void initModelAndAnimation(ResourceHolder*, const char*, ResourceHolder*, J3DMdlFlag); - void initMaterialAnm(); - void initVisibilityAnm(); - void calc(); - void changeBckSetting(const char*, const char*, XanimePlayer*); - void init(const char*, const char*, bool); + ResourceHolder* getResourceHolder() const; + ResourceHolder* getModelResourceHolder() const; + J3DModel* getJ3DModel() const; + J3DModelData* getJ3DModelData() const; + const char* getPlayingBckName() const; + void initModelAndAnimation(ResourceHolder*, const char*, ResourceHolder*, J3DMdlFlag); + void initMaterialAnm(); + void initVisibilityAnm(); + void calc(); + void changeBckSetting(const char*, const char*, XanimePlayer*); + void init(const char*, const char*, bool); - /* 0x00 */ BtkPlayer* mBtkPlayer; - /* 0x04 */ BrkPlayer* mBrkPlayer; - /* 0x08 */ BtpPlayer* mBtpPlayer; - /* 0x0C */ BpkPlayer* mBpkPlayer; - /* 0x10 */ BvaPlayer* mBvaPlayer; + /* 0x00 */ BtkPlayer* mBtkPlayer; + /* 0x04 */ BrkPlayer* mBrkPlayer; + /* 0x08 */ BtpPlayer* mBtpPlayer; + /* 0x0C */ BpkPlayer* mBpkPlayer; + /* 0x10 */ BvaPlayer* mBvaPlayer; /* 0x14 */ XanimeResourceTable* mXanimeResourceTable; - /* 0x18 */ XanimePlayer* mXanimePlayer; - /* 0x1C */ J3DModel* mModel; - /* 0x20 */ ResourceHolder* mModelResourceHolder; - /* 0x24 */ DisplayListMaker* mDisplayListMaker; + /* 0x18 */ XanimePlayer* mXanimePlayer; + /* 0x1C */ J3DModel* mModel; + /* 0x20 */ ResourceHolder* mModelResourceHolder; + /* 0x24 */ DisplayListMaker* mDisplayListMaker; }; diff --git a/include/Game/LiveActor/ModelObj.hpp b/include/Game/LiveActor/ModelObj.hpp index c4bea294e..5cd927771 100644 --- a/include/Game/LiveActor/ModelObj.hpp +++ b/include/Game/LiveActor/ModelObj.hpp @@ -6,9 +6,9 @@ class ModelObj : public LiveActor { public: - ModelObj(const char *, const char *, MtxPtr, int, int, int, bool); + ModelObj(const char*, const char*, MtxPtr, int, int, int, bool); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calcAndSetBaseMtx(); /* 0x8C */ MtxPtr mMtx; @@ -16,14 +16,14 @@ public: class ModelObjNpc : public LiveActor { public: - ModelObjNpc(const char *, const char *, MtxPtr); + ModelObjNpc(const char*, const char*, MtxPtr); virtual ~ModelObjNpc(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); virtual void calcAndSetBaseMtx(); - /* 0x8C */ MtxPtr mMtx; - /* 0x8C */ LodCtrl* mLodCtrl; + /* 0x8C */ MtxPtr mMtx; + /* 0x8C */ LodCtrl* mLodCtrl; /* 0x8C */ ActorJointCtrl* mJointCtrl; }; diff --git a/include/Game/LiveActor/Nerve.hpp b/include/Game/LiveActor/Nerve.hpp index 3adfd48a3..1c0803f44 100644 --- a/include/Game/LiveActor/Nerve.hpp +++ b/include/Game/LiveActor/Nerve.hpp @@ -7,132 +7,118 @@ class Nerve { public: /// @brief Executes a state based on the host actor. /// @param pSpine The spine that contains the host LiveActor to execute the state for. - virtual void execute(Spine *pSpine) const = 0; + virtual void execute(Spine* pSpine) const = 0; /// @brief Executes after the last iteration of a state before it executes another state. /// @param pSpine The spine that contains the host LiveActor to execute the state for. - virtual void executeOnEnd(Spine *pSpine) const; + virtual void executeOnEnd(Spine* pSpine) const; }; /* Defines a basic nerve class */ -#define NERVE(name)\ -class name : public Nerve\ -{\ -public:\ - name() NO_INLINE {\ - };\ - virtual void execute(Spine *) const;\ - static name sInstance;\ -};\ +#define NERVE(name) \ + class name : public Nerve { \ + public: \ + name() NO_INLINE{}; \ + virtual void execute(Spine*) const; \ + static name sInstance; \ + }; /* Defines a basic nerve that overrides the executeOnEnd function */ -#define NERVE_EXECEND(name)\ -class name : public Nerve\ -{\ -public:\ - name() NO_INLINE {\ - };\ - virtual void execute(Spine *) const;\ - virtual void executeOnEnd(Spine *) const;\ - static name sInstance;\ -};\ +#define NERVE_EXECEND(name) \ + class name : public Nerve { \ + public: \ + name() NO_INLINE{}; \ + virtual void execute(Spine*) const; \ + virtual void executeOnEnd(Spine*) const; \ + static name sInstance; \ + }; /* Initializes the static instance of a nerve */ -#define INIT_NERVE(name)\ - name name::sInstance;\ +#define INIT_NERVE(name) \ + name name::sInstance; /* Initalizes the static instance of a nerve and also defines the body of said nerve's execute function */ -#define INIT_NERVE_NEW(name, parent_class, func)\ - name name::sInstance;\ - void name::execute(Spine *pSpine) const { \ - parent_class* actor = reinterpret_cast(pSpine->mExecutor);\ - actor->func();\ - }\ +#define INIT_NERVE_NEW(name, parent_class, func) \ + name name::sInstance; \ + void name::execute(Spine* pSpine) const { \ + parent_class* actor = reinterpret_cast(pSpine->mExecutor); \ + actor->func(); \ + } /* Declares a nerve and also defines the body of the nerve's execution function, which calls a specified member function */ -#define NERVE_DECL(name, parent_class, func)\ -class name : public Nerve\ -{\ -public:\ - name() NO_INLINE {\ - };\ - virtual void execute(Spine *pSpine) const {\ - parent_class* actor = reinterpret_cast(pSpine->mExecutor);\ - actor->func();\ - };\ - static name sInstance;\ -};\ +#define NERVE_DECL(name, parent_class, func) \ + class name : public Nerve { \ + public: \ + name() NO_INLINE{}; \ + virtual void execute(Spine* pSpine) const { \ + parent_class* actor = reinterpret_cast(pSpine->mExecutor); \ + actor->func(); \ + }; \ + static name sInstance; \ + }; /* Declares a nerve and also defines the body of the nerve's execution function, which calls a specified member function */ -#define NERVE_DECL_EXE(name, parent_class, executor_name)\ -class name : public Nerve\ -{\ -public:\ - name() NO_INLINE {\ - };\ - virtual void execute(Spine *pSpine) const {\ - parent_class* actor = reinterpret_cast(pSpine->mExecutor);\ - actor->exe##executor_name();\ - };\ - static name sInstance;\ -};\ +#define NERVE_DECL_EXE(name, parent_class, executor_name) \ + class name : public Nerve { \ + public: \ + name() NO_INLINE{}; \ + virtual void execute(Spine* pSpine) const { \ + parent_class* actor = reinterpret_cast(pSpine->mExecutor); \ + actor->exe##executor_name(); \ + }; \ + static name sInstance; \ + }; /* Declares a nerve and also defines the body of the nerve's execution and executeOnEndfunctions, which calls a specified member function */ -#define NERVE_DECL_ONEND(name, parent_class, func, onEndFunc)\ -class name : public Nerve\ -{\ -public:\ - name() NO_INLINE {\ - };\ - virtual void execute(Spine *pSpine) const {\ - parent_class* actor = reinterpret_cast(pSpine->mExecutor);\ - actor->func();\ - };\ - virtual void executeOnEnd(Spine *pSpine) const {\ - parent_class* actor = reinterpret_cast(pSpine->mExecutor);\ - actor->onEndFunc();\ - };\ - static name sInstance;\ -};\ +#define NERVE_DECL_ONEND(name, parent_class, func, onEndFunc) \ + class name : public Nerve { \ + public: \ + name() NO_INLINE{}; \ + virtual void execute(Spine* pSpine) const { \ + parent_class* actor = reinterpret_cast(pSpine->mExecutor); \ + actor->func(); \ + }; \ + virtual void executeOnEnd(Spine* pSpine) const { \ + parent_class* actor = reinterpret_cast(pSpine->mExecutor); \ + actor->onEndFunc(); \ + }; \ + static name sInstance; \ + }; /* Declares a nerve and also defines the nerve's execute function with an empty body */ -#define NERVE_DECL_NULL(name)\ -class name : public Nerve\ -{\ -public:\ - name() NO_INLINE {}\ - virtual void execute(Spine *pSpine) const {}\ - inline static name* get() {\ - return &sInstance;\ - }\ - static name sInstance;\ -};\ +#define NERVE_DECL_NULL(name) \ + class name : public Nerve { \ + public: \ + name() NO_INLINE {} \ + virtual void execute(Spine* pSpine) const {} \ + inline static name* get() { \ + return &sInstance; \ + } \ + static name sInstance; \ + }; -#define NEW_NERVE(name, parent_class, executor_name)\ -class name : public Nerve\ -{\ -public:\ - virtual void execute(Spine *pSpine) const {\ - parent_class* actor = reinterpret_cast(pSpine->mExecutor);\ - actor->exe##executor_name();\ - };\ - static name sInstance;\ -};\ -name name::sInstance;\ +#define NEW_NERVE(name, parent_class, executor_name) \ + class name : public Nerve { \ + public: \ + virtual void execute(Spine* pSpine) const { \ + parent_class* actor = reinterpret_cast(pSpine->mExecutor); \ + actor->exe##executor_name(); \ + }; \ + static name sInstance; \ + }; \ + name name::sInstance; -#define NEW_NERVE_ONEND(name, parent_class, executor_name, executorOnEnd_name)\ -class name : public Nerve\ -{\ -public:\ - name() NO_INLINE {\ - };\ - virtual void execute(Spine *pSpine) const {\ - parent_class* actor = reinterpret_cast(pSpine->mExecutor);\ - actor->exe##executor_name();\ - };\ - virtual void executeOnEnd(Spine *pSpine) const {\ - parent_class* actor = reinterpret_cast(pSpine->mExecutor);\ - actor->end##executorOnEnd_name();\ - };\ - static name sInstance;\ -};\ -name name::sInstance;\ +#define NEW_NERVE_ONEND(name, parent_class, executor_name, executorOnEnd_name) \ + class name : public Nerve { \ + public: \ + name() NO_INLINE{}; \ + virtual void execute(Spine* pSpine) const { \ + parent_class* actor = reinterpret_cast(pSpine->mExecutor); \ + actor->exe##executor_name(); \ + }; \ + virtual void executeOnEnd(Spine* pSpine) const { \ + parent_class* actor = reinterpret_cast(pSpine->mExecutor); \ + actor->end##executorOnEnd_name(); \ + }; \ + static name sInstance; \ + }; \ + name name::sInstance;\ diff --git a/include/Game/LiveActor/PartsModel.hpp b/include/Game/LiveActor/PartsModel.hpp index 7e941514c..87266bd3c 100644 --- a/include/Game/LiveActor/PartsModel.hpp +++ b/include/Game/LiveActor/PartsModel.hpp @@ -5,10 +5,10 @@ class PartsModel : public LiveActor { public: - PartsModel(LiveActor *, const char *, const char *, MtxPtr, int, bool); + PartsModel(LiveActor*, const char*, const char*, MtxPtr, int, bool); virtual ~PartsModel() {} - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); virtual void calcAnim(); virtual void calcViewAndEntry(); @@ -16,17 +16,17 @@ public: virtual void makeActorDead(); virtual void calcAndSetBaseMtx(); - void initFixedPosition(const TVec3f &, const TVec3f &, const char *); - void initFixedPosition(const char *); - void initFixedPosition(MtxPtr, const TVec3f &, const TVec3f &); - void loadFixedPosition(const char *); + void initFixedPosition(const TVec3f&, const TVec3f&, const char*); + void initFixedPosition(const char*); + void initFixedPosition(MtxPtr, const TVec3f&, const TVec3f&); + void loadFixedPosition(const char*); void offFixedPosNormalizeScale(); - LiveActor* mHost; // 0x8C + LiveActor* mHost; // 0x8C FixedPosition* mFixedPos; // 0x90 - MtxPtr mMtx; // 0x94 - bool mCalcOwnMtx; // 0x98 - bool _99; - bool mIsDead; // 0x9A - bool _9B; + MtxPtr mMtx; // 0x94 + bool mCalcOwnMtx; // 0x98 + bool _99; + bool mIsDead; // 0x9A + bool _9B; }; \ No newline at end of file diff --git a/include/Game/LiveActor/RailRider.hpp b/include/Game/LiveActor/RailRider.hpp index f4425249e..cba049eb5 100644 --- a/include/Game/LiveActor/RailRider.hpp +++ b/include/Game/LiveActor/RailRider.hpp @@ -5,39 +5,39 @@ class RailRider { public: - RailRider(const JMapInfoIter &); + RailRider(const JMapInfoIter&); RailRider(s32, s32); void move(); - void moveToNearestPos(const TVec3f &); - void moveToNearestPoint(const TVec3f &); + void moveToNearestPos(const TVec3f&); + void moveToNearestPoint(const TVec3f&); void moveToNextPoint(); void reverse(); - void calcPosAtCoord(TVec3f *, f32) const; - void calcDirectionAtCoord(TVec3f *, f32) const; - f32 calcNearestPos(const TVec3f &) const; - f32 getTotalLength() const; - f32 getPartLength(int) const; + void calcPosAtCoord(TVec3f*, f32) const; + void calcDirectionAtCoord(TVec3f*, f32) const; + f32 calcNearestPos(const TVec3f&) const; + f32 getTotalLength() const; + f32 getPartLength(int) const; bool isLoop() const; bool isReachedGoal() const; bool isReachedEdge() const; void setCoord(f32); void setSpeed(f32); - bool getRailArgWithInit(const char *, s32 *) const; - bool getRailArgNoInit(const char *, s32 *) const; - f32 getNextPointCoord() const; - f32 getCurrentPointCoord() const; - s32 getPointNum() const; - void copyPointPos(TVec3f *, s32) const; - f32 getPointCoord(s32) const; - void initBezierRail(const JMapInfoIter &, const JMapInfo *); - bool getPointArgS32NoInit(const char *, s32 *, s32) const; - bool getPointArgS32WithInit(const char *, s32 *, s32) const; - bool getCurrentPointArgS32NoInit(const char *, s32 *) const; - bool getCurrentPointArgS32WithInit(const char *, s32 *) const; - bool getNextPointArgS32NoInit(const char *, s32 *) const; - bool getNextPointArgS32WithInit(const char *, s32 *) const; - s32 getNextPointNo() const; + bool getRailArgWithInit(const char*, s32*) const; + bool getRailArgNoInit(const char*, s32*) const; + f32 getNextPointCoord() const; + f32 getCurrentPointCoord() const; + s32 getPointNum() const; + void copyPointPos(TVec3f*, s32) const; + f32 getPointCoord(s32) const; + void initBezierRail(const JMapInfoIter&, const JMapInfo*); + bool getPointArgS32NoInit(const char*, s32*, s32) const; + bool getPointArgS32WithInit(const char*, s32*, s32) const; + bool getCurrentPointArgS32NoInit(const char*, s32*) const; + bool getCurrentPointArgS32WithInit(const char*, s32*) const; + bool getNextPointArgS32NoInit(const char*, s32*) const; + bool getNextPointArgS32WithInit(const char*, s32*) const; + s32 getNextPointNo() const; void syncPosDir(); inline TVec3f getStartPos() { @@ -49,15 +49,15 @@ public: } BezierRail* mBezierRail; // 0x0 - f32 mCoord; // 0x4 - f32 mSpeed; // 0x8 - bool mIsNotReverse; - u8 _D; - u8 _E; - u8 _F; - TVec3f mCurPos; // 0x10 - TVec3f mCurDirection; // 0x1C - TVec3f mStartPos; // 0x28 - TVec3f mEndPos; // 0x34 - s32 mCurPoint; // 0x40 + f32 mCoord; // 0x4 + f32 mSpeed; // 0x8 + bool mIsNotReverse; + u8 _D; + u8 _E; + u8 _F; + TVec3f mCurPos; // 0x10 + TVec3f mCurDirection; // 0x1C + TVec3f mStartPos; // 0x28 + TVec3f mEndPos; // 0x34 + s32 mCurPoint; // 0x40 }; \ No newline at end of file diff --git a/include/Game/LiveActor/SensorHitChecker.hpp b/include/Game/LiveActor/SensorHitChecker.hpp index 8409d2414..8919947cd 100644 --- a/include/Game/LiveActor/SensorHitChecker.hpp +++ b/include/Game/LiveActor/SensorHitChecker.hpp @@ -9,18 +9,18 @@ class HitSensor; class SensorHitChecker : public NameObj { public: - SensorHitChecker(const char *); + SensorHitChecker(const char*); virtual ~SensorHitChecker(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); - void initGroup(HitSensor *); - void doObjColGroup(SensorGroup *, SensorGroup *) const; - void doObjColInSameGroup(SensorGroup *) const; + void initGroup(HitSensor*); + void doObjColGroup(SensorGroup*, SensorGroup*) const; + void doObjColInSameGroup(SensorGroup*) const; - void checkAttack(HitSensor *, HitSensor *) const; + void checkAttack(HitSensor*, HitSensor*) const; SensorGroup* mPlayerGroup; // 0xC SensorGroup* mRideGroup; // 0x10 @@ -32,17 +32,17 @@ public: class SensorGroup { public: - SensorGroup(int, const char *); + SensorGroup(int, const char*); - void add(HitSensor *); - void remove(HitSensor *); + void add(HitSensor*); + void remove(HitSensor*); void clear() const; - s32 mMaxSensors; // 0x0 - s32 mSensorCount; // 0x4 - HitSensor** mSensors; // 0x8 + s32 mMaxSensors; // 0x0 + s32 mSensorCount; // 0x4 + HitSensor** mSensors; // 0x8 }; namespace MR { - void initHitSensorGroup(HitSensor *); + void initHitSensorGroup(HitSensor*); }; \ No newline at end of file diff --git a/include/Game/LiveActor/ShadowController.hpp b/include/Game/LiveActor/ShadowController.hpp index 99f6f722e..73c88bc5f 100644 --- a/include/Game/LiveActor/ShadowController.hpp +++ b/include/Game/LiveActor/ShadowController.hpp @@ -13,17 +13,17 @@ class ShadowController; class ShadowControllerList { public: - ShadowControllerList(LiveActor *, u32); + ShadowControllerList(LiveActor*, u32); - void addController(ShadowController *); - u32 getControllerCount() const; + void addController(ShadowController*); + u32 getControllerCount() const; ShadowController* getController(u32) const; - ShadowController* getController(const char *) const; - void resetCalcCount(); - void requestCalc(); + ShadowController* getController(const char*) const; + void resetCalcCount(); + void requestCalc(); - MR::Vector > mShadowList; // 0x0 - LiveActor* mHost; // 0xC + MR::Vector> mShadowList; // 0x0 + LiveActor* mHost; // 0xC }; class ShadowControllerHolder : public NameObj { @@ -36,64 +36,64 @@ public: void updateController(); - MR::Vector > _C; - MR::Vector > _18; - bool _24; - f32 mFarClip; // 0x28 + MR::Vector> _C; + MR::Vector> _18; + bool _24; + f32 mFarClip; // 0x28 }; class ShadowController { public: - ShadowController(LiveActor *, const char *); + ShadowController(LiveActor*, const char*); - void requestCalc(); - void update(); - void updateFarClipping(f32); - void updateDirection(); - void upateProjection(); + void requestCalc(); + void update(); + void updateFarClipping(f32); + void updateDirection(); + void upateProjection(); ShadowDrawer* getShadowDrawer(); - LiveActor* getHost() const; - void setShadowDrawer(ShadowDrawer *); - void getDropPos(TVec3f *) const; - void getDropDir(TVec3f *) const; - f32 getDropLength() const; - void getProjectionPos(TVec3f *) const; - void getProjectionNormal(TVec3f *) const; - f32 getProjectionLength() const; - bool isProjected() const; - bool isDraw() const; - bool isCalcCollision() const; - bool isCalcGravity() const; - bool isCalcShadowGravity() const; - void setGroupName(const char *); - void setDropPosPtr(const TVec3f *); - void setDropPosMtxPtr(MtxPtr, const TVec3f &); - void setDropPosFix(const TVec3f &); - void setDropDirPtr(const TVec3f *); - void setProjectionPtr(const TVec3f *, const TVec3f *); - void setDropDirFix(const TVec3f &); - void setDropLength(f32); - void setDropStartOffset(f32); - void setDropTypeNormal(); - void setDropTypeSurface(); - void setProjectionFix(const TVec3f &, const TVec3f &, bool); - void onCalcCollision(); - void offCalcCollision(); - void onCalcCollisionOneTime(); - void onCalcDropGravity(); - void onCalcDropGravityOneTime(); - void offCalcDropGravity(); - void onCalcDropPrivateGravity(); - void onCalcDropPrivateGravityOneTime(); - void offCalcDropPrivateGravity(); - void setCollisionPartsFilter(CollisionPartsFilterBase *); - void onFollowHostScale(); - void offFollowHostScale(); - bool isFollowHostScale() const; - void onVisibleSyncHost(); - void offVisibleSyncHost(); - void validate(); - void invalidate(); + LiveActor* getHost() const; + void setShadowDrawer(ShadowDrawer*); + void getDropPos(TVec3f*) const; + void getDropDir(TVec3f*) const; + f32 getDropLength() const; + void getProjectionPos(TVec3f*) const; + void getProjectionNormal(TVec3f*) const; + f32 getProjectionLength() const; + bool isProjected() const; + bool isDraw() const; + bool isCalcCollision() const; + bool isCalcGravity() const; + bool isCalcShadowGravity() const; + void setGroupName(const char*); + void setDropPosPtr(const TVec3f*); + void setDropPosMtxPtr(MtxPtr, const TVec3f&); + void setDropPosFix(const TVec3f&); + void setDropDirPtr(const TVec3f*); + void setProjectionPtr(const TVec3f*, const TVec3f*); + void setDropDirFix(const TVec3f&); + void setDropLength(f32); + void setDropStartOffset(f32); + void setDropTypeNormal(); + void setDropTypeSurface(); + void setProjectionFix(const TVec3f&, const TVec3f&, bool); + void onCalcCollision(); + void offCalcCollision(); + void onCalcCollisionOneTime(); + void onCalcDropGravity(); + void onCalcDropGravityOneTime(); + void offCalcDropGravity(); + void onCalcDropPrivateGravity(); + void onCalcDropPrivateGravityOneTime(); + void offCalcDropPrivateGravity(); + void setCollisionPartsFilter(CollisionPartsFilterBase*); + void onFollowHostScale(); + void offFollowHostScale(); + bool isFollowHostScale() const; + void onVisibleSyncHost(); + void offVisibleSyncHost(); + void validate(); + void invalidate(); void updateProjection(); @@ -101,39 +101,39 @@ public: MR::getSceneObj(SceneObj_ShadowControllerHolder)->_18.push_back(this); } - LiveActor* mActor; // 0x0 - const char* mName; // 0x4 - const char* mGroupName; // 0x8 - ShadowDrawer* mDrawer; // 0xC - HitSensor* mProjectedSensor; // 0x10 - CollisionPartsFilterBase* mCollisionPartsFilter; // 0x14 - MtxPtr _18; - MtxPtr _1C; - const TVec3f* mDropPos; // 0x20 - const TVec3f* mDropDir; // 0x24 - TVec3f* mProjPos; // 0x28 - TVec3f* mProjNorm; // 0x2C - TVec3f _30; - TVec3f _3C; - TVec3f _48; - TVec3f _54; - u8 _60; - u8 _61; - u8 _62; - u8 _63; - u8 _64; - u8 _65; - u8 _66; - u8 _67; - f32 mStartOffset; // 0x68 - f32 mDropLength; // 0x6C - u8 _70; - u8 _71; - u8 _72; + LiveActor* mActor; // 0x0 + const char* mName; // 0x4 + const char* mGroupName; // 0x8 + ShadowDrawer* mDrawer; // 0xC + HitSensor* mProjectedSensor; // 0x10 + CollisionPartsFilterBase* mCollisionPartsFilter; // 0x14 + MtxPtr _18; + MtxPtr _1C; + const TVec3f* mDropPos; // 0x20 + const TVec3f* mDropDir; // 0x24 + TVec3f* mProjPos; // 0x28 + TVec3f* mProjNorm; // 0x2C + TVec3f _30; + TVec3f _3C; + TVec3f _48; + TVec3f _54; + u8 _60; + u8 _61; + u8 _62; + u8 _63; + u8 _64; + u8 _65; + u8 _66; + u8 _67; + f32 mStartOffset; // 0x68 + f32 mDropLength; // 0x6C + u8 _70; + u8 _71; + u8 _72; }; namespace MR { - void addShadowController(ShadowController *); - void requestCalcActorShadowAppear(LiveActor *); - void requestCalcActorShadow(LiveActor *); -}; + void addShadowController(ShadowController*); + void requestCalcActorShadowAppear(LiveActor*); + void requestCalcActorShadow(LiveActor*); +}; // namespace MR diff --git a/include/Game/LiveActor/ShadowDrawer.hpp b/include/Game/LiveActor/ShadowDrawer.hpp index 73c7cf7aa..44dce9fbc 100644 --- a/include/Game/LiveActor/ShadowDrawer.hpp +++ b/include/Game/LiveActor/ShadowDrawer.hpp @@ -6,12 +6,12 @@ class ShadowController; class ShadowDrawer : public NameObj { public: - ShadowDrawer(const char *); + ShadowDrawer(const char*); virtual ~ShadowDrawer(); ShadowController* getController() const; - void setShadowController(ShadowController *); - - ShadowController* mController; // 0xC + void setShadowController(ShadowController*); + + ShadowController* mController; // 0xC }; \ No newline at end of file diff --git a/include/Game/LiveActor/ShadowSurfaceBox.hpp b/include/Game/LiveActor/ShadowSurfaceBox.hpp index 688b7f013..2475d15ca 100644 --- a/include/Game/LiveActor/ShadowSurfaceBox.hpp +++ b/include/Game/LiveActor/ShadowSurfaceBox.hpp @@ -10,6 +10,6 @@ public: virtual ~ShadowSurfaceBox(); virtual void draw() const; - - void setSize(const TVec3f &); + + void setSize(const TVec3f&); }; diff --git a/include/Game/LiveActor/ShadowSurfaceCircle.hpp b/include/Game/LiveActor/ShadowSurfaceCircle.hpp index ddfb92b49..d2b159377 100644 --- a/include/Game/LiveActor/ShadowSurfaceCircle.hpp +++ b/include/Game/LiveActor/ShadowSurfaceCircle.hpp @@ -9,7 +9,7 @@ public: virtual ~ShadowSurfaceCircle(); virtual void draw() const; - + void setRadius(f32); f32 _10; diff --git a/include/Game/LiveActor/ShadowSurfaceDrawer.hpp b/include/Game/LiveActor/ShadowSurfaceDrawer.hpp index 91c3c568e..c86599088 100644 --- a/include/Game/LiveActor/ShadowSurfaceDrawer.hpp +++ b/include/Game/LiveActor/ShadowSurfaceDrawer.hpp @@ -4,7 +4,7 @@ class ShadowSurfaceDrawInit : public NameObj { public: - ShadowSurfaceDrawInit(const char *); + ShadowSurfaceDrawInit(const char*); virtual ~ShadowSurfaceDrawInit(); @@ -13,9 +13,7 @@ public: class ShadowSurfaceDrawer : public ShadowDrawer { public: - ShadowSurfaceDrawer(const char *); + ShadowSurfaceDrawer(const char*); virtual ~ShadowSurfaceDrawer(); - - }; \ No newline at end of file diff --git a/include/Game/LiveActor/ShadowSurfaceOval.hpp b/include/Game/LiveActor/ShadowSurfaceOval.hpp index 26c950a31..eabdcfb94 100644 --- a/include/Game/LiveActor/ShadowSurfaceOval.hpp +++ b/include/Game/LiveActor/ShadowSurfaceOval.hpp @@ -11,8 +11,8 @@ public: virtual ~ShadowSurfaceOval(); virtual void draw() const; - - void setSize(const TVec3f &); + + void setSize(const TVec3f&); void setColor(Color8); void setAlpha(u8); }; diff --git a/include/Game/LiveActor/ShadowVolumeBox.hpp b/include/Game/LiveActor/ShadowVolumeBox.hpp index 890c48f14..30f36d56f 100644 --- a/include/Game/LiveActor/ShadowVolumeBox.hpp +++ b/include/Game/LiveActor/ShadowVolumeBox.hpp @@ -13,10 +13,10 @@ public: virtual void loadModelDrawMtx() const; virtual void drawShape() const; - void setSize(const TVec3f &); + void setSize(const TVec3f&); void makeVertexBuffer() const; - TVec3f mSize; // 0x1C + TVec3f mSize; // 0x1C TVec3f _28; TVec3f _34; TVec3f _40; diff --git a/include/Game/LiveActor/ShadowVolumeCylinder.hpp b/include/Game/LiveActor/ShadowVolumeCylinder.hpp index f13c45009..f0da2917b 100644 --- a/include/Game/LiveActor/ShadowVolumeCylinder.hpp +++ b/include/Game/LiveActor/ShadowVolumeCylinder.hpp @@ -10,5 +10,5 @@ public: void setRadius(f32); - f32 mRadius; // 0x20 + f32 mRadius; // 0x20 }; \ No newline at end of file diff --git a/include/Game/LiveActor/ShadowVolumeDrawer.hpp b/include/Game/LiveActor/ShadowVolumeDrawer.hpp index b3cfb6255..3b7d036d2 100644 --- a/include/Game/LiveActor/ShadowVolumeDrawer.hpp +++ b/include/Game/LiveActor/ShadowVolumeDrawer.hpp @@ -13,7 +13,7 @@ public: class ShadowVolumeDrawer : public ShadowDrawer { public: - ShadowVolumeDrawer(const char *); + ShadowVolumeDrawer(const char*); virtual ~ShadowVolumeDrawer(); @@ -26,12 +26,12 @@ public: void setEndDrawShepeOffset(f32); void onCutDropShadow(); void offCutDropShadow(); - void calcBaseDropPosition(TVec3f *) const; - void calcBaseDropPosition(TVec3f *, const ShadowController *) const; - f32 calcBaseDropLength() const; - f32 calcBaseDropLength(const ShadowController *) const; + void calcBaseDropPosition(TVec3f*) const; + void calcBaseDropPosition(TVec3f*, const ShadowController*) const; + f32 calcBaseDropLength() const; + f32 calcBaseDropLength(const ShadowController*) const; - f32 mStartDrawShapeOffset; // 0x10 - f32 mEndDrawShapeOffset; // 0x14 - bool mIsCutDropShadow; // 0x18 + f32 mStartDrawShapeOffset; // 0x10 + f32 mEndDrawShapeOffset; // 0x14 + bool mIsCutDropShadow; // 0x18 }; \ No newline at end of file diff --git a/include/Game/LiveActor/ShadowVolumeFlatModel.hpp b/include/Game/LiveActor/ShadowVolumeFlatModel.hpp index 10b571881..0d7e24275 100644 --- a/include/Game/LiveActor/ShadowVolumeFlatModel.hpp +++ b/include/Game/LiveActor/ShadowVolumeFlatModel.hpp @@ -6,11 +6,11 @@ class J3DModelData; class ShadowVolumeFlatModel : public ShadowVolumeDrawer { public: - ShadowVolumeFlatModel(const char *); + ShadowVolumeFlatModel(const char*); inline virtual ~ShadowVolumeFlatModel(); virtual void draw() const; - void initModel(const char *); + void initModel(const char*); void setBaseMatrixPtr(MtxPtr); }; diff --git a/include/Game/LiveActor/ShadowVolumeLine.hpp b/include/Game/LiveActor/ShadowVolumeLine.hpp index fad011dc6..f4a92e4f3 100644 --- a/include/Game/LiveActor/ShadowVolumeLine.hpp +++ b/include/Game/LiveActor/ShadowVolumeLine.hpp @@ -10,13 +10,13 @@ public: virtual void loadModelDrawMtx() const; virtual void drawShape() const; - void setFromShadowController(const ShadowController *); - void setToShadowController(const ShadowController *); + void setFromShadowController(const ShadowController*); + void setToShadowController(const ShadowController*); void setFromWidth(f32); void setToWidth(f32); - const ShadowController* mFromShadowController; // 0x1C - const ShadowController* mToShadowController; // 0x20 - f32 mFromWidth; // 0x24 - f32 mToWidth; // 0x28 + const ShadowController* mFromShadowController; // 0x1C + const ShadowController* mToShadowController; // 0x20 + f32 mFromWidth; // 0x24 + f32 mToWidth; // 0x28 }; \ No newline at end of file diff --git a/include/Game/LiveActor/ShadowVolumeModel.hpp b/include/Game/LiveActor/ShadowVolumeModel.hpp index 9c15352e0..3ad2daf5b 100644 --- a/include/Game/LiveActor/ShadowVolumeModel.hpp +++ b/include/Game/LiveActor/ShadowVolumeModel.hpp @@ -6,12 +6,12 @@ class J3DModelData; class ShadowVolumeModel : public ShadowVolumeDrawer { public: - ShadowVolumeModel(const char *); + ShadowVolumeModel(const char*); inline virtual ~ShadowVolumeModel(); virtual void drawShape() const; - void initVolumeModel(const char *); + void initVolumeModel(const char*); - J3DModelData* mModelData; // 0x1C + J3DModelData* mModelData; // 0x1C }; diff --git a/include/Game/LiveActor/ShadowVolumeOval.hpp b/include/Game/LiveActor/ShadowVolumeOval.hpp index 00374e801..f8adf571b 100644 --- a/include/Game/LiveActor/ShadowVolumeOval.hpp +++ b/include/Game/LiveActor/ShadowVolumeOval.hpp @@ -8,7 +8,7 @@ public: virtual bool isDraw() const; - void setSize(const TVec3f &); + void setSize(const TVec3f&); - TVec3f mSize; // 0x20 + TVec3f mSize; // 0x20 }; \ No newline at end of file diff --git a/include/Game/LiveActor/ShadowVolumeOvalPole.hpp b/include/Game/LiveActor/ShadowVolumeOvalPole.hpp index 5bd3cba96..b9c6d9196 100644 --- a/include/Game/LiveActor/ShadowVolumeOvalPole.hpp +++ b/include/Game/LiveActor/ShadowVolumeOvalPole.hpp @@ -9,7 +9,7 @@ public: virtual ~ShadowVolumeOvalPole(); virtual void loadModelDrawMtx() const; - void setSize(const TVec3f &); + void setSize(const TVec3f&); - TVec3f mSize; // 0x20 + TVec3f mSize; // 0x20 }; \ No newline at end of file diff --git a/include/Game/LiveActor/ShadowVolumeSphere.hpp b/include/Game/LiveActor/ShadowVolumeSphere.hpp index d3c10d06c..a404b84e2 100644 --- a/include/Game/LiveActor/ShadowVolumeSphere.hpp +++ b/include/Game/LiveActor/ShadowVolumeSphere.hpp @@ -12,5 +12,5 @@ public: void setRadius(f32); - f32 mRadius; // 0x20 + f32 mRadius; // 0x20 }; \ No newline at end of file diff --git a/include/Game/LiveActor/Spine.hpp b/include/Game/LiveActor/Spine.hpp index 0a01ef845..5af786331 100644 --- a/include/Game/LiveActor/Spine.hpp +++ b/include/Game/LiveActor/Spine.hpp @@ -7,17 +7,17 @@ class Nerve; class Spine { public: - Spine(void *, const Nerve *); + Spine(void*, const Nerve*); - void update(); - void setNerve(const Nerve *); + void update(); + void setNerve(const Nerve*); const Nerve* getCurrentNerve() const; - void changeNerve(); - void initStateKeeper(int); + void changeNerve(); + void initStateKeeper(int); - /* 0x00 */ void* mExecutor; - /* 0x04 */ const Nerve* mCurrNerve; - /* 0x08 */ const Nerve* mNextNerve; - /* 0x0C */ s32 mStep; + /* 0x00 */ void* mExecutor; + /* 0x04 */ const Nerve* mCurrNerve; + /* 0x08 */ const Nerve* mNextNerve; + /* 0x0C */ s32 mStep; /* 0x10 */ ActorStateKeeper* mStateKeeper; }; diff --git a/include/Game/LiveActor/SpotMarkLight.hpp b/include/Game/LiveActor/SpotMarkLight.hpp index c19784aaa..543e4cb51 100644 --- a/include/Game/LiveActor/SpotMarkLight.hpp +++ b/include/Game/LiveActor/SpotMarkLight.hpp @@ -4,7 +4,7 @@ class SpotMarkLight : public PartsModel { public: - SpotMarkLight(LiveActor *, f32, f32, MtxPtr); + SpotMarkLight(LiveActor*, f32, f32, MtxPtr); virtual ~SpotMarkLight(); virtual void control(); diff --git a/include/Game/LiveActor/ViewGroupCtrl.hpp b/include/Game/LiveActor/ViewGroupCtrl.hpp index 4f13946c4..73b7915b7 100644 --- a/include/Game/LiveActor/ViewGroupCtrl.hpp +++ b/include/Game/LiveActor/ViewGroupCtrl.hpp @@ -15,16 +15,16 @@ class ViewGroupCtrl { public: ViewGroupCtrl(); - void initActorInfo(ClippingActorInfo *, s32); - void initViewGroup(ClippingActorInfoList *); + void initActorInfo(ClippingActorInfo*, s32); + void initViewGroup(ClippingActorInfoList*); void endInitViewGroupTable(); - void entryLodCtrl(LodCtrl *, const JMapInfoIter &); + void entryLodCtrl(LodCtrl*, const JMapInfoIter&); void update(); void startInitViewGroupTable(); - AreaObjMgr* mViewCubeMgr; // 0x0 - s32 mMaxViewGroupId; // 0x4 - ViewGroupCtrlDataEntry* mViewGroupData; // 0x8 - u32 mViewCtrlCount; // 0xC - LodCtrl** mLodCtrls; // 0x10 + AreaObjMgr* mViewCubeMgr; // 0x0 + s32 mMaxViewGroupId; // 0x4 + ViewGroupCtrlDataEntry* mViewGroupData; // 0x8 + u32 mViewCtrlCount; // 0xC + LodCtrl** mLodCtrls; // 0x10 }; \ No newline at end of file diff --git a/include/Game/LiveActor/VolumeModelDrawer.hpp b/include/Game/LiveActor/VolumeModelDrawer.hpp index 4ba3e051f..2a3183c59 100644 --- a/include/Game/LiveActor/VolumeModelDrawer.hpp +++ b/include/Game/LiveActor/VolumeModelDrawer.hpp @@ -13,15 +13,14 @@ public: class VolumeModelDrawer : public NameObj { public: - VolumeModelDrawer(const char *, const char *, MtxPtr); + VolumeModelDrawer(const char*, const char*, MtxPtr); virtual ~VolumeModelDrawer(); virtual void draw() const; void loadModelDrawMtx() const; - - MtxPtr mMtx; // 0xC - J3DModelData* mModelData; // 0x10 - _GXColor mColor; // 0x14 + MtxPtr mMtx; // 0xC + J3DModelData* mModelData; // 0x10 + _GXColor mColor; // 0x14 }; \ No newline at end of file diff --git a/include/Game/Map/ActorAppearSwitchListener.hpp b/include/Game/Map/ActorAppearSwitchListener.hpp index 40a7e0c7a..3f741328c 100644 --- a/include/Game/Map/ActorAppearSwitchListener.hpp +++ b/include/Game/Map/ActorAppearSwitchListener.hpp @@ -7,8 +7,7 @@ public: virtual void refresh(bool useOn) { if (useOn) { listenSwitchOnEvent(); - } - else { + } else { listenSwitchOffEvent(); } } @@ -19,12 +18,12 @@ public: class ActorAppearSwitchListener : public SwitchEventListener { public: - ActorAppearSwitchListener(LiveActor *, bool, bool); + ActorAppearSwitchListener(LiveActor*, bool, bool); virtual void listenSwitchOnEvent(); virtual void listenSwitchOffEvent(); - LiveActor* mActor; // 0x4 - bool mUsesOn; // 0x8 - bool mUsesOff; // 0x9 + LiveActor* mActor; // 0x4 + bool mUsesOn; // 0x8 + bool mUsesOff; // 0x9 }; diff --git a/include/Game/Map/Air.hpp b/include/Game/Map/Air.hpp index d33f8e9d6..ed3adb1a3 100644 --- a/include/Game/Map/Air.hpp +++ b/include/Game/Map/Air.hpp @@ -4,12 +4,12 @@ class Air : public LiveActor { public: - Air(const char *); + Air(const char*); virtual ~Air(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); - virtual void initModel(const char *); + virtual void initModel(const char*); virtual void setFarClipping(); bool isDrawing() const; @@ -19,22 +19,22 @@ public: void exeIn(); void exeOut(); - u8 _8C; + u8 _8C; bool _8D; - f32 mDistance; // 0x90 + f32 mDistance; // 0x90 }; class ProjectionMapAir : public Air { public: - ProjectionMapAir(const char *); + ProjectionMapAir(const char*); virtual ~ProjectionMapAir(); - virtual void initModel(const char *); + virtual void initModel(const char*); }; class AirFar100m : public Air { public: - AirFar100m(const char *); + AirFar100m(const char*); virtual ~AirFar100m(); virtual void setFarClipping(); @@ -42,7 +42,7 @@ public: class PriorDrawAir : public Air { public: - PriorDrawAir(const char *); + PriorDrawAir(const char*); virtual ~PriorDrawAir(); }; @@ -53,11 +53,11 @@ public: virtual ~PriorDrawAirHolder(); - void add(PriorDrawAir *); + void add(PriorDrawAir*); bool isExistValidDrawAir() const; - PriorDrawAir* mAirs[8]; // 0xC - s32 mAirCount; // 0x2C + PriorDrawAir* mAirs[8]; // 0xC + s32 mAirCount; // 0x2C }; namespace MR { diff --git a/include/Game/Map/BezierRail.hpp b/include/Game/Map/BezierRail.hpp index a3a969b31..2bfe59d13 100644 --- a/include/Game/Map/BezierRail.hpp +++ b/include/Game/Map/BezierRail.hpp @@ -6,58 +6,55 @@ class RailPart; namespace { - void calcRailDirection(TVec3f *, const RailPart *, f32); + void calcRailDirection(TVec3f*, const RailPart*, f32); }; class BezierRailPart { public: - inline BezierRailPart() { } + inline BezierRailPart() {} - void set(const TVec3f &, const TVec3f &, const TVec3f &, const TVec3f &); - void calcPos(TVec3f *, f32) const; - void calcVelocity(TVec3f *, f32) const; + void set(const TVec3f&, const TVec3f&, const TVec3f&, const TVec3f&); + void calcPos(TVec3f*, f32) const; + void calcVelocity(TVec3f*, f32) const; f32 getLength(f32, f32, int); f32 getParam(f32) const; - f32 getNearestParam(const TVec3f &, f32) const; + f32 getNearestParam(const TVec3f&, f32) const; TVec3f _0; TVec3f _C; TVec3f _18; TVec3f _24; - f32 mLength; // 0x30 + f32 mLength; // 0x30 }; class BezierRail { public: + BezierRail(const JMapInfoIter&, const JMapInfo*); - BezierRail(const JMapInfoIter &, const JMapInfo *); - - f32 normalizePos(f32, int) const; - f32 getPartLength(int) const; - void calcPos(TVec3f *, f32) const; - void calcDirection(TVec3f *, f32) const; - void calcPosDir(TVec3f *, TVec3f *, f32) const; - f32 getNearestRailPosCoord(const TVec3f &) const; - f32 getRailPosCoord(int) const; - void calcCurrentRailCtrlPointIter(JMapInfoIter *, f32, bool) const; - void calcRailCtrlPointIter(JMapInfoIter *, int) const; - void getIncludedSection(const RailPart **, f32 *, f32, int) const; - int getCurrentCtrlPointIndex(f32, bool) const; + f32 normalizePos(f32, int) const; + f32 getPartLength(int) const; + void calcPos(TVec3f*, f32) const; + void calcDirection(TVec3f*, f32) const; + void calcPosDir(TVec3f*, TVec3f*, f32) const; + f32 getNearestRailPosCoord(const TVec3f&) const; + f32 getRailPosCoord(int) const; + void calcCurrentRailCtrlPointIter(JMapInfoIter*, f32, bool) const; + void calcRailCtrlPointIter(JMapInfoIter*, int) const; + void getIncludedSection(const RailPart**, f32*, f32, int) const; + int getCurrentCtrlPointIndex(f32, bool) const; f32 getTotalLength() const; - - - bool mIsClosed; // 0x0 - u8 _1; - u8 _2; - u8 _3; - u32 mPointNum; // 0x4 - u32 _8; - RailPart* mRailParts; // 0xC - f32* _10; - JMapInfoIter* mIter; // 0x14 - JMapInfo* _18; + bool mIsClosed; // 0x0 + u8 _1; + u8 _2; + u8 _3; + u32 mPointNum; // 0x4 + u32 _8; + RailPart* mRailParts; // 0xC + f32* _10; + JMapInfoIter* mIter; // 0x14 + JMapInfo* _18; }; \ No newline at end of file diff --git a/include/Game/Map/CollisionCategorizedKeeper.hpp b/include/Game/Map/CollisionCategorizedKeeper.hpp index 868489953..57f210ff4 100644 --- a/include/Game/Map/CollisionCategorizedKeeper.hpp +++ b/include/Game/Map/CollisionCategorizedKeeper.hpp @@ -14,49 +14,49 @@ public: virtual ~CollisionCategorizedKeeper(); virtual void movement(); - void addToZone(CollisionParts *, s32); - void removeFromZone(CollisionParts *, s32); - void addToGlobal(CollisionParts *); - void removeFromGlobal(CollisionParts *); + void addToZone(CollisionParts*, s32); + void removeFromZone(CollisionParts*, s32); + void addToGlobal(CollisionParts*); + void removeFromGlobal(CollisionParts*); - void checkStrikePoint(const TVec3f &, HitInfo *); - void checkStrikeBall(const TVec3f &, f32, bool, const CollisionPartsFilterBase *, const TriangleFilterBase *); - void checkStrikeBallWithThickness(const TVec3f &, f32, f32, const CollisionPartsFilterBase *, const TriangleFilterBase *); - void checkStrikeLine(const TVec3f &, const TVec3f &, s32, const CollisionPartsFilterBase *, const TriangleFilterBase *); - void createAreaPolygonList(Triangle *, u32, const TVec3f &, const TVec3f &); - void createAreaPolygonListArray(Triangle *, u32, TVec3f *, u32); - void isSphereOverlappingWithBox(const TVec3f &, const TVec3f &, const TVec3f &, f32); - void searchSameHostParts(CollisionParts **, CollisionParts *) const; - void getStrikeInfo(u32); - CollisionZone *getZone(int); + void checkStrikePoint(const TVec3f&, HitInfo*); + void checkStrikeBall(const TVec3f&, f32, bool, const CollisionPartsFilterBase*, const TriangleFilterBase*); + void checkStrikeBallWithThickness(const TVec3f&, f32, f32, const CollisionPartsFilterBase*, const TriangleFilterBase*); + void checkStrikeLine(const TVec3f&, const TVec3f&, s32, const CollisionPartsFilterBase*, const TriangleFilterBase*); + void createAreaPolygonList(Triangle*, u32, const TVec3f&, const TVec3f&); + void createAreaPolygonListArray(Triangle*, u32, TVec3f*, u32); + void isSphereOverlappingWithBox(const TVec3f&, const TVec3f&, const TVec3f&, f32); + void searchSameHostParts(CollisionParts**, CollisionParts*) const; + void getStrikeInfo(u32); + CollisionZone* getZone(int); - HitInfo* mHitInfoArray; // 0xC - s32 _10; - s32 mZoneCount; // 0x14 - CollisionZone* mZones[0x20]; // 0x18 - s32 mZoneNum; // 0x98 - u32 _9C; - u8 _A0; - u8 _A1; - u8 _A2; - u8 _A3; + HitInfo* mHitInfoArray; // 0xC + s32 _10; + s32 mZoneCount; // 0x14 + CollisionZone* mZones[0x20]; // 0x18 + s32 mZoneNum; // 0x98 + u32 _9C; + u8 _A0; + u8 _A1; + u8 _A2; + u8 _A3; }; class CollisionZone { public: CollisionZone(s32); - void addParts(CollisionParts *); + void addParts(CollisionParts*); void calcMinMaxAndRadius(); - void calcMinMaxAndRadiusIfMoveOuter(CollisionParts *); + void calcMinMaxAndRadiusIfMoveOuter(CollisionParts*); void addAndUpdateMinMax(TVec3f, TVec3f); - void eraseParts(CollisionParts *); + void eraseParts(CollisionParts*); - s32 mZoneID; // 0x0 + s32 mZoneID; // 0x0 CollisionParts* mPartsArray[0x200]; // 0x4 - s32 mNumParts; // 0x804 - TVec3f _808; - f32 mRadius; // 0x814 - TVec3f _818; - TVec3f _824; + s32 mNumParts; // 0x804 + TVec3f _808; + f32 mRadius; // 0x814 + TVec3f _818; + TVec3f _824; }; \ No newline at end of file diff --git a/include/Game/Map/CollisionCode.hpp b/include/Game/Map/CollisionCode.hpp index c77332b58..25977b593 100644 --- a/include/Game/Map/CollisionCode.hpp +++ b/include/Game/Map/CollisionCode.hpp @@ -11,41 +11,41 @@ class CollisionCode { public: CollisionCode(); - const char* getFloorCodeString(const Triangle &); - const char* getWallCodeString(const Triangle &); - const char* getSoundCodeString(const Triangle &); - const char* getSoundCodeString(const JMapInfoIter &); + const char* getFloorCodeString(const Triangle&); + const char* getWallCodeString(const Triangle&); + const char* getSoundCodeString(const Triangle&); + const char* getSoundCodeString(const JMapInfoIter&); - u32 getCameraID(const Triangle &); - u32 getCode(const JMapInfoIter &, CodeTable *, const char *); + u32 getCameraID(const Triangle&); + u32 getCode(const JMapInfoIter&, CodeTable*, const char*); void createFloorTable(); void createWallTable(); void createSoundTable(); void createCameraTable(); - u32 getFloorCode(const JMapInfoIter &); - u32 getWallCode(const JMapInfoIter &); - u32 getSoundCode(const JMapInfoIter &); - u32 getCameraCode(const JMapInfoIter &); - u32 getCameraID(const JMapInfoIter &); + u32 getFloorCode(const JMapInfoIter&); + u32 getWallCode(const JMapInfoIter&); + u32 getSoundCode(const JMapInfoIter&); + u32 getCameraCode(const JMapInfoIter&); + u32 getCameraID(const JMapInfoIter&); - CodeTable* mFloorTable; // 0x0 - CodeTable* mWallTable; // 0x4 - CodeTable* mSoundTable; // 0x8 - CodeTable* mCameraTable; // 0xC + CodeTable* mFloorTable; // 0x0 + CodeTable* mWallTable; // 0x4 + CodeTable* mSoundTable; // 0x8 + CodeTable* mCameraTable; // 0xC }; class CodeTable { public: CodeTable(u32); - void add(const char *, u32); + void add(const char*, u32); const char* getString(u32); - u32 mNumCodes; // 0x0 - u32 mMaxNumCodes; // 0x4 - u32* mHashCodes; // 0x8 - u32* _C; + u32 mNumCodes; // 0x0 + u32 mMaxNumCodes; // 0x4 + u32* mHashCodes; // 0x8 + u32* _C; const char** mNames; // 0x10 }; \ No newline at end of file diff --git a/include/Game/Map/CollisionDirector.hpp b/include/Game/Map/CollisionDirector.hpp index 722fe8738..acc24f7a8 100644 --- a/include/Game/Map/CollisionDirector.hpp +++ b/include/Game/Map/CollisionDirector.hpp @@ -10,14 +10,14 @@ public: CollisionDirector(); virtual ~CollisionDirector(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void movement(); - CollisionCategorizedKeeper **mKeepers; // 0xC - CollisionCode *mCode; // 0x10 + CollisionCategorizedKeeper** mKeepers; // 0xC + CollisionCode* mCode; // 0x10 }; namespace MR { - CollisionDirector *getCollisionDirector(); + CollisionDirector* getCollisionDirector(); }; diff --git a/include/Game/Map/CollisionParts.hpp b/include/Game/Map/CollisionParts.hpp index 040bb1a4d..d1cfab889 100644 --- a/include/Game/Map/CollisionParts.hpp +++ b/include/Game/Map/CollisionParts.hpp @@ -15,64 +15,63 @@ class CollisionParts { public: CollisionParts(); - TVec3f getTrans(); - void init(const TPos3f &, HitSensor *, const void *, const void *, s32, bool); - void addToBelongZone(); - void removeFromBelongZone(); - void initWithAutoEqualScale(const TPos3f &, HitSensor *, const void *, const void *, s32, bool); - void initWithNotUsingScale(const TPos3f &, HitSensor *, const void *, const void *, s32, bool); - void resetAllMtx(const TPos3f &); - void resetAllMtx(); - void forceResetAllMtxAndSetUpdateMtxOneTime(); - void resetAllMtxPrivate(const TPos3f &); - void setMtx(const TPos3f &); - void setMtx(); - void updateMtx(); - f32 makeEqualScale(MtxPtr); - void updateBoundingSphereRange(); - void updateBoundingSphereRange(TVec3f); - void updateBoundingSphereRangePrivate(f32); - const char *getHostName() const; - s32 getPlacementZoneID() const; - void checkStrikePoint(HitInfo *, const TVec3f &); - bool checkStrikeBall(HitInfo *, u32, const TVec3f &, f32, bool, const TriangleFilterBase *); - void checkStrikeBallCore(HitInfo *, u32, const TVec3f &, const TVec3f &, f32, f32, f32, KC_PrismData **, f32 *, u8 *, const TriangleFilterBase *, const TVec3f *); - void checkStrikeBallWithThickness(HitInfo *, u32, const TVec3f &, f32, f32, const TriangleFilterBase *); - void calcCollidePosition(TVec3f *, const KC_PrismData &, u8); - void projectToPlane(TVec3f *, const TVec3f &, const TVec3f &, const TVec3f &); - void checkStrikeLine(HitInfo *, u32, const TVec3f &, const TVec3f &, const TriangleFilterBase *); - void createAreaPolygonList(Triangle *, u32, const TVec3f &, const TVec3f &); - void createAreaPolygonListArray(Triangle *, u32, TVec3f *, u32); - void calcForceMovePower(TVec3f *, const TVec3f &) const; + TVec3f getTrans(); + void init(const TPos3f&, HitSensor*, const void*, const void*, s32, bool); + void addToBelongZone(); + void removeFromBelongZone(); + void initWithAutoEqualScale(const TPos3f&, HitSensor*, const void*, const void*, s32, bool); + void initWithNotUsingScale(const TPos3f&, HitSensor*, const void*, const void*, s32, bool); + void resetAllMtx(const TPos3f&); + void resetAllMtx(); + void forceResetAllMtxAndSetUpdateMtxOneTime(); + void resetAllMtxPrivate(const TPos3f&); + void setMtx(const TPos3f&); + void setMtx(); + void updateMtx(); + f32 makeEqualScale(MtxPtr); + void updateBoundingSphereRange(); + void updateBoundingSphereRange(TVec3f); + void updateBoundingSphereRangePrivate(f32); + const char* getHostName() const; + s32 getPlacementZoneID() const; + void checkStrikePoint(HitInfo*, const TVec3f&); + bool checkStrikeBall(HitInfo*, u32, const TVec3f&, f32, bool, const TriangleFilterBase*); + void checkStrikeBallCore(HitInfo*, u32, const TVec3f&, const TVec3f&, f32, f32, f32, KC_PrismData**, f32*, u8*, const TriangleFilterBase*, const TVec3f*); + void checkStrikeBallWithThickness(HitInfo*, u32, const TVec3f&, f32, f32, const TriangleFilterBase*); + void calcCollidePosition(TVec3f*, const KC_PrismData&, u8); + void projectToPlane(TVec3f*, const TVec3f&, const TVec3f&, const TVec3f&); + void checkStrikeLine(HitInfo*, u32, const TVec3f&, const TVec3f&, const TriangleFilterBase*); + void createAreaPolygonList(Triangle*, u32, const TVec3f&, const TVec3f&); + void createAreaPolygonListArray(Triangle*, u32, TVec3f*, u32); + void calcForceMovePower(TVec3f*, const TVec3f&) const; - TMtx34f *_0; - TMtx34f mMatrix; // 0x4 - TPos3f mBaseMatrix; // 0x34 - TPos3f mInvBaseMatrix; // 0x64 - TPos3f mPrevBaseMatrix; // 0x94 - KCollisionServer *mServer; // 0xC4 - HitSensor *mHitSensor; // 0xC8 - bool _CC; - bool _CD; - bool _CE; - bool _CF; - bool _D0; - u8 _D1[3]; - s32 _D4; - f32 _D8; - f32 _DC; - s32 mKeeperIndex; // 0xE0 - CollisionZone *mZone; // 0xE4 - f32 _E8; - f32 _EC; - f32 _F0; + TMtx34f* _0; + TMtx34f mMatrix; // 0x4 + TPos3f mBaseMatrix; // 0x34 + TPos3f mInvBaseMatrix; // 0x64 + TPos3f mPrevBaseMatrix; // 0x94 + KCollisionServer* mServer; // 0xC4 + HitSensor* mHitSensor; // 0xC8 + bool _CC; + bool _CD; + bool _CE; + bool _CF; + bool _D0; + u8 _D1[3]; + s32 _D4; + f32 _D8; + f32 _DC; + s32 mKeeperIndex; // 0xE0 + CollisionZone* mZone; // 0xE4 + f32 _E8; + f32 _EC; + f32 _F0; }; class CollisionPartsFilterBase { public: inline CollisionPartsFilterBase() { - } - virtual bool isInvalidParts(const CollisionParts *) const = 0; + virtual bool isInvalidParts(const CollisionParts*) const = 0; }; \ No newline at end of file diff --git a/include/Game/Map/FileSelectEffect.hpp b/include/Game/Map/FileSelectEffect.hpp index 07e0fa49a..19faf4b40 100644 --- a/include/Game/Map/FileSelectEffect.hpp +++ b/include/Game/Map/FileSelectEffect.hpp @@ -4,10 +4,10 @@ class FileSelectEffect : public LiveActor { public: - FileSelectEffect(const char *); + FileSelectEffect(const char*); virtual ~FileSelectEffect(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void calcAndSetBaseMtx(); @@ -16,5 +16,5 @@ public: void exeWait(); void exeDisappear(); - f32 mEffectFrame; // 0x8C + f32 mEffectFrame; // 0x8C }; diff --git a/include/Game/Map/FileSelectFunc.hpp b/include/Game/Map/FileSelectFunc.hpp index 2930c9ee6..4a40c1711 100644 --- a/include/Game/Map/FileSelectFunc.hpp +++ b/include/Game/Map/FileSelectFunc.hpp @@ -14,4 +14,4 @@ namespace FileSelectFunc { /// @param pName The output pointer for the null-terminated wide name. /// @param rIcon The reference to the identifier of a File Selection Screen icon. void copyMiiName(u16* pName, const FileSelectIconID& rIcon); -}; +}; // namespace FileSelectFunc diff --git a/include/Game/Map/FileSelectIconID.hpp b/include/Game/Map/FileSelectIconID.hpp index 26d75de2d..9bc82a362 100644 --- a/include/Game/Map/FileSelectIconID.hpp +++ b/include/Game/Map/FileSelectIconID.hpp @@ -33,14 +33,14 @@ public: /// @brief Determines if `this` is equal to `rOther`. /// @param rOther A reference to the `FileSelectIconID` to compare with. /// @return `true` if `this` is equal to `other`, `false` otherwise. - bool operator==(const FileSelectIconID &rOther) const { + bool operator==(const FileSelectIconID& rOther) const { return mIsMii == rOther.mIsMii && mData == rOther.mData; } /// @brief Determines if `this` is inequal to `rOther`. /// @param rOther A reference to the `FileSelectIconID` to compare with. /// @return `true` if `this` is inequal to `other`, `false` otherwise. - bool operator!=(const FileSelectIconID &rOther) const { + bool operator!=(const FileSelectIconID& rOther) const { return !(*this == rOther); } diff --git a/include/Game/Map/GroundChecker.hpp b/include/Game/Map/GroundChecker.hpp index 4ed357884..3eb6ba811 100644 --- a/include/Game/Map/GroundChecker.hpp +++ b/include/Game/Map/GroundChecker.hpp @@ -4,7 +4,7 @@ class GroundChecker : public LiveActor { public: - GroundChecker(const char *, f32, f32); + GroundChecker(const char*, f32, f32); virtual ~GroundChecker(); diff --git a/include/Game/Map/Halo.hpp b/include/Game/Map/Halo.hpp index 1a654564e..187ebc4b8 100644 --- a/include/Game/Map/Halo.hpp +++ b/include/Game/Map/Halo.hpp @@ -3,28 +3,27 @@ #include "Game/MapObj/MapObjActor.hpp" struct HaloParam { - const char* haloName; // 0x0 - f32 _4; - f32 _8; - f32 clippingRadius; // 0xC + const char* haloName; // 0x0 + f32 _4; + f32 _8; + f32 clippingRadius; // 0xC }; namespace { HaloParam sParams[2] = { - { "ZoneHalo", 70.0f, 20.0f, 4.0f }, - { "PowerStarHalo", 80.0f, 20.0f, 30.0f } - }; + {"ZoneHalo", 70.0f, 20.0f, 4.0f}, + {"PowerStarHalo", 80.0f, 20.0f, 30.0f}}; }; class Halo : public MapObjActor { public: - Halo(const char *); + Halo(const char*); virtual ~Halo(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); - virtual void connectToScene(const MapObjActorInitInfo &); - virtual f32 getDistance() const; + virtual void connectToScene(const MapObjActorInitInfo&); + virtual f32 getDistance() const; bool isDistanceAppear() const; bool isDistanceDisappear() const; @@ -41,18 +40,18 @@ public: return nullptr; } - - f32 mDistance; // 0xC4 + + f32 mDistance; // 0xC4 }; class PowerStarHalo : public Halo { public: - PowerStarHalo(const char *); + PowerStarHalo(const char*); virtual ~PowerStarHalo(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); - virtual f32 getDistance() const; + virtual f32 getDistance() const; void exeWaitScenarioOpeningEnd(); @@ -64,9 +63,9 @@ namespace NrvHalo { NERVE(HostTypeDisappear); INIT_NERVE(HostTypeAppear); INIT_NERVE(HostTypeDisappear); -}; +}; // namespace NrvHalo namespace NrvPowerStarHalo { NERVE(HostTypeWaitScenarioOpeningEnd); INIT_NERVE(HostTypeWaitScenarioOpeningEnd); -}; +}; // namespace NrvPowerStarHalo diff --git a/include/Game/Map/HitInfo.hpp b/include/Game/Map/HitInfo.hpp index 68345eeeb..2ab910b22 100644 --- a/include/Game/Map/HitInfo.hpp +++ b/include/Game/Map/HitInfo.hpp @@ -11,48 +11,48 @@ class Triangle { public: Triangle(); - Triangle &operator=(const Triangle &); + Triangle& operator=(const Triangle&); - void fillData(CollisionParts *, u32, HitSensor *); - const char *getHostName() const; - s32 getHostPlacementZoneID() const; - bool isHostMoved() const; - bool isValid() const; - const TVec3f *getNormal(int) const; - const TVec3f *getFaceNormal() const; - const TVec3f *getEdgeNormal(int) const; - const TVec3f *getPos(int) const; - const TVec3f *calcAndGetNormal(int); - const TVec3f *calcAndGetEdgeNormal(int); - const TVec3f *calcAndGetPos(int); - void calcForceMovePower(TVec3f *, const TVec3f &) const; - JMapInfoIter getAttributes() const; - TPos3f *getBaseMtx() const; - TPos3f *getBaseInvMtx() const; - TPos3f *getPrevBaseMtx() const; + void fillData(CollisionParts*, u32, HitSensor*); + const char* getHostName() const; + s32 getHostPlacementZoneID() const; + bool isHostMoved() const; + bool isValid() const; + const TVec3f* getNormal(int) const; + const TVec3f* getFaceNormal() const; + const TVec3f* getEdgeNormal(int) const; + const TVec3f* getPos(int) const; + const TVec3f* calcAndGetNormal(int); + const TVec3f* calcAndGetEdgeNormal(int); + const TVec3f* calcAndGetPos(int); + void calcForceMovePower(TVec3f*, const TVec3f&) const; + JMapInfoIter getAttributes() const; + TPos3f* getBaseMtx() const; + TPos3f* getBaseInvMtx() const; + TPos3f* getPrevBaseMtx() const; - CollisionParts* mParts; // 0x0 - u32 mIdx; // 0x4 - HitSensor* mSensor; // 0x8 - TVec3f mNormals[4]; // 0xC - TVec3f mPos[3]; // 0x3C + CollisionParts* mParts; // 0x0 + u32 mIdx; // 0x4 + HitSensor* mSensor; // 0x8 + TVec3f mNormals[4]; // 0xC + TVec3f mPos[3]; // 0x3C }; class HitInfo { public: HitInfo(); - HitInfo &operator=(const HitInfo &); + HitInfo& operator=(const HitInfo&); bool isCollisionAtFace() const; bool isCollisionAtEdge() const; bool isCollisionAtCorner() const; - Triangle mParentTriangle; // 0x0 - f32 _60; - TVec3f mHitPos; // 0x64 - TVec3f _70; - TVec3f _7C; - u8 _88; - u8 _89[3]; + Triangle mParentTriangle; // 0x0 + f32 _60; + TVec3f mHitPos; // 0x64 + TVec3f _70; + TVec3f _7C; + u8 _88; + u8 _89[3]; }; \ No newline at end of file diff --git a/include/Game/Map/KCollision.hpp b/include/Game/Map/KCollision.hpp index 584c36d47..954e76387 100644 --- a/include/Game/Map/KCollision.hpp +++ b/include/Game/Map/KCollision.hpp @@ -7,49 +7,48 @@ class JMapInfo; struct KC_PrismData { - f32 mHeight; // 0x0 - u16 mPositionIndex; // 0x4 - u16 mNormalIndex; // 0x6 - u16 mEdgeIndices[3]; // 0x8 - u16 mAttribute; // 0xE + f32 mHeight; // 0x0 + u16 mPositionIndex; // 0x4 + u16 mNormalIndex; // 0x6 + u16 mEdgeIndices[3]; // 0x8 + u16 mAttribute; // 0xE }; class Fxyz { public: inline Fxyz() { - } - Fxyz &operator=(const Fxyz &); + Fxyz& operator=(const Fxyz&); f32 x, y, z; }; struct KCLFile { union { - TVec3f *mPos; // 0x0 - u32 mPosOffset; // 0x0 + TVec3f* mPos; // 0x0 + u32 mPosOffset; // 0x0 }; union { - TVec3f *mNorms; // 0x4 - u32 mNormOffset; // 0x4 + TVec3f* mNorms; // 0x4 + u32 mNormOffset; // 0x4 }; union { - KC_PrismData *mPrisms; // 0x8 - u32 mPrismOffset; // 0x8 + KC_PrismData* mPrisms; // 0x8 + u32 mPrismOffset; // 0x8 }; union { - void *mOctree; // 0xC - u32 mOctreeOffset; // 0xC + void* mOctree; // 0xC + u32 mOctreeOffset; // 0xC }; - f32 mThickness; // 0x10 - TVec3f mMin; // 0x14 - s32 mXMask; // 0x20 - s32 mYMask; // 0x24 - s32 mZMask; // 0x28 - s32 mBlockWidthShift; // 0x2C - s32 mBlockXShift; // 0x30 - s32 mBlockXYShift; // 0x34 + f32 mThickness; // 0x10 + TVec3f mMin; // 0x14 + s32 mXMask; // 0x20 + s32 mYMask; // 0x24 + s32 mZMask; // 0x28 + s32 mBlockWidthShift; // 0x2C + s32 mBlockXShift; // 0x30 + s32 mBlockXYShift; // 0x34 }; class KCollisionServer { @@ -57,10 +56,9 @@ public: class V3u { public: inline V3u() { - } - void setUsingCast(const TVec3f &); + void setUsingCast(const TVec3f&); s32 x; s32 y; @@ -69,36 +67,36 @@ public: KCollisionServer(); - void init(void *, const void *); - void setData(void *); - void calcFarthestVertexDistance(); - static bool isBinaryInitialized(const void *); - void checkPoint(Fxyz *, f32, f32 *); - void checkArea3D(Fxyz *, Fxyz *, KC_PrismData **, u32); - void checkSphere(Fxyz *, f32, f32, u32, KC_PrismData **, f32 *, u8 *); - void checkSphereWithThickness(Fxyz *, f32, f32, u32, KC_PrismData **, f32 *, u8 *, f32); - void checkArrow(const TVec3f, const TVec3f, f32 *, u8 *, u32 *, KC_PrismData **, u32) const; - void KCHitSphere(KC_PrismData *, Fxyz *, f32, f32, f32 *, u8 *); - void KCHitSphereWithThickness(KC_PrismData *, Fxyz *, f32, f32, f32 *, u8 *, f32); - bool isNearParallelNormal(const KC_PrismData *) const; - void KCHitArrow(KC_PrismData *, const TVec3f, const TVec3f, f32 *, u8 *) const; - s32 toIndex(const KC_PrismData *) const; - TVec3f *getFaceNormal(const KC_PrismData *) const; - TVec3f *getEdgeNormal1(const KC_PrismData *) const; - TVec3f *getEdgeNormal2(const KC_PrismData *) const; - TVec3f *getEdgeNormal3(const KC_PrismData *) const; - TVec3f *getNormal(u32) const; - void calXvec(const Fxyz *, const Fxyz *, Fxyz *) const; - TVec3f getPos(const KC_PrismData *, int) const; - KC_PrismData *getPrismData(u32) const; - s32 getTriangleNum() const; - JMapInfoIter getAttributes(u32) const; - s32 *searchBlock(s32 *, const u32 &, const u32 &, const u32 &) const; - bool isInsideMinMaxInLocalSpace(const V3u &) const; - bool outCheck(const TVec3f *, const TVec3f *, V3u *, V3u *) const; - void objectSpaceToLocalSpace(V3u *, const TVec3f &) const; + void init(void*, const void*); + void setData(void*); + void calcFarthestVertexDistance(); + static bool isBinaryInitialized(const void*); + void checkPoint(Fxyz*, f32, f32*); + void checkArea3D(Fxyz*, Fxyz*, KC_PrismData**, u32); + void checkSphere(Fxyz*, f32, f32, u32, KC_PrismData**, f32*, u8*); + void checkSphereWithThickness(Fxyz*, f32, f32, u32, KC_PrismData**, f32*, u8*, f32); + void checkArrow(const TVec3f, const TVec3f, f32*, u8*, u32*, KC_PrismData**, u32) const; + void KCHitSphere(KC_PrismData*, Fxyz*, f32, f32, f32*, u8*); + void KCHitSphereWithThickness(KC_PrismData*, Fxyz*, f32, f32, f32*, u8*, f32); + bool isNearParallelNormal(const KC_PrismData*) const; + void KCHitArrow(KC_PrismData*, const TVec3f, const TVec3f, f32*, u8*) const; + s32 toIndex(const KC_PrismData*) const; + TVec3f* getFaceNormal(const KC_PrismData*) const; + TVec3f* getEdgeNormal1(const KC_PrismData*) const; + TVec3f* getEdgeNormal2(const KC_PrismData*) const; + TVec3f* getEdgeNormal3(const KC_PrismData*) const; + TVec3f* getNormal(u32) const; + void calXvec(const Fxyz*, const Fxyz*, Fxyz*) const; + TVec3f getPos(const KC_PrismData*, int) const; + KC_PrismData* getPrismData(u32) const; + s32 getTriangleNum() const; + JMapInfoIter getAttributes(u32) const; + s32* searchBlock(s32*, const u32&, const u32&, const u32&) const; + bool isInsideMinMaxInLocalSpace(const V3u&) const; + bool outCheck(const TVec3f*, const TVec3f*, V3u*, V3u*) const; + void objectSpaceToLocalSpace(V3u*, const TVec3f&) const; - KCLFile* mFile; // 0x0 - JMapInfo *mapInfo; // 0x4 - f32 mMaxVertexDistance; // 0x8 + KCLFile* mFile; // 0x0 + JMapInfo* mapInfo; // 0x4 + f32 mMaxVertexDistance; // 0x8 }; \ No newline at end of file diff --git a/include/Game/Map/KoopaBattleMapPlate.hpp b/include/Game/Map/KoopaBattleMapPlate.hpp index 55130a2ca..45fcddc73 100644 --- a/include/Game/Map/KoopaBattleMapPlate.hpp +++ b/include/Game/Map/KoopaBattleMapPlate.hpp @@ -9,7 +9,7 @@ public: virtual ~KoopaBattleMapPlate(); virtual void init(const JMapInfoIter& rIter); virtual void calcAndSetBaseMtx(); - bool receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); + bool receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); private: /* 0x8C */ TPos3f _8C; diff --git a/include/Game/Map/KoopaBattleMapStair.hpp b/include/Game/Map/KoopaBattleMapStair.hpp index 10fb41a60..3b9503d31 100644 --- a/include/Game/Map/KoopaBattleMapStair.hpp +++ b/include/Game/Map/KoopaBattleMapStair.hpp @@ -4,16 +4,16 @@ class KoopaBattleMapStair : public LiveActor { public: - KoopaBattleMapStair(const char *); + KoopaBattleMapStair(const char*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); bool isRequestAttackVs1() const; - s32 calcRemainTimeToBreak() const; + s32 calcRemainTimeToBreak() const; bool isRequestAttackVs3() const; - f32 calcAndSetTargetPos(TVec3f *, const TVec3f &); - f32 calcTimeRate() const; + f32 calcAndSetTargetPos(TVec3f*, const TVec3f&); + f32 calcTimeRate() const; bool isBreak() const; bool isTypeNormal() const NO_INLINE; bool isTypeDemoFar() const; @@ -26,17 +26,17 @@ public: void exeFall(); void exeDisappear(); - s32 mFireTimer; // _8C - s32 _90; - s32 _94; - s32 _98; - bool _9C; - s32 mType; // 0xA0 - bool mIsStairBig; // 0xA4 - bool mIsStairTurn; // 0xA5 - u8 _A6; - u32 _A8; + s32 mFireTimer; // _8C + s32 _90; + s32 _94; + s32 _98; + bool _9C; + s32 mType; // 0xA0 + bool mIsStairBig; // 0xA4 + bool mIsStairTurn; // 0xA5 + u8 _A6; + u32 _A8; TVec3f _AC; - s32 _B8; - s32 _BC; + s32 _B8; + s32 _BC; }; diff --git a/include/Game/Map/LavaShellTower.hpp b/include/Game/Map/LavaShellTower.hpp index 1f91d06b3..c04d6c422 100644 --- a/include/Game/Map/LavaShellTower.hpp +++ b/include/Game/Map/LavaShellTower.hpp @@ -6,11 +6,11 @@ class MapObjActorInitInfo; class LavaShellTower : public MapObjActor { public: - LavaShellTower(const char *); + LavaShellTower(const char*); + + virtual void init(const JMapInfoIter&); + virtual void initCaseUseSwitchB(const MapObjActorInitInfo&); - virtual void init(const JMapInfoIter &); - virtual void initCaseUseSwitchB(const MapObjActorInitInfo &); - void exeWait(); void exeDemo(); void exeDone(); diff --git a/include/Game/Map/LavaSunPlanet.hpp b/include/Game/Map/LavaSunPlanet.hpp index f249e24a7..882e23aec 100644 --- a/include/Game/Map/LavaSunPlanet.hpp +++ b/include/Game/Map/LavaSunPlanet.hpp @@ -7,14 +7,14 @@ class MapPartsRotator; class LavaSunPlanet : public LiveActor { public: - LavaSunPlanet(const char *); + LavaSunPlanet(const char*); virtual ~LavaSunPlanet(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); virtual void calcAndSetBaseMtx(); - MapPartsRotator* mRotator; // 0x8C - const char* mObjName; // 0x90 - LodCtrl* mLodCtrl; // 0x94 + MapPartsRotator* mRotator; // 0x8C + const char* mObjName; // 0x90 + LodCtrl* mLodCtrl; // 0x94 }; diff --git a/include/Game/Map/LightDataHolder.hpp b/include/Game/Map/LightDataHolder.hpp index 22978ae4d..8f4db6b15 100644 --- a/include/Game/Map/LightDataHolder.hpp +++ b/include/Game/Map/LightDataHolder.hpp @@ -5,46 +5,44 @@ class LightInfo { public: - _GXColor mColor; // 0x0 - TVec3f mPos; // 0x4 - u8 mIsFollowCamera; // 0x10 + _GXColor mColor; // 0x0 + TVec3f mPos; // 0x4 + u8 mIsFollowCamera; // 0x10 }; class LightInfoCoin : public LightInfo { public: inline LightInfoCoin() { - } - u8 _14; - u8 _15; - u8 _16; - u8 _17; + u8 _14; + u8 _15; + u8 _16; + u8 _17; f32 _18; }; class ActorLightInfo { public: inline ActorLightInfo() { - } - void operator=(const ActorLightInfo &); + void operator=(const ActorLightInfo&); - LightInfo mInfo0; // 0x0 - LightInfo mInfo1; // 0x14 - u8 mAlpha2; // 0x28 - _GXColor mColor; // 0x29 + LightInfo mInfo0; // 0x0 + LightInfo mInfo1; // 0x14 + u8 mAlpha2; // 0x28 + _GXColor mColor; // 0x29 }; struct AreaLightInfo { - const char* mAreaLightName; // 0x0 - s32 mInterpolate; // 0x4 - bool mFix; // 0x8 - ActorLightInfo mPlayerLight; // 0xC - ActorLightInfo mStrongLight; // 0x3C - ActorLightInfo mWeakLight; // 0x6C - ActorLightInfo mPlanetLight; // 0x9C + const char* mAreaLightName; // 0x0 + s32 mInterpolate; // 0x4 + bool mFix; // 0x8 + ActorLightInfo mPlayerLight; // 0xC + ActorLightInfo mStrongLight; // 0x3C + ActorLightInfo mWeakLight; // 0x6C + ActorLightInfo mPlanetLight; // 0x9C }; class LightDataHolder { @@ -53,11 +51,11 @@ public: void initLightData(); - AreaLightInfo* findAreaLight(const char *) const; - const char* getDefaultAreaLightName() const; - s32 getDefaultStepInterpolate() const; + AreaLightInfo* findAreaLight(const char*) const; + const char* getDefaultAreaLightName() const; + s32 getDefaultStepInterpolate() const; - s32 mLightCount; // 0x0 - AreaLightInfo* mLights; // 0x4 - LightInfoCoin _8; + s32 mLightCount; // 0x0 + AreaLightInfo* mLights; // 0x4 + LightInfoCoin _8; }; diff --git a/include/Game/Map/LightDirector.hpp b/include/Game/Map/LightDirector.hpp index 9ec8ac192..9a998255e 100644 --- a/include/Game/Map/LightDirector.hpp +++ b/include/Game/Map/LightDirector.hpp @@ -11,18 +11,18 @@ public: LightDirector(); virtual ~LightDirector(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); void initData(); void loadLightPlayer() const; void loadLightCoin() const; - u32 _C; - LightDataHolder* mHolder; // 0x10 - LightZoneDataHolder* mZoneHolder; // 0x14 - u32 _18; - u32 _1C; // ActorLightCtrl - LightPointCtrl* mPointCtrl; // 0x20 - ResourceHolder* mResourceHolder; // 0x24 + u32 _C; + LightDataHolder* mHolder; // 0x10 + LightZoneDataHolder* mZoneHolder; // 0x14 + u32 _18; + u32 _1C; // ActorLightCtrl + LightPointCtrl* mPointCtrl; // 0x20 + ResourceHolder* mResourceHolder; // 0x24 }; \ No newline at end of file diff --git a/include/Game/Map/LightFunction.hpp b/include/Game/Map/LightFunction.hpp index 1843a4fdc..9f31ddee6 100644 --- a/include/Game/Map/LightFunction.hpp +++ b/include/Game/Map/LightFunction.hpp @@ -12,7 +12,7 @@ class ResourceHolder; class ActorLightCtrl; namespace { - void loadLightDiffuse(_GXColor color, const TVec3f &rPos, _GXLightID lightID) { + void loadLightDiffuse(_GXColor color, const TVec3f& rPos, _GXLightID lightID) { GXLightObj lightObj; GXInitLightPos(&lightObj, rPos.x, rPos.y, rPos.z); @@ -23,34 +23,34 @@ namespace { GXLoadLightObjImm(&lightObj, lightID); } - void getDataActorLightInfo(JMapInfo *, int, ActorLightInfo *, const char *); -}; + void getDataActorLightInfo(JMapInfo*, int, ActorLightInfo*, const char*); +}; // namespace class LightFunction { public: - static void initLightRegisterAll(); - static void initLightData(); + static void initLightRegisterAll(); + static void initLightData(); static ResourceHolder* loadLightArchive(); - static s32 createLightDataParser(JMapInfo **); + static s32 createLightDataParser(JMapInfo**); static void loadAllLightWhite(); - static AreaLightInfo* getAreaLightInfo(const ZoneLightID &); + static AreaLightInfo* getAreaLightInfo(const ZoneLightID&); - static void loadActorLightInfo(const ActorLightInfo *); + static void loadActorLightInfo(const ActorLightInfo*); - static void getAreaLightLightData(JMapInfo *, int, AreaLightInfo *); + static void getAreaLightLightData(JMapInfo*, int, AreaLightInfo*); static const char* getDefaultAreaLightName(); - static s32 createZoneDataParser(const char *, JMapInfo **); + static s32 createZoneDataParser(const char*, JMapInfo**); - static void loadPointLightInfo(const PointLightInfo *); + static void loadPointLightInfo(const PointLightInfo*); - static void loadLightInfoCoin(const LightInfoCoin *); + static void loadLightInfoCoin(const LightInfoCoin*); - static void registerLightAreaHolder(LightAreaHolder *); + static void registerLightAreaHolder(LightAreaHolder*); - static void calcLightWorldPos(TVec3f *, const LightInfo &); + static void calcLightWorldPos(TVec3f*, const LightInfo&); - static void registerPlayerLightCtrl(const ActorLightCtrl *); + static void registerPlayerLightCtrl(const ActorLightCtrl*); }; diff --git a/include/Game/Map/LightPointCtrl.hpp b/include/Game/Map/LightPointCtrl.hpp index 4c15c4c93..9eaef41f3 100644 --- a/include/Game/Map/LightPointCtrl.hpp +++ b/include/Game/Map/LightPointCtrl.hpp @@ -4,15 +4,15 @@ class PointLightInfo { public: - void operator=(const PointLightInfo &); + void operator=(const PointLightInfo&); u32 _0; u32 _4; u32 _8; - u8 _C; - u8 _D; - u8 _E; - u8 _F; + u8 _C; + u8 _D; + u8 _E; + u8 _F; f32 _10; f32 _14; u32 _18; @@ -21,21 +21,21 @@ public: class LightPointCtrl { public: LightPointCtrl(); - + void loadPointLight(); void update(); - void clearPointLight(PointLightInfo *); + void clearPointLight(PointLightInfo*); bool tryBlendStart(); void updatePointLight(); - s32 _0; - u32 _4; - u32 _8; - u32 _C; - u32 _10; + s32 _0; + u32 _4; + u32 _8; + u32 _C; + u32 _10; PointLightInfo* _14; PointLightInfo* _18; - PointLightInfo* _1C; + PointLightInfo* _1C; }; \ No newline at end of file diff --git a/include/Game/Map/LightZoneDataHolder.hpp b/include/Game/Map/LightZoneDataHolder.hpp index 4ead1524d..a3af5ba75 100644 --- a/include/Game/Map/LightZoneDataHolder.hpp +++ b/include/Game/Map/LightZoneDataHolder.hpp @@ -9,18 +9,18 @@ public: ZoneLightID(); void clear(); - bool isTargetArea(const LightArea *) const; + bool isTargetArea(const LightArea*) const; bool isOutOfArea() const; s32 _0; - s32 mLightID; // 0x4 + s32 mLightID; // 0x4 }; // I am assuming they called this "AreaInfo" because the debug map // tells me there was a function contained in LightZoneInfo called "getAreaInfo" struct AreaInfo { - s32 mID; // 0x0 - const char* mAreaLightName; // 0x4 + s32 mID; // 0x0 + const char* mAreaLightName; // 0x4 }; class LightZoneInfo { @@ -31,18 +31,18 @@ public: const char* getAreaLightNameInZoneData(s32) const; - s32 mAreaCount; // 0x0 - AreaInfo* mAreaInfo; // 0x4 + s32 mAreaCount; // 0x0 + AreaInfo* mAreaInfo; // 0x4 }; class LightZoneDataHolder { public: LightZoneDataHolder(); - void initZoneData(); - const char* getAreaLightNameInZoneData(const ZoneLightID &) const; + void initZoneData(); + const char* getAreaLightNameInZoneData(const ZoneLightID&) const; const char* getDefaultStageAreaLightName() const; - s32 mCount; // 0x0 - LightZoneInfo* mZoneInfo; // 0x4 + s32 mCount; // 0x0 + LightZoneInfo* mZoneInfo; // 0x4 }; \ No newline at end of file diff --git a/include/Game/Map/NamePosHolder.hpp b/include/Game/Map/NamePosHolder.hpp index 63661705c..9fdb6b089 100644 --- a/include/Game/Map/NamePosHolder.hpp +++ b/include/Game/Map/NamePosHolder.hpp @@ -10,26 +10,26 @@ class NamePosInfo { public: NamePosInfo(); - /* 0x0 */ const char* mName; ///< The name of the NamePos. - /* 0x4 */ TVec3f mPosition; ///< The position of the NamePos. - /* 0x10 */ TVec3f mRotation; ///< The rotation of the NamePos. - /* 0x1C */ JMapLinkInfo* mLinkInfo; ///< The information to link this NamePos to other objects. - u32 _20; + /* 0x0 */ const char* mName; ///< The name of the NamePos. + /* 0x4 */ TVec3f mPosition; ///< The position of the NamePos. + /* 0x10 */ TVec3f mRotation; ///< The rotation of the NamePos. + /* 0x1C */ JMapLinkInfo* mLinkInfo; ///< The information to link this NamePos to other objects. + u32 _20; }; /// @brief Class that contains the array of NamePosInfo instances. -class NamePosHolder : public NameObj { +class NamePosHolder : public NameObj { public: NamePosHolder(); virtual ~NamePosHolder(); - bool tryRegisterLinkObj(const NameObj *, const JMapInfoIter &); + bool tryRegisterLinkObj(const NameObj*, const JMapInfoIter&); - bool find(const NameObj *, const char *, TVec3f *, const TVec3f *) const; + bool find(const NameObj*, const char*, TVec3f*, const TVec3f*) const; - /* 0xC */ s32 mPosNum; ///< The number of NamePosInfo instances. - /* 0x10 */ NamePosInfo* mInfos; ///< The array of NamePosInfo instances. + /* 0xC */ s32 mPosNum; ///< The number of NamePosInfo instances. + /* 0x10 */ NamePosInfo* mInfos; ///< The array of NamePosInfo instances. }; namespace MR { diff --git a/include/Game/Map/OceanRing.hpp b/include/Game/Map/OceanRing.hpp index 468bdf13e..8737e4507 100644 --- a/include/Game/Map/OceanRing.hpp +++ b/include/Game/Map/OceanRing.hpp @@ -11,54 +11,54 @@ class OceanRingBloomDrawer; class OceanRing : public LiveActor { public: - OceanRing(const char *); + OceanRing(const char*); virtual ~OceanRing(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void movement(); virtual void draw() const; virtual void startClipped(); virtual void endClipped(); - bool isInWater(const TVec3f &) const; - bool calcWaterInfo(const TVec3f &, const TVec3f &, WaterInfo *) const; - f32 calcNearestPos(const TVec3f &, TVec3f *, TVec3f *, TVec3f *) const; - f32 calcWaveHeight(const TVec3f &, f32, TVec3f *) const; - void calcStreamVec(const TVec3f &, f32, TVec3f *) const; - void initPoints(); - void updatePoints(); - void updatePointsInLine(s32, s32, s32, s32); - f32 calcCurrentWidthRate(f32) const; - f32 calcCurrentFlowSpeedRate(f32) const; - void calcClippingBox(); + bool isInWater(const TVec3f&) const; + bool calcWaterInfo(const TVec3f&, const TVec3f&, WaterInfo*) const; + f32 calcNearestPos(const TVec3f&, TVec3f*, TVec3f*, TVec3f*) const; + f32 calcWaveHeight(const TVec3f&, f32, TVec3f*) const; + void calcStreamVec(const TVec3f&, f32, TVec3f*) const; + void initPoints(); + void updatePoints(); + void updatePointsInLine(s32, s32, s32, s32); + f32 calcCurrentWidthRate(f32) const; + f32 calcCurrentFlowSpeedRate(f32) const; + void calcClippingBox(); WaterPoint* getPoint(int, int) const NO_INLINE; - s32 mWaterPointNum; // 0x8C - s32 mSegCount; // 0x90 - s32 mStride; // 0x94 - WaterPoint** mWaterPoints; // 0x98 - f32 mWidthMax; // 0x9C - s32 mObjArg1; // 0xA0 - f32 mWaveTheta1; // 0xA4 - f32 mWaveTheta2; // 0xA8 - f32 mWaveHeight1; // 0xAC - f32 mWaveHeight2; // 0xB0 - u8 _B4; - u8 _B5; - u8 _B6; - u8 _B7; - f32 mNearPosToPlayer; // 0xB8 - TVec3f mNearestPos; // 0xBC - TVec3f mNearestDir; // 0xC8 - OceanRingDrawer* mRingDrawer; // 0xD4 - TBox3f mBox; // 0xD8 - TBox3f mClippingBox; // 0xF0 - TVec3f _108; - TVec3f mNearestToWatchCam; // 0x114 - AudSoundObject* mSoundObj1; // 0x120 - TVec3f mNerarestToCam; // 0x124 - AudSoundObject* mSoundObj2; // 0x130 - OceanRingPipe* mOceanRingPipe; // 0x134 - OceanRingBloomDrawer* mBloomDrawer; // 0x138 + s32 mWaterPointNum; // 0x8C + s32 mSegCount; // 0x90 + s32 mStride; // 0x94 + WaterPoint** mWaterPoints; // 0x98 + f32 mWidthMax; // 0x9C + s32 mObjArg1; // 0xA0 + f32 mWaveTheta1; // 0xA4 + f32 mWaveTheta2; // 0xA8 + f32 mWaveHeight1; // 0xAC + f32 mWaveHeight2; // 0xB0 + u8 _B4; + u8 _B5; + u8 _B6; + u8 _B7; + f32 mNearPosToPlayer; // 0xB8 + TVec3f mNearestPos; // 0xBC + TVec3f mNearestDir; // 0xC8 + OceanRingDrawer* mRingDrawer; // 0xD4 + TBox3f mBox; // 0xD8 + TBox3f mClippingBox; // 0xF0 + TVec3f _108; + TVec3f mNearestToWatchCam; // 0x114 + AudSoundObject* mSoundObj1; // 0x120 + TVec3f mNerarestToCam; // 0x124 + AudSoundObject* mSoundObj2; // 0x130 + OceanRingPipe* mOceanRingPipe; // 0x134 + OceanRingBloomDrawer* mBloomDrawer; // 0x138 }; diff --git a/include/Game/Map/OceanRingBloomDrawer.hpp b/include/Game/Map/OceanRingBloomDrawer.hpp index 59d403d31..8a969cef7 100644 --- a/include/Game/Map/OceanRingBloomDrawer.hpp +++ b/include/Game/Map/OceanRingBloomDrawer.hpp @@ -6,12 +6,11 @@ class OceanRing; class OceanRingBloomDrawer : public NameObj { public: - OceanRingBloomDrawer(OceanRing *); + OceanRingBloomDrawer(OceanRing*); virtual ~OceanRingBloomDrawer(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void draw() const; - - OceanRing* mRing; // 0xC + OceanRing* mRing; // 0xC }; \ No newline at end of file diff --git a/include/Game/Map/OceanRingDrawer.hpp b/include/Game/Map/OceanRingDrawer.hpp index 7e88fc70d..24e71e013 100644 --- a/include/Game/Map/OceanRingDrawer.hpp +++ b/include/Game/Map/OceanRingDrawer.hpp @@ -8,32 +8,32 @@ class OceanRing; class OceanRingPartDrawer { public: - OceanRingPartDrawer(const OceanRing *, int, int, bool, f32 *, f32 *, f32 *); + OceanRingPartDrawer(const OceanRing*, int, int, bool, f32*, f32*, f32*); - void initDisplayList(f32 *, f32 *, f32*); + void initDisplayList(f32*, f32*, f32*); void draw() const; - void drawGD(f32 *, f32 *, f32 *) const; + void drawGD(f32*, f32*, f32*) const; void drawDynamic() const; void drawDynamicBloom() const; - const OceanRing* mOceanRing; // 0x0 - TVec3f mPosition; // 0x4 - int _10; - int _14; - bool _18; - u8 _19; - u8 _1A; - u8 _1B; - f32 _1C; - f32 _20; - f32 _24; - u32 mDispListLength; // 0x28 - u8* mDispList; // 0x2C + const OceanRing* mOceanRing; // 0x0 + TVec3f mPosition; // 0x4 + int _10; + int _14; + bool _18; + u8 _19; + u8 _1A; + u8 _1B; + f32 _1C; + f32 _20; + f32 _24; + u32 mDispListLength; // 0x28 + u8* mDispList; // 0x2C }; class OceanRingDrawer { public: - OceanRingDrawer(const OceanRing *); + OceanRingDrawer(const OceanRing*); void update(); void draw() const; @@ -52,17 +52,17 @@ public: return (a1 - a2) / a3; } - const OceanRing* mRing; // 0x0 - s32 mDrawerCount; // 0x4 - OceanRingPartDrawer** mPartDrawers; // 0x8 - f32 _C; - f32 _10; - f32 _14; - f32 _18; - f32 _1C; - f32 _20; - JUTTexture* mWaterTex; // 0x24 - JUTTexture* mWaterIndTex; // 0x28 - u32 _2C; - u8* mDispList; // 0x30 + const OceanRing* mRing; // 0x0 + s32 mDrawerCount; // 0x4 + OceanRingPartDrawer** mPartDrawers; // 0x8 + f32 _C; + f32 _10; + f32 _14; + f32 _18; + f32 _1C; + f32 _20; + JUTTexture* mWaterTex; // 0x24 + JUTTexture* mWaterIndTex; // 0x28 + u32 _2C; + u8* mDispList; // 0x30 }; \ No newline at end of file diff --git a/include/Game/Map/OceanRingPipe.hpp b/include/Game/Map/OceanRingPipe.hpp index 392203df7..8a767ab43 100644 --- a/include/Game/Map/OceanRingPipe.hpp +++ b/include/Game/Map/OceanRingPipe.hpp @@ -6,21 +6,21 @@ class OceanRing; class OceanRingPipe : public LiveActor { public: - OceanRingPipe(const OceanRing *, f32, f32); + OceanRingPipe(const OceanRing*, f32, f32); virtual ~OceanRingPipe(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); - const OceanRing* mOceanRing; // 0x8C - u8 _90; - u32 _94; - u32 _98; - u32 _9C; - u32 _A0; - u32 _A4; - f32 _A8; - f32 _AC; - u32 _B0; - u32 _B4; + const OceanRing* mOceanRing; // 0x8C + u8 _90; + u32 _94; + u32 _98; + u32 _9C; + u32 _A0; + u32 _A4; + f32 _A8; + f32 _AC; + u32 _B0; + u32 _B4; }; diff --git a/include/Game/Map/PlanetMapCreator.hpp b/include/Game/Map/PlanetMapCreator.hpp index fbf3af05a..dc3133ad0 100644 --- a/include/Game/Map/PlanetMapCreator.hpp +++ b/include/Game/Map/PlanetMapCreator.hpp @@ -5,9 +5,9 @@ class NameObjArchiveListCollector; struct PlanetMapData { - const char* mPlanetName; // 0x0 - const char* mData[5]; // 0x4 - const char* mForceScenarioData[8]; // 0x18 + const char* mPlanetName; // 0x0 + const char* mData[5]; // 0x4 + const char* mForceScenarioData[8]; // 0x18 }; struct UniqueEntry { @@ -15,34 +15,34 @@ struct UniqueEntry { const char* _4; }; -typedef NameObj* (*CreatorFuncPtr)(const char *); +typedef NameObj* (*CreatorFuncPtr)(const char*); struct PlanetEntry { - /* 0x0 */ const char* mName; + /* 0x0 */ const char* mName; /* 0x4 */ CreatorFuncPtr mCreateFunc; }; class PlanetMapCreator : public NameObj { public: - PlanetMapCreator(const char *); + PlanetMapCreator(const char*); CreatorFuncPtr getCreateFunc(const char*); - void makeArchiveListPlanet(NameObjArchiveListCollector *, const JMapInfoIter &, const char *); - void createPlanetMapDataTable(JMapInfo *); - void addTableData(const JMapInfo *, s32); - PlanetMapData* getTableData(const char *) const; - bool isScenarioForceLow(const PlanetMapData *) const; + void makeArchiveListPlanet(NameObjArchiveListCollector*, const JMapInfoIter&, const char*); + void createPlanetMapDataTable(JMapInfo*); + void addTableData(const JMapInfo*, s32); + PlanetMapData* getTableData(const char*) const; + bool isScenarioForceLow(const PlanetMapData*) const; PlanetMapData** mPlanetMapData; // 0xC - s32 mTableCount; // 0x10 + s32 mTableCount; // 0x10 }; class PlanetMapCreatorFunction { public: - static void makeArchiveList(NameObjArchiveListCollector *, const JMapInfoIter &, const char *); + static void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&, const char*); - static bool isLoadArchiveAfterScenarioSelected(const char *); - static bool isRegisteredObj(const char *); + static bool isLoadArchiveAfterScenarioSelected(const char*); + static bool isRegisteredObj(const char*); - static CreatorFuncPtr getPlanetMapCreator(const char *); + static CreatorFuncPtr getPlanetMapCreator(const char*); }; diff --git a/include/Game/Map/PlanetMapWithoutHighModel.hpp b/include/Game/Map/PlanetMapWithoutHighModel.hpp index ebc11e70b..9620922dc 100644 --- a/include/Game/Map/PlanetMapWithoutHighModel.hpp +++ b/include/Game/Map/PlanetMapWithoutHighModel.hpp @@ -5,9 +5,9 @@ class PlanetMapWithoutHighModel : public MapObjActor { public: - PlanetMapWithoutHighModel(const char *); + PlanetMapWithoutHighModel(const char*); virtual ~PlanetMapWithoutHighModel(); - virtual void init(const JMapInfoIter &); - virtual void connectToScene(const MapObjActorInitInfo &); + virtual void init(const JMapInfoIter&); + virtual void connectToScene(const MapObjActorInitInfo&); }; diff --git a/include/Game/Map/QuakeEffectGenerator.hpp b/include/Game/Map/QuakeEffectGenerator.hpp index e963047b8..c3be86cdf 100644 --- a/include/Game/Map/QuakeEffectGenerator.hpp +++ b/include/Game/Map/QuakeEffectGenerator.hpp @@ -7,7 +7,7 @@ public: QuakeEffectGenerator(); virtual ~QuakeEffectGenerator(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); void exeWaitInArea(); void exeQuaking(); diff --git a/include/Game/Map/RaceManager.hpp b/include/Game/Map/RaceManager.hpp index 49ed47dad..04e7491aa 100644 --- a/include/Game/Map/RaceManager.hpp +++ b/include/Game/Map/RaceManager.hpp @@ -46,8 +46,8 @@ public: virtual void resetRacer(const RaceManager* pRaceManager) = 0; virtual void exitRacer() = 0; - /* 0x04 */ f32 _4; - /* 0x08 */ f32 _8; + /* 0x04 */ f32 _4; + /* 0x08 */ f32 _8; /* 0x0C */ TVec3f mCurrPosition; /* 0x18 */ TVec3f mPrevPosition; }; @@ -60,7 +60,7 @@ public: virtual void prepAudience() = 0; virtual void resetAudience() = 0; - /* 0x04 */ u8 _4; + /* 0x04 */ u8 _4; /* 0x08 */ s32 _8; /* 0x0C */ s32 _C; /* 0x10 */ s32 _10; @@ -99,32 +99,32 @@ public: void entry(PlayerRacer*); void entry(AbstractAudience*); bool isGoal(const AbstractRacer*) const; - u32 getRank(const AbstractRacer*) const; + u32 getRank(const AbstractRacer*) const; void renewTime(); - /* 0x8C */ s32 mCurrentRace; + /* 0x8C */ s32 mCurrentRace; /* 0x90 */ RaceManagerLayout* mLayout; - /* 0x94 */ AbstractRacer* mRacer[10]; - /* 0xBC */ AbstractAudience* mAudience[10]; - /* 0xE4 */ u32 mRacerNum; - /* 0xE8 */ u32 mAudienceNum; - /* 0xEC */ u32 mRank; - /* 0xF0 */ u32 mBestTime; - /* 0xF4 */ u32 mTime; - /* 0xF8 */ PlayerRacer* mPlayerRacer; - /* 0xFC */ TPos3f _FC; + /* 0x94 */ AbstractRacer* mRacer[10]; + /* 0xBC */ AbstractAudience* mAudience[10]; + /* 0xE4 */ u32 mRacerNum; + /* 0xE8 */ u32 mAudienceNum; + /* 0xEC */ u32 mRank; + /* 0xF0 */ u32 mBestTime; + /* 0xF4 */ u32 mTime; + /* 0xF8 */ PlayerRacer* mPlayerRacer; + /* 0xFC */ TPos3f _FC; }; namespace RaceManagerFunction { - void entryRacerOthers(AbstractRacer*); - void entryAudience(AbstractAudience*); - void entryRacerPlayer(PlayerRacer*); - void startRaceWithWipe(); - void startRaceImmediately(); - u32 getRaceRank(); - u32 getRaceTime(); + void entryRacerOthers(AbstractRacer*); + void entryAudience(AbstractAudience*); + void entryRacerPlayer(PlayerRacer*); + void startRaceWithWipe(); + void startRaceImmediately(); + u32 getRaceRank(); + u32 getRaceTime(); const char* getRaceName(int); const char* getRaceMessageId(int); - s32 getRaceId(const char*, s32); - bool hasPowerStarRaceScenario(int); -}; + s32 getRaceId(const char*, s32); + bool hasPowerStarRaceScenario(int); +}; // namespace RaceManagerFunction diff --git a/include/Game/Map/RaceRail.hpp b/include/Game/Map/RaceRail.hpp index 8db8be84f..4a2d7a0dd 100644 --- a/include/Game/Map/RaceRail.hpp +++ b/include/Game/Map/RaceRail.hpp @@ -8,31 +8,31 @@ class ActorCameraInfo; class PlayerRacer : public LiveActor, public AbstractRacer { public: - PlayerRacer(const char *); + PlayerRacer(const char*); virtual ~PlayerRacer(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void initRacer(); - virtual void prepRacer(const RaceManager *); + virtual void prepRacer(const RaceManager*); virtual void startRacer(); - virtual bool updateRacer(const RaceManager *); + virtual bool updateRacer(const RaceManager*); virtual bool goalRacer(); virtual void loseRacer(); - virtual void resetRacer(const RaceManager *); + virtual void resetRacer(const RaceManager*); virtual void exitRacer(); - u32 _B0; - u32 _B4; - ActorCameraInfo* mCameraInfo; // 0xB8 + u32 _B0; + u32 _B4; + ActorCameraInfo* mCameraInfo; // 0xB8 }; class RaceRail : public NameObj { public: - RaceRail(const char *); + RaceRail(const char*); virtual ~RaceRail(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - PlayerRacer* mPlayerRacer; // 0xC + PlayerRacer* mPlayerRacer; // 0xC }; \ No newline at end of file diff --git a/include/Game/Map/RailGraph.hpp b/include/Game/Map/RailGraph.hpp index 0672d20c7..3936f820d 100644 --- a/include/Game/Map/RailGraph.hpp +++ b/include/Game/Map/RailGraph.hpp @@ -11,18 +11,18 @@ class RailGraph { public: RailGraph(); - s32 addNode(const TVec3f &); - void connectNodeTwoWay(s32, s32, const RailGraphEdge *); + s32 addNode(const TVec3f&); + void connectNodeTwoWay(s32, s32, const RailGraphEdge*); RailGraphNode* getNode(s32) const; RailGraphEdge* getEdge(s32) const; - bool isValidEdge(s32) const; - void connectEdgeToNode(s32, s32); - RailGraphIter getIterator() const; + bool isValidEdge(s32) const; + void connectEdgeToNode(s32, s32); + RailGraphIter getIterator() const; - RailGraphNode* mNodes; // 0x0 - s32 mNodeCount; // 0x4 - u32 _8; - RailGraphEdge* mEdges; // 0xC - s32 mEdgeCount; // 0x10 - s32 _14; + RailGraphNode* mNodes; // 0x0 + s32 mNodeCount; // 0x4 + u32 _8; + RailGraphEdge* mEdges; // 0xC + s32 mEdgeCount; // 0x10 + s32 _14; }; \ No newline at end of file diff --git a/include/Game/Map/RailGraphEdge.hpp b/include/Game/Map/RailGraphEdge.hpp index 58d40feb1..08a9c418b 100644 --- a/include/Game/Map/RailGraphEdge.hpp +++ b/include/Game/Map/RailGraphEdge.hpp @@ -9,12 +9,12 @@ public: RailGraphEdge(); void clearConnectInfo(); - s32 getNextNode(s32) const; - s32 getNextEdge(s32) const; + s32 getNextNode(s32) const; + s32 getNextEdge(s32) const; void setNextEdge(s32, s32); - void setArgs(const JMapInfo *, s32); + void setArgs(const JMapInfo*, s32); - void operator=(const RailGraphEdge &rEdge) { + void operator=(const RailGraphEdge& rEdge) { mDistance = rEdge.mDistance; _4 = rEdge._4; _8 = rEdge._8; @@ -30,7 +30,7 @@ public: mPointArg7 = rEdge.mPointArg7; } - f32 mDistance; // 0x0 + f32 mDistance; // 0x0 s32 _4; s32 _8; s32 _C; diff --git a/include/Game/Map/RailGraphIter.hpp b/include/Game/Map/RailGraphIter.hpp index 0529ad766..97064fc66 100644 --- a/include/Game/Map/RailGraphIter.hpp +++ b/include/Game/Map/RailGraphIter.hpp @@ -6,26 +6,26 @@ class RailGraphIter { public: - RailGraphIter(const RailGraph *); + RailGraphIter(const RailGraph*); - void moveNodeNext(); - void setNode(s32); - void watchStartEdge(); - void watchNextEdge(); - bool isWatchEndEdge() const; - void selectEdge(); - void selectEdge(s32); - bool isWatchedPrevEdge() const; - bool isSelectedEdge() const; + void moveNodeNext(); + void setNode(s32); + void watchStartEdge(); + void watchNextEdge(); + bool isWatchEndEdge() const; + void selectEdge(); + void selectEdge(s32); + bool isWatchedPrevEdge() const; + bool isSelectedEdge() const; RailGraphNode* getCurrentNode() const; RailGraphNode* getNextNode() const; RailGraphNode* getWatchNode() const; RailGraphEdge* getCurrentEdge() const; RailGraphEdge* getWatchEdge() const; - const RailGraph* mGraph; // 0x0 - s32 _4; - s32 mSelectedEdge; // 0x8 - s32 mNextEdge; // 0xC - s32 _10; + const RailGraph* mGraph; // 0x0 + s32 _4; + s32 mSelectedEdge; // 0x8 + s32 mNextEdge; // 0xC + s32 _10; }; \ No newline at end of file diff --git a/include/Game/Map/RailGraphNode.hpp b/include/Game/Map/RailGraphNode.hpp index 7a372eb64..0eda68dd9 100644 --- a/include/Game/Map/RailGraphNode.hpp +++ b/include/Game/Map/RailGraphNode.hpp @@ -8,6 +8,6 @@ public: RailGraphNode(); TVec3f _0; - s32 _C; - u32 _10; + s32 _C; + u32 _10; }; \ No newline at end of file diff --git a/include/Game/Map/RailPart.hpp b/include/Game/Map/RailPart.hpp index 0bae6bca9..63e74c085 100644 --- a/include/Game/Map/RailPart.hpp +++ b/include/Game/Map/RailPart.hpp @@ -7,17 +7,16 @@ class LinearRailPart; class RailPart { public: - RailPart(); - void init(const TVec3f &, const TVec3f &, const TVec3f &, const TVec3f &); - void initForBezier(const TVec3f &, const TVec3f &, const TVec3f &, const TVec3f &); - void calcPos(TVec3f *, f32) const; - void calcVelocity(TVec3f *, f32) const; - f32 getLength(f32, f32, int) const; - f32 getTotalLength() const; - f32 getParam(f32) const; - f32 getNearestParam(const TVec3f &, f32) const; + void init(const TVec3f&, const TVec3f&, const TVec3f&, const TVec3f&); + void initForBezier(const TVec3f&, const TVec3f&, const TVec3f&, const TVec3f&); + void calcPos(TVec3f*, f32) const; + void calcVelocity(TVec3f*, f32) const; + f32 getLength(f32, f32, int) const; + f32 getTotalLength() const; + f32 getParam(f32) const; + f32 getNearestParam(const TVec3f&, f32) const; LinearRailPart* mRailPartLinear; // 0x0 BezierRailPart* mRailPartBezier; // 0x4 @@ -25,13 +24,13 @@ public: class LinearRailPart { public: - inline LinearRailPart() { } + inline LinearRailPart() {} - void set(const TVec3f &, const TVec3f &); + void set(const TVec3f&, const TVec3f&); - f32 getNearestParam(const TVec3f &, f32) const; + f32 getNearestParam(const TVec3f&, f32) const; TVec3f _0; TVec3f _C; - f32 _18; + f32 _18; }; \ No newline at end of file diff --git a/include/Game/Map/ScenarioSelectStar.hpp b/include/Game/Map/ScenarioSelectStar.hpp index 8a8380037..e47a205b7 100644 --- a/include/Game/Map/ScenarioSelectStar.hpp +++ b/include/Game/Map/ScenarioSelectStar.hpp @@ -4,10 +4,10 @@ class ScenarioSelectStar : public MultiSceneActor { public: - ScenarioSelectStar(EffectSystem *); + ScenarioSelectStar(EffectSystem*); virtual ~ScenarioSelectStar(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calcViewAndEntry(); virtual void appear(); virtual void kill(); @@ -17,7 +17,7 @@ public: void select(); void notSelect(); bool isAppearEnd() const; - void setup(s32, int, const TVec3f &, s32); + void setup(s32, int, const TVec3f&, s32); bool tryEndPointing(); void updatePos(); void exeAppear(); @@ -28,14 +28,14 @@ public: void exeSelectedMove(); void exeNotSelected(); - int _44; - s32 mFrame; // 0x48 - s32 _4C; - bool _50; - f32 _54; - s32 _58; + int _44; + s32 mFrame; // 0x48 + s32 _4C; + bool _50; + f32 _54; + s32 _58; TVec3f _5C; TVec3f _68; - int _74; - f32 _78; + int _74; + f32 _78; }; diff --git a/include/Game/Map/SeaGull.hpp b/include/Game/Map/SeaGull.hpp index df4f76b46..ac5d61509 100644 --- a/include/Game/Map/SeaGull.hpp +++ b/include/Game/Map/SeaGull.hpp @@ -6,10 +6,10 @@ class SeaGullGroup; class SeaGull : public LiveActor { public: - SeaGull(SeaGullGroup *); + SeaGull(SeaGullGroup*); virtual ~SeaGull(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); virtual void calcAndSetBaseMtx(); @@ -18,37 +18,37 @@ public: void exeHoverRight(); void updateHover(); - SeaGullGroup* mSeaGullGroup; // 0x8C - s32 _90; - bool _94; - s32 _98; - TVec3f* _9C; - TVec3f _A0; - TVec3f _AC; - TVec3f _B8; - TVec3f _C4; - s32 _D0; - f32 _D4; - u32 _D8; - u32 _DC; - s32 _E0; + SeaGullGroup* mSeaGullGroup; // 0x8C + s32 _90; + bool _94; + s32 _98; + TVec3f* _9C; + TVec3f _A0; + TVec3f _AC; + TVec3f _B8; + TVec3f _C4; + s32 _D0; + f32 _D4; + u32 _D8; + u32 _DC; + s32 _E0; }; namespace NrvSeaGull { NERVE(SeaGullNrvHoverFront); NERVE(SeaGullNrvHoverLeft); NERVE(SeaGullNrvHoverRight); -}; +}; // namespace NrvSeaGull class SeaGullGroup : public LiveActor { public: - SeaGullGroup(const char *); + SeaGullGroup(const char*); virtual ~SeaGullGroup(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - TVec3f* updatePosInfo(s32 *, bool) const; - - s32 _8C; + TVec3f* updatePosInfo(s32*, bool) const; + + s32 _8C; TVec3f* _90; }; \ No newline at end of file diff --git a/include/Game/Map/Sky.hpp b/include/Game/Map/Sky.hpp index 364367cac..221da7ad3 100644 --- a/include/Game/Map/Sky.hpp +++ b/include/Game/Map/Sky.hpp @@ -8,30 +8,30 @@ class SpaceInner; class Sky : public LiveActor { public: - Sky(const char *); + Sky(const char*); virtual ~Sky(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calcAnim(); virtual void control(); - virtual void initModel(const char *); + virtual void initModel(const char*); void disappearSpaceInner(); void appearSpaceInner(); - SpaceInner* mSpaceInner; // 0x8C - MirrorReflectionModel* mReflectionModel; // 0x90 + SpaceInner* mSpaceInner; // 0x8C + MirrorReflectionModel* mReflectionModel; // 0x90 }; class ProjectionMapSky : public Sky { public: - ProjectionMapSky(const char *); + ProjectionMapSky(const char*); virtual ~ProjectionMapSky(); virtual void calcAndSetBaseMtx(); - virtual void initModel(const char *); + virtual void initModel(const char*); - ProjmapEffectMtxSetter* mMtxSetter; // 0x94 + ProjmapEffectMtxSetter* mMtxSetter; // 0x94 }; namespace NrvSky { @@ -39,4 +39,4 @@ namespace NrvSky { NERVE(HostTypeWait); NERVE(HostTypeChange); -}; \ No newline at end of file +}; // namespace NrvSky \ No newline at end of file diff --git a/include/Game/Map/SleepController.hpp b/include/Game/Map/SleepController.hpp index 655fa3090..a8d330c17 100644 --- a/include/Game/Map/SleepController.hpp +++ b/include/Game/Map/SleepController.hpp @@ -11,7 +11,7 @@ public: void initSync(); void update(); - SwitchIdInfo* _0; + SwitchIdInfo* _0; SwitchEventListener* _4; - bool _8; + bool _8; }; diff --git a/include/Game/Map/SleepControllerHolder.hpp b/include/Game/Map/SleepControllerHolder.hpp index 5faebf307..e6e266dcc 100644 --- a/include/Game/Map/SleepControllerHolder.hpp +++ b/include/Game/Map/SleepControllerHolder.hpp @@ -6,8 +6,8 @@ class AreaObj; class SleepControlFunc { public: - static void addSleepControl(AreaObj *, const JMapInfoIter&); - static void addSleepControl(LiveActor *, const JMapInfoIter &); + static void addSleepControl(AreaObj*, const JMapInfoIter&); + static void addSleepControl(LiveActor*, const JMapInfoIter&); static void initSyncSleepController(); }; diff --git a/include/Game/Map/SpaceInner.hpp b/include/Game/Map/SpaceInner.hpp index 466ecce31..722e7b880 100644 --- a/include/Game/Map/SpaceInner.hpp +++ b/include/Game/Map/SpaceInner.hpp @@ -4,10 +4,10 @@ class SpaceInner : public LiveActor { public: - SpaceInner(const char *); + SpaceInner(const char*); virtual ~SpaceInner(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calcAnim(); virtual void appear(); @@ -18,4 +18,4 @@ public: namespace NrvSpaceInner { NERVE(HostTypeDisappear); NERVE(HostTypeAppear); -}; \ No newline at end of file +}; // namespace NrvSpaceInner \ No newline at end of file diff --git a/include/Game/Map/SphereSelector.hpp b/include/Game/Map/SphereSelector.hpp index f102e78ed..5f59308c5 100644 --- a/include/Game/Map/SphereSelector.hpp +++ b/include/Game/Map/SphereSelector.hpp @@ -18,7 +18,7 @@ public: SphereSelector(); virtual ~SphereSelector(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void kill(); @@ -37,17 +37,17 @@ public: void exeConfirmCancel(); void exeConfirm(); - LiveActorGroup* mSphereGroup; // 0x8C + LiveActorGroup* mSphereGroup; // 0x8C - bool mIsPointingInvalid; // 0xB0 + bool mIsPointingInvalid; // 0xB0 }; class SphereSelectorFunction { public: - static bool registerTarget(LiveActor *); + static bool registerTarget(LiveActor*); static bool isPadButton(); - static s32 getSelectStartFrame(); - static s32 getConfirmStartCancelFrame(); + static s32 getSelectStartFrame(); + static s32 getConfirmStartCancelFrame(); static void selectStart(); static void selectCancel(bool); static void selectEnd(); @@ -56,32 +56,31 @@ public: static void confirmed(); static bool isSelectWait(); static bool isConfirmWait(); - + static bool isMsgSelectStart(u32); static bool isMsgSelectEnd(u32); static bool isMsgConfirmStart(u32); static bool isMsgConfirmCancel(u32); - static bool isMsgConfirmed(u32); - static bool isMsgTargetSelected(u32); - static bool trySyncAppearMsgSelectStart(LiveActor *, u32); - static bool trySyncKillMsgSelectStart(LiveActor *, u32); - static void validatePointing(); - static void invalidatePointing(); - static bool isValidPointing(); - static void setHandle(SphereSelectorHandle *); - static void calcHandledTrans(const TVec3f &, TVec3f *); - static void calcHandledRotateMtx(const TVec3f &, TPos3f *); - static TVec3f& getHandleTrans(); - static f32 getHandleRotateSpeed(); - static bool isHandleHolding(); - static void registerPointingTarget(LiveActor *, HandlePointingPriority); - static bool tryRegisterPointingTarget(LiveActor *, HandlePointingPriority); - static bool isPointingTarget(); - static bool isPointingTarget(const LiveActor *); + static bool isMsgConfirmed(u32); + static bool isMsgTargetSelected(u32); + static bool trySyncAppearMsgSelectStart(LiveActor*, u32); + static bool trySyncKillMsgSelectStart(LiveActor*, u32); + static void validatePointing(); + static void invalidatePointing(); + static bool isValidPointing(); + static void setHandle(SphereSelectorHandle*); + static void calcHandledTrans(const TVec3f&, TVec3f*); + static void calcHandledRotateMtx(const TVec3f&, TPos3f*); + static TVec3f& getHandleTrans(); + static f32 getHandleRotateSpeed(); + static bool isHandleHolding(); + static void registerPointingTarget(LiveActor*, HandlePointingPriority); + static bool tryRegisterPointingTarget(LiveActor*, HandlePointingPriority); + static bool isPointingTarget(); + static bool isPointingTarget(const LiveActor*); static LiveActor* getPointingTarget(); static LiveActor* getSelectedTarget(); - static TVec3f& getSelectedActorTrans(); - static void calcOffsetPos(TVec3f *, const TVec3f &, const TVec3f &, const TVec3f &, const TVec3f &); - + static TVec3f& getSelectedActorTrans(); + static void calcOffsetPos(TVec3f*, const TVec3f&, const TVec3f&, const TVec3f&, const TVec3f&); }; diff --git a/include/Game/Map/StageSwitch.hpp b/include/Game/Map/StageSwitch.hpp index f77656e2e..3f6d43a86 100644 --- a/include/Game/Map/StageSwitch.hpp +++ b/include/Game/Map/StageSwitch.hpp @@ -18,7 +18,7 @@ public: bool get(int) const; void set(int, bool); - u32 mFlags[0x4]; // 0x0 + u32 mFlags[0x4]; // 0x0 }; class ZoneSwitch : public BitFlag128 { @@ -28,45 +28,45 @@ public: class SwitchIdInfo { public: - SwitchIdInfo(s32, const JMapInfoIter &); + SwitchIdInfo(s32, const JMapInfoIter&); s32 getSwitchNo() const; - JMapIdInfo* mIDInfo; // 0x0 - bool mIsGlobal; // 0x4 + JMapIdInfo* mIDInfo; // 0x0 + bool mIsGlobal; // 0x4 }; class StageSwitchContainer : public NameObj { public: struct ContainerSwitch { - s32 mData; // 0x0 - ZoneSwitch* mSwitch; // 0x4 + s32 mData; // 0x0 + ZoneSwitch* mSwitch; // 0x4 }; StageSwitchContainer(); virtual ~StageSwitchContainer(); - void createAndAddZone(const SwitchIdInfo &); - ZoneSwitch* getZoneSwitch(const SwitchIdInfo &); - ZoneSwitch* findZoneSwitchFromTable(const SwitchIdInfo &); + void createAndAddZone(const SwitchIdInfo&); + ZoneSwitch* getZoneSwitch(const SwitchIdInfo&); + ZoneSwitch* findZoneSwitchFromTable(const SwitchIdInfo&); private: - MR::Vector > mSwitches; // 0x0C - ZoneSwitch* mGlobalSwitches; // 0xB0 + MR::Vector> mSwitches; // 0x0C + ZoneSwitch* mGlobalSwitches; // 0xB0 }; class StageSwitchFunction { public: - static SwitchIdInfo* createSwitchIdInfo(const char *, const JMapInfoIter &, bool); - static void onSwitchBySwitchIdInfo(const SwitchIdInfo &); - static void offSwitchBySwitchIdInfo(const SwitchIdInfo &); - static bool isOnSwitchBySwitchIdInfo(const SwitchIdInfo &); + static SwitchIdInfo* createSwitchIdInfo(const char*, const JMapInfoIter&, bool); + static void onSwitchBySwitchIdInfo(const SwitchIdInfo&); + static void offSwitchBySwitchIdInfo(const SwitchIdInfo&); + static bool isOnSwitchBySwitchIdInfo(const SwitchIdInfo&); }; class StageSwitchCtrl { public: - StageSwitchCtrl(const JMapInfoIter &); + StageSwitchCtrl(const JMapInfoIter&); void onSwitchA(); void offSwitchA(); @@ -84,12 +84,12 @@ public: bool isOnAllSwitchAfterB(int) const; bool isOnAnyOneSwitchAfterB(int) const; - SwitchIdInfo* mSW_A; // 0x0 - SwitchIdInfo* mSW_B; // 0x4 - SwitchIdInfo* mSW_Appear; // 0x8 - SwitchIdInfo* mSW_Dead; // 0xC + SwitchIdInfo* mSW_A; // 0x0 + SwitchIdInfo* mSW_B; // 0x4 + SwitchIdInfo* mSW_Appear; // 0x8 + SwitchIdInfo* mSW_Dead; // 0xC }; namespace MR { - StageSwitchCtrl* createStageSwitchCtrl(NameObj *, const JMapInfoIter &); + StageSwitchCtrl* createStageSwitchCtrl(NameObj*, const JMapInfoIter&); }; \ No newline at end of file diff --git a/include/Game/Map/SunshadeMapHolder.hpp b/include/Game/Map/SunshadeMapHolder.hpp index 6345146cd..9ff665613 100644 --- a/include/Game/Map/SunshadeMapHolder.hpp +++ b/include/Game/Map/SunshadeMapHolder.hpp @@ -13,6 +13,6 @@ public: }; namespace MR { - bool isInShadeFromTheSun(const TVec3f &, f32); + bool isInShadeFromTheSun(const TVec3f&, f32); void createSunshadeMapHolder(); -}; +}; // namespace MR diff --git a/include/Game/Map/SunshadeMapParts.hpp b/include/Game/Map/SunshadeMapParts.hpp index 2e693643a..afa7d718e 100644 --- a/include/Game/Map/SunshadeMapParts.hpp +++ b/include/Game/Map/SunshadeMapParts.hpp @@ -4,15 +4,15 @@ class SunshadeMapParts : public GeneralMapParts { public: - SunshadeMapParts(const char *); + SunshadeMapParts(const char*); virtual ~SunshadeMapParts(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calcAnim(); - CollisionParts* mCollision; // 0xE8 + CollisionParts* mCollision; // 0xE8 }; namespace MR { - SunshadeMapParts* createSunshadeMapParts(const char *); + SunshadeMapParts* createSunshadeMapParts(const char*); }; diff --git a/include/Game/Map/SwitchSynchronizer.hpp b/include/Game/Map/SwitchSynchronizer.hpp index 4314c387a..db70d8d85 100644 --- a/include/Game/Map/SwitchSynchronizer.hpp +++ b/include/Game/Map/SwitchSynchronizer.hpp @@ -5,12 +5,12 @@ class SwitchSynchronizer : public NameObj { public: - SwitchSynchronizer(const char *); + SwitchSynchronizer(const char*); virtual ~SwitchSynchronizer(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); - StageSwitchCtrl* mSwitchCtrl; // 0x0C - u8 _10; + StageSwitchCtrl* mSwitchCtrl; // 0x0C + u8 _10; }; diff --git a/include/Game/Map/SwitchWatcher.hpp b/include/Game/Map/SwitchWatcher.hpp index adc3c477e..ee616ff75 100644 --- a/include/Game/Map/SwitchWatcher.hpp +++ b/include/Game/Map/SwitchWatcher.hpp @@ -7,14 +7,14 @@ class SwitchEventListener; class SwitchWatcher : public NameObj { public: - SwitchWatcher(const StageSwitchCtrl *); + SwitchWatcher(const StageSwitchCtrl*); virtual ~SwitchWatcher(); virtual void movement(); - u32 mFlags; // 0xC - StageSwitchCtrl* mSwitchCtrl; // 0x10 - SwitchEventListener* mSwitchAListener; // 0x14 - SwitchEventListener* mSwitchBListener; // 0x18 - SwitchEventListener* mSwitchApprListener; // 0x1C + u32 mFlags; // 0xC + StageSwitchCtrl* mSwitchCtrl; // 0x10 + SwitchEventListener* mSwitchAListener; // 0x14 + SwitchEventListener* mSwitchBListener; // 0x18 + SwitchEventListener* mSwitchApprListener; // 0x1C }; diff --git a/include/Game/Map/SwitchWatcherHolder.hpp b/include/Game/Map/SwitchWatcherHolder.hpp index 768b4a05e..5c227027c 100644 --- a/include/Game/Map/SwitchWatcherHolder.hpp +++ b/include/Game/Map/SwitchWatcherHolder.hpp @@ -14,17 +14,17 @@ public: virtual void movement(); - void joinSwitchEventListenerA(const StageSwitchCtrl*, SwitchEventListener*); - void joinSwitchEventListenerB(const StageSwitchCtrl*, SwitchEventListener*); - void joinSwitchEventListenerAppear(const StageSwitchCtrl*, SwitchEventListener*); + void joinSwitchEventListenerA(const StageSwitchCtrl*, SwitchEventListener*); + void joinSwitchEventListenerB(const StageSwitchCtrl*, SwitchEventListener*); + void joinSwitchEventListenerAppear(const StageSwitchCtrl*, SwitchEventListener*); SwitchWatcher* findSwitchWatcher(const StageSwitchCtrl*); - void joinSwitchEventListener(const StageSwitchCtrl*, u32, SwitchEventListener*); - void addSwitchWatcher(SwitchWatcher*); + void joinSwitchEventListener(const StageSwitchCtrl*, u32, SwitchEventListener*); + void addSwitchWatcher(SwitchWatcher*); - /* 0x0C */ MR::Vector > mSwitchWatcher; + /* 0x0C */ MR::Vector> mSwitchWatcher; }; namespace MR { SwitchWatcherHolder* getSwitchWatcherHolder(); - void requestMovementOnSwitchWatcher(); -}; + void requestMovementOnSwitchWatcher(); +}; // namespace MR diff --git a/include/Game/Map/TimerSwitch.hpp b/include/Game/Map/TimerSwitch.hpp index b97712357..431b37785 100644 --- a/include/Game/Map/TimerSwitch.hpp +++ b/include/Game/Map/TimerSwitch.hpp @@ -4,12 +4,12 @@ class TimerSwitch : public LiveActor { public: - TimerSwitch(const char *); + TimerSwitch(const char*); virtual ~TimerSwitch(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - s32 mTimerLength; // 0x8C - s32 mCurrentTime; // 0x90 + s32 mTimerLength; // 0x8C + s32 mCurrentTime; // 0x90 }; \ No newline at end of file diff --git a/include/Game/Map/WaterAreaHolder.hpp b/include/Game/Map/WaterAreaHolder.hpp index e6bc45e58..58a154012 100644 --- a/include/Game/Map/WaterAreaHolder.hpp +++ b/include/Game/Map/WaterAreaHolder.hpp @@ -12,16 +12,16 @@ class WaterInfo; class WaterAreaFunction { public: - static void entryOceanBowl(OceanBowl*); - static void entryOceanRing(OceanRing*); - static void entryOceanSphere(OceanSphere*); - static void entryWhirlPool(WhirlPool*); - static void entryWhirlPoolAccelerator(WhirlPoolAccelerator*); - static void createWaterAreaHolder(); - static bool tryInOceanArea(const TVec3f&, WaterInfo*); - static bool tryInWhirlPoolAccelerator(const TVec3f&, TVec3f*); - static bool isCameraInWaterForCameraUtil(); - static f32 getCameraWaterDepth(); + static void entryOceanBowl(OceanBowl*); + static void entryOceanRing(OceanRing*); + static void entryOceanSphere(OceanSphere*); + static void entryWhirlPool(WhirlPool*); + static void entryWhirlPoolAccelerator(WhirlPoolAccelerator*); + static void createWaterAreaHolder(); + static bool tryInOceanArea(const TVec3f&, WaterInfo*); + static bool tryInWhirlPoolAccelerator(const TVec3f&, TVec3f*); + static bool isCameraInWaterForCameraUtil(); + static f32 getCameraWaterDepth(); static WaterInfo* getCameraWaterInfo(); - static void pauseOffWaterArea(); + static void pauseOffWaterArea(); }; diff --git a/include/Game/Map/WaterInfo.hpp b/include/Game/Map/WaterInfo.hpp index 5de4d101f..9f704de7c 100644 --- a/include/Game/Map/WaterInfo.hpp +++ b/include/Game/Map/WaterInfo.hpp @@ -14,16 +14,16 @@ public: bool isInWater() const; void clear(); - f32 mCamWaterDepth; // 0x0 - f32 _4; - TVec3f mSurfacePos; // 0x8 - TVec3f mSurfaceNormal; // 0x14 - f32 mWaveHeight; // 0x20 - TVec3f mStreamVec; // 0x24 - f32 mEdgeDistance; // 0x30 - TVec3f mEdgePos; // 0x34 - const WaterArea* mWaterArea; // 0x40 - const OceanBowl* mOceanBowl; // 0x44 - const OceanRing* mOceanRing; // 0x48 - const OceanSphere* mOceanSphere; // 0x4C + f32 mCamWaterDepth; // 0x0 + f32 _4; + TVec3f mSurfacePos; // 0x8 + TVec3f mSurfaceNormal; // 0x14 + f32 mWaveHeight; // 0x20 + TVec3f mStreamVec; // 0x24 + f32 mEdgeDistance; // 0x30 + TVec3f mEdgePos; // 0x34 + const WaterArea* mWaterArea; // 0x40 + const OceanBowl* mOceanBowl; // 0x44 + const OceanRing* mOceanRing; // 0x48 + const OceanSphere* mOceanSphere; // 0x4C }; diff --git a/include/Game/Map/WaterPoint.hpp b/include/Game/Map/WaterPoint.hpp index 82cef0970..d85d08fd6 100644 --- a/include/Game/Map/WaterPoint.hpp +++ b/include/Game/Map/WaterPoint.hpp @@ -5,18 +5,18 @@ class WaterPoint { public: - WaterPoint(const TVec3f &, const TVec3f &, f32, f32, f32, f32); + WaterPoint(const TVec3f&, const TVec3f&, f32, f32, f32, f32); void initAfterPlacement(); void updatePos(f32, f32, f32, f32, f32); - f32 calcHeight(f32, f32, f32, f32, f32, f32) const; + f32 calcHeight(f32, f32, f32, f32, f32, f32) const; - TVec3f mPosition; // 0x0 - TVec3f mOrigPos; // 0xC - f32 mCoordAcrossRail; // 0x18 - f32 mCoordOnRail; // 0x1C - TVec3f mUpVec; // 0x20 - f32 mHeight; // 0x2C - f32 mFlowSpeedRate; // 0x30 - u8 mAlpha; // 0x34 + TVec3f mPosition; // 0x0 + TVec3f mOrigPos; // 0xC + f32 mCoordAcrossRail; // 0x18 + f32 mCoordOnRail; // 0x1C + TVec3f mUpVec; // 0x20 + f32 mHeight; // 0x2C + f32 mFlowSpeedRate; // 0x30 + u8 mAlpha; // 0x34 }; \ No newline at end of file diff --git a/include/Game/Map/WaterRoad.hpp b/include/Game/Map/WaterRoad.hpp index 4fd68161d..6708613b3 100644 --- a/include/Game/Map/WaterRoad.hpp +++ b/include/Game/Map/WaterRoad.hpp @@ -13,29 +13,29 @@ public: u32 _90; u32 _94; u32 _98; - u8 _9C; + u8 _9C; }; class WaterRoadModelInfo { public: - WaterRoadModelInfo(WaterRoad *, bool); + WaterRoadModelInfo(WaterRoad*, bool); - void initPoints(WaterRoad *); + void initPoints(WaterRoad*); void initDisplayList(); void sendGD() const; void drawGD() const; - void drawDirect(const WaterRoad *) const; - s32 calcDemoDrawPointNum(const WaterRoad *) const; - void loadMaterialHigh(const WaterRoad *) const; + void drawDirect(const WaterRoad*) const; + s32 calcDemoDrawPointNum(const WaterRoad*) const; + void loadMaterialHigh(const WaterRoad*) const; void loadMaterialLow() const; - bool mIsLow; // 0x0 - u32 _4; - s32 _8; - u32 _C; - TVec3f* _10; - TVec3s* _14; - f32* _18; - u32 mDLLength; // 0x1C - const void* mList; // 0x20 + bool mIsLow; // 0x0 + u32 _4; + s32 _8; + u32 _C; + TVec3f* _10; + TVec3s* _14; + f32* _18; + u32 mDLLength; // 0x1C + const void* mList; // 0x20 }; \ No newline at end of file diff --git a/include/Game/MapObj/AirBubble.hpp b/include/Game/MapObj/AirBubble.hpp index accbd7e6d..a0499dfa3 100644 --- a/include/Game/MapObj/AirBubble.hpp +++ b/include/Game/MapObj/AirBubble.hpp @@ -4,18 +4,18 @@ class AirBubble : public LiveActor { public: - AirBubble(const char *); + AirBubble(const char*); virtual ~AirBubble(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void appear(); virtual void kill(); virtual void control(); - virtual bool receiveMsgPush(HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgPush(HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void appearMove(const TVec3f &, s32); + void appearMove(const TVec3f&, s32); void exeWait(); void exeMove(); void exeBreak(); @@ -24,14 +24,14 @@ public: TVec3f _8C; TVec3f _98; TVec3f _A4; - f32 _B0; - u32 _B4; - u32 _B8; - u32 _BC; - f32 _C0; - s32 _C4; - u8 _C8; - u8 _C9; + f32 _B0; + u32 _B4; + u32 _B8; + u32 _BC; + f32 _C0; + s32 _C4; + u8 _C8; + u8 _C9; }; namespace NrvAirBubble { @@ -39,4 +39,4 @@ namespace NrvAirBubble { NERVE(AirBubbleNrvMove); NERVE(AirBubbleNrvBreak); NERVE(AirBubbleNrvKillWait); -}; \ No newline at end of file +}; // namespace NrvAirBubble \ No newline at end of file diff --git a/include/Game/MapObj/AirBubbleGenerator.hpp b/include/Game/MapObj/AirBubbleGenerator.hpp index 4e65967de..c8cd1adba 100644 --- a/include/Game/MapObj/AirBubbleGenerator.hpp +++ b/include/Game/MapObj/AirBubbleGenerator.hpp @@ -4,21 +4,21 @@ class AirBubbleGenerator : public LiveActor { public: - AirBubbleGenerator(const char *); + AirBubbleGenerator(const char*); virtual ~AirBubbleGenerator(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); void exeWait(); void exeGenerate(); u32 _8C; - s32 mSpawnDelay; // 0x90 - s32 mBubbleDuration; // 0x94 + s32 mSpawnDelay; // 0x90 + s32 mBubbleDuration; // 0x94 }; namespace NrvAirBubbleGenerator { NERVE_DECL(AirBubbleGeneratorNrvGenerate, AirBubbleGenerator, AirBubbleGenerator::exeGenerate); NERVE_DECL(AirBubbleGenerateNrvWait, AirBubbleGenerator, AirBubbleGenerator::exeWait); -}; \ No newline at end of file +}; // namespace NrvAirBubbleGenerator \ No newline at end of file diff --git a/include/Game/MapObj/AirBubbleHolder.hpp b/include/Game/MapObj/AirBubbleHolder.hpp index 0de8b134b..563d92801 100644 --- a/include/Game/MapObj/AirBubbleHolder.hpp +++ b/include/Game/MapObj/AirBubbleHolder.hpp @@ -5,14 +5,14 @@ class AirBubbleHolder : public LiveActorGroup { public: - AirBubbleHolder(const char *); + AirBubbleHolder(const char*); - virtual void init(const JMapInfoIter &); - - void appearAirBubble(const TVec3f &, s32); + virtual void init(const JMapInfoIter&); + + void appearAirBubble(const TVec3f&, s32); }; namespace MR { AirBubbleHolder* createAirBubbleHolder(); - void appearAirBubble(const TVec3f &, s32); -}; \ No newline at end of file + void appearAirBubble(const TVec3f&, s32); +}; // namespace MR \ No newline at end of file diff --git a/include/Game/MapObj/AnmModelObj.hpp b/include/Game/MapObj/AnmModelObj.hpp index cbf28ad62..e308a724f 100644 --- a/include/Game/MapObj/AnmModelObj.hpp +++ b/include/Game/MapObj/AnmModelObj.hpp @@ -4,45 +4,45 @@ class AnmModelObj : public MapObjActor { public: - AnmModelObj(const char *); + AnmModelObj(const char*); virtual ~AnmModelObj(); - virtual void init(const JMapInfoIter &); - virtual void control(); - virtual void initCaseUseSwitchA(const MapObjActorInitInfo &); - virtual void initCaseNoUseSwitchA(const MapObjActorInitInfo &); - virtual void initCaseUseSwitchB(const MapObjActorInitInfo &); - virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo &); - virtual bool isOnStartAnmTrigger() const = 0; - virtual bool isDone() const; - virtual bool isKilledAtMoveDone() const; - virtual bool isRepeat() const; - virtual void startInner(); + virtual void init(const JMapInfoIter&); + virtual void control(); + virtual void initCaseUseSwitchA(const MapObjActorInitInfo&); + virtual void initCaseNoUseSwitchA(const MapObjActorInitInfo&); + virtual void initCaseUseSwitchB(const MapObjActorInitInfo&); + virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo&); + virtual bool isOnStartAnmTrigger() const = 0; + virtual bool isDone() const; + virtual bool isKilledAtMoveDone() const; + virtual bool isRepeat() const; + virtual void startInner(); virtual inline void moveInner(); - virtual void stopInner(); + virtual void stopInner(); inline void exeWait(); - void exeMove(); - void exeDone(); + void exeMove(); + void exeDone(); - TVec3f mJointPos; // 0xC4 + TVec3f mJointPos; // 0xC4 }; class AnmModelSwitchMove : public AnmModelObj { public: - AnmModelSwitchMove(const char *); + AnmModelSwitchMove(const char*); virtual ~AnmModelSwitchMove(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual bool isOnStartAnmTrigger() const; }; class AnmModelGroundOnMove : public AnmModelObj { public: - AnmModelGroundOnMove(const char *); + AnmModelGroundOnMove(const char*); virtual ~AnmModelGroundOnMove(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); virtual bool isOnStartAnmTrigger() const; virtual bool isKilledAtMoveDone() const; @@ -50,12 +50,12 @@ public: class AnmModelBindMove : public AnmModelObj { public: - AnmModelBindMove(const char *); + AnmModelBindMove(const char*); virtual ~AnmModelBindMove(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); virtual bool isOnStartAnmTrigger() const; virtual bool isKilledAtMoveDone() const; virtual bool isRepeat() const; @@ -63,19 +63,19 @@ public: class AnmModelSwitchMoveEventCamera : public AnmModelSwitchMove { public: - AnmModelSwitchMoveEventCamera(const char *); + AnmModelSwitchMoveEventCamera(const char*); virtual ~AnmModelSwitchMoveEventCamera(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual bool isDone() const; virtual void startInner(); virtual void stopInner(); - ActorCameraInfo* mCameraInfo; // 0xD0 + ActorCameraInfo* mCameraInfo; // 0xD0 }; namespace NrvAnmModelObj { NERVE_DECL(HostTypeWait, AnmModelObj, AnmModelObj::exeWait); NERVE_DECL(HostTypeMove, AnmModelObj, AnmModelObj::exeMove); NERVE_DECL(HostTypeDone, AnmModelObj, AnmModelObj::exeDone); -}; +}; // namespace NrvAnmModelObj diff --git a/include/Game/MapObj/ArrowSwitch.hpp b/include/Game/MapObj/ArrowSwitch.hpp index 846e61bbd..65434b324 100644 --- a/include/Game/MapObj/ArrowSwitch.hpp +++ b/include/Game/MapObj/ArrowSwitch.hpp @@ -4,17 +4,17 @@ class ArrowSwitch : public LiveActor { public: - ArrowSwitch(const char *); + ArrowSwitch(const char*); virtual ~ArrowSwitch(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPush(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPush(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); - bool requestPunch(HitSensor *, HitSensor *); + bool requestPunch(HitSensor*, HitSensor*); void listenOnSwitch(); void listenOffSwitch(); void exeWait(); @@ -22,20 +22,20 @@ public: void exeLock(); bool isPlusLimit() const; bool isMinusLimit() const; - s32 getOneStep() const; + s32 getOneStep() const; - f32 _8C; - s32 mRotationIdx; // 0x90 - f32 _94; - s32 _98; + f32 _8C; + s32 mRotationIdx; // 0x90 + f32 _94; + s32 _98; bool _9C; - u8 _9D; - u8 _9E; - u8 _9F; + u8 _9D; + u8 _9E; + u8 _9F; }; namespace NrvArrowSwitch { NERVE(ArrowSwitchNrvRotate); NERVE(ArrowSwitchNrvLock); NERVE(ArrowSwitchNrvWait); -}; \ No newline at end of file +}; // namespace NrvArrowSwitch \ No newline at end of file diff --git a/include/Game/MapObj/ArrowSwitchMulti.hpp b/include/Game/MapObj/ArrowSwitchMulti.hpp index abc0e614a..eafd78d67 100644 --- a/include/Game/MapObj/ArrowSwitchMulti.hpp +++ b/include/Game/MapObj/ArrowSwitchMulti.hpp @@ -4,45 +4,45 @@ class ArrowSwitchTarget : public NameObj { public: - ArrowSwitchTarget(const char *); + ArrowSwitchTarget(const char*); virtual ~ArrowSwitchTarget(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); void onTarget(); void offTarget(); - JMapIdInfo* mJMapIDInfo; // 0xC - StageSwitchCtrl* mStageSwitchCtrl; // 0x10 - s32 mTargetIdx; // 0x14 + JMapIdInfo* mJMapIDInfo; // 0xC + StageSwitchCtrl* mStageSwitchCtrl; // 0x10 + s32 mTargetIdx; // 0x14 }; class ArrowSwitchMulti : public LiveActor { public: - ArrowSwitchMulti(const char *); + ArrowSwitchMulti(const char*); virtual ~ArrowSwitchMulti(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); - void registerTarget(ArrowSwitchTarget *); - bool requestPunch(HitSensor *, HitSensor *); + void registerTarget(ArrowSwitchTarget*); + bool requestPunch(HitSensor*, HitSensor*); void exeWait(); void exeRotate(); - JMapIdInfo* mIDInfo; // 0x8C - ArrowSwitchTarget* mTargetArray[4]; // 0x90 - f32 _A0; - f32 _A4; - u32 _A8; - s32 _AC; - u8 _B0; + JMapIdInfo* mIDInfo; // 0x8C + ArrowSwitchTarget* mTargetArray[4]; // 0x90 + f32 _A0; + f32 _A4; + u32 _A8; + s32 _AC; + u8 _B0; }; namespace NrvArrowSwitchMulti { NERVE(ArrowSwitchMultiNrvWait); NERVE(ArrowSwitchMultiNrvRotate); -}; \ No newline at end of file +}; // namespace NrvArrowSwitchMulti \ No newline at end of file diff --git a/include/Game/MapObj/ArrowSwitchMultiHolder.hpp b/include/Game/MapObj/ArrowSwitchMultiHolder.hpp index add5d6147..88b2d6934 100644 --- a/include/Game/MapObj/ArrowSwitchMultiHolder.hpp +++ b/include/Game/MapObj/ArrowSwitchMultiHolder.hpp @@ -7,11 +7,11 @@ class ArrowSwitchMultiHolder : public DeriveActorGroup { public: ArrowSwitchMultiHolder(); - ArrowSwitchMulti* findSwitch(const JMapIdInfo *); + ArrowSwitchMulti* findSwitch(const JMapIdInfo*); }; namespace MR { void createArrowSwitchMultiHolder(); - void registerArrowSwitchMulti(ArrowSwitchMulti *); - void registerArrowSwitchTarget(ArrowSwitchTarget *); -}; \ No newline at end of file + void registerArrowSwitchMulti(ArrowSwitchMulti*); + void registerArrowSwitchTarget(ArrowSwitchTarget*); +}; // namespace MR \ No newline at end of file diff --git a/include/Game/MapObj/AssemblyBlock.hpp b/include/Game/MapObj/AssemblyBlock.hpp index bc6f26097..26d40361a 100644 --- a/include/Game/MapObj/AssemblyBlock.hpp +++ b/include/Game/MapObj/AssemblyBlock.hpp @@ -4,10 +4,10 @@ class AssemblyBlock : public LiveActor { public: - AssemblyBlock(const char *); + AssemblyBlock(const char*); virtual ~AssemblyBlock(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calcAndSetBaseMtx(); void exeWait(); @@ -18,16 +18,16 @@ public: bool tryStartAssemble(); bool tryStartReturn(); - TPos3f _8C; - TPos3f _BC; - TPos3f _EC; - s32 _11C; - f32 mActivationRange; // 0x120 - TVec3f _124; - f32 _130; - s32 mActivationTime; // 0x134 - PartsModel* mBloomModel; // 0x138 - bool _13C; + TPos3f _8C; + TPos3f _BC; + TPos3f _EC; + s32 _11C; + f32 mActivationRange; // 0x120 + TVec3f _124; + f32 _130; + s32 mActivationTime; // 0x134 + PartsModel* mBloomModel; // 0x138 + bool _13C; }; namespace NrvAssemblyBlock { @@ -36,4 +36,4 @@ namespace NrvAssemblyBlock { NERVE_DECL(AssemblyBlockNrvAssembleWait, AssemblyBlock, AssemblyBlock::exeAssembleWait); NERVE_DECL(AssemblyBlockNrvReturn, AssemblyBlock, AssemblyBlock::exeReturn); NERVE_DECL(AssemblyBlockNrvTimer, AssemblyBlock, AssemblyBlock::exeTimer); -}; \ No newline at end of file +}; // namespace NrvAssemblyBlock \ No newline at end of file diff --git a/include/Game/MapObj/AstroCore.hpp b/include/Game/MapObj/AstroCore.hpp index 404ee0037..448b8754c 100644 --- a/include/Game/MapObj/AstroCore.hpp +++ b/include/Game/MapObj/AstroCore.hpp @@ -4,12 +4,12 @@ class AstroCore : public MapObjActor { public: - AstroCore(const char *); + AstroCore(const char*); virtual ~AstroCore(); - virtual void init(const JMapInfoIter &); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void init(const JMapInfoIter&); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeGrow(); @@ -27,4 +27,4 @@ public: namespace NrvAstroCore { NERVE_DECL(AstroCoreNrvWait, AstroCore, AstroCore::exeWait); NERVE_DECL(AstroCoreNrvGrow, AstroCore, AstroCore::exeGrow); -}; \ No newline at end of file +}; // namespace NrvAstroCore \ No newline at end of file diff --git a/include/Game/MapObj/AstroCountDownPlate.hpp b/include/Game/MapObj/AstroCountDownPlate.hpp index 1076cd0c0..b1974cf7e 100644 --- a/include/Game/MapObj/AstroCountDownPlate.hpp +++ b/include/Game/MapObj/AstroCountDownPlate.hpp @@ -5,10 +5,10 @@ class AstroCountDownPlate : public LiveActor { public: - AstroCountDownPlate(const char *); + AstroCountDownPlate(const char*); virtual ~AstroCountDownPlate(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); void exeWait(); void exeRevival(); @@ -22,7 +22,7 @@ public: J3DTexMtx _8C; J3DTexMtx _120; - u8 _1B4; + u8 _1B4; }; namespace NrvAstroCountDownPlate { @@ -30,4 +30,4 @@ namespace NrvAstroCountDownPlate { NERVE_DECL(AstroCountDownPlateNrvAlive, AstroCountDownPlate, AstroCountDownPlate::exeWait); NERVE_DECL(AstroCountDownPlateNrvRevival, AstroCountDownPlate, AstroCountDownPlate::exeRevival); NERVE_DECL(AstroCountDownPlateNrvCountToZero, AstroCountDownPlate, AstroCountDownPlate::exeCountToZero); -}; \ No newline at end of file +}; // namespace NrvAstroCountDownPlate \ No newline at end of file diff --git a/include/Game/MapObj/AstroDemoFunction.hpp b/include/Game/MapObj/AstroDemoFunction.hpp index 24910aa01..6d32e8054 100644 --- a/include/Game/MapObj/AstroDemoFunction.hpp +++ b/include/Game/MapObj/AstroDemoFunction.hpp @@ -7,10 +7,10 @@ class LiveActor; class AstroDemoFunction { public: - static s32 getOpenedAstroDomeNum(); + static s32 getOpenedAstroDomeNum(); static const char* getGrandStarReturnDemoName(int); - static bool tryRegisterDemo(LiveActor *, const char *, const JMapInfoIter &); - static bool tryRegisterGrandStarReturnAndSimpleCast(LiveActor *, const JMapInfoIter &); - static bool tryRegisterGrandStarReturnWithFunctionAndSimpleCast(LiveActor *, const JMapInfoIter &, const MR::FunctorBase &); + static bool tryRegisterDemo(LiveActor*, const char*, const JMapInfoIter&); + static bool tryRegisterGrandStarReturnAndSimpleCast(LiveActor*, const JMapInfoIter&); + static bool tryRegisterGrandStarReturnWithFunctionAndSimpleCast(LiveActor*, const JMapInfoIter&, const MR::FunctorBase&); }; diff --git a/include/Game/MapObj/AstroDome.hpp b/include/Game/MapObj/AstroDome.hpp index ab069d202..e1794892c 100644 --- a/include/Game/MapObj/AstroDome.hpp +++ b/include/Game/MapObj/AstroDome.hpp @@ -4,13 +4,13 @@ class AstroDome : public MapObjActor { public: - AstroDome(const char *); + AstroDome(const char*); virtual ~AstroDome(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void control(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeWait(); void exeDisappear(); @@ -21,4 +21,4 @@ namespace NrvAstroDome { NERVE_DECL(AstroDomeNrvWait, AstroDome, AstroDome::exeWait); NERVE_DECL(AstroDomeNrvDisappear, AstroDome, AstroDome::exeDisappear); NERVE_DECL(AstroDomeNrvAppear, AstroDome, AstroDome::exeAppear); -}; \ No newline at end of file +}; // namespace NrvAstroDome \ No newline at end of file diff --git a/include/Game/MapObj/AstroDomeAsteroid.hpp b/include/Game/MapObj/AstroDomeAsteroid.hpp index a18bdcdd1..7400c87b3 100644 --- a/include/Game/MapObj/AstroDomeAsteroid.hpp +++ b/include/Game/MapObj/AstroDomeAsteroid.hpp @@ -4,14 +4,14 @@ class AstroDomeAsteroid : public LiveActor { public: - AstroDomeAsteroid(const char *); + AstroDomeAsteroid(const char*); virtual ~AstroDomeAsteroid(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); inline void exeWait() { if (MR::isFirstStep(this)) { @@ -21,9 +21,9 @@ public: MR::setBckRate(this, 1.0f); } - TPos3f mRotationMtx; // 0x8C + TPos3f mRotationMtx; // 0x8C }; namespace NrvAstroDomeAsteroid { NERVE_DECL(AstroDomeAsteroidNrvWait, AstroDomeAsteroid, AstroDomeAsteroid::exeWait); -}; \ No newline at end of file +}; diff --git a/include/Game/MapObj/AstroDomeBlueStar.hpp b/include/Game/MapObj/AstroDomeBlueStar.hpp index 209356187..4f0bc5d66 100644 --- a/include/Game/MapObj/AstroDomeBlueStar.hpp +++ b/include/Game/MapObj/AstroDomeBlueStar.hpp @@ -8,34 +8,33 @@ class GCaptureRibbon; class AstroDomeBlueStar : public LiveActor { public: - class CaptureActor : public LiveActor { public: CaptureActor(); virtual ~CaptureActor(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); TPos3f _8C; }; - AstroDomeBlueStar(const char *); + AstroDomeBlueStar(const char*); virtual ~AstroDomeBlueStar(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void draw() const; virtual void appear(); virtual void kill(); virtual void control(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void waitAppear(); void forceKill(); - bool tryStartBind(const LiveActor *); + bool tryStartBind(const LiveActor*); bool isActiveBind() const; bool isValidBindStart() const; - void calcZoomInPos(TVec3f *) const; + void calcZoomInPos(TVec3f*) const; void exeAppear(); void exeWait(); void exePointing(); @@ -48,10 +47,10 @@ public: void exeGalaxyConfirmCancel(); void exeGalaxyConfirm(); - GCaptureRibbon* mCaptureRibbon; // 0x8C - TPos3f _90; - TPos3f _C0; - u32 _F0; - TVec3f mZoomPos; // 0xF4 - CaptureActor* mCaptureActor; // 0x100 + GCaptureRibbon* mCaptureRibbon; // 0x8C + TPos3f _90; + TPos3f _C0; + u32 _F0; + TVec3f mZoomPos; // 0xF4 + CaptureActor* mCaptureActor; // 0x100 }; diff --git a/include/Game/MapObj/AstroDomeCameraController.hpp b/include/Game/MapObj/AstroDomeCameraController.hpp index f5e5d02d8..1878eac45 100644 --- a/include/Game/MapObj/AstroDomeCameraController.hpp +++ b/include/Game/MapObj/AstroDomeCameraController.hpp @@ -6,12 +6,11 @@ class AstroDomeCameraController : public LiveActor { public: - class Position { public: Position(); - void reset(const TVec3f &); + void reset(const TVec3f&); void set(TVec3f vec) { _0.set(vec); _C.set(vec); @@ -23,19 +22,19 @@ public: TVec3f _18; }; - AstroDomeCameraController(const char *); + AstroDomeCameraController(const char*); virtual ~AstroDomeCameraController(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void kill(); virtual void control(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void calcZoomOutPos(TVec3f *) const; - void calcZoomInPos(TVec3f *, const TVec3f &) const; - void calcZoomInTarget(TVec3f *, const TVec3f &) const; - void calcZoomInUp(TVec3f *) const; + void calcZoomOutPos(TVec3f*) const; + void calcZoomInPos(TVec3f*, const TVec3f&) const; + void calcZoomInTarget(TVec3f*, const TVec3f&) const; + void calcZoomInUp(TVec3f*) const; void exeGalaxySelectStart(); void exeGalaxySelect(); @@ -43,10 +42,10 @@ public: void exeGalaxyConfirm(); void exeGalaxyConfirmCancel(); - TVec3f _8C; + TVec3f _8C; Position _98; Position _BC; Position _E0; - f32 _104; - TVec3f _108; + f32 _104; + TVec3f _108; }; diff --git a/include/Game/MapObj/AstroDomeComet.hpp b/include/Game/MapObj/AstroDomeComet.hpp index 45932d0e3..2d36cd7ee 100644 --- a/include/Game/MapObj/AstroDomeComet.hpp +++ b/include/Game/MapObj/AstroDomeComet.hpp @@ -6,21 +6,21 @@ class AstroDomeComet : public LiveActor { public: - AstroDomeComet(const char *); + AstroDomeComet(const char*); virtual ~AstroDomeComet(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void kill(); virtual void calcAndSetBaseMtx(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void initSubModel(); void tryPointing(); void exeSelect(); void exeConfirm(); - PartsModel* mBloomModel; // 0x8C - LiveActor* mMiniGalaxy; // 0x90 - LiveActor** mPointingActors; // 0x94 + PartsModel* mBloomModel; // 0x8C + LiveActor* mMiniGalaxy; // 0x90 + LiveActor** mPointingActors; // 0x94 }; diff --git a/include/Game/MapObj/AstroDomeDemoAstroGalaxy.hpp b/include/Game/MapObj/AstroDomeDemoAstroGalaxy.hpp index a8d897d3e..4a1e804ac 100644 --- a/include/Game/MapObj/AstroDomeDemoAstroGalaxy.hpp +++ b/include/Game/MapObj/AstroDomeDemoAstroGalaxy.hpp @@ -4,8 +4,8 @@ class AstroDomeDemoAstroGalaxy : public MapObjActor { public: - AstroDomeDemoAstroGalaxy(const char *); - + AstroDomeDemoAstroGalaxy(const char*); + virtual ~AstroDomeDemoAstroGalaxy(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); }; \ No newline at end of file diff --git a/include/Game/MapObj/AstroDomeGalaxySelector.hpp b/include/Game/MapObj/AstroDomeGalaxySelector.hpp index 8880a784b..0d3b6e4a3 100644 --- a/include/Game/MapObj/AstroDomeGalaxySelector.hpp +++ b/include/Game/MapObj/AstroDomeGalaxySelector.hpp @@ -12,31 +12,30 @@ #include "revolution/types.h" class AstroDomeGalaxySelector : public LiveActor { - public: - AstroDomeGalaxySelector(const char*); - virtual void init(const JMapInfoIter&); - virtual void appear(); - virtual void kill(); - virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); +public: + AstroDomeGalaxySelector(const char*); + virtual void init(const JMapInfoIter&); + virtual void appear(); + virtual void kill(); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void showGalaxyInfo(const MiniatureGalaxy*); - bool tryStartLectureDemo(const Nerve*); + void showGalaxyInfo(const MiniatureGalaxy*); + bool tryStartLectureDemo(const Nerve*); - void exeGalaxySelect(); - void exeGalaxySelectStart(); - void exeGalaxyConfirmStart(); - void exeGalaxySelectCancel(); - void exeWaitStartDemo() {}; // Yeah this is just a return I guess? - void exeDemoDomeLecture(); - void exeGalaxyConfirm(); - void exeGalaxyConfirmCancel(); // Auto inlined - void exeGalaxyMoveLecture(); - void exeDemoJumpOut(); + void exeGalaxySelect(); + void exeGalaxySelectStart(); + void exeGalaxyConfirmStart(); + void exeGalaxySelectCancel(); + void exeWaitStartDemo(){}; // Yeah this is just a return I guess? + void exeDemoDomeLecture(); + void exeGalaxyConfirm(); + void exeGalaxyConfirmCancel(); // Auto inlined + void exeGalaxyMoveLecture(); + void exeDemoJumpOut(); - - AstroDomeCameraController* pDomeCamCtrl; // _8C - GalaxySelectBackButton* pGSBackButton; // _90 - GalaxySelectInfo* pGSInfo; // _94 - GalaxyConfirmLayout* pGConfirmLayout; // _98 - bool _9C; + AstroDomeCameraController* pDomeCamCtrl; // _8C + GalaxySelectBackButton* pGSBackButton; // _90 + GalaxySelectInfo* pGSInfo; // _94 + GalaxyConfirmLayout* pGConfirmLayout; // _98 + bool _9C; }; diff --git a/include/Game/MapObj/AstroDomeOrbit.hpp b/include/Game/MapObj/AstroDomeOrbit.hpp index 87820facb..2b32bc2da 100644 --- a/include/Game/MapObj/AstroDomeOrbit.hpp +++ b/include/Game/MapObj/AstroDomeOrbit.hpp @@ -7,17 +7,17 @@ public: AstroDomeOrbit(); virtual ~AstroDomeOrbit(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void draw() const; void drawBloom() const; void setup(s32); void moveCoord(); - void calcGalaxyPos(TVec3f *) const; - void initDraw(const Color8 &) const; + void calcGalaxyPos(TVec3f*) const; + void initDraw(const Color8&) const; void drawCelling(f32, bool, f32) const; void drawSide(f32, bool, f32) const; - f32 calcRepeatedRotateCoord(f32) const; + f32 calcRepeatedRotateCoord(f32) const; f32 _8C; f32 _90; diff --git a/include/Game/MapObj/AstroMapBoard.hpp b/include/Game/MapObj/AstroMapBoard.hpp index 940ce19d6..1be8f666d 100644 --- a/include/Game/MapObj/AstroMapBoard.hpp +++ b/include/Game/MapObj/AstroMapBoard.hpp @@ -4,10 +4,10 @@ class AstroMapBoard : public MapObjActor { public: - AstroMapBoard(const char *); + AstroMapBoard(const char*); virtual ~AstroMapBoard(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); - virtual void connectToScene(const MapObjActorInitInfo &); + virtual void connectToScene(const MapObjActorInitInfo&); }; diff --git a/include/Game/MapObj/AstroMapObj.hpp b/include/Game/MapObj/AstroMapObj.hpp index 54a826b8b..8f0ec57d1 100644 --- a/include/Game/MapObj/AstroMapObj.hpp +++ b/include/Game/MapObj/AstroMapObj.hpp @@ -10,63 +10,61 @@ #include "revolution/types.h" class AstroMapObj : public MapObjActor { - public: - AstroMapObj(const char*); - ~AstroMapObj(); +public: + AstroMapObj(const char*); + ~AstroMapObj(); - virtual void init(const JMapInfoIter&); - virtual void control(); - virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); + virtual void init(const JMapInfoIter&); + virtual void control(); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void exeOpen(); - void exeWait(); - void exeAlive(); - void exeRevival(); + void exeOpen(); + void exeWait(); + void exeAlive(); + void exeRevival(); - void setStateAlive(); - void setStateDead(); - void selectNrvWait(); - bool isPlayMachineSE() const; - void tryStartAllAnimAndEffect(const char*); // Curiously the function name starts with "try" but it doesn't return a bool - bool isEndRevival() const; - bool isAlreadyOpen(const char*, s32); - void setStateDoorOpenOrClose(); - void startDemo(); + void setStateAlive(); + void setStateDead(); + void selectNrvWait(); + bool isPlayMachineSE() const; + void tryStartAllAnimAndEffect(const char*); // Curiously the function name starts with "try" but it doesn't return a bool + bool isEndRevival() const; + bool isAlreadyOpen(const char*, s32); + void setStateDoorOpenOrClose(); + void startDemo(); - inline bool checkStrings(const char* arg1) { - return MR::isEqualString(arg1, "AstroDomeEntrance") || MR::isEqualString(arg1, "AstroLibrary"); - } - inline bool checkOtherStrings(const char* arg1) { - return MR::isEqualString(arg1, "AstroRotateStepA") || MR::isEqualString(arg1, "AstroRotateStepB") || MR::isEqualString(arg1, "AstroDecoratePartsA"); - } - inline bool moreInlines(const char* arg1) { - return MR::isEqualString(arg1, "AstroDomeEntrance") || MR::isEqualString(arg1, "AstroLibrary") || MR::isEqualString(arg1, "AstroChildRoom") || MR::isEqualString(arg1, "AstroParking"); - } + inline bool checkStrings(const char* arg1) { + return MR::isEqualString(arg1, "AstroDomeEntrance") || MR::isEqualString(arg1, "AstroLibrary"); + } + inline bool checkOtherStrings(const char* arg1) { + return MR::isEqualString(arg1, "AstroRotateStepA") || MR::isEqualString(arg1, "AstroRotateStepB") || MR::isEqualString(arg1, "AstroDecoratePartsA"); + } + inline bool moreInlines(const char* arg1) { + return MR::isEqualString(arg1, "AstroDomeEntrance") || MR::isEqualString(arg1, "AstroLibrary") || MR::isEqualString(arg1, "AstroChildRoom") || MR::isEqualString(arg1, "AstroParking"); + } - // Unused? - virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo&); - virtual void initCaseUseSwitchB(const MapObjActorInitInfo&); - virtual void initCaseNoUseSwitchA(const MapObjActorInitInfo&); - virtual void initCaseUseSwitchA(const MapObjActorInitInfo&); + // Unused? + virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo&); + virtual void initCaseUseSwitchB(const MapObjActorInitInfo&); + virtual void initCaseNoUseSwitchA(const MapObjActorInitInfo&); + virtual void initCaseUseSwitchA(const MapObjActorInitInfo&); - - const JMapInfo* _C4; - GalaxyNamePlate* _C8; - const char* _CC; // Uhh... - CollisionParts* _D0; - CollisionParts* _D4; - s32 _D8; + const JMapInfo* _C4; + GalaxyNamePlate* _C8; + const char* _CC; // Uhh... + CollisionParts* _D0; + CollisionParts* _D4; + s32 _D8; }; class AstroSimpleObj : public SimpleMapObjFarMax { - public: - AstroSimpleObj(const char*); - ~AstroSimpleObj(); +public: + AstroSimpleObj(const char*); + ~AstroSimpleObj(); - virtual void init(const JMapInfoIter&); - virtual void control(); + virtual void init(const JMapInfoIter&); + virtual void control(); - - const JMapInfo* _C4; - GalaxyNamePlate* _C8; + const JMapInfo* _C4; + GalaxyNamePlate* _C8; }; diff --git a/include/Game/MapObj/AstroMapObjFunction.hpp b/include/Game/MapObj/AstroMapObjFunction.hpp index ba831a329..23e6bbbf7 100644 --- a/include/Game/MapObj/AstroMapObjFunction.hpp +++ b/include/Game/MapObj/AstroMapObjFunction.hpp @@ -10,8 +10,8 @@ class LiveActor; class JMapInfo; namespace { - s32 getNumGrandStarForRevival(const char *, s32) NO_INLINE; - s32 getNumGrandStarForOpen(const char *, s32) NO_INLINE; + s32 getNumGrandStarForRevival(const char*, s32) NO_INLINE; + s32 getNumGrandStarForOpen(const char*, s32) NO_INLINE; const char* cAstroDomeNameTable[6] = { "AstroDomeObservatory", @@ -19,8 +19,7 @@ namespace { "AstroDomeKitchen", "AstroDomeBedRoom", "AstroDomeMachine", - "AstroDomeTower" - }; + "AstroDomeTower"}; const char* cAstroDomeSkyNameTable[6] = { "AstroDomeSkyA", @@ -28,8 +27,7 @@ namespace { "AstroDomeSkyC", "AstroDomeSkyA", "AstroDomeSkyB", - "AstroDomeSkyC" - }; + "AstroDomeSkyC"}; const char* cAstroDomeEntranceNameTable[6] = { "AstroDomeEntranceObservatory", @@ -37,8 +35,7 @@ namespace { "AstroDomeEntranceKitchen", "AstroDomeEntranceBedRoom", "AstroDomeEntranceMachine", - "AstroDomeEntranceTower" - }; + "AstroDomeEntranceTower"}; const char* cAstroStarPlateNameTable[6] = { "AstroStarPlateObservatory", @@ -46,26 +43,25 @@ namespace { "AstroStarPlateKitchen", "AstroStarPlateBedRoom", "AstroStarPlateMachine", - "AstroStarPlateTower" - }; + "AstroStarPlateTower"}; const char* cAstroNamePlateArcName = "AstroNamePlateData"; const char* cAstroNamePlateFileName = "AstroNamePlateData.bcsv"; -}; +}; // namespace class AstroMapObjFunction { public: - static void makeArchiveListFromArg0(NameObjArchiveListCollector *, const JMapInfoIter &); - static void makeArchiveListAstroNamePlate(NameObjArchiveListCollector *, const JMapInfoIter &); - static bool isAlreadyRevival(const char *, s32); - static bool isEnableRevival(const char *, s32); - static bool isAlreadyOpen(const char *, s32); - static bool isEnableOpen(const char *, s32); - static s32 getDomeIdFromArg0(const JMapInfoIter &); - static const char* getModelName(const char *, s32); + static void makeArchiveListFromArg0(NameObjArchiveListCollector*, const JMapInfoIter&); + static void makeArchiveListAstroNamePlate(NameObjArchiveListCollector*, const JMapInfoIter&); + static bool isAlreadyRevival(const char*, s32); + static bool isEnableRevival(const char*, s32); + static bool isAlreadyOpen(const char*, s32); + static bool isEnableOpen(const char*, s32); + static s32 getDomeIdFromArg0(const JMapInfoIter&); + static const char* getModelName(const char*, s32); static const JMapInfo* createAstroNamePlateParser(); - static bool trySetAndShowNamePlate(GalaxyNamePlate *, const JMapInfo *, const TVec3f &, const char *, s32, bool); - static bool tryRegisterMultiDemoAndFunction(const char *, LiveActor *, const JMapInfoIter &, const MR::FunctorBase &); - static void initilizePeculiar(const char *, LiveActor *, const JMapInfoIter &); + static bool trySetAndShowNamePlate(GalaxyNamePlate*, const JMapInfo*, const TVec3f&, const char*, s32, bool); + static bool tryRegisterMultiDemoAndFunction(const char*, LiveActor*, const JMapInfoIter&, const MR::FunctorBase&); + static void initilizePeculiar(const char*, LiveActor*, const JMapInfoIter&); }; \ No newline at end of file diff --git a/include/Game/MapObj/AstroOverlookObj.hpp b/include/Game/MapObj/AstroOverlookObj.hpp index 804c53dfa..558c405c0 100644 --- a/include/Game/MapObj/AstroOverlookObj.hpp +++ b/include/Game/MapObj/AstroOverlookObj.hpp @@ -4,7 +4,7 @@ class AstroOverlookObj : public LiveActor { public: - AstroOverlookObj(const char *); + AstroOverlookObj(const char*); virtual ~AstroOverlookObj(); virtual void control(); diff --git a/include/Game/MapObj/BallOpener.hpp b/include/Game/MapObj/BallOpener.hpp index 9e0e9b9c4..e15b546da 100644 --- a/include/Game/MapObj/BallOpener.hpp +++ b/include/Game/MapObj/BallOpener.hpp @@ -6,30 +6,30 @@ class BindCone; class BallOpener : public LiveActor { public: - BallOpener(const char *); + BallOpener(const char*); virtual ~BallOpener(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void control(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeWait(); void exeSetCenter(); void exeOpen(); void bindHole(); - BindCone* _8C; - HitSensor* mSensor; // 0x90 - TVec3f _94; - TVec3f _A0; - TVec3f _AC; - TVec3f _B8; - s32 _C4; + BindCone* _8C; + HitSensor* mSensor; // 0x90 + TVec3f _94; + TVec3f _A0; + TVec3f _AC; + TVec3f _B8; + s32 _C4; }; namespace NrvBallOpener { NERVE_DECL(BallOpenerNrvWait, BallOpener, BallOpener::exeWait); NERVE_DECL(BallOpenerNrvSetCenter, BallOpener, BallOpener::exeSetCenter); NERVE_DECL(BallOpenerNrvOpen, BallOpener, BallOpener::exeOpen); -}; \ No newline at end of file +}; // namespace NrvBallOpener \ No newline at end of file diff --git a/include/Game/MapObj/BallRail.hpp b/include/Game/MapObj/BallRail.hpp index 1226b8034..8c6e8ba8a 100644 --- a/include/Game/MapObj/BallRail.hpp +++ b/include/Game/MapObj/BallRail.hpp @@ -14,26 +14,26 @@ public: class BallRail : public LiveActor { public: - BallRail(const char *); + BallRail(const char*); virtual ~BallRail(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void initRailPoints(); - void exeWait(); - void exeSetUp(); - void exeRun(); + void initRailPoints(); + void exeWait(); + void exeSetUp(); + void exeRun(); inline void exeNoBind(); BallRailPoint* mRailPoints; // 0x8C - HitSensor* _90; - TVec3f _94; - s32 mNumPoints; // 0xA0 - f32 mAcceleration; // 0xA4 - f32 mDeceleration; // 0xA8 - f32 _AC; + HitSensor* _90; + TVec3f _94; + s32 mNumPoints; // 0xA0 + f32 mAcceleration; // 0xA4 + f32 mDeceleration; // 0xA8 + f32 _AC; }; namespace NrvBallRail { @@ -41,4 +41,4 @@ namespace NrvBallRail { NERVE_DECL(BallRailNrvSetUp, BallRail, BallRail::exeSetUp); NERVE_DECL(BallRailNrvRun, BallRail, BallRail::exeRun); NERVE_DECL(BallRailNrvNoBind, BallRail, BallRail::exeNoBind); -}; \ No newline at end of file +}; // namespace NrvBallRail \ No newline at end of file diff --git a/include/Game/MapObj/Banekiti.hpp b/include/Game/MapObj/Banekiti.hpp index 909ec2653..06709b2cc 100644 --- a/include/Game/MapObj/Banekiti.hpp +++ b/include/Game/MapObj/Banekiti.hpp @@ -7,26 +7,26 @@ class Banekiti : public LiveActor { public: - Banekiti(const char *); + Banekiti(const char*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver); + virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); void exeWait(); void exeRepel(); void exeDPDSwoon(); void endDPDSwoon(); - AnimScaleController* mAnimScaleCtrl; //_8C + AnimScaleController* mAnimScaleCtrl; //_8C WalkerStateBindStarPointer* mBindStarPointer; //_90 - MapPartsRailMover* mRailMover; //_94 + MapPartsRailMover* mRailMover; //_94 }; namespace NrvBanekiti { NERVE(BanekitiNrvWait); NERVE(BanekitiNrvRepel); NERVE_EXECEND(BanekitiNrvDPDSwoon); -}; +}; // namespace NrvBanekiti diff --git a/include/Game/MapObj/BattleShipElevator.hpp b/include/Game/MapObj/BattleShipElevator.hpp index 46c0f5133..b45a3652a 100644 --- a/include/Game/MapObj/BattleShipElevator.hpp +++ b/include/Game/MapObj/BattleShipElevator.hpp @@ -4,12 +4,12 @@ class BattleShipElevator : public MapObjActor { public: - BattleShipElevator(const char *); + BattleShipElevator(const char*); virtual ~BattleShipElevator(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - virtual bool receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver); + virtual bool receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); void exeMove(); }; @@ -18,4 +18,4 @@ namespace NrvBattleShipElevator { NERVE(BattleShipElevatorNrvWait); NERVE(BattleShipElevatorNrvMove); NERVE(BattleShipElevatorNrvEnd); -}; +}; // namespace NrvBattleShipElevator diff --git a/include/Game/MapObj/BeamGoRoundPlanet.hpp b/include/Game/MapObj/BeamGoRoundPlanet.hpp index f55b7656e..3d2222329 100644 --- a/include/Game/MapObj/BeamGoRoundPlanet.hpp +++ b/include/Game/MapObj/BeamGoRoundPlanet.hpp @@ -11,29 +11,29 @@ public: BeamGoRoundBeam(MtxPtr); virtual ~BeamGoRoundBeam(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void draw() const; virtual void calcAndSetBaseMtx(); - virtual void updateHitSensor(HitSensor *); - virtual void attackSensor(HitSensor *, HitSensor *); + virtual void updateHitSensor(HitSensor*); + virtual void attackSensor(HitSensor*, HitSensor*); - VolumeModelDrawer* mModelDrawer; // 0x8C - ModelObj* mBloomModel; // 0x90 - MtxPtr mBeamJointMtx; // 0x94 + VolumeModelDrawer* mModelDrawer; // 0x8C + ModelObj* mBloomModel; // 0x90 + MtxPtr mBeamJointMtx; // 0x94 }; class BeamGoRoundPlanet : public MapObjActor { public: - BeamGoRoundPlanet(const char *); + BeamGoRoundPlanet(const char*); virtual ~BeamGoRoundPlanet(); - virtual void init(const JMapInfoIter &); - virtual void connectToScene(const MapObjActorInitInfo &); + virtual void init(const JMapInfoIter&); + virtual void connectToScene(const MapObjActorInitInfo&); void initBeam(); void exeWait(); - BeamGoRoundBeam** mBeams; // 0xC4 - CollisionParts* _C8; - CollisionParts* _CC; + BeamGoRoundBeam** mBeams; // 0xC4 + CollisionParts* _C8; + CollisionParts* _CC; }; diff --git a/include/Game/MapObj/BeeFlowerHover.hpp b/include/Game/MapObj/BeeFlowerHover.hpp index b1ccc13cc..889ba8428 100644 --- a/include/Game/MapObj/BeeFlowerHover.hpp +++ b/include/Game/MapObj/BeeFlowerHover.hpp @@ -6,25 +6,25 @@ class BeeFlowerHover : public LiveActor { public: - BeeFlowerHover(const char *); + BeeFlowerHover(const char*); virtual ~BeeFlowerHover(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeSoftTouch(); void exeSoftTouchWait(); void exeHardTouch(); void exeRecover(); - TMtx34f _8C; - f32 _BC; - LodCtrl* mLodCtrlPlanet; // 0xC0 - MapPartsRailMover* mRailMover; // 0xC4 - MapPartsRailPosture* mRailPosture; // 0xC8 - TVec3f _CC; + TMtx34f _8C; + f32 _BC; + LodCtrl* mLodCtrlPlanet; // 0xC0 + MapPartsRailMover* mRailMover; // 0xC4 + MapPartsRailPosture* mRailPosture; // 0xC8 + TVec3f _CC; }; namespace NrvBeeFlowerHover { @@ -33,4 +33,4 @@ namespace NrvBeeFlowerHover { NERVE(BeeFlowerHoverNrvSoftTouchWait); NERVE(BeeFlowerHoverNrvHardTouch); NERVE(BeeFlowerHoverNrvRecover); -}; +}; // namespace NrvBeeFlowerHover diff --git a/include/Game/MapObj/BenefitItemInvincible.hpp b/include/Game/MapObj/BenefitItemInvincible.hpp index 12cc0b486..51cebefea 100644 --- a/include/Game/MapObj/BenefitItemInvincible.hpp +++ b/include/Game/MapObj/BenefitItemInvincible.hpp @@ -4,16 +4,16 @@ class BenefitItemInvincible : public BenefitItemObj { public: - BenefitItemInvincible(const char *); + BenefitItemInvincible(const char*); virtual ~BenefitItemInvincible(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appearThrowUp(); virtual void initModelAndEfx(); virtual void exeCatch(); - virtual void runBck(const char *); - virtual void runEfx(const char *); - virtual void stopEfx(const char *); + virtual void runBck(const char*); + virtual void runEfx(const char*); + virtual void stopEfx(const char*); virtual void initEscape(); virtual void doEscape(); diff --git a/include/Game/MapObj/BenefitItemLifeUp.hpp b/include/Game/MapObj/BenefitItemLifeUp.hpp index 56de71a5a..d06ed6f4e 100644 --- a/include/Game/MapObj/BenefitItemLifeUp.hpp +++ b/include/Game/MapObj/BenefitItemLifeUp.hpp @@ -4,12 +4,12 @@ class BenefitItemLifeUp : public BenefitItemObj { public: - BenefitItemLifeUp(const char *); + BenefitItemLifeUp(const char*); virtual ~BenefitItemLifeUp(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initModelAndEfx(); virtual void exeCatch(); - virtual void runEfx(const char *); - virtual void stopEfx(const char *); + virtual void runEfx(const char*); + virtual void stopEfx(const char*); }; \ No newline at end of file diff --git a/include/Game/MapObj/BenefitItemObj.hpp b/include/Game/MapObj/BenefitItemObj.hpp index 9e0474496..d45abce93 100644 --- a/include/Game/MapObj/BenefitItemObj.hpp +++ b/include/Game/MapObj/BenefitItemObj.hpp @@ -5,30 +5,30 @@ class BenefitItemObj : public LiveActor { public: - BenefitItemObj(const char *, const char *); + BenefitItemObj(const char*, const char*); virtual ~BenefitItemObj(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void appear(); virtual void makeActorAppeared(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); virtual void appearGround(); virtual void appearThrowUp(); virtual void appearThrowUpQuestionBox(); virtual void initModelAndEfx(); virtual void exeCatch(); - virtual void runBck(const char *); - virtual void runEfx(const char *); - virtual void stopEfx(const char *); + virtual void runBck(const char*); + virtual void runEfx(const char*); + virtual void stopEfx(const char*); virtual void doRotateY(); virtual void initEscape(); virtual void doEscape(); - void shoot(const TVec3f &, const TVec3f &, bool); + void shoot(const TVec3f&, const TVec3f&, bool); void exeShoot(); void exeWait(); void exeAppearGround(); @@ -37,65 +37,63 @@ public: void setFollowMtx(MtxPtr); void calcAndSetBaseMtxInMovement(); - u32 _8C; - u32 _90; - u32 _94; - TVec3f _98; - TVec3f _A4; - s16 _B0; - s16 _B2; - s16 _B4; - s16 _B6; - s16 _B8; - s16 _BA; - TVec3f _BC; - TVec3f _C8; - MtxPtr mFollowMtx; // 0xD4 - u8 _D8; - u8 _D9; - u8 _DA; - u8 _DB; - u8 _DC; - u8 _DD; - u8 _DE; - u8 _DF; - u8 _E0; - u8 _E1; - u8 _E2; - u8 _E3; - u8 _E4; - u8 _E5; - u8 _E6; - u8 _E7; - f32 _E8; - f32 _EC; - Mtx _F0; - const char* _120; - FlashingCtrl* mFlashCtrl; // 0x124 - ActorCameraInfo* mCameraInfo; // 0x128 - u32 _12C; - u32 _130; - LiveActor* mHitSensorActor; // 0x134 - u8 _138; - u8 _139; - u16 _13A; + u32 _8C; + u32 _90; + u32 _94; + TVec3f _98; + TVec3f _A4; + s16 _B0; + s16 _B2; + s16 _B4; + s16 _B6; + s16 _B8; + s16 _BA; + TVec3f _BC; + TVec3f _C8; + MtxPtr mFollowMtx; // 0xD4 + u8 _D8; + u8 _D9; + u8 _DA; + u8 _DB; + u8 _DC; + u8 _DD; + u8 _DE; + u8 _DF; + u8 _E0; + u8 _E1; + u8 _E2; + u8 _E3; + u8 _E4; + u8 _E5; + u8 _E6; + u8 _E7; + f32 _E8; + f32 _EC; + Mtx _F0; + const char* _120; + FlashingCtrl* mFlashCtrl; // 0x124 + ActorCameraInfo* mCameraInfo; // 0x128 + u32 _12C; + u32 _130; + LiveActor* mHitSensorActor; // 0x134 + u8 _138; + u8 _139; + u16 _13A; }; class BenefitItemOneUp : public BenefitItemObj { public: - inline BenefitItemOneUp(const char *a1, const char *a2) : BenefitItemObj(a1, a2) { - + inline BenefitItemOneUp(const char* a1, const char* a2) + : BenefitItemObj(a1, a2) { } virtual ~BenefitItemOneUp() { - } }; class ShadowClipActor : public LiveActor { public: virtual ~ShadowClipActor() { - } virtual void endClipped(); @@ -111,4 +109,4 @@ namespace NrvBenefitItemObj { NERVE(HostTypeNrvAppearGround); NERVE(HostTypeNrvPreEscape); NERVE(HostTypeNrvEscape); -}; +}; // namespace NrvBenefitItemObj diff --git a/include/Game/MapObj/BigBubbleDrawer.hpp b/include/Game/MapObj/BigBubbleDrawer.hpp index 7a8b87d49..c92b82689 100644 --- a/include/Game/MapObj/BigBubbleDrawer.hpp +++ b/include/Game/MapObj/BigBubbleDrawer.hpp @@ -7,9 +7,9 @@ namespace { static Color8 sTevColor0(0xE0E0E0FF); - Color8 sTevColor1(0xFF000000); - TVec3f sEnvMatTrans(1.0f, 1.0f, 1.5f); -}; + Color8 sTevColor1(0xFF000000); + TVec3f sEnvMatTrans(1.0f, 1.0f, 1.5f); +}; // namespace class BigBubbleDrawer { public: @@ -22,7 +22,7 @@ public: void setUpPixelFormat() const; void setUpMaterial() const; - JUTTexture* mBubbleTexture; // 0x0 - JUTTexture* mRainbowTexture; // 0x4 - f32 _8; + JUTTexture* mBubbleTexture; // 0x0 + JUTTexture* mRainbowTexture; // 0x4 + f32 _8; }; \ No newline at end of file diff --git a/include/Game/MapObj/BigBubbleMoveLimitter.hpp b/include/Game/MapObj/BigBubbleMoveLimitter.hpp index 0d4f8e981..0c780e748 100644 --- a/include/Game/MapObj/BigBubbleMoveLimitter.hpp +++ b/include/Game/MapObj/BigBubbleMoveLimitter.hpp @@ -5,24 +5,24 @@ class BigBubbleMoveLimitter : public NameObj { public: - BigBubbleMoveLimitter(const char *, s32); + BigBubbleMoveLimitter(const char*, s32); virtual ~BigBubbleMoveLimitter(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - BigBubbleMoveLimitter* limitPosition(TVec3f *, f32) const; - BigBubbleMoveLimitter* limitVelocity(TVec3f *, const TVec3f &, f32); + BigBubbleMoveLimitter* limitPosition(TVec3f*, f32) const; + BigBubbleMoveLimitter* limitVelocity(TVec3f*, const TVec3f&, f32); - s32 _C; + s32 _C; TVec3f _10; TVec3f _1C; TVec3f _28; TVec3f _34; TVec3f _40; - f32 _4C; - f32 _50; - f32 _54; - f32 _58; - s32 _5C; - s32 _60; + f32 _4C; + f32 _50; + f32 _54; + f32 _58; + s32 _5C; + s32 _60; }; \ No newline at end of file diff --git a/include/Game/MapObj/BigFan.hpp b/include/Game/MapObj/BigFan.hpp index e99b4cfbc..12205c4a5 100644 --- a/include/Game/MapObj/BigFan.hpp +++ b/include/Game/MapObj/BigFan.hpp @@ -6,25 +6,24 @@ namespace NrvBigFan { NERVE(BigFanNrvStop); NERVE(BigFanNrvStart); NERVE(BigFanNrvWait); -}; - +}; // namespace NrvBigFan class BigFan : public LiveActor { public: - BigFan(const char *); + BigFan(const char*); virtual ~BigFan(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); void initWindModel(); - void calcWindInfo(TVec3f *, const TVec3f &); + void calcWindInfo(TVec3f*, const TVec3f&); void start(); void exeStart(); void exeWait(); - + inline bool isStartOrWait() { - bool flag = false; + bool flag = false; if (isNerve(&NrvBigFan::BigFanNrvStart::sInstance) || isNerve(&NrvBigFan::BigFanNrvWait::sInstance)) { flag = true; } @@ -32,9 +31,9 @@ public: return flag; } - ModelObj* mWindModel; // 0x8C - TVec3f _90; - f32 mWindLength; // 0x9C - f32 _A0; - bool mIsTeresaGalaxy; // 0xA4 + ModelObj* mWindModel; // 0x8C + TVec3f _90; + f32 mWindLength; // 0x9C + f32 _A0; + bool mIsTeresaGalaxy; // 0xA4 }; diff --git a/include/Game/MapObj/BigFanHolder.hpp b/include/Game/MapObj/BigFanHolder.hpp index 0a442b365..806e96427 100644 --- a/include/Game/MapObj/BigFanHolder.hpp +++ b/include/Game/MapObj/BigFanHolder.hpp @@ -11,12 +11,12 @@ public: virtual ~BigFanHolder(); - void calcWindInfo(TVec3f *, const TVec3f &, f32 *); + void calcWindInfo(TVec3f*, const TVec3f&, f32*); }; class BigFanFunction { public: static void createBigFanHolder(); - static void calcWindInfo(TVec3f *, const TVec3f &, f32 *); - static void registerBigFan(BigFan *); + static void calcWindInfo(TVec3f*, const TVec3f&, f32*); + static void registerBigFan(BigFan*); }; diff --git a/include/Game/MapObj/BlackHole.hpp b/include/Game/MapObj/BlackHole.hpp index 58514f4d0..3f59a4fad 100644 --- a/include/Game/MapObj/BlackHole.hpp +++ b/include/Game/MapObj/BlackHole.hpp @@ -6,36 +6,36 @@ class ActorCameraInfo; class BlackHole : public LiveActor { public: - BlackHole(const char *); + BlackHole(const char*); virtual ~BlackHole(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void makeActorAppeared(); virtual void kill(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); bool tryStartDemoCamera(); - void initMapToolInfo(const JMapInfoIter &); + void initMapToolInfo(const JMapInfoIter&); void initModel(); void initCubeBox(); - bool isInCubeBox(const TVec3f &) const; + bool isInCubeBox(const TVec3f&) const; void updateModelScale(f32, f32); void exeWait(); void exeDisappear(); - ModelObj* mBlackHoleModel; // 0x8C - TVec3f _90; - f32 _9C; - f32 _A0; - TBox3f* _A4; - TMtx34f _A8; - TMtx34f _D8; - ActorCameraInfo* mCameraInfo; // 0x108 + ModelObj* mBlackHoleModel; // 0x8C + TVec3f _90; + f32 _9C; + f32 _A0; + TBox3f* _A4; + TMtx34f _A8; + TMtx34f _D8; + ActorCameraInfo* mCameraInfo; // 0x108 }; namespace NrvBlackHole { NERVE(BlackHoleNrvWait); NERVE(BlackHoleNrvDemo); NERVE(BlackHoleNrvDisappear); -}; \ No newline at end of file +}; // namespace NrvBlackHole \ No newline at end of file diff --git a/include/Game/MapObj/BlueChip.hpp b/include/Game/MapObj/BlueChip.hpp index a4a72e6ea..ace6ea44b 100644 --- a/include/Game/MapObj/BlueChip.hpp +++ b/include/Game/MapObj/BlueChip.hpp @@ -4,7 +4,7 @@ class BlueChip : public ChipBase { public: - BlueChip(const char *); + BlueChip(const char*); - virtual ~BlueChip(); + virtual ~BlueChip(); }; \ No newline at end of file diff --git a/include/Game/MapObj/BreakableCage.hpp b/include/Game/MapObj/BreakableCage.hpp index dd4719b2a..e34792b69 100644 --- a/include/Game/MapObj/BreakableCage.hpp +++ b/include/Game/MapObj/BreakableCage.hpp @@ -7,34 +7,34 @@ namespace { Vec cHitSensorOffsetCage; Vec cHitSensorOffsetFixation; -}; +}; // namespace class BreakableCage : public LiveActor { public: - BreakableCage(const char *); + BreakableCage(const char*); enum CageType { - CAGE_INVALID = 0, - CAGE_NORMAL = 1, - CAGE_LARGE = 2, - CAGE_FIX = 3, - CAGE_TRASH = 4 + CAGE_INVALID = 0, + CAGE_NORMAL = 1, + CAGE_LARGE = 2, + CAGE_FIX = 3, + CAGE_TRASH = 4 }; virtual ~BreakableCage(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void kill(); virtual void calcAndSetBaseMtx(); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); const ActorCameraInfo* getCamInfo() const { return mCameraInfo; } - void initMapToolInfo(const JMapInfoIter &); - void initModel(const char *, const JMapInfoIter &); + void initMapToolInfo(const JMapInfoIter&); + void initModel(const char*, const JMapInfoIter&); void initBaseMtxForCage(); bool isTypeCage() const; bool isAppearPowerStar() const; @@ -42,18 +42,18 @@ public: void exeWait(); void exeBreak(); - TPos3f mMtx; // 0x8C - ModelObj* mBreakModel; // 0xBC - CageType mCageType; // 0xC0 - f32 mRotationSpeed; // 0xC4 - DummyDisplayModel* mItemModel; // 0xC8 - bool mIgnoreGravity; // 0xCC - bool mDelayDeadActivate; // 0xCD - const ActorCameraInfo* mCameraInfo; // 0xD0 + TPos3f mMtx; // 0x8C + ModelObj* mBreakModel; // 0xBC + CageType mCageType; // 0xC0 + f32 mRotationSpeed; // 0xC4 + DummyDisplayModel* mItemModel; // 0xC8 + bool mIgnoreGravity; // 0xCC + bool mDelayDeadActivate; // 0xCD + const ActorCameraInfo* mCameraInfo; // 0xD0 }; namespace NrvBreakableCage { NERVE(BreakableCageNrvWait); NERVE(BreakableCageNrvWaitStartDemoBreak); NERVE(BreakableCageNrvBreak); -}; \ No newline at end of file +}; // namespace NrvBreakableCage \ No newline at end of file diff --git a/include/Game/MapObj/BrightObj.hpp b/include/Game/MapObj/BrightObj.hpp index 7c710d4f0..9a80afb5b 100644 --- a/include/Game/MapObj/BrightObj.hpp +++ b/include/Game/MapObj/BrightObj.hpp @@ -9,27 +9,27 @@ public: void endRead(); void reset(); - u32 _0; - u32 _4; - TVec2f mBrightnessCenter[3]; // 0x8 - TVec2f mRealCenter[3]; // 0x20 - f32 mBright[3]; // 0x38 + u32 _0; + u32 _4; + TVec2f mBrightnessCenter[3]; // 0x8 + TVec2f mRealCenter[3]; // 0x20 + f32 mBright[3]; // 0x38 }; class BrightDrawInfo { public: BrightDrawInfo(); - TVec3f mPosition[2]; // 0x0 - f32 mRadius[2]; // 0x18 + TVec3f mPosition[2]; // 0x0 + f32 mRadius[2]; // 0x18 }; class BrightCamInfo { public: BrightCamInfo(); - TMtx34f mViewMtx[2]; // 0x0 - Mtx44 mProjectionMtx[2]; // 0x60 - TVec3f mCameraDir[2]; // 0xE0 - TVec3f mCameraPos[2]; // 0xF8 + TMtx34f mViewMtx[2]; // 0x0 + Mtx44 mProjectionMtx[2]; // 0x60 + TVec3f mCameraDir[2]; // 0xE0 + TVec3f mCameraPos[2]; // 0xF8 }; \ No newline at end of file diff --git a/include/Game/MapObj/BumpAppearPlanet.hpp b/include/Game/MapObj/BumpAppearPlanet.hpp index e43eae0bc..f8e03de19 100644 --- a/include/Game/MapObj/BumpAppearPlanet.hpp +++ b/include/Game/MapObj/BumpAppearPlanet.hpp @@ -4,12 +4,12 @@ class BumpAppearPlanet : public MapObjActor { public: - BumpAppearPlanet(const char *); + BumpAppearPlanet(const char*); virtual ~BumpAppearPlanet(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - virtual void initCaseUseSwitchA(const MapObjActorInitInfo &); + virtual void initCaseUseSwitchA(const MapObjActorInitInfo&); void exeWait(); void exeBumpOut(); diff --git a/include/Game/MapObj/Candlestand.hpp b/include/Game/MapObj/Candlestand.hpp index a9dbec380..e775f835e 100644 --- a/include/Game/MapObj/Candlestand.hpp +++ b/include/Game/MapObj/Candlestand.hpp @@ -5,31 +5,31 @@ class Candlestand : public MapObjActor { public: - Candlestand(const char *); + Candlestand(const char*); virtual ~Candlestand(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void makeActorAppeared(); virtual void startClipped(); virtual void endClipped(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void emitEffectFire(); - void deleteEffectFire(); - void emitEffectExtinguishFire(); - void appearItem(); - void exeFire(); - void exeExtinguish(); - void exeFlicker(); + void emitEffectFire(); + void deleteEffectFire(); + void emitEffectExtinguishFire(); + void appearItem(); + void exeFire(); + void exeExtinguish(); + void exeFlicker(); inline void exeAttack(); inline void exeBurn(); - s32 mItem; // 0xC4 - bool mHasItemAppear; // 0xC8 - SpinPullParticleCallBack* mSpinPtclCb; // 0xCC + s32 mItem; // 0xC4 + bool mHasItemAppear; // 0xC8 + SpinPullParticleCallBack* mSpinPtclCb; // 0xCC }; namespace NrvCandlestand { @@ -39,4 +39,4 @@ namespace NrvCandlestand { NERVE_DECL(HostTypeAttack, Candlestand, Candlestand::exeAttack); NERVE_DECL(HostTypeExtinguish, Candlestand, Candlestand::exeExtinguish); NERVE_DECL(HostTypeFlicker, Candlestand, Candlestand::exeFlicker); -}; \ No newline at end of file +}; // namespace NrvCandlestand \ No newline at end of file diff --git a/include/Game/MapObj/CannonFortressBreakStep.hpp b/include/Game/MapObj/CannonFortressBreakStep.hpp index 5e9c17a17..eb520e620 100644 --- a/include/Game/MapObj/CannonFortressBreakStep.hpp +++ b/include/Game/MapObj/CannonFortressBreakStep.hpp @@ -5,12 +5,12 @@ class CannonFortressBreakStep : public MapObjActor { public: - CannonFortressBreakStep(const char *); + CannonFortressBreakStep(const char*); virtual ~CannonFortressBreakStep(); - virtual void init(const JMapInfoIter &); - virtual void initCaseUseSwitchB(const MapObjActorInitInfo &); - virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo &); + virtual void init(const JMapInfoIter&); + virtual void initCaseUseSwitchB(const MapObjActorInitInfo&); + virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo&); void exeWait(); void exeFall(); diff --git a/include/Game/MapObj/CapsuleCage.hpp b/include/Game/MapObj/CapsuleCage.hpp index f042d33a1..4e3080983 100644 --- a/include/Game/MapObj/CapsuleCage.hpp +++ b/include/Game/MapObj/CapsuleCage.hpp @@ -8,23 +8,23 @@ namespace { class CapsuleCage : public MapObjActor { public: - CapsuleCage(const char *); + CapsuleCage(const char*); virtual ~CapsuleCage(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); - virtual void connectToScene(const MapObjActorInitInfo &); - virtual void initCaseUseSwitchA(const MapObjActorInitInfo &); - virtual void initCaseNoUseSwitchA(const MapObjActorInitInfo &); - virtual void initCaseUseSwitchB(const MapObjActorInitInfo &); - virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo &); + virtual void connectToScene(const MapObjActorInitInfo&); + virtual void initCaseUseSwitchA(const MapObjActorInitInfo&); + virtual void initCaseNoUseSwitchA(const MapObjActorInitInfo&); + virtual void initCaseUseSwitchB(const MapObjActorInitInfo&); + virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo&); - void exeStartCamera(); + void exeStartCamera(); inline void exeEndCamera(); - void exeOpen(); - void startOpen(); + void exeOpen(); + void startOpen(); - ActorCameraInfo* mInfo; // 0xC4 + ActorCameraInfo* mInfo; // 0xC4 }; namespace NrvCapsuleCage { @@ -32,4 +32,4 @@ namespace NrvCapsuleCage { NERVE_DECL(CapsuleCageNrvStartCamera, CapsuleCage, CapsuleCage::exeStartCamera); NERVE_DECL(CapsuleCageNrvOpen, CapsuleCage, CapsuleCage::exeOpen); NERVE_DECL(CapsuleCageNrvEndCamera, CapsuleCage, CapsuleCage::exeEndCamera); -}; +}; // namespace NrvCapsuleCage diff --git a/include/Game/MapObj/ChipBase.hpp b/include/Game/MapObj/ChipBase.hpp index fe614a7ac..56a3dec35 100644 --- a/include/Game/MapObj/ChipBase.hpp +++ b/include/Game/MapObj/ChipBase.hpp @@ -9,51 +9,50 @@ class PartsModel; class ChipBase : public LiveActor { public: - ChipBase(const char *, s32, const char *); + ChipBase(const char*, s32, const char*); virtual ~ChipBase() { - } - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void makeActorAppeared(); virtual void makeActorDead(); virtual void control(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void initModel(const JMapInfoIter &); - void initSensor(); - void initShadow(const JMapInfoIter &); - void initJMapParam(const JMapInfoIter &); - void deactive(); - void setGroupID(s32); - void setHost(LiveActor *); - void appearWait(); - void appearFlashing(s32); - bool requestGet(HitSensor *, HitSensor *); - bool requestShow(); - bool requestHide(); - bool requestStartControl(); - bool requestEndControl(); - void exeDeactive(); - void exeWait(); - void exeControled(); - void exeFlashing(); - void exeHide(); - void exeGot(); - bool isGettable() const; - static bool isNeedBubble(const JMapInfoIter &); - static void makeArchiveList(NameObjArchiveListCollector *, const JMapInfoIter &); + void initModel(const JMapInfoIter&); + void initSensor(); + void initShadow(const JMapInfoIter&); + void initJMapParam(const JMapInfoIter&); + void deactive(); + void setGroupID(s32); + void setHost(LiveActor*); + void appearWait(); + void appearFlashing(s32); + bool requestGet(HitSensor*, HitSensor*); + bool requestShow(); + bool requestHide(); + bool requestStartControl(); + bool requestEndControl(); + void exeDeactive(); + void exeWait(); + void exeControled(); + void exeFlashing(); + void exeHide(); + void exeGot(); + bool isGettable() const; + static bool isNeedBubble(const JMapInfoIter&); + static void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&); - FlashingCtrl* mFlashingCtrl; // 0x8C - MapPartsRailMover* mRailMover; // 0x90 - PartsModel* mAirBubble; // 0x94 - const char* mChipName; // 0x98 - LiveActor* mHost; // 0x9C - TVec3f mClippingRange; // 0xA0 - s32 mGroupID; // 0xAC - s32 mChipType; // 0xB0 - bool _B4; - bool _B5; + FlashingCtrl* mFlashingCtrl; // 0x8C + MapPartsRailMover* mRailMover; // 0x90 + PartsModel* mAirBubble; // 0x94 + const char* mChipName; // 0x98 + LiveActor* mHost; // 0x9C + TVec3f mClippingRange; // 0xA0 + s32 mGroupID; // 0xAC + s32 mChipType; // 0xB0 + bool _B4; + bool _B5; }; diff --git a/include/Game/MapObj/ChipCounter.hpp b/include/Game/MapObj/ChipCounter.hpp index 0cb295cb1..f4c0c7d71 100644 --- a/include/Game/MapObj/ChipCounter.hpp +++ b/include/Game/MapObj/ChipCounter.hpp @@ -5,24 +5,24 @@ class ChipCounter : public LayoutActor { public: - ChipCounter(const char *, s32); + ChipCounter(const char*, s32); virtual ~ChipCounter(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); void setCount(s32); - s32 requestShow(s32, s32); + s32 requestShow(s32, s32); void requestHide(s32); void requestComplete(s32); void requestActive(); void requestDeactive(); - + void exeHide(); - CollectCounter* mCollectCounter; // 0x20 - s32 mCount; // 0x24 - s32 mType; // 0x28 - s32 _2C; - f32 _30; + CollectCounter* mCollectCounter; // 0x20 + s32 mCount; // 0x24 + s32 mType; // 0x28 + s32 _2C; + f32 _30; }; diff --git a/include/Game/MapObj/ChipGroup.hpp b/include/Game/MapObj/ChipGroup.hpp index f6f52c380..12bb29c8f 100644 --- a/include/Game/MapObj/ChipGroup.hpp +++ b/include/Game/MapObj/ChipGroup.hpp @@ -8,23 +8,23 @@ class ChipBase; class ChipGroup : public NameObj { public: - ChipGroup(const char *, s32); + ChipGroup(const char*, s32); struct ChipEntry { - ChipBase* mChip; // 0x0 - bool mIsGotten; // 0x4 + ChipBase* mChip; // 0x0 + bool mIsGotten; // 0x4 }; virtual ~ChipGroup(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); void updateUIRange(); - void registerChip(ChipBase *); + void registerChip(ChipBase*); void noticeEndCompleteDemo(); - s32 getGotCount() const; + s32 getGotCount() const; bool isComplete() const; - void noticeGet(ChipBase *); + void noticeGet(ChipBase*); void receiveAppearRequest(); /*inline ChipEntry** first() { @@ -35,33 +35,33 @@ public: return mChips[4]; }*/ - ChipEntry mChips[5]; // 0xC - StageSwitchCtrl* mSwitchCtrl; // 0x34 - TVec3f _38; - s32 mGotCount; // 0x44 - s32 mTotalCount; // 0x48 - s32 _4C; - s32 _50; - u32 _54; - u32 _58; - f32 _5C; - f32 _60; - u32 _64; - u32 _68; - u8 _6C; - u8 _6D; + ChipEntry mChips[5]; // 0xC + StageSwitchCtrl* mSwitchCtrl; // 0x34 + TVec3f _38; + s32 mGotCount; // 0x44 + s32 mTotalCount; // 0x48 + s32 _4C; + s32 _50; + u32 _54; + u32 _58; + f32 _5C; + f32 _60; + u32 _64; + u32 _68; + u8 _6C; + u8 _6D; }; class BlueChipGroup : public ChipGroup { public: - BlueChipGroup(const char *); + BlueChipGroup(const char*); virtual ~BlueChipGroup(); }; class YellowChipGroup : public ChipGroup { public: - YellowChipGroup(const char *); + YellowChipGroup(const char*); virtual ~YellowChipGroup(); }; \ No newline at end of file diff --git a/include/Game/MapObj/ChipHolder.hpp b/include/Game/MapObj/ChipHolder.hpp index a3c352bc8..571121f3f 100644 --- a/include/Game/MapObj/ChipHolder.hpp +++ b/include/Game/MapObj/ChipHolder.hpp @@ -9,37 +9,37 @@ class ChipHolder; class ChipCounter; namespace MR { - void registerChip(s32, ChipBase *, s32); + void registerChip(s32, ChipBase*, s32); ChipHolder* createChipHolder(s32); ChipHolder* getChipHolder(s32); - void registerChipGroup(s32, ChipGroup* pChipGroup); - s32 getGotChipCount(s32, s32); - void noticeGetChip(s32, ChipBase *, s32); - s32 showChipCounter(s32, s32); - void hideChipCounter(s32, s32); - void requestStartChipCompleteDemo(s32, s32); - void noticeEndChipCompleteDemo(s32, s32); - void activateChipLayout(); - void deactivateChipLayout(); -}; + void registerChipGroup(s32, ChipGroup* pChipGroup); + s32 getGotChipCount(s32, s32); + void noticeGetChip(s32, ChipBase*, s32); + s32 showChipCounter(s32, s32); + void hideChipCounter(s32, s32); + void requestStartChipCompleteDemo(s32, s32); + void noticeEndChipCompleteDemo(s32, s32); + void activateChipLayout(); + void deactivateChipLayout(); +}; // namespace MR class ChipHolder : public NameObj { public: enum ChipType { - Chip_Blue = 0, + Chip_Blue = 0, Chip_Yellow = 1 }; ChipHolder(const char* pName, s32 chipType); virtual ~ChipHolder(); - void registerChipGroup(ChipGroup* pChipGroup); + void registerChipGroup(ChipGroup* pChipGroup); ChipGroup* findChipGroup(s32 chipType) const; - void init(const JMapInfoIter&); + void init(const JMapInfoIter&); /* 0xC */ ChipCounter* mChipCounter; - /* 0x10 */ ChipGroup** mChipGroups; - /* 0x14 */ s32 mNumChipGroups; - /* 0x18 */ s32 mChipType; ///< Determines whether the chip is blue (`0`) or yellow (`1`). + /* 0x10 */ ChipGroup** mChipGroups; + /* 0x14 */ s32 mNumChipGroups; + /* 0x18 */ s32 mChipType; ///< Determines whether the chip is blue (`0`) or yellow (`1`). }; diff --git a/include/Game/MapObj/ChooChooTrain.hpp b/include/Game/MapObj/ChooChooTrain.hpp index c9dd15081..b8018146b 100644 --- a/include/Game/MapObj/ChooChooTrain.hpp +++ b/include/Game/MapObj/ChooChooTrain.hpp @@ -6,15 +6,15 @@ class ChooChooTrain : public LiveActor { public: - ChooChooTrain(const char *); - - virtual void init(const JMapInfoIter &); + ChooChooTrain(const char*); + + virtual void init(const JMapInfoIter&); virtual void startClipped(); virtual void endClipped(); virtual void control(); - MR::Vector > mModelArray; // 0x8C - TVec3f _98; - f32 mRailCoord; // 0xA4 - s32 mWhistleTimer; // 0xA8 + MR::Vector> mModelArray; // 0x8C + TVec3f _98; + f32 mRailCoord; // 0xA4 + s32 mWhistleTimer; // 0xA8 }; \ No newline at end of file diff --git a/include/Game/MapObj/CircleCoinGroup.hpp b/include/Game/MapObj/CircleCoinGroup.hpp index 54d4b351a..ad24c3692 100644 --- a/include/Game/MapObj/CircleCoinGroup.hpp +++ b/include/Game/MapObj/CircleCoinGroup.hpp @@ -4,17 +4,17 @@ class CircleCoinGroup : public CoinGroup { public: - CircleCoinGroup(const char *); + CircleCoinGroup(const char*); virtual ~CircleCoinGroup(); - virtual void initCoinArray(const JMapInfoIter &); - virtual void placementCoin() const; + virtual void initCoinArray(const JMapInfoIter&); + virtual void placementCoin() const; virtual const char* getCoinName() const; - f32 mCoinRadius; // 0xA0 + f32 mCoinRadius; // 0xA0 }; namespace MR { - NameObj* createCircleCoinGroup(const char *); - NameObj* createCirclePurpleCoinGroup(const char *); -}; + NameObj* createCircleCoinGroup(const char*); + NameObj* createCirclePurpleCoinGroup(const char*); +}; // namespace MR diff --git a/include/Game/MapObj/ClipArea.hpp b/include/Game/MapObj/ClipArea.hpp index 0b57162b6..ff9c74706 100644 --- a/include/Game/MapObj/ClipArea.hpp +++ b/include/Game/MapObj/ClipArea.hpp @@ -8,9 +8,9 @@ class ClipAreaShape; class ClipArea : public LiveActor { public: - ClipArea(const char *); - virtual void init(const JMapInfoIter &); - virtual void draw() const; + ClipArea(const char*); + virtual void init(const JMapInfoIter&); + virtual void draw() const; virtual MtxPtr getBaseMtx() const; virtual ~ClipArea(); @@ -18,6 +18,6 @@ public: void setShape(ClipAreaShape*); bool isInArea(const TVec3f&, f32) const; - TPos3f mBaseMatrix; // 0x8C - ClipAreaShape* mShape; // 0xBC + TPos3f mBaseMatrix; // 0x8C + ClipAreaShape* mShape; // 0xBC }; diff --git a/include/Game/MapObj/ClipAreaDrop.hpp b/include/Game/MapObj/ClipAreaDrop.hpp index 85ebd4310..7217ad7c1 100644 --- a/include/Game/MapObj/ClipAreaDrop.hpp +++ b/include/Game/MapObj/ClipAreaDrop.hpp @@ -17,5 +17,5 @@ public: void exeWait(); ClipAreaShapeSphere* _C0; - f32 _C4; + f32 _C4; }; diff --git a/include/Game/MapObj/ClipAreaDropHolder.hpp b/include/Game/MapObj/ClipAreaDropHolder.hpp index 7e2110e34..baff27f1a 100644 --- a/include/Game/MapObj/ClipAreaDropHolder.hpp +++ b/include/Game/MapObj/ClipAreaDropHolder.hpp @@ -10,9 +10,8 @@ public: virtual ~ClipAreaDropHolder(); }; - namespace MR { - NameObj* createClipAreaDropHolder(); + NameObj* createClipAreaDropHolder(); ClipAreaDrop* getDeadClipAreaDrop(); - bool appearClipAreaDrop(const TVec3f &, f32); -} + bool appearClipAreaDrop(const TVec3f&, f32); +} // namespace MR diff --git a/include/Game/MapObj/ClipAreaDropLaser.hpp b/include/Game/MapObj/ClipAreaDropLaser.hpp index aa05b5001..959d18f95 100644 --- a/include/Game/MapObj/ClipAreaDropLaser.hpp +++ b/include/Game/MapObj/ClipAreaDropLaser.hpp @@ -7,24 +7,24 @@ #include class ClipAreaDropLaser : public LiveActor { -public: +public: ClipAreaDropLaser(const char* pName); virtual ~ClipAreaDropLaser(); virtual void init(const JMapInfoIter& rIter); virtual void control(); virtual void draw() const; - void exeWait(); - void exeMove(); - void incrementDrawCount(); + void exeWait(); + void exeMove(); + void incrementDrawCount(); - TVec3f mPoints[0x40]; // 0x8C - f32 mNumPointsToDraw; // 0x38C - int mPointIndexToSkipDraw; // 0x390 - int mDrawCount; // 0x394 - f32 mSpeed; // 0x398 + TVec3f mPoints[0x40]; // 0x8C + f32 mNumPointsToDraw; // 0x38C + int mPointIndexToSkipDraw; // 0x390 + int mDrawCount; // 0x394 + f32 mSpeed; // 0x398 }; namespace NrvClipAreaDropLaser { NERVE_DECL_EXE(ClipAreaDropLaserNrvWait, ClipAreaDropLaser, Wait); NERVE_DECL_EXE(ClipAreaDropLaserNrvMove, ClipAreaDropLaser, Move); -}; +}; // namespace NrvClipAreaDropLaser diff --git a/include/Game/MapObj/ClipAreaHolder.hpp b/include/Game/MapObj/ClipAreaHolder.hpp index f6545bb71..892e3ca82 100644 --- a/include/Game/MapObj/ClipAreaHolder.hpp +++ b/include/Game/MapObj/ClipAreaHolder.hpp @@ -27,4 +27,4 @@ namespace MR { void activateClipArea(); void deactivateClipArea(); void setBinderExceptSensorType(LiveActor*, const TVec3f*, f32); -}; +}; // namespace MR diff --git a/include/Game/MapObj/ClipAreaMovable.hpp b/include/Game/MapObj/ClipAreaMovable.hpp index 83ec46dda..1e4cb0c2e 100644 --- a/include/Game/MapObj/ClipAreaMovable.hpp +++ b/include/Game/MapObj/ClipAreaMovable.hpp @@ -11,14 +11,14 @@ class ClipAreaMovable : public ClipArea { virtual void makeActorAppeared(); virtual void makeActorDead(); virtual void control(); - void initMoveFunction(const JMapInfoIter& rIter); - void startMoveFunction(); - void endMoveFunction(); - void movementMoveFunction(); - void updateMatrix(); + void initMoveFunction(const JMapInfoIter& rIter); + void startMoveFunction(); + void endMoveFunction(); + void movementMoveFunction(); + void updateMatrix(); MapPartsRailMover* mMapPartsRailMover; // 0xC0 - MapPartsRotator* mMapPartsRotator; // 0xC4 + MapPartsRotator* mMapPartsRotator; // 0xC4 }; namespace MR { @@ -27,4 +27,4 @@ namespace MR { ClipArea* createClipAreaBottomBox(const char* pModel); ClipArea* createClipAreaTopCone(const char* pModel); ClipArea* createClipAreaBottomCone(const char* pModel); -} +} // namespace MR diff --git a/include/Game/MapObj/ClipAreaShape.hpp b/include/Game/MapObj/ClipAreaShape.hpp index ac45218c9..207b9ce97 100644 --- a/include/Game/MapObj/ClipAreaShape.hpp +++ b/include/Game/MapObj/ClipAreaShape.hpp @@ -5,22 +5,22 @@ class ClipAreaShape { public: - ClipAreaShape(const char *); + ClipAreaShape(const char*); - virtual bool isInArea(const TVec3f &) const; - virtual void calcVolumeMatrix(TPos3f *, const TPos3f &, const TVec3f &) const; + virtual bool isInArea(const TVec3f&) const; + virtual void calcVolumeMatrix(TPos3f*, const TPos3f&, const TVec3f&) const; - bool isInArea(const TVec3f &, f32, const TPos3f &, const TVec3f &) const; - void drawVolumeShape(const TPos3f &, const TVec3f &) const; + bool isInArea(const TVec3f&, f32, const TPos3f&, const TVec3f&) const; + void drawVolumeShape(const TPos3f&, const TVec3f&) const; - J3DModelData* mModelData; // 0x4 + J3DModelData* mModelData; // 0x4 }; class ClipAreaShapeCone : public ClipAreaShape { public: ClipAreaShapeCone(s32); - virtual bool isInArea(const TVec3f &) const; + virtual bool isInArea(const TVec3f&) const; f32 _8; f32 _C; @@ -31,19 +31,19 @@ class ClipAreaShapeSphere : public ClipAreaShape { public: ClipAreaShapeSphere(); - virtual bool isInArea(const TVec3f &) const; - virtual void calcVolumeMatrix(TPos3f *, const TPos3f &, const TVec3f &) const; + virtual bool isInArea(const TVec3f&) const; + virtual void calcVolumeMatrix(TPos3f*, const TPos3f&, const TVec3f&) const; - f32 mRadius; // 0x8 + f32 mRadius; // 0x8 }; class ClipAreaShapeBox : public ClipAreaShape { public: ClipAreaShapeBox(s32); - virtual bool isInArea(const TVec3f &) const; - virtual void calcVolumeMatrix(TPos3f *, const TPos3f &, const TVec3f &) const; + virtual bool isInArea(const TVec3f&) const; + virtual void calcVolumeMatrix(TPos3f*, const TPos3f&, const TVec3f&) const; - f32 mRadius; // 0x8 + f32 mRadius; // 0x8 s32 _C; }; \ No newline at end of file diff --git a/include/Game/MapObj/ClipFieldMapParts.hpp b/include/Game/MapObj/ClipFieldMapParts.hpp index 0982c2934..97ee23e44 100644 --- a/include/Game/MapObj/ClipFieldMapParts.hpp +++ b/include/Game/MapObj/ClipFieldMapParts.hpp @@ -4,10 +4,10 @@ class ClipFieldMapParts : public GeneralMapParts { public: - ClipFieldMapParts(const char *); + ClipFieldMapParts(const char*); virtual ~ClipFieldMapParts(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); virtual void connectToScene(); }; \ No newline at end of file diff --git a/include/Game/MapObj/ClipFieldSwitch.hpp b/include/Game/MapObj/ClipFieldSwitch.hpp index 0a6dc6351..e6ba093fd 100644 --- a/include/Game/MapObj/ClipFieldSwitch.hpp +++ b/include/Game/MapObj/ClipFieldSwitch.hpp @@ -4,9 +4,9 @@ class ClipFieldSwitch : public LiveActor { public: - ClipFieldSwitch(const char *); + ClipFieldSwitch(const char*); virtual ~ClipFieldSwitch(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); }; \ No newline at end of file diff --git a/include/Game/MapObj/CocoNut.hpp b/include/Game/MapObj/CocoNut.hpp index 9d5b1ff7d..b38932b2f 100644 --- a/include/Game/MapObj/CocoNut.hpp +++ b/include/Game/MapObj/CocoNut.hpp @@ -5,94 +5,96 @@ class CocoNut : public LiveActor { public: - CocoNut(const char *); + CocoNut(const char*); - virtual ~CocoNut(); - virtual void init(const JMapInfoIter &); - virtual void initAfterPlacement(); - virtual void startClipped(); - virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPush(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual ~CocoNut(); + virtual void init(const JMapInfoIter&); + virtual void initAfterPlacement(); + virtual void startClipped(); + virtual void calcAndSetBaseMtx(); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPush(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - static void makeArchiveList(NameObjArchiveListCollector *, const JMapInfoIter &); + static void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&); - void initMapToolInfo(const JMapInfoIter &); - void initModel() NO_INLINE; - void initSensor(); - void initEffect(); - void updateRotate(f32); - void updateGravity(); - void processMove(); - bool isOnGround() const; - f32 calcMoveSpeed() const; - void setFrontVec(const TVec3f &); - bool getWallNormal(TVec3f *) const; + void initMapToolInfo(const JMapInfoIter&); + void initModel() NO_INLINE; + void initSensor(); + void initEffect(); + void updateRotate(f32); + void updateGravity(); + void processMove(); + bool isOnGround() const; + f32 calcMoveSpeed() const; + void setFrontVec(const TVec3f&); + bool getWallNormal(TVec3f*) const; - bool sendMsgToBindedSensor(); - bool sendMsgEnemyAttackToBindedSensor(HitSensor *); + bool sendMsgToBindedSensor(); + bool sendMsgEnemyAttackToBindedSensor(HitSensor*); - bool tryHit(HitSensor *, HitSensor *); - bool isPossibleToHit(const TVec3f &, const TVec3f &, const TVec3f &) const; - void calcHitSpeedAndFrontVec(f32 *, f32 *, TVec3f *, TVec3f *, const TVec3f &, const TVec3f &) const; - void hit(const TVec3f &, f32); - bool tryPushedFromActor(HitSensor *, HitSensor *); + bool tryHit(HitSensor*, HitSensor*); + bool isPossibleToHit(const TVec3f&, const TVec3f&, const TVec3f&) const; + void calcHitSpeedAndFrontVec(f32*, f32*, TVec3f*, TVec3f*, const TVec3f&, const TVec3f&) const; + void hit(const TVec3f&, f32); + bool tryPushedFromActor(HitSensor*, HitSensor*); - void reviseFrontVec(); - void statusToWait(); + void reviseFrontVec(); + void statusToWait(); - bool isValidReceiveMsg(const HitSensor *) const; + bool isValidReceiveMsg(const HitSensor*) const; - void statusToHide(); - void emitEffectSpinHit(const HitSensor *, const HitSensor *); + void statusToHide(); + void emitEffectSpinHit(const HitSensor*, const HitSensor*); - void tryMoveEnd(); + void tryMoveEnd(); - bool tryDisappear(); - bool isContactWithOtherCocoNut() const; + bool tryDisappear(); + bool isContactWithOtherCocoNut() const; - bool isValidPushedFromPlayer(const HitSensor *, const HitSensor *) const; + bool isValidPushedFromPlayer(const HitSensor*, const HitSensor*) const; - void calcHitSpeedAndFrontVec(f32 *, f32 *, TVec3f *, TVec3f *, TVec3f *, TVec3f *) const; + void calcHitSpeedAndFrontVec(f32*, f32*, TVec3f*, TVec3f*, TVec3f*, TVec3f*) const; - static const char *getModelName(); - static const char *getBreakEffectName(); + static const char* getModelName(); + static const char* getBreakEffectName(); - void exeWait(); - void exeWaitOnBind(); - void exeMove(); - void exeInWater(); - void exeBreak(); + void exeWait(); + void exeWaitOnBind(); + void exeMove(); + void exeInWater(); + void exeBreak(); - inline f32 getSize() { return _D0; } + inline f32 getSize() { + return _D0; + } private: - f32 _8C; - f32 _90; - TVec3f _94; - TPos3f _A0; - f32 _D0; - bool _D4; - TPos3f _D8; - TPos3f _108; - s32 _138; - bool _13C; - TVec3f mSpawnPosition; // 0x140 - bool _14C; - TVec3f _150; - bool mSphericalShadow; // 0x15C, also affects some other properties besides shadow - bool mRespawnWhenOutOfView; // 0x15D - bool _15E; // something about clipping - bool mContinueRolling; // 0x15F + f32 _8C; + f32 _90; + TVec3f _94; + TPos3f _A0; + f32 _D0; + bool _D4; + TPos3f _D8; + TPos3f _108; + s32 _138; + bool _13C; + TVec3f mSpawnPosition; // 0x140 + bool _14C; + TVec3f _150; + bool mSphericalShadow; // 0x15C, also affects some other properties besides shadow + bool mRespawnWhenOutOfView; // 0x15D + bool _15E; // something about clipping + bool mContinueRolling; // 0x15F }; namespace NrvCocoNut { - NERVE(CocoNutNrvWait) - NERVE(CocoNutNrvWaitOnBind) - NERVE(CocoNutNrvMove) - NERVE(CocoNutNrvInWater) - NERVE(CocoNutNrvBreak) - NERVE(CocoNutNrvReplaceReady) -}; + NERVE(CocoNutNrvWait) + NERVE(CocoNutNrvWaitOnBind) + NERVE(CocoNutNrvMove) + NERVE(CocoNutNrvInWater) + NERVE(CocoNutNrvBreak) + NERVE(CocoNutNrvReplaceReady) +}; // namespace NrvCocoNut diff --git a/include/Game/MapObj/CoconutTree.hpp b/include/Game/MapObj/CoconutTree.hpp index 36ac98bd7..88ac256e8 100644 --- a/include/Game/MapObj/CoconutTree.hpp +++ b/include/Game/MapObj/CoconutTree.hpp @@ -4,8 +4,8 @@ class CoconutTree : public LiveActor { public: - CoconutTree(const char *); + CoconutTree(const char*); virtual ~CoconutTree(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); }; \ No newline at end of file diff --git a/include/Game/MapObj/Coin.hpp b/include/Game/MapObj/Coin.hpp index 50efdd3d9..c24f0cf1e 100644 --- a/include/Game/MapObj/Coin.hpp +++ b/include/Game/MapObj/Coin.hpp @@ -14,80 +14,80 @@ public: _C = 0; } - const NameObj* mHostActor; // 0x0 - s32 _4; - s32 _8; - u32 _C; + const NameObj* mHostActor; // 0x0 + s32 _4; + s32 _8; + u32 _C; }; class Coin : public LiveActor { public: - Coin(const char *); + Coin(const char*); virtual ~Coin(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void appear(); virtual void makeActorAppeared(); virtual void makeActorDead(); virtual void calcAndSetBaseMtx(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void initShadow(const JMapInfoIter &); - void setShadowAndPoseModeFromJMapIter(const JMapInfoIter &); - void exeNonActive(); - void exeFix(); - void exeFixTimer(); - void exeMove(); - void exeControled(); - void exeSpinDrained(); - void exeHop(); - void appearFixInit(); - void appearFix(); - void appearControlPose(); - void appearNonActive(); - void appearFixTimer(s32, s32); - void appearMove(const TVec3f &, const TVec3f &, s32, s32); - void appearHop(const TVec3f &, const TVec3f &); - bool requestActive(); - bool requestActiveWithGravity(); - bool requestDeactive(); - bool requestStartControl(); - bool requestEndControl(); - bool requestSpinDrain(); - bool requestShow(); - bool requestHide(); - void noticeGetCoin(); - void setLife(s32); - void setHostInfo(CoinHostInfo *); - void setCalcShadowMode(); - void setCannotTime(s32); - void calcRebouond(); - void attenuateVelocity(); - static bool isNeedBubble(const JMapInfoIter &); - static void makeArchiveList(NameObjArchiveListCollector *, const JMapInfoIter &); + void initShadow(const JMapInfoIter&); + void setShadowAndPoseModeFromJMapIter(const JMapInfoIter&); + void exeNonActive(); + void exeFix(); + void exeFixTimer(); + void exeMove(); + void exeControled(); + void exeSpinDrained(); + void exeHop(); + void appearFixInit(); + void appearFix(); + void appearControlPose(); + void appearNonActive(); + void appearFixTimer(s32, s32); + void appearMove(const TVec3f&, const TVec3f&, s32, s32); + void appearHop(const TVec3f&, const TVec3f&); + bool requestActive(); + bool requestActiveWithGravity(); + bool requestDeactive(); + bool requestStartControl(); + bool requestEndControl(); + bool requestSpinDrain(); + bool requestShow(); + bool requestHide(); + void noticeGetCoin(); + void setLife(s32); + void setHostInfo(CoinHostInfo*); + void setCalcShadowMode(); + void setCannotTime(s32); + void calcRebouond(); + void attenuateVelocity(); + static bool isNeedBubble(const JMapInfoIter&); + static void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&); - CoinHostInfo* mHostInfo; // 0x8C - FlashingCtrl* mFlashCtrl; // 0x90 - PartsModel* mAirBubble; // 0x94 - TVec3f mDropPosition; // 0x98 - TVec3f mClippingRange; // 0xA4 - int _B0; - s32 mCannotTime; // 0xB4 - bool mIsInWater; // 0xB8 - bool _B9; // obj_arg3 - bool _BA; // obj_arg4 - bool _BB; - bool mIsPurpleCoin; // 0xBC - bool mIsNeedBubble; // 0xBD + CoinHostInfo* mHostInfo; // 0x8C + FlashingCtrl* mFlashCtrl; // 0x90 + PartsModel* mAirBubble; // 0x94 + TVec3f mDropPosition; // 0x98 + TVec3f mClippingRange; // 0xA4 + int _B0; + s32 mCannotTime; // 0xB4 + bool mIsInWater; // 0xB8 + bool _B9; // obj_arg3 + bool _BA; // obj_arg4 + bool _BB; + bool mIsPurpleCoin; // 0xBC + bool mIsNeedBubble; // 0xBD }; namespace MR { - NameObj* createDirectSetCoin(const char *); - NameObj* createCoin(const NameObj *, const char *); - NameObj* createDirectSetPurpleCoin(const char *); - NameObj* createPurpleCoin(const NameObj *, const char *); -}; + NameObj* createDirectSetCoin(const char*); + NameObj* createCoin(const NameObj*, const char*); + NameObj* createDirectSetPurpleCoin(const char*); + NameObj* createPurpleCoin(const NameObj*, const char*); +}; // namespace MR namespace NrvCoin { NERVE(CoinNrvNonActive); @@ -98,4 +98,4 @@ namespace NrvCoin { NERVE(CoinNrvSpinDrained); NERVE(CoinNrvMove); NERVE(CoinNrvHop); -}; +}; // namespace NrvCoin diff --git a/include/Game/MapObj/CoinBox.hpp b/include/Game/MapObj/CoinBox.hpp index 2b6cf1593..b995c5285 100644 --- a/include/Game/MapObj/CoinBox.hpp +++ b/include/Game/MapObj/CoinBox.hpp @@ -4,11 +4,11 @@ class CoinBox : public LiveActor { public: - CoinBox(const char *); + CoinBox(const char*); virtual ~CoinBox(); - virtual void init(const JMapInfoIter &); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void init(const JMapInfoIter&); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeHit(); }; @@ -16,4 +16,4 @@ public: namespace NrvCoinBox { NERVE(CoinBoxNrvWait); NERVE(CoinBoxNrvHit); -}; \ No newline at end of file +}; // namespace NrvCoinBox \ No newline at end of file diff --git a/include/Game/MapObj/CoinGroup.hpp b/include/Game/MapObj/CoinGroup.hpp index 7ce59cce2..d4317bd18 100644 --- a/include/Game/MapObj/CoinGroup.hpp +++ b/include/Game/MapObj/CoinGroup.hpp @@ -5,32 +5,31 @@ class CoinGroup : public LiveActor { public: - CoinGroup(const char *); + CoinGroup(const char*); virtual ~CoinGroup() { - } - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); - - virtual void initCoinArray(const JMapInfoIter &) = 0; - virtual void placementCoin(); + + virtual void initCoinArray(const JMapInfoIter&) = 0; + virtual void placementCoin(); virtual const char* getCoinName() const; void killCoinAll(); void appearCoinAll(); void appearCoinFix(); void appearCoinAllTimer(); - void setCoinTrans(s32, const TVec3f &); + void setCoinTrans(s32, const TVec3f&); void exeAppear(); void exeDemoAppear(); - Coin** mCoinArray; // 0x8C - ActorCameraInfo* mCameraInfo; // 0x90 - u32 mCoinCount; // 0x94 - s32 mTimeLimit; // 0x98 - bool mIsPurpleCoinGroup; // 0x9C + Coin** mCoinArray; // 0x8C + ActorCameraInfo* mCameraInfo; // 0x90 + u32 mCoinCount; // 0x94 + s32 mTimeLimit; // 0x98 + bool mIsPurpleCoinGroup; // 0x9C }; namespace NrvCoinGroup { @@ -38,4 +37,4 @@ namespace NrvCoinGroup { NERVE(CoinGroupNrvTryStartDemo); NERVE(CoinGroupNrvDemoAppear); NERVE(CoinGroupNrvKill); -}; \ No newline at end of file +}; // namespace NrvCoinGroup \ No newline at end of file diff --git a/include/Game/MapObj/CoinHolder.hpp b/include/Game/MapObj/CoinHolder.hpp index 8b7c904fa..8dfc29f93 100644 --- a/include/Game/MapObj/CoinHolder.hpp +++ b/include/Game/MapObj/CoinHolder.hpp @@ -9,33 +9,32 @@ class CoinHostInfo; class CoinHolder : public DeriveActorGroup { public: - CoinHolder(const char *); + CoinHolder(const char*); virtual ~CoinHolder() { - } - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - bool hopCoin(const NameObj *, const TVec3f &, const TVec3f &); - bool appearCoinFix(const NameObj *, const TVec3f &, s32); - bool appearCoinPop(const NameObj *, const TVec3f &, s32); - bool appearCoinPopToDirection(const NameObj *, const TVec3f &, const TVec3f &, s32); - bool appearCoinToVelocity(const NameObj *, const TVec3f &, const TVec3f &, s32); - bool appearCoinCircle(const NameObj *, const TVec3f &, s32); - CoinHostInfo* declare(const NameObj *, s32); - s32 getDeclareRemnantCoinCount(const NameObj *) const; - CoinHostInfo* findHostInfo(const NameObj *) const; - bool appearCoin(const NameObj *, const TVec3f &, const TVec3f &, s32, s32, s32, f32); + bool hopCoin(const NameObj*, const TVec3f&, const TVec3f&); + bool appearCoinFix(const NameObj*, const TVec3f&, s32); + bool appearCoinPop(const NameObj*, const TVec3f&, s32); + bool appearCoinPopToDirection(const NameObj*, const TVec3f&, const TVec3f&, s32); + bool appearCoinToVelocity(const NameObj*, const TVec3f&, const TVec3f&, s32); + bool appearCoinCircle(const NameObj*, const TVec3f&, s32); + CoinHostInfo* declare(const NameObj*, s32); + s32 getDeclareRemnantCoinCount(const NameObj*) const; + CoinHostInfo* findHostInfo(const NameObj*) const; + bool appearCoin(const NameObj*, const TVec3f&, const TVec3f&, s32, s32, s32, f32); - CoinHostInfo* mHostInfoArr; // 0x18 - s32 mHostInfoCount; // 0x1C + CoinHostInfo* mHostInfoArr; // 0x18 + s32 mHostInfoCount; // 0x1C }; namespace MR { void createCoinHolder(); void createCoinRotater(); - void addToCoinHolder(const NameObj *, Coin *); + void addToCoinHolder(const NameObj*, Coin*); NameObj* getCoinHolder(); -}; +}; // namespace MR diff --git a/include/Game/MapObj/CoinReplica.hpp b/include/Game/MapObj/CoinReplica.hpp index ef52aaaf2..651be5f71 100644 --- a/include/Game/MapObj/CoinReplica.hpp +++ b/include/Game/MapObj/CoinReplica.hpp @@ -5,15 +5,15 @@ class CoinReplica : public NameObj { public: - CoinReplica(const char *); + CoinReplica(const char*); virtual ~CoinReplica(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); void activeCoin(); void activeCoinWithGravity(); void deactiveCoin(); void removeCoin(); - Coin* mCoin; // 0xC + Coin* mCoin; // 0xC }; \ No newline at end of file diff --git a/include/Game/MapObj/CoinRotater.hpp b/include/Game/MapObj/CoinRotater.hpp index 13871d8a7..4611f1957 100644 --- a/include/Game/MapObj/CoinRotater.hpp +++ b/include/Game/MapObj/CoinRotater.hpp @@ -5,23 +5,23 @@ class CoinRotater : public NameObj { public: - CoinRotater(const char *); + CoinRotater(const char*); virtual ~CoinRotater(); virtual void movement(); - f32 _C; - f32 _10; - f32 _14; + f32 _C; + f32 _10; + f32 _14; TMtx34f mRotateYMtx; // 0x18 TMtx34f mHiSpeedRotateYMtx; // 0x48 TMtx34f mWaterRotateMtx; // 0x78 }; namespace MR { - void createCoinRotater(); + void createCoinRotater(); TMtx34f& getCoinRotateYMatrix(); TMtx34f& getCoinHiSpeedRotateYMatrix(); TMtx34f& getCoinInWaterRotateYMatrix(); -}; \ No newline at end of file +}; // namespace MR \ No newline at end of file diff --git a/include/Game/MapObj/CoinSpot.hpp b/include/Game/MapObj/CoinSpot.hpp index c4b9dca02..25241051b 100644 --- a/include/Game/MapObj/CoinSpot.hpp +++ b/include/Game/MapObj/CoinSpot.hpp @@ -4,18 +4,18 @@ class CoinSpot : public LiveActor { public: - CoinSpot(const char *); + CoinSpot(const char*); virtual ~CoinSpot(); - virtual void init(const JMapInfoIter &); - virtual void attackSensor(HitSensor *, HitSensor *); + virtual void init(const JMapInfoIter&); + virtual void attackSensor(HitSensor*, HitSensor*); void initSensor(); void exeWait(); void exeIsInTornado(); s32 _8C; - u8 _90; + u8 _90; s32 _94; s32 _98; }; @@ -23,4 +23,4 @@ public: namespace NrvCoinSpot { NERVE(CoinSpotNrvWait); NERVE(CoinSpotNrvIsInTornado); -}; \ No newline at end of file +}; // namespace NrvCoinSpot \ No newline at end of file diff --git a/include/Game/MapObj/CollapsePlane.hpp b/include/Game/MapObj/CollapsePlane.hpp index a6a05f81a..6176638ba 100644 --- a/include/Game/MapObj/CollapsePlane.hpp +++ b/include/Game/MapObj/CollapsePlane.hpp @@ -6,24 +6,24 @@ class CollapsePlane : public MapObjActor { public: - CollapsePlane(const char *); + CollapsePlane(const char*); virtual ~CollapsePlane(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); virtual void calcAndSetBaseMtx(); void exeWait(); void exeCollapse(); void exeDPDStop(); - bool calcJointPlane(TPos3f *, const JointControllerInfo &); + bool calcJointPlane(TPos3f*, const JointControllerInfo&); bool tryDPDStop(); - AnimScaleController* mScaleController; // 0xC4 - WalkerStateBindStarPointer* mStarPointerBind; // 0xC8 - JointController* mJointController; // 0xCC - s32 _D0; - s32 mTimer; // 0xD4 + AnimScaleController* mScaleController; // 0xC4 + WalkerStateBindStarPointer* mStarPointerBind; // 0xC8 + JointController* mJointController; // 0xCC + s32 _D0; + s32 mTimer; // 0xD4 }; namespace NrvCollapsePlane { @@ -31,4 +31,4 @@ namespace NrvCollapsePlane { NERVE_DECL(CollapsePlaneNrvCollapse, CollapsePlane, CollapsePlane::exeCollapse); NERVE_DECL(CollapsePlaneNrvDPDStop, CollapsePlane, CollapsePlane::exeDPDStop); NERVE_DECL_NULL(CollapsePlaneNrvEnd); -}; \ No newline at end of file +}; // namespace NrvCollapsePlane \ No newline at end of file diff --git a/include/Game/MapObj/CollectCounter.hpp b/include/Game/MapObj/CollectCounter.hpp index f52fe5c53..4939f3223 100644 --- a/include/Game/MapObj/CollectCounter.hpp +++ b/include/Game/MapObj/CollectCounter.hpp @@ -6,10 +6,10 @@ class CollectCounter : public LayoutActor { public: - CollectCounter(const char *); + CollectCounter(const char*); virtual ~CollectCounter(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); void setCount(s32); @@ -21,5 +21,5 @@ public: namespace NrvCollectCounter { NERVE(CollectCounterNrvHide); - NERVE(CollectCounterNrvShow); -}; + NERVE(CollectCounterNrvShow); +}; // namespace NrvCollectCounter diff --git a/include/Game/MapObj/CollisionBlocker.hpp b/include/Game/MapObj/CollisionBlocker.hpp index 5417ba947..27424e4d9 100644 --- a/include/Game/MapObj/CollisionBlocker.hpp +++ b/include/Game/MapObj/CollisionBlocker.hpp @@ -4,11 +4,11 @@ class CollisionBlocker : public LiveActor { public: - CollisionBlocker(const char *); + CollisionBlocker(const char*); virtual ~CollisionBlocker(); - virtual void init(const JMapInfoIter &); - virtual void attackSensor(HitSensor *, HitSensor *); + virtual void init(const JMapInfoIter&); + virtual void attackSensor(HitSensor*, HitSensor*); void forceBreak(); }; diff --git a/include/Game/MapObj/CrystalCage.hpp b/include/Game/MapObj/CrystalCage.hpp index 6074abc6b..7cfe5ca69 100644 --- a/include/Game/MapObj/CrystalCage.hpp +++ b/include/Game/MapObj/CrystalCage.hpp @@ -5,49 +5,49 @@ class CrystalCage : public LiveActor { public: - CrystalCage(const char *); + CrystalCage(const char*); virtual ~CrystalCage(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void kill(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); void forceBreak(); - void initMapToolInfo(const JMapInfoIter &); - void initModel(const char *); + void initMapToolInfo(const JMapInfoIter&); + void initModel(const char*); void tryOnSwitchDead(); void exeWait(); void exeBreak(); void exeBreakAfter(); - s32 mCrystalCageType; // 0x8C - ModelObj* mBreakObj; // 0x90 - TPos3f _94; - s32 _C4; - s32 _C8; - RumbleCalculatorCosMultLinear* mRumbleCalc; // 0xCC - TVec3f _D0; - TVec3f _DC; - TVec3f _E8; - DummyDisplayModel* mDisplayModel; // 0xF4 - TVec3f _F8; - bool _104; - u8 _105; - u8 _106; - u8 _107; - s32 _108; - bool mIsBreakObjVisible; // 0x10C - bool mPlayRiddleSFX; // 0x10D - bool mHasBinding; // 0x10E - u8 _10F; - TVec3f _110; + s32 mCrystalCageType; // 0x8C + ModelObj* mBreakObj; // 0x90 + TPos3f _94; + s32 _C4; + s32 _C8; + RumbleCalculatorCosMultLinear* mRumbleCalc; // 0xCC + TVec3f _D0; + TVec3f _DC; + TVec3f _E8; + DummyDisplayModel* mDisplayModel; // 0xF4 + TVec3f _F8; + bool _104; + u8 _105; + u8 _106; + u8 _107; + s32 _108; + bool mIsBreakObjVisible; // 0x10C + bool mPlayRiddleSFX; // 0x10D + bool mHasBinding; // 0x10E + u8 _10F; + TVec3f _110; }; namespace NrvCrystalCage { NERVE(CrystalCageNrvWait); NERVE(CrystalCageNrvBreak); NERVE(CrystalCageNrvBreakAfter); -}; +}; // namespace NrvCrystalCage diff --git a/include/Game/MapObj/CrystalCageMoving.hpp b/include/Game/MapObj/CrystalCageMoving.hpp index d8198b87e..12365600b 100644 --- a/include/Game/MapObj/CrystalCageMoving.hpp +++ b/include/Game/MapObj/CrystalCageMoving.hpp @@ -9,15 +9,15 @@ namespace { class CrystalCageMoving : public MapObjActor { public: - CrystalCageMoving(const char *); + CrystalCageMoving(const char*); virtual ~CrystalCageMoving(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); virtual void control(); - virtual void updateHitSensor(HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); - virtual void connectToScene(const MapObjActorInitInfo &); + virtual void updateHitSensor(HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); + virtual void connectToScene(const MapObjActorInitInfo&); void exeBreakBig(); void exeBreakSmall(); @@ -25,16 +25,16 @@ public: void exeDemoTicoMove(); void exeDemoTicoStop(); void exeDemoTicoChange(); - void crashMario(HitSensor *, HitSensor *); - void initDummyModel(const JMapInfoIter &); + void crashMario(HitSensor*, HitSensor*); + void initDummyModel(const JMapInfoIter&); void startBreakDemo(); bool isNerveTypeEnd() const; - ModelObj* mTicoModel; // 0xC4 - TPos3f _C8; - ActorCameraInfo* mCameraInfo; // 0xF8 - TVec3f _FC; - u8 _108; + ModelObj* mTicoModel; // 0xC4 + TPos3f _C8; + ActorCameraInfo* mCameraInfo; // 0xF8 + TVec3f _FC; + u8 _108; }; namespace NrvCrystalCageMoving { @@ -46,4 +46,4 @@ namespace NrvCrystalCageMoving { NERVE(CrystalCageMovingNrvDemoTicoMove); NERVE(CrystalCageMovingNrvDemoTicoStop); NERVE(CrystalCageMovingNrvDemoTicoChange); -}; \ No newline at end of file +}; // namespace NrvCrystalCageMoving \ No newline at end of file diff --git a/include/Game/MapObj/CrystalSwitch.hpp b/include/Game/MapObj/CrystalSwitch.hpp index 176dc8085..b06094ea8 100644 --- a/include/Game/MapObj/CrystalSwitch.hpp +++ b/include/Game/MapObj/CrystalSwitch.hpp @@ -4,13 +4,13 @@ class CrystalSwitch : public LiveActor { public: - CrystalSwitch(const char *); + CrystalSwitch(const char*); virtual ~CrystalSwitch(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); bool trySwitchDown(); bool tryOn(); @@ -22,8 +22,8 @@ public: u32 _8C; s32 _90; - f32 mRotateSpeed; // 0x94 - u8 _98; + f32 mRotateSpeed; // 0x94 + u8 _98; }; namespace NrvCrystalSwitch { @@ -31,4 +31,4 @@ namespace NrvCrystalSwitch { NERVE(CrystalSwitchNrvSwitchDown); NERVE(CrystalSwitchNrvOn); NERVE(CrystalSwitchNrvSwitchUp); -}; \ No newline at end of file +}; // namespace NrvCrystalSwitch \ No newline at end of file diff --git a/include/Game/MapObj/CutBushModelObj.hpp b/include/Game/MapObj/CutBushModelObj.hpp index 8bb083cf6..2f3e749a8 100644 --- a/include/Game/MapObj/CutBushModelObj.hpp +++ b/include/Game/MapObj/CutBushModelObj.hpp @@ -4,12 +4,12 @@ class CutBushModelObj : public LiveActor { public: - CutBushModelObj(const char *, const char *, bool, MtxPtr); + CutBushModelObj(const char*, const char*, bool, MtxPtr); virtual ~CutBushModelObj(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void calcAndSetBaseMtx(); - MtxPtr mMtx; // 0x8C + MtxPtr mMtx; // 0x8C }; \ No newline at end of file diff --git a/include/Game/MapObj/DashRing.hpp b/include/Game/MapObj/DashRing.hpp index eacc9639a..ece44fec9 100644 --- a/include/Game/MapObj/DashRing.hpp +++ b/include/Game/MapObj/DashRing.hpp @@ -4,31 +4,31 @@ class DashRing : public LiveActor { public: - DashRing(const char *pName) : LiveActor(pName) { - + DashRing(const char* pName) + : LiveActor(pName) { } virtual ~DashRing(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void draw() const; virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); - void initCommon(const JMapInfoIter &, const char *); + void initCommon(const JMapInfoIter&, const char*); void calcAxis(); void calcSubAxis(); - TVec3f mAxis; // 0x8C - TVec3f mSubAxis; // 0x98 - u16 _A4; - u16 _A6; - s32 _A8; - s32 _AC; - f32 _B0; - u8 _B4; - u8 _B5; - u8 _B6; - u8 _B7; + TVec3f mAxis; // 0x8C + TVec3f mSubAxis; // 0x98 + u16 _A4; + u16 _A6; + s32 _A8; + s32 _AC; + f32 _B0; + u8 _B4; + u8 _B5; + u8 _B6; + u8 _B7; TVec3f _B8; }; \ No newline at end of file diff --git a/include/Game/MapObj/DeadLeaves.hpp b/include/Game/MapObj/DeadLeaves.hpp index 3c4952b7d..80d291029 100644 --- a/include/Game/MapObj/DeadLeaves.hpp +++ b/include/Game/MapObj/DeadLeaves.hpp @@ -1,22 +1,22 @@ -#pragma once +#pragma once #include "Game/MapObj/MapObjActor.hpp" #include "Game/Util.hpp" class DeadLeaves : public MapObjActor { public: - DeadLeaves(const char *); + DeadLeaves(const char*); virtual ~DeadLeaves(); - virtual void init(const JMapInfoIter &); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual void init(const JMapInfoIter&); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); void exeSpin(); - s32 mItemType; // 0xC4 + s32 mItemType; // 0xC4 }; namespace NrvDeadLeaves { NERVE(DeadLeavesNrvWait); NERVE(DeadLeavesNrvSpin); -}; +}; // namespace NrvDeadLeaves diff --git a/include/Game/MapObj/DesertLandMoveSwitch.hpp b/include/Game/MapObj/DesertLandMoveSwitch.hpp index 57265c59c..97f7716ab 100644 --- a/include/Game/MapObj/DesertLandMoveSwitch.hpp +++ b/include/Game/MapObj/DesertLandMoveSwitch.hpp @@ -10,7 +10,7 @@ #include "revolution/types.h" class DesertLandMoveSwitch : public LiveActor { - public: +public: DesertLandMoveSwitch(const char* pName); virtual ~DesertLandMoveSwitch(); virtual void init(const JMapInfoIter& rIter); @@ -20,24 +20,24 @@ class DesertLandMoveSwitch : public LiveActor { virtual void calcAndSetBaseMtx(); virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); virtual bool receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); - void initModelAndCollision(const JMapInfoIter& rIter); - bool tryOn(); - bool trySwitchDown(); - bool tryConnect(); - void updateTimerSE(); - void exeWait(); - void exeSwitchDown(); - void exeOn(); - void exeReturn(); + void initModelAndCollision(const JMapInfoIter& rIter); + bool tryOn(); + bool trySwitchDown(); + bool tryConnect(); + void updateTimerSE(); + void exeWait(); + void exeSwitchDown(); + void exeOn(); + void exeReturn(); - CollisionParts* mCollisionParts; - SpringValue* mSpringValue; // 0x90 + CollisionParts* mCollisionParts; + SpringValue* mSpringValue; // 0x90 MapObjConnector* mMapObjConnector; // 0x94 - bool _98; - bool _99; - bool _9A; - s32 _9C; - const char* _A0; + bool _98; + bool _99; + bool _9A; + s32 _9C; + const char* _A0; }; namespace NrvDesertLandMoveSwitch { @@ -45,7 +45,7 @@ namespace NrvDesertLandMoveSwitch { NERVE_DECL_EXE(HostTypeSwitchDown, DesertLandMoveSwitch, SwitchDown); NERVE_DECL_EXE(HostTypeOn, DesertLandMoveSwitch, On); NERVE_DECL_EXE(HostTypeReturn, DesertLandMoveSwitch, Return); -}; +}; // namespace NrvDesertLandMoveSwitch namespace MR { bool isMsgHipDropFloor(u32); diff --git a/include/Game/MapObj/DesertMovingLand.hpp b/include/Game/MapObj/DesertMovingLand.hpp index 4c2f4be55..4cdb247a7 100644 --- a/include/Game/MapObj/DesertMovingLand.hpp +++ b/include/Game/MapObj/DesertMovingLand.hpp @@ -4,27 +4,27 @@ #include "Game/MapObj/MapObjActorInitInfo.hpp" class DesertMovingLand : public MapObjActor { - public: +public: DesertMovingLand(const char* pName); virtual ~DesertMovingLand(); virtual void init(const JMapInfoIter& rIter); virtual void control(); virtual void connectToScene(const MapObjActorInitInfo& rIter); - virtual void initCaseUseSwitchA(const MapObjActorInitInfo &); - virtual void initCaseUseSwitchB(const MapObjActorInitInfo &); - virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo &); - void startDemo(); - void updateDemoPlayerPos(); - void exeWait(); - void exeMoveDown(); - void exeMoveUp(); - void exeMoveSign(); - void exeStop(); + virtual void initCaseUseSwitchA(const MapObjActorInitInfo&); + virtual void initCaseUseSwitchB(const MapObjActorInitInfo&); + virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo&); + void startDemo(); + void updateDemoPlayerPos(); + void exeWait(); + void exeMoveDown(); + void exeMoveUp(); + void exeMoveSign(); + void exeStop(); - TVec3f _C4; - TVec3f _D0; - s32 _DC; - s32 _E0; + TVec3f _C4; + TVec3f _D0; + s32 _DC; + s32 _E0; TMtx34f _E4; }; @@ -36,8 +36,8 @@ namespace NrvDesertMovingLand { NERVE_DECL_EXE(HostTypeMoveDownSign, DesertMovingLand, MoveSign); NERVE_DECL_EXE(HostTypeMoveUpSign, DesertMovingLand, MoveSign); NERVE_DECL_EXE(HostTypeStop, DesertMovingLand, Stop); -}; +}; // namespace NrvDesertMovingLand namespace { -static const char* cDemoName = "砂漠ＵＦＯ上昇"; + static const char* cDemoName = "砂漠ＵＦＯ上昇"; }; diff --git a/include/Game/MapObj/DummyDisplayModel.hpp b/include/Game/MapObj/DummyDisplayModel.hpp index 476fe2ef4..9aad64ffc 100644 --- a/include/Game/MapObj/DummyDisplayModel.hpp +++ b/include/Game/MapObj/DummyDisplayModel.hpp @@ -22,7 +22,7 @@ namespace MR { DummyDisplayModel* createDummyDisplayModel(LiveActor*, const JMapInfoIter&, MtxPtr, s32, const TVec3f&, const TVec3f&); DummyDisplayModel* createDummyDisplayModelCrystalItem(LiveActor*, const JMapInfoIter&, const TVec3f&, const TVec3f&); DummyDisplayModel* createDummyDisplayModelCrystalItem(LiveActor*, s32, const TVec3f&, const TVec3f&); - s32 getDummyDisplayModelId(const JMapInfoIter&, s32); - s32 getDummyDisplayModelId(const LiveActor*); - void makeArchiveListDummyDisplayModel(NameObjArchiveListCollector*, const JMapInfoIter&); -}; + s32 getDummyDisplayModelId(const JMapInfoIter&, s32); + s32 getDummyDisplayModelId(const LiveActor*); + void makeArchiveListDummyDisplayModel(NameObjArchiveListCollector*, const JMapInfoIter&); +}; // namespace MR diff --git a/include/Game/MapObj/DynamicCollisionObj.hpp b/include/Game/MapObj/DynamicCollisionObj.hpp index 91f3eca40..a05294ec3 100644 --- a/include/Game/MapObj/DynamicCollisionObj.hpp +++ b/include/Game/MapObj/DynamicCollisionObj.hpp @@ -9,32 +9,31 @@ public: class TriangleIndexing { public: inline TriangleIndexing() { - } u16 mIndex[3]; }; - DynamicCollisionObj(const char *); + DynamicCollisionObj(const char*); virtual ~DynamicCollisionObj(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); void syncCollision(); void updateTriangle(); void updateCollisionHeader(); void createCollision(); - void *_8C; - CollisionParts *mParts; // 0x90 - u16 _94; - u16 mNrTriangles; // 0x96 - TVec3f *mPositions; // 0x98 - TVec3f *_9C; - TriangleIndexing *mIndices; // 0xA0 - u32 _A4; - u32 _A8; - u32 _AC; - u8 _B0[0x6C]; - u32 _11C; + void* _8C; + CollisionParts* mParts; // 0x90 + u16 _94; + u16 mNrTriangles; // 0x96 + TVec3f* mPositions; // 0x98 + TVec3f* _9C; + TriangleIndexing* mIndices; // 0xA0 + u32 _A4; + u32 _A8; + u32 _AC; + u8 _B0[0x6C]; + u32 _11C; }; diff --git a/include/Game/MapObj/EarthenPipe.hpp b/include/Game/MapObj/EarthenPipe.hpp index 34738d96e..6a864abd3 100644 --- a/include/Game/MapObj/EarthenPipe.hpp +++ b/include/Game/MapObj/EarthenPipe.hpp @@ -6,64 +6,64 @@ class EarthenPipe : public LiveActor { public: - EarthenPipe(const char *); + EarthenPipe(const char*); virtual ~EarthenPipe(); - virtual void init(const JMapInfoIter &); - virtual void calcAnim(); - virtual void makeActorAppeared(); + virtual void init(const JMapInfoIter&); + virtual void calcAnim(); + virtual void makeActorAppeared(); virtual MtxPtr getBaseMtx() const; - virtual void control(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void control(); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - bool tryShowUp(); - bool tryHideDown(); - bool isNerveShowUp() const; - void exeWait(); - void exeReady(); - void exePlayerIn(); - void exeTargetPipeShowUp(); - void exePlayerOut(); - void exeInvalid(); + bool tryShowUp(); + bool tryHideDown(); + bool isNerveShowUp() const; + void exeWait(); + void exeReady(); + void exePlayerIn(); + void exeTargetPipeShowUp(); + void exePlayerOut(); + void exeInvalid(); inline void exeWaitToHideDown(); inline void exeWaitToShowUp(); - void exeShowUp(); - void exeHideDown(); - void calcTrans(f32); - void processBgmPlayerIn(); - void processBgmPlayerOut(); + void exeShowUp(); + void exeHideDown(); + void calcTrans(f32); + void processBgmPlayerIn(); + void processBgmPlayerOut(); - TVec3f _8C; - TVec3f _98; - f32 _A4; - bool mIsIgnoreGravity; // 0xA8 - bool _A9; - bool _AA; - bool _AB; - s32 mPipeMode; // 0xAC - EarthenPipe* _B0; - MtxPtr mTopJointMtx; // 0xB4 - MtxPtr mBottomJointMtx; // 0xB8 - TPos3f _BC; - LiveActor* mHostActor; // 0xEC - TPos3f _F0; - TMtx34f _120; - TMtx34f _150; - f32 _180; - f32 mHorizExitForce; // 0x184 - f32 mVertExitForce; // 0x188 - s32 mMusicChangeIdx; // 0x18C - s32 mMusicState; // 0x190 - u8 _194; - u8 _195; - u8 _196; - u8 _197; - PartsModel* mPipeStreamModel; // 0x198 - bool _19C; - bool _19D; - bool _19E; - bool _19F; - ActorCameraInfo* mCameraInfo; // 0x1A0 + TVec3f _8C; + TVec3f _98; + f32 _A4; + bool mIsIgnoreGravity; // 0xA8 + bool _A9; + bool _AA; + bool _AB; + s32 mPipeMode; // 0xAC + EarthenPipe* _B0; + MtxPtr mTopJointMtx; // 0xB4 + MtxPtr mBottomJointMtx; // 0xB8 + TPos3f _BC; + LiveActor* mHostActor; // 0xEC + TPos3f _F0; + TMtx34f _120; + TMtx34f _150; + f32 _180; + f32 mHorizExitForce; // 0x184 + f32 mVertExitForce; // 0x188 + s32 mMusicChangeIdx; // 0x18C + s32 mMusicState; // 0x190 + u8 _194; + u8 _195; + u8 _196; + u8 _197; + PartsModel* mPipeStreamModel; // 0x198 + bool _19C; + bool _19D; + bool _19E; + bool _19F; + ActorCameraInfo* mCameraInfo; // 0x1A0 }; class EarthenPipeMediator : public NameObj { @@ -72,16 +72,16 @@ public: struct Entry { EarthenPipe* _0; - EarthenPipe* _4; // 0x4 - s32 mPipeID; // 0x8 + EarthenPipe* _4; // 0x4 + s32 mPipeID; // 0x8 }; virtual ~EarthenPipeMediator(); - void entry(EarthenPipe *, const JMapInfoIter &); + void entry(EarthenPipe*, const JMapInfoIter&); - s32 mNumEntries; // 0xC - Entry* mPipeEntries; // 0x10 + s32 mNumEntries; // 0xC + Entry* mPipeEntries; // 0x10 }; namespace NrvEarthenPipe { @@ -97,4 +97,4 @@ namespace NrvEarthenPipe { NERVE_DECL(EarthenPipeNrvPlayerIn, EarthenPipe, EarthenPipe::exePlayerIn); NERVE_DECL(EarthenPipeNrvReady, EarthenPipe, EarthenPipe::exeReady); NERVE_DECL(EarthenPipeNrvWait, EarthenPipe, EarthenPipe::exeWait); -}; +}; // namespace NrvEarthenPipe diff --git a/include/Game/MapObj/ExterminationChecker.hpp b/include/Game/MapObj/ExterminationChecker.hpp index 4bcf895f2..37705ea01 100644 --- a/include/Game/MapObj/ExterminationChecker.hpp +++ b/include/Game/MapObj/ExterminationChecker.hpp @@ -7,30 +7,29 @@ class KeySwitch; typedef LiveActor* (*CreationFunc)(const char*); struct ExterminationEntry { - const char* mChildName; + const char* mChildName; CreationFunc mCreationFunc; }; namespace { - template - LiveActor* createLiveActor(const char *pName) { + template + LiveActor* createLiveActor(const char* pName) { return new T(pName); } // we will define the creation funcs later - static const ExterminationEntry sCreateTable[3]= { - { "ChildKuribo", nullptr }, - { "ChildSkeletalFishBaby", nullptr }, - { "ChildMeramera", nullptr } - }; -}; + static const ExterminationEntry sCreateTable[3] = { + {"ChildKuribo", nullptr}, + {"ChildSkeletalFishBaby", nullptr}, + {"ChildMeramera", nullptr}}; +}; // namespace class ExterminationChecker : public LiveActor { public: - ExterminationChecker(const char *); + ExterminationChecker(const char*); virtual ~ExterminationChecker(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); void exeWatching(); @@ -38,7 +37,7 @@ public: void exeAppearStar(); void exeAppearKeySwitch(); - inline CreationFunc findEntry(const char *pName) { + inline CreationFunc findEntry(const char* pName) { for (s32 j = 0; j < 3; j++) { if (sCreateTable[j].mChildName && MR::isEqualStringCase(sCreateTable[j].mChildName, pName)) { return sCreateTable[j].mCreationFunc; @@ -48,11 +47,11 @@ public: return nullptr; } - LiveActorGroup* mGroup; // 0x8C - KeySwitch* mKeySwitch; // 0x90 - TVec3f mKeySwitchPos; // 0x94 - u8 _A0; - u8 _A1; + LiveActorGroup* mGroup; // 0x8C + KeySwitch* mKeySwitch; // 0x90 + TVec3f mKeySwitchPos; // 0x94 + u8 _A0; + u8 _A1; }; namespace NrvExterminationChecker { @@ -60,9 +59,9 @@ namespace NrvExterminationChecker { NERVE_DECL(ExterminationCheckerNrvTryStartDemoAppear, ExterminationChecker, ExterminationChecker::exeTryStartDemoAppear); NERVE_DECL(ExterminationCheckerNrvAppearStar, ExterminationChecker, ExterminationChecker::exeAppearStar); NERVE_DECL(ExterminationCheckerNrvAppearKeySwitch, ExterminationChecker, ExterminationChecker::exeAppearKeySwitch); -}; +}; // namespace NrvExterminationChecker namespace MR { - NameObj* createExterminationPowerStar(const char *); - NameObj* createExterminationKeySwitch(const char *); -}; \ No newline at end of file + NameObj* createExterminationPowerStar(const char*); + NameObj* createExterminationKeySwitch(const char*); +}; // namespace MR \ No newline at end of file diff --git a/include/Game/MapObj/FallOutFieldDraw.hpp b/include/Game/MapObj/FallOutFieldDraw.hpp index 23fe29950..ebbad3ab0 100644 --- a/include/Game/MapObj/FallOutFieldDraw.hpp +++ b/include/Game/MapObj/FallOutFieldDraw.hpp @@ -4,10 +4,10 @@ class FallOutFieldDraw : public NameObj { public: - FallOutFieldDraw(const char *); + FallOutFieldDraw(const char*); virtual ~FallOutFieldDraw(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void draw() const; void setUpFillScreen() const; diff --git a/include/Game/MapObj/FallingSmallRock.hpp b/include/Game/MapObj/FallingSmallRock.hpp index c6b99fc60..7f99c8530 100644 --- a/include/Game/MapObj/FallingSmallRock.hpp +++ b/include/Game/MapObj/FallingSmallRock.hpp @@ -4,18 +4,18 @@ class FallingSmallRock : public LiveActor { public: - FallingSmallRock(const char *); + FallingSmallRock(const char*); virtual ~FallingSmallRock(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void startClipped(); virtual void endClipped(); - void exeMove(); + void exeMove(); inline void exeWait(); }; namespace NrvFallingSmallRock { NERVE_DECL(HostTypeWait, FallingSmallRock, FallingSmallRock::exeWait); NERVE_DECL(HostTypeMove, FallingSmallRock, FallingSmallRock::exeMove); -}; \ No newline at end of file +}; // namespace NrvFallingSmallRock \ No newline at end of file diff --git a/include/Game/MapObj/FireBar.hpp b/include/Game/MapObj/FireBar.hpp index 61d879f8c..3297c625a 100644 --- a/include/Game/MapObj/FireBar.hpp +++ b/include/Game/MapObj/FireBar.hpp @@ -4,10 +4,10 @@ class FireBarBall : public ModelObj { public: - FireBarBall(LiveActor *); + FireBarBall(LiveActor*); virtual ~FireBarBall(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void startClipped(); virtual void endClipped(); @@ -15,30 +15,30 @@ public: void controlEmitEffect(); - LiveActor* mFireBarParent; // 0x90 + LiveActor* mFireBarParent; // 0x90 }; class FireBar : public LiveActor { public: - FireBar(const char *); + FireBar(const char*); virtual ~FireBar(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void makeActorAppeared(); virtual void makeActorDead(); - virtual void updateHitSensor(HitSensor *); - virtual void attackSensor(HitSensor *, HitSensor *); + virtual void updateHitSensor(HitSensor*); + virtual void attackSensor(HitSensor*, HitSensor*); void exeWait(); - void initFireBarBall(const JMapInfoIter &); + void initFireBarBall(const JMapInfoIter&); void fixFireBarBall(); - FireBarBall** mFireBalls; // 0x8C - s32 mFireBallCount; // 0x90 - TVec3f _94; - f32 mFireBarSpeed; // 0xA0 - s32 mStickCount; // 0xA4 - f32 mStickDistance; // 0xA8 + FireBarBall** mFireBalls; // 0x8C + s32 mFireBallCount; // 0x90 + TVec3f _94; + f32 mFireBarSpeed; // 0xA0 + s32 mStickCount; // 0xA4 + f32 mStickDistance; // 0xA8 }; namespace NrvFireBar { diff --git a/include/Game/MapObj/FirePressure.hpp b/include/Game/MapObj/FirePressure.hpp index 5755ba55f..f717e177f 100644 --- a/include/Game/MapObj/FirePressure.hpp +++ b/include/Game/MapObj/FirePressure.hpp @@ -4,14 +4,14 @@ class FirePressure : public PressureBase { public: - FirePressure(const char *); + FirePressure(const char*); virtual ~FirePressure(); - virtual void init(const JMapInfoIter &); - virtual void initBullet(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); + virtual void initBullet(const JMapInfoIter&); virtual bool shotBullet(f32); - void calcGunPointFromCannon(TPos3f *); + void calcGunPointFromCannon(TPos3f*); - bool mDisableCollsion; // 0x8D + bool mDisableCollsion; // 0x8D }; \ No newline at end of file diff --git a/include/Game/MapObj/FirePressureBullet.hpp b/include/Game/MapObj/FirePressureBullet.hpp index 45fc7764b..cbaec1c7f 100644 --- a/include/Game/MapObj/FirePressureBullet.hpp +++ b/include/Game/MapObj/FirePressureBullet.hpp @@ -4,23 +4,23 @@ class FirePressureBullet : public LiveActor { public: - FirePressureBullet(const char *); + FirePressureBullet(const char*); virtual ~FirePressureBullet(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); - void shotFireBullet(LiveActor *, const TPos3f &, const f32 &, bool, bool); + void shotFireBullet(LiveActor*, const TPos3f&, const f32&, bool, bool); void exeFly(); bool isCrash() const; - TVec3f _8C; - LiveActor* mFirePressure; // 0x98 - f32 _9C; - bool _A0; - bool _A1; + TVec3f _8C; + LiveActor* mFirePressure; // 0x98 + f32 _9C; + bool _A0; + bool _A1; }; namespace NrvFirePressureBullet { diff --git a/include/Game/MapObj/FirePressureBulletHolder.hpp b/include/Game/MapObj/FirePressureBulletHolder.hpp index 590ae54f8..2d3a1a460 100644 --- a/include/Game/MapObj/FirePressureBulletHolder.hpp +++ b/include/Game/MapObj/FirePressureBulletHolder.hpp @@ -5,12 +5,12 @@ class FirePressureBulletHolder : public NameObj { public: - FirePressureBulletHolder(const char *); + FirePressureBulletHolder(const char*); virtual ~FirePressureBulletHolder(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); FirePressureBullet* callEmptyBullet(); - FirePressureBullet* mBullets[0x8]; // 0xC + FirePressureBullet* mBullets[0x8]; // 0xC }; \ No newline at end of file diff --git a/include/Game/MapObj/FirePressureRadiate.hpp b/include/Game/MapObj/FirePressureRadiate.hpp index 8ce6f2fd1..28cc8ca6f 100644 --- a/include/Game/MapObj/FirePressureRadiate.hpp +++ b/include/Game/MapObj/FirePressureRadiate.hpp @@ -6,38 +6,38 @@ class FirePressureRadiate : public LiveActor { public: - FirePressureRadiate(const char *); + FirePressureRadiate(const char*); virtual ~FirePressureRadiate(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void updateHitSensor(HitSensor *); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void updateHitSensor(HitSensor*); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void exeRadiateMargin(); - void exeRadiate(); - void exePrepareToRadiate(); + void exeRadiateMargin(); + void exeRadiate(); + void exePrepareToRadiate(); inline void exeWait(); - void exeSyncWait(); - void exeRelax(); - void startWait(); - void startRelax(); - void calcRadiateEffectMtx(); - bool calcJointCannon(TPos3f *, const JointControllerInfo &); + void exeSyncWait(); + void exeRelax(); + void startWait(); + void startRelax(); + void calcRadiateEffectMtx(); + bool calcJointCannon(TPos3f*, const JointControllerInfo&); - JointController* mJointController; // 0x8C - TMtx34f mRadiateMtx; // 0x90 - f32 mCannonRotation; // 0x94 - s32 mWaitTime; // 0x98 - s32 mShootTime; // 0x9C - s32 _CC; - f32 _D0; - f32 _D4; - MsgSharedGroup* mGroup; // 0xD8 - bool _DC; + JointController* mJointController; // 0x8C + TMtx34f mRadiateMtx; // 0x90 + f32 mCannonRotation; // 0x94 + s32 mWaitTime; // 0x98 + s32 mShootTime; // 0x9C + s32 _CC; + f32 _D0; + f32 _D4; + MsgSharedGroup* mGroup; // 0xD8 + bool _DC; }; namespace NrvFirePressureRadiate { @@ -47,4 +47,4 @@ namespace NrvFirePressureRadiate { NERVE_DECL(FirePressureRadiateNrvPrepareToRadiate, FirePressureRadiate, FirePressureRadiate::exePrepareToRadiate); NERVE_DECL(FirePressureRadiateNrvRadiate, FirePressureRadiate, FirePressureRadiate::exeRadiate); NERVE_DECL(FirePressureRadiateNrvRadiateMargin, FirePressureRadiate, FirePressureRadiate::exeRadiateMargin); -}; \ No newline at end of file +}; // namespace NrvFirePressureRadiate \ No newline at end of file diff --git a/include/Game/MapObj/FlameGun.hpp b/include/Game/MapObj/FlameGun.hpp index 70fc4742a..c018018c4 100644 --- a/include/Game/MapObj/FlameGun.hpp +++ b/include/Game/MapObj/FlameGun.hpp @@ -4,14 +4,14 @@ class FlameGun : public LiveActor { public: - FlameGun(const char *); + FlameGun(const char*); virtual ~FlameGun(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void endClipped(); - virtual void updateHitSensor(HitSensor *); - virtual void attackSensor(HitSensor *, HitSensor *); + virtual void updateHitSensor(HitSensor*); + virtual void attackSensor(HitSensor*, HitSensor*); void initSensor(); void exeSwitchWait(); @@ -22,7 +22,7 @@ public: void exeRadiateOnly(); TVec3f _8C; - s32 mState; // 0x98 + s32 mState; // 0x98 }; namespace NrvFlameGun { @@ -32,4 +32,4 @@ namespace NrvFlameGun { NERVE_DECL(HostTypeNrvRadiate, FlameGun, FlameGun::exeRadiate); NERVE_DECL(HostTypeNrvRotate, FlameGun, FlameGun::exeRotate); NERVE_DECL(HostTypeNrvRadiateOnly, FlameGun, FlameGun::exeRadiateOnly); -}; \ No newline at end of file +}; // namespace NrvFlameGun \ No newline at end of file diff --git a/include/Game/MapObj/FlipPanel.hpp b/include/Game/MapObj/FlipPanel.hpp index d49b1d78c..f12e80718 100644 --- a/include/Game/MapObj/FlipPanel.hpp +++ b/include/Game/MapObj/FlipPanel.hpp @@ -9,48 +9,48 @@ namespace { class FlipPanel : public MapObjActor { public: - FlipPanel(const char *); + FlipPanel(const char*); virtual ~FlipPanel(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void endClipped(); virtual void calcAndSetBaseMtx(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeFrontLand(); void exeBackLand(); void exeWait(); void exeEnd(); - bool calcJointMove(TPos3f *, const JointControllerInfo &); + bool calcJointMove(TPos3f*, const JointControllerInfo&); bool checkPlayerOnTop(); - JointControlDelegator* mDelegator; // 0xC4 - MsgSharedGroup* mFlipPanelGroup; // 0xC8 - bool _CC; - u8 _CD; - s32 _D0; - bool mIsReverse; // 0xD4 + JointControlDelegator* mDelegator; // 0xC4 + MsgSharedGroup* mFlipPanelGroup; // 0xC8 + bool _CC; + u8 _CD; + s32 _D0; + bool mIsReverse; // 0xD4 }; class FlipPanelObserver : public LiveActor { public: - FlipPanelObserver(const char *); + FlipPanelObserver(const char*); virtual ~FlipPanelObserver(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeWait(); void exeComplete(); void exeDemoWait(); MsgSharedGroup* _8C; - s32 _90; - s32 mDemoDelay; // 0x94 - s32 mPowerStarId; // 0x98 - u8 _9C; + s32 _90; + s32 mDemoDelay; // 0x94 + s32 mPowerStarId; // 0x98 + u8 _9C; }; namespace NrvFlipPanel { @@ -60,10 +60,10 @@ namespace NrvFlipPanel { NERVE(FlipPanelNrvBackLand); NERVE(FlipPanelNrvEnd); NERVE(FlipPanelNrvEndPrepare); -}; +}; // namespace NrvFlipPanel namespace NrvFlipPanelObserver { NERVE(FlipPanelObserverNrvWait); NERVE(FlipPanelObserverNrvDemoWait); NERVE(FlipPanelObserverNrvComplete); -}; \ No newline at end of file +}; // namespace NrvFlipPanelObserver \ No newline at end of file diff --git a/include/Game/MapObj/FloaterFloatingForce.hpp b/include/Game/MapObj/FloaterFloatingForce.hpp index df3d258dc..eeec3447f 100644 --- a/include/Game/MapObj/FloaterFloatingForce.hpp +++ b/include/Game/MapObj/FloaterFloatingForce.hpp @@ -5,23 +5,21 @@ class FloaterFloatingForce : public MapPartsFunction { public: - FloaterFloatingForce(LiveActor *, const char *); + FloaterFloatingForce(LiveActor*, const char*); virtual ~FloaterFloatingForce(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void start(); - virtual void updateHostTrans(TVec3f *) const { - + virtual void updateHostTrans(TVec3f*) const { } - virtual void updateHostVelocity(TVec3f *) const { - + virtual void updateHostVelocity(TVec3f*) const { } virtual const TVec3f& getCurrentVelocity() const; const char* _18; - TVec3f _1C; - TVec3f _28; - f32 mMoveCondition; // 0x34 + TVec3f _1C; + TVec3f _28; + f32 mMoveCondition; // 0x34 }; \ No newline at end of file diff --git a/include/Game/MapObj/FloaterFloatingForceTypeNormal.hpp b/include/Game/MapObj/FloaterFloatingForceTypeNormal.hpp index e35c8dc3b..7333ef8f4 100644 --- a/include/Game/MapObj/FloaterFloatingForceTypeNormal.hpp +++ b/include/Game/MapObj/FloaterFloatingForceTypeNormal.hpp @@ -5,12 +5,12 @@ class FloaterFloatingForceTypeNormal : public FloaterFloatingForce { public: - FloaterFloatingForceTypeNormal(LiveActor *, const char *); + FloaterFloatingForceTypeNormal(LiveActor*, const char*); virtual ~FloaterFloatingForceTypeNormal(); - virtual void init(const JMapInfoIter &); - virtual void start(); - virtual void updateHostTrans(TVec3f *) const; + virtual void init(const JMapInfoIter&); + virtual void start(); + virtual void updateHostTrans(TVec3f*) const; virtual const TVec3f& getCurrentVelocity() const; void updateVelocity(bool); @@ -19,11 +19,11 @@ public: void exeMoveFirst(); void exeMove(); - f32 mRotateAngle; // 0x38 - f32 mRotateSpeed; // 0x3C - f32 _40; - f32 _44; - TVec3f mVelocity; // 0x48 + f32 mRotateAngle; // 0x38 + f32 mRotateSpeed; // 0x3C + f32 _40; + f32 _44; + TVec3f mVelocity; // 0x48 }; namespace NrvFloaterFloatingForceTypeNormal { @@ -31,4 +31,4 @@ namespace NrvFloaterFloatingForceTypeNormal { NERVE(HostTypeMoveFirst); NERVE(HostTypeMoveOffPlayer); NERVE(HostTypeMoveOnPlayer); -}; \ No newline at end of file +}; // namespace NrvFloaterFloatingForceTypeNormal \ No newline at end of file diff --git a/include/Game/MapObj/FloaterFunction.hpp b/include/Game/MapObj/FloaterFunction.hpp index d033afe58..9a4490137 100644 --- a/include/Game/MapObj/FloaterFunction.hpp +++ b/include/Game/MapObj/FloaterFunction.hpp @@ -4,6 +4,6 @@ namespace FloaterFunction { const char* getSeGroundOn(const char*); const char* getSeMoveDown(const char*); const char* getSeMoveUp(const char*); - bool isExistImpactOnRide(const char*); - bool isExistSpeedUpLanding(const char*); -}; + bool isExistImpactOnRide(const char*); + bool isExistSpeedUpLanding(const char*); +}; // namespace FloaterFunction diff --git a/include/Game/MapObj/Fountain.hpp b/include/Game/MapObj/Fountain.hpp index 9a3f5fff1..2a7af3d80 100644 --- a/include/Game/MapObj/Fountain.hpp +++ b/include/Game/MapObj/Fountain.hpp @@ -4,23 +4,23 @@ class Fountain : public LiveActor { public: - Fountain(const char *); + Fountain(const char*); virtual ~Fountain(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void startClipped(); virtual void endClipped(); - virtual void attackSensor(HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); void exeWait(); void exeMove(); - const char* mFountainName; // 0x8C - TVec3f _90; + const char* mFountainName; // 0x8C + TVec3f _90; }; namespace NrvFountain { NERVE_DECL(HostTypeMove, Fountain, Fountain::exeMove); NERVE_DECL(HostTypeWait, Fountain, Fountain::exeWait); -}; \ No newline at end of file +}; // namespace NrvFountain \ No newline at end of file diff --git a/include/Game/MapObj/FountainBig.hpp b/include/Game/MapObj/FountainBig.hpp index a8cbc30a0..f1f827663 100644 --- a/include/Game/MapObj/FountainBig.hpp +++ b/include/Game/MapObj/FountainBig.hpp @@ -4,12 +4,12 @@ class FountainBig : public LiveActor { public: - FountainBig(const char *); + FountainBig(const char*); virtual ~FountainBig(); - virtual void init(const JMapInfoIter &); - virtual void updateHitSensor(HitSensor *); - virtual void attackSensor(HitSensor *, HitSensor *); + virtual void init(const JMapInfoIter&); + virtual void updateHitSensor(HitSensor*); + virtual void attackSensor(HitSensor*, HitSensor*); void exeWait(); void exeSign(); @@ -17,8 +17,8 @@ public: void exeSpout(); void exeSpoutEnd(); - TVec3f mClippingRadius; // 0x8C - s32 mSpoutTimer; // 0x98 + TVec3f mClippingRadius; // 0x8C + s32 mSpoutTimer; // 0x98 }; namespace NrvFountainBig { @@ -27,4 +27,4 @@ namespace NrvFountainBig { NERVE_DECL(FountainBigNrvSignStop, FountainBig, FountainBig::exeSignStop); NERVE_DECL(FountainBigNrvSpout, FountainBig, FountainBig::exeSpout); NERVE_DECL(FountainBigNrvSpoutEnd, FountainBig, FountainBig::exeSpoutEnd); -}; \ No newline at end of file +}; // namespace NrvFountainBig \ No newline at end of file diff --git a/include/Game/MapObj/GCapture.hpp b/include/Game/MapObj/GCapture.hpp index 9d4f16b41..9c6db7ca5 100644 --- a/include/Game/MapObj/GCapture.hpp +++ b/include/Game/MapObj/GCapture.hpp @@ -10,17 +10,17 @@ class GCaptureTargetable; class GCapture : public LiveActor { public: - GCapture(const char *); + GCapture(const char*); virtual ~GCapture(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void draw() const; virtual void control(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - bool requestBind(HitSensor *); + bool requestBind(HitSensor*); bool requestCancelBind(); bool requestDamageCancel(u32); void reset(); @@ -50,48 +50,47 @@ public: void upTractPower(); void downTractPower(); void fillGapBindTrans(); - void updateRibbon(const TVec3f &, s32); - void updateRibbonPointEffectMatrix(const TVec3f &); + void updateRibbon(const TVec3f&, s32); + void updateRibbonPointEffectMatrix(const TVec3f&); void addRotateAccelPointing(); bool tryAddVelocityReflectJumpCollision(); - bool requestTarget(GCaptureTargetable *); - bool isRequestedTarget(GCaptureTargetable *); + bool requestTarget(GCaptureTargetable*); + bool isRequestedTarget(GCaptureTargetable*); void decideTractTarget(); void releaseTractTarget(); void updateCameraTargetMatrix(); - TPos3f _8C; - f32 _BC; - TVec3f _C0; - TVec3f _CC; - TVec3f _D8; - TVec3f _E4; - TVec3f _F0; - TVec3f _FC; - u32 _108; - GCaptureTargetable* mTarget; // 0x10C - u32 _110; - GCaptureRibbon* mCaptureRibbon; // 0x114 - CameraTargetMtx* mTargetMtx; // 0x118 - SpringValue* mSpringValue; // 0x11C - f32 mTractPower; // 0x120 - f32 _124; - f32 _128; - u32 _122C; - f32 _130; - u32 _134; - u8 _138; - u8 _139; - + TPos3f _8C; + f32 _BC; + TVec3f _C0; + TVec3f _CC; + TVec3f _D8; + TVec3f _E4; + TVec3f _F0; + TVec3f _FC; + u32 _108; + GCaptureTargetable* mTarget; // 0x10C + u32 _110; + GCaptureRibbon* mCaptureRibbon; // 0x114 + CameraTargetMtx* mTargetMtx; // 0x118 + SpringValue* mSpringValue; // 0x11C + f32 mTractPower; // 0x120 + f32 _124; + f32 _128; + u32 _122C; + f32 _130; + u32 _134; + u8 _138; + u8 _139; }; namespace MR { void createGCapture(); void resetGCapture(); - bool requestGCaptureTarget(GCaptureTargetable *); - void unrequestGCaptureTarget(GCaptureTargetable *); - bool isRequestedGCaptureTarget(GCaptureTargetable *); + bool requestGCaptureTarget(GCaptureTargetable*); + void unrequestGCaptureTarget(GCaptureTargetable*); + bool isRequestedGCaptureTarget(GCaptureTargetable*); void noticeInTouchableRange(); bool isOnTractTrigger(); bool isPlayerGCaptured(); -}; +}; // namespace MR diff --git a/include/Game/MapObj/GCaptureRibbon.hpp b/include/Game/MapObj/GCaptureRibbon.hpp index 99bce8ccb..8994b563a 100644 --- a/include/Game/MapObj/GCaptureRibbon.hpp +++ b/include/Game/MapObj/GCaptureRibbon.hpp @@ -4,22 +4,21 @@ class GCaptureRibbon : public LiveActor { public: - GCaptureRibbon(const char *); + GCaptureRibbon(const char*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void draw() const; - + void reset(); - void lengthen(const TVec3f &, const TVec3f &); - void shorten(const TVec3f &, const TVec3f &); + void lengthen(const TVec3f&, const TVec3f&); + void shorten(const TVec3f&, const TVec3f&); void updateAxis(); - f32 calcLineWidth() const; + f32 calcLineWidth() const; - - JUTTexture* mTexture; // 0x8C - TVec3f _90; - TVec3f _9C; - TVec3f _A8[0xBE]; - u32 _990; - u32 _994; + JUTTexture* mTexture; // 0x8C + TVec3f _90; + TVec3f _9C; + TVec3f _A8[0xBE]; + u32 _990; + u32 _994; }; diff --git a/include/Game/MapObj/GeneralMapParts.hpp b/include/Game/MapObj/GeneralMapParts.hpp index db3c19234..51058bae9 100644 --- a/include/Game/MapObj/GeneralMapParts.hpp +++ b/include/Game/MapObj/GeneralMapParts.hpp @@ -11,23 +11,22 @@ class GeneralMapParts : public MapParts { public: - GeneralMapParts(const char *); + GeneralMapParts(const char*); virtual ~GeneralMapParts() { - } - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void appear(); virtual void kill(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void initMapPartsFunction(const JMapInfoIter &); - void initSensorType(const JMapInfoIter &); - void initGravity(const JMapInfoIter &); + void initMapPartsFunction(const JMapInfoIter&); + void initSensorType(const JMapInfoIter&); + void initGravity(const JMapInfoIter&); void receiveMsgSwitchBOn(); void receiveMsgSwitchBOff(); void broadcastMsgToAllFunctions(u32); @@ -36,19 +35,19 @@ public: void exeWait(); void exeMoveStart(); - ActorCameraInfo* mCameraInfo; // 0x98 - s32 mMoveConditionType; // 0x9C - s32 mSignMotionType; // 0xA0 - s32 mShadowType; // 0xA4 - MR::Vector > mFunctionArray; // 0xA8 - MapPartsAppearController* mAppearController; // 0xCC - MapPartsRailRotator* mRailRotator; // 0xD0 - MapPartsRailMover* mRailMover; // 0xD4 - MapPartsRotator* mRotator; // 0xD8 - MapPartsRailGuideDrawer* mGuideDrawer; // 0xDC - MapPartsRailPosture* mRailPosture; // 0xE0 - u8 _E4; - u8 _E5; + ActorCameraInfo* mCameraInfo; // 0x98 + s32 mMoveConditionType; // 0x9C + s32 mSignMotionType; // 0xA0 + s32 mShadowType; // 0xA4 + MR::Vector> mFunctionArray; // 0xA8 + MapPartsAppearController* mAppearController; // 0xCC + MapPartsRailRotator* mRailRotator; // 0xD0 + MapPartsRailMover* mRailMover; // 0xD4 + MapPartsRotator* mRotator; // 0xD8 + MapPartsRailGuideDrawer* mGuideDrawer; // 0xDC + MapPartsRailPosture* mRailPosture; // 0xE0 + u8 _E4; + u8 _E5; }; namespace NrvGeneralMapParts { @@ -56,4 +55,4 @@ namespace NrvGeneralMapParts { NERVE(HostTypeWaitForPlayerOn); NERVE(HostTypeMoveStart); NERVE(HostTypeMove); -}; +}; // namespace NrvGeneralMapParts diff --git a/include/Game/MapObj/GreenCaterpillarBig.hpp b/include/Game/MapObj/GreenCaterpillarBig.hpp index 503dfe931..d5a3a45c3 100644 --- a/include/Game/MapObj/GreenCaterpillarBig.hpp +++ b/include/Game/MapObj/GreenCaterpillarBig.hpp @@ -4,27 +4,27 @@ class GreenCaterpillarBigBody : public ModelObj { public: - GreenCaterpillarBigBody(LiveActor *, MtxPtr); + GreenCaterpillarBigBody(LiveActor*, MtxPtr); virtual ~GreenCaterpillarBigBody(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); virtual void calcAndSetBaseMtx(); - void setPosAndDirection(LiveActor *); - void calcBodyDir(LiveActor *, TVec3f *); + void setPosAndDirection(LiveActor*); + void calcBodyDir(LiveActor*, TVec3f*); - LiveActor* mCaterpillar; // 0x90 - TVec3f mFrontVec; // 0x94 - LodCtrl* mPlanetLOD; // 0xA0 + LiveActor* mCaterpillar; // 0x90 + TVec3f mFrontVec; // 0x94 + LodCtrl* mPlanetLOD; // 0xA0 }; class GreenCaterpillarBig : public LiveActor { public: - GreenCaterpillarBig(const char *); + GreenCaterpillarBig(const char*); virtual ~GreenCaterpillarBig(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void startClipped(); virtual void endClipped(); virtual void control(); @@ -32,18 +32,18 @@ public: void startWriggle(); void exeWriggle(); - void initBodyParts(const JMapInfoIter &); + void initBodyParts(const JMapInfoIter&); bool tryGenerateBodyParts(); void fixBodyPartsOnRail(); void leaveApple(); - GreenCaterpillarBigBody** mBodyArray; // 0x8C - s32 mBodyArrayLength; // 0x90 - s32 mCurBodyParts; // 0x94 - s32 _98; - u8 _9C; - u8 _9D; - LodCtrl* mPlanetLOD; // 0xA0 + GreenCaterpillarBigBody** mBodyArray; // 0x8C + s32 mBodyArrayLength; // 0x90 + s32 mCurBodyParts; // 0x94 + s32 _98; + u8 _9C; + u8 _9D; + LodCtrl* mPlanetLOD; // 0xA0 }; namespace NrvGreenCaterpillarBig { @@ -52,4 +52,4 @@ namespace NrvGreenCaterpillarBig { NERVE(GreenCaterpillarBigNrvRest); NERVE(GreenCaterpillarBigNrvEndAdjust); NERVE(GreenCaterpillarBigNrvEnd); -}; \ No newline at end of file +}; // namespace NrvGreenCaterpillarBig \ No newline at end of file diff --git a/include/Game/MapObj/HatchWaterPlanet.hpp b/include/Game/MapObj/HatchWaterPlanet.hpp index a28560089..80542cce0 100644 --- a/include/Game/MapObj/HatchWaterPlanet.hpp +++ b/include/Game/MapObj/HatchWaterPlanet.hpp @@ -4,21 +4,21 @@ class HatchWaterPlanet : public LiveActor { public: - HatchWaterPlanet(const char *); + HatchWaterPlanet(const char*); virtual ~HatchWaterPlanet(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); void exeOpen(); void exeWaitAfterOpen(); - LodCtrl* mPlanetLODCtrl; // 0x8C - CollisionParts* mCollisionParts; // 0x90 + LodCtrl* mPlanetLODCtrl; // 0x8C + CollisionParts* mCollisionParts; // 0x90 }; namespace NrvHatchWaterPlanet { NERVE(HatchWaterPlanetNrvWait); NERVE(HatchWaterPlanetNrvOpen); - NERVE(HatchWaterPlanetNrvWaitAfterOpen); -}; + NERVE(HatchWaterPlanetNrvWaitAfterOpen); +}; // namespace NrvHatchWaterPlanet diff --git a/include/Game/MapObj/HeavensDoorDemoObj.hpp b/include/Game/MapObj/HeavensDoorDemoObj.hpp index 197dcde25..2e8004b5c 100644 --- a/include/Game/MapObj/HeavensDoorDemoObj.hpp +++ b/include/Game/MapObj/HeavensDoorDemoObj.hpp @@ -4,17 +4,17 @@ class HeavensDoorDemoObj : public MapObjActor { public: - HeavensDoorDemoObj(const char *); + HeavensDoorDemoObj(const char*); virtual ~HeavensDoorDemoObj(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); virtual void control(); - virtual void connectToScene(const MapObjActorInitInfo &); + virtual void connectToScene(const MapObjActorInitInfo&); - void exeAppear(); - void exeVanish(); - void startInsideCageDemo(); + void exeAppear(); + void exeVanish(); + void startInsideCageDemo(); inline void exeWait() { if (MapObjActor::isObjectName("HeavensDoorInsidePlanetPartsA")) { MR::startLevelSound(this, "SE_OJ_LV_HD_INSIDE_SUN_WORK", -1, -1, -1); @@ -28,4 +28,4 @@ namespace NrvHeavensDoorDemoObj { NERVE(HeavensDoorDemoObjNrvAppear); NERVE(HeavensDoorDemoObjNrvWait); NERVE(HeavensDoorDemoObjNrvVanish); -}; +}; // namespace NrvHeavensDoorDemoObj diff --git a/include/Game/MapObj/HipDropMoveObj.hpp b/include/Game/MapObj/HipDropMoveObj.hpp index 98c4fc5c0..72d01588c 100644 --- a/include/Game/MapObj/HipDropMoveObj.hpp +++ b/include/Game/MapObj/HipDropMoveObj.hpp @@ -6,15 +6,15 @@ namespace { static const char* cSwitchJointName = "Switch"; static const char* cMoveJointName = "Move"; static const char* cMoveAnimName = "Move"; -}; +}; // namespace class HipDropMoveObj : public LiveActor { public: - HipDropMoveObj(const char *); + HipDropMoveObj(const char*); virtual ~HipDropMoveObj(); - virtual void init(const JMapInfoIter &); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual void init(const JMapInfoIter&); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); virtual void moveStart(); virtual void moving(); virtual void moveEnd(); @@ -22,22 +22,22 @@ public: void exeMove(); - const char* mObjectName; // 0x8C + const char* mObjectName; // 0x8C }; class HipDropDemoMoveObj : public HipDropMoveObj { public: - HipDropDemoMoveObj(const char *); + HipDropDemoMoveObj(const char*); virtual ~HipDropDemoMoveObj(); virtual void moveStart(); virtual void moving(); - TMtx34f mMtx; // 0x90 + TMtx34f mMtx; // 0x90 }; namespace NrvHipDropMoveObj { NERVE(HostTypeWait); NERVE(HostTypeMove); NERVE(HostTypeDone); -}; \ No newline at end of file +}; // namespace NrvHipDropMoveObj \ No newline at end of file diff --git a/include/Game/MapObj/HipDropRock.hpp b/include/Game/MapObj/HipDropRock.hpp index 1e7719077..d9d5e6b7f 100644 --- a/include/Game/MapObj/HipDropRock.hpp +++ b/include/Game/MapObj/HipDropRock.hpp @@ -5,15 +5,15 @@ class HipDropRock : public LiveActor { public: - HipDropRock(const char *); + HipDropRock(const char*); - virtual void init(const JMapInfoIter &); - virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver); + virtual void init(const JMapInfoIter&); + virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); - void initBreakModel(); - void initItem(const JMapInfoIter &); - void appearItem(); - void exeBreak(); + void initBreakModel(); + void initItem(const JMapInfoIter&); + void appearItem(); + void exeBreak(); inline void ValClip1() { if (MR::isFirstStep(this)) { MR::validateClipping(this); @@ -26,14 +26,14 @@ public: } ModelObj* mModel; //_8C - TMtx34f _90; - s32 _C0; - s32 _C4; - bool _C8; + TMtx34f _90; + s32 _C0; + s32 _C4; + bool _C8; }; namespace NrvHipDropRock { NERVE(HipDropRockNrvWait); NERVE(HipDropRockNrvBreak); NERVE(HipDropRockNrvWreck); -}; +}; // namespace NrvHipDropRock diff --git a/include/Game/MapObj/HipDropSwitch.hpp b/include/Game/MapObj/HipDropSwitch.hpp index 81701af2b..4ae39021a 100644 --- a/include/Game/MapObj/HipDropSwitch.hpp +++ b/include/Game/MapObj/HipDropSwitch.hpp @@ -9,16 +9,16 @@ class CollisionParts; class HipDropSwitch : public LiveActor { public: - HipDropSwitch(const char *); + HipDropSwitch(const char*); virtual ~HipDropSwitch(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void calcAnim(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); bool trySwitchDown(); bool tryOn(); @@ -26,12 +26,12 @@ public: void exeSwitchDown(); void exeOn(); - u32 _8C; - SpringValue* mSpringValue; // 0x90 - MapObjConnector* mConnector; // 0x94 - CollisionParts* _98; - TPos3f _9C; - u8 _CC; - u8 _CD; - u8 _CE; + u32 _8C; + SpringValue* mSpringValue; // 0x90 + MapObjConnector* mConnector; // 0x94 + CollisionParts* _98; + TPos3f _9C; + u8 _CC; + u8 _CD; + u8 _CE; }; diff --git a/include/Game/MapObj/IceStep.hpp b/include/Game/MapObj/IceStep.hpp index fa77b004b..f32f09cf1 100644 --- a/include/Game/MapObj/IceStep.hpp +++ b/include/Game/MapObj/IceStep.hpp @@ -4,37 +4,37 @@ class IceStep : public LiveActor { public: - IceStep(const char *); + IceStep(const char*); virtual ~IceStep(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); - void exeWait(); + void exeWait(); inline void exeHit() { s32 step = getNerveStep(); switch (step) { - case 5: - MR::hideModel(this); - break; - case 0xF: - kill(); - break; + case 5: + MR::hideModel(this); + break; + case 0xF: + kill(); + break; } } - void setOn(u32, const TVec3f &, const TVec3f &); + void setOn(u32, const TVec3f&, const TVec3f&); void destroy(); void doHit(); Mtx _8C; - u16 mTimer; // 0xBC + u16 mTimer; // 0xBC }; namespace NrvIceStep { NERVE_DECL(IceStepNrvHit, IceStep, IceStep::exeHit); NERVE_DECL(IceStepNrvWait, IceStep, IceStep::exeWait); -}; \ No newline at end of file +}; // namespace NrvIceStep \ No newline at end of file diff --git a/include/Game/MapObj/InvisiblePolygonObj.hpp b/include/Game/MapObj/InvisiblePolygonObj.hpp index 616549053..2f373d212 100644 --- a/include/Game/MapObj/InvisiblePolygonObj.hpp +++ b/include/Game/MapObj/InvisiblePolygonObj.hpp @@ -4,13 +4,13 @@ class InvisiblePolygonObj : public LiveActor { public: - InvisiblePolygonObj(const char *); + InvisiblePolygonObj(const char*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual MtxPtr getBaseMtx() const; - + void initBaseMtx(); - void initCollision(const JMapInfoIter &); + void initCollision(const JMapInfoIter&); TMtx34f mMatrix; }; diff --git a/include/Game/MapObj/InvisiblePolygonObjGCapture.hpp b/include/Game/MapObj/InvisiblePolygonObjGCapture.hpp index 8598c8083..d08230dce 100644 --- a/include/Game/MapObj/InvisiblePolygonObjGCapture.hpp +++ b/include/Game/MapObj/InvisiblePolygonObjGCapture.hpp @@ -3,9 +3,8 @@ #include "Game/MapObj/InvisiblePolygonObj.hpp" class InvisiblePolygonObjGCapture : public InvisiblePolygonObj { - public: - InvisiblePolygonObjGCapture(const char *); - - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); +public: + InvisiblePolygonObjGCapture(const char*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); }; \ No newline at end of file diff --git a/include/Game/MapObj/ItemAppearStone.hpp b/include/Game/MapObj/ItemAppearStone.hpp index 3861344e3..f7f9f9ca8 100644 --- a/include/Game/MapObj/ItemAppearStone.hpp +++ b/include/Game/MapObj/ItemAppearStone.hpp @@ -4,10 +4,10 @@ class ItemAppearStone : public LiveActor { public: - ItemAppearStone(const char *); + ItemAppearStone(const char*); virtual ~ItemAppearStone(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); virtual void calcAndSetBaseMtx(); diff --git a/include/Game/MapObj/ItemBlock.hpp b/include/Game/MapObj/ItemBlock.hpp index cfed5a1b1..8e02082fc 100644 --- a/include/Game/MapObj/ItemBlock.hpp +++ b/include/Game/MapObj/ItemBlock.hpp @@ -4,37 +4,37 @@ class ItemBlock : public LiveActor { public: - ItemBlock(const char *); + ItemBlock(const char*); - virtual ~ItemBlock(); - virtual void init(const JMapInfoIter &); - virtual void calcAnim(); - virtual void appear(); - virtual void kill(); - virtual void startClipped(); - virtual void endClipped(); - virtual void control(); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual ~ItemBlock(); + virtual void init(const JMapInfoIter&); + virtual void calcAnim(); + virtual void appear(); + virtual void kill(); + virtual void startClipped(); + virtual void endClipped(); + virtual void control(); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); - void checkKind(const JMapInfoIter &); - void initBlock(); - bool tryStartJumpPunch(); - void exeWait(); - void exeAppearItem(); - void exeAppearItemSplash(); - void decTimer(); + void checkKind(const JMapInfoIter&); + void initBlock(); + bool tryStartJumpPunch(); + void exeWait(); + void exeAppearItem(); + void exeAppearItemSplash(); + void decTimer(); - s32 mKind; // 0x8C - s32 mTimer; // 0x90 - s32 mItemCount; // 0x94 - u8 _98; // 0x98 - bool mCalcShadowOneTime; // 0x99 - bool mNoCalcAnim; // 0x9A + s32 mKind; // 0x8C + s32 mTimer; // 0x90 + s32 mItemCount; // 0x94 + u8 _98; // 0x98 + bool mCalcShadowOneTime; // 0x99 + bool mNoCalcAnim; // 0x9A }; namespace NrvItemBlock { - NERVE(ItemBlockNrvStandby); - NERVE(ItemBlockNrvWait); - NERVE(ItemBlockNrvAppearItem); - NERVE(ItemBlockNrvAppearItemSplash); -}; + NERVE(ItemBlockNrvStandby); + NERVE(ItemBlockNrvWait); + NERVE(ItemBlockNrvAppearItem); + NERVE(ItemBlockNrvAppearItemSplash); +}; // namespace NrvItemBlock diff --git a/include/Game/MapObj/KeySwitch.hpp b/include/Game/MapObj/KeySwitch.hpp index 5a284c9c5..1e57df15a 100644 --- a/include/Game/MapObj/KeySwitch.hpp +++ b/include/Game/MapObj/KeySwitch.hpp @@ -9,30 +9,30 @@ namespace { class KeySwitch : public LiveActor { public: - KeySwitch(const char *); + KeySwitch(const char*); virtual ~KeySwitch(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void kill(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void initKeySwitchByOwner(const JMapInfoIter &); - void appearKeySwitch(const TVec3f &); + void initKeySwitchByOwner(const JMapInfoIter&); + void appearKeySwitch(const TVec3f&); void exeDemoStart(); void exeAppear(); void exeWait(); bool tryAvoid(); ActorCameraInfo* mCameraInfo; // 0x8C - s32 mCurDemoFrame; // 0x90 + s32 mCurDemoFrame; // 0x90 }; namespace NrvKeySwitch { NERVE(KeySwitchNrvDemoStart); NERVE(KeySwitchNrvAppear); NERVE(KeySwitchNrvWait); -}; +}; // namespace NrvKeySwitch diff --git a/include/Game/MapObj/KillerGunnerSingle.hpp b/include/Game/MapObj/KillerGunnerSingle.hpp index 22da5894c..06c3e3171 100644 --- a/include/Game/MapObj/KillerGunnerSingle.hpp +++ b/include/Game/MapObj/KillerGunnerSingle.hpp @@ -8,11 +8,11 @@ namespace { class KillerGunnerSingle : public LiveActor { public: - KillerGunnerSingle(const char *); + KillerGunnerSingle(const char*); virtual ~KillerGunnerSingle(); - virtual void init(const JMapInfoIter &); - virtual void attackSensor(HitSensor *, HitSensor *); + virtual void init(const JMapInfoIter&); + virtual void attackSensor(HitSensor*, HitSensor*); void exeWait(); void exeCharge(); @@ -25,4 +25,4 @@ namespace NrvKillerGunnerSingle { NERVE_DECL(HostTypeCharge, KillerGunnerSingle, KillerGunnerSingle::exeCharge); NERVE_DECL(HostTypeShoot, KillerGunnerSingle, KillerGunnerSingle::exeWait); NERVE_DECL(HostTypeAttack, KillerGunnerSingle, KillerGunnerSingle::exeAttack); -}; \ No newline at end of file +}; // namespace NrvKillerGunnerSingle \ No newline at end of file diff --git a/include/Game/MapObj/LargeChain.hpp b/include/Game/MapObj/LargeChain.hpp index b3bd158b3..1de03b3db 100644 --- a/include/Game/MapObj/LargeChain.hpp +++ b/include/Game/MapObj/LargeChain.hpp @@ -5,10 +5,10 @@ class LargeChain : public LiveActor { public: - LargeChain(const char *); + LargeChain(const char*); virtual ~LargeChain(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void makeActorAppeared(); virtual void makeActorDead(); @@ -16,13 +16,13 @@ public: void createChainParts(); void invalidateClippingAllChainParts(); - LargeChainParts* _8C; - LargeChainParts* _90; - /* 0x94 */ LargeChainParts* mChainArray; ///< The array of LargeChainParts - /* 0x98 */ u32 mChainCount; ///< The number of chain parts. + LargeChainParts* _8C; + LargeChainParts* _90; + /* 0x94 */ LargeChainParts* mChainArray; ///< The array of LargeChainParts + /* 0x98 */ u32 mChainCount; ///< The number of chain parts. }; namespace NrvLargeChain { NERVE_DECL_NULL(LargeChainNrvWait); NERVE_DECL(LargeChainNrvBreak, LargeChain, LargeChain::exeBreak); -}; +}; // namespace NrvLargeChain diff --git a/include/Game/MapObj/LargeChainParts.hpp b/include/Game/MapObj/LargeChainParts.hpp index 4b5d30322..f26d424a5 100644 --- a/include/Game/MapObj/LargeChainParts.hpp +++ b/include/Game/MapObj/LargeChainParts.hpp @@ -4,11 +4,11 @@ class LargeChainParts : public LiveActor { public: - LargeChainParts(const char *pName = "でかい鎖パーツ"); + LargeChainParts(const char* pName = "でかい鎖パーツ"); inline virtual ~LargeChainParts(); virtual void kill(); void breakChainParts(); - void initChainParts(TVec3f *, TVec3f *, TVec3f *, bool); + void initChainParts(TVec3f*, TVec3f*, TVec3f*, bool); }; diff --git a/include/Game/MapObj/LavaBallRisingPlanetLava.hpp b/include/Game/MapObj/LavaBallRisingPlanetLava.hpp index 76c5f8899..7e9a523fb 100644 --- a/include/Game/MapObj/LavaBallRisingPlanetLava.hpp +++ b/include/Game/MapObj/LavaBallRisingPlanetLava.hpp @@ -4,10 +4,10 @@ class LavaBallRisingPlanetLava : public MapObjActor { public: - LavaBallRisingPlanetLava(const char *); + LavaBallRisingPlanetLava(const char*); virtual ~LavaBallRisingPlanetLava(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); void exeWait(); void exeScaleUp(); @@ -19,4 +19,4 @@ namespace NrvLavaBallRisingPlanetLava { NERVE_DECL(LavaBallRisingPlanetLavaNrvWaitBig, LavaBallRisingPlanetLava, LavaBallRisingPlanetLava::exeWait); NERVE_DECL(LavaBallRisingPlanetLavaNrvScaleUp, LavaBallRisingPlanetLava, LavaBallRisingPlanetLava::exeScaleUp); NERVE_DECL(LavaBallRisingPlanetLavaNrvScaleDown, LavaBallRisingPlanetLava, LavaBallRisingPlanetLava::exeScaleDown); -}; \ No newline at end of file +}; // namespace NrvLavaBallRisingPlanetLava \ No newline at end of file diff --git a/include/Game/MapObj/LavaGalaxyParts.hpp b/include/Game/MapObj/LavaGalaxyParts.hpp index 2ce7fad74..a70b0ed04 100644 --- a/include/Game/MapObj/LavaGalaxyParts.hpp +++ b/include/Game/MapObj/LavaGalaxyParts.hpp @@ -6,15 +6,15 @@ class LavaGalaxyParts : public LiveActor { public: - LavaGalaxyParts(const char *); + LavaGalaxyParts(const char*); virtual ~LavaGalaxyParts(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void makeActorAppeared(); virtual void makeActorDead(); virtual void control(); - LodCtrl* mLodCtrl; // 0x8C - ProjmapEffectMtxSetter* mMtxSetter; // 0x90 + LodCtrl* mLodCtrl; // 0x8C + ProjmapEffectMtxSetter* mMtxSetter; // 0x90 }; \ No newline at end of file diff --git a/include/Game/MapObj/LavaHomeVolcanoFlow.hpp b/include/Game/MapObj/LavaHomeVolcanoFlow.hpp index 383cb5c4f..cabe124ab 100644 --- a/include/Game/MapObj/LavaHomeVolcanoFlow.hpp +++ b/include/Game/MapObj/LavaHomeVolcanoFlow.hpp @@ -5,9 +5,9 @@ class LavaHomeVolcanoFlow : public LiveActor { public: LavaHomeVolcanoFlow(const char*); - + virtual ~LavaHomeVolcanoFlow(); - virtual void init(const JMapInfoIter &rIter); + virtual void init(const JMapInfoIter& rIter); virtual void startClipped(); virtual void endClipped(); diff --git a/include/Game/MapObj/LavaJamboSunPlanet.hpp b/include/Game/MapObj/LavaJamboSunPlanet.hpp index 067f4e608..c97466a1a 100644 --- a/include/Game/MapObj/LavaJamboSunPlanet.hpp +++ b/include/Game/MapObj/LavaJamboSunPlanet.hpp @@ -10,7 +10,7 @@ public: LavaJamboSunPlanet(const char*); virtual ~LavaJamboSunPlanet(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void control(); @@ -18,7 +18,7 @@ public: void exeMove(); PartsModel* mBloomModel; - LodCtrl* mLodCtrl; - f32 _94; - TVec3f _98; + LodCtrl* mLodCtrl; + f32 _94; + TVec3f _98; }; diff --git a/include/Game/MapObj/LavaSteam.hpp b/include/Game/MapObj/LavaSteam.hpp index 31fd7f0f4..6e999f9c6 100644 --- a/include/Game/MapObj/LavaSteam.hpp +++ b/include/Game/MapObj/LavaSteam.hpp @@ -10,9 +10,9 @@ public: virtual void attackSensor(HitSensor* pSender, HitSensor* pReceiver); virtual void startClipped(); virtual void endClipped(); - void startSteam(); - void exeWait(); - void exeSteam(); + void startSteam(); + void exeWait(); + void exeSteam(); TVec3f _8C; TVec3f _98; @@ -23,4 +23,4 @@ namespace NrvLavaSteam { NERVE_DECL(HostTypeSteam, LavaSteam, LavaSteam::exeSteam); NERVE_DECL(HostTypeWait, LavaSteam, LavaSteam::exeWait); NERVE_DECL_NULL(HostTypeWaitForSwitchOn); -}; \ No newline at end of file +}; // namespace NrvLavaSteam \ No newline at end of file diff --git a/include/Game/MapObj/LotusLeaf.hpp b/include/Game/MapObj/LotusLeaf.hpp index e9d03c33b..40936572d 100644 --- a/include/Game/MapObj/LotusLeaf.hpp +++ b/include/Game/MapObj/LotusLeaf.hpp @@ -5,10 +5,10 @@ class LotusLeaf : public LiveActor { public: - LotusLeaf(const char *); + LotusLeaf(const char*); virtual ~LotusLeaf(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); void convergeToInitPos(); void exeWait(); @@ -16,6 +16,6 @@ public: void exeShake(); TVec3f _8C; - f32 _98; - f32 _9C; + f32 _98; + f32 _9C; }; diff --git a/include/Game/MapObj/MagicBell.hpp b/include/Game/MapObj/MagicBell.hpp index 3c1e17577..4ba82f3e5 100644 --- a/include/Game/MapObj/MagicBell.hpp +++ b/include/Game/MapObj/MagicBell.hpp @@ -5,27 +5,27 @@ class MagicBell : public LiveActor { public: - MagicBell(const char *); + MagicBell(const char*); virtual ~MagicBell(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual MtxPtr getBaseMtx() const; - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); void exeWait(); void exeRing(); bool tryRing(); - void startRing(const TVec3f &, const TVec3f &); + void startRing(const TVec3f&, const TVec3f&); Swinger* mBellSwinger; - MtxPtr mSurface2Mtx; // 0x90 + MtxPtr mSurface2Mtx; // 0x90 Swinger* mBellRodSwinger; - MtxPtr mSurface1Mtx; // 0x98 - TVec3f mHitMarkPosition; + MtxPtr mSurface1Mtx; // 0x98 + TVec3f mHitMarkPosition; }; namespace NrvMagicBell { NERVE_DECL(MagicBellNrvWait, MagicBell, MagicBell::exeWait); NERVE_DECL(MagicBellNrvRing, MagicBell, MagicBell::exeRing); -}; \ No newline at end of file +}; // namespace NrvMagicBell \ No newline at end of file diff --git a/include/Game/MapObj/ManholeCover.hpp b/include/Game/MapObj/ManholeCover.hpp index a88ec4a66..a42bfe181 100644 --- a/include/Game/MapObj/ManholeCover.hpp +++ b/include/Game/MapObj/ManholeCover.hpp @@ -4,15 +4,14 @@ class ManholeCover : public MapObjActor { public: - - inline ManholeCover(const char *pName) : MapObjActor(pName) { - + inline ManholeCover(const char* pName) + : MapObjActor(pName) { } virtual ~ManholeCover(); - virtual void init(const JMapInfoIter &); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void init(const JMapInfoIter&); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeOpen(); void exeRattle(); @@ -22,4 +21,4 @@ namespace NrvManholeCover { NERVE_DECL_NULL(HostTypeWait); NERVE_DECL(HostTypeOpen, ManholeCover, ManholeCover::exeOpen); NERVE_DECL(HostTypeRattle, ManholeCover, ManholeCover::exeRattle); -}; \ No newline at end of file +}; // namespace NrvManholeCover \ No newline at end of file diff --git a/include/Game/MapObj/MapObjActor.hpp b/include/Game/MapObj/MapObjActor.hpp index 362745440..72489ac9b 100644 --- a/include/Game/MapObj/MapObjActor.hpp +++ b/include/Game/MapObj/MapObjActor.hpp @@ -17,16 +17,16 @@ namespace NrvMapObjActor { NERVE(HostTypeWait); NERVE(HostTypeMove); NERVE(HostTypeDone); -}; +}; // namespace NrvMapObjActor class MapObjActor : public LiveActor { public: - MapObjActor(const char *); - MapObjActor(const char *, const char *); + MapObjActor(const char*); + MapObjActor(const char*, const char*); inline virtual ~MapObjActor(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void appear(); virtual void kill(); @@ -34,16 +34,16 @@ public: virtual void endClipped(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void connectToScene(const MapObjActorInitInfo &); - virtual void initCaseUseSwitchA(const MapObjActorInitInfo &); - virtual void initCaseNoUseSwitchA(const MapObjActorInitInfo &); - virtual void initCaseUseSwitchB(const MapObjActorInitInfo &); - virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo &); - virtual void makeSubModels(const JMapInfoIter &, const MapObjActorInitInfo &); + virtual void connectToScene(const MapObjActorInitInfo&); + virtual void initCaseUseSwitchA(const MapObjActorInitInfo&); + virtual void initCaseNoUseSwitchA(const MapObjActorInitInfo&); + virtual void initCaseUseSwitchB(const MapObjActorInitInfo&); + virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo&); + virtual void makeSubModels(const JMapInfoIter&, const MapObjActorInitInfo&); - void initialize(const JMapInfoIter &, const MapObjActorInitInfo &); - bool isObjectName(const char *) const; - bool tryCreateBreakModel(const MapObjActorInitInfo &); + void initialize(const JMapInfoIter&, const MapObjActorInitInfo&); + bool isObjectName(const char*) const; + bool tryCreateBreakModel(const MapObjActorInitInfo&); bool tryEmitWaitEffect(); bool tryDeleteWaitEffect(); void startMapPartsFunctions(); @@ -54,56 +54,56 @@ public: void exeWait(); void exeMove(); - const char* mObjectName; // 0x8C - LodCtrl* mPlanetLodCtrl; // 0x90 - ModelObj* mBloomModel; // 0x94 - ModelObj* mModelObj; // 0x98 - ProjmapEffectMtxSetter* mMatrixSetter; // 0x9C - MapPartsRailMover* mRailMover; // 0xA0 - MapPartsRotator* mRotator; // 0xA4 - MapPartsRailRotator* mRailRotator; // 0xA8 - MapPartsRailPosture* mRailPosture; // 0xAC - MapPartsRailGuideDrawer* mRailGuideDrawer; // 0xB0 - u8 _B4; - u8 _B5; - u8 _B6; - NrvMapObjActor::HostTypeWait* mWaitNrv; // 0xB8 - NrvMapObjActor::HostTypeMove* mMoveNrv; // 0xBC - NrvMapObjActor::HostTypeDone* mDoneNrv; // 0xC0 + const char* mObjectName; // 0x8C + LodCtrl* mPlanetLodCtrl; // 0x90 + ModelObj* mBloomModel; // 0x94 + ModelObj* mModelObj; // 0x98 + ProjmapEffectMtxSetter* mMatrixSetter; // 0x9C + MapPartsRailMover* mRailMover; // 0xA0 + MapPartsRotator* mRotator; // 0xA4 + MapPartsRailRotator* mRailRotator; // 0xA8 + MapPartsRailPosture* mRailPosture; // 0xAC + MapPartsRailGuideDrawer* mRailGuideDrawer; // 0xB0 + u8 _B4; + u8 _B5; + u8 _B6; + NrvMapObjActor::HostTypeWait* mWaitNrv; // 0xB8 + NrvMapObjActor::HostTypeMove* mMoveNrv; // 0xBC + NrvMapObjActor::HostTypeDone* mDoneNrv; // 0xC0 }; class MapObjActorUtil { public: - static void startAllMapPartsFunctions(const MapObjActor *); - static void endAllMapPartsFunctions(const MapObjActor *); - static void pauseAllMapPartsFunctions(const MapObjActor *); - static void resumeAllMapPartsFunctions(const MapObjActor *); - static bool isRotatorMoving(const MapObjActor *); - static bool isRailMoverWorking(const MapObjActor *); - static bool isRailMoverReachedEnd(const MapObjActor *); - static f32 getSeesaw1AxisAngularSpeed(const MapObjActor *); - static void forceRotateSeesaw1Axis(const MapObjActor *, f32); + static void startAllMapPartsFunctions(const MapObjActor*); + static void endAllMapPartsFunctions(const MapObjActor*); + static void pauseAllMapPartsFunctions(const MapObjActor*); + static void resumeAllMapPartsFunctions(const MapObjActor*); + static bool isRotatorMoving(const MapObjActor*); + static bool isRailMoverWorking(const MapObjActor*); + static bool isRailMoverReachedEnd(const MapObjActor*); + static f32 getSeesaw1AxisAngularSpeed(const MapObjActor*); + static void forceRotateSeesaw1Axis(const MapObjActor*, f32); - static void startRotator(const MapObjActor *); - static void startRailMover(const MapObjActor *); - static void endRotator(const MapObjActor *); - static void pauseRotator(const MapObjActor *); - static void resetRailMoverToInitPos(const MapObjActor *); - static void startBreak(MapObjActor *); - static bool tryStartBreak(MapObjActor *); - static bool isBreakStopped(const MapObjActor *); - static void killBloomModel(MapObjActor *); - static void appearBloomModel(MapObjActor *); + static void startRotator(const MapObjActor*); + static void startRailMover(const MapObjActor*); + static void endRotator(const MapObjActor*); + static void pauseRotator(const MapObjActor*); + static void resetRailMoverToInitPos(const MapObjActor*); + static void startBreak(MapObjActor*); + static bool tryStartBreak(MapObjActor*); + static bool isBreakStopped(const MapObjActor*); + static void killBloomModel(MapObjActor*); + static void appearBloomModel(MapObjActor*); - static void setupInitInfoTypical(MapObjActorInitInfo *, const char *); + static void setupInitInfoTypical(MapObjActorInitInfo*, const char*); - static void setupInitInfoSimpleMapObj(MapObjActorInitInfo *); + static void setupInitInfoSimpleMapObj(MapObjActorInitInfo*); - static void setupInitInfoPlanet(MapObjActorInitInfo *); + static void setupInitInfoPlanet(MapObjActorInitInfo*); - static void setupInitInfoSeesaw(MapObjActorInitInfo *, const JMapInfoIter &, const char *, f32); + static void setupInitInfoSeesaw(MapObjActorInitInfo*, const JMapInfoIter&, const char*, f32); - static void setupInitInfoColorChangeArg0(MapObjActorInitInfo *, const JMapInfoIter &); - static void setupInitInfoTextureChangeArg1(MapObjActorInitInfo *, const JMapInfoIter &); - static void setupInitInfoShadowLengthArg2(MapObjActorInitInfo *, const JMapInfoIter &); + static void setupInitInfoColorChangeArg0(MapObjActorInitInfo*, const JMapInfoIter&); + static void setupInitInfoTextureChangeArg1(MapObjActorInitInfo*, const JMapInfoIter&); + static void setupInitInfoShadowLengthArg2(MapObjActorInitInfo*, const JMapInfoIter&); }; diff --git a/include/Game/MapObj/MapObjActorInitInfo.hpp b/include/Game/MapObj/MapObjActorInitInfo.hpp index 79be31ca2..0d6afc273 100644 --- a/include/Game/MapObj/MapObjActorInitInfo.hpp +++ b/include/Game/MapObj/MapObjActorInitInfo.hpp @@ -8,20 +8,20 @@ class MapObjActorInitInfo { public: MapObjActorInitInfo(); - void setupHioNode(const char *); + void setupHioNode(const char*); void setupDefaultPos(); - void setupModelName(const char *); + void setupModelName(const char*); void setupConnectToScene(); void setupBinder(f32, f32); - void setupEffect(const char *); + void setupEffect(const char*); void setupSound(s32); - void setupSoundPos(TVec3f *); + void setupSoundPos(TVec3f*); void setupNoAppearRiddleSE(); void setupHitSensor(); void setupHitSensorCallBack(); - void setupHitSensorParam(u16, f32, const TVec3f &); - void setupNerve(const Nerve *); - void setupShadow(const char *); + void setupHitSensorParam(u16, f32, const TVec3f&); + void setupNerve(const Nerve*); + void setupShadow(const char*); void setupGroupClipping(s32); void setupClippingRadius(f32); void setupFarClipping(f32); @@ -29,68 +29,68 @@ public: void setupRailMover(); void setupRotator(); void setupRailRotator(); - void setupSEesaw1AxisRotator(const char *, f32); + void setupSEesaw1AxisRotator(const char*, f32); void setupRailPosture(); void setupBaseMtxFollowTarget(); void setupAffectedScale(); void setupSeAppear(); void setupMirrorReflection(bool); - void setupPrepareChangeDummyTexture(const char *); + void setupPrepareChangeDummyTexture(const char*); void setupNoUseLodCtrl(); - bool mSetDefaultPosition; // 0x0 - bool mConnectToScene; // 0x1 - bool mInitBinder; // 0x2 - bool mHasEffect; // 0x3 - bool mHasSensors; // 0x4 - bool mHasShadows; // 0x5 - bool mCalcGravity; // 0x6 - bool mProjectMapMtx; // 0x7 - bool mInitFur; // 0x8 - bool mHasRailMover; // 0x9 - bool mHasRotator; // 0xA - bool mHasRailRotator; // 0xB - u8 _C; - u8 _D; - bool mUsesRailPosture; // 0xE - bool mDoesBaseMtxFollowTarget; // 0xF - bool mIsAffectedByScale; // 0x10 - bool mUseMirrorReflection; // 0x11 - u8 _12; - u8 _13; - const char* mModelName; // 0x14 - const char* mHioNode; // 0x18 - u16 _1C; - u8 _1E; - u8 _1F; - f32 mSensorSize; // 0x20 - TVec3f mSensorOffset; // 0x24 - bool mHitSensorCB; // 0x30 - u8 _31; - u8 _32; - u8 _33; - f32 mBinderRadius; // 0x34 - f32 mBinderCenterY; // 0x38 - const char* mEffectName; // 0x3C - s32 mSound; // 0x40 - TVec3f* mSoundPos; // 0x44 - u8 _48; - const Nerve* mNerve; // 0x4C - s32 mGroupClipping; // 0x50 - f32 mClippingRadius; // 0x54 - f32 mFarClipping; // 0x58 - s32 _5C; - s32 mColorChangeArg; // 0x60 - s32 mTextureChangeArg; // 0x64 - bool mNoAppearRiddleSE; // 0x68 - u32 _6C; - f32 _70; - bool _74; - const char* mShadowName; // 0x78 - f32 mShadowLength; // 0x7C - u32 _80; - const char* mDummyChangeTexture; // 0x84 - u32 _88; - bool _8C; - bool mNoUseLOD; // 0x8D + bool mSetDefaultPosition; // 0x0 + bool mConnectToScene; // 0x1 + bool mInitBinder; // 0x2 + bool mHasEffect; // 0x3 + bool mHasSensors; // 0x4 + bool mHasShadows; // 0x5 + bool mCalcGravity; // 0x6 + bool mProjectMapMtx; // 0x7 + bool mInitFur; // 0x8 + bool mHasRailMover; // 0x9 + bool mHasRotator; // 0xA + bool mHasRailRotator; // 0xB + u8 _C; + u8 _D; + bool mUsesRailPosture; // 0xE + bool mDoesBaseMtxFollowTarget; // 0xF + bool mIsAffectedByScale; // 0x10 + bool mUseMirrorReflection; // 0x11 + u8 _12; + u8 _13; + const char* mModelName; // 0x14 + const char* mHioNode; // 0x18 + u16 _1C; + u8 _1E; + u8 _1F; + f32 mSensorSize; // 0x20 + TVec3f mSensorOffset; // 0x24 + bool mHitSensorCB; // 0x30 + u8 _31; + u8 _32; + u8 _33; + f32 mBinderRadius; // 0x34 + f32 mBinderCenterY; // 0x38 + const char* mEffectName; // 0x3C + s32 mSound; // 0x40 + TVec3f* mSoundPos; // 0x44 + u8 _48; + const Nerve* mNerve; // 0x4C + s32 mGroupClipping; // 0x50 + f32 mClippingRadius; // 0x54 + f32 mFarClipping; // 0x58 + s32 _5C; + s32 mColorChangeArg; // 0x60 + s32 mTextureChangeArg; // 0x64 + bool mNoAppearRiddleSE; // 0x68 + u32 _6C; + f32 _70; + bool _74; + const char* mShadowName; // 0x78 + f32 mShadowLength; // 0x7C + u32 _80; + const char* mDummyChangeTexture; // 0x84 + u32 _88; + bool _8C; + bool mNoUseLOD; // 0x8D }; diff --git a/include/Game/MapObj/MapObjConnector.hpp b/include/Game/MapObj/MapObjConnector.hpp index c1a452eb3..e94ccab22 100644 --- a/include/Game/MapObj/MapObjConnector.hpp +++ b/include/Game/MapObj/MapObjConnector.hpp @@ -4,15 +4,15 @@ class MapObjConnector { public: - MapObjConnector(LiveActor *); + MapObjConnector(LiveActor*); void attachToUnder(); void attachToBack(); - void attach(const TVec3f &); + void attach(const TVec3f&); void connect(); - void connect(LiveActor *); + void connect(LiveActor*); - LiveActor* mHost; // 0x0 - u32 _4; - TMtx34f _8; + LiveActor* mHost; // 0x0 + u32 _4; + TMtx34f _8; }; \ No newline at end of file diff --git a/include/Game/MapObj/MapParts.hpp b/include/Game/MapObj/MapParts.hpp index edcc3df33..6c8ddcbba 100644 --- a/include/Game/MapObj/MapParts.hpp +++ b/include/Game/MapObj/MapParts.hpp @@ -4,17 +4,17 @@ class MapParts : public LiveActor { public: - MapParts(const char *); + MapParts(const char*); virtual inline ~MapParts(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); - virtual s32 getSensorNumMax() const; + virtual s32 getSensorNumMax() const; virtual void connectToScene(); static s32 getMoveStartSignalTime(); - void initModelAndCollision(const JMapInfoIter &); + void initModelAndCollision(const JMapInfoIter&); TVec3f _8C; }; diff --git a/include/Game/MapObj/MapPartsAppearController.hpp b/include/Game/MapObj/MapPartsAppearController.hpp index 0e0d00022..af35ed776 100644 --- a/include/Game/MapObj/MapPartsAppearController.hpp +++ b/include/Game/MapObj/MapPartsAppearController.hpp @@ -6,28 +6,28 @@ class PostureHolder; class MapPartsAppearController : public MapPartsFunction { public: - MapPartsAppearController(LiveActor *); + MapPartsAppearController(LiveActor*); virtual ~MapPartsAppearController(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void start(); virtual void end(); virtual bool receiveMsg(u32); void storeCurrentPosture(); - void initSwitchMessenger(const JMapInfoIter &); + void initSwitchMessenger(const JMapInfoIter&); void startAppear(); void startKill(); void appearHost(); void killHost(); void exeDisappear(); - s32 mSignMotionType; // 0x18 + s32 mSignMotionType; // 0x18 PostureHolder* mPostureHolder; // 0x1C - u8 _20; + u8 _20; }; namespace NrvMapPartsAppearController { NERVE(HostTypeWait); NERVE(HostTypeDisappear); -}; \ No newline at end of file +}; // namespace NrvMapPartsAppearController \ No newline at end of file diff --git a/include/Game/MapObj/MapPartsBreaker.hpp b/include/Game/MapObj/MapPartsBreaker.hpp index cb44e02df..bcfd59f6e 100644 --- a/include/Game/MapObj/MapPartsBreaker.hpp +++ b/include/Game/MapObj/MapPartsBreaker.hpp @@ -6,19 +6,18 @@ class MapPartsBreaker : MapPartsFunction { public: - void exeReactToTornado(); void exeBreak(); - u32 _18; + u32 _18; TVec3f _1C; TVec3f _28; - f32 _34; - u8 _38; + f32 _34; + u8 _38; }; namespace NrvMapPartsBreaker { NERVE(HostTypeWait); NERVE(HostTypeReactToTornado); NERVE(HostTypeBreak); -}; \ No newline at end of file +}; // namespace NrvMapPartsBreaker \ No newline at end of file diff --git a/include/Game/MapObj/MapPartsFloatingForce.hpp b/include/Game/MapObj/MapPartsFloatingForce.hpp index 01a487344..6badcb884 100644 --- a/include/Game/MapObj/MapPartsFloatingForce.hpp +++ b/include/Game/MapObj/MapPartsFloatingForce.hpp @@ -12,23 +12,23 @@ public: void addSpringVelocity(f32); void setSpringBaseValue(f32); - f32 mCondition; // 0x0 - f32 mSpeed; // 0x4 - f32 mAngle; // 0x8 - SpringValue* mSpringValue; // 0xC + f32 mCondition; // 0x0 + f32 mSpeed; // 0x4 + f32 mAngle; // 0x8 + SpringValue* mSpringValue; // 0xC }; class MapPartsFloatingForce : public MapPartsFunction { public: - MapPartsFloatingForce(LiveActor *); + MapPartsFloatingForce(LiveActor*); virtual ~MapPartsFloatingForce(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void start(); - void setObjectName(const char *); - void initForNormalMotion(const JMapInfoIter &); - void initForSpringMotion(const JMapInfoIter &); + void setObjectName(const char*); + void initForNormalMotion(const JMapInfoIter&); + void initForSpringMotion(const JMapInfoIter&); void updateVelocity(); void updateVelocitySpring(); bool tryOn(); @@ -38,20 +38,20 @@ public: void exeMoveSpring(); void exeMoveReturn(); - SpringStep* mSpringStep; // 0x18 - const char* mObjectName; // 0x1C - f32 _20; - f32 mRotateAngle; // 0x24 - f32 mRotateSpeed; // 0x28 - s32 mRotateAccelType; // 0x2C - TVec3f _30; - f32 _3C; - f32 _40; - f32 _44; - f32 _48; - f32 _4C; - TVec3f _50; - f32 _5C; + SpringStep* mSpringStep; // 0x18 + const char* mObjectName; // 0x1C + f32 _20; + f32 mRotateAngle; // 0x24 + f32 mRotateSpeed; // 0x28 + s32 mRotateAccelType; // 0x2C + TVec3f _30; + f32 _3C; + f32 _40; + f32 _44; + f32 _48; + f32 _4C; + TVec3f _50; + f32 _5C; }; namespace NrvMapPartsFloatingForce { @@ -59,4 +59,4 @@ namespace NrvMapPartsFloatingForce { NERVE(HostTypeMove); NERVE(HostTypeMoveSpring); NERVE(HostTypeMoveReturn); -}; \ No newline at end of file +}; // namespace NrvMapPartsFloatingForce \ No newline at end of file diff --git a/include/Game/MapObj/MapPartsFunction.hpp b/include/Game/MapObj/MapPartsFunction.hpp index 89716100f..499690ec6 100644 --- a/include/Game/MapObj/MapPartsFunction.hpp +++ b/include/Game/MapObj/MapPartsFunction.hpp @@ -8,14 +8,12 @@ class Nerve; class MapPartsFunction : public NameObj { public: - MapPartsFunction(LiveActor *, const char *); + MapPartsFunction(LiveActor*, const char*); inline virtual ~MapPartsFunction() { - } - virtual void init(const JMapInfoIter &) { - + virtual void init(const JMapInfoIter&) { } virtual void movement(); @@ -25,11 +23,9 @@ public: } virtual void start() { - } virtual void end() { - } virtual bool receiveMsg(u32) { @@ -37,18 +33,17 @@ public: } virtual void control() { - } void sendMsgToHost(u32); - void initNerve(const Nerve *); - void setNerve(const Nerve *); - s32 getStep() const; + void initNerve(const Nerve*); + void setNerve(const Nerve*); + s32 getStep() const; bool isStep(s32) const; - bool isNerve(const Nerve *) const; + bool isNerve(const Nerve*) const; bool isFirstStep() const; - Spine* mSpine; // 0xC - LiveActor* mHost; // 0x10 - u8 _14; + Spine* mSpine; // 0xC + LiveActor* mHost; // 0x10 + u8 _14; }; \ No newline at end of file diff --git a/include/Game/MapObj/MapPartsRailGuideDrawer.hpp b/include/Game/MapObj/MapPartsRailGuideDrawer.hpp index d5a303692..0519b6983 100644 --- a/include/Game/MapObj/MapPartsRailGuideDrawer.hpp +++ b/include/Game/MapObj/MapPartsRailGuideDrawer.hpp @@ -6,21 +6,21 @@ class MapPartsRailGuideDrawer : public MapPartsFunction { public: - MapPartsRailGuideDrawer(LiveActor *, const char *); + MapPartsRailGuideDrawer(LiveActor*, const char*); virtual ~MapPartsRailGuideDrawer(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual bool isWorking() const; virtual void start(); virtual void end(); - void initGuidePoints(const JMapInfoIter &); + void initGuidePoints(const JMapInfoIter&); void show(); void hide(); - MR::Vector > mGuidePoints; // 0x18 - u32 _41C; - s32 _420; - const char* _424; + MR::Vector> mGuidePoints; // 0x18 + u32 _41C; + s32 _420; + const char* _424; }; \ No newline at end of file diff --git a/include/Game/MapObj/MapPartsRailGuideHolder.hpp b/include/Game/MapObj/MapPartsRailGuideHolder.hpp index cd2a9d001..a7870ddd7 100644 --- a/include/Game/MapObj/MapPartsRailGuideHolder.hpp +++ b/include/Game/MapObj/MapPartsRailGuideHolder.hpp @@ -10,11 +10,11 @@ public: MapPartsRailGuideHolder(); virtual ~MapPartsRailGuideHolder(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - MapPartsRailGuideDrawer* createRailGuide(LiveActor *, const char *, const JMapInfoIter &); + MapPartsRailGuideDrawer* createRailGuide(LiveActor*, const char*, const JMapInfoIter&); MapPartsRailGuideDrawer* find(s32); - MapPartsRailGuideDrawer* mDrawers[0x40]; // 0xC - s32 mNumRailGuides; // 0x10C + MapPartsRailGuideDrawer* mDrawers[0x40]; // 0xC + s32 mNumRailGuides; // 0x10C }; \ No newline at end of file diff --git a/include/Game/MapObj/MapPartsRailGuidePoint.hpp b/include/Game/MapObj/MapPartsRailGuidePoint.hpp index 8b20b1fe0..d114419a7 100644 --- a/include/Game/MapObj/MapPartsRailGuidePoint.hpp +++ b/include/Game/MapObj/MapPartsRailGuidePoint.hpp @@ -4,12 +4,12 @@ class MapPartsRailGuidePoint : public LiveActor { public: - MapPartsRailGuidePoint(const LiveActor *, const char *, f32, bool); - MapPartsRailGuidePoint(const LiveActor *, const char *, int, bool); + MapPartsRailGuidePoint(const LiveActor*, const char*, f32, bool); + MapPartsRailGuidePoint(const LiveActor*, const char*, int, bool); virtual ~MapPartsRailGuidePoint(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - f32 _8C; + f32 _8C; bool _90; }; \ No newline at end of file diff --git a/include/Game/MapObj/MapPartsRailMover.hpp b/include/Game/MapObj/MapPartsRailMover.hpp index bc2d30651..7891307b0 100644 --- a/include/Game/MapObj/MapPartsRailMover.hpp +++ b/include/Game/MapObj/MapPartsRailMover.hpp @@ -7,10 +7,10 @@ class MapPartsRailPointPassChecker; class MapPartsRailMover : public MapPartsFunction { public: - MapPartsRailMover(LiveActor *); + MapPartsRailMover(LiveActor*); virtual ~MapPartsRailMover(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); virtual bool isWorking() const; virtual void start(); @@ -29,11 +29,11 @@ public: bool isReachedEnd() const; bool isDone() const; void setStateStopAtEndBeforeRotate(); - void calcTimeToNextRailPoint(f32 *) const; + void calcTimeToNextRailPoint(f32*) const; void endRotateAtPoint(); - void calcMoveSpeed(f32 *) const; - void calcMoveSpeedDirect(f32 *) const; - void calcMoveSpeedTime(f32 *) const; + void calcMoveSpeed(f32*) const; + void calcMoveSpeedDirect(f32*) const; + void calcMoveSpeedTime(f32*) const; void updateAccel(); bool tryPassPoint(); bool tryRestartAtEnd(); @@ -43,15 +43,15 @@ public: void exeStopAtPoint(); void exeStopAtEnd(); - MapPartsRailPointPassChecker* mRailPointPassChecker; // 0x18 - s32 mMoveConditionType; // 0x1C - s32 mMoveStopType; // 0x20 - s32 mSignMotionType; // 0x24 - TVec3f _28; - f32 _34; - s32 mStopTime; // 0x38 - f32 _3C; - u32 _40; - f32 _44; - f32 _48; + MapPartsRailPointPassChecker* mRailPointPassChecker; // 0x18 + s32 mMoveConditionType; // 0x1C + s32 mMoveStopType; // 0x20 + s32 mSignMotionType; // 0x24 + TVec3f _28; + f32 _34; + s32 mStopTime; // 0x38 + f32 _3C; + u32 _40; + f32 _44; + f32 _48; }; \ No newline at end of file diff --git a/include/Game/MapObj/MapPartsRailPointPassChecker.hpp b/include/Game/MapObj/MapPartsRailPointPassChecker.hpp index c0facfe9b..104f907cc 100644 --- a/include/Game/MapObj/MapPartsRailPointPassChecker.hpp +++ b/include/Game/MapObj/MapPartsRailPointPassChecker.hpp @@ -4,14 +4,13 @@ class MapPartsRailPointPassChecker : public MapPartsFunction { public: - MapPartsRailPointPassChecker(LiveActor *); + MapPartsRailPointPassChecker(LiveActor*); virtual ~MapPartsRailPointPassChecker(); virtual void movement(); virtual bool isWorking() const; virtual void start(); virtual void end() { - } bool isPassed() const; @@ -19,5 +18,5 @@ public: bool isPassedStartPoint() const; bool isPassedEndPoint() const; - s32 mRailPointNo; // 0x18 + s32 mRailPointNo; // 0x18 }; \ No newline at end of file diff --git a/include/Game/MapObj/MapPartsRailPosture.hpp b/include/Game/MapObj/MapPartsRailPosture.hpp index 9e640c8d5..327a6ac20 100644 --- a/include/Game/MapObj/MapPartsRailPosture.hpp +++ b/include/Game/MapObj/MapPartsRailPosture.hpp @@ -5,10 +5,10 @@ class MapPartsRailPosture : public MapPartsFunction { public: - MapPartsRailPosture(LiveActor *); + MapPartsRailPosture(LiveActor*); virtual ~MapPartsRailPosture(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual bool isWorking() const; virtual void start(); virtual void end(); @@ -16,5 +16,5 @@ public: void exeMove(); TMtx34f _18; - u32 _48; + u32 _48; }; \ No newline at end of file diff --git a/include/Game/MapObj/MapPartsRailRotator.hpp b/include/Game/MapObj/MapPartsRailRotator.hpp index e61279556..41f8c0e7a 100644 --- a/include/Game/MapObj/MapPartsRailRotator.hpp +++ b/include/Game/MapObj/MapPartsRailRotator.hpp @@ -5,14 +5,14 @@ class MapPartsRailRotator : public MapPartsFunction { public: - MapPartsRailRotator(LiveActor *); + MapPartsRailRotator(LiveActor*); virtual ~MapPartsRailRotator(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual bool isWorking() const; virtual void start(); virtual void end(); - virtual f32 getJMapArgAngleFactor() const; + virtual f32 getJMapArgAngleFactor() const; bool hasRotation(s32) const; void rotateAtPoint(s32); @@ -22,16 +22,16 @@ public: void updateInfo(s32); bool isReachedTargetAngle() const; - void initWithRotateMtx(const JMapInfoIter &, MtxPtr); + void initWithRotateMtx(const JMapInfoIter&, MtxPtr); void exeRotate(); - u32 _18; - u32 _1C; - f32 _20; - f32 _24; - f32 _28; + u32 _18; + u32 _1C; + f32 _20; + f32 _24; + f32 _28; TMtx34f _2C; TMtx34f _5C; - u32 _8C; + u32 _8C; }; \ No newline at end of file diff --git a/include/Game/MapObj/MapPartsRotator.hpp b/include/Game/MapObj/MapPartsRotator.hpp index 4e9dd5e9c..9fcfe9a31 100644 --- a/include/Game/MapObj/MapPartsRotator.hpp +++ b/include/Game/MapObj/MapPartsRotator.hpp @@ -25,23 +25,23 @@ public: class MapPartsRotator : public MapPartsRotatorBase { public: - MapPartsRotator(LiveActor *); + MapPartsRotator(LiveActor*); enum AxisType { - + }; virtual ~MapPartsRotator(); - virtual void init(const JMapInfoIter &); - virtual bool isWorking() const; - virtual void start(); - virtual void end(); + virtual void init(const JMapInfoIter&); + virtual bool isWorking() const; + virtual void start(); + virtual void end(); virtual const TMtx34f& getRotateMtx() const { return _70; } virtual bool isMoving() const; virtual bool isOnReverse() const; - virtual f32 getRotateSpeed() const; + virtual f32 getRotateSpeed() const; void startWithSignalMotion(); void cancelSignalMotion(); @@ -50,28 +50,28 @@ public: void updateAngle(); void updateTargetAngle(); void restartAtEnd(); - void initRotateSpeed(const JMapInfoIter &); + void initRotateSpeed(const JMapInfoIter&); bool isReachedTargetAngle() const; void updateRotateMtx(AxisType, f32); - void calcRotateAxisDir(AxisType, TVec3f *) const; - + void calcRotateAxisDir(AxisType, TVec3f*) const; + void exeRotate(); void exeRotateStart(); - f32 _18; - f32 mRotateAngle; // 0x1C - s32 mRotateStopTime; // 0x20 - f32 mTargetAngle; // 0x24 - f32 mRotateSpeed; // 0x28 - f32 mAngle; // 0x2C - s32 mRotateAxis; // 0x30 - s32 mRotateAccelType; // 0x34 - s32 mRotateType; // 0x38 - s32 mSignMotionType; // 0x3C + f32 _18; + f32 mRotateAngle; // 0x1C + s32 mRotateStopTime; // 0x20 + f32 mTargetAngle; // 0x24 + f32 mRotateSpeed; // 0x28 + f32 mAngle; // 0x2C + s32 mRotateAxis; // 0x30 + s32 mRotateAccelType; // 0x34 + s32 mRotateType; // 0x38 + s32 mSignMotionType; // 0x3C TMtx34f _40; TMtx34f _70; - f32 _A0; - bool mIsOnReverse; // 0xA4 + f32 _A0; + bool mIsOnReverse; // 0xA4 }; namespace NrvMapPartsRotator { @@ -80,4 +80,4 @@ namespace NrvMapPartsRotator { NERVE(HostTypeRotateStart); NERVE(HostTypeRotate); NERVE(HostTypeStopAtEnd); -}; +}; // namespace NrvMapPartsRotator diff --git a/include/Game/MapObj/MarblePlanet.hpp b/include/Game/MapObj/MarblePlanet.hpp index 94ed0b562..c3a64e68e 100644 --- a/include/Game/MapObj/MarblePlanet.hpp +++ b/include/Game/MapObj/MarblePlanet.hpp @@ -7,65 +7,65 @@ class MarblePlanetElectronShadow; class MarblePlanet : public LiveActor { public: - MarblePlanet(const char *); + MarblePlanet(const char*); virtual ~MarblePlanet(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); virtual void startClipped(); virtual void endClipped(); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); void exeScaleUpCore(); void exeBreakCore(); void initCoreAndElectron(); - ModelObj* mCorePlanetModel; // 0x8C - MarblePlanetElectron** mPlanetElectrons; // 0x90 - CollisionParts* mWatermelonCollision; // 0x94 - s32 mNumElectrons; // 0x98 - s32 mRemainingElectrons; // 0x9C + ModelObj* mCorePlanetModel; // 0x8C + MarblePlanetElectron** mPlanetElectrons; // 0x90 + CollisionParts* mWatermelonCollision; // 0x94 + s32 mNumElectrons; // 0x98 + s32 mRemainingElectrons; // 0x9C }; class MarblePlanetElectron : public LiveActor { public: - MarblePlanetElectron(LiveActor *, const TVec3f &, const TVec3f &, const char *); + MarblePlanetElectron(LiveActor*, const TVec3f&, const TVec3f&, const char*); virtual ~MarblePlanetElectron(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPush(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPush(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); void exeMove(); void exeAttack(); - void crashElectron(HitSensor *); + void crashElectron(HitSensor*); - MarblePlanet* mParentPlanet; // 0x8C - MarblePlanetElectronShadow* mElectronShadow; // 0x90 - TVec3f _94; + MarblePlanet* mParentPlanet; // 0x8C + MarblePlanetElectronShadow* mElectronShadow; // 0x90 + TVec3f _94; }; class MarblePlanetElectronShadow : public LiveActor { public: - MarblePlanetElectronShadow(LiveActor *, const TVec3f &, const char *); + MarblePlanetElectronShadow(LiveActor*, const TVec3f&, const char*); virtual ~MarblePlanetElectronShadow(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calcAndSetBaseMtx(); - MarblePlanetElectron* mParentElectron; // 0x8C - const TVec3f* _90; + MarblePlanetElectron* mParentElectron; // 0x8C + const TVec3f* _90; }; namespace NrvMarblePlanet { NERVE(MarblePlanetNrvWait); NERVE(MarblePlanetNrvScaleUpCore); NERVE(MarblePlanetNrvBreakCore); -}; +}; // namespace NrvMarblePlanet namespace NrvMarblePlanetElectron { NERVE(MarblePlanetElectronNrvMove); NERVE(MarblePlanetElectronNrvAttack); -}; +}; // namespace NrvMarblePlanetElectron diff --git a/include/Game/MapObj/MarioLauncherAttractor.hpp b/include/Game/MapObj/MarioLauncherAttractor.hpp index 6305e0002..0d3b222ef 100644 --- a/include/Game/MapObj/MarioLauncherAttractor.hpp +++ b/include/Game/MapObj/MarioLauncherAttractor.hpp @@ -4,19 +4,19 @@ #include "Game/Gravity/GravityCreator.hpp" class MarioLauncherAttractor : public LiveActor { - MarioLauncherAttractor(const char *pName); + MarioLauncherAttractor(const char* pName); - virtual ~MarioLauncherAttractor() {} - virtual void init(const JMapInfoIter &rIter); + virtual ~MarioLauncherAttractor() {} + virtual void init(const JMapInfoIter& rIter); - PointGravityCreator* mGravityCreator; // 0x8C + PointGravityCreator* mGravityCreator; // 0x8C }; namespace NrvMarioLauncherAttractor { - class MarioLauncherAttractorNrvWait : public Nerve { - public: - virtual void execute(Spine *pSpine) const; + class MarioLauncherAttractorNrvWait : public Nerve { + public: + virtual void execute(Spine* pSpine) const; - static MarioLauncherAttractorNrvWait sInstance; - }; -}; + static MarioLauncherAttractorNrvWait sInstance; + }; +}; // namespace NrvMarioLauncherAttractor diff --git a/include/Game/MapObj/MechaKoopaPartsArm.hpp b/include/Game/MapObj/MechaKoopaPartsArm.hpp index 4dce03c2c..6ed91c4e3 100644 --- a/include/Game/MapObj/MechaKoopaPartsArm.hpp +++ b/include/Game/MapObj/MechaKoopaPartsArm.hpp @@ -4,12 +4,12 @@ class MechaKoopaPartsArm : public MapObjActor { public: - MechaKoopaPartsArm(const char *); + MechaKoopaPartsArm(const char*); virtual ~MechaKoopaPartsArm(); - virtual void init(const JMapInfoIter &); - virtual void initCaseUseSwitchB(const MapObjActorInitInfo &); - virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo &); + virtual void init(const JMapInfoIter&); + virtual void initCaseUseSwitchB(const MapObjActorInitInfo&); + virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo&); void exeWait(); void exeMoveStart(); @@ -18,7 +18,7 @@ public: void exeBreak(); void startBreak(); - bool mIsRightArm; // 0xC4 + bool mIsRightArm; // 0xC4 }; namespace NrvMechaKoopaPartsArm { @@ -30,4 +30,4 @@ namespace NrvMechaKoopaPartsArm { NERVE(MechaKoopaPartsArmNrvMoveRear); NERVE(MechaKoopaPartsArmNrvBreakStart); NERVE(MechaKoopaPartsArmNrvBreak); -}; \ No newline at end of file +}; // namespace NrvMechaKoopaPartsArm \ No newline at end of file diff --git a/include/Game/MapObj/MechaKoopaPartsHead.hpp b/include/Game/MapObj/MechaKoopaPartsHead.hpp index 7d99f969b..58ea5f8bf 100644 --- a/include/Game/MapObj/MechaKoopaPartsHead.hpp +++ b/include/Game/MapObj/MechaKoopaPartsHead.hpp @@ -7,18 +7,18 @@ namespace { const char* sDemoPartNameFadeOut = "フェードアウト"; const char* sDemoPartNameWhite = "白画面"; const char* sDemoPartNameFadeIn = "フェードイン"; -}; +}; // namespace class MechaKoopaPartsHead : public MapObjActor { public: - MechaKoopaPartsHead(const char *); + MechaKoopaPartsHead(const char*); virtual ~MechaKoopaPartsHead(); - virtual void init(const JMapInfoIter &); - virtual void initCaseUseSwitchA(const MapObjActorInitInfo &); - virtual void initCaseNoUseSwitchA(const MapObjActorInitInfo &); - virtual void initCaseUseSwitchB(const MapObjActorInitInfo &); - virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo &); + virtual void init(const JMapInfoIter&); + virtual void initCaseUseSwitchA(const MapObjActorInitInfo&); + virtual void initCaseNoUseSwitchA(const MapObjActorInitInfo&); + virtual void initCaseUseSwitchB(const MapObjActorInitInfo&); + virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo&); void exeDemoBreak(); void exeDemoWhiteFadeOut(); @@ -34,4 +34,4 @@ namespace NrvMechaKoopaPartsHead { NERVE(MechaKoopaPartsHeadNrvDemoWhiteWait); NERVE(MechaKoopaPartsHeadNrvDemoWhiteFadeIn); NERVE(MechaKoopaPartsHeadNrvDemoAppearStar); -}; +}; // namespace NrvMechaKoopaPartsHead diff --git a/include/Game/MapObj/MercatorFixParts.hpp b/include/Game/MapObj/MercatorFixParts.hpp index 706602644..0b50bf193 100644 --- a/include/Game/MapObj/MercatorFixParts.hpp +++ b/include/Game/MapObj/MercatorFixParts.hpp @@ -5,11 +5,11 @@ class MercatorFixParts : public LiveActor { public: - MercatorFixParts(const char *); + MercatorFixParts(const char*); virtual ~MercatorFixParts(); - virtual void init(const JMapInfoIter &); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void init(const JMapInfoIter&); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - MapPartsAppearController* mAppearController; // 0x8C + MapPartsAppearController* mAppearController; // 0x8C }; \ No newline at end of file diff --git a/include/Game/MapObj/MercatorRailMoveParts.hpp b/include/Game/MapObj/MercatorRailMoveParts.hpp index 8632ff493..5aacf1a23 100644 --- a/include/Game/MapObj/MercatorRailMoveParts.hpp +++ b/include/Game/MapObj/MercatorRailMoveParts.hpp @@ -5,25 +5,25 @@ class MercatorRailMoveParts : public LiveActor { public: - MercatorRailMoveParts(const char *); + MercatorRailMoveParts(const char*); virtual ~MercatorRailMoveParts(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void startMove(); void endMove(); void updatePose(); - MapPartsRailMover* mRailMover; // 0x8C - MapPartsRailRotator* mRailRotator; // 0x90 - MapPartsAppearController* mAppearController; // 0x94 - TMtx34f mRotateMtx; // 0x98 - TVec3f mLocalTrans; // 0xC8 - TVec3f mLocalRotation; // 0xD4 - TVec3f _E0; - bool mIsNotMoving; // 0xEC + MapPartsRailMover* mRailMover; // 0x8C + MapPartsRailRotator* mRailRotator; // 0x90 + MapPartsAppearController* mAppearController; // 0x94 + TMtx34f mRotateMtx; // 0x98 + TVec3f mLocalTrans; // 0xC8 + TVec3f mLocalRotation; // 0xD4 + TVec3f _E0; + bool mIsNotMoving; // 0xEC }; \ No newline at end of file diff --git a/include/Game/MapObj/MercatorRotateParts.hpp b/include/Game/MapObj/MercatorRotateParts.hpp index 105914586..d1b047c0e 100644 --- a/include/Game/MapObj/MercatorRotateParts.hpp +++ b/include/Game/MapObj/MercatorRotateParts.hpp @@ -6,17 +6,17 @@ class MercatorRotateParts : public LiveActor { public: - MercatorRotateParts(const char *); + MercatorRotateParts(const char*); virtual ~MercatorRotateParts(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - MapPartsRotator* mRotator; // 0x8C - MapPartsAppearController* mAppearController; // 0x90 - TVec3f mLocalTrans; // 0x94 - TVec3f mLocalRotate; // 0xA0 + MapPartsRotator* mRotator; // 0x8C + MapPartsAppearController* mAppearController; // 0x90 + TVec3f mLocalTrans; // 0x94 + TVec3f mLocalRotate; // 0xA0 }; \ No newline at end of file diff --git a/include/Game/MapObj/MeteoContainer.hpp b/include/Game/MapObj/MeteoContainer.hpp index 0164d55af..97c9c30d3 100644 --- a/include/Game/MapObj/MeteoContainer.hpp +++ b/include/Game/MapObj/MeteoContainer.hpp @@ -4,16 +4,16 @@ class MeteoContainer : public LiveActor { public: - MeteoContainer(const char *); + MeteoContainer(const char*); virtual ~MeteoContainer(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void kill(); virtual void control(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPush(HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPush(HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeDestroy(); }; @@ -21,4 +21,4 @@ public: namespace NrvMeteoContainer { NERVE_DECL_NULL(MeteoContainerNrvWait); NERVE_DECL(MeteoContainerNrvDestroy, MeteoContainer, MeteoContainer::exeDestroy); -}; \ No newline at end of file +}; // namespace NrvMeteoContainer \ No newline at end of file diff --git a/include/Game/MapObj/MiniatureGalaxy.hpp b/include/Game/MapObj/MiniatureGalaxy.hpp index f9bc032ed..1489569b4 100644 --- a/include/Game/MapObj/MiniatureGalaxy.hpp +++ b/include/Game/MapObj/MiniatureGalaxy.hpp @@ -7,37 +7,37 @@ #include "revolution/types.h" class MiniatureGalaxy : public LiveActor { - public: - MiniatureGalaxy(const char*); - ~MiniatureGalaxy(); - virtual void init(const JMapInfoIter&); - virtual void initAfterPlacement(); - virtual void appear(); - virtual void kill(); - virtual void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&); - virtual void control(); - virtual void calcAndSetBaseMtx(); - virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - - void initPartsModel(); - void setScale(f32); - bool tryZoomIn(bool); - bool tryZoomOut(); - void updateZoomInOut(); - void updateNamePlate(); - void appearUnknownModel(const char*); - void showUnknownModel(const char*); - void showSelectModel(); - void hideUnknownModel(); - void appearSelectModel(); - void disappearSelectModel(); - void showNamePlate(bool); - bool isUseKoopaFaceModel() const; - void playPointerME(); - void playNeedStartME(); - void exeWait(); - void exeNotSelected(); - void exeOpen(); +public: + MiniatureGalaxy(const char*); + ~MiniatureGalaxy(); + virtual void init(const JMapInfoIter&); + virtual void initAfterPlacement(); + virtual void appear(); + virtual void kill(); + virtual void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&); + virtual void control(); + virtual void calcAndSetBaseMtx(); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - const char* _118; + void initPartsModel(); + void setScale(f32); + bool tryZoomIn(bool); + bool tryZoomOut(); + void updateZoomInOut(); + void updateNamePlate(); + void appearUnknownModel(const char*); + void showUnknownModel(const char*); + void showSelectModel(); + void hideUnknownModel(); + void appearSelectModel(); + void disappearSelectModel(); + void showNamePlate(bool); + bool isUseKoopaFaceModel() const; + void playPointerME(); + void playNeedStartME(); + void exeWait(); + void exeNotSelected(); + void exeOpen(); + + const char* _118; }; diff --git a/include/Game/MapObj/MiniatureGalaxyHolder.hpp b/include/Game/MapObj/MiniatureGalaxyHolder.hpp index 52302a17f..e08f97396 100644 --- a/include/Game/MapObj/MiniatureGalaxyHolder.hpp +++ b/include/Game/MapObj/MiniatureGalaxyHolder.hpp @@ -6,10 +6,10 @@ class MiniatureGalaxyFunction { public: - static s32 getMiniatureGalaxyNum(); + static s32 getMiniatureGalaxyNum(); static MiniatureGalaxy* getPointingMiniatureGalaxy(); static MiniatureGalaxy* getCometLandMiniatureGalaxy(); static void updateCometStatus(); - static s32 getCometNameId(); + static s32 getCometNameId(); }; diff --git a/include/Game/MapObj/NeedlePlant.hpp b/include/Game/MapObj/NeedlePlant.hpp index c7ce7712a..88684cbdd 100644 --- a/include/Game/MapObj/NeedlePlant.hpp +++ b/include/Game/MapObj/NeedlePlant.hpp @@ -6,16 +6,16 @@ class NeedlePlant : public MapObjActor { public: - NeedlePlant(const char *); + NeedlePlant(const char*); virtual ~NeedlePlant(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPush(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); - virtual void connectToScene(const MapObjActorInitInfo &); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPush(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); + virtual void connectToScene(const MapObjActorInitInfo&); void exeShake(); void exeWait(); diff --git a/include/Game/MapObj/NormalMapBase.hpp b/include/Game/MapObj/NormalMapBase.hpp index c0156f83e..ed9fe26e0 100644 --- a/include/Game/MapObj/NormalMapBase.hpp +++ b/include/Game/MapObj/NormalMapBase.hpp @@ -7,29 +7,29 @@ class NormalMapBase : public LiveActor { public: - NormalMapBase(const char *); + NormalMapBase(const char*); virtual ~NormalMapBase(); virtual void draw() const; virtual void calcAnim(); virtual void control(); virtual void drawSetting(MtxPtr) const; - virtual void drawMaterialSetting(J3DMaterial *) const; + virtual void drawMaterialSetting(J3DMaterial*) const; virtual void setTevForObject() const; virtual void setTevForObject_Material() const; virtual void setTevForDebug() const; - void setup(const char *); + void setup(const char*); void initNormalMap(); void setupLighting(); void setupTexture(); void updateBtkMtx(); - void loadTexMtxBtk(J3DMaterial *) const; + void loadTexMtxBtk(J3DMaterial*) const; void updateLightMtx(MtxPtr) const; - bool isNormalMapMaterial(const char *) const; - void standardDraw(J3DModel *) const; - void shapeAnalyzeDraw(J3DModel *) const; + bool isNormalMapMaterial(const char*) const; + void standardDraw(J3DModel*) const; + void shapeAnalyzeDraw(J3DModel*) const; void loadDirectLightTex(_GXTexMapID) const; @@ -39,47 +39,47 @@ public: void drawSettingForCapture(MtxPtr) const; void loadDiffuseGradTex(_GXTexMapID) const; - void loadNormalTex(const JUTTexture *, _GXTexMapID) const; + void loadNormalTex(const JUTTexture*, _GXTexMapID) const; - u32 _8C; + u32 _8C; JUTTexture* _90; - JUTTexture* mNormalTex; // 0x94 - u8 _98[0xDC-0x98]; - void* mImagePtr; // 0xDC - u32 _E0; - s32 nGradTexMode; // 0xE4 - u32 _E8; - s32 _EC; - u32 _F0; - Mtx _F4; - u8 mBackLightMode; // 0x124 - u8 _125; - u8 _126; - u8 _127; - Color10 mTevColor0; // 0x128 - Color10 mTevColor1; // 0x130 - u16 _138; - u16 _13A; - u8 mLightAMode; // 0x13C - u8 mLightBMode; // 0x13D - u16 mHardLightColorMask; // 0x13E - u16 mHardLightAlphaMask; // 0x140 - u8 mAmbColor; // 0x142 - u8 mMatColor; // 0x143 - u8 mAmbAlpha; // 0x144 - u8 mMatAlpha; // 0x145 - u16 mUseModelLightReg; // 0x146 - u16 mUseModelTevReg; // 0x148 - u8 mLightingHighLevel; // 0x14A - u8 mLightingLowLevel; // 0x14B - BtkPlayer* mBtkPlayer; // 0x14C - u8 _150; - u8 _151[0x184-0x151]; - Mtx _184[0x10]; // 0x184 - u8 _484[0x34]; + JUTTexture* mNormalTex; // 0x94 + u8 _98[0xDC - 0x98]; + void* mImagePtr; // 0xDC + u32 _E0; + s32 nGradTexMode; // 0xE4 + u32 _E8; + s32 _EC; + u32 _F0; + Mtx _F4; + u8 mBackLightMode; // 0x124 + u8 _125; + u8 _126; + u8 _127; + Color10 mTevColor0; // 0x128 + Color10 mTevColor1; // 0x130 + u16 _138; + u16 _13A; + u8 mLightAMode; // 0x13C + u8 mLightBMode; // 0x13D + u16 mHardLightColorMask; // 0x13E + u16 mHardLightAlphaMask; // 0x140 + u8 mAmbColor; // 0x142 + u8 mMatColor; // 0x143 + u8 mAmbAlpha; // 0x144 + u8 mMatAlpha; // 0x145 + u16 mUseModelLightReg; // 0x146 + u16 mUseModelTevReg; // 0x148 + u8 mLightingHighLevel; // 0x14A + u8 mLightingLowLevel; // 0x14B + BtkPlayer* mBtkPlayer; // 0x14C + u8 _150; + u8 _151[0x184 - 0x151]; + Mtx _184[0x10]; // 0x184 + u8 _484[0x34]; JUTTexture* _4B8; - int mHeight; // 0x4BC - int mWidth; // 0x4C0 - u8 _4C4; - u8 _4C5; + int mHeight; // 0x4BC + int mWidth; // 0x4C0 + u8 _4C4; + u8 _4C5; }; diff --git a/include/Game/MapObj/NormalMapTestObj.hpp b/include/Game/MapObj/NormalMapTestObj.hpp index 978254408..d39608f65 100644 --- a/include/Game/MapObj/NormalMapTestObj.hpp +++ b/include/Game/MapObj/NormalMapTestObj.hpp @@ -4,8 +4,8 @@ class NormalMapTestObj : public NormalMapBase { public: - NormalMapTestObj(const char *); + NormalMapTestObj(const char*); virtual ~NormalMapTestObj(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); }; diff --git a/include/Game/MapObj/Note.hpp b/include/Game/MapObj/Note.hpp index ef3494d4b..13b7c6dbf 100644 --- a/include/Game/MapObj/Note.hpp +++ b/include/Game/MapObj/Note.hpp @@ -11,24 +11,24 @@ public: NoteGroup(); virtual ~NoteGroup(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); - f32 mRotation; // 0x18 + f32 mRotation; // 0x18 }; /// @brief Class that represents a single note in a NoteFairy actor. class Note : public LiveActor { public: - Note(const char *, const TVec3f &, NoteFairy *); + Note(const char*, const TVec3f&, NoteFairy*); virtual ~Note(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); virtual void calcAndSetBaseMtx(); /// @brief Checks if the sensor is either a player or a rideable entity and if it is, it will "collect" the note. - virtual void attackSensor(HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); void startCountDown(); @@ -39,18 +39,18 @@ public: /// @brief Scales the note's velocity by -30.0 and then invalidates all hit sensors, and after 10 steps, calls Note::kill(). void exeFlyUp(); - /* 0x8C */ NoteFairy* mParentFairy; ///< The parent NoteFairy that this note was spawned from. - TVec3f _90; - TVec3f mRailDirection; // 0x9C - /* 0xA8 */ int mCounter; ///< The amount of steps it takes for the note to disappear. - f32 _AC; - bool mIsCountdown; // 0xB0 - /* 0xB4 */ FlashingCtrl* mFlashCtrl; // A pointer to the FlashingCtrl instance that handles the "fading away" effects. - u32 _B8; + /* 0x8C */ NoteFairy* mParentFairy; ///< The parent NoteFairy that this note was spawned from. + TVec3f _90; + TVec3f mRailDirection; // 0x9C + /* 0xA8 */ int mCounter; ///< The amount of steps it takes for the note to disappear. + f32 _AC; + bool mIsCountdown; // 0xB0 + /* 0xB4 */ FlashingCtrl* mFlashCtrl; // A pointer to the FlashingCtrl instance that handles the "fading away" effects. + u32 _B8; }; namespace NrvNote { NERVE_DECL(NoteNrvWait, Note, Note::exeWait); NERVE_DECL(NoteNrvCountDown, Note, Note::exeCountDown); NERVE_DECL(NoteNrvFlyUp, Note, Note::exeFlyUp); -}; \ No newline at end of file +}; // namespace NrvNote \ No newline at end of file diff --git a/include/Game/MapObj/NoteFairy.hpp b/include/Game/MapObj/NoteFairy.hpp index 635134e7a..1ec59962b 100644 --- a/include/Game/MapObj/NoteFairy.hpp +++ b/include/Game/MapObj/NoteFairy.hpp @@ -6,13 +6,13 @@ class Note; class NoteFairy : public LiveActor { public: - NoteFairy(const char *); + NoteFairy(const char*); virtual ~NoteFairy(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); virtual void control(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void killAllNotes(); void exeHide(); @@ -24,31 +24,31 @@ public: void exeEndWait(); void exeSuccessDemo(); void exeSuccess(); - void enterDemoAppear(const Nerve *, bool); + void enterDemoAppear(const Nerve*, bool); bool isDeadAllNotes(); - void setLastGotNote(Note *); - f32 getNoteCoord(s32); + void setLastGotNote(Note*); + f32 getNoteCoord(s32); - TVec3f _8C; - TVec3f _98; - f32 mAppearanceSpeed; // 0xA4 - s32 mTimeLimit; // 0xA8 - s32 mMelodyNoteNum; // 0xAC - s32 _B0; - s32 mSong; // 0xB4 - s32 mCompletionJingle; // 0xB8 - f32 mNoteCoord; // 0xBC - Note** mNoteArray; // 0xC0 - Note* mLastGotNote; // 0xC4 - s32 mAppearanceType; // 0xC8 - bool _CC; - bool _CD; - bool mHasDemo; // 0xCE - bool _CF; - bool _D0; - bool _D1; - s32 mPowerStarSpawnType; // 0xD4 - ActorCameraInfo* mCameraInfo; // 0xD8 + TVec3f _8C; + TVec3f _98; + f32 mAppearanceSpeed; // 0xA4 + s32 mTimeLimit; // 0xA8 + s32 mMelodyNoteNum; // 0xAC + s32 _B0; + s32 mSong; // 0xB4 + s32 mCompletionJingle; // 0xB8 + f32 mNoteCoord; // 0xBC + Note** mNoteArray; // 0xC0 + Note* mLastGotNote; // 0xC4 + s32 mAppearanceType; // 0xC8 + bool _CC; + bool _CD; + bool mHasDemo; // 0xCE + bool _CF; + bool _D0; + bool _D1; + s32 mPowerStarSpawnType; // 0xD4 + ActorCameraInfo* mCameraInfo; // 0xD8 }; namespace NrvNoteFairy { @@ -61,4 +61,4 @@ namespace NrvNoteFairy { NERVE_DECL(NoteFairyNrvEndWait, NoteFairy, NoteFairy::exeEndWait); NERVE_DECL(NoteFairyNrvSuccessDemo, NoteFairy, NoteFairy::exeSuccessDemo); NERVE_DECL(NoteFairyNrvSuccess, NoteFairy, NoteFairy::exeSuccess); -}; +}; // namespace NrvNoteFairy diff --git a/include/Game/MapObj/PTimerSwitch.hpp b/include/Game/MapObj/PTimerSwitch.hpp index ef82be658..e6c7b0f02 100644 --- a/include/Game/MapObj/PTimerSwitch.hpp +++ b/include/Game/MapObj/PTimerSwitch.hpp @@ -5,33 +5,33 @@ class PTimerSwitch : public LiveActor { public: - PTimerSwitch(const char *pName); + PTimerSwitch(const char* pName); - virtual void init(const JMapInfoIter& rIter); - virtual void initAfterPlacement(); - virtual void appear(); - virtual void kill(); - virtual void calcAnim(); - virtual void control(); - virtual void calcAndSetBaseMtx(); - virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver); + virtual void init(const JMapInfoIter& rIter); + virtual void initAfterPlacement(); + virtual void appear(); + virtual void kill(); + virtual void calcAnim(); + virtual void control(); + virtual void calcAndSetBaseMtx(); + virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); - void reset(); - bool trySwitchDown(); - bool tryOn(); - void exeOff(); - void exeSwitchDown(); - void exeOn(); + void reset(); + bool trySwitchDown(); + bool tryOn(); + void exeOff(); + void exeSwitchDown(); + void exeOn(); - CollisionParts *mSwitchCollision; // 0x8C - MapObjConnector *mConnector; // 0x90 - s32 _94; - bool _98; + CollisionParts* mSwitchCollision; // 0x8C + MapObjConnector* mConnector; // 0x90 + s32 _94; + bool _98; }; namespace NrvPTimerSwitch { - NERVE(PTimerSwitchNrvOn); - NERVE(PTimerSwitchNrvSwitchDown); - NERVE(PTimerSwitchNrvOff); -}; + NERVE(PTimerSwitchNrvOn); + NERVE(PTimerSwitchNrvSwitchDown); + NERVE(PTimerSwitchNrvOff); +}; // namespace NrvPTimerSwitch diff --git a/include/Game/MapObj/PalmIsland.hpp b/include/Game/MapObj/PalmIsland.hpp index 247c73991..9ae1137e2 100644 --- a/include/Game/MapObj/PalmIsland.hpp +++ b/include/Game/MapObj/PalmIsland.hpp @@ -5,15 +5,15 @@ class PalmIsland : public LiveActor { public: - PalmIsland(const char *); - + PalmIsland(const char*); + virtual ~PalmIsland(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); void exeFloat(); void exeWait(); - s32 _8C; // 0x8C + s32 _8C; // 0x8C TVec3f _90; // 0x90 - s32 _9C; // 0x9C + s32 _9C; // 0x9C }; diff --git a/include/Game/MapObj/PeachCastleGardenPlanet.hpp b/include/Game/MapObj/PeachCastleGardenPlanet.hpp index 0220fbeb1..1e8581d71 100644 --- a/include/Game/MapObj/PeachCastleGardenPlanet.hpp +++ b/include/Game/MapObj/PeachCastleGardenPlanet.hpp @@ -4,13 +4,13 @@ class PeachCastleGardenPlanet : public MapObjActor { public: - PeachCastleGardenPlanet(const char *); + PeachCastleGardenPlanet(const char*); virtual ~PeachCastleGardenPlanet(); - virtual void init(const JMapInfoIter &); - virtual void connectToScene(const MapObjActorInitInfo &); - virtual void initCaseUseSwitchA(const MapObjActorInitInfo &); - + virtual void init(const JMapInfoIter&); + virtual void connectToScene(const MapObjActorInitInfo&); + virtual void initCaseUseSwitchA(const MapObjActorInitInfo&); + void startDamage(); void exeWait(); void exeDamage(); diff --git a/include/Game/MapObj/PhantomShipBridge.hpp b/include/Game/MapObj/PhantomShipBridge.hpp index b17715fe4..bc2da516c 100644 --- a/include/Game/MapObj/PhantomShipBridge.hpp +++ b/include/Game/MapObj/PhantomShipBridge.hpp @@ -4,10 +4,10 @@ class PhantomShipBridge : public LiveActor { public: - PhantomShipBridge(const char *); + PhantomShipBridge(const char*); virtual ~PhantomShipBridge(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calcAnim(); void startMoveA(); @@ -18,5 +18,5 @@ public: void exeWait(); CollisionParts* _8C; - s32 mIsNutShipBridge; // 0x90 + s32 mIsNutShipBridge; // 0x90 }; diff --git a/include/Game/MapObj/PicketSwitch.hpp b/include/Game/MapObj/PicketSwitch.hpp index 46202bc2f..574b1bd53 100644 --- a/include/Game/MapObj/PicketSwitch.hpp +++ b/include/Game/MapObj/PicketSwitch.hpp @@ -4,11 +4,11 @@ class PicketSwitch : public LiveActor { public: - PicketSwitch(const char *); + PicketSwitch(const char*); virtual ~PicketSwitch(); - virtual void init(const JMapInfoIter &); - virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver); + virtual void init(const JMapInfoIter&); + virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); inline void exeWait() { if (MR::isFirstStep(this)) { @@ -24,4 +24,4 @@ namespace NrvPicketSwitch { NERVE(PicketSwitchNrvWait); NERVE(PicketSwitchNrvFirstDrop); NERVE(PicketSwitchNrvLastDrop); -}; +}; // namespace NrvPicketSwitch diff --git a/include/Game/MapObj/PowerStar.hpp b/include/Game/MapObj/PowerStar.hpp index 2eaba7603..2fb6ace0e 100644 --- a/include/Game/MapObj/PowerStar.hpp +++ b/include/Game/MapObj/PowerStar.hpp @@ -8,88 +8,88 @@ class PowerStarAppearPoint; namespace { const char* cAppearDemoName = "パワースター出現"; const char* cStageClearAnimNameKoopaVs3 = "GrandStarGetKoopaVs3"; -}; +}; // namespace class PowerStar : public LiveActor { public: - PowerStar(const char *); + PowerStar(const char*); virtual ~PowerStar(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void appear(); virtual void makeActorAppeared(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void requestAppear(); - void setDemoAppearPos(const TVec3f &); - bool isEndAppearDemo() const; - void offAppearDemo(); - static void setupColor(LiveActor *, const NameObj *, s32); - static void setupColorAtResultSequence(LiveActor *, bool); - static void requestPointLight(const LiveActor *, const NameObj *, s32); - static void requestPointLightAtResultSequence(const LiveActor *); - static f32 getPowerStarWaitRotateSpeed(); - static s32 getBtpFrameCurrentStage(s32); - static bool isCurrentStageKoopaVs3(); - static void initShadowPowerStar(LiveActor *, bool); - static void makeArchiveList(NameObjArchiveListCollector *, const JMapInfoIter &); - void initMapToolInfo(const JMapInfoIter &); - void initModel(); - void initSensorGrandStar(); - void initShadow(const JMapInfoIter &); - void initPosture(); - void endAppearDemo(); - PowerStarAppearPoint* getNearestAppearPoint(const TVec3f &) const; - LiveActor* getAppearCameraActor(); - ActorCameraInfo* getAppearCameraInfo() const; - void requestAppearOrWait(); - void calcAppearDemoRiseTrans(TVec3f *, f32) const; - void processWait(f32); - void exeWaitStartAppear(); - void exeAppearDemoRise(); - void exeAppearDemoMove(); - void exeAppearDemoKoopa(); - void exeWait(); - void exeWeak(); - void exeWeakNoRotate(); - void exeWeakToWait(); - void exeStageClearDemo(); + void requestAppear(); + void setDemoAppearPos(const TVec3f&); + bool isEndAppearDemo() const; + void offAppearDemo(); + static void setupColor(LiveActor*, const NameObj*, s32); + static void setupColorAtResultSequence(LiveActor*, bool); + static void requestPointLight(const LiveActor*, const NameObj*, s32); + static void requestPointLightAtResultSequence(const LiveActor*); + static f32 getPowerStarWaitRotateSpeed(); + static s32 getBtpFrameCurrentStage(s32); + static bool isCurrentStageKoopaVs3(); + static void initShadowPowerStar(LiveActor*, bool); + static void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&); + void initMapToolInfo(const JMapInfoIter&); + void initModel(); + void initSensorGrandStar(); + void initShadow(const JMapInfoIter&); + void initPosture(); + void endAppearDemo(); + PowerStarAppearPoint* getNearestAppearPoint(const TVec3f&) const; + LiveActor* getAppearCameraActor(); + ActorCameraInfo* getAppearCameraInfo() const; + void requestAppearOrWait(); + void calcAppearDemoRiseTrans(TVec3f*, f32) const; + void processWait(f32); + void exeWaitStartAppear(); + void exeAppearDemoRise(); + void exeAppearDemoMove(); + void exeAppearDemoKoopa(); + void exeWait(); + void exeWeak(); + void exeWeakNoRotate(); + void exeWeakToWait(); + void exeStageClearDemo(); inline bool isGrandStar() { return mIsGrandStar; } - s32 mPowerStarId; // 0x8C - bool mIsInDemo; // 0x90 - TVec3f mAppearPosition; // 0x94 - TVec3f _A0; - TVec3f _AC; - TPos3f _B8; - TMtx34f _E8; - ModelObj* mPowerStarModelObj; // 0x118 - u8 _11C; - u8 _11D; - u8 _11E; - u8 _11F; + s32 mPowerStarId; // 0x8C + bool mIsInDemo; // 0x90 + TVec3f mAppearPosition; // 0x94 + TVec3f _A0; + TVec3f _AC; + TPos3f _B8; + TMtx34f _E8; + ModelObj* mPowerStarModelObj; // 0x118 + u8 _11C; + u8 _11D; + u8 _11E; + u8 _11F; // 0x120 // this isn't what they wrote but oh well union { volatile s32 mColorFrame_v; - s32 mColorFrame; + s32 mColorFrame; }; - volatile bool mIsGrandStar; // 0x124 - bool _125; // Obj_arg0 - bool _126; // Obj_arg1 - bool _127; // Obj_arg4 - ActorCameraInfo* mCameraInfo; // 0x128 + volatile bool mIsGrandStar; // 0x124 + bool _125; // Obj_arg0 + bool _126; // Obj_arg1 + bool _127; // Obj_arg4 + ActorCameraInfo* mCameraInfo; // 0x128 PowerStarAppearPoint* mCameraActor; // 0x12C - ModelObj* mLuigiNPC; // 0x130 - TMtx34f _134; - bool _164; + ModelObj* mLuigiNPC; // 0x130 + TMtx34f _134; + bool _164; }; diff --git a/include/Game/MapObj/PowerStarAppearPoint.hpp b/include/Game/MapObj/PowerStarAppearPoint.hpp index 056d54967..5a85365e4 100644 --- a/include/Game/MapObj/PowerStarAppearPoint.hpp +++ b/include/Game/MapObj/PowerStarAppearPoint.hpp @@ -4,10 +4,10 @@ class PowerStarAppearPoint : public LiveActor { public: - PowerStarAppearPoint(const char *); + PowerStarAppearPoint(const char*); virtual ~PowerStarAppearPoint(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - ActorCameraInfo* mCameraInfo; // 0x8C + ActorCameraInfo* mCameraInfo; // 0x8C }; \ No newline at end of file diff --git a/include/Game/MapObj/PowerStarHolder.hpp b/include/Game/MapObj/PowerStarHolder.hpp index 54bc200d7..d77f775d3 100644 --- a/include/Game/MapObj/PowerStarHolder.hpp +++ b/include/Game/MapObj/PowerStarHolder.hpp @@ -3,34 +3,34 @@ #include "Game/MapObj/PowerStar.hpp" struct PowerStarRequestInfo { - PowerStar* mStar; // 0x0 - int mStarNum; // 0x4 - bool mIsAppear; // 0x8 + PowerStar* mStar; // 0x0 + int mStarNum; // 0x4 + bool mIsAppear; // 0x8 }; class PowerStarHolder : public NameObj { public: - PowerStarHolder(const char *); + PowerStarHolder(const char*); virtual ~PowerStarHolder(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - void registerPowerStar(PowerStar *, int); - void requestAppearPowerStar(int, const TVec3f *, bool); - void appearPowerStarWithoutDemo(int); - PowerStar* getAppearedPowerStar(int) const; + void registerPowerStar(PowerStar*, int); + void requestAppearPowerStar(int, const TVec3f*, bool); + void appearPowerStarWithoutDemo(int); + PowerStar* getAppearedPowerStar(int) const; PowerStarRequestInfo* findPowerStarRequestInfo(int) const; - PowerStarRequestInfo* mInfos[0x10]; // 0xC - s32 mNumInfos; // 0x4C + PowerStarRequestInfo* mInfos[0x10]; // 0xC + s32 mNumInfos; // 0x4C }; namespace MR { - void registerPowerStar(PowerStar *, int); + void registerPowerStar(PowerStar*, int); }; class PowerStarFunction { public: - static bool isEndPowerStarAppearDemo(int); + static bool isEndPowerStarAppearDemo(int); static PowerStar* findPowerStar(int); }; \ No newline at end of file diff --git a/include/Game/MapObj/PressureBase.hpp b/include/Game/MapObj/PressureBase.hpp index f06514495..f633a5d5a 100644 --- a/include/Game/MapObj/PressureBase.hpp +++ b/include/Game/MapObj/PressureBase.hpp @@ -6,33 +6,32 @@ class PressureMessenger : public LiveActor { public: - PressureMessenger(MsgSharedGroup *, const char *); + PressureMessenger(MsgSharedGroup*, const char*); virtual ~PressureMessenger(); - virtual void init(const JMapInfoIter &); - + virtual void init(const JMapInfoIter&); + void exeSync(); - MsgSharedGroup* mSharedGroup; // 0x8C - s32 _90; + MsgSharedGroup* mSharedGroup; // 0x8C + s32 _90; }; class PressureBase : public LiveActor { public: - PressureBase(const char *); + PressureBase(const char*); virtual ~PressureBase() { - } - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); - virtual void initBullet(const JMapInfoIter &); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); + virtual void initBullet(const JMapInfoIter&); virtual bool shotBullet(f32); void exeBound(); @@ -41,24 +40,24 @@ public: void exeShot(); void startWait(); void startRelax(); - bool calcJointCannonV(TPos3f *, const JointControllerInfo &); + bool calcJointCannonV(TPos3f*, const JointControllerInfo&); bool isShotTypeOnGravity() const; bool isShotTypeFollow() const; - JointControlDelegator* mJointController; // 0x8C - TVec3f mFront; // 0x90 - f32 _9C; - f32 mNozzleRotation; // 0xA0 - s32 mWaitTime; // 0xA4 - f32 mBallSpeed; // 0xA8 - s32 mShotType; // 0xAC - u8 _B0; - u8 _B1; - u8 _B2; - u8 _B3; - PressureMessenger* mMessenger; // 0xB4 - MsgSharedGroup* mGroup; // 0xB8 - s8 _BC; + JointControlDelegator* mJointController; // 0x8C + TVec3f mFront; // 0x90 + f32 _9C; + f32 mNozzleRotation; // 0xA0 + s32 mWaitTime; // 0xA4 + f32 mBallSpeed; // 0xA8 + s32 mShotType; // 0xAC + u8 _B0; + u8 _B1; + u8 _B2; + u8 _B3; + PressureMessenger* mMessenger; // 0xB4 + MsgSharedGroup* mGroup; // 0xB8 + s8 _BC; }; namespace NrvPressureMessenger { @@ -75,4 +74,4 @@ namespace NrvPressureBase { NERVE(PressureBaseNrvWait); NERVE(PressureBaseNrvPrepareToShot); NERVE(PressureBaseNrvShot); -}; \ No newline at end of file +}; // namespace NrvPressureBase \ No newline at end of file diff --git a/include/Game/MapObj/PrizeRing.hpp b/include/Game/MapObj/PrizeRing.hpp index dfc38f34d..2c6199d22 100644 --- a/include/Game/MapObj/PrizeRing.hpp +++ b/include/Game/MapObj/PrizeRing.hpp @@ -3,34 +3,33 @@ #include "Game/LiveActor/LiveActor.hpp" #include "Game/LiveActor/ModelObj.hpp" - namespace NrvPrizeRing { NERVE(PrizeRingStart); NERVE(PrizeRingLoop); NERVE(PrizeRingTimeout); NERVE(PrizeRingReadyToPass); NERVE(PrizeRingPass); - NERVE(PrizeRingReadyToKill); -}; + NERVE(PrizeRingReadyToKill); +}; // namespace NrvPrizeRing class PrizeRing : public ModelObj { public: PrizeRing(); virtual ~PrizeRing(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void kill(); - virtual void attackSensor(HitSensor *pSender, HitSensor *pReceiver); + virtual void attackSensor(HitSensor* pSender, HitSensor* pReceiver); - void setLife(int); - void setNumber(int); - void setNervePass(); - bool isReadyToPass() const; - bool isReadyToKill() const; - void exeStart(); - void exeLoop(); - void exeTimeout(); + void setLife(int); + void setNumber(int); + void setNervePass(); + bool isReadyToPass() const; + bool isReadyToKill() const; + void exeStart(); + void exeLoop(); + void exeTimeout(); inline void exeReadyToKill() { if (MR::isFirstStep(this)) { MR::hideModel(this); @@ -38,7 +37,7 @@ public: } void exePass(); bool isPassed() const; - void playSound() const; + void playSound() const; bool isOnTriggerTimeoutFlash() const; int _90; diff --git a/include/Game/MapObj/PunchingKinoko.hpp b/include/Game/MapObj/PunchingKinoko.hpp index 19cdcf0ee..dbc1e540c 100644 --- a/include/Game/MapObj/PunchingKinoko.hpp +++ b/include/Game/MapObj/PunchingKinoko.hpp @@ -7,28 +7,28 @@ class PunchingKinoko : public LiveActor { public: - PunchingKinoko(const char *); + PunchingKinoko(const char*); ~PunchingKinoko(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void makeActorAppeared(); virtual void kill(); virtual void makeActorDead(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPush(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPush(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); void initShadow(); void initSensor(); - void initCamera(const JMapInfoIter &); + void initCamera(const JMapInfoIter&); void initJointControl(); - bool requestPunch(HitSensor *, HitSensor *); - bool requestEnemyBlow(HitSensor *, HitSensor *); - bool requestTrample(HitSensor *, HitSensor *); + bool requestPunch(HitSensor*, HitSensor*); + bool requestEnemyBlow(HitSensor*, HitSensor*); + bool requestTrample(HitSensor*, HitSensor*); bool requestCrush(); void exeWait(); @@ -40,7 +40,7 @@ public: void exeCrushed(); void exeCrushedEnd(); - bool ballMtxCallBack(TPos3f *, const JointControllerInfo &); + bool ballMtxCallBack(TPos3f*, const JointControllerInfo&); // some callers will only match if these are marked NO_INLINE, even though they aren't being inlined (???) bool isEnablePunched() const; @@ -54,15 +54,15 @@ public: void addVelocityKeepHeight(); private: - GroundChecker *mGroundChecker; // 0x8C - AnimScaleController *mScaleController; // 0x90 - JointControlDelegator *mDelegator; // 0x94 - s32 _98; - TVec3f _9C; - TVec3f _A8; - s32 mStarPointerHitCoolDown; // 0xB4 - bool _B8; - s32 mInvincibleHitCoolDown; // 0xBC + GroundChecker* mGroundChecker; // 0x8C + AnimScaleController* mScaleController; // 0x90 + JointControlDelegator* mDelegator; // 0x94 + s32 _98; + TVec3f _9C; + TVec3f _A8; + s32 mStarPointerHitCoolDown; // 0xB4 + bool _B8; + s32 mInvincibleHitCoolDown; // 0xBC }; namespace NrvPunchingKinoko { @@ -74,4 +74,4 @@ namespace NrvPunchingKinoko { NERVE(PunchingKinokoNrvPointSnaped); NERVE(PunchingKinokoNrvCrushed); NERVE(PunchingKinokoNrvCrushedEnd); -}; +}; // namespace NrvPunchingKinoko diff --git a/include/Game/MapObj/PurpleCoinHolder.hpp b/include/Game/MapObj/PurpleCoinHolder.hpp index 2e929702c..d555e2509 100644 --- a/include/Game/MapObj/PurpleCoinHolder.hpp +++ b/include/Game/MapObj/PurpleCoinHolder.hpp @@ -15,11 +15,11 @@ public: void start(); - PurpleCoinStarter* mStarter; // 0x18 + PurpleCoinStarter* mStarter; // 0x18 }; namespace MR { void createPurpleCoinHolder(); - void addToPurpleCoinHolder(const NameObj *, Coin *); - void registPurpleCoinStarter(PurpleCoinStarter *); -}; \ No newline at end of file + void addToPurpleCoinHolder(const NameObj*, Coin*); + void registPurpleCoinStarter(PurpleCoinStarter*); +}; // namespace MR \ No newline at end of file diff --git a/include/Game/MapObj/PurpleCoinStarter.hpp b/include/Game/MapObj/PurpleCoinStarter.hpp index c6334672f..2c44359ea 100644 --- a/include/Game/MapObj/PurpleCoinStarter.hpp +++ b/include/Game/MapObj/PurpleCoinStarter.hpp @@ -6,14 +6,14 @@ class PurpleCoinStarter : public NameObj { public: - PurpleCoinStarter(const char *); + PurpleCoinStarter(const char*); virtual ~PurpleCoinStarter(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - void setHost(PurpleCoinHolder *); + void setHost(PurpleCoinHolder*); void start(); - PurpleCoinHolder* mCoinHolder; // 0xC - StageSwitchCtrl* mSwitchCtrl; // 0x10 + PurpleCoinHolder* mCoinHolder; // 0xC + StageSwitchCtrl* mSwitchCtrl; // 0x10 }; \ No newline at end of file diff --git a/include/Game/MapObj/QuarterRollGravityRoomArrow.hpp b/include/Game/MapObj/QuarterRollGravityRoomArrow.hpp index 6c23b667b..909e3ce4a 100644 --- a/include/Game/MapObj/QuarterRollGravityRoomArrow.hpp +++ b/include/Game/MapObj/QuarterRollGravityRoomArrow.hpp @@ -14,14 +14,14 @@ public: virtual void initCaseNoUseSwitchA(const MapObjActorInitInfo& rInfo); virtual void initCaseUseSwitchB(const MapObjActorInitInfo& rInfo); virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo& rInfo); - void exeRollOnA(); - void exeRollOffA(); - void exeRollOnB(); - void exeRollOffB(); - void onRollA(); - void offRollA(); - void onRollB(); - void offRollB(); + void exeRollOnA(); + void exeRollOffA(); + void exeRollOnB(); + void exeRollOffB(); + void onRollA(); + void offRollA(); + void onRollB(); + void offRollB(); }; namespace NrvQuarterRollGravityRoomArrow { @@ -31,4 +31,4 @@ namespace NrvQuarterRollGravityRoomArrow { NERVE_DECL(QuarterRollGravityRoomArrowNrvRollOffA, QuarterRollGravityRoomArrow, exeRollOffA) NERVE_DECL(QuarterRollGravityRoomArrowNrvRollOnB, QuarterRollGravityRoomArrow, exeRollOnB) NERVE_DECL(QuarterRollGravityRoomArrowNrvRollOffB, QuarterRollGravityRoomArrow, exeRollOffB) -} +} // namespace NrvQuarterRollGravityRoomArrow diff --git a/include/Game/MapObj/RailMoveObj.hpp b/include/Game/MapObj/RailMoveObj.hpp index 8ad859070..f370a3656 100644 --- a/include/Game/MapObj/RailMoveObj.hpp +++ b/include/Game/MapObj/RailMoveObj.hpp @@ -9,24 +9,23 @@ namespace { class RailMoveObj : public MapObjActor { public: - RailMoveObj(const char *); + RailMoveObj(const char*); virtual ~RailMoveObj() { - } - virtual void init(const JMapInfoIter &); - virtual void startClipped(); - virtual void endClipped(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); - virtual void initCaseUseSwitchB(const MapObjActorInitInfo &); - virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo &); - virtual void setupInitInfo(const JMapInfoIter &, MapObjActorInitInfo *); - virtual bool tryStartMove(); - virtual void startMoveInner(); - virtual void move(); - virtual void doAtEndPoint(); - virtual bool endMove(); + virtual void init(const JMapInfoIter&); + virtual void startClipped(); + virtual void endClipped(); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); + virtual void initCaseUseSwitchB(const MapObjActorInitInfo&); + virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo&); + virtual void setupInitInfo(const JMapInfoIter&, MapObjActorInitInfo*); + virtual bool tryStartMove(); + virtual void startMoveInner(); + virtual void move(); + virtual void doAtEndPoint(); + virtual bool endMove(); virtual TVec3f* getSoundCalcPos(); bool isMoving() const; @@ -34,20 +33,20 @@ public: void exeMove(); TVec3f _C4; - u8 _D0; + u8 _D0; }; class RailMoveObjPress : public RailMoveObj { public: - RailMoveObjPress(const char *); + RailMoveObjPress(const char*); virtual ~RailMoveObjPress(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); }; class RailMoveObjBreakAtEnd : public RailMoveObj { public: - RailMoveObjBreakAtEnd(const char *); + RailMoveObjBreakAtEnd(const char*); virtual ~RailMoveObjBreakAtEnd(); virtual void doAtEndPoint(); @@ -57,28 +56,28 @@ class RailMoveIndirectObj : public RailMoveObj { public: virtual ~RailMoveIndirectObj(); - virtual void connectToScene(const MapObjActorInitInfo &); + virtual void connectToScene(const MapObjActorInitInfo&); }; class RailMoveObjSwitchShadow : public RailMoveObj { public: - inline RailMoveObjSwitchShadow(const char *pName) : RailMoveObj(pName) { - + inline RailMoveObjSwitchShadow(const char* pName) + : RailMoveObj(pName) { } virtual ~RailMoveObjSwitchShadow(); - virtual void init(const JMapInfoIter &); - virtual void initCaseUseSwitchA(const MapObjActorInitInfo &); + virtual void init(const JMapInfoIter&); + virtual void initCaseUseSwitchA(const MapObjActorInitInfo&); void startOnShadow(); }; class RailDemoMoveObj : public RailMoveObj { public: - RailDemoMoveObj(const char *); + RailDemoMoveObj(const char*); virtual ~RailDemoMoveObj(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual bool tryStartMove(); virtual void startMoveInner(); virtual void move(); @@ -89,12 +88,12 @@ public: class RailRotateMoveObj : public RailMoveObj { public: - RailRotateMoveObj(const char *); + RailRotateMoveObj(const char*); virtual ~RailRotateMoveObj(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); - virtual void initCaseUseSwitchB(const MapObjActorInitInfo &); - virtual void setupInitInfo(const JMapInfoIter &, MapObjActorInitInfo *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); + virtual void initCaseUseSwitchB(const MapObjActorInitInfo&); + virtual void setupInitInfo(const JMapInfoIter&, MapObjActorInitInfo*); bool tryStartRotateAtPoint(); bool tryStartRotateBetweenPoints(); @@ -105,4 +104,4 @@ namespace NrvRailMoveObj { NERVE(HostTypeWaitForPlayerOn); NERVE(HostTypeMove); NERVE(HostTypeDone); -}; \ No newline at end of file +}; // namespace NrvRailMoveObj \ No newline at end of file diff --git a/include/Game/MapObj/RainCloud.hpp b/include/Game/MapObj/RainCloud.hpp index 288036280..87b0a0bee 100644 --- a/include/Game/MapObj/RainCloud.hpp +++ b/include/Game/MapObj/RainCloud.hpp @@ -6,15 +6,15 @@ class RainCloud : public LiveActor { public: - RainCloud(const char *); + RainCloud(const char*); virtual ~RainCloud(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void startClipped(); virtual void endClipped(); virtual void control(); - virtual void updateHitSensor(HitSensor *); - virtual void attackSensor(HitSensor *, HitSensor *); + virtual void updateHitSensor(HitSensor*); + virtual void attackSensor(HitSensor*, HitSensor*); void exeAppear(); void exeWait(); @@ -26,16 +26,16 @@ public: void updateRainCylinder(); bool isNextStartOK() const; - static void makeArchiveList(NameObjArchiveListCollector *, const JMapInfoIter &); + static void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&); - ModelObj* mCloudCylinder; // 0x8C - TPos3f _90; - TPos3f _C0; - MapPartsRailMover* mRailMover; // 0xF0 - LodCtrl* _F4; - TVec3f _F8; - f32 _104; - f32 _108; - bool mIsOnPlayer; // 0x10C - bool _10D; + ModelObj* mCloudCylinder; // 0x8C + TPos3f _90; + TPos3f _C0; + MapPartsRailMover* mRailMover; // 0xF0 + LodCtrl* _F4; + TVec3f _F8; + f32 _104; + f32 _108; + bool mIsOnPlayer; // 0x10C + bool _10D; }; diff --git a/include/Game/MapObj/ReverseGravityRoomPlanet.hpp b/include/Game/MapObj/ReverseGravityRoomPlanet.hpp index b3c912940..022ecce5c 100644 --- a/include/Game/MapObj/ReverseGravityRoomPlanet.hpp +++ b/include/Game/MapObj/ReverseGravityRoomPlanet.hpp @@ -4,11 +4,11 @@ class ReverseGravityRoomPlanet : public MapObjActor { public: - ReverseGravityRoomPlanet(const char *); + ReverseGravityRoomPlanet(const char*); virtual ~ReverseGravityRoomPlanet(); - virtual void init(const JMapInfoIter &); - virtual void initCaseUseSwitchA(const MapObjActorInitInfo &); + virtual void init(const JMapInfoIter&); + virtual void initCaseUseSwitchA(const MapObjActorInitInfo&); void exeDownStart(); void exeUpStart(); @@ -21,4 +21,4 @@ namespace NrvReverseGravityRoomPlanet { NERVE(ReverseGravityRoomPlanetNrvDownWait); NERVE(ReverseGravityRoomPlanetNrvUpStart); NERVE(ReverseGravityRoomPlanetNrvUpWait); -}; \ No newline at end of file +}; // namespace NrvReverseGravityRoomPlanet \ No newline at end of file diff --git a/include/Game/MapObj/RevolvingWay.hpp b/include/Game/MapObj/RevolvingWay.hpp index 73572898e..4040aa7d1 100644 --- a/include/Game/MapObj/RevolvingWay.hpp +++ b/include/Game/MapObj/RevolvingWay.hpp @@ -6,10 +6,10 @@ class RevolvingWay : public LiveActor { public: - RevolvingWay(const char *); + RevolvingWay(const char*); virtual ~RevolvingWay(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); virtual void calcAndSetBaseMtx(); @@ -17,6 +17,6 @@ public: void addAccelMoment(); TQuat4f _8C; - TVec3f _9C; - f32 _A8; + TVec3f _9C; + f32 _A8; }; diff --git a/include/Game/MapObj/Rock.hpp b/include/Game/MapObj/Rock.hpp index c41986b86..1b7bc7e5a 100644 --- a/include/Game/MapObj/Rock.hpp +++ b/include/Game/MapObj/Rock.hpp @@ -6,7 +6,7 @@ class RockCreator; class Rock : public LiveActor { public: - Rock(f32, const char *); + Rock(f32, const char*); enum Type { NormalRock = 0, @@ -16,73 +16,73 @@ public: }; virtual ~Rock(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void kill(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); - static s32 getAppearFrame(); - static Type getType(const JMapInfoIter &); - static s32 getAppearStarPieceNum(Type) NO_INLINE; - void initMapToolInfo(const JMapInfoIter &); - void initModel(); - void initSensor(); - void initEffect(); - bool isBreakByWall() const; - bool move(f32); - void calcBaseMtx(TPos3f *) const; - bool isInClippingRange() const; - void startSoundWanwanVoice(); - void startRollLevelSound(bool); - bool tryFreeze(const Nerve *); - void setBtkForEnvironmentMap(LiveActor *, const char *); - void rumblePadAndCamera(); - void setNerveBreak(bool); - void updateRotateX(f32); - void appearStarPiece(); - void moveOnRail(f32, f32, bool); - bool isForceInvalidBindSection() const; - bool tryBreakReachedGoal(); - void exeAppear(); - void exeAppearMoveInvalidBind(); - void exeMove(); - void exeMoveInvalidBind(); - void exeBreak(); - void exeFreeze(); + static s32 getAppearFrame(); + static Type getType(const JMapInfoIter&); + static s32 getAppearStarPieceNum(Type) NO_INLINE; + void initMapToolInfo(const JMapInfoIter&); + void initModel(); + void initSensor(); + void initEffect(); + bool isBreakByWall() const; + bool move(f32); + void calcBaseMtx(TPos3f*) const; + bool isInClippingRange() const; + void startSoundWanwanVoice(); + void startRollLevelSound(bool); + bool tryFreeze(const Nerve*); + void setBtkForEnvironmentMap(LiveActor*, const char*); + void rumblePadAndCamera(); + void setNerveBreak(bool); + void updateRotateX(f32); + void appearStarPiece(); + void moveOnRail(f32, f32, bool); + bool isForceInvalidBindSection() const; + bool tryBreakReachedGoal(); + void exeAppear(); + void exeAppearMoveInvalidBind(); + void exeMove(); + void exeMoveInvalidBind(); + void exeBreak(); + void exeFreeze(); - RockCreator* mParentCreator; // 0x8C - Type mRockType; // 0x90 - ModelObj* mBreakModel; // 0x94 - f32 _98; - u8 _9C; - bool _9D; - TVec3f _A0; - f32 _AC; - f32 _B0; - TMtx34f _B4; - TVec3f _E4; - f32 _F0; - s32 mCurrentRailPoint; // 0xF4 - TVec3f _F8; - TVec3f _104; - u32 _110; - u8 _114; - u8 _115; - u8 _116; - u8 _117; - s32 mBarkTimer; // 0x118 - u32 _11C; - TVec3f _120; + RockCreator* mParentCreator; // 0x8C + Type mRockType; // 0x90 + ModelObj* mBreakModel; // 0x94 + f32 _98; + u8 _9C; + bool _9D; + TVec3f _A0; + f32 _AC; + f32 _B0; + TMtx34f _B4; + TVec3f _E4; + f32 _F0; + s32 mCurrentRailPoint; // 0xF4 + TVec3f _F8; + TVec3f _104; + u32 _110; + u8 _114; + u8 _115; + u8 _116; + u8 _117; + s32 mBarkTimer; // 0x118 + u32 _11C; + TVec3f _120; const Nerve* _12C; - u32 _130; - u32 _134; - f32 _138; - s32 mRollSoundTimer; // 0x13C - s32 _140; + u32 _130; + u32 _134; + f32 _138; + s32 mRollSoundTimer; // 0x13C + s32 _140; }; namespace NrvRock { @@ -92,4 +92,4 @@ namespace NrvRock { NERVE_DECL(RockNrvMoveInvalidBind, Rock, Rock::exeMoveInvalidBind); NERVE_DECL(RockNrvBreak, Rock, Rock::exeBreak); NERVE_DECL(RockNrvFreeze, Rock, Rock::exeFreeze); -}; +}; // namespace NrvRock diff --git a/include/Game/MapObj/RockCreator.hpp b/include/Game/MapObj/RockCreator.hpp index fda0762fd..4df241994 100644 --- a/include/Game/MapObj/RockCreator.hpp +++ b/include/Game/MapObj/RockCreator.hpp @@ -2,4 +2,4 @@ #include "Game/LiveActor//LiveActor.hpp" -class RockCreator : public LiveActor { }; \ No newline at end of file +class RockCreator : public LiveActor {}; \ No newline at end of file diff --git a/include/Game/MapObj/RosettaChair.hpp b/include/Game/MapObj/RosettaChair.hpp index e138abdbc..86eea4f6c 100644 --- a/include/Game/MapObj/RosettaChair.hpp +++ b/include/Game/MapObj/RosettaChair.hpp @@ -4,14 +4,14 @@ class RosettaChair : public LiveActor { public: - RosettaChair(const char *); + RosettaChair(const char*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); void setDefaultPose(); void startDemo(); - TVec3f _8C; - TVec3f _98; + TVec3f _8C; + TVec3f _98; TMtx34f _A0; }; diff --git a/include/Game/MapObj/RosettaPictureBook.hpp b/include/Game/MapObj/RosettaPictureBook.hpp index 11500df56..f80d69bb0 100644 --- a/include/Game/MapObj/RosettaPictureBook.hpp +++ b/include/Game/MapObj/RosettaPictureBook.hpp @@ -28,6 +28,6 @@ public: private: /* 0x8C */ PictureBookLayout* mLayout; - /* 0x90 */ IconAButton* mIconAButton; - /* 0x94 */ bool mIsValidOpenIconAButton; + /* 0x90 */ IconAButton* mIconAButton; + /* 0x94 */ bool mIsValidOpenIconAButton; }; diff --git a/include/Game/MapObj/RotateMoveObj.hpp b/include/Game/MapObj/RotateMoveObj.hpp index 68b9d0e40..47a8e205a 100644 --- a/include/Game/MapObj/RotateMoveObj.hpp +++ b/include/Game/MapObj/RotateMoveObj.hpp @@ -4,18 +4,18 @@ class RotateMoveObj : public MapObjActor { public: - inline RotateMoveObj(const char *pName) : MapObjActor(pName) { - + inline RotateMoveObj(const char* pName) + : MapObjActor(pName) { } virtual ~RotateMoveObj(); - virtual void init(const JMapInfoIter &); - virtual void initCaseUseSwitchB(const MapObjActorInitInfo &); - virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo &); + virtual void init(const JMapInfoIter&); + virtual void initCaseUseSwitchB(const MapObjActorInitInfo&); + virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo&); - void setStateMove(); - void exeMove(); - void exeStop(); + void setStateMove(); + void exeMove(); + void exeStop(); inline void exeWaitForPlayerOn(); }; @@ -24,4 +24,4 @@ namespace NrvRotateMoveObj { NERVE_DECL_NULL(HostTypeWait); NERVE_DECL(HostTypeMove, RotateMoveObj, RotateMoveObj::exeMove); NERVE_DECL(HostTypeStop, RotateMoveObj, RotateMoveObj::exeStop); -}; \ No newline at end of file +}; // namespace NrvRotateMoveObj \ No newline at end of file diff --git a/include/Game/MapObj/SandCapsuleInsidePlanet.hpp b/include/Game/MapObj/SandCapsuleInsidePlanet.hpp index 28077dab3..b218a5449 100644 --- a/include/Game/MapObj/SandCapsuleInsidePlanet.hpp +++ b/include/Game/MapObj/SandCapsuleInsidePlanet.hpp @@ -4,11 +4,11 @@ class SandCapsuleInsidePlanet : public MapObjActor { public: - SandCapsuleInsidePlanet(const char *); + SandCapsuleInsidePlanet(const char*); virtual ~SandCapsuleInsidePlanet(); - virtual void init(const JMapInfoIter &); - virtual void initCaseUseSwitchA(const MapObjActorInitInfo &); + virtual void init(const JMapInfoIter&); + virtual void initCaseUseSwitchA(const MapObjActorInitInfo&); void startOn(); void startOff(); diff --git a/include/Game/MapObj/ScrewSwitch.hpp b/include/Game/MapObj/ScrewSwitch.hpp index 5f4563cac..310e46e0b 100644 --- a/include/Game/MapObj/ScrewSwitch.hpp +++ b/include/Game/MapObj/ScrewSwitch.hpp @@ -8,22 +8,22 @@ class ScrewSwitch : public LiveActor { public: - ScrewSwitch(const char *); + ScrewSwitch(const char*); ~ScrewSwitch(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeWait(); void exeAdjust(); void exeScrew(); - void exeEnd(); + void exeEnd(); void updateBindActorMtx(); - CollisionParts* mCollisionParts; - LiveActor* _90; + CollisionParts* mCollisionParts; + LiveActor* _90; MapObjConnector* mMapObjConnector; }; diff --git a/include/Game/MapObj/SeaBottomTriplePropeller.hpp b/include/Game/MapObj/SeaBottomTriplePropeller.hpp index 2047fec2f..52d79fc99 100644 --- a/include/Game/MapObj/SeaBottomTriplePropeller.hpp +++ b/include/Game/MapObj/SeaBottomTriplePropeller.hpp @@ -10,17 +10,17 @@ public: SeaBottomTriplePropeller(const char*); virtual ~SeaBottomTriplePropeller(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calcAnim(); virtual void control(); void exeWait(); CollisionParts* mPropellerCollision[3]; // 0x8C - AudSeKeeper* mAudSeKeeper; // 0x98 + AudSeKeeper* mAudSeKeeper; // 0x98 }; namespace NrvSeaBottomTriplePropeller { NERVE_DECL_EXE(SeaBottomTriplePropellerNrvWait, SeaBottomTriplePropeller, Wait); NERVE_DECL(SeaBottomTriplePropellerNrvBreak, SeaBottomTriplePropeller, kill); -}; \ No newline at end of file +}; // namespace NrvSeaBottomTriplePropeller \ No newline at end of file diff --git a/include/Game/MapObj/ShootingStar.hpp b/include/Game/MapObj/ShootingStar.hpp index c5623e21b..ebcca111f 100644 --- a/include/Game/MapObj/ShootingStar.hpp +++ b/include/Game/MapObj/ShootingStar.hpp @@ -6,10 +6,10 @@ static f32 zero = 0.0f; class ShootingStar : public LiveActor { public: - ShootingStar(const char *); + ShootingStar(const char*); virtual ~ShootingStar(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); void appearPreShooting(); @@ -20,13 +20,13 @@ public: TVec3f _8C; TVec3f _98; TVec3f _A4; - s32 _B0; - s32 _B4; - f32 _B8; + s32 _B0; + s32 _B4; + f32 _B8; }; namespace NrvShootingStar { NERVE(HostTypeNrvPreShooting); NERVE(HostTypeNrvShooting); NERVE(HostTypeNrvWaitForNextShoot); -}; +}; // namespace NrvShootingStar diff --git a/include/Game/MapObj/SimpleClipPartsObj.hpp b/include/Game/MapObj/SimpleClipPartsObj.hpp index f49a04efe..51f852651 100644 --- a/include/Game/MapObj/SimpleClipPartsObj.hpp +++ b/include/Game/MapObj/SimpleClipPartsObj.hpp @@ -4,16 +4,16 @@ class SimpleClipPartsObj : public MapObjActor { public: - SimpleClipPartsObj(const char *); + SimpleClipPartsObj(const char*); virtual ~SimpleClipPartsObj(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - virtual void connectToScene(const MapObjActorInitInfo &); - virtual void initCaseUseSwitchA(const MapObjActorInitInfo &); - virtual void initCaseNoUseSwitchA(const MapObjActorInitInfo &); - virtual void initCaseUseSwitchB(const MapObjActorInitInfo &); - virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo &); + virtual void connectToScene(const MapObjActorInitInfo&); + virtual void initCaseUseSwitchA(const MapObjActorInitInfo&); + virtual void initCaseNoUseSwitchA(const MapObjActorInitInfo&); + virtual void initCaseUseSwitchB(const MapObjActorInitInfo&); + virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo&); void exeWait(); }; diff --git a/include/Game/MapObj/SimpleFloaterObj.hpp b/include/Game/MapObj/SimpleFloaterObj.hpp index 1a91e0923..ce4992e8e 100644 --- a/include/Game/MapObj/SimpleFloaterObj.hpp +++ b/include/Game/MapObj/SimpleFloaterObj.hpp @@ -5,19 +5,19 @@ class SimpleFloaterObj : public LiveActor { public: - SimpleFloaterObj(const char *); + SimpleFloaterObj(const char*); virtual ~SimpleFloaterObj(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - void exeWait(); + void exeWait(); inline bool isVelocityClose() { return PSVECMag(&_90->_50) < 0.3f; } - const char* _8C; + const char* _8C; MapPartsFloatingForce* _90; - TVec3f _94; + TVec3f _94; }; namespace { diff --git a/include/Game/MapObj/SimpleMapObj.hpp b/include/Game/MapObj/SimpleMapObj.hpp index c4e025a03..04ad06f70 100644 --- a/include/Game/MapObj/SimpleMapObj.hpp +++ b/include/Game/MapObj/SimpleMapObj.hpp @@ -6,85 +6,83 @@ struct SoundEffectDataEntry { const char* objectName; // 0x0 const char* soundName; // 0x4 - f32 _8; + f32 _8; }; namespace { static SoundEffectDataEntry sSeDataTable[8] = { - { "KoopaShipSeesawStep", "SE_OJ_LV_KOOPA_SHIP_SEESAW", 0.001f }, - { "IceVolcanoBalanceStepA", "SE_OJ_LV_VOL_BAL_STEP_ROT", 0.001f }, - { "IceVolcanoBalanceStepB", "SE_OJ_LV_VOL_BAL_STEP_ROT", 0.001f }, - { "IceMountainSeesawSlipA", "SE_OJ_LV_ICE_M_SEESAW_S", 0.001f }, - { "IceMountainSeesawSlipB", "SE_OJ_LV_ICE_M_SEESAW_M", 0.001f }, - { "IceMountainSeesawSlipC", "SE_OJ_LV_ICE_M_SEESAW_L", 0.001f }, - { "IceMountainSeesawSlipD", "SE_OJ_LV_ICE_M_SEESAW_L", 0.001f }, - { "IceMountainSeesawNoSlipA", "SE_OJ_LV_ICE_M_SEESAW_S", 0.001f }, + {"KoopaShipSeesawStep", "SE_OJ_LV_KOOPA_SHIP_SEESAW", 0.001f}, + {"IceVolcanoBalanceStepA", "SE_OJ_LV_VOL_BAL_STEP_ROT", 0.001f}, + {"IceVolcanoBalanceStepB", "SE_OJ_LV_VOL_BAL_STEP_ROT", 0.001f}, + {"IceMountainSeesawSlipA", "SE_OJ_LV_ICE_M_SEESAW_S", 0.001f}, + {"IceMountainSeesawSlipB", "SE_OJ_LV_ICE_M_SEESAW_M", 0.001f}, + {"IceMountainSeesawSlipC", "SE_OJ_LV_ICE_M_SEESAW_L", 0.001f}, + {"IceMountainSeesawSlipD", "SE_OJ_LV_ICE_M_SEESAW_L", 0.001f}, + {"IceMountainSeesawNoSlipA", "SE_OJ_LV_ICE_M_SEESAW_S", 0.001f}, }; }; class SimpleMapObj : public MapObjActor { public: - SimpleMapObj(const char *pName) : MapObjActor(pName) { - + SimpleMapObj(const char* pName) + : MapObjActor(pName) { } virtual ~SimpleMapObj() { - } - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); }; class SimpleEnvironmentObj : public MapObjActor { public: - inline SimpleEnvironmentObj(const char *pName) : MapObjActor(pName) { - + inline SimpleEnvironmentObj(const char* pName) + : MapObjActor(pName) { } virtual ~SimpleEnvironmentObj(); - virtual void init(const JMapInfoIter &); - virtual void connectToScene(const MapObjActorInitInfo &); + virtual void init(const JMapInfoIter&); + virtual void connectToScene(const MapObjActorInitInfo&); }; class SimpleMapObjFarMax : public SimpleMapObj { public: - inline SimpleMapObjFarMax(const char *pName) : SimpleMapObj(pName) { - + inline SimpleMapObjFarMax(const char* pName) + : SimpleMapObj(pName) { } virtual ~SimpleMapObjFarMax() { - } - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); }; class SimpleMapObjPush : public SimpleMapObj { public: - inline SimpleMapObjPush(const char *pName) : SimpleMapObj(pName) { - + inline SimpleMapObjPush(const char* pName) + : SimpleMapObj(pName) { } virtual ~SimpleMapObjPush(); - virtual void attackSensor(HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); }; class SimpleMapObjNoSilhouetted : public SimpleMapObj { public: - inline SimpleMapObjNoSilhouetted(const char *pName) : SimpleMapObj(pName) { - + inline SimpleMapObjNoSilhouetted(const char* pName) + : SimpleMapObj(pName) { } virtual ~SimpleMapObjNoSilhouetted(); - virtual void connectToScene(const MapObjActorInitInfo &); + virtual void connectToScene(const MapObjActorInitInfo&); }; class SimpleSeesawObj : public MapObjActor { public: - SimpleSeesawObj(const char *); + SimpleSeesawObj(const char*); virtual ~SimpleSeesawObj(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); TMtx34f _C4; @@ -92,57 +90,57 @@ public: class SimpleMirrorObj : public MapObjActor { public: - SimpleMirrorObj(const char *pName, const char *a2 = nullptr, MtxPtr = nullptr); + SimpleMirrorObj(const char* pName, const char* a2 = nullptr, MtxPtr = nullptr); virtual ~SimpleMirrorObj(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calcAndSetBaseMtx(); - MtxPtr mMtx; // 0xC4 + MtxPtr mMtx; // 0xC4 }; class SimpleMirrorReflectionObj : public SimpleMapObj { public: - inline SimpleMirrorReflectionObj(const char *pName) : SimpleMapObj(pName) { - + inline SimpleMirrorReflectionObj(const char* pName) + : SimpleMapObj(pName) { } virtual ~SimpleMirrorReflectionObj(); - virtual void init(const JMapInfoIter &); - virtual void connectToScene(const MapObjActorInitInfo &); + virtual void init(const JMapInfoIter&); + virtual void connectToScene(const MapObjActorInitInfo&); }; class SimpleTextureSwitchChangeObj : public SimpleMapObj { - inline SimpleTextureSwitchChangeObj(const char *pName) : SimpleMapObj(pName) { - + inline SimpleTextureSwitchChangeObj(const char* pName) + : SimpleMapObj(pName) { } virtual ~SimpleTextureSwitchChangeObj(); - virtual void initCaseUseSwitchA(const MapObjActorInitInfo &); - virtual s32 getChangedTextureNo() const; + virtual void initCaseUseSwitchA(const MapObjActorInitInfo&); + virtual s32 getChangedTextureNo() const; void changeTexture(); }; class UFOKinokoUnderConstruction : public MapObjActor { - inline UFOKinokoUnderConstruction(const char *pName) : MapObjActor(pName) { - + inline UFOKinokoUnderConstruction(const char* pName) + : MapObjActor(pName) { } virtual ~UFOKinokoUnderConstruction(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); }; class GlaringLight : public SimpleMapObj { public: - inline GlaringLight(const char *pName) : SimpleMapObj(pName) { - + inline GlaringLight(const char* pName) + : SimpleMapObj(pName) { } virtual ~GlaringLight(); - virtual void connectToScene(const MapObjActorInitInfo &); + virtual void connectToScene(const MapObjActorInitInfo&); }; namespace MR { - void makeArchiveListUFOKinokoUnderConstruction(NameObjArchiveListCollector *, const JMapInfoIter &); + void makeArchiveListUFOKinokoUnderConstruction(NameObjArchiveListCollector*, const JMapInfoIter&); }; diff --git a/include/Game/MapObj/SimpleNormalMapObj.hpp b/include/Game/MapObj/SimpleNormalMapObj.hpp index 4a329c809..93c1ada47 100644 --- a/include/Game/MapObj/SimpleNormalMapObj.hpp +++ b/include/Game/MapObj/SimpleNormalMapObj.hpp @@ -4,9 +4,8 @@ class SimpleNormalMapObj : public NormalMapBase { public: - SimpleNormalMapObj(const char *); + SimpleNormalMapObj(const char*); virtual ~SimpleNormalMapObj(); - virtual void init(const JMapInfoIter &); - + virtual void init(const JMapInfoIter&); }; diff --git a/include/Game/MapObj/SimpleTimerObj.hpp b/include/Game/MapObj/SimpleTimerObj.hpp index c79969528..cee74947a 100644 --- a/include/Game/MapObj/SimpleTimerObj.hpp +++ b/include/Game/MapObj/SimpleTimerObj.hpp @@ -5,19 +5,19 @@ class SimpleTimerObj : public MapObjActor { public: - SimpleTimerObj(const char *); + SimpleTimerObj(const char*); virtual ~SimpleTimerObj(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void kill(); virtual void control(); void exeTimer(); - FlashingCtrl* mFlashingCtrl; // 0xC4 - s32 mTimer; // 0xC8 - s32 mTimeLeft; // 0xCC + FlashingCtrl* mFlashingCtrl; // 0xC4 + s32 mTimer; // 0xC8 + s32 mTimeLeft; // 0xCC }; namespace NrvSimpleTimerObj { diff --git a/include/Game/MapObj/SnowCapsulePlanet.hpp b/include/Game/MapObj/SnowCapsulePlanet.hpp index cf3c02684..b71b3b375 100644 --- a/include/Game/MapObj/SnowCapsulePlanet.hpp +++ b/include/Game/MapObj/SnowCapsulePlanet.hpp @@ -4,19 +4,19 @@ class SnowCapsulePlanet : public MapObjActor { public: - SnowCapsulePlanet(const char *); + SnowCapsulePlanet(const char*); virtual ~SnowCapsulePlanet(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); void exeOpen(); - CollisionParts *mDoor1; - CollisionParts *mDoor2; + CollisionParts* mDoor1; + CollisionParts* mDoor2; }; namespace NrvSnowCapsulePlanet { NERVE(SnowCapsulePlanetNrvCloseWait); NERVE(SnowCapsulePlanetNrvOpenWait); NERVE(SnowCapsulePlanetNrvOpen); -}; +}; // namespace NrvSnowCapsulePlanet diff --git a/include/Game/MapObj/SnowMan.hpp b/include/Game/MapObj/SnowMan.hpp index 74e9ece1f..8c2be182b 100644 --- a/include/Game/MapObj/SnowMan.hpp +++ b/include/Game/MapObj/SnowMan.hpp @@ -5,10 +5,10 @@ class SnowMan : public LiveActor { public: - SnowMan(const char *); + SnowMan(const char*); virtual ~SnowMan(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); virtual void control(); virtual void calcAndSetBaseMtx(); @@ -24,8 +24,8 @@ public: void exeWaitBody(); void exeWaitHead(); - CollisionParts* mHeadCollisionParts; /* 0x8C */ - CollisionParts* mBodyCollisionParts; /* 0x90 */ - AnimScaleController* mAnimScaleCtrl; /* 0x94 */ - AnimScaleParam* mAnimScaleParam; /* 0x98 */ + CollisionParts* mHeadCollisionParts; /* 0x8C */ + CollisionParts* mBodyCollisionParts; /* 0x90 */ + AnimScaleController* mAnimScaleCtrl; /* 0x94 */ + AnimScaleParam* mAnimScaleParam; /* 0x98 */ }; diff --git a/include/Game/MapObj/SnowplowSwitch.hpp b/include/Game/MapObj/SnowplowSwitch.hpp index 89d37105c..82fbf83c3 100644 --- a/include/Game/MapObj/SnowplowSwitch.hpp +++ b/include/Game/MapObj/SnowplowSwitch.hpp @@ -4,11 +4,11 @@ class SnowplowSwitch : public LiveActor { public: - SnowplowSwitch(const char *); + SnowplowSwitch(const char*); virtual ~SnowplowSwitch(); - virtual void init(const JMapInfoIter &); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void init(const JMapInfoIter&); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); u8 _8C; }; \ No newline at end of file diff --git a/include/Game/MapObj/SoundEmitter.hpp b/include/Game/MapObj/SoundEmitter.hpp index df5ddee59..0b33ebe3f 100644 --- a/include/Game/MapObj/SoundEmitter.hpp +++ b/include/Game/MapObj/SoundEmitter.hpp @@ -4,16 +4,16 @@ class JAISoundID; -class SoundEmitter: public LiveActor { +class SoundEmitter : public LiveActor { public: - SoundEmitter(const char *); + SoundEmitter(const char*); virtual ~SoundEmitter(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); void exePlaySound(); void exeStandBy(); - + s32 _8C; }; diff --git a/include/Game/MapObj/SpaceMine.hpp b/include/Game/MapObj/SpaceMine.hpp index 6fcdbd35c..7e747511e 100644 --- a/include/Game/MapObj/SpaceMine.hpp +++ b/include/Game/MapObj/SpaceMine.hpp @@ -4,14 +4,14 @@ class SpaceMine : public MapObjActor { public: - SpaceMine(const char *); + SpaceMine(const char*); virtual ~SpaceMine(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void kill(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); bool isCalcShadowAlways() const; void exeWait(); @@ -21,13 +21,13 @@ public: return val > -1 && val < 2; } - f32 _C4; - TVec3f mClippingRange; // 0xC8 - s32 _D4; // Obj_arg0 - u8 _D8; + f32 _C4; + TVec3f mClippingRange; // 0xC8 + s32 _D4; // Obj_arg0 + u8 _D8; }; namespace NrvSpaceMine { NERVE(HostTypeWait); NERVE(HostTypeAppear); -}; \ No newline at end of file +}; // namespace NrvSpaceMine \ No newline at end of file diff --git a/include/Game/MapObj/SphereRailDash.hpp b/include/Game/MapObj/SphereRailDash.hpp index 92ede40a0..3a69329a0 100644 --- a/include/Game/MapObj/SphereRailDash.hpp +++ b/include/Game/MapObj/SphereRailDash.hpp @@ -4,27 +4,27 @@ class SphereRailDash : public LiveActor { public: - SphereRailDash(const char *); + SphereRailDash(const char*); virtual ~SphereRailDash(); - virtual void init(const JMapInfoIter &); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void init(const JMapInfoIter&); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeWait(); void exeRailMove(); HitSensor* _8C; - TVec3f _90; - f32 _9C; - f32 _A0; - TVec3f _A4; - f32 _B0; - f32 _B4; - f32 _B8; - u32 _BC; + TVec3f _90; + f32 _9C; + f32 _A0; + TVec3f _A4; + f32 _B0; + f32 _B4; + f32 _B8; + u32 _BC; }; namespace NrvSphereRailDash { NERVE(SphereRailDashNrvWait); NERVE(SphereRailDashNrvRailMove); -}; \ No newline at end of file +}; // namespace NrvSphereRailDash \ No newline at end of file diff --git a/include/Game/MapObj/SpiderMapBlock.hpp b/include/Game/MapObj/SpiderMapBlock.hpp index dc34566ce..487650585 100644 --- a/include/Game/MapObj/SpiderMapBlock.hpp +++ b/include/Game/MapObj/SpiderMapBlock.hpp @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Game/LiveActor/LiveActor.hpp" @@ -7,7 +7,7 @@ public: SpiderMapBlock(const char*); virtual ~SpiderMapBlock(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); diff --git a/include/Game/MapObj/SpinDriver.hpp b/include/Game/MapObj/SpinDriver.hpp index 2a080622d..d4281e335 100644 --- a/include/Game/MapObj/SpinDriver.hpp +++ b/include/Game/MapObj/SpinDriver.hpp @@ -7,25 +7,25 @@ namespace { static s32 cSpaceFlyStartFrame = 0xA; static s32 cSpaceFlyEndFrame = 0x32; -}; +}; // namespace class SpinDriver : public LiveActor { public: - SpinDriver(const char *); + SpinDriver(const char*); virtual ~SpinDriver(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void appear(); virtual void makeActorAppeared(); virtual void makeActorDead(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void initParamFromJMapInfo(const JMapInfoIter &); - void initShootPath(const JMapInfoIter &); - void initEventCamera(const JMapInfoIter &); + void initParamFromJMapInfo(const JMapInfoIter&); + void initShootPath(const JMapInfoIter&); + void initEventCamera(const JMapInfoIter&); bool tryStartShoot(); bool tryEndCapture(); bool tryShoot(); @@ -40,50 +40,50 @@ public: void exeShootStart(); void exeShoot(); void exeCoolDown(); - bool startBind(HitSensor *); + bool startBind(HitSensor*); void cancelBind(); void updateBindPosition(); void moveBindPosToCenter(); void updateBindActorMatrix(f32); void calcBindActorMatrix(); void calcParabolicBindPose(); - void turnBindHead(const TVec3f &, f32); + void turnBindHead(const TVec3f&, f32); void calcShootMotionTime(); void startCamera(); void updateCamera(); void cancelCamera(); void endCamera(); bool canStartBind() const NO_INLINE; - bool canBind(HitSensor *) const; + bool canBind(HitSensor*) const; - LiveActor* _8C; + LiveActor* _8C; SpinDriverShootPath* mShootPath; // 0x90 - SpinDriverCamera* mSpinDriverCamera; // 0x94 - TQuat4f _98; - TQuat4f _A8; - TVec3f _B8; - TVec3f _C4; - TVec3f _D0; - TVec3f _DC; - TVec3f _E8; - TVec3f _F4; - f32 _100; - f32 _104; - f32 _108; - TVec3f _10C; - f32 _118; - f32 _11C; - f32 _120; - s32 _124; - u32 _128; - u32 _12C; - u32 _130; - f32 _134; - u8 _138; - s32 _13C; - bool _140; - u8 _141; - bool _142; + SpinDriverCamera* mSpinDriverCamera; // 0x94 + TQuat4f _98; + TQuat4f _A8; + TVec3f _B8; + TVec3f _C4; + TVec3f _D0; + TVec3f _DC; + TVec3f _E8; + TVec3f _F4; + f32 _100; + f32 _104; + f32 _108; + TVec3f _10C; + f32 _118; + f32 _11C; + f32 _120; + s32 _124; + u32 _128; + u32 _12C; + u32 _130; + f32 _134; + u8 _138; + s32 _13C; + bool _140; + u8 _141; + bool _142; }; namespace NrvSpinDriver { @@ -95,4 +95,4 @@ namespace NrvSpinDriver { NERVE(SpinDriverNrvShootStart); NERVE(SpinDriverNrvShoot); NERVE(SpinDriverNrvCoolDown); -}; \ No newline at end of file +}; // namespace NrvSpinDriver \ No newline at end of file diff --git a/include/Game/MapObj/SpinDriverCamera.hpp b/include/Game/MapObj/SpinDriverCamera.hpp index 2b0dfd543..9467e87eb 100644 --- a/include/Game/MapObj/SpinDriverCamera.hpp +++ b/include/Game/MapObj/SpinDriverCamera.hpp @@ -7,20 +7,20 @@ class SpinDriverCamera { public: SpinDriverCamera(); - void startAppearCamera(LiveActor *, const TVec3f &, const TVec3f &, const TVec3f &); - void endAppearCamera(LiveActor *); - u32 getAppearCameraFrames() const; - void start(const TVec3f &, const TVec3f &, const TVec3f &); - void update(const TVec3f &, const TVec3f &); + void startAppearCamera(LiveActor*, const TVec3f&, const TVec3f&, const TVec3f&); + void endAppearCamera(LiveActor*); + u32 getAppearCameraFrames() const; + void start(const TVec3f&, const TVec3f&, const TVec3f&); + void update(const TVec3f&, const TVec3f&); void cancel(); void end(); - void updateTargetMatrix(const TVec3f &, const TVec3f &); - BOOL isUseAppearCamera(LiveActor *) const; - void init(const JMapInfoIter &, LiveActor *); - void initAppearCamera(const JMapInfoIter &, LiveActor *); + void updateTargetMatrix(const TVec3f&, const TVec3f&); + BOOL isUseAppearCamera(LiveActor*) const; + void init(const JMapInfoIter&, LiveActor*); + void initAppearCamera(const JMapInfoIter&, LiveActor*); - MultiEventCamera* mCamera; // 0x0 - CameraTargetMtx* mTargetMtx; // 0x4 - ActorCameraInfo* mCameraInfo; // 0x8 - u32 mAppearCameraFrame; // 0xC + MultiEventCamera* mCamera; // 0x0 + CameraTargetMtx* mTargetMtx; // 0x4 + ActorCameraInfo* mCameraInfo; // 0x8 + u32 mAppearCameraFrame; // 0xC }; \ No newline at end of file diff --git a/include/Game/MapObj/SpinDriverOperateRing.hpp b/include/Game/MapObj/SpinDriverOperateRing.hpp index 9db6c7bb6..1de99a8ce 100644 --- a/include/Game/MapObj/SpinDriverOperateRing.hpp +++ b/include/Game/MapObj/SpinDriverOperateRing.hpp @@ -4,37 +4,37 @@ class SpinDriverOperateRing : public LiveActor { public: - SpinDriverOperateRing(const char *); + SpinDriverOperateRing(const char*); virtual ~SpinDriverOperateRing(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); void setRadiusRate(f32); void reset(); - void update(const TVec3f &, const TVec3f &); + void update(const TVec3f&, const TVec3f&); void updatePosition(); - void updateControlPoint(const TVec3f &); - void updateDirection(const TVec3f &); + void updateControlPoint(const TVec3f&); + void updateDirection(const TVec3f&); void resetVelocityAndTrans(); - void addAccelToOperatePlane(const TVec3f &); - void addAccelOperate(TVec3f *, const TVec3f &); + void addAccelToOperatePlane(const TVec3f&); + void addAccelOperate(TVec3f*, const TVec3f&); void addAccelToCenter(); void attenuateVelocity(); - void calcOperatePowerByPDP(TVec3f *) const; + void calcOperatePowerByPDP(TVec3f*) const; TVec3f _8C; TVec3f _98; TVec3f _A4; TVec3f mAccelerate; // 0xB0 TVec3f mDirection; // 0xBC - f32 _C8; - f32 _CC; - f32 _D0; - f32 mRadiusRate; // 0xD4 - f32 _D8; - f32 _DC; - u32 _E0; + f32 _C8; + f32 _CC; + f32 _D0; + f32 mRadiusRate; // 0xD4 + f32 _D8; + f32 _DC; + u32 _E0; }; namespace NrvSpinDriverOperateRing { diff --git a/include/Game/MapObj/SpinDriverPathDrawer.hpp b/include/Game/MapObj/SpinDriverPathDrawer.hpp index 6a91ea77e..a5f816f1f 100644 --- a/include/Game/MapObj/SpinDriverPathDrawer.hpp +++ b/include/Game/MapObj/SpinDriverPathDrawer.hpp @@ -16,45 +16,45 @@ public: JUTTexture* mGreenTexture; // 0x10 JUTTexture* mPinkTexture; // 0x14 JUTTexture* mMaskTexture; // 0x18 - bool mIsPathAtOpa; // 0x1C + bool mIsPathAtOpa; // 0x1C }; class SpinDriverPathDrawer : public LiveActor { public: - SpinDriverPathDrawer(SpinDriverShootPath *); + SpinDriverPathDrawer(SpinDriverShootPath*); virtual ~SpinDriverPathDrawer(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void draw() const; - s32 calcPositionCount(f32, f32) const; + s32 calcPositionCount(f32, f32) const; void initPositionList(f32, f32); void initClipping(); void initPathEnd(); - f32 calcDrawCode() const; - f32 calcDrawBaseCode() const; + f32 calcDrawCode() const; + f32 calcDrawBaseCode() const; void setCoord(f32); void setColorNormal(); void setColorGreen(); void setColorPink(); void setMaskLength(f32); void setFadeScale(f32); - void sendPoint(const TVec3f &, f32, f32); + void sendPoint(const TVec3f&, f32, f32); - SpinDriverShootPath* mShootPath; // 0x8C - TVec3f* _90; - TVec3f* _94; - TVec3f* _98; - void* _9C; - s32 mPositionCount; // 0xA0 - u32 _A4; - u32 _A8; - f32 _AC; - f32 _B0; - s32 mColor; // 0xB4 - f32 _B8; - f32 mFadeScale; // 0xBC - f32 mMaskLength; // 0xC0 + SpinDriverShootPath* mShootPath; // 0x8C + TVec3f* _90; + TVec3f* _94; + TVec3f* _98; + void* _9C; + s32 mPositionCount; // 0xA0 + u32 _A4; + u32 _A8; + f32 _AC; + f32 _B0; + s32 mColor; // 0xB4 + f32 _B8; + f32 mFadeScale; // 0xBC + f32 mMaskLength; // 0xC0 }; namespace MR { @@ -64,4 +64,4 @@ namespace MR { bool isDrawSpinDriverPathAtOpa(); void onDrawSpinDriverPathAtOpa(); void offDrawSpinDriverPathAtOpa(); -}; \ No newline at end of file +}; // namespace MR \ No newline at end of file diff --git a/include/Game/MapObj/SpinDriverShootPath.hpp b/include/Game/MapObj/SpinDriverShootPath.hpp index 46cc0ccb9..e072830f9 100644 --- a/include/Game/MapObj/SpinDriverShootPath.hpp +++ b/include/Game/MapObj/SpinDriverShootPath.hpp @@ -8,17 +8,17 @@ class SpinDriverShootPath { public: SpinDriverShootPath(); - void init(const JMapInfoIter &); - void initUsingParabolic(const JMapInfoIter &, const TVec3f &); - void setStartPosition(const TVec3f &); - void calcPosition(TVec3f *, f32) const; - void calcDirection(TVec3f *, f32, f32) const; - void calcInitPose(TVec3f *, TVec3f *, TVec3f *, f32) const; - f32 getTotalLength() const; - void calcClippingInfo(TVec3f *, f32 *, f32, f32); + void init(const JMapInfoIter&); + void initUsingParabolic(const JMapInfoIter&, const TVec3f&); + void setStartPosition(const TVec3f&); + void calcPosition(TVec3f*, f32) const; + void calcDirection(TVec3f*, f32, f32) const; + void calcInitPose(TVec3f*, TVec3f*, TVec3f*, f32) const; + f32 getTotalLength() const; + void calcClippingInfo(TVec3f*, f32*, f32, f32); - RailRider* mRailRider; // 0x0 - ParabolicPath* mPath; // 0x4 - TVec3f mStartPosition; // 0x8 - bool mUsesParabolic; // 0x14 + RailRider* mRailRider; // 0x0 + ParabolicPath* mPath; // 0x4 + TVec3f mStartPosition; // 0x8 + bool mUsesParabolic; // 0x14 }; \ No newline at end of file diff --git a/include/Game/MapObj/SpinDriverUtil.hpp b/include/Game/MapObj/SpinDriverUtil.hpp index 37ece8f42..b7401fc08 100644 --- a/include/Game/MapObj/SpinDriverUtil.hpp +++ b/include/Game/MapObj/SpinDriverUtil.hpp @@ -4,5 +4,5 @@ class SpinDriverUtil { public: - static void setShadowAndClipping(LiveActor *, TVec3f *, f32, f32, f32 *); + static void setShadowAndClipping(LiveActor*, TVec3f*, f32, f32, f32*); }; \ No newline at end of file diff --git a/include/Game/MapObj/SpinLeverSwitch.hpp b/include/Game/MapObj/SpinLeverSwitch.hpp index 8243dd4ca..1606ce9b2 100644 --- a/include/Game/MapObj/SpinLeverSwitch.hpp +++ b/include/Game/MapObj/SpinLeverSwitch.hpp @@ -5,23 +5,23 @@ class SpinLeverSwitch : public LiveActor { public: - SpinLeverSwitch(const char *); + SpinLeverSwitch(const char*); virtual ~SpinLeverSwitch(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver); + virtual void attackSensor(HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); void exeWait(); void exeSwitchOn(); - - MapObjConnector *mConnector; //_8C + + MapObjConnector* mConnector; //_8C }; namespace NrvSpinLeverSwitch { NERVE(SpinLeverSwitchNrvWait); NERVE(SpinLeverSwitchNrvSwitchOn); NERVE(SpinLeverSwitchNrvEnd); -}; +}; // namespace NrvSpinLeverSwitch diff --git a/include/Game/MapObj/StageEffectDataTable.hpp b/include/Game/MapObj/StageEffectDataTable.hpp index 0a4fa59c2..e15b01bfb 100644 --- a/include/Game/MapObj/StageEffectDataTable.hpp +++ b/include/Game/MapObj/StageEffectDataTable.hpp @@ -6,12 +6,12 @@ class NameObj; class LiveActor; struct StageEffectSoundData { - const char* objectName; // 0x0 - const char* startSoundEffect; // 0x4 - const char* movingSoundEffect; // 0x8 - const char* stopSoundEffect; // 0xC - u32 stopSoundEffectSteps; // 0x10 - s32 soundEffectType; // 0x14 + const char* objectName; // 0x0 + const char* startSoundEffect; // 0x4 + const char* movingSoundEffect; // 0x8 + const char* stopSoundEffect; // 0xC + u32 stopSoundEffectSteps; // 0x10 + s32 soundEffectType; // 0x14 }; namespace { @@ -24,192 +24,191 @@ namespace { }; static StageEffectSoundData sStageEffectSeDataTable[0x9B] = { - { "LavaHomeVolcanoInnerFlow", 0, "SE_OJ_LV_LAVA_INCREASE_HOME", 0, 0xffffffff, 0 }, - { "LavaRotatePlanetStartStep", "SE_OJ_LAVA_BR_ROCK_L_ON", "SE_OJ_LV_LAVA_BR_ROCK_L_MV", 0, 0xffffffff, 0 }, - { "OceanRingRuinsMove", "SE_OJ_OCN_RUIN_MOVE_START", "SE_OJ_LV_OCN_RUIN_MOVE", "SE_OJ_OCN_RUIN_STOP", 0xffffffff, 0 }, - { "OceanRingRuinsGearBig", "SE_OJ_OCN_RUIN_GEAR_L_ST", "SE_OJ_LV_OCN_RUIN_MOVE", "SE_OJ_OCN_RUIN_GEAR_L_END", 0xffffffff, 0 }, - { "OceanRingRuinsGearSmall", 0, "SE_OJ_LV_OCN_RUIN_GEAR_S_MV", 0, 0xffffffff, 0 }, - { "OceanRotateBridge", "SE_OJ_O_ROTATE_BRIDGE_ST", "SE_OJ_LV_O_ROTATE_BRIDGE_MV", "SE_OJ_O_ROTATE_BRIDGE_END", 0xffffffff, 2 }, - { "ShutterDoorA", 0, "SE_OJ_LV_SHUTTER_DOOR_MOVE", "SE_OJ_SHUTTER_DOOR_STOP", 0xffffffff, 0 }, - { "OceanSwingBoard", "SE_OJ_O_SWG_BOARD_MOVE_ST", "SE_OJ_LV_O_SWG_BOARD_MOVE", 0, 0xffffffff, 0 }, - { "RotateNutStep", 0, "SE_OJ_LV_ROTATE_NUT_MOVE", 0, 0xffffffff, 0 }, - { "OceanFloaterTowerRotateStepA", "SE_OJ_O_TOWER_ROTATE_START", "SE_OJ_LV_O_TOWER_ROTATE_MV", 0, 0xffffffff, 1 }, - { "OceanFloaterTowerRotateStepB", "SE_OJ_O_TOWER_ROTATE_START", "SE_OJ_LV_O_TOWER_ROTATE_MV", 0, 0xffffffff, 1 }, - { "OceanFloaterTowerRotateStepC", "SE_OJ_O_TOWER_ROTATE_START", "SE_OJ_LV_O_TOWER_ROTATE_MV", 0, 0xffffffff, 0 }, - { "OceanFloaterTowerRotateStepD", "SE_OJ_O_TOWER_ROTATE_START", "SE_OJ_LV_O_TOWER_ROTATE_MV", 0, 0xffffffff, 0 }, - { "OceanAppearBridge", "SE_OJ_O_APPEAR_BRDG_APPEAR", 0, 0, 0xffffffff, 0 }, - { "OnimasuPlanetRotatePartsA", 0, "SE_OJ_LV_STONE_ROTATOR_MOVE", 0, 0xffffffff, 0 }, - { "OnimasuPlanetRotatePartsB", 0, "SE_OJ_LV_STONE_ROTATOR_MOVE", 0, 0xffffffff, 0 }, - { "OnimasuPlanetRailMovePartsA", "SE_OJ_STONE_FLOOR_START", "SE_OJ_LV_STONE_FLOOR_MOVE", "SE_OJ_STONE_FLOOR_END", 0xffffffff, 0 }, - { "GhostShipCaveMoveGroundA", "SE_OJ_PTM_GROUND_START", "SE_OJ_LV_PTM_GROUND_MOVE", "SE_OJ_PTM_GROUND_STOP", 0xffffffff, 0 }, - { "GhostShipCaveMoveGroundB", "SE_OJ_PTM_GROUND_START", "SE_OJ_LV_PTM_GROUND_MOVE", "SE_OJ_PTM_GROUND_STOP", 0xffffffff, 0 }, - { "WaterRoadCaveStepA", "SE_OJ_W_RD_CAVE_STEP_ST", "SE_OJ_LV_W_RD_CAVE_STEP_MV", "SE_OJ_W_RD_CAVE_STEP_ED", 0xffffffff, 0 }, - { "LavaBreakColumn", "SE_OJ_LAVA_COLUMN_FALL_ST", "SE_OJ_LV_LAVA_COLUMN_FALL", 0, 0x4b, 0 }, - { "LavaBreakRockA", "SE_OJ_LAVA_BR_ROCK_H_ON", "SE_OJ_LV_LAVA_BR_ROCK_H_MV", 0, 0xffffffff, 0 }, - { "LavaBreakRockB", "SE_OJ_LAVA_BR_ROCK_S_ON", "SE_OJ_LV_LAVA_BR_ROCK_S_MV", 0, 0xffffffff, 0 }, - { "LavaBreakRockC", "SE_OJ_LAVA_BR_ROCK_L_ON", "SE_OJ_LV_LAVA_BR_ROCK_L_MV", 0, 0xffffffff, 0 }, - { "LavaBreakRockD", "SE_OJ_LAVA_BR_ROCK_S_ON", "SE_OJ_LV_LAVA_BR_ROCK_S_MV", 0, 0xffffffff, 0 }, - { "LavaFallDownColumnA", "SE_OJ_LAVA_COLUMN_FALL_1", 0, 0, 0xffffffff, 0 }, - { "LavaFallDownColumnB", "SE_OJ_LAVA_COLUMN_FALL_2", 0, 0, 0xffffffff, 0 }, - { "OceanHomeTopRock", 0, 0, 0, 0xffffffff, 0 }, - { "WaterWheelGear", 0, "SE_OJ_LV_W_WHEEL_GEAR_MOVE", 0, 0xffffffff, 0 }, - { "TeresaRoomDoor", "SE_OJ_TERESA_ROOM_DOOR_OPEN", 0, 0, 0xffffffff, 0 }, - { "WaterPowerStream", "SE_OJ_W_POWER_STREAM_ST", "SE_OJ_LV_W_POWER_STREAM_MV", 0, 0xffffffff, 0 }, - { "LavaObstacleRockShell", "SE_OJ_LAVA_OB_ROCK_S_ON", "SE_OJ_LV_LAVA_OB_ROCK_S_MV", "SE_OJ_LAVA_OB_ROCK_S_STOP", 0x122, 0 }, - { "LavaObstacleRockHomeA", "SE_OJ_LAVA_OB_ROCK_A_ON", "SE_OJ_LV_LAVA_OB_ROCK_A_MV", "SE_OJ_LAVA_OB_ROCK_A_STOP", 0xd2, 0 }, - { "LavaObstacleRockHomeB", 0, "SE_OJ_LV_LAVA_OB_ROCK_B_MV", "SE_OJ_LAVA_OB_ROCK_B_STOP", 0x118, 0 }, - { "UFOKinoko", 0, "SE_OJ_LV_UFO_KINOKO_ROTATE", 0, 0xffffffff, 0 }, - { "PhantomShipPropellerSmall", 0, "SE_OJ_LV_P_SHIP_PROPELLER_S", 0, 0xffffffff, 0 }, - { "PhantomShipPropellerBig", 0, "SE_OJ_LV_P_SHIP_PROPELLER_L", 0, 0xffffffff, 0 }, - { "ForestAppearStepA", "SE_OJ_FOREST_STEP_APPEAR", 0, 0, 0xffffffff, 0 }, - { "ForestObstacleWoodA", "SE_OJ_FOREST_OBS_WOOD_ON", "SE_OJ_LV_FOREST_OBS_WOOD_MV", "SE_OJ_FOREST_OBS_WOOD_STOP", 0x78, 2 }, - { "RGTowerPressGroundA", "SE_OJ_STONE_FLOOR_S_START", "SE_OJ_LV_STONE_FLOOR_S_MOVE", "SE_OJ_STONE_FLOOR_S_END", 0xffffffff, 0 }, - { "TeresaMansionEntranceDoor", 0, 0, "SE_OJ_P_ROOM_DOOR_L_CL_ST", 0xffffffff, 0 }, - { "BattleShipMovePartsA", 0, "SE_OJ_LV_METAL_ROTATOR_MOVE", 0, 0xffffffff, 0 }, - { "ReverseGravityRoomPressGroundA", "SE_OJ_METAL_FLOOR_S_START", "SE_OJ_LV_METAL_FLOOR_S_MOVE", "SE_OJ_METAL_FLOOR_S_STOP", 0xffffffff, 0 }, - { "ReverseGravityRoomPressGroundB", "SE_OJ_METAL_FLOOR_L_START", "SE_OJ_LV_METAL_FLOOR_L_MOVE", "SE_OJ_METAL_FLOOR_L_STOP", 0xffffffff, 0 }, - { "ShutterDoorB", "SE_OJ_METAL_FLOOR_L_START", "SE_OJ_LV_METAL_FLOOR_L_MOVE", "SE_OJ_METAL_FLOOR_L_STOP", 0xffffffff, 2 }, - { "TeresaMansionHoleCover", 0, 0, "SE_OJ_STRANGEROCK_BREAK_S", 0xffffffff, 0 }, - { "KoopaStatue", 0, 0, "SE_OJ_STRANGEROCK_BREAK_S", 0xffffffff, 2 }, - { "TeresaRacePartsA", 0, "SE_OJ_LV_TR_RACE_ROTATER", 0, 0xffffffff, 0 }, - { "TeresaRacePartsB", "SE_OJ_TR_RACE_PARTS_BOUND", 0, 0, 0xffffffff, 0 }, - { "BeeWallClimbPartsA", 0, "SE_OJ_LV_BEE_WALL_MOVE", "SE_OJ_BEE_WALL_STOP", 0xffffffff, 0 }, - { "ShutterDoorC", "SE_OJ_FENCE_SHUTTER_START", "SE_OJ_LV_FENCE_SHUTTER_MOVE", "SE_OJ_FENCE_SHUTTER_STOP", 0xae, 2 }, - { "ShutterDoorD", "SE_OJ_FENCE_SHUTTER_S_ST", "SE_OJ_LV_FENCE_SHUTTER_S_MV", "SE_OJ_FENCE_SHUTTER_S_ED", 0xb4, 0 }, - { "IcicleRock", 0, 0, "SE_OJ_STRANGEROCK_BREAK_S", 0xffffffff, 0 }, - { "QuestionBoxMoveStepA", 0, "SE_OJ_LV_Q_BOX_ROTATE", 0, 0xffffffff, 0 }, - { "QuestionBoxMoveStepB", 0, "SE_OJ_LV_Q_BOX_RAIL_MOVE", 0, 0xffffffff, 0 }, - { "QuestionBoxMoveStepC", 0, "SE_OJ_LV_Q_BOX_RAIL_UD", "SE_OJ_Q_BOX_RAIL_UD_STOP", 0xffffffff, 0 }, - { "KoopaVS1PartsMoveStepA", "SE_OJ_KOOPA_F_LIFT_ST", "SE_OJ_LV_KOOPA_F_LIFT_MV", "SE_OJ_KOOPA_F_LIFT_ED", 0xffffffff, 0 }, - { "KoopaVS1PartsMoveStepB", "SE_OJ_KOOPA_F_LIFT_ST", "SE_OJ_LV_KOOPA_F_LIFT_MV", "SE_OJ_KOOPA_F_LIFT_ED", 0xffffffff, 0 }, - { "KoopaVS1PartsRotateMoveStepA", "SE_OJ_KOOPA_F_R_LIFT_ST", "SE_OJ_LV_KOOPA_F_R_LIFT_MV", "SE_OJ_KOOPA_F_R_LIFT_ED", 0xffffffff, 0 }, - { "KoopaVS1PartsRotateMoveStepB", "SE_OJ_KOOPA_F_R_LIFT_ST", "SE_OJ_LV_KOOPA_F_R_LIFT_MV", "SE_OJ_KOOPA_F_R_LIFT_ED", 0xffffffff, 0 }, - { "SideSpikeMoveStepA", "SE_OJ_SIDE_SPIKE_STEP_ST", "SE_OJ_LV_SIDE_SPIKE_STEP_MV", "SE_OJ_SIDE_SPIKE_STEP_ED", 0xffffffff, 0 }, - { "PhantomTowerMoveStepA", "SE_OJ_STONE_FLOOR_S_START", "SE_OJ_LV_STONE_FLOOR_S_MOVE", "SE_OJ_STONE_FLOOR_S_END", 0xffffffff, 0 }, - { "IceVolcanoAppearStepA", "SE_OJ_VOL_APPEAR_STEP_ST", "SE_OJ_LV_VOL_APPEAR_STEP_MV", "SE_OJ_VOL_APPEAR_STEP_ED", 0xda, 2 }, - { "IceVolcanoClimbingWall", "SE_OJ_VOL_CLIMB_WALL_ST", "SE_OJ_LV_VOL_CLIMB_WALL_MV", "SE_OJ_VOL_CLIMB_WALL_ED", 0x1ca, 2 }, - { "IceUpDownShutterDoorA", "SE_OJ_MTL_SHUTTER_S_ST", "SE_OJ_LV_MTL_SHUTTER_S_MV", "SE_OJ_MTL_SHUTTER_S_ED", 0x90, 2 }, - { "IceVolcanoMoveStepA", 0, "SE_OJ_LV_VOL_MOVE_STEP_FLOW", 0, 0xffffffff, 0 }, - { "HopperBeltConveyerRotatePartsA", 0, "SE_OJ_LV_HOPPER_CONVEYER_MV", 0, 0xffffffff, 0 }, - { "HopperBeltConveyerMovePartsA", 0, "SE_OJ_LV_HOPPER_CONVEYER_MV", 0, 0xffffffff, 0 }, - { "MechaKoopaPartsCaterpillar", 0, "SE_OJ_LV_M_KOOPA_CATER_L_MV", 0, 0xffffffff, 0 }, - { "BroadBeanMoveStepA", "SE_OJ_STONE_FLOOR_S_START", "SE_OJ_LV_STONE_FLOOR_S_MOVE", "SE_OJ_STONE_FLOOR_S_END", 0xffffffff, 0 }, - { "BroadBeanMoveStepB", "SE_OJ_STONE_FLOOR_S_START", "SE_OJ_LV_STONE_FLOOR_S_MOVE", "SE_OJ_STONE_FLOOR_S_END", 0xffffffff, 0 }, - { "RayGunPlanetPartsGear", 0, "SE_OJ_LV_RAYGUN_GEAR_ROT", 0, 0xffffffff, 0 }, - { "RayGunPlanetPartsScrew", 0, "SE_OJ_LV_RAYGUN_SCREW_ROT", "SE_OJ_RAYGUN_SCREW_STOP", 0xffffffff, 2 }, - { "SandStreamHighTowerMoveStepA", "SE_OJ_STONE_FLOOR_S_START", "SE_OJ_LV_STONE_FLOOR_S_MOVE", "SE_OJ_STONE_FLOOR_S_END", 0xffffffff, 0 }, - { "MechaKoopaPartsRollerA", 0, "SE_OJ_LV_M_KOOPA_CATER_S_MV", 0, 0xffffffff, 0 }, - { "MiniMechaKoopaPartsGear", 0, "SE_OJ_LV_MM_KOOPA_GEAR_ROT", 0, 0xffffffff, 0 }, - { "MiniMechaKoopaPartsCage", "SE_OJ_MM_KOOPA_CAGE_START", "SE_OJ_LV_MM_KOOPA_CAGE_ROT", "SE_OJ_MM_KOOPA_CAGE_STOP", 0xffffffff, 2 }, - { "MiniMechaKoopaPartsMoveStepA", "SE_OJ_MM_KOOPA_STEP_START", "SE_OJ_LV_MM_KOOPA_STEP_MOVE", "SE_OJ_MM_KOOPA_STEP_STOP", 0xffffffff, 2 }, - { "AsteroidBlockRotateStepA", 0, "SE_OJ_LV_AST_BLOCK_ROTATE", 0, 0xffffffff, 0 }, - { "SandUpDownTowerBreakableWallA", 0, 0, "SE_OJ_WOOD_WALL_BREAK", 0xffffffff, 0 }, - { "SandUpDownTowerBreakableWallB", 0, 0, "SE_OJ_WOOD_WALL_BREAK", 0xffffffff, 0 }, - { "HoleDeathSandMoveStepA", "SE_OJ_SAND_MOVE_STEP_ST", "SE_OJ_LV_SAND_MOVE_STEP_MV", "SE_OJ_SAND_MOVE_STEP_ED", 0xffffffff, 0 }, - { "CannonFortressMoveWall", "SE_OJ_CNFORT_MOVEWALL_ST", "SE_OJ_LV_CNFORT_MOVEWALL_MV", "SE_OJ_CNFORT_MOVEWALL_ED", 0xffffffff, 0 }, - { "MechaKoopaPartsBreast", "SE_OJ_M_KOOPA_BREAST_START", "SE_OJ_LV_M_KOOPA_BREAST_MV", "SE_OJ_M_KOOPA_BREAST_BREAK", 0xffffffff, 1 }, - { "ChoConveyorMoveChocoA", 0, "SE_OJ_LV_CHOCONVEYER_MOVE", 0, 0xffffffff, 0 }, - { "MechaKoopaPartsCollar", 0, "SE_OJ_LV_M_KOOPA_COLLAR_ROT", 0, 0xffffffff, 0 }, - { "MechaKoopaPartsMoveStepA", "SE_OJ_M_KOOPA_MV_STEP_ST", "SE_OJ_LV_M_KOOPA_MV_STEP_MV", "SE_OJ_M_KOOPA_MV_STEP_ED", 0xffffffff, 0 }, - { "ChoConveyorPlanetD", 0, "SE_OJ_LV_CHO_CONVEYOR_PLN_D", 0, 0xffffffff, 0 }, - { "SeaBottomBigDoorA", "SE_OJ_SEABTM_B_DOOR_START", "SE_OJ_LV_SEABTM_B_DOOR_MOVE", "SE_OJ_SEABTM_B_DOOR_STOP", 0xffffffff, 0 }, - { "SeaBottomBigDoorB", "SE_OJ_SEABTM_B_DOOR_START", "SE_OJ_LV_SEABTM_B_DOOR_MOVE", "SE_OJ_SEABTM_B_DOOR_STOP", 0xffffffff, 0 }, - { "SeaBottomBigDoorC", "SE_OJ_SEABTM_DOOR_C_START", "SE_OJ_LV_SEABTM_DOOR_C_MOVE", "SE_OJ_SEABTM_DOOR_C_STOP", 0xffffffff, 0 }, - { "WaterBazookaTowerMoveStepA", 0, "SE_OJ_LV_W_BZK_TW_STEP_A_MV", "SE_OJ_W_BZK_TW_STEP_A_ED", 0xffffffff, 0 }, - { "WaterBazookaTowerMoveStepB", "SE_OJ_W_BZK_TW_STEP_B_ST", "SE_OJ_LV_W_BZK_TW_STEP_B_MV", "SE_OJ_W_BZK_TW_STEP_B_ED", 0xffffffff, 0 }, - { "WaterBazookaTowerMoveStepC", "SE_OJ_W_BZK_TW_STEP_C_ST", "SE_OJ_LV_W_BZK_TW_STEP_C_MV", "SE_OJ_W_BZK_TW_STEP_C_ED", 0xffffffff, 0 }, - { "KoopaJrSmallShipA", "SE_OJ_KOOPA_JR_S_SHIP_ST", "SE_OJ_LV_KOOPA_JR_S_SHIP_MV", "SE_OJ_KOOPA_JR_S_SHIP_ED", 0xffffffff, 0 }, - { "HeavensDoorInsideRotatePartsA", 0, "SE_OJ_LV_HD_INSIDE_ROTATOR", 0, 0xffffffff, 0 }, - { "HeavensDoorInsideRotatePartsB", 0, "SE_OJ_LV_HD_INSIDE_ROTATOR", 0, 0xffffffff, 0 }, - { "HeavensDoorInsideRotatePartsC", 0, "SE_OJ_LV_HD_INSIDE_ROTATOR", 0, 0xffffffff, 0 }, - { "HeavensDoorMiddleRotatePartsA", 0, "SE_OJ_LV_HD_MID_ROTATOR_A", 0, 0xffffffff, 0 }, - { "HeavensDoorMiddleRotatePartsB", 0, "SE_OJ_LV_HD_MID_ROTATOR_B", 0, 0xffffffff, 0 }, - { "HeavensDoorInsideCage", "SE_OJ_HD_INSIDE_CAGE_BREAK", 0, 0, 0xffffffff, 0 }, - { "HeavensDoorInsidePlanetPartsA", "SE_OJ_HD_INSIDE_SUN_OFF", 0, 0, 0xffffffff, 0 }, - { "HeavensDoorAppearStepA", "SE_OJ_HD_STEP_APPEAR", 0, 0, 0xffffffff, 0 }, - { "ReverseGravityRoomPressGroundC", "SE_OJ_METAL_FLOOR_S_START", "SE_OJ_LV_METAL_FLOOR_S_MOVE", "SE_OJ_METAL_FLOOR_S_STOP", 0xffffffff, 0 }, - { "ReverseGravityRoomPressGroundD", "SE_OJ_METAL_FLOOR_L_START", "SE_OJ_LV_METAL_FLOOR_L_MOVE", "SE_OJ_METAL_FLOOR_L_STOP", 0xffffffff, 0 }, - { "BattleShipMovePartsB", "SE_OJ_BS_MOVE_PARTS_B_ST", "SE_OJ_LV_BS_MOVE_PARTS_B_MV", "SE_OJ_BS_MOVE_PARTS_B_ED", 0xffffffff, 0 }, - { "IceWaterUpDownParts", 0, "SE_AT_LV_ICE_WATER_UP_DOWN", 0, 0xffffffff, 0 }, - { "LavaUpDownParts", 0, "SE_AT_LV_LAVA_UP_DOWN", 0, 0xffffffff, 0 }, - { "KoopaVS2PartsStartMoveStepA", "SE_OJ_KP2_START_STEP_ST", "SE_OJ_LV_KP2_START_STEP_MV", "SE_OJ_KP2_START_STEP_ED", 0xffffffff, 0 }, - { "KoopaVS2PartsStartMoveStepB", "SE_OJ_KP2_START_STEP_ST", "SE_OJ_LV_KP2_START_STEP_MV", "SE_OJ_KP2_START_STEP_ED", 0xffffffff, 0 }, - { "KoopaVS2PartsStartMoveStepC", "SE_OJ_KP2_START_STEP_ST", "SE_OJ_LV_KP2_START_STEP_MV", "SE_OJ_KP2_START_STEP_ED", 0xffffffff, 0 }, - { "KoopaVS2PartsRollingStep", 0, "SE_OJ_LV_KP2_ROLL_STEP_MV", 0, 0xffffffff, 0 }, - { "KoopaVS2PartsSSquareMoveStep", "SE_OJ_KP2_S_SQR_STEP_ST", "SE_OJ_LV_KP2_S_SQR_STEP_MV", "SE_OJ_KP2_S_SQR_STEP_ED", 0xffffffff, 0 }, - { "KoopaVS2Parts2DMoveStepBarA", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0 }, - { "KoopaVS2Parts2DMoveStepBarB", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0 }, - { "KoopaVS2Parts2DMoveStepSBarB", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0 }, - { "KoopaVS2Parts2DMoveStepConvex", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0 }, - { "KoopaVS2Parts2DMoveStepLShape", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0 }, - { "KoopaVS2Parts2DMoveStepCross", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0 }, - { "KoopaVS2PartsSquareMoveStepA", 0, "SE_OJ_LV_KP2_START_STEP_MV", 0, 0xffffffff, 0 }, - { "KoopaVS2PartsSquareMoveStepB", 0, "SE_OJ_LV_KP2_START_STEP_MV", 0, 0xffffffff, 0 }, - { "KoopaVS2PartsJoinedMoveStep", "SE_OJ_KP2_JNT_STEP_ST", "SE_OJ_LV_KP2_JNT_STEP_MV", "SE_OJ_KP2_JNT_STEP_ED", 0xffffffff, 0 }, - { "HeavenlyBeachTimerStepA", "SE_OJ_O_APPEAR_BRDG_APPEAR", 0, 0, 0xffffffff, 0 }, - { "HeavenlyBeachTimerStepB", "SE_OJ_O_APPEAR_BRDG_APPEAR", 0, 0, 0xffffffff, 0 }, - { "IceLavaIslandLavaMovableStepA", 0, "SE_AT_LV_ICE_LAVA_LAVA_STEP", 0, 0xffffffff, 0 }, - { "ConcreteBlock", 0, 0, "SE_OJ_STRANGEROCK_BREAK_M", 0xffffffff, 0 }, - { "WindMillPropeller", 0, "SE_OJ_LV_WINDMILL_PROPELLER", 0, 0xffffffff, 0 }, - { "BiriBiriBegomanSpikePistonA", "SE_OJ_METAL_FLOOR_L_START", "SE_OJ_LV_METAL_FLOOR_L_MOVE", "SE_OJ_METAL_FLOOR_L_STOP", 0xffffffff, 0 }, - { "HeavenlyBeachUnderRock", "SE_OJ_HB_UNDERROCK_BREAK", "SE_OJ_LV_HB_UNDERROCK_WATER", 0, 0xffffffff, 0 }, - { "HeavenlyBeachTopRock", "SE_OJ_STRANGEROCK_BREAK_M", 0, 0, 0xffffffff, 0 }, - { "FlagDiscPlanetD", 0, "SE_OJ_LV_FLY_DISK_ROTATE", 0, 0xffffffff, 0 }, - { "IceVolcanoAppearStepB", "SE_OJ_IV_STEP_B_START", "SE_OJ_LV_IV_STEP_B_MVOE", "SE_OJ_IV_STEP_B_END", 0xd2, 0 }, - { "ShutterDoorE", "SE_OJ_MTL_SHUTTER_S_ST", "SE_OJ_LV_MTL_SHUTTER_S_MV", "SE_OJ_MTL_SHUTTER_S_ED", 0xad, 2 }, - { "SnowBlockA", 0, 0, "SE_OJ_SNOW_MAN_MELT", 0xffffffff, 0 }, - { "ChallengeBallRotateBridgeA", "SE_OJ_CHAL_RT_BRIDGE_ST", "SE_OJ_LV_CHAL_RT_BRIDGE_ROT", "SE_OJ_CHAL_RT_BRIDGE_ED", 0xffffffff, 0 }, - { "ChallengeBallMoveGroundA", "SE_OJ_CHAL_MV_GND_L_ST", "SE_OJ_LV_CHAL_MV_GND_L_MV", "SE_OJ_CHAL_MV_GND_L_ED", 0xffffffff, 0 }, - { "ChallengeBallMoveGroundB", 0, "SE_OJ_LV_CHAL_MV_GND_S_MV", 0, 0xffffffff, 0 }, - { "ChallengeBallGearA", 0, "SE_OJ_LV_CHAL_GEAR_ROTATE", 0, 0xffffffff, 0 }, - { "ChallengeBallAccelCylinderA", 0, "SE_OJ_LV_CHAL_ACC_CYLINDER", 0, 0xffffffff, 0 }, - { "AstroDecoratePartsGearA", 0, "SE_OJ_LV_ASTRO_DECO_GEAR_MV", 0, 0xffffffff, 0 }, - { "DarkHopperRotateStepA", "SE_OJ_MYST_CIRCLE_PENDULUM", 0, 0, 0xffffffff, 0 }, - { "TrialBubbleRevolvingPartsA", 0, "SE_OJ_LV_TRIBBL_REVOLV_PRT", 0, 0xffffffff, 0 }, - { "TrialBubbleRotateWallA", 0, "SE_OJ_LV_TRIBBL_ROT_WALL", 0, 0xffffffff, 0 }, - { "TrialBubbleMoveWallA", "SE_OJ_TRIBBL_MOVEWALL_ST", "SE_OJ_LV_TRIBBL_MOVEWALL_MV", "SE_OJ_TRIBBL_MOVEWALL_ED", 0xffffffff, 0 }, - { "CubeBubbleExRotateWallL", 0, "SE_OJ_LV_CUBEBBL_ROT_WALL_L", 0, 0xffffffff, 0 }, - { "PowerStarKeeperA", 0, "SE_OJ_LV_POW_STAR_KEEPER_A", 0, 0xffffffff, 0 }, - { "PowerStarKeeperB", 0, "SE_OJ_LV_POW_STAR_KEEPER_B", 0, 0xffffffff, 0 }, - { "PowerStarKeeperC", 0, "SE_OJ_LV_POW_STAR_KEEPER_C", 0, 0xffffffff, 0 }, - { "KoopaVS3RotateStepsA", 0, "SE_OJ_LV_KP_VS3_ROT_STEP_A", 0, 0xffffffff, 0 }, - { "DeathPromenadeMovePartsSpuareA", "SE_OJ_DP_MOVE_STEP_START", "SE_OJ_LV_DP_MOVE_STEP_MOVE", "SE_OJ_DP_MOVE_STEP_START", 0xffffffff, 0 }, - { "DeathPromenadeRotateCircleL", 0, "SE_OJ_LV_DP_ROT_CIRCLE_L", 0, 0xffffffff, 0 }, - { "DeathPromenadeRotateCircleS", 0, "SE_OJ_LV_DP_ROT_CIRCLE_S", 0, 0xffffffff, 0 }, - { "MiniMechaKoopaPartsFan", 0, "SE_OJ_LV_MM_KOOPA_FAN", 0, 0xffffffff, 0 }, - { "ClockworkHandle", 0, "SE_OJ_LV_CLOCKWORK_HANDLE", 0, 0xffffffff, 0 }, - { "SunkenShip", 0, 0, "SE_OJ_SUNKEN_SHIP_BREAK", 0xffffffff, 2 } - }; + {"LavaHomeVolcanoInnerFlow", 0, "SE_OJ_LV_LAVA_INCREASE_HOME", 0, 0xffffffff, 0}, + {"LavaRotatePlanetStartStep", "SE_OJ_LAVA_BR_ROCK_L_ON", "SE_OJ_LV_LAVA_BR_ROCK_L_MV", 0, 0xffffffff, 0}, + {"OceanRingRuinsMove", "SE_OJ_OCN_RUIN_MOVE_START", "SE_OJ_LV_OCN_RUIN_MOVE", "SE_OJ_OCN_RUIN_STOP", 0xffffffff, 0}, + {"OceanRingRuinsGearBig", "SE_OJ_OCN_RUIN_GEAR_L_ST", "SE_OJ_LV_OCN_RUIN_MOVE", "SE_OJ_OCN_RUIN_GEAR_L_END", 0xffffffff, 0}, + {"OceanRingRuinsGearSmall", 0, "SE_OJ_LV_OCN_RUIN_GEAR_S_MV", 0, 0xffffffff, 0}, + {"OceanRotateBridge", "SE_OJ_O_ROTATE_BRIDGE_ST", "SE_OJ_LV_O_ROTATE_BRIDGE_MV", "SE_OJ_O_ROTATE_BRIDGE_END", 0xffffffff, 2}, + {"ShutterDoorA", 0, "SE_OJ_LV_SHUTTER_DOOR_MOVE", "SE_OJ_SHUTTER_DOOR_STOP", 0xffffffff, 0}, + {"OceanSwingBoard", "SE_OJ_O_SWG_BOARD_MOVE_ST", "SE_OJ_LV_O_SWG_BOARD_MOVE", 0, 0xffffffff, 0}, + {"RotateNutStep", 0, "SE_OJ_LV_ROTATE_NUT_MOVE", 0, 0xffffffff, 0}, + {"OceanFloaterTowerRotateStepA", "SE_OJ_O_TOWER_ROTATE_START", "SE_OJ_LV_O_TOWER_ROTATE_MV", 0, 0xffffffff, 1}, + {"OceanFloaterTowerRotateStepB", "SE_OJ_O_TOWER_ROTATE_START", "SE_OJ_LV_O_TOWER_ROTATE_MV", 0, 0xffffffff, 1}, + {"OceanFloaterTowerRotateStepC", "SE_OJ_O_TOWER_ROTATE_START", "SE_OJ_LV_O_TOWER_ROTATE_MV", 0, 0xffffffff, 0}, + {"OceanFloaterTowerRotateStepD", "SE_OJ_O_TOWER_ROTATE_START", "SE_OJ_LV_O_TOWER_ROTATE_MV", 0, 0xffffffff, 0}, + {"OceanAppearBridge", "SE_OJ_O_APPEAR_BRDG_APPEAR", 0, 0, 0xffffffff, 0}, + {"OnimasuPlanetRotatePartsA", 0, "SE_OJ_LV_STONE_ROTATOR_MOVE", 0, 0xffffffff, 0}, + {"OnimasuPlanetRotatePartsB", 0, "SE_OJ_LV_STONE_ROTATOR_MOVE", 0, 0xffffffff, 0}, + {"OnimasuPlanetRailMovePartsA", "SE_OJ_STONE_FLOOR_START", "SE_OJ_LV_STONE_FLOOR_MOVE", "SE_OJ_STONE_FLOOR_END", 0xffffffff, 0}, + {"GhostShipCaveMoveGroundA", "SE_OJ_PTM_GROUND_START", "SE_OJ_LV_PTM_GROUND_MOVE", "SE_OJ_PTM_GROUND_STOP", 0xffffffff, 0}, + {"GhostShipCaveMoveGroundB", "SE_OJ_PTM_GROUND_START", "SE_OJ_LV_PTM_GROUND_MOVE", "SE_OJ_PTM_GROUND_STOP", 0xffffffff, 0}, + {"WaterRoadCaveStepA", "SE_OJ_W_RD_CAVE_STEP_ST", "SE_OJ_LV_W_RD_CAVE_STEP_MV", "SE_OJ_W_RD_CAVE_STEP_ED", 0xffffffff, 0}, + {"LavaBreakColumn", "SE_OJ_LAVA_COLUMN_FALL_ST", "SE_OJ_LV_LAVA_COLUMN_FALL", 0, 0x4b, 0}, + {"LavaBreakRockA", "SE_OJ_LAVA_BR_ROCK_H_ON", "SE_OJ_LV_LAVA_BR_ROCK_H_MV", 0, 0xffffffff, 0}, + {"LavaBreakRockB", "SE_OJ_LAVA_BR_ROCK_S_ON", "SE_OJ_LV_LAVA_BR_ROCK_S_MV", 0, 0xffffffff, 0}, + {"LavaBreakRockC", "SE_OJ_LAVA_BR_ROCK_L_ON", "SE_OJ_LV_LAVA_BR_ROCK_L_MV", 0, 0xffffffff, 0}, + {"LavaBreakRockD", "SE_OJ_LAVA_BR_ROCK_S_ON", "SE_OJ_LV_LAVA_BR_ROCK_S_MV", 0, 0xffffffff, 0}, + {"LavaFallDownColumnA", "SE_OJ_LAVA_COLUMN_FALL_1", 0, 0, 0xffffffff, 0}, + {"LavaFallDownColumnB", "SE_OJ_LAVA_COLUMN_FALL_2", 0, 0, 0xffffffff, 0}, + {"OceanHomeTopRock", 0, 0, 0, 0xffffffff, 0}, + {"WaterWheelGear", 0, "SE_OJ_LV_W_WHEEL_GEAR_MOVE", 0, 0xffffffff, 0}, + {"TeresaRoomDoor", "SE_OJ_TERESA_ROOM_DOOR_OPEN", 0, 0, 0xffffffff, 0}, + {"WaterPowerStream", "SE_OJ_W_POWER_STREAM_ST", "SE_OJ_LV_W_POWER_STREAM_MV", 0, 0xffffffff, 0}, + {"LavaObstacleRockShell", "SE_OJ_LAVA_OB_ROCK_S_ON", "SE_OJ_LV_LAVA_OB_ROCK_S_MV", "SE_OJ_LAVA_OB_ROCK_S_STOP", 0x122, 0}, + {"LavaObstacleRockHomeA", "SE_OJ_LAVA_OB_ROCK_A_ON", "SE_OJ_LV_LAVA_OB_ROCK_A_MV", "SE_OJ_LAVA_OB_ROCK_A_STOP", 0xd2, 0}, + {"LavaObstacleRockHomeB", 0, "SE_OJ_LV_LAVA_OB_ROCK_B_MV", "SE_OJ_LAVA_OB_ROCK_B_STOP", 0x118, 0}, + {"UFOKinoko", 0, "SE_OJ_LV_UFO_KINOKO_ROTATE", 0, 0xffffffff, 0}, + {"PhantomShipPropellerSmall", 0, "SE_OJ_LV_P_SHIP_PROPELLER_S", 0, 0xffffffff, 0}, + {"PhantomShipPropellerBig", 0, "SE_OJ_LV_P_SHIP_PROPELLER_L", 0, 0xffffffff, 0}, + {"ForestAppearStepA", "SE_OJ_FOREST_STEP_APPEAR", 0, 0, 0xffffffff, 0}, + {"ForestObstacleWoodA", "SE_OJ_FOREST_OBS_WOOD_ON", "SE_OJ_LV_FOREST_OBS_WOOD_MV", "SE_OJ_FOREST_OBS_WOOD_STOP", 0x78, 2}, + {"RGTowerPressGroundA", "SE_OJ_STONE_FLOOR_S_START", "SE_OJ_LV_STONE_FLOOR_S_MOVE", "SE_OJ_STONE_FLOOR_S_END", 0xffffffff, 0}, + {"TeresaMansionEntranceDoor", 0, 0, "SE_OJ_P_ROOM_DOOR_L_CL_ST", 0xffffffff, 0}, + {"BattleShipMovePartsA", 0, "SE_OJ_LV_METAL_ROTATOR_MOVE", 0, 0xffffffff, 0}, + {"ReverseGravityRoomPressGroundA", "SE_OJ_METAL_FLOOR_S_START", "SE_OJ_LV_METAL_FLOOR_S_MOVE", "SE_OJ_METAL_FLOOR_S_STOP", 0xffffffff, 0}, + {"ReverseGravityRoomPressGroundB", "SE_OJ_METAL_FLOOR_L_START", "SE_OJ_LV_METAL_FLOOR_L_MOVE", "SE_OJ_METAL_FLOOR_L_STOP", 0xffffffff, 0}, + {"ShutterDoorB", "SE_OJ_METAL_FLOOR_L_START", "SE_OJ_LV_METAL_FLOOR_L_MOVE", "SE_OJ_METAL_FLOOR_L_STOP", 0xffffffff, 2}, + {"TeresaMansionHoleCover", 0, 0, "SE_OJ_STRANGEROCK_BREAK_S", 0xffffffff, 0}, + {"KoopaStatue", 0, 0, "SE_OJ_STRANGEROCK_BREAK_S", 0xffffffff, 2}, + {"TeresaRacePartsA", 0, "SE_OJ_LV_TR_RACE_ROTATER", 0, 0xffffffff, 0}, + {"TeresaRacePartsB", "SE_OJ_TR_RACE_PARTS_BOUND", 0, 0, 0xffffffff, 0}, + {"BeeWallClimbPartsA", 0, "SE_OJ_LV_BEE_WALL_MOVE", "SE_OJ_BEE_WALL_STOP", 0xffffffff, 0}, + {"ShutterDoorC", "SE_OJ_FENCE_SHUTTER_START", "SE_OJ_LV_FENCE_SHUTTER_MOVE", "SE_OJ_FENCE_SHUTTER_STOP", 0xae, 2}, + {"ShutterDoorD", "SE_OJ_FENCE_SHUTTER_S_ST", "SE_OJ_LV_FENCE_SHUTTER_S_MV", "SE_OJ_FENCE_SHUTTER_S_ED", 0xb4, 0}, + {"IcicleRock", 0, 0, "SE_OJ_STRANGEROCK_BREAK_S", 0xffffffff, 0}, + {"QuestionBoxMoveStepA", 0, "SE_OJ_LV_Q_BOX_ROTATE", 0, 0xffffffff, 0}, + {"QuestionBoxMoveStepB", 0, "SE_OJ_LV_Q_BOX_RAIL_MOVE", 0, 0xffffffff, 0}, + {"QuestionBoxMoveStepC", 0, "SE_OJ_LV_Q_BOX_RAIL_UD", "SE_OJ_Q_BOX_RAIL_UD_STOP", 0xffffffff, 0}, + {"KoopaVS1PartsMoveStepA", "SE_OJ_KOOPA_F_LIFT_ST", "SE_OJ_LV_KOOPA_F_LIFT_MV", "SE_OJ_KOOPA_F_LIFT_ED", 0xffffffff, 0}, + {"KoopaVS1PartsMoveStepB", "SE_OJ_KOOPA_F_LIFT_ST", "SE_OJ_LV_KOOPA_F_LIFT_MV", "SE_OJ_KOOPA_F_LIFT_ED", 0xffffffff, 0}, + {"KoopaVS1PartsRotateMoveStepA", "SE_OJ_KOOPA_F_R_LIFT_ST", "SE_OJ_LV_KOOPA_F_R_LIFT_MV", "SE_OJ_KOOPA_F_R_LIFT_ED", 0xffffffff, 0}, + {"KoopaVS1PartsRotateMoveStepB", "SE_OJ_KOOPA_F_R_LIFT_ST", "SE_OJ_LV_KOOPA_F_R_LIFT_MV", "SE_OJ_KOOPA_F_R_LIFT_ED", 0xffffffff, 0}, + {"SideSpikeMoveStepA", "SE_OJ_SIDE_SPIKE_STEP_ST", "SE_OJ_LV_SIDE_SPIKE_STEP_MV", "SE_OJ_SIDE_SPIKE_STEP_ED", 0xffffffff, 0}, + {"PhantomTowerMoveStepA", "SE_OJ_STONE_FLOOR_S_START", "SE_OJ_LV_STONE_FLOOR_S_MOVE", "SE_OJ_STONE_FLOOR_S_END", 0xffffffff, 0}, + {"IceVolcanoAppearStepA", "SE_OJ_VOL_APPEAR_STEP_ST", "SE_OJ_LV_VOL_APPEAR_STEP_MV", "SE_OJ_VOL_APPEAR_STEP_ED", 0xda, 2}, + {"IceVolcanoClimbingWall", "SE_OJ_VOL_CLIMB_WALL_ST", "SE_OJ_LV_VOL_CLIMB_WALL_MV", "SE_OJ_VOL_CLIMB_WALL_ED", 0x1ca, 2}, + {"IceUpDownShutterDoorA", "SE_OJ_MTL_SHUTTER_S_ST", "SE_OJ_LV_MTL_SHUTTER_S_MV", "SE_OJ_MTL_SHUTTER_S_ED", 0x90, 2}, + {"IceVolcanoMoveStepA", 0, "SE_OJ_LV_VOL_MOVE_STEP_FLOW", 0, 0xffffffff, 0}, + {"HopperBeltConveyerRotatePartsA", 0, "SE_OJ_LV_HOPPER_CONVEYER_MV", 0, 0xffffffff, 0}, + {"HopperBeltConveyerMovePartsA", 0, "SE_OJ_LV_HOPPER_CONVEYER_MV", 0, 0xffffffff, 0}, + {"MechaKoopaPartsCaterpillar", 0, "SE_OJ_LV_M_KOOPA_CATER_L_MV", 0, 0xffffffff, 0}, + {"BroadBeanMoveStepA", "SE_OJ_STONE_FLOOR_S_START", "SE_OJ_LV_STONE_FLOOR_S_MOVE", "SE_OJ_STONE_FLOOR_S_END", 0xffffffff, 0}, + {"BroadBeanMoveStepB", "SE_OJ_STONE_FLOOR_S_START", "SE_OJ_LV_STONE_FLOOR_S_MOVE", "SE_OJ_STONE_FLOOR_S_END", 0xffffffff, 0}, + {"RayGunPlanetPartsGear", 0, "SE_OJ_LV_RAYGUN_GEAR_ROT", 0, 0xffffffff, 0}, + {"RayGunPlanetPartsScrew", 0, "SE_OJ_LV_RAYGUN_SCREW_ROT", "SE_OJ_RAYGUN_SCREW_STOP", 0xffffffff, 2}, + {"SandStreamHighTowerMoveStepA", "SE_OJ_STONE_FLOOR_S_START", "SE_OJ_LV_STONE_FLOOR_S_MOVE", "SE_OJ_STONE_FLOOR_S_END", 0xffffffff, 0}, + {"MechaKoopaPartsRollerA", 0, "SE_OJ_LV_M_KOOPA_CATER_S_MV", 0, 0xffffffff, 0}, + {"MiniMechaKoopaPartsGear", 0, "SE_OJ_LV_MM_KOOPA_GEAR_ROT", 0, 0xffffffff, 0}, + {"MiniMechaKoopaPartsCage", "SE_OJ_MM_KOOPA_CAGE_START", "SE_OJ_LV_MM_KOOPA_CAGE_ROT", "SE_OJ_MM_KOOPA_CAGE_STOP", 0xffffffff, 2}, + {"MiniMechaKoopaPartsMoveStepA", "SE_OJ_MM_KOOPA_STEP_START", "SE_OJ_LV_MM_KOOPA_STEP_MOVE", "SE_OJ_MM_KOOPA_STEP_STOP", 0xffffffff, 2}, + {"AsteroidBlockRotateStepA", 0, "SE_OJ_LV_AST_BLOCK_ROTATE", 0, 0xffffffff, 0}, + {"SandUpDownTowerBreakableWallA", 0, 0, "SE_OJ_WOOD_WALL_BREAK", 0xffffffff, 0}, + {"SandUpDownTowerBreakableWallB", 0, 0, "SE_OJ_WOOD_WALL_BREAK", 0xffffffff, 0}, + {"HoleDeathSandMoveStepA", "SE_OJ_SAND_MOVE_STEP_ST", "SE_OJ_LV_SAND_MOVE_STEP_MV", "SE_OJ_SAND_MOVE_STEP_ED", 0xffffffff, 0}, + {"CannonFortressMoveWall", "SE_OJ_CNFORT_MOVEWALL_ST", "SE_OJ_LV_CNFORT_MOVEWALL_MV", "SE_OJ_CNFORT_MOVEWALL_ED", 0xffffffff, 0}, + {"MechaKoopaPartsBreast", "SE_OJ_M_KOOPA_BREAST_START", "SE_OJ_LV_M_KOOPA_BREAST_MV", "SE_OJ_M_KOOPA_BREAST_BREAK", 0xffffffff, 1}, + {"ChoConveyorMoveChocoA", 0, "SE_OJ_LV_CHOCONVEYER_MOVE", 0, 0xffffffff, 0}, + {"MechaKoopaPartsCollar", 0, "SE_OJ_LV_M_KOOPA_COLLAR_ROT", 0, 0xffffffff, 0}, + {"MechaKoopaPartsMoveStepA", "SE_OJ_M_KOOPA_MV_STEP_ST", "SE_OJ_LV_M_KOOPA_MV_STEP_MV", "SE_OJ_M_KOOPA_MV_STEP_ED", 0xffffffff, 0}, + {"ChoConveyorPlanetD", 0, "SE_OJ_LV_CHO_CONVEYOR_PLN_D", 0, 0xffffffff, 0}, + {"SeaBottomBigDoorA", "SE_OJ_SEABTM_B_DOOR_START", "SE_OJ_LV_SEABTM_B_DOOR_MOVE", "SE_OJ_SEABTM_B_DOOR_STOP", 0xffffffff, 0}, + {"SeaBottomBigDoorB", "SE_OJ_SEABTM_B_DOOR_START", "SE_OJ_LV_SEABTM_B_DOOR_MOVE", "SE_OJ_SEABTM_B_DOOR_STOP", 0xffffffff, 0}, + {"SeaBottomBigDoorC", "SE_OJ_SEABTM_DOOR_C_START", "SE_OJ_LV_SEABTM_DOOR_C_MOVE", "SE_OJ_SEABTM_DOOR_C_STOP", 0xffffffff, 0}, + {"WaterBazookaTowerMoveStepA", 0, "SE_OJ_LV_W_BZK_TW_STEP_A_MV", "SE_OJ_W_BZK_TW_STEP_A_ED", 0xffffffff, 0}, + {"WaterBazookaTowerMoveStepB", "SE_OJ_W_BZK_TW_STEP_B_ST", "SE_OJ_LV_W_BZK_TW_STEP_B_MV", "SE_OJ_W_BZK_TW_STEP_B_ED", 0xffffffff, 0}, + {"WaterBazookaTowerMoveStepC", "SE_OJ_W_BZK_TW_STEP_C_ST", "SE_OJ_LV_W_BZK_TW_STEP_C_MV", "SE_OJ_W_BZK_TW_STEP_C_ED", 0xffffffff, 0}, + {"KoopaJrSmallShipA", "SE_OJ_KOOPA_JR_S_SHIP_ST", "SE_OJ_LV_KOOPA_JR_S_SHIP_MV", "SE_OJ_KOOPA_JR_S_SHIP_ED", 0xffffffff, 0}, + {"HeavensDoorInsideRotatePartsA", 0, "SE_OJ_LV_HD_INSIDE_ROTATOR", 0, 0xffffffff, 0}, + {"HeavensDoorInsideRotatePartsB", 0, "SE_OJ_LV_HD_INSIDE_ROTATOR", 0, 0xffffffff, 0}, + {"HeavensDoorInsideRotatePartsC", 0, "SE_OJ_LV_HD_INSIDE_ROTATOR", 0, 0xffffffff, 0}, + {"HeavensDoorMiddleRotatePartsA", 0, "SE_OJ_LV_HD_MID_ROTATOR_A", 0, 0xffffffff, 0}, + {"HeavensDoorMiddleRotatePartsB", 0, "SE_OJ_LV_HD_MID_ROTATOR_B", 0, 0xffffffff, 0}, + {"HeavensDoorInsideCage", "SE_OJ_HD_INSIDE_CAGE_BREAK", 0, 0, 0xffffffff, 0}, + {"HeavensDoorInsidePlanetPartsA", "SE_OJ_HD_INSIDE_SUN_OFF", 0, 0, 0xffffffff, 0}, + {"HeavensDoorAppearStepA", "SE_OJ_HD_STEP_APPEAR", 0, 0, 0xffffffff, 0}, + {"ReverseGravityRoomPressGroundC", "SE_OJ_METAL_FLOOR_S_START", "SE_OJ_LV_METAL_FLOOR_S_MOVE", "SE_OJ_METAL_FLOOR_S_STOP", 0xffffffff, 0}, + {"ReverseGravityRoomPressGroundD", "SE_OJ_METAL_FLOOR_L_START", "SE_OJ_LV_METAL_FLOOR_L_MOVE", "SE_OJ_METAL_FLOOR_L_STOP", 0xffffffff, 0}, + {"BattleShipMovePartsB", "SE_OJ_BS_MOVE_PARTS_B_ST", "SE_OJ_LV_BS_MOVE_PARTS_B_MV", "SE_OJ_BS_MOVE_PARTS_B_ED", 0xffffffff, 0}, + {"IceWaterUpDownParts", 0, "SE_AT_LV_ICE_WATER_UP_DOWN", 0, 0xffffffff, 0}, + {"LavaUpDownParts", 0, "SE_AT_LV_LAVA_UP_DOWN", 0, 0xffffffff, 0}, + {"KoopaVS2PartsStartMoveStepA", "SE_OJ_KP2_START_STEP_ST", "SE_OJ_LV_KP2_START_STEP_MV", "SE_OJ_KP2_START_STEP_ED", 0xffffffff, 0}, + {"KoopaVS2PartsStartMoveStepB", "SE_OJ_KP2_START_STEP_ST", "SE_OJ_LV_KP2_START_STEP_MV", "SE_OJ_KP2_START_STEP_ED", 0xffffffff, 0}, + {"KoopaVS2PartsStartMoveStepC", "SE_OJ_KP2_START_STEP_ST", "SE_OJ_LV_KP2_START_STEP_MV", "SE_OJ_KP2_START_STEP_ED", 0xffffffff, 0}, + {"KoopaVS2PartsRollingStep", 0, "SE_OJ_LV_KP2_ROLL_STEP_MV", 0, 0xffffffff, 0}, + {"KoopaVS2PartsSSquareMoveStep", "SE_OJ_KP2_S_SQR_STEP_ST", "SE_OJ_LV_KP2_S_SQR_STEP_MV", "SE_OJ_KP2_S_SQR_STEP_ED", 0xffffffff, 0}, + {"KoopaVS2Parts2DMoveStepBarA", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0}, + {"KoopaVS2Parts2DMoveStepBarB", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0}, + {"KoopaVS2Parts2DMoveStepSBarB", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0}, + {"KoopaVS2Parts2DMoveStepConvex", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0}, + {"KoopaVS2Parts2DMoveStepLShape", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0}, + {"KoopaVS2Parts2DMoveStepCross", "SE_OJ_KP2_START_STEP_ST_F", "SE_OJ_LV_KP2_START_STEP_M_F", "SE_OJ_KP2_START_STEP_ED_F", 0xffffffff, 0}, + {"KoopaVS2PartsSquareMoveStepA", 0, "SE_OJ_LV_KP2_START_STEP_MV", 0, 0xffffffff, 0}, + {"KoopaVS2PartsSquareMoveStepB", 0, "SE_OJ_LV_KP2_START_STEP_MV", 0, 0xffffffff, 0}, + {"KoopaVS2PartsJoinedMoveStep", "SE_OJ_KP2_JNT_STEP_ST", "SE_OJ_LV_KP2_JNT_STEP_MV", "SE_OJ_KP2_JNT_STEP_ED", 0xffffffff, 0}, + {"HeavenlyBeachTimerStepA", "SE_OJ_O_APPEAR_BRDG_APPEAR", 0, 0, 0xffffffff, 0}, + {"HeavenlyBeachTimerStepB", "SE_OJ_O_APPEAR_BRDG_APPEAR", 0, 0, 0xffffffff, 0}, + {"IceLavaIslandLavaMovableStepA", 0, "SE_AT_LV_ICE_LAVA_LAVA_STEP", 0, 0xffffffff, 0}, + {"ConcreteBlock", 0, 0, "SE_OJ_STRANGEROCK_BREAK_M", 0xffffffff, 0}, + {"WindMillPropeller", 0, "SE_OJ_LV_WINDMILL_PROPELLER", 0, 0xffffffff, 0}, + {"BiriBiriBegomanSpikePistonA", "SE_OJ_METAL_FLOOR_L_START", "SE_OJ_LV_METAL_FLOOR_L_MOVE", "SE_OJ_METAL_FLOOR_L_STOP", 0xffffffff, 0}, + {"HeavenlyBeachUnderRock", "SE_OJ_HB_UNDERROCK_BREAK", "SE_OJ_LV_HB_UNDERROCK_WATER", 0, 0xffffffff, 0}, + {"HeavenlyBeachTopRock", "SE_OJ_STRANGEROCK_BREAK_M", 0, 0, 0xffffffff, 0}, + {"FlagDiscPlanetD", 0, "SE_OJ_LV_FLY_DISK_ROTATE", 0, 0xffffffff, 0}, + {"IceVolcanoAppearStepB", "SE_OJ_IV_STEP_B_START", "SE_OJ_LV_IV_STEP_B_MVOE", "SE_OJ_IV_STEP_B_END", 0xd2, 0}, + {"ShutterDoorE", "SE_OJ_MTL_SHUTTER_S_ST", "SE_OJ_LV_MTL_SHUTTER_S_MV", "SE_OJ_MTL_SHUTTER_S_ED", 0xad, 2}, + {"SnowBlockA", 0, 0, "SE_OJ_SNOW_MAN_MELT", 0xffffffff, 0}, + {"ChallengeBallRotateBridgeA", "SE_OJ_CHAL_RT_BRIDGE_ST", "SE_OJ_LV_CHAL_RT_BRIDGE_ROT", "SE_OJ_CHAL_RT_BRIDGE_ED", 0xffffffff, 0}, + {"ChallengeBallMoveGroundA", "SE_OJ_CHAL_MV_GND_L_ST", "SE_OJ_LV_CHAL_MV_GND_L_MV", "SE_OJ_CHAL_MV_GND_L_ED", 0xffffffff, 0}, + {"ChallengeBallMoveGroundB", 0, "SE_OJ_LV_CHAL_MV_GND_S_MV", 0, 0xffffffff, 0}, + {"ChallengeBallGearA", 0, "SE_OJ_LV_CHAL_GEAR_ROTATE", 0, 0xffffffff, 0}, + {"ChallengeBallAccelCylinderA", 0, "SE_OJ_LV_CHAL_ACC_CYLINDER", 0, 0xffffffff, 0}, + {"AstroDecoratePartsGearA", 0, "SE_OJ_LV_ASTRO_DECO_GEAR_MV", 0, 0xffffffff, 0}, + {"DarkHopperRotateStepA", "SE_OJ_MYST_CIRCLE_PENDULUM", 0, 0, 0xffffffff, 0}, + {"TrialBubbleRevolvingPartsA", 0, "SE_OJ_LV_TRIBBL_REVOLV_PRT", 0, 0xffffffff, 0}, + {"TrialBubbleRotateWallA", 0, "SE_OJ_LV_TRIBBL_ROT_WALL", 0, 0xffffffff, 0}, + {"TrialBubbleMoveWallA", "SE_OJ_TRIBBL_MOVEWALL_ST", "SE_OJ_LV_TRIBBL_MOVEWALL_MV", "SE_OJ_TRIBBL_MOVEWALL_ED", 0xffffffff, 0}, + {"CubeBubbleExRotateWallL", 0, "SE_OJ_LV_CUBEBBL_ROT_WALL_L", 0, 0xffffffff, 0}, + {"PowerStarKeeperA", 0, "SE_OJ_LV_POW_STAR_KEEPER_A", 0, 0xffffffff, 0}, + {"PowerStarKeeperB", 0, "SE_OJ_LV_POW_STAR_KEEPER_B", 0, 0xffffffff, 0}, + {"PowerStarKeeperC", 0, "SE_OJ_LV_POW_STAR_KEEPER_C", 0, 0xffffffff, 0}, + {"KoopaVS3RotateStepsA", 0, "SE_OJ_LV_KP_VS3_ROT_STEP_A", 0, 0xffffffff, 0}, + {"DeathPromenadeMovePartsSpuareA", "SE_OJ_DP_MOVE_STEP_START", "SE_OJ_LV_DP_MOVE_STEP_MOVE", "SE_OJ_DP_MOVE_STEP_START", 0xffffffff, 0}, + {"DeathPromenadeRotateCircleL", 0, "SE_OJ_LV_DP_ROT_CIRCLE_L", 0, 0xffffffff, 0}, + {"DeathPromenadeRotateCircleS", 0, "SE_OJ_LV_DP_ROT_CIRCLE_S", 0, 0xffffffff, 0}, + {"MiniMechaKoopaPartsFan", 0, "SE_OJ_LV_MM_KOOPA_FAN", 0, 0xffffffff, 0}, + {"ClockworkHandle", 0, "SE_OJ_LV_CLOCKWORK_HANDLE", 0, 0xffffffff, 0}, + {"SunkenShip", 0, 0, "SE_OJ_SUNKEN_SHIP_BREAK", 0xffffffff, 2}}; - StageEffectSoundData* getStageEffectSeParam(const char *); + StageEffectSoundData* getStageEffectSeParam(const char*); void shakeCamera(CameraShakeType); - bool isDistanceValidShake(LiveActor *, const char *); -}; + bool isDistanceValidShake(LiveActor*, const char*); +}; // namespace namespace MR { class StageEffect { public: - static const char* getStartSe(const char *); - static const char* getMovingSe(const char *); - static const char* getStopSe(const char *); + static const char* getStartSe(const char*); + static const char* getMovingSe(const char*); + static const char* getStopSe(const char*); - static s32 getStopSeSteps(const char *); + static s32 getStopSeSteps(const char*); - static bool isRiddleSeTypeStop(const char *); + static bool isRiddleSeTypeStop(const char*); - static bool tryStageEffectStart(LiveActor *, const char *); - static bool tryStageEffectMoving(LiveActor *, const char *); - static bool tryStageEffectStop(LiveActor *, const char *); + static bool tryStageEffectStart(LiveActor*, const char*); + static bool tryStageEffectMoving(LiveActor*, const char*); + static bool tryStageEffectStop(LiveActor*, const char*); - static bool isExistStageEffectData(const char *); + static bool isExistStageEffectData(const char*); - static void rumblePadMoving(LiveActor *, const char *); - static void rumblePadStart(LiveActor *, const char *); - static void rumblePadStop(LiveActor *, const char *); + static void rumblePadMoving(LiveActor*, const char*); + static void rumblePadStart(LiveActor*, const char*); + static void rumblePadStop(LiveActor*, const char*); - static void shakeCameraMoving(NameObj *, const char *); - static void shakeStopCamera(LiveActor *, const char *); - static void stopShakingCameraMoving(NameObj *, const char *); + static void shakeCameraMoving(NameObj*, const char*); + static void shakeStopCamera(LiveActor*, const char*); + static void stopShakingCameraMoving(NameObj*, const char*); }; -}; \ No newline at end of file +}; // namespace MR \ No newline at end of file diff --git a/include/Game/MapObj/StarPieceDirector.hpp b/include/Game/MapObj/StarPieceDirector.hpp index 63ab04d6d..a9448c558 100644 --- a/include/Game/MapObj/StarPieceDirector.hpp +++ b/include/Game/MapObj/StarPieceDirector.hpp @@ -7,5 +7,5 @@ class HitSensor; namespace MR { void createStarPiece(); - bool giftStarPieceToTarget(HitSensor *, u32); -}; + bool giftStarPieceToTarget(HitSensor*, u32); +}; // namespace MR diff --git a/include/Game/MapObj/StarPieceGroup.hpp b/include/Game/MapObj/StarPieceGroup.hpp index ee7b2908a..a89aa7229 100644 --- a/include/Game/MapObj/StarPieceGroup.hpp +++ b/include/Game/MapObj/StarPieceGroup.hpp @@ -4,27 +4,26 @@ #include "Game/Util/JMapInfo.hpp" class StarPieceGroup : public LiveActor { - public: - StarPieceGroup(const char *); +public: + StarPieceGroup(const char*); - virtual void init(const JMapInfoIter &); - virtual void appear(); - virtual void makeActorAppeared(); - virtual void makeActorDead(); - virtual void startClipped(); - virtual void endClipped(); - virtual void control(); - - bool isExistAnyStarPiece(); - void forceReplaceStarPieceAll(); - void forceKillStarPieceAll(bool); - void placementAllPiece(); - void placementPieceOnCircle(); - void placementPieceOnRail(); - void placementPieceOnRailPoint(); - void onSwitchA(); - void offSwitchA(); - void onSwitchB(); - void exeFlow(); + virtual void init(const JMapInfoIter&); + virtual void appear(); + virtual void makeActorAppeared(); + virtual void makeActorDead(); + virtual void startClipped(); + virtual void endClipped(); + virtual void control(); + bool isExistAnyStarPiece(); + void forceReplaceStarPieceAll(); + void forceKillStarPieceAll(bool); + void placementAllPiece(); + void placementPieceOnCircle(); + void placementPieceOnRail(); + void placementPieceOnRailPoint(); + void onSwitchA(); + void offSwitchA(); + void onSwitchB(); + void exeFlow(); }; diff --git a/include/Game/MapObj/SubmarineVolcanoBigColumn.hpp b/include/Game/MapObj/SubmarineVolcanoBigColumn.hpp index 0af52c46b..0532fa1f2 100644 --- a/include/Game/MapObj/SubmarineVolcanoBigColumn.hpp +++ b/include/Game/MapObj/SubmarineVolcanoBigColumn.hpp @@ -6,23 +6,23 @@ class ModelObj; class SubmarineVolcanoBigColumn : public LiveActor { public: - SubmarineVolcanoBigColumn(const char *); + SubmarineVolcanoBigColumn(const char*); virtual ~SubmarineVolcanoBigColumn(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); void exeWait(); void exeBreak(); void pauseOff(); - void initBreakModel(const char *); + void initBreakModel(const char*); - ModelObj* mBreakModel; // 0x8C - bool mIsSmallColumn; // 0x90 + ModelObj* mBreakModel; // 0x8C + bool mIsSmallColumn; // 0x90 }; namespace NrvSubmarineVolcanoBigColumn { NERVE_DECL(SubmarineVolcanoBigColumnNrvWait, SubmarineVolcanoBigColumn, SubmarineVolcanoBigColumn::exeWait); NERVE_DECL(SubmarineVolcanoBigColumnNrvBreak, SubmarineVolcanoBigColumn, SubmarineVolcanoBigColumn::exeBreak); -}; \ No newline at end of file +}; // namespace NrvSubmarineVolcanoBigColumn \ No newline at end of file diff --git a/include/Game/MapObj/Sun.hpp b/include/Game/MapObj/Sun.hpp index 34ce231ca..e2983fb79 100644 --- a/include/Game/MapObj/Sun.hpp +++ b/include/Game/MapObj/Sun.hpp @@ -4,8 +4,8 @@ class Sun : public LiveActor { public: - Sun(const char *); + Sun(const char*); virtual ~Sun(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); }; \ No newline at end of file diff --git a/include/Game/MapObj/SuperSpinDriver.hpp b/include/Game/MapObj/SuperSpinDriver.hpp index 4d0167eb9..df75a8f7d 100644 --- a/include/Game/MapObj/SuperSpinDriver.hpp +++ b/include/Game/MapObj/SuperSpinDriver.hpp @@ -13,10 +13,10 @@ namespace { class SuperSpinDriver : public LiveActor { public: - SuperSpinDriver(const char *, s32); + SuperSpinDriver(const char*, s32); virtual ~SuperSpinDriver(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void appear(); virtual void makeActorAppeared(); @@ -24,21 +24,21 @@ public: virtual void endClipped(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void initParamFromJMapInfo(const JMapInfoIter &); + void initParamFromJMapInfo(const JMapInfoIter&); void initGravityAxis(); void initSensor(); void initEmptyModel(); - void initEventCamera(const JMapInfoIter &); - void initShootPath(const JMapInfoIter &); - void initShootPathDraw(const JMapInfoIter &); + void initEventCamera(const JMapInfoIter&); + void initShootPath(const JMapInfoIter&); + void initShootPathDraw(const JMapInfoIter&); void initColor(); void initOperateRing(); - void initAppearState(const JMapInfoIter &); - bool canBind(HitSensor *, HitSensor *) const; - bool tryBind(HitSensor *, HitSensor *) const; + void initAppearState(const JMapInfoIter&); + bool canBind(HitSensor*, HitSensor*) const; + bool tryBind(HitSensor*, HitSensor*) const; bool tryEndCapture(); bool tryForceCancel(); bool tryShootStart(); @@ -52,15 +52,15 @@ public: void requestHide(); void requestShow(); - void exeEmptyNonActive(); - void exeEmptyAppear(); - void exeEmptyWait(); - void exeNonActive(); - void exeAppear(); - void exeWait(); - void exeCapture(); - void exeShootStart(); - void exeShoot(); + void exeEmptyNonActive(); + void exeEmptyAppear(); + void exeEmptyWait(); + void exeNonActive(); + void exeAppear(); + void exeWait(); + void exeCapture(); + void exeShootStart(); + void exeShoot(); inline void exeCoolDown(); inline void exeShootOnEnd(); @@ -69,7 +69,7 @@ public: void endBind(); void updateBindActorMatrix(); void updateBindActorPoseToShoot(f32); - void turnBindHead(const TVec3f &, f32); + void turnBindHead(const TVec3f&, f32); void moveBindPosToCenter(); void startPathDraw(); void endPathDraw(); @@ -83,56 +83,56 @@ public: bool isNeedEmptyModel() const; bool isRightToUse() const; - LiveActor* _8C; - SpinDriverShootPath* mShootPath; // 0x90 - SpinDriverCamera* mSpinDriverCamera; // 0x94 - SpinDriverOperateRing* mOperateRing; // 0x98 - SpinDriverPathDrawer* mPathDrawer; // 0x9C - ModelObj* mEmptyModel; // 0xA0 - TQuat4f _A4; - TQuat4f _B4; - TVec3f _C4; - TVec3f _D0; - TVec3f _DC; - TVec3f _E8; - TVec3f _F4; - TVec3f _100; - TVec3f _10C; - TVec3f _118; - TVec3f _124; - f32 _130; - f32 _134; - f32 _138; - f32 _13C; - f32 _140; - f32 _144; - f32 _148; - f32 _14C; - u32 _150; - u32 _154; - u32 _158; - u32 _15C; - u32 _160; - f32 _164; - u32 _168; - u32 _16C; - s32 mColor; // 0x170 - u8 _174; - u8 _175; - u8 _176; - u8 _177; - u32 _178; - u8 _17C; - u8 _17D; - u8 _17E; - u8 _17F; + LiveActor* _8C; + SpinDriverShootPath* mShootPath; // 0x90 + SpinDriverCamera* mSpinDriverCamera; // 0x94 + SpinDriverOperateRing* mOperateRing; // 0x98 + SpinDriverPathDrawer* mPathDrawer; // 0x9C + ModelObj* mEmptyModel; // 0xA0 + TQuat4f _A4; + TQuat4f _B4; + TVec3f _C4; + TVec3f _D0; + TVec3f _DC; + TVec3f _E8; + TVec3f _F4; + TVec3f _100; + TVec3f _10C; + TVec3f _118; + TVec3f _124; + f32 _130; + f32 _134; + f32 _138; + f32 _13C; + f32 _140; + f32 _144; + f32 _148; + f32 _14C; + u32 _150; + u32 _154; + u32 _158; + u32 _15C; + u32 _160; + f32 _164; + u32 _168; + u32 _16C; + s32 mColor; // 0x170 + u8 _174; + u8 _175; + u8 _176; + u8 _177; + u32 _178; + u8 _17C; + u8 _17D; + u8 _17E; + u8 _17F; }; namespace MR { - NameObj* createSuperSpinDriverYellow(const char *); - NameObj* createSuperSpinDriverGreen(const char *); - NameObj* createSuperSpinDriverPink(const char *); -}; + NameObj* createSuperSpinDriverYellow(const char*); + NameObj* createSuperSpinDriverGreen(const char*); + NameObj* createSuperSpinDriverPink(const char*); +}; // namespace MR namespace NrvSuperSpinDriver { NERVE_DECL_NULL(SuperSpinDriverNrvTryDemo); @@ -146,4 +146,4 @@ namespace NrvSuperSpinDriver { NERVE_DECL(SuperSpinDriverNrvShootStart, SuperSpinDriver, SuperSpinDriver::exeShootStart); NERVE_DECL_ONEND(SuperSpinDriverNrvShoot, SuperSpinDriver, SuperSpinDriver::exeShoot, SuperSpinDriver::exeShootOnEnd); NERVE_DECL(SuperSpinDriverNrvCoolDown, SuperSpinDriver, SuperSpinDriver::exeCoolDown); -}; \ No newline at end of file +}; // namespace NrvSuperSpinDriver \ No newline at end of file diff --git a/include/Game/MapObj/SurprisedGalaxy.hpp b/include/Game/MapObj/SurprisedGalaxy.hpp index c53b9b1ce..c61081e87 100644 --- a/include/Game/MapObj/SurprisedGalaxy.hpp +++ b/include/Game/MapObj/SurprisedGalaxy.hpp @@ -4,13 +4,13 @@ class SurprisedGalaxy : public LiveActor { public: - SurprisedGalaxy(const char *); + SurprisedGalaxy(const char*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void kill(); - virtual void attackSensor(HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver); + virtual void attackSensor(HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); void exeExit(); @@ -20,4 +20,4 @@ public: namespace NrvSurprisedGalaxy { NERVE(SurprisedGalaxyNrvExit); NERVE(SurprisedGalaxyNrvWait); -}; +}; // namespace NrvSurprisedGalaxy diff --git a/include/Game/MapObj/Swinger.hpp b/include/Game/MapObj/Swinger.hpp index de8503c38..176e78d94 100644 --- a/include/Game/MapObj/Swinger.hpp +++ b/include/Game/MapObj/Swinger.hpp @@ -5,23 +5,23 @@ class Swinger { public: - Swinger(const TVec3f *, MtxPtr, f32, f32, f32, const TVec3f *); + Swinger(const TVec3f*, MtxPtr, f32, f32, f32, const TVec3f*); void update(); - void accel(const TVec3f &); - void updateSwingMtx(const TVec3f &); + void accel(const TVec3f&); + void updateSwingMtx(const TVec3f&); const TVec3f* _0; - MtxPtr _4; - TVec3f _8; - TVec3f mAcceleration; // 0x14 - TVec3f _20; - f32 _2C; - f32 _30; - f32 _34; - const TVec3f *_38; - TVec3f _3C; - TVec3f _48; - TVec3f _54; - TPos3f _60; + MtxPtr _4; + TVec3f _8; + TVec3f mAcceleration; // 0x14 + TVec3f _20; + f32 _2C; + f32 _30; + f32 _34; + const TVec3f* _38; + TVec3f _3C; + TVec3f _48; + TVec3f _54; + TPos3f _60; }; \ No newline at end of file diff --git a/include/Game/MapObj/SwitchBox.hpp b/include/Game/MapObj/SwitchBox.hpp index d70d8e97a..c39d1819a 100644 --- a/include/Game/MapObj/SwitchBox.hpp +++ b/include/Game/MapObj/SwitchBox.hpp @@ -4,27 +4,27 @@ class SwitchBox : public LiveActor { public: - SwitchBox(const char *pName); + SwitchBox(const char* pName); - virtual void init(const JMapInfoIter &rIter); - virtual void initAfterPlacement(); - virtual void appear(); - virtual void kill(); - virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver); - virtual bool receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver); + virtual void init(const JMapInfoIter& rIter); + virtual void initAfterPlacement(); + virtual void appear(); + virtual void kill(); + virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); - void exeWait(); - void exeHit(); - void doHit(HitSensor *pSender, HitSensor *pReceiver); + void exeWait(); + void exeHit(); + void doHit(HitSensor* pSender, HitSensor* pReceiver); - u16 _8c; - u16 _8e; - u16 _90; - u8 _92; + u16 _8c; + u16 _8e; + u16 _90; + u8 _92; }; namespace NrvSwitchBox { - NERVE(SwitchBoxNrvWait); - NERVE(SwitchBoxNrvHit); -}; + NERVE(SwitchBoxNrvWait); + NERVE(SwitchBoxNrvHit); +}; // namespace NrvSwitchBox diff --git a/include/Game/MapObj/TimeAppearObj.hpp b/include/Game/MapObj/TimeAppearObj.hpp index 92f7fa7fd..c01942aae 100644 --- a/include/Game/MapObj/TimeAppearObj.hpp +++ b/include/Game/MapObj/TimeAppearObj.hpp @@ -4,10 +4,10 @@ class TimeAppearObj : public MapObjActor { public: - TimeAppearObj(const char *); + TimeAppearObj(const char*); virtual ~TimeAppearObj(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); void exeEnd(); @@ -18,4 +18,4 @@ public: namespace NrvTimeAppearObj { NERVE(TimeAppearObjNrvHide); NERVE(TimeAppearObjNrvEnd); -}; \ No newline at end of file +}; // namespace NrvTimeAppearObj \ No newline at end of file diff --git a/include/Game/MapObj/TransparentWall.hpp b/include/Game/MapObj/TransparentWall.hpp index e544479f6..45db84387 100644 --- a/include/Game/MapObj/TransparentWall.hpp +++ b/include/Game/MapObj/TransparentWall.hpp @@ -4,12 +4,12 @@ class TransparentWall : public InvisiblePolygonObj { public: - TransparentWall(const char *); + TransparentWall(const char*); virtual ~TransparentWall(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - s32 _BC; + s32 _BC; bool _C0; }; diff --git a/include/Game/MapObj/TreasureBoxCracked.hpp b/include/Game/MapObj/TreasureBoxCracked.hpp index 42a43fd51..b567a062e 100644 --- a/include/Game/MapObj/TreasureBoxCracked.hpp +++ b/include/Game/MapObj/TreasureBoxCracked.hpp @@ -5,35 +5,35 @@ namespace { static Color8 sPointLightColor(0xFF, 0xFF, 0x96, 0xFF); - const Vec sTopOpenStartOffset = { 0.0f, -100.0f, -250.0f }; - const Vec sTopOpenEndOffset = { 0.0f, 23.0f, -250.0f }; - const Vec sCoinOffset = { 0.0f, 130.0f, 0.0f }; - const Vec sChipOffset = { 0.0f, 170.0f, 0.0f }; - const Vec sKinokoOneUpOffset = { 0.0f, 130.0f, 0.0f }; - const Vec sKinokoLifeUpOffset = { 0.0f, 130.0f, 0.0f }; - const Vec sAirBubbleOffset = { 0.0f, 220.0f, 0.0f }; -}; + const Vec sTopOpenStartOffset = {0.0f, -100.0f, -250.0f}; + const Vec sTopOpenEndOffset = {0.0f, 23.0f, -250.0f}; + const Vec sCoinOffset = {0.0f, 130.0f, 0.0f}; + const Vec sChipOffset = {0.0f, 170.0f, 0.0f}; + const Vec sKinokoOneUpOffset = {0.0f, 130.0f, 0.0f}; + const Vec sKinokoLifeUpOffset = {0.0f, 130.0f, 0.0f}; + const Vec sAirBubbleOffset = {0.0f, 220.0f, 0.0f}; +}; // namespace class TreasureBoxCracked : public LiveActor { public: - TreasureBoxCracked(const char *); + TreasureBoxCracked(const char*); virtual ~TreasureBoxCracked(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); - CollisionParts* mBoxCollider; // 0x8C - TMtx34f _90; - u32 _C0; - s32 mOpenCondition; // 0xC4 - u32 _C8; - u32 _CC; - TVec3f _D0; - TVec3f _DC; - u8 _E8; - s32 _EC; - s32 _F0; + CollisionParts* mBoxCollider; // 0x8C + TMtx34f _90; + u32 _C0; + s32 mOpenCondition; // 0xC4 + u32 _C8; + u32 _CC; + TVec3f _D0; + TVec3f _DC; + u8 _E8; + s32 _EC; + s32 _F0; }; \ No newline at end of file diff --git a/include/Game/MapObj/TreasureSpot.hpp b/include/Game/MapObj/TreasureSpot.hpp index 0f33d9065..2e32614a3 100644 --- a/include/Game/MapObj/TreasureSpot.hpp +++ b/include/Game/MapObj/TreasureSpot.hpp @@ -4,12 +4,12 @@ class TreasureSpot : public MapObjActor { public: - TreasureSpot(const char *); + TreasureSpot(const char*); virtual ~TreasureSpot(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); void exeSpout(); void switchEmitGlow(); @@ -21,4 +21,4 @@ namespace NrvTreasureSpot { NERVE(TreasureSpotNrvWait); NERVE(TreasureSpotNrvEnd); NERVE(TreasureSpotNrvSpout); -}; \ No newline at end of file +}; // namespace NrvTreasureSpot \ No newline at end of file diff --git a/include/Game/MapObj/UFOBase.hpp b/include/Game/MapObj/UFOBase.hpp index d6b8d3d40..cf2f52168 100644 --- a/include/Game/MapObj/UFOBase.hpp +++ b/include/Game/MapObj/UFOBase.hpp @@ -9,47 +9,47 @@ class UFOBase : public LiveActor { public: - UFOBase(const char *); + UFOBase(const char*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); virtual void makeActorDead(); virtual void control(); virtual void calcAndSetBaseMtx(); virtual void initSensorType(); - - void initSubModel(const JMapInfoIter &, const char *) NO_INLINE; + + void initSubModel(const JMapInfoIter&, const char*) NO_INLINE; void exeWaitForPlayerOn(); void exeMove(); void inline exeWait(); - CollisionParts* mCollisionParts; // _84 - LodCtrl* mLODCtrl; // _90 - ModelObj* mModel; // _94 - MapPartsRailMover* mRailMover; // _98 - TVec3f _9C; - f32 _A8; - s32 _AC; - bool _B0; - const char* _B4; -}; + CollisionParts* mCollisionParts; // _84 + LodCtrl* mLODCtrl; // _90 + ModelObj* mModel; // _94 + MapPartsRailMover* mRailMover; // _98 + TVec3f _9C; + f32 _A8; + s32 _AC; + bool _B0; + const char* _B4; +}; class UFOSolid : public UFOBase { public: - UFOSolid(const char *); + UFOSolid(const char*); }; class UFOBreakable : public UFOBase { public: - UFOBreakable(const char *); + UFOBreakable(const char*); virtual void initSensorType(); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); }; namespace NrvUFOBase { - NERVE(UFOBaseNrvWait); - NERVE(UFOBaseNrvWaitForPlayerOn); - NERVE(UFOBaseNrvMove); - NERVE(UFOBaseNrvBreak); -}; + NERVE(UFOBaseNrvWait); + NERVE(UFOBaseNrvWaitForPlayerOn); + NERVE(UFOBaseNrvMove); + NERVE(UFOBaseNrvBreak); +}; // namespace NrvUFOBase diff --git a/include/Game/MapObj/UFOKinoko.hpp b/include/Game/MapObj/UFOKinoko.hpp index 21f3f0a57..bd0595712 100644 --- a/include/Game/MapObj/UFOKinoko.hpp +++ b/include/Game/MapObj/UFOKinoko.hpp @@ -7,15 +7,15 @@ class UFOKinoko : public MapObjActor { public: - UFOKinoko(const char *); + UFOKinoko(const char*); ~UFOKinoko(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - virtual void initCaseUseSwitchB(const MapObjActorInitInfo &); - virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo &); + virtual void initCaseUseSwitchB(const MapObjActorInitInfo&); + virtual void initCaseNoUseSwitchB(const MapObjActorInitInfo&); - static void makeArchiveList(NameObjArchiveListCollector *, const JMapInfoIter &); + static void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&); void startMove(); @@ -27,4 +27,4 @@ namespace NrvUFOKinoko { NERVE(HostTypeWait) NERVE(HostTypeMove) NERVE(HostTypeStop) -}; +}; // namespace NrvUFOKinoko diff --git a/include/Game/MapObj/ValveSwitch.hpp b/include/Game/MapObj/ValveSwitch.hpp index e8bfd474f..693d88385 100644 --- a/include/Game/MapObj/ValveSwitch.hpp +++ b/include/Game/MapObj/ValveSwitch.hpp @@ -5,14 +5,14 @@ class ValveSwitch : public LiveActor { public: - ValveSwitch(const char *); + ValveSwitch(const char*); virtual ~ValveSwitch(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeWait(); void exeAdjust(); @@ -20,10 +20,10 @@ public: void exeEnd(); void updateBindActorMtx(); - LiveActor* _8C; - TPos3f _90; - MapObjConnector* mObjConnector; // 0xC0 - bool _C4; + LiveActor* _8C; + TPos3f _90; + MapObjConnector* mObjConnector; // 0xC0 + bool _C4; }; namespace NrvValveSwitch { @@ -31,4 +31,4 @@ namespace NrvValveSwitch { NERVE_DECL_EXE(ValveSwitchNrvAdjust, ValveSwitch, Adjust); NERVE_DECL_EXE(ValveSwitchNrvValve, ValveSwitch, Valve); NERVE_DECL_EXE(ValveSwitchNrvEnd, ValveSwitch, End); -}; \ No newline at end of file +}; // namespace NrvValveSwitch \ No newline at end of file diff --git a/include/Game/MapObj/WatchTowerRotateStep.hpp b/include/Game/MapObj/WatchTowerRotateStep.hpp index 39436305c..ba7c30cd5 100644 --- a/include/Game/MapObj/WatchTowerRotateStep.hpp +++ b/include/Game/MapObj/WatchTowerRotateStep.hpp @@ -1,25 +1,25 @@ -#pragma once +#pragma once #include "Game/LiveActor/LiveActor.hpp" #include "Game/LiveActor/PartsModel.hpp" class WatchTowerRotateStep : public LiveActor { public: - WatchTowerRotateStep(const char *); + WatchTowerRotateStep(const char*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calcAndSetBaseMtx(); void exeMoveStart(); - void initLift(const JMapInfoIter &); + void initLift(const JMapInfoIter&); void attachLift(); - TVec3f mRotDeg; // 0x8C - PartsModel** mLifts; // 0x98 + TVec3f mRotDeg; // 0x8C + PartsModel** mLifts; // 0x98 }; namespace NrvWatchTowerRotateStep { NERVE(WatchTowerRotateStepNrvWait); NERVE(WatchTowerRotateStepNrvMoveStart); NERVE(WatchTowerRotateStepNrvMove); -}; \ No newline at end of file +}; // namespace NrvWatchTowerRotateStep \ No newline at end of file diff --git a/include/Game/MapObj/WaterLeakPipe.hpp b/include/Game/MapObj/WaterLeakPipe.hpp index 2bf401c00..f5cb6df7c 100644 --- a/include/Game/MapObj/WaterLeakPipe.hpp +++ b/include/Game/MapObj/WaterLeakPipe.hpp @@ -7,7 +7,7 @@ public: IceStepNoSlip(MtxPtr); virtual ~IceStepNoSlip(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); inline void exeAppear() { @@ -22,29 +22,29 @@ public: namespace NrvIceStepNoSlip { NERVE_DECL(IceStepNoSlipNrvAppear, IceStepNoSlip, IceStepNoSlip::exeAppear); NERVE_DECL(IceStepNoSlipNrvBreak, IceStepNoSlip, IceStepNoSlip::exeBreak); -}; +}; // namespace NrvIceStepNoSlip class WaterLeakPipe : public LiveActor { public: - WaterLeakPipe(const char *); + WaterLeakPipe(const char*); virtual ~WaterLeakPipe(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calcAnim(); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); void exeWait(); void exeFreeze(); void initPipeHeight(); - IceStepNoSlip* mIceStep; // 0x8C - f32 mPipeHeight; // 0x90 - MtxPtr mTopMtx; // 0x94 - MtxPtr mBottomMtx; // 0x98 - TVec3f _9C; + IceStepNoSlip* mIceStep; // 0x8C + f32 mPipeHeight; // 0x90 + MtxPtr mTopMtx; // 0x94 + MtxPtr mBottomMtx; // 0x98 + TVec3f _9C; }; namespace NrvWaterLeakPipe { NERVE_DECL(WaterLeakPipeNrvWait, WaterLeakPipe, WaterLeakPipe::exeWait); NERVE_DECL(WaterLeakPipeNrvFreeze, WaterLeakPipe, WaterLeakPipe::exeFreeze); -}; \ No newline at end of file +}; // namespace NrvWaterLeakPipe \ No newline at end of file diff --git a/include/Game/MapObj/WaterPressureBullet.hpp b/include/Game/MapObj/WaterPressureBullet.hpp index 73ef12fa1..dcc485545 100644 --- a/include/Game/MapObj/WaterPressureBullet.hpp +++ b/include/Game/MapObj/WaterPressureBullet.hpp @@ -4,38 +4,38 @@ class WaterPressureBullet : public LiveActor { public: - WaterPressureBullet(const char *); + WaterPressureBullet(const char*); virtual ~WaterPressureBullet(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void shotWaterBullet(LiveActor *, const TPos3f &, f32, bool, bool, bool, ActorCameraInfo **); + void shotWaterBullet(LiveActor*, const TPos3f&, f32, bool, bool, bool, ActorCameraInfo**); void exeFly(); void exeSpinKill(); bool startHostCamera() const; bool endHostCamera() const; - bool inviteMario(HitSensor *); + bool inviteMario(HitSensor*); void updateSuffererMtx(); - TVec3f _8C; - TVec3f _98; - LiveActor* _A4; - f32 _A8; - LiveActor* mHostActor; // 0xAC - bool _B0; - bool _B1; - bool _B2; - u8 _B3; - ActorCameraInfo** mCameraInfo; // 0xB4 + TVec3f _8C; + TVec3f _98; + LiveActor* _A4; + f32 _A8; + LiveActor* mHostActor; // 0xAC + bool _B0; + bool _B1; + bool _B2; + u8 _B3; + ActorCameraInfo** mCameraInfo; // 0xB4 }; namespace NrvWaterPressureBullet { NERVE(WaterPressureBulletNrvFly); NERVE(WaterPressureBulletNrvSpinKill); -}; \ No newline at end of file +}; // namespace NrvWaterPressureBullet \ No newline at end of file diff --git a/include/Game/MapObj/WaterPressureBulletHolder.hpp b/include/Game/MapObj/WaterPressureBulletHolder.hpp index 21c46c4f5..a08bd8794 100644 --- a/include/Game/MapObj/WaterPressureBulletHolder.hpp +++ b/include/Game/MapObj/WaterPressureBulletHolder.hpp @@ -5,12 +5,12 @@ class WaterPressureBulletHolder : public NameObj { public: - WaterPressureBulletHolder(const char *); + WaterPressureBulletHolder(const char*); virtual ~WaterPressureBulletHolder(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); WaterPressureBullet* callEmptyBullet(); - WaterPressureBullet* mBullets[0x10]; // 0xC + WaterPressureBullet* mBullets[0x10]; // 0xC }; \ No newline at end of file diff --git a/include/Game/MapObj/WaveFloatingForce.hpp b/include/Game/MapObj/WaveFloatingForce.hpp index 0e33e49e6..ff3c66043 100644 --- a/include/Game/MapObj/WaveFloatingForce.hpp +++ b/include/Game/MapObj/WaveFloatingForce.hpp @@ -4,16 +4,16 @@ class WaveFloatingForce { public: - WaveFloatingForce(const LiveActor *, s32, f32, bool); + WaveFloatingForce(const LiveActor*, s32, f32, bool); void update(); - f32 getCurrentValue() const; + f32 getCurrentValue() const; void updateNormal(); void updateOnPlayer(); - const LiveActor* mActor; // 0x0 - s32 _4; - f32 _8; - f32 _C; - bool _10; + const LiveActor* mActor; // 0x0 + s32 _4; + f32 _8; + f32 _C; + bool _10; }; \ No newline at end of file diff --git a/include/Game/MapObj/WoodBox.hpp b/include/Game/MapObj/WoodBox.hpp index 5cfb8c521..e3aa9c0ea 100644 --- a/include/Game/MapObj/WoodBox.hpp +++ b/include/Game/MapObj/WoodBox.hpp @@ -6,32 +6,32 @@ class BenefitItemObj; class WoodBox : public LiveActor { public: - WoodBox(const char *); + WoodBox(const char*); virtual ~WoodBox(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calcViewAndEntry(); virtual void kill(); virtual void control(); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeHit(); - void doHit(HitSensor *, HitSensor *); + void doHit(HitSensor*, HitSensor*); - u16 _8C; - u16 _8E; - u16 _90; - u16 _92; - bool _94; - bool _95; - bool _96; - bool _97; - Mtx _98; - s32 mCoinCount; // 0xC8 - s32 mStarBitCount; // 0xCC - ModelObj* mBrokenBoxModel; // 0xD0 - ModelObj* mStarDemoModel; // 0xD4 - BenefitItemObj* mOneUp; // 0xD8 + u16 _8C; + u16 _8E; + u16 _90; + u16 _92; + bool _94; + bool _95; + bool _96; + bool _97; + Mtx _98; + s32 mCoinCount; // 0xC8 + s32 mStarBitCount; // 0xCC + ModelObj* mBrokenBoxModel; // 0xD0 + ModelObj* mStarDemoModel; // 0xD4 + BenefitItemObj* mOneUp; // 0xD8 }; \ No newline at end of file diff --git a/include/Game/MapObj/YellowChip.hpp b/include/Game/MapObj/YellowChip.hpp index d7f8d9fe8..e3cc66dee 100644 --- a/include/Game/MapObj/YellowChip.hpp +++ b/include/Game/MapObj/YellowChip.hpp @@ -4,7 +4,7 @@ class YellowChip : public ChipBase { public: - YellowChip(const char *); + YellowChip(const char*); virtual ~YellowChip(); }; \ No newline at end of file diff --git a/include/Game/NPC/Butler.hpp b/include/Game/NPC/Butler.hpp index 6974ac407..80dc1af7a 100644 --- a/include/Game/NPC/Butler.hpp +++ b/include/Game/NPC/Butler.hpp @@ -9,44 +9,44 @@ class Butler : public NPCActor { public: - Butler(const char *); + Butler(const char*); virtual ~Butler(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void kill(); virtual void control(); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - void killIfBatlerMapAppear(); - void startDemoButlerReport(const char *); - void startDemoDomeLecture1(); - void startDemoDomeLecture2(); - void startDemoStarPiece1(); - void startDemoStarPiece2(); - void tryStartShowGalaxyMap(); - void resetStatus(); - bool messageBranchFunc(u32); - void initTalkCtrlArray(const JMapInfoIter &); - void initForAstroDome(const JMapInfoIter &); - void initForAstroGalaxy(const JMapInfoIter &); - TalkMessageCtrl* createTalkCtrl(const JMapInfoIter &, const char *) NO_INLINE; - void forceNerveToWait(); - void tryReplaceStarPieceIfExecLecture(); - bool tryStartStarPieceReaction(); - void exeStarPieceReaction(); - void exeDemo(); - void exeDemoDomeLecture2(); - void exeDemoStarPiece2(); - void exeDemoShowGalaxyMap(); - inline void exeDemoWait(); + void killIfBatlerMapAppear(); + void startDemoButlerReport(const char*); + void startDemoDomeLecture1(); + void startDemoDomeLecture2(); + void startDemoStarPiece1(); + void startDemoStarPiece2(); + void tryStartShowGalaxyMap(); + void resetStatus(); + bool messageBranchFunc(u32); + void initTalkCtrlArray(const JMapInfoIter&); + void initForAstroDome(const JMapInfoIter&); + void initForAstroGalaxy(const JMapInfoIter&); + TalkMessageCtrl* createTalkCtrl(const JMapInfoIter&, const char*) NO_INLINE; + void forceNerveToWait(); + void tryReplaceStarPieceIfExecLecture(); + bool tryStartStarPieceReaction(); + void exeStarPieceReaction(); + void exeDemo(); + void exeDemoDomeLecture2(); + void exeDemoStarPiece2(); + void exeDemoShowGalaxyMap(); + inline void exeDemoWait(); - TalkMessageCtrl** mTalkMessage; //15C - bool _160; - s32 _164; - s32 _168; + TalkMessageCtrl** mTalkMessage; //15C + bool _160; + s32 _164; + s32 _168; ButlerStateStarPieceReaction* mButlerState; //16C - bool _170; - bool _171; + bool _170; + bool _171; }; diff --git a/include/Game/NPC/ButlerExplain.hpp b/include/Game/NPC/ButlerExplain.hpp index dd55ea159..80ae0d2e8 100644 --- a/include/Game/NPC/ButlerExplain.hpp +++ b/include/Game/NPC/ButlerExplain.hpp @@ -5,15 +5,15 @@ class ButlerExplain : public NPCActor { public: - ButlerExplain(const char *); + ButlerExplain(const char*); virtual ~ButlerExplain(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - void startDemo(); + void startDemo(); inline void exeDemo(); - bool _D8; + bool _D8; TalkMessageCtrl* mTalk; }; diff --git a/include/Game/NPC/ButlerMap.hpp b/include/Game/NPC/ButlerMap.hpp index 9659a6717..2ff62f184 100644 --- a/include/Game/NPC/ButlerMap.hpp +++ b/include/Game/NPC/ButlerMap.hpp @@ -7,15 +7,15 @@ class ButlerMap : public NPCActor { public: - ButlerMap(const char *); + ButlerMap(const char*); virtual ~ButlerMap(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void kill(); virtual void control(); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void startLectureDemo(); void resetStatus(); @@ -28,5 +28,5 @@ public: void exeStarPieceReaction(); ButlerStateStarPieceReaction* _15C; - bool _160; + bool _160; }; diff --git a/include/Game/NPC/ButlerStateStarPieceReaction.hpp b/include/Game/NPC/ButlerStateStarPieceReaction.hpp index c515ee572..d59bdbee2 100644 --- a/include/Game/NPC/ButlerStateStarPieceReaction.hpp +++ b/include/Game/NPC/ButlerStateStarPieceReaction.hpp @@ -8,14 +8,14 @@ class TalkMessageCtrl; class ButlerStateStarPieceReaction : public ActorStateBase { public: - ButlerStateStarPieceReaction(LiveActor *, const JMapInfoIter &, const char *); + ButlerStateStarPieceReaction(LiveActor*, const JMapInfoIter&, const char*); virtual void init(); virtual void appear(); void exeWait(); - /* 0x0C */ LiveActor *mHost; - /* 0x10 */ TalkMessageCtrl *mTalkMessage; - /* 0x14 */ bool _14; + /* 0x0C */ LiveActor* mHost; + /* 0x10 */ TalkMessageCtrl* mTalkMessage; + /* 0x14 */ bool _14; }; diff --git a/include/Game/NPC/CollectTico.hpp b/include/Game/NPC/CollectTico.hpp index 24a8f5877..a7532611f 100644 --- a/include/Game/NPC/CollectTico.hpp +++ b/include/Game/NPC/CollectTico.hpp @@ -6,21 +6,21 @@ class StrayTico; class CollectTico : public LiveActor { public: - CollectTico(const char *); + CollectTico(const char*); virtual ~CollectTico(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - void exeWait(); - void exeCompleteDemo(); - void exeFlash(); - void exeAppearPowerStar(); + void exeWait(); + void exeCompleteDemo(); + void exeFlash(); + void exeAppearPowerStar(); inline void exeTryStartDemo(); - s32 calcNoRescuedCount() const; - void startAppearPowerStar(); + s32 calcNoRescuedCount() const; + void startAppearPowerStar(); - StrayTico** mStrayTicos; // 0x8C - s32 mTicoNum; // 0x90 - TVec3f _94; - u8 _A0; + StrayTico** mStrayTicos; // 0x8C + s32 mTicoNum; // 0x90 + TVec3f _94; + u8 _A0; }; diff --git a/include/Game/NPC/CometEventExecutorTimeLimit.hpp b/include/Game/NPC/CometEventExecutorTimeLimit.hpp index 1f3b260f3..c05dec739 100644 --- a/include/Game/NPC/CometEventExecutorTimeLimit.hpp +++ b/include/Game/NPC/CometEventExecutorTimeLimit.hpp @@ -15,7 +15,7 @@ public: virtual void kill(); void exeStartEvent(); - u32 getTimeLimit() const; + u32 getTimeLimit() const; private: /// @brief The pointer to the actor instance for the timer. diff --git a/include/Game/NPC/CometEventKeeper.hpp b/include/Game/NPC/CometEventKeeper.hpp index dbdc8e2b3..fb0bc5a90 100644 --- a/include/Game/NPC/CometEventKeeper.hpp +++ b/include/Game/NPC/CometEventKeeper.hpp @@ -11,17 +11,17 @@ public: /// @brief Creates a new `CometEventKeeper`. CometEventKeeper(); - void init(); - bool isStartEvent(const char*) const; - bool isStartTimeLimitEvent() const; - void startCometEventIfExist(); - void endCometEvent(); + void init(); + bool isStartEvent(const char*) const; + bool isStartTimeLimitEvent() const; + void startCometEventIfExist(); + void endCometEvent(); static u32 getTimeLimitFromTable(const GalaxyTimeLimitInfo*, int); - void initCometStatus(); + void initCometStatus(); private: /* 0x0 */ CometEventExecutorTimeLimit* mExecutorTimeLimit; - /* 0x4 */ GalaxyCometScreenFilter* mScreenFilter; - /* 0x8 */ const char* mCometName; - /* 0xC */ s32 mCometStateIndex; + /* 0x4 */ GalaxyCometScreenFilter* mScreenFilter; + /* 0x8 */ const char* mCometName; + /* 0xC */ s32 mCometStateIndex; }; diff --git a/include/Game/NPC/EventDirector.hpp b/include/Game/NPC/EventDirector.hpp index cac7da7c6..e25a96d0f 100644 --- a/include/Game/NPC/EventDirector.hpp +++ b/include/Game/NPC/EventDirector.hpp @@ -16,23 +16,23 @@ public: virtual void init(const JMapInfoIter& rIter); - /* 0x0C */ PowerStarEventKeeper* mPowerStarEventKeeper; - /* 0x10 */ StageStateKeeper* mStageStateKeeper; - /* 0x14 */ PowerStarHolder* mPowerStarHolder; - /* 0x18 */ CometEventKeeper* mCometEventKeeper; + /* 0x0C */ PowerStarEventKeeper* mPowerStarEventKeeper; + /* 0x10 */ StageStateKeeper* mStageStateKeeper; + /* 0x14 */ PowerStarHolder* mPowerStarHolder; + /* 0x18 */ CometEventKeeper* mCometEventKeeper; /* 0x1C */ TimeAttackEventKeeper* mTimeAttackEventKeeper; }; namespace EventFunction { - PowerStarEventKeeper* getPowerStarEventKeeper(); - StageStateKeeper* getStageStateKeeper(); - PowerStarHolder* getPowerStarHolder(); - CometEventKeeper* getCometEventKeeper(); + PowerStarEventKeeper* getPowerStarEventKeeper(); + StageStateKeeper* getStageStateKeeper(); + PowerStarHolder* getPowerStarHolder(); + CometEventKeeper* getCometEventKeeper(); TimeAttackEventKeeper* getTimeAttackEventKeeper(); - bool isStartCometEvent(const char*); - void startCometEvent(); - void endCometEvent(); -}; + bool isStartCometEvent(const char*); + void startCometEvent(); + void endCometEvent(); +}; // namespace EventFunction namespace MR { void declareEventPowerStar(const char*, s32, bool); @@ -44,4 +44,4 @@ namespace MR { bool isGrandEventPowerStar(const char*, s32); void appearEventPowerStar(const char*, s32, const TVec3f*, bool, bool); bool isEndEventPowerStarAppearDemo(const char*); -}; +}; // namespace MR diff --git a/include/Game/NPC/HoneyBee.hpp b/include/Game/NPC/HoneyBee.hpp index 2759e35e9..ba73d3286 100644 --- a/include/Game/NPC/HoneyBee.hpp +++ b/include/Game/NPC/HoneyBee.hpp @@ -10,25 +10,25 @@ class HoneyBee : public NPCActor { public: - HoneyBee(const char *); + HoneyBee(const char*); virtual ~HoneyBee(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); virtual void calcAndSetBaseMtx(); - static void makeArchiveList(NameObjArchiveListCollector *, const JMapInfoIter &); + static void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&); inline void exeWait(); inline void exeReaction(); - void exeFly(); - void exeDropLecture(); - void exeJumpLecture(); - void exeFlyLectureA(); - void exeFlyLectureB(); + void exeFly(); + void exeDropLecture(); + void exeJumpLecture(); + void exeFlyLectureA(); + void exeFlyLectureB(); - s32 _15C; + s32 _15C; TMtx34f _160; - TVec3f _190; - s32 _19C; - f32 _1A0; + TVec3f _190; + s32 _19C; + f32 _1A0; }; diff --git a/include/Game/NPC/HoneyQueen.hpp b/include/Game/NPC/HoneyQueen.hpp index 3524104d0..eefda4da8 100644 --- a/include/Game/NPC/HoneyQueen.hpp +++ b/include/Game/NPC/HoneyQueen.hpp @@ -8,29 +8,29 @@ class HoneyQueen : public NPCActor { public: - HoneyQueen(const char *); + HoneyQueen(const char*); virtual ~HoneyQueen(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void calcAnim(); virtual void control(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); - void fadeOut(); - void fadeIn(); - void talkEntry(); - void switchFunc(); - void exeWait(); + void fadeOut(); + void fadeIn(); + void talkEntry(); + void switchFunc(); + void exeWait(); inline void exeReady(); inline void exeDemo(); inline void exeFade(); - void exeTalk(); - void exeItch(); - void exeEvent(); + void exeTalk(); + void exeItch(); + void exeEvent(); inline void exeAfter(); - ModelObj* mNpcModel; + ModelObj* mNpcModel; CollisionParts* mCenterPart; CollisionParts* mCenterFurPart; CollisionParts* mFacePart; @@ -41,5 +41,5 @@ public: CollisionParts* mRArm02Part; CollisionParts* mRFoot01Part; CollisionParts* mTactilePart; - s32 _188; + s32 _188; }; diff --git a/include/Game/NPC/KoopaJr.hpp b/include/Game/NPC/KoopaJr.hpp index 56b364719..6d0d8aa68 100644 --- a/include/Game/NPC/KoopaJr.hpp +++ b/include/Game/NPC/KoopaJr.hpp @@ -4,10 +4,10 @@ class KoopaJr : public NPCActor { public: - KoopaJr(const char *); + KoopaJr(const char*); virtual ~KoopaJr(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); virtual void control(); virtual void calcAndSetBaseMtx(); diff --git a/include/Game/NPC/LuigiNPC.hpp b/include/Game/NPC/LuigiNPC.hpp index 3faeeadfc..705211094 100644 --- a/include/Game/NPC/LuigiNPC.hpp +++ b/include/Game/NPC/LuigiNPC.hpp @@ -9,37 +9,37 @@ class LuigiNPC : public NPCActor { public: - LuigiNPC(const char *); + LuigiNPC(const char*); virtual ~LuigiNPC(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void control(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - static void makeArchiveList(NameObjArchiveListCollector *, const JMapInfoIter &); - bool branchFunc(u32); - bool eventFunc(u32); - bool trySetNerveAfraid(); - void setWaitAction(); - void setAfraidAction(); - bool trySetNerveArrested(); - bool isDeclarePowerStarType(); - void exeWait(); - void exeReaction(); - void exeTakeOutStar(); - void exeAfraidWait(); - void exeAfraidSquat(); - void exeAfraidRise(); - void exeArrestedWait(); - void exeArrestedJump(); - void exeOnTreeWait(); - void exeOnTreeTouch(); - void exeOnTreeFall(); - void exeOnTreeLand(); + static void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&); + bool branchFunc(u32); + bool eventFunc(u32); + bool trySetNerveAfraid(); + void setWaitAction(); + void setAfraidAction(); + bool trySetNerveArrested(); + bool isDeclarePowerStarType(); + void exeWait(); + void exeReaction(); + void exeTakeOutStar(); + void exeAfraidWait(); + void exeAfraidSquat(); + void exeAfraidRise(); + void exeArrestedWait(); + void exeArrestedJump(); + void exeOnTreeWait(); + void exeOnTreeTouch(); + void exeOnTreeFall(); + void exeOnTreeLand(); TakeOutStar* mTakeOutStar; - s32 _160; + s32 _160; }; diff --git a/include/Game/NPC/MiiDatabase.hpp b/include/Game/NPC/MiiDatabase.hpp index 27af2fe70..1ca0e8cf7 100644 --- a/include/Game/NPC/MiiDatabase.hpp +++ b/include/Game/NPC/MiiDatabase.hpp @@ -10,6 +10,6 @@ public: ~MiiDatabase(); private: - /* 0x0 */ u8* _0; + /* 0x0 */ u8* _0; /* 0x4 */ MR::AssignableArray* mStoreDataArray; }; diff --git a/include/Game/NPC/MiiFaceIconHolder.hpp b/include/Game/NPC/MiiFaceIconHolder.hpp index 0508f67c4..e01f18b90 100644 --- a/include/Game/NPC/MiiFaceIconHolder.hpp +++ b/include/Game/NPC/MiiFaceIconHolder.hpp @@ -37,4 +37,4 @@ namespace MR { /// @brief Associates `pIcon` with the working `MiiFaceIconHolder` instance. /// @param pIcon The reference to the resource creator for the icon of a Mii character. void registerMiiFaceIcon(MiiFaceIcon* pIcon); -}; +}; // namespace MR diff --git a/include/Game/NPC/MiiFaceParts.hpp b/include/Game/NPC/MiiFaceParts.hpp index be62da384..a46f6b652 100644 --- a/include/Game/NPC/MiiFaceParts.hpp +++ b/include/Game/NPC/MiiFaceParts.hpp @@ -27,12 +27,12 @@ public: void initFaceModel(); bool tryChangeExpression(u32 expression); - /* 0x8C */ RFLCharModel* mCharModel; - /* 0x90 */ void* _90; + /* 0x8C */ RFLCharModel* mCharModel; + /* 0x90 */ void* _90; /* 0x94 */ MiiFaceRecipe* mRecipe; - /* 0x98 */ TPos3f _98; - /* 0xC8 */ MtxPtr _C8; + /* 0x98 */ TPos3f _98; + /* 0xC8 */ MtxPtr _C8; /* 0xCC */ FixedPosition* _CC; - /* 0xD0 */ bool _D0; - /* 0xD1 */ bool _D1; + /* 0xD0 */ bool _D0; + /* 0xD1 */ bool _D1; }; diff --git a/include/Game/NPC/MiiFacePartsHolder.hpp b/include/Game/NPC/MiiFacePartsHolder.hpp index 24b2ab38f..9519e698a 100644 --- a/include/Game/NPC/MiiFacePartsHolder.hpp +++ b/include/Game/NPC/MiiFacePartsHolder.hpp @@ -21,18 +21,18 @@ public: virtual void calcAnim(); virtual void calcViewAndEntry(); - void reinitCharModel(); - bool isInitEnd() const; - bool isError() const; + void reinitCharModel(); + bool isInitEnd() const; + bool isError() const; static MiiFaceParts* createPartsFromReceipe(const char*, const MiiFaceRecipe&); static MiiFaceParts* createPartsFromDefault(const char*, u16); - void drawEachActor(DrawPartsFuncPtr, const RFLDrawCoreSetting*) const; - void drawExtra() const; - void setTevOpa() const; - void setTevXlu() const; + void drawEachActor(DrawPartsFuncPtr, const RFLDrawCoreSetting*) const; + void drawExtra() const; + void setTevOpa() const; + void setTevXlu() const; - /* 0x30 */ u8* mRFLWorkBuffer; + /* 0x30 */ u8* mRFLWorkBuffer; /* 0x34 */ MiiDatabase* _34; - /* 0x38 */ RFLErrcode _38; - /* 0x3C */ s32 _3C; + /* 0x38 */ RFLErrcode _38; + /* 0x3C */ s32 _3C; }; diff --git a/include/Game/NPC/NPCActor.hpp b/include/Game/NPC/NPCActor.hpp index e7f3c3121..6e575c3a8 100644 --- a/include/Game/NPC/NPCActor.hpp +++ b/include/Game/NPC/NPCActor.hpp @@ -16,109 +16,109 @@ namespace NrvNPCActor { NERVE(NPCActorNrvWait); NERVE(NPCActorNrvTalk); NERVE(NPCActorNrvReaction); -}; +}; // namespace NrvNPCActor class NPCActorCaps { public: - NPCActorCaps(const char *); + NPCActorCaps(const char*); void setDefault(); void setIndirect(); const char* _0; - bool mInitModel; // 0x4 - const char* mObjectName; // 0x8 - u8 _C; - u8 _D; - u8 _E; - u8 _F; + bool mInitModel; // 0x4 + const char* mObjectName; // 0x8 + u8 _C; + u8 _D; + u8 _E; + u8 _F; const char* _10; - TVec3f mMessageOffset; // 0x14 - MtxPtr mTalkMtx; // 0x20 - const char* mTalkJointName; // 0x24 - u8 _28; - bool mConnectsToScene; // 0x29 - bool mUseLightCtrl; // 0x2A - bool mUseEffect; // 0x2B - bool mUseSounds; // 0x2C - u8 _2D; - u8 _2E; - u8 _2F; - u32 _30; - bool mCanBeHitByShell; // 0x34 - u8 _35; - u8 _36; - bool mUsesNerves; // 0x37 - u8 _38; - u8 _39; - u8 _3A; - u8 _3B; - f32 _3C; - bool mUseHitSensors; // 0x40 - u8 _41; - u8 _42; - u8 _43; + TVec3f mMessageOffset; // 0x14 + MtxPtr mTalkMtx; // 0x20 + const char* mTalkJointName; // 0x24 + u8 _28; + bool mConnectsToScene; // 0x29 + bool mUseLightCtrl; // 0x2A + bool mUseEffect; // 0x2B + bool mUseSounds; // 0x2C + u8 _2D; + u8 _2E; + u8 _2F; + u32 _30; + bool mCanBeHitByShell; // 0x34 + u8 _35; + u8 _36; + bool mUsesNerves; // 0x37 + u8 _38; + u8 _39; + u8 _3A; + u8 _3B; + f32 _3C; + bool mUseHitSensors; // 0x40 + u8 _41; + u8 _42; + u8 _43; const char* _44; - f32 mSensorSize; // 0x48 - TVec3f mSensorOffset; // 0x4C - u32 _58; - u8 _5C; - bool mUseShadow; // 0x5D - u8 _5E; - u8 _5F; - f32 _60; - bool mUseRail; // 0x64 - u8 _65; - u8 _66; - u8 _67; - bool mUseStarPointer; // 0x68 + f32 mSensorSize; // 0x48 + TVec3f mSensorOffset; // 0x4C + u32 _58; + u8 _5C; + bool mUseShadow; // 0x5D + u8 _5E; + u8 _5F; + f32 _60; + bool mUseRail; // 0x64 + u8 _65; + u8 _66; + u8 _67; + bool mUseStarPointer; // 0x68 const char* _6C; const char* _70; - TVec3f mStarPointerOffs; // 0x74 - f32 _80; - u32 mSceneConnectionType; // 0x84 - Nerve* mWaitNerve; // 0x88 - Nerve* mTalkNerve; // 0x8C - Nerve* mReactionNerve; // 0x90 + TVec3f mStarPointerOffs; // 0x74 + f32 _80; + u32 mSceneConnectionType; // 0x84 + Nerve* mWaitNerve; // 0x88 + Nerve* mTalkNerve; // 0x8C + Nerve* mReactionNerve; // 0x90 }; class NPCActor : public LiveActor { public: - NPCActor(const char *); + NPCActor(const char*); virtual ~NPCActor(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void makeActorAppeared(); virtual void kill(); virtual void makeActorDead(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); - static void makeArchiveList(NameObjArchiveListCollector *, const JMapInfoIter &); - static void addArchive(NameObjArchiveListCollector *, const NPCActorItem &); - static void makeArchiveListDefault(NameObjArchiveListCollector *, const JMapInfoIter &); + static void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&); + static void addArchive(NameObjArchiveListCollector*, const NPCActorItem&); + static void makeArchiveListDefault(NameObjArchiveListCollector*, const JMapInfoIter&); - bool initTalkCtrl(const JMapInfoIter &, const char *, const TVec3f &, MtxPtr); - bool initTalkCtrlDirect(const JMapInfoIter &, const char *, const TVec3f &, MtxPtr); - bool calcJointScale(TPos3f *, const JointControllerInfo &); - void turnToPlayer(); - void turnToPlayer(f32); - void turnToPlayer(f32, f32, f32); - void turnToDefault(f32); - void setToDefault(); - void pushNerve(const Nerve *); - Nerve* popAndPushNerve(const Nerve *); + bool initTalkCtrl(const JMapInfoIter&, const char*, const TVec3f&, MtxPtr); + bool initTalkCtrlDirect(const JMapInfoIter&, const char*, const TVec3f&, MtxPtr); + bool calcJointScale(TPos3f*, const JointControllerInfo&); + void turnToPlayer(); + void turnToPlayer(f32); + void turnToPlayer(f32, f32, f32); + void turnToDefault(f32); + void setToDefault(); + void pushNerve(const Nerve*); + Nerve* popAndPushNerve(const Nerve*); Nerve* popNerve(); - bool tryPullNullNerve(); - bool isEmptyNerve() const; - bool isScaleAnim() const; - bool isPointingSe() const; - void updateReaction(); - void updateScaleCtrl(); + bool tryPullNullNerve(); + bool isEmptyNerve() const; + bool isScaleAnim() const; + bool isPointingSe() const; + void updateReaction(); + void updateScaleCtrl(); bool tryPushNullNerve(); @@ -127,9 +127,9 @@ public: void setInitPose(); - void initialize(const JMapInfoIter &, const NPCActorCaps &); + void initialize(const JMapInfoIter&, const NPCActorCaps&); - void equipment(const NPCActorItem &, bool); + void equipment(const NPCActorItem&, bool); void setBaseMtx(MtxPtr); @@ -139,7 +139,7 @@ public: _138 = "Pointing"; _13C = "Reaction"; } - + inline void setDefaultsParam() { mParam._14 = "Wait"; mParam._18 = "Turn"; @@ -148,62 +148,62 @@ public: _130 = "Spin"; _134 = "Trampled"; _138 = "Pointing"; - _13C = "Reaction"; + _13C = "Reaction"; } inline void setDefaults2() { _130 = "Spin"; _134 = "Trampled"; _138 = "Pointing"; - } + } - LodCtrl* mLodCtrl; // 0x8C - TalkMessageCtrl* mMsgCtrl; // 0x90 - PartsModel* _94; - PartsModel* _98; - u32 _9C; - TQuat4f _A0; - TVec4f _B0; - TVec3f _C0; - TVec3f _CC; - u8 _D8; - u8 _D9; - u8 _DA; - u8 _DB; - u8 _DC; - u8 _DD; - u8 _DE; - u8 _DF; - u8 _E0; - u8 _E1; - u8 _E2; - u8 _E3; - u8 _E4; - u8 _E5; - u8 _E6; - u8 _E7; - MR::ActorTalkParam mParam; // 0xE8 - f32 _10C; - f32 _110; - f32 _114; - u32 _118; - const char* _11C; - const char* _120; - u8 _124; - u8 _125; - u8 _126; - u8 _127; - u8 _128; - f32 _12C; - const char* _130; - const char* _134; - const char* _138; - const char* _13C; - AnimScaleController* mScaleController; // 0x140 - u32 _144; - Nerve* mCurNerve; // 0x148 - Nerve* mWaitNerve; // 0x14C - Nerve* mTalkNerve; // 0x150 - Nerve* mReactionNerve; // 0x154 - u32 _158; + LodCtrl* mLodCtrl; // 0x8C + TalkMessageCtrl* mMsgCtrl; // 0x90 + PartsModel* _94; + PartsModel* _98; + u32 _9C; + TQuat4f _A0; + TVec4f _B0; + TVec3f _C0; + TVec3f _CC; + u8 _D8; + u8 _D9; + u8 _DA; + u8 _DB; + u8 _DC; + u8 _DD; + u8 _DE; + u8 _DF; + u8 _E0; + u8 _E1; + u8 _E2; + u8 _E3; + u8 _E4; + u8 _E5; + u8 _E6; + u8 _E7; + MR::ActorTalkParam mParam; // 0xE8 + f32 _10C; + f32 _110; + f32 _114; + u32 _118; + const char* _11C; + const char* _120; + u8 _124; + u8 _125; + u8 _126; + u8 _127; + u8 _128; + f32 _12C; + const char* _130; + const char* _134; + const char* _138; + const char* _13C; + AnimScaleController* mScaleController; // 0x140 + u32 _144; + Nerve* mCurNerve; // 0x148 + Nerve* mWaitNerve; // 0x14C + Nerve* mTalkNerve; // 0x150 + Nerve* mReactionNerve; // 0x154 + u32 _158; }; diff --git a/include/Game/NPC/NPCActorItem.hpp b/include/Game/NPC/NPCActorItem.hpp index fdd0f2dfc..d0d376aa0 100644 --- a/include/Game/NPC/NPCActorItem.hpp +++ b/include/Game/NPC/NPCActorItem.hpp @@ -5,10 +5,9 @@ class NPCActorItem { public: inline NPCActorItem() { - } - NPCActorItem(const char *pName) NO_INLINE { + NPCActorItem(const char* pName) NO_INLINE { mActor = pName; _4 = ""; _8 = ""; @@ -16,9 +15,9 @@ public: _10 = ""; } - const char* mActor; // 0x00 + const char* mActor; // 0x00 const char* _4; const char* _8; - const char* mArchive; // 0x0C + const char* mArchive; // 0x0C const char* _10; }; diff --git a/include/Game/NPC/NPCParameter.hpp b/include/Game/NPC/NPCParameter.hpp index 5dd31acc0..8d4053033 100644 --- a/include/Game/NPC/NPCParameter.hpp +++ b/include/Game/NPC/NPCParameter.hpp @@ -9,49 +9,49 @@ class NPCActorItem; class NPCParameterEdit { public: - NPCParameterEdit(const char *, const char **, bool); + NPCParameterEdit(const char*, const char**, bool); - virtual void read(JMapInfo *, s32); + virtual void read(JMapInfo*, s32); }; class NPCParameterBool { public: - NPCParameterBool(const char *, bool); + NPCParameterBool(const char*, bool); - virtual void read(JMapInfo *, s32); + virtual void read(JMapInfo*, s32); }; class NPCParameterV3f { public: - NPCParameterV3f(const char *, TVec3f *, f32, f32); + NPCParameterV3f(const char*, TVec3f*, f32, f32); - virtual void read(JMapInfo *, s32); + virtual void read(JMapInfo*, s32); }; class NPCParameterJoint { public: - NPCParameterJoint(const char *, const char *, const char **); + NPCParameterJoint(const char*, const char*, const char**); - virtual void read(JMapInfo *, s32); + virtual void read(JMapInfo*, s32); }; class NPCParameterReader { public: - NPCParameterReader(const char *); + NPCParameterReader(const char*); - virtual void read(JMapInfo *, s32); + virtual void read(JMapInfo*, s32); }; class NPCCapsParameterReader : public NPCParameterReader { public: - NPCCapsParameterReader(const char *); + NPCCapsParameterReader(const char*); void init(); }; class NPCItemParameterReader : public NPCParameterReader { public: - NPCItemParameterReader(const char *); + NPCItemParameterReader(const char*); - void copy(const NPCActorItem *); + void copy(const NPCActorItem*); }; diff --git a/include/Game/NPC/NPCSupportRail.hpp b/include/Game/NPC/NPCSupportRail.hpp index 2efd3bd98..4efa068f9 100644 --- a/include/Game/NPC/NPCSupportRail.hpp +++ b/include/Game/NPC/NPCSupportRail.hpp @@ -3,9 +3,9 @@ #include "Game/LiveActor/LiveActor.hpp" class NPCSupportRail : public LiveActor { -public: - NPCSupportRail(const char *); +public: + NPCSupportRail(const char*); virtual ~NPCSupportRail(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); }; diff --git a/include/Game/NPC/Peach.hpp b/include/Game/NPC/Peach.hpp index 5cbcdb9d1..cb7c0d345 100644 --- a/include/Game/NPC/Peach.hpp +++ b/include/Game/NPC/Peach.hpp @@ -4,10 +4,10 @@ class Peach : public NPCActor { public: - Peach(const char *); + Peach(const char*); virtual ~Peach(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); void exeWait(); }; diff --git a/include/Game/NPC/Penguin.hpp b/include/Game/NPC/Penguin.hpp index ff3f99b49..5e12bf314 100644 --- a/include/Game/NPC/Penguin.hpp +++ b/include/Game/NPC/Penguin.hpp @@ -7,7 +7,7 @@ class RemovableTurtle { public: - RemovableTurtle(LiveActor *, bool); + RemovableTurtle(LiveActor*, bool); bool isPullRange() const; bool tryRemove(); @@ -16,13 +16,13 @@ public: class Penguin : public NPCActor { public: - Penguin(const char *); + Penguin(const char*); virtual ~Penguin(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeReaction(); void exeWait(); diff --git a/include/Game/NPC/PenguinMaster.hpp b/include/Game/NPC/PenguinMaster.hpp index 79ff50a5f..31d6e617b 100644 --- a/include/Game/NPC/PenguinMaster.hpp +++ b/include/Game/NPC/PenguinMaster.hpp @@ -4,12 +4,12 @@ class PenguinMaster : public NPCActor { public: - PenguinMaster(const char *); + PenguinMaster(const char*); virtual ~PenguinMaster(); - virtual void init(const JMapInfoIter &); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual void init(const JMapInfoIter&); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); inline void exeWait(); - void exeReaction(); + void exeReaction(); }; diff --git a/include/Game/NPC/PenguinStudent.hpp b/include/Game/NPC/PenguinStudent.hpp index ecf50b477..97290efcf 100644 --- a/include/Game/NPC/PenguinStudent.hpp +++ b/include/Game/NPC/PenguinStudent.hpp @@ -7,13 +7,13 @@ class PenguinStudent : public NPCActor { public: - PenguinStudent(const char *); + PenguinStudent(const char*); virtual ~PenguinStudent(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); bool branchFunc(u32); bool tryReleaseTurtle(); @@ -21,8 +21,8 @@ public: void exeLead(); void exeSlow(); - s32 _15C; + s32 _15C; RemovableTurtle* mRemovableTurtle; //_160 - LiveActor* mActor; //_164 - f32 _168; + LiveActor* mActor; //_164 + f32 _168; }; diff --git a/include/Game/NPC/PowerStarEventKeeper.hpp b/include/Game/NPC/PowerStarEventKeeper.hpp index 94e676f49..ad934fe77 100644 --- a/include/Game/NPC/PowerStarEventKeeper.hpp +++ b/include/Game/NPC/PowerStarEventKeeper.hpp @@ -4,10 +4,10 @@ #include "JSystem/JGeometry.hpp" struct PowerStarInfo { - u8 _0; - u8 _1; - u8 _2; - u8 _3; + u8 _0; + u8 _1; + u8 _2; + u8 _3; const char* _4; }; @@ -16,18 +16,18 @@ public: PowerStarEventKeeper(); void initStarInfoTable(); - s32 findStarID(const char *) const; - void declareStar(const char *, const char *, s32, bool); - bool isGreen(const char *, s32) const; - bool isRed(const char *, s32) const; - bool isGrand(const char *, s32) const; + s32 findStarID(const char*) const; + void declareStar(const char*, const char*, s32, bool); + bool isGreen(const char*, s32) const; + bool isRed(const char*, s32) const; + bool isGrand(const char*, s32) const; void initStarInfoTableAfterPlacement(); - void requestAppearPowerStar(const char *, s32, const TVec3f *, bool, bool); + void requestAppearPowerStar(const char*, s32, const TVec3f*, bool, bool); bool isExistPowerStarAtScenario(int) const; - bool isCorrectStarIdWithBBS(const char *, const char *, s32) const; - bool isSuccess(const char *, s32) const; + bool isCorrectStarIdWithBBS(const char*, const char*, s32) const; + bool isSuccess(const char*, s32) const; - u32 _0; - s32 mPowerStarNum; // 0x4 - PowerStarInfo** mInfoTbl; // 0x8 + u32 _0; + s32 mPowerStarNum; // 0x4 + PowerStarInfo** mInfoTbl; // 0x8 }; \ No newline at end of file diff --git a/include/Game/NPC/RabbitStateCaught.hpp b/include/Game/NPC/RabbitStateCaught.hpp index a71d54380..e62f063fe 100644 --- a/include/Game/NPC/RabbitStateCaught.hpp +++ b/include/Game/NPC/RabbitStateCaught.hpp @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Game/LiveActor/LiveActor.hpp" #include "Game/NPC/TalkMessageCtrl.hpp" @@ -12,21 +12,21 @@ public: virtual void init(); virtual void appear(); virtual void control(); - void unusePowerStarModel(); - void exeCaught(); - void exeCaughtLand(); - void exeCaughtEvent(); - void setCaughtStartMarioPose(); - void blendBaseMatrixToMario(f32 f) const; + void unusePowerStarModel(); + void exeCaught(); + void exeCaughtLand(); + void exeCaughtEvent(); + void setCaughtStartMarioPose(); + void blendBaseMatrixToMario(f32 f) const; - s32 _C; + s32 _C; TQuat4f _10; - TVec3f _20; - s32 _2C; - s32 _30; + TVec3f _20; + s32 _2C; + s32 _30; TMtx34f _34; - s32 _60; - bool _64; + s32 _60; + bool _64; }; const size_t test = sizeof(RabbitStateCaught); @@ -36,4 +36,4 @@ namespace NrvRabbitStateCaught { NERVE_DECL_EXE(RabbitStateCaughtNrvCaught, RabbitStateCaught, Caught); NERVE_DECL_EXE(RabbitStateCaughtNrvCaughtLand, RabbitStateCaught, CaughtLand); NERVE_DECL_EXE(RabbitStateCaughtNrvCaughtEvent, RabbitStateCaught, CaughtEvent); -} +} // namespace NrvRabbitStateCaught diff --git a/include/Game/NPC/RabbitStateWaitStart.hpp b/include/Game/NPC/RabbitStateWaitStart.hpp index a10937d9e..3dcd2449c 100644 --- a/include/Game/NPC/RabbitStateWaitStart.hpp +++ b/include/Game/NPC/RabbitStateWaitStart.hpp @@ -13,27 +13,27 @@ public: virtual void control(); virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); virtual bool receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); - void setTalkActionName(const char* pName); - void requestTrample(); - void requestSpin(); - void requestHitReaction(); - bool isEnableReaction() const; - bool trySmallTurn(); - bool tryTalk(); - bool tryPointing(); - void exeWait(); - void exeSmallTurn(); - void exeHitReaction(); - void exeTrample(); - void exeSpin(); - void exePointing(); - void exeTalk(); + void setTalkActionName(const char* pName); + void requestTrample(); + void requestSpin(); + void requestHitReaction(); + bool isEnableReaction() const; + bool trySmallTurn(); + bool tryTalk(); + bool tryPointing(); + void exeWait(); + void exeSmallTurn(); + void exeHitReaction(); + void exeTrample(); + void exeSpin(); + void exePointing(); + void exeTalk(); - u32 _8; - u32 _C; - u32 _10; - u32 _14; - u32 _18; + u32 _8; + u32 _C; + u32 _10; + u32 _14; + u32 _18; bool _1C; }; @@ -45,4 +45,4 @@ namespace NrvRabbitStateWatiStart { NERVE_DECL_EXE(RabbitStateWaitStartNrvSpin, RabbitStateWaitStart, Spin); NERVE_DECL_EXE(RabbitStateWaitStartNrvPointing, RabbitStateWaitStart, Pointing); NERVE_DECL_EXE(RabbitStateWaitStartNrvTalk, RabbitStateWaitStart, Talk); -} +} // namespace NrvRabbitStateWatiStart diff --git a/include/Game/NPC/SignBoard.hpp b/include/Game/NPC/SignBoard.hpp index bcaade55b..4fdb5025f 100644 --- a/include/Game/NPC/SignBoard.hpp +++ b/include/Game/NPC/SignBoard.hpp @@ -7,12 +7,12 @@ class FollowCollisionArea; class SignBoard : public NPCActor { public: - SignBoard(const char *); + SignBoard(const char*); virtual ~SignBoard(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - virtual void attackSensor(HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); void exeWait(); diff --git a/include/Game/NPC/StrayTico.hpp b/include/Game/NPC/StrayTico.hpp index be40bbbb6..7aba4671e 100644 --- a/include/Game/NPC/StrayTico.hpp +++ b/include/Game/NPC/StrayTico.hpp @@ -7,19 +7,19 @@ class CollectTico; class StrayTico : public LiveActor { public: - StrayTico(const char *, CollectTico *); + StrayTico(const char*, CollectTico*); virtual ~StrayTico(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPush(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPush(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - bool requestCompleteDemo(const TVec3f &, const TVec3f &, f32); + bool requestCompleteDemo(const TVec3f&, const TVec3f&, f32); void exeWait(); void exeGlad(); void exeChase(); @@ -32,15 +32,15 @@ public: bool isCompleteDemoEnd() const; void noticeEnd(); - CollectTico* mParent; // 0x8C - PartsModel* mBubbleModel; // 0x90 - TQuat4f _94; - TVec3f _A4; - TVec3f _B0; - TVec3f _BC; - TVec3f _C8; - TVec3f _D4; - TVec3f _E0; - f32 _EC; - f32 _F0; + CollectTico* mParent; // 0x8C + PartsModel* mBubbleModel; // 0x90 + TQuat4f _94; + TVec3f _A4; + TVec3f _B0; + TVec3f _BC; + TVec3f _C8; + TVec3f _D4; + TVec3f _E0; + f32 _EC; + f32 _F0; }; diff --git a/include/Game/NPC/TalkBalloon.hpp b/include/Game/NPC/TalkBalloon.hpp index 48a246a33..6d2679dba 100644 --- a/include/Game/NPC/TalkBalloon.hpp +++ b/include/Game/NPC/TalkBalloon.hpp @@ -6,9 +6,9 @@ class TalkMessageCtrl; class TalkBalloon : public LayoutActor { public: - TalkBalloon(const char *); + TalkBalloon(const char*); - virtual void open(TalkMessageCtrl *); + virtual void open(TalkMessageCtrl*); virtual void close(); virtual void updateBalloon(); virtual void updateTalking(); @@ -18,5 +18,5 @@ public: virtual void skipMessage(); virtual bool isTextAppearedAll(); - TalkMessageCtrl *_20; + TalkMessageCtrl* _20; }; diff --git a/include/Game/NPC/TalkDirector.hpp b/include/Game/NPC/TalkDirector.hpp index 5e1336bf8..94e75a412 100644 --- a/include/Game/NPC/TalkDirector.hpp +++ b/include/Game/NPC/TalkDirector.hpp @@ -18,85 +18,85 @@ public: TalkDirector(const char*); virtual ~TalkDirector(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); - bool request(TalkMessageCtrl *, bool); - bool test(TalkMessageCtrl *, bool, bool); - bool start(TalkMessageCtrl *, bool, bool, bool); - void updateMessage(); - void prepTalk(TalkMessageCtrl *, bool, bool, bool); - void termTalk(); - void initState(TalkMessageCtrl *); - bool isInvalidTalk() const; - void appearYesNoSelector(const TalkMessageCtrl *) const; - u32 getDemoType(const TalkMessageCtrl *, bool) const; - u8 getBranchResult(u16); - void initBranchResult(); - void pauseOff(); - void balloonOff(); - bool isSystemTalking() const; - bool isNormalTalking() const; + bool request(TalkMessageCtrl*, bool); + bool test(TalkMessageCtrl*, bool, bool); + bool start(TalkMessageCtrl*, bool, bool, bool); + void updateMessage(); + void prepTalk(TalkMessageCtrl*, bool, bool, bool); + void termTalk(); + void initState(TalkMessageCtrl*); + bool isInvalidTalk() const; + void appearYesNoSelector(const TalkMessageCtrl*) const; + u32 getDemoType(const TalkMessageCtrl*, bool) const; + u8 getBranchResult(u16); + void initBranchResult(); + void pauseOff(); + void balloonOff(); + bool isSystemTalking() const; + bool isNormalTalking() const; LiveActor* getTalkingActor() const; - void exePrep(); - void exeTalk(); - void exeSlct(); - void exeNext(); - void exeTerm(); + void exePrep(); + void exeTalk(); + void exeSlct(); + void exeNext(); + void exeTerm(); - MR::AssignableArray mMsgControls; // 0x20 - TalkPeekZ* mPeekZ; // 0x2C - TalkBalloonHolder* mBalloonHolder; // 0x30 - TalkStateHolder* mStateHolder; // 0x34 - TalkMessageCtrl* mMsgCtrl; // 0x38 - u32 _3C; - u32 _40; - bool _44; - bool _45; - bool _46; - bool _47; - TalkState* mTalkState; // 0x48 - bool _4C; - bool _4D; - bool _4E; - bool mIsInvalidClipping; // 0x4F - bool _50; - u32 mDemoType; // 0x54 - bool _58; - bool _59; - bool _5A; - bool _5B; - TalkMessageInfo mMessageInfo; // 0x5C - ActorCameraInfo* mCameraInfo; // 0x68 - LiveActor* mHostActor; // 0x6C - bool mIsKinopioExplorerRescued; // 0x70 - bool mIsKinopioExplorerOrganize; // 0x71 - bool mIsKinopioExplorerTalkGetGrandStar2; // 0x72 - bool mIsKinopioExplorerTrickComet; // 0x73 - bool mIsKinopioExplorerTalkGetGrandStar3; // 0x74 - bool mIsKinopioExplorerStartMessenger; // 0x75 - bool mIsKinopioExplorerTalkGetGrandStar4; // 0x76 - bool mIsKinopioExplorerTalkGetGrandStar5; // 0x77 - bool mIsKinopioExplorerTalkGetGrandStar6; // 0x78 - bool mIsKinopioExplorerTalkGoFinalBattle; // 0x79 - bool mIsEndLuigiHideAndSeek; // 0x7A - bool mIsKinopioExplorerCompleteTrickComet; // 0x7B - bool _7C; - bool _7D; - bool mHasOneGreenStar; // 0x7E - bool mHasTwoGreenStars; // 0x7F - bool mHasThreeGreenStars; // 0x80 - bool mIsUnlockedRedDriver; // 0x81 - bool _82; - bool mIsActiveLuigiHideAndSeek; // 0x83 - bool mIsGalaxyPurpleCometLaunch; // 0x84 - bool misRosettaTalkTorchLecture; // 0x85 - bool mIsRosettaTalkTrickComet; // 0x86 - bool mIsRosettaTalkKoopa; // 0x87 - bool mIsRosettaTalkCountDownStart; // 0x88 - bool mIsRosettaTalkAstroDemoRecover; // 0x89 - bool mIsRosettaTalkTorchProgress; // 0x8A - bool mIsOnGameEventFlagViewNormalEnding; // 0x8B + MR::AssignableArray mMsgControls; // 0x20 + TalkPeekZ* mPeekZ; // 0x2C + TalkBalloonHolder* mBalloonHolder; // 0x30 + TalkStateHolder* mStateHolder; // 0x34 + TalkMessageCtrl* mMsgCtrl; // 0x38 + u32 _3C; + u32 _40; + bool _44; + bool _45; + bool _46; + bool _47; + TalkState* mTalkState; // 0x48 + bool _4C; + bool _4D; + bool _4E; + bool mIsInvalidClipping; // 0x4F + bool _50; + u32 mDemoType; // 0x54 + bool _58; + bool _59; + bool _5A; + bool _5B; + TalkMessageInfo mMessageInfo; // 0x5C + ActorCameraInfo* mCameraInfo; // 0x68 + LiveActor* mHostActor; // 0x6C + bool mIsKinopioExplorerRescued; // 0x70 + bool mIsKinopioExplorerOrganize; // 0x71 + bool mIsKinopioExplorerTalkGetGrandStar2; // 0x72 + bool mIsKinopioExplorerTrickComet; // 0x73 + bool mIsKinopioExplorerTalkGetGrandStar3; // 0x74 + bool mIsKinopioExplorerStartMessenger; // 0x75 + bool mIsKinopioExplorerTalkGetGrandStar4; // 0x76 + bool mIsKinopioExplorerTalkGetGrandStar5; // 0x77 + bool mIsKinopioExplorerTalkGetGrandStar6; // 0x78 + bool mIsKinopioExplorerTalkGoFinalBattle; // 0x79 + bool mIsEndLuigiHideAndSeek; // 0x7A + bool mIsKinopioExplorerCompleteTrickComet; // 0x7B + bool _7C; + bool _7D; + bool mHasOneGreenStar; // 0x7E + bool mHasTwoGreenStars; // 0x7F + bool mHasThreeGreenStars; // 0x80 + bool mIsUnlockedRedDriver; // 0x81 + bool _82; + bool mIsActiveLuigiHideAndSeek; // 0x83 + bool mIsGalaxyPurpleCometLaunch; // 0x84 + bool misRosettaTalkTorchLecture; // 0x85 + bool mIsRosettaTalkTrickComet; // 0x86 + bool mIsRosettaTalkKoopa; // 0x87 + bool mIsRosettaTalkCountDownStart; // 0x88 + bool mIsRosettaTalkAstroDemoRecover; // 0x89 + bool mIsRosettaTalkTorchProgress; // 0x8A + bool mIsOnGameEventFlagViewNormalEnding; // 0x8B }; namespace MR { @@ -105,4 +105,4 @@ namespace MR { void invalidateTalkDirector(); void setTalkDirectorDrawSyncToken(); bool isActiveTalkBalloonShort(); -}; +}; // namespace MR diff --git a/include/Game/NPC/TalkMessageCtrl.hpp b/include/Game/NPC/TalkMessageCtrl.hpp index 7f9f3a6ae..c979f668c 100644 --- a/include/Game/NPC/TalkMessageCtrl.hpp +++ b/include/Game/NPC/TalkMessageCtrl.hpp @@ -9,32 +9,33 @@ class TalkMessageInfo; class CustomTagArg { public: - inline CustomTagArg(int a1, u32 a2) : mIntArg(a1), _4(a2) { } - inline CustomTagArg(const wchar_t *a1, u32 a2) : mCharArg(a1), _4(a2) { } + inline CustomTagArg(int a1, u32 a2) + : mIntArg(a1), _4(a2) {} + inline CustomTagArg(const wchar_t* a1, u32 a2) + : mCharArg(a1), _4(a2) {} - inline void operator=(const CustomTagArg &rhs) { + inline void operator=(const CustomTagArg& rhs) { mCharArg = rhs.mCharArg; _4 = rhs._4; } union { - int mIntArg; + int mIntArg; const wchar_t* mCharArg; }; u32 _4; }; - class TalkMessageCtrl : public NameObj { public: - TalkMessageCtrl(LiveActor *, const TVec3f &, MtxPtr); + TalkMessageCtrl(LiveActor*, const TVec3f&, MtxPtr); virtual ~TalkMessageCtrl(); - void createMessage(const JMapInfoIter &, const char *); - void createMessageDirect(const JMapInfoIter &, const char *); - u32 getMessageID() const; + void createMessage(const JMapInfoIter&, const char*); + void createMessageDirect(const JMapInfoIter&, const char*); + u32 getMessageID() const; bool requestTalk(); bool requestTalkForce(); void startTalk(); @@ -44,63 +45,63 @@ public: void startTalkForceWithoutDemoPuppetable(); void endTalk(); void updateBalloonPos(); - bool isNearPlayer(const TalkMessageCtrl *); + bool isNearPlayer(const TalkMessageCtrl*); bool isNearPlayer(f32) const; void rootNodePre(bool); void rootNodePst(); bool isCurrentNodeContinue() const; void rootNodeEve(); void rootNodeSel(bool); - void registerBranchFunc(const TalkMessageFuncBase &); - void registerEventFunc(const TalkMessageFuncBase &); - void registerAnimeFunc(const TalkMessageFuncBase &); - void registerKillFunc(const TalkMessageFuncBase &); + void registerBranchFunc(const TalkMessageFuncBase&); + void registerEventFunc(const TalkMessageFuncBase&); + void registerAnimeFunc(const TalkMessageFuncBase&); + void registerKillFunc(const TalkMessageFuncBase&); void readMessage(); bool isSelectYesNo() const; - void setMessageArg(const CustomTagArg &rArg) { + void setMessageArg(const CustomTagArg& rArg) { mTagArg = rArg; } - bool inMessageArea() const; - void startCamera(s32); + bool inMessageArea() const; + void startCamera(s32); const char* getBranchID() const; - LiveActor* mHostActor; // 0xC - TalkNodeCtrl* mNodeCtrl; // 0x10 - s32 mZoneID; // 0x14 - u32 _18; - TVec3f _1C; - MtxPtr mMtx; // 0x28 - TVec3f _2C; - f32 mTalkDistance; // 0x38 - u32 _3C; - u32 mAlreadyDoneFlags; // 0x40 - bool mIsOnRootNodeAuto; // 0x44 - bool mIsOnReadNodeAuto; // 0x45 - bool mIsStartOnlyFront; // 0x46 - ActorCameraInfo* mCameraInfo; // 0x48 - TalkMessageFuncBase* mBranchFunc; // 0x4C - TalkMessageFuncBase* mEventFunc; // 0x50 - TalkMessageFuncBase* mAnimeFunc; // 0x54 - TalkMessageFuncBase* mKillFunc; // 0x58 - CustomTagArg mTagArg; // 0x5C + LiveActor* mHostActor; // 0xC + TalkNodeCtrl* mNodeCtrl; // 0x10 + s32 mZoneID; // 0x14 + u32 _18; + TVec3f _1C; + MtxPtr mMtx; // 0x28 + TVec3f _2C; + f32 mTalkDistance; // 0x38 + u32 _3C; + u32 mAlreadyDoneFlags; // 0x40 + bool mIsOnRootNodeAuto; // 0x44 + bool mIsOnReadNodeAuto; // 0x45 + bool mIsStartOnlyFront; // 0x46 + ActorCameraInfo* mCameraInfo; // 0x48 + TalkMessageFuncBase* mBranchFunc; // 0x4C + TalkMessageFuncBase* mEventFunc; // 0x50 + TalkMessageFuncBase* mAnimeFunc; // 0x54 + TalkMessageFuncBase* mKillFunc; // 0x58 + CustomTagArg mTagArg; // 0x5C }; class TalkFunction { public: - static bool isShortTalk(const TalkMessageCtrl *); - static bool isComposeTalk(const TalkMessageCtrl *); - static bool isSelectTalk(const TalkMessageCtrl *); - bool isEventNode(const TalkMessageCtrl *); + static bool isShortTalk(const TalkMessageCtrl*); + static bool isComposeTalk(const TalkMessageCtrl*); + static bool isSelectTalk(const TalkMessageCtrl*); + bool isEventNode(const TalkMessageCtrl*); - static bool requestTalkSystem(TalkMessageCtrl *, bool); - static void startTalkSystem(TalkMessageCtrl *, bool, bool, bool); - static void endTalkSystem(TalkMessageCtrl *); - static bool isTalkSystemStart(const TalkMessageCtrl *); - static bool isTalkSystemEnd(const TalkMessageCtrl *); + static bool requestTalkSystem(TalkMessageCtrl*, bool); + static void startTalkSystem(TalkMessageCtrl*, bool, bool, bool); + static void endTalkSystem(TalkMessageCtrl*); + static bool isTalkSystemStart(const TalkMessageCtrl*); + static bool isTalkSystemEnd(const TalkMessageCtrl*); static bool getBranchAstroGalaxyResult(u16); - static void registerTalkSystem(TalkMessageCtrl *); + static void registerTalkSystem(TalkMessageCtrl*); - static TalkMessageInfo* getMessageInfo(const TalkMessageCtrl *); + static TalkMessageInfo* getMessageInfo(const TalkMessageCtrl*); }; diff --git a/include/Game/NPC/TalkMessageFunc.hpp b/include/Game/NPC/TalkMessageFunc.hpp index 07caaa92d..14ab11181 100644 --- a/include/Game/NPC/TalkMessageFunc.hpp +++ b/include/Game/NPC/TalkMessageFunc.hpp @@ -5,20 +5,19 @@ class TalkMessageFuncBase { public: - virtual void operator()(u32) const = 0; + virtual void operator()(u32) const = 0; virtual TalkMessageFuncBase* clone() const = 0; - virtual TalkMessageFuncBase* clone(JKRHeap *) const = 0; + virtual TalkMessageFuncBase* clone(JKRHeap*) const = 0; }; -template +template class TalkMessageFuncM : public TalkMessageFuncBase { public: - inline TalkMessageFuncM(T call, U callee) + inline TalkMessageFuncM(T call, U callee) : mCaller(call), mCallee(callee) { } inline TalkMessageFuncM() { - } virtual void operator()(u32 arg) const { @@ -29,7 +28,7 @@ public: return new TalkMessageFuncM(*this); } - virtual TalkMessageFuncM* clone(JKRHeap *pHeap) const { + virtual TalkMessageFuncM* clone(JKRHeap* pHeap) const { return new (pHeap, 0) TalkMessageFuncM(*this); }; @@ -37,12 +36,12 @@ public: U mCallee; }; -template -static TalkMessageFuncM TalkMessageFunc(T* a1, bool (T::*a2)(u32)) NO_INLINE { - return TalkMessageFuncM(a1, a2); +template +static TalkMessageFuncM TalkMessageFunc(T* a1, bool (T::*a2)(u32)) NO_INLINE { + return TalkMessageFuncM(a1, a2); } -template -static inline TalkMessageFuncM TalkMessageFunc_Inline(T* a1, bool (T::*a2)(u32)) { - return TalkMessageFuncM(a1, a2); +template +static inline TalkMessageFuncM TalkMessageFunc_Inline(T* a1, bool (T::*a2)(u32)) { + return TalkMessageFuncM(a1, a2); } diff --git a/include/Game/NPC/TalkMessageInfo.hpp b/include/Game/NPC/TalkMessageInfo.hpp index 9e8a2a14e..94de0bce9 100644 --- a/include/Game/NPC/TalkMessageInfo.hpp +++ b/include/Game/NPC/TalkMessageInfo.hpp @@ -22,10 +22,10 @@ public: u8* _0; u16 _4; - s8 _6; - u8 mCameraType; - u8 mTalkType; - u8 mBalloonType; - s8 _A; - s8 _B; + s8 _6; + u8 mCameraType; + u8 mTalkType; + u8 mBalloonType; + s8 _A; + s8 _B; }; diff --git a/include/Game/NPC/TalkNodeCtrl.hpp b/include/Game/NPC/TalkNodeCtrl.hpp index 7008424d8..d971c5678 100644 --- a/include/Game/NPC/TalkNodeCtrl.hpp +++ b/include/Game/NPC/TalkNodeCtrl.hpp @@ -7,60 +7,58 @@ class RecursiveHelper; class TalkMessageHistory { public: - void entry(u16); bool search(u16) const; - u16 mHistory[0x10]; // 0x0 - s32 mCount; // 0x20 + u16 mHistory[0x10]; // 0x0 + s32 mCount; // 0x20 }; class TalkNode { public: - - u8 mNodeType; // 0x0 - u8 mGroupID; // 0x1 - u16 mIndex; // 0x2 - u16 mNextIdx; // 0x4 - u16 mNextGroup; // 0x6 + u8 mNodeType; // 0x0 + u8 mGroupID; // 0x1 + u16 mIndex; // 0x2 + u16 mNextIdx; // 0x4 + u16 mNextGroup; // 0x6 }; class MessageNode { public: - const char* mMessage; // 0x0 + const char* mMessage; // 0x0 }; class TalkNodeCtrl { public: TalkNodeCtrl(); - void createFlowNodeDirect(TalkMessageCtrl *, const JMapInfoIter &, const char *, ActorCameraInfo **); - void resetFlowNode(); - void resetTempFlowNode(); - void recordTempFlowNode(); - void forwardFlowNode(); - bool isExistNextNode() const; - bool isNextNodeMessage() const; - bool isCurrentNodeEvent() const; - TalkNode* getNextNode() const; - TalkNode* getNextNodeBranch() const; - TalkNode* getCurrentNodeBranch() const; - TalkNode* getCurrentNodeMessage() const; - TalkNode* getCurrentNodeEvent() const; - TalkNode* getNextNodeEvent() const; - void updateMessage(); - void readMessage(); + void createFlowNodeDirect(TalkMessageCtrl*, const JMapInfoIter&, const char*, ActorCameraInfo**); + void resetFlowNode(); + void resetTempFlowNode(); + void recordTempFlowNode(); + void forwardFlowNode(); + bool isExistNextNode() const; + bool isNextNodeMessage() const; + bool isCurrentNodeEvent() const; + TalkNode* getNextNode() const; + TalkNode* getNextNodeBranch() const; + TalkNode* getCurrentNodeBranch() const; + TalkNode* getCurrentNodeMessage() const; + TalkNode* getCurrentNodeEvent() const; + TalkNode* getNextNodeEvent() const; + void updateMessage(); + void readMessage(); const wchar_t* getSubMessage() const; - void forwardCurrentBranchNode(bool); - void createFlowNode(TalkMessageCtrl *, const JMapInfoIter &, const char *, ActorCameraInfo **); - void initNodeRecursive(TalkMessageCtrl *, const JMapInfoIter &, ActorCameraInfo *, RecursiveHelper *); + void forwardCurrentBranchNode(bool); + void createFlowNode(TalkMessageCtrl*, const JMapInfoIter&, const char*, ActorCameraInfo**); + void initNodeRecursive(TalkMessageCtrl*, const JMapInfoIter&, ActorCameraInfo*, RecursiveHelper*); - u32 _0; - s32 mCurrentNodeIdx; // 0x4 - TalkMessageInfo mMessageInfo; // 0x8 - TalkMessageHistory mHistory; // 0x14 - TalkNode* _38; - TalkNode* mCurrentNode; // 0x3C - TalkNode* mFlowNode; // 0x40 - s16 mNodeData; // 0x44 + u32 _0; + s32 mCurrentNodeIdx; // 0x4 + TalkMessageInfo mMessageInfo; // 0x8 + TalkMessageHistory mHistory; // 0x14 + TalkNode* _38; + TalkNode* mCurrentNode; // 0x3C + TalkNode* mFlowNode; // 0x40 + s16 mNodeData; // 0x44 }; \ No newline at end of file diff --git a/include/Game/NPC/TalkState.hpp b/include/Game/NPC/TalkState.hpp index 494b27275..33cf414fa 100644 --- a/include/Game/NPC/TalkState.hpp +++ b/include/Game/NPC/TalkState.hpp @@ -13,8 +13,8 @@ class TalkState { public: TalkState(); - virtual void init(TalkMessageCtrl *, TalkBalloon *); - virtual bool prep(const TalkMessageCtrl *) { + virtual void init(TalkMessageCtrl*, TalkBalloon*); + virtual bool prep(const TalkMessageCtrl*) { return true; } @@ -23,39 +23,37 @@ public: } virtual void open() { - } - virtual bool talk(const TalkMessageCtrl *) { + virtual bool talk(const TalkMessageCtrl*) { return true; } virtual void clos() { - } - virtual bool term(const TalkMessageCtrl *) { + virtual bool term(const TalkMessageCtrl*) { return true; } virtual u32 getPageCount() const; - + void balloonOff() const; bool isLostMessage(const TalkMessageCtrl*) const; bool isSelfInterrupt(const TalkMessageCtrl*) const; - - TalkMessageCtrl *_04; - /* 0x08 */ TalkBalloon *mBalloon; - u32 mMessageID; // 0xC + + TalkMessageCtrl* _04; + /* 0x08 */ TalkBalloon* mBalloon; + u32 mMessageID; // 0xC }; class TalkStateShort : public TalkState { public: TalkStateShort(); - virtual bool prep(const TalkMessageCtrl *); + virtual bool prep(const TalkMessageCtrl*); virtual void open(); - virtual bool talk(const TalkMessageCtrl *); + virtual bool talk(const TalkMessageCtrl*); virtual void clos(); }; @@ -63,45 +61,45 @@ class TalkStateEvent : public TalkState { public: TalkStateEvent(); - virtual bool prep(const TalkMessageCtrl *); + virtual bool prep(const TalkMessageCtrl*); virtual bool test() NO_INLINE; virtual void open(); - virtual bool talk(const TalkMessageCtrl *); + virtual bool talk(const TalkMessageCtrl*); virtual void clos(); - virtual bool term(const TalkMessageCtrl *); - virtual u32 getPageCount() const; + virtual bool term(const TalkMessageCtrl*); + virtual u32 getPageCount() const; - s32 _10; - s32 _14; + s32 _10; + s32 _14; TalkSupportPlayerWatcher* _18; - u8 _1C; - bool _1D; - /* 0x20 */ u32 mPageCount; + u8 _1C; + bool _1D; + /* 0x20 */ u32 mPageCount; }; class TalkStateNormal : public TalkStateEvent { public: TalkStateNormal(); - virtual bool prep(const TalkMessageCtrl *); + virtual bool prep(const TalkMessageCtrl*); virtual bool test(); virtual void clos(); - virtual bool term(const TalkMessageCtrl *); - void updateButton(); + virtual bool term(const TalkMessageCtrl*); + void updateButton(); - IconAButton *_24; + IconAButton* _24; }; class TalkStateCompose : public TalkStateNormal { public: TalkStateCompose(); - virtual void init(TalkMessageCtrl *, TalkBalloon *); - virtual bool prep(const TalkMessageCtrl *); + virtual void init(TalkMessageCtrl*, TalkBalloon*); + virtual bool prep(const TalkMessageCtrl*); virtual bool test(); virtual void open(); - /* 0x28 */ TalkBalloon *mSecondBalloon; + /* 0x28 */ TalkBalloon* mSecondBalloon; }; class TalkStateHolder { @@ -110,17 +108,17 @@ public: void update(); void pauseOff(); - u32 getState(const TalkMessageCtrl *); + u32 getState(const TalkMessageCtrl*); - TalkSupportPlayerWatcher *_00; - LayoutActor *_04; - /* 0x08 */ u32 mTalkShort; - /* 0x0C */ u32 mTalkNormal; - /* 0x10 */ u32 mTalkEvent; - /* 0x14 */ u32 mTalkCompose; - /* 0x18 */ u32 mTalkUnknown; + TalkSupportPlayerWatcher* _00; + LayoutActor* _04; + /* 0x08 */ u32 mTalkShort; + /* 0x0C */ u32 mTalkNormal; + /* 0x10 */ u32 mTalkEvent; + /* 0x14 */ u32 mTalkCompose; + /* 0x18 */ u32 mTalkUnknown; }; namespace MR { - void startTalkSound(unsigned char, const LiveActor *); + void startTalkSound(unsigned char, const LiveActor*); }; diff --git a/include/Game/NPC/TalkTextFormer.hpp b/include/Game/NPC/TalkTextFormer.hpp index bb1faf0d4..85e6796b5 100644 --- a/include/Game/NPC/TalkTextFormer.hpp +++ b/include/Game/NPC/TalkTextFormer.hpp @@ -7,17 +7,17 @@ struct CustomTagArg; class TalkTextFormer { public: - TalkTextFormer(LayoutActor *, const char *); + TalkTextFormer(LayoutActor*, const char*); - void formMessage(const wchar_t *, s32); - void setArg(const CustomTagArg &, s32); + void formMessage(const wchar_t*, s32); + void setArg(const CustomTagArg&, s32); bool nextPage(); bool hasNextPage() const; void updateTalking(); bool isTextAppearedAll() const; - LayoutActor* mHostActor; // 0x0 - const wchar_t* mMsg; // 0x4 - u32 _8; - const char* mPaneName; // 0xC + LayoutActor* mHostActor; // 0x0 + const wchar_t* mMsg; // 0x4 + u32 _8; + const char* mPaneName; // 0xC }; diff --git a/include/Game/NPC/Tico.hpp b/include/Game/NPC/Tico.hpp index caac1ed4b..b3fdad7ac 100644 --- a/include/Game/NPC/Tico.hpp +++ b/include/Game/NPC/Tico.hpp @@ -9,50 +9,50 @@ class TicoDemoGetPower; class Tico : public NPCActor { public: - Tico(const char *); + Tico(const char*); virtual ~Tico(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); - static void makeArchiveList(NameObjArchiveListCollector *, const JMapInfoIter &); + static void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&); - void initBase(s32); - void initBase(const JMapInfoIter &, s32); - void initMessage(const JMapInfoIter &, const char *); - void initMessage(const char *); - bool tryReaction(); - void setNerveMeta(); - void setNerveWait(); - bool killFunc(u32); - void exeReaction(); - void exeDelight(); - void exeAppear(); - void exeNoReaction(); - void exeWait(); - void exeMeta(); - void exeBlue0(); - void exeBlue1(); + void initBase(s32); + void initBase(const JMapInfoIter&, s32); + void initMessage(const JMapInfoIter&, const char*); + void initMessage(const char*); + bool tryReaction(); + void setNerveMeta(); + void setNerveWait(); + bool killFunc(u32); + void exeReaction(); + void exeDelight(); + void exeAppear(); + void exeNoReaction(); + void exeWait(); + void exeMeta(); + void exeBlue0(); + void exeBlue1(); inline void exeRed0(); - void exeRed1(); - void exeRed2(); - void exeGuide0(); - void exeGuide1(); - void exeGuide2(); - void exeGuide3(); - void exeLead0(); + void exeRed1(); + void exeRed2(); + void exeGuide0(); + void exeGuide1(); + void exeGuide2(); + void exeGuide3(); + void exeLead0(); inline void exeTalk(); inline void exeSpin0(); - u32 _15C; - TVec3f _160; - f32 _16C; - TicoDemoGetPower* mDemoGetPower; // 0x170 - TalkMessageCtrl* _174; - MtxPtr _178; - Color8 _17C; - const Nerve* _180; - DemoStarter mDemoStarter; // 0x184 + u32 _15C; + TVec3f _160; + f32 _16C; + TicoDemoGetPower* mDemoGetPower; // 0x170 + TalkMessageCtrl* _174; + MtxPtr _178; + Color8 _17C; + const Nerve* _180; + DemoStarter mDemoStarter; // 0x184 }; diff --git a/include/Game/NPC/TicoAstro.hpp b/include/Game/NPC/TicoAstro.hpp index f77ac2ebc..aa789db39 100644 --- a/include/Game/NPC/TicoAstro.hpp +++ b/include/Game/NPC/TicoAstro.hpp @@ -4,8 +4,8 @@ class TicoAstro : public Tico { public: - TicoAstro(const char *); + TicoAstro(const char*); virtual ~TicoAstro(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); }; diff --git a/include/Game/NPC/TicoComet.hpp b/include/Game/NPC/TicoComet.hpp index 8b9239249..f8ea97e9d 100644 --- a/include/Game/NPC/TicoComet.hpp +++ b/include/Game/NPC/TicoComet.hpp @@ -5,11 +5,11 @@ class TicoEat : public Tico { public: - TicoEat(const char *); + TicoEat(const char*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); virtual void startReactionSound(); void initStarPiece(s32); @@ -24,14 +24,14 @@ public: u32 _190; s32 _194; - s32 _198; + s32 _198; }; class TicoComet : public TicoEat { public: - TicoComet(const char *); + TicoComet(const char*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void startReactionSound(); bool branchFunc(u32); diff --git a/include/Game/NPC/TicoDemoGetPower.hpp b/include/Game/NPC/TicoDemoGetPower.hpp index 1ea173117..7065b1713 100644 --- a/include/Game/NPC/TicoDemoGetPower.hpp +++ b/include/Game/NPC/TicoDemoGetPower.hpp @@ -7,11 +7,11 @@ class Tico; class TicoDemoGetPower : public NerveExecutor { public: - TicoDemoGetPower(Tico *, const JMapInfoIter &); + TicoDemoGetPower(Tico*, const JMapInfoIter&); void startDemo(); void exeWait(); void exeDemo(); - Tico* mTico; // 0x08 + Tico* mTico; // 0x08 }; diff --git a/include/Game/NPC/TicoDomeLecture.hpp b/include/Game/NPC/TicoDomeLecture.hpp index 8b6772b82..1fe7d624d 100644 --- a/include/Game/NPC/TicoDomeLecture.hpp +++ b/include/Game/NPC/TicoDomeLecture.hpp @@ -4,10 +4,10 @@ class TicoDomeLecture : public LiveActor { public: - TicoDomeLecture(const char *); + TicoDomeLecture(const char*); virtual ~TicoDomeLecture(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); void exeWait(); diff --git a/include/Game/NPC/TicoFat.hpp b/include/Game/NPC/TicoFat.hpp index 6d141defd..925949449 100644 --- a/include/Game/NPC/TicoFat.hpp +++ b/include/Game/NPC/TicoFat.hpp @@ -13,78 +13,78 @@ class SpinDriverShootPath; class TicoFat : public NPCActor { public: - TicoFat(const char *); + TicoFat(const char*); virtual ~TicoFat(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void kill(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); virtual void shootStarPiece(); virtual void receiveStarPiece(s32); virtual void startEat(); virtual bool enableAppear(); - virtual void initStarPieceSaveData(const JMapInfoIter &); + virtual void initStarPieceSaveData(const JMapInfoIter&); virtual void addStarPieceSaveData(s32); virtual void disappear(bool); virtual void appearInformation() const; - static void makeArchiveList(NameObjArchiveListCollector *, const JMapInfoIter &); + static void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&); - const char* getActionName(const char *); - void setCameraParam(); - bool eventFunc(u32); - f32 calcScale(); - void setScale(f32); - void setMessage(s32); - bool tryMetamorphosis(); - void emitScreenEffect(); - void updateScreenEffect(); - s32 getDanceSeTranspose() const; - void startAbsorbSound(); - void updateGuidance(); - void updatePointing(); - void updateGoods(); - void exeReaction(); - void exePrep(); - void exeWait(); - void exePoint(); - void exeEat(); - void exeChem(); - void exeTest(); - void exeFullness(); - void exeMeta(); - void exeDemo(); - void exeFly(); - void exeWipeOut(); - void exeWipeIn(); - void exeInfo(); - void exeAfter(); + const char* getActionName(const char*); + void setCameraParam(); + bool eventFunc(u32); + f32 calcScale(); + void setScale(f32); + void setMessage(s32); + bool tryMetamorphosis(); + void emitScreenEffect(); + void updateScreenEffect(); + s32 getDanceSeTranspose() const; + void startAbsorbSound(); + void updateGuidance(); + void updatePointing(); + void updateGoods(); + void exeReaction(); + void exePrep(); + void exeWait(); + void exePoint(); + void exeEat(); + void exeChem(); + void exeTest(); + void exeFullness(); + void exeMeta(); + void exeDemo(); + void exeFly(); + void exeWipeOut(); + void exeWipeIn(); + void exeInfo(); + void exeAfter(); - ActorCameraInfo* mCameraInfo; // 0x15C - BenefitItemObj* mItem; // 0x160 - FullnessMeter* mMeter; // 0x164 - SpinDriverShootPath* mShootPath; // 0x168 - TalkMessageCtrl* _16C; - u8 _170; - bool mStartEat; // 0x171 - u8 _172; - u8 _173; - s32 _174; - s32 _178; - TPos3f _17C; - TPos3f _1AC; - s32 _1DC; - s32 _1E0; - s32 _1E4; - s32 mCurrentFed; // 0x1E8 - s32 _1EC; - u32 _1F0; - s32 _1F4; - f32 _1F8; - f32 _1FC; - u32 _200; - s32 _204; + ActorCameraInfo* mCameraInfo; // 0x15C + BenefitItemObj* mItem; // 0x160 + FullnessMeter* mMeter; // 0x164 + SpinDriverShootPath* mShootPath; // 0x168 + TalkMessageCtrl* _16C; + u8 _170; + bool mStartEat; // 0x171 + u8 _172; + u8 _173; + s32 _174; + s32 _178; + TPos3f _17C; + TPos3f _1AC; + s32 _1DC; + s32 _1E0; + s32 _1E4; + s32 mCurrentFed; // 0x1E8 + s32 _1EC; + u32 _1F0; + s32 _1F4; + f32 _1F8; + f32 _1FC; + u32 _200; + s32 _204; }; diff --git a/include/Game/NPC/TicoGalaxy.hpp b/include/Game/NPC/TicoGalaxy.hpp index 6b48ac355..ee81ed017 100644 --- a/include/Game/NPC/TicoGalaxy.hpp +++ b/include/Game/NPC/TicoGalaxy.hpp @@ -6,19 +6,19 @@ class TicoStarRing; class TicoGalaxy : public TicoFat { public: - TicoGalaxy(const char *); + TicoGalaxy(const char*); virtual ~TicoGalaxy(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void initAfterPlacement(); virtual void shootStarPiece(); virtual void startEat(); virtual bool enableAppear(); - virtual void initStarPieceSaveData(const JMapInfoIter &); + virtual void initStarPieceSaveData(const JMapInfoIter&); virtual void addStarPieceSaveData(s32); virtual void disappear(bool); virtual void appearInformation() const; - const char* mGalaxyName; // 0x208 - TicoStarRing* mStarRing; // 0x20C + const char* mGalaxyName; // 0x208 + TicoStarRing* mStarRing; // 0x20C }; diff --git a/include/Game/NPC/TicoRail.hpp b/include/Game/NPC/TicoRail.hpp index 2b9e41679..3f5a0a863 100644 --- a/include/Game/NPC/TicoRail.hpp +++ b/include/Game/NPC/TicoRail.hpp @@ -6,15 +6,15 @@ class TicoRail : public LiveActor { public: - TicoRail(const char *); + TicoRail(const char*); virtual ~TicoRail(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); virtual void control(); virtual void calcAndSetBaseMtx(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); void exeWait(); void exeLookAround(); @@ -26,9 +26,9 @@ public: void exeTalkCancel(); void exeGoodBye(); bool isGreaterEqualStepAndRandom(s32) const; - bool isSameRailActor(const LiveActor *) const; + bool isSameRailActor(const LiveActor*) const; - TVec3f _8C; + TVec3f _8C; LiveActor* _98; - LodCtrl* mLodCtrl; // 0x9C + LodCtrl* mLodCtrl; // 0x9C }; diff --git a/include/Game/NPC/TicoReading.hpp b/include/Game/NPC/TicoReading.hpp index cb7531445..fbdea4641 100644 --- a/include/Game/NPC/TicoReading.hpp +++ b/include/Game/NPC/TicoReading.hpp @@ -4,12 +4,12 @@ class TicoReading : public LiveActor { public: - TicoReading(const char *); + TicoReading(const char*); virtual ~TicoReading(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); virtual void kill(); - + void exeWait(); }; diff --git a/include/Game/NPC/TicoShop.hpp b/include/Game/NPC/TicoShop.hpp index dcebc41ac..9b9c2c4e6 100644 --- a/include/Game/NPC/TicoShop.hpp +++ b/include/Game/NPC/TicoShop.hpp @@ -6,10 +6,10 @@ class TicoShop : public TicoComet { public: - TicoShop(const char *); + TicoShop(const char*); virtual ~TicoShop(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); virtual void startReactionSound(); @@ -17,8 +17,8 @@ public: bool eventFunc(u32); void exeDemo(); - BenefitItemOneUp* mOneUp; // 0x19C - BenefitItemLifeUp* mLifeUp; // 0x1A0 - bool mChoseOneUp; // 0x1A4 - bool mChoseLifeUp; // 0x1A5 + BenefitItemOneUp* mOneUp; // 0x19C + BenefitItemLifeUp* mLifeUp; // 0x1A0 + bool mChoseOneUp; // 0x1A4 + bool mChoseLifeUp; // 0x1A5 }; diff --git a/include/Game/NPC/TicoStarRing.hpp b/include/Game/NPC/TicoStarRing.hpp index ff807b486..42f7c0679 100644 --- a/include/Game/NPC/TicoStarRing.hpp +++ b/include/Game/NPC/TicoStarRing.hpp @@ -4,16 +4,16 @@ class TicoStarRing : public Tico { public: - TicoStarRing(const char *); + TicoStarRing(const char*); virtual ~TicoStarRing(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); - void initialize(LiveActor *, LiveActor *, const char *); + void initialize(LiveActor*, LiveActor*, const char*); void exeWait(); - const char* mGalaxy; // 0x190 - LiveActor* _194; - LiveActor* mTicoGalaxy; // 0x198 + const char* mGalaxy; // 0x190 + LiveActor* _194; + LiveActor* mTicoGalaxy; // 0x198 }; diff --git a/include/Game/NPC/TrickRabbit.hpp b/include/Game/NPC/TrickRabbit.hpp index 092dbc339..5cb55f2f3 100644 --- a/include/Game/NPC/TrickRabbit.hpp +++ b/include/Game/NPC/TrickRabbit.hpp @@ -22,7 +22,7 @@ namespace TrickRabbitUtil { } class SpotMarkLight : public PartsModel { - public: +public: SpotMarkLight(LiveActor* pActor, f32 f1, f32 f2, MtxPtr mtx); virtual ~SpotMarkLight(); virtual void control(); @@ -30,8 +30,7 @@ class SpotMarkLight : public PartsModel { }; class RailGraphNodeSelecter { - public: - +public: }; namespace { @@ -39,7 +38,7 @@ namespace { public: virtual bool isSatisfy(RailGraphIter& rIter); }; -}; +}; // namespace class TrickRabbit : public LiveActor { public: @@ -47,104 +46,104 @@ public: virtual ~TrickRabbit(); virtual void init(const JMapInfoIter& rIter); virtual void initAfterPlacement(); - void initModel(); - void initSensor(); - void initBind(); - void initRoute(const JMapInfoIter& rIter); - void initDemoCamera(const JMapInfoIter& rIter); - void initState(); + void initModel(); + void initSensor(); + void initBind(); + void initRoute(const JMapInfoIter& rIter); + void initDemoCamera(const JMapInfoIter& rIter); + void initState(); virtual void control(); virtual void calcAndSetBaseMtx(); virtual void attackSensor(HitSensor* pSender, HitSensor* pReceiver); virtual bool receiveMsgPush(HitSensor* pSender, HitSensor* pReceiver); - virtual bool receiveMsgPlayerAttack(u32 msg,HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); virtual bool receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); - bool receiveMsgTrample(); - bool requestCaught(); - bool tryStartDemoRunnaway(); - void endDemoRunnaway(); - bool tryRunaway(); - bool tryBrakeTurn(); - bool tryBrakeTurnEnd(); - bool tryStop(); - bool tryJumpStart(); - bool tryJump(); - bool tryJumpEnd(); - bool tryEndFallDown(); - bool tryEndFallDownLand(); - bool tryComebackRouteStart(); - bool tryComebackRoute(); - bool tryEndTumble(); - bool tryEndGetUp(); - bool tryDemoJumpStart(); - bool tryDemoJump(); - bool tryDemoJumpEnd(); - bool tryEndPowerStarDemo(); - void exeWaitStart(); - void exeDemoRunaway(); - void exeDemoJumpStart(); - void exeDemoJump(); - void exeDemoEnd(); - void exeWait(); - void exeRunaway(); - void exeBrakeTurn(); - void exeJumpStart(); - void exeJump(); - void exeFallDown(); - void exeGetUpFromFallDown(); - void exeComebackRouteStart(); - void exeComebackRoute(); - void exeTumble(); - void exeGetUp(); - void exeCaught(); - void exeWaitPowerStarDemo(); - void exeGiveUp(); - void doWait(); - void doRunaway(); - void doJumpStart(); - void doJump(); - void tearDownWait(); - bool checkDivingThicket(const TVec3f& rVec1, const TVec3f& rVec2); - bool selectEdgeStartEvent(RailGraphIter* pIter); - void selectEdgeRunnaway(RailGraphIter* pIter, const TVec3f& rVec, f32 f); - void startRouteLevelControl(s32 l1, s32 l2) NO_INLINE; - void controlRouteLevel(); - void addMovingAccel(const TVec3f& rVec, f32 f); - void addKeepRouteRange(f32 f1, f32 f2, f32 f3); - void updateFootPrint(); - bool isCaughtable() const; - bool isTumbable() const; - bool isNextEdgeJump() const; - void setUpJumpParam(); - void setUpJumpParamFromJMap(); - s32 calcDefaultJumpTime() const; - s32 calcJumpStartTime() const; - s32 calcJumpTime() const; - f32 calcJumpHeight() const; - void initTimer(); - void updateTime(); + bool receiveMsgTrample(); + bool requestCaught(); + bool tryStartDemoRunnaway(); + void endDemoRunnaway(); + bool tryRunaway(); + bool tryBrakeTurn(); + bool tryBrakeTurnEnd(); + bool tryStop(); + bool tryJumpStart(); + bool tryJump(); + bool tryJumpEnd(); + bool tryEndFallDown(); + bool tryEndFallDownLand(); + bool tryComebackRouteStart(); + bool tryComebackRoute(); + bool tryEndTumble(); + bool tryEndGetUp(); + bool tryDemoJumpStart(); + bool tryDemoJump(); + bool tryDemoJumpEnd(); + bool tryEndPowerStarDemo(); + void exeWaitStart(); + void exeDemoRunaway(); + void exeDemoJumpStart(); + void exeDemoJump(); + void exeDemoEnd(); + void exeWait(); + void exeRunaway(); + void exeBrakeTurn(); + void exeJumpStart(); + void exeJump(); + void exeFallDown(); + void exeGetUpFromFallDown(); + void exeComebackRouteStart(); + void exeComebackRoute(); + void exeTumble(); + void exeGetUp(); + void exeCaught(); + void exeWaitPowerStarDemo(); + void exeGiveUp(); + void doWait(); + void doRunaway(); + void doJumpStart(); + void doJump(); + void tearDownWait(); + bool checkDivingThicket(const TVec3f& rVec1, const TVec3f& rVec2); + bool selectEdgeStartEvent(RailGraphIter* pIter); + void selectEdgeRunnaway(RailGraphIter* pIter, const TVec3f& rVec, f32 f); + void startRouteLevelControl(s32 l1, s32 l2) NO_INLINE; + void controlRouteLevel(); + void addMovingAccel(const TVec3f& rVec, f32 f); + void addKeepRouteRange(f32 f1, f32 f2, f32 f3); + void updateFootPrint(); + bool isCaughtable() const; + bool isTumbable() const; + bool isNextEdgeJump() const; + void setUpJumpParam(); + void setUpJumpParamFromJMap(); + s32 calcDefaultJumpTime() const; + s32 calcJumpStartTime() const; + s32 calcJumpTime() const; + f32 calcJumpHeight() const; + void initTimer(); + void updateTime(); - TQuat4f _8C; - TVec3f _9C; // 0x9C, 0xA0, 0xA4 + TQuat4f _8C; + TVec3f _9C; // 0x9C, 0xA0, 0xA4 RabbitStateWaitStart* mRabbitStateWaitStart; // 0xA8 - RabbitStateCaught* mRabbitStateCaught; // 0xAC - MultiEventCamera* mMultiEventCamera; // 0xB0 - TalkMessageCtrl* mTalkMessageCtrl; // 0xB4 - FootPrint* mFootPrint; // 0xB8 - RailGraph* mRailGraph; // 0xBC - RailGraphIter* mRailGraphIter; // 0xC0 - ParabolicPath* mParabolicPath; // 0xC4 - SpotMarkLight* mSpotMarkLight; // 0xC8 - s32 _CC; - f32 _D0; - s32 _D4; - s32 _D8; - s32 _DC; - bool _E0; - bool _E1; - s32 _E4; - bool _E8; - bool _E9; + RabbitStateCaught* mRabbitStateCaught; // 0xAC + MultiEventCamera* mMultiEventCamera; // 0xB0 + TalkMessageCtrl* mTalkMessageCtrl; // 0xB4 + FootPrint* mFootPrint; // 0xB8 + RailGraph* mRailGraph; // 0xBC + RailGraphIter* mRailGraphIter; // 0xC0 + ParabolicPath* mParabolicPath; // 0xC4 + SpotMarkLight* mSpotMarkLight; // 0xC8 + s32 _CC; + f32 _D0; + s32 _D4; + s32 _D8; + s32 _DC; + bool _E0; + bool _E1; + s32 _E4; + bool _E8; + bool _E9; }; namespace NrvTrickRabbit { @@ -169,4 +168,4 @@ namespace NrvTrickRabbit { NERVE_DECL_EXE(TrickRabbitNrvCaught, TrickRabbit, Caught); NERVE_DECL_EXE(TrickRabbitNrvWaitPowerStarDemo, TrickRabbit, WaitPowerStarDemo); NERVE_DECL_EXE(TrickRabbitNrvGiveUp, TrickRabbit, GiveUp); -}; +}; // namespace NrvTrickRabbit diff --git a/include/Game/NPC/TrickRabbitFreeRun.hpp b/include/Game/NPC/TrickRabbitFreeRun.hpp index aac30108f..efcbe5b19 100644 --- a/include/Game/NPC/TrickRabbitFreeRun.hpp +++ b/include/Game/NPC/TrickRabbitFreeRun.hpp @@ -7,42 +7,42 @@ #include #include "Game/NPC/TrickRabbit.hpp" #include "Game/LiveActor/Nerve.hpp" -class TrickRabbitFreeRun : public LiveActor{ - public: +class TrickRabbitFreeRun : public LiveActor { +public: TrickRabbitFreeRun(const char* pName); - virtual ~TrickRabbitFreeRun(); + virtual ~TrickRabbitFreeRun(); virtual void init(const JMapInfoIter& rIter); virtual void initAfterPlacement(); virtual void initSensor(); virtual void initState(); virtual void control(); - virtual void calcAndSetBaseMtx(); + virtual void calcAndSetBaseMtx(); virtual void attackSensor(HitSensor* pSender, HitSensor* pReceiver); virtual bool receiveMsgPush(HitSensor* pSender, HitSensor* pReceiver); - virtual bool receiveMsgEnemyAttack(u32 msg,HitSensor* pSender, HitSensor* pReceiver); - virtual bool receiveMsgPlayerAttack(u32 msg,HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); + virtual bool receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver); virtual bool receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); - void receiveMsgBlowDamage(HitSensor* pSender, HitSensor* pReceiver); - void requestCaught(); - void exeWaitStart(); - void exeRunawayStart(); - void exeRunaway(); - void exeCaught(); - void exePowerStarDemo(); - void exeGiveUp(); - void isEnableCaught() const; - void isEnableBlowDamage() const; - void startJumpSound(); + void receiveMsgBlowDamage(HitSensor* pSender, HitSensor* pReceiver); + void requestCaught(); + void exeWaitStart(); + void exeRunawayStart(); + void exeRunaway(); + void exeCaught(); + void exePowerStarDemo(); + void exeGiveUp(); + void isEnableCaught() const; + void isEnableBlowDamage() const; + void startJumpSound(); - TQuat4f _8C; - TVec3f _9C; - s32 _A8; - s32 _AC; - s32 _B0; - s32 _B4; + TQuat4f _8C; + TVec3f _9C; + s32 _A8; + s32 _AC; + s32 _B0; + s32 _B4; TalkMessageCtrl* mTalkCtrl; - FootPrint* mFootPrint; // 0xBC - SpotMarkLight* mSpotMarkLight; // 0xC0 + FootPrint* mFootPrint; // 0xBC + SpotMarkLight* mSpotMarkLight; // 0xC0 }; namespace NrvTrickRabbitFreeRun { @@ -54,4 +54,4 @@ namespace NrvTrickRabbitFreeRun { NERVE_DECL_EXE(TrickRabbitFreeRunNrvCaught, TrickRabbitFreeRun, Caught); NERVE_DECL_EXE(TrickRabbitFreeRunNrvPowerStarDemo, TrickRabbitFreeRun, PowerStarDemo); NERVE_DECL_EXE(TrickRabbitFreeRunNrvGiveUp, TrickRabbitFreeRun, GiveUp); -}; +}; // namespace NrvTrickRabbitFreeRun diff --git a/include/Game/NWC24/LuigiMailDirector.hpp b/include/Game/NWC24/LuigiMailDirector.hpp index 68d681833..ebb2acc2b 100644 --- a/include/Game/NWC24/LuigiMailDirector.hpp +++ b/include/Game/NWC24/LuigiMailDirector.hpp @@ -15,7 +15,7 @@ public: void writeSendSize(); void reset(); void prepareMessage(); - u8 calcDelayHours() const; + u8 calcDelayHours() const; private: /// @brief The number of characters in the message describing Luigi as having gone missing. diff --git a/include/Game/NWC24/NWC24Function.hpp b/include/Game/NWC24/NWC24Function.hpp index 836045bb5..254f893ba 100644 --- a/include/Game/NWC24/NWC24Function.hpp +++ b/include/Game/NWC24/NWC24Function.hpp @@ -24,4 +24,4 @@ namespace MR { /// @param[in] pMessageId A pointer to the null-terminated name of the target message identifier. /// @return A pointer to the null-terminated wide name. const wchar_t* getMailSender(const char* pMessageId); -}; +}; // namespace MR diff --git a/include/Game/NWC24/NWC24Messenger.hpp b/include/Game/NWC24/NWC24Messenger.hpp index 53055bc51..10be21bdb 100644 --- a/include/Game/NWC24/NWC24Messenger.hpp +++ b/include/Game/NWC24/NWC24Messenger.hpp @@ -14,21 +14,21 @@ namespace NWC24MessengerSub { /// @brief Creates a new `SendTask`. SendTask(); - /* 0x00 */ bool _0; - /* 0x01 */ bool mIsBG; - /* 0x02 */ bool _2; - /* 0x03 */ bool mIsMsgLedPattern; - /* 0x04 */ s32 mRetryNo; - /* 0x08 */ NWC24Err mErr; - /* 0x0C */ s32 mErrCode; - /* 0x10 */ u32 mSentSize; - /* 0x14 */ u16 mTag; - /* 0x14 */ u8 mDelayHours; - /* 0x18 */ const char* mTaskName; + /* 0x00 */ bool _0; + /* 0x01 */ bool mIsBG; + /* 0x02 */ bool _2; + /* 0x03 */ bool mIsMsgLedPattern; + /* 0x04 */ s32 mRetryNo; + /* 0x08 */ NWC24Err mErr; + /* 0x0C */ s32 mErrCode; + /* 0x10 */ u32 mSentSize; + /* 0x14 */ u16 mTag; + /* 0x14 */ u8 mDelayHours; + /* 0x18 */ const char* mTaskName; /* 0x1C */ const wchar_t* mMessage; /* 0x20 */ const wchar_t* mAltName; - /* 0x24 */ const u8* mPicture; - /* 0x28 */ u32 mPictureSize; + /* 0x24 */ const u8* mPicture; + /* 0x28 */ u32 mPictureSize; }; class SendState : public NerveExecutor { @@ -71,12 +71,12 @@ namespace NWC24MessengerSub { private: /* 0x08 */ NWC24Messenger* mHost; - /* 0x0C */ SendTask* mTask; - /* 0x10 */ SysInfoWindow* mWindow; - /* 0x14 */ SysInfoWindow* mMiniWindow; - /* 0x18 */ const Nerve* _18; + /* 0x0C */ SendTask* mTask; + /* 0x10 */ SysInfoWindow* mWindow; + /* 0x14 */ SysInfoWindow* mMiniWindow; + /* 0x18 */ const Nerve* _18; }; -}; +}; // namespace NWC24MessengerSub class NWC24Messenger : public NameObj { public: @@ -88,23 +88,23 @@ public: virtual void draw() const; virtual void calcAnim(); - void initAfterResourceLoaded(); - void send(const char*, const wchar_t*, const wchar_t*, const u8*, u32, bool, bool, u16, u8); - void term(const char*); - bool isSent(const char*) const; - bool isError(const char*) const; - void prepareReset(); - bool isRunning() const; - void reset(); + void initAfterResourceLoaded(); + void send(const char*, const wchar_t*, const wchar_t*, const u8*, u32, bool, bool, u16, u8); + void term(const char*); + bool isSent(const char*) const; + bool isError(const char*) const; + void prepareReset(); + bool isRunning() const; + void reset(); NWC24MessengerSub::SendTask* findTask(const char*) const; NWC24MessengerSub::SendTask* selectTask() const; - void clearBackgroundTask(); + void clearBackgroundTask(); - /* 0x0C */ NWC24MessengerSub::SendTask* mForegroundTask; - /* 0x10 */ NWC24MessengerSub::SendTask* mBackgroundTaskArray; + /* 0x0C */ NWC24MessengerSub::SendTask* mForegroundTask; + /* 0x10 */ NWC24MessengerSub::SendTask* mBackgroundTaskArray; /* 0x14 */ NWC24MessengerSub::SendState* mSendState; - /* 0x18 */ NWC24System* mSystem; - /* 0x1C */ bool _1C; + /* 0x18 */ NWC24System* mSystem; + /* 0x1C */ bool _1C; }; namespace MR { @@ -125,18 +125,18 @@ namespace MR { void send(); private: - /* 0x00 */ const char* mTaskName; + /* 0x00 */ const char* mTaskName; /* 0x04 */ const wchar_t* mMessage; /* 0x08 */ const wchar_t* mSenderID; - /* 0x0C */ const u8* mImage; - /* 0x10 */ u32 mImageSize; - /* 0x14 */ bool mIsBG; - /* 0x15 */ bool mIsLed; - /* 0x16 */ u16 mTag; - /* 0x18 */ u8 mDelay; + /* 0x0C */ const u8* mImage; + /* 0x10 */ u32 mImageSize; + /* 0x14 */ bool mIsBG; + /* 0x15 */ bool mIsLed; + /* 0x16 */ u16 mTag; + /* 0x18 */ u8 mDelay; }; void termMail(const char*); bool isMailSent(const char*); bool isMailErrorHappened(const char*); -}; +}; // namespace MR diff --git a/include/Game/NWC24/NWC24SendThread.hpp b/include/Game/NWC24/NWC24SendThread.hpp index 5da5d8728..97ab74695 100644 --- a/include/Game/NWC24/NWC24SendThread.hpp +++ b/include/Game/NWC24/NWC24SendThread.hpp @@ -17,27 +17,27 @@ private: struct MsgSendStatus { /* 0x00 */ const u16* mText; /* 0x04 */ const u16* mAltName; - /* 0x08 */ const u8* mLetter; - /* 0x0C */ u32 mLetterSize; - /* 0x10 */ const u8* mPicture; - /* 0x14 */ u32 mPictureSize; - /* 0x18 */ bool _18; - /* 0x19 */ bool mIsMsgLedPattern; - /* 0x1C */ NWC24Err mSentErr; - /* 0x20 */ u32 mSentSize; - /* 0x24 */ u16 mTag; - /* 0x28 */ u8 mDelayHours; + /* 0x08 */ const u8* mLetter; + /* 0x0C */ u32 mLetterSize; + /* 0x10 */ const u8* mPicture; + /* 0x14 */ u32 mPictureSize; + /* 0x18 */ bool _18; + /* 0x19 */ bool mIsMsgLedPattern; + /* 0x1C */ NWC24Err mSentErr; + /* 0x20 */ u32 mSentSize; + /* 0x24 */ u16 mTag; + /* 0x28 */ u8 mDelayHours; }; - static void* threadProc(void*); - void initMsgSendStatus(); + static void* threadProc(void*); + void initMsgSendStatus(); static NWC24Err sendMessage(NWC24SendThread::MsgSendStatus*, u32*); - static bool checkTotalSize(NWC24SendThread::MsgSendStatus*); - NWC24Err setToMyself(NWC24MsgObj*); + static bool checkTotalSize(NWC24SendThread::MsgSendStatus*); + NWC24Err setToMyself(NWC24MsgObj*); private: - static OSMessage mMessage; - static s32 mMessageMax; + static OSMessage mMessage; + static s32 mMessageMax; static OSMessageQueue mMessageQueue; u32 _unused; @@ -46,6 +46,6 @@ private: /* 0x31C */ MsgSendStatus mMsgSendStatus; }; -OSMessage NWC24SendThread::mMessage; -s32 NWC24SendThread::mMessageMax = 1; +OSMessage NWC24SendThread::mMessage; +s32 NWC24SendThread::mMessageMax = 1; OSMessageQueue NWC24SendThread::mMessageQueue; diff --git a/include/Game/NWC24/NWC24System.hpp b/include/Game/NWC24/NWC24System.hpp index 51867abc0..d4971eae5 100644 --- a/include/Game/NWC24/NWC24System.hpp +++ b/include/Game/NWC24/NWC24System.hpp @@ -16,8 +16,8 @@ public: bool isSent(NWC24Err*, u32*); private: - /* 0x0 */ bool _0; - /* 0x4 */ u8* mWorkBuffer; - /* 0x8 */ u8* mVFWorkBuffer; + /* 0x0 */ bool _0; + /* 0x4 */ u8* mWorkBuffer; + /* 0x8 */ u8* mVFWorkBuffer; /* 0xC */ NWC24SendThread* mSendThread; }; diff --git a/include/Game/NWC24/ReceiverTagMail.hpp b/include/Game/NWC24/ReceiverTagMail.hpp index 619825b3a..afcbf5e6f 100644 --- a/include/Game/NWC24/ReceiverTagMail.hpp +++ b/include/Game/NWC24/ReceiverTagMail.hpp @@ -19,8 +19,8 @@ private: /* 0x00 */ const char* mTaskName; /* 0x04 */ const char* mMessageID; /* 0x08 */ const char* mSenderID; - /* 0x0C */ wchar_t* mMessage; - /* 0x10 */ u32 mMessageLength; - /* 0x14 */ bool mIsError; - /* 0x18 */ u32 _18; + /* 0x0C */ wchar_t* mMessage; + /* 0x10 */ u32 mMessageLength; + /* 0x14 */ bool mIsError; + /* 0x18 */ u32 _18; }; diff --git a/include/Game/NWC24/UTF16Util.hpp b/include/Game/NWC24/UTF16Util.hpp index 82b5238fb..bb694f5df 100644 --- a/include/Game/NWC24/UTF16Util.hpp +++ b/include/Game/NWC24/UTF16Util.hpp @@ -7,5 +7,5 @@ namespace MR { /// @brief Returns the length of the given null-terminated wide string. /// @param pStr The pointer to the null-terminated wide string to be examined. /// @return The length of the string. - size_t strlenUTF16(const u16 *pStr); -}; + size_t strlenUTF16(const u16* pStr); +}; // namespace MR diff --git a/include/Game/NameObj/ModelChangableObjFactory.hpp b/include/Game/NameObj/ModelChangableObjFactory.hpp index 35b79cc3e..43b66d1e2 100644 --- a/include/Game/NameObj/ModelChangableObjFactory.hpp +++ b/include/Game/NameObj/ModelChangableObjFactory.hpp @@ -4,16 +4,16 @@ class NameObj; -typedef NameObj* (*CreatorFuncPtr)(const char *); +typedef NameObj* (*CreatorFuncPtr)(const char*); struct Model2CreateFunc { - /* 0x0 */ const char* _0; - /* 0x4 */ const char* mArchiveName; + /* 0x0 */ const char* _0; + /* 0x4 */ const char* mArchiveName; /* 0x8 */ CreatorFuncPtr mCreatorFunc; }; namespace MR { - CreatorFuncPtr getModelChangableObjCreator(const char *); - void requestMountModelChangableObjArchives(const char *, s32); - bool isReadResourceFromDVDAtModelChangableObj(const char *, s32); -}; + CreatorFuncPtr getModelChangableObjCreator(const char*); + void requestMountModelChangableObjArchives(const char*, s32); + bool isReadResourceFromDVDAtModelChangableObj(const char*, s32); +}; // namespace MR diff --git a/include/Game/NameObj/MovementOnOffGroupHolder.hpp b/include/Game/NameObj/MovementOnOffGroupHolder.hpp index 071b0cbab..0c20b1a29 100644 --- a/include/Game/NameObj/MovementOnOffGroupHolder.hpp +++ b/include/Game/NameObj/MovementOnOffGroupHolder.hpp @@ -6,14 +6,14 @@ class MovementOnOffGroupHolder : public NameObj { public: - MovementOnOffGroupHolder(const char *); + MovementOnOffGroupHolder(const char*); ~MovementOnOffGroupHolder(); - NameObjGroup* joinToGroup(const char *, NameObj *, u32); - void onMovementGroup(const char *); - NameObjGroup* createGroup(const char *, u32); - NameObjGroup* findGroupFromName(const char *) const; + NameObjGroup* joinToGroup(const char*, NameObj*, u32); + void onMovementGroup(const char*); + NameObjGroup* createGroup(const char*, u32); + NameObjGroup* findGroupFromName(const char*) const; private: - MR::Vector > mGroups; + MR::Vector> mGroups; }; diff --git a/include/Game/NameObj/NameObj.hpp b/include/Game/NameObj/NameObj.hpp index c5cd4f17c..2151485fa 100644 --- a/include/Game/NameObj/NameObj.hpp +++ b/include/Game/NameObj/NameObj.hpp @@ -40,9 +40,9 @@ public: void requestResume(); void syncWithFlags(); - /* 0x4 */ const char* mName; ///< A string to identify the NameObj. - /* 0x8 */ volatile u16 mFlag; ///< Flags in relation to movement. - /* 0xA */ s16 mExecutorIdx; ///< The index into the NameObjExecuteInfo array. + /* 0x4 */ const char* mName; ///< A string to identify the NameObj. + /* 0x8 */ volatile u16 mFlag; ///< Flags in relation to movement. + /* 0xA */ s16 mExecutorIdx; ///< The index into the NameObjExecuteInfo array. }; /// @brief Contains static functions to begin and end movement in a NameObj. diff --git a/include/Game/NameObj/NameObjAdaptor.hpp b/include/Game/NameObj/NameObjAdaptor.hpp index f3c70c171..d7e928d43 100644 --- a/include/Game/NameObj/NameObjAdaptor.hpp +++ b/include/Game/NameObj/NameObjAdaptor.hpp @@ -6,7 +6,7 @@ /// @brief Implementation of a NameObj that stores function pointers to movement, calcAnim, calcView, and draw functions. class NameObjAdaptor : public NameObj { public: - NameObjAdaptor(const char *); + NameObjAdaptor(const char*); virtual ~NameObjAdaptor(); virtual void movement(); @@ -14,12 +14,12 @@ public: virtual void calcAnim(); virtual void calcViewAndEntry(); - void connectToMovement(const MR::FunctorBase &); - void connectToCalcAnim(const MR::FunctorBase &); - void connectToDraw(const MR::FunctorBase &); + void connectToMovement(const MR::FunctorBase&); + void connectToCalcAnim(const MR::FunctorBase&); + void connectToDraw(const MR::FunctorBase&); - MR::FunctorBase* mMovementFunc; // 0xC - MR::FunctorBase* mCalcAnimFunc; // 0x10 - MR::FunctorBase* mCalcViewFunc; // 0x14 - MR::FunctorBase* mDrawAnimFunc; // 0x18 + MR::FunctorBase* mMovementFunc; // 0xC + MR::FunctorBase* mCalcAnimFunc; // 0x10 + MR::FunctorBase* mCalcViewFunc; // 0x14 + MR::FunctorBase* mDrawAnimFunc; // 0x18 }; diff --git a/include/Game/NameObj/NameObjArchiveListCollector.hpp b/include/Game/NameObj/NameObjArchiveListCollector.hpp index 914a2a13f..71b388652 100644 --- a/include/Game/NameObj/NameObjArchiveListCollector.hpp +++ b/include/Game/NameObj/NameObjArchiveListCollector.hpp @@ -7,9 +7,9 @@ class NameObjArchiveListCollector { public: NameObjArchiveListCollector(); - void addArchive(const char *); + void addArchive(const char*); const char* getArchive(s32) const; - char mArchiveNames[0x20][0x40]; // 0x0 - s32 mCount; // 0x800 + char mArchiveNames[0x20][0x40]; // 0x0 + s32 mCount; // 0x800 }; \ No newline at end of file diff --git a/include/Game/NameObj/NameObjCategoryList.hpp b/include/Game/NameObj/NameObjCategoryList.hpp index 919c3b681..ee32be974 100644 --- a/include/Game/NameObj/NameObjCategoryList.hpp +++ b/include/Game/NameObj/NameObjCategoryList.hpp @@ -205,56 +205,55 @@ #define CATEGORY_DRAW_MAX_VALUE 0x53 namespace { - template + template class NameObjRealDelegator { public: inline NameObjRealDelegator(T in_func) { mNameObjFunc = in_func; } - virtual void operator()(NameObj *pNameObj) { + virtual void operator()(NameObj* pNameObj) { (pNameObj->*mNameObjFunc)(); } T mNameObjFunc; // 0x4 }; -}; +}; // namespace struct CategoryListInitialTable { - u32 mIndex; // 0x0 - u32 mCount; // 0x4 + u32 mIndex; // 0x0 + u32 mCount; // 0x4 }; /// @brief Organizes NameObjs by execution category. class NameObjCategoryList { public: - class CategoryInfo { public: CategoryInfo(); ~CategoryInfo(); - MR::Vector > mNameObjArr; // 0x0 - MR::FunctorBase* _C; - u32 mCheck; // 0x10 + MR::Vector> mNameObjArr; // 0x0 + MR::FunctorBase* _C; + u32 mCheck; // 0x10 }; - NameObjCategoryList(u32, const CategoryListInitialTable *, NameObjMethod, bool, const char *); - NameObjCategoryList(u32, const CategoryListInitialTable *, NameObjMethodConst, bool, const char *); + NameObjCategoryList(u32, const CategoryListInitialTable*, NameObjMethod, bool, const char*); + NameObjCategoryList(u32, const CategoryListInitialTable*, NameObjMethodConst, bool, const char*); ~NameObjCategoryList(); void execute(int); - void incrementCheck(NameObj *, int); + void incrementCheck(NameObj*, int); void allocateBuffer(); - void add(NameObj *, int); - void remove(NameObj *, int); - void registerExecuteBeforeFunction(const MR::FunctorBase &, int); - void initTable(u32, const CategoryListInitialTable *); + void add(NameObj*, int); + void remove(NameObj*, int); + void registerExecuteBeforeFunction(const MR::FunctorBase&, int); + void initTable(u32, const CategoryListInitialTable*); - MR::AssignableArray mCategoryInfo; // 0x0 + MR::AssignableArray mCategoryInfo; // 0x0 union { - NameObjRealDelegator* mDelegator; + NameObjRealDelegator* mDelegator; NameObjRealDelegator* mDelegatorConst; }; diff --git a/include/Game/NameObj/NameObjExecuteHolder.hpp b/include/Game/NameObj/NameObjExecuteHolder.hpp index ef7fb38f9..d0c0392cc 100644 --- a/include/Game/NameObj/NameObjExecuteHolder.hpp +++ b/include/Game/NameObj/NameObjExecuteHolder.hpp @@ -10,10 +10,10 @@ class NameObjExecuteInfo { public: NameObjExecuteInfo(); - void setConnectInfo(NameObj *, int, int, int, int); + void setConnectInfo(NameObj*, int, int, int, int); void initConnectting(); - void requestConnect(u8 *); - void requestDisconnect(u8 *, bool); + void requestConnect(u8*); + void requestDisconnect(u8*, bool); void executeRequirementConnectMovement() NO_INLINE; void executeRequirementDisconnectMovement() NO_INLINE; void executeRequirementConnectDraw() NO_INLINE; @@ -29,54 +29,54 @@ public: private: /* 0x0 */ NameObj* mExecutedObj; - /* 0x4 */ s8 _4; - /* 0x5 */ s8 _5; - /* 0x6 */ s8 _6; - /* 0x7 */ s8 _7; - /* 0x8 */ s8 _8; - /* 0x9 */ s8 _9; - /* 0xA */ s16 _A; + /* 0x4 */ s8 _4; + /* 0x5 */ s8 _5; + /* 0x6 */ s8 _6; + /* 0x7 */ s8 _7; + /* 0x8 */ s8 _8; + /* 0x9 */ s8 _9; + /* 0xA */ s16 _A; }; -class NameObjExecuteHolder : public NameObj { +class NameObjExecuteHolder : public NameObj { public: NameObjExecuteHolder(int); - void registerActor(NameObj *, int, int, int, int); - void initConnectting(); - void connectToScene(NameObj *); - void connectToDraw(NameObj *); - void disconnectToScene(NameObj *); - void disconnectToDraw(NameObj *); - bool isConnectToDraw(const NameObj *) const; - void executeRequirementConnectMovement(); - void executeRequirementDisconnectMovement(); - void executeRequirementConnectDraw(); - void executeRequirementDisconnectDraw(); - void executeRequirementDisconnectDrawDelay(); - void requestMovementOn(int); - void requestMovementOff(int); - NameObjExecuteInfo* getConnectToSceneInfo(const NameObj *) const; + void registerActor(NameObj*, int, int, int, int); + void initConnectting(); + void connectToScene(NameObj*); + void connectToDraw(NameObj*); + void disconnectToScene(NameObj*); + void disconnectToDraw(NameObj*); + bool isConnectToDraw(const NameObj*) const; + void executeRequirementConnectMovement(); + void executeRequirementDisconnectMovement(); + void executeRequirementConnectDraw(); + void executeRequirementDisconnectDraw(); + void executeRequirementDisconnectDrawDelay(); + void requestMovementOn(int); + void requestMovementOff(int); + NameObjExecuteInfo* getConnectToSceneInfo(const NameObj*) const; private: /* 0x0C */ NameObjExecuteInfo* mExecuteArray; - /* 0x10 */ s32 mExecuteArrayMaxSize; - /* 0x14 */ s32 mExecuteArraySize; - /* 0x18 */ bool _18; - /* 0x19 */ bool _19; - /* 0x1A */ bool _1A; - /* 0x1B */ bool _1B; - /* 0x1C */ bool _1C; + /* 0x10 */ s32 mExecuteArrayMaxSize; + /* 0x14 */ s32 mExecuteArraySize; + /* 0x18 */ bool _18; + /* 0x19 */ bool _19; + /* 0x1A */ bool _1A; + /* 0x1B */ bool _1B; + /* 0x1C */ bool _1C; }; namespace MR { - void registerNameObjToExecuteHolder(NameObj *, int, int, int, int); + void registerNameObjToExecuteHolder(NameObj*, int, int, int, int); void initConnectting(); - void connectToSceneTemporarily(NameObj *); - void disconnectToSceneTemporarily(NameObj *); - void connectToDrawTemporarily(NameObj *); - void disconnectToDrawTemporarily(NameObj *); - bool isConnectToDrawTemporarily(const NameObj *); + void connectToSceneTemporarily(NameObj*); + void disconnectToSceneTemporarily(NameObj*); + void connectToDrawTemporarily(NameObj*); + void disconnectToDrawTemporarily(NameObj*); + bool isConnectToDrawTemporarily(const NameObj*); void executeRequirementConnectMovement(); void executeRequirementDisconnectMovement(); void executeRequirementConnectDraw(); @@ -84,5 +84,5 @@ namespace MR { void executeRequirementDisconnectDrawDelay(); void requestMovementOnWithCategory(int); void requestMovementOffWithCategory(int); - void findActorLightInfo(const LiveActor *); -}; + void findActorLightInfo(const LiveActor*); +}; // namespace MR diff --git a/include/Game/NameObj/NameObjFactory.hpp b/include/Game/NameObj/NameObjFactory.hpp index d5a8171cc..8788d3c59 100644 --- a/include/Game/NameObj/NameObjFactory.hpp +++ b/include/Game/NameObj/NameObjFactory.hpp @@ -13,22 +13,22 @@ class NameObj; class NameObjArchiveListCollector; class JMapInfoIter; -typedef NameObj* (*CreatorFuncPtr)(const char *); -typedef void (*ArchiveFuncPtr)(NameObjArchiveListCollector *, const JMapInfoIter &); +typedef NameObj* (*CreatorFuncPtr)(const char*); +typedef void (*ArchiveFuncPtr)(NameObjArchiveListCollector*, const JMapInfoIter&); namespace { - template - NameObj* createNameObj(const char *pName) { + template + NameObj* createNameObj(const char* pName) { return new T(pName); } -}; +}; // namespace /// @brief A namespace for creating `NameObj` instances. namespace NameObjFactory { struct Name2CreateFunc { - /* 0x0 */ const char* mName; + /* 0x0 */ const char* mName; /* 0x4 */ CreatorFuncPtr mCreateFunc; - /* 0x8 */ const char* mArchiveName; + /* 0x8 */ const char* mArchiveName; }; struct Name2Archive { @@ -37,14 +37,14 @@ namespace NameObjFactory { }; struct Name2MakeArchiveListFunc { - /* 0x0 */ const char* mName; + /* 0x0 */ const char* mName; /* 0x4 */ ArchiveFuncPtr mArchiveFunc; }; - CreatorFuncPtr getCreator(const char *); - void requestMountObjectArchives(const char *, const JMapInfoIter &); - bool isReadResourceFromDVD(const char *, const JMapInfoIter &); - bool isPlayerArchiveLoaderObj(const char *); - const Name2CreateFunc* getName2CreateFunc(const char *, const Name2CreateFunc *); - void getMountObjectArchiveList(NameObjArchiveListCollector *, const char *, const JMapInfoIter &); -}; + CreatorFuncPtr getCreator(const char*); + void requestMountObjectArchives(const char*, const JMapInfoIter&); + bool isReadResourceFromDVD(const char*, const JMapInfoIter&); + bool isPlayerArchiveLoaderObj(const char*); + const Name2CreateFunc* getName2CreateFunc(const char*, const Name2CreateFunc*); + void getMountObjectArchiveList(NameObjArchiveListCollector*, const char*, const JMapInfoIter&); +}; // namespace NameObjFactory diff --git a/include/Game/NameObj/NameObjFinder.hpp b/include/Game/NameObj/NameObjFinder.hpp index 62a01e6ef..31b8ee004 100644 --- a/include/Game/NameObj/NameObjFinder.hpp +++ b/include/Game/NameObj/NameObjFinder.hpp @@ -5,5 +5,5 @@ class NameObj; /// @brief Class that supplies a static function to find a NameObj contained in the global NameObjHolder. class NameObjFinder { public: - static NameObj* find(const char *); + static NameObj* find(const char*); }; diff --git a/include/Game/NameObj/NameObjGroup.hpp b/include/Game/NameObj/NameObjGroup.hpp index f8ca030ec..c06e7a53d 100644 --- a/include/Game/NameObj/NameObjGroup.hpp +++ b/include/Game/NameObj/NameObjGroup.hpp @@ -5,11 +5,11 @@ /// @brief Class that can contain multiple NameObj instances stored in a group. class NameObjGroup : public NameObj { public: - NameObjGroup(const char *, int); + NameObjGroup(const char*, int); virtual ~NameObjGroup(); - void registerObj(NameObj *); + void registerObj(NameObj*); void pauseOffAll() const; void initObjArray(int); @@ -17,7 +17,7 @@ public: return mObjectCount; } - s32 _C; - s32 mObjectCount; // 0x10 - NameObj** mObjects; // 0x14 + s32 _C; + s32 mObjectCount; // 0x10 + NameObj** mObjects; // 0x14 }; \ No newline at end of file diff --git a/include/Game/NameObj/NameObjHolder.hpp b/include/Game/NameObj/NameObjHolder.hpp index 62c1e50f6..5dfee67ff 100644 --- a/include/Game/NameObj/NameObjHolder.hpp +++ b/include/Game/NameObj/NameObjHolder.hpp @@ -12,15 +12,15 @@ class NameObjHolder { public: NameObjHolder(int); - void add(NameObj*); - void suspendAllObj(); - void resumeAllObj(); - void syncWithFlags(); - void callMethodAllObj(NameObjMethod); - void clearArray(); + void add(NameObj*); + void suspendAllObj(); + void resumeAllObj(); + void syncWithFlags(); + void callMethodAllObj(NameObjMethod); + void clearArray(); NameObj* find(const char*); private: - /* 0x00 */ MR::Vector > mObjArray1; - /* 0x0C */ MR::Vector > mObjArray2; + /* 0x00 */ MR::Vector> mObjArray1; + /* 0x0C */ MR::Vector> mObjArray2; }; diff --git a/include/Game/NameObj/NameObjListExecutor.hpp b/include/Game/NameObj/NameObjListExecutor.hpp index e4244f69d..0a19aeac7 100644 --- a/include/Game/NameObj/NameObjListExecutor.hpp +++ b/include/Game/NameObj/NameObjListExecutor.hpp @@ -17,21 +17,21 @@ public: virtual void initDrawList(); void init(); - s16 registerDrawBuffer(LiveActor *, int); + s16 registerDrawBuffer(LiveActor*, int); void allocateDrawBufferActorList(); - void registerPreDrawFunction(const MR::FunctorBase &, int); - void findLightInfo(LiveActor *, int, int) const; - void incrementCheckMovement(NameObj *, int); - void incrementCheckCalcAnim(NameObj *, int); - void incrementCheckDraw(NameObj *, int); - void addToMovement(NameObj *, int); - void addToCalcAnim(NameObj *, int); - void addToDrawBuffer(LiveActor *, int, int); - void addToDraw(NameObj *, int); - void removeToMovement(NameObj *, int); - void removeToCalcAnim(NameObj *, int); - void removeToDrawBuffer(LiveActor *, int, int); - void removeToDraw(NameObj *, int); + void registerPreDrawFunction(const MR::FunctorBase&, int); + void findLightInfo(LiveActor*, int, int) const; + void incrementCheckMovement(NameObj*, int); + void incrementCheckCalcAnim(NameObj*, int); + void incrementCheckDraw(NameObj*, int); + void addToMovement(NameObj*, int); + void addToCalcAnim(NameObj*, int); + void addToDrawBuffer(LiveActor*, int, int); + void addToDraw(NameObj*, int); + void removeToMovement(NameObj*, int); + void removeToCalcAnim(NameObj*, int); + void removeToDrawBuffer(LiveActor*, int, int); + void removeToDraw(NameObj*, int); void executeMovement(int); void executeCalcAnim(int); void entryDrawBuffer2D(); @@ -41,7 +41,7 @@ public: void drawXlu(int); void executeDraw(int); - DrawBufferHolder* mBufferHolder; // 0x4 + DrawBufferHolder* mBufferHolder; // 0x4 NameObjCategoryList* mMovementList; // 0x8 NameObjCategoryList* mCalcAnimList; // 0xC NameObjCategoryList* mDrawList; // 0x10 diff --git a/include/Game/NameObj/NameObjRegister.hpp b/include/Game/NameObj/NameObjRegister.hpp index 4fcd47f07..fb76e6668 100644 --- a/include/Game/NameObj/NameObjRegister.hpp +++ b/include/Game/NameObj/NameObjRegister.hpp @@ -7,8 +7,8 @@ class NameObjRegister { public: NameObjRegister(); - void setCurrentHolder(NameObjHolder *); - void add(NameObj *); + void setCurrentHolder(NameObjHolder*); + void add(NameObj*); NameObjHolder* mHolder; // 0x0 }; \ No newline at end of file diff --git a/include/Game/Player/DLchanger.hpp b/include/Game/Player/DLchanger.hpp index 023a8c02b..360672fd6 100644 --- a/include/Game/Player/DLchanger.hpp +++ b/include/Game/Player/DLchanger.hpp @@ -4,6 +4,6 @@ class J3DModelX; class DLchanger { public: - void addDL(J3DModelX *); + void addDL(J3DModelX*); void swap(); }; diff --git a/include/Game/Player/FireMarioBall.hpp b/include/Game/Player/FireMarioBall.hpp index 90e847c33..5173d2aea 100644 --- a/include/Game/Player/FireMarioBall.hpp +++ b/include/Game/Player/FireMarioBall.hpp @@ -14,13 +14,13 @@ public: virtual void appear(); virtual void kill(); virtual void attackSensor(HitSensor*, HitSensor*); - void initSensor(); + void initSensor(); - bool attackFire(HitSensor*); - void exeThrow(); - void appearAndThrow(const TVec3f&, const TVec3f&); + bool attackFire(HitSensor*); + void exeThrow(); + void appearAndThrow(const TVec3f&, const TVec3f&); HitSensor* isBindedAny() const; - bool tryToKill(); + bool tryToKill(); u32 _8C; u16 _90; diff --git a/include/Game/Player/GroupChecker.hpp b/include/Game/Player/GroupChecker.hpp index 1fe162aa3..a5a58438d 100644 --- a/include/Game/Player/GroupChecker.hpp +++ b/include/Game/Player/GroupChecker.hpp @@ -5,26 +5,26 @@ class GroupChecker : public NameObj { public: - GroupChecker(const char *, u32); + GroupChecker(const char*, u32); virtual ~GroupChecker(); virtual void initAfterPlacement(); - void add(const NameObj *); + void add(const NameObj*); - HashSortTable *mHashTable; // 0xC + HashSortTable* mHashTable; // 0xC }; class GroupCheckManager : public NameObj { public: - GroupCheckManager(const char *); + GroupCheckManager(const char*); virtual ~GroupCheckManager(); - void add(const NameObj *, s32); - bool isExist(const NameObj *, s32); + void add(const NameObj*, s32); + bool isExist(const NameObj*, s32); - GroupChecker *mShellSearchGroup; // 0xC - GroupChecker *mSpinningBoxSearchGroup; // 0x10 - u32 _14; + GroupChecker* mShellSearchGroup; // 0xC + GroupChecker* mSpinningBoxSearchGroup; // 0x10 + u32 _14; }; \ No newline at end of file diff --git a/include/Game/Player/J3DModelX.hpp b/include/Game/Player/J3DModelX.hpp index 5d10741f3..197d1d8fa 100644 --- a/include/Game/Player/J3DModelX.hpp +++ b/include/Game/Player/J3DModelX.hpp @@ -8,20 +8,22 @@ class J3DShapePacketX; class J3DModelX : public J3DModel { public: - J3DModelX(J3DModelData *, u32, u32); + J3DModelX(J3DModelData*, u32, u32); virtual ~J3DModelX(); - void simpleDrawShape(J3DMaterial *); - void storeDisplayList(_GDLObj *, u32); - void shapePacketDrawFast(J3DShapePacketX *); - void shapeDrawFast(J3DShapeX *) const; - void setDynamicDL(u8 *, u32); + void simpleDrawShape(J3DMaterial*); + void storeDisplayList(_GDLObj*, u32); + void shapePacketDrawFast(J3DShapePacketX*); + void shapeDrawFast(J3DShapeX*) const; + void setDynamicDL(u8*, u32); void setDrawView(u32); - void directDraw(J3DModel *); + void directDraw(J3DModel*); struct Flags { - inline void clear() { *(u32 *)this = 0; } + inline void clear() { + *(u32*)this = 0; + } unsigned _0 : 1; unsigned _1 : 1; @@ -54,42 +56,42 @@ public: unsigned _1C : 1; }; - u8 _DC; - u8 _DD; - u32 _E0; - u32 _E4; - u32 _E8; - u32 _EC; - u32 _F0; - u32 _F4; - u32 _F8; - u32 _FC; - u32 _100; - u32 _104; - u32 _108; - u32 _10C; - u32 _110; - u32 _114; - u32 _118; - u32 _11C; - u32 _120; - u32 _124; - u32 _128; - u32 _12C; - u8 _130[0x1B0 - 0x130]; + u8 _DC; + u8 _DD; + u32 _E0; + u32 _E4; + u32 _E8; + u32 _EC; + u32 _F0; + u32 _F4; + u32 _F8; + u32 _FC; + u32 _100; + u32 _104; + u32 _108; + u32 _10C; + u32 _110; + u32 _114; + u32 _118; + u32 _11C; + u32 _120; + u32 _124; + u32 _128; + u32 _12C; + u8 _130[0x1B0 - 0x130]; Flags mFlags; - u32 _1B4; - u32 _1B8; - u32 _1BC; - u32 _1C0; - u32 *_1C4; - u32 *_1C8; - u16 *_1CC; - u8 _1D0; - f32 _1D4; - u32 _1D8; - u32 _1DC; - s32 _1E0; - u8 _1E4; - u8 _1E5; + u32 _1B4; + u32 _1B8; + u32 _1BC; + u32 _1C0; + u32* _1C4; + u32* _1C8; + u16* _1CC; + u8 _1D0; + f32 _1D4; + u32 _1D8; + u32 _1DC; + s32 _1E0; + u8 _1E4; + u8 _1E5; }; diff --git a/include/Game/Player/Mario.hpp b/include/Game/Player/Mario.hpp index 58d086bd0..dbdee1789 100644 --- a/include/Game/Player/Mario.hpp +++ b/include/Game/Player/Mario.hpp @@ -50,62 +50,62 @@ class MarioModuleTask; class Mario : public MarioModule { public: - typedef bool (Mario::*Task)(const void *, void *, u32); - Mario(MarioActor *); + typedef bool (Mario::*Task)(const void*, void*, u32); + Mario(MarioActor*); virtual bool postureCtrl(MtxPtr); void initMember(); - - void updateAndClearStrideParameter(); - void checkKeyLock(); - void updateTimers(); - void updateMorphResetTimer(); - void doExtraServices(); - bool isEnableCheckGround() NO_INLINE; - void setGroundNorm(const TVec3f &); - bool checkForceGrounding(); - void updateGroundInfo(); - void fixHeadFrontVecByGravity(); - bool isNonFixHeadVec() const; - void createMtxDir(MtxPtr, const TVec3f &, const TVec3f &, const TVec3f &); - void createDirectionMtx(MtxPtr); - void createCorrectionMtx(MtxPtr, TVec3f *); - void createAngleMtx(MtxPtr, bool); - void slopeTiltHead(TVec3f *); - void fixFrontVecByGravity(); - void fixFrontVecFromUpSide(); - void fixSideVecFromFrontUp(); - void setSideVec(const TVec3f &); - void setHeadVec(const TVec3f &); - void setFrontVec(const TVec3f &); - void setFrontVecKeepUp(const TVec3f &, f32); - void setFrontVecKeepUp(const TVec3f &, u32); - void setFrontVecKeepUp(const TVec3f &); - void setFrontVecKeepUpAngle(const TVec3f &, f32); - void setFrontVecKeepSide(const TVec3f &); - void setHeadAndFrontVecFromRotate(const TVec3f &); - void forceSetHeadVecKeepSide(const TVec3f &); - void setGravityVec(const TVec3f &); - void draw() const; - void addTrans(const TVec3f &, const char *); - void setTrans(const TVec3f &, const char *); - bool isEnableRush() const; - bool isForceStopRush() const; - bool isInvincible() const; - bool isCeiling() const; - void inputStick(); - void updateSoundCode(); - const TVec3f &getShadowNorm() const; - const TVec3f &getAirGravityVec() const; - const TVec3f &getAirFrontVec() const; + + void updateAndClearStrideParameter(); + void checkKeyLock(); + void updateTimers(); + void updateMorphResetTimer(); + void doExtraServices(); + bool isEnableCheckGround() NO_INLINE; + void setGroundNorm(const TVec3f&); + bool checkForceGrounding(); + void updateGroundInfo(); + void fixHeadFrontVecByGravity(); + bool isNonFixHeadVec() const; + void createMtxDir(MtxPtr, const TVec3f&, const TVec3f&, const TVec3f&); + void createDirectionMtx(MtxPtr); + void createCorrectionMtx(MtxPtr, TVec3f*); + void createAngleMtx(MtxPtr, bool); + void slopeTiltHead(TVec3f*); + void fixFrontVecByGravity(); + void fixFrontVecFromUpSide(); + void fixSideVecFromFrontUp(); + void setSideVec(const TVec3f&); + void setHeadVec(const TVec3f&); + void setFrontVec(const TVec3f&); + void setFrontVecKeepUp(const TVec3f&, f32); + void setFrontVecKeepUp(const TVec3f&, u32); + void setFrontVecKeepUp(const TVec3f&); + void setFrontVecKeepUpAngle(const TVec3f&, f32); + void setFrontVecKeepSide(const TVec3f&); + void setHeadAndFrontVecFromRotate(const TVec3f&); + void forceSetHeadVecKeepSide(const TVec3f&); + void setGravityVec(const TVec3f&); + void draw() const; + void addTrans(const TVec3f&, const char*); + void setTrans(const TVec3f&, const char*); + bool isEnableRush() const; + bool isForceStopRush() const; + bool isInvincible() const; + bool isCeiling() const; + void inputStick(); + void updateSoundCode(); + const TVec3f& getShadowNorm() const; + const TVec3f& getAirGravityVec() const; + const TVec3f& getAirFrontVec() const; const TVec3f* getGravityVec() const; - void initAfterConst(); - void writeBackPhysicalVector(); - void update(); - void updateLookOfs(); - void actionMain(); - void touchWater(); + void initAfterConst(); + void writeBackPhysicalVector(); + void update(); + void updateLookOfs(); + void actionMain(); + void touchWater(); bool isBlendWaitGround() const; bool checkSpecialWaitAnimation(); @@ -113,64 +113,64 @@ public: void connectToClimb(); - bool isIgnoreTriangle(const Triangle *); - void checkBaseTransBall(); - void createAtField(bool, f32); - void doSwimmingHitCheck(const HitInfo *, u32); - void doSpinPunchAroundPolygons(); - void checkMap(); - f32 calcDistToCeil(bool); - f32 calcDistToCeilOnPress(); - f32 calcDistToCeilHead(); - void fixTransBetweenWall(const TVec3f &, const TVec3f &); - f32 calcDistWidth(); - void updateCameraPolygon(); - void setCameraPolygon(const Triangle *); - void checkAllWall(const TVec3f &, f32); - void calcFrontFloor(); - const TVec3f &getWallNorm() const; - const TVec3f &getSideWallNorm() const; - const TVec3f &getFrontWallNorm() const; - const TVec3f &getBackWallNorm() const; - const TVec3f &getWallPos() const; - const Triangle *getWallPolygon() const; - const Triangle *getGroundPolygon() const; - void updateFloorCode(); - void updateWallFloorCode(); - void saveLastSafetyTrans(); - void setNotSafetyTimer(); - TVec3f* getLastSafetyTrans(TVec3f *) const; - bool checkCurrentFloorCodeSevere(u32) const; - bool isCurrentFloorSink() const; - bool isCurrentFloorSand() const; - bool isCurrentShadowFloorDangerAction() const; - bool checkBaseTransPoint(); - bool checkHeadPoint(); - const TVec3f *calcShadowPos(); - void updateBinderInfo(); - bool isThroughWall(const Triangle *) const; - void checkGround(); - void getCameraCubeCode() const; - void updateCubeCode(); + bool isIgnoreTriangle(const Triangle*); + void checkBaseTransBall(); + void createAtField(bool, f32); + void doSwimmingHitCheck(const HitInfo*, u32); + void doSpinPunchAroundPolygons(); + void checkMap(); + f32 calcDistToCeil(bool); + f32 calcDistToCeilOnPress(); + f32 calcDistToCeilHead(); + void fixTransBetweenWall(const TVec3f&, const TVec3f&); + f32 calcDistWidth(); + void updateCameraPolygon(); + void setCameraPolygon(const Triangle*); + void checkAllWall(const TVec3f&, f32); + void calcFrontFloor(); + const TVec3f& getWallNorm() const; + const TVec3f& getSideWallNorm() const; + const TVec3f& getFrontWallNorm() const; + const TVec3f& getBackWallNorm() const; + const TVec3f& getWallPos() const; + const Triangle* getWallPolygon() const; + const Triangle* getGroundPolygon() const; + void updateFloorCode(); + void updateWallFloorCode(); + void saveLastSafetyTrans(); + void setNotSafetyTimer(); + TVec3f* getLastSafetyTrans(TVec3f*) const; + bool checkCurrentFloorCodeSevere(u32) const; + bool isCurrentFloorSink() const; + bool isCurrentFloorSand() const; + bool isCurrentShadowFloorDangerAction() const; + bool checkBaseTransPoint(); + bool checkHeadPoint(); + const TVec3f* calcShadowPos(); + void updateBinderInfo(); + bool isThroughWall(const Triangle*) const; + void checkGround(); + void getCameraCubeCode() const; + void updateCubeCode(); bool isDamaging() const; - void damageLarge(const TVec3f &); + void damageLarge(const TVec3f&); void decDamageAfterTimer(); bool checkDamage(); - u16 getDamageAfterTimer() const; + u16 getDamageAfterTimer() const; void damageFloorCheck(); void damageWallCheck(); - void damagePolygonCheck(const Triangle *); - void flipLarge(const TVec3f &); + void damagePolygonCheck(const Triangle*); + void flipLarge(const TVec3f&); bool isEnableAddDamage() const; - void damage(const TVec3f &); + void damage(const TVec3f&); void doAbyssDamage(); void connectToFireRun(); void doFireDanceWithInitialDamage(u8); void doFireObjHitWithInitialDamage(); void doNeedleWithInitialDamage(u8); - void doNeedleWithInitialDamage(const Triangle *); - void doNeedle(const Triangle *); + void doNeedleWithInitialDamage(const Triangle*); + void doNeedle(const Triangle*); void doFireDance(); void checkKarikariDamage(); void doDarkDamage(); @@ -179,18 +179,18 @@ public: void requestCrush(); void tryCrush(); - void doFlipWeak(const TVec3f &); - void faint(const TVec3f &); + void doFlipWeak(const TVec3f&); + void faint(const TVec3f&); - void doFlipJump(const TVec3f &); - void doFlipBackRoll(const TVec3f &); + void doFlipJump(const TVec3f&); + void doFlipBackRoll(const TVec3f&); void doFrontStep(); void beeMarioOnGround(); void beeMarioOnAir(); - void blown(const TVec3f &); + void blown(const TVec3f&); void taskOnEffectCheck(u32); @@ -205,17 +205,17 @@ public: bool trySquatJump(); bool tryBackJump(); bool tryTornadoJump(); - void startTornadoCentering(HitSensor *); + void startTornadoCentering(HitSensor*); void taskOnTornadoCentering(u32); bool trySpinJump(u8); - bool tryForceJumpDelay(const TVec3f &); - bool tryFreeJumpDelay(const TVec3f &); - bool tryForceJump(const TVec3f &, bool); - bool tryForceFreeJump(const TVec3f &); - bool tryForcePowerJump(const TVec3f &, bool); - bool tryFreeJump(const TVec3f &, bool); - bool tryWallJump(const TVec3f &, bool); - bool tryStickJump(const TVec3f &); + bool tryForceJumpDelay(const TVec3f&); + bool tryFreeJumpDelay(const TVec3f&); + bool tryForceJump(const TVec3f&, bool); + bool tryForceFreeJump(const TVec3f&); + bool tryForcePowerJump(const TVec3f&, bool); + bool tryFreeJump(const TVec3f&, bool); + bool tryWallJump(const TVec3f&, bool); + bool tryStickJump(const TVec3f&); bool trySlipUpJump(); bool tryHangSlipUp(); bool tryDrop(); @@ -233,7 +233,7 @@ public: void doAirWalk(); void stopJump(); void cancelTornadoJump(); - void setRocketBooster(const TVec3f &, f32, u16); + void setRocketBooster(const TVec3f&, f32, u16); void procRocketBooster(); bool isSoftLandingFloor() const; void checkAndTryForceJump(); @@ -249,26 +249,26 @@ public: void decideInertia(f32); void decideInertiaOnIce(f32); void decideInertiaOnSlip(f32); - void calcShadowDir(const TVec3f &, TVec3f *); - void retainMoveDir(f32, f32, TVec3f *); - void calcMoveDir(f32, f32, TVec3f *, bool); + void calcShadowDir(const TVec3f&, TVec3f*); + void retainMoveDir(f32, f32, TVec3f*); + void calcMoveDir(f32, f32, TVec3f*, bool); void checkLockOnHoming(); void doLockOnHoming(); void fixPositionInTower(); void check2DMode(); - void calcMoveDir2D(f32, f32, TVec3f *); - void calcShadowDir2D(const TVec3f &, TVec3f *); - void stick2Dadjust(f32 &, f32 &); + void calcMoveDir2D(f32, f32, TVec3f*); + void calcShadowDir2D(const TVec3f&, TVec3f*); + void stick2Dadjust(f32&, f32&); void set2DMode(bool); void beforeJumping2D(); void afterLanding2D(); void clear2DStick(); - void set25DMode(const AreaObj *); + void set25DMode(const AreaObj*); void update25DMode(); void updateAxisFromMode(u8); - void calcMoveDir25D(f32, f32, TVec3f *); + void calcMoveDir25D(f32, f32, TVec3f*); bool checkPressDamage(); bool checkVerticalPress(bool); @@ -284,24 +284,24 @@ public: bool isSkatableFloor() const; void doSkate(); - u32 initSoundTable(SoundList *list, u32); + u32 initSoundTable(SoundList* list, u32); void initSound(); - bool playSoundJ(const char *, s32); - void stopSoundJ(const char *, u32); - void startBas(const char *, bool, f32, f32); - bool isRunningBas(const char *) const; + bool playSoundJ(const char*, s32); + void stopSoundJ(const char*, u32); + void startBas(const char*, bool, f32, f32); + bool isRunningBas(const char*) const; void skipBas(f32); void playSoundTeresaFlying(); void playSoundTrampleCombo(u8); void setSeVersion(u32); - bool checkOnimasu(const HitSensor *); - bool isDossun(const Triangle *) const; + bool checkOnimasu(const HitSensor*); + bool isDossun(const Triangle*) const; bool isStageCameraRotate2D() const; bool isNoWalkFallOnDossun() const; bool isNotReflectGlassGround() const; bool isUseAnotherMovingPolygon() const; - bool isUseFoolSpecialGravity(const TVec3f &, TVec3f *) const; + bool isUseFoolSpecialGravity(const TVec3f&, TVec3f*) const; void updateOnimasu(); bool isHeadPushEnableArea() const; bool isOnimasuBinderPressSkip() const; @@ -309,7 +309,7 @@ public: void checkTornado(); void resetTornado(); void calcTornadoTilt(); - void reflectWallOnSpinning(const TVec3f &, u16); + void reflectWallOnSpinning(const TVec3f&, u16); void forceStopTornado(); void startRotationTask(u32); void doSpinWallEffect(); @@ -317,17 +317,17 @@ public: void sendStateMsg(u32); void updatePosture(MtxPtr); - void changeStatus(MarioState *); - void closeStatus(MarioState *); - u32 getCurrentStatus() const; + void changeStatus(MarioState*); + void closeStatus(MarioState*); + u32 getCurrentStatus() const; bool isStatusActive(u32) const; bool checkBeeStick(); - bool tryBeeStick(const HitSensor *); + bool tryBeeStick(const HitSensor*); - void startTalk(const LiveActor *); + void startTalk(const LiveActor*); void endTalk(); - void setLastNonFixMoveVec(const TVec3f &); + void setLastNonFixMoveVec(const TVec3f&); bool isWalling() const; void checkWallStick(); @@ -337,8 +337,8 @@ public: void fixWallingDir(); void fixWallingTop(); void checkWallFloorCode(u16) const; - void checkWallCode(const char *, bool) const; - void checkWallCodeNorm(u16, TVec3f *, bool) const; + void checkWallCode(const char*, bool) const; + void checkWallCodeNorm(u16, TVec3f*, bool) const; void setWallCancel(); void keepDistFrontWall(); bool isEnableStickWall(); @@ -347,14 +347,14 @@ public: bool tryWallPunch(); bool isHanging() const; - void fixHangDir(const TVec3f &, TVec3f *); + void fixHangDir(const TVec3f&, TVec3f*); bool isEnableBackHang(); bool isEnableSideHang(); void checkHang(); bool isEnableHang(); bool isSwimming() const; - bool forceStartSwimAndShoot(const TVec3f &); + bool forceStartSwimAndShoot(const TVec3f&); bool forceExitSwim(); bool checkStartSwim(); void startSwim(); @@ -367,14 +367,14 @@ public: void slopeMove(); void taskOnSlipTurn(u32); - void lockGroundCheck(void *, bool); - void unlockGroundCheck(void *); + void lockGroundCheck(void*, bool); + void unlockGroundCheck(void*); bool isUseSimpleGroundCheck() const; bool checkGroundOnSlope(); void stopWalk(); void cancelSquatMode(); - f32 getTargetWalkSpeed() const; + f32 getTargetWalkSpeed() const; void decideSquatWalkAnimation(); void decideWalkSpeed(); void decideWalkAnimation(); @@ -394,34 +394,34 @@ public: void startSlider(); void checkStep(); - void startStep(const TVec3f &); + void startStep(const TVec3f&); void checkBump(); - void startBump(const TVec3f &); + void startBump(const TVec3f&); - void checkEnforceMove(); - void checkEnforceMoveInner(); - void recordRelativePosition(); - void invalidateRelativePosition(); + void checkEnforceMove(); + void checkEnforceMoveInner(); + void recordRelativePosition(); + void invalidateRelativePosition(); MtxPtr getMoveBaseMtx() const; - void moveRelativePosition(u32); - void moveRelativePositionWall(); - void recordLastGround(); - void getLastGroundPos(TVec3f *) const; - void getLastGroundEdgeNrm(u32) const; - void getLastGroundEdgeIndex(const TVec3f &, const TVec3f &) const; - void pushedByReaction(); - void addReaction(TVec3f &); - bool tryPushToVelocity(); - void push(const TVec3f &); - void push2(const TVec3f &); - void powerAreaMove(); - void powerRailMove(); - void recordJumpEnforceMove(); - void doEnforceJump(f32); - void pushedByWind(); + void moveRelativePosition(u32); + void moveRelativePositionWall(); + void recordLastGround(); + void getLastGroundPos(TVec3f*) const; + void getLastGroundEdgeNrm(u32) const; + void getLastGroundEdgeIndex(const TVec3f&, const TVec3f&) const; + void pushedByReaction(); + void addReaction(TVec3f&); + bool tryPushToVelocity(); + void push(const TVec3f&); + void push2(const TVec3f&); + void powerAreaMove(); + void powerRailMove(); + void recordJumpEnforceMove(); + void doEnforceJump(f32); + void pushedByWind(); - void delTask(MarioModuleTask *); + void delTask(MarioModuleTask*); void execTask(); void drawTask() const; void initTask(); @@ -438,36 +438,36 @@ public: void startFreezeEnd(); void taskOnHandy(u32); void startHipDropBlur(); - void startHipDropSlide(const HitSensor *); - void startJumpDropSlide(const HitSensor *); + void startHipDropSlide(const HitSensor*); + void startJumpDropSlide(const HitSensor*); void startTeresaMode(); - void getHitWallNorm(TVec3f *); + void getHitWallNorm(TVec3f*); void resetTeresaMode(); - void doTeresaReflection(const TVec3f &, bool); + void doTeresaReflection(const TVec3f&, bool); void startTeresaDisappear(); void stopPunch(); void startMagic(); - void doObjWarp(LiveActor *); - void doPointWarp(const TVec3f &, const TVec3f &, s32); + void doObjWarp(LiveActor*); + void doPointWarp(const TVec3f&, const TVec3f&, s32); bool isVisibleRecoveryWarpBubble() const; void doCubeWarp(); - void doPointWarpRecovery(const TVec3f &, const TVec3f &); + void doPointWarpRecovery(const TVec3f&, const TVec3f&); bool isDisableStayHere() const; bool isDisableFpViewMode() const; void tryFpViewMode(); - void stick2DadjustGround(f32 &, f32 &); - void calcDir2D(f32, f32, TVec3f *); + void stick2DadjustGround(f32&, f32&); + void calcDir2D(f32, f32, TVec3f*); struct MovementStates { - unsigned jumping : 1; // _0 + unsigned jumping : 1; // _0 unsigned _1 : 1; unsigned _2 : 1; - unsigned turning : 1; // _3 + unsigned turning : 1; // _3 unsigned _4 : 1; unsigned _5 : 1; unsigned _6 : 1; @@ -486,7 +486,7 @@ public: unsigned _13 : 1; unsigned _14 : 1; unsigned _15 : 1; - unsigned debugMode : 1; // _16 + unsigned debugMode : 1; // _16 unsigned _17 : 1; unsigned _18 : 1; unsigned _19 : 1; @@ -494,7 +494,7 @@ public: unsigned _1B : 1; unsigned _1C : 1; unsigned _1D : 1; - unsigned digitalJump : 1; // _1E + unsigned digitalJump : 1; // _1E unsigned _1F : 1; unsigned _20 : 1; unsigned _21 : 1; @@ -563,195 +563,201 @@ public: unsigned _1F : 1; }; - inline const MovementStates &getMovementStates() const { return mMovementStates; } - inline const DrawStates &getDrawStates() const { return mDrawStates; } - inline const DrawStates &getPrevDrawStates() const { return mPrevDrawStates; } + inline const MovementStates& getMovementStates() const { + return mMovementStates; + } + inline const DrawStates& getDrawStates() const { + return mDrawStates; + } + inline const DrawStates& getPrevDrawStates() const { + return mPrevDrawStates; + } union { - MovementStates mMovementStates; // 0x8 + MovementStates mMovementStates; // 0x8 struct { - u32 mMovementStates_LOW_WORD; // 0x8 - u32 mMovementStates_HIGH_WORD; // 0xC + u32 mMovementStates_LOW_WORD; // 0x8 + u32 mMovementStates_HIGH_WORD; // 0xC }; }; union { MovementStates _10; struct { - u32 _10_LOW_WORD; // 0x10 - u32 _10_HIGH_WORD; // 0x14 + u32 _10_LOW_WORD; // 0x10 + u32 _10_HIGH_WORD; // 0x14 }; }; union { - DrawStates mDrawStates; // 0x18 - u32 mDrawStates_WORD; + DrawStates mDrawStates; // 0x18 + u32 mDrawStates_WORD; }; union { DrawStates _1C; - u32 _1C_WORD; + u32 _1C_WORD; }; u32 _20; u32 _24; u32 _28; u32 _2C; - DrawStates mPrevDrawStates; // 0x30 + DrawStates mPrevDrawStates; // 0x30 // FAKE u32 _34; // NOT FAKE - f32 _38; - f32 _3C; - TVec3f _40; - TVec3f _4C; - TVec3f _58; - TMtx34f _64; - TMtx34f _94; - TMtx34f _C4; - TMtx34f _F4; - f32 _124; - f32 _128; - u32 _12C; - TVec3f mPosition; // 0x130 - TVec3f _13C; - TVec3f _148; - TVec3f _154; - TVec3f mVelocity; // 0x160 - TVec3f _16C; - TVec3f mVelocityAfter; // 0x178 - TVec3f _184; - TVec3f _190; - TVec3f _19C; - TVec3f _1A8; - TVec3f _1B4; - TVec3f mStickPos; // 0x1C0 - TVec3f mWorldPadDir; // 0x1CC - TVec3f mAirGravityVec; // 0x1D8 - TVec3f _1E4; - TVec3f mHeadVec; // 0x1F0 - TVec3f _1FC; - TVec3f mFrontVec; // 0x208 - TVec3f _214; - TVec3f _220; - TVec3f _22C; - TVec3f _238; - TVec3f _244; - TVec3f _250; - TVec3f _25C; - TVec3f _268; - u8 _274; - f32 _278; - f32 _27C; - f32 _280; - TVec3f _284; - TVec3f _290; - TVec3f _29C; - TVec3f _2A8; - f32 _2B4; - TVec3f _2B8; - TVec3f _2C4; - f32 _2D0; - TVec3f mJumpVec; // 0x2D4 - TVec3f _2E0; - TVec3f _2EC; - TVec3f _2F8; - TVec3f _304; - TVec3f mSideVec; // 0x310 - TVec3f mShadowPos; // 0x31C - TVec3f _328; - TVec3f _334; - f32 _340; - TVec3f _344; // left/right? - TVec3f _350; - TVec3f _35C; - TVec3f _368; - TVec3f _374; - TVec3f _380; - TVec3f _38C; - TVec3f _398; - TVec3f _3A4; - TVec3f _3B0; - u16 _3BC; - u16 _3BE; - u16 _3C0; - u16 _3C2; - u16 _3C4; - u16 _3C6; - u16 _3C8; - u16 _3CA; - u16 _3CC; - u16 _3CE; // a timer - u16 _3D0; - u16 _3D2; - u16 _3D4; - TVec3f _3D8; - TVec3f _3E4; - f32 _3F0; - f32 _3F4; - u16 _3F8; - u16 _3FA; - u16 _3FC; - u16 _3FE; - u16 _400; - u16 _402; - u16 _404; - u16 _406; - u16 _408; - u16 _40A; - u16 _40C; - u16 _40E; - u16 _410; - u16 _412; - u16 _414; // a timer - u16 mMorphResetTimer; // 0x416 - u16 _418; - u16 _41A; - u16 _41C; - u16 _41E; - u16 _420; - u16 _422; - u16 _424; - u16 _426; - u16 _428; - u16 _42A; - u16 _42C; - u32 _430; - u16 _434; // a timer - u16 _436; - u16 _438; - u16 _43A; - TVec3f _43C; // front? - TVec3f _448; - f32 _454; - TriangleFilterDelegator *_458; - Triangle *_45C; - Triangle *_460; - Triangle *mGroundPolygon; // 0x464 - Triangle *_468; - Triangle *_46C; - Triangle *_470; - Triangle *_474; - Triangle *mTmpPolygon; // 0x478 - Triangle *_47C; - Triangle *_480; - Triangle *_484; - f32 _488; - TVec3f mGroundPos; // 0x48C - TVec3f _498; - TVec3f _4A4; - TVec3f _4B0; - TVec3f _4BC; - Triangle *_4C8; - Triangle *mFrontWallTriangle; // 0x4CC - Triangle *mBackWallTriangle; // 0x4D0 - Triangle *mSideWallTriangle; // 0x4D4 - Triangle *_4D8; - Triangle *_4DC; - f32 _4E0; - f32 _4E4; - TVec3f _4E8; - TVec3f _4F4; + f32 _38; + f32 _3C; + TVec3f _40; + TVec3f _4C; + TVec3f _58; + TMtx34f _64; + TMtx34f _94; + TMtx34f _C4; + TMtx34f _F4; + f32 _124; + f32 _128; + u32 _12C; + TVec3f mPosition; // 0x130 + TVec3f _13C; + TVec3f _148; + TVec3f _154; + TVec3f mVelocity; // 0x160 + TVec3f _16C; + TVec3f mVelocityAfter; // 0x178 + TVec3f _184; + TVec3f _190; + TVec3f _19C; + TVec3f _1A8; + TVec3f _1B4; + TVec3f mStickPos; // 0x1C0 + TVec3f mWorldPadDir; // 0x1CC + TVec3f mAirGravityVec; // 0x1D8 + TVec3f _1E4; + TVec3f mHeadVec; // 0x1F0 + TVec3f _1FC; + TVec3f mFrontVec; // 0x208 + TVec3f _214; + TVec3f _220; + TVec3f _22C; + TVec3f _238; + TVec3f _244; + TVec3f _250; + TVec3f _25C; + TVec3f _268; + u8 _274; + f32 _278; + f32 _27C; + f32 _280; + TVec3f _284; + TVec3f _290; + TVec3f _29C; + TVec3f _2A8; + f32 _2B4; + TVec3f _2B8; + TVec3f _2C4; + f32 _2D0; + TVec3f mJumpVec; // 0x2D4 + TVec3f _2E0; + TVec3f _2EC; + TVec3f _2F8; + TVec3f _304; + TVec3f mSideVec; // 0x310 + TVec3f mShadowPos; // 0x31C + TVec3f _328; + TVec3f _334; + f32 _340; + TVec3f _344; // left/right? + TVec3f _350; + TVec3f _35C; + TVec3f _368; + TVec3f _374; + TVec3f _380; + TVec3f _38C; + TVec3f _398; + TVec3f _3A4; + TVec3f _3B0; + u16 _3BC; + u16 _3BE; + u16 _3C0; + u16 _3C2; + u16 _3C4; + u16 _3C6; + u16 _3C8; + u16 _3CA; + u16 _3CC; + u16 _3CE; // a timer + u16 _3D0; + u16 _3D2; + u16 _3D4; + TVec3f _3D8; + TVec3f _3E4; + f32 _3F0; + f32 _3F4; + u16 _3F8; + u16 _3FA; + u16 _3FC; + u16 _3FE; + u16 _400; + u16 _402; + u16 _404; + u16 _406; + u16 _408; + u16 _40A; + u16 _40C; + u16 _40E; + u16 _410; + u16 _412; + u16 _414; // a timer + u16 mMorphResetTimer; // 0x416 + u16 _418; + u16 _41A; + u16 _41C; + u16 _41E; + u16 _420; + u16 _422; + u16 _424; + u16 _426; + u16 _428; + u16 _42A; + u16 _42C; + u32 _430; + u16 _434; // a timer + u16 _436; + u16 _438; + u16 _43A; + TVec3f _43C; // front? + TVec3f _448; + f32 _454; + TriangleFilterDelegator* _458; + Triangle* _45C; + Triangle* _460; + Triangle* mGroundPolygon; // 0x464 + Triangle* _468; + Triangle* _46C; + Triangle* _470; + Triangle* _474; + Triangle* mTmpPolygon; // 0x478 + Triangle* _47C; + Triangle* _480; + Triangle* _484; + f32 _488; + TVec3f mGroundPos; // 0x48C + TVec3f _498; + TVec3f _4A4; + TVec3f _4B0; + TVec3f _4BC; + Triangle* _4C8; + Triangle* mFrontWallTriangle; // 0x4CC + Triangle* mBackWallTriangle; // 0x4D0 + Triangle* mSideWallTriangle; // 0x4D4 + Triangle* _4D8; + Triangle* _4DC; + f32 _4E0; + f32 _4E4; + TVec3f _4E8; + TVec3f _4F4; // FAKE TVec3f _500; @@ -759,154 +765,154 @@ public: TVec3f _50C; TVec3f _518; - f32 _524; - f32 _528; - f32 _52C; - f32 _530; - u16 _534; - f32 _538; - f32 _53C; - f32 mYAngleOffset; // 0x540 - u16 _544; - f32 _548; + f32 _524; + f32 _528; + f32 _52C; + f32 _530; + u16 _534; + f32 _538; + f32 _53C; + f32 mYAngleOffset; // 0x540 + u16 _544; + f32 _548; TVec3f _54C; - u32 _558; + u32 _558; // FAKE u32 _55C; u32 _560; // NOT FAKE - s32 _564; - u32 _568; - u32 _56C; - u8 _570; - u32 _574; - u32 _578; - Triangle *_57C[0x20]; - u32 _5FC; - TVec3f _600; - u8 _60C; - u8 _60D; // bool? - u8 _60E; - u8 _60F; - u8 _610; - u8 _611; - f32 _614; - f32 _618; - f32 _61C; - f32 _620; - u8 _624; - TVec3f _628; - f32 _634; + s32 _564; + u32 _568; + u32 _56C; + u8 _570; + u32 _574; + u32 _578; + Triangle* _57C[0x20]; + u32 _5FC; + TVec3f _600; + u8 _60C; + u8 _60D; // bool? + u8 _60E; + u8 _60F; + u8 _610; + u8 _611; + f32 _614; + f32 _618; + f32 _61C; + f32 _620; + u8 _624; + TVec3f _628; + f32 _634; - u8 _638; + u8 _638; TVec3f _63C; TVec3f _648; TVec3f _654; TVec3f _660; - u8 _66C; + u8 _66C; TVec3f _670; TVec3f _67C; - TVec3f _688; - TVec3f _694; - TVec3f _6A0; - u8 _6AC; - u8 _6AD; - TVec3f _6B0; - TVec3f _6BC; - f32 _6C8; - f32 _6CC; - TVec3f _6D0; - TVec3f _6DC; - TVec3f _6E8; - TVec3f _6F4; - TVec3f _700; - TVec3f _70C; - f32 _718; - u8 _71C; - u8 _71D; - u8 _71E; - u8 _71F; - const char* _720; - const char* _724; - const char* _728; - f32 _72C; - u32 _730; - u8 _734; - u8 _735; - f32 _738; - f32 _73C; - f32 _740; - f32 _744; - u8 _748; - f32 _74C; - u32 _750; - u32 _754; - MarioWall *mWall; // 0x758 - TVec3f _75C; - MarioStick *mStick; // 0x768 - u16 _76C; - f32 _770; - u16 _774; - MarioRabbit *mRabbit; // 0x778 - MarioFoo *mFoo; // 0x77C - MarioSukekiyo *mSukekiyo; // 0x780 - MarioBury *mBury; // 0x784 - MarioWait *mWait; // 0x788 - MarioClimb *mClimb; // 0x78C - TVec3f _790; - MarioHang *mHang; // 0x79C - MarioRecovery *mRecovery; // 0x7A0 - MarioWarp *mWarp; // 0x7A4 - MarioFlip *mFlip; // 0x7A8 - MarioSideStep *mSideStep; // 0x7AC - MarioFrontStep *mFrontStep; // 0x7B0 - MarioSkate *mSkate; // 0x7B4 - MarioTalk *mTalk; // 0x7B8 - MarioTeresa *mTeresa; // 0x7BC - MarioDamage *mDamage; // 0x7C0 - TVec3f _7C4; - u16 _7D0; - TVec3f _7D4; - Triangle *_7E0; - TMtx34f _7E4; - TVec3f _814; - Triangle *_820; - TMtx34f _824; - MarioFlow *mFlow; // 0x854 - MarioFireDamage *mFireDamage; // 0x858 - MarioFireDance *mFireDance; // 0x85C - MarioFireRun *mFireRun; // 0x860 - MarioParalyze *mParalyze; // 0x864 - MarioStun *mStun; // 0x868 - MarioCrush *mCrush; // 0x86C - MarioFreeze *mFreeze; // 0x870 - MarioAbyssDamage *mAbyssDamage; // 0x874 - MarioDarkDamage *mDarkDamage; // 0x878 - MarioFaint *mFaint; // 0x87C - MarioBlown *mBlown; // 0x880 - MarioSwim *mSwim; // 0x884 - MarioSlider *mSlider; // 0x888 - MarioStep *mStep; // 0x88c - MarioBump *mBump; // 0x890 - MarioMagic *mMagic; // 0x894 - u8 _898; - MarioFpView *mFpView; // 0x89C - MarioMove *mMove; // 0x8A0 - TVec3f _8A4; - TVec3f _8B0; - TVec3f _8BC; - Triangle *_8C8; - Triangle *_8CC; - Triangle *_8D0; - u32 _8D4; - u32 _8D8; - TVec3f _8DC; - Triangle *_8E8; - u8 _8EC; + TVec3f _688; + TVec3f _694; + TVec3f _6A0; + u8 _6AC; + u8 _6AD; + TVec3f _6B0; + TVec3f _6BC; + f32 _6C8; + f32 _6CC; + TVec3f _6D0; + TVec3f _6DC; + TVec3f _6E8; + TVec3f _6F4; + TVec3f _700; + TVec3f _70C; + f32 _718; + u8 _71C; + u8 _71D; + u8 _71E; + u8 _71F; + const char* _720; + const char* _724; + const char* _728; + f32 _72C; + u32 _730; + u8 _734; + u8 _735; + f32 _738; + f32 _73C; + f32 _740; + f32 _744; + u8 _748; + f32 _74C; + u32 _750; + u32 _754; + MarioWall* mWall; // 0x758 + TVec3f _75C; + MarioStick* mStick; // 0x768 + u16 _76C; + f32 _770; + u16 _774; + MarioRabbit* mRabbit; // 0x778 + MarioFoo* mFoo; // 0x77C + MarioSukekiyo* mSukekiyo; // 0x780 + MarioBury* mBury; // 0x784 + MarioWait* mWait; // 0x788 + MarioClimb* mClimb; // 0x78C + TVec3f _790; + MarioHang* mHang; // 0x79C + MarioRecovery* mRecovery; // 0x7A0 + MarioWarp* mWarp; // 0x7A4 + MarioFlip* mFlip; // 0x7A8 + MarioSideStep* mSideStep; // 0x7AC + MarioFrontStep* mFrontStep; // 0x7B0 + MarioSkate* mSkate; // 0x7B4 + MarioTalk* mTalk; // 0x7B8 + MarioTeresa* mTeresa; // 0x7BC + MarioDamage* mDamage; // 0x7C0 + TVec3f _7C4; + u16 _7D0; + TVec3f _7D4; + Triangle* _7E0; + TMtx34f _7E4; + TVec3f _814; + Triangle* _820; + TMtx34f _824; + MarioFlow* mFlow; // 0x854 + MarioFireDamage* mFireDamage; // 0x858 + MarioFireDance* mFireDance; // 0x85C + MarioFireRun* mFireRun; // 0x860 + MarioParalyze* mParalyze; // 0x864 + MarioStun* mStun; // 0x868 + MarioCrush* mCrush; // 0x86C + MarioFreeze* mFreeze; // 0x870 + MarioAbyssDamage* mAbyssDamage; // 0x874 + MarioDarkDamage* mDarkDamage; // 0x878 + MarioFaint* mFaint; // 0x87C + MarioBlown* mBlown; // 0x880 + MarioSwim* mSwim; // 0x884 + MarioSlider* mSlider; // 0x888 + MarioStep* mStep; // 0x88c + MarioBump* mBump; // 0x890 + MarioMagic* mMagic; // 0x894 + u8 _898; + MarioFpView* mFpView; // 0x89C + MarioMove* mMove; // 0x8A0 + TVec3f _8A4; + TVec3f _8B0; + TVec3f _8BC; + Triangle* _8C8; + Triangle* _8CC; + Triangle* _8D0; + u32 _8D4; + u32 _8D8; + TVec3f _8DC; + Triangle* _8E8; + u8 _8EC; // FAKE? f32 _8F0; @@ -919,40 +925,40 @@ public: TVec3f _904; // NOT FAKE - TVec3f _910; - TVec3f _91C; - TVec3f _928; - f32 _934; - TVec3f _938; - TVec3f _944; - TVec3f _950; - FloorCode *_95C; - u16 _960; - u16 _962; - u16 _964[3]; - u16 _96A; + TVec3f _910; + TVec3f _91C; + TVec3f _928; + f32 _934; + TVec3f _938; + TVec3f _944; + TVec3f _950; + FloorCode* _95C; + u16 _960; + u16 _962; + u16 _964[3]; + u16 _96A; - HashSortTable *_96C; // Sounds - const char *_970; // Sounds or somthing - u32 _974; + HashSortTable* _96C; // Sounds + const char* _970; // Sounds or somthing + u32 _974; // Fake u32 _978; // Not fake - MarioState *_97C; - MarioState *_980; + MarioState* _97C; + MarioState* _980; - Task _984[0xb]; - u32 _A08[11]; - u16 _A34; - u32 _A38; - u16 _A3C; + Task _984[0xb]; + u32 _A08[11]; + u16 _A34; + u32 _A38; + u16 _A3C; TVec3f _A40; TVec3f _A4C; TVec3f _A58; - f32 _A64; - u32 _A68; - u8 _A6C[0x20]; // animations + f32 _A64; + u32 _A68; + u8 _A6C[0x20]; // animations TVec3f _A8C[9]; }; diff --git a/include/Game/Player/MarioAbyssDamage.hpp b/include/Game/Player/MarioAbyssDamage.hpp index ce6d5d632..5507b82ab 100644 --- a/include/Game/Player/MarioAbyssDamage.hpp +++ b/include/Game/Player/MarioAbyssDamage.hpp @@ -6,6 +6,6 @@ class MarioActor; class MarioAbyssDamage : public MarioState { public: - MarioAbyssDamage(MarioActor *); + MarioAbyssDamage(MarioActor*); u8 _11[0x13]; }; diff --git a/include/Game/Player/MarioAccess.hpp b/include/Game/Player/MarioAccess.hpp index eedbda5dd..681a3a191 100644 --- a/include/Game/Player/MarioAccess.hpp +++ b/include/Game/Player/MarioAccess.hpp @@ -5,5 +5,5 @@ class RushEndInfo; class MarioAccess { public: static void readyRemoteDemo(); - static void endRemoteDemo(const RushEndInfo *); + static void endRemoteDemo(const RushEndInfo*); }; diff --git a/include/Game/Player/MarioActor.hpp b/include/Game/Player/MarioActor.hpp index fe7f97cbe..d10e30350 100644 --- a/include/Game/Player/MarioActor.hpp +++ b/include/Game/Player/MarioActor.hpp @@ -5,7 +5,6 @@ #include "Game/Player/Mario.hpp" #include "Game/MapObj/BlackHole.hpp" - class FootPrint; class JAIAudible; class MarioNullBck; @@ -22,75 +21,75 @@ class J3DModelX; class TornadoMario; class ModelHolder; -bool gIsLuigi; // (cc68 - 10000)(r13) +bool gIsLuigi; // (cc68 - 10000)(r13) class MarioActor : public LiveActor { public: - MarioActor(const char *); + MarioActor(const char*); ~MarioActor(); - virtual const TVec3f &getLastMove() const; - virtual void getLastMove(TVec3f *) const; - virtual void getFrontVec(TVec3f *) const; + virtual const TVec3f& getLastMove() const; + virtual void getLastMove(TVec3f*) const; + virtual void getFrontVec(TVec3f*) const; - void init(const JMapInfoIter &); - void init2(const TVec3f &, const TVec3f &, s32); - void initAfterPlacement(); - void initAfterOpeningDemo(); - void calcBaseFrontVec(const TVec3f &); - void playSound(const char *, s32); - void changeAnimation(const char *, const char *); - void changeAnimationNonStop(const char *); - void changeAnimationUpper(const char *); - const char* changeMorphString(const char *) const; - void stopAnimation(const char *); - bool isAnimationRun(const char *) const; - void changeNullAnimation(const char *, s8); - void clearNullAnimation(s8); - void changeSpecialModeAnimation(const char *); - bool isStopNullAnimation() const; - void changeGameOverAnimation(); - XjointTransform *getJointCtrl(const char *) const; - void updateRotationInfo(); - void exeWait(); - void movement(); - void control(); - void control2(); - void controlMain(); - void updateBehavior(); - void updateBindRatio(); - bool isInPunchTimerRange() const; - void updatePunching(); - bool doRush(); - void updateSwingTimer(); - void updateSwingAction(); - bool checkClapCatchStart(); - void updateRealMtx(); - void setUpperRotateY(f32); - void decLife(u16); - void decLifeLarge(); - void decLifeMiddle(); - void decLifeSmall(); - void resetWaterLife(); - void updateLife(); - void incLife(u32); - void changeMaxLife(s32); - bool doPressing(); - void careMovingObject(); - bool doStun(); - void scaleMtx(MtxPtr); - void updateBaseScaleMtx(); - void getRealMtx(MtxPtr, const char *) const NO_INLINE; - void getRealPos(const char *, TVec3f *) const; - void getGlobalJointMtx(const char *); - void calcAnimInMovement(); - void forceSetBaseMtx(MtxPtr); - void calcAnim(); - void calcAndSetBaseMtx(); - void setBlendMtxTimer(u16); - void getGroundPos(TVec3f *dst) const; - TVec3f* getShadowPos() const; + void init(const JMapInfoIter&); + void init2(const TVec3f&, const TVec3f&, s32); + void initAfterPlacement(); + void initAfterOpeningDemo(); + void calcBaseFrontVec(const TVec3f&); + void playSound(const char*, s32); + void changeAnimation(const char*, const char*); + void changeAnimationNonStop(const char*); + void changeAnimationUpper(const char*); + const char* changeMorphString(const char*) const; + void stopAnimation(const char*); + bool isAnimationRun(const char*) const; + void changeNullAnimation(const char*, s8); + void clearNullAnimation(s8); + void changeSpecialModeAnimation(const char*); + bool isStopNullAnimation() const; + void changeGameOverAnimation(); + XjointTransform* getJointCtrl(const char*) const; + void updateRotationInfo(); + void exeWait(); + void movement(); + void control(); + void control2(); + void controlMain(); + void updateBehavior(); + void updateBindRatio(); + bool isInPunchTimerRange() const; + void updatePunching(); + bool doRush(); + void updateSwingTimer(); + void updateSwingAction(); + bool checkClapCatchStart(); + void updateRealMtx(); + void setUpperRotateY(f32); + void decLife(u16); + void decLifeLarge(); + void decLifeMiddle(); + void decLifeSmall(); + void resetWaterLife(); + void updateLife(); + void incLife(u32); + void changeMaxLife(s32); + bool doPressing(); + void careMovingObject(); + bool doStun(); + void scaleMtx(MtxPtr); + void updateBaseScaleMtx(); + void getRealMtx(MtxPtr, const char*) const NO_INLINE; + void getRealPos(const char*, TVec3f*) const; + void getGlobalJointMtx(const char*); + void calcAnimInMovement(); + void forceSetBaseMtx(MtxPtr); + void calcAnim(); + void calcAndSetBaseMtx(); + void setBlendMtxTimer(u16); + void getGroundPos(TVec3f* dst) const; + TVec3f* getShadowPos() const; bool isTurning() const; bool isJumping() const; @@ -105,10 +104,10 @@ public: bool isDebugMode() const; bool isRequestSpin() const; - void jumpHop(); - void calcCenterPos(); - void calcHeadPos(); - void setPress(u8, s32); + void jumpHop(); + void calcCenterPos(); + void calcHeadPos(); + void setPress(u8, s32); XanimeResourceTable* getResourceTable() const; bool isEnableMoveMario() const; @@ -121,7 +120,7 @@ public: void forceGameOverSink(); void updateCameraInfo(); - bool binderFilter(const Triangle *); + bool binderFilter(const Triangle*); void setPunchHitTimer(u8); void initEffect(); @@ -149,14 +148,14 @@ public: void resetPadSwing(); void initActionMatrix(); - TVec3f &getGravityVec() const; - TVec3f &getGravityVector() const; - void updateGravityVec(bool, bool); - void changeTeresaAnimation(const char *, s32); + TVec3f& getGravityVec() const; + TVec3f& getGravityVector() const; + void updateGravityVec(bool, bool); + void changeTeresaAnimation(const char*, s32); - void playEffect(const char *); - void playEffectTrans(const char *, const TVec3f &); - void stopEffect(const char *); + void playEffect(const char*); + void playEffectTrans(const char*, const TVec3f&); + void stopEffect(const char*); void updateActionTrigger(); void updateControllerSwing(); @@ -180,20 +179,20 @@ public: bool tryThrow(); bool tryStandardRush(); void checkPriorRushTarget(); - u8 selectAction(const char *) const; + u8 selectAction(const char*) const; bool tryRushInRush(); void bodyClap(); - bool selectWaterInOut(const char *) const; - bool selectWaterInOutRush(const HitSensor *) const; - void playEffectRT(const char *, const TVec3f &, const TVec3f &); - void playEffectRTZ(const char *, const TVec3f &, const TVec3f &); - void playEffectRTW(const char *, const TVec3f &, const TVec3f &); - void playEffectSRT(const char *, f32, const TVec3f &, const TVec3f &); - void emitEffectWaterColumn(const TVec3f &, const TVec3f &); - bool selectRecoverFlyMeter(const HitSensor *) const; - void endRush(const RushEndInfo *); + bool selectWaterInOut(const char*) const; + bool selectWaterInOutRush(const HitSensor*) const; + void playEffectRT(const char*, const TVec3f&, const TVec3f&); + void playEffectRTZ(const char*, const TVec3f&, const TVec3f&); + void playEffectRTW(const char*, const TVec3f&, const TVec3f&); + void playEffectSRT(const char*, f32, const TVec3f&, const TVec3f&); + void emitEffectWaterColumn(const TVec3f&, const TVec3f&); + bool selectRecoverFlyMeter(const HitSensor*) const; + void endRush(const RushEndInfo*); void stopSpinTicoEffect(bool); - void stopEffectForce(const char *); + void stopEffectForce(const char*); bool isRequestRush() const; bool isRequestSpinJump2P() const; bool tryReleaseBombTeresa(); @@ -203,132 +202,142 @@ public: bool trySpinPunch(); void shootFireBall(); void doFreezeAttack(); - void setBlink(const char *); + void setBlink(const char*); void resetSensorCount(); - void getStickValue(f32 *, f32 *); + void getStickValue(f32*, f32*); bool checkButtonType(u16, bool) const; - bool sendPunch(HitSensor *, bool); - void reactionPunch(HitSensor *); + bool sendPunch(HitSensor*, bool); + void reactionPunch(HitSensor*); void tryCoinPullInRush(); void damageDropThrowMemoSensor(); void setPlayerMode(u16, bool); - bool isActionOk(const char *) const; + bool isActionOk(const char*) const; bool isInZeroGravitySpot() const; void forceKill(u32); - void sendMsgUpperPunch(HitSensor *); + void sendMsgUpperPunch(HitSensor*); - void entryWallWalkMode(const TVec3f &, const TVec3f &); + void entryWallWalkMode(const TVec3f&, const TVec3f&); - const HitSensor &getCarrySensor() const; + const HitSensor& getCarrySensor() const; - const MarioConst &getConst() const { return *mConst; } + const MarioConst& getConst() const { + return *mConst; + } - inline u32 getHealth() const { return mHealth; } + inline u32 getHealth() const { + return mHealth; + } - inline const Mario::MovementStates &getMovementStates() const { return mMario->mMovementStates; } + inline const Mario::MovementStates& getMovementStates() const { + return mMario->mMovementStates; + } - inline const Mario::DrawStates &getDrawStates() const { return mMario->mDrawStates; } + inline const Mario::DrawStates& getDrawStates() const { + return mMario->mDrawStates; + } - inline const Mario::DrawStates &getPrevDrawStates() const { return mMario->mPrevDrawStates; } + inline const Mario::DrawStates& getPrevDrawStates() const { + return mMario->mPrevDrawStates; + } struct FBO { u32 _0; u32 _4; }; - u8 _8C; - DLchanger *mDLchanger; // 0x90 - u32 _94[0x40]; - u8 *mDL[2]; // 0x194 - u32 mDLSize; // 0x19C - u8 mCurrDL; // 0x1A0 - u8 _1A1; - f32 _1A4; - u16 _1A8; - u16 _1AA; - f32 _1AC; - Color8 _1B0; - u8 _1B4; - bool _1B5; - u32 _1B8; - MarioMessenger *_1BC; - bool _1C0; - bool _1C1; - bool _1C2; - bool _1C3; - u16 _1C4; - u16 _1C6; - f32 _1C8; - f32 _1CC; - u8 _1D0; - u8 _1D1; - f32 _1D4; - FBO *_1D8; - FBO *_1DC; - bool _1E0; - u8 _1E1; - u8 _1E2; + u8 _8C; + DLchanger* mDLchanger; // 0x90 + u32 _94[0x40]; + u8* mDL[2]; // 0x194 + u32 mDLSize; // 0x19C + u8 mCurrDL; // 0x1A0 + u8 _1A1; + f32 _1A4; + u16 _1A8; + u16 _1AA; + f32 _1AC; + Color8 _1B0; + u8 _1B4; + bool _1B5; + u32 _1B8; + MarioMessenger* _1BC; + bool _1C0; + bool _1C1; + bool _1C2; + bool _1C3; + u16 _1C4; + u16 _1C6; + f32 _1C8; + f32 _1CC; + u8 _1D0; + u8 _1D1; + f32 _1D4; + FBO* _1D8; + FBO* _1DC; + bool _1E0; + u8 _1E1; + u8 _1E2; // padding f32 _1E4; u16 _1E8; // padding - f32 _1EC; + f32 _1EC; TVec3f _1F0; TVec3f _1FC; - f32 _208; - u32 _20C; - u8 _210; - u8 _211; + f32 _208; + u32 _20C; + u8 _210; + u8 _211; // padding - CollisionShadow *_214; - u32 _218; - u32 _21C; - u32 _220; - u32 _224; - u32 _228; - u32 _22C; - Mario *mMario; // 0x230 - MarioAnimator *mMarioAnim; // 0x234 - MarioEffect *mMarioEffect; // 0x238 - MarioConst *mConst; // 0x23C - TVec3f _240; - TVec3f _24C; - TVec3f _258; - TVec3f _264; - TVec3f _270; - TVec3f _27C; - TVec3f _288; - TVec3f _294; - TVec3f _2A0; - TVec3f _2AC; - TVec3f _2B8; - TVec3f _2C4; - TVec3f _2D0; - TVec3f _2DC; - TVec3f _2E8; - TVec3f _2F4; - TVec3f _300; - TVec3f _30C; - TVec3f _318; - TVec3f _324; - u16 _330; - u16 _332; - u16 _334; - u16 _336; - u16 _338; + CollisionShadow* _214; + u32 _218; + u32 _21C; + u32 _220; + u32 _224; + u32 _228; + u32 _22C; + Mario* mMario; // 0x230 + MarioAnimator* mMarioAnim; // 0x234 + MarioEffect* mMarioEffect; // 0x238 + MarioConst* mConst; // 0x23C + TVec3f _240; + TVec3f _24C; + TVec3f _258; + TVec3f _264; + TVec3f _270; + TVec3f _27C; + TVec3f _288; + TVec3f _294; + TVec3f _2A0; + TVec3f _2AC; + TVec3f _2B8; + TVec3f _2C4; + TVec3f _2D0; + TVec3f _2DC; + TVec3f _2E8; + TVec3f _2F4; + TVec3f _300; + TVec3f _30C; + TVec3f _318; + TVec3f _324; + u16 _330; + u16 _332; + u16 _334; + u16 _336; + u16 _338; // padding - TVec3f _33C; - TVec3f _348; - TVec3f _354; - TVec3f _360; - GravityInfo *_36C; - u8 _370; + TVec3f _33C; + TVec3f _348; + TVec3f _354; + TVec3f _360; + GravityInfo* _36C; + u8 _370; // padding f32 _374; u16 _378; @@ -341,220 +350,220 @@ public: u32 _390; u32 _394; u32 _398; - u8 _39C; - u8 _39D; - u8 _39E; + u8 _39C; + u8 _39D; + u8 _39E; u32 _3A0; u32 _3A4; u16 _3A8; u16 _3AA; u16 _3AC; // padding - f32 _3B0; + f32 _3B0; TVec3f _3B4; - bool _3C0; - bool _3C1; + bool _3C0; + bool _3C1; // padding TVec3f _3C4; - u16 _3D0; - u16 _3D2; - u16 mPlayerMode; // 0x3D4 - u16 _3D6; - u16 _3D8; - u16 _3DA; - u16 _3DC; - u8 _3DE; - u8 _3DF; - u32 mMaxHealth; // 0x3E0 - bool _3E4; - bool _3E5; - bool _3E6; - bool _3E7; - bool _3E8; + u16 _3D0; + u16 _3D2; + u16 mPlayerMode; // 0x3D4 + u16 _3D6; + u16 _3D8; + u16 _3DA; + u16 _3DC; + u8 _3DE; + u8 _3DF; + u32 mMaxHealth; // 0x3E0 + bool _3E4; + bool _3E5; + bool _3E6; + bool _3E7; + bool _3E8; // padding - TMtx34f _3EC; - u32 _41C; - u32 _420; - u32 _424; - u32 _428[4]; - u8 _438[0x30]; - TVec3f _468; - u32 _474; - f32 _478; - u32 _47C; - u8 _480; - u8 _481; - bool _482; - u8 _483; - TVec3f _484; - f32 _490; - u32 _494; - FixedPosition *_498; - FixedPosition *_49C; - u32 _4A0; - u32 _4A4; - u32 _4A8; - f32 _4AC; - f32 _4B0; - f32 _4B4; - TVec3f _4B8; - TVec3f _4C4; - u32 _4D0[0x80]; + TMtx34f _3EC; + u32 _41C; + u32 _420; + u32 _424; + u32 _428[4]; + u8 _438[0x30]; + TVec3f _468; + u32 _474; + f32 _478; + u32 _47C; + u8 _480; + u8 _481; + bool _482; + u8 _483; + TVec3f _484; + f32 _490; + u32 _494; + FixedPosition* _498; + FixedPosition* _49C; + u32 _4A0; + u32 _4A4; + u32 _4A8; + f32 _4AC; + f32 _4B0; + f32 _4B4; + TVec3f _4B8; + TVec3f _4C4; + u32 _4D0[0x80]; // padding - u8 _6D0; - f32 _6D4; - f32 _6D8; - HitSensor* _6DC[0x40]; - u16 _7DC; - u16 _7DE; - u16 _7E0; - u8 _7E2; - u32 _7E4[0x40]; - u8 _8E4[0x40]; - HitSensor *_924; - u32 _928; - u32 _92C; - u32 _930; - bool _934; - bool _935; - TVec3f _938; - u8 _944; - u8 _945; - u16 _946; - u16 _948; - u16 _94A; - u16 _94C; - u16 _94E; - u8 _950; - u8 _951; - u32 _954[8]; - u8 _974; - TVec3f _978; - f32 _984; - u8 _988; - u8 _989; - TornadoMario *mTornadoMario; // 0x98C - u8 _990; - u32 _994; - u32 _998; - u32 _99C; - u32 _9A0; - MarioParts *_9A4; - f32 _9A8; - f32 _9AC; - f32 _9B0; - u16 _9B4; - u32 _9B8; - u32 _9BC; - u32 _9C0; - u32 _9C4; - u32 _9C8; - f32 _9CC; - f32 _9D0; - u32 _9D4; - TVec3f _9D8; - u32 _9E4; - u32 _9E8; - u32 _9EC; - bool _9F0; - bool mAlphaEnable; // 0x9F1 - u16 _9F2; - TVec3f _9F4; - u32 _A00; - u32 _A04; - u8 _A08; - u8 _A09; - u8 mCurrModel; // 0xA0A - u8 _A0B; - u8 _A0C; - u32 _A10; - u32 _A14; - TVec3f _A18; - u8 _A24; - u8 _A25; + u8 _6D0; + f32 _6D4; + f32 _6D8; + HitSensor* _6DC[0x40]; + u16 _7DC; + u16 _7DE; + u16 _7E0; + u8 _7E2; + u32 _7E4[0x40]; + u8 _8E4[0x40]; + HitSensor* _924; + u32 _928; + u32 _92C; + u32 _930; + bool _934; + bool _935; + TVec3f _938; + u8 _944; + u8 _945; + u16 _946; + u16 _948; + u16 _94A; + u16 _94C; + u16 _94E; + u8 _950; + u8 _951; + u32 _954[8]; + u8 _974; + TVec3f _978; + f32 _984; + u8 _988; + u8 _989; + TornadoMario* mTornadoMario; // 0x98C + u8 _990; + u32 _994; + u32 _998; + u32 _99C; + u32 _9A0; + MarioParts* _9A4; + f32 _9A8; + f32 _9AC; + f32 _9B0; + u16 _9B4; + u32 _9B8; + u32 _9BC; + u32 _9C0; + u32 _9C4; + u32 _9C8; + f32 _9CC; + f32 _9D0; + u32 _9D4; + TVec3f _9D8; + u32 _9E4; + u32 _9E8; + u32 _9EC; + bool _9F0; + bool mAlphaEnable; // 0x9F1 + u16 _9F2; + TVec3f _9F4; + u32 _A00; + u32 _A04; + u8 _A08; + u8 _A09; + u8 mCurrModel; // 0xA0A + u8 _A0B; + u8 _A0C; + u32 _A10; + u32 _A14; + TVec3f _A18; + u8 _A24; + u8 _A25; // padding - J3DModelX *mModels[6]; // 0xA28 - u32 _A40; - u32 _A44; - u32 _A48; - u32 _A4C; - u32 _A50; - u32 _A54; - u8 _A58; - u8 _A59; - u8 _A5A; - u8 _A5B; - ModelHolder *_A5C; - bool _A60; - bool _A61; - bool _A62; + J3DModelX* mModels[6]; // 0xA28 + u32 _A40; + u32 _A44; + u32 _A48; + u32 _A4C; + u32 _A50; + u32 _A54; + u8 _A58; + u8 _A59; + u8 _A5A; + u8 _A5B; + ModelHolder* _A5C; + bool _A60; + bool _A61; + bool _A62; // padding - u32 _A64; - f32 _A68; - u16 _A6C; + u32 _A64; + f32 _A68; + u16 _A6C; bool _A6E; // padding - u32 _A70[8]; - u32 _A90[8]; + u32 _A70[8]; + u32 _A90[8]; TMtx34f _AB0; TMtx34f _AE0; - u16 _B10; - u16 _B12; - u16 _B14; + u16 _B10; + u16 _B12; + u16 _B14; // padding - TVec3f _B18; - f32 _B24; - f32 _B28; - f32 _B2C; - f32 _B30; - f32 _B34; - f32 _B38; - f32 _B3C; - f32 _B40; - u32 _B44; - FootPrint *_B48; - u32 _B4C; - u16 _B50; + TVec3f _B18; + f32 _B24; + f32 _B28; + f32 _B2C; + f32 _B30; + f32 _B34; + f32 _B38; + f32 _B3C; + f32 _B40; + u32 _B44; + FootPrint* _B48; + u32 _B4C; + u16 _B50; // padding u32 _B54[3]; u16 _B60; // padding u32 _B64; - u8 _B68; + u8 _B68; // padding u16 _B6A; u32 _B6C; u16 _B70; - u8 _B72; + u8 _B72; // padding u16 _B74; // padding - u32 _B78; - u32 _B7C; - u32 _B80; - u32 _B84; - u16 _B88; - MarioNullBck *mNullAnimation; // 0xB8C - bool _B90; // animations - bool _B91; - s8 _B92; + u32 _B78; + u32 _B7C; + u32 _B80; + u32 _B84; + u16 _B88; + MarioNullBck* mNullAnimation; // 0xB8C + bool _B90; // animations + bool _B91; + s8 _B92; // padding u16 _B94; - u8 _B96; + u8 _B96; u32 _B98; - u16 _B9C; - u16 _B9E; - u32 _BA0; - u32 _BA4; - u32 _BA8; - TVec3f _BAC; - TVec3f _BB8; - u16 _BC4; + u16 _B9C; + u16 _B9E; + u32 _BA0; + u32 _BA4; + u32 _BA8; + TVec3f _BAC; + TVec3f _BB8; + u16 _BC4; TMtx34f _BC8; TMtx34f _BF8; - void *_C28; + void* _C28; TMtx34f _C2C; TMtx34f _C5C; TMtx34f _C8C; @@ -568,21 +577,21 @@ public: TMtx34f _E0C; TMtx34f _E3C; TMtx34f _E6C; - u16 mBlendMtxTimer; // 0xE9C - f32 _EA0; - bool _EA4; - bool _EA5; - bool _EA6; + u16 mBlendMtxTimer; // 0xE9C + f32 _EA0; + bool _EA4; + bool _EA5; + bool _EA6; TMtx34f _EA8; - TVec3f _ED8; - u32 _EE4; - bool mSuperKinokoCollected; // 0xEE8 - bool mPowerupCollected; // 0xEE9 - bool mTransforming; // 0xEEA - bool _EEB; - bool _EEC; - bool _EED; - bool _EEE; + TVec3f _ED8; + u32 _EE4; + bool mSuperKinokoCollected; // 0xEE8 + bool mPowerupCollected; // 0xEE9 + bool mTransforming; // 0xEEA + bool _EEB; + bool _EEC; + bool _EED; + bool _EEE; // padding u16 _EF0; u16 _EF2; @@ -590,58 +599,58 @@ public: u16 _EF6; u32 _EF8; u32 _EFC; - u8 _F00; + u8 _F00; // padding - u32 _F04; - u32 _F08; + u32 _F04; + u32 _F08; bool _F0C; - u8 _F0D; - u16 _F0E; - u16 _F10; - u16 _F12; - u16 _F14; - u16 _F16; - u16 _F18; - u16 _F1A; - u16 _F1C; - u16 _F1E; - u8 _F20; - u8 _F21; + u8 _F0D; + u16 _F0E; + u16 _F10; + u16 _F12; + u16 _F14; + u16 _F16; + u16 _F18; + u16 _F1A; + u16 _F1C; + u16 _F1E; + u8 _F20; + u8 _F21; // padding u32 _F24; u16 _F28; // padding TVec3f _F2C; - u8 _F38; + u8 _F38; // padding union { - JAIAudible *_F3C; - TVec3f *_F3C_vec; + JAIAudible* _F3C; + TVec3f* _F3C_vec; }; - u16 _F40; - u16 _F42; + u16 _F40; + u16 _F42; bool _F44; // padding - u32 _F48; + u32 _F48; BlackHole* mBlackHole; - TVec3f mBlackHolePosition; - TVec3f mBlackHoleRotateAxis; - TVec3f mPosRelativeToBlackHole; - u8 _F74; + TVec3f mBlackHolePosition; + TVec3f mBlackHoleRotateAxis; + TVec3f mPosRelativeToBlackHole; + u8 _F74; // padding - TVec3f mCamPos; // 0xF78 - TVec3f mCamDirX; // 0xF84 - TVec3f mCamDirY; // 0xF90 - TVec3f mCamDirZ; // 0xF9C - TVec3f _FA8; - const Nerve *_FB4; - u16 _FB8; // a timer - u32 _FBC; - u32 _FC0; - u32 _FC4; - u32 _FC8; - bool _FCC; - bool _FCD; + TVec3f mCamPos; // 0xF78 + TVec3f mCamDirX; // 0xF84 + TVec3f mCamDirY; // 0xF90 + TVec3f mCamDirZ; // 0xF9C + TVec3f _FA8; + const Nerve* _FB4; + u16 _FB8; // a timer + u32 _FBC; + u32 _FC0; + u32 _FC4; + u32 _FC8; + bool _FCC; + bool _FCD; }; namespace NrvMarioActor { @@ -654,4 +663,4 @@ namespace NrvMarioActor { NERVE(MarioActorNrvGameOverSink); NERVE(MarioActorNrvTimeWait); NERVE(MarioActorNrvNoRush); -} // namespace NrvMarioActor +} // namespace NrvMarioActor diff --git a/include/Game/Player/MarioAnimator.hpp b/include/Game/Player/MarioAnimator.hpp index b8cbe0431..ecd9356c6 100644 --- a/include/Game/Player/MarioAnimator.hpp +++ b/include/Game/Player/MarioAnimator.hpp @@ -10,63 +10,64 @@ class XanimePlayer; class MarioAnimator : public MarioModule { public: - MarioAnimator(MarioActor *); + MarioAnimator(MarioActor*); void init(); void update(); void setHoming(); bool isAnimationStop() const; - bool isDefaultAnimationRun(const char *) const; + bool isDefaultAnimationRun(const char*) const; void setSpeed(f32); - void forceSetBlendWeight(const f32 *); + void forceSetBlendWeight(const f32*); void waterToGround(); void initCallbackTable(); - void change(const char *); - void changeDefault(const char *); - void changeUpper(const char *); - void changeDefaultUpper(const char *); - void stopUpper(const char *); + void change(const char*); + void changeDefault(const char*); + void changeUpper(const char*); + void changeDefaultUpper(const char*); + void stopUpper(const char*); void setUpperRotateY(f32); - void entryCallback(const char *); - f32 getFrame() const; + void entryCallback(const char*); + f32 getFrame() const; - inline void f1(const char *name) - { + inline void f1(const char* name) { getPlayer()->startBas(nullptr, false, 0.0f, 0.0f); mXanimePlayer->setDefaultAnimation(name); } - inline bool isTeresaClear() const { return !isPlayerModeTeresa(); } + inline bool isTeresaClear() const { + return !isPlayerModeTeresa(); + } - XanimeResourceTable *mResourceTable; // 0x8 - XanimePlayer *mXanimePlayer; // 0xC - XanimePlayer *mXanimePlayerUpper; // 0x10 - u8 _14; - u8 _15; - u8 _16; - f32 _18; - f32 _1C; - f32 _20; - f32 _24; - TMtx34f _28; - f32 _58; - f32 _5C; - TVec3f _60; - bool _6C; - f32 _70; - u32 _74; - u16 _78; - TMtx34f _7C; - TMtx34f _AC; - TMtx34f _DC; - u8 _10C; - u8 _10D; - bool mUpperDefaultSet; // 0x10E - f32 _110; - const char *mCurrBck; // 0x114 - f32 _118; + XanimeResourceTable* mResourceTable; // 0x8 + XanimePlayer* mXanimePlayer; // 0xC + XanimePlayer* mXanimePlayerUpper; // 0x10 + u8 _14; + u8 _15; + u8 _16; + f32 _18; + f32 _1C; + f32 _20; + f32 _24; + TMtx34f _28; + f32 _58; + f32 _5C; + TVec3f _60; + bool _6C; + f32 _70; + u32 _74; + u16 _78; + TMtx34f _7C; + TMtx34f _AC; + TMtx34f _DC; + u8 _10C; + u8 _10D; + bool mUpperDefaultSet; // 0x10E + f32 _110; + const char* mCurrBck; // 0x114 + f32 _118; u8 _11C[8]; }; diff --git a/include/Game/Player/MarioAnimatorData.hpp b/include/Game/Player/MarioAnimatorData.hpp index 35803f212..ccfc4061c 100644 --- a/include/Game/Player/MarioAnimatorData.hpp +++ b/include/Game/Player/MarioAnimatorData.hpp @@ -4,80 +4,80 @@ XanimeQuadBckTable quadAnimeTable[7] = { { - {"基本"}, //mParent - "WalkSoft", //fileName1 + {"基本"}, //mParent + "WalkSoft", //fileName1 0.00000000000f, // 0x8 - "Walk", //fileName2 + "Walk", //fileName2 0.00000000000f, // 0x10 - "Run", //fileName3 + "Run", //fileName3 0.00000000000f, // 0x18 - "Wait", //fileName4 + "Wait", //fileName4 1.00000000000f, // 0x20 }, { - {"水泳基本"}, //mParent - "SwimWait", //fileName1 - 1.00000000000f, // 0x8 + {"水泳基本"}, //mParent + "SwimWait", //fileName1 + 1.00000000000f, // 0x8 "SwimFlutterSurface", //fileName2 - 0.00000000000f, // 0x10 - "SwimFlutter", //fileName3 - 0.00000000000f, // 0x18 - "SwimDrift", //fileName4 - 0.00000000000f, // 0x20 + 0.00000000000f, // 0x10 + "SwimFlutter", //fileName3 + 0.00000000000f, // 0x18 + "SwimDrift", //fileName4 + 0.00000000000f, // 0x20 }, { {"テニス基本"}, //mParent - "WalkSoft", //fileName1 + "WalkSoft", //fileName1 0.00000000000f, // 0x8 - "Walk", //fileName2 + "Walk", //fileName2 0.00000000000f, // 0x10 - "TennisRun", //fileName3 + "TennisRun", //fileName3 0.00000000000f, // 0x18 - "TennisWait", //fileName4 + "TennisWait", //fileName4 1.00000000000f, // 0x20 }, { - {"スライダー尻"}, //mParent - "SlideHipForWard", //fileName1 - 0.300000011921f, // 0x8 + {"スライダー尻"}, //mParent + "SlideHipForWard", //fileName1 + 0.300000011921f, // 0x8 "SlideHipBackward", //fileName2 - 0.200000002980f, // 0x10 - "SlideHipLeft", //fileName3 - 0.250000000000f, // 0x18 - "SlideHipRight", //fileName4 - 0.250000000000f, // 0x20 + 0.200000002980f, // 0x10 + "SlideHipLeft", //fileName3 + 0.250000000000f, // 0x18 + "SlideHipRight", //fileName4 + 0.250000000000f, // 0x20 }, { {"坂すべり下向きあおむけ"}, //mParent - "SlideHipForWard", //fileName1 - 0.300000011921f, // 0x8 - "SlideHipBackward", //fileName2 - 0.200000002980f, // 0x10 - "SlideHipLeft", //fileName3 - 0.250000000000f, // 0x18 - "SlideHipRight", //fileName4 - 0.250000000000f, // 0x20 + "SlideHipForWard", //fileName1 + 0.300000011921f, // 0x8 + "SlideHipBackward", //fileName2 + 0.200000002980f, // 0x10 + "SlideHipLeft", //fileName3 + 0.250000000000f, // 0x18 + "SlideHipRight", //fileName4 + 0.250000000000f, // 0x20 }, { {"タマコロ移動"}, //mParent - "BallIdle", //fileName1 - 1.00000000000f, // 0x8 - "BallWalkSoft", //fileName2 - 0.00000000000f, // 0x10 - "BallWalk", //fileName3 - 0.00000000000f, // 0x18 - "BallRun", //fileName4 - 0.00000000000f, // 0x20 + "BallIdle", //fileName1 + 1.00000000000f, // 0x8 + "BallWalkSoft", //fileName2 + 0.00000000000f, // 0x10 + "BallWalk", //fileName3 + 0.00000000000f, // 0x18 + "BallRun", //fileName4 + 0.00000000000f, // 0x20 }, { - {""}, //mParent - "", //fileName1 + {""}, //mParent + "", //fileName1 0.00000000000f, // 0x8 - nullptr, //fileName2 + nullptr, //fileName2 0.00000000000f, // 0x10 - nullptr, //fileName3 + nullptr, //fileName3 0.00000000000f, // 0x18 - nullptr, //fileName4 + nullptr, //fileName4 0.00000000000f, // 0x20 }, }; @@ -85,74 +85,74 @@ XanimeQuadBckTable quadAnimeTable[7] = { XanimeTripleBckTable tripleAnimeTable[8] = { { {"坂左右ウエイト"}, //mParent - "Wait", //fileName1 - 1.00000000000f, // 0x8 - "WaitSlopeL", //fileName2 - 0.00000000000f, // 0x10 - "WaitSlopeR", //fileName3 - 0.00000000000f, // 0x18 + "Wait", //fileName1 + 1.00000000000f, // 0x8 + "WaitSlopeL", //fileName2 + 0.00000000000f, // 0x10 + "WaitSlopeR", //fileName3 + 0.00000000000f, // 0x18 }, { {"坂前後ウエイト"}, //mParent - "Wait", //fileName1 - 1.00000000000f, // 0x8 - "WaitSlopeD", //fileName2 - 0.00000000000f, // 0x10 - "WaitSlopeU", //fileName3 - 0.00000000000f, // 0x18 + "Wait", //fileName1 + 1.00000000000f, // 0x8 + "WaitSlopeD", //fileName2 + 0.00000000000f, // 0x10 + "WaitSlopeU", //fileName3 + 0.00000000000f, // 0x18 }, { - {"サーフィン"}, //mParent - "SurfRideLoop", //fileName1 - 1.00000000000f, // 0x8 + {"サーフィン"}, //mParent + "SurfRideLoop", //fileName1 + 1.00000000000f, // 0x8 "SurfRideLoopL", //fileName2 - 0.00000000000f, // 0x10 + 0.00000000000f, // 0x10 "SurfRideLoopR", //fileName3 - 0.00000000000f, // 0x18 + 0.00000000000f, // 0x18 }, { {"サーフィン（加速）"}, //mParent - "SurfRideDashLoop", //fileName1 - 1.00000000000f, // 0x8 - "SurfRideDashLoopL", //fileName2 - 0.00000000000f, // 0x10 - "SurfRideDashLoopR", //fileName3 - 0.00000000000f, // 0x18 + "SurfRideDashLoop", //fileName1 + 1.00000000000f, // 0x8 + "SurfRideDashLoopL", //fileName2 + 0.00000000000f, // 0x10 + "SurfRideDashLoopR", //fileName3 + 0.00000000000f, // 0x18 }, { {"サーフィン傾き開始"}, //mParent - "SurfRide", //fileName1 - 1.00000000000f, // 0x8 - "SurfRideL", //fileName2 - 0.00000000000f, // 0x10 - "SurfRideR", //fileName3 - 0.00000000000f, // 0x18 + "SurfRide", //fileName1 + 1.00000000000f, // 0x8 + "SurfRideL", //fileName2 + 0.00000000000f, // 0x10 + "SurfRideR", //fileName3 + 0.00000000000f, // 0x18 }, { {"サーフィン傾き開始（加速）"}, //mParent - "SurfRideDash", //fileName1 - 1.00000000000f, // 0x8 - "SurfRideDashL", //fileName2 - 0.00000000000f, // 0x10 - "SurfRideDashR", //fileName3 - 0.00000000000f, // 0x18 + "SurfRideDash", //fileName1 + 1.00000000000f, // 0x8 + "SurfRideDashL", //fileName2 + 0.00000000000f, // 0x10 + "SurfRideDashR", //fileName3 + 0.00000000000f, // 0x18 }, { {"サーフィン落下"}, //mParent - "SurfFall", //fileName1 - 1.00000000000f, // 0x8 - "SurfFallL", //fileName2 - 0.00000000000f, // 0x10 - "SurfFallR", //fileName3 - 0.00000000000f, // 0x18 + "SurfFall", //fileName1 + 1.00000000000f, // 0x8 + "SurfFallL", //fileName2 + 0.00000000000f, // 0x10 + "SurfFallR", //fileName3 + 0.00000000000f, // 0x18 }, { - {""}, //mParent - "", //fileName1 + {""}, //mParent + "", //fileName1 0.00000000000f, // 0x8 - nullptr, //fileName2 + nullptr, //fileName2 0.00000000000f, // 0x10 - nullptr, //fileName3 + nullptr, //fileName3 0.00000000000f, // 0x18 }, }; @@ -160,30 +160,30 @@ XanimeTripleBckTable tripleAnimeTable[8] = { XanimeDoubleBckTable doubleAnimeTable[4] = { { {"しゃがみ基本"}, //mParent - "SquatWait", //fileName1 - 1.00000000000f, // 0x8 - "SquatWalk", //fileName2 - 0.00000000000f, // 0x10 + "SquatWait", //fileName1 + 1.00000000000f, // 0x8 + "SquatWalk", //fileName2 + 0.00000000000f, // 0x10 }, { {"その場足踏み"}, //mParent - "Run", //fileName1 - 0.750000000000f, // 0x8 - "Wait", //fileName2 - 0.250000000000f, // 0x10 + "Run", //fileName1 + 0.750000000000f, // 0x8 + "Wait", //fileName2 + 0.250000000000f, // 0x10 }, { {"タマコロしゃがみ"}, //mParent - "BallSquat", //fileName1 - 1.00000000000f, // 0x8 - "BallWalk", //fileName2 - 0.00000000000f, // 0x10 + "BallSquat", //fileName1 + 1.00000000000f, // 0x8 + "BallWalk", //fileName2 + 0.00000000000f, // 0x10 }, { - {""}, //mParent - "", //fileName1 + {""}, //mParent + "", //fileName1 0.00000000000f, // 0x8 - nullptr, //fileName2 + nullptr, //fileName2 0.00000000000f, // 0x10 }, }; @@ -191,1769 +191,1769 @@ XanimeDoubleBckTable doubleAnimeTable[4] = { XanimeSingleBckTable singleAnimeTable[0x124] = { { {"ジャンプ"}, //mParent - "Jump", //fileName - 0, // animationHash - 0, // fileHash + "Jump", //fileName + 0, // animationHash + 0, // fileHash }, { {"ジャンプB"}, //mParent - "Jump2", //fileName - 0, // animationHash - 0, // fileHash + "Jump2", //fileName + 0, // animationHash + 0, // fileHash }, { {"ジャンプC"}, //mParent - "JumpRoll", //fileName - 0, // animationHash - 0, // fileHash + "JumpRoll", //fileName + 0, // animationHash + 0, // fileHash }, { {"ターンジャンプ"}, //mParent - "JumpTurn", //fileName - 0, // animationHash - 0, // fileHash + "JumpTurn", //fileName + 0, // animationHash + 0, // fileHash }, { {"空中一回転"}, //mParent - "AirControl", //fileName - 0, // animationHash - 0, // fileHash + "AirControl", //fileName + 0, // animationHash + 0, // fileHash }, { {"フリージャンプ"}, //mParent - "Rise", //fileName - 0, // animationHash - 0, // fileHash + "Rise", //fileName + 0, // animationHash + 0, // fileHash }, { {"ヘリコプタージャンプ"}, //mParent - "FlickAir", //fileName - 0, // animationHash - 0, // fileHash + "FlickAir", //fileName + 0, // animationHash + 0, // fileHash }, { {"ダッシュジャンプ"}, //mParent - "Rolling", //fileName - 0, // animationHash - 0, // fileHash + "Rolling", //fileName + 0, // animationHash + 0, // fileHash }, { {"飛びすさりジャンプ"}, //mParent - "Bounce", //fileName - 0, // animationHash - 0, // fileHash + "Bounce", //fileName + 0, // animationHash + 0, // fileHash }, { {"ショートジャンプ"}, //mParent - "GravityChange", //fileName - 0, // animationHash - 0, // fileHash + "GravityChange", //fileName + 0, // animationHash + 0, // fileHash }, { {"スカイラブジャンプ"}, //mParent - "JumpTwin", //fileName - 0, // animationHash - 0, // fileHash + "JumpTwin", //fileName + 0, // animationHash + 0, // fileHash }, { {"スケキヨ"}, //mParent - "Bury", //fileName - 0, // animationHash - 0, // fileHash + "Bury", //fileName + 0, // animationHash + 0, // fileHash }, { {"スケキヨ脱出"}, //mParent - "Bury", //fileName - 0, // animationHash - 0, // fileHash + "Bury", //fileName + 0, // animationHash + 0, // fileHash }, { - {"埋まり"}, //mParent + {"埋まり"}, //mParent "BuryStandWait", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"埋まり脱出"}, //mParent "BuryStandEnd", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"逆着地"}, //mParent + {"逆着地"}, //mParent "CannonFlyLand", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"ホッパージャンプA"}, //mParent - "HopperWaitA", //fileName - 0, // animationHash - 0, // fileHash + "HopperWaitA", //fileName + 0, // animationHash + 0, // fileHash }, { {"ホッパージャンプB"}, //mParent - "HopperWaitB", //fileName - 0, // animationHash - 0, // fileHash + "HopperWaitB", //fileName + 0, // animationHash + 0, // fileHash }, { {"ホッパーふみジャンプA"}, //mParent - "HopperWaitA", //fileName - 0, // animationHash - 0, // fileHash + "HopperWaitA", //fileName + 0, // animationHash + 0, // fileHash }, { {"ホッパーふみジャンプB"}, //mParent - "HopperWaitB", //fileName - 0, // animationHash - 0, // fileHash + "HopperWaitB", //fileName + 0, // animationHash + 0, // fileHash }, { {"ホッパー移動A"}, //mParent - "HopperRunA", //fileName - 0, // animationHash - 0, // fileHash + "HopperRunA", //fileName + 0, // animationHash + 0, // fileHash }, { {"ホッパー移動B"}, //mParent - "HopperRunB", //fileName - 0, // animationHash - 0, // fileHash + "HopperRunB", //fileName + 0, // animationHash + 0, // fileHash }, { {"ホッパーハイジャンプA"}, //mParent - "HopperJumpA", //fileName - 0, // animationHash - 0, // fileHash + "HopperJumpA", //fileName + 0, // animationHash + 0, // fileHash }, { {"ホッパーハイジャンプB"}, //mParent - "HopperJumpB", //fileName - 0, // animationHash - 0, // fileHash + "HopperJumpB", //fileName + 0, // animationHash + 0, // fileHash }, { {"ホッパー壁ジャンプ"}, //mParent - "HopperWallJump", //fileName - 0, // animationHash - 0, // fileHash + "HopperWallJump", //fileName + 0, // animationHash + 0, // fileHash }, { {"ホッパーヒップドロップ開始"}, //mParent - "HopperMarioHipDropStart", //fileName - 0, // animationHash - 0, // fileHash + "HopperMarioHipDropStart", //fileName + 0, // animationHash + 0, // fileHash }, { {"ホッパーヒップドロップ"}, //mParent - "HopperMarioHipDrop", //fileName - 0, // animationHash - 0, // fileHash + "HopperMarioHipDrop", //fileName + 0, // animationHash + 0, // fileHash }, { {"ジャンプふみ1"}, //mParent - "Jump", //fileName - 0, // animationHash - 0, // fileHash + "Jump", //fileName + 0, // animationHash + 0, // fileHash }, { {"ジャンプふみ2"}, //mParent - "JumpPress2nd", //fileName - 0, // animationHash - 0, // fileHash + "JumpPress2nd", //fileName + 0, // animationHash + 0, // fileHash }, { {"ジャンプふみ3"}, //mParent - "JumpPress3rd", //fileName - 0, // animationHash - 0, // fileHash + "JumpPress3rd", //fileName + 0, // animationHash + 0, // fileHash }, { {"引き戻し"}, //mParent - "PullBack", //fileName - 0, // animationHash - 0, // fileHash + "PullBack", //fileName + 0, // animationHash + 0, // fileHash }, { {"引き戻し着地"}, //mParent - "PullBackLand", //fileName - 0, // animationHash - 0, // fileHash + "PullBackLand", //fileName + 0, // animationHash + 0, // fileHash }, { {"ポッドワープ開始"}, //mParent - "WarpPodStart", //fileName - 0, // animationHash - 0, // fileHash + "WarpPodStart", //fileName + 0, // animationHash + 0, // fileHash }, { {"ポッドワープ終了"}, //mParent - "WarpPodEnd", //fileName - 0, // animationHash - 0, // fileHash + "WarpPodEnd", //fileName + 0, // animationHash + 0, // fileHash }, { - {"幅とび"}, //mParent + {"幅とび"}, //mParent "JumpBroad", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"着地"}, //mParent - "Land", //fileName - 0, // animationHash - 0, // fileHash + "Land", //fileName + 0, // animationHash + 0, // fileHash }, { - {"着地B"}, //mParent + {"着地B"}, //mParent "Jump2Land", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"着地C"}, //mParent + {"着地C"}, //mParent "JumpRollLand", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"着地ターン"}, //mParent "JumpTurnLand", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"着地幅とび"}, //mParent + {"着地幅とび"}, //mParent "JumpBroadLand", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"ハード着地"}, //mParent - "LandStiffen", //fileName - 0, // animationHash - 0, // fileHash + "LandStiffen", //fileName + 0, // animationHash + 0, // fileHash }, { {"すべり着地"}, //mParent - "LandSlope", //fileName - 0, // animationHash - 0, // fileHash + "LandSlope", //fileName + 0, // animationHash + 0, // fileHash }, { {"ショート着地"}, //mParent - "Land", //fileName - 0, // animationHash - 0, // fileHash + "Land", //fileName + 0, // animationHash + 0, // fileHash }, { {"ヒップドロップ開始"}, //mParent - "HipDropStart", //fileName - 0, // animationHash - 0, // fileHash + "HipDropStart", //fileName + 0, // animationHash + 0, // fileHash }, { {"ヒップドロップ"}, //mParent - "HipDrop", //fileName - 0, // animationHash - 0, // fileHash + "HipDrop", //fileName + 0, // animationHash + 0, // fileHash }, { {"ヒップドロップ着地"}, //mParent - "HipDropLand", //fileName - 0, // animationHash - 0, // fileHash + "HipDropLand", //fileName + 0, // animationHash + 0, // fileHash }, { {"ヒップドロップ滑り"}, //mParent - "LandRotation", //fileName - 0, // animationHash - 0, // fileHash + "LandRotation", //fileName + 0, // animationHash + 0, // fileHash }, { {"ジャンプ順滑り"}, //mParent - "LandRotation", //fileName - 0, // animationHash - 0, // fileHash + "LandRotation", //fileName + 0, // animationHash + 0, // fileHash }, { {"ジャンプ逆滑り"}, //mParent - "Fall", //fileName - 0, // animationHash - 0, // fileHash + "Fall", //fileName + 0, // animationHash + 0, // fileHash }, { {"スピンヒップドロップ開始"}, //mParent - "HipDropHomingStart", //fileName - 0, // animationHash - 0, // fileHash + "HipDropHomingStart", //fileName + 0, // animationHash + 0, // fileHash }, { {"スピンヒップドロップ"}, //mParent - "HipDropHoming", //fileName - 0, // animationHash - 0, // fileHash + "HipDropHoming", //fileName + 0, // animationHash + 0, // fileHash }, { {"スピンヒップドロップ着地"}, //mParent - "HipDropHomingLand", //fileName - 0, // animationHash - 0, // fileHash + "HipDropHomingLand", //fileName + 0, // animationHash + 0, // fileHash }, { {"スリップアップ"}, //mParent - "SlipUp", //fileName - 0, // animationHash - 0, // fileHash + "SlipUp", //fileName + 0, // animationHash + 0, // fileHash }, { {"つかまりスリップアップ準備"}, //mParent - "HangSlipUpStart", //fileName - 0, // animationHash - 0, // fileHash + "HangSlipUpStart", //fileName + 0, // animationHash + 0, // fileHash }, { {"つかまりスリップアップ"}, //mParent - "HangSlipUp", //fileName - 0, // animationHash - 0, // fileHash + "HangSlipUp", //fileName + 0, // animationHash + 0, // fileHash }, { {"ハチ飛行中"}, //mParent - "BeeFly", //fileName - 0, // animationHash - 0, // fileHash + "BeeFly", //fileName + 0, // animationHash + 0, // fileHash }, { {"ハチ飛行中無入力"}, //mParent - "BeeFlyWait", //fileName - 0, // animationHash - 0, // fileHash + "BeeFlyWait", //fileName + 0, // animationHash + 0, // fileHash }, { {"ハチ壁くっつき"}, //mParent - "BeeLand", //fileName - 0, // animationHash - 0, // fileHash + "BeeLand", //fileName + 0, // animationHash + 0, // fileHash }, { {"ハチ壁くっつき中"}, //mParent - "BeeWait", //fileName - 0, // animationHash - 0, // fileHash + "BeeWait", //fileName + 0, // animationHash + 0, // fileHash }, { - {"ハチ花移動"}, //mParent + {"ハチ花移動"}, //mParent "BeeCreepWallWalk", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"ハチジャンプ"}, //mParent - "BeeJump", //fileName - 0, // animationHash - 0, // fileHash + "BeeJump", //fileName + 0, // animationHash + 0, // fileHash }, { {"ハチ壁ジャンプ"}, //mParent - "BeeWallJump", //fileName - 0, // animationHash - 0, // fileHash + "BeeWallJump", //fileName + 0, // animationHash + 0, // fileHash }, { {"ハチ匍匐ウエイト"}, //mParent - "BeeCreepWait", //fileName - 0, // animationHash - 0, // fileHash + "BeeCreepWait", //fileName + 0, // animationHash + 0, // fileHash }, { {"ハチ匍匐前進"}, //mParent - "BeeCreepWalk", //fileName - 0, // animationHash - 0, // fileHash + "BeeCreepWalk", //fileName + 0, // animationHash + 0, // fileHash }, { {"ハチ匍匐着地"}, //mParent - "BeeCreepLand", //fileName - 0, // animationHash - 0, // fileHash + "BeeCreepLand", //fileName + 0, // animationHash + 0, // fileHash }, { {"ハチヒップドロップ開始"}, //mParent - "BeeHipDropStart", //fileName - 0, // animationHash - 0, // fileHash + "BeeHipDropStart", //fileName + 0, // animationHash + 0, // fileHash }, { {"ハチヒップドロップ"}, //mParent - "BeeHipDrop", //fileName - 0, // animationHash - 0, // fileHash + "BeeHipDrop", //fileName + 0, // animationHash + 0, // fileHash }, { {"ハチヒップドロップ着地"}, //mParent - "BeeHipDropLand", //fileName - 0, // animationHash - 0, // fileHash + "BeeHipDropLand", //fileName + 0, // animationHash + 0, // fileHash }, { {"ハチヒップドロップ壁着地"}, //mParent - "BeeHipDropLand", //fileName - 0, // animationHash - 0, // fileHash + "BeeHipDropLand", //fileName + 0, // animationHash + 0, // fileHash }, { {"泥低速歩行"}, //mParent - "WalkSoft", //fileName - 0, // animationHash - 0, // fileHash + "WalkSoft", //fileName + 0, // animationHash + 0, // fileHash }, { {"泥高速歩行"}, //mParent - "WalkBury", //fileName - 0, // animationHash - 0, // fileHash + "WalkBury", //fileName + 0, // animationHash + 0, // fileHash }, { {"落下"}, //mParent - "Fall", //fileName - 0, // animationHash - 0, // fileHash + "Fall", //fileName + 0, // animationHash + 0, // fileHash }, { {"フーファイター飛行開始"}, //mParent - "FooStart", //fileName - 0, // animationHash - 0, // fileHash + "FooStart", //fileName + 0, // animationHash + 0, // fileHash }, { {"フーファイター飛行"}, //mParent - "FooFly", //fileName - 0, // animationHash - 0, // fileHash + "FooFly", //fileName + 0, // animationHash + 0, // fileHash }, { {"フーファイター飛行再開"}, //mParent - "FooFlyStart", //fileName - 0, // animationHash - 0, // fileHash + "FooFlyStart", //fileName + 0, // animationHash + 0, // fileHash }, { {"フーファイター静止"}, //mParent - "FooWait", //fileName - 0, // animationHash - 0, // fileHash + "FooWait", //fileName + 0, // animationHash + 0, // fileHash }, { {"フーファイター解除"}, //mParent - "FooEnd", //fileName - 0, // animationHash - 0, // fileHash + "FooEnd", //fileName + 0, // animationHash + 0, // fileHash }, { {"フーファイター着地"}, //mParent - "LandSlope", //fileName - 0, // animationHash - 0, // fileHash + "LandSlope", //fileName + 0, // animationHash + 0, // fileHash }, { {"フーファイタースピン"}, //mParent - "FooSpin", //fileName - 0, // animationHash - 0, // fileHash + "FooSpin", //fileName + 0, // animationHash + 0, // fileHash }, { {"壁ジャンプ"}, //mParent - "WallJump", //fileName - 0, // animationHash - 0, // fileHash + "WallJump", //fileName + 0, // animationHash + 0, // fileHash }, { {"壁すべり"}, //mParent - "WallSlide", //fileName - 0, // animationHash - 0, // fileHash + "WallSlide", //fileName + 0, // animationHash + 0, // fileHash }, { {"壁くっつき"}, //mParent - "WallKeep", //fileName - 0, // animationHash - 0, // fileHash + "WallKeep", //fileName + 0, // animationHash + 0, // fileHash }, { {"壁押し"}, //mParent - "Push", //fileName - 0, // animationHash - 0, // fileHash + "Push", //fileName + 0, // animationHash + 0, // fileHash }, { {"壁左歩き"}, //mParent - "WallWalkL", //fileName - 0, // animationHash - 0, // fileHash + "WallWalkL", //fileName + 0, // animationHash + 0, // fileHash }, { {"壁右歩き"}, //mParent - "WallWalkR", //fileName - 0, // animationHash - 0, // fileHash + "WallWalkR", //fileName + 0, // animationHash + 0, // fileHash }, { {"壁ウエイト"}, //mParent - "WallWait", //fileName - 0, // animationHash - 0, // fileHash + "WallWait", //fileName + 0, // animationHash + 0, // fileHash }, { {"前壁ウエイト"}, //mParent - "Push", //fileName - 0, // animationHash - 0, // fileHash + "Push", //fileName + 0, // animationHash + 0, // fileHash }, { {"壁ヒット"}, //mParent - "WallHit", //fileName - 0, // animationHash - 0, // fileHash + "WallHit", //fileName + 0, // animationHash + 0, // fileHash }, { {"壁ヒット着地"}, //mParent - "WallHitLand", //fileName - 0, // animationHash - 0, // fileHash + "WallHitLand", //fileName + 0, // animationHash + 0, // fileHash }, { {"壁はじき"}, //mParent - "WallHit", //fileName - 0, // animationHash - 0, // fileHash + "WallHit", //fileName + 0, // animationHash + 0, // fileHash }, { {"崖ふんばり"}, //mParent - "Stagger", //fileName - 0, // animationHash - 0, // fileHash + "Stagger", //fileName + 0, // animationHash + 0, // fileHash }, { {"カリカリ限界"}, //mParent - "WaitHold", //fileName - 0, // animationHash - 0, // fileHash + "WaitHold", //fileName + 0, // animationHash + 0, // fileHash }, { {"坂左ウエイト"}, //mParent - "WaitSlopeL", //fileName - 0, // animationHash - 0, // fileHash + "WaitSlopeL", //fileName + 0, // animationHash + 0, // fileHash }, { {"坂右ウエイト"}, //mParent - "WaitSlopeR", //fileName - 0, // animationHash - 0, // fileHash + "WaitSlopeR", //fileName + 0, // animationHash + 0, // fileHash }, { {"坂前ウエイト"}, //mParent - "WaitSlopeD", //fileName - 0, // animationHash - 0, // fileHash + "WaitSlopeD", //fileName + 0, // animationHash + 0, // fileHash }, { {"坂後ウエイト"}, //mParent - "WaitSlopeU", //fileName - 0, // animationHash - 0, // fileHash + "WaitSlopeU", //fileName + 0, // animationHash + 0, // fileHash }, { {"ラン"}, //mParent - "Run", //fileName - 0, // animationHash - 0, // fileHash + "Run", //fileName + 0, // animationHash + 0, // fileHash }, { {"歩行"}, //mParent - "Walk", //fileName - 0, // animationHash - 0, // fileHash + "Walk", //fileName + 0, // animationHash + 0, // fileHash }, { - {"鈍行"}, //mParent + {"鈍行"}, //mParent "WalkSoft", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"メタルダッシュ"}, //mParent - "RunDash", //fileName - 0, // animationHash - 0, // fileHash + "RunDash", //fileName + 0, // animationHash + 0, // fileHash }, { {"埋まり歩行"}, //mParent - "WalkBury", //fileName - 0, // animationHash - 0, // fileHash + "WalkBury", //fileName + 0, // animationHash + 0, // fileHash }, { {"埋まりジャンプA"}, //mParent - "WalkBuryJumpLow", //fileName - 0, // animationHash - 0, // fileHash + "WalkBuryJumpLow", //fileName + 0, // animationHash + 0, // fileHash }, { {"埋まりジャンプB"}, //mParent - "WalkBuryJumpLow2", //fileName - 0, // animationHash - 0, // fileHash + "WalkBuryJumpLow2", //fileName + 0, // animationHash + 0, // fileHash }, { {"埋まり脱出ジャンプ"}, //mParent - "WalkBuryJumpHi", //fileName - 0, // animationHash - 0, // fileHash + "WalkBuryJumpHi", //fileName + 0, // animationHash + 0, // fileHash }, { {"つぶれ"}, //mParent - "Press", //fileName - 0, // animationHash - 0, // fileHash + "Press", //fileName + 0, // animationHash + 0, // fileHash }, { {"つぶれ復帰"}, //mParent "PressRecover", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"つぶれ解除"}, //mParent - "Jump", //fileName - 0, // animationHash - 0, // fileHash + "Jump", //fileName + 0, // animationHash + 0, // fileHash }, { {"ブレーキ"}, //mParent - "Brake", //fileName - 0, // animationHash - 0, // fileHash + "Brake", //fileName + 0, // animationHash + 0, // fileHash }, { {"ブレーキ滑り床"}, //mParent - "Run", //fileName - 0, // animationHash - 0, // fileHash + "Run", //fileName + 0, // animationHash + 0, // fileHash }, { {"ターンブレーキ"}, //mParent - "Turn", //fileName - 0, // animationHash - 0, // fileHash + "Turn", //fileName + 0, // animationHash + 0, // fileHash }, { {"ターンブレーキ滑り床"}, //mParent - "Run", //fileName - 0, // animationHash - 0, // fileHash + "Run", //fileName + 0, // animationHash + 0, // fileHash }, { {"歩行制動ブレーキ"}, //mParent - "RunEnd", //fileName - 0, // animationHash - 0, // fileHash + "RunEnd", //fileName + 0, // animationHash + 0, // fileHash }, { {"氷上慣性走行"}, //mParent - "Brake", //fileName - 0, // animationHash - 0, // fileHash + "Brake", //fileName + 0, // animationHash + 0, // fileHash }, { {"氷上力行左"}, //mParent - "SkateL", //fileName - 0, // animationHash - 0, // fileHash + "SkateL", //fileName + 0, // animationHash + 0, // fileHash }, { {"氷上力行右"}, //mParent - "SkateR", //fileName - 0, // animationHash - 0, // fileHash + "SkateR", //fileName + 0, // animationHash + 0, // fileHash }, { {"氷上切替左"}, //mParent "SkateSwitchL", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"氷上切替右"}, //mParent "SkateSwitchR", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"氷上後行左"}, //mParent - "SkateBackL", //fileName - 0, // animationHash - 0, // fileHash + "SkateBackL", //fileName + 0, // animationHash + 0, // fileHash }, { {"氷上後行右"}, //mParent - "SkateBackR", //fileName - 0, // animationHash - 0, // fileHash + "SkateBackR", //fileName + 0, // animationHash + 0, // fileHash }, { {"氷上ターン"}, //mParent - "SkateTurn", //fileName - 0, // animationHash - 0, // fileHash + "SkateTurn", //fileName + 0, // animationHash + 0, // fileHash }, { {"しゃがみ"}, //mParent - "SquatWait", //fileName - 0, // animationHash - 0, // fileHash + "SquatWait", //fileName + 0, // animationHash + 0, // fileHash }, { {"しゃがみ開始"}, //mParent - "SquatStart", //fileName - 0, // animationHash - 0, // fileHash + "SquatStart", //fileName + 0, // animationHash + 0, // fileHash }, { {"しゃがみ終了"}, //mParent - "SquatEnd", //fileName - 0, // animationHash - 0, // fileHash + "SquatEnd", //fileName + 0, // animationHash + 0, // fileHash }, { {"坂すべり上向きうつぶせ"}, //mParent - "SlideStmach", //fileName - 0, // animationHash - 0, // fileHash + "SlideStmach", //fileName + 0, // animationHash + 0, // fileHash }, { {"坂すべり上向き終了"}, //mParent - "SlideStmachEnd", //fileName - 0, // animationHash - 0, // fileHash + "SlideStmachEnd", //fileName + 0, // animationHash + 0, // fileHash }, { {"坂すべり下向き終了"}, //mParent - "SlideHipEnd", //fileName - 0, // animationHash - 0, // fileHash + "SlideHipEnd", //fileName + 0, // animationHash + 0, // fileHash }, { {"特殊ウエイト1A"}, //mParent - "Sleep", //fileName - 0, // animationHash - 0, // fileHash + "Sleep", //fileName + 0, // animationHash + 0, // fileHash }, { {"特殊ウエイト1B"}, //mParent - "SleepLie", //fileName - 0, // animationHash - 0, // fileHash + "SleepLie", //fileName + 0, // animationHash + 0, // fileHash }, { {"戦闘ウエイト"}, //mParent - "BattleWait", //fileName - 0, // animationHash - 0, // fileHash + "BattleWait", //fileName + 0, // animationHash + 0, // fileHash }, { {"空転"}, //mParent - "Run", //fileName - 0, // animationHash - 0, // fileHash + "Run", //fileName + 0, // animationHash + 0, // fileHash }, { - {"ひろい"}, //mParent + {"ひろい"}, //mParent "CarryStart", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"ひろい空中"}, //mParent + {"ひろい空中"}, //mParent "CarryAirStart", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"ひろいクイック"}, //mParent - "CarryStartShort", //fileName - 0, // animationHash - 0, // fileHash + "CarryStartShort", //fileName + 0, // animationHash + 0, // fileHash }, { {"ひろいウエイト"}, //mParent - "CarryWait", //fileName - 0, // animationHash - 0, // fileHash + "CarryWait", //fileName + 0, // animationHash + 0, // fileHash }, { {"カブ抜き"}, //mParent - "PullOut", //fileName - 0, // animationHash - 0, // fileHash + "PullOut", //fileName + 0, // animationHash + 0, // fileHash }, { {"カブウエイト"}, //mParent - "PullOutWait", //fileName - 0, // animationHash - 0, // fileHash + "PullOutWait", //fileName + 0, // animationHash + 0, // fileHash }, { {"ハンマー投げ回転中"}, //mParent - "Swing", //fileName - 0, // animationHash - 0, // fileHash + "Swing", //fileName + 0, // animationHash + 0, // fileHash }, { {"ハンマー投げリリース"}, //mParent - "SwingThrow", //fileName - 0, // animationHash - 0, // fileHash + "SwingThrow", //fileName + 0, // animationHash + 0, // fileHash }, { {"コインゲット"}, //mParent - "CoinGet", //fileName - 0, // animationHash - 0, // fileHash + "CoinGet", //fileName + 0, // animationHash + 0, // fileHash }, { {"パンチ"}, //mParent - "Spin2nd", //fileName - 0, // animationHash - 0, // fileHash + "Spin2nd", //fileName + 0, // animationHash + 0, // fileHash }, { {"空パンチ"}, //mParent - "Spin2nd", //fileName - 0, // animationHash - 0, // fileHash + "Spin2nd", //fileName + 0, // animationHash + 0, // fileHash }, { {"左パンチ"}, //mParent - "Spin2nd", //fileName - 0, // animationHash - 0, // fileHash + "Spin2nd", //fileName + 0, // animationHash + 0, // fileHash }, { {"左空パンチ"}, //mParent - "Spin2nd", //fileName - 0, // animationHash - 0, // fileHash + "Spin2nd", //fileName + 0, // animationHash + 0, // fileHash }, { {"ランニングキック"}, //mParent - "Kick", //fileName - 0, // animationHash - 0, // fileHash + "Kick", //fileName + 0, // animationHash + 0, // fileHash }, { {"アッパーパンチ"}, //mParent - "Jump", //fileName - 0, // animationHash - 0, // fileHash + "Jump", //fileName + 0, // animationHash + 0, // fileHash }, { {"しゃがみアッパー"}, //mParent - "SquatEnd", //fileName - 0, // animationHash - 0, // fileHash + "SquatEnd", //fileName + 0, // animationHash + 0, // fileHash }, { {"サマーソルト"}, //mParent - "SpinLow", //fileName - 0, // animationHash - 0, // fileHash + "SpinLow", //fileName + 0, // animationHash + 0, // fileHash }, { {"投げ"}, //mParent - "Throw", //fileName - 0, // animationHash - 0, // fileHash + "Throw", //fileName + 0, // animationHash + 0, // fileHash }, { {"ファイア投げ"}, //mParent - "Throw", //fileName - 0, // animationHash - 0, // fileHash + "Throw", //fileName + 0, // animationHash + 0, // fileHash }, { {"両手投げ"}, //mParent - "ThrowBoth", //fileName - 0, // animationHash - 0, // fileHash + "ThrowBoth", //fileName + 0, // animationHash + 0, // fileHash }, { {"ファイアスピン"}, //mParent - "FireSpin", //fileName - 0, // animationHash - 0, // fileHash + "FireSpin", //fileName + 0, // animationHash + 0, // fileHash }, { {"ファイアスピン空中"}, //mParent - "FireSpin", //fileName - 0, // animationHash - 0, // fileHash + "FireSpin", //fileName + 0, // animationHash + 0, // fileHash }, { {"崖つかまり開始"}, //mParent - "HangStartUnder", //fileName - 0, // animationHash - 0, // fileHash + "HangStartUnder", //fileName + 0, // animationHash + 0, // fileHash }, { {"崖つかまり中"}, //mParent - "HangWait", //fileName - 0, // animationHash - 0, // fileHash + "HangWait", //fileName + 0, // animationHash + 0, // fileHash }, { {"崖つかまり終了"}, //mParent - "HangUp", //fileName - 0, // animationHash - 0, // fileHash + "HangUp", //fileName + 0, // animationHash + 0, // fileHash }, { {"崖つかまり終了坂"}, //mParent - "HangUp", //fileName - 0, // animationHash - 0, // fileHash + "HangUp", //fileName + 0, // animationHash + 0, // fileHash }, { {"崖つかまり降り"}, //mParent - "HangStart", //fileName - 0, // animationHash - 0, // fileHash + "HangStart", //fileName + 0, // animationHash + 0, // fileHash }, { {"しゃがみジャンプ"}, //mParent - "JumpBack", //fileName - 0, // animationHash - 0, // fileHash + "JumpBack", //fileName + 0, // animationHash + 0, // fileHash }, { {"しゃがみジャンプ着地"}, //mParent - "JumpBackLand", //fileName - 0, // animationHash - 0, // fileHash + "JumpBackLand", //fileName + 0, // animationHash + 0, // fileHash }, { {"しゃがみ歩き"}, //mParent - "SquatWalk", //fileName - 0, // animationHash - 0, // fileHash + "SquatWalk", //fileName + 0, // animationHash + 0, // fileHash }, { {"がんばり走り"}, //mParent - "RunSlope", //fileName - 0, // animationHash - 0, // fileHash + "RunSlope", //fileName + 0, // animationHash + 0, // fileHash }, { - {"腹ばいジャンプ"}, //mParent + {"腹ばいジャンプ"}, //mParent "SlideStomachRecover", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"尻滑りジャンプ"}, //mParent - "SlideHipRecover", //fileName - 0, // animationHash - 0, // fileHash + "SlideHipRecover", //fileName + 0, // animationHash + 0, // fileHash }, { {"向かい風走り"}, //mParent - "RunSlope", //fileName - 0, // animationHash - 0, // fileHash + "RunSlope", //fileName + 0, // animationHash + 0, // fileHash }, { {"向かい風ふんばり"}, //mParent - "Stagger", //fileName - 0, // animationHash - 0, // fileHash + "Stagger", //fileName + 0, // animationHash + 0, // fileHash }, { {"その場足踏み上半身"}, //mParent - "Walk", //fileName - 0, // animationHash - 0, // fileHash + "Walk", //fileName + 0, // animationHash + 0, // fileHash }, { {"水泳ウエイト"}, //mParent - "SwimWait", //fileName - 0, // animationHash - 0, // fileHash + "SwimWait", //fileName + 0, // animationHash + 0, // fileHash }, { {"水泳一掻き"}, //mParent - "SwimBreast", //fileName - 0, // animationHash - 0, // fileHash + "SwimBreast", //fileName + 0, // animationHash + 0, // fileHash }, { - {"水上一掻き"}, //mParent + {"水上一掻き"}, //mParent "SwimBreastSurface", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"水泳潜り"}, //mParent - "SwimDive", //fileName - 0, // animationHash - 0, // fileHash + "SwimDive", //fileName + 0, // animationHash + 0, // fileHash }, { {"水泳ジャンプダイブ"}, //mParent - "LandWater", //fileName - 0, // animationHash - 0, // fileHash + "LandWater", //fileName + 0, // animationHash + 0, // fileHash }, { {"水泳ジャンプダイブ回転"}, //mParent - "LandWaterDive", //fileName - 0, // animationHash - 0, // fileHash + "LandWaterDive", //fileName + 0, // animationHash + 0, // fileHash }, { {"水泳上昇呼吸"}, //mParent - "SwimRise", //fileName - 0, // animationHash - 0, // fileHash + "SwimRise", //fileName + 0, // animationHash + 0, // fileHash }, { {"水泳水面初期移動"}, //mParent - "SwimStartSurface", //fileName - 0, // animationHash - 0, // fileHash + "SwimStartSurface", //fileName + 0, // animationHash + 0, // fileHash }, { - {"水上スピン"}, //mParent + {"水上スピン"}, //mParent "SwimSpinSurface", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"水泳スピン"}, //mParent - "SwimSpin", //fileName - 0, // animationHash - 0, // fileHash + "SwimSpin", //fileName + 0, // animationHash + 0, // fileHash }, { {"水泳スピン移動"}, //mParent - "SwimSpinAttack", //fileName - 0, // animationHash - 0, // fileHash + "SwimSpinAttack", //fileName + 0, // animationHash + 0, // fileHash }, { - {"水上スピン移動"}, //mParent + {"水上スピン移動"}, //mParent "SwimSpinAttackSurface", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"水泳スピンジャンプ"}, //mParent - "SwimJump", //fileName - 0, // animationHash - 0, // fileHash + "SwimJump", //fileName + 0, // animationHash + 0, // fileHash }, { - {"水泳ダメージ"}, //mParent + {"水泳ダメージ"}, //mParent "SwimDamageSmall", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"水泳ダメージ亀"}, //mParent + {"水泳ダメージ亀"}, //mParent "SwimFlutterBoardDamageSmall", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"水泳ダメージ中"}, //mParent "SwimDamageMiddle", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"水上ダメージ中"}, //mParent + {"水上ダメージ中"}, //mParent "SwimDamageMiddleSurface", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"水上ダメージ着水"}, //mParent + {"水上ダメージ着水"}, //mParent "SwimDamageMiddleSurfaceLand", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"水泳ジェット"}, //mParent + {"水泳ジェット"}, //mParent "SwimFlutterboard", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"水泳ジェット終了"}, //mParent - "SwimDamageMiddle", //fileName - 0, // animationHash - 0, // fileHash + "SwimDamageMiddle", //fileName + 0, // animationHash + 0, // fileHash }, { - {"水泳亀投げ"}, //mParent + {"水泳亀投げ"}, //mParent "SwimFlutterboardThrow", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"水泳ジェット開始"}, //mParent + {"水泳ジェット開始"}, //mParent "SwimFlutterboardStart", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"水泳ジェット壁ターン"}, //mParent - "SwimFlutterboardTurn", //fileName - 0, // animationHash - 0, // fileHash + "SwimFlutterboardTurn", //fileName + 0, // animationHash + 0, // fileHash }, { {"水泳ダウン"}, //mParent - "SwimDie", //fileName - 0, // animationHash - 0, // fileHash + "SwimDie", //fileName + 0, // animationHash + 0, // fileHash }, { {"水泳ターン左"}, //mParent - "SwimTurnL", //fileName - 0, // animationHash - 0, // fileHash + "SwimTurnL", //fileName + 0, // animationHash + 0, // fileHash }, { {"水泳ターン右"}, //mParent - "SwimTurnR", //fileName - 0, // animationHash - 0, // fileHash + "SwimTurnR", //fileName + 0, // animationHash + 0, // fileHash }, { {"水泳壁ヒット"}, //mParent - "SwimWallHit", //fileName - 0, // animationHash - 0, // fileHash + "SwimWallHit", //fileName + 0, // animationHash + 0, // fileHash }, { - {"水泳ターン下"}, //mParent + {"水泳ターン下"}, //mParent "SwimTurnForward", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"水泳陸うちあげ"}, //mParent - "SlideStmachEnd", //fileName - 0, // animationHash - 0, // fileHash + "SlideStmachEnd", //fileName + 0, // animationHash + 0, // fileHash }, { {"飛び込み準備"}, //mParent - "DiveWait", //fileName - 0, // animationHash - 0, // fileHash + "DiveWait", //fileName + 0, // animationHash + 0, // fileHash }, { {"飛び込みジャンプ"}, //mParent - "Dive", //fileName - 0, // animationHash - 0, // fileHash + "Dive", //fileName + 0, // animationHash + 0, // fileHash }, { {"後方飛び込みジャンプ"}, //mParent - "DiveBack", //fileName - 0, // animationHash - 0, // fileHash + "DiveBack", //fileName + 0, // animationHash + 0, // fileHash }, { {"飛び込み失敗着地"}, //mParent - "Land", //fileName - 0, // animationHash - 0, // fileHash + "Land", //fileName + 0, // animationHash + 0, // fileHash }, { {"飛び込み失敗回転着地"}, //mParent - "LandRotation", //fileName - 0, // animationHash - 0, // fileHash + "LandRotation", //fileName + 0, // animationHash + 0, // fileHash }, { {"リングダッシュ"}, //mParent - "SwimDashRing", //fileName - 0, // animationHash - 0, // fileHash + "SwimDashRing", //fileName + 0, // animationHash + 0, // fileHash }, { {"リングダッシュ準備"}, //mParent - "SwimDashRingStart", //fileName - 0, // animationHash - 0, // fileHash + "SwimDashRingStart", //fileName + 0, // animationHash + 0, // fileHash }, { - {"カメ持ちリング準備"}, //mParent + {"カメ持ちリング準備"}, //mParent "SwimFlutterBoardDashRingStart", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"カメ持ちリング"}, //mParent + {"カメ持ちリング"}, //mParent "SwimFlutterBoardDashRing", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"匍匐前進"}, //mParent - "SwimGetUp", //fileName - 0, // animationHash - 0, // fileHash + "SwimGetUp", //fileName + 0, // animationHash + 0, // fileHash }, { {"前方小ダメージ"}, //mParent "DamageSmallFront", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"後方小ダメージ"}, //mParent - "DamageSmallBack", //fileName - 0, // animationHash - 0, // fileHash + "DamageSmallBack", //fileName + 0, // animationHash + 0, // fileHash }, { {"強制ジャンプ"}, //mParent - "Rise", //fileName - 0, // animationHash - 0, // fileHash + "Rise", //fileName + 0, // animationHash + 0, // fileHash }, { - {"中ダメージ"}, //mParent + {"中ダメージ"}, //mParent "DamageMiddleFront", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"中ダメージ空中"}, //mParent + {"中ダメージ空中"}, //mParent "DamageMiddleFrontAir", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"中ダメージ着地"}, //mParent + {"中ダメージ着地"}, //mParent "DamageMiddleFrontLand", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"中後ダメージ"}, //mParent + {"中後ダメージ"}, //mParent "DamageMiddleBack", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"中後ダメージ空中"}, //mParent + {"中後ダメージ空中"}, //mParent "DamageMiddleBackAir", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"中後ダメージ着地"}, //mParent + {"中後ダメージ着地"}, //mParent "DamageMiddleBackLand", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"炎ダメージ"}, //mParent - "DamageFire", //fileName - 0, // animationHash - 0, // fileHash + "DamageFire", //fileName + 0, // animationHash + 0, // fileHash }, { {"ノーダメージ"}, //mParent - "DamageBit", //fileName - 0, // animationHash - 0, // fileHash + "DamageBit", //fileName + 0, // animationHash + 0, // fileHash }, { {"炎のランナー"}, //mParent - "FireRun", //fileName - 0, // animationHash - 0, // fileHash + "FireRun", //fileName + 0, // animationHash + 0, // fileHash }, { {"ファイアラン前兆"}, //mParent - "FireRunStart", //fileName - 0, // animationHash - 0, // fileHash + "FireRunStart", //fileName + 0, // animationHash + 0, // fileHash }, { {"電気ダメージ"}, //mParent "DamageElectric", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"電気ダメージ終了"}, //mParent - "DamageElectricEnd", //fileName - 0, // animationHash - 0, // fileHash + "DamageElectricEnd", //fileName + 0, // animationHash + 0, // fileHash }, { {"ファイアダンス"}, //mParent - "FireRun", //fileName - 0, // animationHash - 0, // fileHash + "FireRun", //fileName + 0, // animationHash + 0, // fileHash }, { - {"ダメージ"}, //mParent + {"ダメージ"}, //mParent "DamageStart", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"ダメージ着地"}, //mParent - "Land", //fileName - 0, // animationHash - 0, // fileHash + "Land", //fileName + 0, // animationHash + 0, // fileHash }, { {"ダメージウエイト"}, //mParent - "DamageWait", //fileName - 0, // animationHash - 0, // fileHash + "DamageWait", //fileName + 0, // animationHash + 0, // fileHash }, { {"ノーマルウエイト"}, //mParent - "Wait", //fileName - 0, // animationHash - 0, // fileHash + "Wait", //fileName + 0, // animationHash + 0, // fileHash }, { {"氷結"}, //mParent "Freeze", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"氷結解除"}, //mParent - "IceFlick", //fileName - 0, // animationHash - 0, // fileHash + "IceFlick", //fileName + 0, // animationHash + 0, // fileHash }, { - {"しびれ"}, //mParent + {"しびれ"}, //mParent "DamageNumb", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"しびれ回復"}, //mParent + {"しびれ回復"}, //mParent "DamageNumbEnd", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"はねとばされ"}, //mParent - "DamageFlick", //fileName - 0, // animationHash - 0, // fileHash + "DamageFlick", //fileName + 0, // animationHash + 0, // fileHash }, { {"はねとばされ終了"}, //mParent - "DamageFlickEnd", //fileName - 0, // animationHash - 0, // fileHash + "DamageFlickEnd", //fileName + 0, // animationHash + 0, // fileHash }, { - {"後転ふっとび"}, //mParent + {"後転ふっとび"}, //mParent "DamageWeakFront", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"後転ふっとび空中"}, //mParent "DamageWeakFrontAir", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"後転ふっとび着地"}, //mParent + {"後転ふっとび着地"}, //mParent "DamageWeakFrontLand", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"座りダウン"}, //mParent - "DieSit", //fileName - 0, // animationHash - 0, // fileHash + "DieSit", //fileName + 0, // animationHash + 0, // fileHash }, { {"感電ダウン"}, //mParent - "DieElectric", //fileName - 0, // animationHash - 0, // fileHash + "DieElectric", //fileName + 0, // animationHash + 0, // fileHash }, { {"炎ダウン"}, //mParent - "DieFire", //fileName - 0, // animationHash - 0, // fileHash + "DieFire", //fileName + 0, // animationHash + 0, // fileHash }, { {"仰向けダウン"}, //mParent - "DieOver", //fileName - 0, // animationHash - 0, // fileHash + "DieOver", //fileName + 0, // animationHash + 0, // fileHash }, { {"俯せダウン"}, //mParent - "DieUnder", //fileName - 0, // animationHash - 0, // fileHash + "DieUnder", //fileName + 0, // animationHash + 0, // fileHash }, { {"奈落ダウン"}, //mParent - "DieFall", //fileName - 0, // animationHash - 0, // fileHash + "DieFall", //fileName + 0, // animationHash + 0, // fileHash }, { {"ブラックホール落下"}, //mParent - "DieBlackHole", //fileName - 0, // animationHash - 0, // fileHash + "DieBlackHole", //fileName + 0, // animationHash + 0, // fileHash }, { {"つぶれダウン"}, //mParent - "DieSit", //fileName - 0, // animationHash - 0, // fileHash + "DieSit", //fileName + 0, // animationHash + 0, // fileHash }, { {"ゲームオーバー"}, //mParent - "DieOver", //fileName - 0, // animationHash - 0, // fileHash + "DieOver", //fileName + 0, // animationHash + 0, // fileHash }, { {"レース負け"}, //mParent - "DieEvent", //fileName - 0, // animationHash - 0, // fileHash + "DieEvent", //fileName + 0, // animationHash + 0, // fileHash }, { {"水中レース負け"}, //mParent - "DieSwimEvent", //fileName - 0, // animationHash - 0, // fileHash + "DieSwimEvent", //fileName + 0, // animationHash + 0, // fileHash }, { {"埋まりダウン"}, //mParent - "DieBury", //fileName - 0, // animationHash - 0, // fileHash + "DieBury", //fileName + 0, // animationHash + 0, // fileHash }, { {"テニスショット左"}, //mParent - "TennisShotL", //fileName - 0, // animationHash - 0, // fileHash + "TennisShotL", //fileName + 0, // animationHash + 0, // fileHash }, { {"テニスショット右"}, //mParent - "TennisShotR", //fileName - 0, // animationHash - 0, // fileHash + "TennisShotR", //fileName + 0, // animationHash + 0, // fileHash }, { {"テニスショット中"}, //mParent - "TennisShotM", //fileName - 0, // animationHash - 0, // fileHash + "TennisShotM", //fileName + 0, // animationHash + 0, // fileHash }, { {"テニスショット空"}, //mParent - "TennisShotAir", //fileName - 0, // animationHash - 0, // fileHash + "TennisShotAir", //fileName + 0, // animationHash + 0, // fileHash }, { {"テニスウエイト"}, //mParent - "TennisWait", //fileName - 0, // animationHash - 0, // fileHash + "TennisWait", //fileName + 0, // animationHash + 0, // fileHash }, { {"エレメントゲット"}, //mParent - "ElementGet", //fileName - 0, // animationHash - 0, // fileHash + "ElementGet", //fileName + 0, // animationHash + 0, // fileHash }, { {"エレメントゲット接地中"}, //mParent - "ElementGetGround", //fileName - 0, // animationHash - 0, // fileHash + "ElementGetGround", //fileName + 0, // animationHash + 0, // fileHash }, { {"空中ひねり"}, //mParent - "Spin", //fileName - 0, // animationHash - 0, // fileHash + "Spin", //fileName + 0, // animationHash + 0, // fileHash }, { {"地上ひねり"}, //mParent - "SpinGround", //fileName - 0, // animationHash - 0, // fileHash + "SpinGround", //fileName + 0, // animationHash + 0, // fileHash }, { {"アイスひねり"}, //mParent - "IceSpin", //fileName - 0, // animationHash - 0, // fileHash + "IceSpin", //fileName + 0, // animationHash + 0, // fileHash }, { {"アイスひねり移動"}, //mParent - "IceSkateSpin", //fileName - 0, // animationHash - 0, // fileHash + "IceSkateSpin", //fileName + 0, // animationHash + 0, // fileHash }, { {"アイスひねり静止"}, //mParent - "IceSpin", //fileName - 0, // animationHash - 0, // fileHash + "IceSpin", //fileName + 0, // animationHash + 0, // fileHash }, { {"ハチスピン空中"}, //mParent - "BeeSpin", //fileName - 0, // animationHash - 0, // fileHash + "BeeSpin", //fileName + 0, // animationHash + 0, // fileHash }, { - {"ハチスピン"}, //mParent + {"ハチスピン"}, //mParent "BeeSpinGround", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"アイスひねり空中"}, //mParent - "IceSpinAir", //fileName - 0, // animationHash - 0, // fileHash + "IceSpinAir", //fileName + 0, // animationHash + 0, // fileHash }, { {"スケートアクセルジャンプ"}, //mParent - "IceJump", //fileName - 0, // animationHash - 0, // fileHash + "IceJump", //fileName + 0, // animationHash + 0, // fileHash }, { {"スケートジャンプ2"}, //mParent - "IceJump2", //fileName - 0, // animationHash - 0, // fileHash + "IceJump2", //fileName + 0, // animationHash + 0, // fileHash }, { {"スケートジャンプ3"}, //mParent - "IceJump3", //fileName - 0, // animationHash - 0, // fileHash + "IceJump3", //fileName + 0, // animationHash + 0, // fileHash }, { {"スケート着地"}, //mParent - "IceJumpLand", //fileName - 0, // animationHash - 0, // fileHash + "IceJumpLand", //fileName + 0, // animationHash + 0, // fileHash }, { {"スケート静止着地"}, //mParent - "IceJumpStopLand", //fileName - 0, // animationHash - 0, // fileHash + "IceJumpStopLand", //fileName + 0, // animationHash + 0, // fileHash }, { {"サーフィンジャンプ"}, //mParent - "SurfJump", //fileName - 0, // animationHash - 0, // fileHash + "SurfJump", //fileName + 0, // animationHash + 0, // fileHash }, { {"サーフィンハイジャンプ"}, //mParent - "SurfJumpHigh", //fileName - 0, // animationHash - 0, // fileHash + "SurfJumpHigh", //fileName + 0, // animationHash + 0, // fileHash }, { {"サーフィン着地"}, //mParent - "SurfLand", //fileName - 0, // animationHash - 0, // fileHash + "SurfLand", //fileName + 0, // animationHash + 0, // fileHash }, { {"見る"}, //mParent - "Watch", //fileName - 0, // animationHash - 0, // fileHash + "Watch", //fileName + 0, // animationHash + 0, // fileHash }, { {"レース見る"}, //mParent - "Watch", //fileName - 0, // animationHash - 0, // fileHash + "Watch", //fileName + 0, // animationHash + 0, // fileHash }, { - {"ステージインA"}, //mParent + {"ステージインA"}, //mParent "StageStartGround", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { - {"ステージインB"}, //mParent + {"ステージインB"}, //mParent "LandScenarioStart", //fileName - 0, // animationHash - 0, // fileHash + 0, // animationHash + 0, // fileHash }, { {"ウォークイン"}, //mParent - "GoThrough", //fileName - 0, // animationHash - 0, // fileHash + "GoThrough", //fileName + 0, // animationHash + 0, // fileHash }, { {"スピンゲット[デモ1]"}, //mParent - "DemoGetPower", //fileName - 0, // animationHash - 0, // fileHash + "DemoGetPower", //fileName + 0, // animationHash + 0, // fileHash }, { {"スピンゲット[会話1]"}, //mParent - "DemoGetPower", //fileName - 0, // animationHash - 0, // fileHash + "DemoGetPower", //fileName + 0, // animationHash + 0, // fileHash }, { {"スピンゲット[デモ2]"}, //mParent - "DemoGetPower", //fileName - 0, // animationHash - 0, // fileHash + "DemoGetPower", //fileName + 0, // animationHash + 0, // fileHash }, { {"スピンゲット[会話2]"}, //mParent - "DemoGetPower", //fileName - 0, // animationHash - 0, // fileHash + "DemoGetPower", //fileName + 0, // animationHash + 0, // fileHash }, { {"スピンゲット[デモ3]"}, //mParent - "DemoGetPower", //fileName - 0, // animationHash - 0, // fileHash + "DemoGetPower", //fileName + 0, // animationHash + 0, // fileHash }, { {"スピンゲット[会話3]"}, //mParent - "DemoGetPower", //fileName - 0, // animationHash - 0, // fileHash + "DemoGetPower", //fileName + 0, // animationHash + 0, // fileHash }, { {"スピンゲット[デモ4]"}, //mParent - "DemoGetPower", //fileName - 0, // animationHash - 0, // fileHash + "DemoGetPower", //fileName + 0, // animationHash + 0, // fileHash }, { {"スピンゲット[デモ5]"}, //mParent - "DemoGetPower", //fileName - 0, // animationHash - 0, // fileHash + "DemoGetPower", //fileName + 0, // animationHash + 0, // fileHash }, { {"スピンゲット[会話4]"}, //mParent - "DemoGetPower", //fileName - 0, // animationHash - 0, // fileHash + "DemoGetPower", //fileName + 0, // animationHash + 0, // fileHash }, { {"スピンゲット[デモ6]"}, //mParent - "DemoGetPower", //fileName - 0, // animationHash - 0, // fileHash + "DemoGetPower", //fileName + 0, // animationHash + 0, // fileHash }, { {"スピンゲット[デモ7]"}, //mParent - "DemoGetPower", //fileName - 0, // animationHash - 0, // fileHash + "DemoGetPower", //fileName + 0, // animationHash + 0, // fileHash }, { {"スピンゲット[デモ8]"}, //mParent - "DemoGetPower", //fileName - 0, // animationHash - 0, // fileHash + "DemoGetPower", //fileName + 0, // animationHash + 0, // fileHash }, { {"レース開始"}, //mParent - "RaceStart", //fileName - 0, // animationHash - 0, // fileHash + "RaceStart", //fileName + 0, // animationHash + 0, // fileHash }, { {"レースクラウチング開始"}, //mParent - "RaceStartCrouch", //fileName - 0, // animationHash - 0, // fileHash + "RaceStartCrouch", //fileName + 0, // animationHash + 0, // fileHash }, { {"ゴーストレース開始"}, //mParent - "RaceStartGhost", //fileName - 0, // animationHash - 0, // fileHash + "RaceStartGhost", //fileName + 0, // animationHash + 0, // fileHash }, { {"ゴースト勝利"}, //mParent - "WinGhost", //fileName - 0, // animationHash - 0, // fileHash + "WinGhost", //fileName + 0, // animationHash + 0, // fileHash }, { {"ゴースト出現"}, //mParent - "AppearGhost", //fileName - 0, // animationHash - 0, // fileHash + "AppearGhost", //fileName + 0, // animationHash + 0, // fileHash }, { {""}, //mParent - "", //fileName - 0, // animationHash - 0, // fileHash + "", //fileName + 0, // animationHash + 0, // fileHash }, }; XanimeGroupInfo marioAnimeTable[0x134] = { { - {"基本"}, // mParent + {"基本"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -1965,21 +1965,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"しゃがみ基本"}, // mParent - 1.00000000000f, // 0x4 - 0x2, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x2, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -1991,21 +1991,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"水泳基本"}, // mParent + {"水泳基本"}, // mParent 1.00000000000f, // 0x4 - 0x1e, // 0x8 + 0x1e, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2017,21 +2017,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"テニス基本"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2043,21 +2043,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"坂左右ウエイト"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2069,21 +2069,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"坂前後ウエイト"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2095,21 +2095,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"坂左ウエイト"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2121,21 +2121,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"坂右ウエイト"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2147,21 +2147,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"坂前ウエイト"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2173,21 +2173,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"坂後ウエイト"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2199,21 +2199,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"ラン"}, // mParent + {"ラン"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2225,21 +2225,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"歩行"}, // mParent + {"歩行"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2251,21 +2251,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"鈍行"}, // mParent + {"鈍行"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2277,21 +2277,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"メタルダッシュ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2303,21 +2303,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ダッシュジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2329,21 +2329,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"飛びすさりジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2355,21 +2355,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ショートジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2381,21 +2381,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"埋まり歩行"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2407,21 +2407,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"埋まりジャンプA"}, // mParent - 1.00000000000f, // 0x4 - 0x1, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x1, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2433,21 +2433,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"埋まりジャンプB"}, // mParent - 1.00000000000f, // 0x4 - 0x1, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x1, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2459,21 +2459,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"埋まり脱出ジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x1, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x1, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2485,21 +2485,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"逆着地"}, // mParent + {"逆着地"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2511,21 +2511,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"しゃがみ"}, // mParent + {"しゃがみ"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2537,21 +2537,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"ブレーキ"}, // mParent + {"ブレーキ"}, // mParent 1.00000000000f, // 0x4 - 0x4, // 0x8 + 0x4, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2563,21 +2563,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ブレーキ滑り床"}, // mParent - 4.00000000000f, // 0x4 - 0x4, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 4.00000000000f, // 0x4 + 0x4, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2589,21 +2589,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ターンブレーキ"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2615,21 +2615,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ターンブレーキ滑り床"}, // mParent - 3.00000000000f, // 0x4 - 0x4, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 3.00000000000f, // 0x4 + 0x4, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2641,21 +2641,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"歩行制動ブレーキ"}, // mParent - 1.00000000000f, // 0x4 - 0x4, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x4, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2667,21 +2667,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"氷上慣性走行"}, // mParent - 1.00000000000f, // 0x4 - 0x10, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x10, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2693,21 +2693,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"氷上力行左"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2719,21 +2719,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"氷上力行右"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2745,21 +2745,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"氷上切替左"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2771,21 +2771,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"氷上切替右"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2797,21 +2797,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"氷上後行左"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2823,21 +2823,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"氷上後行右"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2849,21 +2849,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"氷上ターン"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2875,21 +2875,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"特殊ウエイト1A"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2901,21 +2901,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"特殊ウエイト1B"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2927,21 +2927,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"戦闘ウエイト"}, // mParent - 1.00000000000f, // 0x4 - 0x1e, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x1e, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2953,21 +2953,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"匍匐前進"}, // mParent + {"匍匐前進"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -2979,21 +2979,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"ジャンプ"}, // mParent + {"ジャンプ"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3005,21 +3005,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"ジャンプB"}, // mParent + {"ジャンプB"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3031,21 +3031,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"ジャンプC"}, // mParent + {"ジャンプC"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3057,21 +3057,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ターンジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3083,21 +3083,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"フリージャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3109,21 +3109,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ジャンプふみ1"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3135,21 +3135,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ジャンプふみ2"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3161,21 +3161,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ジャンプふみ3"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3187,21 +3187,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"引き戻し"}, // mParent + {"引き戻し"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3213,21 +3213,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"引き戻し着地"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3239,21 +3239,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ポッドワープ開始"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3265,21 +3265,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ポッドワープ終了"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3291,21 +3291,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スカイラブジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3317,21 +3317,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"空中一回転"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3343,21 +3343,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"スケキヨ"}, // mParent + {"スケキヨ"}, // mParent 1.00000000000f, // 0x4 - 0x1, // 0x8 + 0x1, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3369,21 +3369,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スケキヨ脱出"}, // mParent - 1.00000000000f, // 0x4 - 0x1, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x1, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3395,21 +3395,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"埋まり"}, // mParent + {"埋まり"}, // mParent 1.00000000000f, // 0x4 - 0x1, // 0x8 + 0x1, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3421,21 +3421,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"埋まり脱出"}, // mParent 1.00000000000f, // 0x4 - 0x1, // 0x8 + 0x1, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3447,21 +3447,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ホッパージャンプA"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3473,21 +3473,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ホッパージャンプB"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3499,21 +3499,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ホッパーふみジャンプA"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3525,21 +3525,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ホッパーふみジャンプB"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3551,21 +3551,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ホッパー移動A"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3577,21 +3577,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ホッパー移動B"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3603,21 +3603,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ホッパーハイジャンプA"}, // mParent - 1.00000000000f, // 0x4 - 0x1, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x1, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3629,21 +3629,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ホッパーハイジャンプB"}, // mParent - 1.00000000000f, // 0x4 - 0x1, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x1, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3655,21 +3655,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ホッパー壁ジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3681,21 +3681,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ホッパーヒップドロップ開始"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3707,21 +3707,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ホッパーヒップドロップ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3733,21 +3733,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"幅とび"}, // mParent + {"幅とび"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3759,21 +3759,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ヒップドロップ開始"}, // mParent - 1.00000000000f, // 0x4 - 0x2, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x2, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3785,21 +3785,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ヒップドロップ"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3811,21 +3811,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ヒップドロップ着地"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3837,21 +3837,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ヒップドロップ滑り"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3863,21 +3863,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ジャンプ順滑り"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3889,21 +3889,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ジャンプ逆滑り"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3915,21 +3915,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スリップアップ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3941,21 +3941,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"つかまりスリップアップ準備"}, // mParent - 1.00000000000f, // 0x4 - 0x4, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x4, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3967,21 +3967,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"つかまりスリップアップ"}, // mParent - 1.00000000000f, // 0x4 - 0x2, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x2, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -3993,21 +3993,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スピンヒップドロップ開始"}, // mParent - 1.00000000000f, // 0x4 - 0x2, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x2, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4019,21 +4019,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スピンヒップドロップ"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4045,21 +4045,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スピンヒップドロップ着地"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4071,21 +4071,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"落下"}, // mParent + {"落下"}, // mParent 1.00000000000f, // 0x4 - 0xf, // 0x8 + 0xf, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4097,21 +4097,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"着地"}, // mParent + {"着地"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4123,21 +4123,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"着地B"}, // mParent + {"着地B"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4149,21 +4149,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハード着地"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4175,21 +4175,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"すべり着地"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4201,21 +4201,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ショート着地"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4227,21 +4227,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハチ飛行中"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4253,21 +4253,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハチ飛行中無入力"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4279,21 +4279,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハチ壁くっつき"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4305,21 +4305,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハチ壁くっつき中"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4331,21 +4331,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハチジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4357,21 +4357,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハチ壁ジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4383,21 +4383,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハチ匍匐ウエイト"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4409,21 +4409,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハチ匍匐前進"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4435,21 +4435,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハチ匍匐着地"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4461,21 +4461,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハチ花移動"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4487,21 +4487,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハチヒップドロップ開始"}, // mParent - 1.00000000000f, // 0x4 - 0x2, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x2, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4513,21 +4513,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハチヒップドロップ"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4539,21 +4539,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハチヒップドロップ着地"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4565,21 +4565,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハチヒップドロップ壁着地"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4591,21 +4591,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"フーファイター飛行開始"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4617,21 +4617,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"フーファイター飛行"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4643,21 +4643,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"フーファイター飛行再開"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4669,21 +4669,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"フーファイター静止"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4695,21 +4695,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"フーファイター解除"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4721,21 +4721,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"フーファイター着地"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4747,21 +4747,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"フーファイタースピン"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4773,21 +4773,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"泥低速歩行"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4799,21 +4799,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"泥高速歩行"}, // mParent 2.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4825,21 +4825,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"壁くっつき"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4851,21 +4851,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"壁すべり"}, // mParent + {"壁すべり"}, // mParent 1.00000000000f, // 0x4 - 0xa, // 0x8 + 0xa, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4877,21 +4877,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"壁ジャンプ"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4903,21 +4903,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"壁押し"}, // mParent + {"壁押し"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4929,21 +4929,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"壁左歩き"}, // mParent + {"壁左歩き"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4955,21 +4955,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"壁右歩き"}, // mParent + {"壁右歩き"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -4981,21 +4981,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"壁ウエイト"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5007,21 +5007,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"前壁ウエイト"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5033,21 +5033,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"壁ヒット"}, // mParent + {"壁ヒット"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5059,21 +5059,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"壁ヒット着地"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5085,21 +5085,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"壁はじき"}, // mParent + {"壁はじき"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5111,21 +5111,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"ダメージ"}, // mParent + {"ダメージ"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5137,21 +5137,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ダメージ着地"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5163,21 +5163,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ダメージウエイト"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5189,21 +5189,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ノーマルウエイト"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5215,21 +5215,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"氷結"}, // mParent + {"氷結"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5241,21 +5241,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"氷結解除"}, // mParent + {"氷結解除"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5267,21 +5267,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"しびれ"}, // mParent + {"しびれ"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5293,21 +5293,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"しびれ回復"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5319,21 +5319,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"コインゲット"}, // mParent - 1.00000000000f, // 0x4 - 0x1, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x1, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5345,21 +5345,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"パンチ"}, // mParent + {"パンチ"}, // mParent 1.00000000000f, // 0x4 - 0x1, // 0x8 + 0x1, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5371,21 +5371,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"空パンチ"}, // mParent + {"空パンチ"}, // mParent 1.00000000000f, // 0x4 - 0x1, // 0x8 + 0x1, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5397,21 +5397,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"左パンチ"}, // mParent + {"左パンチ"}, // mParent 1.00000000000f, // 0x4 - 0x1, // 0x8 + 0x1, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5423,21 +5423,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"左空パンチ"}, // mParent 1.00000000000f, // 0x4 - 0x1, // 0x8 + 0x1, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5449,21 +5449,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ランニングキック"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5475,21 +5475,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"アッパーパンチ"}, // mParent - 1.00000000000f, // 0x4 - 0x3, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x3, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5501,21 +5501,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"しゃがみアッパー"}, // mParent - 1.00000000000f, // 0x4 - 0x3, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x3, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5527,21 +5527,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"サマーソルト"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5553,21 +5553,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ゲームオーバー"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5579,21 +5579,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"つぶれ"}, // mParent + {"つぶれ"}, // mParent 0.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5605,21 +5605,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"つぶれ復帰"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5631,21 +5631,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"つぶれ解除"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5657,21 +5657,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"空転"}, // mParent + {"空転"}, // mParent 4.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5683,21 +5683,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"坂すべり上向きうつぶせ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5709,21 +5709,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"坂すべり下向きあおむけ"}, // mParent - 2.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 2.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5735,21 +5735,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"向かい風走り"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5761,21 +5761,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"向かい風ふんばり"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5787,21 +5787,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"サーフィン"}, // mParent 1.00000000000f, // 0x4 - 0xf, // 0x8 + 0xf, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5813,21 +5813,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"サーフィン（加速）"}, // mParent - 1.00000000000f, // 0x4 - 0xf, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0xf, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5839,21 +5839,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"サーフィン傾き開始"}, // mParent - 1.00000000000f, // 0x4 - 0x4, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x4, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5865,21 +5865,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"サーフィン傾き開始（加速）"}, // mParent - 1.00000000000f, // 0x4 - 0x4, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x4, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5891,21 +5891,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"サーフィンジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x1, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x1, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5917,21 +5917,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"サーフィンハイジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5943,21 +5943,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"サーフィン落下"}, // mParent - 1.00000000000f, // 0x4 - 0xf, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0xf, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5969,21 +5969,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"サーフィン着地"}, // mParent - 1.00000000000f, // 0x4 - 0x1, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x1, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -5995,21 +5995,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"タマコロ移動"}, // mParent - 1.00000000000f, // 0x4 - 0xf, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0xf, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6021,21 +6021,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"タマコロしゃがみ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6047,21 +6047,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スライダー尻"}, // mParent - 2.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 2.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6073,21 +6073,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"その場足踏み"}, // mParent - 1.00000000000f, // 0x4 - 0x2, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x2, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6099,21 +6099,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"その場足踏み上半身"}, // mParent - 1.00000000000f, // 0x4 - 0x4, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x4, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6125,21 +6125,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳一掻き"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6151,21 +6151,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水上一掻き"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6177,21 +6177,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"水泳潜り"}, // mParent + {"水泳潜り"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6203,21 +6203,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳ジャンプダイブ"}, // mParent - 1.00000000000f, // 0x4 - 0x1, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x1, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6229,21 +6229,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳ジャンプダイブ回転"}, // mParent - 1.00000000000f, // 0x4 - 0x1, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x1, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6255,21 +6255,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳上昇呼吸"}, // mParent - 1.00000000000f, // 0x4 - 0x10, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x10, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6281,21 +6281,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳水面初期移動"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6307,21 +6307,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水上スピン"}, // mParent 1.00000000000f, // 0x4 - 0x1, // 0x8 + 0x1, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6333,21 +6333,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳スピン"}, // mParent 1.00000000000f, // 0x4 - 0x1, // 0x8 + 0x1, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6359,21 +6359,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳スピン移動"}, // mParent - 1.00000000000f, // 0x4 - 0x1, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x1, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6385,21 +6385,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水上スピン移動"}, // mParent - 1.00000000000f, // 0x4 - 0x1, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x1, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6411,21 +6411,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳ダメージ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6437,21 +6437,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳ダメージ亀"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6463,21 +6463,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳ダメージ中"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6489,21 +6489,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水上ダメージ中"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6515,21 +6515,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水上ダメージ着水"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6541,21 +6541,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳ダウン"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6567,21 +6567,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳ターン左"}, // mParent - 1.00000000000f, // 0x4 - 0x14, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x14, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6593,21 +6593,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳ターン右"}, // mParent - 1.00000000000f, // 0x4 - 0x14, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x14, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6619,21 +6619,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳ターン下"}, // mParent - 1.00000000000f, // 0x4 - 0x14, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x14, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6645,21 +6645,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳ウエイト"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6671,21 +6671,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳ジェット"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6697,21 +6697,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳ジェット開始"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6723,21 +6723,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳ジェット終了"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6749,21 +6749,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳亀投げ"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6775,21 +6775,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳壁ヒット"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6801,21 +6801,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳ジェット壁ターン"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6827,21 +6827,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳陸うちあげ"}, // mParent - 1.00000000000f, // 0x4 - 0x10, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x10, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6853,21 +6853,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"飛び込み準備"}, // mParent - 1.00000000000f, // 0x4 - 0x14, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x14, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6879,21 +6879,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"飛び込みジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6905,21 +6905,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"後方飛び込みジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6931,21 +6931,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"飛び込み失敗着地"}, // mParent - 1.00000000000f, // 0x4 - 0xf, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0xf, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6957,21 +6957,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"飛び込み失敗回転着地"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -6983,21 +6983,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水泳スピンジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7009,21 +7009,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"リングダッシュ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7035,21 +7035,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"リングダッシュ準備"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7061,21 +7061,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"カメ持ちリング準備"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7087,21 +7087,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"カメ持ちリング"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7113,21 +7113,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"着地C"}, // mParent + {"着地C"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7139,21 +7139,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"着地ターン"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7165,21 +7165,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"着地幅とび"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7191,21 +7191,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"しゃがみ開始"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7217,21 +7217,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"しゃがみ終了"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7243,21 +7243,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"坂すべり上向き終了"}, // mParent - 1.00000000000f, // 0x4 - 0x4, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x4, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7269,21 +7269,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"坂すべり下向き終了"}, // mParent - 1.00000000000f, // 0x4 - 0x4, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x4, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7295,21 +7295,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"ひろい"}, // mParent + {"ひろい"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7321,21 +7321,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ひろい空中"}, // mParent 1.00000000000f, // 0x4 - 0x3, // 0x8 + 0x3, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7347,21 +7347,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ひろいクイック"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7373,21 +7373,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ひろいウエイト"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7399,21 +7399,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"カブ抜き"}, // mParent + {"カブ抜き"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7425,21 +7425,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"カブウエイト"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7451,21 +7451,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハンマー投げ回転中"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7477,21 +7477,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハンマー投げリリース"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7503,21 +7503,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"投げ"}, // mParent + {"投げ"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7529,21 +7529,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ファイア投げ"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7555,21 +7555,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"両手投げ"}, // mParent + {"両手投げ"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7581,21 +7581,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ファイアスピン"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7607,21 +7607,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ファイアスピン空中"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7633,21 +7633,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"崖つかまり開始"}, // mParent - 1.00000000000f, // 0x4 - 0x5, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x5, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7659,21 +7659,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"崖つかまり中"}, // mParent - 1.00000000000f, // 0x4 - 0x5, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x5, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7685,21 +7685,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"崖つかまり終了"}, // mParent - 1.00000000000f, // 0x4 - 0x4, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x4, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7711,21 +7711,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"崖つかまり終了坂"}, // mParent - 1.00000000000f, // 0x4 - 0x4, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x4, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7737,21 +7737,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"崖つかまり降り"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7763,21 +7763,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"崖ふんばり"}, // mParent 1.00000000000f, // 0x4 - 0x2, // 0x8 + 0x2, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7789,21 +7789,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"しゃがみジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7815,21 +7815,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"しゃがみジャンプ着地"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7841,21 +7841,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"しゃがみ歩き"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7867,21 +7867,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"がんばり走り"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7893,21 +7893,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"腹ばいジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7919,21 +7919,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"尻滑りジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7945,21 +7945,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"前方小ダメージ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7971,21 +7971,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"後方小ダメージ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -7997,21 +7997,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"強制ジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8023,21 +8023,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ヘリコプタージャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8049,21 +8049,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"中ダメージ"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8075,21 +8075,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"中ダメージ空中"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8101,21 +8101,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"中ダメージ着地"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8127,21 +8127,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"中後ダメージ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8153,21 +8153,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"中後ダメージ空中"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8179,21 +8179,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"中後ダメージ着地"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8205,21 +8205,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ノーダメージ"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8231,21 +8231,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"炎ダメージ"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8257,21 +8257,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"炎のランナー"}, // mParent - 8.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 8.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8283,21 +8283,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ファイアラン前兆"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8309,21 +8309,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"電気ダメージ"}, // mParent - 1.00000000000f, // 0x4 - 0x1, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x1, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8335,21 +8335,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"電気ダメージ終了"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8361,21 +8361,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ファイアダンス"}, // mParent - 6.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 6.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8387,21 +8387,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"後転ふっとび"}, // mParent - 1.00000000000f, // 0x4 - 0x2, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x2, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8413,21 +8413,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"後転ふっとび空中"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8439,21 +8439,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"後転ふっとび着地"}, // mParent - 1.00000000000f, // 0x4 - 0x2, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x2, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8465,21 +8465,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"座りダウン"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8491,21 +8491,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"感電ダウン"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8517,21 +8517,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"炎ダウン"}, // mParent + {"炎ダウン"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8543,21 +8543,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"仰向けダウン"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8569,21 +8569,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"俯せダウン"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8595,21 +8595,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"奈落ダウン"}, // mParent 1.00000000000f, // 0x4 - 0x14, // 0x8 + 0x14, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8621,21 +8621,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ブラックホール落下"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8647,21 +8647,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"レース負け"}, // mParent 1.00000000000f, // 0x4 - 0xf, // 0x8 + 0xf, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8673,21 +8673,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"水中レース負け"}, // mParent - 1.00000000000f, // 0x4 - 0xf, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0xf, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8699,21 +8699,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"埋まりダウン"}, // mParent - 1.00000000000f, // 0x4 - 0x1e, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x1e, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8725,21 +8725,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"つぶれダウン"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8751,21 +8751,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"はねとばされ"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8777,21 +8777,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"はねとばされ終了"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8803,21 +8803,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"テニスショット左"}, // mParent - 1.25000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.25000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8829,21 +8829,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"テニスショット右"}, // mParent - 1.25000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.25000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8855,21 +8855,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"テニスショット中"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8881,21 +8881,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"テニスショット空"}, // mParent - 1.25000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.25000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8907,21 +8907,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"テニスウエイト"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8933,21 +8933,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"エレメントゲット"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8959,21 +8959,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"エレメントゲット接地中"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -8985,21 +8985,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"空中ひねり"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9011,21 +9011,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"地上ひねり"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9037,21 +9037,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハチスピン"}, // mParent 1.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9063,21 +9063,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ハチスピン空中"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9089,21 +9089,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"アイスひねり"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9115,21 +9115,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"アイスひねり移動"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9141,21 +9141,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"アイスひねり静止"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9167,21 +9167,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"アイスひねり空中"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9193,21 +9193,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スケートアクセルジャンプ"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9219,21 +9219,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スケートジャンプ2"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9245,21 +9245,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スケートジャンプ3"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9271,21 +9271,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スケート着地"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9297,21 +9297,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スケート静止着地"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9323,21 +9323,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {"見る"}, // mParent + {"見る"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9349,21 +9349,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"レース見る"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9375,21 +9375,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"カリカリ限界"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9401,21 +9401,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ステージインA"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9427,21 +9427,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ステージインB"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9453,21 +9453,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ウォークイン"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9479,21 +9479,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スピンゲット[デモ1]"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9505,21 +9505,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スピンゲット[会話1]"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9531,21 +9531,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スピンゲット[デモ2]"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9557,21 +9557,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スピンゲット[会話2]"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9583,21 +9583,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スピンゲット[デモ3]"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9609,21 +9609,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スピンゲット[会話3]"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9635,21 +9635,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スピンゲット[デモ4]"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9661,21 +9661,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スピンゲット[デモ5]"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9687,21 +9687,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スピンゲット[会話4]"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9713,21 +9713,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スピンゲット[デモ6]"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9739,21 +9739,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スピンゲット[デモ7]"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9765,21 +9765,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"スピンゲット[デモ8]"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9791,21 +9791,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"レース開始"}, // mParent 1.00000000000f, // 0x4 - 0x6, // 0x8 + 0x6, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9817,21 +9817,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"レースクラウチング開始"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9843,21 +9843,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ゴーストレース開始"}, // mParent - 1.00000000000f, // 0x4 - 0x6, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0x6, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9869,21 +9869,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ゴースト勝利"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9895,21 +9895,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { {"ゴースト出現"}, // mParent - 1.00000000000f, // 0x4 - 0, // 0x8 - 0.00000000000f, // 0xC - 0.00000000000f, // 0x10 - 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 1.00000000000f, // 0x4 + 0, // 0x8 + 0.00000000000f, // 0xC + 0.00000000000f, // 0x10 + 0.00000000000f, // 0x14 + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9921,21 +9921,21 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, { - {""}, // mParent + {""}, // mParent 0.00000000000f, // 0x4 - 0, // 0x8 + 0, // 0x8 0.00000000000f, // 0xC 0.00000000000f, // 0x10 0.00000000000f, // 0x14 - 0, // 0x18 - 0, // 0x1C - 0, // 0x1D + 0, // 0x18 + 0, // 0x1C + 0, // 0x1D { 0, 0, @@ -9947,9 +9947,9 @@ XanimeGroupInfo marioAnimeTable[0x134] = { 0.00000000000f, 0.00000000000f, 0.00000000000f, - }, // 0x30 - 0, // 0x40 - 0, // 0x44 + }, // 0x30 + 0, // 0x40 + 0, // 0x44 nullptr, // 0x48 }, }; @@ -9958,249 +9958,249 @@ XanimeAuxInfo marioAnimeAuxTable[1] = {{""}}; XanimeOfsInfo marioAnimeOfsTable[35] = { { - {"ダメージ"}, //mParent + {"ダメージ"}, //mParent 0.00000000000f, // 0x4 10.0000000000f, // 0x8 10.0000000000f, // 0xC - 0x1, // 0x10 + 0x1, // 0x10 }, { {"坂すべり下向きあおむけ"}, //mParent - 0.00000000000f, // 0x4 - 2.00000000000f, // 0x8 - 2.00000000000f, // 0xC - 0x1, // 0x10 + 0.00000000000f, // 0x4 + 2.00000000000f, // 0x8 + 2.00000000000f, // 0xC + 0x1, // 0x10 }, { {"坂すべり上向きうつぶせ"}, //mParent - 0.00000000000f, // 0x4 - 2.00000000000f, // 0x8 - 2.00000000000f, // 0xC - 0x1, // 0x10 + 0.00000000000f, // 0x4 + 2.00000000000f, // 0x8 + 2.00000000000f, // 0xC + 0x1, // 0x10 }, { {"ターンブレーキ"}, //mParent - 0.00000000000f, // 0x4 - 20.0000000000f, // 0x8 - 20.0000000000f, // 0xC - 0x1, // 0x10 + 0.00000000000f, // 0x4 + 20.0000000000f, // 0x8 + 20.0000000000f, // 0xC + 0x1, // 0x10 }, { - {"ジャンプ"}, //mParent + {"ジャンプ"}, //mParent 0.00000000000f, // 0x4 24.0000000000f, // 0x8 24.0000000000f, // 0xC - 0x1, // 0x10 + 0x1, // 0x10 }, { - {"壁ヒット"}, //mParent + {"壁ヒット"}, //mParent 0.00000000000f, // 0x4 25.0000000000f, // 0x8 25.0000000000f, // 0xC - 0x1, // 0x10 + 0x1, // 0x10 }, { {"壁ヒット着地"}, //mParent - 0.00000000000f, // 0x4 - 67.0000000000f, // 0x8 - 0.00000000000f, // 0xC - 0, // 0x10 + 0.00000000000f, // 0x4 + 67.0000000000f, // 0x8 + 0.00000000000f, // 0xC + 0, // 0x10 }, { - {"カブ抜き"}, //mParent + {"カブ抜き"}, //mParent 0.00000000000f, // 0x4 49.0000000000f, // 0x8 49.0000000000f, // 0xC - 0x1, // 0x10 + 0x1, // 0x10 }, { - {"落下"}, //mParent + {"落下"}, //mParent 0.00000000000f, // 0x4 29.0000000000f, // 0x8 29.0000000000f, // 0xC - 0x1, // 0x10 + 0x1, // 0x10 }, { {"ヒップドロップ開始"}, //mParent - 0.00000000000f, // 0x4 - 13.0000000000f, // 0x8 - 13.0000000000f, // 0xC - 0x1, // 0x10 + 0.00000000000f, // 0x4 + 13.0000000000f, // 0x8 + 13.0000000000f, // 0xC + 0x1, // 0x10 }, { {"ヒップドロップ"}, //mParent - 0.00000000000f, // 0x4 - 9.00000000000f, // 0x8 - 9.00000000000f, // 0xC - 0x1, // 0x10 + 0.00000000000f, // 0x4 + 9.00000000000f, // 0x8 + 9.00000000000f, // 0xC + 0x1, // 0x10 }, { {"スピンヒップドロップ"}, //mParent - 0.00000000000f, // 0x4 - 19.0000000000f, // 0x8 - 19.0000000000f, // 0xC - 0x1, // 0x10 + 0.00000000000f, // 0x4 + 19.0000000000f, // 0x8 + 19.0000000000f, // 0xC + 0x1, // 0x10 }, { {"ハチヒップドロップ壁着地"}, //mParent - 0.00000000000f, // 0x4 - 20.0000000000f, // 0x8 - 20.0000000000f, // 0xC - 0, // 0x10 + 0.00000000000f, // 0x4 + 20.0000000000f, // 0x8 + 20.0000000000f, // 0xC + 0, // 0x10 }, { {"ホッパーふみジャンプA"}, //mParent - 10.0000000000f, // 0x4 - 50.0000000000f, // 0x8 - 0.00000000000f, // 0xC - 0x1, // 0x10 + 10.0000000000f, // 0x4 + 50.0000000000f, // 0x8 + 0.00000000000f, // 0xC + 0x1, // 0x10 }, { {"ホッパーふみジャンプB"}, //mParent - 10.0000000000f, // 0x4 - 50.0000000000f, // 0x8 - 0.00000000000f, // 0xC - 0x1, // 0x10 + 10.0000000000f, // 0x4 + 50.0000000000f, // 0x8 + 0.00000000000f, // 0xC + 0x1, // 0x10 }, { {"テニスショット左"}, //mParent - 4.00000000000f, // 0x4 - 26.0000000000f, // 0x8 - 26.0000000000f, // 0xC - 0, // 0x10 + 4.00000000000f, // 0x4 + 26.0000000000f, // 0x8 + 26.0000000000f, // 0xC + 0, // 0x10 }, { {"テニスショット右"}, //mParent - 4.00000000000f, // 0x4 - 26.0000000000f, // 0x8 - 26.0000000000f, // 0xC - 0, // 0x10 + 4.00000000000f, // 0x4 + 26.0000000000f, // 0x8 + 26.0000000000f, // 0xC + 0, // 0x10 }, { {"テニスショット中"}, //mParent - 3.00000000000f, // 0x4 - 38.0000000000f, // 0x8 - 38.0000000000f, // 0xC - 0, // 0x10 + 3.00000000000f, // 0x4 + 38.0000000000f, // 0x8 + 38.0000000000f, // 0xC + 0, // 0x10 }, { {"テニスショット空"}, //mParent - 5.00000000000f, // 0x4 - 26.0000000000f, // 0x8 - 26.0000000000f, // 0xC - 0, // 0x10 + 5.00000000000f, // 0x4 + 26.0000000000f, // 0x8 + 26.0000000000f, // 0xC + 0, // 0x10 }, { {"その場足踏み"}, //mParent - 0.00000000000f, // 0x4 - 17.0000000000f, // 0x8 - 8.00000000000f, // 0xC - 0, // 0x10 + 0.00000000000f, // 0x4 + 17.0000000000f, // 0x8 + 8.00000000000f, // 0xC + 0, // 0x10 }, { - {"ブレーキ"}, //mParent + {"ブレーキ"}, //mParent 0.00000000000f, // 0x4 2.00000000000f, // 0x8 0.00000000000f, // 0xC - 0x1, // 0x10 + 0x1, // 0x10 }, { {"ショート着地"}, //mParent - 0.00000000000f, // 0x4 - 5.00000000000f, // 0x8 - 0.00000000000f, // 0xC - 0, // 0x10 + 0.00000000000f, // 0x4 + 5.00000000000f, // 0x8 + 0.00000000000f, // 0xC + 0, // 0x10 }, { {"アッパーパンチ"}, //mParent - 22.0000000000f, // 0x4 - 23.0000000000f, // 0x8 - 0.00000000000f, // 0xC - 0x1, // 0x10 + 22.0000000000f, // 0x4 + 23.0000000000f, // 0x8 + 0.00000000000f, // 0xC + 0x1, // 0x10 }, { {"しゃがみアッパー"}, //mParent - 0.00000000000f, // 0x4 - 6.00000000000f, // 0x8 - 0.00000000000f, // 0xC - 0, // 0x10 + 0.00000000000f, // 0x4 + 6.00000000000f, // 0x8 + 0.00000000000f, // 0xC + 0, // 0x10 }, { - {"スケキヨ"}, //mParent + {"スケキヨ"}, //mParent 0.00000000000f, // 0x4 59.0000000000f, // 0x8 30.0000000000f, // 0xC - 0x2, // 0x10 + 0x2, // 0x10 }, { {"スケキヨ脱出"}, //mParent - 60.0000000000f, // 0x4 - 120.000000000f, // 0x8 - 0.00000000000f, // 0xC - 0, // 0x10 + 60.0000000000f, // 0x4 + 120.000000000f, // 0x8 + 0.00000000000f, // 0xC + 0, // 0x10 }, { {"特殊ウエイト1A"}, //mParent - 0.00000000000f, // 0x4 - 494.000000000f, // 0x8 - 375.000000000f, // 0xC - 0x2, // 0x10 + 0.00000000000f, // 0x4 + 494.000000000f, // 0x8 + 375.000000000f, // 0xC + 0x2, // 0x10 }, { {"特殊ウエイト1B"}, //mParent - 0.00000000000f, // 0x4 - 254.000000000f, // 0x8 - 135.000000000f, // 0xC - 0x2, // 0x10 + 0.00000000000f, // 0x4 + 254.000000000f, // 0x8 + 135.000000000f, // 0xC + 0x2, // 0x10 }, { {"アイスひねり"}, //mParent - 0.00000000000f, // 0x4 - 35.0000000000f, // 0x8 - 35.0000000000f, // 0xC - 0, // 0x10 + 0.00000000000f, // 0x4 + 35.0000000000f, // 0x8 + 35.0000000000f, // 0xC + 0, // 0x10 }, { {"ファイアスピン空中"}, //mParent - 0.00000000000f, // 0x4 - 30.0000000000f, // 0x8 - 30.0000000000f, // 0xC - 0, // 0x10 + 0.00000000000f, // 0x4 + 30.0000000000f, // 0x8 + 30.0000000000f, // 0xC + 0, // 0x10 }, { {"崖つかまり終了坂"}, //mParent - 0.00000000000f, // 0x4 - 27.0000000000f, // 0x8 - 27.0000000000f, // 0xC - 0, // 0x10 + 0.00000000000f, // 0x4 + 27.0000000000f, // 0x8 + 27.0000000000f, // 0xC + 0, // 0x10 }, { {"前壁ウエイト"}, //mParent - 57.0000000000f, // 0x4 - 59.0000000000f, // 0x8 - 57.0000000000f, // 0xC - 0x1, // 0x10 + 57.0000000000f, // 0x4 + 59.0000000000f, // 0x8 + 57.0000000000f, // 0xC + 0x1, // 0x10 }, { {"フーファイター静止"}, //mParent - 0.00000000000f, // 0x4 - 159.000000000f, // 0x8 - 40.0000000000f, // 0xC - 0x2, // 0x10 + 0.00000000000f, // 0x4 + 159.000000000f, // 0x8 + 40.0000000000f, // 0xC + 0x2, // 0x10 }, { {"ひろいクイック"}, //mParent - 0.00000000000f, // 0x4 - 26.0000000000f, // 0x8 - 0.00000000000f, // 0xC - 0x1, // 0x10 + 0.00000000000f, // 0x4 + 26.0000000000f, // 0x8 + 0.00000000000f, // 0xC + 0x1, // 0x10 }, { - {""}, //mParent + {""}, //mParent 0.00000000000f, // 0x4 0.00000000000f, // 0x8 0.00000000000f, // 0xC - 0, // 0x10 + 0, // 0x10 }, }; diff --git a/include/Game/Player/MarioBlown.hpp b/include/Game/Player/MarioBlown.hpp index 58ce648a1..7eb7a3c23 100644 --- a/include/Game/Player/MarioBlown.hpp +++ b/include/Game/Player/MarioBlown.hpp @@ -6,6 +6,6 @@ class MarioActor; class MarioBlown : public MarioState { public: - MarioBlown(MarioActor *); + MarioBlown(MarioActor*); u8 _11[0x17]; }; diff --git a/include/Game/Player/MarioBump.hpp b/include/Game/Player/MarioBump.hpp index a7be93d8c..78fef0545 100644 --- a/include/Game/Player/MarioBump.hpp +++ b/include/Game/Player/MarioBump.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioBump : public MarioState { public: - MarioBump(MarioActor *); + MarioBump(MarioActor*); u8 _11[0x13]; }; diff --git a/include/Game/Player/MarioBury.hpp b/include/Game/Player/MarioBury.hpp index 5ae88d09e..db95e8a19 100644 --- a/include/Game/Player/MarioBury.hpp +++ b/include/Game/Player/MarioBury.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioBury : public MarioState { public: - MarioBury(MarioActor *); + MarioBury(MarioActor*); u8 _11[0x3B]; }; diff --git a/include/Game/Player/MarioClimb.hpp b/include/Game/Player/MarioClimb.hpp index 14236b66d..7b9c86181 100644 --- a/include/Game/Player/MarioClimb.hpp +++ b/include/Game/Player/MarioClimb.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioClimb : public MarioState { public: - MarioClimb(MarioActor *); + MarioClimb(MarioActor*); u8 _11[3]; }; diff --git a/include/Game/Player/MarioConst.hpp b/include/Game/Player/MarioConst.hpp index fc3aff3c7..77201d294 100644 --- a/include/Game/Player/MarioConst.hpp +++ b/include/Game/Player/MarioConst.hpp @@ -467,15 +467,15 @@ struct MarioConstTable { /* 0x71C */ f32 mTeresaWindMovingBrake2; /* 0x720 */ f32 mTeresaWindMovingBrake3; /* 0x724 */ f32 mSilhouetteZoffset; - /* 0x728 */ u8 mRibbonColor[4]; - /* 0x72C */ u8 mDamageFogLow; - /* 0x72D */ u8 mDamageFogHigh; + /* 0x728 */ u8 mRibbonColor[4]; + /* 0x72C */ u8 mDamageFogLow; + /* 0x72D */ u8 mDamageFogHigh; /* 0x730 */ f32 mStarPieceFogLevel; - /* 0x734 */ u8 mStarPieceFogTime; - /* 0x735 */ u8 mSearchLightAlphaLevel; - /* 0x736 */ u8 mSearchLightBlurAlpha[3]; + /* 0x734 */ u8 mStarPieceFogTime; + /* 0x735 */ u8 mSearchLightAlphaLevel; + /* 0x736 */ u8 mSearchLightBlurAlpha[3]; /* 0x73C */ f32 mSearchLightBlurScale[3]; - /* 0x748 */ u8 mSearchLightColor[4]; + /* 0x748 */ u8 mSearchLightColor[4]; /* 0x74C */ f32 mRasterV; /* 0x750 */ s32 mRasterSpeed; /* 0x754 */ f32 mRasterRange; diff --git a/include/Game/Player/MarioCrush.hpp b/include/Game/Player/MarioCrush.hpp index 5d6fb8d3a..2d427e854 100644 --- a/include/Game/Player/MarioCrush.hpp +++ b/include/Game/Player/MarioCrush.hpp @@ -6,6 +6,6 @@ class MarioActor; class MarioCrush : public MarioState { public: - MarioCrush(MarioActor *); + MarioCrush(MarioActor*); u8 _11[7]; }; diff --git a/include/Game/Player/MarioDamage.hpp b/include/Game/Player/MarioDamage.hpp index 8cf7d06dc..cc7452b76 100644 --- a/include/Game/Player/MarioDamage.hpp +++ b/include/Game/Player/MarioDamage.hpp @@ -6,14 +6,14 @@ class MarioActor; class MarioDamage : public MarioState { public: - MarioDamage(MarioActor *); + MarioDamage(MarioActor*); - u8 _11; - u8 _12; - u16 _14; - u16 _16; - u16 _18; + u8 _11; + u8 _12; + u16 _14; + u16 _16; + u16 _18; TVec3f _1C; - u32 _28; - u32 _2C; + u32 _28; + u32 _2C; }; diff --git a/include/Game/Player/MarioDarkDamage.hpp b/include/Game/Player/MarioDarkDamage.hpp index 89ad0f551..ca96f54ba 100644 --- a/include/Game/Player/MarioDarkDamage.hpp +++ b/include/Game/Player/MarioDarkDamage.hpp @@ -6,6 +6,6 @@ class MarioActor; class MarioDarkDamage : public MarioState { public: - MarioDarkDamage(MarioActor *); + MarioDarkDamage(MarioActor*); u8 _11[7]; }; diff --git a/include/Game/Player/MarioEffect.hpp b/include/Game/Player/MarioEffect.hpp index ed7100b33..64beee784 100644 --- a/include/Game/Player/MarioEffect.hpp +++ b/include/Game/Player/MarioEffect.hpp @@ -8,29 +8,29 @@ class MarioActor; class JPABaseEmitter; struct SomeData { - u32 _0; + u32 _0; TMtx34f _4; TMtx34f _34; - u32 _64; - u32 _68; + u32 _64; + u32 _68; }; class MarioEffect : public MarioModule, public MultiEmitterCallBackBase { public: - MarioEffect(MarioActor *); + MarioEffect(MarioActor*); - virtual void execute(JPABaseEmitter *); + virtual void execute(JPABaseEmitter*); // We can infer from the multiple inheritance that this destructor was declared after execute // and that the virtual destructor in JPAEmitterCallBack comes first virtual ~MarioEffect(); - s32 _C; - s32 _10; - s32 _14; - u8 _18; - Color8 _1C; - Color8 _20; - TMtx34f _24; + s32 _C; + s32 _10; + s32 _14; + u8 _18; + Color8 _1C; + Color8 _20; + TMtx34f _24; SomeData _54[0x100]; }; diff --git a/include/Game/Player/MarioFaint.hpp b/include/Game/Player/MarioFaint.hpp index c5ded5b16..4e497ed2f 100644 --- a/include/Game/Player/MarioFaint.hpp +++ b/include/Game/Player/MarioFaint.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioFaint : public MarioState { public: - MarioFaint(MarioActor *); + MarioFaint(MarioActor*); u8 _11[0x17]; }; diff --git a/include/Game/Player/MarioFireDamage.hpp b/include/Game/Player/MarioFireDamage.hpp index d450ff702..6b1af3ba9 100644 --- a/include/Game/Player/MarioFireDamage.hpp +++ b/include/Game/Player/MarioFireDamage.hpp @@ -6,6 +6,6 @@ class MarioActor; class MarioFireDamage : public MarioState { public: - MarioFireDamage(MarioActor *); + MarioFireDamage(MarioActor*); u16 _12; }; diff --git a/include/Game/Player/MarioFireDance.hpp b/include/Game/Player/MarioFireDance.hpp index b0ae3ccd7..617f385c7 100644 --- a/include/Game/Player/MarioFireDance.hpp +++ b/include/Game/Player/MarioFireDance.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioFireDance : public MarioState { public: - MarioFireDance(MarioActor *); + MarioFireDance(MarioActor*); u8 _11[0x1B]; }; diff --git a/include/Game/Player/MarioFireRun.hpp b/include/Game/Player/MarioFireRun.hpp index 72d86282b..509aeca61 100644 --- a/include/Game/Player/MarioFireRun.hpp +++ b/include/Game/Player/MarioFireRun.hpp @@ -6,6 +6,6 @@ class MarioActor; class MarioFireRun : public MarioState { public: - MarioFireRun(MarioActor *); + MarioFireRun(MarioActor*); u8 _11[11]; }; diff --git a/include/Game/Player/MarioFlip.hpp b/include/Game/Player/MarioFlip.hpp index 7b342e368..6b34fb946 100644 --- a/include/Game/Player/MarioFlip.hpp +++ b/include/Game/Player/MarioFlip.hpp @@ -6,6 +6,6 @@ class MarioActor; class MarioFlip : public MarioState { public: - MarioFlip(MarioActor *); + MarioFlip(MarioActor*); u8 _11[0x1B]; }; diff --git a/include/Game/Player/MarioFlow.hpp b/include/Game/Player/MarioFlow.hpp index 664057d43..b260a6586 100644 --- a/include/Game/Player/MarioFlow.hpp +++ b/include/Game/Player/MarioFlow.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioFlow : public MarioState { public: - MarioFlow(MarioActor *); + MarioFlow(MarioActor*); u16 _12; u16 _14; f32 _18; diff --git a/include/Game/Player/MarioFoo.hpp b/include/Game/Player/MarioFoo.hpp index 96a971aa7..edd99e994 100644 --- a/include/Game/Player/MarioFoo.hpp +++ b/include/Game/Player/MarioFoo.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioFoo : public MarioState { public: - MarioFoo(MarioActor *); + MarioFoo(MarioActor*); u8 _11[0x6AB]; }; diff --git a/include/Game/Player/MarioFpView.hpp b/include/Game/Player/MarioFpView.hpp index 30075f99e..1bab1148d 100644 --- a/include/Game/Player/MarioFpView.hpp +++ b/include/Game/Player/MarioFpView.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioFpView : public MarioState { public: - MarioFpView(MarioActor *); + MarioFpView(MarioActor*); u8 _11[11]; }; diff --git a/include/Game/Player/MarioFreeze.hpp b/include/Game/Player/MarioFreeze.hpp index 16d30d65c..282831ea4 100644 --- a/include/Game/Player/MarioFreeze.hpp +++ b/include/Game/Player/MarioFreeze.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioFreeze : public MarioState { public: - MarioFreeze(MarioActor *); + MarioFreeze(MarioActor*); u8 _11[15]; }; diff --git a/include/Game/Player/MarioFrontStep.hpp b/include/Game/Player/MarioFrontStep.hpp index 6cce2ce49..cd8fba5e9 100644 --- a/include/Game/Player/MarioFrontStep.hpp +++ b/include/Game/Player/MarioFrontStep.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioFrontStep : public MarioState { public: - MarioFrontStep(MarioActor *); + MarioFrontStep(MarioActor*); u8 _11[3]; }; diff --git a/include/Game/Player/MarioHang.hpp b/include/Game/Player/MarioHang.hpp index 53914eafd..68b770f75 100644 --- a/include/Game/Player/MarioHang.hpp +++ b/include/Game/Player/MarioHang.hpp @@ -6,9 +6,8 @@ class MarioActor; class MarioHang : public MarioState { public: - MarioHang(MarioActor *); - u8 _11[0x6]; - u16 mHangTimer; // 0x18 - u8 _1A[0x2A]; - + MarioHang(MarioActor*); + u8 _11[0x6]; + u16 mHangTimer; // 0x18 + u8 _1A[0x2A]; }; diff --git a/include/Game/Player/MarioHolder.hpp b/include/Game/Player/MarioHolder.hpp index 68581099a..caefe8f3a 100644 --- a/include/Game/Player/MarioHolder.hpp +++ b/include/Game/Player/MarioHolder.hpp @@ -9,12 +9,12 @@ public: MarioHolder(); ~MarioHolder(); - void setMarioActor(MarioActor *actor); - MarioActor *getMarioActor() const; + void setMarioActor(MarioActor* actor); + MarioActor* getMarioActor() const; - MarioActor *mActor; + MarioActor* mActor; }; namespace MR { - MarioHolder *getMarioHolder(); + MarioHolder* getMarioHolder(); }; diff --git a/include/Game/Player/MarioMagic.hpp b/include/Game/Player/MarioMagic.hpp index f3dbcc10d..c1359cefb 100644 --- a/include/Game/Player/MarioMagic.hpp +++ b/include/Game/Player/MarioMagic.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioMagic : public MarioState { public: - MarioMagic(MarioActor *); + MarioMagic(MarioActor*); u8 _11[3]; }; diff --git a/include/Game/Player/MarioMapCode.hpp b/include/Game/Player/MarioMapCode.hpp index cf8d1a732..f9f214fa9 100644 --- a/include/Game/Player/MarioMapCode.hpp +++ b/include/Game/Player/MarioMapCode.hpp @@ -7,7 +7,7 @@ class Triangle; class FloorCode { public: FloorCode(); - u32 getCode(const Triangle *); + u32 getCode(const Triangle*); u32 _0; }; diff --git a/include/Game/Player/MarioMessenger.hpp b/include/Game/Player/MarioMessenger.hpp index d558fd14f..3f971859b 100644 --- a/include/Game/Player/MarioMessenger.hpp +++ b/include/Game/Player/MarioMessenger.hpp @@ -14,8 +14,8 @@ public: void addRequest(HitSensor* pReceiver, u32 msg); private: - /* 0x0C */ HitSensor* mSender; + /* 0x0C */ HitSensor* mSender; /* 0x10 */ HitSensor** mReceiverArray; - /* 0x14 */ u32* mMsgArray; - /* 0x18 */ u32 mArraySize; + /* 0x14 */ u32* mMsgArray; + /* 0x18 */ u32 mArraySize; }; diff --git a/include/Game/Player/MarioModule.hpp b/include/Game/Player/MarioModule.hpp index 8e796b652..669fdb0ec 100644 --- a/include/Game/Player/MarioModule.hpp +++ b/include/Game/Player/MarioModule.hpp @@ -11,99 +11,100 @@ class Triangle; class MarioModule { public: - inline MarioModule(MarioActor *actor) : mActor(actor) {} + inline MarioModule(MarioActor* actor) + : mActor(actor) {} - virtual f32 getStickY() const; - virtual void addVelocity(const TVec3f &); - virtual void addVelocity(const TVec3f &, f32); + virtual f32 getStickY() const; + virtual void addVelocity(const TVec3f&); + virtual void addVelocity(const TVec3f&, f32); - Mario *getPlayer() const; - MarioAnimator *getAnimator() const; - TVec3f &getShadowPos() const; - const TVec3f &getGravityVec() const; - const TVec3f &getAirGravityVec() const; - TVec3f &getFrontVec() const; - bool isStatusActiveID(u32) const; - bool isStatusActiveS(MarioState *) const; - u16 getPlayerMode() const; - bool isPlayerModeBee() const; - bool isPlayerModeIce() const; - bool isPlayerModeTeresa() const; - bool isPlayerModeHopper() const; - bool isPlayerModeInvincible() const; - bool isPlayerModeFoo() const; - void changeAnimation(const char *, const char *); - void changeAnimationNonStop(const char *); - void changeAnimationWithAttr(const char *, const char *); - void stopAnimation(const char *, const char *); - bool isDefaultAnimationRun(const char *) const; - void changeAnimationInterpoleFrame(u32); - bool isAnimationRun(const char *) const; - bool isAnimationTerminate(const char *) const; - bool isAnimationTerminateUpper(const char *) const; - const char *getAnimationStringPointer(const char *) const; - const char *getCurrentBckName() const; - void changeAnimationUpper(const char *, const char *); - void changeAnimationUpperWeak(const char *, const char *); - void stopAnimationUpper(const char *, const char *); - void stopAnimationUpperForce(); - f32 getAnimationFrame() const; - void changeAnimation(const char *, u32); - bool isAnimationRun(const char *, u32); - void stopAnimation(const char *, u32); - void setJointGlobalMtx(u16, MtxPtr); - void setYangleOffset(f32); - bool isStickOn() const; - bool isStickFull() const; - TVec3f &getWorldPadDir() const; - bool calcWorldPadDir(TVec3f *, f32, f32, bool); - void addVelocityAfter(const TVec3f &); - void clearVelocity(); - TVec3f &getVelocity() const; - void addTrans(const TVec3f &, const char *); - void cutGravityElementFromJumpVec(bool); - void cutVecElementFromJumpVec(const TVec3f &); - TVec3f &getJumpVec() const; - void setJumpVec(const TVec3f &); - void playEffect(const char *); - void playEffectTarns(const char *, const TVec3f &); - void playEffectRT(const char *, const TVec3f &, const TVec3f &); - void playEffectRTZ(const char *, const TVec3f &, const TVec3f &); - void playEffectRTW(const char *, const TVec3f &, const TVec3f &); - void playEffectSRT(const char *, f32, const TVec3f &, const TVec3f &); - void stopEFfect(const char *); - void stopEffectForce(const char *); - bool playSound(const char *, s32); - void stopSound(const char *, u32); - void startCamVib(u32); - TVec3f &getCamPos() const; - TVec3f &getCamDirX() const; - TVec3f &getCamDirY() const; - TVec3f &getCamDirZ() const; - void startPadVib(u32); - void startPadVib(const char *); - f32 getStickX() const; - f32 getStickP() const; - bool checkTrgA() const; - bool checkLvlA() const; - bool checkTrgZ() const; - bool checkLvlZ() const; - bool checkPreLvlZ() const; - bool checkSquat(bool); - TVec3f &getTrans() const; - const Triangle *getGroundPolygon() const; - bool isOnSlipGround() const; - bool isSlipFloorCode(s32) const; - bool isSlipPolygon(const Triangle *) const; - u32 getFloorCode() const; - f32 calcPolygonAngleD(const Triangle *) const; - f32 calcAngleD(const TVec3f &) const; - Triangle *getTmpPolygon() const; - bool sendPunch(HitSensor *, bool); - HitSensor *getSensor(const Triangle *) const; - f32 marioAcos(f32) const; - bool isInputDisable() const; - void stopEffect(const char *); + Mario* getPlayer() const; + MarioAnimator* getAnimator() const; + TVec3f& getShadowPos() const; + const TVec3f& getGravityVec() const; + const TVec3f& getAirGravityVec() const; + TVec3f& getFrontVec() const; + bool isStatusActiveID(u32) const; + bool isStatusActiveS(MarioState*) const; + u16 getPlayerMode() const; + bool isPlayerModeBee() const; + bool isPlayerModeIce() const; + bool isPlayerModeTeresa() const; + bool isPlayerModeHopper() const; + bool isPlayerModeInvincible() const; + bool isPlayerModeFoo() const; + void changeAnimation(const char*, const char*); + void changeAnimationNonStop(const char*); + void changeAnimationWithAttr(const char*, const char*); + void stopAnimation(const char*, const char*); + bool isDefaultAnimationRun(const char*) const; + void changeAnimationInterpoleFrame(u32); + bool isAnimationRun(const char*) const; + bool isAnimationTerminate(const char*) const; + bool isAnimationTerminateUpper(const char*) const; + const char* getAnimationStringPointer(const char*) const; + const char* getCurrentBckName() const; + void changeAnimationUpper(const char*, const char*); + void changeAnimationUpperWeak(const char*, const char*); + void stopAnimationUpper(const char*, const char*); + void stopAnimationUpperForce(); + f32 getAnimationFrame() const; + void changeAnimation(const char*, u32); + bool isAnimationRun(const char*, u32); + void stopAnimation(const char*, u32); + void setJointGlobalMtx(u16, MtxPtr); + void setYangleOffset(f32); + bool isStickOn() const; + bool isStickFull() const; + TVec3f& getWorldPadDir() const; + bool calcWorldPadDir(TVec3f*, f32, f32, bool); + void addVelocityAfter(const TVec3f&); + void clearVelocity(); + TVec3f& getVelocity() const; + void addTrans(const TVec3f&, const char*); + void cutGravityElementFromJumpVec(bool); + void cutVecElementFromJumpVec(const TVec3f&); + TVec3f& getJumpVec() const; + void setJumpVec(const TVec3f&); + void playEffect(const char*); + void playEffectTarns(const char*, const TVec3f&); + void playEffectRT(const char*, const TVec3f&, const TVec3f&); + void playEffectRTZ(const char*, const TVec3f&, const TVec3f&); + void playEffectRTW(const char*, const TVec3f&, const TVec3f&); + void playEffectSRT(const char*, f32, const TVec3f&, const TVec3f&); + void stopEFfect(const char*); + void stopEffectForce(const char*); + bool playSound(const char*, s32); + void stopSound(const char*, u32); + void startCamVib(u32); + TVec3f& getCamPos() const; + TVec3f& getCamDirX() const; + TVec3f& getCamDirY() const; + TVec3f& getCamDirZ() const; + void startPadVib(u32); + void startPadVib(const char*); + f32 getStickX() const; + f32 getStickP() const; + bool checkTrgA() const; + bool checkLvlA() const; + bool checkTrgZ() const; + bool checkLvlZ() const; + bool checkPreLvlZ() const; + bool checkSquat(bool); + TVec3f& getTrans() const; + const Triangle* getGroundPolygon() const; + bool isOnSlipGround() const; + bool isSlipFloorCode(s32) const; + bool isSlipPolygon(const Triangle*) const; + u32 getFloorCode() const; + f32 calcPolygonAngleD(const Triangle*) const; + f32 calcAngleD(const TVec3f&) const; + Triangle* getTmpPolygon() const; + bool sendPunch(HitSensor*, bool); + HitSensor* getSensor(const Triangle*) const; + f32 marioAcos(f32) const; + bool isInputDisable() const; + void stopEffect(const char*); - MarioActor *mActor; // 0x4 + MarioActor* mActor; // 0x4 }; diff --git a/include/Game/Player/MarioMove.hpp b/include/Game/Player/MarioMove.hpp index e0b108e6b..a5304a95d 100644 --- a/include/Game/Player/MarioMove.hpp +++ b/include/Game/Player/MarioMove.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioMove : public MarioState { public: - MarioMove(MarioActor *); + MarioMove(MarioActor*); void initAfter(); u8 _11[0x47]; diff --git a/include/Game/Player/MarioNullBck.hpp b/include/Game/Player/MarioNullBck.hpp index 0c3b456d3..929c805fc 100644 --- a/include/Game/Player/MarioNullBck.hpp +++ b/include/Game/Player/MarioNullBck.hpp @@ -4,15 +4,15 @@ class MarioNullBck : public LiveActor { public: - MarioNullBck(const char *); - + MarioNullBck(const char*); + virtual ~MarioNullBck(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void appear(); - void getLastPos(TVec3f *); - bool getFramePos(f32, TVec3f *, TVec3f *); + void getLastPos(TVec3f*); + bool getFramePos(f32, TVec3f*, TVec3f*); u16 _8C; }; diff --git a/include/Game/Player/MarioParalyze.hpp b/include/Game/Player/MarioParalyze.hpp index 712a8693e..2fec765f3 100644 --- a/include/Game/Player/MarioParalyze.hpp +++ b/include/Game/Player/MarioParalyze.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioParalyze : public MarioState { public: - MarioParalyze(MarioActor *); + MarioParalyze(MarioActor*); u8 _11[11]; }; diff --git a/include/Game/Player/MarioRabbit.hpp b/include/Game/Player/MarioRabbit.hpp index a9607571e..bd8c94b7b 100644 --- a/include/Game/Player/MarioRabbit.hpp +++ b/include/Game/Player/MarioRabbit.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioRabbit : public MarioState { public: - MarioRabbit(MarioActor *); + MarioRabbit(MarioActor*); u8 _11[0x5B]; }; diff --git a/include/Game/Player/MarioRecovery.hpp b/include/Game/Player/MarioRecovery.hpp index ae5850474..5dfbd5a6c 100644 --- a/include/Game/Player/MarioRecovery.hpp +++ b/include/Game/Player/MarioRecovery.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioRecovery : public MarioState { public: - MarioRecovery(MarioActor *); + MarioRecovery(MarioActor*); u8 _11[0x7B]; }; diff --git a/include/Game/Player/MarioSideStep.hpp b/include/Game/Player/MarioSideStep.hpp index 0f9ed9dc4..062cc5f47 100644 --- a/include/Game/Player/MarioSideStep.hpp +++ b/include/Game/Player/MarioSideStep.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioSideStep : public MarioState { public: - MarioSideStep(MarioActor *); + MarioSideStep(MarioActor*); u8 _11[3]; }; diff --git a/include/Game/Player/MarioSkate.hpp b/include/Game/Player/MarioSkate.hpp index de5dcc4ea..29a4f5985 100644 --- a/include/Game/Player/MarioSkate.hpp +++ b/include/Game/Player/MarioSkate.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioSkate : public MarioState { public: - MarioSkate(MarioActor *); + MarioSkate(MarioActor*); u8 _11[0x17]; }; diff --git a/include/Game/Player/MarioSlider.hpp b/include/Game/Player/MarioSlider.hpp index 445d2ad0b..f805e0ac3 100644 --- a/include/Game/Player/MarioSlider.hpp +++ b/include/Game/Player/MarioSlider.hpp @@ -6,6 +6,6 @@ class MarioActor; class MarioSlider : public MarioState { public: - MarioSlider(MarioActor *); + MarioSlider(MarioActor*); u8 _11[0x33]; }; diff --git a/include/Game/Player/MarioState.hpp b/include/Game/Player/MarioState.hpp index 33b5e9103..6f470eb56 100644 --- a/include/Game/Player/MarioState.hpp +++ b/include/Game/Player/MarioState.hpp @@ -4,7 +4,7 @@ class MarioState : public MarioModule { public: - MarioState(MarioActor *, u32); + MarioState(MarioActor*, u32); virtual void init(); virtual bool proc(u32); @@ -14,13 +14,13 @@ public: virtual bool notice(); virtual bool keep(); virtual bool postureCtrl(MtxPtr); - virtual void hitWall(const TVec3f &, HitSensor *); - virtual void hitPoly(u8, const TVec3f &, HitSensor *); - virtual bool passRing(const HitSensor *); - virtual f32 getBlurOffset() const; + virtual void hitWall(const TVec3f&, HitSensor*); + virtual void hitPoly(u8, const TVec3f&, HitSensor*); + virtual bool passRing(const HitSensor*); + virtual f32 getBlurOffset() const; virtual void draw3D() const; u32 _8; - u32 mStatusId; // 0xC - u8 _10; + u32 mStatusId; // 0xC + u8 _10; }; diff --git a/include/Game/Player/MarioStep.hpp b/include/Game/Player/MarioStep.hpp index af6653572..9d12e3c09 100644 --- a/include/Game/Player/MarioStep.hpp +++ b/include/Game/Player/MarioStep.hpp @@ -6,6 +6,6 @@ class MarioActor; class MarioStep : public MarioState { public: - MarioStep(MarioActor *); + MarioStep(MarioActor*); u8 _11[11]; }; diff --git a/include/Game/Player/MarioStick.hpp b/include/Game/Player/MarioStick.hpp index 65acc1191..acfc1a636 100644 --- a/include/Game/Player/MarioStick.hpp +++ b/include/Game/Player/MarioStick.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioStick : public MarioState { public: - MarioStick(MarioActor *); + MarioStick(MarioActor*); u8 _11[0x73]; }; diff --git a/include/Game/Player/MarioStun.hpp b/include/Game/Player/MarioStun.hpp index ad40d7e55..2baafd520 100644 --- a/include/Game/Player/MarioStun.hpp +++ b/include/Game/Player/MarioStun.hpp @@ -6,13 +6,13 @@ class MarioActor; class MarioStun : public MarioState { public: - MarioStun(MarioActor *); + MarioStun(MarioActor*); virtual bool start(); virtual bool close(); virtual bool update(); - u8 _11; + u8 _11; u16 _12; u16 _14; u16 _16; diff --git a/include/Game/Player/MarioSukekiyo.hpp b/include/Game/Player/MarioSukekiyo.hpp index 10d5ee968..18f6465fe 100644 --- a/include/Game/Player/MarioSukekiyo.hpp +++ b/include/Game/Player/MarioSukekiyo.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioSukekiyo : public MarioState { public: - MarioSukekiyo(MarioActor *); + MarioSukekiyo(MarioActor*); u8 _11[0x3B]; }; diff --git a/include/Game/Player/MarioSwim.hpp b/include/Game/Player/MarioSwim.hpp index 8ed26ae56..c0c819071 100644 --- a/include/Game/Player/MarioSwim.hpp +++ b/include/Game/Player/MarioSwim.hpp @@ -10,7 +10,7 @@ class MarineSnow; class MarioSwim : public MarioState { public: - MarioSwim(MarioActor *); + MarioSwim(MarioActor*); virtual void init(); virtual bool proc(u32); @@ -20,10 +20,10 @@ public: virtual bool notice(); virtual bool keep(); virtual bool postureCtrl(MtxPtr); - virtual void hitWall(const TVec3f &, HitSensor *); - virtual void hitPoly(u8, const TVec3f &, HitSensor *); - virtual bool passRing(const HitSensor *); - virtual f32 getBlurOffset() const; + virtual void hitWall(const TVec3f&, HitSensor*); + virtual void hitPoly(u8, const TVec3f&, HitSensor*); + virtual bool passRing(const HitSensor*); + virtual f32 getBlurOffset() const; virtual void draw3D() const; bool checkWaterCube(bool); @@ -41,17 +41,19 @@ public: void updateTilt(); void jet(); void pushedByWaterWall(); - void setDamage(const TVec3f &, u16); + void setDamage(const TVec3f&, u16); void updateUnderwater(); void startJet(u32); - void addDamage(const TVec3f &); - void addFaint(const TVec3f &); + void addDamage(const TVec3f&); + void addFaint(const TVec3f&); f32 getSurface() const; - virtual TVec3f &getGravityVec() const; + virtual TVec3f& getGravityVec() const; - static inline f32 getWorthlessNumber() { return 0.523598790169f; } + static inline f32 getWorthlessNumber() { + return 0.523598790169f; + } /* The worthlesser variable, as its name suggests, has no purpose. It achieves nothing in life. Its existence is completely devoid of value. @@ -63,12 +65,10 @@ public: */ - inline void funReferenceTime(bool &worthlesser) - { + inline void funReferenceTime(bool& worthlesser) { if (_5C > 1.57079637051f) { worthlesser = true; - } - else { + } else { if (_3C > 0x1E) { _1E = 1; } @@ -90,89 +90,93 @@ public: worthlesser = true; } - inline TVec3f getPlayer380() const { return getPlayer()->_380; } + inline TVec3f getPlayer380() const { + return getPlayer()->_380; + } - inline bool check7Aand7C() const { return _7A || _7C; } + inline bool check7Aand7C() const { + return _7A || _7C; + } - MarineSnow *_14; - u8 _18; - u8 _19; - u8 _1A; - u8 _1B; - u8 _1C; - u8 _1D; - u8 _1E; - u8 _1F; - u8 _20; - u8 _21; - u8 _22; - u32 _24; - u32 _28; - u16 _2C; - u16 _2E; - u16 _30; - u16 _32; - u16 _34; - u16 _36; - u16 _38; - u16 _3A; - u16 _3C; - u16 _3E; - u16 _40; - u16 _42; - u16 _44; - f32 _48; - f32 _4C; - f32 _50; - f32 _54; - f32 _58; - f32 _5C; - TVec3f _60; - TVec3f _6C; - u8 _78; - u16 _7A; - u16 _7C; - f32 _80; - f32 _84; - u8 _88; - u16 _8A; - u16 _8C; - u16 _8E; - u16 _90; - f32 _94; - f32 _98; - u8 _9C; - u8 _9D; - u8 _9E; - u8 _9F; - TVec3f _A0; - u8 _AC; - u8 _AD; - u16 _AE; - TMtx34f _B0; - f32 _E0; - f32 _E4; - u16 _E8; - u16 _EA; - u16 _EC; - u16 _EE; - u16 _F0; - WaterInfo _F4; - s32 _144; - TVec3f _148; - TVec3f _154; - TVec3f _160; - TVec3f _16C; - TVec3f _178; - TVec3f _184; - TVec3f _190; - f32 _19C; - f32 _1A0; - f32 _1A4; - f32 _1A8; - f32 _1AC; - u16 _1B0; - u8 _1B2; - f32 _1B4; - f32 _1B8; + MarineSnow* _14; + u8 _18; + u8 _19; + u8 _1A; + u8 _1B; + u8 _1C; + u8 _1D; + u8 _1E; + u8 _1F; + u8 _20; + u8 _21; + u8 _22; + u32 _24; + u32 _28; + u16 _2C; + u16 _2E; + u16 _30; + u16 _32; + u16 _34; + u16 _36; + u16 _38; + u16 _3A; + u16 _3C; + u16 _3E; + u16 _40; + u16 _42; + u16 _44; + f32 _48; + f32 _4C; + f32 _50; + f32 _54; + f32 _58; + f32 _5C; + TVec3f _60; + TVec3f _6C; + u8 _78; + u16 _7A; + u16 _7C; + f32 _80; + f32 _84; + u8 _88; + u16 _8A; + u16 _8C; + u16 _8E; + u16 _90; + f32 _94; + f32 _98; + u8 _9C; + u8 _9D; + u8 _9E; + u8 _9F; + TVec3f _A0; + u8 _AC; + u8 _AD; + u16 _AE; + TMtx34f _B0; + f32 _E0; + f32 _E4; + u16 _E8; + u16 _EA; + u16 _EC; + u16 _EE; + u16 _F0; + WaterInfo _F4; + s32 _144; + TVec3f _148; + TVec3f _154; + TVec3f _160; + TVec3f _16C; + TVec3f _178; + TVec3f _184; + TVec3f _190; + f32 _19C; + f32 _1A0; + f32 _1A4; + f32 _1A8; + f32 _1AC; + u16 _1B0; + u8 _1B2; + f32 _1B4; + f32 _1B8; }; diff --git a/include/Game/Player/MarioTalk.hpp b/include/Game/Player/MarioTalk.hpp index 89a052f0a..3daf86e35 100644 --- a/include/Game/Player/MarioTalk.hpp +++ b/include/Game/Player/MarioTalk.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioTalk : public MarioState { public: - MarioTalk(MarioActor *); + MarioTalk(MarioActor*); u8 _11[11]; }; diff --git a/include/Game/Player/MarioTeresa.hpp b/include/Game/Player/MarioTeresa.hpp index b85559d07..50f6bef59 100644 --- a/include/Game/Player/MarioTeresa.hpp +++ b/include/Game/Player/MarioTeresa.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioTeresa : public MarioState { public: - MarioTeresa(MarioActor *); + MarioTeresa(MarioActor*); u8 _11[0x4B]; }; diff --git a/include/Game/Player/MarioWait.hpp b/include/Game/Player/MarioWait.hpp index e72eed82d..b81b5d31d 100644 --- a/include/Game/Player/MarioWait.hpp +++ b/include/Game/Player/MarioWait.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioWait : public MarioState { public: - MarioWait(MarioActor *); + MarioWait(MarioActor*); u8 _11[7]; }; diff --git a/include/Game/Player/MarioWall.hpp b/include/Game/Player/MarioWall.hpp index 18b3fd674..c7bb3265d 100644 --- a/include/Game/Player/MarioWall.hpp +++ b/include/Game/Player/MarioWall.hpp @@ -6,13 +6,13 @@ class MarioActor; class MarioWall : public MarioState { public: - MarioWall(MarioActor *); - u32 _14; - u32 _18; - u8 _1C; - u8 _1D; - u8 _1E; - f32 _20; + MarioWall(MarioActor*); + u32 _14; + u32 _18; + u8 _1C; + u8 _1D; + u8 _1E; + f32 _20; TVec3f _24; TVec3f _30; }; diff --git a/include/Game/Player/MarioWarp.hpp b/include/Game/Player/MarioWarp.hpp index 30542baaa..50a0fdbb6 100644 --- a/include/Game/Player/MarioWarp.hpp +++ b/include/Game/Player/MarioWarp.hpp @@ -6,7 +6,7 @@ class MarioActor; class MarioWarp : public MarioState { public: - MarioWarp(MarioActor *); + MarioWarp(MarioActor*); u8 _11[0x7F]; }; diff --git a/include/Game/Player/RushEndInfo.hpp b/include/Game/Player/RushEndInfo.hpp index 176b72b82..9ec19fcd8 100644 --- a/include/Game/Player/RushEndInfo.hpp +++ b/include/Game/Player/RushEndInfo.hpp @@ -4,6 +4,6 @@ class RushEndInfo { public: - RushEndInfo(LiveActor *, u32, const TVec3f &, bool, u32); + RushEndInfo(LiveActor*, u32, const TVec3f&, bool, u32); u8 _0[0x24]; }; \ No newline at end of file diff --git a/include/Game/RhythmLib/AudBgmTempoAdjuster.hpp b/include/Game/RhythmLib/AudBgmTempoAdjuster.hpp index 019288bba..c8aa76469 100644 --- a/include/Game/RhythmLib/AudBgmTempoAdjuster.hpp +++ b/include/Game/RhythmLib/AudBgmTempoAdjuster.hpp @@ -10,20 +10,20 @@ public: void init(); void setInfo(f32, u32, u32, u32, u32); - void setStream(JAIStream *); + void setStream(JAIStream*); void reject(); - f32 beatProc(f32); - f32 calcAdjustRate(f32, f32); + f32 beatProc(f32); + f32 calcAdjustRate(f32, f32); - JAIStream* mStream; // 0x0 - f32 _4; - u32 _8; - u32 _C; - u32 _10; - u32 _14; - f32 _18; - u32 _1C; - u32 _20; - bool _24; - bool _25; + JAIStream* mStream; // 0x0 + f32 _4; + u32 _8; + u32 _C; + u32 _10; + u32 _14; + f32 _18; + u32 _1C; + u32 _20; + bool _24; + bool _25; }; \ No newline at end of file diff --git a/include/Game/RhythmLib/AudRhythmSeqParser.hpp b/include/Game/RhythmLib/AudRhythmSeqParser.hpp index 295f9794f..7427683d4 100644 --- a/include/Game/RhythmLib/AudRhythmSeqParser.hpp +++ b/include/Game/RhythmLib/AudRhythmSeqParser.hpp @@ -4,6 +4,6 @@ class AudRhythmSeqParser { public: - f32 mTempo; // 0x4 - f32 mModifiedTempo; // 0x8 + f32 mTempo; // 0x4 + f32 mModifiedTempo; // 0x8 }; \ No newline at end of file diff --git a/include/Game/Ride/BigBubble.hpp b/include/Game/Ride/BigBubble.hpp index b50870feb..c95690f7e 100644 --- a/include/Game/Ride/BigBubble.hpp +++ b/include/Game/Ride/BigBubble.hpp @@ -15,18 +15,18 @@ class BigBubble : public LiveActor { public: BigBubble(const char*); - virtual void init(const JMapInfoIter&); - virtual void initSensor(); - virtual void makeActorAppeared(); - virtual void makeActorDead(); - virtual void control(); - virtual void calcAnim(); - virtual void draw() const; - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgPlayerAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveMsgPush(HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); + virtual void init(const JMapInfoIter&); + virtual void initSensor(); + virtual void makeActorAppeared(); + virtual void makeActorDead(); + virtual void control(); + virtual void calcAnim(); + virtual void draw() const; + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgPlayerAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveMsgPush(HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); virtual MtxPtr getBaseMtx() const; virtual ~BigBubble(); @@ -42,7 +42,7 @@ public: void updateNormalVelocity(); bool requestCancelBind(); bool tryBreakEnd(); - f32 getBaseRadius() const; + f32 getBaseRadius() const; bool tryGoal(); bool isMerged(); bool isPushable() const; @@ -64,37 +64,37 @@ public: // ... OctahedronBezierSurface* _8C; - u32 _90; - LiveActor* _94; - u32 _98; - LiveActor* _9C; // Hmm... - u8 _A0[24]; - TMtx34f _B8; - u8 _E8[48]; // TMtx34f or TPos3f ? - TPos3f _118; - TQuat4f _148; - TQuat4f _158; - TVec3f _168; - TVec3f _174; - TVec3f _180; - u8 _18C[24]; - TVec3f _1A4; - TVec3f _1B0; - u8 _1BC[60]; - f32 _1F8; - f32 _1FC; - u8 _200[40]; - bool _228; - bool _229; - bool _22A; - bool _22B; - bool _22C; - bool _22D; - bool _22E; - bool _22F; - bool _230; - bool _231; - bool _232; + u32 _90; + LiveActor* _94; + u32 _98; + LiveActor* _9C; // Hmm... + u8 _A0[24]; + TMtx34f _B8; + u8 _E8[48]; // TMtx34f or TPos3f ? + TPos3f _118; + TQuat4f _148; + TQuat4f _158; + TVec3f _168; + TVec3f _174; + TVec3f _180; + u8 _18C[24]; + TVec3f _1A4; + TVec3f _1B0; + u8 _1BC[60]; + f32 _1F8; + f32 _1FC; + u8 _200[40]; + bool _228; + bool _229; + bool _22A; + bool _22B; + bool _22C; + bool _22D; + bool _22E; + bool _22F; + bool _230; + bool _231; + bool _232; }; class OctahedronBezierSurface { diff --git a/include/Game/Ride/Pole.hpp b/include/Game/Ride/Pole.hpp index 67303d70a..576176dbf 100644 --- a/include/Game/Ride/Pole.hpp +++ b/include/Game/Ride/Pole.hpp @@ -4,15 +4,15 @@ class Pole : public LiveActor { public: - Pole(const char *); + Pole(const char*); - virtual void init(const JMapInfoIter &); - virtual void appear(); - virtual void calcAnim(); - virtual void attackSensor(HitSensor *, HitSensor *); - virtual bool receiveMsgEnemyAttack(u32, HitSensor *, HitSensor *); - virtual bool receiveOtherMsg(u32, HitSensor *, HitSensor *); - virtual MtxPtr getBaseMtx() const; + virtual void init(const JMapInfoIter&); + virtual void appear(); + virtual void calcAnim(); + virtual void attackSensor(HitSensor*, HitSensor*); + virtual bool receiveMsgEnemyAttack(u32, HitSensor*, HitSensor*); + virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); + virtual MtxPtr getBaseMtx() const; void exeDemoAppear(); void exeFree(); @@ -33,29 +33,29 @@ public: bool tryHandstandTurn(); bool isEnableTurn() const; void updateBindTrans(); - void calcGravityMtx(TPos3f *); + void calcGravityMtx(TPos3f*); void updateTopPos(f32); - f32 getPoleSubPadStickX() const; - f32 getPoleSubPadStickY() const; + f32 getPoleSubPadStickX() const; + f32 getPoleSubPadStickY() const; - TVec3f _8C; - TVec3f _98; - f32 _A4; - bool _A8; - bool _A9; - bool _AA; - bool _AB; - bool _AC; - f32 _B0; - f32 _B4; - LiveActor* mActor; // 0xB8 - ActorCameraInfo* mInfo; // 0xBC - TVec3f _C0; - TVec3f _CC; - TVec3f _D8; - TVec3f _E4; - TMtx34f _F0; - MtxPtr _120; - MtxPtr _124; - TMtx34f _128; + TVec3f _8C; + TVec3f _98; + f32 _A4; + bool _A8; + bool _A9; + bool _AA; + bool _AB; + bool _AC; + f32 _B0; + f32 _B4; + LiveActor* mActor; // 0xB8 + ActorCameraInfo* mInfo; // 0xBC + TVec3f _C0; + TVec3f _CC; + TVec3f _D8; + TVec3f _E4; + TMtx34f _F0; + MtxPtr _120; + MtxPtr _124; + TMtx34f _128; }; diff --git a/include/Game/Ride/SphereAccelSensorController.hpp b/include/Game/Ride/SphereAccelSensorController.hpp index 85dd3bce3..2ffde7693 100644 --- a/include/Game/Ride/SphereAccelSensorController.hpp +++ b/include/Game/Ride/SphereAccelSensorController.hpp @@ -1,23 +1,19 @@ #pragma once - #include "Game/Ride/SpherePadController.hpp" #include - class SphereAccelSensorController : SpherePadController { public: SphereAccelSensorController(); - - - virtual f32 calcJumpPower() const; - virtual f32 calcMoveVector(TVec3f*, const TVec3f&); + + virtual f32 calcJumpPower() const; + virtual f32 calcMoveVector(TVec3f*, const TVec3f&); virtual bool doBrake() const; virtual void update(const TVec3f&); virtual void notifyActivate(); virtual void notifyDeactivate(); virtual void clacXY(f32*, f32*); - void getPadAcceleration(TVec3f*); bool testBrake() const; @@ -34,13 +30,13 @@ public: /* 0x58 */ u32 _58; /* 0x5C */ u32 _5C; - + /* 0x60 */ u32 _60; /* 0x64 */ u32 _64; /* 0x68 */ u32 _68; /* 0x6C */ u32 _6C; /* 0x70 */ u32 _70; - + /* 0x74 */ u32 _74; /* 0x78 */ u32 _78; diff --git a/include/Game/Ride/SphereController.hpp b/include/Game/Ride/SphereController.hpp index ff7d3fd15..a3014ba71 100644 --- a/include/Game/Ride/SphereController.hpp +++ b/include/Game/Ride/SphereController.hpp @@ -7,8 +7,8 @@ public: /// @brief Creates a new `SphereController`. SphereController(); - virtual f32 calcMoveVector(TVec3f*, const TVec3f&); - virtual f32 calcJumpPower() const; + virtual f32 calcMoveVector(TVec3f*, const TVec3f&); + virtual f32 calcJumpPower() const; virtual bool doBrake() const; virtual void update(const TVec3f&); virtual void notifyActivate(); diff --git a/include/Game/Ride/SpherePadController.hpp b/include/Game/Ride/SpherePadController.hpp index 2daf147db..b21a27098 100644 --- a/include/Game/Ride/SpherePadController.hpp +++ b/include/Game/Ride/SpherePadController.hpp @@ -2,15 +2,14 @@ #include "Game/Ride/SphereController.hpp" - class SpherePadController : SphereController { public: SpherePadController(); - virtual f32 calcMoveVector(TVec3f*, const TVec3f&); - virtual f32 calcJumpPower() const; + virtual f32 calcMoveVector(TVec3f*, const TVec3f&); + virtual f32 calcJumpPower() const; virtual void update(const TVec3f&); virtual void clacXY(f32*, f32*) NO_INLINE; - + f32 calcDirSphereMove(TVec3f*, const TVec3f&, u32); }; diff --git a/include/Game/Ride/SurfRay.hpp b/include/Game/Ride/SurfRay.hpp index 7a1558a35..97606b993 100644 --- a/include/Game/Ride/SurfRay.hpp +++ b/include/Game/Ride/SurfRay.hpp @@ -1,6 +1,5 @@ #pragma once - #include "Game/LiveActor/LiveActor.hpp" #include "Game/Map/WaterInfo.hpp" #include "revolution/mtx.h" @@ -19,7 +18,7 @@ public: virtual void calcAndSetBaseMtx(); virtual void attackSensor(HitSensor*, HitSensor*); virtual bool receiveOtherMsg(u32, HitSensor*, HitSensor*); - + void exeWaitPlayer(); void exeTurnToWait(); void exeWait(); @@ -35,9 +34,9 @@ public: void exeWipeOut(); void exeWipeIn(); void exeReady(); - + void resetAllInfo(); - + bool updateRideAccel(); bool updateRideFree(); bool updateRide(); @@ -48,14 +47,14 @@ public: void updateRotate(); void updateSound(); void updateRiderMtx(); - + bool tryInWater(); bool tryJumpOrFall(); bool isTwistStart() const; bool isRotateStart() const; - /* 0x8C */ f32 mSurfSpeed; - /* 0x90 */ f32 mOrthoSpeed; + /* 0x8C */ f32 mSurfSpeed; + /* 0x90 */ f32 mOrthoSpeed; /* 0x94 */ TVec3f mOrthoVelocity; /* 0xA0 */ f32 mSteerRate; @@ -64,35 +63,35 @@ public: /* 0xA8 */ TVec3f mFront; /* 0xB4 */ TVec3f mUp; /* 0xC0 */ TVec3f mSide; - /* 0xCC */ TVec3f mBaseUp; // base up vector for modification + /* 0xCC */ TVec3f mBaseUp; // base up vector for modification /* 0xD8 */ TVec3f mBaseSide; // base side vector for modification /* 0xE4 */ TVec3f mGroundNormal; /* 0xF0 */ TVec3f mWarpPos; /* 0xFC */ LiveActor* mRider; - /* 0x100 */ s32 mChannel; - /* 0x104 */ f32 mRayTilt; - /* 0x108 */ bool mInWater; - /* 0x109 */ u8 _109; // not used? - /* 0x10A */ u8 _10A; // not used? - /* 0x10B */ u8 _10B; // not used? - /* 0x10C */ s32 mAirtime; - /* 0x110 */ TVec3f mWaterNormal; + /* 0x100 */ s32 mChannel; + /* 0x104 */ f32 mRayTilt; + /* 0x108 */ bool mInWater; + /* 0x109 */ u8 _109; // not used? + /* 0x10A */ u8 _10A; // not used? + /* 0x10B */ u8 _10B; // not used? + /* 0x10C */ s32 mAirtime; + /* 0x110 */ TVec3f mWaterNormal; /* 0x11C */ WaterInfo mWaterInfo; - /* 0x16C */ TVec3f mWaterShadowPos; - /* 0x178 */ f32 mShadowAlpha; + /* 0x16C */ TVec3f mWaterShadowPos; + /* 0x178 */ f32 mShadowAlpha; - /* 0x17C */ s32 mTwistBufferSize; + /* 0x17C */ s32 mTwistBufferSize; /* 0x180 */ f32* mTwistBuffer; - /* 0x184 */ bool mInTutorialArea; + /* 0x184 */ bool mInTutorialArea; /* 0x185 */ bool mInTutorial; - /* 0x186 */ u8 _186; // not used? - /* 0x187 */ u8 _187; // not used? - /* 0x188 */ s32 mLectureIdx; - - /* 0x18C */ TPos3f mEffectHostMtx; - /* 0x1BC */ ActorJointCtrl* mActorJointCtrl; + /* 0x186 */ u8 _186; // not used? + /* 0x187 */ u8 _187; // not used? + /* 0x188 */ s32 mLectureIdx; + + /* 0x18C */ TPos3f mEffectHostMtx; + /* 0x1BC */ ActorJointCtrl* mActorJointCtrl; /* 0x1C0 */ ProjmapEffectMtxSetter* mProjmapFxMtxSetter; }; diff --git a/include/Game/Ride/SurfRayTutorial.hpp b/include/Game/Ride/SurfRayTutorial.hpp index 02182bdd3..631c12305 100644 --- a/include/Game/Ride/SurfRayTutorial.hpp +++ b/include/Game/Ride/SurfRayTutorial.hpp @@ -38,11 +38,11 @@ public: void prevTutorial(); void startTimerSound(s32, s32); - /* 0x08 */ LiveActor* mHost; - /* 0x0C */ bool mIsTutorialPass; - /* 0x10 */ TVec3f mPadAccel; + /* 0x08 */ LiveActor* mHost; + /* 0x0C */ bool mIsTutorialPass; + /* 0x10 */ TVec3f mPadAccel; /* 0x1C */ TalkMessageCtrl* mTalkCtrl; /* 0x20 */ SurfingGuidance* mSurfingGuidance; - /* 0x24 */ s32 mChangeStep; - /* 0x28 */ s32 _28; + /* 0x24 */ s32 mChangeStep; + /* 0x28 */ s32 _28; }; diff --git a/include/Game/Ride/Tamakoro.hpp b/include/Game/Ride/Tamakoro.hpp index b68792402..a41b8eefb 100644 --- a/include/Game/Ride/Tamakoro.hpp +++ b/include/Game/Ride/Tamakoro.hpp @@ -59,7 +59,7 @@ public: void exeRideRailFastEnd(); void exeBindEnd(); void addVelocityOperate(); - f32 updateRideRail(); + f32 updateRideRail(); void updateMoment(); void updateAirTime(); void updateMarioPose(f32); @@ -82,28 +82,28 @@ public: private: /* 0x08C */ SphereAccelSensorController* mAccelSensorCtrl; - /* 0x090 */ TamakoroTutorial* mTutorial; - /* 0x094 */ JointController* mJointCtrl; - /* 0x098 */ TQuat4f mBaseQuat; - /* 0x0A8 */ TQuat4f mRotateQuat; - /* 0x0B8 */ TVec3f mRingUp; - /* 0x0C4 */ u8 _C4[0xC]; - /* 0x0D0 */ TVec3f mKickVel; - /* 0x0DC */ TVec3f mMarioBindRequestPos; - /* 0x0E8 */ TVec3f mMarioRotateUp; - /* 0x0F4 */ TVec3f mMarioPos; - /* 0x100 */ TVec3f mMoment; - /* 0x10C */ TVec3f mMarioRotateFront; - /* 0x118 */ TVec3f mDirectionToMario; - /* 0x124 */ TVec3f mMoveVec; - /* 0x130 */ f32 mMoveSpeed; - /* 0x134 */ f32 mMarioRotateYAngle; - /* 0x138 */ f32 mMarioOffset; - /* 0x13C */ f32 mMarioOffsetVelocity; - /* 0x140 */ s32 mAirTime; - /* 0x144 */ AudTamakoroBgmCtrl* mBgmCtrl; - /* 0x148 */ bool mControlDisabled; - /* 0x149 */ bool mHasTutorial; + /* 0x090 */ TamakoroTutorial* mTutorial; + /* 0x094 */ JointController* mJointCtrl; + /* 0x098 */ TQuat4f mBaseQuat; + /* 0x0A8 */ TQuat4f mRotateQuat; + /* 0x0B8 */ TVec3f mRingUp; + /* 0x0C4 */ u8 _C4[0xC]; + /* 0x0D0 */ TVec3f mKickVel; + /* 0x0DC */ TVec3f mMarioBindRequestPos; + /* 0x0E8 */ TVec3f mMarioRotateUp; + /* 0x0F4 */ TVec3f mMarioPos; + /* 0x100 */ TVec3f mMoment; + /* 0x10C */ TVec3f mMarioRotateFront; + /* 0x118 */ TVec3f mDirectionToMario; + /* 0x124 */ TVec3f mMoveVec; + /* 0x130 */ f32 mMoveSpeed; + /* 0x134 */ f32 mMarioRotateYAngle; + /* 0x138 */ f32 mMarioOffset; + /* 0x13C */ f32 mMarioOffsetVelocity; + /* 0x140 */ s32 mAirTime; + /* 0x144 */ AudTamakoroBgmCtrl* mBgmCtrl; + /* 0x148 */ bool mControlDisabled; + /* 0x149 */ bool mHasTutorial; }; namespace MR { diff --git a/include/Game/Ride/TamakoroTutorial.hpp b/include/Game/Ride/TamakoroTutorial.hpp index 5d1110525..572889ed6 100644 --- a/include/Game/Ride/TamakoroTutorial.hpp +++ b/include/Game/Ride/TamakoroTutorial.hpp @@ -36,10 +36,10 @@ public: void exeRecover(); void startTimerSound(s32, s32); - /* 0x8C */ Tamakoro* mHost; + /* 0x8C */ Tamakoro* mHost; /* 0x90 */ TalkMessageCtrl* mTalkCtrl; /* 0x94 */ TalkMessageCtrl* mTalkCtrlAutomatic; - /* 0x98 */ TVec3f mPadAccel; - /* 0xA4 */ bool _A4; - /* 0xA5 */ bool _A5; + /* 0x98 */ TVec3f mPadAccel; + /* 0xA4 */ bool _A4; + /* 0xA5 */ bool _A5; }; diff --git a/include/Game/Scene/GameScene.hpp b/include/Game/Scene/GameScene.hpp index 0f840e60c..95445ea1c 100644 --- a/include/Game/Scene/GameScene.hpp +++ b/include/Game/Scene/GameScene.hpp @@ -18,51 +18,51 @@ public: virtual void draw() const; virtual void calcAnim(); - void notifyEndScenarioStarter(); - void requestPlayMovieDemo(); - void requestStartGameOverDemo(); - void requestEndGameOverDemo(); - void requestEndMissDemo(); - void requestPowerStarGetDemo(); - void requestGrandStarGetDemo(); - void setNerveAfterPauseMenu(); - bool isExecScenarioOpeningCamera() const; - bool isExecScenarioStarter() const; - bool isExecStageClearDemo() const; - void exeScenarioOpeningCamera(); - void exeScenarioStarter(); - void exeSceneAction(); - void exePauseMenu(); - void exePowerStarGet(); - void exeGrandStarGet(); - void exeGameOver(); - void exeCometRetryAfterMiss(); - void exeSaveAfterGameOver(); - void exePlayMovie(); - void exeTimeUp(); - void exeGalaxyMap(); - void exeStaffRoll(); - void initSequences(); - void initEffect(); - void drawMirror() const; - void draw3D() const; - void draw2D() const; - bool isValidScenarioOpeningCamera() const NO_INLINE; - void drawOdhCapture() const; - void startStagePlayFirst(); - void startStagePlayRetry(); - bool isPermitToPauseMenu() const; - void requestShowGalaxyMap(); - void requestStaffRoll(); - bool isDrawMirror() const; - void stageClear(); + void notifyEndScenarioStarter(); + void requestPlayMovieDemo(); + void requestStartGameOverDemo(); + void requestEndGameOverDemo(); + void requestEndMissDemo(); + void requestPowerStarGetDemo(); + void requestGrandStarGetDemo(); + void setNerveAfterPauseMenu(); + bool isExecScenarioOpeningCamera() const; + bool isExecScenarioStarter() const; + bool isExecStageClearDemo() const; + void exeScenarioOpeningCamera(); + void exeScenarioStarter(); + void exeSceneAction(); + void exePauseMenu(); + void exePowerStarGet(); + void exeGrandStarGet(); + void exeGameOver(); + void exeCometRetryAfterMiss(); + void exeSaveAfterGameOver(); + void exePlayMovie(); + void exeTimeUp(); + void exeGalaxyMap(); + void exeStaffRoll(); + void initSequences(); + void initEffect(); + void drawMirror() const; + void draw3D() const; + void draw2D() const; + bool isValidScenarioOpeningCamera() const NO_INLINE; + void drawOdhCapture() const; + void startStagePlayFirst(); + void startStagePlayRetry(); + bool isPermitToPauseMenu() const; + void requestShowGalaxyMap(); + void requestStaffRoll(); + bool isDrawMirror() const; + void stageClear(); inline bool isPlayMovie() const; - u32 _14; - GameSceneScenarioOpeningCameraState* mScenarioCamera; // 0x18 - GameScenePauseControl* mPauseCtrl; // 0x1C - GamePauseSequence* mPauseSeq; // 0x20 - GameStageClearSequence* mStageClearSeq; // 0x24 - bool mDraw3D; // 0x28 - u8 _29; + u32 _14; + GameSceneScenarioOpeningCameraState* mScenarioCamera; // 0x18 + GameScenePauseControl* mPauseCtrl; // 0x1C + GamePauseSequence* mPauseSeq; // 0x20 + GameStageClearSequence* mStageClearSeq; // 0x24 + bool mDraw3D; // 0x28 + u8 _29; }; diff --git a/include/Game/Scene/GameSceneFunction.hpp b/include/Game/Scene/GameSceneFunction.hpp index 7ac438ad9..224672c07 100644 --- a/include/Game/Scene/GameSceneFunction.hpp +++ b/include/Game/Scene/GameSceneFunction.hpp @@ -17,4 +17,4 @@ namespace GameSceneFunction { bool isLoadDoneScenarioWaveData(); void activateDraw3D(); void deactivateDraw3D(); -}; +}; // namespace GameSceneFunction diff --git a/include/Game/Scene/GameScenePauseControl.hpp b/include/Game/Scene/GameScenePauseControl.hpp index 89ad24dd7..1d08bafbb 100644 --- a/include/Game/Scene/GameScenePauseControl.hpp +++ b/include/Game/Scene/GameScenePauseControl.hpp @@ -7,17 +7,17 @@ class PauseButtonCheckerInGame; class GameScenePauseControl : public NerveExecutor { public: - GameScenePauseControl(GameScene *); + GameScenePauseControl(GameScene*); virtual ~GameScenePauseControl(); - void registerNervePauseMenu(const Nerve *); + void registerNervePauseMenu(const Nerve*); void requestPauseMenuOff(); void exeNormal(); bool tryStartPauseMenu(); - GameScene* mScene; // 0x08 - PauseButtonCheckerInGame* mPauseChecker; // 0x0C - bool mPauseMenuOff; // 0x10 - const Nerve* mPauseMenuNerve; // 0x14 + GameScene* mScene; // 0x08 + PauseButtonCheckerInGame* mPauseChecker; // 0x0C + bool mPauseMenuOff; // 0x10 + const Nerve* mPauseMenuNerve; // 0x14 }; diff --git a/include/Game/Scene/GameSceneScenarioOpeningCameraState.hpp b/include/Game/Scene/GameSceneScenarioOpeningCameraState.hpp index 2a0495af2..1059d1438 100644 --- a/include/Game/Scene/GameSceneScenarioOpeningCameraState.hpp +++ b/include/Game/Scene/GameSceneScenarioOpeningCameraState.hpp @@ -17,6 +17,6 @@ public: void exePlay(); bool trySkipTrigger() const; - TPos3f mBaseMtx; // 0x08 - ScenarioTitle* mScenarioTitle; // 0x38 + TPos3f mBaseMtx; // 0x08 + ScenarioTitle* mScenarioTitle; // 0x38 }; diff --git a/include/Game/Scene/IntermissionScene.hpp b/include/Game/Scene/IntermissionScene.hpp index 122a3f2fa..7c5ee4afb 100644 --- a/include/Game/Scene/IntermissionScene.hpp +++ b/include/Game/Scene/IntermissionScene.hpp @@ -9,8 +9,8 @@ public: virtual void update(); virtual void draw() const; - void setCurrentSceneControllerState(const char *, ...); + void setCurrentSceneControllerState(const char*, ...); - char mState[0x40]; // 0x14 - u32 _54; + char mState[0x40]; // 0x14 + u32 _54; }; diff --git a/include/Game/Scene/LogoScene.hpp b/include/Game/Scene/LogoScene.hpp index 52eca862e..525de7456 100644 --- a/include/Game/Scene/LogoScene.hpp +++ b/include/Game/Scene/LogoScene.hpp @@ -37,7 +37,7 @@ public: bool tryFadeoutLayout(); private: - /* 0x14 */ IsbnManager* mIsbnManager; + /* 0x14 */ IsbnManager* mIsbnManager; /* 0x18 */ SimpleLayout* mStrapLayout; - /* 0x1C */ LogoFader* mLogoFader; + /* 0x1C */ LogoFader* mLogoFader; }; diff --git a/include/Game/Scene/MultiSceneActor.hpp b/include/Game/Scene/MultiSceneActor.hpp index 8e7d34456..c2c430229 100644 --- a/include/Game/Scene/MultiSceneActor.hpp +++ b/include/Game/Scene/MultiSceneActor.hpp @@ -11,9 +11,9 @@ class Spine; class MultiSceneActor : public NameObj { public: - MultiSceneActor(const char *, const char *, bool); + MultiSceneActor(const char*, const char*, bool); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); virtual void calcAnim(); virtual void calcViewAndEntry(); @@ -21,46 +21,46 @@ public: virtual void kill(); virtual void control(); - ModelManager* getModelManager() const; - EffectSystem* getEffectSystem() const; + ModelManager* getModelManager() const; + EffectSystem* getEffectSystem() const; MultiSceneEffectKeeper* getEffectKeeper() const; - void initEffect(EffectSystem *, int, const char *); - void setNerve(const Nerve *); - bool isNerve(const Nerve *) const; - void initNerve(const Nerve *); - s32 getNerveStep() const; + void initEffect(EffectSystem*, int, const char*); + void setNerve(const Nerve*); + bool isNerve(const Nerve*) const; + void initNerve(const Nerve*); + s32 getNerveStep() const; - /* 0x0C */ TVec3f mTranslation; - /* 0x18 */ TVec3f mRotation; - /* 0x24 */ TVec3f mScale; - /* 0x30 */ bool _30; - /* 0x34 */ ModelManager* mModelManager; - /* 0x38 */ EffectSystem* mEffectSystem; + /* 0x0C */ TVec3f mTranslation; + /* 0x18 */ TVec3f mRotation; + /* 0x24 */ TVec3f mScale; + /* 0x30 */ bool _30; + /* 0x34 */ ModelManager* mModelManager; + /* 0x38 */ EffectSystem* mEffectSystem; /* 0x3C */ MultiSceneEffectKeeper* mEffectKeeper; - /* 0x40 */ Spine* mSpine; + /* 0x40 */ Spine* mSpine; }; namespace MultiScene { - void startBck(MultiSceneActor *, const char *); - void startBtk(MultiSceneActor *, const char *); - void startBtp(MultiSceneActor *, const char *); - void startBva(MultiSceneActor *, const char *); - void setBtpFrameAndStop(MultiSceneActor *, f32); - void setBvaFrameAndStop(MultiSceneActor *, f32); - bool isBckStopped(MultiSceneActor *); - bool isStep(const MultiSceneActor *, s32); - bool isFirstStep(const MultiSceneActor *); - bool isGreaterStep(const MultiSceneActor *, s32); - bool isLessStep(const MultiSceneActor *, s32); - bool isLessEqualStep(const MultiSceneActor *, s32); - void setNerveAtStep(MultiSceneActor *, const Nerve *, s32); - void setNerveAtBckStopped(MultiSceneActor *, const Nerve *); - f32 calcNerveRate(const MultiSceneActor *, s32); - f32 calcNerveRate(const MultiSceneActor *, s32, s32); - f32 calcNerveEaseOutRate(const MultiSceneActor *, s32); - f32 calcNerveValue(const MultiSceneActor *, s32, f32, f32); - void emitEffect(const MultiSceneActor *, const char *); - void deleteEffectAll(const MultiSceneActor *); - void forceDeleteEffectAll(const MultiSceneActor *); - MtxPtr getJointMtx(const MultiSceneActor *, const char *); -}; + void startBck(MultiSceneActor*, const char*); + void startBtk(MultiSceneActor*, const char*); + void startBtp(MultiSceneActor*, const char*); + void startBva(MultiSceneActor*, const char*); + void setBtpFrameAndStop(MultiSceneActor*, f32); + void setBvaFrameAndStop(MultiSceneActor*, f32); + bool isBckStopped(MultiSceneActor*); + bool isStep(const MultiSceneActor*, s32); + bool isFirstStep(const MultiSceneActor*); + bool isGreaterStep(const MultiSceneActor*, s32); + bool isLessStep(const MultiSceneActor*, s32); + bool isLessEqualStep(const MultiSceneActor*, s32); + void setNerveAtStep(MultiSceneActor*, const Nerve*, s32); + void setNerveAtBckStopped(MultiSceneActor*, const Nerve*); + f32 calcNerveRate(const MultiSceneActor*, s32); + f32 calcNerveRate(const MultiSceneActor*, s32, s32); + f32 calcNerveEaseOutRate(const MultiSceneActor*, s32); + f32 calcNerveValue(const MultiSceneActor*, s32, f32, f32); + void emitEffect(const MultiSceneActor*, const char*); + void deleteEffectAll(const MultiSceneActor*); + void forceDeleteEffectAll(const MultiSceneActor*); + MtxPtr getJointMtx(const MultiSceneActor*, const char*); +}; // namespace MultiScene diff --git a/include/Game/Scene/MultiSceneEffectKeeper.hpp b/include/Game/Scene/MultiSceneEffectKeeper.hpp index 4606bd256..b6cd73c38 100644 --- a/include/Game/Scene/MultiSceneEffectKeeper.hpp +++ b/include/Game/Scene/MultiSceneEffectKeeper.hpp @@ -11,17 +11,17 @@ class MultiSceneEffectKeeper { public: MultiSceneEffectKeeper(const char*, ModelManager*, int, const char*); - void init(const MultiSceneActor*, const EffectSystem*); - void add(const char*, const TVec3f*, const TVec3f*, const TVec3f*, const char*); - void add(const char*, MtxPtr, const char*); + void init(const MultiSceneActor*, const EffectSystem*); + void add(const char*, const TVec3f*, const TVec3f*, const TVec3f*, const char*); + void add(const char*, MtxPtr, const char*); MultiEmitter* create(const char*, EffectSystem*); - void deleteAll(); - void forceDeleteAll(EffectSystem*); - void clear(); + void deleteAll(); + void forceDeleteAll(EffectSystem*); + void clear(); MultiEmitter* get(const char*) const; MultiEmitter* find(const char*) const; - void registerEmitter(MultiEmitter*, const char*); + void registerEmitter(MultiEmitter*, const char*); - /* 0x00 */ MR::Vector > mEmitter; - /* 0x0C */ const char* mResName; + /* 0x00 */ MR::Vector> mEmitter; + /* 0x0C */ const char* mResName; }; diff --git a/include/Game/Scene/PlacementInfoOrdered.hpp b/include/Game/Scene/PlacementInfoOrdered.hpp index 9b2da620f..bbd7d0884 100644 --- a/include/Game/Scene/PlacementInfoOrdered.hpp +++ b/include/Game/Scene/PlacementInfoOrdered.hpp @@ -2,7 +2,7 @@ #include "Game/Util.hpp" -typedef NameObj* (*CreationFuncPtr)(const char *); +typedef NameObj* (*CreationFuncPtr)(const char*); class PlacementInfoOrdered { public: @@ -11,9 +11,9 @@ public: Index(); ~Index(); - MR::BothDirPtrLink mLink; // 0x0 - u32 _10; - s32 _14; + MR::BothDirPtrLink mLink; // 0x0 + u32 _10; + s32 _14; }; class SameIdSet { @@ -21,41 +21,41 @@ public: SameIdSet(); ~SameIdSet(); - u32 _0; - s32 _4; - u32 _8; - MR::BothDirPtrList mList; // 0xC + u32 _0; + s32 _4; + u32 _8; + MR::BothDirPtrList mList; // 0xC }; class Identifier { public: - const char* mName; // 0x0 - s32 _4; - u32 _8; - u32 _C; + const char* mName; // 0x0 + s32 _4; + u32 _8; + u32 _C; JMapInfoIter mInfoIter; // 0x10 }; PlacementInfoOrdered(int); - void sort(); - void requestFileLoad(); - void initPlacement(); - void insert(const Identifier &, const JMapInfoIter &); - u32 getUsedArrayNum() const; - SameIdSet* find(const Identifier &) const; - SameIdSet* createSameIdSet(const Identifier &); - Index* createIndex(const JMapInfoIter &); + void sort(); + void requestFileLoad(); + void initPlacement(); + void insert(const Identifier&, const JMapInfoIter&); + u32 getUsedArrayNum() const; + SameIdSet* find(const Identifier&) const; + SameIdSet* createSameIdSet(const Identifier&); + Index* createIndex(const JMapInfoIter&); - void attach(const JMapInfo *, PlacementInfoOrdered *); + void attach(const JMapInfo*, PlacementInfoOrdered*); - Index* mIndexArray; // 0x0 - u32 _4; - SameIdSet* mSetArray; // 0x8 - Identifier** mIdentiferArray; // 0xC - int mCount; // 0x10 + Index* mIndexArray; // 0x0 + u32 _4; + SameIdSet* mSetArray; // 0x8 + Identifier** mIdentiferArray; // 0xC + int mCount; // 0x10 }; namespace { - CreationFuncPtr getCreator(const PlacementInfoOrdered::Identifier &); + CreationFuncPtr getCreator(const PlacementInfoOrdered::Identifier&); }; diff --git a/include/Game/Scene/PlacementStateChecker.hpp b/include/Game/Scene/PlacementStateChecker.hpp index 84887c7cf..cab88d1ec 100644 --- a/include/Game/Scene/PlacementStateChecker.hpp +++ b/include/Game/Scene/PlacementStateChecker.hpp @@ -4,11 +4,11 @@ class PlacementStateChecker : public NameObj { public: - PlacementStateChecker(const char *); + PlacementStateChecker(const char*); void setCurrentPlacementZoneId(int); void clearCurrentPlacementZoneId(); - int getCurrentPlacementZoneId() const; + int getCurrentPlacementZoneId() const; private: /* 0xC */ int mCurrentZoneId; diff --git a/include/Game/Scene/PlayTimerScene.hpp b/include/Game/Scene/PlayTimerScene.hpp index 4739c2111..0aae6238d 100644 --- a/include/Game/Scene/PlayTimerScene.hpp +++ b/include/Game/Scene/PlayTimerScene.hpp @@ -26,7 +26,7 @@ public: private: /* 0x14 */ TimeLimitLayout* mTimeLimitLayout; - /* 0x18 */ TimeUpLayout* mTimeUpLayout; - /* 0x1C */ u32 mTimeUpWaitFrame; - /* 0x20 */ ValueControl* _20; + /* 0x18 */ TimeUpLayout* mTimeUpLayout; + /* 0x1C */ u32 mTimeUpWaitFrame; + /* 0x20 */ ValueControl* _20; }; diff --git a/include/Game/Scene/ScenarioSelectScene.hpp b/include/Game/Scene/ScenarioSelectScene.hpp index fa1c1ff77..60b5ef3fc 100644 --- a/include/Game/Scene/ScenarioSelectScene.hpp +++ b/include/Game/Scene/ScenarioSelectScene.hpp @@ -42,18 +42,18 @@ public: void exeWaitResumeInitializeThreadIfRequestedReset(); void exeWaitResumeInitializeThreadIfCanceledSelect(); - u8 _14; - u8 _15; - u8 _16; - u8 _17; - ScenarioSelectLayout* mScenarioLayout; // 0x18 - CinemaFrame* mCinemaFrame; // 0x1C - J3DDrawBuffer* _20; - J3DDrawBuffer* _24; - u8 _28; - u8 _29; - u8 _2A; - u8 _2B; - EffectSystem* mEffectSystem; // 0x2C - CameraContext* mCameraContext; // 0x30 + u8 _14; + u8 _15; + u8 _16; + u8 _17; + ScenarioSelectLayout* mScenarioLayout; // 0x18 + CinemaFrame* mCinemaFrame; // 0x1C + J3DDrawBuffer* _20; + J3DDrawBuffer* _24; + u8 _28; + u8 _29; + u8 _2A; + u8 _2B; + EffectSystem* mEffectSystem; // 0x2C + CameraContext* mCameraContext; // 0x30 }; diff --git a/include/Game/Scene/Scene.hpp b/include/Game/Scene/Scene.hpp index b9ca7b74e..afb6880bf 100644 --- a/include/Game/Scene/Scene.hpp +++ b/include/Game/Scene/Scene.hpp @@ -6,7 +6,7 @@ class Scene : public NerveExecutor { public: - Scene(const char *); + Scene(const char*); virtual ~Scene(); virtual void init(); @@ -18,7 +18,7 @@ public: void initNameObjListExecutor(); void initSceneObjHolder(); - SceneNameObjListExecutor* mListExecutor; // 0x8 - u32 _C; - SceneObjHolder* mSceneObjHolder; // 0x10 + SceneNameObjListExecutor* mListExecutor; // 0x8 + u32 _C; + SceneObjHolder* mSceneObjHolder; // 0x10 }; \ No newline at end of file diff --git a/include/Game/Scene/SceneDataInitializer.hpp b/include/Game/Scene/SceneDataInitializer.hpp index d82aaa43f..d6ec9949d 100644 --- a/include/Game/Scene/SceneDataInitializer.hpp +++ b/include/Game/Scene/SceneDataInitializer.hpp @@ -18,6 +18,6 @@ public: void startActorPlacement(); void initAfterScenarioSelected(); - StageFileLoader* mFileLoader; // 0xC - StageDataHolder* mDataHolder; // 0x10 + StageFileLoader* mFileLoader; // 0xC + StageDataHolder* mDataHolder; // 0x10 }; \ No newline at end of file diff --git a/include/Game/Scene/SceneFactory.hpp b/include/Game/Scene/SceneFactory.hpp index a427aa125..b159e05b7 100644 --- a/include/Game/Scene/SceneFactory.hpp +++ b/include/Game/Scene/SceneFactory.hpp @@ -3,5 +3,5 @@ class Scene; namespace MR { - Scene* createScene(const char *); + Scene* createScene(const char*); }; diff --git a/include/Game/Scene/SceneFunction.hpp b/include/Game/Scene/SceneFunction.hpp index 7b6594d1c..5571f5051 100644 --- a/include/Game/Scene/SceneFunction.hpp +++ b/include/Game/Scene/SceneFunction.hpp @@ -202,7 +202,7 @@ namespace MR { DrawType_CameraCover = 0x51, DrawType_0x52 = 0x52, }; -}; // namespace MR +}; // namespace MR class Scene; diff --git a/include/Game/Scene/SceneNameObjListExecutor.hpp b/include/Game/Scene/SceneNameObjListExecutor.hpp index fdc089d36..edb884021 100644 --- a/include/Game/Scene/SceneNameObjListExecutor.hpp +++ b/include/Game/Scene/SceneNameObjListExecutor.hpp @@ -4,10 +4,8 @@ class SceneNameObjListExecutor : public NameObjListExecutor { public: - SceneNameObjListExecutor() : - NameObjListExecutor() - { - + SceneNameObjListExecutor() + : NameObjListExecutor() { } virtual void initMovementList(); diff --git a/include/Game/Scene/SceneNameObjMovementController.hpp b/include/Game/Scene/SceneNameObjMovementController.hpp index 630d72088..ed09c988b 100644 --- a/include/Game/Scene/SceneNameObjMovementController.hpp +++ b/include/Game/Scene/SceneNameObjMovementController.hpp @@ -29,7 +29,7 @@ public: private: /* 0x08 */ MR::MovementControlType _8; - /* 0x0C */ const NameObj* _C; + /* 0x0C */ const NameObj* _C; }; class SceneNameObjMovementController : public NameObj { @@ -45,11 +45,11 @@ public: void notifyRequestNameObjMovementOnOff(bool); private: - /* 0x0C */ bool _C; + /* 0x0C */ bool _C; /* 0x10 */ StopSceneStateControl* mStopSceneStateControl; }; namespace MR { SceneNameObjMovementController* getSceneNameObjMovementController(); - void notifyRequestNameObjMovementOnOff() NO_INLINE; -}; + void notifyRequestNameObjMovementOnOff() NO_INLINE; +}; // namespace MR diff --git a/include/Game/Scene/SceneObjHolder.hpp b/include/Game/Scene/SceneObjHolder.hpp index 119db733b..1510498ae 100644 --- a/include/Game/Scene/SceneObjHolder.hpp +++ b/include/Game/Scene/SceneObjHolder.hpp @@ -182,4 +182,4 @@ namespace MR { T* getSceneObj(int id) { return static_cast(getSceneObjHolder()->getObj(id)); } -}; +}; // namespace MR diff --git a/include/Game/Scene/ScenePlayingResult.hpp b/include/Game/Scene/ScenePlayingResult.hpp index 7a9ea0a0a..bd7345644 100644 --- a/include/Game/Scene/ScenePlayingResult.hpp +++ b/include/Game/Scene/ScenePlayingResult.hpp @@ -28,7 +28,7 @@ public: /// @brief Returns the number of Star Bits. /// @return The number of Star Bits. s32 getStarPieceNum() const; - + /// @brief The number of coins. /* 0x0C */ s32 mCoinNum; diff --git a/include/Game/Scene/StageDataHolder.hpp b/include/Game/Scene/StageDataHolder.hpp index bd37e2aa6..3200d2ea0 100644 --- a/include/Game/Scene/StageDataHolder.hpp +++ b/include/Game/Scene/StageDataHolder.hpp @@ -7,30 +7,30 @@ class StageDataHolder : public NameObj { public: - StageDataHolder(const char *, int, bool); + StageDataHolder(const char*, int, bool); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - void initAfterScenarioSelected(); - void requestFileLoadCommon(); - void requestFileLoadScenario(); - void initPlacement(); - JMapInfo getCommonPathPointInfo(const JMapInfo **, int) const; - JMapInfo getCommonPathPointInfoFromRailDataIndex(const JMapInfo **, int) const; - s32 getCommonPathInfoElementNum() const; - s32 getStartPosNum() const; - s32 getCurrentStartZoneId() const; - s32 getCurrentStartCameraId() const; - void getStartCameraIdInfoFromStartDataIndex(JMapIdInfo *, int) const; - s32 getGeneralPosNum() const; + void initAfterScenarioSelected(); + void requestFileLoadCommon(); + void requestFileLoadScenario(); + void initPlacement(); + JMapInfo getCommonPathPointInfo(const JMapInfo**, int) const; + JMapInfo getCommonPathPointInfoFromRailDataIndex(const JMapInfo**, int) const; + s32 getCommonPathInfoElementNum() const; + s32 getStartPosNum() const; + s32 getCurrentStartZoneId() const; + s32 getCurrentStartCameraId() const; + void getStartCameraIdInfoFromStartDataIndex(JMapIdInfo*, int) const; + s32 getGeneralPosNum() const; - const StageDataHolder* findPlacedStageDataHolder(const JMapInfoIter &) const; + const StageDataHolder* findPlacedStageDataHolder(const JMapInfoIter&) const; const StageDataHolder* getStageDataHolderFromZoneId(int) const; const StageDataHolder* getStageDataHolderFromZoneId(int); - bool isPlacedZone(int) const; - const char* getJapaneseObjectName(const char *) const; - void* getStageArchiveResource(const char *); - s32 getStageArchiveResourceSize(void *); + bool isPlacedZone(int) const; + const char* getJapaneseObjectName(const char*) const; + void* getStageArchiveResource(const char*); + s32 getStageArchiveResourceSize(void*); JMapInfoIter makeCurrentMarioJMapInfoIter() const; @@ -39,50 +39,50 @@ public: void initTableData(); void calcDataAddress(); - void updateDataAddress(const MR::AssignableArray *); + void updateDataAddress(const MR::AssignableArray*); void initPlacementInfoOrderedScenario(); void initPlacementInfoOrderedCommon(); - void createLocalStageDataHolder(const MR::AssignableArray &, bool); + void createLocalStageDataHolder(const MR::AssignableArray&, bool); - void initJmpInfo(MR::AssignableArray *, const char *); + void initJmpInfo(MR::AssignableArray*, const char*); - void initLayerJmpInfo(MR::AssignableArray *, const char *, const char *, u32); - void initAllLayerJmpInfo(MR::AssignableArray *, const char *, const char *); - void initAllLayerJmpInfo(MR::AssignableArray *, const char *); + void initLayerJmpInfo(MR::AssignableArray*, const char*, const char*, u32); + void initAllLayerJmpInfo(MR::AssignableArray*, const char*, const char*); + void initAllLayerJmpInfo(MR::AssignableArray*, const char*); - const JMapInfo* findJmpInfoFromArray(const MR::AssignableArray *, const char *) const; - JMapInfoIter getStartJMapInfoIterFromStartDataIndex(int) const; + const JMapInfo* findJmpInfoFromArray(const MR::AssignableArray*, const char*) const; + JMapInfoIter getStartJMapInfoIterFromStartDataIndex(int) const; - void calcPlacementMtx(const JMapInfoIter &); + void calcPlacementMtx(const JMapInfoIter&); - MR::AssignableArray mPlacementObjs; // 0xC - MR::AssignableArray mStartObjs; // 0x14 - MR::AssignableArray mGeneralPosObjs; // 0x1C - MR::AssignableArray mChildObjs; // 0x24 - MR::AssignableArray mListObjs; // 0x2C - MR::AssignableArray mPathObjs; // 0x34 - JMapInfo* mObjNameTbl; // 0x3C - s32 mStageDataHolderCount; // 0x40 - StageDataHolder* mStageDataArray[0x18]; // 0x44 - JKRArchive* mArchive; // 0xA4 - const char* _A8; - Mtx mPlacementMtx; // 0xAC - s32 mZoneID; // 0xDC - u8 _E0; - u8 _E1; - u8 _E2; - u8 _E3; - u32 _E4; - u32 _E8; + MR::AssignableArray mPlacementObjs; // 0xC + MR::AssignableArray mStartObjs; // 0x14 + MR::AssignableArray mGeneralPosObjs; // 0x1C + MR::AssignableArray mChildObjs; // 0x24 + MR::AssignableArray mListObjs; // 0x2C + MR::AssignableArray mPathObjs; // 0x34 + JMapInfo* mObjNameTbl; // 0x3C + s32 mStageDataHolderCount; // 0x40 + StageDataHolder* mStageDataArray[0x18]; // 0x44 + JKRArchive* mArchive; // 0xA4 + const char* _A8; + Mtx mPlacementMtx; // 0xAC + s32 mZoneID; // 0xDC + u8 _E0; + u8 _E1; + u8 _E2; + u8 _E3; + u32 _E4; + u32 _E8; MR::AssignableArray _EC; MR::AssignableArray _F4; - PlacementInfoOrdered* _FC; - PlacementInfoOrdered* _100; - PlacementInfoOrdered* _104; - PlacementInfoOrdered* _108; - PlacementInfoOrdered* _10C; + PlacementInfoOrdered* _FC; + PlacementInfoOrdered* _100; + PlacementInfoOrdered* _104; + PlacementInfoOrdered* _108; + PlacementInfoOrdered* _10C; }; namespace MR { diff --git a/include/Game/Scene/StageFileLoader.hpp b/include/Game/Scene/StageFileLoader.hpp index 6907665ad..53c23ddcb 100644 --- a/include/Game/Scene/StageFileLoader.hpp +++ b/include/Game/Scene/StageFileLoader.hpp @@ -4,14 +4,14 @@ class StageFileLoader { public: - StageFileLoader(const char *); + StageFileLoader(const char*); - void startLoadingStageFile(); - void waitLoadedStageFile(); - void makeStageArchiveNameList(); - static void makeStageArchiveName(char *, u32, const char *); - void mountFilesInStageMapFile(const char *); + void startLoadingStageFile(); + void waitLoadedStageFile(); + void makeStageArchiveNameList(); + static void makeStageArchiveName(char*, u32, const char*); + void mountFilesInStageMapFile(const char*); - char* mStageFiles[0x18]; // 0x0 - s32 mZoneCount; // 0x60 + char* mStageFiles[0x18]; // 0x0 + s32 mZoneCount; // 0x60 }; \ No newline at end of file diff --git a/include/Game/Scene/StageResourceLoader.hpp b/include/Game/Scene/StageResourceLoader.hpp index c6a068a97..9928cfddf 100644 --- a/include/Game/Scene/StageResourceLoader.hpp +++ b/include/Game/Scene/StageResourceLoader.hpp @@ -3,4 +3,4 @@ namespace MR { bool tryRequestLoadStageResource(); bool isLoadStageScenarioResource(); -}; \ No newline at end of file +}; // namespace MR \ No newline at end of file diff --git a/include/Game/Scene/StopSceneController.hpp b/include/Game/Scene/StopSceneController.hpp index 65a5be4e8..8884fe887 100644 --- a/include/Game/Scene/StopSceneController.hpp +++ b/include/Game/Scene/StopSceneController.hpp @@ -25,6 +25,6 @@ public: void requestStopSceneDelay(s32, s32); bool isSceneStopped() const; - NameObjGroup* mDelayRequests; // 0xC - s32 _10; + NameObjGroup* mDelayRequests; // 0xC + s32 _10; }; \ No newline at end of file diff --git a/include/Game/Screen/BackButton.hpp b/include/Game/Screen/BackButton.hpp index 48b58358a..6ba6b0f4e 100644 --- a/include/Game/Screen/BackButton.hpp +++ b/include/Game/Screen/BackButton.hpp @@ -20,6 +20,6 @@ public: bool isPointing() const; /* 0x20 */ ButtonPaneController* mPaneCtrl; - /* 0x24 */ bool _24; - /* 0x24 */ bool _25; + /* 0x24 */ bool _24; + /* 0x24 */ bool _25; }; diff --git a/include/Game/Screen/BloomEffect.hpp b/include/Game/Screen/BloomEffect.hpp index 38cb5336e..b5204182d 100644 --- a/include/Game/Screen/BloomEffect.hpp +++ b/include/Game/Screen/BloomEffect.hpp @@ -29,10 +29,10 @@ public: void drawBlur(s32, s32, MtxPtr, u32, u32) const; private: - /* 0x14 */ s8 _14; - /* 0x18 */ f32 _18; - /* 0x1C */ f32 _1C; - /* 0x20 */ u8 _20; + /* 0x14 */ s8 _14; + /* 0x18 */ f32 _18; + /* 0x1C */ f32 _1C; + /* 0x20 */ u8 _20; /* 0x24 */ JUTTexture* _24; /* 0x28 */ JUTTexture* _28; /* 0x2C */ JUTTexture* _2C; @@ -42,6 +42,6 @@ private: /* 0x3C */ JUTTexture* _3C; /* 0x40 */ JUTTexture* _40; /* 0x44 */ JUTTexture* _44; - /* 0x48 */ void* _48; - /* 0x4C */ void* _4C; + /* 0x48 */ void* _48; + /* 0x4C */ void* _4C; }; diff --git a/include/Game/Screen/BloomEffectSimple.hpp b/include/Game/Screen/BloomEffectSimple.hpp index f6a3c8ad6..02da8998d 100644 --- a/include/Game/Screen/BloomEffectSimple.hpp +++ b/include/Game/Screen/BloomEffectSimple.hpp @@ -20,7 +20,7 @@ private: /* 0x24 */ JUTTexture* _24; /* 0x28 */ JUTTexture* _28; /* 0x2C */ JUTTexture* _2C; - /* 0x30 */ s32 _30; - /* 0x34 */ u8 _34; - /* 0x38 */ f32 _38; + /* 0x30 */ s32 _30; + /* 0x34 */ u8 _34; + /* 0x38 */ f32 _38; }; diff --git a/include/Game/Screen/BombTimerLayout.hpp b/include/Game/Screen/BombTimerLayout.hpp index ed63a23da..e7e41d808 100644 --- a/include/Game/Screen/BombTimerLayout.hpp +++ b/include/Game/Screen/BombTimerLayout.hpp @@ -15,7 +15,7 @@ public: bool isReadyToTimeUp() const; void addFrame(); bool update(); - u32 getRestTime() const; + u32 getRestTime() const; void updateTextBox(); void exeAppear(); void exeWait(); @@ -23,8 +23,8 @@ public: void exeEnd(); private: - /* 0x20 */ u32 mTimeLimit; - /* 0x24 */ u32 mDangerTransFrame; - /* 0x28 */ u32 mFrame; + /* 0x20 */ u32 mTimeLimit; + /* 0x24 */ u32 mDangerTransFrame; + /* 0x28 */ u32 mFrame; /* 0x2C */ bool mIsSuspend; }; diff --git a/include/Game/Screen/BrosButton.hpp b/include/Game/Screen/BrosButton.hpp index a458429de..b7ef7ef66 100644 --- a/include/Game/Screen/BrosButton.hpp +++ b/include/Game/Screen/BrosButton.hpp @@ -23,6 +23,6 @@ public: void exeDisappear(); private: - /* 0x20 */ bool mIsSelectedMario; + /* 0x20 */ bool mIsSelectedMario; /* 0x24 */ ButtonPaneController* mPaneCtrl; }; diff --git a/include/Game/Screen/ButtonPaneController.hpp b/include/Game/Screen/ButtonPaneController.hpp index a432881e1..cb150051c 100644 --- a/include/Game/Screen/ButtonPaneController.hpp +++ b/include/Game/Screen/ButtonPaneController.hpp @@ -36,7 +36,7 @@ public: bool isPointingPane() const; bool tryPointing(bool); bool tryNotPointing(bool); - f32 calcPointingAnimStartFrame() const; + f32 calcPointingAnimStartFrame() const; void exeHidden(); void exeAppear(); void exeWait(); @@ -48,20 +48,20 @@ public: void exeDisappear(); /* 0x08 */ LayoutActor* mHost; - /* 0x0C */ const char* mPaneName; - /* 0x10 */ const char* mBoundingPaneName; - /* 0x14 */ u32 mAnimIndex; - /* 0x18 */ bool _18; - /* 0x1C */ f32 mPointingAnimStartFrame; - /* 0x20 */ bool mIsSelected; - /* 0x21 */ bool mIsPointing; - /* 0x22 */ bool _22; - /* 0x23 */ bool _23; - /* 0x24 */ bool _24; - /* 0x28 */ const char* mAppearAnimName; - /* 0x2C */ const char* mWaitAnimName; - /* 0x30 */ const char* mDecideAnimName; - /* 0x34 */ const char* mPointingAnimName; - /* 0x38 */ const char* mNotPointingAnimName; - /* 0x3C */ const char* mDisappearAnimName; + /* 0x0C */ const char* mPaneName; + /* 0x10 */ const char* mBoundingPaneName; + /* 0x14 */ u32 mAnimIndex; + /* 0x18 */ bool _18; + /* 0x1C */ f32 mPointingAnimStartFrame; + /* 0x20 */ bool mIsSelected; + /* 0x21 */ bool mIsPointing; + /* 0x22 */ bool _22; + /* 0x23 */ bool _23; + /* 0x24 */ bool _24; + /* 0x28 */ const char* mAppearAnimName; + /* 0x2C */ const char* mWaitAnimName; + /* 0x30 */ const char* mDecideAnimName; + /* 0x34 */ const char* mPointingAnimName; + /* 0x38 */ const char* mNotPointingAnimName; + /* 0x3C */ const char* mDisappearAnimName; }; diff --git a/include/Game/Screen/CameraInfo.hpp b/include/Game/Screen/CameraInfo.hpp index bc4d87768..575cadfd3 100644 --- a/include/Game/Screen/CameraInfo.hpp +++ b/include/Game/Screen/CameraInfo.hpp @@ -29,7 +29,7 @@ public: bool tryChangeCameraStateNerve(); private: - /* 0x20 */ s32 mStep; + /* 0x20 */ s32 mStep; /* 0x24 */ bool mIsActive; /* 0x25 */ bool _25; }; diff --git a/include/Game/Screen/CaptureScreenDirector.hpp b/include/Game/Screen/CaptureScreenDirector.hpp index 10fde7328..42af24a99 100644 --- a/include/Game/Screen/CaptureScreenDirector.hpp +++ b/include/Game/Screen/CaptureScreenDirector.hpp @@ -7,9 +7,9 @@ class ResTIMG; struct TimingInfo { /* 0x0 */ const char* mName; - /* 0x0 */ s32 mTiming; - /* 0x0 */ bool _8; - /* 0x0 */ u32 _C; + /* 0x0 */ s32 mTiming; + /* 0x0 */ bool _8; + /* 0x0 */ u32 _C; }; class CaptureScreenDirector : public NameObj { @@ -17,12 +17,12 @@ public: /// @brief Creates a new `CaptureScreenDirector`. CaptureScreenDirector(); - void captureIfAllow(const char* pName); - void capture(); - void requestCaptureTiming(const char* pName); - void invalidateCaptureTiming(const char* pName); - ResTIMG* getResTIMG() const; - u8* getTexImage() const; + void captureIfAllow(const char* pName); + void capture(); + void requestCaptureTiming(const char* pName); + void invalidateCaptureTiming(const char* pName); + ResTIMG* getResTIMG() const; + u8* getTexImage() const; const TimingInfo* getUsingTiming() const; const TimingInfo* getCurrentTiming() const; const TimingInfo* findFromName(const char* pName) const; @@ -31,7 +31,7 @@ private: /* 0x0C */ const char* _C; /* 0x10 */ const char* mTimingType; /* 0x14 */ JUTTexture* mTexture; - /* 0x18 */ bool _18; + /* 0x18 */ bool _18; }; class CaptureScreenActor : public NameObj { diff --git a/include/Game/Screen/CenterScreenBlur.hpp b/include/Game/Screen/CenterScreenBlur.hpp index c3161cc00..c66afcaa2 100644 --- a/include/Game/Screen/CenterScreenBlur.hpp +++ b/include/Game/Screen/CenterScreenBlur.hpp @@ -26,6 +26,6 @@ public: s32 _90; s32 _94; f32 _98; - u8 _9C; + u8 _9C; f32 _A0; }; diff --git a/include/Game/Screen/CoinCounter.hpp b/include/Game/Screen/CoinCounter.hpp index 4b8972671..20668c9c5 100644 --- a/include/Game/Screen/CoinCounter.hpp +++ b/include/Game/Screen/CoinCounter.hpp @@ -25,11 +25,11 @@ public: void exeDisappear(); private: - /* 0x20 */ s32 mCoinNum; - /* 0x24 */ s32 mCoinDisplayNum; - /* 0x28 */ s32 mInvalidCountUpFrame; + /* 0x20 */ s32 mCoinNum; + /* 0x24 */ s32 mCoinDisplayNum; + /* 0x28 */ s32 mInvalidCountUpFrame; /* 0x2C */ CounterLayoutAppearer* mLayoutAppearer; - /* 0x30 */ CountUpPaneRumbler* mPaneRumbler; - /* 0x34 */ bool mIsForceAppear; - /* 0x38 */ TVec2f mFollowPos; + /* 0x30 */ CountUpPaneRumbler* mPaneRumbler; + /* 0x34 */ bool mIsForceAppear; + /* 0x38 */ TVec2f mFollowPos; }; diff --git a/include/Game/Screen/CometRetryButton.hpp b/include/Game/Screen/CometRetryButton.hpp index 773eadd2b..a61878e9a 100644 --- a/include/Game/Screen/CometRetryButton.hpp +++ b/include/Game/Screen/CometRetryButton.hpp @@ -25,5 +25,5 @@ public: private: /* 0x20 */ ButtonPaneController* mButtonYesPaneCtrl; /* 0x24 */ ButtonPaneController* mButtonNoPaneCtrl; - /* 0x28 */ PlayerMissLeft* mPlayerMissLeft; + /* 0x28 */ PlayerMissLeft* mPlayerMissLeft; }; diff --git a/include/Game/Screen/CopyFilterNegater.hpp b/include/Game/Screen/CopyFilterNegater.hpp index e0f14ef6c..562284965 100644 --- a/include/Game/Screen/CopyFilterNegater.hpp +++ b/include/Game/Screen/CopyFilterNegater.hpp @@ -7,5 +7,5 @@ public: CopyFilterNegater(); ~CopyFilterNegater(); - GXRenderModeObj* mRenderObj; // 0x0 + GXRenderModeObj* mRenderObj; // 0x0 }; \ No newline at end of file diff --git a/include/Game/Screen/CountUpPaneRumbler.hpp b/include/Game/Screen/CountUpPaneRumbler.hpp index ba79b691c..28a8f0eef 100644 --- a/include/Game/Screen/CountUpPaneRumbler.hpp +++ b/include/Game/Screen/CountUpPaneRumbler.hpp @@ -16,9 +16,9 @@ public: void start(); void reset(); bool isRumbling() const; - void connectPane(LayoutActor *, const char *); + void connectPane(LayoutActor*, const char*); private: /* 0x0 */ RumbleCalculatorCosMultLinear* mRumbleCalculator; - /* 0x4 */ TVec2f mPosition; + /* 0x4 */ TVec2f mPosition; }; diff --git a/include/Game/Screen/CounterLayoutAppearer.hpp b/include/Game/Screen/CounterLayoutAppearer.hpp index f4d30e934..aa28dcee0 100644 --- a/include/Game/Screen/CounterLayoutAppearer.hpp +++ b/include/Game/Screen/CounterLayoutAppearer.hpp @@ -7,7 +7,7 @@ class LayoutActor; class CounterLayoutAppearer : public NerveExecutor { public: - CounterLayoutAppearer(LayoutActor *, const TVec2f&); + CounterLayoutAppearer(LayoutActor*, const TVec2f&); void update(); void appear(const TVec2f&); @@ -24,7 +24,7 @@ public: private: /* 0x08 */ LayoutActor* mLayout; - /* 0x0C */ TVec2f _C; - /* 0x14 */ TVec2f mFollowPos; - /* 0x1C */ TVec2f _1C; + /* 0x0C */ TVec2f _C; + /* 0x14 */ TVec2f mFollowPos; + /* 0x1C */ TVec2f _1C; }; diff --git a/include/Game/Screen/CounterLayoutController.hpp b/include/Game/Screen/CounterLayoutController.hpp index 8f27929cd..841ddc37f 100644 --- a/include/Game/Screen/CounterLayoutController.hpp +++ b/include/Game/Screen/CounterLayoutController.hpp @@ -18,26 +18,26 @@ public: virtual void kill(); virtual void control(); - void forceAppear(); - void setHPMeter(MarioMeter*); - void requestedTicoEat(bool); + void forceAppear(); + void setHPMeter(MarioMeter*); + void requestedTicoEat(bool); static bool isInvalidSystemStateShowCounter(); static bool isWaitToDisappearCounter(const LayoutActor*); - void showAllLayout(); - void hideAllLayout(); - bool isHiddenOrWaitAllLayout() const; - bool isPlayerMoving() const; - void appearAllCounterWithoutStar(); - void killAllCoounter(); - bool tryEndTicoEatStarPiece(); - void exePlayerMoving(); - void exePlayerNotMoving(); + void showAllLayout(); + void hideAllLayout(); + bool isHiddenOrWaitAllLayout() const; + bool isPlayerMoving() const; + void appearAllCounterWithoutStar(); + void killAllCoounter(); + bool tryEndTicoEatStarPiece(); + void exePlayerMoving(); + void exePlayerNotMoving(); - /* 0x20 */ s32 mPlayerNotMovingFrame; - /* 0x24 */ bool _24; - /* 0x28 */ CoinCounter* mCoinCounter; + /* 0x20 */ s32 mPlayerNotMovingFrame; + /* 0x24 */ bool _24; + /* 0x28 */ CoinCounter* mCoinCounter; /* 0x2C */ StarPieceCounter* mStarPieceCounter; - /* 0x30 */ PlayerLeft* mPlayerLeft; - /* 0x34 */ StarCounter* mStarCounter; - /* 0x38 */ MarioMeter* mHPMeter; + /* 0x30 */ PlayerLeft* mPlayerLeft; + /* 0x34 */ StarCounter* mStarCounter; + /* 0x38 */ MarioMeter* mHPMeter; }; diff --git a/include/Game/Screen/CustomTagProcessor.hpp b/include/Game/Screen/CustomTagProcessor.hpp index b504167ca..3f2fac345 100644 --- a/include/Game/Screen/CustomTagProcessor.hpp +++ b/include/Game/Screen/CustomTagProcessor.hpp @@ -15,9 +15,8 @@ namespace { return ret; } -}; +}; // namespace class CustomTagProcessor : public MessageTagSkipTagProcessor { public: - }; \ No newline at end of file diff --git a/include/Game/Screen/DepthOfFieldBlur.hpp b/include/Game/Screen/DepthOfFieldBlur.hpp index dedeb55fa..4d6076aa1 100644 --- a/include/Game/Screen/DepthOfFieldBlur.hpp +++ b/include/Game/Screen/DepthOfFieldBlur.hpp @@ -24,7 +24,7 @@ private: /* 0x20 */ JUTTexture* _20; /* 0x24 */ JUTTexture* _24; /* 0x28 */ JUTTexture* _28; - /* 0x2C */ f32 _2C; - /* 0x30 */ s32 _30; - /* 0x34 */ s32 _34; + /* 0x2C */ f32 _2C; + /* 0x30 */ s32 _30; + /* 0x34 */ s32 _34; }; diff --git a/include/Game/Screen/ErrorMessageWindow.hpp b/include/Game/Screen/ErrorMessageWindow.hpp index 64b6fa3a1..2fbd006c5 100644 --- a/include/Game/Screen/ErrorMessageWindow.hpp +++ b/include/Game/Screen/ErrorMessageWindow.hpp @@ -6,7 +6,7 @@ namespace nw4r { namespace lyt { class TexMap; }; -}; +}; // namespace nw4r class ErrorMessageWindow : public LayoutActor { public: @@ -31,7 +31,7 @@ public: void exeDisappearBeforeAppear(); private: - /* 0x20 */ MessageType mMessageType; - /* 0x24 */ const char* mMessageId; + /* 0x20 */ MessageType mMessageType; + /* 0x24 */ const char* mMessageId; /* 0x28 */ const nw4r::lyt::TexMap* mTexture; }; diff --git a/include/Game/Screen/FileSelectButton.hpp b/include/Game/Screen/FileSelectButton.hpp index bc4e077e0..8f36fbfa7 100644 --- a/include/Game/Screen/FileSelectButton.hpp +++ b/include/Game/Screen/FileSelectButton.hpp @@ -37,6 +37,6 @@ public: private: /* 0x20 */ ButtonPaneController* mButtonCtrl[5]; - /* 0x34 */ MR::FunctorBase* mCallbackFunctor[5]; + /* 0x34 */ MR::FunctorBase* mCallbackFunctor[5]; /* 0x48 */ GalaxyMapGalaxyPlain* _48; }; diff --git a/include/Game/Screen/FileSelectInfo.hpp b/include/Game/Screen/FileSelectInfo.hpp index c02e1ef98..8cc26c60d 100644 --- a/include/Game/Screen/FileSelectInfo.hpp +++ b/include/Game/Screen/FileSelectInfo.hpp @@ -6,7 +6,7 @@ namespace FileSelectInfoSub { class SlideState; class CharaState; -}; +}; // namespace FileSelectInfoSub class FileSelectInfo : public LayoutActor { public: @@ -31,18 +31,18 @@ public: void reflectInfo(); private: - /* 0x20 */ s32 mNumber; - /* 0x24 */ s32 mStarNum; - /* 0x28 */ s32 mStarPieceNum; - /* 0x2C */ s32 mNameBufferSize; - /* 0x30 */ wchar_t* mName; - /* 0x34 */ wchar_t mDateMessage[32]; - /* 0x74 */ wchar_t mTimeMessage[32]; - /* 0xB4 */ s32 mMissNum; - /* 0xB8 */ bool mIsSelectedMarioPrev; - /* 0xB9 */ bool mIsSelectedMario; - /* 0xBA */ bool mIsViewNormalEnding; - /* 0xBB */ bool mIsViewCompleteEnding; + /* 0x20 */ s32 mNumber; + /* 0x24 */ s32 mStarNum; + /* 0x28 */ s32 mStarPieceNum; + /* 0x2C */ s32 mNameBufferSize; + /* 0x30 */ wchar_t* mName; + /* 0x34 */ wchar_t mDateMessage[32]; + /* 0x74 */ wchar_t mTimeMessage[32]; + /* 0xB4 */ s32 mMissNum; + /* 0xB8 */ bool mIsSelectedMarioPrev; + /* 0xB9 */ bool mIsSelectedMario; + /* 0xBA */ bool mIsViewNormalEnding; + /* 0xBB */ bool mIsViewCompleteEnding; /* 0xBC */ FileSelectInfoSub::SlideState* mSlideState; /* 0xC0 */ FileSelectInfoSub::CharaState* mCharaState; }; @@ -77,4 +77,4 @@ namespace FileSelectInfoSub { private: /* 0x8 */ FileSelectInfo* mHost; }; -}; +}; // namespace FileSelectInfoSub diff --git a/include/Game/Screen/FileSelectNumber.hpp b/include/Game/Screen/FileSelectNumber.hpp index 223e7ea69..9ce8a7798 100644 --- a/include/Game/Screen/FileSelectNumber.hpp +++ b/include/Game/Screen/FileSelectNumber.hpp @@ -20,9 +20,9 @@ namespace FileSelectNumberSub { private: /* 0x8 */ LayoutActor* mHost; - /* 0xC */ Nerve* _C; + /* 0xC */ Nerve* _C; }; -}; +}; // namespace FileSelectNumberSub class FileSelectNumber : public LayoutActor { public: @@ -43,7 +43,7 @@ public: void exeEnd(); private: - /* 0x20 */ s32 mNumber; - /* 0x24 */ u8 _24[8]; + /* 0x20 */ s32 mNumber; + /* 0x24 */ u8 _24[8]; /* 0x2C */ FileSelectNumberSub::SelectAnimController* mSelectAnimCtrl; }; diff --git a/include/Game/Screen/FullnessMeter.hpp b/include/Game/Screen/FullnessMeter.hpp index b54033a51..3651ed3c5 100644 --- a/include/Game/Screen/FullnessMeter.hpp +++ b/include/Game/Screen/FullnessMeter.hpp @@ -7,11 +7,11 @@ class SimpleLayout; class FullnessMeter : public LayoutActor { public: - FullnessMeter(LiveActor *, s32, s32); + FullnessMeter(LiveActor*, s32, s32); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - + void setNumber(s32); void requestAppear(); void requestDisappear(); @@ -20,8 +20,8 @@ public: void exeWait(); void exeEnd(); - /* 0x20 */ s32 _20; - /* 0x24 */ s32 _24; - /* 0x28 */ LiveActor* mHost; + /* 0x20 */ s32 _20; + /* 0x24 */ s32 _24; + /* 0x28 */ LiveActor* mHost; /* 0x2C */ SimpleLayout* mTargetCounter; }; diff --git a/include/Game/Screen/GalaxyConfirmLayout.hpp b/include/Game/Screen/GalaxyConfirmLayout.hpp index 1923661f7..1682867db 100644 --- a/include/Game/Screen/GalaxyConfirmLayout.hpp +++ b/include/Game/Screen/GalaxyConfirmLayout.hpp @@ -23,5 +23,5 @@ public: private: /* 0x20 */ ButtonPaneController* mPaneCtrl; - /* 0x24 */ BackButton* mBackButton; + /* 0x24 */ BackButton* mBackButton; }; diff --git a/include/Game/Screen/GalaxyMapCometIcon.hpp b/include/Game/Screen/GalaxyMapCometIcon.hpp index c81df9959..7fedeb3cf 100644 --- a/include/Game/Screen/GalaxyMapCometIcon.hpp +++ b/include/Game/Screen/GalaxyMapCometIcon.hpp @@ -6,7 +6,7 @@ namespace nw4r { namespace lyt { class DrawInfo; }; -}; +}; // namespace nw4r class GalaxyMapCometIcon : public LayoutActor { public: @@ -22,7 +22,7 @@ public: void syncStatus(); private: - /* 0x20 */ const char* _20; + /* 0x20 */ const char* _20; /* 0x24 */ LayoutActor* _24; - /* 0x28 */ const char* _28; + /* 0x28 */ const char* _28; }; diff --git a/include/Game/Screen/GalaxyMapController.hpp b/include/Game/Screen/GalaxyMapController.hpp index a30e2c9ca..6fea6fe2c 100644 --- a/include/Game/Screen/GalaxyMapController.hpp +++ b/include/Game/Screen/GalaxyMapController.hpp @@ -3,13 +3,13 @@ class ResTIMG; namespace MR { - void startGalaxyMapLayout(); - void startAstroMapLayout(); - void startAstroMapLayoutForNewGalaxyDiscover(); - void startAstroMapLayoutForNewTicoGalaxyDiscover(); - void startAstroMapLayoutForNewDomeDiscover(); - void startGalaxyMapLayoutForTicoComet(); - void startAstroMapLayoutForChallengeGalaxyDiscover(); - bool isActiveGalaxyMapLayout(); + void startGalaxyMapLayout(); + void startAstroMapLayout(); + void startAstroMapLayoutForNewGalaxyDiscover(); + void startAstroMapLayoutForNewTicoGalaxyDiscover(); + void startAstroMapLayoutForNewDomeDiscover(); + void startGalaxyMapLayoutForTicoComet(); + void startAstroMapLayoutForChallengeGalaxyDiscover(); + bool isActiveGalaxyMapLayout(); const ResTIMG* getGalaxyMapResTIMG(); -}; +}; // namespace MR diff --git a/include/Game/Screen/GalaxyMapDomeIcon.hpp b/include/Game/Screen/GalaxyMapDomeIcon.hpp index feee0352c..05539ca85 100644 --- a/include/Game/Screen/GalaxyMapDomeIcon.hpp +++ b/include/Game/Screen/GalaxyMapDomeIcon.hpp @@ -6,7 +6,7 @@ namespace nw4r { namespace lyt { class DrawInfo; }; -}; +}; // namespace nw4r class GalaxyNamePlate; @@ -25,15 +25,15 @@ public: void calcAnimForCapture(const nw4r::lyt::DrawInfo&); void setModeNormal(); void setModeNewDomeDiscover(); - s32 calcDomeStatus() const; + s32 calcDomeStatus() const; bool isComplete() const; void syncStatus(); bool hasNewGalaxy() const; - /* 0x20 */ int _20; - /* 0x24 */ LayoutActor* mHost; - /* 0x28 */ const char* mPaneName; - /* 0x2C */ const char* _2C; + /* 0x20 */ int _20; + /* 0x24 */ LayoutActor* mHost; + /* 0x28 */ const char* mPaneName; + /* 0x2C */ const char* _2C; /* 0x30 */ GalaxyNamePlate* mNamePlate; - /* 0x34 */ u8 mMode; + /* 0x34 */ u8 mMode; }; diff --git a/include/Game/Screen/GalaxyMapGalaxyPlain.hpp b/include/Game/Screen/GalaxyMapGalaxyPlain.hpp index b59acf09e..ca5793272 100644 --- a/include/Game/Screen/GalaxyMapGalaxyPlain.hpp +++ b/include/Game/Screen/GalaxyMapGalaxyPlain.hpp @@ -24,8 +24,8 @@ public: private: /* 0x20 */ const LayoutActor* mHost; - /* 0x24 */ const char* mPaneName; - /* 0x28 */ GalaxyNamePlate* mNamePlate; - /* 0x2C */ wchar_t* mGalaxyName; - /* 0x30 */ bool _30; + /* 0x24 */ const char* mPaneName; + /* 0x28 */ GalaxyNamePlate* mNamePlate; + /* 0x2C */ wchar_t* mGalaxyName; + /* 0x30 */ bool _30; }; diff --git a/include/Game/Screen/GalaxyMapMarioIcon.hpp b/include/Game/Screen/GalaxyMapMarioIcon.hpp index 04fc301fe..22140ed65 100644 --- a/include/Game/Screen/GalaxyMapMarioIcon.hpp +++ b/include/Game/Screen/GalaxyMapMarioIcon.hpp @@ -13,5 +13,5 @@ public: private: /* 0x20 */ LayoutActor* _20; - /* 0x24 */ const char* _24; + /* 0x24 */ const char* _24; }; diff --git a/include/Game/Screen/GalaxyMapSelectButton.hpp b/include/Game/Screen/GalaxyMapSelectButton.hpp index 1b6352c56..c0fdd78c4 100644 --- a/include/Game/Screen/GalaxyMapSelectButton.hpp +++ b/include/Game/Screen/GalaxyMapSelectButton.hpp @@ -28,6 +28,6 @@ public: void exeBetweenMapToListFadein(); private: - /* 0x20 */ Nerve* _20; + /* 0x20 */ Nerve* _20; /* 0x24 */ ButtonPaneController* mPaneCtrl; }; diff --git a/include/Game/Screen/GalaxyMapTicoIcon.hpp b/include/Game/Screen/GalaxyMapTicoIcon.hpp index 08b06fa93..9e2634f18 100644 --- a/include/Game/Screen/GalaxyMapTicoIcon.hpp +++ b/include/Game/Screen/GalaxyMapTicoIcon.hpp @@ -16,9 +16,9 @@ public: bool isModeDiscoverAndIsAppear() const; private: - /* 0x20 */ int mExclamationGalaxyIndex; - /* 0x24 */ const char* mGalaxyName; + /* 0x20 */ int mExclamationGalaxyIndex; + /* 0x24 */ const char* mGalaxyName; /* 0x28 */ LayoutActor* mHost; - /* 0x2C */ char* mPaneName; - /* 0x30 */ u8 mMode; + /* 0x2C */ char* mPaneName; + /* 0x30 */ u8 mMode; }; diff --git a/include/Game/Screen/GalaxyNamePlate.hpp b/include/Game/Screen/GalaxyNamePlate.hpp index 6e13c31bf..1427610e0 100644 --- a/include/Game/Screen/GalaxyNamePlate.hpp +++ b/include/Game/Screen/GalaxyNamePlate.hpp @@ -6,29 +6,29 @@ class GalaxyNamePlateDrawerEntry; class GalaxyNamePlate : public LayoutActor { public: - GalaxyNamePlate(const char *, bool); + GalaxyNamePlate(const char*, bool); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void kill(); virtual void control(); void showUnknown(bool); void showNew(bool); void showOpen(bool); - void show(const wchar_t *, bool); - void setPos3D(const TVec3f &); + void show(const wchar_t*, bool); + void setPos3D(const TVec3f&); void setShowBalloonNozzle(bool); - void show(const wchar_t *, s32, bool, bool); + void show(const wchar_t*, s32, bool, bool); void exeAppearReady(); void exeAppear(); void exeWait(); - /* 0x20 */ const char* mGalaxyName; - /* 0x24 */ bool _24; - /* 0x25 */ bool _25; - /* 0x26 */ bool mShowBalloonNozzle; + /* 0x20 */ const char* mGalaxyName; + /* 0x24 */ bool _24; + /* 0x25 */ bool _25; + /* 0x26 */ bool mShowBalloonNozzle; /* 0x28 */ GalaxyNamePlateDrawerEntry* mDrawerEntry; - /* 0x2C */ s32 _2C; - /* 0x30 */ bool _30; + /* 0x2C */ s32 _2C; + /* 0x30 */ bool _30; }; diff --git a/include/Game/Screen/GalaxyNamePlateDrawer.hpp b/include/Game/Screen/GalaxyNamePlateDrawer.hpp index a2b6411ec..7c8385e60 100644 --- a/include/Game/Screen/GalaxyNamePlateDrawer.hpp +++ b/include/Game/Screen/GalaxyNamePlateDrawer.hpp @@ -5,7 +5,7 @@ struct GalaxyNamePlateDrawerEntry { /* 0x0 */ LayoutActor* mHostActor; - /* 0x4 */ u32 mZ; + /* 0x4 */ u32 mZ; }; class GalaxyNamePlateDrawer : public NameObj { @@ -19,7 +19,7 @@ public: GalaxyNamePlateDrawerEntry* registerPlate(const LayoutActor*); private: - /* 0xC */ MR::Vector > mPlateArray; + /* 0xC */ MR::Vector> mPlateArray; }; namespace MR { diff --git a/include/Game/Screen/GalaxySelectInfo.hpp b/include/Game/Screen/GalaxySelectInfo.hpp index 592d6dc44..1c75333cc 100644 --- a/include/Game/Screen/GalaxySelectInfo.hpp +++ b/include/Game/Screen/GalaxySelectInfo.hpp @@ -6,19 +6,19 @@ #include "revolution/types.h" class GalaxySelectInfo : public LayoutActor { - public: - GalaxySelectInfo(bool); - ~GalaxySelectInfo(); - virtual void init(const JMapInfoIter&); - virtual void draw() const; - virtual void appear(); - virtual void kill(); - - void show(const char*, u32, s32); - void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&); - void control(); - void show(const char*, u32, bool, s32); - void exeWait(); - void exeDisappear(); - // ... +public: + GalaxySelectInfo(bool); + ~GalaxySelectInfo(); + virtual void init(const JMapInfoIter&); + virtual void draw() const; + virtual void appear(); + virtual void kill(); + + void show(const char*, u32, s32); + void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&); + void control(); + void show(const char*, u32, bool, s32); + void exeWait(); + void exeDisappear(); + // ... }; diff --git a/include/Game/Screen/GamePauseSequence.hpp b/include/Game/Screen/GamePauseSequence.hpp index 4f5d6aaa3..198830a93 100644 --- a/include/Game/Screen/GamePauseSequence.hpp +++ b/include/Game/Screen/GamePauseSequence.hpp @@ -17,9 +17,9 @@ public: GamePauseSequence(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - void initWindowMenu(const MR::FunctorBase &); + void initWindowMenu(const MR::FunctorBase&); void startPause(MenuType); void deactivate(); void exeDeactive(); @@ -27,7 +27,7 @@ public: void exeActivePowerStarList(); void exeSceneInformation(); - /* 0x20 */ MenuType mMenuType; - /* 0x24 */ PauseMenu* mPauseMenu; + /* 0x20 */ MenuType mMenuType; + /* 0x24 */ PauseMenu* mPauseMenu; /* 0x28 */ MR::FunctorBase* mWindowMenuFunc; }; diff --git a/include/Game/Screen/GameSceneLayoutHolder.hpp b/include/Game/Screen/GameSceneLayoutHolder.hpp index 5633fa360..1acbf429b 100644 --- a/include/Game/Screen/GameSceneLayoutHolder.hpp +++ b/include/Game/Screen/GameSceneLayoutHolder.hpp @@ -20,37 +20,37 @@ public: virtual void movement(); - void createPurpleCoinCounter(); + void createPurpleCoinCounter(); PurpleCoinCounter* getPurpleCoinCounter() const; - void initLifeCount(u32); - void setLifeCount(u32); - void setOxygenRatio(f32); - void setBeePowerRatio(f32); - void changeLifeMeterModeGround(); - void changeLifeMeterModeWater(); - void changeLifeMeterModeBee(); - void requestOneUp(s32); - void requestPowerUpHPMeter(); - void requestForceAppearHPMeter(); - void startMiss(); - bool isMissAnimEnd() const; - void activateDefaultGameLayout(); - void deactivateDefaultGameLayout(); - void invalidateStatusLayout(); + void initLifeCount(u32); + void setLifeCount(u32); + void setOxygenRatio(f32); + void setBeePowerRatio(f32); + void changeLifeMeterModeGround(); + void changeLifeMeterModeWater(); + void changeLifeMeterModeBee(); + void requestOneUp(s32); + void requestPowerUpHPMeter(); + void requestForceAppearHPMeter(); + void startMiss(); + bool isMissAnimEnd() const; + void activateDefaultGameLayout(); + void deactivateDefaultGameLayout(); + void invalidateStatusLayout(); - /* 0x0C */ CameraInfo* mCameraInfo; - /* 0x10 */ InformationMessage* mInformationMessage; - /* 0x14 */ MarioMeter* mMarioMeter; - /* 0x18 */ MarioSubMeter* mMarioSubMeter; - /* 0x1C */ MissLayout* mMissLayout; - /* 0x20 */ NoteCounter* mNoteCounter; - /* 0x24 */ OneUpBoard* mOneUpBoard; - /* 0x28 */ YesNoLayout* mYesNoLayout; - /* 0x2C */ PurpleCoinCounter* mPurpleCoinCounter; - /* 0x30 */ bool _30; - /* 0x31 */ bool _31; + /* 0x0C */ CameraInfo* mCameraInfo; + /* 0x10 */ InformationMessage* mInformationMessage; + /* 0x14 */ MarioMeter* mMarioMeter; + /* 0x18 */ MarioSubMeter* mMarioSubMeter; + /* 0x1C */ MissLayout* mMissLayout; + /* 0x20 */ NoteCounter* mNoteCounter; + /* 0x24 */ OneUpBoard* mOneUpBoard; + /* 0x28 */ YesNoLayout* mYesNoLayout; + /* 0x2C */ PurpleCoinCounter* mPurpleCoinCounter; + /* 0x30 */ bool _30; + /* 0x31 */ bool _31; /* 0x34 */ CounterLayoutController* mCounterLayoutCtrl; - /* 0x38 */ bool mIsActiveDefaultGameLayout; + /* 0x38 */ bool mIsActiveDefaultGameLayout; }; namespace MR { diff --git a/include/Game/Screen/GameStageClearSequence.hpp b/include/Game/Screen/GameStageClearSequence.hpp index 7a8778fef..61cd34d18 100644 --- a/include/Game/Screen/GameStageClearSequence.hpp +++ b/include/Game/Screen/GameStageClearSequence.hpp @@ -8,7 +8,7 @@ class GameStageClearSequence : public LayoutActor { public: GameStageClearSequence(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); void startPowerStarGetDemo(); void startGrandStarGetDemo(); @@ -16,6 +16,6 @@ public: void exePowerStarGetDemo(); void exeGrandStarGetDemo(); - SimpleEffectLayout* mEffectLayout; // 0x20 - TVec2f mFollowPos; // 0x24 + SimpleEffectLayout* mEffectLayout; // 0x20 + TVec2f mFollowPos; // 0x24 }; diff --git a/include/Game/Screen/HomeButtonLayout.hpp b/include/Game/Screen/HomeButtonLayout.hpp index 3da391826..8a16618f6 100644 --- a/include/Game/Screen/HomeButtonLayout.hpp +++ b/include/Game/Screen/HomeButtonLayout.hpp @@ -14,7 +14,7 @@ public: void initHomeButtonInfo(); private: - /* 0x00 */ HBMDataInfo* mHomeButtonInfo; + /* 0x00 */ HBMDataInfo* mHomeButtonInfo; /* 0x04 */ HBMControllerData* mControllerData; }; @@ -36,6 +36,6 @@ public: private: /* 0x20 */ HomeButtonMenuContext* mMenuContext; - /* 0x24 */ bool _24; - /* 0x25 */ bool _25; + /* 0x24 */ bool _24; + /* 0x25 */ bool _25; }; diff --git a/include/Game/Screen/IconAButton.hpp b/include/Game/Screen/IconAButton.hpp index 3c5698cdd..b0fdb767b 100644 --- a/include/Game/Screen/IconAButton.hpp +++ b/include/Game/Screen/IconAButton.hpp @@ -6,10 +6,10 @@ class IconAButton : public LayoutActor { public: IconAButton(bool, bool); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); - void setFollowActorPane(LayoutActor *, const char *); + void setFollowActorPane(LayoutActor*, const char*); bool isOpen(); bool isWait(); void openWithTalk(); @@ -22,7 +22,7 @@ public: void exeTerm(); void updateFollowPos(); - /* 0x20 */ TVec2f mFollowPos; + /* 0x20 */ TVec2f mFollowPos; /* 0x28 */ LayoutActor* mFollowActor; - /* 0x2C */ char mFollowPaneName[24]; + /* 0x2C */ char mFollowPaneName[24]; }; diff --git a/include/Game/Screen/IconComet.hpp b/include/Game/Screen/IconComet.hpp index d3216fc19..6af2e82ed 100644 --- a/include/Game/Screen/IconComet.hpp +++ b/include/Game/Screen/IconComet.hpp @@ -6,9 +6,9 @@ class IconComet : public LayoutActor { public: IconComet(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); - bool appearIfLanding(const char *); + bool appearIfLanding(const char*); void appearByCometNameId(int); void exeWait(); }; \ No newline at end of file diff --git a/include/Game/Screen/ImageEffectBase.hpp b/include/Game/Screen/ImageEffectBase.hpp index e04f1a5eb..b87c1c924 100644 --- a/include/Game/Screen/ImageEffectBase.hpp +++ b/include/Game/Screen/ImageEffectBase.hpp @@ -22,5 +22,5 @@ public: private: /* 0x0C */ bool _C; /* 0x0D */ bool _D; - /* 0x10 */ f32 _10; + /* 0x10 */ f32 _10; }; diff --git a/include/Game/Screen/ImageEffectDirector.hpp b/include/Game/Screen/ImageEffectDirector.hpp index 0874cce49..82b83529d 100644 --- a/include/Game/Screen/ImageEffectDirector.hpp +++ b/include/Game/Screen/ImageEffectDirector.hpp @@ -12,7 +12,7 @@ namespace ImageEffectStateImpl { class StateDepthOfField; class StateNull; class StateScreenBlur; -}; +}; // namespace ImageEffectStateImpl class ImageEffectDirector : public NameObj { public: @@ -49,17 +49,17 @@ public: void setPlayerSync(bool); private: - /* 0x0C */ bool mIsAuto; - /* 0x0D */ bool _D; - /* 0x0E */ bool _E; - /* 0x0F */ bool _F; - /* 0x10 */ s32 _10; - /* 0x14 */ f32 mDepthOfFieldIntensity; - /* 0x18 */ ImageEffectStateImpl::StateNull* _18; - /* 0x1C */ ImageEffectStateImpl::StateBloomNormal* _1C; - /* 0x20 */ ImageEffectStateImpl::StateBloomSimple* _20; - /* 0x24 */ ImageEffectStateImpl::StateScreenBlur* _24; + /* 0x0C */ bool mIsAuto; + /* 0x0D */ bool _D; + /* 0x0E */ bool _E; + /* 0x0F */ bool _F; + /* 0x10 */ s32 _10; + /* 0x14 */ f32 mDepthOfFieldIntensity; + /* 0x18 */ ImageEffectStateImpl::StateNull* _18; + /* 0x1C */ ImageEffectStateImpl::StateBloomNormal* _1C; + /* 0x20 */ ImageEffectStateImpl::StateBloomSimple* _20; + /* 0x24 */ ImageEffectStateImpl::StateScreenBlur* _24; /* 0x28 */ ImageEffectStateImpl::StateDepthOfField* _28; - /* 0x2C */ ImageEffectState* _2C; - /* 0x30 */ ImageEffectBase* _30; + /* 0x2C */ ImageEffectState* _2C; + /* 0x30 */ ImageEffectBase* _30; }; diff --git a/include/Game/Screen/ImageEffectLocalUtil.hpp b/include/Game/Screen/ImageEffectLocalUtil.hpp index ef38f7647..5526a1e3e 100644 --- a/include/Game/Screen/ImageEffectLocalUtil.hpp +++ b/include/Game/Screen/ImageEffectLocalUtil.hpp @@ -9,5 +9,5 @@ namespace ImageEffectLocalUtil { }; void setupDrawTexture(); - void drawTexture(JUTTexture *, s32, s32, u8, ETexDrawType); -}; \ No newline at end of file + void drawTexture(JUTTexture*, s32, s32, u8, ETexDrawType); +}; // namespace ImageEffectLocalUtil \ No newline at end of file diff --git a/include/Game/Screen/ImageEffectState.hpp b/include/Game/Screen/ImageEffectState.hpp index 279d7e420..1e19bb9f2 100644 --- a/include/Game/Screen/ImageEffectState.hpp +++ b/include/Game/Screen/ImageEffectState.hpp @@ -8,21 +8,18 @@ class ImageEffectDirector; class ImageEffectState { public: /// @brief Creates a new `ImageEffectState`. - ImageEffectState(ImageEffectDirector* pHost) : - mHost(pHost) - { - + ImageEffectState(ImageEffectDirector* pHost) + : mHost(pHost) { } /// @brief Destroys the `ImageEffectState`. virtual ~ImageEffectState() { - } - virtual void update(); - virtual bool doesEffectExist() const; + virtual void update(); + virtual bool doesEffectExist() const; virtual ImageEffectBase* getEffect() const; - virtual void onChange(); + virtual void onChange(); void forceOff(); @@ -36,8 +33,8 @@ namespace ImageEffectStateImpl { /// @brief Creates a new `StateNull`. /// @param pHost The pointer to the owning `ImageEffectDirector` instance. StateNull(ImageEffectDirector* pHost); - - virtual bool doesEffectExist() const; + + virtual bool doesEffectExist() const; virtual ImageEffectBase* getEffect() const; }; @@ -45,11 +42,11 @@ namespace ImageEffectStateImpl { /// @brief Creates a new `StateBloomNormal`. /// @param pHost The pointer to the owning `ImageEffectDirector` instance. StateBloomNormal(ImageEffectDirector* pHost); - - virtual void update(); - virtual bool doesEffectExist() const; + + virtual void update(); + virtual bool doesEffectExist() const; virtual ImageEffectBase* getEffect() const; - virtual void onChange(); + virtual void onChange(); void setBloomIntensity(u8 bloomIntensity); void setThreshold(u8 threshold); @@ -60,24 +57,24 @@ namespace ImageEffectStateImpl { private: /* 0x08 */ bool _8; - /* 0x0C */ u32 _C; - /* 0x10 */ f32 _10; - /* 0x14 */ u8 mBloomIntensity; - /* 0x18 */ f32 _18; - /* 0x1C */ u8 mThreshold; - /* 0x20 */ f32 _20; - /* 0x24 */ u32 mIntensity1; - /* 0x28 */ f32 _28; - /* 0x2C */ u32 mIntensity2; + /* 0x0C */ u32 _C; + /* 0x10 */ f32 _10; + /* 0x14 */ u8 mBloomIntensity; + /* 0x18 */ f32 _18; + /* 0x1C */ u8 mThreshold; + /* 0x20 */ f32 _20; + /* 0x24 */ u32 mIntensity1; + /* 0x28 */ f32 _28; + /* 0x2C */ u32 mIntensity2; }; class StateBloomSimple : public ImageEffectState { - public: - /// @brief Creates a new `StateBloomSimple`. + public: + /// @brief Creates a new `StateBloomSimple`. /// @param pHost The pointer to the owning `ImageEffectDirector` instance. StateBloomSimple(ImageEffectDirector* pHost); - - virtual bool doesEffectExist() const; + + virtual bool doesEffectExist() const; virtual ImageEffectBase* getEffect() const; void setMaskFilterAll(); @@ -93,8 +90,8 @@ namespace ImageEffectStateImpl { /// @brief Creates a new `StateScreenBlur`. /// @param pHost The pointer to the owning `ImageEffectDirector` instance. StateScreenBlur(ImageEffectDirector* pHost); - - virtual bool doesEffectExist() const; + + virtual bool doesEffectExist() const; virtual ImageEffectBase* getEffect() const; void setIntensity(f32 intensity); @@ -105,12 +102,12 @@ namespace ImageEffectStateImpl { /// @brief Creates a new `StateDepthOfField`. /// @param pHost The pointer to the owning `ImageEffectDirector` instance. StateDepthOfField(ImageEffectDirector* pHost); - - virtual bool doesEffectExist() const; + + virtual bool doesEffectExist() const; virtual ImageEffectBase* getEffect() const; void setIntensity(f32 intensity); void setBlurMaxDist(s32 blurMaxDist); void setBlurMinDist(s32 blurMinDist); }; -}; +}; // namespace ImageEffectStateImpl diff --git a/include/Game/Screen/ImageEffectSystemHolder.hpp b/include/Game/Screen/ImageEffectSystemHolder.hpp index 2b8d241e2..6b6f4c254 100644 --- a/include/Game/Screen/ImageEffectSystemHolder.hpp +++ b/include/Game/Screen/ImageEffectSystemHolder.hpp @@ -18,9 +18,9 @@ private: }; namespace MR { - void createImageEffectSystemHolder(); + void createImageEffectSystemHolder(); ImageEffectSystemHolder* getImageEffectSystemHolder(); - bool isExistImageEffectDirector(); - ImageEffectDirector* getImageEffectDirector(); - ImageEffectResource* getImageEffectResource(); -}; + bool isExistImageEffectDirector(); + ImageEffectDirector* getImageEffectDirector(); + ImageEffectResource* getImageEffectResource(); +}; // namespace MR diff --git a/include/Game/Screen/InformationMessage.hpp b/include/Game/Screen/InformationMessage.hpp index 4c03f9356..cb129b458 100644 --- a/include/Game/Screen/InformationMessage.hpp +++ b/include/Game/Screen/InformationMessage.hpp @@ -26,5 +26,5 @@ public: private: /* 0x20 */ IconAButton* mAButtonIcon; - /* 0x24 */ bool mIsCenter; + /* 0x24 */ bool mIsCenter; }; diff --git a/include/Game/Screen/InformationObserver.hpp b/include/Game/Screen/InformationObserver.hpp index b5e957bd4..92c2f95a8 100644 --- a/include/Game/Screen/InformationObserver.hpp +++ b/include/Game/Screen/InformationObserver.hpp @@ -27,10 +27,10 @@ public: void exeDisp(); private: - /* 0x8C */ TYPE mType; - /* 0x90 */ bool _90; + /* 0x8C */ TYPE mType; + /* 0x90 */ bool _90; /* 0x94 */ LiveActor* _94; - /* 0x98 */ s32 mDisplayFrame; + /* 0x98 */ s32 mDisplayFrame; }; namespace InformationObserverFunction { @@ -44,4 +44,4 @@ namespace InformationObserverFunction { void explainLifeUp(); void explainOneUp(); void explainSpin(LiveActor*); -}; +}; // namespace InformationObserverFunction diff --git a/include/Game/Screen/IsbnManager.hpp b/include/Game/Screen/IsbnManager.hpp index 6181ff507..7af2ec2c8 100644 --- a/include/Game/Screen/IsbnManager.hpp +++ b/include/Game/Screen/IsbnManager.hpp @@ -6,24 +6,24 @@ namespace nw4r { namespace lyt { class ArcResourceAccessor; class Layout; - }; -}; + }; // namespace lyt +}; // namespace nw4r struct MEMAllocator; class IsbnManager { private: - /* 0x00 */ bool _0; - /* 0x04 */ MEMAllocator* mpAllocator; - /* 0x08 */ nw4r::lyt::Layout* mpLayout; + /* 0x00 */ bool _0; + /* 0x04 */ MEMAllocator* mpAllocator; + /* 0x08 */ nw4r::lyt::Layout* mpLayout; /* 0x0C */ nw4r::lyt::ArcResourceAccessor* mpResAccessor; - /* 0x10 */ nw4r::lyt::DrawInfo mDrawInfo; - /* 0x64 */ u16 _64; - /* 0x66 */ u16 _66; - /* 0x68 */ u16 _68; - /* 0x6C */ void* mpIsbnBuffer; - /* 0x70 */ void* mpLayoutBuffer; - /* 0x74 */ void* mpResAccBuffer; + /* 0x10 */ nw4r::lyt::DrawInfo mDrawInfo; + /* 0x64 */ u16 _64; + /* 0x66 */ u16 _66; + /* 0x68 */ u16 _68; + /* 0x6C */ void* mpIsbnBuffer; + /* 0x70 */ void* mpLayoutBuffer; + /* 0x74 */ void* mpResAccBuffer; static const char* cIsbnNumberPaneName[]; static const char* cRegistNumberPaneName[]; @@ -37,11 +37,11 @@ public: /// @brief Destroys the `IsbnManager`. virtual ~IsbnManager(); - void setAdjustRate(f32, f32); - void setNumber(const wchar_t* pIsbnNumber, const wchar_t* pRegistNumber, const wchar_t* pOtherNumber); - void calculateView(); + void setAdjustRate(f32, f32); + void setNumber(const wchar_t* pIsbnNumber, const wchar_t* pRegistNumber, const wchar_t* pOtherNumber); + void calculateView(); static IsbnManager* create(void* pArchiveBuf, MEMAllocator* pAllocator); - bool calc(bool); - void draw(); - void reset(); + bool calc(bool); + void draw(); + void reset(); }; diff --git a/include/Game/Screen/LayoutActor.hpp b/include/Game/Screen/LayoutActor.hpp index eb226c944..2945552ce 100644 --- a/include/Game/Screen/LayoutActor.hpp +++ b/include/Game/Screen/LayoutActor.hpp @@ -13,10 +13,9 @@ class StarPointerLayoutTargetKeeper; class LayoutActor : public NameObj { public: - LayoutActor(const char *, bool); + LayoutActor(const char*, bool); virtual ~LayoutActor() { - } virtual void movement(); @@ -26,28 +25,27 @@ public: virtual void kill(); virtual void control() { - } - void setNerve(const Nerve *) const; - bool isNerve(const Nerve *) const; - s32 getNerveStep() const; - TVec2f getTrans() const; - void setTrans(const TVec2f &); + void setNerve(const Nerve*) const; + bool isNerve(const Nerve*) const; + s32 getNerveStep() const; + TVec2f getTrans() const; + void setTrans(const TVec2f&); LayoutManager* getLayoutManager() const; - void createPaneMtxRef(const char*); - MtxPtr getPaneMtxRef(const char*); - void initLayoutManager(const char *, u32); - void initLayoutManagerNoConvertFilename(const char *, u32); - void initLayoutManagerWithTextBoxBufferLength(const char *, u32, u32); - void initNerve(const Nerve *); - void initEffectKeeper(int, const char *, const EffectSystem *); - void initPointingTarget(int); - void updateSpine(); + void createPaneMtxRef(const char*); + MtxPtr getPaneMtxRef(const char*); + void initLayoutManager(const char*, u32); + void initLayoutManagerNoConvertFilename(const char*, u32); + void initLayoutManagerWithTextBoxBufferLength(const char*, u32, u32); + void initNerve(const Nerve*); + void initEffectKeeper(int, const char*, const EffectSystem*); + void initPointingTarget(int); + void updateSpine(); - /* 0x0C */ LayoutManager* mManager; - /* 0x10 */ Spine* mSpine; - /* 0x14 */ PaneEffectKeeper* mPaneEffectKeeper; + /* 0x0C */ LayoutManager* mManager; + /* 0x10 */ Spine* mSpine; + /* 0x14 */ PaneEffectKeeper* mPaneEffectKeeper; /* 0x18 */ StarPointerLayoutTargetKeeper* mStarPointerTargetKeeper; - /* 0x1C */ LayoutActorFlag mFlag; + /* 0x1C */ LayoutActorFlag mFlag; }; diff --git a/include/Game/Screen/LayoutManager.hpp b/include/Game/Screen/LayoutManager.hpp index 2c93f5026..2ec6c2ce3 100644 --- a/include/Game/Screen/LayoutManager.hpp +++ b/include/Game/Screen/LayoutManager.hpp @@ -9,8 +9,8 @@ namespace nw4r { class Group; class Layout; class Pane; - }; -}; + }; // namespace lyt +}; // namespace nw4r class LayoutGroupCtrl; class LayoutHolder; @@ -20,53 +20,53 @@ class LayoutManager { public: LayoutManager(const char*, bool, u32, u32); - void movement(); - void calcAnim(); - void draw() const; - void addPaneCtrl(LayoutPaneCtrl*); - LayoutPaneCtrl* createAndAddRootPaneCtrl(u32); - LayoutPaneCtrl* createAndAddPaneCtrl(const char*, u32); - LayoutPaneCtrl* getPaneCtrl(const char*) const; - s32 getIndexOfPane(const char*) const; - bool isExistPaneCtrl(const char*) const; - void addGroupCtrl(LayoutGroupCtrl*); - bool isPointing(const nw4r::lyt::Pane*, const TVec2f&) const; - LayoutPaneCtrl* createAndAddGroupCtrl(const char*, u32); - s32 getIndexOfGroupCtrl(const char*) const; - void createPaneMtxRef(const char*); - MtxPtr getPaneMtxRef(const char*) const; - bool isExistPaneMtxRef(const char*) const; - bool isPointing(const char*, const TVec2f&) const; + void movement(); + void calcAnim(); + void draw() const; + void addPaneCtrl(LayoutPaneCtrl*); + LayoutPaneCtrl* createAndAddRootPaneCtrl(u32); + LayoutPaneCtrl* createAndAddPaneCtrl(const char*, u32); + LayoutPaneCtrl* getPaneCtrl(const char*) const; + s32 getIndexOfPane(const char*) const; + bool isExistPaneCtrl(const char*) const; + void addGroupCtrl(LayoutGroupCtrl*); + bool isPointing(const nw4r::lyt::Pane*, const TVec2f&) const; + LayoutPaneCtrl* createAndAddGroupCtrl(const char*, u32); + s32 getIndexOfGroupCtrl(const char*) const; + void createPaneMtxRef(const char*); + MtxPtr getPaneMtxRef(const char*) const; + bool isExistPaneMtxRef(const char*) const; + bool isPointing(const char*, const TVec2f&) const; nw4r::lyt::AnimTransform* getAnimTransform(const char*) const; - void bindPaneCtrlAnim(LayoutPaneCtrl*, nw4r::lyt::AnimTransform*); - void bindPaneCtrlAnimSub(u32&, nw4r::lyt::AnimTransform*); - void unbindPaneCtrlAnim(LayoutPaneCtrl*, nw4r::lyt::AnimTransform*); - void unbindPaneCtrlAnimSub(u32&, nw4r::lyt::AnimTransform*); - void calcAnimWithoutLocationAdjust(const nw4r::lyt::DrawInfo&); - nw4r::lyt::Group* getGroup(const char*) const; - void initArc(const char*, const char*); - void initDrawInfo(); - void initPaneInfo(); - void initPaneInfoRecursive(u32&, nw4r::lyt::Pane*); - u32 countPanes(nw4r::lyt::Pane*); - void initGroupCtrlList(); - void initTextBoxRecursive(nw4r::lyt::Pane*, nw4r::lyt::Pane*, const char*, u32); - void animateRecursive(u32&, nw4r::lyt::Pane*); - nw4r::lyt::Pane* getPane(const char*) const; - nw4r::lyt::Pane* findPaneByName(const char*) const; - void replaceIndDummyTexture(); - void removeUnnecessaryPanes(nw4r::lyt::Pane*); + void bindPaneCtrlAnim(LayoutPaneCtrl*, nw4r::lyt::AnimTransform*); + void bindPaneCtrlAnimSub(u32&, nw4r::lyt::AnimTransform*); + void unbindPaneCtrlAnim(LayoutPaneCtrl*, nw4r::lyt::AnimTransform*); + void unbindPaneCtrlAnimSub(u32&, nw4r::lyt::AnimTransform*); + void calcAnimWithoutLocationAdjust(const nw4r::lyt::DrawInfo&); + nw4r::lyt::Group* getGroup(const char*) const; + void initArc(const char*, const char*); + void initDrawInfo(); + void initPaneInfo(); + void initPaneInfoRecursive(u32&, nw4r::lyt::Pane*); + u32 countPanes(nw4r::lyt::Pane*); + void initGroupCtrlList(); + void initTextBoxRecursive(nw4r::lyt::Pane*, nw4r::lyt::Pane*, const char*, u32); + void animateRecursive(u32&, nw4r::lyt::Pane*); + nw4r::lyt::Pane* getPane(const char*) const; + nw4r::lyt::Pane* findPaneByName(const char*) const; + void replaceIndDummyTexture(); + void removeUnnecessaryPanes(nw4r::lyt::Pane*); - /* 0x00 */ LayoutHolder* mLayoutHolder; - /* 0x04 */ nw4r::lyt::Layout* mLayout; + /* 0x00 */ LayoutHolder* mLayoutHolder; + /* 0x04 */ nw4r::lyt::Layout* mLayout; /* 0x08 */ nw4r::lyt::AnimTransform** mAnimTransList; - /* 0x0C */ nw4r::lyt::DrawInfo mDrawInfo; - /* 0x60 */ bool mIsScreenHidden; - /* 0x61 */ bool _61; - /* 0x64 */ u32 _64; - /* 0x68 */ u32 _68; - /* 0x6C */ u32 _6C; - /* 0x70 */ u32 _70; - /* 0x74 */ u32 _74; - /* 0x78 */ u32 _78; + /* 0x0C */ nw4r::lyt::DrawInfo mDrawInfo; + /* 0x60 */ bool mIsScreenHidden; + /* 0x61 */ bool _61; + /* 0x64 */ u32 _64; + /* 0x68 */ u32 _68; + /* 0x6C */ u32 _6C; + /* 0x70 */ u32 _70; + /* 0x74 */ u32 _74; + /* 0x78 */ u32 _78; }; diff --git a/include/Game/Screen/LayoutPaneCtrl.hpp b/include/Game/Screen/LayoutPaneCtrl.hpp index aa7bce7c1..3d93e2d06 100644 --- a/include/Game/Screen/LayoutPaneCtrl.hpp +++ b/include/Game/Screen/LayoutPaneCtrl.hpp @@ -7,7 +7,7 @@ namespace nw4r { namespace lyt { class Pane; }; -}; +}; // namespace nw4r class J3DFrameCtrl; class LayoutAnmPlayer; @@ -21,20 +21,19 @@ public: /// @param animLayerNum The maximum number of animations to support at once. LayoutPaneCtrl(LayoutManager* pHost, const char* pPaneName, u32 animLayerNum); - void movement(); - void calcAnim(); - void start(const char*, u32); - void stop(u32); - bool isAnimStopped(u32) const; - void reflectFollowPos(); + void movement(); + void calcAnim(); + void start(const char*, u32); + void stop(u32); + bool isAnimStopped(u32) const; + void reflectFollowPos(); J3DFrameCtrl* getFrameCtrl(u32) const; - void recalcChildGlobalMtx(nw4r::lyt::Pane*); + void recalcChildGlobalMtx(nw4r::lyt::Pane*); - /* 0x00 */ LayoutManager* mHost; - /* 0x04 */ nw4r::lyt::Pane* mPane; - /* 0x08 */ s32 mPaneIndex; + /* 0x00 */ LayoutManager* mHost; + /* 0x04 */ nw4r::lyt::Pane* mPane; + /* 0x08 */ s32 mPaneIndex; /* 0x0C */ MR::AssignableArray mAnmPlayerArray; - /* 0x14 */ u32 mFollowType; - /* 0x18 */ const TVec2f* mFollowPos; + /* 0x14 */ u32 mFollowType; + /* 0x18 */ const TVec2f* mFollowPos; }; - diff --git a/include/Game/Screen/LensFlare.hpp b/include/Game/Screen/LensFlare.hpp index 2d8e369e7..af5a59762 100644 --- a/include/Game/Screen/LensFlare.hpp +++ b/include/Game/Screen/LensFlare.hpp @@ -27,7 +27,7 @@ public: void notifyInArea(); private: - /* 0x8C */ TVec3f _8C; + /* 0x8C */ TVec3f _8C; /* 0x98 */ TriggerChecker* _98; /* 0x9C */ TriggerChecker* _9C; }; @@ -73,28 +73,28 @@ public: void pauseOff(); void setDrawSyncToken(); - s32 checkArea(); + s32 checkArea(); bool checkBrightObj(bool); void controlFlare(s32, bool); private: - /* 0x0C */ void* _C; - /* 0x10 */ LensFlareRing* mRing; - /* 0x14 */ LensFlareGlow* mGlow; - /* 0x18 */ LensFlareLine* mLine; - /* 0x1C */ MR::Vector > mBrightObjArray; - /* 0x60 */ TVec2f _60; - /* 0x68 */ f32 _68; - /* 0x6C */ TVec2f _6C; - /* 0x74 */ f32 _74; - /* 0x78 */ f32 _78; - /* 0x7C */ u16 _7C; - /* 0x7E */ u16 mDrawSyncTokenIndex; - /* 0x80 */ BrightCamInfo* mBrightCamInfo; + /* 0x0C */ void* _C; + /* 0x10 */ LensFlareRing* mRing; + /* 0x14 */ LensFlareGlow* mGlow; + /* 0x18 */ LensFlareLine* mLine; + /* 0x1C */ MR::Vector> mBrightObjArray; + /* 0x60 */ TVec2f _60; + /* 0x68 */ f32 _68; + /* 0x6C */ TVec2f _6C; + /* 0x74 */ f32 _74; + /* 0x78 */ f32 _78; + /* 0x7C */ u16 _7C; + /* 0x7E */ u16 mDrawSyncTokenIndex; + /* 0x80 */ BrightCamInfo* mBrightCamInfo; }; namespace MR { void addBrightObj(BrightObjBase* pBrightObj); void setLensFlareDrawSyncToken(); - u16 getLensFlareDrawSyncTokenIndex(); -}; + u16 getLensFlareDrawSyncTokenIndex(); +}; // namespace MR diff --git a/include/Game/Screen/LogoFader.hpp b/include/Game/Screen/LogoFader.hpp index 2924de32d..1b4c96141 100644 --- a/include/Game/Screen/LogoFader.hpp +++ b/include/Game/Screen/LogoFader.hpp @@ -20,6 +20,6 @@ public: bool isFadeEnd() const; /* 0x20 */ bool _20; - /* 0x24 */ s32 mMaxStep; - /* 0x28 */ f32 mRate; + /* 0x24 */ s32 mMaxStep; + /* 0x28 */ f32 mRate; }; diff --git a/include/Game/Screen/LuigiLetter.hpp b/include/Game/Screen/LuigiLetter.hpp index de6a964bd..0a70b5e09 100644 --- a/include/Game/Screen/LuigiLetter.hpp +++ b/include/Game/Screen/LuigiLetter.hpp @@ -6,7 +6,7 @@ namespace nw4r { namespace lyt { class TexMap; }; -}; +}; // namespace nw4r class IconAButton; class NameObjArchiveListCollector; @@ -20,21 +20,21 @@ public: virtual void appear(); virtual void movement(); - void exeAppear(); - void exeWait(); - void exeEnd(); + void exeAppear(); + void exeWait(); + void exeEnd(); static void makeArchiveListForNPC(NameObjArchiveListCollector*, const JMapInfoIter&); static void makeArchiveListForMenu(NameObjArchiveListCollector*, const JMapInfoIter&); static void makeArchiveListCommon(NameObjArchiveListCollector*, const char*); private: /* 0x20 */ nw4r::lyt::TexMap* mTexture; - /* 0x24 */ IconAButton* mAButtonIcon; - /* 0x28 */ const char* _28; - /* 0x2C */ bool _2C; + /* 0x24 */ IconAButton* mAButtonIcon; + /* 0x28 */ const char* _28; + /* 0x2C */ bool _2C; }; namespace MR { LuigiLetter* createLuigiLetterForTalk(); LuigiLetter* createLuigiLetterForMenu(); -}; +}; // namespace MR diff --git a/include/Game/Screen/Manual2P.hpp b/include/Game/Screen/Manual2P.hpp index f40258bca..add63f93b 100644 --- a/include/Game/Screen/Manual2P.hpp +++ b/include/Game/Screen/Manual2P.hpp @@ -27,11 +27,11 @@ public: bool checkSelectedBackButton(); private: - /* 0x20 */ s32 mPageIndex; - /* 0x24 */ s32 _24; + /* 0x20 */ s32 mPageIndex; + /* 0x24 */ s32 _24; /* 0x28 */ ButtonPaneController* mLeftPaneCtrl; /* 0x2C */ ButtonPaneController* mRightPaneCtrl; - /* 0x30 */ bool _30; - /* 0x31 */ bool _31; - /* 0x34 */ BackButton* mBackButton; + /* 0x30 */ bool _30; + /* 0x31 */ bool _31; + /* 0x34 */ BackButton* mBackButton; }; diff --git a/include/Game/Screen/MarioMeter.hpp b/include/Game/Screen/MarioMeter.hpp index 2ce88cb5f..80552dedd 100644 --- a/include/Game/Screen/MarioMeter.hpp +++ b/include/Game/Screen/MarioMeter.hpp @@ -7,11 +7,11 @@ class SuddenDeathMeter; class MarioMeter : public NameObj { public: - MarioMeter(const char *); + MarioMeter(const char*); virtual ~MarioMeter(); - virtual void init(const JMapInfoIter &rIter); + virtual void init(const JMapInfoIter& rIter); void initLifeCount(s32); void setLifeCount(s32); @@ -22,7 +22,7 @@ public: void activate(); void deactivate(); - MeterLayout *mHitPointMeter; // 0xC - SuddenDeathMeter* mSuddenDeathMeter; // 0x10 - bool mUseSuddenDeath; // 0x14 + MeterLayout* mHitPointMeter; // 0xC + SuddenDeathMeter* mSuddenDeathMeter; // 0x10 + bool mUseSuddenDeath; // 0x14 }; \ No newline at end of file diff --git a/include/Game/Screen/MarioSubMeter.hpp b/include/Game/Screen/MarioSubMeter.hpp index 6746abe9f..05f3b1b97 100644 --- a/include/Game/Screen/MarioSubMeter.hpp +++ b/include/Game/Screen/MarioSubMeter.hpp @@ -6,11 +6,11 @@ class SubMeterLayout; class MarioSubMeter : public NameObj { public: - MarioSubMeter(const char *pName); + MarioSubMeter(const char* pName); virtual ~MarioSubMeter(); - virtual void init(const JMapInfoIter &rIter); + virtual void init(const JMapInfoIter& rIter); void setBeeLifeRatio(f32); void setWaterLifeRatio(f32); @@ -20,7 +20,7 @@ public: void activate(); void deactivate(); - SubMeterLayout* mFlyMeter; // 0xC - SubMeterLayout* mAirMeter; // 0x10 - SubMeterLayout* mActiveMeter; // 0x14 + SubMeterLayout* mFlyMeter; // 0xC + SubMeterLayout* mAirMeter; // 0x10 + SubMeterLayout* mActiveMeter; // 0x14 }; \ No newline at end of file diff --git a/include/Game/Screen/MessageTagSkipTagProcessor.hpp b/include/Game/Screen/MessageTagSkipTagProcessor.hpp index 437ff00c1..fcdc71f5b 100644 --- a/include/Game/Screen/MessageTagSkipTagProcessor.hpp +++ b/include/Game/Screen/MessageTagSkipTagProcessor.hpp @@ -7,26 +7,25 @@ public: MessageTagSkipTagProcessor(); virtual ~MessageTagSkipTagProcessor() { - } - virtual nw4r::ut::TagProcessorBase::Operation Process(u16, ContextType *); - virtual nw4r::ut::TagProcessorBase::Operation CalcRect(nw4r::ut::Rect *, u16, ContextType *); + virtual nw4r::ut::TagProcessorBase::Operation Process(u16, ContextType*); + virtual nw4r::ut::TagProcessorBase::Operation CalcRect(nw4r::ut::Rect*, u16, ContextType*); - nw4r::ut::TagProcessorBase::Operation skipTag(nw4r::ut::Rect *, ContextType *, bool); + nw4r::ut::TagProcessorBase::Operation skipTag(nw4r::ut::Rect*, ContextType*, bool); }; class MessageEditorMessageTag { public: - MessageEditorMessageTag(const wchar_t *); + MessageEditorMessageTag(const wchar_t*); - u32 getTagLength() const; - u32 getSkipLength() const; - u32 getParamLength() const; - u8 getParam8(int) const; - u16 getParam16(int) const; - u32 getParam32(int) const; + u32 getTagLength() const; + u32 getSkipLength() const; + u32 getParamLength() const; + u8 getParam8(int) const; + u16 getParam16(int) const; + u32 getParam32(int) const; wchar_t* getParamPtr(int) const; - const wchar_t* mMessage; // 0x0 + const wchar_t* mMessage; // 0x0 }; diff --git a/include/Game/Screen/MeterLayout.hpp b/include/Game/Screen/MeterLayout.hpp index d09c647ef..460231fec 100644 --- a/include/Game/Screen/MeterLayout.hpp +++ b/include/Game/Screen/MeterLayout.hpp @@ -8,9 +8,9 @@ class CountUpPaneRumbler; class MeterLayout : public LayoutActor { public: - MeterLayout(const char *, const char *); + MeterLayout(const char*, const char*); - virtual void init(const JMapInfoIter &rIter); + virtual void init(const JMapInfoIter& rIter); virtual void control(); void requestActive(); @@ -32,21 +32,21 @@ public: void exeBreakMeter(); void exeZeroMeter(); void exeZeroMeterBreak(); - void calcMarioHeadPosition(TVec2f *) const; - void calcPowerUpMeterBasePosition(TVec2f *) const; + void calcMarioHeadPosition(TVec2f*) const; + void calcPowerUpMeterBasePosition(TVec2f*) const; void setAnimBase(); void setCountAnimFrame(); void setRecoveryCountAnimFrame(); - CountUpPaneRumbler* mCountUpPaneRumbler; // 0x20 - s32 _24; // 0x24 - s32 _28; // 0x28 - TVec2f mFollowPos; // 0x2C - TVec2f mFollowPosW; // 0x34 - TVec2f _38; // 0x38 - s32 mCount; // 0x44 - f32 _48; // 0x48 - f32 _4C; // 0x4C + CountUpPaneRumbler* mCountUpPaneRumbler; // 0x20 + s32 _24; // 0x24 + s32 _28; // 0x28 + TVec2f mFollowPos; // 0x2C + TVec2f mFollowPosW; // 0x34 + TVec2f _38; // 0x38 + s32 mCount; // 0x44 + f32 _48; // 0x48 + f32 _4C; // 0x4C }; namespace NrvMeterLayout { @@ -62,4 +62,4 @@ namespace NrvMeterLayout { NERVE_DECL_EXE(MeterLayoutNrvBreakMeter, MeterLayout, BreakMeter); NERVE_DECL_EXE(MeterLayoutNrvZeroMeter, MeterLayout, ZeroMeter); NERVE_DECL_EXE(MeterLayoutNrvZeroMeterBreak, MeterLayout, ZeroMeterBreak); -} // namespace NrvMeterLayout \ No newline at end of file +} // namespace NrvMeterLayout \ No newline at end of file diff --git a/include/Game/Screen/MiiConfirmIcon.hpp b/include/Game/Screen/MiiConfirmIcon.hpp index e32927917..32b3411b0 100644 --- a/include/Game/Screen/MiiConfirmIcon.hpp +++ b/include/Game/Screen/MiiConfirmIcon.hpp @@ -6,7 +6,7 @@ namespace nw4r { namespace lyt { class TexMap; }; -}; +}; // namespace nw4r class MiiConfirmIcon : public LayoutActor { public: diff --git a/include/Game/Screen/MiiSelect.hpp b/include/Game/Screen/MiiSelect.hpp index fda421e49..8b50c08e7 100644 --- a/include/Game/Screen/MiiSelect.hpp +++ b/include/Game/Screen/MiiSelect.hpp @@ -6,7 +6,7 @@ namespace nw4r { namespace lyt { class TexMap; }; -}; +}; // namespace nw4r namespace MR { class BitArray; @@ -34,58 +34,58 @@ public: virtual void appear(); virtual void control(); - void disappear(); - bool isAppearing() const; - bool isSelected(); - bool isDummySelected(); - void getSelectedID(FileSelectIconID*); + void disappear(); + bool isAppearing() const; + bool isSelected(); + bool isDummySelected(); + void getSelectedID(FileSelectIconID*); nw4r::lyt::TexMap* getSelectedMiiTexMap(); - void admitIcon(); - void prohibitIcon(const FileSelectIconID&); - void invalidateSpecialMii(FileSelectIconID::EFellowID); - void validateAllSpecialMii(); - void exeAppear(); - void exeWait(); - void exeScrollRight(); - void exeScrollLeft(); - void exeSelected(); - void exeDisappear(); - void exeDummySelected(); - void createButtons(); - void callbackLeft(); - void callbackRight(); - void appearButtons(); - void disappearButtons(); - void updateButtons(); - void collectValidMiiIndex(); - void createPage(); - void flipPage(); - void setCurrentPageGroupA(); - void setCurrentPageGroupB(); - void setCurrentPageNum(); - void validateAllIcon(); - void refresh(); - void getIconID(FileSelectIconID*, s32) const; - void onSelect(s32, nw4r::lyt::TexMap*); - void onSelectDummy(); - s32 getIconNum(); + void admitIcon(); + void prohibitIcon(const FileSelectIconID&); + void invalidateSpecialMii(FileSelectIconID::EFellowID); + void validateAllSpecialMii(); + void exeAppear(); + void exeWait(); + void exeScrollRight(); + void exeScrollLeft(); + void exeSelected(); + void exeDisappear(); + void exeDummySelected(); + void createButtons(); + void callbackLeft(); + void callbackRight(); + void appearButtons(); + void disappearButtons(); + void updateButtons(); + void collectValidMiiIndex(); + void createPage(); + void flipPage(); + void setCurrentPageGroupA(); + void setCurrentPageGroupB(); + void setCurrentPageNum(); + void validateAllIcon(); + void refresh(); + void getIconID(FileSelectIconID*, s32) const; + void onSelect(s32, nw4r::lyt::TexMap*); + void onSelectDummy(); + s32 getIconNum(); private: /* 0x020 */ ButtonPaneController* _20[2]; - /* 0x028 */ MR::BitArray* _28; - /* 0x02C */ u16 _2C; - /* 0x02E */ u16 _2E; - /* 0x030 */ u32 _30[10]; - /* 0x058 */ u16 _58; - /* 0x05C */ u32 _5C[10]; - /* 0x084 */ u8 _84[360]; - /* 0x1EC */ s32 _1EC; - /* 0x1F0 */ s32 _1F0; - /* 0x1F4 */ nw4r::lyt::TexMap* _1F4; - /* 0x1F8 */ MiiSelectSub::Page* _1F8; - /* 0x1FC */ MiiSelectSub::Page* _1FC; - /* 0x200 */ u8 _200; - /* 0x204 */ FileSelectIconID* _204; + /* 0x028 */ MR::BitArray* _28; + /* 0x02C */ u16 _2C; + /* 0x02E */ u16 _2E; + /* 0x030 */ u32 _30[10]; + /* 0x058 */ u16 _58; + /* 0x05C */ u32 _5C[10]; + /* 0x084 */ u8 _84[360]; + /* 0x1EC */ s32 _1EC; + /* 0x1F0 */ s32 _1F0; + /* 0x1F4 */ nw4r::lyt::TexMap* _1F4; + /* 0x1F8 */ MiiSelectSub::Page* _1F8; + /* 0x1FC */ MiiSelectSub::Page* _1FC; + /* 0x200 */ u8 _200; + /* 0x204 */ FileSelectIconID* _204; }; namespace MiiSelectSub { @@ -103,8 +103,8 @@ namespace MiiSelectSub { void prohibitIcon(const FileSelectIconID&); /* 0x00 */ MiiSelectIcon* mIconArray[8]; - /* 0x20 */ bool _20; - /* 0x24 */ MiiSelect* mHost; - /* 0x28 */ s32 _28; + /* 0x20 */ bool _20; + /* 0x24 */ MiiSelect* mHost; + /* 0x28 */ s32 _28; }; -}; +}; // namespace MiiSelectSub diff --git a/include/Game/Screen/MiiSelectIcon.hpp b/include/Game/Screen/MiiSelectIcon.hpp index 301b73bf1..503deb59d 100644 --- a/include/Game/Screen/MiiSelectIcon.hpp +++ b/include/Game/Screen/MiiSelectIcon.hpp @@ -6,7 +6,7 @@ namespace nw4r { namespace lyt { class TexMap; }; -}; +}; // namespace nw4r class ButtonPaneController; class FileSelectIconID; @@ -19,32 +19,32 @@ public: virtual void appear(); virtual void control(); - void appear(const FileSelectIconID&); - void appearMiiDummy(); - void validate(); - void invalidate(); - void prohibit(); - bool isSelected() const; - bool isMiiDummy() const; - void copyIconID(FileSelectIconID*); + void appear(const FileSelectIconID&); + void appearMiiDummy(); + void validate(); + void invalidate(); + void prohibit(); + bool isSelected() const; + bool isMiiDummy() const; + void copyIconID(FileSelectIconID*); nw4r::lyt::TexMap* getTexMap(); - bool isPointing() const; - void exeCreate(); - void exeWait(); - void exeSelected(); - void exeDisappear(); - void exeInvalid(); - void createButton(); - void createFaceImageObj(); + bool isPointing() const; + void exeCreate(); + void exeWait(); + void exeSelected(); + void exeDisappear(); + void exeInvalid(); + void createButton(); + void createFaceImageObj(); private: /* 0x20 */ ButtonPaneController* _20; /* 0x24 */ ButtonPaneController* _24; /* 0x28 */ ButtonPaneController* _28; - /* 0x2C */ MiiFaceIcon* mIcon; - /* 0x30 */ nw4r::lyt::TexMap* mMiiTexMap; - /* 0x34 */ nw4r::lyt::TexMap* mFellowTexMap; - /* 0x38 */ FileSelectIconID* mIconID; - /* 0x3C */ bool mIsMiiDummy; - /* 0x3D */ bool _3D; + /* 0x2C */ MiiFaceIcon* mIcon; + /* 0x30 */ nw4r::lyt::TexMap* mMiiTexMap; + /* 0x34 */ nw4r::lyt::TexMap* mFellowTexMap; + /* 0x38 */ FileSelectIconID* mIconID; + /* 0x3C */ bool mIsMiiDummy; + /* 0x3D */ bool _3D; }; diff --git a/include/Game/Screen/MoviePlayerSimple.hpp b/include/Game/Screen/MoviePlayerSimple.hpp index 1fce17d8d..33d2405c7 100644 --- a/include/Game/Screen/MoviePlayerSimple.hpp +++ b/include/Game/Screen/MoviePlayerSimple.hpp @@ -8,15 +8,15 @@ class THPSimplePlayerWrapper; class JKRExpHeap; struct Movie { - /* 0x00 */ const char* mMovieName; + /* 0x00 */ const char* mMovieName; /* 0x04 */ THPVideoInfo mVideoInfo; - /* 0x10 */ u8* mBuffer; - /* 0x14 */ u32 mCurrentFrame; - /* 0x18 */ bool _18; - /* 0x19 */ bool _19; - /* 0x1C */ s32 mFrameRateDefault; - /* 0x20 */ s32 _20; - /* 0x24 */ u32 _24; + /* 0x10 */ u8* mBuffer; + /* 0x14 */ u32 mCurrentFrame; + /* 0x18 */ bool _18; + /* 0x19 */ bool _19; + /* 0x1C */ s32 mFrameRateDefault; + /* 0x20 */ s32 _20; + /* 0x24 */ u32 _24; }; class MoviePlayerSimple : public LayoutActor, public JKRDisposer { @@ -27,16 +27,16 @@ public: /// @brief Destroys the `MoviePlayerSimple`. virtual ~MoviePlayerSimple(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void draw() const; virtual void control(); - void startMovie(const char *, bool); + void startMovie(const char*, bool); void stopMovie(); bool isMovieActive() const; bool isMoviePlaying() const; - s32 getCurrentFrame() const; - s32 getTotalFrame() const; + s32 getCurrentFrame() const; + s32 getTotalFrame() const; void setFrameRateDefault(); void setVolume(f32, s32); void setUnpauseHomeButtonFlag(); @@ -47,13 +47,13 @@ public: void exeSimpleSuspend(); void play(bool); void stop(); - u32 calcNeedMemoryForMovieWorks(); + u32 calcNeedMemoryForMovieWorks(); void drawCinemaFrame() const; private: - /* 0x38 */ Movie* mMovie; - /* 0x3C */ JKRExpHeap* mHeap; + /* 0x38 */ Movie* mMovie; + /* 0x3C */ JKRExpHeap* mHeap; /* 0x40 */ THPSimplePlayerWrapper* mPlayerWrapper; - /* 0x44 */ bool _44; - /* 0x44 */ bool _45; + /* 0x44 */ bool _44; + /* 0x44 */ bool _45; }; diff --git a/include/Game/Screen/MoviePlayingSequence.hpp b/include/Game/Screen/MoviePlayingSequence.hpp index 6c40f4751..c6586bcb6 100644 --- a/include/Game/Screen/MoviePlayingSequence.hpp +++ b/include/Game/Screen/MoviePlayingSequence.hpp @@ -57,7 +57,7 @@ public: MovieType_EndingB, }; - MoviePlayingSequence(const char *, s32); + MoviePlayingSequence(const char*, s32); virtual void appear(); virtual void kill(); @@ -75,9 +75,9 @@ public: void exeEndWait(); private: - /* 0x20 */ const MoviePlayingInfo* mInfo; - /* 0x24 */ MR::Vector > mSubtitles; - /* 0x30 */ DemoPadRumbler* mPadRumbler; + /* 0x20 */ const MoviePlayingInfo* mInfo; + /* 0x24 */ MR::Vector> mSubtitles; + /* 0x30 */ DemoPadRumbler* mPadRumbler; }; class MoviePlayingSequenceHolder : public NameObj { @@ -87,7 +87,7 @@ public: MoviePlayingSequenceHolder(const char* pName); MoviePlayingSequence* getSequence(int) const; - s32 getSequenceNum() const; + s32 getSequenceNum() const; private: /* 0x0C */ MR::AssignableArray mSequence; @@ -104,4 +104,4 @@ namespace MR { bool isEndMovieEndingA(); bool isEndMovieEndingB(); bool isMoviePlayingOnSequence(); -}; +}; // namespace MR diff --git a/include/Game/Screen/MovieSubtitles.hpp b/include/Game/Screen/MovieSubtitles.hpp index 313a9c5bb..22193990a 100644 --- a/include/Game/Screen/MovieSubtitles.hpp +++ b/include/Game/Screen/MovieSubtitles.hpp @@ -6,7 +6,7 @@ class TalkTextFormer; class MovieSubtitles : public LayoutActor { public: - MovieSubtitles(const char *, s32); + MovieSubtitles(const char*, s32); virtual void appear(); @@ -16,5 +16,5 @@ public: private: /* 0x20 */ TalkTextFormer* mFormerText; - /* 0x24 */ s32 mAppearTime; + /* 0x24 */ s32 mAppearTime; }; diff --git a/include/Game/Screen/MovieSubtitlesDataTable.hpp b/include/Game/Screen/MovieSubtitlesDataTable.hpp index 2bb7ce21c..c46a6234a 100644 --- a/include/Game/Screen/MovieSubtitlesDataTable.hpp +++ b/include/Game/Screen/MovieSubtitlesDataTable.hpp @@ -24,10 +24,10 @@ struct SubtitlesInfo { }; namespace MovieSubtitlesUtil { - const SubtitlesMessageInfo* getSubtitlesMessageInfo(const char *, s32); - bool isExistSubtitles(const char *, s32); - const char* getSubtitlesMessageId(const char *, s32); - s32 getSubtitlesStartStep(const char *, s32); - s32 getSubtitlesAppearTime(const char *, s32); - s32 getSubtitlesMessageNum(const char *); -}; + const SubtitlesMessageInfo* getSubtitlesMessageInfo(const char*, s32); + bool isExistSubtitles(const char*, s32); + const char* getSubtitlesMessageId(const char*, s32); + s32 getSubtitlesStartStep(const char*, s32); + s32 getSubtitlesAppearTime(const char*, s32); + s32 getSubtitlesMessageNum(const char*); +}; // namespace MovieSubtitlesUtil diff --git a/include/Game/Screen/NoteCounter.hpp b/include/Game/Screen/NoteCounter.hpp index e3efc2379..f4d354d5a 100644 --- a/include/Game/Screen/NoteCounter.hpp +++ b/include/Game/Screen/NoteCounter.hpp @@ -44,4 +44,4 @@ namespace MR { void declareNoteNumMaxAndMelodyToCounter(LiveActor* pHost, s32 noteNum, s32 melodyNo, f32 railLength); void addNoteToCounter(); void failureNoteCollection(); -}; +}; // namespace MR diff --git a/include/Game/Screen/OdhConverter.hpp b/include/Game/Screen/OdhConverter.hpp index 134e77daf..4e538a677 100644 --- a/include/Game/Screen/OdhConverter.hpp +++ b/include/Game/Screen/OdhConverter.hpp @@ -66,12 +66,12 @@ private: }; namespace MR { - void createOdhConverter(); - void requestCaptureOdhImage(); - bool isRequestedCaptureOdhImage(); - void captureOdhImage(); - void setPortCaptureOdhImage(); - const u8* getOdhImage(); - u32 getOdhImageSize(); + void createOdhConverter(); + void requestCaptureOdhImage(); + bool isRequestedCaptureOdhImage(); + void captureOdhImage(); + void setPortCaptureOdhImage(); + const u8* getOdhImage(); + u32 getOdhImageSize(); NameObjAdaptor* createAdaptorAndConnectToWiiMessageBoard(const char*, const FunctorBase&); -}; +}; // namespace MR diff --git a/include/Game/Screen/PaneEffectKeeper.hpp b/include/Game/Screen/PaneEffectKeeper.hpp index 511a49a68..ecaac8758 100644 --- a/include/Game/Screen/PaneEffectKeeper.hpp +++ b/include/Game/Screen/PaneEffectKeeper.hpp @@ -4,6 +4,6 @@ class MultiEmitter; class PaneEffectKeeper { public: - void clear(); - MultiEmitter* getEmitter(const char *) const; + void clear(); + MultiEmitter* getEmitter(const char*) const; }; diff --git a/include/Game/Screen/PauseMenu.hpp b/include/Game/Screen/PauseMenu.hpp index af6761acc..aa56d24c0 100644 --- a/include/Game/Screen/PauseMenu.hpp +++ b/include/Game/Screen/PauseMenu.hpp @@ -35,12 +35,12 @@ public: /* 0x20 */ ButtonPaneController* _20; /* 0x24 */ ButtonPaneController* _24; - /* 0x28 */ TVec2f _28; - /* 0x30 */ SysInfoWindow* _30; - /* 0x34 */ LuigiLetter* mLuigiLetter; + /* 0x28 */ TVec2f _28; + /* 0x30 */ SysInfoWindow* _30; + /* 0x34 */ LuigiLetter* mLuigiLetter; /* 0x38 */ ButtonPaneController* _38; - /* 0x3C */ TVec2f mStageTitleOffset; - /* 0x44 */ TVec2f mCoinNumPos; - /* 0x4C */ TVec2f mStarPieceNumPos; - /* 0x54 */ bool _54; + /* 0x3C */ TVec2f mStageTitleOffset; + /* 0x44 */ TVec2f mCoinNumPos; + /* 0x4C */ TVec2f mStarPieceNumPos; + /* 0x54 */ bool _54; }; diff --git a/include/Game/Screen/PeachLetter.hpp b/include/Game/Screen/PeachLetter.hpp index db04d8a2c..f8da32624 100644 --- a/include/Game/Screen/PeachLetter.hpp +++ b/include/Game/Screen/PeachLetter.hpp @@ -15,9 +15,9 @@ public: virtual void movement(); virtual void appear(); - void exeAppear(); - void exeWait(); - void exeEnd(); + void exeAppear(); + void exeWait(); + void exeEnd(); static void makeArchiveList(NameObjArchiveListCollector*, const JMapInfoIter&); private: diff --git a/include/Game/Screen/PictureBookCloseButton.hpp b/include/Game/Screen/PictureBookCloseButton.hpp index 65f86b485..76df9008a 100644 --- a/include/Game/Screen/PictureBookCloseButton.hpp +++ b/include/Game/Screen/PictureBookCloseButton.hpp @@ -22,5 +22,5 @@ public: private: /* 0x20 */ ButtonPaneController* mPaneCtrl; - /* 0x24 */ bool mCanCloseWithPad; + /* 0x24 */ bool mCanCloseWithPad; }; diff --git a/include/Game/Screen/PictureBookLayout.hpp b/include/Game/Screen/PictureBookLayout.hpp index de6586c1a..8836385fb 100644 --- a/include/Game/Screen/PictureBookLayout.hpp +++ b/include/Game/Screen/PictureBookLayout.hpp @@ -6,7 +6,7 @@ namespace nw4r { namespace lyt { class TexMap; }; -}; +}; // namespace nw4r class ButtonPaneController; class IconAButton; @@ -23,7 +23,7 @@ public: virtual void control(); static void makeArchiveList(NameObjArchiveListCollector* pCollector, s32 chapterMin, s32 chapterMax, bool isRosettaReading); - static s32 getChapterMax(); + static s32 getChapterMax(); void initTexture(); void initContentsButton(); @@ -34,13 +34,13 @@ public: bool chapterNext(); void updateTexMapChapterBase(); bool isReadedCurrentText() const; - s32 getReadSpeed() const; + s32 getReadSpeed() const; bool isBookEndCurrentText() const; void setTextAlpha(f32 alpha); - s32 getChapterNumberMax() const; + s32 getChapterNumberMax() const; bool isValidCloseButton() const; bool isSelectedCloseButton() const; - s32 getCurrentMaxTextIndex() const; + s32 getCurrentMaxTextIndex() const; void exeOpen(); void exeContentsSelect(); void exeContentsFadeOut(); @@ -53,27 +53,27 @@ public: void exeFadeOut(); void exeClose(); void hideContents(); - f32 getFadeInAlphaTextBG(f32 alpha) const; - f32 getFadeOutAlphaTextBG(f32 alpha) const; + f32 getFadeInAlphaTextBG(f32 alpha) const; + f32 getFadeOutAlphaTextBG(f32 alpha) const; private: - /* 0x20 */ s32 mChapterMin; - /* 0x24 */ s32 mChapterMax; - /* 0x28 */ s32 mChapterRosettaMax; - /* 0x2C */ s32 mChapterNo; - /* 0x30 */ s32 mPageNo; - /* 0x34 */ s32 mTextIndex; - /* 0x38 */ s32 mNotReadedChapterNo; - /* 0x3C */ s32 mNotReadedPageNo; - /* 0x40 */ s32 mNotReadedTextIndex; - /* 0x44 */ nw4r::lyt::TexMap** _44; - /* 0x48 */ nw4r::lyt::TexMap** _48; - /* 0x4C */ nw4r::lyt::TexMap* mTitleTexMap; - /* 0x50 */ nw4r::lyt::TexMap* mCoverFrontTexMap; - /* 0x54 */ nw4r::lyt::TexMap* mCoverBackTexMap; - /* 0x58 */ s32 mNextItemDir; - /* 0x5C */ bool mIsNextItemFast; - /* 0x60 */ IconAButton* mIconAButton; - /* 0x64 */ ButtonPaneController** mContentsButtonPaneController; + /* 0x20 */ s32 mChapterMin; + /* 0x24 */ s32 mChapterMax; + /* 0x28 */ s32 mChapterRosettaMax; + /* 0x2C */ s32 mChapterNo; + /* 0x30 */ s32 mPageNo; + /* 0x34 */ s32 mTextIndex; + /* 0x38 */ s32 mNotReadedChapterNo; + /* 0x3C */ s32 mNotReadedPageNo; + /* 0x40 */ s32 mNotReadedTextIndex; + /* 0x44 */ nw4r::lyt::TexMap** _44; + /* 0x48 */ nw4r::lyt::TexMap** _48; + /* 0x4C */ nw4r::lyt::TexMap* mTitleTexMap; + /* 0x50 */ nw4r::lyt::TexMap* mCoverFrontTexMap; + /* 0x54 */ nw4r::lyt::TexMap* mCoverBackTexMap; + /* 0x58 */ s32 mNextItemDir; + /* 0x5C */ bool mIsNextItemFast; + /* 0x60 */ IconAButton* mIconAButton; + /* 0x64 */ ButtonPaneController** mContentsButtonPaneController; /* 0x68 */ PictureBookCloseButton* mCloseButton; }; diff --git a/include/Game/Screen/PlayerActionGuidance.hpp b/include/Game/Screen/PlayerActionGuidance.hpp index 68b21c0ed..fa88e6abc 100644 --- a/include/Game/Screen/PlayerActionGuidance.hpp +++ b/include/Game/Screen/PlayerActionGuidance.hpp @@ -28,13 +28,13 @@ public: /* 0x20 */ SimpleLayout* mSpinLayout; /* 0x24 */ SimpleLayout* mTamakoroLayout; - /* 0x28 */ LayoutActor* mCurrentLayout; - /* 0x2C */ s32 mGuidanceState; - /* 0x30 */ s32 mGuidancePrevState; - /* 0x34 */ bool _34; - /* 0x35 */ bool _35; - /* 0x36 */ bool _36; - /* 0x37 */ bool _37; + /* 0x28 */ LayoutActor* mCurrentLayout; + /* 0x2C */ s32 mGuidanceState; + /* 0x30 */ s32 mGuidancePrevState; + /* 0x34 */ bool _34; + /* 0x35 */ bool _35; + /* 0x36 */ bool _36; + /* 0x37 */ bool _37; }; namespace MR { diff --git a/include/Game/Screen/PlayerLeft.hpp b/include/Game/Screen/PlayerLeft.hpp index bb972d18f..3e2e9ad1e 100644 --- a/include/Game/Screen/PlayerLeft.hpp +++ b/include/Game/Screen/PlayerLeft.hpp @@ -26,8 +26,8 @@ public: void exeDisappear(); private: - /* 0x20 */ s32 mPlayerLeft; + /* 0x20 */ s32 mPlayerLeft; /* 0x24 */ CounterLayoutAppearer* mLayoutAppearer; - /* 0x28 */ CountUpPaneRumbler* mPaneRumbler; - /* 0x2C */ bool mIsForceAppear; + /* 0x28 */ CountUpPaneRumbler* mPaneRumbler; + /* 0x2C */ bool mIsForceAppear; }; diff --git a/include/Game/Screen/PlayerMissLeft.hpp b/include/Game/Screen/PlayerMissLeft.hpp index 451dcad04..2f9af1e84 100644 --- a/include/Game/Screen/PlayerMissLeft.hpp +++ b/include/Game/Screen/PlayerMissLeft.hpp @@ -20,5 +20,5 @@ public: private: /* 0x20 */ CounterLayoutAppearer* mLayoutAppearer; - /* 0x24 */ CountUpPaneRumbler* mPaneRumbler; + /* 0x24 */ CountUpPaneRumbler* mPaneRumbler; }; diff --git a/include/Game/Screen/ProloguePictureBook.hpp b/include/Game/Screen/ProloguePictureBook.hpp index 1b46ca797..fd751eff5 100644 --- a/include/Game/Screen/ProloguePictureBook.hpp +++ b/include/Game/Screen/ProloguePictureBook.hpp @@ -21,5 +21,5 @@ public: private: /* 0x20 */ IconAButton* mAButtonIcon; - /* 0x24 */ u32 mPage; + /* 0x24 */ u32 mPage; }; diff --git a/include/Game/Screen/PurpleCoinCounter.hpp b/include/Game/Screen/PurpleCoinCounter.hpp index a24e51d0f..ca72ee301 100644 --- a/include/Game/Screen/PurpleCoinCounter.hpp +++ b/include/Game/Screen/PurpleCoinCounter.hpp @@ -19,10 +19,10 @@ public: void exeWait(); private: - /* 0x20 */ s32 mPurpleCoinNum; - /* 0x24 */ s32 mPurpleCoinDisplayNum; - /* 0x28 */ s32 mInvalidCountUpFrame; + /* 0x20 */ s32 mPurpleCoinNum; + /* 0x24 */ s32 mPurpleCoinDisplayNum; + /* 0x28 */ s32 mInvalidCountUpFrame; /* 0x2C */ CounterLayoutAppearer* mLayoutAppearer; - /* 0x30 */ CountUpPaneRumbler* mPaneRumbler; - /* 0x34 */ bool mIsValid; + /* 0x30 */ CountUpPaneRumbler* mPaneRumbler; + /* 0x34 */ bool mIsValid; }; diff --git a/include/Game/Screen/ScenarioSelectLayout.hpp b/include/Game/Screen/ScenarioSelectLayout.hpp index ea7a962d6..1bc06cf62 100644 --- a/include/Game/Screen/ScenarioSelectLayout.hpp +++ b/include/Game/Screen/ScenarioSelectLayout.hpp @@ -10,9 +10,9 @@ class ScenarioSelectStar; class ScenarioSelectLayout : public LayoutActor { public: - ScenarioSelectLayout(EffectSystem *, const CameraContext *); + ScenarioSelectLayout(EffectSystem*, const CameraContext*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void movement(); virtual void draw() const; virtual void calcAnim(); @@ -20,28 +20,28 @@ public: virtual void kill(); virtual void control(); - void calcViewAndEntryStarModel(); - s32 getSelectedScenarioNo() const; - bool isReadyToDisappear() const; - void disappear(); - bool isAppearStarEnd() const; - bool isEndAnimStartStep() const; - bool isCanceled() const; - void updateSelectedScenario(); - void updateScenarioText(); - void fadeInText(); - void fadeOutText(); - bool trySelect(); + void calcViewAndEntryStarModel(); + s32 getSelectedScenarioNo() const; + bool isReadyToDisappear() const; + void disappear(); + bool isAppearStarEnd() const; + bool isEndAnimStartStep() const; + bool isCanceled() const; + void updateSelectedScenario(); + void updateScenarioText(); + void fadeInText(); + void fadeOutText(); + bool trySelect(); ScenarioSelectStar* getSelectedStar() const; - void calcWorldPositionFromScreenPos(TVec3f *, const TVec2f &, f32); - s32 calcDisplayScenarioNum(s32 *, s32 *) const; - void appearAllStar(s32, s32, bool); - void appearStar(s32, s32, int); - bool isAppearStarEndAll() const; - bool tryCancel(); - void setPlayerLeft(); - void startAnimAllNewPane(const char *); - void setAnimRateAllNewPane(f32); + void calcWorldPositionFromScreenPos(TVec3f*, const TVec2f&, f32); + s32 calcDisplayScenarioNum(s32*, s32*) const; + void appearAllStar(s32, s32, bool); + void appearStar(s32, s32, int); + bool isAppearStarEndAll() const; + bool tryCancel(); + void setPlayerLeft(); + void startAnimAllNewPane(const char*); + void setAnimRateAllNewPane(f32); void exeAppearStar(); void exeAppear(); @@ -55,21 +55,21 @@ public: void exeWaitCometWarning(); void exeDisappearCometWarning(); - /* 0x20 */ s32 mSelectedScenarioNo; - /* 0x24 */ u32 _24; - /* 0x28 */ bool _28; - /* 0x2C */ TMtx34f mEffectHostMtx; + /* 0x20 */ s32 mSelectedScenarioNo; + /* 0x24 */ u32 _24; + /* 0x28 */ bool _28; + /* 0x2C */ TMtx34f mEffectHostMtx; /* 0x5C */ ScenarioSelectStar** mStar; - /* 0x60 */ MultiSceneActor* mScenarioSky; - /* 0x64 */ EffectSystem* mEffectSystem; + /* 0x60 */ MultiSceneActor* mScenarioSky; + /* 0x64 */ EffectSystem* mEffectSystem; /* 0x68 */ const CameraContext* mCameraContext; - /* 0x6C */ TVec2f mNewTextFollowPos; - /* 0x74 */ TVec2f mNewGreenTextFollowPos; - /* 0x7C */ TVec2f mQuestionPane[2]; - /* 0x8C */ TVec2f mStarTopFollowPos; - /* 0x94 */ BackButton* mBackButton; - /* 0x98 */ TVec2f mMarioPaneFollowPos; - /* 0xA0 */ const char* mMarioPaneName; - /* 0xA4 */ u32 _A4; - /* 0xA8 */ s32 _A8; + /* 0x6C */ TVec2f mNewTextFollowPos; + /* 0x74 */ TVec2f mNewGreenTextFollowPos; + /* 0x7C */ TVec2f mQuestionPane[2]; + /* 0x8C */ TVec2f mStarTopFollowPos; + /* 0x94 */ BackButton* mBackButton; + /* 0x98 */ TVec2f mMarioPaneFollowPos; + /* 0xA0 */ const char* mMarioPaneName; + /* 0xA4 */ u32 _A4; + /* 0xA8 */ s32 _A8; }; diff --git a/include/Game/Screen/SceneWipeHolder.hpp b/include/Game/Screen/SceneWipeHolder.hpp index eb013a6b9..b378364ea 100644 --- a/include/Game/Screen/SceneWipeHolder.hpp +++ b/include/Game/Screen/SceneWipeHolder.hpp @@ -10,8 +10,8 @@ public: namespace SceneWipeHolderFunction { SceneWipeHolder* getSceneWipeHolder(); - void openWipe(const char *, s32); - void closeWipe(const char *, s32); - void forceOpenWipe(const char *); - void forceCloseWipe(const char *); -}; + void openWipe(const char*, s32); + void closeWipe(const char*, s32); + void forceOpenWipe(const char*); + void forceCloseWipe(const char*); +}; // namespace SceneWipeHolderFunction diff --git a/include/Game/Screen/ScreenBlurEffect.hpp b/include/Game/Screen/ScreenBlurEffect.hpp index 9aa110245..f2b8d5ca2 100644 --- a/include/Game/Screen/ScreenBlurEffect.hpp +++ b/include/Game/Screen/ScreenBlurEffect.hpp @@ -22,7 +22,7 @@ public: private: /* 0x14 */ JUTTexture* _14; /* 0x18 */ JUTTexture* _18; - /* 0x1C */ f32 _1C; - /* 0x20 */ bool _20; - /* 0x24 */ f32 _24; + /* 0x1C */ f32 _1C; + /* 0x20 */ bool _20; + /* 0x24 */ f32 _24; }; diff --git a/include/Game/Screen/ScreenPreserver.hpp b/include/Game/Screen/ScreenPreserver.hpp index 31a41f92b..a48e144c3 100644 --- a/include/Game/Screen/ScreenPreserver.hpp +++ b/include/Game/Screen/ScreenPreserver.hpp @@ -14,5 +14,5 @@ public: void deactivate(); /* 0x0C */ bool mIsActive; - /* 0x0D */ u8 _D[3]; + /* 0x0D */ u8 _D[3]; }; diff --git a/include/Game/Screen/SimpleLayout.hpp b/include/Game/Screen/SimpleLayout.hpp index 2882e5074..eed056b9a 100644 --- a/include/Game/Screen/SimpleLayout.hpp +++ b/include/Game/Screen/SimpleLayout.hpp @@ -4,10 +4,10 @@ class SimpleLayout : public LayoutActor { public: - SimpleLayout(const char *, const char *, u32, int); + SimpleLayout(const char*, const char*, u32, int); }; class SimpleEffectLayout : public SimpleLayout { public: - SimpleEffectLayout(const char *, const char *, u32, int); + SimpleEffectLayout(const char*, const char*, u32, int); }; diff --git a/include/Game/Screen/StaffRoll.hpp b/include/Game/Screen/StaffRoll.hpp index 8503dcd65..1223eaffb 100644 --- a/include/Game/Screen/StaffRoll.hpp +++ b/include/Game/Screen/StaffRoll.hpp @@ -6,7 +6,7 @@ namespace nw4r { namespace lyt { class TexMap; }; -}; +}; // namespace nw4r class InformationMessage; @@ -55,40 +55,40 @@ public: virtual void calcAnim(); virtual void kill(); - void startInfo(); - bool isPauseOrEnd() const; - bool isNextLineEmpty() const; - void setNrvNextInfo(); - bool tryGenerateLine(); - void makeLine(); + void startInfo(); + bool isPauseOrEnd() const; + bool isNextLineEmpty() const; + void setNrvNextInfo(); + bool tryGenerateLine(); + void makeLine(); StaffRollLine* getDeadLineLayout() const; - void exePrepareDemo(); - void exePrepareBgm(); - void exeTitleLogoAppear(); - void exeTitleLogoScroll(); - void exeLineScroll(); - void exeEndLogoScroll(); - void exeAllRights(); - void exePrepareInfo(); - void exeInfoAppear(); - void exeInfoDisappear(); - void exePause(); - void exeRestart(); - void exePrepareSave(); - void exeSave(); - void exeEnd(); + void exePrepareDemo(); + void exePrepareBgm(); + void exeTitleLogoAppear(); + void exeTitleLogoScroll(); + void exeLineScroll(); + void exeEndLogoScroll(); + void exeAllRights(); + void exePrepareInfo(); + void exeInfoAppear(); + void exeInfoDisappear(); + void exePause(); + void exeRestart(); + void exePrepareSave(); + void exeSave(); + void exeEnd(); private: /* 0x20 */ InformationMessage* mInfo; - /* 0x24 */ StaffRollLine** mLine; - /* 0x28 */ StaffRollPicture* mPicture; - /* 0x2C */ const wchar_t* mMsg; - /* 0x30 */ u32 mMsgLineNum; - /* 0x34 */ u32 mMsgLine; - /* 0x38 */ TVec2f mTitleLogoPos; - /* 0x40 */ TVec2f mEndLogoPos; - /* 0x48 */ s32 _48; - /* 0x4C */ s32 _4C; + /* 0x24 */ StaffRollLine** mLine; + /* 0x28 */ StaffRollPicture* mPicture; + /* 0x2C */ const wchar_t* mMsg; + /* 0x30 */ u32 mMsgLineNum; + /* 0x34 */ u32 mMsgLine; + /* 0x38 */ TVec2f mTitleLogoPos; + /* 0x40 */ TVec2f mEndLogoPos; + /* 0x48 */ s32 _48; + /* 0x4C */ s32 _4C; }; namespace MR { diff --git a/include/Game/Screen/StageResultInformer.hpp b/include/Game/Screen/StageResultInformer.hpp index dfc40d95c..3cb5ea5b9 100644 --- a/include/Game/Screen/StageResultInformer.hpp +++ b/include/Game/Screen/StageResultInformer.hpp @@ -17,7 +17,7 @@ public: void exeIdle(); /* 0x08 */ StageResultInformer* mHost; - /* 0x0C */ const char* mMessageId; + /* 0x0C */ const char* mMessageId; }; class StageResultInformer : public LayoutActor { @@ -56,9 +56,9 @@ public: private: /* 0x20 */ DisplayInformationForResult* mInformationDisplayer; - /* 0x24 */ StageResultSequenceChecker* mSequenceChecker; - /* 0x28 */ IconAButton* mIconAButton; - /* 0x2C */ s32 mClearedStarPieceNum; - /* 0x30 */ bool _30; - /* 0x30 */ bool _31; + /* 0x24 */ StageResultSequenceChecker* mSequenceChecker; + /* 0x28 */ IconAButton* mIconAButton; + /* 0x2C */ s32 mClearedStarPieceNum; + /* 0x30 */ bool _30; + /* 0x30 */ bool _31; }; diff --git a/include/Game/Screen/StarCounter.hpp b/include/Game/Screen/StarCounter.hpp index ae759a27a..e68599476 100644 --- a/include/Game/Screen/StarCounter.hpp +++ b/include/Game/Screen/StarCounter.hpp @@ -22,7 +22,7 @@ public: void exeDisappear(); private: - /* 0x20 */ s32 mPowerStarNum; + /* 0x20 */ s32 mPowerStarNum; /* 0x24 */ CounterLayoutAppearer* mLayoutAppearer; - /* 0x28 */ CountUpPaneRumbler* mPaneRumbler; + /* 0x28 */ CountUpPaneRumbler* mPaneRumbler; }; diff --git a/include/Game/Screen/StarPieceCounter.hpp b/include/Game/Screen/StarPieceCounter.hpp index f384b10d4..2425931fa 100644 --- a/include/Game/Screen/StarPieceCounter.hpp +++ b/include/Game/Screen/StarPieceCounter.hpp @@ -31,12 +31,12 @@ public: void exeWait(); void exeDisappear(); - /* 0x20 */ s32 mStarPieceNum; - /* 0x24 */ s32 mStarPieceDisplayNum; - /* 0x28 */ s32 mInvalidCountUpFrame; + /* 0x20 */ s32 mStarPieceNum; + /* 0x24 */ s32 mStarPieceDisplayNum; + /* 0x28 */ s32 mInvalidCountUpFrame; /* 0x2C */ CounterLayoutAppearer* mLayoutAppearer; - /* 0x30 */ CountUpPaneRumbler* mPaneRumbler; - /* 0x34 */ TVec2f mFollowPos; - /* 0x38 */ s32 _3C; - /* 0x3C */ int mMode; + /* 0x30 */ CountUpPaneRumbler* mPaneRumbler; + /* 0x34 */ TVec2f mFollowPos; + /* 0x38 */ s32 _3C; + /* 0x3C */ int mMode; }; diff --git a/include/Game/Screen/StarPointerController.hpp b/include/Game/Screen/StarPointerController.hpp index 1048c93bc..b1edfdbd6 100644 --- a/include/Game/Screen/StarPointerController.hpp +++ b/include/Game/Screen/StarPointerController.hpp @@ -8,29 +8,29 @@ public: DpdInfo(); TVec2f _0; - u8 _8; - u8 _9; - u32 _C; - f32 mViewDistZ; // 0x10 + u8 _8; + u8 _9; + u32 _C; + f32 mViewDistZ; // 0x10 }; class StarPointerController { public: StarPointerController(); - s32 mPort; // 0x0 + s32 mPort; // 0x0 DpdInfo _4; DpdInfo _18; - TVec2f _2C; - u32 _34; - u32 _38; - u32 _3C; - u32 _40; - u32 _44; - u32 _48; - u32 _4C; - TVec2f _50; - TVec3f _58; - TVec3f _64; - u8 _70; + TVec2f _2C; + u32 _34; + u32 _38; + u32 _3C; + u32 _40; + u32 _44; + u32 _48; + u32 _4C; + TVec2f _50; + TVec3f _58; + TVec3f _64; + u8 _70; }; \ No newline at end of file diff --git a/include/Game/Screen/StarPointerDirector.hpp b/include/Game/Screen/StarPointerDirector.hpp index 5f5a324c2..808538d7a 100644 --- a/include/Game/Screen/StarPointerDirector.hpp +++ b/include/Game/Screen/StarPointerDirector.hpp @@ -11,21 +11,21 @@ public: virtual void drawSyncCallback(u16); - u16 mToken; // 0x4 - u32 _8; - f32 mProjection; // 0xC - u32 _10; - u32 _14; - u32 _18; - u32 _1C; - u32 _20; - u32 _24; - f32* mViewport; // 0x28 - u32 _2C; - u32 _30; - u32 _34; - u32 _38; - u32 _3C; + u16 mToken; // 0x4 + u32 _8; + f32 mProjection; // 0xC + u32 _10; + u32 _14; + u32 _18; + u32 _1C; + u32 _20; + u32 _24; + f32* mViewport; // 0x28 + u32 _2C; + u32 _30; + u32 _34; + u32 _38; + u32 _3C; }; class StarPointerTransformHolder { @@ -34,10 +34,10 @@ public: void movement(); - Mtx _0; + Mtx _0; Mtx44 _30; - f32 mFovy; // 0x70 - f32 _74; + f32 mFovy; // 0x70 + f32 _74; }; class StarPointerDirector { @@ -47,17 +47,17 @@ public: void draw(); void update(); - u8 _0; - u8 _1; - u8 _2; - u8 _3; - StarPointerController* mControllers; // 0x4 - StarPointerLayout* mStarPointerLayouts; // 0x8 - StarPointerTransformHolder* mTransHolder; // 0xC - StarPointerPeekZ* mPeekZ; // 0x10 - u32* _14; - u32 _18; - u32 _1C; - u32 _20; - u32 _24; + u8 _0; + u8 _1; + u8 _2; + u8 _3; + StarPointerController* mControllers; // 0x4 + StarPointerLayout* mStarPointerLayouts; // 0x8 + StarPointerTransformHolder* mTransHolder; // 0xC + StarPointerPeekZ* mPeekZ; // 0x10 + u32* _14; + u32 _18; + u32 _1C; + u32 _20; + u32 _24; }; \ No newline at end of file diff --git a/include/Game/Screen/SubMeterLayout.hpp b/include/Game/Screen/SubMeterLayout.hpp index 0376471de..28935c699 100644 --- a/include/Game/Screen/SubMeterLayout.hpp +++ b/include/Game/Screen/SubMeterLayout.hpp @@ -4,9 +4,9 @@ class SubMeterLayout : public LayoutActor { public: - SubMeterLayout(const char *, const char *); + SubMeterLayout(const char*, const char*); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); virtual void control(); void setLifeRatio(f32); @@ -15,8 +15,8 @@ public: void requestFrameIn(); void requestFrameOut(); - u8 _20; - u8 _21; + u8 _20; + u8 _21; u16 _22; u16 _24; u16 _26; diff --git a/include/Game/Screen/SuddenDeathMeter.hpp b/include/Game/Screen/SuddenDeathMeter.hpp index 1ee97a548..03c7e1b21 100644 --- a/include/Game/Screen/SuddenDeathMeter.hpp +++ b/include/Game/Screen/SuddenDeathMeter.hpp @@ -7,9 +7,9 @@ class CountUpPaneRumbler; class SuddenDeathMeter : public LayoutActor { public: - SuddenDeathMeter(const char *, const char *); + SuddenDeathMeter(const char*, const char*); - virtual void init(const JMapInfoIter &rIter); + virtual void init(const JMapInfoIter& rIter); virtual void control(); void requestActive(); @@ -27,17 +27,17 @@ public: void exeZeroMeterBreak(); void initCount(s32); void setCount(s32); - void calcMarioHeadPosition(TVec2f *) const; - void calcPowerUpMeterBasePosition(TVec2f *) const; - void setPowerUpMeterPosition(const TVec2f &); + void calcMarioHeadPosition(TVec2f*) const; + void calcPowerUpMeterBasePosition(TVec2f*) const; + void setPowerUpMeterPosition(const TVec2f&); void setAnimBase(); void setCountAnimFrame(); void setRecoveryCountAnimFrame(); - CountUpPaneRumbler *mCountUpPaneRumbler; // 0x20 - TVec2f mFollowPosW; // 0x24 - TVec2f _2C; // 0x2C - s32 mCount; // 0x34 - f32 _38; // 0x38 - f32 _3C; // 0x3C + CountUpPaneRumbler* mCountUpPaneRumbler; // 0x20 + TVec2f mFollowPosW; // 0x24 + TVec2f _2C; // 0x2C + s32 mCount; // 0x34 + f32 _38; // 0x38 + f32 _3C; // 0x3C }; diff --git a/include/Game/Screen/SurfingGuidance.hpp b/include/Game/Screen/SurfingGuidance.hpp index 21d7e3161..e5db292f8 100644 --- a/include/Game/Screen/SurfingGuidance.hpp +++ b/include/Game/Screen/SurfingGuidance.hpp @@ -6,7 +6,7 @@ class SurfingGuidance : public LayoutActor { public: SurfingGuidance(); - virtual void init(const JMapInfoIter &); + virtual void init(const JMapInfoIter&); void activate(); void levelOffReady(); @@ -35,5 +35,5 @@ private: /* 0x20 */ u32 _20; /* 0x24 */ f32 _24; /* 0x28 */ u32 _28; - /* 0x2C */ u8 _2C; + /* 0x2C */ u8 _2C; }; diff --git a/include/Game/Screen/SysInfoWindow.hpp b/include/Game/Screen/SysInfoWindow.hpp index 2d52cb0ea..4b8f18947 100644 --- a/include/Game/Screen/SysInfoWindow.hpp +++ b/include/Game/Screen/SysInfoWindow.hpp @@ -2,7 +2,7 @@ #include "Game/Screen/LayoutActor.hpp" -typedef void (MessageChangeFunc)(LayoutActor*, const char*, const char*); +typedef void(MessageChangeFunc)(LayoutActor*, const char*, const char*); class IconAButton; class YesNoController; @@ -12,7 +12,7 @@ struct MessageChangeFuncTableEntry { }; class SysInfoWindow : public LayoutActor { - public: +public: enum SysInfoWindowType { WindowType_Normal, WindowType_Mini, @@ -49,32 +49,32 @@ class SysInfoWindow : public LayoutActor { virtual void kill(); virtual void control(); - void appear(const char*, SysInfoType, SysInfoTextPos, SysInfoMessageType); - void disappear(); - void forceKill(); - bool isWait() const; - bool isSelectedYes() const; - bool isDisappear() const; + void appear(const char*, SysInfoType, SysInfoTextPos, SysInfoMessageType); + void disappear(); + void forceKill(); + bool isWait() const; + bool isSelectedYes() const; + bool isDisappear() const; const char* getLayoutName() const; - void exeAppear(); - void exeWait(); - void exeDisappear(); - void setYesNoSelectorSE(const char*,const char*,const char*); - void resetYesNoSelectorSE(); - void setTextBoxArgNumber(s32, s32); - void setTextBoxArgString(const wchar_t*, s32); + void exeAppear(); + void exeWait(); + void exeDisappear(); + void setYesNoSelectorSE(const char*, const char*, const char*); + void resetYesNoSelectorSE(); + void setTextBoxArgNumber(s32, s32); + void setTextBoxArgString(const wchar_t*, s32); /* 0x20 */ SysInfoWindowType mWindowType; - /* 0x24 */ SysInfoType mType; - /* 0x28 */ YesNoController* mYesNoSelector; - /* 0x2C */ IconAButton* mIconAButton; - /* 0x30 */ const char* mTextParentPaneName; - /* 0x34 */ const char* mWindowParentPaneName; - /* 0x38 */ bool _38; + /* 0x24 */ SysInfoType mType; + /* 0x28 */ YesNoController* mYesNoSelector; + /* 0x2C */ IconAButton* mIconAButton; + /* 0x30 */ const char* mTextParentPaneName; + /* 0x34 */ const char* mWindowParentPaneName; + /* 0x38 */ bool _38; }; namespace MR { SysInfoWindow* createSysInfoWindow(); SysInfoWindow* createSysInfoWindowExecuteWithChildren(); SysInfoWindow* createSysInfoWindowMiniExecuteWithChildren(); -}; +}; // namespace MR diff --git a/include/Game/Screen/THPSimplePlayerWrapper.hpp b/include/Game/Screen/THPSimplePlayerWrapper.hpp index e7180c5c0..a91a620ce 100644 --- a/include/Game/Screen/THPSimplePlayerWrapper.hpp +++ b/include/Game/Screen/THPSimplePlayerWrapper.hpp @@ -8,39 +8,38 @@ class THPSimplePlayerWrapper; class THPSimplePlayerStaticAudio { - public: - THPSimplePlayerStaticAudio(); - - static s16* audioCallback(s32); - static THPSimplePlayerWrapper* mPlayer; - }; - +public: + THPSimplePlayerStaticAudio(); + + static s16* audioCallback(s32); + static THPSimplePlayerWrapper* mPlayer; +}; class THPSimplePlayerWrapper : public NerveExecutor { public: - THPSimplePlayerWrapper(const char *); + THPSimplePlayerWrapper(const char*); bool init(s32); void quit(); - bool open(const char *); + bool open(const char*); bool close(); - s32 getUseTextureCount() const; - u32 calcNeedMemory(); - bool setBuffer(u8 *); + s32 getUseTextureCount() const; + u32 calcNeedMemory(); + bool setBuffer(u8*); bool preLoad(s32); bool loadStop(); - s32 decode(s32); - s32 drawCurrentFrame(_GXRenderModeObj *, u32, u32, u32, u32); - bool getVideoInfo(THPVideoInfo *) const; - f32 getFrameRate() const; - s32 getTotalFrame() const; - bool videoDecode(u8 *); + s32 decode(s32); + s32 drawCurrentFrame(_GXRenderModeObj*, u32, u32, u32, u32); + bool getVideoInfo(THPVideoInfo*) const; + f32 getFrameRate() const; + s32 getTotalFrame() const; + bool videoDecode(u8*); void readFrameAsync(); void checkPrefetch(); void dvdCallBack(s32); void readAsyncCallBack(s32); - s32 getNextBuffer(u32) const NO_INLINE; - bool tryDvdOpen(const char *); + s32 getNextBuffer(u32) const NO_INLINE; + bool tryDvdOpen(const char*); void setupParams(); void exeReadHeader(); void exeReadFrameComp(); @@ -57,59 +56,58 @@ public: void initAudio(); bool isAudioProcessValid(); s16* audioCallback(s32); - void mixAudio(s16 *, u32); + void mixAudio(s16*, u32); void resetAudioParams(); bool setVolume(s32, s32); bool isPreLoading() const; void setUnpauseFrameFlag(); void exeWait() { - } static THPSimplePlayerStaticAudio mStaticAudioPlayer; - - u8 _8; - u8 _9; - u32 _C; - u32 _10; - DVDFileInfo mFileInfo; // 0x14 - THPHeader mHeader; // 0x50 - THPFrameCompInfo mFrameComp; // 0x80 - THPVideoInfo mVideoInfo; // 0x94 - THPAudioInfo mAudioInfo; // 0xA0 - void* mTHPWork; // 0xB0 - u8 mOpen; // 0xB4 - u8 mPreFetchState; // 0xB5 - u8 mAudioState; // 0xB6 - u8 mLoop; // 0xB7 - u8 mAudioExist; // 0xB8 - u32 mCurOffset; // 0xBC - u8 mDvdError; // 0xC0 - u32 mReadProgress; // 0xC4 - s32 mNextDecodeIndex; // 0xC8 - volatile s32 mReadIndex; // 0xCC - s32 mReadSize; // 0xD0 - s32 mTotalReadFrame; // 0xD4 - f32 mCurrentVolume; // 0xD8 - f32 mTargetVolume; // 0xDC - f32 mDeltaVolume; // 0xE0 - s32 mRampCount; // 0xE4 - THPReadBuffer mReadBuffer[0x14]; // 0xE8 - THPTextureSet mTextureSet[2]; // 0x1D8 - THPAudioBuffer mAudioBuffer[0x14]; // 0x1F8 - s32 mAudioDecodeIndex; // 0x2E8 - s32 mAudioOutputIndex; // 0x2EC - u8 _2F0; - f32 _2F4; - f32 _2F8; - s32 _2FC; - s32* mSoundBuffer[2]; // 0x300 - u32 mSoundBufferIndex; // 0x308 - u8 _30C; - u8 _30D; - u8 _30E; - u8 _30F; - u8 _310; - s32 _314; + + u8 _8; + u8 _9; + u32 _C; + u32 _10; + DVDFileInfo mFileInfo; // 0x14 + THPHeader mHeader; // 0x50 + THPFrameCompInfo mFrameComp; // 0x80 + THPVideoInfo mVideoInfo; // 0x94 + THPAudioInfo mAudioInfo; // 0xA0 + void* mTHPWork; // 0xB0 + u8 mOpen; // 0xB4 + u8 mPreFetchState; // 0xB5 + u8 mAudioState; // 0xB6 + u8 mLoop; // 0xB7 + u8 mAudioExist; // 0xB8 + u32 mCurOffset; // 0xBC + u8 mDvdError; // 0xC0 + u32 mReadProgress; // 0xC4 + s32 mNextDecodeIndex; // 0xC8 + volatile s32 mReadIndex; // 0xCC + s32 mReadSize; // 0xD0 + s32 mTotalReadFrame; // 0xD4 + f32 mCurrentVolume; // 0xD8 + f32 mTargetVolume; // 0xDC + f32 mDeltaVolume; // 0xE0 + s32 mRampCount; // 0xE4 + THPReadBuffer mReadBuffer[0x14]; // 0xE8 + THPTextureSet mTextureSet[2]; // 0x1D8 + THPAudioBuffer mAudioBuffer[0x14]; // 0x1F8 + s32 mAudioDecodeIndex; // 0x2E8 + s32 mAudioOutputIndex; // 0x2EC + u8 _2F0; + f32 _2F4; + f32 _2F8; + s32 _2FC; + s32* mSoundBuffer[2]; // 0x300 + u32 mSoundBufferIndex; // 0x308 + u8 _30C; + u8 _30D; + u8 _30E; + u8 _30F; + u8 _310; + s32 _314; }; diff --git a/include/Game/Screen/TimeLimitLayout.hpp b/include/Game/Screen/TimeLimitLayout.hpp index 1001c3abb..be0650114 100644 --- a/include/Game/Screen/TimeLimitLayout.hpp +++ b/include/Game/Screen/TimeLimitLayout.hpp @@ -5,8 +5,8 @@ class ValueControl; struct Timing { - /* 0x0 */ s32 mScaleStartFrame; - /* 0x4 */ s32 mScaleKeepFrame; + /* 0x0 */ s32 mScaleStartFrame; + /* 0x4 */ s32 mScaleKeepFrame; /* 0x8 */ bool mIsScaleUp; /* 0x9 */ bool mIsScaleDown; /* 0xA */ bool _A; @@ -15,10 +15,8 @@ struct Timing { class TimeUpLayout : public LayoutActor { public: /// @brief Creates a new `TimeUpLayout`. - TimeUpLayout() : - LayoutActor("タイムアップ画面", true) - { - + TimeUpLayout() + : LayoutActor("タイムアップ画面", true) { } virtual void init(const JMapInfoIter& rIter); @@ -33,28 +31,28 @@ public: virtual void kill(); virtual void control(); - void setTimeLimit(u32); - void setDisplayModeOnNormal(bool); - bool isReadyToTimeUp() const; - void resetFrame(); - void addFrame(); - void updateTextBox(); - void exeAppear(); - void exeCountDown(); - void exeScaleUp(); - void exeScaleKeep(); - void exeScaleDown(); - void exeFadeout(); - void exeTimeUpReady(); + void setTimeLimit(u32); + void setDisplayModeOnNormal(bool); + bool isReadyToTimeUp() const; + void resetFrame(); + void addFrame(); + void updateTextBox(); + void exeAppear(); + void exeCountDown(); + void exeScaleUp(); + void exeScaleKeep(); + void exeScaleDown(); + void exeFadeout(); + void exeTimeUpReady(); const Timing* getCurrentTiming() const; - bool updateNormal(); + bool updateNormal(); private: - /* 0x20 */ u32 mTime; - /* 0x24 */ u32 mTimeLimit; + /* 0x20 */ u32 mTime; + /* 0x24 */ u32 mTimeLimit; /* 0x28 */ ValueControl* mScaleCtrl; /* 0x2C */ ValueControl* mAlphaCtrl; /* 0x30 */ const Timing* mCurrentTiming; - /* 0x34 */ bool mIsSuspend; - /* 0x35 */ bool _35; + /* 0x34 */ bool mIsSuspend; + /* 0x35 */ bool _35; }; diff --git a/include/Game/Screen/TitleSequenceProduct.hpp b/include/Game/Screen/TitleSequenceProduct.hpp index 329a92042..c71303986 100644 --- a/include/Game/Screen/TitleSequenceProduct.hpp +++ b/include/Game/Screen/TitleSequenceProduct.hpp @@ -30,11 +30,11 @@ public: private: /* 0x08 */ TitleSequenceProductSub::LogoLayout* mLogoLayout; - /* 0x0C */ SimpleLayout* mPressStartLayout; - /* 0x10 */ EncouragePal60Window* mEncouragePal60Window; - /* 0x14 */ TriggerChecker* mAButtonChecker; - /* 0x18 */ TriggerChecker* mBButtonChecker; - /* 0x1C */ bool mIsDisplayEncouragePal60Window; + /* 0x0C */ SimpleLayout* mPressStartLayout; + /* 0x10 */ EncouragePal60Window* mEncouragePal60Window; + /* 0x14 */ TriggerChecker* mAButtonChecker; + /* 0x18 */ TriggerChecker* mBButtonChecker; + /* 0x1C */ bool mIsDisplayEncouragePal60Window; }; namespace TitleSequenceProductSub { @@ -43,4 +43,4 @@ namespace TitleSequenceProductSub { /// @brief Creates a new `LogoLayout`. LogoLayout(); }; -}; +}; // namespace TitleSequenceProductSub diff --git a/include/Game/Screen/WipeFade.hpp b/include/Game/Screen/WipeFade.hpp index 24905c56d..2a7ab32d3 100644 --- a/include/Game/Screen/WipeFade.hpp +++ b/include/Game/Screen/WipeFade.hpp @@ -19,8 +19,8 @@ public: virtual bool isWipeOut() const; private: - /* 0x20 */ bool mIsWipeIn; - /* 0x24 */ s32 mStepNum; - /* 0x28 */ s32 mStep; + /* 0x20 */ bool mIsWipeIn; + /* 0x24 */ s32 mStepNum; + /* 0x28 */ s32 mStep; /* 0x2C */ Color8 mFillColor; }; diff --git a/include/Game/Screen/WipeHolderBase.hpp b/include/Game/Screen/WipeHolderBase.hpp index c26982603..c046ddef9 100644 --- a/include/Game/Screen/WipeHolderBase.hpp +++ b/include/Game/Screen/WipeHolderBase.hpp @@ -10,22 +10,22 @@ class WipeHolderBase : public NameObj { public: WipeHolderBase(u32, const char*); - virtual void setCurrent(const char*); - virtual void wipe(const char*, s32); - virtual void forceClose(const char*); - virtual void forceOpen(const char*); - virtual bool isOpen() const; - virtual bool isClose() const; - virtual bool isWipeIn() const; - virtual bool isWipeOut() const; - virtual bool isCurrent(const char*) const; - virtual void addWipeLayout(WipeLayoutBase*); + virtual void setCurrent(const char*); + virtual void wipe(const char*, s32); + virtual void forceClose(const char*); + virtual void forceOpen(const char*); + virtual bool isOpen() const; + virtual bool isClose() const; + virtual bool isWipeIn() const; + virtual bool isWipeOut() const; + virtual bool isCurrent(const char*) const; + virtual void addWipeLayout(WipeLayoutBase*); virtual WipeLayoutBase* getCurrent() const; - virtual void updateWipe(const char*); + virtual void updateWipe(const char*); WipeLayoutBase* findWipe(const char*) const; private: - /* 0x0C */ WipeLayoutBase* mCurrentWipeLayout; - /* 0x10 */ MR::Vector > mWipeLayoutArray; + /* 0x0C */ WipeLayoutBase* mCurrentWipeLayout; + /* 0x10 */ MR::Vector> mWipeLayoutArray; }; diff --git a/include/Game/Screen/WipeLayoutBase.hpp b/include/Game/Screen/WipeLayoutBase.hpp index 9b6782efc..68f9f9147 100644 --- a/include/Game/Screen/WipeLayoutBase.hpp +++ b/include/Game/Screen/WipeLayoutBase.hpp @@ -4,9 +4,8 @@ class WipeLayoutBase : public LayoutActor { public: - WipeLayoutBase(const char* pName) : - LayoutActor(pName, true) - {} + WipeLayoutBase(const char* pName) + : LayoutActor(pName, true) {} virtual void wipe(s32) = 0; virtual void forceClose() = 0; diff --git a/include/Game/Screen/WipeRing.hpp b/include/Game/Screen/WipeRing.hpp index deb906eeb..2e2161d00 100644 --- a/include/Game/Screen/WipeRing.hpp +++ b/include/Game/Screen/WipeRing.hpp @@ -18,8 +18,8 @@ public: void setCenterPos(const TVec3f&); void startAnim(const char*); bool getMarioCenterPos(TVec3f*); - f32 calcRadius() const; - f32 calcMaxRadius() const; + f32 calcRadius() const; + f32 calcMaxRadius() const; void updatePlayerPos(); void exeWipeClose(); void exeWipeIn(); @@ -28,8 +28,8 @@ public: private: /* 0x20 */ TVec2f _20; - /* 0x28 */ s32 mStepNum; - /* 0x2C */ f32 _2C; - /* 0x30 */ f32 _30; - /* 0x24 */ bool _34; + /* 0x28 */ s32 mStepNum; + /* 0x2C */ f32 _2C; + /* 0x30 */ f32 _30; + /* 0x24 */ bool _34; }; diff --git a/include/Game/Screen/YesNoController.hpp b/include/Game/Screen/YesNoController.hpp index 66afef3f4..a41cbba60 100644 --- a/include/Game/Screen/YesNoController.hpp +++ b/include/Game/Screen/YesNoController.hpp @@ -28,11 +28,11 @@ public: void exeSelected(); void exeNotSelected(); - /* 0x08 */ LayoutActor* mHost; - /* 0x0C */ bool _C; + /* 0x08 */ LayoutActor* mHost; + /* 0x0C */ bool _C; /* 0x10 */ ButtonPaneController* mButtonYesPaneCtrl; /* 0x14 */ ButtonPaneController* mButtonNoPaneCtrl; - /* 0x18 */ const char* mCursorSE; - /* 0x1C */ const char* mYesSE; - /* 0x20 */ const char* mNoSE; + /* 0x18 */ const char* mCursorSE; + /* 0x1C */ const char* mYesSE; + /* 0x20 */ const char* mNoSE; }; diff --git a/include/Game/Screen/YesNoLayout.hpp b/include/Game/Screen/YesNoLayout.hpp index c9f9feca4..3b4419dbf 100644 --- a/include/Game/Screen/YesNoLayout.hpp +++ b/include/Game/Screen/YesNoLayout.hpp @@ -19,5 +19,5 @@ public: void exeSelecting(); /* 0x20 */ YesNoController* mController; - /* 0x24 */ bool _24; + /* 0x24 */ bool _24; }; diff --git a/include/Game/SingletonHolder.hpp b/include/Game/SingletonHolder.hpp index a1e96df74..76a2cd159 100644 --- a/include/Game/SingletonHolder.hpp +++ b/include/Game/SingletonHolder.hpp @@ -1,6 +1,6 @@ #pragma once -template +template class SingletonHolder { public: static void init() { @@ -17,10 +17,10 @@ private: static T* sInstance; }; -template +template T* SingletonHolder::sInstance; -template +template class AudSingletonHolder { public: static void init() { @@ -37,5 +37,5 @@ private: static T* sInstance; }; -template +template T* AudSingletonHolder::sInstance; diff --git a/include/Game/Speaker/SpkData.hpp b/include/Game/Speaker/SpkData.hpp index 5fdbd9987..55748a19c 100644 --- a/include/Game/Speaker/SpkData.hpp +++ b/include/Game/Speaker/SpkData.hpp @@ -6,17 +6,17 @@ #include "revolution.h" // This is something JKernel related, but idk what it is for the time being. -extern void* FUN_8040f918(JKRArchive * pArchive, u16 id); +extern void* FUN_8040f918(JKRArchive* pArchive, u16 id); class SpkData { public: - SpkData(JKRArchive *); + SpkData(JKRArchive*); void loadTable(u16); void loadWave(u16); bool isValid() const; - SpkTable mTable; // 0x0 - SpkWave mWave; // 0x4 - JKRArchive* mArchive; // 0x14 + SpkTable mTable; // 0x0 + SpkWave mWave; // 0x4 + JKRArchive* mArchive; // 0x14 }; \ No newline at end of file diff --git a/include/Game/Speaker/SpkMixingBuffer.hpp b/include/Game/Speaker/SpkMixingBuffer.hpp index 014322cd7..f6fa9c012 100644 --- a/include/Game/Speaker/SpkMixingBuffer.hpp +++ b/include/Game/Speaker/SpkMixingBuffer.hpp @@ -5,11 +5,11 @@ class SpkMixingBuffer { public: - SpkMixingBuffer(JKRHeap *); + SpkMixingBuffer(JKRHeap*); - void mix(s32, s16 *, s32, f32, s32); + void mix(s32, s16*, s32, f32, s32); const s16* getSamples(s32) const; - bool update(s32); + bool update(s32); const s16* mSamples[4]; }; \ No newline at end of file diff --git a/include/Game/Speaker/SpkSound.hpp b/include/Game/Speaker/SpkSound.hpp index 57881b9c4..94d6693f2 100644 --- a/include/Game/Speaker/SpkSound.hpp +++ b/include/Game/Speaker/SpkSound.hpp @@ -10,7 +10,7 @@ class SpkSoundHandle { public: void releaseSound(); - SpkSound* mSound; // 0x0 + SpkSound* mSound; // 0x0 }; class SpkSoundVolume { @@ -19,7 +19,7 @@ public: void setRelease(s32); void setFadeOut(s32); - f32 calc(bool &); + f32 calc(bool&); f32 _0; f32 _4; @@ -38,25 +38,25 @@ public: void update(f32); void stop(s32); - void attachHandle(SpkSoundHandle *); + void attachHandle(SpkSoundHandle*); void releaseHandle(); bool start(s32, s32); void unlock(); bool setWaveData(s32); - SpkSoundHandle* mSoundHandle; // 0x10 - s32 _14; - u32 _18; - u32 _1C; - u32 _20; - u32 _24; - u32 _28; - u32 _2C; - s32 _30; - s32 _34; - s32 _38; - s32 _3C; - SpkSoundVolume mVolume; // 0x40 + SpkSoundHandle* mSoundHandle; // 0x10 + s32 _14; + u32 _18; + u32 _1C; + u32 _20; + u32 _24; + u32 _28; + u32 _2C; + s32 _30; + s32 _34; + s32 _38; + s32 _3C; + SpkSoundVolume mVolume; // 0x40 }; class SpkSoundHolder : JASGlobalInstance { @@ -66,12 +66,12 @@ public: bool update(s32); bool updateEachSound(s32); - void startSound(s32, s32, SpkSoundHandle *); + void startSound(s32, s32, SpkSoundHandle*); void framework(); - JSUList mSoundList[4]; // 0x0 - f32 _30[4]; - f32 _40; - u32 _44; + JSUList mSoundList[4]; // 0x0 + f32 _30[4]; + f32 _40; + u32 _44; }; \ No newline at end of file diff --git a/include/Game/Speaker/SpkSpeakerCtrl.hpp b/include/Game/Speaker/SpkSpeakerCtrl.hpp index 422d7da6b..5172d8b0c 100644 --- a/include/Game/Speaker/SpkSpeakerCtrl.hpp +++ b/include/Game/Speaker/SpkSpeakerCtrl.hpp @@ -6,23 +6,23 @@ class SpkMixingBuffer; struct SpeakerInfo { - u8 _0; - u8 _1; + u8 _0; + u8 _1; WENCInfo _2; - u8 _22; - u8 _23; - u32 _24; - u32 _28; - s32 _2C; - s32 _30; - u32 _34; - u32 _38; - u32 _3C; + u8 _22; + u8 _23; + u32 _24; + u32 _28; + s32 _2C; + s32 _30; + u32 _34; + u32 _38; + u32 _3C; }; class SpkSpeakerCtrl { public: - static void setMixingBuffer(SpkMixingBuffer *); + static void setMixingBuffer(SpkMixingBuffer*); static void setup(); static void connect(s32); static void disconnect(s32); @@ -37,8 +37,8 @@ public: static void reconnectProcess(s32); static void initReconnect(s32); static void continuousUsingProcess(s32); - static void updateSpeaker(OSAlarm *, OSContext *); + static void updateSpeaker(OSAlarm*, OSContext*); static bool isEnable(s32); static void extensionProcess(s32, s32); - static f32 getDeviceVolume(s32); + static f32 getDeviceVolume(s32); }; diff --git a/include/Game/Speaker/SpkSystem.hpp b/include/Game/Speaker/SpkSystem.hpp index 4607da0d0..66dcb32e0 100644 --- a/include/Game/Speaker/SpkSystem.hpp +++ b/include/Game/Speaker/SpkSystem.hpp @@ -8,20 +8,20 @@ class SpkSystem : JASGlobalInstance { public: - SpkSystem(JKRHeap *); + SpkSystem(JKRHeap*); - void setResource(JKRArchive *, u16, u16); - void framework(); - void startSound(s32, s32, SpkSoundHandle *); + void setResource(JKRArchive*, u16, u16); + void framework(); + void startSound(s32, s32, SpkSoundHandle*); static void newSoundMemPool(s32); static void connect(s32); static void disconnect(s32); static void reconnect(s32); static void extensionProcess(s32, s32); - static f32 getDeviceVolume(s32); + static f32 getDeviceVolume(s32); - JKRHeap* mHeap; // 0x0 - SpkData* mData; // 0x4 - SpkMixingBuffer* mMixBuffer; // 0x8 - SpkSoundHolder* mSoundHolder; // 0xC + JKRHeap* mHeap; // 0x0 + SpkData* mData; // 0x4 + SpkMixingBuffer* mMixBuffer; // 0x8 + SpkSoundHolder* mSoundHolder; // 0xC }; \ No newline at end of file diff --git a/include/Game/Speaker/SpkTable.hpp b/include/Game/Speaker/SpkTable.hpp index 2224bbb34..ee52d33bc 100644 --- a/include/Game/Speaker/SpkTable.hpp +++ b/include/Game/Speaker/SpkTable.hpp @@ -3,24 +3,24 @@ #include "revolution.h" struct SpkFile { - u32 count; // 0x0 - u32 entryOffset; // 0x4 - u32 dataOffset; // 0x8 + u32 count; // 0x0 + u32 entryOffset; // 0x4 + u32 dataOffset; // 0x8 u32 _C; }; struct SpkTableData { - u32* dataArray; // 0x0 + u32* dataArray; // 0x0 }; class SpkTable { public: SpkTable(); - void setResource(void *); + void setResource(void*); - bool mInitialized; // 0x0 - u32 mResourceCount; // 0x4 - u32 mEntryOffset; // 0x8 - u32* mDataOffsets; // 0xC + bool mInitialized; // 0x0 + u32 mResourceCount; // 0x4 + u32 mEntryOffset; // 0x8 + u32* mDataOffsets; // 0xC }; \ No newline at end of file diff --git a/include/Game/Speaker/SpkWave.hpp b/include/Game/Speaker/SpkWave.hpp index ebb226f35..fe5eac205 100644 --- a/include/Game/Speaker/SpkWave.hpp +++ b/include/Game/Speaker/SpkWave.hpp @@ -13,11 +13,11 @@ class SpkWave { public: SpkWave(); - void setResource(void *); - u32 getWaveSize(s32) const; - u32 getLoopStartPos(s32) const; - u32 getLoopEndPos(s32) const; - u8** getWave(s32) const; + void setResource(void*); + u32 getWaveSize(s32) const; + u32 getLoopStartPos(s32) const; + u32 getLoopEndPos(s32) const; + u8** getWave(s32) const; WaveData* getWaveData(s32) const; /* 0x0 */ void* mResource; // Raw data of AudioRes/SpkRes/SpkRes.arc diff --git a/include/Game/System/AlreadyDoneFlagInGalaxy.hpp b/include/Game/System/AlreadyDoneFlagInGalaxy.hpp index 91d04d157..cff6ae209 100644 --- a/include/Game/System/AlreadyDoneFlagInGalaxy.hpp +++ b/include/Game/System/AlreadyDoneFlagInGalaxy.hpp @@ -8,8 +8,8 @@ public: AlreadyDoneInfo(); void clear(); - void init(const char *, s32, s32); - bool isEqual(const AlreadyDoneInfo &) const; + void init(const char*, s32, s32); + bool isEqual(const AlreadyDoneInfo&) const; void set(bool); u16 _0; @@ -22,9 +22,9 @@ public: AlreadyDoneFlagInGalaxy(int); void clear(); - u32 setupFlag(const char *, const JMapInfoIter &, u32 *); + u32 setupFlag(const char*, const JMapInfoIter&, u32*); - AlreadyDoneInfo* mDoneInfos; // 0x0 - int mNumInfos; // 0x4 - u32 _8; // 0x8 + AlreadyDoneInfo* mDoneInfos; // 0x0 + int mNumInfos; // 0x4 + u32 _8; // 0x8 }; \ No newline at end of file diff --git a/include/Game/System/ArchiveHolder.hpp b/include/Game/System/ArchiveHolder.hpp index 45d0402a5..76577a694 100644 --- a/include/Game/System/ArchiveHolder.hpp +++ b/include/Game/System/ArchiveHolder.hpp @@ -5,12 +5,12 @@ class ArchiveHolderArchiveEntry { public: - ArchiveHolderArchiveEntry(void *, JKRHeap *, const char *); + ArchiveHolderArchiveEntry(void*, JKRHeap*, const char*); ~ArchiveHolderArchiveEntry(); - JKRMemArchive* mArchive; // 0x0 - JKRHeap* mHeap; // 0x4 - char* mArchiveName; // 0x8 + JKRMemArchive* mArchive; // 0x0 + JKRHeap* mHeap; // 0x4 + char* mArchiveName; // 0x8 }; class ArchiveHolder { @@ -25,14 +25,14 @@ public: return &mEntries[mCurEntryNum]; } - ArchiveHolderArchiveEntry* createAndAdd(void *, JKRHeap *, const char *); - JKRMemArchive* getArchive(const char *) const; - void getArchiveAndHeap(const char *, JKRArchive **, JKRHeap **) const; - void removeIfIsEqualHeap(JKRHeap *); - ArchiveHolderArchiveEntry* findEntry(const char *) const; + ArchiveHolderArchiveEntry* createAndAdd(void*, JKRHeap*, const char*); + JKRMemArchive* getArchive(const char*) const; + void getArchiveAndHeap(const char*, JKRArchive**, JKRHeap**) const; + void removeIfIsEqualHeap(JKRHeap*); + ArchiveHolderArchiveEntry* findEntry(const char*) const; - ArchiveHolderArchiveEntry** mEntries; // 0x0 - s32 mMaxEntries; // 0x4 - s32 mCurEntryNum; // 0x8 - OSMutex mMutex; // 0xC + ArchiveHolderArchiveEntry** mEntries; // 0x0 + s32 mMaxEntries; // 0x4 + s32 mCurEntryNum; // 0x8 + OSMutex mMutex; // 0xC }; \ No newline at end of file diff --git a/include/Game/System/AudSystemWrapper.hpp b/include/Game/System/AudSystemWrapper.hpp index 6c2e017ee..6ce04b34e 100644 --- a/include/Game/System/AudSystemWrapper.hpp +++ b/include/Game/System/AudSystemWrapper.hpp @@ -2,13 +2,13 @@ #include #include -#include +#include class AudSystem; class AudSystemWrapper { public: - AudSystemWrapper(JKRSolidHeap *, JKRHeap *); + AudSystemWrapper(JKRSolidHeap*, JKRHeap*); void requestResourceForInitialize(); void createAudioSystem(); @@ -30,17 +30,17 @@ public: void resumeReset(); void receiveResourceForInitialize(); - /* 0x00 */ AudSystem* _0; + /* 0x00 */ AudSystem* _0; /* 0x04 */ JKRSolidHeap* _4; - /* 0x08 */ JKRHeap* _8; - /* 0x0C */ JKRArchive* mSMRArchive; - /* 0x10 */ JKRArchive* mJaiSeqArchive; - /* 0x14 */ JKRArchive* mJaiCoordArchive; - /* 0x18 */ JKRArchive* mJaiMeArchive; - /* 0x1C */ JKRArchive* mJaiRemixArchive; - /* 0x20 */ JKRExpHeap* _20; - /* 0x24 */ JKRArchive* mSpkResArchive; - /* 0x28 */ bool _28; - /* 0x29 */ bool _29; - /* 0x2A */ bool _2A; + /* 0x08 */ JKRHeap* _8; + /* 0x0C */ JKRArchive* mSMRArchive; + /* 0x10 */ JKRArchive* mJaiSeqArchive; + /* 0x14 */ JKRArchive* mJaiCoordArchive; + /* 0x18 */ JKRArchive* mJaiMeArchive; + /* 0x1C */ JKRArchive* mJaiRemixArchive; + /* 0x20 */ JKRExpHeap* _20; + /* 0x24 */ JKRArchive* mSpkResArchive; + /* 0x28 */ bool _28; + /* 0x29 */ bool _29; + /* 0x2A */ bool _2A; }; diff --git a/include/Game/System/BinaryDataChunkHolder.hpp b/include/Game/System/BinaryDataChunkHolder.hpp index 12486e039..5dae8044e 100644 --- a/include/Game/System/BinaryDataChunkHolder.hpp +++ b/include/Game/System/BinaryDataChunkHolder.hpp @@ -4,10 +4,10 @@ class BinaryDataChunkBase { public: - virtual u32 makeHeaderHashCode() const = 0; - virtual u32 getSignature() const = 0; - virtual s32 serialize(u8 *, u32) const = 0; - virtual s32 deserialize(const u8 *, u32) = 0; + virtual u32 makeHeaderHashCode() const = 0; + virtual u32 getSignature() const = 0; + virtual s32 serialize(u8*, u32) const = 0; + virtual s32 deserialize(const u8*, u32) = 0; virtual void initializeData() = 0; }; @@ -15,14 +15,14 @@ class BinaryDataChunkHolder { public: BinaryDataChunkHolder(u32, int); - void addChunk(BinaryDataChunkBase *); - s32 makeFileBinary(u8 *, u32); - bool loadFromFileBinary(const u8 *, u32); + void addChunk(BinaryDataChunkBase*); + s32 makeFileBinary(u8*, u32); + bool loadFromFileBinary(const u8*, u32); BinaryDataChunkBase* findFromSignature(u32) const; - BinaryDataChunkBase** mChunks; // 0x0 - s32 mMaxChunks; // 0x4 - s32 mNumChunks; // 0x8 - u8* mData; // 0xC - u32 _10; + BinaryDataChunkBase** mChunks; // 0x0 + s32 mMaxChunks; // 0x4 + s32 mNumChunks; // 0x8 + u8* mData; // 0xC + u32 _10; }; diff --git a/include/Game/System/BinaryDataContentAccessor.hpp b/include/Game/System/BinaryDataContentAccessor.hpp index 98fff6c9a..9560d66a1 100644 --- a/include/Game/System/BinaryDataContentAccessor.hpp +++ b/include/Game/System/BinaryDataContentAccessor.hpp @@ -4,23 +4,23 @@ class BinaryDataContentHeaderSerializer { public: - BinaryDataContentHeaderSerializer(u8 *, u32); + BinaryDataContentHeaderSerializer(u8*, u32); - void addAttribute(const char *, u32); + void addAttribute(const char*, u32); void flush(); - u32 getHeaderSize() const; - u32 getDataSize() const; + u32 getHeaderSize() const; + u32 getDataSize() const; /* 0x00 */ JSUMemoryOutputStream mStream; - /* 0x14 */ u32 mAttributeNum; - /* 0x18 */ u32 mDataSize; + /* 0x14 */ u32 mAttributeNum; + /* 0x18 */ u32 mDataSize; }; class BinaryDataContentAccessor { public: - BinaryDataContentAccessor(u8 *); + BinaryDataContentAccessor(u8*); - u32 getHeaderSize() const; - u32 getDataSize() const; - void* getPointer(const char *, u8 *) const; + u32 getHeaderSize() const; + u32 getDataSize() const; + void* getPointer(const char*, u8*) const; }; diff --git a/include/Game/System/ConfigDataHolder.hpp b/include/Game/System/ConfigDataHolder.hpp index 1419183b7..45f9c9498 100644 --- a/include/Game/System/ConfigDataHolder.hpp +++ b/include/Game/System/ConfigDataHolder.hpp @@ -12,29 +12,29 @@ class ConfigDataHolder { public: ConfigDataHolder(); - void setIsCreated(bool); - bool isCreated() const; - void setLastLoadedMario(bool); - bool isLastLoadedMario() const; - void onCompleteEndingMario(); - void onCompleteEndingLuigi(); - bool isOnCompleteEndingMario(); - bool isOnCompleteEndingLuigi(); - void updateLastModified(); + void setIsCreated(bool); + bool isCreated() const; + void setLastLoadedMario(bool); + bool isLastLoadedMario() const; + void onCompleteEndingMario(); + void onCompleteEndingLuigi(); + bool isOnCompleteEndingMario(); + bool isOnCompleteEndingLuigi(); + void updateLastModified(); OSTime getLastModified() const; - void setMiiOrIconId(const void*, const u32*); - bool getMiiId(void*) const; - bool getIconId(u32*) const; - void resetAllData(); - s32 makeFileBinary(u8*, u32); - bool loadFromFileBinary(const char*, const u8*, u32); + void setMiiOrIconId(const void*, const u32*); + bool getMiiId(void*) const; + bool getIconId(u32*) const; + void resetAllData(); + s32 makeFileBinary(u8*, u32); + bool loadFromFileBinary(const char*, const u8*, u32); private: /* 0x00 */ BinaryDataChunkHolder* mChunkHolder; /* 0x04 */ ConfigDataCreateChunk* mCreateChunk; - /* 0x08 */ ConfigDataMii* mMii; - /* 0x0C */ ConfigDataMisc* mMisc; - /* 0x10 */ char mName[16]; + /* 0x08 */ ConfigDataMii* mMii; + /* 0x0C */ ConfigDataMisc* mMisc; + /* 0x10 */ char mName[16]; }; class ConfigDataCreateChunk : public BinaryDataChunkBase { @@ -43,10 +43,10 @@ class ConfigDataCreateChunk : public BinaryDataChunkBase { public: ConfigDataCreateChunk(); - virtual u32 makeHeaderHashCode() const; - virtual u32 getSignature() const; - virtual s32 serialize(u8*, u32) const; - virtual s32 deserialize(const u8*, u32); + virtual u32 makeHeaderHashCode() const; + virtual u32 getSignature() const; + virtual s32 serialize(u8*, u32) const; + virtual s32 deserialize(const u8*, u32); virtual void initializeData(); private: diff --git a/include/Game/System/ConfigDataMii.hpp b/include/Game/System/ConfigDataMii.hpp index ab47bb3db..4cc6a9d85 100644 --- a/include/Game/System/ConfigDataMii.hpp +++ b/include/Game/System/ConfigDataMii.hpp @@ -6,10 +6,10 @@ class ConfigDataMii : public BinaryDataChunkBase { public: ConfigDataMii(); - virtual u32 makeHeaderHashCode() const; - virtual u32 getSignature() const; - virtual s32 serialize(u8*, u32) const; - virtual s32 deserialize(const u8*, u32); + virtual u32 makeHeaderHashCode() const; + virtual u32 getSignature() const; + virtual s32 serialize(u8*, u32) const; + virtual s32 deserialize(const u8*, u32); virtual void initializeData(); void setMiiOrIconId(const void*, const u32*); @@ -17,7 +17,7 @@ public: bool getMiiId(void*) const; private: - /* 0x04 */ u8 mFlag; - /* 0x05 */ u8 mIconId; + /* 0x04 */ u8 mFlag; + /* 0x05 */ u8 mIconId; /* 0x08 */ void* mMiiId; }; diff --git a/include/Game/System/ConfigDataMisc.hpp b/include/Game/System/ConfigDataMisc.hpp index 9e7d42d8d..72fea34f3 100644 --- a/include/Game/System/ConfigDataMisc.hpp +++ b/include/Game/System/ConfigDataMisc.hpp @@ -6,22 +6,22 @@ class ConfigDataMisc : public BinaryDataChunkBase { public: ConfigDataMisc(); - virtual u32 makeHeaderHashCode() const; - virtual u32 getSignature() const; - virtual s32 serialize(u8*, u32) const; - virtual s32 deserialize(const u8*, u32); + virtual u32 makeHeaderHashCode() const; + virtual u32 getSignature() const; + virtual s32 serialize(u8*, u32) const; + virtual s32 deserialize(const u8*, u32); virtual void initializeData(); - bool isLastLoadedMario() const; - void setLastLoadedMario(bool); - void onCompleteEndingMario(); - void onCompleteEndingLuigi(); - bool isOnCompleteEndingMario(); - bool isOnCompleteEndingLuigi(); + bool isLastLoadedMario() const; + void setLastLoadedMario(bool); + void onCompleteEndingMario(); + void onCompleteEndingLuigi(); + bool isOnCompleteEndingMario(); + bool isOnCompleteEndingLuigi(); OSTime getLastModified() const; - void updateLastModified(); + void updateLastModified(); private: - /* 0x04 */ u8 mFlag; + /* 0x04 */ u8 mFlag; /* 0x08 */ OSTime mLastModified; }; diff --git a/include/Game/System/DrawBufferExecuter.hpp b/include/Game/System/DrawBufferExecuter.hpp index d60408dc7..a37c01b00 100644 --- a/include/Game/System/DrawBufferExecuter.hpp +++ b/include/Game/System/DrawBufferExecuter.hpp @@ -8,20 +8,20 @@ class LiveActor; class DrawBufferExecuter { public: - DrawBufferExecuter(const char *, J3DModel *, s32); + DrawBufferExecuter(const char*, J3DModel*, s32); - void add(LiveActor *); + void add(LiveActor*); - void findLightInfo(LiveActor *); + void findLightInfo(LiveActor*); void onExecuteLight(s32); void offExecuteLight(); void calcViewAndEntry(); - u8 _0[0x8]; - u32 _8; + u8 _0[0x8]; + u32 _8; const char* mName; // 0xC - u32 _10; - u32 _14; - u32 mDrawBufferCount; // 0x18 + u32 _10; + u32 _14; + u32 mDrawBufferCount; // 0x18 }; \ No newline at end of file diff --git a/include/Game/System/DrawBufferGroup.hpp b/include/Game/System/DrawBufferGroup.hpp index ada817f76..b04d448f6 100644 --- a/include/Game/System/DrawBufferGroup.hpp +++ b/include/Game/System/DrawBufferGroup.hpp @@ -10,20 +10,20 @@ public: DrawBufferGroup(); void init(s32); - s32 registerDrawBuffer(LiveActor *); - - void active(LiveActor *, s32); + s32 registerDrawBuffer(LiveActor*); - void findLightInfo(LiveActor *, s32); + void active(LiveActor*, s32); + + void findLightInfo(LiveActor*, s32); void entry(); void setDrawCameraType(s32); void setLightType(s32); - s32 findExecuterIndex(const char *) const; + s32 findExecuterIndex(const char*) const; - MR::Vector > _0; - MR::Vector > _C; - s32 mCount; // 0x18 - s32 _1C; // 0x1C - s32 _20; // 0x20 + MR::Vector> _0; + MR::Vector> _C; + s32 mCount; // 0x18 + s32 _1C; // 0x1C + s32 _20; // 0x20 }; \ No newline at end of file diff --git a/include/Game/System/DrawBufferHolder.hpp b/include/Game/System/DrawBufferHolder.hpp index 2990aa93a..d342b7c61 100644 --- a/include/Game/System/DrawBufferHolder.hpp +++ b/include/Game/System/DrawBufferHolder.hpp @@ -17,20 +17,20 @@ public: DrawBufferHolder(s32); DrawBufferHolder(); - void initTable(const DrawBufferInitialTable *, s32); + void initTable(const DrawBufferInitialTable*, s32); void allocateActorListBuffer(); - void active(LiveActor *, s32, s32); - s16 registerDrawBuffer(LiveActor *, s32); - void deactive(LiveActor *, s32, s32); - void findLightInfo(LiveActor *, s32, s32); + void active(LiveActor*, s32, s32); + s16 registerDrawBuffer(LiveActor*, s32); + void deactive(LiveActor*, s32, s32); + void findLightInfo(LiveActor*, s32, s32); void entry(s32); void drawOpa(s32) const; void drawXlu(s32) const; - DrawBufferGroup* mBufferGroup; // 0x0 - s32 mBufferGroupCount; // 0x4 - MR::Vector >* _8; - u8 _C[0x30-0xC]; + DrawBufferGroup* mBufferGroup; // 0x0 + s32 mBufferGroupCount; // 0x4 + MR::Vector>* _8; + u8 _C[0x30 - 0xC]; }; \ No newline at end of file diff --git a/include/Game/System/DrawSyncManager.hpp b/include/Game/System/DrawSyncManager.hpp index 9d2fd348e..439cd8061 100644 --- a/include/Game/System/DrawSyncManager.hpp +++ b/include/Game/System/DrawSyncManager.hpp @@ -5,13 +5,13 @@ class Fifo { public: Fifo* pop(); - u32 getLoopIdx(u32); - u32 getCount(); + u32 getLoopIdx(u32); + u32 getCount(); - Fifo** mArray; // 0x0 - u32 mCount; // 0x4 - u32 mLoopIdx; // 0x8 - u32 _C; + Fifo** mArray; // 0x0 + u32 mCount; // 0x4 + u32 mLoopIdx; // 0x8 + u32 _C; }; class DrawSyncManager { @@ -23,28 +23,28 @@ public: void reset(bool); static DrawSyncManager* start(u32, s32); - static void prepareReset(); - static void resetIfAborted(); + static void prepareReset(); + static void resetIfAborted(); - void clearFifo(); + void clearFifo(); static void end(); void pushBreakPoint(); void drawSyncCallback(u16); - + static DrawSyncManager* sInstance; - u8 _0[0x28]; - OSThread mThread; // 0x28 + u8 _0[0x28]; + OSThread mThread; // 0x28 OSMessageQueue mQueue; // 0x340 - u32 _360; - u32 _364; - Fifo* mFifo; // 0x368 - u16 _36C; - u16 _36E; - u16 _370; - u8 _372; - u8 _373; - u32 _374; + u32 _360; + u32 _364; + Fifo* mFifo; // 0x368 + u16 _36C; + u16 _36E; + u16 _370; + u8 _372; + u8 _373; + u32 _374; }; \ No newline at end of file diff --git a/include/Game/System/ErrorArchive.hpp b/include/Game/System/ErrorArchive.hpp index f4e320ba4..3d20afc9d 100644 --- a/include/Game/System/ErrorArchive.hpp +++ b/include/Game/System/ErrorArchive.hpp @@ -3,1682 +3,1681 @@ #include const u8 cErrorArchive[] = { - 82, 65, 82, 67, 0, 1, 202, 192, 0, 0, 0, 32, 0, 0, 16, 128, 0, 1, 186, 32, 0, 1, 186, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 32, 0, 0, 0, 138, 0, 0, 2, 128, 0, 0, 3, 32, 0, 0, 13, 96, 0, 138, 1, 0, 0, 0, 0, 0, 82, 79, 79, 84, 0, 0, - 0, 5, 183, 146, 0, 15, 0, 0, 0, 0, 74, 80, 74, 65, 0, 0, 0, 32, 68, 27, 0, 4, 0, 0, 0, 15, 77, 69, 83, 83, 0, 0, 0, 43, 138, 237, 0, 3, 0, 0, 0, 19, 76, 65, 89, 79, 0, 0, 0, 66, 15, 4, 0, 3, 0, 0, 0, 22, 85, 83, 69, 78, 0, 0, 0, 94, 70, 122, 0, 4, - 0, 0, 0, 25, 77, 69, 83, 83, 0, 0, 0, 104, 138, 237, 0, 3, 0, 0, 0, 29, 76, 65, 89, 79, 0, 0, 0, 127, 15, 4, 0, 3, 0, 0, 0, 32, 85, 83, 83, 80, 0, 0, 0, 155, 110, 142, 0, 4, 0, 0, 0, 35, 77, 69, 83, 83, 0, 0, 0, 165, 138, 237, 0, 3, 0, 0, 0, 39, 76, 65, - 89, 79, 0, 0, 0, 188, 15, 4, 0, 3, 0, 0, 0, 42, 85, 83, 70, 82, 0, 0, 0, 216, 195, 252, 0, 4, 0, 0, 0, 45, 77, 69, 83, 83, 0, 0, 0, 225, 138, 237, 0, 3, 0, 0, 0, 49, 76, 65, 89, 79, 0, 0, 0, 248, 15, 4, 0, 3, 0, 0, 0, 52, 69, 85, 69, 78, 0, 0, 1, 20, - 189, 128, 0, 4, 0, 0, 0, 55, 77, 69, 83, 83, 0, 0, 1, 30, 138, 237, 0, 3, 0, 0, 0, 59, 76, 65, 89, 79, 0, 0, 1, 53, 15, 4, 0, 3, 0, 0, 0, 62, 69, 85, 83, 80, 0, 0, 1, 81, 229, 148, 0, 4, 0, 0, 0, 65, 77, 69, 83, 83, 0, 0, 1, 91, 138, 237, 0, 3, 0, 0, - 0, 69, 76, 65, 89, 79, 0, 0, 1, 114, 15, 4, 0, 3, 0, 0, 0, 72, 69, 85, 70, 82, 0, 0, 1, 142, 64, 254, 0, 4, 0, 0, 0, 75, 77, 69, 83, 83, 0, 0, 1, 151, 138, 237, 0, 3, 0, 0, 0, 79, 76, 65, 89, 79, 0, 0, 1, 174, 15, 4, 0, 3, 0, 0, 0, 82, 69, 85, 71, 69, - 0, 0, 1, 202, 63, 42, 0, 4, 0, 0, 0, 85, 77, 69, 83, 83, 0, 0, 1, 211, 138, 237, 0, 3, 0, 0, 0, 89, 76, 65, 89, 79, 0, 0, 1, 234, 15, 4, 0, 3, 0, 0, 0, 92, 69, 85, 73, 84, 0, 0, 2, 6, 204, 128, 0, 4, 0, 0, 0, 95, 77, 69, 83, 83, 0, 0, 2, 16, 138, 237, - 0, 3, 0, 0, 0, 99, 76, 65, 89, 79, 0, 0, 2, 39, 15, 4, 0, 3, 0, 0, 0, 102, 69, 85, 68, 85, 0, 0, 2, 67, 192, 76, 0, 4, 0, 0, 0, 105, 77, 69, 83, 83, 0, 0, 2, 75, 138, 237, 0, 3, 0, 0, 0, 109, 76, 65, 89, 79, 0, 0, 2, 98, 15, 4, 0, 3, 0, 0, 0, 112, - 67, 78, 83, 73, 0, 0, 2, 126, 160, 49, 0, 4, 0, 0, 0, 115, 77, 69, 83, 83, 0, 0, 2, 140, 138, 237, 0, 3, 0, 0, 0, 119, 76, 65, 89, 79, 0, 0, 2, 163, 15, 4, 0, 3, 0, 0, 0, 122, 75, 82, 75, 79, 0, 0, 2, 191, 112, 143, 0, 4, 0, 0, 0, 125, 77, 69, 83, 83, 0, 0, - 2, 200, 138, 237, 0, 3, 0, 0, 0, 129, 76, 65, 89, 79, 0, 0, 2, 223, 15, 4, 0, 3, 0, 0, 0, 132, 76, 65, 89, 79, 0, 0, 2, 251, 15, 4, 0, 3, 0, 0, 0, 135, 255, 255, 68, 27, 2, 0, 0, 32, 0, 0, 0, 1, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 70, 122, 2, 0, 0, 94, - 0, 0, 0, 4, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 110, 142, 2, 0, 0, 155, 0, 0, 0, 7, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 195, 252, 2, 0, 0, 216, 0, 0, 0, 10, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 189, 128, 2, 0, 1, 20, 0, 0, 0, 13, 0, 0, 0, 16, 0, 0, - 0, 0, 255, 255, 229, 148, 2, 0, 1, 81, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 64, 254, 2, 0, 1, 142, 0, 0, 0, 19, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 63, 42, 2, 0, 1, 202, 0, 0, 0, 22, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 204, 128, 2, 0, 2, 6, - 0, 0, 0, 25, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 192, 76, 2, 0, 2, 67, 0, 0, 0, 28, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 160, 49, 2, 0, 2, 126, 0, 0, 0, 31, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 112, 143, 2, 0, 2, 191, 0, 0, 0, 34, 0, 0, 0, 16, 0, 0, - 0, 0, 255, 255, 15, 4, 2, 0, 2, 251, 0, 0, 0, 37, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 255, 255, 255, 255, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 0, 43, - 0, 0, 0, 2, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 0, 66, 0, 0, 0, 3, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, - 0, 0, 0, 19, 84, 47, 149, 0, 0, 55, 0, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 16, 0, 0, 0, 0, 0, 22, 206, 173, 149, 0, 0, 77, - 0, 0, 2, 128, 0, 0, 97, 128, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 0, 104, 0, 0, 0, 5, 0, 0, 0, 16, 0, 0, - 0, 0, 255, 255, 15, 4, 2, 0, 0, 127, 0, 0, 0, 6, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 29, 84, 47, 149, 0, 0, 116, - 0, 0, 100, 0, 0, 0, 2, 160, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 4, 0, 0, 0, 16, 0, 0, 0, 0, 0, 32, 206, 173, 149, 0, 0, 138, 0, 0, 102, 160, 0, 0, 21, 224, 0, 0, - 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 4, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 0, 165, 0, 0, 0, 8, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 0, 188, - 0, 0, 0, 9, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 39, 84, 47, 149, 0, 0, 177, 0, 0, 124, 128, 0, 0, 2, 160, 0, 0, - 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 7, 0, 0, 0, 16, 0, 0, 0, 0, 0, 42, 206, 173, 149, 0, 0, 199, 0, 0, 127, 32, 0, 0, 21, 160, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, - 0, 0, 0, 9, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 7, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 0, 225, 0, 0, 0, 11, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 0, 248, 0, 0, 0, 12, 0, 0, 0, 16, 0, 0, - 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 49, 84, 47, 149, 0, 0, 237, 0, 0, 148, 192, 0, 0, 2, 160, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, - 0, 0, 0, 11, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 10, 0, 0, 0, 16, 0, 0, 0, 0, 0, 52, 206, 173, 149, 0, 1, 3, 0, 0, 151, 96, 0, 0, 22, 224, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 16, 0, 0, - 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 10, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 1, 30, 0, 0, 0, 14, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 1, 53, 0, 0, 0, 15, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, - 0, 0, 0, 13, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 59, 84, 47, 149, 0, 1, 42, 0, 0, 174, 64, 0, 0, 2, 160, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 16, 0, 0, - 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 13, 0, 0, 0, 16, 0, 0, 0, 0, 0, 62, 206, 173, 149, 0, 1, 64, 0, 0, 176, 224, 0, 0, 21, 128, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, - 0, 0, 0, 13, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 1, 91, 0, 0, 0, 17, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 1, 114, 0, 0, 0, 18, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, - 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 69, 84, 47, 149, 0, 1, 103, 0, 0, 198, 96, 0, 0, 2, 192, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, - 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 0, 0, 72, 206, 173, 149, 0, 1, 125, 0, 0, 201, 32, 0, 0, 22, 64, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, - 0, 0, 255, 255, 138, 237, 2, 0, 1, 151, 0, 0, 0, 20, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 1, 174, 0, 0, 0, 21, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, - 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 79, 84, 47, 149, 0, 1, 163, 0, 0, 223, 96, 0, 0, 2, 160, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 19, 0, 0, 0, 16, 0, 0, - 0, 0, 0, 82, 206, 173, 149, 0, 1, 185, 0, 0, 226, 0, 0, 0, 22, 224, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 19, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 1, 211, - 0, 0, 0, 23, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 1, 234, 0, 0, 0, 24, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, - 0, 0, 0, 89, 84, 47, 149, 0, 1, 223, 0, 0, 248, 224, 0, 0, 2, 192, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 22, 0, 0, 0, 16, 0, 0, 0, 0, 0, 92, 206, 173, 149, 0, 1, 245, - 0, 0, 251, 160, 0, 0, 23, 0, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 22, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 2, 16, 0, 0, 0, 26, 0, 0, 0, 16, 0, 0, - 0, 0, 255, 255, 15, 4, 2, 0, 2, 39, 0, 0, 0, 27, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 99, 84, 47, 149, 0, 2, 28, - 0, 1, 18, 160, 0, 0, 2, 160, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 26, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 25, 0, 0, 0, 16, 0, 0, 0, 0, 0, 102, 206, 173, 149, 0, 2, 50, 0, 1, 21, 64, 0, 0, 21, 128, 0, 0, - 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 27, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 25, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 2, 75, 0, 0, 0, 29, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 2, 98, - 0, 0, 0, 30, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 28, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 109, 84, 47, 149, 0, 2, 87, 0, 1, 42, 192, 0, 0, 2, 160, 0, 0, - 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 29, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 28, 0, 0, 0, 16, 0, 0, 0, 0, 0, 112, 206, 173, 149, 0, 2, 109, 0, 1, 45, 96, 0, 0, 22, 64, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, - 0, 0, 0, 30, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 28, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 2, 140, 0, 0, 0, 32, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 2, 163, 0, 0, 0, 33, 0, 0, 0, 16, 0, 0, - 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 119, 84, 47, 149, 0, 2, 152, 0, 1, 67, 160, 0, 0, 2, 32, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, - 0, 0, 0, 32, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 31, 0, 0, 0, 16, 0, 0, 0, 0, 0, 122, 206, 173, 149, 0, 2, 174, 0, 1, 69, 192, 0, 0, 60, 96, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 16, 0, 0, - 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 31, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 2, 200, 0, 0, 0, 35, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 2, 223, 0, 0, 0, 36, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, - 0, 0, 0, 34, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 129, 84, 47, 149, 0, 2, 212, 0, 1, 130, 32, 0, 0, 2, 96, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 16, 0, 0, - 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 34, 0, 0, 0, 16, 0, 0, 0, 0, 0, 132, 206, 173, 149, 0, 2, 234, 0, 1, 132, 128, 0, 0, 44, 32, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, - 0, 0, 0, 34, 0, 0, 0, 16, 0, 0, 0, 0, 0, 135, 27, 67, 149, 0, 3, 6, 0, 1, 176, 160, 0, 0, 9, 128, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 37, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 0, 46, 46, 0, 101, 114, 114, 111, 114, 109, 101, 115, 115, 97, 103, 101, 97, 114, 99, 104, 105, 118, 101, 46, 114, 111, 100, 97, 116, 97, 0, 106, 112, 106, 97, 112, 97, 110, 101, 115, 101, 0, 109, - 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 117, 115, 101, 110, 103, 108, 105, 115, 104, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, - 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 117, 115, 115, 112, 97, 110, 105, 115, 104, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, - 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 117, 115, 102, 114, 101, 110, 99, 104, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, - 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 101, 117, 101, 110, 103, 108, 105, 115, 104, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, - 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 101, 117, 115, 112, 97, 110, 105, 115, 104, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, - 97, 114, 99, 0, 101, 117, 102, 114, 101, 110, 99, 104, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 101, 117, 103, 101, 114, 109, - 97, 110, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 101, 117, 105, 116, 97, 108, 105, 97, 110, 0, 109, 101, 115, 115, 97, 103, - 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 101, 117, 100, 117, 116, 99, 104, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, - 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 99, 110, 115, 105, 109, 112, 99, 104, 105, 110, 101, 115, 101, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, - 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 107, 114, 107, 111, 114, 101, 97, 110, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, - 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 114, 114, 111, 114, 109, 101, 115, 115, 97, 103, 101, 119, 105, 110, 100, 111, 119, 46, 97, 114, 99, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 4, 64, 0, 0, 0, 0, 0, 0, - 0, 0, 255, 82, 65, 82, 67, 0, 0, 4, 64, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 3, 32, 64, 3, 112, 1, 1, 64, 27, 0, 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, 79, 79, 84, 32, 27, 68, 27, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 16, 90, 80, 74, - 224, 64, 81, 226, 226, 16, 19, 28, 80, 15, 186, 160, 48, 107, 2, 207, 45, 16, 39, 42, 16, 8, 190, 128, 96, 19, 255, 255, 0, 46, 2, 128, 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, 3, 10, 46, 0, 46, 46, 0, 106, 112, 255, 106, 97, 112, 97, 110, 101, 115, 101, 255, 0, 109, 101, - 115, 115, 97, 103, 101, 247, 46, 98, 109, 103, 96, 11, 105, 100, 46, 255, 116, 98, 108, 0, 115, 116, 114, 117, 207, 99, 116, 48, 10, 144, 252, 77, 69, 83, 71, 91, 16, 43, 49, 80, 187, 2, 2, 208, 228, 73, 78, 191, 70, 16, 27, 0, 96, 0, 6, 0, 12, 21, 49, 62, 113, 56, 48, 159, 2, 144, 11, 62, 144, 23, - 122, 105, 128, 35, 1, 12, 144, 11, 40, 144, 59, 49, 130, 68, 223, 65, 84, 32, 123, 96, 0, 0, 48, 185, 247, 48, 252, 48, 209, 16, 3, 222, 48, 234, 255, 48, 170, 48, 174, 48, 227, 48, 233, 247, 48, 175, 48, 183, 16, 21, 110, 0, 10, 247, 48, 199, 48, 163, 16, 33, 175, 48, 146, 255, 48, 187, 48, 195, 48, 200, - 48, 87, 255, 48, 102, 48, 79, 48, 96, 48, 85, 207, 48, 68, 0, 59, 45, 112, 89, 0, 26, 10, 255, 255, 0, 2, 1, 48, 136, 0, 138, 173, 255, 48, 129, 48, 126, 48, 91, 48, 147, 221, 48, 103, 16, 105, 95, 48, 2, 16, 107, 143, 127, 16, 115, 79, 48, 111, 48, 1, 0, 10, 238, 0, 26, 16, 16, 41, 2, 48, - 123, 16, 32, 189, 95, 16, 128, 103, 44, 79, 83, 16, 165, 26, 191, 32, 16, 63, 5, 48, 104, 48, 138, 48, 254, 66, 48, 100, 48, 75, 48, 68, 16, 66, 175, 100, 16, 74, 68, 16, 174, 135, 0, 83, 214, 255, 98, 113, 138, 172, 102, 14, 102, 248, 86, 16, 197, 74, 176, 109, 127, 96, 203, 48, 2, 1, 9, 10, 255, 0, - 0, 146, 128, 108, 179, 48, 146, 255, 130, 30, 83, 240, 48, 107, 89, 39, 253, 81, 146, 150, 122, 255, 1, 2, 35, 13, 6, 62, 81, 167, 33, 123, 8, 33, 157, 67, 98, 50, 91, 254, 4, 0, 6, 4, 56, 56, 178, 82, 103, 165, 0, 211, 15, 8, 81, 219, 34, 215, 3, 19, 59, 24, 95, 19, 63, 4, 147, 39, 43, 67, - 79, 77, 77, 255, 69, 78, 84, 0, 68, 73, 83, 67, 235, 95, 48, 49, 80, 7, 50, 80, 15, 51, 0, 255, 84, 73, 84, 76, 69, 95, 77, 65, 223, 73, 78, 80, 10, 83, 85, 66, 0, 64, 47, 0, 0, 0, 144, 111, 112, 35, 163, 174, 55, 113, 97, 123, 96, 147, 28, 19, 62, 141, 80, 171, 0, 190, 231, 198, 20, 162, - 51, 19, 16, 153, 100, 67, 164, 158, 76, 51, 31, 18, 89, 19, 54, 175, 66, 51, 43, 119, 19, 129, 137, 230, 39, 67, 55, 20, 0, 0, 243, 251, 104, 17, 53, 51, 67, 16, 185, 23, 177, 213, 123, 254, 51, 79, 28, 115, 245, 4, 81, 23, 7, 84, 80, 235, 9, 20, 31, 10, 20, 35, 11, 224, 162, 0, 89, 97, 122, 48, - 0, 1, 53, 192, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 1, 53, 192, 247, 0, 0, 0, 32, 16, 3, 192, 0, 1, 202, 52, 224, 48, 3, 128, 0, 1, 80, 27, 3, 16, 35, 187, 64, 80, 3, 128, 0, 3, 32, 22, 0, 0, 247, 82, 79, 79, 84, 16, 59, 5, 198, 97, 63, 48, 31, 0, 2, - 1, 67, 212, 17, 0, 0, 18, 111, 64, 73, 52, 200, 32, 87, 255, 255, 0, 46, 171, 2, 128, 96, 16, 80, 19, 184, 16, 19, 2, 255, 31, 16, 0, 96, 19, 32, 131, 46, 0, 46, 46, 0, 255, 101, 109, 98, 101, 100, 100, 101, 100, 255, 102, 111, 110, 116, 0, 109, 101, 115, 247, 115, 97, 103, 101, 32, 11, 50, 54, 46, - 231, 98, 114, 102, 16, 19, 0, 0, 8, 82, 70, 78, 251, 84, 254, 255, 1, 4, 48, 123, 16, 0, 251, 5, 70, 73, 78, 70, 32, 235, 1, 33, 111, 16, 241, 27, 27, 32, 219, 56, 0, 1, 48, 255, 104, 0, 1, 50, 100, 33, 27, 26, 251, 0, 84, 71, 76, 80, 16, 15, 48, 26, 235, 28, 23, 27, 48, 154, 19, 17, - 25, 9, 0, 217, 1, 1, 65, 31, 96, 0, 0, 0, 120, 33, 66, 95, 127, 0, 24, 3, 103, 99, 0, 191, 255, 255, 229, 43, 81, 75, 1, 29, 7, 128, 0, 204, 16, 9, 1, 211, 3, 20, 119, 229, 100, 108, 255, 64, 0, 1, 122, 6, 248, 33, 231, 176, 126, 1, 45, 38, 87, 83, 0, 0, 223, 255, 50, 41, 122, 1, - 219, 5, 65, 53, 121, 64, 18, 43, 128, 1, 143, 68, 191, 22, 18, 237, 239, 177, 0, 79, 255, 254, 87, 1, 239, 10, 64, 2, 12, 48, 11, 1, 216, 3, 118, 16, 0, 237, 159, 255, 228, 19, 39, 255, 32, 2, 111, 37, 19, 253, 0, 4, 190, 255, 0, 6, 1, 255, 4, 86, 245, 119, 117, 65, 255, 1, 191, 13, 232, 35, - 167, 209, 126, 2, 237, 38, 1, 71, 0, 3, 191, 255, 16, 196, 93, 2, 127, 3, 118, 20, 69, 255, 255, 179, 32, 223, 160, 126, 0, 222, 37, 87, 4, 174, 255, 255, 7, 2, 223, 5, 188, 119, 20, 145, 255, 255, 252, 96, 20, 75, 1, 191, 11, 42, 3, 204, 122, 4, 194, 8, 4, 21, 15, 30, 21, 19, 62, 37, 23, 143, - 127, 85, 143, 117, 158, 51, 134, 201, 223, 255, 246, 245, 0, 11, 255, 112, 48, 43, 5, 21, 63, 11, 109, 21, 67, 111, 255, 16, 10, 255, 243, 21, 216, 250, 42, 21, 220, 34, 200, 255, 80, 7, 251, 21, 236, 246, 21, 240, 167, 208, 69, 228, 3, 4, 211, 10, 37, 143, 191, 198, 32, 251, 62, 53, 0, 0, 14, 22, 35, 143, - 0, 250, 1, 109, 255, 1, 207, 21, 193, 239, 21, 197, 51, 20, 100, 32, 96, 255, 247, 21, 211, 16, 80, 255, 241, 90, 21, 219, 80, 64, 91, 255, 230, 37, 231, 144, 0, 222, 18, 255, 255, 0, 8, 255, 250, 0, 12, 255, 255, 244, 0, 15, 255, 240, 0, 63, 255, 237, 196, 0, 127, 64, 91, 0, 207, 52, 100, 144, 253, 255, - 255, 253, 144, 84, 33, 81, 219, 100, 183, 16, 22, 63, 250, 16, 22, 39, 225, 238, 255, 202, 255, 249, 2, 148, 26, 22, 227, 12, 22, 231, 111, 22, 235, 182, 223, 65, 87, 9, 255, 16, 126, 253, 79, 18, 135, 191, 239, 16, 196, 255, 255, 96, 0, 255, 250, 212, 103, 100, 99, 27, 248, 22, 140, 48, 6, 212, 1, 16, 218, 186, - 0, 16, 42, 0, 255, 224, 6, 13, 19, 143, 65, 195, 189, 13, 22, 215, 127, 255, 0, 1, 48, 239, 255, 245, 0, 14, 255, 248, 17, 162, 241, 22, 239, 192, 255, 255, 223, 255, 244, 252, 11, 255, 251, 174, 243, 17, 11, 144, 17, 88, 16, 0, 175, 23, 3, 165, 95, 23, 7, 47, 181, 191, 39, 40, 112, 55, 164, 0, 211, 0, - 240, 23, 176, 244, 54, 5, 39, 47, 255, 202, 234, 0, 0, 35, 23, 55, 2, 23, 59, 1, 144, 3, 123, 66, 30, 118, 84, 69, 141, 17, 243, 9, 251, 255, 0, 4, 207, 253, 22, 223, 255, 253, 255, 175, 255, 254, 253, 143, 255, 234, 253, 172, 111, 23, 109, 250, 69, 101, 255, 253, 23, 151, 16, 80, 169, 254, 17, 191, 129, 24, - 12, 97, 39, 167, 198, 32, 5, 85, 24, 35, 13, 24, 39, 63, 24, 43, 159, 24, 47, 207, 111, 24, 51, 239, 11, 23, 176, 175, 255, 255, 184, 235, 255, 255, 211, 16, 67, 16, 48, 67, 255, 208, 29, 64, 59, 34, 11, 23, 207, 241, 104, 207, 17, 88, 3, 151, 204, 86, 178, 7, 65, 28, 3, 40, 15, 254, 185, 134, 67, 16, - 222, 255, 32, 12, 49, 63, 96, 3, 66, 253, 255, 51, 181, 88, 38, 43, 5, 239, 24, 72, 63, 24, 76, 10, 86, 24, 80, 6, 17, 183, 5, 17, 187, 8, 249, 80, 199, 212, 255, 242, 24, 119, 249, 80, 231, 255, 128, 243, 0, 1, 153, 166, 2, 66, 187, 27, 66, 71, 50, 27, 14, 255, 19, 43, 253, 254, 10, 255, 255, 210, - 223, 19, 66, 255, 125, 17, 188, 255, 165, 104, 172, 255, 144, 0, 32, 87, 7, 151, 1, 249, 84, 3, 252, 8, 204, 18, 105, 101, 54, 122, 164, 140, 0, 19, 105, 223, 41, 163, 223, 65, 247, 85, 18, 186, 241, 18, 165, 245, 19, 182, 244, 20, 18, 241, 79, 25, 219, 160, 16, 135, 19, 163, 193, 0, 0, 180, 116, 9, 44, 18, - 6, 237, 97, 216, 214, 106, 66, 211, 22, 63, 47, 23, 128, 16, 238, 254, 54, 199, 12, 255, 252, 5, 233, 223, 255, 247, 20, 118, 192, 20, 15, 19, 255, 161, 234, 0, 254, 146, 9, 141, 18, 12, 26, 79, 15, 80, 3, 109, 17, 47, 0, 10, 26, 95, 3, 255, 67, 151, 0, 250, 5, 242, 166, 18, 159, 19, 75, 13, 19, 79, - 190, 12, 21, 43, 31, 253, 64, 4, 223, 103, 27, 85, 16, 232, 254, 50, 207, 247, 84, 227, 245, 84, 227, 144, 93, 69, 67, 112, 10, 12, 18, 207, 255, 160, 26, 212, 150, 127, 38, 171, 12, 255, 250, 255, 31, 255, 244, 253, 255, 95, 255, 240, 119, 159, 25, 28, 158, 125, 56, 190, 14, 255, 121, 189, 239, 145, 178, 220, 230, 255, - 83, 16, 67, 187, 36, 167, 251, 128, 68, 103, 5, 21, 25, 117, 95, 36, 148, 51, 91, 64, 128, 255, 144, 3, 239, 61, 68, 219, 112, 3, 207, 254, 41, 189, 43, 80, 24, 122, 80, 80, 42, 255, 54, 140, 162, 30, 183, 51, 19, 69, 24, 102, 223, 21, 184, 36, 237, 52, 7, 226, 22, 51, 16, 42, 76, 16, 144, 95, 207, 81, - 51, 31, 28, 43, 7, 118, 127, 44, 80, 135, 51, 243, 251, 37, 155, 251, 135, 43, 195, 36, 90, 223, 2, 158, 218, 127, 1, 108, 80, 138, 223, 215, 255, 208, 27, 227, 244, 27, 231, 247, 255, 255, 152, 233, 8, 223, 17, 99, 173, 239, 255, 74, 19, 96, 3, 34, 31, 173, 191, 37, 159, 13, 28, 148, 111, 80, 24, 236, 80, 247, - 2, 191, 255, 185, 113, 189, 255, 179, 255, 202, 253, 130, 67, 243, 100, 147, 64, 74, 151, 112, 3, 246, 155, 222, 6, 119, 12, 115, 10, 118, 85, 67, 51, 12, 147, 10, 189, 17, 12, 176, 45, 110, 219, 151, 64, 12, 243, 76, 11, 173, 184, 13, 83, 10, 48, 13, 68, 78, 87, 118, 0, 98, 76, 37, 87, 11, 194, 15, 50, 1, - 191, 45, 121, 14, 147, 10, 135, 100, 32, 86, 14, 178, 77, 37, 2, 159, 12, 65, 15, 49, 46, 87, 118, 15, 115, 10, 191, 83, 11, 195, 129, 1, 51, 85, 103, 9, 255, 118, 12, 159, 8, 121, 155, 188, 44, 155, 128, 255, 11, 32, 19, 117, 15, 255, 2, 35, 69, 0, 58, 35, 159, 13, 223, 5, 137, 167, 154, 13, 223, 10, - 187, 101, 179, 0, 125, 37, 17, 52, 48, 77, 26, 161, 144, 30, 163, 15, 224, 6, 37, 67, 72, 163, 143, 38, 15, 191, 3, 46, 212, 176, 80, 3, 4, 180, 4, 19, 32, 28, 91, 173, 144, 28, 95, 176, 15, 223, 68, 3, 69, 75, 143, 13, 85, 15, 31, 3, 82, 31, 244, 247, 73, 39, 3, 4, 148, 6, 45, 118, 25, 72, - 239, 255, 177, 15, 255, 36, 83, 16, 42, 215, 202, 64, 8, 15, 126, 8, 14, 153, 46, 51, 72, 11, 1, 15, 255, 3, 43, 38, 19, 42, 24, 255, 5, 217, 7, 66, 32, 160, 253, 0, 163, 7, 0, 160, 11, 10, 88, 11, 15, 253, 0, 26, 116, 239, 176, 41, 72, 179, 10, 201, 4, 70, 45, 196, 96, 49, 227, 15, 131, 40, - 42, 58, 24, 134, 15, 255, 3, 21, 119, 81, 47, 23, 178, 2, 255, 6, 61, 15, 255, 58, 41, 215, 5, 207, 234, 151, 29, 170, 210, 87, 19, 142, 208, 31, 23, 181, 29, 146, 255, 6, 255, 251, 254, 223, 9, 255, 250, 43, 43, 144, 118, 236, 85, 51, 16, 116, 205, 120, 152, 47, 179, 112, 3, 52, 15, 255, 16, 35, 227, 105, - 152, 31, 251, 221, 217, 223, 45, 127, 127, 47, 129, 255, 119, 101, 84, 51, 221, 64, 57, 93, 111, 45, 115, 237, 221, 221, 124, 3, 31, 130, 33, 81, 223, 224, 211, 31, 255, 243, 80, 3, 15, 149, 6, 31, 255, 9, 106, 31, 255, 8, 143, 26, 167, 127, 29, 208, 111, 29, 212, 45, 26, 183, 27, 145, 240, 20, 117, 252, 222, 132, - 95, 159, 42, 144, 3, 30, 183, 17, 31, 184, 251, 31, 188, 252, 31, 192, 221, 253, 191, 28, 13, 0, 0, 144, 144, 3, 128, 23, 94, 195, 96, 3, 51, 227, 175, 27, 12, 159, 255, 192, 20, 49, 63, 33, 67, 32, 112, 127, 31, 93, 127, 2, 65, 7, 15, 246, 25, 86, 43, 255, 11, 80, 3, 9, 80, 3, 8, 255, 66, 59, - 181, 7, 46, 18, 78, 249, 31, 159, 250, 28, 107, 251, 110, 31, 127, 251, 63, 31, 27, 239, 255, 227, 27, 250, 247, 32, 255, 255, 246, 31, 64, 227, 0, 255, 211, 252, 16, 59, 243, 246, 31, 255, 9, 12, 30, 12, 255, 170, 251, 28, 125, 247, 61, 31, 111, 27, 196, 143, 27, 204, 90, 36, 214, 207, 31, 233, 223, 255, 10, 137, - 50, 4, 31, 255, 137, 6, 92, 215, 108, 235, 46, 27, 95, 53, 127, 59, 155, 160, 70, 95, 147, 241, 91, 11, 36, 187, 31, 239, 159, 255, 31, 49, 162, 13, 31, 253, 47, 31, 99, 16, 42, 29, 192, 255, 17, 2, 184, 255, 47, 211, 47, 255, 239, 31, 215, 46, 103, 63, 83, 173, 63, 30, 71, 79, 31, 83, 95, 80, 64, 3, - 111, 80, 28, 251, 127, 31, 226, 127, 17, 34, 17, 31, 76, 67, 38, 206, 173, 255, 62, 3, 249, 47, 247, 32, 255, 44, 228, 143, 46, 17, 215, 34, 56, 47, 30, 40, 15, 255, 243, 30, 178, 170, 244, 29, 203, 245, 17, 146, 247, 17, 142, 247, 2, 255, 19, 22, 36, 135, 17, 151, 30, 18, 226, 21, 55, 96, 8, 31, 196, 142, - 12, 16, 196, 32, 74, 47, 255, 250, 102, 175, 29, 18, 49, 33, 7, 47, 31, 0, 13, 34, 183, 45, 219, 37, 232, 246, 36, 100, 235, 36, 143, 243, 64, 251, 48, 175, 254, 76, 89, 2, 93, 48, 227, 247, 101, 13, 30, 255, 32, 218, 64, 222, 252, 85, 95, 31, 143, 255, 21, 223, 255, 0, 77, 255, 255, 223, 84, 51, 171, 129, - 4, 133, 87, 172, 255, 173, 249, 31, 159, 252, 79, 163, 252, 132, 15, 255, 17, 191, 73, 80, 3, 159, 144, 3, 46, 187, 127, 32, 3, 51, 235, 144, 38, 78, 147, 48, 7, 160, 80, 235, 23, 154, 254, 160, 67, 235, 75, 4, 194, 14, 0, 6, 231, 6, 61, 125, 255, 18, 5, 247, 17, 72, 32, 227, 13, 31, 8, 33, 182, 11, - 30, 52, 20, 219, 19, 69, 250, 234, 0, 255, 219, 223, 221, 151, 239, 93, 175, 106, 47, 195, 221, 239, 47, 35, 80, 208, 3, 64, 91, 215, 18, 59, 219, 35, 227, 36, 88, 95, 31, 89, 32, 3, 79, 31, 97, 239, 63, 255, 242, 19, 48, 243, 0, 63, 253, 181, 211, 13, 170, 48, 5, 255, 128, 3, 3, 95, 251, 2, 167, 255, - 71, 27, 1, 33, 138, 19, 231, 255, 248, 255, 173, 207, 31, 245, 23, 31, 249, 48, 44, 47, 6, 127, 106, 31, 103, 3, 255, 150, 32, 228, 47, 144, 161, 34, 55, 94, 47, 39, 225, 31, 47, 48, 0, 11, 245, 14, 189, 18, 149, 96, 31, 95, 47, 91, 80, 30, 193, 128, 31, 103, 249, 203, 120, 159, 51, 95, 19, 107, 239, 234, - 31, 48, 0, 233, 155, 239, 240, 83, 67, 243, 31, 151, 0, 254, 18, 175, 20, 95, 23, 31, 230, 39, 179, 6, 20, 112, 8, 31, 213, 65, 168, 255, 246, 79, 255, 96, 2, 13, 255, 176, 248, 12, 9, 255, 242, 127, 35, 219, 35, 227, 21, 204, 159, 255, 21, 2, 19, 181, 55, 64, 255, 250, 95, 254, 255, 255, 242, 63, 255, 255, - 176, 16, 3, 212, 48, 63, 31, 46, 63, 31, 202, 63, 24, 30, 36, 67, 170, 31, 42, 160, 143, 21, 195, 159, 25, 233, 159, 31, 226, 171, 191, 32, 3, 240, 64, 3, 223, 20, 78, 189, 255, 255, 61, 255, 245, 255, 54, 255, 254, 255, 178, 48, 31, 120, 48, 79, 17, 63, 26, 249, 48, 20, 222, 234, 80, 0, 30, 22, 143, 2, - 35, 227, 16, 19, 231, 249, 192, 10, 255, 246, 250, 19, 40, 31, 251, 242, 88, 31, 255, 224, 31, 255, 96, 207, 47, 156, 15, 255, 13, 68, 50, 73, 36, 46, 251, 31, 225, 17, 64, 239, 24, 151, 16, 102, 0, 37, 17, 60, 22, 158, 223, 86, 171, 35, 239, 30, 27, 121, 207, 229, 133, 86, 159, 118, 250, 27, 130, 196, 50, 137, - 252, 77, 83, 247, 242, 74, 243, 20, 174, 0, 160, 15, 255, 55, 54, 116, 15, 159, 11, 117, 66, 0, 0, 0, 172, 16, 0, 191, 173, 0, 193, 46, 171, 48, 12, 106, 46, 103, 15, 31, 11, 101, 0, 95, 46, 0, 2, 110, 15, 97, 45, 2, 17, 1, 254, 74, 3, 118, 32, 0, 224, 47, 119, 15, 255, 10, 87, 118, 65, 3, - 96, 129, 35, 86, 6, 186, 207, 15, 255, 8, 119, 118, 82, 44, 159, 232, 12, 159, 14, 190, 209, 14, 252, 38, 1, 87, 117, 2, 175, 39, 183, 40, 15, 255, 4, 44, 140, 251, 45, 255, 246, 10, 88, 12, 89, 67, 15, 227, 0, 241, 19, 86, 119, 190, 123, 255, 4, 243, 1, 31, 31, 255, 204, 255, 197, 45, 131, 5, 102, 41, - 1, 142, 74, 195, 15, 255, 0, 233, 37, 119, 99, 45, 223, 212, 13, 223, 14, 11, 171, 12, 8, 155, 205, 76, 23, 1, 65, 4, 221, 239, 0, 223, 8, 17, 50, 75, 31, 63, 249, 64, 3, 15, 255, 35, 70, 31, 124, 223, 254, 152, 112, 28, 110, 4, 93, 9, 88, 172, 43, 191, 15, 255, 6, 47, 56, 180, 208, 1, 255, 7, - 35, 66, 27, 103, 248, 27, 219, 7, 96, 14, 170, 1, 15, 255, 2, 85, 48, 158, 128, 31, 162, 128, 15, 158, 10, 131, 190, 94, 139, 4, 242, 0, 30, 237, 41, 59, 12, 222, 42, 6, 236, 159, 150, 29, 165, 15, 190, 6, 4, 16, 0, 5, 207, 149, 160, 31, 111, 14, 194, 5, 3, 28, 174, 30, 28, 229, 191, 30, 3, 95, - 68, 189, 125, 47, 204, 252, 169, 0, 52, 57, 127, 143, 255, 42, 82, 112, 3, 60, 157, 255, 255, 85, 85, 173, 142, 42, 111, 239, 29, 109, 207, 16, 30, 107, 16, 250, 1, 143, 255, 37, 175, 63, 161, 254, 40, 139, 37, 34, 5, 61, 167, 112, 64, 11, 40, 159, 226, 142, 107, 9, 80, 75, 235, 3, 94, 199, 63, 61, 215, 31, - 254, 59, 107, 79, 231, 221, 166, 106, 30, 166, 0, 254, 32, 78, 163, 208, 82, 95, 103, 64, 122, 127, 242, 46, 221, 41, 63, 48, 30, 116, 169, 128, 93, 147, 224, 30, 148, 240, 5, 95, 14, 47, 231, 239, 245, 233, 117, 67, 36, 29, 115, 5, 48, 3, 252, 105, 27, 81, 251, 1, 16, 3, 30, 26, 106, 42, 202, 247, 215, 70, - 159, 58, 119, 255, 31, 106, 253, 4, 223, 215, 255, 246, 20, 122, 160, 27, 82, 0, 255, 251, 87, 7, 60, 17, 6, 93, 219, 175, 31, 255, 239, 255, 64, 93, 31, 112, 161, 31, 32, 255, 0, 46, 30, 151, 2, 169, 191, 61, 38, 114, 31, 57, 0, 48, 3, 32, 243, 3, 215, 123, 182, 34, 95, 251, 43, 135, 254, 112, 192, 35, - 31, 255, 32, 196, 192, 80, 243, 15, 255, 0, 111, 247, 2, 51, 52, 12, 223, 6, 33, 135, 17, 143, 31, 33, 95, 112, 3, 108, 147, 186, 240, 31, 190, 0, 221, 217, 15, 166, 40, 11, 31, 28, 148, 15, 31, 36, 47, 2, 159, 31, 10, 207, 58, 194, 44, 19, 37, 32, 234, 45, 5, 95, 95, 175, 47, 183, 13, 95, 195, 11, - 73, 95, 203, 14, 49, 160, 26, 182, 0, 31, 182, 49, 219, 247, 18, 144, 3, 60, 126, 43, 24, 9, 31, 129, 33, 127, 4, 98, 119, 74, 45, 147, 175, 81, 51, 63, 7, 10, 31, 199, 14, 31, 237, 181, 79, 29, 123, 175, 96, 28, 251, 160, 31, 84, 208, 0, 47, 252, 49, 114, 33, 79, 31, 199, 28, 207, 34, 17, 62, 67, - 31, 236, 170, 253, 79, 156, 207, 158, 127, 143, 95, 99, 79, 31, 183, 170, 47, 59, 158, 112, 126, 119, 2, 31, 237, 6, 28, 60, 165, 9, 18, 89, 12, 31, 241, 47, 237, 79, 111, 223, 202, 163, 134, 47, 111, 32, 48, 243, 64, 3, 45, 71, 112, 2, 170, 10, 31, 140, 13, 30, 75, 15, 30, 91, 63, 31, 207, 168, 111, 30, - 14, 175, 28, 129, 223, 30, 212, 33, 35, 28, 69, 45, 64, 219, 50, 239, 63, 81, 203, 0, 239, 95, 235, 223, 126, 36, 36, 80, 79, 255, 253, 226, 239, 60, 87, 212, 96, 255, 30, 155, 255, 18, 222, 255, 19, 12, 47, 227, 163, 176, 11, 126, 79, 255, 158, 239, 175, 11, 36, 123, 191, 221, 127, 30, 86, 178, 127, 255, 179, 0, - 91, 113, 41, 207, 7, 47, 23, 96, 0, 95, 23, 239, 80, 79, 35, 7, 14, 80, 31, 111, 4, 46, 55, 78, 106, 158, 47, 95, 32, 231, 28, 226, 250, 0, 255, 216, 85, 105, 109, 0, 125, 45, 239, 159, 79, 31, 95, 19, 239, 1, 239, 255, 112, 28, 231, 255, 255, 16, 19, 174, 31, 211, 160, 0, 255, 183, 213, 31, 219, 234, - 97, 15, 94, 15, 7, 255, 251, 255, 191, 7, 255, 250, 127, 7, 255, 249, 178, 13, 16, 3, 1, 9, 63, 251, 47, 255, 248, 45, 218, 55, 66, 43, 45, 91, 255, 177, 29, 244, 254, 80, 10, 173, 255, 17, 204, 127, 109, 159, 28, 250, 15, 191, 2, 227, 111, 189, 127, 1, 124, 199, 150, 152, 119, 0, 10, 77, 62, 159, 255, 45, - 240, 31, 160, 251, 22, 36, 15, 2, 111, 66, 211, 120, 173, 125, 222, 247, 255, 254, 183, 73, 60, 157, 112, 87, 11, 100, 7, 80, 13, 219, 26, 35, 235, 63, 88, 176, 3, 241, 112, 3, 47, 253, 6, 34, 47, 36, 210, 35, 243, 94, 36, 94, 63, 31, 146, 12, 255, 255, 146, 22, 38, 233, 255, 0, 78, 38, 43, 159, 63, 99, - 72, 231, 191, 110, 48, 239, 19, 159, 31, 75, 255, 255, 244, 31, 170, 252, 80, 255, 255, 162, 0, 243, 148, 223, 2, 47, 4, 178, 47, 84, 55, 8, 255, 70, 35, 55, 147, 95, 31, 88, 170, 12, 44, 28, 241, 25, 67, 246, 21, 244, 251, 33, 75, 229, 110, 255, 253, 80, 91, 21, 159, 253, 22, 10, 193, 84, 54, 47, 224, 2, - 139, 12, 12, 86, 131, 6, 8, 47, 2, 26, 67, 189, 143, 31, 91, 223, 255, 252, 2, 31, 218, 24, 252, 255, 207, 255, 223, 255, 111, 31, 228, 20, 89, 166, 254, 17, 178, 211, 31, 178, 31, 182, 176, 11, 31, 242, 253, 47, 251, 255, 242, 143, 230, 16, 130, 130, 17, 43, 23, 26, 159, 31, 212, 255, 180, 123, 16, 136, 40, 114, - 254, 148, 16, 70, 199, 72, 62, 10, 31, 231, 127, 68, 219, 38, 19, 246, 223, 255, 248, 9, 16, 80, 1, 191, 16, 37, 206, 6, 227, 27, 71, 36, 39, 243, 0, 238, 31, 228, 135, 69, 20, 80, 23, 22, 33, 191, 37, 19, 251, 0, 1, 206, 250, 48, 14, 189, 175, 15, 255, 14, 37, 122, 255, 81, 155, 93, 7, 191, 6, 217, - 28, 138, 250, 2, 158, 33, 93, 91, 181, 80, 14, 93, 31, 52, 82, 15, 255, 14, 96, 15, 255, 44, 19, 171, 51, 15, 255, 10, 49, 1, 192, 176, 70, 15, 255, 10, 118, 64, 109, 14, 190, 76, 5, 116, 15, 30, 77, 4, 100, 15, 223, 13, 55, 141, 97, 3, 131, 207, 255, 255, 26, 106, 42, 253, 44, 27, 112, 76, 13, 119, - 9, 11, 75, 215, 15, 159, 4, 229, 0, 73, 135, 0, 1, 255, 75, 9, 207, 56, 38, 90, 203, 223, 255, 223, 27, 98, 223, 247, 243, 119, 137, 239, 253, 15, 255, 6, 47, 245, 188, 221, 210, 223, 255, 0, 31, 10, 208, 87, 87, 15, 124, 11, 51, 10, 156, 71, 155, 1, 91, 247, 253, 219, 203, 115, 46, 149, 252, 132, 103, 46, - 153, 122, 239, 15, 96, 4, 41, 84, 253, 149, 0, 51, 59, 63, 15, 193, 32, 7, 200, 78, 167, 44, 207, 5, 157, 92, 239, 255, 81, 46, 239, 218, 98, 0, 75, 171, 28, 16, 75, 15, 131, 32, 13, 208, 3, 206, 175, 112, 159, 75, 148, 103, 85, 1, 127, 12, 213, 12, 28, 49, 239, 26, 47, 95, 28, 192, 12, 2, 95, 255, - 29, 229, 44, 180, 43, 57, 73, 139, 43, 171, 30, 30, 216, 247, 191, 255, 208, 7, 31, 44, 47, 255, 253, 244, 254, 207, 255, 243, 31, 253, 112, 41, 131, 28, 242, 98, 63, 251, 249, 0, 12, 171, 82, 4, 79, 227, 43, 11, 77, 8, 222, 6, 123, 47, 255, 187, 169, 239, 251, 83, 247, 250, 0, 42, 29, 40, 29, 47, 255, 29, - 43, 253, 19, 30, 247, 45, 75, 246, 117, 85, 67, 50, 47, 255, 103, 117, 46, 187, 219, 255, 163, 45, 95, 169, 172, 47, 103, 6, 239, 132, 240, 85, 175, 175, 255, 44, 219, 31, 78, 0, 31, 230, 50, 13, 84, 128, 3, 16, 48, 3, 143, 16, 7, 127, 80, 3, 83, 163, 170, 175, 95, 95, 63, 82, 223, 8, 99, 187, 132, 96, - 75, 157, 16, 64, 79, 30, 218, 0, 255, 242, 77, 115, 223, 121, 3, 159, 0, 70, 0, 4, 223, 82, 135, 46, 51, 119, 251, 48, 0, 2, 89, 223, 111, 131, 155, 222, 60, 59, 255, 62, 30, 201, 117, 51, 53, 62, 189, 18, 120, 215, 72, 197, 79, 232, 201, 31, 110, 255, 254, 96, 114, 31, 167, 250, 0, 124, 31, 75, 30, 59, - 208, 15, 62, 22, 250, 15, 220, 168, 101, 31, 31, 128, 47, 31, 132, 243, 21, 120, 155, 205, 40, 25, 31, 251, 79, 4, 174, 139, 36, 68, 2, 57, 199, 255, 253, 202, 18, 243, 245, 254, 48, 255, 255, 27, 183, 254, 17, 75, 243, 117, 15, 156, 17, 3, 87, 159, 30, 242, 255, 51, 95, 10, 202, 253, 190, 211, 255, 28, 17, 255, - 42, 227, 32, 28, 207, 238, 32, 255, 145, 83, 255, 113, 70, 119, 111, 3, 173, 29, 28, 18, 111, 30, 146, 5, 255, 28, 236, 62, 127, 28, 244, 2, 223, 227, 82, 0, 11, 64, 212, 255, 231, 47, 185, 209, 12, 30, 50, 79, 5, 103, 2, 118, 77, 93, 28, 216, 143, 28, 216, 175, 255, 176, 31, 193, 144, 79, 48, 3, 159, 31, - 127, 31, 146, 0, 111, 254, 208, 87, 12, 158, 130, 6, 12, 79, 2, 12, 29, 151, 159, 253, 80, 90, 34, 27, 16, 22, 54, 229, 26, 46, 64, 94, 34, 137, 127, 13, 97, 50, 142, 252, 0, 13, 253, 207, 0, 250, 143, 128, 2, 0, 237, 83, 60, 207, 31, 218, 226, 95, 211, 23, 47, 223, 43, 34, 46, 167, 239, 31, 237, 170, - 111, 31, 4, 63, 31, 240, 143, 27, 55, 252, 6, 47, 24, 84, 19, 91, 1, 85, 147, 12, 31, 115, 14, 86, 159, 30, 165, 254, 246, 223, 247, 255, 64, 223, 247, 31, 35, 223, 247, 208, 23, 251, 112, 0, 171, 184, 64, 125, 31, 152, 80, 3, 159, 255, 251, 55, 31, 50, 251, 46, 0, 3, 238, 53, 31, 175, 226, 8, 94, 30, - 95, 207, 30, 168, 255, 253, 48, 1, 25, 155, 201, 6, 212, 32, 76, 46, 179, 243, 63, 7, 56, 57, 239, 171, 247, 94, 203, 242, 78, 207, 127, 22, 226, 127, 255, 191, 48, 48, 3, 111, 255, 48, 58, 95, 255, 230, 157, 255, 95, 31, 255, 64, 3, 252, 113, 175, 210, 138, 241, 31, 235, 31, 6, 54, 11, 181, 95, 235, 127, 22, - 57, 191, 31, 26, 8, 12, 255, 240, 0, 6, 255, 247, 194, 0, 1, 130, 14, 209, 51, 93, 0, 0, 241, 76, 255, 0, 92, 35, 83, 16, 88, 32, 197, 95, 222, 255, 144, 19, 35, 16, 143, 255, 247, 31, 83, 218, 128, 0, 16, 6, 0, 253, 15, 61, 12, 7, 31, 255, 181, 143, 70, 223, 111, 255, 16, 156, 255, 19, 104, 244, - 73, 31, 236, 64, 16, 6, 31, 151, 64, 70, 219, 28, 223, 244, 245, 40, 0, 0, 106, 20, 251, 15, 31, 158, 10, 92, 20, 82, 3, 47, 236, 207, 254, 140, 31, 167, 201, 95, 150, 104, 30, 200, 23, 41, 127, 30, 170, 255, 254, 16, 63, 165, 210, 47, 255, 9, 23, 87, 20, 211, 111, 51, 232, 206, 254, 3, 255, 250, 13, 3, - 255, 247, 16, 3, 253, 253, 93, 3, 207, 255, 237, 23, 67, 187, 206, 255, 179, 215, 247, 152, 3, 239, 255, 252, 32, 62, 186, 48, 16, 107, 96, 0, 47, 27, 143, 47, 23, 138, 244, 159, 255, 64, 6, 24, 220, 143, 33, 180, 15, 255, 155, 205, 221, 221, 47, 209, 0, 29, 8, 221, 221, 10, 147, 14, 240, 99, 10, 73, 31, 207, - 96, 74, 74, 15, 136, 69, 25, 19, 0, 0, 164, 22, 14, 165, 7, 194, 0, 96, 49, 87, 95, 3, 15, 255, 2, 27, 227, 252, 230, 255, 255, 181, 0, 103, 15, 135, 8, 39, 147, 139, 109, 15, 255, 6, 21, 210, 50, 227, 38, 8, 124, 6, 199, 16, 211, 0, 34, 15, 0, 105, 11, 28, 196, 24, 210, 129, 0, 212, 78, 129, - 15, 255, 3, 112, 15, 255, 16, 62, 1, 59, 6, 59, 111, 79, 24, 51, 228, 15, 255, 10, 21, 52, 0, 0, 126, 251, 101, 15, 255, 6, 250, 16, 69, 223, 15, 255, 7, 44, 29, 131, 2, 197, 140, 207, 1, 127, 7, 91, 239, 15, 255, 6, 94, 31, 68, 1, 149, 203, 15, 255, 91, 45, 115, 10, 31, 247, 14, 31, 251, 47, - 101, 239, 255, 65, 0, 89, 195, 34, 55, 80, 15, 223, 65, 36, 90, 29, 189, 175, 23, 25, 239, 249, 26, 220, 245, 8, 171, 0, 212, 9, 255, 64, 3, 11, 16, 7, 12, 16, 11, 159, 255, 167, 249, 86, 123, 251, 144, 3, 15, 255, 9, 17, 7, 222, 126, 15, 31, 0, 138, 215, 0, 0, 191, 253, 45, 5, 209, 135, 153, 15, - 63, 10, 178, 86, 235, 8, 23, 13, 15, 127, 0, 8, 223, 173, 112, 29, 107, 192, 18, 58, 255, 249, 47, 15, 159, 1, 26, 115, 159, 29, 81, 159, 244, 155, 180, 252, 191, 244, 255, 244, 207, 244, 243, 171, 35, 175, 150, 176, 128, 3, 15, 67, 13, 94, 255, 255, 91, 16, 22, 145, 250, 210, 0, 207, 255, 251, 31, 71, 144, 15, - 192, 65, 183, 4, 20, 242, 127, 254, 35, 184, 2, 223, 255, 38, 8, 226, 3, 39, 150, 224, 12, 119, 1, 201, 197, 155, 128, 23, 58, 116, 14, 82, 32, 13, 219, 80, 55, 168, 31, 18, 157, 39, 43, 77, 15, 255, 8, 107, 92, 179, 15, 194, 3, 201, 0, 9, 159, 7, 222, 47, 47, 166, 73, 143, 2, 151, 255, 79, 249, 73, - 255, 90, 48, 3, 251, 18, 154, 251, 12, 48, 3, 76, 3, 185, 5, 151, 18, 40, 122, 31, 107, 175, 7, 11, 7, 219, 152, 101, 154, 49, 7, 11, 10, 47, 255, 254, 199, 15, 112, 51, 127, 31, 231, 252, 191, 0, 37, 121, 255, 10, 31, 212, 26, 35, 254, 255, 6, 254, 190, 255, 1, 32, 42, 95, 158, 95, 56, 224, 42, 167, - 255, 254, 200, 16, 31, 243, 186, 244, 46, 111, 177, 20, 175, 30, 26, 11, 26, 25, 183, 6, 136, 255, 39, 202, 48, 206, 32, 79, 255, 255, 96, 144, 14, 255, 176, 192, 8, 255, 228, 241, 240, 2, 41, 133, 126, 170, 87, 64, 239, 32, 247, 221, 111, 235, 65, 3, 0, 5, 7, 26, 23, 11, 123, 30, 20, 159, 255, 255, 236, 109, - 219, 239, 251, 199, 17, 74, 42, 143, 59, 157, 17, 68, 0, 12, 204, 254, 32, 129, 0, 4, 158, 255, 64, 29, 72, 191, 242, 26, 197, 249, 2, 255, 191, 252, 0, 165, 207, 25, 181, 111, 101, 26, 30, 170, 0, 30, 90, 0, 42, 43, 208, 30, 90, 5, 19, 194, 11, 26, 182, 9, 32, 207, 125, 23, 162, 255, 3, 101, 67, 33, - 95, 50, 70, 238, 121, 190, 255, 208, 0, 252, 185, 1, 42, 48, 251, 207, 252, 70, 138, 239, 128, 27, 236, 171, 212, 255, 241, 42, 207, 147, 100, 27, 206, 26, 19, 31, 20, 101, 42, 95, 219, 151, 106, 92, 33, 199, 127, 31, 75, 37, 186, 51, 115, 119, 105, 189, 255, 29, 44, 255, 32, 212, 101, 80, 209, 255, 17, 25, 188, 43, - 175, 53, 160, 124, 236, 222, 168, 191, 35, 227, 185, 119, 204, 194, 32, 191, 245, 197, 121, 189, 242, 81, 99, 246, 16, 27, 98, 109, 42, 92, 204, 176, 3, 215, 3, 78, 0, 65, 123, 175, 114, 58, 95, 1, 207, 255, 28, 203, 33, 187, 227, 67, 215, 188, 96, 75, 211, 251, 16, 0, 255, 22, 220, 16, 6, 203, 0, 128, 14, 41, - 44, 22, 15, 2, 31, 135, 94, 255, 90, 26, 206, 255, 16, 110, 251, 78, 28, 75, 28, 20, 64, 103, 26, 214, 128, 255, 16, 100, 20, 78, 4, 255, 112, 234, 159, 244, 227, 52, 191, 191, 27, 57, 207, 80, 3, 42, 4, 187, 8, 48, 219, 7, 31, 163, 6, 28, 28, 5, 28, 32, 163, 3, 29, 143, 1, 60, 141, 44, 129, 28, - 141, 223, 248, 109, 139, 173, 155, 206, 143, 71, 236, 168, 142, 189, 255, 251, 32, 2, 143, 255, 188, 129, 209, 254, 185, 185, 100, 22, 59, 0, 255, 248, 29, 49, 59, 31, 127, 154, 160, 29, 137, 30, 169, 79, 240, 77, 122, 31, 47, 238, 106, 86, 223, 13, 253, 67, 204, 0, 27, 222, 138, 28, 234, 168, 223, 28, 174, 191, 22, 215, - 157, 63, 135, 53, 30, 28, 31, 247, 1, 56, 255, 189, 146, 50, 185, 117, 61, 97, 93, 127, 15, 255, 18, 154, 58, 147, 31, 153, 58, 217, 234, 224, 134, 0, 0, 16, 111, 49, 111, 34, 147, 30, 8, 29, 183, 214, 52, 104, 255, 168, 9, 28, 156, 95, 250, 35, 83, 237, 255, 155, 223, 45, 167, 2, 69, 9, 223, 3, 248, 108, - 77, 155, 121, 179, 15, 106, 70, 159, 254, 31, 229, 71, 108, 234, 6, 255, 241, 51, 140, 14, 29, 64, 63, 29, 184, 20, 36, 162, 17, 152, 66, 107, 8, 30, 127, 10, 94, 127, 46, 123, 190, 79, 51, 203, 240, 0, 223, 253, 240, 30, 37, 169, 208, 29, 229, 176, 25, 173, 144, 17, 200, 30, 226, 146, 170, 48, 192, 233, 13, 31, - 126, 47, 30, 106, 111, 17, 139, 128, 191, 47, 10, 26, 206, 48, 83, 62, 127, 88, 75, 29, 98, 63, 19, 47, 33, 244, 29, 122, 4, 27, 235, 8, 95, 255, 0, 191, 31, 29, 157, 11, 143, 253, 0, 5, 175, 101, 31, 87, 207, 249, 78, 171, 62, 179, 240, 58, 191, 7, 50, 62, 195, 30, 179, 239, 250, 31, 227, 19, 252, 55, - 150, 88, 246, 236, 168, 100, 32, 63, 129, 4, 253, 45, 188, 174, 224, 48, 219, 15, 26, 245, 12, 255, 249, 18, 115, 42, 25, 155, 62, 249, 251, 69, 143, 62, 99, 234, 0, 16, 52, 231, 0, 253, 150, 142, 64, 6, 171, 7, 109, 185, 117, 177, 0, 76, 96, 95, 0, 112, 219, 50, 82, 41, 243, 79, 178, 49, 75, 127, 13, 232, - 26, 73, 17, 104, 3, 34, 208, 118, 16, 166, 0, 255, 163, 45, 9, 234, 116, 48, 247, 165, 160, 64, 203, 215, 215, 16, 87, 31, 6, 15, 49, 10, 255, 250, 255, 229, 0, 45, 255, 31, 205, 175, 18, 129, 72, 46, 195, 0, 34, 155, 49, 99, 7, 231, 115, 35, 76, 31, 130, 40, 30, 155, 36, 195, 250, 16, 41, 255, 10, 250, - 11, 66, 30, 18, 217, 217, 5, 239, 31, 35, 28, 255, 87, 47, 189, 76, 48, 237, 0, 204, 194, 37, 228, 255, 193, 64, 87, 239, 33, 16, 87, 20, 23, 228, 37, 208, 64, 55, 15, 239, 4, 36, 143, 253, 102, 33, 100, 0, 191, 17, 181, 33, 217, 159, 253, 69, 71, 173, 95, 82, 91, 63, 31, 151, 29, 113, 122, 148, 139, 62, - 47, 114, 78, 61, 255, 233, 0, 0, 181, 106, 172, 68, 31, 171, 4, 20, 236, 34, 186, 38, 75, 9, 31, 159, 38, 79, 133, 13, 27, 55, 34, 198, 44, 66, 90, 207, 8, 95, 243, 5, 39, 73, 103, 58, 231, 1, 49, 123, 42, 207, 208, 57, 192, 245, 255, 252, 255, 240, 30, 127, 241, 20, 67, 128, 250, 255, 250, 64, 0, 198, - 63, 220, 47, 82, 235, 141, 95, 85, 231, 32, 167, 22, 125, 0, 207, 18, 109, 239, 207, 248, 80, 88, 207, 8, 203, 7, 223, 255, 16, 4, 85, 23, 6, 10, 22, 231, 13, 25, 184, 15, 48, 151, 246, 183, 32, 44, 215, 2, 239, 15, 11, 5, 1, 19, 70, 26, 103, 11, 15, 224, 0, 20, 168, 206, 244, 31, 69, 247, 31, 73, - 172, 249, 15, 255, 48, 207, 28, 218, 89, 215, 0, 32, 10, 27, 140, 198, 140, 248, 90, 79, 15, 255, 33, 36, 47, 5, 157, 15, 243, 6, 99, 26, 202, 12, 112, 65, 155, 14, 159, 4, 28, 107, 207, 128, 20, 10, 44, 14, 8, 222, 11, 41, 167, 175, 0, 191, 6, 255, 22, 39, 24, 214, 241, 0, 90, 223, 241, 90, 153, 15, - 176, 31, 3, 159, 13, 255, 220, 255, 25, 44, 71, 5, 156, 255, 93, 91, 191, 255, 156, 96, 0, 117, 38, 15, 147, 22, 191, 255, 254, 23, 99, 28, 83, 201, 61, 128, 15, 198, 68, 52, 23, 143, 83, 83, 15, 95, 0, 243, 74, 76, 175, 237, 90, 245, 14, 201, 62, 15, 26, 137, 47, 30, 136, 225, 44, 239, 48, 2, 161, 39, - 15, 93, 12, 26, 195, 46, 136, 2, 214, 189, 243, 15, 133, 35, 42, 46, 99, 4, 103, 2, 31, 10, 247, 119, 118, 84, 49, 11, 227, 7, 202, 132, 0, 101, 0, 0, 100, 107, 151, 47, 5, 15, 225, 6, 100, 22, 216, 255, 239, 255, 253, 202, 78, 181, 255, 144, 159, 244, 90, 48, 3, 176, 30, 181, 176, 207, 48, 3, 204, 13, - 187, 32, 72, 79, 2, 190, 57, 115, 71, 71, 143, 175, 255, 39, 147, 41, 107, 167, 246, 95, 227, 255, 4, 19, 13, 4, 50, 31, 4, 0, 9, 255, 59, 255, 16, 9, 79, 255, 112, 11, 255, 14, 255, 192, 12, 9, 255, 241, 12, 105, 157, 222, 0, 255, 48, 3, 251, 128, 3, 13, 222, 2, 5, 212, 83, 32, 31, 223, 224, 30, - 131, 176, 30, 131, 15, 96, 66, 137, 85, 88, 91, 94, 131, 207, 255, 50, 46, 23, 49, 31, 9, 69, 24, 224, 9, 14, 95, 3, 16, 202, 64, 3, 251, 15, 254, 44, 17, 237, 35, 53, 86, 12, 157, 0, 221, 231, 75, 187, 255, 230, 247, 119, 153, 20, 123, 0, 61, 8, 0, 222, 14, 222, 12, 107, 31, 98, 18, 51, 15, 255, - 1, 5, 91, 191, 15, 85, 223, 103, 121, 175, 191, 4, 0, 4, 159, 244, 213, 119, 52, 18, 137, 112, 18, 133, 112, 18, 133, 224, 58, 12, 127, 17, 239, 255, 3, 86, 48, 29, 166, 128, 58, 202, 137, 11, 41, 153, 0, 33, 0, 88, 79, 13, 92, 71, 191, 226, 65, 164, 0, 89, 207, 128, 74, 211, 15, 255, 1, 53, 40, 21, - 90, 43, 169, 191, 239, 255, 99, 90, 255, 249, 90, 39, 255, 255, 52, 122, 61, 245, 4, 0, 221, 79, 24, 4, 79, 125, 95, 30, 188, 51, 157, 107, 6, 32, 18, 0, 0, 139, 206, 1, 101, 3, 239, 79, 231, 0, 111, 147, 1, 52, 104, 155, 27, 12, 159, 3, 27, 147, 40, 134, 222, 246, 14, 96, 10, 19, 86, 87, 79, 251, - 159, 95, 43, 19, 171, 78, 95, 137, 189, 122, 143, 116, 236, 185, 118, 83, 188, 255, 185, 144, 28, 244, 254, 185, 134, 207, 31, 216, 111, 31, 216, 43, 194, 134, 11, 28, 60, 46, 96, 47, 163, 31, 189, 10, 81, 31, 12, 59, 90, 247, 183, 103, 19, 70, 121, 158, 31, 237, 185, 189, 83, 156, 31, 3, 255, 250, 124, 31, 242, 242, - 117, 95, 245, 253, 135, 92, 28, 145, 6, 31, 61, 1, 99, 41, 92, 191, 254, 29, 222, 49, 204, 30, 234, 0, 186, 212, 151, 64, 15, 69, 0, 63, 30, 41, 79, 30, 49, 32, 148, 170, 127, 30, 69, 143, 30, 73, 159, 80, 234, 159, 2, 223, 13, 42, 15, 147, 19, 45, 39, 4, 93, 131, 7, 93, 135, 9, 112, 3, 171, 247, - 29, 176, 245, 31, 20, 243, 31, 24, 242, 0, 224, 12, 204, 241, 85, 35, 96, 3, 35, 227, 35, 231, 36, 170, 149, 32, 15, 255, 33, 30, 154, 255, 32, 3, 191, 31, 96, 85, 233, 83, 50, 17, 95, 207, 74, 27, 86, 31, 54, 175, 87, 145, 86, 255, 29, 186, 223, 31, 179, 239, 245, 223, 232, 253, 255, 245, 31, 143, 244, 33, - 79, 31, 151, 46, 227, 244, 32, 152, 119, 85, 13, 66, 4, 13, 31, 211, 32, 3, 117, 27, 16, 0, 5, 85, 227, 239, 10, 159, 215, 223, 223, 33, 16, 51, 115, 14, 4, 173, 255, 223, 187, 191, 111, 240, 240, 204, 194, 31, 119, 15, 255, 232, 255, 252, 152, 63, 179, 80, 94, 75, 29, 242, 30, 148, 41, 63, 129, 36, 4, 119, - 79, 128, 124, 42, 16, 80, 3, 73, 47, 79, 135, 30, 182, 8, 30, 243, 7, 255, 228, 222, 107, 159, 227, 151, 118, 31, 15, 1, 46, 85, 0, 79, 122, 31, 222, 111, 86, 120, 154, 146, 135, 221, 30, 170, 76, 47, 19, 9, 16, 217, 45, 236, 17, 0, 80, 231, 47, 207, 242, 48, 249, 118, 84, 54, 167, 80, 126, 159, 89, 31, - 252, 127, 6, 187, 221, 255, 7, 31, 240, 32, 3, 233, 4, 185, 151, 41, 51, 31, 38, 199, 46, 243, 253, 239, 51, 85, 119, 144, 126, 254, 255, 98, 16, 125, 63, 19, 3, 255, 15, 244, 6, 16, 3, 157, 127, 16, 7, 255, 255, 196, 68, 255, 255, 204, 252, 207, 239, 255, 168, 118, 111, 92, 137, 228, 203, 93, 39, 31, 80, 11, - 255, 27, 255, 48, 4, 54, 41, 241, 94, 172, 159, 16, 12, 159, 40, 0, 0, 121, 190, 43, 83, 169, 250, 30, 223, 252, 229, 55, 6, 157, 131, 63, 164, 33, 81, 45, 34, 180, 31, 255, 244, 95, 207, 47, 211, 45, 89, 255, 232, 215, 32, 79, 29, 136, 5, 42, 186, 63, 216, 31, 220, 179, 37, 207, 132, 201, 113, 12, 254, 17, - 44, 181, 12, 233, 170, 48, 58, 36, 111, 93, 194, 95, 30, 24, 31, 18, 175, 44, 63, 47, 46, 111, 14, 83, 83, 3, 114, 111, 255, 45, 215, 248, 255, 218, 117, 16, 80, 76, 163, 97, 203, 15, 255, 0, 170, 143, 62, 22, 16, 30, 182, 32, 30, 178, 64, 29, 224, 162, 128, 55, 255, 7, 35, 15, 190, 255, 46, 115, 95, 51, - 191, 245, 2, 207, 255, 69, 67, 58, 228, 46, 132, 79, 169, 96, 80, 255, 248, 70, 55, 248, 92, 23, 79, 254, 8, 97, 83, 247, 5, 255, 68, 11, 39, 247, 55, 255, 34, 199, 14, 39, 41, 15, 44, 185, 242, 85, 7, 46, 17, 254, 16, 0, 243, 26, 255, 196, 73, 94, 63, 30, 153, 1, 234, 255, 0, 0, 45, 255, 128, 3, - 239, 255, 208, 176, 95, 21, 176, 255, 30, 135, 33, 99, 35, 47, 1, 63, 16, 90, 31, 208, 3, 31, 88, 2, 255, 25, 118, 207, 31, 207, 153, 46, 40, 119, 125, 207, 32, 5, 31, 231, 17, 71, 1, 157, 127, 110, 177, 28, 112, 180, 143, 254, 53, 63, 9, 212, 255, 243, 47, 31, 144, 95, 239, 80, 89, 195, 223, 42, 134, 31, - 37, 69, 47, 104, 46, 44, 237, 35, 255, 162, 63, 120, 243, 111, 255, 96, 23, 63, 18, 31, 50, 251, 25, 232, 223, 235, 72, 80, 55, 159, 35, 161, 47, 6, 49, 59, 2, 32, 11, 17, 8, 25, 125, 71, 239, 13, 206, 19, 32, 215, 223, 30, 223, 169, 191, 34, 100, 254, 79, 231, 15, 85, 103, 39, 163, 12, 85, 80, 15, 9, - 41, 115, 0, 38, 1, 227, 46, 151, 181, 116, 19, 159, 255, 253, 147, 40, 32, 112, 80, 23, 12, 162, 6, 104, 88, 43, 11, 0, 70, 159, 5, 175, 75, 28, 190, 72, 43, 155, 160, 80, 183, 35, 7, 254, 32, 22, 70, 250, 64, 181, 12, 31, 255, 207, 250, 73, 77, 173, 7, 233, 1, 200, 42, 14, 56, 50, 76, 159, 87, 12, - 159, 40, 133, 14, 189, 43, 4, 36, 99, 211, 7, 223, 47, 163, 106, 14, 63, 7, 31, 154, 206, 240, 53, 15, 255, 38, 37, 41, 1, 158, 15, 159, 9, 64, 38, 159, 72, 150, 190, 15, 158, 3, 15, 255, 17, 95, 87, 155, 0, 22, 15, 255, 4, 255, 251, 16, 255, 252, 64, 0, 117, 16, 79, 15, 228, 39, 5, 14, 157, 11, - 30, 64, 111, 255, 255, 213, 234, 1, 87, 98, 15, 255, 3, 211, 14, 61, 78, 79, 23, 59, 177, 191, 23, 109, 3, 188, 14, 167, 69, 46, 11, 40, 107, 0, 170, 59, 15, 255, 2, 252, 87, 223, 192, 15, 250, 40, 9, 1, 95, 13, 238, 248, 41, 239, 22, 157, 3, 122, 224, 15, 136, 67, 109, 25, 66, 0, 3, 43, 27, 0, - 72, 11, 203, 3, 128, 88, 72, 203, 207, 15, 255, 91, 2, 150, 31, 122, 85, 11, 2, 147, 7, 249, 63, 128, 0, 2, 239, 247, 251, 47, 151, 211, 82, 83, 183, 80, 1, 119, 15, 4, 4, 146, 3, 41, 199, 225, 76, 87, 91, 255, 225, 11, 29, 84, 175, 240, 27, 9, 73, 255, 153, 95, 16, 3, 14, 223, 32, 13, 200, 22, - 106, 92, 135, 191, 76, 254, 159, 48, 87, 123, 44, 160, 121, 160, 3, 179, 43, 44, 139, 179, 14, 239, 255, 236, 147, 84, 211, 38, 163, 217, 188, 18, 2, 239, 4, 30, 194, 32, 3, 1, 30, 198, 239, 255, 144, 87, 79, 146, 176, 88, 151, 223, 255, 67, 31, 254, 17, 147, 2, 92, 47, 170, 10, 255, 255, 246, 91, 15, 240, 67, - 51, 1, 13, 181, 11, 87, 12, 48, 29, 4, 29, 43, 15, 30, 244, 79, 255, 32, 174, 1, 34, 61, 207, 110, 192, 4, 255, 144, 31, 149, 91, 32, 3, 176, 31, 153, 176, 207, 48, 3, 204, 176, 237, 204, 194, 0, 0, 0, 141, 1, 53, 15, 65, 10, 119, 222, 118, 82, 5, 93, 75, 19, 87, 119, 101, 162, 213, 218, 9, 255, - 48, 3, 251, 11, 16, 3, 12, 48, 3, 41, 45, 213, 14, 98, 46, 12, 106, 87, 175, 31, 255, 61, 223, 5, 231, 121, 171, 222, 40, 123, 44, 3, 241, 0, 29, 123, 27, 201, 207, 255, 145, 10, 27, 208, 143, 255, 172, 192, 27, 50, 170, 157, 38, 219, 247, 89, 223, 95, 231, 151, 68, 31, 202, 45, 243, 254, 47, 208, 152, 117, - 50, 107, 6, 245, 5, 104, 155, 74, 75, 191, 30, 87, 32, 2, 255, 63, 255, 160, 30, 10, 248, 16, 207, 203, 1, 16, 30, 215, 26, 72, 205, 157, 135, 239, 254, 91, 30, 24, 244, 25, 9, 112, 12, 31, 144, 12, 204, 247, 250, 188, 228, 68, 111, 203, 252, 169, 117, 134, 67, 238, 223, 57, 247, 93, 19, 47, 230, 155, 206, 79, - 249, 106, 46, 199, 137, 143, 28, 220, 47, 25, 113, 111, 31, 167, 166, 191, 45, 60, 249, 74, 47, 30, 32, 219, 146, 47, 106, 78, 28, 141, 14, 78, 77, 48, 3, 1, 51, 69, 239, 240, 231, 253, 219, 64, 29, 235, 32, 3, 48, 0, 103, 185, 121, 31, 81, 42, 206, 255, 28, 75, 64, 51, 9, 148, 152, 95, 171, 47, 163, 13, - 31, 252, 31, 61, 34, 46, 255, 245, 255, 236, 185, 16, 27, 222, 50, 76, 230, 1, 89, 30, 116, 1, 46, 174, 19, 0, 19, 12, 16, 3, 204, 158, 0, 19, 12, 47, 32, 255, 255, 221, 180, 95, 59, 255, 243, 52, 86, 119, 146, 176, 0, 2, 205, 52, 176, 63, 107, 111, 243, 1, 50, 175, 198, 85, 223, 119, 142, 158, 181, 255, - 254, 17, 0, 239, 171, 247, 27, 171, 243, 30, 158, 224, 31, 61, 215, 236, 183, 221, 143, 162, 186, 153, 162, 79, 0, 0, 117, 171, 66, 91, 39, 160, 78, 71, 83, 11, 156, 1, 51, 69, 207, 87, 120, 111, 255, 47, 115, 35, 33, 16, 15, 59, 95, 19, 46, 211, 223, 255, 253, 144, 96, 219, 169, 175, 151, 63, 127, 16, 78, 211, - 252, 118, 84, 32, 199, 32, 15, 17, 99, 33, 103, 28, 119, 118, 85, 50, 124, 14, 153, 14, 54, 0, 4, 191, 255, 28, 234, 18, 7, 207, 253, 149, 69, 133, 142, 204, 155, 223, 255, 219, 116, 63, 126, 202, 153, 190, 4, 154, 2, 130, 97, 255, 29, 71, 200, 127, 254, 77, 213, 95, 10, 126, 47, 195, 92, 99, 183, 239, 222, 37, - 140, 159, 115, 234, 99, 0, 98, 10, 255, 0, 182, 234, 47, 247, 203, 188, 45, 203, 2, 175, 91, 199, 162, 7, 91, 207, 47, 44, 207, 35, 3, 48, 247, 192, 94, 195, 158, 224, 80, 11, 45, 95, 2, 88, 207, 7, 31, 71, 127, 30, 106, 255, 2, 255, 254, 166, 0, 150, 157, 32, 251, 95, 63, 247, 236, 187, 206, 12, 174, 2, - 44, 212, 204, 32, 31, 211, 112, 31, 79, 245, 27, 170, 31, 79, 53, 17, 30, 48, 220, 191, 252, 29, 146, 247, 12, 0, 47, 10, 239, 220, 185, 134, 15, 69, 10, 83, 37, 239, 211, 106, 25, 227, 249, 4, 19, 129, 31, 31, 164, 143, 31, 70, 124, 32, 130, 143, 255, 197, 16, 30, 29, 0, 15, 129, 10, 183, 167, 58, 243, 157, - 186, 15, 165, 10, 151, 84, 49, 173, 95, 78, 219, 79, 31, 23, 255, 254, 31, 134, 244, 95, 25, 238, 240, 31, 38, 253, 0, 1, 239, 255, 210, 252, 16, 72, 71, 227, 87, 155, 111, 255, 81, 63, 159, 106, 14, 192, 15, 2, 3, 31, 88, 8, 30, 190, 12, 30, 243, 166, 31, 30, 240, 95, 30, 20, 45, 229, 239, 250, 78, 47, - 109, 239, 214, 78, 148, 46, 84, 251, 97, 30, 103, 255, 153, 90, 44, 155, 15, 247, 5, 216, 48, 77, 167, 78, 47, 175, 85, 64, 81, 3, 30, 141, 7, 28, 173, 11, 27, 19, 15, 119, 31, 201, 79, 255, 48, 254, 239, 6, 217, 64, 53, 26, 206, 68, 99, 6, 191, 9, 95, 3, 182, 32, 243, 253, 165, 131, 45, 123, 226, 15, - 161, 15, 36, 175, 63, 31, 231, 57, 214, 153, 154, 12, 127, 5, 48, 31, 153, 245, 189, 33, 171, 175, 3, 18, 195, 2, 18, 68, 46, 255, 245, 5, 229, 239, 255, 176, 16, 231, 7, 3, 18, 255, 65, 159, 5, 152, 153, 14, 31, 5, 53, 235, 153, 187, 45, 195, 52, 23, 20, 27, 217, 3, 239, 61, 119, 27, 255, 31, 190, 30, - 35, 32, 65, 85, 147, 208, 94, 231, 31, 151, 41, 218, 9, 94, 29, 47, 51, 29, 95, 31, 58, 223, 17, 165, 255, 0, 26, 255, 253, 250, 25, 255, 255, 160, 15, 28, 0, 111, 31, 31, 204, 239, 241, 79, 71, 44, 15, 209, 0, 228, 57, 15, 39, 35, 245, 76, 0, 0, 28, 46, 20, 191, 19, 238, 255, 111, 62, 71, 7, 255, - 25, 147, 255, 245, 110, 255, 255, 255, 96, 255, 255, 228, 0, 255, 252, 152, 32, 52, 235, 21, 215, 0, 208, 210, 159, 0, 211, 25, 114, 25, 111, 31, 225, 127, 0, 17, 52, 0, 6, 239, 255, 255, 4, 207, 255, 254, 207, 255, 255, 194, 161, 11, 30, 252, 127, 28, 4, 35, 105, 107, 83, 41, 195, 64, 108, 12, 15, 85, 3, 223, - 98, 167, 1, 88, 15, 159, 3, 26, 35, 85, 36, 4, 200, 14, 222, 39, 45, 47, 120, 91, 15, 159, 8, 192, 122, 31, 163, 112, 0, 21, 156, 10, 140, 7, 7, 12, 71, 6, 54, 63, 223, 18, 23, 191, 208, 2, 16, 9, 3, 141, 15, 187, 7, 37, 79, 191, 28, 37, 251, 91, 89, 15, 255, 2, 159, 31, 254, 91, 147, 251, - 209, 202, 191, 235, 73, 15, 249, 10, 24, 151, 240, 2, 177, 123, 39, 129, 4, 48, 9, 192, 38, 45, 176, 14, 191, 8, 176, 218, 0, 239, 29, 71, 61, 80, 15, 255, 69, 223, 26, 30, 183, 63, 24, 202, 4, 211, 15, 255, 67, 46, 255, 229, 229, 0, 6, 249, 3, 208, 52, 7, 1, 5, 255, 77, 51, 0, 149, 51, 15, 255, - 3, 30, 139, 161, 15, 123, 73, 175, 23, 195, 14, 250, 250, 16, 0, 3, 48, 12, 254, 131, 120, 14, 29, 9, 239, 86, 172, 223, 7, 31, 6, 1, 48, 138, 189, 87, 58, 195, 246, 15, 65, 13, 36, 7, 187, 10, 103, 155, 222, 107, 7, 127, 7, 53, 121, 25, 144, 255, 7, 159, 4, 19, 16, 11, 73, 123, 38, 15, 208, 150, - 25, 193, 224, 55, 166, 0, 223, 111, 30, 156, 143, 255, 5, 46, 63, 0, 0, 41, 253, 41, 56, 203, 58, 125, 9, 239, 191, 159, 36, 49, 25, 231, 191, 87, 31, 199, 207, 26, 38, 207, 143, 245, 144, 0, 244, 90, 48, 3, 176, 128, 3, 204, 176, 15, 128, 14, 39, 223, 177, 87, 43, 150, 216, 29, 5, 250, 24, 135, 242, 119, - 126, 60, 29, 50, 15, 224, 8, 64, 184, 0, 4, 9, 191, 11, 6, 99, 6, 196, 153, 147, 73, 59, 9, 63, 2, 206, 192, 69, 2, 63, 9, 29, 155, 37, 9, 190, 12, 22, 226, 141, 0, 97, 10, 36, 243, 8, 239, 255, 107, 98, 28, 127, 207, 253, 76, 3, 45, 219, 15, 255, 31, 5, 29, 158, 51, 160, 3, 15, 225, 11, - 4, 119, 1, 63, 34, 15, 255, 19, 20, 119, 230, 117, 108, 255, 10, 127, 8, 46, 235, 254, 146, 15, 253, 50, 92, 79, 231, 8, 31, 179, 3, 101, 49, 9, 223, 2, 63, 238, 253, 202, 135, 108, 254, 0, 1, 31, 179, 29, 122, 27, 243, 207, 255, 176, 9, 21, 246, 47, 31, 104, 126, 31, 235, 247, 236, 168, 117, 49, 96, 31, - 255, 137, 244, 80, 151, 207, 243, 47, 231, 175, 60, 49, 19, 181, 66, 120, 0, 95, 6, 255, 219, 151, 101, 137, 223, 47, 59, 23, 88, 239, 2, 255, 251, 63, 235, 253, 185, 134, 223, 63, 33, 207, 30, 92, 255, 210, 0, 4, 250, 0, 239, 159, 244, 160, 16, 3, 0, 1, 191, 244, 72, 46, 187, 67, 158, 38, 63, 255, 144, 90, - 111, 35, 62, 47, 239, 129, 12, 29, 153, 19, 15, 31, 118, 45, 56, 28, 103, 26, 171, 95, 127, 61, 147, 177, 0, 0, 92, 48, 0, 93, 253, 255, 176, 93, 255, 255, 242, 31, 62, 129, 246, 255, 254, 112, 0, 16, 2, 0, 128, 9, 33, 24, 69, 46, 101, 223, 73, 187, 62, 95, 39, 143, 45, 76, 211, 111, 118, 29, 49, 0, - 204, 250, 25, 218, 255, 5, 31, 69, 105, 52, 177, 255, 230, 16, 2, 0, 45, 186, 21, 246, 0, 154, 194, 94, 76, 30, 174, 0, 232, 15, 29, 4, 95, 95, 111, 175, 61, 2, 255, 1, 9, 111, 252, 222, 255, 252, 186, 172, 12, 27, 96, 63, 16, 238, 191, 254, 82, 255, 27, 19, 171, 251, 17, 75, 251, 25, 99, 151, 64, 159, - 1, 0, 193, 21, 83, 76, 178, 80, 3, 32, 131, 46, 70, 41, 99, 175, 6, 29, 205, 231, 198, 99, 231, 0, 7, 6, 64, 210, 255, 255, 26, 38, 229, 253, 102, 83, 15, 149, 0, 97, 139, 203, 13, 170, 7, 207, 138, 251, 60, 43, 29, 48, 71, 139, 4, 31, 181, 8, 78, 15, 63, 25, 29, 31, 115, 110, 16, 41, 239, 255, - 154, 126, 111, 166, 251, 73, 255, 254, 64, 31, 29, 152, 254, 143, 255, 255, 81, 255, 248, 255, 24, 118, 239, 255, 255, 231, 47, 167, 193, 251, 191, 255, 212, 253, 224, 27, 160, 112, 30, 64, 16, 31, 29, 81, 151, 162, 4, 95, 243, 13, 35, 221, 38, 18, 31, 158, 0, 27, 74, 121, 59, 71, 216, 53, 255, 240, 31, 255, 48, 3, - 191, 104, 25, 139, 0, 108, 147, 255, 29, 31, 205, 28, 100, 27, 246, 182, 255, 16, 27, 205, 175, 31, 208, 63, 193, 75, 168, 101, 111, 196, 254, 80, 85, 11, 31, 146, 95, 18, 106, 10, 116, 30, 103, 4, 255, 224, 29, 53, 240, 48, 3, 65, 183, 174, 7, 66, 255, 5, 30, 223, 30, 255, 227, 30, 96, 199, 64, 1, 21, 154, - 46, 42, 66, 223, 169, 173, 250, 233, 32, 0, 22, 30, 230, 143, 77, 111, 38, 55, 63, 79, 48, 255, 255, 22, 23, 29, 195, 0, 40, 255, 255, 255, 128, 230, 46, 255, 242, 250, 3, 255, 212, 248, 242, 31, 252, 160, 29, 95, 32, 62, 123, 12, 8, 76, 253, 159, 254, 16, 0, 223, 249, 66, 35, 223, 94, 29, 107, 143, 29, 192, - 30, 255, 252, 48, 30, 74, 139, 250, 27, 186, 15, 31, 7, 47, 171, 252, 10, 115, 18, 9, 255, 170, 225, 30, 195, 144, 31, 47, 112, 19, 246, 192, 31, 247, 185, 250, 47, 247, 0, 0, 62, 33, 251, 29, 235, 207, 181, 244, 64, 3, 204, 194, 111, 254, 195, 47, 251, 163, 74, 46, 219, 198, 62, 87, 23, 38, 1, 81, 227, 14, - 31, 255, 148, 15, 91, 19, 60, 19, 95, 26, 63, 239, 31, 167, 38, 11, 58, 116, 27, 52, 75, 251, 116, 111, 5, 95, 9, 49, 84, 251, 74, 15, 255, 6, 16, 93, 243, 81, 211, 226, 28, 7, 32, 65, 40, 67, 30, 217, 207, 63, 251, 31, 223, 36, 177, 15, 193, 4, 167, 66, 178, 16, 0, 95, 11, 0, 17, 31, 187, 79, - 158, 31, 39, 212, 83, 74, 163, 6, 35, 15, 175, 174, 55, 52, 239, 32, 3, 219, 85, 251, 29, 168, 243, 14, 29, 45, 63, 255, 234, 152, 32, 47, 31, 178, 13, 24, 80, 4, 31, 224, 127, 19, 235, 48, 95, 254, 0, 255, 239, 253, 85, 47, 171, 146, 30, 83, 255, 26, 116, 255, 18, 66, 239, 244, 51, 255, 243, 7, 239, 255, - 179, 101, 67, 30, 103, 175, 235, 3, 255, 0, 1, 25, 58, 4, 255, 248, 157, 165, 22, 31, 247, 64, 31, 251, 119, 193, 98, 46, 11, 252, 219, 133, 32, 102, 47, 20, 139, 33, 195, 1, 71, 106, 239, 226, 200, 82, 77, 83, 255, 31, 183, 174, 47, 56, 186, 5, 30, 217, 10, 255, 134, 21, 242, 32, 52, 2, 115, 36, 6, 12, - 255, 117, 47, 107, 38, 59, 255, 184, 222, 255, 241, 26, 71, 128, 198, 175, 254, 25, 35, 253, 246, 10, 30, 255, 192, 95, 17, 207, 159, 115, 21, 88, 127, 253, 48, 53, 111, 31, 159, 0, 207, 229, 74, 205, 201, 100, 138, 28, 144, 44, 60, 148, 255, 244, 135, 239, 250, 247, 83, 231, 245, 64, 3, 35, 158, 190, 143, 25, 106, 79, - 191, 32, 0, 4, 61, 52, 237, 207, 255, 240, 22, 255, 240, 175, 84, 3, 255, 245, 232, 255, 240, 254, 20, 19, 244, 24, 7, 16, 115, 103, 255, 2, 156, 219, 49, 207, 31, 11, 1, 255, 218, 243, 2, 78, 84, 249, 2, 25, 230, 239, 35, 231, 140, 135, 21, 119, 45, 103, 20, 156, 48, 127, 19, 176, 18, 87, 249, 48, 239, 248, - 140, 0, 21, 142, 20, 137, 176, 87, 26, 9, 112, 20, 221, 80, 34, 226, 1, 12, 255, 215, 231, 175, 23, 107, 255, 18, 226, 255, 0, 26, 215, 239, 217, 26, 34, 248, 26, 135, 192, 8, 255, 229, 254, 32, 191, 22, 45, 17, 86, 0, 20, 33, 0, 169, 250, 119, 75, 127, 22, 179, 175, 19, 121, 29, 197, 6, 93, 26, 184, 13, - 24, 159, 111, 255, 144, 19, 34, 32, 144, 7, 9, 222, 11, 13, 239, 54, 143, 98, 115, 14, 99, 3, 38, 224, 39, 107, 166, 159, 12, 191, 40, 8, 15, 31, 10, 28, 67, 80, 42, 34, 44, 215, 41, 244, 14, 4, 35, 2, 34, 235, 1, 107, 239, 61, 15, 160, 6, 104, 223, 53, 103, 119, 118, 15, 255, 2, 208, 43, 83, 231, - 9, 203, 8, 42, 46, 63, 23, 0, 191, 9, 255, 190, 99, 44, 167, 19, 86, 10, 43, 3, 35, 227, 35, 231, 119, 99, 53, 1, 159, 42, 38, 95, 0, 58, 15, 255, 4, 224, 57, 55, 239, 159, 197, 4, 102, 7, 15, 255, 11, 255, 255, 234, 64, 235, 157, 98, 15, 218, 41, 0, 96, 14, 0, 7, 187, 15, 255, 10, 112, 127, - 2, 31, 16, 225, 143, 255, 252, 16, 1, 103, 57, 15, 64, 37, 107, 239, 3, 153, 144, 2, 157, 4, 46, 227, 92, 155, 254, 15, 255, 6, 22, 90, 0, 145, 15, 186, 74, 24, 192, 106, 15, 255, 99, 10, 205, 43, 54, 112, 13, 119, 6, 5, 144, 3, 83, 191, 255, 119, 47, 119, 240, 128, 3, 15, 255, 8, 139, 181, 95, 31, - 2, 247, 15, 128, 31, 1, 17, 159, 0, 95, 169, 240, 32, 3, 191, 16, 7, 207, 189, 141, 207, 67, 8, 70, 31, 75, 13, 14, 123, 7, 41, 183, 14, 127, 3, 1, 93, 75, 187, 183, 5, 26, 151, 5, 243, 191, 255, 34, 0, 0, 255, 91, 255, 243, 0, 111, 251, 204, 48, 254, 252, 102, 108, 176, 246, 0, 15, 15, 160, 8, - 235, 25, 100, 16, 26, 194, 254, 15, 192, 10, 201, 99, 125, 4, 207, 10, 84, 0, 0, 126, 252, 1, 8, 10, 167, 46, 75, 43, 15, 225, 4, 65, 45, 187, 236, 150, 65, 5, 122, 13, 189, 228, 206, 206, 255, 144, 159, 244, 48, 3, 176, 98, 29, 89, 176, 207, 33, 72, 12, 240, 1, 31, 245, 11, 89, 107, 164, 46, 0, 119, - 3, 235, 136, 7, 0, 251, 7, 64, 77, 171, 15, 161, 31, 186, 52, 29, 236, 191, 254, 184, 44, 120, 2, 15, 31, 5, 165, 82, 48, 251, 133, 30, 187, 15, 190, 12, 79, 7, 62, 3, 3, 90, 30, 163, 11, 92, 143, 28, 239, 15, 255, 2, 252, 17, 86, 74, 31, 154, 236, 10, 31, 7, 18, 39, 11, 18, 39, 63, 18, 39, - 164, 0, 0, 0, 141, 11, 31, 48, 96, 3, 9, 31, 207, 96, 3, 143, 7, 30, 75, 32, 3, 45, 51, 87, 119, 119, 122, 190, 191, 77, 3, 255, 173, 221, 221, 222, 147, 255, 179, 7, 51, 235, 247, 117, 60, 163, 48, 3, 253, 218, 134, 0, 31, 109, 143, 127, 25, 40, 128, 3, 159, 251, 128, 3, 205, 127, 253, 64, 3, 45, - 149, 119, 119, 29, 178, 255, 119, 48, 3, 10, 221, 221, 206, 253, 240, 207, 119, 231, 175, 249, 204, 42, 187, 47, 61, 221, 239, 255, 235, 221, 0, 95, 28, 136, 95, 32, 66, 251, 0, 245, 244, 204, 176, 11, 31, 67, 11, 30, 121, 11, 106, 29, 109, 9, 208, 77, 235, 9, 95, 86, 7, 91, 243, 165, 87, 30, 135, 191, 30, 135, - 32, 3, 173, 48, 155, 208, 18, 64, 3, 35, 227, 16, 222, 247, 111, 71, 16, 222, 255, 83, 255, 125, 55, 87, 252, 96, 15, 176, 191, 25, 215, 59, 244, 255, 198, 48, 243, 28, 212, 253, 16, 157, 37, 145, 157, 176, 80, 3, 31, 226, 255, 0, 109, 45, 7, 3, 150, 159, 46, 204, 79, 247, 12, 93, 191, 143, 254, 57, 207, 53, - 30, 104, 29, 54, 0, 253, 90, 135, 192, 168, 79, 143, 83, 29, 198, 47, 49, 132, 240, 30, 250, 45, 101, 253, 5, 230, 235, 207, 255, 30, 42, 16, 3, 248, 255, 75, 243, 173, 6, 180, 231, 64, 64, 127, 3, 242, 54, 157, 255, 164, 243, 41, 35, 40, 30, 79, 47, 255, 95, 26, 63, 45, 167, 52, 57, 151, 46, 232, 0, 8, - 29, 63, 1, 42, 40, 44, 55, 178, 79, 79, 7, 94, 204, 63, 252, 30, 177, 207, 17, 64, 66, 45, 89, 144, 111, 171, 49, 207, 31, 215, 30, 207, 143, 12, 189, 7, 107, 44, 253, 237, 113, 43, 144, 36, 123, 231, 32, 0, 234, 1, 141, 242, 76, 255, 159, 31, 206, 47, 31, 12, 237, 12, 255, 192, 45, 0, 173, 32, 223, 251, - 22, 105, 21, 30, 255, 48, 29, 246, 176, 14, 190, 10, 47, 175, 79, 234, 0, 2, 105, 149, 227, 5, 27, 235, 31, 31, 215, 249, 10, 255, 181, 0, 3, 44, 125, 28, 206, 9, 234, 255, 37, 139, 47, 47, 11, 31, 15, 12, 29, 120, 191, 12, 31, 125, 12, 204, 245, 0, 96, 0, 246, 251, 1, 255, 252, 35, 227, 79, 251, 128, - 3, 195, 76, 203, 107, 87, 182, 207, 182, 97, 63, 222, 220, 96, 119, 44, 111, 0, 72, 174, 21, 240, 0, 4, 99, 117, 30, 208, 3, 125, 243, 61, 222, 1, 80, 222, 7, 242, 12, 255, 176, 14, 102, 7, 98, 39, 11, 18, 39, 170, 5, 27, 184, 239, 46, 107, 241, 255, 157, 27, 29, 195, 255, 239, 0, 1, 191, 255, 0, 94, - 255, 157, 255, 28, 226, 44, 150, 0, 2, 113, 18, 70, 254, 183, 112, 31, 231, 253, 80, 31, 240, 252, 252, 77, 85, 47, 245, 127, 45, 63, 191, 15, 87, 2, 251, 28, 24, 255, 164, 249, 46, 63, 247, 15, 254, 47, 35, 231, 6, 26, 35, 89, 6, 222, 7, 4, 29, 14, 3, 255, 241, 10, 16, 3, 207, 5, 2, 47, 52, 26, - 92, 1, 69, 66, 9, 205, 159, 255, 18, 144, 47, 16, 215, 156, 32, 156, 47, 124, 23, 6, 79, 207, 255, 114, 191, 127, 83, 39, 247, 175, 215, 47, 147, 248, 47, 55, 48, 254, 191, 250, 251, 0, 250, 4, 209, 0, 67, 231, 111, 254, 11, 98, 111, 21, 117, 83, 27, 35, 31, 47, 95, 127, 20, 84, 79, 29, 7, 255, 16, 242, - 30, 151, 253, 121, 16, 175, 255, 249, 0, 16, 95, 255, 48, 32, 12, 126, 19, 15, 127, 249, 0, 32, 159, 249, 30, 191, 179, 247, 31, 239, 254, 113, 46, 191, 37, 247, 4, 255, 253, 235, 255, 43, 255, 160, 60, 83, 231, 6, 42, 104, 147, 31, 226, 4, 28, 146, 3, 25, 53, 3, 28, 146, 170, 2, 51, 231, 224, 30, 183, 240, - 31, 161, 240, 30, 84, 108, 45, 237, 241, 10, 16, 3, 5, 255, 16, 222, 24, 63, 213, 7, 255, 16, 222, 255, 0, 222, 1, 254, 16, 222, 250, 91, 42, 20, 144, 74, 135, 0, 215, 31, 244, 255, 231, 86, 46, 191, 16, 52, 213, 3, 32, 222, 0, 207, 29, 170, 53, 16, 156, 63, 41, 239, 246, 64, 15, 143, 80, 219, 8, 63, - 15, 223, 3, 29, 215, 2, 229, 0, 0, 78, 255, 223, 236, 190, 18, 3, 225, 255, 8, 255, 192, 255, 175, 12, 255, 160, 79, 15, 255, 96, 210, 12, 127, 31, 6, 239, 99, 191, 20, 51, 249, 68, 76, 168, 14, 46, 62, 146, 71, 115, 12, 93, 51, 62, 190, 36, 87, 38, 49, 123, 40, 207, 96, 80, 15, 35, 134, 254, 80, 30, - 232, 217, 254, 203, 78, 63, 143, 252, 64, 167, 20, 137, 7, 127, 17, 212, 46, 255, 192, 4, 239, 255, 64, 170, 239, 31, 41, 31, 21, 172, 10, 31, 76, 4, 46, 75, 170, 202, 12, 229, 1, 11, 28, 64, 47, 19, 86, 159, 31, 159, 87, 28, 172, 6, 31, 120, 13, 30, 239, 79, 255, 96, 170, 4, 18, 161, 9, 30, 147, 241, - 68, 49, 191, 28, 201, 187, 111, 81, 211, 15, 255, 98, 20, 212, 255, 237, 171, 255, 16, 219, 243, 17, 124, 251, 68, 231, 31, 255, 255, 160, 48, 9, 255, 242, 96, 1, 255, 246, 250, 112, 0, 175, 20, 32, 47, 196, 68, 151, 183, 1, 81, 43, 14, 255, 64, 67, 223, 253, 16, 21, 35, 124, 22, 93, 17, 106, 111, 30, 229, 31, - 20, 235, 11, 111, 30, 102, 7, 64, 72, 127, 0, 0, 70, 32, 255, 2, 0, 159, 254, 223, 255, 16, 143, 243, 255, 255, 96, 31, 31, 126, 31, 85, 240, 1, 43, 21, 13, 31, 223, 246, 20, 36, 247, 27, 185, 246, 0, 194, 1, 64, 85, 111, 46, 61, 41, 77, 31, 94, 6, 22, 159, 190, 13, 31, 106, 79, 253, 80, 0, 127, - 37, 118, 51, 37, 126, 32, 222, 239, 251, 94, 207, 38, 27, 96, 4, 168, 98, 16, 222, 255, 16, 222, 7, 53, 192, 32, 222, 35, 146, 138, 47, 20, 184, 17, 168, 21, 179, 112, 16, 222, 96, 31, 189, 83, 53, 43, 111, 31, 227, 14, 29, 107, 47, 162, 0, 239, 55, 34, 242, 31, 200, 14, 214, 21, 206, 254, 48, 0, 203, 46, - 177, 96, 181, 15, 175, 2, 4, 15, 196, 10, 223, 255, 218, 255, 230, 37, 228, 0, 43, 44, 135, 94, 46, 107, 162, 143, 239, 139, 212, 36, 19, 31, 255, 35, 173, 160, 15, 37, 29, 180, 1, 36, 222, 101, 81, 15, 255, 7, 46, 35, 111, 16, 132, 240, 0, 7, 207, 233, 15, 255, 2, 102, 207, 15, 253, 8, 37, 175, 221, 6, - 85, 15, 255, 6, 48, 2, 239, 19, 77, 45, 90, 47, 67, 124, 15, 255, 4, 80, 0, 47, 254, 254, 10, 43, 8, 186, 1, 14, 191, 11, 243, 0, 46, 16, 222, 2, 15, 159, 9, 164, 245, 17, 99, 192, 0, 222, 5, 15, 148, 18, 159, 13, 7, 2, 175, 255, 121, 17, 195, 254, 2, 87, 118, 14, 160, 3, 33, 183, 96, 54, - 15, 94, 41, 36, 185, 0, 93, 46, 163, 37, 119, 15, 255, 4, 254, 176, 0, 255, 230, 0, 0, 99, 15, 194, 38, 167, 103, 55, 135, 13, 0, 223, 10, 31, 131, 246, 4, 103, 166, 117, 12, 204, 3, 32, 1, 122, 8, 95, 255, 6, 112, 15, 184, 11, 52, 34, 123, 34, 127, 0, 70, 0, 223, 4, 242, 68, 247, 2, 193, 6, - 129, 32, 0, 222, 16, 31, 223, 32, 3, 3, 135, 4, 28, 199, 28, 203, 246, 130, 0, 0, 222, 5, 2, 125, 13, 0, 27, 238, 13, 97, 4, 13, 19, 48, 2, 27, 238, 114, 25, 67, 11, 255, 188, 4, 87, 7, 26, 231, 195, 71, 43, 85, 4, 48, 2, 11, 31, 251, 15, 26, 44, 14, 15, 191, 1, 17, 204, 205, 223, 110, - 189, 14, 191, 0, 35, 32, 87, 115, 124, 223, 91, 11, 31, 5, 223, 27, 202, 207, 248, 15, 254, 4, 188, 221, 136, 255, 46, 64, 46, 195, 255, 213, 18, 41, 67, 44, 9, 31, 137, 231, 240, 159, 244, 5, 19, 3, 60, 211, 8, 171, 255, 216, 176, 13, 15, 255, 5, 5, 119, 24, 46, 48, 226, 15, 255, 2, 242, 137, 155, 188, - 213, 35, 179, 31, 163, 79, 1, 89, 4, 255, 48, 0, 255, 188, 195, 0, 198, 102, 190, 203, 15, 160, 7, 3, 119, 119, 119, 7, 15, 223, 1, 158, 13, 27, 148, 46, 83, 125, 255, 199, 119, 15, 255, 10, 207, 118, 0, 77, 15, 15, 31, 34, 173, 185, 117, 49, 85, 33, 162, 239, 0, 95, 9, 254, 41, 11, 16, 15, 125, 34, - 4, 124, 30, 151, 5, 255, 51, 53, 90, 1, 255, 3, 47, 17, 124, 30, 242, 0, 247, 119, 119, 16, 42, 231, 15, 223, 36, 198, 5, 179, 79, 23, 41, 155, 2, 253, 33, 198, 16, 31, 171, 171, 208, 29, 9, 112, 4, 124, 62, 4, 70, 207, 61, 255, 42, 46, 89, 23, 247, 252, 109, 238, 10, 28, 116, 223, 28, 116, 127, 31, - 135, 247, 255, 191, 255, 255, 228, 2, 191, 207, 30, 184, 6, 239, 9, 255, 79, 249, 107, 16, 3, 251, 11, 16, 3, 12, 48, 3, 76, 203, 206, 236, 204, 26, 42, 25, 217, 255, 255, 178, 3, 192, 7, 77, 31, 247, 110, 29, 14, 155, 31, 140, 48, 24, 6, 250, 63, 34, 83, 43, 227, 255, 255, 98, 191, 255, 227, 125, 27, 211, - 63, 198, 102, 0, 63, 26, 216, 63, 239, 198, 0, 32, 27, 186, 249, 16, 191, 252, 86, 75, 131, 229, 41, 27, 195, 29, 206, 11, 251, 64, 3, 181, 10, 17, 84, 9, 99, 15, 255, 0, 6, 124, 163, 176, 243, 0, 119, 255, 176, 26, 35, 32, 3, 192, 1, 189, 187, 47, 255, 118, 85, 51, 33, 29, 223, 187, 119, 47, 243, 119, - 119, 122, 115, 248, 187, 187, 189, 81, 31, 255, 5, 50, 66, 176, 113, 243, 51, 155, 48, 3, 251, 135, 187, 66, 11, 60, 8, 44, 12, 28, 179, 0, 159, 251, 110, 128, 3, 127, 252, 76, 250, 103, 101, 83, 125, 107, 46, 19, 51, 26, 169, 255, 32, 3, 27, 187, 187, 16, 115, 255, 0, 0, 50, 16, 191, 244, 123, 176, 255, 207, - 244, 159, 240, 207, 244, 207, 247, 207, 204, 194, 46, 212, 31, 211, 241, 239, 254, 187, 178, 177, 32, 78, 255, 176, 28, 175, 16, 3, 204, 16, 7, 47, 39, 237, 128, 3, 7, 48, 3, 144, 0, 13, 237, 43, 108, 163, 16, 222, 119, 144, 222, 187, 34, 171, 203, 169, 183, 135, 31, 67, 51, 79, 29, 95, 59, 119, 124, 221, 255, 211, - 112, 223, 190, 255, 235, 29, 115, 144, 111, 31, 37, 0, 198, 26, 61, 255, 255, 179, 0, 253, 191, 252, 99, 0, 51, 48, 74, 75, 184, 115, 126, 31, 255, 255, 5, 80, 171, 37, 27, 173, 222, 61, 56, 207, 48, 3, 87, 85, 67, 33, 46, 19, 189, 247, 255, 235, 187, 7, 28, 71, 41, 255, 229, 185, 119, 133, 57, 253, 187, 21, - 30, 91, 35, 227, 186, 117, 95, 254, 121, 151, 0, 57, 203, 255, 30, 17, 169, 163, 151, 10, 145, 7, 87, 60, 71, 29, 228, 29, 62, 251, 87, 231, 155, 222, 255, 77, 2, 46, 51, 191, 255, 116, 230, 19, 255, 249, 33, 31, 31, 39, 251, 173, 31, 44, 93, 37, 97, 241, 93, 163, 16, 0, 51, 33, 144, 214, 125, 29, 237, 247, - 97, 6, 255, 242, 16, 152, 208, 93, 3, 136, 14, 255, 84, 71, 51, 33, 28, 88, 7, 14, 252, 255, 1, 102, 63, 255, 127, 80, 196, 46, 203, 85, 30, 250, 48, 46, 7, 128, 78, 7, 1, 29, 106, 79, 100, 29, 110, 31, 48, 77, 135, 191, 228, 154, 45, 147, 31, 164, 10, 29, 86, 60, 54, 74, 255, 45, 194, 6, 31, 207, - 29, 44, 219, 95, 38, 183, 255, 31, 14, 175, 0, 223, 252, 12, 246, 51, 140, 239, 254, 118, 109, 182, 49, 39, 48, 221, 191, 254, 29, 141, 255, 48, 14, 31, 103, 175, 15, 26, 59, 77, 203, 18, 249, 47, 87, 112, 254, 94, 255, 253, 241, 247, 4, 255, 248, 208, 17, 173, 48, 53, 63, 87, 15, 255, 44, 1, 239, 30, 101, 79, - 30, 190, 7, 94, 4, 202, 7, 9, 11, 95, 11, 255, 255, 145, 61, 44, 159, 182, 126, 31, 191, 1, 175, 31, 227, 4, 223, 95, 147, 46, 107, 30, 30, 158, 13, 27, 194, 2, 229, 246, 85, 63, 176, 80, 159, 20, 252, 16, 79, 95, 13, 29, 6, 12, 251, 14, 20, 97, 237, 7, 255, 145, 21, 176, 254, 112, 31, 208, 112, 216, - 5, 207, 17, 60, 5, 230, 62, 35, 46, 39, 175, 255, 170, 175, 255, 255, 241, 47, 255, 5, 31, 255, 5, 223, 255, 125, 46, 30, 15, 255, 255, 130, 143, 50, 64, 208, 91, 84, 3, 232, 47, 255, 249, 16, 31, 255, 96, 0, 186, 207, 29, 226, 4, 213, 0, 67, 227, 95, 31, 98, 213, 95, 255, 64, 3, 79, 50, 170, 16, 48, - 3, 47, 115, 86, 129, 21, 84, 32, 16, 113, 50, 83, 191, 252, 223, 121, 223, 20, 42, 2, 95, 255, 48, 4, 250, 12, 255, 247, 43, 159, 31, 149, 159, 31, 228, 185, 239, 30, 71, 255, 253, 113, 49, 79, 44, 147, 255, 254, 252, 255, 208, 255, 176, 77, 96, 67, 231, 84, 34, 59, 5, 80, 3, 4, 31, 99, 3, 80, 3, 48, - 222, 170, 0, 16, 222, 85, 144, 222, 199, 16, 222, 144, 16, 222, 153, 243, 16, 222, 46, 194, 144, 66, 19, 231, 16, 222, 112, 99, 30, 70, 214, 157, 46, 75, 31, 154, 31, 192, 223, 114, 233, 191, 251, 6, 239, 240, 231, 82, 191, 16, 150, 0, 188, 225, 174, 39, 122, 187, 168, 79, 83, 247, 30, 226, 255, 20, 175, 253, 16, 0, - 30, 255, 248, 203, 32, 5, 31, 44, 32, 3, 105, 31, 52, 255, 255, 183, 209, 45, 79, 198, 110, 30, 175, 14, 255, 190, 97, 19, 67, 16, 92, 14, 245, 2, 17, 66, 56, 195, 54, 252, 12, 47, 41, 133, 63, 83, 16, 112, 3, 13, 255, 52, 0, 231, 10, 255, 173, 36, 124, 31, 209, 255, 7, 255, 232, 244, 91, 14, 31, 180, - 95, 30, 11, 33, 119, 47, 142, 75, 31, 106, 0, 38, 254, 31, 26, 128, 31, 30, 250, 23, 31, 41, 75, 31, 39, 25, 56, 191, 9, 255, 224, 3, 165, 14, 31, 211, 63, 31, 236, 31, 254, 30, 28, 3, 127, 106, 26, 136, 207, 249, 76, 46, 239, 31, 35, 191, 32, 23, 127, 62, 95, 220, 255, 240, 252, 0, 255, 241, 191, 244, - 16, 3, 240, 3, 255, 224, 249, 159, 215, 255, 192, 31, 110, 144, 32, 3, 121, 92, 255, 125, 14, 20, 10, 16, 119, 137, 206, 224, 47, 251, 95, 91, 25, 144, 12, 28, 136, 3, 255, 31, 133, 175, 161, 238, 0, 0, 19, 159, 220, 255, 243, 7, 23, 171, 175, 1, 64, 230, 96, 26, 116, 96, 9, 14, 255, 142, 216, 23, 55, 31, - 87, 40, 192, 215, 255, 248, 31, 222, 252, 192, 207, 255, 254, 16, 159, 22, 240, 34, 91, 56, 16, 210, 30, 247, 208, 0, 146, 47, 155, 50, 88, 35, 231, 213, 175, 252, 31, 172, 249, 29, 240, 243, 21, 10, 208, 254, 1, 223, 255, 80, 10, 255, 250, 12, 124, 242, 99, 15, 255, 15, 85, 64, 13, 165, 8, 34, 59, 24, 111, 226, - 5, 214, 190, 251, 9, 203, 36, 31, 27, 44, 5, 84, 12, 169, 8, 81, 43, 227, 28, 47, 159, 107, 11, 171, 3, 46, 187, 41, 100, 161, 34, 5, 161, 8, 46, 155, 85, 15, 255, 6, 16, 222, 18, 229, 1, 20, 199, 215, 0, 6, 15, 255, 4, 246, 31, 163, 192, 0, 191, 135, 250, 11, 12, 35, 16, 89, 31, 127, 27, 232, - 0, 0, 23, 149, 207, 15, 255, 3, 20, 191, 255, 20, 40, 251, 15, 104, 5, 68, 28, 6, 128, 15, 47, 219, 23, 239, 0, 3, 116, 15, 255, 2, 42, 128, 170, 193, 15, 195, 9, 159, 27, 65, 91, 36, 172, 18, 15, 135, 37, 60, 26, 231, 39, 4, 0, 0, 25, 206, 15, 255, 5, 40, 107, 251, 244, 255, 253, 185, 98, 15, - 233, 35, 60, 253, 171, 145, 15, 255, 11, 207, 24, 36, 103, 12, 168, 9, 93, 225, 57, 78, 79, 15, 255, 98, 5, 236, 134, 189, 25, 31, 117, 15, 213, 253, 96, 53, 135, 159, 31, 25, 239, 4, 126, 170, 23, 69, 44, 160, 249, 222, 212, 44, 253, 37, 203, 244, 26, 126, 254, 168, 16, 26, 134, 112, 4, 246, 137, 107, 41, 29, - 15, 160, 6, 44, 19, 178, 192, 223, 252, 54, 67, 30, 113, 31, 177, 159, 31, 120, 251, 191, 251, 4, 103, 207, 15, 159, 9, 97, 0, 58, 71, 95, 6, 96, 127, 4, 189, 224, 27, 30, 241, 25, 2, 170, 243, 27, 231, 243, 15, 225, 12, 75, 4, 244, 14, 11, 223, 89, 111, 24, 42, 11, 250, 73, 204, 175, 255, 168, 48, 199, - 3, 191, 239, 255, 47, 240, 38, 41, 255, 252, 64, 93, 30, 223, 252, 5, 84, 35, 6, 120, 80, 28, 105, 160, 74, 28, 213, 176, 12, 151, 7, 94, 195, 12, 15, 255, 2, 184, 24, 214, 11, 26, 187, 57, 3, 15, 255, 47, 36, 255, 12, 30, 213, 4, 138, 168, 239, 31, 255, 14, 31, 255, 47, 40, 116, 75, 107, 27, 208, 235, - 252, 116, 16, 123, 28, 204, 31, 253, 64, 2, 156, 104, 47, 180, 28, 120, 35, 254, 188, 37, 55, 78, 123, 42, 46, 131, 31, 165, 0, 102, 6, 82, 31, 249, 246, 3, 93, 0, 85, 43, 191, 63, 31, 255, 13, 95, 159, 8, 65, 82, 110, 219, 226, 128, 31, 44, 245, 0, 56, 209, 129, 255, 250, 0, 21, 174, 255, 172, 63, 138, - 252, 174, 37, 103, 41, 205, 37, 119, 49, 119, 47, 35, 80, 133, 58, 85, 3, 159, 11, 4, 48, 3, 175, 59, 155, 64, 27, 206, 144, 95, 26, 83, 232, 29, 134, 255, 3, 175, 255, 255, 187, 207, 95, 233, 0, 11, 212, 30, 114, 20, 139, 223, 2, 124, 90, 219, 255, 255, 234, 255, 251, 231, 98, 0, 165, 81, 235, 47, 226, 239, - 252, 96, 117, 87, 71, 253, 0, 136, 38, 42, 127, 73, 142, 0, 44, 62, 125, 95, 221, 38, 25, 247, 111, 244, 30, 166, 29, 75, 254, 15, 250, 2, 0, 12, 253, 143, 31, 174, 106, 17, 87, 101, 0, 26, 203, 16, 29, 243, 20, 30, 94, 222, 255, 2, 16, 123, 175, 255, 254, 115, 45, 207, 234, 249, 111, 247, 127, 4, 119, 26, - 164, 255, 29, 134, 168, 255, 28, 58, 25, 28, 95, 1, 29, 53, 32, 3, 75, 247, 149, 2, 44, 251, 44, 255, 207, 93, 3, 95, 81, 167, 14, 191, 240, 29, 112, 242, 0, 5, 207, 246, 4, 247, 207, 255, 250, 175, 63, 221, 168, 255, 255, 223, 195, 6, 30, 123, 8, 252, 32, 0, 9, 60, 46, 219, 30, 191, 205, 255, 249, 48, - 41, 11, 66, 55, 130, 240, 80, 3, 45, 27, 16, 178, 58, 182, 156, 194, 111, 31, 180, 165, 159, 31, 167, 207, 64, 222, 45, 111, 10, 81, 171, 7, 90, 82, 155, 4, 93, 95, 3, 86, 46, 239, 32, 94, 243, 251, 80, 2, 140, 255, 101, 49, 89, 254, 255, 250, 207, 252, 80, 255, 120, 8, 20, 0, 48, 221, 255, 11, 14, 191, - 16, 28, 109, 56, 101, 39, 163, 223, 25, 42, 223, 247, 122, 160, 3, 2, 142, 255, 112, 25, 191, 208, 31, 163, 253, 128, 255, 251, 80, 0, 200, 8, 230, 0, 15, 84, 82, 115, 111, 94, 63, 175, 31, 255, 223, 81, 79, 31, 81, 78, 29, 76, 64, 80, 195, 88, 111, 252, 138, 205, 127, 146, 118, 19, 0, 0, 2, 175, 27, 135, - 2, 96, 127, 234, 234, 253, 201, 80, 108, 119, 253, 15, 127, 14, 11, 19, 227, 138, 11, 28, 187, 28, 3, 48, 3, 8, 30, 136, 7, 64, 3, 170, 2, 29, 162, 175, 208, 159, 159, 128, 155, 4, 30, 68, 82, 30, 175, 160, 92, 231, 64, 66, 0, 32, 112, 250, 83, 91, 173, 243, 7, 226, 50, 189, 45, 95, 255, 255, 47, 1, - 2, 228, 202, 134, 239, 82, 99, 33, 35, 127, 36, 11, 97, 8, 244, 254, 202, 134, 66, 34, 173, 249, 89, 147, 17, 243, 241, 5, 255, 231, 88, 46, 182, 30, 43, 47, 146, 111, 191, 96, 30, 166, 245, 0, 143, 255, 246, 27, 91, 31, 32, 239, 30, 36, 255, 254, 43, 82, 24, 239, 101, 70, 117, 15, 248, 67, 146, 235, 127, 165, - 61, 207, 79, 85, 29, 58, 13, 31, 229, 7, 29, 227, 2, 37, 23, 207, 85, 18, 217, 127, 17, 250, 6, 29, 244, 11, 31, 79, 31, 85, 27, 37, 143, 19, 91, 239, 21, 250, 239, 30, 60, 7, 191, 32, 12, 251, 19, 223, 249, 63, 255, 87, 16, 146, 10, 95, 63, 51, 67, 175, 84, 223, 34, 23, 10, 39, 39, 164, 224, 81, - 75, 249, 68, 215, 66, 203, 144, 78, 99, 31, 70, 87, 30, 162, 208, 31, 202, 112, 31, 97, 16, 0, 175, 101, 31, 175, 2, 146, 165, 204, 20, 163, 3, 46, 137, 210, 78, 104, 65, 12, 84, 227, 35, 55, 0, 48, 95, 18, 190, 191, 127, 20, 23, 159, 242, 0, 80, 191, 241, 247, 0, 252, 223, 240, 31, 227, 224, 0, 191, 245, - 255, 254, 206, 4, 31, 236, 3, 30, 211, 6, 41, 19, 64, 32, 161, 14, 30, 62, 95, 30, 219, 16, 34, 0, 11, 31, 21, 79, 31, 70, 163, 12, 227, 7, 128, 54, 195, 80, 13, 247, 0, 7, 252, 62, 31, 144, 255, 0, 62, 84, 44, 107, 143, 30, 51, 1, 34, 231, 111, 38, 98, 22, 106, 174, 5, 31, 101, 11, 31, 47, - 63, 255, 128, 30, 57, 8, 100, 233, 22, 192, 51, 93, 38, 75, 176, 76, 139, 47, 147, 36, 149, 158, 208, 133, 203, 51, 231, 1, 103, 100, 19, 31, 255, 191, 254, 63, 255, 176, 3, 109, 207, 208, 0, 233, 11, 111, 250, 49, 22, 0, 112, 3, 19, 216, 255, 183, 250, 39, 23, 253, 113, 20, 228, 255, 251, 1, 164, 126, 8, 159, - 7, 145, 81, 119, 27, 247, 119, 44, 100, 31, 239, 170, 255, 31, 32, 233, 31, 255, 80, 31, 76, 144, 31, 251, 127, 22, 225, 239, 253, 100, 0, 223, 246, 255, 237, 253, 255, 245, 31, 231, 251, 190, 40, 175, 40, 119, 31, 231, 6, 255, 238, 22, 42, 176, 32, 63, 154, 255, 115, 148, 47, 233, 254, 129, 45, 207, 162, 45, 211, 212, - 179, 92, 37, 172, 58, 36, 59, 0, 9, 35, 7, 51, 203, 239, 167, 83, 17, 15, 227, 8, 22, 191, 19, 89, 86, 45, 187, 46, 31, 131, 12, 31, 135, 47, 255, 45, 208, 248, 0, 110, 255, 251, 109, 17, 5, 37, 195, 98, 63, 99, 21, 135, 0, 176, 4, 219, 1, 35, 87, 65, 231, 255, 249, 252, 2, 255, 252, 48, 1, 254, - 21, 215, 157, 236, 161, 112, 22, 243, 208, 16, 248, 46, 72, 19, 5, 81, 187, 191, 56, 43, 93, 20, 120, 255, 248, 240, 89, 199, 231, 95, 15, 248, 57, 30, 2, 95, 11, 39, 247, 39, 23, 8, 223, 252, 131, 15, 95, 3, 91, 20, 159, 196, 15, 255, 42, 31, 251, 65, 90, 7, 234, 75, 12, 228, 70, 4, 6, 93, 11, 26, - 65, 239, 28, 6, 159, 216, 239, 0, 0, 34, 13, 101, 65, 3, 255, 204, 239, 154, 4, 28, 70, 36, 198, 0, 1, 15, 131, 0, 178, 13, 217, 48, 61, 102, 211, 15, 159, 3, 254, 4, 103, 64, 38, 164, 251, 123, 15, 34, 37, 12, 255, 217, 239, 19, 158, 255, 0, 230, 7, 223, 232, 15, 255, 2, 23, 156, 92, 176, 15, 227, - 9, 149, 96, 15, 150, 15, 43, 107, 7, 44, 199, 94, 15, 255, 2, 251, 78, 31, 158, 255, 25, 24, 23, 110, 0, 87, 97, 15, 227, 2, 214, 42, 208, 10, 255, 47, 2, 45, 7, 175, 233, 1, 33, 2, 240, 255, 253, 64, 0, 30, 242, 122, 11, 15, 99, 64, 24, 223, 235, 6, 239, 242, 28, 123, 80, 14, 86, 116, 83, 33, - 47, 40, 118, 53, 143, 13, 14, 31, 4, 255, 220, 186, 16, 82, 75, 15, 128, 1, 14, 65, 240, 176, 3, 15, 255, 13, 39, 15, 29, 7, 92, 29, 249, 207, 8, 34, 2, 3, 100, 49, 59, 151, 44, 243, 187, 14, 0, 223, 6, 169, 32, 255, 28, 137, 255, 255, 8, 239, 65, 9, 82, 20, 208, 3, 202, 205, 240, 192, 3, 4, - 94, 46, 13, 213, 6, 125, 31, 254, 79, 85, 120, 155, 239, 175, 255, 43, 79, 30, 55, 207, 31, 251, 41, 111, 255, 194, 53, 84, 74, 31, 254, 250, 15, 225, 33, 45, 187, 79, 90, 171, 239, 239, 255, 14, 38, 36, 56, 7, 84, 115, 15, 255, 39, 9, 187, 188, 29, 51, 103, 8, 63, 7, 221, 221, 93, 191, 2, 194, 2, 17, - 35, 51, 36, 106, 182, 15, 255, 2, 48, 94, 179, 0, 2, 141, 2, 91, 131, 207, 255, 150, 33, 31, 56, 31, 36, 207, 30, 210, 255, 255, 0, 197, 50, 216, 17, 26, 79, 147, 2, 239, 75, 129, 24, 123, 37, 19, 178, 95, 42, 155, 219, 153, 46, 27, 35, 6, 254, 29, 87, 185, 226, 31, 247, 167, 119, 83, 47, 123, 21, 150, - 255, 244, 255, 119, 120, 174, 9, 223, 3, 64, 92, 39, 64, 158, 166, 4, 23, 89, 9, 42, 221, 31, 56, 6, 191, 239, 175, 167, 53, 30, 140, 255, 64, 3, 25, 34, 240, 47, 91, 234, 255, 240, 11, 20, 3, 3, 36, 7, 46, 46, 168, 215, 1, 125, 63, 175, 191, 63, 175, 236, 255, 255, 213, 230, 10, 31, 57, 14, 30, 114, - 63, 47, 136, 252, 169, 253, 90, 175, 242, 90, 179, 128, 90, 11, 148, 208, 57, 69, 31, 202, 46, 77, 243, 44, 7, 28, 139, 3, 29, 212, 30, 219, 255, 225, 27, 132, 117, 255, 16, 216, 255, 226, 46, 74, 187, 47, 141, 160, 158, 177, 119, 118, 66, 7, 224, 17, 203, 216, 53, 54, 67, 37, 43, 6, 41, 183, 0, 91, 88, 148, - 3, 29, 131, 239, 2, 125, 16, 222, 16, 234, 20, 120, 239, 240, 5, 233, 163, 255, 21, 156, 255, 234, 106, 125, 103, 166, 71, 47, 74, 223, 67, 91, 1, 47, 247, 173, 11, 30, 210, 10, 26, 3, 9, 244, 91, 155, 247, 74, 93, 255, 244, 89, 159, 63, 245, 222, 30, 139, 12, 31, 225, 255, 143, 255, 112, 3, 255, 254, 119, 13, - 29, 62, 187, 63, 252, 33, 171, 219, 84, 49, 127, 138, 110, 252, 116, 0, 61, 255, 255, 235, 62, 226, 190, 191, 214, 126, 32, 73, 207, 255, 22, 141, 252, 64, 111, 167, 180, 3, 31, 119, 8, 255, 77, 157, 47, 65, 63, 36, 69, 234, 1, 255, 248, 29, 239, 243, 46, 135, 241, 90, 163, 189, 112, 108, 51, 20, 122, 224, 126, 17, - 212, 127, 157, 255, 4, 225, 17, 35, 227, 7, 151, 119, 10, 127, 10, 117, 237, 85, 84, 51, 72, 140, 217, 80, 28, 31, 144, 93, 30, 149, 96, 28, 217, 32, 0, 159, 40, 27, 255, 239, 246, 50, 46, 31, 96, 175, 255, 32, 4, 84, 27, 143, 13, 29, 180, 10, 44, 136, 74, 8, 17, 40, 29, 198, 173, 223, 61, 67, 61, 86, - 255, 3, 177, 30, 123, 250, 93, 17, 53, 252, 31, 247, 96, 0, 255, 25, 180, 230, 87, 31, 248, 114, 15, 127, 36, 44, 49, 79, 3, 223, 255, 39, 31, 43, 31, 231, 44, 25, 91, 31, 123, 207, 255, 253, 86, 17, 47, 144, 24, 235, 48, 29, 149, 240, 253, 19, 24, 181, 128, 23, 12, 255, 228, 79, 115, 64, 11, 28, 69, 3, - 121, 127, 70, 71, 116, 0, 45, 30, 63, 30, 29, 5, 241, 255, 249, 140, 7, 22, 251, 46, 251, 31, 242, 78, 47, 110, 203, 51, 211, 227, 25, 49, 225, 0, 95, 61, 250, 48, 25, 255, 1, 74, 30, 192, 242, 70, 79, 146, 223, 31, 154, 62, 75, 240, 79, 59, 42, 115, 226, 132, 199, 150, 29, 30, 194, 19, 127, 29, 94, 155, - 11, 253, 94, 2, 218, 0, 239, 131, 255, 0, 254, 23, 251, 198, 23, 255, 171, 21, 183, 255, 175, 31, 150, 207, 31, 248, 223, 248, 77, 70, 189, 127, 93, 139, 32, 79, 0, 10, 213, 47, 4, 130, 193, 47, 195, 46, 147, 31, 200, 26, 54, 41, 222, 255, 20, 202, 253, 255, 239, 253, 186, 151, 65, 12, 223, 4, 233, 117, 52, 203, - 121, 190, 255, 86, 211, 143, 58, 143, 3, 234, 207, 255, 4, 31, 164, 16, 74, 227, 0, 31, 162, 65, 126, 227, 254, 83, 123, 68, 103, 32, 215, 85, 55, 38, 175, 175, 255, 255, 215, 0, 29, 254, 37, 0, 1, 208, 194, 5, 88, 206, 0, 0, 3, 10, 28, 158, 83, 95, 46, 95, 213, 15, 255, 75, 15, 175, 32, 189, 250, 30, - 231, 245, 86, 26, 24, 5, 31, 39, 30, 31, 198, 207, 128, 31, 20, 141, 48, 31, 44, 39, 29, 138, 159, 132, 54, 30, 64, 45, 250, 255, 48, 3, 239, 248, 20, 212, 192, 30, 59, 212, 32, 3, 30, 152, 5, 20, 227, 1, 63, 230, 30, 167, 106, 31, 63, 217, 255, 19, 176, 143, 31, 162, 9, 44, 10, 180, 128, 47, 219, 254, - 185, 131, 119, 48, 94, 191, 229, 199, 83, 23, 131, 224, 51, 115, 95, 22, 112, 32, 150, 239, 250, 85, 16, 177, 245, 25, 66, 240, 31, 174, 176, 30, 177, 255, 234, 240, 22, 68, 31, 171, 3, 31, 175, 2, 50, 13, 88, 20, 166, 239, 21, 146, 207, 254, 68, 43, 126, 102, 29, 223, 215, 191, 209, 31, 231, 249, 19, 171, 209, 109, - 255, 170, 253, 26, 67, 209, 14, 205, 16, 207, 38, 128, 248, 29, 71, 170, 244, 28, 37, 241, 31, 246, 224, 31, 45, 160, 31, 45, 170, 112, 31, 45, 64, 9, 39, 26, 95, 31, 255, 14, 238, 15, 255, 8, 255, 254, 159, 223, 255, 161, 63, 255, 255, 229, 0, 63, 250, 16, 0, 63, 145, 80, 55, 11, 128, 3, 247, 149, 115, 0, - 11, 2, 8, 198, 15, 255, 238, 255, 212, 2, 22, 177, 0, 109, 64, 10, 240, 20, 62, 11, 0, 29, 15, 255, 47, 239, 255, 237, 0, 78, 29, 223, 237, 1, 140, 239, 0, 30, 4, 255, 250, 23, 238, 64, 214, 252, 166, 15, 158, 4, 16, 11, 239, 53, 1, 85, 12, 254, 36, 200, 77, 208, 102, 116, 15, 255, 7, 7, 91, 15, - 15, 255, 3, 20, 238, 185, 194, 24, 84, 0, 127, 231, 11, 76, 8, 11, 239, 21, 1, 20, 13, 43, 3, 91, 239, 0, 222, 7, 10, 44, 228, 56, 10, 142, 41, 47, 63, 206, 2, 158, 7, 63, 10, 43, 41, 54, 155, 221, 13, 203, 3, 151, 112, 144, 3, 15, 255, 2, 63, 55, 106, 16, 0, 1, 169, 104, 15, 228, 6, 31, - 111, 191, 55, 14, 43, 3, 28, 97, 254, 139, 96, 104, 75, 15, 169, 32, 38, 45, 175, 28, 179, 1, 85, 36, 15, 29, 71, 99, 239, 41, 15, 226, 2, 105, 111, 148, 15, 255, 72, 78, 240, 228, 2, 119, 112, 12, 146, 144, 77, 122, 0, 77, 222, 96, 3, 26, 1, 47, 3, 5, 31, 22, 15, 159, 0, 199, 48, 28, 127, 240, - 28, 138, 150, 176, 57, 231, 13, 83, 64, 255, 76, 11, 0, 175, 30, 41, 138, 159, 175, 255, 43, 237, 24, 100, 0, 47, 20, 252, 40, 71, 231, 103, 137, 171, 15, 255, 10, 9, 147, 34, 28, 239, 64, 95, 26, 194, 96, 29, 13, 128, 0, 28, 255, 180, 125, 75, 98, 4, 255, 144, 159, 244, 48, 3, 176, 175, 191, 16, 3, 207, - 48, 3, 204, 176, 204, 194, 101, 15, 64, 34, 92, 96, 29, 202, 44, 11, 244, 27, 31, 134, 122, 15, 223, 10, 185, 152, 119, 101, 15, 255, 10, 84, 5, 220, 9, 249, 169, 153, 153, 151, 223, 15, 127, 5, 61, 59, 119, 236, 101, 85, 255, 0, 31, 9, 85, 48, 140, 255, 15, 255, 3, 231, 4, 119, 119, 39, 60, 15, 255, 6, - 117, 85, 85, 5, 144, 95, 25, 67, 17, 64, 48, 3, 17, 64, 0, 17, 64, 80, 84, 17, 64, 240, 81, 64, 144, 95, 239, 176, 208, 3, 7, 142, 3, 213, 137, 144, 30, 173, 224, 27, 146, 240, 28, 222, 241, 66, 7, 176, 2, 201, 78, 207, 105, 175, 207, 255, 45, 51, 224, 89, 75, 140, 112, 11, 255, 7, 34, 123, 45, 87, - 0, 126, 239, 255, 41, 135, 182, 251, 45, 135, 250, 32, 31, 223, 249, 16, 7, 255, 79, 233, 5, 87, 119, 25, 76, 255, 29, 87, 16, 3, 254, 189, 221, 238, 221, 119, 137, 153, 239, 110, 155, 221, 223, 203, 187, 47, 239, 191, 3, 16, 0, 191, 255, 62, 209, 0, 191, 239, 253, 16, 191, 235, 253, 187, 211, 31, 191, 243, 48, 3, - 253, 153, 146, 146, 63, 247, 35, 63, 251, 80, 3, 79, 239, 191, 75, 31, 94, 48, 7, 85, 197, 201, 127, 255, 49, 255, 144, 0, 250, 92, 255, 210, 17, 15, 19, 27, 95, 31, 5, 188, 159, 27, 195, 51, 51, 69, 82, 58, 191, 64, 3, 234, 243, 17, 19, 30, 227, 4, 30, 161, 5, 26, 115, 7, 1, 160, 4, 196, 172, 43, - 251, 31, 92, 34, 171, 119, 101, 67, 139, 46, 46, 69, 92, 55, 40, 23, 5, 127, 63, 237, 203, 139, 185, 59, 223, 28, 187, 30, 77, 0, 30, 70, 1, 255, 243, 245, 122, 239, 96, 94, 215, 232, 157, 72, 178, 99, 76, 239, 0, 45, 29, 199, 33, 63, 33, 67, 8, 118, 152, 83, 7, 127, 6, 31, 217, 220, 51, 43, 26, 61, - 44, 28, 202, 185, 175, 23, 24, 143, 253, 88, 42, 141, 45, 55, 187, 190, 147, 223, 41, 37, 139, 16, 190, 255, 250, 224, 182, 9, 74, 199, 1, 239, 66, 131, 0, 127, 27, 230, 255, 11, 30, 255, 225, 14, 207, 255, 80, 133, 9, 42, 102, 28, 11, 60, 171, 47, 151, 160, 151, 255, 171, 211, 188, 222, 93, 55, 79, 76, 171, 42, - 148, 9, 255, 149, 242, 28, 80, 52, 235, 245, 82, 183, 112, 9, 31, 0, 255, 246, 187, 187, 189, 221, 15, 159, 10, 221, 222, 63, 39, 85, 44, 147, 11, 80, 3, 13, 80, 3, 15, 62, 15, 208, 5, 80, 151, 33, 87, 28, 200, 27, 190, 65, 103, 144, 95, 255, 8, 222, 187, 187, 15, 255, 10, 205, 221, 221, 223, 8, 223, 7, - 234, 0, 15, 48, 30, 133, 48, 56, 164, 127, 48, 3, 24, 29, 197, 32, 3, 30, 0, 191, 253, 192, 42, 134, 183, 116, 247, 123, 34, 74, 2, 255, 245, 35, 162, 131, 85, 207, 245, 251, 17, 0, 175, 22, 1, 143, 45, 233, 63, 247, 255, 51, 85, 159, 162, 162, 254, 16, 5, 59, 30, 245, 36, 36, 13, 255, 160, 47, 151, 136, - 153, 38, 46, 71, 64, 3, 221, 0, 201, 2, 47, 99, 253, 96, 29, 206, 234, 255, 147, 12, 37, 51, 108, 47, 247, 57, 43, 111, 235, 6, 126, 255, 31, 104, 143, 29, 91, 1, 140, 85, 63, 225, 198, 47, 99, 64, 79, 63, 199, 15, 243, 10, 4, 249, 160, 0, 4, 207, 246, 12, 30, 50, 19, 19, 2, 90, 27, 251, 46, 18, - 19, 239, 255, 16, 6, 251, 16, 6, 218, 176, 11, 46, 62, 223, 209, 46, 133, 191, 29, 230, 178, 159, 30, 52, 159, 176, 79, 31, 96, 3, 127, 35, 189, 170, 251, 87, 43, 253, 144, 3, 254, 8, 28, 0, 3, 91, 131, 79, 34, 23, 47, 80, 59, 30, 199, 1, 255, 239, 249, 32, 78, 49, 63, 39, 176, 79, 95, 26, 110, 55, - 127, 61, 95, 37, 136, 42, 37, 140, 37, 148, 9, 30, 233, 11, 48, 3, 176, 31, 46, 131, 176, 33, 127, 171, 73, 91, 235, 189, 223, 31, 159, 73, 37, 191, 139, 116, 194, 254, 255, 234, 116, 16, 65, 110, 3, 159, 3, 234, 116, 30, 218, 0, 159, 253, 78, 181, 167, 79, 31, 240, 47, 30, 242, 31, 52, 0, 254, 182, 115, 12, - 231, 13, 2, 104, 207, 45, 40, 31, 251, 255, 0, 250, 127, 253, 166, 0, 19, 147, 198, 191, 116, 221, 186, 253, 20, 132, 112, 48, 12, 31, 75, 10, 31, 166, 139, 8, 31, 87, 22, 96, 31, 161, 112, 16, 123, 80, 167, 149, 65, 14, 187, 11, 14, 6, 38, 1, 31, 187, 160, 31, 134, 48, 234, 0, 239, 252, 30, 106, 245, 24, - 22, 224, 27, 211, 151, 112, 31, 130, 31, 169, 249, 14, 93, 36, 88, 154, 188, 169, 222, 32, 214, 159, 71, 255, 15, 44, 4, 80, 3, 63, 255, 0, 18, 49, 63, 255, 255, 247, 95, 105, 64, 3, 249, 111, 53, 83, 112, 81, 215, 33, 219, 48, 69, 80, 3, 32, 65, 231, 15, 173, 4, 25, 119, 7, 30, 147, 6, 114, 8, 95, - 2, 1, 35, 205, 118, 145, 30, 183, 191, 25, 169, 181, 223, 22, 109, 223, 250, 48, 208, 32, 17, 176, 161, 244, 255, 247, 0, 177, 21, 103, 211, 53, 160, 15, 164, 13, 86, 36, 47, 95, 21, 49, 63, 21, 107, 5, 50, 15, 209, 0, 161, 15, 22, 21, 79, 22, 140, 44, 136, 32, 107, 18, 16, 3, 34, 21, 248, 40, 27, 10, - 37, 108, 10, 225, 33, 30, 105, 191, 16, 2, 25, 24, 171, 57, 63, 22, 1, 4, 207, 32, 15, 16, 18, 255, 83, 18, 46, 248, 16, 2, 16, 39, 250, 39, 253, 207, 255, 172, 254, 29, 195, 231, 50, 135, 248, 16, 15, 111, 48, 255, 255, 169, 26, 15, 193, 15, 127, 83, 235, 91, 5, 127, 4, 76, 12, 169, 89, 15, 255, 7, - 6, 30, 159, 6, 223, 91, 123, 255, 255, 242, 86, 31, 245, 208, 11, 75, 10, 14, 23, 145, 15, 255, 15, 31, 41, 62, 15, 212, 12, 75, 139, 144, 0, 7, 134, 32, 14, 96, 68, 173, 3, 25, 28, 1, 39, 244, 167, 81, 14, 193, 69, 8, 45, 87, 119, 15, 255, 4, 242, 71, 111, 22, 48, 15, 128, 36, 141, 238, 187, 153, - 119, 15, 186, 10, 85, 51, 16, 38, 7, 171, 143, 31, 255, 53, 2, 31, 10, 103, 11, 231, 7, 220, 186, 122, 15, 255, 10, 152, 118, 84, 50, 15, 249, 10, 19, 25, 132, 181, 5, 33, 98, 86, 113, 15, 161, 67, 14, 24, 172, 11, 87, 42, 5, 2, 11, 138, 37, 143, 25, 149, 30, 250, 16, 212, 0, 5, 2, 95, 4, 16, - 15, 244, 128, 12, 87, 219, 26, 99, 199, 1, 175, 14, 243, 2, 60, 159, 31, 40, 255, 255, 230, 94, 15, 225, 13, 79, 6, 97, 35, 71, 101, 51, 16, 23, 74, 61, 37, 11, 14, 95, 7, 253, 219, 169, 135, 30, 126, 244, 103, 12, 247, 40, 254, 220, 54, 99, 15, 27, 6, 135, 101, 51, 52, 14, 191, 10, 47, 26, 255, 225, - 7, 174, 3, 222, 77, 219, 45, 223, 170, 1, 255, 31, 241, 144, 3, 243, 13, 220, 65, 62, 27, 6, 161, 63, 48, 3, 32, 29, 214, 227, 244, 46, 183, 46, 187, 11, 69, 94, 191, 12, 127, 191, 33, 169, 48, 3, 251, 128, 3, 76, 138, 203, 8, 237, 4, 91, 223, 26, 11, 5, 191, 255, 66, 44, 239, 190, 163, 89, 207, 129, - 50, 17, 252, 8, 15, 255, 8, 114, 61, 27, 253, 221, 128, 14, 223, 9, 45, 163, 14, 3, 244, 4, 229, 104, 173, 206, 103, 255, 233, 138, 69, 31, 59, 254, 92, 91, 143, 236, 3, 93, 129, 0, 0, 17, 47, 67, 80, 3, 141, 207, 2, 87, 3, 159, 16, 15, 255, 2, 254, 160, 93, 71, 176, 45, 8, 12, 51, 71, 151, 150, - 43, 141, 249, 48, 17, 178, 252, 182, 6, 31, 44, 0, 3, 42, 33, 0, 109, 26, 190, 237, 208, 4, 223, 29, 177, 5, 239, 30, 85, 5, 167, 0, 47, 15, 254, 89, 199, 46, 55, 9, 255, 79, 181, 249, 16, 3, 251, 11, 16, 3, 12, 48, 3, 76, 229, 203, 12, 204, 44, 240, 30, 88, 43, 9, 127, 16, 173, 98, 58, 67, - 18, 52, 58, 171, 78, 63, 17, 27, 10, 30, 219, 94, 25, 112, 6, 27, 175, 255, 255, 96, 127, 27, 132, 180, 223, 31, 152, 255, 251, 79, 155, 253, 28, 31, 35, 122, 215, 32, 64, 12, 254, 17, 9, 31, 155, 2, 86, 121, 39, 2, 99, 6, 63, 27, 221, 32, 239, 31, 195, 46, 255, 246, 249, 1, 239, 255, 128, 29, 92, 244, - 29, 2, 0, 139, 254, 56, 22, 48, 227, 0, 231, 5, 1, 99, 231, 255, 0, 205, 123, 239, 92, 3, 31, 15, 74, 116, 45, 223, 223, 125, 35, 227, 243, 2, 88, 174, 253, 140, 6, 167, 215, 251, 98, 63, 111, 7, 31, 246, 14, 3, 105, 170, 204, 31, 163, 245, 31, 167, 224, 31, 171, 112, 31, 153, 214, 16, 0, 61, 19, 242, - 1, 223, 2, 7, 206, 65, 27, 163, 7, 36, 95, 167, 47, 170, 35, 227, 19, 231, 37, 31, 58, 28, 92, 142, 195, 165, 32, 78, 29, 72, 13, 45, 76, 253, 0, 12, 204, 139, 239, 240, 108, 231, 252, 215, 202, 121, 60, 4, 208, 28, 224, 96, 0, 207, 165, 254, 62, 154, 160, 65, 173, 15, 226, 5, 30, 31, 219, 207, 171, 255, - 29, 135, 250, 31, 10, 224, 17, 136, 64, 10, 255, 255, 248, 1, 111, 255, 192, 10, 78, 246, 254, 32, 7, 242, 31, 191, 96, 14, 31, 255, 233, 1, 19, 51, 47, 195, 83, 38, 56, 47, 219, 254, 253, 80, 1, 255, 255, 251, 39, 31, 191, 80, 107, 28, 250, 0, 89, 27, 143, 11, 31, 50, 47, 255, 172, 128, 31, 158, 16, 46, - 87, 0, 255, 69, 0, 38, 111, 179, 5, 198, 129, 222, 255, 31, 91, 48, 3, 255, 255, 241, 202, 133, 100, 16, 56, 62, 35, 43, 16, 103, 20, 7, 175, 170, 52, 225, 45, 207, 46, 135, 29, 170, 0, 247, 52, 213, 85, 85, 3, 63, 9, 76, 30, 94, 127, 27, 181, 14, 159, 224, 30, 89, 139, 189, 3, 96, 32, 0, 143, 255, - 242, 224, 0, 95, 245, 247, 0, 47, 255, 248, 254, 0, 15, 250, 255, 112, 13, 246, 253, 239, 224, 10, 222, 194, 31, 213, 31, 6, 45, 31, 116, 31, 251, 7, 16, 200, 14, 255, 11, 142, 18, 52, 117, 191, 182, 121, 154, 187, 18, 146, 255, 28, 222, 255, 249, 6, 203, 186, 153, 85, 16, 0, 158, 171, 18, 191, 221, 156, 219, 119, - 102, 255, 248, 87, 80, 122, 143, 255, 51, 85, 103, 116, 30, 200, 247, 30, 204, 181, 249, 30, 78, 216, 17, 8, 59, 72, 42, 16, 2, 255, 106, 16, 2, 255, 51, 208, 15, 42, 79, 73, 162, 16, 2, 151, 0, 16, 2, 16, 37, 253, 47, 67, 64, 255, 255, 218, 145, 0, 16, 2, 0, 162, 4, 107, 16, 29, 35, 23, 109, 70, - 131, 159, 255, 29, 123, 243, 4, 18, 35, 62, 20, 29, 175, 19, 122, 66, 23, 176, 79, 255, 209, 44, 61, 31, 147, 160, 111, 31, 230, 79, 19, 147, 16, 39, 112, 8, 47, 161, 31, 234, 3, 8, 31, 3, 34, 207, 31, 202, 62, 119, 70, 167, 35, 47, 111, 255, 122, 48, 55, 63, 255, 246, 2, 19, 227, 30, 30, 252, 191, 223, - 35, 227, 209, 8, 48, 254, 32, 143, 208, 227, 227, 20, 107, 64, 29, 144, 71, 27, 53, 159, 187, 83, 82, 43, 62, 228, 44, 239, 64, 86, 223, 30, 46, 191, 72, 126, 169, 191, 149, 207, 159, 80, 3, 143, 109, 55, 27, 248, 79, 149, 247, 28, 251, 16, 3, 0, 32, 3, 249, 80, 3, 250, 203, 51, 51, 66, 167, 28, 248, 157, - 11, 87, 2, 119, 119, 146, 147, 31, 98, 14, 192, 15, 11, 31, 203, 96, 3, 9, 48, 3, 238, 144, 0, 8, 44, 207, 255, 163, 51, 34, 99, 175, 1, 46, 56, 23, 8, 168, 0, 53, 85, 87, 119, 109, 8, 223, 10, 121, 112, 70, 99, 1, 182, 15, 66, 12, 27, 177, 255, 30, 160, 94, 255, 65, 203, 61, 235, 40, 91, 47, - 100, 80, 15, 255, 250, 37, 175, 47, 251, 253, 31, 234, 29, 4, 183, 0, 19, 119, 0, 128, 170, 247, 6, 118, 85, 105, 12, 95, 11, 67, 79, 81, 235, 127, 95, 128, 21, 29, 2, 95, 31, 220, 5, 28, 217, 8, 255, 240, 113, 16, 62, 4, 187, 10, 15, 254, 17, 247, 7, 201, 14, 213, 14, 156, 3, 118, 38, 143, 8, 0, - 95, 26, 194, 223, 242, 18, 123, 188, 176, 25, 53, 64, 0, 47, 253, 116, 1, 98, 95, 93, 15, 145, 44, 4, 26, 195, 7, 255, 240, 25, 146, 208, 85, 62, 235, 47, 30, 144, 111, 25, 188, 175, 24, 196, 223, 159, 251, 12, 29, 80, 38, 175, 47, 255, 178, 0, 9, 171, 179, 15, 255, 3, 162, 15, 120, 47, 45, 25, 141, 1, - 179, 34, 15, 222, 6, 15, 117, 17, 79, 46, 37, 15, 255, 6, 26, 174, 5, 9, 6, 10, 85, 39, 195, 111, 20, 72, 4, 15, 222, 37, 11, 40, 116, 175, 84, 25, 108, 6, 15, 255, 7, 111, 31, 255, 95, 88, 191, 15, 127, 0, 79, 90, 167, 17, 14, 62, 5, 44, 195, 255, 237, 221, 211, 84, 15, 255, 38, 6, 29, 39, - 5, 45, 39, 17, 0, 97, 4, 75, 38, 194, 254, 221, 11, 131, 7, 23, 171, 11, 133, 11, 15, 85, 14, 7, 31, 124, 217, 7, 239, 25, 149, 4, 48, 14, 141, 68, 25, 241, 11, 114, 24, 52, 0, 2, 32, 15, 42, 69, 44, 99, 62, 12, 163, 7, 174, 16, 69, 179, 98, 15, 167, 69, 1, 255, 247, 22, 215, 96, 30, 9, - 3, 112, 12, 159, 121, 106, 211, 14, 191, 0, 12, 159, 19, 39, 156, 29, 28, 24, 32, 3, 15, 255, 0, 223, 247, 249, 80, 3, 251, 37, 16, 11, 15, 2, 65, 13, 208, 3, 206, 115, 112, 112, 3, 159, 58, 32, 3, 5, 146, 4, 144, 0, 244, 48, 3, 176, 14, 63, 66, 150, 218, 31, 66, 87, 43, 9, 255, 31, 97, 0, - 60, 27, 199, 0, 242, 87, 43, 14, 192, 40, 29, 164, 3, 255, 161, 63, 8, 50, 2, 78, 127, 8, 252, 0, 3, 131, 246, 111, 175, 225, 34, 0, 75, 147, 251, 204, 48, 0, 215, 102, 108, 30, 96, 15, 14, 96, 8, 143, 253, 219, 215, 186, 159, 15, 127, 0, 9, 80, 3, 11, 152, 119, 215, 85, 12, 31, 162, 12, 133, 197, - 249, 0, 255, 91, 48, 3, 251, 128, 3, 76, 203, 1, 197, 9, 253, 220, 56, 60, 3, 15, 193, 5, 187, 169, 151, 152, 191, 36, 27, 25, 187, 255, 11, 255, 188, 0, 63, 198, 102, 0, 255, 63, 96, 0, 85, 63, 198, 0, 255, 148, 123, 143, 63, 44, 223, 195, 31, 255, 203, 92, 43, 44, 47, 173, 179, 14, 60, 16, 176, 3, - 148, 95, 95, 255, 192, 3, 0, 47, 14, 127, 14, 15, 255, 47, 53, 175, 164, 5, 137, 155, 187, 93, 29, 210, 255, 47, 24, 8, 203, 185, 12, 159, 12, 103, 227, 255, 246, 87, 31, 248, 30, 79, 32, 3, 76, 51, 45, 31, 248, 24, 201, 247, 76, 163, 253, 215, 44, 159, 251, 67, 83, 231, 203, 51, 235, 0, 3, 2, 156, 253, - 30, 132, 9, 252, 254, 80, 0, 15, 255, 254, 113, 79, 42, 187, 168, 142, 10, 159, 8, 146, 47, 112, 178, 3, 239, 3, 179, 255, 63, 82, 159, 112, 30, 192, 48, 3, 16, 204, 255, 112, 158, 45, 28, 23, 31, 245, 118, 31, 249, 112, 75, 23, 124, 176, 125, 51, 231, 244, 204, 176, 0, 194, 95, 110, 163, 87, 47, 204, 197, 43, - 227, 231, 13, 97, 28, 189, 223, 255, 53, 31, 31, 64, 3, 103, 117, 93, 215, 12, 31, 175, 15, 246, 255, 1, 17, 95, 190, 183, 83, 53, 21, 248, 93, 26, 195, 176, 91, 15, 149, 86, 119, 43, 143, 253, 106, 64, 3, 237, 219, 13, 218, 23, 10, 26, 59, 15, 27, 244, 163, 111, 31, 10, 223, 19, 210, 31, 103, 160, 18, 0, - 8, 172, 243, 19, 231, 247, 28, 207, 223, 59, 30, 250, 31, 113, 173, 31, 92, 227, 5, 47, 27, 239, 96, 19, 227, 255, 252, 251, 48, 0, 255, 198, 48, 60, 227, 45, 59, 142, 240, 91, 171, 45, 131, 35, 227, 89, 155, 187, 8, 63, 8, 25, 19, 227, 16, 242, 16, 50, 1, 239, 64, 83, 32, 239, 63, 106, 31, 119, 175, 255, - 27, 167, 249, 50, 162, 64, 203, 255, 157, 112, 171, 255, 47, 231, 7, 120, 153, 0, 95, 9, 255, 242, 171, 187, 221, 223, 222, 67, 36, 103, 31, 45, 103, 255, 255, 179, 191, 252, 255, 254, 51, 0, 230, 63, 239, 240, 59, 50, 44, 238, 255, 241, 31, 161, 51, 30, 4, 27, 69, 0, 99, 3, 220, 9, 73, 187, 111, 252, 95, 62, - 79, 62, 29, 43, 239, 255, 239, 13, 255, 253, 245, 46, 191, 255, 144, 2, 42, 55, 255, 149, 225, 76, 167, 46, 135, 253, 31, 233, 255, 30, 144, 255, 220, 254, 32, 30, 167, 226, 0, 46, 16, 8, 30, 71, 185, 227, 15, 255, 15, 71, 119, 153, 33, 68, 48, 3, 141, 215, 221, 187, 88, 212, 146, 65, 35, 191, 255, 153, 239, 191, - 255, 221, 111, 241, 186, 191, 255, 119, 122, 99, 255, 80, 95, 255, 3, 36, 11, 208, 31, 9, 190, 255, 63, 99, 253, 0, 85, 84, 51, 61, 56, 154, 43, 31, 31, 46, 25, 223, 253, 8, 50, 81, 6, 29, 103, 170, 10, 28, 237, 13, 31, 132, 31, 31, 81, 95, 18, 103, 176, 143, 31, 186, 207, 252, 65, 108, 13, 123, 15, 3, - 247, 6, 100, 15, 171, 92, 47, 195, 58, 11, 191, 7, 242, 78, 135, 24, 48, 39, 7, 239, 23, 227, 255, 41, 151, 243, 0, 7, 0, 255, 255, 16, 234, 24, 239, 250, 30, 186, 196, 13, 107, 68, 9, 30, 41, 169, 12, 31, 73, 15, 31, 168, 79, 31, 237, 190, 198, 245, 73, 14, 185, 22, 3, 35, 233, 31, 255, 15, 92, 111, - 19, 15, 4, 40, 56, 63, 19, 242, 0, 31, 13, 0, 35, 129, 43, 203, 35, 242, 74, 111, 107, 240, 79, 245, 40, 227, 63, 89, 23, 7, 236, 167, 37, 35, 35, 48, 55, 224, 66, 83, 44, 238, 191, 26, 244, 95, 117, 27, 114, 14, 253, 96, 0, 223, 18, 242, 20, 82, 160, 122, 19, 137, 48, 0, 239, 252, 28, 143, 245, 30, - 198, 189, 208, 22, 198, 96, 0, 207, 254, 14, 190, 51, 239, 74, 73, 43, 13, 87, 24, 16, 85, 3, 27, 52, 11, 19, 229, 234, 47, 255, 144, 47, 33, 244, 31, 255, 208, 31, 255, 68, 0, 173, 5, 62, 81, 63, 14, 31, 4, 20, 155, 231, 14, 135, 10, 19, 232, 134, 0, 19, 232, 32, 8, 28, 131, 20, 227, 0, 46, 84, - 131, 69, 120, 87, 228, 80, 71, 31, 201, 29, 239, 80, 20, 31, 246, 74, 20, 31, 244, 16, 54, 27, 211, 2, 20, 145, 10, 20, 145, 162, 31, 31, 219, 143, 31, 215, 30, 79, 45, 50, 8, 28, 214, 228, 0, 24, 64, 7, 239, 0, 215, 255, 79, 26, 176, 32, 234, 213, 2, 255, 18, 163, 159, 21, 227, 31, 29, 15, 7, 106, - 20, 128, 0, 217, 12, 47, 83, 3, 20, 104, 6, 37, 80, 153, 4, 12, 159, 38, 103, 247, 103, 115, 13, 191, 69, 107, 239, 8, 49, 15, 255, 3, 91, 239, 153, 64, 13, 94, 100, 37, 62, 36, 2, 0, 213, 38, 96, 15, 226, 38, 92, 15, 255, 10, 160, 15, 116, 45, 5, 69, 15, 181, 16, 4, 84, 55, 15, 31, 4, 87, - 111, 6, 14, 190, 70, 159, 82, 23, 197, 175, 43, 177, 99, 15, 31, 118, 207, 255, 41, 11, 239, 53, 223, 19, 51, 0, 223, 123, 11, 221, 221, 221, 11, 30, 15, 223, 5, 44, 8, 15, 255, 10, 17, 17, 17, 48, 43, 93, 157, 255, 38, 76, 1, 181, 126, 3, 252, 132, 21, 128, 255, 120, 28, 179, 255, 0, 3, 123, 14, 95, - 3, 16, 33, 27, 251, 214, 252, 131, 30, 222, 249, 15, 255, 35, 69, 82, 12, 222, 2, 90, 175, 234, 157, 79, 131, 0, 207, 15, 226, 2, 184, 91, 123, 131, 250, 8, 123, 47, 4, 244, 4, 45, 20, 96, 3, 14, 223, 34, 189, 214, 22, 0, 222, 14, 15, 53, 46, 24, 162, 11, 27, 193, 11, 255, 15, 162, 11, 196, 221, 222, - 14, 31, 8, 18, 132, 44, 155, 128, 9, 79, 9, 46, 55, 173, 143, 15, 255, 2, 177, 31, 255, 254, 80, 30, 95, 250, 30, 4, 114, 132, 3, 231, 59, 31, 235, 5, 119, 119, 85, 230, 22, 78, 31, 235, 175, 39, 253, 47, 237, 85, 83, 51, 36, 156, 186, 6, 74, 71, 1, 239, 128, 30, 63, 243, 29, 122, 250, 253, 4, 255, - 254, 255, 29, 36, 191, 24, 243, 9, 40, 158, 25, 246, 58, 127, 47, 212, 192, 173, 227, 64, 59, 5, 122, 169, 55, 0, 0, 88, 190, 28, 68, 255, 45, 204, 143, 239, 31, 247, 26, 46, 61, 179, 239, 208, 0, 20, 237, 191, 249, 206, 95, 43, 235, 134, 207, 255, 34, 241, 0, 106, 207, 242, 31, 151, 30, 179, 27, 74, 63, 171, - 253, 11, 39, 3, 15, 144, 3, 1, 169, 251, 85, 85, 214, 86, 119, 143, 132, 221, 62, 211, 123, 255, 29, 73, 222, 4, 140, 59, 42, 119, 120, 153, 153, 111, 164, 198, 203, 187, 30, 191, 31, 84, 175, 255, 154, 180, 30, 239, 162, 192, 78, 87, 246, 80, 227, 12, 222, 15, 58, 191, 0, 42, 59, 82, 31, 119, 3, 95, 119, 7, - 59, 187, 47, 135, 248, 95, 107, 52, 44, 9, 31, 156, 0, 241, 95, 127, 224, 96, 95, 6, 63, 15, 202, 254, 48, 30, 70, 21, 144, 250, 26, 87, 244, 31, 78, 160, 224, 27, 22, 128, 58, 106, 27, 142, 179, 235, 0, 11, 2, 8, 24, 8, 79, 31, 209, 207, 0, 222, 18, 15, 185, 3, 141, 0, 0, 61, 138, 255, 28, 251, - 3, 159, 7, 35, 152, 242, 66, 128, 179, 30, 95, 170, 179, 29, 39, 177, 29, 43, 208, 48, 3, 8, 28, 64, 175, 7, 48, 3, 240, 111, 27, 119, 117, 85, 83, 119, 14, 31, 3, 255, 255, 96, 31, 63, 80, 51, 111, 84, 30, 151, 79, 60, 184, 0, 61, 99, 159, 31, 28, 56, 55, 223, 0, 26, 15, 163, 10, 255, 255, 212, - 0, 110, 102, 20, 39, 1, 207, 59, 152, 28, 74, 44, 144, 15, 85, 21, 244, 110, 0, 0, 93, 7, 31, 3, 48, 81, 191, 5, 253, 2, 249, 5, 103, 119, 119, 13, 31, 240, 22, 126, 255, 64, 7, 95, 2, 119, 16, 0, 130, 163, 0, 31, 2, 46, 179, 128, 3, 15, 255, 49, 159, 143, 95, 67, 13, 35, 3, 255, 148, 239, - 245, 255, 245, 244, 10, 160, 255, 30, 84, 143, 30, 96, 13, 69, 28, 228, 3, 160, 12, 9, 192, 16, 30, 236, 18, 15, 188, 7, 175, 63, 50, 163, 30, 220, 255, 48, 6, 6, 255, 96, 203, 10, 3, 36, 4, 36, 72, 207, 30, 208, 143, 244, 217, 0, 127, 31, 34, 239, 224, 95, 191, 31, 255, 37, 37, 15, 165, 56, 45, 195, - 12, 31, 132, 40, 11, 246, 19, 234, 192, 77, 16, 10, 32, 64, 10, 20, 95, 254, 16, 63, 87, 32, 10, 12, 222, 22, 44, 230, 39, 247, 255, 209, 12, 31, 240, 14, 31, 244, 169, 15, 31, 248, 31, 31, 252, 63, 94, 199, 50, 164, 254, 20, 43, 191, 34, 112, 45, 93, 80, 94, 79, 16, 11, 127, 0, 175, 251, 81, 24, 55, - 1, 84, 67, 6, 46, 106, 59, 127, 21, 18, 0, 85, 30, 122, 0, 47, 114, 249, 84, 75, 208, 135, 235, 7, 124, 23, 243, 175, 13, 255, 173, 255, 34, 123, 18, 127, 191, 252, 18, 131, 128, 13, 255, 228, 0, 62, 42, 31, 167, 53, 79, 252, 16, 239, 128, 78, 203, 16, 0, 222, 4, 255, 77, 223, 247, 10, 255, 223, 251, 239, - 207, 255, 223, 26, 23, 16, 3, 194, 223, 255, 230, 255, 0, 4, 223, 255, 254, 159, 255, 255, 153, 144, 35, 71, 44, 11, 253, 48, 64, 203, 111, 249, 80, 18, 15, 255, 14, 19, 227, 31, 222, 240, 21, 22, 96, 3, 241, 21, 34, 130, 253, 38, 122, 48, 3, 7, 247, 2, 26, 155, 122, 127, 207, 31, 23, 166, 223, 44, 132, 247, - 26, 148, 21, 69, 70, 114, 32, 31, 210, 128, 255, 48, 147, 255, 3, 203, 10, 38, 143, 159, 159, 246, 126, 20, 39, 24, 255, 0, 7, 239, 255, 17, 85, 127, 32, 227, 196, 255, 255, 213, 0, 0, 60, 245, 255, 255, 43, 255, 38, 231, 255, 16, 83, 145, 248, 0, 255, 161, 0, 0, 168, 148, 38, 130, 13, 217, 10, 245, 3, 83, - 50, 17, 8, 69, 171, 3, 35, 5, 139, 171, 32, 15, 61, 71, 79, 30, 64, 31, 29, 223, 10, 132, 35, 15, 160, 70, 35, 51, 77, 14, 191, 7, 19, 55, 19, 234, 0, 134, 45, 14, 93, 71, 36, 225, 207, 30, 192, 2, 67, 15, 255, 37, 4, 86, 15, 255, 10, 64, 15, 255, 13, 13, 19, 215, 13, 128, 5, 220, 5, 126, - 15, 178, 17, 223, 250, 16, 0, 222, 80, 195, 211, 124, 2, 95, 61, 249, 0, 2, 187, 178, 15, 255, 6, 39, 15, 17, 15, 248, 10, 23, 47, 1, 2, 14, 47, 45, 9, 90, 11, 8, 63, 0, 230, 74, 74, 175, 16, 11, 234, 208, 15, 255, 27, 7, 24, 136, 15, 223, 255, 235, 1, 119, 112, 28, 17, 241, 48, 3, 121, 255, - 201, 248, 119, 15, 255, 6, 88, 199, 0, 0, 30, 9, 15, 255, 4, 81, 106, 22, 236, 255, 194, 26, 14, 240, 26, 195, 160, 28, 87, 146, 48, 206, 21, 48, 127, 240, 176, 3, 15, 255, 1, 15, 220, 3, 40, 234, 47, 76, 91, 151, 25, 103, 160, 10, 79, 3, 74, 111, 2, 119, 5, 87, 105, 123, 159, 30, 121, 175, 14, 125, - 2, 123, 187, 187, 83, 16, 28, 255, 48, 3, 1, 29, 38, 223, 255, 187, 187, 175, 187, 38, 155, 176, 30, 155, 189, 17, 175, 248, 137, 29, 10, 151, 8, 9, 255, 4, 111, 255, 240, 92, 39, 207, 255, 8, 148, 98, 72, 95, 28, 187, 3, 30, 189, 12, 40, 25, 207, 255, 53, 42, 220, 72, 211, 7, 112, 27, 224, 245, 15, 193, - 59, 87, 165, 115, 24, 157, 247, 192, 3, 15, 255, 28, 55, 31, 255, 127, 117, 112, 3, 2, 119, 191, 175, 255, 116, 56, 219, 51, 206, 51, 249, 31, 217, 32, 3, 252, 118, 154, 255, 255, 245, 51, 51, 51, 49, 31, 247, 247, 32, 3, 249, 209, 153, 255, 0, 223, 2, 119, 77, 143, 112, 3, 235, 127, 112, 90, 31, 18, 241, 32, - 3, 248, 120, 1, 63, 0, 27, 17, 192, 130, 31, 31, 51, 64, 3, 63, 23, 209, 223, 139, 159, 95, 12, 253, 2, 62, 31, 108, 47, 116, 0, 7, 153, 153, 7, 235, 255, 254, 7, 119, 48, 119, 127, 255, 183, 47, 116, 245, 153, 159, 255, 201, 11, 255, 4, 119, 44, 239, 208, 248, 153, 155, 255, 208, 255, 3, 96, 13, 5, 179, - 18, 35, 227, 249, 15, 255, 185, 153, 15, 31, 184, 0, 3, 0, 81, 188, 17, 47, 255, 155, 255, 250, 153, 99, 247, 160, 7, 238, 21, 255, 243, 32, 31, 0, 153, 191, 90, 214, 73, 208, 3, 17, 65, 0, 42, 191, 30, 31, 255, 30, 77, 10, 90, 31, 83, 143, 90, 255, 31, 234, 30, 255, 55, 57, 89, 172, 246, 31, 238, 193, - 35, 21, 51, 51, 58, 199, 64, 3, 175, 8, 31, 230, 63, 173, 11, 62, 255, 249, 51, 243, 95, 255, 254, 0, 25, 158, 33, 163, 242, 251, 235, 255, 251, 252, 19, 97, 15, 96, 3, 51, 48, 84, 127, 251, 3, 179, 239, 249, 29, 83, 80, 131, 251, 18, 35, 145, 51, 173, 99, 29, 115, 121, 164, 27, 192, 31, 67, 235, 95, 5, - 157, 115, 33, 245, 36, 122, 68, 126, 59, 125, 248, 157, 149, 243, 127, 176, 19, 159, 247, 13, 119, 207, 247, 1, 63, 18, 146, 26, 209, 247, 9, 17, 175, 247, 6, 71, 16, 19, 2, 16, 19, 30, 187, 32, 3, 255, 255, 17, 253, 17, 21, 255, 157, 64, 4, 16, 213, 6, 127, 27, 138, 8, 255, 255, 224, 11, 255, 223, 255, 243, - 14, 255, 143, 249, 79, 253, 240, 85, 91, 199, 192, 31, 255, 160, 28, 67, 128, 31, 225, 64, 119, 31, 52, 16, 0, 2, 66, 123, 111, 255, 112, 189, 1, 31, 232, 12, 255, 227, 17, 174, 55, 33, 62, 122, 117, 33, 156, 29, 255, 18, 51, 89, 126, 86, 244, 221, 203, 169, 135, 174, 171, 226, 90, 199, 60, 67, 89, 27, 195, 223, - 31, 74, 63, 229, 30, 171, 92, 136, 23, 17, 30, 148, 33, 136, 33, 140, 43, 20, 192, 191, 245, 19, 239, 119, 209, 223, 251, 126, 179, 187, 16, 2, 45, 82, 18, 219, 96, 66, 30, 227, 192, 162, 179, 34, 183, 20, 255, 197, 117, 5, 31, 3, 115, 32, 3, 3, 153, 207, 179, 251, 52, 7, 38, 223, 204, 255, 253, 17, 58, 16, - 3, 253, 152, 40, 40, 40, 44, 246, 5, 255, 249, 74, 19, 57, 253, 9, 16, 23, 255, 12, 255, 240, 4, 255, 240, 240, 9, 255, 255, 160, 208, 14, 255, 131, 208, 95, 93, 17, 58, 175, 18, 24, 153, 153, 239, 45, 22, 252, 35, 29, 220, 99, 235, 49, 31, 234, 30, 74, 47, 224, 255, 242, 62, 81, 190, 17, 83, 255, 241, 1, - 255, 241, 160, 3, 218, 252, 188, 67, 251, 253, 221, 64, 23, 31, 93, 181, 153, 31, 22, 17, 131, 247, 85, 85, 109, 201, 96, 31, 143, 70, 159, 147, 111, 144, 23, 115, 227, 16, 174, 0, 7, 22, 27, 175, 55, 31, 193, 127, 31, 247, 37, 85, 85, 8, 31, 92, 199, 30, 26, 36, 115, 255, 187, 191, 255, 219, 127, 99, 255, 85, - 95, 255, 165, 221, 223, 255, 165, 237, 60, 227, 3, 129, 59, 25, 15, 115, 36, 223, 85, 228, 85, 85, 82, 45, 7, 9, 151, 10, 128, 3, 255, 23, 96, 3, 0, 68, 3, 7, 47, 3, 30, 55, 4, 3, 2, 45, 130, 96, 3, 116, 3, 221, 225, 60, 0, 3, 10, 31, 106, 223, 255, 176, 10, 30, 130, 17, 20, 251, 182, 255, - 250, 255, 207, 30, 160, 182, 255, 255, 175, 255, 176, 202, 63, 255, 176, 16, 255, 0, 246, 255, 244, 255, 179, 255, 240, 250, 207, 51, 255, 240, 79, 23, 251, 11, 192, 143, 145, 240, 63, 59, 31, 166, 0, 19, 20, 65, 224, 31, 0, 143, 101, 30, 6, 26, 176, 79, 72, 51, 251, 248, 87, 247, 246, 17, 144, 11, 80, 23, 83, 251, - 3, 228, 7, 112, 23, 24, 98, 223, 147, 240, 131, 239, 160, 7, 223, 67, 255, 163, 243, 241, 0, 142, 19, 18, 118, 18, 131, 49, 227, 79, 235, 133, 35, 227, 11, 19, 243, 31, 234, 31, 72, 16, 7, 223, 51, 243, 247, 0, 255, 254, 239, 247, 1, 32, 159, 247, 62, 244, 63, 254, 175, 247, 19, 39, 242, 35, 249, 20, 216, 255, - 64, 1, 239, 255, 48, 29, 255, 255, 186, 225, 31, 99, 253, 255, 248, 54, 65, 15, 0, 3, 2, 103, 31, 163, 15, 193, 69, 190, 133, 34, 49, 17, 17, 71, 20, 24, 0, 48, 3, 32, 11, 208, 0, 17, 17, 17, 160, 63, 31, 222, 31, 32, 3, 32, 11, 104, 96, 0, 3, 10, 209, 199, 143, 79, 41, 161, 53, 195, 31, 23, - 75, 255, 255, 248, 127, 21, 160, 245, 207, 250, 143, 254, 255, 242, 117, 23, 21, 160, 7, 255, 29, 75, 207, 19, 99, 46, 140, 112, 220, 183, 41, 106, 31, 165, 0, 255, 28, 72, 27, 241, 116, 26, 27, 211, 0, 79, 47, 80, 13, 31, 231, 55, 15, 251, 255, 223, 0, 2, 64, 211, 255, 53, 207, 255, 255, 247, 15, 255, 252, 16, - 63, 254, 255, 249, 0, 127, 246, 249, 0, 223, 241, 255, 249, 3, 255, 176, 249, 11, 255, 80, 255, 249, 79, 254, 0, 251, 239, 248, 58, 223, 255, 48, 37, 51, 11, 255, 207, 244, 47, 250, 254, 63, 254, 191, 248, 18, 73, 241, 22, 32, 194, 144, 26, 70, 85, 21, 47, 66, 26, 0, 230, 2, 161, 3, 255, 1, 86, 87, 251, 243, - 31, 239, 248, 25, 60, 13, 63, 19, 235, 111, 16, 167, 255, 111, 27, 11, 143, 252, 119, 119, 175, 207, 37, 233, 246, 84, 68, 224, 0, 52, 111, 83, 150, 23, 143, 148, 15, 47, 90, 31, 20, 165, 255, 2, 121, 24, 148, 0, 9, 153, 153, 39, 108, 23, 112, 151, 84, 23, 116, 237, 80, 11, 81, 102, 143, 153, 16, 0, 106, 119, - 149, 221, 84, 23, 17, 175, 17, 144, 31, 144, 27, 142, 240, 255, 119, 121, 255, 240, 221, 222, 255, 240, 35, 32, 11, 22, 54, 240, 137, 207, 15, 254, 70, 87, 247, 221, 209, 36, 12, 74, 39, 84, 3, 5, 15, 127, 6, 47, 131, 187, 4, 172, 5, 107, 239, 228, 2, 187, 176, 15, 255, 35, 118, 243, 211, 11, 103, 15, 15, 34, - 3, 110, 103, 231, 221, 208, 15, 255, 37, 159, 247, 143, 40, 3, 61, 24, 7, 0, 95, 4, 160, 8, 255, 251, 28, 74, 128, 82, 1, 31, 5, 225, 28, 207, 64, 12, 203, 5, 188, 207, 16, 12, 71, 15, 134, 31, 14, 255, 3, 11, 8, 6, 95, 255, 18, 247, 80, 10, 29, 147, 223, 0, 181, 15, 222, 37, 239, 255, 225, 0, - 27, 250, 255, 96, 0, 0, 90, 15, 226, 5, 239, 93, 77, 223, 63, 218, 15, 255, 2, 248, 239, 231, 255, 243, 254, 111, 80, 239, 64, 8, 0, 126, 15, 191, 3, 191, 251, 26, 17, 96, 4, 255, 129, 0, 0, 166, 61, 15, 255, 2, 250, 31, 226, 17, 67, 119, 80, 15, 223, 5, 175, 241, 68, 171, 3, 13, 135, 7, 160, 0, - 239, 239, 242, 64, 0, 143, 43, 19, 210, 14, 15, 3, 253, 73, 253, 206, 252, 128, 11, 96, 8, 51, 247, 11, 187, 32, 13, 231, 34, 10, 35, 243, 35, 247, 3, 0, 39, 13, 224, 42, 55, 223, 3, 2, 31, 128, 152, 5, 31, 252, 80, 3, 119, 122, 42, 247, 15, 226, 8, 15, 67, 1, 113, 25, 134, 2, 239, 0, 30, 152, - 41, 16, 26, 94, 78, 53, 252, 179, 25, 214, 252, 41, 31, 165, 252, 31, 169, 160, 202, 17, 17, 15, 191, 7, 70, 207, 95, 255, 223, 247, 144, 3, 95, 211, 19, 2, 26, 207, 13, 229, 1, 255, 191, 223, 255, 146, 24, 96, 253, 255, 6, 255, 249, 138, 255, 0, 95, 10, 32, 232, 15, 255, 0, 253, 112, 3, 192, 15, 254, 0, - 251, 38, 0, 0, 1, 223, 18, 138, 255, 0, 187, 42, 31, 255, 13, 255, 239, 208, 252, 0, 251, 123, 159, 219, 250, 143, 251, 122, 3, 211, 11, 138, 255, 180, 183, 15, 255, 1, 191, 80, 64, 3, 139, 31, 199, 1, 31, 2, 15, 57, 147, 43, 166, 23, 239, 180, 21, 2, 80, 0, 3, 255, 159, 243, 0, 11, 175, 253, 0, 31, - 254, 13, 255, 144, 143, 4, 250, 18, 191, 63, 170, 80, 108, 3, 112, 76, 15, 242, 15, 255, 1, 8, 30, 255, 54, 41, 132, 41, 136, 1, 17, 241, 159, 23, 177, 30, 9, 188, 243, 87, 64, 17, 221, 221, 239, 15, 120, 3, 95, 159, 244, 255, 221, 221, 214, 223, 255, 6, 72, 99, 33, 67, 253, 11, 255, 0, 1, 207, 253, 255, - 184, 128, 127, 29, 74, 243, 1, 255, 159, 254, 49, 255, 148, 8, 31, 230, 5, 239, 6, 253, 27, 90, 240, 15, 223, 1, 233, 202, 63, 6, 47, 0, 109, 151, 247, 4, 241, 143, 249, 207, 107, 207, 187, 85, 48, 25, 219, 244, 26, 173, 255, 223, 210, 255, 125, 24, 253, 2, 177, 223, 161, 71, 250, 42, 123, 167, 232, 5, 148, 1, - 159, 46, 19, 31, 255, 53, 85, 85, 159, 4, 3, 31, 0, 126, 163, 85, 111, 255, 101, 119, 226, 143, 255, 135, 6, 207, 1, 61, 71, 27, 255, 64, 30, 183, 168, 118, 7, 250, 47, 127, 90, 171, 91, 221, 215, 91, 187, 125, 215, 43, 26, 144, 30, 74, 255, 29, 174, 255, 25, 178, 255, 175, 248, 250, 255, 251, 255, 197, 57, 39, - 77, 247, 30, 23, 141, 80, 70, 175, 66, 227, 28, 124, 239, 245, 62, 95, 1, 255, 48, 0, 4, 112, 32, 0, 13, 254, 85, 79, 73, 43, 45, 147, 77, 111, 159, 190, 36, 86, 0, 237, 39, 119, 96, 31, 97, 252, 32, 29, 192, 96, 254, 95, 251, 251, 0, 95, 247, 146, 16, 3, 190, 0, 48, 3, 0, 63, 119, 119, 48, 30, - 126, 169, 112, 48, 3, 122, 16, 7, 5, 144, 3, 218, 191, 9, 63, 61, 114, 170, 191, 45, 177, 255, 53, 1, 17, 235, 255, 223, 160, 46, 71, 33, 31, 255, 193, 255, 255, 45, 255, 49, 255, 0, 184, 1, 255, 121, 56, 221, 137, 157, 255, 241, 27, 108, 64, 3, 240, 251, 0, 241, 223, 247, 119, 32, 15, 240, 223, 238, 251, 187, - 240, 27, 248, 217, 153, 148, 114, 19, 109, 32, 146, 119, 175, 79, 183, 187, 223, 80, 158, 2, 206, 214, 95, 58, 191, 42, 195, 5, 119, 175, 31, 174, 15, 20, 147, 16, 7, 31, 241, 32, 3, 245, 31, 247, 5, 8, 163, 239, 32, 15, 35, 247, 127, 171, 21, 77, 251, 99, 239, 48, 15, 147, 138, 78, 3, 75, 158, 9, 30, 171, - 32, 3, 5, 153, 106, 93, 235, 191, 32, 68, 3, 87, 22, 211, 121, 31, 243, 146, 245, 32, 3, 26, 63, 149, 79, 77, 49, 162, 5, 31, 178, 154, 5, 26, 83, 112, 123, 255, 237, 30, 107, 112, 91, 127, 101, 43, 131, 183, 119, 79, 179, 85, 47, 239, 28, 162, 127, 74, 144, 3, 191, 85, 71, 18, 174, 255, 32, 3, 141, 30, - 171, 6, 42, 199, 99, 251, 42, 211, 36, 11, 27, 202, 63, 249, 18, 211, 190, 216, 18, 215, 48, 71, 119, 119, 245, 31, 236, 175, 249, 31, 236, 56, 31, 240, 185, 255, 147, 51, 73, 83, 239, 176, 32, 3, 30, 187, 80, 110, 191, 46, 195, 51, 175, 51, 16, 101, 13, 31, 142, 10, 255, 199, 0, 253, 6, 254, 255, 0, 2, 73, - 31, 175, 2, 167, 62, 31, 255, 13, 32, 201, 48, 3, 207, 249, 255, 217, 119, 159, 27, 142, 249, 129, 30, 245, 19, 251, 49, 110, 81, 88, 255, 177, 48, 3, 243, 51, 51, 126, 162, 144, 247, 29, 234, 47, 215, 247, 80, 218, 47, 91, 13, 186, 5, 141, 206, 119, 18, 211, 240, 239, 206, 27, 240, 102, 249, 247, 127, 29, 60, 251, - 252, 0, 0, 249, 255, 16, 255, 223, 242, 255, 128, 223, 240, 207, 224, 169, 223, 28, 64, 46, 27, 246, 121, 33, 7, 31, 182, 255, 246, 1, 28, 255, 97, 111, 19, 249, 157, 16, 226, 62, 31, 51, 40, 3, 214, 230, 0, 0, 208, 78, 114, 15, 118, 131, 33, 67, 43, 255, 64, 3, 86, 119, 9, 255, 167, 93, 16, 11, 80, 17, - 201, 22, 31, 0, 6, 119, 63, 46, 35, 111, 95, 119, 47, 255, 39, 255, 63, 215, 255, 63, 28, 64, 16, 32, 7, 119, 25, 153, 157, 23, 100, 202, 36, 206, 119, 119, 47, 16, 7, 63, 89, 24, 109, 31, 16, 15, 41, 152, 39, 153, 31, 186, 112, 57, 11, 250, 49, 93, 211, 79, 255, 0, 30, 132, 30, 187, 253, 127, 19, 244, - 103, 0, 191, 246, 3, 0, 29, 254, 64, 0, 255, 53, 255, 241, 250, 23, 243, 176, 224, 23, 247, 219, 189, 55, 149, 64, 175, 39, 251, 24, 11, 165, 111, 31, 120, 11, 30, 254, 30, 183, 64, 20, 35, 246, 223, 255, 248, 45, 65, 111, 255, 119, 112, 6, 74, 46, 187, 91, 168, 61, 31, 255, 10, 30, 7, 79, 31, 44, 245, 223, - 128, 0, 8, 48, 115, 59, 19, 235, 175, 250, 211, 95, 251, 255, 245, 19, 251, 224, 19, 255, 247, 112, 95, 251, 254, 19, 255, 247, 0, 57, 192, 148, 224, 50, 208, 67, 243, 99, 255, 36, 11, 36, 19, 62, 139, 231, 89, 154, 239, 14, 191, 10, 25, 154, 5, 0, 115, 255, 3, 255, 0, 239, 133, 255, 3, 255, 190, 230, 17, 135, - 168, 255, 14, 255, 90, 29, 203, 255, 14, 255, 223, 250, 47, 255, 255, 244, 187, 127, 19, 231, 249, 153, 240, 31, 108, 208, 189, 247, 221, 255, 192, 32, 27, 142, 205, 96, 255, 255, 130, 255, 224, 255, 89, 255, 144, 255, 253, 95, 255, 103, 255, 153, 191, 79, 175, 253, 111, 22, 170, 240, 1, 26, 47, 159, 80, 0, 248, 247, 255, 208, - 0, 240, 20, 220, 240, 143, 252, 87, 84, 194, 10, 18, 187, 207, 47, 243, 235, 0, 63, 103, 30, 29, 11, 206, 22, 187, 47, 39, 57, 255, 163, 123, 31, 192, 252, 187, 183, 137, 18, 192, 223, 187, 255, 255, 248, 223, 4, 255, 241, 13, 110, 255, 255, 128, 13, 255, 251, 41, 158, 255, 191, 176, 20, 190, 7, 255, 112, 153, 156, 255, - 130, 201, 127, 199, 16, 15, 48, 3, 80, 19, 83, 239, 173, 21, 71, 208, 17, 48, 159, 170, 144, 92, 154, 35, 239, 30, 47, 55, 138, 95, 31, 239, 80, 32, 3, 231, 123, 255, 80, 208, 254, 7, 255, 80, 233, 156, 255, 140, 47, 255, 239, 57, 255, 153, 23, 43, 103, 255, 10, 255, 254, 87, 255, 12, 255, 55, 255, 31, 16, 100, - 218, 191, 252, 21, 218, 245, 7, 52, 214, 147, 25, 149, 50, 36, 91, 36, 95, 117, 145, 16, 3, 18, 163, 118, 27, 178, 180, 154, 49, 219, 255, 255, 39, 243, 3, 30, 195, 30, 190, 191, 255, 48, 3, 254, 119, 175, 15, 253, 0, 223, 95, 15, 22, 21, 249, 255, 133, 85, 185, 127, 20, 33, 50, 17, 47, 255, 245, 0, 47, 255, - 253, 245, 0, 95, 251, 245, 0, 175, 255, 248, 245, 5, 255, 244, 246, 143, 255, 254, 208, 21, 84, 159, 247, 95, 253, 32, 3, 238, 1, 16, 95, 27, 43, 95, 253, 9, 16, 7, 191, 15, 16, 19, 15, 251, 95, 254, 111, 249, 255, 0, 4, 187, 191, 0, 0, 54, 29, 63, 21, 47, 22, 19, 239, 109, 0, 0, 207, 141, 127, 29, - 52, 173, 0, 0, 69, 29, 0, 5, 246, 137, 191, 255, 187, 19, 247, 9, 65, 16, 120, 103, 31, 154, 63, 193, 19, 132, 20, 7, 57, 66, 255, 223, 255, 123, 63, 162, 255, 245, 239, 245, 94, 250, 240, 191, 243, 175, 240, 22, 58, 240, 31, 95, 255, 240, 9, 255, 245, 240, 2, 255, 244, 254, 240, 21, 223, 254, 254, 255, 126, 44, - 120, 11, 62, 98, 22, 138, 48, 11, 111, 255, 48, 95, 198, 240, 143, 255, 243, 223, 240, 95, 246, 223, 243, 191, 254, 247, 223, 253, 255, 246, 223, 247, 22, 17, 230, 243, 251, 48, 40, 39, 24, 43, 37, 141, 16, 79, 189, 80, 32, 3, 253, 222, 255, 237, 47, 171, 153, 255, 191, 255, 217, 0, 207, 255, 245, 61, 122, 24, 1, 255, - 254, 22, 255, 102, 165, 239, 90, 119, 30, 22, 46, 63, 141, 17, 70, 0, 255, 166, 16, 87, 95, 108, 37, 92, 253, 187, 71, 107, 248, 17, 119, 115, 21, 112, 127, 62, 123, 31, 253, 0, 187, 207, 255, 187, 112, 63, 243, 63, 253, 17, 126, 147, 16, 23, 51, 227, 18, 35, 221, 187, 189, 54, 39, 112, 17, 24, 54, 47, 128, 17, - 36, 126, 51, 179, 15, 251, 9, 32, 12, 48, 50, 155, 239, 26, 110, 16, 36, 8, 96, 34, 31, 197, 218, 85, 26, 255, 255, 64, 15, 213, 14, 23, 249, 51, 28, 46, 23, 91, 186, 150, 15, 255, 2, 22, 127, 10, 226, 63, 0, 92, 6, 47, 255, 208, 111, 253, 143, 80, 6, 175, 249, 31, 220, 130, 15, 255, 2, 62, 251, 191, - 255, 237, 2, 211, 111, 31, 255, 15, 234, 15, 255, 2, 224, 253, 31, 249, 0, 176, 8, 64, 0, 95, 7, 0, 174, 110, 31, 91, 30, 31, 194, 6, 233, 48, 14, 191, 3, 73, 20, 16, 48, 15, 58, 9, 63, 155, 7, 65, 227, 11, 206, 1, 0, 21, 90, 195, 15, 162, 7, 95, 255, 143, 30, 199, 8, 15, 255, 3, 176, 250, - 7, 255, 252, 16, 6, 41, 142, 71, 14, 127, 4, 179, 32, 62, 195, 119, 97, 14, 190, 7, 19, 243, 221, 221, 207, 13, 221, 1, 250, 4, 23, 235, 48, 212, 191, 228, 24, 20, 234, 2, 26, 4, 25, 209, 248, 79, 21, 105, 24, 144, 1, 6, 4, 187, 8, 87, 231, 1, 134, 65, 15, 31, 6, 235, 115, 183, 31, 31, 31, 10, - 134, 15, 63, 4, 84, 255, 254, 232, 183, 16, 111, 31, 92, 5, 15, 255, 2, 46, 14, 29, 167, 58, 16, 229, 1, 63, 4, 240, 0, 111, 31, 92, 14, 31, 96, 221, 6, 182, 15, 255, 3, 210, 0, 111, 31, 222, 3, 45, 2, 95, 7, 17, 63, 223, 29, 212, 5, 180, 15, 67, 6, 115, 115, 15, 182, 12, 31, 255, 221, 30, - 39, 31, 255, 103, 119, 45, 15, 255, 2, 28, 198, 254, 72, 218, 119, 64, 15, 255, 90, 7, 3, 34, 210, 18, 214, 0, 0, 255, 1, 17, 255, 2, 34, 255, 3, 51, 155, 5, 255, 170, 250, 30, 52, 249, 48, 3, 3, 48, 3, 247, 48, 3, 160, 2, 30, 243, 1, 41, 33, 4, 1, 255, 5, 18, 255, 6, 35, 255, 7, 52, - 154, 157, 1, 29, 181, 32, 3, 0, 221, 212, 79, 170, 124, 144, 177, 55, 251, 40, 146, 10, 42, 24, 8, 1, 255, 9, 18, 255, 10, 35, 255, 97, 11, 52, 155, 158, 228, 11, 227, 255, 12, 244, 255, 14, 5, 255, 15, 22, 184, 67, 234, 87, 68, 72, 24, 5, 252, 31, 255, 162, 47, 255, 255, 9, 0, 9, 1, 14, 16, 1, - 15, 191, 16, 64, 5, 0, 20, 20, 0, 18, 18, 124, 32, 2, 19, 19, 0, 15, 15, 32, 2, 16, 14, 255, 6, 6, 0, 17, 17, 0, 14, 14, 224, 0, 23, 23, 80, 26, 16, 35, 16, 41, 160, 35, 16, 53, 207, 24, 24, 32, 38, 16, 56, 13, 13, 0, 9, 88, 16, 88, 11, 32, 47, 22, 22, 32, 83, 16, 56, 16, - 59, 25, 16, 32, 16, 35, 16, 17, 25, 24, 32, 95, 16, 107, 22, 254, 23, 0, 26, 26, 0, 21, 21, 32, 38, 124, 16, 41, 23, 23, 1, 18, 20, 16, 2, 48, 44, 240, 23, 0, 25, 25, 32, 29, 64, 11, 48, 29, 80, 5, 111, 16, 140, 21, 22, 80, 83, 23, 24, 0, 18, 189, 19, 32, 173, 24, 24, 2, 20, 48, - 95, 25, 245, 25, 1, 23, 25, 48, 101, 26, 96, 68, 27, 0, 32, 74, 208, 2, 64, 134, 16, 137, 64, 158, 16, 188, 64, 164, 16, 248, 30, 112, 5, 17, 10, 16, 155, 19, 20, 1, 19, 16, 236, 162, 20, 32, 224, 20, 48, 5, 64, 203, 16, 218, 16, 49, 49, 0, 16, 191, 64, 5, 64, 200, 16, 44, 64, 206, 16, 215, - 64, 248, 64, 110, 64, 65, 4, 22, 49, 67, 64, 20, 16, 62, 16, 65, 17, 34, 65, 22, 192, 23, 22, 80, 134, 17, 52, 64, 122, 16, 95, 17, 85, 65, 109, 240, 20, 21, 2, 19, 48, 83, 17, 103, 64, 5, 65, 79, 6, 65, 100, 48, 248, 128, 197, 112, 26, 65, 118, 5, 5, 33, 251, 239, 77, 65, 80, 26, 1, 140, - 48, 66, 48, 239, 252, 0, 1, 42, 12, 51, 240, 0, 31, 85, 25, 248, 32, 25, 252, 33, 26, 0, 34, 26, 4, 35, 255, 0, 36, 0, 37, 0, 38, 0, 39, 255, 0, 40, 0, 41, 0, 42, 0, 43, 255, 0, 44, 0, 45, 0, 46, 0, 47, 255, 0, 48, 0, 49, 0, 50, 0, 51, 255, 0, 52, 0, 53, 0, 54, 0, - 55, 255, 0, 56, 0, 57, 0, 58, 0, 59, 255, 0, 60, 0, 61, 0, 62, 0, 63, 255, 0, 64, 0, 65, 0, 66, 0, 67, 255, 0, 68, 0, 69, 0, 70, 0, 71, 255, 0, 72, 0, 73, 0, 74, 0, 75, 223, 0, 76, 26, 90, 77, 0, 78, 0, 79, 255, 0, 80, 0, 81, 0, 82, 0, 83, 255, 0, 84, 0, 85, - 0, 86, 0, 87, 255, 0, 88, 0, 89, 0, 90, 0, 91, 255, 0, 92, 0, 93, 0, 94, 0, 95, 255, 0, 96, 0, 97, 0, 98, 0, 99, 246, 0, 100, 0, 101, 26, 142, 102, 255, 16, 0, 251, 0, 103, 0, 104, 255, 0, 0, 9, 0, 105, 247, 0, 106, 0, 107, 144, 15, 108, 0, 109, 125, 26, 202, 110, 0, 111, 0, - 112, 80, 33, 113, 247, 0, 114, 0, 115, 26, 222, 116, 0, 117, 255, 0, 118, 0, 119, 0, 120, 0, 121, 85, 48, 89, 122, 26, 242, 123, 26, 246, 124, 48, 103, 125, 255, 0, 126, 0, 127, 0, 128, 0, 129, 95, 176, 93, 130, 112, 103, 131, 0, 132, 0, 133, 85, 80, 115, 134, 27, 44, 135, 112, 129, 136, 144, 141, 137, 255, - 0, 138, 0, 139, 0, 140, 0, 141, 87, 144, 161, 142, 240, 179, 143, 97, 139, 0, 224, 0, 174, 0, 27, 120, 2, 95, 255, 50, 0, 32, 48, 5, 170, 1, 17, 101, 2, 17, 101, 3, 17, 103, 4, 17, 85, 170, 5, 17, 87, 6, 17, 89, 7, 17, 91, 8, 17, 93, 170, 9, 17, 95, 10, 17, 95, 11, 17, 97, 12, 17, - 97, 250, 13, 0, 76, 0, 14, 17, 99, 15, 17, 101, 170, 16, 17, 103, 17, 17, 105, 18, 17, 107, 19, 17, 109, 170, 20, 17, 111, 21, 17, 113, 22, 17, 115, 23, 17, 117, 170, 24, 17, 119, 25, 17, 121, 26, 17, 123, 27, 17, 115, 255, 28, 48, 1, 0, 29, 48, 2, 0, 255, 30, 78, 45, 0, 144, 79, 83, 0, 255, - 145, 81, 146, 0, 146, 83, 214, 0, 255, 147, 83, 240, 0, 148, 89, 39, 0, 255, 149, 98, 113, 0, 150, 102, 14, 0, 255, 151, 102, 248, 0, 152, 103, 44, 0, 255, 153, 108, 179, 0, 154, 110, 144, 0, 255, 155, 130, 30, 0, 156, 138, 172, 0, 255, 157, 138, 173, 0, 158, 146, 128, 0, 255, 159, 150, 122, 0, 160, 150, 251, - 0, 224, 161, 255, 1, 68, 89, 15, 255, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 4, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 4, 224, 254, 0, 0, 0, 32, 0, 0, 1, 16, - 6, 203, 3, 192, 64, 3, 112, 1, 1, 64, 27, 0, 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, 79, 79, 84, 32, 27, 70, 122, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 15, 109, 64, 79, 2, 128, 64, 81, 226, 226, 16, 19, 27, 90, 80, 15, 160, 64, 26, 207, 45, 16, 39, 41, - 16, 127, 190, 32, 96, 19, 255, 255, 0, 46, 2, 128, 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, 3, 10, 46, 0, 46, 46, 0, 117, 115, 255, 101, 110, 103, 108, 105, 115, 104, 0, 255, 109, 101, 115, 115, 97, 103, 101, 46, 239, 98, 109, 103, 96, 11, 105, 100, 46, 116, 255, 98, 108, 0, 115, - 116, 114, 117, 99, 158, 116, 48, 10, 160, 199, 77, 69, 83, 71, 16, 44, 183, 49, 80, 187, 2, 2, 208, 228, 73, 78, 70, 126, 16, 27, 0, 96, 0, 6, 0, 12, 49, 62, 42, 113, 56, 48, 159, 2, 144, 11, 104, 144, 23, 206, 128, 35, 211, 1, 142, 144, 11, 180, 144, 59, 49, 130, 68, 65, 223, 84, 49, 80, 70, 26, - 6, 1, 0, 3, 255, 0, 80, 0, 108, 0, 101, 0, 97, 223, 0, 115, 16, 5, 32, 0, 105, 0, 110, 116, 48, 9, 114, 0, 116, 17, 191, 116, 16, 99, 32, 21, 238, 83, 0, 85, 16, 39, 69, 0, 82, 17, 211, 239, 77, 0, 65, 16, 7, 73, 0, 79, 0, 235, 10, 0, 71, 16, 11, 76, 16, 15, 88, 0, 170, 89, - 17, 237, 71, 16, 69, 109, 48, 69, 68, 16, 71, 228, 115, 0, 99, 17, 44, 0, 101, 92, 84, 80, 175, 0, 137, 0, 186, 32, 16, 141, 111, 0, 117, 16, 235, 100, 18, 151, 149, 110, 16, 11, 32, 223, 98, 48, 243, 114, 48, 255, 100, 69, 17, 218, 10, 209, 13, 96, 25, 129, 9, 87, 17, 33, 105, 117, 18, 217, 79, 0, - 112, 49, 37, 97, 17, 39, 105, 42, 16, 89, 33, 53, 10, 17, 27, 97, 17, 63, 117, 17, 77, 170, 108, 18, 253, 102, 16, 113, 114, 19, 5, 109, 48, 7, 34, 97, 93, 64, 21, 109, 144, 57, 33, 37, 1, 97, 4, 32, 177, 97, 170, 0, 17, 107, 97, 16, 195, 110, 17, 89, 104, 81, 171, 165, 116, 16, 213, 32, 17, 189, - 64, 223, 115, 17, 127, 105, 37, 48, 237, 32, 207, 118, 17, 215, 32, 33, 117, 48, 225, 33, 87, 115, 129, 6, 82, 71, 40, 19, 163, 8, 33, 157, 223, 67, 98, 50, 251, 4, 0, 6, 4, 56, 212, 56, 178, 83, 7, 0, 211, 175, 8, 82, 123, 35, 51, 171, 3, 19, 219, 24, 19, 223, 4, 147, 199, 43, 67, 255, 79, 77, - 77, 69, 78, 84, 0, 68, 253, 73, 83, 67, 95, 48, 49, 80, 7, 50, 127, 80, 15, 51, 0, 84, 73, 84, 76, 69, 251, 95, 77, 65, 73, 78, 80, 10, 83, 85, 229, 66, 0, 64, 0, 0, 0, 144, 111, 112, 36, 67, 174, 239, 55, 113, 97, 96, 147, 28, 19, 62, 141, 124, 80, 171, 0, 190, 198, 20, 162, 51, 179, 16, - 153, 247, 100, 67, 164, 76, 51, 191, 12, 0, 0, 243, 19, 54, 175, 66, 51, 203, 19, 221, 137, 230, 191, 39, 67, 215, 20, 0, 0, 251, 104, 17, 158, 53, 51, 227, 16, 185, 23, 177, 123, 254, 51, 239, 170, 28, 116, 149, 4, 81, 23, 7, 80, 235, 9, 20, 191, 160, 10, 20, 195, 11, 224, 162, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 82, 192, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 82, 192, 243, 0, 0, 0, 32, 16, 3, 16, 7, 81, 224, 42, 64, 3, 112, 1, 1, 80, 27, 3, 16, 35, 64, 80, 3, 231, 128, 0, 3, 32, 22, 16, 57, 79, 79, 84, 115, - 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, 67, 212, 243, 17, 0, 0, 18, 64, 79, 64, 87, 255, 255, 234, 0, 46, 2, 128, 96, 16, 80, 19, 184, 16, 19, 199, 2, 255, 16, 0, 96, 19, 32, 131, 46, 0, 46, 255, 46, 0, 101, 109, 98, 101, 100, 100, 255, 101, 100, 102, 111, 110, 116, 0, 109, 253, 101, 115, 115, 97, - 103, 101, 32, 11, 50, 249, 54, 46, 98, 114, 102, 16, 19, 0, 0, 8, 82, 254, 70, 78, 84, 254, 255, 1, 4, 48, 215, 254, 16, 0, 5, 70, 73, 78, 70, 32, 235, 219, 1, 33, 16, 241, 27, 27, 32, 219, 56, 0, 239, 0, 80, 104, 16, 247, 8, 33, 27, 26, 251, 0, 84, 71, 76, 80, 16, 15, 48, 24, 255, 25, - 19, 24, 0, 0, 8, 0, 0, 150, 10, 32, 221, 17, 3, 128, 49, 31, 96, 0, 0, 0, 102, 251, 127, 255, 176, 0, 111, 16, 3, 95, 255, 169, 160, 16, 3, 144, 48, 3, 63, 16, 7, 0, 0, 179, 2, 254, 118, 0, 0, 159, 255, 0, 11, 18, 25, 255, 143, 255, 255, 4, 255, 255, 223, 13, 254, 255, 252, 11, 127, 255, - 243, 4, 98, 32, 150, 228, 34, 55, 18, 161, 255, 18, 169, 255, 244, 18, 67, 175, 251, 34, 71, 16, 146, 166, 4, 190, 0, 0, 164, 6, 18, 59, 2, 34, 63, 34, 67, 35, 32, 88, 34, 199, 251, 19, 86, 119, 117, 255, 144, 0, 202, 118, 218, 84, 69, 48, 63, 251, 0, 48, 95, 65, 34, 147, 174, 232, 34, 151, 209, 18, - 155, 250, 0, 141, 18, 160, 249, 9, 255, 253, 0, 207, 32, 104, 1, 96, 110, 63, 215, 255, 112, 48, 3, 47, 16, 7, 31, 255, 96, 93, 16, 3, 80, 48, 3, 13, 221, 64, 2, 139, 80, 4, 141, 32, 2, 239, 49, 36, 63, 19, 72, 0, 14, 20, 99, 111, 85, 20, 103, 207, 65, 163, 7, 19, 231, 12, 19, 238, 144, 106, - 49, 199, 255, 248, 20, 23, 241, 20, 27, 160, 20, 31, 234, 150, 121, 189, 36, 7, 250, 20, 12, 239, 16, 254, 187, 175, 17, 244, 95, 255, 240, 17, 2, 244, 0, 255, 14, 255, 251, 128, 239, 255, 255, 224, 81, 20, 39, 240, 20, 43, 241, 84, 159, 96, 3, 244, 130, 255, 255, 253, 22, 223, 255, 253, 175, 255, 255, 191, 253, 18, - 88, 253, 111, 255, 255, 254, 41, 55, 16, 91, 52, 131, 0, 239, 32, 7, 254, 80, 0, 253, 254, 129, 0, 0, 234, 97, 36, 151, 128, 123, 20, 155, 249, 0, 24, 255, 18, 105, 223, 255, 251, 80, 42, 255, 255, 48, 3, 95, 111, 7, 203, 175, 16, 51, 251, 223, 17, 0, 175, 255, 208, 0, 223, 9, 238, 1, 247, 60, 3, 239, - 243, 0, 13, 86, 19, 77, 14, 18, 240, 6, 33, 133, 39, 80, 4, 227, 60, 182, 31, 21, 207, 95, 255, 51, 223, 0, 158, 37, 219, 175, 37, 166, 39, 244, 33, 200, 119, 83, 16, 176, 31, 54, 84, 70, 132, 166, 71, 220, 255, 255, 80, 1, 30, 33, 135, 16, 7, 17, 147, 112, 0, 50, 17, 5, 130, 27, 249, 223, 255, 54, - 140, 223, 22, 84, 32, 3, 207, 113, 22, 92, 121, 135, 100, 178, 211, 18, 24, 22, 143, 226, 254, 0, 255, 250, 16, 0, 183, 32, 5, 77, 180, 55, 0, 197, 255, 7, 180, 84, 59, 0, 22, 53, 0, 0, 191, 234, 255, 0, 10, 24, 225, 95, 22, 64, 223, 22, 80, 118, 25, 88, 20, 119, 100, 24, 243, 255, 251, 102, 131, 233, - 251, 134, 140, 36, 88, 60, 169, 47, 36, 104, 250, 39, 41, 27, 25, 13, 246, 73, 136, 147, 11, 1, 53, 0, 171, 74, 20, 173, 127, 25, 57, 63, 25, 61, 15, 235, 243, 152, 0, 2, 63, 25, 39, 32, 3, 0, 0, 235, 119, 117, 64, 32, 95, 198, 102, 227, 99, 53, 185, 141, 21, 45, 0, 94, 241, 73, 179, 121, 202, 230, - 11, 41, 123, 24, 49, 53, 107, 23, 76, 255, 104, 62, 1, 51, 167, 85, 22, 240, 255, 21, 146, 64, 3, 5, 207, 234, 159, 0, 22, 112, 67, 179, 0, 0, 103, 121, 155, 190, 188, 167, 63, 151, 118, 85, 51, 210, 26, 48, 170, 208, 90, 36, 96, 83, 187, 144, 80, 3, 16, 250, 8, 227, 35, 69, 0, 21, 197, 68, 3, 36, - 7, 105, 152, 87, 26, 111, 221, 26, 115, 239, 42, 103, 86, 119, 137, 189, 154, 167, 159, 119, 101, 84, 51, 38, 221, 255, 66, 84, 137, 187, 25, 145, 23, 5, 64, 187, 24, 241, 33, 9, 132, 16, 151, 11, 41, 49, 26, 186, 255, 88, 27, 103, 0, 58, 231, 255, 255, 9, 84, 3, 23, 227, 101, 255, 252, 87, 22, 115, 176, 74, - 229, 117, 21, 229, 255, 254, 112, 94, 26, 151, 208, 26, 155, 64, 0, 106, 235, 88, 57, 210, 1, 18, 5, 255, 15, 3, 16, 48, 40, 43, 12, 22, 192, 250, 14, 255, 245, 0, 15, 48, 3, 247, 22, 217, 253, 253, 0, 8, 255, 255, 177, 10, 47, 13, 22, 74, 10, 79, 10, 197, 117, 63, 96, 3, 15, 144, 3, 14, 27, 39, - 147, 13, 55, 0, 39, 4, 243, 144, 3, 25, 30, 6, 245, 122, 23, 107, 245, 0, 43, 255, 38, 50, 111, 23, 59, 82, 39, 63, 143, 22, 62, 223, 55, 111, 18, 47, 253, 73, 71, 21, 55, 5, 27, 117, 25, 58, 254, 24, 244, 250, 23, 146, 247, 47, 22, 15, 32, 200, 243, 32, 3, 181, 87, 120, 152, 133, 255, 85, 63, 37, - 71, 17, 154, 165, 128, 4, 11, 15, 10, 133, 26, 85, 130, 80, 3, 23, 247, 0, 191, 144, 3, 159, 32, 3, 121, 33, 227, 255, 237, 221, 221, 121, 159, 32, 11, 144, 41, 129, 235, 44, 135, 211, 144, 223, 211, 7, 32, 0, 28, 47, 11, 51, 81, 15, 97, 31, 13, 255, 67, 139, 26, 73, 16, 91, 215, 205, 249, 27, 60, 244, - 27, 60, 243, 0, 93, 164, 203, 41, 209, 247, 28, 236, 16, 254, 0, 33, 157, 24, 75, 175, 242, 28, 115, 243, 28, 119, 245, 169, 207, 255, 159, 145, 24, 108, 38, 103, 80, 5, 255, 255, 112, 133, 78, 16, 3, 8, 220, 15, 44, 175, 35, 151, 6, 44, 183, 41, 157, 239, 106, 115, 109, 63, 184, 120, 173, 170, 122, 254, 229, 87, - 119, 100, 179, 30, 48, 135, 64, 66, 223, 146, 86, 13, 64, 3, 13, 80, 207, 11, 80, 231, 5, 119, 173, 103, 206, 251, 157, 122, 217, 20, 95, 216, 32, 101, 216, 177, 28, 24, 210, 48, 239, 8, 200, 7, 14, 255, 252, 52, 175, 18, 200, 235, 0, 0, 77, 45, 123, 54, 173, 199, 85, 87, 189, 172, 171, 58, 252, 119, 117, 66, - 189, 230, 249, 82, 30, 56, 252, 91, 112, 132, 14, 0, 4, 33, 231, 143, 67, 143, 22, 48, 3, 201, 159, 41, 239, 176, 64, 3, 254, 160, 13, 93, 35, 73, 34, 87, 46, 225, 119, 135, 223, 185, 49, 33, 39, 251, 4, 237, 156, 239, 236, 0, 31, 0, 255, 112, 30, 115, 128, 251, 253, 159, 255, 144, 112, 45, 87, 37, 84, 29, - 8, 5, 255, 9, 21, 255, 239, 255, 17, 52, 48, 28, 164, 144, 82, 30, 194, 176, 30, 191, 176, 31, 171, 37, 116, 208, 60, 180, 82, 79, 255, 37, 82, 255, 143, 100, 247, 84, 255, 175, 47, 255, 199, 67, 32, 131, 3, 60, 255, 212, 255, 0, 17, 19, 170, 32, 24, 86, 144, 24, 90, 176, 48, 3, 175, 28, 15, 179, 159, 31, - 9, 159, 255, 103, 130, 12, 3, 45, 69, 82, 41, 28, 3, 37, 247, 249, 29, 146, 249, 31, 135, 32, 3, 250, 87, 31, 4, 251, 159, 255, 45, 44, 44, 0, 0, 78, 181, 255, 37, 86, 0, 79, 63, 167, 246, 104, 187, 248, 105, 85, 79, 255, 227, 20, 15, 16, 72, 11, 159, 255, 83, 6, 39, 41, 30, 6, 61, 243, 70, 199, - 40, 191, 111, 255, 111, 223, 9, 53, 3, 36, 207, 85, 159, 47, 121, 240, 14, 107, 36, 47, 211, 6, 82, 31, 255, 10, 31, 255, 12, 47, 255, 38, 177, 239, 56, 239, 42, 41, 39, 39, 231, 160, 87, 235, 241, 111, 223, 66, 64, 159, 146, 7, 86, 59, 40, 251, 143, 94, 33, 72, 207, 253, 84, 227, 151, 255, 89, 163, 30, 33, - 0, 62, 29, 79, 255, 240, 242, 4, 159, 255, 252, 40, 91, 23, 239, 255, 25, 66, 231, 255, 3, 127, 87, 67, 33, 83, 0, 17, 191, 242, 222, 255, 251, 191, 21, 58, 16, 3, 253, 16, 7, 232, 219, 223, 17, 135, 19, 223, 37, 159, 56, 219, 160, 3, 142, 80, 128, 3, 49, 227, 34, 79, 127, 255, 224, 30, 7, 148, 240, 48, - 3, 47, 12, 95, 31, 45, 95, 128, 192, 15, 255, 39, 67, 33, 227, 8, 29, 251, 121, 251, 144, 3, 24, 220, 63, 255, 236, 254, 64, 239, 17, 212, 255, 254, 26, 47, 26, 152, 219, 255, 252, 42, 55, 248, 0, 29, 75, 228, 23, 40, 38, 251, 15, 255, 9, 161, 63, 255, 143, 75, 19, 16, 49, 45, 141, 42, 79, 121, 143, 129, - 224, 31, 192, 176, 90, 59, 112, 90, 75, 165, 80, 80, 3, 128, 15, 124, 13, 95, 156, 15, 31, 255, 47, 84, 31, 255, 95, 86, 103, 175, 88, 115, 255, 57, 157, 24, 228, 111, 32, 175, 255, 239, 29, 231, 159, 255, 16, 255, 254, 79, 255, 96, 255, 13, 255, 176, 26, 12, 203, 242, 253, 34, 199, 34, 203, 11, 27, 175, 47, 255, - 191, 239, 31, 95, 127, 2, 255, 250, 95, 12, 230, 255, 242, 63, 31, 114, 27, 105, 48, 63, 113, 139, 132, 112, 71, 75, 59, 63, 102, 179, 43, 0, 11, 25, 236, 35, 47, 117, 41, 59, 8, 255, 234, 10, 253, 1, 239, 146, 58, 221, 74, 246, 255, 80, 87, 255, 28, 16, 239, 10, 109, 2, 79, 25, 226, 239, 63, 255, 242, 27, - 247, 243, 0, 63, 253, 137, 211, 14, 161, 63, 39, 247, 41, 255, 1, 80, 3, 219, 189, 48, 174, 44, 47, 124, 127, 31, 124, 3, 223, 96, 75, 87, 85, 191, 255, 254, 43, 155, 225, 67, 11, 245, 8, 103, 3, 223, 39, 95, 251, 44, 79, 4, 43, 239, 188, 147, 249, 120, 155, 180, 239, 172, 91, 103, 119, 200, 193, 240, 154, 223, - 0, 252, 4, 138, 6, 84, 87, 105, 31, 201, 127, 251, 26, 223, 249, 27, 1, 154, 247, 27, 141, 29, 87, 55, 65, 232, 127, 249, 29, 81, 234, 208, 0, 63, 18, 214, 47, 28, 114, 31, 233, 191, 12, 37, 97, 45, 76, 48, 3, 29, 80, 17, 16, 15, 255, 255, 15, 255, 241, 249, 18, 0, 0, 174, 251, 51, 66, 30, 15, 96, - 85, 30, 19, 192, 28, 121, 242, 28, 67, 249, 95, 227, 36, 85, 77, 187, 11, 87, 3, 5, 31, 187, 2, 102, 78, 0, 194, 97, 0, 79, 243, 171, 75, 54, 99, 206, 125, 2, 78, 211, 83, 44, 215, 127, 75, 175, 11, 29, 179, 47, 190, 87, 117, 205, 16, 175, 59, 255, 95, 165, 166, 106, 39, 134, 79, 148, 32, 71, 7, 63, - 255, 32, 80, 99, 255, 31, 172, 20, 77, 175, 0, 39, 217, 255, 128, 96, 35, 0, 6, 207, 28, 79, 255, 39, 219, 21, 229, 0, 0, 52, 53, 63, 79, 159, 222, 118, 82, 175, 255, 169, 85, 85, 142, 31, 204, 212, 1, 255, 159, 232, 232, 45, 79, 209, 64, 57, 36, 49, 170, 239, 31, 176, 207, 13, 62, 4, 9, 79, 155, 3, - 99, 175, 84, 48, 192, 2, 16, 192, 127, 208, 192, 254, 91, 137, 45, 48, 130, 251, 41, 35, 38, 127, 16, 192, 29, 178, 24, 126, 251, 45, 114, 107, 159, 159, 4, 190, 145, 87, 239, 65, 115, 0, 5, 123, 47, 255, 19, 86, 119, 117, 173, 132, 233, 117, 212, 67, 70, 62, 255, 253, 134, 71, 255, 31, 108, 72, 23, 168, 247, 30, - 148, 253, 61, 206, 12, 96, 32, 15, 255, 9, 30, 39, 221, 255, 6, 87, 247, 7, 255, 249, 24, 3, 243, 251, 223, 9, 255, 243, 111, 16, 3, 13, 11, 234, 255, 243, 4, 29, 236, 239, 30, 206, 207, 17, 114, 209, 191, 251, 78, 239, 159, 21, 47, 24, 49, 30, 105, 255, 213, 160, 223, 61, 251, 80, 8, 3, 1, 96, 87, 255, - 63, 41, 25, 99, 47, 184, 207, 29, 201, 239, 56, 192, 33, 92, 80, 74, 58, 11, 111, 23, 136, 9, 11, 12, 28, 40, 96, 143, 26, 42, 162, 95, 24, 62, 63, 26, 142, 24, 174, 48, 15, 239, 30, 24, 138, 255, 40, 196, 30, 193, 128, 3, 0, 224, 3, 223, 24, 235, 255, 4, 255, 16, 1, 143, 255, 37, 175, 63, 79, 162, - 45, 72, 127, 255, 179, 255, 91, 113, 18, 72, 167, 25, 4, 49, 243, 226, 29, 191, 30, 199, 178, 255, 159, 162, 63, 89, 75, 207, 89, 79, 71, 247, 72, 19, 111, 58, 64, 168, 208, 87, 235, 64, 94, 167, 80, 88, 19, 48, 220, 0, 192, 5, 180, 1, 18, 96, 28, 255, 50, 129, 5, 144, 3, 41, 247, 159, 7, 160, 3, 30, - 221, 4, 255, 251, 1, 175, 237, 255, 251, 30, 31, 33, 159, 255, 57, 138, 250, 110, 31, 176, 249, 13, 19, 157, 1, 207, 223, 26, 194, 40, 58, 15, 26, 192, 251, 31, 59, 160, 170, 203, 38, 220, 15, 255, 13, 28, 17, 227, 48, 3, 41, 238, 11, 223, 245, 14, 252, 0, 31, 253, 153, 12, 31, 255, 16, 175, 255, 0, 23, 75, - 22, 130, 98, 40, 191, 159, 30, 109, 254, 83, 255, 144, 15, 159, 4, 83, 147, 27, 119, 238, 0, 0, 141, 239, 198, 216, 85, 105, 191, 159, 245, 37, 119, 100, 16, 214, 223, 0, 28, 41, 0, 136, 250, 81, 95, 15, 162, 1, 106, 139, 191, 80, 3, 8, 159, 0, 88, 255, 210, 221, 96, 15, 159, 34, 14, 39, 247, 43, 231, 78, - 15, 159, 3, 92, 144, 192, 125, 42, 79, 37, 122, 255, 91, 191, 95, 191, 173, 247, 75, 175, 213, 31, 203, 234, 97, 47, 175, 217, 118, 31, 203, 250, 2, 158, 42, 58, 91, 80, 84, 79, 56, 160, 3, 199, 191, 249, 0, 10, 49, 3, 28, 160, 43, 141, 215, 52, 82, 239, 255, 250, 29, 174, 255, 227, 4, 176, 239, 29, 121, 28, - 250, 90, 129, 15, 255, 255, 15, 255, 255, 223, 119, 107, 26, 115, 24, 239, 61, 59, 111, 29, 255, 255, 255, 211, 231, 10, 23, 66, 14, 28, 123, 47, 255, 87, 118, 114, 21, 35, 255, 253, 64, 44, 140, 35, 163, 32, 38, 92, 167, 6, 23, 99, 12, 5, 191, 11, 207, 218, 140, 221, 222, 79, 31, 255, 255, 48, 3, 20, 198, 0, - 35, 49, 24, 47, 102, 223, 30, 99, 19, 171, 67, 255, 255, 237, 221, 83, 166, 223, 32, 93, 95, 144, 157, 107, 207, 158, 4, 98, 73, 78, 247, 79, 93, 171, 94, 7, 9, 40, 7, 79, 255, 231, 44, 24, 180, 27, 131, 8, 20, 74, 5, 96, 219, 99, 47, 234, 198, 138, 201, 71, 79, 77, 221, 79, 107, 223, 255, 100, 48, 212, - 18, 52, 79, 75, 223, 94, 11, 159, 95, 251, 32, 111, 83, 72, 155, 128, 144, 159, 192, 139, 247, 47, 203, 0, 5, 125, 19, 179, 13, 255, 232, 0, 31, 30, 119, 95, 86, 29, 207, 175, 31, 6, 239, 29, 128, 255, 255, 165, 159, 213, 11, 239, 79, 187, 12, 92, 11, 9, 92, 23, 0, 209, 0, 49, 89, 95, 247, 80, 3, 41, - 148, 21, 15, 44, 83, 25, 2, 111, 15, 63, 6, 168, 73, 39, 124, 171, 110, 201, 169, 96, 30, 201, 240, 30, 34, 192, 31, 180, 40, 39, 112, 123, 48, 227, 15, 255, 250, 16, 30, 62, 251, 2, 89, 37, 223, 43, 47, 15, 23, 207, 87, 123, 95, 154, 55, 181, 176, 41, 223, 255, 181, 46, 249, 231, 36, 191, 176, 168, 107, 40, - 100, 45, 31, 115, 10, 15, 63, 12, 104, 98, 0, 3, 1, 130, 3, 96, 3, 129, 115, 0, 7, 4, 15, 255, 15, 34, 131, 14, 31, 217, 162, 15, 31, 40, 15, 30, 99, 34, 180, 34, 151, 8, 25, 33, 170, 3, 15, 223, 3, 1, 89, 87, 11, 31, 175, 111, 41, 227, 128, 191, 89, 235, 40, 150, 56, 15, 90, 65, 55, 220, - 17, 181, 66, 91, 202, 10, 255, 77, 171, 58, 247, 223, 95, 171, 63, 19, 33, 172, 10, 29, 151, 31, 22, 159, 127, 253, 56, 111, 27, 53, 168, 96, 23, 155, 176, 19, 72, 246, 46, 26, 31, 200, 22, 188, 42, 30, 253, 77, 139, 96, 135, 47, 208, 125, 255, 4, 171, 79, 107, 33, 127, 159, 0, 65, 219, 31, 25, 230, 159, 254, - 31, 72, 124, 31, 206, 31, 240, 96, 8, 255, 255, 128, 127, 23, 251, 192, 47, 255, 255, 241, 143, 255, 85, 31, 85, 6, 31, 89, 10, 23, 190, 13, 31, 201, 47, 95, 25, 81, 111, 27, 27, 191, 255, 254, 2, 255, 234, 191, 255, 40, 64, 127, 253, 87, 71, 244, 94, 11, 156, 176, 79, 183, 59, 124, 137, 135, 119, 41, 201, 25, - 163, 123, 51, 251, 0, 1, 51, 51, 179, 23, 223, 255, 175, 252, 30, 223, 245, 30, 227, 112, 255, 235, 113, 161, 0, 14, 62, 33, 3, 145, 239, 243, 119, 41, 2, 112, 3, 221, 43, 14, 156, 34, 41, 151, 63, 111, 155, 25, 239, 223, 249, 33, 188, 57, 175, 158, 250, 4, 103, 100, 207, 63, 23, 133, 72, 42, 195, 245, 92, 99, - 15, 162, 1, 13, 132, 167, 7, 255, 1, 80, 87, 127, 26, 86, 208, 45, 255, 252, 16, 0, 87, 71, 200, 165, 64, 2, 193, 17, 168, 47, 248, 191, 253, 255, 254, 125, 29, 23, 248, 223, 255, 255, 224, 19, 114, 48, 222, 0, 70, 201, 5, 111, 255, 223, 255, 18, 9, 158, 255, 19, 138, 37, 91, 247, 0, 3, 118, 191, 225, 71, - 43, 96, 225, 8, 21, 255, 15, 255, 254, 29, 230, 5, 207, 160, 112, 30, 56, 243, 0, 30, 31, 59, 46, 60, 115, 87, 51, 194, 103, 31, 138, 30, 248, 60, 243, 20, 126, 80, 79, 255, 249, 253, 226, 239, 255, 242, 31, 175, 187, 81, 209, 62, 92, 247, 4, 2, 1, 48, 0, 2, 175, 208, 30, 244, 165, 247, 60, 15, 5, 224, - 95, 127, 135, 7, 31, 146, 79, 250, 160, 0, 1, 239, 244, 31, 91, 253, 26, 217, 49, 56, 29, 31, 255, 190, 80, 85, 71, 46, 66, 27, 7, 255, 93, 30, 148, 251, 10, 233, 141, 1, 87, 116, 5, 46, 21, 5, 167, 120, 71, 243, 10, 87, 247, 160, 3, 0, 0, 146, 92, 31, 230, 243, 0, 3, 2, 2, 103, 99, 11, 236, - 48, 48, 99, 170, 239, 86, 111, 223, 70, 231, 127, 77, 179, 46, 47, 50, 162, 249, 31, 178, 192, 30, 75, 25, 19, 29, 232, 255, 17, 120, 82, 38, 116, 238, 31, 52, 69, 40, 68, 0, 95, 19, 1, 37, 155, 170, 127, 85, 75, 4, 190, 63, 114, 31, 150, 236, 63, 154, 181, 247, 31, 160, 208, 253, 25, 20, 40, 16, 104, 10, - 81, 22, 196, 11, 29, 252, 208, 95, 83, 3, 28, 106, 71, 235, 7, 165, 255, 72, 11, 143, 83, 27, 56, 33, 252, 29, 203, 251, 127, 126, 188, 64, 4, 203, 176, 0, 40, 207, 137, 16, 31, 236, 49, 67, 31, 252, 48, 90, 15, 96, 195, 160, 73, 87, 247, 240, 81, 211, 73, 227, 7, 208, 3, 40, 103, 5, 107, 48, 3, 247, - 191, 159, 30, 229, 27, 157, 64, 0, 175, 8, 26, 212, 4, 31, 238, 6, 246, 16, 0, 212, 12, 211, 47, 235, 48, 88, 91, 243, 72, 179, 51, 31, 158, 246, 71, 239, 14, 241, 15, 223, 255, 248, 9, 25, 211, 254, 1, 191, 254, 16, 0, 6, 227, 7, 94, 2, 175, 241, 23, 94, 251, 27, 75, 251, 0, 1, 250, 42, 1, 138, - 63, 33, 227, 9, 30, 195, 8, 52, 118, 237, 14, 187, 60, 236, 13, 221, 221, 15, 241, 10, 221, 221, 0, 31, 12, 97, 32, 89, 75, 239, 46, 31, 215, 3, 223, 90, 187, 127, 255, 48, 91, 27, 3, 252, 41, 230, 255, 250, 27, 65, 160, 207, 245, 103, 98, 0, 50, 175, 191, 246, 91, 175, 252, 13, 80, 3, 11, 30, 1, 81, - 235, 42, 3, 3, 253, 239, 188, 246, 247, 251, 102, 207, 253, 93, 28, 215, 107, 239, 169, 235, 249, 63, 224, 74, 83, 249, 8, 107, 20, 15, 255, 192, 15, 11, 12, 131, 12, 46, 87, 15, 255, 255, 11, 195, 24, 54, 15, 223, 10, 118, 32, 89, 10, 84, 47, 21, 79, 255, 23, 101, 75, 195, 192, 3, 119, 169, 81, 72, 127, 64, - 85, 55, 144, 0, 3, 1, 10, 214, 42, 20, 197, 119, 81, 7, 40, 27, 93, 243, 93, 175, 6, 85, 183, 0, 237, 0, 38, 118, 46, 51, 254, 80, 31, 27, 64, 122, 31, 31, 16, 255, 117, 140, 63, 163, 246, 11, 115, 77, 245, 3, 103, 98, 20, 15, 127, 10, 87, 7, 56, 19, 77, 62, 57, 211, 45, 251, 1, 255, 255, 179, - 7, 30, 60, 234, 12, 255, 242, 31, 78, 208, 31, 82, 224, 30, 59, 153, 96, 71, 255, 31, 27, 20, 157, 239, 73, 14, 13, 18, 26, 249, 255, 0, 2, 239, 255, 31, 66, 46, 95, 230, 115, 31, 108, 80, 0, 239, 40, 72, 31, 5, 239, 255, 219, 32, 255, 28, 191, 255, 255, 47, 39, 127, 255, 210, 16, 54, 39, 55, 111, 87, - 59, 26, 107, 2, 40, 109, 234, 0, 0, 112, 0, 3, 5, 80, 79, 220, 42, 79, 151, 21, 16, 55, 16, 192, 25, 62, 249, 31, 174, 248, 20, 23, 205, 87, 26, 107, 211, 31, 128, 177, 31, 132, 254, 255, 185, 238, 223, 255, 145, 42, 79, 91, 255, 254, 23, 82, 255, 210, 255, 255, 214, 64, 254, 148, 3, 68, 117, 79, 96, 13, - 35, 1, 78, 235, 39, 247, 158, 64, 143, 48, 3, 170, 123, 95, 171, 1, 63, 175, 247, 62, 195, 245, 112, 3, 233, 252, 119, 114, 58, 151, 253, 95, 204, 8, 95, 21, 111, 42, 79, 255, 41, 251, 13, 31, 234, 15, 31, 238, 14, 31, 242, 143, 11, 33, 25, 38, 93, 40, 5, 95, 253, 48, 5, 203, 31, 242, 24, 132, 30, 178, - 63, 31, 198, 159, 250, 90, 43, 72, 112, 75, 11, 255, 160, 95, 215, 192, 88, 11, 157, 224, 79, 235, 7, 34, 15, 255, 250, 32, 27, 210, 255, 22, 24, 170, 33, 59, 47, 71, 103, 188, 25, 159, 128, 31, 163, 151, 224, 57, 243, 34, 11, 117, 3, 243, 30, 175, 255, 211, 53, 31, 158, 66, 99, 0, 110, 44, 79, 71, 191, 228, - 78, 127, 159, 158, 252, 95, 255, 118, 32, 3, 51, 73, 175, 255, 80, 208, 3, 251, 80, 11, 24, 241, 60, 79, 175, 84, 41, 71, 239, 231, 159, 32, 28, 67, 236, 34, 98, 26, 200, 250, 255, 255, 253, 80, 103, 212, 180, 192, 82, 95, 41, 9, 33, 10, 31, 255, 191, 31, 255, 159, 91, 35, 179, 115, 255, 159, 16, 89, 127, 31, - 96, 255, 128, 0, 0, 33, 50, 15, 103, 31, 41, 231, 0, 175, 44, 251, 154, 111, 12, 31, 255, 167, 31, 63, 222, 235, 26, 97, 58, 99, 253, 72, 4, 239, 119, 64, 12, 29, 136, 95, 252, 134, 106, 74, 138, 20, 240, 65, 231, 48, 7, 224, 82, 3, 96, 66, 127, 151, 210, 15, 243, 255, 15, 255, 131, 2, 15, 255, 10, 123, - 239, 254, 186, 182, 15, 255, 78, 5, 121, 146, 31, 109, 243, 30, 125, 146, 243, 30, 125, 160, 3, 245, 0, 155, 11, 14, 125, 24, 87, 28, 169, 87, 26, 169, 143, 28, 157, 159, 31, 189, 29, 255, 225, 63, 48, 19, 1, 65, 55, 152, 118, 0, 3, 255, 253, 74, 30, 179, 253, 29, 54, 96, 3, 252, 29, 66, 251, 15, 255, 76, - 218, 19, 53, 15, 255, 10, 17, 103, 8, 95, 12, 4, 9, 64, 15, 221, 1, 51, 15, 223, 10, 81, 5, 118, 15, 26, 47, 8, 242, 255, 247, 207, 7, 31, 230, 80, 3, 248, 16, 11, 202, 64, 6, 31, 232, 33, 58, 5, 63, 251, 194, 40, 219, 117, 43, 71, 112, 86, 223, 24, 8, 47, 22, 85, 14, 85, 22, 89, 13, 22, - 93, 15, 6, 97, 17, 79, 22, 149, 95, 43, 30, 157, 64, 3, 192, 31, 22, 176, 112, 3, 143, 255, 37, 9, 194, 46, 47, 42, 251, 31, 154, 96, 3, 249, 48, 3, 8, 21, 62, 84, 64, 3, 15, 255, 47, 191, 86, 91, 159, 94, 7, 143, 41, 95, 219, 47, 223, 95, 40, 189, 113, 31, 255, 61, 162, 251, 167, 87, 39, 41, - 143, 48, 240, 96, 3, 207, 255, 251, 175, 16, 31, 193, 192, 31, 197, 243, 247, 127, 255, 254, 246, 160, 11, 255, 247, 112, 9, 80, 3, 138, 10, 24, 56, 31, 1, 64, 3, 9, 87, 255, 8, 90, 87, 125, 42, 91, 6, 255, 247, 223, 255, 109, 254, 255, 242, 255, 230, 92, 255, 31, 235, 41, 57, 223, 30, 79, 216, 239, 251, 79, - 250, 0, 225, 94, 99, 104, 115, 96, 3, 171, 254, 6, 125, 19, 249, 49, 231, 4, 31, 135, 3, 255, 151, 218, 13, 95, 2, 33, 231, 224, 58, 16, 13, 221, 208, 79, 15, 255, 31, 159, 25, 194, 64, 3, 128, 0, 157, 239, 142, 112, 14, 162, 63, 17, 75, 112, 3, 10, 221, 247, 15, 2, 64, 85, 42, 147, 95, 108, 155, 221, - 239, 194, 176, 82, 212, 208, 95, 48, 3, 109, 254, 139, 112, 11, 255, 245, 96, 110, 21, 92, 80, 13, 16, 3, 12, 221, 225, 15, 255, 8, 138, 3, 80, 3, 207, 255, 33, 227, 251, 26, 216, 252, 26, 220, 233, 219, 0, 3, 240, 127, 253, 90, 107, 42, 115, 218, 11, 14, 232, 255, 15, 249, 255, 15, 255, 60, 6, 125, 46, 18, - 6, 222, 11, 0, 54, 117, 6, 222, 46, 2, 85, 113, 15, 224, 11, 21, 15, 160, 76, 20, 210, 103, 118, 8, 227, 30, 5, 39, 146, 31, 255, 10, 76, 3, 202, 7, 191, 140, 199, 31, 50, 233, 31, 54, 248, 31, 58, 11, 22, 53, 31, 162, 39, 147, 9, 67, 49, 93, 77, 247, 127, 255, 133, 255, 31, 110, 38, 154, 31, 170, - 37, 238, 192, 95, 255, 64, 94, 31, 255, 244, 31, 170, 254, 16, 3, 239, 30, 109, 146, 79, 30, 97, 103, 255, 31, 46, 101, 7, 62, 15, 61, 31, 243, 170, 255, 48, 3, 159, 25, 147, 159, 30, 153, 159, 30, 181, 234, 159, 255, 80, 31, 230, 49, 29, 147, 48, 39, 27, 117, 39, 67, 48, 6, 255, 87, 95, 79, 79, 207, 0, - 170, 207, 191, 66, 48, 95, 167, 112, 95, 175, 64, 69, 255, 85, 106, 180, 247, 30, 99, 254, 31, 174, 255, 160, 3, 6, 95, 29, 160, 127, 29, 152, 255, 255, 241, 0, 255, 244, 249, 32, 0, 254, 29, 171, 243, 13, 243, 16, 175, 185, 162, 59, 71, 143, 95, 80, 143, 47, 35, 40, 19, 26, 47, 255, 175, 20, 31, 155, 247, 46, - 193, 254, 185, 207, 255, 191, 64, 31, 183, 132, 16, 8, 190, 255, 253, 178, 147, 41, 47, 211, 139, 41, 56, 80, 183, 112, 94, 103, 140, 64, 159, 255, 78, 203, 103, 247, 5, 207, 38, 108, 94, 99, 151, 127, 96, 3, 31, 251, 32, 31, 255, 48, 255, 199, 201, 119, 16, 46, 95, 63, 239, 112, 142, 111, 13, 226, 46, 12, 235, 255, - 250, 16, 31, 62, 255, 31, 167, 255, 0, 207, 6, 239, 38, 135, 191, 255, 3, 207, 255, 160, 14, 48, 127, 18, 120, 31, 62, 15, 255, 32, 127, 255, 127, 31, 130, 170, 239, 30, 201, 255, 26, 7, 151, 26, 11, 112, 48, 3, 191, 79, 25, 251, 63, 255, 144, 166, 108, 255, 175, 254, 31, 255, 246, 31, 255, 144, 190, 254, 164, 87, - 9, 255, 36, 5, 19, 21, 5, 28, 87, 5, 254, 214, 101, 14, 242, 68, 9, 253, 105, 143, 27, 147, 87, 191, 226, 3, 243, 191, 255, 221, 222, 63, 142, 42, 3, 177, 119, 208, 117, 65, 191, 255, 96, 82, 179, 8, 96, 10, 95, 235, 35, 243, 186, 1, 239, 178, 255, 230, 120, 27, 131, 253, 43, 127, 124, 19, 13, 255, 48, 4, - 119, 64, 15, 213, 156, 17, 227, 231, 0, 3, 17, 15, 255, 255, 9, 170, 146, 5, 153, 147, 106, 15, 118, 12, 153, 184, 15, 194, 45, 37, 7, 31, 12, 5, 14, 222, 46, 218, 2, 82, 15, 255, 42, 4, 65, 11, 80, 208, 10, 23, 62, 146, 11, 23, 27, 47, 206, 14, 93, 230, 96, 3, 14, 23, 51, 149, 3, 20, 123, 32, - 3, 1, 48, 3, 254, 30, 35, 255, 42, 30, 43, 71, 98, 30, 8, 127, 18, 191, 23, 231, 175, 29, 251, 229, 111, 255, 160, 29, 66, 32, 92, 240, 22, 116, 243, 95, 31, 163, 247, 30, 112, 250, 0, 15, 254, 179, 85, 24, 83, 242, 31, 94, 192, 24, 100, 96, 32, 91, 10, 37, 32, 22, 23, 214, 111, 29, 89, 13, 255, 21, - 248, 63, 251, 5, 67, 29, 42, 2, 29, 42, 79, 34, 95, 183, 95, 255, 58, 134, 87, 47, 186, 80, 16, 22, 112, 24, 231, 160, 8, 255, 255, 255, 208, 62, 255, 255, 242, 12, 255, 174, 229, 24, 239, 244, 30, 230, 242, 0, 47, 30, 234, 73, 40, 222, 127, 30, 178, 32, 182, 255, 253, 205, 13, 96, 192, 11, 237, 255, 252, 120, - 135, 255, 206, 253, 239, 255, 223, 63, 26, 99, 42, 103, 254, 223, 255, 16, 145, 121, 165, 153, 10, 111, 33, 239, 81, 135, 41, 211, 8, 47, 31, 55, 20, 192, 29, 26, 95, 33, 177, 243, 72, 211, 97, 15, 192, 31, 42, 39, 168, 31, 31, 163, 10, 39, 155, 223, 91, 67, 144, 125, 27, 37, 175, 251, 23, 57, 242, 24, 128, 80, - 10, 255, 97, 4, 208, 127, 31, 92, 75, 79, 26, 201, 42, 27, 96, 15, 67, 255, 15, 255, 255, 122, 15, 255, 187, 67, 87, 68, 72, 31, 255, 160, 31, 255, 191, 47, 61, 78, 0, 9, 1, 5, 7, 0, 255, 5, 5, 0, 20, 20, 0, 18, 18, 124, 32, 2, 19, 19, 0, 15, 15, 32, 2, 16, 8, 127, 16, 17, 6, 6, - 0, 17, 17, 0, 14, 240, 14, 0, 23, 23, 80, 29, 16, 38, 16, 44, 112, 38, 102, 64, 53, 24, 24, 32, 38, 16, 59, 13, 13, 32, 44, 12, 16, 65, 16, 8, 16, 71, 16, 56, 11, 11, 32, 62, 16, 65, 6, 16, 74, 64, 104, 112, 35, 16, 26, 16, 47, 10, 10, 80, 32, 253, 19, 19, 67, 77, 65, 80, 31, 255, - 196, 246, 0, 33, 0, 119, 75, 29, 81, 204, 22, 140, 30, 0, 0, 5, 21, 253, 0, 0, 17, 0, 3, 0, 4, 31, 105, 234, 6, 0, 7, 31, 107, 9, 31, 107, 11, 30, 255, 219, 12, 0, 16, 167, 0, 15, 29, 148, 17, 0, 127, 16, 243, 0, 20, 0, 21, 0, 22, 0, 249, 23, 0, 24, 0, 25, 29, 234, 128, 97, - 27, 125, 31, 43, 28, 0, 29, 0, 30, 27, 179, 32, 125, 16, 149, 34, 0, 35, 0, 36, 48, 123, 37, 255, 0, 38, 0, 39, 0, 40, 0, 41, 127, 31, 77, 42, 0, 43, 0, 44, 0, 45, 202, 0, 46, 33, 85, 80, 195, 28, 62, 59, 2, 95, 255, 160, 1, 63, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 4, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 4, 224, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 3, 192, 64, 3, 112, 1, 1, 64, 27, 0, 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, - 79, 79, 84, 32, 27, 110, 142, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 15, 109, 64, 79, 2, 128, 64, 81, 226, 226, 16, 19, 27, 90, 80, 15, 160, 64, 26, 207, 45, 16, 39, 41, 16, 127, 190, 32, 96, 19, 255, 255, 0, 46, 2, 128, 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, - 3, 10, 46, 0, 46, 46, 0, 117, 115, 255, 115, 112, 97, 110, 105, 115, 104, 0, 255, 109, 101, 115, 115, 97, 103, 101, 46, 239, 98, 109, 103, 96, 11, 105, 100, 46, 116, 255, 98, 108, 0, 115, 116, 114, 117, 99, 158, 116, 48, 10, 160, 199, 77, 69, 83, 71, 16, 44, 183, 49, 80, 187, 2, 2, 208, 228, 73, 78, 70, 126, - 16, 27, 0, 96, 0, 6, 0, 12, 49, 62, 42, 113, 56, 48, 159, 2, 144, 11, 90, 144, 23, 178, 128, 35, 211, 1, 146, 144, 11, 184, 144, 59, 49, 130, 68, 65, 223, 84, 49, 80, 70, 26, 6, 1, 0, 3, 255, 0, 73, 0, 110, 0, 115, 0, 101, 253, 0, 114, 0, 116, 0, 97, 17, 179, 101, 221, 0, 108, 17, 185, - 100, 0, 105, 16, 21, 99, 215, 0, 111, 48, 11, 101, 17, 203, 10, 0, 83, 255, 0, 85, 0, 80, 0, 69, 0, 82, 119, 17, 217, 77, 0, 65, 16, 7, 73, 0, 79, 87, 17, 229, 71, 16, 11, 76, 16, 15, 88, 0, 89, 39, 17, 30, 0, 87, 78, 78, 48, 147, 32, 177, 32, 0, 112, 200, 0, 117, 16, 185, 64, 159, - 108, 16, 195, 32, 197, 0, 193, 0, 164, 46, 16, 187, 67, 16, 201, 32, 231, 117, 16, 221, 160, 231, 170, 77, 16, 243, 110, 16, 69, 97, 80, 245, 101, 16, 231, 149, 79, 16, 87, 33, 15, 97, 16, 255, 105, 48, 55, 101, 42, 17, 33, 97, 7, 108, 49, 37, 99, 80, 79, 111, 80, 15, 169, 87, 17, 47, 105, 17, 35, 112, - 17, 67, 32, 57, 32, 83, 17, 57, 98, 17, 81, 101, 48, 61, 32, 149, 109, 0, 170, 225, 48, 69, 105, 17, 111, 102, 17, 87, 114, 16, 17, 71, 64, 97, 243, 17, 129, 33, 55, 1, 95, 18, 0, 0, 161, 196, 0, 86, 48, 245, 64, 135, 64, 183, 102, 17, 173, 64, 79, 170, 109, 48, 113, 116, 17, 183, 33, 2, 201, 7, - 6, 82, 71, 190, 40, 19, 163, 8, 33, 157, 67, 98, 50, 251, 254, 4, 0, 6, 4, 56, 56, 178, 83, 7, 165, 0, 211, 175, 8, 82, 123, 35, 51, 3, 19, 219, 24, 95, 19, 223, 4, 147, 199, 43, 67, 79, 77, 77, 255, 69, 78, 84, 0, 68, 73, 83, 67, 235, 95, 48, 49, 80, 7, 50, 80, 15, 51, 0, 255, 84, - 73, 84, 76, 69, 95, 77, 65, 223, 73, 78, 80, 10, 83, 85, 66, 0, 64, 47, 0, 0, 0, 144, 111, 112, 36, 67, 174, 55, 113, 97, 123, 96, 147, 28, 19, 62, 141, 80, 171, 0, 190, 231, 198, 20, 162, 51, 179, 16, 153, 100, 67, 164, 191, 76, 51, 191, 12, 0, 0, 19, 54, 175, 157, 66, 51, 203, 19, 221, 137, 230, - 39, 67, 215, 20, 252, 0, 0, 251, 104, 17, 53, 51, 227, 16, 185, 245, 23, 177, 123, 254, 51, 239, 28, 116, 149, 4, 85, 81, 23, 7, 80, 235, 9, 20, 191, 10, 20, 195, 11, 0, 224, 162, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 82, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, - 67, 0, 0, 82, 224, 245, 0, 0, 0, 32, 16, 3, 192, 16, 11, 0, 42, 64, 3, 112, 2, 1, 80, 27, 3, 16, 35, 64, 80, 3, 231, 128, 0, 3, 32, 22, 16, 57, 79, 79, 84, 115, 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, 67, 212, 246, 17, 0, 0, 18, 64, 80, 81, 232, 32, 88, 250, 255, 255, 0, 46, - 2, 128, 97, 16, 80, 19, 177, 184, 16, 19, 2, 255, 16, 0, 96, 19, 32, 132, 46, 255, 0, 46, 46, 0, 101, 109, 98, 101, 255, 100, 100, 101, 100, 102, 111, 110, 116, 255, 0, 109, 101, 115, 115, 97, 103, 101, 126, 32, 11, 50, 54, 46, 98, 114, 102, 16, 19, 127, 0, 0, 8, 82, 70, 78, 84, 254, 255, 1, 191, 4, - 48, 123, 16, 0, 5, 70, 73, 78, 182, 70, 32, 235, 1, 33, 16, 241, 27, 27, 32, 219, 251, 56, 0, 0, 80, 104, 16, 155, 8, 33, 254, 27, 26, 0, 84, 71, 76, 80, 16, 15, 255, 48, 24, 26, 20, 24, 0, 0, 8, 229, 0, 0, 10, 32, 221, 17, 3, 128, 49, 31, 96, 190, 0, 0, 0, 106, 127, 255, 176, 0, - 111, 16, 3, 233, 95, 255, 160, 16, 3, 144, 48, 3, 0, 0, 183, 2, 254, 118, 0, 0, 159, 255, 0, 11, 18, 29, 255, 143, 255, 255, 4, 255, 255, 223, 13, 233, 255, 252, 11, 162, 36, 228, 34, 59, 18, 165, 255, 107, 18, 165, 255, 244, 18, 71, 251, 226, 113, 4, 190, 233, 0, 0, 6, 18, 63, 2, 34, 67, 34, 71, - 35, 125, 98, 200, 19, 86, 119, 117, 255, 144, 0, 202, 233, 118, 84, 69, 160, 63, 65, 34, 151, 18, 157, 255, 221, 255, 209, 18, 159, 250, 0, 141, 18, 164, 9, 215, 255, 253, 1, 94, 112, 63, 17, 231, 63, 255, 112, 93, 48, 3, 47, 16, 7, 31, 255, 96, 16, 3, 80, 113, 48, 3, 13, 221, 64, 1, 255, 149, 36, 67, - 19, 76, 0, 171, 14, 20, 103, 111, 20, 107, 207, 65, 163, 7, 255, 235, 127, 255, 243, 17, 234, 144, 20, 19, 16, 0, 213, 255, 248, 20, 27, 241, 20, 31, 160, 20, 35, 150, 221, 121, 189, 65, 175, 16, 0, 239, 16, 254, 175, 119, 17, 244, 95, 255, 240, 17, 2, 244, 0, 14, 254, 255, 251, 128, 239, 255, 255, 224, 20, 43, - 131, 240, 34, 56, 84, 163, 96, 3, 180, 134, 18, 35, 4, 255, 255, 253, 22, 223, 255, 253, 175, 255, 255, 191, 253, 18, 88, 253, 111, 255, 255, 254, 41, 55, 16, 91, 52, 135, 0, 207, 18, 72, 255, 254, 80, 254, 0, 254, 129, 0, 0, 234, 97, 36, 155, 189, 128, 20, 159, 249, 0, 24, 255, 18, 105, 223, 58, 17, 103, 3, - 96, 114, 7, 203, 16, 51, 251, 223, 17, 0, 253, 175, 255, 208, 0, 9, 238, 1, 247, 57, 4, 254, 32, 0, 3, 239, 243, 0, 13, 19, 77, 170, 14, 18, 240, 6, 33, 133, 39, 0, 247, 57, 12, 21, 207, 182, 31, 21, 211, 95, 255, 51, 223, 0, 158, 37, 223, 171, 37, 102, 96, 250, 21, 240, 244, 33, 200, 119, 83, 199, - 16, 176, 54, 88, 70, 136, 113, 191, 255, 255, 241, 255, 220, 255, 255, 80, 1, 255, 255, 48, 94, 22, 56, 80, 17, 147, 112, 0, 50, 17, 5, 134, 23, 190, 239, 22, 77, 223, 255, 54, 140, 223, 22, 88, 93, 32, 3, 207, 22, 96, 121, 135, 100, 112, 98, 42, 31, 16, 87, 18, 24, 22, 147, 226, 0, 255, 250, 16, 227, 0, - 183, 32, 5, 81, 184, 0, 201, 255, 7, 188, 80, 59, 0, 126, 22, 53, 0, 0, 191, 255, 0, 10, 24, 229, 186, 95, 134, 64, 20, 119, 100, 34, 203, 251, 102, 131, 236, 251, 134, 140, 18, 208, 0, 60, 169, 104, 16, 15, 201, 0, 250, 41, 31, 25, 17, 246, 73, 140, 169, 134, 53, 213, 0, 74, 18, 205, 127, 25, 61, 63, - 25, 65, 15, 253, 235, 152, 0, 2, 63, 255, 105, 168, 119, 215, 117, 64, 35, 43, 198, 102, 227, 99, 53, 141, 81, 37, 28, 94, 233, 147, 230, 41, 127, 24, 53, 53, 107, 255, 116, 147, 105, 1, 51, 85, 22, 240, 255, 21, 146, 64, 3, 243, 5, 207, 234, 0, 22, 112, 106, 8, 103, 121, 223, 155, 188, 167, 63, 151, 118, 85, - 51, 210, 85, 154, 37, 96, 83, 187, 144, 80, 3, 16, 250, 12, 35, 198, 69, 0, 21, 197, 68, 3, 36, 7, 105, 152, 26, 115, 189, 221, 106, 104, 86, 119, 137, 154, 167, 159, 119, 232, 101, 84, 51, 166, 221, 187, 25, 149, 23, 5, 64, 187, 75, 24, 245, 33, 9, 136, 16, 40, 59, 127, 152, 27, 103, 0, 243, 58, 255, 255, - 9, 84, 3, 23, 227, 101, 255, 174, 252, 128, 165, 117, 17, 140, 255, 254, 112, 26, 155, 188, 208, 26, 159, 64, 0, 106, 235, 86, 89, 9, 240, 14, 242, 223, 255, 209, 3, 16, 48, 40, 43, 12, 22, 192, 250, 14, 255, 245, 0, 15, 48, 3, 247, 20, 249, 37, 8, 63, 16, 4, 110, 16, 63, 85, 63, 96, 3, 15, 144, 3, - 14, 84, 39, 46, 3, 23, 50, 0, 32, 3, 243, 144, 3, 25, 30, 196, 6, 245, 23, 107, 39, 91, 38, 50, 111, 23, 59, 39, 63, 160, 143, 22, 62, 223, 55, 111, 18, 47, 56, 222, 37, 147, 21, 37, 42, 27, 121, 25, 58, 254, 24, 244, 250, 21, 178, 247, 22, 15, 111, 32, 200, 243, 208, 28, 24, 181, 87, 120, 152, 128, - 255, 85, 63, 37, 71, 17, 154, 5, 128, 24, 21, 130, 33, 37, 80, 3, 105, 23, 247, 0, 191, 144, 3, 159, 39, 97, 48, 3, 237, 194, 221, 221, 121, 159, 32, 11, 81, 231, 108, 136, 211, 144, 223, 130, 211, 200, 90, 56, 71, 17, 238, 49, 15, 129, 31, 13, 28, 71, 62, 18, 208, 22, 84, 255, 16, 91, 205, 249, 27, 60, - 189, 244, 27, 60, 243, 0, 93, 203, 26, 58, 0, 157, 247, 28, 240, 57, 221, 1, 18, 48, 24, 75, 242, 95, 28, 119, 243, 28, 123, 245, 169, 207, 255, 145, 57, 24, 108, 38, 103, 80, 5, 255, 34, 113, 11, 241, 12, 8, 229, 255, 255, 177, 22, 155, 67, 151, 6, 44, 187, 41, 189, 239, 210, 57, 22, 184, 120, 173, 170, 122, - 254, 232, 87, 119, 100, 124, 223, 197, 80, 135, 18, 114, 50, 223, 169, 146, 253, 68, 13, 80, 203, 13, 80, 227, 32, 231, 5, 191, 119, 109, 160, 245, 0, 43, 255, 251, 157, 60, 122, 217, 20, 95, 216, 32, 101, 48, 152, 255, 43, 39, 162, 128, 64, 239, 48, 13, 160, 2, 17, 227, 25, 80, 252, 52, 175, 117, 18, 200, 0, 0, - 77, 45, 127, 54, 171, 84, 85, 222, 87, 172, 171, 58, 252, 119, 117, 66, 126, 31, 170, 133, 30, 56, 249, 30, 60, 252, 91, 112, 132, 14, 4, 0, 170, 159, 80, 3, 143, 83, 143, 127, 185, 159, 144, 89, 239, 181, 176, 64, 3, 254, 160, 8, 191, 31, 255, 82, 87, 46, 105, 3, 177, 2, 255, 177, 46, 111, 185, 49, 33, 39, - 251, 4, 234, 156, 239, 236, 174, 220, 78, 17, 227, 255, 64, 3, 253, 128, 253, 159, 255, 144, 112, 45, 87, 37, 142, 84, 8, 5, 255, 9, 21, 255, 239, 255, 17, 52, 48, 28, 164, 169, 144, 30, 194, 176, 30, 191, 176, 31, 171, 37, 116, 208, 85, 159, 255, 37, 86, 143, 143, 147, 19, 159, 111, 255, 67, 143, 32, 131, 3, 60, - 255, 212, 255, 0, 17, 19, 32, 85, 24, 86, 144, 24, 90, 176, 48, 3, 175, 28, 15, 159, 156, 255, 200, 34, 15, 255, 42, 3, 69, 82, 28, 3, 37, 247, 165, 249, 27, 178, 249, 31, 135, 32, 3, 250, 223, 255, 45, 55, 22, 110, 21, 207, 78, 255, 29, 85, 255, 0, 79, 149, 255, 120, 127, 40, 187, 248, 99, 111, 227, 20, - 15, 16, 38, 72, 11, 159, 255, 83, 22, 170, 31, 155, 8, 255, 76, 19, 37, 38, 199, 136, 191, 16, 101, 3, 31, 240, 251, 85, 159, 244, 84, 14, 107, 40, 4, 31, 255, 6, 31, 255, 10, 111, 255, 38, 177, 138, 239, 29, 210, 54, 247, 31, 78, 255, 30, 100, 255, 177, 158, 210, 0, 66, 64, 159, 7, 86, 59, 40, 251, 143, - 176, 159, 163, 253, 84, 227, 255, 89, 163, 57, 62, 46, 148, 79, 255, 249, 240, 4, 159, 255, 252, 40, 91, 22, 15, 255, 113, 25, 66, 255, 3, 127, 87, 67, 24, 244, 18, 28, 191, 242, 222, 255, 251, 191, 21, 58, 16, 3, 253, 16, 7, 228, 219, 223, 17, 87, 19, 57, 139, 128, 88, 219, 160, 3, 39, 87, 23, 29, 50, 208, - 48, 3, 34, 79, 127, 255, 224, 73, 30, 7, 240, 48, 3, 47, 12, 95, 47, 45, 15, 255, 45, 9, 33, 31, 33, 32, 3, 8, 29, 251, 121, 251, 128, 3, 31, 156, 246, 251, 63, 255, 254, 64, 239, 17, 212, 255, 254, 53, 17, 63, 26, 152, 255, 252, 33, 71, 248, 31, 59, 255, 168, 228, 15, 255, 16, 111, 81, 71, 191, 63, - 109, 45, 141, 79, 121, 42, 79, 129, 47, 192, 224, 31, 196, 176, 90, 59, 112, 90, 75, 132, 80, 80, 3, 14, 96, 18, 38, 197, 31, 255, 47, 33, 141, 86, 103, 139, 175, 88, 115, 46, 62, 31, 231, 244, 48, 175, 255, 239, 127, 29, 231, 159, 255, 16, 255, 79, 255, 96, 244, 255, 13, 255, 176, 26, 12, 242, 62, 33, 34, 203, - 187, 11, 27, 175, 47, 255, 239, 31, 95, 127, 2, 254, 255, 250, 95, 12, 255, 242, 63, 31, 114, 145, 63, 43, 164, 120, 163, 112, 81, 171, 150, 179, 51, 51, 11, 93, 48, 3, 249, 57, 59, 8, 255, 234, 218, 253, 223, 33, 89, 3, 98, 58, 221, 182, 255, 104, 255, 39, 255, 28, 16, 239, 42, 231, 164, 33, 227, 79, 25, 230, - 63, 16, 171, 63, 24, 190, 233, 63, 253, 211, 14, 161, 59, 3, 87, 247, 41, 255, 1, 45, 80, 3, 155, 189, 23, 31, 159, 48, 44, 47, 124, 127, 114, 31, 124, 3, 223, 96, 75, 87, 127, 255, 161, 31, 255, 168, 254, 43, 155, 225, 64, 191, 245, 248, 103, 79, 129, 79, 251, 83, 44, 79, 4, 42, 15, 3, 111, 255, 47, 239, - 249, 120, 217, 155, 239, 172, 91, 103, 119, 136, 193, 45, 19, 240, 17, 154, 223, 0, 252, 0, 36, 83, 6, 84, 87, 105, 31, 139, 185, 253, 84, 20, 167, 251, 26, 223, 249, 27, 10, 247, 25, 173, 29, 87, 221, 55, 65, 168, 127, 255, 48, 63, 20, 241, 63, 84, 27, 246, 63, 18, 214, 47, 28, 114, 31, 171, 249, 37, 193, 76, - 48, 3, 240, 80, 3, 27, 112, 17, 16, 15, 255, 255, 15, 255, 241, 249, 18, 0, 0, 174, 251, 51, 66, 30, 15, 96, 85, 30, 19, 192, 23, 34, 242, 159, 223, 36, 77, 187, 11, 86, 87, 3, 5, 31, 187, 2, 127, 191, 97, 0, 79, 243, 85, 171, 75, 255, 15, 68, 0, 2, 78, 211, 9, 31, 247, 127, 60, 91, 175, 95, - 190, 87, 117, 16, 175, 59, 255, 95, 165, 210, 166, 106, 39, 134, 79, 238, 107, 32, 99, 255, 31, 172, 28, 36, 249, 21, 249, 191, 160, 0, 6, 207, 79, 255, 39, 219, 119, 21, 229, 0, 0, 52, 127, 255, 86, 119, 118, 190, 82, 175, 255, 169, 85, 85, 142, 255, 71, 107, 82, 127, 233, 232, 44, 199, 209, 64, 57, 36, 49, 239, - 13, 62, 8, 165, 9, 79, 155, 3, 120, 63, 32, 192, 2, 16, 192, 127, 33, 208, 192, 168, 31, 251, 41, 35, 38, 127, 16, 192, 33, 90, 79, 41, 208, 192, 31, 227, 190, 145, 87, 239, 65, 115, 79, 255, 19, 239, 86, 119, 117, 173, 132, 233, 117, 67, 70, 37, 175, 158, 45, 50, 255, 29, 140, 72, 23, 247, 31, 21, 253, 22, - 77, 206, 15, 255, 13, 30, 35, 249, 30, 39, 255, 6, 87, 247, 239, 7, 255, 249, 24, 3, 243, 223, 9, 255, 213, 243, 111, 16, 3, 13, 88, 42, 239, 30, 206, 207, 104, 22, 108, 191, 251, 78, 243, 159, 21, 47, 24, 49, 31, 154, 165, 48, 93, 251, 80, 8, 3, 1, 39, 8, 11, 31, 147, 63, 41, 23, 117, 47, 184, 207, - 29, 201, 239, 56, 192, 33, 92, 80, 69, 42, 11, 32, 72, 231, 9, 11, 7, 37, 185, 223, 30, 0, 143, 82, 26, 42, 95, 24, 62, 63, 72, 174, 48, 15, 239, 46, 24, 82, 57, 147, 1, 144, 3, 0, 176, 3, 56, 231, 16, 29, 100, 252, 16, 1, 143, 255, 37, 175, 79, 162, 45, 72, 252, 127, 255, 179, 255, 91, 113, 24, - 3, 41, 75, 165, 48, 65, 243, 226, 29, 191, 30, 199, 178, 191, 255, 11, 82, 89, 231, 143, 87, 255, 239, 87, 255, 38, 23, 191, 40, 82, 85, 50, 247, 208, 86, 11, 64, 94, 167, 80, 88, 19, 6, 82, 0, 192, 9, 1, 66, 96, 5, 208, 3, 41, 247, 7, 96, 3, 63, 33, 227, 30, 221, 4, 255, 251, 1, 175, 255, 218, - 251, 30, 31, 33, 159, 255, 57, 138, 250, 31, 176, 244, 249, 13, 255, 12, 24, 246, 223, 24, 212, 58, 15, 83, 26, 192, 251, 31, 59, 160, 154, 203, 15, 255, 14, 11, 255, 199, 243, 4, 16, 3, 32, 7, 57, 238, 11, 223, 245, 115, 206, 127, 255, 160, 223, 16, 113, 16, 103, 255, 255, 100, 16, 175, 255, 0, 23, 75, 22, 130, - 98, 183, 255, 30, 109, 168, 254, 83, 255, 144, 9, 62, 0, 248, 31, 159, 83, 147, 27, 119, 239, 0, 0, 141, 223, 198, 28, 216, 85, 105, 116, 191, 159, 37, 119, 100, 120, 128, 255, 42, 243, 31, 160, 74, 44, 41, 250, 81, 95, 223, 162, 223, 144, 3, 191, 80, 3, 51, 8, 159, 0, 88, 255, 221, 96, 15, 159, 30, 41, 255, - 14, 255, 69, 95, 167, 78, 239, 221, 60, 51, 144, 192, 125, 31, 168, 0, 236, 37, 122, 255, 91, 191, 0, 28, 18, 129, 35, 143, 90, 59, 175, 213, 31, 207, 234, 97, 41, 212, 217, 31, 203, 228, 250, 2, 158, 27, 15, 65, 235, 9, 208, 3, 135, 191, 232, 249, 1, 207, 28, 209, 10, 49, 3, 28, 160, 28, 225, 225, 0, 52, - 82, 153, 127, 24, 188, 18, 12, 29, 174, 255, 236, 227, 4, 239, 29, 121, 28, 250, 90, 129, 15, 255, 255, 102, 15, 255, 101, 91, 80, 9, 109, 149, 26, 115, 24, 239, 61, 59, 188, 111, 29, 255, 255, 255, 231, 10, 39, 66, 95, 255, 221, 87, 118, 21, 35, 255, 253, 64, 30, 34, 244, 83, 35, 163, 32, 38, 92, 6, 144, 32, - 15, 200, 18, 140, 221, 167, 222, 31, 255, 255, 48, 3, 20, 198, 0, 35, 49, 183, 24, 143, 255, 17, 19, 171, 67, 255, 255, 237, 169, 221, 166, 223, 32, 93, 95, 144, 157, 107, 215, 59, 98, 68, 78, 247, 79, 93, 171, 94, 7, 159, 255, 231, 24, 180, 27, 131, 179, 8, 20, 74, 5, 96, 155, 99, 111, 230, 138, 201, 69, 31, - 255, 253, 109, 221, 79, 107, 153, 31, 52, 140, 11, 191, 82, 92, 15, 111, 127, 255, 32, 92, 11, 96, 159, 192, 91, 247, 62, 119, 103, 19, 179, 13, 255, 232, 0, 31, 30, 119, 169, 95, 29, 207, 175, 31, 118, 239, 61, 128, 182, 107, 239, 85, 79, 187, 12, 92, 11, 9, 127, 191, 49, 89, 95, 247, 21, 80, 3, 41, 103, 21, - 15, 44, 15, 63, 10, 168, 212, 235, 110, 212, 201, 96, 30, 201, 240, 30, 34, 192, 31, 184, 40, 39, 173, 112, 21, 154, 244, 25, 213, 250, 16, 30, 62, 251, 174, 2, 37, 223, 43, 46, 219, 23, 207, 0, 105, 27, 182, 12, 38, 85, 55, 176, 41, 223, 255, 181, 46, 249, 180, 231, 46, 148, 176, 107, 40, 100, 45, 168, 129, 8, - 98, 8, 40, 0, 3, 5, 45, 67, 3, 54, 223, 253, 175, 81, 192, 11, 15, 255, 17, 170, 252, 48, 163, 14, 31, 217, 15, 48, 204, 243, 48, 212, 86, 32, 183, 8, 0, 159, 7, 1, 87, 119, 11, 223, 26, 76, 64, 40, 3, 191, 31, 28, 40, 11, 40, 150, 56, 15, 90, 65, 66, 79, 209, 31, 255, 66, 91, 10, 93, 171, - 58, 247, 47, 159, 143, 101, 29, 215, 4, 244, 16, 24, 29, 151, 31, 22, 159, 127, 118, 25, 146, 223, 255, 16, 25, 85, 96, 13, 17, 37, 2, 19, 72, 48, 79, 31, 200, 22, 188, 30, 253, 77, 143, 96, 135, 47, 82, 77, 247, 6, 86, 95, 2, 111, 99, 33, 127, 159, 39, 61, 88, 26, 226, 111, 25, 230, 159, 254, 72, 124, - 30, 204, 31, 236, 251, 96, 8, 255, 255, 128, 16, 95, 192, 47, 84, 43, 161, 3, 31, 85, 6, 31, 89, 10, 23, 190, 47, 205, 160, 47, 24, 7, 111, 30, 52, 24, 156, 31, 20, 57, 110, 82, 215, 83, 39, 71, 244, 94, 11, 176, 79, 187, 63, 232, 137, 135, 167, 119, 25, 201, 255, 25, 163, 51, 251, 0, 1, 51, 191, 51, - 127, 255, 10, 255, 255, 138, 223, 255, 175, 252, 31, 70, 245, 31, 74, 112, 255, 235, 113, 162, 0, 14, 62, 29, 3, 208, 3, 179, 119, 67, 107, 16, 128, 3, 202, 221, 16, 15, 255, 32, 57, 151, 63, 111, 155, 25, 175, 223, 123, 27, 193, 111, 249, 33, 57, 175, 158, 250, 4, 202, 103, 100, 143, 63, 43, 143, 224, 74, 195, 245, - 92, 99, 83, 223, 162, 63, 31, 239, 13, 89, 167, 255, 189, 255, 246, 95, 127, 250, 250, 26, 86, 208, 45, 255, 252, 16, 209, 0, 87, 136, 165, 208, 8, 179, 4, 175, 128, 47, 175, 12, 183, 0, 11, 7, 5, 255, 241, 17, 148, 253, 255, 254, 125, 29, 23, 248, 223, 255, 255, 224, 19, 114, 48, 223, 0, 70, 137, 5, 191, 255, - 40, 255, 111, 233, 255, 223, 255, 18, 9, 255, 17, 170, 37, 91, 247, 234, 0, 3, 118, 127, 225, 254, 90, 11, 225, 8, 21, 255, 126, 15, 255, 254, 4, 16, 0, 5, 207, 160, 30, 56, 232, 243, 0, 30, 31, 59, 6, 99, 87, 115, 198, 31, 126, 207, 30, 248, 55, 91, 20, 126, 80, 79, 255, 253, 201, 226, 239, 47, 133, 207, - 227, 209, 92, 247, 4, 6, 1, 48, 245, 0, 2, 175, 208, 30, 244, 247, 60, 15, 5, 47, 224, 95, 127, 233, 7, 31, 43, 79, 160, 0, 1, 198, 239, 244, 61, 123, 88, 29, 31, 255, 190, 80, 85, 71, 54, 46, 66, 27, 7, 255, 144, 10, 230, 186, 5, 120, 78, 107, 170, 10, 87, 247, 9, 183, 255, 146, 31, 234, 243, 0, - 3, 1, 73, 11, 232, 48, 63, 104, 103, 37, 59, 111, 77, 79, 38, 231, 127, 36, 61, 179, 31, 48, 96, 30, 104, 31, 178, 192, 28, 107, 29, 139, 84, 29, 232, 255, 17, 120, 255, 30, 51, 238, 9, 254, 19, 96, 95, 170, 1, 37, 155, 127, 85, 75, 4, 111, 243, 253, 44, 185, 171, 114, 31, 150, 236, 63, 154, 247, 31, 160, - 208, 253, 85, 23, 52, 40, 16, 104, 10, 22, 196, 251, 95, 91, 48, 11, 3, 28, 109, 39, 235, 47, 142, 72, 11, 143, 86, 115, 255, 252, 245, 1, 87, 116, 16, 29, 203, 251, 126, 188, 64, 254, 4, 203, 176, 0, 40, 207, 16, 31, 236, 40, 49, 67, 80, 187, 192, 144, 195, 160, 86, 23, 74, 31, 41, 227, 79, 40, 3, 7, - 208, 3, 40, 103, 5, 255, 243, 2, 245, 103, 99, 247, 191, 159, 30, 229, 31, 81, 64, 218, 0, 8, 27, 153, 4, 248, 94, 99, 211, 47, 235, 169, 48, 88, 91, 243, 86, 211, 247, 70, 219, 14, 237, 15, 46, 123, 31, 211, 223, 255, 248, 9, 25, 211, 1, 191, 250, 254, 16, 0, 6, 227, 191, 255, 69, 42, 36, 235, 207, 255, - 241, 23, 94, 251, 26, 142, 251, 0, 210, 1, 250, 1, 138, 59, 11, 31, 220, 32, 3, 9, 30, 195, 165, 8, 52, 118, 237, 14, 187, 125, 45, 4, 223, 91, 239, 46, 103, 31, 215, 3, 223, 90, 187, 95, 162, 223, 255, 48, 87, 25, 35, 252, 56, 6, 250, 27, 65, 160, 207, 103, 233, 98, 0, 50, 111, 191, 243, 91, 183, 43, - 175, 252, 37, 80, 3, 219, 30, 255, 128, 3, 42, 3, 3, 187, 83, 246, 255, 16, 0, 12, 246, 251, 102, 207, 253, 122, 93, 28, 215, 107, 239, 235, 185, 63, 244, 88, 191, 174, 96, 76, 19, 64, 15, 249, 222, 13, 221, 221, 28, 192, 67, 12, 41, 7, 221, 16, 0, 46, 87, 8, 250, 255, 10, 11, 127, 23, 101, 20, 75, 195, - 224, 3, 79, 255, 64, 85, 55, 144, 208, 3, 10, 210, 93, 171, 9, 70, 7, 0, 93, 175, 6, 127, 255, 38, 118, 103, 46, 51, 254, 80, 45, 112, 31, 31, 16, 255, 117, 138, 140, 63, 163, 8, 0, 26, 77, 247, 8, 103, 47, 223, 172, 115, 136, 113, 91, 203, 46, 59, 31, 182, 0, 21, 169, 48, 19, 11, 210, 49, 243, 54, - 0, 0, 77, 57, 211, 45, 251, 1, 255, 234, 255, 179, 7, 30, 60, 12, 30, 88, 15, 30, 172, 185, 118, 29, 16, 255, 253, 96, 71, 255, 31, 27, 20, 191, 157, 12, 68, 31, 21, 0, 0, 26, 255, 0, 229, 2, 239, 255, 31, 66, 46, 95, 230, 31, 108, 80, 223, 0, 239, 40, 72, 254, 0, 119, 81, 63, 47, 31, 35, 28, - 217, 255, 45, 71, 127, 255, 16, 54, 90, 39, 55, 111, 87, 59, 191, 255, 97, 239, 112, 0, 3, 5, 66, 95, 223, 42, 79, 151, 16, 55, 16, 192, 25, 62, 249, 31, 174, 189, 248, 20, 23, 205, 20, 119, 81, 31, 207, 255, 191, 177, 31, 136, 254, 255, 185, 223, 255, 145, 119, 40, 215, 91, 255, 254, 23, 82, 210, 255, 255, 164, - 214, 189, 154, 96, 13, 35, 3, 103, 151, 158, 48, 143, 64, 3, 170, 123, 95, 171, 1, 55, 98, 247, 62, 199, 245, 112, 3, 234, 252, 119, 114, 56, 183, 253, 11, 123, 24, 255, 198, 7, 84, 168, 11, 0, 112, 75, 253, 86, 67, 251, 144, 3, 13, 210, 46, 188, 15, 30, 252, 13, 255, 250, 32, 27, 210, 40, 7, 47, 33, 59, - 47, 71, 103, 127, 255, 1, 16, 0, 4, 211, 159, 128, 31, 167, 224, 57, 243, 34, 11, 117, 32, 127, 15, 255, 25, 239, 255, 32, 0, 175, 255, 211, 53, 31, 158, 66, 99, 0, 110, 44, 83, 71, 127, 228, 2, 95, 31, 191, 78, 159, 158, 252, 95, 255, 118, 32, 213, 3, 51, 111, 255, 80, 0, 3, 1, 16, 175, 255, 14, 74, - 16, 91, 11, 31, 197, 60, 79, 175, 41, 71, 239, 167, 159, 250, 254, 148, 3, 235, 32, 26, 203, 236, 34, 98, 58, 26, 200, 31, 76, 80, 103, 118, 143, 229, 16, 89, 155, 154, 112, 8, 0, 9, 75, 19, 0, 191, 31, 255, 159, 91, 35, 179, 20, 160, 28, 255, 16, 89, 127, 35, 155, 128, 0, 214, 0, 33, 15, 103, 27, 8, - 219, 239, 9, 222, 175, 255, 161, 249, 144, 3, 248, 82, 107, 15, 198, 255, 15, 255, 255, 15, 255, 32, 2, 253, 152, 118, 0, 3, 255, 253, 29, 242, 253, 37, 31, 154, 96, 3, 252, 9, 54, 255, 11, 94, 190, 5, 31, 99, 6, 85, 31, 103, 7, 112, 3, 249, 48, 3, 8, 61, 147, 249, 117, 15, 117, 48, 19, 53, 17, 23, - 239, 223, 22, 3, 255, 42, 29, 66, 32, 3, 251, 31, 62, 224, 31, 246, 176, 32, 3, 217, 103, 81, 28, 244, 255, 113, 31, 66, 76, 225, 87, 186, 255, 30, 185, 143, 255, 160, 31, 62, 112, 32, 3, 106, 56, 127, 251, 16, 88, 127, 243, 31, 81, 246, 30, 51, 158, 247, 31, 53, 64, 3, 0, 1, 51, 81, 48, 16, 171, 11, - 86, 187, 9, 86, 103, 7, 24, 92, 7, 255, 222, 252, 5, 25, 151, 223, 255, 253, 48, 31, 159, 177, 225, 37, 255, 230, 92, 16, 12, 25, 169, 77, 211, 239, 74, 12, 23, 22, 5, 69, 251, 47, 255, 47, 94, 11, 223, 40, 192, 245, 252, 3, 103, 99, 39, 54, 212, 63, 255, 254, 76, 32, 188, 62, 31, 48, 45, 199, 0, 239, - 86, 55, 122, 191, 164, 225, 88, 43, 252, 102, 55, 71, 96, 35, 47, 5, 128, 3, 109, 182, 11, 255, 48, 16, 96, 243, 223, 159, 255, 195, 214, 0, 111, 26, 7, 8, 31, 222, 4, 245, 15, 255, 49, 90, 41, 42, 9, 145, 79, 10, 221, 6, 97, 61, 95, 17, 231, 95, 64, 3, 192, 27, 222, 208, 0, 63, 221, 208, 23, 208, - 31, 49, 231, 25, 238, 96, 25, 242, 80, 0, 109, 42, 26, 100, 159, 255, 10, 25, 87, 11, 48, 3, 243, 26, 62, 249, 243, 0, 12, 221, 225, 207, 255, 34, 188, 5, 92, 80, 3, 3, 31, 171, 3, 255, 219, 223, 191, 42, 104, 140, 253, 26, 23, 32, 3, 16, 35, 221, 218, 15, 255, 29, 27, 118, 149, 207, 31, 255, 42, 151, - 10, 46, 103, 110, 207, 194, 1, 247, 255, 161, 0, 60, 152, 192, 255, 213, 54, 201, 119, 82, 127, 229, 43, 179, 250, 31, 255, 17, 150, 0, 151, 128, 15, 155, 3, 169, 235, 6, 218, 7, 4, 255, 243, 125, 31, 255, 247, 250, 102, 207, 254, 95, 255, 249, 244, 123, 239, 234, 247, 90, 115, 249, 15, 255, 242, 15, 216, 175, 217, 3, - 255, 64, 3, 0, 49, 15, 255, 2, 105, 255, 16, 10, 9, 247, 255, 9, 38, 100, 36, 209, 31, 255, 143, 31, 247, 175, 79, 175, 100, 207, 228, 254, 144, 76, 3, 36, 197, 255, 13, 39, 26, 11, 215, 103, 244, 1, 87, 0, 1, 29, 55, 29, 31, 255, 23, 133, 244, 5, 255, 254, 98, 37, 111, 14, 30, 23, 47, 255, 255, 98, - 3, 50, 16, 255, 206, 255, 243, 127, 31, 164, 241, 255, 238, 255, 241, 57, 126, 206, 255, 241, 31, 87, 64, 3, 47, 255, 240, 15, 255, 15, 234, 37, 87, 16, 23, 247, 48, 23, 251, 55, 23, 255, 171, 127, 23, 251, 239, 31, 218, 255, 80, 3, 247, 1, 101, 29, 224, 111, 241, 31, 63, 28, 220, 255, 29, 72, 255, 244, 146, 0, - 0, 227, 31, 243, 48, 0, 192, 25, 29, 238, 20, 29, 155, 31, 215, 46, 3, 12, 21, 17, 15, 31, 251, 40, 15, 117, 16, 215, 70, 119, 97, 47, 255, 112, 31, 255, 243, 223, 235, 156, 55, 21, 247, 65, 0, 139, 228, 212, 255, 217, 40, 5, 253, 0, 102, 17, 123, 87, 239, 39, 243, 162, 92, 95, 167, 6, 127, 163, 17, 22, - 31, 251, 242, 63, 27, 229, 252, 119, 113, 125, 163, 45, 167, 246, 9, 129, 20, 153, 42, 70, 87, 40, 3, 13, 31, 255, 14, 31, 255, 15, 112, 3, 250, 147, 0, 2, 153, 243, 27, 153, 241, 27, 157, 170, 240, 22, 196, 224, 22, 200, 208, 27, 169, 208, 27, 169, 170, 208, 25, 181, 184, 31, 255, 253, 144, 3, 254, 152, 91, 95, - 8, 220, 18, 14, 16, 187, 10, 255, 253, 32, 3, 86, 47, 255, 143, 31, 255, 6, 41, 19, 4, 119, 127, 255, 255, 175, 255, 240, 25, 255, 255, 240, 255, 124, 96, 3, 159, 255, 240, 64, 31, 24, 105, 96, 3, 85, 15, 255, 14, 127, 18, 35, 111, 56, 3, 128, 73, 211, 237, 172, 96, 2, 191, 61, 72, 79, 235, 159, 221, 50, - 3, 16, 108, 235, 0, 0, 21, 112, 191, 191, 25, 247, 0, 59, 253, 255, 246, 221, 239, 255, 246, 31, 255, 208, 181, 255, 26, 76, 119, 84, 5, 77, 26, 7, 87, 147, 1, 167, 255, 83, 243, 28, 175, 222, 47, 147, 254, 103, 128, 86, 26, 159, 208, 26, 163, 240, 58, 163, 71, 116, 15, 255, 26, 171, 14, 89, 251, 5, 96, 95, - 6, 175, 255, 241, 0, 247, 30, 255, 252, 120, 106, 0, 254, 223, 206, 234, 253, 145, 121, 184, 221, 16, 192, 3, 153, 6, 40, 62, 156, 47, 41, 179, 26, 89, 23, 153, 128, 15, 255, 255, 15, 29, 205, 230, 4, 238, 144, 15, 255, 62, 19, 59, 2, 239, 83, 75, 153, 132, 126, 131, 27, 241, 159, 226, 45, 77, 29, 235, 249, 229, - 16, 0, 214, 6, 204, 41, 31, 255, 46, 31, 255, 31, 86, 31, 255, 8, 127, 255, 85, 29, 85, 254, 16, 27, 197, 123, 46, 67, 145, 0, 253, 96, 11, 39, 248, 13, 255, 174, 250, 23, 231, 253, 63, 83, 1, 188, 112, 65, 247, 66, 29, 162, 5, 23, 230, 32, 3, 8, 96, 50, 119, 159, 6, 31, 255, 169, 31, 29, 139, 127, - 31, 204, 207, 25, 29, 29, 150, 87, 183, 117, 47, 219, 251, 48, 69, 155, 255, 80, 64, 254, 4, 188, 0, 0, 23, 191, 176, 30, 43, 149, 224, 22, 55, 0, 128, 22, 77, 31, 18, 255, 56, 3, 1, 78, 63, 255, 249, 24, 7, 40, 167, 208, 54, 118, 71, 231, 127, 31, 255, 244, 255, 239, 255, 254, 128, 4, 161, 239, 86, 35, - 15, 87, 107, 143, 255, 43, 99, 33, 1, 192, 74, 31, 255, 240, 80, 3, 13, 78, 206, 6, 25, 206, 7, 24, 191, 148, 7, 31, 95, 32, 3, 9, 48, 3, 245, 48, 3, 47, 123, 55, 15, 255, 47, 31, 122, 0, 223, 57, 255, 252, 0, 46, 107, 26, 99, 3, 223, 44, 239, 103, 127, 255, 207, 255, 251, 244, 8, 255, 255, 247, - 22, 225, 250, 255, 255, 252, 223, 254, 255, 177, 191, 253, 98, 212, 0, 34, 15, 162, 24, 15, 30, 253, 12, 17, 239, 41, 251, 27, 24, 172, 31, 67, 20, 95, 0, 3, 143, 255, 31, 255, 253, 0, 2, 207, 255, 253, 239, 63, 162, 248, 115, 25, 243, 80, 103, 117, 139, 152, 31, 58, 0, 160, 56, 10, 111, 28, 15, 97, 187, 11, - 255, 246, 51, 251, 15, 255, 255, 15, 111, 213, 245, 67, 87, 68, 72, 83, 2, 47, 47, 255, 9, 255, 0, 9, 1, 5, 7, 0, 5, 5, 253, 0, 20, 20, 0, 18, 18, 32, 2, 19, 241, 19, 0, 15, 15, 32, 2, 16, 8, 16, 17, 6, 255, 6, 0, 17, 17, 0, 14, 14, 0, 193, 23, 23, 80, 29, 16, 38, 16, 44, - 112, 38, 64, 53, 24, 152, 24, 32, 38, 16, 59, 13, 13, 32, 44, 16, 65, 16, 8, 48, 16, 71, 16, 56, 11, 11, 32, 68, 64, 98, 112, 29, 16, 98, 49, 16, 23, 16, 44, 10, 10, 32, 92, 16, 128, 16, 98, 14, 251, 14, 67, 77, 65, 80, 53, 146, 33, 0, 185, 117, 55, 221, 0, 81, 200, 37, 227, 0, 1, 4, - 0, 206, 2, 255, 0, 0, 17, 20, 29, 4, 0, 5, 27, 103, 187, 7, 24, 35, 9, 0, 10, 62, 43, 12, 0, 109, 16, 167, 0, 15, 22, 4, 17, 0, 16, 243, 0, 255, 20, 0, 21, 0, 22, 0, 23, 0, 250, 24, 0, 25, 0, 26, 144, 97, 27, 31, 39, 251, 28, 0, 29, 0, 30, 24, 99, 32, 0, 175, 33, 48, - 117, 34, 48, 123, 35, 0, 36, 0, 255, 37, 0, 38, 0, 39, 0, 40, 0, 254, 41, 0, 42, 0, 43, 0, 44, 17, 95, 89, 64, 191, 40, 46, 221, 0, 2, 105, 88, 16, 57, 0, 253, 0, 161, 0, 45, 0, 225, 24, 173, 243, 0, 65, 121, 15, 255, 4, 89, 97, 122, 48, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 255, 82, 65, 82, 67, 0, 0, 5, 0, 123, 16, 0, 32, 0, 0, 1, 16, 7, 3, 224, 37, 64, 3, 112, 1, 1, 64, 27, 48, 36, 64, 80, 3, 192, 223, 0, 5, 32, 43, 0, 0, 82, 79, 79, 179, 84, 32, 27, 195, 252, 64, 68, 0, 3, 0, 133, 53, 246, 17, 0, 0, 14, 64, 79, 2, 160, 64, 81, - 211, 226, 226, 16, 19, 26, 80, 15, 64, 19, 2, 207, 171, 45, 16, 39, 40, 16, 127, 64, 96, 19, 255, 255, 234, 0, 46, 2, 128, 136, 16, 80, 19, 184, 16, 19, 199, 2, 255, 16, 0, 96, 19, 0, 3, 10, 46, 0, 46, 255, 46, 0, 117, 115, 102, 114, 101, 110, 255, 99, 104, 0, 109, 101, 115, 115, 97, 253, 103, 101, - 46, 98, 109, 103, 96, 11, 105, 255, 100, 46, 116, 98, 108, 0, 115, 116, 243, 114, 117, 99, 116, 48, 10, 176, 198, 77, 69, 214, 83, 71, 16, 45, 49, 80, 187, 2, 2, 208, 228, 239, 73, 78, 70, 16, 27, 0, 96, 0, 6, 197, 0, 12, 49, 62, 113, 56, 48, 159, 2, 144, 11, 110, 90, 144, 23, 216, 128, 35, 1, 156, - 144, 11, 194, 144, 59, 115, 49, 130, 68, 65, 84, 32, 123, 33, 127, 26, 6, 255, 1, 0, 3, 0, 86, 0, 101, 0, 251, 117, 0, 105, 0, 108, 16, 1, 101, 0, 175, 122, 17, 181, 105, 16, 89, 115, 0, 233, 0, 167, 114, 16, 25, 114, 17, 197, 32, 23, 32, 0, 100, 113, 16, 35, 115, 0, 113, 16, 43, 64, 13, 32, - 19, 10, 255, 0, 83, 0, 85, 0, 80, 0, 69, 221, 0, 82, 17, 237, 77, 0, 65, 16, 7, 73, 213, 0, 79, 17, 249, 71, 16, 11, 76, 16, 15, 88, 199, 0, 89, 17, 50, 0, 107, 48, 0, 105, 30, 73, 0, 109, 245, 0, 112, 0, 111, 16, 199, 115, 16, 219, 98, 41, 112, 195, 32, 201, 108, 16, 237, 114, 80, 9, - 224, 217, 46, 42, 16, 211, 1, 17, 0, 118, 16, 73, 117, 17, 19, 32, 17, 19, 234, 233, 0, 102, 145, 27, 97, 17, 59, 32, 16, 107, 185, 111, 80, 165, 100, 0, 39, 17, 79, 32, 123, 108, 81, 16, 125, 105, 19, 3, 87, 17, 91, 32, 7, 32, 141, 117, 10, 49, 79, 32, 27, 64, 77, 65, 69, 100, 17, 107, 116, 16, - 73, 74, 33, 131, 115, 49, 45, 1, 85, 18, 0, 17, 95, 97, 19, 99, 165, 103, 17, 167, 97, 18, 11, 65, 145, 97, 16, 171, 101, 74, 18, 25, 116, 48, 107, 33, 183, 99, 49, 5, 109, 17, 225, 67, 65, 187, 33, 2, 225, 14, 18, 121, 66, 103, 19, 59, 0, 8, 247, 33, 157, 67, 98, 51, 27, 4, 0, 6, 245, 4, - 56, 56, 178, 83, 39, 0, 211, 207, 8, 42, 82, 155, 35, 83, 3, 19, 252, 24, 20, 0, 4, 147, 231, 255, 43, 67, 79, 77, 77, 69, 78, 84, 255, 0, 68, 73, 83, 67, 95, 48, 49, 95, 80, 7, 50, 80, 15, 51, 0, 84, 73, 84, 254, 76, 69, 95, 77, 65, 73, 78, 80, 10, 249, 83, 85, 66, 0, 64, 0, 0, - 0, 144, 111, 112, 123, 36, 99, 174, 55, 113, 97, 96, 147, 28, 19, 223, 62, 141, 80, 171, 0, 190, 198, 20, 162, 61, 51, 211, 16, 153, 100, 67, 164, 76, 51, 223, 12, 252, 0, 0, 19, 54, 175, 66, 51, 235, 19, 253, 239, 137, 230, 39, 67, 247, 20, 0, 0, 251, 231, 104, 17, 53, 52, 3, 16, 185, 23, 177, 123, 170, - 254, 52, 15, 28, 116, 181, 4, 81, 23, 7, 80, 235, 168, 9, 20, 224, 10, 20, 228, 11, 224, 162, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 90, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 90, 224, 245, 0, 0, 0, 32, 16, 3, 192, 16, 11, 0, 42, 64, 3, 112, 2, 1, - 80, 27, 3, 16, 35, 64, 80, 3, 239, 128, 0, 3, 32, 22, 0, 0, 82, 79, 220, 79, 84, 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, 253, 67, 212, 17, 0, 0, 18, 64, 80, 89, 190, 236, 32, 88, 255, 255, 0, 46, 2, 128, 97, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 32, 132, 46, 0, - 46, 46, 0, 101, 109, 255, 98, 101, 100, 100, 101, 100, 102, 111, 255, 110, 116, 0, 109, 101, 115, 115, 97, 223, 103, 101, 32, 11, 50, 54, 46, 98, 114, 159, 102, 16, 19, 0, 0, 8, 82, 70, 78, 84, 254, 239, 255, 1, 4, 48, 123, 16, 0, 5, 70, 237, 73, 78, 70, 32, 235, 1, 33, 16, 241, 27, 190, 27, 32, 219, - 56, 0, 0, 88, 104, 16, 155, 255, 20, 33, 27, 26, 0, 84, 71, 76, 191, 80, 16, 15, 48, 24, 26, 20, 24, 0, 249, 0, 8, 0, 0, 11, 32, 221, 17, 3, 128, 111, 49, 31, 96, 0, 0, 0, 106, 127, 255, 176, 0, 186, 111, 16, 3, 95, 255, 160, 16, 3, 144, 48, 3, 125, 0, 144, 50, 3, 119, 80, 0, 7, - 16, 83, 7, 253, 255, 128, 0, 9, 255, 96, 16, 3, 64, 254, 0, 10, 255, 32, 0, 11, 255, 0, 238, 107, 111, 1, 107, 61, 39, 0, 16, 220, 0, 0, 191, 255, 223, 0, 8, 18, 129, 79, 255, 253, 0, 223, 213, 255, 192, 98, 232, 97, 19, 0, 254, 18, 221, 255, 170, 242, 18, 159, 252, 34, 163, 64, 16, 41, 176, 0, - 255, 112, 186, 63, 17, 231, 63, 255, 112, 48, 3, 47, 16, 7, 187, 31, 17, 159, 31, 255, 80, 48, 3, 13, 221, 178, 64, 2, 143, 47, 1, 17, 1, 227, 186, 36, 183, 6, 20, 203, 175, 12, 20, 207, 47, 35, 49, 7, 255, 255, 48, 255, 31, 255, 249, 0, 143, 255, 241, 0, 191, 239, 18, 222, 255, 255, 16, 0, 255, 250, - 117, 20, 131, 249, 103, 155, 36, 107, 79, 16, 23, 14, 220, 255, 247, 18, 238, 252, 0, 5, 20, 152, 20, 128, 190, 64, 16, 40, 184, 222, 255, 255, 254, 84, 139, 119, 3, 3, 112, 7, 203, 16, 51, 251, 223, 255, 240, 255, 0, 175, 255, 208, 0, 9, 238, 64, 122, 3, 152, 153, 66, 0, 0, 62, 21, 211, 223, 21, 215, 173, - 239, 21, 219, 111, 21, 223, 2, 117, 166, 96, 48, 36, 22, 124, 35, 105, 208, 54, 88, 5, 97, 31, 207, 22, 162, 22, 51, 217, 5, 255, 67, 223, 9, 239, 22, 203, 118, 94, 255, 191, 175, 49, 228, 255, 255, 7, 117, 49, 251, 71, 22, 228, 248, 38, 179, 150, 221, 38, 111, 253, 207, 255, 186, 245, 19, 87, 243, 0, 15, 16, - 7, 13, 18, 12, 225, 3, 33, 16, 182, 156, 0, 3, 255, 1, 20, 255, 25, 62, 19, 252, 86, 4, 190, 255, 255, 6, 24, 192, 40, 196, 255, 0, 255, 202, 118, 0, 35, 255, 251, 118, 105, 72, 119, 117, 65, 34, 107, 232, 255, 80, 0, 228, 84, 69, 141, 82, 175, 201, 53, 209, 25, 136, 20, 158, 166, 0, 41, 4, 253, 7, - 169, 1, 25, 167, 159, 0, 55, 152, 207, 175, 255, 52, 176, 105, 164, 71, 118, 64, 191, 190, 255, 144, 0, 184, 104, 207, 211, 0, 201, 147, 169, 179, 41, 123, 160, 25, 127, 241, 25, 131, 24, 201, 204, 123, 208, 192, 0, 4, 174, 255, 24, 7, 255, 0, 185, 3, 41, 131, 254, 185, 0, 16, 192, 106, 8, 87, 215, 119, 84, 35, - 43, 252, 96, 191, 134, 51, 88, 72, 35, 208, 5, 170, 40, 41, 28, 254, 25, 33, 21, 110, 25, 227, 169, 128, 21, 111, 242, 161, 31, 53, 16, 186, 25, 219, 127, 103, 80, 3, 92, 254, 41, 238, 106, 104, 86, 119, 153, 191, 187, 160, 190, 169, 119, 101, 83, 253, 32, 85, 138, 134, 198, 83, 187, 249, 80, 3, 49, 250, 108, 2, - 198, 52, 0, 24, 180, 84, 3, 26, 67, 6, 153, 26, 211, 189, 13, 106, 200, 85, 103, 120, 153, 161, 30, 135, 251, 118, 85, 67, 221, 212, 138, 230, 171, 181, 74, 26, 151, 247, 80, 187, 16, 191, 50, 3, 248, 22, 2, 17, 227, 148, 1, 24, 75, 96, 3, 0, 48, 3, 254, 58, 229, 42, 233, 255, 4, 207, 255, 22, 223, 255, - 254, 175, 255, 255, 254, 129, 143, 255, 234, 97, 111, 107, 26, 224, 41, 189, 42, 227, 24, 42, 231, 223, 244, 82, 27, 120, 80, 155, 109, 128, 80, 227, 25, 125, 0, 23, 229, 59, 16, 193, 24, 167, 63, 255, 244, 17, 58, 208, 0, 165, 207, 49, 84, 80, 27, 64, 32, 3, 112, 16, 15, 208, 82, 4, 159, 14, 2, 9, 252, 16, - 255, 69, 63, 96, 3, 0, 160, 3, 169, 239, 23, 46, 0, 112, 3, 48, 144, 3, 41, 43, 80, 232, 0, 6, 63, 23, 91, 10, 25, 74, 18, 247, 55, 63, 170, 8, 25, 86, 13, 23, 111, 111, 16, 178, 255, 22, 170, 82, 73, 115, 14, 27, 211, 47, 85, 251, 34, 3, 207, 86, 15, 61, 21, 123, 28, 120, 251, 85, 119, 137, - 43, 247, 237, 76, 27, 252, 173, 28, 0, 17, 154, 49, 80, 86, 23, 97, 19, 149, 240, 144, 3, 213, 147, 14, 81, 231, 13, 87, 247, 11, 87, 144, 3, 9, 21, 217, 0, 48, 3, 254, 221, 221, 10, 115, 30, 32, 11, 81, 231, 108, 232, 221, 144, 219, 221, 96, 120, 70, 11, 236, 19, 239, 86, 219, 96, 3, 32, 219, 121, 135, - 141, 64, 247, 42, 255, 54, 140, 115, 152, 250, 255, 255, 226, 183, 32, 100, 146, 215, 33, 83, 35, 231, 226, 6, 107, 6, 178, 143, 20, 67, 31, 255, 67, 151, 71, 59, 158, 173, 156, 125, 29, 60, 1, 251, 135, 138, 223, 163, 250, 37, 232, 119, 118, 65, 109, 192, 108, 28, 205, 33, 134, 18, 65, 106, 50, 223, 233, 32, 253, 165, - 223, 144, 3, 191, 80, 3, 190, 87, 119, 63, 80, 2, 191, 255, 185, 160, 94, 247, 253, 130, 118, 83, 167, 63, 64, 0, 255, 8, 23, 84, 26, 161, 52, 95, 14, 3, 0, 255, 87, 247, 20, 175, 26, 204, 243, 0, 0, 4, 223, 94, 75, 119, 251, 197, 85, 221, 122, 207, 164, 186, 103, 119, 84, 115, 249, 72, 13, 32, 191, 28, - 229, 43, 169, 24, 253, 0, 200, 10, 241, 0, 9, 48, 80, 3, 29, 172, 0, 7, 80, 3, 135, 223, 36, 139, 41, 239, 162, 251, 80, 3, 234, 7, 208, 255, 8, 225, 255, 15, 227, 41, 58, 78, 99, 83, 20, 223, 11, 30, 99, 127, 46, 73, 79, 255, 4, 103, 231, 117, 48, 255, 92, 83, 52, 8, 101, 106, 235, 167, 16, 213, - 158, 112, 91, 3, 13, 212, 3, 1, 19, 67, 84, 31, 147, 249, 31, 159, 251, 30, 191, 251, 31, 175, 37, 116, 169, 253, 213, 234, 7, 83, 7, 9, 147, 23, 63, 255, 84, 165, 50, 147, 3, 250, 134, 231, 158, 7, 50, 31, 239, 249, 84, 31, 243, 251, 48, 3, 10, 24, 187, 9, 128, 191, 15, 255, 48, 210, 52, 85, 197, 35, - 191, 80, 3, 79, 255, 32, 64, 255, 191, 2, 19, 234, 62, 144, 0, 4, 239, 144, 101, 31, 160, 160, 4, 141, 127, 40, 248, 223, 28, 28, 255, 190, 251, 29, 191, 254, 48, 0, 255, 193, 72, 11, 34, 159, 255, 40, 139, 63, 37, 49, 76, 19, 41, 66, 3, 125, 191, 5, 40, 47, 53, 3, 22, 72, 47, 214, 36, 175, 255, 13, - 69, 49, 1, 234, 255, 255, 176, 30, 99, 16, 33, 58, 14, 23, 166, 171, 15, 60, 70, 244, 60, 70, 9, 65, 158, 1, 91, 243, 205, 239, 255, 127, 30, 108, 39, 251, 93, 203, 174, 169, 32, 155, 175, 69, 119, 5, 255, 18, 39, 83, 16, 25, 38, 28, 125, 70, 167, 145, 71, 247, 48, 3, 34, 16, 46, 148, 85, 33, 7, 73, - 30, 156, 159, 30, 160, 143, 50, 87, 255, 237, 0, 55, 255, 93, 83, 0, 10, 31, 196, 27, 43, 16, 98, 41, 63, 203, 30, 211, 219, 28, 209, 189, 113, 226, 16, 0, 13, 24, 87, 39, 138, 69, 159, 247, 208, 3, 10, 87, 23, 48, 164, 32, 168, 34, 79, 7, 24, 183, 7, 86, 107, 138, 5, 87, 208, 15, 255, 9, 13, 27, - 20, 159, 87, 243, 143, 153, 251, 175, 95, 112, 3, 176, 29, 155, 179, 255, 255, 228, 186, 222, 17, 212, 255, 255, 226, 31, 159, 96, 31, 163, 161, 194, 45, 151, 128, 26, 108, 42, 78, 15, 255, 7, 79, 4, 6, 106, 31, 163, 8, 255, 75, 19, 12, 31, 175, 13, 31, 179, 140, 15, 112, 3, 47, 192, 26, 104, 0, 251, 90, 59, - 25, 226, 209, 0, 246, 31, 212, 245, 80, 3, 15, 223, 46, 18, 162, 177, 117, 25, 151, 255, 0, 46, 27, 243, 2, 40, 215, 4, 189, 156, 207, 255, 78, 255, 185, 157, 119, 59, 159, 245, 239, 236, 112, 95, 31, 255, 37, 126, 159, 112, 74, 82, 139, 128, 86, 231, 22, 235, 84, 183, 163, 223, 147, 43, 42, 49, 71, 27, 55, 1, - 164, 51, 13, 23, 122, 14, 23, 34, 210, 15, 160, 64, 3, 13, 183, 125, 104, 255, 244, 66, 99, 202, 222, 243, 223, 255, 98, 95, 3, 112, 3, 221, 225, 227, 164, 16, 83, 159, 48, 153, 147, 15, 255, 24, 63, 87, 247, 41, 255, 149, 31, 80, 3, 128, 191, 241, 19, 24, 243, 17, 55, 243, 53, 28, 120, 25, 170, 61, 246, 223, - 255, 250, 42, 127, 229, 89, 43, 81, 16, 51, 35, 191, 80, 220, 212, 58, 91, 13, 39, 95, 251, 60, 79, 78, 175, 178, 47, 239, 255, 151, 137, 180, 190, 173, 26, 54, 119, 136, 193, 3, 106, 240, 90, 223, 198, 253, 48, 15, 240, 255, 15, 255, 255, 15, 255, 4, 51, 17, 60, 11, 148, 1, 85, 175, 45, 16, 10, 197, 63, 32, - 87, 219, 39, 231, 153, 160, 87, 235, 127, 255, 66, 16, 31, 118, 37, 134, 255, 89, 29, 242, 255, 29, 45, 255, 16, 21, 234, 159, 1, 1, 250, 32, 0, 10, 239, 176, 28, 11, 240, 30, 15, 170, 246, 30, 19, 252, 23, 34, 255, 221, 234, 255, 91, 195, 86, 39, 3, 95, 31, 62, 47, 111, 255, 70, 16, 79, 243, 100, 171, 75, - 255, 241, 14, 227, 3, 43, 67, 159, 27, 74, 91, 175, 123, 95, 225, 21, 119, 81, 42, 175, 160, 250, 102, 172, 175, 23, 134, 4, 175, 255, 178, 0, 80, 99, 21, 96, 21, 32, 186, 23, 26, 222, 138, 108, 95, 255, 79, 85, 163, 3, 189, 79, 111, 255, 53, 103, 119, 101, 175, 255, 202, 229, 149, 85, 88, 43, 239, 168, 31, 254, - 39, 255, 253, 41, 23, 255, 28, 12, 239, 23, 103, 30, 47, 176, 15, 166, 8, 7, 22, 88, 15, 112, 192, 29, 138, 255, 29, 70, 255, 159, 80, 192, 34, 40, 71, 111, 255, 81, 47, 115, 16, 192, 70, 127, 246, 28, 173, 229, 255, 32, 4, 208, 192, 15, 255, 3, 12, 31, 231, 15, 42, 65, 176, 22, 214, 239, 29, 175, 159, 28, - 234, 79, 30, 222, 165, 13, 31, 254, 9, 33, 98, 31, 227, 4, 29, 34, 11, 94, 30, 235, 47, 31, 79, 175, 255, 96, 2, 24, 53, 126, 16, 56, 242, 127, 255, 239, 255, 255, 42, 23, 187, 80, 48, 3, 239, 255, 112, 24, 40, 128, 250, 255, 95, 255, 144, 242, 63, 255, 160, 176, 169, 63, 24, 169, 95, 48, 87, 255, 31, 80, - 71, 247, 127, 117, 16, 95, 143, 255, 61, 31, 70, 54, 31, 74, 48, 42, 37, 247, 17, 198, 14, 30, 206, 12, 18, 45, 11, 24, 219, 95, 46, 243, 9, 21, 47, 9, 223, 255, 192, 10, 68, 56, 87, 244, 95, 3, 232, 3, 53, 108, 191, 69, 251, 47, 184, 144, 12, 29, 201, 104, 196, 14, 31, 57, 26, 11, 46, 151, 7, 131, - 10, 170, 111, 24, 239, 13, 30, 0, 8, 26, 234, 5, 24, 62, 146, 3, 88, 174, 32, 15, 30, 46, 24, 73, 147, 31, 144, 3, 143, 15, 160, 3, 34, 131, 80, 3, 24, 255, 242, 90, 63, 79, 162, 23, 248, 255, 247, 255, 251, 255, 245, 233, 183, 16, 12, 30, 180, 79, 25, 83, 33, 243, 255, 170, 254, 18, 83, 228, 23, 203, - 32, 182, 135, 191, 73, 231, 162, 8, 87, 255, 14, 87, 255, 38, 23, 27, 132, 226, 66, 247, 154, 253, 86, 11, 31, 6, 0, 243, 87, 255, 251, 0, 192, 16, 153, 247, 15, 255, 14, 19, 179, 4, 6, 59, 146, 43, 58, 247, 53, 27, 246, 24, 93, 2, 65, 159, 31, 255, 33, 227, 249, 93, 25, 251, 208, 17, 35, 32, 0, 55, - 206, 192, 48, 149, 63, 31, 157, 64, 3, 240, 23, 34, 240, 31, 235, 241, 233, 0, 2, 17, 137, 90, 191, 22, 149, 96, 3, 223, 79, 26, 25, 189, 42, 29, 143, 255, 79, 255, 250, 13, 150, 9, 31, 252, 56, 131, 30, 104, 131, 3, 118, 183, 255, 82, 42, 95, 224, 67, 255, 249, 91, 107, 127, 255, 6, 111, 159, 99, 35, 147, - 4, 239, 95, 71, 127, 224, 27, 114, 1, 253, 235, 133, 86, 159, 111, 255, 223, 31, 168, 2, 87, 169, 118, 112, 224, 207, 26, 188, 255, 31, 160, 44, 233, 255, 84, 24, 128, 196, 15, 94, 0, 13, 144, 3, 11, 80, 3, 8, 159, 0, 100, 82, 159, 253, 214, 15, 159, 30, 41, 255, 0, 32, 183, 36, 75, 134, 4, 239, 221, 57, - 87, 16, 192, 81, 135, 255, 7, 16, 192, 247, 0, 2, 87, 175, 125, 86, 207, 255, 241, 75, 27, 86, 112, 29, 145, 20, 91, 80, 28, 91, 166, 16, 93, 41, 168, 108, 33, 83, 41, 239, 254, 15, 255, 2, 144, 27, 85, 191, 15, 255, 255, 15, 255, 163, 5, 181, 15, 255, 52, 19, 86, 151, 4, 26, 101, 29, 174, 255, 21, 221, - 255, 0, 239, 246, 233, 117, 0, 36, 143, 159, 119, 117, 30, 179, 237, 255, 255, 197, 111, 255, 67, 70, 45, 23, 6, 82, 253, 95, 160, 92, 163, 253, 90, 151, 222, 109, 142, 61, 59, 83, 40, 91, 63, 29, 171, 175, 39, 201, 79, 255, 37, 119, 168, 99, 45, 51, 212, 108, 105, 114, 22, 48, 37, 157, 13, 51, 2, 78, 32, 52, - 240, 80, 7, 191, 223, 8, 205, 221, 37, 50, 51, 48, 3, 20, 84, 0, 2, 40, 211, 126, 233, 17, 239, 125, 171, 68, 255, 254, 221, 143, 255, 136, 193, 50, 85, 93, 95, 249, 93, 107, 217, 15, 90, 0, 70, 78, 243, 4, 74, 93, 171, 15, 94, 7, 151, 223, 112, 75, 131, 252, 93, 163, 186, 240, 223, 158, 88, 172, 144, 30, - 254, 208, 30, 61, 74, 37, 42, 242, 63, 103, 159, 137, 35, 140, 11, 11, 92, 15, 74, 129, 95, 66, 92, 11, 96, 159, 252, 225, 95, 85, 29, 116, 234, 223, 254, 128, 31, 207, 128, 31, 114, 64, 41, 186, 197, 14, 255, 54, 33, 2, 62, 13, 31, 228, 5, 54, 252, 251, 41, 48, 3, 38, 12, 7, 48, 3, 250, 31, 83, 55, - 150, 0, 243, 4, 223, 255, 1, 24, 80, 21, 158, 248, 159, 244, 255, 251, 48, 191, 21, 40, 127, 31, 148, 25, 231, 206, 177, 253, 94, 143, 4, 79, 7, 239, 255, 64, 31, 20, 140, 161, 30, 2, 94, 99, 46, 11, 1, 124, 143, 151, 53, 239, 214, 123, 182, 45, 39, 251, 20, 191, 255, 254, 20, 203, 236, 255, 251, 22, 32, 47, - 2, 223, 46, 86, 15, 194, 3, 145, 112, 234, 127, 15, 232, 5, 95, 49, 111, 65, 115, 160, 3, 63, 42, 80, 3, 15, 255, 20, 207, 86, 99, 255, 80, 3, 239, 80, 19, 170, 143, 50, 192, 128, 88, 99, 64, 94, 99, 64, 80, 19, 65, 43, 31, 13, 26, 234, 40, 3, 39, 91, 40, 11, 40, 150, 31, 38, 30, 200, 34, 3, - 191, 50, 254, 34, 79, 1, 255, 66, 91, 178, 0, 37, 215, 111, 0, 74, 247, 47, 7, 8, 61, 215, 170, 64, 58, 251, 1, 22, 159, 7, 23, 109, 13, 26, 247, 191, 95, 27, 65, 223, 255, 251, 6, 255, 79, 80, 31, 32, 175, 27, 82, 255, 22, 188, 25, 138, 26, 95, 90, 191, 21, 87, 47, 14, 238, 15, 33, 227, 9, 112, - 3, 248, 30, 134, 247, 245, 0, 2, 52, 82, 150, 95, 254, 76, 7, 127, 74, 103, 95, 28, 175, 221, 39, 204, 250, 47, 167, 227, 71, 63, 186, 250, 9, 111, 2, 8, 152, 119, 60, 75, 8, 92, 87, 239, 0, 19, 51, 143, 227, 175, 255, 120, 173, 126, 126, 221, 247, 255, 254, 183, 16, 49, 159, 255, 75, 99, 231, 80, 14, 214, - 37, 65, 231, 241, 112, 3, 47, 253, 148, 209, 15, 255, 33, 41, 151, 3, 111, 155, 1, 175, 226, 27, 193, 243, 6, 255, 146, 19, 120, 95, 43, 155, 0, 70, 146, 118, 121, 36, 59, 143, 254, 90, 195, 31, 251, 162, 9, 130, 1, 114, 15, 177, 10, 255, 255, 110, 56, 179, 27, 70, 255, 27, 170, 189, 253, 19, 18, 193, 0, 5, - 116, 127, 228, 253, 15, 90, 19, 7, 207, 255, 15, 255, 255, 15, 255, 14, 49, 0, 11, 239, 149, 246, 31, 187, 68, 167, 11, 52, 22, 250, 14, 62, 12, 44, 176, 168, 221, 90, 110, 201, 37, 19, 35, 211, 23, 42, 85, 47, 126, 127, 225, 65, 96, 0, 92, 250, 240, 27, 236, 238, 192, 1, 239, 27, 106, 111, 255, 112, 60, 239, - 117, 167, 130, 1, 239, 48, 30, 2, 192, 30, 132, 245, 97, 30, 188, 254, 46, 176, 63, 53, 103, 31, 62, 60, 247, 208, 108, 236, 7, 0, 0, 20, 83, 42, 253, 61, 188, 60, 15, 138, 95, 93, 79, 6, 55, 0, 30, 211, 4, 20, 179, 30, 22, 153, 153, 191, 123, 71, 28, 177, 11, 229, 47, 221, 37, 71, 244, 100, 31, 255, - 112, 0, 38, 253, 11, 38, 206, 8, 55, 242, 33, 54, 234, 254, 0, 2, 70, 222, 48, 29, 139, 96, 31, 159, 170, 128, 31, 179, 192, 31, 183, 242, 31, 171, 243, 29, 159, 43, 46, 196, 33, 150, 247, 21, 198, 248, 23, 251, 251, 47, 149, 255, 95, 48, 45, 131, 10, 31, 127, 13, 30, 68, 47, 86, 31, 173, 111, 54, 220, 176, - 26, 71, 80, 64, 69, 55, 162, 159, 31, 169, 14, 45, 173, 93, 79, 28, 191, 7, 61, 179, 82, 31, 48, 246, 31, 52, 144, 31, 52, 31, 35, 226, 31, 39, 175, 224, 31, 43, 249, 46, 119, 48, 254, 239, 255, 19, 249, 226, 14, 193, 2, 80, 95, 30, 38, 205, 253, 63, 208, 7, 47, 31, 139, 32, 169, 207, 109, 255, 253, 79, - 223, 255, 239, 245, 2, 143, 30, 81, 175, 255, 176, 255, 162, 176, 79, 91, 243, 88, 83, 1, 138, 106, 31, 226, 127, 72, 11, 158, 8, 86, 115, 26, 99, 21, 119, 65, 76, 170, 183, 255, 196, 0, 76, 251, 0, 2, 140, 241, 92, 31, 236, 192, 49, 67, 0, 0, 179, 90, 15, 32, 195, 132, 176, 87, 143, 11, 127, 4, 14, 155, - 1, 47, 175, 12, 27, 231, 63, 71, 102, 35, 179, 45, 255, 90, 235, 63, 255, 143, 255, 25, 184, 169, 254, 31, 253, 248, 17, 237, 224, 17, 228, 31, 205, 64, 87, 150, 179, 40, 27, 198, 223, 26, 11, 255, 255, 225, 46, 70, 235, 31, 3, 118, 143, 253, 0, 0, 2, 31, 155, 59, 26, 40, 25, 70, 251, 0, 27, 16, 36, 0, - 110, 190, 48, 175, 255, 244, 95, 255, 247, 128, 22, 216, 53, 50, 71, 57, 107, 31, 163, 239, 130, 16, 80, 215, 176, 73, 14, 179, 34, 191, 31, 220, 32, 3, 159, 31, 221, 41, 174, 111, 210, 254, 208, 14, 250, 124, 15, 91, 243, 43, 239, 2, 41, 95, 171, 61, 175, 255, 192, 28, 15, 243, 29, 40, 255, 206, 94, 61, 121, 174, - 31, 231, 12, 54, 118, 32, 120, 51, 18, 44, 111, 41, 231, 16, 229, 0, 45, 77, 45, 81, 32, 15, 219, 255, 102, 15, 255, 42, 221, 221, 214, 199, 208, 29, 221, 221, 47, 19, 78, 15, 255, 6, 208, 14, 7, 1, 9, 170, 130, 5, 120, 146, 31, 58, 163, 243, 27, 234, 243, 31, 58, 128, 3, 10, 86, 184, 1, 118, 20, 75, - 195, 224, 3, 79, 255, 84, 92, 199, 249, 208, 3, 6, 7, 101, 166, 15, 31, 247, 79, 94, 11, 69, 70, 103, 99, 30, 137, 215, 255, 229, 31, 27, 244, 31, 31, 241, 255, 247, 199, 88, 192, 35, 243, 11, 246, 46, 17, 235, 2, 8, 255, 213, 247, 191, 23, 37, 255, 80, 3, 229, 23, 49, 64, 162, 6, 23, 143, 5, 31, 227, - 16, 118, 31, 190, 211, 55, 143, 85, 31, 151, 208, 25, 182, 243, 30, 149, 246, 30, 182, 247, 76, 29, 203, 246, 15, 130, 17, 28, 223, 4, 223, 58, 23, 45, 251, 174, 31, 24, 112, 127, 23, 117, 207, 255, 32, 46, 172, 219, 103, 98, 47, 85, 214, 0, 71, 255, 245, 0, 202, 49, 73, 5, 158, 31, 29, 143, 1, 31, 55, 46, - 74, 115, 171, 6, 30, 175, 11, 31, 100, 14, 31, 1, 15, 255, 245, 224, 87, 117, 19, 30, 92, 253, 30, 96, 254, 118, 62, 94, 97, 3, 101, 31, 207, 6, 255, 72, 127, 33, 42, 229, 65, 243, 247, 0, 3, 5, 102, 197, 79, 151, 32, 55, 31, 62, 86, 167, 58, 223, 252, 1, 71, 117, 16, 21, 157, 191, 251, 62, 193, 251, - 157, 255, 249, 16, 7, 253, 255, 144, 5, 191, 255, 139, 29, 171, 223, 230, 255, 253, 100, 102, 191, 31, 142, 0, 246, 80, 3, 170, 224, 202, 187, 127, 71, 247, 9, 31, 91, 11, 48, 147, 33, 31, 148, 42, 151, 47, 55, 157, 37, 219, 26, 180, 31, 33, 80, 117, 112, 3, 199, 119, 32, 40, 183, 255, 6, 201, 49, 5, 236, 255, - 246, 16, 16, 3, 251, 5, 17, 35, 27, 114, 251, 255, 3, 253, 215, 107, 191, 190, 12, 255, 250, 244, 102, 207, 255, 224, 31, 161, 96, 41, 151, 231, 239, 235, 64, 15, 137, 28, 46, 252, 223, 255, 162, 15, 28, 22, 72, 7, 55, 227, 136, 95, 0, 0, 17, 0, 215, 0, 73, 40, 63, 254, 82, 99, 214, 0, 119, 161, 82, 15, - 236, 25, 14, 26, 159, 42, 123, 56, 63, 44, 123, 6, 95, 39, 67, 4, 143, 228, 47, 255, 48, 4, 239, 121, 153, 65, 197, 255, 119, 98, 44, 43, 79, 255, 245, 85, 0, 3, 1, 49, 191, 255, 239, 31, 98, 191, 92, 79, 10, 95, 44, 207, 126, 175, 255, 63, 233, 64, 62, 98, 108, 26, 203, 254, 205, 121, 164, 213, 54, 16, - 96, 111, 255, 138, 177, 89, 155, 34, 95, 3, 174, 5, 15, 91, 19, 11, 35, 142, 68, 91, 35, 1, 127, 255, 22, 60, 25, 161, 0, 37, 138, 35, 109, 113, 25, 106, 0, 66, 16, 15, 236, 255, 15, 255, 255, 14, 185, 127, 87, 212, 153, 32, 30, 19, 48, 29, 115, 48, 30, 91, 128, 3, 125, 8, 193, 56, 113, 0, 0, 207, - 254, 30, 208, 255, 124, 27, 74, 255, 0, 1, 223, 254, 64, 19, 207, 255, 152, 96, 93, 231, 3, 66, 32, 41, 135, 19, 237, 62, 179, 68, 11, 43, 96, 3, 128, 87, 208, 208, 3, 192, 11, 135, 147, 3, 103, 150, 0, 21, 31, 31, 235, 255, 31, 255, 255, 9, 29, 225, 143, 13, 31, 242, 23, 58, 23, 66, 240, 0, 98, 20, - 253, 87, 48, 255, 239, 255, 112, 30, 6, 144, 253, 255, 95, 255, 160, 5, 31, 31, 49, 31, 83, 31, 151, 63, 24, 11, 159, 31, 172, 15, 160, 14, 159, 255, 170, 80, 30, 68, 124, 23, 243, 255, 144, 3, 244, 24, 71, 189, 224, 21, 82, 176, 38, 118, 48, 39, 251, 32, 56, 31, 239, 38, 99, 247, 133, 109, 24, 120, 16, 136, - 21, 119, 34, 94, 143, 15, 148, 17, 4, 30, 91, 22, 192, 80, 3, 252, 31, 22, 138, 251, 112, 3, 15, 211, 47, 37, 247, 111, 31, 147, 127, 208, 3, 100, 38, 107, 159, 255, 110, 151, 110, 159, 144, 208, 3, 10, 151, 17, 169, 51, 71, 247, 10, 94, 3, 9, 95, 255, 47, 219, 7, 250, 255, 81, 22, 117, 16, 24, 189, 247, - 127, 255, 211, 181, 127, 31, 113, 8, 48, 240, 32, 244, 0, 71, 254, 98, 0, 28, 255, 255, 177, 223, 25, 64, 74, 62, 33, 119, 30, 33, 30, 244, 247, 31, 112, 247, 71, 107, 75, 127, 255, 48, 146, 255, 96, 3, 11, 16, 45, 5, 255, 199, 255, 235, 46, 98, 25, 18, 31, 255, 4, 119, 0, 186, 4, 30, 65, 12, 252, 134, - 25, 171, 255, 16, 27, 207, 240, 207, 16, 3, 24, 225, 240, 253, 72, 255, 234, 240, 64, 12, 65, 183, 106, 56, 15, 253, 1, 62, 18, 174, 144, 112, 3, 79, 31, 139, 63, 253, 160, 216, 32, 129, 255, 80, 3, 24, 40, 32, 80, 45, 111, 11, 45, 26, 25, 194, 9, 125, 112, 3, 248, 0, 9, 222, 247, 15, 223, 60, 159, 53, - 89, 239, 96, 7, 173, 223, 175, 255, 144, 209, 79, 112, 2, 9, 129, 33, 128, 3, 60, 159, 177, 84, 97, 231, 34, 212, 253, 26, 179, 234, 221, 0, 6, 176, 127, 247, 21, 80, 247, 24, 159, 175, 246, 24, 163, 245, 26, 255, 245, 0, 205, 222, 81, 175, 254, 80, 80, 3, 48, 81, 255, 248, 58, 19, 247, 0, 239, 2, 123, 239, - 9, 190, 7, 255, 210, 0, 254, 135, 182, 8, 111, 255, 9, 128, 255, 10, 145, 255, 11, 162, 149, 1, 51, 81, 252, 5, 11, 255, 247, 223, 11, 55, 251, 48, 3, 166, 230, 25, 66, 48, 28, 209, 31, 33, 252, 0, 23, 158, 46, 31, 166, 39, 163, 225, 31, 167, 249, 0, 92, 37, 243, 166, 255, 94, 254, 239, 7, 158, 19, 31, - 255, 5, 223, 63, 51, 89, 38, 95, 47, 54, 154, 112, 0, 41, 158, 31, 243, 103, 171, 99, 47, 255, 212, 46, 223, 64, 31, 161, 225, 0, 167, 62, 22, 186, 4, 24, 3, 7, 255, 22, 1, 35, 48, 82, 31, 239, 243, 31, 243, 255, 48, 3, 41, 251, 9, 30, 116, 188, 9, 23, 2, 9, 255, 245, 3, 16, 96, 23, 27, 166, - 211, 110, 0, 195, 55, 203, 39, 95, 4, 255, 79, 207, 41, 135, 27, 47, 78, 243, 95, 167, 247, 95, 175, 95, 255, 26, 37, 29, 146, 21, 247, 12, 94, 7, 46, 15, 239, 54, 175, 21, 231, 118, 32, 51, 24, 191, 94, 96, 254, 239, 230, 227, 35, 151, 239, 21, 115, 46, 227, 31, 203, 2, 255, 147, 33, 47, 2, 33, 67, 16, - 0, 3, 1, 63, 255, 2, 85, 31, 135, 247, 199, 251, 40, 3, 113, 0, 21, 0, 243, 254, 6, 255, 16, 243, 127, 255, 128, 24, 4, 255, 241, 254, 255, 249, 32, 255, 254, 48, 85, 78, 15, 112, 15, 255, 48, 6, 120, 73, 251, 31, 66, 252, 73, 31, 70, 219, 15, 191, 0, 31, 94, 1, 48, 3, 16, 35, 221, 186, 218, 15, - 255, 32, 207, 255, 161, 31, 62, 255, 31, 167, 83, 31, 255, 110, 47, 255, 54, 136, 254, 31, 248, 60, 255, 169, 250, 31, 251, 243, 31, 255, 128, 31, 62, 15, 255, 28, 7, 74, 31, 25, 7, 24, 238, 34, 176, 6, 27, 251, 5, 24, 15, 158, 5, 24, 254, 32, 3, 4, 255, 249, 16, 17, 179, 239, 250, 102, 207, 111, 255, 249, - 123, 239, 234, 168, 64, 175, 222, 244, 31, 255, 224, 92, 23, 15, 158, 4, 42, 135, 205, 175, 255, 75, 251, 41, 151, 0, 110, 175, 255, 32, 115, 25, 183, 210, 1, 159, 127, 252, 19, 35, 255, 71, 194, 116, 1, 28, 39, 64, 3, 82, 8, 176, 3, 253, 144, 3, 89, 73, 231, 6, 152, 3, 5, 254, 185, 29, 56, 3, 0, 212, - 0, 248, 82, 147, 214, 15, 250, 254, 3, 25, 255, 32, 3, 235, 0, 49, 16, 15, 255, 100, 2, 89, 183, 1, 121, 42, 15, 255, 2, 97, 235, 152, 9, 66, 243, 2, 45, 79, 254, 77, 59, 74, 35, 83, 207, 253, 223, 45, 63, 128, 90, 183, 32, 10, 118, 255, 121, 8, 1, 67, 70, 0, 3, 191, 63, 155, 46, 7, 12, 122, - 31, 154, 15, 255, 248, 65, 40, 15, 1, 30, 19, 215, 119, 97, 45, 161, 112, 31, 163, 243, 0, 156, 94, 30, 85, 0, 32, 3, 139, 228, 0, 217, 88, 23, 85, 15, 255, 15, 123, 31, 247, 159, 80, 3, 92, 31, 219, 5, 78, 29, 163, 6, 53, 175, 37, 179, 246, 255, 241, 30, 1, 219, 242, 0, 54, 207, 119, 113, 15, 173, - 33, 5, 153, 159, 147, 31, 58, 39, 255, 241, 0, 13, 255, 240, 221, 0, 14, 30, 159, 15, 255, 208, 112, 3, 2, 210, 153, 184, 29, 86, 253, 48, 3, 70, 196, 254, 29, 102, 137, 255, 24, 99, 94, 239, 15, 164, 15, 37, 71, 239, 38, 3, 111, 107, 86, 7, 15, 255, 72, 11, 8, 23, 214, 5, 48, 250, 80, 0, 15, 254, - 128, 30, 220, 160, 31, 115, 175, 208, 25, 20, 240, 16, 91, 243, 10, 255, 250, 220, 247, 15, 39, 165, 0, 0, 179, 31, 255, 16, 226, 218, 0, 192, 6, 103, 3, 1, 36, 72, 87, 11, 95, 255, 222, 4, 100, 175, 179, 86, 119, 119, 80, 40, 88, 123, 72, 94, 255, 255, 32, 6, 31, 254, 79, 255, 189, 244, 31, 179, 64, 127, - 255, 228, 127, 222, 96, 48, 6, 195, 11, 10, 0, 10, 72, 191, 78, 230, 31, 119, 18, 3, 62, 15, 238, 21, 119, 119, 143, 157, 225, 0, 59, 30, 93, 175, 239, 30, 97, 255, 17, 86, 255, 251, 16, 0, 168, 84, 5, 105, 26, 7, 31, 147, 5, 31, 219, 55, 10, 39, 71, 169, 28, 42, 52, 71, 175, 227, 103, 19, 240, 17, - 177, 0, 42, 17, 189, 56, 215, 116, 15, 255, 26, 14, 18, 65, 11, 50, 87, 111, 87, 167, 6, 206, 191, 255, 30, 255, 255, 120, 191, 223, 89, 253, 254, 223, 255, 253, 145, 121, 161, 153, 175, 255, 16, 0, 3, 1, 230, 96, 40, 4, 31, 243, 175, 87, 31, 247, 79, 31, 251, 8, 175, 255, 250, 111, 255, 249, 192, 255, 239, 255, - 64, 26, 3, 51, 35, 255, 250, 255, 96, 0, 55, 97, 15, 47, 27, 11, 31, 247, 83, 31, 211, 14, 31, 255, 13, 82, 7, 159, 127, 253, 32, 251, 0, 255, 232, 137, 189, 106, 191, 253, 221, 210, 221, 220, 239, 194, 192, 90, 187, 40, 199, 176, 15, 170, 255, 28, 15, 255, 255, 15, 255, 6, 18, 215, 1, 207, 0, 29, 128, 26, - 235, 85, 29, 228, 9, 123, 39, 71, 108, 195, 225, 30, 11, 162, 231, 0, 0, 113, 15, 255, 255, 11, 148, 171, 20, 0, 0, 198, 43, 255, 61, 59, 21, 251, 28, 177, 145, 9, 31, 231, 255, 13, 255, 248, 191, 15, 255, 205, 255, 215, 119, 81, 47, 238, 177, 31, 255, 253, 0, 185, 189, 239, 20, 220, 143, 255, 96, 92, 31, 94, - 255, 252, 255, 210, 0, 255, 230, 64, 9, 161, 255, 13, 158, 158, 255, 14, 255, 212, 254, 11, 255, 245, 32, 13, 41, 251, 24, 230, 25, 19, 46, 239, 3, 103, 111, 255, 164, 189, 3, 30, 125, 127, 255, 192, 207, 63, 155, 249, 112, 25, 243, 80, 0, 117, 11, 152, 255, 12, 168, 255, 13, 185, 255, 15, 254, 134, 245, 67, 87, 68, - 72, 31, 255, 172, 31, 255, 50, 127, 47, 255, 9, 0, 9, 1, 5, 7, 0, 255, 4, 4, 0, 5, 5, 0, 20, 20, 239, 0, 18, 18, 32, 2, 19, 19, 0, 15, 143, 15, 32, 2, 16, 8, 16, 17, 6, 6, 0, 17, 254, 17, 0, 14, 14, 0, 23, 23, 80, 29, 12, 16, 38, 16, 44, 112, 38, 64, 53, 24, 24, 32, - 38, 16, 59, 193, 13, 13, 32, 44, 16, 65, 16, 8, 16, 71, 16, 56, 11, 128, 11, 32, 62, 16, 65, 16, 74, 64, 104, 112, 35, 16, 104, 16, 29, 108, 16, 50, 10, 10, 80, 35, 12, 12, 32, 107, 16, 171, 239, 77, 65, 80, 31, 255, 188, 0, 39, 0, 234, 122, 0, 1, 47, 255, 89, 29, 223, 255, 144, 0, 47, 45, - 217, 0, 1, 16, 0, 16, 220, 0, 6, 0, 7, 116, 27, 201, 9, 0, 10, 27, 127, 12, 30, 163, 16, 162, 217, 0, 15, 28, 14, 17, 0, 16, 238, 23, 19, 21, 255, 0, 22, 0, 23, 0, 24, 0, 25, 245, 0, 26, 0, 27, 144, 97, 28, 30, 207, 29, 255, 0, 30, 0, 31, 0, 32, 0, 33, 255, 0, 34, 0, 35, - 0, 36, 0, 37, 95, 48, 123, 38, 16, 151, 40, 0, 41, 0, 42, 255, 0, 43, 0, 44, 0, 45, 0, 46, 244, 0, 47, 0, 48, 80, 151, 49, 80, 187, 29, 235, 75, 31, 15, 2, 108, 90, 16, 67, 0, 16, 69, 1, 0, 128, 233, 65, 125, 15, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 4, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 4, 224, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 3, 192, 64, 3, 112, 1, 1, 64, 27, 0, 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, 79, 79, 84, 32, - 27, 189, 128, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 15, 109, 64, 79, 2, 128, 64, 81, 226, 226, 16, 19, 27, 90, 80, 15, 160, 64, 26, 207, 45, 16, 39, 41, 16, 127, 190, 32, 96, 19, 255, 255, 0, 46, 2, 128, 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, 3, 10, 46, 0, - 46, 46, 0, 101, 117, 255, 101, 110, 103, 108, 105, 115, 104, 0, 255, 109, 101, 115, 115, 97, 103, 101, 46, 239, 98, 109, 103, 96, 11, 105, 100, 46, 116, 255, 98, 108, 0, 115, 116, 114, 117, 99, 158, 116, 48, 10, 160, 199, 77, 69, 83, 71, 16, 44, 183, 49, 80, 187, 2, 2, 208, 228, 73, 78, 70, 126, 16, 27, 0, 96, - 0, 6, 0, 12, 49, 62, 42, 113, 56, 48, 159, 2, 144, 11, 104, 144, 23, 206, 128, 35, 211, 1, 142, 144, 11, 180, 144, 59, 49, 130, 68, 65, 223, 84, 49, 80, 70, 26, 6, 1, 0, 3, 255, 0, 80, 0, 108, 0, 101, 0, 97, 223, 0, 115, 16, 5, 32, 0, 105, 0, 110, 116, 48, 9, 114, 0, 116, 17, 191, 116, - 16, 99, 32, 21, 238, 83, 0, 85, 16, 39, 69, 0, 82, 17, 211, 239, 77, 0, 65, 16, 7, 73, 0, 79, 0, 235, 10, 0, 71, 16, 11, 76, 16, 15, 88, 0, 170, 89, 17, 237, 71, 16, 69, 109, 48, 69, 68, 16, 71, 228, 115, 0, 99, 17, 44, 0, 101, 92, 84, 80, 175, 0, 137, 0, 186, 32, 16, 141, 111, 0, - 117, 16, 235, 100, 18, 151, 149, 110, 16, 11, 32, 223, 98, 48, 243, 114, 48, 255, 100, 69, 17, 218, 10, 209, 13, 96, 25, 129, 9, 87, 17, 33, 105, 117, 18, 217, 79, 0, 112, 49, 37, 97, 17, 39, 105, 42, 16, 89, 33, 53, 10, 17, 27, 97, 17, 63, 117, 17, 77, 170, 108, 18, 253, 102, 16, 113, 114, 19, 5, 109, - 48, 7, 34, 97, 93, 64, 21, 109, 144, 57, 33, 37, 1, 97, 4, 32, 177, 97, 170, 0, 17, 107, 97, 16, 195, 110, 17, 89, 104, 81, 171, 165, 116, 16, 213, 32, 17, 189, 64, 223, 115, 17, 127, 105, 37, 48, 237, 32, 207, 118, 17, 215, 32, 33, 117, 48, 225, 33, 87, 115, 129, 6, 82, 71, 40, 19, 163, 8, 33, 157, - 223, 67, 98, 50, 251, 4, 0, 6, 4, 56, 212, 56, 178, 83, 7, 0, 211, 175, 8, 82, 123, 35, 51, 171, 3, 19, 219, 24, 19, 223, 4, 147, 199, 43, 67, 255, 79, 77, 77, 69, 78, 84, 0, 68, 253, 73, 83, 67, 95, 48, 49, 80, 7, 50, 127, 80, 15, 51, 0, 84, 73, 84, 76, 69, 251, 95, 77, 65, 73, 78, - 80, 10, 83, 85, 229, 66, 0, 64, 0, 0, 0, 144, 111, 112, 36, 67, 174, 239, 55, 113, 97, 96, 147, 28, 19, 62, 141, 124, 80, 171, 0, 190, 198, 20, 162, 51, 179, 16, 153, 247, 100, 67, 164, 76, 51, 191, 12, 0, 0, 243, 19, 54, 175, 66, 51, 203, 19, 221, 137, 230, 191, 39, 67, 215, 20, 0, 0, 251, 104, 17, - 158, 53, 51, 227, 16, 185, 23, 177, 123, 254, 51, 239, 170, 28, 116, 149, 4, 81, 23, 7, 80, 235, 9, 20, 191, 160, 10, 20, 195, 11, 224, 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 82, 192, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 82, - 192, 243, 0, 0, 0, 32, 16, 3, 16, 7, 81, 224, 42, 64, 3, 112, 1, 1, 80, 27, 3, 16, 35, 64, 80, 3, 231, 128, 0, 3, 32, 22, 16, 57, 79, 79, 84, 115, 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, 67, 212, 246, 17, 0, 0, 18, 64, 79, 81, 220, 32, 87, 250, 255, 255, 0, 46, 2, 128, 96, 16, - 80, 19, 177, 184, 16, 19, 2, 255, 16, 0, 96, 19, 32, 131, 46, 255, 0, 46, 46, 0, 101, 109, 98, 101, 255, 100, 100, 101, 100, 102, 111, 110, 116, 255, 0, 109, 101, 115, 115, 97, 103, 101, 126, 32, 11, 50, 54, 46, 98, 114, 102, 16, 19, 127, 0, 0, 8, 82, 70, 78, 84, 254, 255, 1, 191, 4, 48, 123, 16, 0, - 5, 70, 73, 78, 182, 70, 32, 235, 1, 33, 16, 241, 27, 27, 32, 219, 251, 56, 0, 0, 80, 104, 16, 247, 8, 33, 254, 27, 26, 0, 84, 71, 76, 80, 16, 15, 255, 48, 24, 25, 19, 24, 0, 0, 8, 229, 0, 0, 10, 32, 221, 17, 3, 128, 49, 31, 96, 190, 0, 0, 0, 102, 127, 255, 176, 0, 111, 16, 3, 234, - 95, 255, 160, 16, 3, 144, 48, 3, 63, 16, 7, 127, 0, 0, 179, 2, 118, 0, 0, 159, 255, 0, 191, 11, 18, 25, 143, 255, 255, 4, 255, 255, 255, 223, 13, 255, 252, 11, 127, 255, 243, 165, 4, 98, 32, 228, 34, 55, 18, 161, 255, 18, 169, 255, 171, 244, 18, 67, 251, 34, 71, 16, 146, 166, 4, 190, 233, 0, 0, 6, - 18, 59, 2, 34, 63, 34, 67, 35, 62, 32, 88, 34, 199, 19, 86, 119, 117, 255, 144, 0, 246, 202, 118, 84, 69, 48, 63, 251, 0, 48, 95, 171, 65, 34, 147, 232, 34, 151, 209, 18, 155, 250, 0, 190, 141, 18, 160, 9, 255, 253, 0, 207, 32, 104, 117, 1, 96, 110, 63, 255, 112, 48, 3, 47, 16, 7, 31, 215, 255, 96, - 16, 3, 80, 48, 3, 13, 221, 64, 99, 2, 139, 80, 4, 32, 2, 239, 49, 36, 63, 19, 72, 0, 14, 85, 20, 99, 111, 20, 103, 207, 65, 163, 7, 19, 231, 12, 90, 19, 238, 144, 49, 199, 255, 248, 20, 23, 241, 20, 27, 186, 160, 20, 31, 150, 121, 189, 36, 7, 250, 20, 12, 174, 239, 16, 254, 175, 17, 244, 95, 255, - 240, 17, 2, 255, 244, 0, 14, 255, 251, 128, 239, 255, 212, 255, 224, 20, 39, 240, 20, 43, 241, 84, 159, 96, 3, 127, 244, 130, 255, 253, 22, 223, 255, 253, 175, 239, 255, 255, 253, 18, 88, 253, 111, 255, 255, 205, 254, 41, 16, 91, 52, 131, 0, 239, 32, 7, 254, 255, 80, 0, 254, 129, 0, 0, 234, 97, 94, 36, 151, 128, - 20, 155, 249, 0, 24, 255, 18, 105, 254, 223, 255, 80, 42, 255, 255, 48, 3, 95, 111, 235, 7, 203, 16, 51, 251, 223, 17, 0, 175, 255, 247, 208, 0, 9, 238, 1, 247, 60, 3, 239, 243, 213, 0, 13, 19, 77, 14, 18, 240, 6, 33, 133, 39, 173, 80, 4, 227, 60, 31, 21, 207, 95, 255, 51, 223, 0, 171, 158, 37, 219, - 37, 166, 39, 244, 33, 200, 119, 83, 199, 16, 176, 54, 84, 70, 132, 166, 71, 220, 255, 255, 199, 80, 1, 33, 135, 16, 7, 17, 147, 112, 0, 50, 190, 17, 5, 130, 27, 223, 255, 54, 140, 223, 22, 84, 92, 32, 3, 207, 22, 92, 121, 135, 100, 178, 211, 18, 24, 127, 22, 143, 226, 0, 255, 250, 16, 0, 183, 141, 32, 5, - 77, 180, 0, 197, 255, 7, 180, 84, 59, 0, 22, 53, 0, 250, 0, 191, 255, 0, 10, 24, 225, 95, 22, 64, 157, 223, 22, 80, 25, 88, 20, 119, 100, 24, 243, 255, 186, 251, 102, 131, 251, 134, 140, 36, 88, 60, 169, 47, 73, 36, 104, 250, 41, 27, 25, 13, 246, 73, 136, 147, 11, 1, 234, 53, 0, 74, 20, 173, 127, 25, - 57, 63, 25, 61, 252, 15, 235, 152, 0, 2, 63, 25, 39, 32, 3, 250, 0, 0, 119, 117, 64, 32, 95, 198, 102, 227, 238, 99, 53, 141, 21, 45, 0, 94, 241, 73, 179, 66, 121, 202, 230, 41, 123, 24, 49, 53, 107, 23, 76, 255, 104, 62, 233, 1, 51, 85, 22, 240, 255, 21, 146, 64, 3, 5, 231, 207, 234, 0, 22, 112, - 67, 179, 0, 0, 103, 239, 121, 155, 188, 167, 63, 151, 118, 85, 51, 170, 210, 26, 48, 208, 90, 36, 96, 83, 187, 144, 80, 3, 184, 16, 250, 8, 35, 69, 0, 21, 197, 68, 3, 36, 7, 213, 105, 152, 26, 111, 221, 26, 115, 239, 42, 103, 86, 239, 119, 137, 154, 167, 159, 119, 101, 84, 51, 80, 38, 221, 255, 84, 137, 187, - 25, 145, 23, 5, 64, 187, 24, 241, 165, 33, 9, 132, 16, 11, 41, 49, 26, 186, 255, 88, 27, 103, 249, 0, 58, 255, 255, 9, 84, 3, 23, 227, 101, 213, 255, 252, 22, 115, 176, 74, 229, 117, 21, 229, 255, 215, 254, 112, 26, 151, 208, 26, 155, 64, 0, 106, 180, 235, 88, 57, 1, 18, 5, 255, 15, 3, 16, 48, 40, 43, - 190, 12, 22, 192, 14, 255, 245, 0, 15, 48, 3, 191, 247, 22, 217, 253, 0, 8, 255, 255, 177, 82, 10, 47, 13, 22, 10, 79, 10, 197, 117, 63, 96, 3, 15, 144, 3, 164, 14, 27, 39, 13, 55, 0, 39, 4, 243, 144, 3, 25, 30, 222, 6, 245, 23, 107, 245, 0, 43, 255, 38, 50, 148, 111, 23, 59, 39, 63, 143, 22, - 62, 223, 55, 111, 18, 47, 133, 253, 73, 71, 55, 5, 27, 117, 25, 58, 254, 24, 244, 250, 75, 23, 146, 247, 22, 15, 32, 200, 243, 32, 3, 181, 87, 225, 120, 152, 255, 85, 63, 37, 71, 17, 154, 165, 128, 4, 70, 11, 15, 10, 133, 85, 130, 80, 3, 23, 247, 0, 191, 144, 3, 158, 159, 32, 3, 33, 227, 255, 237, 221, - 221, 121, 159, 74, 32, 11, 144, 129, 235, 44, 135, 211, 144, 223, 211, 7, 32, 0, 76, 28, 47, 11, 81, 15, 97, 31, 13, 255, 67, 139, 26, 73, 245, 16, 91, 205, 249, 27, 60, 244, 27, 60, 243, 233, 0, 93, 203, 41, 209, 247, 28, 236, 16, 254, 0, 43, 33, 157, 24, 75, 242, 28, 115, 243, 28, 119, 245, 169, 231, 207, - 255, 145, 24, 108, 38, 103, 80, 5, 255, 225, 255, 112, 78, 16, 3, 8, 220, 15, 44, 175, 35, 151, 6, 103, 44, 183, 41, 239, 106, 115, 109, 63, 184, 120, 173, 121, 170, 122, 254, 87, 119, 100, 179, 30, 48, 135, 64, 85, 66, 223, 146, 13, 64, 3, 13, 80, 207, 11, 80, 231, 5, 179, 119, 173, 103, 251, 157, 122, 217, 20, - 95, 216, 32, 135, 101, 216, 177, 24, 210, 48, 239, 8, 200, 7, 14, 255, 252, 58, 52, 175, 18, 200, 0, 0, 77, 45, 123, 54, 173, 199, 239, 85, 87, 172, 171, 58, 252, 119, 117, 66, 84, 189, 230, 249, 30, 56, 252, 91, 112, 132, 14, 0, 4, 33, 231, 133, 143, 67, 143, 48, 3, 201, 159, 41, 239, 176, 64, 3, 254, 146, - 160, 13, 93, 35, 34, 87, 46, 225, 119, 135, 223, 185, 49, 33, 123, 39, 251, 4, 156, 239, 236, 0, 31, 0, 255, 112, 126, 30, 115, 128, 253, 159, 255, 144, 112, 45, 87, 199, 37, 84, 8, 5, 255, 9, 21, 255, 239, 255, 17, 52, 48, 84, 28, 164, 144, 30, 194, 176, 30, 191, 176, 31, 171, 37, 116, 148, 208, 60, 180, 79, - 255, 37, 82, 255, 143, 100, 247, 84, 255, 177, 175, 47, 255, 67, 32, 131, 3, 60, 255, 212, 255, 0, 234, 17, 19, 32, 24, 86, 144, 24, 90, 176, 48, 3, 172, 175, 28, 15, 159, 31, 9, 159, 255, 103, 130, 12, 3, 45, 202, 69, 82, 28, 3, 37, 247, 249, 29, 146, 249, 31, 135, 85, 32, 3, 250, 31, 4, 251, 159, 255, - 45, 44, 44, 0, 237, 0, 78, 255, 37, 86, 0, 79, 63, 167, 246, 90, 104, 187, 248, 85, 79, 255, 227, 20, 15, 16, 72, 11, 65, 159, 255, 83, 39, 41, 30, 6, 61, 243, 70, 199, 40, 191, 111, 130, 255, 111, 223, 53, 3, 36, 207, 85, 159, 47, 121, 240, 14, 107, 36, 84, 47, 211, 6, 31, 255, 10, 31, 255, 12, 47, - 255, 38, 177, 138, 239, 56, 239, 41, 39, 39, 231, 160, 87, 235, 241, 111, 223, 164, 66, 64, 159, 7, 86, 59, 40, 251, 143, 94, 33, 72, 207, 165, 253, 84, 227, 255, 89, 163, 30, 33, 0, 62, 29, 79, 252, 255, 240, 4, 159, 255, 252, 40, 91, 23, 239, 185, 255, 25, 66, 255, 3, 127, 87, 67, 33, 83, 0, 252, 17, 191, - 222, 255, 251, 191, 21, 58, 16, 3, 186, 253, 16, 7, 219, 223, 17, 135, 19, 223, 37, 159, 35, 56, 219, 160, 3, 80, 128, 3, 49, 227, 34, 79, 127, 255, 165, 224, 30, 7, 240, 48, 3, 47, 12, 95, 31, 45, 95, 16, 128, 192, 15, 255, 39, 33, 227, 8, 29, 251, 121, 251, 144, 3, 24, 220, 251, 63, 255, 254, 64, 239, - 17, 212, 255, 254, 54, 26, 47, 26, 152, 255, 252, 42, 55, 248, 0, 29, 75, 202, 228, 23, 38, 251, 15, 255, 9, 161, 63, 255, 143, 75, 19, 10, 16, 49, 45, 141, 79, 121, 143, 129, 224, 31, 192, 176, 90, 59, 169, 112, 90, 75, 80, 80, 3, 128, 15, 124, 13, 95, 156, 15, 85, 31, 255, 47, 31, 255, 95, 86, 103, 175, - 88, 115, 255, 27, 57, 157, 24, 228, 32, 175, 255, 239, 29, 231, 159, 255, 255, 16, 255, 79, 255, 96, 255, 13, 255, 178, 176, 26, 12, 242, 253, 34, 199, 34, 203, 11, 27, 175, 239, 47, 255, 239, 31, 95, 127, 2, 255, 250, 249, 95, 12, 255, 242, 63, 31, 114, 27, 105, 48, 161, 63, 113, 139, 112, 71, 75, 59, 63, 102, 179, - 43, 0, 11, 29, 25, 236, 35, 47, 41, 59, 8, 255, 234, 10, 253, 1, 239, 82, 146, 58, 221, 246, 255, 80, 87, 255, 28, 16, 239, 10, 109, 2, 187, 79, 25, 226, 63, 255, 242, 27, 247, 243, 0, 226, 63, 253, 211, 14, 161, 63, 39, 247, 41, 255, 1, 80, 3, 107, 219, 189, 48, 44, 47, 124, 127, 31, 124, 3, 223, 149, - 96, 75, 87, 191, 255, 254, 43, 155, 225, 67, 11, 245, 73, 8, 103, 3, 223, 95, 251, 44, 79, 4, 43, 239, 188, 147, 249, 237, 120, 155, 239, 172, 91, 103, 119, 200, 193, 240, 34, 154, 223, 0, 252, 4, 6, 84, 87, 105, 31, 201, 127, 251, 26, 223, 166, 249, 27, 1, 247, 27, 141, 29, 87, 55, 65, 232, 127, 186, 249, 29, - 81, 208, 0, 63, 18, 214, 47, 28, 114, 131, 31, 233, 191, 37, 97, 45, 76, 48, 3, 29, 80, 17, 16, 62, 15, 255, 255, 15, 255, 241, 18, 0, 0, 174, 251, 51, 66, 85, 30, 15, 96, 30, 19, 192, 28, 121, 242, 28, 67, 249, 85, 95, 227, 36, 77, 187, 11, 87, 3, 5, 31, 187, 2, 112, 102, 78, 0, 97, 0, 79, - 243, 171, 75, 54, 99, 206, 125, 148, 2, 78, 211, 44, 215, 127, 75, 175, 11, 29, 179, 47, 190, 243, 87, 117, 16, 175, 59, 255, 95, 165, 166, 106, 101, 39, 134, 79, 32, 71, 7, 63, 255, 32, 80, 99, 255, 43, 31, 172, 20, 77, 0, 39, 217, 255, 128, 96, 35, 0, 199, 6, 207, 79, 255, 39, 219, 21, 229, 0, 0, 52, - 55, 53, 63, 79, 159, 118, 82, 175, 255, 169, 85, 85, 181, 142, 31, 204, 1, 255, 159, 232, 232, 45, 79, 209, 42, 64, 57, 36, 49, 239, 31, 176, 207, 13, 62, 4, 9, 79, 155, 149, 3, 99, 175, 48, 192, 2, 16, 192, 127, 208, 192, 254, 32, 91, 137, 45, 48, 251, 41, 35, 38, 127, 16, 192, 29, 178, 24, 126, 154, 251, - 45, 114, 159, 159, 4, 190, 145, 87, 239, 65, 115, 222, 0, 5, 47, 255, 19, 86, 119, 117, 173, 132, 245, 233, 117, 67, 70, 62, 255, 253, 134, 71, 255, 42, 31, 108, 72, 23, 247, 30, 148, 253, 61, 206, 12, 96, 32, 55, 15, 255, 9, 30, 39, 255, 6, 87, 247, 7, 255, 249, 126, 24, 3, 243, 223, 9, 255, 243, 111, 16, - 3, 250, 13, 11, 255, 243, 4, 29, 236, 239, 30, 206, 180, 207, 17, 114, 191, 251, 78, 239, 159, 21, 47, 24, 49, 117, 30, 105, 255, 160, 223, 61, 251, 80, 8, 3, 1, 96, 74, 87, 255, 63, 25, 99, 47, 184, 207, 29, 201, 239, 56, 192, 82, 33, 92, 80, 58, 11, 111, 23, 136, 9, 11, 12, 28, 40, 96, 168, 143, 26, - 42, 95, 24, 62, 63, 26, 142, 24, 174, 48, 15, 162, 239, 30, 24, 255, 40, 196, 30, 193, 128, 3, 0, 224, 3, 191, 223, 24, 235, 4, 255, 16, 1, 143, 255, 207, 37, 175, 79, 162, 45, 72, 127, 255, 179, 255, 196, 91, 113, 72, 167, 25, 4, 49, 243, 226, 29, 191, 30, 199, 168, 178, 255, 159, 63, 89, 75, 207, 89, 79, - 71, 247, 72, 19, 170, 111, 58, 64, 208, 87, 235, 64, 94, 167, 80, 88, 19, 45, 48, 220, 0, 192, 5, 1, 18, 96, 28, 255, 50, 129, 5, 39, 144, 3, 41, 247, 7, 160, 3, 30, 221, 4, 255, 251, 251, 1, 175, 255, 251, 30, 31, 33, 159, 255, 91, 57, 138, 250, 31, 176, 249, 13, 19, 157, 1, 207, 138, 223, 26, 194, - 58, 15, 26, 192, 251, 31, 59, 160, 170, 203, 7, 38, 220, 15, 255, 13, 17, 227, 48, 3, 41, 238, 11, 223, 245, 38, 14, 252, 0, 31, 253, 12, 31, 255, 16, 175, 255, 0, 23, 75, 74, 22, 130, 98, 191, 159, 30, 109, 254, 83, 255, 144, 15, 159, 4, 59, 83, 147, 27, 119, 0, 0, 141, 239, 198, 216, 85, 189, 105, 191, - 159, 37, 119, 100, 16, 214, 223, 0, 98, 28, 41, 0, 250, 81, 95, 15, 162, 1, 106, 139, 191, 80, 3, 52, 8, 159, 0, 88, 255, 221, 96, 15, 159, 34, 14, 39, 247, 43, 231, 151, 78, 15, 159, 3, 144, 192, 125, 42, 79, 37, 122, 255, 43, 91, 191, 95, 191, 247, 75, 175, 213, 31, 203, 234, 97, 93, 47, 175, 217, 31, - 203, 250, 2, 158, 42, 58, 91, 142, 80, 84, 79, 160, 3, 199, 191, 249, 0, 10, 49, 3, 53, 28, 160, 43, 141, 52, 82, 239, 255, 250, 29, 174, 255, 236, 227, 4, 239, 29, 121, 28, 250, 90, 129, 15, 255, 255, 26, 15, 255, 255, 223, 119, 26, 115, 24, 239, 61, 59, 111, 29, 255, 244, 255, 255, 231, 10, 23, 66, 14, 28, - 123, 47, 255, 220, 87, 118, 21, 35, 255, 253, 64, 44, 140, 35, 163, 169, 32, 38, 92, 6, 23, 99, 12, 5, 191, 11, 207, 218, 140, 211, 221, 222, 31, 255, 255, 48, 3, 20, 198, 0, 35, 203, 49, 24, 102, 223, 30, 99, 19, 171, 67, 255, 255, 212, 237, 221, 166, 223, 32, 93, 95, 144, 157, 107, 207, 158, 210, 4, 98, 78, - 247, 79, 93, 171, 94, 7, 9, 40, 7, 75, 79, 255, 231, 24, 180, 27, 131, 8, 20, 74, 5, 96, 49, 219, 99, 47, 234, 138, 201, 71, 79, 77, 221, 79, 107, 223, 181, 255, 100, 48, 18, 52, 79, 75, 223, 94, 11, 159, 20, 95, 251, 32, 111, 72, 155, 128, 144, 159, 192, 139, 247, 47, 203, 223, 0, 5, 19, 179, 13, 255, - 232, 0, 31, 85, 30, 119, 95, 29, 207, 175, 31, 6, 239, 29, 128, 255, 181, 255, 165, 159, 11, 239, 79, 187, 12, 92, 11, 9, 116, 92, 23, 0, 0, 49, 89, 95, 247, 80, 3, 41, 148, 84, 21, 15, 44, 25, 2, 111, 15, 63, 6, 168, 73, 39, 124, 171, 234, 110, 201, 96, 30, 201, 240, 30, 34, 192, 31, 180, 94, 40, - 39, 112, 48, 227, 15, 255, 250, 16, 30, 62, 214, 251, 2, 37, 223, 43, 47, 15, 23, 207, 87, 123, 109, 95, 154, 55, 176, 41, 223, 255, 181, 46, 249, 231, 106, 36, 191, 176, 107, 40, 100, 45, 31, 115, 10, 15, 63, 12, 32, 104, 98, 0, 3, 1, 3, 96, 3, 129, 115, 0, 7, 4, 15, 255, 15, 34, 131, 168, 14, 31, - 217, 15, 31, 40, 15, 30, 99, 34, 180, 34, 151, 170, 8, 25, 33, 3, 15, 223, 3, 1, 89, 87, 11, 31, 175, 160, 111, 41, 227, 191, 89, 235, 40, 150, 56, 15, 90, 65, 55, 220, 50, 17, 181, 66, 91, 10, 255, 77, 171, 58, 247, 223, 95, 171, 171, 63, 19, 33, 10, 29, 151, 31, 22, 159, 127, 253, 42, 56, 111, 27, - 53, 96, 23, 155, 176, 19, 72, 246, 46, 26, 10, 31, 200, 22, 188, 30, 253, 77, 139, 96, 135, 47, 208, 125, 255, 154, 4, 171, 79, 33, 127, 159, 0, 65, 219, 31, 25, 230, 199, 159, 254, 72, 124, 31, 206, 31, 240, 96, 8, 255, 223, 255, 128, 23, 251, 192, 47, 255, 255, 241, 213, 143, 255, 31, 85, 6, 31, 89, 10, 23, - 190, 13, 87, 31, 201, 47, 25, 81, 111, 27, 27, 191, 255, 254, 250, 2, 255, 191, 255, 40, 64, 127, 253, 87, 71, 167, 244, 94, 11, 176, 79, 183, 59, 124, 137, 135, 119, 30, 41, 201, 25, 163, 51, 251, 0, 1, 51, 51, 179, 23, 235, 223, 255, 252, 30, 223, 245, 30, 227, 112, 255, 232, 235, 113, 0, 14, 62, 33, 3, 145, - 239, 243, 119, 41, 2, 74, 112, 3, 221, 14, 156, 34, 41, 151, 63, 111, 155, 25, 239, 223, 239, 249, 33, 57, 175, 158, 250, 4, 103, 100, 18, 207, 63, 23, 133, 42, 195, 245, 92, 99, 15, 162, 1, 13, 132, 167, 31, 7, 255, 1, 80, 87, 26, 86, 208, 45, 255, 252, 16, 209, 0, 87, 200, 165, 64, 2, 193, 17, 168, 47, - 248, 191, 253, 223, 255, 254, 29, 23, 248, 223, 255, 255, 224, 119, 19, 114, 48, 0, 70, 201, 5, 111, 255, 223, 167, 255, 18, 9, 255, 19, 138, 37, 91, 247, 0, 3, 145, 118, 191, 225, 43, 96, 225, 8, 21, 255, 15, 255, 254, 29, 230, 5, 220, 207, 160, 30, 56, 243, 0, 30, 31, 59, 46, 60, 25, 115, 87, 51, 194, 31, - 138, 30, 248, 60, 243, 20, 126, 80, 254, 79, 255, 253, 226, 239, 255, 242, 31, 175, 79, 187, 81, 209, 92, 247, 4, 2, 1, 48, 0, 2, 175, 169, 208, 30, 244, 247, 60, 15, 5, 224, 95, 127, 135, 7, 126, 31, 146, 79, 160, 0, 1, 239, 244, 31, 91, 140, 253, 26, 217, 56, 29, 31, 255, 190, 80, 85, 71, 46, 66, 87, - 27, 7, 255, 30, 148, 251, 10, 233, 141, 1, 87, 116, 105, 5, 46, 21, 5, 120, 71, 243, 10, 87, 247, 160, 3, 0, 215, 0, 146, 31, 230, 243, 0, 3, 2, 2, 103, 99, 42, 11, 236, 48, 48, 99, 239, 86, 111, 223, 70, 231, 127, 77, 179, 168, 46, 47, 50, 249, 31, 178, 192, 30, 75, 25, 19, 29, 232, 148, 255, 17, - 120, 38, 116, 238, 31, 52, 69, 40, 68, 0, 95, 19, 170, 1, 37, 155, 127, 85, 75, 4, 190, 63, 114, 31, 150, 173, 236, 63, 154, 247, 31, 160, 208, 253, 25, 20, 40, 84, 16, 104, 10, 22, 196, 11, 29, 252, 208, 95, 83, 3, 28, 106, 105, 71, 235, 7, 255, 72, 11, 143, 83, 27, 56, 33, 252, 95, 29, 203, 251, 126, - 188, 64, 4, 203, 176, 0, 226, 40, 207, 16, 31, 236, 49, 67, 31, 252, 48, 90, 15, 82, 96, 195, 160, 87, 247, 240, 81, 211, 73, 227, 7, 208, 3, 90, 40, 103, 5, 48, 3, 247, 191, 159, 30, 229, 27, 157, 235, 64, 0, 8, 26, 212, 4, 31, 238, 6, 246, 245, 16, 0, 12, 211, 47, 235, 48, 88, 91, 243, 39, 72, - 179, 51, 31, 246, 71, 239, 14, 241, 15, 223, 255, 248, 191, 9, 25, 211, 1, 191, 254, 16, 0, 6, 171, 227, 7, 94, 2, 241, 23, 94, 251, 27, 75, 251, 0, 202, 1, 250, 1, 138, 63, 33, 227, 9, 30, 195, 8, 52, 118, 187, 237, 14, 187, 60, 13, 221, 221, 15, 241, 10, 221, 221, 22, 0, 31, 12, 97, 32, 75, 239, - 46, 31, 215, 3, 223, 90, 187, 86, 127, 255, 48, 27, 3, 252, 41, 230, 255, 250, 27, 65, 253, 160, 207, 103, 98, 0, 50, 175, 191, 246, 67, 91, 175, 252, 80, 3, 11, 30, 1, 81, 235, 42, 3, 3, 253, 125, 239, 188, 246, 251, 102, 207, 253, 93, 28, 215, 234, 107, 239, 235, 249, 63, 224, 74, 83, 249, 8, 107, 20, 66, - 15, 255, 192, 15, 12, 131, 12, 46, 87, 15, 255, 255, 11, 195, 24, 54, 15, 223, 10, 214, 118, 32, 10, 84, 47, 21, 79, 255, 23, 101, 75, 195, 106, 192, 3, 119, 81, 72, 127, 64, 85, 55, 144, 0, 3, 1, 113, 10, 214, 42, 20, 119, 81, 7, 40, 27, 93, 243, 93, 175, 6, 123, 85, 183, 0, 0, 38, 118, 46, 51, - 254, 80, 94, 31, 27, 64, 31, 31, 16, 255, 117, 140, 63, 163, 189, 246, 11, 115, 77, 3, 103, 98, 20, 15, 127, 10, 87, 79, 7, 56, 19, 77, 57, 211, 45, 251, 1, 255, 255, 179, 186, 7, 30, 60, 12, 255, 242, 31, 78, 208, 31, 82, 166, 224, 30, 59, 96, 71, 255, 31, 27, 20, 157, 239, 73, 126, 14, 13, 18, 26, - 255, 0, 2, 239, 255, 31, 66, 92, 46, 95, 230, 31, 108, 80, 0, 239, 40, 72, 31, 5, 246, 239, 255, 32, 255, 28, 191, 255, 255, 47, 39, 244, 127, 255, 16, 54, 39, 55, 111, 87, 59, 26, 107, 186, 2, 40, 109, 0, 0, 112, 0, 3, 5, 80, 79, 220, 133, 42, 79, 151, 16, 55, 16, 192, 25, 62, 249, 31, 174, 248, - 85, 20, 23, 205, 26, 107, 211, 31, 128, 177, 31, 132, 254, 251, 255, 185, 223, 255, 145, 42, 79, 91, 255, 191, 254, 23, 82, 210, 255, 255, 214, 64, 254, 209, 148, 3, 117, 79, 96, 13, 35, 1, 78, 235, 39, 247, 158, 42, 64, 143, 48, 3, 123, 95, 171, 1, 63, 175, 247, 62, 195, 186, 245, 112, 3, 252, 119, 114, 58, 151, - 253, 95, 204, 74, 8, 95, 21, 111, 79, 255, 41, 251, 13, 31, 234, 15, 31, 238, 163, 14, 31, 242, 11, 33, 25, 38, 93, 40, 5, 95, 253, 242, 48, 5, 31, 242, 24, 132, 30, 178, 63, 31, 198, 214, 159, 250, 43, 72, 112, 75, 11, 255, 160, 95, 215, 167, 192, 88, 11, 224, 79, 235, 7, 34, 15, 255, 250, 32, 69, 27, - 210, 255, 24, 170, 33, 59, 47, 71, 103, 188, 25, 159, 165, 128, 31, 163, 224, 57, 243, 34, 11, 117, 3, 243, 30, 175, 205, 255, 211, 31, 158, 66, 99, 0, 110, 44, 79, 71, 95, 191, 228, 78, 159, 158, 252, 95, 255, 118, 32, 210, 3, 51, 175, 255, 80, 208, 3, 251, 80, 11, 24, 241, 85, 60, 79, 175, 41, 71, 239, 231, - 159, 32, 28, 67, 236, 62, 34, 98, 26, 200, 255, 255, 253, 80, 103, 212, 180, 138, 192, 82, 95, 9, 33, 10, 31, 255, 191, 31, 255, 159, 91, 35, 103, 179, 115, 255, 16, 89, 127, 31, 96, 255, 128, 0, 204, 0, 33, 15, 103, 31, 41, 231, 0, 175, 44, 251, 154, 111, 169, 12, 31, 255, 31, 63, 222, 235, 26, 97, 58, 99, - 253, 251, 72, 4, 119, 64, 12, 29, 136, 95, 252, 210, 134, 106, 138, 20, 240, 65, 231, 48, 7, 224, 82, 3, 165, 96, 66, 127, 210, 15, 243, 255, 15, 255, 131, 2, 15, 255, 10, 123, 238, 239, 254, 182, 15, 255, 78, 5, 121, 146, 31, 109, 164, 243, 30, 125, 243, 30, 125, 160, 3, 245, 0, 155, 11, 14, 125, 24, 149, 87, - 28, 169, 26, 169, 143, 28, 157, 159, 31, 189, 29, 207, 255, 225, 48, 19, 1, 65, 55, 152, 118, 0, 3, 210, 255, 253, 30, 179, 253, 29, 54, 96, 3, 252, 29, 66, 182, 251, 15, 255, 76, 19, 53, 15, 255, 10, 17, 103, 8, 95, 12, 183, 4, 9, 64, 15, 1, 51, 15, 223, 10, 81, 5, 118, 124, 15, 26, 47, 8, 255, - 247, 207, 7, 31, 230, 80, 3, 178, 248, 16, 11, 64, 6, 31, 232, 33, 58, 5, 63, 251, 157, 194, 40, 219, 43, 71, 112, 86, 223, 24, 8, 47, 85, 22, 85, 14, 22, 89, 13, 22, 93, 15, 6, 97, 17, 79, 74, 22, 149, 95, 30, 157, 64, 3, 192, 31, 22, 176, 112, 3, 201, 143, 255, 9, 194, 46, 47, 42, 251, 31, - 154, 96, 3, 249, 69, 48, 3, 8, 62, 84, 64, 3, 15, 255, 47, 191, 86, 91, 159, 74, 94, 7, 143, 95, 219, 47, 223, 95, 40, 189, 113, 31, 255, 105, 61, 162, 251, 87, 39, 41, 143, 48, 240, 96, 3, 207, 235, 255, 251, 16, 31, 193, 192, 31, 197, 243, 247, 255, 127, 255, 246, 160, 11, 255, 247, 112, 162, 9, 80, 3, - 10, 24, 56, 31, 1, 64, 3, 9, 87, 255, 159, 8, 90, 87, 42, 91, 6, 255, 247, 223, 255, 124, 109, 254, 255, 255, 230, 92, 255, 31, 235, 41, 57, 182, 223, 30, 79, 239, 251, 79, 250, 0, 225, 94, 99, 42, 104, 115, 96, 3, 254, 6, 125, 19, 249, 49, 231, 4, 31, 135, 229, 3, 255, 218, 13, 95, 2, 33, 231, 224, - 58, 16, 13, 211, 221, 208, 15, 255, 31, 159, 25, 194, 64, 3, 128, 0, 227, 157, 239, 112, 14, 162, 63, 17, 75, 112, 3, 10, 221, 149, 247, 15, 2, 64, 42, 147, 95, 108, 155, 221, 239, 194, 176, 87, 82, 212, 208, 48, 3, 109, 254, 139, 112, 11, 255, 219, 245, 96, 21, 92, 80, 13, 16, 3, 12, 221, 162, 225, 15, 255, - 8, 3, 80, 3, 207, 255, 33, 227, 251, 26, 216, 186, 252, 26, 220, 219, 0, 3, 240, 127, 253, 90, 107, 66, 42, 115, 218, 14, 232, 255, 15, 249, 255, 15, 255, 60, 6, 125, 46, 18, 6, 222, 11, 221, 0, 54, 6, 222, 46, 2, 85, 113, 15, 224, 11, 21, 116, 15, 160, 76, 20, 103, 118, 8, 227, 30, 5, 39, 146, 31, - 255, 178, 10, 76, 3, 7, 191, 140, 199, 31, 50, 233, 31, 54, 130, 248, 31, 58, 22, 53, 31, 162, 39, 147, 9, 67, 49, 93, 77, 247, 225, 127, 255, 255, 31, 110, 38, 154, 31, 170, 37, 238, 192, 87, 95, 255, 64, 31, 255, 244, 31, 170, 254, 16, 3, 164, 239, 30, 109, 79, 30, 97, 103, 255, 31, 46, 101, 7, 62, 15, - 170, 61, 31, 243, 255, 48, 3, 159, 25, 147, 159, 30, 153, 186, 159, 30, 181, 159, 255, 80, 31, 230, 49, 29, 147, 157, 48, 39, 27, 39, 67, 48, 6, 255, 87, 95, 79, 106, 79, 207, 0, 207, 191, 66, 48, 95, 167, 112, 95, 175, 149, 64, 69, 255, 106, 180, 247, 30, 99, 254, 31, 174, 255, 87, 160, 3, 6, 29, 160, 127, - 29, 152, 255, 255, 241, 253, 0, 255, 249, 32, 0, 254, 29, 171, 243, 40, 13, 243, 16, 175, 185, 59, 71, 143, 95, 80, 143, 47, 35, 40, 19, 171, 26, 47, 255, 20, 31, 155, 247, 46, 193, 254, 185, 239, 207, 255, 64, 31, 183, 132, 16, 8, 190, 236, 255, 253, 147, 41, 47, 211, 139, 41, 56, 80, 183, 163, 112, 94, 103, 64, - 159, 255, 78, 203, 103, 247, 5, 207, 37, 38, 108, 94, 99, 127, 96, 3, 31, 251, 32, 31, 255, 48, 242, 255, 199, 119, 16, 46, 95, 63, 239, 112, 142, 111, 122, 13, 226, 46, 12, 255, 250, 16, 31, 62, 255, 31, 167, 243, 255, 0, 6, 239, 38, 135, 191, 255, 3, 207, 195, 255, 160, 48, 127, 18, 120, 31, 62, 15, 255, 32, - 127, 255, 170, 127, 31, 130, 239, 30, 201, 255, 26, 7, 151, 26, 11, 175, 112, 48, 3, 79, 25, 251, 63, 255, 144, 166, 235, 108, 255, 254, 31, 255, 246, 31, 255, 144, 190, 213, 254, 164, 9, 255, 36, 5, 19, 21, 5, 28, 87, 5, 217, 254, 214, 14, 242, 68, 9, 253, 105, 143, 27, 147, 87, 124, 191, 226, 3, 191, 255, 221, - 222, 63, 142, 42, 3, 244, 177, 119, 117, 65, 191, 255, 96, 82, 179, 8, 96, 10, 46, 95, 235, 35, 243, 1, 239, 178, 255, 230, 120, 27, 131, 159, 253, 43, 127, 19, 13, 255, 48, 4, 119, 64, 57, 15, 213, 156, 17, 227, 0, 3, 17, 15, 255, 255, 9, 170, 146, 5, 218, 153, 147, 15, 118, 12, 153, 184, 15, 194, 45, 37, - 7, 31, 12, 202, 5, 48, 10, 209, 255, 13, 63, 62, 10, 23, 62, 11, 23, 27, 74, 47, 206, 14, 93, 230, 96, 3, 14, 23, 51, 3, 20, 123, 84, 32, 3, 1, 48, 3, 254, 30, 35, 255, 30, 43, 71, 98, 171, 30, 8, 127, 18, 191, 23, 231, 175, 29, 251, 111, 255, 149, 160, 29, 66, 32, 92, 240, 22, 116, 243, 31, - 163, 247, 125, 30, 112, 250, 0, 15, 254, 179, 24, 83, 242, 84, 31, 94, 192, 24, 100, 96, 32, 91, 10, 32, 22, 23, 214, 143, 111, 29, 89, 12, 210, 255, 15, 64, 61, 11, 255, 252, 120, 105, 135, 255, 206, 253, 239, 255, 223, 26, 99, 42, 103, 254, 252, 223, 255, 16, 145, 121, 153, 10, 111, 33, 40, 83, 169, 175, 89, 211, - 8, 47, 31, 55, 192, 29, 26, 95, 252, 80, 30, 228, 243, 72, 211, 97, 14, 195, 255, 15, 212, 255, 15, 255, 255, 15, 255, 42, 245, 67, 87, 68, 72, 31, 255, 160, 31, 255, 46, 127, 61, 78, 0, 9, 1, 5, 7, 0, 5, 254, 5, 0, 20, 20, 0, 18, 18, 32, 2, 248, 19, 19, 0, 15, 15, 32, 2, 16, 8, 16, - 17, 255, 6, 6, 0, 17, 17, 0, 14, 14, 224, 0, 23, 23, 80, 29, 16, 38, 16, 44, 112, 38, 64, 53, 204, 24, 24, 32, 38, 16, 59, 13, 13, 32, 44, 16, 65, 24, 16, 8, 16, 71, 16, 56, 11, 11, 32, 62, 16, 65, 16, 74, 12, 64, 104, 112, 35, 16, 26, 16, 47, 10, 10, 80, 32, 16, 159, 239, 77, 65, - 80, 31, 255, 192, 0, 33, 0, 179, 118, 75, 29, 81, 200, 22, 140, 0, 0, 5, 0, 2, 59, 0, 25, 6, 176, 37, 3, 0, 4, 31, 105, 6, 0, 171, 7, 31, 107, 9, 31, 107, 11, 30, 255, 12, 0, 109, 16, 167, 0, 15, 29, 148, 17, 0, 16, 243, 0, 255, 20, 0, 21, 0, 22, 0, 23, 0, 229, 24, 0, 25, - 29, 234, 128, 97, 27, 31, 43, 28, 245, 0, 29, 0, 30, 27, 179, 32, 16, 149, 34, 247, 0, 35, 0, 36, 48, 123, 37, 0, 38, 253, 0, 39, 0, 40, 0, 41, 31, 77, 42, 255, 0, 43, 0, 44, 0, 45, 0, 46, 86, 80, 191, 28, 62, 55, 2, 95, 255, 1, 0, 125, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 4, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 4, 224, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 3, 192, 64, 3, 112, 1, 1, 64, 27, 0, 5, 93, 16, 35, - 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, 79, 79, 84, 32, 27, 229, 148, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 15, 109, 64, 79, 2, 128, 64, 81, 226, 226, 16, 19, 27, 90, 80, 15, 160, 64, 26, 207, 45, 16, 39, 41, 16, 127, 190, 32, 96, 19, 255, 255, 0, 46, 2, 128, 136, 172, 16, 80, - 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, 3, 10, 46, 0, 46, 46, 0, 101, 117, 255, 115, 112, 97, 110, 105, 115, 104, 0, 255, 109, 101, 115, 115, 97, 103, 101, 46, 239, 98, 109, 103, 96, 11, 105, 100, 46, 116, 255, 98, 108, 0, 115, 116, 114, 117, 99, 158, 116, 48, 10, 160, 199, 77, 69, 83, 71, 16, 44, - 183, 49, 80, 187, 2, 2, 208, 228, 73, 78, 70, 126, 16, 27, 0, 96, 0, 6, 0, 12, 49, 62, 42, 113, 56, 48, 159, 2, 144, 11, 88, 144, 23, 174, 128, 35, 211, 1, 140, 144, 11, 178, 144, 59, 49, 130, 68, 65, 223, 84, 49, 80, 70, 26, 6, 1, 0, 3, 255, 0, 73, 0, 110, 0, 115, 0, 101, 253, 0, 114, - 0, 116, 0, 97, 17, 179, 101, 221, 0, 108, 17, 185, 100, 0, 105, 16, 21, 99, 223, 0, 111, 48, 11, 101, 0, 10, 0, 83, 255, 0, 85, 0, 80, 0, 69, 0, 82, 119, 17, 215, 77, 0, 65, 16, 7, 73, 0, 79, 87, 17, 227, 71, 16, 11, 76, 16, 15, 88, 0, 89, 39, 17, 28, 0, 85, 70, 78, 48, 137, 32, - 167, 32, 0, 112, 202, 0, 117, 16, 175, 32, 149, 32, 16, 171, 101, 48, 187, 82, 0, 183, 0, 46, 16, 179, 67, 16, 191, 32, 221, 117, 16, 211, 84, 160, 221, 109, 16, 233, 110, 16, 69, 97, 80, 235, 32, 223, 170, 105, 49, 7, 116, 17, 7, 117, 16, 247, 99, 16, 255, 82, 32, 59, 101, 17, 27, 32, 112, 107, 33, 31, - 99, 80, 83, 170, 111, 80, 15, 87, 17, 41, 105, 17, 31, 112, 17, 61, 186, 114, 49, 65, 111, 0, 98, 17, 75, 101, 48, 61, 114, 32, 153, 109, 0, 225, 48, 69, 32, 97, 102, 17, 81, 145, 114, 48, 127, 32, 97, 243, 17, 123, 33, 51, 1, 91, 18, 0, 202, 0, 161, 17, 103, 33, 161, 103, 48, 103, 110, 19, 95, 233, - 97, 0, 118, 48, 103, 116, 17, 17, 64, 123, 99, 87, 16, 83, 115, 16, 223, 105, 17, 187, 97, 0, 33, 87, 3, 65, 3, 6, 82, 71, 40, 19, 163, 8, 33, 157, 223, 67, 98, 50, 251, 4, 0, 6, 4, 56, 212, 56, 178, 83, 7, 0, 211, 175, 8, 82, 123, 35, 51, 171, 3, 19, 219, 24, 19, 223, 4, 147, 199, 43, - 67, 255, 79, 77, 77, 69, 78, 84, 0, 68, 253, 73, 83, 67, 95, 48, 49, 80, 7, 50, 127, 80, 15, 51, 0, 84, 73, 84, 76, 69, 251, 95, 77, 65, 73, 78, 80, 10, 83, 85, 229, 66, 0, 64, 0, 0, 0, 144, 111, 112, 36, 67, 174, 239, 55, 113, 97, 96, 147, 28, 19, 62, 141, 124, 80, 171, 0, 190, 198, 20, - 162, 51, 179, 16, 153, 247, 100, 67, 164, 76, 51, 191, 12, 0, 0, 243, 19, 54, 175, 66, 51, 203, 19, 221, 137, 230, 191, 39, 67, 215, 20, 0, 0, 251, 104, 17, 158, 53, 51, 227, 16, 185, 23, 177, 123, 254, 51, 239, 170, 28, 116, 149, 4, 81, 23, 7, 80, 235, 9, 20, 191, 160, 10, 20, 195, 11, 224, 162, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 82, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 82, 224, 245, 0, 0, 0, 32, 16, 3, 192, 16, 11, 0, 42, 64, 3, 112, 2, 1, 80, 27, 3, 16, - 35, 64, 80, 3, 231, 128, 0, 3, 32, 22, 16, 57, 79, 79, 84, 115, 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, 67, 212, 246, 17, 0, 0, 18, 64, 80, 81, 240, 32, 88, 250, 255, 255, 0, 46, 2, 128, 97, 16, 80, 19, 177, 184, 16, 19, 2, 255, 16, 0, 96, 19, 32, 132, 46, 255, 0, 46, 46, 0, 101, 109, - 98, 101, 255, 100, 100, 101, 100, 102, 111, 110, 116, 255, 0, 109, 101, 115, 115, 97, 103, 101, 126, 32, 11, 50, 54, 46, 98, 114, 102, 16, 19, 127, 0, 0, 8, 82, 70, 78, 84, 254, 255, 1, 191, 4, 48, 123, 16, 0, 5, 70, 73, 78, 182, 70, 32, 235, 1, 33, 16, 241, 27, 27, 32, 219, 251, 56, 0, 0, 80, 104, - 16, 155, 16, 33, 254, 27, 26, 0, 84, 71, 76, 80, 16, 15, 255, 48, 24, 26, 20, 24, 0, 0, 8, 229, 0, 0, 10, 32, 221, 17, 3, 128, 49, 31, 96, 190, 0, 0, 0, 106, 127, 255, 176, 0, 111, 16, 3, 233, 95, 255, 160, 16, 3, 144, 48, 3, 0, 0, 183, 2, 254, 118, 0, 0, 159, 255, 0, 11, 18, 29, - 255, 143, 255, 255, 4, 255, 255, 223, 13, 233, 255, 252, 11, 162, 36, 228, 34, 59, 18, 165, 255, 107, 18, 165, 255, 244, 18, 71, 251, 226, 113, 4, 190, 233, 0, 0, 6, 18, 63, 2, 34, 67, 34, 71, 35, 125, 98, 200, 19, 86, 119, 117, 255, 144, 0, 202, 234, 118, 84, 69, 160, 63, 65, 34, 151, 232, 34, 155, 187, 209, - 18, 159, 250, 0, 141, 18, 164, 9, 255, 174, 253, 1, 94, 112, 63, 17, 231, 63, 255, 112, 48, 3, 186, 47, 16, 7, 31, 255, 96, 16, 3, 80, 48, 3, 227, 13, 221, 64, 1, 255, 149, 36, 67, 19, 76, 0, 14, 87, 20, 103, 111, 20, 107, 207, 65, 163, 7, 255, 127, 215, 255, 243, 17, 234, 144, 20, 19, 16, 0, 255, - 171, 248, 20, 27, 241, 20, 31, 160, 20, 35, 150, 121, 186, 189, 65, 175, 16, 0, 239, 16, 254, 175, 17, 244, 239, 95, 255, 240, 17, 2, 244, 0, 14, 255, 252, 251, 128, 239, 255, 255, 224, 20, 43, 36, 79, 135, 2, 84, 163, 96, 3, 180, 134, 18, 35, 4, 255, 253, 255, 22, 223, 255, 253, 175, 255, 255, 253, 126, 18, 88, - 253, 111, 255, 255, 254, 41, 16, 91, 111, 52, 135, 0, 207, 18, 72, 255, 254, 80, 0, 253, 254, 129, 0, 0, 234, 97, 36, 155, 128, 122, 20, 159, 249, 0, 24, 255, 18, 105, 223, 17, 103, 117, 3, 96, 114, 7, 203, 16, 51, 251, 223, 17, 0, 175, 251, 255, 208, 0, 9, 238, 1, 247, 57, 4, 32, 253, 0, 3, 239, 243, - 0, 13, 19, 77, 14, 85, 18, 240, 6, 33, 133, 39, 0, 247, 57, 12, 21, 207, 31, 109, 21, 211, 95, 255, 51, 223, 0, 158, 37, 223, 37, 87, 102, 96, 250, 21, 240, 244, 33, 200, 119, 83, 16, 143, 176, 54, 88, 70, 136, 113, 191, 255, 255, 241, 220, 254, 255, 255, 80, 1, 255, 255, 48, 22, 56, 189, 80, 17, 147, 112, - 0, 50, 17, 5, 134, 23, 239, 124, 22, 77, 223, 255, 54, 140, 223, 22, 88, 32, 3, 186, 207, 22, 96, 121, 135, 100, 112, 98, 42, 16, 87, 63, 18, 24, 22, 147, 226, 0, 255, 250, 16, 0, 198, 183, 32, 5, 81, 184, 0, 201, 255, 7, 188, 80, 59, 0, 22, 53, 253, 0, 0, 191, 255, 0, 10, 24, 229, 95, 117, 134, - 64, 20, 119, 100, 34, 203, 251, 102, 131, 251, 217, 134, 140, 18, 208, 0, 60, 169, 104, 16, 15, 0, 147, 250, 41, 31, 25, 17, 246, 73, 140, 169, 134, 53, 0, 171, 74, 18, 205, 127, 25, 61, 63, 25, 65, 15, 235, 251, 152, 0, 2, 63, 255, 105, 168, 119, 117, 174, 64, 35, 43, 198, 102, 227, 99, 53, 141, 37, 28, 162, - 94, 233, 147, 230, 41, 127, 24, 53, 53, 107, 255, 147, 105, 233, 1, 51, 85, 22, 240, 255, 21, 146, 64, 3, 5, 231, 207, 234, 0, 22, 112, 106, 8, 103, 121, 155, 190, 188, 167, 63, 151, 118, 85, 51, 210, 154, 37, 171, 96, 83, 187, 144, 80, 3, 16, 250, 12, 35, 69, 141, 0, 21, 197, 68, 3, 36, 7, 105, 152, 26, - 115, 221, 123, 106, 104, 86, 119, 137, 154, 167, 159, 119, 101, 208, 84, 51, 166, 221, 187, 25, 149, 23, 5, 64, 187, 24, 245, 151, 33, 9, 136, 16, 40, 59, 127, 152, 27, 103, 0, 58, 231, 255, 255, 9, 84, 3, 23, 227, 101, 255, 252, 93, 128, 165, 117, 17, 140, 255, 254, 112, 26, 155, 208, 121, 26, 159, 64, 0, 106, 235, - 86, 89, 9, 240, 14, 223, 229, 255, 209, 3, 16, 48, 40, 43, 12, 22, 192, 14, 244, 255, 245, 0, 15, 48, 3, 247, 20, 249, 8, 63, 16, 74, 4, 110, 16, 63, 85, 63, 96, 3, 15, 144, 3, 14, 39, 46, 169, 3, 23, 50, 0, 32, 3, 243, 144, 3, 25, 30, 6, 137, 245, 23, 107, 39, 91, 38, 50, 111, 23, 59, - 39, 63, 143, 64, 22, 62, 223, 55, 111, 18, 47, 56, 222, 37, 147, 21, 37, 27, 121, 84, 25, 58, 254, 24, 244, 250, 21, 178, 247, 22, 15, 32, 200, 223, 243, 208, 28, 24, 181, 87, 120, 152, 255, 0, 85, 63, 37, 71, 17, 154, 5, 128, 24, 21, 130, 33, 37, 80, 3, 23, 247, 211, 0, 191, 144, 3, 159, 39, 97, 48, - 3, 237, 221, 133, 221, 121, 159, 32, 11, 81, 231, 108, 136, 211, 144, 223, 211, 4, 200, 90, 56, 71, 17, 238, 49, 15, 129, 31, 13, 28, 71, 18, 208, 125, 22, 84, 255, 16, 91, 205, 249, 27, 60, 244, 123, 27, 60, 243, 0, 93, 203, 26, 58, 0, 247, 58, 28, 240, 57, 221, 1, 18, 48, 24, 75, 242, 28, 119, 190, 243, - 28, 123, 245, 169, 207, 255, 145, 24, 108, 115, 38, 103, 80, 5, 255, 34, 113, 11, 241, 12, 8, 255, 203, 255, 177, 22, 155, 67, 151, 6, 44, 187, 41, 239, 123, 210, 57, 22, 184, 120, 173, 170, 122, 254, 87, 209, 119, 100, 124, 223, 197, 80, 135, 18, 114, 50, 223, 146, 83, 253, 68, 13, 80, 203, 13, 80, 227, 32, 231, 5, - 119, 126, 109, 160, 245, 0, 43, 255, 251, 157, 122, 217, 121, 20, 95, 216, 32, 101, 48, 152, 255, 43, 39, 128, 68, 64, 239, 48, 13, 160, 2, 17, 227, 25, 80, 252, 52, 175, 18, 200, 235, 0, 0, 77, 45, 127, 54, 171, 84, 85, 87, 189, 172, 171, 58, 252, 119, 117, 66, 126, 31, 133, 85, 30, 56, 249, 30, 60, 252, 91, - 112, 132, 14, 4, 0, 159, 85, 80, 3, 143, 83, 143, 127, 185, 159, 144, 89, 239, 176, 106, 64, 3, 254, 160, 8, 191, 31, 255, 82, 87, 46, 3, 177, 2, 211, 255, 177, 46, 111, 185, 49, 33, 39, 251, 4, 156, 213, 239, 236, 174, 220, 78, 17, 227, 255, 64, 3, 128, 251, 253, 159, 255, 144, 112, 45, 87, 37, 84, 29, 8, - 5, 255, 9, 21, 255, 239, 255, 17, 52, 48, 28, 164, 144, 82, 30, 194, 176, 30, 191, 176, 31, 171, 37, 116, 208, 159, 255, 171, 37, 86, 143, 143, 147, 19, 159, 111, 255, 67, 32, 30, 131, 3, 60, 255, 212, 255, 0, 17, 19, 32, 24, 86, 171, 144, 24, 90, 176, 48, 3, 175, 28, 15, 159, 255, 57, 200, 34, 15, 255, 42, - 3, 69, 82, 28, 3, 37, 247, 249, 74, 27, 178, 249, 31, 135, 32, 3, 250, 223, 255, 45, 22, 110, 111, 21, 207, 78, 255, 29, 85, 255, 0, 79, 255, 42, 120, 127, 40, 187, 248, 99, 111, 227, 20, 15, 16, 72, 11, 76, 159, 255, 83, 22, 170, 31, 155, 8, 255, 76, 19, 38, 199, 74, 136, 191, 16, 101, 3, 31, 240, 251, - 85, 159, 244, 14, 107, 40, 169, 4, 31, 255, 6, 31, 255, 10, 111, 255, 38, 177, 239, 21, 29, 210, 54, 247, 31, 78, 255, 30, 100, 255, 177, 158, 0, 165, 66, 64, 159, 7, 86, 59, 40, 251, 143, 176, 159, 253, 71, 84, 227, 255, 89, 163, 57, 62, 46, 148, 79, 255, 240, 242, 4, 159, 255, 252, 40, 91, 22, 15, 255, 25, - 66, 227, 255, 3, 127, 87, 67, 24, 244, 18, 28, 191, 222, 229, 255, 251, 191, 21, 58, 16, 3, 253, 16, 7, 219, 200, 223, 17, 87, 19, 57, 139, 128, 88, 219, 160, 3, 87, 23, 78, 29, 50, 208, 48, 3, 34, 79, 127, 255, 224, 30, 7, 146, 240, 48, 3, 47, 12, 95, 47, 45, 15, 255, 45, 9, 31, 33, 67, 32, 3, - 8, 29, 251, 121, 251, 128, 3, 31, 156, 246, 63, 246, 255, 254, 64, 239, 17, 212, 255, 254, 17, 63, 107, 26, 152, 255, 252, 33, 71, 248, 31, 59, 255, 228, 80, 15, 255, 16, 111, 81, 71, 191, 63, 109, 45, 141, 79, 121, 79, 129, 85, 47, 192, 224, 31, 196, 176, 90, 59, 112, 90, 75, 80, 9, 80, 3, 14, 96, 18, 38, - 197, 31, 255, 47, 33, 141, 86, 103, 175, 22, 88, 115, 46, 62, 31, 231, 244, 48, 175, 255, 239, 29, 231, 255, 159, 255, 16, 255, 79, 255, 96, 255, 233, 13, 255, 176, 26, 12, 242, 62, 33, 34, 203, 11, 119, 27, 175, 47, 255, 239, 31, 95, 127, 2, 255, 253, 250, 95, 12, 255, 242, 63, 31, 114, 63, 34, 43, 164, 120, 163, - 112, 81, 171, 150, 179, 51, 51, 11, 48, 3, 186, 249, 57, 59, 8, 255, 234, 218, 253, 223, 89, 3, 66, 98, 58, 221, 182, 255, 104, 255, 39, 255, 28, 16, 239, 231, 164, 85, 33, 227, 79, 25, 230, 63, 16, 171, 63, 24, 190, 63, 210, 253, 211, 14, 161, 59, 3, 87, 247, 41, 255, 1, 80, 3, 90, 155, 189, 23, 31, 159, - 48, 44, 47, 124, 127, 31, 124, 229, 3, 223, 96, 75, 87, 127, 255, 161, 31, 255, 254, 80, 43, 155, 225, 64, 191, 245, 248, 103, 79, 129, 79, 251, 44, 79, 167, 4, 42, 15, 3, 111, 255, 47, 239, 249, 120, 155, 178, 239, 172, 91, 103, 119, 136, 193, 45, 19, 240, 154, 223, 34, 0, 252, 0, 36, 83, 6, 84, 87, 105, 31, - 139, 185, 253, 20, 167, 169, 251, 26, 223, 249, 27, 10, 247, 25, 173, 29, 87, 55, 186, 65, 168, 127, 255, 48, 63, 20, 241, 63, 27, 246, 168, 63, 18, 214, 47, 28, 114, 31, 171, 249, 37, 193, 48, 3, 153, 240, 80, 3, 27, 112, 17, 16, 15, 255, 255, 15, 255, 241, 18, 242, 0, 0, 174, 251, 51, 66, 30, 15, 96, 30, - 19, 170, 192, 23, 34, 242, 159, 223, 36, 77, 187, 11, 87, 3, 172, 5, 31, 187, 2, 127, 191, 97, 0, 79, 243, 171, 75, 170, 255, 15, 68, 0, 2, 78, 211, 9, 31, 247, 127, 91, 175, 121, 95, 190, 87, 117, 16, 175, 59, 255, 95, 165, 166, 164, 106, 39, 134, 79, 238, 107, 32, 99, 255, 31, 172, 36, 249, 56, 21, 249, - 191, 160, 0, 6, 207, 79, 255, 39, 219, 21, 229, 239, 0, 0, 52, 127, 255, 86, 119, 118, 82, 124, 175, 255, 169, 85, 85, 142, 255, 71, 107, 127, 233, 165, 232, 44, 199, 209, 64, 57, 36, 49, 239, 13, 62, 8, 9, 74, 79, 155, 3, 120, 63, 32, 192, 2, 16, 192, 127, 208, 192, 66, 168, 31, 251, 41, 35, 38, 127, 16, - 192, 33, 90, 79, 208, 192, 83, 31, 227, 190, 145, 87, 239, 65, 115, 79, 255, 19, 86, 222, 119, 117, 173, 132, 233, 117, 67, 70, 175, 158, 74, 45, 50, 255, 29, 140, 72, 23, 247, 31, 21, 253, 77, 206, 45, 15, 255, 13, 30, 35, 249, 30, 39, 255, 6, 87, 247, 7, 223, 255, 249, 24, 3, 243, 223, 9, 255, 243, 170, 111, - 16, 3, 13, 88, 42, 239, 30, 206, 207, 22, 108, 209, 191, 251, 78, 243, 159, 21, 47, 24, 49, 31, 154, 48, 74, 93, 251, 80, 8, 3, 1, 39, 8, 11, 31, 147, 63, 23, 117, 82, 47, 184, 207, 29, 201, 239, 56, 192, 33, 92, 80, 42, 11, 138, 32, 72, 231, 9, 11, 7, 37, 185, 223, 30, 0, 143, 26, 42, 164, 95, - 24, 62, 63, 72, 174, 48, 15, 239, 46, 24, 57, 147, 165, 1, 144, 3, 0, 176, 3, 56, 231, 16, 29, 100, 16, 249, 1, 143, 255, 37, 175, 79, 162, 45, 72, 127, 249, 255, 179, 255, 91, 113, 24, 3, 41, 75, 48, 74, 65, 243, 226, 29, 191, 30, 199, 178, 191, 255, 11, 89, 231, 164, 143, 87, 255, 239, 87, 255, 38, 23, - 191, 40, 82, 50, 247, 170, 208, 86, 11, 64, 94, 167, 80, 88, 19, 6, 0, 192, 9, 164, 1, 66, 96, 5, 208, 3, 41, 247, 7, 96, 3, 33, 227, 127, 30, 221, 4, 255, 251, 1, 175, 255, 251, 181, 30, 31, 33, 159, 255, 57, 138, 250, 31, 176, 249, 232, 13, 255, 12, 24, 246, 223, 24, 212, 58, 15, 26, 192, 167, 251, - 31, 59, 160, 154, 203, 15, 255, 14, 11, 255, 243, 142, 4, 16, 3, 32, 7, 57, 238, 11, 223, 245, 206, 127, 230, 255, 160, 223, 16, 113, 16, 103, 255, 255, 16, 175, 201, 255, 0, 23, 75, 22, 130, 98, 183, 255, 30, 109, 254, 81, 83, 255, 144, 9, 62, 0, 248, 31, 159, 83, 147, 27, 119, 0, 222, 0, 141, 223, 198, 28, - 216, 85, 105, 191, 159, 232, 37, 119, 100, 120, 128, 255, 42, 243, 31, 160, 44, 41, 148, 250, 81, 95, 223, 162, 223, 144, 3, 191, 80, 3, 8, 159, 0, 102, 88, 255, 221, 96, 15, 159, 30, 41, 255, 14, 255, 95, 167, 139, 78, 239, 221, 60, 51, 144, 192, 125, 31, 168, 0, 37, 216, 122, 255, 91, 191, 0, 28, 18, 129, 35, - 143, 59, 175, 181, 213, 31, 207, 234, 97, 41, 212, 217, 31, 203, 250, 201, 2, 158, 27, 15, 65, 235, 9, 208, 3, 135, 191, 249, 209, 1, 207, 28, 209, 10, 49, 3, 28, 160, 28, 225, 0, 195, 52, 82, 153, 127, 24, 188, 18, 12, 29, 174, 255, 227, 216, 4, 239, 29, 121, 28, 250, 90, 129, 15, 255, 255, 15, 255, 101, 205, - 91, 80, 9, 109, 149, 26, 115, 24, 239, 61, 59, 111, 121, 29, 255, 255, 255, 231, 10, 39, 66, 95, 255, 87, 186, 118, 21, 35, 255, 253, 64, 30, 34, 244, 35, 163, 167, 32, 38, 92, 6, 144, 32, 15, 200, 18, 140, 221, 222, 79, 31, 255, 255, 48, 3, 20, 198, 0, 35, 49, 24, 111, 143, 255, 17, 19, 171, 67, 255, 255, - 237, 221, 82, 166, 223, 32, 93, 95, 144, 157, 107, 215, 59, 98, 78, 247, 137, 79, 93, 171, 94, 7, 159, 255, 231, 24, 180, 27, 131, 8, 102, 20, 74, 5, 96, 155, 99, 111, 230, 138, 201, 31, 255, 138, 253, 109, 221, 79, 107, 153, 31, 52, 140, 11, 191, 92, 15, 164, 111, 127, 255, 32, 92, 11, 96, 159, 192, 91, 247, 119, - 103, 125, 19, 179, 13, 255, 232, 0, 31, 30, 119, 95, 82, 29, 207, 175, 31, 118, 239, 61, 128, 182, 107, 239, 79, 187, 170, 12, 92, 11, 9, 127, 191, 49, 89, 95, 247, 80, 3, 43, 41, 103, 21, 15, 44, 15, 63, 10, 168, 212, 235, 110, 201, 169, 96, 30, 201, 240, 30, 34, 192, 31, 184, 40, 39, 112, 91, 21, 154, 244, - 25, 213, 250, 16, 30, 62, 251, 2, 93, 37, 223, 43, 46, 219, 23, 207, 0, 105, 27, 12, 109, 38, 85, 55, 176, 41, 223, 255, 181, 46, 249, 231, 104, 46, 148, 176, 107, 40, 100, 45, 168, 129, 8, 98, 8, 0, 3, 5, 81, 45, 67, 3, 54, 223, 253, 175, 81, 192, 11, 15, 255, 17, 252, 84, 48, 163, 14, 31, 217, 15, - 48, 204, 243, 48, 212, 32, 183, 172, 8, 0, 159, 7, 1, 87, 119, 11, 223, 26, 76, 40, 3, 129, 191, 31, 28, 40, 11, 40, 150, 56, 15, 90, 65, 66, 79, 31, 162, 255, 66, 91, 10, 93, 171, 58, 247, 47, 159, 143, 29, 215, 202, 4, 244, 16, 24, 29, 151, 31, 22, 159, 127, 25, 146, 236, 223, 255, 16, 25, 85, 96, - 13, 17, 37, 19, 72, 4, 48, 79, 31, 200, 22, 188, 30, 253, 77, 143, 96, 135, 47, 77, 247, 164, 6, 86, 95, 2, 111, 99, 33, 127, 159, 39, 61, 26, 226, 177, 111, 25, 230, 159, 254, 72, 124, 30, 204, 31, 236, 96, 246, 8, 255, 255, 128, 16, 95, 192, 47, 43, 161, 169, 3, 31, 85, 6, 31, 89, 10, 23, 190, 47, - 205, 47, 64, 24, 7, 111, 30, 52, 24, 156, 31, 20, 57, 110, 82, 215, 39, 71, 167, 244, 94, 11, 176, 79, 187, 63, 232, 137, 135, 119, 79, 25, 201, 255, 25, 163, 51, 251, 0, 1, 51, 51, 127, 127, 255, 10, 255, 255, 138, 223, 255, 252, 95, 31, 70, 245, 31, 74, 112, 255, 235, 113, 0, 69, 14, 62, 29, 3, 208, 3, - 179, 119, 67, 107, 16, 128, 3, 221, 148, 16, 15, 255, 32, 57, 151, 63, 111, 155, 25, 175, 223, 27, 193, 247, 111, 249, 33, 57, 175, 158, 250, 4, 103, 148, 100, 143, 63, 43, 143, 224, 74, 195, 245, 92, 99, 223, 162, 166, 63, 31, 239, 13, 89, 167, 255, 189, 255, 246, 127, 250, 191, 250, 26, 86, 208, 45, 255, 252, 16, 0, - 163, 87, 136, 165, 208, 8, 179, 4, 175, 128, 47, 175, 12, 0, 110, 11, 7, 5, 255, 241, 17, 148, 253, 255, 254, 29, 23, 251, 248, 223, 255, 255, 224, 19, 114, 48, 0, 191, 70, 137, 5, 191, 255, 40, 255, 111, 255, 211, 223, 255, 18, 9, 255, 17, 170, 37, 91, 247, 0, 212, 3, 118, 127, 225, 254, 90, 11, 225, 8, 21, - 255, 15, 255, 254, 253, 4, 16, 0, 5, 207, 160, 30, 56, 243, 209, 0, 30, 31, 59, 6, 99, 87, 115, 198, 31, 126, 30, 159, 248, 55, 91, 20, 126, 80, 79, 255, 253, 226, 147, 239, 47, 133, 207, 227, 209, 92, 247, 4, 6, 1, 48, 0, 234, 2, 175, 208, 30, 244, 247, 60, 15, 5, 224, 95, 95, 127, 233, 7, 31, 43, - 79, 160, 0, 1, 239, 140, 244, 61, 123, 88, 29, 31, 255, 190, 80, 85, 71, 46, 66, 109, 27, 7, 255, 144, 10, 230, 186, 5, 120, 78, 107, 10, 84, 87, 247, 9, 183, 255, 146, 31, 234, 243, 0, 3, 1, 11, 232, 48, 146, 63, 104, 103, 37, 59, 111, 77, 79, 38, 231, 127, 61, 179, 72, 31, 48, 96, 30, 104, 31, 178, - 192, 28, 107, 29, 139, 29, 232, 169, 255, 17, 120, 255, 30, 51, 238, 9, 254, 19, 96, 95, 1, 85, 37, 155, 127, 85, 75, 4, 111, 243, 253, 44, 185, 114, 86, 31, 150, 236, 63, 154, 247, 31, 160, 208, 253, 23, 52, 170, 40, 16, 104, 10, 22, 196, 251, 95, 91, 48, 3, 28, 109, 23, 39, 235, 47, 142, 72, 11, 143, 86, - 115, 255, 252, 1, 235, 87, 116, 16, 29, 203, 251, 126, 188, 64, 4, 252, 203, 176, 0, 40, 207, 16, 31, 236, 49, 67, 80, 80, 187, 192, 144, 195, 160, 86, 23, 74, 31, 41, 227, 40, 3, 159, 7, 208, 3, 40, 103, 5, 255, 243, 2, 103, 235, 99, 247, 191, 159, 30, 229, 31, 81, 64, 0, 181, 8, 27, 153, 4, 248, 94, - 99, 211, 47, 235, 48, 82, 88, 91, 243, 86, 211, 247, 70, 219, 14, 237, 15, 46, 31, 211, 247, 223, 255, 248, 9, 25, 211, 1, 191, 254, 245, 16, 0, 6, 227, 191, 255, 69, 42, 36, 207, 215, 255, 241, 23, 94, 251, 26, 142, 251, 0, 1, 165, 250, 1, 138, 59, 11, 31, 220, 32, 3, 9, 30, 195, 8, 74, 52, 118, 237, - 14, 187, 125, 45, 4, 223, 91, 239, 46, 31, 215, 206, 3, 223, 90, 187, 95, 162, 223, 255, 48, 25, 35, 175, 252, 56, 6, 250, 27, 65, 160, 207, 103, 98, 210, 0, 50, 111, 191, 243, 91, 183, 43, 175, 252, 80, 3, 75, 219, 30, 255, 128, 3, 42, 3, 3, 187, 83, 246, 16, 254, 0, 12, 246, 251, 102, 207, 253, 93, 28, - 245, 215, 107, 239, 235, 185, 63, 244, 88, 191, 96, 92, 76, 19, 64, 15, 249, 222, 13, 221, 221, 28, 192, 12, 41, 7, 134, 221, 16, 0, 46, 87, 8, 250, 255, 10, 11, 127, 23, 101, 75, 195, 41, 224, 3, 79, 255, 64, 85, 55, 144, 208, 3, 10, 210, 93, 9, 86, 70, 7, 0, 93, 175, 6, 127, 255, 38, 118, 46, 51, - 207, 254, 80, 45, 112, 31, 31, 16, 255, 117, 140, 60, 63, 163, 11, 114, 145, 54, 0, 0, 77, 57, 211, 45, 251, 250, 1, 255, 255, 179, 7, 30, 60, 12, 30, 88, 174, 15, 30, 172, 118, 29, 16, 255, 253, 96, 71, 255, 111, 31, 27, 20, 157, 12, 68, 31, 21, 0, 0, 26, 249, 255, 0, 2, 239, 255, 31, 66, 46, 95, - 230, 119, 31, 108, 80, 0, 239, 40, 72, 254, 0, 119, 203, 81, 63, 31, 35, 28, 217, 255, 45, 71, 127, 255, 214, 16, 54, 39, 55, 111, 87, 59, 191, 255, 97, 239, 144, 112, 0, 3, 5, 95, 223, 42, 79, 151, 16, 55, 16, 192, 25, 62, 175, 249, 31, 174, 248, 20, 23, 205, 20, 119, 81, 111, 31, 207, 255, 177, 31, 136, - 254, 255, 185, 223, 221, 255, 145, 40, 215, 91, 255, 254, 23, 82, 210, 233, 255, 255, 214, 189, 154, 96, 13, 35, 3, 103, 151, 158, 42, 48, 143, 64, 3, 123, 95, 171, 1, 55, 98, 247, 62, 199, 186, 245, 112, 3, 252, 119, 114, 56, 183, 253, 8, 95, 28, 149, 111, 79, 255, 41, 251, 13, 31, 234, 15, 31, 238, 14, 252, 255, - 3, 103, 98, 20, 239, 65, 28, 40, 5, 250, 95, 253, 48, 5, 31, 27, 116, 31, 30, 178, 181, 63, 31, 198, 159, 87, 39, 247, 112, 75, 11, 255, 170, 160, 95, 215, 192, 88, 11, 224, 15, 168, 16, 15, 30, 252, 240, 13, 255, 250, 32, 27, 210, 40, 7, 33, 59, 47, 71, 191, 103, 127, 255, 1, 16, 0, 4, 159, 128, 77, - 31, 167, 224, 57, 243, 34, 11, 117, 32, 15, 255, 25, 239, 252, 255, 32, 0, 175, 255, 211, 31, 158, 66, 99, 213, 0, 110, 44, 83, 71, 127, 228, 2, 31, 191, 78, 127, 159, 158, 252, 95, 255, 118, 32, 3, 51, 85, 111, 255, 80, 0, 3, 1, 16, 175, 255, 14, 16, 91, 11, 43, 31, 197, 60, 79, 175, 41, 71, 239, 167, - 159, 254, 148, 232, 3, 235, 32, 26, 203, 236, 34, 98, 26, 200, 31, 76, 234, 80, 103, 118, 143, 229, 16, 89, 155, 112, 8, 0, 9, 106, 75, 19, 0, 191, 31, 255, 159, 91, 35, 20, 160, 28, 207, 255, 16, 89, 127, 31, 96, 255, 128, 0, 0, 153, 33, 9, 1, 29, 72, 3, 0, 175, 44, 251, 154, 111, 12, 105, 31, 255, - 31, 250, 45, 40, 235, 26, 97, 58, 99, 253, 251, 72, 4, 119, 64, 12, 29, 136, 95, 252, 197, 134, 106, 74, 114, 26, 68, 176, 3, 224, 82, 3, 96, 9, 2, 127, 27, 15, 255, 255, 15, 255, 89, 45, 115, 2, 10, 125, 7, 29, 130, 123, 234, 239, 254, 182, 15, 255, 6, 210, 14, 126, 55, 113, 31, 238, 174, 254, 47, 218, - 96, 28, 11, 112, 1, 223, 28, 11, 57, 32, 19, 15, 98, 54, 41, 135, 96, 30, 106, 47, 255, 208, 35, 29, 26, 96, 3, 192, 9, 151, 255, 14, 220, 98, 31, 103, 5, 255, 169, 253, 80, 3, 252, 30, 229, 251, 112, 3, 15, 118, 47, 95, 85, 22, 145, 111, 22, 149, 127, 112, 3, 144, 48, 3, 143, 110, 23, 218, 159, 255, - 9, 194, 48, 1, 51, 81, 30, 68, 228, 253, 0, 10, 86, 187, 38, 191, 8, 24, 88, 80, 196, 237, 22, 117, 16, 25, 151, 247, 28, 88, 100, 255, 203, 181, 127, 54, 135, 37, 86, 247, 32, 3, 71, 98, 86, 39, 187, 177, 25, 187, 252, 40, 39, 48, 119, 18, 255, 78, 24, 159, 112, 29, 238, 64, 3, 0, 19, 53, 135, 247, - 167, 159, 94, 7, 143, 95, 219, 24, 175, 87, 99, 0, 243, 125, 255, 255, 211, 56, 95, 40, 100, 101, 207, 36, 31, 130, 71, 85, 192, 23, 191, 166, 103, 144, 159, 247, 96, 3, 94, 218, 91, 127, 248, 3, 54, 118, 48, 93, 22, 180, 58, 79, 255, 30, 100, 112, 3, 239, 31, 218, 79, 29, 242, 164, 14, 23, 230, 13, 107, 27, - 30, 6, 0, 31, 189, 72, 11, 147, 192, 134, 19, 15, 255, 14, 8, 63, 123, 96, 3, 248, 0, 229, 9, 222, 247, 15, 127, 60, 33, 227, 159, 145, 79, 173, 211, 223, 112, 15, 224, 59, 5, 50, 188, 34, 192, 252, 0, 184, 3, 18, 196, 3, 253, 221, 223, 94, 49, 231, 25, 198, 190, 246, 25, 202, 245, 0, 6, 223, 245, 191, - 255, 147, 175, 26, 212, 42, 143, 191, 23, 193, 31, 202, 0, 205, 200, 222, 16, 213, 158, 31, 251, 95, 80, 3, 60, 159, 191, 159, 149, 176, 30, 124, 64, 3, 31, 27, 33, 31, 25, 126, 61, 72, 176, 127, 224, 81, 243, 33, 247, 176, 92, 195, 233, 129, 23, 234, 95, 168, 3, 6, 208, 63, 31, 250, 16, 3, 207, 57, 105, 33, - 27, 37, 253, 3, 103, 137, 129, 63, 251, 160, 65, 72, 127, 248, 89, 47, 14, 235, 255, 15, 252, 255, 10, 24, 255, 15, 169, 122, 5, 35, 37, 150, 31, 255, 10, 92, 3, 127, 255, 45, 118, 255, 233, 19, 31, 143, 19, 232, 30, 110, 0, 31, 162, 7, 62, 48, 35, 48, 252, 3, 11, 255, 243, 223, 11, 31, 133, 32, 3, 106, - 29, 254, 195, 9, 31, 151, 9, 23, 30, 9, 30, 211, 210, 103, 99, 46, 219, 211, 55, 27, 31, 168, 208, 31, 191, 170, 243, 29, 199, 246, 24, 52, 247, 31, 114, 246, 15, 255, 23, 233, 1, 223, 255, 20, 230, 255, 25, 251, 159, 255, 253, 255, 0, 118, 32, 51, 33, 255, 252, 239, 126, 78, 0, 254, 239, 255, 35, 151, 239, 31, - 255, 136, 255, 64, 3, 46, 27, 31, 255, 48, 93, 243, 224, 3, 78, 63, 213, 85, 113, 31, 239, 243, 80, 3, 247, 87, 251, 255, 43, 112, 3, 16, 125, 6, 29, 160, 127, 29, 152, 255, 255, 254, 241, 0, 255, 249, 32, 0, 254, 31, 51, 146, 243, 13, 243, 12, 239, 185, 59, 30, 87, 86, 7, 207, 80, 159, 126, 40, 19, 26, - 255, 20, 103, 118, 16, 31, 155, 189, 247, 55, 251, 185, 207, 255, 64, 31, 183, 132, 253, 16, 8, 190, 255, 253, 147, 43, 187, 211, 83, 111, 255, 48, 94, 99, 112, 87, 175, 143, 255, 7, 191, 48, 79, 243, 47, 247, 5, 207, 41, 49, 94, 99, 24, 11, 30, 184, 215, 255, 255, 32, 95, 32, 49, 127, 199, 119, 16, 39, 46, 95, - 63, 239, 112, 78, 111, 13, 226, 46, 7, 255, 243, 253, 16, 7, 255, 247, 250, 7, 24, 190, 6, 122, 31, 134, 5, 255, 249, 123, 103, 50, 4, 24, 27, 125, 22, 154, 244, 102, 207, 255, 224, 31, 161, 96, 121, 31, 62, 0, 239, 234, 64, 14, 85, 28, 79, 255, 210, 51, 15, 255, 7, 25, 183, 1, 159, 159, 255, 31, 161, 116, - 1, 18, 26, 140, 96, 3, 0, 192, 16, 255, 18, 135, 42, 192, 248, 73, 211, 205, 254, 214, 14, 246, 61, 95, 235, 9, 253, 66, 3, 6, 107, 31, 242, 1, 87, 111, 255, 139, 25, 247, 0, 3, 243, 191, 255, 221, 222, 63, 142, 41, 167, 177, 119, 233, 117, 65, 0, 169, 247, 96, 80, 3, 15, 142, 5, 127, 83, 81, 243, 31, - 83, 243, 1, 189, 255, 33, 239, 230, 120, 79, 30, 7, 253, 46, 11, 18, 125, 255, 48, 4, 119, 167, 64, 15, 217, 55, 3, 25, 255, 32, 3, 0, 49, 16, 76, 15, 255, 100, 2, 41, 179, 33, 239, 121, 152, 14, 11, 255, 15, 28, 255, 102, 14, 216, 30, 238, 144, 2, 177, 66, 227, 163, 0, 5, 27, 117, 247, 159, 226, 0, - 28, 31, 59, 239, 255, 249, 213, 16, 255, 20, 129, 132, 15, 255, 59, 85, 30, 29, 254, 255, 16, 1, 207, 255, 192, 46, 255, 255, 253, 145, 31, 253, 96, 0, 8, 4, 2, 53, 5, 213, 153, 147, 31, 58, 243, 31, 66, 241, 30, 177, 240, 87, 30, 177, 224, 30, 189, 208, 112, 3, 2, 153, 184, 9, 77, 86, 117, 146, 20, 238, - 31, 106, 4, 87, 98, 15, 191, 16, 37, 170, 16, 61, 95, 175, 23, 128, 111, 28, 169, 63, 48, 92, 135, 240, 28, 242, 40, 71, 31, 131, 28, 184, 15, 254, 179, 215, 0, 79, 24, 205, 159, 31, 50, 239, 255, 96, 82, 32, 91, 10, 31, 162, 15, 31, 73, 15, 255, 15, 13, 48, 40, 189, 253, 16, 192, 247, 0, 1, 188, 78, - 91, 4, 208, 221, 208, 31, 223, 241, 48, 3, 5, 38, 53, 79, 155, 37, 251, 159, 31, 95, 251, 56, 7, 253, 1, 87, 117, 16, 247, 191, 255, 255, 251, 109, 159, 253, 64, 4, 253, 188, 192, 0, 23, 191, 32, 62, 43, 111, 82, 120, 191, 208, 157, 155, 176, 94, 23, 208, 156, 8, 79, 255, 165, 1, 31, 255, 8, 94, 19, 79, - 255, 77, 175, 255, 128, 213, 4, 239, 23, 149, 111, 16, 216, 15, 30, 87, 14, 47, 105, 31, 15, 255, 38, 14, 25, 19, 11, 255, 252, 120, 170, 5, 38, 92, 175, 39, 75, 206, 190, 223, 30, 24, 127, 191, 223, 72, 131, 16, 254, 223, 255, 16, 145, 209, 121, 153, 6, 40, 28, 3, 17, 200, 24, 4, 47, 104, 0, 51, 17, 228, - 64, 219, 0, 55, 143, 93, 33, 242, 64, 0, 74, 31, 189, 0, 33, 238, 40, 211, 97, 15, 255, 26, 6, 25, 212, 133, 7, 27, 9, 24, 200, 48, 3, 74, 11, 245, 58, 188, 10, 131, 255, 207, 235, 15, 27, 35, 40, 131, 26, 187, 18, 156, 0, 0, 179, 46, 31, 255, 3, 223, 82, 15, 95, 230, 207, 255, 167, 48, 24, 215, - 252, 17, 36, 64, 5, 177, 191, 103, 228, 98, 0, 34, 111, 255, 33, 151, 247, 31, 255, 17, 4, 183, 0, 26, 241, 0, 253, 15, 255, 33, 249, 0, 2, 242, 207, 255, 253, 239, 15, 255, 255, 63, 255, 11, 28, 139, 30, 35, 251, 15, 255, 255, 15, 255, 20, 67, 87, 68, 72, 31, 255, 175, 168, 31, 255, 49, 58, 229, 0, 9, - 1, 5, 255, 7, 0, 5, 5, 0, 20, 20, 0, 223, 18, 18, 32, 2, 19, 19, 0, 15, 15, 31, 32, 2, 16, 8, 16, 17, 6, 6, 0, 17, 17, 252, 0, 14, 14, 0, 23, 23, 80, 29, 16, 38, 25, 16, 44, 112, 38, 64, 53, 24, 24, 32, 38, 16, 59, 13, 131, 13, 32, 44, 16, 65, 16, 8, 16, 71, 16, 56, - 11, 11, 1, 32, 62, 16, 71, 64, 101, 112, 32, 16, 101, 16, 26, 16, 47, 10, 135, 10, 32, 95, 16, 98, 16, 134, 64, 8, 0, 67, 77, 190, 65, 37, 62, 192, 0, 33, 0, 118, 75, 33, 193, 81, 208, 28, 35, 0, 0, 5, 46, 57, 0, 1, 16, 21, 213, 4, 116, 31, 109, 6, 0, 7, 31, 111, 9, 31, 111, 31, - 4, 54, 31, 113, 16, 175, 0, 15, 30, 112, 17, 0, 16, 251, 127, 27, 253, 21, 0, 22, 0, 23, 0, 24, 203, 0, 25, 30, 198, 128, 97, 27, 30, 203, 28, 0, 234, 29, 0, 30, 27, 183, 32, 16, 149, 34, 30, 219, 191, 35, 48, 123, 36, 0, 37, 0, 38, 0, 255, 39, 0, 40, 0, 41, 0, 42, 0, 254, 43, 0, - 44, 0, 45, 0, 46, 80, 191, 143, 40, 78, 215, 104, 159, 63, 210, 161, 0, 47, 0, 160, 225, 30, 228, 243, 65, 129, 207, 211, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 4, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, - 67, 0, 0, 4, 224, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 3, 192, 64, 3, 112, 1, 1, 64, 27, 0, 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, 79, 79, 84, 32, 27, 64, 254, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 14, 109, 64, 79, 2, 128, 64, 81, 226, 226, - 16, 19, 26, 90, 80, 15, 160, 64, 26, 207, 45, 16, 39, 40, 16, 127, 190, 32, 96, 19, 255, 255, 0, 46, 2, 128, 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, 3, 10, 46, 0, 46, 46, 0, 101, 117, 255, 102, 114, 101, 110, 99, 104, 0, 109, 255, 101, 115, 115, 97, 103, 101, 46, 98, 223, - 109, 103, 96, 11, 105, 100, 46, 116, 98, 255, 108, 0, 115, 116, 114, 117, 99, 116, 61, 48, 10, 176, 198, 77, 69, 83, 71, 16, 45, 49, 110, 80, 187, 2, 2, 208, 228, 73, 78, 70, 16, 27, 252, 0, 96, 0, 6, 0, 12, 49, 62, 113, 56, 85, 48, 159, 2, 144, 11, 102, 144, 23, 202, 128, 35, 1, 167, 136, 144, 11, - 174, 144, 59, 49, 130, 68, 65, 84, 191, 49, 80, 70, 86, 0, 101, 0, 117, 0, 238, 105, 0, 108, 16, 1, 101, 0, 122, 17, 175, 255, 105, 0, 110, 0, 115, 0, 233, 0, 167, 114, 16, 25, 114, 17, 191, 32, 23, 32, 0, 100, 119, 16, 35, 115, 0, 113, 16, 43, 101, 0, 10, 63, 16, 13, 32, 19, 83, 0, 85, 0, - 80, 0, 238, 69, 0, 82, 17, 229, 77, 0, 65, 16, 7, 234, 73, 0, 79, 17, 241, 71, 16, 11, 76, 16, 15, 231, 88, 0, 89, 17, 42, 0, 99, 84, 73, 0, 109, 245, 0, 112, 0, 111, 16, 185, 115, 16, 205, 98, 41, 112, 181, 32, 187, 108, 16, 223, 114, 80, 9, 224, 203, 46, 42, 16, 205, 1, 3, 0, 118, 16, - 73, 117, 17, 5, 32, 17, 5, 149, 233, 17, 99, 129, 13, 97, 17, 45, 32, 16, 107, 111, 37, 49, 3, 33, 9, 39, 17, 65, 32, 123, 108, 16, 125, 105, 68, 18, 239, 87, 17, 77, 32, 7, 32, 141, 117, 49, 65, 32, 27, 41, 64, 77, 65, 55, 100, 17, 93, 116, 16, 73, 33, 117, 115, 42, 49, 33, 1, 73, 18, 0, - 17, 83, 97, 19, 79, 103, 17, 153, 149, 97, 17, 163, 65, 131, 97, 16, 171, 101, 17, 177, 116, 41, 48, 107, 33, 169, 99, 49, 5, 109, 17, 211, 65, 173, 33, 79, 3, 65, 3, 6, 82, 71, 19, 27, 0, 8, 33, 157, 223, 67, 98, 50, 251, 4, 0, 6, 4, 56, 212, 56, 178, 83, 7, 0, 211, 175, 8, 82, 123, 35, - 51, 171, 3, 19, 219, 24, 19, 223, 4, 147, 199, 43, 67, 255, 79, 77, 77, 69, 78, 84, 0, 68, 253, 73, 83, 67, 95, 48, 49, 80, 7, 50, 127, 80, 15, 51, 0, 84, 73, 84, 76, 69, 251, 95, 77, 65, 73, 78, 80, 10, 83, 85, 229, 66, 0, 64, 0, 0, 0, 144, 111, 112, 36, 67, 174, 239, 55, 113, 97, 96, - 147, 28, 19, 62, 141, 124, 80, 171, 0, 190, 198, 20, 162, 51, 179, 16, 153, 247, 100, 67, 164, 76, 51, 191, 12, 0, 0, 243, 19, 54, 175, 66, 51, 203, 19, 221, 137, 230, 191, 39, 67, 215, 20, 0, 0, 251, 104, 17, 158, 53, 51, 227, 16, 185, 23, 177, 123, 254, 51, 239, 170, 28, 116, 149, 4, 81, 23, 7, 80, 235, - 9, 20, 191, 160, 10, 20, 195, 11, 224, 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 90, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 90, 224, 245, 0, 0, 0, 32, 16, 3, 192, 16, 11, 0, 42, 64, 3, 112, 2, 1, 80, 27, 3, 16, 35, 64, - 80, 3, 239, 128, 0, 3, 32, 22, 0, 0, 82, 79, 220, 79, 84, 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, 253, 67, 212, 17, 0, 0, 18, 64, 80, 89, 190, 236, 32, 88, 255, 255, 0, 46, 2, 128, 97, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 32, 132, 46, 0, 46, 46, 0, 101, 109, 255, - 98, 101, 100, 100, 101, 100, 102, 111, 255, 110, 116, 0, 109, 101, 115, 115, 97, 223, 103, 101, 32, 11, 50, 54, 46, 98, 114, 159, 102, 16, 19, 0, 0, 8, 82, 70, 78, 84, 254, 239, 255, 1, 4, 48, 123, 16, 0, 5, 70, 237, 73, 78, 70, 32, 235, 1, 33, 16, 241, 27, 190, 27, 32, 219, 56, 0, 0, 88, 104, 16, - 155, 255, 20, 33, 27, 26, 0, 84, 71, 76, 191, 80, 16, 15, 48, 24, 26, 20, 24, 0, 249, 0, 8, 0, 0, 11, 32, 221, 17, 3, 128, 111, 49, 31, 96, 0, 0, 0, 106, 127, 255, 176, 0, 186, 111, 16, 3, 95, 255, 160, 16, 3, 144, 48, 3, 125, 0, 144, 50, 3, 119, 80, 0, 7, 16, 83, 7, 253, 255, 128, - 0, 9, 255, 96, 16, 3, 64, 254, 0, 10, 255, 32, 0, 11, 255, 0, 238, 107, 111, 1, 107, 61, 39, 0, 16, 220, 0, 0, 191, 255, 223, 0, 8, 18, 129, 79, 255, 253, 0, 223, 213, 255, 192, 98, 232, 97, 19, 0, 254, 18, 221, 255, 170, 242, 18, 159, 252, 34, 163, 64, 16, 41, 176, 0, 255, 112, 186, 63, 17, 231, - 63, 255, 112, 48, 3, 47, 16, 7, 187, 31, 17, 159, 31, 255, 80, 48, 3, 13, 221, 178, 64, 2, 143, 47, 1, 17, 1, 227, 186, 36, 183, 6, 20, 203, 175, 12, 20, 207, 47, 35, 49, 7, 255, 255, 48, 255, 31, 255, 249, 0, 143, 255, 241, 0, 191, 239, 18, 222, 255, 255, 16, 0, 255, 250, 117, 20, 131, 249, 103, 155, - 36, 107, 79, 16, 23, 14, 220, 255, 247, 18, 238, 252, 0, 5, 20, 152, 20, 128, 190, 64, 16, 40, 184, 222, 255, 255, 254, 84, 139, 119, 3, 3, 112, 7, 203, 16, 51, 251, 223, 255, 240, 255, 0, 175, 255, 208, 0, 9, 238, 64, 122, 3, 152, 153, 66, 0, 0, 62, 21, 211, 223, 21, 215, 173, 239, 21, 219, 111, 21, 223, - 2, 117, 166, 96, 48, 36, 22, 124, 35, 105, 208, 54, 88, 5, 97, 31, 207, 22, 162, 22, 51, 217, 5, 255, 67, 223, 9, 239, 22, 203, 118, 94, 255, 191, 175, 49, 228, 255, 255, 7, 117, 49, 251, 71, 22, 228, 248, 38, 179, 150, 221, 38, 111, 253, 207, 255, 186, 245, 19, 87, 243, 0, 15, 16, 7, 13, 18, 12, 225, 3, - 33, 16, 182, 156, 0, 3, 255, 1, 20, 255, 25, 62, 19, 252, 86, 4, 190, 255, 255, 6, 24, 192, 40, 196, 255, 0, 255, 202, 118, 0, 35, 255, 251, 118, 105, 72, 119, 117, 65, 34, 107, 232, 255, 80, 0, 228, 84, 69, 141, 82, 175, 201, 53, 209, 25, 136, 20, 158, 166, 0, 41, 4, 253, 7, 169, 1, 25, 167, 159, 0, - 55, 152, 207, 175, 255, 52, 176, 105, 164, 71, 118, 64, 191, 190, 255, 144, 0, 184, 104, 207, 211, 0, 201, 147, 169, 179, 41, 123, 160, 25, 127, 241, 25, 131, 24, 201, 204, 123, 208, 192, 0, 4, 174, 255, 24, 7, 255, 0, 185, 3, 41, 131, 254, 185, 0, 16, 192, 106, 8, 87, 215, 119, 84, 35, 43, 252, 96, 191, 134, 51, - 88, 72, 35, 208, 5, 170, 40, 41, 28, 254, 25, 33, 21, 110, 25, 227, 169, 128, 21, 111, 242, 161, 31, 53, 16, 186, 25, 219, 127, 103, 80, 3, 92, 254, 41, 238, 106, 104, 86, 119, 153, 191, 187, 160, 190, 169, 119, 101, 83, 253, 32, 85, 138, 134, 198, 83, 187, 249, 80, 3, 49, 250, 108, 2, 198, 52, 0, 24, 180, 84, - 3, 26, 67, 6, 153, 26, 211, 189, 13, 106, 200, 85, 103, 120, 153, 161, 30, 135, 251, 118, 85, 67, 221, 212, 138, 230, 171, 181, 74, 26, 151, 247, 80, 187, 16, 191, 50, 3, 248, 22, 2, 17, 227, 148, 1, 24, 75, 96, 3, 0, 48, 3, 254, 58, 229, 42, 233, 255, 4, 207, 255, 22, 223, 255, 254, 175, 255, 255, 254, 129, - 143, 255, 234, 97, 111, 107, 26, 224, 41, 189, 42, 227, 24, 42, 231, 223, 244, 82, 27, 120, 80, 155, 109, 128, 80, 227, 25, 125, 0, 23, 229, 59, 16, 193, 24, 167, 63, 255, 244, 17, 58, 208, 0, 165, 207, 49, 84, 80, 27, 64, 32, 3, 112, 16, 15, 208, 82, 4, 159, 14, 2, 9, 252, 16, 255, 69, 63, 96, 3, 0, - 160, 3, 169, 239, 23, 46, 0, 112, 3, 48, 144, 3, 41, 43, 80, 232, 0, 6, 63, 23, 91, 10, 25, 74, 18, 247, 55, 63, 170, 8, 25, 86, 13, 23, 111, 111, 16, 178, 255, 22, 170, 82, 73, 115, 14, 27, 211, 47, 85, 251, 34, 3, 207, 86, 15, 61, 21, 123, 28, 120, 251, 85, 119, 137, 43, 247, 237, 76, 27, 252, - 173, 28, 0, 17, 154, 49, 80, 86, 23, 97, 19, 149, 240, 144, 3, 213, 147, 14, 81, 231, 13, 87, 247, 11, 87, 144, 3, 9, 21, 217, 0, 48, 3, 254, 221, 221, 10, 115, 30, 32, 11, 81, 231, 108, 232, 221, 144, 219, 221, 96, 120, 70, 11, 236, 19, 239, 86, 219, 96, 3, 32, 219, 121, 135, 141, 64, 247, 42, 255, 54, - 140, 115, 152, 250, 255, 255, 226, 183, 32, 100, 146, 215, 33, 83, 35, 231, 226, 6, 107, 6, 178, 143, 20, 67, 31, 255, 67, 151, 71, 59, 158, 173, 156, 125, 29, 60, 1, 251, 135, 138, 223, 163, 250, 37, 232, 119, 118, 65, 109, 192, 108, 28, 205, 33, 134, 18, 65, 106, 50, 223, 233, 32, 253, 165, 223, 144, 3, 191, 80, 3, - 190, 87, 119, 63, 80, 2, 191, 255, 185, 160, 94, 247, 253, 130, 118, 83, 167, 63, 64, 0, 255, 8, 23, 84, 26, 161, 52, 95, 14, 3, 0, 255, 87, 247, 20, 175, 26, 204, 243, 0, 0, 4, 223, 94, 75, 119, 251, 197, 85, 221, 122, 207, 164, 186, 103, 119, 84, 115, 249, 72, 13, 32, 191, 28, 229, 43, 169, 24, 253, 0, - 200, 10, 241, 0, 9, 48, 80, 3, 29, 172, 0, 7, 80, 3, 135, 223, 36, 139, 41, 239, 162, 251, 80, 3, 234, 7, 208, 255, 8, 225, 255, 15, 227, 41, 58, 78, 99, 83, 20, 223, 11, 30, 99, 127, 46, 73, 79, 255, 4, 103, 231, 117, 48, 255, 92, 83, 52, 8, 101, 106, 235, 167, 16, 213, 158, 112, 91, 3, 13, 212, - 3, 1, 19, 67, 84, 31, 147, 249, 31, 159, 251, 30, 191, 251, 31, 175, 37, 116, 169, 253, 213, 234, 7, 83, 7, 9, 147, 23, 63, 255, 84, 165, 50, 147, 3, 250, 134, 231, 158, 7, 50, 31, 239, 249, 84, 31, 243, 251, 48, 3, 10, 24, 187, 9, 128, 191, 15, 255, 48, 210, 52, 85, 197, 35, 191, 80, 3, 79, 255, 32, - 64, 255, 191, 2, 19, 234, 62, 144, 0, 4, 239, 144, 101, 31, 160, 160, 4, 141, 127, 40, 248, 223, 28, 28, 255, 190, 251, 29, 191, 254, 48, 0, 255, 193, 72, 11, 34, 159, 255, 40, 139, 63, 37, 49, 76, 19, 41, 66, 3, 125, 191, 5, 40, 47, 53, 3, 22, 72, 47, 214, 36, 175, 255, 13, 69, 49, 1, 234, 255, 255, - 176, 30, 99, 16, 33, 58, 14, 23, 166, 171, 15, 60, 70, 244, 60, 70, 9, 65, 158, 1, 91, 243, 205, 239, 255, 127, 30, 108, 39, 251, 93, 203, 174, 169, 32, 155, 175, 69, 119, 5, 255, 18, 39, 83, 16, 25, 38, 28, 125, 70, 167, 145, 71, 247, 48, 3, 34, 16, 46, 148, 85, 33, 7, 73, 30, 156, 159, 30, 160, 143, - 50, 87, 255, 237, 0, 55, 255, 93, 83, 0, 10, 31, 196, 27, 43, 16, 98, 41, 63, 203, 30, 211, 219, 28, 209, 189, 113, 226, 16, 0, 13, 24, 87, 39, 138, 69, 159, 247, 208, 3, 10, 87, 23, 48, 164, 32, 168, 34, 79, 7, 24, 183, 7, 86, 107, 138, 5, 87, 208, 15, 255, 9, 13, 27, 20, 159, 87, 243, 143, 153, - 251, 175, 95, 112, 3, 176, 29, 155, 179, 255, 255, 228, 186, 222, 17, 212, 255, 255, 226, 31, 159, 96, 31, 163, 161, 194, 45, 151, 128, 26, 108, 42, 78, 15, 255, 7, 79, 4, 6, 106, 31, 163, 8, 255, 75, 19, 12, 31, 175, 13, 31, 179, 140, 15, 112, 3, 47, 192, 26, 104, 0, 251, 90, 59, 25, 226, 209, 0, 246, 31, - 212, 245, 80, 3, 15, 223, 46, 18, 162, 177, 117, 25, 151, 255, 0, 46, 27, 243, 2, 40, 215, 4, 189, 156, 207, 255, 78, 255, 185, 157, 119, 59, 159, 245, 239, 236, 112, 95, 31, 255, 37, 126, 159, 112, 74, 82, 139, 128, 86, 231, 22, 235, 84, 183, 163, 223, 147, 43, 42, 49, 71, 27, 55, 1, 164, 51, 13, 23, 122, 14, - 23, 34, 210, 15, 160, 64, 3, 13, 183, 125, 104, 255, 244, 66, 99, 202, 222, 243, 223, 255, 98, 95, 3, 112, 3, 221, 225, 227, 164, 16, 83, 159, 48, 153, 147, 15, 255, 24, 63, 87, 247, 41, 255, 149, 31, 80, 3, 128, 191, 241, 19, 24, 243, 17, 55, 243, 53, 28, 120, 25, 170, 61, 246, 223, 255, 250, 42, 127, 229, 89, - 43, 81, 16, 51, 35, 191, 80, 220, 212, 58, 91, 13, 39, 95, 251, 60, 79, 78, 175, 178, 47, 239, 255, 151, 137, 180, 190, 173, 26, 54, 119, 136, 193, 3, 106, 240, 90, 223, 198, 253, 48, 15, 240, 255, 15, 255, 255, 15, 255, 4, 51, 17, 60, 11, 148, 1, 85, 175, 45, 16, 10, 197, 63, 32, 87, 219, 39, 231, 153, 160, - 87, 235, 127, 255, 66, 16, 31, 118, 37, 134, 255, 89, 29, 242, 255, 29, 45, 255, 16, 21, 234, 159, 1, 1, 250, 32, 0, 10, 239, 176, 28, 11, 240, 30, 15, 170, 246, 30, 19, 252, 23, 34, 255, 221, 234, 255, 91, 195, 86, 39, 3, 95, 31, 62, 47, 111, 255, 70, 16, 79, 243, 100, 171, 75, 255, 241, 14, 227, 3, 43, - 67, 159, 27, 74, 91, 175, 123, 95, 225, 21, 119, 81, 42, 175, 160, 250, 102, 172, 175, 23, 134, 4, 175, 255, 178, 0, 80, 99, 21, 96, 21, 32, 186, 23, 26, 222, 138, 108, 95, 255, 79, 85, 163, 3, 189, 79, 111, 255, 53, 103, 119, 101, 175, 255, 202, 229, 149, 85, 88, 43, 239, 168, 31, 254, 39, 255, 253, 41, 23, 255, - 28, 12, 239, 23, 103, 30, 47, 176, 15, 166, 8, 7, 22, 88, 15, 112, 192, 29, 138, 255, 29, 70, 255, 159, 80, 192, 34, 40, 71, 111, 255, 81, 47, 115, 16, 192, 70, 127, 246, 28, 173, 229, 255, 32, 4, 208, 192, 15, 255, 3, 12, 31, 231, 15, 42, 65, 176, 22, 214, 239, 29, 175, 159, 28, 234, 79, 30, 222, 165, 13, - 31, 254, 9, 33, 98, 31, 227, 4, 29, 34, 11, 94, 30, 235, 47, 31, 79, 175, 255, 96, 2, 24, 53, 126, 16, 56, 242, 127, 255, 239, 255, 255, 42, 23, 187, 80, 48, 3, 239, 255, 112, 24, 40, 128, 250, 255, 95, 255, 144, 242, 63, 255, 160, 176, 169, 63, 24, 169, 95, 48, 87, 255, 31, 80, 71, 247, 127, 117, 16, 95, - 143, 255, 61, 31, 70, 54, 31, 74, 48, 42, 37, 247, 17, 198, 14, 30, 206, 12, 18, 45, 11, 24, 219, 95, 46, 243, 9, 21, 47, 9, 223, 255, 192, 10, 68, 56, 87, 244, 95, 3, 232, 3, 53, 108, 191, 69, 251, 47, 184, 144, 12, 29, 201, 104, 196, 14, 31, 57, 26, 11, 46, 151, 7, 131, 10, 170, 111, 24, 239, 13, - 30, 0, 8, 26, 234, 5, 24, 62, 146, 3, 88, 174, 32, 15, 30, 46, 24, 73, 147, 31, 144, 3, 143, 15, 160, 3, 34, 131, 80, 3, 24, 255, 242, 90, 63, 79, 162, 23, 248, 255, 247, 255, 251, 255, 245, 233, 183, 16, 12, 30, 180, 79, 25, 83, 33, 243, 255, 170, 254, 18, 83, 228, 23, 203, 32, 182, 135, 191, 73, 231, - 162, 8, 87, 255, 14, 87, 255, 38, 23, 27, 132, 226, 66, 247, 154, 253, 86, 11, 31, 6, 0, 243, 87, 255, 251, 0, 192, 16, 153, 247, 15, 255, 14, 19, 179, 4, 6, 59, 146, 43, 58, 247, 53, 27, 246, 24, 93, 2, 65, 159, 31, 255, 33, 227, 249, 93, 25, 251, 208, 17, 35, 32, 0, 55, 206, 192, 48, 149, 63, 31, - 157, 64, 3, 240, 23, 34, 240, 31, 235, 241, 233, 0, 2, 17, 137, 90, 191, 22, 149, 96, 3, 223, 79, 26, 25, 189, 42, 29, 143, 255, 79, 255, 250, 13, 150, 9, 31, 252, 56, 131, 30, 104, 131, 3, 118, 183, 255, 82, 42, 95, 224, 67, 255, 249, 91, 107, 127, 255, 6, 111, 159, 99, 35, 147, 4, 239, 95, 71, 127, 224, - 27, 114, 1, 253, 235, 133, 86, 159, 111, 255, 223, 31, 168, 2, 87, 169, 118, 112, 224, 207, 26, 188, 255, 31, 160, 44, 233, 255, 84, 24, 128, 196, 15, 94, 0, 13, 144, 3, 11, 80, 3, 8, 159, 0, 100, 82, 159, 253, 214, 15, 159, 30, 41, 255, 0, 32, 183, 36, 75, 134, 4, 239, 221, 57, 87, 16, 192, 81, 135, 255, - 7, 16, 192, 247, 0, 2, 87, 175, 125, 86, 207, 255, 241, 75, 27, 86, 112, 29, 145, 20, 91, 80, 28, 91, 166, 16, 93, 41, 168, 108, 33, 83, 41, 239, 254, 15, 255, 2, 144, 27, 85, 191, 15, 255, 255, 15, 255, 163, 5, 181, 15, 255, 52, 19, 86, 151, 4, 26, 101, 29, 174, 255, 21, 221, 255, 0, 239, 246, 233, 117, - 0, 36, 143, 159, 119, 117, 30, 179, 237, 255, 255, 197, 111, 255, 67, 70, 45, 23, 6, 82, 253, 95, 160, 92, 163, 253, 90, 151, 222, 109, 142, 61, 59, 83, 40, 91, 63, 29, 171, 175, 39, 201, 79, 255, 37, 119, 168, 99, 45, 51, 212, 108, 105, 114, 22, 48, 37, 157, 13, 51, 2, 78, 32, 52, 240, 80, 7, 191, 223, 8, - 205, 221, 37, 50, 51, 48, 3, 20, 84, 0, 2, 40, 211, 126, 233, 17, 239, 125, 171, 68, 255, 254, 221, 143, 255, 136, 193, 50, 85, 93, 95, 249, 93, 107, 217, 15, 90, 0, 70, 78, 243, 4, 74, 93, 171, 15, 94, 7, 151, 223, 112, 75, 131, 252, 93, 163, 186, 240, 223, 158, 88, 172, 144, 30, 254, 208, 30, 61, 74, 37, - 42, 242, 63, 103, 159, 137, 35, 140, 11, 11, 92, 15, 74, 129, 95, 66, 92, 11, 96, 159, 252, 225, 95, 85, 29, 116, 234, 223, 254, 128, 31, 207, 128, 31, 114, 64, 41, 186, 197, 14, 255, 54, 33, 2, 62, 13, 31, 228, 5, 54, 252, 251, 41, 48, 3, 38, 12, 7, 48, 3, 250, 31, 83, 55, 150, 0, 243, 4, 223, 255, - 1, 24, 80, 21, 158, 248, 159, 244, 255, 251, 48, 191, 21, 40, 127, 31, 148, 25, 231, 206, 177, 253, 94, 143, 4, 79, 7, 239, 255, 64, 31, 20, 140, 161, 30, 2, 94, 99, 46, 11, 1, 124, 143, 151, 53, 239, 214, 123, 182, 45, 39, 251, 20, 191, 255, 254, 20, 203, 236, 255, 251, 22, 32, 47, 2, 223, 46, 86, 15, 194, - 3, 145, 112, 234, 127, 15, 232, 5, 95, 49, 111, 65, 115, 160, 3, 63, 42, 80, 3, 15, 255, 20, 207, 86, 99, 255, 80, 3, 239, 80, 19, 170, 143, 50, 192, 128, 88, 99, 64, 94, 99, 64, 80, 19, 65, 43, 31, 13, 26, 234, 40, 3, 39, 91, 40, 11, 40, 150, 31, 38, 30, 200, 34, 3, 191, 50, 254, 34, 79, 1, - 255, 66, 91, 178, 0, 37, 215, 111, 0, 74, 247, 47, 7, 8, 61, 215, 170, 64, 58, 251, 1, 22, 159, 7, 23, 109, 13, 26, 247, 191, 95, 27, 65, 223, 255, 251, 6, 255, 79, 80, 31, 32, 175, 27, 82, 255, 22, 188, 25, 138, 26, 95, 90, 191, 21, 87, 47, 14, 238, 15, 33, 227, 9, 112, 3, 248, 30, 134, 247, 245, - 0, 2, 52, 82, 150, 95, 254, 76, 7, 127, 74, 103, 95, 28, 175, 221, 39, 204, 250, 47, 167, 227, 71, 63, 186, 250, 9, 111, 2, 8, 152, 119, 60, 75, 8, 92, 87, 239, 0, 19, 51, 143, 227, 175, 255, 120, 173, 126, 126, 221, 247, 255, 254, 183, 16, 49, 159, 255, 75, 99, 231, 80, 14, 214, 37, 65, 231, 241, 112, 3, - 47, 253, 148, 209, 15, 255, 33, 41, 151, 3, 111, 155, 1, 175, 226, 27, 193, 243, 6, 255, 146, 19, 120, 95, 43, 155, 0, 70, 146, 118, 121, 36, 59, 143, 254, 90, 195, 31, 251, 162, 9, 130, 1, 114, 15, 177, 10, 255, 255, 110, 56, 179, 27, 70, 255, 27, 170, 189, 253, 19, 18, 193, 0, 5, 116, 127, 228, 253, 15, 90, - 19, 7, 207, 255, 15, 255, 255, 15, 255, 14, 49, 0, 11, 239, 149, 246, 31, 187, 68, 167, 11, 52, 22, 250, 14, 62, 12, 44, 176, 168, 221, 90, 110, 201, 37, 19, 35, 211, 23, 42, 85, 47, 126, 127, 225, 65, 96, 0, 92, 250, 240, 27, 236, 238, 192, 1, 239, 27, 106, 111, 255, 112, 60, 239, 117, 167, 130, 1, 239, 48, - 30, 2, 192, 30, 132, 245, 97, 30, 188, 254, 46, 176, 63, 53, 103, 31, 62, 60, 247, 208, 108, 236, 7, 0, 0, 20, 83, 42, 253, 61, 188, 60, 15, 138, 95, 93, 79, 6, 55, 0, 30, 211, 4, 20, 179, 30, 22, 153, 153, 191, 123, 71, 28, 177, 11, 229, 47, 221, 37, 71, 244, 100, 31, 255, 112, 0, 38, 253, 11, 38, - 206, 8, 55, 242, 33, 54, 234, 254, 0, 2, 70, 222, 48, 29, 139, 96, 31, 159, 170, 128, 31, 179, 192, 31, 183, 242, 31, 171, 243, 29, 159, 43, 46, 196, 33, 150, 247, 21, 198, 248, 23, 251, 251, 47, 149, 255, 95, 48, 45, 131, 10, 31, 127, 13, 30, 68, 47, 86, 31, 173, 111, 54, 220, 176, 26, 71, 80, 64, 69, 55, - 162, 159, 31, 169, 14, 45, 173, 93, 79, 28, 191, 7, 61, 179, 82, 31, 48, 246, 31, 52, 144, 31, 52, 31, 35, 226, 31, 39, 175, 224, 31, 43, 249, 46, 119, 48, 254, 239, 255, 19, 249, 226, 14, 193, 2, 80, 95, 30, 38, 205, 253, 63, 208, 7, 47, 31, 139, 32, 169, 207, 109, 255, 253, 79, 223, 255, 239, 245, 2, 143, - 30, 81, 175, 255, 176, 255, 162, 176, 79, 91, 243, 88, 83, 1, 138, 106, 31, 226, 127, 72, 11, 158, 8, 86, 115, 26, 99, 21, 119, 65, 76, 170, 183, 255, 196, 0, 76, 251, 0, 2, 140, 241, 92, 31, 236, 192, 49, 67, 0, 0, 179, 90, 15, 32, 195, 132, 176, 87, 143, 11, 127, 4, 14, 155, 1, 47, 175, 12, 27, 231, - 63, 71, 102, 35, 179, 45, 255, 90, 235, 63, 255, 143, 255, 25, 184, 169, 254, 31, 253, 248, 17, 237, 224, 17, 228, 31, 205, 64, 87, 150, 179, 40, 27, 198, 223, 26, 11, 255, 255, 225, 46, 70, 235, 31, 3, 118, 143, 253, 0, 0, 2, 31, 155, 59, 26, 40, 25, 70, 251, 0, 27, 16, 36, 0, 110, 190, 48, 175, 255, 244, - 95, 255, 247, 128, 22, 216, 53, 50, 71, 57, 107, 31, 163, 239, 130, 16, 80, 215, 176, 73, 14, 179, 34, 191, 31, 220, 32, 3, 159, 31, 221, 41, 174, 111, 210, 254, 208, 14, 250, 124, 15, 91, 243, 43, 239, 2, 41, 95, 171, 61, 175, 255, 192, 28, 15, 243, 29, 40, 255, 206, 94, 61, 121, 174, 31, 231, 12, 54, 118, 32, - 120, 51, 18, 44, 111, 41, 231, 16, 229, 0, 45, 77, 45, 81, 32, 15, 219, 255, 102, 15, 255, 42, 221, 221, 214, 199, 208, 29, 221, 221, 47, 19, 78, 15, 255, 6, 208, 14, 7, 1, 9, 170, 130, 5, 120, 146, 31, 58, 163, 243, 27, 234, 243, 31, 58, 128, 3, 10, 86, 184, 1, 118, 20, 75, 195, 224, 3, 79, 255, 84, - 92, 199, 249, 208, 3, 6, 7, 101, 166, 15, 31, 247, 79, 94, 11, 69, 70, 103, 99, 30, 137, 215, 255, 229, 31, 27, 244, 31, 31, 241, 255, 247, 199, 88, 192, 35, 243, 11, 246, 46, 17, 235, 2, 8, 255, 213, 247, 191, 23, 37, 255, 80, 3, 229, 23, 49, 64, 162, 6, 23, 143, 5, 31, 227, 16, 118, 31, 190, 211, 55, - 143, 85, 31, 151, 208, 25, 182, 243, 30, 149, 246, 30, 182, 247, 76, 29, 203, 246, 15, 130, 17, 28, 223, 4, 223, 58, 23, 45, 251, 174, 31, 24, 112, 127, 23, 117, 207, 255, 32, 46, 172, 219, 103, 98, 47, 85, 214, 0, 71, 255, 245, 0, 202, 49, 73, 5, 158, 31, 29, 143, 1, 31, 55, 46, 74, 115, 171, 6, 30, 175, - 11, 31, 100, 14, 31, 1, 15, 255, 245, 224, 87, 117, 19, 30, 92, 253, 30, 96, 254, 118, 62, 94, 97, 3, 101, 31, 207, 6, 255, 72, 127, 33, 42, 229, 65, 243, 247, 0, 3, 5, 102, 197, 79, 151, 32, 55, 31, 62, 86, 167, 58, 223, 252, 1, 71, 117, 16, 21, 157, 191, 251, 62, 193, 251, 157, 255, 249, 16, 7, 253, - 255, 144, 5, 191, 255, 139, 29, 171, 223, 230, 255, 253, 100, 102, 191, 31, 142, 0, 246, 80, 3, 170, 224, 202, 187, 127, 71, 247, 9, 31, 91, 11, 48, 147, 33, 31, 148, 42, 151, 47, 55, 157, 37, 219, 26, 180, 31, 33, 80, 117, 112, 3, 199, 119, 32, 40, 183, 255, 6, 201, 49, 5, 236, 255, 246, 16, 16, 3, 251, 5, - 17, 35, 27, 114, 251, 255, 3, 253, 215, 107, 191, 190, 12, 255, 250, 244, 102, 207, 255, 224, 31, 161, 96, 41, 151, 231, 239, 235, 64, 15, 137, 28, 46, 252, 223, 255, 162, 15, 28, 22, 72, 7, 55, 227, 136, 95, 0, 0, 17, 0, 215, 0, 73, 40, 63, 254, 82, 99, 214, 0, 119, 161, 82, 15, 236, 25, 14, 26, 159, 42, - 123, 56, 63, 44, 123, 6, 95, 39, 67, 4, 143, 228, 47, 255, 48, 4, 239, 121, 153, 65, 197, 255, 119, 98, 44, 43, 79, 255, 245, 85, 0, 3, 1, 49, 191, 255, 239, 31, 98, 191, 92, 79, 10, 95, 44, 207, 126, 175, 255, 63, 233, 64, 62, 98, 108, 26, 203, 254, 205, 121, 164, 213, 54, 16, 96, 111, 255, 138, 177, 89, - 155, 34, 95, 3, 174, 5, 15, 91, 19, 11, 35, 142, 68, 91, 35, 1, 127, 255, 22, 60, 25, 161, 0, 37, 138, 35, 109, 113, 25, 106, 0, 66, 16, 15, 236, 255, 15, 255, 255, 14, 185, 127, 87, 212, 153, 32, 30, 19, 48, 29, 115, 48, 30, 91, 128, 3, 125, 8, 193, 56, 113, 0, 0, 207, 254, 30, 208, 255, 124, 27, - 74, 255, 0, 1, 223, 254, 64, 19, 207, 255, 152, 96, 93, 231, 3, 66, 32, 41, 135, 19, 237, 62, 179, 68, 11, 43, 96, 3, 128, 87, 208, 208, 3, 192, 11, 135, 147, 3, 103, 150, 0, 21, 31, 31, 235, 255, 31, 255, 255, 9, 29, 225, 143, 13, 31, 242, 23, 58, 23, 66, 240, 0, 98, 20, 253, 87, 48, 255, 239, 255, - 112, 30, 6, 144, 253, 255, 95, 255, 160, 5, 31, 31, 49, 31, 83, 31, 151, 63, 24, 11, 159, 31, 172, 15, 160, 14, 159, 255, 170, 80, 30, 68, 124, 23, 243, 255, 144, 3, 244, 24, 71, 189, 224, 21, 82, 176, 38, 118, 48, 39, 251, 32, 56, 31, 239, 38, 99, 247, 133, 109, 24, 120, 16, 136, 21, 119, 34, 94, 143, 15, - 148, 17, 4, 30, 91, 22, 192, 80, 3, 252, 31, 22, 138, 251, 112, 3, 15, 211, 47, 37, 247, 111, 31, 147, 127, 208, 3, 100, 38, 107, 159, 255, 110, 151, 110, 159, 144, 208, 3, 10, 151, 17, 169, 51, 71, 247, 10, 94, 3, 9, 95, 255, 47, 219, 7, 250, 255, 81, 22, 117, 16, 24, 189, 247, 127, 255, 211, 181, 127, 31, - 113, 8, 48, 240, 32, 244, 0, 71, 254, 98, 0, 28, 255, 255, 177, 223, 25, 64, 74, 62, 33, 119, 30, 33, 30, 244, 247, 31, 112, 247, 71, 107, 75, 127, 255, 48, 146, 255, 96, 3, 11, 16, 45, 5, 255, 199, 255, 235, 46, 98, 25, 18, 31, 255, 4, 119, 0, 186, 4, 30, 65, 12, 252, 134, 25, 171, 255, 16, 27, 207, - 240, 207, 16, 3, 24, 225, 240, 253, 72, 255, 234, 240, 64, 12, 65, 183, 106, 56, 15, 253, 1, 62, 18, 174, 144, 112, 3, 79, 31, 139, 63, 253, 160, 216, 32, 129, 255, 80, 3, 24, 40, 32, 80, 45, 111, 11, 45, 26, 25, 194, 9, 125, 112, 3, 248, 0, 9, 222, 247, 15, 223, 60, 159, 53, 89, 239, 96, 7, 173, 223, - 175, 255, 144, 209, 79, 112, 2, 9, 129, 33, 128, 3, 60, 159, 177, 84, 97, 231, 34, 212, 253, 26, 179, 234, 221, 0, 6, 176, 127, 247, 21, 80, 247, 24, 159, 175, 246, 24, 163, 245, 26, 255, 245, 0, 205, 222, 81, 175, 254, 80, 80, 3, 48, 81, 255, 248, 58, 19, 247, 0, 239, 2, 123, 239, 9, 190, 7, 255, 210, 0, - 254, 135, 182, 8, 111, 255, 9, 128, 255, 10, 145, 255, 11, 162, 149, 1, 51, 81, 252, 5, 11, 255, 247, 223, 11, 55, 251, 48, 3, 166, 230, 25, 66, 48, 28, 209, 31, 33, 252, 0, 23, 158, 46, 31, 166, 39, 163, 225, 31, 167, 249, 0, 92, 37, 243, 166, 255, 94, 254, 239, 7, 158, 19, 31, 255, 5, 223, 63, 51, 89, - 38, 95, 47, 54, 154, 112, 0, 41, 158, 31, 243, 103, 171, 99, 47, 255, 212, 46, 223, 64, 31, 161, 225, 0, 167, 62, 22, 186, 4, 24, 3, 7, 255, 22, 1, 35, 48, 82, 31, 239, 243, 31, 243, 255, 48, 3, 41, 251, 9, 30, 116, 188, 9, 23, 2, 9, 255, 245, 3, 16, 96, 23, 27, 166, 211, 110, 0, 195, 55, 203, - 39, 95, 4, 255, 79, 207, 41, 135, 27, 47, 78, 243, 95, 167, 247, 95, 175, 95, 255, 26, 37, 29, 146, 21, 247, 12, 94, 7, 46, 15, 239, 54, 175, 21, 231, 118, 32, 51, 24, 191, 94, 96, 254, 239, 230, 227, 35, 151, 239, 21, 115, 46, 227, 31, 203, 2, 255, 147, 33, 47, 2, 33, 67, 16, 0, 3, 1, 63, 255, 2, - 85, 31, 135, 247, 199, 251, 40, 3, 113, 0, 21, 0, 243, 254, 6, 255, 16, 243, 127, 255, 128, 24, 4, 255, 241, 254, 255, 249, 32, 255, 254, 48, 85, 78, 15, 112, 15, 255, 48, 6, 120, 73, 251, 31, 66, 252, 73, 31, 70, 219, 15, 191, 0, 31, 94, 1, 48, 3, 16, 35, 221, 186, 218, 15, 255, 32, 207, 255, 161, 31, - 62, 255, 31, 167, 83, 31, 255, 110, 47, 255, 54, 136, 254, 31, 248, 60, 255, 169, 250, 31, 251, 243, 31, 255, 128, 31, 62, 15, 255, 28, 7, 74, 31, 25, 7, 24, 238, 34, 176, 6, 27, 251, 5, 24, 15, 158, 5, 24, 254, 32, 3, 4, 255, 249, 16, 17, 179, 239, 250, 102, 207, 111, 255, 249, 123, 239, 234, 168, 64, 175, - 222, 244, 31, 255, 224, 92, 23, 15, 158, 4, 42, 135, 205, 175, 255, 75, 251, 41, 151, 0, 110, 175, 255, 32, 115, 25, 183, 210, 1, 159, 127, 252, 19, 35, 255, 71, 194, 116, 1, 28, 39, 64, 3, 82, 8, 176, 3, 253, 144, 3, 89, 73, 231, 6, 152, 3, 5, 254, 185, 29, 56, 3, 0, 212, 0, 248, 82, 147, 214, 15, - 250, 254, 3, 25, 255, 32, 3, 235, 0, 49, 16, 15, 255, 100, 2, 89, 183, 1, 121, 42, 15, 255, 2, 97, 235, 152, 9, 66, 243, 2, 45, 79, 254, 77, 59, 74, 35, 83, 207, 253, 223, 45, 63, 128, 90, 183, 32, 10, 118, 255, 121, 8, 1, 67, 70, 0, 3, 191, 63, 155, 46, 7, 12, 122, 31, 154, 15, 255, 248, 65, - 40, 15, 1, 30, 19, 215, 119, 97, 45, 161, 112, 31, 163, 243, 0, 156, 94, 30, 85, 0, 32, 3, 139, 228, 0, 217, 88, 23, 85, 15, 255, 15, 123, 31, 247, 159, 80, 3, 92, 31, 219, 5, 78, 29, 163, 6, 53, 175, 37, 179, 246, 255, 241, 30, 1, 219, 242, 0, 54, 207, 119, 113, 15, 173, 33, 5, 153, 159, 147, 31, - 58, 39, 255, 241, 0, 13, 255, 240, 221, 0, 14, 30, 159, 15, 255, 208, 112, 3, 2, 210, 153, 184, 29, 86, 253, 48, 3, 70, 196, 254, 29, 102, 137, 255, 24, 99, 94, 239, 15, 164, 15, 37, 71, 239, 38, 3, 111, 107, 86, 7, 15, 255, 72, 11, 8, 23, 214, 5, 48, 250, 80, 0, 15, 254, 128, 30, 220, 160, 31, 115, - 175, 208, 25, 20, 240, 16, 91, 243, 10, 255, 250, 220, 247, 15, 39, 165, 0, 0, 179, 31, 255, 16, 226, 218, 0, 192, 6, 103, 3, 1, 36, 72, 87, 11, 95, 255, 222, 4, 100, 175, 179, 86, 119, 119, 80, 40, 88, 123, 72, 94, 255, 255, 32, 6, 31, 254, 79, 255, 189, 244, 31, 179, 64, 127, 255, 228, 127, 222, 96, 48, - 6, 195, 11, 10, 0, 10, 72, 191, 78, 230, 31, 119, 18, 3, 62, 15, 238, 21, 119, 119, 143, 157, 225, 0, 59, 30, 93, 175, 239, 30, 97, 255, 17, 86, 255, 251, 16, 0, 168, 84, 5, 105, 26, 7, 31, 147, 5, 31, 219, 55, 10, 39, 71, 169, 28, 42, 52, 71, 175, 227, 103, 19, 240, 17, 177, 0, 42, 17, 189, 56, - 215, 116, 15, 255, 26, 14, 18, 65, 11, 50, 87, 111, 87, 167, 6, 206, 191, 255, 30, 255, 255, 120, 191, 223, 89, 253, 254, 223, 255, 253, 145, 121, 161, 153, 175, 255, 16, 0, 3, 1, 230, 96, 40, 4, 31, 243, 175, 87, 31, 247, 79, 31, 251, 8, 175, 255, 250, 111, 255, 249, 192, 255, 239, 255, 64, 26, 3, 51, 35, 255, - 250, 255, 96, 0, 55, 97, 15, 47, 27, 11, 31, 247, 83, 31, 211, 14, 31, 255, 13, 82, 7, 159, 127, 253, 32, 251, 0, 255, 232, 137, 189, 106, 191, 253, 221, 210, 221, 220, 239, 194, 192, 90, 187, 40, 199, 176, 15, 170, 255, 28, 15, 255, 255, 15, 255, 6, 18, 215, 1, 207, 0, 29, 128, 26, 235, 85, 29, 228, 9, 123, - 39, 71, 108, 195, 225, 30, 11, 162, 231, 0, 0, 113, 15, 255, 255, 11, 148, 171, 20, 0, 0, 198, 43, 255, 61, 59, 21, 251, 28, 177, 145, 9, 31, 231, 255, 13, 255, 248, 191, 15, 255, 205, 255, 215, 119, 81, 47, 238, 177, 31, 255, 253, 0, 185, 189, 239, 20, 220, 143, 255, 96, 92, 31, 94, 255, 252, 255, 210, 0, 255, - 230, 64, 9, 161, 255, 13, 158, 158, 255, 14, 255, 212, 254, 11, 255, 245, 32, 13, 41, 251, 24, 230, 25, 19, 46, 239, 3, 103, 111, 255, 164, 189, 3, 30, 125, 127, 255, 192, 207, 63, 155, 249, 112, 25, 243, 80, 0, 117, 11, 152, 255, 12, 168, 255, 13, 185, 255, 15, 254, 134, 245, 67, 87, 68, 72, 31, 255, 172, 31, 255, - 50, 127, 47, 255, 9, 0, 9, 1, 5, 7, 0, 255, 4, 4, 0, 5, 5, 0, 20, 20, 239, 0, 18, 18, 32, 2, 19, 19, 0, 15, 143, 15, 32, 2, 16, 8, 16, 17, 6, 6, 0, 17, 254, 17, 0, 14, 14, 0, 23, 23, 80, 29, 12, 16, 38, 16, 44, 112, 38, 64, 53, 24, 24, 32, 38, 16, 59, 193, 13, 13, - 32, 44, 16, 65, 16, 8, 16, 71, 16, 56, 11, 128, 11, 32, 62, 16, 65, 16, 74, 64, 104, 112, 35, 16, 104, 16, 29, 108, 16, 50, 10, 10, 80, 35, 12, 12, 32, 107, 16, 171, 239, 77, 65, 80, 31, 255, 188, 0, 39, 0, 234, 122, 0, 1, 47, 255, 89, 29, 223, 255, 144, 0, 47, 45, 217, 0, 1, 16, 0, 16, - 220, 0, 6, 0, 7, 116, 27, 201, 9, 0, 10, 27, 127, 12, 30, 163, 16, 162, 217, 0, 15, 28, 14, 17, 0, 16, 238, 23, 19, 21, 255, 0, 22, 0, 23, 0, 24, 0, 25, 245, 0, 26, 0, 27, 144, 97, 28, 30, 207, 29, 255, 0, 30, 0, 31, 0, 32, 0, 33, 255, 0, 34, 0, 35, 0, 36, 0, 37, 95, 48, - 123, 38, 16, 151, 40, 0, 41, 0, 42, 255, 0, 43, 0, 44, 0, 45, 0, 46, 244, 0, 47, 0, 48, 80, 151, 49, 80, 187, 29, 235, 75, 31, 15, 2, 108, 90, 16, 67, 0, 16, 69, 1, 0, 128, 233, 65, 125, 15, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, - 122, 48, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 5, 0, 123, 16, 0, 32, 0, 0, 1, 16, 7, 3, 224, 37, 64, 3, 112, 1, 1, 64, 27, 48, 36, 64, 80, 3, 192, 223, 0, 5, 32, 43, 0, 0, 82, 79, 79, 179, 84, 32, 27, 63, 42, 64, 68, 0, 3, 0, 133, - 53, 246, 17, 0, 0, 14, 64, 79, 2, 160, 64, 81, 211, 226, 226, 16, 19, 26, 80, 15, 64, 19, 2, 207, 171, 45, 16, 39, 40, 16, 127, 64, 96, 19, 255, 255, 234, 0, 46, 2, 128, 136, 16, 80, 19, 184, 16, 19, 199, 2, 255, 16, 0, 96, 19, 0, 3, 10, 46, 0, 46, 255, 46, 0, 101, 117, 103, 101, 114, 109, - 255, 97, 110, 0, 109, 101, 115, 115, 97, 253, 103, 101, 46, 98, 109, 103, 96, 11, 105, 255, 100, 46, 116, 98, 108, 0, 115, 116, 243, 114, 117, 99, 116, 48, 10, 176, 198, 77, 69, 214, 83, 71, 16, 45, 49, 80, 187, 2, 2, 208, 228, 239, 73, 78, 70, 16, 27, 0, 96, 0, 6, 197, 0, 12, 49, 62, 113, 56, 48, 159, - 2, 144, 11, 98, 90, 144, 23, 194, 128, 35, 1, 170, 144, 11, 208, 144, 59, 115, 49, 130, 68, 65, 84, 32, 123, 33, 127, 66, 0, 235, 105, 0, 116, 16, 1, 101, 17, 169, 115, 0, 233, 99, 0, 104, 16, 15, 101, 16, 85, 32, 15, 100, 127, 48, 11, 32, 0, 83, 0, 85, 0, 80, 247, 0, 69, 0, 82, 17, 205, 10, - 0, 77, 221, 0, 65, 16, 9, 73, 0, 79, 17, 219, 71, 95, 16, 11, 76, 16, 15, 88, 0, 89, 0, 45, 203, 0, 68, 16, 75, 32, 67, 32, 16, 77, 105, 0, 136, 110, 17, 38, 0, 95, 80, 32, 115, 101, 16, 185, 32, 191, 128, 127, 234, 107, 0, 97, 16, 127, 110, 18, 125, 110, 16, 223, 85, 32, 213, 116, 18, 137, - 103, 16, 229, 108, 80, 45, 110, 82, 16, 201, 119, 16, 245, 114, 16, 229, 32, 13, 46, 18, 169, 78, 161, 11, 108, 80, 87, 97, 5, 10, 0, 87, 17, 41, 167, 105, 16, 229, 66, 17, 43, 65, 25, 110, 0, 117, 65, 16, 229, 103, 17, 55, 32, 109, 32, 89, 33, 75, 64, 19, 44, 112, 18, 249, 117, 0, 109, 80, 101, 33, - 99, 32, 107, 33, 101, 186, 73, 17, 25, 102, 0, 111, 16, 121, 109, 16, 165, 167, 116, 17, 127, 111, 17, 43, 32, 145, 32, 0, 122, 42, 16, 81, 33, 61, 114, 17, 135, 97, 16, 171, 116, 80, 155, 148, 0, 177, 131, 1, 129, 6, 0, 17, 163, 114, 48, 225, 65, 191, 74, 65, 133, 32, 17, 175, 33, 207, 110, 49, 229, 117, - 48, 243, 170, 32, 17, 245, 109, 19, 155, 75, 16, 135, 115, 16, 165, 83, 32, 5, 33, 179, 105, 6, 82, 103, 19, 59, 0, 8, 247, 33, 157, 67, 98, 51, 27, 4, 0, 6, 245, 4, 56, 56, 178, 83, 39, 0, 211, 207, 8, 42, 82, 155, 35, 83, 3, 19, 252, 24, 20, 0, 4, 147, 231, 255, 43, 67, 79, 77, 77, 69, - 78, 84, 255, 0, 68, 73, 83, 67, 95, 48, 49, 95, 80, 7, 50, 80, 15, 51, 0, 84, 73, 84, 254, 76, 69, 95, 77, 65, 73, 78, 80, 10, 249, 83, 85, 66, 0, 64, 0, 0, 0, 144, 111, 112, 123, 36, 99, 174, 55, 113, 97, 96, 147, 28, 19, 223, 62, 141, 80, 171, 0, 190, 198, 20, 162, 61, 51, 211, 16, 153, - 100, 67, 164, 76, 51, 223, 12, 252, 0, 0, 19, 54, 175, 66, 51, 235, 19, 253, 239, 137, 230, 39, 67, 247, 20, 0, 0, 251, 231, 104, 17, 53, 52, 3, 16, 185, 23, 177, 123, 170, 254, 52, 15, 28, 116, 181, 4, 81, 23, 7, 80, 235, 168, 9, 20, 224, 10, 20, 228, 11, 224, 162, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 89, 97, 122, 48, 0, 0, 90, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 90, 224, 245, 0, 0, 0, 32, 16, 3, 192, 16, 11, 0, 42, 64, 3, 112, 2, 1, 80, 27, 3, 16, 35, 64, 80, 3, 239, 128, 0, 3, 32, 22, 0, 0, 82, 79, 220, 79, 84, 16, 59, 5, 198, 97, - 48, 31, 0, 2, 1, 253, 67, 212, 17, 0, 0, 18, 64, 80, 89, 190, 228, 32, 88, 255, 255, 0, 46, 2, 128, 97, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 32, 132, 46, 0, 46, 46, 0, 101, 109, 255, 98, 101, 100, 100, 101, 100, 102, 111, 255, 110, 116, 0, 109, 101, 115, 115, 97, 223, 103, 101, - 32, 11, 50, 54, 46, 98, 114, 159, 102, 16, 19, 0, 0, 8, 82, 70, 78, 84, 254, 239, 255, 1, 4, 48, 123, 16, 0, 5, 70, 237, 73, 78, 70, 32, 235, 1, 33, 16, 241, 27, 190, 27, 32, 219, 56, 0, 0, 88, 104, 16, 155, 255, 20, 33, 27, 26, 0, 84, 71, 76, 191, 80, 16, 15, 48, 24, 25, 19, 24, 0, - 249, 0, 8, 0, 0, 11, 32, 221, 17, 3, 128, 111, 49, 31, 96, 0, 0, 0, 102, 127, 255, 176, 0, 186, 111, 16, 3, 95, 255, 160, 16, 3, 144, 48, 3, 142, 63, 16, 7, 0, 0, 255, 1, 17, 189, 63, 255, 112, 48, 3, 186, 47, 16, 7, 31, 255, 96, 16, 3, 80, 48, 3, 236, 13, 221, 64, 1, 251, 160, 35, - 53, 51, 253, 112, 3, 221, 49, 16, 164, 104, 86, 120, 64, 20, 27, 112, 117, 48, 3, 254, 221, 80, 3, 106, 50, 4, 3, 175, 10, 32, 119, 3, 60, 146, 7, 203, 16, 51, 251, 223, 255, 240, 254, 0, 175, 255, 208, 0, 9, 238, 1, 247, 61, 255, 159, 193, 0, 9, 255, 251, 0, 15, 255, 255, 254, 0, 13, 255, 253, 0, - 1, 223, 124, 249, 21, 117, 242, 0, 0, 78, 112, 119, 4, 91, 148, 3, 239, 0, 16, 184, 0, 0, 14, 85, 22, 55, 6, 38, 59, 39, 166, 188, 243, 22, 216, 251, 84, 22, 220, 253, 22, 224, 248, 22, 228, 80, 5, 48, 255, 6, 65, 255, 52, 7, 226, 46, 24, 52, 0, 79, 25, 79, 223, 19, 188, 40, 203, 95, 18, 145, - 97, 19, 98, 254, 64, 191, 255, 255, 186, 242, 24, 223, 252, 255, 253, 24, 229, 192, 16, 13, 229, 48, 79, 255, 9, 51, 2, 41, 100, 176, 25, 144, 241, 125, 137, 130, 53, 0, 75, 239, 255, 23, 255, 255, 127, 22, 7, 255, 0, 15, 252, 167, 0, 2, 175, 63, 25, 39, 47, 48, 95, 103, 119, 84, 16, 111, 25, 55, 254, 255, - 80, 0, 101, 68, 88, 223, 122, 16, 63, 159, 176, 0, 76, 112, 95, 128, 35, 3, 43, 25, 105, 24, 61, 0, 20, 73, 0, 20, 73, 0, 255, 94, 6, 65, 0, 9, 26, 7, 191, 0, 0, 10, 25, 131, 175, 95, 25, 135, 223, 64, 191, 20, 119, 100, 59, 191, 255, 144, 0, 251, 134, 140, 253, 48, 0, 214, 0, 209, 154, 37, - 251, 16, 15, 255, 250, 41, 219, 255, 16, 0, 255, 246, 0, 0, 60, 192, 41, 181, 96, 26, 67, 74, 19, 167, 127, 25, 219, 32, 183, 15, 167, 235, 25, 234, 63, 38, 221, 42, 104, 53, 119, 117, 188, 64, 160, 94, 152, 99, 53, 141, 48, 163, 129, 0, 213, 0, 198, 42, 55, 230, 42, 59, 144, 26, 63, 248, 254, 0, 94, 255, - 255, 32, 3, 255, 104, 255, 211, 1, 51, 16, 186, 255, 65, 111, 33, 115, 5, 207, 79, 26, 207, 47, 36, 220, 42, 200, 85, 103, 121, 155, 126, 160, 190, 234, 151, 118, 85, 255, 210, 65, 3, 81, 42, 232, 188, 25, 213, 255, 17, 32, 41, 77, 41, 81, 51, 169, 16, 9, 229, 26, 31, 26, 175, 143, 26, 179, 17, 159, 6, 93, - 26, 217, 12, 17, 5, 47, 255, 249, 25, 175, 255, 250, 0, 207, 255, 175, 249, 20, 151, 241, 17, 79, 235, 128, 0, 5, 17, 25, 2, 42, 219, 239, 103, 213, 155, 222, 113, 77, 247, 27, 120, 252, 43, 19, 0, 106, 65, 143, 255, 184, 27, 31, 254, 103, 37, 16, 80, 95, 95, 96, 3, 15, 208, 3, 14, 255, 209, 109, 255, 255, - 255, 218, 255, 255, 232, 216, 255, 254, 219, 166, 214, 27, 60, 226, 155, 38, 40, 1, 143, 126, 17, 226, 13, 240, 0, 2, 175, 229, 91, 96, 140, 16, 84, 255, 48, 227, 21, 221, 255, 245, 27, 135, 37, 28, 42, 17, 68, 21, 255, 253, 16, 183, 248, 21, 66, 245, 22, 7, 95, 32, 3, 247, 16, 199, 253, 0, 8, 255, 255, 89, - 8, 100, 10, 177, 11, 12, 13, 22, 197, 65, 32, 144, 3, 15, 82, 144, 3, 14, 28, 115, 13, 33, 227, 48, 3, 243, 144, 3, 186, 244, 80, 159, 245, 0, 43, 54, 243, 111, 22, 251, 174, 95, 22, 255, 143, 22, 255, 223, 255, 144, 17, 102, 208, 64, 111, 22, 170, 255, 32, 40, 17, 120, 44, 54, 69, 251, 103, 34, 3, 12, - 255, 70, 15, 65, 43, 255, 181, 87, 190, 120, 44, 83, 254, 223, 255, 255, 250, 16, 3, 249, 247, 101, 84, 51, 245, 86, 23, 38, 27, 152, 43, 97, 123, 81, 131, 17, 168, 60, 133, 11, 237, 16, 1, 255, 253, 255, 79, 5, 255, 255, 7, 39, 66, 9, 183, 239, 22, 97, 2, 82, 189, 6, 255, 255, 253, 232, 207, 117, 49, 112, - 251, 13, 93, 71, 128, 31, 81, 135, 42, 49, 143, 18, 12, 33, 242, 123, 13, 80, 207, 13, 80, 219, 219, 7, 152, 182, 223, 104, 207, 163, 152, 114, 118, 148, 66, 205, 133, 35, 231, 254, 29, 217, 161, 0, 192, 9, 67, 151, 94, 55, 59, 41, 237, 195, 255, 184, 120, 173, 100, 87, 188, 239, 29, 156, 2, 87, 119, 100, 176, 223, - 23, 88, 34, 34, 37, 57, 179, 146, 157, 184, 144, 192, 80, 247, 11, 80, 3, 183, 5, 177, 31, 251, 157, 164, 89, 216, 119, 101, 160, 48, 209, 63, 128, 49, 23, 36, 95, 9, 175, 4, 39, 247, 36, 175, 175, 3, 46, 55, 77, 238, 131, 252, 85, 87, 172, 115, 164, 186, 54, 119, 117, 177, 33, 19, 169, 0, 255, 177, 252, 74, - 149, 252, 132, 13, 77, 255, 14, 94, 255, 15, 255, 9, 58, 123, 70, 131, 207, 255, 0, 11, 28, 227, 127, 255, 159, 252, 20, 27, 39, 198, 0, 4, 103, 117, 48, 122, 167, 159, 250, 101, 106, 235, 28, 248, 2, 71, 23, 37, 79, 255, 43, 108, 208, 87, 251, 111, 255, 18, 99, 10, 1, 213, 19, 67, 23, 146, 249, 59, 167, 8, - 27, 171, 7, 66, 27, 167, 6, 27, 171, 20, 120, 95, 255, 32, 75, 7, 88, 123, 172, 9, 144, 3, 10, 47, 255, 84, 50, 35, 103, 80, 3, 141, 250, 82, 243, 80, 3, 72, 94, 17, 50, 16, 179, 249, 80, 16, 183, 251, 48, 3, 10, 36, 204, 19, 21, 38, 23, 15, 255, 51, 214, 52, 85, 72, 75, 223, 65, 31, 0, 191, - 80, 3, 203, 159, 255, 109, 135, 28, 108, 2, 23, 204, 62, 144, 255, 0, 4, 239, 144, 0, 79, 255, 160, 165, 4, 17, 60, 79, 64, 223, 37, 48, 223, 39, 159, 251, 127, 24, 91, 254, 48, 0, 255, 193, 0, 0, 85, 32, 186, 96, 143, 255, 5, 88, 75, 143, 31, 255, 207, 92, 71, 78, 3, 108, 15, 0, 49, 0, 86, 83, - 40, 247, 2, 25, 88, 31, 81, 71, 107, 13, 158, 50, 24, 240, 33, 58, 14, 22, 180, 168, 15, 23, 80, 15, 22, 188, 13, 23, 213, 39, 82, 16, 194, 250, 177, 91, 205, 239, 255, 24, 10, 255, 25, 186, 245, 255, 93, 203, 169, 40, 151, 175, 74, 27, 5, 101, 31, 7, 78, 255, 55, 139, 101, 255, 145, 31, 29, 80, 77, 80, - 3, 112, 64, 167, 32, 68, 0, 73, 31, 51, 159, 94, 31, 55, 143, 50, 87, 255, 0, 55, 255, 89, 155, 106, 41, 159, 1, 27, 16, 98, 187, 26, 87, 203, 26, 91, 190, 219, 22, 111, 189, 113, 16, 0, 13, 31, 61, 162, 13, 29, 192, 13, 25, 42, 54, 87, 176, 3, 245, 128, 3, 34, 55, 251, 34, 79, 7, 29, 255, 16, - 204, 48, 3, 5, 144, 3, 10, 15, 255, 5, 104, 83, 14, 95, 17, 89, 31, 127, 86, 103, 95, 144, 3, 254, 63, 255, 179, 255, 255, 228, 222, 17, 212, 43, 24, 185, 31, 251, 96, 31, 255, 194, 31, 255, 255, 128, 178, 252, 26, 207, 241, 127, 0, 127, 8, 47, 4, 250, 57, 167, 164, 8, 29, 251, 11, 247, 247, 105, 31, 254, - 93, 255, 34, 234, 52, 41, 107, 26, 154, 0, 245, 80, 3, 248, 14, 89, 14, 15, 255, 18, 107, 23, 126, 0, 46, 27, 151, 2, 34, 215, 4, 156, 95, 239, 255, 185, 118, 222, 253, 159, 239, 236, 112, 170, 95, 31, 255, 37, 184, 31, 112, 202, 123, 84, 246, 228, 101, 163, 43, 143, 254, 148, 50, 100, 55, 14, 27, 4, 15, 169, - 160, 64, 3, 13, 247, 191, 245, 89, 79, 31, 8, 222, 148, 243, 15, 255, 1, 34, 95, 3, 112, 3, 221, 1, 231, 2, 43, 198, 130, 48, 80, 3, 15, 255, 32, 108, 167, 106, 199, 192, 191, 243, 17, 55, 154, 243, 29, 39, 26, 142, 61, 246, 15, 255, 1, 255, 26, 192, 237, 255, 254, 16, 58, 171, 191, 80, 1, 147, 2, 13, - 46, 89, 247, 59, 91, 78, 248, 191, 151, 137, 190, 199, 255, 194, 118, 83, 185, 159, 44, 87, 45, 23, 28, 207, 253, 0, 224, 36, 48, 15, 255, 255, 15, 255, 224, 51, 17, 61, 255, 43, 75, 37, 175, 46, 7, 146, 10, 62, 11, 127, 223, 32, 95, 215, 39, 231, 160, 87, 235, 100, 127, 223, 66, 16, 29, 134, 37, 134, 255, 29, - 16, 63, 226, 167, 16, 21, 234, 32, 27, 111, 91, 12, 1, 32, 0, 234, 10, 239, 176, 30, 106, 240, 31, 62, 246, 31, 66, 164, 252, 23, 34, 255, 31, 162, 167, 255, 255, 79, 187, 55, 3, 182, 95, 31, 122, 47, 144, 77, 111, 0, 70, 47, 247, 161, 96, 94, 223, 192, 95, 255, 93, 115, 230, 206, 79, 51, 7, 94, 95, 167, - 191, 79, 255, 21, 119, 81, 42, 175, 255, 237, 250, 102, 175, 23, 134, 4, 226, 159, 255, 178, 132, 0, 80, 99, 31, 251, 31, 154, 31, 167, 176, 29, 182, 116, 112, 86, 24, 235, 108, 92, 103, 79, 94, 199, 3, 79, 127, 255, 239, 103, 119, 101, 175, 255, 202, 149, 85, 88, 41, 175, 255, 43, 247, 254, 47, 159, 253, 23, 255, 16, - 192, 239, 82, 30, 184, 30, 62, 162, 247, 7, 150, 7, 88, 15, 191, 79, 225, 230, 21, 119, 0, 16, 192, 23, 171, 255, 159, 80, 192, 34, 56, 71, 80, 192, 81, 47, 127, 16, 192, 70, 127, 246, 30, 114, 228, 255, 32, 4, 208, 192, 15, 255, 7, 15, 65, 176, 30, 159, 170, 239, 30, 159, 159, 30, 175, 79, 30, 163, 13, 31, - 192, 170, 9, 17, 211, 4, 30, 202, 4, 31, 119, 11, 29, 38, 188, 47, 31, 206, 175, 255, 96, 2, 26, 21, 18, 24, 215, 242, 127, 109, 183, 80, 48, 3, 239, 255, 112, 127, 24, 40, 128, 250, 95, 255, 144, 242, 63, 255, 255, 160, 176, 63, 255, 176, 48, 63, 43, 30, 251, 33, 227, 111, 87, 247, 127, 16, 95, 143, 255, 170, - 61, 25, 54, 54, 25, 58, 48, 25, 70, 48, 31, 62, 170, 14, 28, 194, 12, 17, 114, 11, 26, 109, 9, 31, 215, 191, 9, 21, 47, 9, 223, 255, 192, 10, 79, 228, 255, 250, 13, 127, 75, 232, 3, 246, 87, 255, 47, 255, 145, 8, 127, 255, 72, 196, 14, 31, 125, 42, 11, 31, 104, 96, 42, 15, 255, 9, 25, 146, 1, 40, - 96, 8, 29, 64, 5, 24, 62, 148, 3, 82, 254, 32, 15, 30, 24, 120, 207, 40, 220, 15, 255, 8, 188, 15, 159, 255, 24, 255, 242, 90, 78, 199, 23, 248, 255, 255, 247, 255, 251, 255, 245, 183, 16, 75, 47, 27, 79, 31, 28, 33, 243, 255, 30, 196, 255, 228, 74, 30, 7, 32, 230, 135, 45, 247, 8, 95, 247, 14, 119, 247, - 42, 72, 19, 64, 192, 253, 87, 235, 244, 95, 247, 245, 88, 19, 92, 39, 119, 0, 0, 192, 8, 247, 1, 207, 98, 129, 15, 255, 8, 147, 6, 59, 146, 43, 58, 247, 27, 246, 24, 93, 2, 65, 43, 191, 255, 31, 51, 249, 25, 251, 208, 17, 35, 32, 0, 213, 55, 64, 7, 30, 2, 208, 25, 6, 240, 23, 34, 240, 122, 23, - 34, 241, 0, 2, 17, 207, 66, 191, 65, 231, 114, 27, 62, 80, 0, 189, 42, 29, 207, 223, 9, 31, 253, 89, 56, 131, 30, 104, 131, 3, 118, 191, 255, 42, 95, 224, 75, 67, 255, 249, 91, 107, 207, 227, 239, 83, 147, 4, 239, 61, 92, 63, 191, 255, 253, 133, 86, 159, 111, 255, 223, 81, 63, 255, 118, 176, 224, 255, 24, 184, - 63, 63, 24, 128, 196, 12, 15, 62, 4, 239, 255, 8, 159, 0, 82, 159, 253, 214, 15, 127, 35, 32, 183, 81, 36, 75, 4, 15, 189, 2, 255, 16, 192, 47, 255, 21, 75, 255, 188, 7, 16, 192, 0, 2, 87, 175, 202, 157, 19, 119, 118, 29, 20, 255, 253, 80, 28, 91, 166, 16, 41, 168, 182, 108, 33, 83, 41, 239, 26, 58, - 5, 181, 239, 255, 142, 144, 85, 191, 15, 255, 255, 15, 255, 235, 19, 86, 4, 26, 101, 95, 31, 142, 255, 21, 221, 255, 0, 239, 233, 117, 205, 0, 36, 63, 159, 63, 63, 119, 117, 30, 179, 255, 221, 255, 197, 111, 255, 67, 70, 159, 94, 155, 12, 83, 190, 130, 160, 92, 163, 253, 90, 151, 207, 124, 1, 142, 41, 61, 59, 40, - 91, 63, 29, 171, 175, 55, 8, 52, 80, 37, 213, 119, 99, 45, 51, 212, 108, 105, 114, 23, 121, 0, 70, 48, 3, 207, 190, 226, 45, 51, 23, 254, 0, 240, 80, 7, 186, 128, 175, 220, 8, 205, 221, 31, 255, 255, 48, 3, 102, 20, 84, 0, 2, 40, 211, 112, 123, 17, 239, 171, 68, 243, 255, 254, 221, 143, 54, 154, 40, 197, - 0, 0, 170, 50, 93, 95, 249, 93, 107, 217, 15, 87, 0, 70, 78, 243, 166, 4, 93, 171, 15, 94, 7, 143, 255, 254, 112, 75, 131, 143, 252, 93, 163, 96, 163, 111, 226, 88, 172, 144, 0, 38, 64, 115, 37, 42, 242, 95, 103, 108, 49, 1, 35, 69, 251, 160, 13, 94, 11, 9, 95, 251, 32, 111, 25, 94, 93, 235, 96, 159, - 151, 252, 155, 247, 63, 255, 85, 29, 116, 223, 254, 128, 85, 25, 190, 128, 30, 250, 64, 41, 186, 14, 22, 254, 79, 41, 63, 32, 14, 228, 13, 5, 54, 252, 251, 48, 3, 38, 12, 7, 87, 48, 3, 250, 31, 83, 249, 48, 3, 4, 223, 255, 159, 1, 24, 80, 21, 158, 248, 159, 255, 251, 48, 165, 191, 21, 40, 127, 31, 148, - 25, 231, 177, 22, 95, 254, 156, 246, 4, 79, 9, 53, 236, 255, 255, 161, 30, 2, 94, 99, 109, 46, 11, 1, 124, 222, 165, 123, 182, 44, 191, 251, 110, 20, 191, 255, 254, 20, 203, 255, 251, 22, 32, 47, 213, 2, 223, 31, 187, 175, 15, 191, 3, 112, 90, 127, 240, 72, 15, 191, 17, 95, 81, 115, 160, 3, 63, 144, 3, 15, - 32, 18, 70, 99, 169, 255, 80, 3, 239, 82, 151, 143, 63, 255, 39, 130, 96, 82, 95, 207, 48, 95, 215, 128, 91, 31, 31, 175, 6, 41, 227, 146, 11, 89, 235, 40, 150, 31, 30, 200, 34, 3, 191, 40, 19, 106, 56, 157, 1, 255, 66, 91, 0, 37, 215, 111, 31, 238, 146, 47, 86, 115, 38, 203, 3, 35, 33, 26, 251, 1, - 22, 159, 151, 7, 25, 77, 40, 111, 95, 27, 65, 223, 255, 251, 122, 27, 164, 255, 110, 255, 175, 27, 82, 255, 22, 188, 10, 43, 106, 35, 173, 58, 191, 87, 47, 253, 15, 255, 18, 9, 23, 252, 95, 64, 3, 248, 30, 134, 247, 0, 2, 52, 82, 10, 191, 193, 44, 7, 58, 247, 55, 95, 28, 239, 221, 250, 47, 163, 167, 227, - 71, 63, 250, 81, 11, 191, 255, 8, 152, 119, 93, 60, 75, 8, 92, 87, 0, 19, 51, 175, 255, 120, 191, 173, 126, 221, 247, 255, 254, 183, 16, 49, 73, 223, 255, 192, 98, 71, 14, 218, 37, 63, 28, 40, 96, 3, 47, 202, 253, 209, 15, 255, 33, 41, 151, 3, 111, 155, 1, 255, 223, 206, 146, 19, 120, 95, 43, 155, 0, 70, - 118, 185, 36, 72, 26, 86, 0, 58, 195, 31, 251, 162, 15, 158, 33, 40, 179, 29, 38, 175, 255, 29, 138, 253, 19, 18, 193, 0, 5, 116, 71, 191, 228, 244, 7, 207, 255, 15, 255, 255, 15, 255, 17, 49, 0, 11, 202, 239, 246, 31, 187, 78, 147, 11, 52, 18, 250, 29, 86, 186, 251, 14, 62, 8, 44, 168, 96, 31, 32, 242, - 143, 129, 202, 110, 201, 69, 19, 37, 179, 223, 69, 47, 3, 127, 223, 253, 65, 96, 0, 92, 250, 240, 27, 236, 192, 221, 1, 239, 27, 106, 111, 255, 112, 30, 253, 64, 58, 67, 87, 87, 130, 1, 239, 48, 30, 2, 192, 30, 132, 181, 245, 30, 188, 254, 46, 63, 176, 246, 157, 171, 0, 38, 31, 62, 60, 247, 208, 12, 7, 0, - 20, 83, 42, 253, 61, 188, 81, 60, 15, 95, 93, 79, 3, 184, 159, 38, 55, 31, 146, 4, 94, 20, 179, 30, 24, 121, 191, 255, 208, 7, 56, 191, 178, 1, 28, 177, 11, 229, 47, 221, 37, 71, 244, 31, 255, 211, 112, 0, 29, 18, 0, 31, 65, 11, 41, 140, 21, 119, 170, 65, 11, 202, 46, 6, 31, 58, 4, 30, 251, 2, - 70, 222, 170, 48, 30, 244, 96, 31, 159, 128, 31, 179, 192, 61, 207, 165, 159, 31, 79, 207, 62, 196, 33, 150, 247, 21, 198, 248, 110, 23, 251, 251, 47, 25, 68, 143, 255, 191, 73, 207, 170, 10, 31, 127, 13, 30, 68, 47, 31, 173, 111, 54, 220, 177, 176, 26, 71, 80, 40, 36, 252, 28, 162, 31, 165, 14, 21, 46, 106, 93, - 75, 28, 191, 7, 77, 179, 2, 57, 149, 144, 42, 31, 52, 31, 35, 226, 31, 39, 224, 31, 43, 249, 42, 107, 254, 48, 254, 239, 255, 192, 244, 95, 47, 245, 42, 13, 83, 15, 32, 95, 30, 31, 230, 7, 13, 63, 3, 247, 32, 169, 191, 207, 109, 255, 253, 79, 223, 255, 245, 2, 175, 143, 30, 81, 175, 17, 221, 191, 255, 144, - 253, 74, 95, 83, 112, 13, 19, 108, 46, 183, 127, 72, 11, 8, 91, 87, 119, 42, 99, 15, 255, 76, 170, 183, 196, 0, 76, 250, 251, 0, 2, 140, 241, 31, 236, 192, 25, 168, 164, 192, 31, 252, 179, 90, 15, 32, 195, 176, 87, 143, 107, 127, 38, 42, 143, 6, 222, 17, 253, 71, 151, 41, 111, 45, 255, 90, 235, 40, 150, 191, - 31, 253, 248, 17, 237, 224, 17, 228, 31, 201, 27, 176, 169, 3, 198, 159, 248, 31, 67, 225, 56, 203, 47, 3, 118, 141, 16, 239, 61, 31, 223, 26, 56, 0, 27, 16, 36, 0, 179, 110, 240, 145, 128, 12, 100, 39, 44, 83, 31, 163, 66, 239, 222, 16, 80, 215, 3, 138, 39, 17, 227, 31, 36, 160, 27, 124, 251, 192, 0, 111, - 254, 208, 14, 250, 60, 221, 221, 21, 0, 29, 12, 0, 31, 12, 76, 125, 13, 91, 239, 2, 41, 95, 61, 90, 239, 255, 243, 29, 40, 255, 206, 61, 121, 174, 31, 231, 241, 12, 54, 118, 32, 177, 127, 42, 66, 16, 225, 0, 36, 29, 77, 48, 3, 32, 15, 219, 255, 15, 255, 46, 255, 12, 131, 3, 128, 29, 93, 0, 31, 12, - 240, 15, 255, 145, 5, 120, 146, 31, 58, 243, 75, 27, 234, 243, 31, 58, 176, 3, 2, 14, 64, 10, 103, 99, 83, 10, 120, 47, 3, 0, 95, 11, 98, 10, 216, 47, 91, 175, 1, 118, 58, 75, 195, 192, 3, 87, 117, 19, 63, 191, 84, 92, 199, 157, 249, 0, 3, 1, 0, 124, 43, 71, 117, 16, 6, 7, 33, 15, 65, 31, - 243, 79, 94, 11, 22, 19, 20, 25, 17, 104, 28, 100, 229, 95, 31, 27, 244, 31, 31, 241, 255, 247, 88, 192, 94, 51, 243, 96, 6, 120, 49, 255, 247, 191, 7, 31, 116, 90, 80, 3, 229, 16, 11, 64, 6, 23, 143, 5, 31, 227, 254, 5, 255, 246, 16, 255, 255, 211, 55, 143, 85, 31, 151, 208, 25, 239, 243, 29, 199, 246, - 25, 103, 247, 86, 29, 203, 246, 30, 212, 244, 15, 130, 16, 4, 223, 63, 43, 87, 45, 251, 31, 26, 80, 127, 25, 85, 207, 255, 32, 91, 78, 172, 254, 31, 243, 214, 0, 71, 255, 245, 0, 210, 49, 73, 229, 158, 17, 1, 226, 18, 31, 55, 46, 74, 115, 170, 6, 29, 109, 11, 31, 100, 14, 31, 1, 15, 31, 5, 229, 14, - 255, 242, 29, 54, 31, 39, 254, 62, 94, 97, 218, 3, 101, 31, 203, 6, 255, 72, 127, 11, 31, 215, 138, 47, 41, 230, 47, 167, 0, 3, 3, 245, 79, 63, 2, 79, 151, 70, 32, 55, 31, 86, 167, 58, 223, 23, 118, 239, 253, 21, 157, 191, 251, 62, 193, 251, 157, 255, 249, 16, 7, 253, 255, 144, 5, 191, 255, 139, 29, 171, - 223, 254, 255, 253, 100, 63, 233, 64, 62, 39, 14, 106, 31, 142, 0, 246, 80, 3, 224, 154, 187, 177, 79, 159, 102, 23, 247, 9, 239, 64, 143, 32, 147, 7, 191, 31, 255, 162, 47, 31, 255, 31, 34, 11, 27, 40, 41, 15, 80, 112, 3, 230, 199, 119, 32, 42, 151, 17, 141, 0, 255, 4, 92, 49, 103, 17, 227, 251, 5, 17, - 35, 27, 114, 255, 3, 253, 222, 215, 107, 239, 223, 102, 207, 255, 224, 31, 161, 186, 96, 41, 151, 239, 235, 64, 14, 192, 34, 162, 28, 22, 141, 255, 56, 7, 55, 227, 200, 95, 0, 73, 40, 63, 254, 120, 82, 99, 214, 0, 119, 82, 15, 236, 29, 42, 123, 60, 103, 87, 44, 123, 6, 39, 67, 4, 175, 255, 48, 4, 239, 121, - 153, 65, 197, 255, 119, 98, 44, 43, 143, 255, 245, 74, 208, 3, 49, 8, 64, 1, 76, 79, 10, 44, 203, 126, 239, 255, 183, 98, 26, 203, 254, 205, 121, 164, 213, 54, 119, 82, 196, 180, 252, 82, 95, 144, 15, 251, 8, 43, 19, 11, 31, 255, 162, 9, 91, 35, 1, 186, 191, 28, 176, 27, 129, 0, 45, 9, 113, 25, 106, 0, - 66, 16, 15, 236, 255, 15, 255, 255, 14, 181, 56, 3, 187, 103, 15, 1, 10, 98, 20, 87, 12, 97, 18, 0, 0, 234, 87, 153, 32, 31, 109, 48, 29, 115, 48, 30, 91, 93, 160, 3, 80, 15, 97, 10, 38, 118, 48, 8, 193, 22, 113, 245, 0, 0, 207, 254, 29, 58, 255, 27, 74, 255, 242, 0, 1, 223, 254, 64, 19, 207, - 191, 96, 93, 231, 104, 3, 66, 32, 87, 137, 68, 7, 175, 92, 167, 160, 3, 75, 115, 158, 48, 208, 3, 37, 41, 80, 0, 2, 148, 15, 255, 20, 212, 2, 152, 72, 159, 4, 31, 132, 5, 208, 3, 29, 83, 17, 93, 211, 160, 3, 45, 243, 251, 14, 179, 50, 21, 31, 31, 235, 255, 110, 31, 255, 255, 9, 29, 225, 13, 255, - 242, 87, 58, 191, 240, 26, 19, 250, 0, 255, 239, 255, 112, 127, 31, 230, 144, 255, 95, 255, 160, 5, 31, 87, 31, 51, 31, 30, 122, 63, 24, 11, 159, 255, 224, 221, 5, 255, 6, 129, 17, 143, 255, 124, 23, 243, 255, 84, 144, 3, 244, 24, 71, 224, 21, 82, 176, 21, 86, 47, 251, 156, 32, 31, 239, 38, 99, 247, 133, 109, - 24, 120, 16, 136, 33, 23, 87, 103, 99, 255, 8, 94, 16, 30, 91, 22, 192, 80, 3, 252, 88, 31, 22, 251, 112, 3, 8, 255, 9, 194, 46, 48, 192, 31, 154, 95, 208, 3, 111, 86, 19, 95, 255, 80, 2, 175, 215, 251, 81, 29, 162, 207, 63, 167, 253, 112, 255, 219, 252, 64, 77, 143, 248, 16, 31, 23, 249, 32, 10, 98, - 31, 9, 170, 8, 104, 143, 160, 3, 8, 94, 19, 9, 31, 56, 76, 65, 231, 251, 10, 159, 65, 71, 255, 255, 235, 46, 98, 25, 18, 119, 34, 127, 119, 0, 4, 30, 65, 12, 252, 134, 23, 25, 171, 50, 23, 16, 215, 240, 24, 225, 240, 253, 72, 245, 255, 240, 64, 12, 65, 183, 106, 56, 15, 253, 69, 31, 247, 210, 15, 149, - 16, 17, 227, 48, 3, 79, 31, 135, 63, 193, 253, 160, 13, 95, 4, 26, 8, 58, 16, 15, 79, 12, 15, 255, 3, 9, 62, 25, 194, 64, 3, 248, 0, 9, 222, 247, 14, 254, 64, 25, 65, 231, 27, 146, 31, 167, 63, 255, 215, 158, 26, 117, 255, 221, 252, 132, 16, 4, 144, 7, 239, 31, 134, 7, 145, 233, 231, 191, 43, 162, - 160, 153, 243, 0, 192, 2, 128, 3, 10, 29, 240, 255, 234, 155, 15, 222, 63, 2, 123, 239, 15, 255, 10, 254, 158, 182, 8, 111, 255, 9, 128, 215, 1, 51, 81, 22, 15, 255, 10, 77, 30, 221, 71, 8, 31, 11, 15, 255, 14, 19, 53, 15, 31, 11, 87, 166, 99, 10, 235, 76, 54, 8, 95, 23, 15, 255, 6, 18, 51, 0, - 96, 76, 221, 2, 85, 15, 225, 10, 113, 0, 21, 15, 255, 47, 11, 76, 31, 31, 10, 55, 251, 48, 3, 181, 8, 31, 147, 103, 66, 186, 5, 31, 174, 255, 247, 28, 31, 254, 223, 62, 226, 105, 23, 198, 119, 8, 24, 19, 5, 31, 254, 96, 3, 255, 138, 177, 79, 9, 29, 190, 31, 203, 96, 29, 45, 112, 31, 33, 93, 64, - 3, 175, 41, 222, 191, 255, 125, 29, 66, 255, 42, 31, 54, 32, 3, 254, 30, 11, 243, 24, 15, 224, 24, 19, 189, 192, 24, 119, 176, 255, 255, 211, 45, 255, 16, 117, 31, 164, 144, 101, 207, 30, 213, 15, 30, 213, 13, 8, 30, 217, 40, 128, 47, 195, 14, 226, 16, 93, 71, 43, 23, 163, 40, 59, 169, 9, 16, 156, 13, 63, - 255, 192, 40, 200, 31, 255, 64, 94, 31, 252, 244, 24, 199, 254, 112, 3, 239, 85, 199, 165, 14, 31, 255, 13, 95, 207, 79, 228, 16, 90, 27, 192, 81, 31, 255, 240, 80, 3, 224, 125, 255, 96, 3, 233, 251, 127, 206, 255, 61, 31, 235, 110, 96, 252, 48, 6, 32, 176, 170, 143, 31, 178, 79, 26, 216, 111, 30, 75, 207, 43, - 32, 148, 243, 89, 191, 27, 1, 0, 17, 34, 0, 63, 211, 32, 7, 175, 64, 229, 255, 8, 248, 11, 243, 6, 255, 16, 255, 243, 127, 255, 128, 247, 255, 255, 241, 184, 254, 24, 79, 255, 254, 48, 78, 15, 32, 67, 7, 255, 51, 73, 41, 62, 252, 31, 66, 31, 70, 253, 7, 126, 0, 33, 235, 7, 127, 30, 124, 7, 255, 245, - 0, 6, 223, 245, 86, 15, 29, 1, 80, 59, 218, 223, 27, 222, 205, 222, 14, 156, 1, 77, 73, 231, 176, 26, 51, 26, 55, 253, 176, 255, 221, 15, 95, 26, 75, 31, 48, 3, 176, 0, 61, 221, 160, 69, 14, 221, 31, 12, 50, 144, 91, 155, 63, 255, 3, 175, 255, 16, 215, 3, 207, 111, 255, 248, 25, 159, 80, 103, 117, 67, - 199, 137, 160, 91, 187, 15, 158, 8, 9, 243, 0, 168, 15, 127, 166, 159, 108, 27, 34, 79, 255, 151, 190, 254, 164, 112, 77, 92, 99, 144, 95, 243, 28, 136, 0, 246, 15, 255, 11, 6, 74, 171, 243, 254, 239, 221, 43, 227, 248, 88, 7, 214, 15, 250, 255, 53, 15, 255, 82, 41, 243, 3, 17, 15, 255, 6, 144, 8, 1, 204, - 70, 100, 15, 255, 10, 119, 97, 10, 104, 27, 44, 12, 254, 77, 79, 47, 71, 242, 207, 255, 0, 123, 205, 223, 35, 51, 128, 63, 55, 109, 79, 83, 255, 241, 12, 220, 46, 153, 147, 15, 118, 12, 153, 174, 184, 15, 66, 45, 37, 15, 223, 10, 16, 0, 5, 8, 96, 46, 171, 2, 15, 226, 10, 82, 15, 219, 15, 65, 15, 255, - 16, 3, 191, 47, 63, 155, 46, 7, 12, 31, 154, 15, 255, 248, 65, 173, 11, 31, 144, 1, 46, 19, 1, 72, 23, 185, 112, 115, 31, 133, 243, 0, 156, 23, 243, 24, 12, 0, 0, 245, 139, 228, 0, 217, 38, 199, 253, 39, 239, 225, 58, 15, 94, 16, 71, 247, 255, 0, 92, 31, 219, 5, 29, 163, 158, 6, 54, 80, 102, 84, - 248, 255, 242, 0, 54, 207, 212, 119, 113, 15, 169, 37, 10, 24, 79, 11, 18, 41, 72, 51, 81, 39, 247, 208, 112, 3, 14, 18, 65, 54, 216, 30, 172, 1, 93, 48, 3, 254, 22, 232, 255, 0, 4, 94, 239, 30, 169, 255, 7, 66, 11, 16, 119, 255, 175, 95, 243, 45, 255, 15, 87, 31, 255, 12, 95, 163, 3, 24, 225, 15, - 254, 128, 95, 30, 220, 160, 24, 245, 208, 0, 239, 255, 240, 127, 16, 91, 243, 10, 255, 250, 247, 15, 255, 253, 243, 250, 111, 255, 192, 179, 31, 255, 242, 84, 88, 87, 96, 13, 255, 11, 7, 86, 7, 2, 40, 147, 40, 151, 183, 223, 31, 250, 175, 247, 85, 255, 249, 0, 58, 213, 134, 251, 25, 60, 252, 30, 113, 254, 24, 231, - 255, 174, 8, 25, 180, 62, 31, 183, 12, 255, 229, 25, 47, 127, 33, 184, 242, 80, 47, 255, 240, 112, 79, 254, 255, 192, 160, 127, 255, 144, 208, 23, 152, 213, 242, 255, 8, 33, 21, 159, 31, 119, 127, 79, 239, 0, 234, 21, 119, 119, 175, 212, 59, 23, 251, 239, 23, 255, 191, 255, 25, 154, 255, 251, 16, 0, 84, 16, 73, 8, - 96, 31, 254, 17, 123, 87, 159, 28, 41, 111, 188, 51, 103, 37, 19, 240, 25, 245, 0, 25, 245, 56, 215, 116, 10, 192, 32, 252, 83, 151, 255, 206, 239, 255, 120, 74, 186, 26, 98, 223, 255, 240, 253, 145, 121, 153, 1, 227, 2, 160, 3, 15, 166, 1, 47, 31, 168, 175, 31, 244, 79, 31, 248, 8, 239, 198, 26, 87, 26, 95, - 154, 252, 51, 35, 42, 255, 55, 97, 15, 164, 31, 111, 31, 243, 133, 31, 34, 201, 45, 114, 0, 95, 1, 27, 157, 251, 24, 196, 242, 252, 111, 223, 255, 80, 10, 5, 213, 115, 16, 27, 91, 27, 123, 245, 27, 127, 224, 0, 42, 27, 55, 96, 29, 15, 175, 255, 15, 255, 255, 15, 255, 23, 36, 86, 119, 7, 255, 11, 80, 109, - 15, 159, 22, 6, 235, 77, 111, 5, 218, 15, 239, 3, 94, 246, 144, 0, 16, 223, 29, 117, 77, 128, 191, 255, 142, 71, 15, 159, 47, 11, 48, 255, 13, 62, 1, 255, 255, 11, 79, 255, 250, 254, 4, 100, 32, 6, 68, 231, 5, 79, 79, 130, 11, 30, 219, 28, 192, 47, 215, 48, 3, 32, 11, 244, 78, 183, 146, 228, 89, 163, - 9, 247, 17, 175, 61, 59, 45, 163, 30, 31, 255, 232, 127, 255, 209, 25, 250, 32, 24, 64, 40, 68, 31, 251, 207, 253, 96, 31, 251, 22, 170, 255, 160, 97, 2, 250, 143, 48, 0, 5, 158, 47, 255, 243, 31, 251, 167, 246, 29, 114, 250, 12, 242, 255, 14, 3, 61, 3, 223, 255, 214, 232, 14, 31, 33, 13, 50, 7, 253, 221, - 239, 255, 231, 137, 189, 192, 71, 251, 25, 90, 221, 220, 176, 84, 14, 129, 32, 223, 18, 45, 159, 25, 251, 46, 31, 163, 16, 108, 93, 31, 158, 103, 186, 126, 239, 255, 253, 63, 161, 254, 126, 26, 106, 211, 111, 254, 100, 0, 19, 15, 255, 3, 131, 48, 92, 23, 15, 2, 255, 15, 255, 255, 8, 255, 255, 15, 255, 11, 67, 87, - 213, 68, 72, 31, 255, 172, 31, 255, 51, 60, 141, 0, 255, 9, 1, 5, 7, 0, 5, 5, 0, 223, 9, 9, 32, 5, 20, 20, 0, 18, 18, 124, 32, 2, 19, 19, 0, 15, 15, 32, 5, 16, 14, 255, 6, 6, 0, 17, 17, 0, 14, 14, 224, 0, 23, 23, 80, 26, 16, 35, 16, 41, 64, 35, 16, 38, 102, 64, 50, 24, - 24, 32, 38, 16, 56, 13, 13, 32, 44, 12, 16, 62, 16, 8, 16, 68, 16, 56, 11, 11, 32, 62, 16, 65, 3, 16, 74, 16, 29, 64, 104, 112, 38, 16, 29, 16, 50, 10, 10, 55, 80, 35, 16, 122, 12, 12, 16, 125, 67, 77, 65, 125, 40, 113, 180, 0, 44, 0, 122, 75, 41, 89, 167, 200, 31, 33, 3, 45, 207, 0, - 1, 16, 0, 5, 0, 226, 6, 0, 7, 27, 193, 22, 234, 27, 107, 11, 38, 250, 182, 0, 16, 152, 0, 15, 31, 168, 17, 0, 16, 225, 255, 0, 20, 0, 21, 0, 22, 0, 23, 255, 0, 24, 0, 25, 0, 26, 0, 27, 93, 144, 59, 28, 31, 13, 29, 0, 30, 27, 167, 32, 255, 0, 33, 0, 34, 0, 35, 0, 36, 223, - 0, 37, 31, 33, 38, 0, 39, 0, 40, 253, 0, 41, 0, 42, 0, 43, 31, 47, 44, 253, 0, 45, 0, 46, 0, 47, 20, 172, 49, 73, 48, 113, 50, 17, 95, 64, 179, 36, 43, 169, 127, 205, 3, 80, 55, 58, 33, 27, 237, 228, 65, 117, 15, 229, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 4, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 4, 224, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 3, 192, 64, 3, 112, 1, 1, 64, 27, 0, 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, - 0, 82, 79, 79, 84, 32, 27, 204, 128, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 15, 109, 64, 79, 2, 128, 64, 81, 226, 226, 16, 19, 27, 90, 80, 15, 160, 64, 26, 207, 45, 16, 39, 41, 16, 127, 190, 32, 96, 19, 255, 255, 0, 46, 2, 128, 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, - 127, 0, 3, 10, 46, 0, 46, 46, 0, 101, 117, 255, 105, 116, 97, 108, 105, 97, 110, 0, 255, 109, 101, 115, 115, 97, 103, 101, 46, 239, 98, 109, 103, 96, 11, 105, 100, 46, 116, 255, 98, 108, 0, 115, 116, 114, 117, 99, 158, 116, 48, 10, 160, 199, 77, 69, 83, 71, 16, 44, 183, 49, 80, 187, 2, 2, 208, 228, 73, 78, - 70, 126, 16, 27, 0, 96, 0, 6, 0, 12, 49, 62, 42, 113, 56, 48, 159, 2, 144, 11, 86, 144, 23, 170, 128, 35, 211, 1, 134, 144, 11, 172, 144, 59, 49, 130, 68, 65, 223, 84, 49, 80, 70, 73, 0, 110, 0, 115, 253, 0, 101, 0, 114, 0, 105, 16, 7, 99, 85, 16, 5, 32, 16, 9, 108, 17, 183, 100, 80, 17, - 111, 127, 80, 11, 10, 0, 83, 0, 85, 0, 80, 247, 0, 69, 0, 82, 17, 213, 77, 0, 65, 117, 16, 7, 73, 0, 79, 17, 225, 71, 16, 11, 76, 115, 16, 15, 88, 0, 89, 17, 26, 0, 83, 70, 109, 0, 174, 112, 16, 139, 115, 16, 173, 105, 0, 98, 48, 163, 146, 101, 18, 93, 32, 5, 103, 16, 1, 32, 193, 101, - 0, 187, 1, 170, 46, 18, 129, 80, 48, 223, 10, 16, 65, 97, 48, 43, 174, 105, 16, 211, 114, 80, 233, 110, 0, 102, 48, 13, 84, 32, 27, 122, 48, 25, 110, 17, 9, 44, 18, 183, 32, 249, 84, 33, 27, 117, 17, 13, 116, 16, 57, 10, 81, 23, 32, 69, 170, 110, 16, 21, 97, 80, 129, 100, 81, 51, 115, 16, 37, 138, - 114, 16, 45, 128, 69, 33, 67, 101, 17, 75, 108, 48, 61, 84, 96, 79, 111, 80, 185, 87, 17, 113, 105, 49, 47, 1, 87, 18, 170, 0, 17, 121, 97, 17, 165, 116, 49, 161, 112, 49, 177, 186, 32, 16, 155, 110, 0, 39, 16, 213, 118, 16, 1, 169, 101, 17, 201, 116, 16, 173, 114, 16, 229, 64, 189, 115, 93, 17, 51, 105, - 17, 211, 97, 0, 33, 243, 69, 6, 95, 82, 71, 40, 19, 163, 8, 33, 157, 67, 98, 127, 50, 251, 4, 0, 6, 4, 56, 56, 178, 82, 83, 7, 0, 211, 175, 8, 82, 123, 35, 51, 3, 19, 219, 175, 24, 19, 223, 4, 147, 199, 43, 67, 79, 77, 255, 77, 69, 78, 84, 0, 68, 73, 83, 245, 67, 95, 48, 49, 80, 7, - 50, 80, 15, 51, 255, 0, 84, 73, 84, 76, 69, 95, 77, 239, 65, 73, 78, 80, 10, 83, 85, 66, 0, 151, 64, 0, 0, 0, 144, 111, 112, 36, 67, 174, 55, 113, 189, 97, 96, 147, 28, 19, 62, 141, 80, 171, 0, 243, 190, 198, 20, 162, 51, 179, 16, 153, 100, 67, 223, 164, 76, 51, 191, 12, 0, 0, 19, 54, 206, 175, - 66, 51, 203, 19, 221, 137, 230, 39, 67, 215, 254, 20, 0, 0, 251, 104, 17, 53, 51, 227, 122, 16, 185, 23, 177, 123, 254, 51, 239, 28, 116, 149, 170, 4, 81, 23, 7, 80, 235, 9, 20, 191, 10, 20, 195, 128, 11, 224, 162, 0, 0, 0, 89, 97, 122, 48, 0, 0, 82, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, - 65, 82, 67, 0, 0, 82, 224, 245, 0, 0, 0, 32, 16, 3, 192, 16, 11, 0, 42, 64, 3, 112, 2, 1, 80, 27, 3, 16, 35, 64, 80, 3, 231, 128, 0, 3, 32, 22, 16, 57, 79, 79, 84, 115, 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, 67, 212, 246, 17, 0, 0, 18, 64, 80, 81, 232, 32, 88, 250, 255, 255, - 0, 46, 2, 128, 97, 16, 80, 19, 177, 184, 16, 19, 2, 255, 16, 0, 96, 19, 32, 132, 46, 255, 0, 46, 46, 0, 101, 109, 98, 101, 255, 100, 100, 101, 100, 102, 111, 110, 116, 255, 0, 109, 101, 115, 115, 97, 103, 101, 126, 32, 11, 50, 54, 46, 98, 114, 102, 16, 19, 127, 0, 0, 8, 82, 70, 78, 84, 254, 255, 1, - 191, 4, 48, 123, 16, 0, 5, 70, 73, 78, 182, 70, 32, 235, 1, 33, 16, 241, 27, 27, 32, 219, 251, 56, 0, 0, 80, 104, 16, 155, 12, 33, 254, 27, 26, 0, 84, 71, 76, 80, 16, 15, 255, 48, 24, 26, 20, 24, 0, 0, 8, 229, 0, 0, 10, 32, 221, 17, 3, 128, 49, 31, 96, 190, 0, 0, 0, 106, 127, 255, - 176, 0, 111, 16, 3, 233, 95, 255, 160, 16, 3, 144, 48, 3, 0, 144, 50, 3, 247, 119, 80, 0, 7, 16, 83, 7, 255, 128, 247, 0, 9, 255, 96, 16, 3, 64, 0, 10, 249, 255, 32, 0, 11, 255, 0, 238, 107, 0, 124, 243, 63, 117, 17, 231, 63, 255, 112, 48, 3, 47, 16, 7, 31, 119, 17, 159, 31, 255, 80, 48, - 3, 13, 221, 64, 103, 2, 143, 47, 1, 17, 1, 227, 255, 2, 244, 127, 7, 203, 16, 127, 51, 251, 223, 255, 240, 0, 175, 255, 208, 247, 0, 9, 238, 64, 3, 152, 156, 9, 252, 0, 231, 0, 159, 255, 53, 249, 16, 196, 0, 0, 23, 190, 207, 21, 234, 239, 0, 0, 4, 231, 102, 0, 148, 176, 22, 128, 38, 132, 208, 22, - 136, 144, 86, 140, 5, 107, 21, 85, 21, 219, 3, 16, 75, 13, 22, 55, 14, 22, 59, 6, 74, 38, 63, 39, 102, 192, 38, 212, 243, 22, 220, 251, 22, 224, 168, 253, 22, 228, 248, 22, 232, 80, 4, 213, 255, 5, 230, 255, 7, 230, 46, 107, 24, 56, 0, 79, 25, 83, 223, 121, 72, 39, 97, 126, 23, 90, 254, 64, 191, 255, - 255, 242, 24, 227, 237, 252, 255, 253, 24, 233, 192, 191, 7, 96, 7, 64, 62, 83, 19, 153, 134, 53, 0, 75, 239, 255, 23, 255, 191, 255, 22, 7, 255, 0, 15, 252, 167, 0, 222, 2, 63, 119, 160, 103, 119, 84, 16, 25, 59, 222, 254, 255, 80, 0, 101, 68, 88, 223, 19, 83, 162, 159, 169, 200, 128, 35, 3, 25, 109, 24, - 61, 0, 20, 73, 137, 0, 20, 73, 3, 172, 3, 26, 11, 191, 24, 248, 25, 135, 95, 125, 136, 0, 20, 119, 100, 59, 255, 144, 0, 251, 245, 134, 140, 253, 48, 201, 241, 251, 16, 15, 255, 191, 250, 41, 223, 16, 0, 255, 246, 0, 0, 221, 60, 192, 198, 105, 0, 0, 74, 19, 243, 127, 53, 25, 223, 32, 183, 15, 235, 25, - 238, 63, 106, 104, 53, 239, 119, 117, 64, 160, 94, 152, 99, 53, 141, 42, 32, 163, 170, 136, 198, 42, 59, 230, 42, 63, 144, 26, 67, 251, 248, 0, 94, 255, 255, 148, 38, 1, 51, 43, 20, 103, 26, 59, 7, 80, 3, 5, 20, 99, 0, 47, 123, 106, 200, 85, 103, 121, 155, 160, 190, 234, 151, 244, 118, 85, 255, 210, 138, 230, - 188, 25, 217, 24, 253, 153, 0, 41, 81, 41, 85, 51, 16, 5, 156, 23, 26, 175, 31, 74, 26, 179, 143, 26, 183, 17, 159, 6, 26, 221, 12, 17, 5, 239, 47, 255, 249, 25, 175, 255, 255, 48, 79, 119, 16, 8, 14, 255, 241, 25, 80, 128, 0, 5, 94, 17, 25, 2, 42, 223, 239, 103, 155, 222, 49, 170, 164, 241, 27, 120, - 247, 27, 124, 21, 32, 0, 42, 248, 25, 121, 232, 0, 255, 184, 27, 35, 254, 69, 45, 16, 194, 80, 95, 95, 96, 3, 15, 176, 3, 176, 0, 76, 255, 209, 255, 109, 255, 255, 218, 255, 255, 232, 216, 246, 255, 254, 166, 214, 27, 64, 226, 155, 38, 40, 213, 1, 143, 17, 226, 13, 32, 79, 229, 91, 100, 16, 41, 84, 255, 48, - 227, 242, 27, 135, 245, 43, 230, 21, 143, 3, 117, 27, 145, 9, 255, 253, 16, 183, 248, 21, 66, 245, 44, 16, 98, 32, 3, 247, 16, 199, 253, 209, 91, 244, 11, 98, 7, 41, 5, 168, 16, 33, 227, 31, 144, 3, 15, 144, 3, 33, 24, 0, 82, 112, 3, 243, 144, 3, 244, 64, 159, 16, 154, 144, 54, 243, 171, 111, 22, 251, - 95, 22, 255, 143, 22, 255, 223, 255, 180, 144, 17, 102, 64, 111, 16, 178, 0, 66, 227, 22, 75, 155, 2, 85, 251, 34, 3, 12, 255, 70, 15, 15, 255, 123, 34, 227, 255, 181, 87, 120, 44, 87, 254, 223, 239, 255, 255, 250, 16, 3, 247, 101, 84, 51, 145, 245, 86, 23, 44, 232, 152, 97, 123, 81, 131, 9, 17, 27, 207, 255, - 255, 175, 1, 255, 255, 79, 5, 255, 255, 255, 7, 9, 255, 251, 0, 9, 239, 79, 22, 97, 2, 141, 63, 67, 143, 253, 207, 117, 49, 72, 112, 251, 13, 93, 75, 80, 31, 16, 49, 135, 48, 251, 32, 7, 81, 18, 12, 33, 178, 123, 14, 80, 203, 96, 3, 32, 219, 7, 191, 152, 109, 160, 240, 0, 2, 175, 243, 104, 184, 207, - 163, 152, 114, 118, 66, 141, 190, 49, 83, 23, 84, 160, 254, 29, 221, 161, 4, 169, 3, 29, 141, 16, 192, 67, 151, 55, 59, 174, 41, 173, 252, 177, 45, 175, 184, 120, 173, 100, 87, 189, 239, 29, 160, 2, 87, 119, 100, 110, 32, 22, 135, 197, 29, 207, 23, 88, 17, 142, 29, 215, 112, 0, 254, 149, 146, 157, 188, 78, 69, 13, - 144, 3, 11, 80, 3, 5, 126, 113, 31, 245, 0, 43, 255, 251, 157, 164, 89, 234, 216, 119, 101, 132, 88, 255, 18, 8, 255, 28, 150, 18, 33, 23, 36, 95, 8, 23, 0, 15, 87, 247, 36, 175, 3, 46, 59, 158, 77, 174, 188, 39, 251, 252, 85, 87, 172, 164, 186, 237, 54, 119, 117, 113, 33, 4, 133, 30, 143, 249, 88, 30, - 147, 252, 72, 157, 252, 132, 12, 242, 255, 14, 3, 255, 15, 255, 2, 250, 2, 52, 85, 103, 10, 23, 216, 9, 80, 3, 245, 6, 153, 135, 118, 29, 159, 212, 111, 255, 120, 234, 153, 171, 181, 23, 247, 247, 23, 251, 249, 32, 3, 240, 85, 67, 50, 16, 15, 169, 34, 68, 239, 36, 223, 24, 59, 222, 7, 255, 143, 160, 70, 119, - 83, 175, 167, 159, 245, 166, 86, 174, 193, 223, 255, 231, 91, 3, 244, 57, 91, 111, 203, 99, 17, 52, 0, 28, 92, 75, 167, 143, 85, 84, 15, 111, 120, 159, 48, 91, 151, 176, 91, 171, 208, 58, 91, 171, 111, 255, 37, 67, 32, 60, 162, 143, 28, 166, 162, 159, 24, 96, 159, 30, 182, 32, 3, 144, 95, 19, 48, 179, 5, 112, - 3, 96, 107, 139, 167, 160, 95, 44, 15, 192, 1, 26, 28, 69, 73, 197, 35, 11, 80, 3, 79, 255, 82, 87, 103, 19, 234, 3, 122, 19, 238, 78, 249, 0, 4, 24, 170, 79, 137, 127, 93, 24, 203, 45, 28, 28, 239, 255, 177, 28, 165, 227, 69, 20, 15, 16, 56, 11, 15, 255, 15, 39, 47, 13, 48, 3, 254, 74, 23, 247, - 255, 16, 118, 32, 3, 254, 16, 126, 249, 25, 240, 188, 249, 111, 255, 221, 221, 221, 48, 40, 13, 40, 17, 42, 32, 11, 15, 255, 23, 31, 22, 84, 127, 24, 62, 191, 24, 244, 170, 239, 53, 100, 48, 53, 108, 223, 21, 108, 159, 73, 193, 245, 5, 188, 222, 255, 18, 10, 255, 24, 122, 255, 245, 5, 220, 186, 156, 31, 255, 10, - 86, 103, 95, 212, 17, 35, 45, 117, 32, 80, 54, 80, 20, 235, 86, 111, 16, 86, 107, 73, 227, 17, 7, 4, 29, 159, 18, 188, 54, 15, 34, 87, 167, 3, 41, 167, 13, 57, 130, 26, 42, 17, 252, 222, 214, 255, 251, 58, 183, 255, 58, 185, 219, 247, 23, 36, 84, 40, 62, 175, 25, 139, 191, 25, 56, 191, 21, 251, 96, 3, - 68, 32, 154, 223, 16, 107, 32, 3, 77, 247, 159, 86, 95, 160, 3, 106, 42, 91, 95, 255, 98, 71, 208, 93, 255, 240, 144, 3, 147, 241, 14, 91, 20, 87, 243, 8, 169, 251, 112, 3, 251, 4, 127, 26, 170, 63, 255, 254, 253, 239, 255, 227, 99, 27, 30, 32, 255, 26, 152, 27, 126, 16, 7, 255, 248, 169, 255, 23, 54, 246, - 8, 223, 9, 228, 0, 126, 20, 33, 231, 250, 74, 23, 71, 251, 26, 122, 32, 3, 234, 15, 255, 59, 79, 24, 84, 90, 34, 87, 2, 27, 251, 0, 44, 46, 219, 73, 175, 251, 254, 16, 0, 4, 239, 251, 153, 223, 107, 246, 245, 217, 206, 254, 199, 39, 91, 2, 120, 127, 247, 76, 80, 3, 248, 86, 231, 22, 235, 85, 66, 183, - 158, 147, 43, 42, 97, 71, 135, 194, 247, 131, 55, 0, 27, 218, 0, 224, 220, 76, 33, 231, 239, 34, 87, 82, 154, 221, 239, 226, 218, 82, 95, 42, 59, 243, 48, 3, 253, 175, 218, 241, 81, 231, 242, 95, 167, 137, 211, 5, 18, 32, 87, 247, 43, 87, 1, 80, 3, 136, 130, 255, 171, 23, 43, 131, 44, 35, 53, 127, 18, 254, - 3, 255, 173, 96, 207, 252, 255, 25, 20, 255, 254, 32, 191, 225, 120, 27, 9, 48, 0, 11, 245, 84, 236, 15, 255, 255, 15, 255, 255, 106, 207, 255, 5, 49, 46, 214, 244, 30, 6, 240, 28, 19, 150, 176, 43, 12, 29, 86, 64, 10, 77, 56, 3, 49, 76, 11, 162, 31, 83, 79, 111, 87, 67, 100, 7, 67, 67, 244, 94, 79, - 154, 250, 87, 235, 127, 255, 4, 33, 47, 118, 208, 31, 126, 178, 240, 29, 242, 240, 2, 30, 122, 27, 250, 242, 159, 255, 250, 18, 0, 0, 174, 251, 60, 11, 3, 80, 3, 133, 4, 152, 95, 91, 108, 43, 195, 31, 42, 8, 31, 218, 5, 184, 242, 148, 103, 36, 97, 0, 63, 243, 171, 75, 44, 219, 39, 5, 180, 6, 31, 247, - 127, 91, 175, 95, 190, 87, 117, 2, 81, 24, 192, 127, 136, 192, 106, 23, 134, 148, 231, 27, 255, 32, 6, 80, 99, 19, 196, 32, 186, 37, 26, 207, 165, 6, 207, 79, 255, 175, 4, 109, 206, 52, 111, 255, 35, 86, 119, 118, 121, 175, 255, 252, 169, 85, 85, 160, 221, 45, 177, 255, 173, 232, 47, 115, 209, 38, 31, 0, 142, 31, - 185, 1, 137, 239, 28, 208, 15, 255, 13, 47, 238, 8, 55, 238, 37, 166, 249, 85, 31, 112, 247, 31, 161, 246, 95, 66, 245, 12, 76, 49, 207, 42, 49, 73, 30, 222, 255, 22, 214, 254, 29, 175, 249, 28, 234, 184, 244, 55, 154, 15, 255, 240, 33, 98, 47, 227, 29, 34, 87, 45, 231, 2, 31, 79, 10, 22, 226, 47, 223, 251, - 255, 0, 207, 159, 255, 39, 255, 14, 255, 254, 255, 243, 79, 255, 255, 245, 191, 16, 3, 213, 255, 254, 26, 127, 247, 22, 247, 165, 26, 131, 35, 245, 255, 250, 251, 3, 30, 176, 5, 48, 87, 255, 42, 48, 200, 42, 79, 7, 29, 13, 8, 31, 137, 9, 64, 3, 2, 40, 192, 48, 99, 25, 252, 34, 45, 33, 114, 39, 219, 111, - 21, 47, 137, 13, 29, 52, 40, 142, 40, 150, 207, 24, 91, 40, 3, 159, 81, 144, 3, 175, 53, 108, 11, 85, 251, 42, 83, 32, 203, 239, 46, 64, 207, 48, 7, 191, 23, 145, 0, 0, 246, 90, 79, 146, 128, 87, 139, 45, 253, 80, 90, 163, 31, 231, 48, 31, 239, 170, 128, 31, 247, 192, 31, 255, 224, 22, 70, 240, 25, 182, - 148, 240, 32, 15, 17, 159, 128, 95, 75, 1, 144, 3, 197, 223, 17, 47, 95, 64, 3, 31, 166, 37, 91, 34, 47, 47, 34, 105, 91, 173, 113, 31, 191, 112, 24, 34, 48, 143, 48, 203, 226, 61, 22, 11, 30, 199, 178, 0, 0, 179, 15, 255, 21, 14, 121, 23, 88, 13, 255, 255, 151, 43, 247, 19, 83, 255, 219, 0, 78, 47, - 75, 54, 119, 171, 178, 137, 190, 183, 255, 31, 231, 255, 16, 73, 255, 253, 48, 118, 148, 83, 14, 99, 25, 35, 179, 111, 59, 88, 144, 89, 100, 22, 193, 133, 36, 127, 98, 17, 219, 33, 227, 41, 251, 253, 27, 182, 194, 239, 0, 3, 116, 191, 229, 243, 3, 255, 253, 150, 144, 16, 3, 51, 211, 2, 111, 235, 33, 17, 127, 255, - 142, 11, 17, 235, 96, 3, 26, 199, 16, 11, 223, 178, 180, 42, 25, 62, 43, 204, 255, 58, 219, 1, 120, 131, 55, 167, 255, 74, 58, 95, 254, 83, 255, 28, 36, 98, 191, 255, 111, 95, 159, 79, 51, 147, 78, 239, 190, 27, 114, 0, 255, 216, 85, 174, 105, 111, 255, 141, 33, 67, 37, 119, 100, 111, 255, 141, 28, 26, 188, 29, - 50, 31, 155, 192, 0, 27, 176, 0, 197, 252, 64, 152, 156, 15, 170, 17, 106, 135, 223, 82, 159, 191, 197, 221, 96, 15, 224, 255, 15, 255, 255, 11, 192, 40, 42, 76, 131, 159, 29, 79, 155, 28, 119, 111, 255, 21, 119, 81, 36, 3, 178, 117, 111, 162, 250, 102, 175, 29, 200, 4, 231, 95, 0, 19, 42, 158, 44, 147, 29, 178, - 0, 31, 78, 159, 255, 1, 53, 213, 0, 75, 28, 3, 95, 31, 243, 47, 31, 247, 14, 247, 254, 151, 0, 2, 142, 191, 103, 119, 83, 157, 0, 93, 159, 63, 255, 84, 52, 105, 46, 28, 111, 65, 175, 255, 80, 91, 195, 38, 213, 46, 57, 61, 220, 207, 99, 24, 83, 77, 59, 111, 72, 3, 10, 39, 201, 79, 255, 2, 87, 231, - 118, 48, 239, 77, 251, 60, 107, 231, 32, 6, 85, 31, 203, 6, 184, 31, 64, 88, 127, 252, 87, 124, 252, 102, 255, 191, 140, 221, 143, 255, 47, 251, 35, 49, 159, 226, 223, 17, 222, 167, 160, 255, 255, 237, 24, 255, 106, 140, 42, 19, 32, 86, 131, 144, 65, 23, 221, 15, 155, 0, 170, 4, 94, 243, 79, 31, 243, 191, 71, 255, - 5, 127, 255, 98, 36, 147, 255, 231, 31, 11, 28, 100, 22, 73, 0, 44, 7, 117, 232, 220, 5, 138, 201, 30, 254, 253, 55, 18, 2, 58, 79, 52, 9, 191, 16, 191, 255, 226, 25, 231, 96, 32, 55, 170, 12, 29, 100, 14, 26, 2, 15, 23, 62, 14, 31, 100, 169, 11, 72, 159, 111, 95, 139, 8, 47, 170, 86, 175, 4, 84, - 80, 15, 30, 48, 143, 248, 89, 51, 254, 105, 55, 89, 67, 39, 127, 159, 160, 3, 111, 191, 75, 31, 63, 207, 192, 0, 254, 77, 255, 176, 26, 255, 255, 177, 17, 160, 251, 185, 255, 255, 179, 187, 30, 142, 167, 255, 245, 255, 128, 144, 223, 31, 179, 208, 64, 235, 250, 9, 87, 95, 206, 59, 54, 192, 32, 176, 250, 30, 2, 94, - 99, 43, 86, 46, 99, 23, 143, 122, 12, 41, 197, 55, 251, 41, 223, 214, 255, 181, 38, 199, 231, 39, 61, 1, 107, 42, 27, 164, 45, 46, 86, 0, 178, 166, 87, 183, 247, 234, 127, 11, 54, 6, 66, 49, 111, 253, 120, 134, 104, 142, 106, 130, 15, 255, 20, 12, 86, 99, 170, 15, 80, 3, 14, 80, 19, 8, 50, 192, 248, 83, - 83, 165, 244, 94, 99, 244, 86, 119, 62, 136, 223, 30, 17, 207, 69, 55, 87, 112, 48, 7, 30, 204, 27, 2, 48, 41, 22, 11, 148, 255, 2, 193, 0, 9, 255, 1, 128, 31, 0, 253, 39, 136, 31, 138, 103, 31, 163, 7, 223, 175, 127, 30, 147, 207, 133, 86, 155, 159, 111, 159, 35, 63, 254, 87, 26, 231, 0, 0, 165, 108, - 47, 203, 41, 25, 175, 51, 143, 250, 88, 243, 166, 110, 41, 207, 253, 144, 31, 79, 160, 0, 239, 52, 61, 154, 127, 83, 43, 160, 3, 35, 69, 111, 255, 144, 23, 32, 165, 144, 28, 7, 144, 26, 247, 26, 2, 78, 26, 176, 1, 170, 32, 159, 222, 229, 47, 3, 160, 46, 227, 48, 55, 63, 173, 207, 16, 11, 6, 255, 99, 137, - 135, 76, 75, 143, 111, 92, 87, 1, 51, 143, 230, 10, 255, 119, 138, 184, 223, 155, 58, 235, 113, 51, 155, 214, 99, 231, 47, 54, 151, 112, 12, 213, 34, 76, 110, 16, 96, 3, 2, 255, 221, 172, 16, 15, 255, 32, 0, 27, 247, 0, 63, 84, 3, 207, 223, 115, 36, 235, 249, 33, 57, 44, 86, 20, 191, 255, 25, 106, 41, 163, - 4, 103, 120, 95, 111, 28, 180, 255, 26, 86, 52, 45, 170, 43, 174, 250, 32, 14, 54, 93, 181, 15, 255, 255, 15, 255, 163, 234, 1, 35, 66, 92, 11, 249, 62, 11, 9, 31, 4, 162, 6, 207, 62, 85, 43, 46, 30, 232, 86, 151, 10, 91, 23, 52, 79, 255, 35, 179, 254, 128, 93, 199, 64, 78, 188, 206, 221, 245, 3, 16, - 0, 190, 30, 248, 223, 84, 167, 191, 78, 29, 145, 159, 35, 217, 14, 161, 9, 2, 202, 134, 223, 31, 147, 236, 37, 19, 64, 123, 13, 85, 47, 139, 234, 150, 0, 170, 5, 30, 108, 159, 31, 190, 30, 27, 106, 6, 38, 126, 171, 207, 159, 127, 3, 20, 70, 30, 23, 62, 191, 252, 108, 30, 241, 255, 80, 30, 85, 226, 239, 176, - 191, 59, 203, 146, 209, 72, 183, 39, 185, 242, 211, 234, 24, 69, 175, 44, 177, 74, 76, 15, 5, 99, 183, 63, 255, 48, 94, 3, 247, 110, 111, 185, 160, 28, 169, 244, 0, 11, 136, 29, 31, 234, 190, 172, 80, 31, 221, 250, 44, 243, 64, 239, 31, 103, 36, 249, 85, 11, 204, 110, 4, 78, 88, 64, 54, 71, 175, 29, 43, 111, - 84, 31, 133, 47, 31, 133, 13, 31, 133, 8, 47, 45, 41, 163, 149, 175, 77, 119, 47, 95, 13, 29, 167, 95, 31, 161, 223, 210, 255, 224, 31, 114, 96, 45, 108, 41, 134, 160, 94, 247, 74, 255, 255, 143, 29, 251, 32, 83, 79, 30, 251, 47, 63, 243, 169, 243, 29, 139, 246, 31, 159, 248, 31, 179, 66, 100, 9, 74, 93, 159, - 15, 31, 203, 38, 135, 143, 31, 211, 223, 78, 143, 169, 32, 31, 123, 48, 31, 173, 48, 31, 141, 45, 9, 112, 87, 30, 164, 128, 31, 235, 176, 24, 156, 224, 47, 255, 170, 245, 25, 175, 63, 26, 6, 9, 47, 127, 144, 95, 127, 11, 37, 244, 38, 120, 61, 253, 79, 48, 249, 25, 251, 192, 111, 75, 31, 173, 223, 29, 232, 31, - 67, 144, 31, 71, 243, 255, 228, 238, 255, 252, 13, 77, 17, 37, 151, 9, 15, 155, 2, 63, 159, 180, 253, 24, 204, 255, 114, 21, 155, 236, 63, 145, 31, 75, 218, 255, 4, 26, 101, 0, 40, 30, 81, 10, 24, 191, 168, 251, 90, 171, 48, 72, 83, 208, 90, 199, 13, 196, 119, 56, 164, 153, 223, 89, 163, 40, 135, 2, 223, 89, - 231, 63, 255, 110, 71, 31, 150, 255, 26, 19, 47, 70, 42, 206, 255, 193, 0, 202, 0, 116, 4, 88, 27, 47, 175, 207, 89, 247, 13, 96, 95, 93, 118, 231, 24, 25, 226, 223, 255, 230, 31, 62, 130, 61, 24, 89, 24, 8, 211, 0, 11, 100, 159, 255, 242, 235, 143, 255, 224, 27, 180, 128, 24, 118, 16, 255, 122, 54, 235, 112, - 0, 55, 97, 175, 225, 46, 64, 191, 109, 34, 67, 1, 191, 31, 197, 6, 227, 183, 63, 69, 169, 255, 26, 213, 207, 28, 138, 63, 26, 7, 41, 107, 1, 148, 250, 175, 222, 39, 243, 241, 84, 171, 251, 2, 195, 6, 15, 175, 10, 171, 11, 53, 48, 249, 25, 198, 250, 57, 174, 6, 255, 140, 237, 15, 160, 255, 15, 255, 255, 175, - 255, 13, 221, 214, 199, 191, 255, 137, 221, 16, 0, 47, 115, 0, 31, 7, 0, 14, 7, 0, 9, 145, 131, 87, 200, 137, 32, 31, 58, 37, 198, 48, 31, 58, 128, 3, 10, 62, 184, 141, 23, 91, 195, 224, 3, 63, 255, 101, 64, 92, 199, 144, 62, 192, 3, 11, 61, 113, 21, 0, 0, 76, 255, 41, 18, 43, 38, 201, 30, 59, - 196, 39, 246, 12, 29, 216, 15, 255, 245, 192, 0, 119, 65, 47, 211, 179, 31, 215, 252, 63, 31, 219, 31, 236, 76, 176, 0, 2, 140, 250, 78, 62, 247, 7, 14, 223, 18, 33, 235, 143, 255, 123, 39, 37, 85, 80, 3, 254, 31, 254, 244, 29, 166, 192, 24, 71, 128, 220, 38, 118, 29, 215, 255, 253, 48, 55, 143, 30, 95, 145, - 80, 58, 116, 45, 199, 79, 93, 203, 207, 244, 41, 103, 96, 41, 93, 171, 151, 187, 77, 74, 23, 111, 104, 167, 32, 192, 242, 122, 31, 78, 208, 54, 118, 32, 32, 95, 96, 31, 247, 189, 192, 31, 251, 80, 179, 20, 157, 13, 32, 34, 26, 73, 31, 18, 239, 74, 115, 46, 95, 191, 31, 216, 46, 221, 255, 250, 254, 21, 119, 81, - 63, 31, 28, 223, 93, 158, 250, 127, 230, 16, 54, 95, 31, 7, 111, 72, 127, 33, 58, 229, 65, 243, 112, 0, 3, 4, 175, 138, 45, 206, 75, 95, 9, 123, 138, 223, 20, 119, 81, 42, 126, 189, 185, 223, 255, 255, 145, 0, 127, 249, 0, 91, 255, 255, 248, 191, 255, 255, 205, 255, 255, 214, 73, 47, 224, 177, 43, 123, 47, 39, - 96, 64, 3, 47, 118, 210, 19, 137, 11, 15, 255, 11, 33, 227, 13, 25, 146, 25, 130, 206, 2, 109, 30, 96, 0, 61, 47, 219, 54, 118, 116, 157, 255, 207, 255, 48, 31, 238, 33, 63, 144, 255, 174, 255, 254, 192, 250, 12, 255, 192, 32, 3, 14, 100, 25, 234, 95, 255, 97, 26, 47, 111, 26, 51, 223, 57, 219, 239, 63, 221, - 118, 207, 190, 207, 255, 182, 108, 215, 255, 254, 31, 160, 246, 41, 151, 190, 254, 180, 40, 191, 221, 0, 195, 15, 15, 30, 252, 13, 55, 123, 88, 199, 39, 227, 125, 175, 71, 1, 16, 32, 4, 159, 24, 63, 255, 189, 224, 66, 99, 253, 96, 103, 117, 15, 36, 26, 239, 27, 74, 255, 26, 135, 76, 123, 0, 110, 175, 255, 32, 0, - 167, 2, 24, 178, 78, 113, 161, 19, 39, 95, 71, 118, 214, 32, 3, 127, 191, 80, 0, 3, 0, 51, 16, 175, 255, 77, 45, 67, 11, 108, 79, 28, 95, 0, 7, 175, 255, 211, 250, 254, 148, 3, 246, 32, 26, 99, 236, 34, 98, 122, 50, 100, 253, 3, 103, 118, 127, 229, 235, 44, 107, 163, 192, 66, 95, 249, 10, 91, 126, 15, - 255, 255, 10, 25, 138, 2, 103, 18, 37, 172, 54, 7, 77, 135, 247, 30, 11, 126, 160, 99, 47, 27, 142, 229, 31, 223, 29, 112, 30, 29, 0, 88, 192, 10, 229, 126, 211, 5, 113, 31, 238, 254, 54, 199, 60, 11, 223, 254, 22, 64, 19, 207, 196, 102, 59, 16, 15, 121, 31, 41, 135, 68, 3, 138, 79, 93, 43, 96, 3, 128, - 87, 208, 208, 3, 192, 12, 8, 146, 189, 127, 31, 247, 127, 255, 112, 9, 31, 32, 11, 189, 255, 64, 3, 7, 191, 255, 199, 31, 171, 176, 201, 0, 31, 46, 185, 4, 199, 0, 119, 5, 62, 26, 22, 76, 0, 42, 21, 31, 63, 231, 47, 31, 235, 159, 29, 225, 223, 31, 214, 61, 31, 135, 37, 90, 118, 33, 69, 115, 21, 253, - 247, 117, 31, 41, 249, 255, 245, 29, 67, 81, 31, 49, 1, 82, 29, 71, 3, 31, 89, 9, 32, 36, 15, 44, 17, 4, 31, 101, 34, 40, 144, 64, 3, 252, 55, 255, 96, 3, 15, 107, 47, 95, 94, 187, 150, 127, 208, 3, 40, 163, 159, 30, 87, 0, 0, 160, 3, 149, 144, 208, 3, 15, 32, 17, 51, 69, 255, 10, 87, 247, - 9, 94, 86, 103, 7, 48, 3, 81, 22, 117, 16, 30, 255, 165, 247, 120, 2, 181, 41, 64, 41, 161, 5, 48, 244, 0, 254, 71, 98, 0, 28, 255, 255, 177, 24, 128, 181, 252, 56, 38, 119, 255, 30, 136, 191, 19, 188, 159, 10, 48, 3, 9, 59, 6, 96, 3, 28, 122, 240, 31, 150, 241, 30, 199, 95, 40, 4, 246, 30, 191, - 248, 0, 1, 66, 16, 86, 14, 195, 55, 191, 26, 245, 95, 31, 217, 10, 255, 81, 67, 250, 0, 71, 0, 0, 66, 39, 247, 200, 57, 171, 243, 95, 255, 255, 188, 56, 223, 24, 208, 212, 143, 205, 255, 116, 35, 195, 16, 218, 102, 175, 56, 15, 208, 79, 15, 142, 15, 8, 63, 123, 96, 3, 248, 0, 9, 222, 141, 247, 15, 127, - 60, 33, 67, 160, 3, 173, 223, 175, 255, 144, 85, 209, 79, 112, 4, 183, 32, 255, 128, 3, 3, 32, 3, 253, 14, 175, 255, 97, 231, 34, 212, 43, 113, 221, 0, 6, 176, 127, 170, 247, 29, 80, 247, 29, 88, 246, 29, 92, 245, 24, 255, 245, 245, 0, 205, 222, 175, 255, 80, 88, 19, 48, 76, 91, 59, 16, 15, 255, 94, 59, - 207, 39, 190, 15, 255, 6, 27, 251, 240, 32, 255, 235, 96, 8, 181, 255, 9, 198, 255, 10, 215, 255, 15, 255, 52, 255, 1, 51, 81, 5, 11, 255, 247, 223, 86, 39, 251, 9, 64, 3, 230, 29, 74, 48, 7, 31, 166, 146, 7, 31, 243, 31, 158, 0, 31, 158, 31, 255, 225, 31, 255, 234, 249, 0, 92, 31, 247, 0, 109, 106, - 239, 15, 255, 17, 41, 20, 212, 28, 219, 223, 58, 91, 7, 56, 3, 38, 154, 112, 145, 0, 41, 158, 23, 230, 103, 26, 88, 21, 248, 31, 163, 255, 186, 64, 30, 4, 225, 0, 62, 26, 119, 4, 23, 255, 92, 61, 119, 223, 0, 96, 16, 1, 35, 48, 54, 187, 24, 188, 23, 48, 3, 41, 251, 40, 55, 9, 26, 191, 9, 255, - 245, 148, 3, 16, 96, 31, 156, 211, 111, 66, 195, 63, 191, 45, 199, 178, 4, 31, 203, 6, 255, 167, 27, 41, 191, 243, 31, 255, 158, 246, 53, 87, 64, 7, 0, 0, 37, 87, 198, 3, 191, 143, 184, 11, 16, 1, 80, 0, 48, 111, 239, 241, 0, 55, 23, 54, 127, 255, 255, 16, 253, 239, 255, 146, 0, 255, 227, 31, 243, 48, - 20, 64, 67, 15, 40, 21, 46, 47, 127, 78, 3, 12, 79, 247, 62, 19, 254, 1, 175, 1, 70, 119, 97, 191, 111, 255, 223, 235, 156, 59, 126, 248, 65, 0, 139, 255, 229, 255, 217, 48, 31, 147, 54, 43, 112, 80, 183, 247, 68, 80, 183, 228, 151, 239, 5, 158, 16, 104, 73, 251, 25, 114, 41, 118, 145, 219, 213, 160, 33, 167, - 253, 25, 146, 32, 3, 16, 35, 221, 156, 218, 14, 97, 28, 41, 231, 207, 255, 161, 39, 231, 72, 3, 199, 110, 255, 74, 19, 111, 158, 26, 8, 60, 255, 250, 94, 79, 155, 255, 31, 167, 213, 0, 119, 82, 15, 158, 25, 162, 7, 24, 183, 7, 28, 171, 34, 176, 42, 99, 5, 24, 15, 158, 5, 28, 187, 32, 3, 4, 255, 249, - 16, 17, 79, 239, 250, 102, 207, 111, 159, 249, 123, 239, 234, 152, 64, 175, 252, 28, 206, 0, 224, 92, 23, 11, 32, 6, 73, 255, 84, 123, 243, 237, 175, 255, 240, 89, 255, 128, 92, 87, 6, 201, 33, 154, 1, 104, 104, 66, 3, 0, 111, 31, 255, 21, 111, 255, 191, 72, 25, 22, 0, 0, 59, 255, 221, 221, 189, 239, 106, 2, - 251, 119, 119, 84, 124, 190, 225, 84, 82, 175, 246, 92, 127, 16, 15, 255, 222, 3, 25, 255, 32, 3, 227, 0, 49, 16, 15, 255, 255, 15, 162, 31, 29, 216, 5, 255, 170, 233, 31, 67, 248, 28, 142, 245, 20, 138, 242, 9, 152, 255, 29, 10, 169, 189, 31, 235, 103, 247, 255, 5, 207, 31, 247, 95, 211, 255, 128, 30, 238, 112, - 30, 238, 32, 3, 96, 255, 23, 30, 9, 31, 173, 54, 207, 119, 14, 21, 34, 89, 153, 48, 81, 28, 162, 48, 30, 146, 16, 72, 51, 70, 79, 112, 3, 41, 242, 155, 128, 0, 63, 29, 231, 32, 3, 31, 48, 3, 186, 224, 16, 15, 240, 0, 79, 30, 151, 127, 30, 155, 106, 15, 255, 15, 2, 81, 31, 62, 245, 31, 62, 248, - 30, 187, 149, 250, 29, 66, 88, 160, 207, 95, 163, 83, 44, 101, 235, 57, 24, 83, 40, 27, 252, 0, 14, 30, 227, 16, 91, 48, 242, 175, 255, 160, 112, 24, 231, 111, 23, 32, 15, 255, 7, 214, 18, 69, 64, 75, 191, 94, 7, 70, 66, 166, 125, 235, 103, 119, 117, 40, 187, 224, 31, 159, 246, 255, 187, 239, 31, 63, 111, 255, - 224, 16, 106, 64, 95, 117, 23, 169, 255, 254, 64, 12, 215, 144, 127, 17, 239, 95, 203, 255, 230, 17, 123, 71, 159, 1, 33, 55, 4, 119, 65, 175, 255, 120, 31, 255, 46, 148, 47, 188, 40, 215, 0, 213, 27, 239, 77, 18, 65, 191, 50, 87, 87, 255, 108, 239, 186, 127, 239, 253, 255, 241, 141, 255, 255, 241, 31, 235, 241, 255, - 255, 237, 255, 241, 217, 23, 153, 145, 85, 15, 191, 28, 63, 31, 159, 14, 31, 163, 10, 89, 211, 0, 149, 143, 89, 79, 63, 255, 166, 31, 57, 254, 33, 139, 255, 139, 192, 30, 107, 26, 199, 25, 220, 118, 15, 4, 28, 191, 0, 235, 0, 61, 255, 138, 143, 191, 186, 244, 255, 210, 252, 0, 0, 254, 136, 155, 220, 41, 139, 27, - 66, 248, 254, 221, 221, 221, 203, 14, 204, 255, 15, 221, 255, 15, 255, 120, 245, 67, 87, 68, 72, 31, 255, 164, 108, 46, 9, 255, 0, 9, 1, 5, 7, 0, 4, 4, 239, 0, 5, 5, 32, 2, 20, 20, 0, 18, 190, 18, 32, 2, 19, 19, 0, 15, 15, 32, 2, 63, 16, 8, 16, 17, 6, 6, 0, 17, 17, 0, 248, 14, - 14, 0, 23, 23, 80, 29, 16, 38, 16, 44, 51, 112, 38, 64, 53, 24, 24, 32, 38, 16, 59, 13, 13, 6, 32, 44, 16, 65, 16, 8, 16, 71, 16, 56, 11, 11, 32, 62, 6, 16, 71, 64, 101, 112, 32, 16, 23, 16, 44, 10, 10, 32, 92, 127, 16, 95, 12, 12, 0, 67, 77, 65, 80, 125, 31, 255, 200, 0, 33, 0, - 122, 75, 45, 81, 154, 212, 28, 144, 112, 0, 0, 2, 112, 9, 3, 30, 154, 159, 4, 128, 25, 0, 9, 8, 0, 5, 0, 6, 0, 239, 7, 0, 8, 16, 240, 10, 0, 11, 0, 227, 12, 0, 13, 30, 212, 16, 160, 27, 64, 17, 0, 111, 16, 237, 0, 20, 27, 131, 22, 0, 23, 0, 255, 24, 0, 25, 0, 26, 0, 27, - 0, 174, 28, 144, 111, 29, 31, 0, 30, 0, 31, 25, 46, 254, 33, 0, 34, 0, 35, 0, 36, 31, 16, 191, 37, 48, 137, 38, 0, 39, 0, 40, 0, 239, 41, 0, 42, 31, 34, 43, 0, 44, 0, 229, 45, 0, 46, 30, 241, 64, 165, 48, 80, 199, 28, 80, 63, 64, 2, 123, 253, 32, 15, 255, 10, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 4, 160, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 4, 160, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 3, 128, 64, 3, 112, 1, 1, 64, - 27, 0, 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, 79, 79, 84, 32, 27, 192, 76, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 13, 109, 64, 79, 2, 64, 64, 81, 226, 226, 16, 19, 25, 90, 80, 15, 160, 64, 26, 207, 45, 16, 39, 39, 16, 35, 190, 224, 96, 19, 255, 255, 0, 46, - 2, 128, 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, 3, 10, 46, 0, 46, 46, 0, 101, 117, 255, 100, 117, 116, 99, 104, 0, 109, 101, 255, 115, 115, 97, 103, 101, 46, 98, 109, 191, 103, 96, 11, 105, 100, 46, 116, 98, 108, 254, 0, 115, 116, 114, 117, 99, 116, 48, 10, 122, 192, 197, 77, 69, - 83, 71, 16, 46, 49, 80, 187, 221, 2, 2, 208, 228, 73, 78, 70, 16, 27, 0, 248, 96, 0, 6, 0, 12, 49, 62, 113, 56, 48, 159, 171, 2, 144, 11, 88, 144, 23, 174, 128, 35, 1, 82, 78, 144, 11, 120, 144, 59, 49, 130, 68, 65, 84, 16, 123, 223, 1, 192, 17, 159, 26, 6, 1, 0, 3, 255, 0, 86, 0, 111, - 0, 101, 0, 114, 79, 17, 173, 100, 16, 7, 32, 5, 105, 0, 115, 0, 190, 107, 17, 189, 118, 0, 97, 0, 110, 17, 197, 255, 83, 0, 85, 0, 80, 0, 69, 0, 254, 82, 0, 10, 0, 77, 0, 65, 16, 7, 234, 73, 0, 79, 17, 221, 71, 16, 11, 76, 16, 15, 234, 88, 0, 89, 17, 235, 105, 16, 43, 46, 0, 85, - 77, 171, 68, 208, 161, 107, 80, 161, 110, 16, 179, 101, 0, 169, 116, 18, 113, 119, 16, 205, 114, 48, 201, 32, 185, 103, 85, 16, 217, 108, 16, 221, 122, 48, 15, 46, 16, 191, 76, 75, 16, 235, 101, 16, 223, 96, 237, 87, 16, 237, 105, 0, 234, 45, 0, 104, 48, 235, 100, 48, 45, 105, 49, 3, 151, 110, 16, 61, 33, 3, - 111, 48, 81, 10, 0, 109, 85, 48, 57, 114, 80, 233, 102, 48, 103, 109, 17, 33, 116, 21, 48, 123, 32, 249, 129, 39, 32, 1, 39, 7, 0, 17, 49, 97, 210, 0, 117, 17, 87, 99, 16, 115, 65, 53, 116, 17, 129, 170, 32, 17, 107, 32, 16, 19, 111, 17, 123, 109, 17, 129, 165, 99, 48, 17, 100, 17, 131, 32, 201, 116, - 16, 49, 114, 85, 17, 165, 33, 51, 69, 6, 82, 7, 40, 19, 99, 8, 247, 33, 157, 67, 98, 50, 187, 4, 0, 6, 245, 4, 56, 56, 178, 82, 199, 0, 211, 111, 8, 42, 82, 59, 34, 243, 3, 19, 155, 24, 19, 159, 4, 147, 135, 255, 43, 67, 79, 77, 77, 69, 78, 84, 255, 0, 68, 73, 83, 67, 95, 48, 49, 95, - 80, 7, 50, 80, 15, 51, 0, 84, 73, 84, 254, 76, 69, 95, 77, 65, 73, 78, 80, 10, 249, 83, 85, 66, 0, 64, 0, 0, 0, 144, 111, 112, 123, 36, 3, 174, 55, 113, 97, 96, 147, 28, 19, 223, 62, 141, 80, 171, 0, 190, 198, 20, 162, 61, 51, 115, 16, 153, 100, 67, 164, 76, 51, 127, 12, 252, 0, 0, 19, 54, - 175, 66, 51, 139, 19, 157, 239, 137, 230, 39, 67, 151, 20, 0, 0, 251, 231, 104, 17, 53, 51, 163, 16, 185, 23, 177, 123, 170, 254, 51, 175, 28, 116, 85, 4, 81, 23, 7, 80, 235, 168, 9, 20, 127, 10, 20, 131, 11, 224, 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, - 122, 48, 0, 0, 82, 192, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 82, 192, 243, 0, 0, 0, 32, 16, 3, 16, 7, 81, 224, 42, 64, 3, 112, 1, 1, 80, 27, 3, 16, 35, 64, 80, 3, 231, 128, 0, 3, 32, 22, 16, 57, 79, 79, 84, 115, 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, - 67, 212, 246, 17, 0, 0, 18, 64, 79, 81, 216, 32, 87, 250, 255, 255, 0, 46, 2, 128, 96, 16, 80, 19, 177, 184, 16, 19, 2, 255, 16, 0, 96, 19, 32, 131, 46, 255, 0, 46, 46, 0, 101, 109, 98, 101, 255, 100, 100, 101, 100, 102, 111, 110, 116, 255, 0, 109, 101, 115, 115, 97, 103, 101, 126, 32, 11, 50, 54, 46, - 98, 114, 102, 16, 19, 127, 0, 0, 8, 82, 70, 78, 84, 254, 255, 1, 191, 4, 48, 123, 16, 0, 5, 70, 73, 78, 182, 70, 32, 235, 1, 33, 16, 241, 27, 27, 32, 219, 251, 56, 0, 0, 80, 104, 16, 247, 16, 33, 254, 27, 26, 0, 84, 71, 76, 80, 16, 15, 255, 48, 24, 25, 19, 24, 0, 0, 8, 229, 0, 0, - 10, 32, 221, 17, 3, 128, 49, 31, 96, 190, 0, 0, 0, 102, 127, 255, 176, 0, 111, 16, 3, 234, 95, 255, 160, 16, 3, 144, 48, 3, 63, 16, 7, 61, 0, 0, 255, 2, 133, 3, 39, 0, 0, 9, 18, 87, 191, 239, 255, 0, 8, 18, 125, 79, 255, 253, 0, 254, 223, 255, 192, 7, 255, 255, 48, 34, 231, 173, 97, 18, - 252, 254, 18, 217, 255, 242, 18, 155, 252, 85, 34, 159, 64, 16, 41, 176, 16, 38, 241, 1, 94, 112, 63, 215, 255, 112, 48, 3, 47, 16, 7, 31, 255, 96, 93, 16, 3, 80, 48, 3, 13, 221, 64, 2, 139, 63, 2, 243, 51, 85, 0, 15, 19, 157, 96, 3, 3, 17, 107, 179, 210, 103, 132, 19, 187, 247, 64, 3, 237, 213, - 85, 3, 9, 51, 66, 3, 79, 61, 6, 20, 199, 12, 20, 203, 47, 63, 35, 49, 20, 211, 207, 31, 255, 249, 0, 143, 119, 17, 199, 239, 255, 128, 20, 119, 16, 0, 255, 187, 250, 20, 127, 249, 103, 155, 36, 103, 255, 175, 234, 255, 255, 14, 16, 208, 10, 17, 244, 5, 20, 148, 95, 20, 124, 64, 16, 40, 184, 222, 255, 255, - 254, 151, 255, 80, 0, 3, 239, 10, 16, 4, 12, 82, 7, 203, 16, 127, 51, 251, 223, 255, 240, 0, 175, 255, 208, 245, 0, 9, 238, 64, 3, 243, 156, 62, 21, 207, 223, 86, 21, 211, 239, 21, 215, 111, 21, 219, 2, 117, 166, 39, 82, 35, 128, 176, 22, 124, 208, 54, 84, 5, 93, 34, 1, 22, 47, 217, 5, 255, 67, 223, - 9, 239, 34, 197, 166, 135, 255, 189, 79, 22, 81, 7, 117, 49, 251, 22, 224, 248, 61, 38, 175, 214, 164, 253, 207, 255, 245, 19, 87, 243, 119, 18, 247, 245, 0, 13, 18, 221, 3, 33, 16, 31, 5, 83, 255, 6, 100, 255, 232, 233, 19, 86, 4, 190, 255, 207, 255, 6, 24, 188, 40, 192, 0, 255, 202, 118, 243, 0, 35, 255, - 251, 24, 205, 34, 118, 0, 119, 219, 117, 65, 24, 243, 255, 232, 100, 83, 84, 69, 180, 141, 66, 175, 4, 207, 180, 95, 209, 25, 132, 20, 158, 169, 0, 41, 0, 253, 25, 144, 244, 201, 80, 41, 127, 159, 237, 0, 0, 11, 25, 31, 175, 255, 52, 176, 13, 62, 22, 199, 41, 160, 71, 118, 64, 191, 255, 144, 0, 242, 184, 104, - 207, 211, 25, 175, 164, 159, 179, 41, 119, 141, 160, 25, 123, 22, 210, 22, 69, 0, 204, 195, 40, 19, 251, 0, 4, 174, 255, 0, 23, 16, 0, 3, 113, 41, 127, 254, 185, 0, 16, 192, 25, 242, 52, 255, 87, 215, 119, 84, 32, 191, 252, 101, 19, 134, 51, 88, 100, 35, 208, 5, 255, 149, 0, 41, 24, 254, 25, 29, 21, 110, - 85, 25, 223, 128, 21, 111, 242, 24, 158, 249, 97, 31, 53, 44, 16, 186, 25, 215, 127, 80, 3, 92, 254, 41, 234, 71, 147, 253, 0, 0, 86, 119, 153, 187, 160, 190, 169, 249, 119, 101, 83, 253, 32, 65, 3, 42, 135, 198, 84, 83, 187, 249, 80, 3, 49, 6, 184, 0, 52, 25, 168, 100, 3, 106, 26, 63, 6, 153, 26, 207, - 13, 26, 211, 14, 42, 199, 247, 85, 103, 120, 153, 161, 30, 135, 118, 85, 235, 67, 221, 212, 26, 135, 245, 74, 229, 171, 181, 84, 86, 215, 249, 64, 191, 50, 5, 216, 26, 1, 24, 75, 96, 3, 167, 0, 48, 3, 254, 58, 225, 48, 3, 239, 255, 22, 255, 223, 255, 254, 175, 255, 254, 129, 143, 246, 255, 234, 97, 111, 26, 220, - 41, 189, 42, 223, 188, 24, 42, 227, 223, 0, 0, 42, 23, 204, 139, 105, 163, 128, 80, 227, 255, 27, 137, 32, 24, 56, 157, 63, 255, 186, 244, 17, 58, 208, 0, 207, 49, 84, 80, 27, 60, 85, 32, 3, 112, 16, 15, 208, 22, 216, 251, 6, 159, 13, 1, 100, 10, 175, 10, 108, 80, 101, 63, 96, 3, 0, 160, 3, 37, 75, - 147, 223, 33, 227, 48, 3, 48, 144, 3, 41, 43, 80, 0, 252, 6, 255, 80, 2, 191, 10, 25, 74, 18, 247, 85, 55, 63, 8, 25, 86, 13, 23, 111, 111, 16, 178, 255, 9, 22, 170, 41, 71, 17, 130, 27, 207, 47, 85, 251, 34, 3, 207, 61, 86, 15, 65, 35, 251, 85, 119, 137, 43, 243, 237, 77, 27, 248, 173, 27, 252, - 17, 154, 49, 80, 86, 23, 48, 74, 86, 19, 240, 144, 3, 167, 115, 72, 65, 60, 13, 81, 235, 83, 39, 247, 11, 144, 3, 9, 32, 3, 33, 227, 255, 254, 201, 221, 221, 115, 30, 32, 11, 249, 129, 235, 44, 231, 221, 21, 144, 219, 32, 11, 11, 227, 28, 223, 86, 223, 223, 80, 219, 121, 183, 135, 173, 7, 54, 140, 115, 152, - 250, 255, 255, 242, 183, 32, 100, 32, 214, 127, 29, 120, 226, 8, 75, 10, 203, 31, 255, 67, 151, 71, 59, 158, 237, 99, 251, 135, 222, 138, 223, 163, 250, 37, 119, 118, 65, 182, 255, 25, 23, 88, 18, 65, 57, 183, 233, 32, 0, 192, 4, 80, 3, 191, 87, 80, 3, 87, 183, 63, 185, 160, 94, 253, 130, 118, 161, 83, 205, 229, - 255, 23, 84, 26, 161, 52, 95, 13, 255, 4, 239, 60, 68, 175, 28, 172, 0, 0, 4, 223, 94, 71, 126, 94, 247, 197, 85, 122, 207, 164, 186, 103, 119, 84, 38, 177, 33, 44, 225, 255, 30, 157, 24, 253, 0, 200, 10, 241, 4, 49, 33, 231, 29, 168, 0, 7, 80, 3, 192, 159, 41, 239, 251, 68, 80, 3, 234, 13, 45, 255, - 14, 62, 255, 15, 223, 41, 58, 78, 99, 23, 211, 190, 11, 30, 99, 127, 255, 252, 1, 255, 31, 179, 125, 31, 255, 4, 103, 117, 48, 255, 156, 83, 250, 242, 101, 106, 235, 16, 74, 167, 117, 159, 112, 91, 3, 93, 173, 212, 18, 100, 139, 1, 19, 67, 28, 164, 249, 82, 30, 194, 251, 30, 191, 251, 23, 167, 37, 116, 253, 60, - 180, 37, 93, 185, 82, 255, 8, 100, 247, 84, 255, 10, 47, 255, 84, 167, 50, 147, 3, 250, 134, 231, 119, 158, 1, 17, 50, 85, 24, 86, 249, 24, 90, 251, 48, 3, 10, 24, 187, 9, 102, 31, 9, 9, 255, 103, 130, 15, 255, 45, 52, 85, 197, 35, 157, 191, 80, 3, 40, 19, 0, 0, 32, 64, 255, 2, 126, 19, 234, 62, - 144, 0, 4, 239, 144, 31, 160, 210, 160, 4, 17, 60, 79, 77, 127, 40, 248, 223, 28, 28, 223, 255, 251, 29, 191, 254, 48, 0, 255, 193, 82, 72, 11, 96, 143, 255, 5, 47, 41, 31, 255, 143, 45, 243, 32, 73, 66, 40, 187, 6, 61, 191, 40, 47, 53, 3, 22, 72, 33, 145, 5, 36, 175, 54, 195, 13, 158, 50, 30, 84, - 33, 58, 14, 23, 166, 15, 71, 60, 70, 244, 60, 70, 33, 58, 16, 194, 177, 91, 205, 231, 239, 255, 127, 30, 108, 39, 251, 93, 203, 169, 77, 32, 155, 175, 71, 251, 44, 179, 78, 255, 25, 38, 0, 52, 28, 125, 56, 139, 255, 145, 87, 247, 80, 80, 163, 34, 20, 106, 17, 7, 0, 73, 31, 147, 159, 31, 151, 143, 50, 87, - 246, 255, 0, 55, 255, 150, 115, 1, 27, 16, 98, 87, 41, 63, 203, 30, 211, 219, 21, 163, 189, 113, 16, 213, 0, 13, 24, 87, 13, 21, 150, 13, 53, 159, 247, 69, 208, 3, 245, 128, 3, 49, 227, 34, 79, 7, 24, 183, 7, 66, 86, 107, 5, 144, 3, 14, 251, 9, 14, 255, 20, 41, 247, 143, 153, 251, 191, 95, 144, 3, - 63, 255, 179, 255, 255, 228, 186, 222, 17, 212, 255, 255, 226, 31, 159, 96, 31, 163, 174, 194, 43, 43, 128, 26, 108, 254, 241, 127, 15, 127, 8, 90, 47, 4, 250, 63, 128, 8, 255, 75, 19, 12, 31, 171, 171, 13, 31, 175, 15, 144, 3, 14, 41, 140, 0, 251, 53, 90, 59, 25, 226, 0, 246, 31, 208, 245, 80, 3, 248, 77, - 15, 191, 13, 3, 15, 223, 18, 22, 189, 0, 46, 27, 243, 2, 109, 43, 203, 4, 156, 239, 255, 185, 157, 119, 59, 159, 244, 239, 236, 112, 95, 31, 255, 37, 190, 159, 34, 139, 147, 128, 86, 231, 22, 235, 84, 247, 163, 163, 43, 143, 254, 45, 233, 210, 23, 122, 14, 23, 34, 15, 160, 64, 3, 13, 77, 246, 255, 245, 87, 255, - 18, 99, 222, 243, 15, 255, 1, 4, 41, 91, 243, 64, 3, 221, 1, 231, 2, 32, 153, 143, 15, 255, 32, 63, 74, 89, 255, 31, 80, 3, 202, 146, 243, 17, 55, 243, 28, 120, 109, 27, 138, 61, 246, 15, 255, 1, 255, 229, 43, 81, 16, 105, 51, 35, 191, 80, 1, 147, 2, 13, 95, 251, 44, 79, 0, 187, 78, 247, 255, 151, - 137, 190, 173, 26, 54, 119, 24, 200, 193, 58, 244, 90, 223, 253, 48, 15, 249, 255, 15, 255, 255, 15, 255, 4, 194, 51, 17, 58, 231, 23, 240, 53, 175, 45, 16, 10, 31, 159, 165, 12, 133, 63, 32, 87, 219, 39, 231, 160, 87, 235, 241, 98, 111, 252, 66, 16, 31, 118, 37, 134, 47, 210, 255, 29, 45, 222, 255, 16, 21, 234, - 32, 239, 255, 255, 92, 141, 253, 1, 32, 0, 10, 239, 176, 28, 11, 240, 84, 31, 84, 246, 31, 88, 252, 23, 34, 255, 21, 74, 167, 255, 148, 255, 91, 195, 39, 3, 95, 31, 62, 47, 36, 23, 47, 255, 204, 70, 16, 79, 243, 171, 75, 255, 241, 70, 119, 230, 206, 23, 37, 176, 38, 213, 75, 175, 191, 72, 95, 21, 119, 81, - 187, 42, 175, 160, 250, 102, 175, 23, 134, 4, 226, 97, 159, 135, 178, 0, 80, 99, 21, 96, 16, 186, 31, 1, 176, 21, 30, 7, 116, 112, 24, 235, 108, 95, 255, 79, 85, 163, 3, 190, 79, 87, 179, 0, 53, 103, 119, 101, 175, 255, 242, 202, 149, 85, 88, 96, 163, 104, 31, 254, 39, 255, 149, 253, 23, 255, 28, 12, 239, 23, - 103, 30, 31, 176, 12, 22, 47, 180, 7, 150, 5, 88, 15, 191, 79, 225, 21, 119, 31, 106, 177, 255, 29, 70, 255, 159, 80, 192, 56, 71, 80, 192, 81, 23, 47, 115, 16, 192, 70, 127, 246, 28, 173, 255, 32, 4, 37, 208, 192, 15, 255, 7, 15, 65, 176, 22, 214, 239, 31, 143, 159, 85, 28, 234, 79, 31, 53, 13, 31, 254, - 9, 17, 211, 4, 85, 29, 122, 4, 29, 34, 11, 29, 231, 47, 31, 75, 175, 230, 255, 96, 2, 26, 21, 18, 24, 242, 127, 110, 146, 187, 80, 48, 3, 239, 255, 112, 24, 40, 128, 250, 255, 95, 255, 144, 242, 63, 255, 160, 176, 249, 63, 255, 176, 48, 63, 31, 247, 33, 227, 111, 93, 87, 247, 127, 16, 95, 143, 255, 61, 31, - 70, 54, 85, 31, 74, 48, 25, 70, 48, 18, 67, 14, 30, 206, 12, 75, 17, 114, 11, 26, 109, 46, 239, 9, 21, 47, 9, 223, 254, 255, 192, 10, 79, 255, 250, 13, 61, 251, 170, 245, 8, 3, 1, 246, 87, 255, 3, 95, 184, 12, 29, 201, 68, 104, 196, 14, 31, 53, 42, 11, 31, 216, 96, 15, 14, 9, 31, 155, 170, 1, - 40, 96, 8, 26, 42, 5, 24, 62, 3, 82, 254, 81, 32, 15, 30, 30, 24, 207, 40, 220, 30, 193, 144, 3, 15, 95, 208, 3, 13, 50, 135, 241, 0, 24, 255, 242, 159, 90, 79, 162, 23, 248, 255, 247, 255, 251, 255, 233, 245, 183, 16, 47, 187, 79, 25, 83, 33, 243, 255, 169, 254, 18, 83, 228, 30, 239, 32, 230, 135, 41, - 231, 8, 68, 87, 255, 14, 119, 247, 72, 19, 64, 192, 253, 87, 235, 31, 6, 197, 0, 243, 87, 255, 40, 19, 39, 119, 0, 0, 192, 8, 247, 201, 1, 207, 98, 129, 15, 255, 8, 6, 59, 146, 43, 58, 247, 54, 27, 246, 24, 93, 2, 65, 222, 253, 255, 249, 25, 251, 185, 208, 17, 35, 32, 0, 55, 14, 192, 1, 33, 227, - 63, 86, 30, 221, 47, 30, 225, 31, 19, 149, 2, 17, 201, 86, 156, 191, 65, 231, 27, 62, 80, 0, 189, 42, 29, 222, 252, 44, 31, 252, 56, 131, 30, 104, 131, 3, 118, 191, 255, 42, 95, 163, 224, 67, 255, 249, 91, 107, 15, 159, 0, 35, 147, 4, 239, 61, 95, 71, 191, 224, 253, 133, 86, 159, 111, 255, 223, 116, 31, 168, - 2, 87, 118, 176, 224, 255, 31, 160, 28, 41, 213, 0, 255, 24, 128, 196, 15, 94, 4, 13, 80, 3, 11, 24, 80, 3, 8, 159, 0, 82, 159, 253, 214, 15, 159, 35, 32, 183, 36, 75, 163, 4, 15, 221, 2, 255, 16, 192, 45, 119, 21, 75, 255, 7, 120, 16, 192, 0, 2, 87, 175, 202, 157, 19, 119, 29, 20, 237, 255, 253, - 80, 28, 91, 166, 16, 41, 168, 108, 109, 33, 83, 41, 239, 26, 58, 5, 181, 239, 255, 144, 28, 85, 191, 15, 255, 255, 15, 255, 235, 19, 86, 4, 26, 101, 31, 142, 191, 255, 21, 221, 255, 0, 239, 233, 117, 0, 155, 36, 63, 159, 63, 63, 119, 117, 30, 179, 255, 255, 186, 197, 111, 255, 67, 70, 159, 94, 155, 12, 190, 130, - 166, 160, 92, 163, 253, 90, 151, 207, 124, 1, 142, 61, 59, 83, 40, 91, 63, 29, 171, 175, 55, 8, 52, 80, 37, 119, 170, 99, 45, 51, 212, 108, 105, 114, 23, 121, 0, 48, 3, 141, 207, 190, 226, 45, 51, 23, 254, 0, 240, 80, 7, 128, 116, 175, 220, 8, 205, 221, 31, 255, 255, 48, 3, 20, 84, 205, 0, 2, 40, 211, - 112, 123, 17, 239, 171, 68, 255, 231, 254, 221, 143, 54, 154, 40, 197, 0, 0, 50, 85, 93, 95, 249, 93, 107, 217, 15, 87, 0, 70, 78, 243, 4, 77, 93, 171, 15, 94, 7, 143, 255, 254, 112, 75, 131, 252, 30, 93, 163, 96, 163, 111, 226, 88, 172, 144, 0, 64, 115, 77, 37, 42, 242, 95, 103, 108, 49, 1, 35, 69, 251, - 13, 65, 94, 11, 9, 95, 251, 32, 111, 25, 94, 93, 235, 96, 159, 252, 46, 155, 247, 63, 255, 85, 29, 116, 223, 254, 128, 25, 190, 170, 128, 30, 250, 64, 41, 186, 14, 22, 254, 79, 63, 32, 82, 14, 228, 13, 5, 54, 252, 251, 48, 3, 38, 12, 7, 48, 3, 175, 250, 31, 83, 249, 48, 3, 4, 223, 255, 1, 63, 24, - 80, 21, 158, 248, 159, 255, 251, 48, 191, 75, 21, 40, 127, 31, 148, 25, 231, 177, 22, 95, 254, 246, 56, 4, 79, 9, 53, 236, 255, 255, 161, 30, 2, 94, 99, 46, 11, 218, 1, 124, 222, 165, 123, 182, 44, 191, 251, 20, 191, 221, 255, 254, 20, 203, 255, 251, 22, 32, 47, 2, 170, 223, 31, 187, 175, 15, 191, 3, 112, 90, - 127, 240, 15, 191, 17, 145, 95, 81, 115, 160, 3, 63, 144, 3, 15, 32, 18, 70, 99, 255, 82, 80, 3, 239, 82, 151, 143, 63, 255, 39, 130, 96, 95, 207, 165, 48, 95, 215, 128, 91, 31, 31, 175, 6, 41, 227, 11, 36, 89, 235, 40, 150, 31, 30, 200, 34, 3, 191, 40, 19, 56, 157, 213, 1, 255, 66, 91, 0, 37, 215, - 111, 31, 238, 47, 37, 86, 115, 38, 203, 3, 35, 33, 26, 251, 1, 22, 159, 7, 46, 25, 77, 40, 111, 95, 27, 65, 223, 255, 251, 27, 164, 244, 255, 110, 255, 175, 27, 82, 255, 22, 188, 43, 106, 20, 35, 173, 58, 191, 87, 47, 253, 15, 255, 18, 9, 23, 252, 64, 3, 190, 248, 30, 134, 247, 0, 2, 52, 82, 191, 193, - 21, 44, 7, 58, 247, 55, 95, 28, 239, 221, 250, 47, 163, 227, 78, 71, 63, 250, 81, 11, 191, 255, 8, 152, 119, 60, 75, 187, 8, 92, 87, 0, 19, 51, 175, 255, 120, 173, 126, 126, 221, 247, 255, 254, 183, 16, 49, 223, 255, 147, 192, 98, 71, 14, 218, 37, 63, 28, 40, 96, 3, 47, 253, 149, 209, 15, 255, 33, 41, 151, - 3, 111, 155, 1, 255, 223, 146, 156, 19, 120, 95, 43, 155, 0, 70, 118, 185, 36, 26, 86, 145, 0, 58, 195, 31, 251, 162, 15, 158, 33, 40, 179, 29, 38, 255, 94, 29, 138, 253, 19, 18, 193, 0, 5, 116, 191, 228, 143, 244, 7, 207, 255, 15, 255, 255, 15, 255, 17, 49, 0, 11, 239, 149, 246, 31, 187, 78, 147, 11, 52, - 18, 250, 29, 86, 251, 117, 14, 62, 8, 44, 168, 96, 31, 32, 242, 143, 129, 110, 149, 201, 69, 19, 37, 179, 223, 69, 47, 3, 127, 223, 65, 251, 96, 0, 92, 250, 240, 27, 236, 192, 1, 186, 239, 27, 106, 111, 255, 112, 30, 253, 64, 67, 87, 117, 87, 130, 1, 239, 48, 30, 2, 192, 30, 132, 245, 106, 30, 188, 254, 46, - 63, 176, 246, 157, 171, 0, 31, 62, 76, 60, 247, 208, 12, 7, 0, 20, 83, 42, 253, 61, 188, 60, 15, 162, 95, 93, 79, 3, 184, 159, 38, 55, 31, 146, 4, 20, 179, 189, 30, 24, 121, 191, 255, 208, 7, 56, 191, 1, 101, 28, 177, 11, 229, 47, 221, 37, 71, 244, 31, 255, 112, 167, 0, 29, 18, 0, 31, 65, 11, 41, - 140, 21, 119, 65, 85, 11, 202, 46, 6, 31, 58, 4, 30, 251, 2, 70, 222, 48, 85, 30, 244, 96, 31, 159, 128, 31, 179, 192, 61, 207, 159, 74, 31, 79, 207, 62, 196, 33, 150, 247, 21, 198, 248, 23, 251, 221, 251, 47, 25, 68, 143, 255, 191, 73, 207, 10, 85, 31, 127, 13, 30, 68, 47, 31, 173, 111, 54, 220, 176, 98, - 26, 71, 80, 40, 36, 252, 28, 162, 31, 165, 14, 46, 106, 42, 93, 75, 28, 191, 7, 77, 179, 2, 57, 149, 144, 31, 52, 85, 31, 35, 226, 31, 39, 224, 31, 43, 249, 42, 107, 48, 252, 254, 239, 255, 192, 244, 95, 47, 245, 13, 83, 15, 85, 32, 95, 30, 31, 230, 7, 13, 63, 3, 247, 32, 169, 207, 127, 109, 255, 253, - 79, 223, 255, 245, 2, 143, 94, 30, 81, 175, 17, 221, 191, 255, 144, 253, 95, 83, 148, 112, 13, 19, 108, 46, 183, 127, 72, 11, 8, 91, 87, 42, 99, 239, 15, 255, 76, 170, 183, 196, 0, 76, 251, 245, 0, 2, 140, 241, 31, 236, 192, 25, 168, 192, 72, 31, 252, 179, 90, 15, 32, 195, 176, 87, 143, 107, 127, 42, 143, 76, - 6, 222, 17, 253, 71, 151, 41, 111, 45, 255, 90, 235, 150, 191, 81, 31, 253, 248, 17, 237, 224, 17, 228, 31, 201, 27, 176, 3, 83, 198, 159, 248, 31, 67, 225, 56, 203, 47, 3, 118, 16, 27, 239, 61, 31, 223, 26, 56, 0, 27, 16, 36, 0, 110, 102, 240, 145, 128, 12, 100, 39, 44, 83, 31, 163, 239, 222, 133, 16, 80, - 215, 3, 138, 39, 17, 227, 31, 36, 160, 27, 124, 192, 246, 0, 111, 254, 208, 14, 250, 60, 221, 221, 0, 29, 12, 42, 0, 31, 12, 76, 125, 13, 91, 239, 2, 41, 95, 61, 239, 255, 181, 243, 29, 40, 255, 206, 61, 121, 174, 31, 231, 12, 226, 54, 118, 32, 177, 127, 42, 66, 16, 225, 0, 29, 77, 72, 48, 3, 32, 15, - 219, 255, 15, 255, 46, 255, 12, 131, 3, 128, 29, 0, 31, 12, 170, 240, 9, 155, 172, 54, 14, 64, 10, 118, 2, 108, 48, 21, 79, 223, 204, 23, 101, 45, 75, 224, 3, 119, 81, 32, 19, 79, 247, 78, 46, 99, 144, 0, 3, 1, 10, 250, 42, 20, 119, 81, 12, 89, 26, 169, 9, 31, 235, 143, 79, 122, 4, 95, 159, 72, - 63, 38, 186, 118, 29, 123, 255, 254, 80, 30, 187, 64, 30, 191, 245, 16, 255, 117, 140, 63, 171, 246, 11, 151, 77, 3, 235, 103, 98, 20, 15, 224, 10, 87, 5, 255, 18, 0, 77, 61, 77, 155, 21, 230, 1, 255, 255, 179, 47, 254, 12, 84, 25, 214, 15, 31, 55, 15, 39, 143, 253, 21, 215, 62, 171, 244, 80, 0, 20, 157, - 223, 232, 1, 229, 236, 15, 173, 2, 157, 26, 55, 231, 54, 7, 111, 255, 230, 30, 248, 80, 238, 0, 239, 254, 77, 24, 239, 255, 32, 55, 149, 189, 255, 40, 7, 127, 255, 16, 54, 41, 183, 111, 17, 94, 111, 24, 91, 24, 148, 144, 95, 239, 0, 3, 2, 94, 23, 42, 11, 65, 139, 16, 55, 16, 192, 62, 207, 13, 30, 203, - 15, 255, 171, 205, 31, 112, 211, 31, 36, 177, 31, 40, 254, 255, 247, 185, 223, 255, 145, 46, 199, 91, 255, 254, 255, 191, 255, 255, 210, 255, 255, 214, 64, 244, 254, 148, 3, 235, 111, 255, 96, 14, 187, 1, 70, 202, 74, 42, 35, 158, 64, 143, 48, 3, 123, 37, 171, 255, 95, 183, 28, 56, 160, 25, 26, 112, 3, 252, 119, 114, - 58, 163, 103, 131, 85, 15, 130, 17, 4, 79, 247, 2, 86, 7, 13, 87, 251, 14, 71, 31, 119, 11, 33, 25, 41, 36, 16, 178, 255, 95, 253, 234, 48, 5, 31, 27, 112, 31, 31, 222, 63, 20, 87, 196, 159, 250, 24, 7, 27, 72, 69, 255, 160, 74, 175, 54, 7, 55, 27, 32, 25, 74, 0, 255, 4, 124, 17, 13, 255, 250, - 162, 32, 31, 154, 255, 46, 104, 31, 255, 47, 231, 103, 176, 156, 213, 159, 128, 89, 151, 243, 50, 11, 117, 6, 96, 30, 175, 205, 255, 211, 31, 132, 79, 255, 0, 110, 47, 71, 71, 93, 191, 226, 78, 152, 224, 252, 95, 255, 22, 222, 51, 72, 175, 255, 80, 208, 3, 242, 113, 11, 28, 35, 17, 6, 76, 119, 148, 7, 39, 67, - 184, 159, 32, 27, 213, 236, 47, 68, 26, 88, 106, 31, 66, 80, 103, 212, 180, 192, 9, 251, 16, 223, 40, 69, 44, 90, 199, 17, 167, 0, 179, 115, 255, 16, 73, 103, 55, 135, 88, 28, 164, 33, 15, 227, 31, 5, 255, 75, 19, 122, 191, 34, 15, 173, 12, 31, 255, 31, 34, 23, 255, 235, 58, 187, 251, 125, 31, 254, 72, 4, - 119, 64, 12, 28, 247, 95, 233, 252, 134, 106, 138, 21, 240, 65, 231, 48, 7, 224, 82, 82, 3, 96, 74, 3, 210, 15, 255, 255, 15, 255, 131, 2, 15, 255, 10, 247, 123, 239, 254, 182, 15, 255, 78, 5, 121, 146, 82, 31, 243, 243, 29, 198, 243, 31, 247, 160, 3, 245, 0, 155, 11, 218, 103, 99, 15, 31, 22, 87, 16, 31, - 238, 224, 31, 218, 186, 246, 30, 91, 247, 0, 29, 44, 11, 87, 6, 60, 18, 83, 3, 66, 21, 120, 0, 192, 2, 244, 32, 192, 15, 193, 12, 41, 64, 102, 15, 225, 20, 41, 135, 72, 159, 30, 179, 0, 95, 208, 3, 82, 70, 59, 208, 208, 3, 192, 12, 179, 42, 135, 96, 51, 15, 255, 10, 237, 81, 22, 117, 7, 128, 12, - 71, 98, 14, 120, 16, 255, 229, 247, 207, 7, 31, 133, 80, 3, 248, 16, 11, 64, 170, 6, 31, 183, 5, 29, 178, 5, 63, 139, 194, 40, 219, 117, 47, 147, 112, 86, 223, 30, 118, 47, 31, 223, 14, 85, 31, 227, 13, 31, 231, 15, 6, 97, 17, 79, 31, 103, 95, 43, 24, 76, 64, 3, 192, 23, 218, 176, 112, 3, 143, 255, - 37, 9, 194, 46, 47, 46, 245, 31, 10, 32, 3, 252, 31, 18, 255, 47, 48, 3, 46, 207, 5, 80, 3, 42, 255, 176, 26, 239, 255, 255, 242, 31, 255, 246, 255, 255, 215, 154, 0, 31, 67, 57, 155, 255, 129, 43, 217, 146, 15, 245, 17, 45, 104, 143, 160, 3, 143, 94, 175, 159, 255, 110, 155, 176, 85, 10, 159, 39, 11, 31, - 243, 10, 94, 3, 9, 95, 255, 7, 126, 90, 91, 5, 255, 253, 255, 255, 247, 127, 255, 210, 181, 127, 25, 53, 8, 49, 153, 96, 3, 28, 24, 223, 82, 25, 65, 252, 62, 33, 119, 30, 33, 30, 240, 247, 51, 100, 80, 35, 104, 175, 124, 187, 48, 88, 227, 233, 63, 33, 227, 33, 231, 184, 4, 25, 54, 3, 255, 218, 15, 101, - 0, 33, 227, 42, 8, 105, 42, 16, 13, 221, 15, 63, 32, 159, 63, 127, 47, 131, 128, 246, 0, 157, 239, 112, 4, 188, 64, 255, 253, 25, 6, 166, 248, 80, 192, 249, 232, 33, 31, 57, 198, 77, 33, 22, 184, 126, 26, 212, 0, 126, 144, 8, 66, 2, 0, 192, 14, 128, 3, 194, 173, 223, 239, 239, 234, 155, 0, 192, 34, 72, - 3, 3, 32, 3, 139, 253, 239, 255, 35, 133, 34, 216, 253, 28, 107, 221, 0, 170, 6, 240, 127, 247, 27, 80, 246, 27, 84, 245, 25, 192, 245, 245, 0, 205, 222, 239, 254, 80, 81, 251, 48, 30, 0, 248, 32, 8, 61, 255, 9, 78, 222, 1, 51, 81, 5, 15, 255, 11, 138, 48, 14, 194, 48, 8, 95, 52, 7, 62, 6, 35, - 15, 1, 11, 3, 0, 96, 47, 221, 37, 87, 15, 226, 10, 16, 1, 80, 1, 159, 76, 70, 223, 119, 97, 11, 226, 46, 11, 255, 247, 223, 11, 86, 31, 129, 9, 64, 3, 230, 30, 11, 48, 7, 31, 155, 93, 39, 78, 6, 24, 3, 255, 253, 48, 31, 255, 225, 112, 31, 255, 249, 0, 92, 21, 106, 30, 236, 29, 17, 31, 166, - 18, 31, 210, 63, 195, 12, 223, 16, 223, 55, 43, 39, 155, 47, 54, 154, 235, 112, 0, 223, 47, 255, 252, 48, 63, 255, 255, 181, 212, 40, 91, 64, 254, 32, 100, 62, 31, 78, 4, 80, 32, 24, 239, 64, 100, 1, 0, 96, 17, 42, 184, 16, 192, 48, 3, 83, 46, 191, 9, 24, 188, 9, 31, 150, 41, 251, 7, 255, 169, 243, - 30, 214, 211, 110, 97, 195, 55, 203, 39, 95, 4, 89, 31, 211, 6, 29, 186, 12, 255, 103, 27, 41, 191, 243, 74, 31, 255, 246, 53, 83, 64, 7, 244, 245, 255, 143, 248, 11, 251, 48, 111, 241, 0, 55, 22, 126, 127, 255, 236, 255, 16, 239, 24, 79, 255, 227, 78, 15, 32, 67, 169, 240, 3, 3, 24, 127, 78, 7, 12, 95, - 251, 40, 19, 1, 109, 46, 19, 1, 191, 111, 30, 235, 156, 26, 208, 0, 255, 255, 248, 65, 0, 139, 255, 255, 217, 185, 48, 31, 178, 253, 72, 191, 63, 254, 48, 183, 247, 82, 80, 183, 228, 151, 239, 225, 14, 125, 19, 72, 77, 3, 25, 62, 228, 3, 255, 219, 15, 220, 0, 23, 94, 1, 48, 3, 16, 35, 221, 221, 218, 14, - 81, 32, 207, 255, 161, 27, 50, 255, 46, 28, 92, 111, 255, 54, 191, 255, 60, 255, 250, 31, 255, 191, 243, 31, 255, 128, 255, 255, 213, 0, 119, 161, 82, 15, 64, 29, 7, 28, 79, 34, 176, 73, 243, 40, 204, 247, 59, 48, 3, 88, 15, 250, 102, 207, 111, 43, 249, 123, 209, 239, 234, 251, 239, 224, 91, 191, 9, 255, 12, 123, - 243, 237, 42, 239, 222, 43, 227, 128, 89, 87, 96, 15, 111, 40, 159, 66, 3, 215, 0, 111, 31, 255, 21, 207, 182, 59, 255, 221, 222, 221, 239, 111, 239, 251, 119, 119, 84, 189, 55, 164, 246, 82, 179, 208, 7, 223, 230, 57, 243, 49, 8, 218, 255, 15, 91, 32, 170, 32, 44, 110, 233, 30, 16, 248, 31, 71, 245, 31, 175, 203, - 242, 7, 20, 124, 15, 255, 10, 255, 15, 193, 46, 89, 153, 118, 8, 65, 12, 41, 155, 128, 15, 66, 44, 2, 81, 15, 255, 12, 165, 83, 15, 161, 46, 37, 1, 81, 13, 15, 255, 12, 68, 12, 138, 14, 1, 185, 36, 15, 255, 10, 86, 119, 119, 8, 96, 47, 87, 247, 255, 245, 5, 207, 255, 199, 31, 167, 128, 30, 238, 112, - 46, 31, 163, 32, 3, 96, 31, 171, 128, 255, 32, 70, 207, 168, 119, 12, 60, 38, 175, 23, 13, 191, 23, 106, 56, 51, 39, 247, 169, 253, 128, 3, 239, 23, 130, 63, 30, 87, 32, 3, 31, 93, 48, 3, 224, 16, 15, 240, 0, 79, 30, 115, 127, 253, 255, 240, 1, 239, 255, 241, 15, 62, 17, 245, 82, 31, 62, 248, 31, 243, - 250, 30, 192, 88, 160, 207, 95, 163, 167, 63, 40, 164, 235, 30, 220, 40, 27, 252, 0, 14, 62, 29, 42, 16, 91, 48, 175, 255, 160, 112, 24, 231, 165, 166, 29, 89, 48, 1, 167, 15, 109, 255, 127, 86, 7, 47, 87, 87, 163, 13, 63, 183, 112, 85, 255, 144, 3, 168, 255, 96, 176, 8, 255, 245, 192, 13, 255, 255, 247, 224, - 47, 255, 250, 240, 143, 255, 222, 253, 243, 21, 182, 0, 207, 254, 80, 29, 154, 178, 64, 30, 136, 32, 2, 25, 59, 40, 222, 7, 31, 115, 75, 32, 182, 47, 31, 90, 71, 243, 11, 95, 255, 4, 100, 115, 249, 158, 255, 255, 254, 63, 255, 25, 32, 32, 6, 123, 31, 254, 79, 255, 244, 5, 25, 47, 127, 255, 151, 228, 25, 155, - 66, 97, 96, 6, 123, 42, 95, 255, 230, 45, 17, 123, 71, 159, 1, 33, 55, 4, 119, 175, 255, 120, 10, 31, 240, 46, 148, 41, 40, 40, 215, 64, 15, 255, 30, 191, 50, 87, 111, 87, 255, 108, 239, 239, 255, 141, 255, 255, 241, 127, 31, 163, 241, 255, 237, 255, 241, 217, 23, 211, 153, 145, 15, 66, 32, 14, 49, 135, 73, 211, - 0, 143, 92, 236, 83, 254, 25, 53, 255, 255, 192, 26, 195, 26, 199, 81, 25, 220, 118, 15, 4, 31, 6, 41, 139, 42, 39, 41, 143, 29, 45, 239, 255, 65, 156, 188, 27, 65, 38, 255, 31, 132, 175, 221, 86, 16, 204, 211, 255, 255, 176, 27, 63, 80, 42, 59, 42, 42, 27, 118, 13, 2, 0, 223, 64, 195, 13, 89, 247, 119, - 217, 126, 232, 137, 189, 106, 191, 253, 221, 221, 168, 220, 239, 255, 192, 90, 187, 224, 88, 139, 15, 226, 255, 15, 255, 255, 122, 207, 255, 67, 87, 68, 72, 31, 255, 168, 31, 255, 191, 49, 54, 15, 0, 9, 1, 5, 7, 0, 255, 9, 9, 0, 5, 5, 0, 20, 20, 239, 0, 18, 18, 32, 2, 19, 19, 0, 15, 143, 15, 32, - 2, 16, 8, 16, 17, 6, 6, 0, 17, 254, 17, 0, 14, 14, 0, 23, 23, 80, 29, 12, 16, 38, 16, 44, 112, 38, 64, 53, 24, 24, 32, 38, 16, 59, 195, 13, 13, 32, 44, 16, 5, 16, 68, 16, 53, 11, 11, 0, 32, 59, 16, 62, 16, 71, 16, 26, 64, 104, 64, 35, 16, 101, 16, 29, 102, 16, 47, 10, 10, 80, - 35, 16, 122, 12, 12, 16, 167, 223, 77, 65, 47, 76, 176, 0, 45, 0, 122, 222, 0, 1, 47, 255, 81, 192, 0, 2, 28, 182, 127, 0, 0, 17, 0, 4, 0, 5, 0, 6, 0, 238, 7, 0, 8, 16, 222, 10, 0, 11, 29, 246, 219, 255, 0, 16, 146, 0, 15, 27, 50, 17, 0, 111, 16, 222, 0, 20, 27, 117, 22, 0, - 23, 0, 254, 24, 0, 25, 0, 26, 0, 27, 144, 59, 174, 28, 30, 240, 29, 30, 244, 30, 0, 31, 25, 34, 254, 33, 0, 34, 0, 35, 0, 36, 31, 4, 255, 37, 0, 38, 0, 39, 0, 40, 0, 238, 41, 0, 42, 31, 18, 43, 0, 44, 16, 153, 247, 46, 0, 47, 0, 45, 153, 255, 0, 49, 34, 80, 175, 39, 61, 255, - 16, 167, 88, 142, 56, 18, 33, 64, 191, 0, 79, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 3, 128, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 3, 128, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 2, 96, 64, 3, 112, 1, 1, 64, 27, 0, - 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, 79, 79, 84, 32, 27, 160, 49, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 19, 90, 80, 74, 32, 64, 81, 226, 226, 16, 19, 31, 80, 15, 186, 160, 48, 107, 2, 207, 45, 16, 39, 45, 16, 131, 190, 192, 96, 19, 255, 255, 0, 46, 2, 128, - 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, 3, 10, 46, 0, 46, 46, 0, 99, 110, 255, 115, 105, 109, 112, 99, 104, 105, 110, 255, 101, 115, 101, 0, 109, 101, 115, 115, 254, 97, 103, 101, 46, 98, 109, 103, 96, 11, 255, 105, 100, 46, 116, 98, 108, 0, 115, 249, 116, 114, 117, 99, 116, 48, 10, - 96, 255, 77, 235, 69, 83, 71, 16, 40, 49, 80, 187, 2, 2, 119, 208, 228, 73, 78, 70, 16, 27, 0, 96, 0, 226, 6, 0, 12, 49, 62, 113, 56, 48, 159, 2, 144, 11, 170, 32, 144, 23, 62, 144, 35, 112, 144, 47, 128, 144, 59, 123, 49, 130, 68, 65, 84, 49, 65, 35, 139, 247, 255, 99, 210, 81, 101, 48, 10, 141, - 133, 255, 126, 167, 154, 108, 82, 155, 107, 39, 255, 148, 246, 108, 179, 48, 11, 81, 73, 207, 120, 159, 0, 29, 14, 32, 35, 101, 224, 108, 213, 255, 139, 251, 83, 214, 48, 2, 0, 10, 255, 139, 230, 96, 197, 139, 247, 103, 229, 255, 119, 11, 0, 87, 0, 105, 0, 105, 255, 78, 59, 103, 58, 79, 127, 117, 40, 253, 139, 244, - 102, 14, 78, 102, 16, 33, 0, 127, 192, 101, 0, 0, 122, 127, 104, 173, 78, 191, 142, 32, 113, 118, 132, 89, 39, 81, 146, 234, 150, 105, 255, 96, 237, 6, 80, 231, 40, 18, 67, 251, 8, 33, 157, 67, 98, 49, 155, 4, 0, 250, 6, 4, 56, 56, 178, 81, 167, 0, 210, 79, 149, 8, 81, 27, 33, 211, 3, 18, 123, 24, - 18, 127, 4, 127, 146, 103, 43, 67, 79, 77, 77, 69, 78, 255, 84, 0, 68, 73, 83, 67, 95, 48, 175, 49, 80, 7, 50, 80, 15, 51, 0, 84, 73, 255, 84, 76, 69, 95, 77, 65, 73, 78, 124, 80, 10, 83, 85, 66, 0, 64, 0, 0, 0, 144, 111, 125, 33, 103, 32, 174, 55, 113, 97, 96, 147, 28, 239, 19, 62, 141, - 80, 171, 0, 190, 198, 20, 158, 162, 50, 83, 16, 153, 100, 67, 164, 76, 50, 95, 185, 12, 18, 184, 54, 175, 66, 50, 107, 18, 125, 137, 223, 230, 39, 66, 119, 20, 0, 0, 251, 104, 207, 17, 53, 50, 131, 16, 185, 23, 177, 123, 254, 85, 50, 143, 28, 115, 53, 4, 81, 23, 7, 80, 235, 9, 80, 19, 95, 10, 19, 99, - 11, 224, 162, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 147, 160, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 147, 160, 247, 0, 0, 0, 32, 16, 3, 192, 0, 0, 149, 146, 80, 3, 112, 1, 1, 80, 27, 3, 16, 35, 64, 119, 80, 3, 128, 0, 3, 32, 22, 0, 0, 82, 238, 79, 79, - 84, 16, 59, 5, 198, 97, 48, 31, 126, 0, 2, 1, 67, 212, 17, 0, 0, 18, 64, 79, 223, 146, 184, 32, 87, 255, 255, 0, 46, 2, 86, 128, 96, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 63, 96, 19, 32, 131, 46, 0, 46, 46, 0, 101, 255, 109, 98, 101, 100, 100, 101, 100, 102, 255, 111, 110, 116, 0, 109, 101, - 115, 115, 239, 97, 103, 101, 32, 11, 50, 54, 46, 98, 207, 114, 102, 16, 19, 0, 0, 8, 82, 70, 78, 84, 247, 254, 255, 1, 4, 48, 123, 16, 0, 4, 246, 70, 73, 78, 70, 32, 235, 1, 33, 16, 241, 223, 27, 27, 32, 219, 56, 0, 0, 144, 104, 255, 0, 0, 145, 104, 33, 27, 26, 0, 247, 84, 71, 76, 80, 16, - 15, 48, 26, 28, 215, 23, 27, 48, 154, 9, 17, 25, 9, 0, 1, 183, 1, 65, 31, 96, 0, 0, 0, 147, 2, 118, 0, 248, 0, 159, 255, 0, 11, 49, 75, 241, 150, 33, 112, 166, 228, 33, 135, 32, 0, 205, 11, 17, 51, 0, 6, 1, 211, 3, 249, 19, 86, 119, 190, 255, 64, 0, 1, 243, 2, 117, 172, 65, 33, 227, - 232, 17, 231, 255, 209, 1, 47, 41, 34, 111, 190, 159, 2, 83, 2, 1, 71, 118, 64, 191, 0, 127, 9, 87, 34, 187, 179, 34, 103, 160, 0, 222, 11, 174, 0, 0, 190, 7, 1, 31, 3, 19, 87, 119, 84, 255, 0, 95, 13, 183, 252, 18, 9, 255, 254, 2, 14, 36, 19, 53, 86, 215, 119, 159, 18, 232, 127, 1, 63, 5, - 153, 187, 198, 87, 19, 35, 248, 19, 39, 249, 1, 254, 37, 52, 85, 0, 175, 10, 19, 101, 9, 1, 255, 4, 103, 120, 153, 171, 81, 0, 223, 10, 181, 20, 12, 247, 20, 16, 0, 125, 9, 36, 19, 10, 13, 51, 25, 2, 30, 2, 20, 81, 32, 186, 255, 251, 2, 158, 6, 84, 185, 50, 17, 122, 251, 0, 8, 0, 33, 7, - 3, 102, 11, 1, 212, 17, 50, 18, 218, 249, 18, 222, 251, 3, 142, 148, 4, 52, 60, 87, 37, 143, 8, 21, 175, 14, 21, 179, 111, 0, 143, 255, 255, 255, 4, 255, 255, 223, 13, 255, 250, 252, 11, 127, 255, 243, 16, 10, 144, 21, 95, 220, 16, 0, 18, 62, 0, 255, 241, 21, 107, 21, 209, 207, 255, 244, 65, 139, 32, 23, - 239, 255, 112, 0, 190, 175, 16, 20, 95, 255, 240, 0, 47, 32, 24, 30, 21, 115, 4, 211, 10, 51, 230, 202, 118, 84, 35, 17, 204, 189, 2, 17, 208, 1, 255, 253, 22, 16, 3, 175, 125, 16, 7, 143, 0, 255, 253, 111, 21, 175, 250, 223, 69, 141, 50, 107, 253, 4, 207, 255, 244, 255, 223, 255, 254, 80, 255, 254, 129, 0, - 234, 255, 234, 97, 35, 255, 128, 5, 47, 16, 11, 21, 239, 247, 175, 255, 0, 5, 22, 21, 13, 255, 253, 223, 0, 63, 16, 173, 159, 255, 208, 0, 207, 119, 16, 59, 239, 255, 80, 52, 102, 184, 104, 207, 162, 211, 22, 127, 16, 0, 159, 2, 32, 227, 21, 149, 204, 0, 200, 7, 170, 3, 38, 79, 254, 22, 223, 35, 86, 195, - 1, 144, 3, 120, 48, 223, 185, 134, 51, 88, 38, 117, 49, 55, 112, 3, 187, 48, 80, 3, 249, 0, 223, 16, 199, 5, 239, 215, 255, 242, 16, 155, 249, 19, 87, 253, 0, 6, 163, 255, 64, 175, 8, 16, 175, 6, 16, 13, 35, 227, 92, 254, 253, 169, 119, 2, 255, 253, 32, 17, 34, 0, 251, 14, 255, 251, 85, 47, 22, 228, - 111, 255, 251, 237, 255, 159, 255, 173, 22, 238, 249, 0, 238, 101, 83, 49, 119, 110, 119, 137, 128, 23, 31, 143, 240, 112, 3, 6, 111, 15, 35, 227, 6, 153, 135, 0, 229, 0, 13, 221, 18, 18, 23, 59, 13, 80, 3, 12, 95, 23, 71, 11, 53, 165, 118, 85, 67, 50, 212, 94, 23, 224, 245, 80, 3, 254, 221, 221, 221, 100, - 223, 146, 249, 167, 108, 87, 244, 48, 144, 3, 82, 107, 7, 86, 11, 170, 5, 86, 23, 73, 85, 155, 143, 50, 87, 253, 80, 3, 183, 255, 96, 3, 205, 239, 117, 63, 9, 255, 250, 95, 20, 135, 249, 48, 3, 10, 255, 249, 1, 27, 255, 255, 248, 255, 187, 255, 247, 255, 203, 117, 16, 3, 219, 255, 247, 2, 29, 16, 251, 20, - 202, 251, 74, 20, 202, 252, 34, 98, 48, 3, 7, 48, 3, 254, 21, 189, 162, 255, 3, 255, 210, 207, 41, 22, 70, 171, 33, 211, 31, 25, 31, 221, 95, 255, 55, 223, 0, 158, 255, 38, 227, 255, 234, 150, 121, 189, 41, 55, 250, 25, 60, 244, 25, 64, 249, 240, 119, 83, 16, 176, 57, 164, 34, 17, 251, 167, 128, 17, 140, 224, - 32, 22, 25, 91, 241, 220, 255, 234, 255, 80, 1, 66, 220, 80, 18, 216, 112, 8, 207, 15, 235, 255, 254, 41, 113, 216, 239, 25, 154, 223, 255, 157, 54, 35, 16, 48, 3, 207, 255, 255, 16, 120, 249, 223, 0, 24, 41, 179, 223, 255, 0, 42, 255, 250, 255, 140, 255, 255, 253, 25, 195, 226, 20, 22, 228, 16, 255, 183, 72, 96, - 42, 88, 80, 130, 79, 228, 96, 170, 80, 26, 16, 112, 19, 239, 208, 50, 77, 31, 26, 29, 91, 49, 216, 111, 26, 7, 2, 158, 216, 183, 1, 251, 228, 135, 138, 223, 103, 155, 232, 127, 108, 25, 185, 20, 57, 50, 68, 239, 22, 192, 233, 32, 9, 173, 16, 67, 231, 64, 36, 106, 126, 19, 231, 80, 2, 223, 255, 185, 223, 32, - 96, 170, 191, 64, 3, 253, 20, 147, 249, 16, 138, 244, 19, 242, 174, 208, 24, 115, 64, 71, 151, 112, 0, 255, 24, 96, 147, 130, 1, 188, 18, 19, 125, 223, 48, 226, 68, 79, 239, 255, 234, 197, 85, 175, 26, 228, 63, 26, 232, 4, 20, 88, 223, 67, 49, 164, 213, 72, 80, 122, 207, 255, 172, 144, 27, 3, 192, 65, 175, 200, - 64, 5, 63, 20, 37, 67, 162, 9, 144, 3, 8, 82, 47, 19, 37, 19, 235, 249, 87, 203, 84, 40, 77, 250, 27, 232, 251, 80, 3, 234, 1, 147, 6, 212, 194, 94, 28, 27, 55, 6, 31, 11, 255, 113, 16, 223, 82, 78, 175, 191, 48, 3, 144, 26, 125, 160, 0, 143, 254, 247, 160, 0, 253, 189, 19, 227, 13, 255, 245, 87, - 112, 3, 14, 16, 11, 15, 22, 145, 15, 255, 243, 244, 0, 13, 222, 243, 11, 79, 14, 7, 85, 106, 22, 30, 159, 16, 32, 3, 22, 235, 16, 3, 255, 255, 32, 125, 16, 3, 48, 3, 255, 221, 48, 8, 0, 209, 37, 55, 12, 115, 10, 2, 226, 15, 50, 17, 12, 178, 44, 121, 135, 100, 59, 0, 127, 43, 0, 252, 46, 119, - 118, 65, 13, 115, 74, 87, 118, 187, 83, 13, 210, 76, 3, 103, 119, 14, 51, 10, 84, 32, 56, 10, 140, 176, 0, 2, 254, 3, 69, 82, 26, 202, 36, 246, 13, 191, 7, 125, 25, 98, 45, 248, 0, 3, 239, 8, 192, 11, 177, 82, 15, 255, 8, 83, 74, 215, 8, 15, 223, 7, 22, 210, 0, 9, 29, 71, 186, 51, 20, 83, - 239, 255, 32, 24, 71, 64, 15, 191, 13, 179, 7, 15, 255, 2, 66, 16, 138, 47, 14, 94, 5, 32, 0, 225, 10, 239, 176, 24, 234, 11, 0, 6, 44, 179, 47, 251, 191, 99, 15, 255, 2, 70, 16, 76, 19, 29, 10, 14, 31, 37, 21, 119, 84, 40, 203, 7, 15, 255, 5, 81, 45, 23, 178, 45, 79, 15, 255, 36, 251, 0, - 2, 53, 103, 108, 15, 255, 9, 119, 101, 178, 32, 31, 255, 254, 128, 31, 163, 12, 95, 11, 16, 15, 60, 16, 177, 7, 0, 222, 5, 81, 42, 15, 255, 9, 47, 246, 16, 222, 0, 87, 0, 222, 13, 75, 31, 255, 95, 15, 159, 3, 53, 103, 119, 154, 239, 0, 95, 9, 37, 113, 255, 252, 41, 246, 250, 15, 191, 38, 98, 30, - 179, 24, 239, 62, 51, 5, 211, 3, 45, 187, 253, 25, 171, 41, 78, 224, 15, 255, 74, 12, 30, 31, 11, 48, 3, 44, 230, 251, 169, 4, 16, 3, 63, 30, 22, 239, 34, 59, 50, 63, 78, 110, 63, 159, 252, 79, 31, 152, 255, 255, 246, 27, 78, 242, 64, 0, 255, 227, 30, 144, 27, 26, 246, 31, 255, 149, 227, 1, 199, 15, - 45, 199, 15, 31, 35, 63, 91, 19, 143, 80, 31, 47, 191, 31, 51, 207, 59, 140, 41, 203, 45, 68, 47, 201, 68, 46, 45, 224, 31, 209, 43, 251, 34, 250, 112, 13, 29, 49, 25, 111, 181, 112, 30, 238, 160, 10, 26, 255, 12, 28, 63, 15, 63, 28, 98, 30, 191, 248, 95, 255, 239, 253, 143, 41, 30, 193, 31, 223, 13, 31, - 227, 47, 46, 11, 31, 235, 239, 34, 32, 49, 79, 211, 47, 31, 77, 42, 233, 111, 87, 32, 95, 83, 82, 43, 238, 80, 31, 218, 112, 31, 27, 28, 161, 63, 17, 20, 133, 63, 29, 220, 17, 32, 28, 214, 64, 3, 111, 31, 141, 127, 85, 48, 3, 159, 80, 87, 95, 28, 73, 47, 19, 206, 15, 87, 31, 238, 14, 30, 179, 12, - 16, 78, 11, 255, 176, 72, 30, 253, 192, 31, 255, 31, 38, 255, 16, 24, 26, 81, 75, 251, 136, 245, 75, 255, 158, 93, 46, 191, 63, 68, 47, 101, 55, 47, 31, 157, 14, 31, 131, 61, 57, 102, 255, 254, 31, 239, 226, 34, 68, 55, 47, 212, 248, 81, 83, 33, 179, 27, 175, 32, 26, 119, 138, 176, 28, 146, 26, 179, 28, 0, - 8, 30, 140, 5, 30, 128, 159, 3, 14, 128, 16, 17, 247, 255, 15, 255, 202, 149, 213, 3, 79, 31, 212, 63, 16, 165, 31, 112, 3, 242, 53, 27, 7, 63, 159, 85, 88, 45, 88, 30, 95, 179, 79, 165, 255, 45, 79, 90, 20, 0, 31, 188, 228, 16, 222, 0, 170, 243, 81, 227, 247, 80, 11, 192, 201, 247, 159, 78, 27, 133, - 63, 66, 23, 32, 147, 18, 128, 31, 254, 248, 29, 252, 244, 84, 80, 222, 175, 16, 222, 4, 16, 222, 0, 228, 177, 18, 146, 19, 81, 155, 0, 222, 7, 33, 219, 14, 85, 115, 11, 255, 3, 254, 151, 234, 84, 52, 79, 29, 190, 95, 48, 3, 192, 30, 157, 255, 176, 26, 95, 255, 177, 239, 111, 255, 178, 185, 46, 150, 112, 105, - 29, 59, 29, 206, 240, 45, 227, 144, 77, 21, 52, 35, 247, 255, 17, 251, 45, 67, 15, 192, 15, 18, 11, 107, 27, 239, 231, 10, 31, 255, 14, 60, 54, 250, 16, 251, 11, 255, 255, 251, 2, 30, 212, 0, 43, 108, 62, 9, 252, 32, 29, 156, 0, 6, 18, 67, 32, 243, 245, 0, 55, 176, 97, 46, 182, 181, 46, 178, 231, 42, - 15, 255, 79, 28, 155, 255, 80, 3, 207, 28, 151, 23, 44, 151, 172, 2, 31, 95, 1, 79, 103, 96, 252, 31, 2, 32, 149, 50, 17, 202, 45, 43, 161, 44, 21, 216, 50, 219, 3, 31, 47, 228, 0, 11, 245, 239, 255, 47, 39, 225, 191, 43, 111, 124, 46, 143, 128, 79, 251, 47, 31, 255, 4, 239, 96, 95, 91, 189, 80, 95, - 239, 249, 120, 155, 239, 15, 31, 6, 48, 85, 84, 35, 241, 82, 83, 211, 7, 179, 4, 6, 31, 255, 8, 63, 46, 88, 46, 92, 175, 255, 79, 255, 223, 255, 164, 13, 31, 210, 9, 31, 217, 29, 125, 251, 31, 42, 47, 17, 159, 247, 30, 100, 20, 192, 96, 2, 255, 250, 176, 254, 12, 255, 242, 242, 127, 255, 176, 31, 247, 198, - 48, 255, 31, 46, 33, 238, 17, 149, 0, 55, 30, 189, 170, 95, 30, 11, 63, 30, 11, 63, 19, 172, 63, 31, 226, 82, 64, 3, 240, 20, 29, 240, 51, 10, 31, 243, 61, 30, 44, 163, 54, 30, 48, 48, 30, 60, 128, 3, 47, 52, 189, 255, 191, 80, 30, 57, 9, 255, 254, 16, 9, 223, 254, 255, 192, 10, 79, 255, 250, 13, - 16, 133, 174, 255, 31, 84, 255, 19, 46, 255, 0, 2, 16, 8, 20, 83, 231, 50, 199, 35, 247, 242, 31, 255, 224, 71, 255, 73, 125, 91, 37, 59, 14, 95, 35, 6, 255, 68, 163, 0, 79, 83, 36, 218, 0, 83, 91, 245, 95, 19, 36, 142, 255, 253, 200, 133, 86, 46, 211, 38, 191, 8, 31, 159, 37, 0, 51, 239, 255, 30, - 255, 248, 1, 207, 255, 242, 159, 94, 53, 199, 252, 31, 207, 160, 0, 255, 196, 14, 125, 17, 169, 15, 20, 219, 15, 31, 3, 15, 159, 3, 47, 15, 11, 119, 31, 23, 11, 253, 214, 18, 202, 32, 255, 251, 241, 48, 0, 183, 16, 14, 201, 37, 47, 71, 47, 83, 11, 81, 22, 10, 6, 98, 35, 79, 50, 27, 233, 127, 21, 109, - 1, 74, 16, 222, 159, 98, 31, 16, 222, 255, 128, 222, 247, 22, 81, 181, 241, 31, 207, 112, 0, 39, 150, 253, 18, 136, 254, 186, 166, 8, 97, 16, 127, 255, 187, 24, 199, 167, 24, 203, 217, 144, 223, 16, 3, 28, 159, 63, 251, 47, 255, 128, 117, 18, 165, 112, 0, 250, 97, 87, 251, 38, 3, 229, 87, 38, 17, 160, 31, 211, - 254, 23, 23, 250, 0, 1, 205, 207, 160, 11, 28, 5, 159, 214, 23, 207, 188, 102, 137, 195, 135, 119, 38, 86, 23, 6, 54, 39, 25, 162, 176, 107, 79, 34, 5, 45, 26, 81, 22, 164, 138, 223, 255, 252, 92, 25, 182, 245, 36, 119, 255, 235, 113, 15, 255, 80, 9, 132, 16, 158, 48, 14, 65, 46, 15, 255, 10, 103, 119, 101, - 48, 15, 130, 74, 186, 2, 15, 125, 45, 2, 17, 16, 15, 64, 46, 118, 15, 255, 10, 107, 15, 62, 47, 2, 87, 0, 95, 11, 65, 14, 223, 173, 2, 87, 163, 175, 46, 99, 108, 15, 255, 6, 28, 98, 26, 151, 255, 160, 235, 41, 239, 254, 22, 204, 181, 15, 255, 31, 35, 69, 92, 1, 129, 14, 6, 15, 255, 44, 1, 51, - 51, 13, 3, 45, 1, 193, 99, 251, 8, 205, 221, 239, 11, 13, 95, 6, 1, 17, 165, 50, 30, 90, 249, 32, 3, 15, 162, 37, 70, 31, 247, 223, 43, 75, 107, 3, 19, 4, 254, 27, 252, 255, 4, 121, 9, 88, 172, 165, 144, 28, 73, 208, 15, 128, 7, 89, 243, 13, 1, 243, 3, 66, 47, 88, 211, 0, 189, 7, 85, 28, - 221, 223, 254, 0, 1, 78, 15, 225, 8, 128, 88, 175, 4, 242, 5, 16, 0, 190, 31, 193, 217, 223, 255, 12, 194, 41, 6, 236, 75, 231, 15, 255, 4, 150, 0, 41, 186, 59, 59, 12, 243, 1, 31, 88, 38, 153, 44, 79, 5, 144, 3, 29, 187, 187, 30, 28, 32, 191, 255, 209, 5, 209, 37, 48, 0, 234, 2, 175, 208, 28, - 242, 247, 15, 222, 6, 17, 31, 247, 138, 190, 75, 215, 15, 255, 4, 42, 39, 250, 4, 155, 108, 12, 93, 243, 82, 15, 127, 0, 16, 89, 131, 246, 5, 60, 173, 15, 255, 17, 11, 75, 25, 241, 255, 2, 51, 17, 62, 167, 224, 3, 31, 0, 251, 242, 255, 254, 221, 217, 35, 106, 112, 3, 240, 128, 3, 41, 0, 97, 18, 79, - 255, 95, 91, 247, 207, 92, 7, 79, 89, 252, 82, 31, 255, 246, 95, 251, 192, 92, 3, 45, 227, 64, 92, 67, 149, 95, 59, 107, 46, 106, 244, 30, 186, 246, 31, 56, 247, 10, 58, 122, 32, 7, 42, 54, 91, 231, 9, 91, 247, 4, 185, 107, 10, 46, 255, 27, 24, 32, 100, 143, 199, 64, 28, 129, 96, 31, 217, 162, 160, 31, - 166, 208, 61, 0, 41, 119, 31, 74, 251, 31, 195, 182, 245, 31, 242, 240, 1, 73, 227, 48, 13, 30, 134, 170, 64, 15, 32, 14, 207, 26, 112, 191, 58, 52, 160, 28, 11, 43, 47, 99, 35, 24, 224, 60, 32, 15, 147, 129, 2, 202, 137, 134, 58, 223, 28, 134, 31, 253, 255, 47, 59, 47, 92, 0, 21, 25, 244, 20, 166, 49, - 35, 32, 31, 96, 48, 31, 164, 48, 85, 31, 177, 80, 36, 60, 2, 49, 31, 30, 26, 206, 6, 137, 247, 95, 207, 44, 255, 36, 245, 144, 81, 35, 31, 201, 8, 126, 29, 170, 79, 207, 255, 226, 239, 63, 81, 203, 36, 29, 102, 42, 91, 254, 29, 106, 31, 131, 176, 28, 19, 92, 87, 82, 92, 83, 192, 8, 119, 25, 14, 17, - 52, 30, 35, 160, 30, 251, 170, 244, 31, 255, 253, 48, 191, 1, 47, 239, 127, 80, 183, 141, 79, 64, 15, 30, 212, 30, 23, 251, 114, 31, 43, 236, 84, 61, 71, 247, 77, 71, 64, 79, 251, 144, 8, 135, 104, 37, 35, 164, 29, 159, 251, 79, 178, 223, 45, 127, 225, 67, 243, 62, 173, 170, 176, 146, 231, 192, 0, 141, 66, 193, - 27, 230, 249, 29, 213, 154, 253, 60, 242, 255, 224, 60, 248, 33, 94, 48, 31, 151, 154, 112, 47, 131, 7, 152, 0, 237, 32, 50, 103, 223, 30, 132, 138, 159, 7, 0, 8, 13, 141, 25, 35, 243, 63, 0, 3, 5, 47, 163, 235, 85, 51, 247, 241, 128, 3, 253, 6, 62, 19, 239, 83, 243, 143, 85, 31, 255, 63, 31, 255, 12, - 31, 255, 3, 47, 215, 78, 71, 45, 23, 64, 95, 247, 39, 201, 31, 10, 6, 255, 146, 146, 19, 125, 223, 45, 232, 31, 30, 30, 36, 3, 191, 17, 140, 149, 255, 31, 20, 29, 121, 0, 20, 10, 0, 33, 25, 162, 79, 14, 190, 17, 47, 31, 163, 36, 55, 8, 255, 251, 6, 244, 3, 255, 255, 110, 31, 151, 255, 36, 213, 51, - 131, 244, 2, 223, 255, 95, 31, 120, 223, 31, 112, 48, 91, 140, 253, 80, 91, 29, 213, 19, 50, 0, 193, 6, 69, 19, 31, 185, 162, 9, 24, 77, 6, 31, 99, 56, 47, 36, 223, 111, 83, 211, 198, 2, 223, 61, 231, 31, 135, 19, 202, 255, 24, 21, 74, 235, 223, 255, 230, 31, 158, 130, 46, 65, 175, 255, 245, 211, 0, 11, - 128, 30, 243, 176, 30, 251, 224, 255, 47, 255, 245, 242, 143, 255, 224, 253, 237, 255, 255, 128, 30, 94, 16, 255, 22, 124, 255, 43, 200, 62, 47, 239, 46, 73, 55, 9, 31, 39, 1, 191, 11, 42, 156, 30, 50, 30, 191, 47, 241, 238, 31, 246, 69, 255, 95, 24, 215, 207, 20, 133, 63, 254, 16, 0, 9, 129, 227, 31, 47, 36, - 39, 40, 6, 37, 103, 40, 141, 49, 191, 251, 85, 69, 23, 250, 13, 217, 19, 4, 33, 10, 40, 31, 221, 10, 34, 85, 107, 101, 111, 8, 43, 28, 34, 162, 49, 147, 251, 73, 79, 85, 48, 3, 250, 85, 115, 237, 12, 124, 115, 127, 144, 3, 143, 36, 84, 15, 96, 3, 157, 51, 239, 96, 3, 144, 144, 3, 31, 243, 219, 239, - 112, 15, 126, 49, 141, 178, 15, 195, 12, 42, 216, 119, 15, 227, 12, 7, 204, 48, 8, 133, 203, 70, 118, 64, 106, 14, 162, 76, 5, 116, 15, 2, 77, 4, 15, 255, 10, 100, 15, 223, 13, 238, 55, 97, 0, 0, 0, 248, 13, 221, 221, 57, 23, 81, 15, 236, 5, 221, 16, 0, 255, 14, 147, 6, 0, 20, 255, 12, 187, 161, - 181, 255, 0, 80, 5, 250, 4, 250, 13, 242, 255, 12, 243, 111, 144, 95, 176, 239, 16, 215, 223, 32, 15, 63, 33, 10, 3, 147, 6, 80, 5, 176, 255, 0, 243, 10, 245, 0, 252, 2, 253, 255, 0, 191, 64, 159, 96, 63, 208, 31, 186, 224, 14, 130, 59, 53, 103, 121, 28, 226, 255, 48, 3, 239, 89, 152, 119, 239, 251, 153, - 155, 187, 187, 117, 104, 219, 85, 83, 59, 31, 219, 175, 191, 223, 189, 62, 82, 223, 40, 255, 254, 33, 17, 17, 226, 223, 252, 154, 161, 31, 255, 31, 182, 0, 227, 74, 8, 239, 72, 7, 111, 111, 255, 6, 237, 76, 71, 8, 255, 1, 19, 193, 51, 207, 105, 67, 111, 255, 45, 75, 45, 45, 43, 143, 254, 230, 87, 119, 119, 224, - 31, 175, 255, 119, 48, 89, 99, 167, 245, 191, 255, 6, 93, 103, 109, 107, 57, 0, 73, 98, 45, 203, 0, 0, 43, 58, 28, 188, 72, 95, 144, 91, 67, 237, 236, 221, 220, 163, 171, 4, 166, 44, 229, 160, 60, 58, 251, 29, 124, 32, 129, 10, 210, 60, 27, 15, 255, 0, 182, 157, 16, 215, 223, 255, 64, 3, 51, 17, 175, 255, - 246, 17, 51, 69, 85, 113, 31, 219, 189, 30, 87, 189, 5, 180, 43, 119, 119, 120, 133, 106, 59, 247, 241, 119, 85, 83, 245, 15, 255, 1, 46, 91, 91, 84, 2, 62, 94, 239, 102, 39, 96, 0, 2, 207, 248, 28, 214, 188, 248, 31, 19, 144, 223, 255, 228, 62, 43, 230, 76, 251, 20, 103, 137, 157, 127, 89, 115, 72, 84, 214, - 50, 207, 124, 100, 128, 95, 23, 251, 184, 30, 217, 218, 255, 80, 25, 224, 32, 248, 15, 255, 0, 44, 23, 208, 126, 31, 15, 191, 255, 0, 45, 255, 254, 30, 122, 175, 244, 111, 255, 86, 46, 171, 128, 99, 20, 255, 247, 137, 255, 255, 249, 29, 116, 64, 47, 255, 247, 183, 0, 95, 249, 191, 255, 121, 135, 98, 93, 32, 91, 177, - 31, 178, 252, 66, 52, 47, 75, 7, 69, 5, 43, 7, 80, 13, 115, 108, 184, 193, 31, 226, 30, 73, 123, 1, 85, 27, 189, 9, 31, 238, 47, 31, 120, 175, 28, 219, 207, 255, 48, 248, 6, 250, 0, 224, 14, 241, 239, 0, 112, 127, 30, 209, 239, 16, 0, 8, 86, 18, 224, 31, 29, 143, 159, 26, 250, 191, 96, 14, 52, 48, - 255, 10, 246, 8, 247, 2, 254, 0, 238, 125, 16, 80, 127, 0, 31, 224, 14, 16, 96, 6, 24, 30, 191, 29, 237, 32, 112, 111, 176, 98, 191, 44, 131, 28, 218, 40, 63, 31, 36, 117, 95, 28, 3, 63, 13, 255, 36, 43, 35, 27, 155, 175, 11, 67, 223, 10, 31, 125, 191, 255, 209, 11, 247, 255, 253, 16, 191, 59, 215, 255, - 160, 255, 254, 184, 255, 243, 251, 0, 207, 251, 27, 166, 215, 255, 16, 163, 96, 146, 29, 112, 254, 64, 0, 191, 31, 30, 31, 7, 255, 255, 231, 32, 111, 37, 44, 79, 51, 227, 16, 239, 174, 30, 174, 7, 31, 214, 7, 245, 255, 220, 187, 207, 93, 191, 31, 80, 3, 15, 236, 2, 69, 120, 125, 67, 255, 151, 19, 235, 30, 219, - 202, 255, 48, 80, 3, 31, 143, 255, 148, 103, 119, 9, 125, 1, 23, 47, 171, 34, 152, 45, 222, 63, 61, 131, 255, 202, 13, 191, 183, 188, 44, 37, 0, 56, 207, 255, 142, 118, 109, 168, 243, 16, 43, 30, 23, 1, 239, 28, 104, 255, 223, 244, 0, 3, 223, 253, 187, 189, 38, 112, 127, 46, 47, 247, 80, 3, 17, 249, 255, 242, - 95, 95, 206, 212, 0, 61, 207, 15, 255, 3, 2, 104, 172, 29, 83, 135, 255, 48, 3, 60, 239, 59, 195, 32, 223, 12, 0, 18, 238, 52, 91, 239, 110, 32, 253, 203, 169, 28, 106, 143, 0, 46, 76, 47, 41, 45, 183, 255, 232, 153, 153, 116, 112, 251, 248, 85, 84, 31, 255, 111, 94, 223, 44, 175, 201, 0, 112, 85, 67, 18, - 132, 0, 38, 92, 35, 227, 220, 255, 255, 80, 2, 9, 255, 80, 10, 7, 235, 255, 112, 31, 16, 3, 95, 16, 7, 127, 5, 219, 255, 144, 32, 3, 111, 1, 30, 254, 239, 172, 111, 80, 113, 252, 175, 31, 185, 63, 253, 245, 0, 255, 143, 248, 245, 0, 223, 243, 251, 1, 211, 255, 224, 34, 51, 253, 17, 183, 20, 50, 0, 206, - 105, 30, 6, 0, 143, 30, 160, 12, 17, 214, 32, 3, 79, 191, 255, 45, 32, 244, 3, 253, 207, 245, 0, 216, 128, 159, 21, 126, 127, 247, 128, 3, 35, 220, 19, 224, 167, 127, 19, 14, 127, 32, 26, 21, 217, 63, 254, 80, 58, 18, 54, 68, 31, 0, 3, 141, 67, 59, 2, 45, 235, 94, 31, 67, 4, 31, 71, 45, 255, 221, - 222, 63, 29, 248, 245, 255, 236, 166, 16, 46, 30, 34, 192, 96, 3, 159, 144, 80, 211, 13, 117, 31, 8, 239, 196, 0, 223, 223, 220, 255, 19, 123, 46, 14, 208, 0, 6, 255, 15, 176, 0, 3, 12, 241, 0, 8, 245, 5, 253, 49, 127, 165, 55, 241, 81, 55, 247, 16, 82, 31, 3, 30, 20, 35, 69, 11, 31, 177, 23, 116, - 22, 240, 82, 167, 83, 46, 63, 1, 63, 159, 224, 68, 17, 36, 25, 80, 143, 255, 112, 0, 224, 30, 241, 0, 246, 7, 238, 248, 0, 254, 20, 12, 143, 112, 111, 4, 194, 49, 255, 239, 32, 0, 7, 249, 4, 0, 14, 255, 241, 13, 0, 143, 128, 95, 1, 254, 253, 16, 239, 9, 247, 7, 249, 20, 10, 241, 249, 175, 96, 143, - 112, 207, 31, 3, 31, 14, 0, 101, 18, 150, 0, 160, 3, 104, 2, 15, 255, 14, 9, 31, 77, 127, 82, 31, 113, 127, 31, 84, 5, 52, 78, 223, 84, 12, 31, 171, 199, 6, 255, 65, 199, 66, 170, 33, 207, 3, 133, 75, 219, 255, 2, 31, 187, 112, 2, 47, 174, 5, 207, 84, 24, 136, 2, 22, 62, 0, 96, 3, 224, 85, - 191, 31, 90, 159, 7, 34, 227, 12, 196, 4, 6, 223, 254, 202, 151, 143, 110, 43, 57, 144, 3, 63, 163, 1, 51, 69, 93, 106, 56, 107, 129, 17, 79, 247, 112, 222, 223, 201, 67, 39, 109, 15, 255, 6, 153, 148, 35, 159, 16, 0, 24, 72, 218, 251, 175, 217, 81, 0, 51, 15, 202, 5, 207, 251, 234, 51, 86, 127, 31, 247, - 111, 31, 255, 95, 32, 3, 82, 31, 247, 95, 20, 152, 63, 32, 3, 56, 225, 242, 18, 193, 85, 23, 243, 159, 20, 173, 127, 20, 177, 143, 17, 109, 207, 167, 247, 18, 213, 243, 24, 189, 22, 6, 7, 153, 117, 79, 15, 255, 10, 49, 15, 255, 0, 34, 55, 5, 5, 80, 0, 252, 29, 9, 254, 204, 255, 223, 24, 212, 32, 3, - 212, 239, 245, 88, 179, 243, 87, 135, 208, 72, 143, 13, 188, 15, 254, 255, 144, 31, 3, 255, 176, 5, 16, 3, 191, 0, 64, 3, 192, 6, 1, 255, 208, 111, 95, 16, 3, 79, 16, 7, 3, 255, 202, 255, 196, 79, 44, 115, 58, 20, 116, 19, 250, 51, 134, 159, 248, 106, 24, 23, 250, 65, 44, 135, 140, 28, 140, 106, 19, 243, - 109, 35, 251, 255, 180, 195, 123, 218, 98, 36, 223, 234, 89, 31, 251, 79, 24, 240, 63, 251, 144, 3, 17, 33, 31, 189, 253, 96, 3, 4, 85, 85, 89, 24, 111, 255, 113, 32, 3, 5, 119, 126, 28, 251, 23, 215, 41, 36, 175, 238, 255, 128, 9, 32, 91, 183, 119, 118, 117, 203, 253, 213, 85, 85, 255, 208, 36, 21, 63, 255, - 238, 231, 255, 240, 21, 5, 240, 25, 255, 105, 215, 39, 41, 219, 175, 72, 228, 86, 207, 15, 255, 15, 127, 255, 252, 233, 0, 1, 103, 15, 131, 7, 32, 15, 255, 77, 19, 150, 242, 255, 7, 249, 5, 250, 0, 216, 0, 113, 85, 15, 255, 37, 2, 87, 115, 1, 15, 255, 2, 253, 24, 114, 245, 117, 24, 114, 112, 7, 208, 15, - 104, 99, 1, 22, 165, 0, 202, 106, 187, 2, 137, 7, 4, 111, 16, 7, 105, 231, 17, 15, 255, 2, 115, 60, 79, 220, 185, 152, 15, 255, 6, 55, 227, 101, 85, 152, 85, 0, 31, 7, 25, 145, 51, 48, 15, 255, 40, 35, 227, 35, 231, 173, 21, 0, 97, 5, 15, 23, 227, 9, 216, 15, 177, 40, 12, 60, 35, 23, 28, 205, - 0, 1, 69, 83, 1, 223, 3, 31, 255, 165, 194, 1, 159, 43, 208, 23, 93, 27, 184, 153, 11, 45, 4, 9, 244, 255, 184, 190, 13, 40, 92, 55, 6, 25, 4, 27, 138, 244, 0, 38, 173, 248, 1, 158, 6, 0, 83, 235, 41, 199, 181, 153, 15, 255, 2, 5, 255, 28, 56, 54, 15, 255, 8, 223, 250, 240, 0, 44, 223, 241, - 1, 163, 8, 128, 15, 255, 66, 203, 25, 145, 27, 173, 29, 167, 143, 154, 158, 11, 193, 108, 72, 163, 159, 251, 69, 199, 95, 254, 69, 224, 255, 255, 221, 206, 64, 28, 226, 144, 0, 14, 25, 145, 127, 85, 254, 94, 29, 89, 203, 47, 31, 255, 3, 239, 255, 233, 63, 46, 159, 30, 244, 255, 254, 48, 0, 239, 255, 229, 227, 0, - 46, 29, 67, 15, 159, 56, 20, 43, 217, 208, 85, 78, 213, 207, 27, 58, 111, 31, 127, 14, 238, 255, 9, 62, 80, 155, 28, 122, 4, 255, 226, 17, 28, 127, 159, 170, 155, 43, 67, 128, 79, 63, 253, 95, 75, 227, 182, 156, 117, 31, 97, 9, 252, 105, 18, 240, 255, 18, 244, 254, 87, 31, 138, 80, 26, 7, 80, 127, 255, 35, - 86, 119, 127, 111, 148, 167, 83, 16, 0, 54, 137, 171, 181, 187, 175, 159, 118, 65, 43, 15, 213, 46, 59, 112, 255, 0, 57, 255, 241, 219, 64, 223, 245, 245, 255, 144, 175, 245, 13, 194, 25, 4, 73, 95, 3, 149, 255, 76, 123, 34, 115, 143, 127, 255, 64, 95, 255, 248, 39, 92, 231, 46, 27, 169, 30, 79, 14, 34, 22, 19, - 51, 33, 207, 17, 95, 31, 208, 32, 3, 39, 223, 251, 153, 215, 0, 191, 29, 45, 207, 134, 97, 17, 17, 16, 63, 31, 47, 39, 27, 253, 0, 175, 254, 146, 0, 188, 31, 25, 84, 47, 251, 1, 89, 5, 24, 8, 18, 41, 214, 255, 234, 9, 110, 1, 3, 29, 125, 127, 231, 30, 27, 85, 31, 255, 223, 159, 223, 159, 29, 145, - 239, 49, 183, 155, 52, 75, 3, 20, 247, 169, 118, 230, 171, 149, 27, 242, 47, 254, 117, 44, 255, 84, 51, 77, 15, 31, 6, 1, 31, 217, 11, 159, 160, 77, 171, 230, 75, 46, 35, 85, 103, 223, 53, 109, 63, 111, 255, 26, 177, 30, 158, 247, 88, 95, 233, 206, 153, 187, 224, 31, 175, 234, 187, 187, 164, 47, 167, 73, 31, 171, - 251, 6, 30, 15, 156, 244, 168, 74, 43, 19, 52, 1, 223, 239, 250, 29, 246, 241, 18, 95, 255, 181, 94, 175, 255, 64, 219, 223, 85, 85, 103, 117, 15, 226, 47, 170, 63, 26, 187, 11, 19, 19, 2, 38, 9, 143, 21, 74, 178, 6, 17, 236, 87, 137, 104, 147, 30, 140, 32, 21, 196, 175, 64, 50, 207, 11, 28, 113, 9, 255, - 144, 171, 189, 206, 126, 93, 255, 0, 239, 249, 20, 195, 241, 63, 30, 165, 31, 48, 75, 32, 0, 1, 17, 17, 186, 17, 126, 123, 221, 220, 187, 15, 193, 2, 144, 90, 231, 126, 35, 28, 2, 239, 255, 225, 0, 30, 31, 35, 63, 18, 92, 19, 244, 255, 7, 255, 249, 239, 14, 255, 255, 208, 46, 127, 255, 64, 4, 239, 70, 145, - 62, 176, 95, 155, 46, 50, 57, 227, 254, 16, 19, 193, 188, 176, 8, 27, 15, 5, 188, 223, 255, 30, 74, 48, 3, 239, 3, 66, 16, 170, 67, 10, 85, 85, 85, 190, 127, 111, 39, 238, 255, 253, 187, 11, 30, 196, 182, 111, 30, 147, 239, 252, 94, 167, 217, 154, 19, 163, 166, 80, 30, 167, 160, 17, 211, 13, 89, 0, 221, 239, - 20, 159, 147, 11, 38, 224, 29, 137, 8, 21, 200, 36, 247, 3, 133, 123, 47, 210, 21, 0, 7, 221, 33, 59, 255, 201, 255, 118, 85, 67, 36, 85, 119, 119, 191, 117, 31, 248, 172, 185, 153, 55, 167, 139, 82, 191, 252, 255, 185, 153, 153, 51, 0, 191, 244, 118, 255, 0, 239, 242, 255, 82, 255, 240, 119, 255, 5, 255, 192, 0, - 1, 205, 64, 220, 179, 166, 67, 75, 155, 223, 46, 209, 45, 39, 4, 191, 53, 72, 7, 46, 3, 0, 131, 175, 177, 89, 100, 84, 255, 245, 255, 235, 234, 127, 30, 17, 111, 31, 237, 191, 170, 251, 30, 49, 245, 24, 57, 240, 40, 31, 195, 47, 235, 213, 153, 155, 47, 75, 27, 111, 79, 159, 80, 3, 175, 87, 100, 27, 241, 81, - 95, 253, 208, 3, 0, 223, 249, 145, 152, 19, 134, 18, 204, 253, 18, 208, 16, 158, 28, 234, 1, 237, 255, 193, 17, 24, 215, 255, 3, 31, 255, 159, 183, 249, 16, 228, 249, 14, 16, 3, 10, 199, 79, 47, 46, 213, 46, 217, 246, 69, 101, 255, 245, 30, 252, 84, 31, 170, 227, 33, 92, 48, 54, 12, 12, 84, 155, 37, 119, 253, - 79, 254, 96, 0, 223, 248, 91, 181, 240, 250, 64, 1, 255, 227, 112, 16, 80, 96, 16, 84, 242, 64, 5, 255, 199, 31, 56, 33, 79, 112, 109, 143, 174, 17, 72, 235, 221, 47, 250, 137, 153, 171, 82, 87, 207, 1, 69, 31, 214, 89, 31, 11, 255, 221, 221, 123, 63, 167, 253, 187, 187, 186, 46, 174, 0, 101, 218, 85, 48, 46, - 163, 10, 208, 94, 171, 144, 141, 223, 174, 10, 31, 254, 111, 31, 254, 28, 219, 191, 26, 255, 245, 127, 255, 209, 4, 22, 107, 46, 28, 147, 223, 63, 24, 175, 33, 239, 255, 255, 208, 5, 254, 255, 249, 240, 13, 85, 85, 67, 44, 250, 24, 123, 10, 94, 31, 151, 15, 85, 87, 31, 255, 137, 187, 69, 205, 227, 51, 51, 16, 166, - 1, 48, 3, 46, 67, 221, 221, 125, 32, 67, 245, 0, 6, 189, 239, 114, 127, 2, 171, 51, 121, 194, 8, 95, 7, 159, 107, 219, 239, 255, 210, 235, 153, 18, 243, 0, 34, 243, 50, 123, 209, 41, 155, 222, 112, 0, 107, 251, 153, 152, 119, 119, 15, 218, 2, 174, 176, 95, 135, 16, 15, 40, 37, 11, 237, 203, 34, 15, 133, 239, - 74, 103, 39, 15, 39, 23, 20, 127, 6, 29, 184, 13, 250, 255, 176, 255, 51, 17, 45, 222, 143, 31, 251, 180, 191, 31, 140, 223, 16, 66, 63, 223, 95, 203, 45, 246, 180, 0, 21, 22, 0, 244, 95, 67, 242, 80, 11, 31, 83, 246, 1, 255, 217, 155, 16, 87, 0, 7, 43, 230, 42, 81, 111, 18, 123, 5, 50, 7, 96, 30, - 29, 240, 22, 41, 40, 51, 103, 31, 120, 255, 95, 135, 243, 81, 171, 103, 56, 45, 3, 82, 30, 132, 64, 24, 12, 225, 25, 44, 31, 170, 175, 31, 79, 217, 13, 255, 70, 231, 0, 141, 87, 179, 39, 183, 5, 82, 47, 255, 112, 95, 203, 227, 95, 203, 113, 63, 153, 54, 79, 175, 253, 27, 78, 244, 25, 142, 160, 0, 191, 255, - 247, 16, 5, 255, 247, 113, 95, 167, 101, 84, 185, 51, 60, 74, 2, 255, 215, 30, 20, 69, 135, 0, 174, 1, 33, 159, 128, 27, 194, 32, 33, 16, 139, 175, 167, 249, 40, 11, 248, 38, 239, 22, 166, 111, 251, 98, 63, 33, 197, 47, 40, 0, 223, 193, 17, 0, 223, 220, 235, 187, 51, 47, 159, 255, 133, 52, 215, 75, 163, 190, - 237, 47, 139, 18, 51, 51, 51, 187, 16, 0, 63, 47, 151, 20, 123, 85, 168, 118, 85, 86, 0, 255, 2, 223, 245, 221, 96, 63, 250, 255, 255, 160, 13, 253, 51, 0, 11, 253, 187, 255, 64, 11, 253, 255, 176, 14, 252, 85, 254, 17, 191, 248, 121, 191, 255, 224, 12, 239, 5, 85, 33, 83, 12, 42, 92, 12, 31, 212, 31, 24, - 148, 127, 105, 27, 199, 207, 249, 95, 3, 224, 81, 83, 72, 125, 207, 21, 44, 38, 32, 216, 21, 219, 255, 130, 199, 95, 63, 157, 251, 85, 88, 19, 246, 81, 191, 224, 85, 107, 96, 92, 155, 3, 245, 255, 165, 119, 3, 31, 72, 4, 31, 76, 5, 231, 255, 131, 70, 39, 24, 39, 28, 189, 203, 185, 191, 134, 47, 255, 191, 245, - 47, 255, 127, 244, 255, 6, 239, 159, 243, 0, 26, 207, 254, 173, 176, 31, 27, 246, 31, 31, 177, 4, 24, 30, 62, 255, 159, 241, 1, 239, 254, 87, 255, 241, 94, 40, 211, 255, 28, 104, 62, 255, 255, 229, 53, 112, 186, 251, 18, 246, 209, 2, 187, 57, 221, 8, 53, 63, 175, 80, 27, 104, 64, 24, 182, 48, 128, 11, 255, 250, - 49, 64, 11, 255, 33, 25, 63, 16, 32, 3, 247, 44, 185, 223, 255, 41, 55, 239, 255, 234, 227, 99, 255, 229, 95, 215, 47, 219, 20, 99, 175, 255, 218, 234, 151, 100, 223, 51, 52, 47, 59, 1, 100, 223, 121, 18, 207, 6, 255, 119, 138, 40, 67, 79, 23, 192, 43, 86, 115, 96, 3, 208, 91, 59, 148, 19, 227, 1, 255, 171, - 241, 31, 243, 241, 85, 244, 243, 71, 228, 223, 244, 247, 5, 0, 223, 245, 25, 205, 255, 255, 83, 212, 50, 111, 42, 240, 252, 66, 238, 127, 48, 3, 25, 205, 170, 254, 79, 151, 209, 14, 145, 1, 49, 37, 50, 48, 57, 203, 74, 49, 119, 11, 93, 37, 26, 119, 4, 26, 127, 13, 21, 231, 182, 95, 26, 73, 223, 252, 41, 47, - 80, 233, 30, 35, 212, 96, 60, 42, 11, 93, 45, 231, 110, 239, 182, 42, 68, 137, 252, 31, 220, 16, 42, 48, 47, 110, 33, 76, 16, 4, 0, 210, 0, 109, 8, 223, 3, 80, 92, 23, 13, 214, 19, 79, 26, 209, 162, 24, 45, 69, 19, 13, 130, 7, 15, 91, 6, 110, 127, 175, 29, 4, 239, 1, 53, 67, 15, 255, 3, 240, - 0, 55, 201, 143, 128, 15, 121, 99, 79, 255, 24, 75, 0, 7, 239, 80, 21, 56, 214, 9, 131, 16, 15, 255, 0, 159, 31, 190, 1, 43, 134, 2, 88, 13, 105, 5, 2, 42, 163, 4, 156, 15, 127, 10, 59, 231, 25, 23, 124, 15, 191, 4, 253, 32, 255, 201, 64, 15, 128, 10, 45, 47, 146, 39, 15, 223, 7, 30, 150, 205, - 15, 190, 11, 42, 132, 239, 26, 181, 223, 20, 16, 14, 42, 66, 159, 241, 7, 255, 159, 254, 241, 4, 255, 71, 112, 0, 33, 15, 255, 2, 142, 244, 92, 123, 15, 255, 7, 83, 231, 0, 3, 51, 15, 255, 3, 185, 29, 45, 35, 124, 239, 255, 15, 96, 6, 41, 70, 255, 241, 255, 234, 96, 17, 7, 0, 38, 19, 227, 19, 231, - 9, 239, 0, 137, 147, 2, 223, 7, 152, 119, 101, 67, 107, 2, 255, 7, 253, 184, 7, 123, 11, 3, 46, 110, 24, 192, 89, 15, 165, 42, 91, 3, 62, 93, 17, 1, 29, 95, 41, 223, 1, 111, 188, 223, 91, 177, 26, 62, 247, 36, 239, 255, 187, 249, 123, 253, 254, 153, 153, 239, 255, 86, 119, 218, 119, 119, 109, 59, 135, 119, - 8, 179, 0, 48, 71, 227, 179, 3, 25, 244, 191, 64, 69, 175, 79, 255, 141, 48, 127, 26, 179, 144, 1, 3, 255, 144, 127, 5, 255, 255, 112, 127, 167, 255, 80, 55, 184, 239, 255, 64, 3, 141, 38, 127, 176, 35, 85, 223, 239, 248, 109, 151, 101, 52, 255, 224, 85, 232, 120, 255, 233, 175, 255, 119, 22, 145, 26, 65, 28, 27, - 103, 68, 249, 153, 112, 63, 207, 14, 122, 0, 124, 238, 162, 85, 25, 120, 254, 205, 191, 58, 31, 171, 207, 28, 150, 223, 116, 31, 30, 223, 241, 32, 30, 220, 192, 62, 228, 158, 28, 159, 239, 39, 3, 56, 143, 48, 0, 10, 249, 0, 233, 2, 68, 80, 15, 158, 8, 187, 27, 255, 206, 31, 27, 125, 83, 203, 127, 1, 17, 35, - 127, 238, 95, 160, 255, 0, 5, 96, 246, 0, 63, 253, 250, 254, 0, 47, 255, 253, 53, 91, 255, 14, 95, 2, 169, 16, 93, 7, 243, 79, 207, 1, 73, 75, 79, 255, 5, 158, 180, 26, 157, 28, 183, 15, 254, 0, 8, 26, 165, 199, 3, 46, 29, 178, 31, 174, 174, 46, 54, 37, 139, 191, 239, 110, 214, 251, 168, 99, 143, 247, - 0, 237, 17, 143, 248, 111, 255, 137, 184, 43, 95, 48, 135, 0, 27, 13, 42, 236, 95, 211, 223, 189, 19, 53, 86, 187, 3, 91, 247, 3, 220, 187, 241, 251, 119, 119, 223, 153, 153, 111, 55, 175, 255, 165, 85, 175, 163, 255, 207, 222, 153, 17, 144, 44, 215, 40, 35, 83, 51, 181, 32, 15, 14, 5, 191, 205, 25, 218, 255, 30, - 84, 255, 58, 60, 3, 193, 63, 159, 219, 96, 25, 185, 250, 41, 109, 253, 16, 223, 29, 255, 64, 239, 111, 255, 162, 238, 104, 153, 133, 112, 220, 117, 52, 191, 31, 166, 200, 14, 243, 75, 231, 127, 255, 211, 92, 223, 33, 21, 41, 27, 81, 30, 205, 2, 127, 255, 76, 30, 149, 32, 53, 32, 57, 159, 189, 245, 48, 3, 69, 207, - 251, 150, 255, 223, 18, 235, 1, 89, 2, 25, 1, 7, 31, 255, 8, 255, 195, 254, 148, 239, 255, 44, 121, 41, 245, 26, 54, 0, 75, 112, 233, 190, 17, 35, 52, 115, 87, 20, 84, 62, 39, 63, 255, 127, 23, 59, 5, 255, 48, 85, 91, 255, 183, 126, 111, 89, 84, 124, 255, 161, 174, 255, 30, 79, 119, 162, 223, 137, 153, 148, - 95, 121, 253, 88, 49, 46, 37, 217, 6, 55, 0, 32, 12, 11, 30, 17, 1, 223, 77, 151, 214, 191, 255, 31, 223, 254, 27, 94, 250, 8, 25, 161, 126, 29, 219, 253, 0, 124, 127, 253, 255, 27, 72, 252, 254, 48, 22, 190, 226, 25, 18, 76, 39, 12, 249, 111, 232, 16, 0, 55, 132, 222, 58, 223, 232, 114, 45, 155, 225, 0, - 190, 43, 158, 46, 127, 12, 27, 205, 248, 13, 255, 48, 254, 143, 26, 148, 62, 183, 45, 247, 85, 34, 157, 79, 29, 239, 127, 29, 239, 159, 29, 243, 143, 125, 32, 15, 255, 105, 255, 32, 11, 30, 149, 11, 127, 27, 209, 1, 14, 253, 0, 85, 15, 251, 255, 1, 255, 31, 250, 1, 255, 79, 252, 253, 183, 17, 255, 255, 247, 44, - 96, 239, 17, 254, 3, 255, 176, 86, 121, 255, 235, 84, 120, 253, 221, 17, 18, 53, 85, 186, 45, 238, 247, 245, 0, 6, 221, 178, 65, 199, 222, 31, 134, 255, 254, 255, 192, 5, 186, 151, 16, 8, 29, 139, 222, 1, 254, 33, 227, 147, 7, 255, 178, 78, 243, 187, 191, 29, 200, 223, 255, 128, 30, 185, 249, 7, 119, 29, 111, 158, - 255, 46, 26, 148, 243, 153, 223, 207, 254, 245, 31, 255, 32, 3, 244, 51, 143, 248, 250, 241, 0, 63, 250, 192, 19, 69, 96, 60, 99, 222, 10, 255, 78, 11, 192, 0, 220, 167, 157, 97, 244, 8, 212, 0, 33, 31, 99, 173, 28, 63, 51, 227, 181, 51, 44, 29, 101, 87, 30, 138, 255, 30, 218, 255, 249, 0, 95, 253, 116, 0, - 40, 51, 20, 74, 253, 237, 221, 187, 189, 44, 155, 119, 99, 31, 146, 255, 189, 210, 31, 215, 254, 16, 69, 142, 31, 167, 6, 48, 27, 184, 20, 236, 255, 217, 17, 211, 42, 211, 36, 117, 34, 118, 191, 250, 47, 25, 0, 39, 15, 255, 68, 255, 246, 11, 255, 206, 255, 77, 47, 5, 253, 175, 243, 189, 64, 90, 203, 224, 0, 5, - 190, 31, 253, 127, 246, 206, 255, 183, 31, 27, 66, 27, 9, 30, 187, 63, 31, 50, 31, 247, 235, 28, 59, 255, 255, 143, 91, 31, 251, 111, 110, 95, 187, 187, 28, 251, 0, 127, 251, 247, 81, 87, 175, 250, 69, 187, 191, 255, 235, 251, 48, 95, 31, 159, 227, 31, 87, 249, 0, 225, 187, 187, 162, 69, 67, 42, 103, 26, 233, 34, - 122, 122, 47, 29, 161, 89, 251, 8, 109, 195, 88, 155, 205, 255, 105, 108, 3, 137, 135, 16, 94, 248, 64, 187, 35, 169, 255, 238, 50, 51, 51, 134, 27, 221, 220, 112, 222, 176, 219, 69, 85, 36, 147, 254, 16, 36, 151, 187, 187, 168, 182, 79, 217, 7, 30, 244, 9, 37, 79, 27, 239, 27, 255, 73, 30, 26, 255, 30, 119, 96, - 3, 16, 28, 26, 19, 107, 112, 215, 255, 6, 28, 66, 5, 29, 138, 236, 255, 145, 85, 31, 227, 145, 21, 188, 145, 16, 15, 145, 47, 42, 9, 235, 252, 152, 80, 31, 98, 250, 31, 102, 251, 9, 242, 246, 86, 96, 9, 27, 231, 32, 3, 10, 27, 239, 174, 11, 28, 186, 31, 48, 3, 96, 0, 28, 51, 243, 39, 96, 3, 43, - 79, 48, 45, 233, 79, 129, 151, 191, 250, 221, 84, 0, 46, 233, 95, 253, 48, 25, 210, 249, 138, 62, 63, 147, 31, 119, 29, 95, 153, 124, 162, 80, 28, 162, 116, 32, 3, 48, 0, 205, 30, 176, 253, 46, 180, 49, 184, 106, 31, 176, 223, 240, 60, 156, 4, 29, 143, 8, 48, 39, 239, 32, 0, 14, 34, 254, 1, 107, 255, 6, - 239, 191, 255, 255, 16, 210, 216, 10, 251, 114, 103, 27, 72, 2, 2, 51, 107, 36, 227, 8, 255, 234, 127, 34, 96, 254, 169, 255, 176, 48, 5, 255, 255, 176, 0, 3, 153, 112, 88, 172, 221, 189, 221, 63, 243, 202, 135, 120, 98, 26, 50, 127, 233, 255, 252, 64, 30, 133, 252, 30, 138, 30, 75, 1, 238, 149, 219, 168, 49, 67, - 64, 154, 223, 31, 159, 230, 2, 207, 248, 110, 147, 11, 98, 40, 63, 254, 76, 155, 87, 44, 159, 31, 144, 3, 15, 94, 39, 0, 8, 1, 235, 70, 121, 156, 36, 239, 23, 31, 76, 21, 135, 239, 84, 51, 16, 84, 103, 48, 0, 93, 134, 47, 19, 57, 44, 195, 220, 111, 103, 24, 255, 113, 17, 81, 34, 131, 10, 31, 225, 143, - 33, 100, 29, 224, 31, 147, 40, 159, 242, 93, 115, 12, 63, 0, 229, 111, 191, 247, 0, 255, 95, 111, 244, 0, 79, 127, 243, 0, 187, 63, 16, 3, 31, 159, 242, 16, 3, 241, 0, 159, 15, 32, 3, 52, 236, 132, 16, 3, 250, 83, 175, 33, 47, 203, 229, 31, 207, 249, 250, 17, 51, 249, 48, 255, 221, 186, 129, 32, 11, 46, - 239, 191, 85, 31, 101, 14, 61, 101, 16, 30, 74, 16, 50, 74, 12, 238, 255, 16, 2, 23, 11, 7, 2, 239, 30, 144, 165, 46, 29, 220, 63, 30, 234, 31, 151, 9, 26, 46, 95, 218, 255, 114, 28, 177, 0, 117, 20, 178, 0, 87, 67, 59, 43, 195, 30, 229, 79, 255, 242, 31, 251, 112, 79, 254, 255, 229, 3, 239, 254, 48, - 14, 51, 27, 212, 128, 0, 50, 227, 96, 80, 3, 226, 31, 251, 30, 184, 142, 95, 36, 120, 36, 244, 40, 46, 191, 251, 66, 29, 222, 45, 22, 179, 42, 167, 5, 89, 19, 19, 87, 50, 199, 7, 252, 255, 144, 19, 127, 255, 96, 46, 255, 35, 255, 218, 153, 115, 31, 209, 20, 48, 20, 59, 243, 22, 66, 202, 244, 63, 22, 230, - 40, 39, 249, 22, 213, 176, 18, 140, 207, 80, 30, 20, 192, 18, 46, 244, 255, 249, 223, 245, 252, 255, 192, 95, 31, 28, 6, 95, 187, 0, 143, 99, 229, 234, 31, 222, 26, 251, 194, 79, 253, 255, 215, 176, 95, 21, 30, 127, 144, 3, 111, 7, 255, 255, 160, 31, 158, 255, 128, 10, 245, 0, 255, 95, 247, 248, 48, 95, 247, 255, - 251, 87, 64, 3, 245, 16, 11, 246, 16, 19, 254, 80, 95, 247, 246, 255, 254, 207, 23, 73, 243, 0, 54, 215, 191, 245, 23, 84, 247, 48, 3, 0, 111, 246, 80, 53, 158, 3, 31, 15, 191, 20, 251, 46, 32, 31, 105, 20, 149, 85, 17, 105, 6, 22, 208, 12, 23, 147, 31, 24, 255, 127, 106, 31, 18, 223, 248, 26, 251, 89, - 35, 69, 208, 31, 195, 169, 176, 29, 108, 80, 19, 109, 16, 80, 3, 37, 66, 250, 120, 14, 130, 8, 40, 96, 153, 190, 31, 31, 107, 255, 47, 239, 186, 12, 24, 175, 11, 255, 131, 53, 71, 1, 45, 87, 227, 5, 137, 5, 83, 231, 26, 19, 23, 115, 96, 255, 239, 77, 255, 64, 65, 74, 244, 0, 239, 151, 254, 16, 0, 223, - 249, 190, 228, 11, 24, 206, 126, 16, 3, 229, 13, 245, 66, 0, 13, 31, 197, 169, 14, 31, 201, 15, 31, 201, 15, 31, 201, 32, 169, 79, 64, 25, 173, 30, 44, 97, 45, 43, 81, 236, 48, 7, 38, 157, 25, 10, 254, 127, 253, 111, 251, 5, 193, 63, 31, 218, 85, 32, 3, 47, 31, 234, 31, 128, 3, 123, 52, 146, 16, 50, - 176, 166, 160, 178, 31, 251, 70, 213, 33, 54, 143, 72, 54, 221, 0, 191, 33, 66, 252, 36, 112, 21, 124, 245, 42, 31, 250, 39, 87, 255, 22, 74, 163, 26, 60, 250, 55, 103, 222, 0, 8, 40, 183, 2, 0, 103, 121, 121, 47, 251, 52, 85, 87, 119, 65, 47, 79, 254, 221, 95, 37, 94, 255, 43, 71, 153, 154, 187, 188, 252, - 255, 0, 79, 251, 255, 16, 47, 251, 117, 254, 0, 95, 251, 0, 39, 239, 246, 31, 111, 255, 176, 255, 255, 215, 0, 101, 48, 0, 147, 17, 32, 41, 15, 226, 10, 160, 15, 119, 19, 99, 231, 5, 85, 86, 15, 255, 2, 48, 20, 27, 48, 49, 212, 0, 87, 12, 255, 4, 43, 30, 227, 24, 35, 118, 15, 227, 37, 175, 19, 231, - 191, 240, 253, 0, 15, 69, 80, 0, 5, 15, 255, 2, 254, 235, 120, 153, 147, 41, 179, 84, 4, 189, 6, 251, 0, 219, 4, 95, 23, 134, 7, 96, 15, 255, 4, 254, 64, 106, 9, 15, 12, 2, 238, 27, 34, 18, 15, 126, 9, 94, 23, 252, 199, 1, 159, 75, 110, 15, 255, 2, 22, 121, 0, 6, 236, 189, 168, 15, 255, 7, - 252, 96, 8, 99, 15, 157, 10, 32, 252, 12, 255, 53, 0, 3, 251, 89, 186, 255, 255, 81, 24, 26, 223, 29, 51, 143, 15, 255, 7, 27, 226, 27, 78, 0, 155, 52, 15, 221, 5, 22, 122, 255, 5, 22, 127, 0, 0, 223, 36, 83, 15, 63, 3, 254, 16, 0, 254, 128, 62, 0, 124, 5, 62, 191, 243, 0, 2, 141, 224, 15, - 193, 8, 107, 43, 167, 0, 93, 47, 159, 19, 15, 159, 5, 112, 255, 244, 254, 149, 0, 51, 6, 164, 40, 207, 34, 38, 31, 255, 150, 71, 15, 255, 2, 31, 93, 47, 20, 177, 47, 115, 72, 163, 25, 255, 255, 43, 239, 29, 22, 0, 163, 15, 255, 6, 99, 235, 5, 39, 2, 97, 4, 58, 5, 187, 15, 224, 8, 24, 174, 245, - 0, 139, 135, 186, 2, 125, 5, 31, 246, 35, 163, 35, 167, 51, 50, 17, 51, 1, 31, 5, 63, 78, 17, 17, 11, 181, 4, 59, 236, 221, 187, 165, 185, 15, 255, 6, 240, 90, 15, 15, 255, 48, 4, 30, 255, 47, 100, 30, 220, 63, 250, 69, 8, 53, 16, 252, 162, 10, 41, 255, 63, 78, 115, 22, 19, 1, 239, 252, 16, 7, - 255, 85, 127, 31, 135, 93, 87, 247, 22, 15, 144, 38, 43, 0, 250, 207, 254, 0, 4, 175, 228, 159, 59, 65, 207, 151, 1, 30, 25, 40, 240, 8, 190, 223, 133, 86, 119, 189, 115, 111, 223, 217, 119, 119, 117, 202, 63, 139, 191, 16, 30, 15, 112, 80, 13, 255, 80, 96, 227, 79, 255, 205, 28, 167, 77, 71, 15, 224, 0, 8, - 217, 170, 48, 26, 81, 244, 26, 85, 254, 239, 248, 17, 170, 159, 189, 203, 239, 188, 51, 52, 85, 85, 111, 151, 239, 250, 253, 153, 153, 175, 249, 207, 222, 85, 58, 191, 188, 250, 38, 51, 0, 153, 119, 113, 15, 251, 1, 29, 199, 226, 7, 255, 196, 60, 7, 29, 72, 31, 159, 239, 191, 65, 235, 71, 137, 171, 35, 144, 178, 26, - 15, 245, 102, 236, 83, 50, 192, 223, 94, 187, 205, 89, 251, 50, 15, 205, 111, 254, 89, 127, 127, 255, 220, 96, 26, 175, 240, 83, 26, 18, 160, 52, 15, 10, 237, 253, 28, 243, 0, 252, 95, 43, 191, 251, 20, 19, 255, 80, 1, 94, 252, 214, 0, 127, 143, 255, 76, 31, 75, 239, 243, 28, 133, 190, 245, 35, 212, 52, 88, 255, - 251, 255, 1, 63, 4, 83, 79, 171, 149, 46, 195, 80, 207, 255, 30, 115, 9, 255, 170, 162, 45, 21, 160, 27, 35, 201, 29, 218, 79, 127, 255, 87, 22, 0, 9, 29, 43, 9, 31, 223, 1, 239, 249, 250, 0, 189, 239, 255, 219, 160, 95, 1, 25, 21, 125, 39, 222, 111, 255, 67, 48, 239, 111, 168, 185, 206, 153, 151, 210, 131, - 29, 182, 127, 252, 48, 26, 57, 15, 42, 65, 37, 125, 143, 255, 20, 94, 1, 239, 187, 64, 111, 25, 48, 251, 39, 31, 233, 89, 255, 97, 252, 58, 44, 47, 159, 224, 189, 221, 221, 96, 90, 237, 58, 12, 215, 47, 251, 198, 75, 160, 56, 197, 30, 221, 176, 46, 34, 199, 49, 27, 159, 212, 237, 104, 245, 124, 114, 129, 236, 99, - 252, 81, 207, 253, 172, 223, 26, 60, 63, 125, 245, 187, 239, 207, 245, 27, 125, 245, 207, 253, 147, 5, 47, 11, 31, 177, 29, 78, 31, 70, 44, 202, 144, 15, 137, 6, 3, 253, 0, 77, 169, 239, 0, 207, 151, 191, 78, 111, 18, 13, 223, 246, 57, 102, 106, 255, 252, 186, 46, 109, 183, 15, 202, 2, 150, 31, 228, 255, 252, 80, - 61, 183, 47, 3, 250, 46, 28, 235, 255, 31, 235, 255, 3, 254, 239, 179, 254, 131, 243, 127, 254, 62, 203, 30, 65, 253, 41, 126, 18, 39, 101, 255, 255, 186, 0, 159, 31, 199, 215, 223, 252, 31, 18, 225, 31, 227, 69, 212, 111, 254, 248, 79, 255, 162, 162, 239, 190, 79, 143, 250, 159, 253, 167, 133, 9, 30, 207, 230, 20, 23, - 247, 255, 183, 0, 44, 35, 122, 110, 254, 139, 235, 184, 33, 245, 31, 251, 247, 28, 75, 64, 0, 187, 47, 29, 13, 79, 255, 194, 18, 1, 244, 0, 239, 143, 251, 176, 25, 41, 32, 0, 191, 243, 31, 39, 158, 27, 173, 29, 120, 143, 251, 233, 18, 255, 251, 246, 255, 237, 255, 192, 31, 243, 48, 62, 61, 24, 88, 28, 115, 193, - 7, 255, 212, 31, 137, 96, 127, 44, 161, 16, 159, 250, 12, 250, 255, 244, 255, 111, 253, 93, 224, 207, 247, 0, 50, 36, 31, 49, 26, 228, 46, 30, 58, 45, 155, 10, 30, 66, 45, 111, 124, 20, 193, 1, 9, 160, 0, 4, 46, 89, 39, 157, 80, 111, 180, 111, 19, 108, 239, 46, 167, 45, 166, 19, 120, 42, 218, 85, 43, 211, - 159, 29, 242, 159, 25, 250, 127, 80, 3, 111, 245, 254, 69, 119, 95, 31, 245, 79, 31, 249, 63, 237, 255, 169, 119, 237, 90, 120, 132, 47, 242, 48, 102, 48, 3, 101, 82, 72, 1, 127, 155, 127, 214, 22, 173, 222, 255, 213, 28, 70, 255, 0, 2, 191, 31, 25, 238, 6, 208, 48, 45, 157, 8, 253, 203, 44, 201, 127, 28, 94, - 221, 0, 143, 246, 0, 16, 175, 73, 26, 153, 191, 44, 55, 47, 197, 11, 17, 47, 44, 73, 2, 127, 36, 90, 239, 46, 255, 0, 175, 10, 255, 251, 32, 143, 8, 255, 48, 27, 195, 80, 79, 159, 144, 93, 55, 47, 239, 244, 0, 7, 253, 246, 74, 31, 32, 249, 30, 182, 27, 144, 43, 50, 221, 147, 51, 227, 155, 109, 47, 188, - 41, 2, 253, 80, 111, 143, 28, 239, 154, 109, 30, 250, 47, 255, 203, 156, 29, 164, 7, 27, 187, 158, 7, 30, 160, 16, 3, 35, 91, 255, 233, 127, 167, 109, 31, 126, 85, 82, 211, 251, 170, 112, 31, 255, 248, 58, 31, 171, 28, 11, 0, 22, 31, 112, 222, 196, 38, 206, 187, 178, 28, 251, 249, 0, 3, 44, 247, 9, 112, 255, - 2, 222, 255, 185, 239, 14, 255, 32, 223, 111, 47, 28, 253, 111, 251, 0, 2, 159, 117, 28, 66, 207, 253, 219, 47, 227, 176, 29, 106, 241, 122, 37, 66, 244, 104, 151, 32, 31, 243, 247, 47, 107, 223, 216, 48, 39, 81, 15, 251, 0, 5, 127, 174, 246, 31, 6, 240, 190, 186, 7, 253, 96, 31, 255, 141, 253, 47, 149, 16, 222, - 46, 123, 109, 147, 44, 31, 15, 215, 255, 7, 27, 147, 13, 19, 207, 47, 80, 79, 255, 249, 111, 241, 95, 247, 127, 128, 127, 221, 245, 111, 28, 167, 47, 222, 223, 102, 48, 102, 151, 142, 20, 56, 22, 18, 199, 46, 39, 32, 250, 120, 254, 151, 1, 253, 16, 0, 8, 161, 28, 188, 87, 24, 226, 191, 31, 198, 191, 31, 158, 223, - 239, 240, 27, 64, 3, 32, 11, 28, 222, 223, 245, 72, 67, 0, 244, 243, 4, 87, 137, 243, 17, 46, 32, 3, 241, 7, 202, 101, 50, 38, 216, 38, 220, 223, 30, 95, 223, 28, 72, 246, 239, 252, 188, 200, 94, 227, 219, 255, 98, 71, 85, 31, 242, 5, 31, 243, 2, 21, 148, 1, 21, 152, 49, 84, 80, 7, 1, 29, 38, 2, - 29, 18, 3, 29, 22, 31, 172, 243, 252, 4, 255, 231, 23, 42, 37, 27, 201, 152, 93, 28, 172, 255, 64, 3, 185, 171, 8, 29, 95, 124, 243, 255, 144, 1, 12, 31, 47, 45, 58, 127, 255, 159, 98, 120, 15, 44, 4, 31, 255, 33, 17, 72, 173, 239, 31, 76, 9, 29, 119, 0, 239, 46, 233, 247, 255, 217, 16, 159, 247, 255, - 128, 175, 247, 252, 255, 80, 207, 246, 16, 1, 46, 253, 7, 252, 44, 127, 29, 106, 255, 2, 239, 175, 253, 0, 72, 179, 31, 204, 248, 0, 31, 29, 30, 18, 63, 176, 12, 252, 255, 159, 32, 111, 255, 3, 18, 158, 40, 236, 50, 30, 248, 30, 211, 248, 93, 31, 253, 19, 95, 7, 37, 202, 127, 44, 147, 254, 149, 16, 95, 255, - 180, 1, 252, 223, 251, 255, 206, 255, 225, 31, 177, 33, 239, 233, 161, 255, 238, 44, 159, 207, 31, 250, 47, 36, 223, 77, 32, 7, 240, 80, 3, 45, 41, 254, 112, 31, 148, 14, 127, 31, 222, 127, 252, 159, 250, 239, 243, 6, 253, 242, 143, 176, 0, 16, 4, 69, 209, 2, 226, 98, 36, 106, 54, 38, 31, 67, 68, 58, 127, 23, - 140, 219, 207, 249, 33, 224, 230, 6, 49, 67, 174, 255, 241, 15, 255, 1, 142, 35, 64, 41, 166, 80, 3, 15, 96, 41, 178, 233, 81, 30, 141, 18, 139, 46, 206, 20, 120, 56, 151, 78, 61, 251, 32, 95, 199, 31, 247, 255, 254, 80, 22, 139, 193, 254, 203, 20, 87, 30, 206, 46, 40, 34, 102, 34, 106, 32, 93, 29, 17, 48, - 31, 186, 83, 87, 191, 7, 31, 7, 19, 245, 0, 155, 223, 253, 31, 207, 253, 14, 222, 1, 39, 226, 207, 0, 174, 31, 247, 24, 159, 21, 70, 146, 51, 227, 222, 175, 242, 64, 191, 31, 255, 220, 96, 31, 240, 247, 176, 0, 41, 189, 108, 174, 7, 255, 64, 171, 63, 19, 239, 63, 19, 63, 63, 31, 45, 95, 255, 245, 209, 0, - 111, 183, 31, 129, 1, 25, 96, 14, 217, 200, 142, 24, 105, 0, 0, 160, 3, 31, 136, 2, 250, 248, 0, 10, 239, 245, 30, 80, 240, 24, 108, 110, 64, 189, 5, 54, 81, 3, 111, 124, 246, 22, 85, 187, 251, 51, 186, 255, 233, 32, 38, 97, 153, 119, 85, 28, 31, 1, 31, 202, 13, 30, 239, 14, 31, 221, 4, 191, 244, 64, - 83, 22, 255, 235, 189, 255, 117, 201, 85, 48, 58, 63, 19, 43, 0, 31, 193, 60, 75, 191, 88, 28, 19, 223, 22, 200, 255, 255, 31, 69, 20, 196, 85, 71, 190, 12, 31, 203, 14, 0, 40, 236, 63, 16, 222, 255, 175, 207, 255, 253, 159, 143, 253, 112, 255, 175, 255, 112, 159, 244, 255, 64, 95, 255, 245, 255, 16, 79, 247, 254, - 0, 63, 255, 247, 251, 0, 79, 246, 248, 0, 111, 253, 245, 246, 0, 159, 243, 243, 33, 239, 175, 238, 255, 160, 189, 82, 207, 171, 169, 223, 30, 255, 175, 127, 31, 150, 95, 31, 41, 143, 244, 8, 86, 36, 37, 145, 78, 167, 241, 84, 191, 31, 22, 108, 16, 222, 47, 47, 126, 18, 103, 255, 233, 0, 175, 243, 11, 21, 43, 239, - 1, 0, 207, 50, 58, 10, 194, 255, 224, 255, 127, 248, 255, 208, 223, 244, 255, 211, 255, 255, 17, 255, 183, 255, 255, 234, 153, 191, 207, 23, 70, 255, 6, 207, 255, 217, 177, 255, 14, 255, 66, 245, 8, 255, 139, 242, 255, 4, 255, 182, 208, 3, 255, 176, 115, 189, 106, 31, 43, 64, 0, 223, 248, 77, 67, 223, 119, 21, 186, 223, - 255, 177, 31, 128, 254, 0, 191, 127, 30, 51, 191, 3, 192, 0, 159, 241, 1, 243, 35, 54, 241, 127, 19, 243, 32, 3, 73, 152, 169, 120, 18, 172, 1, 21, 157, 3, 32, 3, 31, 206, 3, 245, 255, 250, 205, 254, 95, 163, 218, 50, 55, 208, 85, 192, 3, 52, 30, 30, 133, 26, 201, 23, 23, 248, 9, 200, 255, 128, 31, 230, - 36, 194, 64, 19, 207, 34, 71, 77, 63, 118, 26, 171, 112, 0, 29, 106, 19, 2, 141, 188, 126, 94, 31, 89, 31, 29, 195, 191, 255, 135, 121, 108, 11, 255, 8, 255, 245, 49, 1, 255, 252, 16, 95, 26, 227, 252, 30, 95, 240, 1, 175, 255, 128, 115, 65, 212, 144, 0, 252, 74, 118, 22, 223, 56, 223, 146, 187, 15, 255, 5, - 41, 181, 144, 80, 3, 15, 255, 16, 31, 98, 67, 171, 85, 13, 126, 5, 255, 72, 209, 71, 15, 70, 3, 247, 1, 170, 159, 27, 203, 1, 41, 71, 2, 15, 255, 2, 244, 27, 180, 79, 26, 231, 24, 14, 95, 6, 30, 158, 251, 187, 186, 116, 77, 15, 161, 7, 95, 39, 155, 31, 223, 0, 66, 15, 255, 4, 72, 174, 195, 14, - 87, 12, 5, 26, 108, 0, 23, 190, 10, 231, 7, 118, 61, 127, 220, 185, 118, 15, 191, 7, 254, 200, 0, 122, 6, 106, 79, 255, 37, 32, 13, 125, 43, 47, 31, 159, 45, 41, 200, 222, 20, 85, 15, 255, 3, 128, 0, 2, 82, 15, 57, 13, 149, 46, 44, 217, 0, 223, 10, 158, 39, 20, 35, 15, 225, 4, 250, 102, 23, 227, - 16, 157, 28, 57, 15, 159, 5, 53, 32, 63, 127, 191, 157, 15, 255, 6, 241, 1, 255, 176, 224, 3, 77, 41, 73, 67, 15, 224, 3, 24, 246, 192, 13, 22, 15, 1, 136, 85, 14, 165, 5, 0, 222, 13, 16, 94, 74, 16, 98, 29, 156, 2, 65, 4, 255, 24, 255, 255, 128, 11, 255, 254, 32, 228, 2, 103, 113, 15, 225, 6, - 43, 227, 91, 15, 254, 6, 27, 113, 204, 3, 181, 15, 63, 9, 39, 194, 51, 48, 3, 61, 9, 30, 99, 214, 10, 247, 15, 128, 41, 13, 110, 43, 0, 69, 15, 255, 5, 122, 20, 127, 234, 80, 85, 50, 15, 255, 4, 80, 15, 251, 51, 122, 131, 46, 0, 0, 25, 255, 16, 2, 255, 27, 238, 105, 21, 202, 253, 135, 175, 191, - 169, 19, 232, 29, 152, 11, 246, 254, 32, 0, 63, 30, 123, 207, 83, 31, 195, 39, 124, 71, 41, 43, 160, 85, 31, 30, 105, 255, 171, 205, 170, 162, 14, 95, 1, 108, 93, 115, 139, 47, 247, 32, 191, 31, 239, 17, 17, 222, 95, 252, 152, 118, 127, 253, 244, 19, 53, 191, 253, 174, 159, 51, 16, 0, 111, 187, 122, 32, 11, 137, - 153, 153, 155, 176, 31, 0, 80, 119, 236, 144, 0, 8, 16, 11, 13, 129, 24, 19, 27, 35, 189, 3, 239, 227, 187, 189, 221, 218, 111, 227, 49, 223, 223, 251, 132, 211, 5, 80, 10, 0, 79, 253, 241, 127, 32, 143, 245, 191, 19, 47, 255, 119, 44, 3, 10, 255, 167, 127, 127, 128, 10, 193, 255, 0, 240, 15, 247, 0, 229, 94, - 252, 175, 64, 31, 163, 245, 31, 167, 243, 114, 26, 254, 117, 15, 62, 0, 59, 112, 70, 55, 251, 159, 31, 91, 111, 219, 254, 100, 142, 218, 253, 48, 29, 83, 247, 155, 127, 90, 175, 254, 239, 250, 84, 20, 239, 245, 189, 4, 175, 255, 86, 119, 118, 66, 111, 255, 118, 249, 33, 35, 127, 255, 214, 23, 111, 223, 227, 194, 41, 31, - 74, 25, 168, 12, 38, 76, 254, 31, 200, 175, 30, 9, 121, 24, 89, 191, 255, 112, 7, 60, 32, 30, 235, 252, 119, 191, 90, 103, 119, 91, 123, 244, 251, 141, 196, 12, 46, 188, 38, 155, 95, 255, 47, 72, 253, 32, 86, 223, 42, 243, 94, 27, 199, 143, 162, 215, 1, 19, 52, 30, 58, 147, 255, 255, 255, 29, 219, 185, 154, 1, - 152, 231, 0, 41, 11, 26, 165, 111, 255, 85, 87, 119, 191, 119, 124, 83, 181, 72, 255, 255, 184, 156, 115, 190, 191, 153, 153, 152, 44, 19, 45, 219, 144, 146, 250, 17, 17, 0, 165, 65, 45, 71, 197, 175, 254, 74, 31, 251, 12, 40, 162, 31, 247, 4, 47, 251, 44, 229, 202, 181, 112, 31, 179, 253, 64, 30, 149, 160, 30, 14, - 16, 230, 8, 159, 119, 57, 185, 112, 191, 5, 243, 70, 46, 237, 239, 255, 64, 29, 79, 237, 223, 191, 63, 96, 20, 67, 235, 29, 67, 77, 79, 254, 47, 167, 242, 175, 144, 29, 186, 169, 231, 32, 60, 212, 30, 165, 250, 31, 220, 30, 44, 7, 170, 112, 143, 255, 102, 43, 235, 176, 77, 121, 111, 30, 144, 251, 7, 255, 117, 11, - 205, 159, 191, 108, 80, 87, 28, 7, 192, 31, 30, 144, 21, 211, 32, 0, 175, 4, 31, 73, 45, 164, 208, 222, 43, 232, 92, 223, 44, 47, 251, 222, 95, 235, 1, 51, 64, 20, 15, 160, 20, 19, 16, 8, 197, 135, 84, 26, 103, 68, 19, 30, 66, 9, 29, 240, 95, 235, 255, 119, 120, 109, 183, 111, 31, 165, 143, 254, 200, 153, - 151, 175, 255, 96, 227, 227, 6, 128, 29, 47, 231, 25, 37, 215, 84, 1, 30, 30, 4, 29, 40, 6, 255, 147, 117, 28, 175, 255, 252, 9, 47, 219, 176, 20, 160, 247, 253, 95, 255, 143, 253, 223, 251, 27, 254, 242, 255, 11, 255, 175, 176, 9, 255, 20, 48, 254, 9, 255, 16, 104, 74, 255, 19, 63, 253, 229, 216, 83, 23, 45, - 171, 35, 203, 191, 85, 111, 159, 87, 30, 245, 191, 46, 10, 192, 31, 197, 242, 0, 6, 186, 185, 46, 73, 249, 0, 108, 30, 187, 159, 30, 191, 219, 157, 219, 31, 240, 4, 247, 52, 253, 255, 255, 255, 117, 191, 254, 33, 36, 255, 252, 153, 126, 130, 158, 50, 16, 255, 247, 89, 207, 110, 163, 62, 83, 183, 52, 30, 254, 221, 203, - 187, 17, 18, 63, 85, 31, 162, 234, 46, 220, 229, 104, 71, 212, 65, 111, 185, 181, 146, 36, 195, 0, 13, 27, 246, 4, 31, 128, 4, 168, 5, 26, 195, 13, 29, 252, 95, 42, 211, 44, 15, 29, 73, 125, 29, 110, 0, 255, 221, 219, 80, 35, 199, 2, 255, 255, 83, 255, 3, 255, 51, 255, 5, 223, 255, 33, 16, 3, 32, 175, - 5, 255, 64, 247, 7, 2, 255, 210, 31, 159, 255, 201, 0, 191, 28, 31, 233, 9, 255, 0, 96, 11, 255, 247, 0, 250, 175, 252, 31, 247, 247, 0, 205, 191, 219, 47, 101, 57, 32, 154, 207, 255, 48, 111, 44, 231, 0, 63, 29, 54, 15, 255, 20, 0, 236, 10, 149, 9, 79, 69, 121, 172, 46, 133, 48, 3, 254, 0, 125, 255, - 79, 255, 192, 2, 43, 196, 123, 35, 143, 120, 0, 17, 51, 100, 227, 255, 237, 207, 203, 185, 47, 219, 28, 206, 63, 43, 255, 252, 255, 95, 0, 59, 243, 1, 51, 85, 149, 94, 36, 91, 252, 45, 79, 153, 255, 248, 97, 46, 124, 170, 249, 29, 161, 243, 30, 57, 0, 67, 235, 43, 111, 41, 63, 42, 58, 47, 146, 241, 0, 111, - 247, 249, 122, 196, 255, 250, 63, 111, 31, 151, 26, 42, 0, 31, 186, 48, 111, 85, 29, 192, 96, 46, 155, 5, 26, 163, 8, 58, 155, 80, 205, 7, 13, 28, 107, 26, 151, 14, 47, 26, 89, 79, 173, 250, 67, 227, 191, 31, 230, 239, 242, 67, 247, 255, 54, 30, 139, 31, 1, 0, 99, 47, 25, 191, 245, 56, 159, 247, 111, 255, - 252, 191, 31, 215, 79, 143, 250, 253, 0, 21, 63, 255, 251, 151, 45, 127, 0, 175, 23, 42, 23, 79, 32, 171, 255, 251, 17, 95, 255, 249, 247, 0, 127, 245, 132, 0, 57, 251, 194, 101, 85, 85, 85, 117, 167, 85, 85, 186, 67, 31, 247, 112, 19, 90, 63, 8, 240, 31, 16, 207, 224, 87, 28, 15, 30, 46, 16, 255, 253, 112, - 218, 0, 49, 127, 252, 40, 187, 29, 8, 255, 46, 140, 255, 0, 6, 254, 175, 0, 3, 96, 9, 44, 93, 215, 29, 207, 31, 29, 178, 4, 51, 35, 74, 29, 150, 70, 33, 187, 35, 36, 226, 17, 166, 19, 36, 5, 168, 34, 17, 175, 17, 46, 90, 191, 43, 103, 244, 0, 85, 207, 191, 250, 115, 35, 117, 175, 250, 51, 221, 144, - 91, 118, 158, 127, 31, 234, 143, 150, 35, 189, 160, 0, 141, 54, 28, 222, 54, 51, 47, 63, 139, 182, 47, 166, 160, 127, 31, 170, 243, 1, 234, 255, 247, 3, 0, 189, 159, 16, 3, 191, 244, 2, 0, 31, 232, 111, 125, 31, 244, 191, 254, 166, 68, 239, 47, 239, 192, 69, 93, 35, 176, 64, 11, 49, 51, 31, 255, 106, 43, 30, - 95, 85, 31, 46, 12, 30, 105, 10, 30, 60, 9, 30, 64, 11, 31, 30, 68, 46, 84, 67, 214, 0, 3, 191, 255, 229, 59, 47, 107, 46, 187, 4, 198, 42, 31, 23, 8, 255, 63, 53, 198, 114, 43, 83, 33, 32, 37, 85, 119, 175, 128, 28, 139, 144, 28, 143, 112, 1, 17, 17, 246, 48, 6, 217, 191, 70, 44, 221, 219, 28, - 175, 251, 0, 175, 253, 189, 239, 82, 59, 169, 36, 208, 85, 82, 43, 59, 212, 36, 161, 107, 91, 43, 38, 37, 243, 188, 113, 15, 255, 25, 9, 255, 222, 252, 30, 131, 27, 165, 167, 80, 22, 52, 112, 31, 95, 27, 173, 191, 247, 21, 27, 21, 4, 17, 139, 47, 103, 16, 239, 22, 108, 44, 14, 97, 30, 234, 31, 250, 75, 139, - 45, 181, 39, 227, 49, 147, 193, 127, 31, 6, 254, 2, 255, 175, 247, 4, 255, 203, 6, 208, 80, 211, 60, 249, 95, 31, 251, 159, 253, 74, 31, 232, 111, 29, 240, 17, 62, 8, 29, 58, 31, 30, 134, 254, 159, 254, 96, 0, 8, 246, 32, 90, 113, 94, 24, 222, 183, 108, 247, 239, 247, 35, 53, 20, 138, 223, 253, 127, 55, 127, - 85, 87, 14, 255, 232, 255, 83, 83, 51, 53, 159, 253, 202, 80, 127, 20, 142, 224, 2, 85, 103, 48, 0, 219, 191, 151, 35, 93, 128, 4, 119, 136, 16, 12, 245, 33, 19, 71, 223, 31, 223, 7, 30, 170, 10, 85, 31, 84, 11, 29, 138, 13, 31, 92, 12, 30, 235, 9, 111, 16, 206, 3, 253, 76, 95, 253, 255, 96, 63, 24, - 21, 80, 37, 84, 20, 193, 64, 14, 22, 118, 23, 156, 27, 115, 47, 17, 219, 30, 241, 73, 42, 223, 111, 23, 154, 187, 179, 223, 29, 162, 255, 29, 24, 132, 45, 171, 1, 223, 190, 253, 16, 247, 209, 223, 253, 150, 32, 49, 87, 247, 254, 221, 220, 96, 30, 198, 224, 252, 185, 255, 153, 80, 241, 20, 0, 0, 240, 239, 242, 229, - 0, 240, 207, 47, 49, 45, 229, 79, 23, 146, 181, 63, 80, 251, 1, 175, 31, 218, 79, 69, 11, 2, 126, 82, 0, 0, 0, 184, 119, 120, 155, 109, 223, 247, 253, 85, 84, 50, 38, 139, 240, 0, 11, 239, 131, 0, 143, 30, 157, 79, 253, 138, 206, 119, 109, 252, 223, 255, 66, 62, 56, 63, 254, 0, 218, 19, 207, 47, 253, 0, - 191, 29, 207, 175, 22, 251, 215, 63, 112, 200, 207, 71, 43, 29, 251, 1, 109, 159, 240, 31, 94, 16, 3, 254, 96, 173, 218, 80, 117, 76, 10, 40, 239, 195, 31, 163, 247, 31, 118, 167, 95, 45, 59, 159, 31, 240, 207, 242, 155, 48, 239, 173, 244, 20, 39, 208, 29, 16, 176, 61, 30, 74, 5, 106, 19, 234, 79, 255, 35, 248, - 7, 30, 195, 30, 19, 92, 213, 207, 250, 71, 19, 255, 24, 120, 255, 28, 23, 185, 125, 20, 20, 85, 85, 191, 249, 223, 95, 191, 104, 238, 155, 255, 235, 49, 109, 6, 255, 228, 22, 236, 107, 30, 221, 111, 255, 21, 139, 17, 110, 183, 187, 187, 223, 205, 223, 67, 179, 0, 31, 236, 187, 187, 31, 53, 191, 85, 171, 41, 47, 251, - 255, 221, 221, 195, 97, 46, 176, 254, 37, 20, 163, 20, 151, 32, 3, 31, 255, 63, 2, 33, 127, 31, 254, 33, 55, 32, 63, 33, 67, 84, 239, 1, 23, 44, 21, 38, 55, 59, 167, 31, 151, 95, 20, 205, 95, 21, 194, 77, 242, 220, 248, 206, 16, 31, 15, 30, 233, 95, 35, 123, 251, 249, 0, 17, 111, 252, 122, 31, 187, 191, - 245, 254, 153, 0, 31, 34, 176, 253, 127, 106, 51, 76, 30, 189, 255, 40, 242, 22, 20, 151, 96, 151, 247, 31, 208, 169, 6, 50, 64, 96, 27, 138, 48, 63, 179, 43, 211, 63, 239, 255, 140, 225, 24, 235, 245, 143, 254, 80, 95, 54, 164, 1, 22, 141, 1, 239, 233, 157, 8, 255, 255, 144, 13, 14, 255, 16, 15, 95, 238, 250, - 0, 47, 20, 114, 63, 37, 223, 38, 23, 250, 227, 0, 255, 252, 32, 42, 123, 0, 31, 250, 94, 37, 119, 0, 33, 185, 254, 101, 141, 48, 79, 95, 42, 46, 197, 41, 77, 207, 37, 97, 241, 28, 212, 224, 25, 186, 138, 248, 54, 39, 23, 84, 20, 43, 183, 24, 56, 101, 31, 235, 190, 255, 53, 7, 7, 255, 65, 207, 69, 18, - 183, 189, 149, 90, 167, 1, 76, 255, 50, 38, 84, 254, 191, 48, 23, 19, 96, 191, 19, 51, 0, 191, 44, 19, 7, 31, 253, 112, 37, 18, 0, 192, 50, 75, 29, 139, 45, 144, 3, 33, 89, 224, 15, 255, 19, 23, 152, 15, 65, 10, 64, 101, 14, 221, 15, 239, 248, 70, 61, 15, 8, 36, 3, 47, 159, 24, 74, 58, 71, 51, - 15, 159, 7, 24, 98, 51, 13, 132, 5, 227, 73, 30, 111, 14, 63, 8, 87, 116, 15, 159, 11, 79, 254, 16, 223, 215, 3, 210, 50, 119, 137, 15, 255, 2, 240, 10, 255, 241, 128, 240, 0, 93, 31, 135, 5, 65, 8, 30, 66, 175, 86, 15, 255, 6, 144, 22, 8, 16, 55, 191, 0, 56, 15, 159, 4, 178, 245, 54, 123, 171, - 165, 15, 229, 7, 35, 83, 174, 15, 223, 8, 253, 180, 9, 184, 64, 0, 12, 15, 255, 7, 80, 255, 223, 252, 255, 48, 223, 209, 71, 16, 153, 21, 15, 127, 5, 14, 65, 14, 2, 158, 15, 160, 10, 45, 227, 19, 215, 51, 51, 39, 91, 39, 15, 255, 2, 254, 184, 96, 23, 51, 191, 1, 133, 9, 42, 51, 26, 0, 223, 8, - 48, 0, 238, 141, 198, 15, 160, 9, 44, 2, 44, 6, 7, 119, 15, 132, 35, 11, 123, 29, 203, 1, 174, 236, 100, 15, 255, 9, 15, 239, 249, 144, 0, 5, 1, 16, 0, 255, 7, 58, 7, 4, 173, 85, 2, 254, 6, 191, 31, 223, 26, 238, 1, 191, 7, 117, 231, 255, 183, 200, 55, 120, 0, 64, 4, 153, 153, 36, 84, 31, - 99, 6, 47, 103, 118, 15, 255, 2, 160, 92, 219, 15, 255, 48, 61, 12, 159, 18, 20, 15, 1, 137, 188, 160, 22, 58, 16, 118, 22, 62, 0, 2, 99, 125, 163, 79, 225, 31, 255, 114, 46, 82, 255, 255, 195, 39, 91, 40, 155, 255, 73, 123, 85, 3, 149, 2, 52, 72, 35, 15, 127, 223, 4, 29, 220, 47, 186, 248, 85, 41, - 253, 118, 32, 31, 251, 242, 47, 99, 121, 175, 191, 20, 121, 171, 187, 39, 185, 25, 147, 188, 182, 20, 39, 114, 159, 245, 191, 222, 166, 0, 89, 163, 57, 30, 218, 26, 175, 3, 111, 247, 54, 139, 96, 114, 85, 111, 23, 249, 255, 15, 47, 215, 134, 83, 49, 53, 238, 86, 119, 153, 174, 159, 119, 120, 153, 124, 127, 189, 111, 30, - 68, 191, 254, 187, 187, 190, 191, 146, 76, 31, 46, 253, 70, 63, 60, 143, 205, 201, 44, 131, 149, 30, 201, 1, 204, 68, 11, 46, 147, 127, 31, 158, 31, 27, 4, 41, 142, 255, 29, 194, 3, 30, 191, 11, 28, 151, 30, 1, 48, 91, 16, 134, 176, 29, 121, 112, 79, 111, 255, 200, 35, 221, 85, 83, 127, 158, 168, 119, 191, 31, - 8, 13, 241, 252, 50, 0, 9, 175, 255, 26, 122, 73, 115, 16, 255, 3, 114, 255, 80, 14, 253, 255, 112, 95, 129, 63, 28, 29, 8, 143, 255, 80, 10, 127, 255, 255, 243, 13, 12, 255, 250, 9, 1, 231, 207, 176, 2, 60, 37, 99, 230, 70, 120, 151, 186, 239, 104, 127, 168, 117, 89, 42, 152, 4, 149, 220, 147, 81, 45, 67, - 47, 19, 247, 64, 231, 41, 189, 14, 255, 123, 197, 210, 3, 140, 255, 178, 26, 144, 254, 191, 250, 254, 207, 255, 153, 32, 50, 147, 255, 174, 188, 90, 31, 235, 29, 30, 170, 223, 160, 26, 252, 224, 29, 231, 237, 240, 7, 255, 113, 160, 154, 0, 71, 27, 255, 148, 194, 31, 247, 26, 1, 125, 47, 71, 175, 45, 104, 180, 140, 150, - 88, 74, 63, 60, 239, 132, 223, 27, 17, 172, 96, 192, 244, 237, 187, 188, 33, 46, 104, 225, 212, 107, 59, 199, 137, 193, 31, 195, 47, 191, 28, 253, 79, 160, 158, 255, 20, 127, 15, 88, 119, 5, 87, 4, 91, 231, 0, 1, 211, 2, 83, 0, 5, 234, 223, 255, 228, 29, 126, 254, 60, 159, 130, 43, 195, 188, 11, 91, 199, 2, - 94, 0, 124, 31, 131, 28, 121, 254, 16, 175, 222, 249, 96, 33, 12, 30, 97, 255, 5, 255, 112, 2, 97, 94, 64, 12, 253, 254, 48, 255, 237, 221, 182, 78, 207, 222, 127, 44, 236, 223, 80, 7, 64, 175, 240, 191, 238, 241, 207, 68, 26, 146, 13, 255, 128, 26, 163, 207, 12, 169, 34, 183, 35, 169, 248, 0, 171, 222, 171, 247, - 31, 185, 244, 57, 253, 66, 28, 183, 5, 231, 246, 143, 255, 119, 64, 44, 45, 14, 255, 63, 211, 175, 249, 95, 28, 216, 77, 70, 133, 16, 0, 239, 173, 224, 30, 191, 128, 31, 5, 48, 3, 42, 253, 26, 239, 248, 120, 151, 27, 205, 255, 127, 255, 235, 186, 190, 30, 147, 0, 143, 245, 21, 159, 242, 30, 226, 82, 30, 97, 104, - 29, 8, 97, 29, 109, 25, 178, 4, 30, 194, 159, 7, 30, 215, 30, 85, 255, 255, 83, 51, 17, 251, 0, 44, 180, 139, 223, 58, 144, 255, 201, 205, 101, 255, 27, 196, 63, 134, 233, 153, 19, 227, 221, 247, 187, 111, 253, 17, 104, 103, 255, 111, 254, 253, 51, 52, 191, 255, 119, 112, 44, 31, 207, 253, 255, 221, 213, 187, 187, 184, - 63, 214, 202, 55, 27, 132, 19, 183, 0, 108, 26, 125, 0, 223, 243, 93, 57, 202, 2, 43, 44, 10, 255, 211, 31, 255, 96, 93, 28, 238, 221, 46, 44, 0, 1, 143, 38, 140, 239, 91, 41, 24, 0, 30, 170, 49, 17, 58, 219, 143, 255, 230, 252, 48, 175, 31, 162, 41, 191, 223, 246, 27, 18, 183, 243, 29, 248, 248, 117, 29, - 252, 255, 254, 103, 125, 31, 243, 230, 251, 187, 187, 102, 31, 130, 8, 123, 30, 197, 78, 255, 254, 222, 63, 66, 235, 222, 245, 255, 252, 255, 112, 28, 175, 112, 28, 187, 112, 170, 11, 64, 3, 64, 42, 36, 9, 27, 157, 8, 30, 92, 175, 7, 62, 96, 32, 69, 189, 0, 48, 123, 205, 223, 239, 80, 30, 49, 80, 191, 254, 221, - 112, 171, 32, 53, 82, 79, 46, 55, 95, 29, 187, 14, 255, 206, 49, 16, 61, 11, 60, 98, 251, 185, 239, 59, 127, 151, 242, 58, 243, 64, 3, 16, 28, 246, 16, 0, 93, 107, 30, 178, 14, 255, 133, 157, 44, 31, 22, 127, 245, 255, 4, 255, 127, 246, 12, 254, 95, 247, 255, 111, 248, 95, 247, 143, 255, 79, 249, 255, 8, 255, - 63, 249, 0, 239, 63, 250, 255, 0, 191, 224, 79, 255, 96, 130, 239, 191, 249, 22, 45, 212, 87, 28, 253, 191, 255, 237, 48, 131, 159, 31, 38, 105, 134, 30, 34, 4, 79, 31, 145, 47, 30, 88, 31, 24, 62, 255, 120, 153, 207, 81, 217, 17, 249, 28, 43, 242, 0, 84, 51, 255, 19, 16, 80, 0, 159, 224, 244, 1, 213, 255, - 240, 31, 210, 3, 31, 36, 8, 31, 239, 13, 84, 31, 243, 47, 92, 11, 159, 92, 15, 127, 59, 179, 47, 123, 30, 22, 232, 43, 238, 44, 63, 252, 0, 36, 87, 111, 227, 91, 62, 102, 143, 30, 245, 223, 248, 76, 188, 71, 64, 82, 23, 51, 97, 47, 27, 160, 44, 115, 31, 253, 95, 144, 3, 130, 63, 144, 3, 32, 107, 46, - 144, 75, 183, 96, 3, 112, 144, 3, 150, 96, 3, 255, 210, 46, 183, 111, 17, 64, 175, 248, 87, 193, 161, 242, 31, 97, 240, 29, 126, 30, 162, 50, 106, 28, 70, 175, 175, 99, 24, 198, 255, 44, 113, 0, 222, 219, 239, 253, 0, 16, 1, 255, 190, 16, 20, 45, 80, 157, 31, 19, 47, 31, 220, 250, 85, 84, 126, 219, 153, 239, - 135, 119, 255, 25, 175, 255, 255, 232, 16, 207, 123, 255, 37, 228, 50, 77, 254, 160, 0, 31, 213, 252, 192, 30, 212, 16, 54, 89, 111, 39, 35, 250, 245, 32, 0, 143, 244, 20, 115, 242, 31, 220, 242, 251, 6, 255, 147, 16, 137, 31, 200, 255, 255, 187, 215, 25, 79, 255, 255, 156, 39, 155, 3, 106, 239, 223, 159, 243, 71, 230, - 95, 254, 135, 122, 189, 10, 39, 175, 90, 205, 220, 200, 22, 172, 255, 239, 255, 218, 98, 47, 196, 79, 247, 0, 5, 21, 46, 227, 20, 84, 49, 187, 146, 159, 32, 233, 29, 125, 255, 238, 250, 66, 16, 22, 179, 255, 5, 190, 46, 175, 254, 19, 53, 57, 187, 187, 188, 95, 31, 253, 255, 57, 153, 153, 151, 51, 85, 87, 119, 94, - 31, 181, 20, 111, 151, 143, 255, 83, 67, 103, 35, 255, 143, 255, 85, 51, 143, 255, 169, 153, 190, 142, 31, 27, 255, 252, 16, 0, 235, 30, 51, 23, 29, 119, 62, 115, 39, 246, 49, 31, 216, 155, 187, 164, 20, 23, 165, 31, 7, 48, 3, 238, 19, 251, 3, 94, 183, 96, 7, 94, 46, 250, 211, 40, 198, 255, 249, 153, 52, 30, - 183, 95, 36, 166, 3, 30, 191, 2, 255, 241, 2, 112, 253, 239, 254, 239, 208, 159, 160, 21, 112, 144, 127, 30, 104, 128, 143, 249, 94, 112, 191, 241, 255, 10, 128, 191, 244, 10, 176, 111, 255, 218, 143, 242, 26, 152, 254, 119, 44, 25, 6, 30, 178, 45, 41, 108, 31, 175, 48, 25, 152, 48, 3, 33, 24, 255, 218, 253, 64, 16, - 7, 244, 3, 21, 139, 3, 26, 158, 255, 46, 255, 144, 1, 239, 254, 160, 13, 255, 255, 227, 176, 191, 255, 64, 181, 255, 255, 245, 86, 192, 111, 96, 159, 208, 2, 254, 0, 127, 254, 191, 244, 0, 226, 25, 39, 158, 32, 41, 43, 41, 47, 207, 243, 0, 88, 30, 130, 43, 24, 127, 23, 135, 16, 17, 153, 0, 127, 42, 63, 251, - 23, 64, 3, 30, 219, 63, 86, 127, 31, 43, 47, 251, 0, 249, 239, 31, 253, 108, 255, 31, 11, 32, 3, 229, 248, 15, 254, 84, 0, 15, 31, 148, 32, 55, 47, 43, 255, 243, 7, 161, 47, 224, 15, 249, 15, 244, 96, 14, 254, 11, 30, 191, 101, 26, 59, 30, 118, 187, 201, 31, 109, 18, 51, 0, 31, 51, 249, 6, 255, 255, - 192, 254, 11, 255, 96, 255, 94, 249, 255, 16, 197, 63, 252, 64, 84, 31, 56, 85, 229, 255, 248, 80, 40, 138, 31, 255, 10, 158, 166, 18, 55, 43, 144, 113, 83, 3, 33, 24, 43, 202, 135, 1, 119, 111, 195, 69, 85, 85, 111, 227, 221, 187, 187, 179, 153, 47, 220, 85, 105, 42, 171, 39, 232, 15, 255, 215, 84, 0, 25, 82, - 128, 26, 29, 176, 175, 254, 245, 152, 16, 239, 251, 21, 160, 247, 47, 128, 96, 105, 64, 3, 13, 64, 69, 43, 7, 87, 251, 45, 243, 175, 44, 52, 83, 29, 2, 221, 94, 232, 203, 16, 87, 251, 36, 115, 151, 208, 7, 255, 210, 44, 159, 9, 12, 159, 8, 48, 159, 252, 171, 197, 59, 104, 1, 15, 2, 4, 41, 44, 43, 25, - 255, 125, 13, 195, 6, 240, 0, 159, 243, 128, 16, 3, 16, 229, 0, 71, 113, 15, 162, 6, 15, 160, 10, 72, 36, 119, 0, 172, 54, 14, 255, 8, 96, 55, 4, 7, 38, 30, 201, 14, 159, 6, 119, 46, 163, 51, 50, 17, 14, 191, 7, 255, 221, 221, 190, 221, 15, 95, 8, 254, 0, 203, 187, 182, 15, 35, 10, 95, 47, 251, - 11, 15, 159, 8, 208, 30, 255, 254, 128, 231, 2, 35, 48, 15, 63, 8, 24, 151, 146, 2, 85, 191, 64, 15, 223, 4, 242, 1, 255, 88, 176, 1, 72, 45, 255, 85, 15, 255, 2, 24, 246, 23, 34, 166, 0, 61, 4, 30, 63, 171, 112, 15, 222, 12, 143, 27, 239, 127, 29, 183, 6, 80, 14, 15, 255, 4, 109, 165, 15, 94, - 7, 38, 19, 223, 237, 187, 15, 191, 8, 253, 255, 254, 153, 152, 119, 114, 11, 73, 71, 7, 81, 30, 35, 9, 40, 33, 0, 15, 161, 5, 205, 67, 239, 255, 238, 158, 64, 11, 227, 213, 15, 255, 5, 67, 87, 68, 72, 83, 130, 95, 62, 139, 9, 30, 114, 20, 21, 0, 18, 19, 122, 32, 2, 19, 20, 0, 15, 22, 34, 16, - 32, 14, 255, 6, 7, 0, 17, 18, 0, 14, 15, 224, 0, 23, 24, 80, 26, 16, 35, 16, 41, 160, 35, 16, 53, 223, 24, 25, 32, 38, 19, 20, 1, 13, 15, 127, 16, 50, 2, 22, 27, 1, 9, 13, 1, 193, 12, 14, 16, 2, 32, 26, 16, 29, 16, 62, 16, 65, 25, 155, 26, 32, 2, 16, 44, 22, 23, 80, 5, 21, - 22, 1, 32, 20, 16, 14, 64, 23, 64, 32, 112, 11, 16, 116, 16, 89, 26, 128, 27, 128, 26, 112, 68, 16, 20, 112, 32, 112, 59, 160, 11, 160, 74, 127, 160, 68, 22, 23, 2, 5, 9, 67, 77, 178, 65, 27, 217, 1, 88, 56, 235, 100, 65, 80, 59, 82, 171, 65, 30, 209, 66, 20, 85, 67, 28, 119, 68, 0, 255, 4, - 0, 69, 0, 5, 0, 70, 0, 234, 6, 0, 72, 31, 87, 73, 26, 177, 75, 31, 157, 174, 76, 22, 189, 77, 19, 253, 78, 0, 12, 17, 63, 174, 13, 16, 57, 14, 31, 74, 15, 0, 82, 31, 240, 251, 83, 0, 17, 0, 84, 22, 209, 85, 0, 255, 19, 0, 86, 0, 20, 0, 87, 0, 255, 21, 0, 88, 0, 22, 0, 89, - 0, 191, 23, 26, 147, 24, 0, 105, 0, 25, 32, 255, 38, 0, 26, 48, 2, 0, 27, 48, 255, 10, 0, 28, 48, 11, 0, 29, 78, 255, 13, 0, 30, 78, 59, 0, 31, 78, 255, 102, 0, 32, 78, 142, 0, 33, 79, 255, 127, 0, 34, 79, 221, 0, 35, 81, 255, 73, 0, 36, 81, 101, 0, 37, 81, 255, 115, 0, 38, 81, - 146, 0, 39, 82, 255, 155, 0, 40, 83, 214, 0, 41, 84, 255, 47, 0, 42, 87, 40, 0, 43, 89, 255, 39, 0, 44, 91, 88, 0, 45, 96, 255, 197, 0, 46, 98, 15, 0, 47, 98, 255, 22, 0, 48, 99, 210, 0, 49, 101, 255, 224, 0, 50, 102, 14, 0, 51, 103, 255, 58, 0, 52, 103, 229, 0, 53, 104, 255, 173, 0, - 54, 107, 39, 0, 55, 107, 255, 99, 0, 56, 108, 179, 0, 57, 108, 255, 213, 0, 58, 110, 56, 0, 59, 110, 255, 144, 0, 60, 117, 40, 0, 61, 117, 255, 53, 0, 62, 118, 132, 0, 63, 119, 255, 11, 0, 64, 120, 159, 0, 65, 122, 255, 127, 0, 66, 126, 167, 0, 67, 137, 255, 129, 0, 68, 139, 230, 0, 69, 139, 255, - 244, 0, 70, 139, 247, 0, 71, 139, 255, 251, 0, 72, 141, 133, 0, 73, 145, 255, 205, 0, 74, 148, 246, 0, 75, 149, 255, 237, 0, 76, 150, 105, 0, 77, 154, 160, 108, 28, 189, 1, 66, 73, 79, 249, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, - 3, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 3, 224, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 2, 192, 64, 3, 112, 1, 1, 64, 27, 0, 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, 79, 79, 84, 32, 27, 112, 143, 63, 48, 31, 0, 2, 1, 133, - 53, 17, 0, 0, 14, 90, 80, 74, 128, 64, 81, 226, 226, 16, 19, 26, 80, 15, 186, 160, 48, 107, 2, 207, 45, 16, 39, 40, 16, 127, 190, 32, 96, 19, 255, 255, 0, 46, 2, 128, 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, 3, 10, 46, 0, 46, 46, 0, 107, 114, 255, 107, 111, 114, 101, - 97, 110, 0, 109, 255, 101, 115, 115, 97, 103, 101, 46, 98, 223, 109, 103, 96, 11, 105, 100, 46, 116, 98, 255, 108, 0, 115, 116, 114, 117, 99, 116, 61, 48, 10, 176, 198, 77, 69, 83, 71, 16, 45, 49, 110, 80, 187, 2, 2, 208, 228, 73, 78, 70, 16, 27, 252, 0, 96, 0, 6, 0, 12, 49, 62, 113, 56, 85, 48, 159, - 2, 144, 11, 44, 144, 23, 86, 144, 35, 174, 79, 144, 47, 196, 144, 59, 49, 130, 68, 65, 84, 49, 127, 65, 151, 194, 136, 211, 124, 0, 32, 185, 251, 200, 185, 172, 198, 36, 17, 171, 87, 0, 255, 105, 0, 105, 185, 124, 0, 10, 177, 255, 35, 197, 180, 0, 32, 200, 252, 194, 235, 237, 194, 220, 16, 25, 46, 0, 41, 26, - 181, 20, 247, 194, 164, 208, 108, 16, 69, 32, 189, 136, 255, 183, 236, 198, 36, 201, 192, 0, 32, 255, 186, 187, 213, 136, 194, 181, 178, 200, 223, 178, 228, 17, 60, 10, 199, 144, 193, 56, 255, 213, 92, 0, 32, 176, 180, 198, 169, 254, 199, 64, 0, 10, 188, 248, 204, 16, 109, 255, 192, 172, 198, 169, 193, 36, 186, 133, 219, 193, - 28, 32, 59, 199, 125, 0, 129, 18, 0, 0, 254, 199, 64, 213, 88, 172, 196, 184, 16, 77, 255, 181, 160, 176, 152, 178, 148, 0, 32, 255, 179, 0, 186, 168, 213, 216, 0, 33, 79, 1, 197, 11, 6, 81, 71, 18, 27, 0, 8, 33, 157, 223, 67, 98, 49, 251, 4, 0, 6, 4, 56, 212, 56, 178, 82, 7, 0, 210, 175, 8, - 81, 123, 34, 51, 171, 3, 18, 219, 24, 18, 223, 4, 146, 199, 43, 67, 255, 79, 77, 77, 69, 78, 84, 0, 68, 253, 73, 83, 67, 95, 48, 49, 80, 7, 50, 127, 80, 15, 51, 0, 84, 73, 84, 76, 69, 251, 95, 77, 65, 73, 78, 80, 10, 83, 85, 229, 66, 0, 64, 0, 0, 0, 144, 111, 112, 35, 67, 174, 239, 55, - 113, 97, 96, 147, 28, 19, 62, 141, 124, 80, 171, 0, 190, 198, 20, 162, 50, 179, 16, 153, 247, 100, 67, 164, 76, 50, 191, 12, 0, 0, 243, 19, 54, 175, 66, 50, 203, 18, 221, 137, 230, 191, 39, 66, 215, 20, 0, 0, 251, 104, 17, 158, 53, 50, 227, 16, 185, 23, 177, 123, 254, 50, 239, 170, 28, 115, 149, 4, 81, 23, - 7, 80, 235, 9, 19, 191, 160, 10, 19, 195, 11, 224, 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 163, 192, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 163, 192, 243, 0, 0, - 0, 32, 16, 3, 16, 7, 162, 224, 42, 64, 3, 112, 1, 1, 80, 27, 3, 16, 35, 64, 80, 3, 239, 128, 0, 3, 32, 22, 0, 0, 82, 79, 220, 79, 84, 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, 253, 67, 212, 17, 0, 0, 18, 64, 79, 162, 190, 220, 32, 87, 255, 255, 0, 46, 2, 128, 96, 172, 16, 80, 19, - 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 32, 131, 46, 0, 46, 46, 0, 101, 109, 255, 98, 101, 100, 100, 101, 100, 102, 111, 255, 110, 116, 0, 109, 101, 115, 115, 97, 223, 103, 101, 32, 11, 50, 54, 46, 98, 114, 159, 102, 16, 19, 0, 0, 8, 82, 70, 78, 84, 254, 239, 255, 1, 4, 48, 123, 16, 0, 4, 70, 237, - 73, 78, 70, 32, 235, 1, 33, 16, 241, 27, 191, 27, 32, 219, 56, 0, 0, 160, 104, 0, 255, 0, 161, 120, 33, 27, 26, 0, 84, 239, 71, 76, 80, 16, 15, 48, 26, 27, 22, 169, 26, 48, 154, 10, 49, 1, 9, 16, 49, 33, 18, 96, 159, 0, 0, 0, 255, 1, 17, 240, 7, 255, 251, 0, 6, 117, 16, 3, 5, 255, - 250, 16, 3, 249, 48, 3, 3, 75, 48, 3, 247, 2, 46, 79, 32, 99, 2, 16, 103, 1, 255, 174, 246, 16, 3, 245, 48, 3, 0, 221, 212, 67, 190, 215, 124, 177, 0, 251, 83, 13, 19, 208, 10, 255, 253, 243, 0, 0, 158, 228, 3, 30, 255, 4, 47, 87, 4, 32, 247, 0, 3, 239, 243, 17, 139, 251, 0, 14, 127, 17, - 139, 6, 255, 248, 0, 0, 39, 80, 85, 4, 174, 222, 8, 22, 199, 79, 22, 203, 223, 35, 149, 0, 255, 0, 31, 255, 0, 39, 97, 0, 9, 254, 255, 254, 64, 191, 255, 255, 242, 22, 91, 235, 252, 255, 253, 22, 97, 192, 16, 13, 48, 79, 101, 19, 169, 14, 255, 230, 179, 38, 224, 176, 23, 12, 241, 45, 23, 16, 3, 189, - 20, 143, 22, 175, 239, 255, 20, 0, 255, 213, 0, 12, 20, 0, 47, 20, 0, 127, 22, 225, 207, 254, 255, 175, 1, 255, 255, 79, 241, 19, 25, 167, 128, 20, 25, 16, 22, 218, 23, 99, 239, 103, 155, 220, 222, 255, 128, 0, 253, 207, 252, 39, 15, 39, 19, 105, 23, 89, 255, 184, 23, 27, 254, 55, 31, 23, 35, 16, 159, 0, - 35, 202, 6, 111, 14, 5, 255, 255, 7, 9, 109, 20, 127, 9, 239, 17, 239, 2, 82, 247, 130, 117, 234, 49, 0, 31, 23, 219, 15, 23, 223, 13, 87, 195, 115, 183, 166, 255, 243, 0, 48, 103, 36, 170, 33, 16, 126, 6, 221, 50, 19, 86, 4, 190, 255, 255, 17, 14, 206, 255, 2, 71, 203, 184, 22, 119, 117, 65, 23, 255, - 202, 255, 232, 97, 4, 7, 186, 6, 209, 24, 144, 250, 7, 108, 18, 250, 255, 202, 118, 0, 35, 21, 128, 2, 21, 132, 151, 1, 20, 132, 96, 3, 0, 48, 3, 254, 84, 69, 191, 141, 24, 79, 9, 255, 0, 4, 207, 255, 255, 22, 223, 255, 254, 175, 255, 254, 129, 251, 143, 255, 234, 97, 111, 24, 104, 41, 189, 50, 72, 108, - 20, 185, 0, 244, 25, 0, 163, 45, 128, 25, 16, 141, 249, 7, 236, 19, 65, 173, 50, 3, 0, 223, 144, 3, 207, 126, 24, 199, 121, 135, 0, 0, 24, 255, 66, 143, 247, 42, 255, 54, 140, 113, 250, 250, 255, 255, 233, 183, 32, 100, 25, 113, 255, 32, 3, 24, 113, 255, 165, 48, 64, 135, 226, 168, 252, 8, 108, 152, 59, 49, - 99, 0, 187, 191, 38, 8, 255, 0, 95, 22, 12, 223, 255, 255, 209, 3, 255, 255, 64, 20, 119, 100, 93, 33, 239, 251, 98, 244, 251, 134, 140, 32, 234, 60, 76, 170, 43, 48, 81, 235, 19, 36, 0, 246, 74, 132, 58, 140, 85, 9, 107, 18, 9, 22, 119, 12, 20, 235, 14, 22, 251, 15, 95, 48, 3, 247, 19, 134, 253, 0, - 8, 255, 255, 207, 177, 1, 2, 95, 9, 26, 239, 22, 184, 120, 173, 67, 2, 127, 7, 197, 82, 23, 9, 239, 15, 35, 235, 35, 251, 0, 41, 167, 239, 27, 67, 2, 2, 29, 0, 115, 238, 254, 87, 119, 158, 100, 243, 97, 51, 247, 112, 0, 0, 146, 10, 88, 55, 242, 19, 87, 4, 174, 20, 20, 27, 72, 3, 3, 127, 2, - 37, 27, 173, 21, 6, 96, 32, 143, 3, 127, 10, 96, 2, 255, 22, 254, 212, 185, 134, 19, 127, 255, 24, 240, 255, 24, 132, 128, 3, 109, 84, 197, 51, 88, 35, 19, 5, 239, 27, 228, 63, 42, 43, 77, 27, 236, 6, 18, 234, 5, 18, 238, 8, 18, 242, 186, 13, 21, 28, 0, 255, 242, 28, 19, 249, 83, 177, 69, 96, 57, - 253, 64, 19, 3, 127, 20, 227, 123, 191, 80, 3, 87, 183, 118, 28, 176, 111, 80, 25, 157, 80, 2, 191, 239, 255, 185, 223, 117, 122, 179, 255, 253, 130, 204, 0, 83, 44, 139, 19, 248, 255, 208, 69, 127, 23, 49, 223, 0, 112, 11, 224, 157, 1, 51, 85, 103, 9, 158, 255, 65, 239, 33, 243, 5, 207, 234, 151, 22, 131, 239, - 210, 0, 159, 16, 213, 239, 255, 181, 121, 213, 155, 188, 33, 235, 128, 29, 87, 144, 32, 3, 118, 220, 85, 51, 125, 91, 87, 120, 152, 12, 206, 47, 45, 176, 255, 6, 255, 254, 223, 9, 255, 250, 223, 250, 12, 255, 247, 101, 13, 51, 135, 243, 48, 3, 243, 14, 255, 252, 85, 45, 206, 96, 3, 84, 51, 185, 17, 168, 176, 133, - 87, 172, 1, 225, 20, 13, 115, 10, 10, 90, 98, 231, 77, 46, 55, 54, 119, 3, 127, 1, 252, 71, 112, 247, 252, 132, 117, 66, 13, 189, 80, 2, 52, 85, 167, 103, 32, 147, 9, 80, 3, 239, 19, 120, 153, 171, 169, 181, 30, 227, 247, 30, 231, 249, 32, 3, 14, 79, 46, 6, 248, 153, 135, 118, 0, 13, 27, 240, 37, 0, - 33, 124, 171, 13, 24, 65, 12, 31, 97, 11, 48, 3, 254, 85, 222, 67, 50, 183, 213, 221, 221, 221, 48, 31, 99, 21, 48, 3, 32, 11, 14, 207, 47, 11, 28, 240, 9, 112, 3, 250, 93, 21, 120, 251, 61, 16, 7, 255, 234, 15, 43, 227, 17, 253, 52, 48, 0, 175, 255, 144, 19, 127, 176, 81, 26, 26, 176, 15, 255, 1, - 37, 38, 53, 42, 56, 31, 255, 159, 85, 239, 255, 67, 40, 19, 176, 80, 3, 160, 6, 127, 19, 208, 223, 0, 111, 20, 193, 95, 255, 240, 0, 79, 253, 255, 240, 4, 159, 255, 252, 36, 15, 8, 23, 84, 19, 80, 99, 32, 103, 175, 16, 156, 191, 222, 255, 171, 251, 27, 10, 252, 27, 14, 253, 27, 18, 219, 223, 81, 16, 169, - 0, 112, 3, 128, 70, 139, 160, 3, 14, 127, 15, 127, 40, 30, 228, 66, 119, 247, 18, 115, 247, 82, 15, 34, 7, 17, 255, 228, 16, 0, 17, 59, 139, 112, 3, 239, 106, 238, 34, 138, 86, 58, 127, 80, 208, 3, 64, 73, 11, 239, 48, 5, 127, 149, 210, 17, 50, 51, 2, 11, 31, 255, 32, 3, 10, 43, 139, 197, 255, 252, - 56, 151, 40, 155, 15, 127, 80, 253, 31, 131, 254, 85, 31, 135, 255, 48, 3, 5, 64, 3, 16, 32, 3, 4, 23, 44, 68, 15, 255, 77, 25, 227, 32, 25, 231, 48, 3, 255, 186, 221, 1, 177, 115, 3, 69, 82, 50, 138, 13, 29, 221, 155, 12, 8, 64, 4, 27, 105, 45, 248, 31, 44, 255, 0, 170, 78, 12, 127, 8, 177, - 31, 255, 227, 4, 254, 21, 11, 29, 246, 95, 29, 131, 4, 29, 135, 63, 8, 255, 253, 239, 26, 119, 139, 30, 112, 17, 131, 252, 79, 55, 123, 246, 29, 219, 237, 64, 0, 255, 16, 84, 254, 32, 74, 231, 252, 170, 32, 11, 235, 48, 5, 64, 103, 207, 27, 107, 23, 33, 135, 84, 29, 115, 48, 30, 119, 80, 30, 123, 96, 44, - 72, 27, 26, 89, 30, 79, 228, 45, 115, 161, 44, 26, 131, 62, 155, 3, 98, 44, 167, 11, 245, 91, 122, 127, 255, 44, 255, 225, 224, 20, 101, 15, 255, 142, 5, 49, 26, 89, 25, 197, 143, 20, 255, 207, 114, 21, 115, 255, 255, 112, 44, 119, 47, 142, 8, 47, 76, 9, 13, 75, 77, 35, 247, 34, 103, 36, 254, 15, 17, 227, - 76, 131, 245, 91, 28, 143, 248, 26, 220, 255, 151, 5, 57, 9, 0, 137, 213, 190, 255, 15, 112, 47, 9, 111, 103, 78, 8, 255, 7, 16, 121, 71, 239, 253, 48, 118, 83, 14, 88, 82, 41, 228, 239, 75, 76, 11, 4, 15, 223, 4, 45, 219, 64, 11, 107, 6, 66, 16, 36, 28, 74, 36, 211, 255, 33, 63, 9, 0, 17, 255, - 78, 115, 40, 243, 170, 15, 31, 206, 47, 62, 127, 239, 23, 123, 159, 23, 135, 154, 79, 39, 66, 27, 222, 0, 241, 79, 227, 4, 27, 227, 175, 11, 31, 239, 47, 30, 107, 175, 255, 96, 2, 181, 255, 16, 46, 16, 143, 20, 195, 239, 73, 19, 80, 127, 48, 3, 239, 255, 112, 255, 127, 255, 128, 206, 250, 95, 39, 29, 15, 255, - 13, 223, 255, 13, 31, 254, 180, 9, 16, 179, 4, 6, 24, 250, 8, 54, 11, 39, 10, 102, 30, 201, 2, 65, 23, 203, 25, 140, 242, 127, 63, 248, 127, 16, 99, 249, 111, 255, 255, 208, 8, 255, 95, 19, 249, 55, 33, 1, 0, 0, 242, 63, 255, 254, 160, 176, 63, 255, 176, 48, 63, 28, 133, 95, 64, 3, 240, 27, 191, 240, - 0, 31, 255, 241, 247, 0, 2, 17, 16, 15, 255, 144, 18, 0, 0, 202, 174, 251, 61, 250, 31, 239, 96, 31, 243, 192, 22, 119, 182, 242, 22, 135, 249, 5, 79, 127, 36, 0, 31, 153, 13, 42, 40, 29, 242, 46, 11, 31, 147, 2, 255, 95, 238, 239, 202, 97, 0, 79, 243, 46, 107, 252, 104, 28, 16, 72, 3, 138, 255, 65, - 34, 1, 254, 14, 92, 251, 249, 24, 243, 243, 28, 135, 223, 243, 111, 16, 3, 13, 11, 255, 243, 4, 86, 16, 3, 0, 24, 222, 207, 30, 94, 191, 251, 25, 107, 117, 24, 107, 159, 255, 225, 29, 25, 252, 25, 161, 255, 232, 160, 223, 159, 47, 156, 80, 8, 243, 0, 21, 57, 72, 151, 174, 32, 10, 254, 18, 243, 59, 118, 11, - 223, 245, 15, 193, 3, 107, 27, 138, 255, 1, 18, 92, 0, 21, 124, 0, 0, 202, 55, 98, 255, 62, 80, 255, 144, 14, 119, 60, 42, 40, 25, 58, 32, 242, 239, 255, 21, 119, 81, 45, 143, 178, 111, 9, 85, 15, 255, 10, 246, 8, 128, 20, 255, 21, 127, 254, 31, 114, 226, 21, 33, 255, 22, 255, 28, 126, 248, 29, 251, 244, - 62, 7, 250, 213, 102, 175, 25, 206, 4, 45, 7, 111, 31, 205, 13, 69, 31, 209, 8, 38, 182, 53, 0, 30, 4, 255, 106, 239, 243, 0, 86, 171, 18, 4, 37, 182, 47, 213, 3, 254, 18, 44, 246, 41, 123, 21, 239, 163, 128, 30, 239, 253, 27, 3, 20, 119, 23, 219, 0, 8, 87, 42, 119, 2, 80, 111, 30, 31, 41, 207, - 133, 86, 158, 159, 111, 255, 46, 18, 196, 87, 118, 65, 64, 111, 75, 39, 35, 242, 75, 7, 34, 131, 160, 12, 184, 155, 35, 86, 215, 6, 207, 79, 255, 4, 63, 108, 252, 169, 0, 157, 52, 67, 140, 37, 131, 119, 118, 82, 47, 127, 232, 118, 97, 239, 85, 85, 142, 31, 39, 1, 239, 30, 20, 202, 207, 16, 65, 151, 63, 255, - 209, 99, 127, 48, 156, 3, 67, 14, 29, 18, 1, 64, 103, 129, 177, 97, 185, 40, 99, 223, 255, 253, 16, 1, 143, 255, 37, 175, 63, 129, 254, 127, 16, 166, 178, 127, 255, 179, 0, 91, 113, 81, 72, 107, 80, 83, 243, 226, 86, 15, 15, 157, 36, 40, 203, 191, 84, 32, 3, 221, 15, 221, 2, 80, 86, 103, 96, 14, 140, 92, - 3, 127, 241, 169, 7, 3, 127, 10, 253, 34, 15, 87, 34, 23, 35, 239, 247, 85, 30, 243, 241, 78, 123, 250, 90, 135, 166, 42, 187, 253, 83, 5, 21, 50, 108, 47, 3, 41, 15, 255, 6, 22, 7, 0, 239, 111, 26, 38, 5, 181, 14, 111, 54, 19, 86, 4, 190, 93, 75, 251, 2, 5, 95, 1, 119, 117, 48, 43, 139, 197, - 47, 5, 127, 14, 47, 250, 247, 15, 2, 18, 239, 233, 117, 0, 170, 36, 30, 108, 5, 48, 3, 252, 30, 0, 251, 48, 3, 125, 40, 140, 7, 255, 251, 67, 70, 38, 3, 6, 93, 31, 115, 12, 25, 143, 223, 255, 1, 22, 249, 30, 255, 255, 255, 248, 159, 255, 251, 48, 191, 82, 16, 251, 253, 95, 144, 253, 87, 135, 4, 251, - 31, 7, 31, 235, 43, 23, 124, 48, 3, 9, 112, 3, 248, 31, 4, 247, 0, 247, 2, 52, 82, 127, 75, 7, 177, 1, 207, 10, 30, 164, 41, 167, 28, 128, 25, 134, 239, 31, 255, 28, 236, 123, 9, 33, 251, 45, 31, 17, 146, 50, 7, 96, 12, 135, 148, 22, 99, 24, 140, 239, 63, 120, 25, 220, 31, 15, 231, 10, 31, 255, - 70, 255, 246, 250, 16, 87, 118, 33, 239, 253, 64, 30, 18, 169, 244, 34, 237, 32, 44, 152, 6, 24, 129, 39, 36, 0, 221, 55, 176, 12, 127, 48, 255, 251, 2, 40, 95, 43, 103, 46, 203, 23, 207, 37, 145, 127, 243, 137, 135, 119, 71, 41, 95, 255, 18, 219, 16, 150, 46, 3, 176, 107, 255, 76, 31, 28, 45, 27, 96, 27, - 51, 138, 223, 39, 109, 15, 181, 45, 30, 25, 73, 29, 123, 48, 251, 0, 1, 51, 51, 12, 127, 1, 190, 245, 31, 14, 112, 255, 235, 113, 0, 10, 204, 86, 246, 8, 205, 221, 239, 17, 23, 255, 11, 8, 223, 2, 234, 1, 17, 50, 31, 158, 249, 80, 3, 251, 13, 127, 51, 235, 51, 17, 143, 31, 206, 95, 0, 3, 2, 255, - 254, 212, 221, 217, 27, 217, 0, 112, 3, 240, 192, 3, 15, 106, 49, 165, 63, 0, 3, 5, 47, 61, 255, 160, 111, 241, 128, 3, 253, 149, 209, 8, 228, 155, 15, 255, 8, 4, 27, 82, 13, 18, 220, 79, 117, 27, 236, 191, 255, 192, 31, 255, 96, 35, 138, 9, 48, 99, 98, 63, 255, 5, 138, 236, 123, 45, 185, 31, 255, 35, - 47, 201, 0, 201, 84, 255, 60, 148, 32, 76, 119, 60, 3, 112, 1, 10, 127, 18, 47, 243, 74, 235, 42, 243, 42, 251, 43, 3, 29, 11, 112, 194, 0, 207, 30, 12, 28, 123, 80, 103, 20, 243, 1, 92, 255, 121, 45, 11, 111, 255, 33, 57, 35, 25, 92, 127, 80, 18, 92, 243, 93, 7, 45, 19, 224, 1, 253, 19, 106, 239, - 25, 47, 107, 175, 4, 15, 255, 1, 255, 67, 131, 250, 32, 103, 100, 92, 15, 255, 0, 64, 15, 255, 61, 1, 35, 66, 27, 251, 37, 243, 33, 47, 7, 3, 94, 3, 85, 65, 123, 97, 11, 207, 255, 45, 114, 254, 161, 128, 30, 28, 128, 13, 255, 20, 33, 231, 37, 82, 30, 115, 16, 85, 30, 131, 64, 31, 143, 96, 31, 247, - 160, 21, 139, 208, 42, 31, 229, 31, 246, 10, 30, 131, 14, 30, 135, 79, 30, 139, 151, 175, 74, 171, 44, 179, 13, 28, 168, 95, 255, 246, 21, 46, 160, 36, 4, 45, 189, 240, 91, 251, 48, 15, 116, 26, 13, 85, 31, 232, 8, 31, 248, 3, 106, 243, 95, 71, 107, 0, 171, 2, 44, 127, 5, 27, 6, 224, 30, 163, 96, 110, - 15, 29, 23, 22, 2, 56, 111, 29, 34, 0, 255, 193, 0, 223, 0, 116, 3, 130, 179, 49, 0, 11, 239, 246, 82, 31, 3, 247, 30, 235, 247, 31, 229, 40, 6, 250, 49, 18, 157, 6, 32, 232, 15, 194, 2, 44, 168, 96, 23, 43, 242, 84, 31, 145, 243, 79, 225, 110, 19, 130, 143, 65, 159, 60, 55, 85, 92, 191, 6, 78, - 159, 96, 81, 155, 192, 93, 155, 112, 85, 156, 47, 4, 30, 122, 2, 78, 44, 48, 19, 111, 96, 93, 31, 229, 128, 23, 135, 192, 0, 31, 26, 81, 12, 70, 30, 140, 207, 31, 160, 22, 131, 29, 27, 247, 8, 24, 247, 110, 24, 139, 251, 47, 28, 139, 143, 255, 191, 28, 145, 213, 111, 255, 24, 147, 253, 50, 172, 47, 30, 176, - 111, 118, 21, 157, 191, 255, 176, 25, 183, 80, 40, 30, 210, 149, 223, 116, 63, 15, 156, 9, 6, 108, 235, 45, 47, 107, 70, 87, 250, 95, 248, 16, 109, 224, 16, 100, 48, 0, 191, 146, 64, 78, 243, 218, 127, 225, 36, 178, 59, 3, 118, 7, 32, 51, 253, 4, 16, 0, 5, 207, 160, 49, 91, 30, 90, 7, 223, 2, 3, 31, - 113, 30, 248, 61, 51, 8, 15, 255, 8, 21, 46, 15, 8, 156, 19, 49, 163, 207, 31, 223, 63, 31, 227, 9, 143, 255, 68, 231, 63, 235, 31, 127, 10, 255, 80, 79, 253, 255, 253, 226, 239, 255, 242, 31, 120, 96, 25, 23, 118, 31, 215, 21, 162, 254, 32, 95, 227, 11, 223, 50, 127, 99, 51, 252, 0, 46, 31, 247, 17, 176, - 23, 143, 176, 1, 253, 191, 254, 16, 0, 6, 227, 91, 223, 243, 213, 0, 238, 31, 228, 69, 69, 143, 241, 29, 43, 251, 124, 26, 167, 251, 0, 1, 250, 48, 7, 1, 180, 25, 114, 213, 42, 253, 36, 255, 112, 29, 127, 241, 24, 113, 250, 8, 30, 0, 79, 255, 78, 127, 42, 15, 11, 33, 40, 45, 238, 29, 138, 119, 22, 222, - 191, 255, 208, 30, 55, 247, 47, 255, 177, 253, 41, 147, 229, 0, 75, 115, 30, 50, 63, 251, 249, 50, 1, 251, 22, 63, 179, 30, 255, 78, 235, 55, 79, 79, 93, 243, 37, 127, 205, 31, 244, 243, 57, 255, 30, 151, 223, 30, 43, 143, 212, 255, 224, 26, 50, 176, 31, 177, 144, 48, 3, 15, 150, 78, 174, 159, 29, 223, 143, 24, - 22, 111, 254, 208, 8, 240, 181, 60, 0, 198, 255, 71, 134, 221, 221, 221, 15, 15, 79, 9, 16, 30, 154, 0, 15, 110, 9, 14, 105, 56, 5, 113, 26, 85, 254, 37, 90, 204, 96, 9, 57, 221, 14, 196, 76, 1, 223, 20, 235, 32, 115, 40, 55, 11, 47, 250, 253, 80, 3, 252, 47, 254, 15, 65, 79, 32, 99, 91, 32, 103, - 8, 239, 254, 222, 247, 12, 96, 172, 24, 145, 39, 27, 185, 15, 30, 17, 125, 82, 88, 47, 7, 1, 17, 17, 62, 174, 105, 31, 219, 29, 221, 221, 220, 32, 31, 251, 180, 128, 31, 255, 80, 20, 31, 250, 10, 28, 18, 28, 170, 254, 137, 239, 255, 138, 255, 255, 252, 23, 47, 145, 223, 90, 54, 144, 7, 153, 27, 206, 46, 186, - 2, 175, 20, 1, 94, 28, 199, 62, 55, 203, 2, 239, 255, 252, 24, 227, 247, 112, 3, 255, 129, 96, 127, 6, 255, 226, 225, 0, 103, 254, 28, 87, 39, 13, 111, 127, 40, 132, 239, 216, 226, 0, 56, 115, 119, 239, 0, 127, 0, 112, 147, 18, 199, 7, 2, 2, 18, 0, 3, 1, 124, 135, 40, 215, 112, 3, 249, 51, 51, 86, - 92, 143, 255, 17, 54, 221, 63, 255, 79, 246, 134, 201, 233, 51, 51, 0, 81, 43, 176, 17, 55, 12, 154, 35, 2, 226, 223, 255, 255, 25, 231, 33, 11, 33, 143, 18, 159, 255, 187, 21, 31, 252, 239, 255, 250, 30, 29, 255, 21, 47, 31, 254, 32, 7, 189, 124, 127, 16, 4, 183, 0, 255, 225, 31, 255, 112, 245, 63, 255, 144, - 17, 160, 3, 3, 241, 18, 31, 251, 12, 86, 251, 56, 243, 60, 103, 11, 215, 255, 255, 29, 150, 246, 96, 239, 255, 211, 56, 61, 26, 85, 19, 149, 121, 155, 255, 249, 29, 246, 85, 115, 36, 171, 71, 122, 255, 224, 111, 0, 127, 30, 11, 255, 229, 254, 64, 5, 45, 44, 4, 144, 8, 255, 0, 3, 4, 3, 86, 47, 7, 73, - 0, 127, 6, 242, 17, 7, 48, 12, 25, 168, 13, 8, 156, 47, 8, 185, 9, 33, 240, 13, 109, 9, 51, 51, 0, 126, 18, 6, 100, 90, 119, 2, 205, 15, 173, 2, 98, 111, 221, 98, 111, 117, 167, 102, 31, 232, 207, 245, 58, 31, 31, 30, 0, 222, 24, 155, 170, 7, 80, 3, 9, 31, 207, 10, 31, 207, 12, 46, 62, 117, - 15, 3, 34, 119, 119, 119, 17, 254, 255, 32, 3, 1, 61, 42, 106, 208, 3, 120, 255, 253, 119, 99, 7, 14, 85, 28, 114, 47, 28, 174, 95, 26, 158, 63, 37, 202, 130, 9, 19, 147, 16, 63, 99, 39, 15, 255, 2, 114, 47, 35, 80, 3, 1, 237, 137, 153, 153, 15, 194, 10, 153, 153, 0, 31, 44, 130, 40, 3, 124, 27, - 45, 143, 144, 31, 247, 241, 112, 3, 6, 178, 2, 208, 3, 80, 63, 255, 58, 31, 243, 239, 26, 120, 38, 178, 160, 3, 2, 255, 16, 185, 241, 0, 3, 5, 253, 239, 11, 72, 15, 224, 111, 1, 242, 0, 19, 104, 81, 28, 143, 44, 147, 225, 48, 111, 219, 253, 119, 28, 155, 255, 251, 28, 163, 252, 255, 225, 254, 153, 146, 0, - 127, 26, 30, 87, 229, 247, 205, 255, 236, 229, 167, 33, 16, 0, 131, 2, 110, 31, 251, 0, 3, 5, 250, 85, 28, 217, 210, 15, 255, 74, 2, 31, 66, 95, 8, 32, 8, 74, 173, 112, 18, 183, 246, 15, 255, 16, 138, 32, 31, 239, 224, 21, 1, 135, 7, 76, 131, 0, 3, 8, 3, 31, 122, 19, 208, 3, 171, 29, 62, 39, - 64, 3, 1, 255, 24, 253, 223, 11, 85, 213, 0, 190, 19, 164, 56, 159, 255, 20, 97, 159, 31, 245, 104, 64, 3, 236, 129, 192, 143, 171, 0, 127, 1, 160, 143, 12, 129, 50, 104, 77, 135, 127, 253, 31, 44, 129, 239, 255, 96, 251, 33, 7, 229, 0, 207, 226, 71, 156, 15, 255, 38, 137, 33, 139, 208, 13, 3, 127, 14, 90, - 55, 81, 43, 98, 199, 149, 0, 20, 135, 64, 38, 52, 135, 36, 139, 255, 80, 3, 3, 127, 28, 252, 189, 113, 131, 142, 35, 37, 219, 64, 103, 79, 228, 36, 114, 221, 35, 95, 126, 51, 103, 235, 129, 51, 20, 133, 0, 31, 139, 67, 19, 119, 112, 112, 115, 224, 7, 32, 143, 15, 163, 20, 26, 187, 84, 78, 235, 95, 38, 7, - 61, 31, 248, 95, 45, 250, 31, 255, 255, 143, 0, 127, 255, 144, 187, 223, 255, 179, 235, 119, 135, 255, 222, 24, 93, 31, 24, 32, 0, 255, 15, 255, 48, 0, 31, 3, 148, 0, 245, 0, 187, 186, 32, 28, 27, 160, 28, 31, 96, 234, 0, 254, 66, 31, 11, 96, 95, 15, 160, 15, 255, 19, 171, 63, 31, 255, 8, 15, 255, 1, - 25, 31, 255, 207, 255, 235, 212, 3, 207, 40, 243, 110, 44, 155, 88, 152, 148, 80, 111, 255, 26, 93, 0, 42, 93, 255, 16, 17, 19, 234, 169, 0, 12, 40, 41, 255, 0, 3, 5, 207, 32, 131, 240, 28, 85, 211, 85, 85, 105, 131, 187, 16, 0, 239, 230, 85, 85, 174, 64, 55, 15, 255, 26, 28, 187, 187, 128, 15, 159, 20, - 244, 17, 17, 17, 7, 31, 228, 13, 41, 85, 135, 103, 148, 25, 80, 131, 32, 30, 17, 231, 135, 162, 86, 195, 0, 31, 6, 42, 175, 255, 42, 183, 250, 80, 232, 215, 15, 255, 0, 223, 0, 3, 1, 84, 32, 251, 43, 58, 127, 16, 144, 3, 83, 138, 127, 0, 103, 2, 235, 51, 51, 48, 30, 35, 253, 46, 39, 16, 221, 202, - 221, 216, 15, 255, 32, 27, 253, 7, 17, 208, 15, 19, 131, 34, 96, 3, 223, 255, 3, 90, 47, 160, 3, 63, 255, 90, 34, 115, 134, 245, 219, 47, 13, 66, 17, 160, 107, 192, 11, 253, 239, 95, 15, 125, 224, 111, 5, 0, 36, 105, 53, 31, 42, 197, 65, 31, 46, 181, 224, 111, 0, 127, 30, 33, 247, 33, 255, 6, 255, 8, - 150, 195, 5, 16, 0, 131, 2, 92, 35, 0, 127, 7, 28, 22, 191, 192, 78, 14, 66, 160, 4, 28, 215, 105, 251, 11, 255, 245, 250, 255, 254, 221, 221, 96, 1, 255, 255, 224, 16, 3, 205, 144, 1, 28, 238, 8, 255, 73, 248, 137, 8, 255, 7, 0, 253, 1, 1, 155, 205, 255, 209, 30, 182, 243, 61, 8, 255, 46, 45, 107, - 0, 103, 119, 117, 8, 255, 7, 255, 247, 252, 113, 84, 49, 8, 255, 200, 3, 171, 187, 223, 187, 13, 84, 251, 13, 255, 247, 119, 13, 53, 27, 207, 160, 3, 185, 32, 24, 123, 176, 24, 127, 160, 230, 159, 255, 118, 8, 255, 65, 128, 111, 247, 138, 37, 127, 173, 10, 65, 143, 119, 232, 127, 206, 249, 25, 3, 254, 120, 25, 7, - 247, 159, 255, 82, 8, 255, 198, 63, 227, 47, 131, 196, 1, 255, 128, 3, 166, 219, 134, 251, 253, 29, 163, 236, 94, 214, 85, 85, 37, 255, 242, 48, 3, 119, 119, 8, 123, 22, 85, 160, 107, 1, 167, 123, 6, 47, 187, 251, 144, 3, 253, 29, 157, 215, 45, 227, 239, 219, 119, 119, 80, 30, 175, 246, 8, 62, 143, 32, 11, 15, - 123, 22, 103, 123, 6, 14, 47, 5, 136, 251, 0, 31, 36, 172, 249, 88, 100, 248, 5, 142, 89, 5, 166, 42, 30, 1, 3, 16, 245, 2, 205, 221, 221, 36, 131, 9, 48, 3, 248, 206, 51, 9, 63, 191, 128, 3, 221, 221, 211, 31, 227, 165, 250, 63, 227, 51, 172, 22, 95, 217, 95, 10, 127, 9, 95, 51, 10, 255, 17, 128, - 111, 250, 137, 32, 131, 62, 15, 71, 119, 188, 118, 232, 194, 154, 189, 239, 249, 34, 118, 19, 132, 241, 196, 85, 50, 16, 0, 127, 55, 14, 33, 46, 107, 239, 79, 110, 26, 251, 11, 252, 1, 183, 49, 239, 255, 247, 85, 15, 251, 249, 13, 255, 209, 16, 239, 255, 45, 255, 226, 255, 231, 143, 31, 151, 29, 145, 20, 145, 49, 113, - 8, 236, 1, 153, 16, 31, 203, 208, 0, 229, 63, 4, 255, 16, 171, 208, 0, 3, 6, 83, 42, 143, 159, 26, 0, 159, 255, 250, 21, 153, 159, 255, 79, 16, 115, 63, 16, 119, 223, 19, 119, 64, 19, 16, 53, 175, 255, 223, 117, 26, 179, 240, 0, 158, 21, 179, 255, 80, 3, 126, 87, 149, 191, 157, 0, 127, 17, 12, 33, 243, - 239, 253, 163, 63, 143, 209, 237, 253, 255, 255, 30, 255, 254, 200, 201, 0, 49, 15, 203, 4, 32, 99, 29, 214, 51, 38, 67, 12, 112, 31, 83, 4, 239, 80, 15, 255, 44, 9, 151, 9, 75, 182, 4, 213, 9, 23, 81, 143, 3, 167, 15, 86, 115, 3, 171, 183, 105, 153, 153, 142, 3, 32, 19, 61, 116, 46, 75, 176, 0, 239, - 29, 116, 189, 63, 64, 3, 17, 191, 255, 186, 31, 169, 191, 106, 31, 173, 118, 221, 231, 47, 29, 145, 139, 223, 1, 255, 17, 249, 3, 255, 251, 51, 3, 95, 63, 96, 115, 0, 173, 175, 46, 215, 17, 51, 100, 51, 50, 111, 104, 70, 188, 136, 110, 3, 254, 219, 168, 82, 231, 63, 33, 131, 160, 141, 23, 187, 109, 2, 127, 29, - 10, 161, 46, 1, 239, 59, 118, 255, 62, 19, 145, 73, 13, 219, 0, 141, 251, 153, 16, 0, 13, 251, 0, 41, 175, 192, 84, 51, 11, 175, 24, 199, 31, 0, 255, 20, 23, 94, 107, 13, 135, 2, 218, 127, 119, 150, 243, 255, 133, 30, 123, 48, 31, 95, 234, 203, 187, 187, 111, 143, 143, 115, 123, 192, 48, 127, 112, 47, 240, 187, - 187, 183, 61, 131, 24, 176, 9, 200, 19, 105, 135, 165, 12, 104, 255, 85, 96, 73, 29, 211, 56, 25, 96, 5, 242, 255, 247, 187, 189, 37, 123, 78, 249, 85, 160, 31, 4, 29, 243, 64, 115, 128, 147, 160, 31, 111, 255, 164, 95, 104, 47, 179, 129, 80, 1, 139, 28, 15, 217, 3, 104, 139, 0, 31, 8, 65, 139, 15, 255, 17, - 239, 82, 31, 255, 39, 1, 135, 5, 207, 104, 107, 177, 135, 48, 168, 19, 224, 240, 0, 143, 80, 3, 69, 3, 79, 243, 28, 14, 63, 7, 124, 15, 255, 17, 44, 0, 69, 85, 85, 42, 119, 37, 11, 160, 1, 72, 215, 73, 105, 7, 47, 239, 169, 119, 40, 247, 34, 123, 100, 143, 239, 217, 0, 0, 31, 0, 47, 135, 224, 53, - 147, 47, 255, 41, 41, 137, 26, 60, 0, 34, 13, 114, 11, 130, 1, 31, 255, 111, 54, 2, 123, 2, 43, 228, 51, 51, 143, 243, 255, 185, 16, 119, 151, 185, 128, 123, 32, 27, 95, 117, 251, 208, 0, 153, 253, 152, 32, 0, 153, 153, 148, 114, 123, 51, 208, 51, 49, 5, 111, 31, 9, 105, 139, 165, 15, 149, 111, 229, 15, 34, - 232, 239, 7, 255, 34, 2, 19, 204, 174, 115, 142, 19, 255, 22, 241, 225, 176, 0, 191, 21, 127, 37, 131, 37, 139, 101, 15, 1, 228, 35, 87, 148, 43, 11, 8, 255, 10, 127, 8, 255, 17, 46, 235, 211, 3, 239, 30, 103, 1, 6, 106, 4, 37, 110, 253, 203, 161, 150, 11, 76, 7, 111, 9, 127, 5, 8, 143, 54, 15, 255, - 94, 42, 135, 15, 53, 112, 3, 7, 63, 0, 255, 255, 47, 255, 192, 31, 255, 208, 200, 1, 31, 16, 3, 191, 255, 248, 15, 255, 32, 32, 99, 0, 3, 4, 210, 253, 221, 32, 135, 31, 80, 103, 224, 7, 223, 16, 127, 4, 48, 135, 15, 255, 45, 44, 123, 8, 103, 10, 23, 255, 1, 24, 133, 15, 255, 100, 31, 19, 252, 0, - 30, 12, 15, 222, 8, 4, 149, 0, 0, 47, 174, 255, 14, 3, 16, 8, 127, 251, 252, 187, 13, 19, 119, 58, 224, 3, 71, 79, 243, 51, 191, 112, 39, 253, 88, 243, 233, 243, 51, 13, 83, 127, 143, 57, 35, 64, 3, 239, 18, 92, 143, 96, 19, 15, 255, 16, 252, 54, 247, 61, 251, 37, 246, 183, 151, 1, 41, 101, 21, 203, - 187, 119, 95, 1, 85, 65, 174, 2, 25, 122, 79, 31, 8, 239, 255, 218, 19, 185, 159, 112, 25, 103, 141, 3, 30, 254, 32, 0, 163, 145, 81, 21, 107, 39, 167, 208, 14, 126, 20, 36, 6, 80, 3, 9, 149, 0, 223, 193, 29, 122, 12, 20, 142, 4, 27, 214, 3, 51, 30, 218, 29, 166, 133, 175, 43, 255, 50, 55, 23, 171, - 165, 166, 30, 234, 0, 47, 250, 48, 3, 247, 31, 60, 241, 122, 31, 64, 96, 0, 0, 229, 15, 255, 36, 73, 87, 15, 131, 255, 144, 3, 127, 255, 166, 119, 40, 4, 239, 44, 153, 153, 170, 64, 124, 7, 94, 9, 255, 24, 255, 0, 3, 1, 175, 46, 194, 48, 240, 28, 150, 247, 85, 89, 30, 148, 24, 151, 172, 239, 140, 135, - 160, 208, 25, 171, 16, 15, 255, 23, 39, 115, 101, 255, 87, 127, 171, 160, 224, 247, 119, 122, 51, 219, 119, 127, 239, 255, 169, 163, 0, 31, 2, 138, 114, 87, 123, 7, 127, 5, 15, 255, 10, 109, 15, 255, 10, 221, 7, 35, 1, 84, 192, 31, 112, 1, 127, 38, 255, 89, 23, 111, 122, 123, 29, 11, 21, 114, 20, 28, 171, 168, - 255, 255, 221, 131, 223, 126, 15, 144, 71, 13, 103, 23, 7, 87, 247, 30, 255, 185, 211, 17, 22, 255, 141, 248, 32, 3, 137, 111, 44, 155, 89, 80, 29, 56, 245, 72, 22, 44, 249, 45, 161, 29, 166, 17, 192, 31, 207, 246, 47, 68, 169, 250, 91, 212, 247, 15, 255, 12, 4, 21, 145, 27, 255, 143, 90, 28, 255, 95, 29, 3, - 5, 97, 30, 160, 252, 23, 200, 175, 255, 40, 151, 223, 53, 226, 96, 95, 255, 195, 235, 0, 2, 180, 159, 234, 96, 80, 87, 255, 196, 95, 43, 255, 216, 24, 47, 255, 64, 4, 191, 255, 247, 32, 0, 1, 83, 15, 255, 27, 1, 191, 128, 83, 21, 15, 242, 23, 3, 243, 112, 3, 191, 255, 175, 144, 244, 0, 6, 255, 244, 22, - 51, 245, 112, 3, 15, 255, 46, 30, 41, 111, 128, 3, 128, 119, 9, 255, 246, 51, 41, 139, 189, 255, 20, 96, 255, 255, 246, 155, 38, 218, 7, 218, 255, 249, 20, 119, 245, 35, 32, 127, 57, 48, 23, 169, 245, 63, 235, 191, 159, 255, 62, 13, 255, 29, 54, 255, 139, 212, 187, 187, 6, 255, 8, 244, 28, 207, 128, 13, 255, 15, - 15, 255, 65, 147, 76, 92, 27, 15, 255, 3, 178, 31, 255, 8, 94, 10, 2, 188, 160, 64, 31, 255, 224, 3, 127, 42, 53, 131, 59, 183, 158, 3, 32, 11, 73, 43, 203, 255, 93, 111, 39, 51, 126, 55, 39, 64, 3, 126, 74, 87, 67, 191, 80, 19, 15, 128, 17, 159, 102, 115, 4, 28, 108, 188, 13, 82, 15, 0, 35, 51, - 52, 99, 255, 110, 3, 245, 221, 222, 255, 254, 110, 255, 83, 28, 24, 249, 85, 60, 231, 192, 120, 7, 221, 148, 23, 51, 8, 59, 1, 214, 34, 95, 88, 41, 150, 48, 143, 255, 14, 247, 2, 47, 15, 43, 118, 28, 162, 16, 80, 3, 83, 140, 139, 4, 251, 2, 46, 139, 255, 17, 49, 116, 46, 251, 221, 221, 216, 1, 239, 38, - 255, 6, 255, 2, 97, 239, 165, 254, 157, 139, 254, 159, 39, 97, 239, 94, 145, 139, 94, 16, 1, 127, 20, 103, 107, 47, 255, 25, 47, 123, 110, 11, 47, 147, 160, 111, 9, 45, 247, 174, 11, 47, 147, 128, 111, 240, 55, 127, 176, 31, 187, 74, 3, 87, 0, 80, 95, 131, 46, 11, 180, 141, 255, 207, 95, 158, 172, 125, 94, 15, - 175, 111, 7, 51, 57, 19, 244, 145, 115, 92, 190, 15, 99, 65, 229, 255, 255, 160, 62, 251, 37, 247, 81, 142, 15, 176, 10, 31, 11, 0, 1, 255, 0, 62, 111, 234, 70, 255, 151, 203, 66, 231, 2, 83, 2, 202, 31, 93, 187, 187, 182, 76, 94, 111, 253, 49, 255, 127, 240, 122, 48, 27, 91, 8, 127, 19, 170, 31, 31, 255, - 63, 80, 3, 79, 95, 11, 159, 79, 255, 138, 5, 46, 106, 57, 199, 48, 3, 240, 89, 95, 244, 89, 115, 24, 31, 222, 197, 51, 101, 183, 249, 119, 101, 87, 15, 255, 2, 34, 251, 87, 37, 217, 244, 63, 255, 29, 31, 231, 191, 255, 0, 254, 28, 255, 254, 4, 239, 255, 227, 26, 223, 215, 32, 10, 39, 55, 82, 109, 255, 144, - 0, 206, 81, 25, 216, 36, 33, 100, 111, 20, 14, 23, 32, 18, 38, 213, 100, 141, 47, 251, 153, 0, 131, 4, 70, 67, 96, 13, 175, 79, 70, 171, 114, 38, 183, 1, 223, 128, 14, 112, 46, 33, 255, 13, 45, 150, 41, 144, 3, 127, 255, 187, 43, 83, 224, 90, 227, 42, 231, 242, 102, 159, 222, 25, 145, 17, 70, 30, 240, 223, - 255, 192, 3, 85, 15, 255, 16, 47, 31, 209, 95, 74, 115, 1, 26, 247, 11, 119, 26, 251, 159, 255, 0, 19, 132, 2, 223, 255, 234, 246, 255, 244, 28, 29, 248, 27, 237, 252, 44, 165, 187, 48, 24, 103, 192, 0, 236, 29, 92, 65, 239, 197, 255, 194, 22, 236, 56, 142, 96, 3, 17, 208, 123, 16, 127, 0, 127, 17, 9, 255, - 254, 64, 6, 255, 193, 230, 0, 0, 68, 6, 72, 6, 32, 208, 8, 215, 15, 255, 6, 150, 32, 224, 239, 96, 255, 207, 26, 113, 78, 245, 15, 255, 158, 171, 6, 81, 251, 31, 81, 151, 79, 175, 255, 254, 64, 61, 81, 255, 67, 135, 51, 255, 243, 30, 140, 159, 24, 99, 193, 255, 51, 239, 65, 151, 6, 255, 20, 33, 247, 12, - 255, 245, 0, 1, 207, 255, 23, 76, 255, 21, 127, 228, 253, 11, 255, 251, 16, 2, 169, 22, 79, 248, 175, 63, 23, 116, 25, 26, 239, 192, 0, 238, 255, 245, 253, 48, 67, 239, 31, 89, 44, 42, 163, 126, 69, 37, 70, 48, 47, 190, 27, 12, 1, 247, 0, 191, 23, 185, 42, 171, 162, 2, 243, 22, 7, 221, 247, 6, 94, 23, - 7, 223, 89, 154, 248, 1, 27, 131, 155, 187, 133, 15, 63, 251, 255, 170, 230, 31, 35, 254, 50, 131, 19, 30, 194, 188, 114, 143, 171, 247, 15, 252, 22, 7, 81, 119, 1, 15, 235, 1, 41, 255, 154, 254, 72, 103, 30, 232, 255, 3, 199, 211, 4, 25, 149, 164, 159, 24, 134, 96, 44, 4, 31, 198, 208, 24, 18, 125, 116, 253, - 48, 0, 154, 32, 247, 9, 9, 0, 19, 239, 42, 67, 119, 96, 3, 2, 30, 123, 4, 30, 127, 6, 51, 139, 111, 30, 218, 223, 253, 160, 3, 8, 153, 239, 254, 95, 44, 149, 95, 31, 252, 67, 85, 239, 253, 11, 196, 255, 241, 0, 3, 10, 3, 254, 17, 35, 44, 255, 35, 136, 19, 246, 183, 244, 23, 123, 96, 15, 31, 84, - 8, 252, 32, 87, 79, 127, 160, 31, 222, 244, 31, 226, 254, 48, 223, 247, 127, 255, 246, 223, 31, 128, 239, 0, 127, 248, 253, 223, 0, 1, 81, 56, 183, 0, 127, 48, 7, 31, 23, 139, 191, 34, 229, 239, 214, 96, 255, 249, 17, 7, 112, 5, 82, 45, 112, 18, 10, 243, 42, 93, 79, 251, 97, 143, 3, 175, 255, 205, 2, 194, - 23, 31, 29, 71, 159, 253, 96, 3, 6, 190, 187, 123, 31, 64, 0, 137, 32, 251, 17, 239, 242, 255, 27, 255, 241, 160, 3, 15, 255, 16, 5, 31, 255, 173, 9, 31, 255, 14, 31, 255, 175, 255, 29, 0, 254, 251, 1, 191, 255, 244, 14, 29, 104, 14, 255, 245, 212, 0, 255, 47, 31, 241, 78, 31, 245, 145, 223, 85, 191, 29, - 241, 159, 239, 255, 112, 159, 255, 79, 255, 251, 159, 4, 255, 255, 191, 241, 0, 60, 249, 159, 224, 111, 176, 127, 1, 255, 17, 2, 170, 150, 15, 144, 15, 46, 21, 127, 218, 78, 15, 127, 64, 163, 43, 24, 22, 46, 19, 59, 16, 131, 248, 18, 127, 32, 5, 228, 255, 160, 160, 17, 119, 24, 42, 0, 43, 241, 59, 23, 105, 30, - 250, 255, 253, 12, 127, 19, 124, 65, 3, 49, 107, 54, 127, 12, 255, 0, 248, 3, 255, 253, 64, 0, 252, 91, 28, 202, 32, 191, 255, 37, 32, 17, 158, 243, 239, 245, 255, 254, 144, 26, 35, 236, 42, 40, 149, 5, 162, 48, 7, 238, 57, 92, 48, 239, 31, 99, 48, 3, 12, 28, 138, 86, 23, 6, 2, 31, 159, 94, 60, 6, - 176, 175, 23, 6, 167, 8, 234, 91, 227, 47, 103, 31, 16, 255, 251, 64, 76, 43, 135, 112, 9, 254, 17, 31, 239, 111, 216, 47, 196, 46, 11, 78, 44, 127, 5, 79, 195, 44, 147, 3, 252, 64, 76, 43, 29, 239, 227, 20, 251, 21, 162, 0, 11, 60, 20, 119, 0, 226, 57, 222, 80, 240, 31, 31, 26, 159, 30, 0, 36, 152, - 144, 250, 93, 108, 213, 25, 3, 144, 3, 14, 127, 0, 80, 103, 21, 107, 252, 10, 239, 248, 0, 7, 41, 208, 209, 96, 103, 48, 48, 111, 24, 143, 105, 48, 9, 112, 70, 65, 239, 113, 143, 32, 253, 175, 31, 6, 224, 12, 16, 14, 253, 28, 4, 0, 0, 23, 157, 223, 53, 11, 42, 143, 0, 24, 114, 63, 188, 175, 118, 78, - 15, 223, 255, 251, 31, 169, 128, 95, 19, 146, 211, 2, 214, 159, 213, 176, 97, 87, 26, 145, 255, 255, 237, 215, 16, 207, 27, 248, 5, 207, 27, 252, 2, 145, 104, 0, 126, 23, 97, 247, 6, 11, 47, 5, 161, 247, 0, 31, 34, 249, 90, 95, 100, 248, 11, 11, 59, 157, 160, 28, 96, 247, 11, 94, 65, 246, 74, 0, 0, 110, - 90, 196, 127, 251, 115, 123, 243, 143, 255, 255, 43, 63, 124, 29, 142, 254, 80, 226, 61, 254, 128, 77, 203, 111, 224, 43, 121, 251, 47, 39, 183, 249, 47, 3, 254, 96, 24, 198, 176, 0, 91, 189, 255, 11, 254, 16, 35, 53, 67, 9, 83, 119, 4, 82, 79, 83, 25, 158, 15, 255, 173, 239, 47, 223, 145, 94, 63, 59, 63, 151, - 30, 144, 51, 51, 69, 191, 147, 1, 153, 186, 16, 25, 73, 192, 0, 15, 30, 143, 159, 30, 147, 161, 48, 95, 239, 255, 95, 255, 14, 255, 9, 175, 119, 47, 135, 78, 121, 177, 251, 119, 119, 119, 255, 2, 11, 1, 78, 107, 240, 64, 21, 153, 240, 48, 115, 96, 15, 4, 122, 19, 3, 3, 3, 254, 15, 190, 111, 53, 238, 15, - 127, 224, 90, 96, 23, 45, 244, 30, 49, 247, 8, 176, 3, 15, 255, 17, 158, 111, 40, 247, 29, 72, 143, 94, 15, 62, 115, 80, 110, 111, 254, 190, 15, 161, 46, 15, 224, 111, 0, 127, 30, 238, 111, 99, 7, 158, 0, 239, 254, 174, 111, 7, 189, 0, 0, 127, 4, 4, 255, 168, 246, 30, 214, 192, 14, 125, 46, 3, 10, 56, - 11, 14, 110, 10, 60, 15, 170, 251, 15, 255, 18, 11, 94, 115, 14, 94, 119, 95, 73, 107, 4, 42, 127, 26, 104, 30, 99, 31, 226, 79, 243, 247, 54, 15, 31, 247, 186, 32, 31, 251, 209, 0, 253, 31, 171, 0, 13, 127, 6, 27, 14, 127, 22, 23, 188, 24, 203, 250, 8, 26, 119, 1, 223, 188, 145, 251, 255, 129, 239, 255, - 248, 18, 11, 31, 243, 185, 143, 43, 35, 116, 173, 144, 82, 15, 38, 223, 254, 46, 19, 175, 30, 239, 80, 30, 243, 48, 207, 252, 76, 111, 196, 94, 211, 27, 81, 31, 7, 23, 174, 221, 23, 178, 11, 255, 21, 85, 224, 3, 6, 245, 123, 248, 20, 7, 245, 133, 139, 207, 81, 115, 127, 253, 48, 3, 51, 32, 107, 80, 11, 64, - 19, 246, 107, 14, 123, 37, 4, 139, 61, 135, 30, 31, 88, 207, 255, 162, 197, 239, 192, 186, 25, 82, 20, 255, 48, 95, 73, 33, 136, 21, 3, 127, 45, 25, 92, 22, 127, 246, 31, 135, 243, 26, 122, 245, 61, 28, 121, 29, 84, 223, 255, 146, 0, 29, 246, 0, 42, 19, 128, 21, 119, 161, 20, 204, 255, 19, 40, 255, 48, 7, - 254, 111, 255, 160, 22, 255, 255, 64, 21, 135, 83, 51, 139, 22, 29, 103, 255, 144, 3, 3, 255, 32, 23, 207, 98, 15, 164, 10, 253, 147, 11, 61, 14, 3, 127, 75, 0, 63, 102, 1, 83, 151, 189, 47, 191, 192, 90, 223, 218, 28, 94, 139, 255, 249, 253, 65, 76, 255, 225, 207, 222, 43, 109, 252, 78, 39, 3, 209, 31, 23, - 28, 168, 223, 255, 16, 5, 127, 22, 147, 127, 83, 247, 37, 251, 10, 187, 127, 26, 193, 255, 80, 93, 80, 7, 225, 30, 168, 253, 83, 93, 47, 147, 27, 122, 47, 248, 59, 255, 251, 111, 16, 28, 95, 16, 32, 242, 127, 255, 64, 0, 18, 45, 69, 167, 192, 74, 107, 20, 11, 140, 23, 31, 87, 41, 99, 12, 39, 131, 205, 55, - 131, 181, 96, 196, 51, 56, 39, 244, 135, 131, 0, 62, 1, 51, 0, 31, 10, 167, 131, 190, 197, 12, 32, 54, 90, 221, 218, 44, 255, 10, 127, 8, 42, 97, 139, 1, 235, 21, 10, 85, 123, 31, 85, 131, 9, 106, 147, 124, 49, 235, 251, 32, 42, 255, 224, 87, 123, 32, 7, 244, 251, 32, 26, 239, 108, 12, 225, 71, 27, 44, - 69, 169, 159, 17, 239, 207, 39, 35, 248, 71, 155, 9, 157, 21, 7, 94, 17, 127, 57, 97, 127, 3, 171, 187, 187, 203, 255, 213, 189, 185, 20, 251, 53, 108, 123, 187, 16, 0, 0, 237, 40, 205, 201, 21, 175, 255, 159, 76, 135, 0, 202, 255, 252, 137, 35, 32, 31, 48, 110, 3, 160, 129, 127, 50, 41, 51, 23, 190, 0, 180, - 14, 130, 1, 31, 255, 8, 80, 243, 189, 8, 236, 135, 255, 255, 115, 110, 29, 221, 6, 95, 27, 249, 1, 23, 82, 5, 255, 254, 65, 94, 61, 27, 146, 59, 147, 0, 58, 223, 235, 120, 27, 251, 75, 88, 35, 245, 66, 127, 42, 11, 80, 15, 255, 35, 8, 255, 10, 78, 235, 44, 7, 35, 69, 94, 109, 83, 46, 139, 231, 45, - 211, 254, 160, 233, 158, 255, 247, 32, 2, 40, 141, 181, 175, 156, 127, 137, 32, 31, 198, 224, 29, 149, 241, 69, 96, 3, 16, 15, 127, 17, 25, 234, 22, 164, 159, 31, 255, 30, 90, 31, 255, 2, 28, 127, 0, 6, 42, 135, 11, 124, 15, 245, 207, 255, 128, 8, 60, 124, 242, 26, 248, 64, 253, 189, 220, 114, 53, 221, 223, 110, - 9, 219, 154, 168, 160, 111, 32, 123, 137, 43, 31, 255, 155, 31, 255, 247, 107, 255, 241, 99, 0, 127, 18, 1, 17, 17, 63, 84, 111, 10, 156, 4, 253, 0, 121, 255, 253, 4, 255, 255, 223, 250, 2, 255, 26, 144, 0, 195, 19, 127, 30, 60, 41, 17, 46, 161, 46, 165, 153, 158, 90, 16, 111, 255, 64, 3, 51, 60, 16, 251, - 8, 42, 29, 213, 120, 16, 15, 135, 54, 255, 84, 239, 95, 47, 19, 17, 58, 48, 171, 86, 54, 155, 150, 8, 79, 16, 192, 31, 140, 169, 243, 31, 144, 208, 160, 30, 16, 14, 231, 0, 15, 255, 10, 6, 81, 89, 3, 31, 90, 255, 14, 82, 147, 45, 254, 31, 235, 167, 163, 175, 26, 218, 3, 36, 215, 58, 255, 35, 115, 253, - 48, 136, 60, 40, 3, 34, 227, 63, 107, 252, 66, 13, 33, 201, 33, 209, 74, 57, 43, 176, 15, 11, 25, 31, 255, 8, 204, 135, 5, 46, 125, 185, 10, 46, 19, 73, 221, 201, 175, 255, 44, 135, 96, 10, 92, 135, 101, 103, 224, 31, 15, 11, 2, 250, 12, 135, 4, 223, 0, 3, 1, 85, 44, 255, 43, 63, 255, 16, 144, 3, - 83, 5, 103, 12, 51, 223, 51, 48, 89, 15, 255, 16, 221, 221, 216, 4, 6, 251, 42, 165, 15, 181, 111, 229, 15, 246, 251, 225, 102, 251, 69, 15, 8, 15, 255, 17, 165, 111, 75, 116, 21, 3, 12, 84, 99, 101, 111, 38, 243, 124, 26, 170, 255, 0, 56, 189, 184, 37, 3, 122, 7, 69, 101, 111, 208, 134, 243, 160, 31, 15, - 255, 2, 164, 85, 11, 252, 41, 86, 251, 31, 243, 142, 95, 162, 175, 87, 251, 93, 15, 0, 143, 223, 174, 127, 47, 255, 162, 7, 255, 151, 119, 119, 107, 62, 159, 254, 112, 126, 7, 63, 126, 3, 208, 0, 228, 119, 119, 16, 7, 131, 18, 97, 255, 127, 85, 139, 206, 156, 233, 185, 153, 153, 110, 255, 51, 64, 171, 191, 242, 153, - 196, 153, 150, 49, 239, 31, 148, 23, 198, 49, 136, 192, 31, 7, 149, 11, 46, 40, 9, 255, 16, 205, 29, 99, 255, 24, 68, 255, 250, 1, 239, 255, 163, 7, 24, 184, 11, 28, 112, 118, 69, 70, 242, 0, 220, 40, 127, 254, 64, 31, 211, 234, 244, 0, 75, 46, 0, 207, 24, 141, 79, 22, 89, 145, 47, 31, 223, 16, 7, 13, - 31, 103, 0, 3, 10, 15, 255, 14, 8, 73, 28, 94, 2, 28, 123, 31, 64, 255, 27, 0, 31, 243, 59, 189, 255, 181, 15, 175, 255, 112, 7, 48, 223, 246, 96, 63, 83, 255, 163, 68, 91, 142, 63, 0, 127, 44, 14, 32, 46, 96, 255, 187, 12, 24, 32, 4, 239, 80, 10, 118, 46, 87, 0, 175, 1, 22, 211, 46, 60, 123, - 234, 4, 255, 253, 87, 186, 64, 116, 45, 15, 230, 47, 131, 160, 0, 191, 90, 63, 231, 254, 143, 255, 89, 80, 15, 255, 35, 8, 124, 123, 181, 247, 28, 191, 254, 32, 16, 88, 252, 141, 239, 0, 171, 53, 29, 3, 48, 24, 216, 48, 29, 11, 32, 8, 95, 23, 114, 239, 29, 248, 255, 255, 128, 0, 255, 150, 212, 79, 178, 15, - 255, 6, 3, 46, 32, 123, 112, 15, 127, 17, 201, 9, 239, 26, 246, 30, 235, 12, 46, 172, 23, 11, 5, 87, 24, 255, 14, 30, 251, 15, 48, 3, 255, 255, 194, 95, 24, 230, 250, 30, 6, 249, 191, 21, 255, 249, 204, 1, 188, 60, 247, 44, 251, 226, 0, 34, 221, 47, 7, 80, 108, 255, 24, 31, 255, 7, 208, 3, 4, 126, - 17, 80, 107, 40, 119, 191, 0, 211, 95, 3, 137, 251, 187, 187, 32, 84, 30, 131, 176, 30, 135, 128, 227, 126, 150, 27, 235, 32, 111, 150, 6, 49, 59, 31, 164, 55, 155, 113, 89, 96, 18, 215, 183, 245, 15, 255, 16, 2, 207, 65, 239, 223, 255, 232, 17, 17, 239, 62, 3, 78, 11, 246, 49, 143, 59, 207, 26, 120, 175, 85, - 31, 134, 3, 47, 134, 191, 49, 143, 64, 33, 151, 6, 20, 25, 2, 13, 127, 6, 13, 255, 23, 207, 30, 112, 29, 31, 223, 34, 119, 237, 0, 1, 103, 218, 23, 3, 207, 51, 119, 160, 141, 0, 25, 122, 50, 127, 47, 208, 142, 193, 58, 227, 7, 79, 30, 130, 7, 193, 243, 31, 115, 124, 128, 0, 191, 162, 144, 31, 254, 244, - 74, 11, 15, 112, 18, 91, 111, 63, 43, 110, 88, 63, 123, 5, 32, 143, 239, 195, 45, 134, 31, 14, 28, 154, 253, 16, 14, 255, 255, 193, 191, 47, 251, 250, 109, 29, 124, 128, 45, 41, 251, 125, 128, 63, 255, 246, 94, 77, 107, 255, 18, 166, 255, 255, 229, 0, 18, 41, 238, 176, 64, 127, 31, 252, 2, 191, 226, 9, 86, 9, - 66, 15, 255, 8, 143, 31, 247, 45, 91, 26, 228, 25, 155, 63, 9, 15, 1, 221, 228, 255, 66, 144, 245, 255, 209, 137, 14, 0, 209, 122, 48, 31, 199, 240, 63, 199, 160, 3, 15, 128, 17, 79, 43, 93, 255, 31, 135, 3, 83, 7, 159, 53, 11, 1, 191, 210, 255, 246, 60, 119, 242, 92, 83, 57, 247, 160, 29, 231, 238, 248, - 0, 70, 40, 249, 111, 255, 253, 64, 111, 239, 249, 119, 9, 91, 147, 9, 255, 251, 153, 67, 96, 131, 25, 80, 127, 46, 7, 32, 137, 27, 170, 0, 96, 63, 223, 255, 29, 243, 96, 12, 255, 211, 0, 1, 153, 151, 1, 157, 6, 46, 85, 27, 253, 89, 210, 255, 255, 57, 46, 208, 239, 96, 255, 8, 22, 59, 1, 223, 128, 15, - 255, 156, 235, 38, 119, 119, 31, 68, 255, 48, 3, 57, 153, 158, 191, 95, 147, 127, 255, 119, 119, 119, 80, 31, 254, 190, 247, 31, 254, 248, 255, 233, 153, 128, 182, 222, 180, 41, 31, 168, 239, 248, 31, 160, 251, 176, 3, 15, 255, 17, 94, 24, 115, 1, 84, 255, 191, 255, 0, 77, 61, 91, 220, 245, 14, 26, 224, 6, 253, 96, - 67, 71, 45, 227, 74, 22, 251, 239, 31, 220, 17, 247, 213, 17, 247, 255, 19, 153, 127, 29, 210, 4, 113, 1, 255, 254, 187, 1, 55, 31, 187, 64, 3, 253, 85, 192, 127, 250, 0, 179, 86, 31, 255, 253, 90, 167, 64, 15, 123, 35, 4, 85, 18, 72, 223, 255, 2, 31, 8, 12, 255, 254, 173, 79, 79, 29, 220, 127, 20, 126, - 32, 3, 111, 255, 144, 0, 253, 32, 143, 226, 0, 252, 49, 83, 239, 255, 170, 32, 31, 3, 144, 21, 205, 192, 21, 189, 208, 18, 158, 191, 160, 15, 237, 44, 2, 51, 51, 14, 255, 249, 187, 88, 20, 14, 255, 0, 78, 47, 235, 89, 186, 113, 202, 239, 51, 48, 255, 21, 10, 51, 255, 20, 13, 113, 105, 175, 238, 25, 145, 21, - 43, 252, 3, 239, 20, 20, 89, 0, 233, 60, 221, 223, 92, 119, 15, 68, 139, 57, 143, 239, 124, 83, 235, 254, 255, 253, 221, 196, 46, 77, 25, 18, 235, 53, 255, 246, 31, 125, 252, 46, 33, 50, 187, 50, 63, 248, 144, 3, 85, 239, 68, 62, 47, 30, 187, 10, 126, 4, 29, 249, 1, 62, 239, 36, 243, 159, 255, 250, 31, 215, - 144, 165, 8, 39, 228, 136, 77, 194, 42, 71, 254, 31, 228, 130, 250, 239, 255, 194, 0, 62, 31, 115, 2, 43, 89, 149, 9, 135, 248, 144, 127, 48, 27, 116, 112, 27, 120, 32, 13, 160, 147, 9, 1, 78, 96, 255, 43, 136, 78, 245, 14, 118, 48, 141, 92, 29, 123, 255, 81, 147, 1, 17, 79, 239, 191, 31, 154, 145, 211, 40, - 12, 245, 127, 24, 81, 239, 209, 143, 5, 127, 21, 143, 87, 77, 135, 5, 31, 239, 30, 65, 99, 110, 255, 253, 93, 28, 131, 210, 28, 231, 85, 255, 242, 28, 137, 247, 111, 17, 239, 254, 18, 27, 139, 176, 0, 173, 255, 247, 252, 16, 18, 239, 25, 137, 45, 255, 255, 101, 161, 239, 153, 239, 208, 123, 1, 127, 17, 14, 29, 44, - 4, 202, 203, 48, 103, 111, 45, 119, 11, 192, 3, 159, 20, 68, 202, 1, 80, 37, 74, 54, 7, 243, 144, 3, 246, 28, 187, 46, 162, 127, 45, 12, 79, 136, 115, 51, 51, 50, 15, 255, 18, 137, 11, 111, 107, 15, 255, 1, 126, 111, 173, 14, 111, 3, 62, 143, 64, 124, 31, 255, 112, 221, 221, 219, 16, 14, 143, 2, 15, 255, - 16, 219, 10, 255, 73, 239, 4, 187, 223, 173, 3, 0, 237, 0, 40, 207, 111, 115, 187, 190, 28, 224, 13, 30, 30, 220, 28, 39, 28, 15, 255, 207, 255, 252, 32, 118, 166, 127, 74, 11, 252, 29, 243, 36, 233, 0, 0, 40, 20, 111, 25, 50, 0, 255, 24, 61, 255, 255, 200, 32, 63, 2, 192, 20, 40, 251, 5, 81, 4, 205, - 221, 221, 150, 13, 94, 119, 94, 23, 0, 19, 117, 3, 196, 130, 123, 173, 221, 125, 139, 57, 40, 253, 255, 247, 30, 151, 192, 217, 5, 207, 29, 15, 2, 85, 192, 31, 13, 171, 1, 214, 67, 95, 255, 251, 94, 167, 15, 160, 19, 170, 208, 42, 104, 0, 207, 167, 192, 12, 212, 75, 94, 85, 15, 38, 99, 0, 17, 30, 78, 8, - 255, 1, 231, 53, 15, 39, 3, 243, 17, 16, 245, 111, 9, 3, 127, 32, 101, 111, 35, 131, 28, 11, 9, 181, 15, 56, 251, 246, 80, 103, 3, 48, 5, 15, 0, 223, 3, 115, 1, 149, 15, 14, 127, 16, 197, 111, 4, 11, 159, 0, 213, 111, 223, 207, 245, 111, 5, 15, 56, 59, 65, 15, 15, 194, 4, 103, 22, 221, 2, 250, - 216, 159, 175, 236, 64, 0, 154, 231, 32, 251, 9, 42, 61, 14, 115, 15, 255, 0, 173, 198, 221, 255, 39, 99, 31, 255, 24, 87, 53, 255, 74, 135, 166, 6, 31, 139, 11, 28, 145, 29, 253, 221, 196, 29, 131, 191, 252, 29, 135, 248, 159, 254, 51, 32, 159, 250, 254, 7, 153, 223, 255, 27, 39, 255, 43, 145, 228, 27, 255, 241, - 0, 3, 10, 15, 128, 16, 31, 72, 247, 46, 92, 245, 159, 255, 245, 10, 31, 228, 15, 46, 147, 253, 189, 48, 63, 232, 255, 196, 119, 207, 30, 114, 159, 255, 255, 254, 48, 159, 143, 255, 229, 159, 95, 16, 31, 207, 30, 143, 223, 0, 4, 168, 159, 73, 31, 255, 159, 0, 127, 48, 15, 255, 15, 159, 80, 3, 43, 163, 6, 63, - 252, 15, 80, 255, 253, 11, 255, 241, 145, 5, 105, 25, 16, 0, 18, 10, 243, 42, 119, 78, 135, 62, 139, 121, 18, 240, 28, 26, 128, 101, 143, 153, 16, 0, 0, 31, 0, 112, 31, 155, 169, 248, 63, 31, 155, 30, 47, 6, 14, 255, 19, 50, 3, 171, 52, 67, 119, 33, 243, 0, 69, 239, 180, 187, 16, 0, 102, 7, 149, 85, - 16, 0, 228, 158, 189, 31, 235, 255, 29, 240, 255, 85, 28, 168, 95, 29, 3, 47, 26, 35, 95, 25, 144, 79, 155, 255, 5, 126, 17, 52, 226, 255, 255, 37, 119, 6, 255, 77, 9, 48, 4, 255, 144, 0, 239, 208, 6, 147, 0, 31, 12, 0, 42, 102, 15, 31, 255, 248, 14, 13, 28, 5, 31, 236, 191, 15, 192, 6, 20, 33, - 7, 0, 111, 6, 64, 31, 32, 31, 183, 224, 9, 65, 19, 0, 3, 10, 91, 55, 127, 203, 17, 127, 83, 51, 119, 139, 255, 185, 245, 153, 153, 255, 133, 64, 127, 255, 30, 115, 187, 203, 187, 96, 27, 11, 47, 3, 176, 58, 47, 153, 153, 146, 64, 16, 159, 47, 15, 246, 15, 128, 18, 44, 231, 26, 49, 75, 32, 193, 135, 32, - 255, 175, 55, 123, 18, 0, 225, 135, 46, 71, 43, 93, 116, 34, 111, 187, 187, 161, 1, 167, 15, 0, 81, 127, 1, 135, 1, 59, 0, 255, 2, 31, 11, 0, 43, 0, 87, 47, 255, 16, 37, 80, 3, 145, 3, 221, 8, 143, 3, 38, 31, 253, 47, 190, 16, 239, 221, 221, 216, 15, 251, 32, 1, 17, 17, 0, 71, 24, 113, 3, - 106, 127, 28, 233, 175, 255, 17, 17, 17, 153, 16, 86, 251, 41, 22, 253, 16, 29, 143, 236, 111, 32, 82, 91, 131, 16, 11, 127, 23, 127, 80, 103, 32, 107, 111, 76, 11, 111, 44, 15, 69, 159, 63, 207, 32, 255, 249, 1, 245, 48, 255, 249, 111, 16, 3, 191, 16, 7, 61, 111, 16, 11, 0, 49, 30, 7, 134, 255, 253, 155, - 98, 41, 155, 17, 223, 140, 111, 24, 156, 124, 139, 196, 28, 151, 156, 251, 11, 255, 17, 44, 197, 2, 171, 187, 233, 123, 179, 123, 244, 169, 153, 119, 84, 15, 200, 6, 247, 6, 255, 72, 0, 59, 98, 125, 43, 7, 13, 0, 35, 51, 62, 29, 225, 255, 161, 11, 148, 143, 120, 26, 73, 39, 77, 107, 119, 244, 143, 58, 171, 128, - 191, 255, 210, 31, 255, 243, 15, 255, 17, 3, 187, 170, 207, 78, 64, 9, 26, 219, 15, 30, 97, 63, 31, 52, 165, 63, 63, 68, 208, 23, 126, 30, 123, 254, 37, 123, 64, 213, 84, 191, 28, 137, 11, 23, 9, 4, 26, 240, 3, 127, 26, 244, 8, 255, 247, 16, 111, 255, 241, 179, 97, 63, 239, 253, 119, 79, 255, 32, 3, 254, - 153, 40, 143, 255, 64, 127, 96, 90, 115, 252, 72, 55, 223, 99, 44, 180, 181, 62, 31, 91, 1, 159, 5, 123, 5, 112, 54, 83, 252, 233, 64, 0, 35, 8, 61, 3, 251, 0, 3, 3, 63, 148, 127, 168, 210, 14, 127, 46, 2, 15, 192, 6, 108, 20, 114, 163, 126, 11, 55, 0, 110, 22, 24, 127, 254, 5, 231, 20, 87, 119, - 122, 38, 123, 117, 44, 87, 0, 103, 175, 79, 208, 5, 31, 116, 8, 211, 255, 242, 58, 119, 253, 135, 119, 31, 244, 215, 216, 167, 191, 29, 133, 5, 32, 224, 30, 244, 159, 255, 48, 166, 96, 16, 3, 251, 16, 7, 25, 33, 48, 113, 16, 15, 69, 31, 199, 185, 31, 203, 47, 207, 15, 128, 3, 151, 47, 215, 64, 32, 31, 219, - 45, 246, 9, 25, 35, 43, 215, 25, 124, 67, 251, 55, 131, 159, 25, 105, 156, 57, 27, 2, 255, 252, 131, 110, 46, 30, 239, 30, 124, 255, 30, 47, 223, 235, 64, 45, 28, 236, 0, 223, 225, 57, 1, 133, 0, 64, 115, 0, 3, 0, 242, 111, 254, 0, 83, 15, 255, 16, 40, 211, 7, 208, 3, 170, 5, 123, 239, 247, 144, 3, - 249, 134, 131, 141, 110, 15, 203, 7, 146, 174, 15, 47, 186, 128, 32, 167, 221, 221, 215, 220, 48, 15, 255, 29, 10, 95, 135, 159, 3, 221, 197, 221, 239, 26, 7, 58, 147, 189, 59, 16, 29, 113, 48, 114, 30, 5, 237, 221, 141, 37, 127, 31, 119, 189, 126, 235, 255, 0, 25, 129, 255, 112, 223, 250, 255, 138, 208, 16, 23, 144, - 3, 15, 255, 15, 30, 30, 64, 95, 17, 141, 168, 143, 31, 59, 127, 22, 105, 63, 30, 57, 26, 132, 58, 147, 254, 0, 5, 191, 124, 255, 249, 13, 31, 87, 175, 13, 29, 15, 29, 28, 143, 29, 23, 255, 252, 95, 30, 34, 243, 30, 38, 80, 13, 253, 146, 0, 228, 12, 255, 229, 48, 135, 64, 3, 253, 192, 123, 0, 127, 19, - 94, 15, 161, 12, 27, 31, 204, 4, 2, 222, 96, 31, 37, 170, 240, 27, 141, 241, 16, 112, 242, 25, 95, 248, 45, 162, 191, 68, 63, 155, 80, 143, 246, 7, 237, 49, 202, 16, 15, 23, 251, 36, 50, 47, 29, 31, 127, 29, 52, 144, 255, 29, 48, 31, 187, 177, 14, 96, 18, 20, 242, 42, 115, 44, 227, 119, 239, 195, 4, 255, - 234, 23, 81, 32, 143, 255, 242, 112, 0, 3, 188, 124, 49, 41, 24, 226, 67, 226, 254, 255, 206, 255, 254, 250, 1, 207, 18, 206, 205, 7, 239, 80, 26, 95, 255, 121, 48, 30, 175, 241, 166, 80, 31, 255, 208, 95, 151, 9, 103, 6, 3, 239, 79, 115, 16, 32, 7, 30, 223, 45, 251, 250, 51, 23, 19, 27, 77, 247, 138, 1, - 209, 217, 207, 30, 17, 6, 39, 120, 45, 96, 29, 100, 9, 233, 255, 243, 246, 16, 3, 253, 80, 7, 32, 15, 4, 234, 91, 255, 243, 30, 194, 243, 28, 206, 243, 2, 253, 16, 85, 39, 196, 223, 85, 3, 2, 40, 119, 3, 209, 1, 251, 247, 183, 159, 255, 244, 69, 7, 229, 0, 121, 149, 133, 26, 24, 27, 124, 31, 31, 232, - 63, 31, 236, 75, 150, 190, 64, 115, 48, 3, 7, 44, 239, 172, 80, 27, 155, 179, 80, 31, 39, 241, 255, 0, 127, 18, 15, 255, 13, 63, 255, 230, 213, 85, 63, 25, 215, 128, 3, 255, 255, 32, 123, 180, 8, 91, 43, 85, 93, 22, 145, 11, 128, 3, 32, 115, 96, 80, 3, 176, 0, 0, 0, 255, 1, 17, 255, 2, 34, 255, - 3, 51, 255, 4, 68, 255, 15, 5, 85, 255, 6, 102, 255, 7, 119, 255, 15, 255, 137, 67, 87, 68, 72, 47, 30, 251, 42, 247, 84, 47, 235, 9, 0, 9, 1, 255, 5, 7, 0, 5, 5, 0, 20, 20, 239, 0, 18, 18, 32, 2, 19, 19, 0, 15, 159, 15, 32, 2, 16, 14, 6, 6, 0, 17, 17, 252, 0, 14, 14, 0, - 23, 23, 80, 26, 16, 35, 25, 16, 41, 160, 35, 16, 53, 24, 24, 32, 38, 16, 56, 13, 182, 13, 32, 50, 22, 22, 32, 2, 25, 25, 32, 53, 192, 21, 21, 32, 89, 16, 11, 16, 86, 64, 14, 16, 23, 16, 107, 0, 64, 2, 16, 35, 64, 14, 16, 95, 160, 14, 64, 23, 16, 65, 16, 62, 0, 16, 77, 16, 125, 16, - 128, 160, 20, 64, 2, 64, 62, 112, 26, 16, 194, 3, 16, 110, 112, 41, 64, 59, 64, 68, 160, 20, 16, 152, 26, 26, 59, 32, 179, 16, 212, 67, 77, 65, 27, 178, 1, 108, 58, 47, 249, 127, 125, 85, 0, 32, 31, 250, 33, 30, 141, 175, 46, 31, 145, 65, 30, 124, 66, 0, 4, 0, 171, 67, 31, 57, 68, 30, 61, 69, - 30, 61, 70, 0, 235, 8, 0, 72, 17, 60, 73, 29, 197, 75, 0, 255, 11, 0, 76, 0, 12, 0, 77, 0, 255, 13, 0, 78, 0, 14, 0, 79, 0, 239, 15, 0, 80, 28, 89, 81, 0, 17, 0, 234, 82, 0, 18, 30, 146, 19, 17, 107, 20, 16, 85, 255, 21, 0, 86, 0, 22, 0, 87, 0, 254, 23, 0, 88, 0, 24, - 0, 89, 30, 245, 255, 95, 0, 26, 0, 105, 0, 27, 172, 255, 116, 0, 28, 172, 196, 0, 29, 172, 255, 224, 0, 30, 176, 152, 0, 31, 176, 255, 180, 0, 32, 177, 35, 0, 33, 178, 255, 148, 0, 34, 178, 200, 0, 35, 178, 255, 228, 0, 36, 179, 0, 0, 37, 180, 255, 220, 0, 38, 181, 20, 0, 39, 181, 255, 160, 0, - 40, 183, 236, 0, 41, 184, 255, 92, 0, 42, 185, 124, 0, 43, 185, 255, 172, 0, 44, 185, 200, 0, 45, 186, 255, 133, 0, 46, 186, 168, 0, 47, 186, 255, 187, 0, 48, 188, 132, 0, 49, 188, 255, 248, 0, 50, 189, 136, 0, 51, 192, 255, 172, 0, 52, 193, 28, 0, 53, 193, 255, 36, 0, 54, 193, 56, 0, 55, 193, 255, - 75, 0, 56, 194, 136, 0, 57, 194, 255, 164, 0, 58, 194, 181, 0, 59, 194, 255, 220, 0, 60, 194, 237, 0, 61, 197, 255, 180, 0, 62, 198, 36, 0, 63, 198, 255, 169, 0, 64, 198, 208, 0, 65, 199, 255, 64, 0, 66, 199, 68, 0, 67, 199, 255, 116, 0, 68, 199, 125, 0, 69, 199, 255, 136, 0, 70, 199, 144, 0, 71, - 199, 255, 165, 0, 72, 200, 0, 0, 73, 200, 255, 4, 0, 74, 200, 252, 0, 75, 201, 255, 192, 0, 76, 204, 180, 0, 77, 208, 255, 108, 0, 78, 210, 188, 0, 79, 211, 255, 124, 0, 80, 213, 88, 0, 81, 213, 255, 92, 0, 82, 213, 136, 0, 83, 213, 176, 216, 66, 109, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, - 122, 48, 0, 0, 35, 32, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 35, 32, 236, 0, 0, 0, 16, 3, 2, 128, 16, 6, 80, 3, 90, 112, 1, 4, 64, 27, 0, 18, 16, 35, 96, 16, 39, 255, 160, 0, 0, 1, 224, 0, 18, 1, 123, 48, 34, 82, 79, 79, 84, 16, 59, 5, 234, 239, 23, - 0, 5, 32, 51, 65, 78, 73, 77, 119, 16, 75, 24, 15, 193, 48, 15, 5, 66, 76, 190, 89, 32, 31, 63, 16, 1, 0, 3, 16, 99, 251, 10, 84, 73, 77, 71, 16, 107, 93, 17, 191, 155, 48, 47, 13, 255, 255, 15, 193, 2, 23, 16, 47, 16, 127, 32, 80, 16, 32, 119, 255, 255, 16, 171, 1, 16, 19, 63, 16, 147, - 2, 128, 19, 17, 155, 87, 16, 39, 93, 16, 167, 3, 128, 39, 0, 46, 2, 44, 128, 168, 96, 19, 184, 16, 79, 2, 255, 16, 0, 96, 79, 255, 0, 5, 185, 60, 17, 0, 0, 29, 110, 64, 211, 1, 28, 48, 219, 6, 65, 18, 16, 19, 151, 42, 16, 203, 16, 251, 1, 32, 127, 0, 0, 7, 213, 154, 236, 16, 39, 52, - 17, 7, 64, 17, 15, 248, 79, 208, 99, 1, 224, 99, 160, 119, 0, 10, 247, 220, 77, 16, 99, 68, 16, 158, 16, 59, 27, 168, 208, 159, 2, 119, 0, 59, 11, 13, 202, 247, 16, 159, 98, 0, 0, 223, 31, 0, 81, 99, 0, 0, 14, 71, 177, 75, 16, 179, 109, 16, 19, 33, 115, 192, 49, 143, 15, 234, 169, 8, 16, 199, - 134, 17, 170, 32, 96, 39, 145, 3, 3, 63, 0, 159, 11, 0, 4, 5, 46, 0, 46, 46, 0, 101, 255, 114, 114, 111, 114, 109, 101, 115, 115, 255, 97, 103, 101, 119, 105, 110, 100, 111, 255, 119, 0, 97, 110, 105, 109, 0, 97, 255, 112, 112, 101, 97, 114, 46, 98, 114, 254, 108, 97, 110, 0, 101, 110, 100, 80, 9, 247, 119, - 97, 105, 116, 80, 20, 98, 108, 121, 143, 116, 0, 62, 1, 32, 50, 16, 24, 116, 105, 109, 103, 255, 0, 109, 121, 98, 97, 115, 101, 46, 227, 116, 112, 108, 16, 10, 0, 42, 1, 64, 24, 115, 121, 231, 115, 98, 103, 48, 36, 192, 173, 82, 76, 65, 251, 78, 254, 255, 0, 10, 49, 183, 16, 0, 250, 2, 112, 97, 116, 49, - 18, 171, 36, 82, 159, 171, 28, 80, 11, 20, 34, 141, 65, 48, 174, 0, 0, 238, 112, 97, 105, 32, 35, 232, 0, 21, 113, 123, 190, 20, 80, 43, 156, 87, 105, 110, 69, 32, 237, 143, 77, 64, 237, 113, 156, 82, 227, 80, 82, 76, 80, 189, 65, 66, 217, 0, 12, 0, 1, 113, 229, 12, 102, 35, 15, 193, 240, 18, 200, 17, - 137, 65, 160, 160, 159, 210, 86, 67, 112, 47, 16, 192, 47, 51, 15, 76, 64, 47, 217, 67, 127, 67, 81, 66, 71, 1, 141, 0, 80, 111, 28, 41, 0, 75, 30, 209, 31, 24, 145, 31, 32, 82, 157, 34, 235, 32, 247, 0, 30, 0, 50, 35, 173, 69, 110, 100, 20, 1, 27, 71, 112, 239, 20, 29, 66, 20, 77, 64, 1, 27, - 13, 33, 15, 192, 193, 76, 193, 75, 1, 27, 38, 0, 75, 2, 2, 63, 0, 19, 207, 162, 63, 186, 1, 146, 63, 20, 0, 30, 36, 205, 87, 18, 215, 58, 36, 247, 82, 63, 196, 0, 11, 242, 63, 132, 2, 63, 13, 164, 68, 242, 63, 1, 1, 35, 0, 242, 51, 1, 193, 23, 2, 39, 31, 51, 0, 63, 1, 131, 63, 89, - 84, 67, 63, 20, 147, 16, 0, 171, 37, 19, 175, 49, 99, 47, 68, 21, 117, 67, 228, 250, 0, 0, 116, 120, 108, 35, 83, 84, 53, 161, 43, 69, 139, 37, 254, 35, 86, 3, 60, 38, 11, 77, 121, 181, 66, 99, 197, 77, 121, 163, 65, 87, 131, 197, 77, 253, 121, 83, 121, 115, 66, 71, 51, 234, 102, 170, 110, 48, 83, 104, - 208, 83, 44, 86, 87, 67, 48, 83, 126, 68, 113, 70, 111, 110, 116, 50, 54, 20, 101, 238, 102, 110, 116, 192, 19, 107, 111, 114, 0, 22, 2, 227, 115, 99, 104, 80, 45, 21, 32, 52, 15, 6, 140, 213, 0, 22, 54, 177, 100, 22, 199, 164, 70, 74, 1, 165, 92, 22, 167, 184, 22, 211, 19, 251, 2, 22, 163, 2, 170, 148, - 22, 223, 212, 22, 62, 48, 22, 66, 140, 22, 70, 149, 204, 22, 218, 19, 215, 4, 19, 161, 4, 16, 15, 4, 85, 16, 15, 5, 19, 231, 5, 19, 177, 5, 16, 31, 5, 89, 16, 31, 6, 19, 247, 6, 76, 164, 43, 119, 23, 230, 81, 16, 1, 240, 112, 7, 255, 96, 1, 224, 0, 39, 71, 83, 218, 104, 97, 65, 37, 67, - 32, 5, 138, 6, 100, 0, 63, 8, 219, 1, 17, 229, 191, 63, 128, 64, 3, 1, 4, 180, 30, 128, 91, 76, 84, 0, 91, 36, 1, 0, 91, 8, 0, 180, 3, 250, 60, 0, 90, 0, 150, 112, 7, 255, 0, 183, 38, 38, 0, 180, 3, 0, 91, 26, 1, 1, 19, 11, 1, 178, 3, 0, 80, 112, 7, 158, 80, 1, 175, 13, - 86, 30, 74, 112, 74, 97, 0, 63, 32, 10, 0, 60, 3, 2, 47, 25, 6, 35, 2, 215, 195, 150, 2, 47, 11, 2, 193, 213, 111, 34, 47, 66, 228, 66, 47, 80, 105, 99, 68, 244, 117, 109, 109, 121, 8, 19, 3, 255, 192, 1, 2, 139, 33, 255, 84, 101, 120, 116, 72, 97, 108, 102, 0, 1, 119, 35, 0, 60, 3, 3, - 103, 28, 96, 127, 193, 184, 0, 127, 29, 177, 245, 3, 231, 25, 120, 88, 83, 75, 114, 75, 111, 4, 39, 38, 0, 66, 3, 2, 119, 29, 240, 67, 110, 83, 105, 0, 127, 45, 192, 66, 3, 55, 25, 97, 255, 0, 193, 3, 1, 255, 29, 177, 64, 1, 255, 36, 193, 3, 2, 127, 29, 177, 64, 5, 231, 25, 239, 112, 97, 110, - 42, 155, 76, 1, 4, 255, 255, 0, 82, 111, 111, 116, 80, 97, 110, 142, 101, 3, 201, 15, 213, 211, 103, 147, 112, 97, 115, 42, 231, 244, 8, 112, 105, 99, 42, 239, 128, 32, 83, 4, 23, 17, 48, 0, 83, 11, 246, 155, 8, 1, 182, 83, 230, 95, 38, 103, 96, 211, 137, 7, 16, 211, 11, 59, 2, 46, 39, 128, 80, 3, - 6, 167, 6, 65, 157, 240, 74, 19, 96, 211, 119, 110, 100, 43, 195, 164, 22, 33, 39, 119, 27, 220, 164, 65, 30, 9, 193, 16, 1, 39, 8, 212, 67, 250, 27, 83, 130, 11, 75, 7, 104, 43, 235, 247, 139, 128, 1, 0, 239, 16, 62, 223, 30, 144, 160, 163, 0, 160, 3, 0, 247, 17, 0, 163, 35, 140, 3, 0, 163, 21, - 31, 149, 114, 27, 1, 255, 5, 215, 7, 47, 200, 202, 66, 218, 1, 71, 9, 44, 147, 176, 2, 27, 1, 9, 2, 27, 24, 13, 34, 239, 2, 24, 3, 2, 239, 17, 226, 27, 116, 120, 45, 223, 1, 146, 200, 82, 27, 9, 122, 3, 64, 127, 16, 2, 27, 5, 225, 29, 111, 190, 82, 31, 233, 84, 1, 84, 0, 5, 79, 24, - 95, 31, 251, 116, 105, 156, 65, 183, 153, 154, 65, 231, 237, 153, 153, 41, 71, 47, 232, 0, 87, 0, 190, 228, 26, 169, 114, 0, 101, 0, 110, 26, 65, 186, 32, 26, 69, 101, 0, 115, 30, 15, 76, 48, 7, 255, 101, 0, 45, 0, 47, 0, 83, 0, 174, 99, 80, 35, 105, 31, 169, 118, 0, 111, 16, 47, 186, 45, 30, 151, - 103, 0, 97, 16, 53, 103, 48, 47, 169, 105, 31, 175, 32, 16, 41, 112, 48, 37, 32, 47, 101, 42, 16, 85, 64, 79, 114, 30, 195, 87, 16, 59, 105, 16, 77, 174, 75, 16, 61, 110, 16, 97, 111, 0, 108, 16, 115, 114, 32, 55, 115, 0, 116, 30, 127, 32, 91, 110, 30, 135, 167, 70, 16, 137, 104, 48, 27, 32, 53, 97, - 0, 117, 210, 0, 102, 16, 103, 101, 16, 35, 32, 163, 116, 48, 167, 170, 46, 30, 175, 66, 16, 139, 116, 48, 15, 32, 16, 73, 164, 105, 80, 181, 100, 48, 9, 128, 109, 66, 16, 215, 64, 19, 129, 110, 16, 73, 64, 171, 32, 179, 32, 123, 32, 63, 64, 19, 44, 92, 30, 255, 117, 16, 191, 10, 0, 119, 80, 23, 32, 187, - 85, 32, 157, 73, 17, 21, 102, 48, 239, 109, 16, 235, 116, 28, 16, 255, 32, 189, 33, 43, 32, 0, 122, 16, 155, 32, 183, 164, 114, 27, 233, 97, 16, 205, 96, 155, 0, 161, 199, 2, 22, 6, 38, 3, 63, 15, 161, 199, 0, 1, 199, 255, 1, 199, 89, 0, 240, 195, 143, 39, 203, 23, 51, 143, 192, 3, 143, 16, 18, 45, - 122, 0, 6, 40, 29, 117, 227, 143, 216, 31, 251, 4, 86, 43, 35, 220, 51, 39, 255, 48, 234, 48, 226, 48, 179, 48, 243, 255, 48, 110, 144, 26, 79, 225, 48, 76, 255, 82, 7, 48, 140, 48, 126, 48, 87, 255, 48, 95, 0, 10, 48, 100, 48, 106, 223, 48, 78, 16, 3, 74, 48, 89, 48, 107, 253, 48, 111, 48, 1, 48, - 204, 16, 41, 193, 252, 48, 227, 48, 175, 48, 110, 16, 31, 32, 55, 255, 200, 48, 237, 48, 252, 48, 235, 48, 254, 185, 48, 198, 48, 163, 48, 195, 16, 25, 255, 107, 48, 85, 48, 143, 48, 137, 48, 255, 90, 48, 107, 0, 10, 255, 33, 48, 239, 146, 98, 188, 16, 79, 102, 48, 79, 48, 161, 96, 16, 25, 68, 52, 36, 144, - 239, 12, 4, 4, 70, 239, 192, 172, 128, 0, 239, 21, 7, 0, 239, 146, 1, 20, 197, 111, 202, 194, 82, 1, 223, 23, 160, 23, 59, 15, 30, 150, 1, 223, 5, 64, 85, 187, 255, 200, 56, 204, 96, 49, 85, 49, 72, 255, 214, 16, 49, 74, 214, 0, 186, 0, 255, 49, 57, 49, 74, 49, 72, 186, 112, 255, 177, 120, 0, 10, - 49, 96, 205, 8, 247, 187, 164, 211, 240, 16, 17, 77, 186, 112, 255, 184, 36, 49, 78, 184, 225, 49, 78, 254, 186, 0, 210, 44, 200, 224, 205, 16, 31, 255, 179, 140, 201, 108, 49, 78, 187, 52, 223, 49, 87, 32, 67, 204, 208, 186, 168, 0, 130, 10, 0, 79, 61, 177, 19, 11, 144, 4, 2, 3, 25, 33, 19, 14, 1, 19, - 183, 136, 40, 199, 151, 204, 106, 4, 7, 23, 180, 16, 1, 30, 165, 2, 39, 14, 255, 101, 229, 96, 105, 107, 33, 101, 229, 255, 98, 55, 82, 23, 91, 102, 150, 232, 255, 151, 139, 152, 157, 154, 168, 131, 170, 255, 103, 47, 78, 42, 0, 10, 89, 130, 255, 78, 0, 79, 196, 78, 76, 78, 13, 255, 96, 118, 150, 63, 108, 153, - 78, 148, 255, 83, 69, 103, 58, 79, 238, 150, 63, 255, 78, 76, 79, 196, 0, 10, 130, 207, 255, 79, 196, 101, 135, 108, 213, 102, 110, 255, 114, 53, 110, 170, 78, 148, 78, 42, 255, 78, 34, 101, 229, 101, 224, 84, 200, 255, 89, 130, 0, 10, 95, 151, 82, 6, 255, 150, 63, 139, 237, 84, 140, 89, 130, 247, 81, 101, 89, 28, - 32, 5, 99, 201, 98, 224, 17, 0, 10, 0, 117, 43, 177, 39, 13, 76, 4, 4, 63, 25, 33, 39, 184, 16, 1, 39, 196, 112, 97, 101, 76, 223, 234, 67, 111, 193, 49, 11, 103, 25, 10, 67, 4, 0, 248, 92, 95, 0, 81, 1, 74, 67, 194, 154, 84, 10, 67, 13, 28, 7, 0, 130, 16, 1, 10, 10, 67, 17, 170, 86, - 26, 61, 117, 26, 27, 108, 57, 211, 122, 26, 69, 149, 99, 57, 229, 41, 41, 99, 89, 77, 32, 89, 239, 78, 58, 57, 135, 42, 79, 117, 0, 107, 26, 111, 224, 57, 191, 186, 97, 26, 77, 116, 0, 233, 26, 19, 233, 48, 59, 129, 109, 57, 111, 42, 145, 42, 35, 74, 59, 42, 155, 41, 113, 106, 72, 26, 127, 117, 48, 113, - 42, 95, 49, 41, 113, 119, 171, 48, 247, 53, 0, 244, 3, 93, 171, 194, 76, 0, 247, 21, 11, 0, 247, 155, 180, 21, 209, 239, 184, 164, 49, 239, 80, 12, 51, 12, 66, 47, 231, 62, 95, 16, 1, 12, 8, 163, 17, 49, 0, 80, 48, 110, 252, 255, 55, 255, 73, 255, 73, 120, 169, 24, 85, 247, 98, 225, 95, 53, 152, 125, - 233, 48, 146, 246, 99, 165, 125, 154, 168, 101, 48, 2, 224, 179, 42, 0, 176, 3, 97, 171, 72, 0, 179, 21, 13, 0, 179, 87, 196, 211, 87, 40, 184, 44, 1, 103, 23, 80, 16, 1, 18, 8, 43, 95, 176, 195, 0, 192, 3, 40, 1, 119, 26, 32, 195, 19, 0, 195, 103, 208, 212, 223, 183, 140, 2, 239, 23, 160, 92, 16, - 1, 20, 7, 139, 107, 176, 207, 0, 204, 3, 3, 11, 26, 32, 207, 142, 21, 0, 207, 108, 134, 219, 192, 7, 103, 114, 112, 45, 75, 255, 28, 82, 111, 111, 116, 71, 114, 111, 238, 117, 112, 0, 0, 0, 17, 32, 175, 48, 31, 56, 132, 1, 31, 60, 20, 149, 17, 169, 47, 69, 8, 16, 1, 141, 122, 73, 111, 87, 1, 80, - 39, 191, 103, 255, 0, 0, 13, 0, 95, 3, 16, 30, 24, 117, 0, 95, 21, 79, 212, 57, 204, 0, 9, 16, 75, 245, 143, 255, 255, 3, 31, 156, 10, 31, 160, 13, 73, 31, 164, 14, 32, 95, 31, 245, 204, 16, 0, 0, 135, 2, 182, 213, 17, 107, 32, 35, 251, 16, 39, 246, 16, 43, 241, 79, 80, 3, 246, 80, 19, 48, - 63, 48, 0, 3, 191, 40, 31, 251, 44, 141, 31, 80, 3, 111, 32, 19, 32, 59, 0, 191, 7, 82, 1, 31, 33, 221, 16, 0, 187, 80, 0, 32, 175, 238, 16, 0, 0, 46, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 67, 48, 0, 0, 0, 0, 0, 0, 67, 48, 0, 0, 128, 0, 0, 0, 67, 48, 0, 0 -}; + 82, 65, 82, 67, 0, 1, 202, 192, 0, 0, 0, 32, 0, 0, 16, 128, 0, 1, 186, 32, 0, 1, 186, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 38, 0, 0, 0, 32, 0, 0, 0, 138, 0, 0, 2, 128, 0, 0, 3, 32, 0, 0, 13, 96, 0, 138, 1, 0, 0, 0, 0, 0, 82, 79, 79, 84, 0, 0, + 0, 5, 183, 146, 0, 15, 0, 0, 0, 0, 74, 80, 74, 65, 0, 0, 0, 32, 68, 27, 0, 4, 0, 0, 0, 15, 77, 69, 83, 83, 0, 0, 0, 43, 138, 237, 0, 3, 0, 0, 0, 19, 76, 65, 89, 79, 0, 0, 0, 66, 15, 4, 0, 3, 0, 0, 0, 22, 85, 83, 69, 78, 0, 0, 0, 94, 70, 122, 0, 4, + 0, 0, 0, 25, 77, 69, 83, 83, 0, 0, 0, 104, 138, 237, 0, 3, 0, 0, 0, 29, 76, 65, 89, 79, 0, 0, 0, 127, 15, 4, 0, 3, 0, 0, 0, 32, 85, 83, 83, 80, 0, 0, 0, 155, 110, 142, 0, 4, 0, 0, 0, 35, 77, 69, 83, 83, 0, 0, 0, 165, 138, 237, 0, 3, 0, 0, 0, 39, 76, 65, + 89, 79, 0, 0, 0, 188, 15, 4, 0, 3, 0, 0, 0, 42, 85, 83, 70, 82, 0, 0, 0, 216, 195, 252, 0, 4, 0, 0, 0, 45, 77, 69, 83, 83, 0, 0, 0, 225, 138, 237, 0, 3, 0, 0, 0, 49, 76, 65, 89, 79, 0, 0, 0, 248, 15, 4, 0, 3, 0, 0, 0, 52, 69, 85, 69, 78, 0, 0, 1, 20, + 189, 128, 0, 4, 0, 0, 0, 55, 77, 69, 83, 83, 0, 0, 1, 30, 138, 237, 0, 3, 0, 0, 0, 59, 76, 65, 89, 79, 0, 0, 1, 53, 15, 4, 0, 3, 0, 0, 0, 62, 69, 85, 83, 80, 0, 0, 1, 81, 229, 148, 0, 4, 0, 0, 0, 65, 77, 69, 83, 83, 0, 0, 1, 91, 138, 237, 0, 3, 0, 0, + 0, 69, 76, 65, 89, 79, 0, 0, 1, 114, 15, 4, 0, 3, 0, 0, 0, 72, 69, 85, 70, 82, 0, 0, 1, 142, 64, 254, 0, 4, 0, 0, 0, 75, 77, 69, 83, 83, 0, 0, 1, 151, 138, 237, 0, 3, 0, 0, 0, 79, 76, 65, 89, 79, 0, 0, 1, 174, 15, 4, 0, 3, 0, 0, 0, 82, 69, 85, 71, 69, + 0, 0, 1, 202, 63, 42, 0, 4, 0, 0, 0, 85, 77, 69, 83, 83, 0, 0, 1, 211, 138, 237, 0, 3, 0, 0, 0, 89, 76, 65, 89, 79, 0, 0, 1, 234, 15, 4, 0, 3, 0, 0, 0, 92, 69, 85, 73, 84, 0, 0, 2, 6, 204, 128, 0, 4, 0, 0, 0, 95, 77, 69, 83, 83, 0, 0, 2, 16, 138, 237, + 0, 3, 0, 0, 0, 99, 76, 65, 89, 79, 0, 0, 2, 39, 15, 4, 0, 3, 0, 0, 0, 102, 69, 85, 68, 85, 0, 0, 2, 67, 192, 76, 0, 4, 0, 0, 0, 105, 77, 69, 83, 83, 0, 0, 2, 75, 138, 237, 0, 3, 0, 0, 0, 109, 76, 65, 89, 79, 0, 0, 2, 98, 15, 4, 0, 3, 0, 0, 0, 112, + 67, 78, 83, 73, 0, 0, 2, 126, 160, 49, 0, 4, 0, 0, 0, 115, 77, 69, 83, 83, 0, 0, 2, 140, 138, 237, 0, 3, 0, 0, 0, 119, 76, 65, 89, 79, 0, 0, 2, 163, 15, 4, 0, 3, 0, 0, 0, 122, 75, 82, 75, 79, 0, 0, 2, 191, 112, 143, 0, 4, 0, 0, 0, 125, 77, 69, 83, 83, 0, 0, + 2, 200, 138, 237, 0, 3, 0, 0, 0, 129, 76, 65, 89, 79, 0, 0, 2, 223, 15, 4, 0, 3, 0, 0, 0, 132, 76, 65, 89, 79, 0, 0, 2, 251, 15, 4, 0, 3, 0, 0, 0, 135, 255, 255, 68, 27, 2, 0, 0, 32, 0, 0, 0, 1, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 70, 122, 2, 0, 0, 94, + 0, 0, 0, 4, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 110, 142, 2, 0, 0, 155, 0, 0, 0, 7, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 195, 252, 2, 0, 0, 216, 0, 0, 0, 10, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 189, 128, 2, 0, 1, 20, 0, 0, 0, 13, 0, 0, 0, 16, 0, 0, + 0, 0, 255, 255, 229, 148, 2, 0, 1, 81, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 64, 254, 2, 0, 1, 142, 0, 0, 0, 19, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 63, 42, 2, 0, 1, 202, 0, 0, 0, 22, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 204, 128, 2, 0, 2, 6, + 0, 0, 0, 25, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 192, 76, 2, 0, 2, 67, 0, 0, 0, 28, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 160, 49, 2, 0, 2, 126, 0, 0, 0, 31, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 112, 143, 2, 0, 2, 191, 0, 0, 0, 34, 0, 0, 0, 16, 0, 0, + 0, 0, 255, 255, 15, 4, 2, 0, 2, 251, 0, 0, 0, 37, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 255, 255, 255, 255, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 0, 43, + 0, 0, 0, 2, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 0, 66, 0, 0, 0, 3, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, + 0, 0, 0, 19, 84, 47, 149, 0, 0, 55, 0, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 16, 0, 0, 0, 0, 0, 22, 206, 173, 149, 0, 0, 77, + 0, 0, 2, 128, 0, 0, 97, 128, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 1, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 0, 104, 0, 0, 0, 5, 0, 0, 0, 16, 0, 0, + 0, 0, 255, 255, 15, 4, 2, 0, 0, 127, 0, 0, 0, 6, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 29, 84, 47, 149, 0, 0, 116, + 0, 0, 100, 0, 0, 0, 2, 160, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 4, 0, 0, 0, 16, 0, 0, 0, 0, 0, 32, 206, 173, 149, 0, 0, 138, 0, 0, 102, 160, 0, 0, 21, 224, 0, 0, + 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 6, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 4, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 0, 165, 0, 0, 0, 8, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 0, 188, + 0, 0, 0, 9, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 39, 84, 47, 149, 0, 0, 177, 0, 0, 124, 128, 0, 0, 2, 160, 0, 0, + 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 7, 0, 0, 0, 16, 0, 0, 0, 0, 0, 42, 206, 173, 149, 0, 0, 199, 0, 0, 127, 32, 0, 0, 21, 160, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, + 0, 0, 0, 9, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 7, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 0, 225, 0, 0, 0, 11, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 0, 248, 0, 0, 0, 12, 0, 0, 0, 16, 0, 0, + 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 49, 84, 47, 149, 0, 0, 237, 0, 0, 148, 192, 0, 0, 2, 160, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, + 0, 0, 0, 11, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 10, 0, 0, 0, 16, 0, 0, 0, 0, 0, 52, 206, 173, 149, 0, 1, 3, 0, 0, 151, 96, 0, 0, 22, 224, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 16, 0, 0, + 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 10, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 1, 30, 0, 0, 0, 14, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 1, 53, 0, 0, 0, 15, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, + 0, 0, 0, 13, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 59, 84, 47, 149, 0, 1, 42, 0, 0, 174, 64, 0, 0, 2, 160, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 16, 0, 0, + 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 13, 0, 0, 0, 16, 0, 0, 0, 0, 0, 62, 206, 173, 149, 0, 1, 64, 0, 0, 176, 224, 0, 0, 21, 128, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, + 0, 0, 0, 13, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 1, 91, 0, 0, 0, 17, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 1, 114, 0, 0, 0, 18, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, + 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 69, 84, 47, 149, 0, 1, 103, 0, 0, 198, 96, 0, 0, 2, 192, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, + 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 0, 0, 72, 206, 173, 149, 0, 1, 125, 0, 0, 201, 32, 0, 0, 22, 64, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 18, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, + 0, 0, 255, 255, 138, 237, 2, 0, 1, 151, 0, 0, 0, 20, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 1, 174, 0, 0, 0, 21, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, + 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 79, 84, 47, 149, 0, 1, 163, 0, 0, 223, 96, 0, 0, 2, 160, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 20, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 19, 0, 0, 0, 16, 0, 0, + 0, 0, 0, 82, 206, 173, 149, 0, 1, 185, 0, 0, 226, 0, 0, 0, 22, 224, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 21, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 19, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 1, 211, + 0, 0, 0, 23, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 1, 234, 0, 0, 0, 24, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, + 0, 0, 0, 89, 84, 47, 149, 0, 1, 223, 0, 0, 248, 224, 0, 0, 2, 192, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 22, 0, 0, 0, 16, 0, 0, 0, 0, 0, 92, 206, 173, 149, 0, 1, 245, + 0, 0, 251, 160, 0, 0, 23, 0, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 22, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 2, 16, 0, 0, 0, 26, 0, 0, 0, 16, 0, 0, + 0, 0, 255, 255, 15, 4, 2, 0, 2, 39, 0, 0, 0, 27, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 25, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 99, 84, 47, 149, 0, 2, 28, + 0, 1, 18, 160, 0, 0, 2, 160, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 26, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 25, 0, 0, 0, 16, 0, 0, 0, 0, 0, 102, 206, 173, 149, 0, 2, 50, 0, 1, 21, 64, 0, 0, 21, 128, 0, 0, + 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 27, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 25, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 2, 75, 0, 0, 0, 29, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 2, 98, + 0, 0, 0, 30, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 28, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 109, 84, 47, 149, 0, 2, 87, 0, 1, 42, 192, 0, 0, 2, 160, 0, 0, + 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 29, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 28, 0, 0, 0, 16, 0, 0, 0, 0, 0, 112, 206, 173, 149, 0, 2, 109, 0, 1, 45, 96, 0, 0, 22, 64, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, + 0, 0, 0, 30, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 28, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 2, 140, 0, 0, 0, 32, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 2, 163, 0, 0, 0, 33, 0, 0, 0, 16, 0, 0, + 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 119, 84, 47, 149, 0, 2, 152, 0, 1, 67, 160, 0, 0, 2, 32, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, + 0, 0, 0, 32, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 31, 0, 0, 0, 16, 0, 0, 0, 0, 0, 122, 206, 173, 149, 0, 2, 174, 0, 1, 69, 192, 0, 0, 60, 96, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 33, 0, 0, 0, 16, 0, 0, + 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 31, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 138, 237, 2, 0, 2, 200, 0, 0, 0, 35, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 15, 4, 2, 0, 2, 223, 0, 0, 0, 36, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, + 0, 0, 0, 34, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 129, 84, 47, 149, 0, 2, 212, 0, 1, 130, 32, 0, 0, 2, 96, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 35, 0, 0, 0, 16, 0, 0, + 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 34, 0, 0, 0, 16, 0, 0, 0, 0, 0, 132, 206, 173, 149, 0, 2, 234, 0, 1, 132, 128, 0, 0, 44, 32, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 36, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, + 0, 0, 0, 34, 0, 0, 0, 16, 0, 0, 0, 0, 0, 135, 27, 67, 149, 0, 3, 6, 0, 1, 176, 160, 0, 0, 9, 128, 0, 0, 0, 0, 255, 255, 0, 46, 2, 0, 0, 0, 0, 0, 0, 37, 0, 0, 0, 16, 0, 0, 0, 0, 255, 255, 0, 184, 2, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 46, 0, 46, 46, 0, 101, 114, 114, 111, 114, 109, 101, 115, 115, 97, 103, 101, 97, 114, 99, 104, 105, 118, 101, 46, 114, 111, 100, 97, 116, 97, 0, 106, 112, 106, 97, 112, 97, 110, 101, 115, 101, 0, 109, + 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 117, 115, 101, 110, 103, 108, 105, 115, 104, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, + 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 117, 115, 115, 112, 97, 110, 105, 115, 104, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, + 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 117, 115, 102, 114, 101, 110, 99, 104, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, + 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 101, 117, 101, 110, 103, 108, 105, 115, 104, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, + 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 101, 117, 115, 112, 97, 110, 105, 115, 104, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, + 97, 114, 99, 0, 101, 117, 102, 114, 101, 110, 99, 104, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 101, 117, 103, 101, 114, 109, + 97, 110, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 101, 117, 105, 116, 97, 108, 105, 97, 110, 0, 109, 101, 115, 115, 97, 103, + 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 101, 117, 100, 117, 116, 99, 104, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, + 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 99, 110, 115, 105, 109, 112, 99, 104, 105, 110, 101, 115, 101, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, + 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 107, 114, 107, 111, 114, 101, 97, 110, 0, 109, 101, 115, 115, 97, 103, 101, 100, 97, 116, 97, 0, 115, 121, 115, 116, 101, 109, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, + 97, 0, 101, 109, 98, 101, 100, 100, 101, 100, 102, 111, 110, 116, 46, 97, 114, 99, 0, 108, 97, 121, 111, 117, 116, 100, 97, 116, 97, 0, 101, 114, 114, 111, 114, 109, 101, 115, 115, 97, 103, 101, 119, 105, 110, 100, 111, 119, 46, 97, 114, 99, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 4, 64, 0, 0, 0, 0, 0, 0, + 0, 0, 255, 82, 65, 82, 67, 0, 0, 4, 64, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 3, 32, 64, 3, 112, 1, 1, 64, 27, 0, 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, 79, 79, 84, 32, 27, 68, 27, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 16, 90, 80, 74, + 224, 64, 81, 226, 226, 16, 19, 28, 80, 15, 186, 160, 48, 107, 2, 207, 45, 16, 39, 42, 16, 8, 190, 128, 96, 19, 255, 255, 0, 46, 2, 128, 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, 3, 10, 46, 0, 46, 46, 0, 106, 112, 255, 106, 97, 112, 97, 110, 101, 115, 101, 255, 0, 109, 101, + 115, 115, 97, 103, 101, 247, 46, 98, 109, 103, 96, 11, 105, 100, 46, 255, 116, 98, 108, 0, 115, 116, 114, 117, 207, 99, 116, 48, 10, 144, 252, 77, 69, 83, 71, 91, 16, 43, 49, 80, 187, 2, 2, 208, 228, 73, 78, 191, 70, 16, 27, 0, 96, 0, 6, 0, 12, 21, 49, 62, 113, 56, 48, 159, 2, 144, 11, 62, 144, 23, + 122, 105, 128, 35, 1, 12, 144, 11, 40, 144, 59, 49, 130, 68, 223, 65, 84, 32, 123, 96, 0, 0, 48, 185, 247, 48, 252, 48, 209, 16, 3, 222, 48, 234, 255, 48, 170, 48, 174, 48, 227, 48, 233, 247, 48, 175, 48, 183, 16, 21, 110, 0, 10, 247, 48, 199, 48, 163, 16, 33, 175, 48, 146, 255, 48, 187, 48, 195, 48, 200, + 48, 87, 255, 48, 102, 48, 79, 48, 96, 48, 85, 207, 48, 68, 0, 59, 45, 112, 89, 0, 26, 10, 255, 255, 0, 2, 1, 48, 136, 0, 138, 173, 255, 48, 129, 48, 126, 48, 91, 48, 147, 221, 48, 103, 16, 105, 95, 48, 2, 16, 107, 143, 127, 16, 115, 79, 48, 111, 48, 1, 0, 10, 238, 0, 26, 16, 16, 41, 2, 48, + 123, 16, 32, 189, 95, 16, 128, 103, 44, 79, 83, 16, 165, 26, 191, 32, 16, 63, 5, 48, 104, 48, 138, 48, 254, 66, 48, 100, 48, 75, 48, 68, 16, 66, 175, 100, 16, 74, 68, 16, 174, 135, 0, 83, 214, 255, 98, 113, 138, 172, 102, 14, 102, 248, 86, 16, 197, 74, 176, 109, 127, 96, 203, 48, 2, 1, 9, 10, 255, 0, + 0, 146, 128, 108, 179, 48, 146, 255, 130, 30, 83, 240, 48, 107, 89, 39, 253, 81, 146, 150, 122, 255, 1, 2, 35, 13, 6, 62, 81, 167, 33, 123, 8, 33, 157, 67, 98, 50, 91, 254, 4, 0, 6, 4, 56, 56, 178, 82, 103, 165, 0, 211, 15, 8, 81, 219, 34, 215, 3, 19, 59, 24, 95, 19, 63, 4, 147, 39, 43, 67, + 79, 77, 77, 255, 69, 78, 84, 0, 68, 73, 83, 67, 235, 95, 48, 49, 80, 7, 50, 80, 15, 51, 0, 255, 84, 73, 84, 76, 69, 95, 77, 65, 223, 73, 78, 80, 10, 83, 85, 66, 0, 64, 47, 0, 0, 0, 144, 111, 112, 35, 163, 174, 55, 113, 97, 123, 96, 147, 28, 19, 62, 141, 80, 171, 0, 190, 231, 198, 20, 162, + 51, 19, 16, 153, 100, 67, 164, 158, 76, 51, 31, 18, 89, 19, 54, 175, 66, 51, 43, 119, 19, 129, 137, 230, 39, 67, 55, 20, 0, 0, 243, 251, 104, 17, 53, 51, 67, 16, 185, 23, 177, 213, 123, 254, 51, 79, 28, 115, 245, 4, 81, 23, 7, 84, 80, 235, 9, 20, 31, 10, 20, 35, 11, 224, 162, 0, 89, 97, 122, 48, + 0, 1, 53, 192, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 1, 53, 192, 247, 0, 0, 0, 32, 16, 3, 192, 0, 1, 202, 52, 224, 48, 3, 128, 0, 1, 80, 27, 3, 16, 35, 187, 64, 80, 3, 128, 0, 3, 32, 22, 0, 0, 247, 82, 79, 79, 84, 16, 59, 5, 198, 97, 63, 48, 31, 0, 2, + 1, 67, 212, 17, 0, 0, 18, 111, 64, 73, 52, 200, 32, 87, 255, 255, 0, 46, 171, 2, 128, 96, 16, 80, 19, 184, 16, 19, 2, 255, 31, 16, 0, 96, 19, 32, 131, 46, 0, 46, 46, 0, 255, 101, 109, 98, 101, 100, 100, 101, 100, 255, 102, 111, 110, 116, 0, 109, 101, 115, 247, 115, 97, 103, 101, 32, 11, 50, 54, 46, + 231, 98, 114, 102, 16, 19, 0, 0, 8, 82, 70, 78, 251, 84, 254, 255, 1, 4, 48, 123, 16, 0, 251, 5, 70, 73, 78, 70, 32, 235, 1, 33, 111, 16, 241, 27, 27, 32, 219, 56, 0, 1, 48, 255, 104, 0, 1, 50, 100, 33, 27, 26, 251, 0, 84, 71, 76, 80, 16, 15, 48, 26, 235, 28, 23, 27, 48, 154, 19, 17, + 25, 9, 0, 217, 1, 1, 65, 31, 96, 0, 0, 0, 120, 33, 66, 95, 127, 0, 24, 3, 103, 99, 0, 191, 255, 255, 229, 43, 81, 75, 1, 29, 7, 128, 0, 204, 16, 9, 1, 211, 3, 20, 119, 229, 100, 108, 255, 64, 0, 1, 122, 6, 248, 33, 231, 176, 126, 1, 45, 38, 87, 83, 0, 0, 223, 255, 50, 41, 122, 1, + 219, 5, 65, 53, 121, 64, 18, 43, 128, 1, 143, 68, 191, 22, 18, 237, 239, 177, 0, 79, 255, 254, 87, 1, 239, 10, 64, 2, 12, 48, 11, 1, 216, 3, 118, 16, 0, 237, 159, 255, 228, 19, 39, 255, 32, 2, 111, 37, 19, 253, 0, 4, 190, 255, 0, 6, 1, 255, 4, 86, 245, 119, 117, 65, 255, 1, 191, 13, 232, 35, + 167, 209, 126, 2, 237, 38, 1, 71, 0, 3, 191, 255, 16, 196, 93, 2, 127, 3, 118, 20, 69, 255, 255, 179, 32, 223, 160, 126, 0, 222, 37, 87, 4, 174, 255, 255, 7, 2, 223, 5, 188, 119, 20, 145, 255, 255, 252, 96, 20, 75, 1, 191, 11, 42, 3, 204, 122, 4, 194, 8, 4, 21, 15, 30, 21, 19, 62, 37, 23, 143, + 127, 85, 143, 117, 158, 51, 134, 201, 223, 255, 246, 245, 0, 11, 255, 112, 48, 43, 5, 21, 63, 11, 109, 21, 67, 111, 255, 16, 10, 255, 243, 21, 216, 250, 42, 21, 220, 34, 200, 255, 80, 7, 251, 21, 236, 246, 21, 240, 167, 208, 69, 228, 3, 4, 211, 10, 37, 143, 191, 198, 32, 251, 62, 53, 0, 0, 14, 22, 35, 143, + 0, 250, 1, 109, 255, 1, 207, 21, 193, 239, 21, 197, 51, 20, 100, 32, 96, 255, 247, 21, 211, 16, 80, 255, 241, 90, 21, 219, 80, 64, 91, 255, 230, 37, 231, 144, 0, 222, 18, 255, 255, 0, 8, 255, 250, 0, 12, 255, 255, 244, 0, 15, 255, 240, 0, 63, 255, 237, 196, 0, 127, 64, 91, 0, 207, 52, 100, 144, 253, 255, + 255, 253, 144, 84, 33, 81, 219, 100, 183, 16, 22, 63, 250, 16, 22, 39, 225, 238, 255, 202, 255, 249, 2, 148, 26, 22, 227, 12, 22, 231, 111, 22, 235, 182, 223, 65, 87, 9, 255, 16, 126, 253, 79, 18, 135, 191, 239, 16, 196, 255, 255, 96, 0, 255, 250, 212, 103, 100, 99, 27, 248, 22, 140, 48, 6, 212, 1, 16, 218, 186, + 0, 16, 42, 0, 255, 224, 6, 13, 19, 143, 65, 195, 189, 13, 22, 215, 127, 255, 0, 1, 48, 239, 255, 245, 0, 14, 255, 248, 17, 162, 241, 22, 239, 192, 255, 255, 223, 255, 244, 252, 11, 255, 251, 174, 243, 17, 11, 144, 17, 88, 16, 0, 175, 23, 3, 165, 95, 23, 7, 47, 181, 191, 39, 40, 112, 55, 164, 0, 211, 0, + 240, 23, 176, 244, 54, 5, 39, 47, 255, 202, 234, 0, 0, 35, 23, 55, 2, 23, 59, 1, 144, 3, 123, 66, 30, 118, 84, 69, 141, 17, 243, 9, 251, 255, 0, 4, 207, 253, 22, 223, 255, 253, 255, 175, 255, 254, 253, 143, 255, 234, 253, 172, 111, 23, 109, 250, 69, 101, 255, 253, 23, 151, 16, 80, 169, 254, 17, 191, 129, 24, + 12, 97, 39, 167, 198, 32, 5, 85, 24, 35, 13, 24, 39, 63, 24, 43, 159, 24, 47, 207, 111, 24, 51, 239, 11, 23, 176, 175, 255, 255, 184, 235, 255, 255, 211, 16, 67, 16, 48, 67, 255, 208, 29, 64, 59, 34, 11, 23, 207, 241, 104, 207, 17, 88, 3, 151, 204, 86, 178, 7, 65, 28, 3, 40, 15, 254, 185, 134, 67, 16, + 222, 255, 32, 12, 49, 63, 96, 3, 66, 253, 255, 51, 181, 88, 38, 43, 5, 239, 24, 72, 63, 24, 76, 10, 86, 24, 80, 6, 17, 183, 5, 17, 187, 8, 249, 80, 199, 212, 255, 242, 24, 119, 249, 80, 231, 255, 128, 243, 0, 1, 153, 166, 2, 66, 187, 27, 66, 71, 50, 27, 14, 255, 19, 43, 253, 254, 10, 255, 255, 210, + 223, 19, 66, 255, 125, 17, 188, 255, 165, 104, 172, 255, 144, 0, 32, 87, 7, 151, 1, 249, 84, 3, 252, 8, 204, 18, 105, 101, 54, 122, 164, 140, 0, 19, 105, 223, 41, 163, 223, 65, 247, 85, 18, 186, 241, 18, 165, 245, 19, 182, 244, 20, 18, 241, 79, 25, 219, 160, 16, 135, 19, 163, 193, 0, 0, 180, 116, 9, 44, 18, + 6, 237, 97, 216, 214, 106, 66, 211, 22, 63, 47, 23, 128, 16, 238, 254, 54, 199, 12, 255, 252, 5, 233, 223, 255, 247, 20, 118, 192, 20, 15, 19, 255, 161, 234, 0, 254, 146, 9, 141, 18, 12, 26, 79, 15, 80, 3, 109, 17, 47, 0, 10, 26, 95, 3, 255, 67, 151, 0, 250, 5, 242, 166, 18, 159, 19, 75, 13, 19, 79, + 190, 12, 21, 43, 31, 253, 64, 4, 223, 103, 27, 85, 16, 232, 254, 50, 207, 247, 84, 227, 245, 84, 227, 144, 93, 69, 67, 112, 10, 12, 18, 207, 255, 160, 26, 212, 150, 127, 38, 171, 12, 255, 250, 255, 31, 255, 244, 253, 255, 95, 255, 240, 119, 159, 25, 28, 158, 125, 56, 190, 14, 255, 121, 189, 239, 145, 178, 220, 230, 255, + 83, 16, 67, 187, 36, 167, 251, 128, 68, 103, 5, 21, 25, 117, 95, 36, 148, 51, 91, 64, 128, 255, 144, 3, 239, 61, 68, 219, 112, 3, 207, 254, 41, 189, 43, 80, 24, 122, 80, 80, 42, 255, 54, 140, 162, 30, 183, 51, 19, 69, 24, 102, 223, 21, 184, 36, 237, 52, 7, 226, 22, 51, 16, 42, 76, 16, 144, 95, 207, 81, + 51, 31, 28, 43, 7, 118, 127, 44, 80, 135, 51, 243, 251, 37, 155, 251, 135, 43, 195, 36, 90, 223, 2, 158, 218, 127, 1, 108, 80, 138, 223, 215, 255, 208, 27, 227, 244, 27, 231, 247, 255, 255, 152, 233, 8, 223, 17, 99, 173, 239, 255, 74, 19, 96, 3, 34, 31, 173, 191, 37, 159, 13, 28, 148, 111, 80, 24, 236, 80, 247, + 2, 191, 255, 185, 113, 189, 255, 179, 255, 202, 253, 130, 67, 243, 100, 147, 64, 74, 151, 112, 3, 246, 155, 222, 6, 119, 12, 115, 10, 118, 85, 67, 51, 12, 147, 10, 189, 17, 12, 176, 45, 110, 219, 151, 64, 12, 243, 76, 11, 173, 184, 13, 83, 10, 48, 13, 68, 78, 87, 118, 0, 98, 76, 37, 87, 11, 194, 15, 50, 1, + 191, 45, 121, 14, 147, 10, 135, 100, 32, 86, 14, 178, 77, 37, 2, 159, 12, 65, 15, 49, 46, 87, 118, 15, 115, 10, 191, 83, 11, 195, 129, 1, 51, 85, 103, 9, 255, 118, 12, 159, 8, 121, 155, 188, 44, 155, 128, 255, 11, 32, 19, 117, 15, 255, 2, 35, 69, 0, 58, 35, 159, 13, 223, 5, 137, 167, 154, 13, 223, 10, + 187, 101, 179, 0, 125, 37, 17, 52, 48, 77, 26, 161, 144, 30, 163, 15, 224, 6, 37, 67, 72, 163, 143, 38, 15, 191, 3, 46, 212, 176, 80, 3, 4, 180, 4, 19, 32, 28, 91, 173, 144, 28, 95, 176, 15, 223, 68, 3, 69, 75, 143, 13, 85, 15, 31, 3, 82, 31, 244, 247, 73, 39, 3, 4, 148, 6, 45, 118, 25, 72, + 239, 255, 177, 15, 255, 36, 83, 16, 42, 215, 202, 64, 8, 15, 126, 8, 14, 153, 46, 51, 72, 11, 1, 15, 255, 3, 43, 38, 19, 42, 24, 255, 5, 217, 7, 66, 32, 160, 253, 0, 163, 7, 0, 160, 11, 10, 88, 11, 15, 253, 0, 26, 116, 239, 176, 41, 72, 179, 10, 201, 4, 70, 45, 196, 96, 49, 227, 15, 131, 40, + 42, 58, 24, 134, 15, 255, 3, 21, 119, 81, 47, 23, 178, 2, 255, 6, 61, 15, 255, 58, 41, 215, 5, 207, 234, 151, 29, 170, 210, 87, 19, 142, 208, 31, 23, 181, 29, 146, 255, 6, 255, 251, 254, 223, 9, 255, 250, 43, 43, 144, 118, 236, 85, 51, 16, 116, 205, 120, 152, 47, 179, 112, 3, 52, 15, 255, 16, 35, 227, 105, + 152, 31, 251, 221, 217, 223, 45, 127, 127, 47, 129, 255, 119, 101, 84, 51, 221, 64, 57, 93, 111, 45, 115, 237, 221, 221, 124, 3, 31, 130, 33, 81, 223, 224, 211, 31, 255, 243, 80, 3, 15, 149, 6, 31, 255, 9, 106, 31, 255, 8, 143, 26, 167, 127, 29, 208, 111, 29, 212, 45, 26, 183, 27, 145, 240, 20, 117, 252, 222, 132, + 95, 159, 42, 144, 3, 30, 183, 17, 31, 184, 251, 31, 188, 252, 31, 192, 221, 253, 191, 28, 13, 0, 0, 144, 144, 3, 128, 23, 94, 195, 96, 3, 51, 227, 175, 27, 12, 159, 255, 192, 20, 49, 63, 33, 67, 32, 112, 127, 31, 93, 127, 2, 65, 7, 15, 246, 25, 86, 43, 255, 11, 80, 3, 9, 80, 3, 8, 255, 66, 59, + 181, 7, 46, 18, 78, 249, 31, 159, 250, 28, 107, 251, 110, 31, 127, 251, 63, 31, 27, 239, 255, 227, 27, 250, 247, 32, 255, 255, 246, 31, 64, 227, 0, 255, 211, 252, 16, 59, 243, 246, 31, 255, 9, 12, 30, 12, 255, 170, 251, 28, 125, 247, 61, 31, 111, 27, 196, 143, 27, 204, 90, 36, 214, 207, 31, 233, 223, 255, 10, 137, + 50, 4, 31, 255, 137, 6, 92, 215, 108, 235, 46, 27, 95, 53, 127, 59, 155, 160, 70, 95, 147, 241, 91, 11, 36, 187, 31, 239, 159, 255, 31, 49, 162, 13, 31, 253, 47, 31, 99, 16, 42, 29, 192, 255, 17, 2, 184, 255, 47, 211, 47, 255, 239, 31, 215, 46, 103, 63, 83, 173, 63, 30, 71, 79, 31, 83, 95, 80, 64, 3, + 111, 80, 28, 251, 127, 31, 226, 127, 17, 34, 17, 31, 76, 67, 38, 206, 173, 255, 62, 3, 249, 47, 247, 32, 255, 44, 228, 143, 46, 17, 215, 34, 56, 47, 30, 40, 15, 255, 243, 30, 178, 170, 244, 29, 203, 245, 17, 146, 247, 17, 142, 247, 2, 255, 19, 22, 36, 135, 17, 151, 30, 18, 226, 21, 55, 96, 8, 31, 196, 142, + 12, 16, 196, 32, 74, 47, 255, 250, 102, 175, 29, 18, 49, 33, 7, 47, 31, 0, 13, 34, 183, 45, 219, 37, 232, 246, 36, 100, 235, 36, 143, 243, 64, 251, 48, 175, 254, 76, 89, 2, 93, 48, 227, 247, 101, 13, 30, 255, 32, 218, 64, 222, 252, 85, 95, 31, 143, 255, 21, 223, 255, 0, 77, 255, 255, 223, 84, 51, 171, 129, + 4, 133, 87, 172, 255, 173, 249, 31, 159, 252, 79, 163, 252, 132, 15, 255, 17, 191, 73, 80, 3, 159, 144, 3, 46, 187, 127, 32, 3, 51, 235, 144, 38, 78, 147, 48, 7, 160, 80, 235, 23, 154, 254, 160, 67, 235, 75, 4, 194, 14, 0, 6, 231, 6, 61, 125, 255, 18, 5, 247, 17, 72, 32, 227, 13, 31, 8, 33, 182, 11, + 30, 52, 20, 219, 19, 69, 250, 234, 0, 255, 219, 223, 221, 151, 239, 93, 175, 106, 47, 195, 221, 239, 47, 35, 80, 208, 3, 64, 91, 215, 18, 59, 219, 35, 227, 36, 88, 95, 31, 89, 32, 3, 79, 31, 97, 239, 63, 255, 242, 19, 48, 243, 0, 63, 253, 181, 211, 13, 170, 48, 5, 255, 128, 3, 3, 95, 251, 2, 167, 255, + 71, 27, 1, 33, 138, 19, 231, 255, 248, 255, 173, 207, 31, 245, 23, 31, 249, 48, 44, 47, 6, 127, 106, 31, 103, 3, 255, 150, 32, 228, 47, 144, 161, 34, 55, 94, 47, 39, 225, 31, 47, 48, 0, 11, 245, 14, 189, 18, 149, 96, 31, 95, 47, 91, 80, 30, 193, 128, 31, 103, 249, 203, 120, 159, 51, 95, 19, 107, 239, 234, + 31, 48, 0, 233, 155, 239, 240, 83, 67, 243, 31, 151, 0, 254, 18, 175, 20, 95, 23, 31, 230, 39, 179, 6, 20, 112, 8, 31, 213, 65, 168, 255, 246, 79, 255, 96, 2, 13, 255, 176, 248, 12, 9, 255, 242, 127, 35, 219, 35, 227, 21, 204, 159, 255, 21, 2, 19, 181, 55, 64, 255, 250, 95, 254, 255, 255, 242, 63, 255, 255, + 176, 16, 3, 212, 48, 63, 31, 46, 63, 31, 202, 63, 24, 30, 36, 67, 170, 31, 42, 160, 143, 21, 195, 159, 25, 233, 159, 31, 226, 171, 191, 32, 3, 240, 64, 3, 223, 20, 78, 189, 255, 255, 61, 255, 245, 255, 54, 255, 254, 255, 178, 48, 31, 120, 48, 79, 17, 63, 26, 249, 48, 20, 222, 234, 80, 0, 30, 22, 143, 2, + 35, 227, 16, 19, 231, 249, 192, 10, 255, 246, 250, 19, 40, 31, 251, 242, 88, 31, 255, 224, 31, 255, 96, 207, 47, 156, 15, 255, 13, 68, 50, 73, 36, 46, 251, 31, 225, 17, 64, 239, 24, 151, 16, 102, 0, 37, 17, 60, 22, 158, 223, 86, 171, 35, 239, 30, 27, 121, 207, 229, 133, 86, 159, 118, 250, 27, 130, 196, 50, 137, + 252, 77, 83, 247, 242, 74, 243, 20, 174, 0, 160, 15, 255, 55, 54, 116, 15, 159, 11, 117, 66, 0, 0, 0, 172, 16, 0, 191, 173, 0, 193, 46, 171, 48, 12, 106, 46, 103, 15, 31, 11, 101, 0, 95, 46, 0, 2, 110, 15, 97, 45, 2, 17, 1, 254, 74, 3, 118, 32, 0, 224, 47, 119, 15, 255, 10, 87, 118, 65, 3, + 96, 129, 35, 86, 6, 186, 207, 15, 255, 8, 119, 118, 82, 44, 159, 232, 12, 159, 14, 190, 209, 14, 252, 38, 1, 87, 117, 2, 175, 39, 183, 40, 15, 255, 4, 44, 140, 251, 45, 255, 246, 10, 88, 12, 89, 67, 15, 227, 0, 241, 19, 86, 119, 190, 123, 255, 4, 243, 1, 31, 31, 255, 204, 255, 197, 45, 131, 5, 102, 41, + 1, 142, 74, 195, 15, 255, 0, 233, 37, 119, 99, 45, 223, 212, 13, 223, 14, 11, 171, 12, 8, 155, 205, 76, 23, 1, 65, 4, 221, 239, 0, 223, 8, 17, 50, 75, 31, 63, 249, 64, 3, 15, 255, 35, 70, 31, 124, 223, 254, 152, 112, 28, 110, 4, 93, 9, 88, 172, 43, 191, 15, 255, 6, 47, 56, 180, 208, 1, 255, 7, + 35, 66, 27, 103, 248, 27, 219, 7, 96, 14, 170, 1, 15, 255, 2, 85, 48, 158, 128, 31, 162, 128, 15, 158, 10, 131, 190, 94, 139, 4, 242, 0, 30, 237, 41, 59, 12, 222, 42, 6, 236, 159, 150, 29, 165, 15, 190, 6, 4, 16, 0, 5, 207, 149, 160, 31, 111, 14, 194, 5, 3, 28, 174, 30, 28, 229, 191, 30, 3, 95, + 68, 189, 125, 47, 204, 252, 169, 0, 52, 57, 127, 143, 255, 42, 82, 112, 3, 60, 157, 255, 255, 85, 85, 173, 142, 42, 111, 239, 29, 109, 207, 16, 30, 107, 16, 250, 1, 143, 255, 37, 175, 63, 161, 254, 40, 139, 37, 34, 5, 61, 167, 112, 64, 11, 40, 159, 226, 142, 107, 9, 80, 75, 235, 3, 94, 199, 63, 61, 215, 31, + 254, 59, 107, 79, 231, 221, 166, 106, 30, 166, 0, 254, 32, 78, 163, 208, 82, 95, 103, 64, 122, 127, 242, 46, 221, 41, 63, 48, 30, 116, 169, 128, 93, 147, 224, 30, 148, 240, 5, 95, 14, 47, 231, 239, 245, 233, 117, 67, 36, 29, 115, 5, 48, 3, 252, 105, 27, 81, 251, 1, 16, 3, 30, 26, 106, 42, 202, 247, 215, 70, + 159, 58, 119, 255, 31, 106, 253, 4, 223, 215, 255, 246, 20, 122, 160, 27, 82, 0, 255, 251, 87, 7, 60, 17, 6, 93, 219, 175, 31, 255, 239, 255, 64, 93, 31, 112, 161, 31, 32, 255, 0, 46, 30, 151, 2, 169, 191, 61, 38, 114, 31, 57, 0, 48, 3, 32, 243, 3, 215, 123, 182, 34, 95, 251, 43, 135, 254, 112, 192, 35, + 31, 255, 32, 196, 192, 80, 243, 15, 255, 0, 111, 247, 2, 51, 52, 12, 223, 6, 33, 135, 17, 143, 31, 33, 95, 112, 3, 108, 147, 186, 240, 31, 190, 0, 221, 217, 15, 166, 40, 11, 31, 28, 148, 15, 31, 36, 47, 2, 159, 31, 10, 207, 58, 194, 44, 19, 37, 32, 234, 45, 5, 95, 95, 175, 47, 183, 13, 95, 195, 11, + 73, 95, 203, 14, 49, 160, 26, 182, 0, 31, 182, 49, 219, 247, 18, 144, 3, 60, 126, 43, 24, 9, 31, 129, 33, 127, 4, 98, 119, 74, 45, 147, 175, 81, 51, 63, 7, 10, 31, 199, 14, 31, 237, 181, 79, 29, 123, 175, 96, 28, 251, 160, 31, 84, 208, 0, 47, 252, 49, 114, 33, 79, 31, 199, 28, 207, 34, 17, 62, 67, + 31, 236, 170, 253, 79, 156, 207, 158, 127, 143, 95, 99, 79, 31, 183, 170, 47, 59, 158, 112, 126, 119, 2, 31, 237, 6, 28, 60, 165, 9, 18, 89, 12, 31, 241, 47, 237, 79, 111, 223, 202, 163, 134, 47, 111, 32, 48, 243, 64, 3, 45, 71, 112, 2, 170, 10, 31, 140, 13, 30, 75, 15, 30, 91, 63, 31, 207, 168, 111, 30, + 14, 175, 28, 129, 223, 30, 212, 33, 35, 28, 69, 45, 64, 219, 50, 239, 63, 81, 203, 0, 239, 95, 235, 223, 126, 36, 36, 80, 79, 255, 253, 226, 239, 60, 87, 212, 96, 255, 30, 155, 255, 18, 222, 255, 19, 12, 47, 227, 163, 176, 11, 126, 79, 255, 158, 239, 175, 11, 36, 123, 191, 221, 127, 30, 86, 178, 127, 255, 179, 0, + 91, 113, 41, 207, 7, 47, 23, 96, 0, 95, 23, 239, 80, 79, 35, 7, 14, 80, 31, 111, 4, 46, 55, 78, 106, 158, 47, 95, 32, 231, 28, 226, 250, 0, 255, 216, 85, 105, 109, 0, 125, 45, 239, 159, 79, 31, 95, 19, 239, 1, 239, 255, 112, 28, 231, 255, 255, 16, 19, 174, 31, 211, 160, 0, 255, 183, 213, 31, 219, 234, + 97, 15, 94, 15, 7, 255, 251, 255, 191, 7, 255, 250, 127, 7, 255, 249, 178, 13, 16, 3, 1, 9, 63, 251, 47, 255, 248, 45, 218, 55, 66, 43, 45, 91, 255, 177, 29, 244, 254, 80, 10, 173, 255, 17, 204, 127, 109, 159, 28, 250, 15, 191, 2, 227, 111, 189, 127, 1, 124, 199, 150, 152, 119, 0, 10, 77, 62, 159, 255, 45, + 240, 31, 160, 251, 22, 36, 15, 2, 111, 66, 211, 120, 173, 125, 222, 247, 255, 254, 183, 73, 60, 157, 112, 87, 11, 100, 7, 80, 13, 219, 26, 35, 235, 63, 88, 176, 3, 241, 112, 3, 47, 253, 6, 34, 47, 36, 210, 35, 243, 94, 36, 94, 63, 31, 146, 12, 255, 255, 146, 22, 38, 233, 255, 0, 78, 38, 43, 159, 63, 99, + 72, 231, 191, 110, 48, 239, 19, 159, 31, 75, 255, 255, 244, 31, 170, 252, 80, 255, 255, 162, 0, 243, 148, 223, 2, 47, 4, 178, 47, 84, 55, 8, 255, 70, 35, 55, 147, 95, 31, 88, 170, 12, 44, 28, 241, 25, 67, 246, 21, 244, 251, 33, 75, 229, 110, 255, 253, 80, 91, 21, 159, 253, 22, 10, 193, 84, 54, 47, 224, 2, + 139, 12, 12, 86, 131, 6, 8, 47, 2, 26, 67, 189, 143, 31, 91, 223, 255, 252, 2, 31, 218, 24, 252, 255, 207, 255, 223, 255, 111, 31, 228, 20, 89, 166, 254, 17, 178, 211, 31, 178, 31, 182, 176, 11, 31, 242, 253, 47, 251, 255, 242, 143, 230, 16, 130, 130, 17, 43, 23, 26, 159, 31, 212, 255, 180, 123, 16, 136, 40, 114, + 254, 148, 16, 70, 199, 72, 62, 10, 31, 231, 127, 68, 219, 38, 19, 246, 223, 255, 248, 9, 16, 80, 1, 191, 16, 37, 206, 6, 227, 27, 71, 36, 39, 243, 0, 238, 31, 228, 135, 69, 20, 80, 23, 22, 33, 191, 37, 19, 251, 0, 1, 206, 250, 48, 14, 189, 175, 15, 255, 14, 37, 122, 255, 81, 155, 93, 7, 191, 6, 217, + 28, 138, 250, 2, 158, 33, 93, 91, 181, 80, 14, 93, 31, 52, 82, 15, 255, 14, 96, 15, 255, 44, 19, 171, 51, 15, 255, 10, 49, 1, 192, 176, 70, 15, 255, 10, 118, 64, 109, 14, 190, 76, 5, 116, 15, 30, 77, 4, 100, 15, 223, 13, 55, 141, 97, 3, 131, 207, 255, 255, 26, 106, 42, 253, 44, 27, 112, 76, 13, 119, + 9, 11, 75, 215, 15, 159, 4, 229, 0, 73, 135, 0, 1, 255, 75, 9, 207, 56, 38, 90, 203, 223, 255, 223, 27, 98, 223, 247, 243, 119, 137, 239, 253, 15, 255, 6, 47, 245, 188, 221, 210, 223, 255, 0, 31, 10, 208, 87, 87, 15, 124, 11, 51, 10, 156, 71, 155, 1, 91, 247, 253, 219, 203, 115, 46, 149, 252, 132, 103, 46, + 153, 122, 239, 15, 96, 4, 41, 84, 253, 149, 0, 51, 59, 63, 15, 193, 32, 7, 200, 78, 167, 44, 207, 5, 157, 92, 239, 255, 81, 46, 239, 218, 98, 0, 75, 171, 28, 16, 75, 15, 131, 32, 13, 208, 3, 206, 175, 112, 159, 75, 148, 103, 85, 1, 127, 12, 213, 12, 28, 49, 239, 26, 47, 95, 28, 192, 12, 2, 95, 255, + 29, 229, 44, 180, 43, 57, 73, 139, 43, 171, 30, 30, 216, 247, 191, 255, 208, 7, 31, 44, 47, 255, 253, 244, 254, 207, 255, 243, 31, 253, 112, 41, 131, 28, 242, 98, 63, 251, 249, 0, 12, 171, 82, 4, 79, 227, 43, 11, 77, 8, 222, 6, 123, 47, 255, 187, 169, 239, 251, 83, 247, 250, 0, 42, 29, 40, 29, 47, 255, 29, + 43, 253, 19, 30, 247, 45, 75, 246, 117, 85, 67, 50, 47, 255, 103, 117, 46, 187, 219, 255, 163, 45, 95, 169, 172, 47, 103, 6, 239, 132, 240, 85, 175, 175, 255, 44, 219, 31, 78, 0, 31, 230, 50, 13, 84, 128, 3, 16, 48, 3, 143, 16, 7, 127, 80, 3, 83, 163, 170, 175, 95, 95, 63, 82, 223, 8, 99, 187, 132, 96, + 75, 157, 16, 64, 79, 30, 218, 0, 255, 242, 77, 115, 223, 121, 3, 159, 0, 70, 0, 4, 223, 82, 135, 46, 51, 119, 251, 48, 0, 2, 89, 223, 111, 131, 155, 222, 60, 59, 255, 62, 30, 201, 117, 51, 53, 62, 189, 18, 120, 215, 72, 197, 79, 232, 201, 31, 110, 255, 254, 96, 114, 31, 167, 250, 0, 124, 31, 75, 30, 59, + 208, 15, 62, 22, 250, 15, 220, 168, 101, 31, 31, 128, 47, 31, 132, 243, 21, 120, 155, 205, 40, 25, 31, 251, 79, 4, 174, 139, 36, 68, 2, 57, 199, 255, 253, 202, 18, 243, 245, 254, 48, 255, 255, 27, 183, 254, 17, 75, 243, 117, 15, 156, 17, 3, 87, 159, 30, 242, 255, 51, 95, 10, 202, 253, 190, 211, 255, 28, 17, 255, + 42, 227, 32, 28, 207, 238, 32, 255, 145, 83, 255, 113, 70, 119, 111, 3, 173, 29, 28, 18, 111, 30, 146, 5, 255, 28, 236, 62, 127, 28, 244, 2, 223, 227, 82, 0, 11, 64, 212, 255, 231, 47, 185, 209, 12, 30, 50, 79, 5, 103, 2, 118, 77, 93, 28, 216, 143, 28, 216, 175, 255, 176, 31, 193, 144, 79, 48, 3, 159, 31, + 127, 31, 146, 0, 111, 254, 208, 87, 12, 158, 130, 6, 12, 79, 2, 12, 29, 151, 159, 253, 80, 90, 34, 27, 16, 22, 54, 229, 26, 46, 64, 94, 34, 137, 127, 13, 97, 50, 142, 252, 0, 13, 253, 207, 0, 250, 143, 128, 2, 0, 237, 83, 60, 207, 31, 218, 226, 95, 211, 23, 47, 223, 43, 34, 46, 167, 239, 31, 237, 170, + 111, 31, 4, 63, 31, 240, 143, 27, 55, 252, 6, 47, 24, 84, 19, 91, 1, 85, 147, 12, 31, 115, 14, 86, 159, 30, 165, 254, 246, 223, 247, 255, 64, 223, 247, 31, 35, 223, 247, 208, 23, 251, 112, 0, 171, 184, 64, 125, 31, 152, 80, 3, 159, 255, 251, 55, 31, 50, 251, 46, 0, 3, 238, 53, 31, 175, 226, 8, 94, 30, + 95, 207, 30, 168, 255, 253, 48, 1, 25, 155, 201, 6, 212, 32, 76, 46, 179, 243, 63, 7, 56, 57, 239, 171, 247, 94, 203, 242, 78, 207, 127, 22, 226, 127, 255, 191, 48, 48, 3, 111, 255, 48, 58, 95, 255, 230, 157, 255, 95, 31, 255, 64, 3, 252, 113, 175, 210, 138, 241, 31, 235, 31, 6, 54, 11, 181, 95, 235, 127, 22, + 57, 191, 31, 26, 8, 12, 255, 240, 0, 6, 255, 247, 194, 0, 1, 130, 14, 209, 51, 93, 0, 0, 241, 76, 255, 0, 92, 35, 83, 16, 88, 32, 197, 95, 222, 255, 144, 19, 35, 16, 143, 255, 247, 31, 83, 218, 128, 0, 16, 6, 0, 253, 15, 61, 12, 7, 31, 255, 181, 143, 70, 223, 111, 255, 16, 156, 255, 19, 104, 244, + 73, 31, 236, 64, 16, 6, 31, 151, 64, 70, 219, 28, 223, 244, 245, 40, 0, 0, 106, 20, 251, 15, 31, 158, 10, 92, 20, 82, 3, 47, 236, 207, 254, 140, 31, 167, 201, 95, 150, 104, 30, 200, 23, 41, 127, 30, 170, 255, 254, 16, 63, 165, 210, 47, 255, 9, 23, 87, 20, 211, 111, 51, 232, 206, 254, 3, 255, 250, 13, 3, + 255, 247, 16, 3, 253, 253, 93, 3, 207, 255, 237, 23, 67, 187, 206, 255, 179, 215, 247, 152, 3, 239, 255, 252, 32, 62, 186, 48, 16, 107, 96, 0, 47, 27, 143, 47, 23, 138, 244, 159, 255, 64, 6, 24, 220, 143, 33, 180, 15, 255, 155, 205, 221, 221, 47, 209, 0, 29, 8, 221, 221, 10, 147, 14, 240, 99, 10, 73, 31, 207, + 96, 74, 74, 15, 136, 69, 25, 19, 0, 0, 164, 22, 14, 165, 7, 194, 0, 96, 49, 87, 95, 3, 15, 255, 2, 27, 227, 252, 230, 255, 255, 181, 0, 103, 15, 135, 8, 39, 147, 139, 109, 15, 255, 6, 21, 210, 50, 227, 38, 8, 124, 6, 199, 16, 211, 0, 34, 15, 0, 105, 11, 28, 196, 24, 210, 129, 0, 212, 78, 129, + 15, 255, 3, 112, 15, 255, 16, 62, 1, 59, 6, 59, 111, 79, 24, 51, 228, 15, 255, 10, 21, 52, 0, 0, 126, 251, 101, 15, 255, 6, 250, 16, 69, 223, 15, 255, 7, 44, 29, 131, 2, 197, 140, 207, 1, 127, 7, 91, 239, 15, 255, 6, 94, 31, 68, 1, 149, 203, 15, 255, 91, 45, 115, 10, 31, 247, 14, 31, 251, 47, + 101, 239, 255, 65, 0, 89, 195, 34, 55, 80, 15, 223, 65, 36, 90, 29, 189, 175, 23, 25, 239, 249, 26, 220, 245, 8, 171, 0, 212, 9, 255, 64, 3, 11, 16, 7, 12, 16, 11, 159, 255, 167, 249, 86, 123, 251, 144, 3, 15, 255, 9, 17, 7, 222, 126, 15, 31, 0, 138, 215, 0, 0, 191, 253, 45, 5, 209, 135, 153, 15, + 63, 10, 178, 86, 235, 8, 23, 13, 15, 127, 0, 8, 223, 173, 112, 29, 107, 192, 18, 58, 255, 249, 47, 15, 159, 1, 26, 115, 159, 29, 81, 159, 244, 155, 180, 252, 191, 244, 255, 244, 207, 244, 243, 171, 35, 175, 150, 176, 128, 3, 15, 67, 13, 94, 255, 255, 91, 16, 22, 145, 250, 210, 0, 207, 255, 251, 31, 71, 144, 15, + 192, 65, 183, 4, 20, 242, 127, 254, 35, 184, 2, 223, 255, 38, 8, 226, 3, 39, 150, 224, 12, 119, 1, 201, 197, 155, 128, 23, 58, 116, 14, 82, 32, 13, 219, 80, 55, 168, 31, 18, 157, 39, 43, 77, 15, 255, 8, 107, 92, 179, 15, 194, 3, 201, 0, 9, 159, 7, 222, 47, 47, 166, 73, 143, 2, 151, 255, 79, 249, 73, + 255, 90, 48, 3, 251, 18, 154, 251, 12, 48, 3, 76, 3, 185, 5, 151, 18, 40, 122, 31, 107, 175, 7, 11, 7, 219, 152, 101, 154, 49, 7, 11, 10, 47, 255, 254, 199, 15, 112, 51, 127, 31, 231, 252, 191, 0, 37, 121, 255, 10, 31, 212, 26, 35, 254, 255, 6, 254, 190, 255, 1, 32, 42, 95, 158, 95, 56, 224, 42, 167, + 255, 254, 200, 16, 31, 243, 186, 244, 46, 111, 177, 20, 175, 30, 26, 11, 26, 25, 183, 6, 136, 255, 39, 202, 48, 206, 32, 79, 255, 255, 96, 144, 14, 255, 176, 192, 8, 255, 228, 241, 240, 2, 41, 133, 126, 170, 87, 64, 239, 32, 247, 221, 111, 235, 65, 3, 0, 5, 7, 26, 23, 11, 123, 30, 20, 159, 255, 255, 236, 109, + 219, 239, 251, 199, 17, 74, 42, 143, 59, 157, 17, 68, 0, 12, 204, 254, 32, 129, 0, 4, 158, 255, 64, 29, 72, 191, 242, 26, 197, 249, 2, 255, 191, 252, 0, 165, 207, 25, 181, 111, 101, 26, 30, 170, 0, 30, 90, 0, 42, 43, 208, 30, 90, 5, 19, 194, 11, 26, 182, 9, 32, 207, 125, 23, 162, 255, 3, 101, 67, 33, + 95, 50, 70, 238, 121, 190, 255, 208, 0, 252, 185, 1, 42, 48, 251, 207, 252, 70, 138, 239, 128, 27, 236, 171, 212, 255, 241, 42, 207, 147, 100, 27, 206, 26, 19, 31, 20, 101, 42, 95, 219, 151, 106, 92, 33, 199, 127, 31, 75, 37, 186, 51, 115, 119, 105, 189, 255, 29, 44, 255, 32, 212, 101, 80, 209, 255, 17, 25, 188, 43, + 175, 53, 160, 124, 236, 222, 168, 191, 35, 227, 185, 119, 204, 194, 32, 191, 245, 197, 121, 189, 242, 81, 99, 246, 16, 27, 98, 109, 42, 92, 204, 176, 3, 215, 3, 78, 0, 65, 123, 175, 114, 58, 95, 1, 207, 255, 28, 203, 33, 187, 227, 67, 215, 188, 96, 75, 211, 251, 16, 0, 255, 22, 220, 16, 6, 203, 0, 128, 14, 41, + 44, 22, 15, 2, 31, 135, 94, 255, 90, 26, 206, 255, 16, 110, 251, 78, 28, 75, 28, 20, 64, 103, 26, 214, 128, 255, 16, 100, 20, 78, 4, 255, 112, 234, 159, 244, 227, 52, 191, 191, 27, 57, 207, 80, 3, 42, 4, 187, 8, 48, 219, 7, 31, 163, 6, 28, 28, 5, 28, 32, 163, 3, 29, 143, 1, 60, 141, 44, 129, 28, + 141, 223, 248, 109, 139, 173, 155, 206, 143, 71, 236, 168, 142, 189, 255, 251, 32, 2, 143, 255, 188, 129, 209, 254, 185, 185, 100, 22, 59, 0, 255, 248, 29, 49, 59, 31, 127, 154, 160, 29, 137, 30, 169, 79, 240, 77, 122, 31, 47, 238, 106, 86, 223, 13, 253, 67, 204, 0, 27, 222, 138, 28, 234, 168, 223, 28, 174, 191, 22, 215, + 157, 63, 135, 53, 30, 28, 31, 247, 1, 56, 255, 189, 146, 50, 185, 117, 61, 97, 93, 127, 15, 255, 18, 154, 58, 147, 31, 153, 58, 217, 234, 224, 134, 0, 0, 16, 111, 49, 111, 34, 147, 30, 8, 29, 183, 214, 52, 104, 255, 168, 9, 28, 156, 95, 250, 35, 83, 237, 255, 155, 223, 45, 167, 2, 69, 9, 223, 3, 248, 108, + 77, 155, 121, 179, 15, 106, 70, 159, 254, 31, 229, 71, 108, 234, 6, 255, 241, 51, 140, 14, 29, 64, 63, 29, 184, 20, 36, 162, 17, 152, 66, 107, 8, 30, 127, 10, 94, 127, 46, 123, 190, 79, 51, 203, 240, 0, 223, 253, 240, 30, 37, 169, 208, 29, 229, 176, 25, 173, 144, 17, 200, 30, 226, 146, 170, 48, 192, 233, 13, 31, + 126, 47, 30, 106, 111, 17, 139, 128, 191, 47, 10, 26, 206, 48, 83, 62, 127, 88, 75, 29, 98, 63, 19, 47, 33, 244, 29, 122, 4, 27, 235, 8, 95, 255, 0, 191, 31, 29, 157, 11, 143, 253, 0, 5, 175, 101, 31, 87, 207, 249, 78, 171, 62, 179, 240, 58, 191, 7, 50, 62, 195, 30, 179, 239, 250, 31, 227, 19, 252, 55, + 150, 88, 246, 236, 168, 100, 32, 63, 129, 4, 253, 45, 188, 174, 224, 48, 219, 15, 26, 245, 12, 255, 249, 18, 115, 42, 25, 155, 62, 249, 251, 69, 143, 62, 99, 234, 0, 16, 52, 231, 0, 253, 150, 142, 64, 6, 171, 7, 109, 185, 117, 177, 0, 76, 96, 95, 0, 112, 219, 50, 82, 41, 243, 79, 178, 49, 75, 127, 13, 232, + 26, 73, 17, 104, 3, 34, 208, 118, 16, 166, 0, 255, 163, 45, 9, 234, 116, 48, 247, 165, 160, 64, 203, 215, 215, 16, 87, 31, 6, 15, 49, 10, 255, 250, 255, 229, 0, 45, 255, 31, 205, 175, 18, 129, 72, 46, 195, 0, 34, 155, 49, 99, 7, 231, 115, 35, 76, 31, 130, 40, 30, 155, 36, 195, 250, 16, 41, 255, 10, 250, + 11, 66, 30, 18, 217, 217, 5, 239, 31, 35, 28, 255, 87, 47, 189, 76, 48, 237, 0, 204, 194, 37, 228, 255, 193, 64, 87, 239, 33, 16, 87, 20, 23, 228, 37, 208, 64, 55, 15, 239, 4, 36, 143, 253, 102, 33, 100, 0, 191, 17, 181, 33, 217, 159, 253, 69, 71, 173, 95, 82, 91, 63, 31, 151, 29, 113, 122, 148, 139, 62, + 47, 114, 78, 61, 255, 233, 0, 0, 181, 106, 172, 68, 31, 171, 4, 20, 236, 34, 186, 38, 75, 9, 31, 159, 38, 79, 133, 13, 27, 55, 34, 198, 44, 66, 90, 207, 8, 95, 243, 5, 39, 73, 103, 58, 231, 1, 49, 123, 42, 207, 208, 57, 192, 245, 255, 252, 255, 240, 30, 127, 241, 20, 67, 128, 250, 255, 250, 64, 0, 198, + 63, 220, 47, 82, 235, 141, 95, 85, 231, 32, 167, 22, 125, 0, 207, 18, 109, 239, 207, 248, 80, 88, 207, 8, 203, 7, 223, 255, 16, 4, 85, 23, 6, 10, 22, 231, 13, 25, 184, 15, 48, 151, 246, 183, 32, 44, 215, 2, 239, 15, 11, 5, 1, 19, 70, 26, 103, 11, 15, 224, 0, 20, 168, 206, 244, 31, 69, 247, 31, 73, + 172, 249, 15, 255, 48, 207, 28, 218, 89, 215, 0, 32, 10, 27, 140, 198, 140, 248, 90, 79, 15, 255, 33, 36, 47, 5, 157, 15, 243, 6, 99, 26, 202, 12, 112, 65, 155, 14, 159, 4, 28, 107, 207, 128, 20, 10, 44, 14, 8, 222, 11, 41, 167, 175, 0, 191, 6, 255, 22, 39, 24, 214, 241, 0, 90, 223, 241, 90, 153, 15, + 176, 31, 3, 159, 13, 255, 220, 255, 25, 44, 71, 5, 156, 255, 93, 91, 191, 255, 156, 96, 0, 117, 38, 15, 147, 22, 191, 255, 254, 23, 99, 28, 83, 201, 61, 128, 15, 198, 68, 52, 23, 143, 83, 83, 15, 95, 0, 243, 74, 76, 175, 237, 90, 245, 14, 201, 62, 15, 26, 137, 47, 30, 136, 225, 44, 239, 48, 2, 161, 39, + 15, 93, 12, 26, 195, 46, 136, 2, 214, 189, 243, 15, 133, 35, 42, 46, 99, 4, 103, 2, 31, 10, 247, 119, 118, 84, 49, 11, 227, 7, 202, 132, 0, 101, 0, 0, 100, 107, 151, 47, 5, 15, 225, 6, 100, 22, 216, 255, 239, 255, 253, 202, 78, 181, 255, 144, 159, 244, 90, 48, 3, 176, 30, 181, 176, 207, 48, 3, 204, 13, + 187, 32, 72, 79, 2, 190, 57, 115, 71, 71, 143, 175, 255, 39, 147, 41, 107, 167, 246, 95, 227, 255, 4, 19, 13, 4, 50, 31, 4, 0, 9, 255, 59, 255, 16, 9, 79, 255, 112, 11, 255, 14, 255, 192, 12, 9, 255, 241, 12, 105, 157, 222, 0, 255, 48, 3, 251, 128, 3, 13, 222, 2, 5, 212, 83, 32, 31, 223, 224, 30, + 131, 176, 30, 131, 15, 96, 66, 137, 85, 88, 91, 94, 131, 207, 255, 50, 46, 23, 49, 31, 9, 69, 24, 224, 9, 14, 95, 3, 16, 202, 64, 3, 251, 15, 254, 44, 17, 237, 35, 53, 86, 12, 157, 0, 221, 231, 75, 187, 255, 230, 247, 119, 153, 20, 123, 0, 61, 8, 0, 222, 14, 222, 12, 107, 31, 98, 18, 51, 15, 255, + 1, 5, 91, 191, 15, 85, 223, 103, 121, 175, 191, 4, 0, 4, 159, 244, 213, 119, 52, 18, 137, 112, 18, 133, 112, 18, 133, 224, 58, 12, 127, 17, 239, 255, 3, 86, 48, 29, 166, 128, 58, 202, 137, 11, 41, 153, 0, 33, 0, 88, 79, 13, 92, 71, 191, 226, 65, 164, 0, 89, 207, 128, 74, 211, 15, 255, 1, 53, 40, 21, + 90, 43, 169, 191, 239, 255, 99, 90, 255, 249, 90, 39, 255, 255, 52, 122, 61, 245, 4, 0, 221, 79, 24, 4, 79, 125, 95, 30, 188, 51, 157, 107, 6, 32, 18, 0, 0, 139, 206, 1, 101, 3, 239, 79, 231, 0, 111, 147, 1, 52, 104, 155, 27, 12, 159, 3, 27, 147, 40, 134, 222, 246, 14, 96, 10, 19, 86, 87, 79, 251, + 159, 95, 43, 19, 171, 78, 95, 137, 189, 122, 143, 116, 236, 185, 118, 83, 188, 255, 185, 144, 28, 244, 254, 185, 134, 207, 31, 216, 111, 31, 216, 43, 194, 134, 11, 28, 60, 46, 96, 47, 163, 31, 189, 10, 81, 31, 12, 59, 90, 247, 183, 103, 19, 70, 121, 158, 31, 237, 185, 189, 83, 156, 31, 3, 255, 250, 124, 31, 242, 242, + 117, 95, 245, 253, 135, 92, 28, 145, 6, 31, 61, 1, 99, 41, 92, 191, 254, 29, 222, 49, 204, 30, 234, 0, 186, 212, 151, 64, 15, 69, 0, 63, 30, 41, 79, 30, 49, 32, 148, 170, 127, 30, 69, 143, 30, 73, 159, 80, 234, 159, 2, 223, 13, 42, 15, 147, 19, 45, 39, 4, 93, 131, 7, 93, 135, 9, 112, 3, 171, 247, + 29, 176, 245, 31, 20, 243, 31, 24, 242, 0, 224, 12, 204, 241, 85, 35, 96, 3, 35, 227, 35, 231, 36, 170, 149, 32, 15, 255, 33, 30, 154, 255, 32, 3, 191, 31, 96, 85, 233, 83, 50, 17, 95, 207, 74, 27, 86, 31, 54, 175, 87, 145, 86, 255, 29, 186, 223, 31, 179, 239, 245, 223, 232, 253, 255, 245, 31, 143, 244, 33, + 79, 31, 151, 46, 227, 244, 32, 152, 119, 85, 13, 66, 4, 13, 31, 211, 32, 3, 117, 27, 16, 0, 5, 85, 227, 239, 10, 159, 215, 223, 223, 33, 16, 51, 115, 14, 4, 173, 255, 223, 187, 191, 111, 240, 240, 204, 194, 31, 119, 15, 255, 232, 255, 252, 152, 63, 179, 80, 94, 75, 29, 242, 30, 148, 41, 63, 129, 36, 4, 119, + 79, 128, 124, 42, 16, 80, 3, 73, 47, 79, 135, 30, 182, 8, 30, 243, 7, 255, 228, 222, 107, 159, 227, 151, 118, 31, 15, 1, 46, 85, 0, 79, 122, 31, 222, 111, 86, 120, 154, 146, 135, 221, 30, 170, 76, 47, 19, 9, 16, 217, 45, 236, 17, 0, 80, 231, 47, 207, 242, 48, 249, 118, 84, 54, 167, 80, 126, 159, 89, 31, + 252, 127, 6, 187, 221, 255, 7, 31, 240, 32, 3, 233, 4, 185, 151, 41, 51, 31, 38, 199, 46, 243, 253, 239, 51, 85, 119, 144, 126, 254, 255, 98, 16, 125, 63, 19, 3, 255, 15, 244, 6, 16, 3, 157, 127, 16, 7, 255, 255, 196, 68, 255, 255, 204, 252, 207, 239, 255, 168, 118, 111, 92, 137, 228, 203, 93, 39, 31, 80, 11, + 255, 27, 255, 48, 4, 54, 41, 241, 94, 172, 159, 16, 12, 159, 40, 0, 0, 121, 190, 43, 83, 169, 250, 30, 223, 252, 229, 55, 6, 157, 131, 63, 164, 33, 81, 45, 34, 180, 31, 255, 244, 95, 207, 47, 211, 45, 89, 255, 232, 215, 32, 79, 29, 136, 5, 42, 186, 63, 216, 31, 220, 179, 37, 207, 132, 201, 113, 12, 254, 17, + 44, 181, 12, 233, 170, 48, 58, 36, 111, 93, 194, 95, 30, 24, 31, 18, 175, 44, 63, 47, 46, 111, 14, 83, 83, 3, 114, 111, 255, 45, 215, 248, 255, 218, 117, 16, 80, 76, 163, 97, 203, 15, 255, 0, 170, 143, 62, 22, 16, 30, 182, 32, 30, 178, 64, 29, 224, 162, 128, 55, 255, 7, 35, 15, 190, 255, 46, 115, 95, 51, + 191, 245, 2, 207, 255, 69, 67, 58, 228, 46, 132, 79, 169, 96, 80, 255, 248, 70, 55, 248, 92, 23, 79, 254, 8, 97, 83, 247, 5, 255, 68, 11, 39, 247, 55, 255, 34, 199, 14, 39, 41, 15, 44, 185, 242, 85, 7, 46, 17, 254, 16, 0, 243, 26, 255, 196, 73, 94, 63, 30, 153, 1, 234, 255, 0, 0, 45, 255, 128, 3, + 239, 255, 208, 176, 95, 21, 176, 255, 30, 135, 33, 99, 35, 47, 1, 63, 16, 90, 31, 208, 3, 31, 88, 2, 255, 25, 118, 207, 31, 207, 153, 46, 40, 119, 125, 207, 32, 5, 31, 231, 17, 71, 1, 157, 127, 110, 177, 28, 112, 180, 143, 254, 53, 63, 9, 212, 255, 243, 47, 31, 144, 95, 239, 80, 89, 195, 223, 42, 134, 31, + 37, 69, 47, 104, 46, 44, 237, 35, 255, 162, 63, 120, 243, 111, 255, 96, 23, 63, 18, 31, 50, 251, 25, 232, 223, 235, 72, 80, 55, 159, 35, 161, 47, 6, 49, 59, 2, 32, 11, 17, 8, 25, 125, 71, 239, 13, 206, 19, 32, 215, 223, 30, 223, 169, 191, 34, 100, 254, 79, 231, 15, 85, 103, 39, 163, 12, 85, 80, 15, 9, + 41, 115, 0, 38, 1, 227, 46, 151, 181, 116, 19, 159, 255, 253, 147, 40, 32, 112, 80, 23, 12, 162, 6, 104, 88, 43, 11, 0, 70, 159, 5, 175, 75, 28, 190, 72, 43, 155, 160, 80, 183, 35, 7, 254, 32, 22, 70, 250, 64, 181, 12, 31, 255, 207, 250, 73, 77, 173, 7, 233, 1, 200, 42, 14, 56, 50, 76, 159, 87, 12, + 159, 40, 133, 14, 189, 43, 4, 36, 99, 211, 7, 223, 47, 163, 106, 14, 63, 7, 31, 154, 206, 240, 53, 15, 255, 38, 37, 41, 1, 158, 15, 159, 9, 64, 38, 159, 72, 150, 190, 15, 158, 3, 15, 255, 17, 95, 87, 155, 0, 22, 15, 255, 4, 255, 251, 16, 255, 252, 64, 0, 117, 16, 79, 15, 228, 39, 5, 14, 157, 11, + 30, 64, 111, 255, 255, 213, 234, 1, 87, 98, 15, 255, 3, 211, 14, 61, 78, 79, 23, 59, 177, 191, 23, 109, 3, 188, 14, 167, 69, 46, 11, 40, 107, 0, 170, 59, 15, 255, 2, 252, 87, 223, 192, 15, 250, 40, 9, 1, 95, 13, 238, 248, 41, 239, 22, 157, 3, 122, 224, 15, 136, 67, 109, 25, 66, 0, 3, 43, 27, 0, + 72, 11, 203, 3, 128, 88, 72, 203, 207, 15, 255, 91, 2, 150, 31, 122, 85, 11, 2, 147, 7, 249, 63, 128, 0, 2, 239, 247, 251, 47, 151, 211, 82, 83, 183, 80, 1, 119, 15, 4, 4, 146, 3, 41, 199, 225, 76, 87, 91, 255, 225, 11, 29, 84, 175, 240, 27, 9, 73, 255, 153, 95, 16, 3, 14, 223, 32, 13, 200, 22, + 106, 92, 135, 191, 76, 254, 159, 48, 87, 123, 44, 160, 121, 160, 3, 179, 43, 44, 139, 179, 14, 239, 255, 236, 147, 84, 211, 38, 163, 217, 188, 18, 2, 239, 4, 30, 194, 32, 3, 1, 30, 198, 239, 255, 144, 87, 79, 146, 176, 88, 151, 223, 255, 67, 31, 254, 17, 147, 2, 92, 47, 170, 10, 255, 255, 246, 91, 15, 240, 67, + 51, 1, 13, 181, 11, 87, 12, 48, 29, 4, 29, 43, 15, 30, 244, 79, 255, 32, 174, 1, 34, 61, 207, 110, 192, 4, 255, 144, 31, 149, 91, 32, 3, 176, 31, 153, 176, 207, 48, 3, 204, 176, 237, 204, 194, 0, 0, 0, 141, 1, 53, 15, 65, 10, 119, 222, 118, 82, 5, 93, 75, 19, 87, 119, 101, 162, 213, 218, 9, 255, + 48, 3, 251, 11, 16, 3, 12, 48, 3, 41, 45, 213, 14, 98, 46, 12, 106, 87, 175, 31, 255, 61, 223, 5, 231, 121, 171, 222, 40, 123, 44, 3, 241, 0, 29, 123, 27, 201, 207, 255, 145, 10, 27, 208, 143, 255, 172, 192, 27, 50, 170, 157, 38, 219, 247, 89, 223, 95, 231, 151, 68, 31, 202, 45, 243, 254, 47, 208, 152, 117, + 50, 107, 6, 245, 5, 104, 155, 74, 75, 191, 30, 87, 32, 2, 255, 63, 255, 160, 30, 10, 248, 16, 207, 203, 1, 16, 30, 215, 26, 72, 205, 157, 135, 239, 254, 91, 30, 24, 244, 25, 9, 112, 12, 31, 144, 12, 204, 247, 250, 188, 228, 68, 111, 203, 252, 169, 117, 134, 67, 238, 223, 57, 247, 93, 19, 47, 230, 155, 206, 79, + 249, 106, 46, 199, 137, 143, 28, 220, 47, 25, 113, 111, 31, 167, 166, 191, 45, 60, 249, 74, 47, 30, 32, 219, 146, 47, 106, 78, 28, 141, 14, 78, 77, 48, 3, 1, 51, 69, 239, 240, 231, 253, 219, 64, 29, 235, 32, 3, 48, 0, 103, 185, 121, 31, 81, 42, 206, 255, 28, 75, 64, 51, 9, 148, 152, 95, 171, 47, 163, 13, + 31, 252, 31, 61, 34, 46, 255, 245, 255, 236, 185, 16, 27, 222, 50, 76, 230, 1, 89, 30, 116, 1, 46, 174, 19, 0, 19, 12, 16, 3, 204, 158, 0, 19, 12, 47, 32, 255, 255, 221, 180, 95, 59, 255, 243, 52, 86, 119, 146, 176, 0, 2, 205, 52, 176, 63, 107, 111, 243, 1, 50, 175, 198, 85, 223, 119, 142, 158, 181, 255, + 254, 17, 0, 239, 171, 247, 27, 171, 243, 30, 158, 224, 31, 61, 215, 236, 183, 221, 143, 162, 186, 153, 162, 79, 0, 0, 117, 171, 66, 91, 39, 160, 78, 71, 83, 11, 156, 1, 51, 69, 207, 87, 120, 111, 255, 47, 115, 35, 33, 16, 15, 59, 95, 19, 46, 211, 223, 255, 253, 144, 96, 219, 169, 175, 151, 63, 127, 16, 78, 211, + 252, 118, 84, 32, 199, 32, 15, 17, 99, 33, 103, 28, 119, 118, 85, 50, 124, 14, 153, 14, 54, 0, 4, 191, 255, 28, 234, 18, 7, 207, 253, 149, 69, 133, 142, 204, 155, 223, 255, 219, 116, 63, 126, 202, 153, 190, 4, 154, 2, 130, 97, 255, 29, 71, 200, 127, 254, 77, 213, 95, 10, 126, 47, 195, 92, 99, 183, 239, 222, 37, + 140, 159, 115, 234, 99, 0, 98, 10, 255, 0, 182, 234, 47, 247, 203, 188, 45, 203, 2, 175, 91, 199, 162, 7, 91, 207, 47, 44, 207, 35, 3, 48, 247, 192, 94, 195, 158, 224, 80, 11, 45, 95, 2, 88, 207, 7, 31, 71, 127, 30, 106, 255, 2, 255, 254, 166, 0, 150, 157, 32, 251, 95, 63, 247, 236, 187, 206, 12, 174, 2, + 44, 212, 204, 32, 31, 211, 112, 31, 79, 245, 27, 170, 31, 79, 53, 17, 30, 48, 220, 191, 252, 29, 146, 247, 12, 0, 47, 10, 239, 220, 185, 134, 15, 69, 10, 83, 37, 239, 211, 106, 25, 227, 249, 4, 19, 129, 31, 31, 164, 143, 31, 70, 124, 32, 130, 143, 255, 197, 16, 30, 29, 0, 15, 129, 10, 183, 167, 58, 243, 157, + 186, 15, 165, 10, 151, 84, 49, 173, 95, 78, 219, 79, 31, 23, 255, 254, 31, 134, 244, 95, 25, 238, 240, 31, 38, 253, 0, 1, 239, 255, 210, 252, 16, 72, 71, 227, 87, 155, 111, 255, 81, 63, 159, 106, 14, 192, 15, 2, 3, 31, 88, 8, 30, 190, 12, 30, 243, 166, 31, 30, 240, 95, 30, 20, 45, 229, 239, 250, 78, 47, + 109, 239, 214, 78, 148, 46, 84, 251, 97, 30, 103, 255, 153, 90, 44, 155, 15, 247, 5, 216, 48, 77, 167, 78, 47, 175, 85, 64, 81, 3, 30, 141, 7, 28, 173, 11, 27, 19, 15, 119, 31, 201, 79, 255, 48, 254, 239, 6, 217, 64, 53, 26, 206, 68, 99, 6, 191, 9, 95, 3, 182, 32, 243, 253, 165, 131, 45, 123, 226, 15, + 161, 15, 36, 175, 63, 31, 231, 57, 214, 153, 154, 12, 127, 5, 48, 31, 153, 245, 189, 33, 171, 175, 3, 18, 195, 2, 18, 68, 46, 255, 245, 5, 229, 239, 255, 176, 16, 231, 7, 3, 18, 255, 65, 159, 5, 152, 153, 14, 31, 5, 53, 235, 153, 187, 45, 195, 52, 23, 20, 27, 217, 3, 239, 61, 119, 27, 255, 31, 190, 30, + 35, 32, 65, 85, 147, 208, 94, 231, 31, 151, 41, 218, 9, 94, 29, 47, 51, 29, 95, 31, 58, 223, 17, 165, 255, 0, 26, 255, 253, 250, 25, 255, 255, 160, 15, 28, 0, 111, 31, 31, 204, 239, 241, 79, 71, 44, 15, 209, 0, 228, 57, 15, 39, 35, 245, 76, 0, 0, 28, 46, 20, 191, 19, 238, 255, 111, 62, 71, 7, 255, + 25, 147, 255, 245, 110, 255, 255, 255, 96, 255, 255, 228, 0, 255, 252, 152, 32, 52, 235, 21, 215, 0, 208, 210, 159, 0, 211, 25, 114, 25, 111, 31, 225, 127, 0, 17, 52, 0, 6, 239, 255, 255, 4, 207, 255, 254, 207, 255, 255, 194, 161, 11, 30, 252, 127, 28, 4, 35, 105, 107, 83, 41, 195, 64, 108, 12, 15, 85, 3, 223, + 98, 167, 1, 88, 15, 159, 3, 26, 35, 85, 36, 4, 200, 14, 222, 39, 45, 47, 120, 91, 15, 159, 8, 192, 122, 31, 163, 112, 0, 21, 156, 10, 140, 7, 7, 12, 71, 6, 54, 63, 223, 18, 23, 191, 208, 2, 16, 9, 3, 141, 15, 187, 7, 37, 79, 191, 28, 37, 251, 91, 89, 15, 255, 2, 159, 31, 254, 91, 147, 251, + 209, 202, 191, 235, 73, 15, 249, 10, 24, 151, 240, 2, 177, 123, 39, 129, 4, 48, 9, 192, 38, 45, 176, 14, 191, 8, 176, 218, 0, 239, 29, 71, 61, 80, 15, 255, 69, 223, 26, 30, 183, 63, 24, 202, 4, 211, 15, 255, 67, 46, 255, 229, 229, 0, 6, 249, 3, 208, 52, 7, 1, 5, 255, 77, 51, 0, 149, 51, 15, 255, + 3, 30, 139, 161, 15, 123, 73, 175, 23, 195, 14, 250, 250, 16, 0, 3, 48, 12, 254, 131, 120, 14, 29, 9, 239, 86, 172, 223, 7, 31, 6, 1, 48, 138, 189, 87, 58, 195, 246, 15, 65, 13, 36, 7, 187, 10, 103, 155, 222, 107, 7, 127, 7, 53, 121, 25, 144, 255, 7, 159, 4, 19, 16, 11, 73, 123, 38, 15, 208, 150, + 25, 193, 224, 55, 166, 0, 223, 111, 30, 156, 143, 255, 5, 46, 63, 0, 0, 41, 253, 41, 56, 203, 58, 125, 9, 239, 191, 159, 36, 49, 25, 231, 191, 87, 31, 199, 207, 26, 38, 207, 143, 245, 144, 0, 244, 90, 48, 3, 176, 128, 3, 204, 176, 15, 128, 14, 39, 223, 177, 87, 43, 150, 216, 29, 5, 250, 24, 135, 242, 119, + 126, 60, 29, 50, 15, 224, 8, 64, 184, 0, 4, 9, 191, 11, 6, 99, 6, 196, 153, 147, 73, 59, 9, 63, 2, 206, 192, 69, 2, 63, 9, 29, 155, 37, 9, 190, 12, 22, 226, 141, 0, 97, 10, 36, 243, 8, 239, 255, 107, 98, 28, 127, 207, 253, 76, 3, 45, 219, 15, 255, 31, 5, 29, 158, 51, 160, 3, 15, 225, 11, + 4, 119, 1, 63, 34, 15, 255, 19, 20, 119, 230, 117, 108, 255, 10, 127, 8, 46, 235, 254, 146, 15, 253, 50, 92, 79, 231, 8, 31, 179, 3, 101, 49, 9, 223, 2, 63, 238, 253, 202, 135, 108, 254, 0, 1, 31, 179, 29, 122, 27, 243, 207, 255, 176, 9, 21, 246, 47, 31, 104, 126, 31, 235, 247, 236, 168, 117, 49, 96, 31, + 255, 137, 244, 80, 151, 207, 243, 47, 231, 175, 60, 49, 19, 181, 66, 120, 0, 95, 6, 255, 219, 151, 101, 137, 223, 47, 59, 23, 88, 239, 2, 255, 251, 63, 235, 253, 185, 134, 223, 63, 33, 207, 30, 92, 255, 210, 0, 4, 250, 0, 239, 159, 244, 160, 16, 3, 0, 1, 191, 244, 72, 46, 187, 67, 158, 38, 63, 255, 144, 90, + 111, 35, 62, 47, 239, 129, 12, 29, 153, 19, 15, 31, 118, 45, 56, 28, 103, 26, 171, 95, 127, 61, 147, 177, 0, 0, 92, 48, 0, 93, 253, 255, 176, 93, 255, 255, 242, 31, 62, 129, 246, 255, 254, 112, 0, 16, 2, 0, 128, 9, 33, 24, 69, 46, 101, 223, 73, 187, 62, 95, 39, 143, 45, 76, 211, 111, 118, 29, 49, 0, + 204, 250, 25, 218, 255, 5, 31, 69, 105, 52, 177, 255, 230, 16, 2, 0, 45, 186, 21, 246, 0, 154, 194, 94, 76, 30, 174, 0, 232, 15, 29, 4, 95, 95, 111, 175, 61, 2, 255, 1, 9, 111, 252, 222, 255, 252, 186, 172, 12, 27, 96, 63, 16, 238, 191, 254, 82, 255, 27, 19, 171, 251, 17, 75, 251, 25, 99, 151, 64, 159, + 1, 0, 193, 21, 83, 76, 178, 80, 3, 32, 131, 46, 70, 41, 99, 175, 6, 29, 205, 231, 198, 99, 231, 0, 7, 6, 64, 210, 255, 255, 26, 38, 229, 253, 102, 83, 15, 149, 0, 97, 139, 203, 13, 170, 7, 207, 138, 251, 60, 43, 29, 48, 71, 139, 4, 31, 181, 8, 78, 15, 63, 25, 29, 31, 115, 110, 16, 41, 239, 255, + 154, 126, 111, 166, 251, 73, 255, 254, 64, 31, 29, 152, 254, 143, 255, 255, 81, 255, 248, 255, 24, 118, 239, 255, 255, 231, 47, 167, 193, 251, 191, 255, 212, 253, 224, 27, 160, 112, 30, 64, 16, 31, 29, 81, 151, 162, 4, 95, 243, 13, 35, 221, 38, 18, 31, 158, 0, 27, 74, 121, 59, 71, 216, 53, 255, 240, 31, 255, 48, 3, + 191, 104, 25, 139, 0, 108, 147, 255, 29, 31, 205, 28, 100, 27, 246, 182, 255, 16, 27, 205, 175, 31, 208, 63, 193, 75, 168, 101, 111, 196, 254, 80, 85, 11, 31, 146, 95, 18, 106, 10, 116, 30, 103, 4, 255, 224, 29, 53, 240, 48, 3, 65, 183, 174, 7, 66, 255, 5, 30, 223, 30, 255, 227, 30, 96, 199, 64, 1, 21, 154, + 46, 42, 66, 223, 169, 173, 250, 233, 32, 0, 22, 30, 230, 143, 77, 111, 38, 55, 63, 79, 48, 255, 255, 22, 23, 29, 195, 0, 40, 255, 255, 255, 128, 230, 46, 255, 242, 250, 3, 255, 212, 248, 242, 31, 252, 160, 29, 95, 32, 62, 123, 12, 8, 76, 253, 159, 254, 16, 0, 223, 249, 66, 35, 223, 94, 29, 107, 143, 29, 192, + 30, 255, 252, 48, 30, 74, 139, 250, 27, 186, 15, 31, 7, 47, 171, 252, 10, 115, 18, 9, 255, 170, 225, 30, 195, 144, 31, 47, 112, 19, 246, 192, 31, 247, 185, 250, 47, 247, 0, 0, 62, 33, 251, 29, 235, 207, 181, 244, 64, 3, 204, 194, 111, 254, 195, 47, 251, 163, 74, 46, 219, 198, 62, 87, 23, 38, 1, 81, 227, 14, + 31, 255, 148, 15, 91, 19, 60, 19, 95, 26, 63, 239, 31, 167, 38, 11, 58, 116, 27, 52, 75, 251, 116, 111, 5, 95, 9, 49, 84, 251, 74, 15, 255, 6, 16, 93, 243, 81, 211, 226, 28, 7, 32, 65, 40, 67, 30, 217, 207, 63, 251, 31, 223, 36, 177, 15, 193, 4, 167, 66, 178, 16, 0, 95, 11, 0, 17, 31, 187, 79, + 158, 31, 39, 212, 83, 74, 163, 6, 35, 15, 175, 174, 55, 52, 239, 32, 3, 219, 85, 251, 29, 168, 243, 14, 29, 45, 63, 255, 234, 152, 32, 47, 31, 178, 13, 24, 80, 4, 31, 224, 127, 19, 235, 48, 95, 254, 0, 255, 239, 253, 85, 47, 171, 146, 30, 83, 255, 26, 116, 255, 18, 66, 239, 244, 51, 255, 243, 7, 239, 255, + 179, 101, 67, 30, 103, 175, 235, 3, 255, 0, 1, 25, 58, 4, 255, 248, 157, 165, 22, 31, 247, 64, 31, 251, 119, 193, 98, 46, 11, 252, 219, 133, 32, 102, 47, 20, 139, 33, 195, 1, 71, 106, 239, 226, 200, 82, 77, 83, 255, 31, 183, 174, 47, 56, 186, 5, 30, 217, 10, 255, 134, 21, 242, 32, 52, 2, 115, 36, 6, 12, + 255, 117, 47, 107, 38, 59, 255, 184, 222, 255, 241, 26, 71, 128, 198, 175, 254, 25, 35, 253, 246, 10, 30, 255, 192, 95, 17, 207, 159, 115, 21, 88, 127, 253, 48, 53, 111, 31, 159, 0, 207, 229, 74, 205, 201, 100, 138, 28, 144, 44, 60, 148, 255, 244, 135, 239, 250, 247, 83, 231, 245, 64, 3, 35, 158, 190, 143, 25, 106, 79, + 191, 32, 0, 4, 61, 52, 237, 207, 255, 240, 22, 255, 240, 175, 84, 3, 255, 245, 232, 255, 240, 254, 20, 19, 244, 24, 7, 16, 115, 103, 255, 2, 156, 219, 49, 207, 31, 11, 1, 255, 218, 243, 2, 78, 84, 249, 2, 25, 230, 239, 35, 231, 140, 135, 21, 119, 45, 103, 20, 156, 48, 127, 19, 176, 18, 87, 249, 48, 239, 248, + 140, 0, 21, 142, 20, 137, 176, 87, 26, 9, 112, 20, 221, 80, 34, 226, 1, 12, 255, 215, 231, 175, 23, 107, 255, 18, 226, 255, 0, 26, 215, 239, 217, 26, 34, 248, 26, 135, 192, 8, 255, 229, 254, 32, 191, 22, 45, 17, 86, 0, 20, 33, 0, 169, 250, 119, 75, 127, 22, 179, 175, 19, 121, 29, 197, 6, 93, 26, 184, 13, + 24, 159, 111, 255, 144, 19, 34, 32, 144, 7, 9, 222, 11, 13, 239, 54, 143, 98, 115, 14, 99, 3, 38, 224, 39, 107, 166, 159, 12, 191, 40, 8, 15, 31, 10, 28, 67, 80, 42, 34, 44, 215, 41, 244, 14, 4, 35, 2, 34, 235, 1, 107, 239, 61, 15, 160, 6, 104, 223, 53, 103, 119, 118, 15, 255, 2, 208, 43, 83, 231, + 9, 203, 8, 42, 46, 63, 23, 0, 191, 9, 255, 190, 99, 44, 167, 19, 86, 10, 43, 3, 35, 227, 35, 231, 119, 99, 53, 1, 159, 42, 38, 95, 0, 58, 15, 255, 4, 224, 57, 55, 239, 159, 197, 4, 102, 7, 15, 255, 11, 255, 255, 234, 64, 235, 157, 98, 15, 218, 41, 0, 96, 14, 0, 7, 187, 15, 255, 10, 112, 127, + 2, 31, 16, 225, 143, 255, 252, 16, 1, 103, 57, 15, 64, 37, 107, 239, 3, 153, 144, 2, 157, 4, 46, 227, 92, 155, 254, 15, 255, 6, 22, 90, 0, 145, 15, 186, 74, 24, 192, 106, 15, 255, 99, 10, 205, 43, 54, 112, 13, 119, 6, 5, 144, 3, 83, 191, 255, 119, 47, 119, 240, 128, 3, 15, 255, 8, 139, 181, 95, 31, + 2, 247, 15, 128, 31, 1, 17, 159, 0, 95, 169, 240, 32, 3, 191, 16, 7, 207, 189, 141, 207, 67, 8, 70, 31, 75, 13, 14, 123, 7, 41, 183, 14, 127, 3, 1, 93, 75, 187, 183, 5, 26, 151, 5, 243, 191, 255, 34, 0, 0, 255, 91, 255, 243, 0, 111, 251, 204, 48, 254, 252, 102, 108, 176, 246, 0, 15, 15, 160, 8, + 235, 25, 100, 16, 26, 194, 254, 15, 192, 10, 201, 99, 125, 4, 207, 10, 84, 0, 0, 126, 252, 1, 8, 10, 167, 46, 75, 43, 15, 225, 4, 65, 45, 187, 236, 150, 65, 5, 122, 13, 189, 228, 206, 206, 255, 144, 159, 244, 48, 3, 176, 98, 29, 89, 176, 207, 33, 72, 12, 240, 1, 31, 245, 11, 89, 107, 164, 46, 0, 119, + 3, 235, 136, 7, 0, 251, 7, 64, 77, 171, 15, 161, 31, 186, 52, 29, 236, 191, 254, 184, 44, 120, 2, 15, 31, 5, 165, 82, 48, 251, 133, 30, 187, 15, 190, 12, 79, 7, 62, 3, 3, 90, 30, 163, 11, 92, 143, 28, 239, 15, 255, 2, 252, 17, 86, 74, 31, 154, 236, 10, 31, 7, 18, 39, 11, 18, 39, 63, 18, 39, + 164, 0, 0, 0, 141, 11, 31, 48, 96, 3, 9, 31, 207, 96, 3, 143, 7, 30, 75, 32, 3, 45, 51, 87, 119, 119, 122, 190, 191, 77, 3, 255, 173, 221, 221, 222, 147, 255, 179, 7, 51, 235, 247, 117, 60, 163, 48, 3, 253, 218, 134, 0, 31, 109, 143, 127, 25, 40, 128, 3, 159, 251, 128, 3, 205, 127, 253, 64, 3, 45, + 149, 119, 119, 29, 178, 255, 119, 48, 3, 10, 221, 221, 206, 253, 240, 207, 119, 231, 175, 249, 204, 42, 187, 47, 61, 221, 239, 255, 235, 221, 0, 95, 28, 136, 95, 32, 66, 251, 0, 245, 244, 204, 176, 11, 31, 67, 11, 30, 121, 11, 106, 29, 109, 9, 208, 77, 235, 9, 95, 86, 7, 91, 243, 165, 87, 30, 135, 191, 30, 135, + 32, 3, 173, 48, 155, 208, 18, 64, 3, 35, 227, 16, 222, 247, 111, 71, 16, 222, 255, 83, 255, 125, 55, 87, 252, 96, 15, 176, 191, 25, 215, 59, 244, 255, 198, 48, 243, 28, 212, 253, 16, 157, 37, 145, 157, 176, 80, 3, 31, 226, 255, 0, 109, 45, 7, 3, 150, 159, 46, 204, 79, 247, 12, 93, 191, 143, 254, 57, 207, 53, + 30, 104, 29, 54, 0, 253, 90, 135, 192, 168, 79, 143, 83, 29, 198, 47, 49, 132, 240, 30, 250, 45, 101, 253, 5, 230, 235, 207, 255, 30, 42, 16, 3, 248, 255, 75, 243, 173, 6, 180, 231, 64, 64, 127, 3, 242, 54, 157, 255, 164, 243, 41, 35, 40, 30, 79, 47, 255, 95, 26, 63, 45, 167, 52, 57, 151, 46, 232, 0, 8, + 29, 63, 1, 42, 40, 44, 55, 178, 79, 79, 7, 94, 204, 63, 252, 30, 177, 207, 17, 64, 66, 45, 89, 144, 111, 171, 49, 207, 31, 215, 30, 207, 143, 12, 189, 7, 107, 44, 253, 237, 113, 43, 144, 36, 123, 231, 32, 0, 234, 1, 141, 242, 76, 255, 159, 31, 206, 47, 31, 12, 237, 12, 255, 192, 45, 0, 173, 32, 223, 251, + 22, 105, 21, 30, 255, 48, 29, 246, 176, 14, 190, 10, 47, 175, 79, 234, 0, 2, 105, 149, 227, 5, 27, 235, 31, 31, 215, 249, 10, 255, 181, 0, 3, 44, 125, 28, 206, 9, 234, 255, 37, 139, 47, 47, 11, 31, 15, 12, 29, 120, 191, 12, 31, 125, 12, 204, 245, 0, 96, 0, 246, 251, 1, 255, 252, 35, 227, 79, 251, 128, + 3, 195, 76, 203, 107, 87, 182, 207, 182, 97, 63, 222, 220, 96, 119, 44, 111, 0, 72, 174, 21, 240, 0, 4, 99, 117, 30, 208, 3, 125, 243, 61, 222, 1, 80, 222, 7, 242, 12, 255, 176, 14, 102, 7, 98, 39, 11, 18, 39, 170, 5, 27, 184, 239, 46, 107, 241, 255, 157, 27, 29, 195, 255, 239, 0, 1, 191, 255, 0, 94, + 255, 157, 255, 28, 226, 44, 150, 0, 2, 113, 18, 70, 254, 183, 112, 31, 231, 253, 80, 31, 240, 252, 252, 77, 85, 47, 245, 127, 45, 63, 191, 15, 87, 2, 251, 28, 24, 255, 164, 249, 46, 63, 247, 15, 254, 47, 35, 231, 6, 26, 35, 89, 6, 222, 7, 4, 29, 14, 3, 255, 241, 10, 16, 3, 207, 5, 2, 47, 52, 26, + 92, 1, 69, 66, 9, 205, 159, 255, 18, 144, 47, 16, 215, 156, 32, 156, 47, 124, 23, 6, 79, 207, 255, 114, 191, 127, 83, 39, 247, 175, 215, 47, 147, 248, 47, 55, 48, 254, 191, 250, 251, 0, 250, 4, 209, 0, 67, 231, 111, 254, 11, 98, 111, 21, 117, 83, 27, 35, 31, 47, 95, 127, 20, 84, 79, 29, 7, 255, 16, 242, + 30, 151, 253, 121, 16, 175, 255, 249, 0, 16, 95, 255, 48, 32, 12, 126, 19, 15, 127, 249, 0, 32, 159, 249, 30, 191, 179, 247, 31, 239, 254, 113, 46, 191, 37, 247, 4, 255, 253, 235, 255, 43, 255, 160, 60, 83, 231, 6, 42, 104, 147, 31, 226, 4, 28, 146, 3, 25, 53, 3, 28, 146, 170, 2, 51, 231, 224, 30, 183, 240, + 31, 161, 240, 30, 84, 108, 45, 237, 241, 10, 16, 3, 5, 255, 16, 222, 24, 63, 213, 7, 255, 16, 222, 255, 0, 222, 1, 254, 16, 222, 250, 91, 42, 20, 144, 74, 135, 0, 215, 31, 244, 255, 231, 86, 46, 191, 16, 52, 213, 3, 32, 222, 0, 207, 29, 170, 53, 16, 156, 63, 41, 239, 246, 64, 15, 143, 80, 219, 8, 63, + 15, 223, 3, 29, 215, 2, 229, 0, 0, 78, 255, 223, 236, 190, 18, 3, 225, 255, 8, 255, 192, 255, 175, 12, 255, 160, 79, 15, 255, 96, 210, 12, 127, 31, 6, 239, 99, 191, 20, 51, 249, 68, 76, 168, 14, 46, 62, 146, 71, 115, 12, 93, 51, 62, 190, 36, 87, 38, 49, 123, 40, 207, 96, 80, 15, 35, 134, 254, 80, 30, + 232, 217, 254, 203, 78, 63, 143, 252, 64, 167, 20, 137, 7, 127, 17, 212, 46, 255, 192, 4, 239, 255, 64, 170, 239, 31, 41, 31, 21, 172, 10, 31, 76, 4, 46, 75, 170, 202, 12, 229, 1, 11, 28, 64, 47, 19, 86, 159, 31, 159, 87, 28, 172, 6, 31, 120, 13, 30, 239, 79, 255, 96, 170, 4, 18, 161, 9, 30, 147, 241, + 68, 49, 191, 28, 201, 187, 111, 81, 211, 15, 255, 98, 20, 212, 255, 237, 171, 255, 16, 219, 243, 17, 124, 251, 68, 231, 31, 255, 255, 160, 48, 9, 255, 242, 96, 1, 255, 246, 250, 112, 0, 175, 20, 32, 47, 196, 68, 151, 183, 1, 81, 43, 14, 255, 64, 67, 223, 253, 16, 21, 35, 124, 22, 93, 17, 106, 111, 30, 229, 31, + 20, 235, 11, 111, 30, 102, 7, 64, 72, 127, 0, 0, 70, 32, 255, 2, 0, 159, 254, 223, 255, 16, 143, 243, 255, 255, 96, 31, 31, 126, 31, 85, 240, 1, 43, 21, 13, 31, 223, 246, 20, 36, 247, 27, 185, 246, 0, 194, 1, 64, 85, 111, 46, 61, 41, 77, 31, 94, 6, 22, 159, 190, 13, 31, 106, 79, 253, 80, 0, 127, + 37, 118, 51, 37, 126, 32, 222, 239, 251, 94, 207, 38, 27, 96, 4, 168, 98, 16, 222, 255, 16, 222, 7, 53, 192, 32, 222, 35, 146, 138, 47, 20, 184, 17, 168, 21, 179, 112, 16, 222, 96, 31, 189, 83, 53, 43, 111, 31, 227, 14, 29, 107, 47, 162, 0, 239, 55, 34, 242, 31, 200, 14, 214, 21, 206, 254, 48, 0, 203, 46, + 177, 96, 181, 15, 175, 2, 4, 15, 196, 10, 223, 255, 218, 255, 230, 37, 228, 0, 43, 44, 135, 94, 46, 107, 162, 143, 239, 139, 212, 36, 19, 31, 255, 35, 173, 160, 15, 37, 29, 180, 1, 36, 222, 101, 81, 15, 255, 7, 46, 35, 111, 16, 132, 240, 0, 7, 207, 233, 15, 255, 2, 102, 207, 15, 253, 8, 37, 175, 221, 6, + 85, 15, 255, 6, 48, 2, 239, 19, 77, 45, 90, 47, 67, 124, 15, 255, 4, 80, 0, 47, 254, 254, 10, 43, 8, 186, 1, 14, 191, 11, 243, 0, 46, 16, 222, 2, 15, 159, 9, 164, 245, 17, 99, 192, 0, 222, 5, 15, 148, 18, 159, 13, 7, 2, 175, 255, 121, 17, 195, 254, 2, 87, 118, 14, 160, 3, 33, 183, 96, 54, + 15, 94, 41, 36, 185, 0, 93, 46, 163, 37, 119, 15, 255, 4, 254, 176, 0, 255, 230, 0, 0, 99, 15, 194, 38, 167, 103, 55, 135, 13, 0, 223, 10, 31, 131, 246, 4, 103, 166, 117, 12, 204, 3, 32, 1, 122, 8, 95, 255, 6, 112, 15, 184, 11, 52, 34, 123, 34, 127, 0, 70, 0, 223, 4, 242, 68, 247, 2, 193, 6, + 129, 32, 0, 222, 16, 31, 223, 32, 3, 3, 135, 4, 28, 199, 28, 203, 246, 130, 0, 0, 222, 5, 2, 125, 13, 0, 27, 238, 13, 97, 4, 13, 19, 48, 2, 27, 238, 114, 25, 67, 11, 255, 188, 4, 87, 7, 26, 231, 195, 71, 43, 85, 4, 48, 2, 11, 31, 251, 15, 26, 44, 14, 15, 191, 1, 17, 204, 205, 223, 110, + 189, 14, 191, 0, 35, 32, 87, 115, 124, 223, 91, 11, 31, 5, 223, 27, 202, 207, 248, 15, 254, 4, 188, 221, 136, 255, 46, 64, 46, 195, 255, 213, 18, 41, 67, 44, 9, 31, 137, 231, 240, 159, 244, 5, 19, 3, 60, 211, 8, 171, 255, 216, 176, 13, 15, 255, 5, 5, 119, 24, 46, 48, 226, 15, 255, 2, 242, 137, 155, 188, + 213, 35, 179, 31, 163, 79, 1, 89, 4, 255, 48, 0, 255, 188, 195, 0, 198, 102, 190, 203, 15, 160, 7, 3, 119, 119, 119, 7, 15, 223, 1, 158, 13, 27, 148, 46, 83, 125, 255, 199, 119, 15, 255, 10, 207, 118, 0, 77, 15, 15, 31, 34, 173, 185, 117, 49, 85, 33, 162, 239, 0, 95, 9, 254, 41, 11, 16, 15, 125, 34, + 4, 124, 30, 151, 5, 255, 51, 53, 90, 1, 255, 3, 47, 17, 124, 30, 242, 0, 247, 119, 119, 16, 42, 231, 15, 223, 36, 198, 5, 179, 79, 23, 41, 155, 2, 253, 33, 198, 16, 31, 171, 171, 208, 29, 9, 112, 4, 124, 62, 4, 70, 207, 61, 255, 42, 46, 89, 23, 247, 252, 109, 238, 10, 28, 116, 223, 28, 116, 127, 31, + 135, 247, 255, 191, 255, 255, 228, 2, 191, 207, 30, 184, 6, 239, 9, 255, 79, 249, 107, 16, 3, 251, 11, 16, 3, 12, 48, 3, 76, 203, 206, 236, 204, 26, 42, 25, 217, 255, 255, 178, 3, 192, 7, 77, 31, 247, 110, 29, 14, 155, 31, 140, 48, 24, 6, 250, 63, 34, 83, 43, 227, 255, 255, 98, 191, 255, 227, 125, 27, 211, + 63, 198, 102, 0, 63, 26, 216, 63, 239, 198, 0, 32, 27, 186, 249, 16, 191, 252, 86, 75, 131, 229, 41, 27, 195, 29, 206, 11, 251, 64, 3, 181, 10, 17, 84, 9, 99, 15, 255, 0, 6, 124, 163, 176, 243, 0, 119, 255, 176, 26, 35, 32, 3, 192, 1, 189, 187, 47, 255, 118, 85, 51, 33, 29, 223, 187, 119, 47, 243, 119, + 119, 122, 115, 248, 187, 187, 189, 81, 31, 255, 5, 50, 66, 176, 113, 243, 51, 155, 48, 3, 251, 135, 187, 66, 11, 60, 8, 44, 12, 28, 179, 0, 159, 251, 110, 128, 3, 127, 252, 76, 250, 103, 101, 83, 125, 107, 46, 19, 51, 26, 169, 255, 32, 3, 27, 187, 187, 16, 115, 255, 0, 0, 50, 16, 191, 244, 123, 176, 255, 207, + 244, 159, 240, 207, 244, 207, 247, 207, 204, 194, 46, 212, 31, 211, 241, 239, 254, 187, 178, 177, 32, 78, 255, 176, 28, 175, 16, 3, 204, 16, 7, 47, 39, 237, 128, 3, 7, 48, 3, 144, 0, 13, 237, 43, 108, 163, 16, 222, 119, 144, 222, 187, 34, 171, 203, 169, 183, 135, 31, 67, 51, 79, 29, 95, 59, 119, 124, 221, 255, 211, + 112, 223, 190, 255, 235, 29, 115, 144, 111, 31, 37, 0, 198, 26, 61, 255, 255, 179, 0, 253, 191, 252, 99, 0, 51, 48, 74, 75, 184, 115, 126, 31, 255, 255, 5, 80, 171, 37, 27, 173, 222, 61, 56, 207, 48, 3, 87, 85, 67, 33, 46, 19, 189, 247, 255, 235, 187, 7, 28, 71, 41, 255, 229, 185, 119, 133, 57, 253, 187, 21, + 30, 91, 35, 227, 186, 117, 95, 254, 121, 151, 0, 57, 203, 255, 30, 17, 169, 163, 151, 10, 145, 7, 87, 60, 71, 29, 228, 29, 62, 251, 87, 231, 155, 222, 255, 77, 2, 46, 51, 191, 255, 116, 230, 19, 255, 249, 33, 31, 31, 39, 251, 173, 31, 44, 93, 37, 97, 241, 93, 163, 16, 0, 51, 33, 144, 214, 125, 29, 237, 247, + 97, 6, 255, 242, 16, 152, 208, 93, 3, 136, 14, 255, 84, 71, 51, 33, 28, 88, 7, 14, 252, 255, 1, 102, 63, 255, 127, 80, 196, 46, 203, 85, 30, 250, 48, 46, 7, 128, 78, 7, 1, 29, 106, 79, 100, 29, 110, 31, 48, 77, 135, 191, 228, 154, 45, 147, 31, 164, 10, 29, 86, 60, 54, 74, 255, 45, 194, 6, 31, 207, + 29, 44, 219, 95, 38, 183, 255, 31, 14, 175, 0, 223, 252, 12, 246, 51, 140, 239, 254, 118, 109, 182, 49, 39, 48, 221, 191, 254, 29, 141, 255, 48, 14, 31, 103, 175, 15, 26, 59, 77, 203, 18, 249, 47, 87, 112, 254, 94, 255, 253, 241, 247, 4, 255, 248, 208, 17, 173, 48, 53, 63, 87, 15, 255, 44, 1, 239, 30, 101, 79, + 30, 190, 7, 94, 4, 202, 7, 9, 11, 95, 11, 255, 255, 145, 61, 44, 159, 182, 126, 31, 191, 1, 175, 31, 227, 4, 223, 95, 147, 46, 107, 30, 30, 158, 13, 27, 194, 2, 229, 246, 85, 63, 176, 80, 159, 20, 252, 16, 79, 95, 13, 29, 6, 12, 251, 14, 20, 97, 237, 7, 255, 145, 21, 176, 254, 112, 31, 208, 112, 216, + 5, 207, 17, 60, 5, 230, 62, 35, 46, 39, 175, 255, 170, 175, 255, 255, 241, 47, 255, 5, 31, 255, 5, 223, 255, 125, 46, 30, 15, 255, 255, 130, 143, 50, 64, 208, 91, 84, 3, 232, 47, 255, 249, 16, 31, 255, 96, 0, 186, 207, 29, 226, 4, 213, 0, 67, 227, 95, 31, 98, 213, 95, 255, 64, 3, 79, 50, 170, 16, 48, + 3, 47, 115, 86, 129, 21, 84, 32, 16, 113, 50, 83, 191, 252, 223, 121, 223, 20, 42, 2, 95, 255, 48, 4, 250, 12, 255, 247, 43, 159, 31, 149, 159, 31, 228, 185, 239, 30, 71, 255, 253, 113, 49, 79, 44, 147, 255, 254, 252, 255, 208, 255, 176, 77, 96, 67, 231, 84, 34, 59, 5, 80, 3, 4, 31, 99, 3, 80, 3, 48, + 222, 170, 0, 16, 222, 85, 144, 222, 199, 16, 222, 144, 16, 222, 153, 243, 16, 222, 46, 194, 144, 66, 19, 231, 16, 222, 112, 99, 30, 70, 214, 157, 46, 75, 31, 154, 31, 192, 223, 114, 233, 191, 251, 6, 239, 240, 231, 82, 191, 16, 150, 0, 188, 225, 174, 39, 122, 187, 168, 79, 83, 247, 30, 226, 255, 20, 175, 253, 16, 0, + 30, 255, 248, 203, 32, 5, 31, 44, 32, 3, 105, 31, 52, 255, 255, 183, 209, 45, 79, 198, 110, 30, 175, 14, 255, 190, 97, 19, 67, 16, 92, 14, 245, 2, 17, 66, 56, 195, 54, 252, 12, 47, 41, 133, 63, 83, 16, 112, 3, 13, 255, 52, 0, 231, 10, 255, 173, 36, 124, 31, 209, 255, 7, 255, 232, 244, 91, 14, 31, 180, + 95, 30, 11, 33, 119, 47, 142, 75, 31, 106, 0, 38, 254, 31, 26, 128, 31, 30, 250, 23, 31, 41, 75, 31, 39, 25, 56, 191, 9, 255, 224, 3, 165, 14, 31, 211, 63, 31, 236, 31, 254, 30, 28, 3, 127, 106, 26, 136, 207, 249, 76, 46, 239, 31, 35, 191, 32, 23, 127, 62, 95, 220, 255, 240, 252, 0, 255, 241, 191, 244, + 16, 3, 240, 3, 255, 224, 249, 159, 215, 255, 192, 31, 110, 144, 32, 3, 121, 92, 255, 125, 14, 20, 10, 16, 119, 137, 206, 224, 47, 251, 95, 91, 25, 144, 12, 28, 136, 3, 255, 31, 133, 175, 161, 238, 0, 0, 19, 159, 220, 255, 243, 7, 23, 171, 175, 1, 64, 230, 96, 26, 116, 96, 9, 14, 255, 142, 216, 23, 55, 31, + 87, 40, 192, 215, 255, 248, 31, 222, 252, 192, 207, 255, 254, 16, 159, 22, 240, 34, 91, 56, 16, 210, 30, 247, 208, 0, 146, 47, 155, 50, 88, 35, 231, 213, 175, 252, 31, 172, 249, 29, 240, 243, 21, 10, 208, 254, 1, 223, 255, 80, 10, 255, 250, 12, 124, 242, 99, 15, 255, 15, 85, 64, 13, 165, 8, 34, 59, 24, 111, 226, + 5, 214, 190, 251, 9, 203, 36, 31, 27, 44, 5, 84, 12, 169, 8, 81, 43, 227, 28, 47, 159, 107, 11, 171, 3, 46, 187, 41, 100, 161, 34, 5, 161, 8, 46, 155, 85, 15, 255, 6, 16, 222, 18, 229, 1, 20, 199, 215, 0, 6, 15, 255, 4, 246, 31, 163, 192, 0, 191, 135, 250, 11, 12, 35, 16, 89, 31, 127, 27, 232, + 0, 0, 23, 149, 207, 15, 255, 3, 20, 191, 255, 20, 40, 251, 15, 104, 5, 68, 28, 6, 128, 15, 47, 219, 23, 239, 0, 3, 116, 15, 255, 2, 42, 128, 170, 193, 15, 195, 9, 159, 27, 65, 91, 36, 172, 18, 15, 135, 37, 60, 26, 231, 39, 4, 0, 0, 25, 206, 15, 255, 5, 40, 107, 251, 244, 255, 253, 185, 98, 15, + 233, 35, 60, 253, 171, 145, 15, 255, 11, 207, 24, 36, 103, 12, 168, 9, 93, 225, 57, 78, 79, 15, 255, 98, 5, 236, 134, 189, 25, 31, 117, 15, 213, 253, 96, 53, 135, 159, 31, 25, 239, 4, 126, 170, 23, 69, 44, 160, 249, 222, 212, 44, 253, 37, 203, 244, 26, 126, 254, 168, 16, 26, 134, 112, 4, 246, 137, 107, 41, 29, + 15, 160, 6, 44, 19, 178, 192, 223, 252, 54, 67, 30, 113, 31, 177, 159, 31, 120, 251, 191, 251, 4, 103, 207, 15, 159, 9, 97, 0, 58, 71, 95, 6, 96, 127, 4, 189, 224, 27, 30, 241, 25, 2, 170, 243, 27, 231, 243, 15, 225, 12, 75, 4, 244, 14, 11, 223, 89, 111, 24, 42, 11, 250, 73, 204, 175, 255, 168, 48, 199, + 3, 191, 239, 255, 47, 240, 38, 41, 255, 252, 64, 93, 30, 223, 252, 5, 84, 35, 6, 120, 80, 28, 105, 160, 74, 28, 213, 176, 12, 151, 7, 94, 195, 12, 15, 255, 2, 184, 24, 214, 11, 26, 187, 57, 3, 15, 255, 47, 36, 255, 12, 30, 213, 4, 138, 168, 239, 31, 255, 14, 31, 255, 47, 40, 116, 75, 107, 27, 208, 235, + 252, 116, 16, 123, 28, 204, 31, 253, 64, 2, 156, 104, 47, 180, 28, 120, 35, 254, 188, 37, 55, 78, 123, 42, 46, 131, 31, 165, 0, 102, 6, 82, 31, 249, 246, 3, 93, 0, 85, 43, 191, 63, 31, 255, 13, 95, 159, 8, 65, 82, 110, 219, 226, 128, 31, 44, 245, 0, 56, 209, 129, 255, 250, 0, 21, 174, 255, 172, 63, 138, + 252, 174, 37, 103, 41, 205, 37, 119, 49, 119, 47, 35, 80, 133, 58, 85, 3, 159, 11, 4, 48, 3, 175, 59, 155, 64, 27, 206, 144, 95, 26, 83, 232, 29, 134, 255, 3, 175, 255, 255, 187, 207, 95, 233, 0, 11, 212, 30, 114, 20, 139, 223, 2, 124, 90, 219, 255, 255, 234, 255, 251, 231, 98, 0, 165, 81, 235, 47, 226, 239, + 252, 96, 117, 87, 71, 253, 0, 136, 38, 42, 127, 73, 142, 0, 44, 62, 125, 95, 221, 38, 25, 247, 111, 244, 30, 166, 29, 75, 254, 15, 250, 2, 0, 12, 253, 143, 31, 174, 106, 17, 87, 101, 0, 26, 203, 16, 29, 243, 20, 30, 94, 222, 255, 2, 16, 123, 175, 255, 254, 115, 45, 207, 234, 249, 111, 247, 127, 4, 119, 26, + 164, 255, 29, 134, 168, 255, 28, 58, 25, 28, 95, 1, 29, 53, 32, 3, 75, 247, 149, 2, 44, 251, 44, 255, 207, 93, 3, 95, 81, 167, 14, 191, 240, 29, 112, 242, 0, 5, 207, 246, 4, 247, 207, 255, 250, 175, 63, 221, 168, 255, 255, 223, 195, 6, 30, 123, 8, 252, 32, 0, 9, 60, 46, 219, 30, 191, 205, 255, 249, 48, + 41, 11, 66, 55, 130, 240, 80, 3, 45, 27, 16, 178, 58, 182, 156, 194, 111, 31, 180, 165, 159, 31, 167, 207, 64, 222, 45, 111, 10, 81, 171, 7, 90, 82, 155, 4, 93, 95, 3, 86, 46, 239, 32, 94, 243, 251, 80, 2, 140, 255, 101, 49, 89, 254, 255, 250, 207, 252, 80, 255, 120, 8, 20, 0, 48, 221, 255, 11, 14, 191, + 16, 28, 109, 56, 101, 39, 163, 223, 25, 42, 223, 247, 122, 160, 3, 2, 142, 255, 112, 25, 191, 208, 31, 163, 253, 128, 255, 251, 80, 0, 200, 8, 230, 0, 15, 84, 82, 115, 111, 94, 63, 175, 31, 255, 223, 81, 79, 31, 81, 78, 29, 76, 64, 80, 195, 88, 111, 252, 138, 205, 127, 146, 118, 19, 0, 0, 2, 175, 27, 135, + 2, 96, 127, 234, 234, 253, 201, 80, 108, 119, 253, 15, 127, 14, 11, 19, 227, 138, 11, 28, 187, 28, 3, 48, 3, 8, 30, 136, 7, 64, 3, 170, 2, 29, 162, 175, 208, 159, 159, 128, 155, 4, 30, 68, 82, 30, 175, 160, 92, 231, 64, 66, 0, 32, 112, 250, 83, 91, 173, 243, 7, 226, 50, 189, 45, 95, 255, 255, 47, 1, + 2, 228, 202, 134, 239, 82, 99, 33, 35, 127, 36, 11, 97, 8, 244, 254, 202, 134, 66, 34, 173, 249, 89, 147, 17, 243, 241, 5, 255, 231, 88, 46, 182, 30, 43, 47, 146, 111, 191, 96, 30, 166, 245, 0, 143, 255, 246, 27, 91, 31, 32, 239, 30, 36, 255, 254, 43, 82, 24, 239, 101, 70, 117, 15, 248, 67, 146, 235, 127, 165, + 61, 207, 79, 85, 29, 58, 13, 31, 229, 7, 29, 227, 2, 37, 23, 207, 85, 18, 217, 127, 17, 250, 6, 29, 244, 11, 31, 79, 31, 85, 27, 37, 143, 19, 91, 239, 21, 250, 239, 30, 60, 7, 191, 32, 12, 251, 19, 223, 249, 63, 255, 87, 16, 146, 10, 95, 63, 51, 67, 175, 84, 223, 34, 23, 10, 39, 39, 164, 224, 81, + 75, 249, 68, 215, 66, 203, 144, 78, 99, 31, 70, 87, 30, 162, 208, 31, 202, 112, 31, 97, 16, 0, 175, 101, 31, 175, 2, 146, 165, 204, 20, 163, 3, 46, 137, 210, 78, 104, 65, 12, 84, 227, 35, 55, 0, 48, 95, 18, 190, 191, 127, 20, 23, 159, 242, 0, 80, 191, 241, 247, 0, 252, 223, 240, 31, 227, 224, 0, 191, 245, + 255, 254, 206, 4, 31, 236, 3, 30, 211, 6, 41, 19, 64, 32, 161, 14, 30, 62, 95, 30, 219, 16, 34, 0, 11, 31, 21, 79, 31, 70, 163, 12, 227, 7, 128, 54, 195, 80, 13, 247, 0, 7, 252, 62, 31, 144, 255, 0, 62, 84, 44, 107, 143, 30, 51, 1, 34, 231, 111, 38, 98, 22, 106, 174, 5, 31, 101, 11, 31, 47, + 63, 255, 128, 30, 57, 8, 100, 233, 22, 192, 51, 93, 38, 75, 176, 76, 139, 47, 147, 36, 149, 158, 208, 133, 203, 51, 231, 1, 103, 100, 19, 31, 255, 191, 254, 63, 255, 176, 3, 109, 207, 208, 0, 233, 11, 111, 250, 49, 22, 0, 112, 3, 19, 216, 255, 183, 250, 39, 23, 253, 113, 20, 228, 255, 251, 1, 164, 126, 8, 159, + 7, 145, 81, 119, 27, 247, 119, 44, 100, 31, 239, 170, 255, 31, 32, 233, 31, 255, 80, 31, 76, 144, 31, 251, 127, 22, 225, 239, 253, 100, 0, 223, 246, 255, 237, 253, 255, 245, 31, 231, 251, 190, 40, 175, 40, 119, 31, 231, 6, 255, 238, 22, 42, 176, 32, 63, 154, 255, 115, 148, 47, 233, 254, 129, 45, 207, 162, 45, 211, 212, + 179, 92, 37, 172, 58, 36, 59, 0, 9, 35, 7, 51, 203, 239, 167, 83, 17, 15, 227, 8, 22, 191, 19, 89, 86, 45, 187, 46, 31, 131, 12, 31, 135, 47, 255, 45, 208, 248, 0, 110, 255, 251, 109, 17, 5, 37, 195, 98, 63, 99, 21, 135, 0, 176, 4, 219, 1, 35, 87, 65, 231, 255, 249, 252, 2, 255, 252, 48, 1, 254, + 21, 215, 157, 236, 161, 112, 22, 243, 208, 16, 248, 46, 72, 19, 5, 81, 187, 191, 56, 43, 93, 20, 120, 255, 248, 240, 89, 199, 231, 95, 15, 248, 57, 30, 2, 95, 11, 39, 247, 39, 23, 8, 223, 252, 131, 15, 95, 3, 91, 20, 159, 196, 15, 255, 42, 31, 251, 65, 90, 7, 234, 75, 12, 228, 70, 4, 6, 93, 11, 26, + 65, 239, 28, 6, 159, 216, 239, 0, 0, 34, 13, 101, 65, 3, 255, 204, 239, 154, 4, 28, 70, 36, 198, 0, 1, 15, 131, 0, 178, 13, 217, 48, 61, 102, 211, 15, 159, 3, 254, 4, 103, 64, 38, 164, 251, 123, 15, 34, 37, 12, 255, 217, 239, 19, 158, 255, 0, 230, 7, 223, 232, 15, 255, 2, 23, 156, 92, 176, 15, 227, + 9, 149, 96, 15, 150, 15, 43, 107, 7, 44, 199, 94, 15, 255, 2, 251, 78, 31, 158, 255, 25, 24, 23, 110, 0, 87, 97, 15, 227, 2, 214, 42, 208, 10, 255, 47, 2, 45, 7, 175, 233, 1, 33, 2, 240, 255, 253, 64, 0, 30, 242, 122, 11, 15, 99, 64, 24, 223, 235, 6, 239, 242, 28, 123, 80, 14, 86, 116, 83, 33, + 47, 40, 118, 53, 143, 13, 14, 31, 4, 255, 220, 186, 16, 82, 75, 15, 128, 1, 14, 65, 240, 176, 3, 15, 255, 13, 39, 15, 29, 7, 92, 29, 249, 207, 8, 34, 2, 3, 100, 49, 59, 151, 44, 243, 187, 14, 0, 223, 6, 169, 32, 255, 28, 137, 255, 255, 8, 239, 65, 9, 82, 20, 208, 3, 202, 205, 240, 192, 3, 4, + 94, 46, 13, 213, 6, 125, 31, 254, 79, 85, 120, 155, 239, 175, 255, 43, 79, 30, 55, 207, 31, 251, 41, 111, 255, 194, 53, 84, 74, 31, 254, 250, 15, 225, 33, 45, 187, 79, 90, 171, 239, 239, 255, 14, 38, 36, 56, 7, 84, 115, 15, 255, 39, 9, 187, 188, 29, 51, 103, 8, 63, 7, 221, 221, 93, 191, 2, 194, 2, 17, + 35, 51, 36, 106, 182, 15, 255, 2, 48, 94, 179, 0, 2, 141, 2, 91, 131, 207, 255, 150, 33, 31, 56, 31, 36, 207, 30, 210, 255, 255, 0, 197, 50, 216, 17, 26, 79, 147, 2, 239, 75, 129, 24, 123, 37, 19, 178, 95, 42, 155, 219, 153, 46, 27, 35, 6, 254, 29, 87, 185, 226, 31, 247, 167, 119, 83, 47, 123, 21, 150, + 255, 244, 255, 119, 120, 174, 9, 223, 3, 64, 92, 39, 64, 158, 166, 4, 23, 89, 9, 42, 221, 31, 56, 6, 191, 239, 175, 167, 53, 30, 140, 255, 64, 3, 25, 34, 240, 47, 91, 234, 255, 240, 11, 20, 3, 3, 36, 7, 46, 46, 168, 215, 1, 125, 63, 175, 191, 63, 175, 236, 255, 255, 213, 230, 10, 31, 57, 14, 30, 114, + 63, 47, 136, 252, 169, 253, 90, 175, 242, 90, 179, 128, 90, 11, 148, 208, 57, 69, 31, 202, 46, 77, 243, 44, 7, 28, 139, 3, 29, 212, 30, 219, 255, 225, 27, 132, 117, 255, 16, 216, 255, 226, 46, 74, 187, 47, 141, 160, 158, 177, 119, 118, 66, 7, 224, 17, 203, 216, 53, 54, 67, 37, 43, 6, 41, 183, 0, 91, 88, 148, + 3, 29, 131, 239, 2, 125, 16, 222, 16, 234, 20, 120, 239, 240, 5, 233, 163, 255, 21, 156, 255, 234, 106, 125, 103, 166, 71, 47, 74, 223, 67, 91, 1, 47, 247, 173, 11, 30, 210, 10, 26, 3, 9, 244, 91, 155, 247, 74, 93, 255, 244, 89, 159, 63, 245, 222, 30, 139, 12, 31, 225, 255, 143, 255, 112, 3, 255, 254, 119, 13, + 29, 62, 187, 63, 252, 33, 171, 219, 84, 49, 127, 138, 110, 252, 116, 0, 61, 255, 255, 235, 62, 226, 190, 191, 214, 126, 32, 73, 207, 255, 22, 141, 252, 64, 111, 167, 180, 3, 31, 119, 8, 255, 77, 157, 47, 65, 63, 36, 69, 234, 1, 255, 248, 29, 239, 243, 46, 135, 241, 90, 163, 189, 112, 108, 51, 20, 122, 224, 126, 17, + 212, 127, 157, 255, 4, 225, 17, 35, 227, 7, 151, 119, 10, 127, 10, 117, 237, 85, 84, 51, 72, 140, 217, 80, 28, 31, 144, 93, 30, 149, 96, 28, 217, 32, 0, 159, 40, 27, 255, 239, 246, 50, 46, 31, 96, 175, 255, 32, 4, 84, 27, 143, 13, 29, 180, 10, 44, 136, 74, 8, 17, 40, 29, 198, 173, 223, 61, 67, 61, 86, + 255, 3, 177, 30, 123, 250, 93, 17, 53, 252, 31, 247, 96, 0, 255, 25, 180, 230, 87, 31, 248, 114, 15, 127, 36, 44, 49, 79, 3, 223, 255, 39, 31, 43, 31, 231, 44, 25, 91, 31, 123, 207, 255, 253, 86, 17, 47, 144, 24, 235, 48, 29, 149, 240, 253, 19, 24, 181, 128, 23, 12, 255, 228, 79, 115, 64, 11, 28, 69, 3, + 121, 127, 70, 71, 116, 0, 45, 30, 63, 30, 29, 5, 241, 255, 249, 140, 7, 22, 251, 46, 251, 31, 242, 78, 47, 110, 203, 51, 211, 227, 25, 49, 225, 0, 95, 61, 250, 48, 25, 255, 1, 74, 30, 192, 242, 70, 79, 146, 223, 31, 154, 62, 75, 240, 79, 59, 42, 115, 226, 132, 199, 150, 29, 30, 194, 19, 127, 29, 94, 155, + 11, 253, 94, 2, 218, 0, 239, 131, 255, 0, 254, 23, 251, 198, 23, 255, 171, 21, 183, 255, 175, 31, 150, 207, 31, 248, 223, 248, 77, 70, 189, 127, 93, 139, 32, 79, 0, 10, 213, 47, 4, 130, 193, 47, 195, 46, 147, 31, 200, 26, 54, 41, 222, 255, 20, 202, 253, 255, 239, 253, 186, 151, 65, 12, 223, 4, 233, 117, 52, 203, + 121, 190, 255, 86, 211, 143, 58, 143, 3, 234, 207, 255, 4, 31, 164, 16, 74, 227, 0, 31, 162, 65, 126, 227, 254, 83, 123, 68, 103, 32, 215, 85, 55, 38, 175, 175, 255, 255, 215, 0, 29, 254, 37, 0, 1, 208, 194, 5, 88, 206, 0, 0, 3, 10, 28, 158, 83, 95, 46, 95, 213, 15, 255, 75, 15, 175, 32, 189, 250, 30, + 231, 245, 86, 26, 24, 5, 31, 39, 30, 31, 198, 207, 128, 31, 20, 141, 48, 31, 44, 39, 29, 138, 159, 132, 54, 30, 64, 45, 250, 255, 48, 3, 239, 248, 20, 212, 192, 30, 59, 212, 32, 3, 30, 152, 5, 20, 227, 1, 63, 230, 30, 167, 106, 31, 63, 217, 255, 19, 176, 143, 31, 162, 9, 44, 10, 180, 128, 47, 219, 254, + 185, 131, 119, 48, 94, 191, 229, 199, 83, 23, 131, 224, 51, 115, 95, 22, 112, 32, 150, 239, 250, 85, 16, 177, 245, 25, 66, 240, 31, 174, 176, 30, 177, 255, 234, 240, 22, 68, 31, 171, 3, 31, 175, 2, 50, 13, 88, 20, 166, 239, 21, 146, 207, 254, 68, 43, 126, 102, 29, 223, 215, 191, 209, 31, 231, 249, 19, 171, 209, 109, + 255, 170, 253, 26, 67, 209, 14, 205, 16, 207, 38, 128, 248, 29, 71, 170, 244, 28, 37, 241, 31, 246, 224, 31, 45, 160, 31, 45, 170, 112, 31, 45, 64, 9, 39, 26, 95, 31, 255, 14, 238, 15, 255, 8, 255, 254, 159, 223, 255, 161, 63, 255, 255, 229, 0, 63, 250, 16, 0, 63, 145, 80, 55, 11, 128, 3, 247, 149, 115, 0, + 11, 2, 8, 198, 15, 255, 238, 255, 212, 2, 22, 177, 0, 109, 64, 10, 240, 20, 62, 11, 0, 29, 15, 255, 47, 239, 255, 237, 0, 78, 29, 223, 237, 1, 140, 239, 0, 30, 4, 255, 250, 23, 238, 64, 214, 252, 166, 15, 158, 4, 16, 11, 239, 53, 1, 85, 12, 254, 36, 200, 77, 208, 102, 116, 15, 255, 7, 7, 91, 15, + 15, 255, 3, 20, 238, 185, 194, 24, 84, 0, 127, 231, 11, 76, 8, 11, 239, 21, 1, 20, 13, 43, 3, 91, 239, 0, 222, 7, 10, 44, 228, 56, 10, 142, 41, 47, 63, 206, 2, 158, 7, 63, 10, 43, 41, 54, 155, 221, 13, 203, 3, 151, 112, 144, 3, 15, 255, 2, 63, 55, 106, 16, 0, 1, 169, 104, 15, 228, 6, 31, + 111, 191, 55, 14, 43, 3, 28, 97, 254, 139, 96, 104, 75, 15, 169, 32, 38, 45, 175, 28, 179, 1, 85, 36, 15, 29, 71, 99, 239, 41, 15, 226, 2, 105, 111, 148, 15, 255, 72, 78, 240, 228, 2, 119, 112, 12, 146, 144, 77, 122, 0, 77, 222, 96, 3, 26, 1, 47, 3, 5, 31, 22, 15, 159, 0, 199, 48, 28, 127, 240, + 28, 138, 150, 176, 57, 231, 13, 83, 64, 255, 76, 11, 0, 175, 30, 41, 138, 159, 175, 255, 43, 237, 24, 100, 0, 47, 20, 252, 40, 71, 231, 103, 137, 171, 15, 255, 10, 9, 147, 34, 28, 239, 64, 95, 26, 194, 96, 29, 13, 128, 0, 28, 255, 180, 125, 75, 98, 4, 255, 144, 159, 244, 48, 3, 176, 175, 191, 16, 3, 207, + 48, 3, 204, 176, 204, 194, 101, 15, 64, 34, 92, 96, 29, 202, 44, 11, 244, 27, 31, 134, 122, 15, 223, 10, 185, 152, 119, 101, 15, 255, 10, 84, 5, 220, 9, 249, 169, 153, 153, 151, 223, 15, 127, 5, 61, 59, 119, 236, 101, 85, 255, 0, 31, 9, 85, 48, 140, 255, 15, 255, 3, 231, 4, 119, 119, 39, 60, 15, 255, 6, + 117, 85, 85, 5, 144, 95, 25, 67, 17, 64, 48, 3, 17, 64, 0, 17, 64, 80, 84, 17, 64, 240, 81, 64, 144, 95, 239, 176, 208, 3, 7, 142, 3, 213, 137, 144, 30, 173, 224, 27, 146, 240, 28, 222, 241, 66, 7, 176, 2, 201, 78, 207, 105, 175, 207, 255, 45, 51, 224, 89, 75, 140, 112, 11, 255, 7, 34, 123, 45, 87, + 0, 126, 239, 255, 41, 135, 182, 251, 45, 135, 250, 32, 31, 223, 249, 16, 7, 255, 79, 233, 5, 87, 119, 25, 76, 255, 29, 87, 16, 3, 254, 189, 221, 238, 221, 119, 137, 153, 239, 110, 155, 221, 223, 203, 187, 47, 239, 191, 3, 16, 0, 191, 255, 62, 209, 0, 191, 239, 253, 16, 191, 235, 253, 187, 211, 31, 191, 243, 48, 3, + 253, 153, 146, 146, 63, 247, 35, 63, 251, 80, 3, 79, 239, 191, 75, 31, 94, 48, 7, 85, 197, 201, 127, 255, 49, 255, 144, 0, 250, 92, 255, 210, 17, 15, 19, 27, 95, 31, 5, 188, 159, 27, 195, 51, 51, 69, 82, 58, 191, 64, 3, 234, 243, 17, 19, 30, 227, 4, 30, 161, 5, 26, 115, 7, 1, 160, 4, 196, 172, 43, + 251, 31, 92, 34, 171, 119, 101, 67, 139, 46, 46, 69, 92, 55, 40, 23, 5, 127, 63, 237, 203, 139, 185, 59, 223, 28, 187, 30, 77, 0, 30, 70, 1, 255, 243, 245, 122, 239, 96, 94, 215, 232, 157, 72, 178, 99, 76, 239, 0, 45, 29, 199, 33, 63, 33, 67, 8, 118, 152, 83, 7, 127, 6, 31, 217, 220, 51, 43, 26, 61, + 44, 28, 202, 185, 175, 23, 24, 143, 253, 88, 42, 141, 45, 55, 187, 190, 147, 223, 41, 37, 139, 16, 190, 255, 250, 224, 182, 9, 74, 199, 1, 239, 66, 131, 0, 127, 27, 230, 255, 11, 30, 255, 225, 14, 207, 255, 80, 133, 9, 42, 102, 28, 11, 60, 171, 47, 151, 160, 151, 255, 171, 211, 188, 222, 93, 55, 79, 76, 171, 42, + 148, 9, 255, 149, 242, 28, 80, 52, 235, 245, 82, 183, 112, 9, 31, 0, 255, 246, 187, 187, 189, 221, 15, 159, 10, 221, 222, 63, 39, 85, 44, 147, 11, 80, 3, 13, 80, 3, 15, 62, 15, 208, 5, 80, 151, 33, 87, 28, 200, 27, 190, 65, 103, 144, 95, 255, 8, 222, 187, 187, 15, 255, 10, 205, 221, 221, 223, 8, 223, 7, + 234, 0, 15, 48, 30, 133, 48, 56, 164, 127, 48, 3, 24, 29, 197, 32, 3, 30, 0, 191, 253, 192, 42, 134, 183, 116, 247, 123, 34, 74, 2, 255, 245, 35, 162, 131, 85, 207, 245, 251, 17, 0, 175, 22, 1, 143, 45, 233, 63, 247, 255, 51, 85, 159, 162, 162, 254, 16, 5, 59, 30, 245, 36, 36, 13, 255, 160, 47, 151, 136, + 153, 38, 46, 71, 64, 3, 221, 0, 201, 2, 47, 99, 253, 96, 29, 206, 234, 255, 147, 12, 37, 51, 108, 47, 247, 57, 43, 111, 235, 6, 126, 255, 31, 104, 143, 29, 91, 1, 140, 85, 63, 225, 198, 47, 99, 64, 79, 63, 199, 15, 243, 10, 4, 249, 160, 0, 4, 207, 246, 12, 30, 50, 19, 19, 2, 90, 27, 251, 46, 18, + 19, 239, 255, 16, 6, 251, 16, 6, 218, 176, 11, 46, 62, 223, 209, 46, 133, 191, 29, 230, 178, 159, 30, 52, 159, 176, 79, 31, 96, 3, 127, 35, 189, 170, 251, 87, 43, 253, 144, 3, 254, 8, 28, 0, 3, 91, 131, 79, 34, 23, 47, 80, 59, 30, 199, 1, 255, 239, 249, 32, 78, 49, 63, 39, 176, 79, 95, 26, 110, 55, + 127, 61, 95, 37, 136, 42, 37, 140, 37, 148, 9, 30, 233, 11, 48, 3, 176, 31, 46, 131, 176, 33, 127, 171, 73, 91, 235, 189, 223, 31, 159, 73, 37, 191, 139, 116, 194, 254, 255, 234, 116, 16, 65, 110, 3, 159, 3, 234, 116, 30, 218, 0, 159, 253, 78, 181, 167, 79, 31, 240, 47, 30, 242, 31, 52, 0, 254, 182, 115, 12, + 231, 13, 2, 104, 207, 45, 40, 31, 251, 255, 0, 250, 127, 253, 166, 0, 19, 147, 198, 191, 116, 221, 186, 253, 20, 132, 112, 48, 12, 31, 75, 10, 31, 166, 139, 8, 31, 87, 22, 96, 31, 161, 112, 16, 123, 80, 167, 149, 65, 14, 187, 11, 14, 6, 38, 1, 31, 187, 160, 31, 134, 48, 234, 0, 239, 252, 30, 106, 245, 24, + 22, 224, 27, 211, 151, 112, 31, 130, 31, 169, 249, 14, 93, 36, 88, 154, 188, 169, 222, 32, 214, 159, 71, 255, 15, 44, 4, 80, 3, 63, 255, 0, 18, 49, 63, 255, 255, 247, 95, 105, 64, 3, 249, 111, 53, 83, 112, 81, 215, 33, 219, 48, 69, 80, 3, 32, 65, 231, 15, 173, 4, 25, 119, 7, 30, 147, 6, 114, 8, 95, + 2, 1, 35, 205, 118, 145, 30, 183, 191, 25, 169, 181, 223, 22, 109, 223, 250, 48, 208, 32, 17, 176, 161, 244, 255, 247, 0, 177, 21, 103, 211, 53, 160, 15, 164, 13, 86, 36, 47, 95, 21, 49, 63, 21, 107, 5, 50, 15, 209, 0, 161, 15, 22, 21, 79, 22, 140, 44, 136, 32, 107, 18, 16, 3, 34, 21, 248, 40, 27, 10, + 37, 108, 10, 225, 33, 30, 105, 191, 16, 2, 25, 24, 171, 57, 63, 22, 1, 4, 207, 32, 15, 16, 18, 255, 83, 18, 46, 248, 16, 2, 16, 39, 250, 39, 253, 207, 255, 172, 254, 29, 195, 231, 50, 135, 248, 16, 15, 111, 48, 255, 255, 169, 26, 15, 193, 15, 127, 83, 235, 91, 5, 127, 4, 76, 12, 169, 89, 15, 255, 7, + 6, 30, 159, 6, 223, 91, 123, 255, 255, 242, 86, 31, 245, 208, 11, 75, 10, 14, 23, 145, 15, 255, 15, 31, 41, 62, 15, 212, 12, 75, 139, 144, 0, 7, 134, 32, 14, 96, 68, 173, 3, 25, 28, 1, 39, 244, 167, 81, 14, 193, 69, 8, 45, 87, 119, 15, 255, 4, 242, 71, 111, 22, 48, 15, 128, 36, 141, 238, 187, 153, + 119, 15, 186, 10, 85, 51, 16, 38, 7, 171, 143, 31, 255, 53, 2, 31, 10, 103, 11, 231, 7, 220, 186, 122, 15, 255, 10, 152, 118, 84, 50, 15, 249, 10, 19, 25, 132, 181, 5, 33, 98, 86, 113, 15, 161, 67, 14, 24, 172, 11, 87, 42, 5, 2, 11, 138, 37, 143, 25, 149, 30, 250, 16, 212, 0, 5, 2, 95, 4, 16, + 15, 244, 128, 12, 87, 219, 26, 99, 199, 1, 175, 14, 243, 2, 60, 159, 31, 40, 255, 255, 230, 94, 15, 225, 13, 79, 6, 97, 35, 71, 101, 51, 16, 23, 74, 61, 37, 11, 14, 95, 7, 253, 219, 169, 135, 30, 126, 244, 103, 12, 247, 40, 254, 220, 54, 99, 15, 27, 6, 135, 101, 51, 52, 14, 191, 10, 47, 26, 255, 225, + 7, 174, 3, 222, 77, 219, 45, 223, 170, 1, 255, 31, 241, 144, 3, 243, 13, 220, 65, 62, 27, 6, 161, 63, 48, 3, 32, 29, 214, 227, 244, 46, 183, 46, 187, 11, 69, 94, 191, 12, 127, 191, 33, 169, 48, 3, 251, 128, 3, 76, 138, 203, 8, 237, 4, 91, 223, 26, 11, 5, 191, 255, 66, 44, 239, 190, 163, 89, 207, 129, + 50, 17, 252, 8, 15, 255, 8, 114, 61, 27, 253, 221, 128, 14, 223, 9, 45, 163, 14, 3, 244, 4, 229, 104, 173, 206, 103, 255, 233, 138, 69, 31, 59, 254, 92, 91, 143, 236, 3, 93, 129, 0, 0, 17, 47, 67, 80, 3, 141, 207, 2, 87, 3, 159, 16, 15, 255, 2, 254, 160, 93, 71, 176, 45, 8, 12, 51, 71, 151, 150, + 43, 141, 249, 48, 17, 178, 252, 182, 6, 31, 44, 0, 3, 42, 33, 0, 109, 26, 190, 237, 208, 4, 223, 29, 177, 5, 239, 30, 85, 5, 167, 0, 47, 15, 254, 89, 199, 46, 55, 9, 255, 79, 181, 249, 16, 3, 251, 11, 16, 3, 12, 48, 3, 76, 229, 203, 12, 204, 44, 240, 30, 88, 43, 9, 127, 16, 173, 98, 58, 67, + 18, 52, 58, 171, 78, 63, 17, 27, 10, 30, 219, 94, 25, 112, 6, 27, 175, 255, 255, 96, 127, 27, 132, 180, 223, 31, 152, 255, 251, 79, 155, 253, 28, 31, 35, 122, 215, 32, 64, 12, 254, 17, 9, 31, 155, 2, 86, 121, 39, 2, 99, 6, 63, 27, 221, 32, 239, 31, 195, 46, 255, 246, 249, 1, 239, 255, 128, 29, 92, 244, + 29, 2, 0, 139, 254, 56, 22, 48, 227, 0, 231, 5, 1, 99, 231, 255, 0, 205, 123, 239, 92, 3, 31, 15, 74, 116, 45, 223, 223, 125, 35, 227, 243, 2, 88, 174, 253, 140, 6, 167, 215, 251, 98, 63, 111, 7, 31, 246, 14, 3, 105, 170, 204, 31, 163, 245, 31, 167, 224, 31, 171, 112, 31, 153, 214, 16, 0, 61, 19, 242, + 1, 223, 2, 7, 206, 65, 27, 163, 7, 36, 95, 167, 47, 170, 35, 227, 19, 231, 37, 31, 58, 28, 92, 142, 195, 165, 32, 78, 29, 72, 13, 45, 76, 253, 0, 12, 204, 139, 239, 240, 108, 231, 252, 215, 202, 121, 60, 4, 208, 28, 224, 96, 0, 207, 165, 254, 62, 154, 160, 65, 173, 15, 226, 5, 30, 31, 219, 207, 171, 255, + 29, 135, 250, 31, 10, 224, 17, 136, 64, 10, 255, 255, 248, 1, 111, 255, 192, 10, 78, 246, 254, 32, 7, 242, 31, 191, 96, 14, 31, 255, 233, 1, 19, 51, 47, 195, 83, 38, 56, 47, 219, 254, 253, 80, 1, 255, 255, 251, 39, 31, 191, 80, 107, 28, 250, 0, 89, 27, 143, 11, 31, 50, 47, 255, 172, 128, 31, 158, 16, 46, + 87, 0, 255, 69, 0, 38, 111, 179, 5, 198, 129, 222, 255, 31, 91, 48, 3, 255, 255, 241, 202, 133, 100, 16, 56, 62, 35, 43, 16, 103, 20, 7, 175, 170, 52, 225, 45, 207, 46, 135, 29, 170, 0, 247, 52, 213, 85, 85, 3, 63, 9, 76, 30, 94, 127, 27, 181, 14, 159, 224, 30, 89, 139, 189, 3, 96, 32, 0, 143, 255, + 242, 224, 0, 95, 245, 247, 0, 47, 255, 248, 254, 0, 15, 250, 255, 112, 13, 246, 253, 239, 224, 10, 222, 194, 31, 213, 31, 6, 45, 31, 116, 31, 251, 7, 16, 200, 14, 255, 11, 142, 18, 52, 117, 191, 182, 121, 154, 187, 18, 146, 255, 28, 222, 255, 249, 6, 203, 186, 153, 85, 16, 0, 158, 171, 18, 191, 221, 156, 219, 119, + 102, 255, 248, 87, 80, 122, 143, 255, 51, 85, 103, 116, 30, 200, 247, 30, 204, 181, 249, 30, 78, 216, 17, 8, 59, 72, 42, 16, 2, 255, 106, 16, 2, 255, 51, 208, 15, 42, 79, 73, 162, 16, 2, 151, 0, 16, 2, 16, 37, 253, 47, 67, 64, 255, 255, 218, 145, 0, 16, 2, 0, 162, 4, 107, 16, 29, 35, 23, 109, 70, + 131, 159, 255, 29, 123, 243, 4, 18, 35, 62, 20, 29, 175, 19, 122, 66, 23, 176, 79, 255, 209, 44, 61, 31, 147, 160, 111, 31, 230, 79, 19, 147, 16, 39, 112, 8, 47, 161, 31, 234, 3, 8, 31, 3, 34, 207, 31, 202, 62, 119, 70, 167, 35, 47, 111, 255, 122, 48, 55, 63, 255, 246, 2, 19, 227, 30, 30, 252, 191, 223, + 35, 227, 209, 8, 48, 254, 32, 143, 208, 227, 227, 20, 107, 64, 29, 144, 71, 27, 53, 159, 187, 83, 82, 43, 62, 228, 44, 239, 64, 86, 223, 30, 46, 191, 72, 126, 169, 191, 149, 207, 159, 80, 3, 143, 109, 55, 27, 248, 79, 149, 247, 28, 251, 16, 3, 0, 32, 3, 249, 80, 3, 250, 203, 51, 51, 66, 167, 28, 248, 157, + 11, 87, 2, 119, 119, 146, 147, 31, 98, 14, 192, 15, 11, 31, 203, 96, 3, 9, 48, 3, 238, 144, 0, 8, 44, 207, 255, 163, 51, 34, 99, 175, 1, 46, 56, 23, 8, 168, 0, 53, 85, 87, 119, 109, 8, 223, 10, 121, 112, 70, 99, 1, 182, 15, 66, 12, 27, 177, 255, 30, 160, 94, 255, 65, 203, 61, 235, 40, 91, 47, + 100, 80, 15, 255, 250, 37, 175, 47, 251, 253, 31, 234, 29, 4, 183, 0, 19, 119, 0, 128, 170, 247, 6, 118, 85, 105, 12, 95, 11, 67, 79, 81, 235, 127, 95, 128, 21, 29, 2, 95, 31, 220, 5, 28, 217, 8, 255, 240, 113, 16, 62, 4, 187, 10, 15, 254, 17, 247, 7, 201, 14, 213, 14, 156, 3, 118, 38, 143, 8, 0, + 95, 26, 194, 223, 242, 18, 123, 188, 176, 25, 53, 64, 0, 47, 253, 116, 1, 98, 95, 93, 15, 145, 44, 4, 26, 195, 7, 255, 240, 25, 146, 208, 85, 62, 235, 47, 30, 144, 111, 25, 188, 175, 24, 196, 223, 159, 251, 12, 29, 80, 38, 175, 47, 255, 178, 0, 9, 171, 179, 15, 255, 3, 162, 15, 120, 47, 45, 25, 141, 1, + 179, 34, 15, 222, 6, 15, 117, 17, 79, 46, 37, 15, 255, 6, 26, 174, 5, 9, 6, 10, 85, 39, 195, 111, 20, 72, 4, 15, 222, 37, 11, 40, 116, 175, 84, 25, 108, 6, 15, 255, 7, 111, 31, 255, 95, 88, 191, 15, 127, 0, 79, 90, 167, 17, 14, 62, 5, 44, 195, 255, 237, 221, 211, 84, 15, 255, 38, 6, 29, 39, + 5, 45, 39, 17, 0, 97, 4, 75, 38, 194, 254, 221, 11, 131, 7, 23, 171, 11, 133, 11, 15, 85, 14, 7, 31, 124, 217, 7, 239, 25, 149, 4, 48, 14, 141, 68, 25, 241, 11, 114, 24, 52, 0, 2, 32, 15, 42, 69, 44, 99, 62, 12, 163, 7, 174, 16, 69, 179, 98, 15, 167, 69, 1, 255, 247, 22, 215, 96, 30, 9, + 3, 112, 12, 159, 121, 106, 211, 14, 191, 0, 12, 159, 19, 39, 156, 29, 28, 24, 32, 3, 15, 255, 0, 223, 247, 249, 80, 3, 251, 37, 16, 11, 15, 2, 65, 13, 208, 3, 206, 115, 112, 112, 3, 159, 58, 32, 3, 5, 146, 4, 144, 0, 244, 48, 3, 176, 14, 63, 66, 150, 218, 31, 66, 87, 43, 9, 255, 31, 97, 0, + 60, 27, 199, 0, 242, 87, 43, 14, 192, 40, 29, 164, 3, 255, 161, 63, 8, 50, 2, 78, 127, 8, 252, 0, 3, 131, 246, 111, 175, 225, 34, 0, 75, 147, 251, 204, 48, 0, 215, 102, 108, 30, 96, 15, 14, 96, 8, 143, 253, 219, 215, 186, 159, 15, 127, 0, 9, 80, 3, 11, 152, 119, 215, 85, 12, 31, 162, 12, 133, 197, + 249, 0, 255, 91, 48, 3, 251, 128, 3, 76, 203, 1, 197, 9, 253, 220, 56, 60, 3, 15, 193, 5, 187, 169, 151, 152, 191, 36, 27, 25, 187, 255, 11, 255, 188, 0, 63, 198, 102, 0, 255, 63, 96, 0, 85, 63, 198, 0, 255, 148, 123, 143, 63, 44, 223, 195, 31, 255, 203, 92, 43, 44, 47, 173, 179, 14, 60, 16, 176, 3, + 148, 95, 95, 255, 192, 3, 0, 47, 14, 127, 14, 15, 255, 47, 53, 175, 164, 5, 137, 155, 187, 93, 29, 210, 255, 47, 24, 8, 203, 185, 12, 159, 12, 103, 227, 255, 246, 87, 31, 248, 30, 79, 32, 3, 76, 51, 45, 31, 248, 24, 201, 247, 76, 163, 253, 215, 44, 159, 251, 67, 83, 231, 203, 51, 235, 0, 3, 2, 156, 253, + 30, 132, 9, 252, 254, 80, 0, 15, 255, 254, 113, 79, 42, 187, 168, 142, 10, 159, 8, 146, 47, 112, 178, 3, 239, 3, 179, 255, 63, 82, 159, 112, 30, 192, 48, 3, 16, 204, 255, 112, 158, 45, 28, 23, 31, 245, 118, 31, 249, 112, 75, 23, 124, 176, 125, 51, 231, 244, 204, 176, 0, 194, 95, 110, 163, 87, 47, 204, 197, 43, + 227, 231, 13, 97, 28, 189, 223, 255, 53, 31, 31, 64, 3, 103, 117, 93, 215, 12, 31, 175, 15, 246, 255, 1, 17, 95, 190, 183, 83, 53, 21, 248, 93, 26, 195, 176, 91, 15, 149, 86, 119, 43, 143, 253, 106, 64, 3, 237, 219, 13, 218, 23, 10, 26, 59, 15, 27, 244, 163, 111, 31, 10, 223, 19, 210, 31, 103, 160, 18, 0, + 8, 172, 243, 19, 231, 247, 28, 207, 223, 59, 30, 250, 31, 113, 173, 31, 92, 227, 5, 47, 27, 239, 96, 19, 227, 255, 252, 251, 48, 0, 255, 198, 48, 60, 227, 45, 59, 142, 240, 91, 171, 45, 131, 35, 227, 89, 155, 187, 8, 63, 8, 25, 19, 227, 16, 242, 16, 50, 1, 239, 64, 83, 32, 239, 63, 106, 31, 119, 175, 255, + 27, 167, 249, 50, 162, 64, 203, 255, 157, 112, 171, 255, 47, 231, 7, 120, 153, 0, 95, 9, 255, 242, 171, 187, 221, 223, 222, 67, 36, 103, 31, 45, 103, 255, 255, 179, 191, 252, 255, 254, 51, 0, 230, 63, 239, 240, 59, 50, 44, 238, 255, 241, 31, 161, 51, 30, 4, 27, 69, 0, 99, 3, 220, 9, 73, 187, 111, 252, 95, 62, + 79, 62, 29, 43, 239, 255, 239, 13, 255, 253, 245, 46, 191, 255, 144, 2, 42, 55, 255, 149, 225, 76, 167, 46, 135, 253, 31, 233, 255, 30, 144, 255, 220, 254, 32, 30, 167, 226, 0, 46, 16, 8, 30, 71, 185, 227, 15, 255, 15, 71, 119, 153, 33, 68, 48, 3, 141, 215, 221, 187, 88, 212, 146, 65, 35, 191, 255, 153, 239, 191, + 255, 221, 111, 241, 186, 191, 255, 119, 122, 99, 255, 80, 95, 255, 3, 36, 11, 208, 31, 9, 190, 255, 63, 99, 253, 0, 85, 84, 51, 61, 56, 154, 43, 31, 31, 46, 25, 223, 253, 8, 50, 81, 6, 29, 103, 170, 10, 28, 237, 13, 31, 132, 31, 31, 81, 95, 18, 103, 176, 143, 31, 186, 207, 252, 65, 108, 13, 123, 15, 3, + 247, 6, 100, 15, 171, 92, 47, 195, 58, 11, 191, 7, 242, 78, 135, 24, 48, 39, 7, 239, 23, 227, 255, 41, 151, 243, 0, 7, 0, 255, 255, 16, 234, 24, 239, 250, 30, 186, 196, 13, 107, 68, 9, 30, 41, 169, 12, 31, 73, 15, 31, 168, 79, 31, 237, 190, 198, 245, 73, 14, 185, 22, 3, 35, 233, 31, 255, 15, 92, 111, + 19, 15, 4, 40, 56, 63, 19, 242, 0, 31, 13, 0, 35, 129, 43, 203, 35, 242, 74, 111, 107, 240, 79, 245, 40, 227, 63, 89, 23, 7, 236, 167, 37, 35, 35, 48, 55, 224, 66, 83, 44, 238, 191, 26, 244, 95, 117, 27, 114, 14, 253, 96, 0, 223, 18, 242, 20, 82, 160, 122, 19, 137, 48, 0, 239, 252, 28, 143, 245, 30, + 198, 189, 208, 22, 198, 96, 0, 207, 254, 14, 190, 51, 239, 74, 73, 43, 13, 87, 24, 16, 85, 3, 27, 52, 11, 19, 229, 234, 47, 255, 144, 47, 33, 244, 31, 255, 208, 31, 255, 68, 0, 173, 5, 62, 81, 63, 14, 31, 4, 20, 155, 231, 14, 135, 10, 19, 232, 134, 0, 19, 232, 32, 8, 28, 131, 20, 227, 0, 46, 84, + 131, 69, 120, 87, 228, 80, 71, 31, 201, 29, 239, 80, 20, 31, 246, 74, 20, 31, 244, 16, 54, 27, 211, 2, 20, 145, 10, 20, 145, 162, 31, 31, 219, 143, 31, 215, 30, 79, 45, 50, 8, 28, 214, 228, 0, 24, 64, 7, 239, 0, 215, 255, 79, 26, 176, 32, 234, 213, 2, 255, 18, 163, 159, 21, 227, 31, 29, 15, 7, 106, + 20, 128, 0, 217, 12, 47, 83, 3, 20, 104, 6, 37, 80, 153, 4, 12, 159, 38, 103, 247, 103, 115, 13, 191, 69, 107, 239, 8, 49, 15, 255, 3, 91, 239, 153, 64, 13, 94, 100, 37, 62, 36, 2, 0, 213, 38, 96, 15, 226, 38, 92, 15, 255, 10, 160, 15, 116, 45, 5, 69, 15, 181, 16, 4, 84, 55, 15, 31, 4, 87, + 111, 6, 14, 190, 70, 159, 82, 23, 197, 175, 43, 177, 99, 15, 31, 118, 207, 255, 41, 11, 239, 53, 223, 19, 51, 0, 223, 123, 11, 221, 221, 221, 11, 30, 15, 223, 5, 44, 8, 15, 255, 10, 17, 17, 17, 48, 43, 93, 157, 255, 38, 76, 1, 181, 126, 3, 252, 132, 21, 128, 255, 120, 28, 179, 255, 0, 3, 123, 14, 95, + 3, 16, 33, 27, 251, 214, 252, 131, 30, 222, 249, 15, 255, 35, 69, 82, 12, 222, 2, 90, 175, 234, 157, 79, 131, 0, 207, 15, 226, 2, 184, 91, 123, 131, 250, 8, 123, 47, 4, 244, 4, 45, 20, 96, 3, 14, 223, 34, 189, 214, 22, 0, 222, 14, 15, 53, 46, 24, 162, 11, 27, 193, 11, 255, 15, 162, 11, 196, 221, 222, + 14, 31, 8, 18, 132, 44, 155, 128, 9, 79, 9, 46, 55, 173, 143, 15, 255, 2, 177, 31, 255, 254, 80, 30, 95, 250, 30, 4, 114, 132, 3, 231, 59, 31, 235, 5, 119, 119, 85, 230, 22, 78, 31, 235, 175, 39, 253, 47, 237, 85, 83, 51, 36, 156, 186, 6, 74, 71, 1, 239, 128, 30, 63, 243, 29, 122, 250, 253, 4, 255, + 254, 255, 29, 36, 191, 24, 243, 9, 40, 158, 25, 246, 58, 127, 47, 212, 192, 173, 227, 64, 59, 5, 122, 169, 55, 0, 0, 88, 190, 28, 68, 255, 45, 204, 143, 239, 31, 247, 26, 46, 61, 179, 239, 208, 0, 20, 237, 191, 249, 206, 95, 43, 235, 134, 207, 255, 34, 241, 0, 106, 207, 242, 31, 151, 30, 179, 27, 74, 63, 171, + 253, 11, 39, 3, 15, 144, 3, 1, 169, 251, 85, 85, 214, 86, 119, 143, 132, 221, 62, 211, 123, 255, 29, 73, 222, 4, 140, 59, 42, 119, 120, 153, 153, 111, 164, 198, 203, 187, 30, 191, 31, 84, 175, 255, 154, 180, 30, 239, 162, 192, 78, 87, 246, 80, 227, 12, 222, 15, 58, 191, 0, 42, 59, 82, 31, 119, 3, 95, 119, 7, + 59, 187, 47, 135, 248, 95, 107, 52, 44, 9, 31, 156, 0, 241, 95, 127, 224, 96, 95, 6, 63, 15, 202, 254, 48, 30, 70, 21, 144, 250, 26, 87, 244, 31, 78, 160, 224, 27, 22, 128, 58, 106, 27, 142, 179, 235, 0, 11, 2, 8, 24, 8, 79, 31, 209, 207, 0, 222, 18, 15, 185, 3, 141, 0, 0, 61, 138, 255, 28, 251, + 3, 159, 7, 35, 152, 242, 66, 128, 179, 30, 95, 170, 179, 29, 39, 177, 29, 43, 208, 48, 3, 8, 28, 64, 175, 7, 48, 3, 240, 111, 27, 119, 117, 85, 83, 119, 14, 31, 3, 255, 255, 96, 31, 63, 80, 51, 111, 84, 30, 151, 79, 60, 184, 0, 61, 99, 159, 31, 28, 56, 55, 223, 0, 26, 15, 163, 10, 255, 255, 212, + 0, 110, 102, 20, 39, 1, 207, 59, 152, 28, 74, 44, 144, 15, 85, 21, 244, 110, 0, 0, 93, 7, 31, 3, 48, 81, 191, 5, 253, 2, 249, 5, 103, 119, 119, 13, 31, 240, 22, 126, 255, 64, 7, 95, 2, 119, 16, 0, 130, 163, 0, 31, 2, 46, 179, 128, 3, 15, 255, 49, 159, 143, 95, 67, 13, 35, 3, 255, 148, 239, + 245, 255, 245, 244, 10, 160, 255, 30, 84, 143, 30, 96, 13, 69, 28, 228, 3, 160, 12, 9, 192, 16, 30, 236, 18, 15, 188, 7, 175, 63, 50, 163, 30, 220, 255, 48, 6, 6, 255, 96, 203, 10, 3, 36, 4, 36, 72, 207, 30, 208, 143, 244, 217, 0, 127, 31, 34, 239, 224, 95, 191, 31, 255, 37, 37, 15, 165, 56, 45, 195, + 12, 31, 132, 40, 11, 246, 19, 234, 192, 77, 16, 10, 32, 64, 10, 20, 95, 254, 16, 63, 87, 32, 10, 12, 222, 22, 44, 230, 39, 247, 255, 209, 12, 31, 240, 14, 31, 244, 169, 15, 31, 248, 31, 31, 252, 63, 94, 199, 50, 164, 254, 20, 43, 191, 34, 112, 45, 93, 80, 94, 79, 16, 11, 127, 0, 175, 251, 81, 24, 55, + 1, 84, 67, 6, 46, 106, 59, 127, 21, 18, 0, 85, 30, 122, 0, 47, 114, 249, 84, 75, 208, 135, 235, 7, 124, 23, 243, 175, 13, 255, 173, 255, 34, 123, 18, 127, 191, 252, 18, 131, 128, 13, 255, 228, 0, 62, 42, 31, 167, 53, 79, 252, 16, 239, 128, 78, 203, 16, 0, 222, 4, 255, 77, 223, 247, 10, 255, 223, 251, 239, + 207, 255, 223, 26, 23, 16, 3, 194, 223, 255, 230, 255, 0, 4, 223, 255, 254, 159, 255, 255, 153, 144, 35, 71, 44, 11, 253, 48, 64, 203, 111, 249, 80, 18, 15, 255, 14, 19, 227, 31, 222, 240, 21, 22, 96, 3, 241, 21, 34, 130, 253, 38, 122, 48, 3, 7, 247, 2, 26, 155, 122, 127, 207, 31, 23, 166, 223, 44, 132, 247, + 26, 148, 21, 69, 70, 114, 32, 31, 210, 128, 255, 48, 147, 255, 3, 203, 10, 38, 143, 159, 159, 246, 126, 20, 39, 24, 255, 0, 7, 239, 255, 17, 85, 127, 32, 227, 196, 255, 255, 213, 0, 0, 60, 245, 255, 255, 43, 255, 38, 231, 255, 16, 83, 145, 248, 0, 255, 161, 0, 0, 168, 148, 38, 130, 13, 217, 10, 245, 3, 83, + 50, 17, 8, 69, 171, 3, 35, 5, 139, 171, 32, 15, 61, 71, 79, 30, 64, 31, 29, 223, 10, 132, 35, 15, 160, 70, 35, 51, 77, 14, 191, 7, 19, 55, 19, 234, 0, 134, 45, 14, 93, 71, 36, 225, 207, 30, 192, 2, 67, 15, 255, 37, 4, 86, 15, 255, 10, 64, 15, 255, 13, 13, 19, 215, 13, 128, 5, 220, 5, 126, + 15, 178, 17, 223, 250, 16, 0, 222, 80, 195, 211, 124, 2, 95, 61, 249, 0, 2, 187, 178, 15, 255, 6, 39, 15, 17, 15, 248, 10, 23, 47, 1, 2, 14, 47, 45, 9, 90, 11, 8, 63, 0, 230, 74, 74, 175, 16, 11, 234, 208, 15, 255, 27, 7, 24, 136, 15, 223, 255, 235, 1, 119, 112, 28, 17, 241, 48, 3, 121, 255, + 201, 248, 119, 15, 255, 6, 88, 199, 0, 0, 30, 9, 15, 255, 4, 81, 106, 22, 236, 255, 194, 26, 14, 240, 26, 195, 160, 28, 87, 146, 48, 206, 21, 48, 127, 240, 176, 3, 15, 255, 1, 15, 220, 3, 40, 234, 47, 76, 91, 151, 25, 103, 160, 10, 79, 3, 74, 111, 2, 119, 5, 87, 105, 123, 159, 30, 121, 175, 14, 125, + 2, 123, 187, 187, 83, 16, 28, 255, 48, 3, 1, 29, 38, 223, 255, 187, 187, 175, 187, 38, 155, 176, 30, 155, 189, 17, 175, 248, 137, 29, 10, 151, 8, 9, 255, 4, 111, 255, 240, 92, 39, 207, 255, 8, 148, 98, 72, 95, 28, 187, 3, 30, 189, 12, 40, 25, 207, 255, 53, 42, 220, 72, 211, 7, 112, 27, 224, 245, 15, 193, + 59, 87, 165, 115, 24, 157, 247, 192, 3, 15, 255, 28, 55, 31, 255, 127, 117, 112, 3, 2, 119, 191, 175, 255, 116, 56, 219, 51, 206, 51, 249, 31, 217, 32, 3, 252, 118, 154, 255, 255, 245, 51, 51, 51, 49, 31, 247, 247, 32, 3, 249, 209, 153, 255, 0, 223, 2, 119, 77, 143, 112, 3, 235, 127, 112, 90, 31, 18, 241, 32, + 3, 248, 120, 1, 63, 0, 27, 17, 192, 130, 31, 31, 51, 64, 3, 63, 23, 209, 223, 139, 159, 95, 12, 253, 2, 62, 31, 108, 47, 116, 0, 7, 153, 153, 7, 235, 255, 254, 7, 119, 48, 119, 127, 255, 183, 47, 116, 245, 153, 159, 255, 201, 11, 255, 4, 119, 44, 239, 208, 248, 153, 155, 255, 208, 255, 3, 96, 13, 5, 179, + 18, 35, 227, 249, 15, 255, 185, 153, 15, 31, 184, 0, 3, 0, 81, 188, 17, 47, 255, 155, 255, 250, 153, 99, 247, 160, 7, 238, 21, 255, 243, 32, 31, 0, 153, 191, 90, 214, 73, 208, 3, 17, 65, 0, 42, 191, 30, 31, 255, 30, 77, 10, 90, 31, 83, 143, 90, 255, 31, 234, 30, 255, 55, 57, 89, 172, 246, 31, 238, 193, + 35, 21, 51, 51, 58, 199, 64, 3, 175, 8, 31, 230, 63, 173, 11, 62, 255, 249, 51, 243, 95, 255, 254, 0, 25, 158, 33, 163, 242, 251, 235, 255, 251, 252, 19, 97, 15, 96, 3, 51, 48, 84, 127, 251, 3, 179, 239, 249, 29, 83, 80, 131, 251, 18, 35, 145, 51, 173, 99, 29, 115, 121, 164, 27, 192, 31, 67, 235, 95, 5, + 157, 115, 33, 245, 36, 122, 68, 126, 59, 125, 248, 157, 149, 243, 127, 176, 19, 159, 247, 13, 119, 207, 247, 1, 63, 18, 146, 26, 209, 247, 9, 17, 175, 247, 6, 71, 16, 19, 2, 16, 19, 30, 187, 32, 3, 255, 255, 17, 253, 17, 21, 255, 157, 64, 4, 16, 213, 6, 127, 27, 138, 8, 255, 255, 224, 11, 255, 223, 255, 243, + 14, 255, 143, 249, 79, 253, 240, 85, 91, 199, 192, 31, 255, 160, 28, 67, 128, 31, 225, 64, 119, 31, 52, 16, 0, 2, 66, 123, 111, 255, 112, 189, 1, 31, 232, 12, 255, 227, 17, 174, 55, 33, 62, 122, 117, 33, 156, 29, 255, 18, 51, 89, 126, 86, 244, 221, 203, 169, 135, 174, 171, 226, 90, 199, 60, 67, 89, 27, 195, 223, + 31, 74, 63, 229, 30, 171, 92, 136, 23, 17, 30, 148, 33, 136, 33, 140, 43, 20, 192, 191, 245, 19, 239, 119, 209, 223, 251, 126, 179, 187, 16, 2, 45, 82, 18, 219, 96, 66, 30, 227, 192, 162, 179, 34, 183, 20, 255, 197, 117, 5, 31, 3, 115, 32, 3, 3, 153, 207, 179, 251, 52, 7, 38, 223, 204, 255, 253, 17, 58, 16, + 3, 253, 152, 40, 40, 40, 44, 246, 5, 255, 249, 74, 19, 57, 253, 9, 16, 23, 255, 12, 255, 240, 4, 255, 240, 240, 9, 255, 255, 160, 208, 14, 255, 131, 208, 95, 93, 17, 58, 175, 18, 24, 153, 153, 239, 45, 22, 252, 35, 29, 220, 99, 235, 49, 31, 234, 30, 74, 47, 224, 255, 242, 62, 81, 190, 17, 83, 255, 241, 1, + 255, 241, 160, 3, 218, 252, 188, 67, 251, 253, 221, 64, 23, 31, 93, 181, 153, 31, 22, 17, 131, 247, 85, 85, 109, 201, 96, 31, 143, 70, 159, 147, 111, 144, 23, 115, 227, 16, 174, 0, 7, 22, 27, 175, 55, 31, 193, 127, 31, 247, 37, 85, 85, 8, 31, 92, 199, 30, 26, 36, 115, 255, 187, 191, 255, 219, 127, 99, 255, 85, + 95, 255, 165, 221, 223, 255, 165, 237, 60, 227, 3, 129, 59, 25, 15, 115, 36, 223, 85, 228, 85, 85, 82, 45, 7, 9, 151, 10, 128, 3, 255, 23, 96, 3, 0, 68, 3, 7, 47, 3, 30, 55, 4, 3, 2, 45, 130, 96, 3, 116, 3, 221, 225, 60, 0, 3, 10, 31, 106, 223, 255, 176, 10, 30, 130, 17, 20, 251, 182, 255, + 250, 255, 207, 30, 160, 182, 255, 255, 175, 255, 176, 202, 63, 255, 176, 16, 255, 0, 246, 255, 244, 255, 179, 255, 240, 250, 207, 51, 255, 240, 79, 23, 251, 11, 192, 143, 145, 240, 63, 59, 31, 166, 0, 19, 20, 65, 224, 31, 0, 143, 101, 30, 6, 26, 176, 79, 72, 51, 251, 248, 87, 247, 246, 17, 144, 11, 80, 23, 83, 251, + 3, 228, 7, 112, 23, 24, 98, 223, 147, 240, 131, 239, 160, 7, 223, 67, 255, 163, 243, 241, 0, 142, 19, 18, 118, 18, 131, 49, 227, 79, 235, 133, 35, 227, 11, 19, 243, 31, 234, 31, 72, 16, 7, 223, 51, 243, 247, 0, 255, 254, 239, 247, 1, 32, 159, 247, 62, 244, 63, 254, 175, 247, 19, 39, 242, 35, 249, 20, 216, 255, + 64, 1, 239, 255, 48, 29, 255, 255, 186, 225, 31, 99, 253, 255, 248, 54, 65, 15, 0, 3, 2, 103, 31, 163, 15, 193, 69, 190, 133, 34, 49, 17, 17, 71, 20, 24, 0, 48, 3, 32, 11, 208, 0, 17, 17, 17, 160, 63, 31, 222, 31, 32, 3, 32, 11, 104, 96, 0, 3, 10, 209, 199, 143, 79, 41, 161, 53, 195, 31, 23, + 75, 255, 255, 248, 127, 21, 160, 245, 207, 250, 143, 254, 255, 242, 117, 23, 21, 160, 7, 255, 29, 75, 207, 19, 99, 46, 140, 112, 220, 183, 41, 106, 31, 165, 0, 255, 28, 72, 27, 241, 116, 26, 27, 211, 0, 79, 47, 80, 13, 31, 231, 55, 15, 251, 255, 223, 0, 2, 64, 211, 255, 53, 207, 255, 255, 247, 15, 255, 252, 16, + 63, 254, 255, 249, 0, 127, 246, 249, 0, 223, 241, 255, 249, 3, 255, 176, 249, 11, 255, 80, 255, 249, 79, 254, 0, 251, 239, 248, 58, 223, 255, 48, 37, 51, 11, 255, 207, 244, 47, 250, 254, 63, 254, 191, 248, 18, 73, 241, 22, 32, 194, 144, 26, 70, 85, 21, 47, 66, 26, 0, 230, 2, 161, 3, 255, 1, 86, 87, 251, 243, + 31, 239, 248, 25, 60, 13, 63, 19, 235, 111, 16, 167, 255, 111, 27, 11, 143, 252, 119, 119, 175, 207, 37, 233, 246, 84, 68, 224, 0, 52, 111, 83, 150, 23, 143, 148, 15, 47, 90, 31, 20, 165, 255, 2, 121, 24, 148, 0, 9, 153, 153, 39, 108, 23, 112, 151, 84, 23, 116, 237, 80, 11, 81, 102, 143, 153, 16, 0, 106, 119, + 149, 221, 84, 23, 17, 175, 17, 144, 31, 144, 27, 142, 240, 255, 119, 121, 255, 240, 221, 222, 255, 240, 35, 32, 11, 22, 54, 240, 137, 207, 15, 254, 70, 87, 247, 221, 209, 36, 12, 74, 39, 84, 3, 5, 15, 127, 6, 47, 131, 187, 4, 172, 5, 107, 239, 228, 2, 187, 176, 15, 255, 35, 118, 243, 211, 11, 103, 15, 15, 34, + 3, 110, 103, 231, 221, 208, 15, 255, 37, 159, 247, 143, 40, 3, 61, 24, 7, 0, 95, 4, 160, 8, 255, 251, 28, 74, 128, 82, 1, 31, 5, 225, 28, 207, 64, 12, 203, 5, 188, 207, 16, 12, 71, 15, 134, 31, 14, 255, 3, 11, 8, 6, 95, 255, 18, 247, 80, 10, 29, 147, 223, 0, 181, 15, 222, 37, 239, 255, 225, 0, + 27, 250, 255, 96, 0, 0, 90, 15, 226, 5, 239, 93, 77, 223, 63, 218, 15, 255, 2, 248, 239, 231, 255, 243, 254, 111, 80, 239, 64, 8, 0, 126, 15, 191, 3, 191, 251, 26, 17, 96, 4, 255, 129, 0, 0, 166, 61, 15, 255, 2, 250, 31, 226, 17, 67, 119, 80, 15, 223, 5, 175, 241, 68, 171, 3, 13, 135, 7, 160, 0, + 239, 239, 242, 64, 0, 143, 43, 19, 210, 14, 15, 3, 253, 73, 253, 206, 252, 128, 11, 96, 8, 51, 247, 11, 187, 32, 13, 231, 34, 10, 35, 243, 35, 247, 3, 0, 39, 13, 224, 42, 55, 223, 3, 2, 31, 128, 152, 5, 31, 252, 80, 3, 119, 122, 42, 247, 15, 226, 8, 15, 67, 1, 113, 25, 134, 2, 239, 0, 30, 152, + 41, 16, 26, 94, 78, 53, 252, 179, 25, 214, 252, 41, 31, 165, 252, 31, 169, 160, 202, 17, 17, 15, 191, 7, 70, 207, 95, 255, 223, 247, 144, 3, 95, 211, 19, 2, 26, 207, 13, 229, 1, 255, 191, 223, 255, 146, 24, 96, 253, 255, 6, 255, 249, 138, 255, 0, 95, 10, 32, 232, 15, 255, 0, 253, 112, 3, 192, 15, 254, 0, + 251, 38, 0, 0, 1, 223, 18, 138, 255, 0, 187, 42, 31, 255, 13, 255, 239, 208, 252, 0, 251, 123, 159, 219, 250, 143, 251, 122, 3, 211, 11, 138, 255, 180, 183, 15, 255, 1, 191, 80, 64, 3, 139, 31, 199, 1, 31, 2, 15, 57, 147, 43, 166, 23, 239, 180, 21, 2, 80, 0, 3, 255, 159, 243, 0, 11, 175, 253, 0, 31, + 254, 13, 255, 144, 143, 4, 250, 18, 191, 63, 170, 80, 108, 3, 112, 76, 15, 242, 15, 255, 1, 8, 30, 255, 54, 41, 132, 41, 136, 1, 17, 241, 159, 23, 177, 30, 9, 188, 243, 87, 64, 17, 221, 221, 239, 15, 120, 3, 95, 159, 244, 255, 221, 221, 214, 223, 255, 6, 72, 99, 33, 67, 253, 11, 255, 0, 1, 207, 253, 255, + 184, 128, 127, 29, 74, 243, 1, 255, 159, 254, 49, 255, 148, 8, 31, 230, 5, 239, 6, 253, 27, 90, 240, 15, 223, 1, 233, 202, 63, 6, 47, 0, 109, 151, 247, 4, 241, 143, 249, 207, 107, 207, 187, 85, 48, 25, 219, 244, 26, 173, 255, 223, 210, 255, 125, 24, 253, 2, 177, 223, 161, 71, 250, 42, 123, 167, 232, 5, 148, 1, + 159, 46, 19, 31, 255, 53, 85, 85, 159, 4, 3, 31, 0, 126, 163, 85, 111, 255, 101, 119, 226, 143, 255, 135, 6, 207, 1, 61, 71, 27, 255, 64, 30, 183, 168, 118, 7, 250, 47, 127, 90, 171, 91, 221, 215, 91, 187, 125, 215, 43, 26, 144, 30, 74, 255, 29, 174, 255, 25, 178, 255, 175, 248, 250, 255, 251, 255, 197, 57, 39, + 77, 247, 30, 23, 141, 80, 70, 175, 66, 227, 28, 124, 239, 245, 62, 95, 1, 255, 48, 0, 4, 112, 32, 0, 13, 254, 85, 79, 73, 43, 45, 147, 77, 111, 159, 190, 36, 86, 0, 237, 39, 119, 96, 31, 97, 252, 32, 29, 192, 96, 254, 95, 251, 251, 0, 95, 247, 146, 16, 3, 190, 0, 48, 3, 0, 63, 119, 119, 48, 30, + 126, 169, 112, 48, 3, 122, 16, 7, 5, 144, 3, 218, 191, 9, 63, 61, 114, 170, 191, 45, 177, 255, 53, 1, 17, 235, 255, 223, 160, 46, 71, 33, 31, 255, 193, 255, 255, 45, 255, 49, 255, 0, 184, 1, 255, 121, 56, 221, 137, 157, 255, 241, 27, 108, 64, 3, 240, 251, 0, 241, 223, 247, 119, 32, 15, 240, 223, 238, 251, 187, + 240, 27, 248, 217, 153, 148, 114, 19, 109, 32, 146, 119, 175, 79, 183, 187, 223, 80, 158, 2, 206, 214, 95, 58, 191, 42, 195, 5, 119, 175, 31, 174, 15, 20, 147, 16, 7, 31, 241, 32, 3, 245, 31, 247, 5, 8, 163, 239, 32, 15, 35, 247, 127, 171, 21, 77, 251, 99, 239, 48, 15, 147, 138, 78, 3, 75, 158, 9, 30, 171, + 32, 3, 5, 153, 106, 93, 235, 191, 32, 68, 3, 87, 22, 211, 121, 31, 243, 146, 245, 32, 3, 26, 63, 149, 79, 77, 49, 162, 5, 31, 178, 154, 5, 26, 83, 112, 123, 255, 237, 30, 107, 112, 91, 127, 101, 43, 131, 183, 119, 79, 179, 85, 47, 239, 28, 162, 127, 74, 144, 3, 191, 85, 71, 18, 174, 255, 32, 3, 141, 30, + 171, 6, 42, 199, 99, 251, 42, 211, 36, 11, 27, 202, 63, 249, 18, 211, 190, 216, 18, 215, 48, 71, 119, 119, 245, 31, 236, 175, 249, 31, 236, 56, 31, 240, 185, 255, 147, 51, 73, 83, 239, 176, 32, 3, 30, 187, 80, 110, 191, 46, 195, 51, 175, 51, 16, 101, 13, 31, 142, 10, 255, 199, 0, 253, 6, 254, 255, 0, 2, 73, + 31, 175, 2, 167, 62, 31, 255, 13, 32, 201, 48, 3, 207, 249, 255, 217, 119, 159, 27, 142, 249, 129, 30, 245, 19, 251, 49, 110, 81, 88, 255, 177, 48, 3, 243, 51, 51, 126, 162, 144, 247, 29, 234, 47, 215, 247, 80, 218, 47, 91, 13, 186, 5, 141, 206, 119, 18, 211, 240, 239, 206, 27, 240, 102, 249, 247, 127, 29, 60, 251, + 252, 0, 0, 249, 255, 16, 255, 223, 242, 255, 128, 223, 240, 207, 224, 169, 223, 28, 64, 46, 27, 246, 121, 33, 7, 31, 182, 255, 246, 1, 28, 255, 97, 111, 19, 249, 157, 16, 226, 62, 31, 51, 40, 3, 214, 230, 0, 0, 208, 78, 114, 15, 118, 131, 33, 67, 43, 255, 64, 3, 86, 119, 9, 255, 167, 93, 16, 11, 80, 17, + 201, 22, 31, 0, 6, 119, 63, 46, 35, 111, 95, 119, 47, 255, 39, 255, 63, 215, 255, 63, 28, 64, 16, 32, 7, 119, 25, 153, 157, 23, 100, 202, 36, 206, 119, 119, 47, 16, 7, 63, 89, 24, 109, 31, 16, 15, 41, 152, 39, 153, 31, 186, 112, 57, 11, 250, 49, 93, 211, 79, 255, 0, 30, 132, 30, 187, 253, 127, 19, 244, + 103, 0, 191, 246, 3, 0, 29, 254, 64, 0, 255, 53, 255, 241, 250, 23, 243, 176, 224, 23, 247, 219, 189, 55, 149, 64, 175, 39, 251, 24, 11, 165, 111, 31, 120, 11, 30, 254, 30, 183, 64, 20, 35, 246, 223, 255, 248, 45, 65, 111, 255, 119, 112, 6, 74, 46, 187, 91, 168, 61, 31, 255, 10, 30, 7, 79, 31, 44, 245, 223, + 128, 0, 8, 48, 115, 59, 19, 235, 175, 250, 211, 95, 251, 255, 245, 19, 251, 224, 19, 255, 247, 112, 95, 251, 254, 19, 255, 247, 0, 57, 192, 148, 224, 50, 208, 67, 243, 99, 255, 36, 11, 36, 19, 62, 139, 231, 89, 154, 239, 14, 191, 10, 25, 154, 5, 0, 115, 255, 3, 255, 0, 239, 133, 255, 3, 255, 190, 230, 17, 135, + 168, 255, 14, 255, 90, 29, 203, 255, 14, 255, 223, 250, 47, 255, 255, 244, 187, 127, 19, 231, 249, 153, 240, 31, 108, 208, 189, 247, 221, 255, 192, 32, 27, 142, 205, 96, 255, 255, 130, 255, 224, 255, 89, 255, 144, 255, 253, 95, 255, 103, 255, 153, 191, 79, 175, 253, 111, 22, 170, 240, 1, 26, 47, 159, 80, 0, 248, 247, 255, 208, + 0, 240, 20, 220, 240, 143, 252, 87, 84, 194, 10, 18, 187, 207, 47, 243, 235, 0, 63, 103, 30, 29, 11, 206, 22, 187, 47, 39, 57, 255, 163, 123, 31, 192, 252, 187, 183, 137, 18, 192, 223, 187, 255, 255, 248, 223, 4, 255, 241, 13, 110, 255, 255, 128, 13, 255, 251, 41, 158, 255, 191, 176, 20, 190, 7, 255, 112, 153, 156, 255, + 130, 201, 127, 199, 16, 15, 48, 3, 80, 19, 83, 239, 173, 21, 71, 208, 17, 48, 159, 170, 144, 92, 154, 35, 239, 30, 47, 55, 138, 95, 31, 239, 80, 32, 3, 231, 123, 255, 80, 208, 254, 7, 255, 80, 233, 156, 255, 140, 47, 255, 239, 57, 255, 153, 23, 43, 103, 255, 10, 255, 254, 87, 255, 12, 255, 55, 255, 31, 16, 100, + 218, 191, 252, 21, 218, 245, 7, 52, 214, 147, 25, 149, 50, 36, 91, 36, 95, 117, 145, 16, 3, 18, 163, 118, 27, 178, 180, 154, 49, 219, 255, 255, 39, 243, 3, 30, 195, 30, 190, 191, 255, 48, 3, 254, 119, 175, 15, 253, 0, 223, 95, 15, 22, 21, 249, 255, 133, 85, 185, 127, 20, 33, 50, 17, 47, 255, 245, 0, 47, 255, + 253, 245, 0, 95, 251, 245, 0, 175, 255, 248, 245, 5, 255, 244, 246, 143, 255, 254, 208, 21, 84, 159, 247, 95, 253, 32, 3, 238, 1, 16, 95, 27, 43, 95, 253, 9, 16, 7, 191, 15, 16, 19, 15, 251, 95, 254, 111, 249, 255, 0, 4, 187, 191, 0, 0, 54, 29, 63, 21, 47, 22, 19, 239, 109, 0, 0, 207, 141, 127, 29, + 52, 173, 0, 0, 69, 29, 0, 5, 246, 137, 191, 255, 187, 19, 247, 9, 65, 16, 120, 103, 31, 154, 63, 193, 19, 132, 20, 7, 57, 66, 255, 223, 255, 123, 63, 162, 255, 245, 239, 245, 94, 250, 240, 191, 243, 175, 240, 22, 58, 240, 31, 95, 255, 240, 9, 255, 245, 240, 2, 255, 244, 254, 240, 21, 223, 254, 254, 255, 126, 44, + 120, 11, 62, 98, 22, 138, 48, 11, 111, 255, 48, 95, 198, 240, 143, 255, 243, 223, 240, 95, 246, 223, 243, 191, 254, 247, 223, 253, 255, 246, 223, 247, 22, 17, 230, 243, 251, 48, 40, 39, 24, 43, 37, 141, 16, 79, 189, 80, 32, 3, 253, 222, 255, 237, 47, 171, 153, 255, 191, 255, 217, 0, 207, 255, 245, 61, 122, 24, 1, 255, + 254, 22, 255, 102, 165, 239, 90, 119, 30, 22, 46, 63, 141, 17, 70, 0, 255, 166, 16, 87, 95, 108, 37, 92, 253, 187, 71, 107, 248, 17, 119, 115, 21, 112, 127, 62, 123, 31, 253, 0, 187, 207, 255, 187, 112, 63, 243, 63, 253, 17, 126, 147, 16, 23, 51, 227, 18, 35, 221, 187, 189, 54, 39, 112, 17, 24, 54, 47, 128, 17, + 36, 126, 51, 179, 15, 251, 9, 32, 12, 48, 50, 155, 239, 26, 110, 16, 36, 8, 96, 34, 31, 197, 218, 85, 26, 255, 255, 64, 15, 213, 14, 23, 249, 51, 28, 46, 23, 91, 186, 150, 15, 255, 2, 22, 127, 10, 226, 63, 0, 92, 6, 47, 255, 208, 111, 253, 143, 80, 6, 175, 249, 31, 220, 130, 15, 255, 2, 62, 251, 191, + 255, 237, 2, 211, 111, 31, 255, 15, 234, 15, 255, 2, 224, 253, 31, 249, 0, 176, 8, 64, 0, 95, 7, 0, 174, 110, 31, 91, 30, 31, 194, 6, 233, 48, 14, 191, 3, 73, 20, 16, 48, 15, 58, 9, 63, 155, 7, 65, 227, 11, 206, 1, 0, 21, 90, 195, 15, 162, 7, 95, 255, 143, 30, 199, 8, 15, 255, 3, 176, 250, + 7, 255, 252, 16, 6, 41, 142, 71, 14, 127, 4, 179, 32, 62, 195, 119, 97, 14, 190, 7, 19, 243, 221, 221, 207, 13, 221, 1, 250, 4, 23, 235, 48, 212, 191, 228, 24, 20, 234, 2, 26, 4, 25, 209, 248, 79, 21, 105, 24, 144, 1, 6, 4, 187, 8, 87, 231, 1, 134, 65, 15, 31, 6, 235, 115, 183, 31, 31, 31, 10, + 134, 15, 63, 4, 84, 255, 254, 232, 183, 16, 111, 31, 92, 5, 15, 255, 2, 46, 14, 29, 167, 58, 16, 229, 1, 63, 4, 240, 0, 111, 31, 92, 14, 31, 96, 221, 6, 182, 15, 255, 3, 210, 0, 111, 31, 222, 3, 45, 2, 95, 7, 17, 63, 223, 29, 212, 5, 180, 15, 67, 6, 115, 115, 15, 182, 12, 31, 255, 221, 30, + 39, 31, 255, 103, 119, 45, 15, 255, 2, 28, 198, 254, 72, 218, 119, 64, 15, 255, 90, 7, 3, 34, 210, 18, 214, 0, 0, 255, 1, 17, 255, 2, 34, 255, 3, 51, 155, 5, 255, 170, 250, 30, 52, 249, 48, 3, 3, 48, 3, 247, 48, 3, 160, 2, 30, 243, 1, 41, 33, 4, 1, 255, 5, 18, 255, 6, 35, 255, 7, 52, + 154, 157, 1, 29, 181, 32, 3, 0, 221, 212, 79, 170, 124, 144, 177, 55, 251, 40, 146, 10, 42, 24, 8, 1, 255, 9, 18, 255, 10, 35, 255, 97, 11, 52, 155, 158, 228, 11, 227, 255, 12, 244, 255, 14, 5, 255, 15, 22, 184, 67, 234, 87, 68, 72, 24, 5, 252, 31, 255, 162, 47, 255, 255, 9, 0, 9, 1, 14, 16, 1, + 15, 191, 16, 64, 5, 0, 20, 20, 0, 18, 18, 124, 32, 2, 19, 19, 0, 15, 15, 32, 2, 16, 14, 255, 6, 6, 0, 17, 17, 0, 14, 14, 224, 0, 23, 23, 80, 26, 16, 35, 16, 41, 160, 35, 16, 53, 207, 24, 24, 32, 38, 16, 56, 13, 13, 0, 9, 88, 16, 88, 11, 32, 47, 22, 22, 32, 83, 16, 56, 16, + 59, 25, 16, 32, 16, 35, 16, 17, 25, 24, 32, 95, 16, 107, 22, 254, 23, 0, 26, 26, 0, 21, 21, 32, 38, 124, 16, 41, 23, 23, 1, 18, 20, 16, 2, 48, 44, 240, 23, 0, 25, 25, 32, 29, 64, 11, 48, 29, 80, 5, 111, 16, 140, 21, 22, 80, 83, 23, 24, 0, 18, 189, 19, 32, 173, 24, 24, 2, 20, 48, + 95, 25, 245, 25, 1, 23, 25, 48, 101, 26, 96, 68, 27, 0, 32, 74, 208, 2, 64, 134, 16, 137, 64, 158, 16, 188, 64, 164, 16, 248, 30, 112, 5, 17, 10, 16, 155, 19, 20, 1, 19, 16, 236, 162, 20, 32, 224, 20, 48, 5, 64, 203, 16, 218, 16, 49, 49, 0, 16, 191, 64, 5, 64, 200, 16, 44, 64, 206, 16, 215, + 64, 248, 64, 110, 64, 65, 4, 22, 49, 67, 64, 20, 16, 62, 16, 65, 17, 34, 65, 22, 192, 23, 22, 80, 134, 17, 52, 64, 122, 16, 95, 17, 85, 65, 109, 240, 20, 21, 2, 19, 48, 83, 17, 103, 64, 5, 65, 79, 6, 65, 100, 48, 248, 128, 197, 112, 26, 65, 118, 5, 5, 33, 251, 239, 77, 65, 80, 26, 1, 140, + 48, 66, 48, 239, 252, 0, 1, 42, 12, 51, 240, 0, 31, 85, 25, 248, 32, 25, 252, 33, 26, 0, 34, 26, 4, 35, 255, 0, 36, 0, 37, 0, 38, 0, 39, 255, 0, 40, 0, 41, 0, 42, 0, 43, 255, 0, 44, 0, 45, 0, 46, 0, 47, 255, 0, 48, 0, 49, 0, 50, 0, 51, 255, 0, 52, 0, 53, 0, 54, 0, + 55, 255, 0, 56, 0, 57, 0, 58, 0, 59, 255, 0, 60, 0, 61, 0, 62, 0, 63, 255, 0, 64, 0, 65, 0, 66, 0, 67, 255, 0, 68, 0, 69, 0, 70, 0, 71, 255, 0, 72, 0, 73, 0, 74, 0, 75, 223, 0, 76, 26, 90, 77, 0, 78, 0, 79, 255, 0, 80, 0, 81, 0, 82, 0, 83, 255, 0, 84, 0, 85, + 0, 86, 0, 87, 255, 0, 88, 0, 89, 0, 90, 0, 91, 255, 0, 92, 0, 93, 0, 94, 0, 95, 255, 0, 96, 0, 97, 0, 98, 0, 99, 246, 0, 100, 0, 101, 26, 142, 102, 255, 16, 0, 251, 0, 103, 0, 104, 255, 0, 0, 9, 0, 105, 247, 0, 106, 0, 107, 144, 15, 108, 0, 109, 125, 26, 202, 110, 0, 111, 0, + 112, 80, 33, 113, 247, 0, 114, 0, 115, 26, 222, 116, 0, 117, 255, 0, 118, 0, 119, 0, 120, 0, 121, 85, 48, 89, 122, 26, 242, 123, 26, 246, 124, 48, 103, 125, 255, 0, 126, 0, 127, 0, 128, 0, 129, 95, 176, 93, 130, 112, 103, 131, 0, 132, 0, 133, 85, 80, 115, 134, 27, 44, 135, 112, 129, 136, 144, 141, 137, 255, + 0, 138, 0, 139, 0, 140, 0, 141, 87, 144, 161, 142, 240, 179, 143, 97, 139, 0, 224, 0, 174, 0, 27, 120, 2, 95, 255, 50, 0, 32, 48, 5, 170, 1, 17, 101, 2, 17, 101, 3, 17, 103, 4, 17, 85, 170, 5, 17, 87, 6, 17, 89, 7, 17, 91, 8, 17, 93, 170, 9, 17, 95, 10, 17, 95, 11, 17, 97, 12, 17, + 97, 250, 13, 0, 76, 0, 14, 17, 99, 15, 17, 101, 170, 16, 17, 103, 17, 17, 105, 18, 17, 107, 19, 17, 109, 170, 20, 17, 111, 21, 17, 113, 22, 17, 115, 23, 17, 117, 170, 24, 17, 119, 25, 17, 121, 26, 17, 123, 27, 17, 115, 255, 28, 48, 1, 0, 29, 48, 2, 0, 255, 30, 78, 45, 0, 144, 79, 83, 0, 255, + 145, 81, 146, 0, 146, 83, 214, 0, 255, 147, 83, 240, 0, 148, 89, 39, 0, 255, 149, 98, 113, 0, 150, 102, 14, 0, 255, 151, 102, 248, 0, 152, 103, 44, 0, 255, 153, 108, 179, 0, 154, 110, 144, 0, 255, 155, 130, 30, 0, 156, 138, 172, 0, 255, 157, 138, 173, 0, 158, 146, 128, 0, 255, 159, 150, 122, 0, 160, 150, 251, + 0, 224, 161, 255, 1, 68, 89, 15, 255, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 4, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 4, 224, 254, 0, 0, 0, 32, 0, 0, 1, 16, + 6, 203, 3, 192, 64, 3, 112, 1, 1, 64, 27, 0, 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, 79, 79, 84, 32, 27, 70, 122, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 15, 109, 64, 79, 2, 128, 64, 81, 226, 226, 16, 19, 27, 90, 80, 15, 160, 64, 26, 207, 45, 16, 39, 41, + 16, 127, 190, 32, 96, 19, 255, 255, 0, 46, 2, 128, 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, 3, 10, 46, 0, 46, 46, 0, 117, 115, 255, 101, 110, 103, 108, 105, 115, 104, 0, 255, 109, 101, 115, 115, 97, 103, 101, 46, 239, 98, 109, 103, 96, 11, 105, 100, 46, 116, 255, 98, 108, 0, 115, + 116, 114, 117, 99, 158, 116, 48, 10, 160, 199, 77, 69, 83, 71, 16, 44, 183, 49, 80, 187, 2, 2, 208, 228, 73, 78, 70, 126, 16, 27, 0, 96, 0, 6, 0, 12, 49, 62, 42, 113, 56, 48, 159, 2, 144, 11, 104, 144, 23, 206, 128, 35, 211, 1, 142, 144, 11, 180, 144, 59, 49, 130, 68, 65, 223, 84, 49, 80, 70, 26, + 6, 1, 0, 3, 255, 0, 80, 0, 108, 0, 101, 0, 97, 223, 0, 115, 16, 5, 32, 0, 105, 0, 110, 116, 48, 9, 114, 0, 116, 17, 191, 116, 16, 99, 32, 21, 238, 83, 0, 85, 16, 39, 69, 0, 82, 17, 211, 239, 77, 0, 65, 16, 7, 73, 0, 79, 0, 235, 10, 0, 71, 16, 11, 76, 16, 15, 88, 0, 170, 89, + 17, 237, 71, 16, 69, 109, 48, 69, 68, 16, 71, 228, 115, 0, 99, 17, 44, 0, 101, 92, 84, 80, 175, 0, 137, 0, 186, 32, 16, 141, 111, 0, 117, 16, 235, 100, 18, 151, 149, 110, 16, 11, 32, 223, 98, 48, 243, 114, 48, 255, 100, 69, 17, 218, 10, 209, 13, 96, 25, 129, 9, 87, 17, 33, 105, 117, 18, 217, 79, 0, + 112, 49, 37, 97, 17, 39, 105, 42, 16, 89, 33, 53, 10, 17, 27, 97, 17, 63, 117, 17, 77, 170, 108, 18, 253, 102, 16, 113, 114, 19, 5, 109, 48, 7, 34, 97, 93, 64, 21, 109, 144, 57, 33, 37, 1, 97, 4, 32, 177, 97, 170, 0, 17, 107, 97, 16, 195, 110, 17, 89, 104, 81, 171, 165, 116, 16, 213, 32, 17, 189, + 64, 223, 115, 17, 127, 105, 37, 48, 237, 32, 207, 118, 17, 215, 32, 33, 117, 48, 225, 33, 87, 115, 129, 6, 82, 71, 40, 19, 163, 8, 33, 157, 223, 67, 98, 50, 251, 4, 0, 6, 4, 56, 212, 56, 178, 83, 7, 0, 211, 175, 8, 82, 123, 35, 51, 171, 3, 19, 219, 24, 19, 223, 4, 147, 199, 43, 67, 255, 79, 77, + 77, 69, 78, 84, 0, 68, 253, 73, 83, 67, 95, 48, 49, 80, 7, 50, 127, 80, 15, 51, 0, 84, 73, 84, 76, 69, 251, 95, 77, 65, 73, 78, 80, 10, 83, 85, 229, 66, 0, 64, 0, 0, 0, 144, 111, 112, 36, 67, 174, 239, 55, 113, 97, 96, 147, 28, 19, 62, 141, 124, 80, 171, 0, 190, 198, 20, 162, 51, 179, 16, + 153, 247, 100, 67, 164, 76, 51, 191, 12, 0, 0, 243, 19, 54, 175, 66, 51, 203, 19, 221, 137, 230, 191, 39, 67, 215, 20, 0, 0, 251, 104, 17, 158, 53, 51, 227, 16, 185, 23, 177, 123, 254, 51, 239, 170, 28, 116, 149, 4, 81, 23, 7, 80, 235, 9, 20, 191, 160, 10, 20, 195, 11, 224, 162, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 82, 192, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 82, 192, 243, 0, 0, 0, 32, 16, 3, 16, 7, 81, 224, 42, 64, 3, 112, 1, 1, 80, 27, 3, 16, 35, 64, 80, 3, 231, 128, 0, 3, 32, 22, 16, 57, 79, 79, 84, 115, + 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, 67, 212, 243, 17, 0, 0, 18, 64, 79, 64, 87, 255, 255, 234, 0, 46, 2, 128, 96, 16, 80, 19, 184, 16, 19, 199, 2, 255, 16, 0, 96, 19, 32, 131, 46, 0, 46, 255, 46, 0, 101, 109, 98, 101, 100, 100, 255, 101, 100, 102, 111, 110, 116, 0, 109, 253, 101, 115, 115, 97, + 103, 101, 32, 11, 50, 249, 54, 46, 98, 114, 102, 16, 19, 0, 0, 8, 82, 254, 70, 78, 84, 254, 255, 1, 4, 48, 215, 254, 16, 0, 5, 70, 73, 78, 70, 32, 235, 219, 1, 33, 16, 241, 27, 27, 32, 219, 56, 0, 239, 0, 80, 104, 16, 247, 8, 33, 27, 26, 251, 0, 84, 71, 76, 80, 16, 15, 48, 24, 255, 25, + 19, 24, 0, 0, 8, 0, 0, 150, 10, 32, 221, 17, 3, 128, 49, 31, 96, 0, 0, 0, 102, 251, 127, 255, 176, 0, 111, 16, 3, 95, 255, 169, 160, 16, 3, 144, 48, 3, 63, 16, 7, 0, 0, 179, 2, 254, 118, 0, 0, 159, 255, 0, 11, 18, 25, 255, 143, 255, 255, 4, 255, 255, 223, 13, 254, 255, 252, 11, 127, 255, + 243, 4, 98, 32, 150, 228, 34, 55, 18, 161, 255, 18, 169, 255, 244, 18, 67, 175, 251, 34, 71, 16, 146, 166, 4, 190, 0, 0, 164, 6, 18, 59, 2, 34, 63, 34, 67, 35, 32, 88, 34, 199, 251, 19, 86, 119, 117, 255, 144, 0, 202, 118, 218, 84, 69, 48, 63, 251, 0, 48, 95, 65, 34, 147, 174, 232, 34, 151, 209, 18, + 155, 250, 0, 141, 18, 160, 249, 9, 255, 253, 0, 207, 32, 104, 1, 96, 110, 63, 215, 255, 112, 48, 3, 47, 16, 7, 31, 255, 96, 93, 16, 3, 80, 48, 3, 13, 221, 64, 2, 139, 80, 4, 141, 32, 2, 239, 49, 36, 63, 19, 72, 0, 14, 20, 99, 111, 85, 20, 103, 207, 65, 163, 7, 19, 231, 12, 19, 238, 144, 106, + 49, 199, 255, 248, 20, 23, 241, 20, 27, 160, 20, 31, 234, 150, 121, 189, 36, 7, 250, 20, 12, 239, 16, 254, 187, 175, 17, 244, 95, 255, 240, 17, 2, 244, 0, 255, 14, 255, 251, 128, 239, 255, 255, 224, 81, 20, 39, 240, 20, 43, 241, 84, 159, 96, 3, 244, 130, 255, 255, 253, 22, 223, 255, 253, 175, 255, 255, 191, 253, 18, + 88, 253, 111, 255, 255, 254, 41, 55, 16, 91, 52, 131, 0, 239, 32, 7, 254, 80, 0, 253, 254, 129, 0, 0, 234, 97, 36, 151, 128, 123, 20, 155, 249, 0, 24, 255, 18, 105, 223, 255, 251, 80, 42, 255, 255, 48, 3, 95, 111, 7, 203, 175, 16, 51, 251, 223, 17, 0, 175, 255, 208, 0, 223, 9, 238, 1, 247, 60, 3, 239, + 243, 0, 13, 86, 19, 77, 14, 18, 240, 6, 33, 133, 39, 80, 4, 227, 60, 182, 31, 21, 207, 95, 255, 51, 223, 0, 158, 37, 219, 175, 37, 166, 39, 244, 33, 200, 119, 83, 16, 176, 31, 54, 84, 70, 132, 166, 71, 220, 255, 255, 80, 1, 30, 33, 135, 16, 7, 17, 147, 112, 0, 50, 17, 5, 130, 27, 249, 223, 255, 54, + 140, 223, 22, 84, 32, 3, 207, 113, 22, 92, 121, 135, 100, 178, 211, 18, 24, 22, 143, 226, 254, 0, 255, 250, 16, 0, 183, 32, 5, 77, 180, 55, 0, 197, 255, 7, 180, 84, 59, 0, 22, 53, 0, 0, 191, 234, 255, 0, 10, 24, 225, 95, 22, 64, 223, 22, 80, 118, 25, 88, 20, 119, 100, 24, 243, 255, 251, 102, 131, 233, + 251, 134, 140, 36, 88, 60, 169, 47, 36, 104, 250, 39, 41, 27, 25, 13, 246, 73, 136, 147, 11, 1, 53, 0, 171, 74, 20, 173, 127, 25, 57, 63, 25, 61, 15, 235, 243, 152, 0, 2, 63, 25, 39, 32, 3, 0, 0, 235, 119, 117, 64, 32, 95, 198, 102, 227, 99, 53, 185, 141, 21, 45, 0, 94, 241, 73, 179, 121, 202, 230, + 11, 41, 123, 24, 49, 53, 107, 23, 76, 255, 104, 62, 1, 51, 167, 85, 22, 240, 255, 21, 146, 64, 3, 5, 207, 234, 159, 0, 22, 112, 67, 179, 0, 0, 103, 121, 155, 190, 188, 167, 63, 151, 118, 85, 51, 210, 26, 48, 170, 208, 90, 36, 96, 83, 187, 144, 80, 3, 16, 250, 8, 227, 35, 69, 0, 21, 197, 68, 3, 36, + 7, 105, 152, 87, 26, 111, 221, 26, 115, 239, 42, 103, 86, 119, 137, 189, 154, 167, 159, 119, 101, 84, 51, 38, 221, 255, 66, 84, 137, 187, 25, 145, 23, 5, 64, 187, 24, 241, 33, 9, 132, 16, 151, 11, 41, 49, 26, 186, 255, 88, 27, 103, 0, 58, 231, 255, 255, 9, 84, 3, 23, 227, 101, 255, 252, 87, 22, 115, 176, 74, + 229, 117, 21, 229, 255, 254, 112, 94, 26, 151, 208, 26, 155, 64, 0, 106, 235, 88, 57, 210, 1, 18, 5, 255, 15, 3, 16, 48, 40, 43, 12, 22, 192, 250, 14, 255, 245, 0, 15, 48, 3, 247, 22, 217, 253, 253, 0, 8, 255, 255, 177, 10, 47, 13, 22, 74, 10, 79, 10, 197, 117, 63, 96, 3, 15, 144, 3, 14, 27, 39, + 147, 13, 55, 0, 39, 4, 243, 144, 3, 25, 30, 6, 245, 122, 23, 107, 245, 0, 43, 255, 38, 50, 111, 23, 59, 82, 39, 63, 143, 22, 62, 223, 55, 111, 18, 47, 253, 73, 71, 21, 55, 5, 27, 117, 25, 58, 254, 24, 244, 250, 23, 146, 247, 47, 22, 15, 32, 200, 243, 32, 3, 181, 87, 120, 152, 133, 255, 85, 63, 37, + 71, 17, 154, 165, 128, 4, 11, 15, 10, 133, 26, 85, 130, 80, 3, 23, 247, 0, 191, 144, 3, 159, 32, 3, 121, 33, 227, 255, 237, 221, 221, 121, 159, 32, 11, 144, 41, 129, 235, 44, 135, 211, 144, 223, 211, 7, 32, 0, 28, 47, 11, 51, 81, 15, 97, 31, 13, 255, 67, 139, 26, 73, 16, 91, 215, 205, 249, 27, 60, 244, + 27, 60, 243, 0, 93, 164, 203, 41, 209, 247, 28, 236, 16, 254, 0, 33, 157, 24, 75, 175, 242, 28, 115, 243, 28, 119, 245, 169, 207, 255, 159, 145, 24, 108, 38, 103, 80, 5, 255, 255, 112, 133, 78, 16, 3, 8, 220, 15, 44, 175, 35, 151, 6, 44, 183, 41, 157, 239, 106, 115, 109, 63, 184, 120, 173, 170, 122, 254, 229, 87, + 119, 100, 179, 30, 48, 135, 64, 66, 223, 146, 86, 13, 64, 3, 13, 80, 207, 11, 80, 231, 5, 119, 173, 103, 206, 251, 157, 122, 217, 20, 95, 216, 32, 101, 216, 177, 28, 24, 210, 48, 239, 8, 200, 7, 14, 255, 252, 52, 175, 18, 200, 235, 0, 0, 77, 45, 123, 54, 173, 199, 85, 87, 189, 172, 171, 58, 252, 119, 117, 66, + 189, 230, 249, 82, 30, 56, 252, 91, 112, 132, 14, 0, 4, 33, 231, 143, 67, 143, 22, 48, 3, 201, 159, 41, 239, 176, 64, 3, 254, 160, 13, 93, 35, 73, 34, 87, 46, 225, 119, 135, 223, 185, 49, 33, 39, 251, 4, 237, 156, 239, 236, 0, 31, 0, 255, 112, 30, 115, 128, 251, 253, 159, 255, 144, 112, 45, 87, 37, 84, 29, + 8, 5, 255, 9, 21, 255, 239, 255, 17, 52, 48, 28, 164, 144, 82, 30, 194, 176, 30, 191, 176, 31, 171, 37, 116, 208, 60, 180, 82, 79, 255, 37, 82, 255, 143, 100, 247, 84, 255, 175, 47, 255, 199, 67, 32, 131, 3, 60, 255, 212, 255, 0, 17, 19, 170, 32, 24, 86, 144, 24, 90, 176, 48, 3, 175, 28, 15, 179, 159, 31, + 9, 159, 255, 103, 130, 12, 3, 45, 69, 82, 41, 28, 3, 37, 247, 249, 29, 146, 249, 31, 135, 32, 3, 250, 87, 31, 4, 251, 159, 255, 45, 44, 44, 0, 0, 78, 181, 255, 37, 86, 0, 79, 63, 167, 246, 104, 187, 248, 105, 85, 79, 255, 227, 20, 15, 16, 72, 11, 159, 255, 83, 6, 39, 41, 30, 6, 61, 243, 70, 199, + 40, 191, 111, 255, 111, 223, 9, 53, 3, 36, 207, 85, 159, 47, 121, 240, 14, 107, 36, 47, 211, 6, 82, 31, 255, 10, 31, 255, 12, 47, 255, 38, 177, 239, 56, 239, 42, 41, 39, 39, 231, 160, 87, 235, 241, 111, 223, 66, 64, 159, 146, 7, 86, 59, 40, 251, 143, 94, 33, 72, 207, 253, 84, 227, 151, 255, 89, 163, 30, 33, + 0, 62, 29, 79, 255, 240, 242, 4, 159, 255, 252, 40, 91, 23, 239, 255, 25, 66, 231, 255, 3, 127, 87, 67, 33, 83, 0, 17, 191, 242, 222, 255, 251, 191, 21, 58, 16, 3, 253, 16, 7, 232, 219, 223, 17, 135, 19, 223, 37, 159, 56, 219, 160, 3, 142, 80, 128, 3, 49, 227, 34, 79, 127, 255, 224, 30, 7, 148, 240, 48, + 3, 47, 12, 95, 31, 45, 95, 128, 192, 15, 255, 39, 67, 33, 227, 8, 29, 251, 121, 251, 144, 3, 24, 220, 63, 255, 236, 254, 64, 239, 17, 212, 255, 254, 26, 47, 26, 152, 219, 255, 252, 42, 55, 248, 0, 29, 75, 228, 23, 40, 38, 251, 15, 255, 9, 161, 63, 255, 143, 75, 19, 16, 49, 45, 141, 42, 79, 121, 143, 129, + 224, 31, 192, 176, 90, 59, 112, 90, 75, 165, 80, 80, 3, 128, 15, 124, 13, 95, 156, 15, 31, 255, 47, 84, 31, 255, 95, 86, 103, 175, 88, 115, 255, 57, 157, 24, 228, 111, 32, 175, 255, 239, 29, 231, 159, 255, 16, 255, 254, 79, 255, 96, 255, 13, 255, 176, 26, 12, 203, 242, 253, 34, 199, 34, 203, 11, 27, 175, 47, 255, + 191, 239, 31, 95, 127, 2, 255, 250, 95, 12, 230, 255, 242, 63, 31, 114, 27, 105, 48, 63, 113, 139, 132, 112, 71, 75, 59, 63, 102, 179, 43, 0, 11, 25, 236, 35, 47, 117, 41, 59, 8, 255, 234, 10, 253, 1, 239, 146, 58, 221, 74, 246, 255, 80, 87, 255, 28, 16, 239, 10, 109, 2, 79, 25, 226, 239, 63, 255, 242, 27, + 247, 243, 0, 63, 253, 137, 211, 14, 161, 63, 39, 247, 41, 255, 1, 80, 3, 219, 189, 48, 174, 44, 47, 124, 127, 31, 124, 3, 223, 96, 75, 87, 85, 191, 255, 254, 43, 155, 225, 67, 11, 245, 8, 103, 3, 223, 39, 95, 251, 44, 79, 4, 43, 239, 188, 147, 249, 120, 155, 180, 239, 172, 91, 103, 119, 200, 193, 240, 154, 223, + 0, 252, 4, 138, 6, 84, 87, 105, 31, 201, 127, 251, 26, 223, 249, 27, 1, 154, 247, 27, 141, 29, 87, 55, 65, 232, 127, 249, 29, 81, 234, 208, 0, 63, 18, 214, 47, 28, 114, 31, 233, 191, 12, 37, 97, 45, 76, 48, 3, 29, 80, 17, 16, 15, 255, 255, 15, 255, 241, 249, 18, 0, 0, 174, 251, 51, 66, 30, 15, 96, + 85, 30, 19, 192, 28, 121, 242, 28, 67, 249, 95, 227, 36, 85, 77, 187, 11, 87, 3, 5, 31, 187, 2, 102, 78, 0, 194, 97, 0, 79, 243, 171, 75, 54, 99, 206, 125, 2, 78, 211, 83, 44, 215, 127, 75, 175, 11, 29, 179, 47, 190, 87, 117, 205, 16, 175, 59, 255, 95, 165, 166, 106, 39, 134, 79, 148, 32, 71, 7, 63, + 255, 32, 80, 99, 255, 31, 172, 20, 77, 175, 0, 39, 217, 255, 128, 96, 35, 0, 6, 207, 28, 79, 255, 39, 219, 21, 229, 0, 0, 52, 53, 63, 79, 159, 222, 118, 82, 175, 255, 169, 85, 85, 142, 31, 204, 212, 1, 255, 159, 232, 232, 45, 79, 209, 64, 57, 36, 49, 170, 239, 31, 176, 207, 13, 62, 4, 9, 79, 155, 3, + 99, 175, 84, 48, 192, 2, 16, 192, 127, 208, 192, 254, 91, 137, 45, 48, 130, 251, 41, 35, 38, 127, 16, 192, 29, 178, 24, 126, 251, 45, 114, 107, 159, 159, 4, 190, 145, 87, 239, 65, 115, 0, 5, 123, 47, 255, 19, 86, 119, 117, 173, 132, 233, 117, 212, 67, 70, 62, 255, 253, 134, 71, 255, 31, 108, 72, 23, 168, 247, 30, + 148, 253, 61, 206, 12, 96, 32, 15, 255, 9, 30, 39, 221, 255, 6, 87, 247, 7, 255, 249, 24, 3, 243, 251, 223, 9, 255, 243, 111, 16, 3, 13, 11, 234, 255, 243, 4, 29, 236, 239, 30, 206, 207, 17, 114, 209, 191, 251, 78, 239, 159, 21, 47, 24, 49, 30, 105, 255, 213, 160, 223, 61, 251, 80, 8, 3, 1, 96, 87, 255, + 63, 41, 25, 99, 47, 184, 207, 29, 201, 239, 56, 192, 33, 92, 80, 74, 58, 11, 111, 23, 136, 9, 11, 12, 28, 40, 96, 143, 26, 42, 162, 95, 24, 62, 63, 26, 142, 24, 174, 48, 15, 239, 30, 24, 138, 255, 40, 196, 30, 193, 128, 3, 0, 224, 3, 223, 24, 235, 255, 4, 255, 16, 1, 143, 255, 37, 175, 63, 79, 162, + 45, 72, 127, 255, 179, 255, 91, 113, 18, 72, 167, 25, 4, 49, 243, 226, 29, 191, 30, 199, 178, 255, 159, 162, 63, 89, 75, 207, 89, 79, 71, 247, 72, 19, 111, 58, 64, 168, 208, 87, 235, 64, 94, 167, 80, 88, 19, 48, 220, 0, 192, 5, 180, 1, 18, 96, 28, 255, 50, 129, 5, 144, 3, 41, 247, 159, 7, 160, 3, 30, + 221, 4, 255, 251, 1, 175, 237, 255, 251, 30, 31, 33, 159, 255, 57, 138, 250, 110, 31, 176, 249, 13, 19, 157, 1, 207, 223, 26, 194, 40, 58, 15, 26, 192, 251, 31, 59, 160, 170, 203, 38, 220, 15, 255, 13, 28, 17, 227, 48, 3, 41, 238, 11, 223, 245, 14, 252, 0, 31, 253, 153, 12, 31, 255, 16, 175, 255, 0, 23, 75, + 22, 130, 98, 40, 191, 159, 30, 109, 254, 83, 255, 144, 15, 159, 4, 83, 147, 27, 119, 238, 0, 0, 141, 239, 198, 216, 85, 105, 191, 159, 245, 37, 119, 100, 16, 214, 223, 0, 28, 41, 0, 136, 250, 81, 95, 15, 162, 1, 106, 139, 191, 80, 3, 8, 159, 0, 88, 255, 210, 221, 96, 15, 159, 34, 14, 39, 247, 43, 231, 78, + 15, 159, 3, 92, 144, 192, 125, 42, 79, 37, 122, 255, 91, 191, 95, 191, 173, 247, 75, 175, 213, 31, 203, 234, 97, 47, 175, 217, 118, 31, 203, 250, 2, 158, 42, 58, 91, 80, 84, 79, 56, 160, 3, 199, 191, 249, 0, 10, 49, 3, 28, 160, 43, 141, 215, 52, 82, 239, 255, 250, 29, 174, 255, 227, 4, 176, 239, 29, 121, 28, + 250, 90, 129, 15, 255, 255, 15, 255, 255, 223, 119, 107, 26, 115, 24, 239, 61, 59, 111, 29, 255, 255, 255, 211, 231, 10, 23, 66, 14, 28, 123, 47, 255, 87, 118, 114, 21, 35, 255, 253, 64, 44, 140, 35, 163, 32, 38, 92, 167, 6, 23, 99, 12, 5, 191, 11, 207, 218, 140, 221, 222, 79, 31, 255, 255, 48, 3, 20, 198, 0, + 35, 49, 24, 47, 102, 223, 30, 99, 19, 171, 67, 255, 255, 237, 221, 83, 166, 223, 32, 93, 95, 144, 157, 107, 207, 158, 4, 98, 73, 78, 247, 79, 93, 171, 94, 7, 9, 40, 7, 79, 255, 231, 44, 24, 180, 27, 131, 8, 20, 74, 5, 96, 219, 99, 47, 234, 198, 138, 201, 71, 79, 77, 221, 79, 107, 223, 255, 100, 48, 212, + 18, 52, 79, 75, 223, 94, 11, 159, 95, 251, 32, 111, 83, 72, 155, 128, 144, 159, 192, 139, 247, 47, 203, 0, 5, 125, 19, 179, 13, 255, 232, 0, 31, 30, 119, 95, 86, 29, 207, 175, 31, 6, 239, 29, 128, 255, 255, 165, 159, 213, 11, 239, 79, 187, 12, 92, 11, 9, 92, 23, 0, 209, 0, 49, 89, 95, 247, 80, 3, 41, + 148, 21, 15, 44, 83, 25, 2, 111, 15, 63, 6, 168, 73, 39, 124, 171, 110, 201, 169, 96, 30, 201, 240, 30, 34, 192, 31, 180, 40, 39, 112, 123, 48, 227, 15, 255, 250, 16, 30, 62, 251, 2, 89, 37, 223, 43, 47, 15, 23, 207, 87, 123, 95, 154, 55, 181, 176, 41, 223, 255, 181, 46, 249, 231, 36, 191, 176, 168, 107, 40, + 100, 45, 31, 115, 10, 15, 63, 12, 104, 98, 0, 3, 1, 130, 3, 96, 3, 129, 115, 0, 7, 4, 15, 255, 15, 34, 131, 14, 31, 217, 162, 15, 31, 40, 15, 30, 99, 34, 180, 34, 151, 8, 25, 33, 170, 3, 15, 223, 3, 1, 89, 87, 11, 31, 175, 111, 41, 227, 128, 191, 89, 235, 40, 150, 56, 15, 90, 65, 55, 220, + 17, 181, 66, 91, 202, 10, 255, 77, 171, 58, 247, 223, 95, 171, 63, 19, 33, 172, 10, 29, 151, 31, 22, 159, 127, 253, 56, 111, 27, 53, 168, 96, 23, 155, 176, 19, 72, 246, 46, 26, 31, 200, 22, 188, 42, 30, 253, 77, 139, 96, 135, 47, 208, 125, 255, 4, 171, 79, 107, 33, 127, 159, 0, 65, 219, 31, 25, 230, 159, 254, + 31, 72, 124, 31, 206, 31, 240, 96, 8, 255, 255, 128, 127, 23, 251, 192, 47, 255, 255, 241, 143, 255, 85, 31, 85, 6, 31, 89, 10, 23, 190, 13, 31, 201, 47, 95, 25, 81, 111, 27, 27, 191, 255, 254, 2, 255, 234, 191, 255, 40, 64, 127, 253, 87, 71, 244, 94, 11, 156, 176, 79, 183, 59, 124, 137, 135, 119, 41, 201, 25, + 163, 123, 51, 251, 0, 1, 51, 51, 179, 23, 223, 255, 175, 252, 30, 223, 245, 30, 227, 112, 255, 235, 113, 161, 0, 14, 62, 33, 3, 145, 239, 243, 119, 41, 2, 112, 3, 221, 43, 14, 156, 34, 41, 151, 63, 111, 155, 25, 239, 223, 249, 33, 188, 57, 175, 158, 250, 4, 103, 100, 207, 63, 23, 133, 72, 42, 195, 245, 92, 99, + 15, 162, 1, 13, 132, 167, 7, 255, 1, 80, 87, 127, 26, 86, 208, 45, 255, 252, 16, 0, 87, 71, 200, 165, 64, 2, 193, 17, 168, 47, 248, 191, 253, 255, 254, 125, 29, 23, 248, 223, 255, 255, 224, 19, 114, 48, 222, 0, 70, 201, 5, 111, 255, 223, 255, 18, 9, 158, 255, 19, 138, 37, 91, 247, 0, 3, 118, 191, 225, 71, + 43, 96, 225, 8, 21, 255, 15, 255, 254, 29, 230, 5, 207, 160, 112, 30, 56, 243, 0, 30, 31, 59, 46, 60, 115, 87, 51, 194, 103, 31, 138, 30, 248, 60, 243, 20, 126, 80, 79, 255, 249, 253, 226, 239, 255, 242, 31, 175, 187, 81, 209, 62, 92, 247, 4, 2, 1, 48, 0, 2, 175, 208, 30, 244, 165, 247, 60, 15, 5, 224, + 95, 127, 135, 7, 31, 146, 79, 250, 160, 0, 1, 239, 244, 31, 91, 253, 26, 217, 49, 56, 29, 31, 255, 190, 80, 85, 71, 46, 66, 27, 7, 255, 93, 30, 148, 251, 10, 233, 141, 1, 87, 116, 5, 46, 21, 5, 167, 120, 71, 243, 10, 87, 247, 160, 3, 0, 0, 146, 92, 31, 230, 243, 0, 3, 2, 2, 103, 99, 11, 236, + 48, 48, 99, 170, 239, 86, 111, 223, 70, 231, 127, 77, 179, 46, 47, 50, 162, 249, 31, 178, 192, 30, 75, 25, 19, 29, 232, 255, 17, 120, 82, 38, 116, 238, 31, 52, 69, 40, 68, 0, 95, 19, 1, 37, 155, 170, 127, 85, 75, 4, 190, 63, 114, 31, 150, 236, 63, 154, 181, 247, 31, 160, 208, 253, 25, 20, 40, 16, 104, 10, + 81, 22, 196, 11, 29, 252, 208, 95, 83, 3, 28, 106, 71, 235, 7, 165, 255, 72, 11, 143, 83, 27, 56, 33, 252, 29, 203, 251, 127, 126, 188, 64, 4, 203, 176, 0, 40, 207, 137, 16, 31, 236, 49, 67, 31, 252, 48, 90, 15, 96, 195, 160, 73, 87, 247, 240, 81, 211, 73, 227, 7, 208, 3, 40, 103, 5, 107, 48, 3, 247, + 191, 159, 30, 229, 27, 157, 64, 0, 175, 8, 26, 212, 4, 31, 238, 6, 246, 16, 0, 212, 12, 211, 47, 235, 48, 88, 91, 243, 72, 179, 51, 31, 158, 246, 71, 239, 14, 241, 15, 223, 255, 248, 9, 25, 211, 254, 1, 191, 254, 16, 0, 6, 227, 7, 94, 2, 175, 241, 23, 94, 251, 27, 75, 251, 0, 1, 250, 42, 1, 138, + 63, 33, 227, 9, 30, 195, 8, 52, 118, 237, 14, 187, 60, 236, 13, 221, 221, 15, 241, 10, 221, 221, 0, 31, 12, 97, 32, 89, 75, 239, 46, 31, 215, 3, 223, 90, 187, 127, 255, 48, 91, 27, 3, 252, 41, 230, 255, 250, 27, 65, 160, 207, 245, 103, 98, 0, 50, 175, 191, 246, 91, 175, 252, 13, 80, 3, 11, 30, 1, 81, + 235, 42, 3, 3, 253, 239, 188, 246, 247, 251, 102, 207, 253, 93, 28, 215, 107, 239, 169, 235, 249, 63, 224, 74, 83, 249, 8, 107, 20, 15, 255, 192, 15, 11, 12, 131, 12, 46, 87, 15, 255, 255, 11, 195, 24, 54, 15, 223, 10, 118, 32, 89, 10, 84, 47, 21, 79, 255, 23, 101, 75, 195, 192, 3, 119, 169, 81, 72, 127, 64, + 85, 55, 144, 0, 3, 1, 10, 214, 42, 20, 197, 119, 81, 7, 40, 27, 93, 243, 93, 175, 6, 85, 183, 0, 237, 0, 38, 118, 46, 51, 254, 80, 31, 27, 64, 122, 31, 31, 16, 255, 117, 140, 63, 163, 246, 11, 115, 77, 245, 3, 103, 98, 20, 15, 127, 10, 87, 7, 56, 19, 77, 62, 57, 211, 45, 251, 1, 255, 255, 179, + 7, 30, 60, 234, 12, 255, 242, 31, 78, 208, 31, 82, 224, 30, 59, 153, 96, 71, 255, 31, 27, 20, 157, 239, 73, 14, 13, 18, 26, 249, 255, 0, 2, 239, 255, 31, 66, 46, 95, 230, 115, 31, 108, 80, 0, 239, 40, 72, 31, 5, 239, 255, 219, 32, 255, 28, 191, 255, 255, 47, 39, 127, 255, 210, 16, 54, 39, 55, 111, 87, + 59, 26, 107, 2, 40, 109, 234, 0, 0, 112, 0, 3, 5, 80, 79, 220, 42, 79, 151, 21, 16, 55, 16, 192, 25, 62, 249, 31, 174, 248, 20, 23, 205, 87, 26, 107, 211, 31, 128, 177, 31, 132, 254, 255, 185, 238, 223, 255, 145, 42, 79, 91, 255, 254, 23, 82, 255, 210, 255, 255, 214, 64, 254, 148, 3, 68, 117, 79, 96, 13, + 35, 1, 78, 235, 39, 247, 158, 64, 143, 48, 3, 170, 123, 95, 171, 1, 63, 175, 247, 62, 195, 245, 112, 3, 233, 252, 119, 114, 58, 151, 253, 95, 204, 8, 95, 21, 111, 42, 79, 255, 41, 251, 13, 31, 234, 15, 31, 238, 14, 31, 242, 143, 11, 33, 25, 38, 93, 40, 5, 95, 253, 48, 5, 203, 31, 242, 24, 132, 30, 178, + 63, 31, 198, 159, 250, 90, 43, 72, 112, 75, 11, 255, 160, 95, 215, 192, 88, 11, 157, 224, 79, 235, 7, 34, 15, 255, 250, 32, 27, 210, 255, 22, 24, 170, 33, 59, 47, 71, 103, 188, 25, 159, 128, 31, 163, 151, 224, 57, 243, 34, 11, 117, 3, 243, 30, 175, 255, 211, 53, 31, 158, 66, 99, 0, 110, 44, 79, 71, 191, 228, + 78, 127, 159, 158, 252, 95, 255, 118, 32, 3, 51, 73, 175, 255, 80, 208, 3, 251, 80, 11, 24, 241, 60, 79, 175, 84, 41, 71, 239, 231, 159, 32, 28, 67, 236, 34, 98, 26, 200, 250, 255, 255, 253, 80, 103, 212, 180, 192, 82, 95, 41, 9, 33, 10, 31, 255, 191, 31, 255, 159, 91, 35, 179, 115, 255, 159, 16, 89, 127, 31, + 96, 255, 128, 0, 0, 33, 50, 15, 103, 31, 41, 231, 0, 175, 44, 251, 154, 111, 12, 31, 255, 167, 31, 63, 222, 235, 26, 97, 58, 99, 253, 72, 4, 239, 119, 64, 12, 29, 136, 95, 252, 134, 106, 74, 138, 20, 240, 65, 231, 48, 7, 224, 82, 3, 96, 66, 127, 151, 210, 15, 243, 255, 15, 255, 131, 2, 15, 255, 10, 123, + 239, 254, 186, 182, 15, 255, 78, 5, 121, 146, 31, 109, 243, 30, 125, 146, 243, 30, 125, 160, 3, 245, 0, 155, 11, 14, 125, 24, 87, 28, 169, 87, 26, 169, 143, 28, 157, 159, 31, 189, 29, 255, 225, 63, 48, 19, 1, 65, 55, 152, 118, 0, 3, 255, 253, 74, 30, 179, 253, 29, 54, 96, 3, 252, 29, 66, 251, 15, 255, 76, + 218, 19, 53, 15, 255, 10, 17, 103, 8, 95, 12, 4, 9, 64, 15, 221, 1, 51, 15, 223, 10, 81, 5, 118, 15, 26, 47, 8, 242, 255, 247, 207, 7, 31, 230, 80, 3, 248, 16, 11, 202, 64, 6, 31, 232, 33, 58, 5, 63, 251, 194, 40, 219, 117, 43, 71, 112, 86, 223, 24, 8, 47, 22, 85, 14, 85, 22, 89, 13, 22, + 93, 15, 6, 97, 17, 79, 22, 149, 95, 43, 30, 157, 64, 3, 192, 31, 22, 176, 112, 3, 143, 255, 37, 9, 194, 46, 47, 42, 251, 31, 154, 96, 3, 249, 48, 3, 8, 21, 62, 84, 64, 3, 15, 255, 47, 191, 86, 91, 159, 94, 7, 143, 41, 95, 219, 47, 223, 95, 40, 189, 113, 31, 255, 61, 162, 251, 167, 87, 39, 41, + 143, 48, 240, 96, 3, 207, 255, 251, 175, 16, 31, 193, 192, 31, 197, 243, 247, 127, 255, 254, 246, 160, 11, 255, 247, 112, 9, 80, 3, 138, 10, 24, 56, 31, 1, 64, 3, 9, 87, 255, 8, 90, 87, 125, 42, 91, 6, 255, 247, 223, 255, 109, 254, 255, 242, 255, 230, 92, 255, 31, 235, 41, 57, 223, 30, 79, 216, 239, 251, 79, + 250, 0, 225, 94, 99, 104, 115, 96, 3, 171, 254, 6, 125, 19, 249, 49, 231, 4, 31, 135, 3, 255, 151, 218, 13, 95, 2, 33, 231, 224, 58, 16, 13, 221, 208, 79, 15, 255, 31, 159, 25, 194, 64, 3, 128, 0, 157, 239, 142, 112, 14, 162, 63, 17, 75, 112, 3, 10, 221, 247, 15, 2, 64, 85, 42, 147, 95, 108, 155, 221, + 239, 194, 176, 82, 212, 208, 95, 48, 3, 109, 254, 139, 112, 11, 255, 245, 96, 110, 21, 92, 80, 13, 16, 3, 12, 221, 225, 15, 255, 8, 138, 3, 80, 3, 207, 255, 33, 227, 251, 26, 216, 252, 26, 220, 233, 219, 0, 3, 240, 127, 253, 90, 107, 42, 115, 218, 11, 14, 232, 255, 15, 249, 255, 15, 255, 60, 6, 125, 46, 18, + 6, 222, 11, 0, 54, 117, 6, 222, 46, 2, 85, 113, 15, 224, 11, 21, 15, 160, 76, 20, 210, 103, 118, 8, 227, 30, 5, 39, 146, 31, 255, 10, 76, 3, 202, 7, 191, 140, 199, 31, 50, 233, 31, 54, 248, 31, 58, 11, 22, 53, 31, 162, 39, 147, 9, 67, 49, 93, 77, 247, 127, 255, 133, 255, 31, 110, 38, 154, 31, 170, + 37, 238, 192, 95, 255, 64, 94, 31, 255, 244, 31, 170, 254, 16, 3, 239, 30, 109, 146, 79, 30, 97, 103, 255, 31, 46, 101, 7, 62, 15, 61, 31, 243, 170, 255, 48, 3, 159, 25, 147, 159, 30, 153, 159, 30, 181, 234, 159, 255, 80, 31, 230, 49, 29, 147, 48, 39, 27, 117, 39, 67, 48, 6, 255, 87, 95, 79, 79, 207, 0, + 170, 207, 191, 66, 48, 95, 167, 112, 95, 175, 64, 69, 255, 85, 106, 180, 247, 30, 99, 254, 31, 174, 255, 160, 3, 6, 95, 29, 160, 127, 29, 152, 255, 255, 241, 0, 255, 244, 249, 32, 0, 254, 29, 171, 243, 13, 243, 16, 175, 185, 162, 59, 71, 143, 95, 80, 143, 47, 35, 40, 19, 26, 47, 255, 175, 20, 31, 155, 247, 46, + 193, 254, 185, 207, 255, 191, 64, 31, 183, 132, 16, 8, 190, 255, 253, 178, 147, 41, 47, 211, 139, 41, 56, 80, 183, 112, 94, 103, 140, 64, 159, 255, 78, 203, 103, 247, 5, 207, 38, 108, 94, 99, 151, 127, 96, 3, 31, 251, 32, 31, 255, 48, 255, 199, 201, 119, 16, 46, 95, 63, 239, 112, 142, 111, 13, 226, 46, 12, 235, 255, + 250, 16, 31, 62, 255, 31, 167, 255, 0, 207, 6, 239, 38, 135, 191, 255, 3, 207, 255, 160, 14, 48, 127, 18, 120, 31, 62, 15, 255, 32, 127, 255, 127, 31, 130, 170, 239, 30, 201, 255, 26, 7, 151, 26, 11, 112, 48, 3, 191, 79, 25, 251, 63, 255, 144, 166, 108, 255, 175, 254, 31, 255, 246, 31, 255, 144, 190, 254, 164, 87, + 9, 255, 36, 5, 19, 21, 5, 28, 87, 5, 254, 214, 101, 14, 242, 68, 9, 253, 105, 143, 27, 147, 87, 191, 226, 3, 243, 191, 255, 221, 222, 63, 142, 42, 3, 177, 119, 208, 117, 65, 191, 255, 96, 82, 179, 8, 96, 10, 95, 235, 35, 243, 186, 1, 239, 178, 255, 230, 120, 27, 131, 253, 43, 127, 124, 19, 13, 255, 48, 4, + 119, 64, 15, 213, 156, 17, 227, 231, 0, 3, 17, 15, 255, 255, 9, 170, 146, 5, 153, 147, 106, 15, 118, 12, 153, 184, 15, 194, 45, 37, 7, 31, 12, 5, 14, 222, 46, 218, 2, 82, 15, 255, 42, 4, 65, 11, 80, 208, 10, 23, 62, 146, 11, 23, 27, 47, 206, 14, 93, 230, 96, 3, 14, 23, 51, 149, 3, 20, 123, 32, + 3, 1, 48, 3, 254, 30, 35, 255, 42, 30, 43, 71, 98, 30, 8, 127, 18, 191, 23, 231, 175, 29, 251, 229, 111, 255, 160, 29, 66, 32, 92, 240, 22, 116, 243, 95, 31, 163, 247, 30, 112, 250, 0, 15, 254, 179, 85, 24, 83, 242, 31, 94, 192, 24, 100, 96, 32, 91, 10, 37, 32, 22, 23, 214, 111, 29, 89, 13, 255, 21, + 248, 63, 251, 5, 67, 29, 42, 2, 29, 42, 79, 34, 95, 183, 95, 255, 58, 134, 87, 47, 186, 80, 16, 22, 112, 24, 231, 160, 8, 255, 255, 255, 208, 62, 255, 255, 242, 12, 255, 174, 229, 24, 239, 244, 30, 230, 242, 0, 47, 30, 234, 73, 40, 222, 127, 30, 178, 32, 182, 255, 253, 205, 13, 96, 192, 11, 237, 255, 252, 120, + 135, 255, 206, 253, 239, 255, 223, 63, 26, 99, 42, 103, 254, 223, 255, 16, 145, 121, 165, 153, 10, 111, 33, 239, 81, 135, 41, 211, 8, 47, 31, 55, 20, 192, 29, 26, 95, 33, 177, 243, 72, 211, 97, 15, 192, 31, 42, 39, 168, 31, 31, 163, 10, 39, 155, 223, 91, 67, 144, 125, 27, 37, 175, 251, 23, 57, 242, 24, 128, 80, + 10, 255, 97, 4, 208, 127, 31, 92, 75, 79, 26, 201, 42, 27, 96, 15, 67, 255, 15, 255, 255, 122, 15, 255, 187, 67, 87, 68, 72, 31, 255, 160, 31, 255, 191, 47, 61, 78, 0, 9, 1, 5, 7, 0, 255, 5, 5, 0, 20, 20, 0, 18, 18, 124, 32, 2, 19, 19, 0, 15, 15, 32, 2, 16, 8, 127, 16, 17, 6, 6, + 0, 17, 17, 0, 14, 240, 14, 0, 23, 23, 80, 29, 16, 38, 16, 44, 112, 38, 102, 64, 53, 24, 24, 32, 38, 16, 59, 13, 13, 32, 44, 12, 16, 65, 16, 8, 16, 71, 16, 56, 11, 11, 32, 62, 16, 65, 6, 16, 74, 64, 104, 112, 35, 16, 26, 16, 47, 10, 10, 80, 32, 253, 19, 19, 67, 77, 65, 80, 31, 255, + 196, 246, 0, 33, 0, 119, 75, 29, 81, 204, 22, 140, 30, 0, 0, 5, 21, 253, 0, 0, 17, 0, 3, 0, 4, 31, 105, 234, 6, 0, 7, 31, 107, 9, 31, 107, 11, 30, 255, 219, 12, 0, 16, 167, 0, 15, 29, 148, 17, 0, 127, 16, 243, 0, 20, 0, 21, 0, 22, 0, 249, 23, 0, 24, 0, 25, 29, 234, 128, 97, + 27, 125, 31, 43, 28, 0, 29, 0, 30, 27, 179, 32, 125, 16, 149, 34, 0, 35, 0, 36, 48, 123, 37, 255, 0, 38, 0, 39, 0, 40, 0, 41, 127, 31, 77, 42, 0, 43, 0, 44, 0, 45, 202, 0, 46, 33, 85, 80, 195, 28, 62, 59, 2, 95, 255, 160, 1, 63, 210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 4, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 4, 224, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 3, 192, 64, 3, 112, 1, 1, 64, 27, 0, 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, + 79, 79, 84, 32, 27, 110, 142, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 15, 109, 64, 79, 2, 128, 64, 81, 226, 226, 16, 19, 27, 90, 80, 15, 160, 64, 26, 207, 45, 16, 39, 41, 16, 127, 190, 32, 96, 19, 255, 255, 0, 46, 2, 128, 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, + 3, 10, 46, 0, 46, 46, 0, 117, 115, 255, 115, 112, 97, 110, 105, 115, 104, 0, 255, 109, 101, 115, 115, 97, 103, 101, 46, 239, 98, 109, 103, 96, 11, 105, 100, 46, 116, 255, 98, 108, 0, 115, 116, 114, 117, 99, 158, 116, 48, 10, 160, 199, 77, 69, 83, 71, 16, 44, 183, 49, 80, 187, 2, 2, 208, 228, 73, 78, 70, 126, + 16, 27, 0, 96, 0, 6, 0, 12, 49, 62, 42, 113, 56, 48, 159, 2, 144, 11, 90, 144, 23, 178, 128, 35, 211, 1, 146, 144, 11, 184, 144, 59, 49, 130, 68, 65, 223, 84, 49, 80, 70, 26, 6, 1, 0, 3, 255, 0, 73, 0, 110, 0, 115, 0, 101, 253, 0, 114, 0, 116, 0, 97, 17, 179, 101, 221, 0, 108, 17, 185, + 100, 0, 105, 16, 21, 99, 215, 0, 111, 48, 11, 101, 17, 203, 10, 0, 83, 255, 0, 85, 0, 80, 0, 69, 0, 82, 119, 17, 217, 77, 0, 65, 16, 7, 73, 0, 79, 87, 17, 229, 71, 16, 11, 76, 16, 15, 88, 0, 89, 39, 17, 30, 0, 87, 78, 78, 48, 147, 32, 177, 32, 0, 112, 200, 0, 117, 16, 185, 64, 159, + 108, 16, 195, 32, 197, 0, 193, 0, 164, 46, 16, 187, 67, 16, 201, 32, 231, 117, 16, 221, 160, 231, 170, 77, 16, 243, 110, 16, 69, 97, 80, 245, 101, 16, 231, 149, 79, 16, 87, 33, 15, 97, 16, 255, 105, 48, 55, 101, 42, 17, 33, 97, 7, 108, 49, 37, 99, 80, 79, 111, 80, 15, 169, 87, 17, 47, 105, 17, 35, 112, + 17, 67, 32, 57, 32, 83, 17, 57, 98, 17, 81, 101, 48, 61, 32, 149, 109, 0, 170, 225, 48, 69, 105, 17, 111, 102, 17, 87, 114, 16, 17, 71, 64, 97, 243, 17, 129, 33, 55, 1, 95, 18, 0, 0, 161, 196, 0, 86, 48, 245, 64, 135, 64, 183, 102, 17, 173, 64, 79, 170, 109, 48, 113, 116, 17, 183, 33, 2, 201, 7, + 6, 82, 71, 190, 40, 19, 163, 8, 33, 157, 67, 98, 50, 251, 254, 4, 0, 6, 4, 56, 56, 178, 83, 7, 165, 0, 211, 175, 8, 82, 123, 35, 51, 3, 19, 219, 24, 95, 19, 223, 4, 147, 199, 43, 67, 79, 77, 77, 255, 69, 78, 84, 0, 68, 73, 83, 67, 235, 95, 48, 49, 80, 7, 50, 80, 15, 51, 0, 255, 84, + 73, 84, 76, 69, 95, 77, 65, 223, 73, 78, 80, 10, 83, 85, 66, 0, 64, 47, 0, 0, 0, 144, 111, 112, 36, 67, 174, 55, 113, 97, 123, 96, 147, 28, 19, 62, 141, 80, 171, 0, 190, 231, 198, 20, 162, 51, 179, 16, 153, 100, 67, 164, 191, 76, 51, 191, 12, 0, 0, 19, 54, 175, 157, 66, 51, 203, 19, 221, 137, 230, + 39, 67, 215, 20, 252, 0, 0, 251, 104, 17, 53, 51, 227, 16, 185, 245, 23, 177, 123, 254, 51, 239, 28, 116, 149, 4, 85, 81, 23, 7, 80, 235, 9, 20, 191, 10, 20, 195, 11, 0, 224, 162, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 82, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, + 67, 0, 0, 82, 224, 245, 0, 0, 0, 32, 16, 3, 192, 16, 11, 0, 42, 64, 3, 112, 2, 1, 80, 27, 3, 16, 35, 64, 80, 3, 231, 128, 0, 3, 32, 22, 16, 57, 79, 79, 84, 115, 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, 67, 212, 246, 17, 0, 0, 18, 64, 80, 81, 232, 32, 88, 250, 255, 255, 0, 46, + 2, 128, 97, 16, 80, 19, 177, 184, 16, 19, 2, 255, 16, 0, 96, 19, 32, 132, 46, 255, 0, 46, 46, 0, 101, 109, 98, 101, 255, 100, 100, 101, 100, 102, 111, 110, 116, 255, 0, 109, 101, 115, 115, 97, 103, 101, 126, 32, 11, 50, 54, 46, 98, 114, 102, 16, 19, 127, 0, 0, 8, 82, 70, 78, 84, 254, 255, 1, 191, 4, + 48, 123, 16, 0, 5, 70, 73, 78, 182, 70, 32, 235, 1, 33, 16, 241, 27, 27, 32, 219, 251, 56, 0, 0, 80, 104, 16, 155, 8, 33, 254, 27, 26, 0, 84, 71, 76, 80, 16, 15, 255, 48, 24, 26, 20, 24, 0, 0, 8, 229, 0, 0, 10, 32, 221, 17, 3, 128, 49, 31, 96, 190, 0, 0, 0, 106, 127, 255, 176, 0, + 111, 16, 3, 233, 95, 255, 160, 16, 3, 144, 48, 3, 0, 0, 183, 2, 254, 118, 0, 0, 159, 255, 0, 11, 18, 29, 255, 143, 255, 255, 4, 255, 255, 223, 13, 233, 255, 252, 11, 162, 36, 228, 34, 59, 18, 165, 255, 107, 18, 165, 255, 244, 18, 71, 251, 226, 113, 4, 190, 233, 0, 0, 6, 18, 63, 2, 34, 67, 34, 71, + 35, 125, 98, 200, 19, 86, 119, 117, 255, 144, 0, 202, 233, 118, 84, 69, 160, 63, 65, 34, 151, 18, 157, 255, 221, 255, 209, 18, 159, 250, 0, 141, 18, 164, 9, 215, 255, 253, 1, 94, 112, 63, 17, 231, 63, 255, 112, 93, 48, 3, 47, 16, 7, 31, 255, 96, 16, 3, 80, 113, 48, 3, 13, 221, 64, 1, 255, 149, 36, 67, + 19, 76, 0, 171, 14, 20, 103, 111, 20, 107, 207, 65, 163, 7, 255, 235, 127, 255, 243, 17, 234, 144, 20, 19, 16, 0, 213, 255, 248, 20, 27, 241, 20, 31, 160, 20, 35, 150, 221, 121, 189, 65, 175, 16, 0, 239, 16, 254, 175, 119, 17, 244, 95, 255, 240, 17, 2, 244, 0, 14, 254, 255, 251, 128, 239, 255, 255, 224, 20, 43, + 131, 240, 34, 56, 84, 163, 96, 3, 180, 134, 18, 35, 4, 255, 255, 253, 22, 223, 255, 253, 175, 255, 255, 191, 253, 18, 88, 253, 111, 255, 255, 254, 41, 55, 16, 91, 52, 135, 0, 207, 18, 72, 255, 254, 80, 254, 0, 254, 129, 0, 0, 234, 97, 36, 155, 189, 128, 20, 159, 249, 0, 24, 255, 18, 105, 223, 58, 17, 103, 3, + 96, 114, 7, 203, 16, 51, 251, 223, 17, 0, 253, 175, 255, 208, 0, 9, 238, 1, 247, 57, 4, 254, 32, 0, 3, 239, 243, 0, 13, 19, 77, 170, 14, 18, 240, 6, 33, 133, 39, 0, 247, 57, 12, 21, 207, 182, 31, 21, 211, 95, 255, 51, 223, 0, 158, 37, 223, 171, 37, 102, 96, 250, 21, 240, 244, 33, 200, 119, 83, 199, + 16, 176, 54, 88, 70, 136, 113, 191, 255, 255, 241, 255, 220, 255, 255, 80, 1, 255, 255, 48, 94, 22, 56, 80, 17, 147, 112, 0, 50, 17, 5, 134, 23, 190, 239, 22, 77, 223, 255, 54, 140, 223, 22, 88, 93, 32, 3, 207, 22, 96, 121, 135, 100, 112, 98, 42, 31, 16, 87, 18, 24, 22, 147, 226, 0, 255, 250, 16, 227, 0, + 183, 32, 5, 81, 184, 0, 201, 255, 7, 188, 80, 59, 0, 126, 22, 53, 0, 0, 191, 255, 0, 10, 24, 229, 186, 95, 134, 64, 20, 119, 100, 34, 203, 251, 102, 131, 236, 251, 134, 140, 18, 208, 0, 60, 169, 104, 16, 15, 201, 0, 250, 41, 31, 25, 17, 246, 73, 140, 169, 134, 53, 213, 0, 74, 18, 205, 127, 25, 61, 63, + 25, 65, 15, 253, 235, 152, 0, 2, 63, 255, 105, 168, 119, 215, 117, 64, 35, 43, 198, 102, 227, 99, 53, 141, 81, 37, 28, 94, 233, 147, 230, 41, 127, 24, 53, 53, 107, 255, 116, 147, 105, 1, 51, 85, 22, 240, 255, 21, 146, 64, 3, 243, 5, 207, 234, 0, 22, 112, 106, 8, 103, 121, 223, 155, 188, 167, 63, 151, 118, 85, + 51, 210, 85, 154, 37, 96, 83, 187, 144, 80, 3, 16, 250, 12, 35, 198, 69, 0, 21, 197, 68, 3, 36, 7, 105, 152, 26, 115, 189, 221, 106, 104, 86, 119, 137, 154, 167, 159, 119, 232, 101, 84, 51, 166, 221, 187, 25, 149, 23, 5, 64, 187, 75, 24, 245, 33, 9, 136, 16, 40, 59, 127, 152, 27, 103, 0, 243, 58, 255, 255, + 9, 84, 3, 23, 227, 101, 255, 174, 252, 128, 165, 117, 17, 140, 255, 254, 112, 26, 155, 188, 208, 26, 159, 64, 0, 106, 235, 86, 89, 9, 240, 14, 242, 223, 255, 209, 3, 16, 48, 40, 43, 12, 22, 192, 250, 14, 255, 245, 0, 15, 48, 3, 247, 20, 249, 37, 8, 63, 16, 4, 110, 16, 63, 85, 63, 96, 3, 15, 144, 3, + 14, 84, 39, 46, 3, 23, 50, 0, 32, 3, 243, 144, 3, 25, 30, 196, 6, 245, 23, 107, 39, 91, 38, 50, 111, 23, 59, 39, 63, 160, 143, 22, 62, 223, 55, 111, 18, 47, 56, 222, 37, 147, 21, 37, 42, 27, 121, 25, 58, 254, 24, 244, 250, 21, 178, 247, 22, 15, 111, 32, 200, 243, 208, 28, 24, 181, 87, 120, 152, 128, + 255, 85, 63, 37, 71, 17, 154, 5, 128, 24, 21, 130, 33, 37, 80, 3, 105, 23, 247, 0, 191, 144, 3, 159, 39, 97, 48, 3, 237, 194, 221, 221, 121, 159, 32, 11, 81, 231, 108, 136, 211, 144, 223, 130, 211, 200, 90, 56, 71, 17, 238, 49, 15, 129, 31, 13, 28, 71, 62, 18, 208, 22, 84, 255, 16, 91, 205, 249, 27, 60, + 189, 244, 27, 60, 243, 0, 93, 203, 26, 58, 0, 157, 247, 28, 240, 57, 221, 1, 18, 48, 24, 75, 242, 95, 28, 119, 243, 28, 123, 245, 169, 207, 255, 145, 57, 24, 108, 38, 103, 80, 5, 255, 34, 113, 11, 241, 12, 8, 229, 255, 255, 177, 22, 155, 67, 151, 6, 44, 187, 41, 189, 239, 210, 57, 22, 184, 120, 173, 170, 122, + 254, 232, 87, 119, 100, 124, 223, 197, 80, 135, 18, 114, 50, 223, 169, 146, 253, 68, 13, 80, 203, 13, 80, 227, 32, 231, 5, 191, 119, 109, 160, 245, 0, 43, 255, 251, 157, 60, 122, 217, 20, 95, 216, 32, 101, 48, 152, 255, 43, 39, 162, 128, 64, 239, 48, 13, 160, 2, 17, 227, 25, 80, 252, 52, 175, 117, 18, 200, 0, 0, + 77, 45, 127, 54, 171, 84, 85, 222, 87, 172, 171, 58, 252, 119, 117, 66, 126, 31, 170, 133, 30, 56, 249, 30, 60, 252, 91, 112, 132, 14, 4, 0, 170, 159, 80, 3, 143, 83, 143, 127, 185, 159, 144, 89, 239, 181, 176, 64, 3, 254, 160, 8, 191, 31, 255, 82, 87, 46, 105, 3, 177, 2, 255, 177, 46, 111, 185, 49, 33, 39, + 251, 4, 234, 156, 239, 236, 174, 220, 78, 17, 227, 255, 64, 3, 253, 128, 253, 159, 255, 144, 112, 45, 87, 37, 142, 84, 8, 5, 255, 9, 21, 255, 239, 255, 17, 52, 48, 28, 164, 169, 144, 30, 194, 176, 30, 191, 176, 31, 171, 37, 116, 208, 85, 159, 255, 37, 86, 143, 143, 147, 19, 159, 111, 255, 67, 143, 32, 131, 3, 60, + 255, 212, 255, 0, 17, 19, 32, 85, 24, 86, 144, 24, 90, 176, 48, 3, 175, 28, 15, 159, 156, 255, 200, 34, 15, 255, 42, 3, 69, 82, 28, 3, 37, 247, 165, 249, 27, 178, 249, 31, 135, 32, 3, 250, 223, 255, 45, 55, 22, 110, 21, 207, 78, 255, 29, 85, 255, 0, 79, 149, 255, 120, 127, 40, 187, 248, 99, 111, 227, 20, + 15, 16, 38, 72, 11, 159, 255, 83, 22, 170, 31, 155, 8, 255, 76, 19, 37, 38, 199, 136, 191, 16, 101, 3, 31, 240, 251, 85, 159, 244, 84, 14, 107, 40, 4, 31, 255, 6, 31, 255, 10, 111, 255, 38, 177, 138, 239, 29, 210, 54, 247, 31, 78, 255, 30, 100, 255, 177, 158, 210, 0, 66, 64, 159, 7, 86, 59, 40, 251, 143, + 176, 159, 163, 253, 84, 227, 255, 89, 163, 57, 62, 46, 148, 79, 255, 249, 240, 4, 159, 255, 252, 40, 91, 22, 15, 255, 113, 25, 66, 255, 3, 127, 87, 67, 24, 244, 18, 28, 191, 242, 222, 255, 251, 191, 21, 58, 16, 3, 253, 16, 7, 228, 219, 223, 17, 87, 19, 57, 139, 128, 88, 219, 160, 3, 39, 87, 23, 29, 50, 208, + 48, 3, 34, 79, 127, 255, 224, 73, 30, 7, 240, 48, 3, 47, 12, 95, 47, 45, 15, 255, 45, 9, 33, 31, 33, 32, 3, 8, 29, 251, 121, 251, 128, 3, 31, 156, 246, 251, 63, 255, 254, 64, 239, 17, 212, 255, 254, 53, 17, 63, 26, 152, 255, 252, 33, 71, 248, 31, 59, 255, 168, 228, 15, 255, 16, 111, 81, 71, 191, 63, + 109, 45, 141, 79, 121, 42, 79, 129, 47, 192, 224, 31, 196, 176, 90, 59, 112, 90, 75, 132, 80, 80, 3, 14, 96, 18, 38, 197, 31, 255, 47, 33, 141, 86, 103, 139, 175, 88, 115, 46, 62, 31, 231, 244, 48, 175, 255, 239, 127, 29, 231, 159, 255, 16, 255, 79, 255, 96, 244, 255, 13, 255, 176, 26, 12, 242, 62, 33, 34, 203, + 187, 11, 27, 175, 47, 255, 239, 31, 95, 127, 2, 254, 255, 250, 95, 12, 255, 242, 63, 31, 114, 145, 63, 43, 164, 120, 163, 112, 81, 171, 150, 179, 51, 51, 11, 93, 48, 3, 249, 57, 59, 8, 255, 234, 218, 253, 223, 33, 89, 3, 98, 58, 221, 182, 255, 104, 255, 39, 255, 28, 16, 239, 42, 231, 164, 33, 227, 79, 25, 230, + 63, 16, 171, 63, 24, 190, 233, 63, 253, 211, 14, 161, 59, 3, 87, 247, 41, 255, 1, 45, 80, 3, 155, 189, 23, 31, 159, 48, 44, 47, 124, 127, 114, 31, 124, 3, 223, 96, 75, 87, 127, 255, 161, 31, 255, 168, 254, 43, 155, 225, 64, 191, 245, 248, 103, 79, 129, 79, 251, 83, 44, 79, 4, 42, 15, 3, 111, 255, 47, 239, + 249, 120, 217, 155, 239, 172, 91, 103, 119, 136, 193, 45, 19, 240, 17, 154, 223, 0, 252, 0, 36, 83, 6, 84, 87, 105, 31, 139, 185, 253, 84, 20, 167, 251, 26, 223, 249, 27, 10, 247, 25, 173, 29, 87, 221, 55, 65, 168, 127, 255, 48, 63, 20, 241, 63, 84, 27, 246, 63, 18, 214, 47, 28, 114, 31, 171, 249, 37, 193, 76, + 48, 3, 240, 80, 3, 27, 112, 17, 16, 15, 255, 255, 15, 255, 241, 249, 18, 0, 0, 174, 251, 51, 66, 30, 15, 96, 85, 30, 19, 192, 23, 34, 242, 159, 223, 36, 77, 187, 11, 86, 87, 3, 5, 31, 187, 2, 127, 191, 97, 0, 79, 243, 85, 171, 75, 255, 15, 68, 0, 2, 78, 211, 9, 31, 247, 127, 60, 91, 175, 95, + 190, 87, 117, 16, 175, 59, 255, 95, 165, 210, 166, 106, 39, 134, 79, 238, 107, 32, 99, 255, 31, 172, 28, 36, 249, 21, 249, 191, 160, 0, 6, 207, 79, 255, 39, 219, 119, 21, 229, 0, 0, 52, 127, 255, 86, 119, 118, 190, 82, 175, 255, 169, 85, 85, 142, 255, 71, 107, 82, 127, 233, 232, 44, 199, 209, 64, 57, 36, 49, 239, + 13, 62, 8, 165, 9, 79, 155, 3, 120, 63, 32, 192, 2, 16, 192, 127, 33, 208, 192, 168, 31, 251, 41, 35, 38, 127, 16, 192, 33, 90, 79, 41, 208, 192, 31, 227, 190, 145, 87, 239, 65, 115, 79, 255, 19, 239, 86, 119, 117, 173, 132, 233, 117, 67, 70, 37, 175, 158, 45, 50, 255, 29, 140, 72, 23, 247, 31, 21, 253, 22, + 77, 206, 15, 255, 13, 30, 35, 249, 30, 39, 255, 6, 87, 247, 239, 7, 255, 249, 24, 3, 243, 223, 9, 255, 213, 243, 111, 16, 3, 13, 88, 42, 239, 30, 206, 207, 104, 22, 108, 191, 251, 78, 243, 159, 21, 47, 24, 49, 31, 154, 165, 48, 93, 251, 80, 8, 3, 1, 39, 8, 11, 31, 147, 63, 41, 23, 117, 47, 184, 207, + 29, 201, 239, 56, 192, 33, 92, 80, 69, 42, 11, 32, 72, 231, 9, 11, 7, 37, 185, 223, 30, 0, 143, 82, 26, 42, 95, 24, 62, 63, 72, 174, 48, 15, 239, 46, 24, 82, 57, 147, 1, 144, 3, 0, 176, 3, 56, 231, 16, 29, 100, 252, 16, 1, 143, 255, 37, 175, 79, 162, 45, 72, 252, 127, 255, 179, 255, 91, 113, 24, + 3, 41, 75, 165, 48, 65, 243, 226, 29, 191, 30, 199, 178, 191, 255, 11, 82, 89, 231, 143, 87, 255, 239, 87, 255, 38, 23, 191, 40, 82, 85, 50, 247, 208, 86, 11, 64, 94, 167, 80, 88, 19, 6, 82, 0, 192, 9, 1, 66, 96, 5, 208, 3, 41, 247, 7, 96, 3, 63, 33, 227, 30, 221, 4, 255, 251, 1, 175, 255, 218, + 251, 30, 31, 33, 159, 255, 57, 138, 250, 31, 176, 244, 249, 13, 255, 12, 24, 246, 223, 24, 212, 58, 15, 83, 26, 192, 251, 31, 59, 160, 154, 203, 15, 255, 14, 11, 255, 199, 243, 4, 16, 3, 32, 7, 57, 238, 11, 223, 245, 115, 206, 127, 255, 160, 223, 16, 113, 16, 103, 255, 255, 100, 16, 175, 255, 0, 23, 75, 22, 130, + 98, 183, 255, 30, 109, 168, 254, 83, 255, 144, 9, 62, 0, 248, 31, 159, 83, 147, 27, 119, 239, 0, 0, 141, 223, 198, 28, 216, 85, 105, 116, 191, 159, 37, 119, 100, 120, 128, 255, 42, 243, 31, 160, 74, 44, 41, 250, 81, 95, 223, 162, 223, 144, 3, 191, 80, 3, 51, 8, 159, 0, 88, 255, 221, 96, 15, 159, 30, 41, 255, + 14, 255, 69, 95, 167, 78, 239, 221, 60, 51, 144, 192, 125, 31, 168, 0, 236, 37, 122, 255, 91, 191, 0, 28, 18, 129, 35, 143, 90, 59, 175, 213, 31, 207, 234, 97, 41, 212, 217, 31, 203, 228, 250, 2, 158, 27, 15, 65, 235, 9, 208, 3, 135, 191, 232, 249, 1, 207, 28, 209, 10, 49, 3, 28, 160, 28, 225, 225, 0, 52, + 82, 153, 127, 24, 188, 18, 12, 29, 174, 255, 236, 227, 4, 239, 29, 121, 28, 250, 90, 129, 15, 255, 255, 102, 15, 255, 101, 91, 80, 9, 109, 149, 26, 115, 24, 239, 61, 59, 188, 111, 29, 255, 255, 255, 231, 10, 39, 66, 95, 255, 221, 87, 118, 21, 35, 255, 253, 64, 30, 34, 244, 83, 35, 163, 32, 38, 92, 6, 144, 32, + 15, 200, 18, 140, 221, 167, 222, 31, 255, 255, 48, 3, 20, 198, 0, 35, 49, 183, 24, 143, 255, 17, 19, 171, 67, 255, 255, 237, 169, 221, 166, 223, 32, 93, 95, 144, 157, 107, 215, 59, 98, 68, 78, 247, 79, 93, 171, 94, 7, 159, 255, 231, 24, 180, 27, 131, 179, 8, 20, 74, 5, 96, 155, 99, 111, 230, 138, 201, 69, 31, + 255, 253, 109, 221, 79, 107, 153, 31, 52, 140, 11, 191, 82, 92, 15, 111, 127, 255, 32, 92, 11, 96, 159, 192, 91, 247, 62, 119, 103, 19, 179, 13, 255, 232, 0, 31, 30, 119, 169, 95, 29, 207, 175, 31, 118, 239, 61, 128, 182, 107, 239, 85, 79, 187, 12, 92, 11, 9, 127, 191, 49, 89, 95, 247, 21, 80, 3, 41, 103, 21, + 15, 44, 15, 63, 10, 168, 212, 235, 110, 212, 201, 96, 30, 201, 240, 30, 34, 192, 31, 184, 40, 39, 173, 112, 21, 154, 244, 25, 213, 250, 16, 30, 62, 251, 174, 2, 37, 223, 43, 46, 219, 23, 207, 0, 105, 27, 182, 12, 38, 85, 55, 176, 41, 223, 255, 181, 46, 249, 180, 231, 46, 148, 176, 107, 40, 100, 45, 168, 129, 8, + 98, 8, 40, 0, 3, 5, 45, 67, 3, 54, 223, 253, 175, 81, 192, 11, 15, 255, 17, 170, 252, 48, 163, 14, 31, 217, 15, 48, 204, 243, 48, 212, 86, 32, 183, 8, 0, 159, 7, 1, 87, 119, 11, 223, 26, 76, 64, 40, 3, 191, 31, 28, 40, 11, 40, 150, 56, 15, 90, 65, 66, 79, 209, 31, 255, 66, 91, 10, 93, 171, + 58, 247, 47, 159, 143, 101, 29, 215, 4, 244, 16, 24, 29, 151, 31, 22, 159, 127, 118, 25, 146, 223, 255, 16, 25, 85, 96, 13, 17, 37, 2, 19, 72, 48, 79, 31, 200, 22, 188, 30, 253, 77, 143, 96, 135, 47, 82, 77, 247, 6, 86, 95, 2, 111, 99, 33, 127, 159, 39, 61, 88, 26, 226, 111, 25, 230, 159, 254, 72, 124, + 30, 204, 31, 236, 251, 96, 8, 255, 255, 128, 16, 95, 192, 47, 84, 43, 161, 3, 31, 85, 6, 31, 89, 10, 23, 190, 47, 205, 160, 47, 24, 7, 111, 30, 52, 24, 156, 31, 20, 57, 110, 82, 215, 83, 39, 71, 244, 94, 11, 176, 79, 187, 63, 232, 137, 135, 167, 119, 25, 201, 255, 25, 163, 51, 251, 0, 1, 51, 191, 51, + 127, 255, 10, 255, 255, 138, 223, 255, 175, 252, 31, 70, 245, 31, 74, 112, 255, 235, 113, 162, 0, 14, 62, 29, 3, 208, 3, 179, 119, 67, 107, 16, 128, 3, 202, 221, 16, 15, 255, 32, 57, 151, 63, 111, 155, 25, 175, 223, 123, 27, 193, 111, 249, 33, 57, 175, 158, 250, 4, 202, 103, 100, 143, 63, 43, 143, 224, 74, 195, 245, + 92, 99, 83, 223, 162, 63, 31, 239, 13, 89, 167, 255, 189, 255, 246, 95, 127, 250, 250, 26, 86, 208, 45, 255, 252, 16, 209, 0, 87, 136, 165, 208, 8, 179, 4, 175, 128, 47, 175, 12, 183, 0, 11, 7, 5, 255, 241, 17, 148, 253, 255, 254, 125, 29, 23, 248, 223, 255, 255, 224, 19, 114, 48, 223, 0, 70, 137, 5, 191, 255, + 40, 255, 111, 233, 255, 223, 255, 18, 9, 255, 17, 170, 37, 91, 247, 234, 0, 3, 118, 127, 225, 254, 90, 11, 225, 8, 21, 255, 126, 15, 255, 254, 4, 16, 0, 5, 207, 160, 30, 56, 232, 243, 0, 30, 31, 59, 6, 99, 87, 115, 198, 31, 126, 207, 30, 248, 55, 91, 20, 126, 80, 79, 255, 253, 201, 226, 239, 47, 133, 207, + 227, 209, 92, 247, 4, 6, 1, 48, 245, 0, 2, 175, 208, 30, 244, 247, 60, 15, 5, 47, 224, 95, 127, 233, 7, 31, 43, 79, 160, 0, 1, 198, 239, 244, 61, 123, 88, 29, 31, 255, 190, 80, 85, 71, 54, 46, 66, 27, 7, 255, 144, 10, 230, 186, 5, 120, 78, 107, 170, 10, 87, 247, 9, 183, 255, 146, 31, 234, 243, 0, + 3, 1, 73, 11, 232, 48, 63, 104, 103, 37, 59, 111, 77, 79, 38, 231, 127, 36, 61, 179, 31, 48, 96, 30, 104, 31, 178, 192, 28, 107, 29, 139, 84, 29, 232, 255, 17, 120, 255, 30, 51, 238, 9, 254, 19, 96, 95, 170, 1, 37, 155, 127, 85, 75, 4, 111, 243, 253, 44, 185, 171, 114, 31, 150, 236, 63, 154, 247, 31, 160, + 208, 253, 85, 23, 52, 40, 16, 104, 10, 22, 196, 251, 95, 91, 48, 11, 3, 28, 109, 39, 235, 47, 142, 72, 11, 143, 86, 115, 255, 252, 245, 1, 87, 116, 16, 29, 203, 251, 126, 188, 64, 254, 4, 203, 176, 0, 40, 207, 16, 31, 236, 40, 49, 67, 80, 187, 192, 144, 195, 160, 86, 23, 74, 31, 41, 227, 79, 40, 3, 7, + 208, 3, 40, 103, 5, 255, 243, 2, 245, 103, 99, 247, 191, 159, 30, 229, 31, 81, 64, 218, 0, 8, 27, 153, 4, 248, 94, 99, 211, 47, 235, 169, 48, 88, 91, 243, 86, 211, 247, 70, 219, 14, 237, 15, 46, 123, 31, 211, 223, 255, 248, 9, 25, 211, 1, 191, 250, 254, 16, 0, 6, 227, 191, 255, 69, 42, 36, 235, 207, 255, + 241, 23, 94, 251, 26, 142, 251, 0, 210, 1, 250, 1, 138, 59, 11, 31, 220, 32, 3, 9, 30, 195, 165, 8, 52, 118, 237, 14, 187, 125, 45, 4, 223, 91, 239, 46, 103, 31, 215, 3, 223, 90, 187, 95, 162, 223, 255, 48, 87, 25, 35, 252, 56, 6, 250, 27, 65, 160, 207, 103, 233, 98, 0, 50, 111, 191, 243, 91, 183, 43, + 175, 252, 37, 80, 3, 219, 30, 255, 128, 3, 42, 3, 3, 187, 83, 246, 255, 16, 0, 12, 246, 251, 102, 207, 253, 122, 93, 28, 215, 107, 239, 235, 185, 63, 244, 88, 191, 174, 96, 76, 19, 64, 15, 249, 222, 13, 221, 221, 28, 192, 67, 12, 41, 7, 221, 16, 0, 46, 87, 8, 250, 255, 10, 11, 127, 23, 101, 20, 75, 195, + 224, 3, 79, 255, 64, 85, 55, 144, 208, 3, 10, 210, 93, 171, 9, 70, 7, 0, 93, 175, 6, 127, 255, 38, 118, 103, 46, 51, 254, 80, 45, 112, 31, 31, 16, 255, 117, 138, 140, 63, 163, 8, 0, 26, 77, 247, 8, 103, 47, 223, 172, 115, 136, 113, 91, 203, 46, 59, 31, 182, 0, 21, 169, 48, 19, 11, 210, 49, 243, 54, + 0, 0, 77, 57, 211, 45, 251, 1, 255, 234, 255, 179, 7, 30, 60, 12, 30, 88, 15, 30, 172, 185, 118, 29, 16, 255, 253, 96, 71, 255, 31, 27, 20, 191, 157, 12, 68, 31, 21, 0, 0, 26, 255, 0, 229, 2, 239, 255, 31, 66, 46, 95, 230, 31, 108, 80, 223, 0, 239, 40, 72, 254, 0, 119, 81, 63, 47, 31, 35, 28, + 217, 255, 45, 71, 127, 255, 16, 54, 90, 39, 55, 111, 87, 59, 191, 255, 97, 239, 112, 0, 3, 5, 66, 95, 223, 42, 79, 151, 16, 55, 16, 192, 25, 62, 249, 31, 174, 189, 248, 20, 23, 205, 20, 119, 81, 31, 207, 255, 191, 177, 31, 136, 254, 255, 185, 223, 255, 145, 119, 40, 215, 91, 255, 254, 23, 82, 210, 255, 255, 164, + 214, 189, 154, 96, 13, 35, 3, 103, 151, 158, 48, 143, 64, 3, 170, 123, 95, 171, 1, 55, 98, 247, 62, 199, 245, 112, 3, 234, 252, 119, 114, 56, 183, 253, 11, 123, 24, 255, 198, 7, 84, 168, 11, 0, 112, 75, 253, 86, 67, 251, 144, 3, 13, 210, 46, 188, 15, 30, 252, 13, 255, 250, 32, 27, 210, 40, 7, 47, 33, 59, + 47, 71, 103, 127, 255, 1, 16, 0, 4, 211, 159, 128, 31, 167, 224, 57, 243, 34, 11, 117, 32, 127, 15, 255, 25, 239, 255, 32, 0, 175, 255, 211, 53, 31, 158, 66, 99, 0, 110, 44, 83, 71, 127, 228, 2, 95, 31, 191, 78, 159, 158, 252, 95, 255, 118, 32, 213, 3, 51, 111, 255, 80, 0, 3, 1, 16, 175, 255, 14, 74, + 16, 91, 11, 31, 197, 60, 79, 175, 41, 71, 239, 167, 159, 250, 254, 148, 3, 235, 32, 26, 203, 236, 34, 98, 58, 26, 200, 31, 76, 80, 103, 118, 143, 229, 16, 89, 155, 154, 112, 8, 0, 9, 75, 19, 0, 191, 31, 255, 159, 91, 35, 179, 20, 160, 28, 255, 16, 89, 127, 35, 155, 128, 0, 214, 0, 33, 15, 103, 27, 8, + 219, 239, 9, 222, 175, 255, 161, 249, 144, 3, 248, 82, 107, 15, 198, 255, 15, 255, 255, 15, 255, 32, 2, 253, 152, 118, 0, 3, 255, 253, 29, 242, 253, 37, 31, 154, 96, 3, 252, 9, 54, 255, 11, 94, 190, 5, 31, 99, 6, 85, 31, 103, 7, 112, 3, 249, 48, 3, 8, 61, 147, 249, 117, 15, 117, 48, 19, 53, 17, 23, + 239, 223, 22, 3, 255, 42, 29, 66, 32, 3, 251, 31, 62, 224, 31, 246, 176, 32, 3, 217, 103, 81, 28, 244, 255, 113, 31, 66, 76, 225, 87, 186, 255, 30, 185, 143, 255, 160, 31, 62, 112, 32, 3, 106, 56, 127, 251, 16, 88, 127, 243, 31, 81, 246, 30, 51, 158, 247, 31, 53, 64, 3, 0, 1, 51, 81, 48, 16, 171, 11, + 86, 187, 9, 86, 103, 7, 24, 92, 7, 255, 222, 252, 5, 25, 151, 223, 255, 253, 48, 31, 159, 177, 225, 37, 255, 230, 92, 16, 12, 25, 169, 77, 211, 239, 74, 12, 23, 22, 5, 69, 251, 47, 255, 47, 94, 11, 223, 40, 192, 245, 252, 3, 103, 99, 39, 54, 212, 63, 255, 254, 76, 32, 188, 62, 31, 48, 45, 199, 0, 239, + 86, 55, 122, 191, 164, 225, 88, 43, 252, 102, 55, 71, 96, 35, 47, 5, 128, 3, 109, 182, 11, 255, 48, 16, 96, 243, 223, 159, 255, 195, 214, 0, 111, 26, 7, 8, 31, 222, 4, 245, 15, 255, 49, 90, 41, 42, 9, 145, 79, 10, 221, 6, 97, 61, 95, 17, 231, 95, 64, 3, 192, 27, 222, 208, 0, 63, 221, 208, 23, 208, + 31, 49, 231, 25, 238, 96, 25, 242, 80, 0, 109, 42, 26, 100, 159, 255, 10, 25, 87, 11, 48, 3, 243, 26, 62, 249, 243, 0, 12, 221, 225, 207, 255, 34, 188, 5, 92, 80, 3, 3, 31, 171, 3, 255, 219, 223, 191, 42, 104, 140, 253, 26, 23, 32, 3, 16, 35, 221, 218, 15, 255, 29, 27, 118, 149, 207, 31, 255, 42, 151, + 10, 46, 103, 110, 207, 194, 1, 247, 255, 161, 0, 60, 152, 192, 255, 213, 54, 201, 119, 82, 127, 229, 43, 179, 250, 31, 255, 17, 150, 0, 151, 128, 15, 155, 3, 169, 235, 6, 218, 7, 4, 255, 243, 125, 31, 255, 247, 250, 102, 207, 254, 95, 255, 249, 244, 123, 239, 234, 247, 90, 115, 249, 15, 255, 242, 15, 216, 175, 217, 3, + 255, 64, 3, 0, 49, 15, 255, 2, 105, 255, 16, 10, 9, 247, 255, 9, 38, 100, 36, 209, 31, 255, 143, 31, 247, 175, 79, 175, 100, 207, 228, 254, 144, 76, 3, 36, 197, 255, 13, 39, 26, 11, 215, 103, 244, 1, 87, 0, 1, 29, 55, 29, 31, 255, 23, 133, 244, 5, 255, 254, 98, 37, 111, 14, 30, 23, 47, 255, 255, 98, + 3, 50, 16, 255, 206, 255, 243, 127, 31, 164, 241, 255, 238, 255, 241, 57, 126, 206, 255, 241, 31, 87, 64, 3, 47, 255, 240, 15, 255, 15, 234, 37, 87, 16, 23, 247, 48, 23, 251, 55, 23, 255, 171, 127, 23, 251, 239, 31, 218, 255, 80, 3, 247, 1, 101, 29, 224, 111, 241, 31, 63, 28, 220, 255, 29, 72, 255, 244, 146, 0, + 0, 227, 31, 243, 48, 0, 192, 25, 29, 238, 20, 29, 155, 31, 215, 46, 3, 12, 21, 17, 15, 31, 251, 40, 15, 117, 16, 215, 70, 119, 97, 47, 255, 112, 31, 255, 243, 223, 235, 156, 55, 21, 247, 65, 0, 139, 228, 212, 255, 217, 40, 5, 253, 0, 102, 17, 123, 87, 239, 39, 243, 162, 92, 95, 167, 6, 127, 163, 17, 22, + 31, 251, 242, 63, 27, 229, 252, 119, 113, 125, 163, 45, 167, 246, 9, 129, 20, 153, 42, 70, 87, 40, 3, 13, 31, 255, 14, 31, 255, 15, 112, 3, 250, 147, 0, 2, 153, 243, 27, 153, 241, 27, 157, 170, 240, 22, 196, 224, 22, 200, 208, 27, 169, 208, 27, 169, 170, 208, 25, 181, 184, 31, 255, 253, 144, 3, 254, 152, 91, 95, + 8, 220, 18, 14, 16, 187, 10, 255, 253, 32, 3, 86, 47, 255, 143, 31, 255, 6, 41, 19, 4, 119, 127, 255, 255, 175, 255, 240, 25, 255, 255, 240, 255, 124, 96, 3, 159, 255, 240, 64, 31, 24, 105, 96, 3, 85, 15, 255, 14, 127, 18, 35, 111, 56, 3, 128, 73, 211, 237, 172, 96, 2, 191, 61, 72, 79, 235, 159, 221, 50, + 3, 16, 108, 235, 0, 0, 21, 112, 191, 191, 25, 247, 0, 59, 253, 255, 246, 221, 239, 255, 246, 31, 255, 208, 181, 255, 26, 76, 119, 84, 5, 77, 26, 7, 87, 147, 1, 167, 255, 83, 243, 28, 175, 222, 47, 147, 254, 103, 128, 86, 26, 159, 208, 26, 163, 240, 58, 163, 71, 116, 15, 255, 26, 171, 14, 89, 251, 5, 96, 95, + 6, 175, 255, 241, 0, 247, 30, 255, 252, 120, 106, 0, 254, 223, 206, 234, 253, 145, 121, 184, 221, 16, 192, 3, 153, 6, 40, 62, 156, 47, 41, 179, 26, 89, 23, 153, 128, 15, 255, 255, 15, 29, 205, 230, 4, 238, 144, 15, 255, 62, 19, 59, 2, 239, 83, 75, 153, 132, 126, 131, 27, 241, 159, 226, 45, 77, 29, 235, 249, 229, + 16, 0, 214, 6, 204, 41, 31, 255, 46, 31, 255, 31, 86, 31, 255, 8, 127, 255, 85, 29, 85, 254, 16, 27, 197, 123, 46, 67, 145, 0, 253, 96, 11, 39, 248, 13, 255, 174, 250, 23, 231, 253, 63, 83, 1, 188, 112, 65, 247, 66, 29, 162, 5, 23, 230, 32, 3, 8, 96, 50, 119, 159, 6, 31, 255, 169, 31, 29, 139, 127, + 31, 204, 207, 25, 29, 29, 150, 87, 183, 117, 47, 219, 251, 48, 69, 155, 255, 80, 64, 254, 4, 188, 0, 0, 23, 191, 176, 30, 43, 149, 224, 22, 55, 0, 128, 22, 77, 31, 18, 255, 56, 3, 1, 78, 63, 255, 249, 24, 7, 40, 167, 208, 54, 118, 71, 231, 127, 31, 255, 244, 255, 239, 255, 254, 128, 4, 161, 239, 86, 35, + 15, 87, 107, 143, 255, 43, 99, 33, 1, 192, 74, 31, 255, 240, 80, 3, 13, 78, 206, 6, 25, 206, 7, 24, 191, 148, 7, 31, 95, 32, 3, 9, 48, 3, 245, 48, 3, 47, 123, 55, 15, 255, 47, 31, 122, 0, 223, 57, 255, 252, 0, 46, 107, 26, 99, 3, 223, 44, 239, 103, 127, 255, 207, 255, 251, 244, 8, 255, 255, 247, + 22, 225, 250, 255, 255, 252, 223, 254, 255, 177, 191, 253, 98, 212, 0, 34, 15, 162, 24, 15, 30, 253, 12, 17, 239, 41, 251, 27, 24, 172, 31, 67, 20, 95, 0, 3, 143, 255, 31, 255, 253, 0, 2, 207, 255, 253, 239, 63, 162, 248, 115, 25, 243, 80, 103, 117, 139, 152, 31, 58, 0, 160, 56, 10, 111, 28, 15, 97, 187, 11, + 255, 246, 51, 251, 15, 255, 255, 15, 111, 213, 245, 67, 87, 68, 72, 83, 2, 47, 47, 255, 9, 255, 0, 9, 1, 5, 7, 0, 5, 5, 253, 0, 20, 20, 0, 18, 18, 32, 2, 19, 241, 19, 0, 15, 15, 32, 2, 16, 8, 16, 17, 6, 255, 6, 0, 17, 17, 0, 14, 14, 0, 193, 23, 23, 80, 29, 16, 38, 16, 44, + 112, 38, 64, 53, 24, 152, 24, 32, 38, 16, 59, 13, 13, 32, 44, 16, 65, 16, 8, 48, 16, 71, 16, 56, 11, 11, 32, 68, 64, 98, 112, 29, 16, 98, 49, 16, 23, 16, 44, 10, 10, 32, 92, 16, 128, 16, 98, 14, 251, 14, 67, 77, 65, 80, 53, 146, 33, 0, 185, 117, 55, 221, 0, 81, 200, 37, 227, 0, 1, 4, + 0, 206, 2, 255, 0, 0, 17, 20, 29, 4, 0, 5, 27, 103, 187, 7, 24, 35, 9, 0, 10, 62, 43, 12, 0, 109, 16, 167, 0, 15, 22, 4, 17, 0, 16, 243, 0, 255, 20, 0, 21, 0, 22, 0, 23, 0, 250, 24, 0, 25, 0, 26, 144, 97, 27, 31, 39, 251, 28, 0, 29, 0, 30, 24, 99, 32, 0, 175, 33, 48, + 117, 34, 48, 123, 35, 0, 36, 0, 255, 37, 0, 38, 0, 39, 0, 40, 0, 254, 41, 0, 42, 0, 43, 0, 44, 17, 95, 89, 64, 191, 40, 46, 221, 0, 2, 105, 88, 16, 57, 0, 253, 0, 161, 0, 45, 0, 225, 24, 173, 243, 0, 65, 121, 15, 255, 4, 89, 97, 122, 48, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 255, 82, 65, 82, 67, 0, 0, 5, 0, 123, 16, 0, 32, 0, 0, 1, 16, 7, 3, 224, 37, 64, 3, 112, 1, 1, 64, 27, 48, 36, 64, 80, 3, 192, 223, 0, 5, 32, 43, 0, 0, 82, 79, 79, 179, 84, 32, 27, 195, 252, 64, 68, 0, 3, 0, 133, 53, 246, 17, 0, 0, 14, 64, 79, 2, 160, 64, 81, + 211, 226, 226, 16, 19, 26, 80, 15, 64, 19, 2, 207, 171, 45, 16, 39, 40, 16, 127, 64, 96, 19, 255, 255, 234, 0, 46, 2, 128, 136, 16, 80, 19, 184, 16, 19, 199, 2, 255, 16, 0, 96, 19, 0, 3, 10, 46, 0, 46, 255, 46, 0, 117, 115, 102, 114, 101, 110, 255, 99, 104, 0, 109, 101, 115, 115, 97, 253, 103, 101, + 46, 98, 109, 103, 96, 11, 105, 255, 100, 46, 116, 98, 108, 0, 115, 116, 243, 114, 117, 99, 116, 48, 10, 176, 198, 77, 69, 214, 83, 71, 16, 45, 49, 80, 187, 2, 2, 208, 228, 239, 73, 78, 70, 16, 27, 0, 96, 0, 6, 197, 0, 12, 49, 62, 113, 56, 48, 159, 2, 144, 11, 110, 90, 144, 23, 216, 128, 35, 1, 156, + 144, 11, 194, 144, 59, 115, 49, 130, 68, 65, 84, 32, 123, 33, 127, 26, 6, 255, 1, 0, 3, 0, 86, 0, 101, 0, 251, 117, 0, 105, 0, 108, 16, 1, 101, 0, 175, 122, 17, 181, 105, 16, 89, 115, 0, 233, 0, 167, 114, 16, 25, 114, 17, 197, 32, 23, 32, 0, 100, 113, 16, 35, 115, 0, 113, 16, 43, 64, 13, 32, + 19, 10, 255, 0, 83, 0, 85, 0, 80, 0, 69, 221, 0, 82, 17, 237, 77, 0, 65, 16, 7, 73, 213, 0, 79, 17, 249, 71, 16, 11, 76, 16, 15, 88, 199, 0, 89, 17, 50, 0, 107, 48, 0, 105, 30, 73, 0, 109, 245, 0, 112, 0, 111, 16, 199, 115, 16, 219, 98, 41, 112, 195, 32, 201, 108, 16, 237, 114, 80, 9, + 224, 217, 46, 42, 16, 211, 1, 17, 0, 118, 16, 73, 117, 17, 19, 32, 17, 19, 234, 233, 0, 102, 145, 27, 97, 17, 59, 32, 16, 107, 185, 111, 80, 165, 100, 0, 39, 17, 79, 32, 123, 108, 81, 16, 125, 105, 19, 3, 87, 17, 91, 32, 7, 32, 141, 117, 10, 49, 79, 32, 27, 64, 77, 65, 69, 100, 17, 107, 116, 16, + 73, 74, 33, 131, 115, 49, 45, 1, 85, 18, 0, 17, 95, 97, 19, 99, 165, 103, 17, 167, 97, 18, 11, 65, 145, 97, 16, 171, 101, 74, 18, 25, 116, 48, 107, 33, 183, 99, 49, 5, 109, 17, 225, 67, 65, 187, 33, 2, 225, 14, 18, 121, 66, 103, 19, 59, 0, 8, 247, 33, 157, 67, 98, 51, 27, 4, 0, 6, 245, 4, + 56, 56, 178, 83, 39, 0, 211, 207, 8, 42, 82, 155, 35, 83, 3, 19, 252, 24, 20, 0, 4, 147, 231, 255, 43, 67, 79, 77, 77, 69, 78, 84, 255, 0, 68, 73, 83, 67, 95, 48, 49, 95, 80, 7, 50, 80, 15, 51, 0, 84, 73, 84, 254, 76, 69, 95, 77, 65, 73, 78, 80, 10, 249, 83, 85, 66, 0, 64, 0, 0, + 0, 144, 111, 112, 123, 36, 99, 174, 55, 113, 97, 96, 147, 28, 19, 223, 62, 141, 80, 171, 0, 190, 198, 20, 162, 61, 51, 211, 16, 153, 100, 67, 164, 76, 51, 223, 12, 252, 0, 0, 19, 54, 175, 66, 51, 235, 19, 253, 239, 137, 230, 39, 67, 247, 20, 0, 0, 251, 231, 104, 17, 53, 52, 3, 16, 185, 23, 177, 123, 170, + 254, 52, 15, 28, 116, 181, 4, 81, 23, 7, 80, 235, 168, 9, 20, 224, 10, 20, 228, 11, 224, 162, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 90, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 90, 224, 245, 0, 0, 0, 32, 16, 3, 192, 16, 11, 0, 42, 64, 3, 112, 2, 1, + 80, 27, 3, 16, 35, 64, 80, 3, 239, 128, 0, 3, 32, 22, 0, 0, 82, 79, 220, 79, 84, 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, 253, 67, 212, 17, 0, 0, 18, 64, 80, 89, 190, 236, 32, 88, 255, 255, 0, 46, 2, 128, 97, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 32, 132, 46, 0, + 46, 46, 0, 101, 109, 255, 98, 101, 100, 100, 101, 100, 102, 111, 255, 110, 116, 0, 109, 101, 115, 115, 97, 223, 103, 101, 32, 11, 50, 54, 46, 98, 114, 159, 102, 16, 19, 0, 0, 8, 82, 70, 78, 84, 254, 239, 255, 1, 4, 48, 123, 16, 0, 5, 70, 237, 73, 78, 70, 32, 235, 1, 33, 16, 241, 27, 190, 27, 32, 219, + 56, 0, 0, 88, 104, 16, 155, 255, 20, 33, 27, 26, 0, 84, 71, 76, 191, 80, 16, 15, 48, 24, 26, 20, 24, 0, 249, 0, 8, 0, 0, 11, 32, 221, 17, 3, 128, 111, 49, 31, 96, 0, 0, 0, 106, 127, 255, 176, 0, 186, 111, 16, 3, 95, 255, 160, 16, 3, 144, 48, 3, 125, 0, 144, 50, 3, 119, 80, 0, 7, + 16, 83, 7, 253, 255, 128, 0, 9, 255, 96, 16, 3, 64, 254, 0, 10, 255, 32, 0, 11, 255, 0, 238, 107, 111, 1, 107, 61, 39, 0, 16, 220, 0, 0, 191, 255, 223, 0, 8, 18, 129, 79, 255, 253, 0, 223, 213, 255, 192, 98, 232, 97, 19, 0, 254, 18, 221, 255, 170, 242, 18, 159, 252, 34, 163, 64, 16, 41, 176, 0, + 255, 112, 186, 63, 17, 231, 63, 255, 112, 48, 3, 47, 16, 7, 187, 31, 17, 159, 31, 255, 80, 48, 3, 13, 221, 178, 64, 2, 143, 47, 1, 17, 1, 227, 186, 36, 183, 6, 20, 203, 175, 12, 20, 207, 47, 35, 49, 7, 255, 255, 48, 255, 31, 255, 249, 0, 143, 255, 241, 0, 191, 239, 18, 222, 255, 255, 16, 0, 255, 250, + 117, 20, 131, 249, 103, 155, 36, 107, 79, 16, 23, 14, 220, 255, 247, 18, 238, 252, 0, 5, 20, 152, 20, 128, 190, 64, 16, 40, 184, 222, 255, 255, 254, 84, 139, 119, 3, 3, 112, 7, 203, 16, 51, 251, 223, 255, 240, 255, 0, 175, 255, 208, 0, 9, 238, 64, 122, 3, 152, 153, 66, 0, 0, 62, 21, 211, 223, 21, 215, 173, + 239, 21, 219, 111, 21, 223, 2, 117, 166, 96, 48, 36, 22, 124, 35, 105, 208, 54, 88, 5, 97, 31, 207, 22, 162, 22, 51, 217, 5, 255, 67, 223, 9, 239, 22, 203, 118, 94, 255, 191, 175, 49, 228, 255, 255, 7, 117, 49, 251, 71, 22, 228, 248, 38, 179, 150, 221, 38, 111, 253, 207, 255, 186, 245, 19, 87, 243, 0, 15, 16, + 7, 13, 18, 12, 225, 3, 33, 16, 182, 156, 0, 3, 255, 1, 20, 255, 25, 62, 19, 252, 86, 4, 190, 255, 255, 6, 24, 192, 40, 196, 255, 0, 255, 202, 118, 0, 35, 255, 251, 118, 105, 72, 119, 117, 65, 34, 107, 232, 255, 80, 0, 228, 84, 69, 141, 82, 175, 201, 53, 209, 25, 136, 20, 158, 166, 0, 41, 4, 253, 7, + 169, 1, 25, 167, 159, 0, 55, 152, 207, 175, 255, 52, 176, 105, 164, 71, 118, 64, 191, 190, 255, 144, 0, 184, 104, 207, 211, 0, 201, 147, 169, 179, 41, 123, 160, 25, 127, 241, 25, 131, 24, 201, 204, 123, 208, 192, 0, 4, 174, 255, 24, 7, 255, 0, 185, 3, 41, 131, 254, 185, 0, 16, 192, 106, 8, 87, 215, 119, 84, 35, + 43, 252, 96, 191, 134, 51, 88, 72, 35, 208, 5, 170, 40, 41, 28, 254, 25, 33, 21, 110, 25, 227, 169, 128, 21, 111, 242, 161, 31, 53, 16, 186, 25, 219, 127, 103, 80, 3, 92, 254, 41, 238, 106, 104, 86, 119, 153, 191, 187, 160, 190, 169, 119, 101, 83, 253, 32, 85, 138, 134, 198, 83, 187, 249, 80, 3, 49, 250, 108, 2, + 198, 52, 0, 24, 180, 84, 3, 26, 67, 6, 153, 26, 211, 189, 13, 106, 200, 85, 103, 120, 153, 161, 30, 135, 251, 118, 85, 67, 221, 212, 138, 230, 171, 181, 74, 26, 151, 247, 80, 187, 16, 191, 50, 3, 248, 22, 2, 17, 227, 148, 1, 24, 75, 96, 3, 0, 48, 3, 254, 58, 229, 42, 233, 255, 4, 207, 255, 22, 223, 255, + 254, 175, 255, 255, 254, 129, 143, 255, 234, 97, 111, 107, 26, 224, 41, 189, 42, 227, 24, 42, 231, 223, 244, 82, 27, 120, 80, 155, 109, 128, 80, 227, 25, 125, 0, 23, 229, 59, 16, 193, 24, 167, 63, 255, 244, 17, 58, 208, 0, 165, 207, 49, 84, 80, 27, 64, 32, 3, 112, 16, 15, 208, 82, 4, 159, 14, 2, 9, 252, 16, + 255, 69, 63, 96, 3, 0, 160, 3, 169, 239, 23, 46, 0, 112, 3, 48, 144, 3, 41, 43, 80, 232, 0, 6, 63, 23, 91, 10, 25, 74, 18, 247, 55, 63, 170, 8, 25, 86, 13, 23, 111, 111, 16, 178, 255, 22, 170, 82, 73, 115, 14, 27, 211, 47, 85, 251, 34, 3, 207, 86, 15, 61, 21, 123, 28, 120, 251, 85, 119, 137, + 43, 247, 237, 76, 27, 252, 173, 28, 0, 17, 154, 49, 80, 86, 23, 97, 19, 149, 240, 144, 3, 213, 147, 14, 81, 231, 13, 87, 247, 11, 87, 144, 3, 9, 21, 217, 0, 48, 3, 254, 221, 221, 10, 115, 30, 32, 11, 81, 231, 108, 232, 221, 144, 219, 221, 96, 120, 70, 11, 236, 19, 239, 86, 219, 96, 3, 32, 219, 121, 135, + 141, 64, 247, 42, 255, 54, 140, 115, 152, 250, 255, 255, 226, 183, 32, 100, 146, 215, 33, 83, 35, 231, 226, 6, 107, 6, 178, 143, 20, 67, 31, 255, 67, 151, 71, 59, 158, 173, 156, 125, 29, 60, 1, 251, 135, 138, 223, 163, 250, 37, 232, 119, 118, 65, 109, 192, 108, 28, 205, 33, 134, 18, 65, 106, 50, 223, 233, 32, 253, 165, + 223, 144, 3, 191, 80, 3, 190, 87, 119, 63, 80, 2, 191, 255, 185, 160, 94, 247, 253, 130, 118, 83, 167, 63, 64, 0, 255, 8, 23, 84, 26, 161, 52, 95, 14, 3, 0, 255, 87, 247, 20, 175, 26, 204, 243, 0, 0, 4, 223, 94, 75, 119, 251, 197, 85, 221, 122, 207, 164, 186, 103, 119, 84, 115, 249, 72, 13, 32, 191, 28, + 229, 43, 169, 24, 253, 0, 200, 10, 241, 0, 9, 48, 80, 3, 29, 172, 0, 7, 80, 3, 135, 223, 36, 139, 41, 239, 162, 251, 80, 3, 234, 7, 208, 255, 8, 225, 255, 15, 227, 41, 58, 78, 99, 83, 20, 223, 11, 30, 99, 127, 46, 73, 79, 255, 4, 103, 231, 117, 48, 255, 92, 83, 52, 8, 101, 106, 235, 167, 16, 213, + 158, 112, 91, 3, 13, 212, 3, 1, 19, 67, 84, 31, 147, 249, 31, 159, 251, 30, 191, 251, 31, 175, 37, 116, 169, 253, 213, 234, 7, 83, 7, 9, 147, 23, 63, 255, 84, 165, 50, 147, 3, 250, 134, 231, 158, 7, 50, 31, 239, 249, 84, 31, 243, 251, 48, 3, 10, 24, 187, 9, 128, 191, 15, 255, 48, 210, 52, 85, 197, 35, + 191, 80, 3, 79, 255, 32, 64, 255, 191, 2, 19, 234, 62, 144, 0, 4, 239, 144, 101, 31, 160, 160, 4, 141, 127, 40, 248, 223, 28, 28, 255, 190, 251, 29, 191, 254, 48, 0, 255, 193, 72, 11, 34, 159, 255, 40, 139, 63, 37, 49, 76, 19, 41, 66, 3, 125, 191, 5, 40, 47, 53, 3, 22, 72, 47, 214, 36, 175, 255, 13, + 69, 49, 1, 234, 255, 255, 176, 30, 99, 16, 33, 58, 14, 23, 166, 171, 15, 60, 70, 244, 60, 70, 9, 65, 158, 1, 91, 243, 205, 239, 255, 127, 30, 108, 39, 251, 93, 203, 174, 169, 32, 155, 175, 69, 119, 5, 255, 18, 39, 83, 16, 25, 38, 28, 125, 70, 167, 145, 71, 247, 48, 3, 34, 16, 46, 148, 85, 33, 7, 73, + 30, 156, 159, 30, 160, 143, 50, 87, 255, 237, 0, 55, 255, 93, 83, 0, 10, 31, 196, 27, 43, 16, 98, 41, 63, 203, 30, 211, 219, 28, 209, 189, 113, 226, 16, 0, 13, 24, 87, 39, 138, 69, 159, 247, 208, 3, 10, 87, 23, 48, 164, 32, 168, 34, 79, 7, 24, 183, 7, 86, 107, 138, 5, 87, 208, 15, 255, 9, 13, 27, + 20, 159, 87, 243, 143, 153, 251, 175, 95, 112, 3, 176, 29, 155, 179, 255, 255, 228, 186, 222, 17, 212, 255, 255, 226, 31, 159, 96, 31, 163, 161, 194, 45, 151, 128, 26, 108, 42, 78, 15, 255, 7, 79, 4, 6, 106, 31, 163, 8, 255, 75, 19, 12, 31, 175, 13, 31, 179, 140, 15, 112, 3, 47, 192, 26, 104, 0, 251, 90, 59, + 25, 226, 209, 0, 246, 31, 212, 245, 80, 3, 15, 223, 46, 18, 162, 177, 117, 25, 151, 255, 0, 46, 27, 243, 2, 40, 215, 4, 189, 156, 207, 255, 78, 255, 185, 157, 119, 59, 159, 245, 239, 236, 112, 95, 31, 255, 37, 126, 159, 112, 74, 82, 139, 128, 86, 231, 22, 235, 84, 183, 163, 223, 147, 43, 42, 49, 71, 27, 55, 1, + 164, 51, 13, 23, 122, 14, 23, 34, 210, 15, 160, 64, 3, 13, 183, 125, 104, 255, 244, 66, 99, 202, 222, 243, 223, 255, 98, 95, 3, 112, 3, 221, 225, 227, 164, 16, 83, 159, 48, 153, 147, 15, 255, 24, 63, 87, 247, 41, 255, 149, 31, 80, 3, 128, 191, 241, 19, 24, 243, 17, 55, 243, 53, 28, 120, 25, 170, 61, 246, 223, + 255, 250, 42, 127, 229, 89, 43, 81, 16, 51, 35, 191, 80, 220, 212, 58, 91, 13, 39, 95, 251, 60, 79, 78, 175, 178, 47, 239, 255, 151, 137, 180, 190, 173, 26, 54, 119, 136, 193, 3, 106, 240, 90, 223, 198, 253, 48, 15, 240, 255, 15, 255, 255, 15, 255, 4, 51, 17, 60, 11, 148, 1, 85, 175, 45, 16, 10, 197, 63, 32, + 87, 219, 39, 231, 153, 160, 87, 235, 127, 255, 66, 16, 31, 118, 37, 134, 255, 89, 29, 242, 255, 29, 45, 255, 16, 21, 234, 159, 1, 1, 250, 32, 0, 10, 239, 176, 28, 11, 240, 30, 15, 170, 246, 30, 19, 252, 23, 34, 255, 221, 234, 255, 91, 195, 86, 39, 3, 95, 31, 62, 47, 111, 255, 70, 16, 79, 243, 100, 171, 75, + 255, 241, 14, 227, 3, 43, 67, 159, 27, 74, 91, 175, 123, 95, 225, 21, 119, 81, 42, 175, 160, 250, 102, 172, 175, 23, 134, 4, 175, 255, 178, 0, 80, 99, 21, 96, 21, 32, 186, 23, 26, 222, 138, 108, 95, 255, 79, 85, 163, 3, 189, 79, 111, 255, 53, 103, 119, 101, 175, 255, 202, 229, 149, 85, 88, 43, 239, 168, 31, 254, + 39, 255, 253, 41, 23, 255, 28, 12, 239, 23, 103, 30, 47, 176, 15, 166, 8, 7, 22, 88, 15, 112, 192, 29, 138, 255, 29, 70, 255, 159, 80, 192, 34, 40, 71, 111, 255, 81, 47, 115, 16, 192, 70, 127, 246, 28, 173, 229, 255, 32, 4, 208, 192, 15, 255, 3, 12, 31, 231, 15, 42, 65, 176, 22, 214, 239, 29, 175, 159, 28, + 234, 79, 30, 222, 165, 13, 31, 254, 9, 33, 98, 31, 227, 4, 29, 34, 11, 94, 30, 235, 47, 31, 79, 175, 255, 96, 2, 24, 53, 126, 16, 56, 242, 127, 255, 239, 255, 255, 42, 23, 187, 80, 48, 3, 239, 255, 112, 24, 40, 128, 250, 255, 95, 255, 144, 242, 63, 255, 160, 176, 169, 63, 24, 169, 95, 48, 87, 255, 31, 80, + 71, 247, 127, 117, 16, 95, 143, 255, 61, 31, 70, 54, 31, 74, 48, 42, 37, 247, 17, 198, 14, 30, 206, 12, 18, 45, 11, 24, 219, 95, 46, 243, 9, 21, 47, 9, 223, 255, 192, 10, 68, 56, 87, 244, 95, 3, 232, 3, 53, 108, 191, 69, 251, 47, 184, 144, 12, 29, 201, 104, 196, 14, 31, 57, 26, 11, 46, 151, 7, 131, + 10, 170, 111, 24, 239, 13, 30, 0, 8, 26, 234, 5, 24, 62, 146, 3, 88, 174, 32, 15, 30, 46, 24, 73, 147, 31, 144, 3, 143, 15, 160, 3, 34, 131, 80, 3, 24, 255, 242, 90, 63, 79, 162, 23, 248, 255, 247, 255, 251, 255, 245, 233, 183, 16, 12, 30, 180, 79, 25, 83, 33, 243, 255, 170, 254, 18, 83, 228, 23, 203, + 32, 182, 135, 191, 73, 231, 162, 8, 87, 255, 14, 87, 255, 38, 23, 27, 132, 226, 66, 247, 154, 253, 86, 11, 31, 6, 0, 243, 87, 255, 251, 0, 192, 16, 153, 247, 15, 255, 14, 19, 179, 4, 6, 59, 146, 43, 58, 247, 53, 27, 246, 24, 93, 2, 65, 159, 31, 255, 33, 227, 249, 93, 25, 251, 208, 17, 35, 32, 0, 55, + 206, 192, 48, 149, 63, 31, 157, 64, 3, 240, 23, 34, 240, 31, 235, 241, 233, 0, 2, 17, 137, 90, 191, 22, 149, 96, 3, 223, 79, 26, 25, 189, 42, 29, 143, 255, 79, 255, 250, 13, 150, 9, 31, 252, 56, 131, 30, 104, 131, 3, 118, 183, 255, 82, 42, 95, 224, 67, 255, 249, 91, 107, 127, 255, 6, 111, 159, 99, 35, 147, + 4, 239, 95, 71, 127, 224, 27, 114, 1, 253, 235, 133, 86, 159, 111, 255, 223, 31, 168, 2, 87, 169, 118, 112, 224, 207, 26, 188, 255, 31, 160, 44, 233, 255, 84, 24, 128, 196, 15, 94, 0, 13, 144, 3, 11, 80, 3, 8, 159, 0, 100, 82, 159, 253, 214, 15, 159, 30, 41, 255, 0, 32, 183, 36, 75, 134, 4, 239, 221, 57, + 87, 16, 192, 81, 135, 255, 7, 16, 192, 247, 0, 2, 87, 175, 125, 86, 207, 255, 241, 75, 27, 86, 112, 29, 145, 20, 91, 80, 28, 91, 166, 16, 93, 41, 168, 108, 33, 83, 41, 239, 254, 15, 255, 2, 144, 27, 85, 191, 15, 255, 255, 15, 255, 163, 5, 181, 15, 255, 52, 19, 86, 151, 4, 26, 101, 29, 174, 255, 21, 221, + 255, 0, 239, 246, 233, 117, 0, 36, 143, 159, 119, 117, 30, 179, 237, 255, 255, 197, 111, 255, 67, 70, 45, 23, 6, 82, 253, 95, 160, 92, 163, 253, 90, 151, 222, 109, 142, 61, 59, 83, 40, 91, 63, 29, 171, 175, 39, 201, 79, 255, 37, 119, 168, 99, 45, 51, 212, 108, 105, 114, 22, 48, 37, 157, 13, 51, 2, 78, 32, 52, + 240, 80, 7, 191, 223, 8, 205, 221, 37, 50, 51, 48, 3, 20, 84, 0, 2, 40, 211, 126, 233, 17, 239, 125, 171, 68, 255, 254, 221, 143, 255, 136, 193, 50, 85, 93, 95, 249, 93, 107, 217, 15, 90, 0, 70, 78, 243, 4, 74, 93, 171, 15, 94, 7, 151, 223, 112, 75, 131, 252, 93, 163, 186, 240, 223, 158, 88, 172, 144, 30, + 254, 208, 30, 61, 74, 37, 42, 242, 63, 103, 159, 137, 35, 140, 11, 11, 92, 15, 74, 129, 95, 66, 92, 11, 96, 159, 252, 225, 95, 85, 29, 116, 234, 223, 254, 128, 31, 207, 128, 31, 114, 64, 41, 186, 197, 14, 255, 54, 33, 2, 62, 13, 31, 228, 5, 54, 252, 251, 41, 48, 3, 38, 12, 7, 48, 3, 250, 31, 83, 55, + 150, 0, 243, 4, 223, 255, 1, 24, 80, 21, 158, 248, 159, 244, 255, 251, 48, 191, 21, 40, 127, 31, 148, 25, 231, 206, 177, 253, 94, 143, 4, 79, 7, 239, 255, 64, 31, 20, 140, 161, 30, 2, 94, 99, 46, 11, 1, 124, 143, 151, 53, 239, 214, 123, 182, 45, 39, 251, 20, 191, 255, 254, 20, 203, 236, 255, 251, 22, 32, 47, + 2, 223, 46, 86, 15, 194, 3, 145, 112, 234, 127, 15, 232, 5, 95, 49, 111, 65, 115, 160, 3, 63, 42, 80, 3, 15, 255, 20, 207, 86, 99, 255, 80, 3, 239, 80, 19, 170, 143, 50, 192, 128, 88, 99, 64, 94, 99, 64, 80, 19, 65, 43, 31, 13, 26, 234, 40, 3, 39, 91, 40, 11, 40, 150, 31, 38, 30, 200, 34, 3, + 191, 50, 254, 34, 79, 1, 255, 66, 91, 178, 0, 37, 215, 111, 0, 74, 247, 47, 7, 8, 61, 215, 170, 64, 58, 251, 1, 22, 159, 7, 23, 109, 13, 26, 247, 191, 95, 27, 65, 223, 255, 251, 6, 255, 79, 80, 31, 32, 175, 27, 82, 255, 22, 188, 25, 138, 26, 95, 90, 191, 21, 87, 47, 14, 238, 15, 33, 227, 9, 112, + 3, 248, 30, 134, 247, 245, 0, 2, 52, 82, 150, 95, 254, 76, 7, 127, 74, 103, 95, 28, 175, 221, 39, 204, 250, 47, 167, 227, 71, 63, 186, 250, 9, 111, 2, 8, 152, 119, 60, 75, 8, 92, 87, 239, 0, 19, 51, 143, 227, 175, 255, 120, 173, 126, 126, 221, 247, 255, 254, 183, 16, 49, 159, 255, 75, 99, 231, 80, 14, 214, + 37, 65, 231, 241, 112, 3, 47, 253, 148, 209, 15, 255, 33, 41, 151, 3, 111, 155, 1, 175, 226, 27, 193, 243, 6, 255, 146, 19, 120, 95, 43, 155, 0, 70, 146, 118, 121, 36, 59, 143, 254, 90, 195, 31, 251, 162, 9, 130, 1, 114, 15, 177, 10, 255, 255, 110, 56, 179, 27, 70, 255, 27, 170, 189, 253, 19, 18, 193, 0, 5, + 116, 127, 228, 253, 15, 90, 19, 7, 207, 255, 15, 255, 255, 15, 255, 14, 49, 0, 11, 239, 149, 246, 31, 187, 68, 167, 11, 52, 22, 250, 14, 62, 12, 44, 176, 168, 221, 90, 110, 201, 37, 19, 35, 211, 23, 42, 85, 47, 126, 127, 225, 65, 96, 0, 92, 250, 240, 27, 236, 238, 192, 1, 239, 27, 106, 111, 255, 112, 60, 239, + 117, 167, 130, 1, 239, 48, 30, 2, 192, 30, 132, 245, 97, 30, 188, 254, 46, 176, 63, 53, 103, 31, 62, 60, 247, 208, 108, 236, 7, 0, 0, 20, 83, 42, 253, 61, 188, 60, 15, 138, 95, 93, 79, 6, 55, 0, 30, 211, 4, 20, 179, 30, 22, 153, 153, 191, 123, 71, 28, 177, 11, 229, 47, 221, 37, 71, 244, 100, 31, 255, + 112, 0, 38, 253, 11, 38, 206, 8, 55, 242, 33, 54, 234, 254, 0, 2, 70, 222, 48, 29, 139, 96, 31, 159, 170, 128, 31, 179, 192, 31, 183, 242, 31, 171, 243, 29, 159, 43, 46, 196, 33, 150, 247, 21, 198, 248, 23, 251, 251, 47, 149, 255, 95, 48, 45, 131, 10, 31, 127, 13, 30, 68, 47, 86, 31, 173, 111, 54, 220, 176, + 26, 71, 80, 64, 69, 55, 162, 159, 31, 169, 14, 45, 173, 93, 79, 28, 191, 7, 61, 179, 82, 31, 48, 246, 31, 52, 144, 31, 52, 31, 35, 226, 31, 39, 175, 224, 31, 43, 249, 46, 119, 48, 254, 239, 255, 19, 249, 226, 14, 193, 2, 80, 95, 30, 38, 205, 253, 63, 208, 7, 47, 31, 139, 32, 169, 207, 109, 255, 253, 79, + 223, 255, 239, 245, 2, 143, 30, 81, 175, 255, 176, 255, 162, 176, 79, 91, 243, 88, 83, 1, 138, 106, 31, 226, 127, 72, 11, 158, 8, 86, 115, 26, 99, 21, 119, 65, 76, 170, 183, 255, 196, 0, 76, 251, 0, 2, 140, 241, 92, 31, 236, 192, 49, 67, 0, 0, 179, 90, 15, 32, 195, 132, 176, 87, 143, 11, 127, 4, 14, 155, + 1, 47, 175, 12, 27, 231, 63, 71, 102, 35, 179, 45, 255, 90, 235, 63, 255, 143, 255, 25, 184, 169, 254, 31, 253, 248, 17, 237, 224, 17, 228, 31, 205, 64, 87, 150, 179, 40, 27, 198, 223, 26, 11, 255, 255, 225, 46, 70, 235, 31, 3, 118, 143, 253, 0, 0, 2, 31, 155, 59, 26, 40, 25, 70, 251, 0, 27, 16, 36, 0, + 110, 190, 48, 175, 255, 244, 95, 255, 247, 128, 22, 216, 53, 50, 71, 57, 107, 31, 163, 239, 130, 16, 80, 215, 176, 73, 14, 179, 34, 191, 31, 220, 32, 3, 159, 31, 221, 41, 174, 111, 210, 254, 208, 14, 250, 124, 15, 91, 243, 43, 239, 2, 41, 95, 171, 61, 175, 255, 192, 28, 15, 243, 29, 40, 255, 206, 94, 61, 121, 174, + 31, 231, 12, 54, 118, 32, 120, 51, 18, 44, 111, 41, 231, 16, 229, 0, 45, 77, 45, 81, 32, 15, 219, 255, 102, 15, 255, 42, 221, 221, 214, 199, 208, 29, 221, 221, 47, 19, 78, 15, 255, 6, 208, 14, 7, 1, 9, 170, 130, 5, 120, 146, 31, 58, 163, 243, 27, 234, 243, 31, 58, 128, 3, 10, 86, 184, 1, 118, 20, 75, + 195, 224, 3, 79, 255, 84, 92, 199, 249, 208, 3, 6, 7, 101, 166, 15, 31, 247, 79, 94, 11, 69, 70, 103, 99, 30, 137, 215, 255, 229, 31, 27, 244, 31, 31, 241, 255, 247, 199, 88, 192, 35, 243, 11, 246, 46, 17, 235, 2, 8, 255, 213, 247, 191, 23, 37, 255, 80, 3, 229, 23, 49, 64, 162, 6, 23, 143, 5, 31, 227, + 16, 118, 31, 190, 211, 55, 143, 85, 31, 151, 208, 25, 182, 243, 30, 149, 246, 30, 182, 247, 76, 29, 203, 246, 15, 130, 17, 28, 223, 4, 223, 58, 23, 45, 251, 174, 31, 24, 112, 127, 23, 117, 207, 255, 32, 46, 172, 219, 103, 98, 47, 85, 214, 0, 71, 255, 245, 0, 202, 49, 73, 5, 158, 31, 29, 143, 1, 31, 55, 46, + 74, 115, 171, 6, 30, 175, 11, 31, 100, 14, 31, 1, 15, 255, 245, 224, 87, 117, 19, 30, 92, 253, 30, 96, 254, 118, 62, 94, 97, 3, 101, 31, 207, 6, 255, 72, 127, 33, 42, 229, 65, 243, 247, 0, 3, 5, 102, 197, 79, 151, 32, 55, 31, 62, 86, 167, 58, 223, 252, 1, 71, 117, 16, 21, 157, 191, 251, 62, 193, 251, + 157, 255, 249, 16, 7, 253, 255, 144, 5, 191, 255, 139, 29, 171, 223, 230, 255, 253, 100, 102, 191, 31, 142, 0, 246, 80, 3, 170, 224, 202, 187, 127, 71, 247, 9, 31, 91, 11, 48, 147, 33, 31, 148, 42, 151, 47, 55, 157, 37, 219, 26, 180, 31, 33, 80, 117, 112, 3, 199, 119, 32, 40, 183, 255, 6, 201, 49, 5, 236, 255, + 246, 16, 16, 3, 251, 5, 17, 35, 27, 114, 251, 255, 3, 253, 215, 107, 191, 190, 12, 255, 250, 244, 102, 207, 255, 224, 31, 161, 96, 41, 151, 231, 239, 235, 64, 15, 137, 28, 46, 252, 223, 255, 162, 15, 28, 22, 72, 7, 55, 227, 136, 95, 0, 0, 17, 0, 215, 0, 73, 40, 63, 254, 82, 99, 214, 0, 119, 161, 82, 15, + 236, 25, 14, 26, 159, 42, 123, 56, 63, 44, 123, 6, 95, 39, 67, 4, 143, 228, 47, 255, 48, 4, 239, 121, 153, 65, 197, 255, 119, 98, 44, 43, 79, 255, 245, 85, 0, 3, 1, 49, 191, 255, 239, 31, 98, 191, 92, 79, 10, 95, 44, 207, 126, 175, 255, 63, 233, 64, 62, 98, 108, 26, 203, 254, 205, 121, 164, 213, 54, 16, + 96, 111, 255, 138, 177, 89, 155, 34, 95, 3, 174, 5, 15, 91, 19, 11, 35, 142, 68, 91, 35, 1, 127, 255, 22, 60, 25, 161, 0, 37, 138, 35, 109, 113, 25, 106, 0, 66, 16, 15, 236, 255, 15, 255, 255, 14, 185, 127, 87, 212, 153, 32, 30, 19, 48, 29, 115, 48, 30, 91, 128, 3, 125, 8, 193, 56, 113, 0, 0, 207, + 254, 30, 208, 255, 124, 27, 74, 255, 0, 1, 223, 254, 64, 19, 207, 255, 152, 96, 93, 231, 3, 66, 32, 41, 135, 19, 237, 62, 179, 68, 11, 43, 96, 3, 128, 87, 208, 208, 3, 192, 11, 135, 147, 3, 103, 150, 0, 21, 31, 31, 235, 255, 31, 255, 255, 9, 29, 225, 143, 13, 31, 242, 23, 58, 23, 66, 240, 0, 98, 20, + 253, 87, 48, 255, 239, 255, 112, 30, 6, 144, 253, 255, 95, 255, 160, 5, 31, 31, 49, 31, 83, 31, 151, 63, 24, 11, 159, 31, 172, 15, 160, 14, 159, 255, 170, 80, 30, 68, 124, 23, 243, 255, 144, 3, 244, 24, 71, 189, 224, 21, 82, 176, 38, 118, 48, 39, 251, 32, 56, 31, 239, 38, 99, 247, 133, 109, 24, 120, 16, 136, + 21, 119, 34, 94, 143, 15, 148, 17, 4, 30, 91, 22, 192, 80, 3, 252, 31, 22, 138, 251, 112, 3, 15, 211, 47, 37, 247, 111, 31, 147, 127, 208, 3, 100, 38, 107, 159, 255, 110, 151, 110, 159, 144, 208, 3, 10, 151, 17, 169, 51, 71, 247, 10, 94, 3, 9, 95, 255, 47, 219, 7, 250, 255, 81, 22, 117, 16, 24, 189, 247, + 127, 255, 211, 181, 127, 31, 113, 8, 48, 240, 32, 244, 0, 71, 254, 98, 0, 28, 255, 255, 177, 223, 25, 64, 74, 62, 33, 119, 30, 33, 30, 244, 247, 31, 112, 247, 71, 107, 75, 127, 255, 48, 146, 255, 96, 3, 11, 16, 45, 5, 255, 199, 255, 235, 46, 98, 25, 18, 31, 255, 4, 119, 0, 186, 4, 30, 65, 12, 252, 134, + 25, 171, 255, 16, 27, 207, 240, 207, 16, 3, 24, 225, 240, 253, 72, 255, 234, 240, 64, 12, 65, 183, 106, 56, 15, 253, 1, 62, 18, 174, 144, 112, 3, 79, 31, 139, 63, 253, 160, 216, 32, 129, 255, 80, 3, 24, 40, 32, 80, 45, 111, 11, 45, 26, 25, 194, 9, 125, 112, 3, 248, 0, 9, 222, 247, 15, 223, 60, 159, 53, + 89, 239, 96, 7, 173, 223, 175, 255, 144, 209, 79, 112, 2, 9, 129, 33, 128, 3, 60, 159, 177, 84, 97, 231, 34, 212, 253, 26, 179, 234, 221, 0, 6, 176, 127, 247, 21, 80, 247, 24, 159, 175, 246, 24, 163, 245, 26, 255, 245, 0, 205, 222, 81, 175, 254, 80, 80, 3, 48, 81, 255, 248, 58, 19, 247, 0, 239, 2, 123, 239, + 9, 190, 7, 255, 210, 0, 254, 135, 182, 8, 111, 255, 9, 128, 255, 10, 145, 255, 11, 162, 149, 1, 51, 81, 252, 5, 11, 255, 247, 223, 11, 55, 251, 48, 3, 166, 230, 25, 66, 48, 28, 209, 31, 33, 252, 0, 23, 158, 46, 31, 166, 39, 163, 225, 31, 167, 249, 0, 92, 37, 243, 166, 255, 94, 254, 239, 7, 158, 19, 31, + 255, 5, 223, 63, 51, 89, 38, 95, 47, 54, 154, 112, 0, 41, 158, 31, 243, 103, 171, 99, 47, 255, 212, 46, 223, 64, 31, 161, 225, 0, 167, 62, 22, 186, 4, 24, 3, 7, 255, 22, 1, 35, 48, 82, 31, 239, 243, 31, 243, 255, 48, 3, 41, 251, 9, 30, 116, 188, 9, 23, 2, 9, 255, 245, 3, 16, 96, 23, 27, 166, + 211, 110, 0, 195, 55, 203, 39, 95, 4, 255, 79, 207, 41, 135, 27, 47, 78, 243, 95, 167, 247, 95, 175, 95, 255, 26, 37, 29, 146, 21, 247, 12, 94, 7, 46, 15, 239, 54, 175, 21, 231, 118, 32, 51, 24, 191, 94, 96, 254, 239, 230, 227, 35, 151, 239, 21, 115, 46, 227, 31, 203, 2, 255, 147, 33, 47, 2, 33, 67, 16, + 0, 3, 1, 63, 255, 2, 85, 31, 135, 247, 199, 251, 40, 3, 113, 0, 21, 0, 243, 254, 6, 255, 16, 243, 127, 255, 128, 24, 4, 255, 241, 254, 255, 249, 32, 255, 254, 48, 85, 78, 15, 112, 15, 255, 48, 6, 120, 73, 251, 31, 66, 252, 73, 31, 70, 219, 15, 191, 0, 31, 94, 1, 48, 3, 16, 35, 221, 186, 218, 15, + 255, 32, 207, 255, 161, 31, 62, 255, 31, 167, 83, 31, 255, 110, 47, 255, 54, 136, 254, 31, 248, 60, 255, 169, 250, 31, 251, 243, 31, 255, 128, 31, 62, 15, 255, 28, 7, 74, 31, 25, 7, 24, 238, 34, 176, 6, 27, 251, 5, 24, 15, 158, 5, 24, 254, 32, 3, 4, 255, 249, 16, 17, 179, 239, 250, 102, 207, 111, 255, 249, + 123, 239, 234, 168, 64, 175, 222, 244, 31, 255, 224, 92, 23, 15, 158, 4, 42, 135, 205, 175, 255, 75, 251, 41, 151, 0, 110, 175, 255, 32, 115, 25, 183, 210, 1, 159, 127, 252, 19, 35, 255, 71, 194, 116, 1, 28, 39, 64, 3, 82, 8, 176, 3, 253, 144, 3, 89, 73, 231, 6, 152, 3, 5, 254, 185, 29, 56, 3, 0, 212, + 0, 248, 82, 147, 214, 15, 250, 254, 3, 25, 255, 32, 3, 235, 0, 49, 16, 15, 255, 100, 2, 89, 183, 1, 121, 42, 15, 255, 2, 97, 235, 152, 9, 66, 243, 2, 45, 79, 254, 77, 59, 74, 35, 83, 207, 253, 223, 45, 63, 128, 90, 183, 32, 10, 118, 255, 121, 8, 1, 67, 70, 0, 3, 191, 63, 155, 46, 7, 12, 122, + 31, 154, 15, 255, 248, 65, 40, 15, 1, 30, 19, 215, 119, 97, 45, 161, 112, 31, 163, 243, 0, 156, 94, 30, 85, 0, 32, 3, 139, 228, 0, 217, 88, 23, 85, 15, 255, 15, 123, 31, 247, 159, 80, 3, 92, 31, 219, 5, 78, 29, 163, 6, 53, 175, 37, 179, 246, 255, 241, 30, 1, 219, 242, 0, 54, 207, 119, 113, 15, 173, + 33, 5, 153, 159, 147, 31, 58, 39, 255, 241, 0, 13, 255, 240, 221, 0, 14, 30, 159, 15, 255, 208, 112, 3, 2, 210, 153, 184, 29, 86, 253, 48, 3, 70, 196, 254, 29, 102, 137, 255, 24, 99, 94, 239, 15, 164, 15, 37, 71, 239, 38, 3, 111, 107, 86, 7, 15, 255, 72, 11, 8, 23, 214, 5, 48, 250, 80, 0, 15, 254, + 128, 30, 220, 160, 31, 115, 175, 208, 25, 20, 240, 16, 91, 243, 10, 255, 250, 220, 247, 15, 39, 165, 0, 0, 179, 31, 255, 16, 226, 218, 0, 192, 6, 103, 3, 1, 36, 72, 87, 11, 95, 255, 222, 4, 100, 175, 179, 86, 119, 119, 80, 40, 88, 123, 72, 94, 255, 255, 32, 6, 31, 254, 79, 255, 189, 244, 31, 179, 64, 127, + 255, 228, 127, 222, 96, 48, 6, 195, 11, 10, 0, 10, 72, 191, 78, 230, 31, 119, 18, 3, 62, 15, 238, 21, 119, 119, 143, 157, 225, 0, 59, 30, 93, 175, 239, 30, 97, 255, 17, 86, 255, 251, 16, 0, 168, 84, 5, 105, 26, 7, 31, 147, 5, 31, 219, 55, 10, 39, 71, 169, 28, 42, 52, 71, 175, 227, 103, 19, 240, 17, + 177, 0, 42, 17, 189, 56, 215, 116, 15, 255, 26, 14, 18, 65, 11, 50, 87, 111, 87, 167, 6, 206, 191, 255, 30, 255, 255, 120, 191, 223, 89, 253, 254, 223, 255, 253, 145, 121, 161, 153, 175, 255, 16, 0, 3, 1, 230, 96, 40, 4, 31, 243, 175, 87, 31, 247, 79, 31, 251, 8, 175, 255, 250, 111, 255, 249, 192, 255, 239, 255, + 64, 26, 3, 51, 35, 255, 250, 255, 96, 0, 55, 97, 15, 47, 27, 11, 31, 247, 83, 31, 211, 14, 31, 255, 13, 82, 7, 159, 127, 253, 32, 251, 0, 255, 232, 137, 189, 106, 191, 253, 221, 210, 221, 220, 239, 194, 192, 90, 187, 40, 199, 176, 15, 170, 255, 28, 15, 255, 255, 15, 255, 6, 18, 215, 1, 207, 0, 29, 128, 26, + 235, 85, 29, 228, 9, 123, 39, 71, 108, 195, 225, 30, 11, 162, 231, 0, 0, 113, 15, 255, 255, 11, 148, 171, 20, 0, 0, 198, 43, 255, 61, 59, 21, 251, 28, 177, 145, 9, 31, 231, 255, 13, 255, 248, 191, 15, 255, 205, 255, 215, 119, 81, 47, 238, 177, 31, 255, 253, 0, 185, 189, 239, 20, 220, 143, 255, 96, 92, 31, 94, + 255, 252, 255, 210, 0, 255, 230, 64, 9, 161, 255, 13, 158, 158, 255, 14, 255, 212, 254, 11, 255, 245, 32, 13, 41, 251, 24, 230, 25, 19, 46, 239, 3, 103, 111, 255, 164, 189, 3, 30, 125, 127, 255, 192, 207, 63, 155, 249, 112, 25, 243, 80, 0, 117, 11, 152, 255, 12, 168, 255, 13, 185, 255, 15, 254, 134, 245, 67, 87, 68, + 72, 31, 255, 172, 31, 255, 50, 127, 47, 255, 9, 0, 9, 1, 5, 7, 0, 255, 4, 4, 0, 5, 5, 0, 20, 20, 239, 0, 18, 18, 32, 2, 19, 19, 0, 15, 143, 15, 32, 2, 16, 8, 16, 17, 6, 6, 0, 17, 254, 17, 0, 14, 14, 0, 23, 23, 80, 29, 12, 16, 38, 16, 44, 112, 38, 64, 53, 24, 24, 32, + 38, 16, 59, 193, 13, 13, 32, 44, 16, 65, 16, 8, 16, 71, 16, 56, 11, 128, 11, 32, 62, 16, 65, 16, 74, 64, 104, 112, 35, 16, 104, 16, 29, 108, 16, 50, 10, 10, 80, 35, 12, 12, 32, 107, 16, 171, 239, 77, 65, 80, 31, 255, 188, 0, 39, 0, 234, 122, 0, 1, 47, 255, 89, 29, 223, 255, 144, 0, 47, 45, + 217, 0, 1, 16, 0, 16, 220, 0, 6, 0, 7, 116, 27, 201, 9, 0, 10, 27, 127, 12, 30, 163, 16, 162, 217, 0, 15, 28, 14, 17, 0, 16, 238, 23, 19, 21, 255, 0, 22, 0, 23, 0, 24, 0, 25, 245, 0, 26, 0, 27, 144, 97, 28, 30, 207, 29, 255, 0, 30, 0, 31, 0, 32, 0, 33, 255, 0, 34, 0, 35, + 0, 36, 0, 37, 95, 48, 123, 38, 16, 151, 40, 0, 41, 0, 42, 255, 0, 43, 0, 44, 0, 45, 0, 46, 244, 0, 47, 0, 48, 80, 151, 49, 80, 187, 29, 235, 75, 31, 15, 2, 108, 90, 16, 67, 0, 16, 69, 1, 0, 128, 233, 65, 125, 15, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 4, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 4, 224, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 3, 192, 64, 3, 112, 1, 1, 64, 27, 0, 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, 79, 79, 84, 32, + 27, 189, 128, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 15, 109, 64, 79, 2, 128, 64, 81, 226, 226, 16, 19, 27, 90, 80, 15, 160, 64, 26, 207, 45, 16, 39, 41, 16, 127, 190, 32, 96, 19, 255, 255, 0, 46, 2, 128, 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, 3, 10, 46, 0, + 46, 46, 0, 101, 117, 255, 101, 110, 103, 108, 105, 115, 104, 0, 255, 109, 101, 115, 115, 97, 103, 101, 46, 239, 98, 109, 103, 96, 11, 105, 100, 46, 116, 255, 98, 108, 0, 115, 116, 114, 117, 99, 158, 116, 48, 10, 160, 199, 77, 69, 83, 71, 16, 44, 183, 49, 80, 187, 2, 2, 208, 228, 73, 78, 70, 126, 16, 27, 0, 96, + 0, 6, 0, 12, 49, 62, 42, 113, 56, 48, 159, 2, 144, 11, 104, 144, 23, 206, 128, 35, 211, 1, 142, 144, 11, 180, 144, 59, 49, 130, 68, 65, 223, 84, 49, 80, 70, 26, 6, 1, 0, 3, 255, 0, 80, 0, 108, 0, 101, 0, 97, 223, 0, 115, 16, 5, 32, 0, 105, 0, 110, 116, 48, 9, 114, 0, 116, 17, 191, 116, + 16, 99, 32, 21, 238, 83, 0, 85, 16, 39, 69, 0, 82, 17, 211, 239, 77, 0, 65, 16, 7, 73, 0, 79, 0, 235, 10, 0, 71, 16, 11, 76, 16, 15, 88, 0, 170, 89, 17, 237, 71, 16, 69, 109, 48, 69, 68, 16, 71, 228, 115, 0, 99, 17, 44, 0, 101, 92, 84, 80, 175, 0, 137, 0, 186, 32, 16, 141, 111, 0, + 117, 16, 235, 100, 18, 151, 149, 110, 16, 11, 32, 223, 98, 48, 243, 114, 48, 255, 100, 69, 17, 218, 10, 209, 13, 96, 25, 129, 9, 87, 17, 33, 105, 117, 18, 217, 79, 0, 112, 49, 37, 97, 17, 39, 105, 42, 16, 89, 33, 53, 10, 17, 27, 97, 17, 63, 117, 17, 77, 170, 108, 18, 253, 102, 16, 113, 114, 19, 5, 109, + 48, 7, 34, 97, 93, 64, 21, 109, 144, 57, 33, 37, 1, 97, 4, 32, 177, 97, 170, 0, 17, 107, 97, 16, 195, 110, 17, 89, 104, 81, 171, 165, 116, 16, 213, 32, 17, 189, 64, 223, 115, 17, 127, 105, 37, 48, 237, 32, 207, 118, 17, 215, 32, 33, 117, 48, 225, 33, 87, 115, 129, 6, 82, 71, 40, 19, 163, 8, 33, 157, + 223, 67, 98, 50, 251, 4, 0, 6, 4, 56, 212, 56, 178, 83, 7, 0, 211, 175, 8, 82, 123, 35, 51, 171, 3, 19, 219, 24, 19, 223, 4, 147, 199, 43, 67, 255, 79, 77, 77, 69, 78, 84, 0, 68, 253, 73, 83, 67, 95, 48, 49, 80, 7, 50, 127, 80, 15, 51, 0, 84, 73, 84, 76, 69, 251, 95, 77, 65, 73, 78, + 80, 10, 83, 85, 229, 66, 0, 64, 0, 0, 0, 144, 111, 112, 36, 67, 174, 239, 55, 113, 97, 96, 147, 28, 19, 62, 141, 124, 80, 171, 0, 190, 198, 20, 162, 51, 179, 16, 153, 247, 100, 67, 164, 76, 51, 191, 12, 0, 0, 243, 19, 54, 175, 66, 51, 203, 19, 221, 137, 230, 191, 39, 67, 215, 20, 0, 0, 251, 104, 17, + 158, 53, 51, 227, 16, 185, 23, 177, 123, 254, 51, 239, 170, 28, 116, 149, 4, 81, 23, 7, 80, 235, 9, 20, 191, 160, 10, 20, 195, 11, 224, 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 82, 192, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 82, + 192, 243, 0, 0, 0, 32, 16, 3, 16, 7, 81, 224, 42, 64, 3, 112, 1, 1, 80, 27, 3, 16, 35, 64, 80, 3, 231, 128, 0, 3, 32, 22, 16, 57, 79, 79, 84, 115, 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, 67, 212, 246, 17, 0, 0, 18, 64, 79, 81, 220, 32, 87, 250, 255, 255, 0, 46, 2, 128, 96, 16, + 80, 19, 177, 184, 16, 19, 2, 255, 16, 0, 96, 19, 32, 131, 46, 255, 0, 46, 46, 0, 101, 109, 98, 101, 255, 100, 100, 101, 100, 102, 111, 110, 116, 255, 0, 109, 101, 115, 115, 97, 103, 101, 126, 32, 11, 50, 54, 46, 98, 114, 102, 16, 19, 127, 0, 0, 8, 82, 70, 78, 84, 254, 255, 1, 191, 4, 48, 123, 16, 0, + 5, 70, 73, 78, 182, 70, 32, 235, 1, 33, 16, 241, 27, 27, 32, 219, 251, 56, 0, 0, 80, 104, 16, 247, 8, 33, 254, 27, 26, 0, 84, 71, 76, 80, 16, 15, 255, 48, 24, 25, 19, 24, 0, 0, 8, 229, 0, 0, 10, 32, 221, 17, 3, 128, 49, 31, 96, 190, 0, 0, 0, 102, 127, 255, 176, 0, 111, 16, 3, 234, + 95, 255, 160, 16, 3, 144, 48, 3, 63, 16, 7, 127, 0, 0, 179, 2, 118, 0, 0, 159, 255, 0, 191, 11, 18, 25, 143, 255, 255, 4, 255, 255, 255, 223, 13, 255, 252, 11, 127, 255, 243, 165, 4, 98, 32, 228, 34, 55, 18, 161, 255, 18, 169, 255, 171, 244, 18, 67, 251, 34, 71, 16, 146, 166, 4, 190, 233, 0, 0, 6, + 18, 59, 2, 34, 63, 34, 67, 35, 62, 32, 88, 34, 199, 19, 86, 119, 117, 255, 144, 0, 246, 202, 118, 84, 69, 48, 63, 251, 0, 48, 95, 171, 65, 34, 147, 232, 34, 151, 209, 18, 155, 250, 0, 190, 141, 18, 160, 9, 255, 253, 0, 207, 32, 104, 117, 1, 96, 110, 63, 255, 112, 48, 3, 47, 16, 7, 31, 215, 255, 96, + 16, 3, 80, 48, 3, 13, 221, 64, 99, 2, 139, 80, 4, 32, 2, 239, 49, 36, 63, 19, 72, 0, 14, 85, 20, 99, 111, 20, 103, 207, 65, 163, 7, 19, 231, 12, 90, 19, 238, 144, 49, 199, 255, 248, 20, 23, 241, 20, 27, 186, 160, 20, 31, 150, 121, 189, 36, 7, 250, 20, 12, 174, 239, 16, 254, 175, 17, 244, 95, 255, + 240, 17, 2, 255, 244, 0, 14, 255, 251, 128, 239, 255, 212, 255, 224, 20, 39, 240, 20, 43, 241, 84, 159, 96, 3, 127, 244, 130, 255, 253, 22, 223, 255, 253, 175, 239, 255, 255, 253, 18, 88, 253, 111, 255, 255, 205, 254, 41, 16, 91, 52, 131, 0, 239, 32, 7, 254, 255, 80, 0, 254, 129, 0, 0, 234, 97, 94, 36, 151, 128, + 20, 155, 249, 0, 24, 255, 18, 105, 254, 223, 255, 80, 42, 255, 255, 48, 3, 95, 111, 235, 7, 203, 16, 51, 251, 223, 17, 0, 175, 255, 247, 208, 0, 9, 238, 1, 247, 60, 3, 239, 243, 213, 0, 13, 19, 77, 14, 18, 240, 6, 33, 133, 39, 173, 80, 4, 227, 60, 31, 21, 207, 95, 255, 51, 223, 0, 171, 158, 37, 219, + 37, 166, 39, 244, 33, 200, 119, 83, 199, 16, 176, 54, 84, 70, 132, 166, 71, 220, 255, 255, 199, 80, 1, 33, 135, 16, 7, 17, 147, 112, 0, 50, 190, 17, 5, 130, 27, 223, 255, 54, 140, 223, 22, 84, 92, 32, 3, 207, 22, 92, 121, 135, 100, 178, 211, 18, 24, 127, 22, 143, 226, 0, 255, 250, 16, 0, 183, 141, 32, 5, + 77, 180, 0, 197, 255, 7, 180, 84, 59, 0, 22, 53, 0, 250, 0, 191, 255, 0, 10, 24, 225, 95, 22, 64, 157, 223, 22, 80, 25, 88, 20, 119, 100, 24, 243, 255, 186, 251, 102, 131, 251, 134, 140, 36, 88, 60, 169, 47, 73, 36, 104, 250, 41, 27, 25, 13, 246, 73, 136, 147, 11, 1, 234, 53, 0, 74, 20, 173, 127, 25, + 57, 63, 25, 61, 252, 15, 235, 152, 0, 2, 63, 25, 39, 32, 3, 250, 0, 0, 119, 117, 64, 32, 95, 198, 102, 227, 238, 99, 53, 141, 21, 45, 0, 94, 241, 73, 179, 66, 121, 202, 230, 41, 123, 24, 49, 53, 107, 23, 76, 255, 104, 62, 233, 1, 51, 85, 22, 240, 255, 21, 146, 64, 3, 5, 231, 207, 234, 0, 22, 112, + 67, 179, 0, 0, 103, 239, 121, 155, 188, 167, 63, 151, 118, 85, 51, 170, 210, 26, 48, 208, 90, 36, 96, 83, 187, 144, 80, 3, 184, 16, 250, 8, 35, 69, 0, 21, 197, 68, 3, 36, 7, 213, 105, 152, 26, 111, 221, 26, 115, 239, 42, 103, 86, 239, 119, 137, 154, 167, 159, 119, 101, 84, 51, 80, 38, 221, 255, 84, 137, 187, + 25, 145, 23, 5, 64, 187, 24, 241, 165, 33, 9, 132, 16, 11, 41, 49, 26, 186, 255, 88, 27, 103, 249, 0, 58, 255, 255, 9, 84, 3, 23, 227, 101, 213, 255, 252, 22, 115, 176, 74, 229, 117, 21, 229, 255, 215, 254, 112, 26, 151, 208, 26, 155, 64, 0, 106, 180, 235, 88, 57, 1, 18, 5, 255, 15, 3, 16, 48, 40, 43, + 190, 12, 22, 192, 14, 255, 245, 0, 15, 48, 3, 191, 247, 22, 217, 253, 0, 8, 255, 255, 177, 82, 10, 47, 13, 22, 10, 79, 10, 197, 117, 63, 96, 3, 15, 144, 3, 164, 14, 27, 39, 13, 55, 0, 39, 4, 243, 144, 3, 25, 30, 222, 6, 245, 23, 107, 245, 0, 43, 255, 38, 50, 148, 111, 23, 59, 39, 63, 143, 22, + 62, 223, 55, 111, 18, 47, 133, 253, 73, 71, 55, 5, 27, 117, 25, 58, 254, 24, 244, 250, 75, 23, 146, 247, 22, 15, 32, 200, 243, 32, 3, 181, 87, 225, 120, 152, 255, 85, 63, 37, 71, 17, 154, 165, 128, 4, 70, 11, 15, 10, 133, 85, 130, 80, 3, 23, 247, 0, 191, 144, 3, 158, 159, 32, 3, 33, 227, 255, 237, 221, + 221, 121, 159, 74, 32, 11, 144, 129, 235, 44, 135, 211, 144, 223, 211, 7, 32, 0, 76, 28, 47, 11, 81, 15, 97, 31, 13, 255, 67, 139, 26, 73, 245, 16, 91, 205, 249, 27, 60, 244, 27, 60, 243, 233, 0, 93, 203, 41, 209, 247, 28, 236, 16, 254, 0, 43, 33, 157, 24, 75, 242, 28, 115, 243, 28, 119, 245, 169, 231, 207, + 255, 145, 24, 108, 38, 103, 80, 5, 255, 225, 255, 112, 78, 16, 3, 8, 220, 15, 44, 175, 35, 151, 6, 103, 44, 183, 41, 239, 106, 115, 109, 63, 184, 120, 173, 121, 170, 122, 254, 87, 119, 100, 179, 30, 48, 135, 64, 85, 66, 223, 146, 13, 64, 3, 13, 80, 207, 11, 80, 231, 5, 179, 119, 173, 103, 251, 157, 122, 217, 20, + 95, 216, 32, 135, 101, 216, 177, 24, 210, 48, 239, 8, 200, 7, 14, 255, 252, 58, 52, 175, 18, 200, 0, 0, 77, 45, 123, 54, 173, 199, 239, 85, 87, 172, 171, 58, 252, 119, 117, 66, 84, 189, 230, 249, 30, 56, 252, 91, 112, 132, 14, 0, 4, 33, 231, 133, 143, 67, 143, 48, 3, 201, 159, 41, 239, 176, 64, 3, 254, 146, + 160, 13, 93, 35, 34, 87, 46, 225, 119, 135, 223, 185, 49, 33, 123, 39, 251, 4, 156, 239, 236, 0, 31, 0, 255, 112, 126, 30, 115, 128, 253, 159, 255, 144, 112, 45, 87, 199, 37, 84, 8, 5, 255, 9, 21, 255, 239, 255, 17, 52, 48, 84, 28, 164, 144, 30, 194, 176, 30, 191, 176, 31, 171, 37, 116, 148, 208, 60, 180, 79, + 255, 37, 82, 255, 143, 100, 247, 84, 255, 177, 175, 47, 255, 67, 32, 131, 3, 60, 255, 212, 255, 0, 234, 17, 19, 32, 24, 86, 144, 24, 90, 176, 48, 3, 172, 175, 28, 15, 159, 31, 9, 159, 255, 103, 130, 12, 3, 45, 202, 69, 82, 28, 3, 37, 247, 249, 29, 146, 249, 31, 135, 85, 32, 3, 250, 31, 4, 251, 159, 255, + 45, 44, 44, 0, 237, 0, 78, 255, 37, 86, 0, 79, 63, 167, 246, 90, 104, 187, 248, 85, 79, 255, 227, 20, 15, 16, 72, 11, 65, 159, 255, 83, 39, 41, 30, 6, 61, 243, 70, 199, 40, 191, 111, 130, 255, 111, 223, 53, 3, 36, 207, 85, 159, 47, 121, 240, 14, 107, 36, 84, 47, 211, 6, 31, 255, 10, 31, 255, 12, 47, + 255, 38, 177, 138, 239, 56, 239, 41, 39, 39, 231, 160, 87, 235, 241, 111, 223, 164, 66, 64, 159, 7, 86, 59, 40, 251, 143, 94, 33, 72, 207, 165, 253, 84, 227, 255, 89, 163, 30, 33, 0, 62, 29, 79, 252, 255, 240, 4, 159, 255, 252, 40, 91, 23, 239, 185, 255, 25, 66, 255, 3, 127, 87, 67, 33, 83, 0, 252, 17, 191, + 222, 255, 251, 191, 21, 58, 16, 3, 186, 253, 16, 7, 219, 223, 17, 135, 19, 223, 37, 159, 35, 56, 219, 160, 3, 80, 128, 3, 49, 227, 34, 79, 127, 255, 165, 224, 30, 7, 240, 48, 3, 47, 12, 95, 31, 45, 95, 16, 128, 192, 15, 255, 39, 33, 227, 8, 29, 251, 121, 251, 144, 3, 24, 220, 251, 63, 255, 254, 64, 239, + 17, 212, 255, 254, 54, 26, 47, 26, 152, 255, 252, 42, 55, 248, 0, 29, 75, 202, 228, 23, 38, 251, 15, 255, 9, 161, 63, 255, 143, 75, 19, 10, 16, 49, 45, 141, 79, 121, 143, 129, 224, 31, 192, 176, 90, 59, 169, 112, 90, 75, 80, 80, 3, 128, 15, 124, 13, 95, 156, 15, 85, 31, 255, 47, 31, 255, 95, 86, 103, 175, + 88, 115, 255, 27, 57, 157, 24, 228, 32, 175, 255, 239, 29, 231, 159, 255, 255, 16, 255, 79, 255, 96, 255, 13, 255, 178, 176, 26, 12, 242, 253, 34, 199, 34, 203, 11, 27, 175, 239, 47, 255, 239, 31, 95, 127, 2, 255, 250, 249, 95, 12, 255, 242, 63, 31, 114, 27, 105, 48, 161, 63, 113, 139, 112, 71, 75, 59, 63, 102, 179, + 43, 0, 11, 29, 25, 236, 35, 47, 41, 59, 8, 255, 234, 10, 253, 1, 239, 82, 146, 58, 221, 246, 255, 80, 87, 255, 28, 16, 239, 10, 109, 2, 187, 79, 25, 226, 63, 255, 242, 27, 247, 243, 0, 226, 63, 253, 211, 14, 161, 63, 39, 247, 41, 255, 1, 80, 3, 107, 219, 189, 48, 44, 47, 124, 127, 31, 124, 3, 223, 149, + 96, 75, 87, 191, 255, 254, 43, 155, 225, 67, 11, 245, 73, 8, 103, 3, 223, 95, 251, 44, 79, 4, 43, 239, 188, 147, 249, 237, 120, 155, 239, 172, 91, 103, 119, 200, 193, 240, 34, 154, 223, 0, 252, 4, 6, 84, 87, 105, 31, 201, 127, 251, 26, 223, 166, 249, 27, 1, 247, 27, 141, 29, 87, 55, 65, 232, 127, 186, 249, 29, + 81, 208, 0, 63, 18, 214, 47, 28, 114, 131, 31, 233, 191, 37, 97, 45, 76, 48, 3, 29, 80, 17, 16, 62, 15, 255, 255, 15, 255, 241, 18, 0, 0, 174, 251, 51, 66, 85, 30, 15, 96, 30, 19, 192, 28, 121, 242, 28, 67, 249, 85, 95, 227, 36, 77, 187, 11, 87, 3, 5, 31, 187, 2, 112, 102, 78, 0, 97, 0, 79, + 243, 171, 75, 54, 99, 206, 125, 148, 2, 78, 211, 44, 215, 127, 75, 175, 11, 29, 179, 47, 190, 243, 87, 117, 16, 175, 59, 255, 95, 165, 166, 106, 101, 39, 134, 79, 32, 71, 7, 63, 255, 32, 80, 99, 255, 43, 31, 172, 20, 77, 0, 39, 217, 255, 128, 96, 35, 0, 199, 6, 207, 79, 255, 39, 219, 21, 229, 0, 0, 52, + 55, 53, 63, 79, 159, 118, 82, 175, 255, 169, 85, 85, 181, 142, 31, 204, 1, 255, 159, 232, 232, 45, 79, 209, 42, 64, 57, 36, 49, 239, 31, 176, 207, 13, 62, 4, 9, 79, 155, 149, 3, 99, 175, 48, 192, 2, 16, 192, 127, 208, 192, 254, 32, 91, 137, 45, 48, 251, 41, 35, 38, 127, 16, 192, 29, 178, 24, 126, 154, 251, + 45, 114, 159, 159, 4, 190, 145, 87, 239, 65, 115, 222, 0, 5, 47, 255, 19, 86, 119, 117, 173, 132, 245, 233, 117, 67, 70, 62, 255, 253, 134, 71, 255, 42, 31, 108, 72, 23, 247, 30, 148, 253, 61, 206, 12, 96, 32, 55, 15, 255, 9, 30, 39, 255, 6, 87, 247, 7, 255, 249, 126, 24, 3, 243, 223, 9, 255, 243, 111, 16, + 3, 250, 13, 11, 255, 243, 4, 29, 236, 239, 30, 206, 180, 207, 17, 114, 191, 251, 78, 239, 159, 21, 47, 24, 49, 117, 30, 105, 255, 160, 223, 61, 251, 80, 8, 3, 1, 96, 74, 87, 255, 63, 25, 99, 47, 184, 207, 29, 201, 239, 56, 192, 82, 33, 92, 80, 58, 11, 111, 23, 136, 9, 11, 12, 28, 40, 96, 168, 143, 26, + 42, 95, 24, 62, 63, 26, 142, 24, 174, 48, 15, 162, 239, 30, 24, 255, 40, 196, 30, 193, 128, 3, 0, 224, 3, 191, 223, 24, 235, 4, 255, 16, 1, 143, 255, 207, 37, 175, 79, 162, 45, 72, 127, 255, 179, 255, 196, 91, 113, 72, 167, 25, 4, 49, 243, 226, 29, 191, 30, 199, 168, 178, 255, 159, 63, 89, 75, 207, 89, 79, + 71, 247, 72, 19, 170, 111, 58, 64, 208, 87, 235, 64, 94, 167, 80, 88, 19, 45, 48, 220, 0, 192, 5, 1, 18, 96, 28, 255, 50, 129, 5, 39, 144, 3, 41, 247, 7, 160, 3, 30, 221, 4, 255, 251, 251, 1, 175, 255, 251, 30, 31, 33, 159, 255, 91, 57, 138, 250, 31, 176, 249, 13, 19, 157, 1, 207, 138, 223, 26, 194, + 58, 15, 26, 192, 251, 31, 59, 160, 170, 203, 7, 38, 220, 15, 255, 13, 17, 227, 48, 3, 41, 238, 11, 223, 245, 38, 14, 252, 0, 31, 253, 12, 31, 255, 16, 175, 255, 0, 23, 75, 74, 22, 130, 98, 191, 159, 30, 109, 254, 83, 255, 144, 15, 159, 4, 59, 83, 147, 27, 119, 0, 0, 141, 239, 198, 216, 85, 189, 105, 191, + 159, 37, 119, 100, 16, 214, 223, 0, 98, 28, 41, 0, 250, 81, 95, 15, 162, 1, 106, 139, 191, 80, 3, 52, 8, 159, 0, 88, 255, 221, 96, 15, 159, 34, 14, 39, 247, 43, 231, 151, 78, 15, 159, 3, 144, 192, 125, 42, 79, 37, 122, 255, 43, 91, 191, 95, 191, 247, 75, 175, 213, 31, 203, 234, 97, 93, 47, 175, 217, 31, + 203, 250, 2, 158, 42, 58, 91, 142, 80, 84, 79, 160, 3, 199, 191, 249, 0, 10, 49, 3, 53, 28, 160, 43, 141, 52, 82, 239, 255, 250, 29, 174, 255, 236, 227, 4, 239, 29, 121, 28, 250, 90, 129, 15, 255, 255, 26, 15, 255, 255, 223, 119, 26, 115, 24, 239, 61, 59, 111, 29, 255, 244, 255, 255, 231, 10, 23, 66, 14, 28, + 123, 47, 255, 220, 87, 118, 21, 35, 255, 253, 64, 44, 140, 35, 163, 169, 32, 38, 92, 6, 23, 99, 12, 5, 191, 11, 207, 218, 140, 211, 221, 222, 31, 255, 255, 48, 3, 20, 198, 0, 35, 203, 49, 24, 102, 223, 30, 99, 19, 171, 67, 255, 255, 212, 237, 221, 166, 223, 32, 93, 95, 144, 157, 107, 207, 158, 210, 4, 98, 78, + 247, 79, 93, 171, 94, 7, 9, 40, 7, 75, 79, 255, 231, 24, 180, 27, 131, 8, 20, 74, 5, 96, 49, 219, 99, 47, 234, 138, 201, 71, 79, 77, 221, 79, 107, 223, 181, 255, 100, 48, 18, 52, 79, 75, 223, 94, 11, 159, 20, 95, 251, 32, 111, 72, 155, 128, 144, 159, 192, 139, 247, 47, 203, 223, 0, 5, 19, 179, 13, 255, + 232, 0, 31, 85, 30, 119, 95, 29, 207, 175, 31, 6, 239, 29, 128, 255, 181, 255, 165, 159, 11, 239, 79, 187, 12, 92, 11, 9, 116, 92, 23, 0, 0, 49, 89, 95, 247, 80, 3, 41, 148, 84, 21, 15, 44, 25, 2, 111, 15, 63, 6, 168, 73, 39, 124, 171, 234, 110, 201, 96, 30, 201, 240, 30, 34, 192, 31, 180, 94, 40, + 39, 112, 48, 227, 15, 255, 250, 16, 30, 62, 214, 251, 2, 37, 223, 43, 47, 15, 23, 207, 87, 123, 109, 95, 154, 55, 176, 41, 223, 255, 181, 46, 249, 231, 106, 36, 191, 176, 107, 40, 100, 45, 31, 115, 10, 15, 63, 12, 32, 104, 98, 0, 3, 1, 3, 96, 3, 129, 115, 0, 7, 4, 15, 255, 15, 34, 131, 168, 14, 31, + 217, 15, 31, 40, 15, 30, 99, 34, 180, 34, 151, 170, 8, 25, 33, 3, 15, 223, 3, 1, 89, 87, 11, 31, 175, 160, 111, 41, 227, 191, 89, 235, 40, 150, 56, 15, 90, 65, 55, 220, 50, 17, 181, 66, 91, 10, 255, 77, 171, 58, 247, 223, 95, 171, 171, 63, 19, 33, 10, 29, 151, 31, 22, 159, 127, 253, 42, 56, 111, 27, + 53, 96, 23, 155, 176, 19, 72, 246, 46, 26, 10, 31, 200, 22, 188, 30, 253, 77, 139, 96, 135, 47, 208, 125, 255, 154, 4, 171, 79, 33, 127, 159, 0, 65, 219, 31, 25, 230, 199, 159, 254, 72, 124, 31, 206, 31, 240, 96, 8, 255, 223, 255, 128, 23, 251, 192, 47, 255, 255, 241, 213, 143, 255, 31, 85, 6, 31, 89, 10, 23, + 190, 13, 87, 31, 201, 47, 25, 81, 111, 27, 27, 191, 255, 254, 250, 2, 255, 191, 255, 40, 64, 127, 253, 87, 71, 167, 244, 94, 11, 176, 79, 183, 59, 124, 137, 135, 119, 30, 41, 201, 25, 163, 51, 251, 0, 1, 51, 51, 179, 23, 235, 223, 255, 252, 30, 223, 245, 30, 227, 112, 255, 232, 235, 113, 0, 14, 62, 33, 3, 145, + 239, 243, 119, 41, 2, 74, 112, 3, 221, 14, 156, 34, 41, 151, 63, 111, 155, 25, 239, 223, 239, 249, 33, 57, 175, 158, 250, 4, 103, 100, 18, 207, 63, 23, 133, 42, 195, 245, 92, 99, 15, 162, 1, 13, 132, 167, 31, 7, 255, 1, 80, 87, 26, 86, 208, 45, 255, 252, 16, 209, 0, 87, 200, 165, 64, 2, 193, 17, 168, 47, + 248, 191, 253, 223, 255, 254, 29, 23, 248, 223, 255, 255, 224, 119, 19, 114, 48, 0, 70, 201, 5, 111, 255, 223, 167, 255, 18, 9, 255, 19, 138, 37, 91, 247, 0, 3, 145, 118, 191, 225, 43, 96, 225, 8, 21, 255, 15, 255, 254, 29, 230, 5, 220, 207, 160, 30, 56, 243, 0, 30, 31, 59, 46, 60, 25, 115, 87, 51, 194, 31, + 138, 30, 248, 60, 243, 20, 126, 80, 254, 79, 255, 253, 226, 239, 255, 242, 31, 175, 79, 187, 81, 209, 92, 247, 4, 2, 1, 48, 0, 2, 175, 169, 208, 30, 244, 247, 60, 15, 5, 224, 95, 127, 135, 7, 126, 31, 146, 79, 160, 0, 1, 239, 244, 31, 91, 140, 253, 26, 217, 56, 29, 31, 255, 190, 80, 85, 71, 46, 66, 87, + 27, 7, 255, 30, 148, 251, 10, 233, 141, 1, 87, 116, 105, 5, 46, 21, 5, 120, 71, 243, 10, 87, 247, 160, 3, 0, 215, 0, 146, 31, 230, 243, 0, 3, 2, 2, 103, 99, 42, 11, 236, 48, 48, 99, 239, 86, 111, 223, 70, 231, 127, 77, 179, 168, 46, 47, 50, 249, 31, 178, 192, 30, 75, 25, 19, 29, 232, 148, 255, 17, + 120, 38, 116, 238, 31, 52, 69, 40, 68, 0, 95, 19, 170, 1, 37, 155, 127, 85, 75, 4, 190, 63, 114, 31, 150, 173, 236, 63, 154, 247, 31, 160, 208, 253, 25, 20, 40, 84, 16, 104, 10, 22, 196, 11, 29, 252, 208, 95, 83, 3, 28, 106, 105, 71, 235, 7, 255, 72, 11, 143, 83, 27, 56, 33, 252, 95, 29, 203, 251, 126, + 188, 64, 4, 203, 176, 0, 226, 40, 207, 16, 31, 236, 49, 67, 31, 252, 48, 90, 15, 82, 96, 195, 160, 87, 247, 240, 81, 211, 73, 227, 7, 208, 3, 90, 40, 103, 5, 48, 3, 247, 191, 159, 30, 229, 27, 157, 235, 64, 0, 8, 26, 212, 4, 31, 238, 6, 246, 245, 16, 0, 12, 211, 47, 235, 48, 88, 91, 243, 39, 72, + 179, 51, 31, 246, 71, 239, 14, 241, 15, 223, 255, 248, 191, 9, 25, 211, 1, 191, 254, 16, 0, 6, 171, 227, 7, 94, 2, 241, 23, 94, 251, 27, 75, 251, 0, 202, 1, 250, 1, 138, 63, 33, 227, 9, 30, 195, 8, 52, 118, 187, 237, 14, 187, 60, 13, 221, 221, 15, 241, 10, 221, 221, 22, 0, 31, 12, 97, 32, 75, 239, + 46, 31, 215, 3, 223, 90, 187, 86, 127, 255, 48, 27, 3, 252, 41, 230, 255, 250, 27, 65, 253, 160, 207, 103, 98, 0, 50, 175, 191, 246, 67, 91, 175, 252, 80, 3, 11, 30, 1, 81, 235, 42, 3, 3, 253, 125, 239, 188, 246, 251, 102, 207, 253, 93, 28, 215, 234, 107, 239, 235, 249, 63, 224, 74, 83, 249, 8, 107, 20, 66, + 15, 255, 192, 15, 12, 131, 12, 46, 87, 15, 255, 255, 11, 195, 24, 54, 15, 223, 10, 214, 118, 32, 10, 84, 47, 21, 79, 255, 23, 101, 75, 195, 106, 192, 3, 119, 81, 72, 127, 64, 85, 55, 144, 0, 3, 1, 113, 10, 214, 42, 20, 119, 81, 7, 40, 27, 93, 243, 93, 175, 6, 123, 85, 183, 0, 0, 38, 118, 46, 51, + 254, 80, 94, 31, 27, 64, 31, 31, 16, 255, 117, 140, 63, 163, 189, 246, 11, 115, 77, 3, 103, 98, 20, 15, 127, 10, 87, 79, 7, 56, 19, 77, 57, 211, 45, 251, 1, 255, 255, 179, 186, 7, 30, 60, 12, 255, 242, 31, 78, 208, 31, 82, 166, 224, 30, 59, 96, 71, 255, 31, 27, 20, 157, 239, 73, 126, 14, 13, 18, 26, + 255, 0, 2, 239, 255, 31, 66, 92, 46, 95, 230, 31, 108, 80, 0, 239, 40, 72, 31, 5, 246, 239, 255, 32, 255, 28, 191, 255, 255, 47, 39, 244, 127, 255, 16, 54, 39, 55, 111, 87, 59, 26, 107, 186, 2, 40, 109, 0, 0, 112, 0, 3, 5, 80, 79, 220, 133, 42, 79, 151, 16, 55, 16, 192, 25, 62, 249, 31, 174, 248, + 85, 20, 23, 205, 26, 107, 211, 31, 128, 177, 31, 132, 254, 251, 255, 185, 223, 255, 145, 42, 79, 91, 255, 191, 254, 23, 82, 210, 255, 255, 214, 64, 254, 209, 148, 3, 117, 79, 96, 13, 35, 1, 78, 235, 39, 247, 158, 42, 64, 143, 48, 3, 123, 95, 171, 1, 63, 175, 247, 62, 195, 186, 245, 112, 3, 252, 119, 114, 58, 151, + 253, 95, 204, 74, 8, 95, 21, 111, 79, 255, 41, 251, 13, 31, 234, 15, 31, 238, 163, 14, 31, 242, 11, 33, 25, 38, 93, 40, 5, 95, 253, 242, 48, 5, 31, 242, 24, 132, 30, 178, 63, 31, 198, 214, 159, 250, 43, 72, 112, 75, 11, 255, 160, 95, 215, 167, 192, 88, 11, 224, 79, 235, 7, 34, 15, 255, 250, 32, 69, 27, + 210, 255, 24, 170, 33, 59, 47, 71, 103, 188, 25, 159, 165, 128, 31, 163, 224, 57, 243, 34, 11, 117, 3, 243, 30, 175, 205, 255, 211, 31, 158, 66, 99, 0, 110, 44, 79, 71, 95, 191, 228, 78, 159, 158, 252, 95, 255, 118, 32, 210, 3, 51, 175, 255, 80, 208, 3, 251, 80, 11, 24, 241, 85, 60, 79, 175, 41, 71, 239, 231, + 159, 32, 28, 67, 236, 62, 34, 98, 26, 200, 255, 255, 253, 80, 103, 212, 180, 138, 192, 82, 95, 9, 33, 10, 31, 255, 191, 31, 255, 159, 91, 35, 103, 179, 115, 255, 16, 89, 127, 31, 96, 255, 128, 0, 204, 0, 33, 15, 103, 31, 41, 231, 0, 175, 44, 251, 154, 111, 169, 12, 31, 255, 31, 63, 222, 235, 26, 97, 58, 99, + 253, 251, 72, 4, 119, 64, 12, 29, 136, 95, 252, 210, 134, 106, 138, 20, 240, 65, 231, 48, 7, 224, 82, 3, 165, 96, 66, 127, 210, 15, 243, 255, 15, 255, 131, 2, 15, 255, 10, 123, 238, 239, 254, 182, 15, 255, 78, 5, 121, 146, 31, 109, 164, 243, 30, 125, 243, 30, 125, 160, 3, 245, 0, 155, 11, 14, 125, 24, 149, 87, + 28, 169, 26, 169, 143, 28, 157, 159, 31, 189, 29, 207, 255, 225, 48, 19, 1, 65, 55, 152, 118, 0, 3, 210, 255, 253, 30, 179, 253, 29, 54, 96, 3, 252, 29, 66, 182, 251, 15, 255, 76, 19, 53, 15, 255, 10, 17, 103, 8, 95, 12, 183, 4, 9, 64, 15, 1, 51, 15, 223, 10, 81, 5, 118, 124, 15, 26, 47, 8, 255, + 247, 207, 7, 31, 230, 80, 3, 178, 248, 16, 11, 64, 6, 31, 232, 33, 58, 5, 63, 251, 157, 194, 40, 219, 43, 71, 112, 86, 223, 24, 8, 47, 85, 22, 85, 14, 22, 89, 13, 22, 93, 15, 6, 97, 17, 79, 74, 22, 149, 95, 30, 157, 64, 3, 192, 31, 22, 176, 112, 3, 201, 143, 255, 9, 194, 46, 47, 42, 251, 31, + 154, 96, 3, 249, 69, 48, 3, 8, 62, 84, 64, 3, 15, 255, 47, 191, 86, 91, 159, 74, 94, 7, 143, 95, 219, 47, 223, 95, 40, 189, 113, 31, 255, 105, 61, 162, 251, 87, 39, 41, 143, 48, 240, 96, 3, 207, 235, 255, 251, 16, 31, 193, 192, 31, 197, 243, 247, 255, 127, 255, 246, 160, 11, 255, 247, 112, 162, 9, 80, 3, + 10, 24, 56, 31, 1, 64, 3, 9, 87, 255, 159, 8, 90, 87, 42, 91, 6, 255, 247, 223, 255, 124, 109, 254, 255, 255, 230, 92, 255, 31, 235, 41, 57, 182, 223, 30, 79, 239, 251, 79, 250, 0, 225, 94, 99, 42, 104, 115, 96, 3, 254, 6, 125, 19, 249, 49, 231, 4, 31, 135, 229, 3, 255, 218, 13, 95, 2, 33, 231, 224, + 58, 16, 13, 211, 221, 208, 15, 255, 31, 159, 25, 194, 64, 3, 128, 0, 227, 157, 239, 112, 14, 162, 63, 17, 75, 112, 3, 10, 221, 149, 247, 15, 2, 64, 42, 147, 95, 108, 155, 221, 239, 194, 176, 87, 82, 212, 208, 48, 3, 109, 254, 139, 112, 11, 255, 219, 245, 96, 21, 92, 80, 13, 16, 3, 12, 221, 162, 225, 15, 255, + 8, 3, 80, 3, 207, 255, 33, 227, 251, 26, 216, 186, 252, 26, 220, 219, 0, 3, 240, 127, 253, 90, 107, 66, 42, 115, 218, 14, 232, 255, 15, 249, 255, 15, 255, 60, 6, 125, 46, 18, 6, 222, 11, 221, 0, 54, 6, 222, 46, 2, 85, 113, 15, 224, 11, 21, 116, 15, 160, 76, 20, 103, 118, 8, 227, 30, 5, 39, 146, 31, + 255, 178, 10, 76, 3, 7, 191, 140, 199, 31, 50, 233, 31, 54, 130, 248, 31, 58, 22, 53, 31, 162, 39, 147, 9, 67, 49, 93, 77, 247, 225, 127, 255, 255, 31, 110, 38, 154, 31, 170, 37, 238, 192, 87, 95, 255, 64, 31, 255, 244, 31, 170, 254, 16, 3, 164, 239, 30, 109, 79, 30, 97, 103, 255, 31, 46, 101, 7, 62, 15, + 170, 61, 31, 243, 255, 48, 3, 159, 25, 147, 159, 30, 153, 186, 159, 30, 181, 159, 255, 80, 31, 230, 49, 29, 147, 157, 48, 39, 27, 39, 67, 48, 6, 255, 87, 95, 79, 106, 79, 207, 0, 207, 191, 66, 48, 95, 167, 112, 95, 175, 149, 64, 69, 255, 106, 180, 247, 30, 99, 254, 31, 174, 255, 87, 160, 3, 6, 29, 160, 127, + 29, 152, 255, 255, 241, 253, 0, 255, 249, 32, 0, 254, 29, 171, 243, 40, 13, 243, 16, 175, 185, 59, 71, 143, 95, 80, 143, 47, 35, 40, 19, 171, 26, 47, 255, 20, 31, 155, 247, 46, 193, 254, 185, 239, 207, 255, 64, 31, 183, 132, 16, 8, 190, 236, 255, 253, 147, 41, 47, 211, 139, 41, 56, 80, 183, 163, 112, 94, 103, 64, + 159, 255, 78, 203, 103, 247, 5, 207, 37, 38, 108, 94, 99, 127, 96, 3, 31, 251, 32, 31, 255, 48, 242, 255, 199, 119, 16, 46, 95, 63, 239, 112, 142, 111, 122, 13, 226, 46, 12, 255, 250, 16, 31, 62, 255, 31, 167, 243, 255, 0, 6, 239, 38, 135, 191, 255, 3, 207, 195, 255, 160, 48, 127, 18, 120, 31, 62, 15, 255, 32, + 127, 255, 170, 127, 31, 130, 239, 30, 201, 255, 26, 7, 151, 26, 11, 175, 112, 48, 3, 79, 25, 251, 63, 255, 144, 166, 235, 108, 255, 254, 31, 255, 246, 31, 255, 144, 190, 213, 254, 164, 9, 255, 36, 5, 19, 21, 5, 28, 87, 5, 217, 254, 214, 14, 242, 68, 9, 253, 105, 143, 27, 147, 87, 124, 191, 226, 3, 191, 255, 221, + 222, 63, 142, 42, 3, 244, 177, 119, 117, 65, 191, 255, 96, 82, 179, 8, 96, 10, 46, 95, 235, 35, 243, 1, 239, 178, 255, 230, 120, 27, 131, 159, 253, 43, 127, 19, 13, 255, 48, 4, 119, 64, 57, 15, 213, 156, 17, 227, 0, 3, 17, 15, 255, 255, 9, 170, 146, 5, 218, 153, 147, 15, 118, 12, 153, 184, 15, 194, 45, 37, + 7, 31, 12, 202, 5, 48, 10, 209, 255, 13, 63, 62, 10, 23, 62, 11, 23, 27, 74, 47, 206, 14, 93, 230, 96, 3, 14, 23, 51, 3, 20, 123, 84, 32, 3, 1, 48, 3, 254, 30, 35, 255, 30, 43, 71, 98, 171, 30, 8, 127, 18, 191, 23, 231, 175, 29, 251, 111, 255, 149, 160, 29, 66, 32, 92, 240, 22, 116, 243, 31, + 163, 247, 125, 30, 112, 250, 0, 15, 254, 179, 24, 83, 242, 84, 31, 94, 192, 24, 100, 96, 32, 91, 10, 32, 22, 23, 214, 143, 111, 29, 89, 12, 210, 255, 15, 64, 61, 11, 255, 252, 120, 105, 135, 255, 206, 253, 239, 255, 223, 26, 99, 42, 103, 254, 252, 223, 255, 16, 145, 121, 153, 10, 111, 33, 40, 83, 169, 175, 89, 211, + 8, 47, 31, 55, 192, 29, 26, 95, 252, 80, 30, 228, 243, 72, 211, 97, 14, 195, 255, 15, 212, 255, 15, 255, 255, 15, 255, 42, 245, 67, 87, 68, 72, 31, 255, 160, 31, 255, 46, 127, 61, 78, 0, 9, 1, 5, 7, 0, 5, 254, 5, 0, 20, 20, 0, 18, 18, 32, 2, 248, 19, 19, 0, 15, 15, 32, 2, 16, 8, 16, + 17, 255, 6, 6, 0, 17, 17, 0, 14, 14, 224, 0, 23, 23, 80, 29, 16, 38, 16, 44, 112, 38, 64, 53, 204, 24, 24, 32, 38, 16, 59, 13, 13, 32, 44, 16, 65, 24, 16, 8, 16, 71, 16, 56, 11, 11, 32, 62, 16, 65, 16, 74, 12, 64, 104, 112, 35, 16, 26, 16, 47, 10, 10, 80, 32, 16, 159, 239, 77, 65, + 80, 31, 255, 192, 0, 33, 0, 179, 118, 75, 29, 81, 200, 22, 140, 0, 0, 5, 0, 2, 59, 0, 25, 6, 176, 37, 3, 0, 4, 31, 105, 6, 0, 171, 7, 31, 107, 9, 31, 107, 11, 30, 255, 12, 0, 109, 16, 167, 0, 15, 29, 148, 17, 0, 16, 243, 0, 255, 20, 0, 21, 0, 22, 0, 23, 0, 229, 24, 0, 25, + 29, 234, 128, 97, 27, 31, 43, 28, 245, 0, 29, 0, 30, 27, 179, 32, 16, 149, 34, 247, 0, 35, 0, 36, 48, 123, 37, 0, 38, 253, 0, 39, 0, 40, 0, 41, 31, 77, 42, 255, 0, 43, 0, 44, 0, 45, 0, 46, 86, 80, 191, 28, 62, 55, 2, 95, 255, 1, 0, 125, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 4, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 4, 224, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 3, 192, 64, 3, 112, 1, 1, 64, 27, 0, 5, 93, 16, 35, + 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, 79, 79, 84, 32, 27, 229, 148, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 15, 109, 64, 79, 2, 128, 64, 81, 226, 226, 16, 19, 27, 90, 80, 15, 160, 64, 26, 207, 45, 16, 39, 41, 16, 127, 190, 32, 96, 19, 255, 255, 0, 46, 2, 128, 136, 172, 16, 80, + 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, 3, 10, 46, 0, 46, 46, 0, 101, 117, 255, 115, 112, 97, 110, 105, 115, 104, 0, 255, 109, 101, 115, 115, 97, 103, 101, 46, 239, 98, 109, 103, 96, 11, 105, 100, 46, 116, 255, 98, 108, 0, 115, 116, 114, 117, 99, 158, 116, 48, 10, 160, 199, 77, 69, 83, 71, 16, 44, + 183, 49, 80, 187, 2, 2, 208, 228, 73, 78, 70, 126, 16, 27, 0, 96, 0, 6, 0, 12, 49, 62, 42, 113, 56, 48, 159, 2, 144, 11, 88, 144, 23, 174, 128, 35, 211, 1, 140, 144, 11, 178, 144, 59, 49, 130, 68, 65, 223, 84, 49, 80, 70, 26, 6, 1, 0, 3, 255, 0, 73, 0, 110, 0, 115, 0, 101, 253, 0, 114, + 0, 116, 0, 97, 17, 179, 101, 221, 0, 108, 17, 185, 100, 0, 105, 16, 21, 99, 223, 0, 111, 48, 11, 101, 0, 10, 0, 83, 255, 0, 85, 0, 80, 0, 69, 0, 82, 119, 17, 215, 77, 0, 65, 16, 7, 73, 0, 79, 87, 17, 227, 71, 16, 11, 76, 16, 15, 88, 0, 89, 39, 17, 28, 0, 85, 70, 78, 48, 137, 32, + 167, 32, 0, 112, 202, 0, 117, 16, 175, 32, 149, 32, 16, 171, 101, 48, 187, 82, 0, 183, 0, 46, 16, 179, 67, 16, 191, 32, 221, 117, 16, 211, 84, 160, 221, 109, 16, 233, 110, 16, 69, 97, 80, 235, 32, 223, 170, 105, 49, 7, 116, 17, 7, 117, 16, 247, 99, 16, 255, 82, 32, 59, 101, 17, 27, 32, 112, 107, 33, 31, + 99, 80, 83, 170, 111, 80, 15, 87, 17, 41, 105, 17, 31, 112, 17, 61, 186, 114, 49, 65, 111, 0, 98, 17, 75, 101, 48, 61, 114, 32, 153, 109, 0, 225, 48, 69, 32, 97, 102, 17, 81, 145, 114, 48, 127, 32, 97, 243, 17, 123, 33, 51, 1, 91, 18, 0, 202, 0, 161, 17, 103, 33, 161, 103, 48, 103, 110, 19, 95, 233, + 97, 0, 118, 48, 103, 116, 17, 17, 64, 123, 99, 87, 16, 83, 115, 16, 223, 105, 17, 187, 97, 0, 33, 87, 3, 65, 3, 6, 82, 71, 40, 19, 163, 8, 33, 157, 223, 67, 98, 50, 251, 4, 0, 6, 4, 56, 212, 56, 178, 83, 7, 0, 211, 175, 8, 82, 123, 35, 51, 171, 3, 19, 219, 24, 19, 223, 4, 147, 199, 43, + 67, 255, 79, 77, 77, 69, 78, 84, 0, 68, 253, 73, 83, 67, 95, 48, 49, 80, 7, 50, 127, 80, 15, 51, 0, 84, 73, 84, 76, 69, 251, 95, 77, 65, 73, 78, 80, 10, 83, 85, 229, 66, 0, 64, 0, 0, 0, 144, 111, 112, 36, 67, 174, 239, 55, 113, 97, 96, 147, 28, 19, 62, 141, 124, 80, 171, 0, 190, 198, 20, + 162, 51, 179, 16, 153, 247, 100, 67, 164, 76, 51, 191, 12, 0, 0, 243, 19, 54, 175, 66, 51, 203, 19, 221, 137, 230, 191, 39, 67, 215, 20, 0, 0, 251, 104, 17, 158, 53, 51, 227, 16, 185, 23, 177, 123, 254, 51, 239, 170, 28, 116, 149, 4, 81, 23, 7, 80, 235, 9, 20, 191, 160, 10, 20, 195, 11, 224, 162, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 82, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 82, 224, 245, 0, 0, 0, 32, 16, 3, 192, 16, 11, 0, 42, 64, 3, 112, 2, 1, 80, 27, 3, 16, + 35, 64, 80, 3, 231, 128, 0, 3, 32, 22, 16, 57, 79, 79, 84, 115, 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, 67, 212, 246, 17, 0, 0, 18, 64, 80, 81, 240, 32, 88, 250, 255, 255, 0, 46, 2, 128, 97, 16, 80, 19, 177, 184, 16, 19, 2, 255, 16, 0, 96, 19, 32, 132, 46, 255, 0, 46, 46, 0, 101, 109, + 98, 101, 255, 100, 100, 101, 100, 102, 111, 110, 116, 255, 0, 109, 101, 115, 115, 97, 103, 101, 126, 32, 11, 50, 54, 46, 98, 114, 102, 16, 19, 127, 0, 0, 8, 82, 70, 78, 84, 254, 255, 1, 191, 4, 48, 123, 16, 0, 5, 70, 73, 78, 182, 70, 32, 235, 1, 33, 16, 241, 27, 27, 32, 219, 251, 56, 0, 0, 80, 104, + 16, 155, 16, 33, 254, 27, 26, 0, 84, 71, 76, 80, 16, 15, 255, 48, 24, 26, 20, 24, 0, 0, 8, 229, 0, 0, 10, 32, 221, 17, 3, 128, 49, 31, 96, 190, 0, 0, 0, 106, 127, 255, 176, 0, 111, 16, 3, 233, 95, 255, 160, 16, 3, 144, 48, 3, 0, 0, 183, 2, 254, 118, 0, 0, 159, 255, 0, 11, 18, 29, + 255, 143, 255, 255, 4, 255, 255, 223, 13, 233, 255, 252, 11, 162, 36, 228, 34, 59, 18, 165, 255, 107, 18, 165, 255, 244, 18, 71, 251, 226, 113, 4, 190, 233, 0, 0, 6, 18, 63, 2, 34, 67, 34, 71, 35, 125, 98, 200, 19, 86, 119, 117, 255, 144, 0, 202, 234, 118, 84, 69, 160, 63, 65, 34, 151, 232, 34, 155, 187, 209, + 18, 159, 250, 0, 141, 18, 164, 9, 255, 174, 253, 1, 94, 112, 63, 17, 231, 63, 255, 112, 48, 3, 186, 47, 16, 7, 31, 255, 96, 16, 3, 80, 48, 3, 227, 13, 221, 64, 1, 255, 149, 36, 67, 19, 76, 0, 14, 87, 20, 103, 111, 20, 107, 207, 65, 163, 7, 255, 127, 215, 255, 243, 17, 234, 144, 20, 19, 16, 0, 255, + 171, 248, 20, 27, 241, 20, 31, 160, 20, 35, 150, 121, 186, 189, 65, 175, 16, 0, 239, 16, 254, 175, 17, 244, 239, 95, 255, 240, 17, 2, 244, 0, 14, 255, 252, 251, 128, 239, 255, 255, 224, 20, 43, 36, 79, 135, 2, 84, 163, 96, 3, 180, 134, 18, 35, 4, 255, 253, 255, 22, 223, 255, 253, 175, 255, 255, 253, 126, 18, 88, + 253, 111, 255, 255, 254, 41, 16, 91, 111, 52, 135, 0, 207, 18, 72, 255, 254, 80, 0, 253, 254, 129, 0, 0, 234, 97, 36, 155, 128, 122, 20, 159, 249, 0, 24, 255, 18, 105, 223, 17, 103, 117, 3, 96, 114, 7, 203, 16, 51, 251, 223, 17, 0, 175, 251, 255, 208, 0, 9, 238, 1, 247, 57, 4, 32, 253, 0, 3, 239, 243, + 0, 13, 19, 77, 14, 85, 18, 240, 6, 33, 133, 39, 0, 247, 57, 12, 21, 207, 31, 109, 21, 211, 95, 255, 51, 223, 0, 158, 37, 223, 37, 87, 102, 96, 250, 21, 240, 244, 33, 200, 119, 83, 16, 143, 176, 54, 88, 70, 136, 113, 191, 255, 255, 241, 220, 254, 255, 255, 80, 1, 255, 255, 48, 22, 56, 189, 80, 17, 147, 112, + 0, 50, 17, 5, 134, 23, 239, 124, 22, 77, 223, 255, 54, 140, 223, 22, 88, 32, 3, 186, 207, 22, 96, 121, 135, 100, 112, 98, 42, 16, 87, 63, 18, 24, 22, 147, 226, 0, 255, 250, 16, 0, 198, 183, 32, 5, 81, 184, 0, 201, 255, 7, 188, 80, 59, 0, 22, 53, 253, 0, 0, 191, 255, 0, 10, 24, 229, 95, 117, 134, + 64, 20, 119, 100, 34, 203, 251, 102, 131, 251, 217, 134, 140, 18, 208, 0, 60, 169, 104, 16, 15, 0, 147, 250, 41, 31, 25, 17, 246, 73, 140, 169, 134, 53, 0, 171, 74, 18, 205, 127, 25, 61, 63, 25, 65, 15, 235, 251, 152, 0, 2, 63, 255, 105, 168, 119, 117, 174, 64, 35, 43, 198, 102, 227, 99, 53, 141, 37, 28, 162, + 94, 233, 147, 230, 41, 127, 24, 53, 53, 107, 255, 147, 105, 233, 1, 51, 85, 22, 240, 255, 21, 146, 64, 3, 5, 231, 207, 234, 0, 22, 112, 106, 8, 103, 121, 155, 190, 188, 167, 63, 151, 118, 85, 51, 210, 154, 37, 171, 96, 83, 187, 144, 80, 3, 16, 250, 12, 35, 69, 141, 0, 21, 197, 68, 3, 36, 7, 105, 152, 26, + 115, 221, 123, 106, 104, 86, 119, 137, 154, 167, 159, 119, 101, 208, 84, 51, 166, 221, 187, 25, 149, 23, 5, 64, 187, 24, 245, 151, 33, 9, 136, 16, 40, 59, 127, 152, 27, 103, 0, 58, 231, 255, 255, 9, 84, 3, 23, 227, 101, 255, 252, 93, 128, 165, 117, 17, 140, 255, 254, 112, 26, 155, 208, 121, 26, 159, 64, 0, 106, 235, + 86, 89, 9, 240, 14, 223, 229, 255, 209, 3, 16, 48, 40, 43, 12, 22, 192, 14, 244, 255, 245, 0, 15, 48, 3, 247, 20, 249, 8, 63, 16, 74, 4, 110, 16, 63, 85, 63, 96, 3, 15, 144, 3, 14, 39, 46, 169, 3, 23, 50, 0, 32, 3, 243, 144, 3, 25, 30, 6, 137, 245, 23, 107, 39, 91, 38, 50, 111, 23, 59, + 39, 63, 143, 64, 22, 62, 223, 55, 111, 18, 47, 56, 222, 37, 147, 21, 37, 27, 121, 84, 25, 58, 254, 24, 244, 250, 21, 178, 247, 22, 15, 32, 200, 223, 243, 208, 28, 24, 181, 87, 120, 152, 255, 0, 85, 63, 37, 71, 17, 154, 5, 128, 24, 21, 130, 33, 37, 80, 3, 23, 247, 211, 0, 191, 144, 3, 159, 39, 97, 48, + 3, 237, 221, 133, 221, 121, 159, 32, 11, 81, 231, 108, 136, 211, 144, 223, 211, 4, 200, 90, 56, 71, 17, 238, 49, 15, 129, 31, 13, 28, 71, 18, 208, 125, 22, 84, 255, 16, 91, 205, 249, 27, 60, 244, 123, 27, 60, 243, 0, 93, 203, 26, 58, 0, 247, 58, 28, 240, 57, 221, 1, 18, 48, 24, 75, 242, 28, 119, 190, 243, + 28, 123, 245, 169, 207, 255, 145, 24, 108, 115, 38, 103, 80, 5, 255, 34, 113, 11, 241, 12, 8, 255, 203, 255, 177, 22, 155, 67, 151, 6, 44, 187, 41, 239, 123, 210, 57, 22, 184, 120, 173, 170, 122, 254, 87, 209, 119, 100, 124, 223, 197, 80, 135, 18, 114, 50, 223, 146, 83, 253, 68, 13, 80, 203, 13, 80, 227, 32, 231, 5, + 119, 126, 109, 160, 245, 0, 43, 255, 251, 157, 122, 217, 121, 20, 95, 216, 32, 101, 48, 152, 255, 43, 39, 128, 68, 64, 239, 48, 13, 160, 2, 17, 227, 25, 80, 252, 52, 175, 18, 200, 235, 0, 0, 77, 45, 127, 54, 171, 84, 85, 87, 189, 172, 171, 58, 252, 119, 117, 66, 126, 31, 133, 85, 30, 56, 249, 30, 60, 252, 91, + 112, 132, 14, 4, 0, 159, 85, 80, 3, 143, 83, 143, 127, 185, 159, 144, 89, 239, 176, 106, 64, 3, 254, 160, 8, 191, 31, 255, 82, 87, 46, 3, 177, 2, 211, 255, 177, 46, 111, 185, 49, 33, 39, 251, 4, 156, 213, 239, 236, 174, 220, 78, 17, 227, 255, 64, 3, 128, 251, 253, 159, 255, 144, 112, 45, 87, 37, 84, 29, 8, + 5, 255, 9, 21, 255, 239, 255, 17, 52, 48, 28, 164, 144, 82, 30, 194, 176, 30, 191, 176, 31, 171, 37, 116, 208, 159, 255, 171, 37, 86, 143, 143, 147, 19, 159, 111, 255, 67, 32, 30, 131, 3, 60, 255, 212, 255, 0, 17, 19, 32, 24, 86, 171, 144, 24, 90, 176, 48, 3, 175, 28, 15, 159, 255, 57, 200, 34, 15, 255, 42, + 3, 69, 82, 28, 3, 37, 247, 249, 74, 27, 178, 249, 31, 135, 32, 3, 250, 223, 255, 45, 22, 110, 111, 21, 207, 78, 255, 29, 85, 255, 0, 79, 255, 42, 120, 127, 40, 187, 248, 99, 111, 227, 20, 15, 16, 72, 11, 76, 159, 255, 83, 22, 170, 31, 155, 8, 255, 76, 19, 38, 199, 74, 136, 191, 16, 101, 3, 31, 240, 251, + 85, 159, 244, 14, 107, 40, 169, 4, 31, 255, 6, 31, 255, 10, 111, 255, 38, 177, 239, 21, 29, 210, 54, 247, 31, 78, 255, 30, 100, 255, 177, 158, 0, 165, 66, 64, 159, 7, 86, 59, 40, 251, 143, 176, 159, 253, 71, 84, 227, 255, 89, 163, 57, 62, 46, 148, 79, 255, 240, 242, 4, 159, 255, 252, 40, 91, 22, 15, 255, 25, + 66, 227, 255, 3, 127, 87, 67, 24, 244, 18, 28, 191, 222, 229, 255, 251, 191, 21, 58, 16, 3, 253, 16, 7, 219, 200, 223, 17, 87, 19, 57, 139, 128, 88, 219, 160, 3, 87, 23, 78, 29, 50, 208, 48, 3, 34, 79, 127, 255, 224, 30, 7, 146, 240, 48, 3, 47, 12, 95, 47, 45, 15, 255, 45, 9, 31, 33, 67, 32, 3, + 8, 29, 251, 121, 251, 128, 3, 31, 156, 246, 63, 246, 255, 254, 64, 239, 17, 212, 255, 254, 17, 63, 107, 26, 152, 255, 252, 33, 71, 248, 31, 59, 255, 228, 80, 15, 255, 16, 111, 81, 71, 191, 63, 109, 45, 141, 79, 121, 79, 129, 85, 47, 192, 224, 31, 196, 176, 90, 59, 112, 90, 75, 80, 9, 80, 3, 14, 96, 18, 38, + 197, 31, 255, 47, 33, 141, 86, 103, 175, 22, 88, 115, 46, 62, 31, 231, 244, 48, 175, 255, 239, 29, 231, 255, 159, 255, 16, 255, 79, 255, 96, 255, 233, 13, 255, 176, 26, 12, 242, 62, 33, 34, 203, 11, 119, 27, 175, 47, 255, 239, 31, 95, 127, 2, 255, 253, 250, 95, 12, 255, 242, 63, 31, 114, 63, 34, 43, 164, 120, 163, + 112, 81, 171, 150, 179, 51, 51, 11, 48, 3, 186, 249, 57, 59, 8, 255, 234, 218, 253, 223, 89, 3, 66, 98, 58, 221, 182, 255, 104, 255, 39, 255, 28, 16, 239, 231, 164, 85, 33, 227, 79, 25, 230, 63, 16, 171, 63, 24, 190, 63, 210, 253, 211, 14, 161, 59, 3, 87, 247, 41, 255, 1, 80, 3, 90, 155, 189, 23, 31, 159, + 48, 44, 47, 124, 127, 31, 124, 229, 3, 223, 96, 75, 87, 127, 255, 161, 31, 255, 254, 80, 43, 155, 225, 64, 191, 245, 248, 103, 79, 129, 79, 251, 44, 79, 167, 4, 42, 15, 3, 111, 255, 47, 239, 249, 120, 155, 178, 239, 172, 91, 103, 119, 136, 193, 45, 19, 240, 154, 223, 34, 0, 252, 0, 36, 83, 6, 84, 87, 105, 31, + 139, 185, 253, 20, 167, 169, 251, 26, 223, 249, 27, 10, 247, 25, 173, 29, 87, 55, 186, 65, 168, 127, 255, 48, 63, 20, 241, 63, 27, 246, 168, 63, 18, 214, 47, 28, 114, 31, 171, 249, 37, 193, 48, 3, 153, 240, 80, 3, 27, 112, 17, 16, 15, 255, 255, 15, 255, 241, 18, 242, 0, 0, 174, 251, 51, 66, 30, 15, 96, 30, + 19, 170, 192, 23, 34, 242, 159, 223, 36, 77, 187, 11, 87, 3, 172, 5, 31, 187, 2, 127, 191, 97, 0, 79, 243, 171, 75, 170, 255, 15, 68, 0, 2, 78, 211, 9, 31, 247, 127, 91, 175, 121, 95, 190, 87, 117, 16, 175, 59, 255, 95, 165, 166, 164, 106, 39, 134, 79, 238, 107, 32, 99, 255, 31, 172, 36, 249, 56, 21, 249, + 191, 160, 0, 6, 207, 79, 255, 39, 219, 21, 229, 239, 0, 0, 52, 127, 255, 86, 119, 118, 82, 124, 175, 255, 169, 85, 85, 142, 255, 71, 107, 127, 233, 165, 232, 44, 199, 209, 64, 57, 36, 49, 239, 13, 62, 8, 9, 74, 79, 155, 3, 120, 63, 32, 192, 2, 16, 192, 127, 208, 192, 66, 168, 31, 251, 41, 35, 38, 127, 16, + 192, 33, 90, 79, 208, 192, 83, 31, 227, 190, 145, 87, 239, 65, 115, 79, 255, 19, 86, 222, 119, 117, 173, 132, 233, 117, 67, 70, 175, 158, 74, 45, 50, 255, 29, 140, 72, 23, 247, 31, 21, 253, 77, 206, 45, 15, 255, 13, 30, 35, 249, 30, 39, 255, 6, 87, 247, 7, 223, 255, 249, 24, 3, 243, 223, 9, 255, 243, 170, 111, + 16, 3, 13, 88, 42, 239, 30, 206, 207, 22, 108, 209, 191, 251, 78, 243, 159, 21, 47, 24, 49, 31, 154, 48, 74, 93, 251, 80, 8, 3, 1, 39, 8, 11, 31, 147, 63, 23, 117, 82, 47, 184, 207, 29, 201, 239, 56, 192, 33, 92, 80, 42, 11, 138, 32, 72, 231, 9, 11, 7, 37, 185, 223, 30, 0, 143, 26, 42, 164, 95, + 24, 62, 63, 72, 174, 48, 15, 239, 46, 24, 57, 147, 165, 1, 144, 3, 0, 176, 3, 56, 231, 16, 29, 100, 16, 249, 1, 143, 255, 37, 175, 79, 162, 45, 72, 127, 249, 255, 179, 255, 91, 113, 24, 3, 41, 75, 48, 74, 65, 243, 226, 29, 191, 30, 199, 178, 191, 255, 11, 89, 231, 164, 143, 87, 255, 239, 87, 255, 38, 23, + 191, 40, 82, 50, 247, 170, 208, 86, 11, 64, 94, 167, 80, 88, 19, 6, 0, 192, 9, 164, 1, 66, 96, 5, 208, 3, 41, 247, 7, 96, 3, 33, 227, 127, 30, 221, 4, 255, 251, 1, 175, 255, 251, 181, 30, 31, 33, 159, 255, 57, 138, 250, 31, 176, 249, 232, 13, 255, 12, 24, 246, 223, 24, 212, 58, 15, 26, 192, 167, 251, + 31, 59, 160, 154, 203, 15, 255, 14, 11, 255, 243, 142, 4, 16, 3, 32, 7, 57, 238, 11, 223, 245, 206, 127, 230, 255, 160, 223, 16, 113, 16, 103, 255, 255, 16, 175, 201, 255, 0, 23, 75, 22, 130, 98, 183, 255, 30, 109, 254, 81, 83, 255, 144, 9, 62, 0, 248, 31, 159, 83, 147, 27, 119, 0, 222, 0, 141, 223, 198, 28, + 216, 85, 105, 191, 159, 232, 37, 119, 100, 120, 128, 255, 42, 243, 31, 160, 44, 41, 148, 250, 81, 95, 223, 162, 223, 144, 3, 191, 80, 3, 8, 159, 0, 102, 88, 255, 221, 96, 15, 159, 30, 41, 255, 14, 255, 95, 167, 139, 78, 239, 221, 60, 51, 144, 192, 125, 31, 168, 0, 37, 216, 122, 255, 91, 191, 0, 28, 18, 129, 35, + 143, 59, 175, 181, 213, 31, 207, 234, 97, 41, 212, 217, 31, 203, 250, 201, 2, 158, 27, 15, 65, 235, 9, 208, 3, 135, 191, 249, 209, 1, 207, 28, 209, 10, 49, 3, 28, 160, 28, 225, 0, 195, 52, 82, 153, 127, 24, 188, 18, 12, 29, 174, 255, 227, 216, 4, 239, 29, 121, 28, 250, 90, 129, 15, 255, 255, 15, 255, 101, 205, + 91, 80, 9, 109, 149, 26, 115, 24, 239, 61, 59, 111, 121, 29, 255, 255, 255, 231, 10, 39, 66, 95, 255, 87, 186, 118, 21, 35, 255, 253, 64, 30, 34, 244, 35, 163, 167, 32, 38, 92, 6, 144, 32, 15, 200, 18, 140, 221, 222, 79, 31, 255, 255, 48, 3, 20, 198, 0, 35, 49, 24, 111, 143, 255, 17, 19, 171, 67, 255, 255, + 237, 221, 82, 166, 223, 32, 93, 95, 144, 157, 107, 215, 59, 98, 78, 247, 137, 79, 93, 171, 94, 7, 159, 255, 231, 24, 180, 27, 131, 8, 102, 20, 74, 5, 96, 155, 99, 111, 230, 138, 201, 31, 255, 138, 253, 109, 221, 79, 107, 153, 31, 52, 140, 11, 191, 92, 15, 164, 111, 127, 255, 32, 92, 11, 96, 159, 192, 91, 247, 119, + 103, 125, 19, 179, 13, 255, 232, 0, 31, 30, 119, 95, 82, 29, 207, 175, 31, 118, 239, 61, 128, 182, 107, 239, 79, 187, 170, 12, 92, 11, 9, 127, 191, 49, 89, 95, 247, 80, 3, 43, 41, 103, 21, 15, 44, 15, 63, 10, 168, 212, 235, 110, 201, 169, 96, 30, 201, 240, 30, 34, 192, 31, 184, 40, 39, 112, 91, 21, 154, 244, + 25, 213, 250, 16, 30, 62, 251, 2, 93, 37, 223, 43, 46, 219, 23, 207, 0, 105, 27, 12, 109, 38, 85, 55, 176, 41, 223, 255, 181, 46, 249, 231, 104, 46, 148, 176, 107, 40, 100, 45, 168, 129, 8, 98, 8, 0, 3, 5, 81, 45, 67, 3, 54, 223, 253, 175, 81, 192, 11, 15, 255, 17, 252, 84, 48, 163, 14, 31, 217, 15, + 48, 204, 243, 48, 212, 32, 183, 172, 8, 0, 159, 7, 1, 87, 119, 11, 223, 26, 76, 40, 3, 129, 191, 31, 28, 40, 11, 40, 150, 56, 15, 90, 65, 66, 79, 31, 162, 255, 66, 91, 10, 93, 171, 58, 247, 47, 159, 143, 29, 215, 202, 4, 244, 16, 24, 29, 151, 31, 22, 159, 127, 25, 146, 236, 223, 255, 16, 25, 85, 96, + 13, 17, 37, 19, 72, 4, 48, 79, 31, 200, 22, 188, 30, 253, 77, 143, 96, 135, 47, 77, 247, 164, 6, 86, 95, 2, 111, 99, 33, 127, 159, 39, 61, 26, 226, 177, 111, 25, 230, 159, 254, 72, 124, 30, 204, 31, 236, 96, 246, 8, 255, 255, 128, 16, 95, 192, 47, 43, 161, 169, 3, 31, 85, 6, 31, 89, 10, 23, 190, 47, + 205, 47, 64, 24, 7, 111, 30, 52, 24, 156, 31, 20, 57, 110, 82, 215, 39, 71, 167, 244, 94, 11, 176, 79, 187, 63, 232, 137, 135, 119, 79, 25, 201, 255, 25, 163, 51, 251, 0, 1, 51, 51, 127, 127, 255, 10, 255, 255, 138, 223, 255, 252, 95, 31, 70, 245, 31, 74, 112, 255, 235, 113, 0, 69, 14, 62, 29, 3, 208, 3, + 179, 119, 67, 107, 16, 128, 3, 221, 148, 16, 15, 255, 32, 57, 151, 63, 111, 155, 25, 175, 223, 27, 193, 247, 111, 249, 33, 57, 175, 158, 250, 4, 103, 148, 100, 143, 63, 43, 143, 224, 74, 195, 245, 92, 99, 223, 162, 166, 63, 31, 239, 13, 89, 167, 255, 189, 255, 246, 127, 250, 191, 250, 26, 86, 208, 45, 255, 252, 16, 0, + 163, 87, 136, 165, 208, 8, 179, 4, 175, 128, 47, 175, 12, 0, 110, 11, 7, 5, 255, 241, 17, 148, 253, 255, 254, 29, 23, 251, 248, 223, 255, 255, 224, 19, 114, 48, 0, 191, 70, 137, 5, 191, 255, 40, 255, 111, 255, 211, 223, 255, 18, 9, 255, 17, 170, 37, 91, 247, 0, 212, 3, 118, 127, 225, 254, 90, 11, 225, 8, 21, + 255, 15, 255, 254, 253, 4, 16, 0, 5, 207, 160, 30, 56, 243, 209, 0, 30, 31, 59, 6, 99, 87, 115, 198, 31, 126, 30, 159, 248, 55, 91, 20, 126, 80, 79, 255, 253, 226, 147, 239, 47, 133, 207, 227, 209, 92, 247, 4, 6, 1, 48, 0, 234, 2, 175, 208, 30, 244, 247, 60, 15, 5, 224, 95, 95, 127, 233, 7, 31, 43, + 79, 160, 0, 1, 239, 140, 244, 61, 123, 88, 29, 31, 255, 190, 80, 85, 71, 46, 66, 109, 27, 7, 255, 144, 10, 230, 186, 5, 120, 78, 107, 10, 84, 87, 247, 9, 183, 255, 146, 31, 234, 243, 0, 3, 1, 11, 232, 48, 146, 63, 104, 103, 37, 59, 111, 77, 79, 38, 231, 127, 61, 179, 72, 31, 48, 96, 30, 104, 31, 178, + 192, 28, 107, 29, 139, 29, 232, 169, 255, 17, 120, 255, 30, 51, 238, 9, 254, 19, 96, 95, 1, 85, 37, 155, 127, 85, 75, 4, 111, 243, 253, 44, 185, 114, 86, 31, 150, 236, 63, 154, 247, 31, 160, 208, 253, 23, 52, 170, 40, 16, 104, 10, 22, 196, 251, 95, 91, 48, 3, 28, 109, 23, 39, 235, 47, 142, 72, 11, 143, 86, + 115, 255, 252, 1, 235, 87, 116, 16, 29, 203, 251, 126, 188, 64, 4, 252, 203, 176, 0, 40, 207, 16, 31, 236, 49, 67, 80, 80, 187, 192, 144, 195, 160, 86, 23, 74, 31, 41, 227, 40, 3, 159, 7, 208, 3, 40, 103, 5, 255, 243, 2, 103, 235, 99, 247, 191, 159, 30, 229, 31, 81, 64, 0, 181, 8, 27, 153, 4, 248, 94, + 99, 211, 47, 235, 48, 82, 88, 91, 243, 86, 211, 247, 70, 219, 14, 237, 15, 46, 31, 211, 247, 223, 255, 248, 9, 25, 211, 1, 191, 254, 245, 16, 0, 6, 227, 191, 255, 69, 42, 36, 207, 215, 255, 241, 23, 94, 251, 26, 142, 251, 0, 1, 165, 250, 1, 138, 59, 11, 31, 220, 32, 3, 9, 30, 195, 8, 74, 52, 118, 237, + 14, 187, 125, 45, 4, 223, 91, 239, 46, 31, 215, 206, 3, 223, 90, 187, 95, 162, 223, 255, 48, 25, 35, 175, 252, 56, 6, 250, 27, 65, 160, 207, 103, 98, 210, 0, 50, 111, 191, 243, 91, 183, 43, 175, 252, 80, 3, 75, 219, 30, 255, 128, 3, 42, 3, 3, 187, 83, 246, 16, 254, 0, 12, 246, 251, 102, 207, 253, 93, 28, + 245, 215, 107, 239, 235, 185, 63, 244, 88, 191, 96, 92, 76, 19, 64, 15, 249, 222, 13, 221, 221, 28, 192, 12, 41, 7, 134, 221, 16, 0, 46, 87, 8, 250, 255, 10, 11, 127, 23, 101, 75, 195, 41, 224, 3, 79, 255, 64, 85, 55, 144, 208, 3, 10, 210, 93, 9, 86, 70, 7, 0, 93, 175, 6, 127, 255, 38, 118, 46, 51, + 207, 254, 80, 45, 112, 31, 31, 16, 255, 117, 140, 60, 63, 163, 11, 114, 145, 54, 0, 0, 77, 57, 211, 45, 251, 250, 1, 255, 255, 179, 7, 30, 60, 12, 30, 88, 174, 15, 30, 172, 118, 29, 16, 255, 253, 96, 71, 255, 111, 31, 27, 20, 157, 12, 68, 31, 21, 0, 0, 26, 249, 255, 0, 2, 239, 255, 31, 66, 46, 95, + 230, 119, 31, 108, 80, 0, 239, 40, 72, 254, 0, 119, 203, 81, 63, 31, 35, 28, 217, 255, 45, 71, 127, 255, 214, 16, 54, 39, 55, 111, 87, 59, 191, 255, 97, 239, 144, 112, 0, 3, 5, 95, 223, 42, 79, 151, 16, 55, 16, 192, 25, 62, 175, 249, 31, 174, 248, 20, 23, 205, 20, 119, 81, 111, 31, 207, 255, 177, 31, 136, + 254, 255, 185, 223, 221, 255, 145, 40, 215, 91, 255, 254, 23, 82, 210, 233, 255, 255, 214, 189, 154, 96, 13, 35, 3, 103, 151, 158, 42, 48, 143, 64, 3, 123, 95, 171, 1, 55, 98, 247, 62, 199, 186, 245, 112, 3, 252, 119, 114, 56, 183, 253, 8, 95, 28, 149, 111, 79, 255, 41, 251, 13, 31, 234, 15, 31, 238, 14, 252, 255, + 3, 103, 98, 20, 239, 65, 28, 40, 5, 250, 95, 253, 48, 5, 31, 27, 116, 31, 30, 178, 181, 63, 31, 198, 159, 87, 39, 247, 112, 75, 11, 255, 170, 160, 95, 215, 192, 88, 11, 224, 15, 168, 16, 15, 30, 252, 240, 13, 255, 250, 32, 27, 210, 40, 7, 33, 59, 47, 71, 191, 103, 127, 255, 1, 16, 0, 4, 159, 128, 77, + 31, 167, 224, 57, 243, 34, 11, 117, 32, 15, 255, 25, 239, 252, 255, 32, 0, 175, 255, 211, 31, 158, 66, 99, 213, 0, 110, 44, 83, 71, 127, 228, 2, 31, 191, 78, 127, 159, 158, 252, 95, 255, 118, 32, 3, 51, 85, 111, 255, 80, 0, 3, 1, 16, 175, 255, 14, 16, 91, 11, 43, 31, 197, 60, 79, 175, 41, 71, 239, 167, + 159, 254, 148, 232, 3, 235, 32, 26, 203, 236, 34, 98, 26, 200, 31, 76, 234, 80, 103, 118, 143, 229, 16, 89, 155, 112, 8, 0, 9, 106, 75, 19, 0, 191, 31, 255, 159, 91, 35, 20, 160, 28, 207, 255, 16, 89, 127, 31, 96, 255, 128, 0, 0, 153, 33, 9, 1, 29, 72, 3, 0, 175, 44, 251, 154, 111, 12, 105, 31, 255, + 31, 250, 45, 40, 235, 26, 97, 58, 99, 253, 251, 72, 4, 119, 64, 12, 29, 136, 95, 252, 197, 134, 106, 74, 114, 26, 68, 176, 3, 224, 82, 3, 96, 9, 2, 127, 27, 15, 255, 255, 15, 255, 89, 45, 115, 2, 10, 125, 7, 29, 130, 123, 234, 239, 254, 182, 15, 255, 6, 210, 14, 126, 55, 113, 31, 238, 174, 254, 47, 218, + 96, 28, 11, 112, 1, 223, 28, 11, 57, 32, 19, 15, 98, 54, 41, 135, 96, 30, 106, 47, 255, 208, 35, 29, 26, 96, 3, 192, 9, 151, 255, 14, 220, 98, 31, 103, 5, 255, 169, 253, 80, 3, 252, 30, 229, 251, 112, 3, 15, 118, 47, 95, 85, 22, 145, 111, 22, 149, 127, 112, 3, 144, 48, 3, 143, 110, 23, 218, 159, 255, + 9, 194, 48, 1, 51, 81, 30, 68, 228, 253, 0, 10, 86, 187, 38, 191, 8, 24, 88, 80, 196, 237, 22, 117, 16, 25, 151, 247, 28, 88, 100, 255, 203, 181, 127, 54, 135, 37, 86, 247, 32, 3, 71, 98, 86, 39, 187, 177, 25, 187, 252, 40, 39, 48, 119, 18, 255, 78, 24, 159, 112, 29, 238, 64, 3, 0, 19, 53, 135, 247, + 167, 159, 94, 7, 143, 95, 219, 24, 175, 87, 99, 0, 243, 125, 255, 255, 211, 56, 95, 40, 100, 101, 207, 36, 31, 130, 71, 85, 192, 23, 191, 166, 103, 144, 159, 247, 96, 3, 94, 218, 91, 127, 248, 3, 54, 118, 48, 93, 22, 180, 58, 79, 255, 30, 100, 112, 3, 239, 31, 218, 79, 29, 242, 164, 14, 23, 230, 13, 107, 27, + 30, 6, 0, 31, 189, 72, 11, 147, 192, 134, 19, 15, 255, 14, 8, 63, 123, 96, 3, 248, 0, 229, 9, 222, 247, 15, 127, 60, 33, 227, 159, 145, 79, 173, 211, 223, 112, 15, 224, 59, 5, 50, 188, 34, 192, 252, 0, 184, 3, 18, 196, 3, 253, 221, 223, 94, 49, 231, 25, 198, 190, 246, 25, 202, 245, 0, 6, 223, 245, 191, + 255, 147, 175, 26, 212, 42, 143, 191, 23, 193, 31, 202, 0, 205, 200, 222, 16, 213, 158, 31, 251, 95, 80, 3, 60, 159, 191, 159, 149, 176, 30, 124, 64, 3, 31, 27, 33, 31, 25, 126, 61, 72, 176, 127, 224, 81, 243, 33, 247, 176, 92, 195, 233, 129, 23, 234, 95, 168, 3, 6, 208, 63, 31, 250, 16, 3, 207, 57, 105, 33, + 27, 37, 253, 3, 103, 137, 129, 63, 251, 160, 65, 72, 127, 248, 89, 47, 14, 235, 255, 15, 252, 255, 10, 24, 255, 15, 169, 122, 5, 35, 37, 150, 31, 255, 10, 92, 3, 127, 255, 45, 118, 255, 233, 19, 31, 143, 19, 232, 30, 110, 0, 31, 162, 7, 62, 48, 35, 48, 252, 3, 11, 255, 243, 223, 11, 31, 133, 32, 3, 106, + 29, 254, 195, 9, 31, 151, 9, 23, 30, 9, 30, 211, 210, 103, 99, 46, 219, 211, 55, 27, 31, 168, 208, 31, 191, 170, 243, 29, 199, 246, 24, 52, 247, 31, 114, 246, 15, 255, 23, 233, 1, 223, 255, 20, 230, 255, 25, 251, 159, 255, 253, 255, 0, 118, 32, 51, 33, 255, 252, 239, 126, 78, 0, 254, 239, 255, 35, 151, 239, 31, + 255, 136, 255, 64, 3, 46, 27, 31, 255, 48, 93, 243, 224, 3, 78, 63, 213, 85, 113, 31, 239, 243, 80, 3, 247, 87, 251, 255, 43, 112, 3, 16, 125, 6, 29, 160, 127, 29, 152, 255, 255, 254, 241, 0, 255, 249, 32, 0, 254, 31, 51, 146, 243, 13, 243, 12, 239, 185, 59, 30, 87, 86, 7, 207, 80, 159, 126, 40, 19, 26, + 255, 20, 103, 118, 16, 31, 155, 189, 247, 55, 251, 185, 207, 255, 64, 31, 183, 132, 253, 16, 8, 190, 255, 253, 147, 43, 187, 211, 83, 111, 255, 48, 94, 99, 112, 87, 175, 143, 255, 7, 191, 48, 79, 243, 47, 247, 5, 207, 41, 49, 94, 99, 24, 11, 30, 184, 215, 255, 255, 32, 95, 32, 49, 127, 199, 119, 16, 39, 46, 95, + 63, 239, 112, 78, 111, 13, 226, 46, 7, 255, 243, 253, 16, 7, 255, 247, 250, 7, 24, 190, 6, 122, 31, 134, 5, 255, 249, 123, 103, 50, 4, 24, 27, 125, 22, 154, 244, 102, 207, 255, 224, 31, 161, 96, 121, 31, 62, 0, 239, 234, 64, 14, 85, 28, 79, 255, 210, 51, 15, 255, 7, 25, 183, 1, 159, 159, 255, 31, 161, 116, + 1, 18, 26, 140, 96, 3, 0, 192, 16, 255, 18, 135, 42, 192, 248, 73, 211, 205, 254, 214, 14, 246, 61, 95, 235, 9, 253, 66, 3, 6, 107, 31, 242, 1, 87, 111, 255, 139, 25, 247, 0, 3, 243, 191, 255, 221, 222, 63, 142, 41, 167, 177, 119, 233, 117, 65, 0, 169, 247, 96, 80, 3, 15, 142, 5, 127, 83, 81, 243, 31, + 83, 243, 1, 189, 255, 33, 239, 230, 120, 79, 30, 7, 253, 46, 11, 18, 125, 255, 48, 4, 119, 167, 64, 15, 217, 55, 3, 25, 255, 32, 3, 0, 49, 16, 76, 15, 255, 100, 2, 41, 179, 33, 239, 121, 152, 14, 11, 255, 15, 28, 255, 102, 14, 216, 30, 238, 144, 2, 177, 66, 227, 163, 0, 5, 27, 117, 247, 159, 226, 0, + 28, 31, 59, 239, 255, 249, 213, 16, 255, 20, 129, 132, 15, 255, 59, 85, 30, 29, 254, 255, 16, 1, 207, 255, 192, 46, 255, 255, 253, 145, 31, 253, 96, 0, 8, 4, 2, 53, 5, 213, 153, 147, 31, 58, 243, 31, 66, 241, 30, 177, 240, 87, 30, 177, 224, 30, 189, 208, 112, 3, 2, 153, 184, 9, 77, 86, 117, 146, 20, 238, + 31, 106, 4, 87, 98, 15, 191, 16, 37, 170, 16, 61, 95, 175, 23, 128, 111, 28, 169, 63, 48, 92, 135, 240, 28, 242, 40, 71, 31, 131, 28, 184, 15, 254, 179, 215, 0, 79, 24, 205, 159, 31, 50, 239, 255, 96, 82, 32, 91, 10, 31, 162, 15, 31, 73, 15, 255, 15, 13, 48, 40, 189, 253, 16, 192, 247, 0, 1, 188, 78, + 91, 4, 208, 221, 208, 31, 223, 241, 48, 3, 5, 38, 53, 79, 155, 37, 251, 159, 31, 95, 251, 56, 7, 253, 1, 87, 117, 16, 247, 191, 255, 255, 251, 109, 159, 253, 64, 4, 253, 188, 192, 0, 23, 191, 32, 62, 43, 111, 82, 120, 191, 208, 157, 155, 176, 94, 23, 208, 156, 8, 79, 255, 165, 1, 31, 255, 8, 94, 19, 79, + 255, 77, 175, 255, 128, 213, 4, 239, 23, 149, 111, 16, 216, 15, 30, 87, 14, 47, 105, 31, 15, 255, 38, 14, 25, 19, 11, 255, 252, 120, 170, 5, 38, 92, 175, 39, 75, 206, 190, 223, 30, 24, 127, 191, 223, 72, 131, 16, 254, 223, 255, 16, 145, 209, 121, 153, 6, 40, 28, 3, 17, 200, 24, 4, 47, 104, 0, 51, 17, 228, + 64, 219, 0, 55, 143, 93, 33, 242, 64, 0, 74, 31, 189, 0, 33, 238, 40, 211, 97, 15, 255, 26, 6, 25, 212, 133, 7, 27, 9, 24, 200, 48, 3, 74, 11, 245, 58, 188, 10, 131, 255, 207, 235, 15, 27, 35, 40, 131, 26, 187, 18, 156, 0, 0, 179, 46, 31, 255, 3, 223, 82, 15, 95, 230, 207, 255, 167, 48, 24, 215, + 252, 17, 36, 64, 5, 177, 191, 103, 228, 98, 0, 34, 111, 255, 33, 151, 247, 31, 255, 17, 4, 183, 0, 26, 241, 0, 253, 15, 255, 33, 249, 0, 2, 242, 207, 255, 253, 239, 15, 255, 255, 63, 255, 11, 28, 139, 30, 35, 251, 15, 255, 255, 15, 255, 20, 67, 87, 68, 72, 31, 255, 175, 168, 31, 255, 49, 58, 229, 0, 9, + 1, 5, 255, 7, 0, 5, 5, 0, 20, 20, 0, 223, 18, 18, 32, 2, 19, 19, 0, 15, 15, 31, 32, 2, 16, 8, 16, 17, 6, 6, 0, 17, 17, 252, 0, 14, 14, 0, 23, 23, 80, 29, 16, 38, 25, 16, 44, 112, 38, 64, 53, 24, 24, 32, 38, 16, 59, 13, 131, 13, 32, 44, 16, 65, 16, 8, 16, 71, 16, 56, + 11, 11, 1, 32, 62, 16, 71, 64, 101, 112, 32, 16, 101, 16, 26, 16, 47, 10, 135, 10, 32, 95, 16, 98, 16, 134, 64, 8, 0, 67, 77, 190, 65, 37, 62, 192, 0, 33, 0, 118, 75, 33, 193, 81, 208, 28, 35, 0, 0, 5, 46, 57, 0, 1, 16, 21, 213, 4, 116, 31, 109, 6, 0, 7, 31, 111, 9, 31, 111, 31, + 4, 54, 31, 113, 16, 175, 0, 15, 30, 112, 17, 0, 16, 251, 127, 27, 253, 21, 0, 22, 0, 23, 0, 24, 203, 0, 25, 30, 198, 128, 97, 27, 30, 203, 28, 0, 234, 29, 0, 30, 27, 183, 32, 16, 149, 34, 30, 219, 191, 35, 48, 123, 36, 0, 37, 0, 38, 0, 255, 39, 0, 40, 0, 41, 0, 42, 0, 254, 43, 0, + 44, 0, 45, 0, 46, 80, 191, 143, 40, 78, 215, 104, 159, 63, 210, 161, 0, 47, 0, 160, 225, 30, 228, 243, 65, 129, 207, 211, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 4, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, + 67, 0, 0, 4, 224, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 3, 192, 64, 3, 112, 1, 1, 64, 27, 0, 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, 79, 79, 84, 32, 27, 64, 254, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 14, 109, 64, 79, 2, 128, 64, 81, 226, 226, + 16, 19, 26, 90, 80, 15, 160, 64, 26, 207, 45, 16, 39, 40, 16, 127, 190, 32, 96, 19, 255, 255, 0, 46, 2, 128, 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, 3, 10, 46, 0, 46, 46, 0, 101, 117, 255, 102, 114, 101, 110, 99, 104, 0, 109, 255, 101, 115, 115, 97, 103, 101, 46, 98, 223, + 109, 103, 96, 11, 105, 100, 46, 116, 98, 255, 108, 0, 115, 116, 114, 117, 99, 116, 61, 48, 10, 176, 198, 77, 69, 83, 71, 16, 45, 49, 110, 80, 187, 2, 2, 208, 228, 73, 78, 70, 16, 27, 252, 0, 96, 0, 6, 0, 12, 49, 62, 113, 56, 85, 48, 159, 2, 144, 11, 102, 144, 23, 202, 128, 35, 1, 167, 136, 144, 11, + 174, 144, 59, 49, 130, 68, 65, 84, 191, 49, 80, 70, 86, 0, 101, 0, 117, 0, 238, 105, 0, 108, 16, 1, 101, 0, 122, 17, 175, 255, 105, 0, 110, 0, 115, 0, 233, 0, 167, 114, 16, 25, 114, 17, 191, 32, 23, 32, 0, 100, 119, 16, 35, 115, 0, 113, 16, 43, 101, 0, 10, 63, 16, 13, 32, 19, 83, 0, 85, 0, + 80, 0, 238, 69, 0, 82, 17, 229, 77, 0, 65, 16, 7, 234, 73, 0, 79, 17, 241, 71, 16, 11, 76, 16, 15, 231, 88, 0, 89, 17, 42, 0, 99, 84, 73, 0, 109, 245, 0, 112, 0, 111, 16, 185, 115, 16, 205, 98, 41, 112, 181, 32, 187, 108, 16, 223, 114, 80, 9, 224, 203, 46, 42, 16, 205, 1, 3, 0, 118, 16, + 73, 117, 17, 5, 32, 17, 5, 149, 233, 17, 99, 129, 13, 97, 17, 45, 32, 16, 107, 111, 37, 49, 3, 33, 9, 39, 17, 65, 32, 123, 108, 16, 125, 105, 68, 18, 239, 87, 17, 77, 32, 7, 32, 141, 117, 49, 65, 32, 27, 41, 64, 77, 65, 55, 100, 17, 93, 116, 16, 73, 33, 117, 115, 42, 49, 33, 1, 73, 18, 0, + 17, 83, 97, 19, 79, 103, 17, 153, 149, 97, 17, 163, 65, 131, 97, 16, 171, 101, 17, 177, 116, 41, 48, 107, 33, 169, 99, 49, 5, 109, 17, 211, 65, 173, 33, 79, 3, 65, 3, 6, 82, 71, 19, 27, 0, 8, 33, 157, 223, 67, 98, 50, 251, 4, 0, 6, 4, 56, 212, 56, 178, 83, 7, 0, 211, 175, 8, 82, 123, 35, + 51, 171, 3, 19, 219, 24, 19, 223, 4, 147, 199, 43, 67, 255, 79, 77, 77, 69, 78, 84, 0, 68, 253, 73, 83, 67, 95, 48, 49, 80, 7, 50, 127, 80, 15, 51, 0, 84, 73, 84, 76, 69, 251, 95, 77, 65, 73, 78, 80, 10, 83, 85, 229, 66, 0, 64, 0, 0, 0, 144, 111, 112, 36, 67, 174, 239, 55, 113, 97, 96, + 147, 28, 19, 62, 141, 124, 80, 171, 0, 190, 198, 20, 162, 51, 179, 16, 153, 247, 100, 67, 164, 76, 51, 191, 12, 0, 0, 243, 19, 54, 175, 66, 51, 203, 19, 221, 137, 230, 191, 39, 67, 215, 20, 0, 0, 251, 104, 17, 158, 53, 51, 227, 16, 185, 23, 177, 123, 254, 51, 239, 170, 28, 116, 149, 4, 81, 23, 7, 80, 235, + 9, 20, 191, 160, 10, 20, 195, 11, 224, 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 90, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 90, 224, 245, 0, 0, 0, 32, 16, 3, 192, 16, 11, 0, 42, 64, 3, 112, 2, 1, 80, 27, 3, 16, 35, 64, + 80, 3, 239, 128, 0, 3, 32, 22, 0, 0, 82, 79, 220, 79, 84, 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, 253, 67, 212, 17, 0, 0, 18, 64, 80, 89, 190, 236, 32, 88, 255, 255, 0, 46, 2, 128, 97, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 32, 132, 46, 0, 46, 46, 0, 101, 109, 255, + 98, 101, 100, 100, 101, 100, 102, 111, 255, 110, 116, 0, 109, 101, 115, 115, 97, 223, 103, 101, 32, 11, 50, 54, 46, 98, 114, 159, 102, 16, 19, 0, 0, 8, 82, 70, 78, 84, 254, 239, 255, 1, 4, 48, 123, 16, 0, 5, 70, 237, 73, 78, 70, 32, 235, 1, 33, 16, 241, 27, 190, 27, 32, 219, 56, 0, 0, 88, 104, 16, + 155, 255, 20, 33, 27, 26, 0, 84, 71, 76, 191, 80, 16, 15, 48, 24, 26, 20, 24, 0, 249, 0, 8, 0, 0, 11, 32, 221, 17, 3, 128, 111, 49, 31, 96, 0, 0, 0, 106, 127, 255, 176, 0, 186, 111, 16, 3, 95, 255, 160, 16, 3, 144, 48, 3, 125, 0, 144, 50, 3, 119, 80, 0, 7, 16, 83, 7, 253, 255, 128, + 0, 9, 255, 96, 16, 3, 64, 254, 0, 10, 255, 32, 0, 11, 255, 0, 238, 107, 111, 1, 107, 61, 39, 0, 16, 220, 0, 0, 191, 255, 223, 0, 8, 18, 129, 79, 255, 253, 0, 223, 213, 255, 192, 98, 232, 97, 19, 0, 254, 18, 221, 255, 170, 242, 18, 159, 252, 34, 163, 64, 16, 41, 176, 0, 255, 112, 186, 63, 17, 231, + 63, 255, 112, 48, 3, 47, 16, 7, 187, 31, 17, 159, 31, 255, 80, 48, 3, 13, 221, 178, 64, 2, 143, 47, 1, 17, 1, 227, 186, 36, 183, 6, 20, 203, 175, 12, 20, 207, 47, 35, 49, 7, 255, 255, 48, 255, 31, 255, 249, 0, 143, 255, 241, 0, 191, 239, 18, 222, 255, 255, 16, 0, 255, 250, 117, 20, 131, 249, 103, 155, + 36, 107, 79, 16, 23, 14, 220, 255, 247, 18, 238, 252, 0, 5, 20, 152, 20, 128, 190, 64, 16, 40, 184, 222, 255, 255, 254, 84, 139, 119, 3, 3, 112, 7, 203, 16, 51, 251, 223, 255, 240, 255, 0, 175, 255, 208, 0, 9, 238, 64, 122, 3, 152, 153, 66, 0, 0, 62, 21, 211, 223, 21, 215, 173, 239, 21, 219, 111, 21, 223, + 2, 117, 166, 96, 48, 36, 22, 124, 35, 105, 208, 54, 88, 5, 97, 31, 207, 22, 162, 22, 51, 217, 5, 255, 67, 223, 9, 239, 22, 203, 118, 94, 255, 191, 175, 49, 228, 255, 255, 7, 117, 49, 251, 71, 22, 228, 248, 38, 179, 150, 221, 38, 111, 253, 207, 255, 186, 245, 19, 87, 243, 0, 15, 16, 7, 13, 18, 12, 225, 3, + 33, 16, 182, 156, 0, 3, 255, 1, 20, 255, 25, 62, 19, 252, 86, 4, 190, 255, 255, 6, 24, 192, 40, 196, 255, 0, 255, 202, 118, 0, 35, 255, 251, 118, 105, 72, 119, 117, 65, 34, 107, 232, 255, 80, 0, 228, 84, 69, 141, 82, 175, 201, 53, 209, 25, 136, 20, 158, 166, 0, 41, 4, 253, 7, 169, 1, 25, 167, 159, 0, + 55, 152, 207, 175, 255, 52, 176, 105, 164, 71, 118, 64, 191, 190, 255, 144, 0, 184, 104, 207, 211, 0, 201, 147, 169, 179, 41, 123, 160, 25, 127, 241, 25, 131, 24, 201, 204, 123, 208, 192, 0, 4, 174, 255, 24, 7, 255, 0, 185, 3, 41, 131, 254, 185, 0, 16, 192, 106, 8, 87, 215, 119, 84, 35, 43, 252, 96, 191, 134, 51, + 88, 72, 35, 208, 5, 170, 40, 41, 28, 254, 25, 33, 21, 110, 25, 227, 169, 128, 21, 111, 242, 161, 31, 53, 16, 186, 25, 219, 127, 103, 80, 3, 92, 254, 41, 238, 106, 104, 86, 119, 153, 191, 187, 160, 190, 169, 119, 101, 83, 253, 32, 85, 138, 134, 198, 83, 187, 249, 80, 3, 49, 250, 108, 2, 198, 52, 0, 24, 180, 84, + 3, 26, 67, 6, 153, 26, 211, 189, 13, 106, 200, 85, 103, 120, 153, 161, 30, 135, 251, 118, 85, 67, 221, 212, 138, 230, 171, 181, 74, 26, 151, 247, 80, 187, 16, 191, 50, 3, 248, 22, 2, 17, 227, 148, 1, 24, 75, 96, 3, 0, 48, 3, 254, 58, 229, 42, 233, 255, 4, 207, 255, 22, 223, 255, 254, 175, 255, 255, 254, 129, + 143, 255, 234, 97, 111, 107, 26, 224, 41, 189, 42, 227, 24, 42, 231, 223, 244, 82, 27, 120, 80, 155, 109, 128, 80, 227, 25, 125, 0, 23, 229, 59, 16, 193, 24, 167, 63, 255, 244, 17, 58, 208, 0, 165, 207, 49, 84, 80, 27, 64, 32, 3, 112, 16, 15, 208, 82, 4, 159, 14, 2, 9, 252, 16, 255, 69, 63, 96, 3, 0, + 160, 3, 169, 239, 23, 46, 0, 112, 3, 48, 144, 3, 41, 43, 80, 232, 0, 6, 63, 23, 91, 10, 25, 74, 18, 247, 55, 63, 170, 8, 25, 86, 13, 23, 111, 111, 16, 178, 255, 22, 170, 82, 73, 115, 14, 27, 211, 47, 85, 251, 34, 3, 207, 86, 15, 61, 21, 123, 28, 120, 251, 85, 119, 137, 43, 247, 237, 76, 27, 252, + 173, 28, 0, 17, 154, 49, 80, 86, 23, 97, 19, 149, 240, 144, 3, 213, 147, 14, 81, 231, 13, 87, 247, 11, 87, 144, 3, 9, 21, 217, 0, 48, 3, 254, 221, 221, 10, 115, 30, 32, 11, 81, 231, 108, 232, 221, 144, 219, 221, 96, 120, 70, 11, 236, 19, 239, 86, 219, 96, 3, 32, 219, 121, 135, 141, 64, 247, 42, 255, 54, + 140, 115, 152, 250, 255, 255, 226, 183, 32, 100, 146, 215, 33, 83, 35, 231, 226, 6, 107, 6, 178, 143, 20, 67, 31, 255, 67, 151, 71, 59, 158, 173, 156, 125, 29, 60, 1, 251, 135, 138, 223, 163, 250, 37, 232, 119, 118, 65, 109, 192, 108, 28, 205, 33, 134, 18, 65, 106, 50, 223, 233, 32, 253, 165, 223, 144, 3, 191, 80, 3, + 190, 87, 119, 63, 80, 2, 191, 255, 185, 160, 94, 247, 253, 130, 118, 83, 167, 63, 64, 0, 255, 8, 23, 84, 26, 161, 52, 95, 14, 3, 0, 255, 87, 247, 20, 175, 26, 204, 243, 0, 0, 4, 223, 94, 75, 119, 251, 197, 85, 221, 122, 207, 164, 186, 103, 119, 84, 115, 249, 72, 13, 32, 191, 28, 229, 43, 169, 24, 253, 0, + 200, 10, 241, 0, 9, 48, 80, 3, 29, 172, 0, 7, 80, 3, 135, 223, 36, 139, 41, 239, 162, 251, 80, 3, 234, 7, 208, 255, 8, 225, 255, 15, 227, 41, 58, 78, 99, 83, 20, 223, 11, 30, 99, 127, 46, 73, 79, 255, 4, 103, 231, 117, 48, 255, 92, 83, 52, 8, 101, 106, 235, 167, 16, 213, 158, 112, 91, 3, 13, 212, + 3, 1, 19, 67, 84, 31, 147, 249, 31, 159, 251, 30, 191, 251, 31, 175, 37, 116, 169, 253, 213, 234, 7, 83, 7, 9, 147, 23, 63, 255, 84, 165, 50, 147, 3, 250, 134, 231, 158, 7, 50, 31, 239, 249, 84, 31, 243, 251, 48, 3, 10, 24, 187, 9, 128, 191, 15, 255, 48, 210, 52, 85, 197, 35, 191, 80, 3, 79, 255, 32, + 64, 255, 191, 2, 19, 234, 62, 144, 0, 4, 239, 144, 101, 31, 160, 160, 4, 141, 127, 40, 248, 223, 28, 28, 255, 190, 251, 29, 191, 254, 48, 0, 255, 193, 72, 11, 34, 159, 255, 40, 139, 63, 37, 49, 76, 19, 41, 66, 3, 125, 191, 5, 40, 47, 53, 3, 22, 72, 47, 214, 36, 175, 255, 13, 69, 49, 1, 234, 255, 255, + 176, 30, 99, 16, 33, 58, 14, 23, 166, 171, 15, 60, 70, 244, 60, 70, 9, 65, 158, 1, 91, 243, 205, 239, 255, 127, 30, 108, 39, 251, 93, 203, 174, 169, 32, 155, 175, 69, 119, 5, 255, 18, 39, 83, 16, 25, 38, 28, 125, 70, 167, 145, 71, 247, 48, 3, 34, 16, 46, 148, 85, 33, 7, 73, 30, 156, 159, 30, 160, 143, + 50, 87, 255, 237, 0, 55, 255, 93, 83, 0, 10, 31, 196, 27, 43, 16, 98, 41, 63, 203, 30, 211, 219, 28, 209, 189, 113, 226, 16, 0, 13, 24, 87, 39, 138, 69, 159, 247, 208, 3, 10, 87, 23, 48, 164, 32, 168, 34, 79, 7, 24, 183, 7, 86, 107, 138, 5, 87, 208, 15, 255, 9, 13, 27, 20, 159, 87, 243, 143, 153, + 251, 175, 95, 112, 3, 176, 29, 155, 179, 255, 255, 228, 186, 222, 17, 212, 255, 255, 226, 31, 159, 96, 31, 163, 161, 194, 45, 151, 128, 26, 108, 42, 78, 15, 255, 7, 79, 4, 6, 106, 31, 163, 8, 255, 75, 19, 12, 31, 175, 13, 31, 179, 140, 15, 112, 3, 47, 192, 26, 104, 0, 251, 90, 59, 25, 226, 209, 0, 246, 31, + 212, 245, 80, 3, 15, 223, 46, 18, 162, 177, 117, 25, 151, 255, 0, 46, 27, 243, 2, 40, 215, 4, 189, 156, 207, 255, 78, 255, 185, 157, 119, 59, 159, 245, 239, 236, 112, 95, 31, 255, 37, 126, 159, 112, 74, 82, 139, 128, 86, 231, 22, 235, 84, 183, 163, 223, 147, 43, 42, 49, 71, 27, 55, 1, 164, 51, 13, 23, 122, 14, + 23, 34, 210, 15, 160, 64, 3, 13, 183, 125, 104, 255, 244, 66, 99, 202, 222, 243, 223, 255, 98, 95, 3, 112, 3, 221, 225, 227, 164, 16, 83, 159, 48, 153, 147, 15, 255, 24, 63, 87, 247, 41, 255, 149, 31, 80, 3, 128, 191, 241, 19, 24, 243, 17, 55, 243, 53, 28, 120, 25, 170, 61, 246, 223, 255, 250, 42, 127, 229, 89, + 43, 81, 16, 51, 35, 191, 80, 220, 212, 58, 91, 13, 39, 95, 251, 60, 79, 78, 175, 178, 47, 239, 255, 151, 137, 180, 190, 173, 26, 54, 119, 136, 193, 3, 106, 240, 90, 223, 198, 253, 48, 15, 240, 255, 15, 255, 255, 15, 255, 4, 51, 17, 60, 11, 148, 1, 85, 175, 45, 16, 10, 197, 63, 32, 87, 219, 39, 231, 153, 160, + 87, 235, 127, 255, 66, 16, 31, 118, 37, 134, 255, 89, 29, 242, 255, 29, 45, 255, 16, 21, 234, 159, 1, 1, 250, 32, 0, 10, 239, 176, 28, 11, 240, 30, 15, 170, 246, 30, 19, 252, 23, 34, 255, 221, 234, 255, 91, 195, 86, 39, 3, 95, 31, 62, 47, 111, 255, 70, 16, 79, 243, 100, 171, 75, 255, 241, 14, 227, 3, 43, + 67, 159, 27, 74, 91, 175, 123, 95, 225, 21, 119, 81, 42, 175, 160, 250, 102, 172, 175, 23, 134, 4, 175, 255, 178, 0, 80, 99, 21, 96, 21, 32, 186, 23, 26, 222, 138, 108, 95, 255, 79, 85, 163, 3, 189, 79, 111, 255, 53, 103, 119, 101, 175, 255, 202, 229, 149, 85, 88, 43, 239, 168, 31, 254, 39, 255, 253, 41, 23, 255, + 28, 12, 239, 23, 103, 30, 47, 176, 15, 166, 8, 7, 22, 88, 15, 112, 192, 29, 138, 255, 29, 70, 255, 159, 80, 192, 34, 40, 71, 111, 255, 81, 47, 115, 16, 192, 70, 127, 246, 28, 173, 229, 255, 32, 4, 208, 192, 15, 255, 3, 12, 31, 231, 15, 42, 65, 176, 22, 214, 239, 29, 175, 159, 28, 234, 79, 30, 222, 165, 13, + 31, 254, 9, 33, 98, 31, 227, 4, 29, 34, 11, 94, 30, 235, 47, 31, 79, 175, 255, 96, 2, 24, 53, 126, 16, 56, 242, 127, 255, 239, 255, 255, 42, 23, 187, 80, 48, 3, 239, 255, 112, 24, 40, 128, 250, 255, 95, 255, 144, 242, 63, 255, 160, 176, 169, 63, 24, 169, 95, 48, 87, 255, 31, 80, 71, 247, 127, 117, 16, 95, + 143, 255, 61, 31, 70, 54, 31, 74, 48, 42, 37, 247, 17, 198, 14, 30, 206, 12, 18, 45, 11, 24, 219, 95, 46, 243, 9, 21, 47, 9, 223, 255, 192, 10, 68, 56, 87, 244, 95, 3, 232, 3, 53, 108, 191, 69, 251, 47, 184, 144, 12, 29, 201, 104, 196, 14, 31, 57, 26, 11, 46, 151, 7, 131, 10, 170, 111, 24, 239, 13, + 30, 0, 8, 26, 234, 5, 24, 62, 146, 3, 88, 174, 32, 15, 30, 46, 24, 73, 147, 31, 144, 3, 143, 15, 160, 3, 34, 131, 80, 3, 24, 255, 242, 90, 63, 79, 162, 23, 248, 255, 247, 255, 251, 255, 245, 233, 183, 16, 12, 30, 180, 79, 25, 83, 33, 243, 255, 170, 254, 18, 83, 228, 23, 203, 32, 182, 135, 191, 73, 231, + 162, 8, 87, 255, 14, 87, 255, 38, 23, 27, 132, 226, 66, 247, 154, 253, 86, 11, 31, 6, 0, 243, 87, 255, 251, 0, 192, 16, 153, 247, 15, 255, 14, 19, 179, 4, 6, 59, 146, 43, 58, 247, 53, 27, 246, 24, 93, 2, 65, 159, 31, 255, 33, 227, 249, 93, 25, 251, 208, 17, 35, 32, 0, 55, 206, 192, 48, 149, 63, 31, + 157, 64, 3, 240, 23, 34, 240, 31, 235, 241, 233, 0, 2, 17, 137, 90, 191, 22, 149, 96, 3, 223, 79, 26, 25, 189, 42, 29, 143, 255, 79, 255, 250, 13, 150, 9, 31, 252, 56, 131, 30, 104, 131, 3, 118, 183, 255, 82, 42, 95, 224, 67, 255, 249, 91, 107, 127, 255, 6, 111, 159, 99, 35, 147, 4, 239, 95, 71, 127, 224, + 27, 114, 1, 253, 235, 133, 86, 159, 111, 255, 223, 31, 168, 2, 87, 169, 118, 112, 224, 207, 26, 188, 255, 31, 160, 44, 233, 255, 84, 24, 128, 196, 15, 94, 0, 13, 144, 3, 11, 80, 3, 8, 159, 0, 100, 82, 159, 253, 214, 15, 159, 30, 41, 255, 0, 32, 183, 36, 75, 134, 4, 239, 221, 57, 87, 16, 192, 81, 135, 255, + 7, 16, 192, 247, 0, 2, 87, 175, 125, 86, 207, 255, 241, 75, 27, 86, 112, 29, 145, 20, 91, 80, 28, 91, 166, 16, 93, 41, 168, 108, 33, 83, 41, 239, 254, 15, 255, 2, 144, 27, 85, 191, 15, 255, 255, 15, 255, 163, 5, 181, 15, 255, 52, 19, 86, 151, 4, 26, 101, 29, 174, 255, 21, 221, 255, 0, 239, 246, 233, 117, + 0, 36, 143, 159, 119, 117, 30, 179, 237, 255, 255, 197, 111, 255, 67, 70, 45, 23, 6, 82, 253, 95, 160, 92, 163, 253, 90, 151, 222, 109, 142, 61, 59, 83, 40, 91, 63, 29, 171, 175, 39, 201, 79, 255, 37, 119, 168, 99, 45, 51, 212, 108, 105, 114, 22, 48, 37, 157, 13, 51, 2, 78, 32, 52, 240, 80, 7, 191, 223, 8, + 205, 221, 37, 50, 51, 48, 3, 20, 84, 0, 2, 40, 211, 126, 233, 17, 239, 125, 171, 68, 255, 254, 221, 143, 255, 136, 193, 50, 85, 93, 95, 249, 93, 107, 217, 15, 90, 0, 70, 78, 243, 4, 74, 93, 171, 15, 94, 7, 151, 223, 112, 75, 131, 252, 93, 163, 186, 240, 223, 158, 88, 172, 144, 30, 254, 208, 30, 61, 74, 37, + 42, 242, 63, 103, 159, 137, 35, 140, 11, 11, 92, 15, 74, 129, 95, 66, 92, 11, 96, 159, 252, 225, 95, 85, 29, 116, 234, 223, 254, 128, 31, 207, 128, 31, 114, 64, 41, 186, 197, 14, 255, 54, 33, 2, 62, 13, 31, 228, 5, 54, 252, 251, 41, 48, 3, 38, 12, 7, 48, 3, 250, 31, 83, 55, 150, 0, 243, 4, 223, 255, + 1, 24, 80, 21, 158, 248, 159, 244, 255, 251, 48, 191, 21, 40, 127, 31, 148, 25, 231, 206, 177, 253, 94, 143, 4, 79, 7, 239, 255, 64, 31, 20, 140, 161, 30, 2, 94, 99, 46, 11, 1, 124, 143, 151, 53, 239, 214, 123, 182, 45, 39, 251, 20, 191, 255, 254, 20, 203, 236, 255, 251, 22, 32, 47, 2, 223, 46, 86, 15, 194, + 3, 145, 112, 234, 127, 15, 232, 5, 95, 49, 111, 65, 115, 160, 3, 63, 42, 80, 3, 15, 255, 20, 207, 86, 99, 255, 80, 3, 239, 80, 19, 170, 143, 50, 192, 128, 88, 99, 64, 94, 99, 64, 80, 19, 65, 43, 31, 13, 26, 234, 40, 3, 39, 91, 40, 11, 40, 150, 31, 38, 30, 200, 34, 3, 191, 50, 254, 34, 79, 1, + 255, 66, 91, 178, 0, 37, 215, 111, 0, 74, 247, 47, 7, 8, 61, 215, 170, 64, 58, 251, 1, 22, 159, 7, 23, 109, 13, 26, 247, 191, 95, 27, 65, 223, 255, 251, 6, 255, 79, 80, 31, 32, 175, 27, 82, 255, 22, 188, 25, 138, 26, 95, 90, 191, 21, 87, 47, 14, 238, 15, 33, 227, 9, 112, 3, 248, 30, 134, 247, 245, + 0, 2, 52, 82, 150, 95, 254, 76, 7, 127, 74, 103, 95, 28, 175, 221, 39, 204, 250, 47, 167, 227, 71, 63, 186, 250, 9, 111, 2, 8, 152, 119, 60, 75, 8, 92, 87, 239, 0, 19, 51, 143, 227, 175, 255, 120, 173, 126, 126, 221, 247, 255, 254, 183, 16, 49, 159, 255, 75, 99, 231, 80, 14, 214, 37, 65, 231, 241, 112, 3, + 47, 253, 148, 209, 15, 255, 33, 41, 151, 3, 111, 155, 1, 175, 226, 27, 193, 243, 6, 255, 146, 19, 120, 95, 43, 155, 0, 70, 146, 118, 121, 36, 59, 143, 254, 90, 195, 31, 251, 162, 9, 130, 1, 114, 15, 177, 10, 255, 255, 110, 56, 179, 27, 70, 255, 27, 170, 189, 253, 19, 18, 193, 0, 5, 116, 127, 228, 253, 15, 90, + 19, 7, 207, 255, 15, 255, 255, 15, 255, 14, 49, 0, 11, 239, 149, 246, 31, 187, 68, 167, 11, 52, 22, 250, 14, 62, 12, 44, 176, 168, 221, 90, 110, 201, 37, 19, 35, 211, 23, 42, 85, 47, 126, 127, 225, 65, 96, 0, 92, 250, 240, 27, 236, 238, 192, 1, 239, 27, 106, 111, 255, 112, 60, 239, 117, 167, 130, 1, 239, 48, + 30, 2, 192, 30, 132, 245, 97, 30, 188, 254, 46, 176, 63, 53, 103, 31, 62, 60, 247, 208, 108, 236, 7, 0, 0, 20, 83, 42, 253, 61, 188, 60, 15, 138, 95, 93, 79, 6, 55, 0, 30, 211, 4, 20, 179, 30, 22, 153, 153, 191, 123, 71, 28, 177, 11, 229, 47, 221, 37, 71, 244, 100, 31, 255, 112, 0, 38, 253, 11, 38, + 206, 8, 55, 242, 33, 54, 234, 254, 0, 2, 70, 222, 48, 29, 139, 96, 31, 159, 170, 128, 31, 179, 192, 31, 183, 242, 31, 171, 243, 29, 159, 43, 46, 196, 33, 150, 247, 21, 198, 248, 23, 251, 251, 47, 149, 255, 95, 48, 45, 131, 10, 31, 127, 13, 30, 68, 47, 86, 31, 173, 111, 54, 220, 176, 26, 71, 80, 64, 69, 55, + 162, 159, 31, 169, 14, 45, 173, 93, 79, 28, 191, 7, 61, 179, 82, 31, 48, 246, 31, 52, 144, 31, 52, 31, 35, 226, 31, 39, 175, 224, 31, 43, 249, 46, 119, 48, 254, 239, 255, 19, 249, 226, 14, 193, 2, 80, 95, 30, 38, 205, 253, 63, 208, 7, 47, 31, 139, 32, 169, 207, 109, 255, 253, 79, 223, 255, 239, 245, 2, 143, + 30, 81, 175, 255, 176, 255, 162, 176, 79, 91, 243, 88, 83, 1, 138, 106, 31, 226, 127, 72, 11, 158, 8, 86, 115, 26, 99, 21, 119, 65, 76, 170, 183, 255, 196, 0, 76, 251, 0, 2, 140, 241, 92, 31, 236, 192, 49, 67, 0, 0, 179, 90, 15, 32, 195, 132, 176, 87, 143, 11, 127, 4, 14, 155, 1, 47, 175, 12, 27, 231, + 63, 71, 102, 35, 179, 45, 255, 90, 235, 63, 255, 143, 255, 25, 184, 169, 254, 31, 253, 248, 17, 237, 224, 17, 228, 31, 205, 64, 87, 150, 179, 40, 27, 198, 223, 26, 11, 255, 255, 225, 46, 70, 235, 31, 3, 118, 143, 253, 0, 0, 2, 31, 155, 59, 26, 40, 25, 70, 251, 0, 27, 16, 36, 0, 110, 190, 48, 175, 255, 244, + 95, 255, 247, 128, 22, 216, 53, 50, 71, 57, 107, 31, 163, 239, 130, 16, 80, 215, 176, 73, 14, 179, 34, 191, 31, 220, 32, 3, 159, 31, 221, 41, 174, 111, 210, 254, 208, 14, 250, 124, 15, 91, 243, 43, 239, 2, 41, 95, 171, 61, 175, 255, 192, 28, 15, 243, 29, 40, 255, 206, 94, 61, 121, 174, 31, 231, 12, 54, 118, 32, + 120, 51, 18, 44, 111, 41, 231, 16, 229, 0, 45, 77, 45, 81, 32, 15, 219, 255, 102, 15, 255, 42, 221, 221, 214, 199, 208, 29, 221, 221, 47, 19, 78, 15, 255, 6, 208, 14, 7, 1, 9, 170, 130, 5, 120, 146, 31, 58, 163, 243, 27, 234, 243, 31, 58, 128, 3, 10, 86, 184, 1, 118, 20, 75, 195, 224, 3, 79, 255, 84, + 92, 199, 249, 208, 3, 6, 7, 101, 166, 15, 31, 247, 79, 94, 11, 69, 70, 103, 99, 30, 137, 215, 255, 229, 31, 27, 244, 31, 31, 241, 255, 247, 199, 88, 192, 35, 243, 11, 246, 46, 17, 235, 2, 8, 255, 213, 247, 191, 23, 37, 255, 80, 3, 229, 23, 49, 64, 162, 6, 23, 143, 5, 31, 227, 16, 118, 31, 190, 211, 55, + 143, 85, 31, 151, 208, 25, 182, 243, 30, 149, 246, 30, 182, 247, 76, 29, 203, 246, 15, 130, 17, 28, 223, 4, 223, 58, 23, 45, 251, 174, 31, 24, 112, 127, 23, 117, 207, 255, 32, 46, 172, 219, 103, 98, 47, 85, 214, 0, 71, 255, 245, 0, 202, 49, 73, 5, 158, 31, 29, 143, 1, 31, 55, 46, 74, 115, 171, 6, 30, 175, + 11, 31, 100, 14, 31, 1, 15, 255, 245, 224, 87, 117, 19, 30, 92, 253, 30, 96, 254, 118, 62, 94, 97, 3, 101, 31, 207, 6, 255, 72, 127, 33, 42, 229, 65, 243, 247, 0, 3, 5, 102, 197, 79, 151, 32, 55, 31, 62, 86, 167, 58, 223, 252, 1, 71, 117, 16, 21, 157, 191, 251, 62, 193, 251, 157, 255, 249, 16, 7, 253, + 255, 144, 5, 191, 255, 139, 29, 171, 223, 230, 255, 253, 100, 102, 191, 31, 142, 0, 246, 80, 3, 170, 224, 202, 187, 127, 71, 247, 9, 31, 91, 11, 48, 147, 33, 31, 148, 42, 151, 47, 55, 157, 37, 219, 26, 180, 31, 33, 80, 117, 112, 3, 199, 119, 32, 40, 183, 255, 6, 201, 49, 5, 236, 255, 246, 16, 16, 3, 251, 5, + 17, 35, 27, 114, 251, 255, 3, 253, 215, 107, 191, 190, 12, 255, 250, 244, 102, 207, 255, 224, 31, 161, 96, 41, 151, 231, 239, 235, 64, 15, 137, 28, 46, 252, 223, 255, 162, 15, 28, 22, 72, 7, 55, 227, 136, 95, 0, 0, 17, 0, 215, 0, 73, 40, 63, 254, 82, 99, 214, 0, 119, 161, 82, 15, 236, 25, 14, 26, 159, 42, + 123, 56, 63, 44, 123, 6, 95, 39, 67, 4, 143, 228, 47, 255, 48, 4, 239, 121, 153, 65, 197, 255, 119, 98, 44, 43, 79, 255, 245, 85, 0, 3, 1, 49, 191, 255, 239, 31, 98, 191, 92, 79, 10, 95, 44, 207, 126, 175, 255, 63, 233, 64, 62, 98, 108, 26, 203, 254, 205, 121, 164, 213, 54, 16, 96, 111, 255, 138, 177, 89, + 155, 34, 95, 3, 174, 5, 15, 91, 19, 11, 35, 142, 68, 91, 35, 1, 127, 255, 22, 60, 25, 161, 0, 37, 138, 35, 109, 113, 25, 106, 0, 66, 16, 15, 236, 255, 15, 255, 255, 14, 185, 127, 87, 212, 153, 32, 30, 19, 48, 29, 115, 48, 30, 91, 128, 3, 125, 8, 193, 56, 113, 0, 0, 207, 254, 30, 208, 255, 124, 27, + 74, 255, 0, 1, 223, 254, 64, 19, 207, 255, 152, 96, 93, 231, 3, 66, 32, 41, 135, 19, 237, 62, 179, 68, 11, 43, 96, 3, 128, 87, 208, 208, 3, 192, 11, 135, 147, 3, 103, 150, 0, 21, 31, 31, 235, 255, 31, 255, 255, 9, 29, 225, 143, 13, 31, 242, 23, 58, 23, 66, 240, 0, 98, 20, 253, 87, 48, 255, 239, 255, + 112, 30, 6, 144, 253, 255, 95, 255, 160, 5, 31, 31, 49, 31, 83, 31, 151, 63, 24, 11, 159, 31, 172, 15, 160, 14, 159, 255, 170, 80, 30, 68, 124, 23, 243, 255, 144, 3, 244, 24, 71, 189, 224, 21, 82, 176, 38, 118, 48, 39, 251, 32, 56, 31, 239, 38, 99, 247, 133, 109, 24, 120, 16, 136, 21, 119, 34, 94, 143, 15, + 148, 17, 4, 30, 91, 22, 192, 80, 3, 252, 31, 22, 138, 251, 112, 3, 15, 211, 47, 37, 247, 111, 31, 147, 127, 208, 3, 100, 38, 107, 159, 255, 110, 151, 110, 159, 144, 208, 3, 10, 151, 17, 169, 51, 71, 247, 10, 94, 3, 9, 95, 255, 47, 219, 7, 250, 255, 81, 22, 117, 16, 24, 189, 247, 127, 255, 211, 181, 127, 31, + 113, 8, 48, 240, 32, 244, 0, 71, 254, 98, 0, 28, 255, 255, 177, 223, 25, 64, 74, 62, 33, 119, 30, 33, 30, 244, 247, 31, 112, 247, 71, 107, 75, 127, 255, 48, 146, 255, 96, 3, 11, 16, 45, 5, 255, 199, 255, 235, 46, 98, 25, 18, 31, 255, 4, 119, 0, 186, 4, 30, 65, 12, 252, 134, 25, 171, 255, 16, 27, 207, + 240, 207, 16, 3, 24, 225, 240, 253, 72, 255, 234, 240, 64, 12, 65, 183, 106, 56, 15, 253, 1, 62, 18, 174, 144, 112, 3, 79, 31, 139, 63, 253, 160, 216, 32, 129, 255, 80, 3, 24, 40, 32, 80, 45, 111, 11, 45, 26, 25, 194, 9, 125, 112, 3, 248, 0, 9, 222, 247, 15, 223, 60, 159, 53, 89, 239, 96, 7, 173, 223, + 175, 255, 144, 209, 79, 112, 2, 9, 129, 33, 128, 3, 60, 159, 177, 84, 97, 231, 34, 212, 253, 26, 179, 234, 221, 0, 6, 176, 127, 247, 21, 80, 247, 24, 159, 175, 246, 24, 163, 245, 26, 255, 245, 0, 205, 222, 81, 175, 254, 80, 80, 3, 48, 81, 255, 248, 58, 19, 247, 0, 239, 2, 123, 239, 9, 190, 7, 255, 210, 0, + 254, 135, 182, 8, 111, 255, 9, 128, 255, 10, 145, 255, 11, 162, 149, 1, 51, 81, 252, 5, 11, 255, 247, 223, 11, 55, 251, 48, 3, 166, 230, 25, 66, 48, 28, 209, 31, 33, 252, 0, 23, 158, 46, 31, 166, 39, 163, 225, 31, 167, 249, 0, 92, 37, 243, 166, 255, 94, 254, 239, 7, 158, 19, 31, 255, 5, 223, 63, 51, 89, + 38, 95, 47, 54, 154, 112, 0, 41, 158, 31, 243, 103, 171, 99, 47, 255, 212, 46, 223, 64, 31, 161, 225, 0, 167, 62, 22, 186, 4, 24, 3, 7, 255, 22, 1, 35, 48, 82, 31, 239, 243, 31, 243, 255, 48, 3, 41, 251, 9, 30, 116, 188, 9, 23, 2, 9, 255, 245, 3, 16, 96, 23, 27, 166, 211, 110, 0, 195, 55, 203, + 39, 95, 4, 255, 79, 207, 41, 135, 27, 47, 78, 243, 95, 167, 247, 95, 175, 95, 255, 26, 37, 29, 146, 21, 247, 12, 94, 7, 46, 15, 239, 54, 175, 21, 231, 118, 32, 51, 24, 191, 94, 96, 254, 239, 230, 227, 35, 151, 239, 21, 115, 46, 227, 31, 203, 2, 255, 147, 33, 47, 2, 33, 67, 16, 0, 3, 1, 63, 255, 2, + 85, 31, 135, 247, 199, 251, 40, 3, 113, 0, 21, 0, 243, 254, 6, 255, 16, 243, 127, 255, 128, 24, 4, 255, 241, 254, 255, 249, 32, 255, 254, 48, 85, 78, 15, 112, 15, 255, 48, 6, 120, 73, 251, 31, 66, 252, 73, 31, 70, 219, 15, 191, 0, 31, 94, 1, 48, 3, 16, 35, 221, 186, 218, 15, 255, 32, 207, 255, 161, 31, + 62, 255, 31, 167, 83, 31, 255, 110, 47, 255, 54, 136, 254, 31, 248, 60, 255, 169, 250, 31, 251, 243, 31, 255, 128, 31, 62, 15, 255, 28, 7, 74, 31, 25, 7, 24, 238, 34, 176, 6, 27, 251, 5, 24, 15, 158, 5, 24, 254, 32, 3, 4, 255, 249, 16, 17, 179, 239, 250, 102, 207, 111, 255, 249, 123, 239, 234, 168, 64, 175, + 222, 244, 31, 255, 224, 92, 23, 15, 158, 4, 42, 135, 205, 175, 255, 75, 251, 41, 151, 0, 110, 175, 255, 32, 115, 25, 183, 210, 1, 159, 127, 252, 19, 35, 255, 71, 194, 116, 1, 28, 39, 64, 3, 82, 8, 176, 3, 253, 144, 3, 89, 73, 231, 6, 152, 3, 5, 254, 185, 29, 56, 3, 0, 212, 0, 248, 82, 147, 214, 15, + 250, 254, 3, 25, 255, 32, 3, 235, 0, 49, 16, 15, 255, 100, 2, 89, 183, 1, 121, 42, 15, 255, 2, 97, 235, 152, 9, 66, 243, 2, 45, 79, 254, 77, 59, 74, 35, 83, 207, 253, 223, 45, 63, 128, 90, 183, 32, 10, 118, 255, 121, 8, 1, 67, 70, 0, 3, 191, 63, 155, 46, 7, 12, 122, 31, 154, 15, 255, 248, 65, + 40, 15, 1, 30, 19, 215, 119, 97, 45, 161, 112, 31, 163, 243, 0, 156, 94, 30, 85, 0, 32, 3, 139, 228, 0, 217, 88, 23, 85, 15, 255, 15, 123, 31, 247, 159, 80, 3, 92, 31, 219, 5, 78, 29, 163, 6, 53, 175, 37, 179, 246, 255, 241, 30, 1, 219, 242, 0, 54, 207, 119, 113, 15, 173, 33, 5, 153, 159, 147, 31, + 58, 39, 255, 241, 0, 13, 255, 240, 221, 0, 14, 30, 159, 15, 255, 208, 112, 3, 2, 210, 153, 184, 29, 86, 253, 48, 3, 70, 196, 254, 29, 102, 137, 255, 24, 99, 94, 239, 15, 164, 15, 37, 71, 239, 38, 3, 111, 107, 86, 7, 15, 255, 72, 11, 8, 23, 214, 5, 48, 250, 80, 0, 15, 254, 128, 30, 220, 160, 31, 115, + 175, 208, 25, 20, 240, 16, 91, 243, 10, 255, 250, 220, 247, 15, 39, 165, 0, 0, 179, 31, 255, 16, 226, 218, 0, 192, 6, 103, 3, 1, 36, 72, 87, 11, 95, 255, 222, 4, 100, 175, 179, 86, 119, 119, 80, 40, 88, 123, 72, 94, 255, 255, 32, 6, 31, 254, 79, 255, 189, 244, 31, 179, 64, 127, 255, 228, 127, 222, 96, 48, + 6, 195, 11, 10, 0, 10, 72, 191, 78, 230, 31, 119, 18, 3, 62, 15, 238, 21, 119, 119, 143, 157, 225, 0, 59, 30, 93, 175, 239, 30, 97, 255, 17, 86, 255, 251, 16, 0, 168, 84, 5, 105, 26, 7, 31, 147, 5, 31, 219, 55, 10, 39, 71, 169, 28, 42, 52, 71, 175, 227, 103, 19, 240, 17, 177, 0, 42, 17, 189, 56, + 215, 116, 15, 255, 26, 14, 18, 65, 11, 50, 87, 111, 87, 167, 6, 206, 191, 255, 30, 255, 255, 120, 191, 223, 89, 253, 254, 223, 255, 253, 145, 121, 161, 153, 175, 255, 16, 0, 3, 1, 230, 96, 40, 4, 31, 243, 175, 87, 31, 247, 79, 31, 251, 8, 175, 255, 250, 111, 255, 249, 192, 255, 239, 255, 64, 26, 3, 51, 35, 255, + 250, 255, 96, 0, 55, 97, 15, 47, 27, 11, 31, 247, 83, 31, 211, 14, 31, 255, 13, 82, 7, 159, 127, 253, 32, 251, 0, 255, 232, 137, 189, 106, 191, 253, 221, 210, 221, 220, 239, 194, 192, 90, 187, 40, 199, 176, 15, 170, 255, 28, 15, 255, 255, 15, 255, 6, 18, 215, 1, 207, 0, 29, 128, 26, 235, 85, 29, 228, 9, 123, + 39, 71, 108, 195, 225, 30, 11, 162, 231, 0, 0, 113, 15, 255, 255, 11, 148, 171, 20, 0, 0, 198, 43, 255, 61, 59, 21, 251, 28, 177, 145, 9, 31, 231, 255, 13, 255, 248, 191, 15, 255, 205, 255, 215, 119, 81, 47, 238, 177, 31, 255, 253, 0, 185, 189, 239, 20, 220, 143, 255, 96, 92, 31, 94, 255, 252, 255, 210, 0, 255, + 230, 64, 9, 161, 255, 13, 158, 158, 255, 14, 255, 212, 254, 11, 255, 245, 32, 13, 41, 251, 24, 230, 25, 19, 46, 239, 3, 103, 111, 255, 164, 189, 3, 30, 125, 127, 255, 192, 207, 63, 155, 249, 112, 25, 243, 80, 0, 117, 11, 152, 255, 12, 168, 255, 13, 185, 255, 15, 254, 134, 245, 67, 87, 68, 72, 31, 255, 172, 31, 255, + 50, 127, 47, 255, 9, 0, 9, 1, 5, 7, 0, 255, 4, 4, 0, 5, 5, 0, 20, 20, 239, 0, 18, 18, 32, 2, 19, 19, 0, 15, 143, 15, 32, 2, 16, 8, 16, 17, 6, 6, 0, 17, 254, 17, 0, 14, 14, 0, 23, 23, 80, 29, 12, 16, 38, 16, 44, 112, 38, 64, 53, 24, 24, 32, 38, 16, 59, 193, 13, 13, + 32, 44, 16, 65, 16, 8, 16, 71, 16, 56, 11, 128, 11, 32, 62, 16, 65, 16, 74, 64, 104, 112, 35, 16, 104, 16, 29, 108, 16, 50, 10, 10, 80, 35, 12, 12, 32, 107, 16, 171, 239, 77, 65, 80, 31, 255, 188, 0, 39, 0, 234, 122, 0, 1, 47, 255, 89, 29, 223, 255, 144, 0, 47, 45, 217, 0, 1, 16, 0, 16, + 220, 0, 6, 0, 7, 116, 27, 201, 9, 0, 10, 27, 127, 12, 30, 163, 16, 162, 217, 0, 15, 28, 14, 17, 0, 16, 238, 23, 19, 21, 255, 0, 22, 0, 23, 0, 24, 0, 25, 245, 0, 26, 0, 27, 144, 97, 28, 30, 207, 29, 255, 0, 30, 0, 31, 0, 32, 0, 33, 255, 0, 34, 0, 35, 0, 36, 0, 37, 95, 48, + 123, 38, 16, 151, 40, 0, 41, 0, 42, 255, 0, 43, 0, 44, 0, 45, 0, 46, 244, 0, 47, 0, 48, 80, 151, 49, 80, 187, 29, 235, 75, 31, 15, 2, 108, 90, 16, 67, 0, 16, 69, 1, 0, 128, 233, 65, 125, 15, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, + 122, 48, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 5, 0, 123, 16, 0, 32, 0, 0, 1, 16, 7, 3, 224, 37, 64, 3, 112, 1, 1, 64, 27, 48, 36, 64, 80, 3, 192, 223, 0, 5, 32, 43, 0, 0, 82, 79, 79, 179, 84, 32, 27, 63, 42, 64, 68, 0, 3, 0, 133, + 53, 246, 17, 0, 0, 14, 64, 79, 2, 160, 64, 81, 211, 226, 226, 16, 19, 26, 80, 15, 64, 19, 2, 207, 171, 45, 16, 39, 40, 16, 127, 64, 96, 19, 255, 255, 234, 0, 46, 2, 128, 136, 16, 80, 19, 184, 16, 19, 199, 2, 255, 16, 0, 96, 19, 0, 3, 10, 46, 0, 46, 255, 46, 0, 101, 117, 103, 101, 114, 109, + 255, 97, 110, 0, 109, 101, 115, 115, 97, 253, 103, 101, 46, 98, 109, 103, 96, 11, 105, 255, 100, 46, 116, 98, 108, 0, 115, 116, 243, 114, 117, 99, 116, 48, 10, 176, 198, 77, 69, 214, 83, 71, 16, 45, 49, 80, 187, 2, 2, 208, 228, 239, 73, 78, 70, 16, 27, 0, 96, 0, 6, 197, 0, 12, 49, 62, 113, 56, 48, 159, + 2, 144, 11, 98, 90, 144, 23, 194, 128, 35, 1, 170, 144, 11, 208, 144, 59, 115, 49, 130, 68, 65, 84, 32, 123, 33, 127, 66, 0, 235, 105, 0, 116, 16, 1, 101, 17, 169, 115, 0, 233, 99, 0, 104, 16, 15, 101, 16, 85, 32, 15, 100, 127, 48, 11, 32, 0, 83, 0, 85, 0, 80, 247, 0, 69, 0, 82, 17, 205, 10, + 0, 77, 221, 0, 65, 16, 9, 73, 0, 79, 17, 219, 71, 95, 16, 11, 76, 16, 15, 88, 0, 89, 0, 45, 203, 0, 68, 16, 75, 32, 67, 32, 16, 77, 105, 0, 136, 110, 17, 38, 0, 95, 80, 32, 115, 101, 16, 185, 32, 191, 128, 127, 234, 107, 0, 97, 16, 127, 110, 18, 125, 110, 16, 223, 85, 32, 213, 116, 18, 137, + 103, 16, 229, 108, 80, 45, 110, 82, 16, 201, 119, 16, 245, 114, 16, 229, 32, 13, 46, 18, 169, 78, 161, 11, 108, 80, 87, 97, 5, 10, 0, 87, 17, 41, 167, 105, 16, 229, 66, 17, 43, 65, 25, 110, 0, 117, 65, 16, 229, 103, 17, 55, 32, 109, 32, 89, 33, 75, 64, 19, 44, 112, 18, 249, 117, 0, 109, 80, 101, 33, + 99, 32, 107, 33, 101, 186, 73, 17, 25, 102, 0, 111, 16, 121, 109, 16, 165, 167, 116, 17, 127, 111, 17, 43, 32, 145, 32, 0, 122, 42, 16, 81, 33, 61, 114, 17, 135, 97, 16, 171, 116, 80, 155, 148, 0, 177, 131, 1, 129, 6, 0, 17, 163, 114, 48, 225, 65, 191, 74, 65, 133, 32, 17, 175, 33, 207, 110, 49, 229, 117, + 48, 243, 170, 32, 17, 245, 109, 19, 155, 75, 16, 135, 115, 16, 165, 83, 32, 5, 33, 179, 105, 6, 82, 103, 19, 59, 0, 8, 247, 33, 157, 67, 98, 51, 27, 4, 0, 6, 245, 4, 56, 56, 178, 83, 39, 0, 211, 207, 8, 42, 82, 155, 35, 83, 3, 19, 252, 24, 20, 0, 4, 147, 231, 255, 43, 67, 79, 77, 77, 69, + 78, 84, 255, 0, 68, 73, 83, 67, 95, 48, 49, 95, 80, 7, 50, 80, 15, 51, 0, 84, 73, 84, 254, 76, 69, 95, 77, 65, 73, 78, 80, 10, 249, 83, 85, 66, 0, 64, 0, 0, 0, 144, 111, 112, 123, 36, 99, 174, 55, 113, 97, 96, 147, 28, 19, 223, 62, 141, 80, 171, 0, 190, 198, 20, 162, 61, 51, 211, 16, 153, + 100, 67, 164, 76, 51, 223, 12, 252, 0, 0, 19, 54, 175, 66, 51, 235, 19, 253, 239, 137, 230, 39, 67, 247, 20, 0, 0, 251, 231, 104, 17, 53, 52, 3, 16, 185, 23, 177, 123, 170, 254, 52, 15, 28, 116, 181, 4, 81, 23, 7, 80, 235, 168, 9, 20, 224, 10, 20, 228, 11, 224, 162, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 89, 97, 122, 48, 0, 0, 90, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 90, 224, 245, 0, 0, 0, 32, 16, 3, 192, 16, 11, 0, 42, 64, 3, 112, 2, 1, 80, 27, 3, 16, 35, 64, 80, 3, 239, 128, 0, 3, 32, 22, 0, 0, 82, 79, 220, 79, 84, 16, 59, 5, 198, 97, + 48, 31, 0, 2, 1, 253, 67, 212, 17, 0, 0, 18, 64, 80, 89, 190, 228, 32, 88, 255, 255, 0, 46, 2, 128, 97, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 32, 132, 46, 0, 46, 46, 0, 101, 109, 255, 98, 101, 100, 100, 101, 100, 102, 111, 255, 110, 116, 0, 109, 101, 115, 115, 97, 223, 103, 101, + 32, 11, 50, 54, 46, 98, 114, 159, 102, 16, 19, 0, 0, 8, 82, 70, 78, 84, 254, 239, 255, 1, 4, 48, 123, 16, 0, 5, 70, 237, 73, 78, 70, 32, 235, 1, 33, 16, 241, 27, 190, 27, 32, 219, 56, 0, 0, 88, 104, 16, 155, 255, 20, 33, 27, 26, 0, 84, 71, 76, 191, 80, 16, 15, 48, 24, 25, 19, 24, 0, + 249, 0, 8, 0, 0, 11, 32, 221, 17, 3, 128, 111, 49, 31, 96, 0, 0, 0, 102, 127, 255, 176, 0, 186, 111, 16, 3, 95, 255, 160, 16, 3, 144, 48, 3, 142, 63, 16, 7, 0, 0, 255, 1, 17, 189, 63, 255, 112, 48, 3, 186, 47, 16, 7, 31, 255, 96, 16, 3, 80, 48, 3, 236, 13, 221, 64, 1, 251, 160, 35, + 53, 51, 253, 112, 3, 221, 49, 16, 164, 104, 86, 120, 64, 20, 27, 112, 117, 48, 3, 254, 221, 80, 3, 106, 50, 4, 3, 175, 10, 32, 119, 3, 60, 146, 7, 203, 16, 51, 251, 223, 255, 240, 254, 0, 175, 255, 208, 0, 9, 238, 1, 247, 61, 255, 159, 193, 0, 9, 255, 251, 0, 15, 255, 255, 254, 0, 13, 255, 253, 0, + 1, 223, 124, 249, 21, 117, 242, 0, 0, 78, 112, 119, 4, 91, 148, 3, 239, 0, 16, 184, 0, 0, 14, 85, 22, 55, 6, 38, 59, 39, 166, 188, 243, 22, 216, 251, 84, 22, 220, 253, 22, 224, 248, 22, 228, 80, 5, 48, 255, 6, 65, 255, 52, 7, 226, 46, 24, 52, 0, 79, 25, 79, 223, 19, 188, 40, 203, 95, 18, 145, + 97, 19, 98, 254, 64, 191, 255, 255, 186, 242, 24, 223, 252, 255, 253, 24, 229, 192, 16, 13, 229, 48, 79, 255, 9, 51, 2, 41, 100, 176, 25, 144, 241, 125, 137, 130, 53, 0, 75, 239, 255, 23, 255, 255, 127, 22, 7, 255, 0, 15, 252, 167, 0, 2, 175, 63, 25, 39, 47, 48, 95, 103, 119, 84, 16, 111, 25, 55, 254, 255, + 80, 0, 101, 68, 88, 223, 122, 16, 63, 159, 176, 0, 76, 112, 95, 128, 35, 3, 43, 25, 105, 24, 61, 0, 20, 73, 0, 20, 73, 0, 255, 94, 6, 65, 0, 9, 26, 7, 191, 0, 0, 10, 25, 131, 175, 95, 25, 135, 223, 64, 191, 20, 119, 100, 59, 191, 255, 144, 0, 251, 134, 140, 253, 48, 0, 214, 0, 209, 154, 37, + 251, 16, 15, 255, 250, 41, 219, 255, 16, 0, 255, 246, 0, 0, 60, 192, 41, 181, 96, 26, 67, 74, 19, 167, 127, 25, 219, 32, 183, 15, 167, 235, 25, 234, 63, 38, 221, 42, 104, 53, 119, 117, 188, 64, 160, 94, 152, 99, 53, 141, 48, 163, 129, 0, 213, 0, 198, 42, 55, 230, 42, 59, 144, 26, 63, 248, 254, 0, 94, 255, + 255, 32, 3, 255, 104, 255, 211, 1, 51, 16, 186, 255, 65, 111, 33, 115, 5, 207, 79, 26, 207, 47, 36, 220, 42, 200, 85, 103, 121, 155, 126, 160, 190, 234, 151, 118, 85, 255, 210, 65, 3, 81, 42, 232, 188, 25, 213, 255, 17, 32, 41, 77, 41, 81, 51, 169, 16, 9, 229, 26, 31, 26, 175, 143, 26, 179, 17, 159, 6, 93, + 26, 217, 12, 17, 5, 47, 255, 249, 25, 175, 255, 250, 0, 207, 255, 175, 249, 20, 151, 241, 17, 79, 235, 128, 0, 5, 17, 25, 2, 42, 219, 239, 103, 213, 155, 222, 113, 77, 247, 27, 120, 252, 43, 19, 0, 106, 65, 143, 255, 184, 27, 31, 254, 103, 37, 16, 80, 95, 95, 96, 3, 15, 208, 3, 14, 255, 209, 109, 255, 255, + 255, 218, 255, 255, 232, 216, 255, 254, 219, 166, 214, 27, 60, 226, 155, 38, 40, 1, 143, 126, 17, 226, 13, 240, 0, 2, 175, 229, 91, 96, 140, 16, 84, 255, 48, 227, 21, 221, 255, 245, 27, 135, 37, 28, 42, 17, 68, 21, 255, 253, 16, 183, 248, 21, 66, 245, 22, 7, 95, 32, 3, 247, 16, 199, 253, 0, 8, 255, 255, 89, + 8, 100, 10, 177, 11, 12, 13, 22, 197, 65, 32, 144, 3, 15, 82, 144, 3, 14, 28, 115, 13, 33, 227, 48, 3, 243, 144, 3, 186, 244, 80, 159, 245, 0, 43, 54, 243, 111, 22, 251, 174, 95, 22, 255, 143, 22, 255, 223, 255, 144, 17, 102, 208, 64, 111, 22, 170, 255, 32, 40, 17, 120, 44, 54, 69, 251, 103, 34, 3, 12, + 255, 70, 15, 65, 43, 255, 181, 87, 190, 120, 44, 83, 254, 223, 255, 255, 250, 16, 3, 249, 247, 101, 84, 51, 245, 86, 23, 38, 27, 152, 43, 97, 123, 81, 131, 17, 168, 60, 133, 11, 237, 16, 1, 255, 253, 255, 79, 5, 255, 255, 7, 39, 66, 9, 183, 239, 22, 97, 2, 82, 189, 6, 255, 255, 253, 232, 207, 117, 49, 112, + 251, 13, 93, 71, 128, 31, 81, 135, 42, 49, 143, 18, 12, 33, 242, 123, 13, 80, 207, 13, 80, 219, 219, 7, 152, 182, 223, 104, 207, 163, 152, 114, 118, 148, 66, 205, 133, 35, 231, 254, 29, 217, 161, 0, 192, 9, 67, 151, 94, 55, 59, 41, 237, 195, 255, 184, 120, 173, 100, 87, 188, 239, 29, 156, 2, 87, 119, 100, 176, 223, + 23, 88, 34, 34, 37, 57, 179, 146, 157, 184, 144, 192, 80, 247, 11, 80, 3, 183, 5, 177, 31, 251, 157, 164, 89, 216, 119, 101, 160, 48, 209, 63, 128, 49, 23, 36, 95, 9, 175, 4, 39, 247, 36, 175, 175, 3, 46, 55, 77, 238, 131, 252, 85, 87, 172, 115, 164, 186, 54, 119, 117, 177, 33, 19, 169, 0, 255, 177, 252, 74, + 149, 252, 132, 13, 77, 255, 14, 94, 255, 15, 255, 9, 58, 123, 70, 131, 207, 255, 0, 11, 28, 227, 127, 255, 159, 252, 20, 27, 39, 198, 0, 4, 103, 117, 48, 122, 167, 159, 250, 101, 106, 235, 28, 248, 2, 71, 23, 37, 79, 255, 43, 108, 208, 87, 251, 111, 255, 18, 99, 10, 1, 213, 19, 67, 23, 146, 249, 59, 167, 8, + 27, 171, 7, 66, 27, 167, 6, 27, 171, 20, 120, 95, 255, 32, 75, 7, 88, 123, 172, 9, 144, 3, 10, 47, 255, 84, 50, 35, 103, 80, 3, 141, 250, 82, 243, 80, 3, 72, 94, 17, 50, 16, 179, 249, 80, 16, 183, 251, 48, 3, 10, 36, 204, 19, 21, 38, 23, 15, 255, 51, 214, 52, 85, 72, 75, 223, 65, 31, 0, 191, + 80, 3, 203, 159, 255, 109, 135, 28, 108, 2, 23, 204, 62, 144, 255, 0, 4, 239, 144, 0, 79, 255, 160, 165, 4, 17, 60, 79, 64, 223, 37, 48, 223, 39, 159, 251, 127, 24, 91, 254, 48, 0, 255, 193, 0, 0, 85, 32, 186, 96, 143, 255, 5, 88, 75, 143, 31, 255, 207, 92, 71, 78, 3, 108, 15, 0, 49, 0, 86, 83, + 40, 247, 2, 25, 88, 31, 81, 71, 107, 13, 158, 50, 24, 240, 33, 58, 14, 22, 180, 168, 15, 23, 80, 15, 22, 188, 13, 23, 213, 39, 82, 16, 194, 250, 177, 91, 205, 239, 255, 24, 10, 255, 25, 186, 245, 255, 93, 203, 169, 40, 151, 175, 74, 27, 5, 101, 31, 7, 78, 255, 55, 139, 101, 255, 145, 31, 29, 80, 77, 80, + 3, 112, 64, 167, 32, 68, 0, 73, 31, 51, 159, 94, 31, 55, 143, 50, 87, 255, 0, 55, 255, 89, 155, 106, 41, 159, 1, 27, 16, 98, 187, 26, 87, 203, 26, 91, 190, 219, 22, 111, 189, 113, 16, 0, 13, 31, 61, 162, 13, 29, 192, 13, 25, 42, 54, 87, 176, 3, 245, 128, 3, 34, 55, 251, 34, 79, 7, 29, 255, 16, + 204, 48, 3, 5, 144, 3, 10, 15, 255, 5, 104, 83, 14, 95, 17, 89, 31, 127, 86, 103, 95, 144, 3, 254, 63, 255, 179, 255, 255, 228, 222, 17, 212, 43, 24, 185, 31, 251, 96, 31, 255, 194, 31, 255, 255, 128, 178, 252, 26, 207, 241, 127, 0, 127, 8, 47, 4, 250, 57, 167, 164, 8, 29, 251, 11, 247, 247, 105, 31, 254, + 93, 255, 34, 234, 52, 41, 107, 26, 154, 0, 245, 80, 3, 248, 14, 89, 14, 15, 255, 18, 107, 23, 126, 0, 46, 27, 151, 2, 34, 215, 4, 156, 95, 239, 255, 185, 118, 222, 253, 159, 239, 236, 112, 170, 95, 31, 255, 37, 184, 31, 112, 202, 123, 84, 246, 228, 101, 163, 43, 143, 254, 148, 50, 100, 55, 14, 27, 4, 15, 169, + 160, 64, 3, 13, 247, 191, 245, 89, 79, 31, 8, 222, 148, 243, 15, 255, 1, 34, 95, 3, 112, 3, 221, 1, 231, 2, 43, 198, 130, 48, 80, 3, 15, 255, 32, 108, 167, 106, 199, 192, 191, 243, 17, 55, 154, 243, 29, 39, 26, 142, 61, 246, 15, 255, 1, 255, 26, 192, 237, 255, 254, 16, 58, 171, 191, 80, 1, 147, 2, 13, + 46, 89, 247, 59, 91, 78, 248, 191, 151, 137, 190, 199, 255, 194, 118, 83, 185, 159, 44, 87, 45, 23, 28, 207, 253, 0, 224, 36, 48, 15, 255, 255, 15, 255, 224, 51, 17, 61, 255, 43, 75, 37, 175, 46, 7, 146, 10, 62, 11, 127, 223, 32, 95, 215, 39, 231, 160, 87, 235, 100, 127, 223, 66, 16, 29, 134, 37, 134, 255, 29, + 16, 63, 226, 167, 16, 21, 234, 32, 27, 111, 91, 12, 1, 32, 0, 234, 10, 239, 176, 30, 106, 240, 31, 62, 246, 31, 66, 164, 252, 23, 34, 255, 31, 162, 167, 255, 255, 79, 187, 55, 3, 182, 95, 31, 122, 47, 144, 77, 111, 0, 70, 47, 247, 161, 96, 94, 223, 192, 95, 255, 93, 115, 230, 206, 79, 51, 7, 94, 95, 167, + 191, 79, 255, 21, 119, 81, 42, 175, 255, 237, 250, 102, 175, 23, 134, 4, 226, 159, 255, 178, 132, 0, 80, 99, 31, 251, 31, 154, 31, 167, 176, 29, 182, 116, 112, 86, 24, 235, 108, 92, 103, 79, 94, 199, 3, 79, 127, 255, 239, 103, 119, 101, 175, 255, 202, 149, 85, 88, 41, 175, 255, 43, 247, 254, 47, 159, 253, 23, 255, 16, + 192, 239, 82, 30, 184, 30, 62, 162, 247, 7, 150, 7, 88, 15, 191, 79, 225, 230, 21, 119, 0, 16, 192, 23, 171, 255, 159, 80, 192, 34, 56, 71, 80, 192, 81, 47, 127, 16, 192, 70, 127, 246, 30, 114, 228, 255, 32, 4, 208, 192, 15, 255, 7, 15, 65, 176, 30, 159, 170, 239, 30, 159, 159, 30, 175, 79, 30, 163, 13, 31, + 192, 170, 9, 17, 211, 4, 30, 202, 4, 31, 119, 11, 29, 38, 188, 47, 31, 206, 175, 255, 96, 2, 26, 21, 18, 24, 215, 242, 127, 109, 183, 80, 48, 3, 239, 255, 112, 127, 24, 40, 128, 250, 95, 255, 144, 242, 63, 255, 255, 160, 176, 63, 255, 176, 48, 63, 43, 30, 251, 33, 227, 111, 87, 247, 127, 16, 95, 143, 255, 170, + 61, 25, 54, 54, 25, 58, 48, 25, 70, 48, 31, 62, 170, 14, 28, 194, 12, 17, 114, 11, 26, 109, 9, 31, 215, 191, 9, 21, 47, 9, 223, 255, 192, 10, 79, 228, 255, 250, 13, 127, 75, 232, 3, 246, 87, 255, 47, 255, 145, 8, 127, 255, 72, 196, 14, 31, 125, 42, 11, 31, 104, 96, 42, 15, 255, 9, 25, 146, 1, 40, + 96, 8, 29, 64, 5, 24, 62, 148, 3, 82, 254, 32, 15, 30, 24, 120, 207, 40, 220, 15, 255, 8, 188, 15, 159, 255, 24, 255, 242, 90, 78, 199, 23, 248, 255, 255, 247, 255, 251, 255, 245, 183, 16, 75, 47, 27, 79, 31, 28, 33, 243, 255, 30, 196, 255, 228, 74, 30, 7, 32, 230, 135, 45, 247, 8, 95, 247, 14, 119, 247, + 42, 72, 19, 64, 192, 253, 87, 235, 244, 95, 247, 245, 88, 19, 92, 39, 119, 0, 0, 192, 8, 247, 1, 207, 98, 129, 15, 255, 8, 147, 6, 59, 146, 43, 58, 247, 27, 246, 24, 93, 2, 65, 43, 191, 255, 31, 51, 249, 25, 251, 208, 17, 35, 32, 0, 213, 55, 64, 7, 30, 2, 208, 25, 6, 240, 23, 34, 240, 122, 23, + 34, 241, 0, 2, 17, 207, 66, 191, 65, 231, 114, 27, 62, 80, 0, 189, 42, 29, 207, 223, 9, 31, 253, 89, 56, 131, 30, 104, 131, 3, 118, 191, 255, 42, 95, 224, 75, 67, 255, 249, 91, 107, 207, 227, 239, 83, 147, 4, 239, 61, 92, 63, 191, 255, 253, 133, 86, 159, 111, 255, 223, 81, 63, 255, 118, 176, 224, 255, 24, 184, + 63, 63, 24, 128, 196, 12, 15, 62, 4, 239, 255, 8, 159, 0, 82, 159, 253, 214, 15, 127, 35, 32, 183, 81, 36, 75, 4, 15, 189, 2, 255, 16, 192, 47, 255, 21, 75, 255, 188, 7, 16, 192, 0, 2, 87, 175, 202, 157, 19, 119, 118, 29, 20, 255, 253, 80, 28, 91, 166, 16, 41, 168, 182, 108, 33, 83, 41, 239, 26, 58, + 5, 181, 239, 255, 142, 144, 85, 191, 15, 255, 255, 15, 255, 235, 19, 86, 4, 26, 101, 95, 31, 142, 255, 21, 221, 255, 0, 239, 233, 117, 205, 0, 36, 63, 159, 63, 63, 119, 117, 30, 179, 255, 221, 255, 197, 111, 255, 67, 70, 159, 94, 155, 12, 83, 190, 130, 160, 92, 163, 253, 90, 151, 207, 124, 1, 142, 41, 61, 59, 40, + 91, 63, 29, 171, 175, 55, 8, 52, 80, 37, 213, 119, 99, 45, 51, 212, 108, 105, 114, 23, 121, 0, 70, 48, 3, 207, 190, 226, 45, 51, 23, 254, 0, 240, 80, 7, 186, 128, 175, 220, 8, 205, 221, 31, 255, 255, 48, 3, 102, 20, 84, 0, 2, 40, 211, 112, 123, 17, 239, 171, 68, 243, 255, 254, 221, 143, 54, 154, 40, 197, + 0, 0, 170, 50, 93, 95, 249, 93, 107, 217, 15, 87, 0, 70, 78, 243, 166, 4, 93, 171, 15, 94, 7, 143, 255, 254, 112, 75, 131, 143, 252, 93, 163, 96, 163, 111, 226, 88, 172, 144, 0, 38, 64, 115, 37, 42, 242, 95, 103, 108, 49, 1, 35, 69, 251, 160, 13, 94, 11, 9, 95, 251, 32, 111, 25, 94, 93, 235, 96, 159, + 151, 252, 155, 247, 63, 255, 85, 29, 116, 223, 254, 128, 85, 25, 190, 128, 30, 250, 64, 41, 186, 14, 22, 254, 79, 41, 63, 32, 14, 228, 13, 5, 54, 252, 251, 48, 3, 38, 12, 7, 87, 48, 3, 250, 31, 83, 249, 48, 3, 4, 223, 255, 159, 1, 24, 80, 21, 158, 248, 159, 255, 251, 48, 165, 191, 21, 40, 127, 31, 148, + 25, 231, 177, 22, 95, 254, 156, 246, 4, 79, 9, 53, 236, 255, 255, 161, 30, 2, 94, 99, 109, 46, 11, 1, 124, 222, 165, 123, 182, 44, 191, 251, 110, 20, 191, 255, 254, 20, 203, 255, 251, 22, 32, 47, 213, 2, 223, 31, 187, 175, 15, 191, 3, 112, 90, 127, 240, 72, 15, 191, 17, 95, 81, 115, 160, 3, 63, 144, 3, 15, + 32, 18, 70, 99, 169, 255, 80, 3, 239, 82, 151, 143, 63, 255, 39, 130, 96, 82, 95, 207, 48, 95, 215, 128, 91, 31, 31, 175, 6, 41, 227, 146, 11, 89, 235, 40, 150, 31, 30, 200, 34, 3, 191, 40, 19, 106, 56, 157, 1, 255, 66, 91, 0, 37, 215, 111, 31, 238, 146, 47, 86, 115, 38, 203, 3, 35, 33, 26, 251, 1, + 22, 159, 151, 7, 25, 77, 40, 111, 95, 27, 65, 223, 255, 251, 122, 27, 164, 255, 110, 255, 175, 27, 82, 255, 22, 188, 10, 43, 106, 35, 173, 58, 191, 87, 47, 253, 15, 255, 18, 9, 23, 252, 95, 64, 3, 248, 30, 134, 247, 0, 2, 52, 82, 10, 191, 193, 44, 7, 58, 247, 55, 95, 28, 239, 221, 250, 47, 163, 167, 227, + 71, 63, 250, 81, 11, 191, 255, 8, 152, 119, 93, 60, 75, 8, 92, 87, 0, 19, 51, 175, 255, 120, 191, 173, 126, 221, 247, 255, 254, 183, 16, 49, 73, 223, 255, 192, 98, 71, 14, 218, 37, 63, 28, 40, 96, 3, 47, 202, 253, 209, 15, 255, 33, 41, 151, 3, 111, 155, 1, 255, 223, 206, 146, 19, 120, 95, 43, 155, 0, 70, + 118, 185, 36, 72, 26, 86, 0, 58, 195, 31, 251, 162, 15, 158, 33, 40, 179, 29, 38, 175, 255, 29, 138, 253, 19, 18, 193, 0, 5, 116, 71, 191, 228, 244, 7, 207, 255, 15, 255, 255, 15, 255, 17, 49, 0, 11, 202, 239, 246, 31, 187, 78, 147, 11, 52, 18, 250, 29, 86, 186, 251, 14, 62, 8, 44, 168, 96, 31, 32, 242, + 143, 129, 202, 110, 201, 69, 19, 37, 179, 223, 69, 47, 3, 127, 223, 253, 65, 96, 0, 92, 250, 240, 27, 236, 192, 221, 1, 239, 27, 106, 111, 255, 112, 30, 253, 64, 58, 67, 87, 87, 130, 1, 239, 48, 30, 2, 192, 30, 132, 181, 245, 30, 188, 254, 46, 63, 176, 246, 157, 171, 0, 38, 31, 62, 60, 247, 208, 12, 7, 0, + 20, 83, 42, 253, 61, 188, 81, 60, 15, 95, 93, 79, 3, 184, 159, 38, 55, 31, 146, 4, 94, 20, 179, 30, 24, 121, 191, 255, 208, 7, 56, 191, 178, 1, 28, 177, 11, 229, 47, 221, 37, 71, 244, 31, 255, 211, 112, 0, 29, 18, 0, 31, 65, 11, 41, 140, 21, 119, 170, 65, 11, 202, 46, 6, 31, 58, 4, 30, 251, 2, + 70, 222, 170, 48, 30, 244, 96, 31, 159, 128, 31, 179, 192, 61, 207, 165, 159, 31, 79, 207, 62, 196, 33, 150, 247, 21, 198, 248, 110, 23, 251, 251, 47, 25, 68, 143, 255, 191, 73, 207, 170, 10, 31, 127, 13, 30, 68, 47, 31, 173, 111, 54, 220, 177, 176, 26, 71, 80, 40, 36, 252, 28, 162, 31, 165, 14, 21, 46, 106, 93, + 75, 28, 191, 7, 77, 179, 2, 57, 149, 144, 42, 31, 52, 31, 35, 226, 31, 39, 224, 31, 43, 249, 42, 107, 254, 48, 254, 239, 255, 192, 244, 95, 47, 245, 42, 13, 83, 15, 32, 95, 30, 31, 230, 7, 13, 63, 3, 247, 32, 169, 191, 207, 109, 255, 253, 79, 223, 255, 245, 2, 175, 143, 30, 81, 175, 17, 221, 191, 255, 144, + 253, 74, 95, 83, 112, 13, 19, 108, 46, 183, 127, 72, 11, 8, 91, 87, 119, 42, 99, 15, 255, 76, 170, 183, 196, 0, 76, 250, 251, 0, 2, 140, 241, 31, 236, 192, 25, 168, 164, 192, 31, 252, 179, 90, 15, 32, 195, 176, 87, 143, 107, 127, 38, 42, 143, 6, 222, 17, 253, 71, 151, 41, 111, 45, 255, 90, 235, 40, 150, 191, + 31, 253, 248, 17, 237, 224, 17, 228, 31, 201, 27, 176, 169, 3, 198, 159, 248, 31, 67, 225, 56, 203, 47, 3, 118, 141, 16, 239, 61, 31, 223, 26, 56, 0, 27, 16, 36, 0, 179, 110, 240, 145, 128, 12, 100, 39, 44, 83, 31, 163, 66, 239, 222, 16, 80, 215, 3, 138, 39, 17, 227, 31, 36, 160, 27, 124, 251, 192, 0, 111, + 254, 208, 14, 250, 60, 221, 221, 21, 0, 29, 12, 0, 31, 12, 76, 125, 13, 91, 239, 2, 41, 95, 61, 90, 239, 255, 243, 29, 40, 255, 206, 61, 121, 174, 31, 231, 241, 12, 54, 118, 32, 177, 127, 42, 66, 16, 225, 0, 36, 29, 77, 48, 3, 32, 15, 219, 255, 15, 255, 46, 255, 12, 131, 3, 128, 29, 93, 0, 31, 12, + 240, 15, 255, 145, 5, 120, 146, 31, 58, 243, 75, 27, 234, 243, 31, 58, 176, 3, 2, 14, 64, 10, 103, 99, 83, 10, 120, 47, 3, 0, 95, 11, 98, 10, 216, 47, 91, 175, 1, 118, 58, 75, 195, 192, 3, 87, 117, 19, 63, 191, 84, 92, 199, 157, 249, 0, 3, 1, 0, 124, 43, 71, 117, 16, 6, 7, 33, 15, 65, 31, + 243, 79, 94, 11, 22, 19, 20, 25, 17, 104, 28, 100, 229, 95, 31, 27, 244, 31, 31, 241, 255, 247, 88, 192, 94, 51, 243, 96, 6, 120, 49, 255, 247, 191, 7, 31, 116, 90, 80, 3, 229, 16, 11, 64, 6, 23, 143, 5, 31, 227, 254, 5, 255, 246, 16, 255, 255, 211, 55, 143, 85, 31, 151, 208, 25, 239, 243, 29, 199, 246, + 25, 103, 247, 86, 29, 203, 246, 30, 212, 244, 15, 130, 16, 4, 223, 63, 43, 87, 45, 251, 31, 26, 80, 127, 25, 85, 207, 255, 32, 91, 78, 172, 254, 31, 243, 214, 0, 71, 255, 245, 0, 210, 49, 73, 229, 158, 17, 1, 226, 18, 31, 55, 46, 74, 115, 170, 6, 29, 109, 11, 31, 100, 14, 31, 1, 15, 31, 5, 229, 14, + 255, 242, 29, 54, 31, 39, 254, 62, 94, 97, 218, 3, 101, 31, 203, 6, 255, 72, 127, 11, 31, 215, 138, 47, 41, 230, 47, 167, 0, 3, 3, 245, 79, 63, 2, 79, 151, 70, 32, 55, 31, 86, 167, 58, 223, 23, 118, 239, 253, 21, 157, 191, 251, 62, 193, 251, 157, 255, 249, 16, 7, 253, 255, 144, 5, 191, 255, 139, 29, 171, + 223, 254, 255, 253, 100, 63, 233, 64, 62, 39, 14, 106, 31, 142, 0, 246, 80, 3, 224, 154, 187, 177, 79, 159, 102, 23, 247, 9, 239, 64, 143, 32, 147, 7, 191, 31, 255, 162, 47, 31, 255, 31, 34, 11, 27, 40, 41, 15, 80, 112, 3, 230, 199, 119, 32, 42, 151, 17, 141, 0, 255, 4, 92, 49, 103, 17, 227, 251, 5, 17, + 35, 27, 114, 255, 3, 253, 222, 215, 107, 239, 223, 102, 207, 255, 224, 31, 161, 186, 96, 41, 151, 239, 235, 64, 14, 192, 34, 162, 28, 22, 141, 255, 56, 7, 55, 227, 200, 95, 0, 73, 40, 63, 254, 120, 82, 99, 214, 0, 119, 82, 15, 236, 29, 42, 123, 60, 103, 87, 44, 123, 6, 39, 67, 4, 175, 255, 48, 4, 239, 121, + 153, 65, 197, 255, 119, 98, 44, 43, 143, 255, 245, 74, 208, 3, 49, 8, 64, 1, 76, 79, 10, 44, 203, 126, 239, 255, 183, 98, 26, 203, 254, 205, 121, 164, 213, 54, 119, 82, 196, 180, 252, 82, 95, 144, 15, 251, 8, 43, 19, 11, 31, 255, 162, 9, 91, 35, 1, 186, 191, 28, 176, 27, 129, 0, 45, 9, 113, 25, 106, 0, + 66, 16, 15, 236, 255, 15, 255, 255, 14, 181, 56, 3, 187, 103, 15, 1, 10, 98, 20, 87, 12, 97, 18, 0, 0, 234, 87, 153, 32, 31, 109, 48, 29, 115, 48, 30, 91, 93, 160, 3, 80, 15, 97, 10, 38, 118, 48, 8, 193, 22, 113, 245, 0, 0, 207, 254, 29, 58, 255, 27, 74, 255, 242, 0, 1, 223, 254, 64, 19, 207, + 191, 96, 93, 231, 104, 3, 66, 32, 87, 137, 68, 7, 175, 92, 167, 160, 3, 75, 115, 158, 48, 208, 3, 37, 41, 80, 0, 2, 148, 15, 255, 20, 212, 2, 152, 72, 159, 4, 31, 132, 5, 208, 3, 29, 83, 17, 93, 211, 160, 3, 45, 243, 251, 14, 179, 50, 21, 31, 31, 235, 255, 110, 31, 255, 255, 9, 29, 225, 13, 255, + 242, 87, 58, 191, 240, 26, 19, 250, 0, 255, 239, 255, 112, 127, 31, 230, 144, 255, 95, 255, 160, 5, 31, 87, 31, 51, 31, 30, 122, 63, 24, 11, 159, 255, 224, 221, 5, 255, 6, 129, 17, 143, 255, 124, 23, 243, 255, 84, 144, 3, 244, 24, 71, 224, 21, 82, 176, 21, 86, 47, 251, 156, 32, 31, 239, 38, 99, 247, 133, 109, + 24, 120, 16, 136, 33, 23, 87, 103, 99, 255, 8, 94, 16, 30, 91, 22, 192, 80, 3, 252, 88, 31, 22, 251, 112, 3, 8, 255, 9, 194, 46, 48, 192, 31, 154, 95, 208, 3, 111, 86, 19, 95, 255, 80, 2, 175, 215, 251, 81, 29, 162, 207, 63, 167, 253, 112, 255, 219, 252, 64, 77, 143, 248, 16, 31, 23, 249, 32, 10, 98, + 31, 9, 170, 8, 104, 143, 160, 3, 8, 94, 19, 9, 31, 56, 76, 65, 231, 251, 10, 159, 65, 71, 255, 255, 235, 46, 98, 25, 18, 119, 34, 127, 119, 0, 4, 30, 65, 12, 252, 134, 23, 25, 171, 50, 23, 16, 215, 240, 24, 225, 240, 253, 72, 245, 255, 240, 64, 12, 65, 183, 106, 56, 15, 253, 69, 31, 247, 210, 15, 149, + 16, 17, 227, 48, 3, 79, 31, 135, 63, 193, 253, 160, 13, 95, 4, 26, 8, 58, 16, 15, 79, 12, 15, 255, 3, 9, 62, 25, 194, 64, 3, 248, 0, 9, 222, 247, 14, 254, 64, 25, 65, 231, 27, 146, 31, 167, 63, 255, 215, 158, 26, 117, 255, 221, 252, 132, 16, 4, 144, 7, 239, 31, 134, 7, 145, 233, 231, 191, 43, 162, + 160, 153, 243, 0, 192, 2, 128, 3, 10, 29, 240, 255, 234, 155, 15, 222, 63, 2, 123, 239, 15, 255, 10, 254, 158, 182, 8, 111, 255, 9, 128, 215, 1, 51, 81, 22, 15, 255, 10, 77, 30, 221, 71, 8, 31, 11, 15, 255, 14, 19, 53, 15, 31, 11, 87, 166, 99, 10, 235, 76, 54, 8, 95, 23, 15, 255, 6, 18, 51, 0, + 96, 76, 221, 2, 85, 15, 225, 10, 113, 0, 21, 15, 255, 47, 11, 76, 31, 31, 10, 55, 251, 48, 3, 181, 8, 31, 147, 103, 66, 186, 5, 31, 174, 255, 247, 28, 31, 254, 223, 62, 226, 105, 23, 198, 119, 8, 24, 19, 5, 31, 254, 96, 3, 255, 138, 177, 79, 9, 29, 190, 31, 203, 96, 29, 45, 112, 31, 33, 93, 64, + 3, 175, 41, 222, 191, 255, 125, 29, 66, 255, 42, 31, 54, 32, 3, 254, 30, 11, 243, 24, 15, 224, 24, 19, 189, 192, 24, 119, 176, 255, 255, 211, 45, 255, 16, 117, 31, 164, 144, 101, 207, 30, 213, 15, 30, 213, 13, 8, 30, 217, 40, 128, 47, 195, 14, 226, 16, 93, 71, 43, 23, 163, 40, 59, 169, 9, 16, 156, 13, 63, + 255, 192, 40, 200, 31, 255, 64, 94, 31, 252, 244, 24, 199, 254, 112, 3, 239, 85, 199, 165, 14, 31, 255, 13, 95, 207, 79, 228, 16, 90, 27, 192, 81, 31, 255, 240, 80, 3, 224, 125, 255, 96, 3, 233, 251, 127, 206, 255, 61, 31, 235, 110, 96, 252, 48, 6, 32, 176, 170, 143, 31, 178, 79, 26, 216, 111, 30, 75, 207, 43, + 32, 148, 243, 89, 191, 27, 1, 0, 17, 34, 0, 63, 211, 32, 7, 175, 64, 229, 255, 8, 248, 11, 243, 6, 255, 16, 255, 243, 127, 255, 128, 247, 255, 255, 241, 184, 254, 24, 79, 255, 254, 48, 78, 15, 32, 67, 7, 255, 51, 73, 41, 62, 252, 31, 66, 31, 70, 253, 7, 126, 0, 33, 235, 7, 127, 30, 124, 7, 255, 245, + 0, 6, 223, 245, 86, 15, 29, 1, 80, 59, 218, 223, 27, 222, 205, 222, 14, 156, 1, 77, 73, 231, 176, 26, 51, 26, 55, 253, 176, 255, 221, 15, 95, 26, 75, 31, 48, 3, 176, 0, 61, 221, 160, 69, 14, 221, 31, 12, 50, 144, 91, 155, 63, 255, 3, 175, 255, 16, 215, 3, 207, 111, 255, 248, 25, 159, 80, 103, 117, 67, + 199, 137, 160, 91, 187, 15, 158, 8, 9, 243, 0, 168, 15, 127, 166, 159, 108, 27, 34, 79, 255, 151, 190, 254, 164, 112, 77, 92, 99, 144, 95, 243, 28, 136, 0, 246, 15, 255, 11, 6, 74, 171, 243, 254, 239, 221, 43, 227, 248, 88, 7, 214, 15, 250, 255, 53, 15, 255, 82, 41, 243, 3, 17, 15, 255, 6, 144, 8, 1, 204, + 70, 100, 15, 255, 10, 119, 97, 10, 104, 27, 44, 12, 254, 77, 79, 47, 71, 242, 207, 255, 0, 123, 205, 223, 35, 51, 128, 63, 55, 109, 79, 83, 255, 241, 12, 220, 46, 153, 147, 15, 118, 12, 153, 174, 184, 15, 66, 45, 37, 15, 223, 10, 16, 0, 5, 8, 96, 46, 171, 2, 15, 226, 10, 82, 15, 219, 15, 65, 15, 255, + 16, 3, 191, 47, 63, 155, 46, 7, 12, 31, 154, 15, 255, 248, 65, 173, 11, 31, 144, 1, 46, 19, 1, 72, 23, 185, 112, 115, 31, 133, 243, 0, 156, 23, 243, 24, 12, 0, 0, 245, 139, 228, 0, 217, 38, 199, 253, 39, 239, 225, 58, 15, 94, 16, 71, 247, 255, 0, 92, 31, 219, 5, 29, 163, 158, 6, 54, 80, 102, 84, + 248, 255, 242, 0, 54, 207, 212, 119, 113, 15, 169, 37, 10, 24, 79, 11, 18, 41, 72, 51, 81, 39, 247, 208, 112, 3, 14, 18, 65, 54, 216, 30, 172, 1, 93, 48, 3, 254, 22, 232, 255, 0, 4, 94, 239, 30, 169, 255, 7, 66, 11, 16, 119, 255, 175, 95, 243, 45, 255, 15, 87, 31, 255, 12, 95, 163, 3, 24, 225, 15, + 254, 128, 95, 30, 220, 160, 24, 245, 208, 0, 239, 255, 240, 127, 16, 91, 243, 10, 255, 250, 247, 15, 255, 253, 243, 250, 111, 255, 192, 179, 31, 255, 242, 84, 88, 87, 96, 13, 255, 11, 7, 86, 7, 2, 40, 147, 40, 151, 183, 223, 31, 250, 175, 247, 85, 255, 249, 0, 58, 213, 134, 251, 25, 60, 252, 30, 113, 254, 24, 231, + 255, 174, 8, 25, 180, 62, 31, 183, 12, 255, 229, 25, 47, 127, 33, 184, 242, 80, 47, 255, 240, 112, 79, 254, 255, 192, 160, 127, 255, 144, 208, 23, 152, 213, 242, 255, 8, 33, 21, 159, 31, 119, 127, 79, 239, 0, 234, 21, 119, 119, 175, 212, 59, 23, 251, 239, 23, 255, 191, 255, 25, 154, 255, 251, 16, 0, 84, 16, 73, 8, + 96, 31, 254, 17, 123, 87, 159, 28, 41, 111, 188, 51, 103, 37, 19, 240, 25, 245, 0, 25, 245, 56, 215, 116, 10, 192, 32, 252, 83, 151, 255, 206, 239, 255, 120, 74, 186, 26, 98, 223, 255, 240, 253, 145, 121, 153, 1, 227, 2, 160, 3, 15, 166, 1, 47, 31, 168, 175, 31, 244, 79, 31, 248, 8, 239, 198, 26, 87, 26, 95, + 154, 252, 51, 35, 42, 255, 55, 97, 15, 164, 31, 111, 31, 243, 133, 31, 34, 201, 45, 114, 0, 95, 1, 27, 157, 251, 24, 196, 242, 252, 111, 223, 255, 80, 10, 5, 213, 115, 16, 27, 91, 27, 123, 245, 27, 127, 224, 0, 42, 27, 55, 96, 29, 15, 175, 255, 15, 255, 255, 15, 255, 23, 36, 86, 119, 7, 255, 11, 80, 109, + 15, 159, 22, 6, 235, 77, 111, 5, 218, 15, 239, 3, 94, 246, 144, 0, 16, 223, 29, 117, 77, 128, 191, 255, 142, 71, 15, 159, 47, 11, 48, 255, 13, 62, 1, 255, 255, 11, 79, 255, 250, 254, 4, 100, 32, 6, 68, 231, 5, 79, 79, 130, 11, 30, 219, 28, 192, 47, 215, 48, 3, 32, 11, 244, 78, 183, 146, 228, 89, 163, + 9, 247, 17, 175, 61, 59, 45, 163, 30, 31, 255, 232, 127, 255, 209, 25, 250, 32, 24, 64, 40, 68, 31, 251, 207, 253, 96, 31, 251, 22, 170, 255, 160, 97, 2, 250, 143, 48, 0, 5, 158, 47, 255, 243, 31, 251, 167, 246, 29, 114, 250, 12, 242, 255, 14, 3, 61, 3, 223, 255, 214, 232, 14, 31, 33, 13, 50, 7, 253, 221, + 239, 255, 231, 137, 189, 192, 71, 251, 25, 90, 221, 220, 176, 84, 14, 129, 32, 223, 18, 45, 159, 25, 251, 46, 31, 163, 16, 108, 93, 31, 158, 103, 186, 126, 239, 255, 253, 63, 161, 254, 126, 26, 106, 211, 111, 254, 100, 0, 19, 15, 255, 3, 131, 48, 92, 23, 15, 2, 255, 15, 255, 255, 8, 255, 255, 15, 255, 11, 67, 87, + 213, 68, 72, 31, 255, 172, 31, 255, 51, 60, 141, 0, 255, 9, 1, 5, 7, 0, 5, 5, 0, 223, 9, 9, 32, 5, 20, 20, 0, 18, 18, 124, 32, 2, 19, 19, 0, 15, 15, 32, 5, 16, 14, 255, 6, 6, 0, 17, 17, 0, 14, 14, 224, 0, 23, 23, 80, 26, 16, 35, 16, 41, 64, 35, 16, 38, 102, 64, 50, 24, + 24, 32, 38, 16, 56, 13, 13, 32, 44, 12, 16, 62, 16, 8, 16, 68, 16, 56, 11, 11, 32, 62, 16, 65, 3, 16, 74, 16, 29, 64, 104, 112, 38, 16, 29, 16, 50, 10, 10, 55, 80, 35, 16, 122, 12, 12, 16, 125, 67, 77, 65, 125, 40, 113, 180, 0, 44, 0, 122, 75, 41, 89, 167, 200, 31, 33, 3, 45, 207, 0, + 1, 16, 0, 5, 0, 226, 6, 0, 7, 27, 193, 22, 234, 27, 107, 11, 38, 250, 182, 0, 16, 152, 0, 15, 31, 168, 17, 0, 16, 225, 255, 0, 20, 0, 21, 0, 22, 0, 23, 255, 0, 24, 0, 25, 0, 26, 0, 27, 93, 144, 59, 28, 31, 13, 29, 0, 30, 27, 167, 32, 255, 0, 33, 0, 34, 0, 35, 0, 36, 223, + 0, 37, 31, 33, 38, 0, 39, 0, 40, 253, 0, 41, 0, 42, 0, 43, 31, 47, 44, 253, 0, 45, 0, 46, 0, 47, 20, 172, 49, 73, 48, 113, 50, 17, 95, 64, 179, 36, 43, 169, 127, 205, 3, 80, 55, 58, 33, 27, 237, 228, 65, 117, 15, 229, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 4, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 4, 224, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 3, 192, 64, 3, 112, 1, 1, 64, 27, 0, 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, + 0, 82, 79, 79, 84, 32, 27, 204, 128, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 15, 109, 64, 79, 2, 128, 64, 81, 226, 226, 16, 19, 27, 90, 80, 15, 160, 64, 26, 207, 45, 16, 39, 41, 16, 127, 190, 32, 96, 19, 255, 255, 0, 46, 2, 128, 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, + 127, 0, 3, 10, 46, 0, 46, 46, 0, 101, 117, 255, 105, 116, 97, 108, 105, 97, 110, 0, 255, 109, 101, 115, 115, 97, 103, 101, 46, 239, 98, 109, 103, 96, 11, 105, 100, 46, 116, 255, 98, 108, 0, 115, 116, 114, 117, 99, 158, 116, 48, 10, 160, 199, 77, 69, 83, 71, 16, 44, 183, 49, 80, 187, 2, 2, 208, 228, 73, 78, + 70, 126, 16, 27, 0, 96, 0, 6, 0, 12, 49, 62, 42, 113, 56, 48, 159, 2, 144, 11, 86, 144, 23, 170, 128, 35, 211, 1, 134, 144, 11, 172, 144, 59, 49, 130, 68, 65, 223, 84, 49, 80, 70, 73, 0, 110, 0, 115, 253, 0, 101, 0, 114, 0, 105, 16, 7, 99, 85, 16, 5, 32, 16, 9, 108, 17, 183, 100, 80, 17, + 111, 127, 80, 11, 10, 0, 83, 0, 85, 0, 80, 247, 0, 69, 0, 82, 17, 213, 77, 0, 65, 117, 16, 7, 73, 0, 79, 17, 225, 71, 16, 11, 76, 115, 16, 15, 88, 0, 89, 17, 26, 0, 83, 70, 109, 0, 174, 112, 16, 139, 115, 16, 173, 105, 0, 98, 48, 163, 146, 101, 18, 93, 32, 5, 103, 16, 1, 32, 193, 101, + 0, 187, 1, 170, 46, 18, 129, 80, 48, 223, 10, 16, 65, 97, 48, 43, 174, 105, 16, 211, 114, 80, 233, 110, 0, 102, 48, 13, 84, 32, 27, 122, 48, 25, 110, 17, 9, 44, 18, 183, 32, 249, 84, 33, 27, 117, 17, 13, 116, 16, 57, 10, 81, 23, 32, 69, 170, 110, 16, 21, 97, 80, 129, 100, 81, 51, 115, 16, 37, 138, + 114, 16, 45, 128, 69, 33, 67, 101, 17, 75, 108, 48, 61, 84, 96, 79, 111, 80, 185, 87, 17, 113, 105, 49, 47, 1, 87, 18, 170, 0, 17, 121, 97, 17, 165, 116, 49, 161, 112, 49, 177, 186, 32, 16, 155, 110, 0, 39, 16, 213, 118, 16, 1, 169, 101, 17, 201, 116, 16, 173, 114, 16, 229, 64, 189, 115, 93, 17, 51, 105, + 17, 211, 97, 0, 33, 243, 69, 6, 95, 82, 71, 40, 19, 163, 8, 33, 157, 67, 98, 127, 50, 251, 4, 0, 6, 4, 56, 56, 178, 82, 83, 7, 0, 211, 175, 8, 82, 123, 35, 51, 3, 19, 219, 175, 24, 19, 223, 4, 147, 199, 43, 67, 79, 77, 255, 77, 69, 78, 84, 0, 68, 73, 83, 245, 67, 95, 48, 49, 80, 7, + 50, 80, 15, 51, 255, 0, 84, 73, 84, 76, 69, 95, 77, 239, 65, 73, 78, 80, 10, 83, 85, 66, 0, 151, 64, 0, 0, 0, 144, 111, 112, 36, 67, 174, 55, 113, 189, 97, 96, 147, 28, 19, 62, 141, 80, 171, 0, 243, 190, 198, 20, 162, 51, 179, 16, 153, 100, 67, 223, 164, 76, 51, 191, 12, 0, 0, 19, 54, 206, 175, + 66, 51, 203, 19, 221, 137, 230, 39, 67, 215, 254, 20, 0, 0, 251, 104, 17, 53, 51, 227, 122, 16, 185, 23, 177, 123, 254, 51, 239, 28, 116, 149, 170, 4, 81, 23, 7, 80, 235, 9, 20, 191, 10, 20, 195, 128, 11, 224, 162, 0, 0, 0, 89, 97, 122, 48, 0, 0, 82, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, + 65, 82, 67, 0, 0, 82, 224, 245, 0, 0, 0, 32, 16, 3, 192, 16, 11, 0, 42, 64, 3, 112, 2, 1, 80, 27, 3, 16, 35, 64, 80, 3, 231, 128, 0, 3, 32, 22, 16, 57, 79, 79, 84, 115, 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, 67, 212, 246, 17, 0, 0, 18, 64, 80, 81, 232, 32, 88, 250, 255, 255, + 0, 46, 2, 128, 97, 16, 80, 19, 177, 184, 16, 19, 2, 255, 16, 0, 96, 19, 32, 132, 46, 255, 0, 46, 46, 0, 101, 109, 98, 101, 255, 100, 100, 101, 100, 102, 111, 110, 116, 255, 0, 109, 101, 115, 115, 97, 103, 101, 126, 32, 11, 50, 54, 46, 98, 114, 102, 16, 19, 127, 0, 0, 8, 82, 70, 78, 84, 254, 255, 1, + 191, 4, 48, 123, 16, 0, 5, 70, 73, 78, 182, 70, 32, 235, 1, 33, 16, 241, 27, 27, 32, 219, 251, 56, 0, 0, 80, 104, 16, 155, 12, 33, 254, 27, 26, 0, 84, 71, 76, 80, 16, 15, 255, 48, 24, 26, 20, 24, 0, 0, 8, 229, 0, 0, 10, 32, 221, 17, 3, 128, 49, 31, 96, 190, 0, 0, 0, 106, 127, 255, + 176, 0, 111, 16, 3, 233, 95, 255, 160, 16, 3, 144, 48, 3, 0, 144, 50, 3, 247, 119, 80, 0, 7, 16, 83, 7, 255, 128, 247, 0, 9, 255, 96, 16, 3, 64, 0, 10, 249, 255, 32, 0, 11, 255, 0, 238, 107, 0, 124, 243, 63, 117, 17, 231, 63, 255, 112, 48, 3, 47, 16, 7, 31, 119, 17, 159, 31, 255, 80, 48, + 3, 13, 221, 64, 103, 2, 143, 47, 1, 17, 1, 227, 255, 2, 244, 127, 7, 203, 16, 127, 51, 251, 223, 255, 240, 0, 175, 255, 208, 247, 0, 9, 238, 64, 3, 152, 156, 9, 252, 0, 231, 0, 159, 255, 53, 249, 16, 196, 0, 0, 23, 190, 207, 21, 234, 239, 0, 0, 4, 231, 102, 0, 148, 176, 22, 128, 38, 132, 208, 22, + 136, 144, 86, 140, 5, 107, 21, 85, 21, 219, 3, 16, 75, 13, 22, 55, 14, 22, 59, 6, 74, 38, 63, 39, 102, 192, 38, 212, 243, 22, 220, 251, 22, 224, 168, 253, 22, 228, 248, 22, 232, 80, 4, 213, 255, 5, 230, 255, 7, 230, 46, 107, 24, 56, 0, 79, 25, 83, 223, 121, 72, 39, 97, 126, 23, 90, 254, 64, 191, 255, + 255, 242, 24, 227, 237, 252, 255, 253, 24, 233, 192, 191, 7, 96, 7, 64, 62, 83, 19, 153, 134, 53, 0, 75, 239, 255, 23, 255, 191, 255, 22, 7, 255, 0, 15, 252, 167, 0, 222, 2, 63, 119, 160, 103, 119, 84, 16, 25, 59, 222, 254, 255, 80, 0, 101, 68, 88, 223, 19, 83, 162, 159, 169, 200, 128, 35, 3, 25, 109, 24, + 61, 0, 20, 73, 137, 0, 20, 73, 3, 172, 3, 26, 11, 191, 24, 248, 25, 135, 95, 125, 136, 0, 20, 119, 100, 59, 255, 144, 0, 251, 245, 134, 140, 253, 48, 201, 241, 251, 16, 15, 255, 191, 250, 41, 223, 16, 0, 255, 246, 0, 0, 221, 60, 192, 198, 105, 0, 0, 74, 19, 243, 127, 53, 25, 223, 32, 183, 15, 235, 25, + 238, 63, 106, 104, 53, 239, 119, 117, 64, 160, 94, 152, 99, 53, 141, 42, 32, 163, 170, 136, 198, 42, 59, 230, 42, 63, 144, 26, 67, 251, 248, 0, 94, 255, 255, 148, 38, 1, 51, 43, 20, 103, 26, 59, 7, 80, 3, 5, 20, 99, 0, 47, 123, 106, 200, 85, 103, 121, 155, 160, 190, 234, 151, 244, 118, 85, 255, 210, 138, 230, + 188, 25, 217, 24, 253, 153, 0, 41, 81, 41, 85, 51, 16, 5, 156, 23, 26, 175, 31, 74, 26, 179, 143, 26, 183, 17, 159, 6, 26, 221, 12, 17, 5, 239, 47, 255, 249, 25, 175, 255, 255, 48, 79, 119, 16, 8, 14, 255, 241, 25, 80, 128, 0, 5, 94, 17, 25, 2, 42, 223, 239, 103, 155, 222, 49, 170, 164, 241, 27, 120, + 247, 27, 124, 21, 32, 0, 42, 248, 25, 121, 232, 0, 255, 184, 27, 35, 254, 69, 45, 16, 194, 80, 95, 95, 96, 3, 15, 176, 3, 176, 0, 76, 255, 209, 255, 109, 255, 255, 218, 255, 255, 232, 216, 246, 255, 254, 166, 214, 27, 64, 226, 155, 38, 40, 213, 1, 143, 17, 226, 13, 32, 79, 229, 91, 100, 16, 41, 84, 255, 48, + 227, 242, 27, 135, 245, 43, 230, 21, 143, 3, 117, 27, 145, 9, 255, 253, 16, 183, 248, 21, 66, 245, 44, 16, 98, 32, 3, 247, 16, 199, 253, 209, 91, 244, 11, 98, 7, 41, 5, 168, 16, 33, 227, 31, 144, 3, 15, 144, 3, 33, 24, 0, 82, 112, 3, 243, 144, 3, 244, 64, 159, 16, 154, 144, 54, 243, 171, 111, 22, 251, + 95, 22, 255, 143, 22, 255, 223, 255, 180, 144, 17, 102, 64, 111, 16, 178, 0, 66, 227, 22, 75, 155, 2, 85, 251, 34, 3, 12, 255, 70, 15, 15, 255, 123, 34, 227, 255, 181, 87, 120, 44, 87, 254, 223, 239, 255, 255, 250, 16, 3, 247, 101, 84, 51, 145, 245, 86, 23, 44, 232, 152, 97, 123, 81, 131, 9, 17, 27, 207, 255, + 255, 175, 1, 255, 255, 79, 5, 255, 255, 255, 7, 9, 255, 251, 0, 9, 239, 79, 22, 97, 2, 141, 63, 67, 143, 253, 207, 117, 49, 72, 112, 251, 13, 93, 75, 80, 31, 16, 49, 135, 48, 251, 32, 7, 81, 18, 12, 33, 178, 123, 14, 80, 203, 96, 3, 32, 219, 7, 191, 152, 109, 160, 240, 0, 2, 175, 243, 104, 184, 207, + 163, 152, 114, 118, 66, 141, 190, 49, 83, 23, 84, 160, 254, 29, 221, 161, 4, 169, 3, 29, 141, 16, 192, 67, 151, 55, 59, 174, 41, 173, 252, 177, 45, 175, 184, 120, 173, 100, 87, 189, 239, 29, 160, 2, 87, 119, 100, 110, 32, 22, 135, 197, 29, 207, 23, 88, 17, 142, 29, 215, 112, 0, 254, 149, 146, 157, 188, 78, 69, 13, + 144, 3, 11, 80, 3, 5, 126, 113, 31, 245, 0, 43, 255, 251, 157, 164, 89, 234, 216, 119, 101, 132, 88, 255, 18, 8, 255, 28, 150, 18, 33, 23, 36, 95, 8, 23, 0, 15, 87, 247, 36, 175, 3, 46, 59, 158, 77, 174, 188, 39, 251, 252, 85, 87, 172, 164, 186, 237, 54, 119, 117, 113, 33, 4, 133, 30, 143, 249, 88, 30, + 147, 252, 72, 157, 252, 132, 12, 242, 255, 14, 3, 255, 15, 255, 2, 250, 2, 52, 85, 103, 10, 23, 216, 9, 80, 3, 245, 6, 153, 135, 118, 29, 159, 212, 111, 255, 120, 234, 153, 171, 181, 23, 247, 247, 23, 251, 249, 32, 3, 240, 85, 67, 50, 16, 15, 169, 34, 68, 239, 36, 223, 24, 59, 222, 7, 255, 143, 160, 70, 119, + 83, 175, 167, 159, 245, 166, 86, 174, 193, 223, 255, 231, 91, 3, 244, 57, 91, 111, 203, 99, 17, 52, 0, 28, 92, 75, 167, 143, 85, 84, 15, 111, 120, 159, 48, 91, 151, 176, 91, 171, 208, 58, 91, 171, 111, 255, 37, 67, 32, 60, 162, 143, 28, 166, 162, 159, 24, 96, 159, 30, 182, 32, 3, 144, 95, 19, 48, 179, 5, 112, + 3, 96, 107, 139, 167, 160, 95, 44, 15, 192, 1, 26, 28, 69, 73, 197, 35, 11, 80, 3, 79, 255, 82, 87, 103, 19, 234, 3, 122, 19, 238, 78, 249, 0, 4, 24, 170, 79, 137, 127, 93, 24, 203, 45, 28, 28, 239, 255, 177, 28, 165, 227, 69, 20, 15, 16, 56, 11, 15, 255, 15, 39, 47, 13, 48, 3, 254, 74, 23, 247, + 255, 16, 118, 32, 3, 254, 16, 126, 249, 25, 240, 188, 249, 111, 255, 221, 221, 221, 48, 40, 13, 40, 17, 42, 32, 11, 15, 255, 23, 31, 22, 84, 127, 24, 62, 191, 24, 244, 170, 239, 53, 100, 48, 53, 108, 223, 21, 108, 159, 73, 193, 245, 5, 188, 222, 255, 18, 10, 255, 24, 122, 255, 245, 5, 220, 186, 156, 31, 255, 10, + 86, 103, 95, 212, 17, 35, 45, 117, 32, 80, 54, 80, 20, 235, 86, 111, 16, 86, 107, 73, 227, 17, 7, 4, 29, 159, 18, 188, 54, 15, 34, 87, 167, 3, 41, 167, 13, 57, 130, 26, 42, 17, 252, 222, 214, 255, 251, 58, 183, 255, 58, 185, 219, 247, 23, 36, 84, 40, 62, 175, 25, 139, 191, 25, 56, 191, 21, 251, 96, 3, + 68, 32, 154, 223, 16, 107, 32, 3, 77, 247, 159, 86, 95, 160, 3, 106, 42, 91, 95, 255, 98, 71, 208, 93, 255, 240, 144, 3, 147, 241, 14, 91, 20, 87, 243, 8, 169, 251, 112, 3, 251, 4, 127, 26, 170, 63, 255, 254, 253, 239, 255, 227, 99, 27, 30, 32, 255, 26, 152, 27, 126, 16, 7, 255, 248, 169, 255, 23, 54, 246, + 8, 223, 9, 228, 0, 126, 20, 33, 231, 250, 74, 23, 71, 251, 26, 122, 32, 3, 234, 15, 255, 59, 79, 24, 84, 90, 34, 87, 2, 27, 251, 0, 44, 46, 219, 73, 175, 251, 254, 16, 0, 4, 239, 251, 153, 223, 107, 246, 245, 217, 206, 254, 199, 39, 91, 2, 120, 127, 247, 76, 80, 3, 248, 86, 231, 22, 235, 85, 66, 183, + 158, 147, 43, 42, 97, 71, 135, 194, 247, 131, 55, 0, 27, 218, 0, 224, 220, 76, 33, 231, 239, 34, 87, 82, 154, 221, 239, 226, 218, 82, 95, 42, 59, 243, 48, 3, 253, 175, 218, 241, 81, 231, 242, 95, 167, 137, 211, 5, 18, 32, 87, 247, 43, 87, 1, 80, 3, 136, 130, 255, 171, 23, 43, 131, 44, 35, 53, 127, 18, 254, + 3, 255, 173, 96, 207, 252, 255, 25, 20, 255, 254, 32, 191, 225, 120, 27, 9, 48, 0, 11, 245, 84, 236, 15, 255, 255, 15, 255, 255, 106, 207, 255, 5, 49, 46, 214, 244, 30, 6, 240, 28, 19, 150, 176, 43, 12, 29, 86, 64, 10, 77, 56, 3, 49, 76, 11, 162, 31, 83, 79, 111, 87, 67, 100, 7, 67, 67, 244, 94, 79, + 154, 250, 87, 235, 127, 255, 4, 33, 47, 118, 208, 31, 126, 178, 240, 29, 242, 240, 2, 30, 122, 27, 250, 242, 159, 255, 250, 18, 0, 0, 174, 251, 60, 11, 3, 80, 3, 133, 4, 152, 95, 91, 108, 43, 195, 31, 42, 8, 31, 218, 5, 184, 242, 148, 103, 36, 97, 0, 63, 243, 171, 75, 44, 219, 39, 5, 180, 6, 31, 247, + 127, 91, 175, 95, 190, 87, 117, 2, 81, 24, 192, 127, 136, 192, 106, 23, 134, 148, 231, 27, 255, 32, 6, 80, 99, 19, 196, 32, 186, 37, 26, 207, 165, 6, 207, 79, 255, 175, 4, 109, 206, 52, 111, 255, 35, 86, 119, 118, 121, 175, 255, 252, 169, 85, 85, 160, 221, 45, 177, 255, 173, 232, 47, 115, 209, 38, 31, 0, 142, 31, + 185, 1, 137, 239, 28, 208, 15, 255, 13, 47, 238, 8, 55, 238, 37, 166, 249, 85, 31, 112, 247, 31, 161, 246, 95, 66, 245, 12, 76, 49, 207, 42, 49, 73, 30, 222, 255, 22, 214, 254, 29, 175, 249, 28, 234, 184, 244, 55, 154, 15, 255, 240, 33, 98, 47, 227, 29, 34, 87, 45, 231, 2, 31, 79, 10, 22, 226, 47, 223, 251, + 255, 0, 207, 159, 255, 39, 255, 14, 255, 254, 255, 243, 79, 255, 255, 245, 191, 16, 3, 213, 255, 254, 26, 127, 247, 22, 247, 165, 26, 131, 35, 245, 255, 250, 251, 3, 30, 176, 5, 48, 87, 255, 42, 48, 200, 42, 79, 7, 29, 13, 8, 31, 137, 9, 64, 3, 2, 40, 192, 48, 99, 25, 252, 34, 45, 33, 114, 39, 219, 111, + 21, 47, 137, 13, 29, 52, 40, 142, 40, 150, 207, 24, 91, 40, 3, 159, 81, 144, 3, 175, 53, 108, 11, 85, 251, 42, 83, 32, 203, 239, 46, 64, 207, 48, 7, 191, 23, 145, 0, 0, 246, 90, 79, 146, 128, 87, 139, 45, 253, 80, 90, 163, 31, 231, 48, 31, 239, 170, 128, 31, 247, 192, 31, 255, 224, 22, 70, 240, 25, 182, + 148, 240, 32, 15, 17, 159, 128, 95, 75, 1, 144, 3, 197, 223, 17, 47, 95, 64, 3, 31, 166, 37, 91, 34, 47, 47, 34, 105, 91, 173, 113, 31, 191, 112, 24, 34, 48, 143, 48, 203, 226, 61, 22, 11, 30, 199, 178, 0, 0, 179, 15, 255, 21, 14, 121, 23, 88, 13, 255, 255, 151, 43, 247, 19, 83, 255, 219, 0, 78, 47, + 75, 54, 119, 171, 178, 137, 190, 183, 255, 31, 231, 255, 16, 73, 255, 253, 48, 118, 148, 83, 14, 99, 25, 35, 179, 111, 59, 88, 144, 89, 100, 22, 193, 133, 36, 127, 98, 17, 219, 33, 227, 41, 251, 253, 27, 182, 194, 239, 0, 3, 116, 191, 229, 243, 3, 255, 253, 150, 144, 16, 3, 51, 211, 2, 111, 235, 33, 17, 127, 255, + 142, 11, 17, 235, 96, 3, 26, 199, 16, 11, 223, 178, 180, 42, 25, 62, 43, 204, 255, 58, 219, 1, 120, 131, 55, 167, 255, 74, 58, 95, 254, 83, 255, 28, 36, 98, 191, 255, 111, 95, 159, 79, 51, 147, 78, 239, 190, 27, 114, 0, 255, 216, 85, 174, 105, 111, 255, 141, 33, 67, 37, 119, 100, 111, 255, 141, 28, 26, 188, 29, + 50, 31, 155, 192, 0, 27, 176, 0, 197, 252, 64, 152, 156, 15, 170, 17, 106, 135, 223, 82, 159, 191, 197, 221, 96, 15, 224, 255, 15, 255, 255, 11, 192, 40, 42, 76, 131, 159, 29, 79, 155, 28, 119, 111, 255, 21, 119, 81, 36, 3, 178, 117, 111, 162, 250, 102, 175, 29, 200, 4, 231, 95, 0, 19, 42, 158, 44, 147, 29, 178, + 0, 31, 78, 159, 255, 1, 53, 213, 0, 75, 28, 3, 95, 31, 243, 47, 31, 247, 14, 247, 254, 151, 0, 2, 142, 191, 103, 119, 83, 157, 0, 93, 159, 63, 255, 84, 52, 105, 46, 28, 111, 65, 175, 255, 80, 91, 195, 38, 213, 46, 57, 61, 220, 207, 99, 24, 83, 77, 59, 111, 72, 3, 10, 39, 201, 79, 255, 2, 87, 231, + 118, 48, 239, 77, 251, 60, 107, 231, 32, 6, 85, 31, 203, 6, 184, 31, 64, 88, 127, 252, 87, 124, 252, 102, 255, 191, 140, 221, 143, 255, 47, 251, 35, 49, 159, 226, 223, 17, 222, 167, 160, 255, 255, 237, 24, 255, 106, 140, 42, 19, 32, 86, 131, 144, 65, 23, 221, 15, 155, 0, 170, 4, 94, 243, 79, 31, 243, 191, 71, 255, + 5, 127, 255, 98, 36, 147, 255, 231, 31, 11, 28, 100, 22, 73, 0, 44, 7, 117, 232, 220, 5, 138, 201, 30, 254, 253, 55, 18, 2, 58, 79, 52, 9, 191, 16, 191, 255, 226, 25, 231, 96, 32, 55, 170, 12, 29, 100, 14, 26, 2, 15, 23, 62, 14, 31, 100, 169, 11, 72, 159, 111, 95, 139, 8, 47, 170, 86, 175, 4, 84, + 80, 15, 30, 48, 143, 248, 89, 51, 254, 105, 55, 89, 67, 39, 127, 159, 160, 3, 111, 191, 75, 31, 63, 207, 192, 0, 254, 77, 255, 176, 26, 255, 255, 177, 17, 160, 251, 185, 255, 255, 179, 187, 30, 142, 167, 255, 245, 255, 128, 144, 223, 31, 179, 208, 64, 235, 250, 9, 87, 95, 206, 59, 54, 192, 32, 176, 250, 30, 2, 94, + 99, 43, 86, 46, 99, 23, 143, 122, 12, 41, 197, 55, 251, 41, 223, 214, 255, 181, 38, 199, 231, 39, 61, 1, 107, 42, 27, 164, 45, 46, 86, 0, 178, 166, 87, 183, 247, 234, 127, 11, 54, 6, 66, 49, 111, 253, 120, 134, 104, 142, 106, 130, 15, 255, 20, 12, 86, 99, 170, 15, 80, 3, 14, 80, 19, 8, 50, 192, 248, 83, + 83, 165, 244, 94, 99, 244, 86, 119, 62, 136, 223, 30, 17, 207, 69, 55, 87, 112, 48, 7, 30, 204, 27, 2, 48, 41, 22, 11, 148, 255, 2, 193, 0, 9, 255, 1, 128, 31, 0, 253, 39, 136, 31, 138, 103, 31, 163, 7, 223, 175, 127, 30, 147, 207, 133, 86, 155, 159, 111, 159, 35, 63, 254, 87, 26, 231, 0, 0, 165, 108, + 47, 203, 41, 25, 175, 51, 143, 250, 88, 243, 166, 110, 41, 207, 253, 144, 31, 79, 160, 0, 239, 52, 61, 154, 127, 83, 43, 160, 3, 35, 69, 111, 255, 144, 23, 32, 165, 144, 28, 7, 144, 26, 247, 26, 2, 78, 26, 176, 1, 170, 32, 159, 222, 229, 47, 3, 160, 46, 227, 48, 55, 63, 173, 207, 16, 11, 6, 255, 99, 137, + 135, 76, 75, 143, 111, 92, 87, 1, 51, 143, 230, 10, 255, 119, 138, 184, 223, 155, 58, 235, 113, 51, 155, 214, 99, 231, 47, 54, 151, 112, 12, 213, 34, 76, 110, 16, 96, 3, 2, 255, 221, 172, 16, 15, 255, 32, 0, 27, 247, 0, 63, 84, 3, 207, 223, 115, 36, 235, 249, 33, 57, 44, 86, 20, 191, 255, 25, 106, 41, 163, + 4, 103, 120, 95, 111, 28, 180, 255, 26, 86, 52, 45, 170, 43, 174, 250, 32, 14, 54, 93, 181, 15, 255, 255, 15, 255, 163, 234, 1, 35, 66, 92, 11, 249, 62, 11, 9, 31, 4, 162, 6, 207, 62, 85, 43, 46, 30, 232, 86, 151, 10, 91, 23, 52, 79, 255, 35, 179, 254, 128, 93, 199, 64, 78, 188, 206, 221, 245, 3, 16, + 0, 190, 30, 248, 223, 84, 167, 191, 78, 29, 145, 159, 35, 217, 14, 161, 9, 2, 202, 134, 223, 31, 147, 236, 37, 19, 64, 123, 13, 85, 47, 139, 234, 150, 0, 170, 5, 30, 108, 159, 31, 190, 30, 27, 106, 6, 38, 126, 171, 207, 159, 127, 3, 20, 70, 30, 23, 62, 191, 252, 108, 30, 241, 255, 80, 30, 85, 226, 239, 176, + 191, 59, 203, 146, 209, 72, 183, 39, 185, 242, 211, 234, 24, 69, 175, 44, 177, 74, 76, 15, 5, 99, 183, 63, 255, 48, 94, 3, 247, 110, 111, 185, 160, 28, 169, 244, 0, 11, 136, 29, 31, 234, 190, 172, 80, 31, 221, 250, 44, 243, 64, 239, 31, 103, 36, 249, 85, 11, 204, 110, 4, 78, 88, 64, 54, 71, 175, 29, 43, 111, + 84, 31, 133, 47, 31, 133, 13, 31, 133, 8, 47, 45, 41, 163, 149, 175, 77, 119, 47, 95, 13, 29, 167, 95, 31, 161, 223, 210, 255, 224, 31, 114, 96, 45, 108, 41, 134, 160, 94, 247, 74, 255, 255, 143, 29, 251, 32, 83, 79, 30, 251, 47, 63, 243, 169, 243, 29, 139, 246, 31, 159, 248, 31, 179, 66, 100, 9, 74, 93, 159, + 15, 31, 203, 38, 135, 143, 31, 211, 223, 78, 143, 169, 32, 31, 123, 48, 31, 173, 48, 31, 141, 45, 9, 112, 87, 30, 164, 128, 31, 235, 176, 24, 156, 224, 47, 255, 170, 245, 25, 175, 63, 26, 6, 9, 47, 127, 144, 95, 127, 11, 37, 244, 38, 120, 61, 253, 79, 48, 249, 25, 251, 192, 111, 75, 31, 173, 223, 29, 232, 31, + 67, 144, 31, 71, 243, 255, 228, 238, 255, 252, 13, 77, 17, 37, 151, 9, 15, 155, 2, 63, 159, 180, 253, 24, 204, 255, 114, 21, 155, 236, 63, 145, 31, 75, 218, 255, 4, 26, 101, 0, 40, 30, 81, 10, 24, 191, 168, 251, 90, 171, 48, 72, 83, 208, 90, 199, 13, 196, 119, 56, 164, 153, 223, 89, 163, 40, 135, 2, 223, 89, + 231, 63, 255, 110, 71, 31, 150, 255, 26, 19, 47, 70, 42, 206, 255, 193, 0, 202, 0, 116, 4, 88, 27, 47, 175, 207, 89, 247, 13, 96, 95, 93, 118, 231, 24, 25, 226, 223, 255, 230, 31, 62, 130, 61, 24, 89, 24, 8, 211, 0, 11, 100, 159, 255, 242, 235, 143, 255, 224, 27, 180, 128, 24, 118, 16, 255, 122, 54, 235, 112, + 0, 55, 97, 175, 225, 46, 64, 191, 109, 34, 67, 1, 191, 31, 197, 6, 227, 183, 63, 69, 169, 255, 26, 213, 207, 28, 138, 63, 26, 7, 41, 107, 1, 148, 250, 175, 222, 39, 243, 241, 84, 171, 251, 2, 195, 6, 15, 175, 10, 171, 11, 53, 48, 249, 25, 198, 250, 57, 174, 6, 255, 140, 237, 15, 160, 255, 15, 255, 255, 175, + 255, 13, 221, 214, 199, 191, 255, 137, 221, 16, 0, 47, 115, 0, 31, 7, 0, 14, 7, 0, 9, 145, 131, 87, 200, 137, 32, 31, 58, 37, 198, 48, 31, 58, 128, 3, 10, 62, 184, 141, 23, 91, 195, 224, 3, 63, 255, 101, 64, 92, 199, 144, 62, 192, 3, 11, 61, 113, 21, 0, 0, 76, 255, 41, 18, 43, 38, 201, 30, 59, + 196, 39, 246, 12, 29, 216, 15, 255, 245, 192, 0, 119, 65, 47, 211, 179, 31, 215, 252, 63, 31, 219, 31, 236, 76, 176, 0, 2, 140, 250, 78, 62, 247, 7, 14, 223, 18, 33, 235, 143, 255, 123, 39, 37, 85, 80, 3, 254, 31, 254, 244, 29, 166, 192, 24, 71, 128, 220, 38, 118, 29, 215, 255, 253, 48, 55, 143, 30, 95, 145, + 80, 58, 116, 45, 199, 79, 93, 203, 207, 244, 41, 103, 96, 41, 93, 171, 151, 187, 77, 74, 23, 111, 104, 167, 32, 192, 242, 122, 31, 78, 208, 54, 118, 32, 32, 95, 96, 31, 247, 189, 192, 31, 251, 80, 179, 20, 157, 13, 32, 34, 26, 73, 31, 18, 239, 74, 115, 46, 95, 191, 31, 216, 46, 221, 255, 250, 254, 21, 119, 81, + 63, 31, 28, 223, 93, 158, 250, 127, 230, 16, 54, 95, 31, 7, 111, 72, 127, 33, 58, 229, 65, 243, 112, 0, 3, 4, 175, 138, 45, 206, 75, 95, 9, 123, 138, 223, 20, 119, 81, 42, 126, 189, 185, 223, 255, 255, 145, 0, 127, 249, 0, 91, 255, 255, 248, 191, 255, 255, 205, 255, 255, 214, 73, 47, 224, 177, 43, 123, 47, 39, + 96, 64, 3, 47, 118, 210, 19, 137, 11, 15, 255, 11, 33, 227, 13, 25, 146, 25, 130, 206, 2, 109, 30, 96, 0, 61, 47, 219, 54, 118, 116, 157, 255, 207, 255, 48, 31, 238, 33, 63, 144, 255, 174, 255, 254, 192, 250, 12, 255, 192, 32, 3, 14, 100, 25, 234, 95, 255, 97, 26, 47, 111, 26, 51, 223, 57, 219, 239, 63, 221, + 118, 207, 190, 207, 255, 182, 108, 215, 255, 254, 31, 160, 246, 41, 151, 190, 254, 180, 40, 191, 221, 0, 195, 15, 15, 30, 252, 13, 55, 123, 88, 199, 39, 227, 125, 175, 71, 1, 16, 32, 4, 159, 24, 63, 255, 189, 224, 66, 99, 253, 96, 103, 117, 15, 36, 26, 239, 27, 74, 255, 26, 135, 76, 123, 0, 110, 175, 255, 32, 0, + 167, 2, 24, 178, 78, 113, 161, 19, 39, 95, 71, 118, 214, 32, 3, 127, 191, 80, 0, 3, 0, 51, 16, 175, 255, 77, 45, 67, 11, 108, 79, 28, 95, 0, 7, 175, 255, 211, 250, 254, 148, 3, 246, 32, 26, 99, 236, 34, 98, 122, 50, 100, 253, 3, 103, 118, 127, 229, 235, 44, 107, 163, 192, 66, 95, 249, 10, 91, 126, 15, + 255, 255, 10, 25, 138, 2, 103, 18, 37, 172, 54, 7, 77, 135, 247, 30, 11, 126, 160, 99, 47, 27, 142, 229, 31, 223, 29, 112, 30, 29, 0, 88, 192, 10, 229, 126, 211, 5, 113, 31, 238, 254, 54, 199, 60, 11, 223, 254, 22, 64, 19, 207, 196, 102, 59, 16, 15, 121, 31, 41, 135, 68, 3, 138, 79, 93, 43, 96, 3, 128, + 87, 208, 208, 3, 192, 12, 8, 146, 189, 127, 31, 247, 127, 255, 112, 9, 31, 32, 11, 189, 255, 64, 3, 7, 191, 255, 199, 31, 171, 176, 201, 0, 31, 46, 185, 4, 199, 0, 119, 5, 62, 26, 22, 76, 0, 42, 21, 31, 63, 231, 47, 31, 235, 159, 29, 225, 223, 31, 214, 61, 31, 135, 37, 90, 118, 33, 69, 115, 21, 253, + 247, 117, 31, 41, 249, 255, 245, 29, 67, 81, 31, 49, 1, 82, 29, 71, 3, 31, 89, 9, 32, 36, 15, 44, 17, 4, 31, 101, 34, 40, 144, 64, 3, 252, 55, 255, 96, 3, 15, 107, 47, 95, 94, 187, 150, 127, 208, 3, 40, 163, 159, 30, 87, 0, 0, 160, 3, 149, 144, 208, 3, 15, 32, 17, 51, 69, 255, 10, 87, 247, + 9, 94, 86, 103, 7, 48, 3, 81, 22, 117, 16, 30, 255, 165, 247, 120, 2, 181, 41, 64, 41, 161, 5, 48, 244, 0, 254, 71, 98, 0, 28, 255, 255, 177, 24, 128, 181, 252, 56, 38, 119, 255, 30, 136, 191, 19, 188, 159, 10, 48, 3, 9, 59, 6, 96, 3, 28, 122, 240, 31, 150, 241, 30, 199, 95, 40, 4, 246, 30, 191, + 248, 0, 1, 66, 16, 86, 14, 195, 55, 191, 26, 245, 95, 31, 217, 10, 255, 81, 67, 250, 0, 71, 0, 0, 66, 39, 247, 200, 57, 171, 243, 95, 255, 255, 188, 56, 223, 24, 208, 212, 143, 205, 255, 116, 35, 195, 16, 218, 102, 175, 56, 15, 208, 79, 15, 142, 15, 8, 63, 123, 96, 3, 248, 0, 9, 222, 141, 247, 15, 127, + 60, 33, 67, 160, 3, 173, 223, 175, 255, 144, 85, 209, 79, 112, 4, 183, 32, 255, 128, 3, 3, 32, 3, 253, 14, 175, 255, 97, 231, 34, 212, 43, 113, 221, 0, 6, 176, 127, 170, 247, 29, 80, 247, 29, 88, 246, 29, 92, 245, 24, 255, 245, 245, 0, 205, 222, 175, 255, 80, 88, 19, 48, 76, 91, 59, 16, 15, 255, 94, 59, + 207, 39, 190, 15, 255, 6, 27, 251, 240, 32, 255, 235, 96, 8, 181, 255, 9, 198, 255, 10, 215, 255, 15, 255, 52, 255, 1, 51, 81, 5, 11, 255, 247, 223, 86, 39, 251, 9, 64, 3, 230, 29, 74, 48, 7, 31, 166, 146, 7, 31, 243, 31, 158, 0, 31, 158, 31, 255, 225, 31, 255, 234, 249, 0, 92, 31, 247, 0, 109, 106, + 239, 15, 255, 17, 41, 20, 212, 28, 219, 223, 58, 91, 7, 56, 3, 38, 154, 112, 145, 0, 41, 158, 23, 230, 103, 26, 88, 21, 248, 31, 163, 255, 186, 64, 30, 4, 225, 0, 62, 26, 119, 4, 23, 255, 92, 61, 119, 223, 0, 96, 16, 1, 35, 48, 54, 187, 24, 188, 23, 48, 3, 41, 251, 40, 55, 9, 26, 191, 9, 255, + 245, 148, 3, 16, 96, 31, 156, 211, 111, 66, 195, 63, 191, 45, 199, 178, 4, 31, 203, 6, 255, 167, 27, 41, 191, 243, 31, 255, 158, 246, 53, 87, 64, 7, 0, 0, 37, 87, 198, 3, 191, 143, 184, 11, 16, 1, 80, 0, 48, 111, 239, 241, 0, 55, 23, 54, 127, 255, 255, 16, 253, 239, 255, 146, 0, 255, 227, 31, 243, 48, + 20, 64, 67, 15, 40, 21, 46, 47, 127, 78, 3, 12, 79, 247, 62, 19, 254, 1, 175, 1, 70, 119, 97, 191, 111, 255, 223, 235, 156, 59, 126, 248, 65, 0, 139, 255, 229, 255, 217, 48, 31, 147, 54, 43, 112, 80, 183, 247, 68, 80, 183, 228, 151, 239, 5, 158, 16, 104, 73, 251, 25, 114, 41, 118, 145, 219, 213, 160, 33, 167, + 253, 25, 146, 32, 3, 16, 35, 221, 156, 218, 14, 97, 28, 41, 231, 207, 255, 161, 39, 231, 72, 3, 199, 110, 255, 74, 19, 111, 158, 26, 8, 60, 255, 250, 94, 79, 155, 255, 31, 167, 213, 0, 119, 82, 15, 158, 25, 162, 7, 24, 183, 7, 28, 171, 34, 176, 42, 99, 5, 24, 15, 158, 5, 28, 187, 32, 3, 4, 255, 249, + 16, 17, 79, 239, 250, 102, 207, 111, 159, 249, 123, 239, 234, 152, 64, 175, 252, 28, 206, 0, 224, 92, 23, 11, 32, 6, 73, 255, 84, 123, 243, 237, 175, 255, 240, 89, 255, 128, 92, 87, 6, 201, 33, 154, 1, 104, 104, 66, 3, 0, 111, 31, 255, 21, 111, 255, 191, 72, 25, 22, 0, 0, 59, 255, 221, 221, 189, 239, 106, 2, + 251, 119, 119, 84, 124, 190, 225, 84, 82, 175, 246, 92, 127, 16, 15, 255, 222, 3, 25, 255, 32, 3, 227, 0, 49, 16, 15, 255, 255, 15, 162, 31, 29, 216, 5, 255, 170, 233, 31, 67, 248, 28, 142, 245, 20, 138, 242, 9, 152, 255, 29, 10, 169, 189, 31, 235, 103, 247, 255, 5, 207, 31, 247, 95, 211, 255, 128, 30, 238, 112, + 30, 238, 32, 3, 96, 255, 23, 30, 9, 31, 173, 54, 207, 119, 14, 21, 34, 89, 153, 48, 81, 28, 162, 48, 30, 146, 16, 72, 51, 70, 79, 112, 3, 41, 242, 155, 128, 0, 63, 29, 231, 32, 3, 31, 48, 3, 186, 224, 16, 15, 240, 0, 79, 30, 151, 127, 30, 155, 106, 15, 255, 15, 2, 81, 31, 62, 245, 31, 62, 248, + 30, 187, 149, 250, 29, 66, 88, 160, 207, 95, 163, 83, 44, 101, 235, 57, 24, 83, 40, 27, 252, 0, 14, 30, 227, 16, 91, 48, 242, 175, 255, 160, 112, 24, 231, 111, 23, 32, 15, 255, 7, 214, 18, 69, 64, 75, 191, 94, 7, 70, 66, 166, 125, 235, 103, 119, 117, 40, 187, 224, 31, 159, 246, 255, 187, 239, 31, 63, 111, 255, + 224, 16, 106, 64, 95, 117, 23, 169, 255, 254, 64, 12, 215, 144, 127, 17, 239, 95, 203, 255, 230, 17, 123, 71, 159, 1, 33, 55, 4, 119, 65, 175, 255, 120, 31, 255, 46, 148, 47, 188, 40, 215, 0, 213, 27, 239, 77, 18, 65, 191, 50, 87, 87, 255, 108, 239, 186, 127, 239, 253, 255, 241, 141, 255, 255, 241, 31, 235, 241, 255, + 255, 237, 255, 241, 217, 23, 153, 145, 85, 15, 191, 28, 63, 31, 159, 14, 31, 163, 10, 89, 211, 0, 149, 143, 89, 79, 63, 255, 166, 31, 57, 254, 33, 139, 255, 139, 192, 30, 107, 26, 199, 25, 220, 118, 15, 4, 28, 191, 0, 235, 0, 61, 255, 138, 143, 191, 186, 244, 255, 210, 252, 0, 0, 254, 136, 155, 220, 41, 139, 27, + 66, 248, 254, 221, 221, 221, 203, 14, 204, 255, 15, 221, 255, 15, 255, 120, 245, 67, 87, 68, 72, 31, 255, 164, 108, 46, 9, 255, 0, 9, 1, 5, 7, 0, 4, 4, 239, 0, 5, 5, 32, 2, 20, 20, 0, 18, 190, 18, 32, 2, 19, 19, 0, 15, 15, 32, 2, 63, 16, 8, 16, 17, 6, 6, 0, 17, 17, 0, 248, 14, + 14, 0, 23, 23, 80, 29, 16, 38, 16, 44, 51, 112, 38, 64, 53, 24, 24, 32, 38, 16, 59, 13, 13, 6, 32, 44, 16, 65, 16, 8, 16, 71, 16, 56, 11, 11, 32, 62, 6, 16, 71, 64, 101, 112, 32, 16, 23, 16, 44, 10, 10, 32, 92, 127, 16, 95, 12, 12, 0, 67, 77, 65, 80, 125, 31, 255, 200, 0, 33, 0, + 122, 75, 45, 81, 154, 212, 28, 144, 112, 0, 0, 2, 112, 9, 3, 30, 154, 159, 4, 128, 25, 0, 9, 8, 0, 5, 0, 6, 0, 239, 7, 0, 8, 16, 240, 10, 0, 11, 0, 227, 12, 0, 13, 30, 212, 16, 160, 27, 64, 17, 0, 111, 16, 237, 0, 20, 27, 131, 22, 0, 23, 0, 255, 24, 0, 25, 0, 26, 0, 27, + 0, 174, 28, 144, 111, 29, 31, 0, 30, 0, 31, 25, 46, 254, 33, 0, 34, 0, 35, 0, 36, 31, 16, 191, 37, 48, 137, 38, 0, 39, 0, 40, 0, 239, 41, 0, 42, 31, 34, 43, 0, 44, 0, 229, 45, 0, 46, 30, 241, 64, 165, 48, 80, 199, 28, 80, 63, 64, 2, 123, 253, 32, 15, 255, 10, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 4, 160, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 4, 160, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 3, 128, 64, 3, 112, 1, 1, 64, + 27, 0, 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, 79, 79, 84, 32, 27, 192, 76, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 13, 109, 64, 79, 2, 64, 64, 81, 226, 226, 16, 19, 25, 90, 80, 15, 160, 64, 26, 207, 45, 16, 39, 39, 16, 35, 190, 224, 96, 19, 255, 255, 0, 46, + 2, 128, 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, 3, 10, 46, 0, 46, 46, 0, 101, 117, 255, 100, 117, 116, 99, 104, 0, 109, 101, 255, 115, 115, 97, 103, 101, 46, 98, 109, 191, 103, 96, 11, 105, 100, 46, 116, 98, 108, 254, 0, 115, 116, 114, 117, 99, 116, 48, 10, 122, 192, 197, 77, 69, + 83, 71, 16, 46, 49, 80, 187, 221, 2, 2, 208, 228, 73, 78, 70, 16, 27, 0, 248, 96, 0, 6, 0, 12, 49, 62, 113, 56, 48, 159, 171, 2, 144, 11, 88, 144, 23, 174, 128, 35, 1, 82, 78, 144, 11, 120, 144, 59, 49, 130, 68, 65, 84, 16, 123, 223, 1, 192, 17, 159, 26, 6, 1, 0, 3, 255, 0, 86, 0, 111, + 0, 101, 0, 114, 79, 17, 173, 100, 16, 7, 32, 5, 105, 0, 115, 0, 190, 107, 17, 189, 118, 0, 97, 0, 110, 17, 197, 255, 83, 0, 85, 0, 80, 0, 69, 0, 254, 82, 0, 10, 0, 77, 0, 65, 16, 7, 234, 73, 0, 79, 17, 221, 71, 16, 11, 76, 16, 15, 234, 88, 0, 89, 17, 235, 105, 16, 43, 46, 0, 85, + 77, 171, 68, 208, 161, 107, 80, 161, 110, 16, 179, 101, 0, 169, 116, 18, 113, 119, 16, 205, 114, 48, 201, 32, 185, 103, 85, 16, 217, 108, 16, 221, 122, 48, 15, 46, 16, 191, 76, 75, 16, 235, 101, 16, 223, 96, 237, 87, 16, 237, 105, 0, 234, 45, 0, 104, 48, 235, 100, 48, 45, 105, 49, 3, 151, 110, 16, 61, 33, 3, + 111, 48, 81, 10, 0, 109, 85, 48, 57, 114, 80, 233, 102, 48, 103, 109, 17, 33, 116, 21, 48, 123, 32, 249, 129, 39, 32, 1, 39, 7, 0, 17, 49, 97, 210, 0, 117, 17, 87, 99, 16, 115, 65, 53, 116, 17, 129, 170, 32, 17, 107, 32, 16, 19, 111, 17, 123, 109, 17, 129, 165, 99, 48, 17, 100, 17, 131, 32, 201, 116, + 16, 49, 114, 85, 17, 165, 33, 51, 69, 6, 82, 7, 40, 19, 99, 8, 247, 33, 157, 67, 98, 50, 187, 4, 0, 6, 245, 4, 56, 56, 178, 82, 199, 0, 211, 111, 8, 42, 82, 59, 34, 243, 3, 19, 155, 24, 19, 159, 4, 147, 135, 255, 43, 67, 79, 77, 77, 69, 78, 84, 255, 0, 68, 73, 83, 67, 95, 48, 49, 95, + 80, 7, 50, 80, 15, 51, 0, 84, 73, 84, 254, 76, 69, 95, 77, 65, 73, 78, 80, 10, 249, 83, 85, 66, 0, 64, 0, 0, 0, 144, 111, 112, 123, 36, 3, 174, 55, 113, 97, 96, 147, 28, 19, 223, 62, 141, 80, 171, 0, 190, 198, 20, 162, 61, 51, 115, 16, 153, 100, 67, 164, 76, 51, 127, 12, 252, 0, 0, 19, 54, + 175, 66, 51, 139, 19, 157, 239, 137, 230, 39, 67, 151, 20, 0, 0, 251, 231, 104, 17, 53, 51, 163, 16, 185, 23, 177, 123, 170, 254, 51, 175, 28, 116, 85, 4, 81, 23, 7, 80, 235, 168, 9, 20, 127, 10, 20, 131, 11, 224, 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, + 122, 48, 0, 0, 82, 192, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 82, 192, 243, 0, 0, 0, 32, 16, 3, 16, 7, 81, 224, 42, 64, 3, 112, 1, 1, 80, 27, 3, 16, 35, 64, 80, 3, 231, 128, 0, 3, 32, 22, 16, 57, 79, 79, 84, 115, 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, + 67, 212, 246, 17, 0, 0, 18, 64, 79, 81, 216, 32, 87, 250, 255, 255, 0, 46, 2, 128, 96, 16, 80, 19, 177, 184, 16, 19, 2, 255, 16, 0, 96, 19, 32, 131, 46, 255, 0, 46, 46, 0, 101, 109, 98, 101, 255, 100, 100, 101, 100, 102, 111, 110, 116, 255, 0, 109, 101, 115, 115, 97, 103, 101, 126, 32, 11, 50, 54, 46, + 98, 114, 102, 16, 19, 127, 0, 0, 8, 82, 70, 78, 84, 254, 255, 1, 191, 4, 48, 123, 16, 0, 5, 70, 73, 78, 182, 70, 32, 235, 1, 33, 16, 241, 27, 27, 32, 219, 251, 56, 0, 0, 80, 104, 16, 247, 16, 33, 254, 27, 26, 0, 84, 71, 76, 80, 16, 15, 255, 48, 24, 25, 19, 24, 0, 0, 8, 229, 0, 0, + 10, 32, 221, 17, 3, 128, 49, 31, 96, 190, 0, 0, 0, 102, 127, 255, 176, 0, 111, 16, 3, 234, 95, 255, 160, 16, 3, 144, 48, 3, 63, 16, 7, 61, 0, 0, 255, 2, 133, 3, 39, 0, 0, 9, 18, 87, 191, 239, 255, 0, 8, 18, 125, 79, 255, 253, 0, 254, 223, 255, 192, 7, 255, 255, 48, 34, 231, 173, 97, 18, + 252, 254, 18, 217, 255, 242, 18, 155, 252, 85, 34, 159, 64, 16, 41, 176, 16, 38, 241, 1, 94, 112, 63, 215, 255, 112, 48, 3, 47, 16, 7, 31, 255, 96, 93, 16, 3, 80, 48, 3, 13, 221, 64, 2, 139, 63, 2, 243, 51, 85, 0, 15, 19, 157, 96, 3, 3, 17, 107, 179, 210, 103, 132, 19, 187, 247, 64, 3, 237, 213, + 85, 3, 9, 51, 66, 3, 79, 61, 6, 20, 199, 12, 20, 203, 47, 63, 35, 49, 20, 211, 207, 31, 255, 249, 0, 143, 119, 17, 199, 239, 255, 128, 20, 119, 16, 0, 255, 187, 250, 20, 127, 249, 103, 155, 36, 103, 255, 175, 234, 255, 255, 14, 16, 208, 10, 17, 244, 5, 20, 148, 95, 20, 124, 64, 16, 40, 184, 222, 255, 255, + 254, 151, 255, 80, 0, 3, 239, 10, 16, 4, 12, 82, 7, 203, 16, 127, 51, 251, 223, 255, 240, 0, 175, 255, 208, 245, 0, 9, 238, 64, 3, 243, 156, 62, 21, 207, 223, 86, 21, 211, 239, 21, 215, 111, 21, 219, 2, 117, 166, 39, 82, 35, 128, 176, 22, 124, 208, 54, 84, 5, 93, 34, 1, 22, 47, 217, 5, 255, 67, 223, + 9, 239, 34, 197, 166, 135, 255, 189, 79, 22, 81, 7, 117, 49, 251, 22, 224, 248, 61, 38, 175, 214, 164, 253, 207, 255, 245, 19, 87, 243, 119, 18, 247, 245, 0, 13, 18, 221, 3, 33, 16, 31, 5, 83, 255, 6, 100, 255, 232, 233, 19, 86, 4, 190, 255, 207, 255, 6, 24, 188, 40, 192, 0, 255, 202, 118, 243, 0, 35, 255, + 251, 24, 205, 34, 118, 0, 119, 219, 117, 65, 24, 243, 255, 232, 100, 83, 84, 69, 180, 141, 66, 175, 4, 207, 180, 95, 209, 25, 132, 20, 158, 169, 0, 41, 0, 253, 25, 144, 244, 201, 80, 41, 127, 159, 237, 0, 0, 11, 25, 31, 175, 255, 52, 176, 13, 62, 22, 199, 41, 160, 71, 118, 64, 191, 255, 144, 0, 242, 184, 104, + 207, 211, 25, 175, 164, 159, 179, 41, 119, 141, 160, 25, 123, 22, 210, 22, 69, 0, 204, 195, 40, 19, 251, 0, 4, 174, 255, 0, 23, 16, 0, 3, 113, 41, 127, 254, 185, 0, 16, 192, 25, 242, 52, 255, 87, 215, 119, 84, 32, 191, 252, 101, 19, 134, 51, 88, 100, 35, 208, 5, 255, 149, 0, 41, 24, 254, 25, 29, 21, 110, + 85, 25, 223, 128, 21, 111, 242, 24, 158, 249, 97, 31, 53, 44, 16, 186, 25, 215, 127, 80, 3, 92, 254, 41, 234, 71, 147, 253, 0, 0, 86, 119, 153, 187, 160, 190, 169, 249, 119, 101, 83, 253, 32, 65, 3, 42, 135, 198, 84, 83, 187, 249, 80, 3, 49, 6, 184, 0, 52, 25, 168, 100, 3, 106, 26, 63, 6, 153, 26, 207, + 13, 26, 211, 14, 42, 199, 247, 85, 103, 120, 153, 161, 30, 135, 118, 85, 235, 67, 221, 212, 26, 135, 245, 74, 229, 171, 181, 84, 86, 215, 249, 64, 191, 50, 5, 216, 26, 1, 24, 75, 96, 3, 167, 0, 48, 3, 254, 58, 225, 48, 3, 239, 255, 22, 255, 223, 255, 254, 175, 255, 254, 129, 143, 246, 255, 234, 97, 111, 26, 220, + 41, 189, 42, 223, 188, 24, 42, 227, 223, 0, 0, 42, 23, 204, 139, 105, 163, 128, 80, 227, 255, 27, 137, 32, 24, 56, 157, 63, 255, 186, 244, 17, 58, 208, 0, 207, 49, 84, 80, 27, 60, 85, 32, 3, 112, 16, 15, 208, 22, 216, 251, 6, 159, 13, 1, 100, 10, 175, 10, 108, 80, 101, 63, 96, 3, 0, 160, 3, 37, 75, + 147, 223, 33, 227, 48, 3, 48, 144, 3, 41, 43, 80, 0, 252, 6, 255, 80, 2, 191, 10, 25, 74, 18, 247, 85, 55, 63, 8, 25, 86, 13, 23, 111, 111, 16, 178, 255, 9, 22, 170, 41, 71, 17, 130, 27, 207, 47, 85, 251, 34, 3, 207, 61, 86, 15, 65, 35, 251, 85, 119, 137, 43, 243, 237, 77, 27, 248, 173, 27, 252, + 17, 154, 49, 80, 86, 23, 48, 74, 86, 19, 240, 144, 3, 167, 115, 72, 65, 60, 13, 81, 235, 83, 39, 247, 11, 144, 3, 9, 32, 3, 33, 227, 255, 254, 201, 221, 221, 115, 30, 32, 11, 249, 129, 235, 44, 231, 221, 21, 144, 219, 32, 11, 11, 227, 28, 223, 86, 223, 223, 80, 219, 121, 183, 135, 173, 7, 54, 140, 115, 152, + 250, 255, 255, 242, 183, 32, 100, 32, 214, 127, 29, 120, 226, 8, 75, 10, 203, 31, 255, 67, 151, 71, 59, 158, 237, 99, 251, 135, 222, 138, 223, 163, 250, 37, 119, 118, 65, 182, 255, 25, 23, 88, 18, 65, 57, 183, 233, 32, 0, 192, 4, 80, 3, 191, 87, 80, 3, 87, 183, 63, 185, 160, 94, 253, 130, 118, 161, 83, 205, 229, + 255, 23, 84, 26, 161, 52, 95, 13, 255, 4, 239, 60, 68, 175, 28, 172, 0, 0, 4, 223, 94, 71, 126, 94, 247, 197, 85, 122, 207, 164, 186, 103, 119, 84, 38, 177, 33, 44, 225, 255, 30, 157, 24, 253, 0, 200, 10, 241, 4, 49, 33, 231, 29, 168, 0, 7, 80, 3, 192, 159, 41, 239, 251, 68, 80, 3, 234, 13, 45, 255, + 14, 62, 255, 15, 223, 41, 58, 78, 99, 23, 211, 190, 11, 30, 99, 127, 255, 252, 1, 255, 31, 179, 125, 31, 255, 4, 103, 117, 48, 255, 156, 83, 250, 242, 101, 106, 235, 16, 74, 167, 117, 159, 112, 91, 3, 93, 173, 212, 18, 100, 139, 1, 19, 67, 28, 164, 249, 82, 30, 194, 251, 30, 191, 251, 23, 167, 37, 116, 253, 60, + 180, 37, 93, 185, 82, 255, 8, 100, 247, 84, 255, 10, 47, 255, 84, 167, 50, 147, 3, 250, 134, 231, 119, 158, 1, 17, 50, 85, 24, 86, 249, 24, 90, 251, 48, 3, 10, 24, 187, 9, 102, 31, 9, 9, 255, 103, 130, 15, 255, 45, 52, 85, 197, 35, 157, 191, 80, 3, 40, 19, 0, 0, 32, 64, 255, 2, 126, 19, 234, 62, + 144, 0, 4, 239, 144, 31, 160, 210, 160, 4, 17, 60, 79, 77, 127, 40, 248, 223, 28, 28, 223, 255, 251, 29, 191, 254, 48, 0, 255, 193, 82, 72, 11, 96, 143, 255, 5, 47, 41, 31, 255, 143, 45, 243, 32, 73, 66, 40, 187, 6, 61, 191, 40, 47, 53, 3, 22, 72, 33, 145, 5, 36, 175, 54, 195, 13, 158, 50, 30, 84, + 33, 58, 14, 23, 166, 15, 71, 60, 70, 244, 60, 70, 33, 58, 16, 194, 177, 91, 205, 231, 239, 255, 127, 30, 108, 39, 251, 93, 203, 169, 77, 32, 155, 175, 71, 251, 44, 179, 78, 255, 25, 38, 0, 52, 28, 125, 56, 139, 255, 145, 87, 247, 80, 80, 163, 34, 20, 106, 17, 7, 0, 73, 31, 147, 159, 31, 151, 143, 50, 87, + 246, 255, 0, 55, 255, 150, 115, 1, 27, 16, 98, 87, 41, 63, 203, 30, 211, 219, 21, 163, 189, 113, 16, 213, 0, 13, 24, 87, 13, 21, 150, 13, 53, 159, 247, 69, 208, 3, 245, 128, 3, 49, 227, 34, 79, 7, 24, 183, 7, 66, 86, 107, 5, 144, 3, 14, 251, 9, 14, 255, 20, 41, 247, 143, 153, 251, 191, 95, 144, 3, + 63, 255, 179, 255, 255, 228, 186, 222, 17, 212, 255, 255, 226, 31, 159, 96, 31, 163, 174, 194, 43, 43, 128, 26, 108, 254, 241, 127, 15, 127, 8, 90, 47, 4, 250, 63, 128, 8, 255, 75, 19, 12, 31, 171, 171, 13, 31, 175, 15, 144, 3, 14, 41, 140, 0, 251, 53, 90, 59, 25, 226, 0, 246, 31, 208, 245, 80, 3, 248, 77, + 15, 191, 13, 3, 15, 223, 18, 22, 189, 0, 46, 27, 243, 2, 109, 43, 203, 4, 156, 239, 255, 185, 157, 119, 59, 159, 244, 239, 236, 112, 95, 31, 255, 37, 190, 159, 34, 139, 147, 128, 86, 231, 22, 235, 84, 247, 163, 163, 43, 143, 254, 45, 233, 210, 23, 122, 14, 23, 34, 15, 160, 64, 3, 13, 77, 246, 255, 245, 87, 255, + 18, 99, 222, 243, 15, 255, 1, 4, 41, 91, 243, 64, 3, 221, 1, 231, 2, 32, 153, 143, 15, 255, 32, 63, 74, 89, 255, 31, 80, 3, 202, 146, 243, 17, 55, 243, 28, 120, 109, 27, 138, 61, 246, 15, 255, 1, 255, 229, 43, 81, 16, 105, 51, 35, 191, 80, 1, 147, 2, 13, 95, 251, 44, 79, 0, 187, 78, 247, 255, 151, + 137, 190, 173, 26, 54, 119, 24, 200, 193, 58, 244, 90, 223, 253, 48, 15, 249, 255, 15, 255, 255, 15, 255, 4, 194, 51, 17, 58, 231, 23, 240, 53, 175, 45, 16, 10, 31, 159, 165, 12, 133, 63, 32, 87, 219, 39, 231, 160, 87, 235, 241, 98, 111, 252, 66, 16, 31, 118, 37, 134, 47, 210, 255, 29, 45, 222, 255, 16, 21, 234, + 32, 239, 255, 255, 92, 141, 253, 1, 32, 0, 10, 239, 176, 28, 11, 240, 84, 31, 84, 246, 31, 88, 252, 23, 34, 255, 21, 74, 167, 255, 148, 255, 91, 195, 39, 3, 95, 31, 62, 47, 36, 23, 47, 255, 204, 70, 16, 79, 243, 171, 75, 255, 241, 70, 119, 230, 206, 23, 37, 176, 38, 213, 75, 175, 191, 72, 95, 21, 119, 81, + 187, 42, 175, 160, 250, 102, 175, 23, 134, 4, 226, 97, 159, 135, 178, 0, 80, 99, 21, 96, 16, 186, 31, 1, 176, 21, 30, 7, 116, 112, 24, 235, 108, 95, 255, 79, 85, 163, 3, 190, 79, 87, 179, 0, 53, 103, 119, 101, 175, 255, 242, 202, 149, 85, 88, 96, 163, 104, 31, 254, 39, 255, 149, 253, 23, 255, 28, 12, 239, 23, + 103, 30, 31, 176, 12, 22, 47, 180, 7, 150, 5, 88, 15, 191, 79, 225, 21, 119, 31, 106, 177, 255, 29, 70, 255, 159, 80, 192, 56, 71, 80, 192, 81, 23, 47, 115, 16, 192, 70, 127, 246, 28, 173, 255, 32, 4, 37, 208, 192, 15, 255, 7, 15, 65, 176, 22, 214, 239, 31, 143, 159, 85, 28, 234, 79, 31, 53, 13, 31, 254, + 9, 17, 211, 4, 85, 29, 122, 4, 29, 34, 11, 29, 231, 47, 31, 75, 175, 230, 255, 96, 2, 26, 21, 18, 24, 242, 127, 110, 146, 187, 80, 48, 3, 239, 255, 112, 24, 40, 128, 250, 255, 95, 255, 144, 242, 63, 255, 160, 176, 249, 63, 255, 176, 48, 63, 31, 247, 33, 227, 111, 93, 87, 247, 127, 16, 95, 143, 255, 61, 31, + 70, 54, 85, 31, 74, 48, 25, 70, 48, 18, 67, 14, 30, 206, 12, 75, 17, 114, 11, 26, 109, 46, 239, 9, 21, 47, 9, 223, 254, 255, 192, 10, 79, 255, 250, 13, 61, 251, 170, 245, 8, 3, 1, 246, 87, 255, 3, 95, 184, 12, 29, 201, 68, 104, 196, 14, 31, 53, 42, 11, 31, 216, 96, 15, 14, 9, 31, 155, 170, 1, + 40, 96, 8, 26, 42, 5, 24, 62, 3, 82, 254, 81, 32, 15, 30, 30, 24, 207, 40, 220, 30, 193, 144, 3, 15, 95, 208, 3, 13, 50, 135, 241, 0, 24, 255, 242, 159, 90, 79, 162, 23, 248, 255, 247, 255, 251, 255, 233, 245, 183, 16, 47, 187, 79, 25, 83, 33, 243, 255, 169, 254, 18, 83, 228, 30, 239, 32, 230, 135, 41, + 231, 8, 68, 87, 255, 14, 119, 247, 72, 19, 64, 192, 253, 87, 235, 31, 6, 197, 0, 243, 87, 255, 40, 19, 39, 119, 0, 0, 192, 8, 247, 201, 1, 207, 98, 129, 15, 255, 8, 6, 59, 146, 43, 58, 247, 54, 27, 246, 24, 93, 2, 65, 222, 253, 255, 249, 25, 251, 185, 208, 17, 35, 32, 0, 55, 14, 192, 1, 33, 227, + 63, 86, 30, 221, 47, 30, 225, 31, 19, 149, 2, 17, 201, 86, 156, 191, 65, 231, 27, 62, 80, 0, 189, 42, 29, 222, 252, 44, 31, 252, 56, 131, 30, 104, 131, 3, 118, 191, 255, 42, 95, 163, 224, 67, 255, 249, 91, 107, 15, 159, 0, 35, 147, 4, 239, 61, 95, 71, 191, 224, 253, 133, 86, 159, 111, 255, 223, 116, 31, 168, + 2, 87, 118, 176, 224, 255, 31, 160, 28, 41, 213, 0, 255, 24, 128, 196, 15, 94, 4, 13, 80, 3, 11, 24, 80, 3, 8, 159, 0, 82, 159, 253, 214, 15, 159, 35, 32, 183, 36, 75, 163, 4, 15, 221, 2, 255, 16, 192, 45, 119, 21, 75, 255, 7, 120, 16, 192, 0, 2, 87, 175, 202, 157, 19, 119, 29, 20, 237, 255, 253, + 80, 28, 91, 166, 16, 41, 168, 108, 109, 33, 83, 41, 239, 26, 58, 5, 181, 239, 255, 144, 28, 85, 191, 15, 255, 255, 15, 255, 235, 19, 86, 4, 26, 101, 31, 142, 191, 255, 21, 221, 255, 0, 239, 233, 117, 0, 155, 36, 63, 159, 63, 63, 119, 117, 30, 179, 255, 255, 186, 197, 111, 255, 67, 70, 159, 94, 155, 12, 190, 130, + 166, 160, 92, 163, 253, 90, 151, 207, 124, 1, 142, 61, 59, 83, 40, 91, 63, 29, 171, 175, 55, 8, 52, 80, 37, 119, 170, 99, 45, 51, 212, 108, 105, 114, 23, 121, 0, 48, 3, 141, 207, 190, 226, 45, 51, 23, 254, 0, 240, 80, 7, 128, 116, 175, 220, 8, 205, 221, 31, 255, 255, 48, 3, 20, 84, 205, 0, 2, 40, 211, + 112, 123, 17, 239, 171, 68, 255, 231, 254, 221, 143, 54, 154, 40, 197, 0, 0, 50, 85, 93, 95, 249, 93, 107, 217, 15, 87, 0, 70, 78, 243, 4, 77, 93, 171, 15, 94, 7, 143, 255, 254, 112, 75, 131, 252, 30, 93, 163, 96, 163, 111, 226, 88, 172, 144, 0, 64, 115, 77, 37, 42, 242, 95, 103, 108, 49, 1, 35, 69, 251, + 13, 65, 94, 11, 9, 95, 251, 32, 111, 25, 94, 93, 235, 96, 159, 252, 46, 155, 247, 63, 255, 85, 29, 116, 223, 254, 128, 25, 190, 170, 128, 30, 250, 64, 41, 186, 14, 22, 254, 79, 63, 32, 82, 14, 228, 13, 5, 54, 252, 251, 48, 3, 38, 12, 7, 48, 3, 175, 250, 31, 83, 249, 48, 3, 4, 223, 255, 1, 63, 24, + 80, 21, 158, 248, 159, 255, 251, 48, 191, 75, 21, 40, 127, 31, 148, 25, 231, 177, 22, 95, 254, 246, 56, 4, 79, 9, 53, 236, 255, 255, 161, 30, 2, 94, 99, 46, 11, 218, 1, 124, 222, 165, 123, 182, 44, 191, 251, 20, 191, 221, 255, 254, 20, 203, 255, 251, 22, 32, 47, 2, 170, 223, 31, 187, 175, 15, 191, 3, 112, 90, + 127, 240, 15, 191, 17, 145, 95, 81, 115, 160, 3, 63, 144, 3, 15, 32, 18, 70, 99, 255, 82, 80, 3, 239, 82, 151, 143, 63, 255, 39, 130, 96, 95, 207, 165, 48, 95, 215, 128, 91, 31, 31, 175, 6, 41, 227, 11, 36, 89, 235, 40, 150, 31, 30, 200, 34, 3, 191, 40, 19, 56, 157, 213, 1, 255, 66, 91, 0, 37, 215, + 111, 31, 238, 47, 37, 86, 115, 38, 203, 3, 35, 33, 26, 251, 1, 22, 159, 7, 46, 25, 77, 40, 111, 95, 27, 65, 223, 255, 251, 27, 164, 244, 255, 110, 255, 175, 27, 82, 255, 22, 188, 43, 106, 20, 35, 173, 58, 191, 87, 47, 253, 15, 255, 18, 9, 23, 252, 64, 3, 190, 248, 30, 134, 247, 0, 2, 52, 82, 191, 193, + 21, 44, 7, 58, 247, 55, 95, 28, 239, 221, 250, 47, 163, 227, 78, 71, 63, 250, 81, 11, 191, 255, 8, 152, 119, 60, 75, 187, 8, 92, 87, 0, 19, 51, 175, 255, 120, 173, 126, 126, 221, 247, 255, 254, 183, 16, 49, 223, 255, 147, 192, 98, 71, 14, 218, 37, 63, 28, 40, 96, 3, 47, 253, 149, 209, 15, 255, 33, 41, 151, + 3, 111, 155, 1, 255, 223, 146, 156, 19, 120, 95, 43, 155, 0, 70, 118, 185, 36, 26, 86, 145, 0, 58, 195, 31, 251, 162, 15, 158, 33, 40, 179, 29, 38, 255, 94, 29, 138, 253, 19, 18, 193, 0, 5, 116, 191, 228, 143, 244, 7, 207, 255, 15, 255, 255, 15, 255, 17, 49, 0, 11, 239, 149, 246, 31, 187, 78, 147, 11, 52, + 18, 250, 29, 86, 251, 117, 14, 62, 8, 44, 168, 96, 31, 32, 242, 143, 129, 110, 149, 201, 69, 19, 37, 179, 223, 69, 47, 3, 127, 223, 65, 251, 96, 0, 92, 250, 240, 27, 236, 192, 1, 186, 239, 27, 106, 111, 255, 112, 30, 253, 64, 67, 87, 117, 87, 130, 1, 239, 48, 30, 2, 192, 30, 132, 245, 106, 30, 188, 254, 46, + 63, 176, 246, 157, 171, 0, 31, 62, 76, 60, 247, 208, 12, 7, 0, 20, 83, 42, 253, 61, 188, 60, 15, 162, 95, 93, 79, 3, 184, 159, 38, 55, 31, 146, 4, 20, 179, 189, 30, 24, 121, 191, 255, 208, 7, 56, 191, 1, 101, 28, 177, 11, 229, 47, 221, 37, 71, 244, 31, 255, 112, 167, 0, 29, 18, 0, 31, 65, 11, 41, + 140, 21, 119, 65, 85, 11, 202, 46, 6, 31, 58, 4, 30, 251, 2, 70, 222, 48, 85, 30, 244, 96, 31, 159, 128, 31, 179, 192, 61, 207, 159, 74, 31, 79, 207, 62, 196, 33, 150, 247, 21, 198, 248, 23, 251, 221, 251, 47, 25, 68, 143, 255, 191, 73, 207, 10, 85, 31, 127, 13, 30, 68, 47, 31, 173, 111, 54, 220, 176, 98, + 26, 71, 80, 40, 36, 252, 28, 162, 31, 165, 14, 46, 106, 42, 93, 75, 28, 191, 7, 77, 179, 2, 57, 149, 144, 31, 52, 85, 31, 35, 226, 31, 39, 224, 31, 43, 249, 42, 107, 48, 252, 254, 239, 255, 192, 244, 95, 47, 245, 13, 83, 15, 85, 32, 95, 30, 31, 230, 7, 13, 63, 3, 247, 32, 169, 207, 127, 109, 255, 253, + 79, 223, 255, 245, 2, 143, 94, 30, 81, 175, 17, 221, 191, 255, 144, 253, 95, 83, 148, 112, 13, 19, 108, 46, 183, 127, 72, 11, 8, 91, 87, 42, 99, 239, 15, 255, 76, 170, 183, 196, 0, 76, 251, 245, 0, 2, 140, 241, 31, 236, 192, 25, 168, 192, 72, 31, 252, 179, 90, 15, 32, 195, 176, 87, 143, 107, 127, 42, 143, 76, + 6, 222, 17, 253, 71, 151, 41, 111, 45, 255, 90, 235, 150, 191, 81, 31, 253, 248, 17, 237, 224, 17, 228, 31, 201, 27, 176, 3, 83, 198, 159, 248, 31, 67, 225, 56, 203, 47, 3, 118, 16, 27, 239, 61, 31, 223, 26, 56, 0, 27, 16, 36, 0, 110, 102, 240, 145, 128, 12, 100, 39, 44, 83, 31, 163, 239, 222, 133, 16, 80, + 215, 3, 138, 39, 17, 227, 31, 36, 160, 27, 124, 192, 246, 0, 111, 254, 208, 14, 250, 60, 221, 221, 0, 29, 12, 42, 0, 31, 12, 76, 125, 13, 91, 239, 2, 41, 95, 61, 239, 255, 181, 243, 29, 40, 255, 206, 61, 121, 174, 31, 231, 12, 226, 54, 118, 32, 177, 127, 42, 66, 16, 225, 0, 29, 77, 72, 48, 3, 32, 15, + 219, 255, 15, 255, 46, 255, 12, 131, 3, 128, 29, 0, 31, 12, 170, 240, 9, 155, 172, 54, 14, 64, 10, 118, 2, 108, 48, 21, 79, 223, 204, 23, 101, 45, 75, 224, 3, 119, 81, 32, 19, 79, 247, 78, 46, 99, 144, 0, 3, 1, 10, 250, 42, 20, 119, 81, 12, 89, 26, 169, 9, 31, 235, 143, 79, 122, 4, 95, 159, 72, + 63, 38, 186, 118, 29, 123, 255, 254, 80, 30, 187, 64, 30, 191, 245, 16, 255, 117, 140, 63, 171, 246, 11, 151, 77, 3, 235, 103, 98, 20, 15, 224, 10, 87, 5, 255, 18, 0, 77, 61, 77, 155, 21, 230, 1, 255, 255, 179, 47, 254, 12, 84, 25, 214, 15, 31, 55, 15, 39, 143, 253, 21, 215, 62, 171, 244, 80, 0, 20, 157, + 223, 232, 1, 229, 236, 15, 173, 2, 157, 26, 55, 231, 54, 7, 111, 255, 230, 30, 248, 80, 238, 0, 239, 254, 77, 24, 239, 255, 32, 55, 149, 189, 255, 40, 7, 127, 255, 16, 54, 41, 183, 111, 17, 94, 111, 24, 91, 24, 148, 144, 95, 239, 0, 3, 2, 94, 23, 42, 11, 65, 139, 16, 55, 16, 192, 62, 207, 13, 30, 203, + 15, 255, 171, 205, 31, 112, 211, 31, 36, 177, 31, 40, 254, 255, 247, 185, 223, 255, 145, 46, 199, 91, 255, 254, 255, 191, 255, 255, 210, 255, 255, 214, 64, 244, 254, 148, 3, 235, 111, 255, 96, 14, 187, 1, 70, 202, 74, 42, 35, 158, 64, 143, 48, 3, 123, 37, 171, 255, 95, 183, 28, 56, 160, 25, 26, 112, 3, 252, 119, 114, + 58, 163, 103, 131, 85, 15, 130, 17, 4, 79, 247, 2, 86, 7, 13, 87, 251, 14, 71, 31, 119, 11, 33, 25, 41, 36, 16, 178, 255, 95, 253, 234, 48, 5, 31, 27, 112, 31, 31, 222, 63, 20, 87, 196, 159, 250, 24, 7, 27, 72, 69, 255, 160, 74, 175, 54, 7, 55, 27, 32, 25, 74, 0, 255, 4, 124, 17, 13, 255, 250, + 162, 32, 31, 154, 255, 46, 104, 31, 255, 47, 231, 103, 176, 156, 213, 159, 128, 89, 151, 243, 50, 11, 117, 6, 96, 30, 175, 205, 255, 211, 31, 132, 79, 255, 0, 110, 47, 71, 71, 93, 191, 226, 78, 152, 224, 252, 95, 255, 22, 222, 51, 72, 175, 255, 80, 208, 3, 242, 113, 11, 28, 35, 17, 6, 76, 119, 148, 7, 39, 67, + 184, 159, 32, 27, 213, 236, 47, 68, 26, 88, 106, 31, 66, 80, 103, 212, 180, 192, 9, 251, 16, 223, 40, 69, 44, 90, 199, 17, 167, 0, 179, 115, 255, 16, 73, 103, 55, 135, 88, 28, 164, 33, 15, 227, 31, 5, 255, 75, 19, 122, 191, 34, 15, 173, 12, 31, 255, 31, 34, 23, 255, 235, 58, 187, 251, 125, 31, 254, 72, 4, + 119, 64, 12, 28, 247, 95, 233, 252, 134, 106, 138, 21, 240, 65, 231, 48, 7, 224, 82, 82, 3, 96, 74, 3, 210, 15, 255, 255, 15, 255, 131, 2, 15, 255, 10, 247, 123, 239, 254, 182, 15, 255, 78, 5, 121, 146, 82, 31, 243, 243, 29, 198, 243, 31, 247, 160, 3, 245, 0, 155, 11, 218, 103, 99, 15, 31, 22, 87, 16, 31, + 238, 224, 31, 218, 186, 246, 30, 91, 247, 0, 29, 44, 11, 87, 6, 60, 18, 83, 3, 66, 21, 120, 0, 192, 2, 244, 32, 192, 15, 193, 12, 41, 64, 102, 15, 225, 20, 41, 135, 72, 159, 30, 179, 0, 95, 208, 3, 82, 70, 59, 208, 208, 3, 192, 12, 179, 42, 135, 96, 51, 15, 255, 10, 237, 81, 22, 117, 7, 128, 12, + 71, 98, 14, 120, 16, 255, 229, 247, 207, 7, 31, 133, 80, 3, 248, 16, 11, 64, 170, 6, 31, 183, 5, 29, 178, 5, 63, 139, 194, 40, 219, 117, 47, 147, 112, 86, 223, 30, 118, 47, 31, 223, 14, 85, 31, 227, 13, 31, 231, 15, 6, 97, 17, 79, 31, 103, 95, 43, 24, 76, 64, 3, 192, 23, 218, 176, 112, 3, 143, 255, + 37, 9, 194, 46, 47, 46, 245, 31, 10, 32, 3, 252, 31, 18, 255, 47, 48, 3, 46, 207, 5, 80, 3, 42, 255, 176, 26, 239, 255, 255, 242, 31, 255, 246, 255, 255, 215, 154, 0, 31, 67, 57, 155, 255, 129, 43, 217, 146, 15, 245, 17, 45, 104, 143, 160, 3, 143, 94, 175, 159, 255, 110, 155, 176, 85, 10, 159, 39, 11, 31, + 243, 10, 94, 3, 9, 95, 255, 7, 126, 90, 91, 5, 255, 253, 255, 255, 247, 127, 255, 210, 181, 127, 25, 53, 8, 49, 153, 96, 3, 28, 24, 223, 82, 25, 65, 252, 62, 33, 119, 30, 33, 30, 240, 247, 51, 100, 80, 35, 104, 175, 124, 187, 48, 88, 227, 233, 63, 33, 227, 33, 231, 184, 4, 25, 54, 3, 255, 218, 15, 101, + 0, 33, 227, 42, 8, 105, 42, 16, 13, 221, 15, 63, 32, 159, 63, 127, 47, 131, 128, 246, 0, 157, 239, 112, 4, 188, 64, 255, 253, 25, 6, 166, 248, 80, 192, 249, 232, 33, 31, 57, 198, 77, 33, 22, 184, 126, 26, 212, 0, 126, 144, 8, 66, 2, 0, 192, 14, 128, 3, 194, 173, 223, 239, 239, 234, 155, 0, 192, 34, 72, + 3, 3, 32, 3, 139, 253, 239, 255, 35, 133, 34, 216, 253, 28, 107, 221, 0, 170, 6, 240, 127, 247, 27, 80, 246, 27, 84, 245, 25, 192, 245, 245, 0, 205, 222, 239, 254, 80, 81, 251, 48, 30, 0, 248, 32, 8, 61, 255, 9, 78, 222, 1, 51, 81, 5, 15, 255, 11, 138, 48, 14, 194, 48, 8, 95, 52, 7, 62, 6, 35, + 15, 1, 11, 3, 0, 96, 47, 221, 37, 87, 15, 226, 10, 16, 1, 80, 1, 159, 76, 70, 223, 119, 97, 11, 226, 46, 11, 255, 247, 223, 11, 86, 31, 129, 9, 64, 3, 230, 30, 11, 48, 7, 31, 155, 93, 39, 78, 6, 24, 3, 255, 253, 48, 31, 255, 225, 112, 31, 255, 249, 0, 92, 21, 106, 30, 236, 29, 17, 31, 166, + 18, 31, 210, 63, 195, 12, 223, 16, 223, 55, 43, 39, 155, 47, 54, 154, 235, 112, 0, 223, 47, 255, 252, 48, 63, 255, 255, 181, 212, 40, 91, 64, 254, 32, 100, 62, 31, 78, 4, 80, 32, 24, 239, 64, 100, 1, 0, 96, 17, 42, 184, 16, 192, 48, 3, 83, 46, 191, 9, 24, 188, 9, 31, 150, 41, 251, 7, 255, 169, 243, + 30, 214, 211, 110, 97, 195, 55, 203, 39, 95, 4, 89, 31, 211, 6, 29, 186, 12, 255, 103, 27, 41, 191, 243, 74, 31, 255, 246, 53, 83, 64, 7, 244, 245, 255, 143, 248, 11, 251, 48, 111, 241, 0, 55, 22, 126, 127, 255, 236, 255, 16, 239, 24, 79, 255, 227, 78, 15, 32, 67, 169, 240, 3, 3, 24, 127, 78, 7, 12, 95, + 251, 40, 19, 1, 109, 46, 19, 1, 191, 111, 30, 235, 156, 26, 208, 0, 255, 255, 248, 65, 0, 139, 255, 255, 217, 185, 48, 31, 178, 253, 72, 191, 63, 254, 48, 183, 247, 82, 80, 183, 228, 151, 239, 225, 14, 125, 19, 72, 77, 3, 25, 62, 228, 3, 255, 219, 15, 220, 0, 23, 94, 1, 48, 3, 16, 35, 221, 221, 218, 14, + 81, 32, 207, 255, 161, 27, 50, 255, 46, 28, 92, 111, 255, 54, 191, 255, 60, 255, 250, 31, 255, 191, 243, 31, 255, 128, 255, 255, 213, 0, 119, 161, 82, 15, 64, 29, 7, 28, 79, 34, 176, 73, 243, 40, 204, 247, 59, 48, 3, 88, 15, 250, 102, 207, 111, 43, 249, 123, 209, 239, 234, 251, 239, 224, 91, 191, 9, 255, 12, 123, + 243, 237, 42, 239, 222, 43, 227, 128, 89, 87, 96, 15, 111, 40, 159, 66, 3, 215, 0, 111, 31, 255, 21, 207, 182, 59, 255, 221, 222, 221, 239, 111, 239, 251, 119, 119, 84, 189, 55, 164, 246, 82, 179, 208, 7, 223, 230, 57, 243, 49, 8, 218, 255, 15, 91, 32, 170, 32, 44, 110, 233, 30, 16, 248, 31, 71, 245, 31, 175, 203, + 242, 7, 20, 124, 15, 255, 10, 255, 15, 193, 46, 89, 153, 118, 8, 65, 12, 41, 155, 128, 15, 66, 44, 2, 81, 15, 255, 12, 165, 83, 15, 161, 46, 37, 1, 81, 13, 15, 255, 12, 68, 12, 138, 14, 1, 185, 36, 15, 255, 10, 86, 119, 119, 8, 96, 47, 87, 247, 255, 245, 5, 207, 255, 199, 31, 167, 128, 30, 238, 112, + 46, 31, 163, 32, 3, 96, 31, 171, 128, 255, 32, 70, 207, 168, 119, 12, 60, 38, 175, 23, 13, 191, 23, 106, 56, 51, 39, 247, 169, 253, 128, 3, 239, 23, 130, 63, 30, 87, 32, 3, 31, 93, 48, 3, 224, 16, 15, 240, 0, 79, 30, 115, 127, 253, 255, 240, 1, 239, 255, 241, 15, 62, 17, 245, 82, 31, 62, 248, 31, 243, + 250, 30, 192, 88, 160, 207, 95, 163, 167, 63, 40, 164, 235, 30, 220, 40, 27, 252, 0, 14, 62, 29, 42, 16, 91, 48, 175, 255, 160, 112, 24, 231, 165, 166, 29, 89, 48, 1, 167, 15, 109, 255, 127, 86, 7, 47, 87, 87, 163, 13, 63, 183, 112, 85, 255, 144, 3, 168, 255, 96, 176, 8, 255, 245, 192, 13, 255, 255, 247, 224, + 47, 255, 250, 240, 143, 255, 222, 253, 243, 21, 182, 0, 207, 254, 80, 29, 154, 178, 64, 30, 136, 32, 2, 25, 59, 40, 222, 7, 31, 115, 75, 32, 182, 47, 31, 90, 71, 243, 11, 95, 255, 4, 100, 115, 249, 158, 255, 255, 254, 63, 255, 25, 32, 32, 6, 123, 31, 254, 79, 255, 244, 5, 25, 47, 127, 255, 151, 228, 25, 155, + 66, 97, 96, 6, 123, 42, 95, 255, 230, 45, 17, 123, 71, 159, 1, 33, 55, 4, 119, 175, 255, 120, 10, 31, 240, 46, 148, 41, 40, 40, 215, 64, 15, 255, 30, 191, 50, 87, 111, 87, 255, 108, 239, 239, 255, 141, 255, 255, 241, 127, 31, 163, 241, 255, 237, 255, 241, 217, 23, 211, 153, 145, 15, 66, 32, 14, 49, 135, 73, 211, + 0, 143, 92, 236, 83, 254, 25, 53, 255, 255, 192, 26, 195, 26, 199, 81, 25, 220, 118, 15, 4, 31, 6, 41, 139, 42, 39, 41, 143, 29, 45, 239, 255, 65, 156, 188, 27, 65, 38, 255, 31, 132, 175, 221, 86, 16, 204, 211, 255, 255, 176, 27, 63, 80, 42, 59, 42, 42, 27, 118, 13, 2, 0, 223, 64, 195, 13, 89, 247, 119, + 217, 126, 232, 137, 189, 106, 191, 253, 221, 221, 168, 220, 239, 255, 192, 90, 187, 224, 88, 139, 15, 226, 255, 15, 255, 255, 122, 207, 255, 67, 87, 68, 72, 31, 255, 168, 31, 255, 191, 49, 54, 15, 0, 9, 1, 5, 7, 0, 255, 9, 9, 0, 5, 5, 0, 20, 20, 239, 0, 18, 18, 32, 2, 19, 19, 0, 15, 143, 15, 32, + 2, 16, 8, 16, 17, 6, 6, 0, 17, 254, 17, 0, 14, 14, 0, 23, 23, 80, 29, 12, 16, 38, 16, 44, 112, 38, 64, 53, 24, 24, 32, 38, 16, 59, 195, 13, 13, 32, 44, 16, 5, 16, 68, 16, 53, 11, 11, 0, 32, 59, 16, 62, 16, 71, 16, 26, 64, 104, 64, 35, 16, 101, 16, 29, 102, 16, 47, 10, 10, 80, + 35, 16, 122, 12, 12, 16, 167, 223, 77, 65, 47, 76, 176, 0, 45, 0, 122, 222, 0, 1, 47, 255, 81, 192, 0, 2, 28, 182, 127, 0, 0, 17, 0, 4, 0, 5, 0, 6, 0, 238, 7, 0, 8, 16, 222, 10, 0, 11, 29, 246, 219, 255, 0, 16, 146, 0, 15, 27, 50, 17, 0, 111, 16, 222, 0, 20, 27, 117, 22, 0, + 23, 0, 254, 24, 0, 25, 0, 26, 0, 27, 144, 59, 174, 28, 30, 240, 29, 30, 244, 30, 0, 31, 25, 34, 254, 33, 0, 34, 0, 35, 0, 36, 31, 4, 255, 37, 0, 38, 0, 39, 0, 40, 0, 238, 41, 0, 42, 31, 18, 43, 0, 44, 16, 153, 247, 46, 0, 47, 0, 45, 153, 255, 0, 49, 34, 80, 175, 39, 61, 255, + 16, 167, 88, 142, 56, 18, 33, 64, 191, 0, 79, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 3, 128, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 3, 128, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 2, 96, 64, 3, 112, 1, 1, 64, 27, 0, + 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, 79, 79, 84, 32, 27, 160, 49, 63, 48, 31, 0, 2, 1, 133, 53, 17, 0, 0, 19, 90, 80, 74, 32, 64, 81, 226, 226, 16, 19, 31, 80, 15, 186, 160, 48, 107, 2, 207, 45, 16, 39, 45, 16, 131, 190, 192, 96, 19, 255, 255, 0, 46, 2, 128, + 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, 3, 10, 46, 0, 46, 46, 0, 99, 110, 255, 115, 105, 109, 112, 99, 104, 105, 110, 255, 101, 115, 101, 0, 109, 101, 115, 115, 254, 97, 103, 101, 46, 98, 109, 103, 96, 11, 255, 105, 100, 46, 116, 98, 108, 0, 115, 249, 116, 114, 117, 99, 116, 48, 10, + 96, 255, 77, 235, 69, 83, 71, 16, 40, 49, 80, 187, 2, 2, 119, 208, 228, 73, 78, 70, 16, 27, 0, 96, 0, 226, 6, 0, 12, 49, 62, 113, 56, 48, 159, 2, 144, 11, 170, 32, 144, 23, 62, 144, 35, 112, 144, 47, 128, 144, 59, 123, 49, 130, 68, 65, 84, 49, 65, 35, 139, 247, 255, 99, 210, 81, 101, 48, 10, 141, + 133, 255, 126, 167, 154, 108, 82, 155, 107, 39, 255, 148, 246, 108, 179, 48, 11, 81, 73, 207, 120, 159, 0, 29, 14, 32, 35, 101, 224, 108, 213, 255, 139, 251, 83, 214, 48, 2, 0, 10, 255, 139, 230, 96, 197, 139, 247, 103, 229, 255, 119, 11, 0, 87, 0, 105, 0, 105, 255, 78, 59, 103, 58, 79, 127, 117, 40, 253, 139, 244, + 102, 14, 78, 102, 16, 33, 0, 127, 192, 101, 0, 0, 122, 127, 104, 173, 78, 191, 142, 32, 113, 118, 132, 89, 39, 81, 146, 234, 150, 105, 255, 96, 237, 6, 80, 231, 40, 18, 67, 251, 8, 33, 157, 67, 98, 49, 155, 4, 0, 250, 6, 4, 56, 56, 178, 81, 167, 0, 210, 79, 149, 8, 81, 27, 33, 211, 3, 18, 123, 24, + 18, 127, 4, 127, 146, 103, 43, 67, 79, 77, 77, 69, 78, 255, 84, 0, 68, 73, 83, 67, 95, 48, 175, 49, 80, 7, 50, 80, 15, 51, 0, 84, 73, 255, 84, 76, 69, 95, 77, 65, 73, 78, 124, 80, 10, 83, 85, 66, 0, 64, 0, 0, 0, 144, 111, 125, 33, 103, 32, 174, 55, 113, 97, 96, 147, 28, 239, 19, 62, 141, + 80, 171, 0, 190, 198, 20, 158, 162, 50, 83, 16, 153, 100, 67, 164, 76, 50, 95, 185, 12, 18, 184, 54, 175, 66, 50, 107, 18, 125, 137, 223, 230, 39, 66, 119, 20, 0, 0, 251, 104, 207, 17, 53, 50, 131, 16, 185, 23, 177, 123, 254, 85, 50, 143, 28, 115, 53, 4, 81, 23, 7, 80, 235, 9, 80, 19, 95, 10, 19, 99, + 11, 224, 162, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 147, 160, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 147, 160, 247, 0, 0, 0, 32, 16, 3, 192, 0, 0, 149, 146, 80, 3, 112, 1, 1, 80, 27, 3, 16, 35, 64, 119, 80, 3, 128, 0, 3, 32, 22, 0, 0, 82, 238, 79, 79, + 84, 16, 59, 5, 198, 97, 48, 31, 126, 0, 2, 1, 67, 212, 17, 0, 0, 18, 64, 79, 223, 146, 184, 32, 87, 255, 255, 0, 46, 2, 86, 128, 96, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 63, 96, 19, 32, 131, 46, 0, 46, 46, 0, 101, 255, 109, 98, 101, 100, 100, 101, 100, 102, 255, 111, 110, 116, 0, 109, 101, + 115, 115, 239, 97, 103, 101, 32, 11, 50, 54, 46, 98, 207, 114, 102, 16, 19, 0, 0, 8, 82, 70, 78, 84, 247, 254, 255, 1, 4, 48, 123, 16, 0, 4, 246, 70, 73, 78, 70, 32, 235, 1, 33, 16, 241, 223, 27, 27, 32, 219, 56, 0, 0, 144, 104, 255, 0, 0, 145, 104, 33, 27, 26, 0, 247, 84, 71, 76, 80, 16, + 15, 48, 26, 28, 215, 23, 27, 48, 154, 9, 17, 25, 9, 0, 1, 183, 1, 65, 31, 96, 0, 0, 0, 147, 2, 118, 0, 248, 0, 159, 255, 0, 11, 49, 75, 241, 150, 33, 112, 166, 228, 33, 135, 32, 0, 205, 11, 17, 51, 0, 6, 1, 211, 3, 249, 19, 86, 119, 190, 255, 64, 0, 1, 243, 2, 117, 172, 65, 33, 227, + 232, 17, 231, 255, 209, 1, 47, 41, 34, 111, 190, 159, 2, 83, 2, 1, 71, 118, 64, 191, 0, 127, 9, 87, 34, 187, 179, 34, 103, 160, 0, 222, 11, 174, 0, 0, 190, 7, 1, 31, 3, 19, 87, 119, 84, 255, 0, 95, 13, 183, 252, 18, 9, 255, 254, 2, 14, 36, 19, 53, 86, 215, 119, 159, 18, 232, 127, 1, 63, 5, + 153, 187, 198, 87, 19, 35, 248, 19, 39, 249, 1, 254, 37, 52, 85, 0, 175, 10, 19, 101, 9, 1, 255, 4, 103, 120, 153, 171, 81, 0, 223, 10, 181, 20, 12, 247, 20, 16, 0, 125, 9, 36, 19, 10, 13, 51, 25, 2, 30, 2, 20, 81, 32, 186, 255, 251, 2, 158, 6, 84, 185, 50, 17, 122, 251, 0, 8, 0, 33, 7, + 3, 102, 11, 1, 212, 17, 50, 18, 218, 249, 18, 222, 251, 3, 142, 148, 4, 52, 60, 87, 37, 143, 8, 21, 175, 14, 21, 179, 111, 0, 143, 255, 255, 255, 4, 255, 255, 223, 13, 255, 250, 252, 11, 127, 255, 243, 16, 10, 144, 21, 95, 220, 16, 0, 18, 62, 0, 255, 241, 21, 107, 21, 209, 207, 255, 244, 65, 139, 32, 23, + 239, 255, 112, 0, 190, 175, 16, 20, 95, 255, 240, 0, 47, 32, 24, 30, 21, 115, 4, 211, 10, 51, 230, 202, 118, 84, 35, 17, 204, 189, 2, 17, 208, 1, 255, 253, 22, 16, 3, 175, 125, 16, 7, 143, 0, 255, 253, 111, 21, 175, 250, 223, 69, 141, 50, 107, 253, 4, 207, 255, 244, 255, 223, 255, 254, 80, 255, 254, 129, 0, + 234, 255, 234, 97, 35, 255, 128, 5, 47, 16, 11, 21, 239, 247, 175, 255, 0, 5, 22, 21, 13, 255, 253, 223, 0, 63, 16, 173, 159, 255, 208, 0, 207, 119, 16, 59, 239, 255, 80, 52, 102, 184, 104, 207, 162, 211, 22, 127, 16, 0, 159, 2, 32, 227, 21, 149, 204, 0, 200, 7, 170, 3, 38, 79, 254, 22, 223, 35, 86, 195, + 1, 144, 3, 120, 48, 223, 185, 134, 51, 88, 38, 117, 49, 55, 112, 3, 187, 48, 80, 3, 249, 0, 223, 16, 199, 5, 239, 215, 255, 242, 16, 155, 249, 19, 87, 253, 0, 6, 163, 255, 64, 175, 8, 16, 175, 6, 16, 13, 35, 227, 92, 254, 253, 169, 119, 2, 255, 253, 32, 17, 34, 0, 251, 14, 255, 251, 85, 47, 22, 228, + 111, 255, 251, 237, 255, 159, 255, 173, 22, 238, 249, 0, 238, 101, 83, 49, 119, 110, 119, 137, 128, 23, 31, 143, 240, 112, 3, 6, 111, 15, 35, 227, 6, 153, 135, 0, 229, 0, 13, 221, 18, 18, 23, 59, 13, 80, 3, 12, 95, 23, 71, 11, 53, 165, 118, 85, 67, 50, 212, 94, 23, 224, 245, 80, 3, 254, 221, 221, 221, 100, + 223, 146, 249, 167, 108, 87, 244, 48, 144, 3, 82, 107, 7, 86, 11, 170, 5, 86, 23, 73, 85, 155, 143, 50, 87, 253, 80, 3, 183, 255, 96, 3, 205, 239, 117, 63, 9, 255, 250, 95, 20, 135, 249, 48, 3, 10, 255, 249, 1, 27, 255, 255, 248, 255, 187, 255, 247, 255, 203, 117, 16, 3, 219, 255, 247, 2, 29, 16, 251, 20, + 202, 251, 74, 20, 202, 252, 34, 98, 48, 3, 7, 48, 3, 254, 21, 189, 162, 255, 3, 255, 210, 207, 41, 22, 70, 171, 33, 211, 31, 25, 31, 221, 95, 255, 55, 223, 0, 158, 255, 38, 227, 255, 234, 150, 121, 189, 41, 55, 250, 25, 60, 244, 25, 64, 249, 240, 119, 83, 16, 176, 57, 164, 34, 17, 251, 167, 128, 17, 140, 224, + 32, 22, 25, 91, 241, 220, 255, 234, 255, 80, 1, 66, 220, 80, 18, 216, 112, 8, 207, 15, 235, 255, 254, 41, 113, 216, 239, 25, 154, 223, 255, 157, 54, 35, 16, 48, 3, 207, 255, 255, 16, 120, 249, 223, 0, 24, 41, 179, 223, 255, 0, 42, 255, 250, 255, 140, 255, 255, 253, 25, 195, 226, 20, 22, 228, 16, 255, 183, 72, 96, + 42, 88, 80, 130, 79, 228, 96, 170, 80, 26, 16, 112, 19, 239, 208, 50, 77, 31, 26, 29, 91, 49, 216, 111, 26, 7, 2, 158, 216, 183, 1, 251, 228, 135, 138, 223, 103, 155, 232, 127, 108, 25, 185, 20, 57, 50, 68, 239, 22, 192, 233, 32, 9, 173, 16, 67, 231, 64, 36, 106, 126, 19, 231, 80, 2, 223, 255, 185, 223, 32, + 96, 170, 191, 64, 3, 253, 20, 147, 249, 16, 138, 244, 19, 242, 174, 208, 24, 115, 64, 71, 151, 112, 0, 255, 24, 96, 147, 130, 1, 188, 18, 19, 125, 223, 48, 226, 68, 79, 239, 255, 234, 197, 85, 175, 26, 228, 63, 26, 232, 4, 20, 88, 223, 67, 49, 164, 213, 72, 80, 122, 207, 255, 172, 144, 27, 3, 192, 65, 175, 200, + 64, 5, 63, 20, 37, 67, 162, 9, 144, 3, 8, 82, 47, 19, 37, 19, 235, 249, 87, 203, 84, 40, 77, 250, 27, 232, 251, 80, 3, 234, 1, 147, 6, 212, 194, 94, 28, 27, 55, 6, 31, 11, 255, 113, 16, 223, 82, 78, 175, 191, 48, 3, 144, 26, 125, 160, 0, 143, 254, 247, 160, 0, 253, 189, 19, 227, 13, 255, 245, 87, + 112, 3, 14, 16, 11, 15, 22, 145, 15, 255, 243, 244, 0, 13, 222, 243, 11, 79, 14, 7, 85, 106, 22, 30, 159, 16, 32, 3, 22, 235, 16, 3, 255, 255, 32, 125, 16, 3, 48, 3, 255, 221, 48, 8, 0, 209, 37, 55, 12, 115, 10, 2, 226, 15, 50, 17, 12, 178, 44, 121, 135, 100, 59, 0, 127, 43, 0, 252, 46, 119, + 118, 65, 13, 115, 74, 87, 118, 187, 83, 13, 210, 76, 3, 103, 119, 14, 51, 10, 84, 32, 56, 10, 140, 176, 0, 2, 254, 3, 69, 82, 26, 202, 36, 246, 13, 191, 7, 125, 25, 98, 45, 248, 0, 3, 239, 8, 192, 11, 177, 82, 15, 255, 8, 83, 74, 215, 8, 15, 223, 7, 22, 210, 0, 9, 29, 71, 186, 51, 20, 83, + 239, 255, 32, 24, 71, 64, 15, 191, 13, 179, 7, 15, 255, 2, 66, 16, 138, 47, 14, 94, 5, 32, 0, 225, 10, 239, 176, 24, 234, 11, 0, 6, 44, 179, 47, 251, 191, 99, 15, 255, 2, 70, 16, 76, 19, 29, 10, 14, 31, 37, 21, 119, 84, 40, 203, 7, 15, 255, 5, 81, 45, 23, 178, 45, 79, 15, 255, 36, 251, 0, + 2, 53, 103, 108, 15, 255, 9, 119, 101, 178, 32, 31, 255, 254, 128, 31, 163, 12, 95, 11, 16, 15, 60, 16, 177, 7, 0, 222, 5, 81, 42, 15, 255, 9, 47, 246, 16, 222, 0, 87, 0, 222, 13, 75, 31, 255, 95, 15, 159, 3, 53, 103, 119, 154, 239, 0, 95, 9, 37, 113, 255, 252, 41, 246, 250, 15, 191, 38, 98, 30, + 179, 24, 239, 62, 51, 5, 211, 3, 45, 187, 253, 25, 171, 41, 78, 224, 15, 255, 74, 12, 30, 31, 11, 48, 3, 44, 230, 251, 169, 4, 16, 3, 63, 30, 22, 239, 34, 59, 50, 63, 78, 110, 63, 159, 252, 79, 31, 152, 255, 255, 246, 27, 78, 242, 64, 0, 255, 227, 30, 144, 27, 26, 246, 31, 255, 149, 227, 1, 199, 15, + 45, 199, 15, 31, 35, 63, 91, 19, 143, 80, 31, 47, 191, 31, 51, 207, 59, 140, 41, 203, 45, 68, 47, 201, 68, 46, 45, 224, 31, 209, 43, 251, 34, 250, 112, 13, 29, 49, 25, 111, 181, 112, 30, 238, 160, 10, 26, 255, 12, 28, 63, 15, 63, 28, 98, 30, 191, 248, 95, 255, 239, 253, 143, 41, 30, 193, 31, 223, 13, 31, + 227, 47, 46, 11, 31, 235, 239, 34, 32, 49, 79, 211, 47, 31, 77, 42, 233, 111, 87, 32, 95, 83, 82, 43, 238, 80, 31, 218, 112, 31, 27, 28, 161, 63, 17, 20, 133, 63, 29, 220, 17, 32, 28, 214, 64, 3, 111, 31, 141, 127, 85, 48, 3, 159, 80, 87, 95, 28, 73, 47, 19, 206, 15, 87, 31, 238, 14, 30, 179, 12, + 16, 78, 11, 255, 176, 72, 30, 253, 192, 31, 255, 31, 38, 255, 16, 24, 26, 81, 75, 251, 136, 245, 75, 255, 158, 93, 46, 191, 63, 68, 47, 101, 55, 47, 31, 157, 14, 31, 131, 61, 57, 102, 255, 254, 31, 239, 226, 34, 68, 55, 47, 212, 248, 81, 83, 33, 179, 27, 175, 32, 26, 119, 138, 176, 28, 146, 26, 179, 28, 0, + 8, 30, 140, 5, 30, 128, 159, 3, 14, 128, 16, 17, 247, 255, 15, 255, 202, 149, 213, 3, 79, 31, 212, 63, 16, 165, 31, 112, 3, 242, 53, 27, 7, 63, 159, 85, 88, 45, 88, 30, 95, 179, 79, 165, 255, 45, 79, 90, 20, 0, 31, 188, 228, 16, 222, 0, 170, 243, 81, 227, 247, 80, 11, 192, 201, 247, 159, 78, 27, 133, + 63, 66, 23, 32, 147, 18, 128, 31, 254, 248, 29, 252, 244, 84, 80, 222, 175, 16, 222, 4, 16, 222, 0, 228, 177, 18, 146, 19, 81, 155, 0, 222, 7, 33, 219, 14, 85, 115, 11, 255, 3, 254, 151, 234, 84, 52, 79, 29, 190, 95, 48, 3, 192, 30, 157, 255, 176, 26, 95, 255, 177, 239, 111, 255, 178, 185, 46, 150, 112, 105, + 29, 59, 29, 206, 240, 45, 227, 144, 77, 21, 52, 35, 247, 255, 17, 251, 45, 67, 15, 192, 15, 18, 11, 107, 27, 239, 231, 10, 31, 255, 14, 60, 54, 250, 16, 251, 11, 255, 255, 251, 2, 30, 212, 0, 43, 108, 62, 9, 252, 32, 29, 156, 0, 6, 18, 67, 32, 243, 245, 0, 55, 176, 97, 46, 182, 181, 46, 178, 231, 42, + 15, 255, 79, 28, 155, 255, 80, 3, 207, 28, 151, 23, 44, 151, 172, 2, 31, 95, 1, 79, 103, 96, 252, 31, 2, 32, 149, 50, 17, 202, 45, 43, 161, 44, 21, 216, 50, 219, 3, 31, 47, 228, 0, 11, 245, 239, 255, 47, 39, 225, 191, 43, 111, 124, 46, 143, 128, 79, 251, 47, 31, 255, 4, 239, 96, 95, 91, 189, 80, 95, + 239, 249, 120, 155, 239, 15, 31, 6, 48, 85, 84, 35, 241, 82, 83, 211, 7, 179, 4, 6, 31, 255, 8, 63, 46, 88, 46, 92, 175, 255, 79, 255, 223, 255, 164, 13, 31, 210, 9, 31, 217, 29, 125, 251, 31, 42, 47, 17, 159, 247, 30, 100, 20, 192, 96, 2, 255, 250, 176, 254, 12, 255, 242, 242, 127, 255, 176, 31, 247, 198, + 48, 255, 31, 46, 33, 238, 17, 149, 0, 55, 30, 189, 170, 95, 30, 11, 63, 30, 11, 63, 19, 172, 63, 31, 226, 82, 64, 3, 240, 20, 29, 240, 51, 10, 31, 243, 61, 30, 44, 163, 54, 30, 48, 48, 30, 60, 128, 3, 47, 52, 189, 255, 191, 80, 30, 57, 9, 255, 254, 16, 9, 223, 254, 255, 192, 10, 79, 255, 250, 13, + 16, 133, 174, 255, 31, 84, 255, 19, 46, 255, 0, 2, 16, 8, 20, 83, 231, 50, 199, 35, 247, 242, 31, 255, 224, 71, 255, 73, 125, 91, 37, 59, 14, 95, 35, 6, 255, 68, 163, 0, 79, 83, 36, 218, 0, 83, 91, 245, 95, 19, 36, 142, 255, 253, 200, 133, 86, 46, 211, 38, 191, 8, 31, 159, 37, 0, 51, 239, 255, 30, + 255, 248, 1, 207, 255, 242, 159, 94, 53, 199, 252, 31, 207, 160, 0, 255, 196, 14, 125, 17, 169, 15, 20, 219, 15, 31, 3, 15, 159, 3, 47, 15, 11, 119, 31, 23, 11, 253, 214, 18, 202, 32, 255, 251, 241, 48, 0, 183, 16, 14, 201, 37, 47, 71, 47, 83, 11, 81, 22, 10, 6, 98, 35, 79, 50, 27, 233, 127, 21, 109, + 1, 74, 16, 222, 159, 98, 31, 16, 222, 255, 128, 222, 247, 22, 81, 181, 241, 31, 207, 112, 0, 39, 150, 253, 18, 136, 254, 186, 166, 8, 97, 16, 127, 255, 187, 24, 199, 167, 24, 203, 217, 144, 223, 16, 3, 28, 159, 63, 251, 47, 255, 128, 117, 18, 165, 112, 0, 250, 97, 87, 251, 38, 3, 229, 87, 38, 17, 160, 31, 211, + 254, 23, 23, 250, 0, 1, 205, 207, 160, 11, 28, 5, 159, 214, 23, 207, 188, 102, 137, 195, 135, 119, 38, 86, 23, 6, 54, 39, 25, 162, 176, 107, 79, 34, 5, 45, 26, 81, 22, 164, 138, 223, 255, 252, 92, 25, 182, 245, 36, 119, 255, 235, 113, 15, 255, 80, 9, 132, 16, 158, 48, 14, 65, 46, 15, 255, 10, 103, 119, 101, + 48, 15, 130, 74, 186, 2, 15, 125, 45, 2, 17, 16, 15, 64, 46, 118, 15, 255, 10, 107, 15, 62, 47, 2, 87, 0, 95, 11, 65, 14, 223, 173, 2, 87, 163, 175, 46, 99, 108, 15, 255, 6, 28, 98, 26, 151, 255, 160, 235, 41, 239, 254, 22, 204, 181, 15, 255, 31, 35, 69, 92, 1, 129, 14, 6, 15, 255, 44, 1, 51, + 51, 13, 3, 45, 1, 193, 99, 251, 8, 205, 221, 239, 11, 13, 95, 6, 1, 17, 165, 50, 30, 90, 249, 32, 3, 15, 162, 37, 70, 31, 247, 223, 43, 75, 107, 3, 19, 4, 254, 27, 252, 255, 4, 121, 9, 88, 172, 165, 144, 28, 73, 208, 15, 128, 7, 89, 243, 13, 1, 243, 3, 66, 47, 88, 211, 0, 189, 7, 85, 28, + 221, 223, 254, 0, 1, 78, 15, 225, 8, 128, 88, 175, 4, 242, 5, 16, 0, 190, 31, 193, 217, 223, 255, 12, 194, 41, 6, 236, 75, 231, 15, 255, 4, 150, 0, 41, 186, 59, 59, 12, 243, 1, 31, 88, 38, 153, 44, 79, 5, 144, 3, 29, 187, 187, 30, 28, 32, 191, 255, 209, 5, 209, 37, 48, 0, 234, 2, 175, 208, 28, + 242, 247, 15, 222, 6, 17, 31, 247, 138, 190, 75, 215, 15, 255, 4, 42, 39, 250, 4, 155, 108, 12, 93, 243, 82, 15, 127, 0, 16, 89, 131, 246, 5, 60, 173, 15, 255, 17, 11, 75, 25, 241, 255, 2, 51, 17, 62, 167, 224, 3, 31, 0, 251, 242, 255, 254, 221, 217, 35, 106, 112, 3, 240, 128, 3, 41, 0, 97, 18, 79, + 255, 95, 91, 247, 207, 92, 7, 79, 89, 252, 82, 31, 255, 246, 95, 251, 192, 92, 3, 45, 227, 64, 92, 67, 149, 95, 59, 107, 46, 106, 244, 30, 186, 246, 31, 56, 247, 10, 58, 122, 32, 7, 42, 54, 91, 231, 9, 91, 247, 4, 185, 107, 10, 46, 255, 27, 24, 32, 100, 143, 199, 64, 28, 129, 96, 31, 217, 162, 160, 31, + 166, 208, 61, 0, 41, 119, 31, 74, 251, 31, 195, 182, 245, 31, 242, 240, 1, 73, 227, 48, 13, 30, 134, 170, 64, 15, 32, 14, 207, 26, 112, 191, 58, 52, 160, 28, 11, 43, 47, 99, 35, 24, 224, 60, 32, 15, 147, 129, 2, 202, 137, 134, 58, 223, 28, 134, 31, 253, 255, 47, 59, 47, 92, 0, 21, 25, 244, 20, 166, 49, + 35, 32, 31, 96, 48, 31, 164, 48, 85, 31, 177, 80, 36, 60, 2, 49, 31, 30, 26, 206, 6, 137, 247, 95, 207, 44, 255, 36, 245, 144, 81, 35, 31, 201, 8, 126, 29, 170, 79, 207, 255, 226, 239, 63, 81, 203, 36, 29, 102, 42, 91, 254, 29, 106, 31, 131, 176, 28, 19, 92, 87, 82, 92, 83, 192, 8, 119, 25, 14, 17, + 52, 30, 35, 160, 30, 251, 170, 244, 31, 255, 253, 48, 191, 1, 47, 239, 127, 80, 183, 141, 79, 64, 15, 30, 212, 30, 23, 251, 114, 31, 43, 236, 84, 61, 71, 247, 77, 71, 64, 79, 251, 144, 8, 135, 104, 37, 35, 164, 29, 159, 251, 79, 178, 223, 45, 127, 225, 67, 243, 62, 173, 170, 176, 146, 231, 192, 0, 141, 66, 193, + 27, 230, 249, 29, 213, 154, 253, 60, 242, 255, 224, 60, 248, 33, 94, 48, 31, 151, 154, 112, 47, 131, 7, 152, 0, 237, 32, 50, 103, 223, 30, 132, 138, 159, 7, 0, 8, 13, 141, 25, 35, 243, 63, 0, 3, 5, 47, 163, 235, 85, 51, 247, 241, 128, 3, 253, 6, 62, 19, 239, 83, 243, 143, 85, 31, 255, 63, 31, 255, 12, + 31, 255, 3, 47, 215, 78, 71, 45, 23, 64, 95, 247, 39, 201, 31, 10, 6, 255, 146, 146, 19, 125, 223, 45, 232, 31, 30, 30, 36, 3, 191, 17, 140, 149, 255, 31, 20, 29, 121, 0, 20, 10, 0, 33, 25, 162, 79, 14, 190, 17, 47, 31, 163, 36, 55, 8, 255, 251, 6, 244, 3, 255, 255, 110, 31, 151, 255, 36, 213, 51, + 131, 244, 2, 223, 255, 95, 31, 120, 223, 31, 112, 48, 91, 140, 253, 80, 91, 29, 213, 19, 50, 0, 193, 6, 69, 19, 31, 185, 162, 9, 24, 77, 6, 31, 99, 56, 47, 36, 223, 111, 83, 211, 198, 2, 223, 61, 231, 31, 135, 19, 202, 255, 24, 21, 74, 235, 223, 255, 230, 31, 158, 130, 46, 65, 175, 255, 245, 211, 0, 11, + 128, 30, 243, 176, 30, 251, 224, 255, 47, 255, 245, 242, 143, 255, 224, 253, 237, 255, 255, 128, 30, 94, 16, 255, 22, 124, 255, 43, 200, 62, 47, 239, 46, 73, 55, 9, 31, 39, 1, 191, 11, 42, 156, 30, 50, 30, 191, 47, 241, 238, 31, 246, 69, 255, 95, 24, 215, 207, 20, 133, 63, 254, 16, 0, 9, 129, 227, 31, 47, 36, + 39, 40, 6, 37, 103, 40, 141, 49, 191, 251, 85, 69, 23, 250, 13, 217, 19, 4, 33, 10, 40, 31, 221, 10, 34, 85, 107, 101, 111, 8, 43, 28, 34, 162, 49, 147, 251, 73, 79, 85, 48, 3, 250, 85, 115, 237, 12, 124, 115, 127, 144, 3, 143, 36, 84, 15, 96, 3, 157, 51, 239, 96, 3, 144, 144, 3, 31, 243, 219, 239, + 112, 15, 126, 49, 141, 178, 15, 195, 12, 42, 216, 119, 15, 227, 12, 7, 204, 48, 8, 133, 203, 70, 118, 64, 106, 14, 162, 76, 5, 116, 15, 2, 77, 4, 15, 255, 10, 100, 15, 223, 13, 238, 55, 97, 0, 0, 0, 248, 13, 221, 221, 57, 23, 81, 15, 236, 5, 221, 16, 0, 255, 14, 147, 6, 0, 20, 255, 12, 187, 161, + 181, 255, 0, 80, 5, 250, 4, 250, 13, 242, 255, 12, 243, 111, 144, 95, 176, 239, 16, 215, 223, 32, 15, 63, 33, 10, 3, 147, 6, 80, 5, 176, 255, 0, 243, 10, 245, 0, 252, 2, 253, 255, 0, 191, 64, 159, 96, 63, 208, 31, 186, 224, 14, 130, 59, 53, 103, 121, 28, 226, 255, 48, 3, 239, 89, 152, 119, 239, 251, 153, + 155, 187, 187, 117, 104, 219, 85, 83, 59, 31, 219, 175, 191, 223, 189, 62, 82, 223, 40, 255, 254, 33, 17, 17, 226, 223, 252, 154, 161, 31, 255, 31, 182, 0, 227, 74, 8, 239, 72, 7, 111, 111, 255, 6, 237, 76, 71, 8, 255, 1, 19, 193, 51, 207, 105, 67, 111, 255, 45, 75, 45, 45, 43, 143, 254, 230, 87, 119, 119, 224, + 31, 175, 255, 119, 48, 89, 99, 167, 245, 191, 255, 6, 93, 103, 109, 107, 57, 0, 73, 98, 45, 203, 0, 0, 43, 58, 28, 188, 72, 95, 144, 91, 67, 237, 236, 221, 220, 163, 171, 4, 166, 44, 229, 160, 60, 58, 251, 29, 124, 32, 129, 10, 210, 60, 27, 15, 255, 0, 182, 157, 16, 215, 223, 255, 64, 3, 51, 17, 175, 255, + 246, 17, 51, 69, 85, 113, 31, 219, 189, 30, 87, 189, 5, 180, 43, 119, 119, 120, 133, 106, 59, 247, 241, 119, 85, 83, 245, 15, 255, 1, 46, 91, 91, 84, 2, 62, 94, 239, 102, 39, 96, 0, 2, 207, 248, 28, 214, 188, 248, 31, 19, 144, 223, 255, 228, 62, 43, 230, 76, 251, 20, 103, 137, 157, 127, 89, 115, 72, 84, 214, + 50, 207, 124, 100, 128, 95, 23, 251, 184, 30, 217, 218, 255, 80, 25, 224, 32, 248, 15, 255, 0, 44, 23, 208, 126, 31, 15, 191, 255, 0, 45, 255, 254, 30, 122, 175, 244, 111, 255, 86, 46, 171, 128, 99, 20, 255, 247, 137, 255, 255, 249, 29, 116, 64, 47, 255, 247, 183, 0, 95, 249, 191, 255, 121, 135, 98, 93, 32, 91, 177, + 31, 178, 252, 66, 52, 47, 75, 7, 69, 5, 43, 7, 80, 13, 115, 108, 184, 193, 31, 226, 30, 73, 123, 1, 85, 27, 189, 9, 31, 238, 47, 31, 120, 175, 28, 219, 207, 255, 48, 248, 6, 250, 0, 224, 14, 241, 239, 0, 112, 127, 30, 209, 239, 16, 0, 8, 86, 18, 224, 31, 29, 143, 159, 26, 250, 191, 96, 14, 52, 48, + 255, 10, 246, 8, 247, 2, 254, 0, 238, 125, 16, 80, 127, 0, 31, 224, 14, 16, 96, 6, 24, 30, 191, 29, 237, 32, 112, 111, 176, 98, 191, 44, 131, 28, 218, 40, 63, 31, 36, 117, 95, 28, 3, 63, 13, 255, 36, 43, 35, 27, 155, 175, 11, 67, 223, 10, 31, 125, 191, 255, 209, 11, 247, 255, 253, 16, 191, 59, 215, 255, + 160, 255, 254, 184, 255, 243, 251, 0, 207, 251, 27, 166, 215, 255, 16, 163, 96, 146, 29, 112, 254, 64, 0, 191, 31, 30, 31, 7, 255, 255, 231, 32, 111, 37, 44, 79, 51, 227, 16, 239, 174, 30, 174, 7, 31, 214, 7, 245, 255, 220, 187, 207, 93, 191, 31, 80, 3, 15, 236, 2, 69, 120, 125, 67, 255, 151, 19, 235, 30, 219, + 202, 255, 48, 80, 3, 31, 143, 255, 148, 103, 119, 9, 125, 1, 23, 47, 171, 34, 152, 45, 222, 63, 61, 131, 255, 202, 13, 191, 183, 188, 44, 37, 0, 56, 207, 255, 142, 118, 109, 168, 243, 16, 43, 30, 23, 1, 239, 28, 104, 255, 223, 244, 0, 3, 223, 253, 187, 189, 38, 112, 127, 46, 47, 247, 80, 3, 17, 249, 255, 242, + 95, 95, 206, 212, 0, 61, 207, 15, 255, 3, 2, 104, 172, 29, 83, 135, 255, 48, 3, 60, 239, 59, 195, 32, 223, 12, 0, 18, 238, 52, 91, 239, 110, 32, 253, 203, 169, 28, 106, 143, 0, 46, 76, 47, 41, 45, 183, 255, 232, 153, 153, 116, 112, 251, 248, 85, 84, 31, 255, 111, 94, 223, 44, 175, 201, 0, 112, 85, 67, 18, + 132, 0, 38, 92, 35, 227, 220, 255, 255, 80, 2, 9, 255, 80, 10, 7, 235, 255, 112, 31, 16, 3, 95, 16, 7, 127, 5, 219, 255, 144, 32, 3, 111, 1, 30, 254, 239, 172, 111, 80, 113, 252, 175, 31, 185, 63, 253, 245, 0, 255, 143, 248, 245, 0, 223, 243, 251, 1, 211, 255, 224, 34, 51, 253, 17, 183, 20, 50, 0, 206, + 105, 30, 6, 0, 143, 30, 160, 12, 17, 214, 32, 3, 79, 191, 255, 45, 32, 244, 3, 253, 207, 245, 0, 216, 128, 159, 21, 126, 127, 247, 128, 3, 35, 220, 19, 224, 167, 127, 19, 14, 127, 32, 26, 21, 217, 63, 254, 80, 58, 18, 54, 68, 31, 0, 3, 141, 67, 59, 2, 45, 235, 94, 31, 67, 4, 31, 71, 45, 255, 221, + 222, 63, 29, 248, 245, 255, 236, 166, 16, 46, 30, 34, 192, 96, 3, 159, 144, 80, 211, 13, 117, 31, 8, 239, 196, 0, 223, 223, 220, 255, 19, 123, 46, 14, 208, 0, 6, 255, 15, 176, 0, 3, 12, 241, 0, 8, 245, 5, 253, 49, 127, 165, 55, 241, 81, 55, 247, 16, 82, 31, 3, 30, 20, 35, 69, 11, 31, 177, 23, 116, + 22, 240, 82, 167, 83, 46, 63, 1, 63, 159, 224, 68, 17, 36, 25, 80, 143, 255, 112, 0, 224, 30, 241, 0, 246, 7, 238, 248, 0, 254, 20, 12, 143, 112, 111, 4, 194, 49, 255, 239, 32, 0, 7, 249, 4, 0, 14, 255, 241, 13, 0, 143, 128, 95, 1, 254, 253, 16, 239, 9, 247, 7, 249, 20, 10, 241, 249, 175, 96, 143, + 112, 207, 31, 3, 31, 14, 0, 101, 18, 150, 0, 160, 3, 104, 2, 15, 255, 14, 9, 31, 77, 127, 82, 31, 113, 127, 31, 84, 5, 52, 78, 223, 84, 12, 31, 171, 199, 6, 255, 65, 199, 66, 170, 33, 207, 3, 133, 75, 219, 255, 2, 31, 187, 112, 2, 47, 174, 5, 207, 84, 24, 136, 2, 22, 62, 0, 96, 3, 224, 85, + 191, 31, 90, 159, 7, 34, 227, 12, 196, 4, 6, 223, 254, 202, 151, 143, 110, 43, 57, 144, 3, 63, 163, 1, 51, 69, 93, 106, 56, 107, 129, 17, 79, 247, 112, 222, 223, 201, 67, 39, 109, 15, 255, 6, 153, 148, 35, 159, 16, 0, 24, 72, 218, 251, 175, 217, 81, 0, 51, 15, 202, 5, 207, 251, 234, 51, 86, 127, 31, 247, + 111, 31, 255, 95, 32, 3, 82, 31, 247, 95, 20, 152, 63, 32, 3, 56, 225, 242, 18, 193, 85, 23, 243, 159, 20, 173, 127, 20, 177, 143, 17, 109, 207, 167, 247, 18, 213, 243, 24, 189, 22, 6, 7, 153, 117, 79, 15, 255, 10, 49, 15, 255, 0, 34, 55, 5, 5, 80, 0, 252, 29, 9, 254, 204, 255, 223, 24, 212, 32, 3, + 212, 239, 245, 88, 179, 243, 87, 135, 208, 72, 143, 13, 188, 15, 254, 255, 144, 31, 3, 255, 176, 5, 16, 3, 191, 0, 64, 3, 192, 6, 1, 255, 208, 111, 95, 16, 3, 79, 16, 7, 3, 255, 202, 255, 196, 79, 44, 115, 58, 20, 116, 19, 250, 51, 134, 159, 248, 106, 24, 23, 250, 65, 44, 135, 140, 28, 140, 106, 19, 243, + 109, 35, 251, 255, 180, 195, 123, 218, 98, 36, 223, 234, 89, 31, 251, 79, 24, 240, 63, 251, 144, 3, 17, 33, 31, 189, 253, 96, 3, 4, 85, 85, 89, 24, 111, 255, 113, 32, 3, 5, 119, 126, 28, 251, 23, 215, 41, 36, 175, 238, 255, 128, 9, 32, 91, 183, 119, 118, 117, 203, 253, 213, 85, 85, 255, 208, 36, 21, 63, 255, + 238, 231, 255, 240, 21, 5, 240, 25, 255, 105, 215, 39, 41, 219, 175, 72, 228, 86, 207, 15, 255, 15, 127, 255, 252, 233, 0, 1, 103, 15, 131, 7, 32, 15, 255, 77, 19, 150, 242, 255, 7, 249, 5, 250, 0, 216, 0, 113, 85, 15, 255, 37, 2, 87, 115, 1, 15, 255, 2, 253, 24, 114, 245, 117, 24, 114, 112, 7, 208, 15, + 104, 99, 1, 22, 165, 0, 202, 106, 187, 2, 137, 7, 4, 111, 16, 7, 105, 231, 17, 15, 255, 2, 115, 60, 79, 220, 185, 152, 15, 255, 6, 55, 227, 101, 85, 152, 85, 0, 31, 7, 25, 145, 51, 48, 15, 255, 40, 35, 227, 35, 231, 173, 21, 0, 97, 5, 15, 23, 227, 9, 216, 15, 177, 40, 12, 60, 35, 23, 28, 205, + 0, 1, 69, 83, 1, 223, 3, 31, 255, 165, 194, 1, 159, 43, 208, 23, 93, 27, 184, 153, 11, 45, 4, 9, 244, 255, 184, 190, 13, 40, 92, 55, 6, 25, 4, 27, 138, 244, 0, 38, 173, 248, 1, 158, 6, 0, 83, 235, 41, 199, 181, 153, 15, 255, 2, 5, 255, 28, 56, 54, 15, 255, 8, 223, 250, 240, 0, 44, 223, 241, + 1, 163, 8, 128, 15, 255, 66, 203, 25, 145, 27, 173, 29, 167, 143, 154, 158, 11, 193, 108, 72, 163, 159, 251, 69, 199, 95, 254, 69, 224, 255, 255, 221, 206, 64, 28, 226, 144, 0, 14, 25, 145, 127, 85, 254, 94, 29, 89, 203, 47, 31, 255, 3, 239, 255, 233, 63, 46, 159, 30, 244, 255, 254, 48, 0, 239, 255, 229, 227, 0, + 46, 29, 67, 15, 159, 56, 20, 43, 217, 208, 85, 78, 213, 207, 27, 58, 111, 31, 127, 14, 238, 255, 9, 62, 80, 155, 28, 122, 4, 255, 226, 17, 28, 127, 159, 170, 155, 43, 67, 128, 79, 63, 253, 95, 75, 227, 182, 156, 117, 31, 97, 9, 252, 105, 18, 240, 255, 18, 244, 254, 87, 31, 138, 80, 26, 7, 80, 127, 255, 35, + 86, 119, 127, 111, 148, 167, 83, 16, 0, 54, 137, 171, 181, 187, 175, 159, 118, 65, 43, 15, 213, 46, 59, 112, 255, 0, 57, 255, 241, 219, 64, 223, 245, 245, 255, 144, 175, 245, 13, 194, 25, 4, 73, 95, 3, 149, 255, 76, 123, 34, 115, 143, 127, 255, 64, 95, 255, 248, 39, 92, 231, 46, 27, 169, 30, 79, 14, 34, 22, 19, + 51, 33, 207, 17, 95, 31, 208, 32, 3, 39, 223, 251, 153, 215, 0, 191, 29, 45, 207, 134, 97, 17, 17, 16, 63, 31, 47, 39, 27, 253, 0, 175, 254, 146, 0, 188, 31, 25, 84, 47, 251, 1, 89, 5, 24, 8, 18, 41, 214, 255, 234, 9, 110, 1, 3, 29, 125, 127, 231, 30, 27, 85, 31, 255, 223, 159, 223, 159, 29, 145, + 239, 49, 183, 155, 52, 75, 3, 20, 247, 169, 118, 230, 171, 149, 27, 242, 47, 254, 117, 44, 255, 84, 51, 77, 15, 31, 6, 1, 31, 217, 11, 159, 160, 77, 171, 230, 75, 46, 35, 85, 103, 223, 53, 109, 63, 111, 255, 26, 177, 30, 158, 247, 88, 95, 233, 206, 153, 187, 224, 31, 175, 234, 187, 187, 164, 47, 167, 73, 31, 171, + 251, 6, 30, 15, 156, 244, 168, 74, 43, 19, 52, 1, 223, 239, 250, 29, 246, 241, 18, 95, 255, 181, 94, 175, 255, 64, 219, 223, 85, 85, 103, 117, 15, 226, 47, 170, 63, 26, 187, 11, 19, 19, 2, 38, 9, 143, 21, 74, 178, 6, 17, 236, 87, 137, 104, 147, 30, 140, 32, 21, 196, 175, 64, 50, 207, 11, 28, 113, 9, 255, + 144, 171, 189, 206, 126, 93, 255, 0, 239, 249, 20, 195, 241, 63, 30, 165, 31, 48, 75, 32, 0, 1, 17, 17, 186, 17, 126, 123, 221, 220, 187, 15, 193, 2, 144, 90, 231, 126, 35, 28, 2, 239, 255, 225, 0, 30, 31, 35, 63, 18, 92, 19, 244, 255, 7, 255, 249, 239, 14, 255, 255, 208, 46, 127, 255, 64, 4, 239, 70, 145, + 62, 176, 95, 155, 46, 50, 57, 227, 254, 16, 19, 193, 188, 176, 8, 27, 15, 5, 188, 223, 255, 30, 74, 48, 3, 239, 3, 66, 16, 170, 67, 10, 85, 85, 85, 190, 127, 111, 39, 238, 255, 253, 187, 11, 30, 196, 182, 111, 30, 147, 239, 252, 94, 167, 217, 154, 19, 163, 166, 80, 30, 167, 160, 17, 211, 13, 89, 0, 221, 239, + 20, 159, 147, 11, 38, 224, 29, 137, 8, 21, 200, 36, 247, 3, 133, 123, 47, 210, 21, 0, 7, 221, 33, 59, 255, 201, 255, 118, 85, 67, 36, 85, 119, 119, 191, 117, 31, 248, 172, 185, 153, 55, 167, 139, 82, 191, 252, 255, 185, 153, 153, 51, 0, 191, 244, 118, 255, 0, 239, 242, 255, 82, 255, 240, 119, 255, 5, 255, 192, 0, + 1, 205, 64, 220, 179, 166, 67, 75, 155, 223, 46, 209, 45, 39, 4, 191, 53, 72, 7, 46, 3, 0, 131, 175, 177, 89, 100, 84, 255, 245, 255, 235, 234, 127, 30, 17, 111, 31, 237, 191, 170, 251, 30, 49, 245, 24, 57, 240, 40, 31, 195, 47, 235, 213, 153, 155, 47, 75, 27, 111, 79, 159, 80, 3, 175, 87, 100, 27, 241, 81, + 95, 253, 208, 3, 0, 223, 249, 145, 152, 19, 134, 18, 204, 253, 18, 208, 16, 158, 28, 234, 1, 237, 255, 193, 17, 24, 215, 255, 3, 31, 255, 159, 183, 249, 16, 228, 249, 14, 16, 3, 10, 199, 79, 47, 46, 213, 46, 217, 246, 69, 101, 255, 245, 30, 252, 84, 31, 170, 227, 33, 92, 48, 54, 12, 12, 84, 155, 37, 119, 253, + 79, 254, 96, 0, 223, 248, 91, 181, 240, 250, 64, 1, 255, 227, 112, 16, 80, 96, 16, 84, 242, 64, 5, 255, 199, 31, 56, 33, 79, 112, 109, 143, 174, 17, 72, 235, 221, 47, 250, 137, 153, 171, 82, 87, 207, 1, 69, 31, 214, 89, 31, 11, 255, 221, 221, 123, 63, 167, 253, 187, 187, 186, 46, 174, 0, 101, 218, 85, 48, 46, + 163, 10, 208, 94, 171, 144, 141, 223, 174, 10, 31, 254, 111, 31, 254, 28, 219, 191, 26, 255, 245, 127, 255, 209, 4, 22, 107, 46, 28, 147, 223, 63, 24, 175, 33, 239, 255, 255, 208, 5, 254, 255, 249, 240, 13, 85, 85, 67, 44, 250, 24, 123, 10, 94, 31, 151, 15, 85, 87, 31, 255, 137, 187, 69, 205, 227, 51, 51, 16, 166, + 1, 48, 3, 46, 67, 221, 221, 125, 32, 67, 245, 0, 6, 189, 239, 114, 127, 2, 171, 51, 121, 194, 8, 95, 7, 159, 107, 219, 239, 255, 210, 235, 153, 18, 243, 0, 34, 243, 50, 123, 209, 41, 155, 222, 112, 0, 107, 251, 153, 152, 119, 119, 15, 218, 2, 174, 176, 95, 135, 16, 15, 40, 37, 11, 237, 203, 34, 15, 133, 239, + 74, 103, 39, 15, 39, 23, 20, 127, 6, 29, 184, 13, 250, 255, 176, 255, 51, 17, 45, 222, 143, 31, 251, 180, 191, 31, 140, 223, 16, 66, 63, 223, 95, 203, 45, 246, 180, 0, 21, 22, 0, 244, 95, 67, 242, 80, 11, 31, 83, 246, 1, 255, 217, 155, 16, 87, 0, 7, 43, 230, 42, 81, 111, 18, 123, 5, 50, 7, 96, 30, + 29, 240, 22, 41, 40, 51, 103, 31, 120, 255, 95, 135, 243, 81, 171, 103, 56, 45, 3, 82, 30, 132, 64, 24, 12, 225, 25, 44, 31, 170, 175, 31, 79, 217, 13, 255, 70, 231, 0, 141, 87, 179, 39, 183, 5, 82, 47, 255, 112, 95, 203, 227, 95, 203, 113, 63, 153, 54, 79, 175, 253, 27, 78, 244, 25, 142, 160, 0, 191, 255, + 247, 16, 5, 255, 247, 113, 95, 167, 101, 84, 185, 51, 60, 74, 2, 255, 215, 30, 20, 69, 135, 0, 174, 1, 33, 159, 128, 27, 194, 32, 33, 16, 139, 175, 167, 249, 40, 11, 248, 38, 239, 22, 166, 111, 251, 98, 63, 33, 197, 47, 40, 0, 223, 193, 17, 0, 223, 220, 235, 187, 51, 47, 159, 255, 133, 52, 215, 75, 163, 190, + 237, 47, 139, 18, 51, 51, 51, 187, 16, 0, 63, 47, 151, 20, 123, 85, 168, 118, 85, 86, 0, 255, 2, 223, 245, 221, 96, 63, 250, 255, 255, 160, 13, 253, 51, 0, 11, 253, 187, 255, 64, 11, 253, 255, 176, 14, 252, 85, 254, 17, 191, 248, 121, 191, 255, 224, 12, 239, 5, 85, 33, 83, 12, 42, 92, 12, 31, 212, 31, 24, + 148, 127, 105, 27, 199, 207, 249, 95, 3, 224, 81, 83, 72, 125, 207, 21, 44, 38, 32, 216, 21, 219, 255, 130, 199, 95, 63, 157, 251, 85, 88, 19, 246, 81, 191, 224, 85, 107, 96, 92, 155, 3, 245, 255, 165, 119, 3, 31, 72, 4, 31, 76, 5, 231, 255, 131, 70, 39, 24, 39, 28, 189, 203, 185, 191, 134, 47, 255, 191, 245, + 47, 255, 127, 244, 255, 6, 239, 159, 243, 0, 26, 207, 254, 173, 176, 31, 27, 246, 31, 31, 177, 4, 24, 30, 62, 255, 159, 241, 1, 239, 254, 87, 255, 241, 94, 40, 211, 255, 28, 104, 62, 255, 255, 229, 53, 112, 186, 251, 18, 246, 209, 2, 187, 57, 221, 8, 53, 63, 175, 80, 27, 104, 64, 24, 182, 48, 128, 11, 255, 250, + 49, 64, 11, 255, 33, 25, 63, 16, 32, 3, 247, 44, 185, 223, 255, 41, 55, 239, 255, 234, 227, 99, 255, 229, 95, 215, 47, 219, 20, 99, 175, 255, 218, 234, 151, 100, 223, 51, 52, 47, 59, 1, 100, 223, 121, 18, 207, 6, 255, 119, 138, 40, 67, 79, 23, 192, 43, 86, 115, 96, 3, 208, 91, 59, 148, 19, 227, 1, 255, 171, + 241, 31, 243, 241, 85, 244, 243, 71, 228, 223, 244, 247, 5, 0, 223, 245, 25, 205, 255, 255, 83, 212, 50, 111, 42, 240, 252, 66, 238, 127, 48, 3, 25, 205, 170, 254, 79, 151, 209, 14, 145, 1, 49, 37, 50, 48, 57, 203, 74, 49, 119, 11, 93, 37, 26, 119, 4, 26, 127, 13, 21, 231, 182, 95, 26, 73, 223, 252, 41, 47, + 80, 233, 30, 35, 212, 96, 60, 42, 11, 93, 45, 231, 110, 239, 182, 42, 68, 137, 252, 31, 220, 16, 42, 48, 47, 110, 33, 76, 16, 4, 0, 210, 0, 109, 8, 223, 3, 80, 92, 23, 13, 214, 19, 79, 26, 209, 162, 24, 45, 69, 19, 13, 130, 7, 15, 91, 6, 110, 127, 175, 29, 4, 239, 1, 53, 67, 15, 255, 3, 240, + 0, 55, 201, 143, 128, 15, 121, 99, 79, 255, 24, 75, 0, 7, 239, 80, 21, 56, 214, 9, 131, 16, 15, 255, 0, 159, 31, 190, 1, 43, 134, 2, 88, 13, 105, 5, 2, 42, 163, 4, 156, 15, 127, 10, 59, 231, 25, 23, 124, 15, 191, 4, 253, 32, 255, 201, 64, 15, 128, 10, 45, 47, 146, 39, 15, 223, 7, 30, 150, 205, + 15, 190, 11, 42, 132, 239, 26, 181, 223, 20, 16, 14, 42, 66, 159, 241, 7, 255, 159, 254, 241, 4, 255, 71, 112, 0, 33, 15, 255, 2, 142, 244, 92, 123, 15, 255, 7, 83, 231, 0, 3, 51, 15, 255, 3, 185, 29, 45, 35, 124, 239, 255, 15, 96, 6, 41, 70, 255, 241, 255, 234, 96, 17, 7, 0, 38, 19, 227, 19, 231, + 9, 239, 0, 137, 147, 2, 223, 7, 152, 119, 101, 67, 107, 2, 255, 7, 253, 184, 7, 123, 11, 3, 46, 110, 24, 192, 89, 15, 165, 42, 91, 3, 62, 93, 17, 1, 29, 95, 41, 223, 1, 111, 188, 223, 91, 177, 26, 62, 247, 36, 239, 255, 187, 249, 123, 253, 254, 153, 153, 239, 255, 86, 119, 218, 119, 119, 109, 59, 135, 119, + 8, 179, 0, 48, 71, 227, 179, 3, 25, 244, 191, 64, 69, 175, 79, 255, 141, 48, 127, 26, 179, 144, 1, 3, 255, 144, 127, 5, 255, 255, 112, 127, 167, 255, 80, 55, 184, 239, 255, 64, 3, 141, 38, 127, 176, 35, 85, 223, 239, 248, 109, 151, 101, 52, 255, 224, 85, 232, 120, 255, 233, 175, 255, 119, 22, 145, 26, 65, 28, 27, + 103, 68, 249, 153, 112, 63, 207, 14, 122, 0, 124, 238, 162, 85, 25, 120, 254, 205, 191, 58, 31, 171, 207, 28, 150, 223, 116, 31, 30, 223, 241, 32, 30, 220, 192, 62, 228, 158, 28, 159, 239, 39, 3, 56, 143, 48, 0, 10, 249, 0, 233, 2, 68, 80, 15, 158, 8, 187, 27, 255, 206, 31, 27, 125, 83, 203, 127, 1, 17, 35, + 127, 238, 95, 160, 255, 0, 5, 96, 246, 0, 63, 253, 250, 254, 0, 47, 255, 253, 53, 91, 255, 14, 95, 2, 169, 16, 93, 7, 243, 79, 207, 1, 73, 75, 79, 255, 5, 158, 180, 26, 157, 28, 183, 15, 254, 0, 8, 26, 165, 199, 3, 46, 29, 178, 31, 174, 174, 46, 54, 37, 139, 191, 239, 110, 214, 251, 168, 99, 143, 247, + 0, 237, 17, 143, 248, 111, 255, 137, 184, 43, 95, 48, 135, 0, 27, 13, 42, 236, 95, 211, 223, 189, 19, 53, 86, 187, 3, 91, 247, 3, 220, 187, 241, 251, 119, 119, 223, 153, 153, 111, 55, 175, 255, 165, 85, 175, 163, 255, 207, 222, 153, 17, 144, 44, 215, 40, 35, 83, 51, 181, 32, 15, 14, 5, 191, 205, 25, 218, 255, 30, + 84, 255, 58, 60, 3, 193, 63, 159, 219, 96, 25, 185, 250, 41, 109, 253, 16, 223, 29, 255, 64, 239, 111, 255, 162, 238, 104, 153, 133, 112, 220, 117, 52, 191, 31, 166, 200, 14, 243, 75, 231, 127, 255, 211, 92, 223, 33, 21, 41, 27, 81, 30, 205, 2, 127, 255, 76, 30, 149, 32, 53, 32, 57, 159, 189, 245, 48, 3, 69, 207, + 251, 150, 255, 223, 18, 235, 1, 89, 2, 25, 1, 7, 31, 255, 8, 255, 195, 254, 148, 239, 255, 44, 121, 41, 245, 26, 54, 0, 75, 112, 233, 190, 17, 35, 52, 115, 87, 20, 84, 62, 39, 63, 255, 127, 23, 59, 5, 255, 48, 85, 91, 255, 183, 126, 111, 89, 84, 124, 255, 161, 174, 255, 30, 79, 119, 162, 223, 137, 153, 148, + 95, 121, 253, 88, 49, 46, 37, 217, 6, 55, 0, 32, 12, 11, 30, 17, 1, 223, 77, 151, 214, 191, 255, 31, 223, 254, 27, 94, 250, 8, 25, 161, 126, 29, 219, 253, 0, 124, 127, 253, 255, 27, 72, 252, 254, 48, 22, 190, 226, 25, 18, 76, 39, 12, 249, 111, 232, 16, 0, 55, 132, 222, 58, 223, 232, 114, 45, 155, 225, 0, + 190, 43, 158, 46, 127, 12, 27, 205, 248, 13, 255, 48, 254, 143, 26, 148, 62, 183, 45, 247, 85, 34, 157, 79, 29, 239, 127, 29, 239, 159, 29, 243, 143, 125, 32, 15, 255, 105, 255, 32, 11, 30, 149, 11, 127, 27, 209, 1, 14, 253, 0, 85, 15, 251, 255, 1, 255, 31, 250, 1, 255, 79, 252, 253, 183, 17, 255, 255, 247, 44, + 96, 239, 17, 254, 3, 255, 176, 86, 121, 255, 235, 84, 120, 253, 221, 17, 18, 53, 85, 186, 45, 238, 247, 245, 0, 6, 221, 178, 65, 199, 222, 31, 134, 255, 254, 255, 192, 5, 186, 151, 16, 8, 29, 139, 222, 1, 254, 33, 227, 147, 7, 255, 178, 78, 243, 187, 191, 29, 200, 223, 255, 128, 30, 185, 249, 7, 119, 29, 111, 158, + 255, 46, 26, 148, 243, 153, 223, 207, 254, 245, 31, 255, 32, 3, 244, 51, 143, 248, 250, 241, 0, 63, 250, 192, 19, 69, 96, 60, 99, 222, 10, 255, 78, 11, 192, 0, 220, 167, 157, 97, 244, 8, 212, 0, 33, 31, 99, 173, 28, 63, 51, 227, 181, 51, 44, 29, 101, 87, 30, 138, 255, 30, 218, 255, 249, 0, 95, 253, 116, 0, + 40, 51, 20, 74, 253, 237, 221, 187, 189, 44, 155, 119, 99, 31, 146, 255, 189, 210, 31, 215, 254, 16, 69, 142, 31, 167, 6, 48, 27, 184, 20, 236, 255, 217, 17, 211, 42, 211, 36, 117, 34, 118, 191, 250, 47, 25, 0, 39, 15, 255, 68, 255, 246, 11, 255, 206, 255, 77, 47, 5, 253, 175, 243, 189, 64, 90, 203, 224, 0, 5, + 190, 31, 253, 127, 246, 206, 255, 183, 31, 27, 66, 27, 9, 30, 187, 63, 31, 50, 31, 247, 235, 28, 59, 255, 255, 143, 91, 31, 251, 111, 110, 95, 187, 187, 28, 251, 0, 127, 251, 247, 81, 87, 175, 250, 69, 187, 191, 255, 235, 251, 48, 95, 31, 159, 227, 31, 87, 249, 0, 225, 187, 187, 162, 69, 67, 42, 103, 26, 233, 34, + 122, 122, 47, 29, 161, 89, 251, 8, 109, 195, 88, 155, 205, 255, 105, 108, 3, 137, 135, 16, 94, 248, 64, 187, 35, 169, 255, 238, 50, 51, 51, 134, 27, 221, 220, 112, 222, 176, 219, 69, 85, 36, 147, 254, 16, 36, 151, 187, 187, 168, 182, 79, 217, 7, 30, 244, 9, 37, 79, 27, 239, 27, 255, 73, 30, 26, 255, 30, 119, 96, + 3, 16, 28, 26, 19, 107, 112, 215, 255, 6, 28, 66, 5, 29, 138, 236, 255, 145, 85, 31, 227, 145, 21, 188, 145, 16, 15, 145, 47, 42, 9, 235, 252, 152, 80, 31, 98, 250, 31, 102, 251, 9, 242, 246, 86, 96, 9, 27, 231, 32, 3, 10, 27, 239, 174, 11, 28, 186, 31, 48, 3, 96, 0, 28, 51, 243, 39, 96, 3, 43, + 79, 48, 45, 233, 79, 129, 151, 191, 250, 221, 84, 0, 46, 233, 95, 253, 48, 25, 210, 249, 138, 62, 63, 147, 31, 119, 29, 95, 153, 124, 162, 80, 28, 162, 116, 32, 3, 48, 0, 205, 30, 176, 253, 46, 180, 49, 184, 106, 31, 176, 223, 240, 60, 156, 4, 29, 143, 8, 48, 39, 239, 32, 0, 14, 34, 254, 1, 107, 255, 6, + 239, 191, 255, 255, 16, 210, 216, 10, 251, 114, 103, 27, 72, 2, 2, 51, 107, 36, 227, 8, 255, 234, 127, 34, 96, 254, 169, 255, 176, 48, 5, 255, 255, 176, 0, 3, 153, 112, 88, 172, 221, 189, 221, 63, 243, 202, 135, 120, 98, 26, 50, 127, 233, 255, 252, 64, 30, 133, 252, 30, 138, 30, 75, 1, 238, 149, 219, 168, 49, 67, + 64, 154, 223, 31, 159, 230, 2, 207, 248, 110, 147, 11, 98, 40, 63, 254, 76, 155, 87, 44, 159, 31, 144, 3, 15, 94, 39, 0, 8, 1, 235, 70, 121, 156, 36, 239, 23, 31, 76, 21, 135, 239, 84, 51, 16, 84, 103, 48, 0, 93, 134, 47, 19, 57, 44, 195, 220, 111, 103, 24, 255, 113, 17, 81, 34, 131, 10, 31, 225, 143, + 33, 100, 29, 224, 31, 147, 40, 159, 242, 93, 115, 12, 63, 0, 229, 111, 191, 247, 0, 255, 95, 111, 244, 0, 79, 127, 243, 0, 187, 63, 16, 3, 31, 159, 242, 16, 3, 241, 0, 159, 15, 32, 3, 52, 236, 132, 16, 3, 250, 83, 175, 33, 47, 203, 229, 31, 207, 249, 250, 17, 51, 249, 48, 255, 221, 186, 129, 32, 11, 46, + 239, 191, 85, 31, 101, 14, 61, 101, 16, 30, 74, 16, 50, 74, 12, 238, 255, 16, 2, 23, 11, 7, 2, 239, 30, 144, 165, 46, 29, 220, 63, 30, 234, 31, 151, 9, 26, 46, 95, 218, 255, 114, 28, 177, 0, 117, 20, 178, 0, 87, 67, 59, 43, 195, 30, 229, 79, 255, 242, 31, 251, 112, 79, 254, 255, 229, 3, 239, 254, 48, + 14, 51, 27, 212, 128, 0, 50, 227, 96, 80, 3, 226, 31, 251, 30, 184, 142, 95, 36, 120, 36, 244, 40, 46, 191, 251, 66, 29, 222, 45, 22, 179, 42, 167, 5, 89, 19, 19, 87, 50, 199, 7, 252, 255, 144, 19, 127, 255, 96, 46, 255, 35, 255, 218, 153, 115, 31, 209, 20, 48, 20, 59, 243, 22, 66, 202, 244, 63, 22, 230, + 40, 39, 249, 22, 213, 176, 18, 140, 207, 80, 30, 20, 192, 18, 46, 244, 255, 249, 223, 245, 252, 255, 192, 95, 31, 28, 6, 95, 187, 0, 143, 99, 229, 234, 31, 222, 26, 251, 194, 79, 253, 255, 215, 176, 95, 21, 30, 127, 144, 3, 111, 7, 255, 255, 160, 31, 158, 255, 128, 10, 245, 0, 255, 95, 247, 248, 48, 95, 247, 255, + 251, 87, 64, 3, 245, 16, 11, 246, 16, 19, 254, 80, 95, 247, 246, 255, 254, 207, 23, 73, 243, 0, 54, 215, 191, 245, 23, 84, 247, 48, 3, 0, 111, 246, 80, 53, 158, 3, 31, 15, 191, 20, 251, 46, 32, 31, 105, 20, 149, 85, 17, 105, 6, 22, 208, 12, 23, 147, 31, 24, 255, 127, 106, 31, 18, 223, 248, 26, 251, 89, + 35, 69, 208, 31, 195, 169, 176, 29, 108, 80, 19, 109, 16, 80, 3, 37, 66, 250, 120, 14, 130, 8, 40, 96, 153, 190, 31, 31, 107, 255, 47, 239, 186, 12, 24, 175, 11, 255, 131, 53, 71, 1, 45, 87, 227, 5, 137, 5, 83, 231, 26, 19, 23, 115, 96, 255, 239, 77, 255, 64, 65, 74, 244, 0, 239, 151, 254, 16, 0, 223, + 249, 190, 228, 11, 24, 206, 126, 16, 3, 229, 13, 245, 66, 0, 13, 31, 197, 169, 14, 31, 201, 15, 31, 201, 15, 31, 201, 32, 169, 79, 64, 25, 173, 30, 44, 97, 45, 43, 81, 236, 48, 7, 38, 157, 25, 10, 254, 127, 253, 111, 251, 5, 193, 63, 31, 218, 85, 32, 3, 47, 31, 234, 31, 128, 3, 123, 52, 146, 16, 50, + 176, 166, 160, 178, 31, 251, 70, 213, 33, 54, 143, 72, 54, 221, 0, 191, 33, 66, 252, 36, 112, 21, 124, 245, 42, 31, 250, 39, 87, 255, 22, 74, 163, 26, 60, 250, 55, 103, 222, 0, 8, 40, 183, 2, 0, 103, 121, 121, 47, 251, 52, 85, 87, 119, 65, 47, 79, 254, 221, 95, 37, 94, 255, 43, 71, 153, 154, 187, 188, 252, + 255, 0, 79, 251, 255, 16, 47, 251, 117, 254, 0, 95, 251, 0, 39, 239, 246, 31, 111, 255, 176, 255, 255, 215, 0, 101, 48, 0, 147, 17, 32, 41, 15, 226, 10, 160, 15, 119, 19, 99, 231, 5, 85, 86, 15, 255, 2, 48, 20, 27, 48, 49, 212, 0, 87, 12, 255, 4, 43, 30, 227, 24, 35, 118, 15, 227, 37, 175, 19, 231, + 191, 240, 253, 0, 15, 69, 80, 0, 5, 15, 255, 2, 254, 235, 120, 153, 147, 41, 179, 84, 4, 189, 6, 251, 0, 219, 4, 95, 23, 134, 7, 96, 15, 255, 4, 254, 64, 106, 9, 15, 12, 2, 238, 27, 34, 18, 15, 126, 9, 94, 23, 252, 199, 1, 159, 75, 110, 15, 255, 2, 22, 121, 0, 6, 236, 189, 168, 15, 255, 7, + 252, 96, 8, 99, 15, 157, 10, 32, 252, 12, 255, 53, 0, 3, 251, 89, 186, 255, 255, 81, 24, 26, 223, 29, 51, 143, 15, 255, 7, 27, 226, 27, 78, 0, 155, 52, 15, 221, 5, 22, 122, 255, 5, 22, 127, 0, 0, 223, 36, 83, 15, 63, 3, 254, 16, 0, 254, 128, 62, 0, 124, 5, 62, 191, 243, 0, 2, 141, 224, 15, + 193, 8, 107, 43, 167, 0, 93, 47, 159, 19, 15, 159, 5, 112, 255, 244, 254, 149, 0, 51, 6, 164, 40, 207, 34, 38, 31, 255, 150, 71, 15, 255, 2, 31, 93, 47, 20, 177, 47, 115, 72, 163, 25, 255, 255, 43, 239, 29, 22, 0, 163, 15, 255, 6, 99, 235, 5, 39, 2, 97, 4, 58, 5, 187, 15, 224, 8, 24, 174, 245, + 0, 139, 135, 186, 2, 125, 5, 31, 246, 35, 163, 35, 167, 51, 50, 17, 51, 1, 31, 5, 63, 78, 17, 17, 11, 181, 4, 59, 236, 221, 187, 165, 185, 15, 255, 6, 240, 90, 15, 15, 255, 48, 4, 30, 255, 47, 100, 30, 220, 63, 250, 69, 8, 53, 16, 252, 162, 10, 41, 255, 63, 78, 115, 22, 19, 1, 239, 252, 16, 7, + 255, 85, 127, 31, 135, 93, 87, 247, 22, 15, 144, 38, 43, 0, 250, 207, 254, 0, 4, 175, 228, 159, 59, 65, 207, 151, 1, 30, 25, 40, 240, 8, 190, 223, 133, 86, 119, 189, 115, 111, 223, 217, 119, 119, 117, 202, 63, 139, 191, 16, 30, 15, 112, 80, 13, 255, 80, 96, 227, 79, 255, 205, 28, 167, 77, 71, 15, 224, 0, 8, + 217, 170, 48, 26, 81, 244, 26, 85, 254, 239, 248, 17, 170, 159, 189, 203, 239, 188, 51, 52, 85, 85, 111, 151, 239, 250, 253, 153, 153, 175, 249, 207, 222, 85, 58, 191, 188, 250, 38, 51, 0, 153, 119, 113, 15, 251, 1, 29, 199, 226, 7, 255, 196, 60, 7, 29, 72, 31, 159, 239, 191, 65, 235, 71, 137, 171, 35, 144, 178, 26, + 15, 245, 102, 236, 83, 50, 192, 223, 94, 187, 205, 89, 251, 50, 15, 205, 111, 254, 89, 127, 127, 255, 220, 96, 26, 175, 240, 83, 26, 18, 160, 52, 15, 10, 237, 253, 28, 243, 0, 252, 95, 43, 191, 251, 20, 19, 255, 80, 1, 94, 252, 214, 0, 127, 143, 255, 76, 31, 75, 239, 243, 28, 133, 190, 245, 35, 212, 52, 88, 255, + 251, 255, 1, 63, 4, 83, 79, 171, 149, 46, 195, 80, 207, 255, 30, 115, 9, 255, 170, 162, 45, 21, 160, 27, 35, 201, 29, 218, 79, 127, 255, 87, 22, 0, 9, 29, 43, 9, 31, 223, 1, 239, 249, 250, 0, 189, 239, 255, 219, 160, 95, 1, 25, 21, 125, 39, 222, 111, 255, 67, 48, 239, 111, 168, 185, 206, 153, 151, 210, 131, + 29, 182, 127, 252, 48, 26, 57, 15, 42, 65, 37, 125, 143, 255, 20, 94, 1, 239, 187, 64, 111, 25, 48, 251, 39, 31, 233, 89, 255, 97, 252, 58, 44, 47, 159, 224, 189, 221, 221, 96, 90, 237, 58, 12, 215, 47, 251, 198, 75, 160, 56, 197, 30, 221, 176, 46, 34, 199, 49, 27, 159, 212, 237, 104, 245, 124, 114, 129, 236, 99, + 252, 81, 207, 253, 172, 223, 26, 60, 63, 125, 245, 187, 239, 207, 245, 27, 125, 245, 207, 253, 147, 5, 47, 11, 31, 177, 29, 78, 31, 70, 44, 202, 144, 15, 137, 6, 3, 253, 0, 77, 169, 239, 0, 207, 151, 191, 78, 111, 18, 13, 223, 246, 57, 102, 106, 255, 252, 186, 46, 109, 183, 15, 202, 2, 150, 31, 228, 255, 252, 80, + 61, 183, 47, 3, 250, 46, 28, 235, 255, 31, 235, 255, 3, 254, 239, 179, 254, 131, 243, 127, 254, 62, 203, 30, 65, 253, 41, 126, 18, 39, 101, 255, 255, 186, 0, 159, 31, 199, 215, 223, 252, 31, 18, 225, 31, 227, 69, 212, 111, 254, 248, 79, 255, 162, 162, 239, 190, 79, 143, 250, 159, 253, 167, 133, 9, 30, 207, 230, 20, 23, + 247, 255, 183, 0, 44, 35, 122, 110, 254, 139, 235, 184, 33, 245, 31, 251, 247, 28, 75, 64, 0, 187, 47, 29, 13, 79, 255, 194, 18, 1, 244, 0, 239, 143, 251, 176, 25, 41, 32, 0, 191, 243, 31, 39, 158, 27, 173, 29, 120, 143, 251, 233, 18, 255, 251, 246, 255, 237, 255, 192, 31, 243, 48, 62, 61, 24, 88, 28, 115, 193, + 7, 255, 212, 31, 137, 96, 127, 44, 161, 16, 159, 250, 12, 250, 255, 244, 255, 111, 253, 93, 224, 207, 247, 0, 50, 36, 31, 49, 26, 228, 46, 30, 58, 45, 155, 10, 30, 66, 45, 111, 124, 20, 193, 1, 9, 160, 0, 4, 46, 89, 39, 157, 80, 111, 180, 111, 19, 108, 239, 46, 167, 45, 166, 19, 120, 42, 218, 85, 43, 211, + 159, 29, 242, 159, 25, 250, 127, 80, 3, 111, 245, 254, 69, 119, 95, 31, 245, 79, 31, 249, 63, 237, 255, 169, 119, 237, 90, 120, 132, 47, 242, 48, 102, 48, 3, 101, 82, 72, 1, 127, 155, 127, 214, 22, 173, 222, 255, 213, 28, 70, 255, 0, 2, 191, 31, 25, 238, 6, 208, 48, 45, 157, 8, 253, 203, 44, 201, 127, 28, 94, + 221, 0, 143, 246, 0, 16, 175, 73, 26, 153, 191, 44, 55, 47, 197, 11, 17, 47, 44, 73, 2, 127, 36, 90, 239, 46, 255, 0, 175, 10, 255, 251, 32, 143, 8, 255, 48, 27, 195, 80, 79, 159, 144, 93, 55, 47, 239, 244, 0, 7, 253, 246, 74, 31, 32, 249, 30, 182, 27, 144, 43, 50, 221, 147, 51, 227, 155, 109, 47, 188, + 41, 2, 253, 80, 111, 143, 28, 239, 154, 109, 30, 250, 47, 255, 203, 156, 29, 164, 7, 27, 187, 158, 7, 30, 160, 16, 3, 35, 91, 255, 233, 127, 167, 109, 31, 126, 85, 82, 211, 251, 170, 112, 31, 255, 248, 58, 31, 171, 28, 11, 0, 22, 31, 112, 222, 196, 38, 206, 187, 178, 28, 251, 249, 0, 3, 44, 247, 9, 112, 255, + 2, 222, 255, 185, 239, 14, 255, 32, 223, 111, 47, 28, 253, 111, 251, 0, 2, 159, 117, 28, 66, 207, 253, 219, 47, 227, 176, 29, 106, 241, 122, 37, 66, 244, 104, 151, 32, 31, 243, 247, 47, 107, 223, 216, 48, 39, 81, 15, 251, 0, 5, 127, 174, 246, 31, 6, 240, 190, 186, 7, 253, 96, 31, 255, 141, 253, 47, 149, 16, 222, + 46, 123, 109, 147, 44, 31, 15, 215, 255, 7, 27, 147, 13, 19, 207, 47, 80, 79, 255, 249, 111, 241, 95, 247, 127, 128, 127, 221, 245, 111, 28, 167, 47, 222, 223, 102, 48, 102, 151, 142, 20, 56, 22, 18, 199, 46, 39, 32, 250, 120, 254, 151, 1, 253, 16, 0, 8, 161, 28, 188, 87, 24, 226, 191, 31, 198, 191, 31, 158, 223, + 239, 240, 27, 64, 3, 32, 11, 28, 222, 223, 245, 72, 67, 0, 244, 243, 4, 87, 137, 243, 17, 46, 32, 3, 241, 7, 202, 101, 50, 38, 216, 38, 220, 223, 30, 95, 223, 28, 72, 246, 239, 252, 188, 200, 94, 227, 219, 255, 98, 71, 85, 31, 242, 5, 31, 243, 2, 21, 148, 1, 21, 152, 49, 84, 80, 7, 1, 29, 38, 2, + 29, 18, 3, 29, 22, 31, 172, 243, 252, 4, 255, 231, 23, 42, 37, 27, 201, 152, 93, 28, 172, 255, 64, 3, 185, 171, 8, 29, 95, 124, 243, 255, 144, 1, 12, 31, 47, 45, 58, 127, 255, 159, 98, 120, 15, 44, 4, 31, 255, 33, 17, 72, 173, 239, 31, 76, 9, 29, 119, 0, 239, 46, 233, 247, 255, 217, 16, 159, 247, 255, + 128, 175, 247, 252, 255, 80, 207, 246, 16, 1, 46, 253, 7, 252, 44, 127, 29, 106, 255, 2, 239, 175, 253, 0, 72, 179, 31, 204, 248, 0, 31, 29, 30, 18, 63, 176, 12, 252, 255, 159, 32, 111, 255, 3, 18, 158, 40, 236, 50, 30, 248, 30, 211, 248, 93, 31, 253, 19, 95, 7, 37, 202, 127, 44, 147, 254, 149, 16, 95, 255, + 180, 1, 252, 223, 251, 255, 206, 255, 225, 31, 177, 33, 239, 233, 161, 255, 238, 44, 159, 207, 31, 250, 47, 36, 223, 77, 32, 7, 240, 80, 3, 45, 41, 254, 112, 31, 148, 14, 127, 31, 222, 127, 252, 159, 250, 239, 243, 6, 253, 242, 143, 176, 0, 16, 4, 69, 209, 2, 226, 98, 36, 106, 54, 38, 31, 67, 68, 58, 127, 23, + 140, 219, 207, 249, 33, 224, 230, 6, 49, 67, 174, 255, 241, 15, 255, 1, 142, 35, 64, 41, 166, 80, 3, 15, 96, 41, 178, 233, 81, 30, 141, 18, 139, 46, 206, 20, 120, 56, 151, 78, 61, 251, 32, 95, 199, 31, 247, 255, 254, 80, 22, 139, 193, 254, 203, 20, 87, 30, 206, 46, 40, 34, 102, 34, 106, 32, 93, 29, 17, 48, + 31, 186, 83, 87, 191, 7, 31, 7, 19, 245, 0, 155, 223, 253, 31, 207, 253, 14, 222, 1, 39, 226, 207, 0, 174, 31, 247, 24, 159, 21, 70, 146, 51, 227, 222, 175, 242, 64, 191, 31, 255, 220, 96, 31, 240, 247, 176, 0, 41, 189, 108, 174, 7, 255, 64, 171, 63, 19, 239, 63, 19, 63, 63, 31, 45, 95, 255, 245, 209, 0, + 111, 183, 31, 129, 1, 25, 96, 14, 217, 200, 142, 24, 105, 0, 0, 160, 3, 31, 136, 2, 250, 248, 0, 10, 239, 245, 30, 80, 240, 24, 108, 110, 64, 189, 5, 54, 81, 3, 111, 124, 246, 22, 85, 187, 251, 51, 186, 255, 233, 32, 38, 97, 153, 119, 85, 28, 31, 1, 31, 202, 13, 30, 239, 14, 31, 221, 4, 191, 244, 64, + 83, 22, 255, 235, 189, 255, 117, 201, 85, 48, 58, 63, 19, 43, 0, 31, 193, 60, 75, 191, 88, 28, 19, 223, 22, 200, 255, 255, 31, 69, 20, 196, 85, 71, 190, 12, 31, 203, 14, 0, 40, 236, 63, 16, 222, 255, 175, 207, 255, 253, 159, 143, 253, 112, 255, 175, 255, 112, 159, 244, 255, 64, 95, 255, 245, 255, 16, 79, 247, 254, + 0, 63, 255, 247, 251, 0, 79, 246, 248, 0, 111, 253, 245, 246, 0, 159, 243, 243, 33, 239, 175, 238, 255, 160, 189, 82, 207, 171, 169, 223, 30, 255, 175, 127, 31, 150, 95, 31, 41, 143, 244, 8, 86, 36, 37, 145, 78, 167, 241, 84, 191, 31, 22, 108, 16, 222, 47, 47, 126, 18, 103, 255, 233, 0, 175, 243, 11, 21, 43, 239, + 1, 0, 207, 50, 58, 10, 194, 255, 224, 255, 127, 248, 255, 208, 223, 244, 255, 211, 255, 255, 17, 255, 183, 255, 255, 234, 153, 191, 207, 23, 70, 255, 6, 207, 255, 217, 177, 255, 14, 255, 66, 245, 8, 255, 139, 242, 255, 4, 255, 182, 208, 3, 255, 176, 115, 189, 106, 31, 43, 64, 0, 223, 248, 77, 67, 223, 119, 21, 186, 223, + 255, 177, 31, 128, 254, 0, 191, 127, 30, 51, 191, 3, 192, 0, 159, 241, 1, 243, 35, 54, 241, 127, 19, 243, 32, 3, 73, 152, 169, 120, 18, 172, 1, 21, 157, 3, 32, 3, 31, 206, 3, 245, 255, 250, 205, 254, 95, 163, 218, 50, 55, 208, 85, 192, 3, 52, 30, 30, 133, 26, 201, 23, 23, 248, 9, 200, 255, 128, 31, 230, + 36, 194, 64, 19, 207, 34, 71, 77, 63, 118, 26, 171, 112, 0, 29, 106, 19, 2, 141, 188, 126, 94, 31, 89, 31, 29, 195, 191, 255, 135, 121, 108, 11, 255, 8, 255, 245, 49, 1, 255, 252, 16, 95, 26, 227, 252, 30, 95, 240, 1, 175, 255, 128, 115, 65, 212, 144, 0, 252, 74, 118, 22, 223, 56, 223, 146, 187, 15, 255, 5, + 41, 181, 144, 80, 3, 15, 255, 16, 31, 98, 67, 171, 85, 13, 126, 5, 255, 72, 209, 71, 15, 70, 3, 247, 1, 170, 159, 27, 203, 1, 41, 71, 2, 15, 255, 2, 244, 27, 180, 79, 26, 231, 24, 14, 95, 6, 30, 158, 251, 187, 186, 116, 77, 15, 161, 7, 95, 39, 155, 31, 223, 0, 66, 15, 255, 4, 72, 174, 195, 14, + 87, 12, 5, 26, 108, 0, 23, 190, 10, 231, 7, 118, 61, 127, 220, 185, 118, 15, 191, 7, 254, 200, 0, 122, 6, 106, 79, 255, 37, 32, 13, 125, 43, 47, 31, 159, 45, 41, 200, 222, 20, 85, 15, 255, 3, 128, 0, 2, 82, 15, 57, 13, 149, 46, 44, 217, 0, 223, 10, 158, 39, 20, 35, 15, 225, 4, 250, 102, 23, 227, + 16, 157, 28, 57, 15, 159, 5, 53, 32, 63, 127, 191, 157, 15, 255, 6, 241, 1, 255, 176, 224, 3, 77, 41, 73, 67, 15, 224, 3, 24, 246, 192, 13, 22, 15, 1, 136, 85, 14, 165, 5, 0, 222, 13, 16, 94, 74, 16, 98, 29, 156, 2, 65, 4, 255, 24, 255, 255, 128, 11, 255, 254, 32, 228, 2, 103, 113, 15, 225, 6, + 43, 227, 91, 15, 254, 6, 27, 113, 204, 3, 181, 15, 63, 9, 39, 194, 51, 48, 3, 61, 9, 30, 99, 214, 10, 247, 15, 128, 41, 13, 110, 43, 0, 69, 15, 255, 5, 122, 20, 127, 234, 80, 85, 50, 15, 255, 4, 80, 15, 251, 51, 122, 131, 46, 0, 0, 25, 255, 16, 2, 255, 27, 238, 105, 21, 202, 253, 135, 175, 191, + 169, 19, 232, 29, 152, 11, 246, 254, 32, 0, 63, 30, 123, 207, 83, 31, 195, 39, 124, 71, 41, 43, 160, 85, 31, 30, 105, 255, 171, 205, 170, 162, 14, 95, 1, 108, 93, 115, 139, 47, 247, 32, 191, 31, 239, 17, 17, 222, 95, 252, 152, 118, 127, 253, 244, 19, 53, 191, 253, 174, 159, 51, 16, 0, 111, 187, 122, 32, 11, 137, + 153, 153, 155, 176, 31, 0, 80, 119, 236, 144, 0, 8, 16, 11, 13, 129, 24, 19, 27, 35, 189, 3, 239, 227, 187, 189, 221, 218, 111, 227, 49, 223, 223, 251, 132, 211, 5, 80, 10, 0, 79, 253, 241, 127, 32, 143, 245, 191, 19, 47, 255, 119, 44, 3, 10, 255, 167, 127, 127, 128, 10, 193, 255, 0, 240, 15, 247, 0, 229, 94, + 252, 175, 64, 31, 163, 245, 31, 167, 243, 114, 26, 254, 117, 15, 62, 0, 59, 112, 70, 55, 251, 159, 31, 91, 111, 219, 254, 100, 142, 218, 253, 48, 29, 83, 247, 155, 127, 90, 175, 254, 239, 250, 84, 20, 239, 245, 189, 4, 175, 255, 86, 119, 118, 66, 111, 255, 118, 249, 33, 35, 127, 255, 214, 23, 111, 223, 227, 194, 41, 31, + 74, 25, 168, 12, 38, 76, 254, 31, 200, 175, 30, 9, 121, 24, 89, 191, 255, 112, 7, 60, 32, 30, 235, 252, 119, 191, 90, 103, 119, 91, 123, 244, 251, 141, 196, 12, 46, 188, 38, 155, 95, 255, 47, 72, 253, 32, 86, 223, 42, 243, 94, 27, 199, 143, 162, 215, 1, 19, 52, 30, 58, 147, 255, 255, 255, 29, 219, 185, 154, 1, + 152, 231, 0, 41, 11, 26, 165, 111, 255, 85, 87, 119, 191, 119, 124, 83, 181, 72, 255, 255, 184, 156, 115, 190, 191, 153, 153, 152, 44, 19, 45, 219, 144, 146, 250, 17, 17, 0, 165, 65, 45, 71, 197, 175, 254, 74, 31, 251, 12, 40, 162, 31, 247, 4, 47, 251, 44, 229, 202, 181, 112, 31, 179, 253, 64, 30, 149, 160, 30, 14, + 16, 230, 8, 159, 119, 57, 185, 112, 191, 5, 243, 70, 46, 237, 239, 255, 64, 29, 79, 237, 223, 191, 63, 96, 20, 67, 235, 29, 67, 77, 79, 254, 47, 167, 242, 175, 144, 29, 186, 169, 231, 32, 60, 212, 30, 165, 250, 31, 220, 30, 44, 7, 170, 112, 143, 255, 102, 43, 235, 176, 77, 121, 111, 30, 144, 251, 7, 255, 117, 11, + 205, 159, 191, 108, 80, 87, 28, 7, 192, 31, 30, 144, 21, 211, 32, 0, 175, 4, 31, 73, 45, 164, 208, 222, 43, 232, 92, 223, 44, 47, 251, 222, 95, 235, 1, 51, 64, 20, 15, 160, 20, 19, 16, 8, 197, 135, 84, 26, 103, 68, 19, 30, 66, 9, 29, 240, 95, 235, 255, 119, 120, 109, 183, 111, 31, 165, 143, 254, 200, 153, + 151, 175, 255, 96, 227, 227, 6, 128, 29, 47, 231, 25, 37, 215, 84, 1, 30, 30, 4, 29, 40, 6, 255, 147, 117, 28, 175, 255, 252, 9, 47, 219, 176, 20, 160, 247, 253, 95, 255, 143, 253, 223, 251, 27, 254, 242, 255, 11, 255, 175, 176, 9, 255, 20, 48, 254, 9, 255, 16, 104, 74, 255, 19, 63, 253, 229, 216, 83, 23, 45, + 171, 35, 203, 191, 85, 111, 159, 87, 30, 245, 191, 46, 10, 192, 31, 197, 242, 0, 6, 186, 185, 46, 73, 249, 0, 108, 30, 187, 159, 30, 191, 219, 157, 219, 31, 240, 4, 247, 52, 253, 255, 255, 255, 117, 191, 254, 33, 36, 255, 252, 153, 126, 130, 158, 50, 16, 255, 247, 89, 207, 110, 163, 62, 83, 183, 52, 30, 254, 221, 203, + 187, 17, 18, 63, 85, 31, 162, 234, 46, 220, 229, 104, 71, 212, 65, 111, 185, 181, 146, 36, 195, 0, 13, 27, 246, 4, 31, 128, 4, 168, 5, 26, 195, 13, 29, 252, 95, 42, 211, 44, 15, 29, 73, 125, 29, 110, 0, 255, 221, 219, 80, 35, 199, 2, 255, 255, 83, 255, 3, 255, 51, 255, 5, 223, 255, 33, 16, 3, 32, 175, + 5, 255, 64, 247, 7, 2, 255, 210, 31, 159, 255, 201, 0, 191, 28, 31, 233, 9, 255, 0, 96, 11, 255, 247, 0, 250, 175, 252, 31, 247, 247, 0, 205, 191, 219, 47, 101, 57, 32, 154, 207, 255, 48, 111, 44, 231, 0, 63, 29, 54, 15, 255, 20, 0, 236, 10, 149, 9, 79, 69, 121, 172, 46, 133, 48, 3, 254, 0, 125, 255, + 79, 255, 192, 2, 43, 196, 123, 35, 143, 120, 0, 17, 51, 100, 227, 255, 237, 207, 203, 185, 47, 219, 28, 206, 63, 43, 255, 252, 255, 95, 0, 59, 243, 1, 51, 85, 149, 94, 36, 91, 252, 45, 79, 153, 255, 248, 97, 46, 124, 170, 249, 29, 161, 243, 30, 57, 0, 67, 235, 43, 111, 41, 63, 42, 58, 47, 146, 241, 0, 111, + 247, 249, 122, 196, 255, 250, 63, 111, 31, 151, 26, 42, 0, 31, 186, 48, 111, 85, 29, 192, 96, 46, 155, 5, 26, 163, 8, 58, 155, 80, 205, 7, 13, 28, 107, 26, 151, 14, 47, 26, 89, 79, 173, 250, 67, 227, 191, 31, 230, 239, 242, 67, 247, 255, 54, 30, 139, 31, 1, 0, 99, 47, 25, 191, 245, 56, 159, 247, 111, 255, + 252, 191, 31, 215, 79, 143, 250, 253, 0, 21, 63, 255, 251, 151, 45, 127, 0, 175, 23, 42, 23, 79, 32, 171, 255, 251, 17, 95, 255, 249, 247, 0, 127, 245, 132, 0, 57, 251, 194, 101, 85, 85, 85, 117, 167, 85, 85, 186, 67, 31, 247, 112, 19, 90, 63, 8, 240, 31, 16, 207, 224, 87, 28, 15, 30, 46, 16, 255, 253, 112, + 218, 0, 49, 127, 252, 40, 187, 29, 8, 255, 46, 140, 255, 0, 6, 254, 175, 0, 3, 96, 9, 44, 93, 215, 29, 207, 31, 29, 178, 4, 51, 35, 74, 29, 150, 70, 33, 187, 35, 36, 226, 17, 166, 19, 36, 5, 168, 34, 17, 175, 17, 46, 90, 191, 43, 103, 244, 0, 85, 207, 191, 250, 115, 35, 117, 175, 250, 51, 221, 144, + 91, 118, 158, 127, 31, 234, 143, 150, 35, 189, 160, 0, 141, 54, 28, 222, 54, 51, 47, 63, 139, 182, 47, 166, 160, 127, 31, 170, 243, 1, 234, 255, 247, 3, 0, 189, 159, 16, 3, 191, 244, 2, 0, 31, 232, 111, 125, 31, 244, 191, 254, 166, 68, 239, 47, 239, 192, 69, 93, 35, 176, 64, 11, 49, 51, 31, 255, 106, 43, 30, + 95, 85, 31, 46, 12, 30, 105, 10, 30, 60, 9, 30, 64, 11, 31, 30, 68, 46, 84, 67, 214, 0, 3, 191, 255, 229, 59, 47, 107, 46, 187, 4, 198, 42, 31, 23, 8, 255, 63, 53, 198, 114, 43, 83, 33, 32, 37, 85, 119, 175, 128, 28, 139, 144, 28, 143, 112, 1, 17, 17, 246, 48, 6, 217, 191, 70, 44, 221, 219, 28, + 175, 251, 0, 175, 253, 189, 239, 82, 59, 169, 36, 208, 85, 82, 43, 59, 212, 36, 161, 107, 91, 43, 38, 37, 243, 188, 113, 15, 255, 25, 9, 255, 222, 252, 30, 131, 27, 165, 167, 80, 22, 52, 112, 31, 95, 27, 173, 191, 247, 21, 27, 21, 4, 17, 139, 47, 103, 16, 239, 22, 108, 44, 14, 97, 30, 234, 31, 250, 75, 139, + 45, 181, 39, 227, 49, 147, 193, 127, 31, 6, 254, 2, 255, 175, 247, 4, 255, 203, 6, 208, 80, 211, 60, 249, 95, 31, 251, 159, 253, 74, 31, 232, 111, 29, 240, 17, 62, 8, 29, 58, 31, 30, 134, 254, 159, 254, 96, 0, 8, 246, 32, 90, 113, 94, 24, 222, 183, 108, 247, 239, 247, 35, 53, 20, 138, 223, 253, 127, 55, 127, + 85, 87, 14, 255, 232, 255, 83, 83, 51, 53, 159, 253, 202, 80, 127, 20, 142, 224, 2, 85, 103, 48, 0, 219, 191, 151, 35, 93, 128, 4, 119, 136, 16, 12, 245, 33, 19, 71, 223, 31, 223, 7, 30, 170, 10, 85, 31, 84, 11, 29, 138, 13, 31, 92, 12, 30, 235, 9, 111, 16, 206, 3, 253, 76, 95, 253, 255, 96, 63, 24, + 21, 80, 37, 84, 20, 193, 64, 14, 22, 118, 23, 156, 27, 115, 47, 17, 219, 30, 241, 73, 42, 223, 111, 23, 154, 187, 179, 223, 29, 162, 255, 29, 24, 132, 45, 171, 1, 223, 190, 253, 16, 247, 209, 223, 253, 150, 32, 49, 87, 247, 254, 221, 220, 96, 30, 198, 224, 252, 185, 255, 153, 80, 241, 20, 0, 0, 240, 239, 242, 229, + 0, 240, 207, 47, 49, 45, 229, 79, 23, 146, 181, 63, 80, 251, 1, 175, 31, 218, 79, 69, 11, 2, 126, 82, 0, 0, 0, 184, 119, 120, 155, 109, 223, 247, 253, 85, 84, 50, 38, 139, 240, 0, 11, 239, 131, 0, 143, 30, 157, 79, 253, 138, 206, 119, 109, 252, 223, 255, 66, 62, 56, 63, 254, 0, 218, 19, 207, 47, 253, 0, + 191, 29, 207, 175, 22, 251, 215, 63, 112, 200, 207, 71, 43, 29, 251, 1, 109, 159, 240, 31, 94, 16, 3, 254, 96, 173, 218, 80, 117, 76, 10, 40, 239, 195, 31, 163, 247, 31, 118, 167, 95, 45, 59, 159, 31, 240, 207, 242, 155, 48, 239, 173, 244, 20, 39, 208, 29, 16, 176, 61, 30, 74, 5, 106, 19, 234, 79, 255, 35, 248, + 7, 30, 195, 30, 19, 92, 213, 207, 250, 71, 19, 255, 24, 120, 255, 28, 23, 185, 125, 20, 20, 85, 85, 191, 249, 223, 95, 191, 104, 238, 155, 255, 235, 49, 109, 6, 255, 228, 22, 236, 107, 30, 221, 111, 255, 21, 139, 17, 110, 183, 187, 187, 223, 205, 223, 67, 179, 0, 31, 236, 187, 187, 31, 53, 191, 85, 171, 41, 47, 251, + 255, 221, 221, 195, 97, 46, 176, 254, 37, 20, 163, 20, 151, 32, 3, 31, 255, 63, 2, 33, 127, 31, 254, 33, 55, 32, 63, 33, 67, 84, 239, 1, 23, 44, 21, 38, 55, 59, 167, 31, 151, 95, 20, 205, 95, 21, 194, 77, 242, 220, 248, 206, 16, 31, 15, 30, 233, 95, 35, 123, 251, 249, 0, 17, 111, 252, 122, 31, 187, 191, + 245, 254, 153, 0, 31, 34, 176, 253, 127, 106, 51, 76, 30, 189, 255, 40, 242, 22, 20, 151, 96, 151, 247, 31, 208, 169, 6, 50, 64, 96, 27, 138, 48, 63, 179, 43, 211, 63, 239, 255, 140, 225, 24, 235, 245, 143, 254, 80, 95, 54, 164, 1, 22, 141, 1, 239, 233, 157, 8, 255, 255, 144, 13, 14, 255, 16, 15, 95, 238, 250, + 0, 47, 20, 114, 63, 37, 223, 38, 23, 250, 227, 0, 255, 252, 32, 42, 123, 0, 31, 250, 94, 37, 119, 0, 33, 185, 254, 101, 141, 48, 79, 95, 42, 46, 197, 41, 77, 207, 37, 97, 241, 28, 212, 224, 25, 186, 138, 248, 54, 39, 23, 84, 20, 43, 183, 24, 56, 101, 31, 235, 190, 255, 53, 7, 7, 255, 65, 207, 69, 18, + 183, 189, 149, 90, 167, 1, 76, 255, 50, 38, 84, 254, 191, 48, 23, 19, 96, 191, 19, 51, 0, 191, 44, 19, 7, 31, 253, 112, 37, 18, 0, 192, 50, 75, 29, 139, 45, 144, 3, 33, 89, 224, 15, 255, 19, 23, 152, 15, 65, 10, 64, 101, 14, 221, 15, 239, 248, 70, 61, 15, 8, 36, 3, 47, 159, 24, 74, 58, 71, 51, + 15, 159, 7, 24, 98, 51, 13, 132, 5, 227, 73, 30, 111, 14, 63, 8, 87, 116, 15, 159, 11, 79, 254, 16, 223, 215, 3, 210, 50, 119, 137, 15, 255, 2, 240, 10, 255, 241, 128, 240, 0, 93, 31, 135, 5, 65, 8, 30, 66, 175, 86, 15, 255, 6, 144, 22, 8, 16, 55, 191, 0, 56, 15, 159, 4, 178, 245, 54, 123, 171, + 165, 15, 229, 7, 35, 83, 174, 15, 223, 8, 253, 180, 9, 184, 64, 0, 12, 15, 255, 7, 80, 255, 223, 252, 255, 48, 223, 209, 71, 16, 153, 21, 15, 127, 5, 14, 65, 14, 2, 158, 15, 160, 10, 45, 227, 19, 215, 51, 51, 39, 91, 39, 15, 255, 2, 254, 184, 96, 23, 51, 191, 1, 133, 9, 42, 51, 26, 0, 223, 8, + 48, 0, 238, 141, 198, 15, 160, 9, 44, 2, 44, 6, 7, 119, 15, 132, 35, 11, 123, 29, 203, 1, 174, 236, 100, 15, 255, 9, 15, 239, 249, 144, 0, 5, 1, 16, 0, 255, 7, 58, 7, 4, 173, 85, 2, 254, 6, 191, 31, 223, 26, 238, 1, 191, 7, 117, 231, 255, 183, 200, 55, 120, 0, 64, 4, 153, 153, 36, 84, 31, + 99, 6, 47, 103, 118, 15, 255, 2, 160, 92, 219, 15, 255, 48, 61, 12, 159, 18, 20, 15, 1, 137, 188, 160, 22, 58, 16, 118, 22, 62, 0, 2, 99, 125, 163, 79, 225, 31, 255, 114, 46, 82, 255, 255, 195, 39, 91, 40, 155, 255, 73, 123, 85, 3, 149, 2, 52, 72, 35, 15, 127, 223, 4, 29, 220, 47, 186, 248, 85, 41, + 253, 118, 32, 31, 251, 242, 47, 99, 121, 175, 191, 20, 121, 171, 187, 39, 185, 25, 147, 188, 182, 20, 39, 114, 159, 245, 191, 222, 166, 0, 89, 163, 57, 30, 218, 26, 175, 3, 111, 247, 54, 139, 96, 114, 85, 111, 23, 249, 255, 15, 47, 215, 134, 83, 49, 53, 238, 86, 119, 153, 174, 159, 119, 120, 153, 124, 127, 189, 111, 30, + 68, 191, 254, 187, 187, 190, 191, 146, 76, 31, 46, 253, 70, 63, 60, 143, 205, 201, 44, 131, 149, 30, 201, 1, 204, 68, 11, 46, 147, 127, 31, 158, 31, 27, 4, 41, 142, 255, 29, 194, 3, 30, 191, 11, 28, 151, 30, 1, 48, 91, 16, 134, 176, 29, 121, 112, 79, 111, 255, 200, 35, 221, 85, 83, 127, 158, 168, 119, 191, 31, + 8, 13, 241, 252, 50, 0, 9, 175, 255, 26, 122, 73, 115, 16, 255, 3, 114, 255, 80, 14, 253, 255, 112, 95, 129, 63, 28, 29, 8, 143, 255, 80, 10, 127, 255, 255, 243, 13, 12, 255, 250, 9, 1, 231, 207, 176, 2, 60, 37, 99, 230, 70, 120, 151, 186, 239, 104, 127, 168, 117, 89, 42, 152, 4, 149, 220, 147, 81, 45, 67, + 47, 19, 247, 64, 231, 41, 189, 14, 255, 123, 197, 210, 3, 140, 255, 178, 26, 144, 254, 191, 250, 254, 207, 255, 153, 32, 50, 147, 255, 174, 188, 90, 31, 235, 29, 30, 170, 223, 160, 26, 252, 224, 29, 231, 237, 240, 7, 255, 113, 160, 154, 0, 71, 27, 255, 148, 194, 31, 247, 26, 1, 125, 47, 71, 175, 45, 104, 180, 140, 150, + 88, 74, 63, 60, 239, 132, 223, 27, 17, 172, 96, 192, 244, 237, 187, 188, 33, 46, 104, 225, 212, 107, 59, 199, 137, 193, 31, 195, 47, 191, 28, 253, 79, 160, 158, 255, 20, 127, 15, 88, 119, 5, 87, 4, 91, 231, 0, 1, 211, 2, 83, 0, 5, 234, 223, 255, 228, 29, 126, 254, 60, 159, 130, 43, 195, 188, 11, 91, 199, 2, + 94, 0, 124, 31, 131, 28, 121, 254, 16, 175, 222, 249, 96, 33, 12, 30, 97, 255, 5, 255, 112, 2, 97, 94, 64, 12, 253, 254, 48, 255, 237, 221, 182, 78, 207, 222, 127, 44, 236, 223, 80, 7, 64, 175, 240, 191, 238, 241, 207, 68, 26, 146, 13, 255, 128, 26, 163, 207, 12, 169, 34, 183, 35, 169, 248, 0, 171, 222, 171, 247, + 31, 185, 244, 57, 253, 66, 28, 183, 5, 231, 246, 143, 255, 119, 64, 44, 45, 14, 255, 63, 211, 175, 249, 95, 28, 216, 77, 70, 133, 16, 0, 239, 173, 224, 30, 191, 128, 31, 5, 48, 3, 42, 253, 26, 239, 248, 120, 151, 27, 205, 255, 127, 255, 235, 186, 190, 30, 147, 0, 143, 245, 21, 159, 242, 30, 226, 82, 30, 97, 104, + 29, 8, 97, 29, 109, 25, 178, 4, 30, 194, 159, 7, 30, 215, 30, 85, 255, 255, 83, 51, 17, 251, 0, 44, 180, 139, 223, 58, 144, 255, 201, 205, 101, 255, 27, 196, 63, 134, 233, 153, 19, 227, 221, 247, 187, 111, 253, 17, 104, 103, 255, 111, 254, 253, 51, 52, 191, 255, 119, 112, 44, 31, 207, 253, 255, 221, 213, 187, 187, 184, + 63, 214, 202, 55, 27, 132, 19, 183, 0, 108, 26, 125, 0, 223, 243, 93, 57, 202, 2, 43, 44, 10, 255, 211, 31, 255, 96, 93, 28, 238, 221, 46, 44, 0, 1, 143, 38, 140, 239, 91, 41, 24, 0, 30, 170, 49, 17, 58, 219, 143, 255, 230, 252, 48, 175, 31, 162, 41, 191, 223, 246, 27, 18, 183, 243, 29, 248, 248, 117, 29, + 252, 255, 254, 103, 125, 31, 243, 230, 251, 187, 187, 102, 31, 130, 8, 123, 30, 197, 78, 255, 254, 222, 63, 66, 235, 222, 245, 255, 252, 255, 112, 28, 175, 112, 28, 187, 112, 170, 11, 64, 3, 64, 42, 36, 9, 27, 157, 8, 30, 92, 175, 7, 62, 96, 32, 69, 189, 0, 48, 123, 205, 223, 239, 80, 30, 49, 80, 191, 254, 221, + 112, 171, 32, 53, 82, 79, 46, 55, 95, 29, 187, 14, 255, 206, 49, 16, 61, 11, 60, 98, 251, 185, 239, 59, 127, 151, 242, 58, 243, 64, 3, 16, 28, 246, 16, 0, 93, 107, 30, 178, 14, 255, 133, 157, 44, 31, 22, 127, 245, 255, 4, 255, 127, 246, 12, 254, 95, 247, 255, 111, 248, 95, 247, 143, 255, 79, 249, 255, 8, 255, + 63, 249, 0, 239, 63, 250, 255, 0, 191, 224, 79, 255, 96, 130, 239, 191, 249, 22, 45, 212, 87, 28, 253, 191, 255, 237, 48, 131, 159, 31, 38, 105, 134, 30, 34, 4, 79, 31, 145, 47, 30, 88, 31, 24, 62, 255, 120, 153, 207, 81, 217, 17, 249, 28, 43, 242, 0, 84, 51, 255, 19, 16, 80, 0, 159, 224, 244, 1, 213, 255, + 240, 31, 210, 3, 31, 36, 8, 31, 239, 13, 84, 31, 243, 47, 92, 11, 159, 92, 15, 127, 59, 179, 47, 123, 30, 22, 232, 43, 238, 44, 63, 252, 0, 36, 87, 111, 227, 91, 62, 102, 143, 30, 245, 223, 248, 76, 188, 71, 64, 82, 23, 51, 97, 47, 27, 160, 44, 115, 31, 253, 95, 144, 3, 130, 63, 144, 3, 32, 107, 46, + 144, 75, 183, 96, 3, 112, 144, 3, 150, 96, 3, 255, 210, 46, 183, 111, 17, 64, 175, 248, 87, 193, 161, 242, 31, 97, 240, 29, 126, 30, 162, 50, 106, 28, 70, 175, 175, 99, 24, 198, 255, 44, 113, 0, 222, 219, 239, 253, 0, 16, 1, 255, 190, 16, 20, 45, 80, 157, 31, 19, 47, 31, 220, 250, 85, 84, 126, 219, 153, 239, + 135, 119, 255, 25, 175, 255, 255, 232, 16, 207, 123, 255, 37, 228, 50, 77, 254, 160, 0, 31, 213, 252, 192, 30, 212, 16, 54, 89, 111, 39, 35, 250, 245, 32, 0, 143, 244, 20, 115, 242, 31, 220, 242, 251, 6, 255, 147, 16, 137, 31, 200, 255, 255, 187, 215, 25, 79, 255, 255, 156, 39, 155, 3, 106, 239, 223, 159, 243, 71, 230, + 95, 254, 135, 122, 189, 10, 39, 175, 90, 205, 220, 200, 22, 172, 255, 239, 255, 218, 98, 47, 196, 79, 247, 0, 5, 21, 46, 227, 20, 84, 49, 187, 146, 159, 32, 233, 29, 125, 255, 238, 250, 66, 16, 22, 179, 255, 5, 190, 46, 175, 254, 19, 53, 57, 187, 187, 188, 95, 31, 253, 255, 57, 153, 153, 151, 51, 85, 87, 119, 94, + 31, 181, 20, 111, 151, 143, 255, 83, 67, 103, 35, 255, 143, 255, 85, 51, 143, 255, 169, 153, 190, 142, 31, 27, 255, 252, 16, 0, 235, 30, 51, 23, 29, 119, 62, 115, 39, 246, 49, 31, 216, 155, 187, 164, 20, 23, 165, 31, 7, 48, 3, 238, 19, 251, 3, 94, 183, 96, 7, 94, 46, 250, 211, 40, 198, 255, 249, 153, 52, 30, + 183, 95, 36, 166, 3, 30, 191, 2, 255, 241, 2, 112, 253, 239, 254, 239, 208, 159, 160, 21, 112, 144, 127, 30, 104, 128, 143, 249, 94, 112, 191, 241, 255, 10, 128, 191, 244, 10, 176, 111, 255, 218, 143, 242, 26, 152, 254, 119, 44, 25, 6, 30, 178, 45, 41, 108, 31, 175, 48, 25, 152, 48, 3, 33, 24, 255, 218, 253, 64, 16, + 7, 244, 3, 21, 139, 3, 26, 158, 255, 46, 255, 144, 1, 239, 254, 160, 13, 255, 255, 227, 176, 191, 255, 64, 181, 255, 255, 245, 86, 192, 111, 96, 159, 208, 2, 254, 0, 127, 254, 191, 244, 0, 226, 25, 39, 158, 32, 41, 43, 41, 47, 207, 243, 0, 88, 30, 130, 43, 24, 127, 23, 135, 16, 17, 153, 0, 127, 42, 63, 251, + 23, 64, 3, 30, 219, 63, 86, 127, 31, 43, 47, 251, 0, 249, 239, 31, 253, 108, 255, 31, 11, 32, 3, 229, 248, 15, 254, 84, 0, 15, 31, 148, 32, 55, 47, 43, 255, 243, 7, 161, 47, 224, 15, 249, 15, 244, 96, 14, 254, 11, 30, 191, 101, 26, 59, 30, 118, 187, 201, 31, 109, 18, 51, 0, 31, 51, 249, 6, 255, 255, + 192, 254, 11, 255, 96, 255, 94, 249, 255, 16, 197, 63, 252, 64, 84, 31, 56, 85, 229, 255, 248, 80, 40, 138, 31, 255, 10, 158, 166, 18, 55, 43, 144, 113, 83, 3, 33, 24, 43, 202, 135, 1, 119, 111, 195, 69, 85, 85, 111, 227, 221, 187, 187, 179, 153, 47, 220, 85, 105, 42, 171, 39, 232, 15, 255, 215, 84, 0, 25, 82, + 128, 26, 29, 176, 175, 254, 245, 152, 16, 239, 251, 21, 160, 247, 47, 128, 96, 105, 64, 3, 13, 64, 69, 43, 7, 87, 251, 45, 243, 175, 44, 52, 83, 29, 2, 221, 94, 232, 203, 16, 87, 251, 36, 115, 151, 208, 7, 255, 210, 44, 159, 9, 12, 159, 8, 48, 159, 252, 171, 197, 59, 104, 1, 15, 2, 4, 41, 44, 43, 25, + 255, 125, 13, 195, 6, 240, 0, 159, 243, 128, 16, 3, 16, 229, 0, 71, 113, 15, 162, 6, 15, 160, 10, 72, 36, 119, 0, 172, 54, 14, 255, 8, 96, 55, 4, 7, 38, 30, 201, 14, 159, 6, 119, 46, 163, 51, 50, 17, 14, 191, 7, 255, 221, 221, 190, 221, 15, 95, 8, 254, 0, 203, 187, 182, 15, 35, 10, 95, 47, 251, + 11, 15, 159, 8, 208, 30, 255, 254, 128, 231, 2, 35, 48, 15, 63, 8, 24, 151, 146, 2, 85, 191, 64, 15, 223, 4, 242, 1, 255, 88, 176, 1, 72, 45, 255, 85, 15, 255, 2, 24, 246, 23, 34, 166, 0, 61, 4, 30, 63, 171, 112, 15, 222, 12, 143, 27, 239, 127, 29, 183, 6, 80, 14, 15, 255, 4, 109, 165, 15, 94, + 7, 38, 19, 223, 237, 187, 15, 191, 8, 253, 255, 254, 153, 152, 119, 114, 11, 73, 71, 7, 81, 30, 35, 9, 40, 33, 0, 15, 161, 5, 205, 67, 239, 255, 238, 158, 64, 11, 227, 213, 15, 255, 5, 67, 87, 68, 72, 83, 130, 95, 62, 139, 9, 30, 114, 20, 21, 0, 18, 19, 122, 32, 2, 19, 20, 0, 15, 22, 34, 16, + 32, 14, 255, 6, 7, 0, 17, 18, 0, 14, 15, 224, 0, 23, 24, 80, 26, 16, 35, 16, 41, 160, 35, 16, 53, 223, 24, 25, 32, 38, 19, 20, 1, 13, 15, 127, 16, 50, 2, 22, 27, 1, 9, 13, 1, 193, 12, 14, 16, 2, 32, 26, 16, 29, 16, 62, 16, 65, 25, 155, 26, 32, 2, 16, 44, 22, 23, 80, 5, 21, + 22, 1, 32, 20, 16, 14, 64, 23, 64, 32, 112, 11, 16, 116, 16, 89, 26, 128, 27, 128, 26, 112, 68, 16, 20, 112, 32, 112, 59, 160, 11, 160, 74, 127, 160, 68, 22, 23, 2, 5, 9, 67, 77, 178, 65, 27, 217, 1, 88, 56, 235, 100, 65, 80, 59, 82, 171, 65, 30, 209, 66, 20, 85, 67, 28, 119, 68, 0, 255, 4, + 0, 69, 0, 5, 0, 70, 0, 234, 6, 0, 72, 31, 87, 73, 26, 177, 75, 31, 157, 174, 76, 22, 189, 77, 19, 253, 78, 0, 12, 17, 63, 174, 13, 16, 57, 14, 31, 74, 15, 0, 82, 31, 240, 251, 83, 0, 17, 0, 84, 22, 209, 85, 0, 255, 19, 0, 86, 0, 20, 0, 87, 0, 255, 21, 0, 88, 0, 22, 0, 89, + 0, 191, 23, 26, 147, 24, 0, 105, 0, 25, 32, 255, 38, 0, 26, 48, 2, 0, 27, 48, 255, 10, 0, 28, 48, 11, 0, 29, 78, 255, 13, 0, 30, 78, 59, 0, 31, 78, 255, 102, 0, 32, 78, 142, 0, 33, 79, 255, 127, 0, 34, 79, 221, 0, 35, 81, 255, 73, 0, 36, 81, 101, 0, 37, 81, 255, 115, 0, 38, 81, + 146, 0, 39, 82, 255, 155, 0, 40, 83, 214, 0, 41, 84, 255, 47, 0, 42, 87, 40, 0, 43, 89, 255, 39, 0, 44, 91, 88, 0, 45, 96, 255, 197, 0, 46, 98, 15, 0, 47, 98, 255, 22, 0, 48, 99, 210, 0, 49, 101, 255, 224, 0, 50, 102, 14, 0, 51, 103, 255, 58, 0, 52, 103, 229, 0, 53, 104, 255, 173, 0, + 54, 107, 39, 0, 55, 107, 255, 99, 0, 56, 108, 179, 0, 57, 108, 255, 213, 0, 58, 110, 56, 0, 59, 110, 255, 144, 0, 60, 117, 40, 0, 61, 117, 255, 53, 0, 62, 118, 132, 0, 63, 119, 255, 11, 0, 64, 120, 159, 0, 65, 122, 255, 127, 0, 66, 126, 167, 0, 67, 137, 255, 129, 0, 68, 139, 230, 0, 69, 139, 255, + 244, 0, 70, 139, 247, 0, 71, 139, 255, 251, 0, 72, 141, 133, 0, 73, 145, 255, 205, 0, 74, 148, 246, 0, 75, 149, 255, 237, 0, 76, 150, 105, 0, 77, 154, 160, 108, 28, 189, 1, 66, 73, 79, 249, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, + 3, 224, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 3, 224, 254, 0, 0, 0, 32, 0, 0, 1, 16, 6, 203, 2, 192, 64, 3, 112, 1, 1, 64, 27, 0, 5, 93, 16, 35, 64, 80, 3, 192, 0, 5, 32, 43, 0, 251, 0, 82, 79, 79, 84, 32, 27, 112, 143, 63, 48, 31, 0, 2, 1, 133, + 53, 17, 0, 0, 14, 90, 80, 74, 128, 64, 81, 226, 226, 16, 19, 26, 80, 15, 186, 160, 48, 107, 2, 207, 45, 16, 39, 40, 16, 127, 190, 32, 96, 19, 255, 255, 0, 46, 2, 128, 136, 172, 16, 80, 19, 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 0, 3, 10, 46, 0, 46, 46, 0, 107, 114, 255, 107, 111, 114, 101, + 97, 110, 0, 109, 255, 101, 115, 115, 97, 103, 101, 46, 98, 223, 109, 103, 96, 11, 105, 100, 46, 116, 98, 255, 108, 0, 115, 116, 114, 117, 99, 116, 61, 48, 10, 176, 198, 77, 69, 83, 71, 16, 45, 49, 110, 80, 187, 2, 2, 208, 228, 73, 78, 70, 16, 27, 252, 0, 96, 0, 6, 0, 12, 49, 62, 113, 56, 85, 48, 159, + 2, 144, 11, 44, 144, 23, 86, 144, 35, 174, 79, 144, 47, 196, 144, 59, 49, 130, 68, 65, 84, 49, 127, 65, 151, 194, 136, 211, 124, 0, 32, 185, 251, 200, 185, 172, 198, 36, 17, 171, 87, 0, 255, 105, 0, 105, 185, 124, 0, 10, 177, 255, 35, 197, 180, 0, 32, 200, 252, 194, 235, 237, 194, 220, 16, 25, 46, 0, 41, 26, + 181, 20, 247, 194, 164, 208, 108, 16, 69, 32, 189, 136, 255, 183, 236, 198, 36, 201, 192, 0, 32, 255, 186, 187, 213, 136, 194, 181, 178, 200, 223, 178, 228, 17, 60, 10, 199, 144, 193, 56, 255, 213, 92, 0, 32, 176, 180, 198, 169, 254, 199, 64, 0, 10, 188, 248, 204, 16, 109, 255, 192, 172, 198, 169, 193, 36, 186, 133, 219, 193, + 28, 32, 59, 199, 125, 0, 129, 18, 0, 0, 254, 199, 64, 213, 88, 172, 196, 184, 16, 77, 255, 181, 160, 176, 152, 178, 148, 0, 32, 255, 179, 0, 186, 168, 213, 216, 0, 33, 79, 1, 197, 11, 6, 81, 71, 18, 27, 0, 8, 33, 157, 223, 67, 98, 49, 251, 4, 0, 6, 4, 56, 212, 56, 178, 82, 7, 0, 210, 175, 8, + 81, 123, 34, 51, 171, 3, 18, 219, 24, 18, 223, 4, 146, 199, 43, 67, 255, 79, 77, 77, 69, 78, 84, 0, 68, 253, 73, 83, 67, 95, 48, 49, 80, 7, 50, 127, 80, 15, 51, 0, 84, 73, 84, 76, 69, 251, 95, 77, 65, 73, 78, 80, 10, 83, 85, 229, 66, 0, 64, 0, 0, 0, 144, 111, 112, 35, 67, 174, 239, 55, + 113, 97, 96, 147, 28, 19, 62, 141, 124, 80, 171, 0, 190, 198, 20, 162, 50, 179, 16, 153, 247, 100, 67, 164, 76, 50, 191, 12, 0, 0, 243, 19, 54, 175, 66, 50, 203, 18, 221, 137, 230, 191, 39, 66, 215, 20, 0, 0, 251, 104, 17, 158, 53, 50, 227, 16, 185, 23, 177, 123, 254, 50, 239, 170, 28, 115, 149, 4, 81, 23, + 7, 80, 235, 9, 19, 191, 160, 10, 19, 195, 11, 224, 162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, 122, 48, 0, 0, 163, 192, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 163, 192, 243, 0, 0, + 0, 32, 16, 3, 16, 7, 162, 224, 42, 64, 3, 112, 1, 1, 80, 27, 3, 16, 35, 64, 80, 3, 239, 128, 0, 3, 32, 22, 0, 0, 82, 79, 220, 79, 84, 16, 59, 5, 198, 97, 48, 31, 0, 2, 1, 253, 67, 212, 17, 0, 0, 18, 64, 79, 162, 190, 220, 32, 87, 255, 255, 0, 46, 2, 128, 96, 172, 16, 80, 19, + 184, 16, 19, 2, 255, 16, 0, 96, 19, 127, 32, 131, 46, 0, 46, 46, 0, 101, 109, 255, 98, 101, 100, 100, 101, 100, 102, 111, 255, 110, 116, 0, 109, 101, 115, 115, 97, 223, 103, 101, 32, 11, 50, 54, 46, 98, 114, 159, 102, 16, 19, 0, 0, 8, 82, 70, 78, 84, 254, 239, 255, 1, 4, 48, 123, 16, 0, 4, 70, 237, + 73, 78, 70, 32, 235, 1, 33, 16, 241, 27, 191, 27, 32, 219, 56, 0, 0, 160, 104, 0, 255, 0, 161, 120, 33, 27, 26, 0, 84, 239, 71, 76, 80, 16, 15, 48, 26, 27, 22, 169, 26, 48, 154, 10, 49, 1, 9, 16, 49, 33, 18, 96, 159, 0, 0, 0, 255, 1, 17, 240, 7, 255, 251, 0, 6, 117, 16, 3, 5, 255, + 250, 16, 3, 249, 48, 3, 3, 75, 48, 3, 247, 2, 46, 79, 32, 99, 2, 16, 103, 1, 255, 174, 246, 16, 3, 245, 48, 3, 0, 221, 212, 67, 190, 215, 124, 177, 0, 251, 83, 13, 19, 208, 10, 255, 253, 243, 0, 0, 158, 228, 3, 30, 255, 4, 47, 87, 4, 32, 247, 0, 3, 239, 243, 17, 139, 251, 0, 14, 127, 17, + 139, 6, 255, 248, 0, 0, 39, 80, 85, 4, 174, 222, 8, 22, 199, 79, 22, 203, 223, 35, 149, 0, 255, 0, 31, 255, 0, 39, 97, 0, 9, 254, 255, 254, 64, 191, 255, 255, 242, 22, 91, 235, 252, 255, 253, 22, 97, 192, 16, 13, 48, 79, 101, 19, 169, 14, 255, 230, 179, 38, 224, 176, 23, 12, 241, 45, 23, 16, 3, 189, + 20, 143, 22, 175, 239, 255, 20, 0, 255, 213, 0, 12, 20, 0, 47, 20, 0, 127, 22, 225, 207, 254, 255, 175, 1, 255, 255, 79, 241, 19, 25, 167, 128, 20, 25, 16, 22, 218, 23, 99, 239, 103, 155, 220, 222, 255, 128, 0, 253, 207, 252, 39, 15, 39, 19, 105, 23, 89, 255, 184, 23, 27, 254, 55, 31, 23, 35, 16, 159, 0, + 35, 202, 6, 111, 14, 5, 255, 255, 7, 9, 109, 20, 127, 9, 239, 17, 239, 2, 82, 247, 130, 117, 234, 49, 0, 31, 23, 219, 15, 23, 223, 13, 87, 195, 115, 183, 166, 255, 243, 0, 48, 103, 36, 170, 33, 16, 126, 6, 221, 50, 19, 86, 4, 190, 255, 255, 17, 14, 206, 255, 2, 71, 203, 184, 22, 119, 117, 65, 23, 255, + 202, 255, 232, 97, 4, 7, 186, 6, 209, 24, 144, 250, 7, 108, 18, 250, 255, 202, 118, 0, 35, 21, 128, 2, 21, 132, 151, 1, 20, 132, 96, 3, 0, 48, 3, 254, 84, 69, 191, 141, 24, 79, 9, 255, 0, 4, 207, 255, 255, 22, 223, 255, 254, 175, 255, 254, 129, 251, 143, 255, 234, 97, 111, 24, 104, 41, 189, 50, 72, 108, + 20, 185, 0, 244, 25, 0, 163, 45, 128, 25, 16, 141, 249, 7, 236, 19, 65, 173, 50, 3, 0, 223, 144, 3, 207, 126, 24, 199, 121, 135, 0, 0, 24, 255, 66, 143, 247, 42, 255, 54, 140, 113, 250, 250, 255, 255, 233, 183, 32, 100, 25, 113, 255, 32, 3, 24, 113, 255, 165, 48, 64, 135, 226, 168, 252, 8, 108, 152, 59, 49, + 99, 0, 187, 191, 38, 8, 255, 0, 95, 22, 12, 223, 255, 255, 209, 3, 255, 255, 64, 20, 119, 100, 93, 33, 239, 251, 98, 244, 251, 134, 140, 32, 234, 60, 76, 170, 43, 48, 81, 235, 19, 36, 0, 246, 74, 132, 58, 140, 85, 9, 107, 18, 9, 22, 119, 12, 20, 235, 14, 22, 251, 15, 95, 48, 3, 247, 19, 134, 253, 0, + 8, 255, 255, 207, 177, 1, 2, 95, 9, 26, 239, 22, 184, 120, 173, 67, 2, 127, 7, 197, 82, 23, 9, 239, 15, 35, 235, 35, 251, 0, 41, 167, 239, 27, 67, 2, 2, 29, 0, 115, 238, 254, 87, 119, 158, 100, 243, 97, 51, 247, 112, 0, 0, 146, 10, 88, 55, 242, 19, 87, 4, 174, 20, 20, 27, 72, 3, 3, 127, 2, + 37, 27, 173, 21, 6, 96, 32, 143, 3, 127, 10, 96, 2, 255, 22, 254, 212, 185, 134, 19, 127, 255, 24, 240, 255, 24, 132, 128, 3, 109, 84, 197, 51, 88, 35, 19, 5, 239, 27, 228, 63, 42, 43, 77, 27, 236, 6, 18, 234, 5, 18, 238, 8, 18, 242, 186, 13, 21, 28, 0, 255, 242, 28, 19, 249, 83, 177, 69, 96, 57, + 253, 64, 19, 3, 127, 20, 227, 123, 191, 80, 3, 87, 183, 118, 28, 176, 111, 80, 25, 157, 80, 2, 191, 239, 255, 185, 223, 117, 122, 179, 255, 253, 130, 204, 0, 83, 44, 139, 19, 248, 255, 208, 69, 127, 23, 49, 223, 0, 112, 11, 224, 157, 1, 51, 85, 103, 9, 158, 255, 65, 239, 33, 243, 5, 207, 234, 151, 22, 131, 239, + 210, 0, 159, 16, 213, 239, 255, 181, 121, 213, 155, 188, 33, 235, 128, 29, 87, 144, 32, 3, 118, 220, 85, 51, 125, 91, 87, 120, 152, 12, 206, 47, 45, 176, 255, 6, 255, 254, 223, 9, 255, 250, 223, 250, 12, 255, 247, 101, 13, 51, 135, 243, 48, 3, 243, 14, 255, 252, 85, 45, 206, 96, 3, 84, 51, 185, 17, 168, 176, 133, + 87, 172, 1, 225, 20, 13, 115, 10, 10, 90, 98, 231, 77, 46, 55, 54, 119, 3, 127, 1, 252, 71, 112, 247, 252, 132, 117, 66, 13, 189, 80, 2, 52, 85, 167, 103, 32, 147, 9, 80, 3, 239, 19, 120, 153, 171, 169, 181, 30, 227, 247, 30, 231, 249, 32, 3, 14, 79, 46, 6, 248, 153, 135, 118, 0, 13, 27, 240, 37, 0, + 33, 124, 171, 13, 24, 65, 12, 31, 97, 11, 48, 3, 254, 85, 222, 67, 50, 183, 213, 221, 221, 221, 48, 31, 99, 21, 48, 3, 32, 11, 14, 207, 47, 11, 28, 240, 9, 112, 3, 250, 93, 21, 120, 251, 61, 16, 7, 255, 234, 15, 43, 227, 17, 253, 52, 48, 0, 175, 255, 144, 19, 127, 176, 81, 26, 26, 176, 15, 255, 1, + 37, 38, 53, 42, 56, 31, 255, 159, 85, 239, 255, 67, 40, 19, 176, 80, 3, 160, 6, 127, 19, 208, 223, 0, 111, 20, 193, 95, 255, 240, 0, 79, 253, 255, 240, 4, 159, 255, 252, 36, 15, 8, 23, 84, 19, 80, 99, 32, 103, 175, 16, 156, 191, 222, 255, 171, 251, 27, 10, 252, 27, 14, 253, 27, 18, 219, 223, 81, 16, 169, + 0, 112, 3, 128, 70, 139, 160, 3, 14, 127, 15, 127, 40, 30, 228, 66, 119, 247, 18, 115, 247, 82, 15, 34, 7, 17, 255, 228, 16, 0, 17, 59, 139, 112, 3, 239, 106, 238, 34, 138, 86, 58, 127, 80, 208, 3, 64, 73, 11, 239, 48, 5, 127, 149, 210, 17, 50, 51, 2, 11, 31, 255, 32, 3, 10, 43, 139, 197, 255, 252, + 56, 151, 40, 155, 15, 127, 80, 253, 31, 131, 254, 85, 31, 135, 255, 48, 3, 5, 64, 3, 16, 32, 3, 4, 23, 44, 68, 15, 255, 77, 25, 227, 32, 25, 231, 48, 3, 255, 186, 221, 1, 177, 115, 3, 69, 82, 50, 138, 13, 29, 221, 155, 12, 8, 64, 4, 27, 105, 45, 248, 31, 44, 255, 0, 170, 78, 12, 127, 8, 177, + 31, 255, 227, 4, 254, 21, 11, 29, 246, 95, 29, 131, 4, 29, 135, 63, 8, 255, 253, 239, 26, 119, 139, 30, 112, 17, 131, 252, 79, 55, 123, 246, 29, 219, 237, 64, 0, 255, 16, 84, 254, 32, 74, 231, 252, 170, 32, 11, 235, 48, 5, 64, 103, 207, 27, 107, 23, 33, 135, 84, 29, 115, 48, 30, 119, 80, 30, 123, 96, 44, + 72, 27, 26, 89, 30, 79, 228, 45, 115, 161, 44, 26, 131, 62, 155, 3, 98, 44, 167, 11, 245, 91, 122, 127, 255, 44, 255, 225, 224, 20, 101, 15, 255, 142, 5, 49, 26, 89, 25, 197, 143, 20, 255, 207, 114, 21, 115, 255, 255, 112, 44, 119, 47, 142, 8, 47, 76, 9, 13, 75, 77, 35, 247, 34, 103, 36, 254, 15, 17, 227, + 76, 131, 245, 91, 28, 143, 248, 26, 220, 255, 151, 5, 57, 9, 0, 137, 213, 190, 255, 15, 112, 47, 9, 111, 103, 78, 8, 255, 7, 16, 121, 71, 239, 253, 48, 118, 83, 14, 88, 82, 41, 228, 239, 75, 76, 11, 4, 15, 223, 4, 45, 219, 64, 11, 107, 6, 66, 16, 36, 28, 74, 36, 211, 255, 33, 63, 9, 0, 17, 255, + 78, 115, 40, 243, 170, 15, 31, 206, 47, 62, 127, 239, 23, 123, 159, 23, 135, 154, 79, 39, 66, 27, 222, 0, 241, 79, 227, 4, 27, 227, 175, 11, 31, 239, 47, 30, 107, 175, 255, 96, 2, 181, 255, 16, 46, 16, 143, 20, 195, 239, 73, 19, 80, 127, 48, 3, 239, 255, 112, 255, 127, 255, 128, 206, 250, 95, 39, 29, 15, 255, + 13, 223, 255, 13, 31, 254, 180, 9, 16, 179, 4, 6, 24, 250, 8, 54, 11, 39, 10, 102, 30, 201, 2, 65, 23, 203, 25, 140, 242, 127, 63, 248, 127, 16, 99, 249, 111, 255, 255, 208, 8, 255, 95, 19, 249, 55, 33, 1, 0, 0, 242, 63, 255, 254, 160, 176, 63, 255, 176, 48, 63, 28, 133, 95, 64, 3, 240, 27, 191, 240, + 0, 31, 255, 241, 247, 0, 2, 17, 16, 15, 255, 144, 18, 0, 0, 202, 174, 251, 61, 250, 31, 239, 96, 31, 243, 192, 22, 119, 182, 242, 22, 135, 249, 5, 79, 127, 36, 0, 31, 153, 13, 42, 40, 29, 242, 46, 11, 31, 147, 2, 255, 95, 238, 239, 202, 97, 0, 79, 243, 46, 107, 252, 104, 28, 16, 72, 3, 138, 255, 65, + 34, 1, 254, 14, 92, 251, 249, 24, 243, 243, 28, 135, 223, 243, 111, 16, 3, 13, 11, 255, 243, 4, 86, 16, 3, 0, 24, 222, 207, 30, 94, 191, 251, 25, 107, 117, 24, 107, 159, 255, 225, 29, 25, 252, 25, 161, 255, 232, 160, 223, 159, 47, 156, 80, 8, 243, 0, 21, 57, 72, 151, 174, 32, 10, 254, 18, 243, 59, 118, 11, + 223, 245, 15, 193, 3, 107, 27, 138, 255, 1, 18, 92, 0, 21, 124, 0, 0, 202, 55, 98, 255, 62, 80, 255, 144, 14, 119, 60, 42, 40, 25, 58, 32, 242, 239, 255, 21, 119, 81, 45, 143, 178, 111, 9, 85, 15, 255, 10, 246, 8, 128, 20, 255, 21, 127, 254, 31, 114, 226, 21, 33, 255, 22, 255, 28, 126, 248, 29, 251, 244, + 62, 7, 250, 213, 102, 175, 25, 206, 4, 45, 7, 111, 31, 205, 13, 69, 31, 209, 8, 38, 182, 53, 0, 30, 4, 255, 106, 239, 243, 0, 86, 171, 18, 4, 37, 182, 47, 213, 3, 254, 18, 44, 246, 41, 123, 21, 239, 163, 128, 30, 239, 253, 27, 3, 20, 119, 23, 219, 0, 8, 87, 42, 119, 2, 80, 111, 30, 31, 41, 207, + 133, 86, 158, 159, 111, 255, 46, 18, 196, 87, 118, 65, 64, 111, 75, 39, 35, 242, 75, 7, 34, 131, 160, 12, 184, 155, 35, 86, 215, 6, 207, 79, 255, 4, 63, 108, 252, 169, 0, 157, 52, 67, 140, 37, 131, 119, 118, 82, 47, 127, 232, 118, 97, 239, 85, 85, 142, 31, 39, 1, 239, 30, 20, 202, 207, 16, 65, 151, 63, 255, + 209, 99, 127, 48, 156, 3, 67, 14, 29, 18, 1, 64, 103, 129, 177, 97, 185, 40, 99, 223, 255, 253, 16, 1, 143, 255, 37, 175, 63, 129, 254, 127, 16, 166, 178, 127, 255, 179, 0, 91, 113, 81, 72, 107, 80, 83, 243, 226, 86, 15, 15, 157, 36, 40, 203, 191, 84, 32, 3, 221, 15, 221, 2, 80, 86, 103, 96, 14, 140, 92, + 3, 127, 241, 169, 7, 3, 127, 10, 253, 34, 15, 87, 34, 23, 35, 239, 247, 85, 30, 243, 241, 78, 123, 250, 90, 135, 166, 42, 187, 253, 83, 5, 21, 50, 108, 47, 3, 41, 15, 255, 6, 22, 7, 0, 239, 111, 26, 38, 5, 181, 14, 111, 54, 19, 86, 4, 190, 93, 75, 251, 2, 5, 95, 1, 119, 117, 48, 43, 139, 197, + 47, 5, 127, 14, 47, 250, 247, 15, 2, 18, 239, 233, 117, 0, 170, 36, 30, 108, 5, 48, 3, 252, 30, 0, 251, 48, 3, 125, 40, 140, 7, 255, 251, 67, 70, 38, 3, 6, 93, 31, 115, 12, 25, 143, 223, 255, 1, 22, 249, 30, 255, 255, 255, 248, 159, 255, 251, 48, 191, 82, 16, 251, 253, 95, 144, 253, 87, 135, 4, 251, + 31, 7, 31, 235, 43, 23, 124, 48, 3, 9, 112, 3, 248, 31, 4, 247, 0, 247, 2, 52, 82, 127, 75, 7, 177, 1, 207, 10, 30, 164, 41, 167, 28, 128, 25, 134, 239, 31, 255, 28, 236, 123, 9, 33, 251, 45, 31, 17, 146, 50, 7, 96, 12, 135, 148, 22, 99, 24, 140, 239, 63, 120, 25, 220, 31, 15, 231, 10, 31, 255, + 70, 255, 246, 250, 16, 87, 118, 33, 239, 253, 64, 30, 18, 169, 244, 34, 237, 32, 44, 152, 6, 24, 129, 39, 36, 0, 221, 55, 176, 12, 127, 48, 255, 251, 2, 40, 95, 43, 103, 46, 203, 23, 207, 37, 145, 127, 243, 137, 135, 119, 71, 41, 95, 255, 18, 219, 16, 150, 46, 3, 176, 107, 255, 76, 31, 28, 45, 27, 96, 27, + 51, 138, 223, 39, 109, 15, 181, 45, 30, 25, 73, 29, 123, 48, 251, 0, 1, 51, 51, 12, 127, 1, 190, 245, 31, 14, 112, 255, 235, 113, 0, 10, 204, 86, 246, 8, 205, 221, 239, 17, 23, 255, 11, 8, 223, 2, 234, 1, 17, 50, 31, 158, 249, 80, 3, 251, 13, 127, 51, 235, 51, 17, 143, 31, 206, 95, 0, 3, 2, 255, + 254, 212, 221, 217, 27, 217, 0, 112, 3, 240, 192, 3, 15, 106, 49, 165, 63, 0, 3, 5, 47, 61, 255, 160, 111, 241, 128, 3, 253, 149, 209, 8, 228, 155, 15, 255, 8, 4, 27, 82, 13, 18, 220, 79, 117, 27, 236, 191, 255, 192, 31, 255, 96, 35, 138, 9, 48, 99, 98, 63, 255, 5, 138, 236, 123, 45, 185, 31, 255, 35, + 47, 201, 0, 201, 84, 255, 60, 148, 32, 76, 119, 60, 3, 112, 1, 10, 127, 18, 47, 243, 74, 235, 42, 243, 42, 251, 43, 3, 29, 11, 112, 194, 0, 207, 30, 12, 28, 123, 80, 103, 20, 243, 1, 92, 255, 121, 45, 11, 111, 255, 33, 57, 35, 25, 92, 127, 80, 18, 92, 243, 93, 7, 45, 19, 224, 1, 253, 19, 106, 239, + 25, 47, 107, 175, 4, 15, 255, 1, 255, 67, 131, 250, 32, 103, 100, 92, 15, 255, 0, 64, 15, 255, 61, 1, 35, 66, 27, 251, 37, 243, 33, 47, 7, 3, 94, 3, 85, 65, 123, 97, 11, 207, 255, 45, 114, 254, 161, 128, 30, 28, 128, 13, 255, 20, 33, 231, 37, 82, 30, 115, 16, 85, 30, 131, 64, 31, 143, 96, 31, 247, + 160, 21, 139, 208, 42, 31, 229, 31, 246, 10, 30, 131, 14, 30, 135, 79, 30, 139, 151, 175, 74, 171, 44, 179, 13, 28, 168, 95, 255, 246, 21, 46, 160, 36, 4, 45, 189, 240, 91, 251, 48, 15, 116, 26, 13, 85, 31, 232, 8, 31, 248, 3, 106, 243, 95, 71, 107, 0, 171, 2, 44, 127, 5, 27, 6, 224, 30, 163, 96, 110, + 15, 29, 23, 22, 2, 56, 111, 29, 34, 0, 255, 193, 0, 223, 0, 116, 3, 130, 179, 49, 0, 11, 239, 246, 82, 31, 3, 247, 30, 235, 247, 31, 229, 40, 6, 250, 49, 18, 157, 6, 32, 232, 15, 194, 2, 44, 168, 96, 23, 43, 242, 84, 31, 145, 243, 79, 225, 110, 19, 130, 143, 65, 159, 60, 55, 85, 92, 191, 6, 78, + 159, 96, 81, 155, 192, 93, 155, 112, 85, 156, 47, 4, 30, 122, 2, 78, 44, 48, 19, 111, 96, 93, 31, 229, 128, 23, 135, 192, 0, 31, 26, 81, 12, 70, 30, 140, 207, 31, 160, 22, 131, 29, 27, 247, 8, 24, 247, 110, 24, 139, 251, 47, 28, 139, 143, 255, 191, 28, 145, 213, 111, 255, 24, 147, 253, 50, 172, 47, 30, 176, + 111, 118, 21, 157, 191, 255, 176, 25, 183, 80, 40, 30, 210, 149, 223, 116, 63, 15, 156, 9, 6, 108, 235, 45, 47, 107, 70, 87, 250, 95, 248, 16, 109, 224, 16, 100, 48, 0, 191, 146, 64, 78, 243, 218, 127, 225, 36, 178, 59, 3, 118, 7, 32, 51, 253, 4, 16, 0, 5, 207, 160, 49, 91, 30, 90, 7, 223, 2, 3, 31, + 113, 30, 248, 61, 51, 8, 15, 255, 8, 21, 46, 15, 8, 156, 19, 49, 163, 207, 31, 223, 63, 31, 227, 9, 143, 255, 68, 231, 63, 235, 31, 127, 10, 255, 80, 79, 253, 255, 253, 226, 239, 255, 242, 31, 120, 96, 25, 23, 118, 31, 215, 21, 162, 254, 32, 95, 227, 11, 223, 50, 127, 99, 51, 252, 0, 46, 31, 247, 17, 176, + 23, 143, 176, 1, 253, 191, 254, 16, 0, 6, 227, 91, 223, 243, 213, 0, 238, 31, 228, 69, 69, 143, 241, 29, 43, 251, 124, 26, 167, 251, 0, 1, 250, 48, 7, 1, 180, 25, 114, 213, 42, 253, 36, 255, 112, 29, 127, 241, 24, 113, 250, 8, 30, 0, 79, 255, 78, 127, 42, 15, 11, 33, 40, 45, 238, 29, 138, 119, 22, 222, + 191, 255, 208, 30, 55, 247, 47, 255, 177, 253, 41, 147, 229, 0, 75, 115, 30, 50, 63, 251, 249, 50, 1, 251, 22, 63, 179, 30, 255, 78, 235, 55, 79, 79, 93, 243, 37, 127, 205, 31, 244, 243, 57, 255, 30, 151, 223, 30, 43, 143, 212, 255, 224, 26, 50, 176, 31, 177, 144, 48, 3, 15, 150, 78, 174, 159, 29, 223, 143, 24, + 22, 111, 254, 208, 8, 240, 181, 60, 0, 198, 255, 71, 134, 221, 221, 221, 15, 15, 79, 9, 16, 30, 154, 0, 15, 110, 9, 14, 105, 56, 5, 113, 26, 85, 254, 37, 90, 204, 96, 9, 57, 221, 14, 196, 76, 1, 223, 20, 235, 32, 115, 40, 55, 11, 47, 250, 253, 80, 3, 252, 47, 254, 15, 65, 79, 32, 99, 91, 32, 103, + 8, 239, 254, 222, 247, 12, 96, 172, 24, 145, 39, 27, 185, 15, 30, 17, 125, 82, 88, 47, 7, 1, 17, 17, 62, 174, 105, 31, 219, 29, 221, 221, 220, 32, 31, 251, 180, 128, 31, 255, 80, 20, 31, 250, 10, 28, 18, 28, 170, 254, 137, 239, 255, 138, 255, 255, 252, 23, 47, 145, 223, 90, 54, 144, 7, 153, 27, 206, 46, 186, + 2, 175, 20, 1, 94, 28, 199, 62, 55, 203, 2, 239, 255, 252, 24, 227, 247, 112, 3, 255, 129, 96, 127, 6, 255, 226, 225, 0, 103, 254, 28, 87, 39, 13, 111, 127, 40, 132, 239, 216, 226, 0, 56, 115, 119, 239, 0, 127, 0, 112, 147, 18, 199, 7, 2, 2, 18, 0, 3, 1, 124, 135, 40, 215, 112, 3, 249, 51, 51, 86, + 92, 143, 255, 17, 54, 221, 63, 255, 79, 246, 134, 201, 233, 51, 51, 0, 81, 43, 176, 17, 55, 12, 154, 35, 2, 226, 223, 255, 255, 25, 231, 33, 11, 33, 143, 18, 159, 255, 187, 21, 31, 252, 239, 255, 250, 30, 29, 255, 21, 47, 31, 254, 32, 7, 189, 124, 127, 16, 4, 183, 0, 255, 225, 31, 255, 112, 245, 63, 255, 144, + 17, 160, 3, 3, 241, 18, 31, 251, 12, 86, 251, 56, 243, 60, 103, 11, 215, 255, 255, 29, 150, 246, 96, 239, 255, 211, 56, 61, 26, 85, 19, 149, 121, 155, 255, 249, 29, 246, 85, 115, 36, 171, 71, 122, 255, 224, 111, 0, 127, 30, 11, 255, 229, 254, 64, 5, 45, 44, 4, 144, 8, 255, 0, 3, 4, 3, 86, 47, 7, 73, + 0, 127, 6, 242, 17, 7, 48, 12, 25, 168, 13, 8, 156, 47, 8, 185, 9, 33, 240, 13, 109, 9, 51, 51, 0, 126, 18, 6, 100, 90, 119, 2, 205, 15, 173, 2, 98, 111, 221, 98, 111, 117, 167, 102, 31, 232, 207, 245, 58, 31, 31, 30, 0, 222, 24, 155, 170, 7, 80, 3, 9, 31, 207, 10, 31, 207, 12, 46, 62, 117, + 15, 3, 34, 119, 119, 119, 17, 254, 255, 32, 3, 1, 61, 42, 106, 208, 3, 120, 255, 253, 119, 99, 7, 14, 85, 28, 114, 47, 28, 174, 95, 26, 158, 63, 37, 202, 130, 9, 19, 147, 16, 63, 99, 39, 15, 255, 2, 114, 47, 35, 80, 3, 1, 237, 137, 153, 153, 15, 194, 10, 153, 153, 0, 31, 44, 130, 40, 3, 124, 27, + 45, 143, 144, 31, 247, 241, 112, 3, 6, 178, 2, 208, 3, 80, 63, 255, 58, 31, 243, 239, 26, 120, 38, 178, 160, 3, 2, 255, 16, 185, 241, 0, 3, 5, 253, 239, 11, 72, 15, 224, 111, 1, 242, 0, 19, 104, 81, 28, 143, 44, 147, 225, 48, 111, 219, 253, 119, 28, 155, 255, 251, 28, 163, 252, 255, 225, 254, 153, 146, 0, + 127, 26, 30, 87, 229, 247, 205, 255, 236, 229, 167, 33, 16, 0, 131, 2, 110, 31, 251, 0, 3, 5, 250, 85, 28, 217, 210, 15, 255, 74, 2, 31, 66, 95, 8, 32, 8, 74, 173, 112, 18, 183, 246, 15, 255, 16, 138, 32, 31, 239, 224, 21, 1, 135, 7, 76, 131, 0, 3, 8, 3, 31, 122, 19, 208, 3, 171, 29, 62, 39, + 64, 3, 1, 255, 24, 253, 223, 11, 85, 213, 0, 190, 19, 164, 56, 159, 255, 20, 97, 159, 31, 245, 104, 64, 3, 236, 129, 192, 143, 171, 0, 127, 1, 160, 143, 12, 129, 50, 104, 77, 135, 127, 253, 31, 44, 129, 239, 255, 96, 251, 33, 7, 229, 0, 207, 226, 71, 156, 15, 255, 38, 137, 33, 139, 208, 13, 3, 127, 14, 90, + 55, 81, 43, 98, 199, 149, 0, 20, 135, 64, 38, 52, 135, 36, 139, 255, 80, 3, 3, 127, 28, 252, 189, 113, 131, 142, 35, 37, 219, 64, 103, 79, 228, 36, 114, 221, 35, 95, 126, 51, 103, 235, 129, 51, 20, 133, 0, 31, 139, 67, 19, 119, 112, 112, 115, 224, 7, 32, 143, 15, 163, 20, 26, 187, 84, 78, 235, 95, 38, 7, + 61, 31, 248, 95, 45, 250, 31, 255, 255, 143, 0, 127, 255, 144, 187, 223, 255, 179, 235, 119, 135, 255, 222, 24, 93, 31, 24, 32, 0, 255, 15, 255, 48, 0, 31, 3, 148, 0, 245, 0, 187, 186, 32, 28, 27, 160, 28, 31, 96, 234, 0, 254, 66, 31, 11, 96, 95, 15, 160, 15, 255, 19, 171, 63, 31, 255, 8, 15, 255, 1, + 25, 31, 255, 207, 255, 235, 212, 3, 207, 40, 243, 110, 44, 155, 88, 152, 148, 80, 111, 255, 26, 93, 0, 42, 93, 255, 16, 17, 19, 234, 169, 0, 12, 40, 41, 255, 0, 3, 5, 207, 32, 131, 240, 28, 85, 211, 85, 85, 105, 131, 187, 16, 0, 239, 230, 85, 85, 174, 64, 55, 15, 255, 26, 28, 187, 187, 128, 15, 159, 20, + 244, 17, 17, 17, 7, 31, 228, 13, 41, 85, 135, 103, 148, 25, 80, 131, 32, 30, 17, 231, 135, 162, 86, 195, 0, 31, 6, 42, 175, 255, 42, 183, 250, 80, 232, 215, 15, 255, 0, 223, 0, 3, 1, 84, 32, 251, 43, 58, 127, 16, 144, 3, 83, 138, 127, 0, 103, 2, 235, 51, 51, 48, 30, 35, 253, 46, 39, 16, 221, 202, + 221, 216, 15, 255, 32, 27, 253, 7, 17, 208, 15, 19, 131, 34, 96, 3, 223, 255, 3, 90, 47, 160, 3, 63, 255, 90, 34, 115, 134, 245, 219, 47, 13, 66, 17, 160, 107, 192, 11, 253, 239, 95, 15, 125, 224, 111, 5, 0, 36, 105, 53, 31, 42, 197, 65, 31, 46, 181, 224, 111, 0, 127, 30, 33, 247, 33, 255, 6, 255, 8, + 150, 195, 5, 16, 0, 131, 2, 92, 35, 0, 127, 7, 28, 22, 191, 192, 78, 14, 66, 160, 4, 28, 215, 105, 251, 11, 255, 245, 250, 255, 254, 221, 221, 96, 1, 255, 255, 224, 16, 3, 205, 144, 1, 28, 238, 8, 255, 73, 248, 137, 8, 255, 7, 0, 253, 1, 1, 155, 205, 255, 209, 30, 182, 243, 61, 8, 255, 46, 45, 107, + 0, 103, 119, 117, 8, 255, 7, 255, 247, 252, 113, 84, 49, 8, 255, 200, 3, 171, 187, 223, 187, 13, 84, 251, 13, 255, 247, 119, 13, 53, 27, 207, 160, 3, 185, 32, 24, 123, 176, 24, 127, 160, 230, 159, 255, 118, 8, 255, 65, 128, 111, 247, 138, 37, 127, 173, 10, 65, 143, 119, 232, 127, 206, 249, 25, 3, 254, 120, 25, 7, + 247, 159, 255, 82, 8, 255, 198, 63, 227, 47, 131, 196, 1, 255, 128, 3, 166, 219, 134, 251, 253, 29, 163, 236, 94, 214, 85, 85, 37, 255, 242, 48, 3, 119, 119, 8, 123, 22, 85, 160, 107, 1, 167, 123, 6, 47, 187, 251, 144, 3, 253, 29, 157, 215, 45, 227, 239, 219, 119, 119, 80, 30, 175, 246, 8, 62, 143, 32, 11, 15, + 123, 22, 103, 123, 6, 14, 47, 5, 136, 251, 0, 31, 36, 172, 249, 88, 100, 248, 5, 142, 89, 5, 166, 42, 30, 1, 3, 16, 245, 2, 205, 221, 221, 36, 131, 9, 48, 3, 248, 206, 51, 9, 63, 191, 128, 3, 221, 221, 211, 31, 227, 165, 250, 63, 227, 51, 172, 22, 95, 217, 95, 10, 127, 9, 95, 51, 10, 255, 17, 128, + 111, 250, 137, 32, 131, 62, 15, 71, 119, 188, 118, 232, 194, 154, 189, 239, 249, 34, 118, 19, 132, 241, 196, 85, 50, 16, 0, 127, 55, 14, 33, 46, 107, 239, 79, 110, 26, 251, 11, 252, 1, 183, 49, 239, 255, 247, 85, 15, 251, 249, 13, 255, 209, 16, 239, 255, 45, 255, 226, 255, 231, 143, 31, 151, 29, 145, 20, 145, 49, 113, + 8, 236, 1, 153, 16, 31, 203, 208, 0, 229, 63, 4, 255, 16, 171, 208, 0, 3, 6, 83, 42, 143, 159, 26, 0, 159, 255, 250, 21, 153, 159, 255, 79, 16, 115, 63, 16, 119, 223, 19, 119, 64, 19, 16, 53, 175, 255, 223, 117, 26, 179, 240, 0, 158, 21, 179, 255, 80, 3, 126, 87, 149, 191, 157, 0, 127, 17, 12, 33, 243, + 239, 253, 163, 63, 143, 209, 237, 253, 255, 255, 30, 255, 254, 200, 201, 0, 49, 15, 203, 4, 32, 99, 29, 214, 51, 38, 67, 12, 112, 31, 83, 4, 239, 80, 15, 255, 44, 9, 151, 9, 75, 182, 4, 213, 9, 23, 81, 143, 3, 167, 15, 86, 115, 3, 171, 183, 105, 153, 153, 142, 3, 32, 19, 61, 116, 46, 75, 176, 0, 239, + 29, 116, 189, 63, 64, 3, 17, 191, 255, 186, 31, 169, 191, 106, 31, 173, 118, 221, 231, 47, 29, 145, 139, 223, 1, 255, 17, 249, 3, 255, 251, 51, 3, 95, 63, 96, 115, 0, 173, 175, 46, 215, 17, 51, 100, 51, 50, 111, 104, 70, 188, 136, 110, 3, 254, 219, 168, 82, 231, 63, 33, 131, 160, 141, 23, 187, 109, 2, 127, 29, + 10, 161, 46, 1, 239, 59, 118, 255, 62, 19, 145, 73, 13, 219, 0, 141, 251, 153, 16, 0, 13, 251, 0, 41, 175, 192, 84, 51, 11, 175, 24, 199, 31, 0, 255, 20, 23, 94, 107, 13, 135, 2, 218, 127, 119, 150, 243, 255, 133, 30, 123, 48, 31, 95, 234, 203, 187, 187, 111, 143, 143, 115, 123, 192, 48, 127, 112, 47, 240, 187, + 187, 183, 61, 131, 24, 176, 9, 200, 19, 105, 135, 165, 12, 104, 255, 85, 96, 73, 29, 211, 56, 25, 96, 5, 242, 255, 247, 187, 189, 37, 123, 78, 249, 85, 160, 31, 4, 29, 243, 64, 115, 128, 147, 160, 31, 111, 255, 164, 95, 104, 47, 179, 129, 80, 1, 139, 28, 15, 217, 3, 104, 139, 0, 31, 8, 65, 139, 15, 255, 17, + 239, 82, 31, 255, 39, 1, 135, 5, 207, 104, 107, 177, 135, 48, 168, 19, 224, 240, 0, 143, 80, 3, 69, 3, 79, 243, 28, 14, 63, 7, 124, 15, 255, 17, 44, 0, 69, 85, 85, 42, 119, 37, 11, 160, 1, 72, 215, 73, 105, 7, 47, 239, 169, 119, 40, 247, 34, 123, 100, 143, 239, 217, 0, 0, 31, 0, 47, 135, 224, 53, + 147, 47, 255, 41, 41, 137, 26, 60, 0, 34, 13, 114, 11, 130, 1, 31, 255, 111, 54, 2, 123, 2, 43, 228, 51, 51, 143, 243, 255, 185, 16, 119, 151, 185, 128, 123, 32, 27, 95, 117, 251, 208, 0, 153, 253, 152, 32, 0, 153, 153, 148, 114, 123, 51, 208, 51, 49, 5, 111, 31, 9, 105, 139, 165, 15, 149, 111, 229, 15, 34, + 232, 239, 7, 255, 34, 2, 19, 204, 174, 115, 142, 19, 255, 22, 241, 225, 176, 0, 191, 21, 127, 37, 131, 37, 139, 101, 15, 1, 228, 35, 87, 148, 43, 11, 8, 255, 10, 127, 8, 255, 17, 46, 235, 211, 3, 239, 30, 103, 1, 6, 106, 4, 37, 110, 253, 203, 161, 150, 11, 76, 7, 111, 9, 127, 5, 8, 143, 54, 15, 255, + 94, 42, 135, 15, 53, 112, 3, 7, 63, 0, 255, 255, 47, 255, 192, 31, 255, 208, 200, 1, 31, 16, 3, 191, 255, 248, 15, 255, 32, 32, 99, 0, 3, 4, 210, 253, 221, 32, 135, 31, 80, 103, 224, 7, 223, 16, 127, 4, 48, 135, 15, 255, 45, 44, 123, 8, 103, 10, 23, 255, 1, 24, 133, 15, 255, 100, 31, 19, 252, 0, + 30, 12, 15, 222, 8, 4, 149, 0, 0, 47, 174, 255, 14, 3, 16, 8, 127, 251, 252, 187, 13, 19, 119, 58, 224, 3, 71, 79, 243, 51, 191, 112, 39, 253, 88, 243, 233, 243, 51, 13, 83, 127, 143, 57, 35, 64, 3, 239, 18, 92, 143, 96, 19, 15, 255, 16, 252, 54, 247, 61, 251, 37, 246, 183, 151, 1, 41, 101, 21, 203, + 187, 119, 95, 1, 85, 65, 174, 2, 25, 122, 79, 31, 8, 239, 255, 218, 19, 185, 159, 112, 25, 103, 141, 3, 30, 254, 32, 0, 163, 145, 81, 21, 107, 39, 167, 208, 14, 126, 20, 36, 6, 80, 3, 9, 149, 0, 223, 193, 29, 122, 12, 20, 142, 4, 27, 214, 3, 51, 30, 218, 29, 166, 133, 175, 43, 255, 50, 55, 23, 171, + 165, 166, 30, 234, 0, 47, 250, 48, 3, 247, 31, 60, 241, 122, 31, 64, 96, 0, 0, 229, 15, 255, 36, 73, 87, 15, 131, 255, 144, 3, 127, 255, 166, 119, 40, 4, 239, 44, 153, 153, 170, 64, 124, 7, 94, 9, 255, 24, 255, 0, 3, 1, 175, 46, 194, 48, 240, 28, 150, 247, 85, 89, 30, 148, 24, 151, 172, 239, 140, 135, + 160, 208, 25, 171, 16, 15, 255, 23, 39, 115, 101, 255, 87, 127, 171, 160, 224, 247, 119, 122, 51, 219, 119, 127, 239, 255, 169, 163, 0, 31, 2, 138, 114, 87, 123, 7, 127, 5, 15, 255, 10, 109, 15, 255, 10, 221, 7, 35, 1, 84, 192, 31, 112, 1, 127, 38, 255, 89, 23, 111, 122, 123, 29, 11, 21, 114, 20, 28, 171, 168, + 255, 255, 221, 131, 223, 126, 15, 144, 71, 13, 103, 23, 7, 87, 247, 30, 255, 185, 211, 17, 22, 255, 141, 248, 32, 3, 137, 111, 44, 155, 89, 80, 29, 56, 245, 72, 22, 44, 249, 45, 161, 29, 166, 17, 192, 31, 207, 246, 47, 68, 169, 250, 91, 212, 247, 15, 255, 12, 4, 21, 145, 27, 255, 143, 90, 28, 255, 95, 29, 3, + 5, 97, 30, 160, 252, 23, 200, 175, 255, 40, 151, 223, 53, 226, 96, 95, 255, 195, 235, 0, 2, 180, 159, 234, 96, 80, 87, 255, 196, 95, 43, 255, 216, 24, 47, 255, 64, 4, 191, 255, 247, 32, 0, 1, 83, 15, 255, 27, 1, 191, 128, 83, 21, 15, 242, 23, 3, 243, 112, 3, 191, 255, 175, 144, 244, 0, 6, 255, 244, 22, + 51, 245, 112, 3, 15, 255, 46, 30, 41, 111, 128, 3, 128, 119, 9, 255, 246, 51, 41, 139, 189, 255, 20, 96, 255, 255, 246, 155, 38, 218, 7, 218, 255, 249, 20, 119, 245, 35, 32, 127, 57, 48, 23, 169, 245, 63, 235, 191, 159, 255, 62, 13, 255, 29, 54, 255, 139, 212, 187, 187, 6, 255, 8, 244, 28, 207, 128, 13, 255, 15, + 15, 255, 65, 147, 76, 92, 27, 15, 255, 3, 178, 31, 255, 8, 94, 10, 2, 188, 160, 64, 31, 255, 224, 3, 127, 42, 53, 131, 59, 183, 158, 3, 32, 11, 73, 43, 203, 255, 93, 111, 39, 51, 126, 55, 39, 64, 3, 126, 74, 87, 67, 191, 80, 19, 15, 128, 17, 159, 102, 115, 4, 28, 108, 188, 13, 82, 15, 0, 35, 51, + 52, 99, 255, 110, 3, 245, 221, 222, 255, 254, 110, 255, 83, 28, 24, 249, 85, 60, 231, 192, 120, 7, 221, 148, 23, 51, 8, 59, 1, 214, 34, 95, 88, 41, 150, 48, 143, 255, 14, 247, 2, 47, 15, 43, 118, 28, 162, 16, 80, 3, 83, 140, 139, 4, 251, 2, 46, 139, 255, 17, 49, 116, 46, 251, 221, 221, 216, 1, 239, 38, + 255, 6, 255, 2, 97, 239, 165, 254, 157, 139, 254, 159, 39, 97, 239, 94, 145, 139, 94, 16, 1, 127, 20, 103, 107, 47, 255, 25, 47, 123, 110, 11, 47, 147, 160, 111, 9, 45, 247, 174, 11, 47, 147, 128, 111, 240, 55, 127, 176, 31, 187, 74, 3, 87, 0, 80, 95, 131, 46, 11, 180, 141, 255, 207, 95, 158, 172, 125, 94, 15, + 175, 111, 7, 51, 57, 19, 244, 145, 115, 92, 190, 15, 99, 65, 229, 255, 255, 160, 62, 251, 37, 247, 81, 142, 15, 176, 10, 31, 11, 0, 1, 255, 0, 62, 111, 234, 70, 255, 151, 203, 66, 231, 2, 83, 2, 202, 31, 93, 187, 187, 182, 76, 94, 111, 253, 49, 255, 127, 240, 122, 48, 27, 91, 8, 127, 19, 170, 31, 31, 255, + 63, 80, 3, 79, 95, 11, 159, 79, 255, 138, 5, 46, 106, 57, 199, 48, 3, 240, 89, 95, 244, 89, 115, 24, 31, 222, 197, 51, 101, 183, 249, 119, 101, 87, 15, 255, 2, 34, 251, 87, 37, 217, 244, 63, 255, 29, 31, 231, 191, 255, 0, 254, 28, 255, 254, 4, 239, 255, 227, 26, 223, 215, 32, 10, 39, 55, 82, 109, 255, 144, + 0, 206, 81, 25, 216, 36, 33, 100, 111, 20, 14, 23, 32, 18, 38, 213, 100, 141, 47, 251, 153, 0, 131, 4, 70, 67, 96, 13, 175, 79, 70, 171, 114, 38, 183, 1, 223, 128, 14, 112, 46, 33, 255, 13, 45, 150, 41, 144, 3, 127, 255, 187, 43, 83, 224, 90, 227, 42, 231, 242, 102, 159, 222, 25, 145, 17, 70, 30, 240, 223, + 255, 192, 3, 85, 15, 255, 16, 47, 31, 209, 95, 74, 115, 1, 26, 247, 11, 119, 26, 251, 159, 255, 0, 19, 132, 2, 223, 255, 234, 246, 255, 244, 28, 29, 248, 27, 237, 252, 44, 165, 187, 48, 24, 103, 192, 0, 236, 29, 92, 65, 239, 197, 255, 194, 22, 236, 56, 142, 96, 3, 17, 208, 123, 16, 127, 0, 127, 17, 9, 255, + 254, 64, 6, 255, 193, 230, 0, 0, 68, 6, 72, 6, 32, 208, 8, 215, 15, 255, 6, 150, 32, 224, 239, 96, 255, 207, 26, 113, 78, 245, 15, 255, 158, 171, 6, 81, 251, 31, 81, 151, 79, 175, 255, 254, 64, 61, 81, 255, 67, 135, 51, 255, 243, 30, 140, 159, 24, 99, 193, 255, 51, 239, 65, 151, 6, 255, 20, 33, 247, 12, + 255, 245, 0, 1, 207, 255, 23, 76, 255, 21, 127, 228, 253, 11, 255, 251, 16, 2, 169, 22, 79, 248, 175, 63, 23, 116, 25, 26, 239, 192, 0, 238, 255, 245, 253, 48, 67, 239, 31, 89, 44, 42, 163, 126, 69, 37, 70, 48, 47, 190, 27, 12, 1, 247, 0, 191, 23, 185, 42, 171, 162, 2, 243, 22, 7, 221, 247, 6, 94, 23, + 7, 223, 89, 154, 248, 1, 27, 131, 155, 187, 133, 15, 63, 251, 255, 170, 230, 31, 35, 254, 50, 131, 19, 30, 194, 188, 114, 143, 171, 247, 15, 252, 22, 7, 81, 119, 1, 15, 235, 1, 41, 255, 154, 254, 72, 103, 30, 232, 255, 3, 199, 211, 4, 25, 149, 164, 159, 24, 134, 96, 44, 4, 31, 198, 208, 24, 18, 125, 116, 253, + 48, 0, 154, 32, 247, 9, 9, 0, 19, 239, 42, 67, 119, 96, 3, 2, 30, 123, 4, 30, 127, 6, 51, 139, 111, 30, 218, 223, 253, 160, 3, 8, 153, 239, 254, 95, 44, 149, 95, 31, 252, 67, 85, 239, 253, 11, 196, 255, 241, 0, 3, 10, 3, 254, 17, 35, 44, 255, 35, 136, 19, 246, 183, 244, 23, 123, 96, 15, 31, 84, + 8, 252, 32, 87, 79, 127, 160, 31, 222, 244, 31, 226, 254, 48, 223, 247, 127, 255, 246, 223, 31, 128, 239, 0, 127, 248, 253, 223, 0, 1, 81, 56, 183, 0, 127, 48, 7, 31, 23, 139, 191, 34, 229, 239, 214, 96, 255, 249, 17, 7, 112, 5, 82, 45, 112, 18, 10, 243, 42, 93, 79, 251, 97, 143, 3, 175, 255, 205, 2, 194, + 23, 31, 29, 71, 159, 253, 96, 3, 6, 190, 187, 123, 31, 64, 0, 137, 32, 251, 17, 239, 242, 255, 27, 255, 241, 160, 3, 15, 255, 16, 5, 31, 255, 173, 9, 31, 255, 14, 31, 255, 175, 255, 29, 0, 254, 251, 1, 191, 255, 244, 14, 29, 104, 14, 255, 245, 212, 0, 255, 47, 31, 241, 78, 31, 245, 145, 223, 85, 191, 29, + 241, 159, 239, 255, 112, 159, 255, 79, 255, 251, 159, 4, 255, 255, 191, 241, 0, 60, 249, 159, 224, 111, 176, 127, 1, 255, 17, 2, 170, 150, 15, 144, 15, 46, 21, 127, 218, 78, 15, 127, 64, 163, 43, 24, 22, 46, 19, 59, 16, 131, 248, 18, 127, 32, 5, 228, 255, 160, 160, 17, 119, 24, 42, 0, 43, 241, 59, 23, 105, 30, + 250, 255, 253, 12, 127, 19, 124, 65, 3, 49, 107, 54, 127, 12, 255, 0, 248, 3, 255, 253, 64, 0, 252, 91, 28, 202, 32, 191, 255, 37, 32, 17, 158, 243, 239, 245, 255, 254, 144, 26, 35, 236, 42, 40, 149, 5, 162, 48, 7, 238, 57, 92, 48, 239, 31, 99, 48, 3, 12, 28, 138, 86, 23, 6, 2, 31, 159, 94, 60, 6, + 176, 175, 23, 6, 167, 8, 234, 91, 227, 47, 103, 31, 16, 255, 251, 64, 76, 43, 135, 112, 9, 254, 17, 31, 239, 111, 216, 47, 196, 46, 11, 78, 44, 127, 5, 79, 195, 44, 147, 3, 252, 64, 76, 43, 29, 239, 227, 20, 251, 21, 162, 0, 11, 60, 20, 119, 0, 226, 57, 222, 80, 240, 31, 31, 26, 159, 30, 0, 36, 152, + 144, 250, 93, 108, 213, 25, 3, 144, 3, 14, 127, 0, 80, 103, 21, 107, 252, 10, 239, 248, 0, 7, 41, 208, 209, 96, 103, 48, 48, 111, 24, 143, 105, 48, 9, 112, 70, 65, 239, 113, 143, 32, 253, 175, 31, 6, 224, 12, 16, 14, 253, 28, 4, 0, 0, 23, 157, 223, 53, 11, 42, 143, 0, 24, 114, 63, 188, 175, 118, 78, + 15, 223, 255, 251, 31, 169, 128, 95, 19, 146, 211, 2, 214, 159, 213, 176, 97, 87, 26, 145, 255, 255, 237, 215, 16, 207, 27, 248, 5, 207, 27, 252, 2, 145, 104, 0, 126, 23, 97, 247, 6, 11, 47, 5, 161, 247, 0, 31, 34, 249, 90, 95, 100, 248, 11, 11, 59, 157, 160, 28, 96, 247, 11, 94, 65, 246, 74, 0, 0, 110, + 90, 196, 127, 251, 115, 123, 243, 143, 255, 255, 43, 63, 124, 29, 142, 254, 80, 226, 61, 254, 128, 77, 203, 111, 224, 43, 121, 251, 47, 39, 183, 249, 47, 3, 254, 96, 24, 198, 176, 0, 91, 189, 255, 11, 254, 16, 35, 53, 67, 9, 83, 119, 4, 82, 79, 83, 25, 158, 15, 255, 173, 239, 47, 223, 145, 94, 63, 59, 63, 151, + 30, 144, 51, 51, 69, 191, 147, 1, 153, 186, 16, 25, 73, 192, 0, 15, 30, 143, 159, 30, 147, 161, 48, 95, 239, 255, 95, 255, 14, 255, 9, 175, 119, 47, 135, 78, 121, 177, 251, 119, 119, 119, 255, 2, 11, 1, 78, 107, 240, 64, 21, 153, 240, 48, 115, 96, 15, 4, 122, 19, 3, 3, 3, 254, 15, 190, 111, 53, 238, 15, + 127, 224, 90, 96, 23, 45, 244, 30, 49, 247, 8, 176, 3, 15, 255, 17, 158, 111, 40, 247, 29, 72, 143, 94, 15, 62, 115, 80, 110, 111, 254, 190, 15, 161, 46, 15, 224, 111, 0, 127, 30, 238, 111, 99, 7, 158, 0, 239, 254, 174, 111, 7, 189, 0, 0, 127, 4, 4, 255, 168, 246, 30, 214, 192, 14, 125, 46, 3, 10, 56, + 11, 14, 110, 10, 60, 15, 170, 251, 15, 255, 18, 11, 94, 115, 14, 94, 119, 95, 73, 107, 4, 42, 127, 26, 104, 30, 99, 31, 226, 79, 243, 247, 54, 15, 31, 247, 186, 32, 31, 251, 209, 0, 253, 31, 171, 0, 13, 127, 6, 27, 14, 127, 22, 23, 188, 24, 203, 250, 8, 26, 119, 1, 223, 188, 145, 251, 255, 129, 239, 255, + 248, 18, 11, 31, 243, 185, 143, 43, 35, 116, 173, 144, 82, 15, 38, 223, 254, 46, 19, 175, 30, 239, 80, 30, 243, 48, 207, 252, 76, 111, 196, 94, 211, 27, 81, 31, 7, 23, 174, 221, 23, 178, 11, 255, 21, 85, 224, 3, 6, 245, 123, 248, 20, 7, 245, 133, 139, 207, 81, 115, 127, 253, 48, 3, 51, 32, 107, 80, 11, 64, + 19, 246, 107, 14, 123, 37, 4, 139, 61, 135, 30, 31, 88, 207, 255, 162, 197, 239, 192, 186, 25, 82, 20, 255, 48, 95, 73, 33, 136, 21, 3, 127, 45, 25, 92, 22, 127, 246, 31, 135, 243, 26, 122, 245, 61, 28, 121, 29, 84, 223, 255, 146, 0, 29, 246, 0, 42, 19, 128, 21, 119, 161, 20, 204, 255, 19, 40, 255, 48, 7, + 254, 111, 255, 160, 22, 255, 255, 64, 21, 135, 83, 51, 139, 22, 29, 103, 255, 144, 3, 3, 255, 32, 23, 207, 98, 15, 164, 10, 253, 147, 11, 61, 14, 3, 127, 75, 0, 63, 102, 1, 83, 151, 189, 47, 191, 192, 90, 223, 218, 28, 94, 139, 255, 249, 253, 65, 76, 255, 225, 207, 222, 43, 109, 252, 78, 39, 3, 209, 31, 23, + 28, 168, 223, 255, 16, 5, 127, 22, 147, 127, 83, 247, 37, 251, 10, 187, 127, 26, 193, 255, 80, 93, 80, 7, 225, 30, 168, 253, 83, 93, 47, 147, 27, 122, 47, 248, 59, 255, 251, 111, 16, 28, 95, 16, 32, 242, 127, 255, 64, 0, 18, 45, 69, 167, 192, 74, 107, 20, 11, 140, 23, 31, 87, 41, 99, 12, 39, 131, 205, 55, + 131, 181, 96, 196, 51, 56, 39, 244, 135, 131, 0, 62, 1, 51, 0, 31, 10, 167, 131, 190, 197, 12, 32, 54, 90, 221, 218, 44, 255, 10, 127, 8, 42, 97, 139, 1, 235, 21, 10, 85, 123, 31, 85, 131, 9, 106, 147, 124, 49, 235, 251, 32, 42, 255, 224, 87, 123, 32, 7, 244, 251, 32, 26, 239, 108, 12, 225, 71, 27, 44, + 69, 169, 159, 17, 239, 207, 39, 35, 248, 71, 155, 9, 157, 21, 7, 94, 17, 127, 57, 97, 127, 3, 171, 187, 187, 203, 255, 213, 189, 185, 20, 251, 53, 108, 123, 187, 16, 0, 0, 237, 40, 205, 201, 21, 175, 255, 159, 76, 135, 0, 202, 255, 252, 137, 35, 32, 31, 48, 110, 3, 160, 129, 127, 50, 41, 51, 23, 190, 0, 180, + 14, 130, 1, 31, 255, 8, 80, 243, 189, 8, 236, 135, 255, 255, 115, 110, 29, 221, 6, 95, 27, 249, 1, 23, 82, 5, 255, 254, 65, 94, 61, 27, 146, 59, 147, 0, 58, 223, 235, 120, 27, 251, 75, 88, 35, 245, 66, 127, 42, 11, 80, 15, 255, 35, 8, 255, 10, 78, 235, 44, 7, 35, 69, 94, 109, 83, 46, 139, 231, 45, + 211, 254, 160, 233, 158, 255, 247, 32, 2, 40, 141, 181, 175, 156, 127, 137, 32, 31, 198, 224, 29, 149, 241, 69, 96, 3, 16, 15, 127, 17, 25, 234, 22, 164, 159, 31, 255, 30, 90, 31, 255, 2, 28, 127, 0, 6, 42, 135, 11, 124, 15, 245, 207, 255, 128, 8, 60, 124, 242, 26, 248, 64, 253, 189, 220, 114, 53, 221, 223, 110, + 9, 219, 154, 168, 160, 111, 32, 123, 137, 43, 31, 255, 155, 31, 255, 247, 107, 255, 241, 99, 0, 127, 18, 1, 17, 17, 63, 84, 111, 10, 156, 4, 253, 0, 121, 255, 253, 4, 255, 255, 223, 250, 2, 255, 26, 144, 0, 195, 19, 127, 30, 60, 41, 17, 46, 161, 46, 165, 153, 158, 90, 16, 111, 255, 64, 3, 51, 60, 16, 251, + 8, 42, 29, 213, 120, 16, 15, 135, 54, 255, 84, 239, 95, 47, 19, 17, 58, 48, 171, 86, 54, 155, 150, 8, 79, 16, 192, 31, 140, 169, 243, 31, 144, 208, 160, 30, 16, 14, 231, 0, 15, 255, 10, 6, 81, 89, 3, 31, 90, 255, 14, 82, 147, 45, 254, 31, 235, 167, 163, 175, 26, 218, 3, 36, 215, 58, 255, 35, 115, 253, + 48, 136, 60, 40, 3, 34, 227, 63, 107, 252, 66, 13, 33, 201, 33, 209, 74, 57, 43, 176, 15, 11, 25, 31, 255, 8, 204, 135, 5, 46, 125, 185, 10, 46, 19, 73, 221, 201, 175, 255, 44, 135, 96, 10, 92, 135, 101, 103, 224, 31, 15, 11, 2, 250, 12, 135, 4, 223, 0, 3, 1, 85, 44, 255, 43, 63, 255, 16, 144, 3, + 83, 5, 103, 12, 51, 223, 51, 48, 89, 15, 255, 16, 221, 221, 216, 4, 6, 251, 42, 165, 15, 181, 111, 229, 15, 246, 251, 225, 102, 251, 69, 15, 8, 15, 255, 17, 165, 111, 75, 116, 21, 3, 12, 84, 99, 101, 111, 38, 243, 124, 26, 170, 255, 0, 56, 189, 184, 37, 3, 122, 7, 69, 101, 111, 208, 134, 243, 160, 31, 15, + 255, 2, 164, 85, 11, 252, 41, 86, 251, 31, 243, 142, 95, 162, 175, 87, 251, 93, 15, 0, 143, 223, 174, 127, 47, 255, 162, 7, 255, 151, 119, 119, 107, 62, 159, 254, 112, 126, 7, 63, 126, 3, 208, 0, 228, 119, 119, 16, 7, 131, 18, 97, 255, 127, 85, 139, 206, 156, 233, 185, 153, 153, 110, 255, 51, 64, 171, 191, 242, 153, + 196, 153, 150, 49, 239, 31, 148, 23, 198, 49, 136, 192, 31, 7, 149, 11, 46, 40, 9, 255, 16, 205, 29, 99, 255, 24, 68, 255, 250, 1, 239, 255, 163, 7, 24, 184, 11, 28, 112, 118, 69, 70, 242, 0, 220, 40, 127, 254, 64, 31, 211, 234, 244, 0, 75, 46, 0, 207, 24, 141, 79, 22, 89, 145, 47, 31, 223, 16, 7, 13, + 31, 103, 0, 3, 10, 15, 255, 14, 8, 73, 28, 94, 2, 28, 123, 31, 64, 255, 27, 0, 31, 243, 59, 189, 255, 181, 15, 175, 255, 112, 7, 48, 223, 246, 96, 63, 83, 255, 163, 68, 91, 142, 63, 0, 127, 44, 14, 32, 46, 96, 255, 187, 12, 24, 32, 4, 239, 80, 10, 118, 46, 87, 0, 175, 1, 22, 211, 46, 60, 123, + 234, 4, 255, 253, 87, 186, 64, 116, 45, 15, 230, 47, 131, 160, 0, 191, 90, 63, 231, 254, 143, 255, 89, 80, 15, 255, 35, 8, 124, 123, 181, 247, 28, 191, 254, 32, 16, 88, 252, 141, 239, 0, 171, 53, 29, 3, 48, 24, 216, 48, 29, 11, 32, 8, 95, 23, 114, 239, 29, 248, 255, 255, 128, 0, 255, 150, 212, 79, 178, 15, + 255, 6, 3, 46, 32, 123, 112, 15, 127, 17, 201, 9, 239, 26, 246, 30, 235, 12, 46, 172, 23, 11, 5, 87, 24, 255, 14, 30, 251, 15, 48, 3, 255, 255, 194, 95, 24, 230, 250, 30, 6, 249, 191, 21, 255, 249, 204, 1, 188, 60, 247, 44, 251, 226, 0, 34, 221, 47, 7, 80, 108, 255, 24, 31, 255, 7, 208, 3, 4, 126, + 17, 80, 107, 40, 119, 191, 0, 211, 95, 3, 137, 251, 187, 187, 32, 84, 30, 131, 176, 30, 135, 128, 227, 126, 150, 27, 235, 32, 111, 150, 6, 49, 59, 31, 164, 55, 155, 113, 89, 96, 18, 215, 183, 245, 15, 255, 16, 2, 207, 65, 239, 223, 255, 232, 17, 17, 239, 62, 3, 78, 11, 246, 49, 143, 59, 207, 26, 120, 175, 85, + 31, 134, 3, 47, 134, 191, 49, 143, 64, 33, 151, 6, 20, 25, 2, 13, 127, 6, 13, 255, 23, 207, 30, 112, 29, 31, 223, 34, 119, 237, 0, 1, 103, 218, 23, 3, 207, 51, 119, 160, 141, 0, 25, 122, 50, 127, 47, 208, 142, 193, 58, 227, 7, 79, 30, 130, 7, 193, 243, 31, 115, 124, 128, 0, 191, 162, 144, 31, 254, 244, + 74, 11, 15, 112, 18, 91, 111, 63, 43, 110, 88, 63, 123, 5, 32, 143, 239, 195, 45, 134, 31, 14, 28, 154, 253, 16, 14, 255, 255, 193, 191, 47, 251, 250, 109, 29, 124, 128, 45, 41, 251, 125, 128, 63, 255, 246, 94, 77, 107, 255, 18, 166, 255, 255, 229, 0, 18, 41, 238, 176, 64, 127, 31, 252, 2, 191, 226, 9, 86, 9, + 66, 15, 255, 8, 143, 31, 247, 45, 91, 26, 228, 25, 155, 63, 9, 15, 1, 221, 228, 255, 66, 144, 245, 255, 209, 137, 14, 0, 209, 122, 48, 31, 199, 240, 63, 199, 160, 3, 15, 128, 17, 79, 43, 93, 255, 31, 135, 3, 83, 7, 159, 53, 11, 1, 191, 210, 255, 246, 60, 119, 242, 92, 83, 57, 247, 160, 29, 231, 238, 248, + 0, 70, 40, 249, 111, 255, 253, 64, 111, 239, 249, 119, 9, 91, 147, 9, 255, 251, 153, 67, 96, 131, 25, 80, 127, 46, 7, 32, 137, 27, 170, 0, 96, 63, 223, 255, 29, 243, 96, 12, 255, 211, 0, 1, 153, 151, 1, 157, 6, 46, 85, 27, 253, 89, 210, 255, 255, 57, 46, 208, 239, 96, 255, 8, 22, 59, 1, 223, 128, 15, + 255, 156, 235, 38, 119, 119, 31, 68, 255, 48, 3, 57, 153, 158, 191, 95, 147, 127, 255, 119, 119, 119, 80, 31, 254, 190, 247, 31, 254, 248, 255, 233, 153, 128, 182, 222, 180, 41, 31, 168, 239, 248, 31, 160, 251, 176, 3, 15, 255, 17, 94, 24, 115, 1, 84, 255, 191, 255, 0, 77, 61, 91, 220, 245, 14, 26, 224, 6, 253, 96, + 67, 71, 45, 227, 74, 22, 251, 239, 31, 220, 17, 247, 213, 17, 247, 255, 19, 153, 127, 29, 210, 4, 113, 1, 255, 254, 187, 1, 55, 31, 187, 64, 3, 253, 85, 192, 127, 250, 0, 179, 86, 31, 255, 253, 90, 167, 64, 15, 123, 35, 4, 85, 18, 72, 223, 255, 2, 31, 8, 12, 255, 254, 173, 79, 79, 29, 220, 127, 20, 126, + 32, 3, 111, 255, 144, 0, 253, 32, 143, 226, 0, 252, 49, 83, 239, 255, 170, 32, 31, 3, 144, 21, 205, 192, 21, 189, 208, 18, 158, 191, 160, 15, 237, 44, 2, 51, 51, 14, 255, 249, 187, 88, 20, 14, 255, 0, 78, 47, 235, 89, 186, 113, 202, 239, 51, 48, 255, 21, 10, 51, 255, 20, 13, 113, 105, 175, 238, 25, 145, 21, + 43, 252, 3, 239, 20, 20, 89, 0, 233, 60, 221, 223, 92, 119, 15, 68, 139, 57, 143, 239, 124, 83, 235, 254, 255, 253, 221, 196, 46, 77, 25, 18, 235, 53, 255, 246, 31, 125, 252, 46, 33, 50, 187, 50, 63, 248, 144, 3, 85, 239, 68, 62, 47, 30, 187, 10, 126, 4, 29, 249, 1, 62, 239, 36, 243, 159, 255, 250, 31, 215, + 144, 165, 8, 39, 228, 136, 77, 194, 42, 71, 254, 31, 228, 130, 250, 239, 255, 194, 0, 62, 31, 115, 2, 43, 89, 149, 9, 135, 248, 144, 127, 48, 27, 116, 112, 27, 120, 32, 13, 160, 147, 9, 1, 78, 96, 255, 43, 136, 78, 245, 14, 118, 48, 141, 92, 29, 123, 255, 81, 147, 1, 17, 79, 239, 191, 31, 154, 145, 211, 40, + 12, 245, 127, 24, 81, 239, 209, 143, 5, 127, 21, 143, 87, 77, 135, 5, 31, 239, 30, 65, 99, 110, 255, 253, 93, 28, 131, 210, 28, 231, 85, 255, 242, 28, 137, 247, 111, 17, 239, 254, 18, 27, 139, 176, 0, 173, 255, 247, 252, 16, 18, 239, 25, 137, 45, 255, 255, 101, 161, 239, 153, 239, 208, 123, 1, 127, 17, 14, 29, 44, + 4, 202, 203, 48, 103, 111, 45, 119, 11, 192, 3, 159, 20, 68, 202, 1, 80, 37, 74, 54, 7, 243, 144, 3, 246, 28, 187, 46, 162, 127, 45, 12, 79, 136, 115, 51, 51, 50, 15, 255, 18, 137, 11, 111, 107, 15, 255, 1, 126, 111, 173, 14, 111, 3, 62, 143, 64, 124, 31, 255, 112, 221, 221, 219, 16, 14, 143, 2, 15, 255, + 16, 219, 10, 255, 73, 239, 4, 187, 223, 173, 3, 0, 237, 0, 40, 207, 111, 115, 187, 190, 28, 224, 13, 30, 30, 220, 28, 39, 28, 15, 255, 207, 255, 252, 32, 118, 166, 127, 74, 11, 252, 29, 243, 36, 233, 0, 0, 40, 20, 111, 25, 50, 0, 255, 24, 61, 255, 255, 200, 32, 63, 2, 192, 20, 40, 251, 5, 81, 4, 205, + 221, 221, 150, 13, 94, 119, 94, 23, 0, 19, 117, 3, 196, 130, 123, 173, 221, 125, 139, 57, 40, 253, 255, 247, 30, 151, 192, 217, 5, 207, 29, 15, 2, 85, 192, 31, 13, 171, 1, 214, 67, 95, 255, 251, 94, 167, 15, 160, 19, 170, 208, 42, 104, 0, 207, 167, 192, 12, 212, 75, 94, 85, 15, 38, 99, 0, 17, 30, 78, 8, + 255, 1, 231, 53, 15, 39, 3, 243, 17, 16, 245, 111, 9, 3, 127, 32, 101, 111, 35, 131, 28, 11, 9, 181, 15, 56, 251, 246, 80, 103, 3, 48, 5, 15, 0, 223, 3, 115, 1, 149, 15, 14, 127, 16, 197, 111, 4, 11, 159, 0, 213, 111, 223, 207, 245, 111, 5, 15, 56, 59, 65, 15, 15, 194, 4, 103, 22, 221, 2, 250, + 216, 159, 175, 236, 64, 0, 154, 231, 32, 251, 9, 42, 61, 14, 115, 15, 255, 0, 173, 198, 221, 255, 39, 99, 31, 255, 24, 87, 53, 255, 74, 135, 166, 6, 31, 139, 11, 28, 145, 29, 253, 221, 196, 29, 131, 191, 252, 29, 135, 248, 159, 254, 51, 32, 159, 250, 254, 7, 153, 223, 255, 27, 39, 255, 43, 145, 228, 27, 255, 241, + 0, 3, 10, 15, 128, 16, 31, 72, 247, 46, 92, 245, 159, 255, 245, 10, 31, 228, 15, 46, 147, 253, 189, 48, 63, 232, 255, 196, 119, 207, 30, 114, 159, 255, 255, 254, 48, 159, 143, 255, 229, 159, 95, 16, 31, 207, 30, 143, 223, 0, 4, 168, 159, 73, 31, 255, 159, 0, 127, 48, 15, 255, 15, 159, 80, 3, 43, 163, 6, 63, + 252, 15, 80, 255, 253, 11, 255, 241, 145, 5, 105, 25, 16, 0, 18, 10, 243, 42, 119, 78, 135, 62, 139, 121, 18, 240, 28, 26, 128, 101, 143, 153, 16, 0, 0, 31, 0, 112, 31, 155, 169, 248, 63, 31, 155, 30, 47, 6, 14, 255, 19, 50, 3, 171, 52, 67, 119, 33, 243, 0, 69, 239, 180, 187, 16, 0, 102, 7, 149, 85, + 16, 0, 228, 158, 189, 31, 235, 255, 29, 240, 255, 85, 28, 168, 95, 29, 3, 47, 26, 35, 95, 25, 144, 79, 155, 255, 5, 126, 17, 52, 226, 255, 255, 37, 119, 6, 255, 77, 9, 48, 4, 255, 144, 0, 239, 208, 6, 147, 0, 31, 12, 0, 42, 102, 15, 31, 255, 248, 14, 13, 28, 5, 31, 236, 191, 15, 192, 6, 20, 33, + 7, 0, 111, 6, 64, 31, 32, 31, 183, 224, 9, 65, 19, 0, 3, 10, 91, 55, 127, 203, 17, 127, 83, 51, 119, 139, 255, 185, 245, 153, 153, 255, 133, 64, 127, 255, 30, 115, 187, 203, 187, 96, 27, 11, 47, 3, 176, 58, 47, 153, 153, 146, 64, 16, 159, 47, 15, 246, 15, 128, 18, 44, 231, 26, 49, 75, 32, 193, 135, 32, + 255, 175, 55, 123, 18, 0, 225, 135, 46, 71, 43, 93, 116, 34, 111, 187, 187, 161, 1, 167, 15, 0, 81, 127, 1, 135, 1, 59, 0, 255, 2, 31, 11, 0, 43, 0, 87, 47, 255, 16, 37, 80, 3, 145, 3, 221, 8, 143, 3, 38, 31, 253, 47, 190, 16, 239, 221, 221, 216, 15, 251, 32, 1, 17, 17, 0, 71, 24, 113, 3, + 106, 127, 28, 233, 175, 255, 17, 17, 17, 153, 16, 86, 251, 41, 22, 253, 16, 29, 143, 236, 111, 32, 82, 91, 131, 16, 11, 127, 23, 127, 80, 103, 32, 107, 111, 76, 11, 111, 44, 15, 69, 159, 63, 207, 32, 255, 249, 1, 245, 48, 255, 249, 111, 16, 3, 191, 16, 7, 61, 111, 16, 11, 0, 49, 30, 7, 134, 255, 253, 155, + 98, 41, 155, 17, 223, 140, 111, 24, 156, 124, 139, 196, 28, 151, 156, 251, 11, 255, 17, 44, 197, 2, 171, 187, 233, 123, 179, 123, 244, 169, 153, 119, 84, 15, 200, 6, 247, 6, 255, 72, 0, 59, 98, 125, 43, 7, 13, 0, 35, 51, 62, 29, 225, 255, 161, 11, 148, 143, 120, 26, 73, 39, 77, 107, 119, 244, 143, 58, 171, 128, + 191, 255, 210, 31, 255, 243, 15, 255, 17, 3, 187, 170, 207, 78, 64, 9, 26, 219, 15, 30, 97, 63, 31, 52, 165, 63, 63, 68, 208, 23, 126, 30, 123, 254, 37, 123, 64, 213, 84, 191, 28, 137, 11, 23, 9, 4, 26, 240, 3, 127, 26, 244, 8, 255, 247, 16, 111, 255, 241, 179, 97, 63, 239, 253, 119, 79, 255, 32, 3, 254, + 153, 40, 143, 255, 64, 127, 96, 90, 115, 252, 72, 55, 223, 99, 44, 180, 181, 62, 31, 91, 1, 159, 5, 123, 5, 112, 54, 83, 252, 233, 64, 0, 35, 8, 61, 3, 251, 0, 3, 3, 63, 148, 127, 168, 210, 14, 127, 46, 2, 15, 192, 6, 108, 20, 114, 163, 126, 11, 55, 0, 110, 22, 24, 127, 254, 5, 231, 20, 87, 119, + 122, 38, 123, 117, 44, 87, 0, 103, 175, 79, 208, 5, 31, 116, 8, 211, 255, 242, 58, 119, 253, 135, 119, 31, 244, 215, 216, 167, 191, 29, 133, 5, 32, 224, 30, 244, 159, 255, 48, 166, 96, 16, 3, 251, 16, 7, 25, 33, 48, 113, 16, 15, 69, 31, 199, 185, 31, 203, 47, 207, 15, 128, 3, 151, 47, 215, 64, 32, 31, 219, + 45, 246, 9, 25, 35, 43, 215, 25, 124, 67, 251, 55, 131, 159, 25, 105, 156, 57, 27, 2, 255, 252, 131, 110, 46, 30, 239, 30, 124, 255, 30, 47, 223, 235, 64, 45, 28, 236, 0, 223, 225, 57, 1, 133, 0, 64, 115, 0, 3, 0, 242, 111, 254, 0, 83, 15, 255, 16, 40, 211, 7, 208, 3, 170, 5, 123, 239, 247, 144, 3, + 249, 134, 131, 141, 110, 15, 203, 7, 146, 174, 15, 47, 186, 128, 32, 167, 221, 221, 215, 220, 48, 15, 255, 29, 10, 95, 135, 159, 3, 221, 197, 221, 239, 26, 7, 58, 147, 189, 59, 16, 29, 113, 48, 114, 30, 5, 237, 221, 141, 37, 127, 31, 119, 189, 126, 235, 255, 0, 25, 129, 255, 112, 223, 250, 255, 138, 208, 16, 23, 144, + 3, 15, 255, 15, 30, 30, 64, 95, 17, 141, 168, 143, 31, 59, 127, 22, 105, 63, 30, 57, 26, 132, 58, 147, 254, 0, 5, 191, 124, 255, 249, 13, 31, 87, 175, 13, 29, 15, 29, 28, 143, 29, 23, 255, 252, 95, 30, 34, 243, 30, 38, 80, 13, 253, 146, 0, 228, 12, 255, 229, 48, 135, 64, 3, 253, 192, 123, 0, 127, 19, + 94, 15, 161, 12, 27, 31, 204, 4, 2, 222, 96, 31, 37, 170, 240, 27, 141, 241, 16, 112, 242, 25, 95, 248, 45, 162, 191, 68, 63, 155, 80, 143, 246, 7, 237, 49, 202, 16, 15, 23, 251, 36, 50, 47, 29, 31, 127, 29, 52, 144, 255, 29, 48, 31, 187, 177, 14, 96, 18, 20, 242, 42, 115, 44, 227, 119, 239, 195, 4, 255, + 234, 23, 81, 32, 143, 255, 242, 112, 0, 3, 188, 124, 49, 41, 24, 226, 67, 226, 254, 255, 206, 255, 254, 250, 1, 207, 18, 206, 205, 7, 239, 80, 26, 95, 255, 121, 48, 30, 175, 241, 166, 80, 31, 255, 208, 95, 151, 9, 103, 6, 3, 239, 79, 115, 16, 32, 7, 30, 223, 45, 251, 250, 51, 23, 19, 27, 77, 247, 138, 1, + 209, 217, 207, 30, 17, 6, 39, 120, 45, 96, 29, 100, 9, 233, 255, 243, 246, 16, 3, 253, 80, 7, 32, 15, 4, 234, 91, 255, 243, 30, 194, 243, 28, 206, 243, 2, 253, 16, 85, 39, 196, 223, 85, 3, 2, 40, 119, 3, 209, 1, 251, 247, 183, 159, 255, 244, 69, 7, 229, 0, 121, 149, 133, 26, 24, 27, 124, 31, 31, 232, + 63, 31, 236, 75, 150, 190, 64, 115, 48, 3, 7, 44, 239, 172, 80, 27, 155, 179, 80, 31, 39, 241, 255, 0, 127, 18, 15, 255, 13, 63, 255, 230, 213, 85, 63, 25, 215, 128, 3, 255, 255, 32, 123, 180, 8, 91, 43, 85, 93, 22, 145, 11, 128, 3, 32, 115, 96, 80, 3, 176, 0, 0, 0, 255, 1, 17, 255, 2, 34, 255, + 3, 51, 255, 4, 68, 255, 15, 5, 85, 255, 6, 102, 255, 7, 119, 255, 15, 255, 137, 67, 87, 68, 72, 47, 30, 251, 42, 247, 84, 47, 235, 9, 0, 9, 1, 255, 5, 7, 0, 5, 5, 0, 20, 20, 239, 0, 18, 18, 32, 2, 19, 19, 0, 15, 159, 15, 32, 2, 16, 14, 6, 6, 0, 17, 17, 252, 0, 14, 14, 0, + 23, 23, 80, 26, 16, 35, 25, 16, 41, 160, 35, 16, 53, 24, 24, 32, 38, 16, 56, 13, 182, 13, 32, 50, 22, 22, 32, 2, 25, 25, 32, 53, 192, 21, 21, 32, 89, 16, 11, 16, 86, 64, 14, 16, 23, 16, 107, 0, 64, 2, 16, 35, 64, 14, 16, 95, 160, 14, 64, 23, 16, 65, 16, 62, 0, 16, 77, 16, 125, 16, + 128, 160, 20, 64, 2, 64, 62, 112, 26, 16, 194, 3, 16, 110, 112, 41, 64, 59, 64, 68, 160, 20, 16, 152, 26, 26, 59, 32, 179, 16, 212, 67, 77, 65, 27, 178, 1, 108, 58, 47, 249, 127, 125, 85, 0, 32, 31, 250, 33, 30, 141, 175, 46, 31, 145, 65, 30, 124, 66, 0, 4, 0, 171, 67, 31, 57, 68, 30, 61, 69, + 30, 61, 70, 0, 235, 8, 0, 72, 17, 60, 73, 29, 197, 75, 0, 255, 11, 0, 76, 0, 12, 0, 77, 0, 255, 13, 0, 78, 0, 14, 0, 79, 0, 239, 15, 0, 80, 28, 89, 81, 0, 17, 0, 234, 82, 0, 18, 30, 146, 19, 17, 107, 20, 16, 85, 255, 21, 0, 86, 0, 22, 0, 87, 0, 254, 23, 0, 88, 0, 24, + 0, 89, 30, 245, 255, 95, 0, 26, 0, 105, 0, 27, 172, 255, 116, 0, 28, 172, 196, 0, 29, 172, 255, 224, 0, 30, 176, 152, 0, 31, 176, 255, 180, 0, 32, 177, 35, 0, 33, 178, 255, 148, 0, 34, 178, 200, 0, 35, 178, 255, 228, 0, 36, 179, 0, 0, 37, 180, 255, 220, 0, 38, 181, 20, 0, 39, 181, 255, 160, 0, + 40, 183, 236, 0, 41, 184, 255, 92, 0, 42, 185, 124, 0, 43, 185, 255, 172, 0, 44, 185, 200, 0, 45, 186, 255, 133, 0, 46, 186, 168, 0, 47, 186, 255, 187, 0, 48, 188, 132, 0, 49, 188, 255, 248, 0, 50, 189, 136, 0, 51, 192, 255, 172, 0, 52, 193, 28, 0, 53, 193, 255, 36, 0, 54, 193, 56, 0, 55, 193, 255, + 75, 0, 56, 194, 136, 0, 57, 194, 255, 164, 0, 58, 194, 181, 0, 59, 194, 255, 220, 0, 60, 194, 237, 0, 61, 197, 255, 180, 0, 62, 198, 36, 0, 63, 198, 255, 169, 0, 64, 198, 208, 0, 65, 199, 255, 64, 0, 66, 199, 68, 0, 67, 199, 255, 116, 0, 68, 199, 125, 0, 69, 199, 255, 136, 0, 70, 199, 144, 0, 71, + 199, 255, 165, 0, 72, 200, 0, 0, 73, 200, 255, 4, 0, 74, 200, 252, 0, 75, 201, 255, 192, 0, 76, 204, 180, 0, 77, 208, 255, 108, 0, 78, 210, 188, 0, 79, 211, 255, 124, 0, 80, 213, 88, 0, 81, 213, 255, 92, 0, 82, 213, 136, 0, 83, 213, 176, 216, 66, 109, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 97, + 122, 48, 0, 0, 35, 32, 0, 0, 0, 0, 0, 0, 0, 0, 255, 82, 65, 82, 67, 0, 0, 35, 32, 236, 0, 0, 0, 16, 3, 2, 128, 16, 6, 80, 3, 90, 112, 1, 4, 64, 27, 0, 18, 16, 35, 96, 16, 39, 255, 160, 0, 0, 1, 224, 0, 18, 1, 123, 48, 34, 82, 79, 79, 84, 16, 59, 5, 234, 239, 23, + 0, 5, 32, 51, 65, 78, 73, 77, 119, 16, 75, 24, 15, 193, 48, 15, 5, 66, 76, 190, 89, 32, 31, 63, 16, 1, 0, 3, 16, 99, 251, 10, 84, 73, 77, 71, 16, 107, 93, 17, 191, 155, 48, 47, 13, 255, 255, 15, 193, 2, 23, 16, 47, 16, 127, 32, 80, 16, 32, 119, 255, 255, 16, 171, 1, 16, 19, 63, 16, 147, + 2, 128, 19, 17, 155, 87, 16, 39, 93, 16, 167, 3, 128, 39, 0, 46, 2, 44, 128, 168, 96, 19, 184, 16, 79, 2, 255, 16, 0, 96, 79, 255, 0, 5, 185, 60, 17, 0, 0, 29, 110, 64, 211, 1, 28, 48, 219, 6, 65, 18, 16, 19, 151, 42, 16, 203, 16, 251, 1, 32, 127, 0, 0, 7, 213, 154, 236, 16, 39, 52, + 17, 7, 64, 17, 15, 248, 79, 208, 99, 1, 224, 99, 160, 119, 0, 10, 247, 220, 77, 16, 99, 68, 16, 158, 16, 59, 27, 168, 208, 159, 2, 119, 0, 59, 11, 13, 202, 247, 16, 159, 98, 0, 0, 223, 31, 0, 81, 99, 0, 0, 14, 71, 177, 75, 16, 179, 109, 16, 19, 33, 115, 192, 49, 143, 15, 234, 169, 8, 16, 199, + 134, 17, 170, 32, 96, 39, 145, 3, 3, 63, 0, 159, 11, 0, 4, 5, 46, 0, 46, 46, 0, 101, 255, 114, 114, 111, 114, 109, 101, 115, 115, 255, 97, 103, 101, 119, 105, 110, 100, 111, 255, 119, 0, 97, 110, 105, 109, 0, 97, 255, 112, 112, 101, 97, 114, 46, 98, 114, 254, 108, 97, 110, 0, 101, 110, 100, 80, 9, 247, 119, + 97, 105, 116, 80, 20, 98, 108, 121, 143, 116, 0, 62, 1, 32, 50, 16, 24, 116, 105, 109, 103, 255, 0, 109, 121, 98, 97, 115, 101, 46, 227, 116, 112, 108, 16, 10, 0, 42, 1, 64, 24, 115, 121, 231, 115, 98, 103, 48, 36, 192, 173, 82, 76, 65, 251, 78, 254, 255, 0, 10, 49, 183, 16, 0, 250, 2, 112, 97, 116, 49, + 18, 171, 36, 82, 159, 171, 28, 80, 11, 20, 34, 141, 65, 48, 174, 0, 0, 238, 112, 97, 105, 32, 35, 232, 0, 21, 113, 123, 190, 20, 80, 43, 156, 87, 105, 110, 69, 32, 237, 143, 77, 64, 237, 113, 156, 82, 227, 80, 82, 76, 80, 189, 65, 66, 217, 0, 12, 0, 1, 113, 229, 12, 102, 35, 15, 193, 240, 18, 200, 17, + 137, 65, 160, 160, 159, 210, 86, 67, 112, 47, 16, 192, 47, 51, 15, 76, 64, 47, 217, 67, 127, 67, 81, 66, 71, 1, 141, 0, 80, 111, 28, 41, 0, 75, 30, 209, 31, 24, 145, 31, 32, 82, 157, 34, 235, 32, 247, 0, 30, 0, 50, 35, 173, 69, 110, 100, 20, 1, 27, 71, 112, 239, 20, 29, 66, 20, 77, 64, 1, 27, + 13, 33, 15, 192, 193, 76, 193, 75, 1, 27, 38, 0, 75, 2, 2, 63, 0, 19, 207, 162, 63, 186, 1, 146, 63, 20, 0, 30, 36, 205, 87, 18, 215, 58, 36, 247, 82, 63, 196, 0, 11, 242, 63, 132, 2, 63, 13, 164, 68, 242, 63, 1, 1, 35, 0, 242, 51, 1, 193, 23, 2, 39, 31, 51, 0, 63, 1, 131, 63, 89, + 84, 67, 63, 20, 147, 16, 0, 171, 37, 19, 175, 49, 99, 47, 68, 21, 117, 67, 228, 250, 0, 0, 116, 120, 108, 35, 83, 84, 53, 161, 43, 69, 139, 37, 254, 35, 86, 3, 60, 38, 11, 77, 121, 181, 66, 99, 197, 77, 121, 163, 65, 87, 131, 197, 77, 253, 121, 83, 121, 115, 66, 71, 51, 234, 102, 170, 110, 48, 83, 104, + 208, 83, 44, 86, 87, 67, 48, 83, 126, 68, 113, 70, 111, 110, 116, 50, 54, 20, 101, 238, 102, 110, 116, 192, 19, 107, 111, 114, 0, 22, 2, 227, 115, 99, 104, 80, 45, 21, 32, 52, 15, 6, 140, 213, 0, 22, 54, 177, 100, 22, 199, 164, 70, 74, 1, 165, 92, 22, 167, 184, 22, 211, 19, 251, 2, 22, 163, 2, 170, 148, + 22, 223, 212, 22, 62, 48, 22, 66, 140, 22, 70, 149, 204, 22, 218, 19, 215, 4, 19, 161, 4, 16, 15, 4, 85, 16, 15, 5, 19, 231, 5, 19, 177, 5, 16, 31, 5, 89, 16, 31, 6, 19, 247, 6, 76, 164, 43, 119, 23, 230, 81, 16, 1, 240, 112, 7, 255, 96, 1, 224, 0, 39, 71, 83, 218, 104, 97, 65, 37, 67, + 32, 5, 138, 6, 100, 0, 63, 8, 219, 1, 17, 229, 191, 63, 128, 64, 3, 1, 4, 180, 30, 128, 91, 76, 84, 0, 91, 36, 1, 0, 91, 8, 0, 180, 3, 250, 60, 0, 90, 0, 150, 112, 7, 255, 0, 183, 38, 38, 0, 180, 3, 0, 91, 26, 1, 1, 19, 11, 1, 178, 3, 0, 80, 112, 7, 158, 80, 1, 175, 13, + 86, 30, 74, 112, 74, 97, 0, 63, 32, 10, 0, 60, 3, 2, 47, 25, 6, 35, 2, 215, 195, 150, 2, 47, 11, 2, 193, 213, 111, 34, 47, 66, 228, 66, 47, 80, 105, 99, 68, 244, 117, 109, 109, 121, 8, 19, 3, 255, 192, 1, 2, 139, 33, 255, 84, 101, 120, 116, 72, 97, 108, 102, 0, 1, 119, 35, 0, 60, 3, 3, + 103, 28, 96, 127, 193, 184, 0, 127, 29, 177, 245, 3, 231, 25, 120, 88, 83, 75, 114, 75, 111, 4, 39, 38, 0, 66, 3, 2, 119, 29, 240, 67, 110, 83, 105, 0, 127, 45, 192, 66, 3, 55, 25, 97, 255, 0, 193, 3, 1, 255, 29, 177, 64, 1, 255, 36, 193, 3, 2, 127, 29, 177, 64, 5, 231, 25, 239, 112, 97, 110, + 42, 155, 76, 1, 4, 255, 255, 0, 82, 111, 111, 116, 80, 97, 110, 142, 101, 3, 201, 15, 213, 211, 103, 147, 112, 97, 115, 42, 231, 244, 8, 112, 105, 99, 42, 239, 128, 32, 83, 4, 23, 17, 48, 0, 83, 11, 246, 155, 8, 1, 182, 83, 230, 95, 38, 103, 96, 211, 137, 7, 16, 211, 11, 59, 2, 46, 39, 128, 80, 3, + 6, 167, 6, 65, 157, 240, 74, 19, 96, 211, 119, 110, 100, 43, 195, 164, 22, 33, 39, 119, 27, 220, 164, 65, 30, 9, 193, 16, 1, 39, 8, 212, 67, 250, 27, 83, 130, 11, 75, 7, 104, 43, 235, 247, 139, 128, 1, 0, 239, 16, 62, 223, 30, 144, 160, 163, 0, 160, 3, 0, 247, 17, 0, 163, 35, 140, 3, 0, 163, 21, + 31, 149, 114, 27, 1, 255, 5, 215, 7, 47, 200, 202, 66, 218, 1, 71, 9, 44, 147, 176, 2, 27, 1, 9, 2, 27, 24, 13, 34, 239, 2, 24, 3, 2, 239, 17, 226, 27, 116, 120, 45, 223, 1, 146, 200, 82, 27, 9, 122, 3, 64, 127, 16, 2, 27, 5, 225, 29, 111, 190, 82, 31, 233, 84, 1, 84, 0, 5, 79, 24, + 95, 31, 251, 116, 105, 156, 65, 183, 153, 154, 65, 231, 237, 153, 153, 41, 71, 47, 232, 0, 87, 0, 190, 228, 26, 169, 114, 0, 101, 0, 110, 26, 65, 186, 32, 26, 69, 101, 0, 115, 30, 15, 76, 48, 7, 255, 101, 0, 45, 0, 47, 0, 83, 0, 174, 99, 80, 35, 105, 31, 169, 118, 0, 111, 16, 47, 186, 45, 30, 151, + 103, 0, 97, 16, 53, 103, 48, 47, 169, 105, 31, 175, 32, 16, 41, 112, 48, 37, 32, 47, 101, 42, 16, 85, 64, 79, 114, 30, 195, 87, 16, 59, 105, 16, 77, 174, 75, 16, 61, 110, 16, 97, 111, 0, 108, 16, 115, 114, 32, 55, 115, 0, 116, 30, 127, 32, 91, 110, 30, 135, 167, 70, 16, 137, 104, 48, 27, 32, 53, 97, + 0, 117, 210, 0, 102, 16, 103, 101, 16, 35, 32, 163, 116, 48, 167, 170, 46, 30, 175, 66, 16, 139, 116, 48, 15, 32, 16, 73, 164, 105, 80, 181, 100, 48, 9, 128, 109, 66, 16, 215, 64, 19, 129, 110, 16, 73, 64, 171, 32, 179, 32, 123, 32, 63, 64, 19, 44, 92, 30, 255, 117, 16, 191, 10, 0, 119, 80, 23, 32, 187, + 85, 32, 157, 73, 17, 21, 102, 48, 239, 109, 16, 235, 116, 28, 16, 255, 32, 189, 33, 43, 32, 0, 122, 16, 155, 32, 183, 164, 114, 27, 233, 97, 16, 205, 96, 155, 0, 161, 199, 2, 22, 6, 38, 3, 63, 15, 161, 199, 0, 1, 199, 255, 1, 199, 89, 0, 240, 195, 143, 39, 203, 23, 51, 143, 192, 3, 143, 16, 18, 45, + 122, 0, 6, 40, 29, 117, 227, 143, 216, 31, 251, 4, 86, 43, 35, 220, 51, 39, 255, 48, 234, 48, 226, 48, 179, 48, 243, 255, 48, 110, 144, 26, 79, 225, 48, 76, 255, 82, 7, 48, 140, 48, 126, 48, 87, 255, 48, 95, 0, 10, 48, 100, 48, 106, 223, 48, 78, 16, 3, 74, 48, 89, 48, 107, 253, 48, 111, 48, 1, 48, + 204, 16, 41, 193, 252, 48, 227, 48, 175, 48, 110, 16, 31, 32, 55, 255, 200, 48, 237, 48, 252, 48, 235, 48, 254, 185, 48, 198, 48, 163, 48, 195, 16, 25, 255, 107, 48, 85, 48, 143, 48, 137, 48, 255, 90, 48, 107, 0, 10, 255, 33, 48, 239, 146, 98, 188, 16, 79, 102, 48, 79, 48, 161, 96, 16, 25, 68, 52, 36, 144, + 239, 12, 4, 4, 70, 239, 192, 172, 128, 0, 239, 21, 7, 0, 239, 146, 1, 20, 197, 111, 202, 194, 82, 1, 223, 23, 160, 23, 59, 15, 30, 150, 1, 223, 5, 64, 85, 187, 255, 200, 56, 204, 96, 49, 85, 49, 72, 255, 214, 16, 49, 74, 214, 0, 186, 0, 255, 49, 57, 49, 74, 49, 72, 186, 112, 255, 177, 120, 0, 10, + 49, 96, 205, 8, 247, 187, 164, 211, 240, 16, 17, 77, 186, 112, 255, 184, 36, 49, 78, 184, 225, 49, 78, 254, 186, 0, 210, 44, 200, 224, 205, 16, 31, 255, 179, 140, 201, 108, 49, 78, 187, 52, 223, 49, 87, 32, 67, 204, 208, 186, 168, 0, 130, 10, 0, 79, 61, 177, 19, 11, 144, 4, 2, 3, 25, 33, 19, 14, 1, 19, + 183, 136, 40, 199, 151, 204, 106, 4, 7, 23, 180, 16, 1, 30, 165, 2, 39, 14, 255, 101, 229, 96, 105, 107, 33, 101, 229, 255, 98, 55, 82, 23, 91, 102, 150, 232, 255, 151, 139, 152, 157, 154, 168, 131, 170, 255, 103, 47, 78, 42, 0, 10, 89, 130, 255, 78, 0, 79, 196, 78, 76, 78, 13, 255, 96, 118, 150, 63, 108, 153, + 78, 148, 255, 83, 69, 103, 58, 79, 238, 150, 63, 255, 78, 76, 79, 196, 0, 10, 130, 207, 255, 79, 196, 101, 135, 108, 213, 102, 110, 255, 114, 53, 110, 170, 78, 148, 78, 42, 255, 78, 34, 101, 229, 101, 224, 84, 200, 255, 89, 130, 0, 10, 95, 151, 82, 6, 255, 150, 63, 139, 237, 84, 140, 89, 130, 247, 81, 101, 89, 28, + 32, 5, 99, 201, 98, 224, 17, 0, 10, 0, 117, 43, 177, 39, 13, 76, 4, 4, 63, 25, 33, 39, 184, 16, 1, 39, 196, 112, 97, 101, 76, 223, 234, 67, 111, 193, 49, 11, 103, 25, 10, 67, 4, 0, 248, 92, 95, 0, 81, 1, 74, 67, 194, 154, 84, 10, 67, 13, 28, 7, 0, 130, 16, 1, 10, 10, 67, 17, 170, 86, + 26, 61, 117, 26, 27, 108, 57, 211, 122, 26, 69, 149, 99, 57, 229, 41, 41, 99, 89, 77, 32, 89, 239, 78, 58, 57, 135, 42, 79, 117, 0, 107, 26, 111, 224, 57, 191, 186, 97, 26, 77, 116, 0, 233, 26, 19, 233, 48, 59, 129, 109, 57, 111, 42, 145, 42, 35, 74, 59, 42, 155, 41, 113, 106, 72, 26, 127, 117, 48, 113, + 42, 95, 49, 41, 113, 119, 171, 48, 247, 53, 0, 244, 3, 93, 171, 194, 76, 0, 247, 21, 11, 0, 247, 155, 180, 21, 209, 239, 184, 164, 49, 239, 80, 12, 51, 12, 66, 47, 231, 62, 95, 16, 1, 12, 8, 163, 17, 49, 0, 80, 48, 110, 252, 255, 55, 255, 73, 255, 73, 120, 169, 24, 85, 247, 98, 225, 95, 53, 152, 125, + 233, 48, 146, 246, 99, 165, 125, 154, 168, 101, 48, 2, 224, 179, 42, 0, 176, 3, 97, 171, 72, 0, 179, 21, 13, 0, 179, 87, 196, 211, 87, 40, 184, 44, 1, 103, 23, 80, 16, 1, 18, 8, 43, 95, 176, 195, 0, 192, 3, 40, 1, 119, 26, 32, 195, 19, 0, 195, 103, 208, 212, 223, 183, 140, 2, 239, 23, 160, 92, 16, + 1, 20, 7, 139, 107, 176, 207, 0, 204, 3, 3, 11, 26, 32, 207, 142, 21, 0, 207, 108, 134, 219, 192, 7, 103, 114, 112, 45, 75, 255, 28, 82, 111, 111, 116, 71, 114, 111, 238, 117, 112, 0, 0, 0, 17, 32, 175, 48, 31, 56, 132, 1, 31, 60, 20, 149, 17, 169, 47, 69, 8, 16, 1, 141, 122, 73, 111, 87, 1, 80, + 39, 191, 103, 255, 0, 0, 13, 0, 95, 3, 16, 30, 24, 117, 0, 95, 21, 79, 212, 57, 204, 0, 9, 16, 75, 245, 143, 255, 255, 3, 31, 156, 10, 31, 160, 13, 73, 31, 164, 14, 32, 95, 31, 245, 204, 16, 0, 0, 135, 2, 182, 213, 17, 107, 32, 35, 251, 16, 39, 246, 16, 43, 241, 79, 80, 3, 246, 80, 19, 48, + 63, 48, 0, 3, 191, 40, 31, 251, 44, 141, 31, 80, 3, 111, 32, 19, 32, 59, 0, 191, 7, 82, 1, 31, 33, 221, 16, 0, 187, 80, 0, 32, 175, 238, 16, 0, 0, 46, 159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 67, 48, 0, 0, 0, 0, 0, 0, 67, 48, 0, 0, 128, 0, 0, 0, 67, 48, 0, 0}; diff --git a/include/Game/System/FileHolder.hpp b/include/Game/System/FileHolder.hpp index a46081422..0f968691b 100644 --- a/include/Game/System/FileHolder.hpp +++ b/include/Game/System/FileHolder.hpp @@ -7,32 +7,32 @@ class JKRHeap; class FileHolderFileEntry { public: - FileHolderFileEntry(const char *, JKRHeap *, void *); + FileHolderFileEntry(const char*, JKRHeap*, void*); ~FileHolderFileEntry(); - - void waitReadDone(); - void setContext(void *, JKRHeap *); - s32 mEntryNum; // 0x0 - void* mContext; // 0x4 - JKRHeap* mHeap; // 0x8 - s32 mState; // 0xC + void waitReadDone(); + void setContext(void*, JKRHeap*); + + s32 mEntryNum; // 0x0 + void* mContext; // 0x4 + JKRHeap* mHeap; // 0x8 + s32 mState; // 0xC OSMessageQueue mQueue; // 0x10 - OSMessage mMessage; // 0x30 - bool mContextSet; // 0x34 + OSMessage mMessage; // 0x30 + bool mContextSet; // 0x34 }; class FileHolder { public: FileHolder(); - FileHolderFileEntry* add(const char *, JKRHeap *, void *); - bool isExist(const char *) const; - void* getContext(const char *) const; - void removeIfIsEqualHeap(JKRHeap *); + FileHolderFileEntry* add(const char*, JKRHeap*, void*); + bool isExist(const char*) const; + void* getContext(const char*) const; + void removeIfIsEqualHeap(JKRHeap*); - FileHolderFileEntry** removeFile(const char *); - FileHolderFileEntry* findEntry(const char *) const; + FileHolderFileEntry** removeFile(const char*); + FileHolderFileEntry* findEntry(const char*) const; - MR::Vector > mArray; // 0x0 + MR::Vector> mArray; // 0x0 }; diff --git a/include/Game/System/FileLoader.hpp b/include/Game/System/FileLoader.hpp index ca325f806..e98582cc6 100644 --- a/include/Game/System/FileLoader.hpp +++ b/include/Game/System/FileLoader.hpp @@ -14,26 +14,26 @@ class FileLoader { public: FileLoader(); - void requestLoadToMainRAM(const char *, u8 *, JKRHeap *, JKRDvdRipper::EAllocDirection, bool); - void requestMountArchive(const char *, JKRHeap *, bool); - bool isLoaded(const char *) const; - bool isMountedArchive(const char *) const; - void* receiveFile(const char *); - JKRMemArchive* receiveArchive(const char *); - void receiveAllRequestedFile(); - JKRMemArchive* createAndAddArchive(void *, JKRHeap *, const char *); - void getMountedArchiveAndHeap(const char *, JKRArchive **, JKRHeap **) const; - void clearRequestFileInfo(bool); - void removeHolderIfIsEqualHeap(JKRHeap *); - void removeFile(const char *); - bool isNeedToLoad(const char *) const; - const RequestFileInfo* getRequestFileInfoConst(const char *) const; - RequestFileInfo* addRequest(const char *); + void requestLoadToMainRAM(const char*, u8*, JKRHeap*, JKRDvdRipper::EAllocDirection, bool); + void requestMountArchive(const char*, JKRHeap*, bool); + bool isLoaded(const char*) const; + bool isMountedArchive(const char*) const; + void* receiveFile(const char*); + JKRMemArchive* receiveArchive(const char*); + void receiveAllRequestedFile(); + JKRMemArchive* createAndAddArchive(void*, JKRHeap*, const char*); + void getMountedArchiveAndHeap(const char*, JKRArchive**, JKRHeap**) const; + void clearRequestFileInfo(bool); + void removeHolderIfIsEqualHeap(JKRHeap*); + void removeFile(const char*); + bool isNeedToLoad(const char*) const; + const RequestFileInfo* getRequestFileInfoConst(const char*) const; + RequestFileInfo* addRequest(const char*); - FileLoaderThread* mLoaderThread; // 0x0 - OSMutex mMutex; // 0x4 - RequestFileInfo* mRequestFileInfos; // 0x1C - s32 mRequestedFileCount; // 0x20 - FileHolder* mFileHolder; // 0x24 - ArchiveHolder* mArchiveHolder; // 0x28 + FileLoaderThread* mLoaderThread; // 0x0 + OSMutex mMutex; // 0x4 + RequestFileInfo* mRequestFileInfos; // 0x1C + s32 mRequestedFileCount; // 0x20 + FileHolder* mFileHolder; // 0x24 + ArchiveHolder* mArchiveHolder; // 0x28 }; \ No newline at end of file diff --git a/include/Game/System/FileLoaderThread.hpp b/include/Game/System/FileLoaderThread.hpp index b476c3bf9..4c62928be 100644 --- a/include/Game/System/FileLoaderThread.hpp +++ b/include/Game/System/FileLoaderThread.hpp @@ -4,19 +4,19 @@ #include "Game/System/FileHolder.hpp" struct RequestFileInfo { - u32 _0; - s32 mRequestType; // 0x4 - char mFileName[0x80]; // 0x8 - u32 _88; - FileHolderFileEntry* mFileEntry; // 0x8C + u32 _0; + s32 mRequestType; // 0x4 + char mFileName[0x80]; // 0x8 + u32 _88; + FileHolderFileEntry* mFileEntry; // 0x8C }; class FileLoaderThread : public OSThreadWrapper { public: - FileLoaderThread(int, int, JKRHeap *); + FileLoaderThread(int, int, JKRHeap*); virtual void* run(); - void loadToMainRAM(RequestFileInfo *); - void mountArchiveAndStartCreateResource(RequestFileInfo *); + void loadToMainRAM(RequestFileInfo*); + void mountArchiveAndStartCreateResource(RequestFileInfo*); }; \ No newline at end of file diff --git a/include/Game/System/FileRipper.hpp b/include/Game/System/FileRipper.hpp index e095071d4..7cd430161 100644 --- a/include/Game/System/FileRipper.hpp +++ b/include/Game/System/FileRipper.hpp @@ -12,11 +12,11 @@ public: UNK_2 = 2 }; - static void setup(u32, JKRHeap *); - static s32 checkCompressed(const u8 *); - static void* loadToMainRAM(const char *, u8 *, bool, JKRHeap *, AllocDirection); - static bool decompressFromDVD(DVDFileInfo *, void *, u32, u32, const u8 *, u32); - static bool decompressSzsSub(u8 *, u8 *); - static u8* readSrcDataFirst(); - static u8* readSrcDataNext(u8 *); + static void setup(u32, JKRHeap*); + static s32 checkCompressed(const u8*); + static void* loadToMainRAM(const char*, u8*, bool, JKRHeap*, AllocDirection); + static bool decompressFromDVD(DVDFileInfo*, void*, u32, u32, const u8*, u32); + static bool decompressSzsSub(u8*, u8*); + static u8* readSrcDataFirst(); + static u8* readSrcDataNext(u8*); }; diff --git a/include/Game/System/FindingLuigiEventScheduler.hpp b/include/Game/System/FindingLuigiEventScheduler.hpp index 1c57dde18..f6f3cb747 100644 --- a/include/Game/System/FindingLuigiEventScheduler.hpp +++ b/include/Game/System/FindingLuigiEventScheduler.hpp @@ -10,7 +10,7 @@ public: void initAfterResourceLoaded(); void setStateHiding(); - void getHidingGalaxyNameAndStarId(const char **, s32 *) const; + void getHidingGalaxyNameAndStarId(const char**, s32*) const; bool isActive() const; bool isDisappear() const; bool isHiding() const; @@ -19,13 +19,13 @@ public: void writeSendSize(); void clearLostAndFoundCount(); void syncWithGameEventFlag(); - s32 calcPowerStarIndexLuigiHas() const; + s32 calcPowerStarIndexLuigiHas() const; bool isState(u32) const; void setStateReturnAstroGalaxy(int); void update(const GalaxyMoveArgument&); - void updateOnStageResult(const char *, s32); + void updateOnStageResult(const char*, s32); - /* 0x00 */ const char* mLuigiLostStageName; - /* 0x04 */ s32 mLuigiLostStarID; + /* 0x00 */ const char* mLuigiLostStageName; + /* 0x04 */ s32 mLuigiLostStarID; /* 0x08 */ LuigiMailDirector* mLuigiMailDirector; }; diff --git a/include/Game/System/FunctionAsyncExecutor.hpp b/include/Game/System/FunctionAsyncExecutor.hpp index c37360339..0ef6338d3 100644 --- a/include/Game/System/FunctionAsyncExecutor.hpp +++ b/include/Game/System/FunctionAsyncExecutor.hpp @@ -8,62 +8,62 @@ class JKRUnitHeap; class FunctionAsyncExecInfo { public: - FunctionAsyncExecInfo(MR::FunctorBase *, int, const char *); + FunctionAsyncExecInfo(MR::FunctorBase*, int, const char*); ~FunctionAsyncExecInfo(); void execute(); - - bool isSame(const char *pStr) { + + bool isSame(const char* pStr) { return MR::strcasecmp(mName, pStr) == 0; } /* 0x00 */ MR::FunctorBase* mFunc; - /* 0x04 */ int mPriority; - /* 0x08 */ const char* mName; - /* 0x0C */ bool mIsEnd; - /* 0x10 */ OSMessageQueue mQueue; - /* 0x30 */ OSMessage mMessage; + /* 0x04 */ int mPriority; + /* 0x08 */ const char* mName; + /* 0x0C */ bool mIsEnd; + /* 0x10 */ OSMessageQueue mQueue; + /* 0x30 */ OSMessage mMessage; }; class FunctionAsyncExecutorThread : public OSThreadWrapper { public: - FunctionAsyncExecutorThread(JKRHeap *); + FunctionAsyncExecutorThread(JKRHeap*); virtual void* run(); - /* 0x3C */ bool mIsSuspended; + /* 0x3C */ bool mIsSuspended; /* 0x40 */ const char* mName; }; class FunctionAsyncExecutorOnMainThread { public: - FunctionAsyncExecutorOnMainThread(OSThread *); + FunctionAsyncExecutorOnMainThread(OSThread*); void update(); - /* 0x000 */ bool _0; + /* 0x000 */ bool _0; /* 0x004 */ OSMessageQueue mQueue; - /* 0x024 */ OSMessage mMsgArray[64]; - /* 0x124 */ OSThread* mThread; + /* 0x024 */ OSMessage mMsgArray[64]; + /* 0x124 */ OSThread* mThread; }; class FunctionAsyncExecutor { public: FunctionAsyncExecutor(); - void update(); - void start(const MR::FunctorBase &, int, const char *); - bool startOnMainThread(const MR::FunctorBase &, const char *); - void waitForEnd(const char *); - bool isEnd(const char *) const; - OSThread* getOSThread(const char *); - FunctionAsyncExecInfo* createAndAddExecInfo(const MR::FunctorBase &, int, const char *); + void update(); + void start(const MR::FunctorBase&, int, const char*); + bool startOnMainThread(const MR::FunctorBase&, const char*); + void waitForEnd(const char*); + bool isEnd(const char*) const; + OSThread* getOSThread(const char*); + FunctionAsyncExecInfo* createAndAddExecInfo(const MR::FunctorBase&, int, const char*); FunctionAsyncExecutorThread* getSuspendThread(); - /* 0x000 */ FunctionAsyncExecutorThread* mThreads[2]; - /* 0x008 */ FunctionAsyncExecutorOnMainThread* mMainThreadExec; - /* 0x00C */ MR::Vector > mHolders; - /* 0x410 */ JKRUnitHeap* _410; - /* 0x414 */ JKRExpHeap* _414; + /* 0x000 */ FunctionAsyncExecutorThread* mThreads[2]; + /* 0x008 */ FunctionAsyncExecutorOnMainThread* mMainThreadExec; + /* 0x00C */ MR::Vector> mHolders; + /* 0x410 */ JKRUnitHeap* _410; + /* 0x414 */ JKRExpHeap* _414; }; diff --git a/include/Game/System/GalaxyCometScheduler.hpp b/include/Game/System/GalaxyCometScheduler.hpp index f5c79db5e..4409a263a 100644 --- a/include/Game/System/GalaxyCometScheduler.hpp +++ b/include/Game/System/GalaxyCometScheduler.hpp @@ -10,15 +10,15 @@ struct GalaxyCometSerializeInfo { }; struct GalaxyCometTimePaper { - /* 0x0 */ const char *mGalaxyName; - /* 0x4 */ s32 mCategory; + /* 0x0 */ const char* mGalaxyName; + /* 0x4 */ s32 mCategory; }; class GalaxyCometTimeTable { public: /// @brief Initializes the table with the supplied time paper sequence. /// @param pTimePaper Pointer to the time paper entries. - GalaxyCometTimeTable(const GalaxyCometTimePaper *); + GalaxyCometTimeTable(const GalaxyCometTimePaper*); /// @brief Ticks the comet state and updates the cursor when ready. void update(); @@ -28,11 +28,11 @@ public: /// @brief Packs the current cursor and timing state into the provided game data struct. /// @param pInfo Output structure that receives the serialized state. - void serializeStateToGameData(GalaxyCometSerializeInfo *); + void serializeStateToGameData(GalaxyCometSerializeInfo*); /// @brief Restores the cursor and timing state from serialized game data. /// @param pInfo Input structure that supplies the serialized state. - void deserializeStateFromGameData(const GalaxyCometSerializeInfo *); + void deserializeStateFromGameData(const GalaxyCometSerializeInfo*); /// @brief Reports whether the current comet entry is active in orbit. /// @return `true` when the current entry is landed, otherwise `false`. @@ -41,7 +41,7 @@ public: /// @brief Checks if the given galaxy exists anywhere in this time paper. /// @param galaxyName Galaxy name to test. /// @return `true` if the galaxy is present, `false` otherwise. - bool isIncluded(const char *) const; + bool isIncluded(const char*) const; /// @brief Returns the category for the current time paper entry. /// @return Active entry category identifier. @@ -54,7 +54,7 @@ public: /// @param pResultPos Output pointer that receives the viable position. /// @param startPos Cursor index to begin searching from. /// @return `true` if a suitable position was found, `false` otherwise. - bool findSuitableTimePaperPos(s32 *, s32) const; + bool findSuitableTimePaperPos(s32*, s32) const; /// @brief Counts the populated entries within the time paper. /// @return Number of entries (excluding null terminator). @@ -63,11 +63,11 @@ public: /// @brief Forces the current state forward and reapplies cursor adjustment. void advance(); - /* 0x0 */ GalaxyCometState *mState; - /* 0x4 */ const GalaxyCometTimePaper *mTimePaper; - /* 0x8 */ s32 mTimePaperPos; - /* 0xC */ bool mIsReady; - /* 0xD */ bool mIsHide; + /* 0x0 */ GalaxyCometState* mState; + /* 0x4 */ const GalaxyCometTimePaper* mTimePaper; + /* 0x8 */ s32 mTimePaperPos; + /* 0xC */ bool mIsReady; + /* 0xD */ bool mIsHide; }; class GalaxyCometScheduler { @@ -106,22 +106,22 @@ public: /// @brief Checks if the named galaxy currently hosts an active comet. /// @param pGalaxyName Galaxy name to test. /// @return `true` if the comet is active in orbit in that galaxy, otherwise `false`. - bool isCometLand(const char *) const; + bool isCometLand(const char*) const; /// @brief Resolves the power star ID tied to the active comet category. /// @param pGalaxyName Galaxy name used to locate the relevant table. /// @return Power star ID for the active comet, or `0` if unavailable. - s32 getEncounterCometPowerStarId(const char *) const; + s32 getEncounterCometPowerStarId(const char*) const; /// @brief Returns the localized name for the active comet in the given galaxy. /// @param pGalaxyName Galaxy name that hosts the comet. /// @return Localized comet name string. - const char *getEncounterCometName(const char *) const; + const char* getEncounterCometName(const char*) const; /// @brief Finds the time table whose current entry targets the named galaxy. /// @param pGalaxyName Galaxy name to locate among current entries. /// @return Matching time table pointer, or `nullptr` when not found. - GalaxyCometTimeTable *findFromGalaxy(const char *) const; + GalaxyCometTimeTable* findFromGalaxy(const char*) const; /// @brief Tests whether no time table reports an active comet. /// @return `true` if every table is currently hidden, otherwise `false`. @@ -130,9 +130,9 @@ public: /// @brief Returns the packed state value for the named galaxy when present. /// @param pGalaxyName Galaxy name to query within each time table. /// @return Packed state value, or `-1` when the galaxy is absent. - s32 getStateValueIncluded(const char *); + s32 getStateValueIncluded(const char*); private: - /* 0x0 */ MR::AssignableArray mTimeTables; - /* 0x8 */ bool mEnabled; + /* 0x0 */ MR::AssignableArray mTimeTables; + /* 0x8 */ bool mEnabled; }; diff --git a/include/Game/System/GalaxyMoveArgument.hpp b/include/Game/System/GalaxyMoveArgument.hpp index f55815907..a35e01642 100644 --- a/include/Game/System/GalaxyMoveArgument.hpp +++ b/include/Game/System/GalaxyMoveArgument.hpp @@ -5,14 +5,14 @@ class GalaxyMoveArgument { public: - GalaxyMoveArgument(u32, const char *, s32, const JMapIdInfo *); + GalaxyMoveArgument(u32, const char*, s32, const JMapIdInfo*); - bool isEqualStage(char const *) const; - bool isEqualStageScenario(char const *, int) const; + bool isEqualStage(char const*) const; + bool isEqualStageScenario(char const*, int) const; - /* 0x0 */ u32 mMoveType; + /* 0x0 */ u32 mMoveType; /* 0x4 */ const char* mStageName; - /* 0x8 */ s32 mScenarioNo; - s32 _C; + /* 0x8 */ s32 mScenarioNo; + s32 _C; /* 0x10 */ JMapIdInfo mIDInfo; }; diff --git a/include/Game/System/GalaxyStatusAccessor.hpp b/include/Game/System/GalaxyStatusAccessor.hpp index 8c3ca23ce..a7ea113d7 100644 --- a/include/Game/System/GalaxyStatusAccessor.hpp +++ b/include/Game/System/GalaxyStatusAccessor.hpp @@ -6,36 +6,36 @@ class ScenarioData; class GalaxyStatusAccessor { public: - GalaxyStatusAccessor(const ScenarioData *); - + GalaxyStatusAccessor(const ScenarioData*); + const char* getName() const; - s32 getScenarioNum() const; - s32 getPowerStarNum() const; - s32 getZoneNum() const; - s32 getZoneId(const char *) const; + s32 getScenarioNum() const; + s32 getPowerStarNum() const; + s32 getZoneNum() const; + s32 getZoneId(const char*) const; const char* getZoneName(int) const; const char* getCometName(s32) const; - bool isValidNormalComet(s32) const; - bool isCometStar(s32) const; - bool isExistGrandStar() const; - bool isExistAnyComet() const; - s32 getNormalCometScenarioNo() const; - s32 getCoin100CometScenarioNo() const; - bool canOpen() const; - bool isOpened() const; - bool hasPowerStar(s32) const; - bool isCompleted() const; - s32 getPowerStarNumOwned() const; - s32 getNormalScenarioNum() const; - const char* getAppearPowerStarObjName(s32) const; - u32 getActivePowerStarId(s32) const; - bool isValidCoin100(s32) const; - bool isHiddenStar(s32) const; + bool isValidNormalComet(s32) const; + bool isCometStar(s32) const; + bool isExistGrandStar() const; + bool isExistAnyComet() const; + s32 getNormalCometScenarioNo() const; + s32 getCoin100CometScenarioNo() const; + bool canOpen() const; + bool isOpened() const; + bool hasPowerStar(s32) const; + bool isCompleted() const; + s32 getPowerStarNumOwned() const; + s32 getNormalScenarioNum() const; + const char* getAppearPowerStarObjName(s32) const; + u32 getActivePowerStarId(s32) const; + bool isValidCoin100(s32) const; + bool isHiddenStar(s32) const; const ScenarioData* mScenarioData; // 0x0 }; namespace MR { - GalaxyStatusAccessor makeGalaxyStatusAccessor(const char *); + GalaxyStatusAccessor makeGalaxyStatusAccessor(const char*); GalaxyStatusAccessor makeCurrentGalaxyStatusAccessor(); -}; \ No newline at end of file +}; // namespace MR \ No newline at end of file diff --git a/include/Game/System/GameDataConst.hpp b/include/Game/System/GameDataConst.hpp index 2a6b5e30b..87b86aeed 100644 --- a/include/Game/System/GameDataConst.hpp +++ b/include/Game/System/GameDataConst.hpp @@ -3,18 +3,18 @@ #include #include "Game/Util/JMapInfo.hpp" -const JMapData GalaxyIDBCSV = { 0x0, 0x0, 0x0, 0x0 }; +const JMapData GalaxyIDBCSV = {0x0, 0x0, 0x0, 0x0}; class GameDataConst { public: - static s32 getPowerStarNumToOpenGalaxy(const char *); - static bool isPowerStarGreen(const char *, s32); - static bool isPowerStarRed(const char *, s32); - static bool isPowerStarLuigiHas(const char *, s32); - static bool isGrandStar(const char *, s32); - static bool isGalaxyLuigiArrested(const char *, s32); - static bool isQuestionGalaxy(const char *); - static bool isGalaxyAppearGreenDriver(const char *); - static u32 getIncludedGrandGalaxyId(const char *); - static bool isPowerStarSpecial(const char *, s32, const char *); + static s32 getPowerStarNumToOpenGalaxy(const char*); + static bool isPowerStarGreen(const char*, s32); + static bool isPowerStarRed(const char*, s32); + static bool isPowerStarLuigiHas(const char*, s32); + static bool isGrandStar(const char*, s32); + static bool isGalaxyLuigiArrested(const char*, s32); + static bool isQuestionGalaxy(const char*); + static bool isGalaxyAppearGreenDriver(const char*); + static u32 getIncludedGrandGalaxyId(const char*); + static bool isPowerStarSpecial(const char*, s32, const char*); }; diff --git a/include/Game/System/GameDataFunction.hpp b/include/Game/System/GameDataFunction.hpp index e1e0e946e..bef4ecd3e 100644 --- a/include/Game/System/GameDataFunction.hpp +++ b/include/Game/System/GameDataFunction.hpp @@ -7,80 +7,80 @@ class GameDataSomeScenarioAccessor; class JMapInfoIter; namespace GameDataFunction { - bool isDataMario(); - bool hasPowerStar(const char*, s32); - bool hasGrandStar(int); - void setGameFlagPowerStarSuccess(const char*, s32, bool); + bool isDataMario(); + bool hasPowerStar(const char*, s32); + bool hasGrandStar(int); + void setGameFlagPowerStarSuccess(const char*, s32, bool); GameDataSomeScenarioAccessor makeGalaxyScenarioAccessor(const char*, s32); - bool isOnGalaxyScenarioFlagAlreadyVisited(const char*, s32); - void onGalaxyScenarioFlagAlreadyVisited(const char*, s32); - bool isAppearGalaxy(const char*); - s32 calcCurrentPowerStarNum(); - s32 getPowerStarNumOwned(const char*); - s32 getPowerStarNumMax(); - s32 getPictureBookChapterCanRead(); - s32 getPictureBookChapterAlreadyRead(); - void setPictureBookChapterAlreadyRead(int); - void onGameEventFlag(const char*); - bool canOnGameEventFlag(const char*); - bool canOnAndIsOffGameEventFlag(const char*); - bool isOnGameEventFlag(const char*); - u16 getGameEventValue(const char*); - void setGameEventValue(const char*, u16); - bool isOnGameEventValueForBit(const char*, int); - void setGameEventValueForBit(const char*, int, bool); - s32 setupAlreadyDoneFlag(const char*, const JMapInfoIter&, u32*); - void updateAlreadyDoneFlag(int, u32); - void restoreGalaxyCometStatus(int, u16*, u16*); - void setRaceBestTime(const char*, u32); - s32 getRaceBestTime(const char*); - void addMissPoint(int); - void resetMissPoint(); - bool isPointCollectForLetter(); - void incPlayerMissNum(); - s32 registerStorageSpinDriverPathDrawRange(const char*, int, int, int, f32*); - void updateStorageSpinDriverPathDrawRange(const char*, int, int, f32); - s32 getStarPieceNumGivingToTicoSeed(int); - s32 getStarPieceNumMaxGivingToTicoSeed(int); - void addStarPieceGivingToTicoSeed(int, int); - bool isPassedStoryEvent(const char*); - void followStoryEventByName(const char*); - s32 getPlayerLeft(); - void addPlayerLeft(int); - bool isPlayerLeftSupply(); - void offPlayerLeftSupply(); - s32 getStockedStarPieceNum(); - s32 getStarPieceNum(); - void addStarPiece(int); - void setLast1upStarPieceNum(int); - s32 getLast1upStarPieceNum(); - const wchar_t* getUserName(); - u16 getUserFileIndex(); - void resetAllGameData(); - bool isOnJustGameEventFlag(const char*); - bool canOnJustGameEventFlag(const char*); - bool isOnJustAppearGalaxy(const char*); - bool isEqualJustPowerStarNum(int); - GameDataHolder* getCurrentGameDataHolder(); - GameDataHolder* getSceneStartGameDataHolder(); - s32 calcTicoGalaxyNum(const GameDataHolder*); - s32 calcGrandStarNum(const GameDataHolder*); - void resetGameDataGoToGalaxyFirst(); - void resetGameDataGoToGalaxyRetry(); - void onCompleteEndingCurrentPlayer(); - bool isOnCompleteEndingMarioAndLuigi(); - OSTime getSysConfigFileTimeAnnounced(); - void updateSysConfigFileTimeAnnounced(); - OSTime getSysConfigFileTimeSent(); - void setSysConfigFileTimeSent(OSTime); - u32 getSysConfigFileSentBytes(); - void setSysConfigFileSentBytes(u32); - bool isLuigiLeftSupply(); - void offLuigiLeftSupply(); - bool isOnGameEventFlagNormalComet(const char*); - bool isOnGameEventFlagCoin100Comet(const char*); - void updateGalaxyCometStatus(int, u16, u16); - void addStockedStarPiece(int); - bool isPowerStarLeftInCometOnly(); - s32 calcGreenStarNum(const GameDataHolder*); -}; + bool isOnGalaxyScenarioFlagAlreadyVisited(const char*, s32); + void onGalaxyScenarioFlagAlreadyVisited(const char*, s32); + bool isAppearGalaxy(const char*); + s32 calcCurrentPowerStarNum(); + s32 getPowerStarNumOwned(const char*); + s32 getPowerStarNumMax(); + s32 getPictureBookChapterCanRead(); + s32 getPictureBookChapterAlreadyRead(); + void setPictureBookChapterAlreadyRead(int); + void onGameEventFlag(const char*); + bool canOnGameEventFlag(const char*); + bool canOnAndIsOffGameEventFlag(const char*); + bool isOnGameEventFlag(const char*); + u16 getGameEventValue(const char*); + void setGameEventValue(const char*, u16); + bool isOnGameEventValueForBit(const char*, int); + void setGameEventValueForBit(const char*, int, bool); + s32 setupAlreadyDoneFlag(const char*, const JMapInfoIter&, u32*); + void updateAlreadyDoneFlag(int, u32); + void restoreGalaxyCometStatus(int, u16*, u16*); + void setRaceBestTime(const char*, u32); + s32 getRaceBestTime(const char*); + void addMissPoint(int); + void resetMissPoint(); + bool isPointCollectForLetter(); + void incPlayerMissNum(); + s32 registerStorageSpinDriverPathDrawRange(const char*, int, int, int, f32*); + void updateStorageSpinDriverPathDrawRange(const char*, int, int, f32); + s32 getStarPieceNumGivingToTicoSeed(int); + s32 getStarPieceNumMaxGivingToTicoSeed(int); + void addStarPieceGivingToTicoSeed(int, int); + bool isPassedStoryEvent(const char*); + void followStoryEventByName(const char*); + s32 getPlayerLeft(); + void addPlayerLeft(int); + bool isPlayerLeftSupply(); + void offPlayerLeftSupply(); + s32 getStockedStarPieceNum(); + s32 getStarPieceNum(); + void addStarPiece(int); + void setLast1upStarPieceNum(int); + s32 getLast1upStarPieceNum(); + const wchar_t* getUserName(); + u16 getUserFileIndex(); + void resetAllGameData(); + bool isOnJustGameEventFlag(const char*); + bool canOnJustGameEventFlag(const char*); + bool isOnJustAppearGalaxy(const char*); + bool isEqualJustPowerStarNum(int); + GameDataHolder* getCurrentGameDataHolder(); + GameDataHolder* getSceneStartGameDataHolder(); + s32 calcTicoGalaxyNum(const GameDataHolder*); + s32 calcGrandStarNum(const GameDataHolder*); + void resetGameDataGoToGalaxyFirst(); + void resetGameDataGoToGalaxyRetry(); + void onCompleteEndingCurrentPlayer(); + bool isOnCompleteEndingMarioAndLuigi(); + OSTime getSysConfigFileTimeAnnounced(); + void updateSysConfigFileTimeAnnounced(); + OSTime getSysConfigFileTimeSent(); + void setSysConfigFileTimeSent(OSTime); + u32 getSysConfigFileSentBytes(); + void setSysConfigFileSentBytes(u32); + bool isLuigiLeftSupply(); + void offLuigiLeftSupply(); + bool isOnGameEventFlagNormalComet(const char*); + bool isOnGameEventFlagCoin100Comet(const char*); + void updateGalaxyCometStatus(int, u16, u16); + void addStockedStarPiece(int); + bool isPowerStarLeftInCometOnly(); + s32 calcGreenStarNum(const GameDataHolder*); +}; // namespace GameDataFunction diff --git a/include/Game/System/GameDataHolder.hpp b/include/Game/System/GameDataHolder.hpp index 1316de1bc..24bbf6542 100644 --- a/include/Game/System/GameDataHolder.hpp +++ b/include/Game/System/GameDataHolder.hpp @@ -18,61 +18,61 @@ class GameDataHolder { public: GameDataHolder(const UserFile*); - bool isDataMario() const; - s32 getGalaxyNumCanOpen() const; - bool canOnGameEventFlag(const char*) const; - bool isOnGameEventFlag(const char*) const; - void tryOnGameEventFlag(const char*); - u16 getGameEventValue(const char*) const; - void setGameEventValue(const char*, u16); - bool isOnGameEventValueForBit(const char*, int) const; - void setGameEventValueForBit(const char*, int, bool); - s32 getPictureBookChapterCanRead() const; - u16 getPictureBookChapterAlreadyRead() const; - void setPictureBookChapterAlreadyRead(int); - void setRaceBestTime(const char*, u32); - u32 getRaceBestTime(const char*) const; - void addMissPoint(int); - void resetMissPoint(); - bool isPointCollectForLetter() const; - void incPlayerMissNum(); - s32 getPlayerMissNum() const; - bool hasPowerStar(const char*, s32) const; - bool hasGrandStar(int) const; - void setPowerStar(const char*, s32, bool); - s32 getPowerStarNumOwned(const char*) const; - s32 calcCurrentPowerStarNum() const; + bool isDataMario() const; + s32 getGalaxyNumCanOpen() const; + bool canOnGameEventFlag(const char*) const; + bool isOnGameEventFlag(const char*) const; + void tryOnGameEventFlag(const char*); + u16 getGameEventValue(const char*) const; + void setGameEventValue(const char*, u16); + bool isOnGameEventValueForBit(const char*, int) const; + void setGameEventValueForBit(const char*, int, bool); + s32 getPictureBookChapterCanRead() const; + u16 getPictureBookChapterAlreadyRead() const; + void setPictureBookChapterAlreadyRead(int); + void setRaceBestTime(const char*, u32); + u32 getRaceBestTime(const char*) const; + void addMissPoint(int); + void resetMissPoint(); + bool isPointCollectForLetter() const; + void incPlayerMissNum(); + s32 getPlayerMissNum() const; + bool hasPowerStar(const char*, s32) const; + bool hasGrandStar(int) const; + void setPowerStar(const char*, s32, bool); + s32 getPowerStarNumOwned(const char*) const; + s32 calcCurrentPowerStarNum() const; GameDataSomeScenarioAccessor makeGalaxyScenarioAccessor(const char*, s32); - bool isOnGalaxyScenarioFlagAlreadyVisited(const char*, s32) const; - void onGalaxyScenarioFlagAlreadyVisited(const char*, s32); - bool isAppearGalaxy(const char*) const; - s32 getPlayerLeft() const; - void addPlayerLeft(int); - bool isPlayerLeftSupply() const; - void offPlayerLeftSupply(); - s32 getStockedStarPieceNum() const; - void addStockedStarPiece(int); - void setupSpinDriverPathStorage(const char*, int, int, int, f32*); - void updateSpinDriverPathStorage(const char*, int, int, f32); - s32 getStarPieceNumGivingToTicoSeed(int) const; - u32 getStarPieceNumMaxGivingToTicoSeed(int) const; - void addStarPieceGivingToTicoSeed(int, int); - bool isCompleteMarioAndLuigi() const; - bool isPassedStoryEvent(const char*) const; - void followStoryEventByName(const char*); - void resetAllData(); - s32 makeFileBinary(u8*, u32); - bool loadFromFileBinary(const char*, const u8*, u32); + bool isOnGalaxyScenarioFlagAlreadyVisited(const char*, s32) const; + void onGalaxyScenarioFlagAlreadyVisited(const char*, s32); + bool isAppearGalaxy(const char*) const; + s32 getPlayerLeft() const; + void addPlayerLeft(int); + bool isPlayerLeftSupply() const; + void offPlayerLeftSupply(); + s32 getStockedStarPieceNum() const; + void addStockedStarPiece(int); + void setupSpinDriverPathStorage(const char*, int, int, int, f32*); + void updateSpinDriverPathStorage(const char*, int, int, f32); + s32 getStarPieceNumGivingToTicoSeed(int) const; + u32 getStarPieceNumMaxGivingToTicoSeed(int) const; + void addStarPieceGivingToTicoSeed(int, int); + bool isCompleteMarioAndLuigi() const; + bool isPassedStoryEvent(const char*) const; + void followStoryEventByName(const char*); + void resetAllData(); + s32 makeFileBinary(u8*, u32); + bool loadFromFileBinary(const char*, const u8*, u32); - /* 0x00 */ GameEventFlagChecker* mEventFlagChecker; - /* 0x04 */ GameEventValueChecker* mEventValueChecker; - /* 0x08 */ GameDataPlayerStatus* mPlayerStatus; + /* 0x00 */ GameEventFlagChecker* mEventFlagChecker; + /* 0x04 */ GameEventValueChecker* mEventValueChecker; + /* 0x08 */ GameDataPlayerStatus* mPlayerStatus; /* 0x0C */ GameDataAllGalaxyStorage* mAllGalaxyStorage; - /* 0x10 */ SpinDriverPathStorage* mSpinDriverPathStorage; - /* 0x14 */ StarPieceAlmsStorage* mStarPieceAlmsStorage; - /* 0x18 */ JMapInfo* mMapInfo; - /* 0x1C */ ScenarioProgressTestRun* mScenarioProgressTestRun; - /* 0x20 */ BinaryDataChunkHolder* mChunkHolder; - /* 0x24 */ char mName[16]; - /* 0x34 */ const UserFile* mUserFile; + /* 0x10 */ SpinDriverPathStorage* mSpinDriverPathStorage; + /* 0x14 */ StarPieceAlmsStorage* mStarPieceAlmsStorage; + /* 0x18 */ JMapInfo* mMapInfo; + /* 0x1C */ ScenarioProgressTestRun* mScenarioProgressTestRun; + /* 0x20 */ BinaryDataChunkHolder* mChunkHolder; + /* 0x24 */ char mName[16]; + /* 0x34 */ const UserFile* mUserFile; }; diff --git a/include/Game/System/GameDataTemporaryInGalaxy.hpp b/include/Game/System/GameDataTemporaryInGalaxy.hpp index ceeebb942..0620f08d0 100644 --- a/include/Game/System/GameDataTemporaryInGalaxy.hpp +++ b/include/Game/System/GameDataTemporaryInGalaxy.hpp @@ -20,22 +20,22 @@ public: void resetStageResultCoinParam(); void addStarPiece(int); void setLast1upStarPieceNum(int); - s32 getStarPieceNum() const; + s32 getStarPieceNum() const; void resetStageResultParam(); void clearAlreadyDoneFlag(); - s32 setupAlreadyDoneFlag(const char*, const JMapInfoIter&, u32*); + s32 setupAlreadyDoneFlag(const char*, const JMapInfoIter&, u32*); void updateAlreadyDoneFlag(int, u32); void receiveStageResultParam(const char*, s32, int, int); - /* 0x00 */ JMapIdInfo* mPlayerRestartIdInfo; - /* 0x04 */ bool _4; - /* 0x08 */ u32 _8; - /* 0x0C */ s16 mPowerStarId; - /* 0x0E */ char mStageName[48]; - /* 0x40 */ int mStarPieceNum; - /* 0x44 */ int mLast1upStarPieceNum; - /* 0x48 */ int mCoinNum; - /* 0x4C */ u32 _4C; - /* 0x50 */ u32 _50; + /* 0x00 */ JMapIdInfo* mPlayerRestartIdInfo; + /* 0x04 */ bool _4; + /* 0x08 */ u32 _8; + /* 0x0C */ s16 mPowerStarId; + /* 0x0E */ char mStageName[48]; + /* 0x40 */ int mStarPieceNum; + /* 0x44 */ int mLast1upStarPieceNum; + /* 0x48 */ int mCoinNum; + /* 0x4C */ u32 _4C; + /* 0x50 */ u32 _50; /* 0x54 */ AlreadyDoneFlagInGalaxy* mAlreadyDoneFlag; }; diff --git a/include/Game/System/GameEventFlag.hpp b/include/Game/System/GameEventFlag.hpp index f6a30a503..d29a9b729 100644 --- a/include/Game/System/GameEventFlag.hpp +++ b/include/Game/System/GameEventFlag.hpp @@ -3,18 +3,18 @@ #include struct GameEventFlag { - const char* mName; // 0x0 - u8 mType; // 0x4 - u8 saveFlag; + const char* mName; // 0x0 + u8 mType; // 0x4 + u8 saveFlag; // 0x6 union { - u8 mStarID; - u8 mStarNum; - u8 StarPieceIndex; - }; - - u8 mStarPieceNum; // 0x7 + u8 mStarID; + u8 mStarNum; + u8 StarPieceIndex; + }; + + u8 mStarPieceNum; // 0x7 u32 _8; // 0xC @@ -27,26 +27,26 @@ struct GameEventFlag { //0x10 union { const char* mRequirement; - const char* mRequirement2; + const char* mRequirement2; }; }; class GameEventFlagAccessor { public: - GameEventFlagAccessor(const GameEventFlag *); + GameEventFlagAccessor(const GameEventFlag*); const char* getName() const; - bool isTypeGalaxyOpenStar() const; - bool isTypeSpecialStar() const; - bool isTypeStarPiece() const; - bool isTypeEventValueIsZero() const; + bool isTypeGalaxyOpenStar() const; + bool isTypeSpecialStar() const; + bool isTypeStarPiece() const; + bool isTypeEventValueIsZero() const; const char* getGalaxyName() const; - s32 getStarId() const; - s32 getStarPieceIndex() const; + s32 getStarId() const; + s32 getStarPieceIndex() const; const char* getGalaxyNameWithStarPiece() const; - s32 getNeedStarPieceNum() const; + s32 getNeedStarPieceNum() const; const char* getEventValueName() const; const char* getRequirement() const; - const GameEventFlag* mFlag; // 0x0 + const GameEventFlag* mFlag; // 0x0 }; diff --git a/include/Game/System/GameEventFlagChecker.hpp b/include/Game/System/GameEventFlagChecker.hpp index 2f23b54f6..c295110b4 100644 --- a/include/Game/System/GameEventFlagChecker.hpp +++ b/include/Game/System/GameEventFlagChecker.hpp @@ -8,15 +8,15 @@ class GameEventFlagChecker { public: GameEventFlagChecker(GameDataHolder*); - bool canOn(const char *) const; - bool isOn(const char *) const; - bool tryOn(const char *); - void reset(); + bool canOn(const char*) const; + bool isOn(const char*) const; + bool tryOn(const char*); + void reset(); GameEventFlagStorage* getChunk(); - bool isOnGalaxy(const char *) const; - bool isOnGalaxyDepended(const char *) const; - bool isOnComet(const GameEventFlag *) const; + bool isOnGalaxy(const char*) const; + bool isOnGalaxyDepended(const char*) const; + bool isOnComet(const GameEventFlag*) const; - GameDataHolder* mDataHolder; // 0x0 + GameDataHolder* mDataHolder; // 0x0 GameEventFlagStorage* mFlagStorage; // 0x4 }; diff --git a/include/Game/System/GameEventFlagStorage.hpp b/include/Game/System/GameEventFlagStorage.hpp index 611972874..5e6870091 100644 --- a/include/Game/System/GameEventFlagStorage.hpp +++ b/include/Game/System/GameEventFlagStorage.hpp @@ -8,14 +8,14 @@ class GameEventFlagStorage : public BinaryDataChunkBase { public: GameEventFlagStorage(); - virtual u32 makeHeaderHashCode() const; - virtual u32 getSignature() const; - virtual s32 serialize(u8 *, u32) const; - virtual s32 deserialize(const u8 *, u32); + virtual u32 makeHeaderHashCode() const; + virtual u32 getSignature() const; + virtual s32 serialize(u8*, u32) const; + virtual s32 deserialize(const u8*, u32); virtual void initializeData(); - void set(const GameEventFlag *, bool); - bool isOn(const GameEventFlag *) const; + void set(const GameEventFlag*, bool); + bool isOn(const GameEventFlag*) const; - MR::BitArray* mFlagBitArray; // 0x4 + MR::BitArray* mFlagBitArray; // 0x4 }; diff --git a/include/Game/System/GameEventFlagTable.hpp b/include/Game/System/GameEventFlagTable.hpp index 31628cd95..e7806f9ce 100644 --- a/include/Game/System/GameEventFlagTable.hpp +++ b/include/Game/System/GameEventFlagTable.hpp @@ -4,48 +4,47 @@ #include - class GameEventFlagIter { public: - bool isEnd() const; - void goNext(); + bool isEnd() const; + void goNext(); const GameEventFlag* getFlag() const; - bool isValid() const; + bool isValid() const; - s32 mIter; // 0x0 + s32 mIter; // 0x0 }; class GameEventFlagTableInstance { public: GameEventFlagTableInstance(); - void initSortTable(); - const GameEventFlag* findFlag(const char *); - + void initSortTable(); + const GameEventFlag* findFlag(const char*); + struct Key { - u16 mHashCode; + u16 mHashCode; const GameEventFlag* mFlag; }; Key* mSortTable; - s32 mLength; + s32 mLength; }; namespace GameEventFlagTable { - GameEventFlagIter getBeginIter(); + GameEventFlagIter getBeginIter(); GameEventFlagAccessor makeAccessor(const char*); - s32 getTableSize(); - const GameEventFlag* getFlag(int); - const GameEventFlag* findFlag(const char*); - const char* getEventFlagNameSpecialPowerStar(const char*, s32); - bool isPowerStarType(const char*, s32, const char*); - s32 calcExclamationGalaxyNum(); - const char* getExclamationGalaxyNameFromIndex(int); - bool isExist(const char*); - int getIndex(const GameEventFlag*); - bool isDependedAnother(const char*, const char*); - int getIndexFromHashCode(u16); - s32 calcSpecialPowerStarNum(const char*); - s32 getStarPieceNumToOpenExclamationGalaxy(const char*); - s32 calcGreenPowerStarNum(); - s32 getGalaxyDependedFlags(const char**, int, const char*); -}; + s32 getTableSize(); + const GameEventFlag* getFlag(int); + const GameEventFlag* findFlag(const char*); + const char* getEventFlagNameSpecialPowerStar(const char*, s32); + bool isPowerStarType(const char*, s32, const char*); + s32 calcExclamationGalaxyNum(); + const char* getExclamationGalaxyNameFromIndex(int); + bool isExist(const char*); + int getIndex(const GameEventFlag*); + bool isDependedAnother(const char*, const char*); + int getIndexFromHashCode(u16); + s32 calcSpecialPowerStarNum(const char*); + s32 getStarPieceNumToOpenExclamationGalaxy(const char*); + s32 calcGreenPowerStarNum(); + s32 getGalaxyDependedFlags(const char**, int, const char*); +}; // namespace GameEventFlagTable diff --git a/include/Game/System/GameSequenceDirector.hpp b/include/Game/System/GameSequenceDirector.hpp index 48b568c48..1877705d5 100644 --- a/include/Game/System/GameSequenceDirector.hpp +++ b/include/Game/System/GameSequenceDirector.hpp @@ -11,16 +11,16 @@ public: /// @brief Creates a new `GameSequenceDirector`. GameSequenceDirector(); - void initAfterResourceLoaded(); - void update(); - void draw() const; - bool isInitializedGameDataHolder() const; + void initAfterResourceLoaded(); + void update(); + void draw() const; + bool isInitializedGameDataHolder() const; GameDataHolder* getGameDataHolder(); - void executeOnSaveSuccess(); - void executeJustBeforeSave(); + void executeOnSaveSuccess(); + void executeJustBeforeSave(); /* 0x00 */ GameDataTemporaryInGalaxy* mGameDataTemporaryInGalaxy; - /* 0x04 */ GameSequenceProgress* mGameSequenceProgress; - /* 0x08 */ SaveDataHandleSequence* mSaveDataHandleSequence; - /* 0x0C */ NWC24Messenger* mNWC24Messenger; + /* 0x04 */ GameSequenceProgress* mGameSequenceProgress; + /* 0x08 */ SaveDataHandleSequence* mSaveDataHandleSequence; + /* 0x0C */ NWC24Messenger* mNWC24Messenger; }; diff --git a/include/Game/System/GameSequenceFunction.hpp b/include/Game/System/GameSequenceFunction.hpp index 102affeb7..332314d58 100644 --- a/include/Game/System/GameSequenceFunction.hpp +++ b/include/Game/System/GameSequenceFunction.hpp @@ -6,63 +6,63 @@ class GalaxyMoveArgument; class UserFile; namespace GameSequenceFunction { - void activateGalaxyCometScheduler(); - void deactivateGalaxyCometScheduler(); - void forceToNextStateGalaxyCometScheduler(); - bool isGalaxyCometLand(const char*); - s32 getEncounterGalaxyCometPowerStarId(const char*); + void activateGalaxyCometScheduler(); + void deactivateGalaxyCometScheduler(); + void forceToNextStateGalaxyCometScheduler(); + bool isGalaxyCometLand(const char*); + s32 getEncounterGalaxyCometPowerStarId(const char*); const char* getEncounterGalaxyCometName(const char*); - s32 getGalaxyCometState(const char*); - bool isNeedMoviePlayerForStorySequenceEvent(); - bool hasNextDemoForStorySequenceEvent(); - s32 getExecutingStorySequenceEventNum(); - bool isLuigiDisappearFromAstroGalaxy(); - bool isLuigiHidingAnyGalaxy(); - bool isActiveLuigiHideAndSeekEvent(); - bool isEndLuigiHideAndSeekEvent(); - void getLuigiHidingGalaxyNameAndStarId(const char**, s32*); - void onGameEventFlagGetLuigiLetter(); - bool isReadyToStartScene(); - void startScene(); - void notifyToGameSequenceProgressToEndScene(); - void requestChangeScene(const char*); - void requestGalaxyMove(const GalaxyMoveArgument&); - void requestCancelScenarioSelect(); - void sendStageResultSequenceParam(const char*, s32, int, int); - bool hasStageResultSequence() NO_INLINE; + s32 getGalaxyCometState(const char*); + bool isNeedMoviePlayerForStorySequenceEvent(); + bool hasNextDemoForStorySequenceEvent(); + s32 getExecutingStorySequenceEventNum(); + bool isLuigiDisappearFromAstroGalaxy(); + bool isLuigiHidingAnyGalaxy(); + bool isActiveLuigiHideAndSeekEvent(); + bool isEndLuigiHideAndSeekEvent(); + void getLuigiHidingGalaxyNameAndStarId(const char**, s32*); + void onGameEventFlagGetLuigiLetter(); + bool isReadyToStartScene(); + void startScene(); + void notifyToGameSequenceProgressToEndScene(); + void requestChangeScene(const char*); + void requestGalaxyMove(const GalaxyMoveArgument&); + void requestCancelScenarioSelect(); + void sendStageResultSequenceParam(const char*, s32, int, int); + bool hasStageResultSequence() NO_INLINE; const char* getClearedStageName() NO_INLINE; - s32 getClearedPowerStarId(); - int getClearedStarPieceNum(); - int getClearedCoinNum(); - bool hasPowerStarYetAtResultSequence(); - bool isPowerStarAtResultSequence(const char*, s32); - bool isPowerStarGreenAtResultSequence(); - bool isPowerStarRedAtResultSequence(); - bool isGrandStarAtResultSequence(); - bool hasRetryGalaxySequence(); - bool isNeedToReflectStageResultSequenceStarPiece(); - void reflectStageResultSequenceCoin(); - void resetStageResultSequenceParam(); - void startPreLoadSaveDataSequence(); - void startTotalMailSizeSaveSequence(); - void startGameDataLoadSequence(int, bool); - void startCreateUserFileSequence(int); - void startDeleteUserFileSequence(int); - void startCopyUserFileSequence(int, int); - void startSetMiiOrIconIdUserFileSequence(int, const void*, const u32*); - void storeMiiOrIconIdUserFileSequence(int, const void*, const u32*); - void storeCopyUserFileSequence(int, int); - void startSaveAllUserFileSequence(); - bool isActiveSaveDataHandleSequence(); - bool isSuccessSaveDataHandleSequence(); - void restoreUserFile(UserFile*, int); - void restoreUserFile(UserFile*, int, bool); - void tryNANDErrorSequence(s32); - void reserveUserName(const wchar_t*); - void requestPrepareResetNWC24(); - bool isEnableToResetNWC24(); - void resetNWC24(); - void storeSceneStartGameDataHolder(); - void updateGameDataAndSequenceAfterStageResultSequence(); - void startGameDataSaveSequence(bool, bool); -}; + s32 getClearedPowerStarId(); + int getClearedStarPieceNum(); + int getClearedCoinNum(); + bool hasPowerStarYetAtResultSequence(); + bool isPowerStarAtResultSequence(const char*, s32); + bool isPowerStarGreenAtResultSequence(); + bool isPowerStarRedAtResultSequence(); + bool isGrandStarAtResultSequence(); + bool hasRetryGalaxySequence(); + bool isNeedToReflectStageResultSequenceStarPiece(); + void reflectStageResultSequenceCoin(); + void resetStageResultSequenceParam(); + void startPreLoadSaveDataSequence(); + void startTotalMailSizeSaveSequence(); + void startGameDataLoadSequence(int, bool); + void startCreateUserFileSequence(int); + void startDeleteUserFileSequence(int); + void startCopyUserFileSequence(int, int); + void startSetMiiOrIconIdUserFileSequence(int, const void*, const u32*); + void storeMiiOrIconIdUserFileSequence(int, const void*, const u32*); + void storeCopyUserFileSequence(int, int); + void startSaveAllUserFileSequence(); + bool isActiveSaveDataHandleSequence(); + bool isSuccessSaveDataHandleSequence(); + void restoreUserFile(UserFile*, int); + void restoreUserFile(UserFile*, int, bool); + void tryNANDErrorSequence(s32); + void reserveUserName(const wchar_t*); + void requestPrepareResetNWC24(); + bool isEnableToResetNWC24(); + void resetNWC24(); + void storeSceneStartGameDataHolder(); + void updateGameDataAndSequenceAfterStageResultSequence(); + void startGameDataSaveSequence(bool, bool); +}; // namespace GameSequenceFunction diff --git a/include/Game/System/GameSequenceProgress.hpp b/include/Game/System/GameSequenceProgress.hpp index 674790326..21092304f 100644 --- a/include/Game/System/GameSequenceProgress.hpp +++ b/include/Game/System/GameSequenceProgress.hpp @@ -15,39 +15,39 @@ public: /// @brief Creates a new `GameSequenceProgress`. GameSequenceProgress(); - void initAfterResourceLoaded(); - void update(); - void draw(); - void startScene(); - void endScene(); - void requestChangeScene(const char*); - void requestGalaxyMove(const GalaxyMoveArgument&); - void requestCancelScenarioSelect(); + void initAfterResourceLoaded(); + void update(); + void draw(); + void startScene(); + void endScene(); + void requestChangeScene(const char*); + void requestGalaxyMove(const GalaxyMoveArgument&); + void requestCancelScenarioSelect(); GalaxyCometScheduler* getGalaxyCometScheduler(); - void exeBooting(); - void exeLogo(); - void exeWaitGoToFirstScene(); - void exeNormal(); - void exeGalaxyMove(); - void exeResetProcessing(); - static bool isScenePermittedIsUpdateWiiRemoteStatus() NO_INLINE; - static bool isSceneLongAutoSleepWiiRemote(); - void updateGameDataBeforeChangeScene(); - void resetGameDataAfterChangeScene(const GalaxyMoveArgument&); - void updateGameDataGalaxyVisitedFlag(); - void setMinFrameBeforeStartNextStage(const GalaxyMoveArgument&); - bool isLuigiLeftSupply(); - void offLuigiLeftSupply(); - void countDownGameEventValueFromNewPowerStar(); + void exeBooting(); + void exeLogo(); + void exeWaitGoToFirstScene(); + void exeNormal(); + void exeGalaxyMove(); + void exeResetProcessing(); + static bool isScenePermittedIsUpdateWiiRemoteStatus() NO_INLINE; + static bool isSceneLongAutoSleepWiiRemote(); + void updateGameDataBeforeChangeScene(); + void resetGameDataAfterChangeScene(const GalaxyMoveArgument&); + void updateGameDataGalaxyVisitedFlag(); + void setMinFrameBeforeStartNextStage(const GalaxyMoveArgument&); + bool isLuigiLeftSupply(); + void offLuigiLeftSupply(); + void countDownGameEventValueFromNewPowerStar(); /* 0x08 */ StarPointerOnOffController* mStarPointerOnOffController; - /* 0x0C */ StorySequenceExecutor* mStorySequenceExecutor; + /* 0x0C */ StorySequenceExecutor* mStorySequenceExecutor; /* 0x10 */ FindingLuigiEventScheduler* mFindingLuigiEventScheduler; - /* 0x14 */ GalaxyCometScheduler* mGalaxyCometScheduler; - /* 0x18 */ LuigiLeftSupplier* mLuigiLeftSupplier; - /* 0x1C */ PlayerMissLeft* mPlayerMissLeft; - /* 0x20 */ s32 _20; - /* 0x24 */ bool _24; - /* 0x25 */ bool _25; - /* 0x26 */ bool _26; + /* 0x14 */ GalaxyCometScheduler* mGalaxyCometScheduler; + /* 0x18 */ LuigiLeftSupplier* mLuigiLeftSupplier; + /* 0x1C */ PlayerMissLeft* mPlayerMissLeft; + /* 0x20 */ s32 _20; + /* 0x24 */ bool _24; + /* 0x25 */ bool _25; + /* 0x26 */ bool _26; }; diff --git a/include/Game/System/GameSystem.hpp b/include/Game/System/GameSystem.hpp index b62042d4b..6743f67c8 100644 --- a/include/Game/System/GameSystem.hpp +++ b/include/Game/System/GameSystem.hpp @@ -42,17 +42,17 @@ public: void updateSceneController(); void calcAnim(); - /* 0x08 */ void* mFifoBase; - /* 0x0C */ GameSequenceDirector* mSequenceDirector; - /* 0x10 */ GameSystemDimmingWatcher* mDimmingWatcher; - /* 0x14 */ GameSystemErrorWatcher* mErrorWatcher; - /* 0x18 */ GameSystemFontHolder* mFontHolder; - /* 0x1C */ GameSystemFrameControl* mFrameControl; - /* 0x20 */ GameSystemObjHolder* mObjHolder; - /* 0x24 */ GameSystemSceneController* mSceneController; + /* 0x08 */ void* mFifoBase; + /* 0x0C */ GameSequenceDirector* mSequenceDirector; + /* 0x10 */ GameSystemDimmingWatcher* mDimmingWatcher; + /* 0x14 */ GameSystemErrorWatcher* mErrorWatcher; + /* 0x18 */ GameSystemFontHolder* mFontHolder; + /* 0x1C */ GameSystemFrameControl* mFrameControl; + /* 0x20 */ GameSystemObjHolder* mObjHolder; + /* 0x24 */ GameSystemSceneController* mSceneController; /* 0x28 */ GameSystemStationedArchiveLoader* mStationedArchiveLoader; - /* 0x2C */ HomeButtonLayout* mHomeButtonLayout; - /* 0x30 */ SystemWipeHolder* mSystemWipeHolder; - /* 0x34 */ HomeButtonStateNotifier* mHomeButtonStateNotifier; - /* 0x38 */ bool mIsExecuteLoadSystemArchive; + /* 0x2C */ HomeButtonLayout* mHomeButtonLayout; + /* 0x30 */ SystemWipeHolder* mSystemWipeHolder; + /* 0x34 */ HomeButtonStateNotifier* mHomeButtonStateNotifier; + /* 0x38 */ bool mIsExecuteLoadSystemArchive; }; diff --git a/include/Game/System/GameSystemDimmingWatcher.hpp b/include/Game/System/GameSystemDimmingWatcher.hpp index 4103a3837..45a2894f2 100644 --- a/include/Game/System/GameSystemDimmingWatcher.hpp +++ b/include/Game/System/GameSystemDimmingWatcher.hpp @@ -10,6 +10,6 @@ public: void update(); /* 0x0 */ TriggerChecker* mChecker; - /* 0x4 */ bool _4; - /* 0x5 */ bool _5; + /* 0x4 */ bool _4; + /* 0x5 */ bool _5; }; diff --git a/include/Game/System/GameSystemErrorWatcher.hpp b/include/Game/System/GameSystemErrorWatcher.hpp index c52bbfcdd..846521ec8 100644 --- a/include/Game/System/GameSystemErrorWatcher.hpp +++ b/include/Game/System/GameSystemErrorWatcher.hpp @@ -7,7 +7,7 @@ namespace nw4r { namespace lyt { class TexMap; }; -}; +}; // namespace nw4r class BatteryLayout; class TriggerChecker; @@ -15,36 +15,36 @@ class TriggerChecker; class GameSystemErrorWatcher : public NerveExecutor { public: struct Message { - /* 0x00 */ const char* mId; + /* 0x00 */ const char* mId; /* 0x04 */ ErrorMessageWindow::MessageType mType; }; /// @brief Creates a new `GameSystemErrorWatcher`. GameSystemErrorWatcher(); - void initAfterResourceLoaded(); - void movement(); - void draw() const; - bool isWarning() const; - bool setPermissionUpdateWiiRemoteStatus(bool); - void exeNoError(); - void exeErrorWindowIn(); - void exeErrorWindowDisplay(); - void exeErrorWindowOut(); - void updateWiiRemoteStatus(); - const Message* getProperMessageId() const; + void initAfterResourceLoaded(); + void movement(); + void draw() const; + bool isWarning() const; + bool setPermissionUpdateWiiRemoteStatus(bool); + void exeNoError(); + void exeErrorWindowIn(); + void exeErrorWindowDisplay(); + void exeErrorWindowOut(); + void updateWiiRemoteStatus(); + const Message* getProperMessageId() const; const nw4r::lyt::TexMap* getProperErrorTexMap() const; private: - /* 0x08 */ ErrorMessageWindow* mWindow; - /* 0x0C */ const Message* mMessage; + /* 0x08 */ ErrorMessageWindow* mWindow; + /* 0x0C */ const Message* mMessage; /* 0x10 */ const nw4r::lyt::TexMap* mUnplaggedTexMap; - /* 0x14 */ BatteryLayout* mBatteryLayout; - /* 0x18 */ s32 mDriveStatus; - /* 0x1C */ TriggerChecker* _1C; - /* 0x20 */ s32 mWiiRemoteStatus; - /* 0x24 */ s32 mCounterIgnoreCheckFreeStyle; - /* 0x28 */ s32 mCounterDecideDisconnect; - /* 0x2C */ s32 mWiiRemoteBattery; - /* 0x30 */ bool mPermissionUpdateWiiRemoteStatus; + /* 0x14 */ BatteryLayout* mBatteryLayout; + /* 0x18 */ s32 mDriveStatus; + /* 0x1C */ TriggerChecker* _1C; + /* 0x20 */ s32 mWiiRemoteStatus; + /* 0x24 */ s32 mCounterIgnoreCheckFreeStyle; + /* 0x28 */ s32 mCounterDecideDisconnect; + /* 0x2C */ s32 mWiiRemoteBattery; + /* 0x30 */ bool mPermissionUpdateWiiRemoteStatus; }; diff --git a/include/Game/System/GameSystemException.hpp b/include/Game/System/GameSystemException.hpp index ddde5764e..c406fb273 100644 --- a/include/Game/System/GameSystemException.hpp +++ b/include/Game/System/GameSystemException.hpp @@ -5,7 +5,7 @@ class GameSystemException { public: static void init(); - static void handleException(u16, OSContext *, u32, u32); + static void handleException(u16, OSContext*, u32, u32); static void* sMapFileUsingBuffer; }; diff --git a/include/Game/System/GameSystemFontHolder.hpp b/include/Game/System/GameSystemFontHolder.hpp index d996f376f..33ae9b243 100644 --- a/include/Game/System/GameSystemFontHolder.hpp +++ b/include/Game/System/GameSystemFontHolder.hpp @@ -4,8 +4,8 @@ namespace nw4r { namespace ut { class Font; class ResFont; - }; -}; + }; // namespace ut +}; // namespace nw4r class JKRMemArchive; @@ -15,11 +15,11 @@ public: GameSystemFontHolder(); nw4r::ut::Font* getMessageFont() const; - void createFontFromEmbeddedData(); - void createFontFromFile(); + void createFontFromEmbeddedData(); + void createFontFromFile(); - /* 0x00 */ void* _0; - /* 0x04 */ JKRMemArchive* _4; + /* 0x00 */ void* _0; + /* 0x04 */ JKRMemArchive* _4; /* 0x08 */ nw4r::ut::ResFont* mEmbeddedMessageFont; /* 0x0C */ nw4r::ut::ResFont* mMessageFont; /* 0x10 */ nw4r::ut::ResFont* mPictureFont; diff --git a/include/Game/System/GameSystemFunction.hpp b/include/Game/System/GameSystemFunction.hpp index a2435f857..15ab72211 100644 --- a/include/Game/System/GameSystemFunction.hpp +++ b/include/Game/System/GameSystemFunction.hpp @@ -46,4 +46,4 @@ namespace GameSystemFunction { bool isPreparedFadeinSystem(); void restartSceneController(); bool isDisplayStrapRemineder(); -}; +}; // namespace GameSystemFunction diff --git a/include/Game/System/GameSystemObjHolder.hpp b/include/Game/System/GameSystemObjHolder.hpp index 4d119444c..e26914575 100644 --- a/include/Game/System/GameSystemObjHolder.hpp +++ b/include/Game/System/GameSystemObjHolder.hpp @@ -21,42 +21,42 @@ class GameSystemObjHolder { public: GameSystemObjHolder(); - void initAfterStationedResourceLoaded(); - void initMessageResource(); - void init(); - void createAudioSystem(); - void update(); - void updateAudioSystem(); - void clearRequestFileInfo(bool); - void drawStarPointer(); - void drawBeforeEndRender(); - void captureIfAllowForScreenPreserver(); + void initAfterStationedResourceLoaded(); + void initMessageResource(); + void init(); + void createAudioSystem(); + void update(); + void updateAudioSystem(); + void clearRequestFileInfo(bool); + void drawStarPointer(); + void drawBeforeEndRender(); + void captureIfAllowForScreenPreserver(); GXRenderModeObj* getRenderModeObj() const; - void initDvd(); - void initNAND(); - void initAudio(); - void initRenderMode(); - void initNameObj(); - void initFunctionAsyncExecutor(); - void initResourceHolderManager(); - void initGameController(); - void initWPad(); - void initStarPointerDirector(); - void initDisplay(); + void initDvd(); + void initNAND(); + void initAudio(); + void initRenderMode(); + void initNameObj(); + void initFunctionAsyncExecutor(); + void initResourceHolderManager(); + void initGameController(); + void initWPad(); + void initStarPointerDirector(); + void initDisplay(); - NameObjHolder* mObjHolder; // 0x0 - ParticleResourceHolder* mParticleResHolder; // 0x4 - GXRenderModeObj* mRenderModeObj; // 0x8 - void* _C; - void* _10; - void* _14; - CaptureScreenDirector* mCaptureScreenDir; // 0x18 - ScreenPreserver* mScreenPreserver; // 0x1C - AudSystemWrapper* mSysWrapper; // 0x20 - WPadHolder* mWPadHolder; // 0x24 - FunctionAsyncExecutor* mAsyncExec; // 0x28 - MessageHolder* mMsgHolder; // 0x2C - StarPointerDirector* mStarPointerDir; // 0x30 - JMath::TRandom_fast_ mRandom; // 0x34 - u32 mLanguage; // 0x38 + NameObjHolder* mObjHolder; // 0x0 + ParticleResourceHolder* mParticleResHolder; // 0x4 + GXRenderModeObj* mRenderModeObj; // 0x8 + void* _C; + void* _10; + void* _14; + CaptureScreenDirector* mCaptureScreenDir; // 0x18 + ScreenPreserver* mScreenPreserver; // 0x1C + AudSystemWrapper* mSysWrapper; // 0x20 + WPadHolder* mWPadHolder; // 0x24 + FunctionAsyncExecutor* mAsyncExec; // 0x28 + MessageHolder* mMsgHolder; // 0x2C + StarPointerDirector* mStarPointerDir; // 0x30 + JMath::TRandom_fast_ mRandom; // 0x34 + u32 mLanguage; // 0x38 }; diff --git a/include/Game/System/GameSystemResetAndPowerProcess.hpp b/include/Game/System/GameSystemResetAndPowerProcess.hpp index 809852040..5162fba59 100644 --- a/include/Game/System/GameSystemResetAndPowerProcess.hpp +++ b/include/Game/System/GameSystemResetAndPowerProcess.hpp @@ -14,30 +14,30 @@ public: virtual void draw() const; virtual void control(); - bool isActive() const NO_INLINE; - void setResetOperationApplicationReset(); - void setResetOperationReturnToMenu(); - void requestReset(bool); - void requestGoWiiMenu(bool); - void notifyCheckDiskResult(bool); - void exePolling(); - void exeWaitResetPermitted(); - void exePrepareReset(); - void exeReset(); - void exeWaitPrepareFadein(); - void exeFadein(); - void exitApplication(); - bool tryPermitReset() NO_INLINE; - bool tryAcceptPowerOff(); - bool isResetAcceptAudio() const; + bool isActive() const NO_INLINE; + void setResetOperationApplicationReset(); + void setResetOperationReturnToMenu(); + void requestReset(bool); + void requestGoWiiMenu(bool); + void notifyCheckDiskResult(bool); + void exePolling(); + void exeWaitResetPermitted(); + void exePrepareReset(); + void exeReset(); + void exeWaitPrepareFadein(); + void exeFadein(); + void exitApplication(); + bool tryPermitReset() NO_INLINE; + bool tryAcceptPowerOff(); + bool isResetAcceptAudio() const; static void handleOSPowerCallback(); static void handleCheckDiskAsync(s32, DVDCommandBlock*); /* 0x20 */ TriggerChecker* mResetTriggerChecker; - /* 0x24 */ ValueControl* mFadeinValueControl; + /* 0x24 */ ValueControl* mFadeinValueControl; /* 0x28 */ DVDCommandBlock mCommandBlock; - /* 0x58 */ s32 mResetOperation; - /* 0x5C */ bool _5C; - /* 0x5D */ bool mIsValidPowerOff; - /* 0x5E */ bool _5E; + /* 0x58 */ s32 mResetOperation; + /* 0x5C */ bool _5C; + /* 0x5D */ bool mIsValidPowerOff; + /* 0x5E */ bool _5E; }; diff --git a/include/Game/System/GameSystemSceneController.hpp b/include/Game/System/GameSystemSceneController.hpp index 70d4000dd..3eb01e218 100644 --- a/include/Game/System/GameSystemSceneController.hpp +++ b/include/Game/System/GameSystemSceneController.hpp @@ -18,14 +18,14 @@ class SceneControlInfo { public: SceneControlInfo(); - void setScene(const char *); - void setStage(const char *); - void setStartIdInfo(const JMapIdInfo &); + void setScene(const char*); + void setStage(const char*); + void setStartIdInfo(const JMapIdInfo&); - /* 0x00 */ char mScene[32]; - /* 0x20 */ char mStage[32]; - /* 0x40 */ s32 mCurrentScenarioNo; - /* 0x44 */ s32 mCurrentSelectedScenarioNo; + /* 0x00 */ char mScene[32]; + /* 0x20 */ char mStage[32]; + /* 0x40 */ s32 mCurrentScenarioNo; + /* 0x44 */ s32 mCurrentSelectedScenarioNo; /* 0x48 */ JMapIdInfo* mStartIdInfo; }; @@ -43,63 +43,63 @@ class GameSystemSceneController { public: GameSystemSceneController(); - void initAfterStationedResourceLoaded(); - void requestChangeScene(); - void checkRequestAndChangeScene(); - void initializeScene(); - void destroyScene(); - bool isStopSound() const; - bool isReadyToStartScene() const; - bool isFirstUpdateSceneNerveNormal() const; - void startScene(); - void updateScene(); - void updateSceneDuringResetProcessing(); - void calcAnimScene(); - void drawScene(); + void initAfterStationedResourceLoaded(); + void requestChangeScene(); + void checkRequestAndChangeScene(); + void initializeScene(); + void destroyScene(); + bool isStopSound() const; + bool isReadyToStartScene() const; + bool isFirstUpdateSceneNerveNormal() const; + void startScene(); + void updateScene(); + void updateSceneDuringResetProcessing(); + void calcAnimScene(); + void drawScene(); NameObjListExecutor* getNameObjListExecutor() const; - SceneObjHolder* getSceneObjHolder() const; - bool isExistSceneObjHolder() const; - s32 getCurrentScenarioNo() const; - s32 getCurrentSelectedScenarioNo() const; - void setSceneInitializeState(SceneInitializeState); - bool isSceneInitializeState(SceneInitializeState) const; - void startScenarioSelectScene(); - void startScenarioSelectSceneBackground(); - void setCurrentScenarioNo(s32, s32); - void resetCurrentScenarioNo(); - bool isScenarioDecided() const; - void loadScenarioWaveData(); - bool isLoadDoneScenarioWaveData() const; - void exeNotInitialized(); - void exeNormal(); - void exeWaitDrawDoneScene(); - void exeDestroyScene(); - void exeChangeWaveBank(); - void exeInitializeScene(); - void exeInvalidateSystemWipe(); - void exeDestroyed(); - void exeReadyToStartScene(); - void prepareReset(); - bool isPreparedReset(); - void restartGameAfterResetting(); - bool isExistRequest() const; - bool isSameAtNextSceneAndStage() const; - void updateSceneControlInfo(); - Scene* getCurrentSceneForExecute() const; - const Nerve* getNextNerveOnResetProcessing() const; - bool tryDestroyFileCacheHeap(bool) NO_INLINE; - void requestChangeNerve(const Nerve *); + SceneObjHolder* getSceneObjHolder() const; + bool isExistSceneObjHolder() const; + s32 getCurrentScenarioNo() const; + s32 getCurrentSelectedScenarioNo() const; + void setSceneInitializeState(SceneInitializeState); + bool isSceneInitializeState(SceneInitializeState) const; + void startScenarioSelectScene(); + void startScenarioSelectSceneBackground(); + void setCurrentScenarioNo(s32, s32); + void resetCurrentScenarioNo(); + bool isScenarioDecided() const; + void loadScenarioWaveData(); + bool isLoadDoneScenarioWaveData() const; + void exeNotInitialized(); + void exeNormal(); + void exeWaitDrawDoneScene(); + void exeDestroyScene(); + void exeChangeWaveBank(); + void exeInitializeScene(); + void exeInvalidateSystemWipe(); + void exeDestroyed(); + void exeReadyToStartScene(); + void prepareReset(); + bool isPreparedReset(); + void restartGameAfterResetting(); + bool isExistRequest() const; + bool isSameAtNextSceneAndStage() const; + void updateSceneControlInfo(); + Scene* getCurrentSceneForExecute() const; + const Nerve* getNextNerveOnResetProcessing() const; + bool tryDestroyFileCacheHeap(bool) NO_INLINE; + void requestChangeNerve(const Nerve*); - /* 0x00 */ SceneControlInfo _0; - /* 0x4C */ SceneControlInfo _4C; - /* 0x98 */ Spine* _98; - /* 0x9C */ const Nerve* _9C; - /* 0xA0 */ bool _A0; - /* 0xA4 */ ScenarioDataParser* mScenarioParser; - /* 0xA8 */ NameObjHolder* mObjHolder; - /* 0xAC */ Scene* mScene; + /* 0x00 */ SceneControlInfo _0; + /* 0x4C */ SceneControlInfo _4C; + /* 0x98 */ Spine* _98; + /* 0x9C */ const Nerve* _9C; + /* 0xA0 */ bool _A0; + /* 0xA4 */ ScenarioDataParser* mScenarioParser; + /* 0xA8 */ NameObjHolder* mObjHolder; + /* 0xAC */ Scene* mScene; /* 0xB0 */ SceneInitializeState mSceneInitializeState; - /* 0xB4 */ IntermissionScene* mIntermissionScene; - /* 0xB8 */ PlayTimerScene* mPlayTimerScene; + /* 0xB4 */ IntermissionScene* mIntermissionScene; + /* 0xB8 */ PlayTimerScene* mPlayTimerScene; /* 0xBC */ ScenarioSelectScene* mScenarioSelectScene; }; diff --git a/include/Game/System/GameSystemStationedArchiveLoader.hpp b/include/Game/System/GameSystemStationedArchiveLoader.hpp index 8562ece64..a49913c9e 100644 --- a/include/Game/System/GameSystemStationedArchiveLoader.hpp +++ b/include/Game/System/GameSystemStationedArchiveLoader.hpp @@ -28,31 +28,31 @@ public: void exeSuspended(); void exeChangeArchivePlayer(); bool trySuspend(); - bool tryAsyncExecuteIfNotSuspend(const MR::FunctorBase &, const char *); + bool tryAsyncExecuteIfNotSuspend(const MR::FunctorBase&, const char*); void startToLoadStationedArchivePlayer(bool); void startToLoadStationedArchiveOthers(); void createAndAddPlayerArchives(bool); void createAndAddOtherArchives(); /* 0x8 */ PlayerHeapHolder* mHeapHolder; - /* 0xc */ bool _C; + /* 0xc */ bool _C; }; class ConditionUsePlayerHeap : public StationedArchiveLoader::Condition { public: ConditionUsePlayerHeap(); - virtual bool isExecute(const MR::StationedFileInfo *) const; - virtual JKRHeap* getProperHeap(const MR::StationedFileInfo *) const; + virtual bool isExecute(const MR::StationedFileInfo*) const; + virtual JKRHeap* getProperHeap(const MR::StationedFileInfo*) const; /* 0x4 */ JKRExpHeap* mNapaHeap; /* 0x8 */ JKRExpHeap* mGDDRHeap; - /* 0xC */ bool mIsDataMario; + /* 0xC */ bool mIsDataMario; }; class ConditionIfIsNotPlayer : public StationedArchiveLoader::Condition { public: - virtual bool isExecute(const MR::StationedFileInfo *) const; + virtual bool isExecute(const MR::StationedFileInfo*) const; }; class ConditionIsEqualType : public StationedArchiveLoader::Condition { @@ -67,7 +67,7 @@ public: _4 = var; } - virtual bool isExecute(const MR::StationedFileInfo *) const; + virtual bool isExecute(const MR::StationedFileInfo*) const; /* 0x4 */ s32 _4; }; @@ -80,10 +80,10 @@ public: void dispose(); void setIsDataMario(bool) NO_INLINE; - static JKRExpHeap* createHeap(u32, JKRHeap *); + static JKRExpHeap* createHeap(u32, JKRHeap*); /* 0x0 */ ConditionUsePlayerHeap* mCondition; - /* 0x4 */ JKRExpHeap* mNapaHeap; - /* 0x8 */ JKRExpHeap* mGDDRHeap; - /* 0xC */ bool mIsDataMario; + /* 0x4 */ JKRExpHeap* mNapaHeap; + /* 0x8 */ JKRExpHeap* mGDDRHeap; + /* 0xC */ bool mIsDataMario; }; diff --git a/include/Game/System/HeapMemoryWatcher.hpp b/include/Game/System/HeapMemoryWatcher.hpp index d37220480..32e38b45b 100644 --- a/include/Game/System/HeapMemoryWatcher.hpp +++ b/include/Game/System/HeapMemoryWatcher.hpp @@ -11,32 +11,32 @@ class HeapMemoryWatcher { public: HeapMemoryWatcher(); - JKRHeap* getHeapNapa(const JKRHeap *); - JKRHeap* getHeapGDDR3(const JKRHeap *); - void createFileCacheHeapOnGameHeap(u32); - void createSceneHeapOnGameHeap(); - void adjustStationedHeaps(); - void setCurrentHeapToStationedHeap(); - void setCurrentHeapToGameHeap(); - void setCurrentHeapToSceneHeap(); - void destroySceneHeap(); - void destroyGameHeap(); + JKRHeap* getHeapNapa(const JKRHeap*); + JKRHeap* getHeapGDDR3(const JKRHeap*); + void createFileCacheHeapOnGameHeap(u32); + void createSceneHeapOnGameHeap(); + void adjustStationedHeaps(); + void setCurrentHeapToStationedHeap(); + void setCurrentHeapToGameHeap(); + void setCurrentHeapToSceneHeap(); + void destroySceneHeap(); + void destroyGameHeap(); static void createRootHeap(); - void createHeaps(); - void createGameHeap(); - static void memoryErrorCallback(void *, u32, int); - void checkRestMemory(); + void createHeaps(); + void createGameHeap(); + static void memoryErrorCallback(void*, u32, int); + void checkRestMemory(); - JKRExpHeap* mStationedHeapNapa; // 0x0 - JKRExpHeap* mStationedHeapGDDR; // 0x4 - JKRExpHeap* mGameHeapNapa; // 0x8 - JKRExpHeap* mGameHeapGDDR; // 0xC - JKRHeap* mFileCacheHeap; // 0x10 - JKRSolidHeap* mSceneHeapNapa; // 0x14 - JKRSolidHeap* mSceneHeapGDDR; // 0x18 - JKRExpHeap* mWPadHeap; // 0x1C - JKRExpHeap* mHomeButtonLayoutHeap; // 0x20 - JKRSolidHeap* mAudSystemHeap; // 0x24 + JKRExpHeap* mStationedHeapNapa; // 0x0 + JKRExpHeap* mStationedHeapGDDR; // 0x4 + JKRExpHeap* mGameHeapNapa; // 0x8 + JKRExpHeap* mGameHeapGDDR; // 0xC + JKRHeap* mFileCacheHeap; // 0x10 + JKRSolidHeap* mSceneHeapNapa; // 0x14 + JKRSolidHeap* mSceneHeapGDDR; // 0x18 + JKRExpHeap* mWPadHeap; // 0x1C + JKRExpHeap* mHomeButtonLayoutHeap; // 0x20 + JKRSolidHeap* mAudSystemHeap; // 0x24 static JKRExpHeap* sRootHeapGDDR3; }; diff --git a/include/Game/System/HomeButtonMenuWrapper.hpp b/include/Game/System/HomeButtonMenuWrapper.hpp index 531faa59c..5ee6c9e86 100644 --- a/include/Game/System/HomeButtonMenuWrapper.hpp +++ b/include/Game/System/HomeButtonMenuWrapper.hpp @@ -4,31 +4,30 @@ #include struct HBMDataInfo { - void* mHomeButtonArchive; // 0x00 - void* mHomeButtonSpeakerArchive; // 0x04 - void* mHomeButtonCsvFile; // 0x08 - void* mHomeButtonConfigFile; // 0x0C - u32 _10; + void* mHomeButtonArchive; // 0x00 + void* mHomeButtonSpeakerArchive; // 0x04 + void* mHomeButtonCsvFile; // 0x08 + void* mHomeButtonConfigFile; // 0x0C + u32 _10; - u32 mLanguage; // 0x1C + u32 mLanguage; // 0x1C u32 _24; - + u32 _2C; }; struct HBMControllerData { - }; class RSO { public: static void setupRsoHomeButtonMenu(); - static void HBMCreate(const HBMDataInfo *); + static void HBMCreate(const HBMDataInfo*); static void HBMInit(void); - static void HBMCalc(const HBMControllerData *); + static void HBMCalc(const HBMControllerData*); static void HBMDraw(void); - static s32 HBMGetSelectBtnNum(void); + static s32 HBMGetSelectBtnNum(void); static void HBMSetAdjustFlag(int); static void HBMStartBlackOut(void); }; diff --git a/include/Game/System/HomeButtonStateNotifier.hpp b/include/Game/System/HomeButtonStateNotifier.hpp index 97e0943c1..48d27f4c2 100644 --- a/include/Game/System/HomeButtonStateNotifier.hpp +++ b/include/Game/System/HomeButtonStateNotifier.hpp @@ -13,6 +13,6 @@ public: void notifyHomeButtonDeactive(); private: - /* 0x00 */ bool _0; + /* 0x00 */ bool _0; /* 0x04 */ MoviePlayerSimple* mMoviePlayer; }; diff --git a/include/Game/System/Language.hpp b/include/Game/System/Language.hpp index d0f8dd0b1..6b665872c 100644 --- a/include/Game/System/Language.hpp +++ b/include/Game/System/Language.hpp @@ -40,4 +40,4 @@ namespace MR { /// @param index The position in the lookup table. /// @return The pointer to the null-terminated label. const char* getLanguagePrefixByIndex(u32 index); -}; +}; // namespace MR diff --git a/include/Game/System/LayoutHolder.hpp b/include/Game/System/LayoutHolder.hpp index cac3fbb37..24984eb84 100644 --- a/include/Game/System/LayoutHolder.hpp +++ b/include/Game/System/LayoutHolder.hpp @@ -7,25 +7,25 @@ class JKRArchive; class LayoutHolder : public nw4r::lyt::ResourceAccessor { public: - LayoutHolder(JKRArchive &); + LayoutHolder(JKRArchive&); virtual ~LayoutHolder(); - virtual void* GetResource(u32, const char*, u32*); - virtual nw4r::ut::Font* GetFont(const char *); - virtual void* getResOther(const char *) const; - virtual u32 getResOtherNum() const; - virtual const char* getResOtherName(u32) const; - virtual void* getResOther(u32) const; - virtual bool isExistResOther(const char *) const; + virtual void* GetResource(u32, const char*, u32*); + virtual nw4r::ut::Font* GetFont(const char*); + virtual void* getResOther(const char*) const; + virtual u32 getResOtherNum() const; + virtual const char* getResOtherName(u32) const; + virtual void* getResOther(u32) const; + virtual bool isExistResOther(const char*) const; void initializeArc(); - u32 initEachResTable(ResTable *, const char* const *); + u32 initEachResTable(ResTable*, const char* const*); - void mount(char *); + void mount(char*); JKRArchive* mArchive; // 0x4 - ResTable mLayoutRes; // 0x8 - ResTable mAnimRes; // 0x10 - ResTable mResOther; // 0x18 + ResTable mLayoutRes; // 0x8 + ResTable mAnimRes; // 0x10 + ResTable mResOther; // 0x18 }; diff --git a/include/Game/System/MainLoopFramework.hpp b/include/Game/System/MainLoopFramework.hpp index 25cf01268..7392d6eeb 100644 --- a/include/Game/System/MainLoopFramework.hpp +++ b/include/Game/System/MainLoopFramework.hpp @@ -10,13 +10,14 @@ typedef void (*PreRenderCallback)(); class MainLoopFrameworkAlarm : public OSAlarm { public: u32 _dummy; // helps with waitDrawDoneAndSetAlarm stack frame size - + static MR::BothDirList sList; }; class MainLoopFramework { public: - MainLoopFramework(void* xfb1, void* xfb2, void* xfb3, bool useAlpha) : mClearColor(0xffffffff) { + MainLoopFramework(void* xfb1, void* xfb2, void* xfb3, bool useAlpha) + : mClearColor(0xffffffff) { ctor_subroutine(useAlpha); JUTXfb::createManager(xfb1, xfb2, xfb3); } @@ -24,50 +25,50 @@ public: ~MainLoopFramework(); static MainLoopFramework* createManager(const GXRenderModeObj*, void*, void*, void*, bool); - void ctor_subroutine(bool); - void prepareCopyDisp(); - void drawendXfb_single(); - void exchangeXfb_double(); - void exchangeXfb_triple(); - void copyXfb_triple(); - void preGX(); - void endGX(); - void waitForRetrace(); - void beginRender(); - void endRender(); - void endFrame(); - void waitBlanking(int); - void setTickRateFromFrame(u16); - void clearEfb(GXColor); - void clearEfb(int, int, int, int, GXColor); - void calcCombinationRatio(); - static u32 frameToTick(f32); - static void setForOSResetSystem(); + void ctor_subroutine(bool); + void prepareCopyDisp(); + void drawendXfb_single(); + void exchangeXfb_double(); + void exchangeXfb_triple(); + void copyXfb_triple(); + void preGX(); + void endGX(); + void waitForRetrace(); + void beginRender(); + void endRender(); + void endFrame(); + void waitBlanking(int); + void setTickRateFromFrame(u16); + void clearEfb(GXColor); + void clearEfb(int, int, int, int, GXColor); + void calcCombinationRatio(); + static u32 frameToTick(f32); + static void setForOSResetSystem(); - /* 0x0 */ Color8 mClearColor; - /* 0x4 */ u32 mClearZ; - /* 0x8 */ u16 mDispCopyGamma; - /* 0xA */ u16 mCopyClamp; - u32 _C; - /* 0x10 */ u16 mRetraceCount; - /* 0x14 */ u32 mTickDuration; - /* 0x18 */ bool mUseAlpha; - /* 0x19 */ bool mUseVFilter; - u8 _1A; - u8 _1B; - /* 0x1C */ f32 mCombinationRatio; - /* 0x20 */ OSTick mTick; - /* 0x24 */ s32 mLastFrameTime; - /* 0x28 */ s32 mLastVideoTickDelta; - /* 0x2C */ s32 mRenderInterval; - /* 0x30 */ s32 mRenderCounter; - /* 0x34 */ u8 mDoRenderFrame; - u8 _35; - u8 _36; - u8 _37; + /* 0x0 */ Color8 mClearColor; + /* 0x4 */ u32 mClearZ; + /* 0x8 */ u16 mDispCopyGamma; + /* 0xA */ u16 mCopyClamp; + u32 _C; + /* 0x10 */ u16 mRetraceCount; + /* 0x14 */ u32 mTickDuration; + /* 0x18 */ bool mUseAlpha; + /* 0x19 */ bool mUseVFilter; + u8 _1A; + u8 _1B; + /* 0x1C */ f32 mCombinationRatio; + /* 0x20 */ OSTick mTick; + /* 0x24 */ s32 mLastFrameTime; + /* 0x28 */ s32 mLastVideoTickDelta; + /* 0x2C */ s32 mRenderInterval; + /* 0x30 */ s32 mRenderCounter; + /* 0x34 */ u8 mDoRenderFrame; + u8 _35; + u8 _36; + u8 _37; /* 0x38 */ PreRenderCallback mPreRenderCallback; - /* 0x3C */ s16 mSingleBufferIndex; - u8 _3E; + /* 0x3C */ s16 mSingleBufferIndex; + u8 _3E; u32 _pad1; u32 _pad2; diff --git a/include/Game/System/MessageHolder.hpp b/include/Game/System/MessageHolder.hpp index c1fe14613..45a391798 100644 --- a/include/Game/System/MessageHolder.hpp +++ b/include/Game/System/MessageHolder.hpp @@ -36,23 +36,23 @@ class MessageData { public: MessageData(const char*); - bool getMessageDirect(TalkMessageInfo*, const char*) const; - bool getMessage(TalkMessageInfo*, u16, u16) const; + bool getMessageDirect(TalkMessageInfo*, const char*) const; + bool getMessage(TalkMessageInfo*, u16, u16) const; TalkNode* findNode(const char*) const; TalkNode* getNode(u32) const; TalkNode* getBranchNode(u32) const; - bool isValidBranchNode(u32) const; - u8* getMessageInfoTool(int) const; - s32 findMessageIndex(const char*) const; + bool isValidBranchNode(u32) const; + u8* getMessageInfoTool(int) const; + s32 findMessageIndex(const char*) const; - JMapInfo* mIDTable; // 0x0 - MessageInfoBlock* mInfoBlock; // 0x4 - MessageDataBlock* mDataBlock; // 0x8 - u32 _C; - MessageFlowBlock* mFlowBlock; // 0x10 - u16* _14; - u8* _18; - MessageFLI1Block* mFLI1Block; // 0x1C + JMapInfo* mIDTable; // 0x0 + MessageInfoBlock* mInfoBlock; // 0x4 + MessageDataBlock* mDataBlock; // 0x8 + u32 _C; + MessageFlowBlock* mFlowBlock; // 0x10 + u16* _14; + u8* _18; + MessageFLI1Block* mFLI1Block; // 0x1C }; class MessageHolder { @@ -64,35 +64,32 @@ public: void initSystemData(); void initGameData(); - MessageData* mSystemMessage; // 0x0 - MessageData* mGameMessage; // 0x4 - MessageData* mSceneData; // 0x8 + MessageData* mSystemMessage; // 0x0 + MessageData* mGameMessage; // 0x4 + MessageData* mSceneData; // 0x8 }; class MessageSystem { public: - class Node { - }; struct FlowNodeBranch { - }; struct FlowNodeEvent { - u8 mFlowType; // 0x0 - u8 mEventType; // 0x1 - u16 mBranchID; // 0x2 - u32 mArg; // 0x4 + u8 mFlowType; // 0x0 + u8 mEventType; // 0x1 + u16 mBranchID; // 0x2 + u32 mArg; // 0x4 }; static inline TalkNode* getCurrentBranchNodeFromSceneMsg(u32 idx) { return getSceneMessageData()->getBranchNode(idx); } - static void getSystemMessageDirect(TalkMessageInfo*, const char*); - static void getGameMessageDirect(TalkMessageInfo*, const char*); - static void getLayoutMessageDirect(TalkMessageInfo*, const char*); + static void getSystemMessageDirect(TalkMessageInfo*, const char*); + static void getGameMessageDirect(TalkMessageInfo*, const char*); + static void getLayoutMessageDirect(TalkMessageInfo*, const char*); static MessageData* getSceneMessageData(); }; diff --git a/include/Game/System/NANDErrorSequence.hpp b/include/Game/System/NANDErrorSequence.hpp index 063c21e4d..c0c395bf7 100644 --- a/include/Game/System/NANDErrorSequence.hpp +++ b/include/Game/System/NANDErrorSequence.hpp @@ -44,10 +44,10 @@ public: private: /* 0x0C */ SaveDataHandleSequence* mHost; - /* 0x10 */ const char* mSystemMessageId; - /* 0x14 */ bool _14; - /* 0x15 */ bool _15; - /* 0x18 */ u32 mAnswer; - /* 0x1C */ u32 mResult; - /* 0x20 */ SysInfoWindow* mSysInfoWindow; + /* 0x10 */ const char* mSystemMessageId; + /* 0x14 */ bool _14; + /* 0x15 */ bool _15; + /* 0x18 */ u32 mAnswer; + /* 0x1C */ u32 mResult; + /* 0x20 */ SysInfoWindow* mSysInfoWindow; }; diff --git a/include/Game/System/NANDManager.hpp b/include/Game/System/NANDManager.hpp index f79b34908..893919582 100644 --- a/include/Game/System/NANDManager.hpp +++ b/include/Game/System/NANDManager.hpp @@ -5,61 +5,59 @@ class NANDManagerThread; class NANDRequestInfo; -typedef void (NANDReqFunc)(NANDRequestInfo *); +typedef void(NANDReqFunc)(NANDRequestInfo*); class NANDRequestInfo { public: NANDRequestInfo(); - void init(); - bool isDone() const; - const char* setMove(const char *, const char *); - const char* setWriteSeq(const char *, const void *, u32, u8, u8); - const char* setReadSeq(const char *, void *, u32, u32 *); - const char* setCheck(u32, u32, u32 *); - const char* setDelete(const char *); + void init(); + bool isDone() const; + const char* setMove(const char*, const char*); + const char* setWriteSeq(const char*, const void*, u32, u8, u8); + const char* setReadSeq(const char*, void*, u32, u32*); + const char* setCheck(u32, u32, u32*); + const char* setDelete(const char*); /* 0x00 */ char mPath[NAND_MAX_PATH]; - /* 0x40 */ u32 _40; - /* 0x44 */ s32 mType; - /* 0x48 */ s32 mResult; + /* 0x40 */ u32 _40; + /* 0x44 */ s32 mType; + /* 0x48 */ s32 mResult; /* 0x4C */ union { - void* mReadBuf; + void* mReadBuf; const void* mWriteBuf; }; /* 0x50 */ union { const char* mMoveDestDir; - u32* mReadLength; - u32* mCheckAnswer; + u32* mReadLength; + u32* mCheckAnswer; }; /* 0x54 */ NANDReqFunc* _54; - /* 0x58 */ u8 mPermission; - /* 0x59 */ u8 mAttribute; - /* 0x5C */ u32 mFsBlock; - /* 0x60 */ u32 mInode; - /* 0x64 */ u8 _64[0x1C]; + /* 0x58 */ u8 mPermission; + /* 0x59 */ u8 mAttribute; + /* 0x5C */ u32 mFsBlock; + /* 0x60 */ u32 mInode; + /* 0x64 */ u8 _64[0x1C]; }; class NANDManager { public: NANDManager(); - bool addRequest(NANDRequestInfo *); + bool addRequest(NANDRequestInfo*); private: - /* 0x00 */ OSMutex mMutex; + /* 0x00 */ OSMutex mMutex; /* 0x18 */ NANDManagerThread* mManagerThread; }; class NANDResultCode { public: - NANDResultCode(s32 code) : - mCode(code) - { - + NANDResultCode(s32 code) + : mCode(code) { } - s32 getCode() const; + s32 getCode() const; bool isSuccess() const; bool isSaveDataCorrupted() const; bool isNANDCorrupted() const; @@ -74,5 +72,5 @@ private: }; namespace MR { - void addRequestToNANDManager(NANDRequestInfo *); + void addRequestToNANDManager(NANDRequestInfo*); }; diff --git a/include/Game/System/NANDManagerThread.hpp b/include/Game/System/NANDManagerThread.hpp index 09a048a28..34b849a4d 100644 --- a/include/Game/System/NANDManagerThread.hpp +++ b/include/Game/System/NANDManagerThread.hpp @@ -6,10 +6,10 @@ class NANDRequestInfo; class NANDManagerThread : public OSThreadWrapper { public: - NANDManagerThread(int, int, JKRHeap *); + NANDManagerThread(int, int, JKRHeap*); virtual void* run(); - void executeWriteSequence(NANDRequestInfo *); - void executeReadSequence(NANDRequestInfo *); + void executeWriteSequence(NANDRequestInfo*); + void executeReadSequence(NANDRequestInfo*); }; \ No newline at end of file diff --git a/include/Game/System/NerveExecutor.hpp b/include/Game/System/NerveExecutor.hpp index 7566f9805..22281b048 100644 --- a/include/Game/System/NerveExecutor.hpp +++ b/include/Game/System/NerveExecutor.hpp @@ -16,7 +16,7 @@ public: void updateNerve(); void setNerve(const Nerve* pNerve); bool isNerve(const Nerve* pNerve) const; - s32 getNerveStep() const; + s32 getNerveStep() const; /* 0x4 */ Spine* mSpine; }; diff --git a/include/Game/System/OSThreadWrapper.hpp b/include/Game/System/OSThreadWrapper.hpp index 0e9a2c073..846dd5de7 100644 --- a/include/Game/System/OSThreadWrapper.hpp +++ b/include/Game/System/OSThreadWrapper.hpp @@ -6,20 +6,20 @@ class JKRHeap; class OSThreadWrapper { public: - OSThreadWrapper(u32, int, int, JKRHeap *); + OSThreadWrapper(u32, int, int, JKRHeap*); virtual ~OSThreadWrapper(); virtual void* run(); - void initMessageQueue(JKRHeap *, int); - void initHeapSpecified(JKRHeap *, u32, int); - static void* start(void *); + void initMessageQueue(JKRHeap*, int); + void initHeapSpecified(JKRHeap*, u32, int); + static void* start(void*); - /* 0x00 */ JKRHeap* mHeap; - /* 0x04 */ OSThread* mThread; + /* 0x00 */ JKRHeap* mHeap; + /* 0x04 */ OSThread* mThread; /* 0x08 */ OSMessageQueue mQueue; - /* 0x2C */ OSMessage* mMessageArray; - /* 0x30 */ u32 mMessageCount; - /* 0x34 */ u8* mStack; - /* 0x38 */ u32 mStackSize; + /* 0x2C */ OSMessage* mMessageArray; + /* 0x30 */ u32 mMessageCount; + /* 0x34 */ u8* mStack; + /* 0x38 */ u32 mStackSize; }; diff --git a/include/Game/System/ResourceHolder.hpp b/include/Game/System/ResourceHolder.hpp index 103d8898e..a84fb0794 100644 --- a/include/Game/System/ResourceHolder.hpp +++ b/include/Game/System/ResourceHolder.hpp @@ -11,39 +11,38 @@ class J3DModelData; typedef const char* ArchiveName; - class ResourceHolder { public: - ResourceHolder(JKRArchive &); + ResourceHolder(JKRArchive&); const char* getMotionName(u32) const; - bool isExistMaterialAnm() const; - void newMaterialAnmBuffer(J3DModelData *); - void newBckCtrl(); + bool isExistMaterialAnm() const; + void newMaterialAnmBuffer(J3DModelData*); + void newBckCtrl(); - void initializeArc(JKRArchive &); - static JKRFileFinder* getFindFinder(JKRArchive *, const char *); - u32 initEachResTable(ResTable **, JKRArchive *, const ArchiveName *); + void initializeArc(JKRArchive&); + static JKRFileFinder* getFindFinder(JKRArchive*, const char*); + u32 initEachResTable(ResTable**, JKRArchive*, const ArchiveName*); - void mount(JKRArchive *, char *); + void mount(JKRArchive*, char*); - ResTable* mModelResTable; // 0x0 - ResTable* mMotionResTable; // 0x4 - ResTable* mBtkResTable; // 0x8 - ResTable* mBpkResTable; // 0xC - ResTable* mBtpResTable; // 0x10 - ResTable* mBlkResTable; // 0x14 - ResTable* mBrkResTable; // 0x18 - ResTable* mBasResTable; // 0x1C - ResTable* mBmtResTable; // 0x20 - ResTable* mBvaResTable; // 0x24 - ResTable* mBanmtResTable; // 0x28 - ResTable* mFileInfoTable; // 0x2C - ResTable mDefaultTable; // 0x30 - MaterialAnmBuffer* mMaterialBuf; // 0x38 - BckCtrl* mBckCtrl; // 0x3C - void* mBackupMaterialData; // 0x40 - JKRArchive* mArchive; // 0x44 - JKRHeap* mHeap; // 0x48 - u32 _4C; + ResTable* mModelResTable; // 0x0 + ResTable* mMotionResTable; // 0x4 + ResTable* mBtkResTable; // 0x8 + ResTable* mBpkResTable; // 0xC + ResTable* mBtpResTable; // 0x10 + ResTable* mBlkResTable; // 0x14 + ResTable* mBrkResTable; // 0x18 + ResTable* mBasResTable; // 0x1C + ResTable* mBmtResTable; // 0x20 + ResTable* mBvaResTable; // 0x24 + ResTable* mBanmtResTable; // 0x28 + ResTable* mFileInfoTable; // 0x2C + ResTable mDefaultTable; // 0x30 + MaterialAnmBuffer* mMaterialBuf; // 0x38 + BckCtrl* mBckCtrl; // 0x3C + void* mBackupMaterialData; // 0x40 + JKRArchive* mArchive; // 0x44 + JKRHeap* mHeap; // 0x48 + u32 _4C; }; diff --git a/include/Game/System/ResourceHolderManager.hpp b/include/Game/System/ResourceHolderManager.hpp index 30b87636c..84d4e8ccd 100644 --- a/include/Game/System/ResourceHolderManager.hpp +++ b/include/Game/System/ResourceHolderManager.hpp @@ -19,8 +19,8 @@ public: CreateResourceHolderArgs(); /* 0x0 */ ResourceHolder* mResourceHolder; - /* 0x4 */ LayoutHolder* mLayoutHolder; - /* 0x8 */ JKRHeap* mHeap; + /* 0x4 */ LayoutHolder* mLayoutHolder; + /* 0x8 */ JKRHeap* mHeap; }; class ResourceHolderManagerName2Resource { @@ -34,9 +34,9 @@ public: ResourceHolderManagerName2Resource& operator=(const ResourceHolderManagerName2Resource& other); /* 0x0 */ ResourceHolder* mResourceHolder; - /* 0x4 */ LayoutHolder* mLayoutHolder; - /* 0x8 */ u32 mHash; - /* 0xC */ JKRHeap* mHeap; + /* 0x4 */ LayoutHolder* mLayoutHolder; + /* 0x8 */ u32 mHash; + /* 0xC */ JKRHeap* mHeap; }; class ResourceHolderManager { @@ -46,21 +46,21 @@ public: ResourceHolder* createAndAdd(const char*, JKRHeap*); ResourceHolder* createAndAddStationed(const char*); - LayoutHolder* createAndAddLayoutHolder(const char*, JKRHeap*); - LayoutHolder* createAndAddLayoutHolderStationed(const char*); - LayoutHolder* createAndAddLayoutHolderRawData(const char*); - void removeIfIsEqualHeap(JKRHeap*); - static void startCreateResourceHolderOnMainThread(const char*, CreateResourceHolderArgs*); - static void startCreateLayoutHolderOnMainThread(const char*, CreateResourceHolderArgs*); + LayoutHolder* createAndAddLayoutHolder(const char*, JKRHeap*); + LayoutHolder* createAndAddLayoutHolderStationed(const char*); + LayoutHolder* createAndAddLayoutHolderRawData(const char*); + void removeIfIsEqualHeap(JKRHeap*); + static void startCreateResourceHolderOnMainThread(const char*, CreateResourceHolderArgs*); + static void startCreateLayoutHolderOnMainThread(const char*, CreateResourceHolderArgs*); private: ResourceHolderManagerName2Resource* createAndAddInner(const char*, MakeArchiveFileNameFuncPtr, FuncPtrB); ResourceHolderManagerName2Resource* createAndAddInnerStationed(const char*, FuncPtrC); - void createResourceHolder(const char*, CreateResourceHolderArgs*); - void createLayoutHolder(const char*, CreateResourceHolderArgs*); + void createResourceHolder(const char*, CreateResourceHolderArgs*); + void createLayoutHolder(const char*, CreateResourceHolderArgs*); ResourceHolderManagerName2Resource* add(const char*, const CreateResourceHolderArgs&); ResourceHolderManagerName2Resource* find(const char*); private: - /* 0x0 */ MR::Vector > mResourceArray; + /* 0x0 */ MR::Vector> mResourceArray; }; diff --git a/include/Game/System/ResourceInfo.hpp b/include/Game/System/ResourceInfo.hpp index 29d428095..eb6cf7457 100644 --- a/include/Game/System/ResourceInfo.hpp +++ b/include/Game/System/ResourceInfo.hpp @@ -6,35 +6,35 @@ class ResFileInfo { public: ResFileInfo(); - void setName(const char *, bool); + void setName(const char*, bool); void* mResource; // 0x0 - u32 _4; - u32 _8; - u32 _C; - char* mName; // 0x10 - u32 mHashCode; // 0x14 + u32 _4; + u32 _8; + u32 _C; + char* mName; // 0x10 + u32 mHashCode; // 0x14 }; class ResTable { public: ResTable(); - void newFileInfoTable(u32); - ResFileInfo* add(const char *, void *, bool); - const char* getResName(u32) const; - void* getRes(u32) const; - void* getRes(const char *) const; - ResFileInfo* findFileInfo(const char *) const; + void newFileInfoTable(u32); + ResFileInfo* add(const char*, void*, bool); + const char* getResName(u32) const; + void* getRes(u32) const; + void* getRes(const char*) const; + ResFileInfo* findFileInfo(const char*) const; ResFileInfo* getFileInfo(u32) const; - bool isExistRes(const char *) const; - int getResIndex(const char *) const; - const char* findResName(const void *) const; - const char* getResName(const void *) const; + bool isExistRes(const char*) const; + int getResIndex(const char*) const; + const char* findResName(const void*) const; + const char* getResName(const void*) const; - ResFileInfo* mFileInfoTable; // 0x0 - u32 mCount; // 0x4 + ResFileInfo* mFileInfoTable; // 0x0 + u32 mCount; // 0x4 private: - void* findRes(const char *) const; + void* findRes(const char*) const; }; \ No newline at end of file diff --git a/include/Game/System/SaveDataBannerCreator.hpp b/include/Game/System/SaveDataBannerCreator.hpp index 97a85217b..5a181e68b 100644 --- a/include/Game/System/SaveDataBannerCreator.hpp +++ b/include/Game/System/SaveDataBannerCreator.hpp @@ -11,16 +11,16 @@ public: /// @brief Creates a new `SaveDataBannerCreator`. SaveDataBannerCreator(); - void execute(); - bool isDone() const; + void execute(); + bool isDone() const; NANDResultCode getResultCode() const; - void exeNoOperation(); - void exeCreateOnTemporary(); - void exeMoveToHomeDir(); - void setupBannerInfo(); + void exeNoOperation(); + void exeCreateOnTemporary(); + void exeMoveToHomeDir(); + void setupBannerInfo(); private: /* 0x08 */ NANDRequestInfo* mNANDRequestInfo; - /* 0x0C */ NANDBanner* mBanner; - /* 0x10 */ char mHomeDir[NAND_MAX_PATH]; + /* 0x0C */ NANDBanner* mBanner; + /* 0x10 */ char mHomeDir[NAND_MAX_PATH]; }; diff --git a/include/Game/System/SaveDataHandleSequence.hpp b/include/Game/System/SaveDataHandleSequence.hpp index 33f347acc..709c099a8 100644 --- a/include/Game/System/SaveDataHandleSequence.hpp +++ b/include/Game/System/SaveDataHandleSequence.hpp @@ -19,78 +19,78 @@ public: /// @brief Creates a new `SaveDataHandleSequence`. SaveDataHandleSequence(); - void initAfterResourceLoaded(); - void registerFunctorOnSaveSuccess(const MR::FunctorBase&); - void registerFunctorJustBeforeSave(const MR::FunctorBase&); - void update(); - void draw() const; - void startPreLoad(); - void startCreateUserFile(int); - void startDeleteUserFile(int); - void startSave(bool, bool); - void startSaveBackup(bool, bool); - void startSaveAll(); - void startSaveTotalMailSize(); - void startLoad(int, bool); - void storeMiiOrIconId(int, const void*, const u32*); - void storeCopyUserFile(int, int); - bool tryNANDErrorSequence(s32); - bool isActive() const; - bool isPermitToReset() const; - void prepareReset(); - bool isPreparedReset() const; - void restoreFromReset(); - bool isInitializedGameDataHolder() const; - void restoreUserFile(UserFile*, int); - void restoreUserFile(UserFile*, int, bool); - void backupCurrentUserFile(); - void exeNoOperation(); - void exeCheckEnableToCreate(); - void exeSaveConfirm(); - void exeSave(); - void exeSaveWindowDisappear(); - void exeSaveDoneKeyWait(); - void exeSaveAllWithoutKeyWait(); - void exeSaveAllWithoutKeyWaitDisappear(); - void exeSaveAllWithoutWindow(); - void exePreLoad(); - void exePreLoadDone(); - void exeNoSaveConfirmRemind(); - void exeErrorHandling(); + void initAfterResourceLoaded(); + void registerFunctorOnSaveSuccess(const MR::FunctorBase&); + void registerFunctorJustBeforeSave(const MR::FunctorBase&); + void update(); + void draw() const; + void startPreLoad(); + void startCreateUserFile(int); + void startDeleteUserFile(int); + void startSave(bool, bool); + void startSaveBackup(bool, bool); + void startSaveAll(); + void startSaveTotalMailSize(); + void startLoad(int, bool); + void storeMiiOrIconId(int, const void*, const u32*); + void storeCopyUserFile(int, int); + bool tryNANDErrorSequence(s32); + bool isActive() const; + bool isPermitToReset() const; + void prepareReset(); + bool isPreparedReset() const; + void restoreFromReset(); + bool isInitializedGameDataHolder() const; + void restoreUserFile(UserFile*, int); + void restoreUserFile(UserFile*, int, bool); + void backupCurrentUserFile(); + void exeNoOperation(); + void exeCheckEnableToCreate(); + void exeSaveConfirm(); + void exeSave(); + void exeSaveWindowDisappear(); + void exeSaveDoneKeyWait(); + void exeSaveAllWithoutKeyWait(); + void exeSaveAllWithoutKeyWaitDisappear(); + void exeSaveAllWithoutWindow(); + void exePreLoad(); + void exePreLoadDone(); + void exeNoSaveConfirmRemind(); + void exeErrorHandling(); GameDataHolder* getHolder(); - SysConfigFile* getSysConfigFile(); - UserFile* getCurrentUserFile(); - UserFile* getBackupUserFile(); - void restoreUserFileConfigData(UserFile*, int); - void restoreUserFileGameData(UserFile*, int, bool); - void restoreSysConfigFile(SysConfigFile*); - bool trySave(); - bool trySaveWindowDisappear(bool*, const Nerve*); - bool trySaveWithoutWindow(bool*, const Nerve*); - bool tryConfirm(const char*, bool*); - bool tryProcessDoneKeyWait(const char*); - bool tryNoSave(); - bool isEnablePointer() const; - bool executeSaveFinish(bool*, const Nerve*); - void syncNoSaveFlagsFromErrorSequence(); + SysConfigFile* getSysConfigFile(); + UserFile* getCurrentUserFile(); + UserFile* getBackupUserFile(); + void restoreUserFileConfigData(UserFile*, int); + void restoreUserFileGameData(UserFile*, int, bool); + void restoreSysConfigFile(SysConfigFile*); + bool trySave(); + bool trySaveWindowDisappear(bool*, const Nerve*); + bool trySaveWithoutWindow(bool*, const Nerve*); + bool tryConfirm(const char*, bool*); + bool tryProcessDoneKeyWait(const char*); + bool tryNoSave(); + bool isEnablePointer() const; + bool executeSaveFinish(bool*, const Nerve*); + void syncNoSaveFlagsFromErrorSequence(); - /* 0x08 */ SysConfigFile* mSysConfigFile; - /* 0x0C */ UserFile* mCurrentUserFile; - /* 0x10 */ UserFile* mBackupUserFile; - /* 0x14 */ SaveDataHandler* mSaveDataHandler; + /* 0x08 */ SysConfigFile* mSysConfigFile; + /* 0x0C */ UserFile* mCurrentUserFile; + /* 0x10 */ UserFile* mBackupUserFile; + /* 0x14 */ SaveDataHandler* mSaveDataHandler; /* 0x18 */ NANDErrorSequence* mNANDErrorSequence; - /* 0x1C */ SysInfoWindow* mSysInfoWindowConfirm; - /* 0x20 */ SysInfoWindow* mSysInfoWindowSave; - /* 0x24 */ s32 _24; - /* 0x28 */ bool mIsConfirmRemind; - /* 0x29 */ bool mIsSaveAndQuitMsg; - /* 0x2A */ bool _2A; - /* 0x2B */ bool _2B; - /* 0x2C */ bool _2C; - /* 0x30 */ UserFile* mWorkUserFile; - /* 0x34 */ const Nerve* mNerveForError; - /* 0x38 */ u8* mTempBuffer; - /* 0x3C */ MR::FunctorBase* mOnSaveSuccessFunc; - /* 0x40 */ MR::FunctorBase* mJustBeforeSaveFunc; - /* 0x44 */ SaveIcon* mSaveIcon; + /* 0x1C */ SysInfoWindow* mSysInfoWindowConfirm; + /* 0x20 */ SysInfoWindow* mSysInfoWindowSave; + /* 0x24 */ s32 _24; + /* 0x28 */ bool mIsConfirmRemind; + /* 0x29 */ bool mIsSaveAndQuitMsg; + /* 0x2A */ bool _2A; + /* 0x2B */ bool _2B; + /* 0x2C */ bool _2C; + /* 0x30 */ UserFile* mWorkUserFile; + /* 0x34 */ const Nerve* mNerveForError; + /* 0x38 */ u8* mTempBuffer; + /* 0x3C */ MR::FunctorBase* mOnSaveSuccessFunc; + /* 0x40 */ MR::FunctorBase* mJustBeforeSaveFunc; + /* 0x44 */ SaveIcon* mSaveIcon; }; diff --git a/include/Game/System/SaveDataHandler.hpp b/include/Game/System/SaveDataHandler.hpp index c8e992fb9..f4aac5d76 100644 --- a/include/Game/System/SaveDataHandler.hpp +++ b/include/Game/System/SaveDataHandler.hpp @@ -12,38 +12,38 @@ class SaveDataHandler : public NerveExecutor { public: SaveDataHandler(const SysConfigFile*, const UserFile*); - void update(); - void requestCheckEnableToCreate(); - void requestLoadSaveData(); - bool requestVerifyAfterLoadGameDataFile(); - void initializeUserFileMemory(int, const UserFile*); - void copyUserFileMemory(int, int); - void restoreGameDataFile(const char*, void*, u32); - void storeUserFile(const UserFile*); - void storeSysConfigFile(const SysConfigFile*); - void requestSaveSaveData(); - void requestRemoveSaveData(); - static u32 getEnoughtTempBufferSize(); - bool isDone() const; + void update(); + void requestCheckEnableToCreate(); + void requestLoadSaveData(); + bool requestVerifyAfterLoadGameDataFile(); + void initializeUserFileMemory(int, const UserFile*); + void copyUserFileMemory(int, int); + void restoreGameDataFile(const char*, void*, u32); + void storeUserFile(const UserFile*); + void storeSysConfigFile(const SysConfigFile*); + void requestSaveSaveData(); + void requestRemoveSaveData(); + static u32 getEnoughtTempBufferSize(); + bool isDone() const; NANDResultCode getLastResultCode() const; - void exeWait(); - void exeProcessing(); - void exeSaveProcessingGameData(); - void exeSaveProcessingBanner(); - void exeRemoveProcessingBanner(); - void exeRemoveProcessingGameData(); - static void resetSaveData(u8*); - static void initializeAllFileInSaveData(u8*, const SysConfigFile*, const UserFile*); - static bool isCorrectFileHeader(const u8*); - static void copySaveDataEachFile(u8*, const u8*); - void createCommunicationBuffer(); - bool tryRemoveFile(const char*, bool*); - bool trySave(bool*, bool); + void exeWait(); + void exeProcessing(); + void exeSaveProcessingGameData(); + void exeSaveProcessingBanner(); + void exeRemoveProcessingBanner(); + void exeRemoveProcessingGameData(); + static void resetSaveData(u8*); + static void initializeAllFileInSaveData(u8*, const SysConfigFile*, const UserFile*); + static bool isCorrectFileHeader(const u8*); + static void copySaveDataEachFile(u8*, const u8*); + void createCommunicationBuffer(); + bool tryRemoveFile(const char*, bool*); + bool trySave(bool*, bool); - /* 0x08 */ NANDRequestInfo* mNANDRequestInfo; - /* 0x0C */ u32 _C; - /* 0x10 */ u32 _10; - /* 0x14 */ u8* _14; - /* 0x18 */ u8* _18; + /* 0x08 */ NANDRequestInfo* mNANDRequestInfo; + /* 0x0C */ u32 _C; + /* 0x10 */ u32 _10; + /* 0x14 */ u8* _14; + /* 0x18 */ u8* _18; /* 0x1C */ SaveDataBannerCreator* mBannerCreator; }; diff --git a/include/Game/System/ScenarioDataParser.hpp b/include/Game/System/ScenarioDataParser.hpp index cd051b1b2..98ea667c9 100644 --- a/include/Game/System/ScenarioDataParser.hpp +++ b/include/Game/System/ScenarioDataParser.hpp @@ -12,35 +12,35 @@ public: void goNext(); JMapInfo* _0; - u32 mCur; // 0x4 + u32 mCur; // 0x4 }; class ScenarioData { public: - ScenarioData(const char *); - - s32 getScenarioNum() const; - s32 getPowerStarNum() const; - bool getValueString(const char *, s32, const char **) const; - const char* getZoneName(s32) const; - ScenarioDataIter getScenarioDataIter(s32) const; - u32 getValueU32(const char *, s32, u32 *) const; - bool getValueBool(const char *, s32, bool *) const; - s32 getZoneNum() const; - s32 getZoneId(const char *) const; + ScenarioData(const char*); - JMapInfo* mScenarioData; // 0x0 - const char* mGalaxyName; // 0x4 - JMapInfo* mZoneList; // 0x8 + s32 getScenarioNum() const; + s32 getPowerStarNum() const; + bool getValueString(const char*, s32, const char**) const; + const char* getZoneName(s32) const; + ScenarioDataIter getScenarioDataIter(s32) const; + u32 getValueU32(const char*, s32, u32*) const; + bool getValueBool(const char*, s32, bool*) const; + s32 getZoneNum() const; + s32 getZoneId(const char*) const; + + JMapInfo* mScenarioData; // 0x0 + const char* mGalaxyName; // 0x4 + JMapInfo* mZoneList; // 0x8 }; class ScenarioDataParser : public NameObj { public: - ScenarioDataParser(const char *); + ScenarioDataParser(const char*); virtual ~ScenarioDataParser(); - - GalaxyStatusAccessor makeAccessor(const char *) const; + + GalaxyStatusAccessor makeAccessor(const char*) const; static const char* sNullStr; @@ -50,9 +50,9 @@ public: namespace ScenarioDataFunction { ScenarioDataParser getScenarioDataParser(); - u32 getCurrentCommonLayers(const char *); - u32 getCurrentScenarioLayers(const char *, s32); -}; + u32 getCurrentCommonLayers(const char*); + u32 getCurrentScenarioLayers(const char*, s32); +}; // namespace ScenarioDataFunction namespace MR { ScenarioDataIter makeBeginScenarioDataIter(); diff --git a/include/Game/System/StageResultSequenceChecker.hpp b/include/Game/System/StageResultSequenceChecker.hpp index b4fa29aa4..3b0ed2ef3 100644 --- a/include/Game/System/StageResultSequenceChecker.hpp +++ b/include/Game/System/StageResultSequenceChecker.hpp @@ -11,11 +11,11 @@ public: void init(); private: - /* 0x00 */ s32 mTicoGalaxyNum; - /* 0x04 */ s32 mPictureBookChapterCanRead; - /* 0x08 */ s32 mGalaxyNumCanOpen; - /* 0x0C */ s32 mPowerStarNum; - /* 0x10 */ s32 mGreenStarNum; + /* 0x00 */ s32 mTicoGalaxyNum; + /* 0x04 */ s32 mPictureBookChapterCanRead; + /* 0x08 */ s32 mGalaxyNumCanOpen; + /* 0x0C */ s32 mPowerStarNum; + /* 0x10 */ s32 mGreenStarNum; /* 0x14 */ bool mIsCompleteGalaxy; }; @@ -24,18 +24,18 @@ public: /// @brief Creates a new `StageResultSequenceChecker`. StageResultSequenceChecker(); - void check(); - void checkIfComplete(const char*); - bool isJustAppearTicoGalaxy() const; - bool isAddPictureBook() const; - bool isJustOpenLibraryRoom() const; - bool isJustGetGreenStarFirst() const; - bool isJustCompleteGalaxy() const; - s32 getPrevPowerStarNum() const; - s32 getAfterPowerStarNum() const; + void check(); + void checkIfComplete(const char*); + bool isJustAppearTicoGalaxy() const; + bool isAddPictureBook() const; + bool isJustOpenLibraryRoom() const; + bool isJustGetGreenStarFirst() const; + bool isJustCompleteGalaxy() const; + s32 getPrevPowerStarNum() const; + s32 getAfterPowerStarNum() const; static void fillCheckList(StageResultSequenceCheckList*, const GameDataHolder*); static void fillCheckListIfComplete(StageResultSequenceCheckList*, const GameDataHolder*, const char*); - bool isJustOpenGalaxyWithoutChallengeGalaxy() const; + bool isJustOpenGalaxyWithoutChallengeGalaxy() const; private: /* 0x00 */ StageResultSequenceCheckList mCheckListPrev; diff --git a/include/Game/System/StarPointerOnOffController.hpp b/include/Game/System/StarPointerOnOffController.hpp index c82dd770e..6b38843d7 100644 --- a/include/Game/System/StarPointerOnOffController.hpp +++ b/include/Game/System/StarPointerOnOffController.hpp @@ -74,9 +74,9 @@ public: void incModeCounter(void*, s32); void decModeCounter(void*); - /* 0x08 */ bool _8; + /* 0x08 */ bool _8; /* 0x0C */ void* _C[16]; - /* 0x4C */ u32 _4C[StarPointerMode_Count]; - /* 0xB4 */ bool _B4[StarPointerMode_Count]; - /* 0xD0 */ s32 _D0; + /* 0x4C */ u32 _4C[StarPointerMode_Count]; + /* 0xB4 */ bool _B4[StarPointerMode_Count]; + /* 0xD0 */ s32 _D0; }; diff --git a/include/Game/System/StationedArchiveLoader.hpp b/include/Game/System/StationedArchiveLoader.hpp index 552212b09..387300083 100644 --- a/include/Game/System/StationedArchiveLoader.hpp +++ b/include/Game/System/StationedArchiveLoader.hpp @@ -11,12 +11,12 @@ public: class Condition { public: virtual ~Condition(); - virtual bool isExecute(const MR::StationedFileInfo *) const; - virtual JKRHeap* getProperHeap(const MR::StationedFileInfo *) const; + virtual bool isExecute(const MR::StationedFileInfo*) const; + virtual JKRHeap* getProperHeap(const MR::StationedFileInfo*) const; }; - static JKRHeap* getProperHeap(const MR::StationedFileInfo *); - static void loadResourcesFromTable(const StationedArchiveLoader::Condition &); - static void createAndAddResourcesFromTable(const StationedArchiveLoader::Condition &); - static void loadScenarioData(JKRHeap *); + static JKRHeap* getProperHeap(const MR::StationedFileInfo*); + static void loadResourcesFromTable(const StationedArchiveLoader::Condition&); + static void createAndAddResourcesFromTable(const StationedArchiveLoader::Condition&); + static void loadScenarioData(JKRHeap*); }; diff --git a/include/Game/System/StationedFileInfo.hpp b/include/Game/System/StationedFileInfo.hpp index d3955717e..3629e18d6 100644 --- a/include/Game/System/StationedFileInfo.hpp +++ b/include/Game/System/StationedFileInfo.hpp @@ -4,10 +4,10 @@ namespace MR { struct StationedFileInfo { - /* 0x0 */ s32 mHeapType; - /* 0x4 */ s32 mLoadType; + /* 0x0 */ s32 mHeapType; + /* 0x4 */ s32 mLoadType; /* 0x8 */ const char* mArchive; }; const StationedFileInfo* getStationedFileInfoTable(); -}; +}; // namespace MR diff --git a/include/Game/System/StorySequenceExecutor.hpp b/include/Game/System/StorySequenceExecutor.hpp index fed403e47..7959bb84b 100644 --- a/include/Game/System/StorySequenceExecutor.hpp +++ b/include/Game/System/StorySequenceExecutor.hpp @@ -11,8 +11,8 @@ class StorySequenceExecutorType { public: class DemoSequenceInfo { public: - /* 0x00 */ u16 _0; - /* 0x02 */ u16 _4; + /* 0x00 */ u16 _0; + /* 0x02 */ u16 _4; /* 0x04 */ const char* _8; }; }; @@ -22,53 +22,53 @@ public: /// @brief Creates a new `StorySequenceExecutor`. StorySequenceExecutor(); - void update(); - bool isNeedMoviePlayerExecutingEventEnum() const; - bool hasNextDemo() const; - s32 getExecutingEventEnum() const; - bool isEqualStageScenarioBefore(const char*, int) const; - void moveGalaxy(GalaxyMoveArgument*, bool); - void setNerveSceneStart(); - void forceStop(); - void exeIdle(); - void exeWaitToSceneStart(); - void exePlayDemoSequence(); - void exeWaitTimeKeepDemoEnd(); - void exeWaitSaveEnd(); - void exeStartSaveAfterSequence(); - void exeWaitSaveEndAfterSequence(); - void exeFadeinAfterSequence(); - void exeStaffRollSequence(); - void decideNextEventForClearGalaxy(GalaxyMoveArgument*); - void decideNextEventForMoveGalaxy(GalaxyMoveArgument*); - void decideNextEventForAfterLoading(GalaxyMoveArgument*); - void decideNextStageForGalaxyOut(GalaxyMoveArgument*); - void overwriteGalaxyNameAfterLoading(GalaxyMoveArgument*); - void setNextStageToAstroGalaxyOrDome(GalaxyMoveArgument*); - void setNextStageToAstroDome(GalaxyMoveArgument*); - bool isExecuteDemoLuigiMissing(const GalaxyMoveArgument*) const; - void getOptionalDemoForClearGalaxy(MR::Vector >*, const GalaxyMoveArgument*) const; - bool isEqualStageStopCometScheduler(const char*); - void prepareDemoSequence(const StorySequenceExecutorType::DemoSequenceInfo*); - void prepareDemoSequence(const MR::Vector >&); - void prepareDemoSequenceButlerFortressDiscover(const GalaxyMoveArgument*, const DemoFortressDiscoverCheckList&); - bool tryStartDemo(const char*); - bool tryStartSave(); - bool tryWaitSaveEnd(); - bool tryStartFadein(); - bool tryStartMovieAndWaitEnd(u32); + void update(); + bool isNeedMoviePlayerExecutingEventEnum() const; + bool hasNextDemo() const; + s32 getExecutingEventEnum() const; + bool isEqualStageScenarioBefore(const char*, int) const; + void moveGalaxy(GalaxyMoveArgument*, bool); + void setNerveSceneStart(); + void forceStop(); + void exeIdle(); + void exeWaitToSceneStart(); + void exePlayDemoSequence(); + void exeWaitTimeKeepDemoEnd(); + void exeWaitSaveEnd(); + void exeStartSaveAfterSequence(); + void exeWaitSaveEndAfterSequence(); + void exeFadeinAfterSequence(); + void exeStaffRollSequence(); + void decideNextEventForClearGalaxy(GalaxyMoveArgument*); + void decideNextEventForMoveGalaxy(GalaxyMoveArgument*); + void decideNextEventForAfterLoading(GalaxyMoveArgument*); + void decideNextStageForGalaxyOut(GalaxyMoveArgument*); + void overwriteGalaxyNameAfterLoading(GalaxyMoveArgument*); + void setNextStageToAstroGalaxyOrDome(GalaxyMoveArgument*); + void setNextStageToAstroDome(GalaxyMoveArgument*); + bool isExecuteDemoLuigiMissing(const GalaxyMoveArgument*) const; + void getOptionalDemoForClearGalaxy(MR::Vector>*, const GalaxyMoveArgument*) const; + bool isEqualStageStopCometScheduler(const char*); + void prepareDemoSequence(const StorySequenceExecutorType::DemoSequenceInfo*); + void prepareDemoSequence(const MR::Vector>&); + void prepareDemoSequenceButlerFortressDiscover(const GalaxyMoveArgument*, const DemoFortressDiscoverCheckList&); + bool tryStartDemo(const char*); + bool tryStartSave(); + bool tryWaitSaveEnd(); + bool tryStartFadein(); + bool tryStartMovieAndWaitEnd(u32); const StorySequenceExecutorType::DemoSequenceInfo* getCurrentDemoInfo() const; - bool tryNextDemoInfo(); + bool tryNextDemoInfo(); const StorySequenceExecutorType::DemoSequenceInfo* addDynamicDemoSequenceInfo(u16, u16, const char*); - void setBeforeStageScenario(const GalaxyMoveArgument&, bool); - s32 calcAproposScenarioNoOnAstroGalaxy() const; + void setBeforeStageScenario(const GalaxyMoveArgument&, bool); + s32 calcAproposScenarioNoOnAstroGalaxy() const; - /* 0x08 */ s32 _8; - /* 0x0C */ NameObj* _C; - /* 0x10 */ NameObj* _10; - /* 0x14 */ char _14[48]; - /* 0x44 */ s32 _44; - /* 0x48 */ MR::Vector > _48; - /* 0x6C */ MR::Vector > _6C; - /* 0xB0 */ bool _B0; + /* 0x08 */ s32 _8; + /* 0x0C */ NameObj* _C; + /* 0x10 */ NameObj* _10; + /* 0x14 */ char _14[48]; + /* 0x44 */ s32 _44; + /* 0x48 */ MR::Vector> _48; + /* 0x6C */ MR::Vector> _6C; + /* 0xB0 */ bool _B0; }; diff --git a/include/Game/System/SysConfigFile.hpp b/include/Game/System/SysConfigFile.hpp index 5939d32ad..046a5f208 100644 --- a/include/Game/System/SysConfigFile.hpp +++ b/include/Game/System/SysConfigFile.hpp @@ -11,18 +11,18 @@ class SysConfigChunk : public BinaryDataChunkBase { public: SysConfigChunk(); - virtual u32 makeHeaderHashCode() const; - virtual u32 getSignature() const; - virtual s32 serialize(u8*, u32) const; - virtual s32 deserialize(const u8*, u32); + virtual u32 makeHeaderHashCode() const; + virtual u32 getSignature() const; + virtual s32 serialize(u8*, u32) const; + virtual s32 deserialize(const u8*, u32); virtual void initializeData(); void initHeaderSerializer(); private: - /* 0x08 */ OSTime mTimeAnnounced; - /* 0x10 */ OSTime mTimeSent; - /* 0x18 */ u32 mSentBytes; + /* 0x08 */ OSTime mTimeAnnounced; + /* 0x10 */ OSTime mTimeSent; + /* 0x18 */ u32 mSentBytes; /* 0x1C */ BinaryDataContentHeaderSerializer* mHeaderSerializer; }; @@ -32,15 +32,15 @@ public: SysConfigFile(); OSTime getTimeAnnounced(); - void updateTimeAnnounced(); + void updateTimeAnnounced(); OSTime getTimeSent(); - void setTimeSent(OSTime); - u32 getSentBytes(); - void setSentBytes(u32); - void makeDataBinary(u8*, u32) const; - void loadFromDataBinary(const u8*, u32); + void setTimeSent(OSTime); + u32 getSentBytes(); + void setSentBytes(u32); + void makeDataBinary(u8*, u32) const; + void loadFromDataBinary(const u8*, u32); private: - /* 0x00 */ SysConfigChunk* mChunk; + /* 0x00 */ SysConfigChunk* mChunk; /* 0x04 */ BinaryDataChunkHolder* mChunkHolder; }; diff --git a/include/Game/System/UserFile.hpp b/include/Game/System/UserFile.hpp index 1e9477d59..5bf2e8a3e 100644 --- a/include/Game/System/UserFile.hpp +++ b/include/Game/System/UserFile.hpp @@ -11,36 +11,36 @@ public: /// @brief Creates a new `UserFile`. UserFile(); - bool isCreated() const; - s32 getPowerStarNum() const; - s32 getStarPieceNum() const; - s32 getPlayerMissNum() const; - bool getMiiId(void*) const; - bool getIconId(u32*) const; - bool isLastLoadedMario() const; - bool isOnCompleteEndingMarioAndLuigi() const; - OSTime getLastModified() const; - void setCreated(); - void setMiiOrIconId(const void*, const u32*); - void setLastLoadedMario(bool); - void onCompleteEndingCurrentPlayer(); - void updateLastModified(); - void setUserName(const wchar_t*); + bool isCreated() const; + s32 getPowerStarNum() const; + s32 getStarPieceNum() const; + s32 getPlayerMissNum() const; + bool getMiiId(void*) const; + bool getIconId(u32*) const; + bool isLastLoadedMario() const; + bool isOnCompleteEndingMarioAndLuigi() const; + OSTime getLastModified() const; + void setCreated(); + void setMiiOrIconId(const void*, const u32*); + void setLastLoadedMario(bool); + void onCompleteEndingCurrentPlayer(); + void updateLastModified(); + void setUserName(const wchar_t*); const char* getGameDataName() const; - void makeGameDataBinary(u8*, u32) const; - void loadFromGameDataBinary(const char*, const u8*, u32); + void makeGameDataBinary(u8*, u32) const; + void loadFromGameDataBinary(const char*, const u8*, u32); const char* getConfigDataName() const; - void makeConfigDataBinary(u8*, u32) const; - void loadFromConfigDataBinary(const char*, const u8*, u32); - void resetAllData(); - bool isViewNormalEnding() const; - bool isViewCompleteEnding() const; - bool isPowerStarGetFinalChallengeGalaxy() const; + void makeConfigDataBinary(u8*, u32) const; + void loadFromConfigDataBinary(const char*, const u8*, u32); + void resetAllData(); + bool isViewNormalEnding() const; + bool isViewCompleteEnding() const; + bool isPowerStarGetFinalChallengeGalaxy() const; - /* 0x00 */ GameDataHolder* mGameDataHolder; + /* 0x00 */ GameDataHolder* mGameDataHolder; /* 0x04 */ ConfigDataHolder* mConfigDataHolder; - /* 0x08 */ bool mIsPlayerMario; - /* 0x09 */ bool mIsGameDataCorrupted; - /* 0x0A */ bool mIsConfigDataCorrupted; - /* 0x0C */ wchar_t* mUserName; + /* 0x08 */ bool mIsPlayerMario; + /* 0x09 */ bool mIsGameDataCorrupted; + /* 0x0A */ bool mIsConfigDataCorrupted; + /* 0x0C */ wchar_t* mUserName; }; diff --git a/include/Game/System/WPad.hpp b/include/Game/System/WPad.hpp index 582ca3d90..26fb4a5b8 100644 --- a/include/Game/System/WPad.hpp +++ b/include/Game/System/WPad.hpp @@ -18,44 +18,44 @@ class WPad { public: WPad(s32); - void setReadInfo(WPadReadDataInfo*); - void update(); + void setReadInfo(WPadReadDataInfo*); + void update(); WPadRumble* getRumbleInstance() const; - void startLeaveWatcher(); - void stopLeaveWatcher(); - void restartLeaveWatcher(); - s32 getBattery() const; - void resetPad(); - void connected(); - void disconnected(); + void startLeaveWatcher(); + void stopLeaveWatcher(); + void restartLeaveWatcher(); + s32 getBattery() const; + void resetPad(); + void connected(); + void disconnected(); static void connectCallback(s32, s32); static void extensionCallback(s32, s32); static void getInfoCallback(s32, s32); KPADStatus* getKPadStatus(u32) const; - s32 getValidStatusCount() const; - s32 getEnableAccelPastCount(u32) const; - bool getAcceleration(TVec3f*, u32) const; - bool getPastAcceleration(TVec3f*, s32, u32) const; + s32 getValidStatusCount() const; + s32 getEnableAccelPastCount(u32) const; + bool getAcceleration(TVec3f*, u32) const; + bool getPastAcceleration(TVec3f*, s32, u32) const; - /* 0x00 */ s32 mChannel; + /* 0x00 */ s32 mChannel; /* 0x04 */ WPadReadDataInfo* mReadInfo; - /* 0x08 */ WPadButton* mButton; - /* 0x0C */ WPadPointer* mPointer; + /* 0x08 */ WPadButton* mButton; + /* 0x0C */ WPadPointer* mPointer; /* 0x10 */ WPadAcceleration* mCorePadAccel; - /* 0x14 */ WPadHVSwing* mCorePadSwing; - /* 0x18 */ WPadRumble* _18; - /* 0x1C */ WPadRumble* _1C; - /* 0x20 */ WPadStick* mStick; + /* 0x14 */ WPadHVSwing* mCorePadSwing; + /* 0x18 */ WPadRumble* _18; + /* 0x1C */ WPadRumble* _1C; + /* 0x20 */ WPadStick* mStick; /* 0x24 */ WPadAcceleration* mSubPadAccel; - /* 0x28 */ WPadHVSwing* mSubPadSwing; + /* 0x28 */ WPadHVSwing* mSubPadSwing; /* 0x2C */ WPadLeaveWatcher* mLeaveWatcher; - /* 0x30 */ WPadInfoChecker* mInfoChecker; - /* 0x34 */ bool _34; - /* 0x35 */ bool mIsConnected; - /* 0x36 */ bool mIsSubPadConnected; + /* 0x30 */ WPadInfoChecker* mInfoChecker; + /* 0x34 */ bool _34; + /* 0x35 */ bool mIsConnected; + /* 0x36 */ bool mIsSubPadConnected; }; namespace MR { bool isDeviceFreeStyle(const KPADStatus*); void getPadDataForExceptionNoInit(u32, u32*, u32*); -}; +}; // namespace MR diff --git a/include/Game/System/WPadAcceleration.hpp b/include/Game/System/WPadAcceleration.hpp index a6b5e61cb..d5576e1f7 100644 --- a/include/Game/System/WPadAcceleration.hpp +++ b/include/Game/System/WPadAcceleration.hpp @@ -9,8 +9,8 @@ class WPadAcceleration { public: WPadAcceleration(const WPad*, u32); - bool getAcceleration(TVec3f *) const; - bool getPastAcceleration(TVec3f *, s32) const; + bool getAcceleration(TVec3f*) const; + bool getPastAcceleration(TVec3f*, s32) const; bool isStationary() const; bool isBalanced() const; void update(); diff --git a/include/Game/System/WPadHVSwing.hpp b/include/Game/System/WPadHVSwing.hpp index d1178fb98..c40a0068b 100644 --- a/include/Game/System/WPadHVSwing.hpp +++ b/include/Game/System/WPadHVSwing.hpp @@ -6,23 +6,23 @@ class WPad; class WPadHVSwing { public: - WPadHVSwing(const WPad *, u32); + WPadHVSwing(const WPad*, u32); void updateSwing(); void updateCentrifugal(); void update(); - const WPad *mPad; // 0x0 - u32 _4; - f32 _8; - bool mIsSwing; // 0xC - bool _D; - u32 _10; - u32 _14; - bool mIsTriggerSwing; // 0x18 - f32 _1C; - bool _20; - bool _21; - u32 _24; - u32 _28; + const WPad* mPad; // 0x0 + u32 _4; + f32 _8; + bool mIsSwing; // 0xC + bool _D; + u32 _10; + u32 _14; + bool mIsTriggerSwing; // 0x18 + f32 _1C; + bool _20; + bool _21; + u32 _24; + u32 _28; }; diff --git a/include/Game/System/WPadHolder.hpp b/include/Game/System/WPadHolder.hpp index 67f8d6b3b..da8559f96 100644 --- a/include/Game/System/WPadHolder.hpp +++ b/include/Game/System/WPadHolder.hpp @@ -11,35 +11,35 @@ public: WPadReadDataInfo(); KPADStatus* getKPadStatus(u32) const; - u32 getValidStatusCount() const; + u32 getValidStatusCount() const; /* 0x00 */ KPADStatus* mStatusArray; - /* 0x04 */ u32 mValidStatusCount; + /* 0x04 */ u32 mValidStatusCount; }; class WPadHolder { public: WPadHolder(); - void updateReadDataOnly(); - void updateProjectPadData(); - void updateInGame(); - void update(); - void initSensorBarPosition(); - void resetPad(); - WPad* getWPad(s32); + void updateReadDataOnly(); + void updateProjectPadData(); + void updateInGame(); + void update(); + void initSensorBarPosition(); + void resetPad(); + WPad* getWPad(s32); static void setConnectCallback(); - /* 0x00 */ WPad* mPad[2]; + /* 0x00 */ WPad* mPad[2]; /* 0x08 */ WPadReadDataInfo* mReadDataInfoArray; - /* 0x0C */ u32 mMode; + /* 0x0C */ u32 mMode; }; namespace MR { WPad* getWPad(s32); - void resetWPad(); - void setWPadHolderModeHomeButton(); - void setWPadHolderModeGame(); - void getHBMKPadData(HBMKPadData*, s32); - void setAutoSleepTimeWiiRemote(bool); -}; + void resetWPad(); + void setWPadHolderModeHomeButton(); + void setWPadHolderModeGame(); + void getHBMKPadData(HBMKPadData*, s32); + void setAutoSleepTimeWiiRemote(bool); +}; // namespace MR diff --git a/include/Game/System/WPadInfoChecker.hpp b/include/Game/System/WPadInfoChecker.hpp index a059eb815..9f8b64fc5 100644 --- a/include/Game/System/WPadInfoChecker.hpp +++ b/include/Game/System/WPadInfoChecker.hpp @@ -6,17 +6,17 @@ class WPad; class WPadInfoChecker { public: - WPadInfoChecker(WPad *); + WPadInfoChecker(WPad*); - s32 getBattery() const; + s32 getBattery() const; void successGetInfo(); void startCheck() NO_INLINE; void reset(); void update(); private: - /* 0x00 */ WPad* mPad; + /* 0x00 */ WPad* mPad; /* 0x04 */ WPADInfo mPadInfo; - /* 0x1C */ s32 mCheckInfoFrame; - /* 0x20 */ s32 mBattery; + /* 0x1C */ s32 mCheckInfoFrame; + /* 0x20 */ s32 mBattery; }; diff --git a/include/Game/System/WPadLeaveWatcher.hpp b/include/Game/System/WPadLeaveWatcher.hpp index 456209e05..103e0f725 100644 --- a/include/Game/System/WPadLeaveWatcher.hpp +++ b/include/Game/System/WPadLeaveWatcher.hpp @@ -15,6 +15,6 @@ public: private: /* 0x00 */ WPad* mPad; - /* 0x04 */ s32 mStep; - /* 0x08 */ bool mIsSuspend; + /* 0x04 */ s32 mStep; + /* 0x08 */ bool mIsSuspend; }; diff --git a/include/Game/System/WPadPointer.hpp b/include/Game/System/WPadPointer.hpp index f1b7cec3b..ad9633aab 100644 --- a/include/Game/System/WPadPointer.hpp +++ b/include/Game/System/WPadPointer.hpp @@ -5,34 +5,34 @@ class WPadPointer { public: - WPadPointer(const WPad *); + WPadPointer(const WPad*); void reset(); void setSensorBarLevel(f32); void update(); - void getPointingPos(TVec2f *) const; - void getHorizonVec(TVec2f *) const; - void getPastPointingPos(TVec2f *, s32) const; - u32 getEnablePastCount() const; - void getPointingPosBasedOnScreen(TVec2f *) const; + void getPointingPos(TVec2f*) const; + void getHorizonVec(TVec2f*) const; + void getPastPointingPos(TVec2f*, s32) const; + u32 getEnablePastCount() const; + void getPointingPosBasedOnScreen(TVec2f*) const; - const WPad* mPad; // 0x0 - TVec2f* mPointingPosArray; // 0x4 - TVec2f* mHorizonArray; // 0x8 - s32 _C; - u32 _10; - f32 mPosPlayRadius; // 0x14 - f32 mPosSensitivity; // 0x18 - f32 mHoriPlayRadius; // 0x1C - f32 mHoriSensitivity; // 0x20 - f32 mDistPlayRadius; // 0x24 - f32 mDistSensitivity; // 0x28 - u32 _2C; - f32 mDistDisplay; // 0x30 - u8 _34; - u32 _38; - u32 _3C; - u32 mEnablePastCount; // 0x40 - bool mIsPointInScreen; // 0x44 - u8 _45; + const WPad* mPad; // 0x0 + TVec2f* mPointingPosArray; // 0x4 + TVec2f* mHorizonArray; // 0x8 + s32 _C; + u32 _10; + f32 mPosPlayRadius; // 0x14 + f32 mPosSensitivity; // 0x18 + f32 mHoriPlayRadius; // 0x1C + f32 mHoriSensitivity; // 0x20 + f32 mDistPlayRadius; // 0x24 + f32 mDistSensitivity; // 0x28 + u32 _2C; + f32 mDistDisplay; // 0x30 + u8 _34; + u32 _38; + u32 _3C; + u32 mEnablePastCount; // 0x40 + bool mIsPointInScreen; // 0x44 + u8 _45; }; diff --git a/include/Game/System/WPadRumble.hpp b/include/Game/System/WPadRumble.hpp index 9e7f7c541..4ccd96051 100644 --- a/include/Game/System/WPadRumble.hpp +++ b/include/Game/System/WPadRumble.hpp @@ -12,11 +12,11 @@ public: void setPattern(const void*, const RumblePattern&, u32, bool); /* 0x00 */ const RumblePattern* _0; - /* 0x04 */ bool _4; - /* 0x08 */ u32 _8; - /* 0x0C */ s16 _C; - /* 0x0E */ bool _E; - /* 0x10 */ const void* _10; + /* 0x04 */ bool _4; + /* 0x08 */ u32 _8; + /* 0x0C */ s16 _C; + /* 0x0E */ bool _E; + /* 0x10 */ const void* _10; }; class WPadRumble { @@ -25,24 +25,24 @@ public: virtual ~WPadRumble(); - void registInstance(); - void pause(); - void stop(); - void update(); - void updateRumble(); + void registInstance(); + void pause(); + void stop(); + void update(); + void updateRumble(); WPadRumble* getRumbleInstance() const; - bool vibratePatternIfNotExist(const void*, const char*); - bool setRumblePatternIfNotExist(const void*, const RumblePattern&, bool); - bool findRubmlePattern(const void*, s32*, s32*, s32*, const RumblePattern&); + bool vibratePatternIfNotExist(const void*, const char*); + bool setRumblePatternIfNotExist(const void*, const RumblePattern&, bool); + bool findRubmlePattern(const void*, s32*, s32*, s32*, const RumblePattern&); - /* 0x04 */ WPad* mPad; - /* 0x08 */ bool _8; - /* 0x0C */ u32 _C; + /* 0x04 */ WPad* mPad; + /* 0x08 */ bool _8; + /* 0x0C */ u32 _C; /* 0x10 */ RumbleChannel mChannel[8]; - /* 0xB0 */ s32 _B0; - /* 0xB4 */ s32 _B4; - /* 0xB8 */ bool _B8; - /* 0xBC */ s32 _BC; + /* 0xB0 */ s32 _B0; + /* 0xB4 */ s32 _B4; + /* 0xB8 */ bool _B8; + /* 0xBC */ s32 _BC; private: static WPadRumble** sInstanceForCallback; diff --git a/include/Game/System/WPadRumbleData.hpp b/include/Game/System/WPadRumbleData.hpp index 48af4f06d..a45dd5533 100644 --- a/include/Game/System/WPadRumbleData.hpp +++ b/include/Game/System/WPadRumbleData.hpp @@ -4,15 +4,15 @@ struct RumblePattern { /* 0x00 */ const char* mName; - /* 0x04 */ s32 mFrame; - /* 0x08 */ u8 mPattern[180]; - /* 0xBC */ u32 mHash; + /* 0x04 */ s32 mFrame; + /* 0x08 */ u8 mPattern[180]; + /* 0xBC */ u32 mHash; }; namespace RumbleData { const RumblePattern* getPattern(const char*); - void initHashValue(); - void checkHashCollision(); - u32 getTableSize(); - RumblePattern* getData(u16); -}; + void initHashValue(); + void checkHashCollision(); + u32 getTableSize(); + RumblePattern* getData(u16); +}; // namespace RumbleData diff --git a/include/Game/System/WPadStick.hpp b/include/Game/System/WPadStick.hpp index 8e0f7a990..1e3ef7ae4 100644 --- a/include/Game/System/WPadStick.hpp +++ b/include/Game/System/WPadStick.hpp @@ -7,19 +7,19 @@ class WPad; class WPadStick { public: - WPadStick(const WPad *); + WPadStick(const WPad*); void update(); bool isChanged() const; /* 0x00 */ const WPad* mPad; - /* 0x04 */ TVec2f mStick; - /* 0x0C */ f32 mSpeed; - /* 0x10 */ u32 mHold; - /* 0x14 */ u32 mTrigger; - /* 0x18 */ u32 mRelease; - /* 0x1C */ bool mIsTriggerUp; - /* 0x1D */ bool mIsTriggerDown; - /* 0x1E */ bool mIsHoldUp; - /* 0x1F */ bool mIsHoldDown; + /* 0x04 */ TVec2f mStick; + /* 0x0C */ f32 mSpeed; + /* 0x10 */ u32 mHold; + /* 0x14 */ u32 mTrigger; + /* 0x18 */ u32 mRelease; + /* 0x1C */ bool mIsTriggerUp; + /* 0x1D */ bool mIsTriggerDown; + /* 0x1E */ bool mIsHoldUp; + /* 0x1F */ bool mIsHoldDown; }; diff --git a/include/Game/Util/ActorCameraUtil.hpp b/include/Game/Util/ActorCameraUtil.hpp index 7824a9d8c..a21ef6d05 100644 --- a/include/Game/Util/ActorCameraUtil.hpp +++ b/include/Game/Util/ActorCameraUtil.hpp @@ -9,61 +9,61 @@ class LiveActor; class JMapInfoIter; namespace MR { - void initAnimCamera(const LiveActor *, const ActorCameraInfo *, const char *); + void initAnimCamera(const LiveActor*, const ActorCameraInfo*, const char*); - ActorCameraInfo* createActorCameraInfo(const JMapInfoIter &); - bool createActorCameraInfoIfExist(const JMapInfoIter &, ActorCameraInfo **); + ActorCameraInfo* createActorCameraInfo(const JMapInfoIter&); + bool createActorCameraInfoIfExist(const JMapInfoIter&, ActorCameraInfo**); - bool initActorCamera(const LiveActor *, const JMapInfoIter &, ActorCameraInfo **); - bool initMultiActorCamera(const LiveActor *, const JMapInfoIter &, ActorCameraInfo **, const char *); - bool initMultiActorCameraNoInit(const LiveActor *, ActorCameraInfo *, const char *); + bool initActorCamera(const LiveActor*, const JMapInfoIter&, ActorCameraInfo**); + bool initMultiActorCamera(const LiveActor*, const JMapInfoIter&, ActorCameraInfo**, const char*); + bool initMultiActorCameraNoInit(const LiveActor*, ActorCameraInfo*, const char*); - void initActorCameraProgrammable(const LiveActor *); + void initActorCameraProgrammable(const LiveActor*); - bool startActorCameraNoTarget(const LiveActor *, const ActorCameraInfo *, s32); - bool startActorCameraTargetPlayer(const LiveActor *, const ActorCameraInfo *, s32); - bool startActorCameraTargetSelf(const LiveActor *, const ActorCameraInfo *, s32); - bool startActorCameraTargetOther(const LiveActor *, const ActorCameraInfo *, const CameraTargetArg &, s32); + bool startActorCameraNoTarget(const LiveActor*, const ActorCameraInfo*, s32); + bool startActorCameraTargetPlayer(const LiveActor*, const ActorCameraInfo*, s32); + bool startActorCameraTargetSelf(const LiveActor*, const ActorCameraInfo*, s32); + bool startActorCameraTargetOther(const LiveActor*, const ActorCameraInfo*, const CameraTargetArg&, s32); - bool startMultiActorCameraNoTarget(const LiveActor *, const ActorCameraInfo *, const char *, s32); - bool startMultiActorCameraTargetPlayer(const LiveActor *, const ActorCameraInfo *, const char *, s32); - bool startMultiActorCameraTargetSelf(const LiveActor *, const ActorCameraInfo *, const char *, s32); - bool startMultiActorCameraTargetOther(const LiveActor *, const ActorCameraInfo *, const char *, const CameraTargetArg &, s32); + bool startMultiActorCameraNoTarget(const LiveActor*, const ActorCameraInfo*, const char*, s32); + bool startMultiActorCameraTargetPlayer(const LiveActor*, const ActorCameraInfo*, const char*, s32); + bool startMultiActorCameraTargetSelf(const LiveActor*, const ActorCameraInfo*, const char*, s32); + bool startMultiActorCameraTargetOther(const LiveActor*, const ActorCameraInfo*, const char*, const CameraTargetArg&, s32); - void startAnimCameraTargetPlayer(const LiveActor *, const ActorCameraInfo *, const char *, s32, f32); - void startAnimCameraTargetSelf(const LiveActor *, const ActorCameraInfo *, const char *, s32, f32); - void startAnimCameraTargetOther(const LiveActor *, const ActorCameraInfo *, const char *, const CameraTargetArg &, s32, f32); + void startAnimCameraTargetPlayer(const LiveActor*, const ActorCameraInfo*, const char*, s32, f32); + void startAnimCameraTargetSelf(const LiveActor*, const ActorCameraInfo*, const char*, s32, f32); + void startAnimCameraTargetOther(const LiveActor*, const ActorCameraInfo*, const char*, const CameraTargetArg&, s32, f32); - void startActorCameraProgrammable(const LiveActor *, s32); + void startActorCameraProgrammable(const LiveActor*, s32); - bool endActorCamera(const LiveActor *, const ActorCameraInfo *, bool, s32); - bool endMultiActorCamera(const LiveActor *, const ActorCameraInfo *, const char *, bool, s32); + bool endActorCamera(const LiveActor*, const ActorCameraInfo*, bool, s32); + bool endMultiActorCamera(const LiveActor*, const ActorCameraInfo*, const char*, bool, s32); - bool endActorCameraAtLanding(const LiveActor *, const ActorCameraInfo *, s32); - bool endMultiActorCameraAtLanding(const LiveActor *, const ActorCameraInfo *, const char *, s32); + bool endActorCameraAtLanding(const LiveActor*, const ActorCameraInfo*, s32); + bool endMultiActorCameraAtLanding(const LiveActor*, const ActorCameraInfo*, const char*, s32); - void endActorCameraProgrammable(const LiveActor *, s32, bool); + void endActorCameraProgrammable(const LiveActor*, s32, bool); - bool isActiveActorCamera(const LiveActor *, const ActorCameraInfo *); - bool isActiveMultiActorCamera(const LiveActor *, const ActorCameraInfo *, const char *); + bool isActiveActorCamera(const LiveActor*, const ActorCameraInfo*); + bool isActiveMultiActorCamera(const LiveActor*, const ActorCameraInfo*, const char*); - void setProgrammableCameraParam(const LiveActor *, const TVec3f &, const TVec3f &, const TVec3f &); - void setProgrammableCameraParamFovy(const LiveActor *, f32); + void setProgrammableCameraParam(const LiveActor*, const TVec3f&, const TVec3f&, const TVec3f&); + void setProgrammableCameraParamFovy(const LiveActor*, f32); - void initAnimCamera(const LiveActor *, const ActorCameraInfo *, const char *, const char *); - void endAnimCamera(const LiveActor *, const ActorCameraInfo *, const char *, s32, bool); + void initAnimCamera(const LiveActor*, const ActorCameraInfo*, const char*, const char*); + void endAnimCamera(const LiveActor*, const ActorCameraInfo*, const char*, s32, bool); - s32 getAnimCameraFrame(const LiveActor *, const ActorCameraInfo *, const char *); + s32 getAnimCameraFrame(const LiveActor*, const ActorCameraInfo*, const char*); - bool isAnimCameraEnd(const LiveActor *, const ActorCameraInfo *, const char *); + bool isAnimCameraEnd(const LiveActor*, const ActorCameraInfo*, const char*); - s32 getActorCameraFrames(const LiveActor *, const ActorCameraInfo *); - u32 getMultiActorCameraFrames(const LiveActor *, const ActorCameraInfo *, const char *); + s32 getActorCameraFrames(const LiveActor*, const ActorCameraInfo*); + u32 getMultiActorCameraFrames(const LiveActor*, const ActorCameraInfo*, const char*); - bool isExistActorCamera(const ActorCameraInfo *); + bool isExistActorCamera(const ActorCameraInfo*); - void startRumbleWithShakeCameraWeak(const LiveActor *, const char *, const char *, f32, f32); - void startRumbleWithShakeCameraNormalWeak(const LiveActor *, const char *, const char *, f32, f32); - void startRumbleWithShakeCameraStrong(const LiveActor *, const char *, const char *, f32, f32); + void startRumbleWithShakeCameraWeak(const LiveActor*, const char*, const char*, f32, f32); + void startRumbleWithShakeCameraNormalWeak(const LiveActor*, const char*, const char*, f32, f32); + void startRumbleWithShakeCameraStrong(const LiveActor*, const char*, const char*, f32, f32); -}; +}; // namespace MR diff --git a/include/Game/Util/ActorMovementUtil.hpp b/include/Game/Util/ActorMovementUtil.hpp index 86fd79b0b..66a4dd097 100644 --- a/include/Game/Util/ActorMovementUtil.hpp +++ b/include/Game/Util/ActorMovementUtil.hpp @@ -8,144 +8,144 @@ class HitSensor; class LiveActor; namespace MR { - f32 calcDistance(const HitSensor *, const HitSensor *, TVec3f *); - f32 calcDistance(const LiveActor *, const TVec3f &); - f32 calcDistanceHorizontal(const LiveActor *, const TVec3f &, const TVec3f &); - f32 calcDistanceVertical(const LiveActor *, const TVec3f &, const TVec3f &); - f32 calcDistanceVertical(const LiveActor *, const TVec3f &); - f32 calcDistanceToPlayer(const LiveActor *); - f32 calcDistanceToPlayerH(const LiveActor *); - bool isNear(const HitSensor *, const HitSensor *, f32); - bool isNear(const LiveActor *, const LiveActor *, f32); - bool isNear(const LiveActor *, const TVec3f &, f32); - bool isNearPlayer(const LiveActor *, f32); - bool isNearPlayerAnyTime(const LiveActor *, f32) NO_INLINE; - bool isNearPlayer(const TVec3f &, f32); - bool isNearPlayerPose(const LiveActor *, f32, f32); - bool isNearPlayerHorizontal(const LiveActor *, f32); - void calcFrontVec(TVec3f *, const LiveActor *); - void calcUpVec(TVec3f *, const LiveActor *); - void calcSideVec(TVec3f *, const LiveActor *); - void calcPositionUpOffset(TVec3f *, const LiveActor *, f32); - void calcVecToPlayerH(TVec3f *, const LiveActor *, const TVec3f *); - void calcVecFromPlayerH(TVec3f *, const LiveActor *); - void calcVecToTargetPosH(TVec3f *, const LiveActor *, const TVec3f &, const TVec3f *); - void calcVecFromTargetPosH(TVec3f *, const LiveActor *, const TVec3f &, const TVec3f *); - bool isFaceToTargetDegree(const LiveActor *, const TVec3f &, const TVec3f &, f32); - bool isFaceToPlayerDegree(const LiveActor *, const TVec3f &, f32) NO_INLINE; - bool isFaceToTargetDegree(const LiveActor *, const TVec3f &, f32); - bool isFaceToPlayerDegree(const LiveActor *, f32); - bool isFaceToPlayerDegreeHV(const LiveActor *, const TVec3f&, f32, f32) NO_INLINE; - bool isFaceToTargetHorizontalDegree(const LiveActor *, const TVec3f &, const TVec3f &, f32); - bool isFaceToPlayerHorizontalDegree(const LiveActor *, const TVec3f &, f32); - bool isClockwiseToDir(const LiveActor *, const TVec3f &, const TVec3f &); - bool isClockwiseToPlayer(const LiveActor *, const TVec3f &); - bool isPlayerLeftSide(const LiveActor *); - bool isLeftSideFromPlayer(const LiveActor *); - bool isInSightConePlayer(const LiveActor *, const TVec3f &, f32, f32); - bool isInSightFanPlayer(const LiveActor *, const TVec3f &, f32, f32, f32); - bool isBindedWallFront(const LiveActor *, const TVec3f &, f32); - bool isOnPlayer(const LiveActor *); - bool isPlayerExistSide(const LiveActor *, f32, f32); - bool isPlayerExistUp(const LiveActor *, f32, f32); - bool isPlayerExistDown(const LiveActor *, f32, f32); - bool isInWater(const LiveActor *, const TVec3f &); - bool isInDeath(const LiveActor *, const TVec3f &); - void makeMtxTR(MtxPtr, const LiveActor *); - void makeMtxTRS(MtxPtr, const LiveActor *); - void makeMtxTransRotateY(MtxPtr, const LiveActor *); - void calcMtxFromGravityAndZAxis(TPos3f *, const LiveActor *, const TVec3f &, const TVec3f &); - void calcAndSetBaseMtxFromGravityAndZAxis(LiveActor *, const TVec3f &); - void calcActorAxis(TVec3f *, TVec3f *, TVec3f *, const LiveActor *); - void calcActorAxisX(TVec3f *, const LiveActor *); - void calcActorAxisY(TVec3f *, const LiveActor *); - void calcActorAxisZ(TVec3f *, const LiveActor *); - bool faceToVector(TQuat4f *, TVec3f, f32); - bool faceToVector(float(*)[4], TVec3f, f32); - bool faceToPoint(float(*)[4], TVec3f, f32); - void makeQuatFromRotate(TQuat4f * , const LiveActor *); - void makeQuatAndFrontFromRotate(TQuat4f *, TVec3f *, const LiveActor *); - void turnQuatUpToGravity(TQuat4f *, const TQuat4f &, const LiveActor *); - void blendQuatFromGroundAndFront(TQuat4f *, const LiveActor *, const TVec3f &, f32, f32); - void resetPosition(LiveActor *); - void resetPosition(LiveActor *, const TVec3f &); - void resetPosition(LiveActor *, const char *); - bool makeMtxOnMapCollision(TPos3f *, LiveActor *, f32); - void calcVelocityMoveToDirectionHorizon(TVec3f *, const LiveActor *, const TVec3f &, f32) NO_INLINE; - void calcVelocityMoveToDirectionHorizon(TVec3f *, const LiveActor *, const TVec3f &, f32, f32, f32, f32) NO_INLINE; - void calcVelocityMoveToDirection(TVec3f *, const LiveActor *, const TVec3f &, f32); - void calcVelocityMoveToDirection(TVec3f *, const LiveActor *, const TVec3f &, f32, f32, f32, f32) NO_INLINE; - void calcVelocityMoveToTarget(TVec3f *, const LiveActor *, const TVec3f &, f32); - void addVelocityMoveToDirection(LiveActor *, const TVec3f &, f32); - void addVelocityMoveToTarget(LiveActor *, const TVec3f &, f32); - void addVelocityMoveToTarget(LiveActor *, const TVec3f &, f32, f32, f32, f32); - void addVelocityAwayFromTarget(LiveActor *, const TVec3f &, f32); - void addVelocityAwayFromTarget(LiveActor *, const TVec3f &, f32, f32, f32, f32); - void addVelocityClockwiseToDirection(LiveActor *, const TVec3f &, f32); - void addVelocityClockwiseToTarget(LiveActor *, const TVec3f &, f32); - void addVelocityClockwiseToPlayer(LiveActor *, f32); - void addVelocityJump(LiveActor *, f32) NO_INLINE; - bool addVelocityLimit(LiveActor *, const TVec3f &); - void setVelocityJump(LiveActor *, f32); - void addVelocityToGravity(LiveActor *, f32) NO_INLINE; - void addVelocityToGraviyOrGround(LiveActor *, f32); - bool addVelocityToCollisionNormal(LiveActor *, f32); - void addVelocityKeepHeight(LiveActor *, const TVec3f &, f32, f32); - void addVelocityKeepHeight(LiveActor *, const TVec3f &, f32, f32, f32); - bool addVelocityKeepHeightUseShadow(LiveActor *, f32, f32, f32, const char *); - bool addVelocityKeepHeightUseShadow(LiveActor *, f32, f32, f32, f32, const char *); - void addVelocitySeparateHV(LiveActor *, const TVec3f &, f32, f32); - void setVelocitySeparateHV(LiveActor *, const TVec3f &, f32, f32); - void attenuateVelocity(LiveActor *, f32); - void attenuateVelocityExceptDirection(LiveActor *, const TVec3f &, f32); - void restrictVelocity(LiveActor *, f32); - void killVelocityOnGroundH(LiveActor *); - void killVelocityOnGroundCosH(LiveActor *, f32); - void killVelocityToTarget(LiveActor *, const TVec3f &); - void forceBindOnGround(LiveActor *, f32, f32); - bool reboundVelocityFromEachCollision(LiveActor *, f32, f32, f32, f32); - bool reboundVelocityFromCollision(LiveActor *, f32, f32, f32); - void zeroVelocity(LiveActor *); - void setVelocity(LiveActor *, const TVec3f &); - void addVelocity(LiveActor *, const TVec3f &); - void scaleVelocity(LiveActor *, f32); - f32 calcVelocityLength(const LiveActor *); - f32 calcGravitySpeed(const LiveActor *); - void applyVelocityDampAndGravity(LiveActor *, f32, f32, f32, f32, f32); - void setVelocityJumpAwayFromPlayer(LiveActor *, f32 , f32); - bool sendMsgPushAndKillVelocityToTarget(LiveActor *, HitSensor *, HitSensor *); - void addVelocityFromPush(LiveActor *, f32, HitSensor *, HitSensor *); - void addVelocityFromPushHorizon(LiveActor *, f32, HitSensor *, HitSensor *); - void addVelocitySeparateHV(LiveActor *, HitSensor *, HitSensor *, f32, f32); - void setVelocitySeparateHV(LiveActor *, HitSensor *, HitSensor *, f32, f32) NO_INLINE; - void setVelocityBlowAttack(LiveActor *, HitSensor *, HitSensor *, f32, f32, s32); - bool reflectVelocityH(LiveActor *, HitSensor *, HitSensor *, f32); - bool calcVelocityAreaMoveOnGround(TVec3f *, const LiveActor *); - bool calcVelocityRailMoveOnGround(TVec3f *, const LiveActor *); - bool calcVelocityAreaOrRailMoveOnGround(TVec3f *, const LiveActor *); - void rotateDirectionGravityDegree(const LiveActor *, TVec3f *, f32); - void turnDirection(const LiveActor *, TVec3f *, const TVec3f &, f32); - void turnDirectionDegree(const LiveActor *, TVec3f *, const TVec3f &, f32); - void turnDirectionToTarget(const LiveActor *, TVec3f *, const TVec3f &, f32); - void turnDirectionToTargetDegree(const LiveActor *, TVec3f *, const TVec3f &, f32) NO_INLINE; - void turnDirectionToTargetDegreeHorizon(const LiveActor *, TVec3f *, const TVec3f &, f32) NO_INLINE; - void turnDirectionToTargetUseGroundNormalDegree(const LiveActor *, TVec3f *, const TVec3f &, f32); - void turnDirectionToPlayerDegree(const LiveActor *, TVec3f *, f32); - void turnDirectionToPlayerDegreeHorizon(const LiveActor *, TVec3f *, f32); - void turnDirectionFromTargetDegree(const LiveActor *, TVec3f *, const TVec3f &, f32) NO_INLINE; - void turnDirectionFromTargetDegreeHorizon(const LiveActor *, TVec3f *, const TVec3f &, f32) NO_INLINE; - void turnDirectionFromPlayerDegree(const LiveActor *, TVec3f *, f32); - void turnDirectionFromPlayerDegreeHorizon(const LiveActor *, TVec3f *, f32); - f32 turnDirectionAndGravityH(TQuat4f *, const LiveActor *, const TVec3f &, f32, f32); - f32 turnDirectionAndGravityH(LiveActor *, const TVec3f &, f32, f32); - void turnDirectionToGround(const LiveActor *, TVec3f *); - void moveAndTurnToDirection(LiveActor *, TVec3f *, const TVec3f &, f32, f32, f32, f32); - void moveAndTurnToTarget(LiveActor *, TVec3f *, const TVec3f &, f32, f32, f32, f32); - void moveAndTurnToPlayer(LiveActor *, TVec3f *, f32, f32, f32, f32); - void flyAndTurnAlongRailSearchingPlayer(LiveActor *, TVec3f *, f32, f32, f32, f32, f32, bool); - void escapeFromPlayer(LiveActor *, TVec3f *, f32, f32, f32, f32); - void moveAndTurnToDirection(LiveActor *, const TVec3f &, f32, f32, f32, f32) NO_INLINE; - void moveAndTurnToTarget(LiveActor *, const TVec3f &, f32, f32, f32, f32) NO_INLINE; - void moveAndTurnToPlayer(LiveActor *, f32, f32, f32, f32); - void moveAndTurnAlongRail(LiveActor *, f32, f32, f32, f32, f32, bool *); -}; + f32 calcDistance(const HitSensor*, const HitSensor*, TVec3f*); + f32 calcDistance(const LiveActor*, const TVec3f&); + f32 calcDistanceHorizontal(const LiveActor*, const TVec3f&, const TVec3f&); + f32 calcDistanceVertical(const LiveActor*, const TVec3f&, const TVec3f&); + f32 calcDistanceVertical(const LiveActor*, const TVec3f&); + f32 calcDistanceToPlayer(const LiveActor*); + f32 calcDistanceToPlayerH(const LiveActor*); + bool isNear(const HitSensor*, const HitSensor*, f32); + bool isNear(const LiveActor*, const LiveActor*, f32); + bool isNear(const LiveActor*, const TVec3f&, f32); + bool isNearPlayer(const LiveActor*, f32); + bool isNearPlayerAnyTime(const LiveActor*, f32) NO_INLINE; + bool isNearPlayer(const TVec3f&, f32); + bool isNearPlayerPose(const LiveActor*, f32, f32); + bool isNearPlayerHorizontal(const LiveActor*, f32); + void calcFrontVec(TVec3f*, const LiveActor*); + void calcUpVec(TVec3f*, const LiveActor*); + void calcSideVec(TVec3f*, const LiveActor*); + void calcPositionUpOffset(TVec3f*, const LiveActor*, f32); + void calcVecToPlayerH(TVec3f*, const LiveActor*, const TVec3f*); + void calcVecFromPlayerH(TVec3f*, const LiveActor*); + void calcVecToTargetPosH(TVec3f*, const LiveActor*, const TVec3f&, const TVec3f*); + void calcVecFromTargetPosH(TVec3f*, const LiveActor*, const TVec3f&, const TVec3f*); + bool isFaceToTargetDegree(const LiveActor*, const TVec3f&, const TVec3f&, f32); + bool isFaceToPlayerDegree(const LiveActor*, const TVec3f&, f32) NO_INLINE; + bool isFaceToTargetDegree(const LiveActor*, const TVec3f&, f32); + bool isFaceToPlayerDegree(const LiveActor*, f32); + bool isFaceToPlayerDegreeHV(const LiveActor*, const TVec3f&, f32, f32) NO_INLINE; + bool isFaceToTargetHorizontalDegree(const LiveActor*, const TVec3f&, const TVec3f&, f32); + bool isFaceToPlayerHorizontalDegree(const LiveActor*, const TVec3f&, f32); + bool isClockwiseToDir(const LiveActor*, const TVec3f&, const TVec3f&); + bool isClockwiseToPlayer(const LiveActor*, const TVec3f&); + bool isPlayerLeftSide(const LiveActor*); + bool isLeftSideFromPlayer(const LiveActor*); + bool isInSightConePlayer(const LiveActor*, const TVec3f&, f32, f32); + bool isInSightFanPlayer(const LiveActor*, const TVec3f&, f32, f32, f32); + bool isBindedWallFront(const LiveActor*, const TVec3f&, f32); + bool isOnPlayer(const LiveActor*); + bool isPlayerExistSide(const LiveActor*, f32, f32); + bool isPlayerExistUp(const LiveActor*, f32, f32); + bool isPlayerExistDown(const LiveActor*, f32, f32); + bool isInWater(const LiveActor*, const TVec3f&); + bool isInDeath(const LiveActor*, const TVec3f&); + void makeMtxTR(MtxPtr, const LiveActor*); + void makeMtxTRS(MtxPtr, const LiveActor*); + void makeMtxTransRotateY(MtxPtr, const LiveActor*); + void calcMtxFromGravityAndZAxis(TPos3f*, const LiveActor*, const TVec3f&, const TVec3f&); + void calcAndSetBaseMtxFromGravityAndZAxis(LiveActor*, const TVec3f&); + void calcActorAxis(TVec3f*, TVec3f*, TVec3f*, const LiveActor*); + void calcActorAxisX(TVec3f*, const LiveActor*); + void calcActorAxisY(TVec3f*, const LiveActor*); + void calcActorAxisZ(TVec3f*, const LiveActor*); + bool faceToVector(TQuat4f*, TVec3f, f32); + bool faceToVector(float (*)[4], TVec3f, f32); + bool faceToPoint(float (*)[4], TVec3f, f32); + void makeQuatFromRotate(TQuat4f*, const LiveActor*); + void makeQuatAndFrontFromRotate(TQuat4f*, TVec3f*, const LiveActor*); + void turnQuatUpToGravity(TQuat4f*, const TQuat4f&, const LiveActor*); + void blendQuatFromGroundAndFront(TQuat4f*, const LiveActor*, const TVec3f&, f32, f32); + void resetPosition(LiveActor*); + void resetPosition(LiveActor*, const TVec3f&); + void resetPosition(LiveActor*, const char*); + bool makeMtxOnMapCollision(TPos3f*, LiveActor*, f32); + void calcVelocityMoveToDirectionHorizon(TVec3f*, const LiveActor*, const TVec3f&, f32) NO_INLINE; + void calcVelocityMoveToDirectionHorizon(TVec3f*, const LiveActor*, const TVec3f&, f32, f32, f32, f32) NO_INLINE; + void calcVelocityMoveToDirection(TVec3f*, const LiveActor*, const TVec3f&, f32); + void calcVelocityMoveToDirection(TVec3f*, const LiveActor*, const TVec3f&, f32, f32, f32, f32) NO_INLINE; + void calcVelocityMoveToTarget(TVec3f*, const LiveActor*, const TVec3f&, f32); + void addVelocityMoveToDirection(LiveActor*, const TVec3f&, f32); + void addVelocityMoveToTarget(LiveActor*, const TVec3f&, f32); + void addVelocityMoveToTarget(LiveActor*, const TVec3f&, f32, f32, f32, f32); + void addVelocityAwayFromTarget(LiveActor*, const TVec3f&, f32); + void addVelocityAwayFromTarget(LiveActor*, const TVec3f&, f32, f32, f32, f32); + void addVelocityClockwiseToDirection(LiveActor*, const TVec3f&, f32); + void addVelocityClockwiseToTarget(LiveActor*, const TVec3f&, f32); + void addVelocityClockwiseToPlayer(LiveActor*, f32); + void addVelocityJump(LiveActor*, f32) NO_INLINE; + bool addVelocityLimit(LiveActor*, const TVec3f&); + void setVelocityJump(LiveActor*, f32); + void addVelocityToGravity(LiveActor*, f32) NO_INLINE; + void addVelocityToGraviyOrGround(LiveActor*, f32); + bool addVelocityToCollisionNormal(LiveActor*, f32); + void addVelocityKeepHeight(LiveActor*, const TVec3f&, f32, f32); + void addVelocityKeepHeight(LiveActor*, const TVec3f&, f32, f32, f32); + bool addVelocityKeepHeightUseShadow(LiveActor*, f32, f32, f32, const char*); + bool addVelocityKeepHeightUseShadow(LiveActor*, f32, f32, f32, f32, const char*); + void addVelocitySeparateHV(LiveActor*, const TVec3f&, f32, f32); + void setVelocitySeparateHV(LiveActor*, const TVec3f&, f32, f32); + void attenuateVelocity(LiveActor*, f32); + void attenuateVelocityExceptDirection(LiveActor*, const TVec3f&, f32); + void restrictVelocity(LiveActor*, f32); + void killVelocityOnGroundH(LiveActor*); + void killVelocityOnGroundCosH(LiveActor*, f32); + void killVelocityToTarget(LiveActor*, const TVec3f&); + void forceBindOnGround(LiveActor*, f32, f32); + bool reboundVelocityFromEachCollision(LiveActor*, f32, f32, f32, f32); + bool reboundVelocityFromCollision(LiveActor*, f32, f32, f32); + void zeroVelocity(LiveActor*); + void setVelocity(LiveActor*, const TVec3f&); + void addVelocity(LiveActor*, const TVec3f&); + void scaleVelocity(LiveActor*, f32); + f32 calcVelocityLength(const LiveActor*); + f32 calcGravitySpeed(const LiveActor*); + void applyVelocityDampAndGravity(LiveActor*, f32, f32, f32, f32, f32); + void setVelocityJumpAwayFromPlayer(LiveActor*, f32, f32); + bool sendMsgPushAndKillVelocityToTarget(LiveActor*, HitSensor*, HitSensor*); + void addVelocityFromPush(LiveActor*, f32, HitSensor*, HitSensor*); + void addVelocityFromPushHorizon(LiveActor*, f32, HitSensor*, HitSensor*); + void addVelocitySeparateHV(LiveActor*, HitSensor*, HitSensor*, f32, f32); + void setVelocitySeparateHV(LiveActor*, HitSensor*, HitSensor*, f32, f32) NO_INLINE; + void setVelocityBlowAttack(LiveActor*, HitSensor*, HitSensor*, f32, f32, s32); + bool reflectVelocityH(LiveActor*, HitSensor*, HitSensor*, f32); + bool calcVelocityAreaMoveOnGround(TVec3f*, const LiveActor*); + bool calcVelocityRailMoveOnGround(TVec3f*, const LiveActor*); + bool calcVelocityAreaOrRailMoveOnGround(TVec3f*, const LiveActor*); + void rotateDirectionGravityDegree(const LiveActor*, TVec3f*, f32); + void turnDirection(const LiveActor*, TVec3f*, const TVec3f&, f32); + void turnDirectionDegree(const LiveActor*, TVec3f*, const TVec3f&, f32); + void turnDirectionToTarget(const LiveActor*, TVec3f*, const TVec3f&, f32); + void turnDirectionToTargetDegree(const LiveActor*, TVec3f*, const TVec3f&, f32) NO_INLINE; + void turnDirectionToTargetDegreeHorizon(const LiveActor*, TVec3f*, const TVec3f&, f32) NO_INLINE; + void turnDirectionToTargetUseGroundNormalDegree(const LiveActor*, TVec3f*, const TVec3f&, f32); + void turnDirectionToPlayerDegree(const LiveActor*, TVec3f*, f32); + void turnDirectionToPlayerDegreeHorizon(const LiveActor*, TVec3f*, f32); + void turnDirectionFromTargetDegree(const LiveActor*, TVec3f*, const TVec3f&, f32) NO_INLINE; + void turnDirectionFromTargetDegreeHorizon(const LiveActor*, TVec3f*, const TVec3f&, f32) NO_INLINE; + void turnDirectionFromPlayerDegree(const LiveActor*, TVec3f*, f32); + void turnDirectionFromPlayerDegreeHorizon(const LiveActor*, TVec3f*, f32); + f32 turnDirectionAndGravityH(TQuat4f*, const LiveActor*, const TVec3f&, f32, f32); + f32 turnDirectionAndGravityH(LiveActor*, const TVec3f&, f32, f32); + void turnDirectionToGround(const LiveActor*, TVec3f*); + void moveAndTurnToDirection(LiveActor*, TVec3f*, const TVec3f&, f32, f32, f32, f32); + void moveAndTurnToTarget(LiveActor*, TVec3f*, const TVec3f&, f32, f32, f32, f32); + void moveAndTurnToPlayer(LiveActor*, TVec3f*, f32, f32, f32, f32); + void flyAndTurnAlongRailSearchingPlayer(LiveActor*, TVec3f*, f32, f32, f32, f32, f32, bool); + void escapeFromPlayer(LiveActor*, TVec3f*, f32, f32, f32, f32); + void moveAndTurnToDirection(LiveActor*, const TVec3f&, f32, f32, f32, f32) NO_INLINE; + void moveAndTurnToTarget(LiveActor*, const TVec3f&, f32, f32, f32, f32) NO_INLINE; + void moveAndTurnToPlayer(LiveActor*, f32, f32, f32, f32); + void moveAndTurnAlongRail(LiveActor*, f32, f32, f32, f32, f32, bool*); +}; // namespace MR diff --git a/include/Game/Util/ActorSensorUtil.hpp b/include/Game/Util/ActorSensorUtil.hpp index b34e2aece..f03945f19 100644 --- a/include/Game/Util/ActorSensorUtil.hpp +++ b/include/Game/Util/ActorSensorUtil.hpp @@ -391,209 +391,209 @@ enum { }; namespace MR { - HitSensor* addHitSensor(LiveActor* pActor, const char* pName, u32 type, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorBinder(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorTransferableBinder(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorPriorBinder(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorRide(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorMapObj(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorMapObjPress(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorMapObjSimple(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorMapObjMoveCollision(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorEnemy(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorEnemySimple(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorEnemyAttack(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorNpc(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorEye(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorPush(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorPosBinder(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f* pPos, const TVec3f& rOffset); - HitSensor* addHitSensorPosRide(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f* pPos, const TVec3f& rOffset); - HitSensor* addHitSensorPosMapObj(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f* pPos, const TVec3f& rOffset); - HitSensor* addHitSensorPosEye(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f* pPos, const TVec3f& rOffset); - HitSensor* addHitSensorMtx(LiveActor* pActor, const char* pName, u32 type, u16 groupSize, f32 radius, MtxPtr pMtx, const TVec3f& rOffset); - HitSensor* addHitSensorMtxRide(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, MtxPtr pMtx, const TVec3f& rOffset); - HitSensor* addHitSensorMtxMapObj(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, MtxPtr pMtx, const TVec3f& rOffset); - HitSensor* addHitSensorMtxEnemy(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, MtxPtr pMtx, const TVec3f& rOffset); - HitSensor* addHitSensorMtxEnemyAttack(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, MtxPtr pMtx, const TVec3f& rOffset); - HitSensor* addHitSensorMtxNpc(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, MtxPtr pMtx, const TVec3f& rOffset); - HitSensor* addHitSensorMtxAnimal(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, MtxPtr pMtx, const TVec3f& rOffset); - HitSensor* addHitSensorAtJoint(LiveActor* pActor, const char* pName, const char* pJointName, u32 type, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorAtJointRide(LiveActor* pActor, const char* pName, const char* pJointName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorAtJointMapObj(LiveActor* pActor, const char* pName, const char* pJointName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorAtJointMapObjSimple(LiveActor* pActor, const char* pName, const char* pJointName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorAtJointEnemy(LiveActor* pActor, const char* pName, const char* pJointName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorAtJointEnemySimple(LiveActor* pActor, const char* pName, const char* pJointName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorAtJointEnemyAttack(LiveActor* pActor, const char* pName, const char* pJointName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorAtJointNpc(LiveActor* pActor, const char* pName, const char* pJointName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorAtJointEye(LiveActor* pActor, const char* pName, const char* pJointName, u16 groupSize, f32 radius, const TVec3f& rOffset); - HitSensor* addHitSensorCallback(LiveActor* pActor, const char* pName, u32 type, u16 groupSize, f32 radius); - HitSensor* addHitSensorCallbackBinder(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius); - HitSensor* addHitSensorCallbackPriorBinder(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius); - HitSensor* addHitSensorCallbackRide(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius); - HitSensor* addHitSensorCallbackMapObj(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius); - HitSensor* addHitSensorCallbackMapObjSimple(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius); - HitSensor* addHitSensorCallbackEnemy(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius); - HitSensor* addHitSensorCallbackEnemyAttack(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius); - HitSensor* addHitSensorCallbackEye(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius); - HitSensor* addBodyMessageSensorReceiver(LiveActor* pActor); - HitSensor* addBodyMessageSensorMapObj(LiveActor* pActor); - HitSensor* addBodyMessageSensorMapObjPress(LiveActor* pActor); - HitSensor* addBodyMessageSensorMapObjMoveCollision(LiveActor* pActor); - HitSensor* addBodyMessageSensorEnemy(LiveActor* pActor); - HitSensor* addMessageSensorReceiver(LiveActor* pActor, const char* pName); - HitSensor* addMessageSensorMapObj(LiveActor* pActor, const char* pName); - HitSensor* addMessageSensorMapObjMoveCollision(LiveActor* pActor, const char* pName); - HitSensor* addMessageSensorEnemy(LiveActor* pActor, const char* pName); - bool tryUpdateHitSensorsAll(LiveActor* pActor); - void updateHitSensorsAll(LiveActor* pActor); - bool isSensorType(const HitSensor* pSensor, u32 type); - HitSensor* getSensorWithIndex(LiveActor* pActor, int index); - HitSensor* getTaking(const LiveActor* pActor); - HitSensor* getTaken(const LiveActor* pActor); - void setSensorPos(HitSensor* pSensor, const TVec3f& rPos); - void setSensorOffset(LiveActor* pActor, const char* pName, const TVec3f& rOffset); - void setSensorRadius(LiveActor* pActor, const char* pName, f32 radius); - void setHitSensorApart(HitSensor* pSender, HitSensor* pReceiver); - void validateHitSensors(LiveActor* pActor); - void invalidateHitSensors(LiveActor* pActor); - void validateHitSensor(LiveActor* pActor, const char* pName); - void invalidateHitSensor(LiveActor* pActor, const char* pName); - bool isValidHitSensor(LiveActor* pActor, const char* pName); - void clearHitSensors(LiveActor* pActor); - HitSensor* getSensor(LiveActor* pActor, int index); - LiveActor* getSensorHost(const HitSensor* pSensor); - bool isSensor(const HitSensor* pSensor, const char* pName); - bool isSensorPlayer(const HitSensor* pSensor); - bool isSensorBinder(const HitSensor* pSensor); - bool isSensorRide(const HitSensor* pSensor); - bool isSensorPlayerOrRide(const HitSensor* pSensor); - bool isSensorEnemy(const HitSensor* pSensor); - bool isSensorEnemyAttack(const HitSensor* pSensor); - bool isSensorNpc(const HitSensor* pSensor); - bool isSensorMapObj(const HitSensor* pSensor); - bool isSensorAutoRush(const HitSensor* pSensor); - bool isSensorRush(const HitSensor* pSensor); - bool isSensorPressObj(const HitSensor* pSensor); - bool isSensorEye(const HitSensor* pSensor); - bool isSensorPush(const HitSensor* pSensor); - bool isSensorItem(const HitSensor* pSensor); - bool tryGetItem(HitSensor* pSender, HitSensor* pReceiver); + HitSensor* addHitSensor(LiveActor* pActor, const char* pName, u32 type, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorBinder(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorTransferableBinder(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorPriorBinder(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorRide(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorMapObj(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorMapObjPress(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorMapObjSimple(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorMapObjMoveCollision(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorEnemy(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorEnemySimple(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorEnemyAttack(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorNpc(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorEye(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorPush(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorPosBinder(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f* pPos, const TVec3f& rOffset); + HitSensor* addHitSensorPosRide(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f* pPos, const TVec3f& rOffset); + HitSensor* addHitSensorPosMapObj(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f* pPos, const TVec3f& rOffset); + HitSensor* addHitSensorPosEye(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, const TVec3f* pPos, const TVec3f& rOffset); + HitSensor* addHitSensorMtx(LiveActor* pActor, const char* pName, u32 type, u16 groupSize, f32 radius, MtxPtr pMtx, const TVec3f& rOffset); + HitSensor* addHitSensorMtxRide(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, MtxPtr pMtx, const TVec3f& rOffset); + HitSensor* addHitSensorMtxMapObj(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, MtxPtr pMtx, const TVec3f& rOffset); + HitSensor* addHitSensorMtxEnemy(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, MtxPtr pMtx, const TVec3f& rOffset); + HitSensor* addHitSensorMtxEnemyAttack(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, MtxPtr pMtx, const TVec3f& rOffset); + HitSensor* addHitSensorMtxNpc(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, MtxPtr pMtx, const TVec3f& rOffset); + HitSensor* addHitSensorMtxAnimal(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius, MtxPtr pMtx, const TVec3f& rOffset); + HitSensor* addHitSensorAtJoint(LiveActor* pActor, const char* pName, const char* pJointName, u32 type, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorAtJointRide(LiveActor* pActor, const char* pName, const char* pJointName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorAtJointMapObj(LiveActor* pActor, const char* pName, const char* pJointName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorAtJointMapObjSimple(LiveActor* pActor, const char* pName, const char* pJointName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorAtJointEnemy(LiveActor* pActor, const char* pName, const char* pJointName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorAtJointEnemySimple(LiveActor* pActor, const char* pName, const char* pJointName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorAtJointEnemyAttack(LiveActor* pActor, const char* pName, const char* pJointName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorAtJointNpc(LiveActor* pActor, const char* pName, const char* pJointName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorAtJointEye(LiveActor* pActor, const char* pName, const char* pJointName, u16 groupSize, f32 radius, const TVec3f& rOffset); + HitSensor* addHitSensorCallback(LiveActor* pActor, const char* pName, u32 type, u16 groupSize, f32 radius); + HitSensor* addHitSensorCallbackBinder(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius); + HitSensor* addHitSensorCallbackPriorBinder(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius); + HitSensor* addHitSensorCallbackRide(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius); + HitSensor* addHitSensorCallbackMapObj(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius); + HitSensor* addHitSensorCallbackMapObjSimple(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius); + HitSensor* addHitSensorCallbackEnemy(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius); + HitSensor* addHitSensorCallbackEnemyAttack(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius); + HitSensor* addHitSensorCallbackEye(LiveActor* pActor, const char* pName, u16 groupSize, f32 radius); + HitSensor* addBodyMessageSensorReceiver(LiveActor* pActor); + HitSensor* addBodyMessageSensorMapObj(LiveActor* pActor); + HitSensor* addBodyMessageSensorMapObjPress(LiveActor* pActor); + HitSensor* addBodyMessageSensorMapObjMoveCollision(LiveActor* pActor); + HitSensor* addBodyMessageSensorEnemy(LiveActor* pActor); + HitSensor* addMessageSensorReceiver(LiveActor* pActor, const char* pName); + HitSensor* addMessageSensorMapObj(LiveActor* pActor, const char* pName); + HitSensor* addMessageSensorMapObjMoveCollision(LiveActor* pActor, const char* pName); + HitSensor* addMessageSensorEnemy(LiveActor* pActor, const char* pName); + bool tryUpdateHitSensorsAll(LiveActor* pActor); + void updateHitSensorsAll(LiveActor* pActor); + bool isSensorType(const HitSensor* pSensor, u32 type); + HitSensor* getSensorWithIndex(LiveActor* pActor, int index); + HitSensor* getTaking(const LiveActor* pActor); + HitSensor* getTaken(const LiveActor* pActor); + void setSensorPos(HitSensor* pSensor, const TVec3f& rPos); + void setSensorOffset(LiveActor* pActor, const char* pName, const TVec3f& rOffset); + void setSensorRadius(LiveActor* pActor, const char* pName, f32 radius); + void setHitSensorApart(HitSensor* pSender, HitSensor* pReceiver); + void validateHitSensors(LiveActor* pActor); + void invalidateHitSensors(LiveActor* pActor); + void validateHitSensor(LiveActor* pActor, const char* pName); + void invalidateHitSensor(LiveActor* pActor, const char* pName); + bool isValidHitSensor(LiveActor* pActor, const char* pName); + void clearHitSensors(LiveActor* pActor); + HitSensor* getSensor(LiveActor* pActor, int index); + LiveActor* getSensorHost(const HitSensor* pSensor); + bool isSensor(const HitSensor* pSensor, const char* pName); + bool isSensorPlayer(const HitSensor* pSensor); + bool isSensorBinder(const HitSensor* pSensor); + bool isSensorRide(const HitSensor* pSensor); + bool isSensorPlayerOrRide(const HitSensor* pSensor); + bool isSensorEnemy(const HitSensor* pSensor); + bool isSensorEnemyAttack(const HitSensor* pSensor); + bool isSensorNpc(const HitSensor* pSensor); + bool isSensorMapObj(const HitSensor* pSensor); + bool isSensorAutoRush(const HitSensor* pSensor); + bool isSensorRush(const HitSensor* pSensor); + bool isSensorPressObj(const HitSensor* pSensor); + bool isSensorEye(const HitSensor* pSensor); + bool isSensorPush(const HitSensor* pSensor); + bool isSensorItem(const HitSensor* pSensor); + bool tryGetItem(HitSensor* pSender, HitSensor* pReceiver); const TVec3f& getSensorPos(const HitSensor* pSensor); - void calcSensorDirection(TVec3f* pDir, const HitSensor* pSensor1, const HitSensor* pSensor2); - void calcSensorDirectionNormalize(TVec3f* pDir, const HitSensor* pSensor1, const HitSensor* pSensor2); - void calcSensorHorizonNormalize(TVec3f* pHorizon, const TVec3f& rGravity, const HitSensor* pSensor1, const HitSensor* pSensor2); - HitSensor* getMessageSensor(); - bool sendArbitraryMsg(u32 msg, HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgPush(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgPlayerTrample(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgPlayerPunch(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgJump(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgTouchJump(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgTaken(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgKick(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgAwayJump(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgEnemyAttackMsgToDir(u32 msg, HitSensor* pReceiver, HitSensor* pSender, const TVec3f& rDir); - bool sendMsgEnemyAttackFlipWeak(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgEnemyAttackFlipWeakJump(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgEnemyAttackFlip(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgEnemyAttackFlipToDir(HitSensor* pReceiver, HitSensor* pSender, const TVec3f& rDir); - bool sendMsgEnemyAttackFlipJump(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgEnemyAttackFlipRot(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgEnemyAttackFlipMaximum(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgEnemyAttackFlipMaximumToDir(HitSensor* pReceiver, HitSensor* pSender, const TVec3f& rDir); - bool sendMsgEnemyAttack(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgEnemyAttackStrong(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgEnemyAttackStrongToDir(HitSensor* pReceiver, HitSensor* pSender, const TVec3f& rDir); - bool sendMsgEnemyAttackFire(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgEnemyAttackFireStrong(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgEnemyAttackElectric(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgEnemyAttackFreeze(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgEnemyAttackHeatBeam(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgEnemyAttackExplosion(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgEnemyAttackCounterSpin(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgEnemyAttackCounterHipDrop(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgLockOnStarPieceShoot(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgStarPieceAttack(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgStarPieceGift(HitSensor* pReceiver, HitSensor* pSender, u32 num); - bool sendMsgEnemyAttackMaximum(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgEnemyAttackMaximumToDir(HitSensor* pReceiver, HitSensor* pSender, const TVec3f& rDir); - bool sendMsgEnemyAttackToBindedSensor(LiveActor* pActor, HitSensor* pSender); - bool sendMsgEnemyAttackExplosionToBindedSensor(LiveActor* pActor, HitSensor* pSender); - bool sendSimpleMsgToActor(u32 msg, LiveActor* pActor); - bool sendMsgToBindedSensor(u32 msg, LiveActor* pActor, HitSensor* pSender); - bool sendMsgToBindedSensor(u32 msg, HitSensor* pSender); - bool sendMsgToGroundSensor(u32 msg, HitSensor* pSender); - bool sendMsgToWallSensor(u32 msg, HitSensor* pSender); - bool sendMsgStartDemo(LiveActor* pActor); - bool sendMsgToEnemyAttackBlow(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgToEnemyAttackTrample(HitSensor* pReceiver, HitSensor* pSender); - bool sendMsgToEnemyAttackBlowOrTrample(HitSensor* pReceiver, HitSensor* pSender, f32 ratio); - bool sendMsgToEnemyAttackShockWave(HitSensor* pReceiver, HitSensor* pSender); - void sendMsgToAllLiveActor(u32 msg, LiveActor* pActor); - void sendMsgToGroupMember(u32 msg, LiveActor* pActor, HitSensor* pSensor, const char* pName); - void sendMsgExplosionToNearActor(HitSensor* pSender, f32 distance); - bool isInSpinStormRange(u32 msg, HitSensor* pSender, HitSensor* pReceiver, f32 range); - bool receiveItemShowMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); - bool receiveItemHideMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); - HitSensor* getGroundSensor(const LiveActor* pActor); - HitSensor* getRoofSensor(const LiveActor* pActor); - HitSensor* getWallSensor(const LiveActor* pActor); - bool isMsgPlayerHitAll(u32 msg); - bool isMsgPlayerSpinAttack(u32 msg); - bool isMsgPlayerTrample(u32 msg); - bool isMsgPlayerHipDrop(u32 msg); - bool isMsgPlayerHipDropFloor(u32 msg); - bool isMsgPlayerUpperPunch(u32 msg); - bool isMsgPlayerKick(u32 msg); - bool isMsgJetTurtleAttack(u32 msg); - bool isMsgFireBallAttack(u32 msg); - bool isMsgSearchlightAttack(u32 msg); - bool isMsgFreezeAttack(u32 msg); - bool isMsgInvincibleAttack(u32 msg); - bool isMsgInvalidHit(u32 msg); - bool isMsgAutoRushBegin(u32 msg); - bool isMsgRushBegin(u32 msg); - bool isMsgUpdateBaseMtx(u32 msg); - bool isMsgRushCancel(u32 msg); - bool isMsgIsRushTakeOver(u32 msg); - bool isMsgFloorTouch(u32 msg); - bool isMsgWallTouch(u32 msg); - bool isMsgCeilTouch(u32 msg); - bool isMsgItemGet(u32 msg); - bool isMsgItemPull(u32 msg); - bool isMsgItemShow(u32 msg); - bool isMsgItemHide(u32 msg); - bool isMsgItemStartMove(u32 msg); - bool isMsgItemEndMove(u32 msg); - bool isMsgInhaleBlackHole(u32 msg); - bool isMsgEnemyAttack(u32 msg); - bool isMsgEnemyAttackFire(u32 msg); - bool isMsgEnemyAttackFireStrong(u32 msg); - bool isMsgEnemyAttackElectric(u32 msg); - bool isMsgExplosionAttack(u32 msg); - bool isMsgToEnemyAttackBlow(u32 msg); - bool isMsgToEnemyAttackTrample(u32 msg); - bool isMsgToEnemyAttackShockWave(u32 msg); - bool isMsgSpinStormRange(u32 msg); - bool isMsgTutorialStart(u32 msg); - bool isMsgTutorialNext(u32 msg); - bool isMsgTutorialPrev(u32 msg); - bool isMsgTutorialPass(u32 msg); - bool isMsgTutorialOmit(u32 msg); - bool isMsgRaceReady(u32 msg); - bool isMsgRaceStart(u32 msg); - bool isMsgRaceReset(u32 msg); - bool isMsgLockOnStarPieceShoot(u32 msg); - bool isMsgBallDashWall(u32 msg); - bool isMsgBallDashGround(u32 msg); - bool isMsgStartPowerStarGet(u32 msg); - bool isMsgTouchPlantItem(u32 msg); - bool isMsgHitmarkEmit(u32 msg); - bool isMsgStarPieceAttack(u32 msg); - bool isMsgStarPieceReflect(u32 msg); - bool isMsgStarPieceGift(u32 msg); - s32 getNumStarPieceGift(u32 msg); - void calcPosBetweenSensors(TVec3f* pPos, const HitSensor* pSensor1, const HitSensor* pSensor2, f32 offset); - bool tryForceKillIfMsgStartPowerStarGet(LiveActor* pActor, u32 msg); - HitSensor* addBodyMessageSensor(LiveActor* pActor, u32 type); -}; + void calcSensorDirection(TVec3f* pDir, const HitSensor* pSensor1, const HitSensor* pSensor2); + void calcSensorDirectionNormalize(TVec3f* pDir, const HitSensor* pSensor1, const HitSensor* pSensor2); + void calcSensorHorizonNormalize(TVec3f* pHorizon, const TVec3f& rGravity, const HitSensor* pSensor1, const HitSensor* pSensor2); + HitSensor* getMessageSensor(); + bool sendArbitraryMsg(u32 msg, HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgPush(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgPlayerTrample(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgPlayerPunch(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgJump(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgTouchJump(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgTaken(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgKick(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgAwayJump(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgEnemyAttackMsgToDir(u32 msg, HitSensor* pReceiver, HitSensor* pSender, const TVec3f& rDir); + bool sendMsgEnemyAttackFlipWeak(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgEnemyAttackFlipWeakJump(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgEnemyAttackFlip(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgEnemyAttackFlipToDir(HitSensor* pReceiver, HitSensor* pSender, const TVec3f& rDir); + bool sendMsgEnemyAttackFlipJump(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgEnemyAttackFlipRot(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgEnemyAttackFlipMaximum(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgEnemyAttackFlipMaximumToDir(HitSensor* pReceiver, HitSensor* pSender, const TVec3f& rDir); + bool sendMsgEnemyAttack(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgEnemyAttackStrong(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgEnemyAttackStrongToDir(HitSensor* pReceiver, HitSensor* pSender, const TVec3f& rDir); + bool sendMsgEnemyAttackFire(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgEnemyAttackFireStrong(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgEnemyAttackElectric(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgEnemyAttackFreeze(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgEnemyAttackHeatBeam(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgEnemyAttackExplosion(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgEnemyAttackCounterSpin(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgEnemyAttackCounterHipDrop(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgLockOnStarPieceShoot(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgStarPieceAttack(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgStarPieceGift(HitSensor* pReceiver, HitSensor* pSender, u32 num); + bool sendMsgEnemyAttackMaximum(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgEnemyAttackMaximumToDir(HitSensor* pReceiver, HitSensor* pSender, const TVec3f& rDir); + bool sendMsgEnemyAttackToBindedSensor(LiveActor* pActor, HitSensor* pSender); + bool sendMsgEnemyAttackExplosionToBindedSensor(LiveActor* pActor, HitSensor* pSender); + bool sendSimpleMsgToActor(u32 msg, LiveActor* pActor); + bool sendMsgToBindedSensor(u32 msg, LiveActor* pActor, HitSensor* pSender); + bool sendMsgToBindedSensor(u32 msg, HitSensor* pSender); + bool sendMsgToGroundSensor(u32 msg, HitSensor* pSender); + bool sendMsgToWallSensor(u32 msg, HitSensor* pSender); + bool sendMsgStartDemo(LiveActor* pActor); + bool sendMsgToEnemyAttackBlow(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgToEnemyAttackTrample(HitSensor* pReceiver, HitSensor* pSender); + bool sendMsgToEnemyAttackBlowOrTrample(HitSensor* pReceiver, HitSensor* pSender, f32 ratio); + bool sendMsgToEnemyAttackShockWave(HitSensor* pReceiver, HitSensor* pSender); + void sendMsgToAllLiveActor(u32 msg, LiveActor* pActor); + void sendMsgToGroupMember(u32 msg, LiveActor* pActor, HitSensor* pSensor, const char* pName); + void sendMsgExplosionToNearActor(HitSensor* pSender, f32 distance); + bool isInSpinStormRange(u32 msg, HitSensor* pSender, HitSensor* pReceiver, f32 range); + bool receiveItemShowMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); + bool receiveItemHideMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver); + HitSensor* getGroundSensor(const LiveActor* pActor); + HitSensor* getRoofSensor(const LiveActor* pActor); + HitSensor* getWallSensor(const LiveActor* pActor); + bool isMsgPlayerHitAll(u32 msg); + bool isMsgPlayerSpinAttack(u32 msg); + bool isMsgPlayerTrample(u32 msg); + bool isMsgPlayerHipDrop(u32 msg); + bool isMsgPlayerHipDropFloor(u32 msg); + bool isMsgPlayerUpperPunch(u32 msg); + bool isMsgPlayerKick(u32 msg); + bool isMsgJetTurtleAttack(u32 msg); + bool isMsgFireBallAttack(u32 msg); + bool isMsgSearchlightAttack(u32 msg); + bool isMsgFreezeAttack(u32 msg); + bool isMsgInvincibleAttack(u32 msg); + bool isMsgInvalidHit(u32 msg); + bool isMsgAutoRushBegin(u32 msg); + bool isMsgRushBegin(u32 msg); + bool isMsgUpdateBaseMtx(u32 msg); + bool isMsgRushCancel(u32 msg); + bool isMsgIsRushTakeOver(u32 msg); + bool isMsgFloorTouch(u32 msg); + bool isMsgWallTouch(u32 msg); + bool isMsgCeilTouch(u32 msg); + bool isMsgItemGet(u32 msg); + bool isMsgItemPull(u32 msg); + bool isMsgItemShow(u32 msg); + bool isMsgItemHide(u32 msg); + bool isMsgItemStartMove(u32 msg); + bool isMsgItemEndMove(u32 msg); + bool isMsgInhaleBlackHole(u32 msg); + bool isMsgEnemyAttack(u32 msg); + bool isMsgEnemyAttackFire(u32 msg); + bool isMsgEnemyAttackFireStrong(u32 msg); + bool isMsgEnemyAttackElectric(u32 msg); + bool isMsgExplosionAttack(u32 msg); + bool isMsgToEnemyAttackBlow(u32 msg); + bool isMsgToEnemyAttackTrample(u32 msg); + bool isMsgToEnemyAttackShockWave(u32 msg); + bool isMsgSpinStormRange(u32 msg); + bool isMsgTutorialStart(u32 msg); + bool isMsgTutorialNext(u32 msg); + bool isMsgTutorialPrev(u32 msg); + bool isMsgTutorialPass(u32 msg); + bool isMsgTutorialOmit(u32 msg); + bool isMsgRaceReady(u32 msg); + bool isMsgRaceStart(u32 msg); + bool isMsgRaceReset(u32 msg); + bool isMsgLockOnStarPieceShoot(u32 msg); + bool isMsgBallDashWall(u32 msg); + bool isMsgBallDashGround(u32 msg); + bool isMsgStartPowerStarGet(u32 msg); + bool isMsgTouchPlantItem(u32 msg); + bool isMsgHitmarkEmit(u32 msg); + bool isMsgStarPieceAttack(u32 msg); + bool isMsgStarPieceReflect(u32 msg); + bool isMsgStarPieceGift(u32 msg); + s32 getNumStarPieceGift(u32 msg); + void calcPosBetweenSensors(TVec3f* pPos, const HitSensor* pSensor1, const HitSensor* pSensor2, f32 offset); + bool tryForceKillIfMsgStartPowerStarGet(LiveActor* pActor, u32 msg); + HitSensor* addBodyMessageSensor(LiveActor* pActor, u32 type); +}; // namespace MR diff --git a/include/Game/Util/ActorShadowLocalUtil.hpp b/include/Game/Util/ActorShadowLocalUtil.hpp index f26ac435f..177af6265 100644 --- a/include/Game/Util/ActorShadowLocalUtil.hpp +++ b/include/Game/Util/ActorShadowLocalUtil.hpp @@ -18,35 +18,35 @@ class ShadowVolumeOvalPole; class ShadowVolumeSphere; namespace ActorShadow { - u32 getShadowControllerCount(const LiveActor *); - ShadowController* getShadowController(const LiveActor *, u32); - ShadowController* getShadowController(const LiveActor *, const char *); - bool isExistShadowController(const LiveActor *, const char *); - ShadowController* createShadowControllerVolumeParam(LiveActor *, const char *); - ShadowController* createShadowControllerSuefaceParam(LiveActor *, const char *); // Not a typo - ShadowDrawer* getShadowSurfaceOval(const LiveActor *, const char *); - ShadowDrawer* getShadowVolumeSphere(const LiveActor *, const char *); - ShadowDrawer* getShadowVolumeCylinder(const LiveActor *, const char *); - ShadowDrawer* getShadowVolumeBox(const LiveActor *, const char *); - ShadowDrawer* getShadowVolumeDrawer(const LiveActor *, const char *); - bool getJointNameFromCSV(const char **, const JMapInfoIter &); - s32 getShadowTypeFromCSV(const JMapInfoIter &); - void setUpShadowControlBaseMtxFromCSV(ShadowController *, LiveActor *, const JMapInfoIter &); - void setUpShadowControlIsFollowScaleFromCSV(ShadowController *, const JMapInfoIter &); - void setUpShadowControlIsSyncShowFromCSV(ShadowController *, const JMapInfoIter &); - void setUpShadowControlCalcCollisionFromCSV(ShadowController *, const JMapInfoIter &); - void setUpShadowControlCalcGravityFromCSV(ShadowController *, const JMapInfoIter &); - void setUpShadowControlFromCSV(ShadowController *, LiveActor *, const JMapInfoIter &); - ShadowController* createShadowControlFromCSV(LiveActor *, const JMapInfoIter &); - ShadowSurfaceCircle* createShadowSurfaceCircleFromCSV(LiveActor *, const JMapInfoIter &); - ShadowSurfaceOval* createShadowSurfaceOvalFromCSV(LiveActor *, const JMapInfoIter &); - ShadowSurfaceBox* createShadowSurfaceBoxFromCSV(LiveActor *, const JMapInfoIter &); - ShadowVolumeSphere* createShadowVolumeSphereFromCSV(LiveActor *, const JMapInfoIter &); - ShadowVolumeOval* createShadowVolumeOvalFromCSV(LiveActor *, const JMapInfoIter &); - ShadowVolumeOvalPole* createShadowVolumeOvalPoleFromCSV(LiveActor *, const JMapInfoIter &); - ShadowVolumeCylinder* createShadowVolumeCylinderFromCSV(LiveActor *, const JMapInfoIter &); - ShadowVolumeBox* createShadowVolumeBoxFromCSV(LiveActor *, const JMapInfoIter &); - ShadowVolumeFlatModel* createShadowVolumeFlatModelFromCSV(LiveActor *, const JMapInfoIter &); - ShadowVolumeLine* createShadowVolumeLineFromCSV(LiveActor *, const JMapInfoIter &); - void addShadowFromCSV(LiveActor *, const JMapInfoIter &); -}; + u32 getShadowControllerCount(const LiveActor*); + ShadowController* getShadowController(const LiveActor*, u32); + ShadowController* getShadowController(const LiveActor*, const char*); + bool isExistShadowController(const LiveActor*, const char*); + ShadowController* createShadowControllerVolumeParam(LiveActor*, const char*); + ShadowController* createShadowControllerSuefaceParam(LiveActor*, const char*); // Not a typo + ShadowDrawer* getShadowSurfaceOval(const LiveActor*, const char*); + ShadowDrawer* getShadowVolumeSphere(const LiveActor*, const char*); + ShadowDrawer* getShadowVolumeCylinder(const LiveActor*, const char*); + ShadowDrawer* getShadowVolumeBox(const LiveActor*, const char*); + ShadowDrawer* getShadowVolumeDrawer(const LiveActor*, const char*); + bool getJointNameFromCSV(const char**, const JMapInfoIter&); + s32 getShadowTypeFromCSV(const JMapInfoIter&); + void setUpShadowControlBaseMtxFromCSV(ShadowController*, LiveActor*, const JMapInfoIter&); + void setUpShadowControlIsFollowScaleFromCSV(ShadowController*, const JMapInfoIter&); + void setUpShadowControlIsSyncShowFromCSV(ShadowController*, const JMapInfoIter&); + void setUpShadowControlCalcCollisionFromCSV(ShadowController*, const JMapInfoIter&); + void setUpShadowControlCalcGravityFromCSV(ShadowController*, const JMapInfoIter&); + void setUpShadowControlFromCSV(ShadowController*, LiveActor*, const JMapInfoIter&); + ShadowController* createShadowControlFromCSV(LiveActor*, const JMapInfoIter&); + ShadowSurfaceCircle* createShadowSurfaceCircleFromCSV(LiveActor*, const JMapInfoIter&); + ShadowSurfaceOval* createShadowSurfaceOvalFromCSV(LiveActor*, const JMapInfoIter&); + ShadowSurfaceBox* createShadowSurfaceBoxFromCSV(LiveActor*, const JMapInfoIter&); + ShadowVolumeSphere* createShadowVolumeSphereFromCSV(LiveActor*, const JMapInfoIter&); + ShadowVolumeOval* createShadowVolumeOvalFromCSV(LiveActor*, const JMapInfoIter&); + ShadowVolumeOvalPole* createShadowVolumeOvalPoleFromCSV(LiveActor*, const JMapInfoIter&); + ShadowVolumeCylinder* createShadowVolumeCylinderFromCSV(LiveActor*, const JMapInfoIter&); + ShadowVolumeBox* createShadowVolumeBoxFromCSV(LiveActor*, const JMapInfoIter&); + ShadowVolumeFlatModel* createShadowVolumeFlatModelFromCSV(LiveActor*, const JMapInfoIter&); + ShadowVolumeLine* createShadowVolumeLineFromCSV(LiveActor*, const JMapInfoIter&); + void addShadowFromCSV(LiveActor*, const JMapInfoIter&); +}; // namespace ActorShadow diff --git a/include/Game/Util/ActorShadowUtil.hpp b/include/Game/Util/ActorShadowUtil.hpp index 0164cca01..a4d914c66 100644 --- a/include/Game/Util/ActorShadowUtil.hpp +++ b/include/Game/Util/ActorShadowUtil.hpp @@ -10,96 +10,96 @@ class LiveActor; class HitSensor; namespace MR { - void initShadowFromCSV(LiveActor *, const char *); + void initShadowFromCSV(LiveActor*, const char*); - void initShadowSurfaceCircle(LiveActor *, f32); - void initShadowVolumeSphere(LiveActor *, f32); - void initShadowVolumeOval(LiveActor *, const TVec3f &); - void initShadowVolumeCylinder(LiveActor *, f32); - void initShadowVolumeBox(LiveActor *, const TVec3f &); - void initShadowVolumeBox(LiveActor *, const TVec3f &, MtxPtr); - void initShadowVolumeFlatModel(LiveActor *, const char *); - void initShadowVolumeFlatModel(LiveActor *, const char *, MtxPtr); + void initShadowSurfaceCircle(LiveActor*, f32); + void initShadowVolumeSphere(LiveActor*, f32); + void initShadowVolumeOval(LiveActor*, const TVec3f&); + void initShadowVolumeCylinder(LiveActor*, f32); + void initShadowVolumeBox(LiveActor*, const TVec3f&); + void initShadowVolumeBox(LiveActor*, const TVec3f&, MtxPtr); + void initShadowVolumeFlatModel(LiveActor*, const char*); + void initShadowVolumeFlatModel(LiveActor*, const char*, MtxPtr); - void initShadowController(LiveActor *, u32); + void initShadowController(LiveActor*, u32); - void addShadowSurfaceCircle(LiveActor *, const char *, f32); - void addShadowVolumeSphere(LiveActor *, const char *, f32); - void addShadowVolumeOval(LiveActor *, const char *, const TVec3f &, MtxPtr); - void addShadowVolumeCylinder(LiveActor *, const char *, f32); - void addShadowVolumeBox(LiveActor *, const char *, const TVec3f &); - void addShadowVolumeBox(LiveActor *, const char *, const TVec3f &, MtxPtr); - void addShadowVolumeLine(LiveActor *, const char *, LiveActor *, const char *, f32, LiveActor *, const char *, f32); - void addShadowVolumeFlatModel(LiveActor *, const char *, const char *); - void addShadowVolumeFlatModel(LiveActor *, const char *, const char *, MtxPtr); - - void setShadowDropPosition(LiveActor *, const char *, const TVec3f &); - void setShadowDropPositionPtr(LiveActor *, const char *, const TVec3f *); - void setShadowDropPositionMtxPtr(LiveActor *, const char *, MtxPtr, const TVec3f *); - void setShadowDropPositionAtJoint(LiveActor *, const char *, const char *, const TVec3f *); - void setShadowDropDirection(LiveActor *, const char *, const TVec3f &); - void setShadowDropDirectionPtr(LiveActor *, const char *, const TVec3f *); - void setShadowProjection(LiveActor *, const char *, const TVec3f &, const TVec3f &, bool); - void setShadowProjectionPtr(LiveActor *, const char *, const TVec3f *, const TVec3f *); - void setShadowDropLength(LiveActor *, const char *, f32); - void setShadowDropStartOffset(LiveActor *, const char *, f32); + void addShadowSurfaceCircle(LiveActor*, const char*, f32); + void addShadowVolumeSphere(LiveActor*, const char*, f32); + void addShadowVolumeOval(LiveActor*, const char*, const TVec3f&, MtxPtr); + void addShadowVolumeCylinder(LiveActor*, const char*, f32); + void addShadowVolumeBox(LiveActor*, const char*, const TVec3f&); + void addShadowVolumeBox(LiveActor*, const char*, const TVec3f&, MtxPtr); + void addShadowVolumeLine(LiveActor*, const char*, LiveActor*, const char*, f32, LiveActor*, const char*, f32); + void addShadowVolumeFlatModel(LiveActor*, const char*, const char*); + void addShadowVolumeFlatModel(LiveActor*, const char*, const char*, MtxPtr); - void setShadowSurfaceOvalColor(LiveActor *, const char *, Color8); - void setShadowSurfaceOvalAlpha(LiveActor *, const char *, u8); - void setShadowVolumeSphereRadius(LiveActor *, const char *, f32); - void setShadowVolumeCylinderRadius(LiveActor *, const char *, f32); - void setShadowVolumeBoxSize(LiveActor *, const char *, const TVec3f &); - void setShadowVolumeStartDropOffset(LiveActor *, const char *, f32); - void setShadowVolumeEndDropOffset(LiveActor *, const char *, f32); + void setShadowDropPosition(LiveActor*, const char*, const TVec3f&); + void setShadowDropPositionPtr(LiveActor*, const char*, const TVec3f*); + void setShadowDropPositionMtxPtr(LiveActor*, const char*, MtxPtr, const TVec3f*); + void setShadowDropPositionAtJoint(LiveActor*, const char*, const char*, const TVec3f*); + void setShadowDropDirection(LiveActor*, const char*, const TVec3f&); + void setShadowDropDirectionPtr(LiveActor*, const char*, const TVec3f*); + void setShadowProjection(LiveActor*, const char*, const TVec3f&, const TVec3f&, bool); + void setShadowProjectionPtr(LiveActor*, const char*, const TVec3f*, const TVec3f*); + void setShadowDropLength(LiveActor*, const char*, f32); + void setShadowDropStartOffset(LiveActor*, const char*, f32); - void onCalcShadow(LiveActor *, const char *); - void onCalcShadowAll(LiveActor *); - void onCalcShadowOneTime(LiveActor *, const char *); - void onCalcShadowOneTimeAll(LiveActor *); - void offCalcShadow(LiveActor *, const char *); - void offCalcShadowAll(LiveActor *); + void setShadowSurfaceOvalColor(LiveActor*, const char*, Color8); + void setShadowSurfaceOvalAlpha(LiveActor*, const char*, u8); + void setShadowVolumeSphereRadius(LiveActor*, const char*, f32); + void setShadowVolumeCylinderRadius(LiveActor*, const char*, f32); + void setShadowVolumeBoxSize(LiveActor*, const char*, const TVec3f&); + void setShadowVolumeStartDropOffset(LiveActor*, const char*, f32); + void setShadowVolumeEndDropOffset(LiveActor*, const char*, f32); - void onCalcShadowDropGravity(LiveActor *, const char *); - void onCalcShadowDropGravityOnetime(LiveActor *, const char *); - void onCalcShadowDropPrivateGravity(LiveActor *, const char *); - void onCalcShadowDropPrivateGravityOneTime(LiveActor *, const char *); - void offCalcShadowDropPrivateGravity(LiveActor *, const char *); + void onCalcShadow(LiveActor*, const char*); + void onCalcShadowAll(LiveActor*); + void onCalcShadowOneTime(LiveActor*, const char*); + void onCalcShadowOneTimeAll(LiveActor*); + void offCalcShadow(LiveActor*, const char*); + void offCalcShadowAll(LiveActor*); - void onShadowVolumeCutDropLength(LiveActor *, const char *); + void onCalcShadowDropGravity(LiveActor*, const char*); + void onCalcShadowDropGravityOnetime(LiveActor*, const char*); + void onCalcShadowDropPrivateGravity(LiveActor*, const char*); + void onCalcShadowDropPrivateGravityOneTime(LiveActor*, const char*); + void offCalcShadowDropPrivateGravity(LiveActor*, const char*); - void excludeCalcShadowToMyCollision(LiveActor *, const char *); - void excludeCalcShadowToCollision(LiveActor *, const char *, CollisionParts *); - void excludeCalcShadowToSensorAll(LiveActor *, const HitSensor *); - void excludeCalcShadowToActorAll(LiveActor *, const LiveActor *); - - bool isExistShadow(const LiveActor *, const char *); + void onShadowVolumeCutDropLength(LiveActor*, const char*); - void validateShadow(LiveActor *, const char *); - void validateShadowGroup(LiveActor *, const char *); - void validateShadowAll(LiveActor *); - void invalidateShadow(LiveActor *, const char *); - void invalidateShadowGroup(LiveActor *, const char *); - void invalidateShadowAll(LiveActor *); - - void onShadowVisibleSyncHostAll(LiveActor *); - void offShadowVisibleSyncHost(LiveActor *, const char *); - void offShadowVisibleSyncHostAll(LiveActor *); + void excludeCalcShadowToMyCollision(LiveActor*, const char*); + void excludeCalcShadowToCollision(LiveActor*, const char*, CollisionParts*); + void excludeCalcShadowToSensorAll(LiveActor*, const HitSensor*); + void excludeCalcShadowToActorAll(LiveActor*, const LiveActor*); - void onShadowFollowHostScale(LiveActor *, const char *); - void onShadowFollowHostScaleAll(LiveActor *); - - bool calcClippingRangeIncludeShadow(TVec3f *, f32 *, const LiveActor *, f32); - void setClippingRangeIncludeShadow(LiveActor *, TVec3f *, f32); + bool isExistShadow(const LiveActor*, const char*); - bool isShadowProjected(const LiveActor *, const char *); - bool isShadowProjectedAny(const LiveActor *); - - void getShadowProjectionPos(const LiveActor *, const char *, TVec3f *); - void getShadowProjectionNormal(const LiveActor *, const char *, TVec3f *); - f32 getShadowProjectionLength(const LiveActor *, const char *); - HitSensor* getShadowProjectedSensor(const LiveActor *, const char *); + void validateShadow(LiveActor*, const char*); + void validateShadowGroup(LiveActor*, const char*); + void validateShadowAll(LiveActor*); + void invalidateShadow(LiveActor*, const char*); + void invalidateShadowGroup(LiveActor*, const char*); + void invalidateShadowAll(LiveActor*); - f32 getShadowNearProjectionLength(const LiveActor *); + void onShadowVisibleSyncHostAll(LiveActor*); + void offShadowVisibleSyncHost(LiveActor*, const char*); + void offShadowVisibleSyncHostAll(LiveActor*); - void setShadowProjection(LiveActor *, const char *, const TVec3f &, const TVec3f &, bool); -}; + void onShadowFollowHostScale(LiveActor*, const char*); + void onShadowFollowHostScaleAll(LiveActor*); + + bool calcClippingRangeIncludeShadow(TVec3f*, f32*, const LiveActor*, f32); + void setClippingRangeIncludeShadow(LiveActor*, TVec3f*, f32); + + bool isShadowProjected(const LiveActor*, const char*); + bool isShadowProjectedAny(const LiveActor*); + + void getShadowProjectionPos(const LiveActor*, const char*, TVec3f*); + void getShadowProjectionNormal(const LiveActor*, const char*, TVec3f*); + f32 getShadowProjectionLength(const LiveActor*, const char*); + HitSensor* getShadowProjectedSensor(const LiveActor*, const char*); + + f32 getShadowNearProjectionLength(const LiveActor*); + + void setShadowProjection(LiveActor*, const char*, const TVec3f&, const TVec3f&, bool); +}; // namespace MR diff --git a/include/Game/Util/ActorStateUtil.hpp b/include/Game/Util/ActorStateUtil.hpp index 1afbc3c4c..4bc6c9f6d 100644 --- a/include/Game/Util/ActorStateUtil.hpp +++ b/include/Game/Util/ActorStateUtil.hpp @@ -64,4 +64,4 @@ namespace MR { /// @return true if the state was updated and nerve transition occurred, false otherwise. /// @note Only transitions to the next nerve if the state indicates it should update. bool updateActorStateAndNextNerve(NerveExecutor* pExecutor, ActorStateBaseInterface* pActorState, const Nerve* pNextNerve); -}; +}; // namespace MR diff --git a/include/Game/Util/ActorSwitchUtil.hpp b/include/Game/Util/ActorSwitchUtil.hpp index a03cb2365..513db3a2e 100644 --- a/include/Game/Util/ActorSwitchUtil.hpp +++ b/include/Game/Util/ActorSwitchUtil.hpp @@ -4,40 +4,40 @@ class LiveActor; class JMapInfoIter; namespace MR { - class FunctorBase; + class FunctorBase; - bool useStageSwitchReadA(LiveActor *, const JMapInfoIter &); - bool useStageSwitchReadB(LiveActor *, const JMapInfoIter &); - bool useStageSwitchReadAppear(LiveActor *, const JMapInfoIter &); - void useStageSwitchSleep(LiveActor *, const JMapInfoIter &); - bool useStageSwitchWriteA(LiveActor *, const JMapInfoIter &); - bool useStageSwitchWriteB(LiveActor *, const JMapInfoIter &); - bool useStageSwitchWriteDead(LiveActor *, const JMapInfoIter &); - bool needStageSwitchReadA(LiveActor *, const JMapInfoIter &); - bool needStageSwitchReadB(LiveActor *, const JMapInfoIter &); - bool needStageSwitchReadAppear(LiveActor *, const JMapInfoIter &); - bool needStageSwitchWriteA(LiveActor *, const JMapInfoIter &); - bool needStageSwitchWriteB(LiveActor *, const JMapInfoIter &); - bool needStageSwitchWriteDead(LiveActor *, const JMapInfoIter &); - bool isValidSwitchA(const LiveActor *); - bool isValidSwitchB(const LiveActor *); - bool isValidSwitchAppear(const LiveActor *); - bool isValidSwitchDead(const LiveActor *); - bool isOnSwitchA(const LiveActor *); - bool isOnSwitchB(const LiveActor *); - bool isOnSwitchAppear(const LiveActor *); - void onSwitchA(LiveActor *); - void onSwitchB(LiveActor *); - void onSwitchDead(LiveActor *); - void offSwitchA(LiveActor *); - void offSwitchB(LiveActor *); - void offSwitchDead(LiveActor *); - void syncStageSwitchAppear(LiveActor *); - void listenStageSwitchOnAppear(LiveActor *, const MR::FunctorBase &); - void listenStageSwitchOnOffAppear(LiveActor *, const MR::FunctorBase &, const MR::FunctorBase &); - void listenStageSwitchOnA(LiveActor *, const MR::FunctorBase &); - void listenStageSwitchOnOffA(LiveActor *, const MR::FunctorBase &, const MR::FunctorBase &); - void listenStageSwitchOnB(LiveActor *, const MR::FunctorBase &); - void listenStageSwitchOffB(LiveActor *, const MR::FunctorBase &); - void listenStageSwitchOnOffB(LiveActor *, const MR::FunctorBase &, const MR::FunctorBase &); -}; + bool useStageSwitchReadA(LiveActor*, const JMapInfoIter&); + bool useStageSwitchReadB(LiveActor*, const JMapInfoIter&); + bool useStageSwitchReadAppear(LiveActor*, const JMapInfoIter&); + void useStageSwitchSleep(LiveActor*, const JMapInfoIter&); + bool useStageSwitchWriteA(LiveActor*, const JMapInfoIter&); + bool useStageSwitchWriteB(LiveActor*, const JMapInfoIter&); + bool useStageSwitchWriteDead(LiveActor*, const JMapInfoIter&); + bool needStageSwitchReadA(LiveActor*, const JMapInfoIter&); + bool needStageSwitchReadB(LiveActor*, const JMapInfoIter&); + bool needStageSwitchReadAppear(LiveActor*, const JMapInfoIter&); + bool needStageSwitchWriteA(LiveActor*, const JMapInfoIter&); + bool needStageSwitchWriteB(LiveActor*, const JMapInfoIter&); + bool needStageSwitchWriteDead(LiveActor*, const JMapInfoIter&); + bool isValidSwitchA(const LiveActor*); + bool isValidSwitchB(const LiveActor*); + bool isValidSwitchAppear(const LiveActor*); + bool isValidSwitchDead(const LiveActor*); + bool isOnSwitchA(const LiveActor*); + bool isOnSwitchB(const LiveActor*); + bool isOnSwitchAppear(const LiveActor*); + void onSwitchA(LiveActor*); + void onSwitchB(LiveActor*); + void onSwitchDead(LiveActor*); + void offSwitchA(LiveActor*); + void offSwitchB(LiveActor*); + void offSwitchDead(LiveActor*); + void syncStageSwitchAppear(LiveActor*); + void listenStageSwitchOnAppear(LiveActor*, const MR::FunctorBase&); + void listenStageSwitchOnOffAppear(LiveActor*, const MR::FunctorBase&, const MR::FunctorBase&); + void listenStageSwitchOnA(LiveActor*, const MR::FunctorBase&); + void listenStageSwitchOnOffA(LiveActor*, const MR::FunctorBase&, const MR::FunctorBase&); + void listenStageSwitchOnB(LiveActor*, const MR::FunctorBase&); + void listenStageSwitchOffB(LiveActor*, const MR::FunctorBase&); + void listenStageSwitchOnOffB(LiveActor*, const MR::FunctorBase&, const MR::FunctorBase&); +}; // namespace MR diff --git a/include/Game/Util/AreaObjUtil.hpp b/include/Game/Util/AreaObjUtil.hpp index 6b9ae2213..66b52af1b 100644 --- a/include/Game/Util/AreaObjUtil.hpp +++ b/include/Game/Util/AreaObjUtil.hpp @@ -11,32 +11,32 @@ class AreaCubeBoundingBox; class WaterInfo; namespace MR { - AreaObjMgr* getAreaObjManager(const char *); - AreaObj* getAreaObj(const char *, const TVec3f &); - bool isInAreaObj(const char *, const TVec3f &); - s32 getAreaObjArg(const AreaObj *, s32); - - void calcAreaMoveVelocity(TVec3f *, const TVec3f &); + AreaObjMgr* getAreaObjManager(const char*); + AreaObj* getAreaObj(const char*, const TVec3f&); + bool isInAreaObj(const char*, const TVec3f&); + s32 getAreaObjArg(const AreaObj*, s32); - void calcCylinderPos(TVec3f *, const AreaObj *); + void calcAreaMoveVelocity(TVec3f*, const TVec3f&); - void calcCylinderUpVec(TVec3f *, const AreaObj *); - f32 getCylinderRadius(const AreaObj *); + void calcCylinderPos(TVec3f*, const AreaObj*); - void calcCubePos(const AreaObj *, TVec3f *); - void calcCubeLocalPos(TVec3f *, const AreaObj *, const TVec3f &); - - void calcCubeRotate(const AreaObj *, TVec3f *); + void calcCylinderUpVec(TVec3f*, const AreaObj*); + f32 getCylinderRadius(const AreaObj*); - bool calcWhirlPoolAccelInfo(const TVec3f &, TVec3f *); + void calcCubePos(const AreaObj*, TVec3f*); + void calcCubeLocalPos(TVec3f*, const AreaObj*, const TVec3f&); - TBox3f *getCubeLocalBox(const AreaObj *); + void calcCubeRotate(const AreaObj*, TVec3f*); + + bool calcWhirlPoolAccelInfo(const TVec3f&, TVec3f*); + + TBox3f* getCubeLocalBox(const AreaObj*); AreaObj* getCurrentAstroOverlookAreaObj(); - AreaObj* getAreaIn(const char *, const TVec3f &); + AreaObj* getAreaIn(const char*, const TVec3f&); - bool getWaterAreaObj(WaterInfo *, const TVec3f &); - AreaInfo* getWaterAreaInfo(WaterInfo *, const TVec3f &, const TVec3f &, bool); - -}; + bool getWaterAreaObj(WaterInfo*, const TVec3f&); + AreaInfo* getWaterAreaInfo(WaterInfo*, const TVec3f&, const TVec3f&, bool); + +}; // namespace MR diff --git a/include/Game/Util/Array.hpp b/include/Game/Util/Array.hpp index 5ebff3b33..3a35c4891 100644 --- a/include/Game/Util/Array.hpp +++ b/include/Game/Util/Array.hpp @@ -5,7 +5,7 @@ namespace MR { /// @brief A contiguous reallocatable array. - template + template class AssignableArray { public: typedef T Item; @@ -88,7 +88,7 @@ namespace MR { }; /// @brief A contiguous fixed-size array. - template + template class FixedArray { public: typedef T Item; @@ -143,7 +143,7 @@ namespace MR { }; /// @brief A contiguous growable array. - template + template class Vector { public: /// @brief Creates a new `Vector`. @@ -153,7 +153,6 @@ namespace MR { /// @brief Destroys the `Vector`. ~Vector() { - } /// @brief Returns the element at the given position. @@ -190,7 +189,7 @@ namespace MR { /// @brief Appends a copy of `rItem` to the end of the container. /// @param rItem The reference to the value to append. - void push_back(const T::Item &rItem) { + void push_back(const T::Item& rItem) { u32 index = mCount; mCount++; @@ -248,7 +247,7 @@ namespace MR { /* 0x? */ s32 mCount; }; - template + template class FixedRingBuffer { public: class iterator { @@ -267,15 +266,15 @@ namespace MR { } } - T* mHead; // 0x0 - T* mTail; // 0x4 - T* mEnd; // 0x8 + T* mHead; // 0x0 + T* mTail; // 0x4 + T* mEnd; // 0x8 }; - void push_back(const T &); + void push_back(const T&); T* mBuffer[S]; int _58; }; -}; +}; // namespace MR diff --git a/include/Game/Util/BaseMatrixFollowTargetHolder.hpp b/include/Game/Util/BaseMatrixFollowTargetHolder.hpp index e414d443b..377622d65 100644 --- a/include/Game/Util/BaseMatrixFollowTargetHolder.hpp +++ b/include/Game/Util/BaseMatrixFollowTargetHolder.hpp @@ -13,55 +13,54 @@ public: class BaseMatrixFollowTarget { public: - BaseMatrixFollowTarget(const JMapLinkInfo *); + BaseMatrixFollowTarget(const JMapLinkInfo*); - void set(LiveActor *, const TPos3f &, const TPos3f *, BaseMatrixFollowValidater *); + void set(LiveActor*, const TPos3f&, const TPos3f*, BaseMatrixFollowValidater*); const MtxPtr getHostBaseMtx() const; - bool isValid(s32) const; + bool isValid(s32) const; - TMtx34f _0; - const TPos3f* _30; - LiveActor* mActor; // 0x34 - const JMapLinkInfo* mLinkInfo; // 0x38 - BaseMatrixFollowValidater* mValidater; // 0x3C + TMtx34f _0; + const TPos3f* _30; + LiveActor* mActor; // 0x34 + const JMapLinkInfo* mLinkInfo; // 0x38 + BaseMatrixFollowValidater* mValidater; // 0x3C }; class BaseMatrixFollower { public: - BaseMatrixFollower(NameObj *, const JMapInfoIter &); - - virtual void setGravityFollowHost(const NameObj *) { + BaseMatrixFollower(NameObj*, const JMapInfoIter&); + virtual void setGravityFollowHost(const NameObj*) { } virtual void update(); NameObj* getFollowTargetActor() const; - void calcFollowMatrix(TPos3f *) const; - bool isEnableFollow() const; - bool isValid() const; + void calcFollowMatrix(TPos3f*) const; + bool isEnableFollow() const; + bool isValid() const; - JMapLinkInfo* mLinkInfo; // 0x4 - NameObj* mFollowerObj; // 0x8 - BaseMatrixFollowTarget* mFollowTarget; // 0xC - s32 mFollowID; // 0x10 + JMapLinkInfo* mLinkInfo; // 0x4 + NameObj* mFollowerObj; // 0x8 + BaseMatrixFollowTarget* mFollowTarget; // 0xC + s32 mFollowID; // 0x10 }; class BaseMatrixFollowTargetHolder : public NameObj { public: - BaseMatrixFollowTargetHolder(const char *, s32, s32); + BaseMatrixFollowTargetHolder(const char*, s32, s32); virtual ~BaseMatrixFollowTargetHolder(); virtual void initAfterPlacement(); virtual void movement(); - MR::Vector > mFollowers; // 0xC - MR::Vector > mTargets; // 0x18 + MR::Vector> mFollowers; // 0xC + MR::Vector> mTargets; // 0x18 }; namespace MR { - bool isValidFollowID(const JMapInfoIter &); - void addBaseMatrixFollower(BaseMatrixFollower *); - void addBaseMatrixFollowTarget(LiveActor *, const JMapInfoIter &, const TPos3f *, BaseMatrixFollowValidater *); -}; + bool isValidFollowID(const JMapInfoIter&); + void addBaseMatrixFollower(BaseMatrixFollower*); + void addBaseMatrixFollowTarget(LiveActor*, const JMapInfoIter&, const TPos3f*, BaseMatrixFollowValidater*); +}; // namespace MR diff --git a/include/Game/Util/BitArray.hpp b/include/Game/Util/BitArray.hpp index d687910bf..4271a457a 100644 --- a/include/Game/Util/BitArray.hpp +++ b/include/Game/Util/BitArray.hpp @@ -33,4 +33,4 @@ namespace MR { /// @brief The number of bits. /* 0x4 */ s32 mArraySize; }; -}; +}; // namespace MR diff --git a/include/Game/Util/BothDirList.hpp b/include/Game/Util/BothDirList.hpp index 562af71a1..735ec1a1f 100644 --- a/include/Game/Util/BothDirList.hpp +++ b/include/Game/Util/BothDirList.hpp @@ -11,7 +11,7 @@ namespace MR { BothDirPtrLink(void*); ~BothDirPtrLink(); - /* 0x0 */ void* mValue; + /* 0x0 */ void* mValue; /* 0x4 */ BothDirPtrList* mList; /* 0x8 */ BothDirPtrLink* mPrevLink; /* 0xC */ BothDirPtrLink* mNextLink; @@ -29,30 +29,28 @@ namespace MR { /* 0x0 */ BothDirPtrLink* mHead; /* 0x4 */ BothDirPtrLink* mTail; - /* 0x8 */ u32 mCount; + /* 0x8 */ u32 mCount; }; - template + template class BothDirLink : public BothDirPtrLink { public: - BothDirLink(T* pValue) : BothDirPtrLink(pValue) { - + BothDirLink(T* pValue) + : BothDirPtrLink(pValue) { } ~BothDirLink() NO_INLINE { - } }; - template + template class BothDirList : public BothDirPtrList { public: - BothDirList(bool param1) : BothDirPtrList(param1) { - + BothDirList(bool param1) + : BothDirPtrList(param1) { } ~BothDirList() { - } }; -}; +}; // namespace MR diff --git a/include/Game/Util/CameraUtil.hpp b/include/Game/Util/CameraUtil.hpp index 365e7777f..26d4b6f2b 100644 --- a/include/Game/Util/CameraUtil.hpp +++ b/include/Game/Util/CameraUtil.hpp @@ -13,7 +13,7 @@ class JMapInfoIter; namespace MR { const TVec3f getCamPos(); - f32 calcCameraDistanceZ(const TVec3f &); + f32 calcCameraDistanceZ(const TVec3f&); bool isCameraInterpolateNearlyEnd(); @@ -22,76 +22,75 @@ namespace MR { void cleanEventCameraTarget_temporally(); const TPos3f* getCameraProjectionMtx(); - const MtxPtr getCameraViewMtx(); - const MtxPtr getMirrorCameraViewMtx(); - const MtxPtr getMirrorModelTexMtx(); - TPos3f *getCameraInvViewMtx(); + const MtxPtr getCameraViewMtx(); + const MtxPtr getMirrorCameraViewMtx(); + const MtxPtr getMirrorModelTexMtx(); + TPos3f* getCameraInvViewMtx(); void loadViewMtx(); void loadProjectionMtx(); - void startEventCamera(const ActorCameraInfo *, const char *, const CameraTargetArg &, s32); - void startEventCameraNoTarget(const ActorCameraInfo *, const char *, s32); - void startEventCameraTargetPlayer(const ActorCameraInfo *, const char *, long); + void startEventCamera(const ActorCameraInfo*, const char*, const CameraTargetArg&, s32); + void startEventCameraNoTarget(const ActorCameraInfo*, const char*, s32); + void startEventCameraTargetPlayer(const ActorCameraInfo*, const char*, long); - f32 getAspect(); - f32 getNearZ(); - f32 getFarZ(); - f32 getFovy(); - void setCameraViewMtx(const TPos3f &, bool, bool, const TVec3f &); - void setNearZ(f32); - void setFovy(f32); - void setShakeOffset(f32, f32); + f32 getAspect(); + f32 getNearZ(); + f32 getFarZ(); + f32 getFovy(); + void setCameraViewMtx(const TPos3f&, bool, bool, const TVec3f&); + void setNearZ(f32); + void setFovy(f32); + void setShakeOffset(f32, f32); TVec3f getCamXDir(); TVec3f getCamYdir(); TVec3f getCamZdir(); - void createMirrorCamera(); - bool isExistMirrorCamera(); + void createMirrorCamera(); + bool isExistMirrorCamera(); void completeCameraParameters(); void resetCameraMan(); void startCameraInterpolation(u32); - void declareEventCamera(const ActorCameraInfo *, const char *); - void endEventCamera(const ActorCameraInfo *,const char *, bool, s32); - void endEventCameraAtLanding(const ActorCameraInfo *, const char *, s32); - void declareGlobalEventCameraAbyss(const char *); - void declareGlobalEventCameraFixedThere(const char *, bool, f32); - void declareGlobalEventCameraDead(const char *, f32, s32, s32); - void declareEventCameraAnim(const ActorCameraInfo *, const char *, void *); - void declareBlackHoleCamera(const char *); - void declareGlobalEventCamera(const char *); - void declareEventCameraProgrammable(const char *); + void declareEventCamera(const ActorCameraInfo*, const char*); + void endEventCamera(const ActorCameraInfo*, const char*, bool, s32); + void endEventCameraAtLanding(const ActorCameraInfo*, const char*, s32); + void declareGlobalEventCameraAbyss(const char*); + void declareGlobalEventCameraFixedThere(const char*, bool, f32); + void declareGlobalEventCameraDead(const char*, f32, s32, s32); + void declareEventCameraAnim(const ActorCameraInfo*, const char*, void*); + void declareBlackHoleCamera(const char*); + void declareGlobalEventCamera(const char*); + void declareEventCameraProgrammable(const char*); void setGameCameraTargetToPlayer(); - void setGameCameraTarget(const CameraTargetArg &); + void setGameCameraTarget(const CameraTargetArg&); - void startGlobalEventCamera(const char *, const CameraTargetArg &, s32); + void startGlobalEventCamera(const char*, const CameraTargetArg&, s32); - void startGlobalEventCameraNoTarget(const char *, s32); + void startGlobalEventCameraNoTarget(const char*, s32); - void setProgrammableCameraParam(const char *, const TVec3f &, const TVec3f &, const TVec3f &, bool); - void setProgrammableCameraParamFovy(const char *, f32); + void setProgrammableCameraParam(const char*, const TVec3f&, const TVec3f&, const TVec3f&, bool); + void setProgrammableCameraParamFovy(const char*, f32); - bool calcScreenPosition(TVec2f *, const TVec3f &); - bool calcScreenPosition(TVec3f *, const TVec3f &); - bool calcNormalizedScreenPosition(TVec3f *, const TVec3f &); - bool calcNormalizedScreenPositionFromView(TVec3f *, const TVec3f &); - bool calcWorldPositionFromScreen(TVec3f *, const TVec2f &, f32); - bool calcWorldRayDirectionFromScreen(TVec3f *, const TVec2f &); + bool calcScreenPosition(TVec2f*, const TVec3f&); + bool calcScreenPosition(TVec3f*, const TVec3f&); + bool calcNormalizedScreenPosition(TVec3f*, const TVec3f&); + bool calcNormalizedScreenPositionFromView(TVec3f*, const TVec3f&); + bool calcWorldPositionFromScreen(TVec3f*, const TVec2f&, f32); + bool calcWorldRayDirectionFromScreen(TVec3f*, const TVec2f&); + void declareEventCameraAnim(const ActorCameraInfo*, const char*, void*); - void declareEventCameraAnim(const ActorCameraInfo *, const char *, void *); + void pauseOnAnimCamera(const ActorCameraInfo*, const char*); + void pauseOffAnimCamera(const ActorCameraInfo*, const char*); - void pauseOnAnimCamera(const ActorCameraInfo *, const char *); - void pauseOffAnimCamera(const ActorCameraInfo *, const char *); + void startBlackHoleCamera(const char*, const TVec3f&, const TVec3f&); - void startBlackHoleCamera(const char *, const TVec3f &, const TVec3f &); - - bool createActorCameraInfoIfExist(const JMapInfoIter &, ActorCameraInfo **); + bool createActorCameraInfoIfExist(const JMapInfoIter&, ActorCameraInfo**); void pauseOnCameraDirector(); void pauseOffCameraDirector(); - bool endActorCamera(const LiveActor *, const ActorCameraInfo *, bool, s32); + bool endActorCamera(const LiveActor*, const ActorCameraInfo*, bool, s32); bool isStartAnimCameraEnd(); @@ -101,8 +100,8 @@ namespace MR { void drawInitFor2DModel(); - void declareCameraRegisterMtx(const NameObj *, u32, MtxPtr); - void declareCameraRegisterVec(const NameObj *, u32, TVec3f *); + void declareCameraRegisterMtx(const NameObj*, u32, MtxPtr); + void declareCameraRegisterVec(const NameObj*, u32, TVec3f*); void startStartPosCamera(bool); void endStartPosCamera(); @@ -115,25 +114,25 @@ namespace MR { bool isCameraInWater(); - void startGlobalEventCameraTargetPlayer(const char *, s32); + void startGlobalEventCameraTargetPlayer(const char*, s32); bool isEventCameraActive(); - bool isEventCameraActive(const ActorCameraInfo *, const char *); + bool isEventCameraActive(const ActorCameraInfo*, const char*); - void endGlobalEventCamera(const char *, s32, bool); + void endGlobalEventCamera(const char*, s32, bool); void startStartAnimCamera(); - s32 getStartAnimCameraFrame(); + s32 getStartAnimCameraFrame(); - void startEventCameraAnim(const ActorCameraInfo *, const char *, const CameraTargetArg &, long, float); + void startEventCameraAnim(const ActorCameraInfo*, const char*, const CameraTargetArg&, long, float); - s32 getAnimCameraFrame(const ActorCameraInfo *, const char *); + s32 getAnimCameraFrame(const ActorCameraInfo*, const char*); - u32 getEventCameraFrames(const ActorCameraInfo *, const char *); + u32 getEventCameraFrames(const ActorCameraInfo*, const char*); - bool isAnimCameraEnd(const ActorCameraInfo *, const char *); + bool isAnimCameraEnd(const ActorCameraInfo*, const char*); - void startBlackHoleCamera(const char *, const TVec3f &, const TVec3f &); + void startBlackHoleCamera(const char*, const TVec3f&, const TVec3f&); void startSubjectiveCamera(s32); void endSubjectiveCamera(s32); @@ -147,7 +146,7 @@ namespace MR { bool isCameraControlNG(); - void startTalkCamera(const TVec3f &, const TVec3f &, f32, f32, s32); + void startTalkCamera(const TVec3f&, const TVec3f&, f32, f32, s32); void endTalkCamera(bool, s32); TVec3f* getCameraWatchPos(); @@ -155,5 +154,5 @@ namespace MR { void zoomInTargetGameCamera(); void zoomOutTargetGameCamera(); - void changeEventCameraTarget(const ActorCameraInfo *, const char *, const CameraTargetArg &); -}; + void changeEventCameraTarget(const ActorCameraInfo*, const char*, const CameraTargetArg&); +}; // namespace MR diff --git a/include/Game/Util/Color.hpp b/include/Game/Util/Color.hpp index 69a084da6..5a2d5078c 100644 --- a/include/Game/Util/Color.hpp +++ b/include/Game/Util/Color.hpp @@ -5,7 +5,7 @@ class Color8 { public: Color8() {} - + Color8(GXColor color) { set(color); } @@ -22,12 +22,12 @@ public: return mGXColor; } - inline const Color8& operator=(const GXColor &other) { + inline const Color8& operator=(const GXColor& other) { mGXColor = other; return *this; } - inline const Color8& operator=(const Color8 &other) { + inline const Color8& operator=(const Color8& other) { r = other.r; g = other.g; b = other.b; @@ -56,15 +56,15 @@ public: u8 b; u8 a; }; - u32 mColor; + u32 mColor; GXColor mGXColor; }; }; class Color10 { public: - Color10() : r(0x3FF), g(0x3FF), b(0x3FF), a(0x3FF) { - + Color10() + : r(0x3FF), g(0x3FF), b(0x3FF), a(0x3FF) { } u16 r; diff --git a/include/Game/Util/DemoUtil.hpp b/include/Game/Util/DemoUtil.hpp index b898ad0d2..4d2e1a2b6 100644 --- a/include/Game/Util/DemoUtil.hpp +++ b/include/Game/Util/DemoUtil.hpp @@ -15,83 +15,83 @@ namespace MR { }; namespace MR { - bool tryRegisterDemoCast(LiveActor*, const JMapInfoIter&); - void registerDemoActionFunctor(const LiveActor*, const MR::FunctorBase&, const char*); - void registerDemoActionNerve(const LiveActor*, const Nerve*, const char*); - bool tryRegisterDemoActionFunctor(const LiveActor*, const MR::FunctorBase&, const char*); - bool tryRegisterDemoActionNerve(const LiveActor*, const Nerve*, const char*); - bool tryRegisterDemoCast(LiveActor*, const char*, const JMapInfoIter&); - void registerDemoCast(LiveActor*, const char*, const JMapInfoIter&); - void initTalkAnimDemoCast(LiveActor*, const JMapInfoIter&, const char*, const char*); - void registerDemoActionFunctorDirect(const LiveActor*, const MR::FunctorBase&, const char*, const char*); - bool tryRegisterDemoActionFunctorDirect(const LiveActor*, const MR::FunctorBase&, const char*, const char*); - bool tryStartDemoRegistered(LiveActor*, const char*); - bool tryStartDemoRegisteredMarioPuppetable(LiveActor*, const char*); - void registerDemoSimpleCastAll(LiveActor*); - void registerDemoSimpleCastAll(LayoutActor*); - void registerDemoSimpleCastAll(NameObj*); - bool isDemoCast(const LiveActor*, const char*); - bool isRegisteredDemoActionAppear(const LiveActor*); - bool isRegisteredDemoActionNerve(const LiveActor*); - bool tryStartDemo(LiveActor*, const char*); - bool tryStartDemo(LayoutActor*, const char*); - bool tryStartDemoWithoutCinemaFrame(LiveActor*, const char*); - bool tryStartDemoWithoutCinemaFrameValidStarPointer(LiveActor*, const char*); - bool tryStartDemoWithoutCinemaFrameValidHandPointerFinger(NameObj*, const char*); - bool tryStartDemoWithoutCinemaFrameValidHandPointerFinger(LayoutActor*, const char*); - bool tryStartDemoMarioPuppetable(LiveActor*, const char*); - bool tryStartDemoMarioPuppetableWithoutCinemaFrame(LiveActor*, const char*); - bool tryStartTimeKeepDemo(NameObj*, const char*, const char*); - bool tryStartTimeKeepDemoMarioPuppetable(NameObj*, const char*, const char*); - bool tryStartTimeKeepDemoMarioPuppetable(LiveActor*, const char*, const char*); - bool requestStartDemo(LiveActor*, const char*, const Nerve*, const Nerve*); - bool requestStartDemoWithoutCinemaFrame(LiveActor*, const char*, const Nerve*, const Nerve*); - bool requestStartDemoWithoutCinemaFrame(LayoutActor*, const char*, const Nerve*, const Nerve*); - bool requestStartDemoMarioPuppetable(LiveActor*, const char*, const Nerve*, const Nerve*); - bool requestStartDemoMarioPuppetable(NerveExecutor*, LiveActor*, const char*, const Nerve*, const Nerve*); - bool requestStartDemoMarioPuppetableWithoutCinemaFrame(LiveActor*, const char*, const Nerve*, const Nerve*); - bool requestStartTimeKeepDemo(LiveActor*, const char*, const Nerve*, const Nerve*, const char*); - bool requestStartTimeKeepDemo(NameObj*, const char*, const char*); - bool requestStartTimeKeepDemoMarioPuppetable(LiveActor*, const char*, const Nerve*, const Nerve*, const char*); - bool requestStartTimeKeepDemoMarioPuppetable(NerveExecutor*, LiveActor*, const char*, const Nerve*, const Nerve*, const char*); - bool requestStartTimeKeepDemoMarioPuppetable(NameObj*, const char*, const char*); - bool requestStartTimeKeepDemoWithoutCinemaFrame(LiveActor*, const char*, const Nerve*, const Nerve*, const char*); - bool requestStartDemoRegistered(LiveActor*, const Nerve*, const Nerve*, const char*); - bool requestStartDemoRegisteredMarioPuppetable(LiveActor*, const Nerve*, const Nerve*, const char*); - void endDemo(NameObj*, const char*); - void endDemoWaitCameraInterpolating(NameObj*, const char*); - void initDemoSheetTalkAnim(LiveActor*, const JMapInfoIter&, const char*, const char*, TalkMessageCtrl*); - void initDemoSheetTalkAnimWithMessageName(LiveActor*, const JMapInfoIter&, const char*, const char*, const char*); - void initDemoSheetTalkAnimFunctor(LiveActor*, const JMapInfoIter&, const char*, const char*, TalkMessageCtrl*, const MR::FunctorBase&); - bool tryInitDemoSheetTalkAnim(LiveActor*, const JMapInfoIter&, const char*, const char*, TalkMessageCtrl*); - void startTimeKeepDemo(NameObj*, const char*, const char*); - void startTimeKeepDemoMarioPuppetable(NameObj*, const char*, const char*); - bool isDemoExist(const char*); - bool isDemoActive(); - bool isDemoActive(const char*); - bool canStartDemo(); - bool isTimeKeepDemoActive(); - bool isDemoActiveRegistered(const LiveActor*); - bool isDemoPartExist(const LiveActor*, const char*); - bool isDemoLastStep(); - bool isDemoPartActive(const char*); - bool isDemoPartStep(const char*, s32); - bool isDemoPartFirstStep(const char*); - bool isDemoPartLastStep(const char*); - bool isDemoPartLessEqualStep(const char*, s32); - bool isDemoPartGreaterStep(const char*, s32); - s32 getDemoPartTotalStep(const char*); - f32 calcDemoPartStepRate(const char*); - s32 getDemoPartStep(const char*); - void pauseTimeKeepDemo(LiveActor*); - void resumeTimeKeepDemo(LiveActor*); - bool isPowerStarGetDemoActive(); + bool tryRegisterDemoCast(LiveActor*, const JMapInfoIter&); + void registerDemoActionFunctor(const LiveActor*, const MR::FunctorBase&, const char*); + void registerDemoActionNerve(const LiveActor*, const Nerve*, const char*); + bool tryRegisterDemoActionFunctor(const LiveActor*, const MR::FunctorBase&, const char*); + bool tryRegisterDemoActionNerve(const LiveActor*, const Nerve*, const char*); + bool tryRegisterDemoCast(LiveActor*, const char*, const JMapInfoIter&); + void registerDemoCast(LiveActor*, const char*, const JMapInfoIter&); + void initTalkAnimDemoCast(LiveActor*, const JMapInfoIter&, const char*, const char*); + void registerDemoActionFunctorDirect(const LiveActor*, const MR::FunctorBase&, const char*, const char*); + bool tryRegisterDemoActionFunctorDirect(const LiveActor*, const MR::FunctorBase&, const char*, const char*); + bool tryStartDemoRegistered(LiveActor*, const char*); + bool tryStartDemoRegisteredMarioPuppetable(LiveActor*, const char*); + void registerDemoSimpleCastAll(LiveActor*); + void registerDemoSimpleCastAll(LayoutActor*); + void registerDemoSimpleCastAll(NameObj*); + bool isDemoCast(const LiveActor*, const char*); + bool isRegisteredDemoActionAppear(const LiveActor*); + bool isRegisteredDemoActionNerve(const LiveActor*); + bool tryStartDemo(LiveActor*, const char*); + bool tryStartDemo(LayoutActor*, const char*); + bool tryStartDemoWithoutCinemaFrame(LiveActor*, const char*); + bool tryStartDemoWithoutCinemaFrameValidStarPointer(LiveActor*, const char*); + bool tryStartDemoWithoutCinemaFrameValidHandPointerFinger(NameObj*, const char*); + bool tryStartDemoWithoutCinemaFrameValidHandPointerFinger(LayoutActor*, const char*); + bool tryStartDemoMarioPuppetable(LiveActor*, const char*); + bool tryStartDemoMarioPuppetableWithoutCinemaFrame(LiveActor*, const char*); + bool tryStartTimeKeepDemo(NameObj*, const char*, const char*); + bool tryStartTimeKeepDemoMarioPuppetable(NameObj*, const char*, const char*); + bool tryStartTimeKeepDemoMarioPuppetable(LiveActor*, const char*, const char*); + bool requestStartDemo(LiveActor*, const char*, const Nerve*, const Nerve*); + bool requestStartDemoWithoutCinemaFrame(LiveActor*, const char*, const Nerve*, const Nerve*); + bool requestStartDemoWithoutCinemaFrame(LayoutActor*, const char*, const Nerve*, const Nerve*); + bool requestStartDemoMarioPuppetable(LiveActor*, const char*, const Nerve*, const Nerve*); + bool requestStartDemoMarioPuppetable(NerveExecutor*, LiveActor*, const char*, const Nerve*, const Nerve*); + bool requestStartDemoMarioPuppetableWithoutCinemaFrame(LiveActor*, const char*, const Nerve*, const Nerve*); + bool requestStartTimeKeepDemo(LiveActor*, const char*, const Nerve*, const Nerve*, const char*); + bool requestStartTimeKeepDemo(NameObj*, const char*, const char*); + bool requestStartTimeKeepDemoMarioPuppetable(LiveActor*, const char*, const Nerve*, const Nerve*, const char*); + bool requestStartTimeKeepDemoMarioPuppetable(NerveExecutor*, LiveActor*, const char*, const Nerve*, const Nerve*, const char*); + bool requestStartTimeKeepDemoMarioPuppetable(NameObj*, const char*, const char*); + bool requestStartTimeKeepDemoWithoutCinemaFrame(LiveActor*, const char*, const Nerve*, const Nerve*, const char*); + bool requestStartDemoRegistered(LiveActor*, const Nerve*, const Nerve*, const char*); + bool requestStartDemoRegisteredMarioPuppetable(LiveActor*, const Nerve*, const Nerve*, const char*); + void endDemo(NameObj*, const char*); + void endDemoWaitCameraInterpolating(NameObj*, const char*); + void initDemoSheetTalkAnim(LiveActor*, const JMapInfoIter&, const char*, const char*, TalkMessageCtrl*); + void initDemoSheetTalkAnimWithMessageName(LiveActor*, const JMapInfoIter&, const char*, const char*, const char*); + void initDemoSheetTalkAnimFunctor(LiveActor*, const JMapInfoIter&, const char*, const char*, TalkMessageCtrl*, const MR::FunctorBase&); + bool tryInitDemoSheetTalkAnim(LiveActor*, const JMapInfoIter&, const char*, const char*, TalkMessageCtrl*); + void startTimeKeepDemo(NameObj*, const char*, const char*); + void startTimeKeepDemoMarioPuppetable(NameObj*, const char*, const char*); + bool isDemoExist(const char*); + bool isDemoActive(); + bool isDemoActive(const char*); + bool canStartDemo(); + bool isTimeKeepDemoActive(); + bool isDemoActiveRegistered(const LiveActor*); + bool isDemoPartExist(const LiveActor*, const char*); + bool isDemoLastStep(); + bool isDemoPartActive(const char*); + bool isDemoPartStep(const char*, s32); + bool isDemoPartFirstStep(const char*); + bool isDemoPartLastStep(const char*); + bool isDemoPartLessEqualStep(const char*, s32); + bool isDemoPartGreaterStep(const char*, s32); + s32 getDemoPartTotalStep(const char*); + f32 calcDemoPartStepRate(const char*); + s32 getDemoPartStep(const char*); + void pauseTimeKeepDemo(LiveActor*); + void resumeTimeKeepDemo(LiveActor*); + bool isPowerStarGetDemoActive(); const char* getCurrentDemoPartNameMain(const char*); - void startTalkingSequenceWithoutCinemaFrame(NameObj*); - void endTalkingSequence(NameObj*); - bool isSystemTalking(); - bool isNormalTalking(); - LiveActor* getTalkingActor(); - bool isDemoPartTalk(const char*); - void startTalkingSequence(NameObj*); -}; + void startTalkingSequenceWithoutCinemaFrame(NameObj*); + void endTalkingSequence(NameObj*); + bool isSystemTalking(); + bool isNormalTalking(); + LiveActor* getTalkingActor(); + bool isDemoPartTalk(const char*); + void startTalkingSequence(NameObj*); +}; // namespace MR diff --git a/include/Game/Util/DirectDraw.hpp b/include/Game/Util/DirectDraw.hpp index b0a77206d..57bf9bc5f 100644 --- a/include/Game/Util/DirectDraw.hpp +++ b/include/Game/Util/DirectDraw.hpp @@ -4,19 +4,19 @@ class TDDraw { public: - static void sendPoint(const TVec3f &); + static void sendPoint(const TVec3f&); static void setup(u32, u32, u8); static void drawLine(const TVec3f&, const TVec3f&, u32); - static void drawCircle(const TVec3f &, const TVec3f &, f32, u32, u32); + static void drawCircle(const TVec3f&, const TVec3f&, f32, u32, u32); - static void drawSphere(const TVec3f &, f32, u32, u32); + static void drawSphere(const TVec3f&, f32, u32, u32); - static void drawCylinder(const TVec3f &, const TVec3f &, f32, u32, u32, u32); + static void drawCylinder(const TVec3f&, const TVec3f&, f32, u32, u32, u32); - static void drawFillFan(const TVec3f &, const TVec3f &, const TVec3f &, u32, f32, f32, u32); + static void drawFillFan(const TVec3f&, const TVec3f&, const TVec3f&, u32, f32, f32, u32); static void cameraInit3D(); }; diff --git a/include/Game/Util/DrawUtil.hpp b/include/Game/Util/DrawUtil.hpp index 696c1a648..0c25e620e 100644 --- a/include/Game/Util/DrawUtil.hpp +++ b/include/Game/Util/DrawUtil.hpp @@ -14,40 +14,39 @@ public: J2DOrthoGraphSimple(); ~J2DOrthoGraphSimple() { - } - + void setPort(); }; namespace MR { - void drawInit(); - void reinitGX(); - void resetTextureCacheSize(); - void loadViewMtxFor2DModel(); - void drawInitFor2DModel(); - void setDefaultViewportAndScissor(); - void loadProjectionMtxFor2D(); - void setupDrawForNW4RLayout(f32, bool); - void clearZBuffer(); - void clearAlphaBuffer(u8); - void clearAlphaBuffer(u8, const TVec2f &, const TVec2f &); - void fillScreenSetup(const GXColor &); - void fillScreenArea(const TVec2s &, const TVec2s &); - void fillScreen(const GXColor &); - void setupShadowVolumeDraw(); - void drawSimpleModel(J3DModelData*); - void fillSilhouetteColor(); + void drawInit(); + void reinitGX(); + void resetTextureCacheSize(); + void loadViewMtxFor2DModel(); + void drawInitFor2DModel(); + void setDefaultViewportAndScissor(); + void loadProjectionMtxFor2D(); + void setupDrawForNW4RLayout(f32, bool); + void clearZBuffer(); + void clearAlphaBuffer(u8); + void clearAlphaBuffer(u8, const TVec2f&, const TVec2f&); + void fillScreenSetup(const GXColor&); + void fillScreenArea(const TVec2s&, const TVec2s&); + void fillScreen(const GXColor&); + void setupShadowVolumeDraw(); + void drawSimpleModel(J3DModelData*); + void fillSilhouetteColor(); const JUTTexture* getMarioShadowTex(); const JUTTexture* getMarioShadowTexForLoad(); - const TVec3f& getMarioShadowVec(); - void setMarioShadowTex(const JUTTexture *); - void setMarioShadowVec(const TVec3f &); - void loadTexProjectionMtx(u32); - void nonFilteredCapture(JUTTexture *, s16, s16); - void simpleDraw(J3DModel *, J3DMaterial *); - void activateGameSceneDraw3D(); - void deactivateGameSceneDraw3D(); -}; // namespace MR + const TVec3f& getMarioShadowVec(); + void setMarioShadowTex(const JUTTexture*); + void setMarioShadowVec(const TVec3f&); + void loadTexProjectionMtx(u32); + void nonFilteredCapture(JUTTexture*, s16, s16); + void simpleDraw(J3DModel*, J3DMaterial*); + void activateGameSceneDraw3D(); + void deactivateGameSceneDraw3D(); +}; // namespace MR static GXTexCacheSize sReinitTextureCacheSize; diff --git a/include/Game/Util/EffectUtil.hpp b/include/Game/Util/EffectUtil.hpp index 15d56cc31..b7e24fda5 100644 --- a/include/Game/Util/EffectUtil.hpp +++ b/include/Game/Util/EffectUtil.hpp @@ -12,46 +12,46 @@ class MultiEmitterParticleCallBack; class Triangle; namespace MR { - void requestEffectStopSceneStart(); - void requestEffectStopSceneEnd(); - void addEffect(LiveActor*, const char*); + void requestEffectStopSceneStart(); + void requestEffectStopSceneEnd(); + void addEffect(LiveActor*, const char*); MultiEmitter* getEffect(const LiveActor*, const char*); MultiEmitter* getEffect(const LayoutActor*, const char*); - bool isExistEffectKeeper(const LiveActor*); - bool isExistEffectKeeper(const LayoutActor*); + bool isExistEffectKeeper(const LiveActor*); + bool isExistEffectKeeper(const LayoutActor*); MultiEmitter* emitEffect(LiveActor*, const char*); MultiEmitter* emitEffectWithScale(LiveActor*, const char*, f32, s32); MultiEmitter* emitEffectWithEmitterCallBack(LiveActor*, const char*, MultiEmitterCallBackBase*); MultiEmitter* emitEffectWithParticleCallBack(LiveActor*, const char*, MultiEmitterParticleCallBack*); MultiEmitter* tryEmitEffect(LiveActor*, const char*); - bool tryDeleteEffect(LiveActor*, const char*); - void deleteEffect(LiveActor*, const char*); - void forceDeleteEffect(LiveActor*, const char*); - void deleteEffectAll(LiveActor*); - void forceDeleteEffectAll(LiveActor*); - bool isRegisteredEffect(const LiveActor*, const char*); - bool isEffectValid(const LiveActor*, const char*); - void onDrawEffect(LiveActor*); - void offDrawEffect(LiveActor*); - void pauseOffEffectAll(LiveActor*); - void onEmitEffectSyncClipping(LiveActor*, const char*); - void onForceDeleteEffectSyncClipping(LiveActor*, const char*); - void setEffectName(LiveActor*, const char*, const char*); - void setEffectHostSRT(LiveActor*, const char*, const TVec3f*, const TVec3f*, const TVec3f*); - void setEffectHostMtx(LiveActor*, const char*, MtxPtr); - void setEffectBaseScale(LiveActor*, const char*, f32); - void setEffectLocalScale(LiveActor*, const char*, const TVec3f&); - void setEffectColor(LiveActor*, const char*, u8, u8, u8, u8, u8, u8); - void setEffectPrmColor(LiveActor*, const char*, u8, u8, u8); - void setEffectEnvColor(LiveActor*, const char*, u8, u8, u8); - void emitEffectHit(LiveActor*, const TVec3f&, const char*); - void emitEffectHit(LiveActor*, const TVec3f&, const TVec3f&, const char*); - void emitEffectHit(LiveActor*, MtxPtr, const char*); - void emitEffectHitBetweenSensors(LiveActor*, const HitSensor*, const HitSensor*, f32, const char*); - void initEffectAfterPlacement(LiveActor*); - void updateEffectFloorCode(LiveActor*, const Triangle*); - void updateEffectFloorCodeLineToMap(LiveActor*, const TVec3f&, const TVec3f&); - void updateEffectFloorCodeLineToMap(LiveActor*, f32, f32); - void initEffectSyncBck(LiveActor*, const char*, const char* const*); - void addEffectHitNormal(LiveActor*, const char*); -}; + bool tryDeleteEffect(LiveActor*, const char*); + void deleteEffect(LiveActor*, const char*); + void forceDeleteEffect(LiveActor*, const char*); + void deleteEffectAll(LiveActor*); + void forceDeleteEffectAll(LiveActor*); + bool isRegisteredEffect(const LiveActor*, const char*); + bool isEffectValid(const LiveActor*, const char*); + void onDrawEffect(LiveActor*); + void offDrawEffect(LiveActor*); + void pauseOffEffectAll(LiveActor*); + void onEmitEffectSyncClipping(LiveActor*, const char*); + void onForceDeleteEffectSyncClipping(LiveActor*, const char*); + void setEffectName(LiveActor*, const char*, const char*); + void setEffectHostSRT(LiveActor*, const char*, const TVec3f*, const TVec3f*, const TVec3f*); + void setEffectHostMtx(LiveActor*, const char*, MtxPtr); + void setEffectBaseScale(LiveActor*, const char*, f32); + void setEffectLocalScale(LiveActor*, const char*, const TVec3f&); + void setEffectColor(LiveActor*, const char*, u8, u8, u8, u8, u8, u8); + void setEffectPrmColor(LiveActor*, const char*, u8, u8, u8); + void setEffectEnvColor(LiveActor*, const char*, u8, u8, u8); + void emitEffectHit(LiveActor*, const TVec3f&, const char*); + void emitEffectHit(LiveActor*, const TVec3f&, const TVec3f&, const char*); + void emitEffectHit(LiveActor*, MtxPtr, const char*); + void emitEffectHitBetweenSensors(LiveActor*, const HitSensor*, const HitSensor*, f32, const char*); + void initEffectAfterPlacement(LiveActor*); + void updateEffectFloorCode(LiveActor*, const Triangle*); + void updateEffectFloorCodeLineToMap(LiveActor*, const TVec3f&, const TVec3f&); + void updateEffectFloorCodeLineToMap(LiveActor*, f32, f32); + void initEffectSyncBck(LiveActor*, const char*, const char* const*); + void addEffectHitNormal(LiveActor*, const char*); +}; // namespace MR diff --git a/include/Game/Util/EventUtil.hpp b/include/Game/Util/EventUtil.hpp index 4c8d706b0..52f1b927d 100644 --- a/include/Game/Util/EventUtil.hpp +++ b/include/Game/Util/EventUtil.hpp @@ -7,183 +7,183 @@ class LiveActor; class NameObj; namespace MR { - s32 getPlayerLeft(); - void incPlayerLeft(); - void decPlayerLeft(); - bool isLuigiLeftSupply(); - void incPlayerGameOverNum(); - bool isAnyPlayerLeftSupply(); - void offAllPlayerLeftSupply(); - s32 getStarPieceNum(); - void addStarPiece(int); - s32 getStockedStarPieceNum(); - void addStockedStarPiece(int); - bool isPlayerLuigi(); - void explainEnableToSpin(LiveActor*); - void onGameEventFlagBeeMarioAtFirst(); - void onGameEventFlagTeresaMarioAtFirst(); - void onGameEventFlagHopperMarioAtFirst(); - void onGameEventFlagFireMarioAtFirst(); - void onGameEventFlagIceMarioAtFirst(); - void onGameEventFlagFlyingMarioAtFirst(); - void onGameEventFlagInvincibleMarioAtFirst(); - void onGameEventFlagLifeUpAtFirst(); - void onGameEventFlagOneUpAtFirst(); - bool isOnGameEventFlagPlayMoviePrologueA(); - bool isOnGameEventFlagEndTicoGuideDemo(); - bool isOnGameEventFlagEndButlerDomeLecture(); - bool isOnGameEventFlagEndButlerGalaxyMoveLecture(); - bool isOnGameEventFlagEndButlerStarPieceLecture(); - bool isOnGameEventFlagBeeMarioAtFirst(); - bool isOnGameEventFlagTeresaMarioAtFirst(); - bool isOnGameEventFlagHopperMarioAtFirst(); - bool isOnGameEventFlagFireMarioAtFirst(); - bool isOnGameEventFlagIceMarioAtFirst(); - bool isOnGameEventFlagFlyingMarioAtFirst(); - bool isOnGameEventFlagSurfingTutorialAtFirst(); - bool isOnGameEventFlagTamakoroTutorialAtFirst(); - bool isOnGameEventFlagViewCompleteEnding(); - bool isOnGameEventFlagViewCompleteEndingMarioAndLuigi(); - bool isOnGameEventFlagOffAstroDomeGuidance(); - bool isOnGameEventFlagChildsRoom(); - bool isOnGameEventFlagLibraryRoom(); - bool isOnGameEventFlagRosettaTalkAboutTicoInTower(); - bool isRosettaTalkTorchProgress(); - bool isRosettaTalkCountDownStart(); - bool isRosettaTalkAstroDomeRecover(); - bool isRosettaTalkKoopa(); - bool isRosettaTalkTorchLecture(); - bool isKinopioExplorerCompleteTrickComet(); - bool isKinopioExplorerTalkGoFinalBattle(); - bool isKinopioExplorerTalkGetGrandStar6(); - bool isKinopioExplorerTalkGetGrandStar5(); - bool isKinopioExplorerTalkGetGrandStar4(); - bool isKinopioExplorerTalkGetGrandStar3(); - bool isKinopioExplorerTrickComet(); - bool isKinopioExplorerTalkGetGrandStar2(); - bool isUFOKinokoBeforeConstruction(); - bool isUFOKinokoUnderConstruction(); - bool isButlerMapAppear(); - s32 setupAlreadyDoneFlag(const char*, const JMapInfoIter&, u32*); - void updateAlreadyDoneFlag(int, u32); - bool isOnGameEventFlagGalaxyOpen(const char*); - bool isAlreadyVisitedCurrentStageAndScenario(); - bool isAlreadyVisitedStage(const char*); - bool canOpenGalaxy(const char*); - bool isAppearGalaxy(const char*); - bool isGalaxyAppearGreenDriver(const char*); - void onGameEventFlagGalaxyOpen(const char*); - bool hasPowerStarInCurrentStage(s32); - bool isPowerStarGreenInCurrentStage(s32); - bool isPowerStarRedInCurrentStage(s32); - bool isGrandStarInCurrentStage(s32); - bool hasPowerStarInCurrentStageWithDeclarer(const char*, s32); - bool isPowerStarGreenInCurrentStageWithDeclarer(const char*, s32); - bool isPowerStarRedInCurrentStageWithDeclarer(const char*, s32); - bool isGrandStarInCurrentStageWithDeclarer(const char*, s32); - bool hasPowerStarAtResultSequence(); - bool isPowerStarGreenAtResultSequence(); - bool isPowerStarRedAtResultSequence(); - void sendStageResultSequenceParam(s32); - bool isOnGameEventFlagPowerStarSuccess(const char*, s32); - bool hasGrandStar(int); - s32 calcOpenedAstroDomeNum(); - s32 calcCurrentGreenStarNum(); - s32 getPowerStarNumToOpenGalaxy(const char*); - s32 getPowerStarNumSucceed(const char*); - bool isPowerStarGreen(const char*, s32); - s32 getPictureBookChapterCanRead(); - s32 getPictureBookChapterAlreadyRead(); - void setPictureBookChapterAlreadyRead(int); - void setRaceBestTime(int, u32); - u32 getRaceBestTime(int); - u32 getRaceCurrentTime(); - void setWarpPodPathFlag(int, bool); - s32 registerStorageSpinDriverPathDrawRange(const NameObj*, const JMapInfoIter&, int, f32*); - void updateStorageSpinDriverPathDrawRange(int, f32); - s32 getStarPieceNumGivingToTicoSeed(int); - void addStarPieceGivingToTicoSeed(int, int); - s32 getStarPieceNumGivingToTicoGalaxy(int); - s32 getStarPieceNumMaxGivingToTicoGalaxy(int); - void addStarPieceGivingToTicoGalaxy(int, int); - void setTicoGalaxyAlreadyTalk(int, bool); - bool isGalaxyAnyCometAppearInCurrentStage(); - void startGalaxyCometEvent(); - void endGalaxyCometEvent(); - s32 getGalaxyCometStateIndexInCurrentStage(); - void forceToNextStateGalaxyCometScheduler(); - bool isGalaxyCometLandInStage(const char*); - s32 getEncounterGalaxyCometPowerStarId(const char*); - bool isGalaxyPurpleCometLaunch(); - bool canAppearNormalComet(const char*); - bool canAppearCoin100Comet(const char*); - int getEncounterGalaxyCometNameId(const char*); - int getCometNameIdFromString(const char*); + s32 getPlayerLeft(); + void incPlayerLeft(); + void decPlayerLeft(); + bool isLuigiLeftSupply(); + void incPlayerGameOverNum(); + bool isAnyPlayerLeftSupply(); + void offAllPlayerLeftSupply(); + s32 getStarPieceNum(); + void addStarPiece(int); + s32 getStockedStarPieceNum(); + void addStockedStarPiece(int); + bool isPlayerLuigi(); + void explainEnableToSpin(LiveActor*); + void onGameEventFlagBeeMarioAtFirst(); + void onGameEventFlagTeresaMarioAtFirst(); + void onGameEventFlagHopperMarioAtFirst(); + void onGameEventFlagFireMarioAtFirst(); + void onGameEventFlagIceMarioAtFirst(); + void onGameEventFlagFlyingMarioAtFirst(); + void onGameEventFlagInvincibleMarioAtFirst(); + void onGameEventFlagLifeUpAtFirst(); + void onGameEventFlagOneUpAtFirst(); + bool isOnGameEventFlagPlayMoviePrologueA(); + bool isOnGameEventFlagEndTicoGuideDemo(); + bool isOnGameEventFlagEndButlerDomeLecture(); + bool isOnGameEventFlagEndButlerGalaxyMoveLecture(); + bool isOnGameEventFlagEndButlerStarPieceLecture(); + bool isOnGameEventFlagBeeMarioAtFirst(); + bool isOnGameEventFlagTeresaMarioAtFirst(); + bool isOnGameEventFlagHopperMarioAtFirst(); + bool isOnGameEventFlagFireMarioAtFirst(); + bool isOnGameEventFlagIceMarioAtFirst(); + bool isOnGameEventFlagFlyingMarioAtFirst(); + bool isOnGameEventFlagSurfingTutorialAtFirst(); + bool isOnGameEventFlagTamakoroTutorialAtFirst(); + bool isOnGameEventFlagViewCompleteEnding(); + bool isOnGameEventFlagViewCompleteEndingMarioAndLuigi(); + bool isOnGameEventFlagOffAstroDomeGuidance(); + bool isOnGameEventFlagChildsRoom(); + bool isOnGameEventFlagLibraryRoom(); + bool isOnGameEventFlagRosettaTalkAboutTicoInTower(); + bool isRosettaTalkTorchProgress(); + bool isRosettaTalkCountDownStart(); + bool isRosettaTalkAstroDomeRecover(); + bool isRosettaTalkKoopa(); + bool isRosettaTalkTorchLecture(); + bool isKinopioExplorerCompleteTrickComet(); + bool isKinopioExplorerTalkGoFinalBattle(); + bool isKinopioExplorerTalkGetGrandStar6(); + bool isKinopioExplorerTalkGetGrandStar5(); + bool isKinopioExplorerTalkGetGrandStar4(); + bool isKinopioExplorerTalkGetGrandStar3(); + bool isKinopioExplorerTrickComet(); + bool isKinopioExplorerTalkGetGrandStar2(); + bool isUFOKinokoBeforeConstruction(); + bool isUFOKinokoUnderConstruction(); + bool isButlerMapAppear(); + s32 setupAlreadyDoneFlag(const char*, const JMapInfoIter&, u32*); + void updateAlreadyDoneFlag(int, u32); + bool isOnGameEventFlagGalaxyOpen(const char*); + bool isAlreadyVisitedCurrentStageAndScenario(); + bool isAlreadyVisitedStage(const char*); + bool canOpenGalaxy(const char*); + bool isAppearGalaxy(const char*); + bool isGalaxyAppearGreenDriver(const char*); + void onGameEventFlagGalaxyOpen(const char*); + bool hasPowerStarInCurrentStage(s32); + bool isPowerStarGreenInCurrentStage(s32); + bool isPowerStarRedInCurrentStage(s32); + bool isGrandStarInCurrentStage(s32); + bool hasPowerStarInCurrentStageWithDeclarer(const char*, s32); + bool isPowerStarGreenInCurrentStageWithDeclarer(const char*, s32); + bool isPowerStarRedInCurrentStageWithDeclarer(const char*, s32); + bool isGrandStarInCurrentStageWithDeclarer(const char*, s32); + bool hasPowerStarAtResultSequence(); + bool isPowerStarGreenAtResultSequence(); + bool isPowerStarRedAtResultSequence(); + void sendStageResultSequenceParam(s32); + bool isOnGameEventFlagPowerStarSuccess(const char*, s32); + bool hasGrandStar(int); + s32 calcOpenedAstroDomeNum(); + s32 calcCurrentGreenStarNum(); + s32 getPowerStarNumToOpenGalaxy(const char*); + s32 getPowerStarNumSucceed(const char*); + bool isPowerStarGreen(const char*, s32); + s32 getPictureBookChapterCanRead(); + s32 getPictureBookChapterAlreadyRead(); + void setPictureBookChapterAlreadyRead(int); + void setRaceBestTime(int, u32); + u32 getRaceBestTime(int); + u32 getRaceCurrentTime(); + void setWarpPodPathFlag(int, bool); + s32 registerStorageSpinDriverPathDrawRange(const NameObj*, const JMapInfoIter&, int, f32*); + void updateStorageSpinDriverPathDrawRange(int, f32); + s32 getStarPieceNumGivingToTicoSeed(int); + void addStarPieceGivingToTicoSeed(int, int); + s32 getStarPieceNumGivingToTicoGalaxy(int); + s32 getStarPieceNumMaxGivingToTicoGalaxy(int); + void addStarPieceGivingToTicoGalaxy(int, int); + void setTicoGalaxyAlreadyTalk(int, bool); + bool isGalaxyAnyCometAppearInCurrentStage(); + void startGalaxyCometEvent(); + void endGalaxyCometEvent(); + s32 getGalaxyCometStateIndexInCurrentStage(); + void forceToNextStateGalaxyCometScheduler(); + bool isGalaxyCometLandInStage(const char*); + s32 getEncounterGalaxyCometPowerStarId(const char*); + bool isGalaxyPurpleCometLaunch(); + bool canAppearNormalComet(const char*); + bool canAppearCoin100Comet(const char*); + int getEncounterGalaxyCometNameId(const char*); + int getCometNameIdFromString(const char*); const char* getCometNameFromId(int); - bool isStarComplete(const char*); - bool isStarCompleteNormalScenario(const char*); - s32 getCoinBestScore(const char*, s32); - s32 getCoinBestScore(const char*); - bool isPlacedCoin(const char*, s32); - bool isActiveLuigiHideAndSeekEvent(); - bool isEndLuigiHideAndSeekEvent(); - bool isLuigiDisappearFromAstroGalaxy(); - bool isOnGameEventFlagLuigiRescued(); - void onGameEventFlagTalkedToLuigiAfterRescued(); - void onGameEventFlagGetLuigiLetter(); - bool isOnLuigiHiding(); - bool isOnLuigiHidingCurrentStage(); - bool isLuigiDisappearFromAstroGalaxyOrHiding(); - bool isLuigiLetterArrivalAtMessenger(); - bool isLuigiHidingGalaxyAndScenario(const char*, s32); - bool isPowerStarGetDemoWithLuigiCurrentGalaxy(); - bool isPowerStarGetDemoWithLuigiCurrentGalaxyAndScenario(s32); + bool isStarComplete(const char*); + bool isStarCompleteNormalScenario(const char*); + s32 getCoinBestScore(const char*, s32); + s32 getCoinBestScore(const char*); + bool isPlacedCoin(const char*, s32); + bool isActiveLuigiHideAndSeekEvent(); + bool isEndLuigiHideAndSeekEvent(); + bool isLuigiDisappearFromAstroGalaxy(); + bool isOnGameEventFlagLuigiRescued(); + void onGameEventFlagTalkedToLuigiAfterRescued(); + void onGameEventFlagGetLuigiLetter(); + bool isOnLuigiHiding(); + bool isOnLuigiHidingCurrentStage(); + bool isLuigiDisappearFromAstroGalaxyOrHiding(); + bool isLuigiLetterArrivalAtMessenger(); + bool isLuigiHidingGalaxyAndScenario(const char*, s32); + bool isPowerStarGetDemoWithLuigiCurrentGalaxy(); + bool isPowerStarGetDemoWithLuigiCurrentGalaxyAndScenario(s32); const char* getLuigiLetterGalaxyName(); const char* getLuigiLetterGalaxyNameForNPC(); - void onMessageAlreadyRead(s8); - void offMsgLedPattern(); - bool isMsgLedPattern(); - void explainBeeMarioIfAtFirst(); - void explainTeresaMarioIfAtFirst(); - void explainHopperMarioIfAtFirst(); - void explainFireMarioIfAtFirst(); - void explainIceMarioIfAtFirst(); - void explainFlyingMarioIfAtFirst(); - void explainInvincibleMarioIfAtFirst(); - void explainLifeUpIfAtFirst(); - void explainOneUpIfAtFirst(); - void onGameEventFlagPlayMoviePrologueA(); - void onGameEventFlagPlayMoviePrologueB(); - void onGameEventFlagEndTicoGuideDemo(); - void onGameEventFlagEnableToSpinAndStarPointer(); - void onGameEventFlagEndButlerDomeLecture(); - void onGameEventFlagEndButlerGalaxyMoveLecture(); - void onGameEventFlagEndButlerStarPieceLecture(); - void onGameEventFlagSurfingTutorialAtFirst(); - void onGameEventFlagTamakoroTutorialAtFirst(); - void onGameEventFlagRosettaTalkAboutTicoInTower(); - void onGameEventFlagViewNormalEnding(); - void onGameEventFlagViewCompleteEnding(); - bool isOnGameEventFlagUseAstroDome(); - bool isOnGameEventFlagGreenDriver(); - bool isOnGameEventFlagRedDriver(); - bool isOnGameEventFlagViewNormalEnding(); - bool isRosettaTalkTrickComet(); - bool isKinopioExplorerStartMessenger(); - bool isKinopioExplorerOrganize(); - bool isKinopioExplorerRescued(); - s32 getPowerStarLeftToDisplayCountDownPlate(); - bool isOnWarpPodPathFlag(int); - bool isOnTicoGalaxyAlreadyTalk(int); - bool isKoopaFortressAppearInGalaxy(); - bool isGalaxyRedCometAppearInCurrentStage(); - bool isGalaxyDarkCometAppearInCurrentStage(); - bool isGalaxyGhostCometAppearInCurrentStage(); - bool isGalaxyQuickCometAppearInCurrentStage(); - bool isGalaxyBlackCometAppearInCurrentStage(); - bool isStarCompleteAllGalaxy(); - bool isStarPieceCounterStop(); - bool isOnGameEventFlagAstroGalaxyBgmBright(); - bool isOnMessageAlreadyRead(s8); - void onMsgLedPattern(); -}; + void onMessageAlreadyRead(s8); + void offMsgLedPattern(); + bool isMsgLedPattern(); + void explainBeeMarioIfAtFirst(); + void explainTeresaMarioIfAtFirst(); + void explainHopperMarioIfAtFirst(); + void explainFireMarioIfAtFirst(); + void explainIceMarioIfAtFirst(); + void explainFlyingMarioIfAtFirst(); + void explainInvincibleMarioIfAtFirst(); + void explainLifeUpIfAtFirst(); + void explainOneUpIfAtFirst(); + void onGameEventFlagPlayMoviePrologueA(); + void onGameEventFlagPlayMoviePrologueB(); + void onGameEventFlagEndTicoGuideDemo(); + void onGameEventFlagEnableToSpinAndStarPointer(); + void onGameEventFlagEndButlerDomeLecture(); + void onGameEventFlagEndButlerGalaxyMoveLecture(); + void onGameEventFlagEndButlerStarPieceLecture(); + void onGameEventFlagSurfingTutorialAtFirst(); + void onGameEventFlagTamakoroTutorialAtFirst(); + void onGameEventFlagRosettaTalkAboutTicoInTower(); + void onGameEventFlagViewNormalEnding(); + void onGameEventFlagViewCompleteEnding(); + bool isOnGameEventFlagUseAstroDome(); + bool isOnGameEventFlagGreenDriver(); + bool isOnGameEventFlagRedDriver(); + bool isOnGameEventFlagViewNormalEnding(); + bool isRosettaTalkTrickComet(); + bool isKinopioExplorerStartMessenger(); + bool isKinopioExplorerOrganize(); + bool isKinopioExplorerRescued(); + s32 getPowerStarLeftToDisplayCountDownPlate(); + bool isOnWarpPodPathFlag(int); + bool isOnTicoGalaxyAlreadyTalk(int); + bool isKoopaFortressAppearInGalaxy(); + bool isGalaxyRedCometAppearInCurrentStage(); + bool isGalaxyDarkCometAppearInCurrentStage(); + bool isGalaxyGhostCometAppearInCurrentStage(); + bool isGalaxyQuickCometAppearInCurrentStage(); + bool isGalaxyBlackCometAppearInCurrentStage(); + bool isStarCompleteAllGalaxy(); + bool isStarPieceCounterStop(); + bool isOnGameEventFlagAstroGalaxyBgmBright(); + bool isOnMessageAlreadyRead(s8); + void onMsgLedPattern(); +}; // namespace MR diff --git a/include/Game/Util/FileUtil.hpp b/include/Game/Util/FileUtil.hpp index 256473456..98a20b3c1 100644 --- a/include/Game/Util/FileUtil.hpp +++ b/include/Game/Util/FileUtil.hpp @@ -8,176 +8,152 @@ class JKRArchive; class JKRHeap; -namespace MR { - +namespace MR { + /// @brief Checks whether a file exists. /// @param pFile Path to the file. /// @param considerLanguage Whether to consider language prefix. /// @return true if file exists, false otherwise. - bool isFileExist(const char *pFile, bool considerLanguage) NO_INLINE; + bool isFileExist(const char* pFile, bool considerLanguage) NO_INLINE; - /// @brief Gets the size of a file. /// @param pFile Path to the file. /// @param considerLanguage Whether to consider language prefix. /// @return Size of the file in bytes. - u32 getFileSize(const char *pFile, bool considerLanguage); + u32 getFileSize(const char* pFile, bool considerLanguage); - /// @brief Converts a file path to its DVD entry number, considering the language prefix. /// @param pFile Path to the file. /// @return The DVD entry number, or -1 if not found. - s32 convertPathToEntrynumConsideringLanguage(const char *pFile); + s32 convertPathToEntrynumConsideringLanguage(const char* pFile); - /// @brief Loads a file to main RAM synchronously. /// @param pFile Path to the file. /// @param pData Target memory address, or nullptr to allocate. /// @param pHeap Memory heap to use. /// @param allocDir Allocation direction. /// @return Pointer to the loaded data. - void* loadToMainRAM(const char *pFile, u8 *pData, JKRHeap *pHeap, JKRDvdRipper::EAllocDirection allocDir); + void* loadToMainRAM(const char* pFile, u8* pData, JKRHeap* pHeap, JKRDvdRipper::EAllocDirection allocDir); - /// @brief Requests asynchronous file load to main RAM. /// @param pFile Path to the file. /// @param pData Target memory address, or nullptr to allocate. /// @param pHeap Memory heap to use. /// @param allocDir Allocation direction. - void loadAsyncToMainRAM(const char *pFile, u8 *pData, JKRHeap *pHeap, JKRDvdRipper::EAllocDirection allocDir); + void loadAsyncToMainRAM(const char* pFile, u8* pData, JKRHeap* pHeap, JKRDvdRipper::EAllocDirection allocDir); - /// @brief Mounts an archive synchronously. /// @param pFile Path to the archive file. /// @param pHeap Memory heap to use. /// @return Pointer to the mounted archive. - void* mountArchive(const char *pFile, JKRHeap *pHeap); + void* mountArchive(const char* pFile, JKRHeap* pHeap); - /// @brief Requests asynchronous mounting of an archive. /// @param pFile Path to the archive file. /// @param pHeap Memory heap to use. - void mountAsyncArchive(const char *pFile, JKRHeap *pHeap); + void mountAsyncArchive(const char* pFile, JKRHeap* pHeap); - /// @brief Mounts an object or layout archive based on the provided file name. /// @param pFile Object or layout name. - /// @param pHeap Memory heap to use (optional). - void mountAsyncArchiveByObjectOrLayoutName(const char *pFile, JKRHeap *pHeap); + /// @param pHeap Memory heap to use (optional). + void mountAsyncArchiveByObjectOrLayoutName(const char* pFile, JKRHeap* pHeap); - /// @brief Receives a file after it has been asynchronously loaded. /// @param pFile Path to the file. /// @return Pointer to the loaded data. - void* receiveFile(const char *pFile); + void* receiveFile(const char* pFile); - /// @brief Receives an archive after it has been asynchronously mounted. /// @param pFile Path to the archive file. - /// @return Pointer to the mounted archive. - void* receiveArchive(const char *pFile); + /// @return Pointer to the mounted archive. + void* receiveArchive(const char* pFile); - /// @brief Receives all files that have been requested for loading. void receiveAllRequestedFile(); - /// @brief Creates and adds an archive from existing memory data. /// @param pData Pointer to the archive data. /// @param pHeap Heap to add the archive to. /// @param pFile File name for identification. - /// @return Pointer to the created archive. - void* createAndAddArchive(void *pData, JKRHeap *pHeap, const char *pFile); + /// @return Pointer to the created archive. + void* createAndAddArchive(void* pData, JKRHeap* pHeap, const char* pFile); - /// @brief Gets the mounted archive and heap for a given file. /// @param pFile Archive file path. /// @param pArchive Output pointer to archive. /// @param pHeap Output pointer to heap. - void getMountedArchiveAndHeap(const char *pFile, JKRArchive **pArchive, JKRHeap **pHeap); + void getMountedArchiveAndHeap(const char* pFile, JKRArchive** pArchive, JKRHeap** pHeap); - /// @brief Removes a file from memory, considering language prefix. /// @param pFile Path to the file. - void removeFileConsideringLanguage(const char *pFile); + void removeFileConsideringLanguage(const char* pFile); - /// @brief Removes resources and file holders from memory if they belong to the specified heap. /// @param heap The heap to check. void removeResourceAndFileHolderIfIsEqualHeap(JKRHeap* heap); - /// @brief Decompresses a file from an archive into RAM. /// @param archive Archive containing the file. /// @param filename File name within the archive. /// @param heap Heap to allocate memory from. /// @param align Alignment for the allocation. /// @return Pointer to the decompressed file data. - void* decompressFileFromArchive(JKRArchive *archive, const char *filename, JKRHeap *heap, int align); + void* decompressFileFromArchive(JKRArchive* archive, const char* filename, JKRHeap* heap, int align); - /// @brief Checks if a file is currently loaded. /// @param pFile File path. /// @return true if the file is loaded, false otherwise. - bool isLoadedFile(const char *pFile); + bool isLoadedFile(const char* pFile); - /// @brief Checks if an archive is currently mounted. /// @param pFile Archive path. /// @return true if the archive is mounted, false otherwise. - bool isMountedArchive(const char *pFile); + bool isMountedArchive(const char* pFile); - /// @brief Checks if an object or layout archive is loaded. /// @param pFile Object or layout name. /// @return true if loaded, false otherwise. - bool isLoadedObjectOrLayoutArchive(const char *pFile); + bool isLoadedObjectOrLayoutArchive(const char* pFile); - /// @brief Builds a language-aware file path. /// @param pName Output buffer for the file name. /// @param length Maximum length of the buffer. /// @param pFile Base file path. - void makeFileNameConsideringLanguage(char *pName, u32 length, const char *pFile); + void makeFileNameConsideringLanguage(char* pName, u32 length, const char* pFile); - /// @brief Constructs an object archive file name from the provided name. /// @param pName Output buffer for the archive name. /// @param length Buffer length. /// @param pFile Object name. /// @return true if a valid archive was found, false otherwise. - bool makeObjectArchiveFileName(char *pName, u32 length, const char *pFile); + bool makeObjectArchiveFileName(char* pName, u32 length, const char* pFile); - /// @brief Constructs an object archive file name using a prefix. /// @param pName Output buffer for the archive name. /// @param length Buffer length. /// @param pFile Object name. /// @param unused Unused flag. /// @return true if a valid archive was found, false otherwise. - bool makeObjectArchiveFileNameFromPrefix(char *pName, u32 length, const char *pFile, bool unused) NO_INLINE; + bool makeObjectArchiveFileNameFromPrefix(char* pName, u32 length, const char* pFile, bool unused) NO_INLINE; - /// @brief Constructs a layout archive file name from the provided name. /// @param pName Output buffer for the archive name. /// @param length Buffer length. /// @param pFile Layout name. /// @return true if a valid archive was found, false otherwise. - bool makeLayoutArchiveFileName(char *pName, u32 length, const char *pFile); + bool makeLayoutArchiveFileName(char* pName, u32 length, const char* pFile); - /// @brief Constructs a layout archive file name using a prefix, with optional fallback. /// @param pName Output buffer for the archive name. /// @param length Buffer length. /// @param pFile Layout name. /// @param fallback Whether to fall back if none found. /// @return true if a valid archive was found, false otherwise. - bool makeLayoutArchiveFileNameFromPrefix(char *pName, u32 length, const char *pFile, bool fallback); + bool makeLayoutArchiveFileNameFromPrefix(char* pName, u32 length, const char* pFile, bool fallback); - /// @brief Creates a scenario archive file name from the given stage name. /// @param pName Output buffer for the file name. /// @param length Buffer length. /// @param pFile Stage name. - void makeScenarioArchiveFileName(char *pName, u32 length, const char *pFile); -}; + void makeScenarioArchiveFileName(char* pName, u32 length, const char* pFile); +}; // namespace MR diff --git a/include/Game/Util/FixedPosition.hpp b/include/Game/Util/FixedPosition.hpp index 37a9eaa2c..59c66ecab 100644 --- a/include/Game/Util/FixedPosition.hpp +++ b/include/Game/Util/FixedPosition.hpp @@ -8,21 +8,21 @@ class LiveActor; class FixedPosition { public: - FixedPosition(const LiveActor *, const char *, const TVec3f &, const TVec3f &); - FixedPosition(const LiveActor *, const TVec3f &, const TVec3f &); - FixedPosition(MtxPtr, const TVec3f &, const TVec3f &); - FixedPosition(const LiveActor *, const char *, const LiveActor *); + FixedPosition(const LiveActor*, const char*, const TVec3f&, const TVec3f&); + FixedPosition(const LiveActor*, const TVec3f&, const TVec3f&); + FixedPosition(MtxPtr, const TVec3f&, const TVec3f&); + FixedPosition(const LiveActor*, const char*, const LiveActor*); - void init(MtxPtr, const TVec3f &, const TVec3f &); - void calc(); - void setBaseMtx(MtxPtr); - void setLocalTrans(const TVec3f &); - void copyTrans(TVec3f *) const; - void copyRotate(TVec3f *) const; + void init(MtxPtr, const TVec3f&, const TVec3f&); + void calc(); + void setBaseMtx(MtxPtr); + void setLocalTrans(const TVec3f&); + void copyTrans(TVec3f*) const; + void copyRotate(TVec3f*) const; - MtxPtr mBaseMtx; // 0x0 - TVec3f mLocalTrans; // 0x4 - TVec3f _10; - TPos3f _1C; - bool mNormalizeScale; // 0x4C + MtxPtr mBaseMtx; // 0x0 + TVec3f mLocalTrans; // 0x4 + TVec3f _10; + TPos3f _1C; + bool mNormalizeScale; // 0x4C }; \ No newline at end of file diff --git a/include/Game/Util/FootPrint.hpp b/include/Game/Util/FootPrint.hpp index 8809f3788..610a6992d 100644 --- a/include/Game/Util/FootPrint.hpp +++ b/include/Game/Util/FootPrint.hpp @@ -9,22 +9,22 @@ class FootPrintInfo; class FootPrint : public NameObj { public: - FootPrint(const char *, s32, s32); - void setTexture(ResTIMG *); + FootPrint(const char*, s32, s32); + void setTexture(ResTIMG*); void addPrint(const TVec3f&, const TVec3f&, const TVec3f&, bool); void clear(); - JUTTexture *_C; - FootPrintInfo *_10; - f32 _14; - f32 _18; - f32 _1C; - s32 _20; - u32 _24; - u32 _28; - f32 _2C; - f32 _30; - f32 _34; - f32 _38; - u8 _3C; + JUTTexture* _C; + FootPrintInfo* _10; + f32 _14; + f32 _18; + f32 _1C; + s32 _20; + u32 _24; + u32 _28; + f32 _2C; + f32 _30; + f32 _34; + f32 _38; + u8 _3C; }; diff --git a/include/Game/Util/Functor.hpp b/include/Game/Util/Functor.hpp index 759838f6a..683828c3f 100644 --- a/include/Game/Util/Functor.hpp +++ b/include/Game/Util/Functor.hpp @@ -7,27 +7,25 @@ class JKRHeap; namespace MR { class FunctorBase { public: - virtual void operator()() const = 0; - virtual FunctorBase* clone(JKRHeap *) const = 0; + virtual void operator()() const = 0; + virtual FunctorBase* clone(JKRHeap*) const = 0; }; - template + template class FunctorV0M : public FunctorBase { public: - - inline FunctorV0M(T call, U callee) + inline FunctorV0M(T call, U callee) : mCaller(call), mCallee(callee) { } inline FunctorV0M() { - } virtual void operator()() const { (mCaller->*mCallee)(); } - virtual FunctorBase* clone(JKRHeap *pHeap) const { + virtual FunctorBase* clone(JKRHeap* pHeap) const { return new (pHeap, 0) FunctorV0M(*this); }; @@ -35,7 +33,7 @@ namespace MR { U mCallee; }; - template + template class FunctorV1M : public FunctorBase { public: inline FunctorV1M(T call, U callee, V arg_0) { @@ -45,14 +43,13 @@ namespace MR { } inline FunctorV1M() { - } virtual void operator()() const { (mCaller->*mCallee)(mArg0); } - virtual FunctorBase* clone(JKRHeap *pHeap) const { + virtual FunctorBase* clone(JKRHeap* pHeap) const { return new (pHeap, 0x16) FunctorV1M(*this); }; @@ -61,7 +58,7 @@ namespace MR { V mArg0; }; - template + template class FunctorV2M : public FunctorBase { public: inline FunctorV2M(T call, U callee, V arg_0, W arg_1) { @@ -72,14 +69,13 @@ namespace MR { } inline FunctorV2M() { - } virtual void operator()() const { (mCaller->*mCallee)(mArg0, mArg1); } - virtual FunctorBase* clone(JKRHeap *pHeap) const { + virtual FunctorBase* clone(JKRHeap* pHeap) const { return new (pHeap, 0x16) FunctorV2M(*this); }; @@ -89,39 +85,39 @@ namespace MR { W mArg1; }; - template - static FunctorV0M Functor(T* a1, void (T::*a2)()) NO_INLINE { - return FunctorV0M(a1, a2); + template + static FunctorV0M Functor(T* a1, void (T::*a2)()) NO_INLINE { + return FunctorV0M(a1, a2); } - template + template static FunctorV0M Functor(T* a1, void (T::*a2)() const) NO_INLINE { return FunctorV0M(a1, a2); } - template - inline static FunctorV0M Functor_Inline(T* a1, void (T::*a2)()) { - return FunctorV0M(a1, a2); + template + inline static FunctorV0M Functor_Inline(T* a1, void (T::*a2)()) { + return FunctorV0M(a1, a2); } - template + template inline static FunctorV0M Functor_Inline(T* a1, void (T::*a2)() const) { return FunctorV0M(a1, a2); } - template - static FunctorV1M Functor(T* a1, void (T::*a2)(U), U arg_0) NO_INLINE{ - return FunctorV1M(a1, a2, arg_0); + template + static FunctorV1M Functor(T* a1, void (T::*a2)(U), U arg_0) NO_INLINE { + return FunctorV1M(a1, a2, arg_0); } - template - inline static FunctorV1M Functor_Inline(T* a1, void (T::*a2)(U), U arg_0) { - return FunctorV1M(a1, a2, arg_0); - } + template + inline static FunctorV1M Functor_Inline(T* a1, void (T::*a2)(U), U arg_0) { + return FunctorV1M(a1, a2, arg_0); + } - template - static FunctorV2M Functor(T* a1, void (T::*a2)(U, V), U arg_0, V arg_1) { - return FunctorV2M(a1, a2, arg_0, arg_1); + template + static FunctorV2M Functor(T* a1, void (T::*a2)(U, V), U arg_0, V arg_1) { + return FunctorV2M(a1, a2, arg_0, arg_1); } class FunctorV0F : public FunctorBase { @@ -130,9 +126,9 @@ namespace MR { mFunc = func; }; - virtual void operator()() const; - virtual FunctorBase* clone(JKRHeap *) const; + virtual void operator()() const; + virtual FunctorBase* clone(JKRHeap*) const; - void* mFunc; // 0x4 + void* mFunc; // 0x4 }; -}; +}; // namespace MR diff --git a/include/Game/Util/GamePadUtil.hpp b/include/Game/Util/GamePadUtil.hpp index a1947d585..2547a4e33 100644 --- a/include/Game/Util/GamePadUtil.hpp +++ b/include/Game/Util/GamePadUtil.hpp @@ -8,7 +8,7 @@ namespace MR { void getCorePadPointingPosBasedOnScreen(TVec2f* pPos, s32 channel); void getCorePadPointingPos(TVec2f* pPos, s32 channel); void getCorePadPastPointingPos(TVec2f* pPos, s32 idx, s32 channel); - s32 getCorePadEnablePastCount(s32 channel); + s32 getCorePadEnablePastCount(s32 channel); /// @brief Determines if the given Wii Remote is pointing at the screen. /// @param channel The handle to the Wii Remote. @@ -275,7 +275,7 @@ namespace MR { /// @param channel The handle to the Wii Remote. /// @return `true` if the Wii Remote is being controlled, `false` otherwise. bool isOperatingWPad(s32 channel); -}; +}; // namespace MR namespace WPadFunction { WPadRumble* getWPadRumble(s32 channel); diff --git a/include/Game/Util/GeometryBindUtil.hpp b/include/Game/Util/GeometryBindUtil.hpp index ae5331763..4ca3051b5 100644 --- a/include/Game/Util/GeometryBindUtil.hpp +++ b/include/Game/Util/GeometryBindUtil.hpp @@ -6,18 +6,18 @@ class BindSphere { public: TVec3f _0; - f32 _C; + f32 _C; }; class BindCone { public: - BindCone(const TVec3f &, const TVec3f &, f32, f32); + BindCone(const TVec3f&, const TVec3f&, f32, f32); - bool isInPoint(const TVec3f &) const; + bool isInPoint(const TVec3f&) const; void calcVertexPosition(); void calcGeneratixLength(); - void setPosition(const TVec3f &); - void setDirection(const TVec3f &); + void setPosition(const TVec3f&); + void setDirection(const TVec3f&); TVec3f _0; TVec3f _C; diff --git a/include/Game/Util/GravityUtil.hpp b/include/Game/Util/GravityUtil.hpp index aa65113d2..2f9819356 100644 --- a/include/Game/Util/GravityUtil.hpp +++ b/include/Game/Util/GravityUtil.hpp @@ -9,26 +9,26 @@ class NameObj; class PlanetGravity; namespace MR { - void registerGravity(PlanetGravity *pGravity); + void registerGravity(PlanetGravity* pGravity); - bool calcGravityVector(const LiveActor *pActor, TVec3f *pDest, GravityInfo *rInfo, u32 host); - bool calcGravityVector(const NameObj *pActor, const TVec3f &rPosition, TVec3f *pDest, GravityInfo *rInfo, u32 host); - bool calcDropShadowVector(const LiveActor *pActor, TVec3f *pDest, GravityInfo *rInfo, u32 host); - bool calcDropShadowVector(const NameObj *pActor, const TVec3f &rPosition, TVec3f *pDest, GravityInfo *rInfo, u32 host); - bool calcGravityAndDropShadowVector(const LiveActor *pActor, TVec3f *pDest, GravityInfo *rInfo, u32 host); - bool calcGravityAndMagnetVector(const LiveActor *pActor, TVec3f *pDest, GravityInfo *rInfo, u32 host); - bool calcGravityVectorOrZero(const LiveActor *pActor, TVec3f *pDest, GravityInfo *rInfo, u32 host); - bool calcGravityVectorOrZero(const NameObj *pActor, const TVec3f &rPosition, TVec3f *pDest, GravityInfo *rInfo, u32 host); - bool calcDropShadowVectorOrZero(const NameObj *pActor, const TVec3f &rPosition, TVec3f *pDest, GravityInfo *rInfo, u32 host); - bool calcGravityAndDropShadowVectorOrZero(const LiveActor *pActor, TVec3f *pDest, GravityInfo *rInfo, u32 host); - bool calcAttractMarioLauncherOrZero(const LiveActor *pActor, TVec3f *pDest, GravityInfo *rInfo, u32 host); + bool calcGravityVector(const LiveActor* pActor, TVec3f* pDest, GravityInfo* rInfo, u32 host); + bool calcGravityVector(const NameObj* pActor, const TVec3f& rPosition, TVec3f* pDest, GravityInfo* rInfo, u32 host); + bool calcDropShadowVector(const LiveActor* pActor, TVec3f* pDest, GravityInfo* rInfo, u32 host); + bool calcDropShadowVector(const NameObj* pActor, const TVec3f& rPosition, TVec3f* pDest, GravityInfo* rInfo, u32 host); + bool calcGravityAndDropShadowVector(const LiveActor* pActor, TVec3f* pDest, GravityInfo* rInfo, u32 host); + bool calcGravityAndMagnetVector(const LiveActor* pActor, TVec3f* pDest, GravityInfo* rInfo, u32 host); + bool calcGravityVectorOrZero(const LiveActor* pActor, TVec3f* pDest, GravityInfo* rInfo, u32 host); + bool calcGravityVectorOrZero(const NameObj* pActor, const TVec3f& rPosition, TVec3f* pDest, GravityInfo* rInfo, u32 host); + bool calcDropShadowVectorOrZero(const NameObj* pActor, const TVec3f& rPosition, TVec3f* pDest, GravityInfo* rInfo, u32 host); + bool calcGravityAndDropShadowVectorOrZero(const LiveActor* pActor, TVec3f* pDest, GravityInfo* rInfo, u32 host); + bool calcAttractMarioLauncherOrZero(const LiveActor* pActor, TVec3f* pDest, GravityInfo* rInfo, u32 host); - bool calcGravityAndMagnetVector(const NameObj *, const TVec3f &, TVec3f &, GravityInfo *, u32); + bool calcGravityAndMagnetVector(const NameObj*, const TVec3f&, TVec3f&, GravityInfo*, u32); - bool isZeroGravity(const LiveActor *pActor); - bool isLightGravity(const GravityInfo &rInfo); + bool isZeroGravity(const LiveActor* pActor); + bool isLightGravity(const GravityInfo& rInfo); - void settingGravityParamFromJMap(PlanetGravity *pGravity, const JMapInfoIter &rIter); - void getJMapInfoGravityType(const JMapInfoIter &rIter, PlanetGravity *pGravity); - void getJMapInfoGravityPower(const JMapInfoIter &rIter, PlanetGravity *pGravity); -}; + void settingGravityParamFromJMap(PlanetGravity* pGravity, const JMapInfoIter& rIter); + void getJMapInfoGravityType(const JMapInfoIter& rIter, PlanetGravity* pGravity); + void getJMapInfoGravityPower(const JMapInfoIter& rIter, PlanetGravity* pGravity); +}; // namespace MR diff --git a/include/Game/Util/HashUtil.hpp b/include/Game/Util/HashUtil.hpp index a290b671d..3f76a2936 100644 --- a/include/Game/Util/HashUtil.hpp +++ b/include/Game/Util/HashUtil.hpp @@ -6,25 +6,25 @@ class HashSortTable { public: HashSortTable(u32); - bool add(const char *, u32, bool); + bool add(const char*, u32, bool); bool add(u32, u32); bool addOrSkip(u32, u32); void sort(); - bool search(u32, u32 *); - bool search(const char *, u32 *); - bool search(const char *, const char *, u32 *); - void swap(const char *, const char *); + bool search(u32, u32*); + bool search(const char*, u32*); + bool search(const char*, const char*, u32*); + void swap(const char*, const char*); /* 0x00 */ bool mHasBeenSorted; /* 0x04 */ u32* mHashCodes; /* 0x08 */ u32* _8; /* 0x0C */ u16* _C; /* 0x10 */ u16* _10; - /* 0x14 */ u32 mCurrentLength; - /* 0x18 */ u32 mMaxLength; + /* 0x14 */ u32 mCurrentLength; + /* 0x18 */ u32 mMaxLength; }; namespace MR { - u32 getHashCode(const char *); - u32 getHashCodeLower(const char *); -}; + u32 getHashCode(const char*); + u32 getHashCodeLower(const char*); +}; // namespace MR diff --git a/include/Game/Util/IKJoint.hpp b/include/Game/Util/IKJoint.hpp index 47c2cf541..e480b204c 100644 --- a/include/Game/Util/IKJoint.hpp +++ b/include/Game/Util/IKJoint.hpp @@ -8,29 +8,29 @@ public: void setRootBoneLength(f32); void setMiddleBoneLength(f32); - void setFirstPose(const TVec3f &, const TVec3f &); - s32 checkReachIKTarget(f32, f32, f32); - f32 calcIKRootAngleCosign(f32, f32, f32); + void setFirstPose(const TVec3f&, const TVec3f&); + s32 checkReachIKTarget(f32, f32, f32); + f32 calcIKRootAngleCosign(f32, f32, f32); - void update(MtxPtr, MtxPtr, MtxPtr, const TVec3f &); + void update(MtxPtr, MtxPtr, MtxPtr, const TVec3f&); - void getRootJointPosition(TVec3f *) const; - void getEndJointPosition(TVec3f *) const; + void getRootJointPosition(TVec3f*) const; + void getEndJointPosition(TVec3f*) const; f32 getMaxLimitDistance() const; f32 getMinLimitDistance() const; - - void updateByLocalRootAndWorldTarget(const TPos3f &, const TVec3f &, const TVec3f &); - void updateByLocalRootAndDirection(const TPos3f &, const TVec3f &, const TVec3f &); + void updateByLocalRootAndWorldTarget(const TPos3f&, const TVec3f&, const TVec3f&); - s32 updateByUpVector(const TVec3f &, const TVec3f &, const TVec3f &); + void updateByLocalRootAndDirection(const TPos3f&, const TVec3f&, const TVec3f&); + + s32 updateByUpVector(const TVec3f&, const TVec3f&, const TVec3f&); s32 updateByDistanceOnly(f32); TPos3f _0; TPos3f _30; TPos3f _60; - f32 mRootBoneLength; // 0x90 - f32 mMiddleBoneLength; // 0x94 + f32 mRootBoneLength; // 0x90 + f32 mMiddleBoneLength; // 0x94 }; diff --git a/include/Game/Util/JMapIdInfo.hpp b/include/Game/Util/JMapIdInfo.hpp index bebe94726..ba9a21f36 100644 --- a/include/Game/Util/JMapIdInfo.hpp +++ b/include/Game/Util/JMapIdInfo.hpp @@ -6,24 +6,23 @@ class JMapIdInfo { public: inline JMapIdInfo() { - } JMapIdInfo(s32, s32); - JMapIdInfo(s32, const JMapInfoIter &); - JMapIdInfo(const JMapIdInfo &rInf) { + JMapIdInfo(s32, const JMapInfoIter&); + JMapIdInfo(const JMapIdInfo& rInf) { _0 = rInf._0; mZoneID = rInf.mZoneID; } - void initalize(s32, const JMapInfoIter &); + void initalize(s32, const JMapInfoIter&); - void operator=(const JMapIdInfo &rhs) NO_INLINE { + void operator=(const JMapIdInfo& rhs) NO_INLINE { _0 = rhs._0; mZoneID = rhs.mZoneID; } - inline bool operator==(const JMapIdInfo &rOther) const { + inline bool operator==(const JMapIdInfo& rOther) const { bool ret = false; if (_0 == rOther._0 && mZoneID == rOther.mZoneID) { @@ -38,5 +37,5 @@ public: }; namespace MR { - JMapIdInfo& createJMapIdInfoFromClippingGroupId(const JMapInfoIter &); + JMapIdInfo& createJMapIdInfoFromClippingGroupId(const JMapInfoIter&); }; diff --git a/include/Game/Util/JMapInfo.hpp b/include/Game/Util/JMapInfo.hpp index f4147b3c3..99e0e3a24 100644 --- a/include/Game/Util/JMapInfo.hpp +++ b/include/Game/Util/JMapInfo.hpp @@ -15,27 +15,27 @@ class JMapInfoIter; struct JMapItem { - u32 mHash; // 0x0 - u32 mMask; // 0x4 - u16 mOffsData; // 0x8 - u8 mShift; // 0xA - u8 mType; // 0xB + u32 mHash; // 0x0 + u32 mMask; // 0x4 + u16 mOffsData; // 0x8 + u8 mShift; // 0xA + u8 mType; // 0xB }; struct JMapData { - s32 mNumEntries; // 0x0 - s32 mNumFields; // 0x4 - s32 mDataOffset; // 0x8 - u32 mEntrySize; // 0xC - const JMapItem mItems[]; // 0x10 + s32 mNumEntries; // 0x0 + s32 mNumFields; // 0x4 + s32 mDataOffset; // 0x8 + u32 mEntrySize; // 0xC + const JMapItem mItems[]; // 0x10 }; -template +template inline bool compareValues(const T a, const T b) { return a == b; } -template<> +template <> inline bool compareValues(const char* a, const char* b) { return strcmp(a, b) == 0; } @@ -49,13 +49,13 @@ public: JMapInfo(); ~JMapInfo(); - inline JMapInfo& operator=(const JMapInfo &rInfo) { + inline JMapInfo& operator=(const JMapInfo& rInfo) { mData = rInfo.mData; mName = rInfo.mName; return *this; } - inline bool operator==(const JMapInfo &rInfo) const { + inline bool operator==(const JMapInfo& rInfo) const { return mData == rInfo.mData; } @@ -71,23 +71,23 @@ public: return dataExists() ? mData->mNumFields : 0; } - bool attach(const void*); - void setName(const char*); + bool attach(const void*); + void setName(const char*); const char* getName() const; - s32 searchItemInfo(const char*) const; - s32 getValueType(const char*) const; - bool getValueFast(int, int, const char**) const; - bool getValueFast(int, int, u32*) const; - bool getValueFast(int, int, s32*) const; - bool getValueFast(int entryIndex, int itemIndex, f32* pValueOut) const { + s32 searchItemInfo(const char*) const; + s32 getValueType(const char*) const; + bool getValueFast(int, int, const char**) const; + bool getValueFast(int, int, u32*) const; + bool getValueFast(int, int, s32*) const; + bool getValueFast(int entryIndex, int itemIndex, f32* pValueOut) const { const JMapItem* pItem = &mData->mItems[itemIndex]; - const char* pValue = getEntryAddress(mData, mData->mDataOffset, entryIndex) + pItem->mOffsData; + const char* pValue = getEntryAddress(mData, mData->mDataOffset, entryIndex) + pItem->mOffsData; *pValueOut = *reinterpret_cast(pValue); return true; } JMapInfoIter findElementBinary(const char*, const char*) const; - template + template const bool getValue(int entryIndex, const char* pKey, T* pValueOut) const NO_INLINE { s32 itemIndex = searchItemInfo(pKey); if (itemIndex < 0) { @@ -96,10 +96,10 @@ public: return getValueFast(entryIndex, itemIndex, pValueOut); } - template + template JMapInfoIter findElement(const char* pKey, T searchValue, int startIndex) const NO_INLINE { int entryIndex = startIndex; - T value; + T value; while (entryIndex < getNumEntries()) { getValue(entryIndex, pKey, &value); if (compareValues(value, searchValue)) { @@ -116,29 +116,29 @@ public: JMapInfoIter end() const; const JMapData* mData; // 0x0 - const char* mName; // 0x4 + const char* mName; // 0x4 }; class JMapInfoIter { public: - inline JMapInfoIter() { } + inline JMapInfoIter() {} inline JMapInfoIter(const JMapInfo* pInfo, s32 index) { mInfo = pInfo; mIndex = index; } - inline JMapInfoIter& operator=(const JMapInfoIter &rIter) { + inline JMapInfoIter& operator=(const JMapInfoIter& rIter) { mInfo = rIter.mInfo; mIndex = rIter.mIndex; return *this; } - bool operator==(const JMapInfoIter &rIter) const { + bool operator==(const JMapInfoIter& rIter) const { return mIndex == rIter.mIndex && mInfo && rIter.mInfo && *mInfo == *rIter.mInfo; } - - bool operator!=(const JMapInfoIter &rIter) const { + + bool operator!=(const JMapInfoIter& rIter) const { return !(*this == rIter); } @@ -146,11 +146,11 @@ public: return mInfo && mIndex >= 0 && mIndex < mInfo->getNumEntries(); } - template + template bool getValue(const char* pKey, T* pValueOut) const { const JMapInfo* info = mInfo; - s32 entryIndex = mIndex; - + s32 entryIndex = mIndex; + s32 itemIndex = info->searchItemInfo(pKey); if (itemIndex < 0) { return false; @@ -158,8 +158,8 @@ public: return info->getValueFast(entryIndex, itemIndex, pValueOut); } - const JMapInfo* mInfo; // 0x0 - s32 mIndex; // 0x4 + const JMapInfo* mInfo; // 0x0 + s32 mIndex; // 0x4 }; namespace MR { diff --git a/include/Game/Util/JMapLinkInfo.hpp b/include/Game/Util/JMapLinkInfo.hpp index 348159c18..e87c0e304 100644 --- a/include/Game/Util/JMapLinkInfo.hpp +++ b/include/Game/Util/JMapLinkInfo.hpp @@ -4,11 +4,11 @@ class JMapLinkInfo { public: - JMapLinkInfo(const JMapInfoIter &, bool); + JMapLinkInfo(const JMapInfoIter&, bool); void invalidate(); - void setLinkedInfo(const JMapInfoIter &); - void setLinkInfo(const JMapInfoIter &); + void setLinkedInfo(const JMapInfoIter&); + void setLinkInfo(const JMapInfoIter&); s32 _0; s32 _4; diff --git a/include/Game/Util/JMapUtil.hpp b/include/Game/Util/JMapUtil.hpp index a9dae5e47..5114ef447 100644 --- a/include/Game/Util/JMapUtil.hpp +++ b/include/Game/Util/JMapUtil.hpp @@ -5,105 +5,105 @@ #include namespace MR { - bool isValidInfo(const JMapInfoIter &rIter); - bool isObjectName(const JMapInfoIter &rIter, const char *pName); - bool getJMapInfoArgNoInit(const JMapInfoIter &rIter, const char *pFieldName, s32 *); - bool getJMapInfoArgNoInit(const JMapInfoIter &rIter, const char *pFieldName, f32 *); - bool getJMapInfoArgNoInit(const JMapInfoIter &rIter, const char *pFieldName, bool *); - bool getJMapInfoTrans(const JMapInfoIter &rIter, TVec3f *); - bool getJMapInfoRotate(const JMapInfoIter &rIter, TVec3f *); - bool getJMapInfoMatrixFromRT(const JMapInfoIter &rIter, TPos3f *); - bool getJMapInfoArg0WithInit(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoArg0WithInit(const JMapInfoIter &rIter, f32 *); - bool getJMapInfoArg0WithInit(const JMapInfoIter &rIter, bool *); - bool getJMapInfoArg1WithInit(const JMapInfoIter &rIter, f32 *); - bool getJMapInfoArg1WithInit(const JMapInfoIter &rIter, bool *); - bool getJMapInfoArg2WithInit(const JMapInfoIter &rIter, f32 *); - bool getJMapInfoArg2WithInit(const JMapInfoIter &rIter, bool *); - bool getJMapInfoArg3WithInit(const JMapInfoIter &rIter, f32 *); - bool getJMapInfoArg3WithInit(const JMapInfoIter &rIter, bool *); - bool getJMapInfoArg4WithInit(const JMapInfoIter &rIter, bool *); - bool getJMapInfoArg7WithInit(const JMapInfoIter &rIter, bool *); - bool getJMapInfoArg0NoInit(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoArg0NoInit(const JMapInfoIter &rIter, f32 *); - bool getJMapInfoArg0NoInit(const JMapInfoIter &rIter, bool *); - bool getJMapInfoArg1NoInit(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoArg1NoInit(const JMapInfoIter &rIter, f32 *); - bool getJMapInfoArg1NoInit(const JMapInfoIter &rIter, bool *); - bool getJMapInfoArg2NoInit(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoArg2NoInit(const JMapInfoIter &rIter, f32 *); - bool getJMapInfoArg2NoInit(const JMapInfoIter &rIter, bool *); - bool getJMapInfoArg3NoInit(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoArg3NoInit(const JMapInfoIter &rIter, f32 *); - bool getJMapInfoArg3NoInit(const JMapInfoIter &rIter, bool *); - bool getJMapInfoArg4NoInit(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoArg4NoInit(const JMapInfoIter &rIter, f32 *); - bool getJMapInfoArg4NoInit(const JMapInfoIter &rIter, bool *); - bool getJMapInfoArg5NoInit(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoArg5NoInit(const JMapInfoIter &rIter, f32 *); - bool getJMapInfoArg5NoInit(const JMapInfoIter &rIter, bool *); - bool getJMapInfoArg6NoInit(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoArg6NoInit(const JMapInfoIter &rIter, f32 *); - bool getJMapInfoArg6NoInit(const JMapInfoIter &rIter, bool *); - bool getJMapInfoArg7NoInit(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoArg7NoInit(const JMapInfoIter &rIter, f32 *); - bool getJMapInfoArg7NoInit(const JMapInfoIter &rIter, bool *); - bool isEqualObjectName(const JMapInfoIter &rIter, const char *); - s32 getDemoGroupID(const JMapInfoIter &rIter); - s32 getDemoGroupLinkID(const JMapInfoIter &rIter); - bool getJMapInfoRailArg(const JMapInfoIter &rIter, const char *, s32 *); - bool getJMapInfoRailArg0NoInit(const JMapInfoIter &rIter, s32 *); - bool getRailId(const JMapInfoIter &rIter, s32 *); - bool getObjectName(const char **pDest, const JMapInfoIter &rIter); - bool isExistJMapArg(const JMapInfoIter &rIter); - bool getJMapInfoShapeIdWithInit(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoTransLocal(const JMapInfoIter &rIter, TVec3f *); - bool getJMapInfoRotateLocal(const JMapInfoIter &rIter, TVec3f *); - bool getJMapInfoScale(const JMapInfoIter &rIter, TVec3f *); - bool getJMapInfoV3f(const JMapInfoIter &rIter, const char *, TVec3f *); - bool getJMapInfoArg1WithInit(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoArg2WithInit(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoArg3WithInit(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoArg4WithInit(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoArg5WithInit(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoArg6WithInit(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoArg7WithInit(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoFollowID(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoGroupID(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoClippingGroupID(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoDemoGroupID(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoLinkID(const JMapInfoIter &rIter, s32 *); - bool isConnectedWithRail(const JMapInfoIter &rIter); - bool isExistStageSwitchA(const JMapInfoIter &rIter); - bool isExistStageSwitchB(const JMapInfoIter &rIter); - bool isExistStageSwitchAppear(const JMapInfoIter &rIter); - bool isExistStageSwitchDead(const JMapInfoIter &rIter); - bool isExistStageSwitchSleep(const JMapInfoIter &rIter); - bool getJMapInfoCameraSetID(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoViewGroupID(const JMapInfoIter &rIter, s32 *); - bool getJMapInfoMessageID(const JMapInfoIter &rIter, s32 *); - s32 getDemoCastID(const JMapInfoIter &rIter); - const char* getDemoName(const JMapInfoIter &rIter); - const char* getDemoSheetName(const JMapInfoIter &rIter); - bool getNextLinkRailID(const JMapInfoIter &rIter, s32 *); - bool isEqualRailUsage(const JMapInfoIter &rIter, const char *); - void getRailPointPos0(const JMapInfoIter &rIter, TVec3f *); - void getRailPointPos1(const JMapInfoIter &rIter, TVec3f *); - void getRailPointPos2(const JMapInfoIter &rIter, TVec3f *); - bool isLoopRailPathIter(const JMapInfoIter &rIter); - - template - inline bool getValue(const JMapInfoIter &rIter, const char *pName, T *pOut) { + bool isValidInfo(const JMapInfoIter& rIter); + bool isObjectName(const JMapInfoIter& rIter, const char* pName); + bool getJMapInfoArgNoInit(const JMapInfoIter& rIter, const char* pFieldName, s32*); + bool getJMapInfoArgNoInit(const JMapInfoIter& rIter, const char* pFieldName, f32*); + bool getJMapInfoArgNoInit(const JMapInfoIter& rIter, const char* pFieldName, bool*); + bool getJMapInfoTrans(const JMapInfoIter& rIter, TVec3f*); + bool getJMapInfoRotate(const JMapInfoIter& rIter, TVec3f*); + bool getJMapInfoMatrixFromRT(const JMapInfoIter& rIter, TPos3f*); + bool getJMapInfoArg0WithInit(const JMapInfoIter& rIter, s32*); + bool getJMapInfoArg0WithInit(const JMapInfoIter& rIter, f32*); + bool getJMapInfoArg0WithInit(const JMapInfoIter& rIter, bool*); + bool getJMapInfoArg1WithInit(const JMapInfoIter& rIter, f32*); + bool getJMapInfoArg1WithInit(const JMapInfoIter& rIter, bool*); + bool getJMapInfoArg2WithInit(const JMapInfoIter& rIter, f32*); + bool getJMapInfoArg2WithInit(const JMapInfoIter& rIter, bool*); + bool getJMapInfoArg3WithInit(const JMapInfoIter& rIter, f32*); + bool getJMapInfoArg3WithInit(const JMapInfoIter& rIter, bool*); + bool getJMapInfoArg4WithInit(const JMapInfoIter& rIter, bool*); + bool getJMapInfoArg7WithInit(const JMapInfoIter& rIter, bool*); + bool getJMapInfoArg0NoInit(const JMapInfoIter& rIter, s32*); + bool getJMapInfoArg0NoInit(const JMapInfoIter& rIter, f32*); + bool getJMapInfoArg0NoInit(const JMapInfoIter& rIter, bool*); + bool getJMapInfoArg1NoInit(const JMapInfoIter& rIter, s32*); + bool getJMapInfoArg1NoInit(const JMapInfoIter& rIter, f32*); + bool getJMapInfoArg1NoInit(const JMapInfoIter& rIter, bool*); + bool getJMapInfoArg2NoInit(const JMapInfoIter& rIter, s32*); + bool getJMapInfoArg2NoInit(const JMapInfoIter& rIter, f32*); + bool getJMapInfoArg2NoInit(const JMapInfoIter& rIter, bool*); + bool getJMapInfoArg3NoInit(const JMapInfoIter& rIter, s32*); + bool getJMapInfoArg3NoInit(const JMapInfoIter& rIter, f32*); + bool getJMapInfoArg3NoInit(const JMapInfoIter& rIter, bool*); + bool getJMapInfoArg4NoInit(const JMapInfoIter& rIter, s32*); + bool getJMapInfoArg4NoInit(const JMapInfoIter& rIter, f32*); + bool getJMapInfoArg4NoInit(const JMapInfoIter& rIter, bool*); + bool getJMapInfoArg5NoInit(const JMapInfoIter& rIter, s32*); + bool getJMapInfoArg5NoInit(const JMapInfoIter& rIter, f32*); + bool getJMapInfoArg5NoInit(const JMapInfoIter& rIter, bool*); + bool getJMapInfoArg6NoInit(const JMapInfoIter& rIter, s32*); + bool getJMapInfoArg6NoInit(const JMapInfoIter& rIter, f32*); + bool getJMapInfoArg6NoInit(const JMapInfoIter& rIter, bool*); + bool getJMapInfoArg7NoInit(const JMapInfoIter& rIter, s32*); + bool getJMapInfoArg7NoInit(const JMapInfoIter& rIter, f32*); + bool getJMapInfoArg7NoInit(const JMapInfoIter& rIter, bool*); + bool isEqualObjectName(const JMapInfoIter& rIter, const char*); + s32 getDemoGroupID(const JMapInfoIter& rIter); + s32 getDemoGroupLinkID(const JMapInfoIter& rIter); + bool getJMapInfoRailArg(const JMapInfoIter& rIter, const char*, s32*); + bool getJMapInfoRailArg0NoInit(const JMapInfoIter& rIter, s32*); + bool getRailId(const JMapInfoIter& rIter, s32*); + bool getObjectName(const char** pDest, const JMapInfoIter& rIter); + bool isExistJMapArg(const JMapInfoIter& rIter); + bool getJMapInfoShapeIdWithInit(const JMapInfoIter& rIter, s32*); + bool getJMapInfoTransLocal(const JMapInfoIter& rIter, TVec3f*); + bool getJMapInfoRotateLocal(const JMapInfoIter& rIter, TVec3f*); + bool getJMapInfoScale(const JMapInfoIter& rIter, TVec3f*); + bool getJMapInfoV3f(const JMapInfoIter& rIter, const char*, TVec3f*); + bool getJMapInfoArg1WithInit(const JMapInfoIter& rIter, s32*); + bool getJMapInfoArg2WithInit(const JMapInfoIter& rIter, s32*); + bool getJMapInfoArg3WithInit(const JMapInfoIter& rIter, s32*); + bool getJMapInfoArg4WithInit(const JMapInfoIter& rIter, s32*); + bool getJMapInfoArg5WithInit(const JMapInfoIter& rIter, s32*); + bool getJMapInfoArg6WithInit(const JMapInfoIter& rIter, s32*); + bool getJMapInfoArg7WithInit(const JMapInfoIter& rIter, s32*); + bool getJMapInfoFollowID(const JMapInfoIter& rIter, s32*); + bool getJMapInfoGroupID(const JMapInfoIter& rIter, s32*); + bool getJMapInfoClippingGroupID(const JMapInfoIter& rIter, s32*); + bool getJMapInfoDemoGroupID(const JMapInfoIter& rIter, s32*); + bool getJMapInfoLinkID(const JMapInfoIter& rIter, s32*); + bool isConnectedWithRail(const JMapInfoIter& rIter); + bool isExistStageSwitchA(const JMapInfoIter& rIter); + bool isExistStageSwitchB(const JMapInfoIter& rIter); + bool isExistStageSwitchAppear(const JMapInfoIter& rIter); + bool isExistStageSwitchDead(const JMapInfoIter& rIter); + bool isExistStageSwitchSleep(const JMapInfoIter& rIter); + bool getJMapInfoCameraSetID(const JMapInfoIter& rIter, s32*); + bool getJMapInfoViewGroupID(const JMapInfoIter& rIter, s32*); + bool getJMapInfoMessageID(const JMapInfoIter& rIter, s32*); + s32 getDemoCastID(const JMapInfoIter& rIter); + const char* getDemoName(const JMapInfoIter& rIter); + const char* getDemoSheetName(const JMapInfoIter& rIter); + bool getNextLinkRailID(const JMapInfoIter& rIter, s32*); + bool isEqualRailUsage(const JMapInfoIter& rIter, const char*); + void getRailPointPos0(const JMapInfoIter& rIter, TVec3f*); + void getRailPointPos1(const JMapInfoIter& rIter, TVec3f*); + void getRailPointPos2(const JMapInfoIter& rIter, TVec3f*); + bool isLoopRailPathIter(const JMapInfoIter& rIter); + + template + inline bool getValue(const JMapInfoIter& rIter, const char* pName, T* pOut) { return rIter.getValue(pName, pOut); } - inline s32 getMessageID(const JMapInfoIter &rIter) { + inline s32 getMessageID(const JMapInfoIter& rIter) { s32 msgId; getJMapInfoMessageID(rIter, &msgId); return msgId; } - inline bool checkJMapDataEntries(const JMapInfoIter &rIter) { + inline bool checkJMapDataEntries(const JMapInfoIter& rIter) { bool flag; bool ret; @@ -130,4 +130,4 @@ namespace MR { return ret; } -}; +}; // namespace MR diff --git a/include/Game/Util/JointController.hpp b/include/Game/Util/JointController.hpp index dbc950d8a..c436f8d86 100644 --- a/include/Game/Util/JointController.hpp +++ b/include/Game/Util/JointController.hpp @@ -17,50 +17,49 @@ struct UnkStruct { }; struct JointControllerInfo { - u32 _0; + u32 _0; UnkStruct* _4; }; - class JointController { public: JointController(); - virtual bool calcJointMatrix(TPos3f *, const JointControllerInfo &); - virtual bool calcJointMatrixAfterChild(TPos3f *, const JointControllerInfo &); + virtual bool calcJointMatrix(TPos3f*, const JointControllerInfo&); + virtual bool calcJointMatrixAfterChild(TPos3f*, const JointControllerInfo&); - void registerCallBack(); - void calcJointMatrixAndSetSystem(J3DJoint *); - void calcJointMatrixAfterChildAndSetSystem(J3DJoint *); - static void staticCallBack(J3DJoint *, int); + void registerCallBack(); + void calcJointMatrixAndSetSystem(J3DJoint*); + void calcJointMatrixAfterChildAndSetSystem(J3DJoint*); + static void staticCallBack(J3DJoint*, int); - J3DModel* mModel; // 0x4 - J3DJoint* mJoint; // 0x8 + J3DModel* mModel; // 0x4 + J3DJoint* mJoint; // 0x8 }; -template +template class JointControlDelegator : public JointController { public: + typedef bool (T::*func)(TPos3f*, const JointControllerInfo&); - typedef bool (T::*func)(TPos3f *, const JointControllerInfo &); - - inline JointControlDelegator(T *pHost, func calcFunc, func calcAfterChild) : JointController() { + inline JointControlDelegator(T* pHost, func calcFunc, func calcAfterChild) + : JointController() { mHost = pHost; mMtxCalcFunc = calcFunc; mMtxCalcAfterChildFunc = calcAfterChild; } - inline JointControlDelegator(func calcFunc, T *pHost, func calcAfterChild) : JointController() { + inline JointControlDelegator(func calcFunc, T* pHost, func calcAfterChild) + : JointController() { mHost = pHost; mMtxCalcFunc = calcAfterChild; mMtxCalcAfterChildFunc = calcFunc; } virtual ~JointControlDelegator() { - } - virtual bool calcJointMatrix(TPos3f *a1, const JointControllerInfo &a2) { + virtual bool calcJointMatrix(TPos3f* a1, const JointControllerInfo& a2) { if (mMtxCalcFunc != nullptr) { return (mHost->*mMtxCalcFunc)(a1, a2); } else { @@ -68,7 +67,7 @@ public: } } - virtual bool calcJointMatrixAfterChild(TPos3f *a1, const JointControllerInfo &a2) { + virtual bool calcJointMatrixAfterChild(TPos3f* a1, const JointControllerInfo& a2) { if (mMtxCalcAfterChildFunc != nullptr) { return (mHost->*mMtxCalcAfterChildFunc)(a1, a2); } else { @@ -76,25 +75,25 @@ public: } } - T* mHost; // 0xC - func mMtxCalcFunc; // 0x10 - func mMtxCalcAfterChildFunc; // 0x14 + T* mHost; // 0xC + func mMtxCalcFunc; // 0x10 + func mMtxCalcAfterChildFunc; // 0x14 }; namespace MR { - void setJointControllerParam(JointController *, const LiveActor *, const char *); + void setJointControllerParam(JointController*, const LiveActor*, const char*); template - JointControlDelegator* createJointDelegatorWithNullChildFunc(T *pHost, bool (T::*calcFunc)(TPos3f *, const JointControllerInfo &), const char *pName) { + JointControlDelegator* createJointDelegatorWithNullChildFunc(T* pHost, bool (T::*calcFunc)(TPos3f*, const JointControllerInfo&), const char* pName) { JointControlDelegator* delegator = new JointControlDelegator(pHost, calcFunc, 0); setJointControllerParam(delegator, pHost, pName); return delegator; } - + template - JointControlDelegator* createJointDelegatorWithNullMtxFunc(T *pHost, bool (T::*calcFunc)(TPos3f *, const JointControllerInfo &), const char *pName) { + JointControlDelegator* createJointDelegatorWithNullMtxFunc(T* pHost, bool (T::*calcFunc)(TPos3f*, const JointControllerInfo&), const char* pName) { JointControlDelegator* delegator = new JointControlDelegator(calcFunc, pHost, 0); setJointControllerParam(delegator, pHost, pName); return delegator; } -}; \ No newline at end of file +}; // namespace MR \ No newline at end of file diff --git a/include/Game/Util/JointUtil.hpp b/include/Game/Util/JointUtil.hpp index 92c9442e7..3a781378c 100644 --- a/include/Game/Util/JointUtil.hpp +++ b/include/Game/Util/JointUtil.hpp @@ -9,37 +9,37 @@ class J3DModelData; class LiveActor; namespace MR { - J3DJoint* getJoint(J3DModel*, const char*); - J3DJoint* getJoint(const LiveActor*, const char*); - J3DJoint* getJoint(const LiveActor*, u16); - MtxPtr getJointMtx(J3DModel*, const char*); - MtxPtr getJointMtx(const LiveActor*, const char*); - MtxPtr getJointMtx(const LiveActor*, int); - s32 getJointIndex(const LiveActor*, const char*); + J3DJoint* getJoint(J3DModel*, const char*); + J3DJoint* getJoint(const LiveActor*, const char*); + J3DJoint* getJoint(const LiveActor*, u16); + MtxPtr getJointMtx(J3DModel*, const char*); + MtxPtr getJointMtx(const LiveActor*, const char*); + MtxPtr getJointMtx(const LiveActor*, int); + s32 getJointIndex(const LiveActor*, const char*); const char* getJointName(const LiveActor*, int); - s32 getJointNum(const LiveActor*); - bool isExistJoint(const LiveActor*, const char*); - void copyJointPos(J3DModel*, const char*, TVec3f*); - void copyJointPos(const LiveActor*, const char*, TVec3f*); - void copyJointPos(J3DModel*, int, TVec3f*); - void copyJointPos(const LiveActor*, int, TVec3f*); - void copyJointScale(const LiveActor*, const char*, TVec3f*); - void hideJoint(J3DJoint*); - void hideJoint(J3DModel*, const char*); - void hideJoint(const LiveActor*, const char*); - void hideJointAndChildren(J3DJoint*); - void hideJointAndChildren(J3DModel*, const char*); - void hideJointAndChildren(const LiveActor*, const char*); - void showJoint(J3DJoint*); - void showJoint(J3DModel*, const char*); - void showJoint(const LiveActor*, const char*); - void showJointAndChildren(J3DJoint*); - void showJointAndChildren(J3DModel*, const char*); - void showJointAndChildren(const LiveActor*, const char*); - f32 getJointTransX(const J3DJoint*); - f32 getJointTransY(const J3DJoint*); - f32 getJointTransZ(const J3DJoint*); - s32 searchChildJoint(J3DJoint*, J3DJoint*); - s32 getParentJoint(J3DModelData*, J3DJoint*); - s32 getParentJoint(const LiveActor*, J3DJoint*); -}; + s32 getJointNum(const LiveActor*); + bool isExistJoint(const LiveActor*, const char*); + void copyJointPos(J3DModel*, const char*, TVec3f*); + void copyJointPos(const LiveActor*, const char*, TVec3f*); + void copyJointPos(J3DModel*, int, TVec3f*); + void copyJointPos(const LiveActor*, int, TVec3f*); + void copyJointScale(const LiveActor*, const char*, TVec3f*); + void hideJoint(J3DJoint*); + void hideJoint(J3DModel*, const char*); + void hideJoint(const LiveActor*, const char*); + void hideJointAndChildren(J3DJoint*); + void hideJointAndChildren(J3DModel*, const char*); + void hideJointAndChildren(const LiveActor*, const char*); + void showJoint(J3DJoint*); + void showJoint(J3DModel*, const char*); + void showJoint(const LiveActor*, const char*); + void showJointAndChildren(J3DJoint*); + void showJointAndChildren(J3DModel*, const char*); + void showJointAndChildren(const LiveActor*, const char*); + f32 getJointTransX(const J3DJoint*); + f32 getJointTransY(const J3DJoint*); + f32 getJointTransZ(const J3DJoint*); + s32 searchChildJoint(J3DJoint*, J3DJoint*); + s32 getParentJoint(J3DModelData*, J3DJoint*); + s32 getParentJoint(const LiveActor*, J3DJoint*); +}; // namespace MR diff --git a/include/Game/Util/LayoutUtil.hpp b/include/Game/Util/LayoutUtil.hpp index bdf1448e5..d344f0c93 100644 --- a/include/Game/Util/LayoutUtil.hpp +++ b/include/Game/Util/LayoutUtil.hpp @@ -17,13 +17,13 @@ namespace nw4r { class Pane; class TexMap; class TextBox; - }; + }; // namespace lyt namespace ut { class Font; class Rect; - }; -}; + }; // namespace ut +}; // namespace nw4r class TextBoxRecursiveOperation { public: @@ -36,9 +36,8 @@ public: class TextBoxRecursiveSetMessage : public TextBoxRecursiveOperation { public: /// @brief Creates a new `TextBoxRecursiveSetMessage`. - TextBoxRecursiveSetMessage(const wchar_t* pMessage) : - mMessage(pMessage) - {} + TextBoxRecursiveSetMessage(const wchar_t* pMessage) + : mMessage(pMessage) {} virtual void execute(nw4r::lyt::TextBox* pTextBox) const; @@ -49,10 +48,9 @@ private: class TextBoxRecursiveSetArgNumber : public TextBoxRecursiveOperation { public: /// @brief Creates a new `TextBoxRecursiveSetArgNumber`. - TextBoxRecursiveSetArgNumber(s32 arg, s32 param2) : - mArg(arg), - _8(param2) - {} + TextBoxRecursiveSetArgNumber(s32 arg, s32 param2) + : mArg(arg), + _8(param2) {} virtual void execute(nw4r::lyt::TextBox* pTextBox) const; @@ -64,24 +62,22 @@ private: class TextBoxRecursiveSetArgString : public TextBoxRecursiveOperation { public: /// @brief Creates a new `TextBoxRecursiveSetArgString`. - TextBoxRecursiveSetArgString(const wchar_t* pArg, s32 param2) : - mArg(pArg), - _8(param2) - {} + TextBoxRecursiveSetArgString(const wchar_t* pArg, s32 param2) + : mArg(pArg), + _8(param2) {} virtual void execute(nw4r::lyt::TextBox* pTextBox) const; private: /* 0x4 */ const wchar_t* mArg; - /* 0x8 */ s32 _8; + /* 0x8 */ s32 _8; }; class TextBoxRecursiveSetVerticalPosition : public TextBoxRecursiveOperation { public: /// @brief Creates a new `TextBoxRecursiveSetVerticalPosition`. - TextBoxRecursiveSetVerticalPosition(u8 position) : - mPosition(position) - {} + TextBoxRecursiveSetVerticalPosition(u8 position) + : mPosition(position) {} virtual void execute(nw4r::lyt::TextBox* pTextBox) const; @@ -92,9 +88,8 @@ private: class TextBoxRecursiveSetHorizontalPosition : public TextBoxRecursiveOperation { public: /// @brief Creates a new `TextBoxRecursiveSetHorizontalPosition`. - TextBoxRecursiveSetHorizontalPosition(u8 position) : - mPosition(position) - {} + TextBoxRecursiveSetHorizontalPosition(u8 position) + : mPosition(position) {} virtual void execute(nw4r::lyt::TextBox* pTextBox) const; @@ -105,9 +100,8 @@ private: class TextBoxRecursiveSetFont : public TextBoxRecursiveOperation { public: /// @brief Creates a new `TextBoxRecursiveSetFont`. - TextBoxRecursiveSetFont(nw4r::ut::Font* pFont) : - mFont(pFont) - {} + TextBoxRecursiveSetFont(nw4r::ut::Font* pFont) + : mFont(pFont) {} virtual void execute(nw4r::lyt::TextBox* pTextBox) const; @@ -116,137 +110,137 @@ private: }; namespace MR { - LayoutHolder* createAndAddLayoutHolder(const char*); - LayoutHolder* createAndAddLayoutHolderRawData(const char*); - void createAndAddPaneCtrl(LayoutActor*, const char*, u32); - void createAndAddGroupCtrl(LayoutActor*, const char*, u32); - bool isExistPaneCtrl(LayoutActor*, const char*); - u8 getPaneAlpha(const LayoutActor*, const char*); - void setInfluencedAlphaToChild(const LayoutActor*); - void setLayoutAlpha(const LayoutActor*, u8); - void setLayoutAlphaFloat(const LayoutActor*, f32); - void setPaneAlpha(const LayoutActor*, const char*, u8); - void setPaneAlphaFloat(const LayoutActor*, const char*, f32); - void executeTextBoxRecursive(LayoutActor*, const char*, const TextBoxRecursiveOperation&); - void setTextBoxGameMessageRecursive(LayoutActor*, const char*, const char*); - void setTextBoxLayoutMessageRecursive(LayoutActor*, const char*, const char*); - void setTextBoxSystemMessageRecursive(LayoutActor*, const char*, const char*); - void setTextBoxMessageRecursive(LayoutActor*, const char*, const wchar_t*); - void setTextBoxFormatRecursive(LayoutActor*, const char*, const wchar_t*, ...); - void setTextBoxArgNumberRecursive(LayoutActor*, const char*, s32, s32); - void setTextBoxArgStringRecursive(LayoutActor*, const char*, const wchar_t*, s32); - void setTextBoxArgGameMessageRecursive(LayoutActor*, const char*, const char*, s32); - void setTextBoxVerticalPositionTopRecursive(LayoutActor*, const char*); - void setTextBoxVerticalPositionCenterRecursive(LayoutActor*, const char*); - void setTextBoxVerticalPositionBottomRecursive(LayoutActor*, const char*); - void setTextBoxHorizontalPositionLeftRecursive(LayoutActor*, const char*); - void setTextBoxHorizontalPositionCenterRecursive(LayoutActor*, const char*); - void updateClearTimeTextBox(LayoutActor*, const char*, u32); - void updateMinuteAndSecondTextBox(LayoutActor*, const char*, u32); - void setTextBoxFontRecursive(LayoutActor*, const char*, nw4r::ut::Font*); - void showPane(LayoutActor*, const char*); - void showPaneRecursive(LayoutActor*, const char*); - void hidePane(LayoutActor*, const char*); - void hidePaneRecursive(LayoutActor*, const char*); - bool isHiddenPane(const LayoutActor*, const char*); - void showScreen(LayoutActor*); - void hideScreen(LayoutActor*); - void setFollowPos(const TVec2f*, const LayoutActor*, const char*); - void setFollowTypeReplace(const LayoutActor*, const char*); - void setFollowTypeAdd(const LayoutActor*, const char*); - void copyPaneTrans(TVec2f*, const LayoutActor*, const char*); - f32 getPaneTransX(const LayoutActor*, const char*); - f32 getPaneTransY(const LayoutActor*, const char*); - void setLayoutPosAtPaneTrans(LayoutActor*, const LayoutActor*, const char*); - void copyPaneScale(TVec2f*, const LayoutActor*, const char*); - void setPaneScale(const LayoutActor*, f32, f32, const char*); - void setLayoutScaleAtPaneScale(LayoutActor*, const LayoutActor*, const char*); - void copyPaneRotate(TVec3f*, const LayoutActor*, const char*); - void setPaneRotate(const LayoutActor*, f32, f32, f32, const char*); - void setLayoutScalePosAtPaneScaleTrans(LayoutActor*, const LayoutActor*, const char*); - void setLayoutScalePosAtPaneScaleTransIfExecCalcAnim(LayoutActor*, const LayoutActor*, const char*); + LayoutHolder* createAndAddLayoutHolder(const char*); + LayoutHolder* createAndAddLayoutHolderRawData(const char*); + void createAndAddPaneCtrl(LayoutActor*, const char*, u32); + void createAndAddGroupCtrl(LayoutActor*, const char*, u32); + bool isExistPaneCtrl(LayoutActor*, const char*); + u8 getPaneAlpha(const LayoutActor*, const char*); + void setInfluencedAlphaToChild(const LayoutActor*); + void setLayoutAlpha(const LayoutActor*, u8); + void setLayoutAlphaFloat(const LayoutActor*, f32); + void setPaneAlpha(const LayoutActor*, const char*, u8); + void setPaneAlphaFloat(const LayoutActor*, const char*, f32); + void executeTextBoxRecursive(LayoutActor*, const char*, const TextBoxRecursiveOperation&); + void setTextBoxGameMessageRecursive(LayoutActor*, const char*, const char*); + void setTextBoxLayoutMessageRecursive(LayoutActor*, const char*, const char*); + void setTextBoxSystemMessageRecursive(LayoutActor*, const char*, const char*); + void setTextBoxMessageRecursive(LayoutActor*, const char*, const wchar_t*); + void setTextBoxFormatRecursive(LayoutActor*, const char*, const wchar_t*, ...); + void setTextBoxArgNumberRecursive(LayoutActor*, const char*, s32, s32); + void setTextBoxArgStringRecursive(LayoutActor*, const char*, const wchar_t*, s32); + void setTextBoxArgGameMessageRecursive(LayoutActor*, const char*, const char*, s32); + void setTextBoxVerticalPositionTopRecursive(LayoutActor*, const char*); + void setTextBoxVerticalPositionCenterRecursive(LayoutActor*, const char*); + void setTextBoxVerticalPositionBottomRecursive(LayoutActor*, const char*); + void setTextBoxHorizontalPositionLeftRecursive(LayoutActor*, const char*); + void setTextBoxHorizontalPositionCenterRecursive(LayoutActor*, const char*); + void updateClearTimeTextBox(LayoutActor*, const char*, u32); + void updateMinuteAndSecondTextBox(LayoutActor*, const char*, u32); + void setTextBoxFontRecursive(LayoutActor*, const char*, nw4r::ut::Font*); + void showPane(LayoutActor*, const char*); + void showPaneRecursive(LayoutActor*, const char*); + void hidePane(LayoutActor*, const char*); + void hidePaneRecursive(LayoutActor*, const char*); + bool isHiddenPane(const LayoutActor*, const char*); + void showScreen(LayoutActor*); + void hideScreen(LayoutActor*); + void setFollowPos(const TVec2f*, const LayoutActor*, const char*); + void setFollowTypeReplace(const LayoutActor*, const char*); + void setFollowTypeAdd(const LayoutActor*, const char*); + void copyPaneTrans(TVec2f*, const LayoutActor*, const char*); + f32 getPaneTransX(const LayoutActor*, const char*); + f32 getPaneTransY(const LayoutActor*, const char*); + void setLayoutPosAtPaneTrans(LayoutActor*, const LayoutActor*, const char*); + void copyPaneScale(TVec2f*, const LayoutActor*, const char*); + void setPaneScale(const LayoutActor*, f32, f32, const char*); + void setLayoutScaleAtPaneScale(LayoutActor*, const LayoutActor*, const char*); + void copyPaneRotate(TVec3f*, const LayoutActor*, const char*); + void setPaneRotate(const LayoutActor*, f32, f32, f32, const char*); + void setLayoutScalePosAtPaneScaleTrans(LayoutActor*, const LayoutActor*, const char*); + void setLayoutScalePosAtPaneScaleTransIfExecCalcAnim(LayoutActor*, const LayoutActor*, const char*); nw4r::lyt::TexMap* createLytTexMap(const char*, const char*); nw4r::lyt::TexMap* createLytTexMap(ResTIMG*); nw4r::lyt::TexMap* getLytTexMap(LayoutActor*, const char*, u8); - void replacePaneTexture(LayoutActor*, const char*, const nw4r::lyt::TexMap*, u8); - void startAnim(LayoutActor*, const char*, u32); - void startAnimAtFirstStep(LayoutActor*, const char*, u32); - void startPaneAnim(LayoutActor*, const char*, const char*, u32); - void startPaneAnimAtStep(LayoutActor*, const char*, const char*, s32, u32); - void startPaneAnimAtFirstStep(LayoutActor*, const char*, const char*, u32); - void startAnimReverseOneTime(LayoutActor*, const char*, u32); - void startPaneAnimReverseOneTime(LayoutActor*, const char*, const char*, u32); - void startAnimAndSetFrameAndStop(LayoutActor*, const char*, f32, u32); - void setAnimFrameAndStop(LayoutActor*, f32, u32); - void setAnimFrameAndStopAtEnd(LayoutActor*, u32); - void setAnimFrameAndStopAdjustTextWidth(LayoutActor*, const char*, u32); - void setAnimFrameAndStopAdjustTextHeight(LayoutActor*, const char*, u32); - void setPaneAnimFrameAndStop(LayoutActor*, const char*, f32, u32); - void setPaneAnimFrameAndStopAtEnd(LayoutActor*, const char*, u32); - void setAnimFrame(LayoutActor*, f32, u32); - void setPaneAnimFrame(LayoutActor*, const char*, f32, u32); - void setAnimRate(LayoutActor*, f32, u32); - void setPaneAnimRate(LayoutActor*, const char*, f32, u32); - void stopAnim(LayoutActor*, u32); - void stopPaneAnim(LayoutActor*, const char*, u32); - bool isAnimStopped(const LayoutActor*, u32); - bool isPaneAnimStopped(const LayoutActor*, const char*, u32); - f32 getAnimFrame(const LayoutActor*, u32); - f32 getPaneAnimFrame(const LayoutActor*, const char*, u32); - s16 getAnimFrameMax(const LayoutActor*, u32); - s16 getPaneAnimFrameMax(const LayoutActor*, const char*, u32); - s16 getAnimFrameMax(const LayoutActor*, const char*); - J3DFrameCtrl* getAnimCtrl(const LayoutActor*, u32); - J3DFrameCtrl* getPaneAnimCtrl(const LayoutActor*, const char*, u32); - void emitEffect(LayoutActor*, const char*); - void deleteEffect(LayoutActor*, const char*); - void forceDeleteEffect(LayoutActor*, const char*); - void deleteEffectAll(LayoutActor*); - void forceDeleteEffectAll(LayoutActor*); - void setEffectHostMtx(LayoutActor*, const char*, MtxPtr); - void setEffectRate(LayoutActor*, const char*, f32); - void setEffectDirectionalSpeed(LayoutActor*, const char*, f32); - void pauseOffEffectAll(LayoutActor*); - bool isRegisteredEffect(const LayoutActor*, const char*); - void copyLayoutDrawInfoWithAspect(nw4r::lyt::DrawInfo*, const LayoutActor*, bool); - void calcAnimLayoutWithDrawInfo(const LayoutActor*, const nw4r::lyt::DrawInfo&); - void drawLayoutWithDrawInfoWithoutProjectionSetup(const LayoutActor*, const nw4r::lyt::DrawInfo&); - bool isStep(const LayoutActor*, s32) NO_INLINE; - bool isFirstStep(const LayoutActor*); - bool isLessStep(const LayoutActor*, s32); - bool isGreaterStep(const LayoutActor*, s32); - bool isGreaterEqualStep(const LayoutActor*, s32); - bool isIntervalStep(const LayoutActor*, s32); - bool isNewNerve(const LayoutActor*) NO_INLINE; - f32 calcNerveRate(const LayoutActor*, s32); - f32 calcNerveRate(const LayoutActor*, s32, s32); - f32 calcNerveEaseInRate(const LayoutActor*, s32); - f32 calcNerveEaseInValue(const LayoutActor*, s32, s32, f32, f32); - void setNerveAtStep(LayoutActor*, const Nerve*, s32); - void setNerveAtAnimStopped(LayoutActor*, const Nerve*, u32); - void setNerveAtPaneAnimStopped(LayoutActor*, const char*, const Nerve*, u32); - void killAtAnimStopped(LayoutActor*, u32); - bool isDead(const LayoutActor*); - bool isHiddenLayout(const LayoutActor*); - void showLayout(LayoutActor*); - void hideLayout(LayoutActor*); - bool isStopAnimFrame(const LayoutActor*); - void stopAnimFrame(LayoutActor*); - void releaseAnimFrame(LayoutActor*); - void onCalcAnim(LayoutActor*); - void offCalcAnim(LayoutActor*); - bool isExecuteCalcAnimLayout(const LayoutActor*); - bool isExecuteDrawLayout(const LayoutActor*); - SimpleLayout* createSimpleLayout(const char*, const char*, u32); - SimpleLayout* createSimpleLayoutTalkParts(const char*, const char*, u32); - nw4r::lyt::Pane* getPane(const LayoutActor*, const char*); - nw4r::lyt::Pane* getRootPane(const LayoutActor*); - void calcTextBoxRectRecursive(TBox2f*, const LayoutActor*, const char*); - u32 getTextLineNumMaxRecursive(const LayoutActor*, const char*); - void invalidateParentAnim(LayoutActor*); - void setCometPaneAnimFromId(LayoutActor*, const char*, int, u32); - void setTextBoxNumberRecursive(LayoutActor*, const char*, s32); - void clearTextBoxMessageRecursive(LayoutActor*, const char*); - IconAButton* createAndSetupIconAButton(LayoutActor*, bool, bool); - void setCometAnimFromId(LayoutActor*, int, u32); -}; + void replacePaneTexture(LayoutActor*, const char*, const nw4r::lyt::TexMap*, u8); + void startAnim(LayoutActor*, const char*, u32); + void startAnimAtFirstStep(LayoutActor*, const char*, u32); + void startPaneAnim(LayoutActor*, const char*, const char*, u32); + void startPaneAnimAtStep(LayoutActor*, const char*, const char*, s32, u32); + void startPaneAnimAtFirstStep(LayoutActor*, const char*, const char*, u32); + void startAnimReverseOneTime(LayoutActor*, const char*, u32); + void startPaneAnimReverseOneTime(LayoutActor*, const char*, const char*, u32); + void startAnimAndSetFrameAndStop(LayoutActor*, const char*, f32, u32); + void setAnimFrameAndStop(LayoutActor*, f32, u32); + void setAnimFrameAndStopAtEnd(LayoutActor*, u32); + void setAnimFrameAndStopAdjustTextWidth(LayoutActor*, const char*, u32); + void setAnimFrameAndStopAdjustTextHeight(LayoutActor*, const char*, u32); + void setPaneAnimFrameAndStop(LayoutActor*, const char*, f32, u32); + void setPaneAnimFrameAndStopAtEnd(LayoutActor*, const char*, u32); + void setAnimFrame(LayoutActor*, f32, u32); + void setPaneAnimFrame(LayoutActor*, const char*, f32, u32); + void setAnimRate(LayoutActor*, f32, u32); + void setPaneAnimRate(LayoutActor*, const char*, f32, u32); + void stopAnim(LayoutActor*, u32); + void stopPaneAnim(LayoutActor*, const char*, u32); + bool isAnimStopped(const LayoutActor*, u32); + bool isPaneAnimStopped(const LayoutActor*, const char*, u32); + f32 getAnimFrame(const LayoutActor*, u32); + f32 getPaneAnimFrame(const LayoutActor*, const char*, u32); + s16 getAnimFrameMax(const LayoutActor*, u32); + s16 getPaneAnimFrameMax(const LayoutActor*, const char*, u32); + s16 getAnimFrameMax(const LayoutActor*, const char*); + J3DFrameCtrl* getAnimCtrl(const LayoutActor*, u32); + J3DFrameCtrl* getPaneAnimCtrl(const LayoutActor*, const char*, u32); + void emitEffect(LayoutActor*, const char*); + void deleteEffect(LayoutActor*, const char*); + void forceDeleteEffect(LayoutActor*, const char*); + void deleteEffectAll(LayoutActor*); + void forceDeleteEffectAll(LayoutActor*); + void setEffectHostMtx(LayoutActor*, const char*, MtxPtr); + void setEffectRate(LayoutActor*, const char*, f32); + void setEffectDirectionalSpeed(LayoutActor*, const char*, f32); + void pauseOffEffectAll(LayoutActor*); + bool isRegisteredEffect(const LayoutActor*, const char*); + void copyLayoutDrawInfoWithAspect(nw4r::lyt::DrawInfo*, const LayoutActor*, bool); + void calcAnimLayoutWithDrawInfo(const LayoutActor*, const nw4r::lyt::DrawInfo&); + void drawLayoutWithDrawInfoWithoutProjectionSetup(const LayoutActor*, const nw4r::lyt::DrawInfo&); + bool isStep(const LayoutActor*, s32) NO_INLINE; + bool isFirstStep(const LayoutActor*); + bool isLessStep(const LayoutActor*, s32); + bool isGreaterStep(const LayoutActor*, s32); + bool isGreaterEqualStep(const LayoutActor*, s32); + bool isIntervalStep(const LayoutActor*, s32); + bool isNewNerve(const LayoutActor*) NO_INLINE; + f32 calcNerveRate(const LayoutActor*, s32); + f32 calcNerveRate(const LayoutActor*, s32, s32); + f32 calcNerveEaseInRate(const LayoutActor*, s32); + f32 calcNerveEaseInValue(const LayoutActor*, s32, s32, f32, f32); + void setNerveAtStep(LayoutActor*, const Nerve*, s32); + void setNerveAtAnimStopped(LayoutActor*, const Nerve*, u32); + void setNerveAtPaneAnimStopped(LayoutActor*, const char*, const Nerve*, u32); + void killAtAnimStopped(LayoutActor*, u32); + bool isDead(const LayoutActor*); + bool isHiddenLayout(const LayoutActor*); + void showLayout(LayoutActor*); + void hideLayout(LayoutActor*); + bool isStopAnimFrame(const LayoutActor*); + void stopAnimFrame(LayoutActor*); + void releaseAnimFrame(LayoutActor*); + void onCalcAnim(LayoutActor*); + void offCalcAnim(LayoutActor*); + bool isExecuteCalcAnimLayout(const LayoutActor*); + bool isExecuteDrawLayout(const LayoutActor*); + SimpleLayout* createSimpleLayout(const char*, const char*, u32); + SimpleLayout* createSimpleLayoutTalkParts(const char*, const char*, u32); + nw4r::lyt::Pane* getPane(const LayoutActor*, const char*); + nw4r::lyt::Pane* getRootPane(const LayoutActor*); + void calcTextBoxRectRecursive(TBox2f*, const LayoutActor*, const char*); + u32 getTextLineNumMaxRecursive(const LayoutActor*, const char*); + void invalidateParentAnim(LayoutActor*); + void setCometPaneAnimFromId(LayoutActor*, const char*, int, u32); + void setTextBoxNumberRecursive(LayoutActor*, const char*, s32); + void clearTextBoxMessageRecursive(LayoutActor*, const char*); + IconAButton* createAndSetupIconAButton(LayoutActor*, bool, bool); + void setCometAnimFromId(LayoutActor*, int, u32); +}; // namespace MR diff --git a/include/Game/Util/LightUtil.hpp b/include/Game/Util/LightUtil.hpp index 0ffdcc38d..475cd5e7c 100644 --- a/include/Game/Util/LightUtil.hpp +++ b/include/Game/Util/LightUtil.hpp @@ -7,9 +7,9 @@ class LiveActor; namespace MR { - void initActorLightInfoLightType(LiveActor *, s32); + void initActorLightInfoLightType(LiveActor*, s32); - void requestPointLight(const LiveActor *, TVec3f, Color8, f32, s32); + void requestPointLight(const LiveActor*, TVec3f, Color8, f32, s32); void loadLightPlayer(); -}; \ No newline at end of file +}; // namespace MR \ No newline at end of file diff --git a/include/Game/Util/LiveActorUtil.hpp b/include/Game/Util/LiveActorUtil.hpp index 61fb5516b..a41d4ef4b 100644 --- a/include/Game/Util/LiveActorUtil.hpp +++ b/include/Game/Util/LiveActorUtil.hpp @@ -29,11 +29,11 @@ class TexMtxCtrl; class TriangleFilterBase; namespace MR { - enum CollisionScaleType { - AutoEqualScale = 0, - NoScale = 1, - UNKNOWN_2 = 2, - UNKNOWN_3 = 3 + enum CollisionScaleType { + AutoEqualScale = 0, + NoScale = 1, + UNKNOWN_2 = 2, + UNKNOWN_3 = 3 }; bool isExistIndirectTexture(const LiveActor*); @@ -65,7 +65,7 @@ namespace MR { bool isValidCollisionParts(LiveActor*); void setCollisionMtx(LiveActor*); - void setCollisionMtx(LiveActor *, CollisionParts *); + void setCollisionMtx(LiveActor*, CollisionParts*); void invalidateClipping(LiveActor*); @@ -117,67 +117,67 @@ namespace MR { void zeroVelocity(LiveActor*); - void initLightCtrl(LiveActor*); - void initLightCtrlForPlayer(LiveActor*); - void initLightCtrlNoDrawEnemy(LiveActor*); - void initLightCtrlNoDrawMapObj(LiveActor*); - void updateLightCtrl(LiveActor*); - void updateLightCtrlDirect(LiveActor*); - void loadActorLight(const LiveActor*); - void calcLightPos0(TVec3f*, const LiveActor*); - void calcLightPos1(TVec3f*, const LiveActor*); - const GXColor* getLightAmbientColor(const LiveActor*); + void initLightCtrl(LiveActor*); + void initLightCtrlForPlayer(LiveActor*); + void initLightCtrlNoDrawEnemy(LiveActor*); + void initLightCtrlNoDrawMapObj(LiveActor*); + void updateLightCtrl(LiveActor*); + void updateLightCtrlDirect(LiveActor*); + void loadActorLight(const LiveActor*); + void calcLightPos0(TVec3f*, const LiveActor*); + void calcLightPos1(TVec3f*, const LiveActor*); + const GXColor* getLightAmbientColor(const LiveActor*); ActorLightCtrl* getLightCtrl(const LiveActor*); - bool isStep(const LiveActor*, s32) NO_INLINE; - bool isFirstStep(const LiveActor*); - bool isLessStep(const LiveActor*, s32); - bool isLessEqualStep(const LiveActor*, s32); - bool isGreaterStep(const LiveActor*, s32); - bool isGreaterEqualStep(const LiveActor*, s32); - bool isIntervalStep(const LiveActor*, s32); - bool isNewNerve(const LiveActor*); - f32 calcNerveRate(const LiveActor*, s32); - f32 calcNerveRate(const LiveActor*, s32, s32); - f32 calcNerveEaseInRate(const LiveActor*, s32); - f32 calcNerveEaseOutRate(const LiveActor*, s32); - f32 calcNerveEaseOutRate(const LiveActor*, s32, s32); - f32 calcNerveEaseInOutRate(const LiveActor*, s32); - f32 calcNerveEaseInOutRate(const LiveActor*, s32, s32); - f32 calcNerveValue(const LiveActor*, s32, f32, f32); - f32 calcNerveValue(const LiveActor*, s32, s32, f32, f32); - f32 calcNerveEaseInValue(const LiveActor*, s32, f32, f32); - f32 calcNerveEaseInValue(const LiveActor*, s32, s32, f32, f32); - f32 calcNerveEaseOutValue(const LiveActor*, s32, f32, f32); - f32 calcNerveEaseInOutValue(const LiveActor*, s32, f32, f32); - f32 calcNerveEaseInOutValue(const LiveActor*, s32, s32, f32, f32); - void setNerveAtStep(LiveActor*, const Nerve*, s32); - void setNerveAtBckStopped(LiveActor*, const Nerve*); - bool trySetNerve(LiveActor*, const Nerve*); - const TVec3f* getGroundNormal(const LiveActor*); - const TVec3f* getWallNormal(const LiveActor*); - const TVec3f* getRoofNormal(const LiveActor*); - const TVec3f* getBindedNormal(const LiveActor*); - const TVec3f* getBindedHitPos(const LiveActor*); - const TVec3f* getGroundHitPos(const LiveActor*); - const TVec3f* getWallHitPos(const LiveActor*); - const TVec3f* getRoofHitPos(const LiveActor*); - const TVec3f* getGroundHitPos(const LiveActor*); - const TVec3f* getWallHitPos(const LiveActor*); - const TVec3f* getRoofHitPos(const LiveActor*); - void calcWallNormalHorizontal(TVec3f*, const LiveActor*); - f32 calcHitPowerToGround(const LiveActor*); - f32 calcHitPowerToWall(const LiveActor*); - int getBindedPlaneNum(const LiveActor*); - const TVec3f* getBindedPlaneNormal(const LiveActor*, int); - HitSensor* getBindedPlaneSensor(const LiveActor*, int); - TVec3f* getBindedFixReactionVector(const LiveActor*); - void setBinderOffsetVec(LiveActor*, const TVec3f*, bool); - void setBinderRadius(LiveActor*, f32); - f32 getBinderRadius(const LiveActor*); + bool isStep(const LiveActor*, s32) NO_INLINE; + bool isFirstStep(const LiveActor*); + bool isLessStep(const LiveActor*, s32); + bool isLessEqualStep(const LiveActor*, s32); + bool isGreaterStep(const LiveActor*, s32); + bool isGreaterEqualStep(const LiveActor*, s32); + bool isIntervalStep(const LiveActor*, s32); + bool isNewNerve(const LiveActor*); + f32 calcNerveRate(const LiveActor*, s32); + f32 calcNerveRate(const LiveActor*, s32, s32); + f32 calcNerveEaseInRate(const LiveActor*, s32); + f32 calcNerveEaseOutRate(const LiveActor*, s32); + f32 calcNerveEaseOutRate(const LiveActor*, s32, s32); + f32 calcNerveEaseInOutRate(const LiveActor*, s32); + f32 calcNerveEaseInOutRate(const LiveActor*, s32, s32); + f32 calcNerveValue(const LiveActor*, s32, f32, f32); + f32 calcNerveValue(const LiveActor*, s32, s32, f32, f32); + f32 calcNerveEaseInValue(const LiveActor*, s32, f32, f32); + f32 calcNerveEaseInValue(const LiveActor*, s32, s32, f32, f32); + f32 calcNerveEaseOutValue(const LiveActor*, s32, f32, f32); + f32 calcNerveEaseInOutValue(const LiveActor*, s32, f32, f32); + f32 calcNerveEaseInOutValue(const LiveActor*, s32, s32, f32, f32); + void setNerveAtStep(LiveActor*, const Nerve*, s32); + void setNerveAtBckStopped(LiveActor*, const Nerve*); + bool trySetNerve(LiveActor*, const Nerve*); + const TVec3f* getGroundNormal(const LiveActor*); + const TVec3f* getWallNormal(const LiveActor*); + const TVec3f* getRoofNormal(const LiveActor*); + const TVec3f* getBindedNormal(const LiveActor*); + const TVec3f* getBindedHitPos(const LiveActor*); + const TVec3f* getGroundHitPos(const LiveActor*); + const TVec3f* getWallHitPos(const LiveActor*); + const TVec3f* getRoofHitPos(const LiveActor*); + const TVec3f* getGroundHitPos(const LiveActor*); + const TVec3f* getWallHitPos(const LiveActor*); + const TVec3f* getRoofHitPos(const LiveActor*); + void calcWallNormalHorizontal(TVec3f*, const LiveActor*); + f32 calcHitPowerToGround(const LiveActor*); + f32 calcHitPowerToWall(const LiveActor*); + int getBindedPlaneNum(const LiveActor*); + const TVec3f* getBindedPlaneNormal(const LiveActor*, int); + HitSensor* getBindedPlaneSensor(const LiveActor*, int); + TVec3f* getBindedFixReactionVector(const LiveActor*); + void setBinderOffsetVec(LiveActor*, const TVec3f*, bool); + void setBinderRadius(LiveActor*, f32); + f32 getBinderRadius(const LiveActor*); - void initFur(LiveActor *); - void initFurPlanet(LiveActor *); - void initFurPlayer(LiveActor *); + void initFur(LiveActor*); + void initFurPlanet(LiveActor*); + void initFurPlayer(LiveActor*); void initCollisionParts(LiveActor*, const char*, HitSensor*, MtxPtr); void initCollisionPartsAutoEqualScale(LiveActor*, const char*, HitSensor*, MtxPtr); @@ -212,9 +212,9 @@ namespace MR { bool isBrkOneTimeAndStopped(const LiveActor*); - bool tryStartBckAndBtp(const LiveActor *, const char *, const char *); + bool tryStartBckAndBtp(const LiveActor*, const char*, const char*); void setAllAnimFrame(const LiveActor*, const char*, f32); - void setAllAnimFrameAndStop(const LiveActor *, const char *, f32); + void setAllAnimFrameAndStop(const LiveActor*, const char*, f32); void setAllAnimFrameAtEnd(const LiveActor*, const char*); void startBck(const LiveActor*, const char*, const char*); @@ -237,12 +237,12 @@ namespace MR { void setBtkRate(const LiveActor*, f32); void setBrkRate(const LiveActor*, f32); - void setBvaRate(const LiveActor *, f32); + void setBvaRate(const LiveActor*, f32); void setBckFrame(const LiveActor*, f32); - f32 getBckFrameMax(const LiveActor*); - f32 getBrkFrameMax(const LiveActor*); - f32 getBtkFrameMax(const LiveActor*); + f32 getBckFrameMax(const LiveActor*); + f32 getBrkFrameMax(const LiveActor*); + f32 getBtkFrameMax(const LiveActor*); void setBckFrameAndStop(const LiveActor*, f32); s16 getBrkFrameMax(const LiveActor*, const char*); @@ -259,7 +259,7 @@ namespace MR { bool isBckPlaying(const LiveActor*, const char*); - bool isBckLooped(const LiveActor *); + bool isBckLooped(const LiveActor*); bool checkPassBckFrame(const LiveActor* pActor, f32 f); bool isBckStopped(const LiveActor*); @@ -296,9 +296,9 @@ namespace MR { ModelObj* createModelObjIndirectMapObj(const char*, const char*, MtxPtr); ModelObj* createModelObjNoSilhouettedMapObj(const char*, const char*, MtxPtr); ModelObj* createModelObjNpc(const char*, const char*, MtxPtr); - ModelObj* createModelObjEnemy(const char *, const char *, MtxPtr); + ModelObj* createModelObjEnemy(const char*, const char*, MtxPtr); - ModelObj* createModelObjBloomModel(const char *, const char *, MtxPtr); + ModelObj* createModelObjBloomModel(const char*, const char*, MtxPtr); PartsModel* createPartsModelMapObj(LiveActor*, const char*, const char*, MtxPtr); @@ -315,7 +315,7 @@ namespace MR { void startAction(const LiveActor*, const char*); - bool tryStartAction(const LiveActor *, const char *); + bool tryStartAction(const LiveActor*, const char*); LodCtrl* createLodCtrlPlanet(LiveActor*, const JMapInfoIter&, f32, s32); LodCtrl* createLodCtrlNPC(LiveActor*, const JMapInfoIter&); @@ -323,7 +323,7 @@ namespace MR { bool changeShowModelFlagSyncNearClipping(LiveActor*, f32); - u32 createIndirectPlanetModel(LiveActor*, MtxPtr); + u32 createIndirectPlanetModel(LiveActor*, MtxPtr); bool tryCreateMirrorActor(LiveActor*, const char*); CollisionParts* createCollisionPartsFromLiveActor(LiveActor*, const char*, HitSensor*, CollisionScaleType); @@ -379,7 +379,7 @@ namespace MR { void initCollisionPartsAutoEqualScaleOne(LiveActor*, const char*, HitSensor*, MtxPtr); void initCollisionPartsFromResourceHolder(LiveActor*, const char*, HitSensor*, ResourceHolder*, MtxPtr); - ResTIMG* getTexFromArc(const char*, const LiveActor*); + ResTIMG* getTexFromArc(const char*, const LiveActor*); PartsModel* createBloomModel(LiveActor*, MtxPtr); CollisionParts* getCollisionParts(const LiveActor*); @@ -390,18 +390,18 @@ namespace MR { void reflectBckCtrlData(LiveActor*, const BckCtrlData&); - bool isExistKcl(LiveActor *, const char *); + bool isExistKcl(LiveActor*, const char*); - s32 countShowGroupMember(const LiveActor *); - s32 countHideGroupMember(const LiveActor *); + s32 countShowGroupMember(const LiveActor*); + s32 countHideGroupMember(const LiveActor*); - f32 getBckFrame(const LiveActor *); + f32 getBckFrame(const LiveActor*); - f32 calcNerveValue(const LiveActor *, s32, s32, f32, f32); + f32 calcNerveValue(const LiveActor*, s32, s32, f32, f32); - LiveActor* getPairedGroupMember(const LiveActor *); + LiveActor* getPairedGroupMember(const LiveActor*); - TVec3f* getBindedFixReactionVector(const LiveActor *); + TVec3f* getBindedFixReactionVector(const LiveActor*); - CollisionParts* tryCreateCollisionSunshade(LiveActor *, HitSensor *); -}; // namespace MR + CollisionParts* tryCreateCollisionSunshade(LiveActor*, HitSensor*); +}; // namespace MR diff --git a/include/Game/Util/MapPartsUtil.hpp b/include/Game/Util/MapPartsUtil.hpp index 627131e32..a914d9871 100644 --- a/include/Game/Util/MapPartsUtil.hpp +++ b/include/Game/Util/MapPartsUtil.hpp @@ -10,31 +10,31 @@ class MapPartsRailRotator; class LiveActor; namespace MR { - bool getMapPartsArgMoveConditionType(s32 *, const JMapInfoIter &); - bool getMapPartsArgRotateSpeed(f32 *, const JMapInfoIter &); - bool getMapPartsArgRotateTime(s32 *, const JMapInfoIter &); - bool getMapPartsArgRotateAngle(f32 *, const JMapInfoIter &); - bool getMapPartsArgRotateAxis(s32 *, const JMapInfoIter &); - bool getMapPartsArgRotateAccelType(s32 *, const JMapInfoIter &); - bool getMapPartsArgRotateStopTime(s32 *, const JMapInfoIter &); - bool getMapPartsArgRotateType(s32 *, const JMapInfoIter &); - s32 getMapPartsArgShadowType(s32 *, const JMapInfoIter &); - bool getMapPartsArgSignMotionType(s32 *, const JMapInfoIter &); - bool getMapPartsArgMovePosture(s32 *, const JMapInfoIter &); - bool getMapPartsArgMoveStopType(s32 *, const JMapInfoIter &); - bool getMapPartsArgRailGuideType(s32 *, const JMapInfoIter &); - bool getMapPartsArgRailInitPosType(s32 *, const JMapInfoIter &); - bool getMapPartsArgMoveSpeed(f32 *, const JMapInfoIter &); - bool getMapPartsArgMoveSpeed(f32 *, const LiveActor*); - bool getMapPartsArgStopTime(s32 *, const JMapInfoIter &); - bool getMapPartsArgAccelTime(s32 *, const JMapInfoIter &); - bool getMapPartsArgSpeedCalcType(s32 *, const JMapInfoIter &); - bool getMapPartsArgRailRotateSpeed(f32 *, const JMapInfoIter &); - bool getMapPartsArgRailRotateTime(s32 *, const JMapInfoIter &); + bool getMapPartsArgMoveConditionType(s32*, const JMapInfoIter&); + bool getMapPartsArgRotateSpeed(f32*, const JMapInfoIter&); + bool getMapPartsArgRotateTime(s32*, const JMapInfoIter&); + bool getMapPartsArgRotateAngle(f32*, const JMapInfoIter&); + bool getMapPartsArgRotateAxis(s32*, const JMapInfoIter&); + bool getMapPartsArgRotateAccelType(s32*, const JMapInfoIter&); + bool getMapPartsArgRotateStopTime(s32*, const JMapInfoIter&); + bool getMapPartsArgRotateType(s32*, const JMapInfoIter&); + s32 getMapPartsArgShadowType(s32*, const JMapInfoIter&); + bool getMapPartsArgSignMotionType(s32*, const JMapInfoIter&); + bool getMapPartsArgMovePosture(s32*, const JMapInfoIter&); + bool getMapPartsArgMoveStopType(s32*, const JMapInfoIter&); + bool getMapPartsArgRailGuideType(s32*, const JMapInfoIter&); + bool getMapPartsArgRailInitPosType(s32*, const JMapInfoIter&); + bool getMapPartsArgMoveSpeed(f32*, const JMapInfoIter&); + bool getMapPartsArgMoveSpeed(f32*, const LiveActor*); + bool getMapPartsArgStopTime(s32*, const JMapInfoIter&); + bool getMapPartsArgAccelTime(s32*, const JMapInfoIter&); + bool getMapPartsArgSpeedCalcType(s32*, const JMapInfoIter&); + bool getMapPartsArgRailRotateSpeed(f32*, const JMapInfoIter&); + bool getMapPartsArgRailRotateTime(s32*, const JMapInfoIter&); - void getMapPartsObjectName(char *, u32, const char *, s32); - void getMapPartsObjectName(char *, u32, const JMapInfoIter &); - void getMapPartsObjectNameIfExistShapeID(char *, u32, const JMapInfoIter &); + void getMapPartsObjectName(char*, u32, const char*, s32); + void getMapPartsObjectName(char*, u32, const JMapInfoIter&); + void getMapPartsObjectNameIfExistShapeID(char*, u32, const JMapInfoIter&); bool hasMapPartsShadow(s32); @@ -44,29 +44,29 @@ namespace MR { bool isMapPartsShadowTypeNone(s32); - void setBodySensorType(LiveActor *, u32); + void setBodySensorType(LiveActor*, u32); - const HitSensor* getBodySensor(LiveActor *); + const HitSensor* getBodySensor(LiveActor*); - void initMapPartsClipping(LiveActor *, const JMapInfoIter &, TVec3f *, bool); + void initMapPartsClipping(LiveActor*, const JMapInfoIter&, TVec3f*, bool); - MapPartsRailGuideDrawer* createMapPartsRailGuideDrawer(LiveActor *, const char *, const JMapInfoIter &); + MapPartsRailGuideDrawer* createMapPartsRailGuideDrawer(LiveActor*, const char*, const JMapInfoIter&); - bool isMapPartsPressOn(const JMapInfoIter &); + bool isMapPartsPressOn(const JMapInfoIter&); - void setBodySensorTypePress(LiveActor *); - void setBodySensorTypeMoveCollision(LiveActor *); - void setBodySensorTypeMapObj(LiveActor *); + void setBodySensorTypePress(LiveActor*); + void setBodySensorTypeMoveCollision(LiveActor*); + void setBodySensorTypeMapObj(LiveActor*); bool isMapPartsSignMotionTypeMoveWait(s32); bool isMoveStartTypeUnconditional(s32); - bool receiveMapPartsRotateMsg(LiveActor *, u32, MapPartsRailMover *, MapPartsRailRotator *); + bool receiveMapPartsRotateMsg(LiveActor*, u32, MapPartsRailMover*, MapPartsRailRotator*); - void initMapPartsShadow(LiveActor *, const JMapInfoIter &); + void initMapPartsShadow(LiveActor*, const JMapInfoIter&); - bool isMapPartsRailMovePassedEndPointRepeat(const MapPartsRailMover *); + bool isMapPartsRailMovePassedEndPointRepeat(const MapPartsRailMover*); - bool isMapPartsRailMovePassedStartPointRepeat(const MapPartsRailMover *); -}; + bool isMapPartsRailMovePassedStartPointRepeat(const MapPartsRailMover*); +}; // namespace MR diff --git a/include/Game/Util/MapUtil.hpp b/include/Game/Util/MapUtil.hpp index cc6b7e423..1ae23552d 100644 --- a/include/Game/Util/MapUtil.hpp +++ b/include/Game/Util/MapUtil.hpp @@ -9,47 +9,46 @@ class TriangleFilterBase; class CollisionPartsFilterBase; namespace MR { - bool isBindedGroundAreaMove(const LiveActor *); - bool isBindedGroundRailMove(const LiveActor *); - bool isBindedGroundDamageFire(const LiveActor *); - bool isBindedGroundSand(const LiveActor *); + bool isBindedGroundAreaMove(const LiveActor*); + bool isBindedGroundRailMove(const LiveActor*); + bool isBindedGroundDamageFire(const LiveActor*); + bool isBindedGroundSand(const LiveActor*); bool isWallPolygon(f32); bool isFloorPolygon(f32); bool isCeilingPolygon(f32); + bool getFirstPolyOnLineToMap(TVec3f*, Triangle*, const TVec3f&, const TVec3f&); + bool getFirstPolyOnLineToMapExceptActor(TVec3f*, Triangle*, const TVec3f&, const TVec3f&, const LiveActor*); + bool getFirstPolyNormalOnLineToMap(TVec3f*, const TVec3f&, const TVec3f&, TVec3f*, const HitSensor*); - bool getFirstPolyOnLineToMap(TVec3f *, Triangle *, const TVec3f &, const TVec3f &); - bool getFirstPolyOnLineToMapExceptActor(TVec3f * , Triangle *, const TVec3f &, const TVec3f &, const LiveActor *); - bool getFirstPolyNormalOnLineToMap(TVec3f *, const TVec3f &, const TVec3f &, TVec3f *, const HitSensor *); + bool isWallCodeNoAction(const Triangle*); - bool isWallCodeNoAction(const Triangle *); + void setBindTriangleFilter(LiveActor*, TriangleFilterBase*); - void setBindTriangleFilter(LiveActor *, TriangleFilterBase *); + bool isExistMapCollision(const TVec3f&, const TVec3f&); + bool isExistMapCollisionExceptActor(const TVec3f&, const TVec3f&, const LiveActor*); - bool isExistMapCollision(const TVec3f &, const TVec3f &); - bool isExistMapCollisionExceptActor(const TVec3f &, const TVec3f &, const LiveActor *); + bool checkStikeBallToMap(const TVec3f&, f32); - bool checkStikeBallToMap(const TVec3f &, f32); + bool calcMapGround(const TVec3f&, TVec3f*, f32); + bool calcMapGroundUpper(TVec3f*, const LiveActor*); - bool calcMapGround(const TVec3f &, TVec3f *, f32); - bool calcMapGroundUpper(TVec3f *, const LiveActor *); + bool trySetMoveLimitCollision(LiveActor*); - bool trySetMoveLimitCollision(LiveActor *); + void makeQuatRotateDegree(TQuat4f*, const TVec3f&); - void makeQuatRotateDegree(TQuat4f *, const TVec3f &); + bool isFloorPolygonCos(const TVec3f&, const TVec3f&, f32); - bool isFloorPolygonCos(const TVec3f &, const TVec3f &, f32); + bool isFallNextMove(const LiveActor*, f32, f32, f32, const TriangleFilterBase*); - bool isFallNextMove(const LiveActor *, f32, f32, f32, const TriangleFilterBase *); + s32 getSoundCodeIndex(const JMapInfoIter&); - s32 getSoundCodeIndex(const JMapInfoIter &); - - char* getWallCodeString(const Triangle *); -}; + char* getWallCodeString(const Triangle*); +}; // namespace MR class Collision { public: - static bool checkStrikeLineToMap(const TVec3f &, const TVec3f &, s32, const CollisionPartsFilterBase *, const TriangleFilterBase *); - static bool checkStrikeLineToSunshade(const TVec3f &, const TVec3f &, s32, const CollisionPartsFilterBase *, const TriangleFilterBase *); + static bool checkStrikeLineToMap(const TVec3f&, const TVec3f&, s32, const CollisionPartsFilterBase*, const TriangleFilterBase*); + static bool checkStrikeLineToSunshade(const TVec3f&, const TVec3f&, s32, const CollisionPartsFilterBase*, const TriangleFilterBase*); }; diff --git a/include/Game/Util/MathUtil.hpp b/include/Game/Util/MathUtil.hpp index 513495b98..2c216457c 100644 --- a/include/Game/Util/MathUtil.hpp +++ b/include/Game/Util/MathUtil.hpp @@ -114,9 +114,9 @@ namespace MR { /// @return The fitted mapped number. f32 getEaseInOutValue(f32 x, f32 start, f32 end, f32 max); - f32 getScaleWithReactionValueZeroToOne(f32, f32, f32); - f32 getConvergeVibrationValue(f32, f32, f32, f32, f32); - f32 getReduceVibrationValue(f32, f32, f32, f32, f32); + f32 getScaleWithReactionValueZeroToOne(f32, f32, f32); + f32 getConvergeVibrationValue(f32, f32, f32, f32, f32); + f32 getReduceVibrationValue(f32, f32, f32, f32, f32); void makeAxisFrontUp(TVec3f*, TVec3f*, const TVec3f&, const TVec3f&); void makeAxisFrontSide(TVec3f*, TVec3f*, const TVec3f&, const TVec3f&); void makeAxisUpFront(TVec3f*, TVec3f*, const TVec3f&, const TVec3f&); @@ -176,10 +176,10 @@ namespace MR { void clampVecAngleDeg(TVec3f*, const TVec3f&, f32); void clampLength(TVec3f*, const TVec3f&, f32); - f32 convergeRadian(f32, f32, f32); + f32 convergeRadian(f32, f32, f32); bool isInRange(f32, f32, f32); - f32 calcRotateY(f32, f32); - f32 calcRotateZ(const TVec3f&, const TVec3f&); + f32 calcRotateY(f32, f32); + f32 calcRotateZ(const TVec3f&, const TVec3f&); /// @brief Computes the distance between two points. /// @param[in] rPos1 A reference to the position of the first point. @@ -252,12 +252,12 @@ namespace MR { /// @return The mapped number. f32 normalize(f32 x, f32 min, f32 max); - f32 normalizeAbs(f32, f32, f32); + f32 normalizeAbs(f32, f32, f32); bool turnVecToVecCos(TVec3f*, const TVec3f&, const TVec3f&, f32, const TVec3f&, f32); bool turnVecToVecCosOnPlane(TVec3f*, const TVec3f&, const TVec3f&, const TVec3f&, f32); bool turnVecToVecCosOnPlane(TVec3f*, const TVec3f&, const TVec3f&, f32); - f32 turnVecToVecRadian(TVec3f*, const TVec3f&, const TVec3f&, f32, const TVec3f&); - f32 turnVecToVecDegree(TVec3f*, const TVec3f&, const TVec3f&, f32, const TVec3f&); + f32 turnVecToVecRadian(TVec3f*, const TVec3f&, const TVec3f&, f32, const TVec3f&); + f32 turnVecToVecDegree(TVec3f*, const TVec3f&, const TVec3f&, f32, const TVec3f&); void calcMomentRollBall(TVec3f*, const TVec3f&, const TVec3f&, f32); bool calcReflectionVector(TVec3f*, const TVec3f&, f32, f32); @@ -291,10 +291,10 @@ namespace MR { /// @return `true` if the elements are approximately equal to zero, `false` otherwise. bool isNearZero(const TVec2f& rVec, f32 tolerance); - f32 diffAngleAbs(f32, f32); - f32 normalizeAngleAbs(f32); + f32 diffAngleAbs(f32, f32); + f32 normalizeAngleAbs(f32); bool isAngleBetween(f32, f32, f32); - f32 blendAngle(f32, f32, f32); + f32 blendAngle(f32, f32, f32); /// @brief Computes clamped linear interpolation between two integers. /// @param start The starting integer. @@ -312,7 +312,7 @@ namespace MR { void sortSmall(s32, f32*, s32*); void sortSmall(s32, u32*, s32*); - f32 vecKillElement(const TVec3f&, const TVec3f&, TVec3f*); + f32 vecKillElement(const TVec3f&, const TVec3f&, TVec3f*); void vecScaleAdd(const TVec3f*, const TVec3f*, f32); void PSvecBlend(const TVec3f*, const TVec3f*, TVec3f*, f32, f32); void vecBlend(const TVec3f&, const TVec3f&, TVec3f*, f32); @@ -334,18 +334,18 @@ namespace MR { /// @param t The linear interpolant. void blendVec(Vec* pDst, const Vec& rStart, const Vec& rEnd, f32 t); - f32 turnVecToPlane(TVec3f*, const TVec3f&, const TVec3f&); - u32 getMinAbsElementIndex(const TVec3f&); - f32 getMaxElement(const TVec3f&); - f32 getMaxAbsElement(const TVec3f&); - u32 getMaxElementIndex(const TVec3f&); - u32 getMaxAbsElementIndex(const TVec3f&); - f32 diffAngleAbsFast(const TVec3f&, const TVec3f&); - f32 diffAngleAbs(const TVec3f&, const TVec3f&); - f32 diffAngleAbs(const TVec2f&, const TVec2f&); - f32 diffAngleSigned(const TVec3f&, const TVec3f&, const TVec3f&); - f32 diffAngleAbsHorizontal(const TVec3f&, const TVec3f&, const TVec3f&); - f32 diffAngleSignedHorizontal(const TVec3f&, const TVec3f&, const TVec3f&); + f32 turnVecToPlane(TVec3f*, const TVec3f&, const TVec3f&); + u32 getMinAbsElementIndex(const TVec3f&); + f32 getMaxElement(const TVec3f&); + f32 getMaxAbsElement(const TVec3f&); + u32 getMaxElementIndex(const TVec3f&); + u32 getMaxAbsElementIndex(const TVec3f&); + f32 diffAngleAbsFast(const TVec3f&, const TVec3f&); + f32 diffAngleAbs(const TVec3f&, const TVec3f&); + f32 diffAngleAbs(const TVec2f&, const TVec2f&); + f32 diffAngleSigned(const TVec3f&, const TVec3f&, const TVec3f&); + f32 diffAngleAbsHorizontal(const TVec3f&, const TVec3f&, const TVec3f&); + f32 diffAngleSignedHorizontal(const TVec3f&, const TVec3f&, const TVec3f&); bool isNearAngleRadian(const TVec3f&, const TVec3f&, f32); bool isNearAngleDegree(const TVec3f&, const TVec3f&, f32); bool isNearAngleRadianHV(const TVec3f&, const TVec3f&, const TVec3f&, f32, f32); @@ -389,7 +389,7 @@ namespace MR { void getRotatedAxisY(TVec3f*, const TVec3f&); void getRotatedAxisZ(TVec3f*, const TVec3f&); - template + template T converge(T, T, T); /// @brief Computes the cosine of a number, in radians. @@ -454,7 +454,7 @@ namespace MR { return a + (f32)fmod(360.0f + (b - a), 360.0f); } - #ifdef __MWERKS__ +#ifdef __MWERKS__ inline f32 frsqrte(register f32 x) { register f32 recip; @@ -464,14 +464,14 @@ namespace MR { } return recip * x; } - + inline f32 fastSqrtf(register f32 x) { register f32 recip; if (x > 0.0f) { - __asm { frsqrte recip, x } + __asm { frsqrte recip, x} f32 v = recip * x; - recip = -(v * recip - 3.0f); + recip = -(v * recip - 3.0f); recip = (recip * v); recip *= 0.5f; return recip; @@ -479,16 +479,16 @@ namespace MR { return x; } - #else +#else f32 frsqrte(f32); f32 fastSqrtf(f32); - #endif +#endif - template + template T sqrt(T x) { return fastSqrtf(x); } -}; +}; // namespace MR f32 PSVECKillElement(const Vec*, const Vec*, const Vec*); f32 JMASqrt(f32); diff --git a/include/Game/Util/MemoryUtil.hpp b/include/Game/Util/MemoryUtil.hpp index b92b55c5a..bdd9719f1 100644 --- a/include/Game/Util/MemoryUtil.hpp +++ b/include/Game/Util/MemoryUtil.hpp @@ -19,24 +19,24 @@ namespace MR { class NewDeleteAllocator { public: static void* alloc(MEMAllocator* pAllocator, u32 size); - static void free(MEMAllocator* pAllocator, void* pPtr); + static void free(MEMAllocator* pAllocator, void* pPtr); static MEMAllocatorFunc sAllocatorFunc; - static MEMAllocator sAllocator; + static MEMAllocator sAllocator; }; MEMAllocator* getHomeButtonLayoutAllocator(); - JKRHeap* getCurrentHeap(); - JKRHeap* getAproposHeapForSceneArchive(f32); - JKRExpHeap* getStationedHeapNapa(); - JKRExpHeap* getStationedHeapGDDR3(); + JKRHeap* getCurrentHeap(); + JKRHeap* getAproposHeapForSceneArchive(f32); + JKRExpHeap* getStationedHeapNapa(); + JKRExpHeap* getStationedHeapGDDR3(); JKRSolidHeap* getSceneHeapNapa(); JKRSolidHeap* getSceneHeapGDDR3(); - JKRHeap* getHeapNapa(const JKRHeap* pHeap); - JKRHeap* getHeapGDDR3(const JKRHeap* pHeap); - void becomeCurrentHeap(JKRHeap* pHeap); - bool isEqualCurrentHeap(JKRHeap* pHeap); - void adjustHeapSize(JKRExpHeap* pHeap, const char* pParam2); + JKRHeap* getHeapNapa(const JKRHeap* pHeap); + JKRHeap* getHeapGDDR3(const JKRHeap* pHeap); + void becomeCurrentHeap(JKRHeap* pHeap); + bool isEqualCurrentHeap(JKRHeap* pHeap); + void adjustHeapSize(JKRExpHeap* pHeap, const char* pParam2); /// @brief Copies `size` bytes from `pSrc` to `pDst`. /// @param pDst The pointer to the memory to copy to. @@ -62,16 +62,16 @@ namespace MR { u32 calcCheckSum(const void* pPtr, u32 size); void* allocFromWPadHeap(u32 size); - u8 freeFromWPadHeap(void* pPtr); + u8 freeFromWPadHeap(void* pPtr); - template + template class JKRHeapAllocator { public: static void* alloc(MEMAllocator* pAllocator, u32 size); - static void free(MEMAllocator* pAllocator, void* pPtr); + static void free(MEMAllocator* pAllocator, void* pPtr); - static MEMAllocator sAllocator; + static MEMAllocator sAllocator; static MEMAllocatorFunc sAllocatorFunc; - static JKRHeap* sHeap; + static JKRHeap* sHeap; }; -}; +}; // namespace MR diff --git a/include/Game/Util/MessageUtil.hpp b/include/Game/Util/MessageUtil.hpp index 695c859b3..f270b10ed 100644 --- a/include/Game/Util/MessageUtil.hpp +++ b/include/Game/Util/MessageUtil.hpp @@ -9,15 +9,15 @@ namespace MR { const wchar_t* getCurrentGalaxyNameOnCurrentLanguage(); const wchar_t* getCurrentScenarioNameOnCurrentLanguage(); const wchar_t* getRaceNameOnCurrentLanguage(int); - bool isExistGameMessage(const char*); + bool isExistGameMessage(const char*); const wchar_t* getMessageLine(wchar_t*, u32, const wchar_t*, u32); - s32 countMessageLine(const wchar_t*); - s32 countMessageChar(const wchar_t*); - s32 countMessageFigure(s32); + s32 countMessageLine(const wchar_t*); + s32 countMessageChar(const wchar_t*); + s32 countMessageFigure(s32); const wchar_t* getNextMessagePage(const wchar_t*); const wchar_t* getGalaxyNameOnCurrentLanguage(const char*); const wchar_t* getGalaxyNameShortOnCurrentLanguage(const char*); const wchar_t* getScenarioNameOnCurrentLanguage(const char*, s32); - void getLayoutMessageID(char*, const char*, const char*); - void makeCometMessageID(char*, u32, const char*); -}; + void getLayoutMessageID(char*, const char*, const char*); + void makeCometMessageID(char*, u32, const char*); +}; // namespace MR diff --git a/include/Game/Util/ModelUtil.hpp b/include/Game/Util/ModelUtil.hpp index 1f7d08d6f..4b94bd5b8 100644 --- a/include/Game/Util/ModelUtil.hpp +++ b/include/Game/Util/ModelUtil.hpp @@ -9,49 +9,49 @@ class J3DMaterial; class LiveActor; namespace MR { - bool isExistModel(const char *); + bool isExistModel(const char*); - J3DModel* getJ3DModel(const LiveActor *); - J3DModelData* getJ3DModelData(const LiveActor *); - J3DModelData* getJ3DModelData(const char *); + J3DModel* getJ3DModel(const LiveActor*); + J3DModelData* getJ3DModelData(const LiveActor*); + J3DModelData* getJ3DModelData(const char*); - void calcJ3DModel(LiveActor *); + void calcJ3DModel(LiveActor*); - u32 getMaterialNo(J3DModelData *, const char *); - u32 getMaterialNo(J3DModel *, const char *); - J3DMaterial* getMaterial(J3DModelData *, const char *); - J3DMaterial* getMaterial(J3DModelData *, int); - J3DMaterial* getMaterial(J3DModel *, int); - J3DMaterial* getMaterial(const LiveActor *, int); - u16 getMaterialNum(J3DModel *); - const char* getMaterialName(const J3DModelData *, int); - void updateModelDiffDL(LiveActor *); - bool isEnvelope(J3DMaterial *); - void hideMaterial(J3DModel *, const char *); + u32 getMaterialNo(J3DModelData*, const char*); + u32 getMaterialNo(J3DModel*, const char*); + J3DMaterial* getMaterial(J3DModelData*, const char*); + J3DMaterial* getMaterial(J3DModelData*, int); + J3DMaterial* getMaterial(J3DModel*, int); + J3DMaterial* getMaterial(const LiveActor*, int); + u16 getMaterialNum(J3DModel*); + const char* getMaterialName(const J3DModelData*, int); + void updateModelDiffDL(LiveActor*); + bool isEnvelope(J3DMaterial*); + void hideMaterial(J3DModel*, const char*); - void showMaterial(const LiveActor *, const char *); - void hideMaterial(const LiveActor *, const char *); + void showMaterial(const LiveActor*, const char*); + void hideMaterial(const LiveActor*, const char*); - void updateMaterial(LiveActor *); + void updateMaterial(LiveActor*); - void syncJointAnimation(LiveActor *, const LiveActor *); + void syncJointAnimation(LiveActor*, const LiveActor*); - void syncMaterialAnimation(LiveActor *, const LiveActor *); + void syncMaterialAnimation(LiveActor*, const LiveActor*); - void copyJointAnimation(LiveActor *, const LiveActor *); + void copyJointAnimation(LiveActor*, const LiveActor*); - void calcModelBoundingBox(TBox3f *, const LiveActor *); + void calcModelBoundingBox(TBox3f*, const LiveActor*); - void calcModelBoundingRadius(f32 *, const LiveActor *); + void calcModelBoundingRadius(f32*, const LiveActor*); - bool isExistCollisionResource(const LiveActor *, const char *); - bool isExistModel(const char *); - bool isExistSubModel(const char *, const char *); + bool isExistCollisionResource(const LiveActor*, const char*); + bool isExistModel(const char*); + bool isExistSubModel(const char*, const char*); - bool isExistEffectTexMtx(LiveActor *); + bool isExistEffectTexMtx(LiveActor*); - s16 getBckFrameMax(const LiveActor *, const char *); + s16 getBckFrameMax(const LiveActor*, const char*); - void updateModelManager(LiveActor *); - void calcAnimModelManager(LiveActor *); -}; + void updateModelManager(LiveActor*); + void calcAnimModelManager(LiveActor*); +}; // namespace MR diff --git a/include/Game/Util/MtxUtil.hpp b/include/Game/Util/MtxUtil.hpp index de295e403..abe5139c0 100644 --- a/include/Game/Util/MtxUtil.hpp +++ b/include/Game/Util/MtxUtil.hpp @@ -6,89 +6,89 @@ class LiveActor; namespace MR { - void makeMtxRotate(MtxPtr, s16, s16, s16); - void makeMtxRotate(MtxPtr, f32, f32, f32); - void makeMtxRotate(MtxPtr, const TVec3f &); - void makeMtxRotateY(MtxPtr, f32); - void makeMtxTR(MtxPtr, f32, f32, f32, f32, f32, f32); - void makeMtxTR(MtxPtr, const TVec3f &, const TVec3f &); - void makeMtxTransRotateY(MtxPtr, f32, f32, f32, f32); - void rotateMtxLocalX(MtxPtr, f32); - void rotateMtxLocalY(MtxPtr, f32); - void rotateMtxLocalZ(MtxPtr, f32); - void rotateMtxLocalXDegree(MtxPtr, f32); - void rotateMtxLocalYDegree(MtxPtr, f32); - void rotateMtxLocalZDegree(MtxPtr, f32); - void preScaleMtx(MtxPtr, f32); - void preScaleMtx(MtxPtr, const TVec3f &); + void makeMtxRotate(MtxPtr, s16, s16, s16); + void makeMtxRotate(MtxPtr, f32, f32, f32); + void makeMtxRotate(MtxPtr, const TVec3f&); + void makeMtxRotateY(MtxPtr, f32); + void makeMtxTR(MtxPtr, f32, f32, f32, f32, f32, f32); + void makeMtxTR(MtxPtr, const TVec3f&, const TVec3f&); + void makeMtxTransRotateY(MtxPtr, f32, f32, f32, f32); + void rotateMtxLocalX(MtxPtr, f32); + void rotateMtxLocalY(MtxPtr, f32); + void rotateMtxLocalZ(MtxPtr, f32); + void rotateMtxLocalXDegree(MtxPtr, f32); + void rotateMtxLocalYDegree(MtxPtr, f32); + void rotateMtxLocalZDegree(MtxPtr, f32); + void preScaleMtx(MtxPtr, f32); + void preScaleMtx(MtxPtr, const TVec3f&); - void preScaleMtx(MtxPtr, f32, f32, f32); + void preScaleMtx(MtxPtr, f32, f32, f32); - void scaleMtxToLocalMtx(MtxPtr, MtxPtr, MtxPtr, const TVec3f &); - void scaleMtxToLocalMtx(MtxPtr, MtxPtr, const TVec3f &); - void scaleMtxToDir(TPos3f *, const TVec3f &, const TVec3f &); - void makeMtxTRS(MtxPtr, f32, f32, f32, f32, f32, f32, f32, f32, f32); - void makeMtxTRS(MtxPtr, const TVec3f &, const TVec3f &, const TVec3f &); - void setMtxAxisXYZ(MtxPtr, const TVec3f &, const TVec3f &, const TVec3f &); - void flattenMtx(MtxPtr, MtxPtr, const TVec3f &); - void flattenMtx(MtxPtr, const TVec3f &); - void blendMtxRotate(MtxPtr, MtxPtr, f32, MtxPtr); - void blendMtxRotateSlerp(MtxPtr, MtxPtr, f32, MtxPtr); - void blendMtx(MtxPtr, MtxPtr, f32, MtxPtr); - void makeMtxWithoutScale(TPos3f *, const TPos3f &); - void makeRTFromMtxPtr(TVec3f *, TVec3f *, MtxPtr, bool); - void makeMtxSideUp(TPos3f *, const TVec3f &, const TVec3f &); - void makeMtxSideUpPos(TPos3f *, const TVec3f &, const TVec3f &, const TVec3f &); - void makeMtxSideFront(TPos3f *, const TVec3f &, const TVec3f &); - void makeMtxUpSide(TPos3f *, const TVec3f &, const TVec3f &); - void makeMtxUpSidePos(TPos3f *, const TVec3f &, const TVec3f &, const TVec3f &); - void makeMtxUpFront(TPos3f *, const TVec3f &, const TVec3f &); - void makeMtxUpFrontPos(TPos3f *, const TVec3f &, const TVec3f &, const TVec3f &); - void makeMtxFrontSidePos(TPos3f *, const TVec3f &, const TVec3f &, const TVec3f &); - void makeMtxFrontUp(TPos3f *, const TVec3f &, const TVec3f &); - void makeMtxFrontUpPos(TPos3f *, const TVec3f &, const TVec3f &, const TVec3f &); - void makeMtxUpNoSupport(TPos3f *, const TVec3f &); - void makeMtxUpNoSupportPos(TPos3f *, const TVec3f &, const TVec3f &); - void makeMtxFrontNoSupport(TPos3f *, const TVec3f &); - void makeMtxFrontNoSupportPos(TPos3f *, const TVec3f &, const TVec3f &); - void orthogonalize(TPos3f *); - void turnMtxToXDirRate(TPos3f *, const TVec3f &, f32); - void turnMtxToXDirDegree(TPos3f *, const TVec3f &, f32); - void turnMtxToYDirRate(TPos3f *, const TVec3f &, f32); - void turnMtxToYDirDegree(TPos3f *, const TVec3f &, f32); - void turnMtxToLocalDirDegree(TPos3f *, const TVec3f &, const TVec3f &, f32); - void makeMtxMoment(TPos3f *, const TVec3f &); - void rotateMtxMoment(TPos3f *, const TPos3f &, const TVec3f &); - void rotateMtxMoment(TPos3f *, const TVec3f &); - void setMtxTrans(MtxPtr, f32, f32, f32); - void addTransMtx(MtxPtr, const TVec3f &); - void addTransMtxLocal(MtxPtr, const TVec3f &); - void addTransMtxLocalX(MtxPtr, f32); - void addTransMtxLocalY(MtxPtr, f32); - void addTransMtxLocalZ(MtxPtr, f32); - void extractMtxXDir(MtxPtr, TVec3f *); - void extractMtxYDir(MtxPtr, TVec3f *); - void extractMtxZDir(MtxPtr, TVec3f *); - void extractMtxXYZDir(MtxPtr, TVec3f *, TVec3f *, TVec3f *); - void extractMtxTrans(MtxPtr, TVec3f *); - bool isSameMtx(MtxPtr, MtxPtr); - bool isSameMtxRot(MtxPtr, MtxPtr); - bool isRotAxisY(MtxPtr, MtxPtr); - void calcMtxRotAxis(TVec3f *, MtxPtr, MtxPtr); - void tmpMtxTrans(const TVec3f &); - void tmpMtxScale(f32, f32, f32); - MtxPtr tmpMtxRotXRad(f32); - MtxPtr tmpMtxRotYRad(f32); - MtxPtr tmpMtxRotZRad(f32); - MtxPtr tmpMtxRotXDeg(f32); - MtxPtr tmpMtxRotYDeg(f32); - MtxPtr tmpMtxRotZDeg(f32); - void orderRotateMtx(s16, const TVec3f &, MtxPtr); - void rotAxisVecRad(const TVec3f &, const TVec3f &, TVec3f *, f32); + void scaleMtxToLocalMtx(MtxPtr, MtxPtr, MtxPtr, const TVec3f&); + void scaleMtxToLocalMtx(MtxPtr, MtxPtr, const TVec3f&); + void scaleMtxToDir(TPos3f*, const TVec3f&, const TVec3f&); + void makeMtxTRS(MtxPtr, f32, f32, f32, f32, f32, f32, f32, f32, f32); + void makeMtxTRS(MtxPtr, const TVec3f&, const TVec3f&, const TVec3f&); + void setMtxAxisXYZ(MtxPtr, const TVec3f&, const TVec3f&, const TVec3f&); + void flattenMtx(MtxPtr, MtxPtr, const TVec3f&); + void flattenMtx(MtxPtr, const TVec3f&); + void blendMtxRotate(MtxPtr, MtxPtr, f32, MtxPtr); + void blendMtxRotateSlerp(MtxPtr, MtxPtr, f32, MtxPtr); + void blendMtx(MtxPtr, MtxPtr, f32, MtxPtr); + void makeMtxWithoutScale(TPos3f*, const TPos3f&); + void makeRTFromMtxPtr(TVec3f*, TVec3f*, MtxPtr, bool); + void makeMtxSideUp(TPos3f*, const TVec3f&, const TVec3f&); + void makeMtxSideUpPos(TPos3f*, const TVec3f&, const TVec3f&, const TVec3f&); + void makeMtxSideFront(TPos3f*, const TVec3f&, const TVec3f&); + void makeMtxUpSide(TPos3f*, const TVec3f&, const TVec3f&); + void makeMtxUpSidePos(TPos3f*, const TVec3f&, const TVec3f&, const TVec3f&); + void makeMtxUpFront(TPos3f*, const TVec3f&, const TVec3f&); + void makeMtxUpFrontPos(TPos3f*, const TVec3f&, const TVec3f&, const TVec3f&); + void makeMtxFrontSidePos(TPos3f*, const TVec3f&, const TVec3f&, const TVec3f&); + void makeMtxFrontUp(TPos3f*, const TVec3f&, const TVec3f&); + void makeMtxFrontUpPos(TPos3f*, const TVec3f&, const TVec3f&, const TVec3f&); + void makeMtxUpNoSupport(TPos3f*, const TVec3f&); + void makeMtxUpNoSupportPos(TPos3f*, const TVec3f&, const TVec3f&); + void makeMtxFrontNoSupport(TPos3f*, const TVec3f&); + void makeMtxFrontNoSupportPos(TPos3f*, const TVec3f&, const TVec3f&); + void orthogonalize(TPos3f*); + void turnMtxToXDirRate(TPos3f*, const TVec3f&, f32); + void turnMtxToXDirDegree(TPos3f*, const TVec3f&, f32); + void turnMtxToYDirRate(TPos3f*, const TVec3f&, f32); + void turnMtxToYDirDegree(TPos3f*, const TVec3f&, f32); + void turnMtxToLocalDirDegree(TPos3f*, const TVec3f&, const TVec3f&, f32); + void makeMtxMoment(TPos3f*, const TVec3f&); + void rotateMtxMoment(TPos3f*, const TPos3f&, const TVec3f&); + void rotateMtxMoment(TPos3f*, const TVec3f&); + void setMtxTrans(MtxPtr, f32, f32, f32); + void addTransMtx(MtxPtr, const TVec3f&); + void addTransMtxLocal(MtxPtr, const TVec3f&); + void addTransMtxLocalX(MtxPtr, f32); + void addTransMtxLocalY(MtxPtr, f32); + void addTransMtxLocalZ(MtxPtr, f32); + void extractMtxXDir(MtxPtr, TVec3f*); + void extractMtxYDir(MtxPtr, TVec3f*); + void extractMtxZDir(MtxPtr, TVec3f*); + void extractMtxXYZDir(MtxPtr, TVec3f*, TVec3f*, TVec3f*); + void extractMtxTrans(MtxPtr, TVec3f*); + bool isSameMtx(MtxPtr, MtxPtr); + bool isSameMtxRot(MtxPtr, MtxPtr); + bool isRotAxisY(MtxPtr, MtxPtr); + void calcMtxRotAxis(TVec3f*, MtxPtr, MtxPtr); + void tmpMtxTrans(const TVec3f&); + void tmpMtxScale(f32, f32, f32); + MtxPtr tmpMtxRotXRad(f32); + MtxPtr tmpMtxRotYRad(f32); + MtxPtr tmpMtxRotZRad(f32); + MtxPtr tmpMtxRotXDeg(f32); + MtxPtr tmpMtxRotYDeg(f32); + MtxPtr tmpMtxRotZDeg(f32); + void orderRotateMtx(s16, const TVec3f&, MtxPtr); + void rotAxisVecRad(const TVec3f&, const TVec3f&, TVec3f*, f32); - void makeMtxTR(MtxPtr, const LiveActor *); + void makeMtxTR(MtxPtr, const LiveActor*); - void setMtxTrans(MtxPtr mtx, const TVec3f &rVec); /*{ + void setMtxTrans(MtxPtr mtx, const TVec3f& rVec); /*{ MR::setMtxTrans(mtx, rVec.x, rVec.y, rVec.z); }*/ -}; +}; // namespace MR diff --git a/include/Game/Util/MultiEventCamera.hpp b/include/Game/Util/MultiEventCamera.hpp index 802e0f602..77f68a4a5 100644 --- a/include/Game/Util/MultiEventCamera.hpp +++ b/include/Game/Util/MultiEventCamera.hpp @@ -8,11 +8,11 @@ public: MultiEventCamera(); bool isEnd() const; - void setUp(const char *, const ActorCameraInfo *, s32); + void setUp(const char*, const ActorCameraInfo*, s32); void setEndCameraTypeSoon(); void setEndCameraTypeAtLanding(); void start(s32); - void start(const CameraTargetArg &, s32); + void start(const CameraTargetArg&, s32); void update(); void nextForce(); void endForce(); @@ -23,14 +23,14 @@ public: void declareEventCamera(s32); void startCamera(); void endCamera(); - void changeTarget(const CameraTargetArg &); + void changeTarget(const CameraTargetArg&); - const char* mName; // 0x0 - s32 mCameraCount; // 0x4 - s32 _8; - u32 _C; - u32 _10; - u32 mCameraType; // 0x14 - ActorCameraInfo* mCameraInfo; // 0x18 - CameraTargetArg mTarget; // 0x1C + const char* mName; // 0x0 + s32 mCameraCount; // 0x4 + s32 _8; + u32 _C; + u32 _10; + u32 mCameraType; // 0x14 + ActorCameraInfo* mCameraInfo; // 0x18 + CameraTargetArg mTarget; // 0x1C }; \ No newline at end of file diff --git a/include/Game/Util/MutexHolder.hpp b/include/Game/Util/MutexHolder.hpp index 9e829841f..904dd307e 100644 --- a/include/Game/Util/MutexHolder.hpp +++ b/include/Game/Util/MutexHolder.hpp @@ -5,12 +5,12 @@ class JKRHeap; namespace MR { - template + template class MutexHolder { public: static OSMutex sMutex; }; - - template + + template OSMutex MutexHolder::sMutex; -}; +}; // namespace MR diff --git a/include/Game/Util/NPCUtil.hpp b/include/Game/Util/NPCUtil.hpp index 32911d6ec..175b58b61 100644 --- a/include/Game/Util/NPCUtil.hpp +++ b/include/Game/Util/NPCUtil.hpp @@ -12,46 +12,46 @@ class NPCActorItem; class TalkMessageCtrl; namespace MR { - bool getNPCItemData(NPCActorItem *, s32); + bool getNPCItemData(NPCActorItem*, s32); - bool isNPCItemFileExist(const char *); + bool isNPCItemFileExist(const char*); - void startNPCTalkCamera(const TalkMessageCtrl *, MtxPtr, f32, s32); + void startNPCTalkCamera(const TalkMessageCtrl*, MtxPtr, f32, s32); - void initDefaultPosAndQuat(NPCActor *, const JMapInfoIter &); + void initDefaultPosAndQuat(NPCActor*, const JMapInfoIter&); - void invalidateLodCtrl(const NPCActor *); - void startMoveAction(NPCActor *); - bool tryStartTurnAction(NPCActor *); - bool tryStartMoveTurnAction(NPCActor *); - bool tryStartReaction(NPCActor *); - bool tryTalkNearPlayerAndStartTalkAction(NPCActor *); - bool tryTalkNearPlayerAndStartMoveTalkAction(NPCActor *); - bool tryTalkNearPlayerAtEndAndStartTalkAction(NPCActor *); - bool tryTalkNearPlayerAtEndAndStartMoveTalkAction(NPCActor *); - bool tryTalkForceAndStartMoveTalkAction(NPCActor *); - bool tryTalkForceAtEndAndStartTalkAction(NPCActor *); - bool tryStartReactionAndPushNerve(NPCActor *, const Nerve *); - bool tryStartReactionAndPopNerve(NPCActor *); - bool tryChangeTalkActionRandom(NPCActor *, const char *, const char *, const char *); - f32 calcFloatOffset(const NPCActor *, f32, f32); - void calcAndSetFloatBaseMtx(NPCActor *, f32); + void invalidateLodCtrl(const NPCActor*); + void startMoveAction(NPCActor*); + bool tryStartTurnAction(NPCActor*); + bool tryStartMoveTurnAction(NPCActor*); + bool tryStartReaction(NPCActor*); + bool tryTalkNearPlayerAndStartTalkAction(NPCActor*); + bool tryTalkNearPlayerAndStartMoveTalkAction(NPCActor*); + bool tryTalkNearPlayerAtEndAndStartTalkAction(NPCActor*); + bool tryTalkNearPlayerAtEndAndStartMoveTalkAction(NPCActor*); + bool tryTalkForceAndStartMoveTalkAction(NPCActor*); + bool tryTalkForceAtEndAndStartTalkAction(NPCActor*); + bool tryStartReactionAndPushNerve(NPCActor*, const Nerve*); + bool tryStartReactionAndPopNerve(NPCActor*); + bool tryChangeTalkActionRandom(NPCActor*, const char*, const char*, const char*); + f32 calcFloatOffset(const NPCActor*, f32, f32); + void calcAndSetFloatBaseMtx(NPCActor*, f32); - bool tryStartTalkAction(NPCActor *); - bool tryStartMoveTalkAction(NPCActor *); + bool tryStartTalkAction(NPCActor*); + bool tryStartMoveTalkAction(NPCActor*); - void turnPlayerToActor(const LiveActor *, f32); + void turnPlayerToActor(const LiveActor*, f32); - void setNPCActorPos(NPCActor *, const TVec3f &); - void setNPCActorPose(NPCActor *, const TVec3f &, const TVec3f &, const TVec3f &); - void followRailPose(NPCActor *, f32, f32); + void setNPCActorPos(NPCActor*, const TVec3f&); + void setNPCActorPose(NPCActor*, const TVec3f&, const TVec3f&, const TVec3f&); + void followRailPose(NPCActor*, f32, f32); - void setDefaultPose(NPCActor *); -}; + void setDefaultPose(NPCActor*); +}; // namespace MR class DemoStarter : public NerveExecutor { public: - DemoStarter(NPCActor *); + DemoStarter(NPCActor*); bool update(); void start(); @@ -65,7 +65,7 @@ public: class TakeOutStar : public NerveExecutor { public: - TakeOutStar(NPCActor *, const char *, const char *, const Nerve *); + TakeOutStar(NPCActor*, const char*, const char*, const Nerve*); bool takeOut(); bool isFirstStep(); @@ -74,22 +74,22 @@ public: void exeDemo(); void exeTerm(); - /* 0x08 */ ModelObj* mStarModel; - /* 0x0C */ NPCActor* mActor; + /* 0x08 */ ModelObj* mStarModel; + /* 0x0C */ NPCActor* mActor; /* 0x10 */ const Nerve* mNerve; - /* 0x14 */ const char* mActionName; - /* 0x18 */ const char* mAnimName; + /* 0x14 */ const char* mActionName; + /* 0x18 */ const char* mAnimName; }; class FadeStarter : public NerveExecutor { public: - FadeStarter(NPCActor *, s32); + FadeStarter(NPCActor*, s32); bool update(); void exeFade(); void exeTerm(); - /* 0x08 */ NPCActor* mActor; + /* 0x08 */ NPCActor* mActor; /* 0x0C */ const Nerve* _C; - /* 0x10 */ s32 _10; + /* 0x10 */ s32 _10; }; diff --git a/include/Game/Util/NerveUtil.hpp b/include/Game/Util/NerveUtil.hpp index 7f9cbf6c7..d90891029 100644 --- a/include/Game/Util/NerveUtil.hpp +++ b/include/Game/Util/NerveUtil.hpp @@ -100,4 +100,4 @@ namespace MR { /// @param pNerve The pointer to the new nerve action. /// @param step The frame value to compare with. void setNerveAtStep(NerveExecutor* pExecutor, const Nerve* pNerve, s32 step); -}; +}; // namespace MR diff --git a/include/Game/Util/ObjUtil.hpp b/include/Game/Util/ObjUtil.hpp index 74f3201f0..90fd25da2 100644 --- a/include/Game/Util/ObjUtil.hpp +++ b/include/Game/Util/ObjUtil.hpp @@ -22,179 +22,179 @@ namespace MR { }; namespace MR { - bool isJudgedToClipFrustum(const TVec3f&, f32); - bool isJudgedToClipFrustum100m(const TVec3f&, f32); - bool isJudgedToClipFrustum300m(const TVec3f&, f32); - bool isJudgedToNearClip(const TVec3f&, f32); - bool isInWater(const TVec3f&); - bool isInDeath(const TVec3f&); - bool isInDarkMatter(const TVec3f&); - void connectToScene(LiveActor*, int, int, int, int); - void connectToScene(NameObj*, int, int, int, int); - void connectToSceneCollisionMapObj(LiveActor*); - void connectToSceneCollisionMapObjMovementCalcAnim(LiveActor*); - void connectToSceneCollisionMapObjWeakLight(LiveActor*); - void connectToSceneCollisionMapObjStrongLight(LiveActor*); - void connectToSceneCollisionEnemy(LiveActor*); - void connectToSceneCollisionEnemyMovement(NameObj*); - void connectToSceneCollisionEnemyStrongLight(LiveActor*); - void connectToSceneCollisionEnemyNoShadowedMapObjStrongLight(LiveActor*); - void connectToSceneNpc(LiveActor*); - void connectToSceneNpcMovement(LiveActor*); - void connectToSceneRide(LiveActor*); - void connectToSceneEnemy(LiveActor*); - void connectToSceneEnemyMovement(NameObj*); - void connectToSceneMapObj(LiveActor*); - void connectToSceneMapObjMovement(NameObj*); - void connectToSceneMapObjMovementCalcAnim(NameObj*); - void connectToSceneMapObjNoMovement(LiveActor*); - void connectToSceneMapObjNoCalcAnim(LiveActor*); - void connectToSceneMapObjNoCalcAnimStrongLight(LiveActor*); - void connectToSceneMapObjDecoration(LiveActor*); - void connectToSceneMapObjDecorationStrongLight(LiveActor*); - void connectToSceneMapObjDecorationMovement(NameObj*); - void connectToSceneMapObjStrongLight(LiveActor*); - void connectToSceneMapParts(LiveActor*); - void connectToScenePlanet(LiveActor*); - void connectToSceneEnvironment(LiveActor*); - void connectToSceneEnvironmentStrongLight(LiveActor*); - void connectToClippedMapParts(LiveActor*); - void connectToSceneEnemyDecoration(LiveActor*); - void connectToSceneEnemyDecorationMovement(NameObj*); - void connectToSceneEnemyDecorationMovementCalcAnim(NameObj*); - void connectToSceneItem(LiveActor*); - void connectToSceneItemStrongLight(LiveActor*); - void connectToSceneIndirectEnemy(LiveActor*); - void connectToSceneIndirectNpc(LiveActor*); - void connectToSceneIndirectMapObj(LiveActor*); - void connectToSceneIndirectMapObjStrongLight(LiveActor*); - void connectToSceneScreenEffectMovement(NameObj*); - void connectToSceneAreaObj(NameObj*); - void connectToScene3DModelFor2D(LiveActor*); - void connectToSceneLayout(NameObj*); - void connectToSceneLayoutMovementCalcAnim(NameObj*); - void connectToSceneLayoutDecoration(NameObj*); - void connectToSceneTalkLayout(NameObj*); - void connectToSceneTalkLayoutNoMovement(NameObj*); - void connectToSceneWipeLayout(NameObj*); - void connectToSceneLayoutOnPause(NameObj*); - void connectToSceneLayoutOnPauseNoMovement(NameObj*); - void connectToSceneLayoutOnPauseMovementCalcAnim(NameObj*); - void connectToSceneLayoutMovement(NameObj*); - void connectToSceneMovie(NameObj*); - void connectToSceneMirrorMapObj(LiveActor*); - void connectToSceneMirrorMapObjDecoration(LiveActor*); - void connectToSceneMirrorMapObjNoMovement(LiveActor*); - void connectToSceneCamera(NameObj*); - void connectToSceneNoShadowedMapObj(LiveActor*); - void connectToSceneNoShadowedMapObjStrongLight(LiveActor*); - void connectToSceneNoSilhouettedMapObj(LiveActor*); - void connectToSceneNoSilhouettedMapObjStrongLight(LiveActor*); - void connectToSceneNoSilhouettedMapObjWeakLightNoMovement(LiveActor*); - void connectToSceneSky(LiveActor*); - void connectToSceneAir(LiveActor*); - void connectToSceneSun(LiveActor*); - void connectToSceneCrystal(LiveActor*); - void connectToSceneNormalMapObj(LiveActor*); - void requestMovementOn(NameObj*); - void requestMovementOn(LiveActor*); - void requestMovementOn(LayoutActor*); - void requestMovementOff(NameObj*); - NameObjGroup* joinToNameObjGroup(NameObj*, const char*); - NameObjGroup* joinToMovementOnOffGroup(const char*, NameObj*, u32); - void onMovementOnOffGroup(const char*); - void registerPreDrawFunction(const MR::FunctorBase&, int); - NameObjAdaptor* createDrawAdaptor(const char*, const MR::FunctorBase&); - NameObjAdaptor* createAdaptorAndConnectToDrawBloomModel(const char*, const MR::FunctorBase&); - void listenNameObjStageSwitchOnAppear(const NameObj*, const StageSwitchCtrl*, const MR::FunctorBase&); - void listenNameObjStageSwitchOnOffAppear(const NameObj*, const StageSwitchCtrl*, const MR::FunctorBase&, const MR::FunctorBase&); - void listenNameObjStageSwitchOnA(const NameObj*, const StageSwitchCtrl*, const MR::FunctorBase&); - void listenNameObjStageSwitchOnOffA(const NameObj*, const StageSwitchCtrl*, const MR::FunctorBase&, const MR::FunctorBase&); - void listenNameObjStageSwitchOnB(const NameObj*, const StageSwitchCtrl*, const MR::FunctorBase&); - void listenNameObjStageSwitchOffB(const NameObj*, const StageSwitchCtrl*, const MR::FunctorBase&); - void listenNameObjStageSwitchOnOffB(const NameObj*, const StageSwitchCtrl*, const MR::FunctorBase&, const MR::FunctorBase&); - ResourceHolder* createAndAddResourceHolder(const char*); - void* loadResourceFromArc(const char*, const char*); - bool isExistResourceInArc(const char*, const char*); - const ResTIMG* loadTexFromArc(const char*, const char*); - const ResTIMG* loadTexFromArc(const char*); - bool isExistFileInArc(const ResourceHolder*, const char*, ...); - JMapInfo* createCsvParser(const ResourceHolder*, const char*, ...); - JMapInfo* createCsvParser(const char*, const char*, ...); - JMapInfo* tryCreateCsvParser(const LiveActor*, const char*, ...); - JMapInfo* tryCreateCsvParser(const ResourceHolder*, const char*, ...); - s32 getCsvDataElementNum(const JMapInfo*); - void getCsvDataStr(const char**, const JMapInfo*, const char*, s32); - void getCsvDataStrOrNULL(const char**, const JMapInfo*, const char*, s32); - void getCsvDataS32(s32*, const JMapInfo*, const char*, s32); - void getCsvDataU8(u8*, const JMapInfo*, const char*, s32); - void getCsvDataF32(f32*, const JMapInfo*, const char*, s32); - void getCsvDataBool(bool*, const JMapInfo*, const char*, s32); - void getCsvDataVec(Vec*, const JMapInfo*, const char*, s32); - void getCsvDataColor(GXColor*, const JMapInfo*, const char*, s32); - bool isStageStateScenarioOpeningCamera(); - bool isStageStatePowerStarAppeared(); - void declarePowerStar(const NameObj*); - void declarePowerStar(const NameObj*, s32); - void declarePowerStarCoin100(); - void appearPowerStarContinueCurrentDemo(const NameObj*, const TVec3f&); - void appearPowerStarWithoutDemo(const NameObj*); - void requestAppearPowerStar(const NameObj*); - void requestAppearPowerStar(const NameObj*, const TVec3f&); - void requestAppearPowerStar(const NameObj*, s32, const TVec3f&); - void requestAppearPowerStar(const NameObj*, const LiveActor*, f32); - void requestAppearPowerStarCoin100(); - bool isEndPowerStarAppearDemo(const NameObj*); - ModelObj* createPowerStarDemoModel(const NameObj*, const char*, MtxPtr); - void declareCoin(const NameObj*, s32); - s32 getDeclareRemnantCoinCount(const NameObj*); - void hopCoin(const NameObj*, const TVec3f&, const TVec3f&); - void appearCoinFix(const NameObj*, const TVec3f&, s32); - void appearCoinPop(const NameObj*, const TVec3f&, s32); - void appearCoinPopToDirection(const NameObj*, const TVec3f&, const TVec3f&, s32); - void appearCoinToVelocity(const NameObj*, const TVec3f&, const TVec3f&, s32); - void appearCoinCircle(const NameObj*, const TVec3f&, s32); - void declareStarPiece(const NameObj*, s32); - s32 getDeclareRemnantStarPieceCount(const NameObj*); - s32 getDeclareRemnantStarPieceCountNotExist(const NameObj*); - void declareStarPieceReceiver(const NameObj*, s32); - void clearGotCountStarPieceReceiver(const NameObj*); - void hopStarPiece(const NameObj*, const TVec3f&, const TVec3f&); - bool appearStarPiece(const NameObj*, const TVec3f&, s32, f32, f32, bool); - bool appearStarPieceToDirection(const NameObj*, const TVec3f&, const TVec3f&, s32, f32, f32, bool); - void initStarPieceGetCSSound(); - BenefitItemOneUp* createKinokoOneUp(); - void appearKinokoOneUpPop(BenefitItemObj*, MtxPtr, f32); + bool isJudgedToClipFrustum(const TVec3f&, f32); + bool isJudgedToClipFrustum100m(const TVec3f&, f32); + bool isJudgedToClipFrustum300m(const TVec3f&, f32); + bool isJudgedToNearClip(const TVec3f&, f32); + bool isInWater(const TVec3f&); + bool isInDeath(const TVec3f&); + bool isInDarkMatter(const TVec3f&); + void connectToScene(LiveActor*, int, int, int, int); + void connectToScene(NameObj*, int, int, int, int); + void connectToSceneCollisionMapObj(LiveActor*); + void connectToSceneCollisionMapObjMovementCalcAnim(LiveActor*); + void connectToSceneCollisionMapObjWeakLight(LiveActor*); + void connectToSceneCollisionMapObjStrongLight(LiveActor*); + void connectToSceneCollisionEnemy(LiveActor*); + void connectToSceneCollisionEnemyMovement(NameObj*); + void connectToSceneCollisionEnemyStrongLight(LiveActor*); + void connectToSceneCollisionEnemyNoShadowedMapObjStrongLight(LiveActor*); + void connectToSceneNpc(LiveActor*); + void connectToSceneNpcMovement(LiveActor*); + void connectToSceneRide(LiveActor*); + void connectToSceneEnemy(LiveActor*); + void connectToSceneEnemyMovement(NameObj*); + void connectToSceneMapObj(LiveActor*); + void connectToSceneMapObjMovement(NameObj*); + void connectToSceneMapObjMovementCalcAnim(NameObj*); + void connectToSceneMapObjNoMovement(LiveActor*); + void connectToSceneMapObjNoCalcAnim(LiveActor*); + void connectToSceneMapObjNoCalcAnimStrongLight(LiveActor*); + void connectToSceneMapObjDecoration(LiveActor*); + void connectToSceneMapObjDecorationStrongLight(LiveActor*); + void connectToSceneMapObjDecorationMovement(NameObj*); + void connectToSceneMapObjStrongLight(LiveActor*); + void connectToSceneMapParts(LiveActor*); + void connectToScenePlanet(LiveActor*); + void connectToSceneEnvironment(LiveActor*); + void connectToSceneEnvironmentStrongLight(LiveActor*); + void connectToClippedMapParts(LiveActor*); + void connectToSceneEnemyDecoration(LiveActor*); + void connectToSceneEnemyDecorationMovement(NameObj*); + void connectToSceneEnemyDecorationMovementCalcAnim(NameObj*); + void connectToSceneItem(LiveActor*); + void connectToSceneItemStrongLight(LiveActor*); + void connectToSceneIndirectEnemy(LiveActor*); + void connectToSceneIndirectNpc(LiveActor*); + void connectToSceneIndirectMapObj(LiveActor*); + void connectToSceneIndirectMapObjStrongLight(LiveActor*); + void connectToSceneScreenEffectMovement(NameObj*); + void connectToSceneAreaObj(NameObj*); + void connectToScene3DModelFor2D(LiveActor*); + void connectToSceneLayout(NameObj*); + void connectToSceneLayoutMovementCalcAnim(NameObj*); + void connectToSceneLayoutDecoration(NameObj*); + void connectToSceneTalkLayout(NameObj*); + void connectToSceneTalkLayoutNoMovement(NameObj*); + void connectToSceneWipeLayout(NameObj*); + void connectToSceneLayoutOnPause(NameObj*); + void connectToSceneLayoutOnPauseNoMovement(NameObj*); + void connectToSceneLayoutOnPauseMovementCalcAnim(NameObj*); + void connectToSceneLayoutMovement(NameObj*); + void connectToSceneMovie(NameObj*); + void connectToSceneMirrorMapObj(LiveActor*); + void connectToSceneMirrorMapObjDecoration(LiveActor*); + void connectToSceneMirrorMapObjNoMovement(LiveActor*); + void connectToSceneCamera(NameObj*); + void connectToSceneNoShadowedMapObj(LiveActor*); + void connectToSceneNoShadowedMapObjStrongLight(LiveActor*); + void connectToSceneNoSilhouettedMapObj(LiveActor*); + void connectToSceneNoSilhouettedMapObjStrongLight(LiveActor*); + void connectToSceneNoSilhouettedMapObjWeakLightNoMovement(LiveActor*); + void connectToSceneSky(LiveActor*); + void connectToSceneAir(LiveActor*); + void connectToSceneSun(LiveActor*); + void connectToSceneCrystal(LiveActor*); + void connectToSceneNormalMapObj(LiveActor*); + void requestMovementOn(NameObj*); + void requestMovementOn(LiveActor*); + void requestMovementOn(LayoutActor*); + void requestMovementOff(NameObj*); + NameObjGroup* joinToNameObjGroup(NameObj*, const char*); + NameObjGroup* joinToMovementOnOffGroup(const char*, NameObj*, u32); + void onMovementOnOffGroup(const char*); + void registerPreDrawFunction(const MR::FunctorBase&, int); + NameObjAdaptor* createDrawAdaptor(const char*, const MR::FunctorBase&); + NameObjAdaptor* createAdaptorAndConnectToDrawBloomModel(const char*, const MR::FunctorBase&); + void listenNameObjStageSwitchOnAppear(const NameObj*, const StageSwitchCtrl*, const MR::FunctorBase&); + void listenNameObjStageSwitchOnOffAppear(const NameObj*, const StageSwitchCtrl*, const MR::FunctorBase&, const MR::FunctorBase&); + void listenNameObjStageSwitchOnA(const NameObj*, const StageSwitchCtrl*, const MR::FunctorBase&); + void listenNameObjStageSwitchOnOffA(const NameObj*, const StageSwitchCtrl*, const MR::FunctorBase&, const MR::FunctorBase&); + void listenNameObjStageSwitchOnB(const NameObj*, const StageSwitchCtrl*, const MR::FunctorBase&); + void listenNameObjStageSwitchOffB(const NameObj*, const StageSwitchCtrl*, const MR::FunctorBase&); + void listenNameObjStageSwitchOnOffB(const NameObj*, const StageSwitchCtrl*, const MR::FunctorBase&, const MR::FunctorBase&); + ResourceHolder* createAndAddResourceHolder(const char*); + void* loadResourceFromArc(const char*, const char*); + bool isExistResourceInArc(const char*, const char*); + const ResTIMG* loadTexFromArc(const char*, const char*); + const ResTIMG* loadTexFromArc(const char*); + bool isExistFileInArc(const ResourceHolder*, const char*, ...); + JMapInfo* createCsvParser(const ResourceHolder*, const char*, ...); + JMapInfo* createCsvParser(const char*, const char*, ...); + JMapInfo* tryCreateCsvParser(const LiveActor*, const char*, ...); + JMapInfo* tryCreateCsvParser(const ResourceHolder*, const char*, ...); + s32 getCsvDataElementNum(const JMapInfo*); + void getCsvDataStr(const char**, const JMapInfo*, const char*, s32); + void getCsvDataStrOrNULL(const char**, const JMapInfo*, const char*, s32); + void getCsvDataS32(s32*, const JMapInfo*, const char*, s32); + void getCsvDataU8(u8*, const JMapInfo*, const char*, s32); + void getCsvDataF32(f32*, const JMapInfo*, const char*, s32); + void getCsvDataBool(bool*, const JMapInfo*, const char*, s32); + void getCsvDataVec(Vec*, const JMapInfo*, const char*, s32); + void getCsvDataColor(GXColor*, const JMapInfo*, const char*, s32); + bool isStageStateScenarioOpeningCamera(); + bool isStageStatePowerStarAppeared(); + void declarePowerStar(const NameObj*); + void declarePowerStar(const NameObj*, s32); + void declarePowerStarCoin100(); + void appearPowerStarContinueCurrentDemo(const NameObj*, const TVec3f&); + void appearPowerStarWithoutDemo(const NameObj*); + void requestAppearPowerStar(const NameObj*); + void requestAppearPowerStar(const NameObj*, const TVec3f&); + void requestAppearPowerStar(const NameObj*, s32, const TVec3f&); + void requestAppearPowerStar(const NameObj*, const LiveActor*, f32); + void requestAppearPowerStarCoin100(); + bool isEndPowerStarAppearDemo(const NameObj*); + ModelObj* createPowerStarDemoModel(const NameObj*, const char*, MtxPtr); + void declareCoin(const NameObj*, s32); + s32 getDeclareRemnantCoinCount(const NameObj*); + void hopCoin(const NameObj*, const TVec3f&, const TVec3f&); + void appearCoinFix(const NameObj*, const TVec3f&, s32); + void appearCoinPop(const NameObj*, const TVec3f&, s32); + void appearCoinPopToDirection(const NameObj*, const TVec3f&, const TVec3f&, s32); + void appearCoinToVelocity(const NameObj*, const TVec3f&, const TVec3f&, s32); + void appearCoinCircle(const NameObj*, const TVec3f&, s32); + void declareStarPiece(const NameObj*, s32); + s32 getDeclareRemnantStarPieceCount(const NameObj*); + s32 getDeclareRemnantStarPieceCountNotExist(const NameObj*); + void declareStarPieceReceiver(const NameObj*, s32); + void clearGotCountStarPieceReceiver(const NameObj*); + void hopStarPiece(const NameObj*, const TVec3f&, const TVec3f&); + bool appearStarPiece(const NameObj*, const TVec3f&, s32, f32, f32, bool); + bool appearStarPieceToDirection(const NameObj*, const TVec3f&, const TVec3f&, s32, f32, f32, bool); + void initStarPieceGetCSSound(); + BenefitItemOneUp* createKinokoOneUp(); + void appearKinokoOneUpPop(BenefitItemObj*, MtxPtr, f32); BenefitItemLifeUp* createKinokoSuper(); - void appearKinokoSuper(BenefitItemLifeUp*, MtxPtr, f32); - void stopScene(s32); - void stopSceneForDefaultHit(s32); - void tryRumblePad(const void*, const char*, s32); - void tryRumblePadVeryStrongLong(const void*, s32); - void tryRumblePadVeryStrong(const void*, s32); - void tryRumblePadStrong(const void*, s32); - void tryRumblePadMiddle(const void*, s32); - void tryRumblePadWeak(const void*, s32); - void tryRumblePadVeryWeak(const void*, s32); - void tryRumbleDefaultHit(const void*, s32); - void shakeCameraVeryStrong(); - void shakeCameraStrong(); - void shakeCameraNormalStrong(); - void shakeCameraNormal(); - void shakeCameraNormalWeak(); - void shakeCameraWeak(); - void shakeCameraVeryWeak(); - void shakeCameraInfinity(NameObj*, f32, f32); - void stopShakingCamera(NameObj*); - bool isName(const NameObj*, const char*); - bool isSame(const NameObj*, const NameObj*); - bool tryRegisterNamePosLinkObj(const NameObj*, const JMapInfoIter&); - void findNamePos(const char*, MtxPtr); - void findNamePos(const char*, TVec3f*, TVec3f*); - void findNamePosOnGround(const char*, MtxPtr); - bool tryFindNamePos(const char*, MtxPtr); - bool tryFindNamePos(const char*, TVec3f*, TVec3f*); - void findLinkNamePos(const NameObj*, const char*, MtxPtr); - bool tryFindLinkNamePos(const NameObj*, const char*, MtxPtr); - bool tryFindLinkNamePos(const NameObj*, const char*, TVec3f*, TVec3f*); -}; + void appearKinokoSuper(BenefitItemLifeUp*, MtxPtr, f32); + void stopScene(s32); + void stopSceneForDefaultHit(s32); + void tryRumblePad(const void*, const char*, s32); + void tryRumblePadVeryStrongLong(const void*, s32); + void tryRumblePadVeryStrong(const void*, s32); + void tryRumblePadStrong(const void*, s32); + void tryRumblePadMiddle(const void*, s32); + void tryRumblePadWeak(const void*, s32); + void tryRumblePadVeryWeak(const void*, s32); + void tryRumbleDefaultHit(const void*, s32); + void shakeCameraVeryStrong(); + void shakeCameraStrong(); + void shakeCameraNormalStrong(); + void shakeCameraNormal(); + void shakeCameraNormalWeak(); + void shakeCameraWeak(); + void shakeCameraVeryWeak(); + void shakeCameraInfinity(NameObj*, f32, f32); + void stopShakingCamera(NameObj*); + bool isName(const NameObj*, const char*); + bool isSame(const NameObj*, const NameObj*); + bool tryRegisterNamePosLinkObj(const NameObj*, const JMapInfoIter&); + void findNamePos(const char*, MtxPtr); + void findNamePos(const char*, TVec3f*, TVec3f*); + void findNamePosOnGround(const char*, MtxPtr); + bool tryFindNamePos(const char*, MtxPtr); + bool tryFindNamePos(const char*, TVec3f*, TVec3f*); + void findLinkNamePos(const NameObj*, const char*, MtxPtr); + bool tryFindLinkNamePos(const NameObj*, const char*, MtxPtr); + bool tryFindLinkNamePos(const NameObj*, const char*, TVec3f*, TVec3f*); +}; // namespace MR diff --git a/include/Game/Util/ParabolicPath.hpp b/include/Game/Util/ParabolicPath.hpp index 0e4a8faa4..ed095870b 100644 --- a/include/Game/Util/ParabolicPath.hpp +++ b/include/Game/Util/ParabolicPath.hpp @@ -6,19 +6,19 @@ class ParabolicPath { public: ParabolicPath(); - void initFromMaxHeight(const TVec3f &, const TVec3f &, const TVec3f &); - void initFromUpVector(const TVec3f &, const TVec3f &, const TVec3f &, f32); - void initFromUpVectorAddHeight(const TVec3f &, const TVec3f &, const TVec3f &, f32); - void calcPosition(TVec3f *, f32) const; - void calcDirection(TVec3f *, f32, f32) const; - f32 getLength(f32, f32, s32) const; - f32 getTotalLength(s32) const; - f32 calcPathSpeedFromAverageSpeed(f32) const; + void initFromMaxHeight(const TVec3f&, const TVec3f&, const TVec3f&); + void initFromUpVector(const TVec3f&, const TVec3f&, const TVec3f&, f32); + void initFromUpVectorAddHeight(const TVec3f&, const TVec3f&, const TVec3f&, f32); + void calcPosition(TVec3f*, f32) const; + void calcDirection(TVec3f*, f32, f32) const; + f32 getLength(f32, f32, s32) const; + f32 getTotalLength(s32) const; + f32 calcPathSpeedFromAverageSpeed(f32) const; - TVec3f mPosition; // 0x0 - TVec3f mAxisY; // 0xC - TVec3f mAxisZ; // 0x18 - f32 _24; - f32 _28; - f32 _2C; + TVec3f mPosition; // 0x0 + TVec3f mAxisY; // 0xC + TVec3f mAxisZ; // 0x18 + f32 _24; + f32 _28; + f32 _2C; }; \ No newline at end of file diff --git a/include/Game/Util/PlayerUtil.hpp b/include/Game/Util/PlayerUtil.hpp index 93912a184..bb96d9315 100644 --- a/include/Game/Util/PlayerUtil.hpp +++ b/include/Game/Util/PlayerUtil.hpp @@ -14,177 +14,177 @@ class Triangle; class XanimeResourceTable; namespace MR { - bool isOnGroundPlayer(); - Triangle* getPlayerGroundingPolygon(); - void forceKillPlayerByAbyss(); - void forceKillPlayerByWaterRace(); - void forceKillPlayerByGroundRace(); - void forceKillPlayerByGhostRace(); - bool isPlayerDead(); - bool isPlayerRefuseTalk(); - bool isPlayerTeresaDisappear(); - bool isPlayerInAreaObj(const char*); - TVec3f* getPlayerPos(); - TVec3f* getPlayerCenterPos(); - void getPlayerTakePos(TVec3f*); - void setPlayerPos(const TVec3f&); - void setPlayerUpperRotateY(f32); - TVec3f* getPlayerRotate(); - TVec3f* getPlayerShadowRotate(); - TVec3f* getPlayerVelocity(); - TVec3f* getPlayerLastMove(); - void setPlayerJumpVec(const TVec3f&); - f32 getPlayerHitRadius(); - void setPlayerWalkingResist(f32); - TVec3f* getPlayerGravity(); - void calcPlayerSpinPullVelocity(TVec3f*, const TVec3f&); - bool checkPlayerActionTrigger(); - bool checkPlayerSwingTrigger(); - f32 calcDistanceToPlayer(const TVec3f&); - void getPlayerUpVec(TVec3f*); - void getPlayerFrontVec(TVec3f*); - void getPlayerSideVec(TVec3f*); - void getPlayerThrowVec(TVec3f*); - void getPlayerGroundPos(TVec3f*); - TVec3f* getPlayerGroundNormal(); - void setPlayerFrontTargetVec(const TVec3f&, s32); - void setPlayerFrontVec(const TVec3f&, s32); - void setPlayerSwingInhibitTimer(u16); - void setPlayerSwingPermission(bool); - void setPlayerStateWait(); - void startBckPlayer(const char*, const char*); - void startBckPlayer(const char*, const BckCtrlData&); - void startBckPlayer(const char*, s32); - bool isBckStoppedPlayer(); - bool isBckOneTimeAndStoppedPlayer(); - f32 getBckFrameMaxPlayer(); - s16 getBckFrameMaxPlayer(const char*); - void startBckPlayerJ(const char*); - void becomeContinuousBckPlayer(); - void progressPlayerBckOnPause(); - const char* getPlayerCurrentBckName(); - void setBckBlendWeight(f32, f32); - void setBckBlendWeight(f32, f32, f32); - void setBckBlendWeight(f32, f32, f32, f32); - void setBckRatePlayer(f32); + bool isOnGroundPlayer(); + Triangle* getPlayerGroundingPolygon(); + void forceKillPlayerByAbyss(); + void forceKillPlayerByWaterRace(); + void forceKillPlayerByGroundRace(); + void forceKillPlayerByGhostRace(); + bool isPlayerDead(); + bool isPlayerRefuseTalk(); + bool isPlayerTeresaDisappear(); + bool isPlayerInAreaObj(const char*); + TVec3f* getPlayerPos(); + TVec3f* getPlayerCenterPos(); + void getPlayerTakePos(TVec3f*); + void setPlayerPos(const TVec3f&); + void setPlayerUpperRotateY(f32); + TVec3f* getPlayerRotate(); + TVec3f* getPlayerShadowRotate(); + TVec3f* getPlayerVelocity(); + TVec3f* getPlayerLastMove(); + void setPlayerJumpVec(const TVec3f&); + f32 getPlayerHitRadius(); + void setPlayerWalkingResist(f32); + TVec3f* getPlayerGravity(); + void calcPlayerSpinPullVelocity(TVec3f*, const TVec3f&); + bool checkPlayerActionTrigger(); + bool checkPlayerSwingTrigger(); + f32 calcDistanceToPlayer(const TVec3f&); + void getPlayerUpVec(TVec3f*); + void getPlayerFrontVec(TVec3f*); + void getPlayerSideVec(TVec3f*); + void getPlayerThrowVec(TVec3f*); + void getPlayerGroundPos(TVec3f*); + TVec3f* getPlayerGroundNormal(); + void setPlayerFrontTargetVec(const TVec3f&, s32); + void setPlayerFrontVec(const TVec3f&, s32); + void setPlayerSwingInhibitTimer(u16); + void setPlayerSwingPermission(bool); + void setPlayerStateWait(); + void startBckPlayer(const char*, const char*); + void startBckPlayer(const char*, const BckCtrlData&); + void startBckPlayer(const char*, s32); + bool isBckStoppedPlayer(); + bool isBckOneTimeAndStoppedPlayer(); + f32 getBckFrameMaxPlayer(); + s16 getBckFrameMaxPlayer(const char*); + void startBckPlayerJ(const char*); + void becomeContinuousBckPlayer(); + void progressPlayerBckOnPause(); + const char* getPlayerCurrentBckName(); + void setBckBlendWeight(f32, f32); + void setBckBlendWeight(f32, f32, f32); + void setBckBlendWeight(f32, f32, f32, f32); + void setBckRatePlayer(f32); XanimeResourceTable* getPlayerXanimeResource(); - void jumpPlayer(const TVec3f&); - void forceJumpPlayer(const TVec3f&); - void forceFlyPlayer(const TVec3f&, const TVec3f&, s32); - void tornadoJumpPlayer(); - void miniTornadoJumpPlayer(); - void becomePlayerNormalJumpStatus(); - bool isOnPlayer(const HitSensor*); - bool isActorOnPlayer(const LiveActor*); - bool isOnPlayerShadow(const LiveActor*); - f32 getPlayerShadowHeight(); - void setPlayerPos(const char*); - void setPlayerPosAndWait(const TVec3f&); - void setPlayerPosAndWait(const char*); - void setPlayerLinkPosAndWait(const NameObj*, const char*); - void setPlayerPosOnGround(const char*); - void setPlayerPosOnGroundAndWait(const char*); - bool isPlayerHipDropFalling(); - bool isPlayerHipDropLand(); - void incPlayerLife(u32); - void incPlayerOxygen(u32); - bool isPlayerConfrontDeath(); - void getStarPiecePlayer(); - void notifyDirectGetStarPiecePlayer(); - void scatterStarPiecePlayer(u32); - bool isPlayerSwingAction(); - bool isPlayerPointedBy2POnTriggerButton(); - bool isPlayerSquat(); - bool isPlayerInRush(); - bool isPlayerNeedBrakingCamera(); - bool isPlayerFlying(); - bool isPlayerElementMode(s32); - bool isPlayerElementModeTornado(); - bool isPlayerElementModeInvincible(); - bool isPlayerElementModeBee(); - bool isPlayerElementModeHopper(); - bool isPlayerElementModeTeresa(); - bool isPlayerElementModeIce(); - bool isPlayerElementModeNormal(); - bool isPlayerSkating(); - void changePlayerItemStatus(s32); - void curePlayerElementMode(); - bool isPlayerParalyzing(); - bool isPlayerDamaging(); - bool isPlayerStaggering(); - bool isPlayerSwimming(); - bool isPlayerSleeping(); - bool isPlayerJumpRising(); - void validatePlayerSensor(); - bool isPlayerInBind(); - void endBindAndPlayerWait(LiveActor*); - void endBindAndPlayerJump(LiveActor*, const TVec3f&, u32); - void endBindAndPlayerForceJump(LiveActor*, const TVec3f&, u32); - void endBindAndPlayerWeakGravityJump(LiveActor*, const TVec3f&); - void endBindAndPlayerForceWeakGravityJump(LiveActor*, const TVec3f&); - void endBindAndPlayerForceWeakGravityJumpInputOff(LiveActor*, const TVec3f&); - void endBindAndPlayerWeakGravityLimitJump(LiveActor*, const TVec3f&); - void endBindAndSpinDriverJump(LiveActor*, const TVec3f&); - void endBindAndPlayerDamage(LiveActor*, const TVec3f&); - void endBindAndPlayerFlip(LiveActor*, const TVec3f&); - void endBindAndPlayerJumpWithRollLanding(LiveActor*, const TVec3f&, u32); - void endBindAndPlayerDamageMsg(LiveActor*, u32); - void endBindAndPlayerDamageMsg(LiveActor*, u32, const TVec3f&); - void endBindAndPlayerAcidDamage(LiveActor*); - void endBindAndPlayerFreezeDamage(LiveActor*); - void endBindAndPlayerFireDamage(LiveActor*); - void endBindAndPlayerElectricDamage(LiveActor*); - LiveActor* getCurrentRushActor(); - HitSensor* getCurrentRushSensor(); - void tryPlayerCoinPull(); - void tryPlayerPullActor(HitSensor*); - void tryPlayerDropTakingActor(); - void tryPlayerKillTakingActor(); - bool isPlayerTakingActor(const char*); - bool isPlayerCarryAny(); - void startSoundPlayer(const char*, s32); - void startLevelSoundPlayer(const char*, s32); - void stopSoundPlayer(const char*, u32); - void startSoundPlayerJ(const char*); - void showPlayer(); - void hidePlayer(); - void showPlayerJoint(const char*); - void hidePlayerJoint(const char*); - void setPlayerSpot(f32, u32); - void startPlayerDownWipe(); - void setCameraTargetToPlayer(CameraTargetArg*); - bool isPlayerDisableFpView(); - bool isFpViewChangingFailure(); - void stopPlayerFpView(); - void setRasterScroll(s32, s32, s32); - void noticePlayerDashChance(); - void startPlayerTalk(const LiveActor*); - void endPlayerTalk(); - void preventPlayerRush(); - bool isExistMario(); - void startPlayerEvent(const char*); - void offPlayerControl(); - void onPlayerControl(bool); - bool isOffPlayerControl(); - void unlockPlayerAnimation(); - void resetPlayerStatus(); - void resetPlayerEffect(); - void setPlayerBaseMtx(MtxPtr); - MtxPtr getPlayerBaseMtx(); - LiveActor* getPlayerDemoActor(); - void initPlayerAfterOpeningDemo(); - void readyPlayerDemo(); - void onFollowDemoEffect(); - void requestMovementOnPlayer(); - void calcPlayerJointMtx(TPos3f*, const char*); - bool isPlayerOnPress(); - void pushPlayer(const TVec3f&); - void pushPlayerFromArea(const TVec3f&); - bool isPlayerInWaterMode(); - bool isPlayerOnWaterSurface(); - bool isPlayerHidden(); - void calcPlayerWorldPadDir(TVec3f*, f32, f32); - JUTTexture* getFullScreenBlurTexture(); - u16 getPlayerMovementTimer(); - CubeCameraArea* getCameraCube(); -}; + void jumpPlayer(const TVec3f&); + void forceJumpPlayer(const TVec3f&); + void forceFlyPlayer(const TVec3f&, const TVec3f&, s32); + void tornadoJumpPlayer(); + void miniTornadoJumpPlayer(); + void becomePlayerNormalJumpStatus(); + bool isOnPlayer(const HitSensor*); + bool isActorOnPlayer(const LiveActor*); + bool isOnPlayerShadow(const LiveActor*); + f32 getPlayerShadowHeight(); + void setPlayerPos(const char*); + void setPlayerPosAndWait(const TVec3f&); + void setPlayerPosAndWait(const char*); + void setPlayerLinkPosAndWait(const NameObj*, const char*); + void setPlayerPosOnGround(const char*); + void setPlayerPosOnGroundAndWait(const char*); + bool isPlayerHipDropFalling(); + bool isPlayerHipDropLand(); + void incPlayerLife(u32); + void incPlayerOxygen(u32); + bool isPlayerConfrontDeath(); + void getStarPiecePlayer(); + void notifyDirectGetStarPiecePlayer(); + void scatterStarPiecePlayer(u32); + bool isPlayerSwingAction(); + bool isPlayerPointedBy2POnTriggerButton(); + bool isPlayerSquat(); + bool isPlayerInRush(); + bool isPlayerNeedBrakingCamera(); + bool isPlayerFlying(); + bool isPlayerElementMode(s32); + bool isPlayerElementModeTornado(); + bool isPlayerElementModeInvincible(); + bool isPlayerElementModeBee(); + bool isPlayerElementModeHopper(); + bool isPlayerElementModeTeresa(); + bool isPlayerElementModeIce(); + bool isPlayerElementModeNormal(); + bool isPlayerSkating(); + void changePlayerItemStatus(s32); + void curePlayerElementMode(); + bool isPlayerParalyzing(); + bool isPlayerDamaging(); + bool isPlayerStaggering(); + bool isPlayerSwimming(); + bool isPlayerSleeping(); + bool isPlayerJumpRising(); + void validatePlayerSensor(); + bool isPlayerInBind(); + void endBindAndPlayerWait(LiveActor*); + void endBindAndPlayerJump(LiveActor*, const TVec3f&, u32); + void endBindAndPlayerForceJump(LiveActor*, const TVec3f&, u32); + void endBindAndPlayerWeakGravityJump(LiveActor*, const TVec3f&); + void endBindAndPlayerForceWeakGravityJump(LiveActor*, const TVec3f&); + void endBindAndPlayerForceWeakGravityJumpInputOff(LiveActor*, const TVec3f&); + void endBindAndPlayerWeakGravityLimitJump(LiveActor*, const TVec3f&); + void endBindAndSpinDriverJump(LiveActor*, const TVec3f&); + void endBindAndPlayerDamage(LiveActor*, const TVec3f&); + void endBindAndPlayerFlip(LiveActor*, const TVec3f&); + void endBindAndPlayerJumpWithRollLanding(LiveActor*, const TVec3f&, u32); + void endBindAndPlayerDamageMsg(LiveActor*, u32); + void endBindAndPlayerDamageMsg(LiveActor*, u32, const TVec3f&); + void endBindAndPlayerAcidDamage(LiveActor*); + void endBindAndPlayerFreezeDamage(LiveActor*); + void endBindAndPlayerFireDamage(LiveActor*); + void endBindAndPlayerElectricDamage(LiveActor*); + LiveActor* getCurrentRushActor(); + HitSensor* getCurrentRushSensor(); + void tryPlayerCoinPull(); + void tryPlayerPullActor(HitSensor*); + void tryPlayerDropTakingActor(); + void tryPlayerKillTakingActor(); + bool isPlayerTakingActor(const char*); + bool isPlayerCarryAny(); + void startSoundPlayer(const char*, s32); + void startLevelSoundPlayer(const char*, s32); + void stopSoundPlayer(const char*, u32); + void startSoundPlayerJ(const char*); + void showPlayer(); + void hidePlayer(); + void showPlayerJoint(const char*); + void hidePlayerJoint(const char*); + void setPlayerSpot(f32, u32); + void startPlayerDownWipe(); + void setCameraTargetToPlayer(CameraTargetArg*); + bool isPlayerDisableFpView(); + bool isFpViewChangingFailure(); + void stopPlayerFpView(); + void setRasterScroll(s32, s32, s32); + void noticePlayerDashChance(); + void startPlayerTalk(const LiveActor*); + void endPlayerTalk(); + void preventPlayerRush(); + bool isExistMario(); + void startPlayerEvent(const char*); + void offPlayerControl(); + void onPlayerControl(bool); + bool isOffPlayerControl(); + void unlockPlayerAnimation(); + void resetPlayerStatus(); + void resetPlayerEffect(); + void setPlayerBaseMtx(MtxPtr); + MtxPtr getPlayerBaseMtx(); + LiveActor* getPlayerDemoActor(); + void initPlayerAfterOpeningDemo(); + void readyPlayerDemo(); + void onFollowDemoEffect(); + void requestMovementOnPlayer(); + void calcPlayerJointMtx(TPos3f*, const char*); + bool isPlayerOnPress(); + void pushPlayer(const TVec3f&); + void pushPlayerFromArea(const TVec3f&); + bool isPlayerInWaterMode(); + bool isPlayerOnWaterSurface(); + bool isPlayerHidden(); + void calcPlayerWorldPadDir(TVec3f*, f32, f32); + JUTTexture* getFullScreenBlurTexture(); + u16 getPlayerMovementTimer(); + CubeCameraArea* getCameraCube(); +}; // namespace MR diff --git a/include/Game/Util/RailGraphUtil.hpp b/include/Game/Util/RailGraphUtil.hpp index a91234c0d..1017c68e6 100644 --- a/include/Game/Util/RailGraphUtil.hpp +++ b/include/Game/Util/RailGraphUtil.hpp @@ -6,19 +6,19 @@ #include "JSystem/JGeometry/TVec.hpp" class RailGraphNodeSelecter; namespace MR { - RailGraph* createRailGraphFromJMap(const JMapInfoIter& rIter); + RailGraph* createRailGraphFromJMap(const JMapInfoIter& rIter); RailGraphIter* createRailGraphIter(const RailGraph* pRailGraph); - void moveNodeNearPosition(RailGraphIter* pRailGraphIter, const TVec3f& rVec, f32 f, RailGraphNodeSelecter* pSelector); - TVec3f* getNextNodePosition(const RailGraphIter* pRailGraphIter); - TVec3f* getCurrentNodePosition(const RailGraphIter* pRailGraphIter); - void selectReverseEdge(RailGraphIter* pRailGraphIter); - void moveNextNode(RailGraphIter* pRailGraphIter); - s32 getSelectEdgeArg0(const RailGraphIter* pRailGraphIter); - s32 getSelectEdgeArg1(const RailGraphIter* pRailGraphIter); - s32 getSelectEdgeArg2(const RailGraphIter* pRailGraphIter); - s32 getSelectEdgeArg3(const RailGraphIter* pRailGraphIter); - bool isSelectedEdge(const RailGraphIter* pRailGraphIter); - bool isWatchedPrevEdge(const RailGraphIter* pRailGraphIter); - s32 getWatchEdgeArg7(const RailGraphIter* pRailGraphIter); - void calcWatchEdgeDirection(const RailGraphIter* pRailGraphIter, TVec3f* pVec); -} + void moveNodeNearPosition(RailGraphIter* pRailGraphIter, const TVec3f& rVec, f32 f, RailGraphNodeSelecter* pSelector); + TVec3f* getNextNodePosition(const RailGraphIter* pRailGraphIter); + TVec3f* getCurrentNodePosition(const RailGraphIter* pRailGraphIter); + void selectReverseEdge(RailGraphIter* pRailGraphIter); + void moveNextNode(RailGraphIter* pRailGraphIter); + s32 getSelectEdgeArg0(const RailGraphIter* pRailGraphIter); + s32 getSelectEdgeArg1(const RailGraphIter* pRailGraphIter); + s32 getSelectEdgeArg2(const RailGraphIter* pRailGraphIter); + s32 getSelectEdgeArg3(const RailGraphIter* pRailGraphIter); + bool isSelectedEdge(const RailGraphIter* pRailGraphIter); + bool isWatchedPrevEdge(const RailGraphIter* pRailGraphIter); + s32 getWatchEdgeArg7(const RailGraphIter* pRailGraphIter); + void calcWatchEdgeDirection(const RailGraphIter* pRailGraphIter, TVec3f* pVec); +} // namespace MR diff --git a/include/Game/Util/RailUtil.hpp b/include/Game/Util/RailUtil.hpp index fd0b01c5b..fe0c63894 100644 --- a/include/Game/Util/RailUtil.hpp +++ b/include/Game/Util/RailUtil.hpp @@ -8,108 +8,108 @@ class LiveActor; class RailRider; namespace MR { - f32 getRailTotalLength(const LiveActor *); + f32 getRailTotalLength(const LiveActor*); - s32 getRailPointNum(const LiveActor *); - s32 getCurrentRailPointNo(const LiveActor *); + s32 getRailPointNum(const LiveActor*); + s32 getCurrentRailPointNo(const LiveActor*); - void calcRailPosAtCoord(TVec3f *, const LiveActor *, f32); + void calcRailPosAtCoord(TVec3f*, const LiveActor*, f32); - void calcRailDirectionAtCoord(TVec3f *, const LiveActor *, f32); + void calcRailDirectionAtCoord(TVec3f*, const LiveActor*, f32); - void calcRailPointPos(TVec3f *, const LiveActor *, int); - f32 getRailCoord(const LiveActor *); - f32 getRailPointCoord(const LiveActor *, int); + void calcRailPointPos(TVec3f*, const LiveActor*, int); + f32 getRailCoord(const LiveActor*); + f32 getRailPointCoord(const LiveActor*, int); - bool isRailReachedGoal(const LiveActor *); + bool isRailReachedGoal(const LiveActor*); - void initAndSetRailClipping(TVec3f *, LiveActor *, f32, f32); + void initAndSetRailClipping(TVec3f*, LiveActor*, f32, f32); - void moveCoordToNearestPos(LiveActor *, const TVec3f &); + void moveCoordToNearestPos(LiveActor*, const TVec3f&); - s32 moveCoordAndCheckPassPointNo(LiveActor *, f32); - void moveCoordAndTransToNearestRailPos(LiveActor *); - void moveCoordAndTransToRailPoint(LiveActor *, s32); - void moveTransToCurrentRailPos(LiveActor *); - - void reverseRailDirection(LiveActor *); - - void setRailCoord(LiveActor *, f32); - void setRailCoordSpeed(LiveActor *, f32); - void accelerateRailCoordSpeed(LiveActor *, f32); - - void calcDistanceToCurrentAndNextRailPoint(const LiveActor *, f32 *, f32 *); - - void moveCoord(LiveActor *, f32); - - void moveTransToOtherActorRailPos(LiveActor *, const LiveActor *); - - const TVec3f& getRailPos(const LiveActor *); - const TVec3f& getRailDirection(const LiveActor *); - - const TVec3f& getRailPointPosStart(const LiveActor *); - - void moveCoordToStartPos(LiveActor *); - void moveCoordAndTransToRailStartPoint(LiveActor *); - - bool getJMapInfoRailArg0NoInit(const LiveActor *, s32 *); - bool getRailPointArg0NoInit(const LiveActor *, s32, f32 *); + s32 moveCoordAndCheckPassPointNo(LiveActor*, f32); + void moveCoordAndTransToNearestRailPos(LiveActor*); + void moveCoordAndTransToRailPoint(LiveActor*, s32); + void moveTransToCurrentRailPos(LiveActor*); - bool getRailPointArg0WithInit(const LiveActor *, s32, s32 *); + void reverseRailDirection(LiveActor*); - bool getRailArg0WithInit(const LiveActor *, s32 *); - bool getRailArg1WithInit(const RailRider *, s32 *); + void setRailCoord(LiveActor*, f32); + void setRailCoordSpeed(LiveActor*, f32); + void accelerateRailCoordSpeed(LiveActor*, f32); - bool getRailArg3NoInit(const LiveActor *, s32 *); + void calcDistanceToCurrentAndNextRailPoint(const LiveActor*, f32*, f32*); - f64 calcNearestRailCoord(const LiveActor *, const TVec3f &); + void moveCoord(LiveActor*, f32); - void moveCoordAndFollowTrans(LiveActor *); - void moveCoordAndFollowTrans(LiveActor *, f32); + void moveTransToOtherActorRailPos(LiveActor*, const LiveActor*); - bool isExistRail(const LiveActor *); + const TVec3f& getRailPos(const LiveActor*); + const TVec3f& getRailDirection(const LiveActor*); - void moveRailRider(LiveActor *); + const TVec3f& getRailPointPosStart(const LiveActor*); - void moveCoordToEndPos(LiveActor *); + void moveCoordToStartPos(LiveActor*); + void moveCoordAndTransToRailStartPoint(LiveActor*); - void slowDownRailCoordSpeed(LiveActor *, f32); + bool getJMapInfoRailArg0NoInit(const LiveActor*, s32*); + bool getRailPointArg0NoInit(const LiveActor*, s32, f32*); - bool isRailGoingToEnd(const LiveActor *); + bool getRailPointArg0WithInit(const LiveActor*, s32, s32*); - f32 getRailCoordSpeed(const LiveActor *); + bool getRailArg0WithInit(const LiveActor*, s32*); + bool getRailArg1WithInit(const RailRider*, s32*); - void setRailDirectionToEnd(LiveActor *); - void setRailDirectionCloseToNearestPos(LiveActor *, const TVec3f &); + bool getRailArg3NoInit(const LiveActor*, s32*); - bool isLoopRail(const LiveActor *); + f64 calcNearestRailCoord(const LiveActor*, const TVec3f&); - bool getRailPointArg1NoInit(const LiveActor *, s32, f32 *); + void moveCoordAndFollowTrans(LiveActor*); + void moveCoordAndFollowTrans(LiveActor*, f32); - bool getCurrentRailPointArg0WithInit(const LiveActor *, s32 *); - bool getCurrentRailPointArg1WithInit(const LiveActor *, s32 *); - bool getCurrentRailPointArg0NoInit(const LiveActor *, s32 *); - bool getCurrentRailPointArg1NoInit(const LiveActor *, s32 *); + bool isExistRail(const LiveActor*); - bool getCurrentRailPointArg0NoInit(const LiveActor *, f32 *); + void moveRailRider(LiveActor*); - bool getCurrentRailPointArg1NoInit(const LiveActor *, f32 *); + void moveCoordToEndPos(LiveActor*); - bool getNextRailPointArg0NoInit(const LiveActor *, f32 *); - bool getNextRailPointArg1NoInit(const LiveActor *, f32 *); + void slowDownRailCoordSpeed(LiveActor*, f32); - const TVec3f& getRailPointPosEnd(const LiveActor *); - void calcRailEndPointPos(TVec3f *, const LiveActor *); - void calcNearestRailDirection(TVec3f *, const LiveActor *, const TVec3f &); - void calcNearestRailPos(TVec3f *, const LiveActor *, const TVec3f &); + bool isRailGoingToEnd(const LiveActor*); - void calcMovingDirectionAlongRail(LiveActor *, TVec3f *, const TVec3f &, float, bool, bool *); - void calcMovingDirectionAlongRailH(LiveActor *, TVec3f *, const TVec3f &, float, bool *); + f32 getRailCoordSpeed(const LiveActor*); - void calcRailPosAndDirectionAtCoord(TVec3f *, TVec3f *, const LiveActor *, f32); + void setRailDirectionToEnd(LiveActor*); + void setRailDirectionCloseToNearestPos(LiveActor*, const TVec3f&); + + bool isLoopRail(const LiveActor*); + + bool getRailPointArg1NoInit(const LiveActor*, s32, f32*); + + bool getCurrentRailPointArg0WithInit(const LiveActor*, s32*); + bool getCurrentRailPointArg1WithInit(const LiveActor*, s32*); + bool getCurrentRailPointArg0NoInit(const LiveActor*, s32*); + bool getCurrentRailPointArg1NoInit(const LiveActor*, s32*); + + bool getCurrentRailPointArg0NoInit(const LiveActor*, f32*); + + bool getCurrentRailPointArg1NoInit(const LiveActor*, f32*); + + bool getNextRailPointArg0NoInit(const LiveActor*, f32*); + bool getNextRailPointArg1NoInit(const LiveActor*, f32*); + + const TVec3f& getRailPointPosEnd(const LiveActor*); + void calcRailEndPointPos(TVec3f*, const LiveActor*); + void calcNearestRailDirection(TVec3f*, const LiveActor*, const TVec3f&); + void calcNearestRailPos(TVec3f*, const LiveActor*, const TVec3f&); + + void calcMovingDirectionAlongRail(LiveActor*, TVec3f*, const TVec3f&, float, bool, bool*); + void calcMovingDirectionAlongRailH(LiveActor*, TVec3f*, const TVec3f&, float, bool*); + + void calcRailPosAndDirectionAtCoord(TVec3f*, TVec3f*, const LiveActor*, f32); void calcRailStartPos(TVec3f*, const LiveActor*); - void calcBoundingBox(const LiveActor *, TBox3f *, f32); + void calcBoundingBox(const LiveActor*, TBox3f*, f32); - void calcRailClippingInfo(TVec3f *, f32 *, const LiveActor *, f32, f32); -}; + void calcRailClippingInfo(TVec3f*, f32*, const LiveActor*, f32, f32); +}; // namespace MR diff --git a/include/Game/Util/RenderMode.hpp b/include/Game/Util/RenderMode.hpp index 4e24065be..551d752f8 100644 --- a/include/Game/Util/RenderMode.hpp +++ b/include/Game/Util/RenderMode.hpp @@ -6,20 +6,20 @@ class RenderModeObj { public: static u32 getViWidthMax(); - VITVMode mTVMode; // 0x0 - u16 mFrameBufWidth; // 0x4 - u16 mEFBHeight; // 0x6 - u16 mXFBHeight; // 0x8 - u16 mXOrigin; // 0xA - u16 mYOrigin; // 0xC - u16 mVIWidth; // 0xE - u16 mVIHeight; // 0x10 - u16 _12; - VIXFBMode mMode; // 0x14 - u8 mFieldRendering; // 0x18 - u8 mAA; // 0x19 - u8 mSamplePattern[12][2]; // 0x1A - u8 mFilter[7]; // 0x32 + VITVMode mTVMode; // 0x0 + u16 mFrameBufWidth; // 0x4 + u16 mEFBHeight; // 0x6 + u16 mXFBHeight; // 0x8 + u16 mXOrigin; // 0xA + u16 mYOrigin; // 0xC + u16 mVIWidth; // 0xE + u16 mVIHeight; // 0x10 + u16 _12; + VIXFBMode mMode; // 0x14 + u8 mFieldRendering; // 0x18 + u8 mAA; // 0x19 + u8 mSamplePattern[12][2]; // 0x1A + u8 mFilter[7]; // 0x32 }; namespace MR { diff --git a/include/Game/Util/RumbleCalculator.hpp b/include/Game/Util/RumbleCalculator.hpp index af24fc91d..7ed1af880 100644 --- a/include/Game/Util/RumbleCalculator.hpp +++ b/include/Game/Util/RumbleCalculator.hpp @@ -7,23 +7,23 @@ class RumbleCalculator { public: RumbleCalculator(f32, f32, f32, u32); - virtual void calcValues(TVec3f *, const TVec3f &) = 0; + virtual void calcValues(TVec3f*, const TVec3f&) = 0; void start(u32); void calc(); void reset(); - u32 _4; - u32 _8; + u32 _4; + u32 _8; TVec3f _C; - f32 _18; - f32 _1C; - f32 _20; + f32 _18; + f32 _1C; + f32 _20; }; class RumbleCalculatorCosMultLinear : public RumbleCalculator { public: RumbleCalculatorCosMultLinear(f32, f32, f32, u32); - virtual void calcValues(TVec3f *, const TVec3f &); + virtual void calcValues(TVec3f*, const TVec3f&); }; \ No newline at end of file diff --git a/include/Game/Util/SceneUtil.hpp b/include/Game/Util/SceneUtil.hpp index 3cba9134d..9c564ed83 100644 --- a/include/Game/Util/SceneUtil.hpp +++ b/include/Game/Util/SceneUtil.hpp @@ -12,74 +12,74 @@ class JMapLinkInfo; class NameObj; namespace MR { - s32 getCurrentScenarioNo(); - s32 getCurrentSelectedScenarioNo(); - void setCurrentScenarioNo(s32, s32); - bool isScenarioDecided(); - const char* getCurrentStageName(); - bool isEqualSceneName(const char*); - bool isEqualStageName(const char*); - bool isStageBeginPrologueEvent(); - bool isStageBeginFadeWipe(); - bool isStageBeginTitleWipe(); - bool isStageBeginWithoutWipe(); - bool isStageDisablePauseMenu(); - bool isStageAstroLocation(); - bool isStageSwimAngleLimit(); - bool isStageStarPieceFollowGroupLimit(); - bool isStageFileSelect(); - bool isStageKoopaVs(); - bool isStageKoopaVs1(); - bool isStageKoopaVs2(); - bool isStageKoopaVs3(); - bool isStageEpilogueDemo(); - bool isBeginScenarioStarter(); - bool isStageSuddenDeathDodoryu(); - void setInitializeStatePlacementPlayer(); - void setInitializeStatePlacementHighPriority(); - void setInitializeStatePlacement(); - void setInitializeStateAfterPlacement(); - bool isInitializeStateEnd(); - bool isInitializeStatePlacementSomething(); - void stopSceneForScenarioOpeningCamera(); - void playSceneForScenarioOpeningCamera(); + s32 getCurrentScenarioNo(); + s32 getCurrentSelectedScenarioNo(); + void setCurrentScenarioNo(s32, s32); + bool isScenarioDecided(); + const char* getCurrentStageName(); + bool isEqualSceneName(const char*); + bool isEqualStageName(const char*); + bool isStageBeginPrologueEvent(); + bool isStageBeginFadeWipe(); + bool isStageBeginTitleWipe(); + bool isStageBeginWithoutWipe(); + bool isStageDisablePauseMenu(); + bool isStageAstroLocation(); + bool isStageSwimAngleLimit(); + bool isStageStarPieceFollowGroupLimit(); + bool isStageFileSelect(); + bool isStageKoopaVs(); + bool isStageKoopaVs1(); + bool isStageKoopaVs2(); + bool isStageKoopaVs3(); + bool isStageEpilogueDemo(); + bool isBeginScenarioStarter(); + bool isStageSuddenDeathDodoryu(); + void setInitializeStatePlacementPlayer(); + void setInitializeStatePlacementHighPriority(); + void setInitializeStatePlacement(); + void setInitializeStateAfterPlacement(); + bool isInitializeStateEnd(); + bool isInitializeStatePlacementSomething(); + void stopSceneForScenarioOpeningCamera(); + void playSceneForScenarioOpeningCamera(); const JMapIdInfo& getCurrentMarioStartIdInfo(); - s32 getStartPosNum(); - s32 getCurrentStartZoneId(); + s32 getStartPosNum(); + s32 getCurrentStartZoneId(); const JMapIdInfo& getInitializeStartIdInfo(); - JKRMemArchive* getStageArchive(const char*); - s32 getGeneralPosNum(); - void getGeneralPosData(const char**, TVec3f*, TVec3f*, JMapLinkInfo**, int); - s32 getChildObjNum(const JMapInfoIter&); - const char* getChildObjName(const char**, const JMapInfoIter&, int); - void initChildObj(NameObj*, const JMapInfoIter&, int); - const char* getAppearPowerStarObjName(s32); - s32 getCurrentStageNormalScenarioNum(); - s32 getCurrentStagePowerStarNum(); - s32 getZoneNum(); - const char* getZoneNameFromZoneId(s32); - s32 getPlacedHiddenStarScenarioNo(const char*, s32); - void getRailInfo(JMapInfoIter*, const JMapInfo**, const JMapInfoIter&); - bool getNextLinkRailInfo(JMapInfoIter*, const JMapInfo**, const JMapInfoIter&); - s32 getCurrentStartCameraId(); - void getStartCameraIdInfoFromStartDataIndex(JMapIdInfo*, int); - s32 getPlacedRailNum(s32); - void getCameraRailInfo(JMapInfoIter*, const JMapInfo**, s32, s32); - bool getCameraRailInfoFromRailDataIndex(JMapInfoIter*, const JMapInfo**, int, s32); - void getStageCameraData(void**, s32*, s32); - void getCurrentScenarioStartAnimCameraData(void**, s32*); - void incCoin(int); - void incPurpleCoin(); - s32 getCoinNum(); - s32 getPurpleCoinNum(); - s32 getPowerStarNum(); - bool isPlacementLocalStage(); - s32 getPlacedZoneId(const JMapInfoIter&); - TMtx34f* getZonePlacementMtx(const JMapInfoIter&); - TMtx34f* getZonePlacementMtx(s32); - const char* getJapaneseObjectName(const char*); - void setCurrentPlacementZoneId(s32); - void clearCurrentPlacementZoneId(); - s32 getCurrentPlacementZoneId(); - const char* getCurrentPlacementZoneName(); -}; + JKRMemArchive* getStageArchive(const char*); + s32 getGeneralPosNum(); + void getGeneralPosData(const char**, TVec3f*, TVec3f*, JMapLinkInfo**, int); + s32 getChildObjNum(const JMapInfoIter&); + const char* getChildObjName(const char**, const JMapInfoIter&, int); + void initChildObj(NameObj*, const JMapInfoIter&, int); + const char* getAppearPowerStarObjName(s32); + s32 getCurrentStageNormalScenarioNum(); + s32 getCurrentStagePowerStarNum(); + s32 getZoneNum(); + const char* getZoneNameFromZoneId(s32); + s32 getPlacedHiddenStarScenarioNo(const char*, s32); + void getRailInfo(JMapInfoIter*, const JMapInfo**, const JMapInfoIter&); + bool getNextLinkRailInfo(JMapInfoIter*, const JMapInfo**, const JMapInfoIter&); + s32 getCurrentStartCameraId(); + void getStartCameraIdInfoFromStartDataIndex(JMapIdInfo*, int); + s32 getPlacedRailNum(s32); + void getCameraRailInfo(JMapInfoIter*, const JMapInfo**, s32, s32); + bool getCameraRailInfoFromRailDataIndex(JMapInfoIter*, const JMapInfo**, int, s32); + void getStageCameraData(void**, s32*, s32); + void getCurrentScenarioStartAnimCameraData(void**, s32*); + void incCoin(int); + void incPurpleCoin(); + s32 getCoinNum(); + s32 getPurpleCoinNum(); + s32 getPowerStarNum(); + bool isPlacementLocalStage(); + s32 getPlacedZoneId(const JMapInfoIter&); + TMtx34f* getZonePlacementMtx(const JMapInfoIter&); + TMtx34f* getZonePlacementMtx(s32); + const char* getJapaneseObjectName(const char*); + void setCurrentPlacementZoneId(s32); + void clearCurrentPlacementZoneId(); + s32 getCurrentPlacementZoneId(); + const char* getCurrentPlacementZoneName(); +}; // namespace MR diff --git a/include/Game/Util/SchedulerUtil.hpp b/include/Game/Util/SchedulerUtil.hpp index 1f850d721..cf8e06200 100644 --- a/include/Game/Util/SchedulerUtil.hpp +++ b/include/Game/Util/SchedulerUtil.hpp @@ -9,4 +9,4 @@ namespace MR { u32 _0; }; -}; \ No newline at end of file +}; // namespace MR \ No newline at end of file diff --git a/include/Game/Util/ScreenUtil.hpp b/include/Game/Util/ScreenUtil.hpp index 3ebea6c1a..7fc2d84f5 100644 --- a/include/Game/Util/ScreenUtil.hpp +++ b/include/Game/Util/ScreenUtil.hpp @@ -6,116 +6,116 @@ struct ResTIMG; namespace MR { - u32 getViWidth(); - f32 getSafetyVIScreenWidthRatio(); - s32 getScreenWidth(); - s32 getSafetyFrameWidth(); - s32 getSafetyFrameLeft(); - s32 getSafetyFrameRight(); - s32 getFrameBufferWidth(); - s32 getFrameBufferHeight(); - void convertFrameBufferPosToScreenPos(TVec2f*, const TVec2f&); - void convertScreenPosToFrameBufferPos(TVec2f*, const TVec2f&); - void startToCaptureScreen(const char*); - void endToCaptureScreen(const char*); - void captureScreenIfAllow(const char*); + u32 getViWidth(); + f32 getSafetyVIScreenWidthRatio(); + s32 getScreenWidth(); + s32 getSafetyFrameWidth(); + s32 getSafetyFrameLeft(); + s32 getSafetyFrameRight(); + s32 getFrameBufferWidth(); + s32 getFrameBufferHeight(); + void convertFrameBufferPosToScreenPos(TVec2f*, const TVec2f&); + void convertScreenPosToFrameBufferPos(TVec2f*, const TVec2f&); + void startToCaptureScreen(const char*); + void endToCaptureScreen(const char*); + void captureScreenIfAllow(const char*); ResTIMG* getScreenResTIMG(); - u8* getScreenTexImage(); - void closeWipeCircle(s32); - void forceOpenWipeCircle(); - void forceCloseWipeCircle(); - void closeWipeFade(s32); - void forceOpenWipeFade(); - void forceCloseWipeFade(); - void closeWipeWhiteFade(s32); - void forceOpenWipeWhiteFade(); - void forceCloseWipeWhiteFade(); - bool isWipeActive(); - bool isWipeBlank(); - bool isWipeOpen(); - void closeSystemWipeCircle(s32); - void openSystemWipeFade(s32); - void closeSystemWipeFade(s32); - void forceOpenSystemWipeFade(); - void openSystemWipeWhiteFade(s32); - void closeSystemWipeWhiteFade(s32); - void forceCloseSystemWipeWhiteFade(); - bool isSystemWipeActive(); - void closeSystemWipeCircleWithCaptureScreen(s32); - void closeSystemWipeFadeWithCaptureScreen(s32); - void setWipeCircleCenterPos(const TVec3f&); - void requestMovementOnImageEffect(); - void setImageEffectControlAuto(); - void turnOffDOFInSubjective(); - void turnOnDOFInSubjective(); - void turnOnNormalBloom(); - void turnOnDepthOfField(bool); - void turnOffImageEffect(); - void forceOffImageEffect(); - void createNormalBloom(); - bool isNormalBloomOn(); - bool isNormalBloomForEachModel(); - void setNormalBloomIntensity(u8); - void setNormalBloomThreshold(u8); - void setNormalBloomBlurIntensity1(u8); - void setNormalBloomBlurIntensity2(u8); - void createSimpleBloom(); - void createScreenBlur(); - void createDepthOfFieldBlur(); - void setDepthOfFieldBlurIntensity(f32); - void createCenterScreenBlur(); - void startCenterScreenBlur(s32, f32, u8, s32, s32); - void startGlobalTimer(); - void resetGlobalTimer(); - bool isGlobalTimerEnd(); - void startGlobalTimerTimeUp(); - void requestPowerUpHPMeter(); - void requestForceAppearHPMeter(); - void startMissLayout(); - bool isMissLayoutAnimEnd(); - void activateDefaultGameLayout(); - void deactivateDefaultGameLayout(); - bool isActiveDefaultGameLayout(); - void forceAppearDefaultGameLayout(); - void pauseOffLensFlare(); - void tryScreenToFrameCinemaFrame(); - void tryFrameToBlankCinemaFrame(); - void tryBlankToFrameCinemaFrame(); - void tryFrameToScreenCinemaFrame(); - void forceToScreenCinemaFrame(); - void forceToFrameCinemaFrame(); - void forceToBlankCinemaFrame(); - bool isStopCinemaFrame(); - void appearInformationMessage(const char*, bool); - void appearInformationMessageCenter(const char*, bool); - void appearInformationMessage(const wchar_t*, bool); - void setInformationMessageReplaceString(const wchar_t*, s32); - void disappearInformationMessage(); - bool isDeadInformationMessage(); - void appearYesNoSelector(const char*, const char*, const char*); - bool isYesNoSelected(); - bool isYesNoSelectedYes(); - void setYesNoSelectorSE(const char*, const char*, const char*); - void resetYesNoSelectorSE(); - void startMoviePlayer(const char*); - void stopMoviePlayer(); - bool isActiveMoviePlayer(); - bool isMoviePlayerPlaying(); - s32 getMovieCurrentFrame(); - u32 getMovieTotalFrame(); - void setMovieVolume(f32, s32); - void appearStarCounter(); - void disappearStarCounter(); - void forceSyncStarPieceCounter(); - void forceAppearStarPieceCounterForTicoFat(); - void disappearStarPieceCounterForTicoFat(); - void createPurpleCoinCounter(); - void validatePurpleCoinCounter(); - void requestCounterLayoutAppearanceForTicoEat(bool); - void openWipeCircle(s32); - void openWipeFade(s32); - void openWipeWhiteFade(s32); - void startGameOverWipe(); - void startDownWipe(); - void requestOneUp(); -}; + u8* getScreenTexImage(); + void closeWipeCircle(s32); + void forceOpenWipeCircle(); + void forceCloseWipeCircle(); + void closeWipeFade(s32); + void forceOpenWipeFade(); + void forceCloseWipeFade(); + void closeWipeWhiteFade(s32); + void forceOpenWipeWhiteFade(); + void forceCloseWipeWhiteFade(); + bool isWipeActive(); + bool isWipeBlank(); + bool isWipeOpen(); + void closeSystemWipeCircle(s32); + void openSystemWipeFade(s32); + void closeSystemWipeFade(s32); + void forceOpenSystemWipeFade(); + void openSystemWipeWhiteFade(s32); + void closeSystemWipeWhiteFade(s32); + void forceCloseSystemWipeWhiteFade(); + bool isSystemWipeActive(); + void closeSystemWipeCircleWithCaptureScreen(s32); + void closeSystemWipeFadeWithCaptureScreen(s32); + void setWipeCircleCenterPos(const TVec3f&); + void requestMovementOnImageEffect(); + void setImageEffectControlAuto(); + void turnOffDOFInSubjective(); + void turnOnDOFInSubjective(); + void turnOnNormalBloom(); + void turnOnDepthOfField(bool); + void turnOffImageEffect(); + void forceOffImageEffect(); + void createNormalBloom(); + bool isNormalBloomOn(); + bool isNormalBloomForEachModel(); + void setNormalBloomIntensity(u8); + void setNormalBloomThreshold(u8); + void setNormalBloomBlurIntensity1(u8); + void setNormalBloomBlurIntensity2(u8); + void createSimpleBloom(); + void createScreenBlur(); + void createDepthOfFieldBlur(); + void setDepthOfFieldBlurIntensity(f32); + void createCenterScreenBlur(); + void startCenterScreenBlur(s32, f32, u8, s32, s32); + void startGlobalTimer(); + void resetGlobalTimer(); + bool isGlobalTimerEnd(); + void startGlobalTimerTimeUp(); + void requestPowerUpHPMeter(); + void requestForceAppearHPMeter(); + void startMissLayout(); + bool isMissLayoutAnimEnd(); + void activateDefaultGameLayout(); + void deactivateDefaultGameLayout(); + bool isActiveDefaultGameLayout(); + void forceAppearDefaultGameLayout(); + void pauseOffLensFlare(); + void tryScreenToFrameCinemaFrame(); + void tryFrameToBlankCinemaFrame(); + void tryBlankToFrameCinemaFrame(); + void tryFrameToScreenCinemaFrame(); + void forceToScreenCinemaFrame(); + void forceToFrameCinemaFrame(); + void forceToBlankCinemaFrame(); + bool isStopCinemaFrame(); + void appearInformationMessage(const char*, bool); + void appearInformationMessageCenter(const char*, bool); + void appearInformationMessage(const wchar_t*, bool); + void setInformationMessageReplaceString(const wchar_t*, s32); + void disappearInformationMessage(); + bool isDeadInformationMessage(); + void appearYesNoSelector(const char*, const char*, const char*); + bool isYesNoSelected(); + bool isYesNoSelectedYes(); + void setYesNoSelectorSE(const char*, const char*, const char*); + void resetYesNoSelectorSE(); + void startMoviePlayer(const char*); + void stopMoviePlayer(); + bool isActiveMoviePlayer(); + bool isMoviePlayerPlaying(); + s32 getMovieCurrentFrame(); + u32 getMovieTotalFrame(); + void setMovieVolume(f32, s32); + void appearStarCounter(); + void disappearStarCounter(); + void forceSyncStarPieceCounter(); + void forceAppearStarPieceCounterForTicoFat(); + void disappearStarPieceCounterForTicoFat(); + void createPurpleCoinCounter(); + void validatePurpleCoinCounter(); + void requestCounterLayoutAppearanceForTicoEat(bool); + void openWipeCircle(s32); + void openWipeFade(s32); + void openWipeWhiteFade(s32); + void startGameOverWipe(); + void startDownWipe(); + void requestOneUp(); +}; // namespace MR diff --git a/include/Game/Util/SequenceUtil.hpp b/include/Game/Util/SequenceUtil.hpp index 00f3b1964..d6e2b6c64 100644 --- a/include/Game/Util/SequenceUtil.hpp +++ b/include/Game/Util/SequenceUtil.hpp @@ -28,4 +28,4 @@ namespace MR { void executeOnWelcomeAndRetry(); void requestGoToAstroGalaxy(s32); void requestGoToAstroDomeFromAstroGalaxy(s32, s32); -}; +}; // namespace MR diff --git a/include/Game/Util/SoundUtil.hpp b/include/Game/Util/SoundUtil.hpp index 2174c744d..f754df891 100644 --- a/include/Game/Util/SoundUtil.hpp +++ b/include/Game/Util/SoundUtil.hpp @@ -11,11 +11,11 @@ namespace MR { void startCurrentStageBGM(); void startBossBGM(s32); - void startStageBGM(const char *, bool); - void startStageBGMFromStageName(const char *, const char * , s32); + void startStageBGM(const char*, bool); + void startStageBGMFromStageName(const char*, const char*, s32); - void startAtmosphereSE(const char *, s32, s32); - void startAtmosphereLevelSE(const char *, s32, s32); + void startAtmosphereSE(const char*, s32, s32); + void startAtmosphereLevelSE(const char*, s32, s32); void stopStageBGM(u32); void unlockStageBGM(); @@ -29,29 +29,29 @@ namespace MR { void stopSubBGM(u32); - void startSound(const LiveActor *, const char *, s32, s32); + void startSound(const LiveActor*, const char*, s32, s32); void actorSoundMovement(LiveActor*); - void startSystemSE(const char *, s32, s32); - void stopSystemSE(const char *, u32); - void startSpinHitSound(const LiveActor *); - void startBlowHitSound(const LiveActor *); - void startSystemME(const char *); - void startSound(const LiveActor *, const char *, s32, s32); - void startSoundObject(AudSoundObject *, const char *); + void startSystemSE(const char*, s32, s32); + void stopSystemSE(const char*, u32); + void startSpinHitSound(const LiveActor*); + void startBlowHitSound(const LiveActor*); + void startSystemME(const char*); + void startSound(const LiveActor*, const char*, s32, s32); + void startSoundObject(AudSoundObject*, const char*); - void startLevelSound(const LiveActor *, const char *, s32, s32, s32); - void startLevelSound(const LiveActor *, JAISoundID, s32, s32, s32); - void releaseSoundHandle(const LiveActor *, const char *); + void startLevelSound(const LiveActor*, const char*, s32, s32, s32); + void startLevelSound(const LiveActor*, JAISoundID, s32, s32, s32); + void releaseSoundHandle(const LiveActor*, const char*); void setAudioEffectType(s32, s32); bool isPlayingStageBgm(); bool isPlayingStageBgmID(u32); - bool isPlayingStageBgmName(const char *); + bool isPlayingStageBgmName(const char*); bool isStopOrFadeoutStageBgmID(u32); - bool isStopOrFadeoutBgmName(const char *); + bool isStopOrFadeoutBgmName(const char*); bool isPreparedStageBgm(); void setStageBGMState(s32, u32); @@ -63,7 +63,7 @@ namespace MR { void startEventBGM(s32); void startAfterBossBGM(); - void startCSSound(const char *, const char *, s32); + void startCSSound(const char*, const char*, s32); bool hasME(); @@ -71,13 +71,13 @@ namespace MR { void start2PJumpAssistSound(); void startDPDHitSound(); - void startDPDFreezeLevelSound(const LiveActor *); + void startDPDFreezeLevelSound(const LiveActor*); void moveVolumeStageBGMForNoteFairy(f32, u32); s32 getRemixMelodyNoteNum(s32); - void startSystemLevelSE(const char *, s32, s32); + void startSystemLevelSE(const char*, s32, s32); void submitSE(); @@ -90,20 +90,20 @@ namespace MR { void setSoundVolumeSetting(s32, u32); - void startSubBGM(const char *, bool); + void startSubBGM(const char*, bool); - void stopSound(const LiveActor *, const char *, u32); - void startSoundObjectLevel(AudSoundObject *, const char *, s32); + void stopSound(const LiveActor*, const char*, u32); + void startSoundObjectLevel(AudSoundObject*, const char*, s32); void limitedStarPieceHitSound(); void submitLevelSE(); void permitLevelSE(); - void setSeVersion(const LiveActor *, u32); + void setSeVersion(const LiveActor*, u32); - void startSoundSeVer(const LiveActor *, const char *, s32, s32); - void startLevelSoundSeVer(const LiveActor *, const char *, s32, s32, s32); + void startSoundSeVer(const LiveActor*, const char*, s32, s32); + void startLevelSoundSeVer(const LiveActor*, const char*, s32, s32, s32); - void setMapSondCodeGravity(const LiveActor *, s32); -}; + void setMapSondCodeGravity(const LiveActor*, s32); +}; // namespace MR diff --git a/include/Game/Util/StarPointerUtil.hpp b/include/Game/Util/StarPointerUtil.hpp index c44899cd0..aa0ff3535 100644 --- a/include/Game/Util/StarPointerUtil.hpp +++ b/include/Game/Util/StarPointerUtil.hpp @@ -14,113 +14,113 @@ namespace { typedef bool (*StarPointerFunc2)(s32); StarPointerOnOffController* getStarPointerOnOffController(); - bool always(s32); - void onReaction(u64, s32, bool, bool, bool); - bool checkPointingTarget(StarPointerTargetInfo*, const TVec3f&, const TVec2f&, f32, f32); - bool checkPointingWithoutCheckZ(StarPointerTargetInfo*, const TVec3f&, const TVec2f&, f32, f32); - bool isStarPointerPointingCore(StarPointerTargetInfo*, const LiveActor*, s32, StarPointerFunc1, StarPointerFunc2, bool, bool, bool); -}; + bool always(s32); + void onReaction(u64, s32, bool, bool, bool); + bool checkPointingTarget(StarPointerTargetInfo*, const TVec3f&, const TVec2f&, f32, f32); + bool checkPointingWithoutCheckZ(StarPointerTargetInfo*, const TVec3f&, const TVec2f&, f32, f32); + bool isStarPointerPointingCore(StarPointerTargetInfo*, const LiveActor*, s32, StarPointerFunc1, StarPointerFunc2, bool, bool, bool); +}; // namespace namespace MR { - void initStarPointerGameScene(); - void createStarPointerLayout(); - void onStarPointerSceneOut(); - void setStarPointerModeBase(); - void setStarPointerCameraMtxAtGameScene(); - void initStarPointerTarget(LiveActor*, f32, const TVec3f&); - void initStarPointerTargetAtPos(LiveActor*, f32, const TVec3f*, const TVec3f&); - void initStarPointerTargetAtMtx(LiveActor*, f32, MtxPtr, const TVec3f&); - void initStarPointerTargetAtJoint(LiveActor*, const char*, f32, const TVec3f&); - void addStarPointerTargetCircle(LayoutActor*, const char*, f32, const TVec2f&, const char*); - bool isStarPointerValid(s32); - bool isStarPointerPointing(const LiveActor*, s32, bool, const char*); - bool tryStarPointerCheck(const LiveActor*, bool, const char*); - bool tryStarPointerCheckWithoutRumble(LiveActor*, bool); - bool isStarPointerPointingPane(const LayoutActor*, const char*, s32, bool, const char*); - bool isStarPointerPointingPaneForMeterLayout(const LayoutActor*, const char*, s32, bool, const char*); - bool isStarPointerPointingTarget(const LayoutActor*, const char*, s32, bool, const char*); - bool isStarPointerPointing1P(const LiveActor*, const char*, bool, bool); - bool isStarPointerPointing1PWithoutCheckZ(const LiveActor*, const char*, bool, bool); - bool isStarPointerPointing2P(const LiveActor*, const char*, bool, bool); - bool isStarPointerPointing2POnPressButton(const LiveActor*, const char*, bool, bool); - bool isStarPointerPointing2POnTriggerButton(const LiveActor*, const char*, bool, bool); - bool isStarPointerPointingFileSelect(const LiveActor*); - bool isStarPointerPointing1Por2P(const LiveActor*, const char*, bool, bool); - bool requestTicoSeedGuidanceForce(); - bool requestPointerGuidanceNoInformation(); - bool isExistStarPointerGuidance(); - bool isExistStarPointerGuidanceFrame1P(); - void activeStarPointerGuidance(); - void deactiveStarPointerGuidance(); - void tryShowTimeoutedStarPointerGuidance(); - bool isExistStarPointerTarget(const LiveActor*); - void setStarPointerTargetRadius3d(LiveActor*, f32); - bool isStarPointerPointing(const TVec3f&, f32, s32, bool); - MtxPtr getStarPointerViewMtx(); - MtxPtr getStarPointerProjMtx(); - f32 getStarPointerRadius(s32); + void initStarPointerGameScene(); + void createStarPointerLayout(); + void onStarPointerSceneOut(); + void setStarPointerModeBase(); + void setStarPointerCameraMtxAtGameScene(); + void initStarPointerTarget(LiveActor*, f32, const TVec3f&); + void initStarPointerTargetAtPos(LiveActor*, f32, const TVec3f*, const TVec3f&); + void initStarPointerTargetAtMtx(LiveActor*, f32, MtxPtr, const TVec3f&); + void initStarPointerTargetAtJoint(LiveActor*, const char*, f32, const TVec3f&); + void addStarPointerTargetCircle(LayoutActor*, const char*, f32, const TVec2f&, const char*); + bool isStarPointerValid(s32); + bool isStarPointerPointing(const LiveActor*, s32, bool, const char*); + bool tryStarPointerCheck(const LiveActor*, bool, const char*); + bool tryStarPointerCheckWithoutRumble(LiveActor*, bool); + bool isStarPointerPointingPane(const LayoutActor*, const char*, s32, bool, const char*); + bool isStarPointerPointingPaneForMeterLayout(const LayoutActor*, const char*, s32, bool, const char*); + bool isStarPointerPointingTarget(const LayoutActor*, const char*, s32, bool, const char*); + bool isStarPointerPointing1P(const LiveActor*, const char*, bool, bool); + bool isStarPointerPointing1PWithoutCheckZ(const LiveActor*, const char*, bool, bool); + bool isStarPointerPointing2P(const LiveActor*, const char*, bool, bool); + bool isStarPointerPointing2POnPressButton(const LiveActor*, const char*, bool, bool); + bool isStarPointerPointing2POnTriggerButton(const LiveActor*, const char*, bool, bool); + bool isStarPointerPointingFileSelect(const LiveActor*); + bool isStarPointerPointing1Por2P(const LiveActor*, const char*, bool, bool); + bool requestTicoSeedGuidanceForce(); + bool requestPointerGuidanceNoInformation(); + bool isExistStarPointerGuidance(); + bool isExistStarPointerGuidanceFrame1P(); + void activeStarPointerGuidance(); + void deactiveStarPointerGuidance(); + void tryShowTimeoutedStarPointerGuidance(); + bool isExistStarPointerTarget(const LiveActor*); + void setStarPointerTargetRadius3d(LiveActor*, f32); + bool isStarPointerPointing(const TVec3f&, f32, s32, bool); + MtxPtr getStarPointerViewMtx(); + MtxPtr getStarPointerProjMtx(); + f32 getStarPointerRadius(s32); TVec2f* getStarPointerScreenPosition(s32); - TVec2f getStarPointerScreenPositionOrEdge(s32); - f32 getStarPointerScreenSpeed(s32); - bool isStarPointerInScreen(s32); - bool isStarPointerInScreenAnyPort(s32*); - s32* getStarPointerLastPointedPort(const LiveActor*); + TVec2f getStarPointerScreenPositionOrEdge(s32); + f32 getStarPointerScreenSpeed(s32); + bool isStarPointerInScreen(s32); + bool isStarPointerInScreenAnyPort(s32*); + s32* getStarPointerLastPointedPort(const LiveActor*); TVec2f* getStarPointerScreenVelocity(s32); - void getStarPointerWorldVelocityDirection(TVec3f*, s32); + void getStarPointerWorldVelocityDirection(TVec3f*, s32); TVec3f* getStarPointerWorldPosUsingDepth(s32); - void calcStarPointerWorldPointingPos(TVec3f*, const TVec3f&, s32); - void calcStarPointerWorldPointingPosInsideEdge(TVec3f*, const TVec3f&, s32); - bool calcStarPointerPosOnPlane(TVec3f*, const TVec3f&, const TVec3f&, s32, bool); - bool calcStarPointerWorldVelocityDirectionOnPlane(TVec3f*, const TVec3f&, const TVec3f&, s32); - f32 calcPointRadius2D(const TVec3f&, f32); - bool calcStarPointerStrokeRotateMoment(TVec3f*, const TVec3f&, f32, s32); - bool calcStarPointerScreenDistanceToTarget(const LiveActor*, f32*, s32); - bool tryStartStarPointerCommandStream(const LiveActor*, const TVec3f*, s32, bool); - bool tryEndStarPointerCommandStream(const LiveActor*, s32); - bool isStarPointerCommandStream(const LiveActor*, s32); - void startStarPointerModeTitle(void*); - void startStarPointerModeFileSelect(void*); - void startStarPointerModeGame(void*); - void startStarPointerModeDemo(void*); - void startStarPointerModeDemoWithStarPointer(void*); - void startStarPointerModeDemoWithHandPointerFinger(void*); - void startStarPointerModeDemoMarioDeath(void*); - void startStarPointerModeMarioLauncher(void*); - void startStarPointerModeHomeButton(void*); - void startStarPointerModeChooseYesNo(void*); - void startStarPointerModePauseMenu(void*); - void startStarPointerModeScenarioSelectScene(void*); - void startStarPointerModeBlueStar(void*); - void startStarPointerModePowerStarGetDemo(void*); - void startStarPointerModeStarPieceTarget(void*); - void startStarPointerModeSphereSelectorFinger(void*); - void startStarPointerModeSphereSelectorOnReaction(void*); - void startStarPointerModeEnding(void*); - void startStarPointerModeCommandStream(void*); - void startStarPointerMode1PInvalid2PValid(void*); - void endStarPointerMode(void*); - void requestStarPointerModeErrorWindow(void*); - void requestStarPointerModeSaveLoad(void*); - void requestStarPointerModePictureBook(void*); - void requestStarPointerModePauseMenu(void*); - void requestStarPointerModeBlueStarReady(void*); - void requestStarPointerModeBigBubble(void*, const TVec3f&); - bool isStarPointerModeBlueStarReady(); - bool isStarPointerModeStarPieceTarget(); - bool isStarPointerModeMarioLauncher(); - bool isStarPointerModeHomeButton(); - bool isStarPointerModeErrorWindow(); - void enableStarPointerShootStarPiece(); - void disableStarPointerShootStarPiece(); - bool isEnableStarPointerShootStarPiece(s32); - bool isStarPointer2PTransparencyMode(); - bool isStarPointer1PInvalid2PValidMode(); - void setStarPointerDrawSyncToken(); - bool requestBlueStarGuidance(); - bool requestTicoSeedGuidance(s32); - bool requestBigBubbleGuidance(); - bool requestMarioLauncherGuidance(); - bool requestFileSelectGuidance(); - bool requestFileSelectCopyGuidance(); - bool requestStarPieceLectureGuidance(); -}; + void calcStarPointerWorldPointingPos(TVec3f*, const TVec3f&, s32); + void calcStarPointerWorldPointingPosInsideEdge(TVec3f*, const TVec3f&, s32); + bool calcStarPointerPosOnPlane(TVec3f*, const TVec3f&, const TVec3f&, s32, bool); + bool calcStarPointerWorldVelocityDirectionOnPlane(TVec3f*, const TVec3f&, const TVec3f&, s32); + f32 calcPointRadius2D(const TVec3f&, f32); + bool calcStarPointerStrokeRotateMoment(TVec3f*, const TVec3f&, f32, s32); + bool calcStarPointerScreenDistanceToTarget(const LiveActor*, f32*, s32); + bool tryStartStarPointerCommandStream(const LiveActor*, const TVec3f*, s32, bool); + bool tryEndStarPointerCommandStream(const LiveActor*, s32); + bool isStarPointerCommandStream(const LiveActor*, s32); + void startStarPointerModeTitle(void*); + void startStarPointerModeFileSelect(void*); + void startStarPointerModeGame(void*); + void startStarPointerModeDemo(void*); + void startStarPointerModeDemoWithStarPointer(void*); + void startStarPointerModeDemoWithHandPointerFinger(void*); + void startStarPointerModeDemoMarioDeath(void*); + void startStarPointerModeMarioLauncher(void*); + void startStarPointerModeHomeButton(void*); + void startStarPointerModeChooseYesNo(void*); + void startStarPointerModePauseMenu(void*); + void startStarPointerModeScenarioSelectScene(void*); + void startStarPointerModeBlueStar(void*); + void startStarPointerModePowerStarGetDemo(void*); + void startStarPointerModeStarPieceTarget(void*); + void startStarPointerModeSphereSelectorFinger(void*); + void startStarPointerModeSphereSelectorOnReaction(void*); + void startStarPointerModeEnding(void*); + void startStarPointerModeCommandStream(void*); + void startStarPointerMode1PInvalid2PValid(void*); + void endStarPointerMode(void*); + void requestStarPointerModeErrorWindow(void*); + void requestStarPointerModeSaveLoad(void*); + void requestStarPointerModePictureBook(void*); + void requestStarPointerModePauseMenu(void*); + void requestStarPointerModeBlueStarReady(void*); + void requestStarPointerModeBigBubble(void*, const TVec3f&); + bool isStarPointerModeBlueStarReady(); + bool isStarPointerModeStarPieceTarget(); + bool isStarPointerModeMarioLauncher(); + bool isStarPointerModeHomeButton(); + bool isStarPointerModeErrorWindow(); + void enableStarPointerShootStarPiece(); + void disableStarPointerShootStarPiece(); + bool isEnableStarPointerShootStarPiece(s32); + bool isStarPointer2PTransparencyMode(); + bool isStarPointer1PInvalid2PValidMode(); + void setStarPointerDrawSyncToken(); + bool requestBlueStarGuidance(); + bool requestTicoSeedGuidance(s32); + bool requestBigBubbleGuidance(); + bool requestMarioLauncherGuidance(); + bool requestFileSelectGuidance(); + bool requestFileSelectCopyGuidance(); + bool requestStarPieceLectureGuidance(); +}; // namespace MR diff --git a/include/Game/Util/StringUtil.hpp b/include/Game/Util/StringUtil.hpp index 264c1cbe9..c652a1967 100644 --- a/include/Game/Util/StringUtil.hpp +++ b/include/Game/Util/StringUtil.hpp @@ -144,7 +144,7 @@ namespace MR { bool isNullOrEmptyString(const char* pStr); bool isMessageEditorNextTag(const wchar_t*); - int getStringLengthWithMessageTag(const wchar_t*); + int getStringLengthWithMessageTag(const wchar_t*); /// @brief Parses the given character string into a signed 32-bit integer. /// @param pSrc The pointer to the null-terminated character string to read from. @@ -187,4 +187,4 @@ namespace MR { /// @param pSubStr The pointer to the null-terminated character substring to search for. /// @param pDst The output pointer for the parsed values. void scanf32x4(const char* pSrc, const char* pSubStr, f32* pDst); -}; +}; // namespace MR diff --git a/include/Game/Util/SwitchEventFunctorListener.hpp b/include/Game/Util/SwitchEventFunctorListener.hpp index 17516d6f0..c35b8472f 100644 --- a/include/Game/Util/SwitchEventFunctorListener.hpp +++ b/include/Game/Util/SwitchEventFunctorListener.hpp @@ -11,9 +11,9 @@ public: virtual void listenSwitchOnEvent(); virtual void listenSwitchOffEvent(); - void setOnFunctor(const MR::FunctorBase &); - void setOffFunctor(const MR::FunctorBase &); + void setOnFunctor(const MR::FunctorBase&); + void setOffFunctor(const MR::FunctorBase&); - MR::FunctorBase* mOnFunctor; // 0x4 - MR::FunctorBase* mOffFunctor; // 0x8 + MR::FunctorBase* mOnFunctor; // 0x4 + MR::FunctorBase* mOffFunctor; // 0x8 }; diff --git a/include/Game/Util/SystemUtil.hpp b/include/Game/Util/SystemUtil.hpp index b973059ca..b7254aa39 100644 --- a/include/Game/Util/SystemUtil.hpp +++ b/include/Game/Util/SystemUtil.hpp @@ -15,39 +15,39 @@ namespace nw4r { namespace ut { class Font; }; -}; +}; // namespace nw4r namespace MR { - GameSystemObjHolder* getGameSystemObjHolder(); - nw4r::ut::Font* getFontOnCurrentLanguage(); - nw4r::ut::Font* getPictureFontNW4R(); - nw4r::ut::Font* getMenuFontNW4R(); - nw4r::ut::Font* getNumberFontNW4R(); - nw4r::ut::Font* getCinemaFontNW4R(); + GameSystemObjHolder* getGameSystemObjHolder(); + nw4r::ut::Font* getFontOnCurrentLanguage(); + nw4r::ut::Font* getPictureFontNW4R(); + nw4r::ut::Font* getMenuFontNW4R(); + nw4r::ut::Font* getNumberFontNW4R(); + nw4r::ut::Font* getCinemaFontNW4R(); ParticleResourceHolder* getParticleResourceHolder(); - void requestChangeArchivePlayer(bool); - void waitEndChangeArchivePlayer(); - void callMethodAllSceneNameObj(void (NameObj::*)()); - void suspendAllSceneNameObj(); - void resumeAllSceneNameObj(); - void syncWithFlagsAllSceneNameObj(); - void setRandomSeedFromStageName(); - void clearFileLoaderRequestFileInfo(bool); - void startFunctionAsyncExecute(const MR::FunctorBase&, int, const char*); - bool startFunctionAsyncExecuteOnMainThread(const MR::FunctorBase&, const char*); - void waitForEndFunctionAsyncExecute(const char*); - bool isEndFunctionAsyncExecute(const char*); - bool tryEndFunctionAsyncExecute(const char*); - void suspendAsyncExecuteThread(const char*); - void resumeAsyncExecuteThread(const char*); - bool isSuspendedAsyncExecuteThread(const char*); - bool isScreen16Per9(); - void initSceneMessage(); - void destroySceneMessage(); - void resetSystemAndGameStatus(); - void stopAllSound(u32); - void setLayoutDefaultAllocator(); - bool isDisplayEncouragePal60Window(); - JMapIdInfo* getPlayerRestartIdInfo(); - void setPlayerRestartIdInfo(const JMapIdInfo&); -}; + void requestChangeArchivePlayer(bool); + void waitEndChangeArchivePlayer(); + void callMethodAllSceneNameObj(void (NameObj::*)()); + void suspendAllSceneNameObj(); + void resumeAllSceneNameObj(); + void syncWithFlagsAllSceneNameObj(); + void setRandomSeedFromStageName(); + void clearFileLoaderRequestFileInfo(bool); + void startFunctionAsyncExecute(const MR::FunctorBase&, int, const char*); + bool startFunctionAsyncExecuteOnMainThread(const MR::FunctorBase&, const char*); + void waitForEndFunctionAsyncExecute(const char*); + bool isEndFunctionAsyncExecute(const char*); + bool tryEndFunctionAsyncExecute(const char*); + void suspendAsyncExecuteThread(const char*); + void resumeAsyncExecuteThread(const char*); + bool isSuspendedAsyncExecuteThread(const char*); + bool isScreen16Per9(); + void initSceneMessage(); + void destroySceneMessage(); + void resetSystemAndGameStatus(); + void stopAllSound(u32); + void setLayoutDefaultAllocator(); + bool isDisplayEncouragePal60Window(); + JMapIdInfo* getPlayerRestartIdInfo(); + void setPlayerRestartIdInfo(const JMapIdInfo&); +}; // namespace MR diff --git a/include/Game/Util/TalkUtil.hpp b/include/Game/Util/TalkUtil.hpp index e4f52c636..b4e80c9d8 100644 --- a/include/Game/Util/TalkUtil.hpp +++ b/include/Game/Util/TalkUtil.hpp @@ -16,74 +16,74 @@ namespace MR { void setNoTurnAction(const char*); void setSingleAction(const char*); - u8 _0; - u8 _1; - u8 _2; - u8 _3; - f32 _4; - f32 _8; - f32 _C; - f32 _10; + u8 _0; + u8 _1; + u8 _2; + u8 _3; + f32 _4; + f32 _8; + f32 _C; + f32 _10; const char* _14; const char* _18; const char* _1C; const char* _20; }; - void registerBranchFunc(TalkMessageCtrl*, const TalkMessageFuncBase&); - void registerEventFunc(TalkMessageCtrl*, const TalkMessageFuncBase&); - void registerAnimeFunc(TalkMessageCtrl*, const TalkMessageFuncBase&); - void registerKillFunc(TalkMessageCtrl*, const TalkMessageFuncBase&); - void setMessageArg(TalkMessageCtrl*, int); - void setMessageArg(TalkMessageCtrl*, const wchar_t*); + void registerBranchFunc(TalkMessageCtrl*, const TalkMessageFuncBase&); + void registerEventFunc(TalkMessageCtrl*, const TalkMessageFuncBase&); + void registerAnimeFunc(TalkMessageCtrl*, const TalkMessageFuncBase&); + void registerKillFunc(TalkMessageCtrl*, const TalkMessageFuncBase&); + void setMessageArg(TalkMessageCtrl*, int); + void setMessageArg(TalkMessageCtrl*, const wchar_t*); TalkMessageCtrl* createTalkCtrl(LiveActor*, const JMapInfoIter&, const char*, const TVec3f&, MtxPtr); TalkMessageCtrl* createTalkCtrlDirect(LiveActor*, const JMapInfoIter&, const char*, const TVec3f&, MtxPtr); TalkMessageCtrl* createTalkCtrlDirectOnRootNodeAutomatic(LiveActor*, const JMapInfoIter&, const char*, const TVec3f&, MtxPtr); - bool tryTalkNearPlayer(TalkMessageCtrl*); - bool tryTalkNearPlayerAtEnd(TalkMessageCtrl*); - bool tryTalkForce(TalkMessageCtrl*); - bool tryTalkForceAtEnd(TalkMessageCtrl*); - bool tryTalkForceWithoutDemo(TalkMessageCtrl*); - bool tryTalkForceWithoutDemoMarioPuppetable(TalkMessageCtrl*); - bool tryTalkForceWithoutDemoAtEnd(TalkMessageCtrl*); - bool tryTalkForceWithoutDemoMarioPuppetableAtEnd(TalkMessageCtrl*); - bool tryTalkTimeKeepDemo(TalkMessageCtrl*); - bool tryTalkTimeKeepDemoMarioPuppetable(TalkMessageCtrl*); - bool tryTalkTimeKeepDemoWithoutPauseMarioPuppetable(TalkMessageCtrl*); - bool tryTalkRequest(TalkMessageCtrl*); - bool tryTalkSelectLeft(TalkMessageCtrl*); - bool tryTalkSelectRight(TalkMessageCtrl*); - const MtxPtr getMessageBalloonFollowMatrix(const TalkMessageCtrl*); - const TVec3f& getMessageBalloonFollowOffset(const TalkMessageCtrl*); - void setMessageBalloonFollowOffset(TalkMessageCtrl*, const TVec3f&); - bool isNearPlayer(const TalkMessageCtrl*, f32); - bool inMessageArea(const TalkMessageCtrl*); - bool isTalkNone(const TalkMessageCtrl*); - bool isTalkEntry(const TalkMessageCtrl*); - bool isTalkTalking(const TalkMessageCtrl*); - bool isTalkEnableEnd(const TalkMessageCtrl*); - void clearTalkState(TalkMessageCtrl*); - void resetNode(TalkMessageCtrl*); - void readMessage(TalkMessageCtrl*); - void forwardNode(TalkMessageCtrl*); - void resetAndForwardNode(TalkMessageCtrl*, s32); - void forwardNodeNextBranchLeft(TalkMessageCtrl*); - void forwardNodeNextBranchRight(TalkMessageCtrl*); - void forwardNodeCurrentBranchLeft(TalkMessageCtrl*); - void forwardNodeCurrentBranchRight(TalkMessageCtrl*); - void tryForwardNode(TalkMessageCtrl*); - bool isExistNextNode(const TalkMessageCtrl*); - bool isShortTalk(const TalkMessageCtrl*); - void setDistanceToTalk(TalkMessageCtrl*, f32); - void onRootNodeAutomatic(TalkMessageCtrl*); - void offRootNodeAutomatic(TalkMessageCtrl*); - void onReadNodeAutomatic(TalkMessageCtrl*); - void offReadNodeAutomatic(TalkMessageCtrl*); - void onStartOnlyFront(TalkMessageCtrl*); - bool isTalkStart(const TalkMessageCtrl*); - bool isTalkEnd(const TalkMessageCtrl*); + bool tryTalkNearPlayer(TalkMessageCtrl*); + bool tryTalkNearPlayerAtEnd(TalkMessageCtrl*); + bool tryTalkForce(TalkMessageCtrl*); + bool tryTalkForceAtEnd(TalkMessageCtrl*); + bool tryTalkForceWithoutDemo(TalkMessageCtrl*); + bool tryTalkForceWithoutDemoMarioPuppetable(TalkMessageCtrl*); + bool tryTalkForceWithoutDemoAtEnd(TalkMessageCtrl*); + bool tryTalkForceWithoutDemoMarioPuppetableAtEnd(TalkMessageCtrl*); + bool tryTalkTimeKeepDemo(TalkMessageCtrl*); + bool tryTalkTimeKeepDemoMarioPuppetable(TalkMessageCtrl*); + bool tryTalkTimeKeepDemoWithoutPauseMarioPuppetable(TalkMessageCtrl*); + bool tryTalkRequest(TalkMessageCtrl*); + bool tryTalkSelectLeft(TalkMessageCtrl*); + bool tryTalkSelectRight(TalkMessageCtrl*); + const MtxPtr getMessageBalloonFollowMatrix(const TalkMessageCtrl*); + const TVec3f& getMessageBalloonFollowOffset(const TalkMessageCtrl*); + void setMessageBalloonFollowOffset(TalkMessageCtrl*, const TVec3f&); + bool isNearPlayer(const TalkMessageCtrl*, f32); + bool inMessageArea(const TalkMessageCtrl*); + bool isTalkNone(const TalkMessageCtrl*); + bool isTalkEntry(const TalkMessageCtrl*); + bool isTalkTalking(const TalkMessageCtrl*); + bool isTalkEnableEnd(const TalkMessageCtrl*); + void clearTalkState(TalkMessageCtrl*); + void resetNode(TalkMessageCtrl*); + void readMessage(TalkMessageCtrl*); + void forwardNode(TalkMessageCtrl*); + void resetAndForwardNode(TalkMessageCtrl*, s32); + void forwardNodeNextBranchLeft(TalkMessageCtrl*); + void forwardNodeNextBranchRight(TalkMessageCtrl*); + void forwardNodeCurrentBranchLeft(TalkMessageCtrl*); + void forwardNodeCurrentBranchRight(TalkMessageCtrl*); + void tryForwardNode(TalkMessageCtrl*); + bool isExistNextNode(const TalkMessageCtrl*); + bool isShortTalk(const TalkMessageCtrl*); + void setDistanceToTalk(TalkMessageCtrl*, f32); + void onRootNodeAutomatic(TalkMessageCtrl*); + void offRootNodeAutomatic(TalkMessageCtrl*); + void onReadNodeAutomatic(TalkMessageCtrl*); + void offReadNodeAutomatic(TalkMessageCtrl*); + void onStartOnlyFront(TalkMessageCtrl*); + bool isTalkStart(const TalkMessageCtrl*); + bool isTalkEnd(const TalkMessageCtrl*); - inline void setMessageArgToCurrentGalaxyName(TalkMessageCtrl *pCtrl, const char *pName) { + inline void setMessageArgToCurrentGalaxyName(TalkMessageCtrl* pCtrl, const char* pName) { MR::setMessageArg(pCtrl, MR::getGalaxyNameOnCurrentLanguage(pName)); } -}; +}; // namespace MR diff --git a/include/Game/Util/TriangleFilter.hpp b/include/Game/Util/TriangleFilter.hpp index 9d9ad3434..badf5b6bd 100644 --- a/include/Game/Util/TriangleFilter.hpp +++ b/include/Game/Util/TriangleFilter.hpp @@ -2,7 +2,7 @@ class Triangle; -typedef bool (*TriangleFunc)(const Triangle *); +typedef bool (*TriangleFunc)(const Triangle*); class TriangleFilterBase { public: @@ -10,9 +10,9 @@ public: mFunction = function; }*/ - virtual bool isInvalidTriangle(const Triangle *) const = 0; + virtual bool isInvalidTriangle(const Triangle*) const = 0; -// TriangleFunc mFunction; // 0x4 + // TriangleFunc mFunction; // 0x4 }; class TriangleFilterFunc : public TriangleFilterBase { @@ -21,28 +21,28 @@ public: }*/ - virtual bool isInvalidTriangle(const Triangle *) const; + virtual bool isInvalidTriangle(const Triangle*) const; }; namespace MR { TriangleFilterFunc* createTriangleFilterFunc(TriangleFunc); }; -template -class TriangleFilterDelegator: public TriangleFilterBase { - public: - typedef bool (T::*DelegateFilter)(const Triangle *); - TriangleFilterDelegator(T *parent, DelegateFilter filter) : mParent(parent), mFunc(filter) {} +template +class TriangleFilterDelegator : public TriangleFilterBase { +public: + typedef bool (T::*DelegateFilter)(const Triangle*); + TriangleFilterDelegator(T* parent, DelegateFilter filter) + : mParent(parent), mFunc(filter) {} - virtual bool isInvalidTriangle(const Triangle *) const; - - static inline TriangleFilterDelegator* allocateDelegator ( - T *parent, - DelegateFilter filter - ) { + virtual bool isInvalidTriangle(const Triangle*) const; + + static inline TriangleFilterDelegator* allocateDelegator( + T* parent, + DelegateFilter filter) { return new TriangleFilterDelegator(parent, filter); } - T *mParent; // 0x4 - DelegateFilter mFunc; // 0x10 + T* mParent; // 0x4 + DelegateFilter mFunc; // 0x10 }; diff --git a/include/Game/Util/VectorUtil.hpp b/include/Game/Util/VectorUtil.hpp index 2abaca5f3..30cad319f 100644 --- a/include/Game/Util/VectorUtil.hpp +++ b/include/Game/Util/VectorUtil.hpp @@ -3,9 +3,9 @@ #include namespace MR { - inline void getUpVecFromQuat(TVec3f *pOut, const TQuat4f &rQuat) { - pOut->set((2.0f * (rQuat.x * rQuat.y)) - (2.0f * (rQuat.w * rQuat.z)), - ((1.0f - (2.0f * (rQuat.x * rQuat.x))) - (2.0f * (rQuat.z * rQuat.z))), - ((2.0f * (rQuat.y * rQuat.z)) + (2.0f * (rQuat.w * rQuat.x)))); + inline void getUpVecFromQuat(TVec3f* pOut, const TQuat4f& rQuat) { + pOut->set((2.0f * (rQuat.x * rQuat.y)) - (2.0f * (rQuat.w * rQuat.z)), + ((1.0f - (2.0f * (rQuat.x * rQuat.x))) - (2.0f * (rQuat.z * rQuat.z))), + ((2.0f * (rQuat.y * rQuat.z)) + (2.0f * (rQuat.w * rQuat.x)))); } -}; +}; // namespace MR diff --git a/include/Inline.hpp b/include/Inline.hpp index 6d952a4d2..61402f436 100644 --- a/include/Inline.hpp +++ b/include/Inline.hpp @@ -11,8 +11,8 @@ // int someFunction(int SomeArg) // inline int INLINE_FUNC_DECL(someFunction, int someArg); // CALL_INLINE_FUNC(someFunction, 0); -#define INLINE_FUNC_DECL(name, ...) name(void *****, __VA_ARGS__) -#define INLINE_FUNC_DECL_NO_ARG(name) name(void *****) +#define INLINE_FUNC_DECL(name, ...) name(void*****, __VA_ARGS__) +#define INLINE_FUNC_DECL_NO_ARG(name) name(void*****) -#define CALL_INLINE_FUNC(name, ...) name((void *****)0, __VA_ARGS__) -#define CALL_INLINE_FUNC_NO_ARG(name) name((void *****)0) +#define CALL_INLINE_FUNC(name, ...) name((void*****)0, __VA_ARGS__) +#define CALL_INLINE_FUNC_NO_ARG(name) name((void*****)0) diff --git a/include/math_types.hpp b/include/math_types.hpp index ae8c70f64..1686c3cf4 100644 --- a/include/math_types.hpp +++ b/include/math_types.hpp @@ -12,9 +12,8 @@ const f32 PI_180 = 0.017453292f; const f32 FLOAT_MAX = 3.4028235e38; const f32 FLOAT_ZERO = 0.0f; -const static Vec gZeroVec = { 0.0f, 0.0f, 0.0f }; +const static Vec gZeroVec = {0.0f, 0.0f, 0.0f}; namespace std { f32 atan2(f32, f32); }; - diff --git a/libs/JSystem/include/Inline.hpp b/libs/JSystem/include/Inline.hpp index 6d952a4d2..61402f436 100644 --- a/libs/JSystem/include/Inline.hpp +++ b/libs/JSystem/include/Inline.hpp @@ -11,8 +11,8 @@ // int someFunction(int SomeArg) // inline int INLINE_FUNC_DECL(someFunction, int someArg); // CALL_INLINE_FUNC(someFunction, 0); -#define INLINE_FUNC_DECL(name, ...) name(void *****, __VA_ARGS__) -#define INLINE_FUNC_DECL_NO_ARG(name) name(void *****) +#define INLINE_FUNC_DECL(name, ...) name(void*****, __VA_ARGS__) +#define INLINE_FUNC_DECL_NO_ARG(name) name(void*****) -#define CALL_INLINE_FUNC(name, ...) name((void *****)0, __VA_ARGS__) -#define CALL_INLINE_FUNC_NO_ARG(name) name((void *****)0) +#define CALL_INLINE_FUNC(name, ...) name((void*****)0, __VA_ARGS__) +#define CALL_INLINE_FUNC_NO_ARG(name) name((void*****)0) diff --git a/libs/JSystem/include/JSystem/J2DGraph/J2DGrafContext.hpp b/libs/JSystem/include/JSystem/J2DGraph/J2DGrafContext.hpp index 09293678f..0362f779f 100644 --- a/libs/JSystem/include/JSystem/J2DGraph/J2DGrafContext.hpp +++ b/libs/JSystem/include/JSystem/J2DGraph/J2DGrafContext.hpp @@ -6,45 +6,44 @@ #include enum J2DGrafType { - J2DGraf_Base = 0, - J2DGraf_Ortho = 1, - J2DGraf_Persp = 2, + J2DGraf_Base = 0, + J2DGraf_Ortho = 1, + J2DGraf_Persp = 2, }; struct J2DGrafBlend { - u8 mType; // 0x00 - u8 mSrcFactor; // 0x01 - u8 mDestFactor; // 0x02 + u8 mType; // 0x00 + u8 mSrcFactor; // 0x01 + u8 mDestFactor; // 0x02 }; class J2DGrafContext { public: virtual ~J2DGrafContext() { - } - virtual void place(const TBox2f &); - virtual void place(f32, f32, f32, f32); - virtual void setPort(); - virtual void setup2D(); - virtual void setScissor(); + virtual void place(const TBox2f&); + virtual void place(f32, f32, f32, f32); + virtual void setPort(); + virtual void setup2D(); + virtual void setScissor(); virtual J2DGrafType getGrafType() const; - virtual void setLookat(); + virtual void setLookat(); void setColor(JUtility::TColor, JUtility::TColor, JUtility::TColor, JUtility::TColor); - void fillBox(const TBox2f &); + void fillBox(const TBox2f&); - TBox2f mBounds; // 0x04 - TBox2f mScissorBounds; // 0x14 - JUtility::TColor mColorTL; // 0x24 - JUtility::TColor mColorTR; // 0x28 - JUtility::TColor mColorBR; // 0x2C - JUtility::TColor mColorBL; // 0x30 - u8 mLineWidth; // 0x34 - TVec2f mPrevPos; // 0x38 - Mtx44 mMtx44; // 0x40 - Mtx mPosMtx; // 0x80 - J2DGrafBlend _B0; - J2DGrafBlend _B3; - J2DGrafBlend _B6; + TBox2f mBounds; // 0x04 + TBox2f mScissorBounds; // 0x14 + JUtility::TColor mColorTL; // 0x24 + JUtility::TColor mColorTR; // 0x28 + JUtility::TColor mColorBR; // 0x2C + JUtility::TColor mColorBL; // 0x30 + u8 mLineWidth; // 0x34 + TVec2f mPrevPos; // 0x38 + Mtx44 mMtx44; // 0x40 + Mtx mPosMtx; // 0x80 + J2DGrafBlend _B0; + J2DGrafBlend _B3; + J2DGrafBlend _B6; }; diff --git a/libs/JSystem/include/JSystem/J2DGraph/J2DOrthoGraph.hpp b/libs/JSystem/include/JSystem/J2DGraph/J2DOrthoGraph.hpp index baa11ca70..34398fd2a 100644 --- a/libs/JSystem/include/JSystem/J2DGraph/J2DOrthoGraph.hpp +++ b/libs/JSystem/include/JSystem/J2DGraph/J2DOrthoGraph.hpp @@ -10,6 +10,6 @@ public: void setPort(); TBox2f _BC; - f32 mNear; // 0xCC - f32 mFar; // 0xD0 + f32 mNear; // 0xCC + f32 mFar; // 0xD0 }; diff --git a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DAnimation.hpp b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DAnimation.hpp index 585168c0c..4bcc49c49 100644 --- a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DAnimation.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DAnimation.hpp @@ -8,15 +8,14 @@ public: virtual ~J3DAnmBase(); - u8 mLoopMode; // 0x4 - u8 _5; - s16 mLoopDuration; // 0x6 - f32 mCurrentFrame; // 0x8 + u8 mLoopMode; // 0x4 + u8 _5; + s16 mLoopDuration; // 0x6 + f32 mCurrentFrame; // 0x8 }; class J3DFrameCtrl { public: - inline J3DFrameCtrl(s16 endFrame) { init(endFrame); } @@ -27,11 +26,11 @@ public: bool checkPass(f32); void update(); - u8 mLoopMode; // 0x4 - u8 mFlags; // 0x5 - s16 mStartFrame; // 0x6 - s16 mEndFrame; // 0x8 - s16 mLoopFrame; // 0xA - f32 mSpeed; // 0xC - f32 mCurrentFrame; // 0x10 + u8 mLoopMode; // 0x4 + u8 mFlags; // 0x5 + s16 mStartFrame; // 0x6 + s16 mEndFrame; // 0x8 + s16 mLoopFrame; // 0xA + f32 mSpeed; // 0xC + f32 mCurrentFrame; // 0x10 }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DJoint.hpp b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DJoint.hpp index 5e7468313..9fdcefeda 100644 --- a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DJoint.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DJoint.hpp @@ -8,18 +8,18 @@ class J3DMaterial; class J3DJoint { public: - void* mJointData; // 0x0 - void* mJointCallback; // 0x4 - void* _8; - J3DJoint* mChild; // 0x0C - J3DJoint* mYoung; // 0x10 - u16 mJointNo; // 0x14 - u8 mKind; // 0x16 - u8 mScaleComp; // 0x17 + void* mJointData; // 0x0 + void* mJointCallback; // 0x4 + void* _8; + J3DJoint* mChild; // 0x0C + J3DJoint* mYoung; // 0x10 + u16 mJointNo; // 0x14 + u8 mKind; // 0x16 + u8 mScaleComp; // 0x17 J3DTransformInfo mTransformInfo; // 0x18 - f32 mBoundingSphereRadius; // 0x38 - Vec mMin; // 0x3C - Vec mMax; // 0x48 - J3DMtxCalc* mMtxCalc; // 0x54 - J3DMaterial* mMesh; // 0x58 + f32 mBoundingSphereRadius; // 0x38 + Vec mMin; // 0x3C + Vec mMax; // 0x48 + J3DMtxCalc* mMtxCalc; // 0x54 + J3DMaterial* mMesh; // 0x58 }; diff --git a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DJointTree.hpp b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DJointTree.hpp index efcc2255d..cf2a5095c 100644 --- a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DJointTree.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DJointTree.hpp @@ -12,23 +12,23 @@ class J3DJointTree { public: J3DJointTree(); - virtual void calc(J3DMtxBuffer *, const Vec &, const Mtx &); + virtual void calc(J3DMtxBuffer*, const Vec&, const Mtx&); virtual ~J3DJointTree(); - J3DModelHierarchy* mHierarchy; // 0x04 - u32 mFlags; // 0x08 - u32 mModelDataType; // 0x0C - u32 _10; - u32 _14; - J3DJoint** mJointNode; // 0x18 - u16 mJointNum; // 0x1C - u16 mWEvlpMtxNum; // 0x1E - u8* mWEvlpMixMtxNum; // 0x20 - u16* mWEvlpMixMtxIndex; // 0x24 - f32* mWEvlpMixWeight; // 0x28 - Mtx* mInvJointMtx; // 0x2C - u16* mWEvlpImportantMtxIdx; // 0x30 - J3DDrawMtxData mMatrixData; // 0x34 - u32 _40; - JUTNameTab* mJointName; // 0x44 + J3DModelHierarchy* mHierarchy; // 0x04 + u32 mFlags; // 0x08 + u32 mModelDataType; // 0x0C + u32 _10; + u32 _14; + J3DJoint** mJointNode; // 0x18 + u16 mJointNum; // 0x1C + u16 mWEvlpMtxNum; // 0x1E + u8* mWEvlpMixMtxNum; // 0x20 + u16* mWEvlpMixMtxIndex; // 0x24 + f32* mWEvlpMixWeight; // 0x28 + Mtx* mInvJointMtx; // 0x2C + u16* mWEvlpImportantMtxIdx; // 0x30 + J3DDrawMtxData mMatrixData; // 0x34 + u32 _40; + JUTNameTab* mJointName; // 0x44 }; diff --git a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.hpp b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.hpp index e785ad9a6..ec984fa59 100644 --- a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.hpp @@ -30,14 +30,14 @@ public: return mMaterialCount; } - u16 mMaterialCount; // 0x4 - u16 mUniqueMaterialCount; // 0x6 - J3DMaterial** mMaterials; // 0x8 - JUTNameTab* mNameTable; // 0xC - J3DMaterial* mUniqueMaterials; // 0x10 - J3DTexture* mTexture; // 0x14 - JUTNameTab* mTextureNameTable; // 0x18 - u16 _1C; - u8 _1E; - u8 _1F; + u16 mMaterialCount; // 0x4 + u16 mUniqueMaterialCount; // 0x6 + J3DMaterial** mMaterials; // 0x8 + JUTNameTab* mNameTable; // 0xC + J3DMaterial* mUniqueMaterials; // 0x10 + J3DTexture* mTexture; // 0x14 + JUTNameTab* mTextureNameTable; // 0x18 + u16 _1C; + u8 _1E; + u8 _1F; }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModel.hpp b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModel.hpp index 92acb771b..47d755d4d 100644 --- a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModel.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModel.hpp @@ -18,25 +18,25 @@ public: virtual void viewCalc(); virtual ~J3DModel(); - void setBaseScale(const Vec &); + void setBaseScale(const Vec&); - J3DModelData* mModelData; // 0x4 - u32 _8; - u32 _C; - u32 _10; - u32 _14; - f32 _18; - f32 _1C; - f32 _20; - Mtx mBaseTransformMtx; // 0x24 - Mtx mInternalView; // 0x54 - J3DMtxBuffer* mMtxBuffer; // 0x84 - J3DVertexBuffer mVertexBuffer; // 0x88 - J3DMatPacket* mMaterialPacket; // 0xC0 - u32 _C4; - u32 _C8; - u32 _CC; - u32 _D0; - u32 _D4; - u32 _D8; + J3DModelData* mModelData; // 0x4 + u32 _8; + u32 _C; + u32 _10; + u32 _14; + f32 _18; + f32 _1C; + f32 _20; + Mtx mBaseTransformMtx; // 0x24 + Mtx mInternalView; // 0x54 + J3DMtxBuffer* mMtxBuffer; // 0x84 + J3DVertexBuffer mVertexBuffer; // 0x88 + J3DMatPacket* mMaterialPacket; // 0xC0 + u32 _C4; + u32 _C8; + u32 _CC; + u32 _D0; + u32 _D4; + u32 _D8; }; diff --git a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModelData.hpp b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModelData.hpp index a685f030e..e874c1322 100644 --- a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModelData.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DModelData.hpp @@ -23,14 +23,14 @@ public: return mMaterialTable.mMaterials[idx]; } - u32 _4; - u32 _8; - u32 _C; - J3DJointTree mJointTree; // 0x10 - J3DMaterialTable mMaterialTable; // 0x58 - u32 _78; - u16 _7C; - u32 _80; - u32 _84; - J3DVertexData mVertexData; // 0x88 + u32 _4; + u32 _8; + u32 _C; + J3DJointTree mJointTree; // 0x10 + J3DMaterialTable mMaterialTable; // 0x58 + u32 _78; + u16 _7C; + u32 _80; + u32 _84; + J3DVertexData mVertexData; // 0x88 }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.hpp b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.hpp index 0a15c4837..6271135b6 100644 --- a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMtxBuffer.hpp @@ -6,15 +6,15 @@ class J3DJointTree; class J3DMtxBuffer { public: - J3DJointTree* mJointTree; // 0x00 - u8* mpScaleFlagArr; // 0x04 - u8* mpEvlpScaleFlagArr; // 0x08 - Mtx* mpAnmMtx; // 0x0C - Mtx* mpWeightEvlpMtx; // 0x10 - Mtx** mpDrawMtxArr[2]; // 0x14 - Mtx33** mpNrmMtxArr[2]; // 0x18 - Mtx33*** mpBumpMtxArr[2]; // 0x1C - u32 mFlags; // 0x20 - u32 mCurrentViewNo; // - Mtx* mpUserAnmMtx; + J3DJointTree* mJointTree; // 0x00 + u8* mpScaleFlagArr; // 0x04 + u8* mpEvlpScaleFlagArr; // 0x08 + Mtx* mpAnmMtx; // 0x0C + Mtx* mpWeightEvlpMtx; // 0x10 + Mtx** mpDrawMtxArr[2]; // 0x14 + Mtx33** mpNrmMtxArr[2]; // 0x18 + Mtx33*** mpBumpMtxArr[2]; // 0x1C + u32 mFlags; // 0x20 + u32 mCurrentViewNo; // + Mtx* mpUserAnmMtx; }; diff --git a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMtxCalc.hpp b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMtxCalc.hpp index e6c255afa..66c4ba270 100644 --- a/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMtxCalc.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphAnimator/J3DMtxCalc.hpp @@ -7,14 +7,13 @@ class J3DAnmTransform; class J3DMtxCalc { public: inline J3DMtxCalc() { - } virtual ~J3DMtxCalc(); - virtual void setAnmTransForm(J3DAnmTransform *); + virtual void setAnmTransForm(J3DAnmTransform*); virtual J3DAnmTransform* getAnmTransform(); - virtual void setAnmTransform(u8, J3DAnmTransform *); + virtual void setAnmTransform(u8, J3DAnmTransform*); virtual J3DAnmTransform* getAnmTransform(u8); - virtual void setWeight(u8, f32); - virtual f32 getWeight(u8); + virtual void setWeight(u8, f32); + virtual f32 getWeight(u8); }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/J3DGraphBase/J3DDrawBuffer.hpp b/libs/JSystem/include/JSystem/J3DGraphBase/J3DDrawBuffer.hpp index 6ef1aaace..45af81d57 100644 --- a/libs/JSystem/include/JSystem/J3DGraphBase/J3DDrawBuffer.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DDrawBuffer.hpp @@ -16,13 +16,13 @@ public: void draw() const; - void* mBuffer; // 0x00 - u32 mBufferSize; // 0x04 - u32 _8; - u32 _C; - f32 _10; - f32 _14; - u32 _18; - u32 _1C; - u32 _20; + void* mBuffer; // 0x00 + u32 mBufferSize; // 0x04 + u32 _8; + u32 _C; + f32 _10; + f32 _14; + u32 _18; + u32 _1C; + u32 _20; }; diff --git a/libs/JSystem/include/JSystem/J3DGraphBase/J3DDrawPacket.hpp b/libs/JSystem/include/JSystem/J3DGraphBase/J3DDrawPacket.hpp index a4499722e..769b1eeed 100644 --- a/libs/JSystem/include/JSystem/J3DGraphBase/J3DDrawPacket.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DDrawPacket.hpp @@ -9,11 +9,11 @@ public: virtual void draw(); virtual ~J3DDrawPacket(); - u32 _C; - u32 mFlags; // 0x10 - u32 _14; - u32 _18; - u32 _1C; + u32 _C; + u32 mFlags; // 0x10 + u32 _14; + u32 _18; + u32 _1C; J3DDisplayListObj* mDL; // 0x20 - u32 _24; + u32 _24; }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/J3DGraphBase/J3DMatBlock.hpp b/libs/JSystem/include/JSystem/J3DGraphBase/J3DMatBlock.hpp index 8c900fb9f..db4b1712d 100644 --- a/libs/JSystem/include/JSystem/J3DGraphBase/J3DMatBlock.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DMatBlock.hpp @@ -4,13 +4,13 @@ #include struct J3DBlendInfo { - u8 mType; // 0x0 - u8 mSrcFactor; // 0x1 - u8 mDstFactor; // 0x2 - u8 mOp; // 0x3 + u8 mType; // 0x0 + u8 mSrcFactor; // 0x1 + u8 mDstFactor; // 0x2 + u8 mOp; // 0x3 }; -class J3DBlend : public J3DBlendInfo { }; +class J3DBlend : public J3DBlendInfo {}; struct J3DColorChanInfo { u8 _0; @@ -24,7 +24,7 @@ struct J3DColorChanInfo { }; struct J3DColorChan { - u16 mColorChanID; // 0x0 + u16 mColorChanID; // 0x0 }; struct J3DZModeInfo { @@ -34,88 +34,88 @@ struct J3DZModeInfo { u8 _3; }; -class J3DZMode { +class J3DZMode { public: u16 _0; }; class J3DColorBlock { public: - virtual void load(); - virtual void reset(J3DColorBlock *); - virtual void patch(); - virtual void patchMatColor(); - virtual void patchLight(); - virtual void diff(u32); - virtual void diffMatColor(); - virtual void diffLight(); - virtual s32 countDLSize(); - virtual u32 getType() = 0; - virtual void setMatColor(u32, J3DGXColor const *); - virtual void setMatColor(u32, J3DGXColor); - virtual _GXColor* getMatColor(u32); - virtual void setAmbColor(u32, J3DGXColor const *); - virtual void setAmbColor(u32, J3DGXColor); - virtual bool getAmbColor(u32); - virtual void setColorChanNum(u8); - virtual void setColorChanNum(u8 const *); - virtual u8 getColorChanNum() const; - virtual void setColorChan(u32, J3DColorChan const &); - virtual void setColorChan(u32, J3DColorChan const *); + virtual void load(); + virtual void reset(J3DColorBlock*); + virtual void patch(); + virtual void patchMatColor(); + virtual void patchLight(); + virtual void diff(u32); + virtual void diffMatColor(); + virtual void diffLight(); + virtual s32 countDLSize(); + virtual u32 getType() = 0; + virtual void setMatColor(u32, J3DGXColor const*); + virtual void setMatColor(u32, J3DGXColor); + virtual _GXColor* getMatColor(u32); + virtual void setAmbColor(u32, J3DGXColor const*); + virtual void setAmbColor(u32, J3DGXColor); + virtual bool getAmbColor(u32); + virtual void setColorChanNum(u8); + virtual void setColorChanNum(u8 const*); + virtual u8 getColorChanNum() const; + virtual void setColorChan(u32, J3DColorChan const&); + virtual void setColorChan(u32, J3DColorChan const*); virtual J3DColorChan* getColorChan(u32); - virtual void setLight(u32, J3DLightObj *); - virtual bool getLight(u32); - virtual void setCullMode(u8 const*); - virtual void setCullMode(u8); - virtual s32 getCullMode() const; - virtual bool getMatColorOffset() const; - virtual bool getColorChanOffset() const; - virtual void setMatColorOffset(u32); - virtual void setColorChanOffset(u32); + virtual void setLight(u32, J3DLightObj*); + virtual bool getLight(u32); + virtual void setCullMode(u8 const*); + virtual void setCullMode(u8); + virtual s32 getCullMode() const; + virtual bool getMatColorOffset() const; + virtual bool getColorChanOffset() const; + virtual void setMatColorOffset(u32); + virtual void setColorChanOffset(u32); virtual ~J3DColorBlock() {} }; class J3DColorBlockLightOn : public J3DColorBlock { public: - virtual void load(); - virtual void reset(J3DColorBlock *); - virtual void patch(); - virtual void patchMatColor(); - virtual void patchLight(); - virtual void diff(u32); - virtual void diffMatColor(); - virtual void diffLight(); - virtual s32 countDLSize(); - virtual u32 getType(); - virtual void setMatColor(u32, J3DGXColor const *); - virtual void setMatColor(u32, J3DGXColor); - virtual _GXColor* getMatColor(u32); - virtual void setAmbColor(u32, J3DGXColor const *); - virtual void setAmbColor(u32, J3DGXColor); - virtual bool getAmbColor(u32); - virtual void setColorChanNum(u8); - virtual void setColorChanNum(u8 const *); - virtual u8 getColorChanNum() const; - virtual void setColorChan(u32, J3DColorChan const &); - virtual void setColorChan(u32, J3DColorChan const *); + virtual void load(); + virtual void reset(J3DColorBlock*); + virtual void patch(); + virtual void patchMatColor(); + virtual void patchLight(); + virtual void diff(u32); + virtual void diffMatColor(); + virtual void diffLight(); + virtual s32 countDLSize(); + virtual u32 getType(); + virtual void setMatColor(u32, J3DGXColor const*); + virtual void setMatColor(u32, J3DGXColor); + virtual _GXColor* getMatColor(u32); + virtual void setAmbColor(u32, J3DGXColor const*); + virtual void setAmbColor(u32, J3DGXColor); + virtual bool getAmbColor(u32); + virtual void setColorChanNum(u8); + virtual void setColorChanNum(u8 const*); + virtual u8 getColorChanNum() const; + virtual void setColorChan(u32, J3DColorChan const&); + virtual void setColorChan(u32, J3DColorChan const*); virtual J3DColorChan* getColorChan(u32); - virtual void setLight(u32, J3DLightObj *); - virtual bool getLight(u32); - virtual void setCullMode(u8 const*); - virtual void setCullMode(u8); - virtual s32 getCullMode() const; - virtual bool getMatColorOffset() const; - virtual bool getColorChanOffset() const; - virtual void setMatColorOffset(u32); - virtual void setColorChanOffset(u32); + virtual void setLight(u32, J3DLightObj*); + virtual bool getLight(u32); + virtual void setCullMode(u8 const*); + virtual void setCullMode(u8); + virtual s32 getCullMode() const; + virtual bool getMatColorOffset() const; + virtual bool getColorChanOffset() const; + virtual void setMatColorOffset(u32); + virtual void setColorChanOffset(u32); virtual ~J3DColorBlockLightOn() {} - J3DGXColor mMatColor[2]; - J3DGXColor mAmbColor[2]; - u8 mColorChanNum; + J3DGXColor mMatColor[2]; + J3DGXColor mAmbColor[2]; + u8 mColorChanNum; J3DColorChan mColorChan[4]; J3DLightObj* mLightObjs[8]; - u8 mCullMode; - u32 mMatColorOffs; - u32 mColorChanOffs; + u8 mCullMode; + u32 mMatColorOffs; + u32 mColorChanOffs; }; diff --git a/libs/JSystem/include/JSystem/J3DGraphBase/J3DMatPacket.hpp b/libs/JSystem/include/JSystem/J3DGraphBase/J3DMatPacket.hpp index b1aa6f9ee..89f735fac 100644 --- a/libs/JSystem/include/JSystem/J3DGraphBase/J3DMatPacket.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DMatPacket.hpp @@ -11,23 +11,23 @@ public: J3DShapePacket* _28; J3DShapePacket* _2C; - J3DMaterial* mMaterial; // 0x30 - u32 mFlags; // 0x34 - s32 _38; - s32 _3C; + J3DMaterial* mMaterial; // 0x30 + u32 mFlags; // 0x34 + s32 _38; + s32 _3C; }; -class J3DFog { +class J3DFog { public: void load() const; - u8 _0; - u8 _1; - u16 _2; - f32 _4; - f32 _8; - f32 _C; - f32 _10; - GXColor mColor; // 0x14 - GXFogAdjTable mFogTable; // 0x18 + u8 _0; + u8 _1; + u16 _2; + f32 _4; + f32 _8; + f32 _C; + f32 _10; + GXColor mColor; // 0x14 + GXFogAdjTable mFogTable; // 0x18 }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/J3DGraphBase/J3DMaterial.hpp b/libs/JSystem/include/JSystem/J3DGraphBase/J3DMaterial.hpp index bc543e450..46908f2af 100644 --- a/libs/JSystem/include/JSystem/J3DGraphBase/J3DMaterial.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DMaterial.hpp @@ -20,8 +20,8 @@ public: J3DAlphaComp(); u16 _0; - u8 _2; - u8 _3; + u8 _2; + u8 _3; static u16 sUnk; }; @@ -39,62 +39,62 @@ public: virtual void reset(); virtual void change(); - J3DMaterial* _4; - J3DShape* mShape; // 0x8 - J3DJoint* mJoint; // 0xC - u32 mMaterialIndex; // 0x10 - u16 mIndex; // 0x14 - u8 _16; - u8 _17; - u32 _18; - u8 _1C; - u8 _1D; - u8 _1E; - u8 _1F; - u32 _20; - J3DColorBlockLightOn* mColorBlock; // 0x24 + J3DMaterial* _4; + J3DShape* mShape; // 0x8 + J3DJoint* mJoint; // 0xC + u32 mMaterialIndex; // 0x10 + u16 mIndex; // 0x14 + u8 _16; + u8 _17; + u32 _18; + u8 _1C; + u8 _1D; + u8 _1E; + u8 _1F; + u32 _20; + J3DColorBlockLightOn* mColorBlock; // 0x24 J3DTexGenBlockPatched* mTexGenBlock; // 0x28 - J3DTevBlockPatched* mTevBlock; // 0x2C - u32 mIndBlock; // 0x30 - J3DPEBlock* mPEBlock; // 0x34 - J3DMaterial* mOrigMaterial; // 0x38 - J3DMaterialAnm* mMaterialAnm; // 0x3C - J3DCurrentMtx mMtx; // 0x40 - J3DDisplayListObj* mDisplayListObj; // 0x48 + J3DTevBlockPatched* mTevBlock; // 0x2C + u32 mIndBlock; // 0x30 + J3DPEBlock* mPEBlock; // 0x34 + J3DMaterial* mOrigMaterial; // 0x38 + J3DMaterialAnm* mMaterialAnm; // 0x3C + J3DCurrentMtx mMtx; // 0x40 + J3DDisplayListObj* mDisplayListObj; // 0x48 }; class J3DPEBlock { public: //inline J3DPEBlock() { } - virtual void reset(J3DPEBlock *); - virtual void load() = 0; - virtual void patch(); - virtual void diff(); - virtual void diffFog(); - virtual void diffBlend(); - virtual u32 countDLSize(); - virtual u32 getType() = 0; - virtual void setFog(J3DFog); - virtual void setFog(J3DFog *); - virtual J3DFogInfo& getFog(); - virtual void setAlphaComp(const J3DAlphaComp *); - virtual void setAlphaComp(const J3DAlphaComp &); + virtual void reset(J3DPEBlock*); + virtual void load() = 0; + virtual void patch(); + virtual void diff(); + virtual void diffFog(); + virtual void diffBlend(); + virtual u32 countDLSize(); + virtual u32 getType() = 0; + virtual void setFog(J3DFog); + virtual void setFog(J3DFog*); + virtual J3DFogInfo& getFog(); + virtual void setAlphaComp(const J3DAlphaComp*); + virtual void setAlphaComp(const J3DAlphaComp&); virtual J3DAlphaComp* getAlphaComp(); - virtual void setBlend(const J3DBlend *); - virtual void setBlend(const J3DBlend &); - virtual J3DBlend* getBlend(); - virtual void setZMode(const J3DZMode *); - virtual void setZMode(const J3DZMode &); - virtual J3DZMode* getZMode(); - virtual void setZCompLoc(const u8 *); - virtual void setZCompLoc(u8); - virtual u8* getZCompLoc() const; - virtual void setDither(const u8 *); - virtual void setDither(u8); - virtual u8 getDither() const; - virtual u32 getFogOffset() const; - virtual void setFogOffset(u32); + virtual void setBlend(const J3DBlend*); + virtual void setBlend(const J3DBlend&); + virtual J3DBlend* getBlend(); + virtual void setZMode(const J3DZMode*); + virtual void setZMode(const J3DZMode&); + virtual J3DZMode* getZMode(); + virtual void setZCompLoc(const u8*); + virtual void setZCompLoc(u8); + virtual u8* getZCompLoc() const; + virtual void setDither(const u8*); + virtual void setDither(u8); + virtual u8 getDither() const; + virtual u32 getFogOffset() const; + virtual void setFogOffset(u32); virtual ~J3DPEBlock(); }; @@ -102,40 +102,40 @@ class J3DPEBlockFull : public J3DPEBlock { public: //inline J3DPEBlock() { } - virtual void reset(J3DPEBlock *); - virtual void load(); - virtual void patch(); - virtual void diff(); - virtual void diffFog(); - virtual void diffBlend(); - virtual u32 countDLSize(); - virtual u32 getType(); - virtual void setFog(J3DFog); - virtual void setFog(J3DFog *); - virtual J3DFogInfo& getFog(); - virtual void setAlphaComp(const J3DAlphaComp *); - virtual void setAlphaComp(const J3DAlphaComp &); + virtual void reset(J3DPEBlock*); + virtual void load(); + virtual void patch(); + virtual void diff(); + virtual void diffFog(); + virtual void diffBlend(); + virtual u32 countDLSize(); + virtual u32 getType(); + virtual void setFog(J3DFog); + virtual void setFog(J3DFog*); + virtual J3DFogInfo& getFog(); + virtual void setAlphaComp(const J3DAlphaComp*); + virtual void setAlphaComp(const J3DAlphaComp&); virtual J3DAlphaComp* getAlphaComp(); - virtual void setBlend(const J3DBlend *); - virtual void setBlend(const J3DBlend &); - virtual J3DBlend* getBlend(); - virtual void setZMode(const J3DZMode *); - virtual void setZMode(const J3DZMode &); - virtual J3DZMode* getZMode(); - virtual void setZCompLoc(const u8 *); - virtual void setZCompLoc(u8); - virtual u8* getZCompLoc() const; - virtual void setDither(const u8 *); - virtual void setDither(u8); - virtual u8 getDither() const; - virtual u32 getFogOffset() const; - virtual void setFogOffset(u32); + virtual void setBlend(const J3DBlend*); + virtual void setBlend(const J3DBlend&); + virtual J3DBlend* getBlend(); + virtual void setZMode(const J3DZMode*); + virtual void setZMode(const J3DZMode&); + virtual J3DZMode* getZMode(); + virtual void setZCompLoc(const u8*); + virtual void setZCompLoc(u8); + virtual u8* getZCompLoc() const; + virtual void setDither(const u8*); + virtual void setDither(u8); + virtual u8 getDither() const; + virtual u32 getFogOffset() const; + virtual void setFogOffset(u32); virtual ~J3DPEBlockFull(); - J3DFogInfo mFogInfo; // 0x4 - J3DAlphaComp mAlphaComp; // 0x30 - J3DBlend mBlend; // 0x34 - J3DZMode mZMode; // 0x38 - const u8 mDither; // 0x3B - u32 mFogOffset; // 0x3C + J3DFogInfo mFogInfo; // 0x4 + J3DAlphaComp mAlphaComp; // 0x30 + J3DBlend mBlend; // 0x34 + J3DZMode mZMode; // 0x38 + const u8 mDither; // 0x3B + u32 mFogOffset; // 0x3C }; diff --git a/libs/JSystem/include/JSystem/J3DGraphBase/J3DPacket.hpp b/libs/JSystem/include/JSystem/J3DGraphBase/J3DPacket.hpp index f49e4cf29..e1e8f8e72 100644 --- a/libs/JSystem/include/JSystem/J3DGraphBase/J3DPacket.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DPacket.hpp @@ -7,15 +7,14 @@ class J3DDrawBuffer; class J3DPacket { public: inline J3DPacket() { - } - virtual u32 entry(J3DDrawBuffer *); + virtual u32 entry(J3DDrawBuffer*); - void addChildPacket(J3DPacket *); + void addChildPacket(J3DPacket*); - J3DPacket* mNext; // 0x4 - J3DPacket* mFirst; // 0x8 + J3DPacket* mNext; // 0x4 + J3DPacket* mFirst; // 0x8 }; class J3DDisplayListObj { @@ -25,7 +24,7 @@ public: void newDisplayList(u32); void newSingleDisplayList(u32); bool single_to_Double(); - void setSingleDisplayList(void *, u32); + void setSingleDisplayList(void*, u32); void swapBuffer(); void callDL() const; void beginDL(); @@ -35,6 +34,6 @@ public: u32 _0; u32 _4; - u32 mSize; // 0x8 - u32 mMaxSize; // 0xC + u32 mSize; // 0x8 + u32 mMaxSize; // 0xC }; diff --git a/libs/JSystem/include/JSystem/J3DGraphBase/J3DShape.hpp b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShape.hpp index 82dfe1653..2fc820829 100644 --- a/libs/JSystem/include/JSystem/J3DGraphBase/J3DShape.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShape.hpp @@ -10,13 +10,12 @@ class J3DDrawMtxData; class J3DCurrentMtxInfo { public: - u32 mMtxIdxRegA; // 0x00 - u32 mMtxIdxRegB; // 0x04 + u32 mMtxIdxRegA; // 0x00 + u32 mMtxIdxRegB; // 0x04 }; class J3DCurrentMtx : public J3DCurrentMtxInfo { public: - }; class J3DShape { @@ -32,27 +31,27 @@ public: void initialize(); - J3DMaterial* mMaterial; // 0x04 - u16 mIndex; // 0x08 - u16 mMtxGroupNum; // 0x0A - u32 mFlags; // 0x0C - f32 mRadius; // 0x10 - Vec mMin; // 0x14 - Vec mMax; // 0x20 - u8* mVcdVatCmd; // 0x2C - u32* mVtxDesc; // 0x30 - bool mHasNBT; // 0x34 - J3DShapeMtx** mShapeMtx; // 0x38 - J3DShapeDraw** mShapeDraw; // 0x3C - J3DCurrentMtx mCurrentMtx; // 0x40 - bool mHasPNMTXIdx; // 0x48 - J3DVertexData* mVertexData; // 0x4C - J3DDrawMtxData* mDrawMtxData; // 0x50 - u8* mScaleFlagArray; // 0x54 - Mtx** mDrawMtx; // 0x58 - Mtx33** mNormalMtx; // 0x5C - u32* mCurrentViewNo; // 0x60 - u32 mBumpMtxOffset; // 0x64 + J3DMaterial* mMaterial; // 0x04 + u16 mIndex; // 0x08 + u16 mMtxGroupNum; // 0x0A + u32 mFlags; // 0x0C + f32 mRadius; // 0x10 + Vec mMin; // 0x14 + Vec mMax; // 0x20 + u8* mVcdVatCmd; // 0x2C + u32* mVtxDesc; // 0x30 + bool mHasNBT; // 0x34 + J3DShapeMtx** mShapeMtx; // 0x38 + J3DShapeDraw** mShapeDraw; // 0x3C + J3DCurrentMtx mCurrentMtx; // 0x40 + bool mHasPNMTXIdx; // 0x48 + J3DVertexData* mVertexData; // 0x4C + J3DDrawMtxData* mDrawMtxData; // 0x50 + u8* mScaleFlagArray; // 0x54 + Mtx** mDrawMtx; // 0x58 + Mtx33** mNormalMtx; // 0x5C + u32* mCurrentViewNo; // 0x60 + u32 mBumpMtxOffset; // 0x64 static u32 sOldVcdVatCmd; }; diff --git a/libs/JSystem/include/JSystem/J3DGraphBase/J3DShapePacket.hpp b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShapePacket.hpp index 5fabc7233..174930ceb 100644 --- a/libs/JSystem/include/JSystem/J3DGraphBase/J3DShapePacket.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DShapePacket.hpp @@ -10,9 +10,9 @@ class J3DShapePacket : public J3DDrawPacket { public: J3DShapePacket(); - J3DShape* _28; + J3DShape* _28; J3DMtxBuffer* _2C; - Mtx* _30; - u32 _34; - J3DModel* _38; + Mtx* _30; + u32 _34; + J3DModel* _38; }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/J3DGraphBase/J3DStruct.hpp b/libs/JSystem/include/JSystem/J3DGraphBase/J3DStruct.hpp index 54bdb83ba..2bbb27b86 100644 --- a/libs/JSystem/include/JSystem/J3DGraphBase/J3DStruct.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DStruct.hpp @@ -17,61 +17,60 @@ public: class J3DFogInfo { public: inline J3DFogInfo() { - } - J3DFogInfo& operator=(const J3DFogInfo &); + J3DFogInfo& operator=(const J3DFogInfo&); - u8 mFogType; // 0x0 - u8 _1; - u16 _2; - f32 mStartZ; // 0x4 - f32 mEndZ; // 0x8 - f32 mNearZ; // 0xC - f32 mFarZ; // 0x10 - _GXColor mColor; // 0x14 - u16 mTable[10]; // _18 + u8 mFogType; // 0x0 + u8 _1; + u16 _2; + f32 mStartZ; // 0x4 + f32 mEndZ; // 0x8 + f32 mNearZ; // 0xC + f32 mFarZ; // 0x10 + _GXColor mColor; // 0x14 + u16 mTable[10]; // _18 }; struct J3DTextureSRTInfo { - f32 mScaleX; // 0x0 - f32 mScaleY; // 0x4 - s16 mRotation; // 0x8 - s16 mPad; // 0xA - f32 mTransX; // 0xC - f32 mTransY; // 0x10 + f32 mScaleX; // 0x0 + f32 mScaleY; // 0x4 + s16 mRotation; // 0x8 + s16 mPad; // 0xA + f32 mTransX; // 0xC + f32 mTransY; // 0x10 }; struct J3DTexMtxInfo { - void operator=(const J3DTexMtxInfo &); + void operator=(const J3DTexMtxInfo&); - u8 mProjection; // 0x0 - u8 mInfo; // 0x1 - s16 mPad; // 0x2 - TVec3f mCenter; // 0x4 - J3DTextureSRTInfo mSRTInfo; // 0x10 - Mtx44 mEffectMtx; // 0x24 + u8 mProjection; // 0x0 + u8 mInfo; // 0x1 + s16 mPad; // 0x2 + TVec3f mCenter; // 0x4 + J3DTextureSRTInfo mSRTInfo; // 0x10 + Mtx44 mEffectMtx; // 0x24 }; struct J3DTexMtx { J3DTexMtxInfo mInfo; - Mtx mOutputMatrix; + Mtx mOutputMatrix; }; static J3DTexMtxInfo j3dDefaultTexMtxInfo; class J3DLightInfo { public: - Vec mLightPosition; // 0x0 - Vec mLightDirection; // 0xC - GXColor mColor; // 0x18 - Vec mCosAtten; // 0x1C - Vec mDistAtten; // 0x28 + Vec mLightPosition; // 0x0 + Vec mLightDirection; // 0xC + GXColor mColor; // 0x18 + Vec mCosAtten; // 0x1C + Vec mDistAtten; // 0x28 }; class J3DLightObj { public: J3DLightInfo mInfo; - GXLightObj mLightObj; + GXLightObj mLightObj; }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/J3DGraphBase/J3DSys.hpp b/libs/JSystem/include/JSystem/J3DGraphBase/J3DSys.hpp index f6355dfb9..bb18d92c1 100644 --- a/libs/JSystem/include/JSystem/J3DGraphBase/J3DSys.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DSys.hpp @@ -6,16 +6,16 @@ class J3DDrawBuffer; class J3DSys { public: - Mtx mViewMtx; // 0x0 - u32 _30; - u32 _34; - u32 _38; - u32 _3C; - u32 _40; - u32 _44; + Mtx mViewMtx; // 0x0 + u32 _30; + u32 _34; + u32 _38; + u32 _3C; + u32 _40; + u32 _44; J3DDrawBuffer* _48; J3DDrawBuffer* _4C; - u32 _50; + u32 _50; void drawInit(); void draw() const; diff --git a/libs/JSystem/include/JSystem/J3DGraphBase/J3DTransform.hpp b/libs/JSystem/include/JSystem/J3DGraphBase/J3DTransform.hpp index c42a88d47..f8120fd58 100644 --- a/libs/JSystem/include/JSystem/J3DGraphBase/J3DTransform.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DTransform.hpp @@ -3,7 +3,7 @@ #include struct J3DTransformInfo { - Vec mScale; // 0x00 - S16Vec mRotation; // 0x0C - Vec mTranslate; // 0x14 + Vec mScale; // 0x00 + S16Vec mRotation; // 0x0C + Vec mTranslate; // 0x14 }; diff --git a/libs/JSystem/include/JSystem/J3DGraphBase/J3DVertex.hpp b/libs/JSystem/include/JSystem/J3DGraphBase/J3DVertex.hpp index b05a16b08..4ddd72925 100644 --- a/libs/JSystem/include/JSystem/J3DGraphBase/J3DVertex.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphBase/J3DVertex.hpp @@ -8,10 +8,10 @@ public: ~J3DDrawMtxData(); - u16 mDrawMatrixCount; // 0x0 - u16 mRigidMtxCount; // 0x2 - u32 _4; - u16* mDrawMtxArray; // 0x8 + u16 mDrawMatrixCount; // 0x0 + u16 mRigidMtxCount; // 0x2 + u32 _4; + u16* mDrawMtxArray; // 0x8 }; class J3DVertexData { @@ -30,10 +30,10 @@ public: u32 _24; u32 _28; u32 _2C; - u8 _30[0x4C-0x30]; - u8 _4C; + u8 _30[0x4C - 0x30]; + u8 _4C; u32 _50; - u8 _54; + u8 _54; u32 _58; }; diff --git a/libs/JSystem/include/JSystem/J3DGraphLoader/J3DAnmLoader.hpp b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DAnmLoader.hpp index 59e8169a0..38f461e23 100644 --- a/libs/JSystem/include/JSystem/J3DGraphLoader/J3DAnmLoader.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DAnmLoader.hpp @@ -6,6 +6,6 @@ enum J3DAnmLoaderDataBaseFlag { class J3DAnmLoaderDataBase { public: - static void* load(const void *, J3DAnmLoaderDataBaseFlag); - static void* loadMaterialTable(const void *); + static void* load(const void*, J3DAnmLoaderDataBaseFlag); + static void* loadMaterialTable(const void*); }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelLoader.hpp b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelLoader.hpp index 9bed8d622..9747bcb25 100644 --- a/libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelLoader.hpp +++ b/libs/JSystem/include/JSystem/J3DGraphLoader/J3DModelLoader.hpp @@ -12,18 +12,18 @@ struct J3DModelBlock { }; struct J3DModelFileData { - u32 mMagic1; - u32 mMagic2; - u8 _8[4]; - u32 mBlockNum; - u8 _10[0x10]; + u32 mMagic1; + u32 mMagic2; + u8 _8[4]; + u32 mBlockNum; + u8 _10[0x10]; J3DModelBlock mBlocks[1]; }; struct J3DModelInfoBlock : public J3DModelBlock { - u16 mFlags; - u32 mPacketNum; - u32 mVtxNum; + u16 mFlags; + u32 mPacketNum; + u32 mVtxNum; void* mpHierarchy; }; @@ -37,7 +37,7 @@ struct J3DVertexBlock : public J3DModelBlock { }; struct J3DEnvelopeBlock : public J3DModelBlock { - u16 mWEvlpMtxNum; + u16 mWEvlpMtxNum; void* mpWEvlpMixMtxNum; void* mpWEvlpMixIndex; void* mpWEvlpMixWeight; @@ -45,20 +45,20 @@ struct J3DEnvelopeBlock : public J3DModelBlock { }; struct J3DDrawBlock : public J3DModelBlock { - u16 mMtxNum; + u16 mMtxNum; void* mpDrawMtxFlag; void* mpDrawMtxIndex; }; struct J3DJointBlock : public J3DModelBlock { - u16 mJointNum; + u16 mJointNum; void* mpJointInitData; void* mpIndexTable; void* mpNameTable; }; struct J3DMaterialBlock : public J3DModelBlock { - u16 mMaterialNum; + u16 mMaterialNum; void* mpMaterialInitData; void* mpMaterialID; void* mpNameTable; @@ -92,7 +92,7 @@ struct J3DMaterialBlock : public J3DModelBlock { }; struct J3DMaterialBlock_v21 : public J3DModelBlock { - u16 mMaterialNum; + u16 mMaterialNum; void* mpMaterialInitData; void* mpMaterialID; void* mpNameTable; @@ -123,7 +123,7 @@ struct J3DMaterialBlock_v21 : public J3DModelBlock { }; struct J3DMaterialDLBlock : public J3DModelBlock { - u16 mMaterialNum; + u16 mMaterialNum; void* mpDisplayListInit; void* mpPatchingInfo; void* mpCurrentMtxInfo; @@ -133,7 +133,7 @@ struct J3DMaterialDLBlock : public J3DModelBlock { }; struct J3DShapeBlock : public J3DModelBlock { - u16 mShapeNum; + u16 mShapeNum; void* mpShapeInitData; void* mpIndexTable; void* mpNameTable; @@ -145,7 +145,7 @@ struct J3DShapeBlock : public J3DModelBlock { }; struct J3DTextureBlock : public J3DModelBlock { - u16 mTextureNum; + u16 mTextureNum; void* mpTextureRes; void* mpNameTable; }; @@ -153,60 +153,53 @@ struct J3DTextureBlock : public J3DModelBlock { class J3DModelLoader { public: J3DModelLoader(); - - virtual J3DModelData* load(const void *, u32); - virtual J3DMaterialTable* loadMaterialTable(const void *); - virtual J3DModelData* loadBinaryDisplayList(const void *, u32); - virtual u32 calcLoadSize(const void *, u32); - virtual u32 calcLoadMaterialTableSize(const void *); - virtual u32 calcLoadBinaryDisplayListSize(void const*, u32); - virtual u16 countMaterialNum(void const *); - virtual void setupBBoardInfo(); - virtual ~J3DModelLoader() { + virtual J3DModelData* load(const void*, u32); + virtual J3DMaterialTable* loadMaterialTable(const void*); + virtual J3DModelData* loadBinaryDisplayList(const void*, u32); + virtual u32 calcLoadSize(const void*, u32); + virtual u32 calcLoadMaterialTableSize(const void*); + virtual u32 calcLoadBinaryDisplayListSize(void const*, u32); + virtual u16 countMaterialNum(void const*); + virtual void setupBBoardInfo(); + virtual ~J3DModelLoader() { } virtual void readMaterial(J3DMaterialBlock const*, u32) { - } - - virtual void readMaterial_v21(J3DMaterialBlock_v21 const*, u32) { + virtual void readMaterial_v21(J3DMaterialBlock_v21 const*, u32) { } virtual void readMaterialTable(J3DMaterialBlock const*, u32) { - } virtual void readMaterialTable_v21(J3DMaterialBlock_v21 const*, u32) { - } - virtual u32 calcSizeMaterial(J3DMaterialBlock const*, u32) { - return false; + virtual u32 calcSizeMaterial(J3DMaterialBlock const*, u32) { + return false; } - virtual u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32) { - return false; + virtual u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32) { + return false; } - J3DModelData* mpModelData; // 0x04 - J3DMaterialTable* mpMaterialTable; // 0x08 - const J3DShapeBlock* mpShapeBlock; // 0x0C - const J3DMaterialBlock* mpMaterialBlock; // 0x10 - J3DModelHierarchy* mpModelHierarchy; // 0x14 - u8 _18; - u8 _19; - u16 mEnvelopeSize; // 0x1A + J3DModelData* mpModelData; // 0x04 + J3DMaterialTable* mpMaterialTable; // 0x08 + const J3DShapeBlock* mpShapeBlock; // 0x0C + const J3DMaterialBlock* mpMaterialBlock; // 0x10 + J3DModelHierarchy* mpModelHierarchy; // 0x14 + u8 _18; + u8 _19; + u16 mEnvelopeSize; // 0x1A }; class J3DModelLoader_v21 : public J3DModelLoader { public: inline J3DModelLoader_v21() { - } ~J3DModelLoader_v21() { - } void readMaterial_v21(J3DMaterialBlock_v21 const*, u32); @@ -216,16 +209,15 @@ public: class J3DModelLoader_v26 : public J3DModelLoader { public: ~J3DModelLoader_v26() { - } void readMaterial(J3DMaterialBlock const*, u32); void readMaterialTable(J3DMaterialBlock const*, u32); - u32 calcSizeMaterial(J3DMaterialBlock const*, u32); - u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32); + u32 calcSizeMaterial(J3DMaterialBlock const*, u32); + u32 calcSizeMaterialTable(J3DMaterialBlock const*, u32); }; class J3DModelLoaderDataBase { public: - static J3DModelData* load(void const *, u32); + static J3DModelData* load(void const*, u32); }; diff --git a/libs/JSystem/include/JSystem/JAudio2/JAISoundHandles.hpp b/libs/JSystem/include/JSystem/JAudio2/JAISoundHandles.hpp index 9c743fbc5..81436f0c6 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JAISoundHandles.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JAISoundHandles.hpp @@ -4,11 +4,10 @@ class JAISoundHandle; -class JAISoundHandles -{ +class JAISoundHandles { public: - u32 *getHandleSoundID(JAISoundID); // exact return type currently unknown + u32* getHandleSoundID(JAISoundID); // exact return type currently unknown - /* 0x0 */ JAISoundHandle *mHandles; - u32 _4; + /* 0x0 */ JAISoundHandle* mHandles; + u32 _4; }; diff --git a/libs/JSystem/include/JSystem/JAudio2/JASAiCtrl.hpp b/libs/JSystem/include/JSystem/JAudio2/JASAiCtrl.hpp index d538b7ff6..055f2d9bb 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASAiCtrl.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASAiCtrl.hpp @@ -13,4 +13,4 @@ namespace JASDriver { u32 getSubFrames(); void registerMixCallback(MixCallback, JASMixMode); -} +} // namespace JASDriver diff --git a/libs/JSystem/include/JSystem/JAudio2/JASAudioReseter.hpp b/libs/JSystem/include/JSystem/JAudio2/JASAudioReseter.hpp index cf9150893..14e4a7a86 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASAudioReseter.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASAudioReseter.hpp @@ -7,7 +7,7 @@ public: JASAudioReseter(); u32 _0; - f32 mDSPLevel; // 0x04 + f32 mDSPLevel; // 0x04 u32 _8; - u8 _C; + u8 _C; }; diff --git a/libs/JSystem/include/JSystem/JAudio2/JASBank.hpp b/libs/JSystem/include/JSystem/JAudio2/JASBank.hpp index e9fdddd94..83760117b 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASBank.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASBank.hpp @@ -2,5 +2,4 @@ class JASBank { public: - }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JAudio2/JASCalc.hpp b/libs/JSystem/include/JSystem/JAudio2/JASCalc.hpp index fbd2e5b4b..c37253fcc 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASCalc.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASCalc.hpp @@ -4,5 +4,5 @@ class JASCalc { public: - static void bzero(void *, u32); + static void bzero(void*, u32); }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JAudio2/JASChannel.hpp b/libs/JSystem/include/JSystem/JAudio2/JASChannel.hpp index 7ca09719d..31621f968 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASChannel.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASChannel.hpp @@ -6,27 +6,27 @@ class JASChannel { public: - void setKey(s32) NO_INLINE; - void setVelocity(u32) NO_INLINE; - void setUpdateTimer(u32) NO_INLINE; - void setKeySweepTarget(s32, u32) NO_INLINE; - void setOscInit(u32, const JASOscillator::Data *) NO_INLINE; - void setVibrate(f32, f32) NO_INLINE; - void setTremolo(f32, f32) NO_INLINE; - void setParams(const JASChannelParams &) NO_INLINE; - void release(u16) NO_INLINE; - void free() NO_INLINE; - void setPauseFlag(bool) NO_INLINE; - u32 _0; - bool _4; - u8 _5[0xf]; - u32 _14; - u8 _18[0x44]; + void setKey(s32) NO_INLINE; + void setVelocity(u32) NO_INLINE; + void setUpdateTimer(u32) NO_INLINE; + void setKeySweepTarget(s32, u32) NO_INLINE; + void setOscInit(u32, const JASOscillator::Data*) NO_INLINE; + void setVibrate(f32, f32) NO_INLINE; + void setTremolo(f32, f32) NO_INLINE; + void setParams(const JASChannelParams&) NO_INLINE; + void release(u16) NO_INLINE; + void free() NO_INLINE; + void setPauseFlag(bool) NO_INLINE; + u32 _0; + bool _4; + u8 _5[0xf]; + u32 _14; + u8 _18[0x44]; JASLfo _5C; JASLfo _74; - u8 _8C[0x3C]; - s16 _C8; - u16 _CA; - u8 _CC[0x15]; - u8 _E1; + u8 _8C[0x3C]; + s16 _C8; + u16 _CA; + u8 _CC[0x15]; + u8 _E1; }; diff --git a/libs/JSystem/include/JSystem/JAudio2/JASDriverIF.hpp b/libs/JSystem/include/JSystem/JAudio2/JASDriverIF.hpp index a4a2a4f5f..af4948d3b 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASDriverIF.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASDriverIF.hpp @@ -3,6 +3,6 @@ #include namespace JASDriver { - typedef s32 (*SubFrameCallback)(void *); - bool registerSubFrameCallback(SubFrameCallback, void *); -} + typedef s32 (*SubFrameCallback)(void*); + bool registerSubFrameCallback(SubFrameCallback, void*); +} // namespace JASDriver diff --git a/libs/JSystem/include/JSystem/JAudio2/JASDspInterface.hpp b/libs/JSystem/include/JSystem/JAudio2/JASDspInterface.hpp index ca4d98ed4..abf30db00 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASDspInterface.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASDspInterface.hpp @@ -5,8 +5,8 @@ class JASDsp { public: struct TChannel { - void setIIRFilterParam(s16 *); - void setFIR8FilterParam(s16 *); + void setIIRFilterParam(s16*); + void setFIR8FilterParam(s16*); void setFilterMode(u16); void setDistFilter(s16); }; diff --git a/libs/JSystem/include/JSystem/JAudio2/JASGlobal.hpp b/libs/JSystem/include/JSystem/JAudio2/JASGlobal.hpp index d22ed4da5..2d3896774 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASGlobal.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASGlobal.hpp @@ -1,6 +1,6 @@ #pragma once -template +template class JASGlobalInstance { public: JASGlobalInstance(T* inst) { diff --git a/libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.hpp b/libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.hpp index 0f0e737c4..fccee5238 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASHeapCtrl.hpp @@ -9,21 +9,21 @@ public: JASGenericMemPool(); ~JASGenericMemPool(); - void newMemPool(u32, int); + void newMemPool(u32, int); void* alloc(u32); - void free(void *, u32); - + void free(void*, u32); + u32 _0; u32 _4; u32 _8; }; -template +template class JASMemPool : public JASGenericMemPool { public: - JASMemPool() : JASGenericMemPool() { - + JASMemPool() + : JASGenericMemPool() { } ~JASMemPool(); @@ -35,16 +35,16 @@ public: static JASPoolAllocObject memPool_; }; -template +template class JASMemPool_MultiThreaded : public JASGenericMemPool { public: - void *alloc(u32 size) NO_INLINE { + void* alloc(u32 size) NO_INLINE { { JASThreadingModel::InterruptsDisable::Lock lock(*this); return JASGenericMemPool::alloc(size); } } - void free(void *addr, u32 size) NO_INLINE { + void free(void* addr, u32 size) NO_INLINE { { JASThreadingModel::InterruptsDisable::Lock lock(*this); JASGenericMemPool::free(addr, size); @@ -52,21 +52,20 @@ public: } }; -template +template class JASPoolAllocObject_MultiThreaded { public: static JASMemPool_MultiThreaded memPool_; - #ifdef __MWERKS__ +#ifdef __MWERKS__ static void* operator new(u32 size) NO_INLINE { return memPool_.alloc(size); } - #endif - static void operator delete(void *addr, u32 size) NO_INLINE { +#endif + static void operator delete(void* addr, u32 size)NO_INLINE { memPool_.free(addr, size); } }; -template -JASMemPool_MultiThreaded JASPoolAllocObject_MultiThreaded::memPool_ - = JASMemPool_MultiThreaded(); \ No newline at end of file +template +JASMemPool_MultiThreaded JASPoolAllocObject_MultiThreaded::memPool_ = JASMemPool_MultiThreaded(); \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JAudio2/JASOscillator.hpp b/libs/JSystem/include/JSystem/JAudio2/JASOscillator.hpp index 0d8f12969..956e5a220 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASOscillator.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASOscillator.hpp @@ -5,7 +5,7 @@ class JASOscillator { public: struct Point { - const Point& operator=(const Point &); + const Point& operator=(const Point&); s16 _0; s16 _2; @@ -13,11 +13,11 @@ public: }; struct Data { - u32 _0; - f32 _4; + u32 _0; + f32 _4; const Point* _8; - u32 _C; - f32 _10; - f32 _14; + u32 _C; + f32 _10; + f32 _14; }; }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JAudio2/JASReport.hpp b/libs/JSystem/include/JSystem/JAudio2/JASReport.hpp index e4e5236fc..a806e9f5a 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASReport.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASReport.hpp @@ -1,3 +1,3 @@ #pragma once -void JASReport(const char *, ...); \ No newline at end of file +void JASReport(const char*, ...); \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JAudio2/JASSeqCtrl.hpp b/libs/JSystem/include/JSystem/JAudio2/JASSeqCtrl.hpp index da4044535..31fb1388c 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASSeqCtrl.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASSeqCtrl.hpp @@ -8,48 +8,47 @@ class JASTrack; class JASSeqParser; struct int24 { - u8 padding; - unsigned num: 24; + u8 padding; + unsigned num : 24; }; class JASSeqCtrl : public JASSeqReader { public: - enum IntrType { - INTR_0 = 0, - INTR_1, - INTR_2, - INTR_3, - INTR_4, - INTR_5, - INTR_6 - }; - static JASSeqParser sDefaultParser; - - JASSeqCtrl(); - void init(); - void start(void *, u32); - int tickProc(JASTrack *); - void interrupt(JASSeqCtrl::IntrType); - void setIntrMask(u32); - void clrIntrMask(u32); - bool retIntr(); - s32 findIntr() NO_INLINE; - void checkIntr(); - void timerProcess(); + enum IntrType { + INTR_0 = 0, + INTR_1, + INTR_2, + INTR_3, + INTR_4, + INTR_5, + INTR_6 + }; + static JASSeqParser sDefaultParser; + JASSeqCtrl(); + void init(); + void start(void*, u32); + int tickProc(JASTrack*); + void interrupt(JASSeqCtrl::IntrType); + void setIntrMask(u32); + void clrIntrMask(u32); + bool retIntr(); + s32 findIntr() NO_INLINE; + void checkIntr(); + void timerProcess(); - u32 calcSeekAmt(u32 intr) const { - return ((int24*)(intr + (u8 *)mSeqBuff - 1))->num; - } + u32 calcSeekAmt(u32 intr) const { + return ((int24*)(intr + (u8*)mSeqBuff - 1))->num; + } - JASSeqParser *mParser; - s32 mTimer; - void* mCursorSwap; - s32 _48; - u16 _4C; - u16 _4E; - u8 mIntTimer; - bool _51; - u32 _54; - u32 _58; + JASSeqParser* mParser; + s32 mTimer; + void* mCursorSwap; + s32 _48; + u16 _4C; + u16 _4E; + u8 mIntTimer; + bool _51; + u32 _54; + u32 _58; }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JAudio2/JASSeqParser.hpp b/libs/JSystem/include/JSystem/JAudio2/JASSeqParser.hpp index 771c0def7..6728dce73 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASSeqParser.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASSeqParser.hpp @@ -6,99 +6,98 @@ class JASTrack; class JASSeqParser { public: - typedef s32 (JASSeqParser::*CommandFunc)(JASTrack *, u32 *); - typedef u16 (*Callback)(JASTrack *, u16); + typedef s32 (JASSeqParser::*CommandFunc)(JASTrack*, u32*); + typedef u16 (*Callback)(JASTrack*, u16); - enum BranchCondition { - COND_ALWAYS = 0, - COND_NULL, - COND_NONNULL, - COND_1, - COND_NEGATIVE, - COND_POSITIVE - }; + enum BranchCondition { + COND_ALWAYS = 0, + COND_NULL, + COND_NONNULL, + COND_1, + COND_NEGATIVE, + COND_POSITIVE + }; - static Callback sCallbackFunc; - struct Command { - CommandFunc func; - u16 numArgs; - u16 argWidths; - }; - static Command sCmdInfo[0x60]; - - static Command sExtCmdInfo[0xff]; + static Callback sCallbackFunc; + struct Command { + CommandFunc func; + u16 numArgs; + u16 argWidths; + }; + static Command sCmdInfo[0x60]; - JASSeqParser(); - - virtual ~JASSeqParser(); - virtual s32 parse(JASTrack *); - virtual void execNoteOnMidi(JASTrack *, u32, u32, u32); - virtual void execNoteOnGate(JASTrack *, u32, u32, u32, u32); - virtual void execNoteOff(JASTrack *, u32); - virtual s32 execCommand(JASTrack *, JASSeqParser::CommandFunc, u32, u32 *); + static Command sExtCmdInfo[0xff]; - bool conditionCheck(JASTrack *, BranchCondition); - void writeReg(JASTrack *, u32, u32); - u32 readReg(JASTrack *, u32) const; - s32 cmdOpenTrack(JASTrack *, u32 *); - s32 cmdCloseTrack(JASTrack *, u32 *); - s32 cmdCall(JASTrack *, u32 *); - s32 cmdCallF(JASTrack *, u32 *); - s32 cmdRet(JASTrack *, u32 *); - s32 cmdRetF(JASTrack *, u32 *); - s32 cmdJmp(JASTrack *, u32 *); - s32 cmdJmpF(JASTrack *, u32 *); - s32 cmdJmpTable(JASTrack *, u32 *); - s32 cmdCallTable(JASTrack *, u32 *); - s32 cmdLoopS(JASTrack *, u32 *); - s32 cmdLoopE(JASTrack *, u32 *); - s32 cmdNote(JASTrack *, u32 *); - s32 cmdNoteOn(JASTrack *, u32 *); - s32 cmdNoteOff(JASTrack *, u32 *); - s32 cmdReadPort(JASTrack *, u32 *); - s32 cmdWritePort(JASTrack *, u32 *); - s32 cmdParentWritePort(JASTrack *, u32 *); - s32 cmdChildWritePort(JASTrack *, u32 *); - s32 cmdParentReadPort(JASTrack *, u32 *); - s32 cmdChildReadPort(JASTrack *, u32 *); - s32 cmdCheckPortImport(JASTrack *, u32 *); - s32 cmdCheckPortExport(JASTrack *, u32 *); - s32 cmdWait(JASTrack *, u32 *); - s32 cmdWaitByte(JASTrack *, u32 *); - s32 cmdSetLastNote(JASTrack *, u32 *); - s32 cmdEnvScaleSet(JASTrack *, u32 *); - s32 cmdEnvSet(JASTrack *, u32 *); - s32 cmdSimpleADSR(JASTrack *, u32 *); - s32 cmdBusConnect(JASTrack *, u32 *); - s32 cmdSetIntTable(JASTrack *, u32 *); - s32 cmdSetInterrupt(JASTrack *, u32 *); - s32 cmdDisInterrupt(JASTrack *, u32 *); - s32 cmdClrI(JASTrack *, u32 *); - s32 cmdRetI(JASTrack *, u32 *); - s32 cmdIntTimer(JASTrack *, u32 *); - s32 cmdSyncCPU(JASTrack *, u32 *); - s32 cmdTempo(JASTrack *, u32 *); - s32 cmdFinish(JASTrack *, u32 *); - s32 cmdNop(JASTrack *, u32 *); - s32 cmdFIRSet(JASTrack *, u32 *); - s32 cmdIIRSet(JASTrack *, u32 *); - s32 cmdIIRCutOff(JASTrack *, u32 *); - s32 cmdBankPrg(JASTrack *, u32 *); - s32 cmdBank(JASTrack *, u32 *); - s32 cmdPrg(JASTrack *, u32 *); - s32 cmdParamI(JASTrack *, u32 *); - s32 cmdParamII(JASTrack *, u32 *); - s32 cmdParamE(JASTrack *, u32 *); - s32 cmdParamEI(JASTrack *, u32 *); - s32 cmdReg(JASTrack *, u32 *); - s32 cmdRegLoad(JASTrack *, u32 *); - s32 cmdRegUni(JASTrack *, u32 *); - s32 cmdRegTblLoad(JASTrack *, u32 *); - s32 cmdDump(JASTrack *, u32 *); - s32 cmdPrintf(JASTrack *, u32 *); - s32 parseNoteOff(JASTrack *, u8); - s32 parseNoteOn(JASTrack *, u8); - s32 parseCommand(JASTrack *, u8, u16); - s32 parseRegCommand(JASTrack *, int); - + JASSeqParser(); + + virtual ~JASSeqParser(); + virtual s32 parse(JASTrack*); + virtual void execNoteOnMidi(JASTrack*, u32, u32, u32); + virtual void execNoteOnGate(JASTrack*, u32, u32, u32, u32); + virtual void execNoteOff(JASTrack*, u32); + virtual s32 execCommand(JASTrack*, JASSeqParser::CommandFunc, u32, u32*); + + bool conditionCheck(JASTrack*, BranchCondition); + void writeReg(JASTrack*, u32, u32); + u32 readReg(JASTrack*, u32) const; + s32 cmdOpenTrack(JASTrack*, u32*); + s32 cmdCloseTrack(JASTrack*, u32*); + s32 cmdCall(JASTrack*, u32*); + s32 cmdCallF(JASTrack*, u32*); + s32 cmdRet(JASTrack*, u32*); + s32 cmdRetF(JASTrack*, u32*); + s32 cmdJmp(JASTrack*, u32*); + s32 cmdJmpF(JASTrack*, u32*); + s32 cmdJmpTable(JASTrack*, u32*); + s32 cmdCallTable(JASTrack*, u32*); + s32 cmdLoopS(JASTrack*, u32*); + s32 cmdLoopE(JASTrack*, u32*); + s32 cmdNote(JASTrack*, u32*); + s32 cmdNoteOn(JASTrack*, u32*); + s32 cmdNoteOff(JASTrack*, u32*); + s32 cmdReadPort(JASTrack*, u32*); + s32 cmdWritePort(JASTrack*, u32*); + s32 cmdParentWritePort(JASTrack*, u32*); + s32 cmdChildWritePort(JASTrack*, u32*); + s32 cmdParentReadPort(JASTrack*, u32*); + s32 cmdChildReadPort(JASTrack*, u32*); + s32 cmdCheckPortImport(JASTrack*, u32*); + s32 cmdCheckPortExport(JASTrack*, u32*); + s32 cmdWait(JASTrack*, u32*); + s32 cmdWaitByte(JASTrack*, u32*); + s32 cmdSetLastNote(JASTrack*, u32*); + s32 cmdEnvScaleSet(JASTrack*, u32*); + s32 cmdEnvSet(JASTrack*, u32*); + s32 cmdSimpleADSR(JASTrack*, u32*); + s32 cmdBusConnect(JASTrack*, u32*); + s32 cmdSetIntTable(JASTrack*, u32*); + s32 cmdSetInterrupt(JASTrack*, u32*); + s32 cmdDisInterrupt(JASTrack*, u32*); + s32 cmdClrI(JASTrack*, u32*); + s32 cmdRetI(JASTrack*, u32*); + s32 cmdIntTimer(JASTrack*, u32*); + s32 cmdSyncCPU(JASTrack*, u32*); + s32 cmdTempo(JASTrack*, u32*); + s32 cmdFinish(JASTrack*, u32*); + s32 cmdNop(JASTrack*, u32*); + s32 cmdFIRSet(JASTrack*, u32*); + s32 cmdIIRSet(JASTrack*, u32*); + s32 cmdIIRCutOff(JASTrack*, u32*); + s32 cmdBankPrg(JASTrack*, u32*); + s32 cmdBank(JASTrack*, u32*); + s32 cmdPrg(JASTrack*, u32*); + s32 cmdParamI(JASTrack*, u32*); + s32 cmdParamII(JASTrack*, u32*); + s32 cmdParamE(JASTrack*, u32*); + s32 cmdParamEI(JASTrack*, u32*); + s32 cmdReg(JASTrack*, u32*); + s32 cmdRegLoad(JASTrack*, u32*); + s32 cmdRegUni(JASTrack*, u32*); + s32 cmdRegTblLoad(JASTrack*, u32*); + s32 cmdDump(JASTrack*, u32*); + s32 cmdPrintf(JASTrack*, u32*); + s32 parseNoteOff(JASTrack*, u8); + s32 parseNoteOn(JASTrack*, u8); + s32 parseCommand(JASTrack*, u8, u16); + s32 parseRegCommand(JASTrack*, int); }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JAudio2/JASSeqReader.hpp b/libs/JSystem/include/JSystem/JAudio2/JASSeqReader.hpp index 2f5295f65..34a030c83 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASSeqReader.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASSeqReader.hpp @@ -4,19 +4,18 @@ class JASSeqReader { public: + void init(); + void init(void*); + bool call(u32); + bool loopStart(u32); + bool loopEnd(); + bool ret(); + u32 readMidiValue(); + void* getStackPtr(u32) const; - void init(); - void init(void *); - bool call(u32); - bool loopStart(u32); - bool loopEnd(); - bool ret(); - u32 readMidiValue(); - void* getStackPtr(u32) const; - - void *mSeqBuff; - void *mSeqCursor; - u32 mNumStacks; - void *mStackPtrs[8]; - u16 mLoopTimers[8]; + void* mSeqBuff; + void* mSeqCursor; + u32 mNumStacks; + void* mStackPtrs[8]; + u16 mLoopTimers[8]; }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JAudio2/JASSeqRegisterParam.hpp b/libs/JSystem/include/JSystem/JAudio2/JASSeqRegisterParam.hpp index 56cbfc4c2..dc3ee3a0c 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASSeqRegisterParam.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASSeqRegisterParam.hpp @@ -4,17 +4,17 @@ class JASRegisterParam { public: - enum RegID { - REG_A, - REG_B, - REG_S, - REG_F, - REG_X, - REG_Y - }; + enum RegID { + REG_A, + REG_B, + REG_S, + REG_F, + REG_X, + REG_Y + }; JASRegisterParam(); void init(); - u32 read(RegID); - void write(RegID, u32); - u32 _0; + u32 read(RegID); + void write(RegID, u32); + u32 _0; }; diff --git a/libs/JSystem/include/JSystem/JAudio2/JASTaskThread.hpp b/libs/JSystem/include/JSystem/JAudio2/JASTaskThread.hpp index 7f6f9ad61..5bde23ca4 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASTaskThread.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASTaskThread.hpp @@ -3,15 +3,15 @@ #include namespace JASThreadingModel { - template + template class InterruptsDisable { public: struct Lock { - Lock(const T &) NO_INLINE { + Lock(const T&) NO_INLINE { success = OSDisableInterrupts(); } ~Lock() NO_INLINE; u32 success; }; }; -} +} // namespace JASThreadingModel diff --git a/libs/JSystem/include/JSystem/JAudio2/JASTrack.hpp b/libs/JSystem/include/JSystem/JAudio2/JASTrack.hpp index 7eb62c053..a00001494 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASTrack.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASTrack.hpp @@ -12,46 +12,49 @@ #include "JSystem/JAudio2/JASHeapCtrl.hpp" #include -template +template class JASGlobalInstance { public: - static T *sInstance; - + static T* sInstance; + JASGlobalInstance(bool flag) NO_INLINE { - if(!flag) return; - sInstance = (T *)this; + if (!flag) + return; + sInstance = (T*)this; } ~JASGlobalInstance() NO_INLINE { - if(sInstance == (T *)this) sInstance = nullptr; + if (sInstance == (T*)this) + sInstance = nullptr; }; }; class JASSoundParams; class JASChannel; -template +template class JASPtrTable { public: - JASPtrTable(T **ptrTable, u32 len) NO_INLINE { + JASPtrTable(T** ptrTable, u32 len) NO_INLINE { mLen = len; mPtrTable = ptrTable; - memset(mPtrTable, 0, len * sizeof(T *)); + memset(mPtrTable, 0, len * sizeof(T*)); } T* get(u32 idx) const NO_INLINE { - if(idx >= mLen) return nullptr; + if (idx >= mLen) + return nullptr; return mPtrTable[idx]; } - T **mPtrTable; // 0x0 - u32 mLen; // 0x4 + T** mPtrTable; // 0x0 + u32 mLen; // 0x4 }; -template +template class JASPtrArray : public JASPtrTable { public: JASPtrArray() NO_INLINE : JASPtrTable(mPtrArray, LEN) {} - T *mPtrArray[LEN]; // 0x8 + T* mPtrArray[LEN]; // 0x8 }; class JASBankList { @@ -61,11 +64,10 @@ public: virtual JASBank* getBank(u32) const = 0; }; -template +template class JASBankTable : public JASBankList { public: JASBankTable() NO_INLINE : JASBankList(), mBanks() { - } virtual JASBank* getBank(u32 idx) const NO_INLINE { @@ -77,21 +79,23 @@ public: class JASChannelParams { public: - JASChannelParams(); - void init(); - f32 _0[6]; + JASChannelParams(); + void init(); + f32 _0[6]; }; class JASCriticalSection { public: - JASCriticalSection() NO_INLINE; - inline JASCriticalSection(const JASCriticalSection &rOther) : success(rOther.success) {} - ~JASCriticalSection() NO_INLINE; - u32 success; + JASCriticalSection() NO_INLINE; + inline JASCriticalSection(const JASCriticalSection& rOther) + : success(rOther.success) {} + ~JASCriticalSection() NO_INLINE; + u32 success; }; class JASDefaultBankTable - : public JASBankTable<0x100>, public JASGlobalInstance { + : public JASBankTable<0x100>, + public JASGlobalInstance { public: JASDefaultBankTable(); ~JASDefaultBankTable(); @@ -99,197 +103,194 @@ public: class JASTrack : public JASSeqCtrl, public JASPoolAllocObject_MultiThreaded { public: + static const JASOscillator::Data sEnvOsc; + static const JASOscillator::Data sPitchEnvOsc; - static const JASOscillator::Data sEnvOsc; - static const JASOscillator::Data sPitchEnvOsc; + static JASDefaultBankTable sDefaultBankTable; - static JASDefaultBankTable sDefaultBankTable; - - struct TChannelMgr : public JASPoolAllocObject_MultiThreaded { - TChannelMgr(JASTrack *); - void init(); + struct TChannelMgr : public JASPoolAllocObject_MultiThreaded { + TChannelMgr(JASTrack*); + void init(); void releaseAll(); bool noteOff(u32, u16); void setPauseFlag(bool); - JASChannel* mChannels[8]; // 0x0 - JASChannelParams mChannelParams; // 0x20 - u16 _38[8]; - JASSoundParams* _48; - JASTrack *mParentTrack; // 0x4C - }; + JASChannel* mChannels[8]; // 0x0 + JASChannelParams mChannelParams; // 0x20 + u16 _38[8]; + JASSoundParams* _48; + JASTrack* mParentTrack; // 0x4C + }; - struct Timed { - f32 _0; - f32 _4; - u32 _8; - }; + struct Timed { + f32 _0; + f32 _4; + u32 _8; + }; - JASTrack(); - - ~JASTrack(); - - s32 seqMain(); + JASTrack(); - void init(); - void initTimed(); - - void startSeq(); - void stopSeq(); - - void start(); - JASChannel* channelStart(TChannelMgr *, u32, u32, u32); + ~JASTrack(); - void close(); + s32 seqMain(); - int tickProc(); + void init(); + void initTimed(); - void inherit(const JASTrack &); + void startSeq(); + void stopSeq(); - JASTrack* openChild(u32); - bool connectChild(u32, JASTrack *); - void closeChild(u32); - JASTrack* getRootTrack(); - - void connectBus(int, int); + void start(); + JASChannel* channelStart(TChannelMgr*, u32, u32, u32); - void assignExtBuffer(u32, JASSoundParams *); - - void call(u32); + void close(); - void updateTimedParam(); - void updateTrack(f32); - void updateTempo(); - void updateSeq(bool, f32); - void updateChannel(JASChannel *, JASDsp::TChannel *); - static void channelUpdateCallback(u32, JASChannel *, JASDsp::TChannel *, void *); + int tickProc(); - bool gateOn(u32, u32, f32, u32); - bool noteOn(u32, u32, u32); - bool noteOff(u32, u16); - void noteOffAll(u16); - bool checkNoteStop(u32) const; + void inherit(const JASTrack&); + + JASTrack* openChild(u32); + bool connectChild(u32, JASTrack*); + void closeChild(u32); + JASTrack* getRootTrack(); + + void connectBus(int, int); + + void assignExtBuffer(u32, JASSoundParams*); + + void call(u32); + + void updateTimedParam(); + void updateTrack(f32); + void updateTempo(); + void updateSeq(bool, f32); + void updateChannel(JASChannel*, JASDsp::TChannel*); + static void channelUpdateCallback(u32, JASChannel*, JASDsp::TChannel*, void*); + + bool gateOn(u32, u32, f32, u32); + bool noteOn(u32, u32, u32); + bool noteOff(u32, u16); + void noteOffAll(u16); + bool checkNoteStop(u32) const; + + void mute(bool); + void pause(bool); + + void setChannelMgrCount(u32); + void setChannelPauseFlag(bool); + void setTimebase(u16); + void setSeqData(void*, u32); + void setLatestKey(u8); - void mute(bool); - void pause(bool); - - void setChannelMgrCount(u32); - void setChannelPauseFlag(bool); - void setTimebase(u16); - void setSeqData(void *, u32); - void setLatestKey(u8); - //Accept the tempo in units of bpm - void setTempo(u16); + void setTempo(u16); void setTempoRate(f32); - void setParam(u32, f32, u32); + void setParam(u32, f32, u32); - s32 getTransposeTotal() const; - bool isMute() const; + s32 getTransposeTotal() const; + bool isMute() const; - void overwriteOsc(JASChannel *); - void setOscScale(u32, f32); - void setOscTable(u32, const JASOscillator::Point *); - void setOscAdsr(s16, s16, s16, s16, u16); + void overwriteOsc(JASChannel*); + void setOscScale(u32, f32); + void setOscTable(u32, const JASOscillator::Point*); + void setOscAdsr(s16, s16, s16, s16, u16); - void setFIR(const s16 *); - void setIIR(const s16 *); - u32 seqTimeToDspTime(f32); - - u16 readPortSelf(u32); - u16 readPort(u32); - void writePortSelf(u32, u16); - void writePort(u32, u16); - - JASTrackPort mPorts; // 0x5C - JASRegisterParam mRegs; // 0x80 - u8 _84[0x18]; - Timed _9C[6]; - JASOscillator::Data _E4[2]; - JASOscillator::Point mAdsr[4]; // 0x114 - JASTrack *mParent; // 0x12C - JASTrack *mChildren[0x10]; // 0x130 - TChannelMgr* mMgrs[4]; // 0x170 - TChannelMgr mInitialMgr; // 0x180 - u32 mNumChannels; // 0x1D0 - JASDefaultBankTable* mBankTable; // 0x1D4 - f32 mPlaytime; // 0x1D8 - f32 mSampleInterval; // 0x1DC - f32 _1E0; - f32 _1E4; - f32 _1E8; - f32 _1EC; - u16 _1F0; - u16 _1F2; - s16 mFIRFilter[8]; // 0x1F4 - s16 mIIRFilter[8]; // 0x204 - u8 mFilterMode; - f32 _218; - f32 mTempoRate; // 0x21C - u32 _220; - u16 _224; + void setFIR(const s16*); + void setIIR(const s16*); + u32 seqTimeToDspTime(f32); + + u16 readPortSelf(u32); + u16 readPort(u32); + void writePortSelf(u32, u16); + void writePort(u32, u16); + + JASTrackPort mPorts; // 0x5C + JASRegisterParam mRegs; // 0x80 + u8 _84[0x18]; + Timed _9C[6]; + JASOscillator::Data _E4[2]; + JASOscillator::Point mAdsr[4]; // 0x114 + JASTrack* mParent; // 0x12C + JASTrack* mChildren[0x10]; // 0x130 + TChannelMgr* mMgrs[4]; // 0x170 + TChannelMgr mInitialMgr; // 0x180 + u32 mNumChannels; // 0x1D0 + JASDefaultBankTable* mBankTable; // 0x1D4 + f32 mPlaytime; // 0x1D8 + f32 mSampleInterval; // 0x1DC + f32 _1E0; + f32 _1E4; + f32 _1E8; + f32 _1EC; + u16 _1F0; + u16 _1F2; + s16 mFIRFilter[8]; // 0x1F4 + s16 mIIRFilter[8]; // 0x204 + u8 mFilterMode; + f32 _218; + f32 mTempoRate; // 0x21C + u32 _220; + u16 _224; /* Unit: bpm */ - u16 mTempo; // 0x226 + u16 mTempo; // 0x226 - u16 mTimebase; // 0x228 - s8 mTransposeAmt; // 0x22A - u8 mPitch; // 0x22B - u16 mBank; // 0x22C - u16 mPrg; // 0x22E - u8 _230; - u8 _231; - u8 _232; + u16 mTimebase; // 0x228 + s8 mTransposeAmt; // 0x22A + u8 mPitch; // 0x22B + u16 mBank; // 0x22C + u16 mPrg; // 0x22E + u8 _230; + u8 _231; + u8 _232; // Percentage latency for notes scheduled with gateOn (can be < 100% to schedule notes sooner) - u8 mGateLatency; // 0x233 - u16 mBuses[6]; // 0x234 - volatile s32 _240; + u8 mGateLatency; // 0x233 + u16 mBuses[6]; // 0x234 + volatile s32 _240; - union { - struct { - bool mPauseFlag: 1; - bool mIsMute: 1; - bool mIsDirectlyPlayed: 1; - bool mIsOwnedByParent: 1; - bool mReadyToPlay: 1; - bool mInvalidateSeq: 1; - bool mIsStopped: 1; - }; - volatile u8 byteRepr; - }; - JGadget::TLinkListNode mNode; // mNode + union { + struct { + bool mPauseFlag : 1; + bool mIsMute : 1; + bool mIsDirectlyPlayed : 1; + bool mIsOwnedByParent : 1; + bool mReadyToPlay : 1; + bool mInvalidateSeq : 1; + bool mIsStopped : 1; + }; + volatile u8 byteRepr; + }; + JGadget::TLinkListNode mNode; // mNode - struct TList; - - static TList sTrackList; + struct TList; + + static TList sTrackList; }; struct JASTrack::TList { typedef JGADGET_LINK_LIST(JASTrack, mNode) InternalList; - + TList(); ~TList(); - - static s32 cbSeqMain(void *); - void append(JASTrack *); - void seqMain(); - InternalList mList; // 0x0 - bool mIsInit; // 0xC + + static s32 cbSeqMain(void*); + void append(JASTrack*); + void seqMain(); + InternalList mList; // 0x0 + bool mIsInit; // 0xC }; namespace JGadget { - bool operator!= ( + bool operator!=( JASTrack::TList::InternalList::iterator, - JASTrack::TList::InternalList::iterator - ) NO_INLINE; - - bool operator== ( + JASTrack::TList::InternalList::iterator) NO_INLINE; + + bool operator==( JASTrack::TList::InternalList::iterator, - JASTrack::TList::InternalList::iterator - ) NO_INLINE; - + JASTrack::TList::InternalList::iterator) NO_INLINE; + bool operator==(TNodeLinkList::iterator, TNodeLinkList::iterator) NO_INLINE; -} \ No newline at end of file +} // namespace JGadget \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JAudio2/JASTrackPort.hpp b/libs/JSystem/include/JSystem/JAudio2/JASTrackPort.hpp index 4eb002baf..a343ca1a3 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JASTrackPort.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JASTrackPort.hpp @@ -5,8 +5,8 @@ class JASTrackPort { public: void init(); - u16 readImport(u32); - u16 readExport(u32); + u16 readImport(u32); + u16 readExport(u32); void writeImport(u32, u16); void writeExport(u32, u16); bool checkImport(u32) const; diff --git a/libs/JSystem/include/JSystem/JAudio2/JAUSoundAnimator.hpp b/libs/JSystem/include/JSystem/JAudio2/JAUSoundAnimator.hpp index a3e1f799c..4f203d69e 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JAUSoundAnimator.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JAUSoundAnimator.hpp @@ -9,15 +9,15 @@ class JASSoundParams; class JAUSoundAnimator { public: - JAUSoundAnimator(JAISoundHandles *); + JAUSoundAnimator(JAISoundHandles*); - virtual u32* getFreeHandle(const JAUSoundAnimationSound *); - virtual s32 getSoundID(const JAUSoundAnimationSound *, const TVec3f &, f32); - virtual bool playSound(const JAUSoundAnimationSound *, const TVec3f &, f32); - virtual void modifySoundParams(JASSoundParams *, const JAUSoundAnimationSound *, f32); + virtual u32* getFreeHandle(const JAUSoundAnimationSound*); + virtual s32 getSoundID(const JAUSoundAnimationSound*, const TVec3f&, f32); + virtual bool playSound(const JAUSoundAnimationSound*, const TVec3f&, f32); + virtual void modifySoundParams(JASSoundParams*, const JAUSoundAnimationSound*, f32); - JAISoundHandles* mHandles; // 0x04 - u32 _8; - u32 _C; - u32 _10; + JAISoundHandles* mHandles; // 0x04 + u32 _8; + u32 _C; + u32 _10; }; diff --git a/libs/JSystem/include/JSystem/JAudio2/JAUSoundObject.hpp b/libs/JSystem/include/JSystem/JAudio2/JAUSoundObject.hpp index ae97286ac..78872d6ab 100644 --- a/libs/JSystem/include/JSystem/JAudio2/JAUSoundObject.hpp +++ b/libs/JSystem/include/JSystem/JAudio2/JAUSoundObject.hpp @@ -8,24 +8,23 @@ class JAISoundHandle; class JAUSoundObject : public JAISoundHandles { public: - JAUSoundObject(); ~JAUSoundObject(); - virtual void process(); - virtual void dispose(); - virtual void stopOK(JAISoundHandle &); - virtual JAISoundHandle *startSound(JAISoundID); - virtual void startSoundIndex(JAISoundID, unsigned char); - virtual JAISoundHandle *startLevelSound(JAISoundID); - virtual void startLevelSoundIndex(JAISoundID, unsigned char); + virtual void process(); + virtual void dispose(); + virtual void stopOK(JAISoundHandle&); + virtual JAISoundHandle* startSound(JAISoundID); + virtual void startSoundIndex(JAISoundID, unsigned char); + virtual JAISoundHandle* startLevelSound(JAISoundID); + virtual void startLevelSoundIndex(JAISoundID, unsigned char); void stopSound(JAISoundID, unsigned long); void getLowPrioSound(JAISoundID); void getFreeHandleNotReserved(); - bool _C; - u8 _D[3]; - u32 _10; - TVec3f *_14; + bool _C; + u8 _D[3]; + u32 _10; + TVec3f* _14; }; diff --git a/libs/JSystem/include/JSystem/JGadget/hashcode.hpp b/libs/JSystem/include/JSystem/JGadget/hashcode.hpp index 466a22794..0b1c396cc 100644 --- a/libs/JSystem/include/JSystem/JGadget/hashcode.hpp +++ b/libs/JSystem/include/JSystem/JGadget/hashcode.hpp @@ -3,5 +3,5 @@ #include namespace JGadget { - u32 getHashCode(const char *); + u32 getHashCode(const char*); }; diff --git a/libs/JSystem/include/JSystem/JGadget/linklist.hpp b/libs/JSystem/include/JSystem/JGadget/linklist.hpp index de5b55003..fea24c213 100644 --- a/libs/JSystem/include/JSystem/JGadget/linklist.hpp +++ b/libs/JSystem/include/JSystem/JGadget/linklist.hpp @@ -10,197 +10,190 @@ #define JGADGET_LINK_LIST(type, node) JGadget::TLinkList namespace std { - + struct input_iterator_tag {}; struct forward_iterator_tag : public input_iterator_tag {}; struct bidirectional_iterator_tag : public forward_iterator_tag {}; - - template< + template < typename Category, typename T, typename Distance = s32, typename Pointer = T*, - typename Reference = T& - > + typename Reference = T&> class iterator { public: - typedef Category iterator_category; - typedef T value_type; - typedef Distance difference_type; - typedef Pointer pointer; + typedef Category iterator_category; + typedef T value_type; + typedef Distance difference_type; + typedef Pointer pointer; typedef Reference reference; - iterator& operator=(const iterator &rOther) NO_INLINE {return *this;} + iterator& operator=(const iterator& rOther) NO_INLINE { + return *this; + } }; - -} +} // namespace std namespace JGadget { - - template< + template < typename Category, typename T, typename Distance = s32, typename Pointer = T*, - typename Reference = T& - > + typename Reference = T&> class TIterator : std::iterator { public: - const TIterator& operator=(const TIterator &rOther) NO_INLINE { + const TIterator& operator=(const TIterator& rOther) NO_INLINE { std::iterator::operator=(rOther); return *this; } }; - class TLinkListNode { public: - INLINE_FUNC_DECL_NO_ARG(TLinkListNode) : mPrev(nullptr), mNext(nullptr) {} + INLINE_FUNC_DECL_NO_ARG(TLinkListNode) + : mPrev(nullptr), mNext(nullptr) {} TLinkListNode() NO_INLINE; TLinkListNode* getNext() const NO_INLINE; - TLinkListNode *mNext; - TLinkListNode *mPrev; + TLinkListNode* mNext; + TLinkListNode* mPrev; }; - + class TNodeLinkList { public: struct iterator { iterator() NO_INLINE; - iterator(TLinkListNode *) NO_INLINE; - iterator(const iterator &) NO_INLINE; - iterator& operator++() NO_INLINE; + iterator(TLinkListNode*) NO_INLINE; + iterator(const iterator&) NO_INLINE; + iterator& operator++() NO_INLINE; TLinkListNode* operator->() const NO_INLINE; - - INLINE_FUNC_DECL(iterator, TLinkListNode *node) : curr(node) {} - - TLinkListNode *curr; + + INLINE_FUNC_DECL(iterator, TLinkListNode* node) + : curr(node) {} + + TLinkListNode* curr; }; - + TNodeLinkList() NO_INLINE; ~TNodeLinkList(); - void Initialize_() NO_INLINE; + void Initialize_() NO_INLINE; TLinkListNode* begin() NO_INLINE; TLinkListNode* end() NO_INLINE; - TLinkListNode* Insert(iterator, TLinkListNode *); - TLinkListNode* Erase(TLinkListNode *); - void Remove(TLinkListNode *); - void splice(iterator, TNodeLinkList &, iterator); + TLinkListNode* Insert(iterator, TLinkListNode*); + TLinkListNode* Erase(TLinkListNode*); + void Remove(TLinkListNode*); + void splice(iterator, TNodeLinkList&, iterator); - INLINE_FUNC_DECL_NO_ARG(TNodeLinkList) : CALL_INLINE_FUNC_NO_ARG(mEnd) { + INLINE_FUNC_DECL_NO_ARG(TNodeLinkList) + : CALL_INLINE_FUNC_NO_ARG(mEnd) { Initialize_(); } - template - inline void Remove_if(T p, TNodeLinkList &removed) { + template + inline void Remove_if(T p, TNodeLinkList& removed) { TLinkListNode *curr, *end, *removedEnd; removedEnd = &removed.mEnd; curr = mEnd.mNext; end = &mEnd; - while(curr != end) { - TLinkListNode *prev = curr; - if(p(curr)) { + while (curr != end) { + TLinkListNode* prev = curr; + if (p(curr)) { curr = curr->mNext; - removed.splice ( - CALL_INLINE_FUNC (iterator, removedEnd), + removed.splice( + CALL_INLINE_FUNC(iterator, removedEnd), *this, - CALL_INLINE_FUNC(iterator, prev) - ); - } - else curr = curr->mNext; + CALL_INLINE_FUNC(iterator, prev)); + } else + curr = curr->mNext; } - } - template + template inline void remove_if(T p) { TNodeLinkList CALL_INLINE_FUNC_NO_ARG(removed); Remove_if(p, removed); } - u32 mLen; + u32 mLen; TLinkListNode mEnd; }; - - template + + template class TLinkList : public TNodeLinkList { public: - struct iterator : - public TIterator, - public TNodeLinkList::iterator - { + struct iterator : public TIterator, + public TNodeLinkList::iterator { iterator() NO_INLINE : TNodeLinkList::iterator() {} - iterator(TLinkListNode *iter) : CALL_INLINE_FUNC(TNodeLinkList::iterator, iter) {} + iterator(TLinkListNode* iter) + : CALL_INLINE_FUNC(TNodeLinkList::iterator, iter) {} iterator(TNodeLinkList::iterator iter) NO_INLINE : TNodeLinkList::iterator(iter) {} - - iterator(const iterator &rOther) + + iterator(const iterator& rOther) : CALL_INLINE_FUNC(TNodeLinkList::iterator, rOther.curr) {} - - const iterator& operator=(const iterator &rOther) NO_INLINE { + + const iterator& operator=(const iterator& rOther) NO_INLINE { TIterator::operator=(rOther); curr = rOther.curr; return *this; } - + iterator& operator++() NO_INLINE { TNodeLinkList::iterator::operator++(); return *this; } - + T* operator->() const NO_INLINE { - return TLinkList::Element_toValue ( - TNodeLinkList::iterator::operator->() - ); + return TLinkList::Element_toValue( + TNodeLinkList::iterator::operator->()); } - + T* operator*() const NO_INLINE { return operator->(); } }; - + TLinkList() NO_INLINE : TNodeLinkList() {} - ~TLinkList() NO_INLINE {}; - + ~TLinkList() NO_INLINE{}; + TLinkListNode* begin() NO_INLINE { return iterator(CALL_INLINE_FUNC(TNodeLinkList::iterator, TNodeLinkList::begin())).curr; } - + TLinkListNode* end() NO_INLINE { return iterator(CALL_INLINE_FUNC(TNodeLinkList::iterator, TNodeLinkList::end())).curr; } - - void Push_back(T *element) NO_INLINE { + + void Push_back(T* element) NO_INLINE { Insert(end(), element); } - TLinkListNode* Insert(iterator pos, T *element) NO_INLINE { - return iterator ( - CALL_INLINE_FUNC ( - TNodeLinkList::iterator, - TNodeLinkList::Insert ( - CALL_INLINE_FUNC(TNodeLinkList::iterator, pos.curr), - Element_toNode(element) - ) - ) - ).curr; + TLinkListNode* Insert(iterator pos, T* element) NO_INLINE { + return iterator( + CALL_INLINE_FUNC( + TNodeLinkList::iterator, + TNodeLinkList::Insert( + CALL_INLINE_FUNC(TNodeLinkList::iterator, pos.curr), + Element_toNode(element)))) + .curr; } - - static TLinkListNode* Element_toNode(T *element) NO_INLINE { - return (TLinkListNode *)((u8 *)element - NODE_OFFSET); + + static TLinkListNode* Element_toNode(T* element) NO_INLINE { + return (TLinkListNode*)((u8*)element - NODE_OFFSET); } - - static T* Element_toValue(TLinkListNode *element) NO_INLINE { - return (T *)((u8 *)element + NODE_OFFSET); + + static T* Element_toValue(TLinkListNode* element) NO_INLINE { + return (T*)((u8*)element + NODE_OFFSET); } - + void Remove(T* element) NO_INLINE { TNodeLinkList::Remove(Element_toNode(element)); } }; -} +} // namespace JGadget diff --git a/libs/JSystem/include/JSystem/JGadget/predicate.hpp b/libs/JSystem/include/JSystem/JGadget/predicate.hpp index a66686327..412165481 100644 --- a/libs/JSystem/include/JSystem/JGadget/predicate.hpp +++ b/libs/JSystem/include/JSystem/JGadget/predicate.hpp @@ -3,37 +3,39 @@ #include namespace JGadget { - + namespace { - - template + + template class TPRIsEnd_value_ { public: - TPRIsEnd_value_(T _end) : end(_end) {} - - template + TPRIsEnd_value_(T _end) + : end(_end) {} + + template inline bool operator()(U const other) { return other == end; } - + private: T end; }; - template + template class TPRIsEqual_pointer_ { public: - TPRIsEqual_pointer_(const T *_ptr) : ptr(_ptr) {} + TPRIsEqual_pointer_(const T* _ptr) + : ptr(_ptr) {} - template - inline bool operator()(const U *other) { + template + inline bool operator()(const U* other) { return other == ptr; } - + private: - const T *ptr; + const T* ptr; }; - - } - -} \ No newline at end of file + + } // namespace + +} // namespace JGadget \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JGeometry/TBox.hpp b/libs/JSystem/include/JSystem/JGeometry/TBox.hpp index bd3c743c1..c69e105b6 100644 --- a/libs/JSystem/include/JSystem/JGeometry/TBox.hpp +++ b/libs/JSystem/include/JSystem/JGeometry/TBox.hpp @@ -6,15 +6,17 @@ namespace JGeometry { template struct TBox { - TBox() : mMin(), mMax() {} - TBox(const TBox& other) : mMin(other.i), mMax(other.f) {} - - void extend(const TVec3f &); + TBox() + : mMin(), mMax() {} + TBox(const TBox& other) + : mMin(other.i), mMax(other.f) {} + + void extend(const TVec3f&); T mMin, mMax; }; - template + template class TBox2 { public: TBox2(T a1, T a2, T a3, T a4) { @@ -26,24 +28,23 @@ namespace JGeometry { //void set(const TBox2 &a1, const TBox2 &a2); - void set(const JGeometry::TBox2 &, const JGeometry::TBox2 &); - void operator=(const JGeometry::TBox2 &); + void set(const JGeometry::TBox2&, const JGeometry::TBox2&); + void operator=(const JGeometry::TBox2&); TVec2 _0; TVec2 _8; }; - template - class TBox3 : public TBox > { + template + class TBox3 : public TBox> { public: TBox3() { - } - bool intersectsPoint(const TVec3f &) const; + bool intersectsPoint(const TVec3f&) const; }; - template + template class TDirBox3 { public: JGeometry::TVec3 _0; @@ -52,10 +53,10 @@ namespace JGeometry { JGeometry::TVec3 _24; JGeometry::TVec3 _30; }; -}; +}; // namespace JGeometry -typedef JGeometry::TBox2 TBox2f; -typedef JGeometry::TBox2 TBox2s; -typedef JGeometry::TBox3 TBox3f; -typedef JGeometry::TBox3 > TBoxVec3f; -typedef JGeometry::TDirBox3 TDirBox3f; +typedef JGeometry::TBox2 TBox2f; +typedef JGeometry::TBox2 TBox2s; +typedef JGeometry::TBox3 TBox3f; +typedef JGeometry::TBox3> TBoxVec3f; +typedef JGeometry::TDirBox3 TDirBox3f; diff --git a/libs/JSystem/include/JSystem/JGeometry/THex.hpp b/libs/JSystem/include/JSystem/JGeometry/THex.hpp index d7519b815..38606d8ea 100644 --- a/libs/JSystem/include/JSystem/JGeometry/THex.hpp +++ b/libs/JSystem/include/JSystem/JGeometry/THex.hpp @@ -3,14 +3,13 @@ #include "JSystem/JGeometry/TPartition3.hpp" namespace JGeometry { - template + template class THexahedron3 { public: THexahedron3() { - } - bool mayIntersectBall3(const TVec3f &rVec, f32 a2) const; /*{ + bool mayIntersectBall3(const TVec3f& rVec, f32 a2) const; /*{ f32 neg = -a2; s32 curIdx = 0; while(mPlanes[curIdx] != mPlanes[0x6]) { @@ -23,8 +22,8 @@ namespace JGeometry { return false; }*/ - TPartition3 mPlanes[0x6]; // 0x0 + TPartition3 mPlanes[0x6]; // 0x0 }; -}; +}; // namespace JGeometry typedef JGeometry::THexahedron3 THex3f; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JGeometry/TMatrix.hpp b/libs/JSystem/include/JSystem/JGeometry/TMatrix.hpp index 15480b5a5..f4bb829fb 100644 --- a/libs/JSystem/include/JSystem/JGeometry/TMatrix.hpp +++ b/libs/JSystem/include/JSystem/JGeometry/TMatrix.hpp @@ -5,27 +5,26 @@ #include namespace JGeometry { - template + template struct SMatrix34C { public: - typedef f32 ArrType[4]; - void set(const ArrType*); - void set(const SMatrix34C &rSrc); - void set(T rxx, T ryx, T rzx, T tx, T rxy, T ryy, T rzy, T ty, T rxz, T ryz, T rzz, T tz); + void set(const ArrType*); + void set(const SMatrix34C& rSrc); + void set(T rxx, T ryx, T rzx, T tx, T rxy, T ryy, T rzy, T ty, T rxz, T ryz, T rzz, T tz); void scale(T); - inline void setInline(const SMatrix34C &rSrc) { - #ifdef __MWERKS__ - register const SMatrix34C *pSrc = &rSrc; - register SMatrix34C *pDest = this; - register f32 rzztz; - register f32 rxzyz; - register f32 rzyty; - register f32 rxyyy; - register f32 rzxtx; - register f32 rxxyx; + inline void setInline(const SMatrix34C& rSrc) { +#ifdef __MWERKS__ + register const SMatrix34C* pSrc = &rSrc; + register SMatrix34C* pDest = this; + register f32 rzztz; + register f32 rxzyz; + register f32 rzyty; + register f32 rxyyy; + register f32 rzxtx; + register f32 rxxyx; __asm { psq_l rxxyx, 0(pSrc), 0, 0 @@ -40,20 +39,21 @@ namespace JGeometry { psq_st rzyty, 0x18(pDest), 0, 0 psq_st rxzyz, 0x20(pDest), 0, 0 psq_st rzztz, 0x28(pDest), 0, 0 - }; - #endif + } + ; +#endif } inline void setInline(const MtxPtr rSrc) { - #ifdef __MWERKS__ - register const MtxPtr pSrc = rSrc; - register SMatrix34C *pDest = this; - register f32 rzztz; - register f32 rxzyz; - register f32 rzyty; - register f32 rxyyy; - register f32 rzxtx; - register f32 rxxyx; +#ifdef __MWERKS__ + register const MtxPtr pSrc = rSrc; + register SMatrix34C* pDest = this; + register f32 rzztz; + register f32 rxzyz; + register f32 rzyty; + register f32 rxyyy; + register f32 rzxtx; + register f32 rxxyx; __asm { psq_l rxxyx, 0(pSrc), 0, 0 @@ -68,20 +68,21 @@ namespace JGeometry { psq_st rzyty, 0x18(pDest), 0, 0 psq_st rxzyz, 0x20(pDest), 0, 0 psq_st rzztz, 0x28(pDest), 0, 0 - }; - #endif + } + ; +#endif } inline void setInline_2(MtxPtr rSrc) { - #ifdef __MWERKS__ - register MtxPtr pSrc = rSrc; - register SMatrix34C *pDest = this; - register f32 rzztz; - register f32 rxzyz; - register f32 rzyty; - register f32 rxyyy; - register f32 rzxtx; - register f32 rxxyx; +#ifdef __MWERKS__ + register MtxPtr pSrc = rSrc; + register SMatrix34C* pDest = this; + register f32 rzztz; + register f32 rxzyz; + register f32 rzyty; + register f32 rxyyy; + register f32 rzxtx; + register f32 rxxyx; __asm { psq_l rxxyx, 0(pSrc), 0, 0 @@ -96,8 +97,9 @@ namespace JGeometry { psq_st rzyty, 0x18(pDest), 0, 0 psq_st rxzyz, 0x20(pDest), 0, 0 psq_st rzztz, 0x28(pDest), 0, 0 - }; - #endif + } + ; +#endif } inline Mtx* toMtx() { @@ -119,8 +121,8 @@ namespace JGeometry { operator const ArrType*() const { return mMtx; } - - f32 get(int x, int y) const { + + f32 get(int x, int y) const { return mMtx[x][y]; } @@ -128,10 +130,8 @@ namespace JGeometry { return get(x, y); } - - __attribute__((always_inline)) - inline f32 dot() const { - return( + __attribute__((always_inline)) inline f32 dot() const { + return ( (this->mMtx[1][0] * this->mMtx[1][0]) + (this->mMtx[0][0] * this->mMtx[0][0]) + (this->mMtx[2][0] * this->mMtx[2][0]) + @@ -140,8 +140,7 @@ namespace JGeometry { (this->mMtx[2][1] * this->mMtx[2][1]) + (this->mMtx[0][2] * this->mMtx[0][2]) + (this->mMtx[1][2] * this->mMtx[1][2]) + - (this->mMtx[2][2] * this->mMtx[2][2]) - ); + (this->mMtx[2][2] * this->mMtx[2][2])); } inline f32 dot(int x, int y) { @@ -152,7 +151,7 @@ namespace JGeometry { //f32 _10 = ; //f32 _20 = ; //f32 _00 = ; - + return (this->mMtx[1][0] * this->mMtx[1][0]) + (this->mMtx[0][0] * this->mMtx[0][0]) + (this->mMtx[2][0] * this->mMtx[2][0]); } @@ -160,7 +159,7 @@ namespace JGeometry { //f32 _11 = ; //f32 _21 = ; //f32 _01 = ; - + return (this->mMtx[1][1] * this->mMtx[1][1]) + (this->mMtx[0][1] * this->mMtx[0][1]) + (this->mMtx[2][1] * this->mMtx[2][1]); } @@ -168,7 +167,7 @@ namespace JGeometry { //f32 _12 = ; //f32 _22 = ; //f32 _02 = ; - + return (this->mMtx[1][2] * this->mMtx[1][2]) + (this->mMtx[0][2] * this->mMtx[0][2]) + (this->mMtx[2][2] * this->mMtx[2][2]); } @@ -179,75 +178,75 @@ namespace JGeometry { T mMtx[3][4]; }; - template + template struct TMatrix34 : public T { public: void identity(); - void concat(const T &rSrcA, const T &rSrcB); - void concat(const T &rSrc); - void invert(const TMatrix34 &rDest); + void concat(const T& rSrcA, const T& rSrcB); + void concat(const T& rSrc); + void invert(const TMatrix34& rDest); - void mult(const TVec3f &rSrc, TVec3f &rDest) const; + void mult(const TVec3f& rSrc, TVec3f& rDest) const; - void multTranspose(const TVec3f &a1, const TVec3f &a2) const; + void multTranspose(const TVec3f& a1, const TVec3f& a2) const; }; - template + template struct TRotation3 : public T { public: void identity33(); - void getXDir(TVec3f &rDest) const NO_INLINE { + void getXDir(TVec3f& rDest) const NO_INLINE { rDest.set(this->mMtx[0][0], this->mMtx[1][0], this->mMtx[2][0]); }; - void getYDir(TVec3f &rDest) const NO_INLINE { + void getYDir(TVec3f& rDest) const NO_INLINE { rDest.set(this->mMtx[0][1], this->mMtx[1][1], this->mMtx[2][1]); }; - void getZDir(TVec3f &rDest) const NO_INLINE { + void getZDir(TVec3f& rDest) const NO_INLINE { rDest.set(this->mMtx[0][2], this->mMtx[1][2], this->mMtx[2][2]); }; - void getXYZDir(TVec3f &rDestX, TVec3f &rDestY, TVec3f &rDestZ) const; - void setXDir(const TVec3f &rSrc); + void getXYZDir(TVec3f& rDestX, TVec3f& rDestY, TVec3f& rDestZ) const; + void setXDir(const TVec3f& rSrc); void setXDir(f32 x, f32 y, f32 z); - void setYDir(const TVec3f &rSrc); + void setYDir(const TVec3f& rSrc); void setYDir(f32 x, f32 y, f32 z); - void setZDir(const TVec3f &rSrc); + void setZDir(const TVec3f& rSrc); void setZDir(f32 x, f32 y, f32 z); - void setXYZDir(const TVec3f &rSrcX, const TVec3f &rSrcY, const TVec3f &rSrcZ); + void setXYZDir(const TVec3f& rSrcX, const TVec3f& rSrcY, const TVec3f& rSrcZ); - void getEuler(TVec3f &rDest) const; - void getEulerXYZ(TVec3f &rDest) const; + void getEuler(TVec3f& rDest) const; + void getEulerXYZ(TVec3f& rDest) const; void setEulerY(f32 val); void setEulerZ(f32 val); - void getQuat(TQuat4f &rDest) const; - void setQuat(const TQuat4f &rSrc); + void getQuat(TQuat4f& rDest) const; + void setQuat(const TQuat4f& rSrc); - void getScale(TVec3f &rDest) const; - void setScale(const TVec3f &rSrc); - void setRotate(const TVec3f &, f32); - void setRotate(const TVec3f &, const TVec3f &); + void getScale(TVec3f& rDest) const; + void setScale(const TVec3f& rSrc); + void setRotate(const TVec3f&, f32); + void setRotate(const TVec3f&, const TVec3f&); - void mult33(TVec3f &) const; - void mult33(const TVec3f &rDst, TVec3f &rSrc) const; + void mult33(TVec3f&) const; + void mult33(const TVec3f& rDst, TVec3f& rSrc) const; - inline void getXDirInline(TVec3f &rDest) const { + inline void getXDirInline(TVec3f& rDest) const { f32 z = this->mMtx[2][0]; f32 y = this->mMtx[1][0]; f32 x = this->mMtx[0][0]; rDest.set(x, y, z); } - inline void getYDirInline(TVec3f &rDest) const { + inline void getYDirInline(TVec3f& rDest) const { f32 z = this->mMtx[2][1]; f32 y = this->mMtx[1][1]; f32 x = this->mMtx[0][1]; rDest.set(x, y, z); } - inline void getZDirInline(TVec3f &rDest) const { + inline void getZDirInline(TVec3f& rDest) const { f32 z = this->mMtx[2][2]; f32 y = this->mMtx[1][2]; f32 x = this->mMtx[0][2]; @@ -260,7 +259,7 @@ namespace JGeometry { this->mMtx[2][3] = 0.0f; } - inline void makeRotateInline(const TVec3f &rVec, f32 r) { + inline void makeRotateInline(const TVec3f& rVec, f32 r) { zeroTrans(); setRotateInline(rVec, r); } @@ -301,25 +300,25 @@ namespace JGeometry { this->mMtx[2][1] = 0.0f; this->mMtx[1][2] = 0.0f; this->mMtx[1][0] = 0.0f; - this->mMtx[0][1] = 0.0f; + this->mMtx[0][1] = 0.0f; } inline void someInlineMatrixFunction(f32 y, f32 p) { f32 HUNDERDEIGHTIETHPI = 0.017453292f; - f32 v9 = (HUNDERDEIGHTIETHPI * y); // f25 + f32 v9 = (HUNDERDEIGHTIETHPI * y); // f25 f32 v10 = -(HUNDERDEIGHTIETHPI * p); //f24 f32 v11 = cos(0.0f); //f28 - f32 v12 = cos(v9); // f27 - f32 v13 = cos(v10); // f26 + f32 v12 = cos(v9); // f27 + f32 v13 = cos(v10); // f26 f32 v14 = sin(0.0f); //f23 - f32 v15 = sin(v9); // f25 - f32 v16 = sin(v10); //f9 + f32 v15 = sin(v9); // f25 + f32 v16 = sin(v10); //f9 this->mMtx[0][0] = v12 * v11; - this->mMtx[0][1] = ( v16 * v15 * v11) - (v13 * v14); + this->mMtx[0][1] = (v16 * v15 * v11) - (v13 * v14); this->mMtx[1][0] = v12 * v14; - this->mMtx[1][1] = (v13 * v11) + (v16 * v15 * v14) ; + this->mMtx[1][1] = (v13 * v11) + (v16 * v15 * v14); this->mMtx[2][0] = -v15; this->mMtx[2][1] = v16 * v12; this->mMtx[0][2] = (v13 * v11 * v15) + (v16 * v14); @@ -327,7 +326,7 @@ namespace JGeometry { this->mMtx[2][2] = v12 * v13; } - inline void setRotateInline(const TVec3f &vec1, f32 r) { + inline void setRotateInline(const TVec3f& vec1, f32 r) { TVec3f vec; vec.set(vec1); PSVECMag(&vec); @@ -339,8 +338,8 @@ namespace JGeometry { f32 y = vec.y; f32 z = vec.z; - this->mMtx[0][0] = (negc * (x * x) + c); - this->mMtx[0][1] = (y * (negc * x)) - (s * z); + this->mMtx[0][0] = (negc * (x * x) + c); + this->mMtx[0][1] = (y * (negc * x)) - (s * z); this->mMtx[0][2] = (z * (negc * x)) + (s * y); this->mMtx[1][0] = (y * (negc * x)) + (s * z); this->mMtx[1][1] = (negc * (y * y) + c); @@ -349,7 +348,7 @@ namespace JGeometry { this->mMtx[2][1] = (z * (negc * y)) + (s * x); this->mMtx[2][2] = (negc * (z * z) + c); } - void setRotateInline2(const TVec3f &vec1, f32 r) { + void setRotateInline2(const TVec3f& vec1, f32 r) { // The only difference from setRotateInline is that we use setInline instead of set TVec3f vec; vec.x = vec1.x; @@ -364,8 +363,8 @@ namespace JGeometry { f32 y = vec.y; f32 z = vec.z; - this->mMtx[0][0] = (negc * (x * x) + c); - this->mMtx[0][1] = (y * (negc * x)) - (s * z); + this->mMtx[0][0] = (negc * (x * x) + c); + this->mMtx[0][1] = (y * (negc * x)) - (s * z); this->mMtx[0][2] = (z * (negc * x)) + (s * y); this->mMtx[1][0] = (y * (negc * x)) + (s * z); this->mMtx[1][1] = (negc * (y * y) + c); @@ -375,7 +374,7 @@ namespace JGeometry { this->mMtx[2][2] = (negc * (z * z) + c); } - void setRotateQuaternionInline(const TQuat4f &q) { + void setRotateQuaternionInline(const TQuat4f& q) { f32 two = 2.0f; f32 y = q.y; @@ -383,7 +382,6 @@ namespace JGeometry { f32 z = q.z; f32 w = q.w; - // NOTE: this doesnt quite match yet, needs some // messing around with to actually properly match... /* @@ -404,19 +402,17 @@ namespace JGeometry { this->mMtx[0][0] = (1.0f - two * y * y) - two * z * z; this->mMtx[2][0] = two * x * z - two * w * y; this->mMtx[0][2] = two * x * z + two * w * y; - + this->mMtx[0][1] = two * x * y - two * w * z; this->mMtx[1][0] = two * x * y + two * w * z; this->mMtx[1][1] = (1.0f - two * x * x) - two * z * z; - + this->mMtx[2][1] = two * z * y + two * w * x; this->mMtx[1][2] = two * z * y - two * w * x; this->mMtx[2][2] = (1.0f - two * x * x) - two * y * y; - } - - inline void mult33Inline(const TVec3f &rSrc, TVec3f &rDst) const { + inline void mult33Inline(const TVec3f& rSrc, TVec3f& rDst) const { f32 a32, a22, a12, a11, a21, vx, a31, vy, a23, a33, a13; a32 = this->mMtx[2][1]; a22 = this->mMtx[1][1]; @@ -435,20 +431,20 @@ namespace JGeometry { } }; - template + template struct TPosition3 : public TRotation3 { public: - void getTrans(TVec3f &rDest) const; - void setTrans(const TVec3f &rSrc); + void getTrans(TVec3f& rDest) const; + void setTrans(const TVec3f& rSrc); void setTrans(f32 x, f32 y, f32 z); void zeroTrans(); - void makeRotate(const TVec3f &, f32); - void makeQuat(const TQuat4f &rSrc); - void setPositionFromLookAt(const TPosition3 &rLookAt); - void setQT(const TQuat4f &rSrcQuat, const TVec3f &rSrcTrans); + void makeRotate(const TVec3f&, f32); + void makeQuat(const TQuat4f& rSrc); + void setPositionFromLookAt(const TPosition3& rLookAt); + void setQT(const TQuat4f& rSrcQuat, const TVec3f& rSrcTrans); - f32 get(int x, int y) const { + f32 get(int x, int y) const { return this->mMtx[x][y]; } @@ -456,14 +452,14 @@ namespace JGeometry { return get(x, y); } - inline void getTransInline(TVec3f &rDest) const { + inline void getTransInline(TVec3f& rDest) const { f32 z = this->mMtx[2][3]; f32 y = this->mMtx[1][3]; f32 x = this->mMtx[0][3]; rDest.set(x, y, z); } - inline void setVec(const TVec3f &a1, const TVec3f &a2, const TVec3f &a3) { + inline void setVec(const TVec3f& a1, const TVec3f& a2, const TVec3f& a3) { this->mMtx[0][0] = a1.x; this->mMtx[1][0] = a1.y; this->mMtx[2][0] = a1.z; @@ -477,9 +473,9 @@ namespace JGeometry { this->mMtx[2][2] = a3.z; } }; -}; +}; // namespace JGeometry -typedef JGeometry::SMatrix34C TSMtxf; -typedef JGeometry::TMatrix34 TMtx34f; +typedef JGeometry::SMatrix34C TSMtxf; +typedef JGeometry::TMatrix34 TMtx34f; typedef JGeometry::TRotation3 TRot3f; typedef JGeometry::TPosition3 TPos3f; diff --git a/libs/JSystem/include/JSystem/JGeometry/TPartition3.hpp b/libs/JSystem/include/JSystem/JGeometry/TPartition3.hpp index af9918926..2c6b1819a 100644 --- a/libs/JSystem/include/JSystem/JGeometry/TPartition3.hpp +++ b/libs/JSystem/include/JSystem/JGeometry/TPartition3.hpp @@ -3,10 +3,10 @@ #include "JSystem/JGeometry/TVec.hpp" namespace JGeometry { - template + template class TPartition3 { public: - TVec3 mNormal; // 0x0 - T mDot; // 0xC + TVec3 mNormal; // 0x0 + T mDot; // 0xC }; -}; +}; // namespace JGeometry diff --git a/libs/JSystem/include/JSystem/JGeometry/TQuat.hpp b/libs/JSystem/include/JSystem/JGeometry/TQuat.hpp index 79f9fd8b0..b434e1a11 100644 --- a/libs/JSystem/include/JSystem/JGeometry/TQuat.hpp +++ b/libs/JSystem/include/JSystem/JGeometry/TQuat.hpp @@ -4,7 +4,7 @@ #include namespace JGeometry { - template + template struct TQuat4 : public TVec3 { public: /* Constructors */ @@ -17,7 +17,7 @@ namespace JGeometry { this->w = _w; } - template + template TQuat4(A _x, A _y, A _z, A _w) { this->x = _x; this->y = _y; @@ -29,48 +29,45 @@ namespace JGeometry { /* General operations */ void normalize(); - void normalize(const TQuat4 &rSrc); + void normalize(const TQuat4& rSrc); - void getXDir(TVec3 &rDest) const { + void getXDir(TVec3& rDest) const { rDest.template set( 1.0f - this->y * this->y * 2.0f - this->z * this->z * 2.0f, this->x * this->y * 2.0f + this->w * this->z * 2.0f, - this->x * this->z * 2.0f - this->w * this->y * 2.0f - ); + this->x * this->z * 2.0f - this->w * this->y * 2.0f); } - void getYDir(TVec3 &rDest) const { + void getYDir(TVec3& rDest) const { rDest.template set( this->x * this->y * 2.0f - this->w * this->z * 2.0f, 1.0f - this->x * this->x * 2.0f - this->z * this->z * 2.0f, - this->y * this->z * 2.0f + this->w * this->x * 2.0f - ); + this->y * this->z * 2.0f + this->w * this->x * 2.0f); } - - void getZDir(TVec3 &rDest) const { + + void getZDir(TVec3& rDest) const { rDest.template set( this->x * this->z * 2.0f + this->w * this->y * 2.0f, this->y * this->z * 2.0f - this->w * this->x * 2.0f, - 1.0f - this->x * this->x * 2.0f - this->y * this->y * 2.0f - ); + 1.0f - this->x * this->x * 2.0f - this->y * this->y * 2.0f); } - void getEuler(TVec3 &rDest) const; + void getEuler(TVec3& rDest) const; void setEuler(T _x, T _y, T _z); void setEulerZ(T _z); - void setRotate(const TVec3 &, const TVec3 &, T); - void setRotate(const TVec3 &, const TVec3 &); + void setRotate(const TVec3&, const TVec3&, T); + void setRotate(const TVec3&, const TVec3&); - void setRotate(const TVec3 & pVec, f32 pAngle) { + void setRotate(const TVec3& pVec, f32 pAngle) { f32 halfAngle = pAngle * 0.5f; scale(sin(halfAngle), pVec); this->w = cos(halfAngle); } - - void rotate(TVec3f &rDest) const; - void slerp(const TQuat4 &a1, const TQuat4 &a2, T a3) { + void rotate(TVec3f& rDest) const; + + void slerp(const TQuat4& a1, const TQuat4& a2, T a3) { this->x = a1.x; this->y = a1.y; this->z = a1.z; @@ -78,15 +75,15 @@ namespace JGeometry { this->slerp(a2, a3); } - void slerp(const TQuat4 &, T); - void transform(const TVec3 &, TVec3 &rDest); - void transform(TVec3 &rDest); + void slerp(const TQuat4&, T); + void transform(const TVec3&, TVec3& rDest); + void transform(TVec3& rDest); /* Operators */ - TQuat4& operator=(const TQuat4 &rSrc); + TQuat4& operator=(const TQuat4& rSrc); T w; }; -}; +}; // namespace JGeometry typedef JGeometry::TQuat4 TQuat4f; diff --git a/libs/JSystem/include/JSystem/JGeometry/TUtil.hpp b/libs/JSystem/include/JSystem/JGeometry/TUtil.hpp index 0a58468d3..ee8e153d4 100644 --- a/libs/JSystem/include/JSystem/JGeometry/TUtil.hpp +++ b/libs/JSystem/include/JSystem/JGeometry/TUtil.hpp @@ -5,7 +5,7 @@ static f32 flt_80630CA0[0x408]; namespace JGeometry { - template + template class TUtil { public: static int epsilonEquals(T a1, T a2, T a3) { @@ -30,8 +30,7 @@ namespace JGeometry { } static f32 asin(f32 val) NO_INLINE { - - + if (val >= 1.0f) { return 1.5707964f; } @@ -54,4 +53,4 @@ namespace JGeometry { static T clamp(T, T, T); static T inv_sqrt(T); }; -}; +}; // namespace JGeometry diff --git a/libs/JSystem/include/JSystem/JGeometry/TVec.hpp b/libs/JSystem/include/JSystem/JGeometry/TVec.hpp index e5f908d39..ac78f8cdc 100644 --- a/libs/JSystem/include/JSystem/JGeometry/TVec.hpp +++ b/libs/JSystem/include/JSystem/JGeometry/TVec.hpp @@ -8,11 +8,10 @@ #include namespace JGeometry { - void negateInternal(const f32 *rSrc, f32 *rDest); + void negateInternal(const f32* rSrc, f32* rDest); - #ifdef __MWERKS__ - inline static void subInternal(register const f32 *vec1, register const f32 *vec2, register f32 *dst) - { +#ifdef __MWERKS__ + inline static void subInternal(register const f32* vec1, register const f32* vec2, register f32* dst) { register f32 xy2, z1, xy1, z2; __asm { psq_l xy1, 0(vec1), 0, 0 @@ -25,9 +24,9 @@ namespace JGeometry { psq_st z1, 8(dst), 1, 0 } } - #else - static void subInternal(const f32 *vec1, const f32 *vec2, f32 *dst) ; - #endif +#else + static void subInternal(const f32* vec1, const f32* vec2, f32* dst); +#endif template struct TVec2 { @@ -36,44 +35,43 @@ namespace JGeometry { inline TVec2() {} template - TVec2(A _x, A _y) - { + TVec2(A _x, A _y) { x = _x; y = _y; } // inline - inline TVec2(const TVec2 &rSrc) { + inline TVec2(const TVec2& rSrc) { x = rSrc.x; y = rSrc.y; } /* General operations */ template - void set(const JGeometry::TVec2 &rSrc); + void set(const JGeometry::TVec2& rSrc); template void set(A _x, A _y); - void setMin(const TVec2 &); - void setMax(const TVec2 &); + void setMin(const TVec2&); + void setMax(const TVec2&); - void sub(const TVec2 &rOther); + void sub(const TVec2& rOther); T length() const { return JGeometry::TUtil::sqrt((x * x) + (y * y)); } - - T squared() const; - T squared(const TVec2 &) const; - T dot(const TVec2 &rOther) const; - T distance(const TVec2 &rOther) const; + + T squared() const; + T squared(const TVec2&) const; + T dot(const TVec2& rOther) const; + T distance(const TVec2& rOther) const; void zero(); /* Operators */ - TVec2& operator=(const TVec2 &rSrc); - TVec2& operator+(const TVec2 &rOther) const; - TVec2& operator-(const TVec2 &rOther) const; + TVec2& operator=(const TVec2& rSrc); + TVec2& operator+(const TVec2& rOther) const; + TVec2& operator-(const TVec2& rOther) const; TVec2& operator*(f32 scale) const; T x, y; @@ -105,7 +103,7 @@ namespace JGeometry { z = z_; } - template + template TVec3(J _x, J _y, J _z) { x = _x; y = _y; @@ -113,11 +111,10 @@ namespace JGeometry { } }; - __attribute__((always_inline)) - inline void setTVec3f(const f32* a, f32* b) { - #ifdef __MWERKS__ + __attribute__((always_inline)) inline void setTVec3f(const f32* a, f32* b) { +#ifdef __MWERKS__ const register f32* v_a = a; - register f32* v_b = b; + register f32* v_b = b; register f32 b_x; register f32 a_x; @@ -127,11 +124,12 @@ namespace JGeometry { lfs b_x, 8(v_a) psq_st a_x, 0(v_b), 0, 0 stfs b_x, 8(v_b) - }; - #endif + } + ; +#endif } - template<> + template <> struct TVec3 : public Vec { inline TVec3(const Vec& vec) NO_INLINE { @@ -139,29 +137,30 @@ namespace JGeometry { } //Used inlined and non-inlined? - TVec3(const TVec3 &vec) { + TVec3(const TVec3& vec) { const register Vec* v_a = &vec; - register Vec* v_b = this; - + register Vec* v_b = this; + register f32 b_x; register f32 a_x; - + asm { psq_l a_x, 0(v_a), 0, 0 lfs b_x, 8(v_a) psq_st a_x, 0(v_b), 0, 0 stfs b_x, 8(v_b) - }; + } + ; } // Can't be NO_INLINE (gets inlined in DiskGravity::DiskGravity()) - template + template TVec3(T _x, T _y, T _z) { x = _x; y = _y; z = _z; } - + TVec3(f32 xz, f32 _y) { x = xz; y = _y; @@ -179,38 +178,37 @@ namespace JGeometry { return *this; } - TVec3& operator-=(const TVec3 &op) NO_INLINE { + TVec3& operator-=(const TVec3& op) NO_INLINE { sub(op); return *this; } - TVec3 operator+(const TVec3 &op) const { + TVec3 operator+(const TVec3& op) const { TVec3 ret(*this); JMathInlineVEC::PSVECAdd(&ret, &op, &ret); return ret; } - TVec3& operator+=(const TVec3 &op); - + TVec3& operator+=(const TVec3& op); + // Needs to be part of TVec to schedule instructions correctly in CubeGravity // Also, this seems like it should be merged with operator+(), but then how is // it that sometimes operator+() gets inlined several times without operator+= getting // inlined while other times, operator+() doesn't get inlined, and other times yet, // both operator+() and operator+=() both get inlined? - TVec3 translate(const TVec3 &op) const - { + TVec3 translate(const TVec3& op) const { TVec3 ret(*this); ret += op; return ret; } // needed to match TVec stack access order in many places - TVec3 addOperatorInLine(const TVec3 &op) const { + TVec3 addOperatorInLine(const TVec3& op) const { TVec3 ret(*this); ret.add(op); return ret; } - void addInLine(const TVec3 &op) { + void addInLine(const TVec3& op) { JMathInlineVEC::PSVECAdd(this, &op, this); } @@ -221,7 +219,7 @@ namespace JGeometry { ret.z *= scalar; return ret; } - + TVec3& operator*=(f32); // Same reason to expect to merge as translate() @@ -240,7 +238,7 @@ namespace JGeometry { TVec3 operator-() const; - bool operator==(const TVec3 &) const; + bool operator==(const TVec3&) const; // This should probably be merged with operator-(), but ParallelGravity doesn't inline // operator-() despite only referencing it once. So if we can match that, the two functions @@ -250,8 +248,8 @@ namespace JGeometry { JMathInlineVEC::PSVECNegate(this, &ret); return ret; } - - TVec3 operator-(const TVec3 &op) const { + + TVec3 operator-(const TVec3& op) const { TVec3 ret(*this); JMathInlineVEC::PSVECSubtract(&ret, &op, &ret); return ret; @@ -271,7 +269,7 @@ namespace JGeometry { z = _z; } - template + template void set(int x, int y, int z); void set(f32 x_, f32 y_, f32 z_) { @@ -286,10 +284,9 @@ namespace JGeometry { z = val; } - #ifdef __MWERKS__ - inline void mulInternal(register const f32 *vec1, register const f32 *vec2, register f32 *dst) - { - +#ifdef __MWERKS__ + inline void mulInternal(register const f32* vec1, register const f32* vec2, register f32* dst) { + register f32 xy1, xy2, res; __asm { psq_l xy1, 0(vec1), 0, 0 @@ -298,18 +295,16 @@ namespace JGeometry { psq_st res, 0(dst), 0, 0 } dst[2] = vec1[2] * vec2[2]; - } - #else - void mulInternal(const f32 *vec1, const f32 *vec2, f32 *dst) ; - #endif +#else + void mulInternal(const f32* vec1, const f32* vec2, f32* dst); +#endif - - void mult(const Vec &src1, const Vec &src2, Vec &dest) { + void mult(const Vec& src1, const Vec& src2, Vec& dest) { mulInternal(&src1.x, &src2.x, &dest.x); } - template + template void setAll(f32); inline void mult(f32 val) { @@ -318,14 +313,14 @@ namespace JGeometry { z *= val; } - void sub(const TVec3 &b) NO_INLINE { + void sub(const TVec3& b) NO_INLINE { JMathInlineVEC::PSVECSubtract(this, &b, this); } - void sub(const TVec3 &, const TVec3 &); - + void sub(const TVec3&, const TVec3&); + //Required for multiple objects to match? - inline void multPS(TVec3&a, TVec3&b) { + inline void multPS(TVec3& a, TVec3& b) { mulInternal(&b.x, &a.x, &this->x); } @@ -340,47 +335,49 @@ namespace JGeometry { // Point gravity doesn't match if we use setPS inline void setPS2(const TVec3& rSrc) { const register Vec* v_a = &rSrc; - register Vec* v_b = this; - + register Vec* v_b = this; + register f32 b_x; register f32 a_x; - + asm { psq_l a_x, 0(v_a), 0, 0 lfs b_x, 8(v_a) psq_st a_x, 0(v_b), 0, 0 stfs b_x, 8(v_b) - }; + } + ; } inline void setPSZeroVec() { const register Vec* v_a = &gZeroVec; - register Vec* v_b = this; - + register Vec* v_b = this; + register f32 b_x; register f32 a_x; - + asm { psq_l a_x, 0(v_a), 0, 0 lfs b_x, 8(v_a) psq_st a_x, 0(v_b), 0, 0 stfs b_x, 8(v_b) - }; + } + ; } - void add(const TVec3 &b) NO_INLINE { + void add(const TVec3& b) NO_INLINE { JMathInlineVEC::PSVECAdd(this, &b, this); } - void add(const TVec3 &, const TVec3 &); - + void add(const TVec3&, const TVec3&); + f32 squareMag() const { return JMathInlineVEC::PSVECSquareMag(this); } - f32 dot(const TVec3 &) const; + f32 dot(const TVec3&) const; - bool epsilonEquals(const TVec3 &a1, f32 a2) const { + bool epsilonEquals(const TVec3& a1, f32 a2) const { bool ret = false; if (JGeometry::TUtil::epsilonEquals(x, a1.x, a2)) { if (JGeometry::TUtil::epsilonEquals(y, a1.y, a2)) { @@ -393,7 +390,7 @@ namespace JGeometry { return ret; } - inline void rejection(const TVec3 &rVec, const TVec3 &rNormal) { + inline void rejection(const TVec3& rVec, const TVec3& rNormal) { JMAVECScaleAdd(&rNormal, &rVec, this, -rNormal.dot(rVec)); } @@ -404,17 +401,17 @@ namespace JGeometry { } void scale(f32 scale); - void scale(f32, const TVec3 &); + void scale(f32, const TVec3&); void negate(); - f32 squared() const; - f32 squared(const TVec3 &) const; + f32 squared() const; + f32 squared(const TVec3&) const; void zero(); - + bool isZero() const { return squareMag() <= 0.0000038146973f; } - - f32 normalize(const TVec3 &rSrc) { + + f32 normalize(const TVec3& rSrc) { x = rSrc.x; y = rSrc.y; z = rSrc.z; @@ -422,10 +419,10 @@ namespace JGeometry { PSVECNormalize(this, this); return magnitude; } - + f32 setLength(f32 newlength) { f32 oldlength = squareMag(); - if(oldlength <= 0.0000038146973f){ + if (oldlength <= 0.0000038146973f) { return 0.0f; } f32 lengthinv = JGeometry::TUtil::inv_sqrt(oldlength); @@ -433,16 +430,16 @@ namespace JGeometry { return lengthinv * oldlength; }; - f32 setLength(const TVec3 &, f32); + f32 setLength(const TVec3&, f32); - f32 length() const { + f32 length() const { return PSVECMag(this); } template - void cubic(const TVec3 &, const TVec3 &, const TVec3 &, const TVec3 &, f32); + void cubic(const TVec3&, const TVec3&, const TVec3&, const TVec3&, f32); - f32 angle(const TVec3 &) const; + f32 angle(const TVec3&) const; }; template @@ -452,8 +449,7 @@ namespace JGeometry { inline TVec4() {} template - TVec4(A _x, A _y, A _z, A _h) - { + TVec4(A _x, A _y, A _z, A _h) { x = _x; y = _y; z = _z; @@ -462,11 +458,10 @@ namespace JGeometry { /* General operations */ template - void set(const JGeometry::TVec4 &); + void set(const JGeometry::TVec4&); template - void set(A _x, A _y, A _z, A _h) - { + void set(A _x, A _y, A _z, A _h) { x = _x; y = _y; z = _z; @@ -477,7 +472,7 @@ namespace JGeometry { T x, y, z, h; }; -}; // namespace JGeometry +}; // namespace JGeometry typedef JGeometry::TVec2 TVec2s; typedef JGeometry::TVec2 TVec2f; diff --git a/libs/JSystem/include/JSystem/JKernel/JKRAram.hpp b/libs/JSystem/include/JSystem/JKernel/JKRAram.hpp index 03988b2be..173b00753 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRAram.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRAram.hpp @@ -8,5 +8,5 @@ s32 JKRDecompExpandSize(u8*); class JKRAram { public: static void create(u32, u32, s32, s32, s32); - static void aramToMainRam(u32, u8*, u32, JKRExpandSwitch, u32, JKRHeap *, int, u32*); + static void aramToMainRam(u32, u8*, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*); }; diff --git a/libs/JSystem/include/JSystem/JKernel/JKRAramArchive.hpp b/libs/JSystem/include/JSystem/JKernel/JKRAramArchive.hpp index 63d63ae74..dbdbdd092 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRAramArchive.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRAramArchive.hpp @@ -7,14 +7,14 @@ public: JKRAramArchive(long, EMountDirection); virtual ~JKRAramArchive(); - virtual s32 getExpandedResSize(const void *) const; - virtual void *fetchResource(SDIFileEntry *, unsigned long *); - virtual void *fetchResource(void *, unsigned long, SDIFileEntry *, unsigned long *); + virtual s32 getExpandedResSize(const void*) const; + virtual void* fetchResource(SDIFileEntry*, unsigned long*); + virtual void* fetchResource(void*, unsigned long, SDIFileEntry*, unsigned long*); bool open(long); - void fetchResource_subroutine(unsigned long, unsigned long, unsigned char *, unsigned long, int); - void fetchResource_subroutine(unsigned long, unsigned long, JKRHeap *, int, unsigned char **); + void fetchResource_subroutine(unsigned long, unsigned long, unsigned char*, unsigned long, int); + void fetchResource_subroutine(unsigned long, unsigned long, JKRHeap*, int, unsigned char**); - void *_64; - void *_68; + void* _64; + void* _68; }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JKernel/JKRAramPiece.hpp b/libs/JSystem/include/JSystem/JKernel/JKRAramPiece.hpp index efdcb3e70..8bafe3e35 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRAramPiece.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRAramPiece.hpp @@ -5,11 +5,11 @@ class JKRAramBlock; class JKRAramPiece { public: - static void prepareCommand(int, unsigned long, unsigned long, unsigned long, JKRAramBlock *, void *(unsigned long)); - static void sendCommand(JKRAMCommand *); - static void orderAsync(int, unsigned long, unsigned long, unsigned long, JKRAramBlock *, void *(unsigned long)); - static void sync(JKRAMCommand *, int); - static void orderSync(int, unsigned long, unsigned long, unsigned long, JKRAramBlock *); + static void prepareCommand(int, unsigned long, unsigned long, unsigned long, JKRAramBlock*, void*(unsigned long)); + static void sendCommand(JKRAMCommand*); + static void orderAsync(int, unsigned long, unsigned long, unsigned long, JKRAramBlock*, void*(unsigned long)); + static void sync(JKRAMCommand*, int); + static void orderSync(int, unsigned long, unsigned long, unsigned long, JKRAramBlock*); static void doneDMA(unsigned long); - static void startDMA(JKRAMCommand *); + static void startDMA(JKRAMCommand*); }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JKernel/JKRArchive.hpp b/libs/JSystem/include/JSystem/JKernel/JKRArchive.hpp index 9bac2f4ac..f67f900e1 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRArchive.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRArchive.hpp @@ -43,125 +43,124 @@ public: }; struct RarcHeader { - u32 mMagic; // 0x0 - u32 mFileSize; // 0x4 - u32 mHeaderSize; // 0x8 - u32 mFileDataOffset; // 0xC - u32 mTotalDataSize; // 0x10 - u32 mMRamDataSize; // 0x14 - u32 mARamDataSize; // 0x18 + u32 mMagic; // 0x0 + u32 mFileSize; // 0x4 + u32 mHeaderSize; // 0x8 + u32 mFileDataOffset; // 0xC + u32 mTotalDataSize; // 0x10 + u32 mMRamDataSize; // 0x14 + u32 mARamDataSize; // 0x18 u32 _1C; }; struct RarcInfoBlock { - u32 mNrDirs; // 0x0 - u32 mDirOffset; // 0x4 - u32 mNrFiles; // 0x8 - u32 mFileOffset; // 0xC - u32 mStringTableSize; // 0x10 - u32 mStringTableOffset; // 0x14 - u16 mNextAvailableFileID; // 0x18 - u16 mFileIDIsIndex; // 0x1A + u32 mNrDirs; // 0x0 + u32 mDirOffset; // 0x4 + u32 mNrFiles; // 0x8 + u32 mFileOffset; // 0xC + u32 mStringTableSize; // 0x10 + u32 mStringTableOffset; // 0x14 + u16 mNextAvailableFileID; // 0x18 + u16 mFileIDIsIndex; // 0x1A u32 _1C; }; struct SDIFileEntry { - u16 mFileID; // 0x0 - u16 mHash; // 0x2 - u32 mFlag : 8; // 0x4 - u32 mNameOffset : 24; // 0x5 + u16 mFileID; // 0x0 + u16 mHash; // 0x2 + u32 mFlag : 8; // 0x4 + u32 mNameOffset : 24; // 0x5 union { - u32 mDataOffset; // 0x8 - u32 mDirIndex; // 0x8 + u32 mDataOffset; // 0x8 + u32 mDirIndex; // 0x8 }; union { - u32 mDataSize; // 0xC + u32 mDataSize; // 0xC }; - void *mFileData; // 0x10 + void* mFileData; // 0x10 }; struct SDIDirEntry { - u32 mID; // 0x0 - u32 mNameOffset; // 0x4 - u16 mHash; // 0x8 - u16 mNrFiles; // 0xA - u32 mFirstFileIndex; // 0xC + u32 mID; // 0x0 + u32 mNameOffset; // 0x4 + u16 mHash; // 0x8 + u16 mNrFiles; // 0xA + u32 mFirstFileIndex; // 0xC }; struct SDirEntry { - u8 mFileFlag; // 0x0 - u8 _1; - u16 mFileID; // 0x2 - char *mName; // 0x4 + u8 mFileFlag; // 0x0 + u8 _1; + u16 mFileID; // 0x2 + char* mName; // 0x4 }; class CArcName { public: inline CArcName() { - } - const char *store(const char *); - const char *store(const char *, char); + const char* store(const char*); + const char* store(const char*, char); - u16 mHash; // 0x0 - u16 mLength; // 0x2 - char mName[MAX_NAME_LENGTH + 1]; // 0x4 + u16 mHash; // 0x0 + u16 mLength; // 0x2 + char mName[MAX_NAME_LENGTH + 1]; // 0x4 }; JKRArchive(); JKRArchive(long, EMountMode); virtual ~JKRArchive(); - virtual bool becomeCurrent(const char *); - virtual void *getResource(const char *); - virtual void *getResource(unsigned long, const char *); - virtual u32 readResource(void *, unsigned long, const char *); - virtual u32 readResource(void *, unsigned long, unsigned long, const char *); - virtual void removeResourceAll(); - virtual bool removeResource(void *); - virtual bool detachResource(void *); - virtual s32 getResSize(const void *) const; - virtual s32 countFile(const char *) const; - JKRArcFinder *getFirstFile(const char *) const; - virtual s32 getExpandedResSize(const void *) const; - virtual void *fetchResource(SDIFileEntry *, unsigned long *) = 0; - virtual void *fetchResource(void *, unsigned long, SDIFileEntry *, unsigned long *) = 0; - virtual void setExpandSize(SDIFileEntry *, unsigned long); - virtual u32 getExpandSize(SDIFileEntry *) const; + virtual bool becomeCurrent(const char*); + virtual void* getResource(const char*); + virtual void* getResource(unsigned long, const char*); + virtual u32 readResource(void*, unsigned long, const char*); + virtual u32 readResource(void*, unsigned long, unsigned long, const char*); + virtual void removeResourceAll(); + virtual bool removeResource(void*); + virtual bool detachResource(void*); + virtual s32 getResSize(const void*) const; + virtual s32 countFile(const char*) const; + JKRArcFinder* getFirstFile(const char*) const; + virtual s32 getExpandedResSize(const void*) const; + virtual void* fetchResource(SDIFileEntry*, unsigned long*) = 0; + virtual void* fetchResource(void*, unsigned long, SDIFileEntry*, unsigned long*) = 0; + virtual void setExpandSize(SDIFileEntry*, unsigned long); + virtual u32 getExpandSize(SDIFileEntry*) const; - static JKRArchive *check_mount_already(long); - static JKRArchive *check_mount_already(long, JKRHeap *); - static void mount(const char *, EMountMode, JKRHeap *, EMountDirection); - static JKRArchive *mount(long, EMountMode, JKRHeap *, EMountDirection); - bool getDirEntry(SDirEntry *, unsigned long) const; - void *getIdxResource(unsigned long); - void *getResource(unsigned short); - u32 readResource(void *, unsigned long, unsigned short); - u32 countResource() const; - u32 getFileAttribute(unsigned long) const; - bool isSameName(CArcName &, unsigned long, unsigned short) const; - SDIDirEntry *findResType(unsigned long) const; - SDIDirEntry *findDirectory(const char *, unsigned long) const; - SDIFileEntry *findTypeResource(unsigned long, const char *) const; - SDIFileEntry *findFsResource(const char *, unsigned long) const; - SDIFileEntry *findIdxResource(unsigned long) const; - SDIFileEntry *findNameResource(const char *) const; - SDIFileEntry *findPtrResource(const void *) const; - SDIFileEntry *findIdResource(unsigned short) const; + static JKRArchive* check_mount_already(long); + static JKRArchive* check_mount_already(long, JKRHeap*); + static void mount(const char*, EMountMode, JKRHeap*, EMountDirection); + static JKRArchive* mount(long, EMountMode, JKRHeap*, EMountDirection); + bool getDirEntry(SDirEntry*, unsigned long) const; + void* getIdxResource(unsigned long); + void* getResource(unsigned short); + u32 readResource(void*, unsigned long, unsigned short); + u32 countResource() const; + u32 getFileAttribute(unsigned long) const; + bool isSameName(CArcName&, unsigned long, unsigned short) const; + SDIDirEntry* findResType(unsigned long) const; + SDIDirEntry* findDirectory(const char*, unsigned long) const; + SDIFileEntry* findTypeResource(unsigned long, const char*) const; + SDIFileEntry* findFsResource(const char*, unsigned long) const; + SDIFileEntry* findIdxResource(unsigned long) const; + SDIFileEntry* findNameResource(const char*) const; + SDIFileEntry* findPtrResource(const void*) const; + SDIFileEntry* findIdResource(unsigned short) const; static u32 sCurrentDirIndex; // 0x806B7148 - JKRHeap *mHeap; // 0x38 - u8 mMountMode; // 0x3C - u8 _3D[3]; - s32 mEntryNum; // 0x40 - RarcInfoBlock *mInfoBlock; // 0x44 - SDIDirEntry *mDirs; // 0x48 - SDIFileEntry *mFiles; // 0x4C - u32 *mExpandSizes; // 0x50 - char *mStringTable; // 0x54 - u32 _58; - s32 _5C; - u32 mMountDir; // 0x60 + JKRHeap* mHeap; // 0x38 + u8 mMountMode; // 0x3C + u8 _3D[3]; + s32 mEntryNum; // 0x40 + RarcInfoBlock* mInfoBlock; // 0x44 + SDIDirEntry* mDirs; // 0x48 + SDIFileEntry* mFiles; // 0x4C + u32* mExpandSizes; // 0x50 + char* mStringTable; // 0x54 + u32 _58; + s32 _5C; + u32 mMountDir; // 0x60 }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JKernel/JKRCompArchive.hpp b/libs/JSystem/include/JSystem/JKernel/JKRCompArchive.hpp index 209b31a0b..2b8051729 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRCompArchive.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRCompArchive.hpp @@ -7,11 +7,11 @@ public: JKRCompArchive(long, EMountDirection); virtual ~JKRCompArchive(void); - virtual void removeResourceAll(); - virtual bool removeResource(void *); - virtual s32 getExpandedResSize(const void *) const; - virtual void *fetchResource(SDIFileEntry *, unsigned long *); - virtual void *fetchResource(void *, unsigned long, SDIFileEntry *, unsigned long *); + virtual void removeResourceAll(); + virtual bool removeResource(void*); + virtual s32 getExpandedResSize(const void*) const; + virtual void* fetchResource(SDIFileEntry*, unsigned long*); + virtual void* fetchResource(void*, unsigned long, SDIFileEntry*, unsigned long*); void open(long); diff --git a/libs/JSystem/include/JSystem/JKernel/JKRDecomp.hpp b/libs/JSystem/include/JSystem/JKernel/JKRDecomp.hpp index cfb7cc8ce..aa0ea78e2 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRDecomp.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRDecomp.hpp @@ -15,18 +15,18 @@ class JKRDecompCommand { public: JKRDecompCommand(); - u8 _0[4]; - u8 *mSrc; // 0x4 - u8 *mDst; // 0x8 - u32 mCompressedSize; // 0xC - u32 mDecompressedSize; // 0x10 + u8 _0[4]; + u8* mSrc; // 0x4 + u8* mDst; // 0x8 + u32 mCompressedSize; // 0xC + u32 mDecompressedSize; // 0x10 void (*_14)(u32); - JKRDecompCommand *mThis; // 0x18 - OSMessageQueue *_1C; - s32 _20; - JKRAMCommand *mAmCommand; // 0x24 - OSMessageQueue mMessageQueue; // 0x28 - OSMessage mMessage; // 0x48 + JKRDecompCommand* mThis; // 0x18 + OSMessageQueue* _1C; + s32 _20; + JKRAMCommand* mAmCommand; // 0x24 + OSMessageQueue mMessageQueue; // 0x28 + OSMessage mMessage; // 0x48 }; class JKRDecomp : public JKRThread { @@ -35,14 +35,14 @@ public: virtual ~JKRDecomp(); virtual s32 run(); - - static JKRDecomp *create(long); - static JKRDecompCommand *prepareCommand(unsigned char *, unsigned char *, unsigned long, unsigned long, void (*)(unsigned long)); - static void sendCommand(JKRDecompCommand *); - static bool sync(JKRDecompCommand *, int); - static bool orderSync(unsigned char *, unsigned char *, unsigned long, unsigned long); - static void decode(unsigned char *, unsigned char *, unsigned long, unsigned long); - static void decodeSZP(unsigned char *, unsigned char *, unsigned long, unsigned long); - static void decodeSZS(u8 *, u8 *, u32, u32); - static EJKRCompression checkCompressed(unsigned char *); + + static JKRDecomp* create(long); + static JKRDecompCommand* prepareCommand(unsigned char*, unsigned char*, unsigned long, unsigned long, void (*)(unsigned long)); + static void sendCommand(JKRDecompCommand*); + static bool sync(JKRDecompCommand*, int); + static bool orderSync(unsigned char*, unsigned char*, unsigned long, unsigned long); + static void decode(unsigned char*, unsigned char*, unsigned long, unsigned long); + static void decodeSZP(unsigned char*, unsigned char*, unsigned long, unsigned long); + static void decodeSZS(u8*, u8*, u32, u32); + static EJKRCompression checkCompressed(unsigned char*); }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JKernel/JKRDisposer.hpp b/libs/JSystem/include/JSystem/JKernel/JKRDisposer.hpp index b39f621b1..c445ef229 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRDisposer.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRDisposer.hpp @@ -9,6 +9,6 @@ public: JKRDisposer(); virtual ~JKRDisposer(); - JKRHeap *mHeap; // 0x4 - JSULink mLink; // 0x8 + JKRHeap* mHeap; // 0x4 + JSULink mLink; // 0x8 }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JKernel/JKRDvdArchive.hpp b/libs/JSystem/include/JSystem/JKernel/JKRDvdArchive.hpp index 84375b307..815e53da6 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRDvdArchive.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRDvdArchive.hpp @@ -7,14 +7,14 @@ public: JKRDvdArchive(long, EMountDirection); virtual ~JKRDvdArchive(); - virtual s32 getExpandedResSize(const void *) const; - virtual void *fetchResource(SDIFileEntry *, unsigned long *); - virtual void *fetchResource(void *, unsigned long, SDIFileEntry *, unsigned long *); + virtual s32 getExpandedResSize(const void*) const; + virtual void* fetchResource(SDIFileEntry*, unsigned long*); + virtual void* fetchResource(void*, unsigned long, SDIFileEntry*, unsigned long*); bool open(long); - void fetchResource_subroutine(long, unsigned long, unsigned long, unsigned char *, unsigned long, int, int); - void fetchResource_subroutine(long, unsigned long, unsigned long, JKRHeap *, int, int, unsigned char **); + void fetchResource_subroutine(long, unsigned long, unsigned long, unsigned char*, unsigned long, int, int); + void fetchResource_subroutine(long, unsigned long, unsigned long, JKRHeap*, int, int, unsigned char**); - u8 _64[4]; - void *_68; + u8 _64[4]; + void* _68; }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JKernel/JKRDvdRipper.hpp b/libs/JSystem/include/JSystem/JKernel/JKRDvdRipper.hpp index 5ec5a8145..f708a0db2 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRDvdRipper.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRDvdRipper.hpp @@ -15,10 +15,10 @@ public: ALLOC_DIRECTION_1 = 1, ALLOC_DIRECTION_2 = 2 }; - - static u8 *loadToMainRAM(const char *, unsigned char *, JKRExpandSwitch, unsigned long, JKRHeap *, EAllocDirection, unsigned long, int *, unsigned long *); - static u8 *loadToMainRAM(long, unsigned char *, JKRExpandSwitch, unsigned long, JKRHeap *, EAllocDirection, unsigned long, int *, unsigned long *); - static u8 *loadToMainRAM(JKRDvdFile *, unsigned char *, JKRExpandSwitch, unsigned long, JKRHeap *, EAllocDirection, unsigned long, int *, unsigned long *); + + static u8* loadToMainRAM(const char*, unsigned char*, JKRExpandSwitch, unsigned long, JKRHeap*, EAllocDirection, unsigned long, int*, unsigned long*); + static u8* loadToMainRAM(long, unsigned char*, JKRExpandSwitch, unsigned long, JKRHeap*, EAllocDirection, unsigned long, int*, unsigned long*); + static u8* loadToMainRAM(JKRDvdFile*, unsigned char*, JKRExpandSwitch, unsigned long, JKRHeap*, EAllocDirection, unsigned long, int*, unsigned long*); static void isErrorRetry(); }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JKernel/JKRExpHeap.hpp b/libs/JSystem/include/JSystem/JKernel/JKRExpHeap.hpp index d0a285190..04402bd19 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRExpHeap.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRExpHeap.hpp @@ -4,72 +4,70 @@ class JKRExpHeap : public JKRHeap { public: - class CMemBlock { public: + void initiate(CMemBlock*, CMemBlock*, u32, u8, u8); + CMemBlock* allocFore(u32, u8, u8, u8, u8); + CMemBlock* allocBack(u32, u8, u8, u8, u8); + static CMemBlock* getHeapBlock(void*); - void initiate(CMemBlock *, CMemBlock *, u32, u8, u8); - CMemBlock* allocFore(u32, u8, u8, u8, u8); - CMemBlock* allocBack(u32, u8, u8, u8, u8); - static CMemBlock* getHeapBlock(void *); - - void* getContent() const { - return (void*)(this + 1); + void* getContent() const { + return (void*)(this + 1); } - u16 mMagic; // 0x0 - u8 mFlags; // 0x2 - u8 mGroupId; // 0x3 - u32 mSize; // 0x4 - CMemBlock* mPrev; // 0x8 - CMemBlock* mNext; // 0xC + u16 mMagic; // 0x0 + u8 mFlags; // 0x2 + u8 mGroupId; // 0x3 + u32 mSize; // 0x4 + CMemBlock* mPrev; // 0x8 + CMemBlock* mNext; // 0xC }; - JKRExpHeap(void *, u32, JKRHeap *, bool); + JKRExpHeap(void*, u32, JKRHeap*, bool); virtual ~JKRExpHeap(); - virtual u32 getHeapType(); - virtual bool check(); - virtual bool dump_sort(); - virtual bool dump(); - virtual void do_destroy(); + virtual u32 getHeapType(); + virtual bool check(); + virtual bool dump_sort(); + virtual bool dump(); + virtual void do_destroy(); virtual void* do_alloc(u32, int); - virtual void do_free(void *); - virtual void do_freeAll(); - virtual void do_freeTail(); - virtual void do_fillFreeArea(); - virtual s32 do_resize(void *, u32); - virtual s32 do_getSize(void *); - virtual s32 do_getFreeSize(); + virtual void do_free(void*); + virtual void do_freeAll(); + virtual void do_freeTail(); + virtual void do_fillFreeArea(); + virtual s32 do_resize(void*, u32); + virtual s32 do_getSize(void*); + virtual s32 do_getFreeSize(); virtual void* do_getMaxFreeBlock(); - virtual s32 do_getTotalFreeSize(); - virtual s32 do_changeGroupID(u8); - virtual u8 do_getCurrentGroupId(); - virtual void state_register(TState *, u32) const; - virtual bool state_compare(const TState &, const TState &) const; + virtual s32 do_getTotalFreeSize(); + virtual s32 do_changeGroupID(u8); + virtual u8 do_getCurrentGroupId(); + virtual void state_register(TState*, u32) const; + virtual bool state_compare(const TState&, const TState&) const; void* allocFromHead(u32); void* allocFromHead(u32, int); void* allocFromTail(u32); void* allocFromTail(u32, int); - bool isEmpty(); + bool isEmpty(); - void appendUsedList(JKRExpHeap::CMemBlock *); - void setFreeBlock(CMemBlock *, CMemBlock *, CMemBlock *); - void removeFreeBlock(CMemBlock *); + void appendUsedList(JKRExpHeap::CMemBlock*); + void setFreeBlock(CMemBlock*, CMemBlock*, CMemBlock*); + void removeFreeBlock(CMemBlock*); - static JKRExpHeap* create(void *, u32, JKRHeap *, bool); - static JKRExpHeap* create(u32, JKRHeap *, bool); + static JKRExpHeap* create(void*, u32, JKRHeap*, bool); + static JKRExpHeap* create(u32, JKRHeap*, bool); static JKRExpHeap* createRoot(int, bool); - u8 mAllocMode; // 0x6C - u8 mCurrentGroupId; // 0x6D - u8 _6E; - void* _70; - u32 _74; - CMemBlock* mHeadFreeList; // 0x78 - CMemBlock* mTailFreeList; // 0x7C - CMemBlock* mHeadUsedList; // 0x80 - CMemBlock* mTailUsedList; // 0x84 + u8 mAllocMode; // 0x6C + u8 mCurrentGroupId; // 0x6D + u8 _6E; + void* _70; + u32 _74; + CMemBlock* mHeadFreeList; // 0x78 + CMemBlock* mTailFreeList; // 0x7C + CMemBlock* mHeadUsedList; // 0x80 + CMemBlock* mTailUsedList; // 0x84 }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JKernel/JKRFileFinder.hpp b/libs/JSystem/include/JSystem/JKernel/JKRFileFinder.hpp index b63f5da22..70d56df2e 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRFileFinder.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRFileFinder.hpp @@ -6,30 +6,30 @@ class JKRArchive; class JKRFileFinder { public: - char *mName; // 0x0 - s32 mDirIndex; // 0x4 - u16 mFileID; // 0x8 - u16 mFileFlag; // 0xA + char* mName; // 0x0 + s32 mDirIndex; // 0x4 + u16 mFileID; // 0x8 + u16 mFileFlag; // 0xA JKRFileFinder(); virtual ~JKRFileFinder(); virtual bool findNextFile() = 0; - bool mHasMoreFiles; // 0x10 - bool mFileIsFolder; // 0x11 - u8 _12[2]; + bool mHasMoreFiles; // 0x10 + bool mFileIsFolder; // 0x11 + u8 _12[2]; }; class JKRArcFinder : public JKRFileFinder { public: - JKRArcFinder(JKRArchive *, long, long); + JKRArcFinder(JKRArchive*, long, long); virtual ~JKRArcFinder(); virtual bool findNextFile(); - JKRArchive *mArchive; // 0x14 - s32 mFirstIndex; // 0x18 - s32 mLastIndex; // 0x1C - s32 mCurrentIndex; // 0x20 + JKRArchive* mArchive; // 0x14 + s32 mFirstIndex; // 0x18 + s32 mLastIndex; // 0x1C + s32 mCurrentIndex; // 0x20 }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JKernel/JKRFileLoader.hpp b/libs/JSystem/include/JSystem/JKernel/JKRFileLoader.hpp index 3617f0eca..8f1d51f39 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRFileLoader.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRFileLoader.hpp @@ -11,31 +11,31 @@ public: virtual void unmount(); - virtual bool becomeCurrent(const char *) = 0; - virtual void *getResource(const char *) = 0; - virtual void *getResource(unsigned long, const char *) = 0; - virtual u32 readResource(void *, unsigned long, const char *) = 0; - virtual u32 readResource(void *, unsigned long, unsigned long, const char *) = 0; - virtual void removeResourceAll() = 0; - virtual bool removeResource(void *) = 0; - virtual bool detachResource(void *) = 0; - virtual s32 getResSize(const void *) const = 0; - virtual s32 countFile(const char *) const = 0; - virtual JKRArcFinder *getFirstFile(const char *) const = 0; - virtual s32 getExpandedResSize(const void *) const = 0; + virtual bool becomeCurrent(const char*) = 0; + virtual void* getResource(const char*) = 0; + virtual void* getResource(unsigned long, const char*) = 0; + virtual u32 readResource(void*, unsigned long, const char*) = 0; + virtual u32 readResource(void*, unsigned long, unsigned long, const char*) = 0; + virtual void removeResourceAll() = 0; + virtual bool removeResource(void*) = 0; + virtual bool detachResource(void*) = 0; + virtual s32 getResSize(const void*) const = 0; + virtual s32 countFile(const char*) const = 0; + virtual JKRArcFinder* getFirstFile(const char*) const = 0; + virtual s32 getExpandedResSize(const void*) const = 0; - static void *getGlbResource(const char *, JKRFileLoader *); - static void initializeVolumeList(); - void prependVolumeList(JSULink *); - void removeVolumeList(JSULink *); + static void* getGlbResource(const char*, JKRFileLoader*); + static void initializeVolumeList(); + void prependVolumeList(JSULink*); + void removeVolumeList(JSULink*); - static JSUList sFileLoaderList; // 0x8060CF9C - static JKRFileLoader *gCurrentFileLoader; // 0x806B7140; + static JSUList sFileLoaderList; // 0x8060CF9C + static JKRFileLoader* gCurrentFileLoader; // 0x806B7140; JSULink mLoaderLink; // 0x18 - char *mLoaderName; // 0x28 - u32 mLoaderType; // 0x2C - bool mIsMounted; // 0x30 - u8 _31[3]; - u32 _34; + char* mLoaderName; // 0x28 + u32 mLoaderType; // 0x2C + bool mIsMounted; // 0x30 + u8 _31[3]; + u32 _34; }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JKernel/JKRHeap.hpp b/libs/JSystem/include/JSystem/JKernel/JKRHeap.hpp index 6dc8a0a6a..d19ef5654 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRHeap.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRHeap.hpp @@ -1,69 +1,67 @@ #pragma once -#include +#include #include "JSystem/JSupport/JSUList.hpp" #include "JSystem/JKernel/JKRDisposer.hpp" #include "Inline.hpp" typedef void (*JKRErrorHandler)(void*, u32, int); -void JKRDefaultMemoryErrorRoutine(void *, u32, int); +void JKRDefaultMemoryErrorRoutine(void*, u32, int); class JKRHeap : public JKRDisposer { public: - class TState { public: u32 _0; u32 _4; }; - JKRHeap(void *, u32, JKRHeap *, bool); + JKRHeap(void*, u32, JKRHeap*, bool); virtual ~JKRHeap(); - virtual void callAllDisposer(); - virtual u32 getHeapType() = 0; - virtual bool check() = 0; - virtual bool dump_sort(); - virtual bool dump() = 0; - virtual void do_destroy() = 0; + virtual void callAllDisposer(); + virtual u32 getHeapType() = 0; + virtual bool check() = 0; + virtual bool dump_sort(); + virtual bool dump() = 0; + virtual void do_destroy() = 0; virtual void* do_alloc(u32, int) = 0; - virtual void do_free(void *) = 0; - virtual void do_freeAll() = 0; - virtual void do_freeTail() = 0; - virtual void do_fillFreeArea() = 0; - virtual s32 do_resize(void *, u32) = 0; - virtual s32 do_getSize(void *) = 0; - virtual s32 do_getFreeSize() = 0; + virtual void do_free(void*) = 0; + virtual void do_freeAll() = 0; + virtual void do_freeTail() = 0; + virtual void do_fillFreeArea() = 0; + virtual s32 do_resize(void*, u32) = 0; + virtual s32 do_getSize(void*) = 0; + virtual s32 do_getFreeSize() = 0; virtual void* do_getMaxFreeBlock() = 0; - virtual s32 do_getTotalFreeSize() = 0; - virtual s32 do_changeGroupID(u8); - virtual u8 do_getCurrentGroupId(); - virtual void state_register(TState *, u32) const; - virtual bool state_compare(const TState &, const TState &) const; - virtual void state_dump(const TState &) const; + virtual s32 do_getTotalFreeSize() = 0; + virtual s32 do_changeGroupID(u8); + virtual u8 do_getCurrentGroupId(); + virtual void state_register(TState*, u32) const; + virtual bool state_compare(const TState&, const TState&) const; + virtual void state_dump(const TState&) const; - void* alloc(u32, int); - JKRHeap* becomeSystemHeap(); - JKRHeap* becomeCurrentHeap(); - bool dispose(void *, u32); - void dispose(void *, void *); - void dispose(); - static void copyMemory(void *, void *, u32); + void* alloc(u32, int); + JKRHeap* becomeSystemHeap(); + JKRHeap* becomeCurrentHeap(); + bool dispose(void*, u32); + void dispose(void*, void*); + void dispose(); + static void copyMemory(void*, void*, u32); static JKRErrorHandler setErrorHandler(JKRErrorHandler); - - void freeAll(); - void freeTail(); - s32 resize(void *, u32); - s32 getFreeSize(); + void freeAll(); + void freeTail(); + s32 resize(void*, u32); + s32 getFreeSize(); void* getMaxFreeBlock(); - void free(void *); + void free(void*); - JKRHeap* find(void *) const; - JKRHeap* findAllHeap(void *) const; - void dispose_subroutine(u32, u32); - s32 getTotalFreeSize(); + JKRHeap* find(void*) const; + JKRHeap* findAllHeap(void*) const; + void dispose_subroutine(u32, u32); + s32 getTotalFreeSize(); u32 getMaxAllocatableSize(int a1) NO_INLINE { u32 v4 = (u32)getMaxFreeBlock(); @@ -78,22 +76,21 @@ public: return mEnd; } - static JKRHeap* findFromRoot(void *); + static JKRHeap* findFromRoot(void*); + static void* alloc(u32, int, JKRHeap*); + static void free(void*, JKRHeap*) NO_INLINE; - static void* alloc(u32, int, JKRHeap *); - static void free(void *, JKRHeap *) NO_INLINE; - - static void destroy(JKRHeap *); + static void destroy(JKRHeap*); static void setAltAramStartAdr(u32); - static u32 getAltAramStartAdr(); + static u32 getAltAramStartAdr(); - static bool initArena(char **, u32 *, int); + static bool initArena(char**, u32*, int); - static JKRHeap* sGameHeap; // 0x806B70A8 + static JKRHeap* sGameHeap; // 0x806B70A8 static JKRHeap* sCurrentHeap; // 0x806B70AC - static JKRHeap* sRootHeap; // 0x806B70B0 + static JKRHeap* sRootHeap; // 0x806B70B0 static JKRHeap* sSystemHeap; static JKRErrorHandler mErrorHandler; @@ -102,7 +99,7 @@ public: static void* mCodeEnd; static void* mUserRamStart; static void* mUserRamEnd; - static u32 mMemorySize; + static u32 mMemorySize; static u32 ARALT_AramStartAddr; @@ -114,27 +111,27 @@ public: return (void*)mEnd; } - OSMutex mMutex; // 0x18 - u8* mStart; // 0x30 - u8* mEnd; // 0x34 - u32 mSize; // 0x38 - u8 _3C; - u8 _3D; - u8 _3E; - u8 _3F; - JSUTree mChildTree; // 0x40 + OSMutex mMutex; // 0x18 + u8* mStart; // 0x30 + u8* mEnd; // 0x34 + u32 mSize; // 0x38 + u8 _3C; + u8 _3D; + u8 _3E; + u8 _3F; + JSUTree mChildTree; // 0x40 JSUList mDisposerList; // 0x5C - bool mErrorFlag; // 0x68 - u8 _69; - u8 _6A; - u8 _6B; + bool mErrorFlag; // 0x68 + u8 _69; + u8 _6A; + u8 _6B; }; #ifdef __MWERKS__ void* operator new(u32, int); -void* operator new(u32, JKRHeap *); -void* operator new(u32, JKRHeap *, int); +void* operator new(u32, JKRHeap*); +void* operator new(u32, JKRHeap*, int); void* operator new[](u32, int); -void* operator new[](u32, JKRHeap *, int); +void* operator new[](u32, JKRHeap*, int); #endif diff --git a/libs/JSystem/include/JSystem/JKernel/JKRMemArchive.hpp b/libs/JSystem/include/JSystem/JKernel/JKRMemArchive.hpp index f442bf36e..d9c8048b8 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRMemArchive.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRMemArchive.hpp @@ -13,20 +13,20 @@ public: JKRMemArchive(long, EMountDirection); virtual ~JKRMemArchive(); - virtual void removeResourceAll(); - virtual bool removeResource(void *); - virtual s32 getExpandedResSize(const void *) const; - virtual void *fetchResource(SDIFileEntry *, unsigned long *); - virtual void *fetchResource(void *, unsigned long, SDIFileEntry *, unsigned long *); + virtual void removeResourceAll(); + virtual bool removeResource(void*); + virtual s32 getExpandedResSize(const void*) const; + virtual void* fetchResource(SDIFileEntry*, unsigned long*); + virtual void* fetchResource(void*, unsigned long, SDIFileEntry*, unsigned long*); - void fixedInit(long); - bool mountFixed(void *, JKRMemBreakFlag); - bool open(long, EMountDirection); - bool open(void *, unsigned long, JKRMemBreakFlag); - static s32 fetchResource_subroutine(unsigned char *, unsigned long, unsigned char *, unsigned long, int); + void fixedInit(long); + bool mountFixed(void*, JKRMemBreakFlag); + bool open(long, EMountDirection); + bool open(void*, unsigned long, JKRMemBreakFlag); + static s32 fetchResource_subroutine(unsigned char*, unsigned long, unsigned char*, unsigned long, int); - RarcHeader *mHeader; // 0x64 - u8 *mFileDataStart; // 0x68 - bool _6C; - u8 _6D[3]; + RarcHeader* mHeader; // 0x64 + u8* mFileDataStart; // 0x68 + bool _6C; + u8 _6D[3]; }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JKernel/JKRSolidHeap.hpp b/libs/JSystem/include/JSystem/JKernel/JKRSolidHeap.hpp index 41e524e56..81a4609c5 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRSolidHeap.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRSolidHeap.hpp @@ -4,8 +4,7 @@ class JKRSolidHeap : public JKRHeap { public: - - static JKRSolidHeap* create(u32, JKRHeap *, bool); + static JKRSolidHeap* create(u32, JKRHeap*, bool); u32 _6C; u32 _70; diff --git a/libs/JSystem/include/JSystem/JKernel/JKRThread.hpp b/libs/JSystem/include/JSystem/JKernel/JKRThread.hpp index 031c5d608..d20c1151d 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRThread.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRThread.hpp @@ -10,14 +10,13 @@ public: class JKRThread : public JKRDisposer { public: - class TLoad { public: TLoad(); void clear(); - u8 _0; + u8 _0; u32 _4; u32 _8; u32 _C; @@ -29,29 +28,29 @@ public: virtual ~JKRThread(); virtual s32 run(); - void setCommon_mesgQueue(JKRHeap *, int); - void setCommon_heapSpecified(JKRHeap *, u32, int); - s32 start(void *); + void setCommon_mesgQueue(JKRHeap*, int); + void setCommon_heapSpecified(JKRHeap*, u32, int); + s32 start(void*); - static JKRThread* searchThread(OSThread *); + static JKRThread* searchThread(OSThread*); - JSULink mDisposerList; // 0x18 - JKRHeap* _28; - OSThread* mThread; // 0x2C - OSMessageQueue mQueue; // 0x30 - OSMessage* mMessage; // 0x50 - s32 mMsgCount; // 0x54 - void* _58; - void* _5C; - JKRThread::TLoad _60; - u32 _74; - void* _78; + JSULink mDisposerList; // 0x18 + JKRHeap* _28; + OSThread* mThread; // 0x2C + OSMessageQueue mQueue; // 0x30 + OSMessage* mMessage; // 0x50 + s32 mMsgCount; // 0x54 + void* _58; + void* _5C; + JKRThread::TLoad _60; + u32 _74; + void* _78; static JSUList sThreadList; - static JSUList sTaskList; + static JSUList sTaskList; }; class JKRThreadSwitch { public: - JKRThread* enter(JKRThread *, int); + JKRThread* enter(JKRThread*, int); }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JKernel/JKRUnitHeap.hpp b/libs/JSystem/include/JSystem/JKernel/JKRUnitHeap.hpp index 5e4f42bd6..1d9f453cc 100644 --- a/libs/JSystem/include/JSystem/JKernel/JKRUnitHeap.hpp +++ b/libs/JSystem/include/JSystem/JKernel/JKRUnitHeap.hpp @@ -4,6 +4,5 @@ class JKRUnitHeap : public JKRHeap { public: - - static JKRUnitHeap* create(u32, u32, u32, JKRHeap *, bool); + static JKRUnitHeap* create(u32, u32, u32, JKRHeap*, bool); }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JMath/JMATrigonometric.hpp b/libs/JSystem/include/JSystem/JMath/JMATrigonometric.hpp index 8a17e3a27..118c83a0c 100644 --- a/libs/JSystem/include/JSystem/JMath/JMATrigonometric.hpp +++ b/libs/JSystem/include/JSystem/JMath/JMATrigonometric.hpp @@ -8,43 +8,44 @@ namespace std { struct pair { A1 a1; B1 b1; - pair() - { + pair() { a1 = A1(); b1 = B1(); } }; -} // namespace std +} // namespace std namespace JMath { template class TSinCosTable { public: - static const u32 LEN = 1 << Bits; + static const u32 LEN = 1 << Bits; std::pair table[LEN]; - f32 sinShort(s8 v) const { return table[static_cast(v) >> 3].a1; } - f32 cosShort(s8 v) const { return table[static_cast(v) >> 3].b1; } + f32 sinShort(s8 v) const { + return table[static_cast(v) >> 3].a1; + } + f32 cosShort(s8 v) const { + return table[static_cast(v) >> 3].b1; + } - inline f32 sinLapRad(f32 v) - { + inline f32 sinLapRad(f32 v) { if (v < 0.0f) { f32 tmp = v * (-LEN / TWO_PI); return -table[(u16)tmp & LEN - 1].a1; - } - else { + } else { f32 tmp = v * (LEN / TWO_PI); return table[(u16)tmp & LEN - 1].a1; } } inline f32 cosLapRad(f32 v) { - if(v < 0.0f) { + if (v < 0.0f) { v = -v; } - + v *= (LEN / TWO_PI); - return table[(u16)v & LEN - 1].b1; + return table[(u16)v & LEN - 1].b1; } inline f32 cosLap(f32 v) { @@ -53,11 +54,13 @@ namespace JMath { } // 45.511112f == LEN / TWO_PI * PI / 180 v = 45.511112f * v; - + + return table[(u16)v & LEN - 1].b1; + } + + inline f32 get(f32 v) { return table[(u16)v & LEN - 1].b1; } - - inline f32 get(f32 v) { return table[(u16)v & LEN - 1].b1; } }; template @@ -83,17 +86,15 @@ namespace JMath { T _1000; }; - static TSinCosTable<14, f32> sSinCosTable; - static TAtanTable<1024, f32> sAtanTable; + static TSinCosTable<14, f32> sSinCosTable; + static TAtanTable<1024, f32> sAtanTable; static TAsinAcosTable<1024, f32> sAsinAcosTable; -}; // namespace JMath +}; // namespace JMath -inline f32 JMASSin(u16 s) -{ +inline f32 JMASSin(u16 s) { return JMath::sSinCosTable.sinShort(s); } -inline f32 JMASCos(u16 s) -{ +inline f32 JMASCos(u16 s) { return JMath::sSinCosTable.cosShort(s); } diff --git a/libs/JSystem/include/JSystem/JMath/JMath.hpp b/libs/JSystem/include/JSystem/JMath/JMath.hpp index 9736fd729..a590f50e2 100644 --- a/libs/JSystem/include/JSystem/JMath/JMath.hpp +++ b/libs/JSystem/include/JSystem/JMath/JMath.hpp @@ -2,30 +2,29 @@ #include -f32 JMAAcosRadian(f32); -f32 JMAAsinRadian(f32); -f32 JMACosDegree(f32); -f32 JMACosRadian(f32); -f32 JMASinDegree(f32); -f32 JMASinRadian(f32); -void JMAVECLerp(const Vec *, const Vec *, Vec *, f32); -void JMAVECScaleAdd(const Vec *, const Vec *, Vec *, f32); +f32 JMAAcosRadian(f32); +f32 JMAAsinRadian(f32); +f32 JMACosDegree(f32); +f32 JMACosRadian(f32); +f32 JMASinDegree(f32); +f32 JMASinRadian(f32); +void JMAVECLerp(const Vec*, const Vec*, Vec*, f32); +void JMAVECScaleAdd(const Vec*, const Vec*, Vec*, f32); namespace JMath { f32 fastReciprocal(f32); - template + template f32 fastSqrt(T); - void gekko_ps_copy12(void *, const void *); - void gekko_ps_copy16(void *, const void *); -}; + void gekko_ps_copy12(void*, const void*); + void gekko_ps_copy16(void*, const void*); +}; // namespace JMath namespace JMathInlineVEC { - #ifdef __MWERKS__ +#ifdef __MWERKS__ - __attribute__((always_inline)) - inline void PSVECCopy(register const Vec *src, register Vec *dest) { + __attribute__((always_inline)) inline void PSVECCopy(register const Vec* src, register Vec* dest) { register f32 xy, z; __asm { lfs z, 8(src) @@ -35,11 +34,9 @@ namespace JMathInlineVEC { } } - __attribute__((always_inline)) - inline void PSVECAdd(register const Vec* vec1, register const Vec* vec2, register Vec* dst) - { + __attribute__((always_inline)) inline void PSVECAdd(register const Vec* vec1, register const Vec* vec2, register Vec* dst) { register f32 v1xy, v2xy, d1xy, d1z, v1z, v2z; - + __asm { psq_l v1xy, 0(vec1), 0, 0 psq_l v2xy, 0(vec2), 0, 0 @@ -53,11 +50,9 @@ namespace JMathInlineVEC { } } - __attribute__((always_inline)) - inline void PSVECAdd2(register const Vec* vec1, register const Vec* vec2, register Vec* dst) - { + __attribute__((always_inline)) inline void PSVECAdd2(register const Vec* vec1, register const Vec* vec2, register Vec* dst) { register f32 v2z, d1z, v1z, v2xy, v1xy, d1xy; - + __asm { psq_l v1xy, 0(vec1), 0, 0 psq_l v2xy, 0(vec2), 0, 0 @@ -70,8 +65,7 @@ namespace JMathInlineVEC { } } - __attribute__((always_inline)) - inline void PSVECSubtract(register const Vec* vec1, register const Vec* vec2, register Vec* dst) { + __attribute__((always_inline)) inline void PSVECSubtract(register const Vec* vec1, register const Vec* vec2, register Vec* dst) { register f32 v1xy, v2xy, dxy, v1z, v2z, dz; __asm { psq_l v1xy, 0(vec1), 0, 0 @@ -82,12 +76,11 @@ namespace JMathInlineVEC { psq_l v1z, 8(vec1), 1, 0 psq_l v2z, 8(vec2), 1, 0 ps_sub dz, v1z, v2z - psq_st dz, 8(dst), 1, 0 + psq_st dz, 8(dst), 1, 0 } } - __attribute__((always_inline)) - inline void PSVECSubtract2(register const Vec* vec1, register const Vec* vec2, register Vec* dst) { + __attribute__((always_inline)) inline void PSVECSubtract2(register const Vec* vec1, register const Vec* vec2, register Vec* dst) { register f32 v1xy, v2xy, v1z, v2z, dxy, dz; __asm { psq_l v2xy, 0(vec1), 0, 0 @@ -98,12 +91,11 @@ namespace JMathInlineVEC { psq_l v2z, 8(vec1), 1, 0 psq_l v1z, 8(vec2), 1, 0 ps_sub dz, v2z, v1z - psq_st dz, 8(dst), 1, 0 + psq_st dz, 8(dst), 1, 0 } } - - __attribute__((always_inline)) - inline void PSVECMultiply(register const Vec* vec1, register const Vec* vec2, register Vec* dst) { + + __attribute__((always_inline)) inline void PSVECMultiply(register const Vec* vec1, register const Vec* vec2, register Vec* dst) { register f32 v1xy, v2xy, dxy, v1z, v2z, dz; __asm { psq_l v1xy, 0(vec1), 0, 0 @@ -117,23 +109,19 @@ namespace JMathInlineVEC { } } - __attribute__((always_inline)) - inline f32 PSVECSquareMag(register const Vec* src) - { + __attribute__((always_inline)) inline f32 PSVECSquareMag(register const Vec* src) { register f32 xy, z, ret; __asm { psq_l xy, 0(src), 0, 0 ps_mul xy, xy, xy lfs z, 8(src) ps_madd ret, z, z, xy - ps_sum0 ret, ret, xy, xy + ps_sum0 ret, ret, xy, xy } return ret; } - __attribute__((always_inline)) - inline void PSVECNegate(register const Vec* src, register Vec* dst) - { + __attribute__((always_inline)) inline void PSVECNegate(register const Vec* src, register Vec* dst) { register f32 xy; __asm { psq_l xy, 0(src), 0, 0 @@ -142,11 +130,9 @@ namespace JMathInlineVEC { } dst->z = -src->z; } - - __attribute__((always_inline)) - inline f32 PSVECSquareDistance(const register Vec *a, const register Vec *b) - { - + + __attribute__((always_inline)) inline f32 PSVECSquareDistance(const register Vec* a, const register Vec* b) { + register f32 dyz, dxy, sqdist; register f32 v0xy, v1yz, v0yz, v1xy; @@ -163,20 +149,20 @@ namespace JMathInlineVEC { ps_madd sqdist, dxy, dxy, dyz ps_sum0 sqdist, sqdist, dyz, dyz - } + } return sqdist; } - #else - void PSVECCopy(const Vec *, Vec *); - void PSVECAdd(const Vec *, const Vec *, Vec *); - void PSVECAdd2(const Vec *, const Vec *, Vec *); - void PSVECSubtract(const Vec *, const Vec *, Vec *); - void PSVECSubtract2(const Vec *, const Vec *, Vec *); - f32 PSVECDotProduct(const Vec *, const Vec *); - f32 PSVECSquareMag(const Vec *); - void PSVECNegate(const Vec *, Vec *); - f32 PSVECSquareDistance(const Vec *, const Vec *); +#else + void PSVECCopy(const Vec*, Vec*); + void PSVECAdd(const Vec*, const Vec*, Vec*); + void PSVECAdd2(const Vec*, const Vec*, Vec*); + void PSVECSubtract(const Vec*, const Vec*, Vec*); + void PSVECSubtract2(const Vec*, const Vec*, Vec*); + f32 PSVECDotProduct(const Vec*, const Vec*); + f32 PSVECSquareMag(const Vec*); + void PSVECNegate(const Vec*, Vec*); + f32 PSVECSquareDistance(const Vec*, const Vec*); void PSVECMultiply(const Vec*, const Vec*, Vec*); #endif -}; +}; // namespace JMathInlineVEC diff --git a/libs/JSystem/include/JSystem/JMath/random.hpp b/libs/JSystem/include/JSystem/JMath/random.hpp index 4242041e0..b850986fe 100644 --- a/libs/JSystem/include/JSystem/JMath/random.hpp +++ b/libs/JSystem/include/JSystem/JMath/random.hpp @@ -8,11 +8,11 @@ namespace JMath { TRandom_fast_(u32); inline u32 rand() { - return mSeed = 0x19660d * mSeed + 0x3c6ef35f;; + return mSeed = 0x19660d * mSeed + 0x3c6ef35f; + ; } u32 mSeed; }; - -} +} // namespace JMath diff --git a/libs/JSystem/include/JSystem/JParticle/JPAEmitter.hpp b/libs/JSystem/include/JSystem/JParticle/JPAEmitter.hpp index 3a53d8a66..7c391984e 100644 --- a/libs/JSystem/include/JSystem/JParticle/JPAEmitter.hpp +++ b/libs/JSystem/include/JSystem/JParticle/JPAEmitter.hpp @@ -8,8 +8,8 @@ class JPAEmitterManager; class JPAResource; enum JPAEmitterFlag { - JPA_EMITTER_PAUSE_FLAG = 1 << 1, - JPA_EMITTER_INIT_FLAG = 1 << 6 + JPA_EMITTER_PAUSE_FLAG = 1 << 1, + JPA_EMITTER_INIT_FLAG = 1 << 6 }; class JPABaseEmitter { @@ -20,52 +20,52 @@ public: /// @brief Destorys the `JPABaseEmitter`. ~JPABaseEmitter(); - /* 0x000 */ TVec3f _0; - /* 0x00C */ TVec3f _C; - /* 0x018 */ TVec3f _18; - /* 0x024 */ s32 _24; - /* 0x028 */ f32 _28; - /* 0x02C */ f32 _2C; - /* 0x030 */ f32 _30; - /* 0x034 */ f32 _34; - /* 0x038 */ f32 _38; - /* 0x03C */ f32 _3C; - /* 0x040 */ f32 _40; - /* 0x044 */ f32 _44; - /* 0x048 */ f32 _48; - /* 0x04C */ u16 _4C; - /* 0x04E */ u16 _4E; - /* 0x050 */ u16 _50; - /* 0x052 */ u16 _52; - /* 0x054 */ u16 _54; - /* 0x056 */ u8 _56; - /* 0x058 */ JSUPtrLink _58; - /* 0x068 */ Mtx _68; - /* 0x098 */ TVec3f _98; - /* 0x0A4 */ TVec3f _A4; - /* 0x0B0 */ TVec2f mGlobalScale; - /* 0x0B8 */ GXColor mGlobalPrmColor; - /* 0x0BC */ GXColor mGlobalEnvColor; - /* 0x0C0 */ void* _C0; - /* 0x0C4 */ u32 _C4; - /* 0x0C8 */ void* _C8; // Part of JPAList - /* 0x0CC */ void* _CC; // Part of JPAList - /* 0x0D0 */ u32 _D0; // Part of JPAList - /* 0x0D4 */ void* _D4; // Part of JPAList - /* 0x0D8 */ void* _D8; // Part of JPAList - /* 0x0DC */ u32 _DC; // Part of JPAList - /* 0x0E0 */ void* _E0; // JPAList* + /* 0x000 */ TVec3f _0; + /* 0x00C */ TVec3f _C; + /* 0x018 */ TVec3f _18; + /* 0x024 */ s32 _24; + /* 0x028 */ f32 _28; + /* 0x02C */ f32 _2C; + /* 0x030 */ f32 _30; + /* 0x034 */ f32 _34; + /* 0x038 */ f32 _38; + /* 0x03C */ f32 _3C; + /* 0x040 */ f32 _40; + /* 0x044 */ f32 _44; + /* 0x048 */ f32 _48; + /* 0x04C */ u16 _4C; + /* 0x04E */ u16 _4E; + /* 0x050 */ u16 _50; + /* 0x052 */ u16 _52; + /* 0x054 */ u16 _54; + /* 0x056 */ u8 _56; + /* 0x058 */ JSUPtrLink _58; + /* 0x068 */ Mtx _68; + /* 0x098 */ TVec3f _98; + /* 0x0A4 */ TVec3f _A4; + /* 0x0B0 */ TVec2f mGlobalScale; + /* 0x0B8 */ GXColor mGlobalPrmColor; + /* 0x0BC */ GXColor mGlobalEnvColor; + /* 0x0C0 */ void* _C0; + /* 0x0C4 */ u32 _C4; + /* 0x0C8 */ void* _C8; // Part of JPAList + /* 0x0CC */ void* _CC; // Part of JPAList + /* 0x0D0 */ u32 _D0; // Part of JPAList + /* 0x0D4 */ void* _D4; // Part of JPAList + /* 0x0D8 */ void* _D8; // Part of JPAList + /* 0x0DC */ u32 _DC; // Part of JPAList + /* 0x0E0 */ void* _E0; // JPAList* /* 0x0E4 */ JPAEmitterManager* mManager; - /* 0x0E8 */ JPAResource* mResource; - /* 0x0EC */ void* _EC; - /* 0x0F0 */ void* _F0; - /* 0x0F4 */ u32 mFlag; - /* 0x0F8 */ f32 _F8; - /* 0x0FC */ f32 _FC; - /* 0x100 */ u32 _100; - /* 0x104 */ s16 _104; - /* 0x108 */ GXColor _108; - /* 0x10C */ GXColor _10C; - /* 0x110 */ u8 _110; - /* 0x111 */ u8 _111; + /* 0x0E8 */ JPAResource* mResource; + /* 0x0EC */ void* _EC; + /* 0x0F0 */ void* _F0; + /* 0x0F4 */ u32 mFlag; + /* 0x0F8 */ f32 _F8; + /* 0x0FC */ f32 _FC; + /* 0x100 */ u32 _100; + /* 0x104 */ s16 _104; + /* 0x108 */ GXColor _108; + /* 0x10C */ GXColor _10C; + /* 0x110 */ u8 _110; + /* 0x111 */ u8 _111; }; diff --git a/libs/JSystem/include/JSystem/JParticle/JPAEmitterCallback.hpp b/libs/JSystem/include/JSystem/JParticle/JPAEmitterCallback.hpp index 07caebfa4..10e5d7b42 100644 --- a/libs/JSystem/include/JSystem/JParticle/JPAEmitterCallback.hpp +++ b/libs/JSystem/include/JSystem/JParticle/JPAEmitterCallback.hpp @@ -4,9 +4,9 @@ class JPABaseEmitter; class JPAEmitterCallBack { virtual ~JPAEmitterCallBack(); - virtual void execute(JPABaseEmitter *); - virtual void executeAfter(JPABaseEmitter *); - virtual void draw(JPABaseEmitter *); - virtual void drawAfter(JPABaseEmitter *); - virtual void init(JPABaseEmitter *) = 0; + virtual void execute(JPABaseEmitter*); + virtual void executeAfter(JPABaseEmitter*); + virtual void draw(JPABaseEmitter*); + virtual void drawAfter(JPABaseEmitter*); + virtual void init(JPABaseEmitter*) = 0; }; diff --git a/libs/JSystem/include/JSystem/JParticle/JPAEmitterManager.hpp b/libs/JSystem/include/JSystem/JParticle/JPAEmitterManager.hpp index ed7c8a083..f8a64a527 100644 --- a/libs/JSystem/include/JSystem/JParticle/JPAEmitterManager.hpp +++ b/libs/JSystem/include/JSystem/JParticle/JPAEmitterManager.hpp @@ -16,21 +16,21 @@ public: JPAEmitterManager(u32, u32, JKRHeap*, u8, u8); JPABaseEmitter* createSimpleEmitterID(const TVec3f&, u16, u8, u8, JPAEmitterCallBack*, JPAParticleCallBack*); - void calc(u8); - void calcYBBCam(); - void draw(const JPADrawInfo*, u8); - void forceDeleteEmitter(JPABaseEmitter*); - void entryResourceManager(JPAResourceManager*, u8); + void calc(u8); + void calcYBBCam(); + void draw(const JPADrawInfo*, u8); + void forceDeleteEmitter(JPABaseEmitter*); + void entryResourceManager(JPAResourceManager*, u8); - /* 0x00 */ void* _0; - /* 0x04 */ JSUPtrList _4; - /* 0x10 */ void* _10; // Part of JPAList - /* 0x14 */ void* _14; // Part of JPAList - /* 0x18 */ u32 _18; // Part of JPAList - /* 0x1C */ void* _1C; + /* 0x00 */ void* _0; + /* 0x04 */ JSUPtrList _4; + /* 0x10 */ void* _10; // Part of JPAList + /* 0x14 */ void* _14; // Part of JPAList + /* 0x18 */ u32 _18; // Part of JPAList + /* 0x1C */ void* _1C; /* 0x20 */ JPABaseEmitter* _20; - /* 0x24 */ u32 _24; - /* 0x28 */ u32 _28; - /* 0x2C */ u8 _2C; - /* 0x2D */ u8 _2D; + /* 0x24 */ u32 _24; + /* 0x28 */ u32 _28; + /* 0x2C */ u8 _2C; + /* 0x2D */ u8 _2D; }; diff --git a/libs/JSystem/include/JSystem/JParticle/JPAParticleCallBack.hpp b/libs/JSystem/include/JSystem/JParticle/JPAParticleCallBack.hpp index dab05f8d3..26766c314 100644 --- a/libs/JSystem/include/JSystem/JParticle/JPAParticleCallBack.hpp +++ b/libs/JSystem/include/JSystem/JParticle/JPAParticleCallBack.hpp @@ -7,11 +7,9 @@ class JPABaseParticle; class JPAParticleCallBack { public: virtual ~JPAParticleCallBack(); - virtual void execute(JPABaseEmitter *, JPABaseParticle *) { - + virtual void execute(JPABaseEmitter*, JPABaseParticle*) { } - virtual void draw(JPABaseEmitter *, JPABaseParticle *) { - + virtual void draw(JPABaseEmitter*, JPABaseParticle*) { } }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JParticle/JPAResourceManager.hpp b/libs/JSystem/include/JSystem/JParticle/JPAResourceManager.hpp index 0ea4b3235..ec7520b8f 100644 --- a/libs/JSystem/include/JSystem/JParticle/JPAResourceManager.hpp +++ b/libs/JSystem/include/JSystem/JParticle/JPAResourceManager.hpp @@ -6,13 +6,13 @@ class JKRHeap; class JPAResourceManager { public: - JPAResourceManager(const void *, JKRHeap *); + JPAResourceManager(const void*, JKRHeap*); JKRHeap* mHeap; // 0x0 - u32 _4; - u32 _8; - u16 _C; - u16 _E; - u16 _10; - u16 _12; + u32 _4; + u32 _8; + u16 _C; + u16 _E; + u16 _10; + u16 _12; }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JParticle/MultiEmitterCallBack.hpp b/libs/JSystem/include/JSystem/JParticle/MultiEmitterCallBack.hpp index e42612620..1f926209f 100644 --- a/libs/JSystem/include/JSystem/JParticle/MultiEmitterCallBack.hpp +++ b/libs/JSystem/include/JSystem/JParticle/MultiEmitterCallBack.hpp @@ -4,5 +4,5 @@ class MultiEmitterCallBackBase : public JPAEmitterCallBack { virtual ~MultiEmitterCallBackBase(); - virtual void init(JPABaseEmitter *); + virtual void init(JPABaseEmitter*); }; diff --git a/libs/JSystem/include/JSystem/JSupport/JSUInputStream.hpp b/libs/JSystem/include/JSystem/JSupport/JSUInputStream.hpp index 3c40c52ac..f62d38f8f 100644 --- a/libs/JSystem/include/JSystem/JSupport/JSUInputStream.hpp +++ b/libs/JSystem/include/JSystem/JSupport/JSUInputStream.hpp @@ -4,14 +4,14 @@ class JSUInputStream : public JSUIosBase { public: - JSUInputStream() : JSUIosBase() { - + JSUInputStream() + : JSUIosBase() { } virtual ~JSUInputStream(); virtual s32 getAvailable() const = 0; virtual s32 skip(s32); - virtual u32 readData(void *, s32) = 0; + virtual u32 readData(void*, s32) = 0; - s32 read(void *, s32); + s32 read(void*, s32); }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JSupport/JSUIosBase.hpp b/libs/JSystem/include/JSystem/JSupport/JSUIosBase.hpp index 2d56b5fcb..61dde44eb 100644 --- a/libs/JSystem/include/JSystem/JSupport/JSUIosBase.hpp +++ b/libs/JSystem/include/JSystem/JSupport/JSUIosBase.hpp @@ -20,7 +20,6 @@ public: }; virtual ~JSUIosBase() { - } void setState(EIoState); diff --git a/libs/JSystem/include/JSystem/JSupport/JSUList.hpp b/libs/JSystem/include/JSystem/JSupport/JSUList.hpp index 4b2774f63..102b10f1b 100644 --- a/libs/JSystem/include/JSystem/JSupport/JSUList.hpp +++ b/libs/JSystem/include/JSystem/JSupport/JSUList.hpp @@ -15,117 +15,116 @@ public: ~JSUPtrList(); void initiate(); - void setFirst(JSUPtrLink *); - bool append(JSUPtrLink *); - bool prepend(JSUPtrLink *); - bool insert(JSUPtrLink *, JSUPtrLink *); - bool remove(JSUPtrLink *); + void setFirst(JSUPtrLink*); + bool append(JSUPtrLink*); + bool prepend(JSUPtrLink*); + bool insert(JSUPtrLink*, JSUPtrLink*); + bool remove(JSUPtrLink*); - JSUPtrLink* getFirstLink() const { - return mHead; + JSUPtrLink* getFirstLink() const { + return mHead; } - u32 getNumLinks() const { - return mNodeCount; + u32 getNumLinks() const { + return mNodeCount; } - JSUPtrLink *mHead; // 0x0 - JSUPtrLink *mTail; // 0x4 - u32 mNodeCount; // 0x8 + JSUPtrLink* mHead; // 0x0 + JSUPtrLink* mTail; // 0x4 + u32 mNodeCount; // 0x8 }; class JSUPtrLink { public: - JSUPtrLink(void *); + JSUPtrLink(void*); ~JSUPtrLink(); - void* getObjectPtr() const { - return mData; + void* getObjectPtr() const { + return mData; } - JSUPtrList* getList() const { - return mPtrList; + JSUPtrList* getList() const { + return mPtrList; } - JSUPtrLink* getNext() const { + JSUPtrLink* getNext() const { return mNext; } - void *mData; // 0x0 - JSUPtrList *mPtrList; // 0x4 - JSUPtrLink *mPrev; // 0x8 - JSUPtrLink *mNext; // 0xC + void* mData; // 0x0 + JSUPtrList* mPtrList; // 0x4 + JSUPtrLink* mPrev; // 0x8 + JSUPtrLink* mNext; // 0xC }; -template +template class JSULink : public JSUPtrLink { public: - JSULink(void *pData) : JSUPtrLink(pData) { - + JSULink(void* pData) + : JSUPtrLink(pData) { } ~JSULink() NO_INLINE { - } - T* getObject() const { - return (T*)getObjectPtr(); + T* getObject() const { + return (T*)getObjectPtr(); } - JSULink* getNext() const { - return (JSULink*)this->JSUPtrLink::getNext(); + JSULink* getNext() const { + return (JSULink*)this->JSUPtrLink::getNext(); } - JSULink* getPrev() const { - return (JSULink*)this->JSUPtrLink::getPrev(); + JSULink* getPrev() const { + return (JSULink*)this->JSUPtrLink::getPrev(); } }; -template +template class JSUList : public JSUPtrList { public: - JSUList() : JSUPtrList() { - + JSUList() + : JSUPtrList() { } - JSUList(bool thing) : JSUPtrList(thing) { - + JSUList(bool thing) + : JSUPtrList(thing) { } - ~JSUList() { + ~JSUList(){ }; - JSULink* getFirst() const { - return (JSULink*)getFirstLink(); + JSULink* getFirst() const { + return (JSULink*)getFirstLink(); } - JSULink* getLast() const { - return (JSULink*)getLastLink(); + JSULink* getLast() const { + return (JSULink*)getLastLink(); } - u32 getNumLinks() const { - return this->JSUPtrList::getNumLinks(); + u32 getNumLinks() const { + return this->JSUPtrList::getNumLinks(); } - JSULink* getEnd() const { - return NULL; + JSULink* getEnd() const { + return NULL; } }; -template +template class JSUListIterator { public: - JSUListIterator() : mLink(NULL) { - + JSUListIterator() + : mLink(NULL) { } - - JSUListIterator(JSULink* link) : mLink(link) { + JSUListIterator(JSULink* link) + : mLink(link) { } - - JSUListIterator(JSUList* list) : mLink(list->getFirst()) { + JSUListIterator(JSUList* list) + : mLink(list->getFirst()) { } JSUListIterator& operator=(JSULink* link) { @@ -133,14 +132,22 @@ public: return *this; } - T* getObject() { - return this->mLink->getObject(); + T* getObject() { + return this->mLink->getObject(); } - bool operator==(JSULink const* other) const { return this->mLink == other; } - bool operator!=(JSULink const* other) const { return this->mLink != other; } - bool operator==(JSUListIterator const& other) const { return this->mLink == other.mLink; } - bool operator!=(JSUListIterator const& other) const { return this->mLink != other.mLink; } + bool operator==(JSULink const* other) const { + return this->mLink == other; + } + bool operator!=(JSULink const* other) const { + return this->mLink != other; + } + bool operator==(JSUListIterator const& other) const { + return this->mLink == other.mLink; + } + bool operator!=(JSUListIterator const& other) const { + return this->mLink != other.mLink; + } JSUListIterator operator++(int) { JSUListIterator prev = *this; @@ -164,80 +171,78 @@ public: return *this; } - T& operator*() { - return *this->getObject(); + T& operator*() { + return *this->getObject(); } - T* operator->() { - return this->getObject(); + T* operator->() { + return this->getObject(); } JSULink* mLink; }; /* from https://github.com/zeldaret/tp/blob/master/include/JSystem/JSupport/JSUList.hpp */ -template +template class JSUTree : public JSUList, public JSULink { public: - __inline JSUTree(T *pOwner) : JSUList(), JSULink(pOwner) { - + __inline JSUTree(T* pOwner) + : JSUList(), JSULink(pOwner) { } ~JSUTree() NO_INLINE { - } bool appendChild(JSUTree* pChild) { return this->append(pChild); } - bool removeChild(JSUTree* child) { - return this->remove(child); + bool removeChild(JSUTree* child) { + return this->remove(child); } - JSUTree* getEndChild() const { - return NULL; + JSUTree* getEndChild() const { + return NULL; } - JSUTree* getFirstChild() const { - return (JSUTree*)this->getFirst(); + JSUTree* getFirstChild() const { + return (JSUTree*)this->getFirst(); } - JSUTree* getLastChild() const { - return (JSUTree*)this->getLast(); + JSUTree* getLastChild() const { + return (JSUTree*)this->getLast(); } - JSUTree* getNextChild() const { + JSUTree* getNextChild() const { return (JSUTree*)this->getNext(); } - u32 getNumChildren() const { - return this->getNumLinks(); + u32 getNumChildren() const { + return this->getNumLinks(); } - T* getObject() const { - return (T*)this->mData; + T* getObject() const { + return (T*)this->mData; } - JSUTree* getParent() const { - return (JSUTree*)this->getList(); + JSUTree* getParent() const { + return (JSUTree*)this->getList(); } - }; -template +template class JSUTreeIterator { public: - JSUTreeIterator() : mTree(NULL) { - + JSUTreeIterator() + : mTree(NULL) { } - JSUTreeIterator(JSUTree* tree) : mTree(tree) { - + JSUTreeIterator(JSUTree* tree) + : mTree(tree) { } - T* getObject() { - return this->mTree->getObject(); + T* getObject() { + return this->mTree->getObject(); } JSUTreeIterator& operator=(JSUTree* tree) { @@ -245,12 +250,12 @@ public: return *this; } - bool operator==(JSUTree* other) { - return this->mTree == other; + bool operator==(JSUTree* other) { + return this->mTree == other; } - bool operator!=(JSUTree* other) { - return this->mTree != other; + bool operator!=(JSUTree* other) { + return this->mTree != other; } JSUTreeIterator operator++(int) NO_INLINE { @@ -264,13 +269,13 @@ public: return *this; } - T& operator*() { - return *this->getObject(); + T& operator*() { + return *this->getObject(); } - T* operator->() { - return this->getObject(); + T* operator->() { + return this->getObject(); } - JSUTree* mTree; // 0x0 + JSUTree* mTree; // 0x0 }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JSupport/JSUMemoryInputStream.hpp b/libs/JSystem/include/JSystem/JSupport/JSUMemoryInputStream.hpp index 08cb188f1..aa5580706 100644 --- a/libs/JSystem/include/JSystem/JSupport/JSUMemoryInputStream.hpp +++ b/libs/JSystem/include/JSystem/JSupport/JSUMemoryInputStream.hpp @@ -2,23 +2,22 @@ #include "JSystem/JSupport/JSURandomInputStream.hpp" -class JSUMemoryInputStream : public JSURandomInputStream { +class JSUMemoryInputStream : public JSURandomInputStream { public: - JSUMemoryInputStream(const void* pBuffer, s32 size) : - JSURandomInputStream() - { + JSUMemoryInputStream(const void* pBuffer, s32 size) + : JSURandomInputStream() { setBuffer(pBuffer, size); } virtual ~JSUMemoryInputStream(); - virtual u32 readData(void *, s32); + virtual u32 readData(void*, s32); virtual s32 getLength() const; virtual s32 getPosition() const; virtual s32 seekPos(s32, JSUStreamSeekFrom); - void setBuffer(const void *, s32); + void setBuffer(const void*, s32); - const void* mBuffer; // 0x8 - s32 mLength; // 0xC - s32 mPosition; // 0x10 + const void* mBuffer; // 0x8 + s32 mLength; // 0xC + s32 mPosition; // 0x10 }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JSupport/JSUMemoryOutputStream.hpp b/libs/JSystem/include/JSystem/JSupport/JSUMemoryOutputStream.hpp index ea57ec055..a5a277512 100644 --- a/libs/JSystem/include/JSystem/JSupport/JSUMemoryOutputStream.hpp +++ b/libs/JSystem/include/JSystem/JSupport/JSUMemoryOutputStream.hpp @@ -4,21 +4,20 @@ class JSUMemoryOutputStream : public JSURandomOutputStream { public: - JSUMemoryOutputStream(void* pBuffer, s32 size) : - JSURandomOutputStream() - { + JSUMemoryOutputStream(void* pBuffer, s32 size) + : JSURandomOutputStream() { setBuffer(pBuffer, size); } virtual ~JSUMemoryOutputStream(); - virtual s32 writeData(const void *, s32); + virtual s32 writeData(const void*, s32); virtual s32 getLength() const; virtual s32 getPosition() const; virtual s32 seekPos(s32, JSUStreamSeekFrom); - void setBuffer(void *, s32); + void setBuffer(void*, s32); - void* mBuffer; // 0x8 - s32 mLength; // 0xC - s32 mPosition; // 0x10 + void* mBuffer; // 0x8 + s32 mLength; // 0xC + s32 mPosition; // 0x10 }; diff --git a/libs/JSystem/include/JSystem/JSupport/JSUOutputStream.hpp b/libs/JSystem/include/JSystem/JSupport/JSUOutputStream.hpp index d53c65f8e..4d9fbaad3 100644 --- a/libs/JSystem/include/JSystem/JSupport/JSUOutputStream.hpp +++ b/libs/JSystem/include/JSystem/JSupport/JSUOutputStream.hpp @@ -5,11 +5,10 @@ class JSUOutputStream : public JSUIosBase { public: JSUOutputStream() { - } - + virtual ~JSUOutputStream(); virtual s32 skip(s32, s8); - void write(const void *, s32); + void write(const void*, s32); }; \ No newline at end of file diff --git a/libs/JSystem/include/JSystem/JSupport/JSURandomInputStream.hpp b/libs/JSystem/include/JSystem/JSupport/JSURandomInputStream.hpp index 079b42943..19961b7a3 100644 --- a/libs/JSystem/include/JSystem/JSupport/JSURandomInputStream.hpp +++ b/libs/JSystem/include/JSystem/JSupport/JSURandomInputStream.hpp @@ -13,7 +13,7 @@ public: } virtual s32 skip(s32); - virtual u32 readData(void *, s32) = 0; + virtual u32 readData(void*, s32) = 0; virtual s32 getLength() const = 0; virtual s32 getPosition() const = 0; virtual s32 seekPos(s32, JSUStreamSeekFrom) = 0; diff --git a/libs/JSystem/include/JSystem/JSupport/JSURandomOutputStream.hpp b/libs/JSystem/include/JSystem/JSupport/JSURandomOutputStream.hpp index 1f67b5495..f58ca6a40 100644 --- a/libs/JSystem/include/JSystem/JSupport/JSURandomOutputStream.hpp +++ b/libs/JSystem/include/JSystem/JSupport/JSURandomOutputStream.hpp @@ -6,9 +6,9 @@ class JSURandomOutputStream : public JSUOutputStream { public: JSURandomOutputStream() {} - virtual s32 writeData(const void *, s32) = 0; - virtual s32 getLength() const = 0; - virtual s32 getPosition() const = 0; + virtual s32 writeData(const void*, s32) = 0; + virtual s32 getLength() const = 0; + virtual s32 getPosition() const = 0; virtual void seek(s32, JSUStreamSeekFrom); - virtual s32 getAvailable() const; + virtual s32 getAvailable() const; }; diff --git a/libs/JSystem/include/JSystem/JUtility/JUTConsole.hpp b/libs/JSystem/include/JSystem/JUtility/JUTConsole.hpp index 8158672c6..c66b371fd 100644 --- a/libs/JSystem/include/JSystem/JUtility/JUTConsole.hpp +++ b/libs/JSystem/include/JSystem/JUtility/JUTConsole.hpp @@ -5,13 +5,13 @@ #include "JSystem/JGadget/linklist.hpp" #include "JSystem/JUtility/TColor.hpp" -void JUTWarningConsole_f(const char *, ...); +void JUTWarningConsole_f(const char*, ...); class JUTFont; class JUTConsole : public JKRDisposer { public: - static void print_f(const char *, ...); + static void print_f(const char*, ...); enum EConsoleType { CONSOLE_TYPE_0 = 0, @@ -20,54 +20,56 @@ public: }; void doDraw(EConsoleType) const; - u32 getOutput() const { return mOutput; } + u32 getOutput() const { + return mOutput; + } - JGadget::TLinkListNode mListNode; // 0x18 - u32 _20; - int mMaxLines; // 0x24 - u8* mBuf; // 0x28 - bool _2C; - int _30; - int _34; - int _38; - int _3C; - int mPositionX; // 0x40 - int mPositionY; // 0x44 - u32 mHeight; // 0x48 - JUTFont* mFont; // 0x4C - f32 mFontSizeX; // 0x50 - f32 mFontSizeY; // 0x54 - int mOutput; // 0x58 - JUtility::TColor _5C; - JUtility::TColor _60; - int _64; - bool mVisible; // 0x68 - bool _69; - bool _6A; - bool _6B; + JGadget::TLinkListNode mListNode; // 0x18 + u32 _20; + int mMaxLines; // 0x24 + u8* mBuf; // 0x28 + bool _2C; + int _30; + int _34; + int _38; + int _3C; + int mPositionX; // 0x40 + int mPositionY; // 0x44 + u32 mHeight; // 0x48 + JUTFont* mFont; // 0x4C + f32 mFontSizeX; // 0x50 + f32 mFontSizeY; // 0x54 + int mOutput; // 0x58 + JUtility::TColor _5C; + JUtility::TColor _60; + int _64; + bool mVisible; // 0x68 + bool _69; + bool _6A; + bool _6B; }; class JUTConsoleManager { public: JUTConsoleManager(); - void appendConsole(JUTConsole *); - void removeConsole(JUTConsole *); + void appendConsole(JUTConsole*); + void removeConsole(JUTConsole*); void draw() const; void drawDirect(bool) const; - void setDirectConsole(JUTConsole *); + void setDirectConsole(JUTConsole*); - static JUTConsoleManager* createManager(JKRHeap *); + static JUTConsoleManager* createManager(JKRHeap*); - #ifdef __MWERKS__ +#ifdef __MWERKS__ typedef JGadget::TLinkList ConsoleList; - #else +#else typedef JGadget::TLinkList ConsoleList; - #endif +#endif - ConsoleList mList; // 0x0 - JUTConsole* mActiveConsole; // 0xC - JUTConsole* mDirectConsole; // 0x10 + ConsoleList mList; // 0x0 + JUTConsole* mActiveConsole; // 0xC + JUTConsole* mDirectConsole; // 0x10 static JUTConsoleManager* sManager; }; diff --git a/libs/JSystem/include/JSystem/JUtility/JUTDirectPrint.hpp b/libs/JSystem/include/JSystem/JUtility/JUTDirectPrint.hpp index 91c5d9108..e39faa1bf 100644 --- a/libs/JSystem/include/JSystem/JUtility/JUTDirectPrint.hpp +++ b/libs/JSystem/include/JSystem/JUtility/JUTDirectPrint.hpp @@ -6,28 +6,27 @@ class JUTDirectPrint { public: - static JUTDirectPrint* start(); - void changeFrameBuffer(void *, u16, u16); + void changeFrameBuffer(void*, u16, u16); - void* field_0x00; - u16 mFrameBufferWidth; - u16 mFrameBufferHeight; - u16 mStride; - u16 field_0x0A; - size_t mFrameBufferSize; - u8 field_0x10[4]; - u16* mFrameBuffer; + void* field_0x00; + u16 mFrameBufferWidth; + u16 mFrameBufferHeight; + u16 mStride; + u16 field_0x0A; + size_t mFrameBufferSize; + u8 field_0x10[4]; + u16* mFrameBuffer; JUtility::TColor mCharColor; - u16 mCharColor_Y; - u16 mCharColor_Cb; - u16 mCharColor_Cb2; - u16 mCharColor_Cb4; - u16 mCharColor_Cr; - u16 mCharColor_Cr2; - u16 mCharColor_Cr4; - u16 field_0x2A; + u16 mCharColor_Y; + u16 mCharColor_Cb; + u16 mCharColor_Cb2; + u16 mCharColor_Cb4; + u16 mCharColor_Cr; + u16 mCharColor_Cr2; + u16 mCharColor_Cr4; + u16 field_0x2A; static JUTDirectPrint* sDirectPrint; }; diff --git a/libs/JSystem/include/JSystem/JUtility/JUTException.hpp b/libs/JSystem/include/JSystem/JUtility/JUTException.hpp index 1033f582e..c78d38813 100644 --- a/libs/JSystem/include/JSystem/JUtility/JUTException.hpp +++ b/libs/JSystem/include/JSystem/JUtility/JUTException.hpp @@ -4,45 +4,44 @@ #include "JSystem/JKernel/JKRThread.hpp" #include "JSystem/JUtility/JUTGamePad.hpp" -typedef void (*CallbackFunc)(OSError, OSContext *, u32, u32); +typedef void (*CallbackFunc)(OSError, OSContext*, u32, u32); typedef struct _GXRenderModeObj GXRenderModeObj; -typedef struct OSContext OSContext; +typedef struct OSContext OSContext; class JUTDirectPrint; class JUTExternalFB { public: - JUTExternalFB(_GXRenderModeObj *, GXGamma, void *, u32); + JUTExternalFB(_GXRenderModeObj*, GXGamma, void*, u32); - void changeFrameBuffer(void *, u16, u16); + void changeFrameBuffer(void*, u16, u16); public: - _GXRenderModeObj* mRenderMode; // 0x0 - u32 mSize; // 0x4 - u32 _8; - u16 _C; - u16 mGamma; // 0xE - bool _10; - u8 _11[3]; + _GXRenderModeObj* mRenderMode; // 0x0 + u32 mSize; // 0x4 + u32 _8; + u16 _C; + u16 mGamma; // 0xE + bool _10; + u8 _11[3]; }; class JUTException : public JKRThread { public: - virtual ~JUTException(); virtual s32 run(); void createFB(); - void printContext(u16, OSContext *, u32, u32); + void printContext(u16, OSContext*, u32, u32); bool isEnablePad() const; - static void create(JUTDirectPrint *); - static void createConsole(void *, u32); + static void create(JUTDirectPrint*); + static void createConsole(void*, u32); static void setPreUserCallback(CallbackFunc); - static void errorHandler(u16, OSContext *, u32, u32); + static void errorHandler(u16, OSContext*, u32, u32); static void panic_f_va(char const*, int, char const*, va_list); - static void panic_f(const char *, int, const char *, ...); + static void panic_f(const char*, int, const char*, ...); static JUTConsole* getConsole() NO_INLINE { return sConsole; @@ -50,27 +49,27 @@ public: static void waitTime(s32); - void readPad(u32 *, u32 *); + void readPad(u32*, u32*); - static u32 msr; - static u32 fpscr; + static u32 msr; + static u32 fpscr; static OSMessageQueue sMessageQueue; - static JUTException* sErrorManager; - static CallbackFunc sPreUserCallback; - static CallbackFunc sPostUserCallback; - static OSMessage sMessageBuffer; - static u32 sConsoleBufferSize; - static JUTConsole* sConsole; + static JUTException* sErrorManager; + static CallbackFunc sPreUserCallback; + static CallbackFunc sPostUserCallback; + static OSMessage sMessageBuffer; + static u32 sConsoleBufferSize; + static JUTConsole* sConsole; - JUTExternalFB* mFrameMemory; // 0x7C - JUTDirectPrint* mDirectPrint; // 0x80 - u32 _84; + JUTExternalFB* mFrameMemory; // 0x7C + JUTDirectPrint* mDirectPrint; // 0x80 + u32 _84; //JUTGamePad* mGamePad; // 0x84 - JUTGamePad::EPadPort mGamePadPort; // 0x88 - s32 mPrintWaitTime0; // 0x8C - s32 mPrintWaitTime1; // 0x90 - u32 mTraceSuppress; // 0x94 - u32 _98; - u32 mPrintFlags; // 0x9C - u32 mStackPointer; // 0xA0 + JUTGamePad::EPadPort mGamePadPort; // 0x88 + s32 mPrintWaitTime0; // 0x8C + s32 mPrintWaitTime1; // 0x90 + u32 mTraceSuppress; // 0x94 + u32 _98; + u32 mPrintFlags; // 0x9C + u32 mStackPointer; // 0xA0 }; diff --git a/libs/JSystem/include/JSystem/JUtility/JUTNameTab.hpp b/libs/JSystem/include/JSystem/JUtility/JUTNameTab.hpp index ccafde3b7..5facc3da4 100644 --- a/libs/JSystem/include/JSystem/JUtility/JUTNameTab.hpp +++ b/libs/JSystem/include/JSystem/JUtility/JUTNameTab.hpp @@ -5,23 +5,23 @@ struct ResNTAB { u16 _0; u16 _2; - u16 mEntries[0x2]; // 0x4 + u16 mEntries[0x2]; // 0x4 }; class JUTNameTab { public: JUTNameTab(); - JUTNameTab(const ResNTAB *); + JUTNameTab(const ResNTAB*); virtual ~JUTNameTab(); - void setResource(const ResNTAB *); - s32 getIndex(const char *) const; + void setResource(const ResNTAB*); + s32 getIndex(const char*) const; const char* getName(u16) const; - u32 calcKeyCode(const char *) const; + u32 calcKeyCode(const char*) const; - const ResNTAB* mResource; // 0x4 - u8* _8; - u16 _C; - u16 _E; + const ResNTAB* mResource; // 0x4 + u8* _8; + u16 _C; + u16 _E; }; diff --git a/libs/JSystem/include/JSystem/JUtility/JUTPalette.hpp b/libs/JSystem/include/JSystem/JUtility/JUTPalette.hpp index 7ac34dbac..a2cabc772 100644 --- a/libs/JSystem/include/JSystem/JUtility/JUTPalette.hpp +++ b/libs/JSystem/include/JSystem/JUtility/JUTPalette.hpp @@ -3,13 +3,13 @@ #include enum JUTTransparency { - + }; struct ResTLUT { /* 0x0 */ GXTlutFmt mFormat; - /* 0x1 */ u8 mTransparency; - /* 0x2 */ u16 mLutNum; + /* 0x1 */ u8 mTransparency; + /* 0x2 */ u16 mLutNum; }; class JUTPalette { @@ -19,9 +19,9 @@ public: void load(); /* 0x00 */ GXTlutObj mObj; - /* 0x0C */ u8 mName; - /* 0x0D */ u8 mFormat; - /* 0x10 */ void* mLut; - /* 0x14 */ u16 mLutNum; - /* 0x16 */ u8 mTransparency; + /* 0x0C */ u8 mName; + /* 0x0D */ u8 mFormat; + /* 0x10 */ void* mLut; + /* 0x14 */ u16 mLutNum; + /* 0x16 */ u8 mTransparency; }; diff --git a/libs/JSystem/include/JSystem/JUtility/JUTTexture.hpp b/libs/JSystem/include/JSystem/JUtility/JUTTexture.hpp index 8bd7b2ad7..df2edf508 100644 --- a/libs/JSystem/include/JSystem/JUtility/JUTTexture.hpp +++ b/libs/JSystem/include/JSystem/JUtility/JUTTexture.hpp @@ -5,27 +5,27 @@ class JUTPalette; struct ResTIMG { - /* 0x00 */ u8 mFormat; - /* 0x01 */ u8 mTransparency; - /* 0x02 */ u16 mWidth; - /* 0x04 */ u16 mHeight; - /* 0x06 */ u8 mWrapS; - /* 0x07 */ u8 mWrapT; - /* 0x08 */ u8 mPaletteName; - /* 0x09 */ u8 mPaletteFormat; - /* 0x0A */ u16 mPaletteNum; - /* 0x0C */ u32 mPaletteDataOffset; + /* 0x00 */ u8 mFormat; + /* 0x01 */ u8 mTransparency; + /* 0x02 */ u16 mWidth; + /* 0x04 */ u16 mHeight; + /* 0x06 */ u8 mWrapS; + /* 0x07 */ u8 mWrapT; + /* 0x08 */ u8 mPaletteName; + /* 0x09 */ u8 mPaletteFormat; + /* 0x0A */ u16 mPaletteNum; + /* 0x0C */ u32 mPaletteDataOffset; /* 0x10 */ bool mMipmap; /* 0x11 */ bool mDoEdgeLod; /* 0x12 */ bool mBiasClamp; - /* 0x13 */ u8 mMaxAnisotropy; - /* 0x14 */ u8 mMinType; - /* 0x15 */ u8 mMagType; - /* 0x16 */ u8 mMinLod; - /* 0x17 */ u8 mMaxLod; - /* 0x18 */ u8 mImageNum; - /* 0x1A */ s16 mLodBias; - /* 0x1C */ u32 mImageDataOffset; + /* 0x13 */ u8 mMaxAnisotropy; + /* 0x14 */ u8 mMinType; + /* 0x15 */ u8 mMagType; + /* 0x16 */ u8 mMinLod; + /* 0x17 */ u8 mMaxLod; + /* 0x18 */ u8 mImageNum; + /* 0x1A */ s16 mLodBias; + /* 0x1C */ u32 mImageDataOffset; }; class JUTTexture { @@ -47,10 +47,10 @@ public: /// @brief Destroys the `JUTTexture`. ~JUTTexture(); - void storeTIMG(const ResTIMG *, u8); - void storeTIMG(const ResTIMG *, JUTPalette *); - void storeTIMG(const ResTIMG *, JUTPalette *, GXTlut); - void attachPalette(JUTPalette *); + void storeTIMG(const ResTIMG*, u8); + void storeTIMG(const ResTIMG*, JUTPalette*); + void storeTIMG(const ResTIMG*, JUTPalette*, GXTlut); + void attachPalette(JUTPalette*); void init(); void initTexObj(); void initTexObj(_GXTlut); @@ -59,19 +59,19 @@ public: void setCaptureFlag(bool); void setEmbPaletteDelFlag(bool); - /* 0x00 */ GXTexObj mObj; - /* 0x20 */ ResTIMG* mTIMG; - /* 0x24 */ u8* mImage; + /* 0x00 */ GXTexObj mObj; + /* 0x20 */ ResTIMG* mTIMG; + /* 0x24 */ u8* mImage; /* 0x28 */ JUTPalette* mEmbPalette; /* 0x2C */ JUTPalette* mPalette; - /* 0x30 */ u8 mWrapS; - /* 0x31 */ u8 mWrapT; - /* 0x32 */ u8 mMagType; - /* 0x33 */ u8 mMinType; - /* 0x34 */ u16 mMinLod; - /* 0x36 */ u16 mMaxLod; - /* 0x38 */ u16 mLodBias; - /* 0x3A */ u8 _3A; - /* 0x3B */ u8 mFlag; - /* 0x3C */ ResTIMG* _3C; + /* 0x30 */ u8 mWrapS; + /* 0x31 */ u8 mWrapT; + /* 0x32 */ u8 mMagType; + /* 0x33 */ u8 mMinType; + /* 0x34 */ u16 mMinLod; + /* 0x36 */ u16 mMaxLod; + /* 0x38 */ u16 mLodBias; + /* 0x3A */ u8 _3A; + /* 0x3B */ u8 mFlag; + /* 0x3C */ ResTIMG* _3C; }; diff --git a/libs/JSystem/include/JSystem/JUtility/JUTVideo.hpp b/libs/JSystem/include/JSystem/JUtility/JUTVideo.hpp index 8230d19b1..4b1fa7d55 100644 --- a/libs/JSystem/include/JSystem/JUtility/JUTVideo.hpp +++ b/libs/JSystem/include/JSystem/JUtility/JUTVideo.hpp @@ -10,7 +10,7 @@ public: virtual ~JUTVideo(); static JUTVideo* createManager(const GXRenderModeObj*); - static void destroyManager(); + static void destroyManager(); static void drawDoneStart(); static void dummyNoDrawWait(); @@ -18,25 +18,25 @@ public: void setRenderMode(const GXRenderModeObj*); void waitRetraceIfNeed(); - GXRenderModeObj* mRenderModeObj; // 0x4 - u32 _8; - u32 mRetraceCount; // 0xC - u32 _10; - u32 _14; - u32 _18; - VIRetraceCallback mPreRetractCb; // 0x1C - VIRetraceCallback mPostRetraceCb; // 0x20 - u32 _24; - u32 _28; - u8 _2C; - u8 _2D; - u8 _2E; - u8 _2F; - u32 _30; - OSMessage mMessage; // 0x34 - OSMessageQueue mMessageQueue; // 0x38 + GXRenderModeObj* mRenderModeObj; // 0x4 + u32 _8; + u32 mRetraceCount; // 0xC + u32 _10; + u32 _14; + u32 _18; + VIRetraceCallback mPreRetractCb; // 0x1C + VIRetraceCallback mPostRetraceCb; // 0x20 + u32 _24; + u32 _28; + u8 _2C; + u8 _2D; + u8 _2E; + u8 _2F; + u32 _30; + OSMessage mMessage; // 0x34 + OSMessageQueue mMessageQueue; // 0x38 static JUTVideo* sManager; - static OSTick sVideoLastTick; - static s32 sVideoInterval; + static OSTick sVideoLastTick; + static s32 sVideoInterval; }; diff --git a/libs/JSystem/include/JSystem/JUtility/JUTXfb.hpp b/libs/JSystem/include/JSystem/JUtility/JUTXfb.hpp index 2bd547a5e..267cbbd04 100644 --- a/libs/JSystem/include/JSystem/JUtility/JUTXfb.hpp +++ b/libs/JSystem/include/JSystem/JUtility/JUTXfb.hpp @@ -18,17 +18,17 @@ public: } static JUTXfb* createManager(void*, void*, void*); - static void destroyManager(); + static void destroyManager(); - void* mXfbs[3]; - u8 _C; - u8 _D; - u8 _E; + void* mXfbs[3]; + u8 _C; + u8 _D; + u8 _E; /* 0x10 */ s32 mBufferMode; /* 0x14 */ s16 mDrawingXfbIndex; /* 0x16 */ s16 mLastDrawnXfbIndex; /* 0x18 */ s16 mDisplayingXfbIndex; - s32 _1C; + s32 _1C; static JUTXfb* sManager; }; diff --git a/libs/JSystem/include/JSystem/JUtility/TColor.hpp b/libs/JSystem/include/JSystem/JUtility/TColor.hpp index 210637d28..156334256 100644 --- a/libs/JSystem/include/JSystem/JUtility/TColor.hpp +++ b/libs/JSystem/include/JSystem/JUtility/TColor.hpp @@ -5,6 +5,6 @@ namespace JUtility { struct TColor : public GXColor { public: - TColor() { } + TColor() {} }; -}; +}; // namespace JUtility diff --git a/libs/MSL_C++/include/functional.hpp b/libs/MSL_C++/include/functional.hpp index 878320512..888ac7a66 100644 --- a/libs/MSL_C++/include/functional.hpp +++ b/libs/MSL_C++/include/functional.hpp @@ -1,41 +1,42 @@ #ifndef FUNCTIONAL_H #define FUNCTIONAL_H -template +template struct unary_function { - typedef Arg argument_type; + typedef Arg argument_type; typedef Result result_type; }; -template +template struct binary_function { - typedef Arg1 first_argument_type; - typedef Arg2 second_argument_type; + typedef Arg1 first_argument_type; + typedef Arg2 second_argument_type; typedef Result result_type; }; -template -class mem_fun_t : public unary_function { +template +class mem_fun_t : public unary_function { public: explicit mem_fun_t(S (T::*mf)()); - S operator()(T *p) const; + S operator()(T* p) const; private: - S (T::*mf_)(); + S (T::*mf_) + (); }; template -inline mem_fun_t::mem_fun_t(S (T::*mf)()) : mf_(mf) { - +inline mem_fun_t::mem_fun_t(S (T::*mf)()) + : mf_(mf) { } template -inline S mem_fun_t::operator()(T *p) const { +inline S mem_fun_t::operator()(T* p) const { return (p->*mf_)(); } -template +template inline mem_fun_t mem_func(S (T::*f)()) { return mem_fun_t(f); } diff --git a/src/Game/Animation/AnmPlayer.cpp b/src/Game/Animation/AnmPlayer.cpp index b34291c2b..669b3b96c 100644 --- a/src/Game/Animation/AnmPlayer.cpp +++ b/src/Game/Animation/AnmPlayer.cpp @@ -4,12 +4,10 @@ #include #include -AnmPlayerBase::AnmPlayerBase(const ResTable *pResTable) : - mResTable(pResTable), - mAnmRes(nullptr), - mFrameCtrl(0) -{ - +AnmPlayerBase::AnmPlayerBase(const ResTable* pResTable) + : mResTable(pResTable), + mAnmRes(nullptr), + mFrameCtrl(0) { } void AnmPlayerBase::update() { @@ -24,7 +22,7 @@ void AnmPlayerBase::reflectFrame() { } } -void AnmPlayerBase::start(const char *pResName) { +void AnmPlayerBase::start(const char* pResName) { J3DAnmBase* pAnmRes = reinterpret_cast(mResTable->getRes(pResName)); if (pAnmRes != mAnmRes) { @@ -43,7 +41,7 @@ void AnmPlayerBase::stop() { mFrameCtrl.mSpeed = 0.0f; } -bool AnmPlayerBase::isPlaying(const char *pAnimName) const { +bool AnmPlayerBase::isPlaying(const char* pAnimName) const { if (mAnmRes != nullptr) { if (MR::isEqualStringCase(pAnimName, mResTable->getResName(mAnmRes))) { return true; @@ -53,11 +51,9 @@ bool AnmPlayerBase::isPlaying(const char *pAnimName) const { return false; } -MaterialAnmPlayerBase::MaterialAnmPlayerBase(const ResTable *pResTable, J3DModelData *pModelData) : - AnmPlayerBase(pResTable), - mModelData(pModelData) -{ - +MaterialAnmPlayerBase::MaterialAnmPlayerBase(const ResTable* pResTable, J3DModelData* pModelData) + : AnmPlayerBase(pResTable), + mModelData(pModelData) { } void MaterialAnmPlayerBase::beginDiff() { @@ -73,10 +69,8 @@ void MaterialAnmPlayerBase::endDiff() { } } -void AnmPlayerBase::changeAnimation(J3DAnmBase *) { - +void AnmPlayerBase::changeAnimation(J3DAnmBase*) { } void AnmPlayerBase::stopAnimation() { - } diff --git a/src/Game/Animation/BckCtrl.cpp b/src/Game/Animation/BckCtrl.cpp index b38412d36..4a2aceb1f 100644 --- a/src/Game/Animation/BckCtrl.cpp +++ b/src/Game/Animation/BckCtrl.cpp @@ -5,23 +5,21 @@ namespace { static const char* sDefaultPlayDataName = "_default"; }; -void BckCtrl::overWrite(const BckCtrlData &rNew) { +void BckCtrl::overWrite(const BckCtrlData& rNew) { if (MR::isEqualStringCase(rNew._0, sDefaultPlayDataName)) { mDefaultCtrlData = rNew; - } - else { + } else { BckCtrlData* data = find(rNew._0); if (data) { *data = rNew; - } - else { - add(rNew); + } else { + add(rNew); } } } -void BckCtrl::changeBckSetting(const char *pName, XanimePlayer *pPlayer) const { +void BckCtrl::changeBckSetting(const char* pName, XanimePlayer* pPlayer) const { BckCtrlData* data = find(pName); if (data) { diff --git a/src/Game/Animation/BpkPlayer.cpp b/src/Game/Animation/BpkPlayer.cpp index 0f29a894b..827f1eff3 100644 --- a/src/Game/Animation/BpkPlayer.cpp +++ b/src/Game/Animation/BpkPlayer.cpp @@ -3,10 +3,8 @@ #include #include -BpkPlayer::BpkPlayer(const ResourceHolder* pResourceHolder, J3DModelData* pModelData) : - MaterialAnmPlayerBase(pResourceHolder->mBpkResTable, pModelData) -{ - +BpkPlayer::BpkPlayer(const ResourceHolder* pResourceHolder, J3DModelData* pModelData) + : MaterialAnmPlayerBase(pResourceHolder->mBpkResTable, pModelData) { } void BpkPlayer::attach(J3DAnmBase* pAnmRes, J3DModelData* pModelData) { diff --git a/src/Game/Animation/BrkPlayer.cpp b/src/Game/Animation/BrkPlayer.cpp index bd5ae1e0a..81a774ade 100644 --- a/src/Game/Animation/BrkPlayer.cpp +++ b/src/Game/Animation/BrkPlayer.cpp @@ -3,10 +3,8 @@ #include #include -BrkPlayer::BrkPlayer(const ResourceHolder* pResourceHolder, J3DModelData* pModelData) : - MaterialAnmPlayerBase(pResourceHolder->mBrkResTable, pModelData) -{ - +BrkPlayer::BrkPlayer(const ResourceHolder* pResourceHolder, J3DModelData* pModelData) + : MaterialAnmPlayerBase(pResourceHolder->mBrkResTable, pModelData) { } void BrkPlayer::attach(J3DAnmBase* pAnmRes, J3DModelData* pModelData) { diff --git a/src/Game/Animation/BtkPlayer.cpp b/src/Game/Animation/BtkPlayer.cpp index 810025f52..016d5318b 100644 --- a/src/Game/Animation/BtkPlayer.cpp +++ b/src/Game/Animation/BtkPlayer.cpp @@ -3,10 +3,8 @@ #include #include -BtkPlayer::BtkPlayer(const ResourceHolder* pResourceHolder, J3DModelData* pModelData) : - MaterialAnmPlayerBase(pResourceHolder->mBtkResTable, pModelData) -{ - +BtkPlayer::BtkPlayer(const ResourceHolder* pResourceHolder, J3DModelData* pModelData) + : MaterialAnmPlayerBase(pResourceHolder->mBtkResTable, pModelData) { } void BtkPlayer::attach(J3DAnmBase* pAnmRes, J3DModelData* pModelData) { diff --git a/src/Game/Animation/BtpPlayer.cpp b/src/Game/Animation/BtpPlayer.cpp index 6c8aefc91..abd382d25 100644 --- a/src/Game/Animation/BtpPlayer.cpp +++ b/src/Game/Animation/BtpPlayer.cpp @@ -3,10 +3,8 @@ #include #include -BtpPlayer::BtpPlayer(const ResourceHolder* pResourceHolder, J3DModelData* pModelData) : - MaterialAnmPlayerBase(pResourceHolder->mBtpResTable, pModelData) -{ - +BtpPlayer::BtpPlayer(const ResourceHolder* pResourceHolder, J3DModelData* pModelData) + : MaterialAnmPlayerBase(pResourceHolder->mBtpResTable, pModelData) { } void BtpPlayer::attach(J3DAnmBase* pAnmRes, J3DModelData* pModelData) { diff --git a/src/Game/Animation/BvaPlayer.cpp b/src/Game/Animation/BvaPlayer.cpp index c3f28370f..58bce3b6b 100644 --- a/src/Game/Animation/BvaPlayer.cpp +++ b/src/Game/Animation/BvaPlayer.cpp @@ -1,10 +1,8 @@ #include "Game/Animation/BvaPlayer.hpp" -BvaPlayer::BvaPlayer(const ResTable* pResTable, J3DModel* pModel) : - AnmPlayerBase(pResTable), - mModel(pModel) -{ - +BvaPlayer::BvaPlayer(const ResTable* pResTable, J3DModel* pModel) + : AnmPlayerBase(pResTable), + mModel(pModel) { } // BvaPlayer::calc diff --git a/src/Game/Animation/LayoutAnmPlayer.cpp b/src/Game/Animation/LayoutAnmPlayer.cpp index ce4fcbf15..5f745e8b8 100644 --- a/src/Game/Animation/LayoutAnmPlayer.cpp +++ b/src/Game/Animation/LayoutAnmPlayer.cpp @@ -2,13 +2,11 @@ #include "Game/Screen/LayoutManager.hpp" #include -LayoutAnmPlayer::LayoutAnmPlayer(const LayoutManager* pManager) : - mManager(pManager), - mAnimName(nullptr), - mAnimTransform(nullptr), - mFrameCtrl(0) -{ - +LayoutAnmPlayer::LayoutAnmPlayer(const LayoutManager* pManager) + : mManager(pManager), + mAnimName(nullptr), + mAnimTransform(nullptr), + mFrameCtrl(0) { } void LayoutAnmPlayer::movement() { @@ -37,8 +35,7 @@ void LayoutAnmPlayer::start(const char* pAnimName) { if (mAnimTransform->IsLoopData()) { mFrameCtrl.mLoopMode = 2; - } - else { + } else { mFrameCtrl.mLoopMode = 0; } diff --git a/src/Game/Animation/XanimeCore.cpp b/src/Game/Animation/XanimeCore.cpp index 597fc6ae5..b1162ae84 100644 --- a/src/Game/Animation/XanimeCore.cpp +++ b/src/Game/Animation/XanimeCore.cpp @@ -22,7 +22,7 @@ XjointInfo::XjointInfo() { _50.zero(); } -void XanimeCore::shareJointTransform(const XanimeCore *pOther) { +void XanimeCore::shareJointTransform(const XanimeCore* pOther) { mTransformList = pOther->mTransformList; } @@ -58,7 +58,7 @@ XanimeCore::XanimeCore(u32 trackCount, u32 jointCount, u8 a3) { initMember(trackCount); } -XanimeCore::XanimeCore(u32 trackCount, XanimeCore *pOtherCore) { +XanimeCore::XanimeCore(u32 trackCount, XanimeCore* pOtherCore) { mTrackCount = trackCount; mJointCount = pOtherCore->mJointCount; _4 = pOtherCore->_4; @@ -79,7 +79,6 @@ void XanimeCore::setWeight(u8 idx, f32 weight) { } XanimeCore::~XanimeCore() { - } XtransformInfo::XtransformInfo() { diff --git a/src/Game/Animation/XanimePlayer.cpp b/src/Game/Animation/XanimePlayer.cpp index 9007f4c3f..a03222563 100644 --- a/src/Game/Animation/XanimePlayer.cpp +++ b/src/Game/Animation/XanimePlayer.cpp @@ -2,7 +2,7 @@ #include "Game/Animation/XanimeResource.hpp" void XanimePlayer::setDefaultAnimation(const char* pAnimationName) { - const XanimeGroupInfo *pDefaultAnimation = mResourceTable->getGroupInfo(pAnimationName); + const XanimeGroupInfo* pDefaultAnimation = mResourceTable->getGroupInfo(pAnimationName); if (mCurrentAnimation == mDefaultAnimation) { changeAnimation(pDefaultAnimation); diff --git a/src/Game/Animation/XanimeResource.cpp b/src/Game/Animation/XanimeResource.cpp index fd66a73c5..ea183a885 100644 --- a/src/Game/Animation/XanimeResource.cpp +++ b/src/Game/Animation/XanimeResource.cpp @@ -1,7 +1,6 @@ #include "Game/Animation/XanimeResource.hpp" -void XanimeGroupInfo::init() -{ +void XanimeGroupInfo::init() { _4 = 0.f; mParent.animationName = "not-initialized"; _8 = 0; diff --git a/src/Game/AreaObj/AreaForm.cpp b/src/Game/AreaObj/AreaForm.cpp index 3021c9e98..5ef0c5f0d 100644 --- a/src/Game/AreaObj/AreaForm.cpp +++ b/src/Game/AreaObj/AreaForm.cpp @@ -2,17 +2,17 @@ #include "JSystem/JMath/JMath.hpp" #include "Game/Util.hpp" -template<> -void TRot3f::mult33(const TVec3f &rSrc, TVec3f &rDst) const { +template <> +void TRot3f::mult33(const TVec3f& rSrc, TVec3f& rDst) const { f32 a32, a22, a12, a31, a21, a11, a13, a33, a23; a32 = mMtx[2][1]; - + a22 = mMtx[1][1]; a12 = mMtx[0][1]; a31 = mMtx[2][0]; a21 = mMtx[1][0]; a11 = mMtx[0][0]; - + a33 = mMtx[2][2]; a13 = mMtx[0][2]; a23 = mMtx[1][2]; @@ -41,40 +41,34 @@ AreaFormCube::AreaFormCube(int a1) { mBounding.mMax.z = 0.0f; } -void AreaFormCube::init(const JMapInfoIter &rIter) { +void AreaFormCube::init(const JMapInfoIter& rIter) { MR::getJMapInfoTrans(rIter, &mTranslation); MR::getJMapInfoRotate(rIter, &mRotation); MR::getJMapInfoScale(rIter, &mScale); updateBoxParam(); } -bool AreaFormCube::isInVolume(const TVec3f &rPos) const { +bool AreaFormCube::isInVolume(const TVec3f& rPos) const { TPos3f pos; calcWorldMtx(&pos); TVec3f transpose; pos.multTranspose(rPos, transpose); - return transpose.x >= mBounding.mMin.x - && transpose.y >= mBounding.mMin.y - && transpose.z >= mBounding.mMin.z - && transpose.x < mBounding.mMax.x - && transpose.y < mBounding.mMax.y - && transpose.z < mBounding.mMax.z; + return transpose.x >= mBounding.mMin.x && transpose.y >= mBounding.mMin.y && transpose.z >= mBounding.mMin.z && transpose.x < mBounding.mMax.x && transpose.y < mBounding.mMax.y && transpose.z < mBounding.mMax.z; } -void AreaFormCube::calcWorldPos(TVec3f *pPos) const { +void AreaFormCube::calcWorldPos(TVec3f* pPos) const { if (_4 != nullptr) { _4->mult(mTranslation, *pPos); - } - else { + } else { pPos->set(mTranslation); } } // AreaFormCube::calcWorldRotate -void AreaFormCube::calcWorldBox(TDirBox3f *pBox) const { +void AreaFormCube::calcWorldBox(TDirBox3f* pBox) const { TPos3f pos; calcWorldMtx(&pos); @@ -95,7 +89,7 @@ void AreaFormCube::calcWorldBox(TDirBox3f *pBox) const { pos.mult(mBounding.mMin, pBox->_24); } -void AreaFormCube::calcLocalPos(TVec3f *pPos, const TVec3f &a2) const { +void AreaFormCube::calcLocalPos(TVec3f* pPos, const TVec3f& a2) const { TPos3f worldMtx; calcWorldMtx(&worldMtx); worldMtx.multTranspose(a2, *pPos); @@ -131,7 +125,7 @@ void AreaFormCube::updateBoxParam() { if (_8 == 1) { TVec3f temp; - + f32 v7 = mScale.y * 1000.0f; temp.x = 0.0f; temp.z = 0.0f; @@ -143,13 +137,13 @@ void AreaFormCube::updateBoxParam() { } #endif -void AreaFormCube::calcWorldMtx(register TPos3f *pPos) const { +void AreaFormCube::calcWorldMtx(register TPos3f* pPos) const { register const AreaFormCube* cube = this; - + if (_4) { return pPos->concat(*_4, (const TSMtxf&)*_48); } - #ifdef __MWERKS__ +#ifdef __MWERKS__ __asm { psq_l f0, 0x48(cube), 0, 0 psq_l f1, 0x50(cube), 0, 0 @@ -163,8 +157,9 @@ void AreaFormCube::calcWorldMtx(register TPos3f *pPos) const { psq_st f3, 0x18(pPos), 0, 0 psq_st f4, 0x20(pPos), 0, 0 psq_st f5, 0x28(pPos), 0, 0 - }; - #endif + } + ; +#endif } AreaFormSphere::AreaFormSphere() { @@ -175,26 +170,24 @@ AreaFormSphere::AreaFormSphere() { _14 = 0.0f; } -void AreaFormSphere::calcUpVec(TVec3f *pOut) const { +void AreaFormSphere::calcUpVec(TVec3f* pOut) const { if (_4 != nullptr) { _4->mult33(mUp, *pOut); MR::normalize(pOut); - } - else { + } else { pOut->set(mUp); } } -void AreaFormSphere::calcPos(TVec3f *pOut) const { +void AreaFormSphere::calcPos(TVec3f* pOut) const { if (_4 != nullptr) { _4->mult(mTranslation, *pOut); - } - else { + } else { pOut->set(mTranslation); } } -bool AreaFormSphere::isInVolume(const TVec3f &rVector) const { +bool AreaFormSphere::isInVolume(const TVec3f& rVector) const { TVec3f pos; calcPos(&pos); @@ -212,7 +205,7 @@ AreaFormBowl::AreaFormBowl() { _20 = 0.0f; } -void AreaFormBowl::init(const JMapInfoIter &rIter) { +void AreaFormBowl::init(const JMapInfoIter& rIter) { MR::getJMapInfoTrans(rIter, &mTranslation); f32 scale_x; @@ -220,15 +213,15 @@ void AreaFormBowl::init(const JMapInfoIter &rIter) { _20 = scale_x; _20 *= 500.0f; - TVec3f rotation; + TVec3f rotation; MR::getJMapInfoRotate(rIter, &rotation); calcUpVec(rotation); } -bool AreaFormBowl::isInVolume(const TVec3f &rPos) const { +bool AreaFormBowl::isInVolume(const TVec3f& rPos) const { TVec3f pos(rPos); JMathInlineVEC::PSVECSubtract(&pos, &mTranslation, &pos); - + if (PSVECMag((const Vec*)&pos) > _20) { return false; } @@ -239,7 +232,7 @@ bool AreaFormBowl::isInVolume(const TVec3f &rPos) const { return otherPos.dot(mUp) < 0.0f; } -void AreaFormBowl::calcUpVec(const TVec3f &rPos) { +void AreaFormBowl::calcUpVec(const TVec3f& rPos) { TVec3f up(0.0f, 1.0f, 0.0f); Mtx mtx; @@ -260,16 +253,15 @@ AreaFormCylinder::AreaFormCylinder() { _24 = 0.0f; } -void AreaFormCylinder::calcPos(TVec3f *pPos) const { +void AreaFormCylinder::calcPos(TVec3f* pPos) const { if (_4) { _4->mult(mTranslation, *pPos); - } - else { + } else { pPos->set(mTranslation); } } -void AreaFormCylinder::calcCenterPos(TVec3f *pCenterPos) const { +void AreaFormCylinder::calcCenterPos(TVec3f* pCenterPos) const { calcPos(pCenterPos); TVec3f upVec; @@ -278,17 +270,16 @@ void AreaFormCylinder::calcCenterPos(TVec3f *pCenterPos) const { pCenterPos->add((upVec * _24) * 0.5f); } -void AreaFormCylinder::calcUpVec(TVec3f *pUpVec) const { +void AreaFormCylinder::calcUpVec(TVec3f* pUpVec) const { if (_4) { _4->mult33(mRotation, *pUpVec); MR::normalize(pUpVec); - } - else { + } else { pUpVec->set(mRotation); } } -bool AreaFormCylinder::isInVolume(const TVec3f &rVec) const { +bool AreaFormCylinder::isInVolume(const TVec3f& rVec) const { TVec3f pos; calcPos(&pos); @@ -304,15 +295,14 @@ bool AreaFormCylinder::isInVolume(const TVec3f &rVec) const { if (MR::isInRange(v6, 0.0f, _24) && (v7 < _20)) { ret = true; - } - else { + } else { ret = false; } return ret; } -void AreaFormCylinder::calcDir(const TVec3f &a1) { +void AreaFormCylinder::calcDir(const TVec3f& a1) { mRotation.x = 0.0f; mRotation.y = 1.0f; mRotation.z = 0.0f; @@ -327,7 +317,7 @@ void AreaFormCylinder::calcDir(const TVec3f &a1) { PSVECNormalize((const Vec*)&mRotation, (Vec*)&mRotation); } -void AreaFormSphere::init(const JMapInfoIter &rIter) { +void AreaFormSphere::init(const JMapInfoIter& rIter) { MR::getJMapInfoTrans(rIter, &mTranslation); f32 scale_x; @@ -335,7 +325,7 @@ void AreaFormSphere::init(const JMapInfoIter &rIter) { _14 = scale_x; _14 *= 500.0f; - + TVec3f rotation; MR::getJMapInfoRotate(rIter, &rotation); @@ -347,10 +337,10 @@ void AreaFormSphere::init(const JMapInfoIter &rIter) { mUp = butts; } -void AreaFormCylinder::init(const JMapInfoIter &rIter) { +void AreaFormCylinder::init(const JMapInfoIter& rIter) { MR::getJMapInfoTrans(rIter, &mTranslation); TVec3f rotate; - + MR::getJMapInfoRotate(rIter, &rotate); calcDir(rotate); diff --git a/src/Game/AreaObj/AreaFormDrawer.cpp b/src/Game/AreaObj/AreaFormDrawer.cpp index 3a57e57b4..040ea5ffc 100644 --- a/src/Game/AreaObj/AreaFormDrawer.cpp +++ b/src/Game/AreaObj/AreaFormDrawer.cpp @@ -2,4 +2,4 @@ /* there used to be class here used for debug drawing...but it got stripped away and only left the static data */ static Color8 sAreaCol = Color8((u8)0x80, (u8)0, (u8)0, (u8)0x80); -static Color8 sLineCol = Color8((u8)0xFF, (u8)0xFF, (u8)0xFF, (u8)0xFF); \ No newline at end of file +static Color8 sLineCol = Color8((u8)0xFF, (u8)0xFF, (u8)0xFF, (u8)0xFF); \ No newline at end of file diff --git a/src/Game/AreaObj/AreaObj.cpp b/src/Game/AreaObj/AreaObj.cpp index b52fc6a98..d1284a2c6 100644 --- a/src/Game/AreaObj/AreaObj.cpp +++ b/src/Game/AreaObj/AreaObj.cpp @@ -3,23 +3,22 @@ #include "Game/AreaObj/AreaObjFollower.hpp" #include "Game/Map/SleepControllerHolder.hpp" -AreaObj::AreaObj(int type, const char *pName) : - NameObj(pName), - mType(type), - mIsValid(true), - _15(true), - mIsAwake(true), - mObjArg0(-1), - mObjArg1(-1), - mObjArg2(-1), - mObjArg3(-1), - mObjArg4(-1), - mObjArg5(-1), - mObjArg6(-1), - mObjArg7(-1), - mSwitchCtrl(nullptr) -{ - switch(type) { +AreaObj::AreaObj(int type, const char* pName) + : NameObj(pName), + mType(type), + mIsValid(true), + _15(true), + mIsAwake(true), + mObjArg0(-1), + mObjArg1(-1), + mObjArg2(-1), + mObjArg3(-1), + mObjArg4(-1), + mObjArg5(-1), + mObjArg6(-1), + mObjArg7(-1), + mSwitchCtrl(nullptr) { + switch (type) { case 0: mForm = new AreaFormCube(0); break; @@ -39,7 +38,7 @@ AreaObj::AreaObj(int type, const char *pName) : } // Issues with functors -void AreaObj::init(const JMapInfoIter &rIter) { +void AreaObj::init(const JMapInfoIter& rIter) { mForm->init(rIter); MR::addBaseMatrixFollowerAreaObj(this, rIter); MR::getJMapInfoArg0WithInit(rIter, &mObjArg0); @@ -54,15 +53,15 @@ void AreaObj::init(const JMapInfoIter &rIter) { mSwitchCtrl = MR::createStageSwitchCtrl(this, rIter); if (mSwitchCtrl->isValidSwitchAppear()) { - MR::FunctorV0M validateFunc = MR::Functor(this, &AreaObj::validate); - MR::FunctorV0M invalidateFunc = MR::Functor(this, &AreaObj::invalidate); + MR::FunctorV0M validateFunc = MR::Functor(this, &AreaObj::validate); + MR::FunctorV0M invalidateFunc = MR::Functor(this, &AreaObj::invalidate); MR::listenNameObjStageSwitchOnOffAppear(this, mSwitchCtrl, validateFunc, invalidateFunc); mIsValid = false; } const char* pName; - if (MR::getObjectName(&pName, rIter) ) { + if (MR::getObjectName(&pName, rIter)) { setName(pName); } @@ -71,7 +70,7 @@ void AreaObj::init(const JMapInfoIter &rIter) { SleepControlFunc::addSleepControl(this, rIter); } -bool AreaObj::isInVolume(const TVec3f &rPos) const { +bool AreaObj::isInVolume(const TVec3f& rPos) const { return mIsValid && _15 && mIsAwake && mForm->isInVolume(rPos); } @@ -99,7 +98,7 @@ bool AreaObj::isValidSwitchB() const { return mSwitchCtrl->isValidSwitchB(); } -void AreaObj::setFollowMtx(const TPos3f *pMtx) { +void AreaObj::setFollowMtx(const TPos3f* pMtx) { mForm->_4 = const_cast(pMtx); } @@ -107,15 +106,13 @@ TPos3f* AreaObj::getFollowMtx() const { return mForm->_4; } -AreaObjMgr::AreaObjMgr(s32 count, const char* pName) : - NameObj(pName), - mArray(), - _18(count) -{ - +AreaObjMgr::AreaObjMgr(s32 count, const char* pName) + : NameObj(pName), + mArray(), + _18(count) { } -void AreaObjMgr::entry(AreaObj *pAreaObj) { +void AreaObjMgr::entry(AreaObj* pAreaObj) { if (mArray.capacity() == 0) { mArray.init(_18); } diff --git a/src/Game/AreaObj/AreaObjContainer.cpp b/src/Game/AreaObj/AreaObjContainer.cpp index c1ad7a89d..2028d64be 100644 --- a/src/Game/AreaObj/AreaObjContainer.cpp +++ b/src/Game/AreaObj/AreaObjContainer.cpp @@ -10,90 +10,359 @@ #include namespace { - template + template AreaObjMgr* createManager(s32 type, const char* pName) { return new T(type, pName); } const Name2CreateManagerFunc cCreateTable[] = { - { "SwitchArea", 0x40, createManager, }, - { "RaceJudgeCube", 0x40, createManager, }, - { "NinForceWindCube", 0x40, createManager, }, - { "NinAbyssCube", 0x40, createManager, }, - { "CubeCamera", 0xA0, createManager, }, - { "BindEndCube", 0x40, createManager, }, - { "EffectCylinder", 0x40, createManager, }, - { "DeathArea", 0x40, createManager, }, - { "WarpCube", 0x40, createManager, }, - { "TripodBossStepStart", 0x40, createManager, }, - { "Water", 0x40, createManager, }, - { "PlaneModeCube", 0x10, createManager, }, - { "PlaneCircularModeCube", 0x10, createManager, }, - { "PipeModeCube", 0x4, createManager, }, - { "TowerModeCylinder", 0x4, createManager, }, - { "ShadeCube", 0x40, createManager, }, - { "PullBackCube", 0x40, createManager, }, - { "PullBackCylinder", 0x40, createManager, }, - { "RestartCube", 0x40, createManager, }, - { "ChangeBgmCube", 0x20, createManager, }, - { "BgmProhibitArea", 0x4, createManager, }, - { "SoundEmitterCube", 0x10, createManager, }, - { "SoundEmitterSphere", 0x8, createManager, }, - { "PlaneCollisionCube", 0x10, createManager, }, - { "ForbidTriangleJumpCube", 0x10, createManager, }, - { "ForbidWaterSearchCube", 0x10, createManager, }, - { "QuakeEffectArea", 0x10, createManager, }, - { "HazeCube", 0x10, createManager, }, - { "AudioEffectArea", 0x10, createManager, }, - { "BigBubbleGoalArea", 0x10, createManager, }, - { "SunLightArea", 0x10, createManager, }, - { "GlaringLightArea", 0x40, createManager, }, - { "ViewGroupCtrlCube", 0x40, createManager, }, - { "LensFlareArea", 0x40, createManager, }, - { "CameraRepulsiveArea", 0x80, createManager, }, - { "LightArea", 0x80, createManager, }, - { "FallsCube", 0x20, createManager, }, - { "MercatorCube", 0x1, createManager, }, - { "AstroChangeStageCube", 0x10, createManager, }, - { "ImageEffectArea", 0x20, createManager, }, - { "BlueStarGuidanceCube", 0x10, createManager, }, - { "TicoSeedGuidanceCube", 0x10, createManager, }, - { "MessageArea", 0x10, createManager, }, - { "SmokeEffectColorArea", 0x10, createManager, }, - { "BeeWallShortDistArea", 0x10, createManager, }, - { "ExtraWallCheckArea", 0x10, createManager, }, - { "ExtraWallCheckCylinder", 0x10, createManager, }, - { "SpinGuidanceCube", 0x10, createManager, }, - { "HipDropGuidanceCube", 0x10, createManager, }, - { "TamakoroMoveGuidanceCube", 0x10, createManager, }, - { "TamakoroJumpGuidanceCube", 0x10, createManager, }, - { "BigBubbleGuidanceCube", 0x10, createManager, }, - { "HeavySteeringCube", 0x10, createManager, }, - { "NonSleepCube", 0x10, createManager, }, - { "AreaMoveSphere", 0x10, createManager, }, - { "DodoryuClosedCylinder", 0x8, createManager, }, - { "DashChargeCylinder", 0x8, createManager, }, - { "PlayerSeArea", 0x8, createManager, }, - { "RasterScrollCube", 0x8, createManager, }, - { "OnimasuCube", 0x20, createManager, }, - { "ForbidJumpCube", 0x8, createManager, }, - { "CollisionArea", 0x40, createManager, }, - { "AstroOverlookArea", 0x8, createManager, }, - { "CelestrialSphere", 0x4, createManager, }, - { "MirrorArea", 0x10, createManager, }, - { "DarkMatterCube", 0x40, createManager, }, - { "DarkMatterCylinder", 0x20, createManager, }, + { + "SwitchArea", + 0x40, + createManager, + }, + { + "RaceJudgeCube", + 0x40, + createManager, + }, + { + "NinForceWindCube", + 0x40, + createManager, + }, + { + "NinAbyssCube", + 0x40, + createManager, + }, + { + "CubeCamera", + 0xA0, + createManager, + }, + { + "BindEndCube", + 0x40, + createManager, + }, + { + "EffectCylinder", + 0x40, + createManager, + }, + { + "DeathArea", + 0x40, + createManager, + }, + { + "WarpCube", + 0x40, + createManager, + }, + { + "TripodBossStepStart", + 0x40, + createManager, + }, + { + "Water", + 0x40, + createManager, + }, + { + "PlaneModeCube", + 0x10, + createManager, + }, + { + "PlaneCircularModeCube", + 0x10, + createManager, + }, + { + "PipeModeCube", + 0x4, + createManager, + }, + { + "TowerModeCylinder", + 0x4, + createManager, + }, + { + "ShadeCube", + 0x40, + createManager, + }, + { + "PullBackCube", + 0x40, + createManager, + }, + { + "PullBackCylinder", + 0x40, + createManager, + }, + { + "RestartCube", + 0x40, + createManager, + }, + { + "ChangeBgmCube", + 0x20, + createManager, + }, + { + "BgmProhibitArea", + 0x4, + createManager, + }, + { + "SoundEmitterCube", + 0x10, + createManager, + }, + { + "SoundEmitterSphere", + 0x8, + createManager, + }, + { + "PlaneCollisionCube", + 0x10, + createManager, + }, + { + "ForbidTriangleJumpCube", + 0x10, + createManager, + }, + { + "ForbidWaterSearchCube", + 0x10, + createManager, + }, + { + "QuakeEffectArea", + 0x10, + createManager, + }, + { + "HazeCube", + 0x10, + createManager, + }, + { + "AudioEffectArea", + 0x10, + createManager, + }, + { + "BigBubbleGoalArea", + 0x10, + createManager, + }, + { + "SunLightArea", + 0x10, + createManager, + }, + { + "GlaringLightArea", + 0x40, + createManager, + }, + { + "ViewGroupCtrlCube", + 0x40, + createManager, + }, + { + "LensFlareArea", + 0x40, + createManager, + }, + { + "CameraRepulsiveArea", + 0x80, + createManager, + }, + { + "LightArea", + 0x80, + createManager, + }, + { + "FallsCube", + 0x20, + createManager, + }, + { + "MercatorCube", + 0x1, + createManager, + }, + { + "AstroChangeStageCube", + 0x10, + createManager, + }, + { + "ImageEffectArea", + 0x20, + createManager, + }, + { + "BlueStarGuidanceCube", + 0x10, + createManager, + }, + { + "TicoSeedGuidanceCube", + 0x10, + createManager, + }, + { + "MessageArea", + 0x10, + createManager, + }, + { + "SmokeEffectColorArea", + 0x10, + createManager, + }, + { + "BeeWallShortDistArea", + 0x10, + createManager, + }, + { + "ExtraWallCheckArea", + 0x10, + createManager, + }, + { + "ExtraWallCheckCylinder", + 0x10, + createManager, + }, + { + "SpinGuidanceCube", + 0x10, + createManager, + }, + { + "HipDropGuidanceCube", + 0x10, + createManager, + }, + { + "TamakoroMoveGuidanceCube", + 0x10, + createManager, + }, + { + "TamakoroJumpGuidanceCube", + 0x10, + createManager, + }, + { + "BigBubbleGuidanceCube", + 0x10, + createManager, + }, + { + "HeavySteeringCube", + 0x10, + createManager, + }, + { + "NonSleepCube", + 0x10, + createManager, + }, + { + "AreaMoveSphere", + 0x10, + createManager, + }, + { + "DodoryuClosedCylinder", + 0x8, + createManager, + }, + { + "DashChargeCylinder", + 0x8, + createManager, + }, + { + "PlayerSeArea", + 0x8, + createManager, + }, + { + "RasterScrollCube", + 0x8, + createManager, + }, + { + "OnimasuCube", + 0x20, + createManager, + }, + { + "ForbidJumpCube", + 0x8, + createManager, + }, + { + "CollisionArea", + 0x40, + createManager, + }, + { + "AstroOverlookArea", + 0x8, + createManager, + }, + { + "CelestrialSphere", + 0x4, + createManager, + }, + { + "MirrorArea", + 0x10, + createManager, + }, + { + "DarkMatterCube", + 0x40, + createManager, + }, + { + "DarkMatterCylinder", + 0x20, + createManager, + }, }; -}; +}; // namespace -AreaObjContainer::AreaObjContainer(const char* pName) : NameObj(pName) { +AreaObjContainer::AreaObjContainer(const char* pName) + : NameObj(pName) { mNumManagers = 0; } void AreaObjContainer::init(const JMapInfoIter& rIter) { for (s32 i = 0; i < sizeof(cCreateTable) / sizeof(*cCreateTable); i++) { const Name2CreateManagerFunc* pName2CreateManagerFunc = &cCreateTable[i]; - AreaObjMgr* mgr = pName2CreateManagerFunc->mCreateFunc( + AreaObjMgr* mgr = pName2CreateManagerFunc->mCreateFunc( pName2CreateManagerFunc->_4, pName2CreateManagerFunc->mName); JMapInfoIter iter; @@ -108,7 +377,7 @@ void AreaObjContainer::init(const JMapInfoIter& rIter) { /* this function is nearly impossible to match without context behind the random stack storages */ AreaObjMgr* AreaObjContainer::getManager(const char* pName) const { - const char* str; + const char* str; AreaObjMgr** first = (AreaObjMgr**)&mManagerArray[0]; AreaObjMgr** last = (AreaObjMgr**)&mManagerArray[mNumManagers]; @@ -130,8 +399,7 @@ namespace MR { AreaObjContainer* getAreaObjContainer() { return MR::getSceneObj(SceneObj_AreaObjContainer); } -}; +}; // namespace MR AreaObjContainer::~AreaObjContainer() { - } diff --git a/src/Game/AreaObj/AreaObjFollower.cpp b/src/Game/AreaObj/AreaObjFollower.cpp index 27d14baac..50c96b466 100644 --- a/src/Game/AreaObj/AreaObjFollower.cpp +++ b/src/Game/AreaObj/AreaObjFollower.cpp @@ -1,6 +1,7 @@ #include "Game/AreaObj/AreaObjFollower.hpp" -AreaObjFollower::AreaObjFollower(AreaObj *pAreaObj, const JMapInfoIter &rIter) : BaseMatrixFollower(pAreaObj, rIter) { +AreaObjFollower::AreaObjFollower(AreaObj* pAreaObj, const JMapInfoIter& rIter) + : BaseMatrixFollower(pAreaObj, rIter) { mObj = pAreaObj; mFollowMtx.identity(); mObj->setFollowMtx(&mFollowMtx); @@ -10,15 +11,14 @@ void AreaObjFollower::update() { if (MR::isDead((LiveActor*)getFollowTargetActor()) || !isValid()) { mObj->_15 = 0; - } - else { + } else { calcFollowMatrix(&mFollowMtx); - mObj->_15 = 1; + mObj->_15 = 1; } } namespace MR { - bool addBaseMatrixFollowerAreaObj(AreaObj *pArea, const JMapInfoIter &rIter) { + bool addBaseMatrixFollowerAreaObj(AreaObj* pArea, const JMapInfoIter& rIter) { if (!MR::isValidFollowID(rIter)) { return false; } @@ -27,4 +27,4 @@ namespace MR { MR::addBaseMatrixFollower(follower); return true; } -}; \ No newline at end of file +}; // namespace MR \ No newline at end of file diff --git a/src/Game/AreaObj/AstroChangeStageCube.cpp b/src/Game/AreaObj/AstroChangeStageCube.cpp index 20511691e..681419ed9 100644 --- a/src/Game/AreaObj/AstroChangeStageCube.cpp +++ b/src/Game/AreaObj/AstroChangeStageCube.cpp @@ -1,32 +1,33 @@ #include "Game/AreaObj/AstroChangeStageCube.hpp" #include "Game/Util.hpp" -AstroChangeStageCube::AstroChangeStageCube(int a1, const char *pName) : AreaObj(a1, pName) { +AstroChangeStageCube::AstroChangeStageCube(int a1, const char* pName) + : AreaObj(a1, pName) { _3C = 1; _44 = 0; } -void AstroChangeStageCube::init(const JMapInfoIter &rIter) { +void AstroChangeStageCube::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); MR::connectToSceneAreaObj(this); - switch(mObjArg0) { - case 0: - _3C = MR::getCurrentScenarioNo(); - break; - case 1: - case 2: - case 3: - case 4: - _3C = mObjArg1; - break; - case 5: - _3C = mObjArg1; - break; + switch (mObjArg0) { + case 0: + _3C = MR::getCurrentScenarioNo(); + break; + case 1: + case 2: + case 3: + case 4: + _3C = mObjArg1; + break; + case 5: + _3C = mObjArg1; + break; } } -bool AstroChangeStageCube::isInVolume(const TVec3f &rVec) const { +bool AstroChangeStageCube::isInVolume(const TVec3f& rVec) const { if (MR::isPlayerInBind() || MR::isDemoActive()) { return false; } @@ -35,22 +36,22 @@ bool AstroChangeStageCube::isInVolume(const TVec3f &rVec) const { return false; } - switch(mObjArg0) { - case 5: - if (!MR::hasGrandStar(mObjArg2)) { - return false; - } - break; - case 1: - if (!MR::isOnGameEventFlagChildsRoom()) { - return false; - } - break; - case 3: - if (!MR::isOnGameEventFlagLibraryRoom()) { - return false; - } - break; + switch (mObjArg0) { + case 5: + if (!MR::hasGrandStar(mObjArg2)) { + return false; + } + break; + case 1: + if (!MR::isOnGameEventFlagChildsRoom()) { + return false; + } + break; + case 3: + if (!MR::isOnGameEventFlagLibraryRoom()) { + return false; + } + break; } return AreaObj::isInVolume(rVec); @@ -74,49 +75,46 @@ void AstroChangeStageCube::movement() { MR::stopStageBGM(5); MR::stopSubBGM(5); - switch(mObjArg0) { - case 3: - case 1: - case 5: - MR::startSystemSE("SE_DM_ASTRO_WIPE_IN", -1, -1); - break; - case 0: - MR::startSystemSE("SE_DM_ASTRO_WIPE_OUT", -1, -1); - break; + switch (mObjArg0) { + case 3: + case 1: + case 5: + MR::startSystemSE("SE_DM_ASTRO_WIPE_IN", -1, -1); + break; + case 0: + MR::startSystemSE("SE_DM_ASTRO_WIPE_OUT", -1, -1); + break; } _44 = 0; - } - else { + } else { if (_44 < 5) { _44++; - } - else { + } else { MR::closeSystemWipeCircleWithCaptureScreen(0x6E); MR::setWipeCircleCenterPos(*MR::getPlayerCenterPos()); - switch(mObjArg0) { - case 0: - case 4: - MR::requestGoToAstroGalaxy(_3C); - break; - case 2: - MR::requestChangeStageInGameMoving("AstroGalaxy", 1, JMapIdInfo(_3C, 0)); - break; - case 1: - if (MR::isOnGameEventFlagRosettaTalkAboutTicoInTower()) { - MR::requestStartScenarioSelect("HeavensDoorGalaxy"); - } - else { - MR::requestChangeStageInGameMoving("HeavensDoorGalaxy", 2, JMapIdInfo(_3C, 0)); - } - break; - case 3: - MR::requestChangeStageInGameMoving("LibraryRoom", 1, JMapIdInfo(_3C, 0)); - break; - case 5: - MR::requestGoToAstroDomeFromAstroGalaxy(mObjArg2, _3C); - break; + switch (mObjArg0) { + case 0: + case 4: + MR::requestGoToAstroGalaxy(_3C); + break; + case 2: + MR::requestChangeStageInGameMoving("AstroGalaxy", 1, JMapIdInfo(_3C, 0)); + break; + case 1: + if (MR::isOnGameEventFlagRosettaTalkAboutTicoInTower()) { + MR::requestStartScenarioSelect("HeavensDoorGalaxy"); + } else { + MR::requestChangeStageInGameMoving("HeavensDoorGalaxy", 2, JMapIdInfo(_3C, 0)); + } + break; + case 3: + MR::requestChangeStageInGameMoving("LibraryRoom", 1, JMapIdInfo(_3C, 0)); + break; + case 5: + MR::requestGoToAstroDomeFromAstroGalaxy(mObjArg2, _3C); + break; } } } diff --git a/src/Game/AreaObj/AudioEffectArea.cpp b/src/Game/AreaObj/AudioEffectArea.cpp index 5a256a981..1183d8b6a 100644 --- a/src/Game/AreaObj/AudioEffectArea.cpp +++ b/src/Game/AreaObj/AudioEffectArea.cpp @@ -1,12 +1,13 @@ #include "Game/AreaObj/AudioEffectArea.hpp" #include "Game/Util.hpp" -AudioEffectArea::AudioEffectArea(int a1, const char *pName) : AreaObj(a1, pName) { +AudioEffectArea::AudioEffectArea(int a1, const char* pName) + : AreaObj(a1, pName) { _3C = 0; _40 = 0; } -void AudioEffectArea::init(const JMapInfoIter &rIter) { +void AudioEffectArea::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); MR::connectToSceneAreaObj(this); @@ -21,25 +22,24 @@ void AudioEffectArea::init(const JMapInfoIter &rIter) { void AudioEffectArea::movement() { bool val; - switch(_3C) { - case 3: - case 4: - val = false; + switch (_3C) { + case 3: + case 4: + val = false; - if (isInVolume(MR::getCamPos()) || isInVolume(*MR::getPlayerPos())) { - val = true; - } + if (isInVolume(MR::getCamPos()) || isInVolume(*MR::getPlayerPos())) { + val = true; + } - break; - default: - val = isInVolume(*MR::getPlayerPos()); - break; + break; + default: + val = isInVolume(*MR::getPlayerPos()); + break; } if (val) { MR::setAudioEffectType(_3C, _40); - } - else { + } else { MR::setAudioEffectType(0, 0); } } diff --git a/src/Game/AreaObj/BgmProhibitArea.cpp b/src/Game/AreaObj/BgmProhibitArea.cpp index a3a80e7e0..94ea89ffb 100644 --- a/src/Game/AreaObj/BgmProhibitArea.cpp +++ b/src/Game/AreaObj/BgmProhibitArea.cpp @@ -1,11 +1,10 @@ #include "Game/AreaObj/BgmProhibitArea.hpp" BgmProhibitArea::~BgmProhibitArea() { - } namespace { - BgmMuteSet* findDataElement(const char *pName) { + BgmMuteSet* findDataElement(const char* pName) { for (u32 i = 0; i < 2; i++) { BgmMuteSet* ret = &sBgmMuteSet[i]; @@ -16,9 +15,10 @@ namespace { return 0; } -}; +}; // namespace -BgmProhibitArea::BgmProhibitArea(int a1, const char *pName) : AreaObj(a1, pName) { +BgmProhibitArea::BgmProhibitArea(int a1, const char* pName) + : AreaObj(a1, pName) { _3C = 0; _3D = 0; _40.x = 0.0f; @@ -26,7 +26,7 @@ BgmProhibitArea::BgmProhibitArea(int a1, const char *pName) : AreaObj(a1, pName) _40.z = 0.0f; } -void BgmProhibitArea::init(const JMapInfoIter &rIter) { +void BgmProhibitArea::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); MR::connectToSceneAreaObj(this); } @@ -36,30 +36,28 @@ void BgmProhibitArea::movement() { TVec3f stack_8; stack_8.setPS(*MR::getPlayerPos()); f32 dist = PSVECDistance(&stack_8, &_40); - + if (isInVolume(*MR::getPlayerPos())) { _3D = 0; if (!_3C && MR::isPlayingStageBgm()) { BgmMuteSet* set = findDataElement(MR::getCurrentStageName()); - s32 v10 = set ? set->_4 : -1; + s32 v10 = set ? set->_4 : -1; if (v10 >= 0) { if (dist >= 10000.0f) { MR::setStageBGMState(v10, 0); - } - else { + } else { MR::setStageBGMState(v10, 120); } } _3C = 1; } - } - else { + } else { _3C = 0; if (!_3D && MR::isPlayingStageBgm()) { BgmMuteSet* set = findDataElement(MR::getCurrentStageName()); - s32 v14 = set ? set->_8 : -1; + s32 v14 = set ? set->_8 : -1; if (v14 >= 0) { MR::setStageBGMState(v14, 120); diff --git a/src/Game/AreaObj/BigBubbleCameraArea.cpp b/src/Game/AreaObj/BigBubbleCameraArea.cpp index 8aa209ffa..e4b493250 100644 --- a/src/Game/AreaObj/BigBubbleCameraArea.cpp +++ b/src/Game/AreaObj/BigBubbleCameraArea.cpp @@ -1,35 +1,33 @@ #include "Game/AreaObj/BigBubbleCameraArea.hpp" #include "Game/MapObj/BigBubbleHolder.hpp" -BigBubbleSwitchArea::BigBubbleSwitchArea(int type, const char *pName) : SwitchArea(type, pName) { - +BigBubbleSwitchArea::BigBubbleSwitchArea(int type, const char* pName) + : SwitchArea(type, pName) { } BigBubbleSwitchArea::~BigBubbleSwitchArea() { - } -bool BigBubbleSwitchArea::isInVolume(const TVec3f &rPos) const { +bool BigBubbleSwitchArea::isInVolume(const TVec3f& rPos) const { if (MR::isPlayerBindedBigBubble()) { return AreaObj::isInVolume(rPos); } return false; -} +} -const char *BigBubbleSwitchArea::getManagerName() const { +const char* BigBubbleSwitchArea::getManagerName() const { return "SwitchArea"; } -BigBubbleCameraArea::BigBubbleCameraArea(int a1, const char *pName) : CubeCameraArea(a1, pName) { - +BigBubbleCameraArea::BigBubbleCameraArea(int a1, const char* pName) + : CubeCameraArea(a1, pName) { } BigBubbleCameraArea::~BigBubbleCameraArea() { - } -bool BigBubbleCameraArea::isInVolume(const TVec3f &rVec) const { +bool BigBubbleCameraArea::isInVolume(const TVec3f& rVec) const { if (MR::isPlayerBindedBigBubble()) { return CubeCameraArea::isInVolume(rVec); } diff --git a/src/Game/AreaObj/BigBubbleGoalArea.cpp b/src/Game/AreaObj/BigBubbleGoalArea.cpp index c3d9e56c3..dc1eec39c 100644 --- a/src/Game/AreaObj/BigBubbleGoalArea.cpp +++ b/src/Game/AreaObj/BigBubbleGoalArea.cpp @@ -4,7 +4,8 @@ #include "Game/Util/DirectDraw.hpp" #include "Game/Util/ObjUtil.hpp" -BigBubbleGoalArea::BigBubbleGoalArea(int type, const char *pName) : AreaObj(type, pName) { +BigBubbleGoalArea::BigBubbleGoalArea(int type, const char* pName) + : AreaObj(type, pName) { mTranslation.x = 0.0f; mTranslation.y = 0.0f; mTranslation.z = 0.0f; @@ -14,10 +15,9 @@ BigBubbleGoalArea::BigBubbleGoalArea(int type, const char *pName) : AreaObj(type } BigBubbleGoalArea::~BigBubbleGoalArea() { - } -void BigBubbleGoalArea::init(const JMapInfoIter &rIter) { +void BigBubbleGoalArea::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); _48 = mObjArg0 <= 0 ? 1.0f : (f32)mObjArg0; @@ -40,8 +40,7 @@ void BigBubbleGoalArea::movement() { _4C = _48; onSwitchA(); mIsValid = false; - } - else if (_50 < _4C) { + } else if (_50 < _4C) { _4C = _50; } } @@ -50,7 +49,7 @@ void BigBubbleGoalArea::draw() const { if (!isValidSwitchA() || isOnSwitchA()) { return; } - + TDDraw::setup(0, 1, 0); GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); GXSetCullMode(GX_CULL_BACK); @@ -62,6 +61,6 @@ void BigBubbleGoalArea::draw() const { TDDraw::drawFillFan(mTranslation, MR::getCamZdir(), MR::getCamYdir() * 150.0f, 0x80FF, dVar4, 150.0f, 16); } -const char *BigBubbleGoalArea::getManagerName() const { +const char* BigBubbleGoalArea::getManagerName() const { return "BigBubbleGoalArea"; } diff --git a/src/Game/AreaObj/BloomArea.cpp b/src/Game/AreaObj/BloomArea.cpp index 664b0d8bd..774176686 100644 --- a/src/Game/AreaObj/BloomArea.cpp +++ b/src/Game/AreaObj/BloomArea.cpp @@ -1,8 +1,8 @@ #include "Game/AreaObj/BloomArea.hpp" #include "Game/Util/ScreenUtil.hpp" -BloomArea::BloomArea(int type, const char *pName) : - ImageEffectArea(IMAGE_EFFECT_TYPE_BLOOM, type, pName) { +BloomArea::BloomArea(int type, const char* pName) + : ImageEffectArea(IMAGE_EFFECT_TYPE_BLOOM, type, pName) { _40 = 128; _41 = 255; _44 = -1; @@ -10,10 +10,9 @@ BloomArea::BloomArea(int type, const char *pName) : } BloomArea::~BloomArea() { - } -void BloomArea::init(const JMapInfoIter &rIter) { +void BloomArea::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); MR::createNormalBloom(); @@ -34,7 +33,6 @@ void BloomArea::init(const JMapInfoIter &rIter) { } } -const char *BloomArea::getManagerName() const { +const char* BloomArea::getManagerName() const { return "ImageEffectArea"; } - \ No newline at end of file diff --git a/src/Game/AreaObj/CameraRepulsiveArea.cpp b/src/Game/AreaObj/CameraRepulsiveArea.cpp index f8931ce8b..262dcfc8a 100644 --- a/src/Game/AreaObj/CameraRepulsiveArea.cpp +++ b/src/Game/AreaObj/CameraRepulsiveArea.cpp @@ -2,18 +2,15 @@ #include "Game/Util/AreaObjUtil.hpp" CameraRepulsiveArea::~CameraRepulsiveArea() { - } CameraRepulsiveSphere::~CameraRepulsiveSphere() { - } CameraRepulsiveCylinder::~CameraRepulsiveCylinder() { - } -TVec3f CameraRepulsiveSphere::getRepulsion(const TVec3f &rRep) { +TVec3f CameraRepulsiveSphere::getRepulsion(const TVec3f& rRep) { TVec3f ret; ret.x = 0.0f; ret.y = 0.0f; @@ -21,7 +18,7 @@ TVec3f CameraRepulsiveSphere::getRepulsion(const TVec3f &rRep) { return ret; } -TVec3f CameraRepulsiveCylinder::getRepulsion(const TVec3f &rRep) { +TVec3f CameraRepulsiveCylinder::getRepulsion(const TVec3f& rRep) { TVec3f position; MR::calcCylinderPos(&position, this); TVec3f upVec; @@ -29,7 +26,7 @@ TVec3f CameraRepulsiveCylinder::getRepulsion(const TVec3f &rRep) { TVec3f ret(rRep); ret -= position; - f32 dot = ret.dot(upVec); + f32 dot = ret.dot(upVec); TVec3f _14; TVec3f _8(upVec); _8.scale(dot); diff --git a/src/Game/AreaObj/ChangeBgmCube.cpp b/src/Game/AreaObj/ChangeBgmCube.cpp index 01e3b0228..76ea40433 100644 --- a/src/Game/AreaObj/ChangeBgmCube.cpp +++ b/src/Game/AreaObj/ChangeBgmCube.cpp @@ -3,15 +3,15 @@ #include "Game/GameAudio/AudStageBgmTable.hpp" #include "Game/Util/ObjUtil.hpp" -ChangeBgmCube::ChangeBgmCube(int a1, const char *pName) : AreaObj(a1, pName) { +ChangeBgmCube::ChangeBgmCube(int a1, const char* pName) + : AreaObj(a1, pName) { _3C = 0; } ChangeBgmCube::~ChangeBgmCube() { - } -void ChangeBgmCube::init(const JMapInfoIter &rIter) { +void ChangeBgmCube::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); MR::connectToSceneAreaObj(this); } diff --git a/src/Game/AreaObj/CollisionArea.cpp b/src/Game/AreaObj/CollisionArea.cpp index 330da29c1..e1ec915df 100644 --- a/src/Game/AreaObj/CollisionArea.cpp +++ b/src/Game/AreaObj/CollisionArea.cpp @@ -6,21 +6,20 @@ #include "Inline.hpp" DynamicCollisionObj::~DynamicCollisionObj() { - } bool AreaObj::isValid() const { return mIsValid && _15 && mIsAwake; } -AreaPolygon::AreaPolygon() : DynamicCollisionObj("エリアポリゴン") { +AreaPolygon::AreaPolygon() + : DynamicCollisionObj("エリアポリゴン") { mForm = nullptr; _128 = nullptr; _12C.zero(); } AreaPolygon::~AreaPolygon() { - } /*void AreaPolygon::init(const JMapInfoIter &rIter) { @@ -63,7 +62,7 @@ AreaPolygon::~AreaPolygon() { makeActorAppeared(); }*/ -void AreaPolygon::setMtx(MtxPtr matrix, const TVec3f &a2, f32 a3) { +void AreaPolygon::setMtx(MtxPtr matrix, const TVec3f& a2, f32 a3) { _128 = matrix; _12C = a2; _138 = a3; @@ -85,7 +84,8 @@ void AreaPolygon::validate() { MR::validateCollisionParts(mParts); } -CollisionArea::CollisionArea(int type, const char *pName) : AreaObj(type, pName) { +CollisionArea::CollisionArea(int type, const char* pName) + : AreaObj(type, pName) { _3C = 0; _40 = 0.0f; _44.zero(); @@ -99,10 +99,9 @@ CollisionArea::CollisionArea(int type, const char *pName) : AreaObj(type, pName) } CollisionArea::~CollisionArea() { - } -void CollisionArea::init(const JMapInfoIter &rIter) { +void CollisionArea::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); MR::connectToSceneAreaObj(this); @@ -122,8 +121,7 @@ void CollisionArea::init(const JMapInfoIter &rIter) { if (_60 == 0) { mPolygon = nullptr; - } - else { + } else { mPolygon = new AreaPolygon(); mPolygon->mForm = mForm; mPolygon->init(rIter); @@ -146,8 +144,7 @@ void CollisionArea::movement() { mIsValid = false; } - } - else { + } else { if (!mIsValid) { if (mPolygon != nullptr) { MR::validateCollisionParts(mPolygon->mParts); @@ -162,10 +159,9 @@ void CollisionArea::movement() { if (mPolygon != nullptr) { MR::invalidateCollisionParts(mPolygon->mParts); } - } - else { + } else { TVec3f playerPos = *MR::getPlayerCenterPos(); - f32 dVar4 = static_cast(_5C); + f32 dVar4 = static_cast(_5C); if (_5C == 0) { dVar4 = MR::getPlayerHitRadius(); @@ -186,15 +182,13 @@ void CollisionArea::movement() { MR::validateCollisionParts(mPolygon->mParts); } } - } - else if (!_58 && _50 == -1) { + } else if (!_58 && _50 == -1) { TVec3f tStack84; if (_3C == 0) { tStack84 = tStack72; tStack84.setLength(dVar4 + _40); - } - else { + } else { TVec3f tStack96; TVec3f tStack108 = playerPos; tStack108.sub(tStack60); diff --git a/src/Game/AreaObj/CubeCamera.cpp b/src/Game/AreaObj/CubeCamera.cpp index 04c77a7c9..3aa9c2b5c 100644 --- a/src/Game/AreaObj/CubeCamera.cpp +++ b/src/Game/AreaObj/CubeCamera.cpp @@ -2,12 +2,10 @@ #include -CubeCameraArea::CubeCameraArea(int type, const char *pName) : - AreaObj(type, pName), - _3C(0), - mZoneID(0) -{ - +CubeCameraArea::CubeCameraArea(int type, const char* pName) + : AreaObj(type, pName), + _3C(0), + mZoneID(0) { } /* @@ -63,8 +61,7 @@ void CubeCameraArea::movement() { if (isValidSwitchA() && isOnSwitchA()) { mIsValid = true; } - } - else if (isValidSwitchB() && isOnSwitchB()) { + } else if (isValidSwitchB() && isOnSwitchB()) { mIsValid = false; } } @@ -77,7 +74,7 @@ u16 CubeCameraArea::getCameraID() const { return mObjArg0; } -bool CubeCameraArea::isInVolume(const TVec3f &rVec) const { +bool CubeCameraArea::isInVolume(const TVec3f& rVec) const { return (_3C & sCubeCategory) != 0 && AreaObj::isInVolume(rVec); } @@ -89,7 +86,8 @@ s32 CubeCameraArea::getCategoryArg() const { return mObjArg3; } -CubeCameraMgr::CubeCameraMgr(s32 type, const char *pName) : AreaObjMgr(type, pName) { +CubeCameraMgr::CubeCameraMgr(s32 type, const char* pName) + : AreaObjMgr(type, pName) { CubeCameraArea::sCubeCategory = 1; } @@ -100,5 +98,4 @@ void CubeCameraMgr::initAfterLoad() { // CubeCameraMgr::sort CubeCameraMgr::~CubeCameraMgr() { - } diff --git a/src/Game/AreaObj/DeathArea.cpp b/src/Game/AreaObj/DeathArea.cpp index 4c16556c9..663db9d87 100644 --- a/src/Game/AreaObj/DeathArea.cpp +++ b/src/Game/AreaObj/DeathArea.cpp @@ -2,13 +2,11 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/PlayerUtil.hpp" -DeathArea::DeathArea(int type, const char *pName) : - AreaObj(type, pName) -{ - +DeathArea::DeathArea(int type, const char* pName) + : AreaObj(type, pName) { } -void DeathArea::init(const JMapInfoIter &rIter) { +void DeathArea::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); MR::connectToSceneAreaObj(this); } @@ -23,7 +21,7 @@ void DeathArea::movement() { } } -bool DeathArea::isInVolume(const TVec3f &rVec) const { +bool DeathArea::isInVolume(const TVec3f& rVec) const { if (isValidSwitchA() && !isOnSwitchA()) { return false; } @@ -36,7 +34,6 @@ s32 DeathArea::getDeathType() const { } DeathArea::~DeathArea() { - } const char* DeathArea::getManagerName() const { diff --git a/src/Game/AreaObj/DepthOfFieldArea.cpp b/src/Game/AreaObj/DepthOfFieldArea.cpp index ca916a2b8..c74c12854 100644 --- a/src/Game/AreaObj/DepthOfFieldArea.cpp +++ b/src/Game/AreaObj/DepthOfFieldArea.cpp @@ -1,22 +1,21 @@ #include "Game/AreaObj/DepthOfFieldArea.hpp" #include "Game/Util/ScreenUtil.hpp" -DepthOfFieldArea::DepthOfFieldArea(int type, const char *pName) : - ImageEffectArea(IMAGE_EFFECT_TYPE_DOF, type, pName) { +DepthOfFieldArea::DepthOfFieldArea(int type, const char* pName) + : ImageEffectArea(IMAGE_EFFECT_TYPE_DOF, type, pName) { mIsPlayerSync = false; } DepthOfFieldArea::~DepthOfFieldArea() { - } -void DepthOfFieldArea::init(const JMapInfoIter &rIter) { +void DepthOfFieldArea::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); mIsPlayerSync = mObjArg0 > 0; MR::createDepthOfFieldBlur(); } -const char *DepthOfFieldArea::getManagerName() const { +const char* DepthOfFieldArea::getManagerName() const { return "ImageEffectArea"; } diff --git a/src/Game/AreaObj/GlaringLightArea.cpp b/src/Game/AreaObj/GlaringLightArea.cpp index 474522cd6..6bab473b0 100644 --- a/src/Game/AreaObj/GlaringLightArea.cpp +++ b/src/Game/AreaObj/GlaringLightArea.cpp @@ -2,11 +2,12 @@ #include "Game/AudioLib/AudSoundObject.hpp" #include "Game/Util.hpp" -GlaringLightAreaMgr::GlaringLightAreaMgr(s32 type, const char *pName) : AreaObjMgr(type, pName) { - +GlaringLightAreaMgr::GlaringLightAreaMgr(s32 type, const char* pName) + : AreaObjMgr(type, pName) { } -GlaringLightArea::GlaringLightArea(int type, const char *pName) : AreaObj(type, pName) { +GlaringLightArea::GlaringLightArea(int type, const char* pName) + : AreaObj(type, pName) { mSound = nullptr; mPos.x = 0.0f; mPos.y = 0.0f; @@ -14,14 +15,12 @@ GlaringLightArea::GlaringLightArea(int type, const char *pName) : AreaObj(type, } GlaringLightArea::~GlaringLightArea() { - } GlaringLightAreaMgr::~GlaringLightAreaMgr() { - } -void GlaringLightArea::init(const JMapInfoIter &rIter) { +void GlaringLightArea::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); TVec3f pos; @@ -51,14 +50,13 @@ void GlaringLightArea::movement() { } mIsValid = true; - } - else { + } else { mIsValid = false; } mSound->process(); } -const char *GlaringLightArea::getManagerName() const { +const char* GlaringLightArea::getManagerName() const { return "GlaringLightArea"; } diff --git a/src/Game/AreaObj/HazeCube.cpp b/src/Game/AreaObj/HazeCube.cpp index afdb6733a..7f0e91234 100644 --- a/src/Game/AreaObj/HazeCube.cpp +++ b/src/Game/AreaObj/HazeCube.cpp @@ -1,24 +1,24 @@ #include "Game/AreaObj/HazeCube.hpp" #include "Game/Scene/SceneObjHolder.hpp" -HazeCube::HazeCube(int type, const char *pName) : AreaObj(type, pName) { +HazeCube::HazeCube(int type, const char* pName) + : AreaObj(type, pName) { _3C = 1000.0f; } HazeCube::~HazeCube() { - } -void HazeCube::init(const JMapInfoIter &rIter) { +void HazeCube::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); if (mObjArg0 >= 0) { _3C = static_cast(mObjArg0); } - + MR::createSceneObj(SceneObj_HeatHazeDirector); } -const char *HazeCube::getManagerName() const { +const char* HazeCube::getManagerName() const { return "HazeCube"; } diff --git a/src/Game/AreaObj/ImageEffectArea.cpp b/src/Game/AreaObj/ImageEffectArea.cpp index 050fd2214..e59cd5369 100644 --- a/src/Game/AreaObj/ImageEffectArea.cpp +++ b/src/Game/AreaObj/ImageEffectArea.cpp @@ -1,12 +1,12 @@ #include "Game/AreaObj/ImageEffectArea.hpp" -ImageEffectArea::ImageEffectArea(EImageEffectType effectType, int type, const char *pName) : - AreaObj(type, pName) { +ImageEffectArea::ImageEffectArea(EImageEffectType effectType, int type, const char* pName) + : AreaObj(type, pName) { mEffectType = effectType; } -ImageEffectAreaMgr::ImageEffectAreaMgr(s32 type, const char *pName) : AreaObjMgr(type, pName) { - +ImageEffectAreaMgr::ImageEffectAreaMgr(s32 type, const char* pName) + : AreaObjMgr(type, pName) { } void ImageEffectAreaMgr::initAfterPlacement() { @@ -16,5 +16,4 @@ void ImageEffectAreaMgr::initAfterPlacement() { // ImageEffectAreaMgr::sort() ImageEffectAreaMgr::~ImageEffectAreaMgr() { - } \ No newline at end of file diff --git a/src/Game/AreaObj/LightArea.cpp b/src/Game/AreaObj/LightArea.cpp index 31dee9b11..dc43b29dd 100644 --- a/src/Game/AreaObj/LightArea.cpp +++ b/src/Game/AreaObj/LightArea.cpp @@ -1,17 +1,17 @@ #include "Game/AreaObj/LightArea.hpp" #include "Game/Util.hpp" -LightArea::LightArea(int type, const char *pName) : AreaObj(type, pName) { +LightArea::LightArea(int type, const char* pName) + : AreaObj(type, pName) { mPlacedZoneID = -1; } -void LightArea::init(const JMapInfoIter &rIter) { +void LightArea::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); mPlacedZoneID = MR::getPlacedZoneId(rIter); } LightArea::~LightArea() { - } const char* LightArea::getManagerName() const { diff --git a/src/Game/AreaObj/LightAreaHolder.cpp b/src/Game/AreaObj/LightAreaHolder.cpp index 2675cb38e..70ae73640 100644 --- a/src/Game/AreaObj/LightAreaHolder.cpp +++ b/src/Game/AreaObj/LightAreaHolder.cpp @@ -2,30 +2,28 @@ #include "Game/Map/LightZoneDataHolder.hpp" #include "Game/Map/LightFunction.hpp" -LightAreaHolder::LightAreaHolder(s32 type, const char *pName) : AreaObjMgr(type, pName) { +LightAreaHolder::LightAreaHolder(s32 type, const char* pName) + : AreaObjMgr(type, pName) { LightFunction::registerLightAreaHolder(this); } #ifdef NON_MATCHING // for some reason the register movement for isTargetArea are wrong -bool LightAreaHolder::tryFindLightID(const TVec3f &rArea, ZoneLightID *pLightID) const { +bool LightAreaHolder::tryFindLightID(const TVec3f& rArea, ZoneLightID* pLightID) const { const LightArea* lightArea = reinterpret_cast(find_in(rArea)); if (!lightArea) { if (pLightID->isOutOfArea()) { pLightID->clear(); return false; - } - else { + } else { pLightID->clear(); return true; } - } - else { + } else { if (pLightID->isTargetArea(lightArea)) { return false; - } - else { + } else { pLightID->_0 = lightArea->mPlacedZoneID; pLightID->mLightID = lightArea->mObjArg0; return true; @@ -39,5 +37,4 @@ void LightAreaHolder::initAfterPlacement() { } LightAreaHolder::~LightAreaHolder() { - } diff --git a/src/Game/AreaObj/MercatorTransformCube.cpp b/src/Game/AreaObj/MercatorTransformCube.cpp index ecbe88fd5..241063726 100644 --- a/src/Game/AreaObj/MercatorTransformCube.cpp +++ b/src/Game/AreaObj/MercatorTransformCube.cpp @@ -3,18 +3,18 @@ #include "Game/Util/SceneUtil.hpp" #include "JSystem/JMath/JMath.hpp" -MercatorTransformCube::MercatorTransformCube(int type, const char *pName) : AreaObj(type, pName) { +MercatorTransformCube::MercatorTransformCube(int type, const char* pName) + : AreaObj(type, pName) { _3C.identity(); } MercatorTransformCube::~MercatorTransformCube() { - } -void MercatorTransformCube::init(const JMapInfoIter &rIter) { +void MercatorTransformCube::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); - TMtx34f *matrix = MR::getZonePlacementMtx(rIter); + TMtx34f* matrix = MR::getZonePlacementMtx(rIter); _3C.setInline(*matrix); } @@ -26,7 +26,7 @@ f32 MercatorTransformCube::getSphereRadius() const { return static_cast(mObjArg0); } -void MercatorTransformCube::calcUV(TVec2f *uv, const TVec3f &a2) const { +void MercatorTransformCube::calcUV(TVec2f* uv, const TVec3f& a2) const { TVec3f boxSize; calcLocalBoxSize(&boxSize); boxSize *= 0.5f; @@ -38,8 +38,8 @@ void MercatorTransformCube::calcUV(TVec2f *uv, const TVec3f &a2) const { uv->y = 1.5707964f * -localPos.z / boxSize.z; } -void MercatorTransformCube::calcLocalBoxSize(TVec3f *pPos) const { - TBox3f *box = MR::getCubeLocalBox(this); +void MercatorTransformCube::calcLocalBoxSize(TVec3f* pPos) const { + TBox3f* box = MR::getCubeLocalBox(this); TVec3f max; TVec3f min; @@ -47,5 +47,5 @@ void MercatorTransformCube::calcLocalBoxSize(TVec3f *pPos) const { min.set(box->mMin); max.set(box->mMax); - JMathInlineVEC::PSVECSubtract(reinterpret_cast(&max), reinterpret_cast(&min), reinterpret_cast(pPos)); + JMathInlineVEC::PSVECSubtract(reinterpret_cast(&max), reinterpret_cast(&min), reinterpret_cast(pPos)); } diff --git a/src/Game/AreaObj/MessageArea.cpp b/src/Game/AreaObj/MessageArea.cpp index e7974fd57..4d3d68f2e 100644 --- a/src/Game/AreaObj/MessageArea.cpp +++ b/src/Game/AreaObj/MessageArea.cpp @@ -1,15 +1,15 @@ #include "Game/AreaObj/MessageArea.hpp" #include "Game/Util.hpp" -MessageArea::MessageArea(int type, const char *pName) : AreaObj(type, pName) { +MessageArea::MessageArea(int type, const char* pName) + : AreaObj(type, pName) { mZoneID = -1; } MessageArea::~MessageArea() { - } -void MessageArea::init(const JMapInfoIter &rIter) { +void MessageArea::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); mZoneID = MR::getPlacedZoneId(rIter); } diff --git a/src/Game/AreaObj/PlayerSeArea.cpp b/src/Game/AreaObj/PlayerSeArea.cpp index a68408a5d..265a02a08 100644 --- a/src/Game/AreaObj/PlayerSeArea.cpp +++ b/src/Game/AreaObj/PlayerSeArea.cpp @@ -1,15 +1,14 @@ #include "Game/AreaObj/PlayerSeArea.hpp" #include "Game/Util.hpp" -PlayerSeArea::PlayerSeArea(int type, const char *pName) : AreaObj(type, pName) { - +PlayerSeArea::PlayerSeArea(int type, const char* pName) + : AreaObj(type, pName) { } PlayerSeArea::~PlayerSeArea() { - } -void PlayerSeArea::init(const JMapInfoIter &rIter) { +void PlayerSeArea::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); MR::connectToSceneAreaObj(this); _3C = mObjArg0; @@ -25,6 +24,6 @@ void PlayerSeArea::movement() { } } -const char *PlayerSeArea::getManagerName() const { +const char* PlayerSeArea::getManagerName() const { return "PlayerSeArea"; } diff --git a/src/Game/AreaObj/QuakeEffectArea.cpp b/src/Game/AreaObj/QuakeEffectArea.cpp index ef61b74b9..7e1166f43 100644 --- a/src/Game/AreaObj/QuakeEffectArea.cpp +++ b/src/Game/AreaObj/QuakeEffectArea.cpp @@ -1,12 +1,12 @@ #include "Game/AreaObj/QuakeEffectArea.hpp" #include "Game/Scene/SceneObjHolder.hpp" -QuakeEffectArea::QuakeEffectArea(int type, const char *pName) : AreaObj(type, pName) { +QuakeEffectArea::QuakeEffectArea(int type, const char* pName) + : AreaObj(type, pName) { if (!MR::createSceneObj(SceneObj_QuakeEffectGenerator)) { MR::createSceneObj(SceneObj_QuakeEffectGenerator); } } QuakeEffectArea::~QuakeEffectArea() { - } \ No newline at end of file diff --git a/src/Game/AreaObj/RestartCube.cpp b/src/Game/AreaObj/RestartCube.cpp index 858dafac8..e42fd942b 100644 --- a/src/Game/AreaObj/RestartCube.cpp +++ b/src/Game/AreaObj/RestartCube.cpp @@ -4,7 +4,8 @@ #include "Game/GameAudio/AudStageBgmTable.hpp" #include "Game/Util.hpp" -RestartCube::RestartCube(int type, const char *pName) : AreaObj(type, pName) { +RestartCube::RestartCube(int type, const char* pName) + : AreaObj(type, pName) { mIdInfo = nullptr; _40 = -1; _44 = -1; @@ -12,10 +13,9 @@ RestartCube::RestartCube(int type, const char *pName) : AreaObj(type, pName) { } RestartCube::~RestartCube() { - } -void RestartCube::init(const JMapInfoIter &rIter) { +void RestartCube::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); mIdInfo = new JMapIdInfo(mObjArg0, rIter); _40 = mObjArg1; @@ -26,7 +26,7 @@ void RestartCube::init(const JMapInfoIter &rIter) { void RestartCube::updatePlayerRestartIdInfo() { if (mObjArg3 == -1 || MR::isOnGroundPlayer()) { MR::setPlayerRestartIdInfo(*mIdInfo); - + if (!_48 && !MR::isCubeBgmChangeInvalid() && _40 >= 0) { changeBgm(); } diff --git a/src/Game/AreaObj/ScreenBlurArea.cpp b/src/Game/AreaObj/ScreenBlurArea.cpp index fc9427fcf..1c5166dd1 100644 --- a/src/Game/AreaObj/ScreenBlurArea.cpp +++ b/src/Game/AreaObj/ScreenBlurArea.cpp @@ -1,25 +1,24 @@ #include "Game/AreaObj/ScreenBlurArea.hpp" #include "Game/Util/ScreenUtil.hpp" -ScreenBlurArea::ScreenBlurArea(int type, const char *pName) : - ImageEffectArea(IMAGE_EFFECT_TYPE_BLUR, type, pName) { +ScreenBlurArea::ScreenBlurArea(int type, const char* pName) + : ImageEffectArea(IMAGE_EFFECT_TYPE_BLUR, type, pName) { mIsPlayerSync = false; } -void ScreenBlurArea::init(const JMapInfoIter &rIter) { +void ScreenBlurArea::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); mIsPlayerSync = mObjArg0 > 0; MR::createScreenBlur(); } ScreenBlurArea::~ScreenBlurArea() { - } bool ScreenBlurArea::isSyncWithPlayer() const { return mIsPlayerSync; } -const char *ScreenBlurArea::getManagerName() const { +const char* ScreenBlurArea::getManagerName() const { return "ImageEffectArea"; } diff --git a/src/Game/AreaObj/SimpleBloomArea.cpp b/src/Game/AreaObj/SimpleBloomArea.cpp index a1a4260bf..ea58bd7bd 100644 --- a/src/Game/AreaObj/SimpleBloomArea.cpp +++ b/src/Game/AreaObj/SimpleBloomArea.cpp @@ -1,8 +1,8 @@ #include "Game/AreaObj/SimpleBloomArea.hpp" #include "Game/Util.hpp" -SimpleBloomArea::SimpleBloomArea(int type, const char *pName) : - ImageEffectArea(IMAGE_EFFECT_TYPE_SIMPLE_BLOOM, type, pName) { +SimpleBloomArea::SimpleBloomArea(int type, const char* pName) + : ImageEffectArea(IMAGE_EFFECT_TYPE_SIMPLE_BLOOM, type, pName) { _40 = 0; _44 = 128; _45 = 76; @@ -11,7 +11,7 @@ SimpleBloomArea::SimpleBloomArea(int type, const char *pName) : SimpleBloomArea::~SimpleBloomArea() { } -void SimpleBloomArea::init(const JMapInfoIter &rIter) { +void SimpleBloomArea::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); MR::createSimpleBloom(); @@ -28,6 +28,6 @@ void SimpleBloomArea::init(const JMapInfoIter &rIter) { } } -const char *SimpleBloomArea::getManagerName() const { +const char* SimpleBloomArea::getManagerName() const { return "ImageEffectArea"; } diff --git a/src/Game/AreaObj/SoundEmitterCube.cpp b/src/Game/AreaObj/SoundEmitterCube.cpp index b78017a27..02089a544 100644 --- a/src/Game/AreaObj/SoundEmitterCube.cpp +++ b/src/Game/AreaObj/SoundEmitterCube.cpp @@ -3,27 +3,26 @@ #include "Game/Util.hpp" namespace { - const char *gSoundNameTable[4] = { + const char* gSoundNameTable[4] = { "SE_AT_LV_GRAVE", "SE_AT_LV_KOOPA_WIND", "SE_AT_LV_WIND_DESERT", - "SE_AT_LV_WIND_ICE_MT_TOP" - }; + "SE_AT_LV_WIND_ICE_MT_TOP"}; } -SoundEmitterCube::SoundEmitterCube(int type, const char *pName) : AreaObj(type, pName) { +SoundEmitterCube::SoundEmitterCube(int type, const char* pName) + : AreaObj(type, pName) { mSoundObj = nullptr; - _40.x = 0.0f; - _40.y = 0.0f; - _40.z = 0.0f; + _40.x = 0.0f; + _40.y = 0.0f; + _40.z = 0.0f; mSoundName = nullptr; } SoundEmitterCube::~SoundEmitterCube() { - } -void SoundEmitterCube::init(const JMapInfoIter &rIter) { +void SoundEmitterCube::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); mSoundName = gSoundNameTable[mObjArg0]; mSoundObj = new AudAnmSoundObject(&_40, 4, MR::getCurrentHeap()); diff --git a/src/Game/AreaObj/SoundEmitterSphere.cpp b/src/Game/AreaObj/SoundEmitterSphere.cpp index adf52d993..51e3c8f70 100644 --- a/src/Game/AreaObj/SoundEmitterSphere.cpp +++ b/src/Game/AreaObj/SoundEmitterSphere.cpp @@ -3,17 +3,17 @@ #include "Game/Util.hpp" namespace { - const char *gSoundNameTable[6] = { + const char* gSoundNameTable[6] = { "SE_AT_LV_MAGMA_AMBIENT", "SE_OJ_LV_FLOATING_SAND", "SE_AT_LV_WIND_DESERT", "SE_AT_LV_MAGMA_WIND_VOLCANO", "SE_AT_LV_KOOPA_FLOAT_SAND", - "SE_AT_LV_WIND_RABBIT_MAZE" - }; + "SE_AT_LV_WIND_RABBIT_MAZE"}; } -SoundEmitterSphere::SoundEmitterSphere(int type, const char *pName) : AreaObj(type, pName) { +SoundEmitterSphere::SoundEmitterSphere(int type, const char* pName) + : AreaObj(type, pName) { mSoundObj = nullptr; _40.x = 0.0f; _40.y = 0.0f; @@ -23,10 +23,9 @@ SoundEmitterSphere::SoundEmitterSphere(int type, const char *pName) : AreaObj(ty } SoundEmitterSphere::~SoundEmitterSphere() { - } -void SoundEmitterSphere::init(const JMapInfoIter &rIter) { +void SoundEmitterSphere::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); mSoundName = gSoundNameTable[mObjArg0]; mSoundIndex = mObjArg0; @@ -37,5 +36,4 @@ void SoundEmitterSphere::init(const JMapInfoIter &rIter) { } void SoundEmitterSphere::movement() { - } diff --git a/src/Game/AreaObj/SpinGuidanceArea.cpp b/src/Game/AreaObj/SpinGuidanceArea.cpp index efe08d3e9..fb5720c82 100644 --- a/src/Game/AreaObj/SpinGuidanceArea.cpp +++ b/src/Game/AreaObj/SpinGuidanceArea.cpp @@ -3,25 +3,23 @@ #include "Game/Screen/PlayerActionGuidance.hpp" #include "Game/Util.hpp" -SpinGuidanceArea::SpinGuidanceArea(int type, const char *pName) : AreaObj(type, pName) { - +SpinGuidanceArea::SpinGuidanceArea(int type, const char* pName) + : AreaObj(type, pName) { } SpinGuidanceArea::~SpinGuidanceArea() { - } -void SpinGuidanceArea::init(const JMapInfoIter &rIter) { +void SpinGuidanceArea::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); MR::createSceneObj(SceneObj_PlayerActionGuidance); - const char *objName = nullptr; + const char* objName = nullptr; MR::getObjectName(&objName, rIter); if (MR::isEqualString(objName, "SpinGuidanceCube")) { MR::getPlayerActionGuidance()->createSpinLayout(); - } - else if (MR::isEqualString(objName, "TamakoroMoveGuidanceCube") || MR::isEqualString(objName, "TamakoroJumpGuidanceCube")) { + } else if (MR::isEqualString(objName, "TamakoroMoveGuidanceCube") || MR::isEqualString(objName, "TamakoroJumpGuidanceCube")) { MR::getPlayerActionGuidance()->createTamakoroLayout(); } } \ No newline at end of file diff --git a/src/Game/AreaObj/SunLightArea.cpp b/src/Game/AreaObj/SunLightArea.cpp index 2f79fb413..6f7aa37d4 100644 --- a/src/Game/AreaObj/SunLightArea.cpp +++ b/src/Game/AreaObj/SunLightArea.cpp @@ -1,13 +1,12 @@ #include "Game/AreaObj/SunLightArea.hpp" -SunLightArea::SunLightArea(int type, const char *pName) : AreaObj(type, pName) { - +SunLightArea::SunLightArea(int type, const char* pName) + : AreaObj(type, pName) { } SunLightArea::~SunLightArea() { - } -const char *SunLightArea::getManagerName() const { - return "SunLightArea"; +const char* SunLightArea::getManagerName() const { + return "SunLightArea"; } diff --git a/src/Game/AreaObj/SwitchArea.cpp b/src/Game/AreaObj/SwitchArea.cpp index 8755c859a..706d7a8db 100644 --- a/src/Game/AreaObj/SwitchArea.cpp +++ b/src/Game/AreaObj/SwitchArea.cpp @@ -1,11 +1,11 @@ #include "Game/AreaObj/SwitchArea.hpp" #include "Game/Util.hpp" -SwitchArea::SwitchArea(int type, const char *pName) : AreaObj(type, pName) { - +SwitchArea::SwitchArea(int type, const char* pName) + : AreaObj(type, pName) { } -void SwitchArea::init(const JMapInfoIter &rIter) { +void SwitchArea::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); MR::connectToSceneAreaObj(this); } @@ -24,17 +24,15 @@ void SwitchArea::movement() { if (bVar1 && isInVolume(*MR::getPlayerPos())) { if (mObjArg1 == -1) { onSwitchA(); - } - else { + } else { offSwitchA(); } - } - else if (mObjArg0 != -1) { + } else if (mObjArg0 != -1) { offSwitchA(); } } -const char *SwitchArea::getManagerName() const { +const char* SwitchArea::getManagerName() const { return "SwitchArea"; } diff --git a/src/Game/AreaObj/WarpCube.cpp b/src/Game/AreaObj/WarpCube.cpp index f441ac598..2daa1e8d7 100644 --- a/src/Game/AreaObj/WarpCube.cpp +++ b/src/Game/AreaObj/WarpCube.cpp @@ -10,18 +10,17 @@ #include #include -WarpCube::~WarpCube() { - +WarpCube::~WarpCube() { } // WarpCubeMgr::getPairCube -void WarpCubeMgr::setInvalidateTimer(AreaObj *pObj, u16 a2) { +void WarpCubeMgr::setInvalidateTimer(AreaObj* pObj, u16 a2) { reinterpret_cast(pObj)->_48 = a2; reinterpret_cast(pObj)->mIsValid = false; } -void WarpCubeMgr::startEventCamera(const AreaObj *pAreaObj) { +void WarpCubeMgr::startEventCamera(const AreaObj* pAreaObj) { WarpCube* cube = (WarpCube*)pAreaObj; MR::startEventCameraNoTarget(cube->mCameraInfo, cube->mEventName, -1); mWarpCube = cube; @@ -89,7 +88,7 @@ void WarpCube::draw() const { } */ -void WarpCube::init(const JMapInfoIter &rIter) { +void WarpCube::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); s32 groupID = -1; diff --git a/src/Game/AreaObj/WaterArea.cpp b/src/Game/AreaObj/WaterArea.cpp index e9e62d4e3..51a107392 100644 --- a/src/Game/AreaObj/WaterArea.cpp +++ b/src/Game/AreaObj/WaterArea.cpp @@ -2,11 +2,12 @@ #include "Game/Map/WaterAreaHolder.hpp" #include "Game/Util.hpp" -WaterArea::WaterArea(int type, const char *pName) : AreaObj(type, pName) { +WaterArea::WaterArea(int type, const char* pName) + : AreaObj(type, pName) { _3C = 0; } -void WaterArea::init(const JMapInfoIter &rIter) { +void WaterArea::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); if (MR::checkJMapDataEntries(rIter)) { @@ -16,14 +17,12 @@ void WaterArea::init(const JMapInfoIter &rIter) { WaterAreaFunction::createWaterAreaHolder(); } -WaterAreaMgr::WaterAreaMgr(s32 type, const char *pName) : AreaObjMgr(type, pName) { - +WaterAreaMgr::WaterAreaMgr(s32 type, const char* pName) + : AreaObjMgr(type, pName) { } WaterArea::~WaterArea() { - } WaterAreaMgr::~WaterAreaMgr() { - } \ No newline at end of file diff --git a/src/Game/AudioLib/AudRemixMgr.cpp b/src/Game/AudioLib/AudRemixMgr.cpp index f3a605be4..4a1d4f6ed 100644 --- a/src/Game/AudioLib/AudRemixMgr.cpp +++ b/src/Game/AudioLib/AudRemixMgr.cpp @@ -1,7 +1,7 @@ #include "Game/AudioLib/AudRemixMgr.hpp" #include "JSystem/JKernel/JKRHeap.hpp" -AudRemixMgr::AudRemixMgr(JKRHeap *pHeap) { +AudRemixMgr::AudRemixMgr(JKRHeap* pHeap) { mHeap = pHeap; mGroups = nullptr; mSoundObj = nullptr; @@ -9,45 +9,40 @@ AudRemixMgr::AudRemixMgr(JKRHeap *pHeap) { } void AudRemixMgr::init() { - mSoundObj = new(mHeap, 0) AudSoundObject(nullptr, 0x10, mHeap); - mRemixSeq = new(mHeap, 0) AudRemixSequencer(); + mSoundObj = new (mHeap, 0) AudSoundObject(nullptr, 0x10, mHeap); + mRemixSeq = new (mHeap, 0) AudRemixSequencer(); } void AudRemixMgr::update() { mRemixSeq->update(); } -void AudRemixMgr::setRemixSeqResource(void *ptr) { - u32 *newPtr = (u32 *)ptr; - int groupCount = *(newPtr); +void AudRemixMgr::setRemixSeqResource(void* ptr) { + u32* newPtr = (u32*)ptr; + int groupCount = *(newPtr); newPtr++; mGroupCount = groupCount; newPtr += mGroupCount; - mGroups = new(mHeap, 0) RemixNoteGroupData[mGroupCount]; - for (int i = 0; i < mGroupCount; i++) - { - RemixNoteGroupData *pGroupData = &mGroups[i]; + mGroups = new (mHeap, 0) RemixNoteGroupData[mGroupCount]; + for (int i = 0; i < mGroupCount; i++) { + RemixNoteGroupData* pGroupData = &mGroups[i]; pGroupData->mIndex = i; pGroupData->mTrackCount = *newPtr++; pGroupData->mNoteCount = *newPtr++; pGroupData->_C = newPtr; newPtr += pGroupData->mNoteCount; - pGroupData->mRemixTracks = new(mHeap, 0) RemixTrack[pGroupData->mTrackCount]; - for (int j = 0; j < pGroupData->mTrackCount; j++) - { + pGroupData->mRemixTracks = new (mHeap, 0) RemixTrack[pGroupData->mTrackCount]; + for (int j = 0; j < pGroupData->mTrackCount; j++) { pGroupData->mRemixTracks[j]._0 = *newPtr++; pGroupData->mRemixTracks[j]._4 = newPtr; newPtr += pGroupData->mNoteCount * 4; } } - } -RemixNoteGroupData *AudRemixMgr::getRemixNoteGroupDataFromMelodyNo(s32 melodyNo) const { - for (int i = 0; i < mGroupCount; i++) - { - if (melodyNo == mGroups[i].mIndex) - { +RemixNoteGroupData* AudRemixMgr::getRemixNoteGroupDataFromMelodyNo(s32 melodyNo) const { + for (int i = 0; i < mGroupCount; i++) { + if (melodyNo == mGroups[i].mIndex) { return &mGroups[i]; } } diff --git a/src/Game/AudioLib/AudRemixSequencer.cpp b/src/Game/AudioLib/AudRemixSequencer.cpp index c928f929b..9f45f8bb3 100644 --- a/src/Game/AudioLib/AudRemixSequencer.cpp +++ b/src/Game/AudioLib/AudRemixSequencer.cpp @@ -6,9 +6,8 @@ #include "Game/SingletonHolder.hpp" #include "JSystem/JAudio2/JAISoundHandles.hpp" -namespace -{ - static const char *cRemixNoteTrackSeId[] = { +namespace { + static const char* cRemixNoteTrackSeId[] = { "SE_RS_REMIX_NOTE_GET_TRK0", "SE_RS_REMIX_NOTE_GET_TRK1", "SE_RS_REMIX_NOTE_GET_TRK2", @@ -28,8 +27,7 @@ namespace }; } -AudRmxSeqNoteOnTimer::AudRmxSeqNoteOnTimer() -{ +AudRmxSeqNoteOnTimer::AudRmxSeqNoteOnTimer() { _8 = nullptr; _0 = 0.0f; _4 = 0.0f; @@ -37,49 +35,42 @@ AudRmxSeqNoteOnTimer::AudRmxSeqNoteOnTimer() initData(); } -void AudRmxSeqNoteOnTimer::initData() -{ +void AudRmxSeqNoteOnTimer::initData() { _8 = nullptr; _4 = 0.0f; _0 = 0.0f; _C = nullptr; } -void AudRmxSeqNoteOnTimer::setData(const RemixNoteTrackData *trackData, const RemixNoteData *data) { +void AudRmxSeqNoteOnTimer::setData(const RemixNoteTrackData* trackData, const RemixNoteData* data) { _C = trackData; _8 = data; _0 = data->_C; _4 = _0 + data->_8; } -bool AudRmxSeqNoteOnTimer::update(f32 f1) -{ - if (_4 <= 0.0f) - { +bool AudRmxSeqNoteOnTimer::update(f32 f1) { + if (_4 <= 0.0f) { initData(); return false; } _4 -= f1; - if (_0 <= 0.0f) - { - if (_C != nullptr && _8 != nullptr) - { - AudRemixSequencer *pSeq = AudWrap::getRemixSequencer(); - JAISoundID id = getFreeSeID(); - JAISoundHandle *pHandle = AudWrap::getRemixSeqObject()->startSound(id); + if (_0 <= 0.0f) { + if (_C != nullptr && _8 != nullptr) { + AudRemixSequencer* pSeq = AudWrap::getRemixSequencer(); + JAISoundID id = getFreeSeID(); + JAISoundHandle* pHandle = AudWrap::getRemixSeqObject()->startSound(id); AudWrap::getSystemSeObject()->writePort(pHandle, 0xc, _C->_0); AudWrap::getSystemSeObject()->writePort(pHandle, 0xb, _8->_0); AudWrap::getSystemSeObject()->writePort(pHandle, 0xf, _8->_4); f32 x200 = pSeq->_200; u16 length = (_8->_8 * 120.0f) / x200; - if (length < 1) - { + if (length < 1) { length = 1; - } - else if (length > 1440) { + } else if (length > 1440) { length = 1440; } AudWrap::getSystemSeObject()->writePort(pHandle, 0xe, length); @@ -87,22 +78,18 @@ bool AudRmxSeqNoteOnTimer::update(f32 f1) _8 = nullptr; } return true; - } - else { + } else { _0 -= f1; return false; } } -JAISoundID AudRmxSeqNoteOnTimer::getFreeSeID() -{ - - for (u32 i = 0; i < 0x10; i++) - { +JAISoundID AudRmxSeqNoteOnTimer::getFreeSeID() { + + for (u32 i = 0; i < 0x10; i++) { JAISoundID id = AudSingletonHolder::get()->getSoundID(cRemixNoteTrackSeId[i]); - u32 *handleID = AudWrap::getRemixSeqObject()->getHandleSoundID(id); - if (handleID == nullptr) - { + u32* handleID = AudWrap::getRemixSeqObject()->getHandleSoundID(id); + if (handleID == nullptr) { return id; } } @@ -111,62 +98,49 @@ JAISoundID AudRmxSeqNoteOnTimer::getFreeSeID() return id; } -AudRemixSequencer::AudRemixSequencer() -{ +AudRemixSequencer::AudRemixSequencer() { _200 = 120.0f; _204 = 0.0f; initNoteOnBuff(); setTempo(120.0f); } -void AudRemixSequencer::initNoteOnBuff() -{ - for (int i = 0; i < 0x20; i++) - { +void AudRemixSequencer::initNoteOnBuff() { + for (int i = 0; i < 0x20; i++) { _0[i].initData(); } } -void AudRemixSequencer::update() -{ - for (int i = 0; i < 0x20; i++) - { +void AudRemixSequencer::update() { + for (int i = 0; i < 0x20; i++) { bool isUpdate = (_0[i]._4 > 0.0f); - if (isUpdate) - { + if (isUpdate) { _0[i].update(_204); } } } -void AudRemixSequencer::setTempo(f32 f1) -{ +void AudRemixSequencer::setTempo(f32 f1) { _200 = f1; f32 f2 = f1 + 0.0; f32 f3 = 48.0f; _204 = f3 * f2 / 3600.0f; } -AudRmxSeqNoteOnTimer *AudRemixSequencer::newNoteOnTimer() -{ - for (int i = 0; i < 0x20; i++) - { +AudRmxSeqNoteOnTimer* AudRemixSequencer::newNoteOnTimer() { + for (int i = 0; i < 0x20; i++) { bool isUsed = (_0[i]._4 > 0.0f); - if (!isUsed) - { + if (!isUsed) { return &_0[i]; } } return nullptr; } -void AudRemixSequencer::addNoteData(const RemixNoteTrackData *trackData, const RemixNoteData *data) -{ - if (data->_0 >= 0) - { - AudRmxSeqNoteOnTimer *pTimer = newNoteOnTimer(); - if (pTimer) - { +void AudRemixSequencer::addNoteData(const RemixNoteTrackData* trackData, const RemixNoteData* data) { + if (data->_0 >= 0) { + AudRmxSeqNoteOnTimer* pTimer = newNoteOnTimer(); + if (pTimer) { pTimer->setData(trackData, data); } } diff --git a/src/Game/Boss/BossAccessor.cpp b/src/Game/Boss/BossAccessor.cpp index b32cf835f..8b2f8f8fb 100644 --- a/src/Game/Boss/BossAccessor.cpp +++ b/src/Game/Boss/BossAccessor.cpp @@ -2,10 +2,9 @@ #include "Game/Boss/Koopa.hpp" #include "Game/Scene/SceneObjHolder.hpp" -BossAccessor::BossAccessor() : - NameObj("ボスへのアクセス"), - mBoss(nullptr) -{} +BossAccessor::BossAccessor() + : NameObj("ボスへのアクセス"), + mBoss(nullptr) {} namespace BossAccess { void setBossAccessorKoopa(Koopa* pKoopa) { @@ -21,8 +20,7 @@ namespace BossAccess { return nullptr; } -}; +}; // namespace BossAccess BossAccessor::~BossAccessor() { - } diff --git a/src/Game/Boss/BossBegomanHead.cpp b/src/Game/Boss/BossBegomanHead.cpp index d7a2263b3..b649c6752 100644 --- a/src/Game/Boss/BossBegomanHead.cpp +++ b/src/Game/Boss/BossBegomanHead.cpp @@ -10,17 +10,15 @@ namespace NrvBossBegomanHead { NEW_NERVE(HostTypeNrvSwitchOff, BossBegomanHead, SwitchOff); NEW_NERVE(HostTypeNrvTurn, BossBegomanHead, Turn); NEW_NERVE(HostTypeNrvTurnEnd, BossBegomanHead, TurnEnd); -}; +}; // namespace NrvBossBegomanHead -BossBegomanHead::BossBegomanHead(LiveActor *pParent, MtxPtr pMtx) : - PartsModel(pParent, "スイッチ頭", "BossBegomanHead", pMtx, 0x12, false), - _9C(0.0f), - mJointDelegator(nullptr) -{ - +BossBegomanHead::BossBegomanHead(LiveActor* pParent, MtxPtr pMtx) + : PartsModel(pParent, "スイッチ頭", "BossBegomanHead", pMtx, 0x12, false), + _9C(0.0f), + mJointDelegator(nullptr) { } -void BossBegomanHead::init(const JMapInfoIter &rIter) { +void BossBegomanHead::init(const JMapInfoIter& rIter) { initNerve(&NrvBossBegomanHead::HostTypeNrvDemoWait::sInstance); mJointDelegator = MR::createJointDelegatorWithNullChildFunc(this, &BossBegomanHead::calcJointEdge, "Edge"); @@ -31,17 +29,11 @@ void BossBegomanHead::init(const JMapInfoIter &rIter) { } bool BossBegomanHead::isSwitchOn() { - return isNerve(&NrvBossBegomanHead::HostTypeNrvDemoWait::sInstance) - || isNerve(&NrvBossBegomanHead::HostTypeNrvOpeningDemo::sInstance) - || isNerve(&NrvBossBegomanHead::HostTypeNrvOnWait::sInstance) - || isNerve(&NrvBossBegomanHead::HostTypeNrvSwitchOn::sInstance); + return isNerve(&NrvBossBegomanHead::HostTypeNrvDemoWait::sInstance) || isNerve(&NrvBossBegomanHead::HostTypeNrvOpeningDemo::sInstance) || isNerve(&NrvBossBegomanHead::HostTypeNrvOnWait::sInstance) || isNerve(&NrvBossBegomanHead::HostTypeNrvSwitchOn::sInstance); } bool BossBegomanHead::isEdgeOut() { - return isNerve(&NrvBossBegomanHead::HostTypeNrvOffWait::sInstance) - || isNerve(&NrvBossBegomanHead::HostTypeNrvSwitchOff::sInstance) - || isNerve(&NrvBossBegomanHead::HostTypeNrvTurn::sInstance) - || isNerve(&NrvBossBegomanHead::HostTypeNrvTurnEnd::sInstance); + return isNerve(&NrvBossBegomanHead::HostTypeNrvOffWait::sInstance) || isNerve(&NrvBossBegomanHead::HostTypeNrvSwitchOff::sInstance) || isNerve(&NrvBossBegomanHead::HostTypeNrvTurn::sInstance) || isNerve(&NrvBossBegomanHead::HostTypeNrvTurnEnd::sInstance); } void BossBegomanHead::setOpeningDemo() { @@ -129,8 +121,8 @@ void BossBegomanHead::calcAndSetBaseMtx() { mJointDelegator->registerCallBack(); } -bool BossBegomanHead::calcJointEdge(TPos3f *pMtx, const JointControllerInfo &) { - f32 v3 = _9C; +bool BossBegomanHead::calcJointEdge(TPos3f* pMtx, const JointControllerInfo&) { + f32 v3 = _9C; TVec3f v8; v8.x = 0.0; v8.y = 1.0; @@ -147,5 +139,4 @@ bool BossBegomanHead::calcJointEdge(TPos3f *pMtx, const JointControllerInfo &) { } BossBegomanHead::~BossBegomanHead() { - } diff --git a/src/Game/Boss/BossKameck.cpp b/src/Game/Boss/BossKameck.cpp index 5ccd551a7..16039e2bc 100644 --- a/src/Game/Boss/BossKameck.cpp +++ b/src/Game/Boss/BossKameck.cpp @@ -8,9 +8,10 @@ #include "Game/Enemy/KameckBeamHolder.hpp" #include "Game/LiveActor/ActorJointCtrl.hpp" -BossKameck::BossKameck(const char *pName, const char *pType) : LiveActor(pName), - _8C(pType), _90(0.0f, 1.0f), _A0(0, 0, 1), mSequencer(nullptr), mKameckHolder(nullptr), mJointCtrl(nullptr), - mActorList(nullptr), mBeamListener(nullptr), mMoveRail(nullptr), _C4(0), _C8(0, 0, 0), _D4(-1) { +BossKameck::BossKameck(const char* pName, const char* pType) + : LiveActor(pName), + _8C(pType), _90(0.0f, 1.0f), _A0(0, 0, 1), mSequencer(nullptr), mKameckHolder(nullptr), mJointCtrl(nullptr), + mActorList(nullptr), mBeamListener(nullptr), mMoveRail(nullptr), _C4(0), _C8(0, 0, 0), _D4(-1) { mBeamListener = new BossKameckBeamEventListener(this); mActorList = new ActiveActorList(8); @@ -94,13 +95,13 @@ void BossKameck::calcAndSetBaseMtx() { mJointCtrl->setCallBackFunction(); } -void BossKameck::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void BossKameck::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (mSequencer != nullptr) { mSequencer->attackSensor(pSender, pReceiver); } } -bool BossKameck::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BossKameck::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (mSequencer != nullptr) { return mSequencer->receiveMsgPlayerAttack(msg, pSender, pReceiver); } @@ -174,7 +175,7 @@ void BossKameck::updatePose() { } */ -void BossKameck::init(const JMapInfoIter &rIter) { +void BossKameck::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm(_8C, nullptr, false); MR::connectToSceneEnemy(this); @@ -211,9 +212,9 @@ void BossKameck::init(const JMapInfoIter &rIter) { makeActorDead(); } -void BossKameck::initKameckHolder(const JMapInfoIter &rIter) { - s32 childNum = MR::getChildObjNum(rIter); - s32 kameckChildNum = 0; +void BossKameck::initKameckHolder(const JMapInfoIter& rIter) { + s32 childNum = MR::getChildObjNum(rIter); + s32 kameckChildNum = 0; const char* objName; for (s32 i = 0; i < childNum; i++) { @@ -241,7 +242,7 @@ void BossKameck::initKameckHolder(const JMapInfoIter &rIter) { } } -void BossKameck::initMoveRail(const JMapInfoIter &rIter) { +void BossKameck::initMoveRail(const JMapInfoIter& rIter) { s32 childNum = MR::getChildObjNum(rIter); _C4 = 0; const char* objName; @@ -266,7 +267,7 @@ void BossKameck::initMoveRail(const JMapInfoIter &rIter) { MR::initChildObj(mMoveRail[curRails], rIter, j); curRails++; } - } + } } } @@ -290,32 +291,30 @@ void BossKameck::hitBeam(s32 beamType) { } switch (beamType) { - case 1: - MR::startSound(this, "SE_BV_KAMECK_ATK_SUCCESS", -1, -1); - break; - case 2: - case 3: - case 4: - MR::startSound(this, "SE_BV_KAMECK_ATK_SUCCESS", -1, -1); - break; + case 1: + MR::startSound(this, "SE_BV_KAMECK_ATK_SUCCESS", -1, -1); + break; + case 2: + case 3: + case 4: + MR::startSound(this, "SE_BV_KAMECK_ATK_SUCCESS", -1, -1); + break; } } - namespace MR { - NameObj* createBossKameck1(const char *pName) { + NameObj* createBossKameck1(const char* pName) { BossKameck* boss = new BossKameck(pName, "BossKameck"); boss->mSequencer = new BossKameckVs1(); return boss; } - NameObj* createBossKameck2(const char *pName) { + NameObj* createBossKameck2(const char* pName) { BossKameck* boss = new BossKameck(pName, "BossKameck"); boss->mSequencer = new BossKameckVs2(); return boss; } -}; +}; // namespace MR BossKameck::~BossKameck() { - -} +} diff --git a/src/Game/Boss/BossKameckAction.cpp b/src/Game/Boss/BossKameckAction.cpp index 4da2ca0d4..2d271077f 100644 --- a/src/Game/Boss/BossKameckAction.cpp +++ b/src/Game/Boss/BossKameckAction.cpp @@ -1,29 +1,28 @@ #include "Game/Boss/BossKameckAction.hpp" -BossKameckAction::BossKameckAction(const char *pName, BossKameck *pBoss) : ActorStateBase(pName) { +BossKameckAction::BossKameckAction(const char* pName, BossKameck* pBoss) + : ActorStateBase(pName) { mBossKameck = pBoss; } BossKameckAction::~BossKameckAction() { - } -bool BossKameckAction::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BossKameckAction::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return false; } -bool BossKameckAction::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { +bool BossKameckAction::receiveMsgPush(HitSensor* pSender, HitSensor* pReceiver) { return false; } -bool BossKameckAction::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BossKameckAction::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return false; } -bool BossKameckAction::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BossKameckAction::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return false; } -void BossKameckAction::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { - +void BossKameckAction::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { } \ No newline at end of file diff --git a/src/Game/Boss/BossKameckBarrier.cpp b/src/Game/Boss/BossKameckBarrier.cpp index d58b522a7..7829fdb03 100644 --- a/src/Game/Boss/BossKameckBarrier.cpp +++ b/src/Game/Boss/BossKameckBarrier.cpp @@ -4,11 +4,12 @@ namespace NrvBossKameckBarrier { NEW_NERVE(BossKameckBarrierNrvWait, BossKameckBarrier, Wait); }; -BossKameckBarrier::BossKameckBarrier(const char *pName, const char *pBossName) : LiveActor(pName) { +BossKameckBarrier::BossKameckBarrier(const char* pName, const char* pBossName) + : LiveActor(pName) { mBossName = pBossName; } -void BossKameckBarrier::init(const JMapInfoIter &rIter) { +void BossKameckBarrier::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm(mBossName, nullptr, false); MR::connectToSceneEnemy(this); @@ -21,7 +22,6 @@ void BossKameckBarrier::init(const JMapInfoIter &rIter) { } void BossKameckBarrier::control() { - } void BossKameckBarrier::exeWait() { @@ -32,5 +32,4 @@ void BossKameckBarrier::exeWait() { } BossKameckBarrier::~BossKameckBarrier() { - } diff --git a/src/Game/Boss/BossKameckBattleDemo.cpp b/src/Game/Boss/BossKameckBattleDemo.cpp index 318ec5cf4..b9fce2d67 100644 --- a/src/Game/Boss/BossKameckBattleDemo.cpp +++ b/src/Game/Boss/BossKameckBattleDemo.cpp @@ -1,11 +1,12 @@ #include "Game/Boss/BossKameckBattleDemo.hpp" #include "Game/Boss/BossKameck.hpp" -BossKameckDemoPosition::BossKameckDemoPosition() : LiveActor("キャスト位") { +BossKameckDemoPosition::BossKameckDemoPosition() + : LiveActor("キャスト位") { makeActorDead(); } -void BossKameckDemoPosition::init(const JMapInfoIter &rIter) { +void BossKameckDemoPosition::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("BossKameckBattleDemo", nullptr, false); @@ -31,9 +32,10 @@ namespace NrvBossKamecBattleDemo { NEW_NERVE(BossKameckBattleDemoNrvAppearVs2, BossKameckBattleDemo, AppearVs2); NEW_NERVE(BossKameckBattleDemoNrvPowerUpVs2, BossKameckBattleDemo, PowerUpVs2); NEW_NERVE(BossKameckBattleDemoNrvDownVs2, BossKameckBattleDemo, DownVs2); -}; +}; // namespace NrvBossKamecBattleDemo -BossKameckBattleDemo::BossKameckBattleDemo(BossKameck *pBoss, const JMapInfoIter &rIter) : BossKameckAction("ボスカメック戦デモ", pBoss) { +BossKameckBattleDemo::BossKameckBattleDemo(BossKameck* pBoss, const JMapInfoIter& rIter) + : BossKameckAction("ボスカメック戦デモ", pBoss) { mDemoPos = nullptr; mCurDemoName = nullptr; mDemoNerve = nullptr; @@ -55,14 +57,13 @@ void BossKameckBattleDemo::kill() { mDemoPos->kill(); } -void BossKameckBattleDemo::startTryDemo(const char *pName, const Nerve *pNerve) { +void BossKameckBattleDemo::startTryDemo(const char* pName, const Nerve* pNerve) { appear(); if (MR::tryStartDemoMarioPuppetable(mBossKameck, pName)) { MR::overlayWithPreviousScreen(2); setNerve(pNerve); - } - else { + } else { mDemoNerve = pNerve; mCurDemoName = pName; setNerve(&NrvBossKamecBattleDemo::BossKameckBattleDemoNrvTryStartDemo::sInstance); @@ -123,7 +124,7 @@ void BossKameckBattleDemo::exeAppearVs1() { MR::overlayWithPreviousScreen(1); MR::showModel(mBossKameck); BossKameckDemoPosition* pos = mDemoPos; - const char* demoName = "DemoBossKameckStart"; + const char* demoName = "DemoBossKameckStart"; pos->makeActorAppeared(); MR::startAnimCameraTargetSelf(pos, pos->mCameraInfo, demoName, 0, 1.0f); MR::startBck(pos, "DemoBossKameckStart", nullptr); @@ -170,7 +171,7 @@ void BossKameckBattleDemo::exeAppearVs2() { MR::overlayWithPreviousScreen(1); MR::showModel(mBossKameck); BossKameckDemoPosition* pos = mDemoPos; - const char* demoName = "DemoBossKameckStart2"; + const char* demoName = "DemoBossKameckStart2"; pos->makeActorAppeared(); MR::startAnimCameraTargetSelf(pos, pos->mCameraInfo, demoName, 0, 1.0f); MR::startBck(pos, "DemoBossKameckStart2", nullptr); @@ -206,7 +207,7 @@ void BossKameckBattleDemo::exeAppearVs2() { void BossKameckBattleDemo::exePowerUpVs1() { if (MR::isFirstStep(this)) { BossKameckDemoPosition* pos = mDemoPos; - const char* powerUpName = "DemoBossKameckPowerUp"; + const char* powerUpName = "DemoBossKameckPowerUp"; pos->makeActorAppeared(); MR::startAnimCameraTargetSelf(pos, pos->mCameraInfo, powerUpName, 0, 1.0f); MR::startBck(pos, powerUpName, nullptr); @@ -224,7 +225,7 @@ void BossKameckBattleDemo::exePowerUpVs1() { if (MR::isActionEnd(mBossKameck)) { MR::endDemo(mBossKameck, "カメックパワーアップVs1"); BossKameckDemoPosition* pos = mDemoPos; - const char* powerUpName = "DemoBossKameckPowerUp"; + const char* powerUpName = "DemoBossKameckPowerUp"; MR::endAnimCamera(pos, pos->mCameraInfo, powerUpName, 0, true); pos->makeActorDead(); mBossKameck->endDemoAppearKameck(); @@ -236,7 +237,7 @@ void BossKameckBattleDemo::exePowerUpVs1() { void BossKameckBattleDemo::exePowerUpVs2() { if (MR::isFirstStep(this)) { BossKameckDemoPosition* pos = mDemoPos; - const char* powerUpName = "DemoBossKameckPowerUp2"; + const char* powerUpName = "DemoBossKameckPowerUp2"; pos->makeActorAppeared(); MR::startAnimCameraTargetSelf(pos, pos->mCameraInfo, powerUpName, 0, 1.0f); MR::startBck(pos, powerUpName, nullptr); @@ -256,7 +257,7 @@ void BossKameckBattleDemo::exePowerUpVs2() { if (MR::isActionEnd(mBossKameck)) { MR::endDemo(mBossKameck, "カメックパワーアップVs2"); BossKameckDemoPosition* pos = mDemoPos; - const char* powerUpName = "DemoBossKameckPowerUp2"; + const char* powerUpName = "DemoBossKameckPowerUp2"; MR::endAnimCamera(pos, pos->mCameraInfo, powerUpName, 0, true); pos->makeActorDead(); mBossKameck->endDemoAppearKameck(); @@ -268,7 +269,7 @@ void BossKameckBattleDemo::exePowerUpVs2() { void BossKameckBattleDemo::exeDownVs1() { if (MR::isFirstStep(this)) { BossKameckDemoPosition* pos = mDemoPos; - const char* powerUpName = "DemoBossKameckDown"; + const char* powerUpName = "DemoBossKameckDown"; pos->makeActorAppeared(); MR::startAnimCameraTargetSelf(pos, pos->mCameraInfo, powerUpName, 0, 1.0f); MR::startBck(pos, powerUpName, nullptr); @@ -301,7 +302,7 @@ void BossKameckBattleDemo::exeDownVs1() { if (MR::isActionEnd(mBossKameck)) { MR::endDemo(mBossKameck, "ボスカメックダウンLv1"); BossKameckDemoPosition* pos = mDemoPos; - const char* powerUpName = "DemoBossKameckDown"; + const char* powerUpName = "DemoBossKameckDown"; MR::endAnimCamera(pos, pos->mCameraInfo, powerUpName, 0, true); pos->makeActorDead(); MR::appearPowerStarWithoutDemo(mBossKameck); @@ -314,7 +315,7 @@ void BossKameckBattleDemo::exeDownVs1() { void BossKameckBattleDemo::exeDownVs2() { if (MR::isFirstStep(this)) { BossKameckDemoPosition* pos = mDemoPos; - const char* powerUpName = "DemoBossKameckDown2"; + const char* powerUpName = "DemoBossKameckDown2"; pos->makeActorAppeared(); MR::startAnimCameraTargetSelf(pos, pos->mCameraInfo, powerUpName, 0, 1.0f); MR::startBck(pos, powerUpName, nullptr); @@ -347,7 +348,7 @@ void BossKameckBattleDemo::exeDownVs2() { if (MR::isActionEnd(mBossKameck)) { MR::endDemo(mBossKameck, "ボスカメックダウンLv2"); BossKameckDemoPosition* pos = mDemoPos; - const char* powerUpName = "DemoBossKameckDown2"; + const char* powerUpName = "DemoBossKameckDown2"; MR::endAnimCamera(pos, pos->mCameraInfo, powerUpName, 0, true); pos->makeActorDead(); MR::appearPowerStarWithoutDemo(mBossKameck); @@ -366,9 +367,7 @@ void BossKameckBattleDemo::updateCastPose() { } BossKameckBattleDemo::~BossKameckBattleDemo() { - } BossKameckDemoPosition::~BossKameckDemoPosition() { - } diff --git a/src/Game/Boss/BossKameckBattlePattarn.cpp b/src/Game/Boss/BossKameckBattlePattarn.cpp index e695911e6..d5b0a0389 100644 --- a/src/Game/Boss/BossKameckBattlePattarn.cpp +++ b/src/Game/Boss/BossKameckBattlePattarn.cpp @@ -1,6 +1,6 @@ #include "Game/Boss/BossKameckBattlePattarn.hpp" -BossKameckBattlePattarn::BossKameckBattlePattarn(s32 *a1, bool a2) { +BossKameckBattlePattarn::BossKameckBattlePattarn(s32* a1, bool a2) { _10 = a2; _0 = nullptr; _4 = 0; @@ -9,7 +9,7 @@ BossKameckBattlePattarn::BossKameckBattlePattarn(s32 *a1, bool a2) { initPattarn(a1); } -void BossKameckBattlePattarn::initPattarn(s32 *a1) { +void BossKameckBattlePattarn::initPattarn(s32* a1) { _0 = a1; u32 v2 = 0; diff --git a/src/Game/Boss/BossKameckMoveRail.cpp b/src/Game/Boss/BossKameckMoveRail.cpp index 36dfd943a..89f9d4d8a 100644 --- a/src/Game/Boss/BossKameckMoveRail.cpp +++ b/src/Game/Boss/BossKameckMoveRail.cpp @@ -1,11 +1,12 @@ #include "Game/Boss/BossKameckMoveRail.hpp" -BossKameckMoveRail::BossKameckMoveRail(const char *pName) : LiveActor(pName) { +BossKameckMoveRail::BossKameckMoveRail(const char* pName) + : LiveActor(pName) { _8C = 0; _90 = 0; } -void BossKameckMoveRail::init(const JMapInfoIter &rIter) { +void BossKameckMoveRail::init(const JMapInfoIter& rIter) { MR::getJMapInfoArg0WithInit(rIter, &_8C); initRailRider(rIter); makeActorDead(); @@ -21,7 +22,7 @@ void BossKameckMoveRail::init(const JMapInfoIter &rIter) { } } -void BossKameckMoveRail::calcMovePosition(TVec3f *pPos, s32 idx) const { +void BossKameckMoveRail::calcMovePosition(TVec3f* pPos, s32 idx) const { MR::calcRailPointPos(pPos, this, idx); } @@ -76,5 +77,4 @@ s32 BossKameckMoveRail::calcRandomStoppableIndex(s32 idx) const { } BossKameckMoveRail::~BossKameckMoveRail() { - } diff --git a/src/Game/Boss/BossKameckSequencer.cpp b/src/Game/Boss/BossKameckSequencer.cpp index 190dc2df8..66d1c7f8d 100644 --- a/src/Game/Boss/BossKameckSequencer.cpp +++ b/src/Game/Boss/BossKameckSequencer.cpp @@ -1,13 +1,14 @@ #include "Game/Boss/BossKameckSequencer.hpp" #include "Game/Boss/BossKameckBattleDemo.hpp" -BossKameckSequencer::BossKameckSequencer(const char *pName) : NerveExecutor(pName) { +BossKameckSequencer::BossKameckSequencer(const char* pName) + : NerveExecutor(pName) { mBossKameck = nullptr; _C = 0; mBattleDemo = nullptr; } -void BossKameckSequencer::init(BossKameck *pBoss, const JMapInfoIter &rIter) { +void BossKameckSequencer::init(BossKameck* pBoss, const JMapInfoIter& rIter) { mBossKameck = pBoss; mBattleDemo = new BossKameckBattleDemo(pBoss, rIter); mBattleDemo->init(); @@ -23,13 +24,13 @@ void BossKameckSequencer::update() { * This is most likely a remenant of another class that they accidentally included (or left) here, * so this code is my best guess since the vtables align up. It is some sort of BossKameckAction. */ -void BossKameckSequencer::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void BossKameckSequencer::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (_C != nullptr) { _C->attackSensor(pSender, pReceiver); } } -bool BossKameckSequencer::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BossKameckSequencer::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (_C != nullptr) { return _C->receiveMsgPlayerAttack(msg, pSender, pReceiver); } @@ -37,7 +38,7 @@ bool BossKameckSequencer::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, Hi return false; } -bool BossKameckSequencer::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BossKameckSequencer::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (_C != nullptr) { return _C->receiveMsgEnemyAttack(msg, pSender, pReceiver); } @@ -45,7 +46,7 @@ bool BossKameckSequencer::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, Hit return false; } -bool BossKameckSequencer::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { +bool BossKameckSequencer::receiveMsgPush(HitSensor* pSender, HitSensor* pReceiver) { if (_C != nullptr) { return _C->receiveMsgPush(pSender, pReceiver); } @@ -53,7 +54,7 @@ bool BossKameckSequencer::receiveMsgPush(HitSensor *pSender, HitSensor *pReceive return false; } -bool BossKameckSequencer::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BossKameckSequencer::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (_C != nullptr) { return _C->receiveOtherMsg(msg, pSender, pReceiver); } diff --git a/src/Game/Boss/BossKameckStateBattle.cpp b/src/Game/Boss/BossKameckStateBattle.cpp index 1bbc97f05..4fdae06ec 100644 --- a/src/Game/Boss/BossKameckStateBattle.cpp +++ b/src/Game/Boss/BossKameckStateBattle.cpp @@ -18,9 +18,10 @@ namespace NrvBossKameckStateBattle { NEW_NERVE(BossKameckStateBattleNrvDamage, BossKameckStateBattle, Damage); NEW_NERVE(BossKameckStateBattleNrvRecover, BossKameckStateBattle, Recover); NEW_NERVE(BossKameckStateBattleNrvGuard, BossKameckStateBattle, Guard); -}; +}; // namespace NrvBossKameckStateBattle -BossKameckStateBattle::BossKameckStateBattle(BossKameck *pBoss) : mBossKameck(pBoss), ActorStateBase("ボスカメック戦闘状態") { +BossKameckStateBattle::BossKameckStateBattle(BossKameck* pBoss) + : mBossKameck(pBoss), ActorStateBase("ボスカメック戦闘状態") { mMoveRail = nullptr; mBattlePattarn = nullptr; mBeam = nullptr; @@ -33,7 +34,7 @@ BossKameckStateBattle::BossKameckStateBattle(BossKameck *pBoss) : mBossKameck(pB _3C = 0; _3D = 0; } - + void BossKameckStateBattle::init() { initNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvWait::sInstance); } @@ -44,22 +45,21 @@ void BossKameckStateBattle::appear() { MR::onCalcGravity(mBossKameck); } -void BossKameckStateBattle::setMoveRail(BossKameckMoveRail *pMoveRail) { +void BossKameckStateBattle::setMoveRail(BossKameckMoveRail* pMoveRail) { mMoveRail = pMoveRail; } -void BossKameckStateBattle::setBattlePattarn(BossKameckBattlePattarn *pPattarn) { +void BossKameckStateBattle::setBattlePattarn(BossKameckBattlePattarn* pPattarn) { mBattlePattarn = pPattarn; } -void BossKameckStateBattle::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void BossKameckStateBattle::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (isEnableGuard() && MR::isSensorPlayer(pReceiver)) { if (isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvGuard::sInstance)) { if (MR::sendMsgEnemyAttackFlipRot(pReceiver, pSender)) { return; } - } - else if (MR::isSensorEnemyAttack(pSender)) { + } else if (MR::isSensorEnemyAttack(pSender)) { if (!MR::sendMsgEnemyAttack(pReceiver, pSender)) { MR::sendMsgPush(pReceiver, pSender); } @@ -67,7 +67,7 @@ void BossKameckStateBattle::attackSensor(HitSensor *pSender, HitSensor *pReceive } } -bool BossKameckStateBattle::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BossKameckStateBattle::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgStarPieceReflect(msg)) { return true; } @@ -83,7 +83,7 @@ bool BossKameckStateBattle::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, return false; } -bool BossKameckStateBattle::requestDamage(HitSensor *pSender, HitSensor *pReceiver) { +bool BossKameckStateBattle::requestDamage(HitSensor* pSender, HitSensor* pReceiver) { if (isEnableDamage()) { if (mBeam != nullptr) { mBeam->kill(); @@ -99,7 +99,7 @@ bool BossKameckStateBattle::requestDamage(HitSensor *pSender, HitSensor *pReceiv return false; } -bool BossKameckStateBattle::requestGuard(HitSensor *pSender, HitSensor *pReceiver) { +bool BossKameckStateBattle::requestGuard(HitSensor* pSender, HitSensor* pReceiver) { if (isEnableGuard()) { if (mBeam != nullptr) { mBeam->kill(); @@ -121,8 +121,7 @@ bool BossKameckStateBattle::tryAttackWait() { if (MR::isGreaterStep(this, 120) && MR::isNear(mBossKameck, _20, 100.0f)) { if (tryChargeBram()) { setNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvAttackWait::sInstance); - } - else { + } else { startMove(); } @@ -144,7 +143,7 @@ bool BossKameckStateBattle::trySummonKameck() { if (mBossKameck->getLivingKameckNum() == 0) { _38 = 0; return true; - } + } return false; } @@ -164,8 +163,7 @@ bool BossKameckStateBattle::tryChargeBram() { if (mBossKameck->getLivingKameckNum() == 0) { _38++; - } - else { + } else { _38 = 0; } @@ -178,8 +176,7 @@ bool BossKameckStateBattle::tryChargeBram() { void BossKameckStateBattle::startMove() { if (_3D) { setNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvHideMoveStart::sInstance); - } - else { + } else { setNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvMove::sInstance); } } @@ -253,8 +250,7 @@ void BossKameckStateBattle::exeHideMove() { if (_3C) { v2 = 20.0f; - } - else { + } else { v2 = 15.0f; } @@ -268,14 +264,12 @@ void BossKameckStateBattle::exeHideMove() { s32 v4 = _34; if (v4 <= v3) { setNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvHideMoveEnd::sInstance); - } - else { - _34 = v3 + 1; + } else { + _34 = v3 + 1; if (v4 == v3 + 1) { selectStoppablePosition(); - } - else { + } else { selectPosition(); } } @@ -296,11 +290,9 @@ void BossKameckStateBattle::exeHideMoveEnd() { if (MR::isActionEnd(mBossKameck)) { if (trySummonKameck()) { setNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvSummonKameckWait::sInstance); - } - else if (tryChargeBram()) { + } else if (tryChargeBram()) { setNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvAttackWait::sInstance); - } - else { + } else { startMove(); } } @@ -364,7 +356,7 @@ void BossKameckStateBattle::exeAttack() { } MR::attenuateVelocity(mBossKameck, 0.95999998f); - + if (MR::isGreaterStep(this, 30)) { setNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvWait::sInstance); } @@ -379,8 +371,7 @@ void BossKameckStateBattle::exeDamage() { MR::startAction(mBossKameck, "Down"); MR::startSound(mBossKameck, "SE_BV_KAMECK_LAST_DAMAGE", -1, -1); MR::startSound(mBossKameck, "SE_BM_KAMECK_LAST_DAMAGE", -1, -1); - } - else { + } else { MR::startAction(mBossKameck, "Damage"); MR::startSound(mBossKameck, "SE_BV_KAMECK_DAMAGE", -1, -1); MR::startSound(mBossKameck, "SE_BM_KAMECK_DAMAGE", -1, -1); @@ -439,14 +430,7 @@ void BossKameckStateBattle::selectPosition() { bool BossKameckStateBattle::isEnableDamage() const { bool ret = false; - if (isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvWait::sInstance) - || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvMove::sInstance) - || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvHideMoveStart::sInstance) - || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvHideMoveEnd::sInstance) - || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvSummonKameckWait::sInstance) - || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvSummonKameck::sInstance) - || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvAttackWait::sInstance) - || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvAttack::sInstance)) { + if (isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvWait::sInstance) || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvMove::sInstance) || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvHideMoveStart::sInstance) || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvHideMoveEnd::sInstance) || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvSummonKameckWait::sInstance) || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvSummonKameck::sInstance) || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvAttackWait::sInstance) || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvAttack::sInstance)) { return true; } @@ -456,14 +440,7 @@ bool BossKameckStateBattle::isEnableDamage() const { bool BossKameckStateBattle::isEnableGuard() const { bool ret = false; - if (isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvWait::sInstance) - || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvMove::sInstance) - || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvHideMoveStart::sInstance) - || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvHideMoveEnd::sInstance) - || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvSummonKameckWait::sInstance) - || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvSummonKameck::sInstance) - || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvAttackWait::sInstance) - || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvAttack::sInstance)) { + if (isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvWait::sInstance) || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvMove::sInstance) || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvHideMoveStart::sInstance) || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvHideMoveEnd::sInstance) || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvSummonKameckWait::sInstance) || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvSummonKameck::sInstance) || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvAttackWait::sInstance) || isNerve(&NrvBossKameckStateBattle::BossKameckStateBattleNrvAttack::sInstance)) { return true; } @@ -471,5 +448,4 @@ bool BossKameckStateBattle::isEnableGuard() const { } BossKameckStateBattle::~BossKameckStateBattle() { - } diff --git a/src/Game/Boss/BossKameckVs1.cpp b/src/Game/Boss/BossKameckVs1.cpp index c26eff12c..336887a24 100644 --- a/src/Game/Boss/BossKameckVs1.cpp +++ b/src/Game/Boss/BossKameckVs1.cpp @@ -5,14 +5,14 @@ #include "Game/Boss/BossKameck.hpp" namespace { - s32 sBeamPatternLv1[] = { 2, 1, -1 }; - s32 sBeamPatternLv2[] = { 3, 1, -1 }; - s32 sBeamPatternLv3[] = { 4, 1, 3, -1 }; + s32 sBeamPatternLv1[] = {2, 1, -1}; + s32 sBeamPatternLv2[] = {3, 1, -1}; + s32 sBeamPatternLv3[] = {4, 1, 3, -1}; BossKameckBattlePattarn sPatternLv1 = BossKameckBattlePattarn(sBeamPatternLv1, false); BossKameckBattlePattarn sPatternLv2 = BossKameckBattlePattarn(sBeamPatternLv2, false); BossKameckBattlePattarn sPatternLv3 = BossKameckBattlePattarn(sBeamPatternLv3, false); -}; +}; // namespace namespace NrvBossKameckVs1 { NEW_NERVE(BossKameckVs1NrvOpeningDemo, BossKameckVs1, OpeningDemo); @@ -21,13 +21,14 @@ namespace NrvBossKameckVs1 { NEW_NERVE(BossKameckVs1NrvPowerUpDemo, BossKameckVs1, PowerUpDemo); NEW_NERVE(BossKameckVs1NrvBattleLv3, BossKameckVs1, BattleLv3); NEW_NERVE(BossKameckVs1NrvEndDemo, BossKameckVs1, EndDemo); -}; +}; // namespace NrvBossKameckVs1 -BossKameckVs1::BossKameckVs1() : BossKameckSequencer("ボスカメックVs1") { +BossKameckVs1::BossKameckVs1() + : BossKameckSequencer("ボスカメックVs1") { mStateBattle = nullptr; } -void BossKameckVs1::init(BossKameck *pBoss, const JMapInfoIter &rIter) { +void BossKameckVs1::init(BossKameck* pBoss, const JMapInfoIter& rIter) { BossKameckSequencer::init(pBoss, rIter); mStateBattle = new BossKameckStateBattle(pBoss); mStateBattle->init(); @@ -39,13 +40,13 @@ void BossKameckVs1::start() { setNerve(&NrvBossKameckVs1::BossKameckVs1NrvOpeningDemo::sInstance); } -void BossKameckVs1::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void BossKameckVs1::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (isBattle()) { mStateBattle->attackSensor(pSender, pReceiver); } } -bool BossKameckVs1::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BossKameckVs1::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (isBattle()) { return mStateBattle->receiveMsgPlayerAttack(msg, pSender, pReceiver); } @@ -114,9 +115,7 @@ void BossKameckVs1::exeEndDemo() { } bool BossKameckVs1::isBattle() const { - if (isNerve(&NrvBossKameckVs1::BossKameckVs1NrvBattleLv1::sInstance) - || isNerve(&NrvBossKameckVs1::BossKameckVs1NrvBattleLv2::sInstance) - || isNerve(&NrvBossKameckVs1::BossKameckVs1NrvBattleLv3::sInstance)) { + if (isNerve(&NrvBossKameckVs1::BossKameckVs1NrvBattleLv1::sInstance) || isNerve(&NrvBossKameckVs1::BossKameckVs1NrvBattleLv2::sInstance) || isNerve(&NrvBossKameckVs1::BossKameckVs1NrvBattleLv3::sInstance)) { return true; } @@ -124,5 +123,4 @@ bool BossKameckVs1::isBattle() const { } BossKameckVs1::~BossKameckVs1() { - -} +} diff --git a/src/Game/Boss/BossKameckVs2.cpp b/src/Game/Boss/BossKameckVs2.cpp index 8e9615d39..6dc581255 100644 --- a/src/Game/Boss/BossKameckVs2.cpp +++ b/src/Game/Boss/BossKameckVs2.cpp @@ -6,14 +6,14 @@ #include "Game/Boss/BossKameckBarrier.hpp" namespace { - s32 sBeamPatternLv1[] = { 2, 1, -1 }; - s32 sBeamPatternLv2[] = { 3, 1, -1 }; - s32 sBeamPatternLv3[] = { 4, 1, 3, -1 }; + s32 sBeamPatternLv1[] = {2, 1, -1}; + s32 sBeamPatternLv2[] = {3, 1, -1}; + s32 sBeamPatternLv3[] = {4, 1, 3, -1}; BossKameckBattlePattarn sPatternLv1 = BossKameckBattlePattarn(sBeamPatternLv1, false); BossKameckBattlePattarn sPatternLv2 = BossKameckBattlePattarn(sBeamPatternLv2, false); BossKameckBattlePattarn sPatternLv3 = BossKameckBattlePattarn(sBeamPatternLv3, true); -}; +}; // namespace namespace NrvBossKameckVs2 { NEW_NERVE(BossKameckVs2NrvOpeningDemo, BossKameckVs2, OpeningDemo); @@ -23,14 +23,15 @@ namespace NrvBossKameckVs2 { NEW_NERVE(BossKameckVs2NrvBattleLv3, BossKameckVs2, BattleLv3); NEW_NERVE(BossKameckVs2NrvBattleLv4, BossKameckVs2, BattleLv4); NEW_NERVE(BossKameckVs2NrvEndDemo, BossKameckVs2, EndDemo); -}; +}; // namespace NrvBossKameckVs2 -BossKameckVs2::BossKameckVs2() : BossKameckSequencer("ボスカメックVs2") { +BossKameckVs2::BossKameckVs2() + : BossKameckSequencer("ボスカメックVs2") { mStateBattle = nullptr; mBarrier = nullptr; } -void BossKameckVs2::init(BossKameck *pBoss, const JMapInfoIter &rIter) { +void BossKameckVs2::init(BossKameck* pBoss, const JMapInfoIter& rIter) { BossKameckSequencer::init(pBoss, rIter); mStateBattle = new BossKameckStateBattle(pBoss); mStateBattle->init(); @@ -45,13 +46,13 @@ void BossKameckVs2::start() { setNerve(&NrvBossKameckVs2::BossKameckVs2NrvOpeningDemo::sInstance); } -void BossKameckVs2::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void BossKameckVs2::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (isBattle()) { mStateBattle->attackSensor(pSender, pReceiver); } } -bool BossKameckVs2::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BossKameckVs2::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (isBattle()) { return mStateBattle->receiveMsgPlayerAttack(msg, pSender, pReceiver); } @@ -136,15 +137,11 @@ void BossKameckVs2::exeEndDemo() { } bool BossKameckVs2::isBattle() const { - if (isNerve(&NrvBossKameckVs2::BossKameckVs2NrvBattleLv1::sInstance) - || isNerve(&NrvBossKameckVs2::BossKameckVs2NrvBattleLv2::sInstance) - || isNerve(&NrvBossKameckVs2::BossKameckVs2NrvBattleLv3::sInstance) - || isNerve(&NrvBossKameckVs2::BossKameckVs2NrvBattleLv4::sInstance)) { - return true; - } + if (isNerve(&NrvBossKameckVs2::BossKameckVs2NrvBattleLv1::sInstance) || isNerve(&NrvBossKameckVs2::BossKameckVs2NrvBattleLv2::sInstance) || isNerve(&NrvBossKameckVs2::BossKameckVs2NrvBattleLv3::sInstance) || isNerve(&NrvBossKameckVs2::BossKameckVs2NrvBattleLv4::sInstance)) { + return true; + } return false; } BossKameckVs2::~BossKameckVs2() { - } diff --git a/src/Game/Boss/KoopaSensorCtrl.cpp b/src/Game/Boss/KoopaSensorCtrl.cpp index a555e475c..30ba85342 100644 --- a/src/Game/Boss/KoopaSensorCtrl.cpp +++ b/src/Game/Boss/KoopaSensorCtrl.cpp @@ -2,12 +2,10 @@ #include "Game/Boss/KoopaSensorCtrl.hpp" #include "Game/Util/ActorSensorUtil.hpp" -KoopaSensorCtrl::KoopaSensorCtrl(Koopa* pHost) : - mHost(pHost) -{} +KoopaSensorCtrl::KoopaSensorCtrl(Koopa* pHost) + : mHost(pHost) {} void KoopaSensorCtrl::update(HitSensor* pSensor) { - } void KoopaSensorCtrl::initSensor() { diff --git a/src/Game/Boss/SkeletalFishBaby.cpp b/src/Game/Boss/SkeletalFishBaby.cpp index 8eff696cb..2e975c9e8 100644 --- a/src/Game/Boss/SkeletalFishBaby.cpp +++ b/src/Game/Boss/SkeletalFishBaby.cpp @@ -8,31 +8,34 @@ #include namespace { - const Vec sStarPointerTargetOffset[4] = { - { 0.0f, 0.0f, 150.0f, }, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f }, - { 0.0f, 0.0f, 0.0f } - }; + const Vec sStarPointerTargetOffset[4] = { + { + 0.0f, + 0.0f, + 150.0f, + }, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f}}; const f32 sStarPointerTargetSize[4] = { 220.0f, 150.0f, 120.0f, - 120.0f - }; + 120.0f}; - const char* sStarPointerTargetJoint[4] = { "Joint00", "Joint01", "Joint02", "Joint03" }; -}; + const char* sStarPointerTargetJoint[4] = {"Joint00", "Joint01", "Joint02", "Joint03"}; +}; // namespace namespace { NEW_NERVE(SkeletalFishBabyNrvSwim, SkeletalFishBaby, Swim); NEW_NERVE_ONEND(SkeletalFishBabyNrvBind, SkeletalFishBaby, Bind, Bind); NEW_NERVE(SkeletalFishBabyNrvBreak, SkeletalFishBaby, Break); NEW_NERVE(SkeletalFishBabyNrvDead, SkeletalFishBaby, Dead); -}; +}; // namespace -SkeletalFishBaby::SkeletalFishBaby(const char *pName) : LiveActor(pName) { +SkeletalFishBaby::SkeletalFishBaby(const char* pName) + : LiveActor(pName) { mJointIndicies = nullptr; _A0 = 20.0f; _A4 = 20.0f; @@ -47,7 +50,7 @@ SkeletalFishBaby::SkeletalFishBaby(const char *pName) : LiveActor(pName) { _AC.identity(); } -void SkeletalFishBaby::init(const JMapInfoIter &rIter) { +void SkeletalFishBaby::init(const JMapInfoIter& rIter) { MR::createAirBubbleHolder(); MR::initDefaultPos(this, rIter); @@ -74,8 +77,7 @@ void SkeletalFishBaby::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchReadAppear(this, rIter)) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { makeActorAppeared(); } @@ -127,18 +129,17 @@ void SkeletalFishBaby::calcAnim() { LiveActor::calcAnim(); } -void SkeletalFishBaby::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void SkeletalFishBaby::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayerOrRide(pReceiver)) { if (isAttackable() && MR::sendMsgEnemyAttackStrong(pReceiver, pSender)) { MR::shakeCameraStrong(); - } - else { + } else { MR::sendMsgPush(pReceiver, pSender); } } } -bool SkeletalFishBaby::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool SkeletalFishBaby::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgJetTurtleAttack(msg)) { return damage(pSender->mPosition, true); } @@ -148,23 +149,23 @@ bool SkeletalFishBaby::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSe return true; } - return false; -} - -bool SkeletalFishBaby::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { return false; } -bool SkeletalFishBaby::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool SkeletalFishBaby::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + return false; +} + +bool SkeletalFishBaby::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { switch (msg) { - case 190: - MR::invalidateClipping(this); - return true; - case 191: - MR::validateClipping(this); - return true; - default: - break; + case 190: + MR::invalidateClipping(this); + return true; + case 191: + MR::validateClipping(this); + return true; + default: + break; } return false; @@ -226,27 +227,25 @@ void SkeletalFishBaby::exeDead() { MR::appearStarPiece(this, jointPos, 10, 10.0f, 40.0f, false); MR::startSound(this, "SE_OJ_STAR_PIECE_BURST_W_F", -1, -1); kill(); - } + } } -bool SkeletalFishBaby::calcJoint(TPos3f *pJointPos, const JointControllerInfo &rInfo) { +bool SkeletalFishBaby::calcJoint(TPos3f* pJointPos, const JointControllerInfo& rInfo) { if (mJointIndicies[rInfo._4->_14] == -1) { return false; } SkeletalFishJointCalc::calcJoint(pJointPos, &_AC, mRailControl, rInfo); - return true; + return true; } -bool SkeletalFishBaby::damage(const TVec3f &rAirBubblePos, bool shakeCameraNormal) { - bool isDeadOrBroke = isNerve(&::SkeletalFishBabyNrvDead::sInstance) - || isNerve(&::SkeletalFishBabyNrvBreak::sInstance); +bool SkeletalFishBaby::damage(const TVec3f& rAirBubblePos, bool shakeCameraNormal) { + bool isDeadOrBroke = isNerve(&::SkeletalFishBabyNrvDead::sInstance) || isNerve(&::SkeletalFishBabyNrvBreak::sInstance); if (!isDeadOrBroke) { if (shakeCameraNormal) { MR::shakeCameraNormal(); - } - else { + } else { MR::shakeCameraWeak(); } @@ -263,7 +262,7 @@ void SkeletalFishBaby::calcAndSetBaseMtx() { for (u32 i = 0; i < 4; i++) { mControllers[i]->registerCallBack(); } - + TPos3f railMtx; mRailControl->getMtx(&railMtx, 0.0f); MR::setBaseTRMtx(this, railMtx); @@ -275,7 +274,7 @@ void SkeletalFishBaby::calcAndSetBaseMtx() { } } -void SkeletalFishBaby::initRail(const JMapInfoIter &rIter) { +void SkeletalFishBaby::initRail(const JMapInfoIter& rIter) { if (rIter.isValid()) { initRailRider(rIter); mRailControl->setRailActor(this, nullptr, true); @@ -308,9 +307,7 @@ void SkeletalFishBaby::initSensor() { } bool SkeletalFishBaby::isAttackable() const { - bool isAttackable = !isNerve(&::SkeletalFishBabyNrvDead::sInstance) - && !isNerve(&::SkeletalFishBabyNrvBreak::sInstance) - && !isNerve(&::SkeletalFishBabyNrvBind::sInstance); + bool isAttackable = !isNerve(&::SkeletalFishBabyNrvDead::sInstance) && !isNerve(&::SkeletalFishBabyNrvBreak::sInstance) && !isNerve(&::SkeletalFishBabyNrvBind::sInstance); return isAttackable; } @@ -319,12 +316,11 @@ bool SkeletalFishBaby::isStarPointerPointing() const { for (u32 i = 0; i < 4; i++) { if (MR::isStarPointerPointing2POnPressButton(mStarPieceTargets[i], "弱", true, false)) { return true; - } + } } return false; } SkeletalFishBaby::~SkeletalFishBaby() { - } diff --git a/src/Game/Boss/SkeletalFishBabyRail.cpp b/src/Game/Boss/SkeletalFishBabyRail.cpp index 342844b57..0840e3231 100644 --- a/src/Game/Boss/SkeletalFishBabyRail.cpp +++ b/src/Game/Boss/SkeletalFishBabyRail.cpp @@ -1,11 +1,12 @@ #include "Game/Boss/SkeletalFishBabyRail.hpp" #include "Game/Boss/SkeletalFishBabyRailHolder.hpp" -SkeletalFishBabyRail::SkeletalFishBabyRail(const char *pName) : LiveActor(pName) { +SkeletalFishBabyRail::SkeletalFishBabyRail(const char* pName) + : LiveActor(pName) { _8C = -1; }; -void SkeletalFishBabyRail::init(const JMapInfoIter &rIter) { +void SkeletalFishBabyRail::init(const JMapInfoIter& rIter) { MR::createSkeletalFishBabyRailHolder(); initRailRider(rIter); MR::getJMapInfoArg0NoInit(rIter, &_8C); @@ -14,5 +15,4 @@ void SkeletalFishBabyRail::init(const JMapInfoIter &rIter) { } SkeletalFishBabyRail::~SkeletalFishBabyRail() { - } diff --git a/src/Game/Boss/SkeletalFishBabyRailHolder.cpp b/src/Game/Boss/SkeletalFishBabyRailHolder.cpp index 7d98aaf92..4a974ce78 100644 --- a/src/Game/Boss/SkeletalFishBabyRailHolder.cpp +++ b/src/Game/Boss/SkeletalFishBabyRailHolder.cpp @@ -18,7 +18,7 @@ SkeletalFishBabyRailGroupNode::SkeletalFishBabyRailGroupNode(s32 a1) { _24 = node; } -void SkeletalFishBabyRailGroupNode::addChild(SkeletalFishBabyRail *pRail) { +void SkeletalFishBabyRailGroupNode::addChild(SkeletalFishBabyRail* pRail) { if (MR::isLoopRail(pRail)) { if (_24->_10 == nullptr) { createChild(); @@ -27,8 +27,7 @@ void SkeletalFishBabyRailGroupNode::addChild(SkeletalFishBabyRail *pRail) { SkeletalFishBabyRailSetLinkNode* node = _24->_10; _24 = node; node->_4 = pRail; - } - else { + } else { if (_20->_10 == nullptr) { createChild(); } @@ -44,7 +43,7 @@ void SkeletalFishBabyRailGroupNode::tidy() { TVec3f endPointPos; MR::calcRailEndPointPos(&endPointPos, curLink->_0); SkeletalFishBabyRailSetLinkNode* v2 = curLink; - TVec3f nearestRailPos; + TVec3f nearestRailPos; MR::calcNearestRailPos(&nearestRailPos, curLink->_4, endPointPos); f32 totalDist = PSVECDistance(&endPointPos, &nearestRailPos); @@ -74,7 +73,8 @@ void SkeletalFishBabyRailGroupNode::createChild() { mNumNodes++; } -SkeletalFishBabyRailHolder::SkeletalFishBabyRailHolder(const char *pName) : NameObj(pName) { +SkeletalFishBabyRailHolder::SkeletalFishBabyRailHolder(const char* pName) + : NameObj(pName) { mNodes = nullptr; } @@ -84,13 +84,13 @@ void SkeletalFishBabyRailHolder::initAfterPlacement() { for (curNode = nodes; curNode != nullptr; curNode = curNode->_14) { curNode->tidy(); - } + } } -void SkeletalFishBabyRailHolder::add(SkeletalFishBabyRail *pRail) { +void SkeletalFishBabyRailHolder::add(SkeletalFishBabyRail* pRail) { SkeletalFishBabyRailGroupNode* nextNode = mNodes; - for (; nextNode != nullptr; nextNode = nextNode->_14) { + for (; nextNode != nullptr; nextNode = nextNode->_14) { if (nextNode->_0 == pRail->_8C) { break; } @@ -124,10 +124,9 @@ namespace MR { void createSkeletalFishBabyRailHolder() { MR::createSceneObj(SceneObj_SkeletalFishBabyRailHolder); } -}; +}; // namespace MR SkeletalFishBabyRailHolder::~SkeletalFishBabyRailHolder() { - } SkeletalFishBabyRailSetLinkNode::SkeletalFishBabyRailSetLinkNode() { @@ -135,5 +134,5 @@ SkeletalFishBabyRailSetLinkNode::SkeletalFishBabyRailSetLinkNode() { _4 = nullptr; _8 = 0; _C = nullptr; - _10 = nullptr; + _10 = nullptr; } diff --git a/src/Game/Boss/SkeletalFishBoss.cpp b/src/Game/Boss/SkeletalFishBoss.cpp index 737f5c57a..83ed61dcc 100644 --- a/src/Game/Boss/SkeletalFishBoss.cpp +++ b/src/Game/Boss/SkeletalFishBoss.cpp @@ -20,36 +20,32 @@ namespace { static SkeletalFishBoss::SensorToCollider sColInfo[0xE] = { - { "Joint01", "BackBone01" }, - { "Joint02", "BackBone02" }, - { "Joint03", "BackBone03" }, - { "Joint04", "BackBone04" }, - { "Joint05", "BackBone05" }, - { "Joint06", "BackBone06" }, - { "Joint07", "BackBone07" }, - { "Joint08", "BackBone08" }, - { "Joint09", "BackBone09" }, - { "Joint10", "BackBone10" }, - { "Joint11", "BackBone11" }, - { "Joint12", "BackFin" }, - { "LeftFinJoint", "LeftFinJoint" }, - { "RightFinJoint", "RightFinJoint" } - }; + {"Joint01", "BackBone01"}, + {"Joint02", "BackBone02"}, + {"Joint03", "BackBone03"}, + {"Joint04", "BackBone04"}, + {"Joint05", "BackBone05"}, + {"Joint06", "BackBone06"}, + {"Joint07", "BackBone07"}, + {"Joint08", "BackBone08"}, + {"Joint09", "BackBone09"}, + {"Joint10", "BackBone10"}, + {"Joint11", "BackBone11"}, + {"Joint12", "BackFin"}, + {"LeftFinJoint", "LeftFinJoint"}, + {"RightFinJoint", "RightFinJoint"}}; static SkeletalFishBoss::HitPos sHitPosData[0x10] = { - { "Wound0", "Head", { 26.144243f, 414.56268f, 552.11462} } - }; -}; + {"Wound0", "Head", {26.144243f, 414.56268f, 552.11462}}}; +}; // namespace namespace { char* test[] = { "Shadow00", "Joint02", - "SkeletalFishBossShadow" - }; + "SkeletalFishBossShadow"}; static SkeletalFishBoss::JointToShadow sShadowInfo = { - "Shadow00", "Joint02", "SkeletalFishBossShadow" - }; + "Shadow00", "Joint02", "SkeletalFishBossShadow"}; inline SkeletalFishBoss::JointToShadow& testInline() { return sShadowInfo; @@ -66,7 +62,7 @@ namespace { inline const char* getJointName(SkeletalFishBoss::JointToShadow& jointToShadow) { return jointToShadow.mJointName; } -}; +}; // namespace namespace { NEW_NERVE(SkeletalFishBossNrvSwim, SkeletalFishBoss, Swim); @@ -84,9 +80,10 @@ namespace { NEW_NERVE(SkeletalFishBossNrvDeadDemo, SkeletalFishBoss, DeadDemo); NEW_NERVE(SkeletalFishBossNrvBreakDemo, SkeletalFishBoss, BreakDemo); NEW_NERVE(SkeletalFishBossNrvDemoWait, SkeletalFishBoss, DemoWait); -}; +}; // namespace -SkeletalFishBoss::SkeletalFishBoss(const char *pName) : LiveActor(pName) { +SkeletalFishBoss::SkeletalFishBoss(const char* pName) + : LiveActor(pName) { mJointIndicies = nullptr; mPartsArray = nullptr; mBossHead = nullptr; @@ -121,7 +118,7 @@ SkeletalFishBoss::SkeletalFishBoss(const char *pName) : LiveActor(pName) { _150.identity(); } -void SkeletalFishBoss::init(const JMapInfoIter &rIter) { +void SkeletalFishBoss::init(const JMapInfoIter& rIter) { initModelManagerWithAnm("SkeletalFishBoss", nullptr, false); MR::initDefaultPos(this, rIter); MR::getJMapInfoArg0NoInit(rIter, &_1A0); @@ -202,9 +199,7 @@ void SkeletalFishBoss::control() { } if (!isNerve(&::SkeletalFishBossNrvDead::sInstance) && !isNerve(&::SkeletalFishBossNrvAppearWait::sInstance)) { - bool isInDemo = isNerve(&::SkeletalFishBossNrvAppearDemo::sInstance) - || isNerve(&::SkeletalFishBossNrvPowerUpDemo::sInstance) - || isNerve(&::SkeletalFishBossNrvDeadDemo::sInstance); + bool isInDemo = isNerve(&::SkeletalFishBossNrvAppearDemo::sInstance) || isNerve(&::SkeletalFishBossNrvPowerUpDemo::sInstance) || isNerve(&::SkeletalFishBossNrvDeadDemo::sInstance); if (!isInDemo) { mRailControl->update(); @@ -259,7 +254,7 @@ void SkeletalFishBoss::calcAnim() { } */ -bool SkeletalFishBoss::calcJoint(TPos3f *pJointPos, const JointControllerInfo &rInfo) { +bool SkeletalFishBoss::calcJoint(TPos3f* pJointPos, const JointControllerInfo& rInfo) { if (mJointIndicies[rInfo._4->_14] == -1) { return false; } @@ -268,7 +263,7 @@ bool SkeletalFishBoss::calcJoint(TPos3f *pJointPos, const JointControllerInfo &r return true; } -void SkeletalFishBoss::damage(const HitSensor *pSensor, const TVec3f &rStarPieceOffs) { +void SkeletalFishBoss::damage(const HitSensor* pSensor, const TVec3f& rStarPieceOffs) { if (isEnableToBeDamaged()) { _D4 = pSensor; MR::shakeCameraStrong(); @@ -284,12 +279,10 @@ void SkeletalFishBoss::damage(const HitSensor *pSensor, const TVec3f &rStarPiece if (_114 <= 0) { if (_110 + 1 == _1A0) { setNerve(&::SkeletalFishBossNrvDeadDamage::sInstance); - } - else if (MR::isDemoExist("スカルシャークデモ")) { + } else if (MR::isDemoExist("スカルシャークデモ")) { setNerve(&::SkeletalFishBossNrvDown::sInstance); } - } - else { + } else { u32 numStarPiece = (_110 + 1 == _1A0) ? 15 : 10; MR::appearStarPiece(this, rStarPieceOffs, numStarPiece, 10.0f, 14.0f, false); MR::startSound(this, "SE_OJ_STAR_PIECE_BURST_W_F", -1, -1); @@ -342,8 +335,7 @@ void SkeletalFishBoss::exeOpenWait() { if (!isClose) { setNerve(&::SkeletalFishBossNrvClose::sInstance); - } - else { + } else { MR::startLevelSound(mBossHead, "SE_BM_LV_SKL_BOSS_SWIM_FAR", -1, -1, -1); MR::startLevelSound(mBossHead, "SE_BM_LV_SKL_BOSS_SWIM_NEAR", -1, -1, -1); } @@ -393,8 +385,7 @@ void SkeletalFishBoss::exeDamage() { if (_114 == 2) { MR::startBrk(this, "Damage1Color"); MR::startBrk(mBossHead, "Damage1Color"); - } - else if (_114 == 1) { + } else if (_114 == 1) { MR::startBrk(this, "Damage2Color"); MR::startBrk(mBossHead, "Damage2Color"); } @@ -453,10 +444,9 @@ void SkeletalFishBoss::exeDead() { } resetCamera(); - } - else { + } else { ActorCameraInfo info(-1, 0); - bool isCameraActive = MR::isEventCameraActive(&info, "デモ終了後カメラ") == false; + bool isCameraActive = MR::isEventCameraActive(&info, "デモ終了後カメラ") == false; if (isCameraActive) { kill(); } @@ -508,8 +498,7 @@ void SkeletalFishBoss::exePowerUpDemo() { MR::startBck(this, "PowerUp1", nullptr); MR::startBck(mBossHead, "PowerUp1", nullptr); mBossDirector->startPowerUpDemo1(); - } - else { + } else { MR::startBck(this, "PowerUp2", nullptr); MR::startBck(mBossHead, "PowerUp2", nullptr); mBossDirector->startPowerUpDemo2(); @@ -615,7 +604,7 @@ void SkeletalFishBoss::exeDemoWait() { } } -void SkeletalFishBoss::notifyAttack(SkeletalFishGuard *pGuard) { +void SkeletalFishBoss::notifyAttack(SkeletalFishGuard* pGuard) { mGuardHolder->notifyAttack(pGuard); } @@ -640,8 +629,7 @@ void SkeletalFishBoss::calcAndSetBaseMtx() { if (isInDemo) { MR::setBaseTRMtx(this, _150.toMtxPtr()); - } - else { + } else { for (u32 i = 0; i < 0xD; i++) { mControllers[i]->registerCallBack(); } @@ -663,7 +651,7 @@ void SkeletalFishBoss::calcAndSetBaseMtx() { void SkeletalFishBoss::initLevelStatus() { mBossInfo = new SkeletalFishBossInfo(this, _1A0, _1A4, "ボス戦パラメータ"); -} +} void SkeletalFishBoss::initJoint() { mJointIndicies = new s32[MR::getJointNum(this)]; @@ -686,8 +674,8 @@ void SkeletalFishBoss::initCollision() { for (u32 i = 0; i < 0xE; i++) { mPartsArray[i] = MR::createCollisionPartsFromLiveActor(this, sColInfo[i].mColliderName, mBossHead->getSensor("body"), MR::getJointMtx(this, sColInfo[i].mJointName), (MR::CollisionScaleType)2); MR::validateCollisionParts(mPartsArray[i]); - } -} + } +} void SkeletalFishBoss::initHead() { mBossHead = new SkeletalFishBossHead(this); @@ -708,12 +696,11 @@ void SkeletalFishBoss::initBreakModel() { MR::invalidateClipping(mBreakModel); } -void SkeletalFishBoss::initSwitch(const JMapInfoIter &rIter) { +void SkeletalFishBoss::initSwitch(const JMapInfoIter& rIter) { if (MR::useStageSwitchReadAppear(this, rIter)) { MR::syncStageSwitchAppear(this); - } - else if (MR::useStageSwitchReadA(this, rIter)) { - MR::listenStageSwitchOnA(this, MR::FunctorV0M(this, &SkeletalFishBoss::appear)); + } else if (MR::useStageSwitchReadA(this, rIter)) { + MR::listenStageSwitchOnA(this, MR::FunctorV0M(this, &SkeletalFishBoss::appear)); } } @@ -724,9 +711,9 @@ void SkeletalFishBoss::createGuards() { void SkeletalFishBoss::initShadow() { MR::initShadowController(this, 1); SkeletalFishBoss::JointToShadow& shadow = testInline(); - const char** bruh = (const char**)test; - const char* name = bruh[0]; - MtxPtr mtx = MR::getJointMtx(this, bruh[1]); + const char** bruh = (const char**)test; + const char* name = bruh[0]; + MtxPtr mtx = MR::getJointMtx(this, bruh[1]); //SkeletalFishBoss::JointToShadow* shadow = &sShadowInfo; MR::addShadowVolumeFlatModel(this, name, test[2], mtx); MR::setShadowDropLength(this, name, 4000.0f); @@ -735,7 +722,7 @@ void SkeletalFishBoss::initShadow() { void SkeletalFishBoss::initCamera() { ActorCameraInfo cameraInfo(-1, 0); - const char* fileName = "SkeletalFishBossBattleStart.canm"; + const char* fileName = "SkeletalFishBossBattleStart.canm"; MR::declareEventCameraAnim(&cameraInfo, "スカルシャーク出現", MR::getResourceHolder(this)->mFileInfoTable->getRes(fileName)); fileName = "SkeletalFishBossPowerUp1.canm"; MR::declareEventCameraAnim(&cameraInfo, "スカルシャークパワーアップ", MR::getResourceHolder(this)->mFileInfoTable->getRes(fileName)); @@ -768,7 +755,7 @@ void SkeletalFishBoss::invalidateCollision() { MR::invalidateCollisionParts(head->_100); } -void SkeletalFishBoss::getMouthSensorCenterPos(TVec3f &rPos, f32 a2) const { +void SkeletalFishBoss::getMouthSensorCenterPos(TVec3f& rPos, f32 a2) const { TMtx34f mtx; JMath::gekko_ps_copy12(&mtx, MR::getJointMtx(this, "Head")); rPos.z = a2; @@ -841,7 +828,7 @@ bool SkeletalFishBoss::calcGravityCenter(TVec3f *pOut, const TVec3f &rFirstPoint void SkeletalFishBoss::resetRail() { SkeletalFishBossInfo::LevelStatus* lvl = mBossInfo->getLevelStatus(_110); - SkeletalFishBossRail* rail = MR::getSkeletalFishBossRailHolder()->getByID(lvl->mRailIDLevel); + SkeletalFishBossRail* rail = MR::getSkeletalFishBossRailHolder()->getByID(lvl->mRailIDLevel); mRailControl->setRailActor(rail, nullptr, true); mRailControl->_14 = mBossInfo->getLevelStatus(_110)->mSpeedLevel; } @@ -853,11 +840,10 @@ void SkeletalFishBoss::updateBgm() { s32 bgType, v4; if (MR::calcDistanceToPlayer(this) <= 4200.0f) { - + bgType = 2; v4 = 60; - } - else { + } else { bgType = 1; v4 = 120; } @@ -874,14 +860,14 @@ LiveActor* SkeletalFishBoss::getCurrentBossRail() { return mRailControl->_8; } -void SkeletalFishBoss::stopScene(const char *pName, const Nerve *pNerve, SceneFunc func) { +void SkeletalFishBoss::stopScene(const char* pName, const Nerve* pNerve, SceneFunc func) { setNerve(&::SkeletalFishBossNrvDemoWait::sInstance); mSceneFunc = func; mCurScene = pName; mSceneNerve = pNerve; } -void SkeletalFishBoss::startCamera(const char *pCameraName) { +void SkeletalFishBoss::startCamera(const char* pCameraName) { ActorCameraInfo cameraInfo(-1, 0); CameraTargetArg target(nullptr, mCameraTargetMtx, nullptr, nullptr); MR::startEventCamera(&cameraInfo, pCameraName, target, 0); @@ -941,8 +927,8 @@ void SkeletalFishBoss::endAppearDemo() { } MR::showPlayer(); - const char* cameraName = "スカルシャーク出現"; - ActorCameraInfo cameraInfo(-1, 0); + const char* cameraName = "スカルシャーク出現"; + ActorCameraInfo cameraInfo(-1, 0); MR::endEventCamera(&cameraInfo, cameraName, false, 0); resetCamera(); @@ -963,8 +949,7 @@ void SkeletalFishBoss::startPowerUpDemo() { if (!_110) { startCamera("スカルシャークパワーアップ"); - } - else { + } else { startCamera("スカルシャークパワーアップ２"); } } @@ -985,8 +970,7 @@ void SkeletalFishBoss::endPowerUpDemo() { MR::endEventCamera(&cameraInfo, eventCameraName, false, 0); resetCamera(); mBossDirector->endPowerUpDemo1(); - } - else { + } else { eventCameraName = "スカルシャークパワーアップ２"; ActorCameraInfo cameraInfo(-1, 0); MR::endEventCamera(&cameraInfo, eventCameraName, false, 0); @@ -1013,7 +997,7 @@ void SkeletalFishBoss::startDeadDemo() { } void SkeletalFishBoss::endBreakDemo() { - const char* cameraName = "スカルシャーク死亡"; + const char* cameraName = "スカルシャーク死亡"; ActorCameraInfo info(-1, 0); MR::endEventCamera(&info, cameraName, false, 0); resetCamera(); @@ -1033,21 +1017,15 @@ void SkeletalFishBoss::endBreakDemo() { bool SkeletalFishBoss::isEnableToBeDamaged() const { bool isDmg = false; - if (!isNerve(&::SkeletalFishBossNrvDamage::sInstance) - && !isNerve(&::SkeletalFishBossNrvDown::sInstance) - && !isNerve(&::SkeletalFishBossNrvDeadDamage::sInstance) - && !isNerve(&::SkeletalFishBossNrvDead::sInstance) - && !isNerve(&::SkeletalFishBossNrvDemoWait::sInstance) - && !isNerve(&::SkeletalFishBossNrvAppearDemo::sInstance) - && !isNerve(&::SkeletalFishBossNrvPowerUpDemo::sInstance) - && !isNerve(&::SkeletalFishBossNrvDeadDemo::sInstance)) { - isDmg = true; + if (!isNerve(&::SkeletalFishBossNrvDamage::sInstance) && !isNerve(&::SkeletalFishBossNrvDown::sInstance) && !isNerve(&::SkeletalFishBossNrvDeadDamage::sInstance) && !isNerve(&::SkeletalFishBossNrvDead::sInstance) && !isNerve(&::SkeletalFishBossNrvDemoWait::sInstance) && !isNerve(&::SkeletalFishBossNrvAppearDemo::sInstance) && !isNerve(&::SkeletalFishBossNrvPowerUpDemo::sInstance) && !isNerve(&::SkeletalFishBossNrvDeadDemo::sInstance)) { + isDmg = true; } return isDmg; } -SkeletalFishBossHead::SkeletalFishBossHead(LiveActor *pActor) : PartsModel(pActor, "スカルシャーク頭", "SkeletalFishBossHeadA", nullptr, 0x12, false) { +SkeletalFishBossHead::SkeletalFishBossHead(LiveActor* pActor) + : PartsModel(pActor, "スカルシャーク頭", "SkeletalFishBossHeadA", nullptr, 0x12, false) { initFixedPosition("Head"); initHitSensor(17); MR::addHitSensorAtJointEnemy(this, "body", "Head", 8, 400.0f, TVec3f(0.0f, -120.0f, 320.0f)); @@ -1071,23 +1049,20 @@ SkeletalFishBossHead::SkeletalFishBossHead(LiveActor *pActor) : PartsModel(pActo createSubModel(); } -void SkeletalFishBossHead::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void SkeletalFishBossHead::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (!MR::isSensor(pSender, "body")) { return; } LiveActor* pHost = mHost; - bool curFlag = pHost->isNerve(&::SkeletalFishBossNrvDeadDamage::sInstance) - || pHost->isNerve(&::SkeletalFishBossNrvDead::sInstance); + bool curFlag = pHost->isNerve(&::SkeletalFishBossNrvDeadDamage::sInstance) || pHost->isNerve(&::SkeletalFishBossNrvDead::sInstance); if (curFlag) { return; } if (MR::isSensorPlayer(pReceiver)) { - curFlag = pHost->isNerve(&::SkeletalFishBossNrvAppearDemo::sInstance) - || pHost->isNerve(&::SkeletalFishBossNrvPowerUpDemo::sInstance) - || pHost->isNerve(&::SkeletalFishBossNrvDeadDemo::sInstance); + curFlag = pHost->isNerve(&::SkeletalFishBossNrvAppearDemo::sInstance) || pHost->isNerve(&::SkeletalFishBossNrvPowerUpDemo::sInstance) || pHost->isNerve(&::SkeletalFishBossNrvDeadDemo::sInstance); if (curFlag) { return; @@ -1095,16 +1070,14 @@ void SkeletalFishBossHead::attackSensor(HitSensor *pSender, HitSensor *pReceiver if (pHost->isNerve(&::SkeletalFishBossNrvDamage::sInstance)) { MR::sendMsgPush(pReceiver, pSender); - } - else { + } else { MR::sendMsgPush(pReceiver, pSender); if (pHost->isNerve(&::SkeletalFishBossNrvOpenWait::sInstance)) { pHost->setNerve(&::SkeletalFishBossNrvBite::sInstance); } } - } - else if (!MR::isSensorEnemyAttack(pSender) && MR::isSensorEnemy(pReceiver)) { + } else if (!MR::isSensorEnemyAttack(pSender) && MR::isSensorEnemy(pReceiver)) { MR::sendMsgEnemyAttack(pReceiver, pSender); } } @@ -1120,15 +1093,13 @@ void SkeletalFishBossHead::movement() { MR::disconnectToDrawTemporarily(mBloomModels[i]); } } - } - else if (MR::isConnectToDrawTemporarily(mLightModels[0])) { + } else if (MR::isConnectToDrawTemporarily(mLightModels[0])) { for (s32 i = 0; i < 2; i++) { MR::connectToDrawTemporarily(mLightModels[i]); MR::connectToDrawTemporarily(mBloomModels[i]); } } - } - else if (MR::isConnectToDrawTemporarily(mLightModels[0])) { + } else if (MR::isConnectToDrawTemporarily(mLightModels[0])) { for (s32 i = 0; i < 2; i++) { MR::disconnectToDrawTemporarily(mLightModels[i]); MR::disconnectToDrawTemporarily(mBloomModels[i]); @@ -1147,7 +1118,7 @@ void SkeletalFishBossHead::calcAnim() { } } -bool SkeletalFishBossHead::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool SkeletalFishBossHead::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgJetTurtleAttack(msg)) { SkeletalFishBoss* boss = (SkeletalFishBoss*)mHost; boss->damage(pReceiver, pSender->mPosition); @@ -1163,7 +1134,7 @@ void SkeletalFishBossHead::updateCollisionMtx() { } void SkeletalFishBossHead::createSubModel() { - const char* coneMdls[2] = { "LightConeLeft", "LightConeRight" }; + const char* coneMdls[2] = {"LightConeLeft", "LightConeRight"}; for (s32 i = 0; i < 2; i++) { mLightModels[i] = new ModelObj("眼光", "SkeletalFishBossLight", MR::getJointMtx(this, coneMdls[i]), 18, -1, -1, false); @@ -1176,11 +1147,12 @@ void SkeletalFishBossHead::createSubModel() { } } -SkeletalFishBossScarFlash::SkeletalFishBossScarFlash(LiveActor *pActor) : PartsModel(pActor, "スカルシャーク傷跡エフェクトモデル", "SkeletalFishBossScarFlash", nullptr, 0x12, false) { +SkeletalFishBossScarFlash::SkeletalFishBossScarFlash(LiveActor* pActor) + : PartsModel(pActor, "スカルシャーク傷跡エフェクトモデル", "SkeletalFishBossScarFlash", nullptr, 0x12, false) { initFixedPosition("Head"); } -void SkeletalFishBossScarFlash::init(const JMapInfoIter &rIter) { +void SkeletalFishBossScarFlash::init(const JMapInfoIter& rIter) { PartsModel::init(rIter); makeActorDead(); } @@ -1198,13 +1170,10 @@ void SkeletalFishBossScarFlash::control() { } SkeletalFishBoss::~SkeletalFishBoss() { - } SkeletalFishBossHead::~SkeletalFishBossHead() { - } SkeletalFishBossScarFlash::~SkeletalFishBossScarFlash() { - } diff --git a/src/Game/Boss/SkeletalFishBossBattleDirector.cpp b/src/Game/Boss/SkeletalFishBossBattleDirector.cpp index 2d6cb9594..65f82895b 100644 --- a/src/Game/Boss/SkeletalFishBossBattleDirector.cpp +++ b/src/Game/Boss/SkeletalFishBossBattleDirector.cpp @@ -7,7 +7,8 @@ #include "Game/Map/HitInfo.hpp" #include -SkeletalFishBossBattleDirector::SkeletalFishBossBattleDirector(SkeletalFishBoss *pBoss) : NameObj("スカルシャークボス戦指揮") { +SkeletalFishBossBattleDirector::SkeletalFishBossBattleDirector(SkeletalFishBoss* pBoss) + : NameObj("スカルシャークボス戦指揮") { mFishBoss = pBoss; _90 = 0; _D4 = 0; @@ -58,7 +59,7 @@ void SkeletalFishBossBattleDirector::startPowerUpDemo2() { playGuardAnim("PowerUp2", 4); } -void SkeletalFishBossBattleDirector::playGuardAnim(const char *pAnimName, s32 numGuards) { +void SkeletalFishBossBattleDirector::playGuardAnim(const char* pAnimName, s32 numGuards) { for (s32 i = 0; i < numGuards; i++) { char buf[0x80]; snprintf(buf, sizeof(buf), "%s%c", pAnimName, i + 0x41); @@ -70,10 +71,9 @@ void SkeletalFishBossBattleDirector::playGuardAnim(const char *pAnimName, s32 nu } void SkeletalFishBossBattleDirector::movement() { - } -void SkeletalFishBossBattleDirector::tryColumnCollision(HitSensor *pSensor) { +void SkeletalFishBossBattleDirector::tryColumnCollision(HitSensor* pSensor) { for (s32 i = 0; i < _90; i++) { CollisionParts* parts = MR::getCollisionParts(mColumns[i]); @@ -131,5 +131,4 @@ void SkeletalFishBossBattleDirector::killBirdLouse() { } SkeletalFishBossBattleDirector::~SkeletalFishBossBattleDirector() { - } diff --git a/src/Game/Boss/SkeletalFishBossFunc.cpp b/src/Game/Boss/SkeletalFishBossFunc.cpp index deb81bcf0..ef5fd5302 100644 --- a/src/Game/Boss/SkeletalFishBossFunc.cpp +++ b/src/Game/Boss/SkeletalFishBossFunc.cpp @@ -6,7 +6,7 @@ namespace { static const char* sNamePosName = "ガード出現ポイント"; }; -s32 SkeletalFishBossFunc::getNearestGuardPosID(const TVec3f &rVec) { +s32 SkeletalFishBossFunc::getNearestGuardPosID(const TVec3f& rVec) { f32 closest = 100000.0; s32 posID = -1; @@ -25,7 +25,7 @@ s32 SkeletalFishBossFunc::getNearestGuardPosID(const TVec3f &rVec) { return posID; } -bool SkeletalFishBossFunc::copyGuardPos(TVec3f *pOut, s32 idx) { +bool SkeletalFishBossFunc::copyGuardPos(TVec3f* pOut, s32 idx) { char buf[0x80]; snprintf(buf, sizeof(buf), "%s%d", ::sNamePosName, idx); return MR::tryFindNamePos(buf, pOut, nullptr); diff --git a/src/Game/Boss/SkeletalFishBossInfo.cpp b/src/Game/Boss/SkeletalFishBossInfo.cpp index 7364c9d0f..fa202938e 100644 --- a/src/Game/Boss/SkeletalFishBossInfo.cpp +++ b/src/Game/Boss/SkeletalFishBossInfo.cpp @@ -13,9 +13,10 @@ namespace { static const char* sParamNameGuard = "Id"; static const char* sParamNameGuardPos = "GuardPosLv"; static const char* sParamNameGuardWait = "GuardWaitLv"; -}; +}; // namespace -SkeletalFishBossInfo::SkeletalFishBossInfo(SkeletalFishBoss *pBoss, s32 levelNum, s32 guardNum, const char *pDesc) : NameObj(pDesc) { +SkeletalFishBossInfo::SkeletalFishBossInfo(SkeletalFishBoss* pBoss, s32 levelNum, s32 guardNum, const char* pDesc) + : NameObj(pDesc) { mFishBoss = pBoss; mLevelNum = levelNum; mGuardNum = guardNum; @@ -23,12 +24,12 @@ SkeletalFishBossInfo::SkeletalFishBossInfo(SkeletalFishBoss *pBoss, s32 levelNum createLevelStatus(); } -void SkeletalFishBossInfo::init(const JMapInfoIter &rIter) { +void SkeletalFishBossInfo::init(const JMapInfoIter& rIter) { volatile const JMapInfo* info = MR::tryCreateCsvParser(mFishBoss, "%s.bcsv", ::sParamFileName); if (info != nullptr) { /* there is something I am missing here */ - JMapInfoIter what; + JMapInfoIter what; volatile JMapInfoIter level_iter; level_iter.mInfo = (JMapInfo*)info; what.mInfo = (JMapInfo*)info; @@ -51,7 +52,7 @@ void SkeletalFishBossInfo::createLevelStatus() { getLevelStatus(i)->mRailIDLevel = 0; getLevelStatus(i)->mGuardOffsLevel = 2000.0f; getLevelStatus(i)->mGuardAppearNumLevel = 0; - getLevelStatus(i)->mStatusArray = new GuardStatus[mGuardNum]; + getLevelStatus(i)->mStatusArray = new GuardStatus[mGuardNum]; for (s32 j = 0; j < mGuardNum; j++) { LevelStatus* s = &mLevelStatusArray[i]; @@ -63,10 +64,9 @@ void SkeletalFishBossInfo::createLevelStatus() { } SkeletalFishBossInfo::GuardStatus::GuardStatus() { - } -void SkeletalFishBossInfo::loadLevelStatus(const JMapInfoIter &rIter) { +void SkeletalFishBossInfo::loadLevelStatus(const JMapInfoIter& rIter) { s32 levelNum; if (rIter.getValue(::sParamNameLevelNum, &levelNum)) { @@ -91,7 +91,7 @@ void SkeletalFishBossInfo::loadLevelStatus(const JMapInfoIter &rIter) { } } -void SkeletalFishBossInfo::loadGuardStatus(const JMapInfoIter &rIter, s32 levelIdx, s32 guardLevel) { +void SkeletalFishBossInfo::loadGuardStatus(const JMapInfoIter& rIter, s32 levelIdx, s32 guardLevel) { LevelStatus* status = &mLevelStatusArray[levelIdx]; for (s32 i = 0; i < guardLevel; i++) { @@ -104,5 +104,4 @@ void SkeletalFishBossInfo::loadGuardStatus(const JMapInfoIter &rIter, s32 levelI } SkeletalFishBossInfo::~SkeletalFishBossInfo() { - } diff --git a/src/Game/Boss/SkeletalFishBossRail.cpp b/src/Game/Boss/SkeletalFishBossRail.cpp index d83671a1b..416677be9 100644 --- a/src/Game/Boss/SkeletalFishBossRail.cpp +++ b/src/Game/Boss/SkeletalFishBossRail.cpp @@ -2,14 +2,15 @@ #include "Game/Boss/SkeletalFishBossFunc.hpp" #include "Game/Boss/SkeletalFishBossRailHolder.hpp" -SkeletalFishBossRail::SkeletalFishBossRail(const char *pName) : LiveActor(pName) { +SkeletalFishBossRail::SkeletalFishBossRail(const char* pName) + : LiveActor(pName) { _8C = -1; mFillUpFlags = nullptr; mNamePosIDs = nullptr; _98 = 0.0f; } -void SkeletalFishBossRail::init(const JMapInfoIter &rIter) { +void SkeletalFishBossRail::init(const JMapInfoIter& rIter) { MR::createSkeletalFishBossRailHolder(); initRailRider(rIter); MR::getJMapInfoArg0WithInit(rIter, &_8C); @@ -40,8 +41,7 @@ void SkeletalFishBossRail::createFillUpFlag() { if (pointArg == -1) { mFillUpFlags[i] = false; - } - else { + } else { mFillUpFlags[i] = true; } } @@ -64,5 +64,4 @@ void SkeletalFishBossRail::linkFillUpNamePosID() { } SkeletalFishBossRail::~SkeletalFishBossRail() { - } diff --git a/src/Game/Boss/SkeletalFishBossRailHolder.cpp b/src/Game/Boss/SkeletalFishBossRailHolder.cpp index e0c25fd2b..5ffc9e641 100644 --- a/src/Game/Boss/SkeletalFishBossRailHolder.cpp +++ b/src/Game/Boss/SkeletalFishBossRailHolder.cpp @@ -1,7 +1,8 @@ #include "Game/Boss/SkeletalFishBossRailHolder.hpp" #include "Game/Boss/SkeletalFishBossRail.hpp" -SkeletalFishBossRailHolder::SkeletalFishBossRailHolder(const char *pName) : NameObj(pName) { +SkeletalFishBossRailHolder::SkeletalFishBossRailHolder(const char* pName) + : NameObj(pName) { mNumRails = 0; for (s32 i = 0; i < 3; i++) { @@ -9,7 +10,7 @@ SkeletalFishBossRailHolder::SkeletalFishBossRailHolder(const char *pName) : Name } } -void SkeletalFishBossRailHolder::add(SkeletalFishBossRail *pRail) { +void SkeletalFishBossRailHolder::add(SkeletalFishBossRail* pRail) { mRails[mNumRails++] = pRail; } @@ -37,8 +38,7 @@ namespace MR { void createSkeletalFishBossRailHolder() { MR::createSceneObj(SceneObj_SkeletalFishBossRailHolder); } -}; +}; // namespace MR SkeletalFishBossRailHolder::~SkeletalFishBossRailHolder() { - } diff --git a/src/Game/Boss/SkeletalFishGuard.cpp b/src/Game/Boss/SkeletalFishGuard.cpp index 4558addf8..d08ead236 100644 --- a/src/Game/Boss/SkeletalFishGuard.cpp +++ b/src/Game/Boss/SkeletalFishGuard.cpp @@ -7,14 +7,10 @@ // JGeometry functions are painful to match, so this just gives the gist #ifdef NON_MATCHING -template<> -void TVec3f::cubic(const TVec3f &rv1, const TVec3f &rv2, const TVec3f &rv3, const TVec3f &rv4, f32 a) { +template <> +void TVec3f::cubic(const TVec3f& rv1, const TVec3f& rv2, const TVec3f& rv3, const TVec3f& rv4, f32 a) { set( - rv3 * (a * a * a - a * a) - + rv2 * (a + a * a * a - 2.0f * a * a) - + rv1 * (1.0f + 2.0f * a * a * a - 3.0f * a * a) - + rv4 * (3.0f * a * a - 2.0f * a * a * a) - ); + rv3 * (a * a * a - a * a) + rv2 * (a + a * a * a - 2.0f * a * a) + rv1 * (1.0f + 2.0f * a * a * a - 3.0f * a * a) + rv4 * (3.0f * a * a - 2.0f * a * a * a)); } #endif @@ -28,9 +24,9 @@ namespace { NEW_NERVE(SkeletalFishGuardNrvDefence, SkeletalFishGuard, Defence); NEW_NERVE(SkeletalFishGuardNrvKill, SkeletalFishGuard, Kill); NEW_NERVE_ONEND(SkeletalFishGuardNrvNumb, SkeletalFishGuard, Numb, Numb); -}; +}; // namespace -void SkeletalFishGuard::init(const JMapInfoIter &rIter) { +void SkeletalFishGuard::init(const JMapInfoIter& rIter) { initModelManagerWithAnm("SkeletalFishGuard", nullptr, false); MR::addToAttributeGroupSearchTurtle(this); MR::connectToSceneEnemy(this); @@ -66,9 +62,8 @@ void SkeletalFishGuard::control() { mAttackDelay--; } - if (!isNerve(&::SkeletalFishGuardNrvKill::sInstance) - && !isNerve(&::SkeletalFishGuardNrvApart::sInstance)) { - + if (!isNerve(&::SkeletalFishGuardNrvKill::sInstance) && !isNerve(&::SkeletalFishGuardNrvApart::sInstance)) { + if (MR::isBinded(this)) { MR::isBindedGround(this); MR::isBindedWall(this); @@ -99,13 +94,12 @@ void SkeletalFishGuard::exeAppear() { _DC.set(MR::getRandom(-1.0f, 1.0f), MR::getRandom(-1.0f, 1.0f), MR::getRandom(-1.0f, 1.0f)); } - MR::calcGravityVector(this, _10C, &v32, nullptr, false); TVec3f v31 = _10C - v32 * 1000.0f; - s32 v5 = 300 - getNerveStep(); + s32 v5 = 300 - getNerveStep(); calcTarget(&_E8, &_F4, &_100, v5); TVec3f v30 = _DC; - f32 v6 = v32.dot(v30); + f32 v6 = v32.dot(v30); //JMAVECScaleAdd(v32, v30, v30, -v6); MR::normalizeOrZero(&v30); v31 += v30 * 500.0f; @@ -114,18 +108,17 @@ void SkeletalFishGuard::exeAppear() { TVec3f v29 = mPosition; if (getNerveStep() < 99) { - s32 v7 = getNerveStep(); - s32 max = 0x63; - f32 scaled = v7 / (f32)max; + s32 v7 = getNerveStep(); + s32 max = 0x63; + f32 scaled = v7 / (f32)max; TVec3f temp_vec = TVec3f(0.0f, 1.0f, 0.0f) * 0.0f * (f32)max; TVec3f temp_vec2 = v30 * 10.0f * (f32)max; mPosition.cubic(_10C, temp_vec, temp_vec2, v31, scaled); - } - else { - f32 v9 = (getNerveStep() - 0x63); - s32 max = 0xC9; - f32 scaled = v9 / (f32)max; - f32 v11 = MR::getRailCoordSpeed(mFishBoss->getCurrentBossRail()); + } else { + f32 v9 = (getNerveStep() - 0x63); + s32 max = 0xC9; + f32 scaled = v9 / (f32)max; + f32 v11 = MR::getRailCoordSpeed(mFishBoss->getCurrentBossRail()); TVec3f temp_vec = v30 * 10.0f * (f32)max; TVec3f temp_vec2 = _100 * v11 * (f32)max; mPosition.cubic(v31, temp_vec, temp_vec2, _F4, scaled); @@ -158,8 +151,8 @@ void SkeletalFishGuard::exeNormal() { void SkeletalFishGuard::exeApart() { if (MR::isFirstStep(this)) { TVec3f* grav = &mGravity; - f32 dot = grav->dot(_A4); - TVec3f v15; + f32 dot = grav->dot(_A4); + TVec3f v15; JMAVECScaleAdd(grav, _A4, v15, -dot); _B0 = grav->dot(_A4 - v15); _A4.set(v15); @@ -168,7 +161,7 @@ void SkeletalFishGuard::exeApart() { mAttackDelay = 0; } - f32 v3 = (f32)getNerveStep() / 80.0f; + f32 v3 = (f32)getNerveStep() / 80.0f; TVec3f v14(_A4); if (!MR::isNearZero(v14, 0.001f)) { @@ -184,14 +177,13 @@ void SkeletalFishGuard::exeApart() { _A4.z = 0.0f; _A4.y = 0.0f; _A4.x = 0.0f; - } - else { + } else { TVec3f v10 = v14 * 0.30000001f; JMathInlineVEC::PSVECSubtract(_A4, v10, _A4); } } - f32 v7 = (_B0 * v3); + f32 v7 = (_B0 * v3); TVec3f grav(mGravity); MR::calcGravity(this); TQuat4f quat; @@ -267,7 +259,6 @@ void SkeletalFishGuard::exeStraight() { } void SkeletalFishGuard::exeDefence() { - } void SkeletalFishGuard::exeKill() { @@ -322,8 +313,7 @@ void SkeletalFishGuard::killNaturally() { if (!MR::isDead(this)) { if (isNerve(&::SkeletalFishGuardNrvWait::sInstance)) { makeActorDead(); - } - else if (!isNerve(&::SkeletalFishGuardNrvKill::sInstance)) { + } else if (!isNerve(&::SkeletalFishGuardNrvKill::sInstance)) { setNerve(&::SkeletalFishGuardNrvKill::sInstance); } } @@ -407,18 +397,17 @@ void SkeletalFishGuard::exeWait() { MR::setNerveAtStep(this, &::SkeletalFishGuardNrvAppear::sInstance, _A0); } -void SkeletalFishGuard::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void SkeletalFishGuard::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (!isNerve(&::SkeletalFishGuardNrvKill::sInstance) && (!isNerve(&::SkeletalFishGuardNrvNormal::sInstance) || getNerveStep() >= 2)) { if (MR::isSensorPlayer(pReceiver) && MR::sendMsgEnemyAttackStrong(pReceiver, pSender)) { setNerve(&::SkeletalFishGuardNrvKill::sInstance); - } - else { + } else { MR::sendMsgPush(pReceiver, pSender); } } } -bool SkeletalFishGuard::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool SkeletalFishGuard::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (isNerve(&::SkeletalFishGuardNrvKill::sInstance)) { return false; } @@ -454,17 +443,17 @@ void SkeletalFishGuard::calcTransAndFront() { mPosition.set(_F4); } -void SkeletalFishGuard::rotateHorizontal(const TVec3f &a2, f32 scalar) { +void SkeletalFishGuard::rotateHorizontal(const TVec3f& a2, f32 scalar) { TVec3f* grav = &mGravity; - f32 dot = grav->dot(a2); - TVec3f v10; + f32 dot = grav->dot(a2); + TVec3f v10; JMAVECScaleAdd(grav, &a2, &v10, -dot); if (!MR::isNearZero(v10, 0.001f)) { MR::normalize(&v10); TVec3f* v11 = &_D0; TVec3f* g = &mGravity; - f32 v8 = g->dot(*v11); - TVec3f v9; + f32 v8 = g->dot(*v11); + TVec3f v9; JMAVECScaleAdd(g, &_D0, &v9, -v8); if (!MR::isNearZero(v9, 0.001f)) { MR::normalize(&v9); @@ -473,7 +462,7 @@ void SkeletalFishGuard::rotateHorizontal(const TVec3f &a2, f32 scalar) { } } -void SkeletalFishGuard::rotateVertical(const TVec3f &a2, f32 a3) { +void SkeletalFishGuard::rotateVertical(const TVec3f& a2, f32 a3) { TVec3f v12; PSVECCrossProduct(&mGravity, &_D0, &v12); @@ -486,15 +475,14 @@ void SkeletalFishGuard::rotateVertical(const TVec3f &a2, f32 a3) { if (v7 > a3) { v7 = a3; } - } - else { + } else { if (v7 < -a3) { v7 = -a3; } } - f32 v8 = (0.5f * v7); - f32 v9 = sin(v8); + f32 v8 = (0.5f * v7); + f32 v9 = sin(v8); TQuat4f v10; v10.scale(v9, v12); v10.w = cos(v8); @@ -547,7 +535,7 @@ bool SkeletalFishGuard::tryShiftKill() { #ifdef NON_MATCHING // very close. small instruction swap. -void SkeletalFishGuard::turn(TVec3f *a1, const TVec3f &a2, const TVec3f &a3, f32 a4) { +void SkeletalFishGuard::turn(TVec3f* a1, const TVec3f& a2, const TVec3f& a3, f32 a4) { TQuat4f quat; f32 angle = a2.angle(a3); @@ -564,8 +552,7 @@ void SkeletalFishGuard::turn(TVec3f *a1, const TVec3f &a2, const TVec3f &a3, f32 if (v11 <= factor) { quat.set(0.0f, 0.0f, 0.0f, 1.0f); - } - else { + } else { f32 v12 = a2.dot(a3); f32 v13 = (v10 * (0.5f * JMath::sAtanTable.atan2_(v11, v12))); f32 v14 = sin(v13); @@ -590,7 +577,7 @@ void SkeletalFishGuard::lookToPlayer(f32 a2, f32 a3) { #ifdef NON_MATCHING // functionally equiv. just needs stack work -void SkeletalFishGuard::calcTarget(TVec3f *a1, TVec3f *a2, TVec3f *a3, s32 a4) { +void SkeletalFishGuard::calcTarget(TVec3f* a1, TVec3f* a2, TVec3f* a3, s32 a4) { f32 v11 = MR::getRailCoord(mFishBoss->getCurrentRail()); f32 v13 = (_94.z + (v11 + (MR::getRailCoordSpeed(mFishBoss->getCurrentRail()) * a4))); MR::calcRailPosAtCoord(a1, mFishBoss->getCurrentRail(), v13); @@ -600,10 +587,10 @@ void SkeletalFishGuard::calcTarget(TVec3f *a1, TVec3f *a2, TVec3f *a3, s32 a4) { TVec3f v21; PSVECCrossProduct(a3, v22, v21); MR::normalizeOrZero(&v21); - f32 v16 = -_94.y; + f32 v16 = -_94.y; TVec3f v18(v22); v18.scale(v16); - f32 v17 = _94.x; + f32 v17 = _94.x; TVec3f v19(v21); v19.scale(v17); TVec3f v20(v19); @@ -651,16 +638,16 @@ bool SkeletalFishGuard::isPlayerInAttackRange() const { bool SkeletalFishGuard::isLineOfSightClear() const { TVec3f v12(*MR::getPlayerCenterPos()); JMathInlineVEC::PSVECSubtract(v12, mPosition, v12); - + if (Collision::checkStrikeLineToMap(mPosition, v12, 0, nullptr, nullptr)) { return false; } TVec3f v10 = MR::getCamPos(); JMathInlineVEC::PSVECSubtract(v10, mPosition, v10); - + if (Collision::checkStrikeLineToMap(mPosition, v10, 0, nullptr, nullptr)) { - return false; + return false; } TVec3f v11(_E8); @@ -684,7 +671,7 @@ bool SkeletalFishGuard::isLineOfSightClear() const { } #endif -bool SkeletalFishGuard::tryShiftNumb(const Nerve *pNerve) { +bool SkeletalFishGuard::tryShiftNumb(const Nerve* pNerve) { if (MR::isStarPointerPointing2POnPressButton(this, "弱", true, false)) { _CC = pNerve; setNerve(&::SkeletalFishGuardNrvNumb::sInstance); @@ -695,5 +682,4 @@ bool SkeletalFishGuard::tryShiftNumb(const Nerve *pNerve) { } SkeletalFishGuard::~SkeletalFishGuard() { - } diff --git a/src/Game/Boss/SkeletalFishGuardHolder.cpp b/src/Game/Boss/SkeletalFishGuardHolder.cpp index 92ab7880b..b9538d4f4 100644 --- a/src/Game/Boss/SkeletalFishGuardHolder.cpp +++ b/src/Game/Boss/SkeletalFishGuardHolder.cpp @@ -5,7 +5,8 @@ #include "Game/Boss/SkeletalFishGuard.hpp" #include "Game/Boss/SkeletalFishBossRail.hpp" -SkeletalFishGuardHolder::SkeletalFishGuardHolder(SkeletalFishBoss *pBoss, s32 numGuards, const char *pName) : NameObj(pName) { +SkeletalFishGuardHolder::SkeletalFishGuardHolder(SkeletalFishBoss* pBoss, s32 numGuards, const char* pName) + : NameObj(pName) { mFishBoss = pBoss; mBossRail = nullptr; mNumGuards = numGuards; @@ -26,11 +27,11 @@ void SkeletalFishGuardHolder::movement() { } void SkeletalFishGuardHolder::forceAppearAll() { - SkeletalFishGuard* guard; // + SkeletalFishGuard* guard; // SkeletalFishBossInfo::LevelStatus* lvl; - s32 guardWaitLvlId; // r28 - s32 appearableGuard = countAppearableGuard(); // r27 - s32 i; // r26 + s32 guardWaitLvlId; // r28 + s32 appearableGuard = countAppearableGuard(); // r27 + s32 i; // r26 for (i = 0; i < mNumGuards; i++) { if (MR::isDead(mGuards[i])) { @@ -60,7 +61,7 @@ void SkeletalFishGuardHolder::killAll() { } } -void SkeletalFishGuardHolder::notifyAttack(SkeletalFishGuard *pGuard) { +void SkeletalFishGuardHolder::notifyAttack(SkeletalFishGuard* pGuard) { for (s32 i = 0; i < mNumGuards; i++) { SkeletalFishGuard* guard = mGuards[i]; @@ -90,7 +91,7 @@ void SkeletalFishGuardHolder::checkRailChangedAndReset() { s32 SkeletalFishGuardHolder::countAppearableGuard() const { SkeletalFishBossInfo::LevelStatus* lvl = mFishBoss->mBossInfo->getLevelStatus(mFishBoss->_110); - s32 guardCount = lvl->mGuardAppearNumLevel - countGuardAlive(); + s32 guardCount = lvl->mGuardAppearNumLevel - countGuardAlive(); if (guardCount < 0) { guardCount = 0; @@ -144,10 +145,10 @@ void SkeletalFishGuardHolder::checkDistanceAndAppear(s32 numGuards) { */ void SkeletalFishGuardHolder::appearGuard(s32 numGuards, s32 startGuard) { - SkeletalFishGuard* guard; + SkeletalFishGuard* guard; SkeletalFishBossInfo::LevelStatus* level; - s32 pos = mBossRail->getFillUpNamePos(startGuard); - s32 waitID; + s32 pos = mBossRail->getFillUpNamePos(startGuard); + s32 waitID; TVec3f guardPos; if (pos >= 0 && SkeletalFishBossFunc::copyGuardPos(&guardPos, pos)) { @@ -170,7 +171,6 @@ void SkeletalFishGuardHolder::appearGuard(s32 numGuards, s32 startGuard) { } SkeletalFishGuardHolder::~SkeletalFishGuardHolder() { - } void SkeletalFishGuardHolder::createAndInitGuard() { diff --git a/src/Game/Boss/SkeletalFishJointCalc.cpp b/src/Game/Boss/SkeletalFishJointCalc.cpp index 0f7d088f2..addb87af3 100644 --- a/src/Game/Boss/SkeletalFishJointCalc.cpp +++ b/src/Game/Boss/SkeletalFishJointCalc.cpp @@ -1,14 +1,14 @@ #include "Game/Boss/SkeletalFishJointCalc.hpp" -void SkeletalFishJointCalc::calcJoint(TPos3f *pOutMtx, const TPos3f *pInMtx, SkeletalFishRailControl *pRailCtrl, const JointControllerInfo &rJointInfo) { +void SkeletalFishJointCalc::calcJoint(TPos3f* pOutMtx, const TPos3f* pInMtx, SkeletalFishRailControl* pRailCtrl, const JointControllerInfo& rJointInfo) { pOutMtx->concat(*pInMtx, *pOutMtx); TVec3f pos; - f32 z = pOutMtx->mMtx[2][3]; - f32 y = pOutMtx->mMtx[1][3]; - f32 x = pOutMtx->mMtx[0][3]; + f32 z = pOutMtx->mMtx[2][3]; + f32 y = pOutMtx->mMtx[1][3]; + f32 x = pOutMtx->mMtx[0][3]; pos.set(x, y, z); TMtx34f mtx; - f32 negZ = -pos.z; + f32 negZ = -pos.z; mtx.mMtx[0][0] = 1.0f; mtx.mMtx[1][0] = 0.0f; diff --git a/src/Game/Boss/SkeletalFishRailControl.cpp b/src/Game/Boss/SkeletalFishRailControl.cpp index fe11ec487..d56c7d82a 100644 --- a/src/Game/Boss/SkeletalFishRailControl.cpp +++ b/src/Game/Boss/SkeletalFishRailControl.cpp @@ -9,7 +9,7 @@ SkeletalFishRailControl::SkeletalFishRailControl() { _18 = false; } -void SkeletalFishRailControl::setRailActor(LiveActor *a1, LiveActor *a2, bool a3) { +void SkeletalFishRailControl::setRailActor(LiveActor* a1, LiveActor* a2, bool a3) { _4 = a2; _8 = a1; @@ -17,8 +17,7 @@ void SkeletalFishRailControl::setRailActor(LiveActor *a1, LiveActor *a2, bool a3 _0 = 0; MR::setRailCoord(a2, 0.0f); MR::setRailDirectionToEnd(_4); - } - else { + } else { _0 = 2; } @@ -36,87 +35,82 @@ void SkeletalFishRailControl::update() { MR::setRailCoordSpeed(_8, _14); switch (_0) { - case 0: - { - f32 railLength = MR::getRailTotalLength(_4); - f32 v3 = ((_14 + MR::getRailCoord(_4) - railLength)); - if (v3 >= 0.0f) { - f32 coord = MR::calcNearestRailCoord(_8, MR::getRailPointPosEnd(_4)); - _10 = coord; - _C = (coord - v3); - MR::setRailCoord(_8, _C); - _0 = 1; - } - break; + case 0: { + f32 railLength = MR::getRailTotalLength(_4); + f32 v3 = ((_14 + MR::getRailCoord(_4) - railLength)); + if (v3 >= 0.0f) { + f32 coord = MR::calcNearestRailCoord(_8, MR::getRailPointPosEnd(_4)); + _10 = coord; + _C = (coord - v3); + MR::setRailCoord(_8, _C); + _0 = 1; } - - case 1: - if (_C - _10 >= MR::getRailTotalLength(_8)) { - _0 = 2; - } - break; - case 2: - break; + break; + } + + case 1: + if (_C - _10 >= MR::getRailTotalLength(_8)) { + _0 = 2; + } + break; + case 2: + break; } _18 = false; switch (_0) { - case 0: - MR::moveRailRider(_4); - break; - case 1: - _C += _14; - MR::getRailTotalLength(_8); - MR::setRailCoord(_8, _C); - break; - case 2: - if (MR::getRailCoord(_8) + MR::getRailCoordSpeed(_8) > MR::getRailTotalLength(_8)) { - _18 = true; - } + case 0: + MR::moveRailRider(_4); + break; + case 1: + _C += _14; + MR::getRailTotalLength(_8); + MR::setRailCoord(_8, _C); + break; + case 2: + if (MR::getRailCoord(_8) + MR::getRailCoordSpeed(_8) > MR::getRailTotalLength(_8)) { + _18 = true; + } - MR::moveRailRider(_8); - break; + MR::moveRailRider(_8); + break; } } void SkeletalFishRailControl::getRailInfo(SkeletalFishRailInfo* pOutInfo, f32 a2) { switch (_0) { - case 0: - { - f32 coord = MR::getRailCoord(_4); + case 0: { + f32 coord = MR::getRailCoord(_4); + pOutInfo->_0 = _4; + pOutInfo->_4 = coord - a2; + break; + } + case 1: { + f32 dist = _C - a2; + if (dist < _10) { + f32 railLength = MR::getRailTotalLength(_4); + f32 diff = _10 - dist; pOutInfo->_0 = _4; - pOutInfo->_4 = coord - a2; - break; - } - case 1: - { - f32 dist = _C - a2; - if (dist < _10) { - f32 railLength = MR::getRailTotalLength(_4); - f32 diff = _10 - dist; - pOutInfo->_0 = _4; - dist = railLength - diff; - } - else { - pOutInfo->_0 = _8; - } - - pOutInfo->_4 = dist; - break; - } - - case 2: - { - f32 coord = MR::getRailCoord(_8); + dist = railLength - diff; + } else { pOutInfo->_0 = _8; - pOutInfo->_4 = coord - a2; - break; } + + pOutInfo->_4 = dist; + break; + } + + case 2: { + f32 coord = MR::getRailCoord(_8); + pOutInfo->_0 = _8; + pOutInfo->_4 = coord - a2; + break; + } } } -void SkeletalFishRailControl::getPos(TVec3f *pOut, f32 a2) { +void SkeletalFishRailControl::getPos(TVec3f* pOut, f32 a2) { SkeletalFishRailInfo info; getRailInfo(&info, a2); @@ -126,14 +120,13 @@ void SkeletalFishRailControl::getPos(TVec3f *pOut, f32 a2) { MR::calcRailDirectionAtCoord(&railDir, info._0, 0.0f); railDir.scale(info._4); pOut->add(railDir); - - } - else { + + } else { MR::calcRailPosAtCoord(pOut, info._0, info._4); } } -void SkeletalFishRailControl::getMtx(TPos3f *pOut, f32 a2) { +void SkeletalFishRailControl::getMtx(TPos3f* pOut, f32 a2) { SkeletalFishRailInfo normalRailInfo; SkeletalFishRailInfo distRailInfo; getRailInfo(&normalRailInfo, a2); @@ -153,8 +146,7 @@ void SkeletalFishRailControl::getMtx(TPos3f *pOut, f32 a2) { stack_3C.setPS(railDir); stack_3C.scale(normalRailInfo._4); railPos.add(stack_3C); - } - else { + } else { MR::calcRailPosAtCoord(&railPos, normalRailInfo._0, normalRailInfo._4); MR::calcRailDirectionAtCoord(&railDir, normalRailInfo._0, normalRailInfo._4); } diff --git a/src/Game/Boss/TripodBoss.cpp b/src/Game/Boss/TripodBoss.cpp index 6f2eca230..15090d31f 100644 --- a/src/Game/Boss/TripodBoss.cpp +++ b/src/Game/Boss/TripodBoss.cpp @@ -21,8 +21,7 @@ namespace { static const char* sLegBoneNameTable[3] = { - "LeftLeg", "RightLeg", "BackLeg" - }; + "LeftLeg", "RightLeg", "BackLeg"}; static s32 sKillerGeneraterIncreaseSeTiming = 0x5A; static s32 sHeadExplodeSeTiming; @@ -30,7 +29,7 @@ namespace { static TVec3f sPowerStarOffset(0.0f, 3200.0f, 0.0f); static TVec3f sAppearStarPieceOffset(0.0f, 3600.0f, 0.0f); static TVec3f sEndMarioPosition(0.0f, 2160.0f, 1260.0f); -}; +}; // namespace namespace NrvTripodBoss { NEW_NERVE(TripodBossNrvTryStartDemo, TripodBoss, TryStartDemo); @@ -46,10 +45,11 @@ namespace NrvTripodBoss { NEW_NERVE(TripodBossNrvPainDemo, TripodBoss, PainDemo); NEW_NERVE(TripodBossNrvBreakDownDemo, TripodBoss, BreakDownDemo); NEW_NERVE(TripodBossNrvExplosionDemo, TripodBoss, ExplosionDemo); -}; +}; // namespace NrvTripodBoss -TripodBoss::TripodBoss(const char *pName) : LiveActor(pName), mLowModel(nullptr), mMovableArea(nullptr), mDummyModel(nullptr), - _5BC(0.0f, 3200.0f), _5C8(0, 0, 0), _5D4(0, 0, 0), _5E0(0, 0, 0), _5EC(0, 0, 0) { +TripodBoss::TripodBoss(const char* pName) + : LiveActor(pName), mLowModel(nullptr), mMovableArea(nullptr), mDummyModel(nullptr), + _5BC(0.0f, 3200.0f), _5C8(0, 0, 0), _5D4(0, 0, 0), _5E0(0, 0, 0), _5EC(0, 0, 0) { _5F8 = 7500.0f; _5FC = 0.0f; @@ -83,7 +83,7 @@ TripodBoss::TripodBoss(const char *pName) : LiveActor(pName), mLowModel(nullptr) _62C = 32; } -void TripodBoss::init(const JMapInfoIter &rIter) { +void TripodBoss::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::connectToSceneCollisionMapObjMovementCalcAnim(this); TPos3f v14; @@ -112,7 +112,7 @@ void TripodBoss::init(const JMapInfoIter &rIter) { initNerve(&NrvTripodBoss::TripodBossNrvNonActive::sInstance); MR::invalidateClipping(this); MR::needStageSwitchReadA(this, rIter); - MR::FunctorV0M demoFunc = MR::Functor_Inline(this, &TripodBoss::requestOpeningDemo); + MR::FunctorV0M demoFunc = MR::Functor_Inline(this, &TripodBoss::requestOpeningDemo); MR::listenStageSwitchOnA(this, demoFunc); MR::useStageSwitchReadB(this, rIter); MR::useStageSwitchWriteDead(this, rIter); @@ -135,13 +135,13 @@ void TripodBoss::initAfterPlacement() { MR::hideTripodBossParts(); } -void TripodBoss::initEventCamera(const JMapInfoIter &rIter) { +void TripodBoss::initEventCamera(const JMapInfoIter& rIter) { mEventCamera = MR::createActorCameraInfo(rIter); MR::initAnimCamera(this, mEventCamera, "StartDemo"); MR::initAnimCamera(this, mEventCamera, "EndDemo"); } -void TripodBoss::initLeg(const JMapInfoIter &rIter) { +void TripodBoss::initLeg(const JMapInfoIter& rIter) { const char* objName; MR::getObjectName(&objName, rIter); char lowName[0x20]; @@ -178,30 +178,30 @@ void TripodBoss::initLegIKPlacement() { f32 ONEPOINTFIVEPI = 2.0943952f; for (u32 i = 0; i < 3; i++) { - u32 &rI = i; - f32 cur = -(f32)i * ONEPOINTFIVEPI; - f32 initAngle = ((0.5f * ONEPOINTFIVEPI) + cur); - f32 x = JMath::sSinCosTable.sinLapRad(initAngle); - f32 z = JMath::sSinCosTable.cosLapRad(initAngle); - + u32& rI = i; + f32 cur = -(f32)i * ONEPOINTFIVEPI; + f32 initAngle = ((0.5f * ONEPOINTFIVEPI) + cur); + f32 x = JMath::sSinCosTable.sinLapRad(initAngle); + f32 z = JMath::sSinCosTable.cosLapRad(initAngle); + TVec3f legDirShadow; legDirShadow.x = x; legDirShadow.y = 0.0f; legDirShadow.z = z; TVec3f j(0.0f, 1.0f, 0.0f); - + TVec3f legDir = legDirShadow.multiplyOperatorInline(_610).translate(j.multiplyOperatorInline(_614)); getLeg(rI)->setIKParam(_608, _60C, legDir, legDirShadow, j); - + TVec3f* center = &mMovableArea->mCenter; TVec3f v23 = v29.translate(v27.multiplyOperatorInline(x)).translate(v28.multiplyOperatorInline(z)).translate(*center); TVec3f v22; mMovableArea->calcLandingNormal(&v22, v23); - + TVec3f v21; mMovableArea->calcLandingFront(&v21, v23); @@ -213,7 +213,7 @@ void TripodBoss::initLegIKPlacement() { } } -void TripodBoss::initMovableArea(const TPos3f &rPos) { +void TripodBoss::initMovableArea(const TPos3f& rPos) { TVec3f trans; rPos.getTrans(trans); mMovableArea = new TripodBossMovableArea(); @@ -231,7 +231,7 @@ void TripodBoss::initBodyPosition() { f32 xxx = _604; f32 yyy = mMovableArea->mRadius; f32 v3 = xxx + yyy; - + TVec3f v4(mMovableArea->mBaseAxis); v4 *= v3; TVec3f v5(mMovableArea->mCenter); @@ -297,8 +297,7 @@ void TripodBoss::control() { if (isNerve(&NrvTripodBoss::TripodBossNrvNonActive::sInstance)) { clippingModel(); - } - else { + } else { mNextStepSeq = -1; checkRideMario(); changeBgmState(); @@ -332,7 +331,7 @@ bool TripodBoss::tryChangeSequence() { TripodBossStepSequence* seq = getNextStepSequence(); seq->reset(); - s32 v9 = seq->getCurrentLeg(); + s32 v9 = seq->getCurrentLeg(); bool v10 = false; for (u32 i = 0; i < 3; i++) { if (i != v9 && !mLegs[i]->isStop()) { @@ -344,8 +343,7 @@ bool TripodBoss::tryChangeSequence() { mCurrentStepSeq = mNextStepSeq; if (!v10) { setNerve(&NrvTripodBoss::TripodBossNrvStep::sInstance); - } - else { + } else { setNerve(&NrvTripodBoss::TripodBossNrvChangeSequence::sInstance); } @@ -375,11 +373,11 @@ bool TripodBoss::tryNextSequence() { } bool TripodBoss::tryDamage() { - s32 leg = getCurrentStepSequence()->getCurrentLeg(); + s32 leg = getCurrentStepSequence()->getCurrentLeg(); if (mLegs[leg]->isDamage()) { setNerve(&NrvTripodBoss::TripodBossNrvDamage::sInstance); return true; - } + } return false; } @@ -400,8 +398,8 @@ bool TripodBoss::tryNextStep() { } TripodBossStepSequence* seq = getCurrentStepSequence(); - s32 leg = seq->getCurrentLeg(); - s32 waitTime = seq->getCurrentWaitTime(); + s32 leg = seq->getCurrentLeg(); + s32 waitTime = seq->getCurrentWaitTime(); if (MR::isGreaterStep(this, waitTime) || mLegs[leg]->isBroken()) { seq->nextStep(); setNerve(&NrvTripodBoss::TripodBossNrvStep::sInstance); @@ -452,7 +450,7 @@ bool TripodBoss::tryBreak() { for (u32 i = 0; i < 3; i++) { mLegs[i]->requestBreak(); } - + setNerve(&NrvTripodBoss::TripodBossNrvTryStartDemo::sInstance); MR::requestStartDemoMarioPuppetable(this, "破壊", &NrvTripodBoss::TripodBossNrvPainDemo::sInstance, nullptr); return true; @@ -487,7 +485,7 @@ void TripodBoss::requestEndDamageDemo() { endDemo("ダメージ"); setNerve(&NrvTripodBoss::TripodBossNrvWait::sInstance); TVec3f appearOffs; - mBodyMtx.mult(sAppearStarPieceOffset,appearOffs); + mBodyMtx.mult(sAppearStarPieceOffset, appearOffs); TVec3f yDir; mBodyMtx.getYDir(yDir); MR::appearStarPieceToDirection(this, appearOffs, yDir, 24, 50.0f, 60.0f, false); @@ -508,12 +506,11 @@ void TripodBoss::exeWait() { void TripodBoss::exeStep() { if (MR::isFirstStep(this)) { TripodBossStepSequence* stepSeq = getCurrentStepSequence(); - s32 curr = stepSeq->getCurrentLeg(); + s32 curr = stepSeq->getCurrentLeg(); if (mLegs[curr]->canStep()) { mLegs[curr]->requestStepTarget(stepSeq->getCurrentStepPoint()); - } - else { - stepSeq->nextStep(); + } else { + stepSeq->nextStep(); } } @@ -561,15 +558,14 @@ void TripodBoss::exeLeaveLegOutOfPlayer() { void TripodBoss::exeDamage() { if (MR::isGreaterStep(this, 30)) { TVec3f* center = &mMovableArea->mCenter; - TVec3f v5(_5D4); + TVec3f v5(_5D4); v5 -= *center; MR::normalizeOrZero(&v5); if (getNerveStep() % 6 < 3) { TVec3f v3(v5); v3 *= 80.0f; _5E0 -= v3; - } - else { + } else { TVec3f v4(v5); v4 *= 79.5f; _5E0 += v4; @@ -587,7 +583,7 @@ void TripodBoss::exeDamage() { void TripodBoss::exeStartDemo() { if (MR::isFirstStep(this)) { startDemo(); - MR::startBckPlayer("BattleWait", (const char *)0); + MR::startBckPlayer("BattleWait", (const char*)0); MR::stopStageBGM(10); _600 = 1.0f; MR::startAnimCameraTargetSelf(this, mEventCamera, "StartDemo", 0, 1.0f); @@ -605,7 +601,7 @@ void TripodBoss::exeStartDemo() { if (MR::isGreaterStep(this, 120)) { MR::startLevelSound(this, "SE_BM_LV_TRIPOD_START_DEMO", -1, -1, -1); } - + calcDemoMovement(); if (MR::isBckStopped(this)) { @@ -638,7 +634,7 @@ void TripodBoss::exePainDemo() { MR::stopStageBGM(30); startDemo(); if (isOnGround) { - MR::startBckPlayer("BattleWait", (const char *)0); + MR::startBckPlayer("BattleWait", (const char*)0); } MR::startBrk(mDummyModel, "Recover"); @@ -655,15 +651,14 @@ void TripodBoss::exePainDemo() { mtx.mMtx[1][3] = v5.y; mtx.mMtx[2][3] = v5.z; MR::setPlayerBaseMtx(mtx); - MR::startBckPlayer("Wait", (const char *)0); + MR::startBckPlayer("Wait", (const char*)0); MR::startAnimCameraTargetSelf(this, mEventCamera, "EndDemo", 0, 1.0f); MR::startBck(this, "EndDemo", nullptr); MR::emitEffect(this, "BreakLight"); } if (MR::isLessStep(this, 90)) { _5BC.y = MR::calcNerveEaseInOutValue(this, 70, 3200.0f, 3400.0f); - } - else { + } else { _5BC.y = MR::calcNerveEaseInValue(this, 90, 150, 3400.0f, 5000.0f); } @@ -712,11 +707,9 @@ void TripodBoss::exeExplosionDemo() { } void TripodBoss::exeNonActive() { - } void TripodBoss::exeTryStartDemo() { - } bool TripodBoss::isStopLeg(s32 idx) const { @@ -737,7 +730,7 @@ bool TripodBoss::isStopAllLeg() const { if (!mLegs[i]->isStop()) { return false; } - } + } return true; } @@ -795,12 +788,12 @@ bool TripodBoss::isLeaveMarioNow() const { return _634 == 3; } -void TripodBoss::setJointAttachBaseMatrix(const TPos3f &rPos, s32 idx) { +void TripodBoss::setJointAttachBaseMatrix(const TPos3f& rPos, s32 idx) { mBossBones[idx].setAttachBaseMatrix(rPos); } -void TripodBoss::addStepPoint(TripodBossStepPoint *pPoint) { - s32 idx = pPoint->_B8; +void TripodBoss::addStepPoint(TripodBossStepPoint* pPoint) { + s32 idx = pPoint->_B8; TVec3f nearPos; mMovableArea->calcNearLandingPosition(&nearPos, pPoint->mStepPosition); TVec3f landingNormal; @@ -813,15 +806,15 @@ void TripodBoss::addStepPoint(TripodBossStepPoint *pPoint) { mStepSequence[idx].addStepPoint(pPoint); } -void TripodBoss::getBodyMatrix(TPos3f *pMtx) const { +void TripodBoss::getBodyMatrix(TPos3f* pMtx) const { JMath::gekko_ps_copy12(pMtx, mBodyMtx); } -void TripodBoss::getJointMatrix(TPos3f *pMtx, s32 a2) const { +void TripodBoss::getJointMatrix(TPos3f* pMtx, s32 a2) const { JMath::gekko_ps_copy12(pMtx, mBossBones[a2]._30); } -void TripodBoss::getJointAttachMatrix(TPos3f *pMtx, s32 a2) const { +void TripodBoss::getJointAttachMatrix(TPos3f* pMtx, s32 a2) const { pMtx->concat(*mBossBones[a2]._30, mBossBones[a2]._0); } @@ -833,11 +826,9 @@ void TripodBoss::requestStartStepSequence(s32 seq) { if (mCurrentStepSeq == -1) { mNextStepSeq = seq; - } - else if (mCurrentStepSeq == seq) { + } else if (mCurrentStepSeq == seq) { mNextStepSeq = seq; - } - else if (mNextStepSeq == -1) { + } else if (mNextStepSeq == -1) { mNextStepSeq = seq; } } @@ -858,13 +849,13 @@ TripodBossStepSequence* TripodBoss::getNextStepSequence() { return &mStepSequence[mNextStepSeq]; } -void TripodBoss::calcLegUpVector(TVec3f *pUp, const TVec3f &a2) { +void TripodBoss::calcLegUpVector(TVec3f* pUp, const TVec3f& a2) { TVec3f* center = &mMovableArea->mCenter; - TVec3f v8(a2); + TVec3f v8(a2); v8 -= *center; MR::normalizeOrZero(&v8); TVec3f* axis = &mMovableArea->mBaseAxis; - f32 v7 = axis->dot(v8); + f32 v7 = axis->dot(v8); JMAVECScaleAdd(axis, &v8, &v8, -v7); MR::normalizeOrZero(&v8); pUp->set(v8); @@ -926,17 +917,17 @@ void TripodBoss::addAccelToWeightPosition() { } JMAVECLerp(&v22.mMax, &v22.mMin, &v20, 0.5f); - + JMAVECLerp(&v21.mMax, &v21.mMin, &v19, 0.5f); - + MR::vecBlend(v19, v20, &v18, 0.30000001f); TVec3f* center = &mMovableArea->mCenter; - TVec3f v14(v18); + TVec3f v14(v18); v14 -= *center; TVec3f* axis = &mMovableArea->mBaseAxis; - f32 v7 = axis->dot(v14); + f32 v7 = axis->dot(v14); JMAVECScaleAdd(axis, &v14, &v18, -v7); - f32 v9 = (_5FC + (_604 + mMovableArea->mRadius)); + f32 v9 = (_5FC + (_604 + mMovableArea->mRadius)); TVec3f v13(mMovableArea->mBaseAxis); v13 *= v9; TVec3f v17(v13); @@ -981,8 +972,7 @@ void TripodBoss::clippingModel() { MR::hideTripodBossParts(); _638 = 1; } - } - else if (MR::calcCameraDistanceZ(_5EC) < 34000.0f) { + } else if (MR::calcCameraDistanceZ(_5EC) < 34000.0f) { if (!MR::isDead(mLowModel)) { mLowModel->makeActorDead(); } @@ -991,8 +981,7 @@ void TripodBoss::clippingModel() { MR::showTripodBossParts(); _638 = 0; } - } - else { + } else { if (MR::isDead(mLowModel)) { mLowModel->makeActorAppeared(); } @@ -1015,7 +1004,7 @@ void TripodBoss::startDemo() { } } -void TripodBoss::endDemo(const char *pName) { +void TripodBoss::endDemo(const char* pName) { MR::endDemo(this, pName); MR::offCalcAnim(this); @@ -1026,13 +1015,12 @@ void TripodBoss::endDemo(const char *pName) { void TripodBoss::checkRideMario() { GravityInfo info; - TVec3f v8; + TVec3f v8; MR::calcGravityAndMagnetVector(this, *MR::getPlayerPos(), v8, &info, 0); if (info.mGravityInstance != nullptr && MR::isTripoddBossParts((const NameObj*)info.mGravityInstance->mHost)) { _630 = 120; - } - else { + } else { if (_630 > 0) { _630--; } @@ -1041,22 +1029,19 @@ void TripodBoss::checkRideMario() { if (_630 > 0) { bool v5 = 1; v5 = isStateSomething(); - + if (v5) { _634 = 0; - } - else { + } else { _634 = 1; } - } - else { + } else { bool v7 = 1; v7 = isStateSomething(); if (v7) { _634 = 3; - } - else { + } else { _634 = 2; } } @@ -1073,22 +1058,22 @@ const TPos3f* TripodBoss::getLegMatrixPtr(PART_ID partID, SUB_PART_ID subPartID) } switch (subPartID) { - case Part_RootLocalY: - return &mLegs[partID]->getRootLocalYMatrix(); - case Part_RootLocalYZ: - return &mLegs[partID]->getRootLocalYZMatrix(); - case Part_RootJoint: - return &mLegs[partID]->getRootJointMatrix(); - case Part_MiddleJoint: - return &mLegs[partID]->getMiddleJointMatrix(); - case Part_AnkleLocalX: - return &mLegs[partID]->getAnkleLocalXMatrix(); - case Part_AnkleLocalXZ: - return &mLegs[partID]->getAnkleLocalXZMatrix(); - case Part_EndJoint: - return &mLegs[partID]->getEndJointMatrix(); - default: - return nullptr; + case Part_RootLocalY: + return &mLegs[partID]->getRootLocalYMatrix(); + case Part_RootLocalYZ: + return &mLegs[partID]->getRootLocalYZMatrix(); + case Part_RootJoint: + return &mLegs[partID]->getRootJointMatrix(); + case Part_MiddleJoint: + return &mLegs[partID]->getMiddleJointMatrix(); + case Part_AnkleLocalX: + return &mLegs[partID]->getAnkleLocalXMatrix(); + case Part_AnkleLocalXZ: + return &mLegs[partID]->getAnkleLocalXZMatrix(); + case Part_EndJoint: + return &mLegs[partID]->getEndJointMatrix(); + default: + return nullptr; } } @@ -1108,8 +1093,7 @@ void TripodBoss::changeBgmState() { } _63C = 3; - } - else { + } else { if (_63C != 1) { MR::setStageBGMState(1, 60); } @@ -1120,38 +1104,38 @@ void TripodBoss::changeBgmState() { s32 TripodBoss::getPartIDFromBoneID(s32 boneID) { switch (boneID) { - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - return 0; - case 7: - case 8: - case 9: - case 10: - case 11: - case 12: - case 13: - return 1; - case 14: - case 15: - case 16: - case 17: - case 18: - case 19: - case 20: - return 2; - case 21: - return 3; - default: - return -1; + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + return 0; + case 7: + case 8: + case 9: + case 10: + case 11: + case 12: + case 13: + return 1; + case 14: + case 15: + case 16: + case 17: + case 18: + case 19: + case 20: + return 2; + case 21: + return 3; + default: + return -1; } } -void TripodBossBone::setAttachBaseMatrix(const TPos3f &rPos) { +void TripodBossBone::setAttachBaseMatrix(const TPos3f& rPos) { _0.invert(rPos); JGeometry::TUtil::sqrt(_0.dot()); @@ -1164,7 +1148,7 @@ void TripodBossBone::setAttachBaseMatrix(const TPos3f &rPos) { _0.mMtx[0][1] = v8 * _0.mMtx[0][1]; _0.mMtx[1][1] = v8 * _0.mMtx[1][1]; _0.mMtx[2][1] = v8 * _0.mMtx[2][1]; - f32 v13 = JGeometry::TUtil::inv_sqrt( (_0.mMtx[0][2] * _0.mMtx[0][2]) + ((_0.mMtx[1][2] * _0.mMtx[1][2]) + (_0.mMtx[2][2] * _0.mMtx[2][2]))); + f32 v13 = JGeometry::TUtil::inv_sqrt((_0.mMtx[0][2] * _0.mMtx[0][2]) + ((_0.mMtx[1][2] * _0.mMtx[1][2]) + (_0.mMtx[2][2] * _0.mMtx[2][2]))); _0.mMtx[0][2] = v13 * _0.mMtx[0][2]; _0.mMtx[1][2] = v13 * _0.mMtx[1][2]; _0.mMtx[2][2] = v13 * _0.mMtx[2][2]; @@ -1172,11 +1156,11 @@ void TripodBossBone::setAttachBaseMatrix(const TPos3f &rPos) { } namespace MR { - NameObj* createTripodBoss(const char *pName) { + NameObj* createTripodBoss(const char* pName) { return new TripodBoss(pName); } - NameObj* createTripod2Boss(const char *pName) { + NameObj* createTripod2Boss(const char* pName) { return new TripodBoss(pName); } -}; +}; // namespace MR diff --git a/src/Game/Boss/TripodBossAccesser.cpp b/src/Game/Boss/TripodBossAccesser.cpp index 34fcd63ad..582d83e27 100644 --- a/src/Game/Boss/TripodBossAccesser.cpp +++ b/src/Game/Boss/TripodBossAccesser.cpp @@ -7,29 +7,28 @@ namespace { static s32 cJMapBoneIDToBoneIndexTableSize = 0x29; static s32 cJMapBoneIDToBoneIndexTable[0x29] = { 0, 1, 2, 7, 8, 9, 0xE, 0xF, 0x10, 0x15, 3, 4, 0, 1, 5, 6, 2, -1, -1, -1, - 0xA, 0xB, 7, 8, 0xC, 0xD, 9, -1, -1, -1, 0x11, 0x12, 0xE, 0xF, 0x13, 0x14, 0x10, -1, -1, -1, 0x15 - }; + 0xA, 0xB, 7, 8, 0xC, 0xD, 9, -1, -1, -1, 0x11, 0x12, 0xE, 0xF, 0x13, 0x14, 0x10, -1, -1, -1, 0x15}; s32 convertBoneIDToIndex(s32 id) NO_INLINE { if (id < 0 || cJMapBoneIDToBoneIndexTableSize <= id) { return -1; - } - else { + } else { return cJMapBoneIDToBoneIndexTable[id]; } } -}; +}; // namespace -TripodBossAccesser::TripodBossAccesser(const char *pName) : NameObj(pName) { +TripodBossAccesser::TripodBossAccesser(const char* pName) + : NameObj(pName) { mBoss = nullptr; mNumParts = 0; } -void TripodBossAccesser::setTriPodBoss(TripodBoss *pBoss) { +void TripodBossAccesser::setTriPodBoss(TripodBoss* pBoss) { mBoss = pBoss; } -void TripodBossAccesser::addTripodBossParts(LiveActor *pActor) { +void TripodBossAccesser::addTripodBossParts(LiveActor* pActor) { mParts[mNumParts] = pActor; mNumParts++; } @@ -37,7 +36,7 @@ void TripodBossAccesser::addTripodBossParts(LiveActor *pActor) { void TripodBossAccesser::showTripodBossParts() { for (s32 i = 0; i < mNumParts; i++) { if (MR::isDead(mParts[i])) { - mParts[i]->makeActorAppeared(); + mParts[i]->makeActorAppeared(); } } } @@ -45,7 +44,7 @@ void TripodBossAccesser::showTripodBossParts() { void TripodBossAccesser::hideTripodBossParts() { for (s32 i = 0; i < mNumParts; i++) { if (!MR::isDead(mParts[i])) { - mParts[i]->makeActorDead(); + mParts[i]->makeActorDead(); } } } @@ -79,16 +78,16 @@ TripodBossAccesser* TripodBossAccesser::createSceneObj() { } namespace MR { - void addTripodBossParts(LiveActor *pActor) { + void addTripodBossParts(LiveActor* pActor) { ((TripodBossAccesser*)MR::createSceneObj(SceneObj_TripodBossAccesser))->addTripodBossParts(pActor); MR::joinToMovementOnOffGroup("三脚ボス部品", pActor, 0x100); } - void addTripodBossPartsMovement(NameObj *pObj) { + void addTripodBossPartsMovement(NameObj* pObj) { MR::joinToMovementOnOffGroup("三脚ボス部品", pObj, 0x100); } - bool isTripoddBossParts(const NameObj *pObj) { + bool isTripoddBossParts(const NameObj* pObj) { return MR::getSceneObj(SceneObj_TripodBossAccesser)->isTripoddBossParts(pObj); } @@ -147,7 +146,7 @@ namespace MR { bool isRideMarioTripodBoss() { return MR::getSceneObj(SceneObj_TripodBossAccesser)->mBoss->isRideMario(); } - + bool tryDamageDemoTripodBoss() { return MR::getSceneObj(SceneObj_TripodBossAccesser)->mBoss->tryDamageDemo(); } @@ -157,10 +156,10 @@ namespace MR { } u32 getTripodBossGravityHostID() { - return (u32)MR::getSceneObj(SceneObj_TripodBossAccesser); + return (u32)MR::getSceneObj(SceneObj_TripodBossAccesser); } - void setTripodBossJointAttachBaseMatrix(const TPos3f &rPos, s32 id) { + void setTripodBossJointAttachBaseMatrix(const TPos3f& rPos, s32 id) { TripodBoss* boss = MR::getSceneObj(SceneObj_TripodBossAccesser)->mBoss; boss->setJointAttachBaseMatrix(rPos, convertBoneIDToIndex(id)); } @@ -169,21 +168,21 @@ namespace MR { MR::getSceneObj(SceneObj_TripodBossAccesser)->mBoss->requestStartStepSequence(seq); } - void addTripodBossStepPoint(TripodBossStepPoint *pPoint) { + void addTripodBossStepPoint(TripodBossStepPoint* pPoint) { MR::getSceneObj(SceneObj_TripodBossAccesser)->mBoss->addStepPoint(pPoint); } - void getTripodBossJointMatrix(TPos3f *pPos, s32 id) { + void getTripodBossJointMatrix(TPos3f* pPos, s32 id) { TripodBoss* boss = MR::getSceneObj(SceneObj_TripodBossAccesser)->mBoss; boss->getJointMatrix(pPos, convertBoneIDToIndex(id)); } - void getTripodBossAttachJointMatrix(TPos3f *pPos, s32 id) { + void getTripodBossAttachJointMatrix(TPos3f* pPos, s32 id) { TripodBoss* boss = MR::getSceneObj(SceneObj_TripodBossAccesser)->mBoss; boss->getJointAttachMatrix(pPos, convertBoneIDToIndex(id)); } - void concatTripodBossAttachJointMatrix(TPos3f *pPos, s32 id) { + void concatTripodBossAttachJointMatrix(TPos3f* pPos, s32 id) { if (MR::isCreatedTripodBoss()) { TPos3f mtx; MR::getTripodBossAttachJointMatrix(&mtx, id); @@ -197,7 +196,7 @@ namespace MR { } bool isSteppingTripodBossJointID(s32 id) { - s32 partID = TripodBoss::getPartIDFromBoneID(convertBoneIDToIndex(id)); + s32 partID = TripodBoss::getPartIDFromBoneID(convertBoneIDToIndex(id)); bool ret = false; if (partID >= 0 && partID < 3) { @@ -207,11 +206,10 @@ namespace MR { if (ret) { return MR::isSteppingTripodBossLegID(partID); } - + return false; } -}; +}; // namespace MR TripodBossAccesser::~TripodBossAccesser() { - } diff --git a/src/Game/Boss/TripodBossBaseJointPosition.cpp b/src/Game/Boss/TripodBossBaseJointPosition.cpp index d7a0408e6..5454dbdc3 100644 --- a/src/Game/Boss/TripodBossBaseJointPosition.cpp +++ b/src/Game/Boss/TripodBossBaseJointPosition.cpp @@ -2,12 +2,13 @@ #include "Game/Boss/TripodBossAccesser.hpp" #include "Game/Util/ObjUtil.hpp" -TripodBossBaseJointPosition::TripodBossBaseJointPosition(const char *pName) : LiveActor(pName) { +TripodBossBaseJointPosition::TripodBossBaseJointPosition(const char* pName) + : LiveActor(pName) { _8C = -1; _90.identity(); } -void TripodBossBaseJointPosition::init(const JMapInfoIter &rIter) { +void TripodBossBaseJointPosition::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::connectToSceneCollisionEnemyMovement(this); MR::getJMapInfoArg0NoInit(rIter, &_8C); @@ -33,7 +34,6 @@ void TripodBossBaseJointPosition::control() { } TripodBossBaseJointPosition::~TripodBossBaseJointPosition() { - } MtxPtr TripodBossBaseJointPosition::getBaseMtx() const { diff --git a/src/Game/Boss/TripodBossBreakMovement.cpp b/src/Game/Boss/TripodBossBreakMovement.cpp index 941851cbb..02f45b368 100644 --- a/src/Game/Boss/TripodBossBreakMovement.cpp +++ b/src/Game/Boss/TripodBossBreakMovement.cpp @@ -7,11 +7,11 @@ namespace NrvTripodBossBreakMovement { NEW_NERVE(TripodBossBreakMovementNrvWait, TripodBossBreakMovement, Wait); NEW_NERVE(TripodBossBreakMovementNrvStartBreak, TripodBossBreakMovement, StartBreak); NEW_NERVE(TripodBossBreakMovementNrvBreak, TripodBossBreakMovement, Break); -}; +}; // namespace NrvTripodBossBreakMovement -TripodBossBreakMovement::TripodBossBreakMovement(const char *pName) : - LiveActor(pName), mSpring(nullptr), _CC(0, 0, 0), _D8(0, 0, 0), - _E4(0, 1, 0) { +TripodBossBreakMovement::TripodBossBreakMovement(const char* pName) + : LiveActor(pName), mSpring(nullptr), _CC(0, 0, 0), _D8(0, 0, 0), + _E4(0, 1, 0) { _F0 = 0.30000001f; _F4 = 0.0f; @@ -26,7 +26,7 @@ TripodBossBreakMovement::TripodBossBreakMovement(const char *pName) : setBreakDownLevel(1); } -void TripodBossBreakMovement::start(const TPos3f &a1, s32 a2) { +void TripodBossBreakMovement::start(const TPos3f& a1, s32 a2) { _8C.setInline(a1); _8C.getTrans(_C0); _CC.z = 0.0f; @@ -47,12 +47,12 @@ void TripodBossBreakMovement::start(const TPos3f &a1, s32 a2) { MR::getTripodBossJointMatrix(&jointMtx, _100); jointMtx.getYDir(_E4); - f32 v17 = MR::getRandom(-1.0f, 1.0f); - f32 v18 = MR::getRandom(-1.0f, 1.0f); - f32 v19 = MR::getRandom(-1.0f, 1.0f); + f32 v17 = MR::getRandom(-1.0f, 1.0f); + f32 v18 = MR::getRandom(-1.0f, 1.0f); + f32 v19 = MR::getRandom(-1.0f, 1.0f); TVec3f v25; v25.set(v19, v18, v17); - f32 val = _F0; + f32 val = _F0; TVec3f v24(v25); v24 *= val; _E4 += v24; @@ -75,16 +75,15 @@ void TripodBossBreakMovement::setBreakDownLevel(s32 level) { } switch (level) { - case 0: - case 1: - case 2: - _F4 = MR::getRandom(50.0f, 90.0f); - break; - case 3: - _F4 = 50.0f; - _F0 = 0.0f; - break; - + case 0: + case 1: + case 2: + _F4 = MR::getRandom(50.0f, 90.0f); + break; + case 3: + _F4 = 50.0f; + _F0 = 0.0f; + break; } } @@ -92,7 +91,7 @@ void TripodBossBreakMovement::setBreakDownLevel(s32 level) { void TripodBossBreakMovement::exeStartBreak() { TVec3f dir; _8C.getYDir(dir); - f32 val = mSpring->_4; + f32 val = mSpring->_4; TVec3f v5(dir); v5 *= val; TVec3f v6(_C0); @@ -109,7 +108,7 @@ void TripodBossBreakMovement::exeBreak() { MR::rotateMtxMoment(&_8C, _8C, _CC); if (MR::isFirstStep(this)) { _8C.getTrans(_C0); - f32 val = _F4; + f32 val = _F4; TVec3f v8(_E4); v8 *= val; _D8 += v8; @@ -126,5 +125,4 @@ void TripodBossBreakMovement::exeBreak() { } TripodBossBreakMovement::~TripodBossBreakMovement() { - } diff --git a/src/Game/Boss/TripodBossCoin.cpp b/src/Game/Boss/TripodBossCoin.cpp index af8c4e769..952e1f4ac 100644 --- a/src/Game/Boss/TripodBossCoin.cpp +++ b/src/Game/Boss/TripodBossCoin.cpp @@ -6,18 +6,17 @@ namespace NrvTripodBossCoin { NEW_NERVE(TripodBossCoinNrvNonActive, TripodBossCoin, NonActive); NEW_NERVE(TripodBossCoinNrvActive, TripodBossCoin, Active); NEW_NERVE(TripodBossCoinNrvEnd, TripodBossCoin, End); -}; +}; // namespace NrvTripodBossCoin -TripodBossCoin::TripodBossCoin(const char *pName) : - NameObj(pName), - mCoin(nullptr), - mSpine(nullptr), - _44(-1) -{ +TripodBossCoin::TripodBossCoin(const char* pName) + : NameObj(pName), + mCoin(nullptr), + mSpine(nullptr), + _44(-1) { _14.identity(); } -void TripodBossCoin::init(const JMapInfoIter &rIter) { +void TripodBossCoin::init(const JMapInfoIter& rIter) { MR::getJMapInfoMatrixFromRT(rIter, &_14); MR::connectToSceneMapObjDecorationMovement(this); MR::getJMapInfoArg0NoInit(rIter, &_44); @@ -32,7 +31,7 @@ void TripodBossCoin::movement() { } void TripodBossCoin::exeNonActive() { - if (MR::isStartedTripodBoss()&& !MR::isStartDemoTripodBoss()) { + if (MR::isStartedTripodBoss() && !MR::isStartDemoTripodBoss()) { mSpine->setNerve(&NrvTripodBossCoin::TripodBossCoinNrvActive::sInstance); } } @@ -42,9 +41,9 @@ void TripodBossCoin::exeActive() { pos.setInline(_14); MR::concatTripodBossAttachJointMatrix(&pos, _44); TVec3f coinPos; - f32 z = pos.mMtx[2][3]; - f32 y = pos.mMtx[1][3]; - f32 x = pos.mMtx[0][3]; + f32 z = pos.mMtx[2][3]; + f32 y = pos.mMtx[1][3]; + f32 x = pos.mMtx[0][3]; coinPos.set(x, y, z); TVec3f* newPos = &mCoin->mPosition; newPos->x = coinPos.x; @@ -62,5 +61,4 @@ void TripodBossCoin::exeActive() { } void TripodBossCoin::exeEnd() { - } diff --git a/src/Game/Boss/TripodBossCore.cpp b/src/Game/Boss/TripodBossCore.cpp index 846256d1d..c4c45cf7e 100644 --- a/src/Game/Boss/TripodBossCore.cpp +++ b/src/Game/Boss/TripodBossCore.cpp @@ -14,14 +14,15 @@ namespace NrvTripodBossCore { NEW_NERVE(TripodBossCoreNrvDamageDemo, TripodBossCore, DamageDemo); NEW_NERVE(TripodBossCoreNrvWarning, TripodBossCore, Warning); NEW_NERVE(TripodBossCoreNrvBreak, TripodBossCore, Break); -}; +}; // namespace NrvTripodBossCore -TripodBossCore::TripodBossCore(const char *pName) : TripodBossFixPartsBase(pName) { +TripodBossCore::TripodBossCore(const char* pName) + : TripodBossFixPartsBase(pName) { mBreakModel = nullptr; mBloomModel = nullptr; } -void TripodBossCore::init(const JMapInfoIter &rIter) { +void TripodBossCore::init(const JMapInfoIter& rIter) { TripodBossFixPartsBase::init(rIter); initModelManagerWithAnm("TripodBossCore", nullptr, false); MR::connectToScene(this, 0x23, 0xB, 0x1F, -1); @@ -57,7 +58,7 @@ void TripodBossCore::kill() { mBreakModel->kill(); } -bool TripodBossCore::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool TripodBossCore::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (!isNerve(&NrvTripodBossCore::TripodBossCoreNrvBreak::sInstance)) { setNerve(&NrvTripodBossCore::TripodBossCoreNrvBreak::sInstance); return true; @@ -82,7 +83,7 @@ void TripodBossCore::exeWait() { } updateTripodMatrix(); - GXColor g = { 0x96, 0x96, 0x96, 0xFF}; + GXColor g = {0x96, 0x96, 0x96, 0xFF}; MR::requestPointLight(this, mPosition, Color8(g), 1.0f, -1); if (MR::isDamageDemoTripodBoss()) { setNerve(&NrvTripodBossCore::TripodBossCoreNrvDamageDemo::sInstance); @@ -95,7 +96,7 @@ void TripodBossCore::exeDamageDemo() { MR::tryStartAllAnim(mBloomModel, "2ndDemo"); } - GXColor g = { 0xFF, 0x96, 0x96, 0xFF}; + GXColor g = {0xFF, 0x96, 0x96, 0xFF}; MR::requestPointLight(this, mPosition, Color8(g), 1.0f, -1); if (MR::isDamageDemoTripodBoss()) { setNerve(&NrvTripodBossCore::TripodBossCoreNrvWarning::sInstance); @@ -104,7 +105,7 @@ void TripodBossCore::exeDamageDemo() { void TripodBossCore::exeWarning() { updateTripodMatrix(); - GXColor g = { 0xFF, 0x96, 0x96, 0xFF}; + GXColor g = {0xFF, 0x96, 0x96, 0xFF}; MR::requestPointLight(this, mPosition, Color8(g), 1.0f, -1); } @@ -124,7 +125,7 @@ void TripodBossCore::exeBreak() { if (MR::isValidSwitchDead(this)) { MR::onSwitchDead(this); } - } + } if (MR::isStep(this, 2)) { MR::stopScene(16); @@ -138,9 +139,7 @@ void TripodBossCore::exeBreak() { } void TripodBossCore::exeNonActive() { - } TripodBossCore::~TripodBossCore() { - } diff --git a/src/Game/Boss/TripodBossFixParts.cpp b/src/Game/Boss/TripodBossFixParts.cpp index c1f52e4b5..01f084096 100644 --- a/src/Game/Boss/TripodBossFixParts.cpp +++ b/src/Game/Boss/TripodBossFixParts.cpp @@ -10,23 +10,22 @@ namespace NrvTripodBossFixParts { NEW_NERVE(TripodBossFixPartsNrvStartDemo, TripodBossFixParts, StartDemo); NEW_NERVE(TripodBossFixPartsNrvWait, TripodBossFixParts, Wait); NEW_NERVE(TripodBossFixPartsNrvBreak, TripodBossFixParts, Break); -}; +}; // namespace NrvTripodBossFixParts struct TripodBossSetting { - const char* mPartName; // 0x00 - s32 mType; // 0x04 + const char* mPartName; // 0x00 + s32 mType; // 0x04 }; namespace { static TripodBossSetting sTripodBossSettingTable[5] = { - { "TripodBossBodyABloom", 3 }, - { "TripodBossFootBloom", 3 }, - { "TriPodBossLeg2ABloom", 3 }, - { "TripodBossEyeLight", 2 }, - { "TripodBossEyeLightBloom", 3 } - }; + {"TripodBossBodyABloom", 3}, + {"TripodBossFootBloom", 3}, + {"TriPodBossLeg2ABloom", 3}, + {"TripodBossEyeLight", 2}, + {"TripodBossEyeLightBloom", 3}}; - TripodBossSetting* getSetting(const char *pObjName) { + TripodBossSetting* getSetting(const char* pObjName) { for (u32 i = 0; i < 5; i++) { const char* partName = sTripodBossSettingTable[i].mPartName; if (MR::isEqualString(pObjName, partName)) { @@ -36,9 +35,10 @@ namespace { return nullptr; } -}; +}; // namespace -TripodBossFixParts::TripodBossFixParts(const char *pName) : TripodBossFixPartsBase(pName) { +TripodBossFixParts::TripodBossFixParts(const char* pName) + : TripodBossFixPartsBase(pName) { _E4 = -1; _E8 = 180; mHasCollision = false; @@ -48,12 +48,12 @@ TripodBossFixParts::TripodBossFixParts(const char *pName) : TripodBossFixPartsBa } // https://decomp.me/scratch/UtuYP -void TripodBossFixParts::init(const JMapInfoIter &rIter) { +void TripodBossFixParts::init(const JMapInfoIter& rIter) { const char* objName; MR::getObjectName(&objName, rIter); setName(objName); TripodBossFixPartsBase::init(rIter); - bool val = false; + bool val = false; TripodBossSetting* setting = getSetting(objName); if (setting != nullptr) { @@ -67,8 +67,7 @@ void TripodBossFixParts::init(const JMapInfoIter &rIter) { if (val) { MR::connectToScene(this, 0x23, 0xB, 0x1E, -1); - } - else { + } else { MR::connectToScene(this, 0x23, 0xB, 0x1F, -1); } @@ -78,8 +77,7 @@ void TripodBossFixParts::init(const JMapInfoIter &rIter) { clip.y = 1000.0f; clip.z = 0.0f; setClippingSphere(clip, 3750.0f); - } - else { + } else { initClippingSphere(); } @@ -108,39 +106,38 @@ void TripodBossFixParts::init(const JMapInfoIter &rIter) { makeActorDead(); } -void TripodBossFixParts::initSensor(const JMapInfoIter &rIter) { +void TripodBossFixParts::initSensor(const JMapInfoIter& rIter) { initHitSensor(1); if (MR::isMapPartsPressOn(rIter)) { MR::addBodyMessageSensorMapObjPress(this); - } - else { + } else { MR::addBodyMessageSensorMapObj(this); } } void TripodBossFixParts::kill() { switch (_E4) { - case 0: - MR::emitEffect(this, "ExplosionS"); - MR::startSound(this, "SE_BM_TRIPOD_KILL_S", -1, -1); - break; - case 1: - MR::emitEffect(this, "ExplosionM"); - MR::startSound(this, "SE_BM_TRIPOD_KILL_M", -1, -1); - MR::tryRumblePadVeryWeak(this, 0); - break; - case 2: - MR::emitEffect(this, "ExplosionM"); - MR::startSound(this, "SE_BM_TRIPOD_KILL_M", -1, -1); - MR::shakeCameraVeryWeak(); - MR::tryRumblePadMiddle(this, 0); - break; - case 3: - MR::emitEffect(this, "ExplosionL"); - MR::startSound(this, "SE_BM_TRIPOD_KILL_L", -1, -1); - MR::shakeCameraStrong(); - MR::tryRumblePadVeryStrong(this, 0); - break; + case 0: + MR::emitEffect(this, "ExplosionS"); + MR::startSound(this, "SE_BM_TRIPOD_KILL_S", -1, -1); + break; + case 1: + MR::emitEffect(this, "ExplosionM"); + MR::startSound(this, "SE_BM_TRIPOD_KILL_M", -1, -1); + MR::tryRumblePadVeryWeak(this, 0); + break; + case 2: + MR::emitEffect(this, "ExplosionM"); + MR::startSound(this, "SE_BM_TRIPOD_KILL_M", -1, -1); + MR::shakeCameraVeryWeak(); + MR::tryRumblePadMiddle(this, 0); + break; + case 3: + MR::emitEffect(this, "ExplosionL"); + MR::startSound(this, "SE_BM_TRIPOD_KILL_L", -1, -1); + MR::shakeCameraStrong(); + MR::tryRumblePadVeryStrong(this, 0); + break; } LiveActor::kill(); @@ -158,8 +155,7 @@ void TripodBossFixParts::activateTripodBoss() { if (MR::isExistAnim(this, "StartDemo")) { setNerve(&NrvTripodBossFixParts::TripodBossFixPartsNrvStartDemo::sInstance); - } - else { + } else { setNerve(&NrvTripodBossFixParts::TripodBossFixPartsNrvWait::sInstance); } } @@ -207,8 +203,7 @@ void TripodBossFixParts::exeWait() { if (MR::isEndBreakDownDemoTripodBoss()) { if (_ED) { setNerve(&NrvTripodBossFixParts::TripodBossFixPartsNrvBreak::sInstance); - } - else { + } else { kill(); } } @@ -229,13 +224,10 @@ void TripodBossFixParts::exeBreak() { } void TripodBossFixParts::exeNonActive() { - } TripodBossFixParts::~TripodBossFixParts() { - } void TripodBossFixParts::exeWaitOwn() { - } diff --git a/src/Game/Boss/TripodBossFixPartsBase.cpp b/src/Game/Boss/TripodBossFixPartsBase.cpp index 841470c22..063e70a85 100644 --- a/src/Game/Boss/TripodBossFixPartsBase.cpp +++ b/src/Game/Boss/TripodBossFixPartsBase.cpp @@ -6,7 +6,8 @@ #include "Game/Util/ObjUtil.hpp" #include -TripodBossFixPartsBase::TripodBossFixPartsBase(const char *pName) : LiveActor(pName) { +TripodBossFixPartsBase::TripodBossFixPartsBase(const char* pName) + : LiveActor(pName) { _BC.x = 0.0f; _BC.y = 0.0f; _BC.z = 0.0f; @@ -21,7 +22,7 @@ TripodBossFixPartsBase::TripodBossFixPartsBase(const char *pName) : LiveActor(pN _8C.identity(); } -void TripodBossFixPartsBase::init(const JMapInfoIter &rIter) { +void TripodBossFixPartsBase::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); _BC = mPosition; MR::getJMapInfoArg0NoInit(rIter, &_CC); @@ -48,7 +49,7 @@ void TripodBossFixPartsBase::initClippingSphere() { mClippingDistance = PSVECDistance(&_D0, &box.mMin); } -void TripodBossFixPartsBase::setClippingSphere(const TVec3f &a1, f32 dist) { +void TripodBossFixPartsBase::setClippingSphere(const TVec3f& a1, f32 dist) { _D0 = a1; mClippingDistance = dist; } @@ -64,7 +65,7 @@ void TripodBossFixPartsBase::calcAndSetBaseMtx() { MR::setBaseTRMtx(this, _8C); } -bool TripodBossFixPartsBase::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool TripodBossFixPartsBase::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (msg == ACTMES_TRIPODBOSS_STARTED) { activateTripodBoss(); @@ -74,12 +75,11 @@ bool TripodBossFixPartsBase::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSen return false; } -void TripodBossFixPartsBase::calcTripodLocalMatrix(TPos3f *pPos) { +void TripodBossFixPartsBase::calcTripodLocalMatrix(TPos3f* pPos) { MR::makeMtxTR(*pPos, _BC, mRotation); } void TripodBossFixPartsBase::activateTripodBoss() { - } void TripodBossFixPartsBase::startBreakMovement() { @@ -105,8 +105,7 @@ void TripodBossFixPartsBase::updateTripodMatrix() { _8C.mult(_D0, mul); if (MR::isJudgedToClipFrustum(mul, mClippingDistance)) { MR::hideModelAndOnCalcAnim(this); - } - else { + } else { MR::showModel(this); } } diff --git a/src/Game/Boss/TripodBossGuardWall.cpp b/src/Game/Boss/TripodBossGuardWall.cpp index 355c5c482..01eb0f786 100644 --- a/src/Game/Boss/TripodBossGuardWall.cpp +++ b/src/Game/Boss/TripodBossGuardWall.cpp @@ -17,28 +17,28 @@ struct WallPart2Angle { namespace { static WallPart2Angle sWallPartPlacementAngleTable[8] = { - { 0.0f, 4 }, - { 45.0f, 8 }, - { 90.0f, 0xC }, - { 135.0f, 0x10 }, - { 180.0f, 0x14 }, - { 225.0f, 0x18 }, - { 270.0f, 0x1C }, - { 315.0f, 0x20 } - }; + {0.0f, 4}, + {45.0f, 8}, + {90.0f, 0xC}, + {135.0f, 0x10}, + {180.0f, 0x14}, + {225.0f, 0x18}, + {270.0f, 0x1C}, + {315.0f, 0x20}}; static s32 sMoveSeLength = 0x3A; -}; +}; // namespace namespace NrvTriPodBossGuardWall { NEW_NERVE(TripodBossGuardWallNrvWait, TripodBossGuardWall, Wait); NEW_NERVE(TripodBossGuardWallNrvTryDemo, TripodBossGuardWall, TryDemo); NEW_NERVE(TripodBossGuardWallNrvDemo, TripodBossGuardWall, Demo); NEW_NERVE(TripodBossGuardWallNrvRotate, TripodBossGuardWall, Rotate); -}; +}; // namespace NrvTriPodBossGuardWall -TripodBossGuardWall::TripodBossGuardWall(const char *pName) : LiveActor(pName), - mCameraTargetMtx(nullptr) { +TripodBossGuardWall::TripodBossGuardWall(const char* pName) + : LiveActor(pName), + mCameraTargetMtx(nullptr) { mCameraInfo = nullptr; _580.x = 0.0f; _580.y = 0.0f; @@ -66,7 +66,7 @@ void TripodBossGuardWall::kill() { LiveActor::kill(); } -void TripodBossGuardWall::init(const JMapInfoIter &rIter) { +void TripodBossGuardWall::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::connectToSceneMapObjDecorationMovement(this); _580.setPS(mPosition); @@ -79,7 +79,7 @@ void TripodBossGuardWall::init(const JMapInfoIter &rIter) { mCameraTargetMtx = new CameraTargetMtx("カメラターゲットダミー"); if (MR::useStageSwitchReadAppear(this, rIter)) { - MR::FunctorV0M validateFunc = MR::Functor_Inline(this, &TripodBossGuardWall::requestStart); + MR::FunctorV0M validateFunc = MR::Functor_Inline(this, &TripodBossGuardWall::requestStart); MR::listenStageSwitchOnAppear(this, validateFunc); } @@ -107,7 +107,7 @@ void TripodBossGuardWall::calcAndSetBaseMtx() { MR::setBaseTRMtx(this, mBaseMtx); } -bool TripodBossGuardWall::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool TripodBossGuardWall::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (msg == ACTMES_TRIPODBOSS_STARTED) { for (s32 i = 0; i < 8; i++) { mWallParts[i].makeActorAppeared(); @@ -129,7 +129,6 @@ void TripodBossGuardWall::requestStart() { /* more small inlining issues */ void TripodBossGuardWall::exeDemo() { if (MR::isFirstStep(this)) { - } if (MR::isStep(this, 150)) { @@ -195,7 +194,7 @@ void TripodBossGuardWall::updateCameraTarget() { front.x = fromPlayer.x; front.y = fromPlayer.y; front.z = fromPlayer.z; - + f32 z = mBaseMtx.mMtx[2][1]; f32 y = mBaseMtx.mMtx[1][1]; f32 x = mBaseMtx.mMtx[0][1]; @@ -208,8 +207,7 @@ void TripodBossGuardWall::updateCameraTarget() { f32 y = mBaseMtx.mMtx[1][2]; f32 x = mBaseMtx.mMtx[0][2]; front.set(x, y, z); - } - else { + } else { MR::normalize(&front); } diff --git a/src/Game/Boss/TripodBossGuardWallPart.cpp b/src/Game/Boss/TripodBossGuardWallPart.cpp index 066f7b3c1..e3b7f12c3 100644 --- a/src/Game/Boss/TripodBossGuardWallPart.cpp +++ b/src/Game/Boss/TripodBossGuardWallPart.cpp @@ -11,15 +11,16 @@ namespace NrvTripodBossGuardWallPart { NEW_NERVE(TripodBossGuardWallPartNrvActive, TripodBossGuardWallPart, Active); NEW_NERVE(TripodBossGuardWallPartNrvBreak, TripodBossGuardWallPart, Break); NEW_NERVE(TripodBossGuardWallPartNrvRepair, TripodBossGuardWallPart, Repair); -}; +}; // namespace NrvTripodBossGuardWallPart -TripodBossGuardWallPart::TripodBossGuardWallPart(const char *pName) : LiveActor(pName) { +TripodBossGuardWallPart::TripodBossGuardWallPart(const char* pName) + : LiveActor(pName) { mHostMtx = nullptr; mPlacementAngle = 0.0f; mStartTiming = 0; } -void TripodBossGuardWallPart::init(const JMapInfoIter &rIter) { +void TripodBossGuardWallPart::init(const JMapInfoIter& rIter) { initModelManagerWithAnm("TripodBossGuardWall", nullptr, false); MR::connectToScene(this, 0x23, 0xB, 0x1F, -1); initHitSensor(2); @@ -58,10 +59,8 @@ void TripodBossGuardWallPart::calcAndSetBaseMtx() { MR::setBaseTRMtx(this, mtx); } -bool TripodBossGuardWallPart::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - if (MR::isSensorType(pReceiver, ATYPE_TRIPODBOSS_GUARD_WALL) - && MR::isMsgExplosionAttack(msg)) - { +bool TripodBossGuardWallPart::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + if (MR::isSensorType(pReceiver, ATYPE_TRIPODBOSS_GUARD_WALL) && MR::isMsgExplosionAttack(msg)) { return requestBreak(); } @@ -119,7 +118,6 @@ void TripodBossGuardWallPart::exeRepair() { } void TripodBossGuardWallPart::exeActive() { - } void TripodBossGuardWallPart::exeDemo() { @@ -129,10 +127,9 @@ void TripodBossGuardWallPart::exeDemo() { } void TripodBossGuardWallPart::exeNonActive() { - } -void TripodBossGuardWallPart::setHostMatrix(const TPos3f *pPos) { +void TripodBossGuardWallPart::setHostMatrix(const TPos3f* pPos) { mHostMtx = pPos; } diff --git a/src/Game/Boss/TripodBossKillerGenerater.cpp b/src/Game/Boss/TripodBossKillerGenerater.cpp index 19151e5a8..f9df4eb87 100644 --- a/src/Game/Boss/TripodBossKillerGenerater.cpp +++ b/src/Game/Boss/TripodBossKillerGenerater.cpp @@ -18,9 +18,10 @@ namespace NrvTripodBossKillerGenerater { NEW_NERVE(TripodBossKillerGeneraterNrvBreak, TripodBossKillerGenerater, Break); NEW_NERVE(TripodBossKillerGeneraterNrvStop, TripodBossKillerGenerater, Stop); NEW_NERVE(TripodBossKillerGeneraterNrvRestart, TripodBossKillerGenerater, Restart); -}; +}; // namespace NrvTripodBossKillerGenerater -TripodBossKillerGenerater::TripodBossKillerGenerater(const char *pName) : TripodBossFixPartsBase(pName) { +TripodBossKillerGenerater::TripodBossKillerGenerater(const char* pName) + : TripodBossFixPartsBase(pName) { mKiller = nullptr; _118 = 2000.0f; mActiveLabel = false; @@ -29,7 +30,7 @@ TripodBossKillerGenerater::TripodBossKillerGenerater(const char *pName) : Tripod _E4.identity(); } -void TripodBossKillerGenerater::init(const JMapInfoIter &rIter) { +void TripodBossKillerGenerater::init(const JMapInfoIter& rIter) { TripodBossFixPartsBase::init(rIter); MR::makeMtxTR(_E4, this); initModelManagerWithAnm("TripodBossKillerCannon", nullptr, false); @@ -44,7 +45,7 @@ void TripodBossKillerGenerater::init(const JMapInfoIter &rIter) { if (arg == 0) { mKiller->_15C = 1; } - + if (mHasCollision) { initHitSensor(1); MR::addHitSensor(this, "body", ATYPE_TRIPODBOSS_KILLER_GENERATER, 0, 0.0f, TVec3f(0.0f, 0.0f, 0.0f)); @@ -58,8 +59,7 @@ void TripodBossKillerGenerater::init(const JMapInfoIter &rIter) { if (mActiveLabel > 0) { MR::startBck(this, "Shoot", nullptr); MR::setBckFrameAndStop(this, 0.0f); - } - else { + } else { MR::startBck(this, "2ndDemo", nullptr); MR::setBckFrameAndStop(this, 0.0f); } @@ -76,7 +76,7 @@ void TripodBossKillerGenerater::kill() { MR::emitEffect(this, "ExplosionM"); } -bool TripodBossKillerGenerater::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool TripodBossKillerGenerater::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgExplosionAttack(msg)) { return requestBreak(); } @@ -84,7 +84,7 @@ bool TripodBossKillerGenerater::receiveMsgEnemyAttack(u32 msg, HitSensor *pSende return false; } -void TripodBossKillerGenerater::calcTripodLocalMatrix(TPos3f *pPos) { +void TripodBossKillerGenerater::calcTripodLocalMatrix(TPos3f* pPos) { pPos->set(_E4); } @@ -95,8 +95,7 @@ void TripodBossKillerGenerater::activateTripodBoss() { if (mHasCollision) { MR::invalidateCollisionParts(this); } - } - else { + } else { setNerve(&NrvTripodBossKillerGenerater::TripodBossKillerGeneraterNrvReady::sInstance); if (mHasCollision) { MR::validateCollisionParts(this); @@ -107,7 +106,7 @@ void TripodBossKillerGenerater::activateTripodBoss() { _E1 = 1; } -void TripodBossKillerGenerater::setLocalMatrix(const TPos3f &pMtx) { +void TripodBossKillerGenerater::setLocalMatrix(const TPos3f& pMtx) { _E4.set(pMtx); } @@ -189,26 +188,22 @@ bool TripodBossKillerGenerater::tryAbort() { setNerve(&NrvTripodBossKillerGenerater::TripodBossKillerGeneraterNrvReady::sInstance); return true; - } - else { + } else { return false; } } bool TripodBossKillerGenerater::requestBreak() { - if (isNerve(&NrvTripodBossKillerGenerater::TripodBossKillerGeneraterNrvReady::sInstance) - || isNerve(&NrvTripodBossKillerGenerater::TripodBossKillerGeneraterNrvShootSetting::sInstance) - || isNerve(&NrvTripodBossKillerGenerater::TripodBossKillerGeneraterNrvShoot::sInstance) - || isNerve(&NrvTripodBossKillerGenerater::TripodBossKillerGeneraterNrvCoolDown::sInstance)) { - + if (isNerve(&NrvTripodBossKillerGenerater::TripodBossKillerGeneraterNrvReady::sInstance) || isNerve(&NrvTripodBossKillerGenerater::TripodBossKillerGeneraterNrvShootSetting::sInstance) || isNerve(&NrvTripodBossKillerGenerater::TripodBossKillerGeneraterNrvShoot::sInstance) || isNerve(&NrvTripodBossKillerGenerater::TripodBossKillerGeneraterNrvCoolDown::sInstance)) { + if (isNerve(&NrvTripodBossKillerGenerater::TripodBossKillerGeneraterNrvShootSetting::sInstance) && !MR::isDead(mKiller)) { mKiller->kill(); } - + if (mHasCollision) { MR::invalidateCollisionParts(this); } - + MR::startBck(this, "2ndDemo", nullptr); MR::setBckFrameAndStop(this, 0.0f); setNerve(&NrvTripodBossKillerGenerater::TripodBossKillerGeneraterNrvStop::sInstance); @@ -337,9 +332,7 @@ void TripodBossKillerGenerater::exeHide() { } void TripodBossKillerGenerater::exeNonActive() { - } TripodBossKillerGenerater::~TripodBossKillerGenerater() { - } diff --git a/src/Game/Boss/TripodBossKillerGeneraterCircle.cpp b/src/Game/Boss/TripodBossKillerGeneraterCircle.cpp index b214dbe77..88dabf055 100644 --- a/src/Game/Boss/TripodBossKillerGeneraterCircle.cpp +++ b/src/Game/Boss/TripodBossKillerGeneraterCircle.cpp @@ -3,37 +3,33 @@ #include "JSystem/JGeometry/TMatrix.hpp" struct GeneratorCircleData { - const char* mName; // 0x00 - const f32* mAngleTable; // 0x04 - s32 mNumAngles; // 0x08 - f32 _C; - f32 _10; - f32 _14; - f32 _18; - u32 mActiveLabel; // 0x1C - bool mHasCollision; // 0x20 + const char* mName; // 0x00 + const f32* mAngleTable; // 0x04 + s32 mNumAngles; // 0x08 + f32 _C; + f32 _10; + f32 _14; + f32 _18; + u32 mActiveLabel; // 0x1C + bool mHasCollision; // 0x20 }; namespace { static f32 sUpperHorizonAngleTable[7] = { - 42.0f, 96.0f, 140.0f, 180.0f, -140.0f, -96.0f, -42.0f - }; + 42.0f, 96.0f, 140.0f, 180.0f, -140.0f, -96.0f, -42.0f}; static f32 sUnderHorizonAngleTable[6] = { - 78.0f, 120.0f, 160.0f, -160.0f, -120.0f, -78.0f - }; + 78.0f, 120.0f, 160.0f, -160.0f, -120.0f, -78.0f}; static f32 sBottomHorizonAngleTable[3] = { - 0.0f, 120.0f, 240.0f - }; + 0.0f, 120.0f, 240.0f}; static const GeneratorCircleData sSetUpDataTable[3] = { - { "TripodBossUpperKillerCannon", sUpperHorizonAngleTable, 7, 2150.0f, 49.0f, -29.0f, 975.0f, 1, 0x1000000 }, - { "TripodBossUnderKillerCannon", sUnderHorizonAngleTable, 6, 2150.0f,5.8000002f, 39.200001f, 975.0f, 0, 0x1000000 }, - { "TripodBossBottomKillerCannon", sBottomHorizonAngleTable, 3, 500.0f, -50.0f, -30.0f, -1300.0f, 0, 0 } - }; + {"TripodBossUpperKillerCannon", sUpperHorizonAngleTable, 7, 2150.0f, 49.0f, -29.0f, 975.0f, 1, 0x1000000}, + {"TripodBossUnderKillerCannon", sUnderHorizonAngleTable, 6, 2150.0f, 5.8000002f, 39.200001f, 975.0f, 0, 0x1000000}, + {"TripodBossBottomKillerCannon", sBottomHorizonAngleTable, 3, 500.0f, -50.0f, -30.0f, -1300.0f, 0, 0}}; - const GeneratorCircleData* getCirlceData(const char *pName) { + const GeneratorCircleData* getCirlceData(const char* pName) { for (u32 i = 0; i < 3; i++) { if (MR::isEqualString(pName, sSetUpDataTable[i].mName)) { return &sSetUpDataTable[i]; @@ -42,13 +38,13 @@ namespace { return nullptr; } -}; +}; // namespace TripodBossKillerGeneraterCircle::~TripodBossKillerGeneraterCircle() { - } -TripodBossKillerGeneraterCircle::TripodBossKillerGeneraterCircle(const char *pName) : NameObj(pName) { +TripodBossKillerGeneraterCircle::TripodBossKillerGeneraterCircle(const char* pName) + : NameObj(pName) { mGenerators = nullptr; mPosition.x = 0.0f; mPosition.y = 0.0f; @@ -62,7 +58,7 @@ TripodBossKillerGeneraterCircle::TripodBossKillerGeneraterCircle(const char *pNa _40 = 0; } -void TripodBossKillerGeneraterCircle::init(const JMapInfoIter &rIter) { +void TripodBossKillerGeneraterCircle::init(const JMapInfoIter& rIter) { const char* objName; MR::getObjectName(&objName, rIter); const GeneratorCircleData* dataPtr = getCirlceData(objName); @@ -88,25 +84,25 @@ void TripodBossKillerGeneraterCircle::init(const JMapInfoIter &rIter) { // https://decomp.me/scratch/kbnGV void TripodBossKillerGeneraterCircle::placementGenerater() { - + for (s32 i = 0; i < mNumAngles; i++) { TPos3f mtx; mtx.identity(); f32 v5 = -(0.017453292f * _3C); f32 v6 = sin(v5); f32 v7 = cos(v5); - + mtx.mMtx[0][0] = 1.0f; mtx.mMtx[2][1] = v6; mtx.mMtx[1][1] = v7; mtx.mMtx[1][2] = -v6; mtx.mMtx[2][2] = v7; - + mtx.mMtx[2][0] = 0.0f; mtx.mMtx[0][2] = 0.0f; mtx.mMtx[1][0] = 0.0f; mtx.mMtx[0][1] = 0.0f; - // might be a fake temp, as it causes regswaps, but is the only way i found to get + // might be a fake temp, as it causes regswaps, but is the only way i found to get // the load in the correct position f32 temp = _34; mtx.mMtx[0][3] = 0.0f; diff --git a/src/Game/Boss/TripodBossKinokoOneUp.cpp b/src/Game/Boss/TripodBossKinokoOneUp.cpp index 170f4e70b..d4c65e847 100644 --- a/src/Game/Boss/TripodBossKinokoOneUp.cpp +++ b/src/Game/Boss/TripodBossKinokoOneUp.cpp @@ -7,16 +7,17 @@ namespace NrvTripodBossKinokoOneUp { NEW_NERVE(TripodBossKinokoOneUpNrvActive, TripodBossKinokoOneUp, Active); NEW_NERVE(TripodBossKinokoOneUpNrvEnd, TripodBossKinokoOneUp, End); -} +} // namespace NrvTripodBossKinokoOneUp -TripodBossKinokoOneUp::TripodBossKinokoOneUp(const char *pName) : LiveActor(pName) { +TripodBossKinokoOneUp::TripodBossKinokoOneUp(const char* pName) + : LiveActor(pName) { mOneUp = nullptr; _F0 = -1; _8C.identity(); _BC.identity(); } -void TripodBossKinokoOneUp::init(const JMapInfoIter &rIter) { +void TripodBossKinokoOneUp::init(const JMapInfoIter& rIter) { MR::getJMapInfoMatrixFromRT(rIter, &_8C); MR::connectToSceneMapObjDecorationMovement(this); MR::invalidateClipping(this); @@ -31,7 +32,6 @@ void TripodBossKinokoOneUp::init(const JMapInfoIter &rIter) { } void TripodBossKinokoOneUp::control() { - } void TripodBossKinokoOneUp::exeActive() { @@ -52,11 +52,9 @@ void TripodBossKinokoOneUp::exeActive() { } TripodBossKinokoOneUp::~TripodBossKinokoOneUp() { - } void TripodBossKinokoOneUp::exeEnd() { - } MtxPtr TripodBossKinokoOneUp::getBaseMtx() const { diff --git a/src/Game/Boss/TripodBossLeg.cpp b/src/Game/Boss/TripodBossLeg.cpp index 51bced243..f97055c58 100644 --- a/src/Game/Boss/TripodBossLeg.cpp +++ b/src/Game/Boss/TripodBossLeg.cpp @@ -24,14 +24,14 @@ namespace NrvTripodBossLeg { NEW_NERVE(TripodBossLegNrvDamageVibration, TripodBossLeg, DamageVibration); NEW_NERVE(TripodBossLegNrvDamage, TripodBossLeg, Damage); NEW_NERVE(TripodBossLegNrvBreak, TripodBossLeg, Break); -}; +}; // namespace NrvTripodBossLeg TripodBossLeg::~TripodBossLeg() { - } -TripodBossLeg::TripodBossLeg(const char *pName) : LiveActor(pName), mBoss(nullptr), mMoveArea(nullptr), _94(0), _98(0), mJoint(new IKJoint()), - _1F0(0, 0, 0, 1), _200(0, 0, 0, 1), _210(0, 0, 0), _21C(0, 0, 0), mForceEndPoint(0, 0, 0), _234(0, 0, 0), _240(0, 0, 0) { +TripodBossLeg::TripodBossLeg(const char* pName) + : LiveActor(pName), mBoss(nullptr), mMoveArea(nullptr), _94(0), _98(0), mJoint(new IKJoint()), + _1F0(0, 0, 0, 1), _200(0, 0, 0, 1), _210(0, 0, 0), _21C(0, 0, 0), mForceEndPoint(0, 0, 0), _234(0, 0, 0), _240(0, 0, 0) { _254 = 0; _24C = 1; @@ -47,7 +47,7 @@ TripodBossLeg::TripodBossLeg(const char *pName) : LiveActor(pName), mBoss(nullpt mAnkleLocalXZMtx.identity(); } -void TripodBossLeg::init(const JMapInfoIter &rIter) { +void TripodBossLeg::init(const JMapInfoIter& rIter) { initNerve(&NrvTripodBossLeg::TripodBossLegNrvHold::sInstance); MR::invalidateClipping(this); initHitSensor(1); @@ -60,7 +60,7 @@ void TripodBossLeg::init(const JMapInfoIter &rIter) { makeActorAppeared(); } -void TripodBossLeg::initShadow(const char *pName) { +void TripodBossLeg::initShadow(const char* pName) { MR::initShadowVolumeFlatModel(this, pName, _1C0); MR::setShadowDropLength(this, nullptr, 2000.0f); } @@ -83,7 +83,7 @@ void TripodBossLeg::control() { _260->process(); } -void TripodBossLeg::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void TripodBossLeg::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (pReceiver->receiveMessage(0xA9, pSender)) { _254 = 1; } @@ -93,15 +93,15 @@ void TripodBossLeg::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { } } -void TripodBossLeg::setBody(TripodBoss *pBoss) { +void TripodBossLeg::setBody(TripodBoss* pBoss) { mBoss = pBoss; } -void TripodBossLeg::setMovableArea(TripodBossMovableArea *pArea) { +void TripodBossLeg::setMovableArea(TripodBossMovableArea* pArea) { mMoveArea = pArea; } -void TripodBossLeg::setIKParam(f32 rootLength, f32 middleLength, const TVec3f &a3, const TVec3f &a4, const TVec3f &a5) { +void TripodBossLeg::setIKParam(f32 rootLength, f32 middleLength, const TVec3f& a3, const TVec3f& a4, const TVec3f& a5) { mJoint->setRootBoneLength(rootLength); mJoint->setMiddleBoneLength(middleLength); mJoint->setFirstPose(a4, a5); @@ -124,7 +124,7 @@ void TripodBossLeg::setIKParam(f32 rootLength, f32 middleLength, const TVec3f &a _A0.setTrans(_210); } -void TripodBossLeg::setStepTarget(TripodBossStepPoint *pPoint) { +void TripodBossLeg::setStepTarget(TripodBossStepPoint* pPoint) { _94 = pPoint; _98 = pPoint; mForceEndPoint = pPoint->mStepPosition; @@ -135,7 +135,7 @@ void TripodBossLeg::setWait() { setNerve(&NrvTripodBossLeg::TripodBossLegNrvHold::sInstance); } -void TripodBossLeg::setForceEndPoint(const TVec3f &rPoint) { +void TripodBossLeg::setForceEndPoint(const TVec3f& rPoint) { mForceEndPoint.set(rPoint); } @@ -143,12 +143,10 @@ void TripodBossLeg::setDemoEffectTiming(bool timg) { if (timg) { if (mDemoTiming == 0) { mDemoTiming = 1; - } - else { + } else { mDemoTiming = 2; } - } - else { + } else { mDemoTiming = 0; } } @@ -181,7 +179,7 @@ const TPos3f& TripodBossLeg::getAnkleLocalXZMatrix() const { return mAnkleLocalXZMtx; } -void TripodBossLeg::requestStepTarget(TripodBossStepPoint *pPoint) { +void TripodBossLeg::requestStepTarget(TripodBossStepPoint* pPoint) { bool v4 = false; if (isNerve(&NrvTripodBossLeg::TripodBossLegNrvDamage::sInstance) || isNerve(&NrvTripodBossLeg::TripodBossLegNrvBreak::sInstance)) { v4 = true; @@ -192,8 +190,7 @@ void TripodBossLeg::requestStepTarget(TripodBossStepPoint *pPoint) { _98 = pPoint; if (isNerve(&NrvTripodBossLeg::TripodBossLegNrvHold::sInstance)) { setNerve(&NrvTripodBossLeg::TripodBossLegNrvUp::sInstance); - } - else { + } else { setNerve(&NrvTripodBossLeg::TripodBossLegNrvMoveToLandingPos::sInstance); } } @@ -215,7 +212,7 @@ void TripodBossLeg::requestStartDemo() { } void TripodBossLeg::requestEndDemo() { - _24C= 0; + _24C = 0; setNerve(&NrvTripodBossLeg::TripodBossLegNrvHold::sInstance); } @@ -321,12 +318,10 @@ void TripodBossLeg::exeLeaveOut() { if (MR::isLessStep(this, 60)) { _234.zero(); updatePose(); - } - else if (calcLegHeight(_98) < 1000.0f) { + } else if (calcLegHeight(_98) < 1000.0f) { addAccelUpLeg(_98, 0.80000001f); updateAnkleUp(calcLegHeight(_98)); - } - else { + } else { addToTargetPower(_240, 1.0f); addIKLimitPower(); mForceEndPoint += _234; @@ -390,7 +385,7 @@ void TripodBossLeg::exeStampSign() { if (MR::isGreaterStep(this, 20)) { TVec3f v8(_98->mStepNormal); - f32 v4 = MR::sin(getNerveStep() * 6.2831855f / 10.0f) * 20.0f; + f32 v4 = MR::sin(getNerveStep() * 6.2831855f / 10.0f) * 20.0f; TVec3f v5(v8); v5 *= v4; mForceEndPoint += v5; @@ -415,7 +410,7 @@ void TripodBossLeg::exeLanding() { MR::makeMtxSideUp(&v18, -point->mStepNormal, point->mStepFront); v18.getQuat(_200); TVec3f* step = &_98->mStepPosition; - TVec3f v16(mForceEndPoint); + TVec3f v16(mForceEndPoint); v16 -= *step; _250 = v16.dot(_98->mStepNormal); } @@ -437,19 +432,17 @@ void TripodBossLeg::exeLanding() { TVec3f endJointPos; mJoint->getEndJointPosition(&endJointPos); HitResult hitResult; - TVec3f v8(endJointPos); + TVec3f v8(endJointPos); v8 -= v12; if (mMoveArea->collideSphere(&hitResult, v12, 0.0f, v8)) { MR::startSoundObject(_260, "SE_BM_TRIPOD_LAND"); f32 dist = PSVECDistance(&mForceEndPoint, MR::getPlayerPos()); if (dist < 2000.0f) { MR::shakeCameraStrong(); - } - else { + } else { if (dist < 3500.0f) { MR::shakeCameraNormal(); - } - else { + } else { MR::shakeCameraWeak(); } } @@ -459,15 +452,13 @@ void TripodBossLeg::exeLanding() { _234.zero(); if (_254) { setNerve(&NrvTripodBossLeg::TripodBossLegNrvDamageVibration::sInstance); - } - else { + } else { setNerve(&NrvTripodBossLeg::TripodBossLegNrvHold::sInstance); } updateIKPose(); updateAnkleLanding(); - } - else { + } else { mJoint->getEndJointPosition(&mForceEndPoint); updateAnkleLanding(); } @@ -480,7 +471,7 @@ void TripodBossLeg::exeDamageVibration() { } TVec3f v5(_98->mStepNormal); - f32 v2 = (MR::sin(((6.2831855f * getNerveStep() * 25.0f))) * 40.0f); + f32 v2 = (MR::sin(((6.2831855f * getNerveStep() * 25.0f))) * 40.0f); TVec3f v3(v5); v3 *= v2; TVec3f v4(_240); @@ -515,12 +506,12 @@ void TripodBossLeg::exeHold() { updateIKPose(); } -void TripodBossLeg::addToTargetPower(const TVec3f &a1, f32 a2) { +void TripodBossLeg::addToTargetPower(const TVec3f& a1, f32 a2) { TVec3f v11(a1); v11 -= mForceEndPoint; f32 v7; MR::separateScalarAndDirection(&v7, &v11, v11); - f32 v5 = a2 * MR::clamp(v7 / 300.0f, -1.0f, 1.0f); + f32 v5 = a2 * MR::clamp(v7 / 300.0f, -1.0f, 1.0f); TVec3f v10(v11); v10 *= v5; _234 += v10; @@ -552,14 +543,13 @@ void TripodBossLeg::addIKLimitPower() { v12 = -v12; v5 = 0.5f; v6 = 0.0f; - } - else { + } else { v5 = 0.89999998f; v6 = 5.0f; } if (v5 < v8) { - f32 ease = MR::getEaseInOutValue(((1.0f / (1.0f - v5))) * (v8 - v5), 0.0f, 1.0f, 1.0f); + f32 ease = MR::getEaseInOutValue(((1.0f / (1.0f - v5))) * (v8 - v5), 0.0f, 1.0f, 1.0f); TVec3f v9(v12); v9 *= ease; TVec3f v10(v9); @@ -568,7 +558,7 @@ void TripodBossLeg::addIKLimitPower() { } } -void TripodBossLeg::addAccelUpLeg(TripodBossStepPoint *pPoint, f32 a3) { +void TripodBossLeg::addAccelUpLeg(TripodBossStepPoint* pPoint, f32 a3) { TVec3f v8(pPoint->mStepNormal); TVec3f v7(v8); v7 *= a3; @@ -581,10 +571,10 @@ void TripodBossLeg::addAccelUpLeg(TripodBossStepPoint *pPoint, f32 a3) { updatePose(); } -f32 TripodBossLeg::calcLegHeight(TripodBossStepPoint *pPoint) const { - TVec3f v4(mForceEndPoint); - v4 -= pPoint->mStepPosition; - return v4.dot(pPoint->mStepNormal); +f32 TripodBossLeg::calcLegHeight(TripodBossStepPoint* pPoint) const { + TVec3f v4(mForceEndPoint); + v4 -= pPoint->mStepPosition; + return v4.dot(pPoint->mStepNormal); } void TripodBossLeg::updatePose() { @@ -593,25 +583,24 @@ void TripodBossLeg::updatePose() { updateIKPose(); } - mJoint->getEndJointPosition(&mForceEndPoint); + mJoint->getEndJointPosition(&mForceEndPoint); } void TripodBossLeg::updateIKPose() { TPos3f bodyMtx; mBoss->getBodyMatrix(&bodyMtx); switch (_24C) { - case 0: - { - TVec3f v4; - bodyMtx.mult(_210, v4); - TVec3f legUp; - mBoss->calcLegUpVector(&legUp, mForceEndPoint); - mJoint->updateByUpVector(v4, mForceEndPoint, legUp); - break; - } - case 1: - mJoint->updateByLocalRootAndWorldTarget(bodyMtx, _210, mForceEndPoint); - break; + case 0: { + TVec3f v4; + bodyMtx.mult(_210, v4); + TVec3f legUp; + mBoss->calcLegUpVector(&legUp, mForceEndPoint); + mJoint->updateByUpVector(v4, mForceEndPoint, legUp); + break; + } + case 1: + mJoint->updateByLocalRootAndWorldTarget(bodyMtx, _210, mForceEndPoint); + break; } separateLocalAxisRootJoint(bodyMtx); @@ -623,7 +612,7 @@ bool TripodBossLeg::bindEndPosition() { TVec3f endJointPos; mJoint->getEndJointPosition(&endJointPos); HitResult hitResult; - TVec3f v4(endJointPos); + TVec3f v4(endJointPos); v4 -= v6; if (mMoveArea->collideSphere(&hitResult, v6, 0.0f, v4)) { @@ -639,7 +628,7 @@ bool TripodBossLeg::bindEndPosition() { return false; } -void TripodBossLeg::separateLocalAxisRootJoint(const TPos3f &rPos) { +void TripodBossLeg::separateLocalAxisRootJoint(const TPos3f& rPos) { TPos3f v5; v5.set(rPos); v5.setTrans(0.0f, 0.0f, 0.0f); @@ -658,17 +647,17 @@ void TripodBossLeg::separateAnkleJointLocalAxis() { } void TripodBossLeg::updateAnkleUp(f32 angle) { - TPos3f v9; + TPos3f v9; TQuat4f quat; - TVec3f landingNormal; - TVec3f landingFront; - + TVec3f landingNormal; + TVec3f landingFront; + mMoveArea->calcLandingNormal(&landingNormal, mForceEndPoint); mMoveArea->calcLandingFront(&landingFront, mForceEndPoint); - + v9.identity(); MR::makeMtxSideUp(&v9, -landingNormal, landingFront); - + v9.getQuat(quat); f32 v4 = MR::clamp((angle / 1000.0f), 0.0f, 1.0f); quat.slerp(_1F0, (1.0f - (v4 * (v4 * v4)))); @@ -678,8 +667,8 @@ void TripodBossLeg::updateAnkleUp(f32 angle) { void TripodBossLeg::updateAnkleSlerpToBasePose() { TQuat4f quat; - TVec3f landingNormal; - TVec3f landingFront; + TVec3f landingNormal; + TVec3f landingFront; mEndJointMtx.getQuat(quat); mMoveArea->calcLandingNormal(&landingNormal, mForceEndPoint); mMoveArea->calcLandingFront(&landingFront, mForceEndPoint); @@ -695,10 +684,10 @@ void TripodBossLeg::updateAnkleSlerpToBasePose() { void TripodBossLeg::updateAnkleLanding() { TVec3f* stepPos = &_98->mStepPosition; - TVec3f v6(mForceEndPoint); + TVec3f v6(mForceEndPoint); v6 -= *stepPos; - f32 v3 = v6.dot(_98->mStepNormal); - f32 v4 = MR::normalize((v3 / _250), 0.15000001f, 1.0f); + f32 v3 = v6.dot(_98->mStepNormal); + f32 v4 = MR::normalize((v3 / _250), 0.15000001f, 1.0f); TQuat4f quat; quat.slerp(_1F0, _200, ((1.0f - v4) * ((1.0f - v4) * (1.0f - v4)))); quat.normalize(); @@ -709,7 +698,7 @@ void TripodBossLeg::updateAnkleShadowMatrix() { TVec3f v7, v8, v9; TVec3f landingPosition; TVec3f landingNormal; - + mMoveArea->calcNearLandingPosition(&landingPosition, mForceEndPoint); mMoveArea->calcLandingNormal(&landingNormal, landingPosition); @@ -727,14 +716,14 @@ void TripodBossLeg::updateAnkleShadowMatrix() { } namespace MR { - void separateMatrixRotateYZX(TPos3f *a1, TPos3f *a2, const TPos3f &a3, const TPos3f &a4) { + void separateMatrixRotateYZX(TPos3f* a1, TPos3f* a2, const TPos3f& a3, const TPos3f& a4) { TPos3f v17; v17.invert(a3); v17.concat(v17, a4); TVec3f v16; - f32 z = v17.mMtx[2][0]; - f32 y = v17.mMtx[1][0]; - f32 x = v17.mMtx[0][0]; + f32 z = v17.mMtx[2][0]; + f32 y = v17.mMtx[1][0]; + f32 x = v17.mMtx[0][0]; v16.set(x, y, z); f32 v10 = MR::sqrt((v16.x * v16.x) + (v16.z * v16.z)); @@ -742,25 +731,22 @@ namespace MR { if (v16.y >= 0.0f) { a1->setXDir(0.0f, 1.0f, 0.0f); a1->setYDir(-1.0f, 0.0f, 0.0f); - - } - else { + + } else { a1->setXDir(0.0f, -1.0f, 0.0f); a1->setYDir(1.0f, 0.0f, 0.0f); } - a1->setZDir(0.0f, 0.0f, 1.0f); a1->concat(a3, *a1); a2->set(*a1); - } - else { + } else { f32 v11 = v16.length(); f32 v12 = (v10 / v11); f32 v14 = (v16.y / v11); f32 v15 = (v16.x / v10); f32 v13 = (v16.z / v10); - + a1->setXDir(v15, 0.0f, v13); a1->setYDir(0.0f, 1.0f, 0.0f); a1->setZDir(-v13, 0.0f, v15); @@ -773,4 +759,4 @@ namespace MR { a2->concat(*a1, *a2); } } -}; +}; // namespace MR diff --git a/src/Game/Boss/TripodBossMovableArea.cpp b/src/Game/Boss/TripodBossMovableArea.cpp index 47c45e559..80d7fce39 100644 --- a/src/Game/Boss/TripodBossMovableArea.cpp +++ b/src/Game/Boss/TripodBossMovableArea.cpp @@ -7,7 +7,7 @@ namespace { static TVec3f sTestHitPosition(0, 0, 0); static TVec3f sTestHitVerocity(0, 0, 0); static TVec3f sTestLandPosition(0, 0, 0); -}; +}; // namespace HitResult::HitResult() { _0.set(0, 0, 0); @@ -34,16 +34,16 @@ TripodBossMovableArea::TripodBossMovableArea() { _30 = 1.0f; } -void TripodBossMovableArea::setCenter(const TVec3f &rCenter) { +void TripodBossMovableArea::setCenter(const TVec3f& rCenter) { mCenter = rCenter; } -void TripodBossMovableArea::setBaseAxis(const TVec3f &rAxis) { +void TripodBossMovableArea::setBaseAxis(const TVec3f& rAxis) { mBaseAxis = rAxis; MR::normalizeOrZero(&mBaseAxis); } -void TripodBossMovableArea::setFrontVector(const TVec3f &rFront) { +void TripodBossMovableArea::setFrontVector(const TVec3f& rFront) { mFront = rFront; MR::normalizeOrZero(&mBaseAxis); } @@ -52,13 +52,13 @@ void TripodBossMovableArea::setRadius(f32 radius) { mRadius = radius; } -bool TripodBossMovableArea::collideSphere(HitResult *pResult, const TVec3f &a2, f32 a3, const TVec3f &a4) const { - pResult->_C = a2 + a4; - f32 v10 = mRadius + a3; +bool TripodBossMovableArea::collideSphere(HitResult* pResult, const TVec3f& a2, f32 a3, const TVec3f& a4) const { + pResult->_C = a2 + a4; + f32 v10 = mRadius + a3; TVec3f v29(a2); v29 -= mCenter; TVec3f direction(a4); - f32 scalar; + f32 scalar; MR::separateScalarAndDirection(&scalar, &direction, direction); f32 v11 = v29.dot(direction); f32 v12 = v29.dot(v29); @@ -69,7 +69,7 @@ bool TripodBossMovableArea::collideSphere(HitResult *pResult, const TVec3f &a2, return false; } - f32 v14 = ((v11 * v11) - val); + f32 v14 = ((v11 * v11) - val); if (v14 < 0.0f) { return false; } @@ -105,8 +105,8 @@ bool TripodBossMovableArea::collideSphere(HitResult *pResult, const TVec3f &a2, return true; } -void TripodBossMovableArea::calcNearLandingPosition(TVec3f *pPos, const TVec3f &a2) const { - f32 v6, v8, x, v7; +void TripodBossMovableArea::calcNearLandingPosition(TVec3f* pPos, const TVec3f& a2) const { + f32 v6, v8, x, v7; TVec3f v16(a2); v16 -= mCenter; MR::separateScalarAndDirection(&v8, &v16, v16); @@ -118,12 +118,10 @@ void TripodBossMovableArea::calcNearLandingPosition(TVec3f *pPos, const TVec3f & x = mBaseAxis.dot(v16); if (MR::isInRange(x, _2C, _30)) { pPos->set(mCenter + (v16 * mRadius)); - } - else { + } else { if (x < _2C) { x = _2C; - } - else { + } else { if (x > _30) { x = _30; } @@ -145,7 +143,7 @@ void TripodBossMovableArea::calcNearLandingPosition(TVec3f *pPos, const TVec3f & } } -void TripodBossMovableArea::calcLandingNormal(TVec3f *pNorm, const TVec3f &a2) const { +void TripodBossMovableArea::calcLandingNormal(TVec3f* pNorm, const TVec3f& a2) const { TVec3f norm(a2); norm -= mCenter; MR::normalizeOrZero(&norm); @@ -156,7 +154,7 @@ void TripodBossMovableArea::calcLandingNormal(TVec3f *pNorm, const TVec3f &a2) c pNorm->set(norm); } -void TripodBossMovableArea::calcLandingFront(TVec3f *pFront, const TVec3f &a2) const { +void TripodBossMovableArea::calcLandingFront(TVec3f* pFront, const TVec3f& a2) const { TVec3f v11(a2); v11 -= mCenter; MR::normalizeOrZero(&v11); diff --git a/src/Game/Boss/TripodBossRailMoveParts.cpp b/src/Game/Boss/TripodBossRailMoveParts.cpp index 7a147d2e8..b1d13a8a6 100644 --- a/src/Game/Boss/TripodBossRailMoveParts.cpp +++ b/src/Game/Boss/TripodBossRailMoveParts.cpp @@ -2,11 +2,12 @@ #include "Game/Boss/TripodBossFixParts.hpp" #include "Game/MapObj/MapPartsRailMover.hpp" -TripodBossRailMoveParts::TripodBossRailMoveParts(const char *pName) : TripodBossFixParts(pName) { +TripodBossRailMoveParts::TripodBossRailMoveParts(const char* pName) + : TripodBossFixParts(pName) { mRailMover = nullptr; } -void TripodBossRailMoveParts::init(const JMapInfoIter &rIter) { +void TripodBossRailMoveParts::init(const JMapInfoIter& rIter) { TripodBossFixParts::init(rIter); initRailRider(rIter); mRailMover = new MapPartsRailMover(this); @@ -26,7 +27,7 @@ void TripodBossRailMoveParts::activateTripodBoss() { TripodBossFixParts::activateTripodBoss(); } -void TripodBossRailMoveParts::calcTripodLocalMatrix(TPos3f *pMtx) { +void TripodBossRailMoveParts::calcTripodLocalMatrix(TPos3f* pMtx) { _BC.setPS(mRailMover->_28); TripodBossFixPartsBase::calcTripodLocalMatrix(pMtx); } @@ -36,5 +37,4 @@ void TripodBossRailMoveParts::exeWaitOwn() { } TripodBossRailMoveParts::~TripodBossRailMoveParts() { - } diff --git a/src/Game/Boss/TripodBossRotateParts.cpp b/src/Game/Boss/TripodBossRotateParts.cpp index 087a31b2b..7424c484b 100644 --- a/src/Game/Boss/TripodBossRotateParts.cpp +++ b/src/Game/Boss/TripodBossRotateParts.cpp @@ -2,11 +2,12 @@ #include "Game/Boss/TripodBossFixParts.hpp" #include "Game/MapObj/MapPartsRotator.hpp" -TripodBossRotateParts::TripodBossRotateParts(const char *pName) : TripodBossFixParts(pName) { +TripodBossRotateParts::TripodBossRotateParts(const char* pName) + : TripodBossFixParts(pName) { mRotator = nullptr; } -void TripodBossRotateParts::init(const JMapInfoIter &rIter) { +void TripodBossRotateParts::init(const JMapInfoIter& rIter) { TripodBossFixParts::init(rIter); mRotator = new MapPartsRotator(this); mRotator->init(rIter); @@ -25,20 +26,18 @@ void TripodBossRotateParts::activateTripodBoss() { mRotator->start(); } -void TripodBossRotateParts::calcTripodLocalMatrix(TPos3f *pMtx) { +void TripodBossRotateParts::calcTripodLocalMatrix(TPos3f* pMtx) { if (mRotator->isWorking()) { pMtx->setInline(mRotator->getRotateMtx()); pMtx->mMtx[0][3] = _BC.x; pMtx->mMtx[1][3] = _BC.y; pMtx->mMtx[2][3] = _BC.z; - } - else { + } else { MR::makeMtxTR(*pMtx, _BC, mRotation); } } TripodBossRotateParts::~TripodBossRotateParts() { - } void TripodBossRotateParts::exeWaitOwn() { diff --git a/src/Game/Boss/TripodBossShell.cpp b/src/Game/Boss/TripodBossShell.cpp index e7f80cf02..566e80d8a 100644 --- a/src/Game/Boss/TripodBossShell.cpp +++ b/src/Game/Boss/TripodBossShell.cpp @@ -13,17 +13,17 @@ namespace NrvTripodBossShell { NEW_NERVE(TripodBossShellNrvNonActive, TripodBossShell, NonActive); NEW_NERVE(TripodBossShellNrvWait, TripodBossShell, Wait); NEW_NERVE(TripodBossShellNrvBreak, TripodBossShell, Break); -}; +}; // namespace NrvTripodBossShell TripodBossShell::~TripodBossShell() { - } -TripodBossShell::TripodBossShell(const char *pName) : TripodBossFixPartsBase(pName) { +TripodBossShell::TripodBossShell(const char* pName) + : TripodBossFixPartsBase(pName) { mBreakModel = nullptr; } -void TripodBossShell::init(const JMapInfoIter &rIter) { +void TripodBossShell::init(const JMapInfoIter& rIter) { TripodBossFixPartsBase::init(rIter); initModelManagerWithAnm("TripodBossShell", nullptr, false); MR::connectToScene(this, 0x23, 0xB, 0x1F, -1); @@ -49,7 +49,7 @@ void TripodBossShell::kill() { mBreakModel->kill(); } -bool TripodBossShell::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool TripodBossShell::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (pReceiver == getSensor("killer_terget") && !isNerve(&NrvTripodBossShell::TripodBossShellNrvBreak::sInstance)) { setNerve(&NrvTripodBossShell::TripodBossShellNrvBreak::sInstance); return true; @@ -112,5 +112,4 @@ void TripodBossShell::exeWait() { } void TripodBossShell::exeNonActive() { - } diff --git a/src/Game/Boss/TripodBossStepPoint.cpp b/src/Game/Boss/TripodBossStepPoint.cpp index 30edbc5f9..ca755106c 100644 --- a/src/Game/Boss/TripodBossStepPoint.cpp +++ b/src/Game/Boss/TripodBossStepPoint.cpp @@ -2,14 +2,15 @@ #include "Game/Boss/TripodBossAccesser.hpp" #include "Game/Util/JMapUtil.hpp" -TripodBossStepPoint::TripodBossStepPoint(const char *pName) : LiveActor(pName), mStepPosition(0, 0, 0), mStepNormal(0, 1, 0), mStepFront(0, 0, 1) { +TripodBossStepPoint::TripodBossStepPoint(const char* pName) + : LiveActor(pName), mStepPosition(0, 0, 0), mStepNormal(0, 1, 0), mStepFront(0, 0, 1) { mLeg = 0; _B4 = 0; _B8 = -1; mWaitTime = 120; } -void TripodBossStepPoint::init(const JMapInfoIter &rIter) { +void TripodBossStepPoint::init(const JMapInfoIter& rIter) { if (MR::isValidInfo(rIter)) { TPos3f mtx; MR::getJMapInfoMatrixFromRT(rIter, &mtx); @@ -31,20 +32,19 @@ void TripodBossStepPoint::initAfterPlacement() { } } -void TripodBossStepPoint::setStepPosition(const TVec3f &rPos) { +void TripodBossStepPoint::setStepPosition(const TVec3f& rPos) { mStepPosition = rPos; } -void TripodBossStepPoint::setStepNormal(const TVec3f &rNorm) { +void TripodBossStepPoint::setStepNormal(const TVec3f& rNorm) { mStepNormal = rNorm; MR::normalizeOrZero(&mStepNormal); } -void TripodBossStepPoint::setStepFront(const TVec3f &rFront) { +void TripodBossStepPoint::setStepFront(const TVec3f& rFront) { mStepFront = rFront; MR::normalizeOrZero(&mStepFront); } TripodBossStepPoint::~TripodBossStepPoint() { - } diff --git a/src/Game/Boss/TripodBossStepSequence.cpp b/src/Game/Boss/TripodBossStepSequence.cpp index a63ff6d74..eae516f91 100644 --- a/src/Game/Boss/TripodBossStepSequence.cpp +++ b/src/Game/Boss/TripodBossStepSequence.cpp @@ -11,10 +11,10 @@ TripodBossStepSequence::TripodBossStepSequence() { } } -void TripodBossStepSequence::addStepPoint(TripodBossStepPoint *pPoint) { +void TripodBossStepSequence::addStepPoint(TripodBossStepPoint* pPoint) { int temp = pPoint->_B4; int pointNum = mPointNum++; - + for (int i = mPointNum - 1; i > 0; i--) { if (mStepPoints[i - 1]->_B4 < temp) { mStepPoints[i] = pPoint; diff --git a/src/Game/Boss/TripodBossStepStartArea.cpp b/src/Game/Boss/TripodBossStepStartArea.cpp index 6afd2fde7..7d2d83cc5 100644 --- a/src/Game/Boss/TripodBossStepStartArea.cpp +++ b/src/Game/Boss/TripodBossStepStartArea.cpp @@ -3,11 +3,12 @@ #include "Game/Util.hpp" #include "Game/Util/PlayerUtil.hpp" -TripodBossStepStartArea::TripodBossStepStartArea(int a1, const char *pName) : AreaObj(a1, pName) { +TripodBossStepStartArea::TripodBossStepStartArea(int a1, const char* pName) + : AreaObj(a1, pName) { _3C = -1; } -void TripodBossStepStartArea::init(const JMapInfoIter &rIter) { +void TripodBossStepStartArea::init(const JMapInfoIter& rIter) { AreaObj::init(rIter); MR::connectToSceneAreaObj(this); _3C = mObjArg0; @@ -20,7 +21,6 @@ void TripodBossStepStartArea::movement() { } TripodBossStepStartArea::~TripodBossStepStartArea() { - } const char* TripodBossStepStartArea::getManagerName() const { diff --git a/src/Game/Camera/CamTranslatorAnim.cpp b/src/Game/Camera/CamTranslatorAnim.cpp index 90bf637ec..00d34e9e6 100644 --- a/src/Game/Camera/CamTranslatorAnim.cpp +++ b/src/Game/Camera/CamTranslatorAnim.cpp @@ -2,17 +2,17 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorAnim.hpp" -void CamTranslatorAnim::setParam(const CameraParamChunk *pChunk) { - CameraAnim *camera = mCamera; +void CamTranslatorAnim::setParam(const CameraParamChunk* pChunk) { + CameraAnim* camera = mCamera; // mNum1 is used to store the pointer to the data - camera->setParam(reinterpret_cast(pChunk->mGeneralParam->mNum1), pChunk->mGeneralParam->mDist); + camera->setParam(reinterpret_cast(pChunk->mGeneralParam->mNum1), pChunk->mGeneralParam->mDist); } -Camera *CamTranslatorAnim::CamTranslatorAnim::getCamera() const { +Camera* CamTranslatorAnim::CamTranslatorAnim::getCamera() const { return mCamera; } -u32 CamTranslatorAnim::getAnimFrame(const CameraParamChunk *pChunk) const { - return CameraAnim::getAnimFrame(reinterpret_cast(pChunk->mGeneralParam->mNum1)); +u32 CamTranslatorAnim::getAnimFrame(const CameraParamChunk* pChunk) const { + return CameraAnim::getAnimFrame(reinterpret_cast(pChunk->mGeneralParam->mNum1)); } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorBehind.cpp b/src/Game/Camera/CamTranslatorBehind.cpp index 69bb6b109..4dc6d9cbf 100644 --- a/src/Game/Camera/CamTranslatorBehind.cpp +++ b/src/Game/Camera/CamTranslatorBehind.cpp @@ -1,23 +1,23 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorBehind.hpp" -void CamTranslatorBehind::setParam(const CameraParamChunk *pChunk) { - TVec2f angle; - f32 dist; - f32 axisX; - angle.y = 180.0f * pChunk->mGeneralParam->mAngleA / 3.1415927f; - angle.x = 180.0f * pChunk->mGeneralParam->mAngleB / 3.1415927f; - axisX = pChunk->mGeneralParam->mAxis.x; - dist = pChunk->mGeneralParam->mDist; +void CamTranslatorBehind::setParam(const CameraParamChunk* pChunk) { + TVec2f angle; + f32 dist; + f32 axisX; + angle.y = 180.0f * pChunk->mGeneralParam->mAngleA / 3.1415927f; + angle.x = 180.0f * pChunk->mGeneralParam->mAngleB / 3.1415927f; + axisX = pChunk->mGeneralParam->mAxis.x; + dist = pChunk->mGeneralParam->mDist; - CameraBehind *camera = mCamera; + CameraBehind* camera = mCamera; - camera->mAngleB = angle.x; - camera->mAngleA = angle.y; - camera->mDist = dist; - camera->mAxisX = axisX; + camera->mAngleB = angle.x; + camera->mAngleA = angle.y; + camera->mDist = dist; + camera->mAxisX = axisX; } -Camera *CamTranslatorBehind::getCamera() const { - return mCamera; +Camera* CamTranslatorBehind::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorBlackHole.cpp b/src/Game/Camera/CamTranslatorBlackHole.cpp index 79dbec1a4..7d693aaca 100644 --- a/src/Game/Camera/CamTranslatorBlackHole.cpp +++ b/src/Game/Camera/CamTranslatorBlackHole.cpp @@ -1,18 +1,18 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorBlackHole.hpp" -void CamTranslatorBlackHole::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorBlackHole::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - TVec3f axis = general->mAxis; - TVec3f wPoint = general->mWPoint; + TVec3f axis = general->mAxis; + TVec3f wPoint = general->mWPoint; - CameraBlackHole *camera = mCamera; + CameraBlackHole* camera = mCamera; - camera->mWPoint.set(wPoint); - camera->mAxis.set(axis); + camera->mWPoint.set(wPoint); + camera->mAxis.set(axis); } -Camera *CamTranslatorBlackHole::getCamera() const { - return mCamera; +Camera* CamTranslatorBlackHole::getCamera() const { + return mCamera; } diff --git a/src/Game/Camera/CamTranslatorCharmedFix.cpp b/src/Game/Camera/CamTranslatorCharmedFix.cpp index b954a27ce..a25da7b84 100644 --- a/src/Game/Camera/CamTranslatorCharmedFix.cpp +++ b/src/Game/Camera/CamTranslatorCharmedFix.cpp @@ -2,26 +2,25 @@ #include "Game/Camera/CamTranslatorCharmedFix.hpp" #include "Game/Util/MathUtil.hpp" -void CamTranslatorCharmedFix::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorCharmedFix::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - TVec3f up; - up.setPS(general->mUp); + TVec3f up; + up.setPS(general->mUp); - if (MR::isNearZero(up, 0.001f)) { - up.set(0.0f, 1.0f, 0.0f); - } - else { - MR::normalize(&up); - } + if (MR::isNearZero(up, 0.001f)) { + up.set(0.0f, 1.0f, 0.0f); + } else { + MR::normalize(&up); + } - CameraCharmedFix *camera = mCamera; + CameraCharmedFix* camera = mCamera; - camera->mAxis.set(general->mAxis); - camera->mUp.set(up); - camera->mWPoint.set(general->mWPoint); + camera->mAxis.set(general->mAxis); + camera->mUp.set(up); + camera->mWPoint.set(general->mWPoint); } -Camera *CamTranslatorCharmedFix::getCamera() const { - return mCamera; +Camera* CamTranslatorCharmedFix::getCamera() const { + return mCamera; } diff --git a/src/Game/Camera/CamTranslatorCharmedTripodBoss.cpp b/src/Game/Camera/CamTranslatorCharmedTripodBoss.cpp index 1041ff0dc..f50a9b59e 100644 --- a/src/Game/Camera/CamTranslatorCharmedTripodBoss.cpp +++ b/src/Game/Camera/CamTranslatorCharmedTripodBoss.cpp @@ -2,23 +2,22 @@ #include "Game/Camera/CamTranslatorCharmedTripodBoss.hpp" #include "Game/Util/MathUtil.hpp" -void CamTranslatorCharmedTripodBoss::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorCharmedTripodBoss::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - TVec3f up = general->mUp; + TVec3f up = general->mUp; - if (MR::isNearZero(up, 0.001f)) { - up.set(0.0f, 1.0f, 0.0f); - } - else { - MR::normalize(&up); - } + if (MR::isNearZero(up, 0.001f)) { + up.set(0.0f, 1.0f, 0.0f); + } else { + MR::normalize(&up); + } - TVec2f axis = TVec2f(general->mAxis.x, general->mAxis.y); + TVec2f axis = TVec2f(general->mAxis.x, general->mAxis.y); - mCamera->setParam(general->mNum1, up, general->mWPoint, axis); + mCamera->setParam(general->mNum1, up, general->mWPoint, axis); } -Camera *CamTranslatorCharmedTripodBoss::getCamera() const { - return mCamera; +Camera* CamTranslatorCharmedTripodBoss::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorCharmedVecReg.cpp b/src/Game/Camera/CamTranslatorCharmedVecReg.cpp index f6dc9c2eb..af22e9643 100644 --- a/src/Game/Camera/CamTranslatorCharmedVecReg.cpp +++ b/src/Game/Camera/CamTranslatorCharmedVecReg.cpp @@ -1,41 +1,41 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorCharmedVecReg.hpp" -void CamTranslatorCharmedVecReg::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorCharmedVecReg::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - const char *string; - f32 dist; - f32 axisX; - f32 axisY; - f32 axisZ; - f32 angleA; - f32 angleB; + const char* string; + f32 dist; + f32 axisX; + f32 axisY; + f32 axisZ; + f32 angleA; + f32 angleB; - angleB = general->mAngleB; - angleA = general->mAngleA; - axisZ = general->mAxis.z; - axisY = general->mAxis.y; - axisX = general->mAxis.x; - dist = general->mDist; - string = general->mString.getCharPtr(); + angleB = general->mAngleB; + angleA = general->mAngleA; + axisZ = general->mAxis.z; + axisY = general->mAxis.y; + axisX = general->mAxis.x; + dist = general->mDist; + string = general->mString.getCharPtr(); - CameraCharmedVecReg *camera = mCamera; + CameraCharmedVecReg* camera = mCamera; - camera->mString = string; - camera->mDist = dist; + camera->mString = string; + camera->mDist = dist; - if (dist < 300.0f) { - camera->mDist = 300.0f; - } + if (dist < 300.0f) { + camera->mDist = 300.0f; + } - camera->mAxisX = axisX; - camera->mAxisZ = axisZ; - camera->mAxisY = axisY; - camera->mAngleA = angleA; - camera->mAngleB = angleB; + camera->mAxisX = axisX; + camera->mAxisZ = axisZ; + camera->mAxisY = axisY; + camera->mAngleA = angleA; + camera->mAngleB = angleB; } -Camera *CamTranslatorCharmedVecReg::getCamera() const { - return mCamera; +Camera* CamTranslatorCharmedVecReg::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorCharmedVecRegTower.cpp b/src/Game/Camera/CamTranslatorCharmedVecRegTower.cpp index e1d4093f9..598bd57d7 100644 --- a/src/Game/Camera/CamTranslatorCharmedVecRegTower.cpp +++ b/src/Game/Camera/CamTranslatorCharmedVecRegTower.cpp @@ -3,42 +3,42 @@ #ifdef NON_MATCHING // Register issues -void CamTranslatorCharmedVecRegTower::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorCharmedVecRegTower::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - TVec3f axis; - const char *string; - f32 angleA; - f32 angleB; - f32 dist; - bool uVar3; + TVec3f axis; + const char* string; + f32 angleA; + f32 angleB; + f32 dist; + bool uVar3; - axis.setInline(general->mAxis); + axis.setInline(general->mAxis); - MR::normalizeOrZero(&axis); + MR::normalizeOrZero(&axis); - if (MR::isNearZero(axis, 0.001f)) { - axis.set(0.0f, 1.0f, 0.0f); - } + if (MR::isNearZero(axis, 0.001f)) { + axis.set(0.0f, 1.0f, 0.0f); + } - uVar3 = general->mNum1 != 0; - dist = general->mDist; - angleB = general->mAngleB; - angleA = general->mAngleA; - string = general->mString.getCharPtr(); + uVar3 = general->mNum1 != 0; + dist = general->mDist; + angleB = general->mAngleB; + angleA = general->mAngleA; + string = general->mString.getCharPtr(); - CameraCharmedVecRegTower *camera = mCamera; + CameraCharmedVecRegTower* camera = mCamera; - camera->mString = string; - camera->mWPoint.set(general->mWPoint); - camera->mAxis.set(axis); - camera->mAngleA = angleA; - camera->mAngleB = angleB; - camera->mDist = dist; - camera->_70 = uVar3; + camera->mString = string; + camera->mWPoint.set(general->mWPoint); + camera->mAxis.set(axis); + camera->mAngleA = angleA; + camera->mAngleB = angleB; + camera->mDist = dist; + camera->_70 = uVar3; } #endif -Camera *CamTranslatorCharmedVecRegTower::getCamera() const { - return mCamera; +Camera* CamTranslatorCharmedVecRegTower::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorCubePlanet.cpp b/src/Game/Camera/CamTranslatorCubePlanet.cpp index bd641e473..c976d9d47 100644 --- a/src/Game/Camera/CamTranslatorCubePlanet.cpp +++ b/src/Game/Camera/CamTranslatorCubePlanet.cpp @@ -1,23 +1,23 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorCubePlanet.hpp" -void CamTranslatorCubePlanet::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; - CameraCubePlanet *camera = mCamera; +void CamTranslatorCubePlanet::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; + CameraCubePlanet* camera = mCamera; - f32 dist; - f32 angleA; - f32 angleB; + f32 dist; + f32 angleA; + f32 angleB; - angleB = general->mAngleB; - angleA = general->mAngleA; - dist = general->mDist; + angleB = general->mAngleB; + angleA = general->mAngleA; + dist = general->mDist; - camera->mDist = dist; - camera->mAngleA = angleA; - camera->mAngleB = angleB; + camera->mDist = dist; + camera->mAngleA = angleA; + camera->mAngleB = angleB; } -Camera *CamTranslatorCubePlanet::getCamera() const { - return mCamera; +Camera* CamTranslatorCubePlanet::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorDPD.cpp b/src/Game/Camera/CamTranslatorDPD.cpp index d6ee8c9f4..88dfc7bc9 100644 --- a/src/Game/Camera/CamTranslatorDPD.cpp +++ b/src/Game/Camera/CamTranslatorDPD.cpp @@ -1,42 +1,42 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorDPD.hpp" -void CamTranslatorDPD::setParam(const CameraParamChunk *pChunk) { - CameraDPD *camera; +void CamTranslatorDPD::setParam(const CameraParamChunk* pChunk) { + CameraDPD* camera; - CameraGeneralParam *general = pChunk->mGeneralParam; - camera = mCamera; + CameraGeneralParam* general = pChunk->mGeneralParam; + camera = mCamera; - f32 dist; - f32 angleA; - f32 angleB; - f32 wPointZ; - f32 wPointX; - f32 wPointY; - f32 upX; - s32 num2; + f32 dist; + f32 angleA; + f32 angleB; + f32 wPointZ; + f32 wPointX; + f32 wPointY; + f32 upX; + s32 num2; - num2 = general->mNum2; - bool uVar8 = !(num2 != 1); - upX = general->mUp.x; - wPointY = general->mWPoint.y; - wPointX = general->mWPoint.x; - wPointZ = general->mWPoint.z; - angleB = general->mAngleB; - angleA = general->mAngleA; - dist = general->mDist; + num2 = general->mNum2; + bool uVar8 = !(num2 != 1); + upX = general->mUp.x; + wPointY = general->mWPoint.y; + wPointX = general->mWPoint.x; + wPointZ = general->mWPoint.z; + angleB = general->mAngleB; + angleA = general->mAngleA; + dist = general->mDist; - camera->_94 = general->mNum1; - camera->mDist = dist; - camera->mAngleA = angleA; - camera->mAngleB = angleB; - camera->mWPointZ = wPointZ; - camera->mWPointX = wPointX; - camera->mWPointY = wPointY; - camera->_B4 = uVar8; - camera->mUpX = upX; + camera->_94 = general->mNum1; + camera->mDist = dist; + camera->mAngleA = angleA; + camera->mAngleB = angleB; + camera->mWPointZ = wPointZ; + camera->mWPointX = wPointX; + camera->mWPointY = wPointY; + camera->_B4 = uVar8; + camera->mUpX = upX; } -Camera *CamTranslatorDPD::getCamera() const { - return mCamera; +Camera* CamTranslatorDPD::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorDead.cpp b/src/Game/Camera/CamTranslatorDead.cpp index 8461e9851..744a24103 100644 --- a/src/Game/Camera/CamTranslatorDead.cpp +++ b/src/Game/Camera/CamTranslatorDead.cpp @@ -1,29 +1,29 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorDead.hpp" -CamTranslatorDead::CamTranslatorDead(CameraDead *pCamera) { - mCamera = pCamera; +CamTranslatorDead::CamTranslatorDead(CameraDead* pCamera) { + mCamera = pCamera; } -void CamTranslatorDead::setParam(const CameraParamChunk *pChunk) { - CameraDead *camera; +void CamTranslatorDead::setParam(const CameraParamChunk* pChunk) { + CameraDead* camera; - f32 dist; - s32 num1; - s32 num2; + f32 dist; + s32 num1; + s32 num2; - CameraGeneralParam *general = pChunk->mGeneralParam; - camera = mCamera; + CameraGeneralParam* general = pChunk->mGeneralParam; + camera = mCamera; - num2 = general->mNum2; - num1 = general->mNum1; - dist = general->mDist; - - camera->mDist = dist; - camera->_54 = num1; - camera->_58 = num2; + num2 = general->mNum2; + num1 = general->mNum1; + dist = general->mDist; + + camera->mDist = dist; + camera->_54 = num1; + camera->_58 = num2; } -Camera *CamTranslatorDead::getCamera() const { - return mCamera; +Camera* CamTranslatorDead::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorFix.cpp b/src/Game/Camera/CamTranslatorFix.cpp index 432bd2423..7ac240e62 100644 --- a/src/Game/Camera/CamTranslatorFix.cpp +++ b/src/Game/Camera/CamTranslatorFix.cpp @@ -4,22 +4,22 @@ #ifdef NON_MATCHING // Trouble with negateInline -void CamTranslatorFix::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorFix::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - TVec3f aTStack32; - TVec3f origin = TVec3f(0.0f, 0.0f, 0.0f); + TVec3f aTStack32; + TVec3f origin = TVec3f(0.0f, 0.0f, 0.0f); - MR::polarToCross(origin, &aTStack32, general->mDist, general->mAxis.x, general->mAxis.y); + MR::polarToCross(origin, &aTStack32, general->mDist, general->mAxis.x, general->mAxis.y); - TVec3f aTStack32Negative; - aTStack32.negateInline(aTStack32Negative); + TVec3f aTStack32Negative; + aTStack32.negateInline(aTStack32Negative); - CameraFix *camera = mCamera; - camera->setParam(general->mWPoint, aTStack32Negative, general->mUp); + CameraFix* camera = mCamera; + camera->setParam(general->mWPoint, aTStack32Negative, general->mUp); } #endif -Camera *CamTranslatorFix::getCamera() const { - return mCamera; +Camera* CamTranslatorFix::getCamera() const { + return mCamera; } diff --git a/src/Game/Camera/CamTranslatorFixedPoint.cpp b/src/Game/Camera/CamTranslatorFixedPoint.cpp index 14edad501..f7500e969 100644 --- a/src/Game/Camera/CamTranslatorFixedPoint.cpp +++ b/src/Game/Camera/CamTranslatorFixedPoint.cpp @@ -1,12 +1,12 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorFixedPoint.hpp" -void CamTranslatorFixedPoint::setParam(const CameraParamChunk *pChunk) { - CameraFixedPoint *camera = mCamera; +void CamTranslatorFixedPoint::setParam(const CameraParamChunk* pChunk) { + CameraFixedPoint* camera = mCamera; - camera->setParam(pChunk->mGeneralParam->mWPoint, pChunk->mGeneralParam->mNum1); + camera->setParam(pChunk->mGeneralParam->mWPoint, pChunk->mGeneralParam->mNum1); } -Camera *CamTranslatorFixedPoint::getCamera() const { - return mCamera; +Camera* CamTranslatorFixedPoint::getCamera() const { + return mCamera; } diff --git a/src/Game/Camera/CamTranslatorFixedThere.cpp b/src/Game/Camera/CamTranslatorFixedThere.cpp index d2fda5126..173e33bc7 100644 --- a/src/Game/Camera/CamTranslatorFixedThere.cpp +++ b/src/Game/Camera/CamTranslatorFixedThere.cpp @@ -1,18 +1,18 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorFixedThere.hpp" -void CamTranslatorFixedThere::setParam(const CameraParamChunk *pChunk) { - CameraFixedThere *camera = mCamera; - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorFixedThere::setParam(const CameraParamChunk* pChunk) { + CameraFixedThere* camera = mCamera; + CameraGeneralParam* general = pChunk->mGeneralParam; - s32 num2 = general->mNum2; - bool uVar1 = !(num2 != 1); - s32 num1 = general->mNum1; + s32 num2 = general->mNum2; + bool uVar1 = !(num2 != 1); + s32 num1 = general->mNum1; - camera->_4C = num1; - camera->_50 = uVar1; + camera->_4C = num1; + camera->_50 = uVar1; } -Camera *CamTranslatorFixedThere::getCamera() const { - return mCamera; +Camera* CamTranslatorFixedThere::getCamera() const { + return mCamera; } diff --git a/src/Game/Camera/CamTranslatorFollow.cpp b/src/Game/Camera/CamTranslatorFollow.cpp index 306cec8b7..df7c4f35f 100644 --- a/src/Game/Camera/CamTranslatorFollow.cpp +++ b/src/Game/Camera/CamTranslatorFollow.cpp @@ -1,24 +1,23 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorFollow.hpp" -CamTranslatorFollow::CamTranslatorFollow(CameraFollow *pCamera) { - mCamera = pCamera; +CamTranslatorFollow::CamTranslatorFollow(CameraFollow* pCamera) { + mCamera = pCamera; } -void CamTranslatorFollow::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; - CameraFollow *camera = mCamera; +void CamTranslatorFollow::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; + CameraFollow* camera = mCamera; - camera->setParam( - general->mAxis.x, - general->mAxis.y, - general->mAngleA, - general->mAngleB, - general->mDist, - general->mNum1 > 0 - ); + camera->setParam( + general->mAxis.x, + general->mAxis.y, + general->mAngleA, + general->mAngleB, + general->mDist, + general->mNum1 > 0); } -Camera *CamTranslatorFollow::getCamera() const { - return mCamera; +Camera* CamTranslatorFollow::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorFooFighter.cpp b/src/Game/Camera/CamTranslatorFooFighter.cpp index da7f37623..45c02f529 100644 --- a/src/Game/Camera/CamTranslatorFooFighter.cpp +++ b/src/Game/Camera/CamTranslatorFooFighter.cpp @@ -1,27 +1,27 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorFooFighter.hpp" -CamTranslatorFooFighter::CamTranslatorFooFighter(CameraFooFighter *pCamera) { - mCamera = pCamera; +CamTranslatorFooFighter::CamTranslatorFooFighter(CameraFooFighter* pCamera) { + mCamera = pCamera; } -void CamTranslatorFooFighter::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; - CameraFooFighter *camera = mCamera; +void CamTranslatorFooFighter::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; + CameraFooFighter* camera = mCamera; - f32 axisY; - f32 axisX; - f32 dist; + f32 axisY; + f32 axisX; + f32 dist; - dist = general->mDist; - axisX = general->mAxis.x; - axisY = general->mAxis.y; + dist = general->mDist; + axisX = general->mAxis.x; + axisY = general->mAxis.y; - camera->mAxisY = axisY; - camera->mAxisX = axisX; - camera->mDist = dist; + camera->mAxisY = axisY; + camera->mAxisX = axisX; + camera->mDist = dist; } -Camera *CamTranslatorFooFighter::getCamera() const { - return mCamera; +Camera* CamTranslatorFooFighter::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorFooFighterPlanet.cpp b/src/Game/Camera/CamTranslatorFooFighterPlanet.cpp index d625891e7..9a8b29b14 100644 --- a/src/Game/Camera/CamTranslatorFooFighterPlanet.cpp +++ b/src/Game/Camera/CamTranslatorFooFighterPlanet.cpp @@ -1,27 +1,27 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorFooFighterPlanet.hpp" -CamTranslatorFooFighterPlanet::CamTranslatorFooFighterPlanet(CameraFooFighterPlanet *pCamera) { - mCamera = pCamera; +CamTranslatorFooFighterPlanet::CamTranslatorFooFighterPlanet(CameraFooFighterPlanet* pCamera) { + mCamera = pCamera; } -void CamTranslatorFooFighterPlanet::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; - CameraFooFighterPlanet *camera = mCamera; +void CamTranslatorFooFighterPlanet::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; + CameraFooFighterPlanet* camera = mCamera; - f32 axisX; - f32 axisY; - f32 angleA; + f32 axisX; + f32 axisY; + f32 angleA; - angleA = general->mAngleA; - axisY = general->mAxis.y; - axisX = general->mAxis.x; + angleA = general->mAngleA; + axisY = general->mAxis.y; + axisX = general->mAxis.x; - camera->mAxisX = axisX; - camera->mAxisY = axisY; - camera->mAngleA = angleA; + camera->mAxisX = axisX; + camera->mAxisY = axisY; + camera->mAngleA = angleA; } -Camera *CamTranslatorFooFighterPlanet::getCamera() const { - return mCamera; +Camera* CamTranslatorFooFighterPlanet::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorFrontAndBack.cpp b/src/Game/Camera/CamTranslatorFrontAndBack.cpp index 66b43f262..be3b554b3 100644 --- a/src/Game/Camera/CamTranslatorFrontAndBack.cpp +++ b/src/Game/Camera/CamTranslatorFrontAndBack.cpp @@ -4,39 +4,38 @@ #ifdef NON_MATCHING // Register mismatch -void CamTranslatorFrontAndBack::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorFrontAndBack::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - TVec3f axis = general->mAxis; + TVec3f axis = general->mAxis; - if (MR::isNearZero(axis, 0.001f)) { - axis.set(1.0f, 0.0f, 0.0f); - } - else { - MR::normalize(&axis); - } + if (MR::isNearZero(axis, 0.001f)) { + axis.set(1.0f, 0.0f, 0.0f); + } else { + MR::normalize(&axis); + } - f32 angleA2; - f32 angleB2; - f32 dist; + f32 angleA2; + f32 angleB2; + f32 dist; - f32 angleB = general->mAngleB; - f32 angleA = general->mAngleA; + f32 angleB = general->mAngleB; + f32 angleA = general->mAngleA; - angleB2 = angleB * 3.1415927f / 180.0f; - angleA2 = angleA * 3.1415927f / 180.0f; - dist = general->mDist; + angleB2 = angleB * 3.1415927f / 180.0f; + angleA2 = angleA * 3.1415927f / 180.0f; + dist = general->mDist; - CameraFrontAndBack *camera = mCamera; + CameraFrontAndBack* camera = mCamera; - camera->mWPoint = general->mWPoint; - camera->mAxis = axis; - camera->mAngleA = angleA2; - camera->mAngleB = angleB2; - camera->mDist = dist; + camera->mWPoint = general->mWPoint; + camera->mAxis = axis; + camera->mAngleA = angleA2; + camera->mAngleB = angleB2; + camera->mDist = dist; } #endif -Camera *CamTranslatorFrontAndBack::getCamera() const { - return mCamera; +Camera* CamTranslatorFrontAndBack::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorGround.cpp b/src/Game/Camera/CamTranslatorGround.cpp index d6e735f63..220cceb47 100644 --- a/src/Game/Camera/CamTranslatorGround.cpp +++ b/src/Game/Camera/CamTranslatorGround.cpp @@ -1,21 +1,21 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorGround.hpp" -void CamTranslatorGround::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; - CameraGround *camera = mCamera; +void CamTranslatorGround::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; + CameraGround* camera = mCamera; - TVec2f angle = TVec2f(general->mAngleA, general->mAngleB); - f32 dist = general->mDist; + TVec2f angle = TVec2f(general->mAngleA, general->mAngleB); + f32 dist = general->mDist; - camera->mAngleA = angle.x; - camera->mAngleB = angle.y; - camera->mDist = dist; - camera->mUpX = general->mUp.x; - camera->mUpY = general->mUp.y; - camera->mUpZ = general->mUp.z; + camera->mAngleA = angle.x; + camera->mAngleB = angle.y; + camera->mDist = dist; + camera->mUpX = general->mUp.x; + camera->mUpY = general->mUp.y; + camera->mUpZ = general->mUp.z; } -Camera *CamTranslatorGround::getCamera() const { - return mCamera; +Camera* CamTranslatorGround::getCamera() const { + return mCamera; } diff --git a/src/Game/Camera/CamTranslatorInnerCylinder.cpp b/src/Game/Camera/CamTranslatorInnerCylinder.cpp index 846a5780e..2a981dd21 100644 --- a/src/Game/Camera/CamTranslatorInnerCylinder.cpp +++ b/src/Game/Camera/CamTranslatorInnerCylinder.cpp @@ -2,35 +2,34 @@ #include "Game/Camera/CamTranslatorInnerCylinder.hpp" #include "Game/Util/MathUtil.hpp" -void CamTranslatorInnerCylinder::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorInnerCylinder::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - TVec3f axis = general->mAxis; + TVec3f axis = general->mAxis; - if (MR::isNearZero(axis, 0.001f)) { - axis.set(0.0f, 0.0f, 1.0f); - } - else { - MR::normalize(&axis); - } + if (MR::isNearZero(axis, 0.001f)) { + axis.set(0.0f, 0.0f, 1.0f); + } else { + MR::normalize(&axis); + } - CameraInnerCylinder *camera = mCamera; + CameraInnerCylinder* camera = mCamera; - TVec2f angle = TVec2f(general->mAngleA, general->mAngleB); - f32 dist; - f32 upX; + TVec2f angle = TVec2f(general->mAngleA, general->mAngleB); + f32 dist; + f32 upX; - upX = general->mUp.x; - dist = general->mDist; + upX = general->mUp.x; + dist = general->mDist; - camera->mWPoint.set(general->mWPoint); - camera->mAxis.set(axis); - camera->mAngleA = angle.x; - camera->mAngleB = angle.y; - camera->mDist = dist; - camera->mUpX = upX; + camera->mWPoint.set(general->mWPoint); + camera->mAxis.set(axis); + camera->mAngleA = angle.x; + camera->mAngleB = angle.y; + camera->mDist = dist; + camera->mUpX = upX; } -Camera *CamTranslatorInnerCylinder::getCamera() const { - return mCamera; +Camera* CamTranslatorInnerCylinder::getCamera() const { + return mCamera; } diff --git a/src/Game/Camera/CamTranslatorInwardSphere.cpp b/src/Game/Camera/CamTranslatorInwardSphere.cpp index 532375402..0969e44f7 100644 --- a/src/Game/Camera/CamTranslatorInwardSphere.cpp +++ b/src/Game/Camera/CamTranslatorInwardSphere.cpp @@ -1,23 +1,23 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorInwardSphere.hpp" -void CamTranslatorInwardSphere::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; - CameraInwardSphere *camera = mCamera; +void CamTranslatorInwardSphere::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; + CameraInwardSphere* camera = mCamera; - f32 angleA; - f32 dist; - f32 angleB; + f32 angleA; + f32 dist; + f32 angleB; - angleB = general->mAngleB; - dist = general->mDist; - angleA = general->mAngleA; + angleB = general->mAngleB; + dist = general->mDist; + angleA = general->mAngleA; - camera->mAngleA = angleA; - camera->mDist = dist; - camera->mAngleB = angleB; + camera->mAngleA = angleA; + camera->mDist = dist; + camera->mAngleB = angleB; } -Camera *CamTranslatorInwardSphere::getCamera() const { - return mCamera; +Camera* CamTranslatorInwardSphere::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorInwardTower.cpp b/src/Game/Camera/CamTranslatorInwardTower.cpp index cf7432aa4..3d85335ed 100644 --- a/src/Game/Camera/CamTranslatorInwardTower.cpp +++ b/src/Game/Camera/CamTranslatorInwardTower.cpp @@ -2,30 +2,29 @@ #include "Game/Camera/CamTranslatorInwardTower.hpp" #include "Game/Util/MathUtil.hpp" -void CamTranslatorInwardTower::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorInwardTower::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - TVec3f axis = general->mAxis; + TVec3f axis = general->mAxis; - if (MR::isNearZero(axis, 0.001f)) { - axis.set(0.0f, 1.0f, 0.0f); - } - else { - MR::normalize(&axis); - } + if (MR::isNearZero(axis, 0.001f)) { + axis.set(0.0f, 1.0f, 0.0f); + } else { + MR::normalize(&axis); + } - TVec2f angle = TVec2f(general->mAngleB, general->mAngleA); - f32 dist = general->mDist; + TVec2f angle = TVec2f(general->mAngleB, general->mAngleA); + f32 dist = general->mDist; - CameraInwardTower *camera = mCamera; + CameraInwardTower* camera = mCamera; - camera->mWPoint.set(general->mWPoint); - camera->mAxis.set(axis); - camera->mAngleB = angle.x; - camera->mAngleA = angle.y; - camera->mDist = dist; + camera->mWPoint.set(general->mWPoint); + camera->mAxis.set(axis); + camera->mAngleB = angle.x; + camera->mAngleA = angle.y; + camera->mDist = dist; } -Camera *CamTranslatorInwardTower::getCamera() const { - return mCamera; +Camera* CamTranslatorInwardTower::getCamera() const { + return mCamera; } diff --git a/src/Game/Camera/CamTranslatorMedianPlanet.cpp b/src/Game/Camera/CamTranslatorMedianPlanet.cpp index 58dc2d963..289a8a6ed 100644 --- a/src/Game/Camera/CamTranslatorMedianPlanet.cpp +++ b/src/Game/Camera/CamTranslatorMedianPlanet.cpp @@ -1,42 +1,42 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorMedianPlanet.hpp" -CamTranslatorMedianPlanet::CamTranslatorMedianPlanet(CameraMedianPlanet *pCamera) { - mCamera = pCamera; +CamTranslatorMedianPlanet::CamTranslatorMedianPlanet(CameraMedianPlanet* pCamera) { + mCamera = pCamera; } -void CamTranslatorMedianPlanet::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorMedianPlanet::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - f32 axisX; - f32 axisY; - f32 angleA; - f32 axisZ; - f32 angleB; - f32 dist; - f32 wPointX; + f32 axisX; + f32 axisY; + f32 angleA; + f32 axisZ; + f32 angleB; + f32 dist; + f32 wPointX; - wPointX = general->mWPoint.x; - dist = general->mDist; - angleB = general->mAngleB; - axisZ = general->mAxis.z; - angleA = general->mAngleA; - axisY = general->mAxis.y; - axisX = general->mAxis.x; - const char *string = general->mString.getCharPtr(); + wPointX = general->mWPoint.x; + dist = general->mDist; + angleB = general->mAngleB; + axisZ = general->mAxis.z; + angleA = general->mAngleA; + axisY = general->mAxis.y; + axisX = general->mAxis.x; + const char* string = general->mString.getCharPtr(); - CameraMedianPlanet *camera = mCamera; + CameraMedianPlanet* camera = mCamera; - camera->mString = string; - camera->mAxisX = axisX; - camera->mAxisY = axisY; - camera->mAngleA = angleA; - camera->mAngleB = angleB; - camera->mDist = dist; - camera->mAxisZ = axisZ; - camera->mWPointX = wPointX; + camera->mString = string; + camera->mAxisX = axisX; + camera->mAxisY = axisY; + camera->mAngleA = angleA; + camera->mAngleB = angleB; + camera->mDist = dist; + camera->mAxisZ = axisZ; + camera->mWPointX = wPointX; } -Camera *CamTranslatorMedianPlanet::getCamera() const { - return mCamera; +Camera* CamTranslatorMedianPlanet::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorMedianTower.cpp b/src/Game/Camera/CamTranslatorMedianTower.cpp index c576ab872..13d210377 100644 --- a/src/Game/Camera/CamTranslatorMedianTower.cpp +++ b/src/Game/Camera/CamTranslatorMedianTower.cpp @@ -3,33 +3,33 @@ #ifdef NON_MATCHING // Instruction order, register mismatch -void CamTranslatorMedianTower::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorMedianTower::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - const char *string; - f32 angleA; - f32 upX; - f32 upY; - f32 upZ; + const char* string; + f32 angleA; + f32 upX; + f32 upY; + f32 upZ; - upZ = general->mUp.z; - upY = general->mUp.y; - upX = general->mUp.x; - angleA = general->mAngleA; - string = general->mString.getCharPtr(); + upZ = general->mUp.z; + upY = general->mUp.y; + upX = general->mUp.x; + angleA = general->mAngleA; + string = general->mString.getCharPtr(); - CameraMedianTower *camera = mCamera; + CameraMedianTower* camera = mCamera; - camera->mString = string; - camera->mWPoint.set(pChunk->mGeneralParam->mWPoint); - camera->mAxis.set(pChunk->mGeneralParam->mAxis); - camera->mAngleA = angleA; - camera->mUpX = upX; - camera->mUpY = upY; - camera->mUpZ = upZ; + camera->mString = string; + camera->mWPoint.set(pChunk->mGeneralParam->mWPoint); + camera->mAxis.set(pChunk->mGeneralParam->mAxis); + camera->mAngleA = angleA; + camera->mUpX = upX; + camera->mUpY = upY; + camera->mUpZ = upZ; } #endif -Camera *CamTranslatorMedianTower::getCamera() const { - return mCamera; +Camera* CamTranslatorMedianTower::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorMtxRegParallel.cpp b/src/Game/Camera/CamTranslatorMtxRegParallel.cpp index f8418aff2..e98559aad 100644 --- a/src/Game/Camera/CamTranslatorMtxRegParallel.cpp +++ b/src/Game/Camera/CamTranslatorMtxRegParallel.cpp @@ -1,23 +1,23 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorMtxRegParallel.hpp" -void CamTranslatorMtxRegParallel::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorMtxRegParallel::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - TVec2f angle = TVec2f(general->mAngleB, general->mAngleA); - f32 dist = general->mDist; - const char *string = general->mString.getCharPtr(); + TVec2f angle = TVec2f(general->mAngleB, general->mAngleA); + f32 dist = general->mDist; + const char* string = general->mString.getCharPtr(); - CameraMtxRegParallel *camera = mCamera; + CameraMtxRegParallel* camera = mCamera; - camera->mString = string; - camera->mAngleB = angle.x; - camera->mAngleA = angle.y; - camera->mDist = dist; + camera->mString = string; + camera->mAngleB = angle.x; + camera->mAngleA = angle.y; + camera->mDist = dist; - camera->mWPoint.setPS(general->mWPoint); + camera->mWPoint.setPS(general->mWPoint); } -Camera *CamTranslatorMtxRegParallel::getCamera() const { - return mCamera; +Camera* CamTranslatorMtxRegParallel::getCamera() const { + return mCamera; } diff --git a/src/Game/Camera/CamTranslatorObjParallel.cpp b/src/Game/Camera/CamTranslatorObjParallel.cpp index f87f0884d..017df7ced 100644 --- a/src/Game/Camera/CamTranslatorObjParallel.cpp +++ b/src/Game/Camera/CamTranslatorObjParallel.cpp @@ -1,24 +1,24 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorObjParallel.hpp" -void CamTranslatorObjParallel::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorObjParallel::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - f32 dist; - f32 angleA; - f32 angleB; + f32 dist; + f32 angleA; + f32 angleB; - angleB = general->mAngleB; - angleA = general->mAngleA; - dist = general->mDist; + angleB = general->mAngleB; + angleA = general->mAngleA; + dist = general->mDist; - CameraObjParallel *camera = mCamera; + CameraObjParallel* camera = mCamera; - camera->mDist = dist; - camera->mAngleA = angleA; - camera->mAngleB = angleB; + camera->mDist = dist; + camera->mAngleA = angleA; + camera->mAngleB = angleB; } -Camera *CamTranslatorObjParallel::getCamera() const { - return mCamera; +Camera* CamTranslatorObjParallel::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorParallel.cpp b/src/Game/Camera/CamTranslatorParallel.cpp index 7ecbdc50e..37636b485 100644 --- a/src/Game/Camera/CamTranslatorParallel.cpp +++ b/src/Game/Camera/CamTranslatorParallel.cpp @@ -1,24 +1,24 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorParallel.hpp" -void CamTranslatorParallel::setParam(const CameraParamChunk *pChunk) { - TVec2f angle; - f32 dist; - f32 axisX; +void CamTranslatorParallel::setParam(const CameraParamChunk* pChunk) { + TVec2f angle; + f32 dist; + f32 axisX; - dist = pChunk->mGeneralParam->mDist; - angle.y = 180.0f * pChunk->mGeneralParam->mAngleA / 3.1415927f; - angle.x = 180.0f * pChunk->mGeneralParam->mAngleB / 3.1415927f; - bool var = !(pChunk->mGeneralParam->mNum1 != 1); + dist = pChunk->mGeneralParam->mDist; + angle.y = 180.0f * pChunk->mGeneralParam->mAngleA / 3.1415927f; + angle.x = 180.0f * pChunk->mGeneralParam->mAngleB / 3.1415927f; + bool var = !(pChunk->mGeneralParam->mNum1 != 1); - CameraParallel *camera = mCamera; + CameraParallel* camera = mCamera; - camera->mAngleB = angle.x; - camera->mAngleA = angle.y; - camera->mDist = dist; - camera->_58 = var; + camera->mAngleB = angle.x; + camera->mAngleA = angle.y; + camera->mDist = dist; + camera->_58 = var; } -Camera *CamTranslatorParallel::getCamera() const { - return mCamera; +Camera* CamTranslatorParallel::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorRaceFollow.cpp b/src/Game/Camera/CamTranslatorRaceFollow.cpp index 9ce26ddab..bdd3f2851 100644 --- a/src/Game/Camera/CamTranslatorRaceFollow.cpp +++ b/src/Game/Camera/CamTranslatorRaceFollow.cpp @@ -1,30 +1,30 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorRaceFollow.hpp" -void CamTranslatorRaceFollow::setParam(const CameraParamChunk *pChunk) { - f32 wPointX; - f32 wPointY; - f32 wPointZ; - f32 angleA; +void CamTranslatorRaceFollow::setParam(const CameraParamChunk* pChunk) { + f32 wPointX; + f32 wPointY; + f32 wPointZ; + f32 angleA; - f32 pi = 3.1415927f; - f32 angleA2 = pChunk->mGeneralParam->mAngleA; + f32 pi = 3.1415927f; + f32 angleA2 = pChunk->mGeneralParam->mAngleA; - angleA = angleA2 * pi / 180.0f; - bool uVar5 = pChunk->mGeneralParam->mNum1 != 0; - wPointZ = pChunk->mGeneralParam->mWPoint.z; - wPointY = pChunk->mGeneralParam->mWPoint.y; - wPointX = pChunk->mGeneralParam->mWPoint.x; + angleA = angleA2 * pi / 180.0f; + bool uVar5 = pChunk->mGeneralParam->mNum1 != 0; + wPointZ = pChunk->mGeneralParam->mWPoint.z; + wPointY = pChunk->mGeneralParam->mWPoint.y; + wPointX = pChunk->mGeneralParam->mWPoint.x; - CameraRaceFollow *camera = mCamera; + CameraRaceFollow* camera = mCamera; - camera->mWPointX = wPointX; - camera->mWPointY = wPointY; - camera->mAngleA = angleA; - camera->_58 = uVar5; - camera->mWPointZ = wPointZ; + camera->mWPointX = wPointX; + camera->mWPointY = wPointY; + camera->mAngleA = angleA; + camera->_58 = uVar5; + camera->mWPointZ = wPointZ; } -Camera *CamTranslatorRaceFollow::getCamera() const { - return mCamera; +Camera* CamTranslatorRaceFollow::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorRailDemo.cpp b/src/Game/Camera/CamTranslatorRailDemo.cpp index 578053ead..65b79c3aa 100644 --- a/src/Game/Camera/CamTranslatorRailDemo.cpp +++ b/src/Game/Camera/CamTranslatorRailDemo.cpp @@ -1,16 +1,15 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorRailDemo.hpp" -void CamTranslatorRailDemo::setParam(const CameraParamChunk *pChunk) { - mCamera->setParam( - pChunk->getZoneID(), - pChunk->mGeneralParam->mNum1 >> 16, - pChunk->mGeneralParam->mNum2, - pChunk->mGeneralParam->mNum1 & 0xFFFF, - pChunk->mGeneralParam->mDist - ); +void CamTranslatorRailDemo::setParam(const CameraParamChunk* pChunk) { + mCamera->setParam( + pChunk->getZoneID(), + pChunk->mGeneralParam->mNum1 >> 16, + pChunk->mGeneralParam->mNum2, + pChunk->mGeneralParam->mNum1 & 0xFFFF, + pChunk->mGeneralParam->mDist); } -Camera *CamTranslatorRailDemo::getCamera() const { - return mCamera; +Camera* CamTranslatorRailDemo::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorRailFollow.cpp b/src/Game/Camera/CamTranslatorRailFollow.cpp index bd2976971..3d46ecd63 100644 --- a/src/Game/Camera/CamTranslatorRailFollow.cpp +++ b/src/Game/Camera/CamTranslatorRailFollow.cpp @@ -1,17 +1,16 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorRailFollow.hpp" -void CamTranslatorRailFollow::setParam(const CameraParamChunk *pChunk) { - mCamera->setParam( - pChunk->getZoneID(), - pChunk->mGeneralParam->mNum1, - pChunk->mGeneralParam->mDist, - pChunk->mGeneralParam->mWPoint.x, - pChunk->mGeneralParam->mWPoint.y, - pChunk->mGeneralParam->mNum2 - ); +void CamTranslatorRailFollow::setParam(const CameraParamChunk* pChunk) { + mCamera->setParam( + pChunk->getZoneID(), + pChunk->mGeneralParam->mNum1, + pChunk->mGeneralParam->mDist, + pChunk->mGeneralParam->mWPoint.x, + pChunk->mGeneralParam->mWPoint.y, + pChunk->mGeneralParam->mNum2); } -Camera *CamTranslatorRailFollow::getCamera() const { - return mCamera; +Camera* CamTranslatorRailFollow::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorRailWatch.cpp b/src/Game/Camera/CamTranslatorRailWatch.cpp index c566f7b25..8b476db1d 100644 --- a/src/Game/Camera/CamTranslatorRailWatch.cpp +++ b/src/Game/Camera/CamTranslatorRailWatch.cpp @@ -1,17 +1,16 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorRailWatch.hpp" -void CamTranslatorRailWatch::setParam(const CameraParamChunk *pChunk) { - mCamera->setParam( - pChunk->getZoneID(), - pChunk->mGeneralParam->mNum1, - pChunk->mGeneralParam->mNum2, - pChunk->mGeneralParam->mAxis.x, - pChunk->mGeneralParam->mDist, - pChunk->mGeneralParam->mAngleA - ); +void CamTranslatorRailWatch::setParam(const CameraParamChunk* pChunk) { + mCamera->setParam( + pChunk->getZoneID(), + pChunk->mGeneralParam->mNum1, + pChunk->mGeneralParam->mNum2, + pChunk->mGeneralParam->mAxis.x, + pChunk->mGeneralParam->mDist, + pChunk->mGeneralParam->mAngleA); } -Camera *CamTranslatorRailWatch::getCamera() const { - return mCamera; +Camera* CamTranslatorRailWatch::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorSlide.cpp b/src/Game/Camera/CamTranslatorSlide.cpp index 8cf101062..324b00071 100644 --- a/src/Game/Camera/CamTranslatorSlide.cpp +++ b/src/Game/Camera/CamTranslatorSlide.cpp @@ -35,6 +35,6 @@ camera->mDist = dist; }*/ -Camera *CamTranslatorSlide::getCamera() const { - return mCamera; +Camera* CamTranslatorSlide::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorSpiral.cpp b/src/Game/Camera/CamTranslatorSpiral.cpp index b7aad188e..5c0012bf3 100644 --- a/src/Game/Camera/CamTranslatorSpiral.cpp +++ b/src/Game/Camera/CamTranslatorSpiral.cpp @@ -3,40 +3,40 @@ #ifdef NON_MATCHING // Register mismatch -void CamTranslatorSpiral::setParam(const CameraParamChunk *pChunk) { - CameraSpiral *camera = mCamera; - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorSpiral::setParam(const CameraParamChunk* pChunk) { + CameraSpiral* camera = mCamera; + CameraGeneralParam* general = pChunk->mGeneralParam; - s32 uVar8; - f32 wPointY; - f32 axisY; - f32 wPointZ; - f32 axisZ; - f32 wPointX; - f32 axisX; - s16 sVar7; + s32 uVar8; + f32 wPointY; + f32 axisY; + f32 wPointZ; + f32 axisZ; + f32 wPointX; + f32 axisX; + s16 sVar7; - sVar7 = reinterpret_cast(&general->mNum1)[1]; - axisX = general->mAxis.x; - wPointX = general->mWPoint.x; - axisZ = general->mAxis.z; - wPointZ = general->mWPoint.z; - axisY = general->mAxis.y; - wPointY = general->mWPoint.y; - uVar8 = general->mNum2; + sVar7 = reinterpret_cast(&general->mNum1)[1]; + axisX = general->mAxis.x; + wPointX = general->mWPoint.x; + axisZ = general->mAxis.z; + wPointZ = general->mWPoint.z; + axisY = general->mAxis.y; + wPointY = general->mWPoint.y; + uVar8 = general->mNum2; - camera->_4C = reinterpret_cast(&general->mNum1)[0]; - camera->_54 = sVar7; - camera->_58 = uVar8; - camera->mWPointY = wPointY; - camera->mAxisY = axisY; - camera->mWPointZ = wPointZ; - camera->mAxisZ = axisZ; - camera->mWPointX = wPointX; - camera->mAxisX = axisX; + camera->_4C = reinterpret_cast(&general->mNum1)[0]; + camera->_54 = sVar7; + camera->_58 = uVar8; + camera->mWPointY = wPointY; + camera->mAxisY = axisY; + camera->mWPointZ = wPointZ; + camera->mAxisZ = axisZ; + camera->mWPointX = wPointX; + camera->mAxisX = axisX; } #endif -Camera *CamTranslatorSpiral::getCamera() const { - return mCamera; +Camera* CamTranslatorSpiral::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorTalk.cpp b/src/Game/Camera/CamTranslatorTalk.cpp index 3fbae19e9..c535f9b26 100644 --- a/src/Game/Camera/CamTranslatorTalk.cpp +++ b/src/Game/Camera/CamTranslatorTalk.cpp @@ -1,15 +1,14 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorTalk.hpp" -void CamTranslatorTalk::setParam(const CameraParamChunk *pChunk) { - mCamera->setParam( - pChunk->mGeneralParam->mWPoint, - pChunk->mGeneralParam->mUp, - pChunk->mGeneralParam->mAxis.x, - pChunk->mGeneralParam->mAxis.y - ); +void CamTranslatorTalk::setParam(const CameraParamChunk* pChunk) { + mCamera->setParam( + pChunk->mGeneralParam->mWPoint, + pChunk->mGeneralParam->mUp, + pChunk->mGeneralParam->mAxis.x, + pChunk->mGeneralParam->mAxis.y); } -Camera *CamTranslatorTalk::getCamera() const { - return mCamera; +Camera* CamTranslatorTalk::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorTower.cpp b/src/Game/Camera/CamTranslatorTower.cpp index 3f02260da..631358442 100644 --- a/src/Game/Camera/CamTranslatorTower.cpp +++ b/src/Game/Camera/CamTranslatorTower.cpp @@ -3,27 +3,27 @@ #ifdef NON_MATCHING // fmuls operand order -void CamTranslatorTower::setParam(const CameraParamChunk *pChunk) { - CameraTower *camera; - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorTower::setParam(const CameraParamChunk* pChunk) { + CameraTower* camera; + CameraGeneralParam* general = pChunk->mGeneralParam; - f32 dist; - TVec2f angle; + f32 dist; + TVec2f angle; - angle.x = general->mAngleB; - angle.y = 3.1415927f * (1.0f - general->mAngleA) * 0.5f; - dist = general->mDist; + angle.x = general->mAngleB; + angle.y = 3.1415927f * (1.0f - general->mAngleA) * 0.5f; + dist = general->mDist; - camera = mCamera; + camera = mCamera; - camera->mWPoint.set(general->mWPoint); - camera->mAxis.set(general->mAxis); - camera->mDist = dist; - camera->mAngleB = angle.x; - camera->mAngleA = angle.y; + camera->mWPoint.set(general->mWPoint); + camera->mAxis.set(general->mAxis); + camera->mDist = dist; + camera->mAngleB = angle.x; + camera->mAngleA = angle.y; } #endif -Camera *CamTranslatorTower::getCamera() const { - return mCamera; +Camera* CamTranslatorTower::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorTowerPos.cpp b/src/Game/Camera/CamTranslatorTowerPos.cpp index 3d0aace73..5964cc913 100644 --- a/src/Game/Camera/CamTranslatorTowerPos.cpp +++ b/src/Game/Camera/CamTranslatorTowerPos.cpp @@ -3,30 +3,30 @@ #ifdef NON_MATCHING // fmuls operand order, same as CamTranslatorTower::setParam() -void CamTranslatorTowerPos::setParam(const CameraParamChunk *pChunk) { - CameraTowerPos *camera; - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorTowerPos::setParam(const CameraParamChunk* pChunk) { + CameraTowerPos* camera; + CameraGeneralParam* general = pChunk->mGeneralParam; - f32 upY; - f32 upX; - TVec2f angle; + f32 upY; + f32 upX; + TVec2f angle; - angle.x = general->mAngleB; - angle.y = (1.0f - general->mAngleA) * 3.1415927f * 0.5f; - upX = general->mUp.x; - upY = general->mUp.y; + angle.x = general->mAngleB; + angle.y = (1.0f - general->mAngleA) * 3.1415927f * 0.5f; + upX = general->mUp.x; + upY = general->mUp.y; - camera = mCamera; + camera = mCamera; - camera->mWPoint.set(general->mWPoint); - camera->mAxis.set(general->mAxis); - camera->mUpX = upX; - camera->mAngleA = angle.y; - camera->mAngleB = angle.x; - camera->mUpY = upY; + camera->mWPoint.set(general->mWPoint); + camera->mAxis.set(general->mAxis); + camera->mUpX = upX; + camera->mAngleA = angle.y; + camera->mAngleB = angle.x; + camera->mUpY = upY; } #endif -Camera *CamTranslatorTowerPos::getCamera() const { - return mCamera; +Camera* CamTranslatorTowerPos::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorTripodBoss.cpp b/src/Game/Camera/CamTranslatorTripodBoss.cpp index d4bf1fe03..bd87b8451 100644 --- a/src/Game/Camera/CamTranslatorTripodBoss.cpp +++ b/src/Game/Camera/CamTranslatorTripodBoss.cpp @@ -1,27 +1,27 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorTripodBoss.hpp" -void CamTranslatorTripodBoss::setParam(const CameraParamChunk *pChunk) { - CameraTripodBoss *camera; - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorTripodBoss::setParam(const CameraParamChunk* pChunk) { + CameraTripodBoss* camera; + CameraGeneralParam* general = pChunk->mGeneralParam; - f32 dist; - TVec2f up; - - up.y = general->mUp.y; - up.x = general->mUp.x; - dist = general->mDist; + f32 dist; + TVec2f up; - camera = mCamera; + up.y = general->mUp.y; + up.x = general->mUp.x; + dist = general->mDist; - camera->mWPoint.set(general->mWPoint); - camera->mAxis.set(general->mAxis); - camera->mDist = dist; - camera->mAngleB = up.x; - camera->mAngleA = up.y; - camera->upZ = general->mUp.z; + camera = mCamera; + + camera->mWPoint.set(general->mWPoint); + camera->mAxis.set(general->mAxis); + camera->mDist = dist; + camera->mAngleB = up.x; + camera->mAngleA = up.y; + camera->upZ = general->mUp.z; } -Camera *CamTranslatorTripodBoss::getCamera() const { - return mCamera; +Camera* CamTranslatorTripodBoss::getCamera() const { + return mCamera; } diff --git a/src/Game/Camera/CamTranslatorTripodBossJoint.cpp b/src/Game/Camera/CamTranslatorTripodBossJoint.cpp index b6e54b251..01ef1bf32 100644 --- a/src/Game/Camera/CamTranslatorTripodBossJoint.cpp +++ b/src/Game/Camera/CamTranslatorTripodBossJoint.cpp @@ -1,29 +1,29 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorTripodBossJoint.hpp" -void CamTranslatorTripodBossJoint::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorTripodBossJoint::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - s32 uVar3; - TVec2f angle; - f32 dist; + s32 uVar3; + TVec2f angle; + f32 dist; - uVar3 = general->mNum1; - dist = general->mDist; - angle.y = 180.0f * general->mAngleA / 3.1415927f; - angle.x = 180.0f * general->mAngleB / 3.1415927f; + uVar3 = general->mNum1; + dist = general->mDist; + angle.y = 180.0f * general->mAngleA / 3.1415927f; + angle.x = 180.0f * general->mAngleB / 3.1415927f; - CameraTripodBossJoint *camera = mCamera; + CameraTripodBossJoint* camera = mCamera; - camera->mAngleB = angle.x; - camera->mAngleA = angle.y; - camera->mDist = dist; - camera->_58 = uVar3; - camera->mAxisX = general->mAxis.x; - camera->mAxisY = general->mAxis.y; - camera->mAxisZ = general->mAxis.z; + camera->mAngleB = angle.x; + camera->mAngleA = angle.y; + camera->mDist = dist; + camera->_58 = uVar3; + camera->mAxisX = general->mAxis.x; + camera->mAxisY = general->mAxis.y; + camera->mAxisZ = general->mAxis.z; } -Camera *CamTranslatorTripodBossJoint::getCamera() const { - return mCamera; +Camera* CamTranslatorTripodBossJoint::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorTripodPlanet.cpp b/src/Game/Camera/CamTranslatorTripodPlanet.cpp index 4dbb67b13..6192274d7 100644 --- a/src/Game/Camera/CamTranslatorTripodPlanet.cpp +++ b/src/Game/Camera/CamTranslatorTripodPlanet.cpp @@ -2,30 +2,29 @@ #include "Game/Camera/CamTranslatorTripodPlanet.hpp" #include "Game/Util/MathUtil.hpp" -void CamTranslatorTripodPlanet::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorTripodPlanet::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - TVec3f axis = general->mAxis; + TVec3f axis = general->mAxis; - if (MR::isNearZero(axis, 0.001f)) { - axis.set(0.0f, 1.0f, 0.0f); - } - else { - MR::normalize(&axis); - } + if (MR::isNearZero(axis, 0.001f)) { + axis.set(0.0f, 1.0f, 0.0f); + } else { + MR::normalize(&axis); + } - TVec2f angle = TVec2f(general->mAngleA, general->mAngleB); - f32 dist = general->mDist; + TVec2f angle = TVec2f(general->mAngleA, general->mAngleB); + f32 dist = general->mDist; - CameraTripodPlanet *camera = mCamera; + CameraTripodPlanet* camera = mCamera; - camera->mWPoint.set(general->mWPoint); - camera->mAxis.set(axis); - camera->mAngleA = angle.x; - camera->mAngleB = angle.y; - camera->mDist = dist; + camera->mWPoint.set(general->mWPoint); + camera->mAxis.set(axis); + camera->mAngleA = angle.x; + camera->mAngleB = angle.y; + camera->mDist = dist; } -Camera *CamTranslatorTripodPlanet::getCamera() const { - return mCamera; +Camera* CamTranslatorTripodPlanet::getCamera() const { + return mCamera; } diff --git a/src/Game/Camera/CamTranslatorTrundle.cpp b/src/Game/Camera/CamTranslatorTrundle.cpp index 618394181..25f2f810b 100644 --- a/src/Game/Camera/CamTranslatorTrundle.cpp +++ b/src/Game/Camera/CamTranslatorTrundle.cpp @@ -2,36 +2,36 @@ #include "Game/Camera/CamTranslatorTrundle.hpp" #include "Game/Util/MathUtil.hpp" -void CamTranslatorTrundle::setParam(const CameraParamChunk *pChunk) { - CameraTrundle *camera; - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorTrundle::setParam(const CameraParamChunk* pChunk) { + CameraTrundle* camera; + CameraGeneralParam* general = pChunk->mGeneralParam; - TVec3f axis = general->mAxis; + TVec3f axis = general->mAxis; - if (!MR::isNearZero(axis, 0.001f)) { - MR::normalize(&axis); + if (!MR::isNearZero(axis, 0.001f)) { + MR::normalize(&axis); - f32 dist; - f32 angleA; - f32 angleB; - f32 upX; + f32 dist; + f32 angleA; + f32 angleB; + f32 upX; - upX = general->mUp.x; - angleB = general->mAngleB; - angleA = general->mAngleA; - dist = general->mDist; + upX = general->mUp.x; + angleB = general->mAngleB; + angleA = general->mAngleA; + dist = general->mDist; - camera = mCamera; + camera = mCamera; - camera->mWPoint.set(general->mWPoint); - camera->mAxis.set(axis); - camera->mDist = dist; - camera->mAngleA = angleA; - camera->mAngleB = angleB; - camera->mUpX = upX; - } + camera->mWPoint.set(general->mWPoint); + camera->mAxis.set(axis); + camera->mDist = dist; + camera->mAngleA = angleA; + camera->mAngleB = angleB; + camera->mUpX = upX; + } } -Camera *CamTranslatorTrundle::getCamera() const { - return mCamera; +Camera* CamTranslatorTrundle::getCamera() const { + return mCamera; } diff --git a/src/Game/Camera/CamTranslatorTwistedPassage.cpp b/src/Game/Camera/CamTranslatorTwistedPassage.cpp index 238895480..bb89ba7d6 100644 --- a/src/Game/Camera/CamTranslatorTwistedPassage.cpp +++ b/src/Game/Camera/CamTranslatorTwistedPassage.cpp @@ -1,15 +1,14 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorTwistedPassage.hpp" -void CamTranslatorTwistedPassage::setParam(const CameraParamChunk *pChunk) { - mCamera->setParam( - pChunk->getZoneID(), - pChunk->mGeneralParam->mNum1, - pChunk->mGeneralParam->mAxis.x, - pChunk->mGeneralParam->mAxis.y - ); +void CamTranslatorTwistedPassage::setParam(const CameraParamChunk* pChunk) { + mCamera->setParam( + pChunk->getZoneID(), + pChunk->mGeneralParam->mNum1, + pChunk->mGeneralParam->mAxis.x, + pChunk->mGeneralParam->mAxis.y); } -Camera *CamTranslatorTwistedPassage::getCamera() const { - return mCamera; +Camera* CamTranslatorTwistedPassage::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorWaterFollow.cpp b/src/Game/Camera/CamTranslatorWaterFollow.cpp index 261c97df0..1acbd7693 100644 --- a/src/Game/Camera/CamTranslatorWaterFollow.cpp +++ b/src/Game/Camera/CamTranslatorWaterFollow.cpp @@ -1,28 +1,28 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorWaterFollow.hpp" -CamTranslatorWaterFollow::CamTranslatorWaterFollow(CameraWaterFollow *pCamera) { - mCamera = pCamera; +CamTranslatorWaterFollow::CamTranslatorWaterFollow(CameraWaterFollow* pCamera) { + mCamera = pCamera; } -void CamTranslatorWaterFollow::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorWaterFollow::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - f32 axisY; - f32 axisX; - f32 dist; + f32 axisY; + f32 axisX; + f32 dist; - dist = general->mDist; - axisX = general->mAxis.x; - axisY = general->mAxis.y; + dist = general->mDist; + axisX = general->mAxis.x; + axisY = general->mAxis.y; - CameraWaterFollow *camera = mCamera; + CameraWaterFollow* camera = mCamera; - camera->mAxisY = axisY; - camera->mAxisX = axisX; - camera->mDist = dist; + camera->mAxisY = axisY; + camera->mAxisX = axisX; + camera->mDist = dist; } -Camera *CamTranslatorWaterFollow::getCamera() const { - return mCamera; +Camera* CamTranslatorWaterFollow::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorWaterPlanet.cpp b/src/Game/Camera/CamTranslatorWaterPlanet.cpp index 614148f6c..262c07c2d 100644 --- a/src/Game/Camera/CamTranslatorWaterPlanet.cpp +++ b/src/Game/Camera/CamTranslatorWaterPlanet.cpp @@ -1,28 +1,28 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorWaterPlanet.hpp" -CamTranslatorWaterPlanet::CamTranslatorWaterPlanet(CameraWaterPlanet *pCamera) { - mCamera = pCamera; +CamTranslatorWaterPlanet::CamTranslatorWaterPlanet(CameraWaterPlanet* pCamera) { + mCamera = pCamera; } -void CamTranslatorWaterPlanet::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorWaterPlanet::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - f32 axisX; - f32 axisY; - f32 angleA; + f32 axisX; + f32 axisY; + f32 angleA; - angleA = general->mAngleA; - axisY = general->mAxis.y; - axisX = general->mAxis.x; + angleA = general->mAngleA; + axisY = general->mAxis.y; + axisX = general->mAxis.x; - CameraWaterPlanet *camera = mCamera; + CameraWaterPlanet* camera = mCamera; - camera->mAxisX = axisX; - camera->mAxisY = axisY; - camera->mAngleA = angleA; + camera->mAxisX = axisX; + camera->mAxisY = axisY; + camera->mAngleA = angleA; } -Camera *CamTranslatorWaterPlanet::getCamera() const { - return mCamera; +Camera* CamTranslatorWaterPlanet::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorWaterPlanetBoss.cpp b/src/Game/Camera/CamTranslatorWaterPlanetBoss.cpp index 7b6ed54f9..77275f9d8 100644 --- a/src/Game/Camera/CamTranslatorWaterPlanetBoss.cpp +++ b/src/Game/Camera/CamTranslatorWaterPlanetBoss.cpp @@ -1,51 +1,51 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorWaterPlanetBoss.hpp" -CamTranslatorWaterPlanetBoss::CamTranslatorWaterPlanetBoss(CameraWaterPlanetBoss *pCamera) { - mCamera = pCamera; +CamTranslatorWaterPlanetBoss::CamTranslatorWaterPlanetBoss(CameraWaterPlanetBoss* pCamera) { + mCamera = pCamera; } #ifdef NON_MATCHING // wPoint.z is put into f2 instead of f8 -void CamTranslatorWaterPlanetBoss::setParam(const CameraParamChunk *pChunk) { - CameraWaterPlanetBoss *camera; - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorWaterPlanetBoss::setParam(const CameraParamChunk* pChunk) { + CameraWaterPlanetBoss* camera; + CameraGeneralParam* general = pChunk->mGeneralParam; - f32 axisY; - f32 axisX; - f32 dist; - f32 axisZ; - f32 upX; - f32 upY; - f32 upZ; - bool uVar8; + f32 axisY; + f32 axisX; + f32 dist; + f32 axisZ; + f32 upX; + f32 upY; + f32 upZ; + bool uVar8; - TVec3f wPoint = general->mWPoint; - uVar8 = general->mNum1 != 0; - upZ = general->mUp.z; - upY = general->mUp.y; - upX = general->mUp.x; - axisZ = general->mAxis.z; - dist = general->mDist; - axisX = general->mAxis.x; - axisY = general->mAxis.y; + TVec3f wPoint = general->mWPoint; + uVar8 = general->mNum1 != 0; + upZ = general->mUp.z; + upY = general->mUp.y; + upX = general->mUp.x; + axisZ = general->mAxis.z; + dist = general->mDist; + axisX = general->mAxis.x; + axisY = general->mAxis.y; - camera = mCamera; + camera = mCamera; - camera->mAxisY = axisY; - camera->mAxisX = axisX; - camera->mDist = dist; - camera->_6C = uVar8; - camera->mWPointX = wPoint.x; - camera->mWPointY = wPoint.y; - camera->mWPointZ = wPoint.z; - camera->mAxisZ = axisZ; - camera->mUpX = upX; - camera->mUpY = upY; - camera->mUpZ = upZ; + camera->mAxisY = axisY; + camera->mAxisX = axisX; + camera->mDist = dist; + camera->_6C = uVar8; + camera->mWPointX = wPoint.x; + camera->mWPointY = wPoint.y; + camera->mWPointZ = wPoint.z; + camera->mAxisZ = axisZ; + camera->mUpX = upX; + camera->mUpY = upY; + camera->mUpZ = upZ; } #endif -Camera *CamTranslatorWaterPlanetBoss::getCamera() const { - return mCamera; +Camera* CamTranslatorWaterPlanetBoss::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/CamTranslatorWonderPlanet.cpp b/src/Game/Camera/CamTranslatorWonderPlanet.cpp index 7141770e9..2c45751e0 100644 --- a/src/Game/Camera/CamTranslatorWonderPlanet.cpp +++ b/src/Game/Camera/CamTranslatorWonderPlanet.cpp @@ -1,28 +1,28 @@ #include "Game/Camera/CameraParamChunk.hpp" #include "Game/Camera/CamTranslatorWonderPlanet.hpp" -CamTranslatorWonderPlanet::CamTranslatorWonderPlanet(CameraWonderPlanet *pCamera) { - mCamera = pCamera; +CamTranslatorWonderPlanet::CamTranslatorWonderPlanet(CameraWonderPlanet* pCamera) { + mCamera = pCamera; } -void CamTranslatorWonderPlanet::setParam(const CameraParamChunk *pChunk) { - CameraGeneralParam *general = pChunk->mGeneralParam; +void CamTranslatorWonderPlanet::setParam(const CameraParamChunk* pChunk) { + CameraGeneralParam* general = pChunk->mGeneralParam; - f32 axisX; - f32 axisY; - f32 angleA; + f32 axisX; + f32 axisY; + f32 angleA; - angleA = general->mAngleA; - axisY = general->mAxis.y; - axisX = general->mAxis.x; + angleA = general->mAngleA; + axisY = general->mAxis.y; + axisX = general->mAxis.x; - CameraWonderPlanet *camera = mCamera; + CameraWonderPlanet* camera = mCamera; - camera->mAxisX = axisX; - camera->mAxisY = axisY; - camera->mAngleA = angleA; + camera->mAxisX = axisX; + camera->mAxisY = axisY; + camera->mAngleA = angleA; } -Camera *CamTranslatorWonderPlanet::getCamera() const { - return mCamera; +Camera* CamTranslatorWonderPlanet::getCamera() const { + return mCamera; } \ No newline at end of file diff --git a/src/Game/Camera/Camera.cpp b/src/Game/Camera/Camera.cpp index 9c30fb479..45ca46979 100644 --- a/src/Game/Camera/Camera.cpp +++ b/src/Game/Camera/Camera.cpp @@ -5,15 +5,15 @@ #include "Game/Camera/CameraPoseParam.hpp" #include "Game/Util/SceneUtil.hpp" -void CamTranslatorDummy::setParam(const CameraParamChunk *pChunk) { - +void CamTranslatorDummy::setParam(const CameraParamChunk* pChunk) { } -Camera *CamTranslatorDummy::getCamera() const { +Camera* CamTranslatorDummy::getCamera() const { return mCamera; } -Camera::Camera(const char *pName) : NameObj(pName) { +Camera::Camera(const char* pName) + : NameObj(pName) { mPosParam = new CameraPoseParam(); mVPan = nullptr; mIsLOfsErpOff = false; @@ -21,7 +21,6 @@ Camera::Camera(const char *pName) : NameObj(pName) { } void Camera::reset() { - } bool Camera::isInterpolationOff() const { @@ -45,11 +44,9 @@ bool Camera::isCorrectingErpPositionOff() const { } void Camera::roundLeft() { - } void Camera::roundRight() { - } bool Camera::isEnableToRoundLeft() const { @@ -64,7 +61,7 @@ bool Camera::isEnableToReset() const { return false; } -CamTranslatorBase *Camera::createTranslator() { +CamTranslatorBase* Camera::createTranslator() { return new CamTranslatorDummy(this); } @@ -73,12 +70,11 @@ CamTranslatorBase *Camera::createTranslator() { void Camera::setZoneMtx(s32 zoneID) { if (zoneID <= 0) { mZoneMatrix.identity(); - } - else { + } else { mZoneMatrix.identity(); - register TMtx34f *matrix = MR::getZonePlacementMtx(zoneID); - register Camera *camera = this; + register TMtx34f* matrix = MR::getZonePlacementMtx(zoneID); + register Camera* camera = this; __asm { psq_l f0, 0x00(matrix), 0, 0 @@ -93,7 +89,8 @@ void Camera::setZoneMtx(s32 zoneID) { psq_st f3, 0x34(camera), 0, 0 psq_st f4, 0x3C(camera), 0, 0 psq_st f5, 0x44(camera), 0, 0 - }; + } + ; } if (mVPan != nullptr) { diff --git a/src/Game/Camera/CameraAnim.cpp b/src/Game/Camera/CameraAnim.cpp index 4e103ea5d..c9c1abca0 100644 --- a/src/Game/Camera/CameraAnim.cpp +++ b/src/Game/Camera/CameraAnim.cpp @@ -2,18 +2,17 @@ #include "Game/Camera/CamTranslatorAnim.hpp" KeyCamAnmDataAccessor::~KeyCamAnmDataAccessor() { - } -void KeyCamAnmDataAccessor::set(void *pInfo, void *pValues) { - mInfo = reinterpret_cast(pInfo); - mValues = reinterpret_cast(pValues); +void KeyCamAnmDataAccessor::set(void* pInfo, void* pValues) { + mInfo = reinterpret_cast(pInfo); + mValues = reinterpret_cast(pValues); } -void KeyCamAnmDataAccessor::getPos(TVec3f *pPos, f32 key) const { - CanmKeyFrameComponentInfo &infoZ = mInfo->mPosZ; - CanmKeyFrameComponentInfo &infoY = mInfo->mPosY; - CanmKeyFrameComponentInfo &infoX = mInfo->mPosX; +void KeyCamAnmDataAccessor::getPos(TVec3f* pPos, f32 key) const { + CanmKeyFrameComponentInfo& infoZ = mInfo->mPosZ; + CanmKeyFrameComponentInfo& infoY = mInfo->mPosY; + CanmKeyFrameComponentInfo& infoX = mInfo->mPosX; f32 x; f32 y; @@ -26,10 +25,10 @@ void KeyCamAnmDataAccessor::getPos(TVec3f *pPos, f32 key) const { pPos->set(x, y, z); } -void KeyCamAnmDataAccessor::getWatchPos(TVec3f *pWatchPos, f32 key) const { - CanmKeyFrameComponentInfo &infoZ = mInfo->mWatchPosZ; - CanmKeyFrameComponentInfo &infoY = mInfo->mWatchPosY; - CanmKeyFrameComponentInfo &infoX = mInfo->mWatchPosX; +void KeyCamAnmDataAccessor::getWatchPos(TVec3f* pWatchPos, f32 key) const { + CanmKeyFrameComponentInfo& infoZ = mInfo->mWatchPosZ; + CanmKeyFrameComponentInfo& infoY = mInfo->mWatchPosY; + CanmKeyFrameComponentInfo& infoX = mInfo->mWatchPosX; f32 x; f32 y; @@ -43,14 +42,14 @@ void KeyCamAnmDataAccessor::getWatchPos(TVec3f *pWatchPos, f32 key) const { } f32 KeyCamAnmDataAccessor::getTwist(f32 key) const { - CanmKeyFrameComponentInfo &info = mInfo->mTwist; - + CanmKeyFrameComponentInfo& info = mInfo->mTwist; + return get(key, info.mOffset, info.mCount, info.mType); } f32 KeyCamAnmDataAccessor::getFovy(f32 key) const { - CanmKeyFrameComponentInfo &info = mInfo->mFovy; - + CanmKeyFrameComponentInfo& info = mInfo->mFovy; + return get(key, info.mOffset, info.mCount, info.mType); } @@ -61,8 +60,7 @@ f32 KeyCamAnmDataAccessor::get(f32 key, u32 offset, u32 count, u32 type) const { if (type == 0) { return get3f(key, offset, count); - } - else { + } else { return get4f(key, offset, count); } } @@ -76,8 +74,7 @@ u32 KeyCamAnmDataAccessor::searchKeyFrameIndex(f32 key, u32 offset, u32 count, u if (mValues[offset + middle * stride] <= key) { low = middle + 1; - } - else { + } else { high = middle; } } @@ -86,15 +83,15 @@ u32 KeyCamAnmDataAccessor::searchKeyFrameIndex(f32 key, u32 offset, u32 count, u } f32 KeyCamAnmDataAccessor::get3f(f32 key, u32 offset, u32 count) const { - u32 index = searchKeyFrameIndex(key, offset, count, 3); - f32 *values = mValues + offset + index * 3; + u32 index = searchKeyFrameIndex(key, offset, count, 3); + f32* values = mValues + offset + index * 3; return calcHermite(key, values[0], values[1], values[2], values[3], values[4], values[5]); } f32 KeyCamAnmDataAccessor::get4f(f32 key, u32 offset, u32 count) const { - u32 index = searchKeyFrameIndex(key, offset, count, 4); - f32 *values = mValues + offset + index * 4; + u32 index = searchKeyFrameIndex(key, offset, count, 4); + f32* values = mValues + offset + index * 4; return calcHermite(key, values[0], values[1], values[2], values[3], values[4], values[5]); } @@ -111,18 +108,17 @@ f32 KeyCamAnmDataAccessor::calcHermite(f32 key, f32 a2, f32 a3, f32 a4, f32 a5, #endif CamAnmDataAccessor::~CamAnmDataAccessor() { - } -void CamAnmDataAccessor::set(void *pInfo, void *pValues) { - mInfo = reinterpret_cast(pInfo); - mValues = reinterpret_cast(pValues); +void CamAnmDataAccessor::set(void* pInfo, void* pValues) { + mInfo = reinterpret_cast(pInfo); + mValues = reinterpret_cast(pValues); } -void CamAnmDataAccessor::getPos(TVec3f *pPos, f32 key) const { - CamnFrameComponentInfo &infoZ = mInfo->mPosZ; - CamnFrameComponentInfo &infoY = mInfo->mPosY; - CamnFrameComponentInfo &infoX = mInfo->mPosX; +void CamAnmDataAccessor::getPos(TVec3f* pPos, f32 key) const { + CamnFrameComponentInfo& infoZ = mInfo->mPosZ; + CamnFrameComponentInfo& infoY = mInfo->mPosY; + CamnFrameComponentInfo& infoX = mInfo->mPosX; f32 x; f32 y; @@ -135,10 +131,10 @@ void CamAnmDataAccessor::getPos(TVec3f *pPos, f32 key) const { pPos->set(x, y, z); } -void CamAnmDataAccessor::getWatchPos(TVec3f *pWatchPos, f32 key) const { - CamnFrameComponentInfo &infoZ = mInfo->mWatchPosZ; - CamnFrameComponentInfo &infoY = mInfo->mWatchPosY; - CamnFrameComponentInfo &infoX = mInfo->mWatchPosX; +void CamAnmDataAccessor::getWatchPos(TVec3f* pWatchPos, f32 key) const { + CamnFrameComponentInfo& infoZ = mInfo->mWatchPosZ; + CamnFrameComponentInfo& infoY = mInfo->mWatchPosY; + CamnFrameComponentInfo& infoX = mInfo->mWatchPosX; f32 x; f32 y; @@ -152,13 +148,13 @@ void CamAnmDataAccessor::getWatchPos(TVec3f *pWatchPos, f32 key) const { } f32 CamAnmDataAccessor::getTwist(f32 key) const { - CamnFrameComponentInfo &info = mInfo->mTwist; + CamnFrameComponentInfo& info = mInfo->mTwist; return get(key, info.mOffset, info.mCount); } f32 CamAnmDataAccessor::getFovy(f32 key) const { - CamnFrameComponentInfo &info = mInfo->mFovy; + CamnFrameComponentInfo& info = mInfo->mFovy; return get(key, info.mOffset, info.mCount); } @@ -174,7 +170,8 @@ f32 CamAnmDataAccessor::getFovy(f32 key) const { } }*/ -CameraAnim::CameraAnim(const char *pName) : Camera(pName) { +CameraAnim::CameraAnim(const char* pName) + : Camera(pName) { _4C = 0; _50 = 1; mNrFrames = 0; @@ -190,7 +187,6 @@ CameraAnim::CameraAnim(const char *pName) : Camera(pName) { } CameraAnim::~CameraAnim() { - } bool CameraAnim::isZeroFrameMoveOff() const { @@ -205,11 +201,11 @@ bool CameraAnim::isInterpolationOff() const { return true; } -CamTranslatorBase *CameraAnim::createTranslator() { +CamTranslatorBase* CameraAnim::createTranslator() { return new CamTranslatorAnim(this); } -void CameraAnim::setParam(u8 *pFile, f32 speed) { +void CameraAnim::setParam(u8* pFile, f32 speed) { loadBin(pFile); mFileData = pFile; mSpeed = speed; @@ -217,7 +213,7 @@ void CameraAnim::setParam(u8 *pFile, f32 speed) { bool CameraAnim::isAnimEnd() const { bool hasEnded = true; - u32 nrFrames = mNrFrames; + u32 nrFrames = mNrFrames; if (nrFrames != 0) { if (!(mCurrentFrame >= nrFrames)) { @@ -228,12 +224,12 @@ bool CameraAnim::isAnimEnd() const { return hasEnded; } -u32 CameraAnim::getAnimFrame(u8 *pFile) { +u32 CameraAnim::getAnimFrame(u8* pFile) { if (pFile == nullptr) { return 0; } - CanmFileHeader *pHeader = reinterpret_cast(pFile); + CanmFileHeader* pHeader = reinterpret_cast(pFile); if (pHeader->mMagic[0] != 'A' || pHeader->mMagic[1] != 'N' || pHeader->mMagic[2] != 'D' || pHeader->mMagic[3] != 'O') { return 0; @@ -243,7 +239,7 @@ u32 CameraAnim::getAnimFrame(u8 *pFile) { (pHeader->mType[0] != 'C' || pHeader->mType[1] != 'K' || pHeader->mType[2] != 'A' || pHeader->mType[3] != 'N')) { return 0; } - + if (pHeader->_8 == 0) { return 0; } @@ -251,8 +247,8 @@ u32 CameraAnim::getAnimFrame(u8 *pFile) { return pHeader->mNrFrames; } -bool CameraAnim::loadBin(u8 *pFile) { - CanmFileHeader *pHeader = reinterpret_cast(pFile); +bool CameraAnim::loadBin(u8* pFile) { + CanmFileHeader* pHeader = reinterpret_cast(pFile); if (pHeader->mMagic[0] != 'A' || pHeader->mMagic[1] != 'N' || pHeader->mMagic[2] != 'D' || pHeader->mMagic[3] != 'O') { return false; @@ -261,12 +257,10 @@ bool CameraAnim::loadBin(u8 *pFile) { if (pHeader->mType[0] == 'C' && pHeader->mType[1] == 'A' && pHeader->mType[2] == 'N' && pHeader->mType[3] == 'M') { mIsKey = 0; mFileDataAccessor = mDataAccessor; - } - else if (pHeader->mType[0] == 'C' && pHeader->mType[1] == 'K' && pHeader->mType[2] == 'A' && pHeader->mType[3] == 'N') { + } else if (pHeader->mType[0] == 'C' && pHeader->mType[1] == 'K' && pHeader->mType[2] == 'A' && pHeader->mType[3] == 'N') { mIsKey = 1; mFileDataAccessor = mKeyDataAccessor; - } - else { + } else { return false; } @@ -274,15 +268,15 @@ bool CameraAnim::loadBin(u8 *pFile) { return false; } - u8 *pEntry = reinterpret_cast(pFile + sizeof(CanmFileHeader)); + u8* pEntry = reinterpret_cast(pFile + sizeof(CanmFileHeader)); _4C = pHeader->_C; _50 = pHeader->_10; mNrFrames = pHeader->mNrFrames; u32 valueOffset = pHeader->mValueOffset; - mNrValues = *(reinterpret_cast(&pEntry[valueOffset])) / sizeof(f32); - + mNrValues = *(reinterpret_cast(&pEntry[valueOffset])) / sizeof(f32); + mFileDataAccessor->set(pEntry, pEntry + valueOffset + 4); return true; diff --git a/src/Game/Camera/CameraBehind.cpp b/src/Game/Camera/CameraBehind.cpp index 3874801ae..2c65cffce 100644 --- a/src/Game/Camera/CameraBehind.cpp +++ b/src/Game/Camera/CameraBehind.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraBehind.hpp" #include "Game/Camera/CamTranslatorBehind.hpp" -CameraBehind::CameraBehind(const char *pName) : Camera(pName) { +CameraBehind::CameraBehind(const char* pName) + : Camera(pName) { mAngleB = 0.5235988f; mAngleA = 0.0f; mDist = 3000.0f; @@ -10,9 +11,8 @@ CameraBehind::CameraBehind(const char *pName) : Camera(pName) { } CameraBehind::~CameraBehind() { - } -CamTranslatorBase *CameraBehind::createTranslator() { +CamTranslatorBase* CameraBehind::createTranslator() { return new CamTranslatorBehind(this); } \ No newline at end of file diff --git a/src/Game/Camera/CameraBlackHole.cpp b/src/Game/Camera/CameraBlackHole.cpp index 96526e8cf..2890eeab9 100644 --- a/src/Game/Camera/CameraBlackHole.cpp +++ b/src/Game/Camera/CameraBlackHole.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraBlackHole.hpp" #include "Game/Camera/CamTranslatorBlackHole.hpp" -CameraBlackHole::CameraBlackHole(const char *pName) : Camera(pName) { +CameraBlackHole::CameraBlackHole(const char* pName) + : Camera(pName) { _4C = 1.0f; _50 = 0.0f; mWPoint.x = 0.0f; @@ -13,9 +14,8 @@ CameraBlackHole::CameraBlackHole(const char *pName) : Camera(pName) { } CameraBlackHole::~CameraBlackHole() { - } -CamTranslatorBase *CameraBlackHole::createTranslator() { +CamTranslatorBase* CameraBlackHole::createTranslator() { return new CamTranslatorBlackHole(this); } \ No newline at end of file diff --git a/src/Game/Camera/CameraCharmedFix.cpp b/src/Game/Camera/CameraCharmedFix.cpp index bf5331144..79096eb5f 100644 --- a/src/Game/Camera/CameraCharmedFix.cpp +++ b/src/Game/Camera/CameraCharmedFix.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraCharmedFix.hpp" #include "Game/Camera/CamTranslatorCharmedFix.hpp" -CameraCharmedFix::CameraCharmedFix(const char *pName) : Camera(pName) { +CameraCharmedFix::CameraCharmedFix(const char* pName) + : Camera(pName) { mAxis.x = 0.0f; mAxis.y = 0.0f; mAxis.z = 0.0f; @@ -14,9 +15,8 @@ CameraCharmedFix::CameraCharmedFix(const char *pName) : Camera(pName) { } CameraCharmedFix::~CameraCharmedFix() { - } -CamTranslatorBase *CameraCharmedFix::createTranslator() { +CamTranslatorBase* CameraCharmedFix::createTranslator() { return new CamTranslatorCharmedFix(this); } diff --git a/src/Game/Camera/CameraCharmedTripodBoss.cpp b/src/Game/Camera/CameraCharmedTripodBoss.cpp index e14edbca7..983c6dc1d 100644 --- a/src/Game/Camera/CameraCharmedTripodBoss.cpp +++ b/src/Game/Camera/CameraCharmedTripodBoss.cpp @@ -4,7 +4,8 @@ #include "Game/Camera/CameraLocalUtil.hpp" #include "Game/Boss/TripodBossAccesser.hpp" -CameraCharmedTripodBoss::CameraCharmedTripodBoss(const char *pName) : Camera(pName) { +CameraCharmedTripodBoss::CameraCharmedTripodBoss(const char* pName) + : Camera(pName) { _4C = -1; _50.x = 0.0f; _50.y = 1.0f; @@ -25,7 +26,7 @@ void CameraCharmedTripodBoss::reset() { CameraTargetObj* CameraCharmedTripodBoss::calc() { CameraTargetObj* v2 = CameraLocalUtil::getTarget(this); CameraTargetObj* v3 = CameraLocalUtil::getTarget(this); - TVec3f v25; + TVec3f v25; CameraLocalUtil::makeWatchPoint(&v25, this, v3, 0.0066666668f); TVec3f v24(_50); TVec3f v23(0.0f, 0.0f, 0.0f); @@ -34,8 +35,8 @@ CameraTargetObj* CameraCharmedTripodBoss::calc() { MR::getTripodBossJointMatrix(&v30, _4C); v23.set(v30.mMtx[0][3], v30.mMtx[1][3], v30.mMtx[2][3]); v24.set(((v24.z * v30.mMtx[0][2]) + ((v24.x * v30.mMtx[0][0]) + (v24.y * v30.mMtx[0][1]))), - ((v24.z * v30.mMtx[1][2]) + ((v24.x * v30.mMtx[1][0]) + (v24.y * v30.mMtx[1][1]))), - ((v24.z * v30.mMtx[2][2]) + ((v24.x * v30.mMtx[2][0]) + (v24.y * v30.mMtx[2][1])))); + ((v24.z * v30.mMtx[1][2]) + ((v24.x * v30.mMtx[1][0]) + (v24.y * v30.mMtx[1][1]))), + ((v24.z * v30.mMtx[2][2]) + ((v24.x * v30.mMtx[2][0]) + (v24.y * v30.mMtx[2][1])))); } TVec3f v5(-1.0f, 0.0f, 0.0f); @@ -47,7 +48,7 @@ CameraTargetObj* CameraCharmedTripodBoss::calc() { TPos3f v27; v27.concat(v28, v29); CameraTargetObj* v7 = CameraLocalUtil::getTarget(this); - TVec3f v22 = *v7->getPosition(); + TVec3f v22 = *v7->getPosition(); if (MR::isNearZero(v22, 0.001f)) { return v2; } @@ -71,7 +72,7 @@ CameraTargetObj* CameraCharmedTripodBoss::calc() { v26.mMtx[1][2] = v22.y; v26.mMtx[2][2] = v22.z; CameraTargetObj* v10 = CameraLocalUtil::getTarget(this); - const TVec3f* pos = v10->getPosition(); + const TVec3f* pos = v10->getPosition(); v26.mMtx[0][3] = pos->x; v26.mMtx[1][3] = pos->y; v26.mMtx[2][3] = pos->z; @@ -82,7 +83,7 @@ CameraTargetObj* CameraCharmedTripodBoss::calc() { v24.set(v26.mMtx[0][1], v26.mMtx[1][1], v26.mMtx[2][1]); TVec3f v20(_5C); v26.mult(v20, v20); - f32 z = _5C.z; + f32 z = _5C.z; TVec3f v14(v22); v14.x *= z; v14.y *= z; @@ -98,7 +99,7 @@ CameraTargetObj* CameraCharmedTripodBoss::calc() { return v2; } -void CameraCharmedTripodBoss::setParam(s32 a1, TVec3f a2, const TVec3f &a3, const TVec2f &a4) { +void CameraCharmedTripodBoss::setParam(s32 a1, TVec3f a2, const TVec3f& a3, const TVec2f& a4) { _68.x = a4.x; _68.y = a4.y; _50.set(a2); @@ -107,9 +108,8 @@ void CameraCharmedTripodBoss::setParam(s32 a1, TVec3f a2, const TVec3f &a3, cons } CameraCharmedTripodBoss::~CameraCharmedTripodBoss() { - } -CamTranslatorBase *CameraCharmedTripodBoss::createTranslator() { +CamTranslatorBase* CameraCharmedTripodBoss::createTranslator() { return new CamTranslatorCharmedTripodBoss(this); } diff --git a/src/Game/Camera/CameraCharmedVecReg.cpp b/src/Game/Camera/CameraCharmedVecReg.cpp index 86370ea00..298495877 100644 --- a/src/Game/Camera/CameraCharmedVecReg.cpp +++ b/src/Game/Camera/CameraCharmedVecReg.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraCharmedVecReg.hpp" #include "Game/Camera/CamTranslatorCharmedVecReg.hpp" -CameraCharmedVecReg::CameraCharmedVecReg(const char *pName) : Camera(pName) { +CameraCharmedVecReg::CameraCharmedVecReg(const char* pName) + : Camera(pName) { mString = nullptr; mDist = 1000.0f; mAxisX = 0.0f; @@ -12,9 +13,8 @@ CameraCharmedVecReg::CameraCharmedVecReg(const char *pName) : Camera(pName) { } CameraCharmedVecReg::~CameraCharmedVecReg() { - } -CamTranslatorBase *CameraCharmedVecReg::createTranslator() { +CamTranslatorBase* CameraCharmedVecReg::createTranslator() { return new CamTranslatorCharmedVecReg(this); } \ No newline at end of file diff --git a/src/Game/Camera/CameraCharmedVecRegTower.cpp b/src/Game/Camera/CameraCharmedVecRegTower.cpp index 27b81e6db..eb376a5a2 100644 --- a/src/Game/Camera/CameraCharmedVecRegTower.cpp +++ b/src/Game/Camera/CameraCharmedVecRegTower.cpp @@ -1,14 +1,14 @@ #include "Game/Camera/CameraCharmedVecRegTower.hpp" #include "Game/Camera/CamTranslatorCharmedVecRegTower.hpp" -CameraCharmedVecRegTower::CameraCharmedVecRegTower(const char *pName) : Camera(pName) { +CameraCharmedVecRegTower::CameraCharmedVecRegTower(const char* pName) + : Camera(pName) { _70 = false; } CameraCharmedVecRegTower::~CameraCharmedVecRegTower() { - } -CamTranslatorBase *CameraCharmedVecRegTower::createTranslator() { +CamTranslatorBase* CameraCharmedVecRegTower::createTranslator() { return new CamTranslatorCharmedVecRegTower(this); } \ No newline at end of file diff --git a/src/Game/Camera/CameraContext.cpp b/src/Game/Camera/CameraContext.cpp index 796161aae..6a0d6db92 100644 --- a/src/Game/Camera/CameraContext.cpp +++ b/src/Game/Camera/CameraContext.cpp @@ -1,18 +1,18 @@ #include "Game/Camera/CameraContext.hpp" -CameraContext::CameraContext() : NameObj("カメラコンテキスト") { +CameraContext::CameraContext() + : NameObj("カメラコンテキスト") { initParams(); } CameraContext::~CameraContext() { - } -const TPos3f *CameraContext::getViewMtx() const { +const TPos3f* CameraContext::getViewMtx() const { return &mView; } -const TPos3f *CameraContext::getInvViewMtx() const { +const TPos3f* CameraContext::getInvViewMtx() const { return &mViewInv; } diff --git a/src/Game/Camera/CameraCover.cpp b/src/Game/Camera/CameraCover.cpp index 914bd67b5..4d2b0ed79 100644 --- a/src/Game/Camera/CameraCover.cpp +++ b/src/Game/Camera/CameraCover.cpp @@ -7,7 +7,8 @@ namespace { const f32 sAngleThreshold = (JGeometry::TUtil::PI() * 60.0f) / 180.0f; }; -CameraCover::CameraCover(const char *pName) : NameObj(pName) { +CameraCover::CameraCover(const char* pName) + : NameObj(pName) { _3C = 0; _40 = 0; _41 = false; @@ -53,10 +54,10 @@ void CameraCover::cover(u32 a1) { bool CameraCover::isCameraHopping() const { if (_40) { - return false; + return false; } - return _41; + return _41; } void CameraCover::copyCamera() { @@ -64,5 +65,4 @@ void CameraCover::copyCamera() { } CameraCover::~CameraCover() { - } \ No newline at end of file diff --git a/src/Game/Camera/CameraCubePlanet.cpp b/src/Game/Camera/CameraCubePlanet.cpp index 9aa899b12..2409215b6 100644 --- a/src/Game/Camera/CameraCubePlanet.cpp +++ b/src/Game/Camera/CameraCubePlanet.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraCubePlanet.hpp" #include "Game/Camera/CamTranslatorCubePlanet.hpp" -CameraCubePlanet::CameraCubePlanet(const char *pName) : Camera(pName) { +CameraCubePlanet::CameraCubePlanet(const char* pName) + : Camera(pName) { mDist = 3000.0f; mAngleA = 0.5235988f; mAngleB = 0.35f; @@ -11,9 +12,8 @@ CameraCubePlanet::CameraCubePlanet(const char *pName) : Camera(pName) { } CameraCubePlanet::~CameraCubePlanet() { - } -CamTranslatorBase *CameraCubePlanet::createTranslator() { +CamTranslatorBase* CameraCubePlanet::createTranslator() { return new CamTranslatorCubePlanet(this); } diff --git a/src/Game/Camera/CameraDPD.cpp b/src/Game/Camera/CameraDPD.cpp index 905cc978a..dee632062 100644 --- a/src/Game/Camera/CameraDPD.cpp +++ b/src/Game/Camera/CameraDPD.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraDPD.hpp" #include "Game/Camera/CamTranslatorDPD.hpp" -CameraDPD::CameraDPD(const char *pName) : Camera(pName) { +CameraDPD::CameraDPD(const char* pName) + : Camera(pName) { _4C = 0.0f; _50 = 0.0f; _54 = 0.0f; @@ -22,9 +23,8 @@ CameraDPD::CameraDPD(const char *pName) : Camera(pName) { } CameraDPD::~CameraDPD() { - } -CamTranslatorBase *CameraDPD::createTranslator() { +CamTranslatorBase* CameraDPD::createTranslator() { return new CamTranslatorDPD(this); } \ No newline at end of file diff --git a/src/Game/Camera/CameraDead.cpp b/src/Game/Camera/CameraDead.cpp index 89bc59e51..10e42e014 100644 --- a/src/Game/Camera/CameraDead.cpp +++ b/src/Game/Camera/CameraDead.cpp @@ -6,7 +6,8 @@ f32 CameraTargetObj::getRadius() const { return 150.0f; } -CameraDead::CameraDead(const char *pName) : Camera(pName) { +CameraDead::CameraDead(const char* pName) + : Camera(pName) { mDist = 0.5f; _54 = 0; _58 = 0; @@ -14,9 +15,8 @@ CameraDead::CameraDead(const char *pName) : Camera(pName) { } CameraDead::~CameraDead() { - } -CamTranslatorBase *CameraDead::createTranslator() { +CamTranslatorBase* CameraDead::createTranslator() { return new CamTranslatorDead(this); } diff --git a/src/Game/Camera/CameraDirector.cpp b/src/Game/Camera/CameraDirector.cpp index 9378b5b23..576855010 100644 --- a/src/Game/Camera/CameraDirector.cpp +++ b/src/Game/Camera/CameraDirector.cpp @@ -31,26 +31,26 @@ #include namespace { - u32 gMovementCounter; - const char *gSubjectiveCameraName = "主観カメラ"; - const char *gStartCameraName = "スタートアニメカメラ"; - const char *gTalkCameraName = "共通会話カメラ"; -} + u32 gMovementCounter; + const char* gSubjectiveCameraName = "主観カメラ"; + const char* gStartCameraName = "スタートアニメカメラ"; + const char* gTalkCameraName = "共通会話カメラ"; +} // namespace -void CameraPoseParam::copyFrom(const CameraPoseParam &rOther) { - _0.set(rOther._0); +void CameraPoseParam::copyFrom(const CameraPoseParam& rOther) { + _0.set(rOther._0); mWatchPos.set(rOther.mWatchPos); _18.set(rOther._18); _24.set(rOther._24); - _30 = rOther._30; - _34.set(rOther._34); + _30 = rOther._30; + _34.set(rOther._34); _40.set(rOther._40); _4C = rOther._4C; - _50 = rOther._50; + _50 = rOther._50; _54 = rOther._54; } -char *CameraParamChunkID_Tmp::getBuffer(u32 size) { +char* CameraParamChunkID_Tmp::getBuffer(u32 size) { return &mBuffer[0]; } @@ -87,14 +87,13 @@ bool CameraMan::isEnableToRoundRight() const { } void CameraMan::roundLeft() { - } void CameraMan::roundRight() { - } -CameraDirector::CameraDirector(const char *pName) : NameObj(pName) { +CameraDirector::CameraDirector(const char* pName) + : NameObj(pName) { _C = 0; mStack = new CameraManStack(); mOnlyCamera = new OnlyCamera("OnlyCamera"); @@ -141,11 +140,9 @@ CameraDirector::CameraDirector(const char *pName) : NameObj(pName) { } CameraDirector::~CameraDirector() { - } -void CameraDirector::init(const JMapInfoIter &rIter) { - +void CameraDirector::init(const JMapInfoIter& rIter) { } void CameraDirector::movement() { @@ -155,7 +152,7 @@ void CameraDirector::movement() { updateCameraMan(); calcPose(); createViewMtx(); - TPos3f *invView = MR::getCameraInvViewMtx(); + TPos3f* invView = MR::getCameraInvViewMtx(); JMath::gekko_ps_copy12(&getCurrentCameraMan()->mMatrix, invView); mPoseParam2->copyFrom(*getCurrentCameraMan()->mPoseParam); calcSubjective(); @@ -167,17 +164,17 @@ void CameraDirector::movement() { _1B1 = false; } -void CameraDirector::setTarget(CameraTargetObj *pTarget) { +void CameraDirector::setTarget(CameraTargetObj* pTarget) { mTargetHolder->set(pTarget); } -CameraTargetObj *CameraDirector::getTarget() { +CameraTargetObj* CameraDirector::getTarget() { return mTargetHolder->get(); } -void CameraDirector::push(CameraMan *pMan) { +void CameraDirector::push(CameraMan* pMan) { if (mStack->mCount != 0) { - CameraMan *man = getCurrentCameraMan(); + CameraMan* man = getCurrentCameraMan(); man->deactivate(this); } @@ -187,14 +184,14 @@ void CameraDirector::push(CameraMan *pMan) { pMan->activate(this); } -CameraMan *CameraDirector::pop() { - CameraMan *man = mStack->mElements[--mStack->mCount]; +CameraMan* CameraDirector::pop() { + CameraMan* man = mStack->mElements[--mStack->mCount]; man->deactivate(this); man->released(this); if (mStack->mCount != 0) { - CameraMan *newMan = getCurrentCameraMan(); + CameraMan* newMan = getCurrentCameraMan(); newMan->activate(this); } @@ -204,14 +201,14 @@ CameraMan *CameraDirector::pop() { void CameraDirector::backLastMtx() { if (_1F0) { MR::setCameraViewMtx(_1C0, false, false, TVec3f(0.0f, 0.0f, 0.0f)); - TPos3f *invView = MR::getCameraInvViewMtx(); + TPos3f* invView = MR::getCameraInvViewMtx(); TVec3f invTrans; invView->getTrans(invTrans); } } -CameraMan *CameraDirector::getCurrentCameraMan() const { +CameraMan* CameraDirector::getCurrentCameraMan() const { return mStack->mElements[mStack->mCount - 1]; } @@ -221,7 +218,7 @@ void CameraDirector::updateCameraMan() { } if (_1B1) { - CameraMan *man = getCurrentCameraMan(); + CameraMan* man = getCurrentCameraMan(); man->_15 = true; } @@ -255,7 +252,7 @@ void CameraDirector::calcPose() { bool CameraDirector::isInterpolationOff() { bool off = false; - CameraMan *man = getCurrentCameraMan(); + CameraMan* man = getCurrentCameraMan(); if (man->isInterpolationOff() || mViewInterpolator->_9) { off = true; @@ -267,8 +264,7 @@ bool CameraDirector::isInterpolationOff() { void CameraDirector::switchAntiOscillation() { if (isInterpolationOff()) { mViewInterpolator->_8 = false; - } - else { + } else { mViewInterpolator->_8 = true; } } @@ -277,12 +273,12 @@ void CameraDirector::createViewMtx() { TPos3f view; calcViewMtxFromPoseParam(&view, mPoseParam1); - CameraPoseParam *poseParam = mPoseParam1; - CameraTargetObj *target = _C; - TVec3f &rWatchPos = poseParam->mWatchPos; + CameraPoseParam* poseParam = mPoseParam1; + CameraTargetObj* target = _C; + TVec3f& rWatchPos = poseParam->mWatchPos; - CameraMan *man = getCurrentCameraMan(); - f32 fovy = CameraLocalUtil::getFovy(man); + CameraMan* man = getCurrentCameraMan(); + f32 fovy = CameraLocalUtil::getFovy(man); mViewInterpolator->updateCameraMtx(reinterpret_cast(&view), rWatchPos, target, fovy); } @@ -293,17 +289,17 @@ void CameraDirector::checkStartCondition() { } } -void CameraDirector::startEvent(s32 zoneID, const char * pName, const CameraTargetArg &rTargetArg, s32 a4) { +void CameraDirector::startEvent(s32 zoneID, const char* pName, const CameraTargetArg& rTargetArg, s32 a4) { mViewInterpolator->_A = false; removeEndEventAtLanding(zoneID, pName); if (getCurrentCameraMan() != mCameraManEvent) { if (mStack->mCount != 0) { - CameraMan *gameMan = mCameraManGame; + CameraMan* gameMan = mCameraManGame; if (getCurrentCameraMan() == gameMan) { mCameraManEvent->mPoseParam->copyFrom(*gameMan->mPoseParam); - TPos3f *invView = MR::getCameraInvViewMtx(); + TPos3f* invView = MR::getCameraInvViewMtx(); JMath::gekko_ps_copy12(&mCameraManEvent->mMatrix, invView); } } @@ -314,7 +310,7 @@ void CameraDirector::startEvent(s32 zoneID, const char * pName, const CameraTarg mCameraManEvent->start(zoneID, pName, rTargetArg, a4); } -void CameraDirector::endEvent(s32 zoneID, const char *pName, bool a3, s32 a4) { +void CameraDirector::endEvent(s32 zoneID, const char* pName, bool a3, s32 a4) { if (getCurrentCameraMan() == mCameraManEvent) { mCameraManEvent->end(zoneID, pName, a4); @@ -323,7 +319,7 @@ void CameraDirector::endEvent(s32 zoneID, const char *pName, bool a3, s32 a4) { if (!mViewInterpolator->_9 && a3 && getCurrentCameraMan() == mCameraManGame) { mCameraManGame->mPoseParam->copyFrom(*mPoseParam1); - TPos3f *invView = MR::getCameraInvViewMtx(); + TPos3f* invView = MR::getCameraInvViewMtx(); JMath::gekko_ps_copy12(&mCameraManGame->mMatrix, invView); } @@ -341,11 +337,11 @@ void CameraDirector::endEvent(s32 zoneID, const char *pName, bool a3, s32 a4) { } }*/ -CameraParamChunkEvent *CameraDirector::getEventParameter(s32 zoneID, const char *pName) { +CameraParamChunkEvent* CameraDirector::getEventParameter(s32 zoneID, const char* pName) { CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); chunkID.createEventID(zoneID, pName); - return reinterpret_cast(mChunkHolder->getChunk(chunkID)); + return reinterpret_cast(mChunkHolder->getChunk(chunkID)); } void CameraDirector::requestToResetCameraMan() { @@ -378,7 +374,7 @@ void CameraDirector::closeCreatingCameraChunk() { mCameraManGame->startStartPosCamera(false); } -void CameraDirector::initCameraCodeCollection(const char *a1, s32 a2) { +void CameraDirector::initCameraCodeCollection(const char* a1, s32 a2) { mCameraCreator->initCameraCodeCollection(a1, a2); } @@ -390,7 +386,7 @@ void CameraDirector::termCameraCodeCollection() { mCameraCreator->termCameraCodeCollection(); } -void CameraDirector::declareEvent(s32 zoneID, const char *pName) { +void CameraDirector::declareEvent(s32 zoneID, const char* pName) { CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); chunkID.createEventID(zoneID, pName); @@ -402,11 +398,11 @@ void CameraDirector::started() { mCameraManGame->endStartPosCamera(); } -void CameraDirector::setTargetActor(const LiveActor *pActor) { +void CameraDirector::setTargetActor(const LiveActor* pActor) { mTargetHolder->set(pActor); } -void CameraDirector::setTargetPlayer(const MarioActor *pActor) { +void CameraDirector::setTargetPlayer(const MarioActor* pActor) { mTargetHolder->set(pActor); } @@ -449,7 +445,7 @@ bool CameraDirector::isEnableToReset() const { return getCurrentCameraMan()->isEnableToReset(); } -bool CameraDirector::isEventCameraActive(s32 zoneID, const char *pName) const { +bool CameraDirector::isEventCameraActive(s32 zoneID, const char* pName) const { if (getCurrentCameraMan() == mCameraManEvent) { return mCameraManEvent->isEventActive(zoneID, pName); } @@ -514,18 +510,18 @@ void CameraDirector::endStartAnimCamera() { #ifndef NON_MATCHING // Register mismatch -void CameraDirector::startTalkCamera(const TVec3f &rPosition, const TVec3f &rUp, f32 axisX, f32 axisY, s32 a5) { - const char *name = gTalkCameraName; +void CameraDirector::startTalkCamera(const TVec3f& rPosition, const TVec3f& rUp, f32 axisX, f32 axisY, s32 a5) { + const char* name = gTalkCameraName; CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); chunkID.createEventID(0, name); - CameraParamChunk *chunk = mChunkHolder->getChunk(chunkID); + CameraParamChunk* chunk = mChunkHolder->getChunk(chunkID); if (chunk != nullptr) { chunk->mGeneralParam->mWPoint.set(rPosition); chunk->mGeneralParam->mUp.set(rUp); - CameraGeneralParam *generalParam = chunk->mGeneralParam; + CameraGeneralParam* generalParam = chunk->mGeneralParam; generalParam->mAxis.x = axisX; generalParam->mAxis.y = axisY; generalParam->mAxis.z = 0.0f; @@ -580,9 +576,9 @@ void CameraDirector::endSubjectiveCamera(s32 a1) { } } -bool CameraDirector::isAnimCameraEnd(s32 zoneID, const char *pName) const { - CameraManEvent *eventMan = mCameraManEvent; - CameraMan *man = getCurrentCameraMan(); +bool CameraDirector::isAnimCameraEnd(s32 zoneID, const char* pName) const { + CameraManEvent* eventMan = mCameraManEvent; + CameraMan* man = getCurrentCameraMan(); if (man == eventMan) { return eventMan->isAnimCameraEnd(zoneID, pName); @@ -591,9 +587,9 @@ bool CameraDirector::isAnimCameraEnd(s32 zoneID, const char *pName) const { return true; } -u32 CameraDirector::getAnimCameraFrame(s32 zoneID, const char *pName) const { - CameraManEvent *eventMan = mCameraManEvent; - CameraMan *man = getCurrentCameraMan(); +u32 CameraDirector::getAnimCameraFrame(s32 zoneID, const char* pName) const { + CameraManEvent* eventMan = mCameraManEvent; + CameraMan* man = getCurrentCameraMan(); if (man == eventMan) { return eventMan->getAnimCameraFrame(zoneID, pName); @@ -602,18 +598,18 @@ u32 CameraDirector::getAnimCameraFrame(s32 zoneID, const char *pName) const { return 0; } -void CameraDirector::pauseOnAnimCamera(s32 zoneID, const char *pName) { - CameraManEvent *eventMan = mCameraManEvent; - CameraMan *man = getCurrentCameraMan(); +void CameraDirector::pauseOnAnimCamera(s32 zoneID, const char* pName) { + CameraManEvent* eventMan = mCameraManEvent; + CameraMan* man = getCurrentCameraMan(); if (man == eventMan) { eventMan->pauseOnAnimCamera(zoneID, pName); } } -void CameraDirector::pauseOffAnimCamera(s32 zoneID, const char *pName) { - CameraManEvent *eventMan = mCameraManEvent; - CameraMan *man = getCurrentCameraMan(); +void CameraDirector::pauseOffAnimCamera(s32 zoneID, const char* pName) { + CameraManEvent* eventMan = mCameraManEvent; + CameraMan* man = getCurrentCameraMan(); if (man == eventMan) { eventMan->pauseOffAnimCamera(zoneID, pName); @@ -688,11 +684,11 @@ bool CameraDirector::isPlayableCameraSE(bool a1) { void CameraDirector::resetCameraMan() { setInterpolation(0); - - CameraTargetObj *target1; - CameraTargetObj *target2; - CameraTargetObj *target3; - CameraMan *man = getCurrentCameraMan(); + + CameraTargetObj* target1; + CameraTargetObj* target2; + CameraTargetObj* target3; + CameraMan* man = getCurrentCameraMan(); target1 = mTargetHolder->get(); target2 = mTargetHolder->get(); @@ -712,8 +708,8 @@ void CameraDirector::resetCameraMan() { } void CameraDirector::createStartAnimCamera() { - void *data = nullptr; - s32 size = 0; + void* data = nullptr; + s32 size = 0; MR::getCurrentScenarioStartAnimCameraData(&data, &size); if (size > 0) { @@ -724,17 +720,17 @@ void CameraDirector::createStartAnimCamera() { } void CameraDirector::createTalkCamera() { - const char *name = gTalkCameraName; + const char* name = gTalkCameraName; CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); chunkID.createEventID(0, name); mChunkHolder->createChunk(chunkID, nullptr); - const char *name2 = gTalkCameraName; + const char* name2 = gTalkCameraName; CameraParamChunkID_Tmp chunkID2 = CameraParamChunkID_Tmp(); - chunkID2.createEventID(0, name2); + chunkID2.createEventID(0, name2); - CameraParamChunk *chunk2 = mChunkHolder->getChunk(chunkID2); + CameraParamChunk* chunk2 = mChunkHolder->getChunk(chunkID2); if (chunk2 != nullptr) { chunk2->setCameraType("CAM_TYPE_TALK", mHolder); @@ -742,18 +738,18 @@ void CameraDirector::createTalkCamera() { } } -void CameraDirector::createSubjectiveCamera() { - const char *name = gSubjectiveCameraName; +void CameraDirector::createSubjectiveCamera() { + const char* name = gSubjectiveCameraName; CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); chunkID.createEventID(0, name); mChunkHolder->createChunk(chunkID, nullptr); - const char *name2 = gSubjectiveCameraName; + const char* name2 = gSubjectiveCameraName; CameraParamChunkID_Tmp chunkID2 = CameraParamChunkID_Tmp(); - chunkID2.createEventID(0, name2); + chunkID2.createEventID(0, name2); - CameraParamChunk *chunk2 = mChunkHolder->getChunk(chunkID2); + CameraParamChunk* chunk2 = mChunkHolder->getChunk(chunkID2); if (chunk2 != nullptr) { chunk2->setCameraType("CAM_TYPE_SUBJECTIVE", mHolder); diff --git a/src/Game/Camera/CameraFix.cpp b/src/Game/Camera/CameraFix.cpp index 9b5d766fe..de13c060c 100644 --- a/src/Game/Camera/CameraFix.cpp +++ b/src/Game/Camera/CameraFix.cpp @@ -2,7 +2,8 @@ #include "Game/Camera/CameraTargetMtx.hpp" #include "Game/Camera/CamTranslatorFix.hpp" -CameraFix::CameraFix(const char *pName) : Camera(pName) { +CameraFix::CameraFix(const char* pName) + : Camera(pName) { _4C = 0.0f; _50 = 0.0f; _54 = 0.0f; @@ -16,9 +17,8 @@ CameraFix::CameraFix(const char *pName) : Camera(pName) { } CameraFix::~CameraFix() { - } -CamTranslatorBase *CameraFix::createTranslator() { +CamTranslatorBase* CameraFix::createTranslator() { return new CamTranslatorFix(this); } diff --git a/src/Game/Camera/CameraFixedPoint.cpp b/src/Game/Camera/CameraFixedPoint.cpp index af9ef21c7..83838e703 100644 --- a/src/Game/Camera/CameraFixedPoint.cpp +++ b/src/Game/Camera/CameraFixedPoint.cpp @@ -1,16 +1,16 @@ #include "Game/Camera/CameraFixedPoint.hpp" #include "Game/Camera/CamTranslatorFixedPoint.hpp" -CameraFixedPoint::CameraFixedPoint(const char *pName) : Camera(pName) { +CameraFixedPoint::CameraFixedPoint(const char* pName) + : Camera(pName) { _4C = 0.0f; _50 = 0.0f; _54 = 0.0f; } CameraFixedPoint::~CameraFixedPoint() { - } -CamTranslatorBase *CameraFixedPoint::createTranslator() { +CamTranslatorBase* CameraFixedPoint::createTranslator() { return new CamTranslatorFixedPoint(this); } diff --git a/src/Game/Camera/CameraFixedThere.cpp b/src/Game/Camera/CameraFixedThere.cpp index 06b1e82b4..913c7a9cd 100644 --- a/src/Game/Camera/CameraFixedThere.cpp +++ b/src/Game/Camera/CameraFixedThere.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraFixedThere.hpp" #include "Game/Camera/CamTranslatorFixedThere.hpp" -CameraFixedThere::CameraFixedThere(const char *pName) : Camera(pName) { +CameraFixedThere::CameraFixedThere(const char* pName) + : Camera(pName) { _4C = 0; _50 = false; _54 = 0.0f; @@ -14,9 +15,8 @@ CameraFixedThere::CameraFixedThere(const char *pName) : Camera(pName) { } CameraFixedThere::~CameraFixedThere() { - } -CamTranslatorBase *CameraFixedThere::createTranslator() { +CamTranslatorBase* CameraFixedThere::createTranslator() { return new CamTranslatorFixedThere(this); } diff --git a/src/Game/Camera/CameraFollow.cpp b/src/Game/Camera/CameraFollow.cpp index cb31cb445..8ee2db00e 100644 --- a/src/Game/Camera/CameraFollow.cpp +++ b/src/Game/Camera/CameraFollow.cpp @@ -6,7 +6,8 @@ bool CameraTargetObj::isJumping() const { return false; } -CameraFollow::CameraFollow(const char *pName) : Camera(pName) { +CameraFollow::CameraFollow(const char* pName) + : Camera(pName) { _4C = 1200.0f; _50 = 300.0f; _54 = 0.17453294f; @@ -29,9 +30,8 @@ CameraFollow::CameraFollow(const char *pName) : Camera(pName) { } CameraFollow::~CameraFollow() { - } -CamTranslatorBase *CameraFollow::createTranslator() { +CamTranslatorBase* CameraFollow::createTranslator() { return new CamTranslatorFollow(this); } diff --git a/src/Game/Camera/CameraFooFighter.cpp b/src/Game/Camera/CameraFooFighter.cpp index 1c3794727..a20a452f0 100644 --- a/src/Game/Camera/CameraFooFighter.cpp +++ b/src/Game/Camera/CameraFooFighter.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraFooFighter.hpp" #include "Game/Camera/CamTranslatorFooFighter.hpp" -CameraFooFighter::CameraFooFighter(const char *pName) : Camera(pName) { +CameraFooFighter::CameraFooFighter(const char* pName) + : Camera(pName) { mAxisY = 300.0f; mAxisX = 1200.0f; mDist = 0.03f; @@ -13,9 +14,8 @@ CameraFooFighter::CameraFooFighter(const char *pName) : Camera(pName) { } CameraFooFighter::~CameraFooFighter() { - } -CamTranslatorBase *CameraFooFighter::createTranslator() { +CamTranslatorBase* CameraFooFighter::createTranslator() { return new CamTranslatorFooFighter(this); } diff --git a/src/Game/Camera/CameraFooFighterPlanet.cpp b/src/Game/Camera/CameraFooFighterPlanet.cpp index a00fd0e51..854ece1b8 100644 --- a/src/Game/Camera/CameraFooFighterPlanet.cpp +++ b/src/Game/Camera/CameraFooFighterPlanet.cpp @@ -1,16 +1,16 @@ #include "Game/Camera/CameraFooFighterPlanet.hpp" #include "Game/Camera/CamTranslatorFooFighterPlanet.hpp" -CameraFooFighterPlanet::CameraFooFighterPlanet(const char *pName) : Camera(pName) { +CameraFooFighterPlanet::CameraFooFighterPlanet(const char* pName) + : Camera(pName) { mAxisX = 500.0f; mAxisY = 2000.0f; mAngleA = 0.7853982f; } CameraFooFighterPlanet::~CameraFooFighterPlanet() { - } -CamTranslatorBase *CameraFooFighterPlanet::createTranslator() { +CamTranslatorBase* CameraFooFighterPlanet::createTranslator() { return new CamTranslatorFooFighterPlanet(this); } diff --git a/src/Game/Camera/CameraFrontAndBack.cpp b/src/Game/Camera/CameraFrontAndBack.cpp index e2cef7cbf..5d40db207 100644 --- a/src/Game/Camera/CameraFrontAndBack.cpp +++ b/src/Game/Camera/CameraFrontAndBack.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraFrontAndBack.hpp" #include "Game/Camera/CamTranslatorFrontAndBack.hpp" -CameraFrontAndBack::CameraFrontAndBack(const char *pName) : Camera(pName) { +CameraFrontAndBack::CameraFrontAndBack(const char* pName) + : Camera(pName) { mWPoint.x = 0.0f; mWPoint.y = 0.0f; mWPoint.z = 0.0f; @@ -14,9 +15,8 @@ CameraFrontAndBack::CameraFrontAndBack(const char *pName) : Camera(pName) { } CameraFrontAndBack::~CameraFrontAndBack() { - } -CamTranslatorBase *CameraFrontAndBack::createTranslator() { +CamTranslatorBase* CameraFrontAndBack::createTranslator() { return new CamTranslatorFrontAndBack(this); } diff --git a/src/Game/Camera/CameraGround.cpp b/src/Game/Camera/CameraGround.cpp index ad306458f..efb70988c 100644 --- a/src/Game/Camera/CameraGround.cpp +++ b/src/Game/Camera/CameraGround.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraGround.hpp" #include "Game/Camera/CamTranslatorGround.hpp" -CameraGround::CameraGround(const char *pName) : Camera(pName) { +CameraGround::CameraGround(const char* pName) + : Camera(pName) { mAngleA = 0.0f; mAngleB = 0.0f; mDist = 1000.0f; @@ -15,9 +16,8 @@ CameraGround::CameraGround(const char *pName) : Camera(pName) { } CameraGround::~CameraGround() { - } -CamTranslatorBase *CameraGround::createTranslator() { +CamTranslatorBase* CameraGround::createTranslator() { return new CamTranslatorGround(this); } \ No newline at end of file diff --git a/src/Game/Camera/CameraHeightArrange.cpp b/src/Game/Camera/CameraHeightArrange.cpp index bb6249694..63fada706 100644 --- a/src/Game/Camera/CameraHeightArrange.cpp +++ b/src/Game/Camera/CameraHeightArrange.cpp @@ -11,7 +11,8 @@ bool CameraTargetObj::isFastRise() const { return false; } -CameraHeightArrange::CameraHeightArrange(Camera *pCamera) : NameObj("CameraHeightArrange") { +CameraHeightArrange::CameraHeightArrange(Camera* pCamera) + : NameObj("CameraHeightArrange") { mCamera = pCamera; _10 = 0; _11 = 0; @@ -23,7 +24,7 @@ CameraHeightArrange::CameraHeightArrange(Camera *pCamera) : NameObj("CameraHeigh _30 = 0.0f; _34 = 0.0f; _38 = 0.0f; - _3C = 0.0f; + _3C = 0.0f; _40 = 0; _44 = 0; _4C = 0; @@ -86,7 +87,7 @@ void CameraHeightArrange::chase() { if (fVar1 > 1.0f) { fVar1 = 1.0f; } - + if (fVar1 > 0.5f) { _5C = 0; } @@ -96,12 +97,11 @@ void CameraHeightArrange::chase() { void CameraHeightArrange::updateHeightAndOffset() { TVec3f globalAxis = *getGlobalAxis(); - f32 fVar1; + f32 fVar1; if (mVPanUse != 0) { fVar1 = 0.05f; - } - else { + } else { fVar1 = 1.0f; } @@ -115,12 +115,12 @@ void CameraHeightArrange::updateHeightAndOffset() { #ifdef NON_MATCHING // Float operation order -TVec3f *CameraHeightArrange::getGlobalAxis() { +TVec3f* CameraHeightArrange::getGlobalAxis() { if (_60 != 0) { _60 = 0; - + mGlobalAxis.set(mVPanAxis); - TMtx34f &matrix = mCamera->mZoneMatrix; + TMtx34f& matrix = mCamera->mZoneMatrix; f32 axisX = mGlobalAxis.x; f32 axisY = mGlobalAxis.y; @@ -129,8 +129,7 @@ TVec3f *CameraHeightArrange::getGlobalAxis() { mGlobalAxis.set( axisZ * matrix.mMtx[0][2] + axisX * matrix.mMtx[0][0] + axisY * matrix.mMtx[0][1], axisZ * matrix.mMtx[1][2] + axisX * matrix.mMtx[1][0] + axisY * matrix.mMtx[1][1], - axisZ * matrix.mMtx[2][2] + axisX * matrix.mMtx[2][0] + axisY * matrix.mMtx[2][1] - ); + axisZ * matrix.mMtx[2][2] + axisX * matrix.mMtx[2][0] + axisY * matrix.mMtx[2][1]); } return &mGlobalAxis; diff --git a/src/Game/Camera/CameraHolder.cpp b/src/Game/Camera/CameraHolder.cpp index 86faf7943..87f58c4aa 100644 --- a/src/Game/Camera/CameraHolder.cpp +++ b/src/Game/Camera/CameraHolder.cpp @@ -48,310 +48,309 @@ #include struct CameraTableEntry { - const char *mName; // 0x0 - const char *mJapaneseDescription; // 0x4 - Camera* (*mCreateFunction)(void); // 0x8 + const char* mName; // 0x0 + const char* mJapaneseDescription; // 0x4 + Camera* (*mCreateFunction)(void); // 0x8 u8 _C; u8 _D[3]; }; namespace { - const char *gDefaultCameraName = "CAM_TYPE_XZ_PARA"; + const char* gDefaultCameraName = "CAM_TYPE_XZ_PARA"; - template - Camera *createCamera(); + template + Camera* createCamera(); - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraParallel("平行カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraTower("塔カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraFollow("フォローカメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraWonderPlanet("ワンダープラネットカメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraFix("完全固定カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraFixedPoint("定点カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraBehind("後方カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraInwardTower("塔内部カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraFixedThere("その場定点カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraTripodBoss("三脚ボスカメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraTowerPos("塔カメラ（サブターゲット付き）"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraTripodPlanet("三脚惑星カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraDead("通常死亡カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraInwardSphere("球内部カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraRailDemo("レールデモカメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraRailFollow("レールフォローカメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraTripodBossJoint("三脚ボス関節カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraCharmedTripodBoss("三脚ボスジョイント注視カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraObjParallel("オブジェ並行カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraCharmedFix("サンボカメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraGround("地面カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraTrundle("トランドルカメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraCubePlanet("キューブ惑星カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraInnerCylinder("CameraInnerCylinder"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraSpiral("螺旋カメラ（デモ用）"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraTalk("会話カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraMtxRegParallel("マトリクスレジスタ並行カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraCharmedVecReg("ベクトルレジスタ注目カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraMedianPlanet("中点注目プラネットカメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraTwistedPassage("ねじれ回廊カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraMedianTower("中点塔カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraCharmedVecRegTower("CameraCharmedVecRegTower"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraFrontAndBack("表裏カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraRaceFollow("CameraRaceFollow"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraSlide("スライドカメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraFooFighter("フーファイター"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraFooFighterPlanet("フーファイタープラネットカメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraBlackHole("ブラックホールカメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraAnim("アニメーションカメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraDPD("DPD操作カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraWaterFollow("水中フォロー"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraWaterPlanet("水中プラネット"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraWaterPlanetBoss("水中プラネットボス"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraRailWatch("レール注目カメラ"); } - template<> - Camera *createCamera() { + template <> + Camera* createCamera() { return new CameraSubjective("主観カメラ"); } - #define NR_CAMERA_TYPES 45 +#define NR_CAMERA_TYPES 45 CameraTableEntry gCameraTable[NR_CAMERA_TYPES] = { - { "CAM_TYPE_XZ_PARA", "並行", createCamera, 1 }, - { "CAM_TYPE_TOWER", "塔", createCamera, 1 }, - { "CAM_TYPE_FOLLOW", "フォロー", createCamera, 1 }, - { "CAM_TYPE_WONDER_PLANET", "プラネット", createCamera, 1 }, - { "CAM_TYPE_POINT_FIX", "完全固定", createCamera, 1 }, - { "CAM_TYPE_EYEPOS_FIX", "定点", createCamera, 1 }, - { "CAM_TYPE_SLIDER", "スライダー", createCamera, 1 }, - { "CAM_TYPE_INWARD_TOWER", "塔内部", createCamera, 1 }, - { "CAM_TYPE_EYEPOS_FIX_THER", "その場定点", createCamera, 1 }, - { "CAM_TYPE_TRIPOD_BOSS", "三脚ボス", createCamera, 1 }, - { "CAM_TYPE_TOWER_POS", "塔（サブターゲット付き）", createCamera, 1 }, - { "CAM_TYPE_TRIPOD_PLANET", "三脚惑星", createCamera, 1 }, - { "CAM_TYPE_DEAD", "通常死亡", createCamera, 1 }, - { "CAM_TYPE_INWARD_SPHERE", "球内部", createCamera, 1 }, - { "CAM_TYPE_RAIL_DEMO", "レールデモ", createCamera, 1 }, - { "CAM_TYPE_RAIL_FOLLOW", "レールフォロー", createCamera, 1 }, - { "CAM_TYPE_TRIPOD_BOSS_JOINT", "三脚ボスジョイント", createCamera, 1 }, - { "CAM_TYPE_CHARMED_TRIPOD_BOSS", "三脚ボスジョイント注視", createCamera, 1 }, - { "CAM_TYPE_OBJ_PARALLEL", "オブジェ並行", createCamera, 1 }, - { "CAM_TYPE_CHARMED_FIX", "サンボ", createCamera, 1 }, - { "CAM_TYPE_GROUND", "地面", createCamera, 1 }, - { "CAM_TYPE_TRUNDLE", "トランドル", createCamera, 1 }, - { "CAM_TYPE_CUBE_PLANET", "キューブ惑星", createCamera, 1 }, - { "CAM_TYPE_INNER_CYLINDER", "円筒内部", createCamera, 1 }, - { "CAM_TYPE_SPIRAL_DEMO", "螺旋デモ", createCamera, 1 }, - { "CAM_TYPE_TALK", "会話", createCamera, 1 }, - { "CAM_TYPE_MTXREG_PARALLEL", "マトリクスレジスタ並行", createCamera, 1 }, - { "CAM_TYPE_CHARMED_VECREG", "ベクトルレジスタ注目", createCamera, 1 }, - { "CAM_TYPE_MEDIAN_PLANET", "中点注目プラネット", createCamera, 1 }, - { "CAM_TYPE_TWISTED_PASSAGE", "ねじれ回廊", createCamera, 1 }, - { "CAM_TYPE_MEDIAN_TOWER", "中点塔カメラ", createCamera, 1 }, - { "CAM_TYPE_CHARMED_VECREG_TOWER", "VecReg角度補正塔カメラ", createCamera, 1 }, - { "CAM_TYPE_FRONT_AND_BACK", "表裏カメラ", createCamera, 1 }, - { "CAM_TYPE_RACE_FOLLOW", "レース用フォロー", createCamera, 1 }, - { "CAM_TYPE_2D_SLIDE", "２Ｄスライド", createCamera, 1 }, - { "CAM_TYPE_FOO_FIGHTER", "フーファイター", createCamera, 1 }, - { "CAM_TYPE_FOO_FIGHTER_PLANET", "フーファイタープラネット", createCamera, 1 }, - { "CAM_TYPE_BLACK_HOLE", "ブラックホール", createCamera, 0 }, - { "CAM_TYPE_ANIM", "アニメ", createCamera, 0 }, - { "CAM_TYPE_DPD", "ＤＰＤ", createCamera, 1 }, - { "CAM_TYPE_WATER_FOLLOW", "水中フォロー", createCamera, 1 }, - { "CAM_TYPE_WATER_PLANET", "水中プラネット", createCamera, 1 }, - { "CAM_TYPE_WATER_PLANET_BOSS", "水中プラネットボス", createCamera, 1 }, - { "CAM_TYPE_RAIL_WATCH", "レール注目", createCamera, 1 }, - { "CAM_TYPE_SUBJECTIVE", "主観", createCamera, 1 } - }; -} + {"CAM_TYPE_XZ_PARA", "並行", createCamera, 1}, + {"CAM_TYPE_TOWER", "塔", createCamera, 1}, + {"CAM_TYPE_FOLLOW", "フォロー", createCamera, 1}, + {"CAM_TYPE_WONDER_PLANET", "プラネット", createCamera, 1}, + {"CAM_TYPE_POINT_FIX", "完全固定", createCamera, 1}, + {"CAM_TYPE_EYEPOS_FIX", "定点", createCamera, 1}, + {"CAM_TYPE_SLIDER", "スライダー", createCamera, 1}, + {"CAM_TYPE_INWARD_TOWER", "塔内部", createCamera, 1}, + {"CAM_TYPE_EYEPOS_FIX_THER", "その場定点", createCamera, 1}, + {"CAM_TYPE_TRIPOD_BOSS", "三脚ボス", createCamera, 1}, + {"CAM_TYPE_TOWER_POS", "塔（サブターゲット付き）", createCamera, 1}, + {"CAM_TYPE_TRIPOD_PLANET", "三脚惑星", createCamera, 1}, + {"CAM_TYPE_DEAD", "通常死亡", createCamera, 1}, + {"CAM_TYPE_INWARD_SPHERE", "球内部", createCamera, 1}, + {"CAM_TYPE_RAIL_DEMO", "レールデモ", createCamera, 1}, + {"CAM_TYPE_RAIL_FOLLOW", "レールフォロー", createCamera, 1}, + {"CAM_TYPE_TRIPOD_BOSS_JOINT", "三脚ボスジョイント", createCamera, 1}, + {"CAM_TYPE_CHARMED_TRIPOD_BOSS", "三脚ボスジョイント注視", createCamera, 1}, + {"CAM_TYPE_OBJ_PARALLEL", "オブジェ並行", createCamera, 1}, + {"CAM_TYPE_CHARMED_FIX", "サンボ", createCamera, 1}, + {"CAM_TYPE_GROUND", "地面", createCamera, 1}, + {"CAM_TYPE_TRUNDLE", "トランドル", createCamera, 1}, + {"CAM_TYPE_CUBE_PLANET", "キューブ惑星", createCamera, 1}, + {"CAM_TYPE_INNER_CYLINDER", "円筒内部", createCamera, 1}, + {"CAM_TYPE_SPIRAL_DEMO", "螺旋デモ", createCamera, 1}, + {"CAM_TYPE_TALK", "会話", createCamera, 1}, + {"CAM_TYPE_MTXREG_PARALLEL", "マトリクスレジスタ並行", createCamera, 1}, + {"CAM_TYPE_CHARMED_VECREG", "ベクトルレジスタ注目", createCamera, 1}, + {"CAM_TYPE_MEDIAN_PLANET", "中点注目プラネット", createCamera, 1}, + {"CAM_TYPE_TWISTED_PASSAGE", "ねじれ回廊", createCamera, 1}, + {"CAM_TYPE_MEDIAN_TOWER", "中点塔カメラ", createCamera, 1}, + {"CAM_TYPE_CHARMED_VECREG_TOWER", "VecReg角度補正塔カメラ", createCamera, 1}, + {"CAM_TYPE_FRONT_AND_BACK", "表裏カメラ", createCamera, 1}, + {"CAM_TYPE_RACE_FOLLOW", "レース用フォロー", createCamera, 1}, + {"CAM_TYPE_2D_SLIDE", "２Ｄスライド", createCamera, 1}, + {"CAM_TYPE_FOO_FIGHTER", "フーファイター", createCamera, 1}, + {"CAM_TYPE_FOO_FIGHTER_PLANET", "フーファイタープラネット", createCamera, 1}, + {"CAM_TYPE_BLACK_HOLE", "ブラックホール", createCamera, 0}, + {"CAM_TYPE_ANIM", "アニメ", createCamera, 0}, + {"CAM_TYPE_DPD", "ＤＰＤ", createCamera, 1}, + {"CAM_TYPE_WATER_FOLLOW", "水中フォロー", createCamera, 1}, + {"CAM_TYPE_WATER_PLANET", "水中プラネット", createCamera, 1}, + {"CAM_TYPE_WATER_PLANET_BOSS", "水中プラネットボス", createCamera, 1}, + {"CAM_TYPE_RAIL_WATCH", "レール注目", createCamera, 1}, + {"CAM_TYPE_SUBJECTIVE", "主観", createCamera, 1}}; +} // namespace -CameraHolder::CameraHolder(const char *pName) : NameObj(pName) { +CameraHolder::CameraHolder(const char* pName) + : NameObj(pName) { createCameras(); mDefaultCameraIndex = getIndexOf(gDefaultCameraName); mDefaultTranslator = mTranslators[mDefaultCameraIndex]; } CameraHolder::~CameraHolder() { - } -CamTranslatorBase *CameraHolder::getTranslator(s32 index) { +CamTranslatorBase* CameraHolder::getTranslator(s32 index) { return mTranslators[index]; } -s32 CameraHolder::getIndexOf(const char *pName) const { +s32 CameraHolder::getIndexOf(const char* pName) const { for (s32 i = 0; i < NR_CAMERA_TYPES; i++) { if (strcmp(pName, gCameraTable[i].mName) == 0) { return i; @@ -361,7 +360,7 @@ s32 CameraHolder::getIndexOf(const char *pName) const { return -1; } -Camera *CameraHolder::getDefaultCamera() { +Camera* CameraHolder::getDefaultCamera() { return mCameras[mDefaultCameraIndex]; } @@ -369,7 +368,7 @@ s32 CameraHolder::getIndexOfDefault() const { return mDefaultCameraIndex; } -s32 CameraHolder::getIndexOf(Camera *pCamera) const { +s32 CameraHolder::getIndexOf(Camera* pCamera) const { for (s32 i = 0; i < NR_CAMERA_TYPES; i++) { if (mCameras[i] == pCamera) { return i; @@ -380,8 +379,8 @@ s32 CameraHolder::getIndexOf(Camera *pCamera) const { } void CameraHolder::createCameras() { - mCameras = new Camera *[NR_CAMERA_TYPES]; - mTranslators = new CamTranslatorBase *[NR_CAMERA_TYPES]; + mCameras = new Camera*[NR_CAMERA_TYPES]; + mTranslators = new CamTranslatorBase*[NR_CAMERA_TYPES]; for (s32 i = 0; i < NR_CAMERA_TYPES; i++) { mCameras[i] = gCameraTable[i].mCreateFunction(); @@ -389,6 +388,6 @@ void CameraHolder::createCameras() { } } -Camera *CameraHolder::getCameraInner(s32 index) const { +Camera* CameraHolder::getCameraInner(s32 index) const { return mCameras[index]; } \ No newline at end of file diff --git a/src/Game/Camera/CameraInnerCylinder.cpp b/src/Game/Camera/CameraInnerCylinder.cpp index c249f0c5c..00c7dfaad 100644 --- a/src/Game/Camera/CameraInnerCylinder.cpp +++ b/src/Game/Camera/CameraInnerCylinder.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraInnerCylinder.hpp" #include "Game/Camera/CamTranslatorInnerCylinder.hpp" -CameraInnerCylinder::CameraInnerCylinder(const char *pName) : Camera(pName) { +CameraInnerCylinder::CameraInnerCylinder(const char* pName) + : Camera(pName) { mWPoint.x = 0.0f; mWPoint.y = 0.0f; mWPoint.z = 0.0f; @@ -18,9 +19,8 @@ CameraInnerCylinder::CameraInnerCylinder(const char *pName) : Camera(pName) { } CameraInnerCylinder::~CameraInnerCylinder() { - } -CamTranslatorBase *CameraInnerCylinder::createTranslator() { +CamTranslatorBase* CameraInnerCylinder::createTranslator() { return new CamTranslatorInnerCylinder(this); } diff --git a/src/Game/Camera/CameraInwardSphere.cpp b/src/Game/Camera/CameraInwardSphere.cpp index 91158c5a6..21bb09d74 100644 --- a/src/Game/Camera/CameraInwardSphere.cpp +++ b/src/Game/Camera/CameraInwardSphere.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraInwardSphere.hpp" #include "Game/Camera/CamTranslatorInwardSphere.hpp" -CameraInwardSphere::CameraInwardSphere(const char *pName) : Camera(pName) { +CameraInwardSphere::CameraInwardSphere(const char* pName) + : Camera(pName) { mDist = 1500.0f; mAngleA = 500.0f; mAngleB = 300.0f; @@ -14,9 +15,8 @@ CameraInwardSphere::CameraInwardSphere(const char *pName) : Camera(pName) { } CameraInwardSphere::~CameraInwardSphere() { - } -CamTranslatorBase *CameraInwardSphere::createTranslator() { +CamTranslatorBase* CameraInwardSphere::createTranslator() { return new CamTranslatorInwardSphere(this); } diff --git a/src/Game/Camera/CameraInwardTower.cpp b/src/Game/Camera/CameraInwardTower.cpp index 79e139ce6..d5add117d 100644 --- a/src/Game/Camera/CameraInwardTower.cpp +++ b/src/Game/Camera/CameraInwardTower.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraInwardTower.hpp" #include "Game/Camera/CamTranslatorInwardTower.hpp" -CameraInwardTower::CameraInwardTower(const char *pName) : Camera(pName) { +CameraInwardTower::CameraInwardTower(const char* pName) + : Camera(pName) { mWPoint.x = 0.0f; mWPoint.y = 0.0f; mWPoint.z = 0.0f; @@ -21,9 +22,8 @@ CameraInwardTower::CameraInwardTower(const char *pName) : Camera(pName) { } CameraInwardTower::~CameraInwardTower() { - } -CamTranslatorBase *CameraInwardTower::createTranslator() { +CamTranslatorBase* CameraInwardTower::createTranslator() { return new CamTranslatorInwardTower(this); } diff --git a/src/Game/Camera/CameraMan.cpp b/src/Game/Camera/CameraMan.cpp index ca9c7b5f0..3f2daaa52 100644 --- a/src/Game/Camera/CameraMan.cpp +++ b/src/Game/Camera/CameraMan.cpp @@ -2,7 +2,8 @@ #include "Game/Camera/CameraMan.hpp" #include "Game/Camera/CameraPoseParam.hpp" -CameraMan::CameraMan(const char *pName) : NameObj(pName) { +CameraMan::CameraMan(const char* pName) + : NameObj(pName) { mDirector = nullptr; mPoseParam = new CameraPoseParam(); mIsActivated = false; @@ -10,8 +11,7 @@ CameraMan::CameraMan(const char *pName) : NameObj(pName) { mMatrix.identity(); } -void CameraMan::init(const JMapInfoIter &rIter) { - +void CameraMan::init(const JMapInfoIter& rIter) { } void CameraMan::movement() { @@ -22,31 +22,28 @@ void CameraMan::movement() { } void CameraMan::calc() { - } void CameraMan::notifyActivate() { - } void CameraMan::notifyDeactivate() { - } -void CameraMan::owned(CameraDirector *pDirector) { +void CameraMan::owned(CameraDirector* pDirector) { mDirector = pDirector; } -void CameraMan::released(CameraDirector *pDirector) { +void CameraMan::released(CameraDirector* pDirector) { mDirector = nullptr; } -void CameraMan::activate(CameraDirector *pDirector) { +void CameraMan::activate(CameraDirector* pDirector) { mIsActivated = true; notifyActivate(); } -void CameraMan::deactivate(CameraDirector *pDirector) { +void CameraMan::deactivate(CameraDirector* pDirector) { mIsActivated = false; notifyDeactivate(); } \ No newline at end of file diff --git a/src/Game/Camera/CameraManEvent.cpp b/src/Game/Camera/CameraManEvent.cpp index 9568c6372..75725b243 100644 --- a/src/Game/Camera/CameraManEvent.cpp +++ b/src/Game/Camera/CameraManEvent.cpp @@ -10,7 +10,7 @@ #include "Game/Util/CameraUtil.hpp" #ifdef NON_MATCHING -// Constructor for mTargetArg is called. The constructor exists in the symbol so +// Constructor for mTargetArg is called. The constructor exists in the symbol so // it's not fully inlined. It also exists in the code (not inlined), but the code below // matches the constructor exactly. CameraManEvent::ChunkFIFOItem::ChunkFIFOItem() { @@ -21,8 +21,8 @@ CameraManEvent::ChunkFIFOItem::ChunkFIFOItem() { } #endif -CameraManEvent::CameraManEvent(CameraHolder *pHolder, CameraParamChunkHolder *pChunkHolder, const char *pName) : - CameraMan(pName), mHolder(pHolder), mChunkHolder(pChunkHolder), mCamera(nullptr) { +CameraManEvent::CameraManEvent(CameraHolder* pHolder, CameraParamChunkHolder* pChunkHolder, const char* pName) + : CameraMan(pName), mHolder(pHolder), mChunkHolder(pChunkHolder), mCamera(nullptr) { mChunk = nullptr; _B8 = 0; _BC = false; @@ -34,11 +34,9 @@ CameraManEvent::CameraManEvent(CameraHolder *pHolder, CameraParamChunkHolder *pC } CameraManEvent::~CameraManEvent() { - } -void CameraManEvent::init(const JMapInfoIter &rIter) { - +void CameraManEvent::init(const JMapInfoIter& rIter) { } void CameraManEvent::calc() { @@ -46,7 +44,7 @@ void CameraManEvent::calc() { applyChunk(); changeCamera(); resetCameraIfRequested(); - CameraTargetObj *target = mCamera->calc(); + CameraTargetObj* target = mCamera->calc(); CameraLocalUtil::setUsedTarget(this, target); setSafePose(); } @@ -101,14 +99,14 @@ bool CameraManEvent::isCorrectingErpPositionOff() const { return off; } -void CameraManEvent::start(s32 zoneID, const char *pName, const CameraTargetArg &rTargetArg, s32 a4) { - CameraParamChunkEvent *chunk = findChunk(zoneID, pName); +void CameraManEvent::start(s32 zoneID, const char* pName, const CameraTargetArg& rTargetArg, s32 a4) { + CameraParamChunkEvent* chunk = findChunk(zoneID, pName); requestChunk(chunk, static_cast(chunk->mEvPriority), rTargetArg, a4); rTargetArg.setTarget(); } -void CameraManEvent::end(s32 zoneID, const char *pName, s32 a3) { - CameraParamChunkEvent *chunk = findChunk(zoneID, pName); +void CameraManEvent::end(s32 zoneID, const char* pName, s32 a3) { + CameraParamChunkEvent* chunk = findChunk(zoneID, pName); searchPriority(chunk); if (cleanChunkFIFO(chunk)) { @@ -121,12 +119,12 @@ void CameraManEvent::end(s32 zoneID, const char *pName, s32 a3) { } } -bool CameraManEvent::isEventActive(s32 zoneID, const char *pName) const { +bool CameraManEvent::isEventActive(s32 zoneID, const char* pName) const { if (mCamera != nullptr) { CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); chunkID.createEventID(zoneID, pName); - CameraParamChunkEvent *chunk = reinterpret_cast(mChunkHolder->getChunk(chunkID)); + CameraParamChunkEvent* chunk = reinterpret_cast(mChunkHolder->getChunk(chunkID)); // Nice loop, probably they wanted i-- for (s32 i = NR_FIFO_ITEMS - 1; i >= 0; i++) { @@ -148,14 +146,14 @@ bool CameraManEvent::isActive() const { } bool CameraManEvent::doesNextChunkHaveInterpolation() const { - const ChunkFIFOItem *item = nullptr; + const ChunkFIFOItem* item = nullptr; for (u32 i = 0; i < NR_FIFO_ITEMS; i++) { if (mItems[i].mSecond.mChunk != nullptr) { item = &mItems[i].mSecond; break; } - + if (mItems[i].mFirst.mChunk != nullptr) { break; } @@ -168,30 +166,30 @@ bool CameraManEvent::doesNextChunkHaveInterpolation() const { return false; } -u32 CameraManEvent::getAnimCameraFrame(s32 zoneID, const char *pName) const { +u32 CameraManEvent::getAnimCameraFrame(s32 zoneID, const char* pName) const { mHolder->getIndexOf("CAM_TYPE_ANIM"); - CameraParamChunkEvent *chunk = findChunk(zoneID, pName); - CamTranslatorAnim *translator = reinterpret_cast(mHolder->getTranslator(chunk->mCameraTypeIndex)); + CameraParamChunkEvent* chunk = findChunk(zoneID, pName); + CamTranslatorAnim* translator = reinterpret_cast(mHolder->getTranslator(chunk->mCameraTypeIndex)); return translator->getAnimFrame(chunk); } -void CameraManEvent::pauseOnAnimCamera(s32 zoneID, const char *pName) { +void CameraManEvent::pauseOnAnimCamera(s32 zoneID, const char* pName) { mHolder->getIndexOf("CAM_TYPE_ANIM"); - CameraParamChunkEvent *chunk = findChunk(zoneID, pName); + CameraParamChunkEvent* chunk = findChunk(zoneID, pName); if (chunk == mChunk && mCamera != nullptr) { - CameraAnim *animCamera = reinterpret_cast(mCamera); + CameraAnim* animCamera = reinterpret_cast(mCamera); animCamera->_7C = 1; } } -void CameraManEvent::pauseOffAnimCamera(s32 zoneID, const char *pName) { +void CameraManEvent::pauseOffAnimCamera(s32 zoneID, const char* pName) { mHolder->getIndexOf("CAM_TYPE_ANIM"); - CameraParamChunkEvent *chunk = findChunk(zoneID, pName); + CameraParamChunkEvent* chunk = findChunk(zoneID, pName); if (chunk == mChunk && mCamera != nullptr) { - CameraAnim *animCamera = reinterpret_cast(mCamera); + CameraAnim* animCamera = reinterpret_cast(mCamera); animCamera->_7C = 0; } } @@ -200,19 +198,19 @@ void CameraManEvent::pauseOffAnimCamera(s32 zoneID, const char *pName) { // LWZ wrong instruction order, register mismatch void CameraManEvent::updateChunkFIFO() { for (u32 i = 0; i < NR_FIFO_ITEMS; i++) { - CameraParamChunkEvent *chunk = mItems[i].mSecond.mChunk; + CameraParamChunkEvent* chunk = mItems[i].mSecond.mChunk; if (chunk != nullptr) { mItems[i].mFirst.mChunk = chunk; - CameraTargetMtx *mtx = mItems[i].mSecond.mTargetArg.mTargetMtx; - CameraTargetObj *obj = mItems[i].mSecond.mTargetArg.mTargetObj; + CameraTargetMtx* mtx = mItems[i].mSecond.mTargetArg.mTargetMtx; + CameraTargetObj* obj = mItems[i].mSecond.mTargetArg.mTargetObj; mItems[i].mFirst.mTargetArg.mTargetObj = obj; mItems[i].mFirst.mTargetArg.mTargetMtx = mtx; - const LiveActor *liveActor = mItems[i].mSecond.mTargetArg.mLiveActor; - MarioActor *marioActor = mItems[i].mSecond.mTargetArg.mMarioActor; + const LiveActor* liveActor = mItems[i].mSecond.mTargetArg.mLiveActor; + MarioActor* marioActor = mItems[i].mSecond.mTargetArg.mMarioActor; mItems[i].mFirst.mTargetArg.mLiveActor = liveActor; mItems[i].mFirst.mTargetArg.mMarioActor = marioActor; @@ -226,7 +224,7 @@ void CameraManEvent::updateChunkFIFO() { #endif void CameraManEvent::applyChunk() { - ChunkFIFOItem *item = nullptr; + ChunkFIFOItem* item = nullptr; for (u32 i = 0; i < NR_FIFO_ITEMS; i++) { if (mItems[i].mFirst.mChunk != nullptr) { @@ -239,15 +237,14 @@ void CameraManEvent::applyChunk() { mChunk = item->mChunk; } -void CameraManEvent::checkReset(ChunkFIFOItem *pItem) { - CameraParamChunkEvent *itemChunk = pItem->mChunk; +void CameraManEvent::checkReset(ChunkFIFOItem* pItem) { + CameraParamChunkEvent* itemChunk = pItem->mChunk; - if (mChunk != itemChunk) { + if (mChunk != itemChunk) { _BC = true; sendStartInterpolateFrame(pItem->mChunk, pItem->_14); pItem->mTargetArg.setTarget(); - } - else { + } else { u8 cameraIndex = itemChunk->mCameraTypeIndex; if (cameraIndex != mHolder->getIndexOf(mCamera)) { @@ -258,7 +255,7 @@ void CameraManEvent::checkReset(ChunkFIFOItem *pItem) { void CameraManEvent::changeCamera() { mCamera = mHolder->getCameraInner(mChunk->mCameraTypeIndex); - CamTranslatorBase *translator = mHolder->getTranslator(mChunk->mCameraTypeIndex); + CamTranslatorBase* translator = mHolder->getTranslator(mChunk->mCameraTypeIndex); translator->setParam(mChunk); setExtraParam(); setVPanParam(); @@ -270,7 +267,7 @@ void CameraManEvent::setExtraParam() { CameraLocalUtil::setGlobalOffset(mCamera, mChunk->mExParam.mWOffset); - TVec3f *localOffset = CameraLocalUtil::getLocalOffset(this); + TVec3f* localOffset = CameraLocalUtil::getLocalOffset(this); CameraLocalUtil::setLocalOffset(mCamera, *localOffset); CameraLocalUtil::setFrontOffset(mCamera, mChunk->mExParam.mLOffset); @@ -278,16 +275,14 @@ void CameraManEvent::setExtraParam() { if (mChunk->isOnUseFovy()) { CameraLocalUtil::setFovy(mCamera, mChunk->mExParam.mFovy); - } - else { + } else { f32 fovy = mDirector->getDefaultFovy(); CameraLocalUtil::setFovy(mCamera, fovy); } if (mChunk->isLOfsErpOff()) { mCamera->mIsLOfsErpOff = true; - } - else { + } else { mCamera->mIsLOfsErpOff = false; } @@ -298,7 +293,7 @@ void CameraManEvent::setExtraParam() { // r0 nonsense void CameraManEvent::setVPanParam() { if (mCamera->mVPan != nullptr) { - CameraHeightArrange *vPan = mCamera->mVPan; + CameraHeightArrange* vPan = mCamera->mVPan; vPan->resetParameter(); vPan->mUpper = mChunk->mExParam.mUpper; @@ -315,7 +310,7 @@ void CameraManEvent::setVPanParam() { mChunk->getVPanAxis(&axis); vPan->mVPanAxis.set(axis); - + vPan->_60 = 1; } } @@ -345,14 +340,14 @@ void CameraManEvent::resetCameraIfRequested() { } }*/ -CameraParamChunkEvent *CameraManEvent::findChunk(s32 zoneID, const char *pName) const { +CameraParamChunkEvent* CameraManEvent::findChunk(s32 zoneID, const char* pName) const { CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); chunkID.createEventID(zoneID, pName); - return reinterpret_cast(mChunkHolder->getChunk(chunkID)); + return reinterpret_cast(mChunkHolder->getChunk(chunkID)); } -void CameraManEvent::requestChunk(CameraParamChunkEvent *pChunk, EPriority priority, const CameraTargetArg &rArg, s32 a4) { +void CameraManEvent::requestChunk(CameraParamChunkEvent* pChunk, EPriority priority, const CameraTargetArg& rArg, s32 a4) { mItems[priority].mSecond.mChunk = pChunk; mItems[priority].mSecond.mTargetArg.mTargetObj = rArg.mTargetObj; mItems[priority].mSecond.mTargetArg.mTargetMtx = rArg.mTargetMtx; @@ -361,7 +356,7 @@ void CameraManEvent::requestChunk(CameraParamChunkEvent *pChunk, EPriority prior mItems[priority].mSecond._14 = a4; } -bool CameraManEvent::cleanChunkFIFO(CameraParamChunk *pChunk) { +bool CameraManEvent::cleanChunkFIFO(CameraParamChunk* pChunk) { s32 nr = 0; for (u32 i = 0; i < NR_FIFO_ITEMS; i++) { @@ -398,8 +393,8 @@ bool CameraManEvent::isChunkFIFOEmpty() const { return true; } -void CameraManEvent::sendStartInterpolateFrame(CameraParamChunkEvent *pChunk, s32 a2) { - u32 frames = getInterpolateFrame(pChunk, a2); +void CameraManEvent::sendStartInterpolateFrame(CameraParamChunkEvent* pChunk, s32 a2) { + u32 frames = getInterpolateFrame(pChunk, a2); if (frames == 0) { _15 = 1; @@ -408,38 +403,37 @@ void CameraManEvent::sendStartInterpolateFrame(CameraParamChunkEvent *pChunk, s3 mDirector->setInterpolation(frames); } -s32 CameraManEvent::getInterpolateFrame(CameraParamChunkEvent *pChunk, s32 a2) const { +s32 CameraManEvent::getInterpolateFrame(CameraParamChunkEvent* pChunk, s32 a2) const { s32 frames = -1; if (pChunk->mEnableErpFrame != 0) { frames = pChunk->mExParam.mCamInt; } - + if (frames < 0 && a2 >= 0) { frames = a2; } - + if (frames < 0) { frames = 60; } - + return frames; } -void CameraManEvent::sendFinishInterpolateFrame(CameraParamChunkEvent *pChunk, s32 a2) { +void CameraManEvent::sendFinishInterpolateFrame(CameraParamChunkEvent* pChunk, s32 a2) { s32 frames = -1; if (pChunk->mEnableEndErpFrame) { frames = pChunk->mCamEndInt; - } - else if (pChunk->mEnableErpFrame) { + } else if (pChunk->mEnableErpFrame) { frames = pChunk->mExParam.mCamInt; } - + if (frames < 0 && a2 >= 0) { frames = a2; } - + if (frames < 0) { frames = 60; } @@ -447,7 +441,7 @@ void CameraManEvent::sendFinishInterpolateFrame(CameraParamChunkEvent *pChunk, s mDirector->setInterpolation(frames); } -s32 CameraManEvent::searchPriority(CameraParamChunk *pChunk) const { +s32 CameraManEvent::searchPriority(CameraParamChunk* pChunk) const { s32 i; for (i = 0; i < NR_FIFO_ITEMS; i++) { @@ -463,7 +457,7 @@ s32 CameraManEvent::searchPriority(CameraParamChunk *pChunk) const { return i; } -bool CameraManEvent::isInFIFO(CameraParamChunk *pChunk) const { +bool CameraManEvent::isInFIFO(CameraParamChunk* pChunk) const { for (u32 i = 0; i < NR_FIFO_ITEMS; i++) { if (mItems[i].mFirst.mChunk == pChunk || mItems[i].mSecond.mChunk == pChunk) { return true; @@ -473,15 +467,14 @@ bool CameraManEvent::isInFIFO(CameraParamChunk *pChunk) const { return false; } -bool CameraManEvent::isAnimCameraEnd(s32 zoneID, const char *pName) const { +bool CameraManEvent::isAnimCameraEnd(s32 zoneID, const char* pName) const { mHolder->getIndexOf("CAM_TYPE_ANIM"); - CameraParamChunkEvent *chunk = findChunk(zoneID, pName); + CameraParamChunkEvent* chunk = findChunk(zoneID, pName); if (isInFIFO(chunk)) { if (chunk == mChunk && mCamera != nullptr) { - return reinterpret_cast(mCamera)->isAnimEnd(); - } - else { + return reinterpret_cast(mCamera)->isAnimEnd(); + } else { return false; } } diff --git a/src/Game/Camera/CameraManGame.cpp b/src/Game/Camera/CameraManGame.cpp index 522935219..745e9acef 100644 --- a/src/Game/Camera/CameraManGame.cpp +++ b/src/Game/Camera/CameraManGame.cpp @@ -16,14 +16,14 @@ #include namespace { - const char *gDefaultCameraName = "デフォルトカメラ"; - const char *gDefaultWaterCameraName = "デフォルト水中カメラ"; - const char *gDefaultWaterSurfaceCameraName = "デフォルト水面カメラ"; - const char *gDefaultFooFighterCameraName = "デフォルトフーファイターカメラ"; - const char *gDefaultStartAnimCameraName = "スタートアニメカメラ"; -} + const char* gDefaultCameraName = "デフォルトカメラ"; + const char* gDefaultWaterCameraName = "デフォルト水中カメラ"; + const char* gDefaultWaterSurfaceCameraName = "デフォルト水面カメラ"; + const char* gDefaultFooFighterCameraName = "デフォルトフーファイターカメラ"; + const char* gDefaultStartAnimCameraName = "スタートアニメカメラ"; +} // namespace -const char *CameraParamChunk::getClassName() const { +const char* CameraParamChunk::getClassName() const { return "Base"; } @@ -39,15 +39,16 @@ bool CameraTargetObj::isFooFighterMode() const { return false; } -CubeCameraArea *CameraTargetObj::getCubeCameraArea() const { +CubeCameraArea* CameraTargetObj::getCubeCameraArea() const { return nullptr; } -Triangle *CameraTargetObj::getGroundTriangle() const { +Triangle* CameraTargetObj::getGroundTriangle() const { return nullptr; } -CameraManGame::CameraManGame(CameraHolder *pHolder, CameraParamChunkHolder *pChunkHolder, const char *pName) : CameraMan(pName) { +CameraManGame::CameraManGame(CameraHolder* pHolder, CameraParamChunkHolder* pChunkHolder, const char* pName) + : CameraMan(pName) { mHolder = pHolder; mChunkHolder = pChunkHolder; _58 = 0; @@ -64,17 +65,15 @@ CameraManGame::CameraManGame(CameraHolder *pHolder, CameraParamChunkHolder *pChu } CameraManGame::~CameraManGame() { - } -void CameraManGame::init(const JMapInfoIter &rIter) { - +void CameraManGame::init(const JMapInfoIter& rIter) { } void CameraManGame::calc() { selectCameraChunk(); checkReset(); - CameraTargetObj *target = mCamera->calc(); + CameraTargetObj* target = mCamera->calc(); CameraLocalUtil::setUsedTarget(this, target); setSafePose(); mKarikari->update(this); @@ -86,7 +85,6 @@ void CameraManGame::notifyActivate() { } void CameraManGame::notifyDeactivate() { - } bool CameraManGame::isInterpolationOff() const { @@ -192,12 +190,12 @@ void CameraManGame::zoomIn() { CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); chunkID.createOtherID(0, "ズームカメラ"); - CameraParamChunk *chunk = mChunkHolder->getChunk(chunkID); + CameraParamChunk* chunk = mChunkHolder->getChunk(chunkID); - TVec3f *pos = CameraLocalUtil::getPos(this); - TVec3f *watchPos = CameraLocalUtil::getWatchPos(this); + TVec3f* pos = CameraLocalUtil::getPos(this); + TVec3f* watchPos = CameraLocalUtil::getWatchPos(this); - f32 distance = PSVECDistance(reinterpret_cast(watchPos), reinterpret_cast(pos)); + f32 distance = PSVECDistance(reinterpret_cast(watchPos), reinterpret_cast(pos)); f32 dVar3 = JMAAsinRadian(100.0f / distance); f32 var2 = 1.5f; f32 var1 = dVar3 * var2; @@ -214,34 +212,33 @@ void CameraManGame::selectCameraChunk() { checkStateShift(); switch (mTypeState) { - case 0: - updateNormal(); - break; - case 1: - updateSwim(); - break; - case 2: - updateWaterSurface(); - break; - case 3: - updateGCapture(); - break; - case 4: - updateFooFighter(); - break; - case 5: - break; + case 0: + updateNormal(); + break; + case 1: + updateSwim(); + break; + case 2: + updateWaterSurface(); + break; + case 3: + updateGCapture(); + break; + case 4: + updateFooFighter(); + break; + case 5: + break; } } } -void CameraManGame::setChunk(const CameraParamChunkID &rChunk) { - CameraParamChunk *chunk = mChunkHolder->getChunk(rChunk); +void CameraManGame::setChunk(const CameraParamChunkID& rChunk) { + CameraParamChunk* chunk = mChunkHolder->getChunk(rChunk); if (chunk == nullptr) { setNullCamera(); - } - else { + } else { chunk = tryToReplaceChunkToDefault(chunk); requestResetIfNecessary(chunk); replaceCurrentChunkAndCamera(chunk); @@ -255,7 +252,7 @@ void CameraManGame::setNullCamera() { mChunk = nullptr; s32 index = mHolder->getIndexOfDefault(); mCamera = mHolder->getCameraInner(index); - + f32 fovy = mDirector->getDefaultFovy(); CameraLocalUtil::setFovy(this, fovy); CameraLocalUtil::setRoll(this, 0.0f); @@ -271,18 +268,18 @@ void CameraManGame::setNullCamera() { } #endif -CameraParamChunk *CameraManGame::tryToReplaceChunkToDefault(CameraParamChunk *pChunk) { +CameraParamChunk* CameraManGame::tryToReplaceChunkToDefault(CameraParamChunk* pChunk) { if (strcmp(pChunk->getClassName(), "Game") != 0) { return pChunk; } - - CameraParamChunkGame *gameChunk = reinterpret_cast(pChunk); + + CameraParamChunkGame* gameChunk = reinterpret_cast(pChunk); if (gameChunk->mThru != 1) { return pChunk; } - static const char *name = "デフォルトカメラ"; + static const char* name = "デフォルトカメラ"; CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); chunkID.createOtherID(0, name); @@ -290,24 +287,22 @@ CameraParamChunk *CameraManGame::tryToReplaceChunkToDefault(CameraParamChunk *pC return mChunkHolder->getChunk(chunkID); } -void CameraManGame::requestResetIfNecessary(CameraParamChunk *pChunk) { +void CameraManGame::requestResetIfNecessary(CameraParamChunk* pChunk) { if (isNecessaryToReset(pChunk)) { _58 = 1; if (isZoomCamera()) { mDirector->setInterpolation(mChunk->mExParam.mCamInt); - } - else if (isCurrentChunkEnableEndInterp()) { - CameraParamChunkGame *gameChunk = reinterpret_cast(mChunk); + } else if (isCurrentChunkEnableEndInterp()) { + CameraParamChunkGame* gameChunk = reinterpret_cast(mChunk); mDirector->setInterpolation(gameChunk->mCamEndInt); - } - else { + } else { mDirector->setInterpolation(pChunk->mExParam.mCamInt); } } } -bool CameraManGame::isNecessaryToReset(CameraParamChunk *pChunk) const { +bool CameraManGame::isNecessaryToReset(CameraParamChunk* pChunk) const { if (mChunk == pChunk) { return false; } @@ -329,7 +324,6 @@ bool CameraManGame::isNecessaryToReset(CameraParamChunk *pChunk) const { return false; } - bool CameraManGame::isCurrentChunkEnableEndInterp() const { bool is; @@ -337,21 +331,20 @@ bool CameraManGame::isCurrentChunkEnableEndInterp() const { is = false; if (strcmp(mChunk->getClassName(), "Game") == 0) { - CameraParamChunkGame *gameChunk = reinterpret_cast(mChunk); + CameraParamChunkGame* gameChunk = reinterpret_cast(mChunk); if (gameChunk->mEnableEndErpFrame != 0) { is = true; } } - } - else { + } else { is = false; } return is; } -void CameraManGame::replaceCurrentChunkAndCamera(CameraParamChunk *pChunk) { +void CameraManGame::replaceCurrentChunkAndCamera(CameraParamChunk* pChunk) { mCamera = mHolder->getCameraInner(pChunk->mCameraTypeIndex); mChunk = pChunk; } @@ -359,37 +352,35 @@ void CameraManGame::replaceCurrentChunkAndCamera(CameraParamChunk *pChunk) { #ifdef NON_MATCHING // Register mismatch, r0 used void CameraManGame::applyParameter() { - CamTranslatorBase *translator = mHolder->getTranslator(mChunk->mCameraTypeIndex); + CamTranslatorBase* translator = mHolder->getTranslator(mChunk->mCameraTypeIndex); translator->setParam(mChunk); - Camera *camera = translator->getCamera(); + Camera* camera = translator->getCamera(); camera->setZoneMtx(mChunk->getZoneID()); CameraLocalUtil::setGlobalOffset(mCamera, mChunk->mExParam.mWOffset); - TVec3f *localOffset = CameraLocalUtil::getLocalOffset(this); + TVec3f* localOffset = CameraLocalUtil::getLocalOffset(this); CameraLocalUtil::setLocalOffset(mCamera, *localOffset); CameraLocalUtil::setFrontOffset(mCamera, mChunk->mExParam.mLOffset); CameraLocalUtil::setUpperOffset(mCamera, mChunk->mExParam.mLOffsetV); if (mChunk->isOnUseFovy()) { CameraLocalUtil::setFovy(mCamera, mChunk->mExParam.mFovy); - } - else { + } else { CameraLocalUtil::setFovy(mCamera, mDirector->getDefaultFovy()); } if (mChunk->isLOfsErpOff()) { camera->_18 = 1; - } - else { + } else { camera->_18 = 0; } CameraLocalUtil::setRoll(mCamera, mChunk->mExParam.mRoll); if (camera->mVPan != nullptr) { - CameraHeightArrange *vPan = camera->mVPan; + CameraHeightArrange* vPan = camera->mVPan; vPan->resetParameter(); vPan->mUpper = mChunk->mExParam.mUpper; @@ -406,7 +397,7 @@ void CameraManGame::applyParameter() { mChunk->getVPanAxis(&axis); vPan->mVPanAxis.set(axis); - + vPan->_60 = 1; } } @@ -416,7 +407,7 @@ void CameraManGame::checkReset() { if (_58 == 0 || mChunk == nullptr || mCamera == nullptr) { return; } - + mCamera->mCameraMan = this; mCamera->reset(); _58 = 0; @@ -438,13 +429,13 @@ void CameraManGame::setSafePose() { CameraLocalUtil::setUpVec(this, up); CameraLocalUtil::setWatchPos(this, watchPos); - TVec3f *watchUp = CameraLocalUtil::getWatchUpVec(mCamera); + TVec3f* watchUp = CameraLocalUtil::getWatchUpVec(mCamera); CameraLocalUtil::setWatchUpVec(this, *watchUp); - TVec3f *globalOffset = CameraLocalUtil::getGlobalOffset(mCamera); + TVec3f* globalOffset = CameraLocalUtil::getGlobalOffset(mCamera); CameraLocalUtil::setGlobalOffset(this, *globalOffset); - TVec3f *localOffset = CameraLocalUtil::getLocalOffset(mCamera); + TVec3f* localOffset = CameraLocalUtil::getLocalOffset(mCamera); CameraLocalUtil::setLocalOffset(this, *localOffset); f32 fovy = CameraLocalUtil::getFovy(mCamera); @@ -456,23 +447,22 @@ void CameraManGame::setSafePose() { #ifdef NON_MATCHING // Stack issues -void CameraManGame::keepAwayWatchPos(TVec3f *watchPos, const TVec3f &pos) { +void CameraManGame::keepAwayWatchPos(TVec3f* watchPos, const TVec3f& pos) { TVec3f dir = *watchPos - pos; - f32 length = PSVECMag(reinterpret_cast(&dir)); + f32 length = PSVECMag(reinterpret_cast(&dir)); if (length < 300.0f) { if (length < 1.0f) { - TVec3f *currentPos = CameraLocalUtil::getPos(this); - TVec3f *currentWatchPos = CameraLocalUtil::getWatchPos(this); - + TVec3f* currentPos = CameraLocalUtil::getPos(this); + TVec3f* currentWatchPos = CameraLocalUtil::getWatchPos(this); + TVec3f newWatchPos1 = pos + *currentWatchPos; TVec3f newWatchPos2 = newWatchPos1 - *currentPos; watchPos->set(newWatchPos2); - } - else { - f32 length2 = PSVECMag(reinterpret_cast(&dir)); - PSVECNormalize(reinterpret_cast(&dir), reinterpret_cast(&dir)); + } else { + f32 length2 = PSVECMag(reinterpret_cast(&dir)); + PSVECNormalize(reinterpret_cast(&dir), reinterpret_cast(&dir)); TVec3f dirCopy = TVec3f(dir); dirCopy.x *= 300.0f; @@ -494,7 +484,7 @@ void CameraManGame::createDefaultCamera() { void CameraManGame::createDefaultWaterCamera() { CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); chunkID.createOtherID(0, gDefaultWaterCameraName); - CameraParamChunk *chunk = mChunkHolder->createChunk(chunkID, nullptr); + CameraParamChunk* chunk = mChunkHolder->createChunk(chunkID, nullptr); chunk->setCameraType("CAM_TYPE_WATER_FOLLOW", mHolder); @@ -511,7 +501,7 @@ void CameraManGame::createDefaultWaterCamera() { void CameraManGame::createDefaultWaterSurfaceCamera() { CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); chunkID.createOtherID(0, gDefaultWaterSurfaceCameraName); - CameraParamChunk *chunk = mChunkHolder->createChunk(chunkID, nullptr); + CameraParamChunk* chunk = mChunkHolder->createChunk(chunkID, nullptr); chunk->setCameraType("CAM_TYPE_FOLLOW", mHolder); @@ -531,7 +521,7 @@ void CameraManGame::createDefaultWaterSurfaceCamera() { void CameraManGame::createDefaultFooFighterCamera() { CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); chunkID.createOtherID(0, gDefaultFooFighterCameraName); - CameraParamChunk *chunk = mChunkHolder->createChunk(chunkID, nullptr); + CameraParamChunk* chunk = mChunkHolder->createChunk(chunkID, nullptr); chunk->setCameraType("CAM_TYPE_FOO_FIGHTER", mHolder); @@ -546,16 +536,16 @@ void CameraManGame::createDefaultFooFighterCamera() { } void CameraManGame::createStartAnimCamera() { - void *data; - s32 size; + void* data; + s32 size; MR::getCurrentScenarioStartAnimCameraData(&data, &size); if (size >= 0) { CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); chunkID.createOtherID(0, gDefaultStartAnimCameraName); - CameraParamChunk *chunk = mChunkHolder->createChunk(chunkID, nullptr); + CameraParamChunk* chunk = mChunkHolder->createChunk(chunkID, nullptr); - CameraDirector *director = CameraLocalUtil::getCameraDirector(); + CameraDirector* director = CameraLocalUtil::getCameraDirector(); chunk->setCameraType("CAM_TYPE_ANIM", director->mHolder); chunk->mGeneralParam->mNum1 = reinterpret_cast(data); @@ -566,9 +556,9 @@ void CameraManGame::createStartAnimCamera() { void CameraManGame::createZoomCamera() { CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); chunkID.createOtherID(0, "ズームカメラ"); - CameraParamChunk *chunk = mChunkHolder->createChunk(chunkID, nullptr); + CameraParamChunk* chunk = mChunkHolder->createChunk(chunkID, nullptr); - CameraDirector *director = CameraLocalUtil::getCameraDirector(); + CameraDirector* director = CameraLocalUtil::getCameraDirector(); chunk->setCameraType("CAM_TYPE_EYEPOS_FIX_THERE", director->mHolder); TVec3f wOffset = TVec3f(0.0f, 0.0f, 0.0f); @@ -603,15 +593,14 @@ bool CameraManGame::tryShiftToGCapture() { } bool CameraManGame::tryShiftToSwimOrWaterSurface() { - CameraTargetObj *target = CameraLocalUtil::getTarget(this); + CameraTargetObj* target = CameraLocalUtil::getTarget(this); if (target->isWaterMode()) { - CameraTargetObj *target2 = CameraLocalUtil::getTarget(this); + CameraTargetObj* target2 = CameraLocalUtil::getTarget(this); if (target2->isOnWaterSurface()) { mTypeState = 2; - } - else { + } else { mTypeState = 1; } @@ -622,7 +611,7 @@ bool CameraManGame::tryShiftToSwimOrWaterSurface() { } bool CameraManGame::tryShiftToFooFighter() { - CameraTargetObj *target = CameraLocalUtil::getTarget(this); + CameraTargetObj* target = CameraLocalUtil::getTarget(this); if (target->isFooFighterMode()) { mTypeState = 4; @@ -660,10 +649,10 @@ void CameraManGame::updateWaterSurface() { void CameraManGame::updateGCapture() { CubeCameraArea::setCurrentCategory(CubeCameraArea::CATEGORY_UNKNOWN_3); - CameraTargetObj *target = CameraLocalUtil::getTarget(this); - const TVec3f *position = target->getPosition(); + CameraTargetObj* target = CameraLocalUtil::getTarget(this); + const TVec3f* position = target->getPosition(); - CubeCameraArea *area = reinterpret_cast(MR::getAreaObj("CubeCamera", *position)); + CubeCameraArea* area = reinterpret_cast(MR::getAreaObj("CubeCamera", *position)); if (area != nullptr) { CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); @@ -671,8 +660,7 @@ void CameraManGame::updateGCapture() { setChunk(chunkID); CubeCameraArea::setCurrentCategory(CubeCameraArea::CATEGORY_UNKNOWN_0); - } - else { + } else { updateNormal(); } } @@ -688,8 +676,8 @@ void CameraManGame::updateFooFighter() { bool CameraManGame::setCubeChunk(CubeCameraArea::ECategory category) { CubeCameraArea::setCurrentCategory(static_cast(category)); - CameraTargetObj *target = CameraLocalUtil::getTarget(this); - CubeCameraArea *area = target->getCubeCameraArea(); + CameraTargetObj* target = CameraLocalUtil::getTarget(this); + CubeCameraArea* area = target->getCubeCameraArea(); if (area != nullptr) { CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); @@ -708,8 +696,8 @@ bool CameraManGame::tryStartPosCamera() { } CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); - u16 startCameraID = static_cast(MR::getCurrentStartCameraId()); - s32 startZoneID = MR::getCurrentStartZoneId(); + u16 startCameraID = static_cast(MR::getCurrentStartCameraId()); + s32 startZoneID = MR::getCurrentStartZoneId(); chunkID.createStartID(startZoneID, startCameraID); setChunk(chunkID); @@ -730,7 +718,7 @@ bool CameraManGame::tryStartPosCamera() { _70--; } - return true; + return true; } bool CameraManGame::tryZoomCamera() { @@ -750,7 +738,7 @@ bool CameraManGame::isZoomCamera() const { CameraParamChunkID_Tmp chunkID = CameraParamChunkID_Tmp(); chunkID.createOtherID(0, "ズームカメラ"); - CameraParamChunk *chunk = mChunkHolder->getChunk(chunkID); + CameraParamChunk* chunk = mChunkHolder->getChunk(chunkID); return mChunk == chunk; } diff --git a/src/Game/Camera/CameraManPause.cpp b/src/Game/Camera/CameraManPause.cpp index 2a28a73ff..94d55d350 100644 --- a/src/Game/Camera/CameraManPause.cpp +++ b/src/Game/Camera/CameraManPause.cpp @@ -2,11 +2,12 @@ #include "Game/Camera/CameraManPause.hpp" #include "Game/Camera/CameraTargetObj.hpp" -TMtx34f *CameraTargetObj::getMapBaseMtx() const { +TMtx34f* CameraTargetObj::getMapBaseMtx() const { return nullptr; } -CameraManPause::CameraManPause(const char *pName) : CameraMan(pName) { +CameraManPause::CameraManPause(const char* pName) + : CameraMan(pName) { _48 = 6000.0f; _4C = 0.0f; _50 = 0.0f; @@ -19,12 +20,9 @@ CameraManPause::CameraManPause(const char *pName) : CameraMan(pName) { } CameraManPause::~CameraManPause() { - } - -void CameraManPause::init(const JMapInfoIter &rIter) { - +void CameraManPause::init(const JMapInfoIter& rIter) { } /*void CameraManPause::calc() { @@ -46,7 +44,6 @@ void CameraManPause::init(const JMapInfoIter &rIter) { }*/ void CameraManPause::notifyDeactivate() { - } bool CameraManPause::isCollisionOff() const { diff --git a/src/Game/Camera/CameraManSubjective.cpp b/src/Game/Camera/CameraManSubjective.cpp index 36fb06f55..4c85ac503 100644 --- a/src/Game/Camera/CameraManSubjective.cpp +++ b/src/Game/Camera/CameraManSubjective.cpp @@ -2,17 +2,16 @@ #include "Game/Camera/CameraManSubjective.hpp" #include "Game/Camera/CameraSubjective.hpp" -CameraManSubjective::CameraManSubjective(const char *pName) : CameraMan(pName) { +CameraManSubjective::CameraManSubjective(const char* pName) + : CameraMan(pName) { mCamera = new CameraSubjective("主観カメラ"); mCamera->mCameraMan = this; } CameraManSubjective::~CameraManSubjective() { - } -void CameraManSubjective::init(const JMapInfoIter &rIter) { - +void CameraManSubjective::init(const JMapInfoIter& rIter) { } void CameraManSubjective::calc() { @@ -25,5 +24,4 @@ void CameraManSubjective::notifyActivate() { } void CameraManSubjective::notifyDeactivate() { - } diff --git a/src/Game/Camera/CameraMedianPlanet.cpp b/src/Game/Camera/CameraMedianPlanet.cpp index 3ca628712..f4570e1f7 100644 --- a/src/Game/Camera/CameraMedianPlanet.cpp +++ b/src/Game/Camera/CameraMedianPlanet.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraMedianPlanet.hpp" #include "Game/Camera/CamTranslatorMedianPlanet.hpp" -CameraMedianPlanet::CameraMedianPlanet(const char *pName) : Camera(pName) { +CameraMedianPlanet::CameraMedianPlanet(const char* pName) + : Camera(pName) { mString = nullptr; mAxisX = 1200.0f; mAxisY = 3000.0f; @@ -13,9 +14,8 @@ CameraMedianPlanet::CameraMedianPlanet(const char *pName) : Camera(pName) { } CameraMedianPlanet::~CameraMedianPlanet() { - } -CamTranslatorBase *CameraMedianPlanet::createTranslator() { +CamTranslatorBase* CameraMedianPlanet::createTranslator() { return new CamTranslatorMedianPlanet(this); } diff --git a/src/Game/Camera/CameraMedianTower.cpp b/src/Game/Camera/CameraMedianTower.cpp index 96e633f45..985016069 100644 --- a/src/Game/Camera/CameraMedianTower.cpp +++ b/src/Game/Camera/CameraMedianTower.cpp @@ -2,7 +2,8 @@ #include "Game/Camera/CamTranslatorMedianTower.hpp" #include "Game/Camera/CameraLocalUtil.hpp" -CameraMedianTower::CameraMedianTower(const char *pName) : Camera(pName) { +CameraMedianTower::CameraMedianTower(const char* pName) + : Camera(pName) { mString = nullptr; mWPoint.x = 0.0f; mWPoint.y = 0.0f; @@ -29,9 +30,8 @@ void CameraMedianTower::reset() { } CameraMedianTower::~CameraMedianTower() { - } -CamTranslatorBase *CameraMedianTower::createTranslator() { +CamTranslatorBase* CameraMedianTower::createTranslator() { return new CamTranslatorMedianTower(this); } diff --git a/src/Game/Camera/CameraMtxRegParallel.cpp b/src/Game/Camera/CameraMtxRegParallel.cpp index 7fcd47067..833119ccf 100644 --- a/src/Game/Camera/CameraMtxRegParallel.cpp +++ b/src/Game/Camera/CameraMtxRegParallel.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraMtxRegParallel.hpp" #include "Game/Camera/CamTranslatorMtxRegParallel.hpp" -CameraMtxRegParallel::CameraMtxRegParallel(const char *pName) : Camera(pName) { +CameraMtxRegParallel::CameraMtxRegParallel(const char* pName) + : Camera(pName) { mString = nullptr; mAngleB = 0.0f; mAngleA = 0.0f; @@ -12,9 +13,8 @@ CameraMtxRegParallel::CameraMtxRegParallel(const char *pName) : Camera(pName) { } CameraMtxRegParallel::~CameraMtxRegParallel() { - } -CamTranslatorBase *CameraMtxRegParallel::createTranslator() { +CamTranslatorBase* CameraMtxRegParallel::createTranslator() { return new CamTranslatorMtxRegParallel(this); } diff --git a/src/Game/Camera/CameraObjParallel.cpp b/src/Game/Camera/CameraObjParallel.cpp index 5ec47567d..77ebba28e 100644 --- a/src/Game/Camera/CameraObjParallel.cpp +++ b/src/Game/Camera/CameraObjParallel.cpp @@ -1,16 +1,16 @@ #include "Game/Camera/CameraObjParallel.hpp" #include "Game/Camera/CamTranslatorObjParallel.hpp" -CameraObjParallel::CameraObjParallel(const char *pName) : Camera(pName) { +CameraObjParallel::CameraObjParallel(const char* pName) + : Camera(pName) { mAngleA = 0.0f; mAngleB = 0.0f; mDist = 3000.0f; } CameraObjParallel::~CameraObjParallel() { - } -CamTranslatorBase *CameraObjParallel::createTranslator() { +CamTranslatorBase* CameraObjParallel::createTranslator() { return new CamTranslatorObjParallel(this); } diff --git a/src/Game/Camera/CameraParallel.cpp b/src/Game/Camera/CameraParallel.cpp index 5a062d3ca..4caf94ec4 100644 --- a/src/Game/Camera/CameraParallel.cpp +++ b/src/Game/Camera/CameraParallel.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraParallel.hpp" #include "Game/Camera/CamTranslatorParallel.hpp" -CameraParallel::CameraParallel(const char *pName) : Camera(pName) { +CameraParallel::CameraParallel(const char* pName) + : Camera(pName) { mAngleB = 0.0f; mAngleA = 0.0f; mDist = 3000.0f; @@ -15,9 +16,8 @@ CameraParallel::CameraParallel(const char *pName) : Camera(pName) { } CameraParallel::~CameraParallel() { - } -CamTranslatorBase *CameraParallel::createTranslator() { +CamTranslatorBase* CameraParallel::createTranslator() { return new CamTranslatorParallel(this); } diff --git a/src/Game/Camera/CameraParamChunk.cpp b/src/Game/Camera/CameraParamChunk.cpp index b82aeecc5..da02a5353 100644 --- a/src/Game/Camera/CameraParamChunk.cpp +++ b/src/Game/Camera/CameraParamChunk.cpp @@ -7,7 +7,8 @@ #ifdef NON_MATCHING // String constructor called first instead of last -CameraGeneralParam::CameraGeneralParam() : mString() { +CameraGeneralParam::CameraGeneralParam() + : mString() { mDist = 1200.0f; mAxis.x = 0.0f; mAxis.y = 1.0f; @@ -25,7 +26,7 @@ CameraGeneralParam::CameraGeneralParam() : mString() { } #endif -CameraGeneralParam& CameraGeneralParam::operator=(const CameraGeneralParam &rOther) { +CameraGeneralParam& CameraGeneralParam::operator=(const CameraGeneralParam& rOther) { mDist = rOther.mDist; mAxis = rOther.mAxis; mWPoint = rOther.mWPoint; @@ -40,7 +41,6 @@ CameraGeneralParam& CameraGeneralParam::operator=(const CameraGeneralParam &rOth } CameraParamChunk::ExParam::ExParam() { - } void CameraParamChunk::ExParam::init() { @@ -65,7 +65,7 @@ void CameraParamChunk::ExParam::init() { mVPanAxis.z = 0.0f; } -CameraParamChunk::CameraParamChunk(CameraHolder *pHolder, const CameraParamChunkID &rChunk) { +CameraParamChunk::CameraParamChunk(CameraHolder* pHolder, const CameraParamChunkID& rChunk) { mParamChunkID = new CameraParamChunkID(rChunk); mCameraTypeIndex = pHolder->getIndexOfDefault(); mGeneralParam = new CameraGeneralParam(); @@ -73,7 +73,7 @@ CameraParamChunk::CameraParamChunk(CameraHolder *pHolder, const CameraParamChunk mExParam.init(); } -void CameraParamChunk::copy(const CameraParamChunk *pOther) { +void CameraParamChunk::copy(const CameraParamChunk* pOther) { mCameraTypeIndex = pOther->mCameraTypeIndex; mExParam.mWOffset = pOther->mExParam.mWOffset; mExParam.mLOffset = pOther->mExParam.mLOffset; @@ -103,8 +103,8 @@ void CameraParamChunk::initiate() { #ifdef NON_MATCHING // Register mismatch -void CameraParamChunk::load(DotCamReader *pReader, CameraHolder *pHolder) { - const char *camType = ""; +void CameraParamChunk::load(DotCamReader* pReader, CameraHolder* pHolder) { + const char* camType = ""; pReader->getValueString("camtype", &camType); arrangeCamTypeName(pReader->getVersion(), &camType); @@ -115,8 +115,7 @@ void CameraParamChunk::load(DotCamReader *pReader, CameraHolder *pHolder) { if (index == -1) { mCameraTypeIndex = pHolder->getIndexOfDefault(); - } - else { + } else { mCameraTypeIndex = index; } @@ -137,14 +136,13 @@ void CameraParamChunk::load(DotCamReader *pReader, CameraHolder *pHolder) { pReader->getValueInt("vpanuse", &mExParam.mVPanUse); pReader->getValueVec("vpanaxis", &mExParam.mVPanAxis); - static const char *sFlagNames[6] = { + static const char* sFlagNames[6] = { "flag.noreset", "flag.nofovy", "flag.lofserpoff", "flag.antibluroff", "flag.collisionoff", - "flag.subjectiveoff" - }; + "flag.subjectiveoff"}; for (u32 i = 0; i < 6; i++) { s32 flag; @@ -167,7 +165,7 @@ void CameraParamChunk::load(DotCamReader *pReader, CameraHolder *pHolder) { pReader->getValueInt("num1", &mGeneralParam->mNum1); pReader->getValueInt("num2", &mGeneralParam->mNum2); - const char *stringParam = nullptr; + const char* stringParam = nullptr; if (pReader->getValueString("string", &stringParam)) { mGeneralParam->mString.setCharPtr(stringParam); @@ -203,7 +201,7 @@ bool CameraParamChunk::isSubjectiveCameraOff() const { return (mExParam.mFlag >> 5) & 1; } -void CameraParamChunk::getVPanAxis(TVec3f *pOut) const { +void CameraParamChunk::getVPanAxis(TVec3f* pOut) const { pOut->x = mExParam.mVPanAxis.x; pOut->y = mExParam.mVPanAxis.y; pOut->z = mExParam.mVPanAxis.z; @@ -215,7 +213,7 @@ void CameraParamChunk::getVPanAxis(TVec3f *pOut) const { MR::normalize(pOut); } -void CameraParamChunk::setCameraType(const char *pType, const CameraHolder *pHolder) { +void CameraParamChunk::setCameraType(const char* pType, const CameraHolder* pHolder) { mCameraTypeIndex = pHolder->getIndexOf(pType); } @@ -249,44 +247,40 @@ void CameraParamChunk::setCollisionOff(bool value) { mExParam.mFlag |= 1 << 4; } -void CameraParamChunk::arrangeCamTypeName(u32 version, const char **ppType) { - const char *&type = *ppType; +void CameraParamChunk::arrangeCamTypeName(u32 version, const char** ppType) { + const char*& type = *ppType; if (version < 0x30004) { if (strcmp(type, "CAM_TYPE_DONKETSU_TEST")) { type = "CAM_TYPE_BOSS_DONKETSU"; } - } - else if (version < 0x30006) { + } else if (version < 0x30006) { if (strcmp(type, "CAM_TYPE_BEHIND_DEBUG")) { type = "CAM_TYPE_SLIDER"; - } - else if (strcmp(type, "CAM_TYPE_INWARD_TOWER_TEST")) { + } else if (strcmp(type, "CAM_TYPE_INWARD_TOWER_TEST")) { type = "CAM_TYPE_INWARD_TOWER"; - } - else if (strcmp(type, "CAM_TYPE_EYE_FIXED_THERE_TEST")) { + } else if (strcmp(type, "CAM_TYPE_EYE_FIXED_THERE_TEST")) { type = "CAM_TYPE_EYEPOS_FIX_THERE"; } - } - else if (version < 0x30009) { + } else if (version < 0x30009) { if (strcmp(type, "CAM_TYPE_ICECUBE_PLANET")) { type = "CAM_TYPE_CUBE_PLANET"; } } } -CameraParamChunkGame::CameraParamChunkGame(CameraHolder *pHolder, const CameraParamChunkID &rChunk) : - CameraParamChunk(pHolder, rChunk) { +CameraParamChunkGame::CameraParamChunkGame(CameraHolder* pHolder, const CameraParamChunkID& rChunk) + : CameraParamChunk(pHolder, rChunk) { mThru = 1; mEnableEndErpFrame = 0; mCamEndInt = 120; } -void CameraParamChunkGame::copy(const CameraParamChunk *pOther) { +void CameraParamChunkGame::copy(const CameraParamChunk* pOther) { CameraParamChunk::copy(pOther); } -void CameraParamChunkGame::load(DotCamReader *pReader, CameraHolder *pHolder) { +void CameraParamChunkGame::load(DotCamReader* pReader, CameraHolder* pHolder) { CameraParamChunk::load(pReader, pHolder); s32 thru; @@ -295,14 +289,13 @@ void CameraParamChunkGame::load(DotCamReader *pReader, CameraHolder *pHolder) { if (pReader->getValueInt("gflag.thru", &thru)) { mThru = thru; - } - else { + } else { mThru = 0; } - + if (pReader->getValueInt("gflag.enableEndErpFrame", &enableEndErpFrame)) { mEnableEndErpFrame = enableEndErpFrame; - } + } if (pReader->getValueInt("gflag.camendint", &camEndInt)) { mCamEndInt = camEndInt; @@ -317,12 +310,12 @@ void CameraParamChunkGame::initiate() { mEnableEndErpFrame = 0; } -const char *CameraParamChunkGame::getClassName() const { +const char* CameraParamChunkGame::getClassName() const { return "Game"; } -CameraParamChunkEvent::CameraParamChunkEvent(CameraHolder *pHolder, const CameraParamChunkID &rChunk) : - CameraParamChunk(pHolder, rChunk) { +CameraParamChunkEvent::CameraParamChunkEvent(CameraHolder* pHolder, const CameraParamChunkID& rChunk) + : CameraParamChunk(pHolder, rChunk) { mEnableErpFrame = 0; mEvFrame = 0; mEnableEndErpFrame = 0; @@ -330,13 +323,13 @@ CameraParamChunkEvent::CameraParamChunkEvent(CameraHolder *pHolder, const Camera mEvPriority = 1; } -void CameraParamChunkEvent::copy(const CameraParamChunk *pOther) { +void CameraParamChunkEvent::copy(const CameraParamChunk* pOther) { CameraParamChunk::copy(pOther); } -void CameraParamChunkEvent::load(DotCamReader *pReader, CameraHolder *pHolder) { +void CameraParamChunkEvent::load(DotCamReader* pReader, CameraHolder* pHolder) { CameraParamChunk::load(pReader, pHolder); - + s32 enableErpFrame; s32 enableEndErpFrame; s32 camEndInt; @@ -346,19 +339,19 @@ void CameraParamChunkEvent::load(DotCamReader *pReader, CameraHolder *pHolder) { if (pReader->getValueInt("eflag.enableErpFrame", &enableErpFrame)) { mEnableErpFrame = enableErpFrame; } - + if (pReader->getValueInt("eflag.enableEndErpFrame", &enableEndErpFrame)) { mEnableEndErpFrame = enableEndErpFrame; } - + if (pReader->getValueInt("camendint", &camEndInt)) { mCamEndInt = camEndInt; } - + if (pReader->getValueInt("evfrm", &evFrm)) { mEvFrame = evFrm; } - + if (pReader->getValueInt("evpriority", &evPriority)) { mEvPriority = evPriority; } @@ -373,6 +366,6 @@ void CameraParamChunkEvent::initiate() { mEvPriority = 1; } -const char *CameraParamChunkEvent::getClassName() const { +const char* CameraParamChunkEvent::getClassName() const { return "Event"; } \ No newline at end of file diff --git a/src/Game/Camera/CameraParamChunkHolder.cpp b/src/Game/Camera/CameraParamChunkHolder.cpp index c35d272ba..dee67acad 100644 --- a/src/Game/Camera/CameraParamChunkHolder.cpp +++ b/src/Game/Camera/CameraParamChunkHolder.cpp @@ -10,42 +10,40 @@ #define CHUNK_CAPACITY 0x400 -CameraParamChunkHolder::CameraParamChunkHolder(CameraHolder *pCameraHolder, const char *pName) : NameObj(pName) { +CameraParamChunkHolder::CameraParamChunkHolder(CameraHolder* pCameraHolder, const char* pName) + : NameObj(pName) { mCameraHolder = pCameraHolder; mChunkCapacity = CHUNK_CAPACITY; mNrChunks = 0; - mChunks = new CameraParamChunk *[CHUNK_CAPACITY]; + mChunks = new CameraParamChunk*[CHUNK_CAPACITY]; mIsSorted = 0; } CameraParamChunkHolder::~CameraParamChunkHolder() { - } -CameraParamChunk *CameraParamChunkHolder::createChunk(const CameraParamChunkID &rID, JKRHeap *pHeap) { +CameraParamChunk* CameraParamChunkHolder::createChunk(const CameraParamChunkID& rID, JKRHeap* pHeap) { if (isNewAttribute(rID)) { - char firstChar = rID.mName[0]; - CameraParamChunk *chunk; + char firstChar = rID.mName[0]; + CameraParamChunk* chunk; if (firstChar == 'e') { - chunk = new(pHeap, 0) CameraParamChunkEvent(mCameraHolder, rID); - } - else if (firstChar == 'g' || firstChar == 'c' || firstChar == 's') { - chunk = new(pHeap, 0) CameraParamChunkGame(mCameraHolder, rID); - } - else { - chunk = new(pHeap, 0) CameraParamChunk(mCameraHolder, rID); + chunk = new (pHeap, 0) CameraParamChunkEvent(mCameraHolder, rID); + } else if (firstChar == 'g' || firstChar == 'c' || firstChar == 's') { + chunk = new (pHeap, 0) CameraParamChunkGame(mCameraHolder, rID); + } else { + chunk = new (pHeap, 0) CameraParamChunk(mCameraHolder, rID); } mChunks[mNrChunks++] = chunk; - + return chunk; } - + return nullptr; } -CameraParamChunk *CameraParamChunkHolder::getChunk(const CameraParamChunkID &rID) { +CameraParamChunk* CameraParamChunkHolder::getChunk(const CameraParamChunkID& rID) { if (rID.mName == nullptr) { return nullptr; } @@ -65,7 +63,7 @@ void CameraParamChunkHolder::sort() { } if (minIndex != i) { - CameraParamChunk *temp = mChunks[i]; + CameraParamChunk* temp = mChunks[i]; mChunks[i] = mChunks[minIndex]; mChunks[minIndex] = temp; } @@ -80,7 +78,7 @@ void CameraParamChunkHolder::loadCameraParameters() { } } -bool CameraParamChunkHolder::isNewAttribute(const CameraParamChunkID &rID) { +bool CameraParamChunkHolder::isNewAttribute(const CameraParamChunkID& rID) { for (s32 i = 0; i < mNrChunks; i++) { if (*mChunks[i]->mParamChunkID == rID) { return false; @@ -90,7 +88,7 @@ bool CameraParamChunkHolder::isNewAttribute(const CameraParamChunkID &rID) { return true; } -CameraParamChunk *CameraParamChunkHolder::findChunk(const CameraParamChunkID &rID) { +CameraParamChunk* CameraParamChunkHolder::findChunk(const CameraParamChunkID& rID) { if (mIsSorted) { s32 low = 0; s32 high = mNrChunks - 1; @@ -100,8 +98,7 @@ CameraParamChunk *CameraParamChunkHolder::findChunk(const CameraParamChunkID &rI if (*mChunks[middle]->mParamChunkID > rID) { low = middle + 1; - } - else { + } else { high = middle; } } @@ -109,8 +106,7 @@ CameraParamChunk *CameraParamChunkHolder::findChunk(const CameraParamChunkID &rI if (*mChunks[low]->mParamChunkID == rID) { return mChunks[low]; } - } - else { + } else { for (s32 i = 0; i < mNrChunks; i++) { if (*mChunks[i]->mParamChunkID == rID) { return mChunks[i]; @@ -121,7 +117,7 @@ CameraParamChunk *CameraParamChunkHolder::findChunk(const CameraParamChunkID &rI return nullptr; } -CameraParamChunk *CameraParamChunkHolder::findChunk(s32 zoneID, const char *pName) { +CameraParamChunk* CameraParamChunkHolder::findChunk(s32 zoneID, const char* pName) { for (s32 i = 0; i < mNrChunks; i++) { if (mChunks[i]->mParamChunkID->equals(zoneID, pName)) { return mChunks[i]; @@ -134,8 +130,8 @@ CameraParamChunk *CameraParamChunkHolder::findChunk(s32 zoneID, const char *pNam #ifdef NON_MATCHING // Stack is 0x10 bytes smaller void CameraParamChunkHolder::loadFile(s32 zoneID) { - void *data; - s32 local44; + void* data; + s32 local44; MR::getStageCameraData(&data, &local44, zoneID); if (local44 != 0) { @@ -143,20 +139,19 @@ void CameraParamChunkHolder::loadFile(s32 zoneID) { mCameraVersion = reader.mVersion; while (reader.hasMoreChunk()) { - const char *id = nullptr; + const char* id = nullptr; reader.getValueString("id", &id); - CameraParamChunk *chunk = findChunk(zoneID, id); + CameraParamChunk* chunk = findChunk(zoneID, id); if (chunk != nullptr && chunk->_64 != 0) { reader.nextToChunk(); - } - else { + } else { if (chunk != nullptr) { chunk->load(&reader, mCameraHolder); arrangeChunk(chunk); } - + reader.nextToChunk(); } } @@ -164,12 +159,12 @@ void CameraParamChunkHolder::loadFile(s32 zoneID) { } #endif -void CameraParamChunkHolder::arrangeChunk(CameraParamChunk *pChunk) { +void CameraParamChunkHolder::arrangeChunk(CameraParamChunk* pChunk) { s32 index = pChunk->mCameraTypeIndex; if (mCameraHolder->getIndexOf("CAM_TYPE_FOLLOW") == index) { if (mCameraVersion < 0x30001) { - CameraGeneralParam *param = pChunk->mGeneralParam; + CameraGeneralParam* param = pChunk->mGeneralParam; param->mAngleA = 0.17453294f; // 10 degrees param->mAngleB = 0.34906587f; // 20 degrees @@ -181,10 +176,10 @@ void CameraParamChunkHolder::arrangeChunk(CameraParamChunk *pChunk) { } if (mCameraVersion < 0x30003) { - const char *className = pChunk->getClassName(); + const char* className = pChunk->getClassName(); if (strcmp(className, "Game") == 0) { - CameraParamChunkGame *pGameChunk = reinterpret_cast(pChunk); + CameraParamChunkGame* pGameChunk = reinterpret_cast(pChunk); pGameChunk->mThru = 0; } } @@ -193,7 +188,7 @@ void CameraParamChunkHolder::arrangeChunk(CameraParamChunk *pChunk) { if (mCameraHolder->getIndexOf("CAM_TYPE_RAIL_FOLLOW") == index) { if (mCameraVersion < 0x30007) { - CameraGeneralParam *param = pChunk->mGeneralParam; + CameraGeneralParam* param = pChunk->mGeneralParam; param->mWPoint.x = 30.0f; param->mWPoint.y = 0.35f; @@ -232,7 +227,7 @@ void CameraParamChunkHolder::arrangeChunk(CameraParamChunk *pChunk) { index = pChunk->mCameraTypeIndex; if (mCameraHolder->getIndexOf("CAM_TYPE_CHARMED_VECREG") == index) { - CameraGeneralParam *param = pChunk->mGeneralParam; + CameraGeneralParam* param = pChunk->mGeneralParam; param->mString.setCharPtr(CameraLocalUtil::getDummyVecRegName()); } } diff --git a/src/Game/Camera/CameraParamChunkID.cpp b/src/Game/Camera/CameraParamChunkID.cpp index 6a290fd15..8684f4407 100644 --- a/src/Game/Camera/CameraParamChunkID.cpp +++ b/src/Game/Camera/CameraParamChunkID.cpp @@ -7,19 +7,18 @@ CameraParamChunkID::CameraParamChunkID() { mName = nullptr; } -CameraParamChunkID::CameraParamChunkID(const CameraParamChunkID &other) { +CameraParamChunkID::CameraParamChunkID(const CameraParamChunkID& other) { mZoneID = other.mZoneID; - u32 length = strlen(other.mName); - char *buffer = getBuffer(length + 1); + u32 length = strlen(other.mName); + char* buffer = getBuffer(length + 1); strcpy(buffer, other.mName); mName = buffer; } -bool CameraParamChunkID::operator>(const CameraParamChunkID &other) const { +bool CameraParamChunkID::operator>(const CameraParamChunkID& other) const { if (mName == nullptr) { return other.mName != nullptr; - } - else if (other.mName == nullptr) { + } else if (other.mName == nullptr) { return false; } @@ -31,7 +30,7 @@ bool CameraParamChunkID::operator>(const CameraParamChunkID &other) const { if (mZoneID == other.mZoneID && strcmp(mName, other.mName) == 0) { stringEqual = true; } - + if (!stringEqual) { result = false; } @@ -40,11 +39,10 @@ bool CameraParamChunkID::operator>(const CameraParamChunkID &other) const { return result; } -bool CameraParamChunkID::operator==(const CameraParamChunkID &other) const { +bool CameraParamChunkID::operator==(const CameraParamChunkID& other) const { if (mName == nullptr) { return other.mName == nullptr; - } - else if (other.mName == nullptr) { + } else if (other.mName == nullptr) { return false; } @@ -55,16 +53,15 @@ bool CameraParamChunkID::operator==(const CameraParamChunkID &other) const { return mZoneID == other.mZoneID && strcmp(mName, other.mName) == 0; } - -char *CameraParamChunkID::getBuffer(u32 length) { +char* CameraParamChunkID::getBuffer(u32 length) { return new char[length]; } -bool CameraParamChunkID::equals(s32 zoneID, const char *pName) const { +bool CameraParamChunkID::equals(s32 zoneID, const char* pName) const { if (mName != nullptr) { return zoneID == mZoneID && strcmp(mName, pName) == 0; } - + return false; } @@ -72,46 +69,46 @@ void CameraParamChunkID::createCubeID(s32 zoneID, u16 id) { mZoneID = static_cast(zoneID); const u32 formatSize = 7; - char *buffer = getBuffer(formatSize); + char* buffer = getBuffer(formatSize); snprintf(buffer, formatSize, "c:%04x", id); mName = buffer; } -void CameraParamChunkID::createGroupID(s32 zoneID, const char *a2, u32 a3, u32 a4) { +void CameraParamChunkID::createGroupID(s32 zoneID, const char* a2, u32 a3, u32 a4) { mZoneID = static_cast(zoneID); char buffer[0x100]; snprintf(buffer, sizeof(buffer), "g:%s:%d:%d", a2, a3, a4); - u32 actualSize = strlen(&buffer[0]); - char *buffer2 = getBuffer(actualSize + 1); + u32 actualSize = strlen(&buffer[0]); + char* buffer2 = getBuffer(actualSize + 1); strcpy(buffer2, &buffer[0]); mName = buffer2; } -void CameraParamChunkID::createOtherID(s32 zoneID, const char *a2) { +void CameraParamChunkID::createOtherID(s32 zoneID, const char* a2) { mZoneID = static_cast(zoneID); char buffer[0x100]; snprintf(buffer, sizeof(buffer), "o:%s", a2); - u32 actualSize = strlen(&buffer[0]); - char *buffer2 = getBuffer(actualSize + 1); + u32 actualSize = strlen(&buffer[0]); + char* buffer2 = getBuffer(actualSize + 1); strcpy(buffer2, &buffer[0]); mName = buffer2; } -void CameraParamChunkID::createEventID(s32 zoneID, const char *a2) { +void CameraParamChunkID::createEventID(s32 zoneID, const char* a2) { mZoneID = static_cast(zoneID); char buffer[0x100]; snprintf(buffer, sizeof(buffer), "e:%s", a2); - u32 actualSize = strlen(&buffer[0]); - char *buffer2 = getBuffer(actualSize + 1); + u32 actualSize = strlen(&buffer[0]); + char* buffer2 = getBuffer(actualSize + 1); strcpy(buffer2, &buffer[0]); mName = buffer2; @@ -123,8 +120,8 @@ void CameraParamChunkID::createStartID(s32 zoneID, u16 id) { char buffer[0x100]; snprintf(buffer, sizeof(buffer), "s:%04x", id); - u32 actualSize = strlen(&buffer[0]); - char *buffer2 = getBuffer(actualSize + 1); + u32 actualSize = strlen(&buffer[0]); + char* buffer2 = getBuffer(actualSize + 1); strcpy(buffer2, &buffer[0]); mName = buffer2; diff --git a/src/Game/Camera/CameraParamString.cpp b/src/Game/Camera/CameraParamString.cpp index 9feb459f8..dbcd97bee 100644 --- a/src/Game/Camera/CameraParamString.cpp +++ b/src/Game/Camera/CameraParamString.cpp @@ -5,25 +5,24 @@ CameraParamString::CameraParamString() { mString = nullptr; } -CameraParamString &CameraParamString::operator=(const CameraParamString &rOther) { +CameraParamString& CameraParamString::operator=(const CameraParamString& rOther) { copy(rOther.mString); return *this; } -void CameraParamString::setCharPtr(const char *pString) { +void CameraParamString::setCharPtr(const char* pString) { copy(pString); } -const char *CameraParamString::getCharPtr() const { +const char* CameraParamString::getCharPtr() const { return mString; } -void CameraParamString::copy(const char *pStringOther) { +void CameraParamString::copy(const char* pStringOther) { if (pStringOther != nullptr && *pStringOther != 0) { mString = pStringOther; - } - else { + } else { mString = nullptr; } } \ No newline at end of file diff --git a/src/Game/Camera/CameraPoseParam.cpp b/src/Game/Camera/CameraPoseParam.cpp index 32c7275e9..8a4855b57 100644 --- a/src/Game/Camera/CameraPoseParam.cpp +++ b/src/Game/Camera/CameraPoseParam.cpp @@ -13,7 +13,7 @@ CameraPoseParam::CameraPoseParam() { _24.x = 0.0f; _24.y = 0.0f; _24.z = 0.0f; - _30 = 40.0f; + _30 = 40.0f; _34.x = 0.0f; _34.y = 0.0f; _34.z = 0.0f; @@ -21,6 +21,6 @@ CameraPoseParam::CameraPoseParam() { _40.y = 0.0f; _40.z = 0.0f; _4C = 0.0f; - _50 = 0.0f; + _50 = 0.0f; _54 = 0.0f; } diff --git a/src/Game/Camera/CameraRaceFollow.cpp b/src/Game/Camera/CameraRaceFollow.cpp index 8f0222078..54b38e3a2 100644 --- a/src/Game/Camera/CameraRaceFollow.cpp +++ b/src/Game/Camera/CameraRaceFollow.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraRaceFollow.hpp" #include "Game/Camera/CamTranslatorRaceFollow.hpp" -CameraRaceFollow::CameraRaceFollow(const char *pName) : Camera(pName) { +CameraRaceFollow::CameraRaceFollow(const char* pName) + : Camera(pName) { mWPointX = 500.0f; mWPointY = 1200.0f; mAngleA = 0.2617994f; @@ -10,9 +11,8 @@ CameraRaceFollow::CameraRaceFollow(const char *pName) : Camera(pName) { } CameraRaceFollow::~CameraRaceFollow() { - } -CamTranslatorBase *CameraRaceFollow::createTranslator() { +CamTranslatorBase* CameraRaceFollow::createTranslator() { return new CamTranslatorRaceFollow(this); } \ No newline at end of file diff --git a/src/Game/Camera/CameraRailDemo.cpp b/src/Game/Camera/CameraRailDemo.cpp index ce4433b81..bbf9a9c70 100644 --- a/src/Game/Camera/CameraRailDemo.cpp +++ b/src/Game/Camera/CameraRailDemo.cpp @@ -1,8 +1,8 @@ #include "Game/Camera/CameraRailDemo.hpp" #include "Game/Camera/CamTranslatorRailDemo.hpp" -CameraRailDemo::CameraRailDemo(const char *pName) : Camera(pName) { - +CameraRailDemo::CameraRailDemo(const char* pName) + : Camera(pName) { } void CameraRailDemo::reset() { @@ -11,16 +11,16 @@ void CameraRailDemo::reset() { } CameraTargetObj* CameraRailDemo::calc() { - switch(_50) { - case 0: - calcLinear(); - break; - case 1: - calcEaseInOut(); - break; - case 2: - calcDamp(); - break; + switch (_50) { + case 0: + calcLinear(); + break; + case 1: + calcEaseInOut(); + break; + case 2: + calcDamp(); + break; } _58 = _58 + 1; @@ -28,9 +28,8 @@ CameraTargetObj* CameraRailDemo::calc() { } CameraRailDemo::~CameraRailDemo() { - } -CamTranslatorBase *CameraRailDemo::createTranslator() { +CamTranslatorBase* CameraRailDemo::createTranslator() { return new CamTranslatorRailDemo(this); } diff --git a/src/Game/Camera/CameraRailFollow.cpp b/src/Game/Camera/CameraRailFollow.cpp index 5bbf13cb9..ba2376dda 100644 --- a/src/Game/Camera/CameraRailFollow.cpp +++ b/src/Game/Camera/CameraRailFollow.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraRailFollow.hpp" #include "Game/Camera/CamTranslatorRailFollow.hpp" -CameraRailFollow::CameraRailFollow(const char *pName) : Camera(pName) { +CameraRailFollow::CameraRailFollow(const char* pName) + : Camera(pName) { _4C = 0; _50 = 0.0f; _54 = 0.0f; @@ -11,9 +12,8 @@ CameraRailFollow::CameraRailFollow(const char *pName) : Camera(pName) { } CameraRailFollow::~CameraRailFollow() { - } -CamTranslatorBase *CameraRailFollow::createTranslator() { +CamTranslatorBase* CameraRailFollow::createTranslator() { return new CamTranslatorRailFollow(this); } diff --git a/src/Game/Camera/CameraRailHolder.cpp b/src/Game/Camera/CameraRailHolder.cpp index 2daec87b5..dafe52295 100644 --- a/src/Game/Camera/CameraRailHolder.cpp +++ b/src/Game/Camera/CameraRailHolder.cpp @@ -6,7 +6,7 @@ CameraRailHolder::ZoneRail::ZoneRail() { _4 = 0; } -CameraRailHolder::RailSet &CameraRailHolder::RailSet::operator=(const RailSet &rOther) { +CameraRailHolder::RailSet& CameraRailHolder::RailSet::operator=(const RailSet& rOther) { _0 = rOther._0; _4 = rOther._4; return *this; @@ -25,5 +25,4 @@ CameraRailHolder::RailSet &CameraRailHolder::RailSet::operator=(const RailSet &r }*/ CameraRailHolder::~CameraRailHolder() { - } \ No newline at end of file diff --git a/src/Game/Camera/CameraRailWatch.cpp b/src/Game/Camera/CameraRailWatch.cpp index 01685c849..9a31abe6d 100644 --- a/src/Game/Camera/CameraRailWatch.cpp +++ b/src/Game/Camera/CameraRailWatch.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraRailWatch.hpp" #include "Game/Camera/CamTranslatorRailWatch.hpp" -CameraRailWatch::CameraRailWatch(const char *pName) : Camera(pName) { +CameraRailWatch::CameraRailWatch(const char* pName) + : Camera(pName) { _4C = 0; _50 = 0; _54 = 0; @@ -11,9 +12,8 @@ CameraRailWatch::CameraRailWatch(const char *pName) : Camera(pName) { } CameraRailWatch::~CameraRailWatch() { - } -CamTranslatorBase *CameraRailWatch::createTranslator() { +CamTranslatorBase* CameraRailWatch::createTranslator() { return new CamTranslatorRailWatch(this); } diff --git a/src/Game/Camera/CameraRegisterHolder.cpp b/src/Game/Camera/CameraRegisterHolder.cpp index 03a725fa5..3f51cfce0 100644 --- a/src/Game/Camera/CameraRegisterHolder.cpp +++ b/src/Game/Camera/CameraRegisterHolder.cpp @@ -1,25 +1,26 @@ #include "Game/Camera/CameraRegisterHolder.hpp" #include -const char *sDummyMatrixName = "ダミーマトリクス"; -const char *sDummyVectorName = "ダミーベクトル"; -const char *sDummyFloatName = "ダミー浮動小数"; +const char* sDummyMatrixName = "ダミーマトリクス"; +const char* sDummyVectorName = "ダミーベクトル"; +const char* sDummyFloatName = "ダミー浮動小数"; -CameraRegisterHolder::CameraRegisterHolder(const char *pName) : NameObj(pName) { +CameraRegisterHolder::CameraRegisterHolder(const char* pName) + : NameObj(pName) { initMtx(); initVec(); initFloat(); initDummyRegister(); } -void CameraRegisterHolder::declareMtxReg(const char *pName, MtxPtr pValue) { +void CameraRegisterHolder::declareMtxReg(const char* pName, MtxPtr pValue) { mMatrices[mNrMatrices] = pValue; mMatrixNames[mNrMatrices] = pName; mNrMatrices++; } -MtxPtr CameraRegisterHolder::getMtx(const char *pName) const { +MtxPtr CameraRegisterHolder::getMtx(const char* pName) const { s32 index = searchName(mMatrixNames, mNrMatrices, pName); if (index < 0) { @@ -29,13 +30,13 @@ MtxPtr CameraRegisterHolder::getMtx(const char *pName) const { return mMatrices[index]; } -void CameraRegisterHolder::declareVecReg(const char *pName, const TVec3f *pValue) { +void CameraRegisterHolder::declareVecReg(const char* pName, const TVec3f* pValue) { mVectors[mNrVectors] = pValue; mVectorNames[mNrVectors] = pName; mNrVectors++; } -const TVec3f *CameraRegisterHolder::getVec(const char *pName) const { +const TVec3f* CameraRegisterHolder::getVec(const char* pName) const { s32 index = searchName(mVectorNames, mNrVectors, pName); if (index < 0) { @@ -45,13 +46,13 @@ const TVec3f *CameraRegisterHolder::getVec(const char *pName) const { return mVectors[index]; } -void CameraRegisterHolder::declareFloatReg(const char *pName, const f32 *pValue) { +void CameraRegisterHolder::declareFloatReg(const char* pName, const f32* pValue) { mFloats[mNrFloats] = pValue; mFloatNames[mNrFloats] = pName; mNrFloats++; } -const char *CameraRegisterHolder::getDummyVecRegName() const { +const char* CameraRegisterHolder::getDummyVecRegName() const { return sDummyVectorName; } @@ -66,7 +67,7 @@ void CameraRegisterHolder::initMtx() { void CameraRegisterHolder::initVec() { mNrVectors = 0; - + for (u32 i = 0; i < NR_REGISTERS; i++) { mVectors[i] = nullptr; mVectorNames[i] = nullptr; @@ -75,7 +76,7 @@ void CameraRegisterHolder::initVec() { void CameraRegisterHolder::initFloat() { mNrFloats = 0; - + for (u32 i = 0; i < NR_REGISTERS; i++) { mFloats[i] = nullptr; mFloatNames[i] = nullptr; @@ -95,7 +96,7 @@ void CameraRegisterHolder::initDummyRegister() { declareFloatReg(sDummyFloatName, &mDummyFloat); } -s32 CameraRegisterHolder::searchName(const char *const *pNames, u32 count, const char *pName) const { +s32 CameraRegisterHolder::searchName(const char* const* pNames, u32 count, const char* pName) const { if (pName == nullptr) { return -1; } diff --git a/src/Game/Camera/CameraShakePatternImpl.cpp b/src/Game/Camera/CameraShakePatternImpl.cpp index 5b85b47d9..69bd09457 100644 --- a/src/Game/Camera/CameraShakePatternImpl.cpp +++ b/src/Game/Camera/CameraShakePatternImpl.cpp @@ -2,21 +2,21 @@ #include "Game/Util/MathUtil.hpp" #include "Game/AreaObj/MercatorTransformCube.hpp" -CameraShakePatternSingly::CameraShakePatternSingly(f32 a1) : CameraShakePattern() { +CameraShakePatternSingly::CameraShakePatternSingly(f32 a1) + : CameraShakePattern() { _8 = a1; mDirection.x = 0.0f; mDirection.y = 1.0f; } CameraShakePatternSingly::~CameraShakePatternSingly() { - } bool CameraShakePatternSingly::isEnd() const { return _4 >= 25; } -void CameraShakePatternSingly::getOffset(TVec2f *pOffset) const { +void CameraShakePatternSingly::getOffset(TVec2f* pOffset) const { pOffset->set(mOffset); } @@ -36,11 +36,11 @@ void CameraShakePatternSingly::update() { f32 dVar2 = MR::sin((12.566371f * static_cast(uStack44)) / 25.0f); f32 dVar3 = _8 * dVar2; - + f32 dVar2_2 = MR::sin((1.5707964f * static_cast(uStack44)) / 25.0f); dVar3 *= dVar2_2; - + f32 offsetX = mDirection.x * dVar3; f32 offsetY = mDirection.y * dVar3; @@ -54,7 +54,7 @@ void CameraShakePatternSingly::update() { } #endif -void CameraShakePatternSingly::setDirection(const TVec2f &rDir) { +void CameraShakePatternSingly::setDirection(const TVec2f& rDir) { mDirection.set(rDir); MR::normalize(&mDirection); } @@ -67,7 +67,6 @@ CameraShakePatternVerticalSin::CameraShakePatternVerticalSin(f32 a1, f32 a2) { } CameraShakePatternVerticalSin::~CameraShakePatternVerticalSin() { - } bool CameraShakePatternVerticalSin::isEnd() const { @@ -76,7 +75,7 @@ bool CameraShakePatternVerticalSin::isEnd() const { return _C <= var; } -void CameraShakePatternVerticalSin::getOffset(TVec2f *pOffset) const { +void CameraShakePatternVerticalSin::getOffset(TVec2f* pOffset) const { pOffset->set(mOffset); } @@ -89,8 +88,7 @@ void CameraShakePatternVerticalSin::update() { if (_C < 0.01) { mOffset.y = 0.0f; mOffset.x = 0.0f; - } - else { + } else { f32 dVar2 = MR::sin((6.2831855f * static_cast(_4)) / _C); f32 nVar2 = -dVar2; diff --git a/src/Game/Camera/CameraShakeTask.cpp b/src/Game/Camera/CameraShakeTask.cpp index dfcc3571a..9d7fe86ae 100644 --- a/src/Game/Camera/CameraShakeTask.cpp +++ b/src/Game/Camera/CameraShakeTask.cpp @@ -1,7 +1,7 @@ #include "Game/Camera/CameraShakePatternImpl.hpp" #include "Game/Camera/CameraShakeTask.hpp" -CameraShakeTask::CameraShakeTask(CameraShakePattern *pPattern) { +CameraShakeTask::CameraShakeTask(CameraShakePattern* pPattern) { mPattern = pPattern; mHasEnded = true; mIsInfinite = false; @@ -39,12 +39,11 @@ void CameraShakeTask::movement() { } } -void CameraShakeTask::getOffset(TVec2f *pOffset) const { +void CameraShakeTask::getOffset(TVec2f* pOffset) const { if (mHasEnded || mPattern->isEnd()) { pOffset->x = 0.0f; pOffset->y = 0.0f; - } - else { + } else { mPattern->getOffset(pOffset); } } @@ -55,16 +54,16 @@ bool CameraShakeTask::isEnd() const { void CameraShakeTask::startCommon(u32 a1) { _C = a1; - CameraShakePattern *pattern = mPattern; + CameraShakePattern* pattern = mPattern; mHasEnded = false; pattern->_4 = 0; pattern->start(); } void CameraShakeTask::updatePattern() { - CameraShakePattern *pattern = mPattern; + CameraShakePattern* pattern = mPattern; - pattern->_4++; + pattern->_4++; pattern->update(); if (mPattern->isEnd()) { @@ -82,12 +81,11 @@ void CameraShakeTask::updateInterval() { return; } - CameraShakePattern *pattern = mPattern; + CameraShakePattern* pattern = mPattern; pattern->_4 = 0; pattern->start(); - } - else { + } else { mHasEnded = true; } } \ No newline at end of file diff --git a/src/Game/Camera/CameraShaker.cpp b/src/Game/Camera/CameraShaker.cpp index 318888588..50382c480 100644 --- a/src/Game/Camera/CameraShaker.cpp +++ b/src/Game/Camera/CameraShaker.cpp @@ -10,23 +10,21 @@ f32 sVerticalTaskTable[7] = { 1.0f, 3.0f, 6.0f, - 9.0f -}; + 9.0f}; f32 sHorizontalTable[3] = { 0.3f, 1.0f, - 3.0f -}; + 3.0f}; -CameraShaker::CameraShaker(const char *pName) : NameObj(pName) { +CameraShaker::CameraShaker(const char* pName) + : NameObj(pName) { createSinglyVerticalTask(); createSinglyHorizontalTask(); createInfinityTask(); } CameraShaker::~CameraShaker() { - } void CameraShaker::movement() { @@ -42,7 +40,7 @@ void CameraShaker::shakeVertical(ESinglyVerticalPower power) { } } -void CameraShaker::shakeInfinity(NameObj *pNameObj, f32 a2, f32 a3) { +void CameraShaker::shakeInfinity(NameObj* pNameObj, f32 a2, f32 a3) { for (u32 i = 0; i < NR_INFINITY_TASKS; i++) { if (mInfinityTasks[i]->isEnd()) { startInfinity(i, a2, a3); @@ -52,7 +50,7 @@ void CameraShaker::shakeInfinity(NameObj *pNameObj, f32 a2, f32 a3) { } } -void CameraShaker::stopShakingInfinity(NameObj *pNameObj) { +void CameraShaker::stopShakingInfinity(NameObj* pNameObj) { for (u32 i = 0; i < NR_INFINITY_TASKS; i++) { if (mInfinityNameObjs[i] == pNameObj) { mInfinityTasks[i]->endForce(); @@ -64,8 +62,8 @@ void CameraShaker::stopShakingInfinity(NameObj *pNameObj) { void CameraShaker::createSinglyVerticalTask() { for (u32 i = 0; i < NR_VERTICAL_TASKS; i++) { - CameraShakePatternSingly *singly = new CameraShakePatternSingly(sVerticalTaskTable[i]); - CameraShakeTask *task = new CameraShakeTask(singly); + CameraShakePatternSingly* singly = new CameraShakePatternSingly(sVerticalTaskTable[i]); + CameraShakeTask* task = new CameraShakeTask(singly); mVerticalTasks[i] = task; } @@ -80,7 +78,7 @@ void CameraShaker::createSinglyHorizontalTask() { // Should be i < NR_HORIZONTAL_TASKS for (u32 i = 0; i < NR_VERTICAL_TASKS; i++) { - CameraShakePatternSingly *singly = new CameraShakePatternSingly(sHorizontalTable[i]); + CameraShakePatternSingly* singly = new CameraShakePatternSingly(sHorizontalTable[i]); TVec2f dir; dir.x = 1.0f; @@ -88,7 +86,7 @@ void CameraShaker::createSinglyHorizontalTask() { singly->setDirection(dir); - CameraShakeTask *task = new CameraShakeTask(singly); + CameraShakeTask* task = new CameraShakeTask(singly); mHorizontalTasks[i] = task; } @@ -96,8 +94,8 @@ void CameraShaker::createSinglyHorizontalTask() { void CameraShaker::createInfinityTask() { for (u32 i = 0; i < NR_INFINITY_TASKS; i++) { - CameraShakePatternVerticalSin *sin = new CameraShakePatternVerticalSin(1.0f, 15.0f); - CameraShakeTask *task = new CameraShakeTask(sin); + CameraShakePatternVerticalSin* sin = new CameraShakePatternVerticalSin(1.0f, 15.0f); + CameraShakeTask* task = new CameraShakeTask(sin); mInfinityTasks[i] = task; mInfinityNameObjs[i] = nullptr; @@ -107,19 +105,19 @@ void CameraShaker::createInfinityTask() { void CameraShaker::updateSinglyVerticalTask() { for (u32 i = 0; i < NR_VERTICAL_TASKS; i++) { mVerticalTasks[i]->movement(); - } + } } void CameraShaker::updateSinglyHorizontalTask() { for (u32 i = 0; i < NR_HORIZONTAL_TASKS; i++) { mHorizontalTasks[i]->movement(); - } + } } void CameraShaker::updateInfinityTask() { for (u32 i = 0; i < NR_INFINITY_TASKS; i++) { mInfinityTasks[i]->movement(); - } + } } void CameraShaker::setOffset() { @@ -132,7 +130,7 @@ void CameraShaker::setOffset() { MR::setShakeOffset(offset.x, offset.y); } -void CameraShaker::addSinglyVerticalTaskOffset(TVec2f *pOffset) { +void CameraShaker::addSinglyVerticalTaskOffset(TVec2f* pOffset) { for (u32 i = 0; i < NR_VERTICAL_TASKS; i++) { if (!mVerticalTasks[i]->isEnd()) { TVec2f offset; @@ -144,7 +142,7 @@ void CameraShaker::addSinglyVerticalTaskOffset(TVec2f *pOffset) { } } -void CameraShaker::addSinglyHorizontalTaskOffset(TVec2f *pOffset) { +void CameraShaker::addSinglyHorizontalTaskOffset(TVec2f* pOffset) { for (u32 i = 0; i < NR_HORIZONTAL_TASKS; i++) { if (!mHorizontalTasks[i]->isEnd()) { TVec2f offset; @@ -156,7 +154,7 @@ void CameraShaker::addSinglyHorizontalTaskOffset(TVec2f *pOffset) { } } -void CameraShaker::addInfinityTaskOffset(TVec2f *pOffset) { +void CameraShaker::addInfinityTaskOffset(TVec2f* pOffset) { for (u32 i = 0; i < NR_INFINITY_TASKS; i++) { if (!mInfinityTasks[i]->isEnd()) { TVec2f offset; @@ -169,7 +167,7 @@ void CameraShaker::addInfinityTaskOffset(TVec2f *pOffset) { } void CameraShaker::startInfinity(u32 index, f32 a2, f32 a3) { - CameraShakePatternVerticalSin *sin = reinterpret_cast(mInfinityTasks[index]->mPattern); + CameraShakePatternVerticalSin* sin = reinterpret_cast(mInfinityTasks[index]->mPattern); sin->_8 = a2; sin->_C = a3; diff --git a/src/Game/Camera/CameraSlide.cpp b/src/Game/Camera/CameraSlide.cpp index 66a0bcdee..9e0cd2e50 100644 --- a/src/Game/Camera/CameraSlide.cpp +++ b/src/Game/Camera/CameraSlide.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraSlide.hpp" #include "Game/Camera/CamTranslatorSlide.hpp" -CameraSlide::CameraSlide(const char *pName) : Camera(pName) { +CameraSlide::CameraSlide(const char* pName) + : Camera(pName) { mAxis.x = 1.0f; mAxis.y = 0.0f; mAxis.z = 0.0f; @@ -16,9 +17,8 @@ CameraSlide::CameraSlide(const char *pName) : Camera(pName) { } CameraSlide::~CameraSlide() { - } -CamTranslatorBase *CameraSlide::createTranslator() { +CamTranslatorBase* CameraSlide::createTranslator() { return new CamTranslatorSlide(this); } diff --git a/src/Game/Camera/CameraSpiral.cpp b/src/Game/Camera/CameraSpiral.cpp index f225fd5c8..e7d95a08e 100644 --- a/src/Game/Camera/CameraSpiral.cpp +++ b/src/Game/Camera/CameraSpiral.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraSpiral.hpp" #include "Game/Camera/CamTranslatorSpiral.hpp" -CameraSpiral::CameraSpiral(const char *pName) : Camera(pName) { +CameraSpiral::CameraSpiral(const char* pName) + : Camera(pName) { _4C = 60; _50 = 0; _54 = 0; @@ -12,9 +13,8 @@ CameraSpiral::CameraSpiral(const char *pName) : Camera(pName) { } CameraSpiral::~CameraSpiral() { - } -CamTranslatorBase *CameraSpiral::createTranslator() { +CamTranslatorBase* CameraSpiral::createTranslator() { return new CamTranslatorSpiral(this); } diff --git a/src/Game/Camera/CameraSubjective.cpp b/src/Game/Camera/CameraSubjective.cpp index 5bdcac864..660934f41 100644 --- a/src/Game/Camera/CameraSubjective.cpp +++ b/src/Game/Camera/CameraSubjective.cpp @@ -1,6 +1,7 @@ #include "Game/Camera/CameraSubjective.hpp" -CameraSubjective::CameraSubjective(const char *pName) : Camera(pName) { +CameraSubjective::CameraSubjective(const char* pName) + : Camera(pName) { _4C = 0.0f; _50 = 0.0f; _54 = 0.0f; @@ -9,9 +10,8 @@ CameraSubjective::CameraSubjective(const char *pName) : Camera(pName) { } CameraSubjective::~CameraSubjective() { - } -CamTranslatorBase *CameraSubjective::createTranslator() { +CamTranslatorBase* CameraSubjective::createTranslator() { return new CamTranslatorDummy(this); } diff --git a/src/Game/Camera/CameraTalk.cpp b/src/Game/Camera/CameraTalk.cpp index ff81d3708..6304c11e9 100644 --- a/src/Game/Camera/CameraTalk.cpp +++ b/src/Game/Camera/CameraTalk.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraTalk.hpp" #include "Game/Camera/CamTranslatorTalk.hpp" -CameraTalk::CameraTalk(const char *pName) : Camera(pName) { +CameraTalk::CameraTalk(const char* pName) + : Camera(pName) { _4C = 0.0f; _50 = 0.0f; _54 = 0.0f; @@ -14,9 +15,8 @@ CameraTalk::CameraTalk(const char *pName) : Camera(pName) { } CameraTalk::~CameraTalk() { - } -CamTranslatorBase *CameraTalk::createTranslator() { +CamTranslatorBase* CameraTalk::createTranslator() { return new CamTranslatorTalk(this); } diff --git a/src/Game/Camera/CameraTargetArg.cpp b/src/Game/Camera/CameraTargetArg.cpp index d389b8310..597086271 100644 --- a/src/Game/Camera/CameraTargetArg.cpp +++ b/src/Game/Camera/CameraTargetArg.cpp @@ -4,7 +4,7 @@ #include "Game/Camera/CameraTargetMtx.hpp" #include "Game/LiveActor/LiveActor.hpp" -CameraTargetArg::CameraTargetArg(const LiveActor *pLiveActor) { +CameraTargetArg::CameraTargetArg(const LiveActor* pLiveActor) { mLiveActor = pLiveActor; mTargetObj = nullptr; mTargetMtx = nullptr; @@ -15,33 +15,33 @@ void CameraTargetArg::setTarget() const { CameraTargetObj* obj = mTargetObj; if (obj != nullptr) { - CameraDirector *director = MR::getCameraDirector(); + CameraDirector* director = MR::getCameraDirector(); director->setTarget(obj); return; } - CameraTargetMtx *mtx = mTargetMtx; - - if (mtx != nullptr) { + CameraTargetMtx* mtx = mTargetMtx; + + if (mtx != nullptr) { mtx->invalidateLastMove(); - CameraDirector *director = MR::getCameraDirector(); + CameraDirector* director = MR::getCameraDirector(); director->setTarget(mTargetMtx); return; } - const LiveActor *liveActor = mLiveActor; - + const LiveActor* liveActor = mLiveActor; + if (liveActor != nullptr) { - CameraDirector *director = MR::getCameraDirector(); + CameraDirector* director = MR::getCameraDirector(); director->setTargetActor(liveActor); return; } - MarioActor *marioActor = mMarioActor; - + MarioActor* marioActor = mMarioActor; + if (marioActor != nullptr) { - CameraDirector *director = MR::getCameraDirector(); + CameraDirector* director = MR::getCameraDirector(); director->setTargetPlayer(marioActor); } } \ No newline at end of file diff --git a/src/Game/Camera/CameraTargetHolder.cpp b/src/Game/Camera/CameraTargetHolder.cpp index 6c0916b7f..17ebc9b48 100644 --- a/src/Game/Camera/CameraTargetHolder.cpp +++ b/src/Game/Camera/CameraTargetHolder.cpp @@ -9,27 +9,26 @@ CameraTargetHolder::CameraTargetHolder() { } CameraTargetHolder::~CameraTargetHolder() { - } void CameraTargetHolder::movement() { mTargetActor->movement(); } -CameraTargetObj *CameraTargetHolder::get() { +CameraTargetObj* CameraTargetHolder::get() { return mTarget; } -void CameraTargetHolder::set(CameraTargetObj *pTarget) { +void CameraTargetHolder::set(CameraTargetObj* pTarget) { mTarget = pTarget; } -void CameraTargetHolder::set(const LiveActor *pActor) { +void CameraTargetHolder::set(const LiveActor* pActor) { mTargetActor->mActor = pActor; mTarget = mTargetActor; } -void CameraTargetHolder::set(const MarioActor *pActor) { +void CameraTargetHolder::set(const MarioActor* pActor) { mTargetPlayer->mActor = pActor; mTarget = mTargetPlayer; } @@ -39,8 +38,8 @@ bool CameraTargetHolder::isOnGround() const { } bool CameraTargetHolder::isMoving() const { - const TVec3f *lastMove = mTarget->getLastMove(); - f32 length = PSVECMag(reinterpret_cast(lastMove)); + const TVec3f* lastMove = mTarget->getLastMove(); + f32 length = PSVECMag(reinterpret_cast(lastMove)); return length > 1.0f; } \ No newline at end of file diff --git a/src/Game/Camera/CameraTargetMtx.cpp b/src/Game/Camera/CameraTargetMtx.cpp index 858c605d6..2f5957618 100644 --- a/src/Game/Camera/CameraTargetMtx.cpp +++ b/src/Game/Camera/CameraTargetMtx.cpp @@ -2,8 +2,7 @@ #include "Game/Camera/CameraTargetMtx.hpp" #include "Game/Util/GravityUtil.hpp" -void CameraTargetObj::init(const JMapInfoIter &rIter) { - +void CameraTargetObj::init(const JMapInfoIter& rIter) { } bool CameraTargetObj::isTurning() const { @@ -22,7 +21,7 @@ u32 CameraTargetObj::getSpecialMode() const { return 0; } -GravityInfo *CameraTargetObj::getGravityInfo() const { +GravityInfo* CameraTargetObj::getGravityInfo() const { return nullptr; } @@ -43,10 +42,10 @@ bool CameraTargetObj::isDebugMode() const { } void CameraTargetObj::resetStatus() { - } -CameraTargetMtx::CameraTargetMtx(const char *pName) : CameraTargetObj(pName) { +CameraTargetMtx::CameraTargetMtx(const char* pName) + : CameraTargetObj(pName) { mPosition.x = 0.0f; mPosition.y = 0.0f; mPosition.z = 0.0f; @@ -71,7 +70,6 @@ CameraTargetMtx::CameraTargetMtx(const char *pName) : CameraTargetObj(pName) { } CameraTargetMtx::~CameraTargetMtx() { - } #ifdef NON_MATCHING @@ -89,11 +87,10 @@ void CameraTargetMtx::movement() { mLastMove.z = 0.0f; mLastMove.y = 0.0f; mLastMove.x = 0.0f; - } - else { - register TVec3f &rPos = position; - register TVec3f &thisPos = mPosition; - register TVec3f &thisLastMove = mLastMove; + } else { + register TVec3f& rPos = position; + register TVec3f& thisPos = mPosition; + register TVec3f& thisLastMove = mLastMove; __asm { psq_l f0, 0(rPos), 0, 0 @@ -111,48 +108,47 @@ void CameraTargetMtx::movement() { mPosition.y = position.y; mPosition.z = position.z; - AreaObj *area = MR::getAreaObj("CubeCamera", mPosition); + AreaObj* area = MR::getAreaObj("CubeCamera", mPosition); if (area == nullptr) { mCameraArea = nullptr; - } - else { - mCameraArea = reinterpret_cast(area); + } else { + mCameraArea = reinterpret_cast(area); } MR::calcGravityVectorOrZero(this, mPosition, &mGravityVector, nullptr, 0); } #endif -const TVec3f *CameraTargetMtx::getPosition() const { +const TVec3f* CameraTargetMtx::getPosition() const { return &mPosition; } -const TVec3f *CameraTargetMtx::getUpVec() const { +const TVec3f* CameraTargetMtx::getUpVec() const { return &mUp; } -const TVec3f *CameraTargetMtx::getFrontVec() const { +const TVec3f* CameraTargetMtx::getFrontVec() const { return &mFront; } -const TVec3f *CameraTargetMtx::getSideVec() const { +const TVec3f* CameraTargetMtx::getSideVec() const { return &mSide; } -const TVec3f *CameraTargetMtx::getLastMove() const { +const TVec3f* CameraTargetMtx::getLastMove() const { return &mLastMove; } -const TVec3f *CameraTargetMtx::getGroundPos() const { +const TVec3f* CameraTargetMtx::getGroundPos() const { return &mPosition; } -const TVec3f *CameraTargetMtx::getGravityVector() const { +const TVec3f* CameraTargetMtx::getGravityVector() const { return &mGravityVector; } -CubeCameraArea *CameraTargetMtx::getCubeCameraArea() const { +CubeCameraArea* CameraTargetMtx::getCubeCameraArea() const { return mCameraArea; } diff --git a/src/Game/Camera/CameraTargetObj.cpp b/src/Game/Camera/CameraTargetObj.cpp index fdd1027d1..d0619db10 100644 --- a/src/Game/Camera/CameraTargetObj.cpp +++ b/src/Game/Camera/CameraTargetObj.cpp @@ -4,11 +4,13 @@ #include "Game/LiveActor/LiveActor.hpp" #include "Game/Util/LiveActorUtil.hpp" -CameraTargetObj::CameraTargetObj(const char *pName) : NameObj(pName) { +CameraTargetObj::CameraTargetObj(const char* pName) + : NameObj(pName) { mCameraWall = false; } -CameraTargetActor::CameraTargetActor(const char *pName) : CameraTargetObj(pName) { +CameraTargetActor::CameraTargetActor(const char* pName) + : CameraTargetObj(pName) { mActor = nullptr; mUp.x = 0.0f; mUp.y = 1.0f; @@ -23,7 +25,6 @@ CameraTargetActor::CameraTargetActor(const char *pName) : CameraTargetObj(pName) } CameraTargetActor::~CameraTargetActor() { - } void CameraTargetActor::movement() { @@ -35,8 +36,7 @@ void CameraTargetActor::movement() { MR::calcUpVec(&mUp, mActor); MR::calcFrontVec(&mFront, mActor); MR::calcSideVec(&mSide, mActor); - } - else { + } else { TRot3f matrix; MR::makeMtxRotate(reinterpret_cast(&matrix), mActor->mRotation.x, mActor->mRotation.y, mActor->mRotation.z); @@ -45,45 +45,43 @@ void CameraTargetActor::movement() { matrix.getXDir(mSide); } - CubeCameraArea *area = reinterpret_cast(MR::getAreaObj("CubeCamera", mActor->mPosition)); + CubeCameraArea* area = reinterpret_cast(MR::getAreaObj("CubeCamera", mActor->mPosition)); if (area == nullptr) { mCameraArea = nullptr; - } - else { + } else { mCameraArea = area; } } -const TVec3f *CameraTargetActor::getPosition() const { +const TVec3f* CameraTargetActor::getPosition() const { return &mActor->mPosition; } -const TVec3f *CameraTargetActor::getUpVec() const { +const TVec3f* CameraTargetActor::getUpVec() const { return &mUp; } -const TVec3f *CameraTargetActor::getFrontVec() const { +const TVec3f* CameraTargetActor::getFrontVec() const { return &mFront; } -const TVec3f *CameraTargetActor::getSideVec() const { +const TVec3f* CameraTargetActor::getSideVec() const { return &mSide; } -const TVec3f *CameraTargetActor::getLastMove() const { +const TVec3f* CameraTargetActor::getLastMove() const { return &mActor->mVelocity; } -const TVec3f *CameraTargetActor::getGroundPos() const { +const TVec3f* CameraTargetActor::getGroundPos() const { return &mActor->mPosition; } -const TVec3f *CameraTargetActor::getGravityVector() const { +const TVec3f* CameraTargetActor::getGravityVector() const { if (getGravityInfo() != nullptr) { return &getGravityInfo()->mGravityVector; - } - else { + } else { return &mUp; } } @@ -92,15 +90,16 @@ f32 CameraTargetActor::getRadius() const { return 150.0f; } -CubeCameraArea *CameraTargetActor::getCubeCameraArea() const { +CubeCameraArea* CameraTargetActor::getCubeCameraArea() const { return mCameraArea; } -Triangle *CameraTargetActor::getGroundTriangle() const { +Triangle* CameraTargetActor::getGroundTriangle() const { return nullptr; } -CameraTargetPlayer::CameraTargetPlayer(const char *pName) : CameraTargetObj(pName) { +CameraTargetPlayer::CameraTargetPlayer(const char* pName) + : CameraTargetObj(pName) { mGravity.x = 0.0f; mGravity.y = -1.0f; mGravity.z = 0.0f; @@ -114,25 +113,24 @@ CameraTargetPlayer::CameraTargetPlayer(const char *pName) : CameraTargetObj(pNam } CameraTargetPlayer::~CameraTargetPlayer() { - } -const TVec3f *CameraTargetPlayer::getUpVec() const { +const TVec3f* CameraTargetPlayer::getUpVec() const { return &mUp; } -const TVec3f *CameraTargetPlayer::getFrontVec() const { +const TVec3f* CameraTargetPlayer::getFrontVec() const { return &mFront; } -const TVec3f *CameraTargetPlayer::getSideVec() const { +const TVec3f* CameraTargetPlayer::getSideVec() const { return &mSide; } -const TVec3f *CameraTargetPlayer::getGroundPos() const { +const TVec3f* CameraTargetPlayer::getGroundPos() const { return &mGroundPos; } -const TVec3f *CameraTargetPlayer::getGravityVector() const { +const TVec3f* CameraTargetPlayer::getGravityVector() const { return &mGravity; } \ No newline at end of file diff --git a/src/Game/Camera/CameraTower.cpp b/src/Game/Camera/CameraTower.cpp index 5d74aae09..13810ddab 100644 --- a/src/Game/Camera/CameraTower.cpp +++ b/src/Game/Camera/CameraTower.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraTower.hpp" #include "Game/Camera/CamTranslatorTower.hpp" -CameraTower::CameraTower(const char *pName) : Camera(pName) { +CameraTower::CameraTower(const char* pName) + : Camera(pName) { mWPoint.x = 0.0f; mWPoint.y = 0.0f; mWPoint.z = 0.0f; @@ -24,9 +25,8 @@ CameraTower::CameraTower(const char *pName) : Camera(pName) { } CameraTower::~CameraTower() { - } -CamTranslatorBase *CameraTower::createTranslator() { +CamTranslatorBase* CameraTower::createTranslator() { return new CamTranslatorTower(this); } diff --git a/src/Game/Camera/CameraTowerBase.cpp b/src/Game/Camera/CameraTowerBase.cpp index bf48dc99f..3fa4d8b8b 100644 --- a/src/Game/Camera/CameraTowerBase.cpp +++ b/src/Game/Camera/CameraTowerBase.cpp @@ -1,6 +1,7 @@ #include "Game/Camera/CameraTowerBase.hpp" -CameraTowerBase::CameraTowerBase(const char *pName) : Camera(pName) { +CameraTowerBase::CameraTowerBase(const char* pName) + : Camera(pName) { _4C = 0.0f; _50 = 0.0f; _54 = 0.0f; @@ -12,5 +13,4 @@ CameraTowerBase::CameraTowerBase(const char *pName) : Camera(pName) { } CameraTowerBase::~CameraTowerBase() { - } \ No newline at end of file diff --git a/src/Game/Camera/CameraTowerPos.cpp b/src/Game/Camera/CameraTowerPos.cpp index 45da64e31..7c7192c22 100644 --- a/src/Game/Camera/CameraTowerPos.cpp +++ b/src/Game/Camera/CameraTowerPos.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraTowerPos.hpp" #include "Game/Camera/CamTranslatorTowerPos.hpp" -CameraTowerPos::CameraTowerPos(const char *pName) : CameraTowerBase(pName) { +CameraTowerPos::CameraTowerPos(const char* pName) + : CameraTowerBase(pName) { mWPoint.x = 0.0f; mWPoint.y = 0.0f; mWPoint.z = 0.0f; @@ -18,9 +19,8 @@ CameraTowerPos::CameraTowerPos(const char *pName) : CameraTowerBase(pName) { } CameraTowerPos::~CameraTowerPos() { - } -CamTranslatorBase *CameraTowerPos::createTranslator() { +CamTranslatorBase* CameraTowerPos::createTranslator() { return new CamTranslatorTowerPos(this); } diff --git a/src/Game/Camera/CameraTripodBoss.cpp b/src/Game/Camera/CameraTripodBoss.cpp index 9b27d680d..92a4697fd 100644 --- a/src/Game/Camera/CameraTripodBoss.cpp +++ b/src/Game/Camera/CameraTripodBoss.cpp @@ -1,14 +1,14 @@ #include "Game/Camera/CameraTripodBoss.hpp" #include "Game/Camera/CamTranslatorTripodBoss.hpp" -CameraTripodBoss::CameraTripodBoss(const char *pName) : CameraTower(pName) { +CameraTripodBoss::CameraTripodBoss(const char* pName) + : CameraTower(pName) { upZ = 0.0f; } CameraTripodBoss::~CameraTripodBoss() { - } -CamTranslatorBase *CameraTripodBoss::createTranslator() { +CamTranslatorBase* CameraTripodBoss::createTranslator() { return new CamTranslatorTripodBoss(this); } diff --git a/src/Game/Camera/CameraTripodBossJoint.cpp b/src/Game/Camera/CameraTripodBossJoint.cpp index c8a5acdf4..083c9ede3 100644 --- a/src/Game/Camera/CameraTripodBossJoint.cpp +++ b/src/Game/Camera/CameraTripodBossJoint.cpp @@ -2,7 +2,8 @@ #include "Game/Camera/CamTranslatorTripodBossJoint.hpp" #include "Game/Camera/CameraLocalUtil.hpp" -CameraTripodBossJoint::CameraTripodBossJoint(const char *pName) : Camera(pName) { +CameraTripodBossJoint::CameraTripodBossJoint(const char* pName) + : Camera(pName) { mAngleB = 0.0f; mAngleA = 0.0f; mDist = 3000.0f; @@ -27,10 +28,9 @@ CameraTargetObj* CameraTripodBossJoint::calc() { } CameraTripodBossJoint::~CameraTripodBossJoint() { - } -CamTranslatorBase *CameraTripodBossJoint::createTranslator() { +CamTranslatorBase* CameraTripodBossJoint::createTranslator() { return new CamTranslatorTripodBossJoint(this); } diff --git a/src/Game/Camera/CameraTripodPlanet.cpp b/src/Game/Camera/CameraTripodPlanet.cpp index 2dc1aa3d4..5727fae37 100644 --- a/src/Game/Camera/CameraTripodPlanet.cpp +++ b/src/Game/Camera/CameraTripodPlanet.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraTripodPlanet.hpp" #include "Game/Camera/CamTranslatorTripodPlanet.hpp" -CameraTripodPlanet::CameraTripodPlanet(const char *pName) : Camera(pName) { +CameraTripodPlanet::CameraTripodPlanet(const char* pName) + : Camera(pName) { mAxis.x = 0.0f; mAxis.y = 1.0f; mAxis.z = 0.0f; @@ -14,9 +15,8 @@ CameraTripodPlanet::CameraTripodPlanet(const char *pName) : Camera(pName) { } CameraTripodPlanet::~CameraTripodPlanet() { - } -CamTranslatorBase *CameraTripodPlanet::createTranslator() { +CamTranslatorBase* CameraTripodPlanet::createTranslator() { return new CamTranslatorTripodPlanet(this); } diff --git a/src/Game/Camera/CameraTrundle.cpp b/src/Game/Camera/CameraTrundle.cpp index 03959eabd..73bd98875 100644 --- a/src/Game/Camera/CameraTrundle.cpp +++ b/src/Game/Camera/CameraTrundle.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraTrundle.hpp" #include "Game/Camera/CamTranslatorTrundle.hpp" -CameraTrundle::CameraTrundle(const char *pName) : Camera(pName) { +CameraTrundle::CameraTrundle(const char* pName) + : Camera(pName) { mWPoint.x = 0.0f; mWPoint.y = 0.0f; mWPoint.z = 0.0f; @@ -15,9 +16,8 @@ CameraTrundle::CameraTrundle(const char *pName) : Camera(pName) { } CameraTrundle::~CameraTrundle() { - } -CamTranslatorBase *CameraTrundle::createTranslator() { +CamTranslatorBase* CameraTrundle::createTranslator() { return new CamTranslatorTrundle(this); } diff --git a/src/Game/Camera/CameraTwistedPassage.cpp b/src/Game/Camera/CameraTwistedPassage.cpp index 3f0a975e3..a5fe177ae 100644 --- a/src/Game/Camera/CameraTwistedPassage.cpp +++ b/src/Game/Camera/CameraTwistedPassage.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraTwistedPassage.hpp" #include "Game/Camera/CamTranslatorTwistedPassage.hpp" -CameraTwistedPassage::CameraTwistedPassage(const char *pName) : Camera(pName) { +CameraTwistedPassage::CameraTwistedPassage(const char* pName) + : Camera(pName) { _4C = 0; _50 = 500.0f; _54 = 1300.0f; @@ -9,9 +10,8 @@ CameraTwistedPassage::CameraTwistedPassage(const char *pName) : Camera(pName) { } CameraTwistedPassage::~CameraTwistedPassage() { - } -CamTranslatorBase *CameraTwistedPassage::createTranslator() { +CamTranslatorBase* CameraTwistedPassage::createTranslator() { return new CamTranslatorTwistedPassage(this); } diff --git a/src/Game/Camera/CameraWaterFollow.cpp b/src/Game/Camera/CameraWaterFollow.cpp index 03e0bd5fc..f742d6deb 100644 --- a/src/Game/Camera/CameraWaterFollow.cpp +++ b/src/Game/Camera/CameraWaterFollow.cpp @@ -4,7 +4,8 @@ #include "Game/Camera/CameraMan.hpp" #include "JSystem/JGeometry/TVec.hpp" -CameraWaterFollow::CameraWaterFollow(const char *pName) : Camera(pName) { +CameraWaterFollow::CameraWaterFollow(const char* pName) + : Camera(pName) { mAxisY = 300.0f; mAxisX = 1200.0f; mDist = 0.01f; @@ -27,20 +28,18 @@ void CameraWaterFollow::reset() { _68 = 0.0f; _64 = 0.0f; _60 = 0.0f; - CameraLocalUtil::setWatchPos(this, *CameraLocalUtil::getWatchPos(mCameraMan)); + CameraLocalUtil::setWatchPos(this, *CameraLocalUtil::getWatchPos(mCameraMan)); CameraLocalUtil::setPos(this, *CameraLocalUtil::getPos(mCameraMan)); CameraLocalUtil::setUpVecAndWatchUpVec(this, *CameraLocalUtil::getUpVec(mCameraMan)); } CameraWaterFollow::~CameraWaterFollow() { - } -CamTranslatorBase *CameraWaterFollow::createTranslator() { +CamTranslatorBase* CameraWaterFollow::createTranslator() { return new CamTranslatorWaterFollow(this); } - bool CameraWaterFollow::isEnableToReset() const { return true; } diff --git a/src/Game/Camera/CameraWaterPlanet.cpp b/src/Game/Camera/CameraWaterPlanet.cpp index 47535e57d..8e7a20f5d 100644 --- a/src/Game/Camera/CameraWaterPlanet.cpp +++ b/src/Game/Camera/CameraWaterPlanet.cpp @@ -1,16 +1,16 @@ #include "Game/Camera/CameraWaterPlanet.hpp" #include "Game/Camera/CamTranslatorWaterPlanet.hpp" -CameraWaterPlanet::CameraWaterPlanet(const char *pName) : Camera(pName) { +CameraWaterPlanet::CameraWaterPlanet(const char* pName) + : Camera(pName) { mAxisX = 500.0f; mAxisY = 2000.0f; mAngleA = 0.7853982f; } CameraWaterPlanet::~CameraWaterPlanet() { - } -CamTranslatorBase *CameraWaterPlanet::createTranslator() { +CamTranslatorBase* CameraWaterPlanet::createTranslator() { return new CamTranslatorWaterPlanet(this); } diff --git a/src/Game/Camera/CameraWaterPlanetBoss.cpp b/src/Game/Camera/CameraWaterPlanetBoss.cpp index 0e6d8d6f5..7e052129d 100644 --- a/src/Game/Camera/CameraWaterPlanetBoss.cpp +++ b/src/Game/Camera/CameraWaterPlanetBoss.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraWaterPlanetBoss.hpp" #include "Game/Camera/CamTranslatorWaterPlanetBoss.hpp" -CameraWaterPlanetBoss::CameraWaterPlanetBoss(const char *pName) : Camera(pName) { +CameraWaterPlanetBoss::CameraWaterPlanetBoss(const char* pName) + : Camera(pName) { mAxisY = 300.0f; mAxisX = 1200.0f; mDist = 0.01f; @@ -26,9 +27,8 @@ CameraWaterPlanetBoss::CameraWaterPlanetBoss(const char *pName) : Camera(pName) } CameraWaterPlanetBoss::~CameraWaterPlanetBoss() { - } -CamTranslatorBase *CameraWaterPlanetBoss::createTranslator() { +CamTranslatorBase* CameraWaterPlanetBoss::createTranslator() { return new CamTranslatorWaterPlanetBoss(this); } diff --git a/src/Game/Camera/CameraWonderPlanet.cpp b/src/Game/Camera/CameraWonderPlanet.cpp index a2d4a0227..59ed6a80e 100644 --- a/src/Game/Camera/CameraWonderPlanet.cpp +++ b/src/Game/Camera/CameraWonderPlanet.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraWonderPlanet.hpp" #include "Game/Camera/CamTranslatorWonderPlanet.hpp" -CameraWonderPlanet::CameraWonderPlanet(const char *pName) : Camera(pName) { +CameraWonderPlanet::CameraWonderPlanet(const char* pName) + : Camera(pName) { mAxisX = 500.0f; mAxisY = 2000.0f; mAngleA = 0.7853982f; @@ -10,9 +11,8 @@ CameraWonderPlanet::CameraWonderPlanet(const char *pName) : Camera(pName) { } CameraWonderPlanet::~CameraWonderPlanet() { - } -CamTranslatorBase *CameraWonderPlanet::createTranslator() { +CamTranslatorBase* CameraWonderPlanet::createTranslator() { return new CamTranslatorWonderPlanet(this); } diff --git a/src/Game/Camera/DotCamParams.cpp b/src/Game/Camera/DotCamParams.cpp index eb9071a1e..92ef05c0d 100644 --- a/src/Game/Camera/DotCamParams.cpp +++ b/src/Game/Camera/DotCamParams.cpp @@ -3,11 +3,10 @@ #include DotCamReader::~DotCamReader() { - } -DotCamReaderInBin::DotCamReaderInBin(const void *pData) : - mVersion(0), _8(nullptr), mMapInfo() { +DotCamReaderInBin::DotCamReaderInBin(const void* pData) + : mVersion(0), _8(nullptr), mMapInfo() { mMapIter.mInfo = nullptr; mMapIter.mIndex = -1; init(pData); @@ -29,18 +28,18 @@ bool DotCamReaderInBin::hasMoreChunk() const { bool hasMore = false; if (mMapIter.isValid()) { - const JMapData *mapData = mMapInfo.mData; - s32 iVar2 = mapData != nullptr ? mapData->_0 : 0; + const JMapData* mapData = mMapInfo.mData; + s32 iVar2 = mapData != nullptr ? mapData->_0 : 0; bool bVar1 = false; - const JMapInfo &mapInfo = mMapInfo; + const JMapInfo& mapInfo = mMapInfo; if (mMapIter.mIndex == iVar2 && mMapIter.mInfo != nullptr && mapInfo.mData != nullptr) { if (mMapIter.mInfo->mData == mapInfo.mData) { bVar1 = true; } - } + } if (!bVar1) { hasMore = true; @@ -57,17 +56,17 @@ void DotCamReaderInBin::nextToChunk() { } } -bool DotCamReaderInBin::getValueInt(const char *pName, s32 *pOut) { +bool DotCamReaderInBin::getValueInt(const char* pName, s32* pOut) { return mMapIter.getValue(pName, pOut); } -bool DotCamReaderInBin::getValueFloat(const char *pName, f32 *pOut) { +bool DotCamReaderInBin::getValueFloat(const char* pName, f32* pOut) { return mMapIter.getValue(pName, pOut); } -bool DotCamReaderInBin::getValueVec(const char *pName, TVec3f *pOut) { - char buffer[0x100]; - char *pBuffer = &buffer[0]; +bool DotCamReaderInBin::getValueVec(const char* pName, TVec3f* pOut) { + char buffer[0x100]; + char* pBuffer = &buffer[0]; f32 z; f32 y; @@ -91,10 +90,10 @@ bool DotCamReaderInBin::getValueVec(const char *pName, TVec3f *pOut) { return success; } -bool DotCamReaderInBin::getValueString(const char *pName, const char **pOut) { - s32 iVar3 = mMapIter.mIndex; - const JMapInfo *info = mMapIter.mInfo; - s32 index = info->searchItemInfo(pName); +bool DotCamReaderInBin::getValueString(const char* pName, const char** pOut) { + s32 iVar3 = mMapIter.mIndex; + const JMapInfo* info = mMapIter.mInfo; + s32 index = info->searchItemInfo(pName); if (index < 0) { return false; @@ -105,9 +104,9 @@ bool DotCamReaderInBin::getValueString(const char *pName, const char **pOut) { #ifdef NON_MATCHING // Stack issues -void DotCamReaderInBin::init(const void *pData) { +void DotCamReaderInBin::init(const void* pData) { mMapInfo.attach(pData); - s32 index = mMapInfo.searchItemInfo("version"); + s32 index = mMapInfo.searchItemInfo("version"); bool valid = index >= 0; diff --git a/src/Game/Camera/GameCameraCreator.cpp b/src/Game/Camera/GameCameraCreator.cpp index 71932a621..1a11fe2cc 100644 --- a/src/Game/Camera/GameCameraCreator.cpp +++ b/src/Game/Camera/GameCameraCreator.cpp @@ -5,7 +5,7 @@ #include #include -GameCameraCreator::GameCameraCreator(CameraParamChunkHolder *pChunkHolder) { +GameCameraCreator::GameCameraCreator(CameraParamChunkHolder* pChunkHolder) { mChunkHolder = pChunkHolder; _4 = nullptr; _8 = -1; @@ -13,7 +13,7 @@ GameCameraCreator::GameCameraCreator(CameraParamChunkHolder *pChunkHolder) { memset(&mCodes[0], 0, sizeof(mCodes)); } -void GameCameraCreator::initCameraCodeCollection(const char *a1, s32 a2) { +void GameCameraCreator::initCameraCodeCollection(const char* a1, s32 a2) { _4 = a1; _8 = a2; } diff --git a/src/Game/Camera/OnlyCamera.cpp b/src/Game/Camera/OnlyCamera.cpp index ab87d3a11..315ee5923 100644 --- a/src/Game/Camera/OnlyCamera.cpp +++ b/src/Game/Camera/OnlyCamera.cpp @@ -1,7 +1,8 @@ #include "Game/Camera/CameraPoseParam.hpp" #include "Game/Camera/OnlyCamera.hpp" -OnlyCamera::OnlyCamera(const char *pName) : NameObj(pName) { +OnlyCamera::OnlyCamera(const char* pName) + : NameObj(pName) { mPoseParam = new CameraPoseParam(); _10 = true; _11 = false; @@ -20,5 +21,4 @@ OnlyCamera::OnlyCamera(const char *pName) : NameObj(pName) { } OnlyCamera::~OnlyCamera() { - } \ No newline at end of file diff --git a/src/Game/Demo/AstroDemoFunction.cpp b/src/Game/Demo/AstroDemoFunction.cpp index c4730a8b3..e7bebb040 100644 --- a/src/Game/Demo/AstroDemoFunction.cpp +++ b/src/Game/Demo/AstroDemoFunction.cpp @@ -101,7 +101,7 @@ namespace AstroDemoFunction { void tryRegisterDemoForTico(LiveActor* pParam1, const JMapInfoIter& rIter) { if (tryRegisterSimpleCastIfAstroGalaxy(pParam1)) { - s32 demoCastID = MR::getDemoCastID(rIter); + s32 demoCastID = MR::getDemoCastID(rIter); const char* pDemoName = nullptr; switch (demoCastID) { @@ -128,4 +128,4 @@ namespace AstroDemoFunction { AstroDemoFunction::tryRegisterDemo(pParam1, "バトラーグリーンドライバ説明", rIter); AstroDemoFunction::tryRegisterDemo(pParam1, "ロゼッタ最終決戦デモ", rIter); } -}; +}; // namespace AstroDemoFunction diff --git a/src/Game/Demo/DemoActionKeeper.cpp b/src/Game/Demo/DemoActionKeeper.cpp index cd6e68a65..7a3bf9cb1 100644 --- a/src/Game/Demo/DemoActionKeeper.cpp +++ b/src/Game/Demo/DemoActionKeeper.cpp @@ -2,12 +2,12 @@ #include "Game/Demo/DemoFunction.hpp" #include "Game/Util.hpp" -void DemoActionInfo::registerCast(LiveActor *pActor) { +void DemoActionInfo::registerCast(LiveActor* pActor) { mCastList[mCastCount] = pActor; mCastCount++; } -void DemoActionInfo::registerFunctor(const LiveActor *pActor, const MR::FunctorBase &rFunctor) { +void DemoActionInfo::registerFunctor(const LiveActor* pActor, const MR::FunctorBase& rFunctor) { for (s32 i = 0; i < mCastCount; i++) { if (mCastList[i] == pActor) { mFunctors[i] = rFunctor.clone(nullptr); @@ -16,7 +16,7 @@ void DemoActionInfo::registerFunctor(const LiveActor *pActor, const MR::FunctorB } } -void DemoActionInfo::registerNerve(const LiveActor *pActor, const Nerve *pNerve) { +void DemoActionInfo::registerNerve(const LiveActor* pActor, const Nerve* pNerve) { for (s32 i = 0; i < mCastCount; i++) { if (mCastList[i] == pActor) { mNerves[i] = pNerve; @@ -25,7 +25,7 @@ void DemoActionInfo::registerNerve(const LiveActor *pActor, const Nerve *pNerve) } } -void DemoActionKeeper::registerNerve(const LiveActor *pActor, const Nerve *pNerve, const char *pPartName) { +void DemoActionKeeper::registerNerve(const LiveActor* pActor, const Nerve* pNerve, const char* pPartName) { for (s32 i = 0; i < mNumInfos; i++) { DemoActionInfo* info = mInfoArray[i]; @@ -46,27 +46,26 @@ void DemoActionKeeper::update() { info = mInfoArray[i]; if (MR::isDemoPartFirstStep(info->mPartName)) { mInfoArray[i]->executeActionFirst(); - } - else if (MR::isDemoPartLastStep(info->mPartName)) { + } else if (MR::isDemoPartLastStep(info->mPartName)) { mInfoArray[i]->executeActionLast(); } } } } -bool DemoActionKeeper::isRegisteredDemoActionAppear(const LiveActor *pActor) const { +bool DemoActionKeeper::isRegisteredDemoActionAppear(const LiveActor* pActor) const { return isRegisteredDemoAction(pActor, 0); } -bool DemoActionKeeper::isRegisteredDemoActionFunctor(const LiveActor *pActor) const { +bool DemoActionKeeper::isRegisteredDemoActionFunctor(const LiveActor* pActor) const { return isRegisteredDemoAction(pActor, 2); } -bool DemoActionKeeper::isRegisteredDemoActionNerve(const LiveActor *pActor) const { +bool DemoActionKeeper::isRegisteredDemoActionNerve(const LiveActor* pActor) const { return isRegisteredDemoAction(pActor, 3); } -DemoActionKeeper::DemoActionKeeper(const DemoExecutor *pExector) { +DemoActionKeeper::DemoActionKeeper(const DemoExecutor* pExector) { mDemoExecutor = pExector; mNumInfos = 0; mInfoArray = nullptr; diff --git a/src/Game/Demo/DemoCameraFunction.cpp b/src/Game/Demo/DemoCameraFunction.cpp index 442e9b2cc..43a1ec2bb 100644 --- a/src/Game/Demo/DemoCameraFunction.cpp +++ b/src/Game/Demo/DemoCameraFunction.cpp @@ -30,4 +30,4 @@ namespace DemoCameraFunction { void makeAnimCameraName(char* pName, u32 size, const DemoCameraInfo* pInfo) { MR::removeExtensionString(pName, size, pInfo->_C); } -}; +}; // namespace DemoCameraFunction diff --git a/src/Game/Demo/DemoCastGroup.cpp b/src/Game/Demo/DemoCastGroup.cpp index b5c7eb651..de0d87995 100644 --- a/src/Game/Demo/DemoCastGroup.cpp +++ b/src/Game/Demo/DemoCastGroup.cpp @@ -1,11 +1,12 @@ #include "Game/Demo/DemoCastGroup.hpp" -DemoCastGroup::DemoCastGroup(const char *pName) : NameObj(pName) { +DemoCastGroup::DemoCastGroup(const char* pName) + : NameObj(pName) { mInfo = 0; mGroup = 0; } -bool DemoCastGroup::tryRegisterDemoActor(LiveActor *pActor, const JMapInfoIter &rIter, const JMapIdInfo &rInfo) { +bool DemoCastGroup::tryRegisterDemoActor(LiveActor* pActor, const JMapInfoIter& rIter, const JMapIdInfo& rInfo) { bool isNotSame = !(*mInfo == rInfo); if (isNotSame) { @@ -16,7 +17,7 @@ bool DemoCastGroup::tryRegisterDemoActor(LiveActor *pActor, const JMapInfoIter & return true; } -bool DemoCastGroup::tryRegisterDemoActor(LiveActor *pActor, const char *pName, const JMapInfoIter &rIter) { +bool DemoCastGroup::tryRegisterDemoActor(LiveActor* pActor, const char* pName, const JMapInfoIter& rIter) { if (!MR::isEqualString(mName, pName)) { return false; } @@ -25,11 +26,11 @@ bool DemoCastGroup::tryRegisterDemoActor(LiveActor *pActor, const char *pName, c return true; } -void DemoCastGroup::registerDemoActor(LiveActor *pActor, const JMapInfoIter & /* unused */) { +void DemoCastGroup::registerDemoActor(LiveActor* pActor, const JMapInfoIter& /* unused */) { mGroup->registerActor(pActor); } -void DemoCastGroup::init(const JMapInfoIter &rIter) { +void DemoCastGroup::init(const JMapInfoIter& rIter) { setName(MR::getDemoName(rIter)); mGroup = new LiveActorGroup("関連者保持", 0xC0); mGroup->initWithoutIter(); diff --git a/src/Game/Demo/DemoCastGroupHolder.cpp b/src/Game/Demo/DemoCastGroupHolder.cpp index c2c3dede5..a368835b4 100644 --- a/src/Game/Demo/DemoCastGroupHolder.cpp +++ b/src/Game/Demo/DemoCastGroupHolder.cpp @@ -1,10 +1,10 @@ #include "Game/Demo/DemoCastGroupHolder.hpp" -DemoCastGroupHolder::DemoCastGroupHolder() : NameObjGroup("デモ関係者グループ保持", 0x20) { - +DemoCastGroupHolder::DemoCastGroupHolder() + : NameObjGroup("デモ関係者グループ保持", 0x20) { } -bool DemoCastGroupHolder::tryRegisterDemoActor(LiveActor *pActor, const JMapInfoIter &rIter, const JMapIdInfo &rInfo) const { +bool DemoCastGroupHolder::tryRegisterDemoActor(LiveActor* pActor, const JMapInfoIter& rIter, const JMapIdInfo& rInfo) const { for (s32 i = 0; i < mObjectCount; i++) { bool ret = reinterpret_cast(mObjects[i])->tryRegisterDemoActor(pActor, rIter, rInfo); @@ -16,7 +16,7 @@ bool DemoCastGroupHolder::tryRegisterDemoActor(LiveActor *pActor, const JMapInfo return false; } -bool DemoCastGroupHolder::tryRegisterDemoActor(LiveActor *pActor, const char *pName, const JMapInfoIter &rIter) const { +bool DemoCastGroupHolder::tryRegisterDemoActor(LiveActor* pActor, const char* pName, const JMapInfoIter& rIter) const { for (s32 i = 0; i < mObjectCount; i++) { bool ret = reinterpret_cast(mObjects[i])->tryRegisterDemoActor(pActor, pName, rIter); @@ -32,7 +32,7 @@ DemoCastGroup* DemoCastGroupHolder::getCastGroup(int index) const { return reinterpret_cast(mObjects[index]); } -DemoCastGroup* DemoCastGroupHolder::findCastGroup(const char *pName) const { +DemoCastGroup* DemoCastGroupHolder::findCastGroup(const char* pName) const { for (s32 i = 0; i < mObjectCount; i++) { NameObj* obj = mObjects[i]; if (MR::isName(mObjects[i], pName)) { @@ -44,5 +44,4 @@ DemoCastGroup* DemoCastGroupHolder::findCastGroup(const char *pName) const { } DemoCastGroupHolder::~DemoCastGroupHolder() { - } \ No newline at end of file diff --git a/src/Game/Demo/DemoCastSubGroup.cpp b/src/Game/Demo/DemoCastSubGroup.cpp index a18816a7c..e2d12d875 100644 --- a/src/Game/Demo/DemoCastSubGroup.cpp +++ b/src/Game/Demo/DemoCastSubGroup.cpp @@ -5,16 +5,17 @@ #include "Game/Util/JMapIdInfo.hpp" #include "Game/Util/JMapInfo.hpp" -DemoCastSubGroup::DemoCastSubGroup(const char *pName) : DemoCastGroup(pName) { +DemoCastSubGroup::DemoCastSubGroup(const char* pName) + : DemoCastGroup(pName) { mExecutor = nullptr; } -void DemoCastSubGroup::init(const JMapInfoIter &rIter) { +void DemoCastSubGroup::init(const JMapInfoIter& rIter) { DemoCastGroup::init(rIter); DemoFunction::getDemoCastSubGroupHolder()->registerObj(this); } -bool DemoCastSubGroup::tryRegisterDemoActor(LiveActor *pActor, const JMapInfoIter &rIter, const JMapIdInfo &rInfo) { +bool DemoCastSubGroup::tryRegisterDemoActor(LiveActor* pActor, const JMapInfoIter& rIter, const JMapIdInfo& rInfo) { if (!DemoCastGroup::tryRegisterDemoActor(pActor, rIter, rInfo)) { return false; } @@ -31,5 +32,4 @@ bool DemoCastSubGroup::tryRegisterDemoActor(LiveActor *pActor, const JMapInfoIte } DemoCastSubGroup::~DemoCastSubGroup() { - } diff --git a/src/Game/Demo/DemoCtrlBase.cpp b/src/Game/Demo/DemoCtrlBase.cpp index fdcd06ce8..0f5e1fc37 100644 --- a/src/Game/Demo/DemoCtrlBase.cpp +++ b/src/Game/Demo/DemoCtrlBase.cpp @@ -3,7 +3,7 @@ #include "Game/Util/LiveActorUtil.hpp" #include "Game/Util/ObjUtil.hpp" -DemoCtrlBase::DemoCtrlBase(LiveActor *pActor, const char *pName) { +DemoCtrlBase::DemoCtrlBase(LiveActor* pActor, const char* pName) { mActor = pActor; mCameraInfo = nullptr; mDemoName = pName; @@ -11,7 +11,7 @@ DemoCtrlBase::DemoCtrlBase(LiveActor *pActor, const char *pName) { _10 = false; } -void DemoCtrlBase::init(const JMapInfoIter &rIter) { +void DemoCtrlBase::init(const JMapInfoIter& rIter) { MR::initActorCamera(mActor, rIter, &mCameraInfo); } diff --git a/src/Game/Demo/DemoExecutorFunction.cpp b/src/Game/Demo/DemoExecutorFunction.cpp index 876d3887d..fc12866b6 100644 --- a/src/Game/Demo/DemoExecutorFunction.cpp +++ b/src/Game/Demo/DemoExecutorFunction.cpp @@ -4,15 +4,15 @@ #include "Game/Demo/DemoTimeKeeper.hpp" namespace DemoExecutorFunction { - void registerDemoActionFunction(const DemoExecutor *pExecutor, const LiveActor *pActor, const MR::FunctorBase &rFunctor, const char *a4) { + void registerDemoActionFunction(const DemoExecutor* pExecutor, const LiveActor* pActor, const MR::FunctorBase& rFunctor, const char* a4) { pExecutor->mActionKeeper->registerFunctor(pActor, rFunctor, a4); } - void registerDemoActionNerve(const DemoExecutor *pExecutor, const LiveActor *pActor, const Nerve *pNerve, const char *a4) { + void registerDemoActionNerve(const DemoExecutor* pExecutor, const LiveActor* pActor, const Nerve* pNerve, const char* a4) { pExecutor->mActionKeeper->registerNerve(pActor, pNerve, a4); } - bool isExistDemoPart(const DemoExecutor *pExecutor, const char *pPartName) { + bool isExistDemoPart(const DemoExecutor* pExecutor, const char* pPartName) { if (isExistDemoPartMain(pExecutor, pPartName)) { return true; } @@ -24,8 +24,8 @@ namespace DemoExecutorFunction { return false; } - bool isExistDemoPartMain(const DemoExecutor *pExecutor, const char *pPartName) { - DemoTimeKeeper *pTimeKeeper = pExecutor->mTimeKeeper; + bool isExistDemoPartMain(const DemoExecutor* pExecutor, const char* pPartName) { + DemoTimeKeeper* pTimeKeeper = pExecutor->mTimeKeeper; for (s32 i = 0; i < pTimeKeeper->mNumPartInfos; i++) { if (MR::isEqualString(pTimeKeeper->mMainPartInfos[i].mName, pPartName)) { @@ -36,8 +36,8 @@ namespace DemoExecutorFunction { return false; } - bool isExistDemoPartSub(const DemoExecutor *pExecutor, const char *pPartName) { - DemoSubPartKeeper *pSubPartKeeper = pExecutor->mSubPartKeeper; + bool isExistDemoPartSub(const DemoExecutor* pExecutor, const char* pPartName) { + DemoSubPartKeeper* pSubPartKeeper = pExecutor->mSubPartKeeper; for (s32 i = 0; i < pSubPartKeeper->mNumSubPartInfos; i++) { if (MR::isEqualString(pSubPartKeeper->mSubPartInfos[i].mSubPartName, pPartName)) { @@ -48,8 +48,8 @@ namespace DemoExecutorFunction { return false; } - bool isRegisteredDemoCast(const DemoExecutor *pExecutor, const LiveActor *pActor) { - LiveActorGroup *pGroup = pExecutor->mGroup; + bool isRegisteredDemoCast(const DemoExecutor* pExecutor, const LiveActor* pActor) { + LiveActorGroup* pGroup = pExecutor->mGroup; for (s32 i = 0; i < pGroup->mObjectCount; i++) { if (MR::isSame(pGroup->getActor(i), pActor)) { @@ -60,20 +60,20 @@ namespace DemoExecutorFunction { return false; } - bool isRegisteredDemoActionAppear(const DemoExecutor *pExecutor, const LiveActor *pActor) { + bool isRegisteredDemoActionAppear(const DemoExecutor* pExecutor, const LiveActor* pActor) { return pExecutor->mActionKeeper->isRegisteredDemoActionAppear(pActor); } - bool isRegisteredDemoActionFunctor(const DemoExecutor *pExecutor, const LiveActor *pActor) { + bool isRegisteredDemoActionFunctor(const DemoExecutor* pExecutor, const LiveActor* pActor) { return pExecutor->mActionKeeper->isRegisteredDemoActionFunctor(pActor); } - bool isRegisteredDemoActionNerve(const DemoExecutor *pExecutor, const LiveActor *pActor) { + bool isRegisteredDemoActionNerve(const DemoExecutor* pExecutor, const LiveActor* pActor) { return pExecutor->mActionKeeper->isRegisteredDemoActionNerve(pActor); } - bool tryCreateDemoTalkAnimCtrlForActor(DemoExecutor *pExecutor, LiveActor *pActor, const char *a3, const char *a4) { - DemoTalkAnimCtrl *pTalkAnimCtrl = new DemoTalkAnimCtrl(pActor, pExecutor->mName, a4); + bool tryCreateDemoTalkAnimCtrlForActor(DemoExecutor* pExecutor, LiveActor* pActor, const char* a3, const char* a4) { + DemoTalkAnimCtrl* pTalkAnimCtrl = new DemoTalkAnimCtrl(pActor, pExecutor->mName, a4); pTalkAnimCtrl->initForActor(a3); pExecutor->addTalkAnimCtrl(pTalkAnimCtrl); @@ -81,8 +81,8 @@ namespace DemoExecutorFunction { return true; } - bool tryCreateDemoTalkAnimCtrlForScene(DemoExecutor *pExecutor, LiveActor *pActor, const JMapInfoIter &rIter, const char *a4, const char *a5, s32 a6, s32 a7) { - DemoTalkAnimCtrl *pTalkAnimCtrl = new DemoTalkAnimCtrl(pActor, pExecutor->mName, a5); + bool tryCreateDemoTalkAnimCtrlForScene(DemoExecutor* pExecutor, LiveActor* pActor, const JMapInfoIter& rIter, const char* a4, const char* a5, s32 a6, s32 a7) { + DemoTalkAnimCtrl* pTalkAnimCtrl = new DemoTalkAnimCtrl(pActor, pExecutor->mName, a5); pTalkAnimCtrl->initForScene(a4, a4, rIter); pTalkAnimCtrl->_40 = a6; @@ -92,23 +92,23 @@ namespace DemoExecutorFunction { return true; } - void registerDemoTalkMessageCtrl(DemoExecutor *pExecutor, LiveActor *pActor, TalkMessageCtrl *pTalkCtrl) { + void registerDemoTalkMessageCtrl(DemoExecutor* pExecutor, LiveActor* pActor, TalkMessageCtrl* pTalkCtrl) { pExecutor->addTalkMessageCtrl(pActor, pTalkCtrl); } - void setDemoTalkMessageCtrl(DemoExecutor *pExecutor, const LiveActor *pActor, TalkMessageCtrl *pTalkCtrl) { + void setDemoTalkMessageCtrl(DemoExecutor* pExecutor, const LiveActor* pActor, TalkMessageCtrl* pTalkCtrl) { pExecutor->setTalkMessageCtrl(pActor, pTalkCtrl); } - void pauseTimeKeepDemo(DemoExecutor *pExecutor) { + void pauseTimeKeepDemo(DemoExecutor* pExecutor) { return pExecutor->pause(); } - void resumeTimeKeepDemo(DemoExecutor *pExecutor) { + void resumeTimeKeepDemo(DemoExecutor* pExecutor) { return pExecutor->resume(); } - bool isPauseTimeKeepDemo(const DemoExecutor *pExecutor) { + bool isPauseTimeKeepDemo(const DemoExecutor* pExecutor) { return pExecutor->mTimeKeeper->mIsPaused; } -}; +}; // namespace DemoExecutorFunction diff --git a/src/Game/Demo/DemoFunction.cpp b/src/Game/Demo/DemoFunction.cpp index 6638ff507..9c27ce1f0 100644 --- a/src/Game/Demo/DemoFunction.cpp +++ b/src/Game/Demo/DemoFunction.cpp @@ -9,28 +9,39 @@ #include "Game/Demo/DemoTimeKeeper.hpp" #include "Game/Effect/EffectSystemUtil.hpp" - namespace { - DemoTimeKeeper* getCurrentTimeKeeper() NO_INLINE { return DemoFunction::getDemoDirector()->mExecutor->mTimeKeeper; } - DemoSubPartKeeper* getCurrentSubPartKeeper() NO_INLINE { return DemoFunction::getDemoDirector()->mExecutor->mSubPartKeeper; } + DemoTimeKeeper* getCurrentTimeKeeper() NO_INLINE { + return DemoFunction::getDemoDirector()->mExecutor->mTimeKeeper; + } + DemoSubPartKeeper* getCurrentSubPartKeeper() NO_INLINE { + return DemoFunction::getDemoDirector()->mExecutor->mSubPartKeeper; + } bool isCurrentMainPart(const char* pPartName) NO_INLINE { DemoTimeKeeper* timekeeper = getCurrentTimeKeeper(); return MR::isEqualString(pPartName, timekeeper->mSubPartInfos[0].mName); } -}; // namespace +}; // namespace namespace DemoFunction { DemoDirector* getDemoDirector() { return MR::getSceneObj(SceneObj_DemoDirector); } - DemoCastGroupHolder* getDemoCastSubGroupHolder() { return getDemoDirector()->_1C; } + DemoCastGroupHolder* getDemoCastSubGroupHolder() { + return getDemoDirector()->_1C; + } - void registerDemoSimpleCastAllFunction(LiveActor* pActor) { return getDemoDirector()->registerDemoSimpleCast(pActor); } + void registerDemoSimpleCastAllFunction(LiveActor* pActor) { + return getDemoDirector()->registerDemoSimpleCast(pActor); + } - void registerDemoSimpleCastAllFunction(LayoutActor* pActor) { return getDemoDirector()->registerDemoSimpleCast(pActor); } + void registerDemoSimpleCastAllFunction(LayoutActor* pActor) { + return getDemoDirector()->registerDemoSimpleCast(pActor); + } - void registerDemoSimpleCastAllFunction(NameObj* pObj) { return getDemoDirector()->registerDemoSimpleCast(pObj); } + void registerDemoSimpleCastAllFunction(NameObj* pObj) { + return getDemoDirector()->registerDemoSimpleCast(pObj); + } void registerDemoActionFunctorFunction(const LiveActor* pActor, const MR::FunctorBase& rFunctor, const char* pName) { DemoExecutorFunction::registerDemoActionFunction(findDemoExecutor(pActor), pActor, rFunctor, pName); @@ -68,7 +79,9 @@ namespace DemoFunction { } } - void registerDemoExecutor(DemoExecutor* pExecutor) { getDemoDirector()->_18->registerObj(pExecutor); } + void registerDemoExecutor(DemoExecutor* pExecutor) { + getDemoDirector()->_18->registerObj(pExecutor); + } DemoExecutor* findDemoExecutor(const char* pDemoName) { DemoCastGroup* group = getDemoDirector()->_18->findCastGroup(pDemoName); @@ -100,9 +113,13 @@ namespace DemoFunction { return nullptr; } - bool isDemoCast(const DemoExecutor* pExecutor, const LiveActor* pActor) { return DemoExecutorFunction::isRegisteredDemoCast(pExecutor, pActor); } + bool isDemoCast(const DemoExecutor* pExecutor, const LiveActor* pActor) { + return DemoExecutorFunction::isRegisteredDemoCast(pExecutor, pActor); + } - bool isExistDemoPart(const DemoExecutor* pExecutor, const char* pPartName) { return DemoExecutorFunction::isExistDemoPart(pExecutor, pPartName); } + bool isExistDemoPart(const DemoExecutor* pExecutor, const char* pPartName) { + return DemoExecutorFunction::isExistDemoPart(pExecutor, pPartName); + } bool isDemoPartActiveFunction(const char* pPartName) { if (!MR::isTimeKeepDemoActive()) { @@ -214,17 +231,29 @@ namespace DemoFunction { return false; } - void pauseTimeKeepDemo(LiveActor* pActor) { return DemoExecutorFunction::pauseTimeKeepDemo(DemoFunction::findDemoExecutorActive(pActor)); } + void pauseTimeKeepDemo(LiveActor* pActor) { + return DemoExecutorFunction::pauseTimeKeepDemo(DemoFunction::findDemoExecutorActive(pActor)); + } - void resumeTimeKeepDemo(LiveActor* pActor) { return DemoExecutorFunction::resumeTimeKeepDemo(DemoFunction::findDemoExecutorActive(pActor)); } + void resumeTimeKeepDemo(LiveActor* pActor) { + return DemoExecutorFunction::resumeTimeKeepDemo(DemoFunction::findDemoExecutorActive(pActor)); + } - bool isPauseTimeKeepDemo(LiveActor* pActor) { return DemoExecutorFunction::isPauseTimeKeepDemo(DemoFunction::findDemoExecutorActive(pActor)); } + bool isPauseTimeKeepDemo(LiveActor* pActor) { + return DemoExecutorFunction::isPauseTimeKeepDemo(DemoFunction::findDemoExecutorActive(pActor)); + } - void pauseTimeKeepDemo(const char* pDemoName) { return DemoExecutorFunction::pauseTimeKeepDemo(DemoFunction::findDemoExecutor(pDemoName)); } + void pauseTimeKeepDemo(const char* pDemoName) { + return DemoExecutorFunction::pauseTimeKeepDemo(DemoFunction::findDemoExecutor(pDemoName)); + } - void resumeTimeKeepDemo(const char* pDemoName) { return DemoExecutorFunction::resumeTimeKeepDemo(DemoFunction::findDemoExecutor(pDemoName)); } + void resumeTimeKeepDemo(const char* pDemoName) { + return DemoExecutorFunction::resumeTimeKeepDemo(DemoFunction::findDemoExecutor(pDemoName)); + } - bool isPauseTimeKeepDemo(const char* pDemoName) { return DemoExecutorFunction::isPauseTimeKeepDemo(DemoFunction::findDemoExecutor(pDemoName)); } + bool isPauseTimeKeepDemo(const char* pDemoName) { + return DemoExecutorFunction::isPauseTimeKeepDemo(DemoFunction::findDemoExecutor(pDemoName)); + } bool tryCreateDemoTalkAnimCtrlForActor(LiveActor* pActor, const char* pFileBaseName, const char* a3) { DemoExecutor* executor = findDemoExecutor(pActor); @@ -270,7 +299,7 @@ namespace DemoFunction { s32 createSheetParser(const DemoExecutor* pExecutor, const char* pNameSuffix, JMapInfo** pMap) { const char* sheet_name = pExecutor->mSheetName; - JMapInfo* map = MR::tryCreateCsvParser(getDemoDirector()->mResourceHolder, "Demo%s%s.bcsv", sheet_name, pNameSuffix); + JMapInfo* map = MR::tryCreateCsvParser(getDemoDirector()->mResourceHolder, "Demo%s%s.bcsv", sheet_name, pNameSuffix); *pMap = map; if (map != nullptr) { const JMapData* data = map->mData; @@ -282,5 +311,7 @@ namespace DemoFunction { return 0; } - bool isDemoPartTalk(const char* pDemoName) { return MR::isEqualSubString(pDemoName, "会話"); } -}; // namespace DemoFunction + bool isDemoPartTalk(const char* pDemoName) { + return MR::isEqualSubString(pDemoName, "会話"); + } +}; // namespace DemoFunction diff --git a/src/Game/Demo/DemoPadRumbler.cpp b/src/Game/Demo/DemoPadRumbler.cpp index ea020de62..8ad994763 100644 --- a/src/Game/Demo/DemoPadRumbler.cpp +++ b/src/Game/Demo/DemoPadRumbler.cpp @@ -2,19 +2,21 @@ #include "Game/Util/ObjUtil.hpp" #include -DemoPadRumbler::DemoPadRumbler(const char *pName) : mNumPadRumbleEntries(0), mPadRumbleEntries(nullptr), _8(0) { - if (pName == nullptr) return; +DemoPadRumbler::DemoPadRumbler(const char* pName) + : mNumPadRumbleEntries(0), mPadRumbleEntries(nullptr), _8(0) { + if (pName == nullptr) + return; char buf[0x100]; snprintf(buf, sizeof(buf), "MoviePadRumble%s.arc", pName); JMapInfo* map = MR::createCsvParser(buf, "PadRumbleData.bcsv"); mNumPadRumbleEntries = MR::getCsvDataElementNum(map); - PadRumbleInfo *infos = new PadRumbleInfo[mNumPadRumbleEntries]; + PadRumbleInfo* infos = new PadRumbleInfo[mNumPadRumbleEntries]; mPadRumbleEntries = infos; for (int i = 0; i < mNumPadRumbleEntries; i++) { - PadRumbleInfo *rumble = &infos[i]; + PadRumbleInfo* rumble = &infos[i]; MR::getCsvDataStrOrNULL(&rumble->mName, map, "PadRumbleName", i); MR::getCsvDataS32(&rumble->mStartFrame, map, "StartFrame", i); } @@ -22,7 +24,7 @@ DemoPadRumbler::DemoPadRumbler(const char *pName) : mNumPadRumbleEntries(0), mPa void DemoPadRumbler::update(s32 frame) { for (int i = 0; i < mNumPadRumbleEntries; i++) { - PadRumbleInfo *rumble = &mPadRumbleEntries[i]; + PadRumbleInfo* rumble = &mPadRumbleEntries[i]; if (rumble->mStartFrame == frame) { MR::tryRumblePad(this, rumble->mName, 0); } diff --git a/src/Game/Demo/DemoParamCommonDataTable.cpp b/src/Game/Demo/DemoParamCommonDataTable.cpp index 757e848e7..b7962cfbe 100644 --- a/src/Game/Demo/DemoParamCommonDataTable.cpp +++ b/src/Game/Demo/DemoParamCommonDataTable.cpp @@ -3,19 +3,19 @@ namespace { struct Param { - const char *mParamName; // 0x0 - f32 mCameraShakeIntensity; // 0x4 - f32 mCameraShakeSpeed; // 0x8 - const char *pRumbleName; // 0xC + const char* mParamName; // 0x0 + f32 mCameraShakeIntensity; // 0x4 + f32 mCameraShakeSpeed; // 0x8 + const char* pRumbleName; // 0xC }; const Param sDataTable[3] = { - { "SeaBottomBigDoorA", 0.1f, 2.2f, "中" }, - { "SeaBottomBigDoorB", 0.1f, 2.2f, "中" }, - { "SeaBottomBigDoorC", 0.1f, 2.2f, "中" }, + {"SeaBottomBigDoorA", 0.1f, 2.2f, "中"}, + {"SeaBottomBigDoorB", 0.1f, 2.2f, "中"}, + {"SeaBottomBigDoorC", 0.1f, 2.2f, "中"}, }; - const Param *getParam(const char *pParamName) { + const Param* getParam(const char* pParamName) { for (u32 i = 0; i < 3; i++) { if (MR::isEqualString(pParamName, sDataTable[i].mParamName)) { return &sDataTable[i]; @@ -23,27 +23,27 @@ namespace { } return &sDataTable[0]; } -} +} // namespace namespace MR { namespace Demo { - f32 getCameraShakeIntensity(const char *pParamName) { + f32 getCameraShakeIntensity(const char* pParamName) { return getParam(pParamName)->mCameraShakeIntensity; } - f32 getCameraShakeSpeed(const char *pParamName) { + f32 getCameraShakeSpeed(const char* pParamName) { return getParam(pParamName)->mCameraShakeSpeed; } - const char* getPadRumble(const char *pParamName) { + const char* getPadRumble(const char* pParamName) { return getParam(pParamName)->pRumbleName; } - bool isExistCameraShaking(const char *pParamName) { + bool isExistCameraShaking(const char* pParamName) { return getParam(pParamName)->mCameraShakeIntensity > 0.0f; } - bool isExistPadRumble(const char *pParamName) { + bool isExistPadRumble(const char* pParamName) { return getParam(pParamName)->pRumbleName != nullptr; } - const char* getStartEffect(const char *pParamName) { + const char* getStartEffect(const char* pParamName) { return "Open"; } - } -} + } // namespace Demo +} // namespace MR diff --git a/src/Game/Demo/DemoPlayerKeeper.cpp b/src/Game/Demo/DemoPlayerKeeper.cpp index 5afe4942e..35ba7cd2f 100644 --- a/src/Game/Demo/DemoPlayerKeeper.cpp +++ b/src/Game/Demo/DemoPlayerKeeper.cpp @@ -4,7 +4,8 @@ #include "Game/Util/JMapInfo.hpp" #include "Game/Util/PlayerUtil.hpp" -DemoPlayerKeeper::DemoPlayerKeeper(const DemoExecutor* pExecutor) : mExecutor(pExecutor), mNumPlayerInfos(0), mPlayerInfos(nullptr) { +DemoPlayerKeeper::DemoPlayerKeeper(const DemoExecutor* pExecutor) + : mExecutor(pExecutor), mNumPlayerInfos(0), mPlayerInfos(nullptr) { JMapInfo* map = nullptr; mNumPlayerInfos = DemoFunction::createSheetParser(mExecutor, "Player", &map); mPlayerInfos = new DemoPlayerInfo[mNumPlayerInfos]; @@ -16,7 +17,8 @@ DemoPlayerKeeper::DemoPlayerKeeper(const DemoExecutor* pExecutor) : mExecutor(pE } } -DemoPlayerInfo::DemoPlayerInfo() : mPosName(nullptr), mPartName(nullptr), mBckName(nullptr) {} +DemoPlayerInfo::DemoPlayerInfo() + : mPosName(nullptr), mPartName(nullptr), mBckName(nullptr) {} void DemoPlayerKeeper::update() { const DemoPlayerInfo* playerinfo; diff --git a/src/Game/Demo/DemoPositionController.cpp b/src/Game/Demo/DemoPositionController.cpp index fad357074..959201414 100644 --- a/src/Game/Demo/DemoPositionController.cpp +++ b/src/Game/Demo/DemoPositionController.cpp @@ -4,7 +4,8 @@ #include "Game/Util/LiveActorUtil.hpp" #include "Game/LiveActor/ActorCameraInfo.hpp" -DemoPositionController::DemoPositionController(const char *pName, const JMapInfoIter &rIter) : LiveActor("OSS_09_B"), pCameraInfo(nullptr) { +DemoPositionController::DemoPositionController(const char* pName, const JMapInfoIter& rIter) + : LiveActor("OSS_09_B"), pCameraInfo(nullptr) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm(pName, nullptr, false); pCameraInfo = new ActorCameraInfo(rIter); @@ -16,17 +17,17 @@ void DemoPositionController::control() { calcAnim(); } -void DemoPositionController::initAnimCamera(const char *pCameraName) { +void DemoPositionController::initAnimCamera(const char* pCameraName) { MR::initAnimCamera(this, this->pCameraInfo, pCameraName); } -void DemoPositionController::startDemo(const char *pBckName) { +void DemoPositionController::startDemo(const char* pBckName) { appear(); MR::startBck(this, pBckName, nullptr); MR::startAnimCameraTargetSelf(this, pCameraInfo, pBckName, 0, 1.0f); } -void DemoPositionController::endDemo(const char *pCameraName) { +void DemoPositionController::endDemo(const char* pCameraName) { MR::endAnimCamera(this, pCameraInfo, pCameraName, -1, true); kill(); } diff --git a/src/Game/Demo/DemoSimpleCastHolder.cpp b/src/Game/Demo/DemoSimpleCastHolder.cpp index d8504286e..27c2b1a42 100644 --- a/src/Game/Demo/DemoSimpleCastHolder.cpp +++ b/src/Game/Demo/DemoSimpleCastHolder.cpp @@ -7,15 +7,15 @@ DemoSimpleCastHolder::DemoSimpleCastHolder(s32 liveActorCount, s32 layoutActorCo mNameObjs.init(nameObjCount); } -void DemoSimpleCastHolder::registerActor(LiveActor *pActor) { +void DemoSimpleCastHolder::registerActor(LiveActor* pActor) { mLiveActors.push_back(pActor); } -void DemoSimpleCastHolder::registerActor(LayoutActor *pActor) { +void DemoSimpleCastHolder::registerActor(LayoutActor* pActor) { mLayoutActors.push_back(pActor); } -void DemoSimpleCastHolder::registerNameObj(NameObj *pNameObj) { +void DemoSimpleCastHolder::registerNameObj(NameObj* pNameObj) { mNameObjs.push_back(pNameObj); } diff --git a/src/Game/Demo/DemoStartRequestHolder.cpp b/src/Game/Demo/DemoStartRequestHolder.cpp index ce25897dd..7fd7ab74a 100644 --- a/src/Game/Demo/DemoStartRequestHolder.cpp +++ b/src/Game/Demo/DemoStartRequestHolder.cpp @@ -2,7 +2,8 @@ #ifdef NON_MATCHING // reg scheduling issues, 0x40 / 0x9C are likely a part of FixedRingRuffer ctor -DemoStartRequestHolder::DemoStartRequestHolder() : _40(0), _84(&_44, &_44), _9C(0), _94(&_44, &_44) { +DemoStartRequestHolder::DemoStartRequestHolder() + : _40(0), _84(&_44, &_44), _9C(0), _94(&_44, &_44) { _9C = 0; _A0 = new NameObj("代理人"); diff --git a/src/Game/Demo/DemoSubPartKeeper.cpp b/src/Game/Demo/DemoSubPartKeeper.cpp index 76b399186..2ac367de8 100644 --- a/src/Game/Demo/DemoSubPartKeeper.cpp +++ b/src/Game/Demo/DemoSubPartKeeper.cpp @@ -3,7 +3,8 @@ #include "Game/Util.hpp" #include -DemoSubPartKeeper::DemoSubPartKeeper(const DemoExecutor* pExecutor) : mExecutor(pExecutor), mNumSubPartInfos(0), mSubPartInfos(nullptr) { +DemoSubPartKeeper::DemoSubPartKeeper(const DemoExecutor* pExecutor) + : mExecutor(pExecutor), mNumSubPartInfos(0), mSubPartInfos(nullptr) { JMapInfo* map = nullptr; mNumSubPartInfos = DemoFunction::createSheetParser(mExecutor, "SubPart", &map); mSubPartInfos = new DemoSubPartInfo[mNumSubPartInfos]; @@ -16,7 +17,8 @@ DemoSubPartKeeper::DemoSubPartKeeper(const DemoExecutor* pExecutor) : mExecutor( } } -DemoSubPartInfo::DemoSubPartInfo() : mSubPartName(nullptr), mSubPartTotalStep(1), mMainPartName(nullptr), mMainPartStep(1), _10(-1) {} +DemoSubPartInfo::DemoSubPartInfo() + : mSubPartName(nullptr), mSubPartTotalStep(1), mMainPartName(nullptr), mMainPartStep(1), _10(-1) {} void DemoSubPartKeeper::update() { if (mNumSubPartInfos > 0) { @@ -59,7 +61,7 @@ s32 DemoSubPartKeeper::getDemoPartTotalStep(const char* pSubPartName) const { DemoSubPartInfo* DemoSubPartKeeper::findSubPart(const char* pSubPartName) const { DemoSubPartInfo* subpart; - s32 count = mNumSubPartInfos; + s32 count = mNumSubPartInfos; for (int i = 0; i < count; i++) { subpart = &mSubPartInfos[i]; if (!strcmp(subpart->mSubPartName, pSubPartName)) { diff --git a/src/Game/Demo/DemoTalkAnimCtrl.cpp b/src/Game/Demo/DemoTalkAnimCtrl.cpp index 0c61d5253..61f363824 100644 --- a/src/Game/Demo/DemoTalkAnimCtrl.cpp +++ b/src/Game/Demo/DemoTalkAnimCtrl.cpp @@ -110,7 +110,7 @@ bool DemoTalkAnimCtrl::updateDemo() { } if (ok) { - s32 totalsteps = MR::getDemoPartTotalStep(name); + s32 totalsteps = MR::getDemoPartTotalStep(name); BckCtrlData bck; _36 = MR::isDemoPartTalk(name); _14 = name; diff --git a/src/Game/Demo/PrologueDirector.cpp b/src/Game/Demo/PrologueDirector.cpp index e33ab58ff..3727f9be1 100644 --- a/src/Game/Demo/PrologueDirector.cpp +++ b/src/Game/Demo/PrologueDirector.cpp @@ -9,16 +9,16 @@ namespace { static const char* sPictureBookDemoName = "プロローグデモ"; static const char* sArriveDemoName = "主人公ピーチ城に到着"; - static const s32 sPicBookStartWipeFrame = 60; - static const s32 sPeachLetterWait = 20; - static const s32 sPeachLetterStartWipeFrame = 60; - static const s32 sPeachLetterEndWipeFrame = 60; - static const s32 sArriveStartWipeFrame = 30; - static const s32 sArriveEndWipeFrame = 30; - static const s32 sGameStartWipeFrame = 30; - static const s32 sGameStartFrame = 15; - static const s32 sFallingStarStep = 130; -}; + static const s32 sPicBookStartWipeFrame = 60; + static const s32 sPeachLetterWait = 20; + static const s32 sPeachLetterStartWipeFrame = 60; + static const s32 sPeachLetterEndWipeFrame = 60; + static const s32 sArriveStartWipeFrame = 30; + static const s32 sArriveEndWipeFrame = 30; + static const s32 sGameStartWipeFrame = 30; + static const s32 sGameStartFrame = 15; + static const s32 sFallingStarStep = 130; +}; // namespace namespace { NEW_NERVE(PrologueDirectorNrvWait, PrologueDirector, Wait); @@ -30,17 +30,16 @@ namespace { NEW_NERVE(PrologueDirectorNrvBindWait, PrologueDirector, BindWait); NEW_NERVE(PrologueDirectorNrvArrive, PrologueDirector, Arrive); NEW_NERVE(PrologueDirectorNrvGameStart, PrologueDirector, GameStart); -}; +}; // namespace -PrologueDirector::PrologueDirector(const char* pName) : - LiveActor(pName), - mPictureBook(nullptr), - mLetter(nullptr), - mScenery(nullptr), - mMarioPosDummyModel(nullptr), - mCameraTarget(nullptr), - _D0(false) -{ +PrologueDirector::PrologueDirector(const char* pName) + : LiveActor(pName), + mPictureBook(nullptr), + mLetter(nullptr), + mScenery(nullptr), + mMarioPosDummyModel(nullptr), + mCameraTarget(nullptr), + _D0(false) { _A0.identity(); } @@ -279,7 +278,6 @@ void PrologueDirector::createCameraTarget() { } void PrologueDirector::control() { - } void PrologueDirector::pauseOff() { @@ -289,10 +287,9 @@ void PrologueDirector::pauseOff() { MR::requestMovementOn(mMarioPosDummyModel); } -PrologueHolder::PrologueHolder(const char* pName) : - NameObj(pName), - mDirector(nullptr) -{} +PrologueHolder::PrologueHolder(const char* pName) + : NameObj(pName), + mDirector(nullptr) {} void PrologueHolder::registerPrologueObj(PrologueDirector* pDirector) { mDirector = pDirector; @@ -310,4 +307,4 @@ namespace MR { void startPrologue() { getPrologueHolder()->start(); } -}; +}; // namespace MR diff --git a/src/Game/Effect/AstroEffectObj.cpp b/src/Game/Effect/AstroEffectObj.cpp index 7d1e1bf0e..0c08478b3 100644 --- a/src/Game/Effect/AstroEffectObj.cpp +++ b/src/Game/Effect/AstroEffectObj.cpp @@ -6,7 +6,8 @@ #include "JSystem/JGeometry/TVec.hpp" #include "revolution/mtx.h" -AstroEffectObj::AstroEffectObj(const char* pName) : SimpleEffectObj(pName) { +AstroEffectObj::AstroEffectObj(const char* pName) + : SimpleEffectObj(pName) { _9C = -1; } @@ -18,7 +19,7 @@ void AstroEffectObj::init(const JMapInfoIter& rIter) { makeActorAppeared(); } -bool AstroEffectObj::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool AstroEffectObj::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return false; } @@ -37,5 +38,4 @@ void AstroEffectObj::selectNrvWait() { } AstroEffectObj::~AstroEffectObj() { - } diff --git a/src/Game/Effect/EffectSystem.cpp b/src/Game/Effect/EffectSystem.cpp index 4a130e525..2b65a1656 100644 --- a/src/Game/Effect/EffectSystem.cpp +++ b/src/Game/Effect/EffectSystem.cpp @@ -6,7 +6,6 @@ #include void EffectSystem::init(const JMapInfoIter& rIter) { - } void EffectSystem::forceDeleteEmitter(ParticleEmitter* pEmitter) const { @@ -61,4 +60,4 @@ namespace MR { EffectSystem* getEffectSystem() { return getSceneObj(SceneObj_EffectSystem); } -}; +}; // namespace MR diff --git a/src/Game/Effect/MultiEmitterParticleCallBack.cpp b/src/Game/Effect/MultiEmitterParticleCallBack.cpp index 2e75e24e6..c1e55af31 100644 --- a/src/Game/Effect/MultiEmitterParticleCallBack.cpp +++ b/src/Game/Effect/MultiEmitterParticleCallBack.cpp @@ -1,10 +1,7 @@ #include "Game/Effect/MultiEmitterParticleCallBack.hpp" MultiEmitterParticleCallBack::MultiEmitterParticleCallBack() { - } MultiEmitterParticleCallBack::~MultiEmitterParticleCallBack() { - } - \ No newline at end of file diff --git a/src/Game/Effect/ParticleEmitter.cpp b/src/Game/Effect/ParticleEmitter.cpp index fb22a8095..f8a7ee993 100644 --- a/src/Game/Effect/ParticleEmitter.cpp +++ b/src/Game/Effect/ParticleEmitter.cpp @@ -1,12 +1,10 @@ #include "Game/Effect/ParticleEmitter.hpp" #include -ParticleEmitter::ParticleEmitter() : - mEmitter(nullptr), - mPaused(false), - mStopped(false) -{ - +ParticleEmitter::ParticleEmitter() + : mEmitter(nullptr), + mPaused(false), + mStopped(false) { } void ParticleEmitter::invalidate() { diff --git a/src/Game/Effect/RandomEffectObj.cpp b/src/Game/Effect/RandomEffectObj.cpp index c1dd93990..d566139dd 100644 --- a/src/Game/Effect/RandomEffectObj.cpp +++ b/src/Game/Effect/RandomEffectObj.cpp @@ -6,16 +6,14 @@ namespace { static const s32 sLifeTime = 600; static const s32 sRandWidth = 180; -}; +}; // namespace -RandomEffectObj::RandomEffectObj(const char* pName) : - SimpleEffectObj(pName), - mStep(0), - mSeStep(-1), - mLifeTime(sLifeTime), - mRandWidth(sRandWidth) -{ - +RandomEffectObj::RandomEffectObj(const char* pName) + : SimpleEffectObj(pName), + mStep(0), + mSeStep(-1), + mLifeTime(sLifeTime), + mRandWidth(sRandWidth) { } void RandomEffectObj::init(const JMapInfoIter& rIter) { diff --git a/src/Game/Effect/SimpleEffectObj.cpp b/src/Game/Effect/SimpleEffectObj.cpp index 09d7eccd3..b55c2fd4b 100644 --- a/src/Game/Effect/SimpleEffectObj.cpp +++ b/src/Game/Effect/SimpleEffectObj.cpp @@ -17,13 +17,13 @@ namespace NrvSimpleEffectObj { NEW_NERVE(HostTypeWait, SimpleEffectObj, Wait); NEW_NERVE(HostTypeMove, SimpleEffectObj, Move); -}; +}; // namespace NrvSimpleEffectObj namespace { - const s_effectDataTable sEffectDataTable[12] = { + const s_effectDataTable sEffectDataTable[12] = { {"IceLayerBreak", "SE_OJ_ICE_LAYER_BREAK", nullptr, 0, "最強", 7}, {"LavaVolcanoEruption", nullptr, nullptr, 0, "最強", 0}, - {"LavaHomeVolcanoFallingRock", nullptr, "SE_AT_LV_FALLING_ROCK", -1, nullptr,0}, + {"LavaHomeVolcanoFallingRock", nullptr, "SE_AT_LV_FALLING_ROCK", -1, nullptr, 0}, {"WaterLayerBreak", "SE_OJ_WATER_LAYER_BREAK", nullptr, 0, "最強", 7}, {"DrainPipeBubbleA", nullptr, "SE_OJ_LV_PIPE_BUBBLE_A", -1, nullptr, 0}, {"DrainPipeBubbleB", nullptr, "SE_OJ_LV_PIPE_BUBBLE_B", -1, nullptr, 0}, @@ -32,7 +32,7 @@ namespace { {"BattleShipExplosionRock", "SE_AT_BTLSHIP_EXPLODE_ROCK", nullptr, -1, nullptr, 0}, {"Steam", nullptr, "SE_OJ_LV_HD_STEAM", -1, nullptr, 0}, {"IcicleRockLight", nullptr, "SE_OJ_LV_ICICLE_ROCK_LIGHT", -1, nullptr, 0}, - {"UFOKinokoLandingBlackSmoke", nullptr, "SE_OJ_LV_UFO_KINOKO_SMOKE", -1, nullptr, 0}, + {"UFOKinokoLandingBlackSmoke", nullptr, "SE_OJ_LV_UFO_KINOKO_SMOKE", -1, nullptr, 0}, }; const s_effectDataTable* findDataElement(const char* pString) { u32 i = 0; @@ -44,11 +44,12 @@ namespace { } v2 += 1; } - return nullptr; + return nullptr; } -}; +}; // namespace -SimpleEffectObj::SimpleEffectObj(const char* pName) : LiveActor(pName) { +SimpleEffectObj::SimpleEffectObj(const char* pName) + : LiveActor(pName) { _8C = nullptr; } @@ -159,19 +160,18 @@ void SimpleEffectObj::exeMove() { return; } if (MR::isStep(this, v13)) { - v1 = ::findDataElement(_8C); - const char* v15; - if (v1) { - v15 = v1->_10; - } else { - v15 = nullptr; - } - if (v15) { - MR::tryRumblePad(this, v15, 0); - } + v1 = ::findDataElement(_8C); + const char* v15; + if (v1) { + v15 = v1->_10; + } else { + v15 = nullptr; + } + if (v15) { + MR::tryRumblePad(this, v15, 0); + } } } inline void SimpleEffectObj::exeWait() { - } diff --git a/src/Game/Effect/SingleEmitter.cpp b/src/Game/Effect/SingleEmitter.cpp index eeb2ffe72..7feab6f71 100644 --- a/src/Game/Effect/SingleEmitter.cpp +++ b/src/Game/Effect/SingleEmitter.cpp @@ -19,7 +19,7 @@ void SingleEmitter::deleteEmitter() { } } -void SingleEmitter::scanParticleEmitter(EffectSystem *pSystem) { +void SingleEmitter::scanParticleEmitter(EffectSystem* pSystem) { ParticleEmitter* emitter; if (mSpawn == SINGLE_EMITTER_UNDEF_SPAWN) { emitter = pSystem->createEmitter(_4, mGroupId, 0); @@ -44,7 +44,7 @@ bool SingleEmitter::isValid() const { } } -void SingleEmitter::link(ParticleEmitter *pEmitter) { +void SingleEmitter::link(ParticleEmitter* pEmitter) { mEmitter = pEmitter; MR::Effect::setLinkSingleEmitter(pEmitter, this); } diff --git a/src/Game/Enemy/BallBeamer.cpp b/src/Game/Enemy/BallBeamer.cpp index a73fd5d25..f2f1ffbe4 100644 --- a/src/Game/Enemy/BallBeamer.cpp +++ b/src/Game/Enemy/BallBeamer.cpp @@ -6,17 +6,16 @@ namespace NrvBallBeamer { NEW_NERVE(BallBeamerNrvWait, BallBeamer, Wait); NEW_NERVE(BallBeamerNrvAttack, BallBeamer, Attack); NEW_NERVE(BallBeamerNrvInter, BallBeamer, Inter); -}; +}; // namespace NrvBallBeamer -BallBeamer::BallBeamer(const char *pName) : - LiveActor(pName), - mBeams(nullptr), - _90(false) -{ +BallBeamer::BallBeamer(const char* pName) + : LiveActor(pName), + mBeams(nullptr), + _90(false) { _98.identity(); } -void BallBeamer::makeArchiveList(NameObjArchiveListCollector *pCollector, const JMapInfoIter &rIter) { +void BallBeamer::makeArchiveList(NameObjArchiveListCollector* pCollector, const JMapInfoIter& rIter) { s32 arg2 = -1; MR::getJMapInfoArg2NoInit(rIter, &arg2); pCollector->addArchive("JumpBeamerBeam"); @@ -26,7 +25,7 @@ void BallBeamer::makeArchiveList(NameObjArchiveListCollector *pCollector, const } } -void BallBeamer::init(const JMapInfoIter &rIter) { +void BallBeamer::init(const JMapInfoIter& rIter) { initModelManagerWithAnm("BallBeamer", nullptr, nullptr); MR::initDefaultPos(this, rIter); mPosition.y = mPosition.y - 50.0f; @@ -41,8 +40,8 @@ void BallBeamer::init(const JMapInfoIter &rIter) { makeActorAppeared(); if (MR::useStageSwitchReadA(this, rIter)) { - MR::listenStageSwitchOnOffA(this, MR::Functor(this, &BallBeamer::syncSwitchOffA), - MR::Functor(this, &BallBeamer::syncSwitchOnA)); + MR::listenStageSwitchOnOffA(this, MR::Functor(this, &BallBeamer::syncSwitchOffA), + MR::Functor(this, &BallBeamer::syncSwitchOnA)); } if (MR::useStageSwitchReadB(this, rIter)) { @@ -50,31 +49,30 @@ void BallBeamer::init(const JMapInfoIter &rIter) { } mBeams = new RingBeam*[12]; - for(int i = 0; i < 12; i++){ - mBeams[i] = nullptr; + for (int i = 0; i < 12; i++) { + mBeams[i] = nullptr; } f32 arg0 = 12.0f; s32 arg1 = 530; s32 arg2 = -1; - MR::getJMapInfoArg0NoInit(rIter,&arg0); - MR::getJMapInfoArg1NoInit(rIter,&arg1); - MR::getJMapInfoArg2NoInit(rIter,&arg2); - for(int i = 0; i < 12; i++){ - if(arg2 == 0){ - mBeams[i] = new RingBeam("リングビーム",this,true,true); - }else{ - mBeams[i] = new RingBeam("リングビーム",this,true,false); + MR::getJMapInfoArg0NoInit(rIter, &arg0); + MR::getJMapInfoArg1NoInit(rIter, &arg1); + MR::getJMapInfoArg2NoInit(rIter, &arg2); + for (int i = 0; i < 12; i++) { + if (arg2 == 0) { + mBeams[i] = new RingBeam("リングビーム", this, true, true); + } else { + mBeams[i] = new RingBeam("リングビーム", this, true, false); } mBeams[i]->init(rIter); mBeams[i]->setSpeed(arg0); mBeams[i]->setLife(arg1); } - _98.setInline(MR::getJointMtx(this,"Head")); + _98.setInline(MR::getJointMtx(this, "Head")); MR::initCollisionParts(this, "Head", getSensor("Body"), _98.toMtxPtr()); MR::validateCollisionParts(this); } - void BallBeamer::syncSwitchOnA() { _90 = true; BallBeamer::setupAttack(); @@ -85,15 +83,14 @@ void BallBeamer::syncSwitchOffA() { } void BallBeamer::syncSwitchOnB() { - MR::deleteEffect(this,"Charge"); - MR::emitEffect(this,"Vanish"); + MR::deleteEffect(this, "Charge"); + MR::emitEffect(this, "Vanish"); kill(); - for(int i = 0; i < 12; i++){ - if(mBeams[i]){ + for (int i = 0; i < 12; i++) { + if (mBeams[i]) { mBeams[i]->kill(); } } - } void BallBeamer::setupAttack() { @@ -106,13 +103,13 @@ void BallBeamer::setupAttack() { } bool BallBeamer::tryAttack() { - for(int i = 0; i < 12; i++){ - if(MR::isDead(mBeams[i])){ + for (int i = 0; i < 12; i++) { + if (MR::isDead(mBeams[i])) { mBeams[i]->appear(); return true; } - } - return false; + } + return false; } void BallBeamer::exeWait() { @@ -129,8 +126,7 @@ void BallBeamer::exeWait() { void BallBeamer::exeAttack() { if (MR::isGreaterEqualStep(this, 360)) { setNerve(&NrvBallBeamer::BallBeamerNrvInter::sInstance); - } - else { + } else { if (getNerveStep() % 120 >= 75 && getNerveStep() % 120 < 119) { MR::startLevelSound(this, "SE_EM_LV_RINGBEAM_CHARGE", -1, -1, -1); } @@ -149,27 +145,25 @@ void BallBeamer::exeAttack() { void BallBeamer::exeInter() { if (MR::isFirstStep(this)) { - } if (MR::isGreaterEqualStep(this, 120)) { if (_90) { setNerve(&NrvBallBeamer::BallBeamerNrvAttack::sInstance); - } - else { + } else { setNerve(&NrvBallBeamer::BallBeamerNrvWait::sInstance); } - } + } } -void BallBeamer::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void BallBeamer::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { MR::sendMsgPush(pReceiver, pSender); } -bool BallBeamer::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BallBeamer::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return false; } -bool BallBeamer::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BallBeamer::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return MR::isMsgStarPieceReflect(msg); } diff --git a/src/Game/Enemy/BasaBasa.cpp b/src/Game/Enemy/BasaBasa.cpp index 36916e62e..f4090707c 100644 --- a/src/Game/Enemy/BasaBasa.cpp +++ b/src/Game/Enemy/BasaBasa.cpp @@ -34,30 +34,28 @@ namespace NrvBasaBasa { NEW_NERVE(BasaBasaNrvAttachCelling, BasaBasa, AttachCelling); NEW_NERVE_ONEND(BasaBasaNrvDPDSwoon, BasaBasa, DPDSwoon, DPDSwoon); NEW_NERVE(BasaBasaNrvStun, BasaBasa, Stun); -}; +}; // namespace NrvBasaBasa -BasaBasa::BasaBasa(const char *pName) : - LiveActor(pName), - mHangModel(nullptr), - mScaleController(nullptr), - mStampController(nullptr), - mSpinHitController(nullptr), - _9C(0.0f, 0.0f, 1.0f), - _A8(2000.0f), - _AC(0.0f), - _B4(0), - _B8(0.0f), - _BC(0.0f, 0.0f, 0.0f), - mIsIceModel(false), - _CC(0.0f, 0.0f, 0.0f), - _E4(-1.0f), - _E8(0), - _EC(0) -{ - +BasaBasa::BasaBasa(const char* pName) + : LiveActor(pName), + mHangModel(nullptr), + mScaleController(nullptr), + mStampController(nullptr), + mSpinHitController(nullptr), + _9C(0.0f, 0.0f, 1.0f), + _A8(2000.0f), + _AC(0.0f), + _B4(0), + _B8(0.0f), + _BC(0.0f, 0.0f, 0.0f), + mIsIceModel(false), + _CC(0.0f, 0.0f, 0.0f), + _E4(-1.0f), + _E8(0), + _EC(0) { } -void BasaBasa::init(const JMapInfoIter &rIter) { +void BasaBasa::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); const char* objName; MR::getObjectName(&objName, rIter); @@ -77,8 +75,7 @@ void BasaBasa::init(const JMapInfoIter &rIter) { if (MR::isConnectedWithRail(rIter)) { initRailRider(rIter); _B4 = &MR::getRailPos(this); - } - else { + } else { _B4 = MR::getPlayerCenterPos(); } @@ -128,8 +125,7 @@ void BasaBasa::exeAirWait() { MR::startBck(this, "Fly", nullptr); if (MR::isExistRail(this)) { _B4 = &MR::getRailPos(this); - } - else { + } else { _B4 = MR::getPlayerCenterPos(); } @@ -141,8 +137,7 @@ void BasaBasa::exeAirWait() { if (isNearTarget(_A8)) { MR::invalidateClipping(this); setNerve(&NrvBasaBasa::BasaBasaNrvChase::sInstance); - } - else if (!tryComeHome()) { + } else if (!tryComeHome()) { trySetNerveDPDSwoon(); } } @@ -179,7 +174,7 @@ void BasaBasa::exeChase() { TVec3f v5; v5.sub(*_B4, mPosition); TVec3f* gravityPtr = &mGravity; - f32 dot = gravityPtr->dot(v5); + f32 dot = gravityPtr->dot(v5); JMAVECScaleAdd(gravityPtr, &v5, &v5, -dot); MR::normalizeOrZero(&v5); if (!MR::isNearZero(v5, 0.001f)) { @@ -194,11 +189,9 @@ void BasaBasa::exeChase() { if (!trySetNerveDPDSwoon()) { if (MR::isNearPlayer(_CC, _E4) && MR::isNearPlayer(this, _AC)) { setNerve(&NrvBasaBasa::BasaBasaNrvAttackStart::sInstance); - } - else if (!MR::isFaceToTargetHorizontalDegree(this, *_B4, _9C, 60.0f)) { + } else if (!MR::isFaceToTargetHorizontalDegree(this, *_B4, _9C, 60.0f)) { setNerve(&NrvBasaBasa::BasaBasaNrvQuickTurnStart::sInstance); - } - else { + } else { if (tryComeHome()) { return; } @@ -210,8 +203,7 @@ void BasaBasa::exeQuickTurnStart() { JMAVECScaleAdd(&_9C, &mVelocity, &mVelocity, 2.0f); if (MR::isStep(this, 45)) { setNerve(&NrvBasaBasa::BasaBasaNrvQuickTurn::sInstance); - } - else { + } else { trySetNerveDPDSwoon(); } } @@ -221,8 +213,7 @@ void BasaBasa::exeQuickTurn() { MR::turnDirectionToTargetDegree(this, &_9C, *_B4, 2.5500002f); if (MR::isFaceToTargetHorizontalDegree(this, *_B4, _9C, 2.5500002f)) { setNerve(&NrvBasaBasa::BasaBasaNrvChase::sInstance); - } - else { + } else { trySetNerveDPDSwoon(); } } @@ -277,8 +268,7 @@ void BasaBasa::exeAttackStart() { JMAVECScaleAdd(&v3, &mVelocity, &mVelocity, 0.2f); if (MR::isBckStopped(this)) { setNerve(&NrvBasaBasa::BasaBasaNrvAttack::sInstance); - } - else { + } else { trySetNerveDPDSwoon(); } } @@ -310,8 +300,7 @@ void BasaBasa::exeAttack() { JMAVECScaleAdd(&v5, &mVelocity, &mVelocity, 10.0f); if (MR::isNear(this, _BC, 40.0f) || MR::isBindedWall(this) || MR::isStep(this, 180)) { setNerve(&NrvBasaBasa::BasaBasaNrvAttackEnd::sInstance); - } - else { + } else { trySetNerveDPDSwoon(); } } @@ -327,8 +316,7 @@ void BasaBasa::exeAttackEnd() { JMAVECScaleAdd(&_9C, &mVelocity, &mVelocity, 0.1f); if (MR::isStep(this, 50)) { setNerve(&NrvBasaBasa::BasaBasaNrvAttackEndRecover::sInstance); - } - else { + } else { trySetNerveDPDSwoon(); } } @@ -376,8 +364,7 @@ void BasaBasa::exeHitBack() { if (MR::isBckStopped(this)) { setNerve(&NrvBasaBasa::BasaBasaNrvHitBackEnd::sInstance); - } - else { + } else { trySetNerveDPDSwoon(); } } @@ -389,8 +376,7 @@ void BasaBasa::exeHitBackEnd() { if (MR::isStep(this, 60)) { setNerve(&NrvBasaBasa::BasaBasaNrvChase::sInstance); - } - else { + } else { trySetNerveDPDSwoon(); } } @@ -407,16 +393,13 @@ void BasaBasa::exeComeHome() { if (isNearTarget(300.0f)) { if (_EC) { setNerve(&NrvBasaBasa::BasaBasaNrvAttachCelling::sInstance); - } - else { + } else { setNerve(&NrvBasaBasa::BasaBasaNrvAirWait::sInstance); } - } - else if (MR::isGreaterEqualStep(this, 120) && MR::isNearPlayer(this, _A8) && MR::isNearPlayer(_CC, _E4)) { + } else if (MR::isGreaterEqualStep(this, 120) && MR::isNearPlayer(this, _A8) && MR::isNearPlayer(_CC, _E4)) { _B4 = MR::getPlayerCenterPos(); setNerve(&NrvBasaBasa::BasaBasaNrvChase::sInstance); - } - else { + } else { trySetNerveDPDSwoon(); } } @@ -432,8 +415,7 @@ void BasaBasa::exeAttachCelling() { if (MR::isNear(this, _CC, 10.0f)) { mVelocity.zero(); MR::resetPosition(this, _CC); - } - else { + } else { TVec3f v2; v2.sub(_CC, mPosition); mVelocity.scale(5.0f, v2); @@ -491,8 +473,7 @@ void BasaBasa::initAfterPlacement() { _EC = MR::getFirstPolyOnLineToMap(&mPosition, nullptr, v4, v3); if (_EC) { initNerve(&NrvBasaBasa::BasaBasaNrvWait::sInstance); - } - else { + } else { initNerve(&NrvBasaBasa::BasaBasaNrvAirWait::sInstance); } @@ -529,9 +510,8 @@ void BasaBasa::calcAndSetBaseMtx() { MR::setBaseScale(this, mScaleController->_C); } -void BasaBasa::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { - bool v6 = isNerve(&NrvBasaBasa::BasaBasaNrvTrampleDown::sInstance) - || isNerve(&NrvBasaBasa::BasaBasaNrvPunchDown::sInstance); +void BasaBasa::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { + bool v6 = isNerve(&NrvBasaBasa::BasaBasaNrvTrampleDown::sInstance) || isNerve(&NrvBasaBasa::BasaBasaNrvPunchDown::sInstance); if (v6) { return; @@ -546,13 +526,11 @@ void BasaBasa::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { if (!MR::isPlayerHipDropFalling()) { if (mIsIceModel) { v7 = MR::sendMsgEnemyAttackFreeze(pReceiver, pSender); - } - else if (!isNerve(&NrvBasaBasa::BasaBasaNrvDPDSwoon::sInstance)) { + } else if (!isNerve(&NrvBasaBasa::BasaBasaNrvDPDSwoon::sInstance)) { bool v8; if (MR::isPlayerSwimming()) { v8 = MR::sendMsgEnemyAttackStrong(pReceiver, pSender); - } - else { + } else { v8 = MR::sendMsgEnemyAttack(pReceiver, pSender); } @@ -563,12 +541,10 @@ void BasaBasa::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { if (v7) { MR::emitEffectHitBetweenSensors(this, pSender, pReceiver, 0.0f, nullptr); setNerve(&NrvBasaBasa::BasaBasaNrvHitBack::sInstance); - } - else { + } else { MR::sendMsgPush(pReceiver, pSender); } - } - else if (MR::isSensorEnemy(pSender)) { + } else if (MR::isSensorEnemy(pSender)) { if (MR::isSensorEnemy(pReceiver)) { MR::sendMsgPush(pReceiver, pSender); TVec3f v10; @@ -576,14 +552,14 @@ void BasaBasa::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { MR::normalizeOrZero(&v10); if (mVelocity.dot(v10) < 0.0f) { TVec3f* velocityPtr = &mVelocity; - f32 dot = v10.dot(mVelocity); + f32 dot = v10.dot(mVelocity); JMAVECScaleAdd(&v10, velocityPtr, velocityPtr, -dot); } } } } -bool BasaBasa::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BasaBasa::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (!MR::isSensorEnemy(pReceiver)) { return false; } @@ -600,8 +576,7 @@ bool BasaBasa::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pR return true; } - bool v9 = isNerve(&NrvBasaBasa::BasaBasaNrvTrampleDown::sInstance) - || isNerve(&NrvBasaBasa::BasaBasaNrvPunchDown::sInstance); + bool v9 = isNerve(&NrvBasaBasa::BasaBasaNrvTrampleDown::sInstance) || isNerve(&NrvBasaBasa::BasaBasaNrvPunchDown::sInstance); if (v9) { return false; @@ -610,8 +585,7 @@ bool BasaBasa::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pR if (mIsIceModel && !MR::isPlayerElementModeIce()) { if (MR::isMsgPlayerSpinAttack(msg)) { return false; - } - else if (MR::isMsgPlayerTrample(msg) || MR::isMsgPlayerHipDrop(msg)) { + } else if (MR::isMsgPlayerTrample(msg) || MR::isMsgPlayerHipDrop(msg)) { MR::sendMsgEnemyAttackFreeze(pSender, pReceiver); return true; } @@ -632,7 +606,7 @@ bool BasaBasa::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pR return false; } -bool BasaBasa::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { +bool BasaBasa::receiveMsgPush(HitSensor* pSender, HitSensor* pReceiver) { if (isNerve(&NrvBasaBasa::BasaBasaNrvDPDSwoon::sInstance)) { return false; } @@ -652,7 +626,7 @@ bool BasaBasa::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { return false; } -bool BasaBasa::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BasaBasa::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (!MR::isSensorEnemy(pReceiver)) { return false; } @@ -672,7 +646,7 @@ bool BasaBasa::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pRe return false; } -bool BasaBasa::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BasaBasa::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (!mIsIceModel) { return false; } @@ -684,8 +658,7 @@ bool BasaBasa::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver if (MR::isMsgSpinStormRange(msg) && MR::isPlayerElementModeNormal()) { if (500.0f < MR::calcDistance(pSender, pReceiver, nullptr)) { return false; - } - else { + } else { setNerve(&NrvBasaBasa::BasaBasaNrvHitBack::sInstance); return false; } @@ -714,21 +687,18 @@ bool BasaBasa::tryClippingAndResetPos() { if (!MR::isJudgedToClipFrustum(mPosition, radius) || MR::isNearPlayer(this, 2500.0f)) { _E8 = 0; return false; - } - else { + } else { if (_E8 < 180) { _E8++; return false; - } - else { + } else { MR::resetPosition(this, _CC); _9C.set(_D8); mVelocity.zero(); _E8 = 0; if (_EC != 0) { setNerve(&NrvBasaBasa::BasaBasaNrvWait::sInstance); - } - else { + } else { setNerve(&NrvBasaBasa::BasaBasaNrvAirWait::sInstance); } return true; @@ -772,19 +742,18 @@ void BasaBasa::controlVelocity() { if (!v1) { TVec3f v15; MR::calcSideVec(&v15, this); - f32 v3 = v15.dot(mVelocity); + f32 v3 = v15.dot(mVelocity); TVec3f v14; v14.scale(v3, v15); v14.scale(0.5f); TVec3f* velocity = &mVelocity; - f32 v4 = v15.dot(*velocity); + f32 v4 = v15.dot(*velocity); JMAVECScaleAdd(&v15, velocity, velocity, -v4); JMathInlineVEC::PSVECAdd(&mVelocity, &v14, &mVelocity); f32 v5 = 0.94999999f; if (isNerve(&NrvBasaBasa::BasaBasaNrvAttackEnd::sInstance)) { v5 = 0.95999998f; - } - else if (isNerve(&NrvBasaBasa::BasaBasaNrvChaseStart::sInstance)) { + } else if (isNerve(&NrvBasaBasa::BasaBasaNrvChaseStart::sInstance)) { v5 = 0.44999999f; } @@ -792,29 +761,23 @@ void BasaBasa::controlVelocity() { f32 v6; if (isNerve(&NrvBasaBasa::BasaBasaNrvChaseStart::sInstance)) { v6 = 15.0f; - } - else if (isNerve(&NrvBasaBasa::BasaBasaNrvHitBack::sInstance)) { + } else if (isNerve(&NrvBasaBasa::BasaBasaNrvHitBack::sInstance)) { v6 = 15.0f; - } - else if (isNerve(&NrvBasaBasa::BasaBasaNrvQuickTurn::sInstance)) { + } else if (isNerve(&NrvBasaBasa::BasaBasaNrvQuickTurn::sInstance)) { v6 = 8.0f; - } - else if (isNerve(&NrvBasaBasa::BasaBasaNrvAttack::sInstance)) { + } else if (isNerve(&NrvBasaBasa::BasaBasaNrvAttack::sInstance)) { v6 = 23.0f; - } - else { + } else { v6 = 8.0f; } - if (PSVECMag(&mVelocity) > v6) { TVec3f* velocityPtr = &mVelocity; - f32 sqr = JMathInlineVEC::PSVECSquareMag(velocityPtr); + f32 sqr = JMathInlineVEC::PSVECSquareMag(velocityPtr); if (sqr <= 0.0000038146973f) { velocityPtr->scale(v6 * JGeometry::TUtil::inv_sqrt(sqr)); } - } - else { + } else { if (MR::isNearZero(mVelocity, 0.001f)) { mVelocity.zero(); } @@ -829,47 +792,40 @@ void BasaBasa::tuneHeight() { v5.sub(*_B4, mPosition); TVec3f* gravityPtr = &mGravity; v5.scale(gravityPtr->dot(v5), *gravityPtr); - } - else { + } else { v5.scale(MR::getShadowProjectionLength(this, nullptr) - (_AC - 350.0f), mGravity); } if (PSVECMag(&v5) < 2.0f) { return; - } - else { + } else { TVec3f v4; v4.set(v5); MR::normalize(&v4); JMAVECScaleAdd(&v4, &mVelocity, &mVelocity, 2.0f); } - } } bool BasaBasa::isNearTarget(f32 a1) const { if (_B4 == MR::getPlayerCenterPos()) { return MR::isNearPlayer(this, a1); - } - else { + } else { return MR::isNear(this, *_B4, a1); } } bool BasaBasa::isNrvEnableStun() const { - bool v1 = isNerve(&NrvBasaBasa::BasaBasaNrvTrampleDown::sInstance) - || isNerve(&NrvBasaBasa::BasaBasaNrvPunchDown::sInstance); + bool v1 = isNerve(&NrvBasaBasa::BasaBasaNrvTrampleDown::sInstance) || isNerve(&NrvBasaBasa::BasaBasaNrvPunchDown::sInstance); if (v1) { return false; } - v1 = !isNerve(&NrvBasaBasa::BasaBasaNrvWait::sInstance) - && !isNerve(&NrvBasaBasa::BasaBasaNrvAttachCelling::sInstance); + v1 = !isNerve(&NrvBasaBasa::BasaBasaNrvWait::sInstance) && !isNerve(&NrvBasaBasa::BasaBasaNrvAttachCelling::sInstance); return v1; } BasaBasa::~BasaBasa() { - } diff --git a/src/Game/Enemy/Birikyu.cpp b/src/Game/Enemy/Birikyu.cpp index 7aa2835b6..0a8089d4b 100644 --- a/src/Game/Enemy/Birikyu.cpp +++ b/src/Game/Enemy/Birikyu.cpp @@ -9,24 +9,22 @@ namespace NrvBirikyu { NEW_NERVE(HostTypeAttackWait, Birikyu, AttackWait); NEW_NERVE(HostTypeWaitAtEdge, Birikyu, WaitAtEdge); NEW_NERVE(HostTypeStopPointing, Birikyu, StopPointing); -}; +}; // namespace NrvBirikyu -Birikyu::Birikyu(const char *pName) : - LiveActor(pName), - _8C(nullptr), - _90(gZeroVec), - _9C(gZeroVec), - _A8(false), - _A9(false), - _AC(0.0f, 1.0f, 0.0f), - _B8(0.0f, 0.0f, 1.0f), - _C4(0.0f), - _C8(10.0f) -{ - +Birikyu::Birikyu(const char* pName) + : LiveActor(pName), + _8C(nullptr), + _90(gZeroVec), + _9C(gZeroVec), + _A8(false), + _A9(false), + _AC(0.0f, 1.0f, 0.0f), + _B8(0.0f, 0.0f, 1.0f), + _C4(0.0f), + _C8(10.0f) { } -void Birikyu::init(const JMapInfoIter &rIter) { +void Birikyu::init(const JMapInfoIter& rIter) { MR::getObjectName(&_8C, rIter); initModelManagerWithAnm(_8C, nullptr, false); MR::connectToSceneEnemy(this); @@ -47,8 +45,7 @@ void Birikyu::init(const JMapInfoIter &rIter) { if (_A9) { initNerve(&NrvBirikyu::HostTypeMove::sInstance); - } - else { + } else { initNerve(&NrvBirikyu::HostTypeMoveCircle::sInstance); } @@ -58,8 +55,7 @@ void Birikyu::init(const JMapInfoIter &rIter) { void Birikyu::initAfterPlacement() { if (_A9) { MR::moveCoordAndTransToNearestRailPos(this); - } - else { + } else { _9C.set(mPosition); TPos3f matrix; matrix.identity(); @@ -68,7 +64,7 @@ void Birikyu::initAfterPlacement() { f32 y1 = matrix.mMtx[1][1]; f32 x1 = matrix.mMtx[0][1]; _AC.set(x1, y1, z1); - MR::normalize(&_AC); + MR::normalize(&_AC); f32 z2 = matrix.mMtx[2][2]; f32 y2 = matrix.mMtx[1][2]; f32 x2 = matrix.mMtx[0][2]; @@ -76,7 +72,7 @@ void Birikyu::initAfterPlacement() { MR::normalize(&_B8); TVec3f add(_9C * 400.0f); TVec3f vec(_9C + add); - mPosition.set(vec); + mPosition.set(vec); } } @@ -89,30 +85,28 @@ f32 Birikyu::getHitRadius() const { return 120.0f; } -char *Birikyu::getCenterJointName() const { +char* Birikyu::getCenterJointName() const { return "Root"; } -void Birikyu::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void Birikyu::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayerOrRide(pReceiver) || MR::isSensorEnemy(pReceiver)) { if (MR::sendMsgEnemyAttackElectric(pReceiver, pSender)) { MR::sendMsgToGroupMember(ACTMES_GROUP_MOVE_STOP, this, getSensor("body"), "body"); setNerve(&NrvBirikyu::HostTypeAttack::sInstance); - } - else { + } else { MR::sendMsgPush(pReceiver, pSender); } } } -bool Birikyu::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool Birikyu::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return MR::isMsgStarPieceReflect(msg); } -bool Birikyu::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool Birikyu::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (msg == ACTMES_GROUP_MOVE_STOP) { - bool bool4 = isNerve(&NrvBirikyu::HostTypeMove::sInstance) - || isNerve(&NrvBirikyu::HostTypeMoveCircle::sInstance); + bool bool4 = isNerve(&NrvBirikyu::HostTypeMove::sInstance) || isNerve(&NrvBirikyu::HostTypeMoveCircle::sInstance); if (bool4) { setNerve(&NrvBirikyu::HostTypeAttackWait::sInstance); @@ -122,15 +116,14 @@ bool Birikyu::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) } if (msg == ACTMES_GROUP_MOVE_START) { - bool bool5 = isNerve(&NrvBirikyu::HostTypeMove::sInstance) - || isNerve(&NrvBirikyu::HostTypeMoveCircle::sInstance); + bool bool5 = isNerve(&NrvBirikyu::HostTypeMove::sInstance) || isNerve(&NrvBirikyu::HostTypeMoveCircle::sInstance); if (!bool5) { goMove(); return true; } - } + } return false; } @@ -145,14 +138,14 @@ void Birikyu::endClipped() { MR::emitEffect(this, _8C); } -void Birikyu::initFromJmpArgs(const JMapInfoIter &rIter) { +void Birikyu::initFromJmpArgs(const JMapInfoIter& rIter) { MR::getJMapInfoArg0NoInit(rIter, &_C8); s32 num = -1; MR::getJMapInfoArg2NoInit(rIter, &num); _A8 = num == true; } -void Birikyu::initRail(const JMapInfoIter &rIter) { +void Birikyu::initRail(const JMapInfoIter& rIter) { bool result = MR::isConnectedWithRail(rIter); _A9 = result; if (_A9) { @@ -191,8 +184,7 @@ bool Birikyu::tryStopPointing() { void Birikyu::goMove() { if (_A9) { setNerve(&NrvBirikyu::HostTypeMove::sInstance); - } - else { + } else { setNerve(&NrvBirikyu::HostTypeMoveCircle::sInstance); } } @@ -208,9 +200,8 @@ void Birikyu::exeMove() { if (arg > 0) { setNerve(&NrvBirikyu::HostTypeWaitAtEdge::sInstance); - } - else { - MR::emitEffect(this, "Clash"); + } else { + MR::emitEffect(this, "Clash"); } } @@ -253,7 +244,7 @@ void Birikyu::exeAttack() { mVelocity.x = 0.0f; MR::emitEffect(this, "Hit"); } - + MR::startLevelSound(this, "SE_OJ_LV_BIRIKYU_MOVE", -1, -1, -1); if (MR::isStep(this, 90)) { @@ -263,7 +254,6 @@ void Birikyu::exeAttack() { } void Birikyu::exeAttackWait() { - } void Birikyu::exeStopPointing() { @@ -275,7 +265,7 @@ void Birikyu::exeStopPointing() { } MR::startDPDFreezeLevelSound(this); - + if (!MR::isStarPointerPointing2POnPressButton(this, "Hit", true, false)) { if (MR::isRegisteredEffect(this, "Touch")) { MR::deleteEffect(this, "Touch"); @@ -286,11 +276,12 @@ void Birikyu::exeStopPointing() { } } -BirikyuWithFace::BirikyuWithFace(const char *pName) : Birikyu(pName) { +BirikyuWithFace::BirikyuWithFace(const char* pName) + : Birikyu(pName) { _CC = false; } -void BirikyuWithFace::init(const JMapInfoIter &rIter) { +void BirikyuWithFace::init(const JMapInfoIter& rIter) { Birikyu::init(rIter); s32 num = -1; MR::getJMapInfoArg1NoInit(rIter, &num); @@ -298,7 +289,7 @@ void BirikyuWithFace::init(const JMapInfoIter &rIter) { } void BirikyuWithFace::calcAndSetBaseMtx() { - TPos3f vec3; + TPos3f vec3; vec3.identity(); if (_A9) { TVec3f vec(MR::getRailDirection(this)); @@ -311,12 +302,10 @@ void BirikyuWithFace::calcAndSetBaseMtx() { TVec3f vec2(_AC); if (MR::isSameDirection(vec2, vec, 0.0099999998f)) { MR::makeMtxSideFront(&vec3, vec, _B8); - } - else { + } else { MR::makeMtxSideUp(&vec3, vec, vec2); } - } - else { + } else { vec3.makeRotate(_AC, _C4); } vec3.mMtx[0][3] = mPosition.x; @@ -329,6 +318,6 @@ f32 BirikyuWithFace::getHitRadius() const { return 50.0f; } -char *BirikyuWithFace::getCenterJointName() const { +char* BirikyuWithFace::getCenterJointName() const { return "Center"; } diff --git a/src/Game/Enemy/BombTeresa.cpp b/src/Game/Enemy/BombTeresa.cpp index 90b8f5cb7..6d15ee947 100644 --- a/src/Game/Enemy/BombTeresa.cpp +++ b/src/Game/Enemy/BombTeresa.cpp @@ -49,16 +49,16 @@ namespace NrvBombTeresa { NEW_NERVE(BombTeresaNrvDisperse, BombTeresa, Disperse); NEW_NERVE(BombTeresaNrvShock, BombTeresa, Shock); NEW_NERVE(BombTeresaNrvReadyRestart, BombTeresa, ReadyRestart); -} +} // namespace NrvBombTeresa -BombTeresa::BombTeresa(const char* pName) +BombTeresa::BombTeresa(const char* pName) : LiveActor(pName), mJointDelegator(nullptr), mJointDelegator2(nullptr), mScaleController(nullptr), mBindStarPointer(nullptr), _9C(0.0f, 0.0f, 0.0f, 1.0f), - _AC(0 ,0 ,1), + _AC(0, 0, 1), _B8(0, 0, 0), _C4(0, 0, 0), _D0(0, 0, 0), @@ -69,8 +69,7 @@ BombTeresa::BombTeresa(const char* pName) _EC(false), mDisableRespawning(false), _EE(true), - _EF(false) -{ + _EF(false) { } BombTeresa::~BombTeresa() {} @@ -109,7 +108,7 @@ void BombTeresa::initAfterPlacement() { } //The 2.0 needs to be 1.0 -void BombTeresa::initFromJMapParam(const JMapInfoIter & rIter) { +void BombTeresa::initFromJMapParam(const JMapInfoIter& rIter) { if (MR::isValidInfo(rIter)) { MR::initDefaultPos(this, rIter); applyScale(1.0f); @@ -132,9 +131,9 @@ void BombTeresa::initTongue() { void BombTeresa::initSensor() { f32 mScaleXTemp = mScale.x; initHitSensor(2); - MR::addHitSensorPosEye(this, "tungue", 8, (mScaleXTemp * 20.0f), &_C4, TVec3f(0.0f,0.0f,0.0f)); - MR::addHitSensorEnemy(this, "body", 8, (mScaleXTemp * 85.0f), TVec3f(0.0f,0.0f,0.0f)); - MR::initStarPointerTarget(this, (mScaleXTemp * 85.0f), TVec3f(0.0f,0.0f,0.0f)); + MR::addHitSensorPosEye(this, "tungue", 8, (mScaleXTemp * 20.0f), &_C4, TVec3f(0.0f, 0.0f, 0.0f)); + MR::addHitSensorEnemy(this, "body", 8, (mScaleXTemp * 85.0f), TVec3f(0.0f, 0.0f, 0.0f)); + MR::initStarPointerTarget(this, (mScaleXTemp * 85.0f), TVec3f(0.0f, 0.0f, 0.0f)); } void BombTeresa::makeActorAppeared() { @@ -143,16 +142,14 @@ void BombTeresa::makeActorAppeared() { MR::onCalcGravity(this); MR::invalidateClipping(this); MR::startBrk(this, "Normal"); - mScale.set(1.0f,1.0f,1.0f); + mScale.set(1.0f, 1.0f, 1.0f); _C4 = mPosition; _DC = 0.0f; setNerve(&NrvBombTeresa::BombTeresaNrvAppear::sInstance); } void BombTeresa::control() { - if (isNerve(&NrvBombTeresa::BombTeresaNrvWait::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvWander::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvChase::sInstance)) { + if (isNerve(&NrvBombTeresa::BombTeresaNrvWait::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvWander::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvChase::sInstance)) { MR::startLevelSound(this, "SE_EM_LV_BOMBTERE_MOVE", -1, -1, -1); } mScaleController->updateNerve(); @@ -166,7 +163,7 @@ void BombTeresa::control() { void BombTeresa::calcAndSetBaseMtx() { MR::setBaseTRMtx(this, _9C); TVec3f scale; - scale.z *= mScale.z; + scale.z *= mScale.z; MR::setBaseScale(this, scale); mJointDelegator->registerCallBack(); mJointDelegator2->registerCallBack(); @@ -200,7 +197,7 @@ bool BombTeresa::rootTongueMtxCallBack(TPos3f* arg0, const JointControllerInfo& if (MR::normalizeOrZero(&(v12 - v11))) { v14.set(v13); } - MR::turnMtxToXDirRate(arg0, v14, (0.5f * _DC)); + MR::turnMtxToXDirRate(arg0, v14, (0.5f * _DC)); v14.x = MR::getEaseInOutValue(MR::normalize(PSVECDistance(&v11, &v12), 400.0f, 1000.0f), 1.0f, 0.5f, 1.0f); v14.y = 1.0f; MR::preScaleMtx(arg0->toMtxPtr(), v14); @@ -224,7 +221,7 @@ bool BombTeresa::endTongueMtxCallBack(TPos3f* arg0, const JointControllerInfo& a } MR::turnMtxToXDirRate(arg0, v14, _DC); arg0->getXDir(v13); - f32 v7 = _DC; + f32 v7 = _DC; TVec3f v15(v14); v15 *= 0.35f; TVec3f v16(v15); @@ -239,18 +236,14 @@ bool BombTeresa::endTongueMtxCallBack(TPos3f* arg0, const JointControllerInfo& a return true; } -void BombTeresa::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void BombTeresa::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorEye(pSender) && MR::isSensorPlayer(pReceiver)) { - if (isTouchTongue() - && !MR::sendArbitraryMsg(ACTMES_BOMB_TERESA_TONGUE_TOUCH, pReceiver, pSender)) - { + if (isTouchTongue() && !MR::sendArbitraryMsg(ACTMES_BOMB_TERESA_TONGUE_TOUCH, pReceiver, pSender)) { setNerve(&NrvBombTeresa::BombTeresaNrvAttackTongueFailed::sInstance); } } else if (MR::isSensorEnemy(pSender)) { if (MR::isSensorPlayer(pReceiver)) { - if (isEnableHitExplosionToPlayer() - && MR::sendMsgEnemyAttackExplosion(pReceiver, pSender)) - { + if (isEnableHitExplosionToPlayer() && MR::sendMsgEnemyAttackExplosion(pReceiver, pSender)) { MR::zeroVelocity(this); setNerve(&NrvBombTeresa::BombTeresaNrvExplosion::sInstance); } @@ -268,14 +261,14 @@ void BombTeresa::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { } } -bool BombTeresa::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { +bool BombTeresa::receiveMsgPush(HitSensor* pSender, HitSensor* pReceiver) { if (!MR::isSensorEnemy(pReceiver)) { return false; } if (MR::isSensorEnemy(pSender)) { TVec3f deltaPos = MR::getSensorPos(pReceiver) - MR::getSensorPos(pSender); - + if (MR::normalizeOrZero(&deltaPos)) { MR::getRandomVector(&deltaPos, 1.0); MR::normalizeOrZero(&deltaPos); @@ -292,7 +285,7 @@ bool BombTeresa::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { return false; } -bool BombTeresa::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BombTeresa::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgStarPieceAttack(msg) && isEnableStarPieceAttack()) { setNerve(&NrvBombTeresa::BombTeresaNrvDisperse::sInstance); return true; @@ -310,7 +303,7 @@ bool BombTeresa::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor * return false; } -bool BombTeresa::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BombTeresa::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgToEnemyAttackBlow(msg) && isEnableHitExplosion()) { MR::zeroVelocity(this); setNerve(&NrvBombTeresa::BombTeresaNrvDisperse::sInstance); @@ -336,7 +329,7 @@ bool BombTeresa::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *p return false; } -bool BombTeresa::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BombTeresa::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (msg == ACTMES_DISPERSE_BOMB_TERESA && isEnableDisperse()) { MR::zeroVelocity(this); setNerve(&NrvBombTeresa::BombTeresaNrvDisperse::sInstance); @@ -355,7 +348,7 @@ bool BombTeresa::requestDrift() { MR::invalidateClipping(this); setNerve(&NrvBombTeresa::BombTeresaNrvDrift::sInstance); return true; - } + } return false; } @@ -368,7 +361,7 @@ bool BombTeresa::tryCheseEnd() { } bool BombTeresa::tryDirectTackle() { - if (!MR::isPlayerDamaging() && MR::isNearPlayer(this,900.0f) && MR::isFaceToPlayerHorizontalDegree(this, _AC, 30.0f)) { + if (!MR::isPlayerDamaging() && MR::isNearPlayer(this, 900.0f) && MR::isFaceToPlayerHorizontalDegree(this, _AC, 30.0f)) { setNerve(&NrvBombTeresa::BombTeresaNrvDirectTackleSign::sInstance); return true; } @@ -463,7 +456,6 @@ void BombTeresa::exeShadowAppear() { MR::deleteEffect(this, "Shadow"); setNerve(&NrvBombTeresa::BombTeresaNrvAppear::sInstance); } - } void BombTeresa::exeBallAppear() { @@ -484,9 +476,9 @@ void BombTeresa::exeBallAppear() { } if (MR::isLessStep(this, 160)) { MR::rotateQuatRollBall(&_9C, mVelocity, -mGravity, 70.0f); - _AC.set((2.0f * _9C.y * _9C.x) + (2.0f * _9C.y * _9C.z), - (2.0f * _9C.z * _9C.x) - (2.0f * _9C.y * _9C.y), - (1.0f - (2.0f * _9C.y * _9C.y) - (2.0f * _9C.z * _9C.z))); + _AC.set((2.0f * _9C.y * _9C.x) + (2.0f * _9C.y * _9C.z), + (2.0f * _9C.z * _9C.x) - (2.0f * _9C.y * _9C.y), + (1.0f - (2.0f * _9C.y * _9C.y) - (2.0f * _9C.z * _9C.z))); } else { f32 v3 = mGravity.dot(_AC); JMAVECScaleAdd(&mGravity, &_AC, &_AC, -v3); @@ -538,7 +530,7 @@ void BombTeresa::exeWander() { v2 = 0.5f; } MR::rotateDirectionGravityDegree(this, &_AC, v2); - MR::addVelocityMoveToDirection(this, _AC, 0.5f); + MR::addVelocityMoveToDirection(this, _AC, 0.5f); updateNormalVelocity(); if (MR::isInDeath(this, TVec3f(0.0f, 0.0f, 0.0f))) { tryRevival(); @@ -557,7 +549,8 @@ void BombTeresa::exeChase() { MR::addVelocityMoveToDirection(this, _AC, (0.9f * MR::calcNerveRate(this, 60))); _C4 = mPosition; updateNormalVelocity(); - if (!tryCheseEnd() && tryDirectTackle()) return; + if (!tryCheseEnd() && tryDirectTackle()) + return; } void BombTeresa::exeAttackTongueFailed() { @@ -621,11 +614,11 @@ void BombTeresa::exeDrift() { } PSVECCrossProduct(&mGravity, &_AC, &v14); PSVECCrossProduct(&mGravity, &(*MR::getPlayerPos() - MR::getCamPos()), &v15); - if ( MR::isNearZero(v14, 0.001) ) { - MR::makeAxisVerticalZX(&v14, mGravity); + if (MR::isNearZero(v14, 0.001)) { + MR::makeAxisVerticalZX(&v14, mGravity); } - if ( MR::isNearZero(v15, 0.001) ) { - MR::makeAxisVerticalZX(&v15, mGravity); + if (MR::isNearZero(v15, 0.001)) { + MR::makeAxisVerticalZX(&v15, mGravity); } MR::normalize(&v14); MR::normalize(&v15); @@ -669,7 +662,8 @@ void BombTeresa::exeDrift() { _E0 *= 0.992f; } _E8--; - if (!tryExplosion() && !tryDriftRelease() && tryAbortDrift()) return; + if (!tryExplosion() && !tryDriftRelease() && tryAbortDrift()) + return; } void BombTeresa::exeDriftRelease() { @@ -685,7 +679,8 @@ void BombTeresa::exeDriftRelease() { } else { updateDriftReleaseVelocity(); } - if (!tryExplosion() && tryDriftReleaseEnd()) return; + if (!tryExplosion() && tryDriftReleaseEnd()) + return; } void BombTeresa::exeBindStarPointer() { @@ -736,7 +731,7 @@ void BombTeresa::exeDisperse() { MR::startSound(this, "SE_EM_BOMBTERE_HIDE", -1, -1); MR::hideModel(this); _DC = 0.0f; - MR::zeroVelocity(this); + MR::zeroVelocity(this); } _C4 = mPosition; if (MR::isGreaterStep(this, 40)) { @@ -762,27 +757,14 @@ bool BombTeresa::isTouchTongue() const { } bool BombTeresa::isEnableDrift() const { - if (isNerve(&NrvBombTeresa::BombTeresaNrvBallAppear::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvShadowAppear::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvDrift::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvDriftRelease::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvExplosion::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvShock::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvDisperse::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvReadyRestart::sInstance) ) { + if (isNerve(&NrvBombTeresa::BombTeresaNrvBallAppear::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvShadowAppear::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvDrift::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvDriftRelease::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvExplosion::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvShock::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvDisperse::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvReadyRestart::sInstance)) { return false; } return true; } bool BombTeresa::isEnablePointBind() const { - if (isNerve(&NrvBombTeresa::BombTeresaNrvWait::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvWander::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvChase::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvAttackTongueFailed::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvDirectTackleSign::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvDirectTackle::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvDriftRelease::sInstance)) { + if (isNerve(&NrvBombTeresa::BombTeresaNrvWait::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvWander::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvChase::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvAttackTongueFailed::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvDirectTackleSign::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvDirectTackle::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvDriftRelease::sInstance)) { return true; } return false; @@ -803,49 +785,34 @@ bool BombTeresa::isEnableHitExplosionToPlayer() const { } bool BombTeresa::isEnableHitExplosionToEnemy() const { - if (isNerve(&NrvBombTeresa::BombTeresaNrvDrift::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvDriftRelease::sInstance)) { + if (isNerve(&NrvBombTeresa::BombTeresaNrvDrift::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvDriftRelease::sInstance)) { return true; } return false; } bool BombTeresa::isEnableHitExplosion() const { - if (isNerve(&NrvBombTeresa::BombTeresaNrvBallAppear::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvShadowAppear::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvExplosion::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvShock::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvDisperse::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvDrift::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvReadyRestart::sInstance)) { + if (isNerve(&NrvBombTeresa::BombTeresaNrvBallAppear::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvShadowAppear::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvExplosion::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvShock::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvDisperse::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvDrift::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvReadyRestart::sInstance)) { return false; } return true; } bool BombTeresa::isEnableStarPieceAttack() const { - if (isNerve(&NrvBombTeresa::BombTeresaNrvBallAppear::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvShadowAppear::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvExplosion::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvShock::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvDisperse::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvDrift::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvReadyRestart::sInstance)) { + if (isNerve(&NrvBombTeresa::BombTeresaNrvBallAppear::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvShadowAppear::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvExplosion::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvShock::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvDisperse::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvDrift::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvReadyRestart::sInstance)) { return false; } return true; } bool BombTeresa::isEnableShockWave() const { - if (isNerve(&NrvBombTeresa::BombTeresaNrvExplosion::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvShock::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvDisperse::sInstance)) { + if (isNerve(&NrvBombTeresa::BombTeresaNrvExplosion::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvShock::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvDisperse::sInstance)) { return false; } return true; } -bool BombTeresa::appearNormal(const TVec3f & arg0, const TVec3f & arg1) { +bool BombTeresa::appearNormal(const TVec3f& arg0, const TVec3f& arg1) { if (!MR::isDead(this)) { return false; } @@ -859,7 +826,7 @@ bool BombTeresa::appearNormal(const TVec3f & arg0, const TVec3f & arg1) { return true; } -bool BombTeresa::appearShadow(const TVec3f & arg0, const TVec3f & arg1) { +bool BombTeresa::appearShadow(const TVec3f& arg0, const TVec3f& arg1) { if (!appearNormal(arg0, arg1)) { return false; } @@ -877,9 +844,7 @@ void BombTeresa::addTeresaSpinPullVelocity(f32 arg0) { } bool BombTeresa::requestDisperse() { - if (isNerve(&NrvBombTeresa::BombTeresaNrvExplosion::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvShock::sInstance) - || isNerve(&NrvBombTeresa::BombTeresaNrvDisperse::sInstance)) { + if (isNerve(&NrvBombTeresa::BombTeresaNrvExplosion::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvShock::sInstance) || isNerve(&NrvBombTeresa::BombTeresaNrvDisperse::sInstance)) { return false; } setNerve(&NrvBombTeresa::BombTeresaNrvDisperse::sInstance); diff --git a/src/Game/Enemy/Dossun.cpp b/src/Game/Enemy/Dossun.cpp index ba690a729..dbed58167 100644 --- a/src/Game/Enemy/Dossun.cpp +++ b/src/Game/Enemy/Dossun.cpp @@ -13,9 +13,10 @@ namespace NrvDossun { NEW_NERVE(DossunNrvFalling, Dossun, Falling); NEW_NERVE(DossunNrvOnGround, Dossun, OnGround); NEW_NERVE(DossunNrvRising, Dossun, Rising); -}; +}; // namespace NrvDossun -Dossun::Dossun(const char *pName) : LiveActor(pName) { +Dossun::Dossun(const char* pName) + : LiveActor(pName) { _8C.x = 0.0f; _8C.y = 0.0f; _8C.z = 0.0f; @@ -30,7 +31,7 @@ Dossun::Dossun(const char *pName) : LiveActor(pName) { mHasShadow = false; } -void Dossun::init(const JMapInfoIter &rIter) { +void Dossun::init(const JMapInfoIter& rIter) { MR::useStageSwitchReadA(this, rIter); MR::useStageSwitchSleep(this, rIter); initMapToolInfo(rIter); @@ -38,8 +39,7 @@ void Dossun::init(const JMapInfoIter &rIter) { MR::startBva(this, "Wait"); if (mHasShadow) { MR::connectToSceneCollisionEnemyStrongLight(this); - } - else { + } else { MR::connectToSceneCollisionEnemyNoShadowedMapObjStrongLight(this); } @@ -63,13 +63,12 @@ void Dossun::appear() { mPosition.set(_8C); if (MR::isValidSwitchA(this)) { setNerve(&NrvDossun::DossunNrvReady::sInstance); - } - else { + } else { setNerve(&NrvDossun::DossunNrvUpper::sInstance); } } -void Dossun::initMapToolInfo(const JMapInfoIter &rIter) { +void Dossun::initMapToolInfo(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::getJMapInfoArg0NoInit(rIter, &mMovementDist); MR::getJMapInfoArg1NoInit(rIter, &mRisenWaitTime); @@ -86,8 +85,7 @@ void Dossun::initShadow() { calcParameters(); if (mShadowType == 0) { MR::initShadowFromCSV(this, "Shadow2D"); - } - else { + } else { MR::initShadowFromCSV(this, "Shadow"); MR::excludeCalcShadowToMyCollision(this, nullptr); } @@ -142,7 +140,7 @@ void Dossun::exeFallSign() { MR::startSound(this, "SE_OJ_DOSSUN_FALL_SIGN", -1, -1); } - + if (MR::isBckStopped(this)) { setNerve(&NrvDossun::DossunNrvFalling::sInstance); } diff --git a/src/Game/Enemy/ElectricPressureBullet.cpp b/src/Game/Enemy/ElectricPressureBullet.cpp index 6ed4c5f64..ac65213d7 100644 --- a/src/Game/Enemy/ElectricPressureBullet.cpp +++ b/src/Game/Enemy/ElectricPressureBullet.cpp @@ -14,16 +14,14 @@ namespace NrvElectricPressureBullet { NEW_NERVE(ElectricPressureBulletNrvFly, ElectricPressureBullet, Fly); }; -ElectricPressureBullet::ElectricPressureBullet(const char *pName) : - LiveActor(pName), - _8C(0.0f, 0.0f, 0.0f), - _98(nullptr), - _9C(0.0f) -{ - +ElectricPressureBullet::ElectricPressureBullet(const char* pName) + : LiveActor(pName), + _8C(0.0f, 0.0f, 0.0f), + _98(nullptr), + _9C(0.0f) { } -void ElectricPressureBullet::init(const JMapInfoIter &rIter) { +void ElectricPressureBullet::init(const JMapInfoIter& rIter) { initModelManagerWithAnm("ElectricBullet", nullptr, false); MR::connectToSceneEnemy(this); initHitSensor(1); @@ -43,7 +41,7 @@ void ElectricPressureBullet::kill() { LiveActor::kill(); } -void ElectricPressureBullet::shotElectricBullet(LiveActor *actor, const TPos3f &pos, const f32 &value) { +void ElectricPressureBullet::shotElectricBullet(LiveActor* actor, const TPos3f& pos, const f32& value) { _98 = actor; _9C = value; _8C.set(pos.get(0, 2), pos.get(1, 2), pos.get(2, 2)); @@ -70,33 +68,32 @@ void ElectricPressureBullet::exeFly() { MR::startLevelSound(this, "SE_EM_LV_ELECBUBLLET_FLY", -1, -1, -1); if (MR::isGreaterEqualStep(this, 10)) { if (MR::isLessStep(this, 150)) { - s32 v2 = getNerveStep(); + s32 v2 = getNerveStep(); if (!(v2 % 5)) { - TVec3f *v1 = MR::getPlayerCenterPos(); - TVec3f v3; + TVec3f* v1 = MR::getPlayerCenterPos(); + TVec3f v3; JMathInlineVEC::PSVECSubtract2(v1, &mPosition, &v3); MR::normalize(&v3); MR::turnVecToVecDegree(&_8C, _8C, v3, 4.0f, TVec3f(0, 1, 0)); mVelocity.scale(_9C, _8C); } } - } - + } + if (MR::isBinded(this)) { kill(); - } - else if (MR::isStep(this, 360)) { + } else if (MR::isStep(this, 360)) { kill(); } } void ElectricPressureBullet::control() { - if (MR::isStarPointerPointing2POnTriggerButton(this,"弱", true, false)) { + if (MR::isStarPointerPointing2POnTriggerButton(this, "弱", true, false)) { kill(); } } -void ElectricPressureBullet::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void ElectricPressureBullet::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver) && MR::sendMsgEnemyAttackElectric(pReceiver, pSender)) { kill(); } diff --git a/src/Game/Enemy/EyeBeamer.cpp b/src/Game/Enemy/EyeBeamer.cpp index f4a8dac3f..0df4b7569 100644 --- a/src/Game/Enemy/EyeBeamer.cpp +++ b/src/Game/Enemy/EyeBeamer.cpp @@ -28,20 +28,21 @@ #include "JSystem/JGeometry/TQuat.hpp" #include "revolution/mtx.h" -EyeBeamer::EyeBeamer(const char* pName) : LiveActor(pName), - mRailMover(nullptr), - mBeamMdl(nullptr), - mBeamBloom(nullptr), - mBeamVolumeDrawer(nullptr), - _CC(0, 0, 0, 1), - _DC(0, 0, 0, 1), - _EC(0, 0, 0), - _F8(0, 0, 0), - _104(0, 0, 0), - _140(0, 0, 0), - _15C(2000.0f), - _160(-1.0f), - mIsInMercatorCube(false) { +EyeBeamer::EyeBeamer(const char* pName) + : LiveActor(pName), + mRailMover(nullptr), + mBeamMdl(nullptr), + mBeamBloom(nullptr), + mBeamVolumeDrawer(nullptr), + _CC(0, 0, 0, 1), + _DC(0, 0, 0, 1), + _EC(0, 0, 0), + _F8(0, 0, 0), + _104(0, 0, 0), + _140(0, 0, 0), + _15C(2000.0f), + _160(-1.0f), + mIsInMercatorCube(false) { mWaterSurfaceMtx.identity(); _9C.identity(); } @@ -60,7 +61,7 @@ void EyeBeamer::init(const JMapInfoIter& rIter) { MR::getJMapInfoArg1NoInit(rIter, &_160); initHitSensor(2); MR::addHitSensorMapObj(this, "body", 8, 0.0f, TVec3f(0.0f, 0.0f, 0.0f)); - MR::addHitSensorEye(this, "beam", 8, 140.0f+(0.5f*_15C), TVec3f(0.0f, 0.5f*(-_15C), 0.0f)); + MR::addHitSensorEye(this, "beam", 8, 140.0f + (0.5f * _15C), TVec3f(0.0f, 0.5f * (-_15C), 0.0f)); initSound(4, 0); MR::initCollisionParts(this, "EyeBeamer", getSensor("body"), 0); initRailMoveFunction(rIter); @@ -88,14 +89,14 @@ void EyeBeamer::initStartNerve(const JMapInfoIter& rIter) { MR::getJMapInfoArg2WithInit(rIter, &arg); switch (arg) { - case -1: - initNerve(&NrvEyeBeamer::EyeBeamerNrvWait::sInstance); + case -1: + initNerve(&NrvEyeBeamer::EyeBeamerNrvWait::sInstance); break; - case 0: - initNerve(&NrvEyeBeamer::EyeBeamerNrvPatrol::sInstance); + case 0: + initNerve(&NrvEyeBeamer::EyeBeamerNrvPatrol::sInstance); break; - default: - initNerve(&NrvEyeBeamer::EyeBeamerNrvWait::sInstance); + default: + initNerve(&NrvEyeBeamer::EyeBeamerNrvWait::sInstance); break; } } @@ -121,17 +122,16 @@ void EyeBeamer::initAfterPlacement() { MR::calcUpVec(&stack_80, this); stack_80.negate(); TVec3f stack_74; - stack_74.set(mPosition-(stack_80*300.0f)); + stack_74.set(mPosition - (stack_80 * 300.0f)); TVec3f stack_68; - f32 dist; - if (MR::getFirstPolyOnLineToMapExceptActor(&stack_68, 0, stack_74, stack_80*(300.0f+_15C), this)) { + f32 dist; + if (MR::getFirstPolyOnLineToMapExceptActor(&stack_68, 0, stack_74, stack_80 * (300.0f + _15C), this)) { dist = PSVECDistance(&stack_68, &mPosition); - _140.set((stack_68+mPosition)*0.5); - dist = 300.0f+0.5f*dist; - } - else { - _140.set(mPosition+((stack_80*_15C)*0.5f)); - dist = 300.0f+(0.5f*_15C); + _140.set((stack_68 + mPosition) * 0.5); + dist = 300.0f + 0.5f * dist; + } else { + _140.set(mPosition + ((stack_80 * _15C) * 0.5f)); + dist = 300.0f + (0.5f * _15C); } MR::setClippingTypeSphere(this, dist, &_140); @@ -156,8 +156,7 @@ void EyeBeamer::updatePoseAndTrans() { stack_8.identity(); MR::convertMercatorPlaneToSphereTransAndRotate(&mPosition, &stack_8, _EC, true); stack_38.concat(stack_8, stack_38); - } - else { + } else { mPosition.set(_EC); } stack_38.setTrans(mPosition); @@ -171,12 +170,12 @@ void EyeBeamer::updateWaterSurfaceMtx() { mWaterSurfaceMtx.setQuat(_DC); TVec3f stack_38; - f32 f3 = mWaterSurfaceMtx[2][1]; - f32 f2 = mWaterSurfaceMtx[1][1]; - f32 f1 = mWaterSurfaceMtx[0][1]; + f32 f3 = mWaterSurfaceMtx[2][1]; + f32 f2 = mWaterSurfaceMtx[1][1]; + f32 f1 = mWaterSurfaceMtx[0][1]; stack_38.set(f1, f2, f3); TVec3f stack_2C; - TVec3f stack_20(_EC-(stack_38*(_160+(stack_38).dot(_EC - _104)))); + TVec3f stack_20(_EC - (stack_38 * (_160 + (stack_38).dot(_EC - _104)))); stack_2C.set(stack_20); if (mIsInMercatorCube) { @@ -215,11 +214,11 @@ void EyeBeamer::calcAnim() { MtxPtr mtx = MR::getJointMtx(this, "Beam"); _9C.setInline(mtx); f32 one = 1.0f; - f32 temp = _15C/2000.0f; + f32 temp = _15C / 2000.0f; MR::preScaleMtx(_9C, TVec3f(one, temp, one)); } -void EyeBeamer::calcAndSetBaseMtx() {}; +void EyeBeamer::calcAndSetBaseMtx(){}; void EyeBeamer::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (isOnBeam() && MR::isSensorPlayer(pReceiver) && isInBeamRange(*MR::getPlayerPos())) { @@ -254,17 +253,17 @@ void EyeBeamer::exeDemoTurn() { if (MR::isFirstStep(this)) MR::startSound(this, "SE_OJ_EYE_BEAMER_TURN", -1, -1); - f32 rate = MR::calcDemoPartStepRate("アイビーマー回転"); - f32 easeIn = MR::getEaseInOutValue(rate, 0.0f, 1.0f, 1.0f); + f32 rate = MR::calcDemoPartStepRate("アイビーマー回転"); + f32 easeIn = MR::getEaseInOutValue(rate, 0.0f, 1.0f, 1.0f); TQuat4f stack_30; - TVec3f stack_24; + TVec3f stack_24; _CC.getXDir(stack_24); - stack_30.setRotate(stack_24, PI*easeIn); + stack_30.setRotate(stack_24, PI * easeIn); PSQUATMultiply((Quaternion*)&stack_30, (Quaternion*)&_CC, (Quaternion*)&_DC); - + if (MR::isDemoPartLastStep("アイビーマー回転")) { TQuat4f stack_14; - TVec3f stack_8; + TVec3f stack_8; _CC.getXDir(stack_8); stack_14.setRotate(stack_8, PI); PSQUATMultiply((Quaternion*)&stack_14, (Quaternion*)&_CC, (Quaternion*)&_DC); @@ -284,13 +283,13 @@ void EyeBeamer::exeTurn() { if (MR::isFirstStep(this)) { MR::startSound(this, "SE_OJ_EYE_BEAMER_TURN", -1, -1); } - f32 easeInOut = MR::calcNerveEaseInOutRate(this, 0x12C); + f32 easeInOut = MR::calcNerveEaseInOutRate(this, 0x12C); TQuat4f stack_14; - TVec3f stack_8; + TVec3f stack_8; _CC.getXDir(stack_8); - stack_14.setRotate(stack_8, PI*easeInOut); + stack_14.setRotate(stack_8, PI * easeInOut); PSQUATMultiply((Quaternion*)&stack_14, (Quaternion*)&_CC, (Quaternion*)&_DC); - + if (tryGotoPatrol()) return; } @@ -306,7 +305,7 @@ void EyeBeamer::exeGotoPatrol() { void EyeBeamer::exePatrol() { if (MR::isFirstStep(this)) { MR::validateClipping(this); - TVec3f stack_48; + TVec3f stack_48; TQuat4f stack_38; _CC.getXDir(stack_48); stack_38.setRotate(stack_48, PI); @@ -317,8 +316,8 @@ void EyeBeamer::exePatrol() { TVec3f stack_2C; MR::calcUpVec(&stack_2C, this); stack_2C.negate(); - _140.set(mPosition+((stack_2C*_15C)*0.5)); - MR::setClippingTypeSphere(this, 300.0f+(0.5f*_15C), &_140); + _140.set(mPosition + ((stack_2C * _15C) * 0.5)); + MR::setClippingTypeSphere(this, 300.0f + (0.5f * _15C), &_140); mRailMover->movement(); _EC.set(mRailMover->_28); } @@ -328,17 +327,17 @@ bool EyeBeamer::isInBeamRange(const TVec3f& rVec) const { MR::calcUpVec(&stack_44, this); stack_44.negate(); TVec3f stack_38; - f32 f3 = _9C[2][3]; - f32 f2 = _9C[1][3]; - f32 f1 = _9C[0][3]; + f32 f3 = _9C[2][3]; + f32 f2 = _9C[1][3]; + f32 f1 = _9C[0][3]; stack_38.set(f1, f2, f3); - f32 dot = stack_44.dot(rVec-stack_38); + f32 dot = stack_44.dot(rVec - stack_38); if (dot < 0.0f || _15C < dot) return false; else { TVec3f stack_2C; - stack_2C.set(stack_38+(stack_44*dot)); + stack_2C.set(stack_38 + (stack_44 * dot)); f32 dist = PSVECDistance(&stack_2C, &rVec); if (dist < 140.0f) @@ -355,14 +354,12 @@ bool EyeBeamer::isOnBeam() const { return false; } - - -EyeBeamer::~EyeBeamer() {}; +EyeBeamer::~EyeBeamer(){}; namespace NrvEyeBeamer { void EyeBeamerNrvDemoWait::execute(Spine* pSpine) const { EyeBeamer* pEyeBeamer = (EyeBeamer*)pSpine->mExecutor; - if (MR::isDemoLastStep()) + if (MR::isDemoLastStep()) pEyeBeamer->setNerve(&NrvEyeBeamer::EyeBeamerNrvPatrol::sInstance); } EyeBeamerNrvDemoStartWait(EyeBeamerNrvDemoStartWait::sInstance); @@ -373,4 +370,4 @@ namespace NrvEyeBeamer { EyeBeamerNrvTurn(EyeBeamerNrvTurn::sInstance); EyeBeamerNrvGotoPatrol(EyeBeamerNrvGotoPatrol::sInstance); EyeBeamerNrvPatrol(EyeBeamerNrvPatrol::sInstance); -}; +}; // namespace NrvEyeBeamer diff --git a/src/Game/Enemy/FireBall.cpp b/src/Game/Enemy/FireBall.cpp index 87036776d..d63900baf 100644 --- a/src/Game/Enemy/FireBall.cpp +++ b/src/Game/Enemy/FireBall.cpp @@ -25,13 +25,14 @@ namespace NrvFireBall { NEW_NERVE(FireBallNrvThrow, FireBall, Throw); NEW_NERVE(FireBallNrvReflect, FireBall, Reflect); -}; +}; // namespace NrvFireBall -FireBall::FireBall(const char* pName) : LiveActor(pName), - _8C(nullptr), - _90(0.0f, 1.0f, 0.0f) { } +FireBall::FireBall(const char* pName) + : LiveActor(pName), + _8C(nullptr), + _90(0.0f, 1.0f, 0.0f) {} -void FireBall::init(const JMapInfoIter & rIter) { +void FireBall::init(const JMapInfoIter& rIter) { initModelManagerWithAnm("FireBall", nullptr, false); MR::connectToSceneEnemyDecoration(this); initHitSensor(1); @@ -81,12 +82,12 @@ void FireBall::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { kill(); return; } - if (MR::isSensorEnemy(pReceiver) && pReceiver->mHost != this->_8C && MR::sendMsgEnemyAttackFire(pReceiver, pSender) ) { + if (MR::isSensorEnemy(pReceiver) && pReceiver->mHost != this->_8C && MR::sendMsgEnemyAttackFire(pReceiver, pSender)) { kill(); } } -bool FireBall::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool FireBall::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgJetTurtleAttack(msg)) { kill(); return false; @@ -116,7 +117,7 @@ HitSensor* FireBall::isBindedAny() const { } bool FireBall::tryToKill() { - HitSensor* bindedSensor = isBindedAny(); + HitSensor* bindedSensor = isBindedAny(); if (bindedSensor) { MR::sendMsgEnemyAttack(bindedSensor, getSensor("body")); @@ -139,7 +140,6 @@ void FireBall::setVelocityToPlayer(f32 param1) { JMathInlineVEC::PSVECSubtract2(&stack_14, &mPosition, &a1); MR::normalize(&a1); mVelocity.scale(param1, a1); - } void FireBall::calcReflectVelocity() { @@ -172,7 +172,7 @@ void FireBall::exeThrow() { } if (MR::isGreaterStep(this, 30) && MR::isStarPointerPointing2POnPressButton(this, "弱", true, false)) { - s32* starPointerLastPointedPort = MR::getStarPointerLastPointedPort(this); + s32* starPointerLastPointedPort = MR::getStarPointerLastPointedPort(this); TVec2f pointerScreenVel = *MR::getStarPointerScreenVelocity(*starPointerLastPointedPort); if (30.0f < pointerScreenVel.length()) { calcReflectVelocity(); @@ -181,7 +181,7 @@ void FireBall::exeThrow() { } } - if (tryToKill()) { + if (tryToKill()) { return; } } @@ -192,7 +192,7 @@ void FireBall::exeReflect() { MR::start2PAttackAssistSound(); MR::startSound(this, "SE_EM_FIRE_BUBBLE_REFLECT", -1, -1); } - mVelocity.mult(0.96f); + mVelocity.mult(0.96f); if (!tryToKill()) { if (MR::isStep(this, 60)) { diff --git a/src/Game/Enemy/IceMerameraKing.cpp b/src/Game/Enemy/IceMerameraKing.cpp index 4ae14804d..c8f6bc61d 100644 --- a/src/Game/Enemy/IceMerameraKing.cpp +++ b/src/Game/Enemy/IceMerameraKing.cpp @@ -17,86 +17,74 @@ namespace { static const char* hScaleJointName[3] = { "WideInSide", "WideOutSide", - "Hirgh1" - }; + "Hirgh1"}; static const f32 hOnAirParam[4] = { 0.0f, 3.0f, 0.95999998f, - 0.0f - }; + 0.0f}; static const f32 hOnGroundParam[4] = { 0.0f, 1.0f, 0.80000001f, - 0.0f - }; + 0.0f}; static const f32 hFlyParam[4] = { 0.0f, 0.5f, 0.89999998f, - 1.0f - }; + 1.0f}; static const f32 hAngryDemoParam[4] = { 0.0f, 0.5f, 0.89999998f, - 1.5f - }; + 1.5f}; static const f32 hEscapeOnGroundParam[4] = { -0.69999999f, 1.0f, 0.95999998f, - 180.0f - }; + 180.0f}; static const f32 hEscapeOnAirParam[4] = { 0.0f, 3.0f, 0.95999998f, - 0.0f - }; + 0.0f}; static const f32 hPreRecoverJumpParam[4] = { 0.0f, 1.0f, 0.95999998f, - 0.0f - }; + 0.0f}; static const f32 hDamageJumpParam[4] = { 0.0f, 1.9f, 0.98000002f, - 0.0f - }; + 0.0f}; static const f32 hAttackParam[4] = { 0.0f, 6.0f, 0.98000002f, - 0.0f - }; + 0.0f}; static f32 hExtinguishOnAirParam[4] = { 0.0f, 0.125f, 0.95999998f, - 0.0f - }; + 0.0f}; static f32 hExtinguishFallOnAirParam[4] = { 0.0f, 4.0f, 0.95999998f, - 0.0f - }; -}; + 0.0f}; +}; // namespace namespace NrvIceMerameraKing { NEW_NERVE(HostTypeNrvSearch, IceMerameraKing, Search); @@ -119,37 +107,35 @@ namespace NrvIceMerameraKing { TVec3f hBinderOffset(-100.586f, 222.65601f, -91.796898f); TVec3f hEscapeBinderOffset(-39.0625f, 91.796898f, -47.851601f); -}; +}; // namespace NrvIceMerameraKing -IceMerameraKing::IceMerameraKing(const char *pName) : - LiveActor(pName), - mFixedPos(nullptr), - _90(nullptr), - _94(nullptr), - mActor(nullptr), - _A0(0), - _A4(0), - _A8(nullptr), - _AC(nullptr), - _B0(0, 0, 1), - _BC(0, 1, 0), - _C8(0, 0, 0), - _D4(0, 0, 0), - _E0(0), - _E4(0), - _EC(3), - _F0(0), - mModelArray(), - _100(0, 0, 0, 1), - _120(false), - _110(0.0f, 0.0f, 0.0f), - _11C(0.0f), - _121(false) -{ - +IceMerameraKing::IceMerameraKing(const char* pName) + : LiveActor(pName), + mFixedPos(nullptr), + _90(nullptr), + _94(nullptr), + mActor(nullptr), + _A0(0), + _A4(0), + _A8(nullptr), + _AC(nullptr), + _B0(0, 0, 1), + _BC(0, 1, 0), + _C8(0, 0, 0), + _D4(0, 0, 0), + _E0(0), + _E4(0), + _EC(3), + _F0(0), + mModelArray(), + _100(0, 0, 0, 1), + _120(false), + _110(0.0f, 0.0f, 0.0f), + _11C(0.0f), + _121(false) { } -void IceMerameraKing::init(const JMapInfoIter &rIter) { +void IceMerameraKing::init(const JMapInfoIter& rIter) { if (MR::isValidInfo(rIter)) { MR::initDefaultPos(this, rIter); _C8.set(mPosition); @@ -235,8 +221,7 @@ void IceMerameraKing::initAfterPlacement() { if (mBinder->_24) { cChar = cc & 0xDF; - } - else { + } else { cChar = cc | 0x20; } @@ -275,8 +260,7 @@ void IceMerameraKing::control() { if (MR::isValidSwitchA(this)) { if (MR::isOnSwitchA(this)) { MR::invalidateClipping(this); - } - else { + } else { MR::validateClipping(this); } } @@ -297,8 +281,7 @@ void IceMerameraKing::control() { _120 = true; _121 = true; } - } - else if (!isNerve(&NrvIceMerameraKing::HostTypeNrvDeathDemoWait::sInstance) && !isNerve(&NrvIceMerameraKing::HostTypeNrvDeathDemo::sInstance) && MR::isNearPlayer(this, 5000.0f) && _121) { + } else if (!isNerve(&NrvIceMerameraKing::HostTypeNrvDeathDemoWait::sInstance) && !isNerve(&NrvIceMerameraKing::HostTypeNrvDeathDemo::sInstance) && MR::isNearPlayer(this, 5000.0f) && _121) { MR::playLevelMarioPinchBGM(_120); _120 = true; } @@ -316,16 +299,14 @@ void IceMerameraKing::exeSearch() { if (!(4500.0f < shadow)) { if (shadow < 1000.0f) { setNerve(&NrvIceMerameraKing::HostTypeNrvPreAttack::sInstance); - } - else { + } else { if (isEnableThrow()) { if (!(_EC > 2)) { if (MR::isGreaterStep(this, 200) && isDeadAllIce()) { _E0 = 0; setNerve(&NrvIceMerameraKing::HostTypeNrvThrow2nd::sInstance); } - } - else if (MR::isGreaterStep(this, 100) && isDeadAllIce()) { + } else if (MR::isGreaterStep(this, 100) && isDeadAllIce()) { _E0 = 0; setNerve(&NrvIceMerameraKing::HostTypeNrvThrow::sInstance); } @@ -365,8 +346,7 @@ void IceMerameraKing::exeThrow() { if (MR::isActionEnd(this)) { if (MR::calcDistanceToPlayer(this) < 1000.0f) { setNerve(&NrvIceMerameraKing::HostTypeNrvPreAttack::sInstance); - } - else { + } else { u32 v10 = 3; if (isNerve(&NrvIceMerameraKing::HostTypeNrvThrow2nd::sInstance)) { v10 = 6; @@ -374,11 +354,9 @@ void IceMerameraKing::exeThrow() { if (v10 <= _E0 || !isEnableThrow()) { setNerve(&NrvIceMerameraKing::HostTypeNrvSearch::sInstance); - } - else if (isNerve(&NrvIceMerameraKing::HostTypeNrvThrow2nd::sInstance)) { + } else if (isNerve(&NrvIceMerameraKing::HostTypeNrvThrow2nd::sInstance)) { setNerve(&NrvIceMerameraKing::HostTypeNrvThrow2nd::sInstance); - } - else { + } else { setNerve(&NrvIceMerameraKing::HostTypeNrvThrow::sInstance); } } @@ -410,8 +388,8 @@ void IceMerameraKing::exeExtinguish() { MR::startSound(this, "SE_BM_ICEMERAKING_SMOKE", -1, -1); MR::deleteEffect(this, "BodyIce"); MR::emitEffectWithParticleCallBack(this, "BodyIceOff", mSpinParticle); - TVec3f *v3 = MR::getPlayerCenterPos(); - TVec3f v4(mPosition); + TVec3f* v3 = MR::getPlayerCenterPos(); + TVec3f v4(mPosition); v4.sub(*v3); MR::vecKillElement(v4, mGravity, &v4); MR::normalizeOrZero(&v4); @@ -422,14 +400,12 @@ void IceMerameraKing::exeExtinguish() { if (MR::isLessStep(this, 40)) { MR::addVelocityKeepHeightUseShadow(this, _11C, 1.3f, 700.0f, nullptr); MR::moveAndTurnToPlayer(this, &_B0, hExtinguishOnAirParam[0], hExtinguishOnAirParam[1], hExtinguishOnAirParam[2], hExtinguishOnAirParam[3]); - } - else if (MR::isOnGround(this) && MR::isActionEnd(this)) { + } else if (MR::isOnGround(this) && MR::isActionEnd(this)) { MR::moveAndTurnToPlayer(this, &_B0, hOnGroundParam[0], hOnGroundParam[1], hOnGroundParam[2], hOnGroundParam[3]); MR::startSound(this, "SE_BM_ICEMERAKING_LAND", -1, -1); _E8 = 0; setNerve(&NrvIceMerameraKing::HostTypeNrvEscape::sInstance); - } - else { + } else { MR::moveAndTurnToPlayer(this, &_B0, hExtinguishFallOnAirParam[0], hExtinguishFallOnAirParam[1], hExtinguishFallOnAirParam[2], hExtinguishFallOnAirParam[3]); } //minor. problems on the params @@ -437,17 +413,15 @@ void IceMerameraKing::exeExtinguish() { void IceMerameraKing::exeEscape() { if (MR::isFirstStep(this)) { - } _E8++; if (_E8 > 600 && MR::isOnGround(this)) { _E8 = 0; setNerve(&NrvIceMerameraKing::HostTypeNrvPreRecover::sInstance); - } - else { + } else { MR::emitEffect(this, "Rolling"); - if (MR::isOnGround(this) ){ + if (MR::isOnGround(this)) { f32 v11 = MR::getLinerValueFromMinMax(PSVECMag(&mVelocity), 2.0f, 6.0f, 0.0f, 100.0f); MR::startLevelSound(this, "SE_BM_LV_ICEMERAKING_ROLL", v11, -1, 15); } @@ -459,8 +433,7 @@ void IceMerameraKing::exeEscape() { if (MR::isBindedWallFront(this, -_B0, 0.25f)) { setNerve(&NrvIceMerameraKing::HostTypeNrvEscapeJump::sInstance); } - } - else { + } else { f32 sensor = getSensor("body")->mRadius; MR::rotateQuatRollBall(&_100, mVelocity, -mGravity, 0.5f * sensor); MR::moveAndTurnToPlayer(this, &_B0, hEscapeOnAirParam[0], hEscapeOnAirParam[1], hEscapeOnAirParam[2], hEscapeOnAirParam[3]); @@ -489,8 +462,7 @@ void IceMerameraKing::exeEscapeJump() { MR::startSound(this, "SE_BM_ICEMERAKING_LAND", -1, -1); setNerve(&NrvIceMerameraKing::HostTypeNrvEscape::sInstance); } - } - else { + } else { f32 radius = getSensor("body")->mRadius; MR::rotateQuatRollBall(&_100, mVelocity, -mGravity, (0.5f * radius)); MR::moveAndTurnToPlayer(this, &_B0, hEscapeOnAirParam[0], hEscapeOnAirParam[1], hEscapeOnAirParam[2], hEscapeOnAirParam[3]); @@ -503,7 +475,7 @@ void IceMerameraKing::exeDamage() { MR::emitEffect(this, "Damage"); MR::startBlowHitSound(this); MR::startSound(this, "SE_BM_ICEMERAKING_DAMAGE", -1, -1), - MR::setVelocityJump(this, 80.0f); + MR::setVelocityJump(this, 80.0f); MR::stopSceneForDefaultHit(4); } @@ -513,8 +485,7 @@ void IceMerameraKing::exeDamage() { if (MR::isOnGround(this)) { MR::moveAndTurnToPlayer(this, &_B0, hOnGroundParam[0], hOnGroundParam[1], hOnGroundParam[2], hOnGroundParam[3]); - } - else { + } else { MR::moveAndTurnToPlayer(this, &_B0, hDamageJumpParam[0], hDamageJumpParam[1], hDamageJumpParam[2], hDamageJumpParam[3]); } @@ -523,8 +494,7 @@ void IceMerameraKing::exeDamage() { if (MR::tryStartDemoRegisteredMarioPuppetable(this, "怒りデモ")) { setNerve(&NrvIceMerameraKing::HostTypeNrvAngryDemo2nd::sInstance); } - } - else if (MR::tryStartDemoRegisteredMarioPuppetable(this, "怒りデモ")) { + } else if (MR::tryStartDemoRegisteredMarioPuppetable(this, "怒りデモ")) { setNerve(&NrvIceMerameraKing::HostTypeNrvAngryDemo1st::sInstance); } } @@ -539,20 +509,17 @@ void IceMerameraKing::exePreRecover() { if (MR::isLessStep(this, 50)) { MR::moveAndTurnToPlayer(this, &_B0, hPreRecoverJumpParam[0], hPreRecoverJumpParam[1], hPreRecoverJumpParam[2], hPreRecoverJumpParam[3]); - } - else if (MR::isStep(this, 50)) { + } else if (MR::isStep(this, 50)) { MR::startAction(this, "PreRecover"); MR::setBinderRadius(this, 130.0f); HitSensor* sensor = getSensor("body"); sensor->mRadius = 130.0f; MR::setShadowVolumeSphereRadius(this, nullptr, 130.0f); MR::moveAndTurnToPlayer(this, &_B0, hFlyParam[0], hFlyParam[1], hFlyParam[2], hFlyParam[3]); - } - else if (MR::isLessStep(this, 120)) { + } else if (MR::isLessStep(this, 120)) { MR::addVelocityKeepHeightUseShadow(this, 750.0f, 1.5f, 300.0f, nullptr); MR::moveAndTurnToPlayer(this, &_B0, hFlyParam[0], hFlyParam[1], hFlyParam[2], hFlyParam[3]); - } - else { + } else { setNerve(&NrvIceMerameraKing::HostTypeNrvRecover::sInstance); } } @@ -578,13 +545,11 @@ void IceMerameraKing::exeRecover() { void IceMerameraKing::exePreAttack() { if (MR::isFirstStep(this)) { - } if (MR::isLessStep(this, 120)) { MR::addVelocityKeepHeightUseShadow(this, 800.0f, 1.5f, 300.0f, nullptr); - } - else if (MR::isDead(_A8)) { + } else if (MR::isDead(_A8)) { setNerve(&NrvIceMerameraKing::HostTypeNrvAttack::sInstance); return; } @@ -601,8 +566,7 @@ void IceMerameraKing::exeAttack() { if (!MR::isActionEnd(this)) { MR::addVelocityKeepHeightUseShadow(this, 800.0f, 1.5f, 300.0f, nullptr); MR::moveAndTurnToPlayer(this, &_B0, hFlyParam[0], hFlyParam[1], hFlyParam[2], hFlyParam[3]); - } - else { + } else { MR::moveAndTurnToPlayer(this, &_B0, hAttackParam[0], hAttackParam[1], hAttackParam[2], hAttackParam[3]); } @@ -634,8 +598,7 @@ void IceMerameraKing::exeAngryDemo() { if (isNerve(&NrvIceMerameraKing::HostTypeNrvAngryDemo2nd::sInstance)) { MR::startAction(this, "Summon"); MR::startSound(this, "SE_BM_ICEMERAKING_PRE_ANGRY2", -1, -1); - } - else { + } else { MR::startAction(this, "Recover"); MR::startSound(this, "SE_BM_ICEMERAKING_PRE_ANGRY1", -1, -1); } @@ -655,8 +618,7 @@ void IceMerameraKing::exeAngryDemo() { if (isNerve(&NrvIceMerameraKing::HostTypeNrvAngryDemo2nd::sInstance) && MR::isStep(this, 85)) { MR::startSound(this, "SE_BM_ICEMERAKING_ANGRY2", -1, -1); - } - else if (MR::isStep(this, 85)) { + } else if (MR::isStep(this, 85)) { MR::startSound(this, "SE_BM_ICEMERAKING_ANGRY1", -1, -1); } MR::playLevelMarioPinchBGM(true); @@ -668,8 +630,7 @@ void IceMerameraKing::exeAngryDemo() { TVec3f v8(mPosition); v7.sub(v8); MR::appearStarPiece(this, v7, 8, 15.0f, 70.0f, false); - } - else { + } else { TVec3f v5(mGravity); v5.scale(200.0f); TVec3f v6(mPosition); @@ -711,8 +672,7 @@ void IceMerameraKing::exeDeathDemo() { if (MR::isOnGround(this)) { mVelocity.zero(); - } - else { + } else { MR::moveAndTurnToPlayer(this, &_B0, hOnAirParam[0], hOnAirParam[1], hOnAirParam[2], hOnAirParam[3]); } @@ -735,7 +695,7 @@ void IceMerameraKing::exeDeathDemo() { } } -void IceMerameraKing::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void IceMerameraKing::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (pSender != getSensor("body")) { return; } @@ -744,33 +704,19 @@ void IceMerameraKing::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { return; } - if (isNerve(&NrvIceMerameraKing::HostTypeNrvDamage::sInstance) - || isNerve(&NrvIceMerameraKing::HostTypeNrvExtinguish::sInstance) - || isNerve(&NrvIceMerameraKing::HostTypeNrvEscape::sInstance) - || isNerve(&NrvIceMerameraKing::HostTypeNrvEscapeJump::sInstance) - || isNerve(&NrvIceMerameraKing::HostTypeNrvPreRecover::sInstance) - || isNerve(&NrvIceMerameraKing::HostTypeNrvRecover::sInstance) - || isNerve(&NrvIceMerameraKing::HostTypeNrvDeathDemoWait::sInstance) - || isNerve(&NrvIceMerameraKing::HostTypeNrvAngryDemo1st::sInstance) - || isNerve(&NrvIceMerameraKing::HostTypeNrvAngryDemo2nd::sInstance) - || isNerve(&NrvIceMerameraKing::HostTypeNrvDeathDemo::sInstance) - || MR::isPlayerElementModeIce()) - { + if (isNerve(&NrvIceMerameraKing::HostTypeNrvDamage::sInstance) || isNerve(&NrvIceMerameraKing::HostTypeNrvExtinguish::sInstance) || isNerve(&NrvIceMerameraKing::HostTypeNrvEscape::sInstance) || isNerve(&NrvIceMerameraKing::HostTypeNrvEscapeJump::sInstance) || isNerve(&NrvIceMerameraKing::HostTypeNrvPreRecover::sInstance) || isNerve(&NrvIceMerameraKing::HostTypeNrvRecover::sInstance) || isNerve(&NrvIceMerameraKing::HostTypeNrvDeathDemoWait::sInstance) || isNerve(&NrvIceMerameraKing::HostTypeNrvAngryDemo1st::sInstance) || isNerve(&NrvIceMerameraKing::HostTypeNrvAngryDemo2nd::sInstance) || isNerve(&NrvIceMerameraKing::HostTypeNrvDeathDemo::sInstance) || MR::isPlayerElementModeIce()) { MR::sendMsgPush(pReceiver, pSender); - } - else { + } else { MR::sendMsgEnemyAttackFreeze(pReceiver, pSender); } } -bool IceMerameraKing::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool IceMerameraKing::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgStarPieceReflect(msg)) { return true; } - if (!isNerve(&NrvIceMerameraKing::HostTypeNrvEscape::sInstance) - && !isNerve(&NrvIceMerameraKing::HostTypeNrvEscapeJump::sInstance)) - { + if (!isNerve(&NrvIceMerameraKing::HostTypeNrvEscape::sInstance) && !isNerve(&NrvIceMerameraKing::HostTypeNrvEscapeJump::sInstance)) { return false; } @@ -780,8 +726,7 @@ bool IceMerameraKing::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSen if (_EC == 0) { MR::stopMarioPinchBGMSoon(); MR::requestStartTimeKeepDemo(this, "メラキンオープニング", &NrvIceMerameraKing::HostTypeNrvDeathDemo::sInstance, &NrvIceMerameraKing::HostTypeNrvDeathDemoWait::sInstance, "死亡デモ"); - } - else { + } else { setNerve(&NrvIceMerameraKing::HostTypeNrvDamage::sInstance); } @@ -793,8 +738,7 @@ bool IceMerameraKing::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSen if (_EC == 0) { MR::requestStartTimeKeepDemo(this, "メラキンオープニング", &NrvIceMerameraKing::HostTypeNrvDeathDemo::sInstance, &NrvIceMerameraKing::HostTypeNrvDeathDemoWait::sInstance, "死亡デモ"); - } - else { + } else { setNerve(&NrvIceMerameraKing::HostTypeNrvDamage::sInstance); } @@ -804,29 +748,18 @@ bool IceMerameraKing::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSen return false; } -bool IceMerameraKing::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool IceMerameraKing::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isInSpinStormRange(msg, pSender, pReceiver, 600.0f)) { - if (isNerve(&NrvIceMerameraKing::HostTypeNrvDeathDemo::sInstance) - || isNerve(&NrvIceMerameraKing::HostTypeNrvExtinguish::sInstance) - || isNerve(&NrvIceMerameraKing::HostTypeNrvDamage::sInstance) - || isNerve(&NrvIceMerameraKing::HostTypeNrvAngryDemo1st::sInstance) - || isNerve(&NrvIceMerameraKing::HostTypeNrvAngryDemo2nd::sInstance) - || isNerve(&NrvIceMerameraKing::HostTypeNrvEscape::sInstance) - || isNerve(&NrvIceMerameraKing::HostTypeNrvEscapeJump::sInstance) - || isNerve(&NrvIceMerameraKing::HostTypeNrvPreRecover::sInstance) - || isNerve(&NrvIceMerameraKing::HostTypeNrvRecover::sInstance)) - { + if (isNerve(&NrvIceMerameraKing::HostTypeNrvDeathDemo::sInstance) || isNerve(&NrvIceMerameraKing::HostTypeNrvExtinguish::sInstance) || isNerve(&NrvIceMerameraKing::HostTypeNrvDamage::sInstance) || isNerve(&NrvIceMerameraKing::HostTypeNrvAngryDemo1st::sInstance) || isNerve(&NrvIceMerameraKing::HostTypeNrvAngryDemo2nd::sInstance) || isNerve(&NrvIceMerameraKing::HostTypeNrvEscape::sInstance) || isNerve(&NrvIceMerameraKing::HostTypeNrvEscapeJump::sInstance) || isNerve(&NrvIceMerameraKing::HostTypeNrvPreRecover::sInstance) || isNerve(&NrvIceMerameraKing::HostTypeNrvRecover::sInstance)) { return false; - } - else { + } else { TVec3f v10(*MR::getPlayerCenterPos()); v10.sub(mPosition); MR::vecKillElement(v10, mGravity, &v10); if (PSVECMag(&v10) < getSensor("body")->mRadius) { return false; - } - else { + } else { setNerve(&NrvIceMerameraKing::HostTypeNrvExtinguish::sInstance); return true; } @@ -848,8 +781,7 @@ void IceMerameraKing::addVelocityToInitPos() { if (squared <= 0.0000038146973f) { squared = squared; - } - else { + } else { f32 inv = JGeometry::TUtil::inv_sqrt(squared); f32 v9 = inv * half; v12.scale(v9); @@ -895,8 +827,8 @@ bool IceMerameraKing::isEnableThrow() { ThrowingIce* IceMerameraKing::getDeadWeaponAndAppear() { ThrowingIce* v7; - s32 tempE4 = _E4; - s32 temp = _A4; + s32 tempE4 = _E4; + s32 temp = _A4; for (s32 i = 0; i < temp; i++) { if (MR::isDead(mActor[tempE4])) { MR::resetPosition(mActor[tempE4], mPosition); @@ -912,9 +844,9 @@ ThrowingIce* IceMerameraKing::getDeadWeaponAndAppear() { //major } -bool IceMerameraKing::calcJoint(TPos3f *vec, const JointControllerInfo &info) { +bool IceMerameraKing::calcJoint(TPos3f* vec, const JointControllerInfo& info) { TMtx34f v16; - TVec3f v15; + TVec3f v15; v16.mMtx[0][3] = 0.0f; v16.mMtx[1][3] = 0.0f; v16.mMtx[2][3] = 0.0f; @@ -950,7 +882,8 @@ bool IceMerameraKing::calcJoint(TPos3f *vec, const JointControllerInfo &info) { return true; } -IceMerameraKingShockWave::IceMerameraKingShockWave() : ModelObj("衝撃", "IceMerameraKingShock", nullptr, -2, -2, -2, false) { +IceMerameraKingShockWave::IceMerameraKingShockWave() + : ModelObj("衝撃", "IceMerameraKingShock", nullptr, -2, -2, -2, false) { initHitSensor(2); MR::addHitSensorEnemyAttack(this, "circle", 16, 15.0f, TVec3f(0.0f, -100.0f, 0.0f)); MR::addHitSensorEnemyAttack(this, "circle_end", 16, 24.0f, TVec3f(0.0f, -100.0f, 0.0f)); @@ -976,15 +909,14 @@ void IceMerameraKingShockWave::control() { } } -void IceMerameraKingShockWave::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void IceMerameraKingShockWave::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (pSender != getSensor("circle_end") && MR::isSensorPlayer(pReceiver)) { HitSensor* sensor = getSensor("circle_end"); - TVec3f v17(sensor->mPosition); + TVec3f v17(sensor->mPosition); v17.sub(pReceiver->mPosition); f32 radius2 = pReceiver->mRadius; f32 radius1 = sensor->mRadius; - if (PSVECMag(&v17) < (radius1 + radius2)) { return; } diff --git a/src/Game/Enemy/ItemGenerator.cpp b/src/Game/Enemy/ItemGenerator.cpp index 75205f49c..44ec6efd3 100644 --- a/src/Game/Enemy/ItemGenerator.cpp +++ b/src/Game/Enemy/ItemGenerator.cpp @@ -16,26 +16,25 @@ void ItemGenerator::setTypeNone() { void ItemGenerator::setTypeCoin(s32 arg0) { mNumType = arg0; - mType = TYPE_COIN; + mType = TYPE_COIN; } void ItemGenerator::setTypeStarPeace(s32 arg0) { mNumType = arg0; - mType = TYPE_STARPIECE; + mType = TYPE_STARPIECE; } void ItemGenerator::generate(const LiveActor* pActor) { if (mNumType > 0) { switch (mType) { - case 1: + case 1: MR::appearCoinPopToDirection(pActor, pActor->mPosition, -pActor->mGravity, mNumType); break; - case 2: - MR::appearStarPieceToDirection(pActor, pActor->mPosition, -pActor->mGravity, mNumType, 10.0f, 40.0f, false); + case 2: + MR::appearStarPieceToDirection(pActor, pActor->mPosition, -pActor->mGravity, mNumType, 10.0f, 40.0f, false); if (ItemGenerator::isUseFarSE()) { MR::startSound(pActor, "SE_OJ_STAR_PIECE_BURST_F", -1, -1); - } - else { + } else { MR::startSound(pActor, "SE_OJ_STAR_PIECE_BURST", -1, -1); } break; diff --git a/src/Game/Enemy/Jiraira.cpp b/src/Game/Enemy/Jiraira.cpp index d8dafc0ae..97f4affe1 100644 --- a/src/Game/Enemy/Jiraira.cpp +++ b/src/Game/Enemy/Jiraira.cpp @@ -9,17 +9,15 @@ namespace NrvJiraira { NEW_NERVE(HostTypeNrvRecover, Jiraira, Recover); NEW_NERVE(HostTypeNrvSteppedExplode, Jiraira, Explode); NEW_NERVE(HostTypeNrvExplode, Jiraira, Explode); -}; +}; // namespace NrvJiraira -Jiraira::Jiraira(const char *pName) : - LiveActor(pName), - _8C(nullptr), - _90(500.0f) -{ - +Jiraira::Jiraira(const char* pName) + : LiveActor(pName), + _8C(nullptr), + _90(500.0f) { } -void Jiraira::init(const JMapInfoIter &rIter) { +void Jiraira::init(const JMapInfoIter& rIter) { if (MR::isValidInfo(rIter)) { MR::initDefaultPos(this, rIter); s32 arg1 = _90; @@ -30,7 +28,7 @@ void Jiraira::init(const JMapInfoIter &rIter) { initModelManagerWithAnm("Jiraira", nullptr, false); MR::connectToSceneCollisionEnemy(this); initHitSensor(2); - f32 scaleY = mScale.y; + f32 scaleY = mScale.y; TVec3f offset; offset.x = 0.0f; offset.y = 30.0f; @@ -42,7 +40,7 @@ void Jiraira::init(const JMapInfoIter &rIter) { offset2.z = 0.0f; MR::addHitSensorEnemyAttack(this, "explode", 16, (_90 * scaleY), offset2); MR::initCollisionPartsAutoEqualScaleOne(this, "Jiraira", getSensor("body"), MR::getJointMtx(this, "Jiraira")); - CollisionParts *colPart = MR::createCollisionPartsFromLiveActor(this, "Button", getSensor("body"), MR::getJointMtx(this, "Button"), (MR::CollisionScaleType)1); + CollisionParts* colPart = MR::createCollisionPartsFromLiveActor(this, "Button", getSensor("body"), MR::getJointMtx(this, "Button"), (MR::CollisionScaleType)1); _8C = colPart; MR::validateCollisionParts(colPart); initSound(6, false); @@ -69,12 +67,12 @@ void Jiraira::control() { } void Jiraira::exeWait() { - if (MR::isFirstStep(this)){ + if (MR::isFirstStep(this)) { MR::startBck(this, "Wait", nullptr); MR::startBrk(this, "Wait"); } - if (MR::isOnPlayer(getSensor("Body"))){ + if (MR::isOnPlayer(getSensor("Body"))) { setNerve(&NrvJiraira::HostTypeNrvStepped::sInstance); } } @@ -106,8 +104,7 @@ void Jiraira::exeExplode() { if (MR::isStep(this, 8)) { getSensor("explode")->invalidate(); - } - else if (MR::isLessStep(this, 8)) { + } else if (MR::isLessStep(this, 8)) { getSensor("explode")->mRadius = _90 * getNerveStep() / 8.0f; } @@ -142,35 +139,32 @@ void Jiraira::exeRecover() { } #ifdef NON_MATCHING -void Jiraira::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void Jiraira::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (pSender == getSensor("explode")) { - TVec3f tes = mPosition; + TVec3f tes = mPosition; LiveActor* sensorActor; - TVec3f thing; + TVec3f thing; HitSensor* sensor = 0; sensorActor = sensor->mHost; thing.subInline2(mPosition, sensorActor->mPosition); if (!MR::isExistMapCollisionExceptActor(thing, thing, this)) { if (MR::isSensorPlayer(pReceiver)) { MR::sendMsgEnemyAttackExplosion(pReceiver, pSender); - } - else if (MR::isSensorEnemy(pReceiver)) { + } else if (MR::isSensorEnemy(pReceiver)) { + if (isNerve(&NrvJiraira::HostTypeNrvSteppedExplode::sInstance)) { + MR::sendMsgEnemyAttackExplosion(pReceiver, pSender); + } + } else if (MR::isSensorMapObj(pReceiver)) { if (isNerve(&NrvJiraira::HostTypeNrvSteppedExplode::sInstance)) { MR::sendMsgEnemyAttackExplosion(pReceiver, pSender); } } - else if (MR::isSensorMapObj(pReceiver)) { - if (isNerve(&NrvJiraira::HostTypeNrvSteppedExplode::sInstance)) { - MR::sendMsgEnemyAttackExplosion(pReceiver, pSender); - } - } - } - } + } } #endif -bool Jiraira::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool Jiraira::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (isNerve(&NrvJiraira::HostTypeNrvExplode::sInstance) || isNerve(&NrvJiraira::HostTypeNrvSteppedExplode::sInstance) || isNerve(&NrvJiraira::HostTypeNrvPreRecover::sInstance)) { return false; } @@ -186,7 +180,7 @@ bool Jiraira::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pRe return false; } -bool Jiraira::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool Jiraira::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (isNerve(&NrvJiraira::HostTypeNrvExplode::sInstance) || isNerve(&NrvJiraira::HostTypeNrvSteppedExplode::sInstance)) { return false; } @@ -200,5 +194,4 @@ bool Jiraira::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pRec } Jiraira::~Jiraira() { - } diff --git a/src/Game/Enemy/Karon.cpp b/src/Game/Enemy/Karon.cpp index 4e1bda013..bf9fd6597 100644 --- a/src/Game/Enemy/Karon.cpp +++ b/src/Game/Enemy/Karon.cpp @@ -11,14 +11,14 @@ #include "Game/Util/MapUtil.hpp" namespace { - static const KaronParam hNoMoveNoTurnParam = { 0.0f, 1.2f, 0.80000001f, 0.0f }; - static const KaronParam hNoMoveNoTurnOnAirParam = { 0.0f, 2.0f, 0.94f, 0.0f }; - static const KaronParam hWalkparam = { 0.12f, 1.2f, 0.94f, 2.0f }; - static const KaronParam hSearchParam = { 0.0f, 1.2f, 0.94f, 2.0f }; - static const KaronParam hPursueParam = { 0.25f, 1.2f, 0.94f, 2.0f }; - static const KaronParam hHitReactionOnGroundParam = { 0.0f, 1.2f, 0.80f, 5.0f }; - static const KaronParam hHitReactionAirParam = { 0.0f, 2.0f, 0.94f, 5.0f }; -}; + static const KaronParam hNoMoveNoTurnParam = {0.0f, 1.2f, 0.80000001f, 0.0f}; + static const KaronParam hNoMoveNoTurnOnAirParam = {0.0f, 2.0f, 0.94f, 0.0f}; + static const KaronParam hWalkparam = {0.12f, 1.2f, 0.94f, 2.0f}; + static const KaronParam hSearchParam = {0.0f, 1.2f, 0.94f, 2.0f}; + static const KaronParam hPursueParam = {0.25f, 1.2f, 0.94f, 2.0f}; + static const KaronParam hHitReactionOnGroundParam = {0.0f, 1.2f, 0.80f, 5.0f}; + static const KaronParam hHitReactionAirParam = {0.0f, 2.0f, 0.94f, 5.0f}; +}; // namespace namespace NrvKaron { NEW_NERVE(HostTypeNrvFixWait, Karon, FixWait); @@ -37,9 +37,10 @@ namespace NrvKaron { NEW_NERVE(HostTypeNrvDeath, Karon, Death); NEW_NERVE(HostTypeNrvSinkDown, Karon, SinkDown); NEW_NERVE_ONEND(HostTypeNrvBindStarPointer, Karon, BindStarPointer, BindStarPointer); -}; +}; // namespace NrvKaron -Karon::Karon(const char *pName) : LiveActor(pName) { +Karon::Karon(const char* pName) + : LiveActor(pName) { mTerritoryMover = nullptr; _90 = 0; _94 = 0; @@ -47,7 +48,7 @@ Karon::Karon(const char *pName) : LiveActor(pName) { mStateStarPointer = nullptr; } -void Karon::init(const JMapInfoIter &rIter) { +void Karon::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::useStageSwitchWriteDead(this, rIter); if (MR::useStageSwitchReadAppear(this, rIter)) { @@ -55,7 +56,7 @@ void Karon::init(const JMapInfoIter &rIter) { } bool needsFixWait = false; - if(MR::useStageSwitchReadA(this, rIter)) { + if (MR::useStageSwitchReadA(this, rIter)) { needsFixWait = true; } @@ -68,8 +69,7 @@ void Karon::init(const JMapInfoIter &rIter) { if (arg0 == -1) { _94 = 0; - } - else { + } else { _94 = 1; } @@ -82,13 +82,12 @@ void Karon::init(const JMapInfoIter &rIter) { if (needsFixWait) { initNerve(&NrvKaron::HostTypeNrvFixWait::sInstance); - } - else { + } else { initNerve(&NrvKaron::HostTypeNrvWait::sInstance); } initHitSensor(1); - f32 y_scale = (90.0f * mScale.y); + f32 y_scale = (90.0f * mScale.y); TVec3f v13; v13.x = 0.0f; v13.y = y_scale; @@ -155,11 +154,9 @@ void Karon::exeStepBroken() { MR::addVelocityLimit(this, v6 * 1.0f); MR::moveAndTurnToPlayer(this, hNoMoveNoTurnParam._0, hNoMoveNoTurnParam._4, hNoMoveNoTurnParam._8, hNoMoveNoTurnParam._C); MR::calcGravity(this); - } - else if (MR::isBinded(this)) { + } else if (MR::isBinded(this)) { mVelocity.scale(MR::getBindedNormal(this)->dot(mVelocity)); - } - else { + } else { mVelocity.scale(mGravity.dot(mVelocity), mGravity); MR::forceBindOnGround(this, 1.0f, 0.8f); } @@ -187,15 +184,13 @@ void Karon::exeRecover() { MR::onCalcGravity(this); setNerve(&NrvKaron::HostTypeNrvWait::sInstance); } - } void Karon::exeHitReaction() { if (MR::isFirstStep(this)) { if (isNerve(&NrvKaron::HostTypeNrvStarPieceHit::sInstance)) { MR::startAction(this, "StarPiece"); - } - else { + } else { MR::startAction(this, "AttackHit"); } } @@ -205,26 +200,22 @@ void Karon::exeHitReaction() { if (isNerve(&NrvKaron::HostTypeNrvStarPieceHit::sInstance)) { if (MR::isOnGround(this)) { MR::moveAndTurnToPlayer(this, hNoMoveNoTurnParam._0, hNoMoveNoTurnParam._4, hNoMoveNoTurnParam._8, hNoMoveNoTurnParam._C); - } - else { + } else { MR::moveAndTurnToPlayer(this, hNoMoveNoTurnOnAirParam._0, hNoMoveNoTurnOnAirParam._4, hNoMoveNoTurnOnAirParam._8, hNoMoveNoTurnOnAirParam._C); } - } - else if (MR::isOnGround(this)) { + } else if (MR::isOnGround(this)) { MR::moveAndTurnToPlayer(this, hHitReactionOnGroundParam._0, hHitReactionOnGroundParam._4, hHitReactionOnGroundParam._8, hHitReactionOnGroundParam._C); - } - else { + } else { MR::moveAndTurnToPlayer(this, hHitReactionAirParam._0, hHitReactionAirParam._4, hHitReactionAirParam._8, hHitReactionAirParam._C); } if (MR::isOnGround(this) && MR::isActionEnd(this)) { if (isNerve(&NrvKaron::HostTypeNrvStarPieceHit::sInstance)) { setNerve(&NrvKaron::HostTypeNrvStarPieceHitWait::sInstance); - } - else { + } else { setNerve(&NrvKaron::HostTypeNrvWait::sInstance); } - } + } } void Karon::exeDeath() { @@ -235,7 +226,7 @@ void Karon::exeDeath() { } moveAndTurn(&hNoMoveNoTurnParam); - + if (MR::isActionEnd(this)) { kill(); } diff --git a/src/Game/Enemy/Kuribo.cpp b/src/Game/Enemy/Kuribo.cpp index f42006202..8496581a3 100644 --- a/src/Game/Enemy/Kuribo.cpp +++ b/src/Game/Enemy/Kuribo.cpp @@ -23,11 +23,11 @@ namespace { public: KuriboParam(); - WalkerStateParam mStateParam; // 0x00 - WalkerStateStaggerParam mStaggerParam; // 0x18 - WalkerStateFindPlayerParam mFindPlayerParam; // 0x48 - WalkerStateChaseParam mChaseParam; // 0x54 - WalkerStateWanderParam mWanderParam; // 0x68 + WalkerStateParam mStateParam; // 0x00 + WalkerStateStaggerParam mStaggerParam; // 0x18 + WalkerStateFindPlayerParam mFindPlayerParam; // 0x48 + WalkerStateChaseParam mChaseParam; // 0x54 + WalkerStateWanderParam mWanderParam; // 0x68 }; KuriboParam::KuriboParam() { @@ -47,7 +47,7 @@ namespace { } static KuriboParam sParam; -}; +}; // namespace namespace NrvKuribo { NEW_NERVE_ONEND(KuriboNrvNonActive, Kuribo, NonActive, NonActive); @@ -64,15 +64,15 @@ namespace NrvKuribo { NEW_NERVE(KuriboNrvHipDropDown, Kuribo, HipDropDown); NEW_NERVE(KuriboNrvPressDown, Kuribo, PressDown); NEW_NERVE(KuriboNrvBlowDown, Kuribo, BlowDown); -}; +}; // namespace NrvKuribo -Kuribo::Kuribo(const char *pName) : LiveActor(pName), mScaleController(nullptr), mItemGenerator(nullptr), mStateWander(nullptr), - mStateFindPlayer(nullptr), mBindStarPointer(nullptr), mStateStagger(nullptr), mStateChase(nullptr), - _A8(0.0f, 0.0f, 0.0f, 1.0f), _B8(0, 0, 1), _C4(0), _C5(1) { - +Kuribo::Kuribo(const char* pName) + : LiveActor(pName), mScaleController(nullptr), mItemGenerator(nullptr), mStateWander(nullptr), + mStateFindPlayer(nullptr), mBindStarPointer(nullptr), mStateStagger(nullptr), mStateChase(nullptr), + _A8(0.0f, 0.0f, 0.0f, 1.0f), _B8(0, 0, 1), _C4(0), _C5(1) { } -void Kuribo::init(const JMapInfoIter &rIter) { +void Kuribo::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("Kuribo", nullptr, false); MR::connectToSceneEnemy(this); @@ -85,8 +85,7 @@ void Kuribo::init(const JMapInfoIter &rIter) { if (!_C4) { MR::onCalcGravity(this); MR::calcGravity(this); - } - else { + } else { MR::offCalcGravity(this); TVec3f v8; MR::getUpVecFromQuat(&v8, _A8); @@ -95,7 +94,7 @@ void Kuribo::init(const JMapInfoIter &rIter) { mScaleController = new AnimScaleController(nullptr); mItemGenerator = new ItemGenerator(); - f32 offsScale = mScale.y; + f32 offsScale = mScale.y; TVec3f v7; v7.x = 0.0f; v7.y = 75.0f * offsScale; @@ -104,8 +103,7 @@ void Kuribo::init(const JMapInfoIter &rIter) { initSound(4, false); if (MR::isEqualStageName("KoopaBattleVs2Galaxy")) { MR::setSeVersion(this, 1); - } - else { + } else { MR::setSeVersion(this, 0); } @@ -128,8 +126,7 @@ void Kuribo::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchReadAppear(this, rIter)) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { makeActorAppeared(); } } @@ -154,20 +151,20 @@ void Kuribo::initSensor() { MR::addHitSensor(this, "attack", ATYPE_ENEMY_ATTACK, 8, 45.0f * y_scale, TVec3f(0.0f, 75.0f * y_scale, 0.0f)); } -void Kuribo::initAppearState(const JMapInfoIter &rIter) { +void Kuribo::initAppearState(const JMapInfoIter& rIter) { s32 state = -1; if (MR::isValidInfo(rIter)) { MR::getJMapInfoArg1NoInit(rIter, &state); } switch (state) { - case -1: - setNerve(&NrvKuribo::KuriboNrvWander::sInstance); - break; - case 0: - setNerve(&NrvKuribo::KuriboNrvAppearFromBox::sInstance); - _A8.getZDir(_B8); - break; + case -1: + setNerve(&NrvKuribo::KuriboNrvWander::sInstance); + break; + case 0: + setNerve(&NrvKuribo::KuriboNrvAppearFromBox::sInstance); + _A8.getZDir(_B8); + break; } } @@ -227,26 +224,17 @@ void Kuribo::calcAndSetBaseMtx() { MR::setBaseScale(this, scale); } -void Kuribo::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { - if ((!MR::isSensorType(pSender, ATYPE_KURIBO) - || (isEnableAttack() || !MR::isSensorPlayer(pReceiver)) - && !MR::isSensorEnemy(pReceiver) - || !isEnablePushMove() - || !MR::sendMsgPushAndKillVelocityToTarget(this, pReceiver, pSender)) - && isEnableAttack() - && MR::isSensorPlayer(pReceiver) - && MR::isSensorEnemyAttack(pSender)) - { +void Kuribo::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { + if ((!MR::isSensorType(pSender, ATYPE_KURIBO) || (isEnableAttack() || !MR::isSensorPlayer(pReceiver)) && !MR::isSensorEnemy(pReceiver) || !isEnablePushMove() || !MR::sendMsgPushAndKillVelocityToTarget(this, pReceiver, pSender)) && isEnableAttack() && MR::isSensorPlayer(pReceiver) && MR::isSensorEnemyAttack(pSender)) { if (!MR::isPlayerHipDropFalling() && MR::sendMsgEnemyAttack(pReceiver, pSender)) { requestAttackSuccess(); - } - else { + } else { MR::sendMsgPush(pReceiver, pSender); } } } -bool Kuribo::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool Kuribo::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgLockOnStarPieceShoot(msg)) { return true; } @@ -259,10 +247,7 @@ bool Kuribo::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pRec return requestFlatDown(pSender, pReceiver); } - if (MR::isMsgJetTurtleAttack(msg) - || MR::isMsgFireBallAttack(msg) - || MR::isMsgInvincibleAttack(msg)) - { + if (MR::isMsgJetTurtleAttack(msg) || MR::isMsgFireBallAttack(msg) || MR::isMsgInvincibleAttack(msg)) { return requestBlowDown(pSender, pReceiver); } @@ -281,7 +266,7 @@ bool Kuribo::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pRec return false; } -bool Kuribo::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool Kuribo::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgToEnemyAttackShockWave(msg)) { return requestStagger(pSender, pReceiver); } @@ -289,7 +274,7 @@ bool Kuribo::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pRece if (MR::isMsgToEnemyAttackTrample(msg)) { return requestPressDown(); } - + if (MR::isMsgExplosionAttack(msg)) { return requestBlowDown(pSender, pReceiver); } @@ -301,7 +286,7 @@ bool Kuribo::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pRece return false; } -bool Kuribo::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { +bool Kuribo::receiveMsgPush(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorEnemyAttack(pReceiver)) { return false; } @@ -316,7 +301,7 @@ bool Kuribo::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { return false; } -bool Kuribo::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool Kuribo::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgInhaleBlackHole(msg)) { mItemGenerator->setTypeNone(); kill(); @@ -331,12 +316,7 @@ bool Kuribo::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) } bool Kuribo::requestDead() { - if (isNerve(&NrvKuribo::KuriboNrvNonActive::sInstance) - || isNerve(&NrvKuribo::KuriboNrvFlatDown::sInstance) - || isNerve(&NrvKuribo::KuriboNrvHipDropDown::sInstance) - || isNerve(&NrvKuribo::KuriboNrvPressDown::sInstance) - || isNerve(&NrvKuribo::KuriboNrvBlowDown::sInstance)) - { + if (isNerve(&NrvKuribo::KuriboNrvNonActive::sInstance) || isNerve(&NrvKuribo::KuriboNrvFlatDown::sInstance) || isNerve(&NrvKuribo::KuriboNrvHipDropDown::sInstance) || isNerve(&NrvKuribo::KuriboNrvPressDown::sInstance) || isNerve(&NrvKuribo::KuriboNrvBlowDown::sInstance)) { return false; } @@ -346,7 +326,7 @@ bool Kuribo::requestDead() { return true; } -bool Kuribo::requestFlatDown(HitSensor *pSender, HitSensor *pReceiver) { +bool Kuribo::requestFlatDown(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorEnemyAttack(pSender)) { return false; } @@ -362,8 +342,7 @@ bool Kuribo::requestFlatDown(HitSensor *pSender, HitSensor *pReceiver) { MR::startSoundSeVer(this, "SE_EM_STOMPED_S", -1, -1); if (isUpsideDown()) { MR::startAction(this, "FlatDownReverse"); - } - else { + } else { MR::startAction(this, "FlatDown"); } @@ -373,7 +352,7 @@ bool Kuribo::requestFlatDown(HitSensor *pSender, HitSensor *pReceiver) { return true; } -bool Kuribo::requestHipDropDown(HitSensor *pSender, HitSensor *pReceiver) { +bool Kuribo::requestHipDropDown(HitSensor* pSender, HitSensor* pReceiver) { if (!requestDead()) { return false; } @@ -385,8 +364,7 @@ bool Kuribo::requestHipDropDown(HitSensor *pSender, HitSensor *pReceiver) { MR::startSoundSeVer(this, "SE_EM_STOMPED_S", -1, -1); if (isUpsideDown()) { MR::startAction(this, "HipDropDownReverse"); - } - else { + } else { MR::startAction(this, "HipDropDown"); } @@ -404,8 +382,7 @@ bool Kuribo::requestPressDown() { MR::startSoundSeVer(this, "SE_EM_STOMPED_S", -1, -1); if (isUpsideDown()) { MR::startAction(this, "HipDropDownReverse"); - } - else { + } else { MR::startAction(this, "HipDropDown"); } @@ -416,7 +393,7 @@ bool Kuribo::requestPressDown() { return true; } -bool Kuribo::requestStagger(HitSensor *pSender, HitSensor *pReceiver) { +bool Kuribo::requestStagger(HitSensor* pSender, HitSensor* pReceiver) { if (isEnablePanch()) { mStateStagger->setPunchDirection(pSender, pReceiver); setNerve(&NrvKuribo::KuriboNrvStagger::sInstance); @@ -426,7 +403,7 @@ bool Kuribo::requestStagger(HitSensor *pSender, HitSensor *pReceiver) { return false; } -bool Kuribo::requestBlowDown(HitSensor *pSender, HitSensor *pReceiver) { +bool Kuribo::requestBlowDown(HitSensor* pSender, HitSensor* pReceiver) { if (!isEnablePanch()) { return false; } @@ -453,7 +430,7 @@ void Kuribo::onNoGravitySupport() { MR::offCalcGravity(this); } -void Kuribo::setUp(const TVec3f &a1, const TQuat4f &a2, const TVec3f &a3) { +void Kuribo::setUp(const TVec3f& a1, const TQuat4f& a2, const TVec3f& a3) { mPosition.set(a1); mVelocity.set(a3); _A8.x = a2.x; @@ -463,7 +440,7 @@ void Kuribo::setUp(const TVec3f &a1, const TQuat4f &a2, const TVec3f &a3) { _A8.getZDir(_B8); } -void Kuribo::appearBlowed(const TVec3f &a1, const TQuat4f &a2, const TVec3f &a3) { +void Kuribo::appearBlowed(const TVec3f& a1, const TQuat4f& a2, const TVec3f& a3) { setUp(a1, a2, a3); setNerve(&NrvKuribo::KuriboNrvBlow::sInstance); MR::startAction(this, "Blow"); @@ -473,7 +450,7 @@ void Kuribo::appearBlowed(const TVec3f &a1, const TQuat4f &a2, const TVec3f &a3) } } -void Kuribo::appearHipDropped(const TVec3f &a1, const TQuat4f &a2) { +void Kuribo::appearHipDropped(const TVec3f& a1, const TQuat4f& a2) { setUp(a1, a2, TVec3f(0.0f, 0.0f, 0.0f)); appear(); MR::startAction(this, "HipDropDown"); @@ -518,7 +495,7 @@ bool Kuribo::tryEndBlowLand() { setNerve(&NrvKuribo::KuriboNrvChase::sInstance); return true; } - + return false; } @@ -720,8 +697,7 @@ void Kuribo::calcPassiveMovement() { if (MR::isOnGround(this)) { vel = 0.93f; - } - else { + } else { vel = 0.99f; } @@ -748,9 +724,9 @@ bool Kuribo::isUpsideDown() const { } bool Kuribo::isEnableDead() const { - if (isNerve(&NrvKuribo::KuriboNrvWander::sInstance) || isNerve(&NrvKuribo::KuriboNrvFindPlayer::sInstance) || - isNerve(&NrvKuribo::KuriboNrvChase::sInstance) || isNerve(&NrvKuribo::KuriboNrvStagger::sInstance) || - isNerve(&NrvKuribo::KuriboNrvBindStarPointer::sInstance) || isNerve(&NrvKuribo::KuriboNrvNonActive::sInstance) || + if (isNerve(&NrvKuribo::KuriboNrvWander::sInstance) || isNerve(&NrvKuribo::KuriboNrvFindPlayer::sInstance) || + isNerve(&NrvKuribo::KuriboNrvChase::sInstance) || isNerve(&NrvKuribo::KuriboNrvStagger::sInstance) || + isNerve(&NrvKuribo::KuriboNrvBindStarPointer::sInstance) || isNerve(&NrvKuribo::KuriboNrvNonActive::sInstance) || isNerve(&NrvKuribo::KuriboNrvAttackSuccess::sInstance)) { return true; } @@ -775,8 +751,8 @@ bool Kuribo::isEnableAttack() const { } bool Kuribo::isEnableStamp() const { - if (isNerve(&NrvKuribo::KuriboNrvNonActive::sInstance) || isNerve(&NrvKuribo::KuriboNrvFlatDown::sInstance) || - isNerve(&NrvKuribo::KuriboNrvHipDropDown::sInstance) || isNerve(&NrvKuribo::KuriboNrvPressDown::sInstance) || + if (isNerve(&NrvKuribo::KuriboNrvNonActive::sInstance) || isNerve(&NrvKuribo::KuriboNrvFlatDown::sInstance) || + isNerve(&NrvKuribo::KuriboNrvHipDropDown::sInstance) || isNerve(&NrvKuribo::KuriboNrvPressDown::sInstance) || isNerve(&NrvKuribo::KuriboNrvBlowDown::sInstance) || isNerve(&NrvKuribo::KuriboNrvBlow::sInstance)) { return false; } @@ -785,8 +761,8 @@ bool Kuribo::isEnableStamp() const { } bool Kuribo::isEnablePanch() const { - if (isNerve(&NrvKuribo::KuriboNrvFlatDown::sInstance) || isNerve(&NrvKuribo::KuriboNrvHipDropDown::sInstance) || - isNerve(&NrvKuribo::KuriboNrvPressDown::sInstance) || isNerve(&NrvKuribo::KuriboNrvBlowDown::sInstance) || + if (isNerve(&NrvKuribo::KuriboNrvFlatDown::sInstance) || isNerve(&NrvKuribo::KuriboNrvHipDropDown::sInstance) || + isNerve(&NrvKuribo::KuriboNrvPressDown::sInstance) || isNerve(&NrvKuribo::KuriboNrvBlowDown::sInstance) || isNerve(&NrvKuribo::KuriboNrvBlow::sInstance)) { return false; } @@ -795,7 +771,7 @@ bool Kuribo::isEnablePanch() const { } bool Kuribo::isEnablePushMove() const { - if (isNerve(&NrvKuribo::KuriboNrvFlatDown::sInstance) || isNerve(&NrvKuribo::KuriboNrvHipDropDown::sInstance) || + if (isNerve(&NrvKuribo::KuriboNrvFlatDown::sInstance) || isNerve(&NrvKuribo::KuriboNrvHipDropDown::sInstance) || isNerve(&NrvKuribo::KuriboNrvPressDown::sInstance) || isNerve(&NrvKuribo::KuriboNrvBlowDown::sInstance)) { return false; } @@ -809,13 +785,12 @@ void Kuribo::exeBlowLand() { } namespace MR { - LiveActor* createNoItemKuriboActor(const char *pName) { + LiveActor* createNoItemKuriboActor(const char* pName) { Kuribo* kuribo = new Kuribo(pName); kuribo->_C5 = 0; return kuribo; } -}; +}; // namespace MR Kuribo::~Kuribo() { - } diff --git a/src/Game/Enemy/PackunPetit.cpp b/src/Game/Enemy/PackunPetit.cpp index f809ac0c1..fc052f2d7 100644 --- a/src/Game/Enemy/PackunPetit.cpp +++ b/src/Game/Enemy/PackunPetit.cpp @@ -21,20 +21,18 @@ namespace NrvPackunPetit { NEW_NERVE(PackunPetitNrvSwoon, PackunPetit, Swoon); NEW_NERVE(PackunPetitNrvSwoonToThreat, PackunPetit, SwoonToThreat); NEW_NERVE_ONEND(PackunPetitNrvDPDSwoon, PackunPetit, DPDSwoon, DPDSwoon); -}; +}; // namespace NrvPackunPetit -PackunPetit::PackunPetit(const char *pName) : - LiveActor(pName), - mScaleController(nullptr), - mStarPointerState(nullptr), - _94(0.0f, 0.0f, 1.0f), - mBlownModel(nullptr), - mDontTurn(false) -{ - +PackunPetit::PackunPetit(const char* pName) + : LiveActor(pName), + mScaleController(nullptr), + mStarPointerState(nullptr), + _94(0.0f, 0.0f, 1.0f), + mBlownModel(nullptr), + mDontTurn(false) { } -void PackunPetit::init(const JMapInfoIter &rIter) { +void PackunPetit::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("PackunPetit", nullptr, false); MR::connectToSceneEnemy(this); @@ -94,8 +92,7 @@ void PackunPetit::exeWait() { if (MR::isNearPlayer(this, 1700.0f)) { setNerve(&NrvPackunPetit::PackunPetitNrvFind::sInstance); - } - else { + } else { tryNonActive(); } } @@ -126,13 +123,9 @@ void PackunPetit::exeThreat() { MR::turnDirectionToTargetUseGroundNormalDegree(this, &_94, *pos, 2.0f); } - if (MR::isGreaterStep(this, 50) - && MR::isNearPlayer(this, 1100.0f) - && (MR::isFaceToPlayerHorizontalDegree(this, _94, 10.0f) || mDontTurn)) - { + if (MR::isGreaterStep(this, 50) && MR::isNearPlayer(this, 1100.0f) && (MR::isFaceToPlayerHorizontalDegree(this, _94, 10.0f) || mDontTurn)) { setNerve(&NrvPackunPetit::PackunPetitNrvAttackStart::sInstance); - } - else if (!MR::isNearPlayer(this, 2000.0f)) { + } else if (!MR::isNearPlayer(this, 2000.0f)) { setNerve(&NrvPackunPetit::PackunPetitNrvWait::sInstance); } } @@ -141,8 +134,7 @@ void PackunPetit::exeTurn() { if (MR::isFirstStep(this)) { if (isNerve(&NrvPackunPetit::PackunPetitNrvLeftTurn::sInstance)) { MR::startBck(this, "TurnLeft", nullptr); - } - else { + } else { MR::startBck(this, "TurnRight", nullptr); } } @@ -291,8 +283,7 @@ void PackunPetit::kill() { } mBlownModel->kill(); - } - else { + } else { if (!MR::isValidSwitchDead(this)) { MR::appearCoinPop(this, mPosition, 1); } @@ -331,9 +322,8 @@ void PackunPetit::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { } }*/ -bool PackunPetit::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - bool isTrampleOrPunch = isNerve(&NrvPackunPetit::PackunPetitNrvTrampleDown::sInstance) - || isNerve(&NrvPackunPetit::PackunPetitNrvPunchDown::sInstance); +bool PackunPetit::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + bool isTrampleOrPunch = isNerve(&NrvPackunPetit::PackunPetitNrvTrampleDown::sInstance) || isNerve(&NrvPackunPetit::PackunPetitNrvPunchDown::sInstance); if (isTrampleOrPunch) { return false; @@ -348,8 +338,7 @@ bool PackunPetit::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor return true; } - bool isWaitOrHit = isNerve(&NrvPackunPetit::PackunPetitNrvHitWaitForAttack::sInstance) - || isNerve(&NrvPackunPetit::PackunPetitNrvHit::sInstance); + bool isWaitOrHit = isNerve(&NrvPackunPetit::PackunPetitNrvHitWaitForAttack::sInstance) || isNerve(&NrvPackunPetit::PackunPetitNrvHit::sInstance); if (isWaitOrHit) { return false; @@ -385,9 +374,8 @@ bool PackunPetit::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor return false; } -bool PackunPetit::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - bool isTrampleOrPunch = isNerve(&NrvPackunPetit::PackunPetitNrvTrampleDown::sInstance) - || isNerve(&NrvPackunPetit::PackunPetitNrvPunchDown::sInstance); +bool PackunPetit::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + bool isTrampleOrPunch = isNerve(&NrvPackunPetit::PackunPetitNrvTrampleDown::sInstance) || isNerve(&NrvPackunPetit::PackunPetitNrvPunchDown::sInstance); if (isTrampleOrPunch) { return false; @@ -407,9 +395,8 @@ bool PackunPetit::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor * return false; } -bool PackunPetit::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - bool isSwoon = isNerve(&NrvPackunPetit::PackunPetitNrvSwoonStart::sInstance) - || isNerve(&NrvPackunPetit::PackunPetitNrvSwoon::sInstance); +bool PackunPetit::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + bool isSwoon = isNerve(&NrvPackunPetit::PackunPetitNrvSwoonStart::sInstance) || isNerve(&NrvPackunPetit::PackunPetitNrvSwoon::sInstance); if (!isSwoon) { return false; @@ -457,11 +444,9 @@ void PackunPetit::punchDown(HitSensor *pSender, HitSensor *pReceiver) { void PackunPetit::selectNrvWait() { if (!MR::isNearPlayer(this, 1700.0f)) { setNerve(&NrvPackunPetit::PackunPetitNrvWait::sInstance); - } - else if (isNerve(&NrvPackunPetit::PackunPetitNrvSwoon::sInstance)) { + } else if (isNerve(&NrvPackunPetit::PackunPetitNrvSwoon::sInstance)) { setNerve(&NrvPackunPetit::PackunPetitNrvSwoonToThreat::sInstance); - } - else { + } else { setNerve(&NrvPackunPetit::PackunPetitNrvThreat::sInstance); } } @@ -507,15 +492,13 @@ bool PackunPetit::tryDPDSwoon() { return false; } - bool isSwoon = isNerve(&NrvPackunPetit::PackunPetitNrvSwoonStart::sInstance) - || isNerve(&NrvPackunPetit::PackunPetitNrvSwoon::sInstance); + bool isSwoon = isNerve(&NrvPackunPetit::PackunPetitNrvSwoonStart::sInstance) || isNerve(&NrvPackunPetit::PackunPetitNrvSwoon::sInstance); if (isSwoon) { return false; } - bool isTrampleOrPunch = isNerve(&NrvPackunPetit::PackunPetitNrvTrampleDown::sInstance) - || isNerve(&NrvPackunPetit::PackunPetitNrvPunchDown::sInstance); + bool isTrampleOrPunch = isNerve(&NrvPackunPetit::PackunPetitNrvTrampleDown::sInstance) || isNerve(&NrvPackunPetit::PackunPetitNrvPunchDown::sInstance); if (isTrampleOrPunch) { return false; @@ -530,5 +513,4 @@ bool PackunPetit::tryDPDSwoon() { } PackunPetit::~PackunPetit() { - } diff --git a/src/Game/Enemy/Poihana.cpp b/src/Game/Enemy/Poihana.cpp index d69ae96c3..ff61eb22e 100644 --- a/src/Game/Enemy/Poihana.cpp +++ b/src/Game/Enemy/Poihana.cpp @@ -10,53 +10,54 @@ #define POIHANA_BEHAVIOR_NEW_HOME 2 namespace { - const Vec sNormalBinderPos = { 0.0f, 130.0f, 120.0f }; - const Vec sTrampleBinderPos = { 0.0f, 150.0f, 0.0f }; -}; + const Vec sNormalBinderPos = {0.0f, 130.0f, 120.0f}; + const Vec sTrampleBinderPos = {0.0f, 150.0f, 0.0f}; +}; // namespace namespace NrvPoihana { - NEW_NERVE_ONEND(PoihanaNrvNonActive, Poihana, NonActive, NonActive); - NEW_NERVE(PoihanaNrvWait, Poihana, Wait); - NEW_NERVE(PoihanaNrvWalkAround, Poihana, WalkAround); - NEW_NERVE(PoihanaNrvSleepStart, Poihana, SleepStart); - NEW_NERVE(PoihanaNrvSleep, Poihana, Sleep); - NEW_NERVE(PoihanaNrvGetUp, Poihana, GetUp); - NEW_NERVE(PoihanaNrvSearch, Poihana, Search); - NEW_NERVE(PoihanaNrvChasePlayer, Poihana, ChasePlayer); - NEW_NERVE(PoihanaNrvShootUpCharge, Poihana, ShootUpCharge); - NEW_NERVE_ONEND(PoihanaNrvShootUp, Poihana, ShootUp, ShootUp); - NEW_NERVE(PoihanaNrvGoBack, Poihana, GoBack); - NEW_NERVE(PoihanaNrvShock, Poihana, Shock); - NEW_NERVE(PoihanaNrvSwoon, Poihana, Swoon); - NEW_NERVE(PoihanaNrvSwoonLand, Poihana, SwoonLand); - NEW_NERVE(PoihanaNrvRecover, Poihana, Recover); - NEW_NERVE(PoihanaNrvShake, Poihana, Shake); - NEW_NERVE(PoihanaNrvDrown, Poihana, Drown); - NEW_NERVE(PoihanaNrvHide, Poihana, Hide); - NEW_NERVE(PoihanaNrvAppear, Poihana, Appear); - NEW_NERVE_ONEND(PoihanaNrvDPDSwoon, Poihana, DPDSwoon, DPDSwoon); -}; + NEW_NERVE_ONEND(PoihanaNrvNonActive, Poihana, NonActive, NonActive); + NEW_NERVE(PoihanaNrvWait, Poihana, Wait); + NEW_NERVE(PoihanaNrvWalkAround, Poihana, WalkAround); + NEW_NERVE(PoihanaNrvSleepStart, Poihana, SleepStart); + NEW_NERVE(PoihanaNrvSleep, Poihana, Sleep); + NEW_NERVE(PoihanaNrvGetUp, Poihana, GetUp); + NEW_NERVE(PoihanaNrvSearch, Poihana, Search); + NEW_NERVE(PoihanaNrvChasePlayer, Poihana, ChasePlayer); + NEW_NERVE(PoihanaNrvShootUpCharge, Poihana, ShootUpCharge); + NEW_NERVE_ONEND(PoihanaNrvShootUp, Poihana, ShootUp, ShootUp); + NEW_NERVE(PoihanaNrvGoBack, Poihana, GoBack); + NEW_NERVE(PoihanaNrvShock, Poihana, Shock); + NEW_NERVE(PoihanaNrvSwoon, Poihana, Swoon); + NEW_NERVE(PoihanaNrvSwoonLand, Poihana, SwoonLand); + NEW_NERVE(PoihanaNrvRecover, Poihana, Recover); + NEW_NERVE(PoihanaNrvShake, Poihana, Shake); + NEW_NERVE(PoihanaNrvDrown, Poihana, Drown); + NEW_NERVE(PoihanaNrvHide, Poihana, Hide); + NEW_NERVE(PoihanaNrvAppear, Poihana, Appear); + NEW_NERVE_ONEND(PoihanaNrvDPDSwoon, Poihana, DPDSwoon, DPDSwoon); +}; // namespace NrvPoihana -Poihana::Poihana(const char *pName) : LiveActor(pName) { - mAnimScaleCtrl = nullptr; - mBindStarPointer = nullptr; - mCamInfo = nullptr; - mBindedActor = nullptr; - mLaunchIntensity = 0.0f; - mRespawnPos.set(0.0f); - _AC = 0.0f; - _B0 = 0.0f; - mHomePos.set(0.0f); - _C0 = 1.0f; - mBoundTimer = -1; - mBehavior = POIHANA_BEHAVIOR_NORMAL; - mCanDrown = false; - mWaterColumn = nullptr; - mIsActive = false; - _E5 = 0; +Poihana::Poihana(const char* pName) + : LiveActor(pName) { + mAnimScaleCtrl = nullptr; + mBindStarPointer = nullptr; + mCamInfo = nullptr; + mBindedActor = nullptr; + mLaunchIntensity = 0.0f; + mRespawnPos.set(0.0f); + _AC = 0.0f; + _B0 = 0.0f; + mHomePos.set(0.0f); + _C0 = 1.0f; + mBoundTimer = -1; + mBehavior = POIHANA_BEHAVIOR_NORMAL; + mCanDrown = false; + mWaterColumn = nullptr; + mIsActive = false; + _E5 = 0; } -Poihana::~Poihana() { } +Poihana::~Poihana() {} /*void Poihana::init(const JMapInfoIter &rIter) { MR::initDefaultPos(this, rIter); @@ -140,153 +141,143 @@ Poihana::~Poihana() { } }*/ void Poihana::initAfterPlacement() { - TVec3f gravityNegated; - JGeometry::negateInternal((f32 *)&mGravity, (f32 *)&gravityNegated); - TPos3f baseMtx; - MR::makeMtxUpNoSupportPos(&baseMtx, gravityNegated, mPosition); - MR::setBaseTRMtx(this, baseMtx); - MR::calcFrontVec(&mFrontVec, this); - MR::trySetMoveLimitCollision(this); + TVec3f gravityNegated; + JGeometry::negateInternal((f32*)&mGravity, (f32*)&gravityNegated); + TPos3f baseMtx; + MR::makeMtxUpNoSupportPos(&baseMtx, gravityNegated, mPosition); + MR::setBaseTRMtx(this, baseMtx); + MR::calcFrontVec(&mFrontVec, this); + MR::trySetMoveLimitCollision(this); } void Poihana::control() { - if (!isNerve(&NrvPoihana::PoihanaNrvHide::sInstance)) { - mAnimScaleCtrl->updateNerve(); - calcBound(); - controlVelocity(); - calcMyGravity(); + if (!isNerve(&NrvPoihana::PoihanaNrvHide::sInstance)) { + mAnimScaleCtrl->updateNerve(); + calcBound(); + controlVelocity(); + calcMyGravity(); - if (!tryDrown() && !tryDPDSwoon() && tryHipDropShock()) { - return; - } - } + if (!tryDrown() && !tryDPDSwoon() && tryHipDropShock()) { + return; + } + } } void Poihana::calcAndSetBaseMtx() { - TPos3f baseMtx; - MR::calcMtxFromGravityAndZAxis(&baseMtx, this, mGravity, mHomePos); + TPos3f baseMtx; + MR::calcMtxFromGravityAndZAxis(&baseMtx, this, mGravity, mHomePos); - if (isNerveTypeWalkOrWait()) { - MR::blendMtx((MtxPtr)getBaseMtx(), (MtxPtr)&baseMtx, 0.3f, (MtxPtr)&baseMtx); - } + if (isNerveTypeWalkOrWait()) { + MR::blendMtx((MtxPtr)getBaseMtx(), (MtxPtr)&baseMtx, 0.3f, (MtxPtr)&baseMtx); + } - MR::setBaseTRMtx(this, baseMtx); + MR::setBaseTRMtx(this, baseMtx); - TVec3f newScale; - newScale.multPS(mScale, mAnimScaleCtrl->_C); - MR::setBaseScale(this, newScale); + TVec3f newScale; + newScale.multPS(mScale, mAnimScaleCtrl->_C); + MR::setBaseScale(this, newScale); } // This inline function might be used elsewhere too? It seems unusual for it to be used once -inline void calcRepelVector(const TVec3f &agent, const TVec3f &object, TVec3f& dst) { - JMAVECScaleAdd(&agent, &object, &dst, -agent.dot(object)); +inline void calcRepelVector(const TVec3f& agent, const TVec3f& object, TVec3f& dst) { + JMAVECScaleAdd(&agent, &object, &dst, -agent.dot(object)); } -void Poihana::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { - bool ret = MR::isSensorPlayer(pReceiver) - || MR::isSensorEnemy(pReceiver) - || MR::isSensorMapObj(pReceiver); +void Poihana::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { + bool ret = MR::isSensorPlayer(pReceiver) || MR::isSensorEnemy(pReceiver) || MR::isSensorMapObj(pReceiver); - if (!ret) { - return; - } + if (!ret) { + return; + } - if (!MR::isSensorEnemy(pSender)) { - return; - } + if (!MR::isSensorEnemy(pSender)) { + return; + } - if (MR::isSensorPlayer(pReceiver)) { - contactMario(pSender, pReceiver); - } - - if (!MR::sendMsgPush(pReceiver, pSender)) { - return; - } + if (MR::isSensorPlayer(pReceiver)) { + contactMario(pSender, pReceiver); + } - if (MR::isSensorPlayer(pReceiver)) { - ret = isNerve(&NrvPoihana::PoihanaNrvShock::sInstance) - || isNerve(&NrvPoihana::PoihanaNrvSwoonLand::sInstance) - || isNerve(&NrvPoihana::PoihanaNrvSwoon::sInstance) - || isNerve(&NrvPoihana::PoihanaNrvRecover::sInstance); + if (!MR::sendMsgPush(pReceiver, pSender)) { + return; + } - if (ret) { - return; - } - } + if (MR::isSensorPlayer(pReceiver)) { + ret = isNerve(&NrvPoihana::PoihanaNrvShock::sInstance) || isNerve(&NrvPoihana::PoihanaNrvSwoonLand::sInstance) || isNerve(&NrvPoihana::PoihanaNrvSwoon::sInstance) || isNerve(&NrvPoihana::PoihanaNrvRecover::sInstance); - TVec3f pushVelocity; - pushVelocity.sub(mPosition, pReceiver->mHost->mPosition); + if (ret) { + return; + } + } - MR::normalizeOrZero(&pushVelocity); + TVec3f pushVelocity; + pushVelocity.sub(mPosition, pReceiver->mHost->mPosition); - if (mVelocity.dot(pushVelocity) < 0.0f) { - const TVec3f& velocity = mVelocity; - calcRepelVector(pushVelocity, velocity, mVelocity); - } + MR::normalizeOrZero(&pushVelocity); + + if (mVelocity.dot(pushVelocity) < 0.0f) { + const TVec3f& velocity = mVelocity; + calcRepelVector(pushVelocity, velocity, mVelocity); + } } -bool Poihana::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { - if (MR::isSensorEnemy(pSender) || MR::isSensorMapObj(pSender)) { - TVec3f pushOffset(mPosition - pSender->mHost->mPosition); - MR::normalizeOrZero(&pushOffset); - JMAVECScaleAdd(&pushOffset, &mVelocity, &mVelocity, 1.5f); +bool Poihana::receiveMsgPush(HitSensor* pSender, HitSensor* pReceiver) { + if (MR::isSensorEnemy(pSender) || MR::isSensorMapObj(pSender)) { + TVec3f pushOffset(mPosition - pSender->mHost->mPosition); + MR::normalizeOrZero(&pushOffset); + JMAVECScaleAdd(&pushOffset, &mVelocity, &mVelocity, 1.5f); - return true; - } + return true; + } - return false; + return false; } -bool Poihana::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - if (MR::isMsgStarPieceAttack(msg)) { - return true; - } +bool Poihana::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + if (MR::isMsgStarPieceAttack(msg)) { + return true; + } - if (MR::isMsgPlayerTrample(msg) || MR::isMsgPlayerHipDrop(msg)) { - bool flag = isNerve(&NrvPoihana::PoihanaNrvShock::sInstance) - || isNerve(&NrvPoihana::PoihanaNrvSwoonLand::sInstance) - || isNerve(&NrvPoihana::PoihanaNrvSwoon::sInstance) - || isNerve(&NrvPoihana::PoihanaNrvRecover::sInstance); + if (MR::isMsgPlayerTrample(msg) || MR::isMsgPlayerHipDrop(msg)) { + bool flag = isNerve(&NrvPoihana::PoihanaNrvShock::sInstance) || isNerve(&NrvPoihana::PoihanaNrvSwoonLand::sInstance) || isNerve(&NrvPoihana::PoihanaNrvSwoon::sInstance) || isNerve(&NrvPoihana::PoihanaNrvRecover::sInstance); - if (flag) { - goto here; - } + if (flag) { + goto here; + } - flag = isNerve(&NrvPoihana::PoihanaNrvSleepStart::sInstance) - || isNerve(&NrvPoihana::PoihanaNrvSleep::sInstance) - || isNerve(&NrvPoihana::PoihanaNrvGetUp::sInstance); + flag = isNerve(&NrvPoihana::PoihanaNrvSleepStart::sInstance) || isNerve(&NrvPoihana::PoihanaNrvSleep::sInstance) || isNerve(&NrvPoihana::PoihanaNrvGetUp::sInstance); - if (flag) { -here: - startBound(); - MR::startSound(this, "SE_EV_POIHANA_TRAMPLE", -1, -1); + if (flag) { + here: + startBound(); + MR::startSound(this, "SE_EV_POIHANA_TRAMPLE", -1, -1); - if (MR::isMsgPlayerHipDrop(msg)) { - MR::sendMsgAwayJump(pSender, pReceiver); - } + if (MR::isMsgPlayerHipDrop(msg)) { + MR::sendMsgAwayJump(pSender, pReceiver); + } - return true; - } + return true; + } - MR::setSensorOffset(this, "binder", sTrampleBinderPos); - MR::setSensorRadius(this, "binder", 125.0f); - MR::validateHitSensor(this, "binder"); - } + MR::setSensorOffset(this, "binder", sTrampleBinderPos); + MR::setSensorRadius(this, "binder", 125.0f); + MR::validateHitSensor(this, "binder"); + } - if (MR::isMsgPlayerHitAll(msg) && tryShock()) { - MR::stopSceneForDefaultHit(3); - return true; - } + if (MR::isMsgPlayerHitAll(msg) && tryShock()) { + MR::stopSceneForDefaultHit(3); + return true; + } - return false; + return false; } -bool Poihana::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - if (MR::isMsgExplosionAttack(msg) && tryShock()) { - return true; - } +bool Poihana::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + if (MR::isMsgExplosionAttack(msg) && tryShock()) { + return true; + } - return false; + return false; } /*bool Poihana::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { @@ -325,169 +316,162 @@ bool Poihana::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pRec }*/ void Poihana::exeNonActive() { - if (MR::isFirstStep(this)) { - mVelocity.zero(); - MR::offBind(this); - MR::offCalcShadow(this, nullptr); - MR::offCalcAnim(this); + if (MR::isFirstStep(this)) { + mVelocity.zero(); + MR::offBind(this); + MR::offCalcShadow(this, nullptr); + MR::offCalcAnim(this); - mIsActive = false; + mIsActive = false; - MR::invalidateHitSensors(this); - } + MR::invalidateHitSensors(this); + } - if (MR::isNearPlayerAnyTime(this, 3500.0f)) { - if (mBehavior == POIHANA_BEHAVIOR_SLEEP) { - setNerve(&NrvPoihana::PoihanaNrvSleep::sInstance); - } - else { - setNerve(&NrvPoihana::PoihanaNrvWait::sInstance); - } - } + if (MR::isNearPlayerAnyTime(this, 3500.0f)) { + if (mBehavior == POIHANA_BEHAVIOR_SLEEP) { + setNerve(&NrvPoihana::PoihanaNrvSleep::sInstance); + } else { + setNerve(&NrvPoihana::PoihanaNrvWait::sInstance); + } + } } void Poihana::endNonActive() { - MR::onBind(this); - MR::onCalcShadow(this, nullptr); - MR::onCalcAnim(this); + MR::onBind(this); + MR::onCalcShadow(this, nullptr); + MR::onCalcAnim(this); - mIsActive = true; + mIsActive = true; - MR::setSensorOffset(this, "binder", sNormalBinderPos); - MR::setSensorRadius(this, "binder", 125.0f); - MR::validateHitSensor(this, "binder"); - MR::validateHitSensors(this); + MR::setSensorOffset(this, "binder", sNormalBinderPos); + MR::setSensorRadius(this, "binder", 125.0f); + MR::validateHitSensor(this, "binder"); + MR::validateHitSensors(this); } void Poihana::exeWait() { - if (MR::isFirstStep(this)) { - MR::startBckNoInterpole(this, "Wait"); - MR::setSensorOffset(this, "binder", sNormalBinderPos); - MR::setSensorRadius(this, "binder", 125.0f); - MR::validateHitSensor(this, "binder"); - } + if (MR::isFirstStep(this)) { + MR::startBckNoInterpole(this, "Wait"); + MR::setSensorOffset(this, "binder", sNormalBinderPos); + MR::setSensorRadius(this, "binder", 125.0f); + MR::validateHitSensor(this, "binder"); + } - if (MR::isNearPlayer(this, 800.0f)) { - setNerve(&NrvPoihana::PoihanaNrvSearch::sInstance); - } - else if (MR::isGreaterStep(this, 180)) { - setNerve(&NrvPoihana::PoihanaNrvWalkAround::sInstance); - } - else { - tryNonActive(); - } + if (MR::isNearPlayer(this, 800.0f)) { + setNerve(&NrvPoihana::PoihanaNrvSearch::sInstance); + } else if (MR::isGreaterStep(this, 180)) { + setNerve(&NrvPoihana::PoihanaNrvWalkAround::sInstance); + } else { + tryNonActive(); + } } void Poihana::exeWalkAround() { - if (MR::isFirstStep(this)) { - if (!MR::isBckPlaying(this, "Walk")) { - MR::startBck(this, "Walk", nullptr); - } + if (MR::isFirstStep(this)) { + if (!MR::isBckPlaying(this, "Walk")) { + MR::startBck(this, "Walk", nullptr); + } - mRandDir = MR::getRandom((s32)-2, (s32)2); - } + mRandDir = MR::getRandom((s32)-2, (s32)2); + } - MR::rotateVecDegree(&mFrontVec, mGravity, mRandDir); - JMAVECScaleAdd(&mFrontVec, &mVelocity, &mVelocity, 0.5f); + MR::rotateVecDegree(&mFrontVec, mGravity, mRandDir); + JMAVECScaleAdd(&mFrontVec, &mVelocity, &mVelocity, 0.5f); - if (isNeedForBackHome()) { - setNerve(&NrvPoihana::PoihanaNrvGoBack::sInstance); - } - else if (MR::isNearPlayer(this, 800.0f)) { - setNerve(&NrvPoihana::PoihanaNrvSearch::sInstance); - } - else if (MR::isGreaterStep(this, 120)) { - if (mBehavior == POIHANA_BEHAVIOR_SLEEP) { - setNerve(&NrvPoihana::PoihanaNrvSleepStart::sInstance); - } - else { - setNerve(&NrvPoihana::PoihanaNrvWait::sInstance); - } - } + if (isNeedForBackHome()) { + setNerve(&NrvPoihana::PoihanaNrvGoBack::sInstance); + } else if (MR::isNearPlayer(this, 800.0f)) { + setNerve(&NrvPoihana::PoihanaNrvSearch::sInstance); + } else if (MR::isGreaterStep(this, 120)) { + if (mBehavior == POIHANA_BEHAVIOR_SLEEP) { + setNerve(&NrvPoihana::PoihanaNrvSleepStart::sInstance); + } else { + setNerve(&NrvPoihana::PoihanaNrvWait::sInstance); + } + } } void Poihana::exeSleepStart() { - if (MR::isFirstStep(this)) { - MR::startBck(this, "SleepStart", nullptr); - MR::startSound(this, "SE_EV_POIHANA_SLEEP_START", -1, -1); - MR::invalidateHitSensor(this, "binder"); - } + if (MR::isFirstStep(this)) { + MR::startBck(this, "SleepStart", nullptr); + MR::startSound(this, "SE_EV_POIHANA_SLEEP_START", -1, -1); + MR::invalidateHitSensor(this, "binder"); + } - if (MR::isBckStopped(this)) { - setNerve(&NrvPoihana::PoihanaNrvSleep::sInstance); - } + if (MR::isBckStopped(this)) { + setNerve(&NrvPoihana::PoihanaNrvSleep::sInstance); + } } void Poihana::exeSleep() { - if (MR::isFirstStep(this)) { - MR::startBck(this, "Sleep", nullptr); - MR::invalidateHitSensor(this, "binder"); - } + if (MR::isFirstStep(this)) { + MR::startBck(this, "Sleep", nullptr); + MR::invalidateHitSensor(this, "binder"); + } - if (isNeedForGetUp()) { - setNerve(&NrvPoihana::PoihanaNrvGetUp::sInstance); - } - else { - tryNonActive(); - } + if (isNeedForGetUp()) { + setNerve(&NrvPoihana::PoihanaNrvGetUp::sInstance); + } else { + tryNonActive(); + } } void Poihana::exeGetUp() { - if (MR::isFirstStep(this)) { - MR::startBck(this, "GetUp", nullptr); - MR::startSound(this, "SE_EV_POIHANA_WAKEUP", -1, -1); - MR::startSound(this, "SE_EM_POIHANA_WAKEUP", -1, -1); - } + if (MR::isFirstStep(this)) { + MR::startBck(this, "GetUp", nullptr); + MR::startSound(this, "SE_EV_POIHANA_WAKEUP", -1, -1); + MR::startSound(this, "SE_EM_POIHANA_WAKEUP", -1, -1); + } - if (MR::isBckStopped(this)) { - MR::setSensorOffset(this, "binder", sNormalBinderPos); - MR::setSensorRadius(this, "binder", 125.0f); - MR::validateHitSensor(this, "binder"); - setNerve(&NrvPoihana::PoihanaNrvWait::sInstance); - } + if (MR::isBckStopped(this)) { + MR::setSensorOffset(this, "binder", sNormalBinderPos); + MR::setSensorRadius(this, "binder", 125.0f); + MR::validateHitSensor(this, "binder"); + setNerve(&NrvPoihana::PoihanaNrvWait::sInstance); + } } void Poihana::exeSearch() { - if (MR::isFirstStep(this)) { - MR::startBck(this, "Search", nullptr); - MR::startSound(this, "SE_EV_POIHANA_FIND", -1, -1); - } + if (MR::isFirstStep(this)) { + MR::startBck(this, "Search", nullptr); + MR::startSound(this, "SE_EV_POIHANA_FIND", -1, -1); + } - MR::turnDirectionToTargetUseGroundNormalDegree(this, &mFrontVec, *MR::getPlayerPos(), 4.0f); + MR::turnDirectionToTargetUseGroundNormalDegree(this, &mFrontVec, *MR::getPlayerPos(), 4.0f); - if (MR::isBckStopped(this)) { - setNerve(&NrvPoihana::PoihanaNrvChasePlayer::sInstance); - } + if (MR::isBckStopped(this)) { + setNerve(&NrvPoihana::PoihanaNrvChasePlayer::sInstance); + } } void Poihana::exeChasePlayer() { - if (MR::isFirstStep(this)) { - MR::startBck(this, "Run", nullptr); - MR::setSensorOffset(this, "binder", sNormalBinderPos); - MR::setSensorRadius(this, "binder", 125.0f); - MR::validateHitSensor(this, "binder"); - } + if (MR::isFirstStep(this)) { + MR::startBck(this, "Run", nullptr); + MR::setSensorOffset(this, "binder", sNormalBinderPos); + MR::setSensorRadius(this, "binder", 125.0f); + MR::validateHitSensor(this, "binder"); + } - MR::turnDirectionToTargetUseGroundNormalDegree(this, &mFrontVec, *MR::getPlayerPos(), 4.0f); - JMAVECScaleAdd(&mFrontVec, &mVelocity, &mVelocity, 0.5f); + MR::turnDirectionToTargetUseGroundNormalDegree(this, &mFrontVec, *MR::getPlayerPos(), 4.0f); + JMAVECScaleAdd(&mFrontVec, &mVelocity, &mVelocity, 0.5f); - if (isNeedForBackHome()) { - setNerve(&NrvPoihana::PoihanaNrvGoBack::sInstance); - } + if (isNeedForBackHome()) { + setNerve(&NrvPoihana::PoihanaNrvGoBack::sInstance); + } } void Poihana::exeShootUpCharge() { - if (MR::isFirstStep(this)) { - MR::startBck(this, "ThrowStart", nullptr); - } + if (MR::isFirstStep(this)) { + MR::startBck(this, "ThrowStart", nullptr); + } - TVec3f& gravity = mGravity; - f32 dot = gravity.dot(mVelocity); - mVelocity.scale(dot, gravity); + TVec3f& gravity = mGravity; + f32 dot = gravity.dot(mVelocity); + mVelocity.scale(dot, gravity); - if (MR::isBckStopped(this)) { - setNerve(&NrvPoihana::PoihanaNrvShootUp::sInstance); - } + if (MR::isBckStopped(this)) { + setNerve(&NrvPoihana::PoihanaNrvShootUp::sInstance); + } } /*void Poihana::exeShootUp() { @@ -523,205 +507,203 @@ void Poihana::exeShootUpCharge() { }*/ void Poihana::endShootUp() { - endBind(); + endBind(); - MR::setSensorOffset(this, "binder", sNormalBinderPos); - MR::setSensorRadius(this, "binder", 125.0f); - MR::validateHitSensor(this, "binder"); + MR::setSensorOffset(this, "binder", sNormalBinderPos); + MR::setSensorRadius(this, "binder", 125.0f); + MR::validateHitSensor(this, "binder"); - MR::endActorCamera(this, mCamInfo, true, -1); + MR::endActorCamera(this, mCamInfo, true, -1); } void Poihana::exeGoBack() { - if (MR::isFirstStep(this) && !MR::isBckPlaying(this, "Walk")) { - MR::startBck(this, "Walk", nullptr); - } + if (MR::isFirstStep(this) && !MR::isBckPlaying(this, "Walk")) { + MR::startBck(this, "Walk", nullptr); + } - MR::turnDirectionToTargetUseGroundNormalDegree(this, &mFrontVec, mHomePos, 2.0f); - JMAVECScaleAdd(&mFrontVec, &mVelocity, &mVelocity, 0.5f); + MR::turnDirectionToTargetUseGroundNormalDegree(this, &mFrontVec, mHomePos, 2.0f); + JMAVECScaleAdd(&mFrontVec, &mVelocity, &mVelocity, 0.5f); - if (MR::isNearPlayer(this, 800.0f) && MR::isGreaterStep(this, 120)) { - setNerve(&NrvPoihana::PoihanaNrvSearch::sInstance); - } - else if (MR::isNear(this, mHomePos, 100.0f)) { - setNerve(&NrvPoihana::PoihanaNrvWait::sInstance); - } + if (MR::isNearPlayer(this, 800.0f) && MR::isGreaterStep(this, 120)) { + setNerve(&NrvPoihana::PoihanaNrvSearch::sInstance); + } else if (MR::isNear(this, mHomePos, 100.0f)) { + setNerve(&NrvPoihana::PoihanaNrvWait::sInstance); + } } void Poihana::exeShock() { - if (MR::isFirstStep(this)) { - MR::startBck(this, "PunchDamage", nullptr); - MR::startBlowHitSound(this); - MR::invalidateHitSensor(this, "binder"); - } + if (MR::isFirstStep(this)) { + MR::startBck(this, "PunchDamage", nullptr); + MR::startBlowHitSound(this); + MR::invalidateHitSensor(this, "binder"); + } - if (MR::isOnGround(this) && MR::isGreaterStep(this, 12)) { - setNerve(&NrvPoihana::PoihanaNrvSwoon::sInstance); - } + if (MR::isOnGround(this) && MR::isGreaterStep(this, 12)) { + setNerve(&NrvPoihana::PoihanaNrvSwoon::sInstance); + } } void Poihana::exeSwoonLand() { - if (MR::isFirstStep(this)) { - MR::startBckNoInterpole(this, "SwoonLand"); - MR::startSound(this, "SE_EV_POIHANA_SWOON", -1, -1); - } + if (MR::isFirstStep(this)) { + MR::startBckNoInterpole(this, "SwoonLand"); + MR::startSound(this, "SE_EV_POIHANA_SWOON", -1, -1); + } - if (MR::isBckStopped(this)) { - setNerve(&NrvPoihana::PoihanaNrvSwoon::sInstance); - } + if (MR::isBckStopped(this)) { + setNerve(&NrvPoihana::PoihanaNrvSwoon::sInstance); + } } void Poihana::exeSwoon() { - if (MR::isFirstStep(this)) { - MR::startBck(this, "Swoon", nullptr); - } + if (MR::isFirstStep(this)) { + MR::startBck(this, "Swoon", nullptr); + } - MR::startLevelSound(this, "SE_EM_LV_SWOON_S", -1, -1, -1); + MR::startLevelSound(this, "SE_EM_LV_SWOON_S", -1, -1, -1); - if (MR::isStep(this, 110)) { - setNerve(&NrvPoihana::PoihanaNrvRecover::sInstance); - } + if (MR::isStep(this, 110)) { + setNerve(&NrvPoihana::PoihanaNrvRecover::sInstance); + } } void Poihana::exeRecover() { - if (MR::isFirstStep(this)) { - MR::startBck(this, "Recover", nullptr); - MR::startSound(this, "SE_EM_POIHANA_RECOVER", -1, -1); - MR::startSound(this, "SE_EV_POIHANA_RECOVER", -1, -1); - mScale.set(1.0f); - } + if (MR::isFirstStep(this)) { + MR::startBck(this, "Recover", nullptr); + MR::startSound(this, "SE_EM_POIHANA_RECOVER", -1, -1); + MR::startSound(this, "SE_EV_POIHANA_RECOVER", -1, -1); + mScale.set(1.0f); + } - if (MR::isBckStopped(this)) { - MR::setSensorOffset(this, "binder", sNormalBinderPos); - MR::setSensorRadius(this, "binder", 125.0f); - MR::validateHitSensor(this, "binder"); - setNerve(&NrvPoihana::PoihanaNrvWait::sInstance); - } + if (MR::isBckStopped(this)) { + MR::setSensorOffset(this, "binder", sNormalBinderPos); + MR::setSensorRadius(this, "binder", 125.0f); + MR::validateHitSensor(this, "binder"); + setNerve(&NrvPoihana::PoihanaNrvWait::sInstance); + } } // Needs to be reviewed void Poihana::exeShake() { - f32 _f31 = 0.2f - 0.01f * getNerveStep(); - f32 scale = MR::sinDegree(getNerveStep() * 0.01745329251f) * _f31 + 36.0f; - mScale.set(scale); + f32 _f31 = 0.2f - 0.01f * getNerveStep(); + f32 scale = MR::sinDegree(getNerveStep() * 0.01745329251f) * _f31 + 36.0f; + mScale.set(scale); - if (MR::isStep(this, 20)) { - mScale.set(1.0f); - setNerve(&NrvPoihana::PoihanaNrvSearch::sInstance); - } + if (MR::isStep(this, 20)) { + mScale.set(1.0f); + setNerve(&NrvPoihana::PoihanaNrvSearch::sInstance); + } } void Poihana::exeDrown() { - if (MR::isFirstStep(this)) { - MR::startBck(this, "Drown", nullptr); - MR::invalidateClipping(this); - MR::invalidateHitSensors(this); - MR::startSound(this, "SE_EM_FALL_INTO_WATER_S", -1, -1); + if (MR::isFirstStep(this)) { + MR::startBck(this, "Drown", nullptr); + MR::invalidateClipping(this); + MR::invalidateHitSensors(this); + MR::startSound(this, "SE_EM_FALL_INTO_WATER_S", -1, -1); - mWaterColumn->appear(); - MR::tryStartAllAnim(mWaterColumn, "Splash"); - } + mWaterColumn->appear(); + MR::tryStartAllAnim(mWaterColumn, "Splash"); + } - if (MR::isBckStopped(this)) { - setNerve(&NrvPoihana::PoihanaNrvHide::sInstance); - } + if (MR::isBckStopped(this)) { + setNerve(&NrvPoihana::PoihanaNrvHide::sInstance); + } } void Poihana::exeHide() { - if (MR::isFirstStep(this)) { - MR::startSound(this, "SE_EM_EXPLODE_S_WATER", -1, -1); - MR::emitEffect(this, "DeathWater"); - MR::hideModel(this); - } + if (MR::isFirstStep(this)) { + MR::startSound(this, "SE_EM_EXPLODE_S_WATER", -1, -1); + MR::emitEffect(this, "DeathWater"); + MR::hideModel(this); + } - if (MR::isStep(this, 150)) { - setNerve(&NrvPoihana::PoihanaNrvAppear::sInstance); - } + if (MR::isStep(this, 150)) { + setNerve(&NrvPoihana::PoihanaNrvAppear::sInstance); + } } void Poihana::exeAppear() { - if (MR::isFirstStep(this)) { - MR::resetPosition(this, mRespawnPos); - MR::emitEffect(this, "Appear"); - } + if (MR::isFirstStep(this)) { + MR::resetPosition(this, mRespawnPos); + MR::emitEffect(this, "Appear"); + } - if (MR::isLessStep(this, 60)) { - MR::startLevelSound(this, "SE_EM_LV_POIHANA_REVIVE_EFFECT", -1, -1, -1); - } + if (MR::isLessStep(this, 60)) { + MR::startLevelSound(this, "SE_EM_LV_POIHANA_REVIVE_EFFECT", -1, -1, -1); + } - if (MR::isStep(this, 60)) { - MR::showModel(this); - MR::startBck(this, "Appear", nullptr); - MR::startSound(this, "SE_EM_POIHANA_REVIVE_APPEAR", -1, -1); - } - else if (MR::isBckStopped(this) && MR::isGreaterStep(this, 60)) { - MR::validateClipping(this); - MR::validateHitSensors(this); - MR::setSensorOffset(this, "binder", sNormalBinderPos); - MR::setSensorRadius(this, "binder", 125.0f); - MR::validateHitSensor(this, "binder"); - setNerve(&NrvPoihana::PoihanaNrvWait::sInstance); - } + if (MR::isStep(this, 60)) { + MR::showModel(this); + MR::startBck(this, "Appear", nullptr); + MR::startSound(this, "SE_EM_POIHANA_REVIVE_APPEAR", -1, -1); + } else if (MR::isBckStopped(this) && MR::isGreaterStep(this, 60)) { + MR::validateClipping(this); + MR::validateHitSensors(this); + MR::setSensorOffset(this, "binder", sNormalBinderPos); + MR::setSensorRadius(this, "binder", 125.0f); + MR::validateHitSensor(this, "binder"); + setNerve(&NrvPoihana::PoihanaNrvWait::sInstance); + } } void Poihana::exeDPDSwoon() { - if (MR::isFirstStep(this)) { - MR::invalidateHitSensor(this, "Binder"); - } + if (MR::isFirstStep(this)) { + MR::invalidateHitSensor(this, "Binder"); + } - MR::updateActorStateAndNextNerve(this, (ActorStateBaseInterface*)mBindStarPointer, - &NrvPoihana::PoihanaNrvWait::sInstance); + MR::updateActorStateAndNextNerve(this, (ActorStateBaseInterface*)mBindStarPointer, + &NrvPoihana::PoihanaNrvWait::sInstance); } void Poihana::endDPDSwoon() { - mBindStarPointer->kill(); + mBindStarPointer->kill(); - MR::setSensorOffset(this, "binder", sNormalBinderPos); - MR::setSensorRadius(this, "binder", 125.0f); - MR::validateHitSensor(this, "binder"); + MR::setSensorOffset(this, "binder", sNormalBinderPos); + MR::setSensorRadius(this, "binder", 125.0f); + MR::validateHitSensor(this, "binder"); } bool Poihana::tryToStartBind(HitSensor* pSender) { - if (mBindedActor != nullptr) { - return false; - } + if (mBindedActor != nullptr) { + return false; + } - LiveActor *bindedActor = pSender->mHost; - if (MR::isInWater(bindedActor, TVec3f(0.0f, 0.0f, 0.0f))) { - return false; - } + LiveActor* bindedActor = pSender->mHost; + if (MR::isInWater(bindedActor, TVec3f(0.0f, 0.0f, 0.0f))) { + return false; + } - MR::tryRumblePadMiddle(this, 0); - mBindedActor = pSender->mHost; - MR::startBckPlayer("Rise", (const char *)nullptr); - MR::invalidateClipping(this); - return true; + MR::tryRumblePadMiddle(this, 0); + mBindedActor = pSender->mHost; + MR::startBckPlayer("Rise", (const char*)nullptr); + MR::invalidateClipping(this); + return true; } void Poihana::updateBindActorMtx() { - TPos3f binderMtx; - MR::makeMtxTR(binderMtx.toMtxPtr(), mBindedActor); - MR::setBaseTRMtx(mBindedActor, binderMtx); + TPos3f binderMtx; + MR::makeMtxTR(binderMtx.toMtxPtr(), mBindedActor); + MR::setBaseTRMtx(mBindedActor, binderMtx); } void Poihana::endBind() { - MR::validateClipping(this); + MR::validateClipping(this); - if (MR::isPlayerInRush()) { - TVec3f jumpVec; - jumpVec.scale(-mLaunchIntensity, mGravity); - MR::endBindAndPlayerJump(this, jumpVec, 0); - MR::startSound(this, "SE_PM_HELI_JUMP", -1, -1); - } + if (MR::isPlayerInRush()) { + TVec3f jumpVec; + jumpVec.scale(-mLaunchIntensity, mGravity); + MR::endBindAndPlayerJump(this, jumpVec, 0); + MR::startSound(this, "SE_PM_HELI_JUMP", -1, -1); + } - mBindedActor = nullptr; + mBindedActor = nullptr; } void Poihana::startBound() { - mBoundTimer = 0; - mScale.x = 1.0f; - mScale.y = 1.0f; - mScale.z = 1.0f; + mBoundTimer = 0; + mScale.x = 1.0f; + mScale.y = 1.0f; + mScale.z = 1.0f; } /* @@ -746,28 +728,27 @@ void Poihana::startBound() { } }*/ -void Poihana::contactMario(HitSensor *pSender, HitSensor *pReceiver) { - bool isShooting; +void Poihana::contactMario(HitSensor* pSender, HitSensor* pReceiver) { + bool isShooting; - if (!isNerveTypeWalkOrWait()) { - isShooting = isNerve(&NrvPoihana::PoihanaNrvShootUpCharge::sInstance) - || isNerve(&NrvPoihana::PoihanaNrvShootUp::sInstance); - } else { - goto doFlip; - } + if (!isNerveTypeWalkOrWait()) { + isShooting = isNerve(&NrvPoihana::PoihanaNrvShootUpCharge::sInstance) || isNerve(&NrvPoihana::PoihanaNrvShootUp::sInstance); + } else { + goto doFlip; + } - if (isShooting) { -doFlip: - if (!isBackAttack(pReceiver)) { - return; - } + if (isShooting) { + doFlip: + if (!isBackAttack(pReceiver)) { + return; + } - if (MR::sendMsgEnemyAttackFlipWeak(pReceiver, pSender)) { - setNerve(&NrvPoihana::PoihanaNrvShake::sInstance); - } - } else if (isNerve(&NrvPoihana::PoihanaNrvSleep::sInstance)) { - setNerve(&NrvPoihana::PoihanaNrvGetUp::sInstance); - } + if (MR::sendMsgEnemyAttackFlipWeak(pReceiver, pSender)) { + setNerve(&NrvPoihana::PoihanaNrvShake::sInstance); + } + } else if (isNerve(&NrvPoihana::PoihanaNrvSleep::sInstance)) { + setNerve(&NrvPoihana::PoihanaNrvGetUp::sInstance); + } } // Needs review @@ -827,152 +808,145 @@ doFlip: }*/ void Poihana::calcMyGravity() { - if (!mIsActive) { - return; - } + if (!mIsActive) { + return; + } - TVec3f upVec, gravityPos; - MR::calcUpVec(&upVec, this); - JMAVECScaleAdd(&upVec, &mPosition, &gravityPos, 20.0f); - MR::calcGravity(this, gravityPos); + TVec3f upVec, gravityPos; + MR::calcUpVec(&upVec, this); + JMAVECScaleAdd(&upVec, &mPosition, &gravityPos, 20.0f); + MR::calcGravity(this, gravityPos); } bool Poihana::tryNonActive() { - if (!MR::isStageStateScenarioOpeningCamera()) { - bool notNear = !MR::isNearPlayerAnyTime(this, 3500.0f); - if (notNear && MR::isBindedGround(this)) { - setNerve(&NrvPoihana::PoihanaNrvNonActive::sInstance); - return true; - } - } + if (!MR::isStageStateScenarioOpeningCamera()) { + bool notNear = !MR::isNearPlayerAnyTime(this, 3500.0f); + if (notNear && MR::isBindedGround(this)) { + setNerve(&NrvPoihana::PoihanaNrvNonActive::sInstance); + return true; + } + } - return false; + return false; } bool Poihana::tryDrown() { - if (!mCanDrown) { - return false; - } + if (!mCanDrown) { + return false; + } - if (isNerve(&NrvPoihana::PoihanaNrvAppear::sInstance)) { - return false; - } + if (isNerve(&NrvPoihana::PoihanaNrvAppear::sInstance)) { + return false; + } - if (isNerve(&NrvPoihana::PoihanaNrvDrown::sInstance)) { - return false; - } + if (isNerve(&NrvPoihana::PoihanaNrvDrown::sInstance)) { + return false; + } - if (!MR::isInWater(this, TVec3f(0.0f, 0.0f, 0.0f))) { - return false; - } + if (!MR::isInWater(this, TVec3f(0.0f, 0.0f, 0.0f))) { + return false; + } - setNerve(&NrvPoihana::PoihanaNrvDrown::sInstance); - return true; + setNerve(&NrvPoihana::PoihanaNrvDrown::sInstance); + return true; } bool Poihana::tryDPDSwoon() { - if (!isNerveTypeWalkOrWait()) { - return false; - } + if (!isNerveTypeWalkOrWait()) { + return false; + } - if (!mBindStarPointer->tryStartPointBind()) { - return false; - } + if (!mBindStarPointer->tryStartPointBind()) { + return false; + } - setNerve(&NrvPoihana::PoihanaNrvDPDSwoon::sInstance); - return true; + setNerve(&NrvPoihana::PoihanaNrvDPDSwoon::sInstance); + return true; } bool Poihana::tryShock() { - bool ret = isNerve(&NrvPoihana::PoihanaNrvDrown::sInstance) - || isNerve(&NrvPoihana::PoihanaNrvHide::sInstance) - || isNerve(&NrvPoihana::PoihanaNrvAppear::sInstance); + bool ret = isNerve(&NrvPoihana::PoihanaNrvDrown::sInstance) || isNerve(&NrvPoihana::PoihanaNrvHide::sInstance) || isNerve(&NrvPoihana::PoihanaNrvAppear::sInstance); - if (ret) { - return false; - } + if (ret) { + return false; + } - if (isNerve(&NrvPoihana::PoihanaNrvShock::sInstance)) { - return false; - } + if (isNerve(&NrvPoihana::PoihanaNrvShock::sInstance)) { + return false; + } - if (isNerve(&NrvPoihana::PoihanaNrvSwoonLand::sInstance)) { - return false; - } + if (isNerve(&NrvPoihana::PoihanaNrvSwoonLand::sInstance)) { + return false; + } - mVelocity.scale(-30.0f, mGravity); - setNerve(&NrvPoihana::PoihanaNrvShock::sInstance); - return true; + mVelocity.scale(-30.0f, mGravity); + setNerve(&NrvPoihana::PoihanaNrvShock::sInstance); + return true; } bool Poihana::tryHipDropShock() { - bool isNotNear = !MR::isNearPlayerAnyTime(this, 500.0f); + bool isNotNear = !MR::isNearPlayerAnyTime(this, 500.0f); - if (isNotNear) { - return false; - } + if (isNotNear) { + return false; + } - if (MR::isPlayerHipDropLand()) { - return tryShock(); - } + if (MR::isPlayerHipDropLand()) { + return tryShock(); + } - return false; + return false; } bool Poihana::isNerveTypeWalkOrWait() const { - return isNerve(&NrvPoihana::PoihanaNrvWait::sInstance) - || isNerve(&NrvPoihana::PoihanaNrvSearch::sInstance) - || isNerve(&NrvPoihana::PoihanaNrvWalkAround::sInstance) - || isNerve(&NrvPoihana::PoihanaNrvChasePlayer::sInstance) - || isNerve(&NrvPoihana::PoihanaNrvGoBack::sInstance); + return isNerve(&NrvPoihana::PoihanaNrvWait::sInstance) || isNerve(&NrvPoihana::PoihanaNrvSearch::sInstance) || isNerve(&NrvPoihana::PoihanaNrvWalkAround::sInstance) || isNerve(&NrvPoihana::PoihanaNrvChasePlayer::sInstance) || isNerve(&NrvPoihana::PoihanaNrvGoBack::sInstance); } bool Poihana::isNeedForBackHome() const { - if (isNerve(&NrvPoihana::PoihanaNrvWalkAround::sInstance)) { - return !MR::isNear(this, mHomePos, 350.0f); - } + if (isNerve(&NrvPoihana::PoihanaNrvWalkAround::sInstance)) { + return !MR::isNear(this, mHomePos, 350.0f); + } - if (isNerve(&NrvPoihana::PoihanaNrvChasePlayer::sInstance)) { - bool ret; + if (isNerve(&NrvPoihana::PoihanaNrvChasePlayer::sInstance)) { + bool ret; - if (mBehavior == POIHANA_BEHAVIOR_NEW_HOME) { - ret = !MR::isNearPlayer(this, 1100.0f); - } else { - ret = !MR::isNear(this, mHomePos, 2000.0f) - || !MR::isNearPlayer(this, 1110.0f); - } + if (mBehavior == POIHANA_BEHAVIOR_NEW_HOME) { + ret = !MR::isNearPlayer(this, 1100.0f); + } else { + ret = !MR::isNear(this, mHomePos, 2000.0f) || !MR::isNearPlayer(this, 1110.0f); + } - return ret; - } + return ret; + } - return false; + return false; } bool Poihana::isNeedForGetUp() const { - bool ret = false; + bool ret = false; - if (MR::isNearPlayer(this, 500.0f)) { - bool flag = true; + if (MR::isNearPlayer(this, 500.0f)) { + bool flag = true; - f32 mag = PSVECMag(MR::getPlayerVelocity()); + f32 mag = PSVECMag(MR::getPlayerVelocity()); - if (!(mag >= 10.0f) && !MR::isPlayerSwingAction()) { - flag = false; - } + if (!(mag >= 10.0f) && !MR::isPlayerSwingAction()) { + flag = false; + } - if (flag) { - ret = true; - } - } + if (flag) { + ret = true; + } + } - return ret; + return ret; } -bool Poihana::isBackAttack(HitSensor *pMySensor) const { - TVec3f frontVec; - MR::calcFrontVec(&frontVec, this); - JGeometry::negateInternal((f32 *)&frontVec, (f32 *)&frontVec); +bool Poihana::isBackAttack(HitSensor* pMySensor) const { + TVec3f frontVec; + MR::calcFrontVec(&frontVec, this); + JGeometry::negateInternal((f32*)&frontVec, (f32*)&frontVec); - TVec3f sensorRelative(pMySensor->mPosition - mPosition); - return sensorRelative.dot(frontVec) > 0.0f; + TVec3f sensorRelative(pMySensor->mPosition - mPosition); + return sensorRelative.dot(frontVec) > 0.0f; } diff --git a/src/Game/Enemy/RingBeam.cpp b/src/Game/Enemy/RingBeam.cpp index 8bdb3ccd4..7b36e9845 100644 --- a/src/Game/Enemy/RingBeam.cpp +++ b/src/Game/Enemy/RingBeam.cpp @@ -6,22 +6,23 @@ //GX function that is included as a local symbol for some reason extern "C" { - void GXPosition3f32(f32,f32,f32); +void GXPosition3f32(f32, f32, f32); } namespace NrvRingBeam { - NEW_NERVE(RingBeamNrvSpread, RingBeam, Spread); + NEW_NERVE(RingBeamNrvSpread, RingBeam, Spread); } -RingBeamShadowDrawer::RingBeamShadowDrawer(const LiveActor * unk0) : ShadowVolumeDrawer("影描画[リングビーム]"){ +RingBeamShadowDrawer::RingBeamShadowDrawer(const LiveActor* unk0) + : ShadowVolumeDrawer("影描画[リングビーム]") { _1c = unk0; _20 = 0.0f; } -void RingBeamShadowDrawer::drawShape() const{ +void RingBeamShadowDrawer::drawShape() const { TPos3f MtxList[32]; TPos3f baseMtxCopy; - Mtx mtx; + Mtx mtx; TVec3f temp; TVec3f temp2; TVec3f temp3; @@ -34,26 +35,26 @@ void RingBeamShadowDrawer::drawShape() const{ TVec3f Trans; TVec3f listXDir; TVec3f listYDir; - float f1 = 0.2026834f; + float f1 = 0.2026834f; - JMath::gekko_ps_copy12(&baseMtxCopy,_1c->getBaseMtx()); + JMath::gekko_ps_copy12(&baseMtxCopy, _1c->getBaseMtx()); baseMtxCopy.getXDir(XDir); baseMtxCopy.getYDir(YDir); baseMtxCopy.getTrans(Trans); - PSMTXRotAxisRad(mtx,&YDir,f1); + PSMTXRotAxisRad(mtx, &YDir, f1); XDirScaled.scale(_20, XDir); float f2 = 0.0f; - for(int i = 0; i < 32; i++){ - JMathInlineVEC::PSVECAdd(&Trans,&XDirScaled,&temp); - MR::calcGravityVector(_1c,temp,&temp2,nullptr,0); - if(MR::normalizeOrZero(XDirScaled,&temp3)){ - JMath::gekko_ps_copy12(&MtxList[i],&baseMtxCopy); - } else if(MR::isSameDirection(-temp2,temp3,0.01f)){ - MR::makeMtxUpSide(&MtxList[i],-temp2,-YDir); - } else if(temp2.dot(YDir) < f2){ - MR::makeMtxUpSide(&MtxList[i],-temp2,temp3); - } else{ - MR::makeMtxUpSide(&MtxList[i],-temp2,-temp3); + for (int i = 0; i < 32; i++) { + JMathInlineVEC::PSVECAdd(&Trans, &XDirScaled, &temp); + MR::calcGravityVector(_1c, temp, &temp2, nullptr, 0); + if (MR::normalizeOrZero(XDirScaled, &temp3)) { + JMath::gekko_ps_copy12(&MtxList[i], &baseMtxCopy); + } else if (MR::isSameDirection(-temp2, temp3, 0.01f)) { + MR::makeMtxUpSide(&MtxList[i], -temp2, -YDir); + } else if (temp2.dot(YDir) < f2) { + MR::makeMtxUpSide(&MtxList[i], -temp2, temp3); + } else { + MR::makeMtxUpSide(&MtxList[i], -temp2, -temp3); } // almost certainly an inline MtxList[i][0][3] = temp.x; @@ -63,77 +64,77 @@ void RingBeamShadowDrawer::drawShape() const{ PSMTXMultVec(mtx, &XDirScaled, &XDirScaled); } GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, 64); - for(int i = 0; i < 32; i++){ + for (int i = 0; i < 32; i++) { MtxList[i].getXDir(listXDir); MtxList[i].getTrans(Trans); - listXDirScaledNeg.scale(-5.0f,listXDir); - listXDirScaledPos.scale(5.0f,listXDir); - JMathInlineVEC::PSVECAdd(&Trans,&listXDirScaledNeg,&temp); - JMathInlineVEC::PSVECAdd(&Trans,&listXDirScaledPos,&temp2); - GXPosition3f32(temp2.x,temp2.y,temp2.z); - GXPosition3f32(temp.x,temp.y,temp.z); + listXDirScaledNeg.scale(-5.0f, listXDir); + listXDirScaledPos.scale(5.0f, listXDir); + JMathInlineVEC::PSVECAdd(&Trans, &listXDirScaledNeg, &temp); + JMathInlineVEC::PSVECAdd(&Trans, &listXDirScaledPos, &temp2); + GXPosition3f32(temp2.x, temp2.y, temp2.z); + GXPosition3f32(temp.x, temp.y, temp.z); } GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, 64); - for(int i = 0; i < 32; i++){ + for (int i = 0; i < 32; i++) { MtxList[i].getXDir(listXDir); MtxList[i].getYDir(listYDir); MtxList[i].getTrans(Trans); - listXDirScaledNeg.scale(-5.0f,listXDir); - listXDirScaledPos.scale(5.0f,listXDir); - negYDirScaled.scale(500.0f,-listYDir); - JMathInlineVEC::PSVECAdd(&Trans,&listXDirScaledNeg,&temp); - JMathInlineVEC::PSVECAdd(&Trans,&listXDirScaledPos,&temp2); - JMathInlineVEC::PSVECAdd(&temp,&negYDirScaled,&temp); - JMathInlineVEC::PSVECAdd(&temp2,&negYDirScaled,&temp2); - GXPosition3f32(temp.x,temp.y,temp.z); - GXPosition3f32(temp2.x,temp2.y,temp2.z); + listXDirScaledNeg.scale(-5.0f, listXDir); + listXDirScaledPos.scale(5.0f, listXDir); + negYDirScaled.scale(500.0f, -listYDir); + JMathInlineVEC::PSVECAdd(&Trans, &listXDirScaledNeg, &temp); + JMathInlineVEC::PSVECAdd(&Trans, &listXDirScaledPos, &temp2); + JMathInlineVEC::PSVECAdd(&temp, &negYDirScaled, &temp); + JMathInlineVEC::PSVECAdd(&temp2, &negYDirScaled, &temp2); + GXPosition3f32(temp.x, temp.y, temp.z); + GXPosition3f32(temp2.x, temp2.y, temp2.z); } GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, 64); - for(int i = 0; i < 32; i++){ + for (int i = 0; i < 32; i++) { MtxList[i].getXDir(listXDir); MtxList[i].getYDir(listYDir); MtxList[i].getTrans(Trans); - listXDirScaledNeg.scale(-5.0f,listXDir); - negYDirScaled.scale(500.0f,-listYDir); - JMathInlineVEC::PSVECAdd(&Trans,&listXDirScaledNeg,&temp); - JMathInlineVEC::PSVECAdd(&Trans,&listXDirScaledNeg,&temp2); - JMathInlineVEC::PSVECAdd(&temp2,&negYDirScaled,&temp2); - GXPosition3f32(temp.x,temp.y,temp.z); - GXPosition3f32(temp2.x,temp2.y,temp2.z); + listXDirScaledNeg.scale(-5.0f, listXDir); + negYDirScaled.scale(500.0f, -listYDir); + JMathInlineVEC::PSVECAdd(&Trans, &listXDirScaledNeg, &temp); + JMathInlineVEC::PSVECAdd(&Trans, &listXDirScaledNeg, &temp2); + JMathInlineVEC::PSVECAdd(&temp2, &negYDirScaled, &temp2); + GXPosition3f32(temp.x, temp.y, temp.z); + GXPosition3f32(temp2.x, temp2.y, temp2.z); } GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, 64); - for(int i = 0; i < 32; i++){ + for (int i = 0; i < 32; i++) { MtxList[i].getXDir(listXDir); MtxList[i].getYDir(listYDir); MtxList[i].getTrans(Trans); - listXDirScaledPos.scale(5.0f,listXDir); - negYDirScaled.scale(500.0f,-listYDir); - JMathInlineVEC::PSVECAdd(&Trans,&listXDirScaledPos,&temp); - JMathInlineVEC::PSVECAdd(&Trans,&listXDirScaledPos,&temp2); - JMathInlineVEC::PSVECAdd(&temp2,&negYDirScaled,&temp2); - GXPosition3f32(temp2.x,temp2.y,temp2.z); - GXPosition3f32(temp.x,temp.y,temp.z); + listXDirScaledPos.scale(5.0f, listXDir); + negYDirScaled.scale(500.0f, -listYDir); + JMathInlineVEC::PSVECAdd(&Trans, &listXDirScaledPos, &temp); + JMathInlineVEC::PSVECAdd(&Trans, &listXDirScaledPos, &temp2); + JMathInlineVEC::PSVECAdd(&temp2, &negYDirScaled, &temp2); + GXPosition3f32(temp2.x, temp2.y, temp2.z); + GXPosition3f32(temp.x, temp.y, temp.z); } } -void RingBeamShadowDrawer::loadModelDrawMtx() const{ - - GXLoadPosMtxImm(MR::getCameraViewMtx(), 0); - GXSetCurrentMtx(0); - GXClearVtxDesc(); - GXSetVtxDesc(GX_VA_POS, GX_DIRECT); - GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); +void RingBeamShadowDrawer::loadModelDrawMtx() const { + + GXLoadPosMtxImm(MR::getCameraViewMtx(), 0); + GXSetCurrentMtx(0); + GXClearVtxDesc(); + GXSetVtxDesc(GX_VA_POS, GX_DIRECT); + GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); }; -bool RingBeamShadowDrawer::isDraw() const{ +bool RingBeamShadowDrawer::isDraw() const { return MR::isValidDraw(_1c); } - -RingBeam::RingBeam(const char * pName, LiveActor * arg1, bool arg2, bool arg3) : LiveActor(pName){ +RingBeam::RingBeam(const char* pName, LiveActor* arg1, bool arg2, bool arg3) + : LiveActor(pName) { _8c = arg1; mSpeed = 20.0f; mLife = 100; @@ -143,53 +144,52 @@ RingBeam::RingBeam(const char * pName, LiveActor * arg1, bool arg2, bool arg3) : _a4 = nullptr; } -void RingBeam::setSpeed(f32 speed){ +void RingBeam::setSpeed(f32 speed) { mSpeed = speed; } - -void RingBeam::setLife(s32 life){ +void RingBeam::setLife(s32 life) { mLife = life; } -void RingBeam::init(const JMapInfoIter &rIter){ - TPos3f mtx; - MR::initDefaultPos(this,rIter); - initModelManagerWithAnm("JumpBeamerBeam",nullptr,false); +void RingBeam::init(const JMapInfoIter& rIter) { + TPos3f mtx; + MR::initDefaultPos(this, rIter); + initModelManagerWithAnm("JumpBeamerBeam", nullptr, false); MR::connectToSceneIndirectEnemy(this); initHitSensor(1); - MR::addHitSensorEye(this,"Beam",8,0.0f,TVec3f(0.0f,0.0f,0.0f)); - initEffectKeeper(1,nullptr,false); - initSound(2,true); + MR::addHitSensorEye(this, "Beam", 8, 0.0f, TVec3f(0.0f, 0.0f, 0.0f)); + initEffectKeeper(1, nullptr, false); + initSound(2, true); mSoundObject->setTrans(&_cc); MR::invalidateClipping(this); initNerve(&NrvRingBeam::RingBeamNrvSpread::sInstance); - + initPos(this); - JMath::gekko_ps_copy12(&mtx,this->getBaseMtx()); + JMath::gekko_ps_copy12(&mtx, this->getBaseMtx()); mtx.getZDir(_a8); mtx.getTrans(_c0); mtx.getTrans(_cc); - if(_9d){ - _a4 = new ModelObj("影モデル","JumpBeamerBeamShadow",nullptr,28,42,8,0); - _a4->initWithoutIter(); - _a4->mPosition.set(this->mPosition); - _a4->mRotation.set(this->mRotation); - _a4->mScale.set(this->mScale); - }else{ - _a0 = new RingBeamShadowDrawer(this); + if (_9d) { + _a4 = new ModelObj("影モデル", "JumpBeamerBeamShadow", nullptr, 28, 42, 8, 0); + _a4->initWithoutIter(); + _a4->mPosition.set(this->mPosition); + _a4->mRotation.set(this->mRotation); + _a4->mScale.set(this->mScale); + } else { + _a0 = new RingBeamShadowDrawer(this); } - mBloomModel = MR::createModelObjBloomModel("リングビームブルーム","JumpBeamerBeamBloom", getBaseMtx()); + mBloomModel = MR::createModelObjBloomModel("リングビームブルーム", "JumpBeamerBeamBloom", getBaseMtx()); MR::invalidateClipping(mBloomModel); makeActorDead(); } -void RingBeam::appear(){ +void RingBeam::appear() { LiveActor::appear(); mBloomModel->appear(); } -void RingBeam::kill(){ +void RingBeam::kill() { setNerve(&NrvRingBeam::RingBeamNrvSpread::sInstance); initPos(_8c); setRadius(0.0f); @@ -197,69 +197,66 @@ void RingBeam::kill(){ mBloomModel->kill(); } -void RingBeam::startBrk(const char * pchar){ - MR::startBrk(this,pchar); - if(_a4){ - MR::startBrk(_a4,pchar); +void RingBeam::startBrk(const char* pchar) { + MR::startBrk(this, pchar); + if (_a4) { + MR::startBrk(_a4, pchar); } } -void RingBeam::setRadius(f32 radius){ +void RingBeam::setRadius(f32 radius) { TVec3f Ydir; TVec3f temp2; TVec3f temp6; - - if (radius >= 2000.0f){ + + if (radius >= 2000.0f) { radius = 2000.0f; - } - if(_a0){ + } + if (_a0) { _a0->_20 = radius; } - getSensor("Beam")->mRadius = radius; - char * str = "Spread"; - MR::startBckNoInterpole(this,str); - MR::startBckNoInterpole(mBloomModel,str); - radius = (radius/2000.0f)*MR::getBckFrameMax(this); - MR::setBckFrameAndStop(this,radius); - MR::setBckFrameAndStop(mBloomModel,radius); - if(_a4){ + getSensor("Beam")->mRadius = radius; + char* str = "Spread"; + MR::startBckNoInterpole(this, str); + MR::startBckNoInterpole(mBloomModel, str); + radius = (radius / 2000.0f) * MR::getBckFrameMax(this); + MR::setBckFrameAndStop(this, radius); + MR::setBckFrameAndStop(mBloomModel, radius); + if (_a4) { Triangle triangle; - MR::extractMtxYDir(_8c->getBaseMtx(),&Ydir); + MR::extractMtxYDir(_8c->getBaseMtx(), &Ydir); Ydir.scale(1000.0f); TVec3f temp = _b4; temp.scale(500.0f); - MR::getFirstPolyOnLineToMap(&temp2,&triangle,_c0,temp); + MR::getFirstPolyOnLineToMap(&temp2, &triangle, _c0, temp); TVec3f temp3 = _b4; temp3.scale(10.0f); temp2 -= temp3; TVec3f temp4 = _8c->mPosition; - JMathInlineVEC::PSVECAdd(&temp4,&Ydir,&temp4); + JMathInlineVEC::PSVECAdd(&temp4, &Ydir, &temp4); TVec3f temp5 = _8c->mPosition; - temp5 -=Ydir; - MR::calcPerpendicFootToLine(&temp6,temp2,temp4,temp5); + temp5 -= Ydir; + MR::calcPerpendicFootToLine(&temp6, temp2, temp4, temp5); _a4->mPosition.set(temp6); - MR::startBckNoInterpole(_a4,str); + MR::startBckNoInterpole(_a4, str); TVec3f temp7 = temp2; temp7 -= temp6; f32 length = temp7.length(); - if(0.0f <= length && length < 2000.0f){ - MR::setBckFrameAndStop(_a4,(length/2000.0f)*MR::getBckFrameMax(_a4)); + if (0.0f <= length && length < 2000.0f) { + MR::setBckFrameAndStop(_a4, (length / 2000.0f) * MR::getBckFrameMax(_a4)); } } } - -void RingBeam::initPos(const LiveActor * actor){ +void RingBeam::initPos(const LiveActor* actor) { TRot3f actorBaseMtxCopy; TVec3f baseMtxYdir; - JMath::gekko_ps_copy12(&actorBaseMtxCopy,actor->getBaseMtx()); + JMath::gekko_ps_copy12(&actorBaseMtxCopy, actor->getBaseMtx()); actorBaseMtxCopy.getYDir(baseMtxYdir); - mPosition.set(actor->mPosition+ baseMtxYdir.scaleInline(75.0f)); + mPosition.set(actor->mPosition + baseMtxYdir.scaleInline(75.0f)); } - - -void RingBeam::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void RingBeam::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { TRot3f mtx; TVec3f temp; TVec3f temp2; @@ -273,7 +270,7 @@ void RingBeam::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { temp.set(x, y, z); MR::vecKillElement(sensordiff, temp, &temp2); temp2.setLength(pSender->mRadius); - + TVec3f temp3 = temp2; temp3 -= sensordiff; f32 length = temp3.length(); @@ -284,16 +281,13 @@ void RingBeam::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { } } - -bool RingBeam::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool RingBeam::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return false; } - - -// has a bunch of stack problems and wrong operators +// has a bunch of stack problems and wrong operators // due to TVec jank. -void RingBeam::exeSpread(){ +void RingBeam::exeSpread() { TPos3f mtx; TVec3f temp; TVec3f ec; @@ -302,82 +296,79 @@ void RingBeam::exeSpread(){ TVec3f temp13; TVec3f temp15; TVec3f temp3; - if(MR::isFirstStep(this)){ - if(!MR::isPowerStarGetDemoActive()){ - MR::startSound(this,"SE_EM_JUMPRING_APPEAR",-1,-1); + if (MR::isFirstStep(this)) { + if (!MR::isPowerStarGetDemoActive()) { + MR::startSound(this, "SE_EM_JUMPRING_APPEAR", -1, -1); } - char * str = "Spread"; - MR::startBckNoInterpole(this,str); - MR::startBckNoInterpole(mBloomModel,str); + char* str = "Spread"; + MR::startBckNoInterpole(this, str); + MR::startBckNoInterpole(mBloomModel, str); startBrk("Erase"); - MR::setBrkFrameAndStop(this,0.0f); - if(_a4){ - MR::setBrkFrameAndStop(_a4,0.0f); + MR::setBrkFrameAndStop(this, 0.0f); + if (_a4) { + MR::setBrkFrameAndStop(_a4, 0.0f); } - MR::extractMtxZDir(_8c->getBaseMtx(),&_a8); - MR::extractMtxYDir(_8c->getBaseMtx(),&temp); + MR::extractMtxZDir(_8c->getBaseMtx(), &_a8); + MR::extractMtxYDir(_8c->getBaseMtx(), &temp); TVec3f temp2 = temp; temp2.scale(75.0f); temp3 = _8c->mPosition; - JMathInlineVEC::PSVECAdd(&temp3, &temp2,&temp3); + JMathInlineVEC::PSVECAdd(&temp3, &temp2, &temp3); _c0.set(temp3); - MR::calcGravityVector(this,_c0,&_b4,nullptr,0); + MR::calcGravityVector(this, _c0, &_b4, nullptr, 0); } - if(_9c){ - MR::calcGravityVector(this,_c0 + _a8.scaleInline(mSpeed),&_b4,nullptr,0); + if (_9c) { + MR::calcGravityVector(this, _c0 + _a8.scaleInline(mSpeed), &_b4, nullptr, 0); TVec3f temp6 = -_b4; - MR::makeMtxUpFront(&mtx,temp6,_a8); + MR::makeMtxUpFront(&mtx, temp6, _a8); mtx.getZDir(_a8); - MR::extractMtxYDir(_8c->getBaseMtx(),&temp7); + MR::extractMtxYDir(_8c->getBaseMtx(), &temp7); TVec3f temp8(_8c->mPosition); - JMathInlineVEC::PSVECAdd(&temp8,&temp7,&temp8); + JMathInlineVEC::PSVECAdd(&temp8, &temp7, &temp8); TVec3f temp9(_8c->mPosition); temp9 -= temp7; - MR::calcPerpendicFootToLine(&ec,_c0,temp8,temp9); + MR::calcPerpendicFootToLine(&ec, _c0, temp8, temp9); TVec3f temp10(ec); mPosition = temp10; - }else{ + } else { ec = mPosition; } - JMathInlineVEC::PSVECAdd(&_c0,&(_a8.scaleInline(mSpeed)),&_c0); + JMathInlineVEC::PSVECAdd(&_c0, &(_a8.scaleInline(mSpeed)), &_c0); TVec3f temp11 = _c0; temp11 -= ec; setRadius(PSVECMag(&temp11)); - if(!MR::isPowerStarGetDemoActive()){ + if (!MR::isPowerStarGetDemoActive()) { temp12 = MR::getCamPos(); temp12 -= ec; - if(!MR::isNearZero(temp12,0.001f)){ + if (!MR::isNearZero(temp12, 0.001f)) { f32 radius; f32 dot; f32 float2; - MR::extractMtxYDir(_8c->getBaseMtx(),&temp13); + MR::extractMtxYDir(_8c->getBaseMtx(), &temp13); dot = temp12.dot(temp13); TVec3f temp14 = temp13.scaleInline(dot); temp15 = temp12; temp15 -= temp14; MR::normalizeOrZero(&temp15); MR::normalizeOrZero(&temp12); - float2 = 1.0f-__fabsf(temp13.dot(temp12)); + float2 = 1.0f - __fabsf(temp13.dot(temp12)); radius = getSensor("Beam")->mRadius; _cc = ec + temp15.scaleInline(radius).scaleInline(float2); - }else{ + } else { _cc = ec; } - MR::startLevelSound(this,"SE_EM_LV_RINGBEAM_MOVE",-1,-1,-1); - - } - if(MR::isStep(this,mLife - (s32)MR::getBrkFrameMax(this))){ + MR::startLevelSound(this, "SE_EM_LV_RINGBEAM_MOVE", -1, -1, -1); + } + if (MR::isStep(this, mLife - (s32)MR::getBrkFrameMax(this))) { startBrk("Erase"); - } - if(MR::isGreaterEqualStep(this,mLife)){ + } + if (MR::isGreaterEqualStep(this, mLife)) { kill(); - } + } } RingBeam::~RingBeam() { - } RingBeamShadowDrawer::~RingBeamShadowDrawer() { - } diff --git a/src/Game/Enemy/RingBeamer.cpp b/src/Game/Enemy/RingBeamer.cpp index 84ded8ae0..c00047797 100644 --- a/src/Game/Enemy/RingBeamer.cpp +++ b/src/Game/Enemy/RingBeamer.cpp @@ -3,25 +3,23 @@ //MR function that has not been defined elsewhere yet // -namespace MR{ - bool enableGroupAttack(LiveActor *, f32, f32); +namespace MR { + bool enableGroupAttack(LiveActor*, f32, f32); }; namespace NrvRingBeamer { NEW_NERVE(RingBeamerNrvWait, RingBeamer, Wait); NEW_NERVE(RingBeamerNrvAttack, RingBeamer, Attack); NEW_NERVE(RingBeamerNrvInter, RingBeamer, Inter); -}; +}; // namespace NrvRingBeamer -RingBeamer::RingBeamer(const char *pName) : - LiveActor(pName), - mBeams(nullptr) -{ - +RingBeamer::RingBeamer(const char* pName) + : LiveActor(pName), + mBeams(nullptr) { } -void RingBeamer::init(const JMapInfoIter &rIter){ - initModelManagerWithAnm("RingBeamer",nullptr,false); +void RingBeamer::init(const JMapInfoIter& rIter) { + initModelManagerWithAnm("RingBeamer", nullptr, false); MR::initDefaultPos(this, rIter); MR::connectToSceneEnemy(this); MR::initLightCtrl(this); @@ -34,22 +32,22 @@ void RingBeamer::init(const JMapInfoIter &rIter){ initNerve(&NrvRingBeamer::RingBeamerNrvWait::sInstance); makeActorAppeared(); MR::useStageSwitchReadA(this, rIter); - if(MR::useStageSwitchReadB(this, rIter)){ + if (MR::useStageSwitchReadB(this, rIter)) { MR::listenStageSwitchOffB(this, - MR::FunctorV0M(this, &RingBeamer::syncSwitchOffB)); + MR::FunctorV0M(this, &RingBeamer::syncSwitchOffB)); } MR::joinToGroupArray(this, rIter, nullptr, 32); // initializes to 5 long, but only uses 3? mBeams = new RingBeam*[5]; - for(int i = 0; i < 5; i++){ + for (int i = 0; i < 5; i++) { mBeams[i] = nullptr; } f32 arg0 = 20.0f; s32 arg1 = 100; - MR::getJMapInfoArg0NoInit(rIter,&arg0); - MR::getJMapInfoArg1NoInit(rIter,&arg1); - for(int i = 0; i < 3; i++){ - mBeams[i] = new RingBeam("リングビーム",this,false,false); + MR::getJMapInfoArg0NoInit(rIter, &arg0); + MR::getJMapInfoArg1NoInit(rIter, &arg1); + for (int i = 0; i < 3; i++) { + mBeams[i] = new RingBeam("リングビーム", this, false, false); mBeams[i]->init(rIter); mBeams[i]->setSpeed(arg0); mBeams[i]->setLife(arg1); @@ -59,7 +57,7 @@ void RingBeamer::init(const JMapInfoIter &rIter){ MR::calcAnimDirect(this); } -void RingBeamer::syncSwitchOffB(){ +void RingBeamer::syncSwitchOffB() { setNerve(&NrvRingBeamer::RingBeamerNrvInter::sInstance); for (int i = 0; i < 3; i++) { @@ -67,7 +65,7 @@ void RingBeamer::syncSwitchOffB(){ } } -void RingBeamer::exeWait(){ +void RingBeamer::exeWait() { if (MR::isFirstStep(this)) { MR::validateClipping(this); } @@ -77,8 +75,8 @@ void RingBeamer::exeWait(){ } } -void RingBeamer::exeAttack(){ - if (MR::isFirstStep(this)){ +void RingBeamer::exeAttack() { + if (MR::isFirstStep(this)) { MR::startBck(this, "Open", nullptr); } @@ -91,17 +89,16 @@ void RingBeamer::exeAttack(){ MR::startLevelSound(this, "SE_EM_LV_RINGBEAM_CHARGE", -1, -1, -1); } - if (getNerveStep() % 80 == 0){ + if (getNerveStep() % 80 == 0) { MR::emitEffect(this, "Charge"); } - if (getNerveStep() % 80 == 79){ + if (getNerveStep() % 80 == 79) { MR::deleteEffect(this, "Charge"); if (!MR::enableGroupAttack(this, 3200.0f, 500.0f)) { MR::sendMsgToGroupMember(ACTMES_GROUP_HIDE, this, getSensor("Body"), "Body"); - } - else if (mBeams[getNerveStep() / 80]) { + } else if (mBeams[getNerveStep() / 80]) { mBeams[getNerveStep() / 80]->appear(); } } @@ -109,7 +106,6 @@ void RingBeamer::exeAttack(){ void RingBeamer::exeInter() { if (MR::isFirstStep(this)) { - } if (MR::isGreaterEqualStep(this, 80)) { @@ -123,16 +119,15 @@ void RingBeamer::exeInter() { } } -void RingBeamer::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void RingBeamer::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayerOrRide(pReceiver) && MR::isSensorEnemyAttack(pSender)) { - MR::sendMsgEnemyAttackStrong(pReceiver,pSender); - } - else { - MR::sendMsgPush(pReceiver,pSender); + MR::sendMsgEnemyAttackStrong(pReceiver, pSender); + } else { + MR::sendMsgPush(pReceiver, pSender); } } -bool RingBeamer::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool RingBeamer::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (msg == ACTMES_GROUP_ATTACK) { MR::invalidateClipping(this); setNerve(&NrvRingBeamer::RingBeamerNrvAttack::sInstance); @@ -149,7 +144,7 @@ bool RingBeamer::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiv return false; } -bool RingBeamer::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool RingBeamer::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgJetTurtleAttack(msg)) { return true; } diff --git a/src/Game/Enemy/SearchBeamer.cpp b/src/Game/Enemy/SearchBeamer.cpp index e36b851f1..964d55cb3 100644 --- a/src/Game/Enemy/SearchBeamer.cpp +++ b/src/Game/Enemy/SearchBeamer.cpp @@ -17,7 +17,7 @@ namespace NrvSearchBeamer { NEW_NERVE(SearchBeamerNrvStopForPlayerOff, SearchBeamer, StopForPlayerOff); NEW_NERVE(SearchBeamerNrvRecover, SearchBeamer, Recover); NEW_NERVE_ONEND(SearchBeamerNrvDPDSwoon, SearchBeamer, DPDSwoon, DPDSwoon); -}; +}; // namespace NrvSearchBeamer void SearchBeamer::endDPDSwoon() { mBindStarPointer->kill(); diff --git a/src/Game/Enemy/SpinHitController.cpp b/src/Game/Enemy/SpinHitController.cpp index 4ad978129..504cd88d7 100644 --- a/src/Game/Enemy/SpinHitController.cpp +++ b/src/Game/Enemy/SpinHitController.cpp @@ -3,15 +3,15 @@ #include "Game/Util/LiveActorUtil.hpp" #include "Game/Util/ObjUtil.hpp" -SpinHitController::SpinHitController(const NameObj *pObj, s32 a1, bool a2) { +SpinHitController::SpinHitController(const NameObj* pObj, s32 a1, bool a2) { setParameter(pObj, 15, 10, 3, 0.0f, 40.0f, 20.0f, a1, a2); } -SpinHitController::SpinHitController(const NameObj *pObj, s32 a2, s32 a3, s32 a4, f32 a5, f32 a6, f32 a7, s32 a8, bool a9) { +SpinHitController::SpinHitController(const NameObj* pObj, s32 a2, s32 a3, s32 a4, f32 a5, f32 a6, f32 a7, s32 a8, bool a9) { setParameter(pObj, a2, a3, a4, a5, a6, a7, a8, a9); } -void SpinHitController::setParameter(const NameObj *pObj, s32 a2, s32 a3, s32 a4, f32 a5, f32 a6, f32 a7, s32 a8, bool a9) { +void SpinHitController::setParameter(const NameObj* pObj, s32 a2, s32 a3, s32 a4, f32 a5, f32 a6, f32 a7, s32 a8, bool a9) { _0 = a2; _4 = a3; _8 = a4; @@ -22,13 +22,13 @@ void SpinHitController::setParameter(const NameObj *pObj, s32 a2, s32 a3, s32 a4 _1C = a8; } -void SpinHitController::start(LiveActor *pActor, const TVec3f &a2, const TVec3f &a3) { +void SpinHitController::start(LiveActor* pActor, const TVec3f& a2, const TVec3f& a3) { TVec3f v9(a3); v9 -= a2; MR::vecKillElement(v9, pActor->mGravity, &v9); MR::normalizeOrZero(&v9); v9 *= _10; - f32 val = _14; + f32 val = _14; TVec3f v8(pActor->mGravity); v8 *= val; v9 -= v8; @@ -38,21 +38,21 @@ void SpinHitController::start(LiveActor *pActor, const TVec3f &a2, const TVec3f _18 = true; } -void SpinHitController::startWithoutStopScene(LiveActor *pActor, const TVec3f &a2, const TVec3f &a3) { +void SpinHitController::startWithoutStopScene(LiveActor* pActor, const TVec3f& a2, const TVec3f& a3) { start(pActor, a2, a3); _18 = false; } -bool SpinHitController::execute(LiveActor *pActor) { +bool SpinHitController::execute(LiveActor* pActor) { if (MR::isFirstStep(pActor)) { MR::invalidateClipping(pActor); - + if (_18) { MR::stopSceneForDefaultHit(_8); } } - f32 val = _C; + f32 val = _C; TVec3f v12(pActor->mGravity); v12 *= val; JMathInlineVEC::PSVECAdd(&pActor->mVelocity, &v12, &pActor->mVelocity); @@ -67,25 +67,24 @@ bool SpinHitController::execute(LiveActor *pActor) { if (MR::isLessStep(pActor, _4)) { emitItem(pActor); } - + return true; } return false; } -void SpinHitController::emitItem(LiveActor *pActor) { +void SpinHitController::emitItem(LiveActor* pActor) { if (_1C != 0) { - if (_19) { + if (_19) { MR::appearCoinPop(pActor, pActor->mPosition, _1C); - } - else { + } else { MR::appearStarPiece(pActor, pActor->mPosition, _1C, 10.0f, 40.0f, false); if (pActor->mSoundObject != nullptr) { MR::startSound(pActor, "SE_OJ_STAR_PIECE_BURST", -1, -1); } } - + _1C = 0; } } diff --git a/src/Game/Enemy/TerritoryMover.cpp b/src/Game/Enemy/TerritoryMover.cpp index ce7c6c2c7..bb3b3e589 100644 --- a/src/Game/Enemy/TerritoryMover.cpp +++ b/src/Game/Enemy/TerritoryMover.cpp @@ -7,12 +7,12 @@ TerritoryMover::TerritoryMover(f32 a1) { } /* not even close but will look at it later */ -void TerritoryMover::decideNextTargetPos(const LiveActor *pActor) { +void TerritoryMover::decideNextTargetPos(const LiveActor* pActor) { TVec3f v11; MR::getRandomVector(&v11, 1.0f); MR::normalizeOrZero(&v11); const TVec3f* gravPtr = &pActor->mGravity; - f32 dot = gravPtr->dot(v11); + f32 dot = gravPtr->dot(v11); JMAVECScaleAdd(gravPtr, &v11, &v11, -dot); f32 x = v11.x * _0; f32 y = v11.y * _0; diff --git a/src/Game/Enemy/WalkerStateBindStarPointer.cpp b/src/Game/Enemy/WalkerStateBindStarPointer.cpp index 9e6ec5106..f5f976fe8 100644 --- a/src/Game/Enemy/WalkerStateBindStarPointer.cpp +++ b/src/Game/Enemy/WalkerStateBindStarPointer.cpp @@ -5,13 +5,12 @@ namespace NrvWalkerStateBindStarPointer { NEW_NERVE(WalkerStateBindStarPointerNrvBind, WalkerStateBindStarPointer, Bind); }; -WalkerStateBindStarPointer::WalkerStateBindStarPointer(LiveActor *pActor, AnimScaleController *pController) : - ActorStateBase("歩行型スターポインタ拘束"), - mHostActor(pActor), - mScaleController(pController), - mUpdateCounter(0), - mHasEffect(false) -{ +WalkerStateBindStarPointer::WalkerStateBindStarPointer(LiveActor* pActor, AnimScaleController* pController) + : ActorStateBase("歩行型スターポインタ拘束"), + mHostActor(pActor), + mScaleController(pController), + mUpdateCounter(0), + mHasEffect(false) { initNerve(&NrvWalkerStateBindStarPointer::WalkerStateBindStarPointerNrvBind::sInstance); if (!MR::isRegisteredEffect(pActor, "Touch")) { @@ -61,8 +60,7 @@ void WalkerStateBindStarPointer::exeBind() { MR::zeroVelocity(mHostActor); if (MR::isStarPointerPointing2POnPressButton(mHostActor, "弱", true, false)) { mUpdateCounter = 0; - } - else { + } else { mUpdateCounter++; } @@ -72,5 +70,4 @@ void WalkerStateBindStarPointer::exeBind() { } WalkerStateBindStarPointer::~WalkerStateBindStarPointer() { - } diff --git a/src/Game/Enemy/WalkerStateBlowDamage.cpp b/src/Game/Enemy/WalkerStateBlowDamage.cpp index 8846a957b..b40022389 100644 --- a/src/Game/Enemy/WalkerStateBlowDamage.cpp +++ b/src/Game/Enemy/WalkerStateBlowDamage.cpp @@ -7,9 +7,10 @@ namespace NrvWalkerStateBlowDamage { NEW_NERVE(WalkerStateBlowDamageNrvBlow, WalkerStateBlowDamage, Blow); NEW_NERVE(WalkerStateBlowDamageNrvBlowLand, WalkerStateBlowDamage, BlowLand); -} +} // namespace NrvWalkerStateBlowDamage -WalkerStateBlowDamage::WalkerStateBlowDamage(LiveActor* pActor, TVec3f* pVec, WalkerStateBlowDamageParam* pBlowDamageParam) : ActorStateBase("吹き飛びダメージ状態") { +WalkerStateBlowDamage::WalkerStateBlowDamage(LiveActor* pActor, TVec3f* pVec, WalkerStateBlowDamageParam* pBlowDamageParam) + : ActorStateBase("吹き飛びダメージ状態") { initNerve(&NrvWalkerStateBlowDamage::WalkerStateBlowDamageNrvBlow::sInstance); } WalkerStateBlowDamage::~WalkerStateBlowDamage() {} @@ -28,8 +29,8 @@ void WalkerStateBlowDamage::exeBlow() { TVec3f mVelocityNegate; JMathInlineVEC::PSVECNegate(&mParentActor->mVelocity, &mVelocityNegate); - MR::turnDirectionDegree(this->mParentActor, this->_10, mVelocityNegate, 15.0f); - + MR::turnDirectionDegree(this->mParentActor, this->_10, mVelocityNegate, 15.0f); + if (MR::isGreaterStep(this, 5)) { if (MR::isBindedGround(this->mParentActor)) { MR::startAction(this->mParentActor, "DamageLand"); @@ -38,7 +39,7 @@ void WalkerStateBlowDamage::exeBlow() { } } } - + inline void WalkerStateBlowDamage::exeBlowLand() { if (MR::isGreaterStep(this, 30)) { kill(); diff --git a/src/Game/Enemy/WalkerStateChase.cpp b/src/Game/Enemy/WalkerStateChase.cpp index e2dc9a6af..c5d2e4dac 100644 --- a/src/Game/Enemy/WalkerStateChase.cpp +++ b/src/Game/Enemy/WalkerStateChase.cpp @@ -15,16 +15,17 @@ namespace { namespace NrvWalkerStateChase { NEW_NERVE(WalkerStateChaseNrvStart, WalkerStateChase, Start); NEW_NERVE(WalkerStateChaseNrvEnd, WalkerStateChase, End); -}; +}; // namespace NrvWalkerStateChase -WalkerStateChase::WalkerStateChase(LiveActor *pActor, TVec3f *pVec, WalkerStateParam *pParam, WalkerStateChaseParam *pChaseParam) : ActorStateBase("クリボー追いかけ状態") { +WalkerStateChase::WalkerStateChase(LiveActor* pActor, TVec3f* pVec, WalkerStateParam* pParam, WalkerStateChaseParam* pChaseParam) + : ActorStateBase("クリボー追いかけ状態") { mParentActor = pActor; mStateParam = pParam; mChaseParam = pChaseParam; _18 = pVec; - + if (pChaseParam == nullptr) { - mChaseParam = &sDefaultParam; + mChaseParam = &sDefaultParam; } initNerve(&NrvWalkerStateChase::WalkerStateChaseNrvStart::sInstance); @@ -52,8 +53,7 @@ void WalkerStateChase::exeStart() { if (MR::isFallNextMove(mParentActor, 150.0f, 150.0f, 150.0f, nullptr)) { MR::zeroVelocity(mParentActor); setNerve(&NrvWalkerStateChase::WalkerStateChaseNrvEnd::sInstance); - } - else if (MR::isGreaterStep(this, mChaseParam->_8) || (MR::isGreaterStep(this, mChaseParam->_4) && !isInSight)) { + } else if (MR::isGreaterStep(this, mChaseParam->_8) || (MR::isGreaterStep(this, mChaseParam->_4) && !isInSight)) { setNerve(&NrvWalkerStateChase::WalkerStateChaseNrvEnd::sInstance); } } @@ -81,5 +81,4 @@ bool WalkerStateChase::isRunning() const { } WalkerStateChase::~WalkerStateChase() { - } diff --git a/src/Game/Enemy/WalkerStateFunction.cpp b/src/Game/Enemy/WalkerStateFunction.cpp index f1dfe75eb..5ff5e8a3f 100644 --- a/src/Game/Enemy/WalkerStateFunction.cpp +++ b/src/Game/Enemy/WalkerStateFunction.cpp @@ -14,8 +14,7 @@ void WalkerStateFunction::calcPassiveMovement(LiveActor* pActor, const WalkerSta if (!MR::isOnGround(pActor)) { MR::addVelocityToGravity(pActor, pParam->_0); MR::attenuateVelocity(pActor, pParam->_4); - } - else { + } else { MR::attenuateVelocity(pActor, pParam->_8); } } diff --git a/src/Game/GameAudio/AudEffectDirector.cpp b/src/Game/GameAudio/AudEffectDirector.cpp index f6dbf75ff..fbf3560f2 100644 --- a/src/Game/GameAudio/AudEffectDirector.cpp +++ b/src/Game/GameAudio/AudEffectDirector.cpp @@ -20,17 +20,17 @@ namespace { }; } -AudEffectDirector::AudEffectDirector() : NameObj("オーディオエフェクトディレクター") { +AudEffectDirector::AudEffectDirector() + : NameObj("オーディオエフェクトディレクター") { _C = 0; _10 = 0; _14 = 0; } AudEffectDirector::~AudEffectDirector() { - } -void AudEffectDirector::init(const JMapInfoIter &rIter) { +void AudEffectDirector::init(const JMapInfoIter& rIter) { MR::connectToScene(this, 24, -1, -1, -1); } @@ -47,7 +47,7 @@ void AudEffectDirector::movement() { void AudEffectDirector::setEffectType(s32 a1, s32 a2) { if (a2 < 0) a2 = 0; - + if (a2 > 0x7f) a2 = 0x7f; @@ -55,27 +55,32 @@ void AudEffectDirector::setEffectType(s32 a1, s32 a2) { _C = a1; _14 = a2; } -} +} void AudEffectDirector::setAudioEffectParam(s32 a1) { - AudEffector *pAudEffector = AudWrap::getSystem()->getAudEffector(); + AudEffector* pAudEffector = AudWrap::getSystem()->getAudEffector(); pAudEffector->setFxSend(::cAudEffectDataList[a1].fxSend); pAudEffector->setCutoff(::cAudEffectDataList[a1].cutoff); - if (!MR::isStageStateScenarioOpeningCamera()) + if (!MR::isStageStateScenarioOpeningCamera()) MR::moveVolumeStageBGM(::cAudEffectDataList[a1].volume, ::cAudEffectDataList[a1]._C); switch (a1) { - case 1: return pAudEffector->setSpecialFx(1); - case 3: return pAudEffector->setSpecialFx(2); - default: return pAudEffector->setSpecialFx(0); + case 1: + return pAudEffector->setSpecialFx(1); + case 3: + return pAudEffector->setSpecialFx(2); + default: + return pAudEffector->setSpecialFx(0); } } void AudEffectDirector::playEffectSound(s32 a1) { switch (a1) { - case 3: return MR::startAtmosphereLevelSE("SE_AT_LV_WATERFALL_CAVE", -1, -1); - case 4: return MR::startAtmosphereLevelSE("SE_AT_LV_PHNCV_TERESA_ROOM", -1, -1); + case 3: + return MR::startAtmosphereLevelSE("SE_AT_LV_WATERFALL_CAVE", -1, -1); + case 4: + return MR::startAtmosphereLevelSE("SE_AT_LV_PHNCV_TERESA_ROOM", -1, -1); } } diff --git a/src/Game/Gravity/ConeGravity.cpp b/src/Game/Gravity/ConeGravity.cpp index d805e9143..bbb7977ba 100644 --- a/src/Game/Gravity/ConeGravity.cpp +++ b/src/Game/Gravity/ConeGravity.cpp @@ -1,107 +1,105 @@ #include "Game/Gravity.hpp" -ConeGravity::ConeGravity() : PlanetGravity() { - mValidDegree = 360.0f; - mValidCos = -1.0f; - mWorldRadius = 0.0f; - mEnableBottom = true; - mTopCutRate = 0.0f; - mLocalMtx.identity(); - mWorldMtx.identity(); +ConeGravity::ConeGravity() + : PlanetGravity() { + mValidDegree = 360.0f; + mValidCos = -1.0f; + mWorldRadius = 0.0f; + mEnableBottom = true; + mTopCutRate = 0.0f; + mLocalMtx.identity(); + mWorldMtx.identity(); } -void ConeGravity::setLocalMatrix(const TPos3f &rMtx) { - mLocalMtx.setInline(rMtx); - updateIdentityMtx(); +void ConeGravity::setLocalMatrix(const TPos3f& rMtx) { + mLocalMtx.setInline(rMtx); + updateIdentityMtx(); } void ConeGravity::setEnableBottom(bool val) { - mEnableBottom = val; + mEnableBottom = val; } void ConeGravity::setTopCutRate(f32 val) { - mTopCutRate = val < 0.0f ? 0.0f : val > 1.0f ? 1.0f : val; + mTopCutRate = val < 0.0f ? 0.0f : val > 1.0f ? 1.0f : val; } -inline f32 absfInline(f32 &orig, f32 v) { +inline f32 absfInline(f32& orig, f32 v) { orig = v; return __fabsf(v); } -bool ConeGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f &rPos) const { - +bool ConeGravity::calcOwnGravityVector(TVec3f* pDest, f32* pScalar, const TVec3f& rPos) const { + TVec3f worldBaseCenter, worldCentralAxis; mWorldMtx.getYDir(worldCentralAxis); mWorldMtx.getTransInline(worldBaseCenter); - + TVec3f unitWorldCentralAxis; - f32 centralAxisLength; + f32 centralAxisLength; MR::separateScalarAndDirection(¢ralAxisLength, &unitWorldCentralAxis, worldCentralAxis); TVec3f relativePosition = rPos - worldBaseCenter; TVec3f positionOnBasePlane; positionOnBasePlane.rejection(relativePosition, unitWorldCentralAxis); - if(MR::isNearZero(positionOnBasePlane, 0.00100000005f)) { - + if (MR::isNearZero(positionOnBasePlane, 0.00100000005f)) { + f32 positionOnCentralAxis; f32 distance = absfInline(positionOnCentralAxis, relativePosition.dot(unitWorldCentralAxis)); - if(positionOnCentralAxis > 0.0f) { + if (positionOnCentralAxis > 0.0f) { f32 height = centralAxisLength * (1.0f - mTopCutRate); distance -= height; - if(distance < 0.0f) { + if (distance < 0.0f) { distance = 0.0f; } - } - - if(!isInRangeDistance(distance)) { + + if (!isInRangeDistance(distance)) { return false; } - if(positionOnCentralAxis > 0.0f) { + if (positionOnCentralAxis > 0.0f) { pDest->set(-unitWorldCentralAxis); - } - else { + } else { pDest->set(unitWorldCentralAxis); } *pScalar = distance; return true; } - + f32 distanceToCentralAxis = PSVECMag(&positionOnBasePlane); f32 centralAxisY = unitWorldCentralAxis.dot(relativePosition); bool isInsideCone = false; - - if(MR::isNearZero(centralAxisLength, 0.00100000005f) || MR::isNearZero(mWorldRadius, 0.00100000005f)) { + + if (MR::isNearZero(centralAxisLength, 0.00100000005f) || MR::isNearZero(mWorldRadius, 0.00100000005f)) { // The cone is too small to have an inner region isInsideCone = false; - } - else if(distanceToCentralAxis < mWorldRadius - centralAxisY * (mWorldRadius / centralAxisLength)) { + } else if (distanceToCentralAxis < mWorldRadius - centralAxisY * (mWorldRadius / centralAxisLength)) { isInsideCone = true; } TVec3f pointOfAttraction; - + TVec3f dirOnDirectrix = worldBaseCenter + positionOnBasePlane * (mWorldRadius / distanceToCentralAxis); TVec3f apex = worldBaseCenter + worldCentralAxis; - if(relativePosition.dot(worldCentralAxis) < 0.0f) { + if (relativePosition.dot(worldCentralAxis) < 0.0f) { - if(!mEnableBottom) { + if (!mEnableBottom) { return false; } MR::calcPerpendicFootToLineInside(&pointOfAttraction, rPos, worldBaseCenter, dirOnDirectrix); - if(MR::isNearZero(pointOfAttraction - rPos, 0.00100000005f)) { + if (MR::isNearZero(pointOfAttraction - rPos, 0.00100000005f)) { *pDest = -unitWorldCentralAxis; *pScalar = 0.0f; @@ -112,14 +110,11 @@ bool ConeGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f else { return calcGravityFromMassPosition(pDest, pScalar, rPos, pointOfAttraction); } - } - - if(mTopCutRate < 0.00999999978f) { + if (mTopCutRate < 0.00999999978f) { MR::calcPerpendicFootToLineInside(&pointOfAttraction, rPos, dirOnDirectrix, apex); - } - else { + } else { TVec3f generatrixTermination; generatrixTermination.set(apex * (1.0f - mTopCutRate) + dirOnDirectrix * mTopCutRate); @@ -127,21 +122,20 @@ bool ConeGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f TVec3f frustumBaseCenter; frustumBaseCenter.set(worldBaseCenter + worldCentralAxis * (1.0f - mTopCutRate)); - if((rPos - generatrixTermination).dot(generatrixTermination - frustumBaseCenter) <= 0.0f) { + if ((rPos - generatrixTermination).dot(generatrixTermination - frustumBaseCenter) <= 0.0f) { // Attracted to the frustum f32 distanceToCentralAxis = unitWorldCentralAxis.dot(rPos - frustumBaseCenter); - if(distanceToCentralAxis < 0.0f) { + if (distanceToCentralAxis < 0.0f) { distanceToCentralAxis = 0.0f; } - if(isInRangeDistance(distanceToCentralAxis)) { + if (isInRangeDistance(distanceToCentralAxis)) { *pDest = -unitWorldCentralAxis; *pScalar = distanceToCentralAxis; return true; - } - else { + } else { return false; } } @@ -149,8 +143,7 @@ bool ConeGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f MR::calcPerpendicFootToLineInside(&pointOfAttraction, rPos, dirOnDirectrix, generatrixTermination); } - - if(MR::isNearZero(pointOfAttraction - rPos, 0.00100000005f)) { + if (MR::isNearZero(pointOfAttraction - rPos, 0.00100000005f)) { TVec3f generatrixDirection = apex - dirOnDirectrix; MR::normalizeOrZero(&generatrixDirection); @@ -158,10 +151,9 @@ bool ConeGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f TVec3f gravity; gravity.rejection((-positionOnBasePlane), generatrixDirection); - if(MR::isNearZero(gravity, 0.00100000005f)) { + if (MR::isNearZero(gravity, 0.00100000005f)) { *pDest = -unitWorldCentralAxis; - } - else { + } else { MR::normalize(gravity, pDest); } *pScalar = 0.0f; @@ -169,25 +161,24 @@ bool ConeGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f return true; } - if(isInsideCone) { + if (isInsideCone) { MR::normalize(rPos - pointOfAttraction, pDest); *pScalar = 0.0f; return true; } - + return calcGravityFromMassPosition(pDest, pScalar, rPos, pointOfAttraction); } +void ConeGravity::updateMtx(const TPos3f& rMtx) { + mWorldMtx.concat(rMtx, mLocalMtx); -void ConeGravity::updateMtx(const TPos3f &rMtx) { - mWorldMtx.concat(rMtx, mLocalMtx); + TVec3f sideVec; + mWorldMtx.getXDirInline(sideVec); + mWorldRadius = PSVECMag(&sideVec); - TVec3f sideVec; - mWorldMtx.getXDirInline(sideVec); - mWorldRadius = PSVECMag(&sideVec); - - TVec3f axis; // unused - mWorldMtx.getYDir(axis); + TVec3f axis; // unused + mWorldMtx.getYDir(axis); // The developers could have left this in because there originally was a height member // that they would set to ||axis|| * (1.0f - mTopCutRate) } diff --git a/src/Game/Gravity/CubeGravity.cpp b/src/Game/Gravity/CubeGravity.cpp index 64c21936e..43cc16769 100644 --- a/src/Game/Gravity/CubeGravity.cpp +++ b/src/Game/Gravity/CubeGravity.cpp @@ -34,8 +34,8 @@ #define ENCODE_CORNER(signumx, signumy, signumz) \ ((signumx + 1) + (signumy + 1) * 3 + (signumz + 1) * 9) -CubeGravity::CubeGravity() : PlanetGravity() -{ +CubeGravity::CubeGravity() + : PlanetGravity() { lenX = 1.0; lenY = 1.0; @@ -46,15 +46,13 @@ CubeGravity::CubeGravity() : PlanetGravity() mPosition.identity(); } -void CubeGravity::setCube(const TPos3f &rCube) -{ +void CubeGravity::setCube(const TPos3f& rCube) { mCube = rCube; updateIdentityMtx(); } -void CubeGravity::updateMtx(const TPos3f &rMtx) -{ +void CubeGravity::updateMtx(const TPos3f& rMtx) { mPosition.concat(rMtx, mCube); TVec3f dir; mPosition.getXDir(dir); @@ -65,14 +63,13 @@ void CubeGravity::updateMtx(const TPos3f &rMtx) lenZ = PSVECMag(&dir); } -bool CubeGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f &rPosition) const -{ +bool CubeGravity::calcOwnGravityVector(TVec3f* pDest, f32* pScalar, const TVec3f& rPosition) const { int area = calcGravityArea(rPosition); if (area < 0) { return false; } TVec3f gravityForce; - f32 scalar; + f32 scalar; if (!calcFaceGravity(rPosition, area, &gravityForce, &scalar) && !calcEdgeGravity(rPosition, area, &gravityForce, &scalar) && !calcCornerGravity(rPosition, area, &gravityForce, &scalar)) { return false; } @@ -91,28 +88,25 @@ bool CubeGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f return true; } -int CubeGravity::calcGravityArea(const TVec3f &rPosition) const -{ +int CubeGravity::calcGravityArea(const TVec3f& rPosition) const { TVec3f dirX, dirY, dirZ, trans; mPosition.getXDir(dirX); mPosition.getYDir(dirY); mPosition.getZDir(dirZ); mPosition.getTrans(trans); TVec3f relativePosition = rPosition - trans; - int area; // Region of the cube - f32 xDirDistance = relativePosition.dot(dirX) / lenX, yDirDistance = relativePosition.dot(dirY) / lenY, zDirDistance = relativePosition.dot(dirZ) / lenZ; + int area; // Region of the cube + f32 xDirDistance = relativePosition.dot(dirX) / lenX, yDirDistance = relativePosition.dot(dirY) / lenY, zDirDistance = relativePosition.dot(dirZ) / lenZ; if (xDirDistance < -lenX) { if ((mActiveFaces & 2) != 2) { return -1; } area = REGION_NEGATIVE_X; - } - else { + } else { if (xDirDistance <= lenX) { area = REGION_BETWEEN_X; - } - else { + } else { if ((mActiveFaces & 1) != 1) { return -1; } @@ -125,12 +119,10 @@ int CubeGravity::calcGravityArea(const TVec3f &rPosition) const return -1; } area += REGION_NEGATIVE_Y; - } - else { + } else { if (yDirDistance <= lenY) { area += REGION_BETWEEN_Y; - } - else { + } else { if ((mActiveFaces & 4) != 4) { return -1; } @@ -143,12 +135,10 @@ int CubeGravity::calcGravityArea(const TVec3f &rPosition) const return -1; } area += REGION_NEGATIVE_Z; - } - else { + } else { if (zDirDistance <= lenZ) { area += REGION_BETWEEN_Z; - } - else { + } else { if ((mActiveFaces & 16) != 16) { return -1; } @@ -159,43 +149,42 @@ int CubeGravity::calcGravityArea(const TVec3f &rPosition) const return area; } -bool CubeGravity::calcFaceGravity(const TVec3f &rPosition, s32 area, TVec3f *pDest, f32 *pScalar) const -{ - TVec3f antiFaceDir; // Negative of the normal vector of the face an object is on +bool CubeGravity::calcFaceGravity(const TVec3f& rPosition, s32 area, TVec3f* pDest, f32* pScalar) const { + TVec3f antiFaceDir; // Negative of the normal vector of the face an object is on switch (area) { - - case REGION_Z_FACE_NEGATIVE: - mPosition.getZDir(antiFaceDir); - break; - case REGION_Y_FACE_NEGATIVE: - mPosition.getYDir(antiFaceDir); - break; + case REGION_Z_FACE_NEGATIVE: + mPosition.getZDir(antiFaceDir); + break; - case REGION_X_FACE_NEGATIVE: - mPosition.getXDir(antiFaceDir); - break; + case REGION_Y_FACE_NEGATIVE: + mPosition.getYDir(antiFaceDir); + break; - case REGION_X_FACE_POSITIVE: - mPosition.getXDir(antiFaceDir); - JGeometry::negateInternal(&antiFaceDir.x, &antiFaceDir.x); - break; + case REGION_X_FACE_NEGATIVE: + mPosition.getXDir(antiFaceDir); + break; - case REGION_Y_FACE_POSITIVE: - mPosition.getYDir(antiFaceDir); - JGeometry::negateInternal(&antiFaceDir.x, &antiFaceDir.x); - break; + case REGION_X_FACE_POSITIVE: + mPosition.getXDir(antiFaceDir); + JGeometry::negateInternal(&antiFaceDir.x, &antiFaceDir.x); + break; - case REGION_Z_FACE_POSITIVE: - mPosition.getZDir(antiFaceDir); - JGeometry::negateInternal(&antiFaceDir.x, &antiFaceDir.x); - break; + case REGION_Y_FACE_POSITIVE: + mPosition.getYDir(antiFaceDir); + JGeometry::negateInternal(&antiFaceDir.x, &antiFaceDir.x); + break; - default: - return false; + case REGION_Z_FACE_POSITIVE: + mPosition.getZDir(antiFaceDir); + JGeometry::negateInternal(&antiFaceDir.x, &antiFaceDir.x); + break; + + default: + return false; } TVec3f trans; - f32 length; + f32 length; mPosition.getTrans(trans); MR::separateScalarAndDirection(&length, &antiFaceDir, antiFaceDir); f32 height = antiFaceDir.dot(trans - rPosition) - length; @@ -207,95 +196,91 @@ bool CubeGravity::calcFaceGravity(const TVec3f &rPosition, s32 area, TVec3f *pDe return true; } -TVec3f negate(const TVec3f &in) -{ +TVec3f negate(const TVec3f& in) { TVec3f tmp; JGeometry::negateInternal(&in.x, &tmp.x); return tmp; } -bool CubeGravity::calcEdgeGravity(const TVec3f &rPosition, s32 area, TVec3f *pDest, f32 *pScalar) const -{ +bool CubeGravity::calcEdgeGravity(const TVec3f& rPosition, s32 area, TVec3f* pDest, f32* pScalar) const { // There is a mistake here: so long as area is not both even and negative, the function will not // return here. The intent is that area should be neither even nor negative, since all edges // are odd and positive. However, this mistake does not really matter since the switch will // return if this does not. - if (!(((area & 1) ^ ((area & 0x80000000) >> 31)) - ((area & 0x80000000) >> 31)) - || area == ENCODE_REGION(REGION_BETWEEN_X, REGION_BETWEEN_Y, REGION_BETWEEN_Z)) { + if (!(((area & 1) ^ ((area & 0x80000000) >> 31)) - ((area & 0x80000000) >> 31)) || area == ENCODE_REGION(REGION_BETWEEN_X, REGION_BETWEEN_Y, REGION_BETWEEN_Z)) { return false; } - + TVec3f edgeVector, edgeTranslation, xDir, yDir, zDir, trans, positionOppositeInOrthogonalPlane; - + mPosition.getXDir(xDir); mPosition.getYDir(yDir); mPosition.getZDir(zDir); switch (area) { - case ENCODE_EDGE(AXIS_X, REGION_NEGATIVE_Y, REGION_NEGATIVE_Z): - edgeVector = xDir; - edgeTranslation = negate(yDir) - zDir; - break; + case ENCODE_EDGE(AXIS_X, REGION_NEGATIVE_Y, REGION_NEGATIVE_Z): + edgeVector = xDir; + edgeTranslation = negate(yDir) - zDir; + break; - case ENCODE_EDGE(AXIS_Y, REGION_NEGATIVE_X, REGION_NEGATIVE_Z): - edgeVector = yDir; - edgeTranslation = negate(xDir) - zDir; - break; + case ENCODE_EDGE(AXIS_Y, REGION_NEGATIVE_X, REGION_NEGATIVE_Z): + edgeVector = yDir; + edgeTranslation = negate(xDir) - zDir; + break; - case ENCODE_EDGE(AXIS_Y, REGION_POSITIVE_X, REGION_NEGATIVE_Z): - edgeVector = yDir; - edgeTranslation = xDir - zDir; - break; + case ENCODE_EDGE(AXIS_Y, REGION_POSITIVE_X, REGION_NEGATIVE_Z): + edgeVector = yDir; + edgeTranslation = xDir - zDir; + break; - case ENCODE_EDGE(AXIS_X, REGION_POSITIVE_Y, REGION_NEGATIVE_Z): - edgeVector = xDir; - edgeTranslation = yDir - zDir; - break; + case ENCODE_EDGE(AXIS_X, REGION_POSITIVE_Y, REGION_NEGATIVE_Z): + edgeVector = xDir; + edgeTranslation = yDir - zDir; + break; - case ENCODE_EDGE(AXIS_Z, REGION_NEGATIVE_X, REGION_NEGATIVE_Y): - edgeVector = zDir; - edgeTranslation = negate(xDir) - yDir; - break; + case ENCODE_EDGE(AXIS_Z, REGION_NEGATIVE_X, REGION_NEGATIVE_Y): + edgeVector = zDir; + edgeTranslation = negate(xDir) - yDir; + break; - case ENCODE_EDGE(AXIS_Z, REGION_POSITIVE_X, REGION_NEGATIVE_Y): - edgeVector = zDir; - edgeTranslation = xDir - yDir; - break; + case ENCODE_EDGE(AXIS_Z, REGION_POSITIVE_X, REGION_NEGATIVE_Y): + edgeVector = zDir; + edgeTranslation = xDir - yDir; + break; - case ENCODE_EDGE(AXIS_Z, REGION_NEGATIVE_X, REGION_POSITIVE_Y): - edgeVector = zDir; - edgeTranslation = negate(xDir).translate(yDir); - break; + case ENCODE_EDGE(AXIS_Z, REGION_NEGATIVE_X, REGION_POSITIVE_Y): + edgeVector = zDir; + edgeTranslation = negate(xDir).translate(yDir); + break; - case ENCODE_EDGE(AXIS_Z, REGION_POSITIVE_X, REGION_POSITIVE_Y): - edgeVector = zDir; - edgeTranslation = xDir.translate(yDir); - break; + case ENCODE_EDGE(AXIS_Z, REGION_POSITIVE_X, REGION_POSITIVE_Y): + edgeVector = zDir; + edgeTranslation = xDir.translate(yDir); + break; - case ENCODE_EDGE(AXIS_X, REGION_NEGATIVE_Y, REGION_POSITIVE_Z): - edgeVector = xDir; - edgeTranslation = negate(yDir).translate(zDir); - break; + case ENCODE_EDGE(AXIS_X, REGION_NEGATIVE_Y, REGION_POSITIVE_Z): + edgeVector = xDir; + edgeTranslation = negate(yDir).translate(zDir); + break; - case ENCODE_EDGE(AXIS_Y, REGION_NEGATIVE_X, REGION_POSITIVE_Z): - edgeVector = yDir; - edgeTranslation = negate(xDir).translate(zDir); - break; + case ENCODE_EDGE(AXIS_Y, REGION_NEGATIVE_X, REGION_POSITIVE_Z): + edgeVector = yDir; + edgeTranslation = negate(xDir).translate(zDir); + break; - case ENCODE_EDGE(AXIS_Y, REGION_POSITIVE_X, REGION_POSITIVE_Z): - edgeVector = yDir; - edgeTranslation = xDir.translate(zDir); - break; + case ENCODE_EDGE(AXIS_Y, REGION_POSITIVE_X, REGION_POSITIVE_Z): + edgeVector = yDir; + edgeTranslation = xDir.translate(zDir); + break; - case ENCODE_EDGE(AXIS_X, REGION_POSITIVE_Y, REGION_POSITIVE_Z): - edgeVector = xDir; - edgeTranslation = yDir.translate(zDir); - break; - - default: - return false; + case ENCODE_EDGE(AXIS_X, REGION_POSITIVE_Y, REGION_POSITIVE_Z): + edgeVector = xDir; + edgeTranslation = yDir.translate(zDir); + break; + default: + return false; } mPosition.getTrans(trans); @@ -308,63 +293,58 @@ bool CubeGravity::calcEdgeGravity(const TVec3f &rPosition, s32 area, TVec3f *pDe if (positionOppositeInOrthogonalPlane.isZero()) { pDest->normalize(edgeTranslation - trans); *pScalar = 0.0; - } - else { + } else { *pScalar = pDest->normalize(positionOppositeInOrthogonalPlane); } return true; } - - -bool CubeGravity::calcCornerGravity(const TVec3f &rPosition, s32 area, TVec3f *pDest, f32 *pScalar) const -{ +bool CubeGravity::calcCornerGravity(const TVec3f& rPosition, s32 area, TVec3f* pDest, f32* pScalar) const { TVec3f vertex, xDir, yDir, zDir, trans; - + mPosition.getXDir(xDir); mPosition.getYDir(yDir); mPosition.getZDir(zDir); switch (area) { - - case ENCODE_CORNER(-1, -1, -1): - vertex = negate(xDir) - yDir - zDir; - break; - - case ENCODE_CORNER(1, -1, -1): - vertex = xDir - yDir - zDir; - break; - - case ENCODE_CORNER(-1, 1, -1): - vertex = negate(xDir).translate(yDir) - zDir; - break; - - case ENCODE_CORNER(1, 1, -1): - vertex = xDir.translate(yDir) - zDir; - break; - - case ENCODE_CORNER(-1, -1, 1): - vertex = (negate(xDir) - yDir).translate(zDir); - break; - - case ENCODE_CORNER(1, -1, 1): - vertex = (xDir - yDir).translate(zDir); - break; - - case ENCODE_CORNER(-1, 1, 1): - vertex = negate(xDir).translate(yDir).translate(zDir); - break; - - case ENCODE_CORNER(1, 1, 1): - vertex = xDir.translate(yDir).translate(zDir); - break; - - default: - return false; - + + case ENCODE_CORNER(-1, -1, -1): + vertex = negate(xDir) - yDir - zDir; + break; + + case ENCODE_CORNER(1, -1, -1): + vertex = xDir - yDir - zDir; + break; + + case ENCODE_CORNER(-1, 1, -1): + vertex = negate(xDir).translate(yDir) - zDir; + break; + + case ENCODE_CORNER(1, 1, -1): + vertex = xDir.translate(yDir) - zDir; + break; + + case ENCODE_CORNER(-1, -1, 1): + vertex = (negate(xDir) - yDir).translate(zDir); + break; + + case ENCODE_CORNER(1, -1, 1): + vertex = (xDir - yDir).translate(zDir); + break; + + case ENCODE_CORNER(-1, 1, 1): + vertex = negate(xDir).translate(yDir).translate(zDir); + break; + + case ENCODE_CORNER(1, 1, 1): + vertex = xDir.translate(yDir).translate(zDir); + break; + + default: + return false; } - + mPosition.getTrans(trans); vertex += trans; @@ -372,8 +352,7 @@ bool CubeGravity::calcCornerGravity(const TVec3f &rPosition, s32 area, TVec3f *p if (gravity.isZero()) { *pScalar = 0.0; pDest->normalize(vertex - trans); - } - else { + } else { *pScalar = pDest->normalize(gravity); } diff --git a/src/Game/Gravity/DiskGravity.cpp b/src/Game/Gravity/DiskGravity.cpp index ea94d52ee..380fb1f55 100644 --- a/src/Game/Gravity/DiskGravity.cpp +++ b/src/Game/Gravity/DiskGravity.cpp @@ -4,16 +4,15 @@ #include #include -DiskGravity::DiskGravity() : - PlanetGravity(), - mLocalPosition(0.0f, 50.0f, 0.0f), - mWorldPosition(0.0f, 50.0f, 0.0f), - mLocalNormal(0, 1, 0), - mWorldNormal(0, 1, 0), - mSideDirection(1, 0, 0), - mOppositeSideVecOrtho(1, 0, 0), - mWorldOppositeSideVecOrtho(1, 0, 0) -{ +DiskGravity::DiskGravity() + : PlanetGravity(), + mLocalPosition(0.0f, 50.0f, 0.0f), + mWorldPosition(0.0f, 50.0f, 0.0f), + mLocalNormal(0, 1, 0), + mWorldNormal(0, 1, 0), + mSideDirection(1, 0, 0), + mOppositeSideVecOrtho(1, 0, 0), + mWorldOppositeSideVecOrtho(1, 0, 0) { mLocalRadius = 2500.0f; mWorldRadius = 2500.0f; mValidDegree = 360.0f; @@ -22,17 +21,17 @@ DiskGravity::DiskGravity() : mEnableEdgeGravity = true; } -void DiskGravity::setLocalPosition(const TVec3f &rLocalPos) { +void DiskGravity::setLocalPosition(const TVec3f& rLocalPos) { mLocalPosition = rLocalPos; } -void DiskGravity::setLocalDirection(const TVec3f &rLocalDir) { +void DiskGravity::setLocalDirection(const TVec3f& rLocalDir) { mLocalNormal.set(rLocalDir); MR::normalizeOrZero(&mLocalNormal); updateLocalParam(); } -void DiskGravity::setSideDirection(const TVec3f &rSideDir) { +void DiskGravity::setSideDirection(const TVec3f& rSideDir) { mSideDirection.set(rSideDir); updateLocalParam(); } @@ -54,8 +53,8 @@ void DiskGravity::setEnableEdgeGravity(bool val) { mEnableEdgeGravity = val; } -bool DiskGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pDistance, const TVec3f &rPosition) const { - +bool DiskGravity::calcOwnGravityVector(TVec3f* pDest, f32* pDistance, const TVec3f& rPosition) const { + TVec3f relativePos; relativePos = rPosition - mWorldPosition; @@ -65,24 +64,23 @@ bool DiskGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pDistance, const TVec return false; TVec3f dirOnDiskPlane = relativePos - mWorldNormal * centralAxisY; - f32 distanceToCentralAxis; + f32 distanceToCentralAxis; MR::separateScalarAndDirection(&distanceToCentralAxis, &dirOnDiskPlane, dirOnDiskPlane); if (mValidCos > -1.0f && dirOnDiskPlane.dot(mWorldOppositeSideVecOrtho) < mValidCos) return false; TVec3f gravity(0, 0, 0); - f32 distance = 0.0f; + f32 distance = 0.0f; if (distanceToCentralAxis <= mWorldRadius) { gravity = centralAxisY >= 0.0f ? mWorldNormal.negateInline() : mWorldNormal; distance = __fabsf(centralAxisY); - } - else { + } else { if (!mEnableEdgeGravity) { return false; } - + TVec3f closestEdgePoint; closestEdgePoint.set(dirOnDiskPlane * mWorldRadius); JMathInlineVEC::PSVECAdd(&closestEdgePoint, &mWorldPosition, &closestEdgePoint); @@ -106,24 +104,23 @@ bool DiskGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pDistance, const TVec return true; } - void DiskGravity::updateLocalParam() { TRot3f rot; // Both of these variables are present because the codegen indicates they should be. // In the final game, however, they have no behavioral effect and are not given any memory. - bool artifact = false; - bool &rArtifact = artifact; + bool artifact = false; + bool& rArtifact = artifact; mValidCos = JMath::sSinCosTable.cosLap(0.5f * mValidDegree); - if(MR::isNearZero(mLocalNormal, 0.00100000005f)) { + if (MR::isNearZero(mLocalNormal, 0.00100000005f)) { rArtifact = true; mOppositeSideVecOrtho.zero(); return; } JMAVECScaleAdd(&mLocalNormal, &mSideDirection, &mOppositeSideVecOrtho, -mLocalNormal.dot(mSideDirection)); MR::normalizeOrZero(&mOppositeSideVecOrtho); - if(MR::isNearZero(mOppositeSideVecOrtho, 0.00100000005f)) { + if (MR::isNearZero(mOppositeSideVecOrtho, 0.00100000005f)) { mOppositeSideVecOrtho.zero(); return; } @@ -131,12 +128,12 @@ void DiskGravity::updateLocalParam() { rot.identity(); rot.setRotateInline(mLocalNormal, 0.5f * mValidDegree * (PI / 180)); rArtifact = false; - if(!artifact) { + if (!artifact) { rot.mult(mOppositeSideVecOrtho, mOppositeSideVecOrtho); } } -void DiskGravity::updateMtx(const TPos3f &rMtx) { +void DiskGravity::updateMtx(const TPos3f& rMtx) { rMtx.mult(mLocalPosition, mWorldPosition); rMtx.mult33(mLocalNormal, mWorldNormal); rMtx.mult33(mOppositeSideVecOrtho, mWorldOppositeSideVecOrtho); diff --git a/src/Game/Gravity/DiskTorusGravity.cpp b/src/Game/Gravity/DiskTorusGravity.cpp index 5ee0ebec1..db096950e 100644 --- a/src/Game/Gravity/DiskTorusGravity.cpp +++ b/src/Game/Gravity/DiskTorusGravity.cpp @@ -2,18 +2,16 @@ #include "Game/Util.hpp" #include "Inline.hpp" - #define DISK_TORUS_DISABLE_BOTH_EDGE_GRAVITY 0 #define DISK_TORUS_DISABLE_OUTER_EDGE_GRAVITY 1 #define DISK_TORUS_DISABLE_INNER_EDGE_GRAVITY 2 -DiskTorusGravity::DiskTorusGravity() : - PlanetGravity(), - mLocalPosition(0.0f, 50.0f, 0.0f), - mTranslation(0.0f, 50.0f, 0.0f), - mLocalDirection(0, 1, 0), - mRotation(0, 1, 0) -{ +DiskTorusGravity::DiskTorusGravity() + : PlanetGravity(), + mLocalPosition(0.0f, 50.0f, 0.0f), + mTranslation(0.0f, 50.0f, 0.0f), + mLocalDirection(0, 1, 0), + mRotation(0, 1, 0) { mRadius = 2000.0f; mWorldRadius = 2000.0f; mDiskRadius = 0.0f; @@ -21,11 +19,11 @@ DiskTorusGravity::DiskTorusGravity() : mEnableBothSide = true; } -void DiskTorusGravity::setPosition(const TVec3f &rPosition) { +void DiskTorusGravity::setPosition(const TVec3f& rPosition) { mLocalPosition = rPosition; } -void DiskTorusGravity::setDirection(const TVec3f &rDirection) { +void DiskTorusGravity::setDirection(const TVec3f& rDirection) { mLocalDirection = rDirection; } @@ -36,8 +34,7 @@ void DiskTorusGravity::setRadius(f32 val) { void DiskTorusGravity::setDiskRadius(f32 val) { if (val < 0.0f) { mDiskRadius = 0.0f; - } - else { + } else { mDiskRadius = val; } } @@ -50,37 +47,35 @@ void DiskTorusGravity::setBothSide(bool val) { mEnableBothSide = val; } -bool DiskTorusGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f &rPos) const { - +bool DiskTorusGravity::calcOwnGravityVector(TVec3f* pDest, f32* pScalar, const TVec3f& rPos) const { + TVec3f relativePosition; relativePosition = rPos - mTranslation; - + f32 centralAxisY = relativePosition.dot(mRotation); - - if(!mEnableBothSide && centralAxisY < 0.0f) { + + if (!mEnableBothSide && centralAxisY < 0.0f) { return false; } - + TVec3f dirOnTorusPlane = relativePosition - mRotation * centralAxisY; - f32 distanceToCentralAxis; + f32 distanceToCentralAxis; MR::separateScalarAndDirection(&distanceToCentralAxis, &dirOnTorusPlane, dirOnTorusPlane); - if(MR::isNearZero(distanceToCentralAxis, 0.00100000005f)) { - + if (MR::isNearZero(distanceToCentralAxis, 0.00100000005f)) { + // Just choose a direction in-plane for gravity if the object is sitting // on the central axis (otherwise dirOnTorusPlane is zero) MR::makeAxisVerticalZX(&dirOnTorusPlane, mRotation); - } - - f32 innerRadius = mWorldRadius - mDiskRadius; - f32 worldRadius = mWorldRadius; + f32 innerRadius = mWorldRadius - mDiskRadius; + f32 worldRadius = mWorldRadius; TVec3f gravity(0, 0, 0); - f32 distance = 0.0f; + f32 distance = 0.0f; - if(distanceToCentralAxis < innerRadius) { + if (distanceToCentralAxis < innerRadius) { - if(mEdgeType == DISK_TORUS_DISABLE_BOTH_EDGE_GRAVITY || mEdgeType == DISK_TORUS_DISABLE_INNER_EDGE_GRAVITY) { + if (mEdgeType == DISK_TORUS_DISABLE_BOTH_EDGE_GRAVITY || mEdgeType == DISK_TORUS_DISABLE_INNER_EDGE_GRAVITY) { return false; } @@ -89,10 +84,9 @@ bool DiskTorusGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const T gravity = nearestInnerEdgePoint - rPos; MR::separateScalarAndDirection(&distance, &gravity, gravity); - } - else if(distanceToCentralAxis > worldRadius) { - - if(mEdgeType == DISK_TORUS_DISABLE_BOTH_EDGE_GRAVITY || mEdgeType == DISK_TORUS_DISABLE_OUTER_EDGE_GRAVITY) { + } else if (distanceToCentralAxis > worldRadius) { + + if (mEdgeType == DISK_TORUS_DISABLE_BOTH_EDGE_GRAVITY || mEdgeType == DISK_TORUS_DISABLE_OUTER_EDGE_GRAVITY) { return false; } @@ -100,31 +94,28 @@ bool DiskTorusGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const T JMAVECScaleAdd(&dirOnTorusPlane, &mTranslation, &nearestOuterEdgePoint, worldRadius); gravity = nearestOuterEdgePoint - rPos; MR::separateScalarAndDirection(&distance, &gravity, gravity); - } - else { + } else { gravity = centralAxisY >= 0.0f ? mRotation.negateInline() : mRotation; distance = __fabsf(centralAxisY); } - - if(!isInRangeDistance(distance)) { + + if (!isInRangeDistance(distance)) { return false; } - if(pDest) { + if (pDest) { *pDest = gravity; } - if(pScalar) { + if (pScalar) { *pScalar = distance; } return true; - } - -void DiskTorusGravity::updateMtx(const TPos3f &rMtx) { +void DiskTorusGravity::updateMtx(const TPos3f& rMtx) { rMtx.mult(mLocalPosition, mTranslation); rMtx.mult33Inline(mLocalDirection, mRotation); - + f32 worldScale; MR::separateScalarAndDirection(&worldScale, &mRotation, mRotation); mWorldRadius = mRadius * worldScale; diff --git a/src/Game/Gravity/GlobalGravityObj.cpp b/src/Game/Gravity/GlobalGravityObj.cpp index c882b3eed..e05d8eeb4 100644 --- a/src/Game/Gravity/GlobalGravityObj.cpp +++ b/src/Game/Gravity/GlobalGravityObj.cpp @@ -1,125 +1,126 @@ #include "Game/Gravity.hpp" #include "Game/Util.hpp" -GlobalGravityObj::GlobalGravityObj(const char *pName) : LiveActor(pName) { - mGravityCreator = nullptr; +GlobalGravityObj::GlobalGravityObj(const char* pName) + : LiveActor(pName) { + mGravityCreator = nullptr; } -void GlobalGravityObj::init(const JMapInfoIter &rIter) { - MR::initDefaultPos(this, rIter); - mGravityCreator->createFromJMap(rIter); +void GlobalGravityObj::init(const JMapInfoIter& rIter) { + MR::initDefaultPos(this, rIter); + mGravityCreator->createFromJMap(rIter); - MR::useStageSwitchReadA(this, rIter); - MR::useStageSwitchReadB(this, rIter); + MR::useStageSwitchReadA(this, rIter); + MR::useStageSwitchReadB(this, rIter); - if (MR::isValidSwitchA(this) || MR::isValidSwitchB(this)) { - MR::connectToSceneMapObjMovement(this); - } + if (MR::isValidSwitchA(this) || MR::isValidSwitchB(this)) { + MR::connectToSceneMapObjMovement(this); + } - MR::invalidateClipping(this); - MR::registerDemoSimpleCastAll(this); - MR::addBaseMatrixFollowerGravity(this, rIter); + MR::invalidateClipping(this); + MR::registerDemoSimpleCastAll(this); + MR::addBaseMatrixFollowerGravity(this, rIter); - makeActorAppeared(); - MR::useStageSwitchSleep(this, rIter); + makeActorAppeared(); + MR::useStageSwitchSleep(this, rIter); } void GlobalGravityObj::makeActorAppeared() { - LiveActor::makeActorAppeared(); - PlanetGravity* pGravity = mGravityCreator->getGravity(); - pGravity->mAppeared = true; - updateSwitch(); + LiveActor::makeActorAppeared(); + PlanetGravity* pGravity = mGravityCreator->getGravity(); + pGravity->mAppeared = true; + updateSwitch(); } void GlobalGravityObj::makeActorDead() { - LiveActor::makeActorDead(); - PlanetGravity* pGravity = mGravityCreator->getGravity(); - pGravity->mAppeared = false; + LiveActor::makeActorDead(); + PlanetGravity* pGravity = mGravityCreator->getGravity(); + pGravity->mAppeared = false; } void GlobalGravityObj::updateSwitch() { - if (MR::isValidSwitchA(this) || MR::isValidSwitchB(this)) { - bool switchA = true; - bool switchB = true; + if (MR::isValidSwitchA(this) || MR::isValidSwitchB(this)) { + bool switchA = true; + bool switchB = true; - if (MR::isValidSwitchA(this)) { - switchA = MR::isOnSwitchA(this); - } - if (MR::isValidSwitchB(this)) { - switchB = MR::isOnSwitchB(this) == false; - } + if (MR::isValidSwitchA(this)) { + switchA = MR::isOnSwitchA(this); + } + if (MR::isValidSwitchB(this)) { + switchB = MR::isOnSwitchB(this) == false; + } - PlanetGravity* pGravity = mGravityCreator->getGravity(); - pGravity->mActivated = switchA && switchB; - } + PlanetGravity* pGravity = mGravityCreator->getGravity(); + pGravity->mActivated = switchA && switchB; + } } void GlobalGravityObj::movement() { - updateSwitch(); + updateSwitch(); } PlanetGravity* GlobalGravityObj::getGravity() { - return mGravityCreator->getGravity(); + return mGravityCreator->getGravity(); } namespace MR { - NameObj* createGlobalCubeGravityObj(const char *pName) { - GlobalGravityObj* ret = new GlobalGravityObj(pName); - ret->mGravityCreator = new CubeGravityCreator(); - return ret; - } + NameObj* createGlobalCubeGravityObj(const char* pName) { + GlobalGravityObj* ret = new GlobalGravityObj(pName); + ret->mGravityCreator = new CubeGravityCreator(); + return ret; + } - NameObj* createGlobalConeGravityObj(const char *pName) { - GlobalGravityObj* ret = new GlobalGravityObj(pName); - ret->mGravityCreator = new ConeGravityCreator(); - return ret; - } + NameObj* createGlobalConeGravityObj(const char* pName) { + GlobalGravityObj* ret = new GlobalGravityObj(pName); + ret->mGravityCreator = new ConeGravityCreator(); + return ret; + } - NameObj* createGlobalDiskGravityObj(const char *pName) { - GlobalGravityObj* ret = new GlobalGravityObj(pName); - ret->mGravityCreator = new DiskGravityCreator(); - return ret; - } + NameObj* createGlobalDiskGravityObj(const char* pName) { + GlobalGravityObj* ret = new GlobalGravityObj(pName); + ret->mGravityCreator = new DiskGravityCreator(); + return ret; + } - NameObj* createGlobalDiskTorusGravityObj(const char *pName) { - GlobalGravityObj* ret = new GlobalGravityObj(pName); - ret->mGravityCreator = new DiskTorusGravityCreator(); - return ret; - } + NameObj* createGlobalDiskTorusGravityObj(const char* pName) { + GlobalGravityObj* ret = new GlobalGravityObj(pName); + ret->mGravityCreator = new DiskTorusGravityCreator(); + return ret; + } - NameObj* createGlobalPlaneGravityObj(const char *pName) { - GlobalGravityObj* ret = new GlobalGravityObj(pName); - ret->mGravityCreator = new PlaneGravityCreator(); - return ret; - } + NameObj* createGlobalPlaneGravityObj(const char* pName) { + GlobalGravityObj* ret = new GlobalGravityObj(pName); + ret->mGravityCreator = new PlaneGravityCreator(); + return ret; + } - NameObj* createGlobalPlaneInBoxGravityObj(const char *pName) { - GlobalGravityObj* ret = new GlobalGravityObj(pName); - ret->mGravityCreator = new PlaneInBoxGravityCreator(); - return ret; - } + NameObj* createGlobalPlaneInBoxGravityObj(const char* pName) { + GlobalGravityObj* ret = new GlobalGravityObj(pName); + ret->mGravityCreator = new PlaneInBoxGravityCreator(); + return ret; + } - NameObj* createGlobalPlaneInCylinderGravityObj(const char *pName) { - GlobalGravityObj* ret = new GlobalGravityObj(pName); - ret->mGravityCreator = new PlaneInCylinderGravityCreator(); - return ret; - } + NameObj* createGlobalPlaneInCylinderGravityObj(const char* pName) { + GlobalGravityObj* ret = new GlobalGravityObj(pName); + ret->mGravityCreator = new PlaneInCylinderGravityCreator(); + return ret; + } - NameObj* createGlobalPointGravityObj(const char *pName) { - GlobalGravityObj* ret = new GlobalGravityObj(pName); - ret->mGravityCreator = new PointGravityCreator(); - return ret; - } + NameObj* createGlobalPointGravityObj(const char* pName) { + GlobalGravityObj* ret = new GlobalGravityObj(pName); + ret->mGravityCreator = new PointGravityCreator(); + return ret; + } - NameObj* createGlobalSegmentGravityObj(const char *pName) { - GlobalGravityObj* ret = new GlobalGravityObj(pName); - ret->mGravityCreator = new SegmentGravityCreator(); - return ret; - } + NameObj* createGlobalSegmentGravityObj(const char* pName) { + GlobalGravityObj* ret = new GlobalGravityObj(pName); + ret->mGravityCreator = new SegmentGravityCreator(); + return ret; + } - NameObj* createGlobalWireGravityObj(const char *pName) { - GlobalGravityObj* ret = new GlobalGravityObj(pName); - ret->mGravityCreator = new WireGravityCreator(); - return ret; - } -} + NameObj* createGlobalWireGravityObj(const char* pName) { + GlobalGravityObj* ret = new GlobalGravityObj(pName); + ret->mGravityCreator = new WireGravityCreator(); + return ret; + } +} // namespace MR diff --git a/src/Game/Gravity/GraviryFollower.cpp b/src/Game/Gravity/GraviryFollower.cpp index e0ee5a30a..5839e4bd5 100644 --- a/src/Game/Gravity/GraviryFollower.cpp +++ b/src/Game/Gravity/GraviryFollower.cpp @@ -3,36 +3,36 @@ #include "Game/Gravity.hpp" #include "Game/Util.hpp" -GraviryFollower::GraviryFollower(GlobalGravityObj *pGravityObj, const JMapInfoIter &rIter) : BaseMatrixFollower(pGravityObj, rIter), mGravity(nullptr) { - mGravity = pGravityObj->getGravity(); +GraviryFollower::GraviryFollower(GlobalGravityObj* pGravityObj, const JMapInfoIter& rIter) + : BaseMatrixFollower(pGravityObj, rIter), mGravity(nullptr) { + mGravity = pGravityObj->getGravity(); } -void GraviryFollower::setGravityFollowHost(const NameObj *pHost) { - mGravity->mHost = pHost; +void GraviryFollower::setGravityFollowHost(const NameObj* pHost) { + mGravity->mHost = pHost; } void GraviryFollower::update() { - GlobalGravityObj* pFollowTarget = static_cast(getFollowTargetActor()); + GlobalGravityObj* pFollowTarget = static_cast(getFollowTargetActor()); - if (MR::isDead(pFollowTarget) || MR::isClipped(pFollowTarget) || !isValid()) { - mGravity->mValidFollower = false; - } - else { - TPos3f followMtx; - calcFollowMatrix(&followMtx); + if (MR::isDead(pFollowTarget) || MR::isClipped(pFollowTarget) || !isValid()) { + mGravity->mValidFollower = false; + } else { + TPos3f followMtx; + calcFollowMatrix(&followMtx); - mGravity->updateMtx(followMtx); - mGravity->mValidFollower = true; - } + mGravity->updateMtx(followMtx); + mGravity->mValidFollower = true; + } } namespace MR { - bool addBaseMatrixFollowerGravity(GlobalGravityObj *pGravityObj, const JMapInfoIter &rIter) { - if (!MR::isValidFollowID(rIter)) { - return false; - } + bool addBaseMatrixFollowerGravity(GlobalGravityObj* pGravityObj, const JMapInfoIter& rIter) { + if (!MR::isValidFollowID(rIter)) { + return false; + } - MR::addBaseMatrixFollower(new GraviryFollower(pGravityObj, rIter)); - return true; - } -} + MR::addBaseMatrixFollower(new GraviryFollower(pGravityObj, rIter)); + return true; + } +} // namespace MR diff --git a/src/Game/Gravity/GravityCreator.cpp b/src/Game/Gravity/GravityCreator.cpp index fcea025fa..aa83a7994 100644 --- a/src/Game/Gravity/GravityCreator.cpp +++ b/src/Game/Gravity/GravityCreator.cpp @@ -2,400 +2,397 @@ #include "Game/Util.hpp" GravityCreator::GravityCreator() { - } -PlanetGravity* GravityCreator::createFromJMap(const JMapInfoIter &rIter) { - PlanetGravity* instance = createInstance(); +PlanetGravity* GravityCreator::createFromJMap(const JMapInfoIter& rIter) { + PlanetGravity* instance = createInstance(); - if (instance) { - TVec3f trans(0, 0, 0); - TVec3f rotate(0, 0, 0); - TVec3f scale(1, 1, 1); - MR::getJMapInfoTrans(rIter, &trans); - MR::getJMapInfoRotate(rIter, &rotate); - MR::getJMapInfoScale(rIter, &scale); - settingFromSRT(trans, rotate, scale); + if (instance) { + TVec3f trans(0, 0, 0); + TVec3f rotate(0, 0, 0); + TVec3f scale(1, 1, 1); + MR::getJMapInfoTrans(rIter, &trans); + MR::getJMapInfoRotate(rIter, &rotate); + MR::getJMapInfoScale(rIter, &scale); + settingFromSRT(trans, rotate, scale); - s32 arg0; - s32 arg1; - s32 arg2; - MR::getJMapInfoArg0WithInit(rIter, &arg0); - MR::getJMapInfoArg1WithInit(rIter, &arg1); - MR::getJMapInfoArg2WithInit(rIter, &arg2); - settingFromJMapArgs(arg0, arg1, arg2); + s32 arg0; + s32 arg1; + s32 arg2; + MR::getJMapInfoArg0WithInit(rIter, &arg0); + MR::getJMapInfoArg1WithInit(rIter, &arg1); + MR::getJMapInfoArg2WithInit(rIter, &arg2); + settingFromJMapArgs(arg0, arg1, arg2); - settingFromJMapOtherParam(rIter); + settingFromJMapOtherParam(rIter); - MR::settingGravityParamFromJMap(instance, rIter); - getGravity()->updateIdentityMtx(); - MR::registerGravity(instance); - } + MR::settingGravityParamFromJMap(instance, rIter); + getGravity()->updateIdentityMtx(); + MR::registerGravity(instance); + } - return instance; + return instance; } PlanetGravity* CubeGravityCreator::createInstance() { - mGravityInstance = new CubeGravity(); - return mGravityInstance; + mGravityInstance = new CubeGravity(); + return mGravityInstance; } -void CubeGravityCreator::settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale) { - // Calculate TR matrix - TPos3f mtx; - MR::makeMtxTR(reinterpret_cast(&mtx), rTrans, rRotate); +void CubeGravityCreator::settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale) { + // Calculate TR matrix + TPos3f mtx; + MR::makeMtxTR(reinterpret_cast(&mtx), rTrans, rRotate); - // Get up vector and calculate scale - TVec3f upVec; - TVec3f scale; - scale.set(rScale * 500.0f); - mtx.getYDir(upVec); + // Get up vector and calculate scale + TVec3f upVec; + TVec3f scale; + scale.set(rScale * 500.0f); + mtx.getYDir(upVec); - // Translate and scale matrix - mtx.setTrans(rTrans + upVec * scale.y); - MR::preScaleMtx(reinterpret_cast(&mtx), scale); + // Translate and scale matrix + mtx.setTrans(rTrans + upVec * scale.y); + MR::preScaleMtx(reinterpret_cast(&mtx), scale); - // Set cube matrix - mGravityInstance->setCube(mtx); + // Set cube matrix + mGravityInstance->setCube(mtx); } void CubeGravityCreator::settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2) { - u8 activeFaces = 0; + u8 activeFaces = 0; - if (arg0 & 1) { - activeFaces |= 1; - } - if (arg0 & 2) { - activeFaces |= 2; - } - if (arg1 & 1) { - activeFaces |= 4; - } - if (arg1 & 2) { - activeFaces |= 8; - } - if (arg2 & 1) { - activeFaces |= 16; - } - if (arg2 & 2) { - activeFaces |= 32; - } + if (arg0 & 1) { + activeFaces |= 1; + } + if (arg0 & 2) { + activeFaces |= 2; + } + if (arg1 & 1) { + activeFaces |= 4; + } + if (arg1 & 2) { + activeFaces |= 8; + } + if (arg2 & 1) { + activeFaces |= 16; + } + if (arg2 & 2) { + activeFaces |= 32; + } - mGravityInstance->mActiveFaces = activeFaces; + mGravityInstance->mActiveFaces = activeFaces; } PlanetGravity* CubeGravityCreator::getGravity() { - return mGravityInstance; + return mGravityInstance; } PlanetGravity* DiskGravityCreator::createInstance() { - mGravityInstance = new DiskGravity(); - return mGravityInstance; + mGravityInstance = new DiskGravity(); + return mGravityInstance; } -void DiskGravityCreator::settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale) { - // Calculate TR matrix - TPos3f mtx; - MR::makeMtxTR(reinterpret_cast(&mtx), rTrans, rRotate); +void DiskGravityCreator::settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale) { + // Calculate TR matrix + TPos3f mtx; + MR::makeMtxTR(reinterpret_cast(&mtx), rTrans, rRotate); - // Calculate side and up vectors - TVec3f sideVec, upVec; - mtx.getXDir(sideVec); - mtx.getYDir(upVec); + // Calculate side and up vectors + TVec3f sideVec, upVec; + mtx.getXDir(sideVec); + mtx.getYDir(upVec); - // Populate gravity attributes - mGravityInstance->setLocalPosition(rTrans); - mGravityInstance->setLocalDirection(upVec); - mGravityInstance->setSideDirection(sideVec); - mGravityInstance->setRadius(500.0f * MR::getMaxElement(rScale)); + // Populate gravity attributes + mGravityInstance->setLocalPosition(rTrans); + mGravityInstance->setLocalDirection(upVec); + mGravityInstance->setSideDirection(sideVec); + mGravityInstance->setRadius(500.0f * MR::getMaxElement(rScale)); } void DiskGravityCreator::settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2) { - // Obj_arg0 = enable both sides? - mGravityInstance->setBothSide(arg0 != 0); + // Obj_arg0 = enable both sides? + mGravityInstance->setBothSide(arg0 != 0); - // Obj_arg1 = enable edge gravity? - mGravityInstance->setEnableEdgeGravity(arg1 != 0); + // Obj_arg1 = enable edge gravity? + mGravityInstance->setEnableEdgeGravity(arg1 != 0); - // Obj_arg3 = valid degree - if (arg2 >= 0) { - mGravityInstance->setValidDegee(arg2); - } - else { - mGravityInstance->setValidDegee(360.0f); - } + // Obj_arg3 = valid degree + if (arg2 >= 0) { + mGravityInstance->setValidDegee(arg2); + } else { + mGravityInstance->setValidDegee(360.0f); + } } PlanetGravity* DiskGravityCreator::getGravity() { - return mGravityInstance; + return mGravityInstance; } PlanetGravity* DiskTorusGravityCreator::createInstance() { - mGravityInstance = new DiskTorusGravity(); - return mGravityInstance; + mGravityInstance = new DiskTorusGravity(); + return mGravityInstance; } -void DiskTorusGravityCreator::settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale) { - // Calculate TR matrix - TPos3f mtx; - MR::makeMtxTR(reinterpret_cast(&mtx), rTrans, rRotate); +void DiskTorusGravityCreator::settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale) { + // Calculate TR matrix + TPos3f mtx; + MR::makeMtxTR(reinterpret_cast(&mtx), rTrans, rRotate); - // Calculate side and up vectors - TVec3f upVec; - mtx.getYDir(upVec); + // Calculate side and up vectors + TVec3f upVec; + mtx.getYDir(upVec); - // Populate gravity attributes - mGravityInstance->setPosition(rTrans); - mGravityInstance->setDirection(upVec); - mGravityInstance->setRadius(500.0f * MR::getMaxElement(rScale)); + // Populate gravity attributes + mGravityInstance->setPosition(rTrans); + mGravityInstance->setDirection(upVec); + mGravityInstance->setRadius(500.0f * MR::getMaxElement(rScale)); } void DiskTorusGravityCreator::settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2) { - // Obj_arg0 = enable both sides? - mGravityInstance->setBothSide(arg0 != 0); + // Obj_arg0 = enable both sides? + mGravityInstance->setBothSide(arg0 != 0); - // Obj_arg1 = edge type - switch (arg1) { - case 0: - mGravityInstance->setEdgeType(0); - break; - case 1: - mGravityInstance->setEdgeType(1); - break; - case 2: - mGravityInstance->setEdgeType(2); - break; - default: - mGravityInstance->setEdgeType(3); - break; - } + // Obj_arg1 = edge type + switch (arg1) { + case 0: + mGravityInstance->setEdgeType(0); + break; + case 1: + mGravityInstance->setEdgeType(1); + break; + case 2: + mGravityInstance->setEdgeType(2); + break; + default: + mGravityInstance->setEdgeType(3); + break; + } - // Obj_arg2 = disk radius - mGravityInstance->setDiskRadius(arg2); + // Obj_arg2 = disk radius + mGravityInstance->setDiskRadius(arg2); } PlanetGravity* DiskTorusGravityCreator::getGravity() { - return mGravityInstance; + return mGravityInstance; } PlanetGravity* ConeGravityCreator::createInstance() { - mGravityInstance = new ConeGravity(); - return mGravityInstance; + mGravityInstance = new ConeGravity(); + return mGravityInstance; } -void ConeGravityCreator::settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale) { - // Calculate local matrix - TPos3f localMtx; - MR::makeMtxTRS(reinterpret_cast(&localMtx), rTrans, rRotate, rScale * 500.0f); - mGravityInstance->setLocalMatrix(localMtx); +void ConeGravityCreator::settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale) { + // Calculate local matrix + TPos3f localMtx; + MR::makeMtxTRS(reinterpret_cast(&localMtx), rTrans, rRotate, rScale * 500.0f); + mGravityInstance->setLocalMatrix(localMtx); } void ConeGravityCreator::settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2) { - // Obj_arg0 = is enable bottom? - mGravityInstance->setEnableBottom(arg0 != 0); + // Obj_arg0 = is enable bottom? + mGravityInstance->setEnableBottom(arg0 != 0); - // Obj_arg1 = top cut rate - mGravityInstance->setTopCutRate(arg1 / 1000.0f); + // Obj_arg1 = top cut rate + mGravityInstance->setTopCutRate(arg1 / 1000.0f); } PlanetGravity* ConeGravityCreator::getGravity() { - return mGravityInstance; + return mGravityInstance; } PlanetGravity* PlaneGravityCreator::createInstance() { - mGravityInstance = new ParallelGravity(); - return mGravityInstance; + mGravityInstance = new ParallelGravity(); + return mGravityInstance; } -void PlaneGravityCreator::settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale) { - // Calculate rotate matrix - TPos3f mtx; - MR::makeMtxRotate(reinterpret_cast(&mtx), rRotate); +void PlaneGravityCreator::settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale) { + // Calculate rotate matrix + TPos3f mtx; + MR::makeMtxRotate(reinterpret_cast(&mtx), rRotate); - // Set normal-form plane - TVec3f upVec; - mtx.getYDir(upVec); - mGravityInstance->setPlane(upVec, rTrans); + // Set normal-form plane + TVec3f upVec; + mtx.getYDir(upVec); + mGravityInstance->setPlane(upVec, rTrans); } PlanetGravity* PlaneGravityCreator::getGravity() { - return mGravityInstance; + return mGravityInstance; } PlanetGravity* PlaneInBoxGravityCreator::createInstance() { - mGravityInstance = new ParallelGravity(); - mGravityInstance->setRangeType(ParallelGravity::RangeType_Box); - return mGravityInstance; + mGravityInstance = new ParallelGravity(); + mGravityInstance->setRangeType(ParallelGravity::RangeType_Box); + return mGravityInstance; } -void PlaneInBoxGravityCreator::settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale) { - // Calculate scale and TR matrix - TPos3f mtx; - TVec3f scale = rScale * 500.0f; - MR::makeMtxTR(reinterpret_cast(&mtx), rTrans, rRotate); +void PlaneInBoxGravityCreator::settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale) { + // Calculate scale and TR matrix + TPos3f mtx; + TVec3f scale = rScale * 500.0f; + MR::makeMtxTR(reinterpret_cast(&mtx), rTrans, rRotate); - // Get up vector - TVec3f upVec; - mtx.getYDir(upVec); + // Get up vector + TVec3f upVec; + mtx.getYDir(upVec); - // Translate and scale matrix - mtx.setTrans(rTrans + upVec * scale.y); - MR::preScaleMtx(reinterpret_cast(&mtx), scale); + // Translate and scale matrix + mtx.setTrans(rTrans + upVec * scale.y); + MR::preScaleMtx(reinterpret_cast(&mtx), scale); - // Set cube matrix - mGravityInstance->setPlane(upVec, rTrans); - mGravityInstance->setRangeBox(mtx); + // Set cube matrix + mGravityInstance->setPlane(upVec, rTrans); + mGravityInstance->setRangeBox(mtx); } PlanetGravity* PlaneInBoxGravityCreator::getGravity() { - return mGravityInstance; + return mGravityInstance; } void PlaneInBoxGravityCreator::settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2) { - // Obj_arg0 = base distance - mGravityInstance->setBaseDistance(arg0); + // Obj_arg0 = base distance + mGravityInstance->setBaseDistance(arg0); - // Obj_arg1 = distance calc type - switch (arg1) { - case 0: - mGravityInstance->setDistanceCalcType(ParallelGravity::DistanceCalcType_X); - break; - case 1: - mGravityInstance->setDistanceCalcType(ParallelGravity::DistanceCalcType_Y); - break; - case 2: - mGravityInstance->setDistanceCalcType(ParallelGravity::DistanceCalcType_Z); - break; - default: - mGravityInstance->setDistanceCalcType(ParallelGravity::DistanceCalcType_Default); - break; - } + // Obj_arg1 = distance calc type + switch (arg1) { + case 0: + mGravityInstance->setDistanceCalcType(ParallelGravity::DistanceCalcType_X); + break; + case 1: + mGravityInstance->setDistanceCalcType(ParallelGravity::DistanceCalcType_Y); + break; + case 2: + mGravityInstance->setDistanceCalcType(ParallelGravity::DistanceCalcType_Z); + break; + default: + mGravityInstance->setDistanceCalcType(ParallelGravity::DistanceCalcType_Default); + break; + } } PlanetGravity* PlaneInCylinderGravityCreator::createInstance() { - mGravityInstance = new ParallelGravity(); - mGravityInstance->setRangeType(ParallelGravity::RangeType_Cylinder); - return mGravityInstance; + mGravityInstance = new ParallelGravity(); + mGravityInstance->setRangeType(ParallelGravity::RangeType_Cylinder); + return mGravityInstance; } PlanetGravity* PlaneInCylinderGravityCreator::getGravity() { - return mGravityInstance; + return mGravityInstance; } -void PlaneInCylinderGravityCreator::settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale) { - // Calculate TR matrix - TPos3f mtx; - MR::makeMtxTR(reinterpret_cast(&mtx), rTrans, rRotate); +void PlaneInCylinderGravityCreator::settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale) { + // Calculate TR matrix + TPos3f mtx; + MR::makeMtxTR(reinterpret_cast(&mtx), rTrans, rRotate); - // Set normal-form plane - TVec3f upVec; - mtx.getYDir(upVec); - mGravityInstance->setPlane(upVec, rTrans); + // Set normal-form plane + TVec3f upVec; + mtx.getYDir(upVec); + mGravityInstance->setPlane(upVec, rTrans); - // Set cylinder range - mGravityInstance->setRangeCylinder(500.0f * rScale.x, 500.0f * rScale.y); + // Set cylinder range + mGravityInstance->setRangeCylinder(500.0f * rScale.x, 500.0f * rScale.y); } void PlaneInCylinderGravityCreator::settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2) { - // Obj_arg0 = base distance - mGravityInstance->setBaseDistance(arg0); + // Obj_arg0 = base distance + mGravityInstance->setBaseDistance(arg0); } PlanetGravity* PointGravityCreator::createInstance() { - mGravityInstance = new PointGravity(); - return mGravityInstance; + mGravityInstance = new PointGravity(); + return mGravityInstance; } -void PointGravityCreator::settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale) { - mGravityInstance->mDistant = 500.0f * rScale.x; - mGravityInstance->mOrigPosition.setPS(rTrans); +void PointGravityCreator::settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale) { + mGravityInstance->mDistant = 500.0f * rScale.x; + mGravityInstance->mOrigPosition.setPS(rTrans); } PlanetGravity* PointGravityCreator::getGravity() { - return mGravityInstance; + return mGravityInstance; } PlanetGravity* SegmentGravityCreator::createInstance() { - mGravityInstance = new SegmentGravity(); - return mGravityInstance; + mGravityInstance = new SegmentGravity(); + return mGravityInstance; } -void SegmentGravityCreator::settingFromSRT(const TVec3f &rTrans, const TVec3f &rRotate, const TVec3f &rScale) { - // Calculate TRS matrix - TPos3f mtx; - MR::makeMtxTRS(reinterpret_cast(&mtx), rTrans, rRotate, rScale); +void SegmentGravityCreator::settingFromSRT(const TVec3f& rTrans, const TVec3f& rRotate, const TVec3f& rScale) { + // Calculate TRS matrix + TPos3f mtx; + MR::makeMtxTRS(reinterpret_cast(&mtx), rTrans, rRotate, rScale); - // Get side and up vectors - TVec3f sideVec, upVec; - mtx.getXDir(sideVec); - mtx.getYDir(upVec); + // Get side and up vectors + TVec3f sideVec, upVec; + mtx.getXDir(sideVec); + mtx.getYDir(upVec); - // Set gravity points and side vec - mGravityInstance->setGravityPoint(0, rTrans); - mGravityInstance->setGravityPoint(1, rTrans + upVec * 1000.0f); - mGravityInstance->setSideVector(sideVec); + // Set gravity points and side vec + mGravityInstance->setGravityPoint(0, rTrans); + mGravityInstance->setGravityPoint(1, rTrans + upVec * 1000.0f); + mGravityInstance->setSideVector(sideVec); } void SegmentGravityCreator::settingFromJMapArgs(s32 arg0, s32 arg1, s32 arg2) { - // Obj_arg0 = valid edge - switch (arg0) { - case 0: - mGravityInstance->setEdgeValid(0, false); - mGravityInstance->setEdgeValid(1, false); - break; - case 1: - mGravityInstance->setEdgeValid(0, true); - mGravityInstance->setEdgeValid(1, false); - break; - case 2: - mGravityInstance->setEdgeValid(0, false); - mGravityInstance->setEdgeValid(1, true); - break; - default: - mGravityInstance->setEdgeValid(0, true); - mGravityInstance->setEdgeValid(1, true); - break; - } + // Obj_arg0 = valid edge + switch (arg0) { + case 0: + mGravityInstance->setEdgeValid(0, false); + mGravityInstance->setEdgeValid(1, false); + break; + case 1: + mGravityInstance->setEdgeValid(0, true); + mGravityInstance->setEdgeValid(1, false); + break; + case 2: + mGravityInstance->setEdgeValid(0, false); + mGravityInstance->setEdgeValid(1, true); + break; + default: + mGravityInstance->setEdgeValid(0, true); + mGravityInstance->setEdgeValid(1, true); + break; + } - // Obj_arg1 = valid side degree - if (arg1 >= 0.0f) { - mGravityInstance->setValidSideDegree(arg1); - } - else { - mGravityInstance->setValidSideDegree(360.0f); - } + // Obj_arg1 = valid side degree + if (arg1 >= 0.0f) { + mGravityInstance->setValidSideDegree(arg1); + } else { + mGravityInstance->setValidSideDegree(360.0f); + } } PlanetGravity* SegmentGravityCreator::getGravity() { - return mGravityInstance; + return mGravityInstance; } PlanetGravity* WireGravityCreator::createInstance() { - mGravityInstance = new WireGravity(); - return mGravityInstance; + mGravityInstance = new WireGravity(); + return mGravityInstance; } -void WireGravityCreator::settingFromJMapOtherParam(const JMapInfoIter &rIter) { - // Get data from JMap - mRailRider = new RailRider(rIter); - s32 numPointsInBetween = 20; - MR::getJMapInfoArg0NoInit(rIter, &numPointsInBetween); +void WireGravityCreator::settingFromJMapOtherParam(const JMapInfoIter& rIter) { + // Get data from JMap + mRailRider = new RailRider(rIter); + s32 numPointsInBetween = 20; + MR::getJMapInfoArg0NoInit(rIter, &numPointsInBetween); - // Determine number of points, the interval and allocate the necessary space - u32 numPoints = numPointsInBetween + 2; - f32 railInterval = mRailRider->getTotalLength() / (numPoints - 1); - mGravityInstance->setPointListSize(numPoints); + // Determine number of points, the interval and allocate the necessary space + u32 numPoints = numPointsInBetween + 2; + f32 railInterval = mRailRider->getTotalLength() / (numPoints - 1); + mGravityInstance->setPointListSize(numPoints); - // Iterate over the points and add them to the gravity - mRailRider->setCoord(0.0f); - mRailRider->setSpeed(railInterval); + // Iterate over the points and add them to the gravity + mRailRider->setCoord(0.0f); + mRailRider->setSpeed(railInterval); - for (s32 i = 0; i < numPoints - 1; i++) { - mGravityInstance->addPoint(mRailRider->mCurPos); - mRailRider->move(); - } + for (s32 i = 0; i < numPoints - 1; i++) { + mGravityInstance->addPoint(mRailRider->mCurPos); + mRailRider->move(); + } } PlanetGravity* WireGravityCreator::getGravity() { - return mGravityInstance; + return mGravityInstance; } diff --git a/src/Game/Gravity/GravityInfo.cpp b/src/Game/Gravity/GravityInfo.cpp index 96c4ee263..54ae48005 100644 --- a/src/Game/Gravity/GravityInfo.cpp +++ b/src/Game/Gravity/GravityInfo.cpp @@ -1,17 +1,17 @@ #include "Game/Gravity.hpp" GravityInfo::GravityInfo() { - mLargestPriority = -1; - mGravityVector.x = 0.0f; - mGravityVector.y = 0.0f; - mGravityVector.z = 0.0f; - mGravityInstance = nullptr; + mLargestPriority = -1; + mGravityVector.x = 0.0f; + mGravityVector.y = 0.0f; + mGravityVector.z = 0.0f; + mGravityInstance = nullptr; } void GravityInfo::init() { - mLargestPriority = -1; - mGravityVector.z = 0.0f; - mGravityVector.y = 0.0f; - mGravityVector.x = 0.0f; - mGravityInstance = nullptr; + mLargestPriority = -1; + mGravityVector.z = 0.0f; + mGravityVector.y = 0.0f; + mGravityVector.x = 0.0f; + mGravityInstance = nullptr; } diff --git a/src/Game/Gravity/ParallelGravity.cpp b/src/Game/Gravity/ParallelGravity.cpp index 929ea625b..648f5e1ab 100644 --- a/src/Game/Gravity/ParallelGravity.cpp +++ b/src/Game/Gravity/ParallelGravity.cpp @@ -3,14 +3,12 @@ #include "JSystem/JMath.hpp" #include "Inline.hpp" - -ParallelGravity::ParallelGravity() : - PlanetGravity(), - mPlanePosition(0, 0, 0), - mPlaneUpVec(0.0f, 1.0f, 0.0f), - mWorldPlanePosition(0, 0, 0), - mWorldPlaneUpVec(0.0f, 1.0f, 0.0f) -{ +ParallelGravity::ParallelGravity() + : PlanetGravity(), + mPlanePosition(0, 0, 0), + mPlaneUpVec(0.0f, 1.0f, 0.0f), + mWorldPlanePosition(0, 0, 0), + mWorldPlaneUpVec(0.0f, 1.0f, 0.0f) { mCylinderHeight = 1000.0f; mCylinderRadius = 500.0f; mBaseDistance = 2000.0f; @@ -20,7 +18,7 @@ ParallelGravity::ParallelGravity() : mWorldMtx.identity(); } -bool ParallelGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f &rPosition) const { +bool ParallelGravity::calcOwnGravityVector(TVec3f* pDest, f32* pScalar, const TVec3f& rPosition) const { if (!isInRange(rPosition, pScalar)) { return false; } @@ -32,7 +30,7 @@ bool ParallelGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TV return true; } -void ParallelGravity::updateMtx(const TPos3f &rMtx) { +void ParallelGravity::updateMtx(const TPos3f& rMtx) { rMtx.mult33Inline(mPlaneUpVec, mWorldPlaneUpVec); rMtx.mult(mPlanePosition, mWorldPlanePosition); MR::normalizeOrZero(&mWorldPlaneUpVec); @@ -50,7 +48,7 @@ void ParallelGravity::updateMtx(const TPos3f &rMtx) { } } -void ParallelGravity::setPlane(const TVec3f &rPlaneUp, const TVec3f &rPlanePos) { +void ParallelGravity::setPlane(const TVec3f& rPlaneUp, const TVec3f& rPlanePos) { // Up vector mPlaneUpVec.set(rPlaneUp); PSVECMag(&mPlaneUpVec); // unused result @@ -60,7 +58,7 @@ void ParallelGravity::setPlane(const TVec3f &rPlaneUp, const TVec3f &rPlanePos) mPlanePosition = rPlanePos; } -void ParallelGravity::setRangeBox(const TPos3f &rMtx) { +void ParallelGravity::setRangeBox(const TPos3f& rMtx) { mLocalMtx = rMtx; updateIdentityMtx(); } @@ -77,8 +75,7 @@ void ParallelGravity::setRangeType(RANGE_TYPE rangeType) { void ParallelGravity::setBaseDistance(f32 val) { if (val < 0.0f) { mBaseDistance = 2000.0f; - } - else { + } else { mBaseDistance = val; } } @@ -87,22 +84,21 @@ void ParallelGravity::setDistanceCalcType(DISTANCE_CALC_TYPE distanceCalcType) { mDistanceCalcType = distanceCalcType; } -bool ParallelGravity::isInSphereRange(const TVec3f &rPosition, f32 *pScalar) const { +bool ParallelGravity::isInSphereRange(const TVec3f& rPosition, f32* pScalar) const { if (pScalar) { *pScalar = mBaseDistance; } if (mRange < 0.0f) { return true; - } - else { + } else { TVec3f dirToCenter(mWorldPlanePosition - rPosition); - f32 range = mRange; + f32 range = mRange; return dirToCenter.squared() < range * range; } } -bool ParallelGravity::isInBoxRange(const TVec3f &rPosition, f32 *pScalar) const { +bool ParallelGravity::isInBoxRange(const TVec3f& rPosition, f32* pScalar) const { // Get direction to center TVec3f translation; mWorldMtx.getTransInline(translation); @@ -157,13 +153,13 @@ bool ParallelGravity::isInBoxRange(const TVec3f &rPosition, f32 *pScalar) const return true; } -bool ParallelGravity::isInCylinderRange(const TVec3f &rPosition, f32 *pScalar) const { +bool ParallelGravity::isInCylinderRange(const TVec3f& rPosition, f32* pScalar) const { f32 height = mWorldPlaneUpVec.dot(rPosition - mWorldPlanePosition); if (height < 0.0f || mCylinderHeight < height) { return false; } - + TVec3f positionOnWorldPlane; // Check radius range @@ -174,15 +170,14 @@ bool ParallelGravity::isInCylinderRange(const TVec3f &rPosition, f32 *pScalar) c if (radius > mCylinderRadius) { return false; } - + // Set speed *pScalar = mBaseDistance + radius; return true; } - -bool ParallelGravity::isInRange(const TVec3f &rPosition, f32 *pScalar) const { +bool ParallelGravity::isInRange(const TVec3f& rPosition, f32* pScalar) const { switch (mRangeType) { case RangeType_Sphere: return isInSphereRange(rPosition, pScalar); diff --git a/src/Game/Gravity/PlanetGravity.cpp b/src/Game/Gravity/PlanetGravity.cpp index fe9c87e1d..ff376ba3d 100644 --- a/src/Game/Gravity/PlanetGravity.cpp +++ b/src/Game/Gravity/PlanetGravity.cpp @@ -20,9 +20,9 @@ void PlanetGravity::setPriority(s32 priority) { mPriority = priority; } -bool PlanetGravity::calcGravity(TVec3f *pDest, const TVec3f &rPosition) const { +bool PlanetGravity::calcGravity(TVec3f* pDest, const TVec3f& rPosition) const { // Calculate raw gravity vector - f32 radius = 0.0f; + f32 radius = 0.0f; TVec3f gravity; gravity.x = 0.0f; gravity.y = 0.0f; @@ -59,14 +59,12 @@ bool PlanetGravity::calcGravity(TVec3f *pDest, const TVec3f &rPosition) const { return true; } - bool PlanetGravity::isInRangeSquare(f32 radius) const { f32 range = mRange; if (range < 0.0f) { return true; - } - else { + } else { f32 distance = range + mDistant; return radius < distance * distance; } @@ -77,16 +75,15 @@ bool PlanetGravity::isInRangeDistance(f32 radius) const { if (range < 0.0f) { return true; - } - else { + } else { f32 distance = range + mDistant; return radius < distance; } } -bool PlanetGravity::calcGravityFromMassPosition(TVec3f *pDirection, f32 *pScalar, const TVec3f &rPosition, const TVec3f &rMassPosition) const { +bool PlanetGravity::calcGravityFromMassPosition(TVec3f* pDirection, f32* pScalar, const TVec3f& rPosition, const TVec3f& rMassPosition) const { TVec3f direction = rMassPosition - rPosition; - f32 scalar; + f32 scalar; MR::separateScalarAndDirection(&scalar, &direction, direction); @@ -103,7 +100,6 @@ bool PlanetGravity::calcGravityFromMassPosition(TVec3f *pDirection, f32 *pScalar return true; } - void PlanetGravity::updateIdentityMtx() { TPos3f mtx; mtx.identity(); diff --git a/src/Game/Gravity/PlanetGravityManager.cpp b/src/Game/Gravity/PlanetGravityManager.cpp index 0279e1c2a..7819c9430 100644 --- a/src/Game/Gravity/PlanetGravityManager.cpp +++ b/src/Game/Gravity/PlanetGravityManager.cpp @@ -1,115 +1,112 @@ #include "Game/Gravity.hpp" -PlanetGravityManager::PlanetGravityManager(const char *pName) : NameObj(pName) { - mNumGravities = 0; +PlanetGravityManager::PlanetGravityManager(const char* pName) + : NameObj(pName) { + mNumGravities = 0; } -void PlanetGravityManager::init(const JMapInfoIter &rIter) { - +void PlanetGravityManager::init(const JMapInfoIter& rIter) { } +bool PlanetGravityManager::calcTotalGravityVector(TVec3f* pGravity, GravityInfo* pInfo, const TVec3f& rPosition, u32 gravityType, u32 host) const { + TVec3f totalGravity; + totalGravity.z = 0.0f; + totalGravity.y = 0.0f; + totalGravity.x = 0.0f; -bool PlanetGravityManager::calcTotalGravityVector(TVec3f *pGravity, GravityInfo *pInfo, const TVec3f &rPosition, u32 gravityType, u32 host) const { - TVec3f totalGravity; - totalGravity.z = 0.0f; - totalGravity.y = 0.0f; - totalGravity.x = 0.0f; + PlanetGravity** pGravities = (PlanetGravity**)&mGravities; + bool hasCalculated = false; - PlanetGravity** pGravities = (PlanetGravity**)&mGravities; - bool hasCalculated = false; + if (pInfo) { + pInfo->init(); + } - if (pInfo) { - pInfo->init(); - } + f32 largestScalar = -1.0f; + s32 largestPriority = -1; - f32 largestScalar = -1.0f; - s32 largestPriority = -1; + while (pGravities != &mGravities[mNumGravities]) { + // Is gravity valid/active? + bool validGravity = false; - while (pGravities != &mGravities[mNumGravities]) { - // Is gravity valid/active? - bool validGravity = false; + if ((*pGravities)->mActivated && (*pGravities)->mValidFollower && (*pGravities)->mAppeared) { + validGravity = true; + } - if ((*pGravities)->mActivated && (*pGravities)->mValidFollower && (*pGravities)->mAppeared) { - validGravity = true; - } + // Gravity is valid, matches specified gravity type(s) and does not have same host + if (validGravity && ((gravityType & (*pGravities)->mGravityType) != 0) && (host != (u32)(*pGravities)->mHost)) { + // Is priority lower -> end of list reached as it's sorted in descending order + s32 priority = (*pGravities)->mPriority; - // Gravity is valid, matches specified gravity type(s) and does not have same host - if (validGravity && ((gravityType & (*pGravities)->mGravityType) != 0) && (host != (u32)(*pGravities)->mHost)) { - // Is priority lower -> end of list reached as it's sorted in descending order - s32 priority = (*pGravities)->mPriority; + if (priority < largestPriority) { + break; + } - if (priority < largestPriority) { - break; - } + // Calculate gravity + TVec3f gravityVec; - // Calculate gravity - TVec3f gravityVec; + if ((*pGravities)->calcGravity(&gravityVec, rPosition)) { + bool storeInfo = false; + f32 scalar = PSVECMag(&gravityVec); - if ((*pGravities)->calcGravity(&gravityVec, rPosition)) { - bool storeInfo = false; - f32 scalar = PSVECMag(&gravityVec); + // If same priority, add gravity vector to total result + if (priority == largestPriority) { + JMathInlineVEC::PSVECAdd(&totalGravity, &gravityVec, &totalGravity); + hasCalculated = true; - // If same priority, add gravity vector to total result - if (priority == largestPriority) { - JMathInlineVEC::PSVECAdd(&totalGravity, &gravityVec, &totalGravity); - hasCalculated = true; + if (largestScalar < scalar) { + storeInfo = true; + } + } + // If larger priority, total gravity gets overriden + else if (priority > largestPriority) { + largestPriority = priority; + hasCalculated = true; + storeInfo = true; + totalGravity = gravityVec; + } - if (largestScalar < scalar) { - storeInfo = true; - } - } - // If larger priority, total gravity gets overriden - else if (priority > largestPriority) { - largestPriority = priority; - hasCalculated = true; - storeInfo = true; - totalGravity = gravityVec; - } + // Try to store gravity info if necessary + if (pInfo && storeInfo) { + largestScalar = scalar; + pInfo->mGravityVector = gravityVec; + pInfo->mLargestPriority = largestPriority; + pInfo->mGravityInstance = *pGravities; + } + } + } - // Try to store gravity info if necessary - if (pInfo && storeInfo) { - largestScalar = scalar; - pInfo->mGravityVector = gravityVec; - pInfo->mLargestPriority = largestPriority; - pInfo->mGravityInstance = *pGravities; - } - } - } + pGravities++; + } - pGravities++; - } + // Store normalized vector as result if necessary + if (pGravity) { + MR::normalizeOrZero(&totalGravity); + *pGravity = totalGravity; + } - // Store normalized vector as result if necessary - if (pGravity) { - MR::normalizeOrZero(&totalGravity); - *pGravity = totalGravity; - } - - return hasCalculated; + return hasCalculated; } +void PlanetGravityManager::registerGravity(PlanetGravity* pGravity) { + pGravity->mIsRegistered = true; + int index = mNumGravities++; + mGravities[index] = pGravity; -void PlanetGravityManager::registerGravity(PlanetGravity *pGravity) { - pGravity->mIsRegistered = true; - int index = mNumGravities++; - mGravities[index] = pGravity; - - sortGravities(); + sortGravities(); } inline void PlanetGravityManager::sortGravities() { - for (s32 i = mNumGravities - 1; i >= 1; i--) { - if (mGravities[i]->mPriority > mGravities[i - 1]->mPriority) { - bubbleDown(i); - } - else { - break; - } - } + for (s32 i = mNumGravities - 1; i >= 1; i--) { + if (mGravities[i]->mPriority > mGravities[i - 1]->mPriority) { + bubbleDown(i); + } else { + break; + } + } } inline void PlanetGravityManager::bubbleDown(int i) { - PlanetGravity *temp = mGravities[i - 1]; - mGravities[i - 1] = mGravities[i]; - mGravities[i] = temp; + PlanetGravity* temp = mGravities[i - 1]; + mGravities[i - 1] = mGravities[i]; + mGravities[i] = temp; } diff --git a/src/Game/Gravity/PointGravity.cpp b/src/Game/Gravity/PointGravity.cpp index 43864e399..cf38cfbc5 100644 --- a/src/Game/Gravity/PointGravity.cpp +++ b/src/Game/Gravity/PointGravity.cpp @@ -1,52 +1,49 @@ #include "Game/Gravity.hpp" #include "Game/Util.hpp" -PointGravity::PointGravity() : - PlanetGravity(), - mOrigPosition(0, 0, 0), - mTranslation(0, 0, 0) -{ - +PointGravity::PointGravity() + : PlanetGravity(), + mOrigPosition(0, 0, 0), + mTranslation(0, 0, 0) { } -bool PointGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f &rPosition) const { - TVec3f direction = mTranslation - rPosition; - f32 distance = PSVECMag(&direction); +bool PointGravity::calcOwnGravityVector(TVec3f* pDest, f32* pScalar, const TVec3f& rPosition) const { + TVec3f direction = mTranslation - rPosition; + f32 distance = PSVECMag(&direction); - // Epsilon-equals zero? If so, direction is the zero vector. - if (MR::isNearZero(distance, 0.01f)) { - direction.z = 0.0f; - direction.y = 0.0f; - direction.x = 0.0f; - } - // Otherwise, it's a proper direction and it should be normalized. - else { + // Epsilon-equals zero? If so, direction is the zero vector. + if (MR::isNearZero(distance, 0.01f)) { + direction.z = 0.0f; + direction.y = 0.0f; + direction.x = 0.0f; + } + // Otherwise, it's a proper direction and it should be normalized. + else { f32 scalar = 1.0f / distance; - direction.x *= scalar; - direction.y *= scalar; - direction.z *= scalar; - } + direction.x *= scalar; + direction.y *= scalar; + direction.z *= scalar; + } - // Out of range? If so, don't update result vector & scalar - if (!isInRangeDistance(distance)) { - return false; - } - // Update result vector & scalar if applicable - else { - if (pDest) { - pDest->setPS2(direction); - } - if (pScalar) { - *pScalar = distance; - } + // Out of range? If so, don't update result vector & scalar + if (!isInRangeDistance(distance)) { + return false; + } + // Update result vector & scalar if applicable + else { + if (pDest) { + pDest->setPS2(direction); + } + if (pScalar) { + *pScalar = distance; + } - return true; - } + return true; + } } - -void PointGravity::updateMtx(const TPos3f &rMtx) { - // Converts relative zone-coordinates into worldspace - // mTranslation = rMtx * mOrigPosition - rMtx.mult(mOrigPosition, mTranslation); +void PointGravity::updateMtx(const TPos3f& rMtx) { + // Converts relative zone-coordinates into worldspace + // mTranslation = rMtx * mOrigPosition + rMtx.mult(mOrigPosition, mTranslation); } diff --git a/src/Game/Gravity/SegmentGravity.cpp b/src/Game/Gravity/SegmentGravity.cpp index 5b8acaa9b..bda1dc577 100644 --- a/src/Game/Gravity/SegmentGravity.cpp +++ b/src/Game/Gravity/SegmentGravity.cpp @@ -2,131 +2,125 @@ #include "Game/Util.hpp" #include -SegmentGravity::SegmentGravity() : - PlanetGravity(), - mSideVector(1, 0, 0), - mOppositeSideVecOrtho(1, 0, 0), - mWorldOppositeSideVecOrtho(1, 0, 0), - mAxis(0, 0, 0) -{ - mAxisLength = 0.0f; - mValidSideDegree = 360.0f; - mValidSideCos = -1.0f; +SegmentGravity::SegmentGravity() + : PlanetGravity(), + mSideVector(1, 0, 0), + mOppositeSideVecOrtho(1, 0, 0), + mWorldOppositeSideVecOrtho(1, 0, 0), + mAxis(0, 0, 0) { + mAxisLength = 0.0f; + mValidSideDegree = 360.0f; + mValidSideCos = -1.0f; - for (u32 i = 0 ; i < 2 ; i++) { - mGravityPoints[i].zero(); - mWorldGravityPoints[i].zero(); - mHemisphereExtension[i] = 0.0f; - mEdges[i] = true; - } + for (u32 i = 0; i < 2; i++) { + mGravityPoints[i].zero(); + mWorldGravityPoints[i].zero(); + mHemisphereExtension[i] = 0.0f; + mEdges[i] = true; + } } -bool SegmentGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f &rPos) const { +bool SegmentGravity::calcOwnGravityVector(TVec3f* pDest, f32* pScalar, const TVec3f& rPos) const { TVec3f relPosFromBase = rPos - mWorldGravityPoints[0]; - f32 axisY = relPosFromBase.dot(mAxis); - if(-1.0f < mValidSideCos) { - if(!mWorldOppositeSideVecOrtho.isZero()) { + f32 axisY = relPosFromBase.dot(mAxis); + if (-1.0f < mValidSideCos) { + if (!mWorldOppositeSideVecOrtho.isZero()) { TVec3f dirOnBasePlane = relPosFromBase - mAxis * axisY; MR::normalizeOrZero(&dirOnBasePlane); - if(dirOnBasePlane.dot(mWorldOppositeSideVecOrtho) < mValidSideCos) { + if (dirOnBasePlane.dot(mWorldOppositeSideVecOrtho) < mValidSideCos) { return false; } } } TVec3f attraction; - if(axisY < mHemisphereExtension[0]) { - if(!mEdges[0]) { + if (axisY < mHemisphereExtension[0]) { + if (!mEdges[0]) { return false; - } - else { + } else { attraction = mWorldGravityPoints[0]; } - } - else { - if(axisY > mAxisLength - mHemisphereExtension[1]) { - if(!mEdges[1]) { + } else { + if (axisY > mAxisLength - mHemisphereExtension[1]) { + if (!mEdges[1]) { return false; } attraction = mWorldGravityPoints[1]; - } - else { + } else { attraction = mWorldGravityPoints[0] + mAxis * axisY; - } } TVec3f gravity = attraction - rPos; - f32 distance; + f32 distance; MR::separateScalarAndDirection(&distance, &gravity, gravity); - if(!isInRangeDistance(distance)) { + if (!isInRangeDistance(distance)) { return false; } - if(pDest) { + if (pDest) { *pDest = gravity; } - if(pScalar) { + if (pScalar) { *pScalar = distance; } return true; } - - void SegmentGravity::updateLocalParam() { TRot3f rot; // Both of these variables are present because the codegen indicates they should be. // In the final game, however, they have no behavioral effect and are not given any storage. - bool artifact = true; - bool &rArtifact = artifact; + bool artifact = true; + bool& rArtifact = artifact; mValidSideCos = JMath::sSinCosTable.cosLap(0.5f * mValidSideDegree); TVec3f localAxis = mGravityPoints[1] - mGravityPoints[0]; MR::normalizeOrZero(&localAxis); - if(MR::isNearZero(localAxis, 0.00100000005f)) { + if (MR::isNearZero(localAxis, 0.00100000005f)) { rArtifact = false; mOppositeSideVecOrtho.zero(); return; } JMAVECScaleAdd(&localAxis, &mSideVector, &mOppositeSideVecOrtho, -localAxis.dot(mSideVector)); MR::normalizeOrZero(&mOppositeSideVecOrtho); - if(MR::isNearZero(mOppositeSideVecOrtho, 0.00100000005f)) { + if (MR::isNearZero(mOppositeSideVecOrtho, 0.00100000005f)) { mOppositeSideVecOrtho.zero(); return; } - + rot.identity(); rot.setRotateInline2(localAxis, 0.5f * mValidSideDegree * (PI / 180)); // Necessary to force the compiler to load the arguments to `mult` in the correct order rArtifact = false; - if(!artifact) { + if (!artifact) { rot.mult(mOppositeSideVecOrtho, mOppositeSideVecOrtho); } } -void SegmentGravity::setGravityPoint(u32 index, const TVec3f &rGravityPoint) { - mGravityPoints[index != 0] = rGravityPoint; - updateLocalParam(); +void SegmentGravity::setGravityPoint(u32 index, const TVec3f& rGravityPoint) { + mGravityPoints[index != 0] = rGravityPoint; + updateLocalParam(); } -void SegmentGravity::setSideVector(const TVec3f &rSideVec) { - mSideVector = rSideVec; - MR::normalizeOrZero(&mSideVector); - updateLocalParam(); +void SegmentGravity::setSideVector(const TVec3f& rSideVec) { + mSideVector = rSideVec; + MR::normalizeOrZero(&mSideVector); + updateLocalParam(); } void SegmentGravity::setValidSideDegree(f32 val) { - mValidSideDegree = val;; - updateLocalParam(); + mValidSideDegree = val; + ; + updateLocalParam(); } void SegmentGravity::setEdgeValid(u32 index, bool val) { - mEdges[index != 0] = val; + mEdges[index != 0] = val; } -void SegmentGravity::updateMtx(const TPos3f &rMtx) { - for(s32 i = 0; i < 2; i++) { +void SegmentGravity::updateMtx(const TPos3f& rMtx) { + for (s32 i = 0; i < 2; i++) { rMtx.mult(mGravityPoints[i], mWorldGravityPoints[i]); } rMtx.mult33Inline(mOppositeSideVecOrtho, mWorldOppositeSideVecOrtho); diff --git a/src/Game/Gravity/WireGravity.cpp b/src/Game/Gravity/WireGravity.cpp index 97f66f1a1..5441a4c76 100644 --- a/src/Game/Gravity/WireGravity.cpp +++ b/src/Game/Gravity/WireGravity.cpp @@ -2,49 +2,46 @@ #include "Game/Util.hpp" WireGravity::WireGravity() { - } void WireGravity::setPointListSize(u32 numPoints) { - mPoints.init(numPoints); - mPoints.clear(); + mPoints.init(numPoints); + mPoints.clear(); } -void WireGravity::addPoint(const TVec3f &rPoint) { - mPoints.mArray.mArr[mPoints.mCount++] = rPoint; +void WireGravity::addPoint(const TVec3f& rPoint) { + mPoints.mArray.mArr[mPoints.mCount++] = rPoint; } -bool WireGravity::calcOwnGravityVector(TVec3f *pDest, f32 *pScalar, const TVec3f &rPos) const { +bool WireGravity::calcOwnGravityVector(TVec3f* pDest, f32* pScalar, const TVec3f& rPos) const { - f32 distance = -1.0f; + f32 distance = -1.0f; TVec3f pointOfAttraction; - for(s32 i = 0; i < mPoints.size() - 1; i++) { + for (s32 i = 0; i < mPoints.size() - 1; i++) { // unused TVec3f wireBegin(mPoints[i]); TVec3f wireEnd(mPoints[i + 1]); - TVec3f positionProjectedOntoWire; MR::calcPerpendicFootToLineInside(&positionProjectedOntoWire, rPos, mPoints[i], mPoints[i + 1]); f32 squareDistance = JMathInlineVEC::PSVECSquareDistance(&rPos, &positionProjectedOntoWire); - if(squareDistance < distance || distance < 0.0f) { + if (squareDistance < distance || distance < 0.0f) { pointOfAttraction = positionProjectedOntoWire; distance = squareDistance; - } } - if(!isInRangeSquare(distance)) { + if (!isInRangeSquare(distance)) { return false; } - if(distance >= 0.0f) { - + if (distance >= 0.0f) { + MR::separateScalarAndDirection(pScalar, pDest, pointOfAttraction - rPos); - + return true; } diff --git a/src/Game/LiveActor/ActiveActorList.cpp b/src/Game/LiveActor/ActiveActorList.cpp index b77a3d45b..f997e303d 100644 --- a/src/Game/LiveActor/ActiveActorList.cpp +++ b/src/Game/LiveActor/ActiveActorList.cpp @@ -13,7 +13,7 @@ bool ActiveActorList::isFull() const { return mCurCount >= mMaxCount; } -void ActiveActorList::addActor(LiveActor *pActor) { +void ActiveActorList::addActor(LiveActor* pActor) { if (!hasTooMany()) { mActorList[mCurCount] = pActor; mCurCount++; @@ -30,8 +30,7 @@ void ActiveActorList::removeDeadActor() { s32 newCount = mCurCount - 1; mActorList[newCount] = 0; mCurCount--; - } - else { + } else { ++cur; ++idx; } diff --git a/src/Game/LiveActor/ActorCameraInfo.cpp b/src/Game/LiveActor/ActorCameraInfo.cpp index c211e1307..32667576e 100644 --- a/src/Game/LiveActor/ActorCameraInfo.cpp +++ b/src/Game/LiveActor/ActorCameraInfo.cpp @@ -2,10 +2,9 @@ #include "Game/Util/JMapUtil.hpp" #include "Game/Util/SceneUtil.hpp" -ActorCameraInfo::ActorCameraInfo(const JMapInfoIter &rIter) : - mCameraSetID(-1), - mZoneID(0) -{ +ActorCameraInfo::ActorCameraInfo(const JMapInfoIter& rIter) + : mCameraSetID(-1), + mZoneID(0) { s32 cameraSetID = -1; if (MR::getJMapInfoCameraSetID(rIter, &cameraSetID)) { @@ -15,9 +14,7 @@ ActorCameraInfo::ActorCameraInfo(const JMapInfoIter &rIter) : mZoneID = MR::getPlacedZoneId(rIter); } -ActorCameraInfo::ActorCameraInfo(s32 cameraSetID, s32 zoneID) : - mCameraSetID(cameraSetID), - mZoneID(zoneID) -{ - +ActorCameraInfo::ActorCameraInfo(s32 cameraSetID, s32 zoneID) + : mCameraSetID(cameraSetID), + mZoneID(zoneID) { } diff --git a/src/Game/LiveActor/ActorJointCtrl.cpp b/src/Game/LiveActor/ActorJointCtrl.cpp index 9d1d09646..541e22279 100644 --- a/src/Game/LiveActor/ActorJointCtrl.cpp +++ b/src/Game/LiveActor/ActorJointCtrl.cpp @@ -4,7 +4,7 @@ #include "Game/LiveActor/IKJointCtrl.hpp" #include "Game/LiveActor/LiveActor.hpp" -ActorJointCtrl::ActorJointCtrl(LiveActor *pActor) { +ActorJointCtrl::ActorJointCtrl(LiveActor* pActor) { mActor = pActor; mJointCtrlKeeper = 0; mFaceJointCtrl = 0; @@ -22,10 +22,10 @@ ActorJointCtrl::ActorJointCtrl(LiveActor *pActor) { } } -void ActorJointCtrl::startDynamicCtrl(const char *pName, s32 val) { +void ActorJointCtrl::startDynamicCtrl(const char* pName, s32 val) { mJointCtrlKeeper->startCtrl(pName, val); } -void ActorJointCtrl::endDynamicCtrl(const char *pName, s32 val) { +void ActorJointCtrl::endDynamicCtrl(const char* pName, s32 val) { mJointCtrlKeeper->endCtrl(pName, val); } @@ -41,11 +41,11 @@ void ActorJointCtrl::endFaceCtrl(s32 val) { mFaceJointCtrl->endCtrl(val); } -void ActorJointCtrl::setIKEndPosition(const char *pName, const TVec3f &a2, f32 a3) { +void ActorJointCtrl::setIKEndPosition(const char* pName, const TVec3f& a2, f32 a3) { mJointCtrlHolder->setEndPosition(pName, a2, a3); } -void ActorJointCtrl::setIKEndDirection(const char *pName, const TVec3f &a2, f32 a3) { +void ActorJointCtrl::setIKEndDirection(const char* pName, const TVec3f& a2, f32 a3) { mJointCtrlHolder->setEndDirection(pName, a2, a3); } diff --git a/src/Game/LiveActor/ActorLightCtrl.cpp b/src/Game/LiveActor/ActorLightCtrl.cpp index cc8940b68..925a29195 100644 --- a/src/Game/LiveActor/ActorLightCtrl.cpp +++ b/src/Game/LiveActor/ActorLightCtrl.cpp @@ -3,7 +3,7 @@ #include "Game/NameObj/NameObjExecuteHolder.hpp" #include "Game/Util.hpp" -ActorLightCtrl::ActorLightCtrl(const LiveActor *pActor) +ActorLightCtrl::ActorLightCtrl(const LiveActor* pActor) : mActor(pActor), _4(-1), _8(0), _C(0), mAreaLightInf(0), mLightID() { _1C = 0; mInterpolate = -1; @@ -36,14 +36,13 @@ void ActorLightCtrl::loadLight() const { if (mAreaLightInf) { if (_1C) { LightFunction::loadActorLightInfo(&mLightInfo); - } - else { + } else { LightFunction::loadActorLightInfo(getTargetActorLight(mAreaLightInf)); } } } -bool ActorLightCtrl::isSameLight(const ActorLightCtrl *pLight) const { +bool ActorLightCtrl::isSameLight(const ActorLightCtrl* pLight) const { if (_1C) { return false; } @@ -63,7 +62,7 @@ void ActorLightCtrl::initActorLightInfo() { if (_C) { return; } - + MR::findActorLightInfo(mActor); return; } @@ -76,21 +75,18 @@ void ActorLightCtrl::resetCurrentLightInfo() { _54 = 0; } -const ActorLightInfo* ActorLightCtrl::getTargetActorLight(const AreaLightInfo *pInfo) const { +const ActorLightInfo* ActorLightCtrl::getTargetActorLight(const AreaLightInfo* pInfo) const { s32 type = _4; if (type == 0) { return &pInfo->mPlayerLight; - } - else if (type == 1) { + } else if (type == 1) { return &pInfo->mStrongLight; - } - else if (type == 2) { + } else if (type == 2) { return &pInfo->mWeakLight; - } - else if (type == 3) { + } else if (type == 3) { return &pInfo->mPlanetLight; } - + return 0; } diff --git a/src/Game/LiveActor/ActorStateKeeper.cpp b/src/Game/LiveActor/ActorStateKeeper.cpp index 9d11c4eb5..311240406 100644 --- a/src/Game/LiveActor/ActorStateKeeper.cpp +++ b/src/Game/LiveActor/ActorStateKeeper.cpp @@ -1,27 +1,26 @@ #include "Game/LiveActor/ActorStateKeeper.hpp" #include "Game/LiveActor/Nerve.hpp" -ActorStateKeeper::ActorStateKeeper(int capacity) : - mStatesCapacity(capacity), - mLength(0), - mStates(nullptr), - mCurrentState(nullptr) -{ - mStates = new State[capacity]; +ActorStateKeeper::ActorStateKeeper(int capacity) + : mStatesCapacity(capacity), + mLength(0), + mStates(nullptr), + mCurrentState(nullptr) { + mStates = new State[capacity]; - for (s32 i = 0; i < mStatesCapacity; i++) { - State& e = mStates[i]; - e.mInterface = nullptr; - e.mNerve = nullptr; - e.mName = nullptr; - } + for (s32 i = 0; i < mStatesCapacity; i++) { + State& e = mStates[i]; + e.mInterface = nullptr; + e.mNerve = nullptr; + e.mName = nullptr; + } } bool ActorStateKeeper::updateCurrentState() { return (!mCurrentState) ? false : (mCurrentState->mInterface)->update(); } -void ActorStateKeeper::startState(const Nerve *pNerve) { +void ActorStateKeeper::startState(const Nerve* pNerve) { mCurrentState = findStateInfo(pNerve); if (mCurrentState) { @@ -30,7 +29,7 @@ void ActorStateKeeper::startState(const Nerve *pNerve) { } } -void ActorStateKeeper::endState(const Nerve *pNerve) { +void ActorStateKeeper::endState(const Nerve* pNerve) { mCurrentState = findStateInfo(pNerve); if (mCurrentState) { @@ -43,19 +42,19 @@ void ActorStateKeeper::endState(const Nerve *pNerve) { } void ActorStateKeeper::addState(ActorStateBaseInterface* pInterface, const Nerve* pNerve, const char* pName) { - State& e = mStates[mLength]; - e.mInterface = pInterface; - e.mNerve = pNerve; - e.mName = pName; - mLength += 1; + State& e = mStates[mLength]; + e.mInterface = pInterface; + e.mNerve = pNerve; + e.mName = pName; + mLength += 1; } -ActorStateKeeper::State* ActorStateKeeper::findStateInfo(const Nerve *pNerve) { - for (int i = 0; i < mLength; i++) { - if (mStates[i].mNerve == pNerve) { +ActorStateKeeper::State* ActorStateKeeper::findStateInfo(const Nerve* pNerve) { + for (int i = 0; i < mLength; i++) { + if (mStates[i].mNerve == pNerve) { return &mStates[i]; } - } + } - return nullptr; + return nullptr; } diff --git a/src/Game/LiveActor/AllLiveActorGroup.cpp b/src/Game/LiveActor/AllLiveActorGroup.cpp index 0db22ddba..ee1620c89 100644 --- a/src/Game/LiveActor/AllLiveActorGroup.cpp +++ b/src/Game/LiveActor/AllLiveActorGroup.cpp @@ -2,15 +2,16 @@ #include "Game/LiveActor/ClippingDirector.hpp" #include "Game/Scene/SceneObjHolder.hpp" -AllLiveActorGroup::AllLiveActorGroup() : LiveActorGroup("AllLiveActorGroup", 0xA00) { +AllLiveActorGroup::AllLiveActorGroup() + : LiveActorGroup("AllLiveActorGroup", 0xA00) { _18 = 0; } -void AllLiveActorGroup::initActorSystemInfo(const JMapInfoIter &rIter) { +void AllLiveActorGroup::initActorSystemInfo(const JMapInfoIter& rIter) { if (mObjectCount <= 0) { return; } - + s32 cnt = _18; if (cnt == mObjectCount) { @@ -36,7 +37,7 @@ namespace MR { pAllLiveActorGroup->_18 = pAllLiveActorGroup->mObjectCount; } - void initLiveActorSystemInfo(const JMapInfoIter &rIter) { + void initLiveActorSystemInfo(const JMapInfoIter& rIter) { AllLiveActorGroup* pAllLiveActorGroup = getAllLiveActorGroup(); pAllLiveActorGroup->initActorSystemInfo(rIter); @@ -47,8 +48,7 @@ namespace MR { MR::getClippingDirector()->endInitActorSystemInfo(); } -}; +}; // namespace MR AllLiveActorGroup::~AllLiveActorGroup() { - } diff --git a/src/Game/LiveActor/AnimationRandomPlayer.cpp b/src/Game/LiveActor/AnimationRandomPlayer.cpp index 155691e84..41884483b 100644 --- a/src/Game/LiveActor/AnimationRandomPlayer.cpp +++ b/src/Game/LiveActor/AnimationRandomPlayer.cpp @@ -4,7 +4,8 @@ NrvAnimationRandomPlayer::HostTypeWait NrvAnimationRandomPlayer::HostTypeWait::sInstance; NrvAnimationRandomPlayer::HostTypePlay NrvAnimationRandomPlayer::HostTypePlay::sInstance; -AnimationRandomPlayer::AnimationRandomPlayer(const LiveActor *pActor, const char *a2, const char *a3, s32 a4, f32 a5) : NerveExecutor(a2) { +AnimationRandomPlayer::AnimationRandomPlayer(const LiveActor* pActor, const char* a2, const char* a3, s32 a4, f32 a5) + : NerveExecutor(a2) { mActor = pActor; _C = a2; _10 = a3; @@ -26,7 +27,7 @@ void AnimationRandomPlayer::exeWait() { if (_10) { MR::startAllAnim(mActor, _10); } - } + } if (MR::isStep(this, _14)) { setNerve(&NrvAnimationRandomPlayer::HostTypePlay::sInstance); @@ -46,5 +47,4 @@ void AnimationRandomPlayer::exePlay() { } AnimationRandomPlayer::~AnimationRandomPlayer() { - } \ No newline at end of file diff --git a/src/Game/LiveActor/Binder.cpp b/src/Game/LiveActor/Binder.cpp index 8028d1095..f53fdab93 100644 --- a/src/Game/LiveActor/Binder.cpp +++ b/src/Game/LiveActor/Binder.cpp @@ -1,8 +1,7 @@ #include "Game/LiveActor/Binder.hpp" #include "Game/Map/HitInfo.hpp" -HitInfo &HitInfo::operator=(const HitInfo &rOther) -{ +HitInfo& HitInfo::operator=(const HitInfo& rOther) { mParentTriangle.mParts = rOther.mParentTriangle.mParts; mParentTriangle.mIdx = rOther.mParentTriangle.mIdx; mParentTriangle.mSensor = rOther.mParentTriangle.mSensor; @@ -22,12 +21,11 @@ HitInfo &HitInfo::operator=(const HitInfo &rOther) return *this; } -Binder::Binder(MtxPtr mtx, const TVec3f *v1, const TVec3f *v2, f32 a, f32 b, u32 c) : BinderParent(mtx), _10(v1), _14(v2), mRadius(a), _1C(b), mOffsetVec(0), _24(c), mPlaneNum(0), mPlaneInfos(0), mFixReactionVector(0, 0, 0), mGroundInfo(), mWallInfo(), mRoofInfo(), _C8(131076.953125f), _158(131076.953125f), _1E8(131076.953125f) -{ +Binder::Binder(MtxPtr mtx, const TVec3f* v1, const TVec3f* v2, f32 a, f32 b, u32 c) + : BinderParent(mtx), _10(v1), _14(v2), mRadius(a), _1C(b), mOffsetVec(0), _24(c), mPlaneNum(0), mPlaneInfos(0), mFixReactionVector(0, 0, 0), mGroundInfo(), mWallInfo(), mRoofInfo(), _C8(131076.953125f), _158(131076.953125f), _1E8(131076.953125f) { if (!_24) { mPlaneInfos = nullptr; - } - else { + } else { mPlaneInfos = new HitInfo[_24]; } clear(); diff --git a/src/Game/LiveActor/ClippingActorHolder.cpp b/src/Game/LiveActor/ClippingActorHolder.cpp index e767626fa..991156cd3 100644 --- a/src/Game/LiveActor/ClippingActorHolder.cpp +++ b/src/Game/LiveActor/ClippingActorHolder.cpp @@ -8,15 +8,14 @@ namespace { static int sActorNumMax = 2560; }; -ClippingActorHolder::ClippingActorHolder() : - NameObj("クリッピングアクター保持"), - _C(0), - _10(nullptr), - _14(nullptr), - _18(nullptr), - _1C(nullptr), - mViewGroupCtrl(nullptr) -{ +ClippingActorHolder::ClippingActorHolder() + : NameObj("クリッピングアクター保持"), + _C(0), + _10(nullptr), + _14(nullptr), + _18(nullptr), + _1C(nullptr), + mViewGroupCtrl(nullptr) { _10 = new ClippingActorInfoList(sActorNumMax); _14 = new ClippingActorInfoList(sActorNumMax); _18 = new ClippingActorInfoList(sActorNumMax); @@ -32,13 +31,13 @@ void ClippingActorHolder::movement() { } } -void ClippingActorHolder::registerActor(LiveActor *pActor) { +void ClippingActorHolder::registerActor(LiveActor* pActor) { ClippingActorInfo* inf = new ClippingActorInfo(pActor); _18->add(inf); _C++; } -void ClippingActorHolder::initSystemInfo(LiveActor *pActor, const JMapInfoIter &rIter) { +void ClippingActorHolder::initSystemInfo(LiveActor* pActor, const JMapInfoIter& rIter) { s32 viewGroupID = -1; if (MR::getJMapInfoViewGroupID(rIter, &viewGroupID)) { @@ -55,39 +54,35 @@ void ClippingActorHolder::initViewGroupTable() { mViewGroupCtrl->endInitViewGroupTable(); } -void ClippingActorHolder::entryLodCtrl(LodCtrl *pLod, const JMapInfoIter &rIter) { +void ClippingActorHolder::entryLodCtrl(LodCtrl* pLod, const JMapInfoIter& rIter) { mViewGroupCtrl->entryLodCtrl(pLod, rIter); } -void ClippingActorHolder::validateClipping(LiveActor *pActor) { +void ClippingActorHolder::validateClipping(LiveActor* pActor) { pActor->mFlag.mIsInvalidClipping = false; ClippingActorInfo* inf = _14->remove(pActor); if (MR::isDead(pActor)) { _18->add(inf); - } - else { + } else { if (inf->isGroupClipping()) { _1C->add(inf); - } - else { + } else { _10->add(inf); - } + } } } -void ClippingActorHolder::invalidateClipping(LiveActor *pActor) { +void ClippingActorHolder::invalidateClipping(LiveActor* pActor) { pActor->mFlag.mIsInvalidClipping = true; ClippingActorInfo* inf; if (MR::isDead(pActor)) { inf = _18->remove(pActor); - } - else { + } else { if (_10->isInList(pActor)) { inf = _10->remove(pActor); - } - else { + } else { inf = _1C->remove(pActor); } } @@ -98,13 +93,13 @@ void ClippingActorHolder::invalidateClipping(LiveActor *pActor) { } } -void ClippingActorHolder::setTypeToSphere(LiveActor *pActor, f32 range, const TVec3f *a3) { +void ClippingActorHolder::setTypeToSphere(LiveActor* pActor, f32 range, const TVec3f* a3) { find(pActor)->setTypeToSphere(range, a3); } #ifdef NON_MATCHING // cast issues -void ClippingActorHolder::setFarClipLevel(LiveActor *pActor, s32 level) { +void ClippingActorHolder::setFarClipLevel(LiveActor* pActor, s32 level) { find(pActor)->mFarClipLevel = level; } #endif \ No newline at end of file diff --git a/src/Game/LiveActor/ClippingActorInfo.cpp b/src/Game/LiveActor/ClippingActorInfo.cpp index acf74c403..1b3242b29 100644 --- a/src/Game/LiveActor/ClippingActorInfo.cpp +++ b/src/Game/LiveActor/ClippingActorInfo.cpp @@ -3,7 +3,7 @@ #include "Game/LiveActor/LiveActor.hpp" #include "Game/Util.hpp" -ClippingActorInfo::ClippingActorInfo(LiveActor *pActor) { +ClippingActorInfo::ClippingActorInfo(LiveActor* pActor) { mActor = pActor; _4 = 0; _8 = 0.0f; @@ -19,8 +19,7 @@ void ClippingActorInfo::judgeClipping() { if (!MR::isClipped(mActor)) { mActor->startClipped(); } - } - else { + } else { if (MR::isClipped(mActor)) { mActor->endClipped(); } @@ -44,24 +43,23 @@ bool ClippingActorInfo::isGroupClipping() const { return mInfo; } -void ClippingActorInfo::setTypeToSphere(f32 a1, const TVec3f *a2) { +void ClippingActorInfo::setTypeToSphere(f32 a1, const TVec3f* a2) { _8 = a1; if (!a2) { _4 = &mActor->mPosition; - } - else { + } else { _4 = a2; } } #ifdef NON_MATCHING -void ClippingActorInfo::setGroupClippingNo(const JMapInfoIter &rIter) { +void ClippingActorInfo::setGroupClippingNo(const JMapInfoIter& rIter) { JMapIdInfo* id_info = new JMapIdInfo(); *id_info = MR::createJMapIdInfoFromClippingGroupId(rIter); - mInfo = id_info; + mInfo = id_info; } #endif - + ClippingActorInfoList::ClippingActorInfoList(int a1) { _0 = a1; _4 = 0; @@ -74,12 +72,12 @@ ClippingActorInfoList::ClippingActorInfoList(int a1) { } } -void ClippingActorInfoList::add(ClippingActorInfo *pInfo) { +void ClippingActorInfoList::add(ClippingActorInfo* pInfo) { mClippingActorList[_4] = pInfo; _4++; } -ClippingActorInfo* ClippingActorInfoList::find(const LiveActor *pActor, s32 *pIndex) const { +ClippingActorInfo* ClippingActorInfoList::find(const LiveActor* pActor, s32* pIndex) const { for (s32 i = 0; i < _4; i++) { ClippingActorInfo* inf = mClippingActorList[i]; @@ -97,7 +95,7 @@ ClippingActorInfo* ClippingActorInfoList::find(const LiveActor *pActor, s32 *pIn // ClippingActorInfoList::findOrNone -bool ClippingActorInfoList::isInList(const LiveActor *pActor) const { +bool ClippingActorInfoList::isInList(const LiveActor* pActor) const { for (s32 i = 0; i < _4; i++) { ClippingActorInfo* inf = mClippingActorList[i]; if (inf->mActor == pActor) { diff --git a/src/Game/LiveActor/ClippingDirector.cpp b/src/Game/LiveActor/ClippingDirector.cpp index 92086c1d0..daa23ea99 100644 --- a/src/Game/LiveActor/ClippingDirector.cpp +++ b/src/Game/LiveActor/ClippingDirector.cpp @@ -6,12 +6,11 @@ #include "Game/Util/JMapUtil.hpp" #include "Game/Util/ObjUtil.hpp" -ClippingDirector::ClippingDirector() : - NameObj("クリッピング指揮"), - mJudge(nullptr), - mActorHolder(nullptr), - mGroupHolder(nullptr) -{ +ClippingDirector::ClippingDirector() + : NameObj("クリッピング指揮"), + mJudge(nullptr), + mActorHolder(nullptr), + mGroupHolder(nullptr) { mJudge = new ClippingJudge("クリッピング判定"); mJudge->initWithoutIter(); @@ -34,15 +33,15 @@ void ClippingDirector::movement() { mGroupHolder->movement(); } -void ClippingDirector::registerActor(LiveActor *pActor) { +void ClippingDirector::registerActor(LiveActor* pActor) { mActorHolder->registerActor(pActor); } -void ClippingDirector::initActorSystemInfo(LiveActor *pActor, const JMapInfoIter &rIter) { +void ClippingDirector::initActorSystemInfo(LiveActor* pActor, const JMapInfoIter& rIter) { mActorHolder->initSystemInfo(pActor, rIter); } -void ClippingDirector::joinToGroupClipping(LiveActor *pActor, const JMapInfoIter &rIter, int a3) { +void ClippingDirector::joinToGroupClipping(LiveActor* pActor, const JMapInfoIter& rIter, int a3) { s32 clippingID = -1; MR::getJMapInfoClippingGroupID(rIter, &clippingID); @@ -52,7 +51,7 @@ void ClippingDirector::joinToGroupClipping(LiveActor *pActor, const JMapInfoIter } } -void ClippingDirector::entryLodCtrl(LodCtrl *pLod, const JMapInfoIter &rIter) { +void ClippingDirector::entryLodCtrl(LodCtrl* pLod, const JMapInfoIter& rIter) { mActorHolder->entryLodCtrl(pLod, rIter); } @@ -61,11 +60,11 @@ namespace MR { return MR::getSceneObj(SceneObj_ClippingDirector); } - void addToClippingTarget(LiveActor *pActor) { + void addToClippingTarget(LiveActor* pActor) { getClippingDirector()->mActorHolder->addToClippingTarget(pActor); } - void removeFromClippingTarget(LiveActor *pActor) { + void removeFromClippingTarget(LiveActor* pActor) { getClippingDirector()->mActorHolder->removeFromClippingTarget(pActor); } -}; +}; // namespace MR diff --git a/src/Game/LiveActor/ClippingGroupHolder.cpp b/src/Game/LiveActor/ClippingGroupHolder.cpp index 43693d242..0a8d90289 100644 --- a/src/Game/LiveActor/ClippingGroupHolder.cpp +++ b/src/Game/LiveActor/ClippingGroupHolder.cpp @@ -2,7 +2,8 @@ #include "Game/LiveActor/ClippingActorInfo.hpp" #include "Game/LiveActor/LiveActor.hpp" -ClippingInfoGroup::ClippingInfoGroup(const char *pGroupName, int count) : NameObj(pGroupName) { +ClippingInfoGroup::ClippingInfoGroup(const char* pGroupName, int count) + : NameObj(pGroupName) { _C = count; _10 = 0; _14 = 0; @@ -15,11 +16,11 @@ ClippingInfoGroup::ClippingInfoGroup(const char *pGroupName, int count) : NameOb } } -void ClippingInfoGroup::setGroupNo(const JMapInfoIter &rIter) { +void ClippingInfoGroup::setGroupNo(const JMapInfoIter& rIter) { _18 = new JMapIdInfo(MR::createJMapIdInfoFromClippingGroupId(rIter)); } -void ClippingInfoGroup::registerInfo(ClippingActorInfo *pInfo) { +void ClippingInfoGroup::registerInfo(ClippingActorInfo* pInfo) { _14[_10] = pInfo; _10++; } @@ -70,8 +71,7 @@ void ClippingGroupHolder::movement() { if (!var) { group->startClippedAll(); } - } - else { + } else { u8 var = group->_1C; if (var) { group->endClippedAll(); @@ -80,7 +80,7 @@ void ClippingGroupHolder::movement() { } } -void ClippingGroupHolder::createAndAdd(ClippingActorInfo *pInfo, const JMapInfoIter &rIter, int count) { +void ClippingGroupHolder::createAndAdd(ClippingActorInfo* pInfo, const JMapInfoIter& rIter, int count) { ClippingInfoGroup* group = findGroup(rIter); if (!group) { @@ -90,7 +90,7 @@ void ClippingGroupHolder::createAndAdd(ClippingActorInfo *pInfo, const JMapInfoI group->registerInfo(pInfo); } -ClippingInfoGroup* ClippingGroupHolder::createGroup(ClippingActorInfo *pInfo, const JMapInfoIter &rIter, int count) { +ClippingInfoGroup* ClippingGroupHolder::createGroup(ClippingActorInfo* pInfo, const JMapInfoIter& rIter, int count) { ClippingInfoGroup* group = new ClippingInfoGroup(pInfo->mActor->mName, count); group->setGroupNo(rIter); mInfoGroups[mNumGroups] = group; @@ -100,11 +100,11 @@ ClippingInfoGroup* ClippingGroupHolder::createGroup(ClippingActorInfo *pInfo, co #ifdef NON_MATCHING // reg usage issue, and not reloading the array to return -ClippingInfoGroup* ClippingGroupHolder::findGroup(const JMapInfoIter &rIter) { +ClippingInfoGroup* ClippingGroupHolder::findGroup(const JMapInfoIter& rIter) { JMapIdInfo info = MR::createJMapIdInfoFromClippingGroupId(rIter); for (s32 i = 0; i < mNumGroups; i++) { - bool isFound = false; + bool isFound = false; JMapIdInfo* inf = mInfoGroups[i]->_18; if (*inf == info) { @@ -117,14 +117,13 @@ ClippingInfoGroup* ClippingGroupHolder::findGroup(const JMapInfoIter &rIter) { #endif ClippingInfoGroup::~ClippingInfoGroup() { - } ClippingGroupHolder::~ClippingGroupHolder() { - } -ClippingGroupHolder::ClippingGroupHolder() : NameObj("クリッピングアクター保持") { +ClippingGroupHolder::ClippingGroupHolder() + : NameObj("クリッピングアクター保持") { mNumGroups = 0; mInfoGroups = 0; mInfoGroups = new ClippingInfoGroup*[0x40]; diff --git a/src/Game/LiveActor/ClippingJudge.cpp b/src/Game/LiveActor/ClippingJudge.cpp index a19db27c3..3ee7f3e56 100644 --- a/src/Game/LiveActor/ClippingJudge.cpp +++ b/src/Game/LiveActor/ClippingJudge.cpp @@ -1,7 +1,8 @@ #include "Game/LiveActor/ClippingJudge.hpp" #include "Game/Util.hpp" -ClippingJudge::ClippingJudge(const char *pName) : NameObj(pName), mFrustum() { +ClippingJudge::ClippingJudge(const char* pName) + : NameObj(pName), mFrustum() { for (s32 i = 0; i < 8; i++) { mClipDistances[i] = -1.0f; } @@ -16,8 +17,7 @@ ClippingJudge::ClippingJudge(const char *pName) : NameObj(pName), mFrustum() { mClipDistances[7] = 5000.0f; } -void ClippingJudge::init(const JMapInfoIter &rIter) { - +void ClippingJudge::init(const JMapInfoIter& rIter) { } void ClippingJudge::movement() { @@ -28,16 +28,15 @@ void ClippingJudge::movement() { } } -bool ClippingJudge::isJudgedToClipFrustum(const TVec3f &rVec, f32 a2) const { +bool ClippingJudge::isJudgedToClipFrustum(const TVec3f& rVec, f32 a2) const { return !mFrustum.mayIntersectBall3(rVec, a2); } -bool ClippingJudge::isJudgedToClipFrustum(const TVec3f &rVec, f32 a2, s32 index) const { +bool ClippingJudge::isJudgedToClipFrustum(const TVec3f& rVec, f32 a2, s32 index) const { return (!index) ? !mFrustum.mayIntersectBall3(rVec, a2) : !mClipFrustums[index].mayIntersectBall3(rVec, a2); } // ClippingJudge::calcViewingVolume ClippingJudge::~ClippingJudge() { - } \ No newline at end of file diff --git a/src/Game/LiveActor/DynamicJointCtrl.cpp b/src/Game/LiveActor/DynamicJointCtrl.cpp index 02ec4a8d0..06cfcde7a 100644 --- a/src/Game/LiveActor/DynamicJointCtrl.cpp +++ b/src/Game/LiveActor/DynamicJointCtrl.cpp @@ -16,27 +16,24 @@ JointCtrlRate::JointCtrlRate() { void JointCtrlRate::update() { u32 temp; if (_8 < 0) { - if (_C >= 0) { + if (_C >= 0) { temp = _4; _4 = temp - 1; - if (temp - 1 >= 0) { - _0 = ((f32)(_4 - 1) / (f32)(_4 - 1)); - } - else { - _C = -1; - _0 = 0.0f; - } - } - } - else { + if (temp - 1 >= 0) { + _0 = ((f32)(_4 - 1) / (f32)(_4 - 1)); + } else { + _C = -1; + _0 = 0.0f; + } + } + } else { temp = _4; _4 = temp - 1; if ((temp - 1) >= 0) { _0 = ((f32)(_8 - (temp - 1) / _8)); - } - else { + } else { _8 = -1; _0 = 1.0f; } @@ -78,11 +75,11 @@ void DynamicJointCtrlKeeper::setCallBackFunction() { } } -void DynamicJointCtrlKeeper::startCtrl(const char *pName, s32 a2) { +void DynamicJointCtrlKeeper::startCtrl(const char* pName, s32 a2) { findJointCtrl(pName)->mControlRate->startCtrl(a2); } -void DynamicJointCtrlKeeper::endCtrl(const char *pName, s32 a2) { +void DynamicJointCtrlKeeper::endCtrl(const char* pName, s32 a2) { findJointCtrl(pName)->mControlRate->endCtrl(a2); } @@ -92,7 +89,7 @@ void DynamicJointCtrlKeeper::reset() { } } -DynamicJointCtrl* DynamicJointCtrlKeeper::findJointCtrl(const char *pName) { +DynamicJointCtrl* DynamicJointCtrlKeeper::findJointCtrl(const char* pName) { for (s32 i = 0; i < _4; i++) { if (MR::isEqualString(mControls[i]->mName, pName)) { return mControls[i]; diff --git a/src/Game/LiveActor/FaceJointCtrl.cpp b/src/Game/LiveActor/FaceJointCtrl.cpp index 3a0bb99a9..156d35346 100644 --- a/src/Game/LiveActor/FaceJointCtrl.cpp +++ b/src/Game/LiveActor/FaceJointCtrl.cpp @@ -2,7 +2,7 @@ #include "Game/LiveActor/DynamicJointCtrl.hpp" #include "Game/Util/JointController.hpp" -FaceJointCtrl::FaceJointCtrl(LiveActor *pActor) { +FaceJointCtrl::FaceJointCtrl(LiveActor* pActor) { mHostActor = pActor; _4 = 45.0f; _8 = 0.0f; diff --git a/src/Game/LiveActor/FlashingCtrl.cpp b/src/Game/LiveActor/FlashingCtrl.cpp index 156f83edd..b785acdc1 100644 --- a/src/Game/LiveActor/FlashingCtrl.cpp +++ b/src/Game/LiveActor/FlashingCtrl.cpp @@ -1,7 +1,8 @@ #include "Game/LiveActor/FlashingCtrl.hpp" #include "Game/Util.hpp" -FlashingCtrl::FlashingCtrl(LiveActor *pActor, bool toggleDraw) : NameObj("点滅") { +FlashingCtrl::FlashingCtrl(LiveActor* pActor, bool toggleDraw) + : NameObj("点滅") { mActor = pActor; mToggleDraw = toggleDraw; mIsEnded = true; @@ -14,16 +15,14 @@ FlashingCtrl::FlashingCtrl(LiveActor *pActor, bool toggleDraw) : NameObj("点滅 void FlashingCtrl::movement() { if (!mIsEnded) { s32 curTimer = mTimer; - mTimer = curTimer -1; + mTimer = curTimer - 1; if (curTimer - 1 <= 0 || MR::isClipped(mActor) || MR::isDead(mActor)) { end(); - } - else if (MR::isDemoActive()) { + } else if (MR::isDemoActive()) { if (mToggleDraw && MR::isNoEntryDrawBuffer(mActor)) { MR::onEntryDrawBuffer(mActor); } - } - else if (isNowFlashing()) { + } else if (isNowFlashing()) { updateFlashing(); } } @@ -70,12 +69,11 @@ void FlashingCtrl::updateFlashing() { if (mToggleDraw) { if (isNowOn()) { MR::offEntryDrawBuffer(mActor); - } - else { + } else { MR::onEntryDrawBuffer(mActor); } } } -FlashingCtrl::~FlashingCtrl() { +FlashingCtrl::~FlashingCtrl() { } \ No newline at end of file diff --git a/src/Game/LiveActor/HitSensor.cpp b/src/Game/LiveActor/HitSensor.cpp index c629417a6..6fce829de 100644 --- a/src/Game/LiveActor/HitSensor.cpp +++ b/src/Game/LiveActor/HitSensor.cpp @@ -2,18 +2,17 @@ #include "Game/LiveActor/LiveActor.hpp" #include "Game/LiveActor/SensorHitChecker.hpp" -HitSensor::HitSensor(u32 type, u16 groupSize, f32 radius, LiveActor* pHost) : - mType(type), - mPosition(0.0f, 0.0f, 0.0f), - mRadius(radius), - mSensorCount(0), - mGroupSize(groupSize), - mSensors(nullptr), - mSensorGroup(nullptr), - mValidBySystem(false), - mValidByHost(true), - mHost(pHost) -{ +HitSensor::HitSensor(u32 type, u16 groupSize, f32 radius, LiveActor* pHost) + : mType(type), + mPosition(0.0f, 0.0f, 0.0f), + mRadius(radius), + mSensorCount(0), + mGroupSize(groupSize), + mSensors(nullptr), + mSensorGroup(nullptr), + mValidBySystem(false), + mValidByHost(true), + mHost(pHost) { if (mGroupSize != 0) { mSensors = new HitSensor*[mGroupSize]; diff --git a/src/Game/LiveActor/HitSensorInfo.cpp b/src/Game/LiveActor/HitSensorInfo.cpp index b386c76f8..4435d8ebd 100644 --- a/src/Game/LiveActor/HitSensorInfo.cpp +++ b/src/Game/LiveActor/HitSensorInfo.cpp @@ -3,7 +3,7 @@ #include "Game/LiveActor/LiveActor.hpp" #include "Game/Util/HashUtil.hpp" -HitSensorInfo::HitSensorInfo(const char *pName, HitSensor *pSensor, const TVec3f *a3, MtxPtr mtx, const register TVec3f &a5, bool a6) { +HitSensorInfo::HitSensorInfo(const char* pName, HitSensor* pSensor, const TVec3f* a3, MtxPtr mtx, const register TVec3f& a5, bool a6) { mName = pName; mHashCode = MR::getHashCode(pName); mSensor = pSensor; @@ -13,7 +13,6 @@ HitSensorInfo::HitSensorInfo(const char *pName, HitSensor *pSensor, const TVec3f _18 = a3; _1C = mtx; _20 = a6; - } // HitSensorInfo::update() diff --git a/src/Game/LiveActor/HitSensorKeeper.cpp b/src/Game/LiveActor/HitSensorKeeper.cpp index e47a5c792..c6217879b 100644 --- a/src/Game/LiveActor/HitSensorKeeper.cpp +++ b/src/Game/LiveActor/HitSensorKeeper.cpp @@ -17,31 +17,31 @@ HitSensorKeeper::HitSensorKeeper(int sensorCount) { } } -HitSensor* HitSensorKeeper::add(const char *pName, u32 sensorType, u16 sensorGroupSize, f32 radius, LiveActor *pActor, const TVec3f &a6) { +HitSensor* HitSensorKeeper::add(const char* pName, u32 sensorType, u16 sensorGroupSize, f32 radius, LiveActor* pActor, const TVec3f& a6) { HitSensorInfo* pInfo = new HitSensorInfo(pName, new HitSensor(sensorType, sensorGroupSize, radius, pActor), nullptr, nullptr, a6, false); registHitSensorInfo(pInfo); return pInfo->mSensor; } -HitSensor* HitSensorKeeper::addPos(const char *pName, u32 sensorType, u16 sensorGroupSize, f32 radius, LiveActor * pActor, const TVec3f *pPos, const TVec3f &a7) { +HitSensor* HitSensorKeeper::addPos(const char* pName, u32 sensorType, u16 sensorGroupSize, f32 radius, LiveActor* pActor, const TVec3f* pPos, const TVec3f& a7) { HitSensorInfo* pInfo = new HitSensorInfo(pName, new HitSensor(sensorType, sensorGroupSize, radius, pActor), pPos, nullptr, a7, false); registHitSensorInfo(pInfo); return pInfo->mSensor; } -HitSensor* HitSensorKeeper::addMtx(const char *pName, u32 sensorType, u16 sensorGroupSize, f32 radius, LiveActor *pActor, MtxPtr mtx, const TVec3f &a7) { +HitSensor* HitSensorKeeper::addMtx(const char* pName, u32 sensorType, u16 sensorGroupSize, f32 radius, LiveActor* pActor, MtxPtr mtx, const TVec3f& a7) { HitSensorInfo* pInfo = new HitSensorInfo(pName, new HitSensor(sensorType, sensorGroupSize, radius, pActor), nullptr, mtx, a7, false); registHitSensorInfo(pInfo); return pInfo->mSensor; } -HitSensor* HitSensorKeeper::addCallback(const char *pName, u32 sensorType, u16 sensorGroupSize, f32 radius, LiveActor *pActor) { +HitSensor* HitSensorKeeper::addCallback(const char* pName, u32 sensorType, u16 sensorGroupSize, f32 radius, LiveActor* pActor) { HitSensorInfo* pInfo = new HitSensorInfo(pName, new HitSensor(sensorType, sensorGroupSize, radius, pActor), nullptr, nullptr, TVec3f(0.0f), true); registHitSensorInfo(pInfo); return pInfo->mSensor; } -HitSensor* HitSensorKeeper::getSensor(const char *pSensorName) const { +HitSensor* HitSensorKeeper::getSensor(const char* pSensorName) const { if (mSensorInfosSize == 1) { return mSensorInfos[0]->mSensor; } @@ -104,7 +104,7 @@ HitSensorInfo* HitSensorKeeper::getNthSensorInfo(int n) const { return mSensorInfos[n]; } -HitSensorInfo* HitSensorKeeper::getSensorInfo(const char *pSensorName) const { +HitSensorInfo* HitSensorKeeper::getSensorInfo(const char* pSensorName) const { if (mSensorInfosSize == 1) { return mSensorInfos[0]; } @@ -120,7 +120,7 @@ HitSensorInfo* HitSensorKeeper::getSensorInfo(const char *pSensorName) const { return nullptr; } -void HitSensorKeeper::registHitSensorInfo(HitSensorInfo *pInfo) { +void HitSensorKeeper::registHitSensorInfo(HitSensorInfo* pInfo) { mSensorInfos[mSensorInfosSize] = pInfo; mSensorInfosSize++; pInfo->update(); diff --git a/src/Game/LiveActor/IKJointCtrl.cpp b/src/Game/LiveActor/IKJointCtrl.cpp index 0b9d74900..282a3d71f 100644 --- a/src/Game/LiveActor/IKJointCtrl.cpp +++ b/src/Game/LiveActor/IKJointCtrl.cpp @@ -4,7 +4,7 @@ #include -void IKJointCtrl::setEndPosition(const TVec3f &rPos, f32 a2) { +void IKJointCtrl::setEndPosition(const TVec3f& rPos, f32 a2) { TVec3f joint_pos; MR::copyJointPos(mActor, _B4, &joint_pos); MR::vecBlend(joint_pos, rPos, &joint_pos, a2); @@ -12,7 +12,7 @@ void IKJointCtrl::setEndPosition(const TVec3f &rPos, f32 a2) { _A8 = a2; } -void IKJointCtrl::setEndDirection(const TVec3f &rDirection, f32 a2) { +void IKJointCtrl::setEndDirection(const TVec3f& rDirection, f32 a2) { s32 val = MR::vecBlendSphere(_78, rDirection, &_78, a2); if (!val) { @@ -26,7 +26,7 @@ void IKJointCtrl::endCtrl() { _A8 = 0.0f; _AC = 0.0f; } - + void IKJointCtrl::setCallBackFunction() { if (_B6) { if (_A8 > 0.0f) { @@ -42,16 +42,16 @@ void IKJointCtrl::setCallBackFunction() { } } -bool IKJointCtrl::updateRootJointCallBack(TPos3f *pPos, const JointControllerInfo &rInfo) { +bool IKJointCtrl::updateRootJointCallBack(TPos3f* pPos, const JointControllerInfo& rInfo) { pPos->concat(mJoint->_30, _4); return true; } -bool IKJointCtrl::updateMiddleJointCallBack(TPos3f *pPos, const JointControllerInfo &rInfo) { +bool IKJointCtrl::updateMiddleJointCallBack(TPos3f* pPos, const JointControllerInfo& rInfo) { pPos->concat(mJoint->_60, _34); return true; } -IKJointCtrlHolder::IKJointCtrlHolder(LiveActor *pActor, u32 count) { +IKJointCtrlHolder::IKJointCtrlHolder(LiveActor* pActor, u32 count) { mControls = 0; mNumControls = 0; _8 = 0; @@ -61,7 +61,7 @@ IKJointCtrlHolder::IKJointCtrlHolder(LiveActor *pActor, u32 count) { mNumControls = count; } -void IKJointCtrlHolder::addCtrl(const IKJointCtrlParam &rParam) { +void IKJointCtrlHolder::addCtrl(const IKJointCtrlParam& rParam) { if (mNumControls > _8) { IKJointCtrl* ctrl = new IKJointCtrl(mActor); ctrl->init(rParam); @@ -71,11 +71,11 @@ void IKJointCtrlHolder::addCtrl(const IKJointCtrlParam &rParam) { } } -void IKJointCtrlHolder::setEndPosition(const char *pName, const TVec3f &rPos, f32 a3) { +void IKJointCtrlHolder::setEndPosition(const char* pName, const TVec3f& rPos, f32 a3) { findIKJointCtrl(pName)->setEndPosition(rPos, a3); } -void IKJointCtrlHolder::setEndDirection(const char *pName, const TVec3f &rDirection, f32 a3) { +void IKJointCtrlHolder::setEndDirection(const char* pName, const TVec3f& rDirection, f32 a3) { findIKJointCtrl(pName)->setEndDirection(rDirection, a3); } @@ -87,7 +87,7 @@ void IKJointCtrlHolder::endUpdate() { } #endif -IKJointCtrl* IKJointCtrlHolder::findIKJointCtrl(const char *pName) { +IKJointCtrl* IKJointCtrlHolder::findIKJointCtrl(const char* pName) { for (u32 i = 0; i < mNumControls; i++) { const char* ctrlName = mControls[i]->mName; @@ -95,7 +95,7 @@ IKJointCtrl* IKJointCtrlHolder::findIKJointCtrl(const char *pName) { return mControls[i]; } } - + return 0; } diff --git a/src/Game/LiveActor/LiveActor.cpp b/src/Game/LiveActor/LiveActor.cpp index 49f2705fa..6dea94bfd 100644 --- a/src/Game/LiveActor/LiveActor.cpp +++ b/src/Game/LiveActor/LiveActor.cpp @@ -15,34 +15,32 @@ #include "Game/Util/ModelUtil.hpp" #include -LiveActor::LiveActor(const char* pName) : - NameObj(pName), - mPosition(0.0f, 0.0f, 0.0f), - mRotation(0.0f, 0.0f, 0.0f), - mScale(1.0f, 1.0f, 1.0f), - mVelocity(0.0f, 0.0f, 0.0f), - mGravity(0.0f, -1.0f, 0.0f), - mModelManager(nullptr), - mAnimKeeper(nullptr), - mSpine(nullptr), - mSensorKeeper(nullptr), - mBinder(nullptr), - mRailRider(nullptr), - mEffectKeeper(nullptr), - mSoundObject(nullptr), - mShadowControllerList(nullptr), - mCollisionParts(nullptr), - mStageSwitchCtrl(nullptr), - mStarPointerTarget(nullptr), - mActorLightCtrl(nullptr), - mCameraCtrl(nullptr) -{ +LiveActor::LiveActor(const char* pName) + : NameObj(pName), + mPosition(0.0f, 0.0f, 0.0f), + mRotation(0.0f, 0.0f, 0.0f), + mScale(1.0f, 1.0f, 1.0f), + mVelocity(0.0f, 0.0f, 0.0f), + mGravity(0.0f, -1.0f, 0.0f), + mModelManager(nullptr), + mAnimKeeper(nullptr), + mSpine(nullptr), + mSensorKeeper(nullptr), + mBinder(nullptr), + mRailRider(nullptr), + mEffectKeeper(nullptr), + mSoundObject(nullptr), + mShadowControllerList(nullptr), + mCollisionParts(nullptr), + mStageSwitchCtrl(nullptr), + mStarPointerTarget(nullptr), + mActorLightCtrl(nullptr), + mCameraCtrl(nullptr) { MR::getAllLiveActorGroup()->registerActor(this); MR::getClippingDirector()->registerActor(this); } void LiveActor::init(const JMapInfoIter& rIter) { - } void LiveActor::appear() { @@ -247,8 +245,7 @@ bool LiveActor::receiveMessage(u32 msg, HitSensor* pSender, HitSensor* pReceiver void LiveActor::calcAndSetBaseMtx() { if (MR::getTaken(this)) { MR::setBaseTRMtx(this, MR::getTaken(this)->mHost->getTakingMtx()); - } - else { + } else { TPos3f mtx; if (mRotation.x == 0.0f && mRotation.z == 0.0f) { @@ -389,8 +386,7 @@ void LiveActor::initEffectKeeper(int a1, const char* a2, bool doSort) { void LiveActor::initSound(int param1, bool param2) { if (!param2) { mSoundObject = new AudAnmSoundObject(&mPosition, param1, MR::getCurrentHeap()); - } - else { + } else { mSoundObject = new AudAnmSoundObject(nullptr, param1, MR::getCurrentHeap()); } } @@ -412,7 +408,6 @@ void LiveActor::initActorLightCtrl() { } void LiveActor::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { - } bool LiveActor::receiveMsgPush(HitSensor* pSender, HitSensor* pReceiver) { diff --git a/src/Game/LiveActor/LiveActorGroup.cpp b/src/Game/LiveActor/LiveActorGroup.cpp index 126da705b..e2b6b6b7b 100644 --- a/src/Game/LiveActor/LiveActorGroup.cpp +++ b/src/Game/LiveActor/LiveActorGroup.cpp @@ -2,11 +2,11 @@ #include "Game/LiveActor/LiveActor.hpp" #include "Game/Util.hpp" -LiveActorGroup::LiveActorGroup(const char *pName, int count) : NameObjGroup(pName, count) { - +LiveActorGroup::LiveActorGroup(const char* pName, int count) + : NameObjGroup(pName, count) { } -void LiveActorGroup::registerActor(LiveActor *pActor) { +void LiveActorGroup::registerActor(LiveActor* pActor) { registerObj(pActor); } diff --git a/src/Game/LiveActor/LiveActorGroupArray.cpp b/src/Game/LiveActor/LiveActorGroupArray.cpp index d4d1a42c8..7454b1d50 100644 --- a/src/Game/LiveActor/LiveActorGroupArray.cpp +++ b/src/Game/LiveActor/LiveActorGroupArray.cpp @@ -4,7 +4,8 @@ #include #include -MsgSharedGroup::MsgSharedGroup(const char *pName, s32 a2, const JMapInfoIter &rIter) : LiveActorGroup(_28, a2) { +MsgSharedGroup::MsgSharedGroup(const char* pName, s32 a2, const JMapInfoIter& rIter) + : LiveActorGroup(_28, a2) { mIDInfo = 0; _1C = -1; _20 = 0; @@ -21,7 +22,7 @@ MsgSharedGroup::MsgSharedGroup(const char *pName, s32 a2, const JMapInfoIter &rI mIDInfo = inf; } -void MsgSharedGroup::init(const JMapInfoIter &rIter) { +void MsgSharedGroup::init(const JMapInfoIter& rIter) { MR::connectToScene(this, 6, -1, -1, -1); } @@ -39,25 +40,25 @@ void MsgSharedGroup::movement() { } } -void MsgSharedGroup::sendMsgToGroupMember(u32 msg, HitSensor *pSensor, const char *pName) { +void MsgSharedGroup::sendMsgToGroupMember(u32 msg, HitSensor* pSensor, const char* pName) { _1C = msg; _20 = pSensor; _24 = pName; } -LiveActorGroupArray::LiveActorGroupArray(const char *pName) : NameObj(pName) { +LiveActorGroupArray::LiveActorGroupArray(const char* pName) + : NameObj(pName) { mNumGroups = 0; } -void LiveActorGroupArray::init(const JMapInfoIter &rIter) { - +void LiveActorGroupArray::init(const JMapInfoIter& rIter) { } -LiveActorGroup* LiveActorGroupArray::getLiveActorGroup(const LiveActor *pActor) const { +LiveActorGroup* LiveActorGroupArray::getLiveActorGroup(const LiveActor* pActor) const { return findGroup(pActor); } -MsgSharedGroup* LiveActorGroupArray::createGroup(const JMapInfoIter &rIter, const char *pName, s32 msg) { +MsgSharedGroup* LiveActorGroupArray::createGroup(const JMapInfoIter& rIter, const char* pName, s32 msg) { MsgSharedGroup* group = new MsgSharedGroup(pName, msg, rIter); group->initWithoutIter(); s32 cnt = mNumGroups; @@ -66,7 +67,7 @@ MsgSharedGroup* LiveActorGroupArray::createGroup(const JMapInfoIter &rIter, cons return group; } -LiveActorGroup* LiveActorGroupArray::entry(LiveActor *pActor, const JMapInfoIter &rIter, const char *pName, s32 a4) { +LiveActorGroup* LiveActorGroupArray::entry(LiveActor* pActor, const JMapInfoIter& rIter, const char* pName, s32 a4) { s32 groupID = -1; MR::getJMapInfoGroupID(rIter, &groupID); diff --git a/src/Game/LiveActor/LodCtrl.cpp b/src/Game/LiveActor/LodCtrl.cpp index 3044fb292..3c8cc5155 100644 --- a/src/Game/LiveActor/LodCtrl.cpp +++ b/src/Game/LiveActor/LodCtrl.cpp @@ -5,7 +5,7 @@ #include namespace { - void LodFuntionCall(LodCtrl *pCtrl, void (*pFunc)(LiveActor *)) NO_INLINE { + void LodFuntionCall(LodCtrl* pCtrl, void (*pFunc)(LiveActor*)) NO_INLINE { pFunc(pCtrl->mActor); if (pCtrl->_10) { @@ -17,8 +17,8 @@ namespace { } } - template - void LodFuntionCall(LodCtrl *pCtrl, void (*pFunc)(LiveActor *, T), T arg) NO_INLINE { + template + void LodFuntionCall(LodCtrl* pCtrl, void (*pFunc)(LiveActor*, T), T arg) NO_INLINE { pFunc(pCtrl->mActor, arg); if (pCtrl->_10) { @@ -29,11 +29,11 @@ namespace { pFunc(pCtrl->_14, arg); } } -}; +}; // namespace const bool def = false; -LodCtrl::LodCtrl(LiveActor *pActor, const JMapInfoIter &rIter) { +LodCtrl::LodCtrl(LiveActor* pActor, const JMapInfoIter& rIter) { _0 = 2000.0f; _4 = 3000.0f; _8 = pActor; @@ -113,8 +113,7 @@ void LodCtrl::invalidate() { } bool LodCtrl::isShowLowModel() const { - return _14 != nullptr - && _14 == _8; + return _14 != nullptr && _14 == _8; } void LodCtrl::setDistanceToMiddle(f32 dist) { @@ -158,8 +157,7 @@ void LodCtrl::showHighModel() { mActorLightCtrl = mActor->mActorLightCtrl; MR::showModel(mActor); - } - else { + } else { if (_10) { if (!MR::isDead(_10)) { _10->makeActorDead(); @@ -170,7 +168,7 @@ void LodCtrl::showHighModel() { if (!MR::isDead(_14)) { _14->makeActorDead(); } - } + } } _8 = mActor; @@ -185,8 +183,7 @@ void LodCtrl::showMiddleModel() { mActorLightCtrl = _10->mActorLightCtrl; _10->makeActorAppeared(); MR::calcAnimDirect(mActor); - } - else { + } else { if (!MR::isHiddenModel(mActor)) { MR::hideModelAndOnCalcAnim(mActor); } @@ -210,8 +207,7 @@ void LodCtrl::showLowModel() { mActorLightCtrl = _14->mActorLightCtrl; _14->makeActorAppeared(); MR::calcAnimDirect(mActor); - } - else { + } else { if (!MR::isHiddenModel(mActor)) { MR::hideModelAndOnCalcAnim(mActor); } @@ -225,12 +221,12 @@ void LodCtrl::showLowModel() { } void LodCtrl::hideAllModel() { - if (!MR::isHiddenModel(mActor)) { + if (!MR::isHiddenModel(mActor)) { MR::hideModelAndOnCalcAnim(mActor); } if (_10) { - if (!MR::isDead(_10)) { + if (!MR::isDead(_10)) { _10->makeActorDead(); } } @@ -241,10 +237,10 @@ void LodCtrl::hideAllModel() { } } - _8 = 0; + _8 = 0; } -void LodCtrl::setViewCtrlPtr(const bool *a1, const bool *a2, const bool *a3, const bool *a4) { +void LodCtrl::setViewCtrlPtr(const bool* a1, const bool* a2, const bool* a3, const bool* a4) { _1C = a1; _20 = a2; _24 = a3; @@ -258,8 +254,7 @@ void LodCtrl::createLodModel(int a1, int a2, int a3) { if (_10 || _14) { appear(); _18 = 1; - } - else { + } else { kill(); _18 = 0; } @@ -298,7 +293,7 @@ void LodCtrl::initLightCtrl() { ModelObj* LodCtrl::initLodModel(int a1, int a2, int a3, bool isLowModel) const { const char* res = MR::getModelResName(mActor); const char* type = isLowModel ? "Low" : "Middle"; - char buf[0x100]; + char buf[0x100]; snprintf(buf, sizeof(buf), "/ObjectData/%s%s.arc", res, type); if (!MR::isFileExist(buf, false)) { @@ -315,7 +310,7 @@ ModelObj* LodCtrl::initLodModel(int a1, int a2, int a3, bool isLowModel) const { return obj; } -bool LodCtrlFunction::isExistLodLowModel(const char *pName) { +bool LodCtrlFunction::isExistLodLowModel(const char* pName) { char buf[0x100]; snprintf(buf, sizeof(buf), "/ObjectData/%sLow.arc", pName); return MR::isFileExist(buf, false); diff --git a/src/Game/LiveActor/MaterialCtrl.cpp b/src/Game/LiveActor/MaterialCtrl.cpp index b75f0aaa4..d4f3193be 100644 --- a/src/Game/LiveActor/MaterialCtrl.cpp +++ b/src/Game/LiveActor/MaterialCtrl.cpp @@ -2,7 +2,7 @@ #include "Game/Util.hpp" #include -MaterialCtrl::MaterialCtrl(J3DModelData *pModelData, const char *pMaterialName) { +MaterialCtrl::MaterialCtrl(J3DModelData* pModelData, const char* pMaterialName) { mModelData = pModelData; mMaterial = nullptr; @@ -14,8 +14,7 @@ MaterialCtrl::MaterialCtrl(J3DModelData *pModelData, const char *pMaterialName) void MaterialCtrl::update() { if (mMaterial) { updateMaterial(mMaterial); - } - else { + } else { u16 i = 0; while (i < mModelData->mMaterialTable.mMaterialCount) { updateMaterial(mModelData->mMaterialTable.mMaterials[i]); @@ -24,7 +23,8 @@ void MaterialCtrl::update() { } } -FogCtrl::FogCtrl(J3DModelData *pModelData, bool a3) : MaterialCtrl(pModelData, nullptr) { +FogCtrl::FogCtrl(J3DModelData* pModelData, bool a3) + : MaterialCtrl(pModelData, nullptr) { mNumMaterials = 0; mMaterials = nullptr; @@ -68,12 +68,12 @@ void FogCtrl::update() { } #endif -MatColorCtrl::MatColorCtrl(J3DModelData *pModelData, const char *pName, u32 color, const J3DGXColor *pColor) : MaterialCtrl(pModelData, pName) { +MatColorCtrl::MatColorCtrl(J3DModelData* pModelData, const char* pName, u32 color, const J3DGXColor* pColor) + : MaterialCtrl(pModelData, pName) { mColorChoice = color; - mColor = pColor; -} - -void MatColorCtrl::updateMaterial(J3DMaterial *pMaterial) { - pMaterial->mColorBlock->setMatColor(mColorChoice, mColor); + mColor = pColor; } +void MatColorCtrl::updateMaterial(J3DMaterial* pMaterial) { + pMaterial->mColorBlock->setMatColor(mColorChoice, mColor); +} diff --git a/src/Game/LiveActor/MessageSensorHolder.cpp b/src/Game/LiveActor/MessageSensorHolder.cpp index 8ba5ddb2a..9e73b48bd 100644 --- a/src/Game/LiveActor/MessageSensorHolder.cpp +++ b/src/Game/LiveActor/MessageSensorHolder.cpp @@ -1,13 +1,11 @@ #include "Game/LiveActor/MessageSensorHolder.hpp" #include "Game/Util.hpp" -MessageSensorHolder::MessageSensorHolder(const char *pName) : - LiveActor(pName) -{ - +MessageSensorHolder::MessageSensorHolder(const char* pName) + : LiveActor(pName) { } -void MessageSensorHolder::init(const JMapInfoIter &rIter) { +void MessageSensorHolder::init(const JMapInfoIter& rIter) { initHitSensor(1); MR::addBodyMessageSensor(this, ATYPE_MESSAGE_SENSOR); MR::invalidateClipping(this); diff --git a/src/Game/LiveActor/MirrorActor.cpp b/src/Game/LiveActor/MirrorActor.cpp index 3284caee7..226bddc40 100644 --- a/src/Game/LiveActor/MirrorActor.cpp +++ b/src/Game/LiveActor/MirrorActor.cpp @@ -4,17 +4,17 @@ #include "JSystem/JMath/JMath.hpp" MirrorActor::~MirrorActor() { - } -MirrorActor::MirrorActor(LiveActor *pActor, const char *a2, const char *a3) : LiveActor(a2) { +MirrorActor::MirrorActor(LiveActor* pActor, const char* a2, const char* a3) + : LiveActor(a2) { _8C = pActor; _A0 = false; initModelManagerWithAnm(a3, 0, 0); } #ifdef NON_MATCHING -void MirrorActor::init(const JMapInfoIter &rIter) { +void MirrorActor::init(const JMapInfoIter& rIter) { MR::connectToSceneMirrorMapObj(this); MR::copyJointAnimation(this, _8C); MR::syncMaterialAnimation(this, _8C); @@ -38,7 +38,8 @@ void MirrorActor::init(const JMapInfoIter &rIter) { ps_sub f1, f2, f3 psq_st f0, 0(ptrStack), 0, 0 psq_st f1, 8(ptrStack), 1, 0 - }; + } + ; f32 mag = PSVECMag((const Vec*)&stack_8); _9C = 0.5f * mag; @@ -48,7 +49,8 @@ void MirrorActor::init(const JMapInfoIter &rIter) { lfs f1, 0x1C(r1) psq_st f0, 0x90(r31), 0, 0 stfs f1, 0x98(r31) - }; + } + ; makeActorAppeared(); } @@ -62,9 +64,8 @@ void MirrorActor::movement() { if (!MR::isHiddenModel(this)) { MR::disconnectToDrawTemporarily(this); } - } - } - else { + } + } else { if (_A0) { _A0 = false; @@ -77,7 +78,7 @@ void MirrorActor::movement() { } } -void MirrorActor::calcAnim() { +void MirrorActor::calcAnim() { MR::copyJointAnimation(this, _8C); MR::updateMaterial(this); } @@ -89,7 +90,7 @@ void MirrorActor::calcViewAndEntry() { #ifdef NON_MATCHING // weird function call to getHostCenterPos bool MirrorActor::isHostInTheOtherSideOfMirror() const { - if (MR::isExistMirrorCamera()) { + if (MR::isExistMirrorCamera()) { TVec3f centerPos; centerPos = getHostCenterPos(); f32 dist = MR::getDistanceToMirror(centerPos); diff --git a/src/Game/LiveActor/MirrorCamera.cpp b/src/Game/LiveActor/MirrorCamera.cpp index d7c5ae565..b1d3d9e32 100644 --- a/src/Game/LiveActor/MirrorCamera.cpp +++ b/src/Game/LiveActor/MirrorCamera.cpp @@ -2,20 +2,20 @@ #include "Game/Scene/SceneObjHolder.hpp" #include "Game/Util.hpp" -void MirrorCamera::init(const JMapInfoIter &rIter) { +void MirrorCamera::init(const JMapInfoIter& rIter) { MR::connectToScene(this, 0x16, -1, -1, -1); } -void MirrorCamera::setMirrorMapInfo(const TVec3f &a1, const TVec3f &a2) { +void MirrorCamera::setMirrorMapInfo(const TVec3f& a1, const TVec3f& a2) { _18.set(a1); _C.set(a2); _24 = -PSVECDotProduct((const Vec*)&_18, (const Vec*)&_C); } -f32 MirrorCamera::getDistance(const TVec3f &a1) const { +f32 MirrorCamera::getDistance(const TVec3f& a1) const { TVec3f stack_14; TVec3f stack_8; - + stack_8.set(_18); stack_14.x = stack_8.dot(_C); return stack_8.dot(a1) - stack_14.x; @@ -26,18 +26,17 @@ namespace MR { return MR::getSceneObj(SceneObj_MirrorCamera); } - f32 getDistanceToMirror(const TVec3f &rVec) { + f32 getDistanceToMirror(const TVec3f& rVec) { return getMirrorCamera()->getDistance(rVec); } -}; +}; // namespace MR MirrorCamera::~MirrorCamera() { - } void MirrorCamera::movement() { if (MR::isPlayerInAreaObj("MirrorArea")) { updateViewMtx(); updateModelTexMtx(); - } + } } diff --git a/src/Game/LiveActor/MirrorReflectionModel.cpp b/src/Game/LiveActor/MirrorReflectionModel.cpp index 60a4e93b9..11c4fa7da 100644 --- a/src/Game/LiveActor/MirrorReflectionModel.cpp +++ b/src/Game/LiveActor/MirrorReflectionModel.cpp @@ -1,7 +1,8 @@ #include "Game/LiveActor/MirrorReflectionModel.hpp" #include "Game/NameObj/NameObjExecuteHolder.hpp" -MirrorReflectionModel::MirrorReflectionModel(const LiveActor *pActor, const char *pName, const char *pInternalName, MtxPtr mtx) : LiveActor(pName) { +MirrorReflectionModel::MirrorReflectionModel(const LiveActor* pActor, const char* pName, const char* pInternalName, MtxPtr mtx) + : LiveActor(pName) { _8C = pActor; _90 = mtx; _94 = 0; @@ -10,8 +11,7 @@ MirrorReflectionModel::MirrorReflectionModel(const LiveActor *pActor, const char TPos3f pos; pos.set(mtx); pos.getTrans(mPosition); - } - else { + } else { mPosition.set(pActor->mPosition); } @@ -21,7 +21,7 @@ MirrorReflectionModel::MirrorReflectionModel(const LiveActor *pActor, const char MR::connectToSceneMirrorMapObjDecoration(this); } -void MirrorReflectionModel::init(const JMapInfoIter &rIter) { +void MirrorReflectionModel::init(const JMapInfoIter& rIter) { MR::invalidateClipping(this); MR::registerDemoSimpleCastAll(this); makeActorAppeared(); @@ -37,8 +37,7 @@ void MirrorReflectionModel::movement() { MR::disconnectToDrawTemporarily(this); } } - } - else { + } else { if (_94) { _94 = 0; if (!MR::isHiddenModel(this)) { @@ -71,8 +70,7 @@ void MirrorReflectionModel::calcViewAndEntry() { void MirrorReflectionModel::calcAndSetBaseMtx() { if (!_90) { LiveActor::calcAndSetBaseMtx(); - } - else { + } else { TPos3f pos; pos.set(_90); pos.getTrans(mPosition); @@ -81,5 +79,4 @@ void MirrorReflectionModel::calcAndSetBaseMtx() { } MirrorReflectionModel::~MirrorReflectionModel() { - } diff --git a/src/Game/LiveActor/ModelManager.cpp b/src/Game/LiveActor/ModelManager.cpp index efa701f79..2ae08cef8 100644 --- a/src/Game/LiveActor/ModelManager.cpp +++ b/src/Game/LiveActor/ModelManager.cpp @@ -12,19 +12,17 @@ #include "Game/Util/MutexHolder.hpp" #include -ModelManager::ModelManager() : - mBtkPlayer(nullptr), - mBrkPlayer(nullptr), - mBtpPlayer(nullptr), - mBpkPlayer(nullptr), - mBvaPlayer(nullptr), - mXanimeResourceTable(nullptr), - mXanimePlayer(nullptr), - mModel(nullptr), - mModelResourceHolder(nullptr), - mDisplayListMaker(nullptr) -{ - +ModelManager::ModelManager() + : mBtkPlayer(nullptr), + mBrkPlayer(nullptr), + mBtpPlayer(nullptr), + mBpkPlayer(nullptr), + mBvaPlayer(nullptr), + mXanimeResourceTable(nullptr), + mXanimePlayer(nullptr), + mModel(nullptr), + mModelResourceHolder(nullptr), + mDisplayListMaker(nullptr) { } void ModelManager::update() { @@ -76,8 +74,7 @@ void ModelManager::newDifferedDLBuffer() { void ModelManager::updateDL(bool isDiffDL) { OSLockMutex(&MR::MutexHolder<0>::sMutex); - bool isUpdateDL = mDisplayListMaker != nullptr - && mDisplayListMaker->isValidDiff(); + bool isUpdateDL = mDisplayListMaker != nullptr && mDisplayListMaker->isValidDiff(); if (isUpdateDL) { mDisplayListMaker->update(); @@ -329,7 +326,7 @@ const char* ModelManager::getPlayingBckName() const { void ModelManager::initMaterialAnm() { ResourceHolder* pResourceHolder = getResourceHolder(); - J3DModelData* pModelData = getJ3DModelData(); + J3DModelData* pModelData = getJ3DModelData(); if (pResourceHolder->mMaterialBuf == nullptr) { pResourceHolder->newMaterialAnmBuffer(pModelData); diff --git a/src/Game/LiveActor/ModelObj.cpp b/src/Game/LiveActor/ModelObj.cpp index a6c98a1af..d579dbd20 100644 --- a/src/Game/LiveActor/ModelObj.cpp +++ b/src/Game/LiveActor/ModelObj.cpp @@ -1,10 +1,9 @@ #include "Game/LiveActor/ModelObj.hpp" #include "Game/Util.hpp" -ModelObj::ModelObj(const char *pName, const char *pModelName, MtxPtr mtxPtr, int a4, int a5, int a6, bool a7) : - LiveActor(pName), - mMtx(mtxPtr) -{ +ModelObj::ModelObj(const char* pName, const char* pModelName, MtxPtr mtxPtr, int a4, int a5, int a6, bool a7) + : LiveActor(pName), + mMtx(mtxPtr) { if (a4 < -1) { a4 = 0x8; } @@ -27,7 +26,7 @@ ModelObj::ModelObj(const char *pName, const char *pModelName, MtxPtr mtxPtr, int } } -void ModelObj::init(const JMapInfoIter &) { +void ModelObj::init(const JMapInfoIter&) { makeActorAppeared(); } @@ -35,13 +34,12 @@ void ModelObj::calcAndSetBaseMtx() { if (mMtx) { mPosition.set(mMtx[0][3], mMtx[1][3], mMtx[2][3]); MR::setBaseTRMtx(this, mMtx); - } - else { + } else { LiveActor::calcAndSetBaseMtx(); } } -void ModelObjNpc::init(const JMapInfoIter &rIter) { +void ModelObjNpc::init(const JMapInfoIter& rIter) { mLodCtrl = MR::createLodCtrlNPC(this, rIter); mJointCtrl = new ActorJointCtrl(this); makeActorAppeared(); @@ -56,8 +54,7 @@ void ModelObjNpc::calcAndSetBaseMtx() { if (mMtx) { mPosition.set(mMtx[0][3], mMtx[1][3], mMtx[2][3]); MR::setBaseTRMtx(this, mMtx); - } - else { + } else { LiveActor::calcAndSetBaseMtx(); } @@ -65,15 +62,13 @@ void ModelObjNpc::calcAndSetBaseMtx() { } ModelObjNpc::~ModelObjNpc() { - } -ModelObjNpc::ModelObjNpc(const char *pName, const char *a2, MtxPtr mtx) : - LiveActor(pName), - mMtx(mtx), - mLodCtrl(nullptr), - mJointCtrl(nullptr) -{ +ModelObjNpc::ModelObjNpc(const char* pName, const char* a2, MtxPtr mtx) + : LiveActor(pName), + mMtx(mtx), + mLodCtrl(nullptr), + mJointCtrl(nullptr) { if (mMtx != nullptr) { mPosition.set(mMtx[0][3], mMtx[1][3], mMtx[2][3]); } diff --git a/src/Game/LiveActor/Nerve.cpp b/src/Game/LiveActor/Nerve.cpp index b1e8fdfef..c8f8c1f3c 100644 --- a/src/Game/LiveActor/Nerve.cpp +++ b/src/Game/LiveActor/Nerve.cpp @@ -1,3 +1,3 @@ #include "Game/LiveActor/Nerve.hpp" -void Nerve::executeOnEnd(Spine *pSpine) const { } \ No newline at end of file +void Nerve::executeOnEnd(Spine* pSpine) const {} \ No newline at end of file diff --git a/src/Game/LiveActor/PartsModel.cpp b/src/Game/LiveActor/PartsModel.cpp index dbc3baa18..e2e6f6ac3 100644 --- a/src/Game/LiveActor/PartsModel.cpp +++ b/src/Game/LiveActor/PartsModel.cpp @@ -1,7 +1,8 @@ -#include "Game/LiveActor/PartsModel.hpp" +#include "Game/LiveActor/PartsModel.hpp" #include "Game/NameObj/NameObjExecuteHolder.hpp" -PartsModel::PartsModel(LiveActor *pActor, const char *pName, const char *pModelName, MtxPtr mtx, int a5, bool a6) : LiveActor(pName) { +PartsModel::PartsModel(LiveActor* pActor, const char* pName, const char* pModelName, MtxPtr mtx, int a5, bool a6) + : LiveActor(pName) { mHost = pActor; mFixedPos = nullptr; mMtx = mtx; @@ -15,8 +16,7 @@ PartsModel::PartsModel(LiveActor *pActor, const char *pName, const char *pModelN if (mMtx) { mPosition.set(mMtx[0][3], mMtx[1][3], mMtx[2][3]); - } - else { + } else { mPosition.set(pActor->mPosition); } @@ -51,7 +51,7 @@ void PartsModel::makeActorDead() { } // 99.9% sure the call to makeActorAppered is meant to be inlined but this matches -void PartsModel::init(const JMapInfoIter &rIter) { +void PartsModel::init(const JMapInfoIter& rIter) { initEffectKeeper(8, nullptr, false); initSound(8, false); MR::isInvalidClipping(this); @@ -69,8 +69,7 @@ void PartsModel::movement() { MR::disconnectToDrawTemporarily(this); } } - } - else { + } else { if (mIsDead) { mIsDead = false; MR::validateHitSensors(this); @@ -102,26 +101,25 @@ void PartsModel::calcViewAndEntry() { } } -void PartsModel::initFixedPosition(const TVec3f &rLocalTrans, const TVec3f &a2, const char *pJointName) { +void PartsModel::initFixedPosition(const TVec3f& rLocalTrans, const TVec3f& a2, const char* pJointName) { if (pJointName) { mFixedPos = new FixedPosition(mHost, pJointName, rLocalTrans, a2); - } - else { + } else { mFixedPos = new FixedPosition(mHost, rLocalTrans, a2); } mMtx = (MtxPtr)&mFixedPos->_1C; } -void PartsModel::initFixedPosition(const char *pJointName) { +void PartsModel::initFixedPosition(const char* pJointName) { initFixedPosition(TVec3f(0.0f, 0.0f, 0.0f), TVec3f(0.0f, 0.0f, 0.0f), pJointName); } -void PartsModel::initFixedPosition(MtxPtr mtx, const TVec3f &rLocalTrans, const TVec3f &a3) { +void PartsModel::initFixedPosition(MtxPtr mtx, const TVec3f& rLocalTrans, const TVec3f& a3) { mFixedPos = new FixedPosition(mtx, rLocalTrans, a3); mMtx = (MtxPtr)&mFixedPos->_1C; } -void PartsModel::loadFixedPosition(const char *pJointName) { +void PartsModel::loadFixedPosition(const char* pJointName) { mFixedPos = new FixedPosition(mHost, pJointName, nullptr); mMtx = (MtxPtr)&mFixedPos->_1C; } @@ -134,8 +132,7 @@ void PartsModel::calcAndSetBaseMtx() { if (mMtx && mCalcOwnMtx) { mPosition.set(mMtx[0][3], mMtx[1][3], mMtx[2][3]); MR::setBaseTRMtx(this, mMtx); - } - else { + } else { LiveActor::calcAndSetBaseMtx(); } } diff --git a/src/Game/LiveActor/RailRider.cpp b/src/Game/LiveActor/RailRider.cpp index 9ca052cec..d8896ffc5 100644 --- a/src/Game/LiveActor/RailRider.cpp +++ b/src/Game/LiveActor/RailRider.cpp @@ -1,6 +1,6 @@ #include "Game/LiveActor/RailRider.hpp" -RailRider::RailRider(const JMapInfoIter &rIter) { +RailRider::RailRider(const JMapInfoIter& rIter) { mBezierRail = nullptr; mCoord = 0.0f; mSpeed = 0.0f; @@ -18,7 +18,7 @@ RailRider::RailRider(const JMapInfoIter &rIter) { mEndPos.y = 0.0f; mEndPos.z = 0.0f; const JMapInfo* info = nullptr; - JMapInfoIter iter; + JMapInfoIter iter; iter.mInfo = nullptr; iter.mIndex = -1; MR::getRailInfo(&iter, &info, rIter); @@ -43,7 +43,7 @@ RailRider::RailRider(s32 a1, s32 a2) { mEndPos.y = 0.0f; mEndPos.z = 0.0f; const JMapInfo* info = nullptr; - JMapInfoIter iter; + JMapInfoIter iter; iter.mInfo = nullptr; iter.mIndex = -1; MR::getCameraRailInfo(&iter, &info, a1, a2); @@ -53,8 +53,7 @@ RailRider::RailRider(s32 a1, s32 a2) { void RailRider::move() { if (mIsNotReverse) { mCoord += mSpeed; - } - else { + } else { mCoord -= mSpeed; } @@ -62,7 +61,7 @@ void RailRider::move() { syncPosDir(); } -void RailRider::moveToNearestPos(const TVec3f &rPos) { +void RailRider::moveToNearestPos(const TVec3f& rPos) { mCoord = mBezierRail->getNearestRailPosCoord(rPos); syncPosDir(); } @@ -77,23 +76,22 @@ void RailRider::moveToNextPoint() { void RailRider::reverse() { if (mIsNotReverse != false) { mIsNotReverse = false; - } - else { + } else { mIsNotReverse = true; } syncPosDir(); } -void RailRider::calcPosAtCoord(TVec3f *pOutVec, f32 a2) const { +void RailRider::calcPosAtCoord(TVec3f* pOutVec, f32 a2) const { mBezierRail->calcPos(pOutVec, a2); } -void RailRider::calcDirectionAtCoord(TVec3f *pOutVec, f32 a2) const { +void RailRider::calcDirectionAtCoord(TVec3f* pOutVec, f32 a2) const { mBezierRail->calcDirection(pOutVec, a2); } -f32 RailRider::calcNearestPos(const TVec3f &rPos) const { +f32 RailRider::calcNearestPos(const TVec3f& rPos) const { return mBezierRail->getNearestRailPosCoord(rPos); } @@ -144,8 +142,7 @@ bool RailRider::isReachedEdge() const { if (mBezierRail->mIsClosed) { return false; - } - else { + } else { ret = true; if (!MR::isNearZero(mCoord, 0.001f)) { @@ -171,7 +168,7 @@ void RailRider::setSpeed(f32 coord) { mSpeed = coord; } -bool RailRider::getRailArgWithInit(const char *pStr, s32 *pOut) const { +bool RailRider::getRailArgWithInit(const char* pStr, s32* pOut) const { s32 val; if (!mBezierRail->mIter->getValue(pStr, &val)) { return false; @@ -181,7 +178,7 @@ bool RailRider::getRailArgWithInit(const char *pStr, s32 *pOut) const { return true; } -bool RailRider::getRailArgNoInit(const char *pStr, s32 *pOut) const { +bool RailRider::getRailArgNoInit(const char* pStr, s32* pOut) const { s32 val; if (!mBezierRail->mIter->getValue(pStr, &val)) { return false; @@ -207,7 +204,7 @@ s32 RailRider::getPointNum() const { return mBezierRail->mPointNum; } -void RailRider::copyPointPos(TVec3f *pOut, s32 pointNum) const { +void RailRider::copyPointPos(TVec3f* pOut, s32 pointNum) const { JMapInfoIter iter; iter.mInfo = nullptr; iter.mIndex = -1; @@ -220,7 +217,7 @@ f32 RailRider::getPointCoord(s32 idx) const { } #ifdef NON_MATCHING // Second call to setCoord gets inlined -void RailRider::initBezierRail(const JMapInfoIter &rIter, const JMapInfo *pInfo) { +void RailRider::initBezierRail(const JMapInfoIter& rIter, const JMapInfo* pInfo) { mBezierRail = new BezierRail(rIter, pInfo); syncPosDir(); setCoord(mBezierRail->getTotalLength()); @@ -228,10 +225,10 @@ void RailRider::initBezierRail(const JMapInfoIter &rIter, const JMapInfo *pInfo) setCoord(0.0f); mStartPos.set(mCurPos); } -#endif +#endif -bool RailRider::getPointArgS32NoInit(const char *pStr, s32 *pOut, s32 pointNum) const { - s32 val; +bool RailRider::getPointArgS32NoInit(const char* pStr, s32* pOut, s32 pointNum) const { + s32 val; JMapInfoIter iter; iter.mInfo = nullptr; iter.mIndex = -1; @@ -248,7 +245,7 @@ bool RailRider::getPointArgS32NoInit(const char *pStr, s32 *pOut, s32 pointNum) return false; } -bool RailRider::getPointArgS32WithInit(const char *pStr, s32 *pOut, s32 pointNum) const { +bool RailRider::getPointArgS32WithInit(const char* pStr, s32* pOut, s32 pointNum) const { JMapInfoIter iter; iter.mInfo = nullptr; iter.mIndex = -1; @@ -257,8 +254,8 @@ bool RailRider::getPointArgS32WithInit(const char *pStr, s32 *pOut, s32 pointNum return true; } -bool RailRider::getCurrentPointArgS32NoInit(const char *pStr, s32 *pOut) const { - s32 val; +bool RailRider::getCurrentPointArgS32NoInit(const char* pStr, s32* pOut) const { + s32 val; JMapInfoIter iter; iter.mInfo = nullptr; iter.mIndex = -1; @@ -275,7 +272,7 @@ bool RailRider::getCurrentPointArgS32NoInit(const char *pStr, s32 *pOut) const { return false; } -bool RailRider::getCurrentPointArgS32WithInit(const char *pStr, s32 *pOut) const { +bool RailRider::getCurrentPointArgS32WithInit(const char* pStr, s32* pOut) const { JMapInfoIter iter; iter.mInfo = nullptr; iter.mIndex = -1; @@ -284,8 +281,8 @@ bool RailRider::getCurrentPointArgS32WithInit(const char *pStr, s32 *pOut) const return true; } -bool RailRider::getNextPointArgS32NoInit(const char *pStr, s32 *pOut) const { - s32 val; +bool RailRider::getNextPointArgS32NoInit(const char* pStr, s32* pOut) const { + s32 val; JMapInfoIter iter; iter.mInfo = nullptr; iter.mIndex = -1; @@ -302,7 +299,7 @@ bool RailRider::getNextPointArgS32NoInit(const char *pStr, s32 *pOut) const { return false; } -bool RailRider::getNextPointArgS32WithInit(const char *pStr, s32 *pOut) const { +bool RailRider::getNextPointArgS32WithInit(const char* pStr, s32* pOut) const { JMapInfoIter iter; iter.mInfo = nullptr; iter.mIndex = -1; @@ -316,13 +313,11 @@ bool RailRider::getNextPointArgS32WithInit(const char *pStr, s32 *pOut) const { void RailRider::syncPosDir() { if (0.0f < mCoord && mCoord < mBezierRail->getTotalLength()) { mBezierRail->calcPosDir(&mCurPos, &mCurDirection, mCoord); - } - else { + } else { if (mCoord == 0.0f) { mBezierRail->calcPos(&mCurPos, mCoord); mBezierRail->calcDirection(&mCurDirection, 0.1f); - } - else { + } else { mBezierRail->calcPos(&mCurPos, mCoord); mBezierRail->calcDirection(&mCurDirection, (mBezierRail->getTotalLength() - 0x1f)); } diff --git a/src/Game/LiveActor/SensorHitChecker.cpp b/src/Game/LiveActor/SensorHitChecker.cpp index e920135d6..66ec7be16 100644 --- a/src/Game/LiveActor/SensorHitChecker.cpp +++ b/src/Game/LiveActor/SensorHitChecker.cpp @@ -2,30 +2,23 @@ #include "Game/Scene/SceneObjHolder.hpp" #include "Game/Util.hpp" -void SensorHitChecker::init(const JMapInfoIter &rIter) { +void SensorHitChecker::init(const JMapInfoIter& rIter) { MR::connectToScene(this, 5, -1, -1, -1); } -void SensorHitChecker::initGroup(HitSensor *pSensor) { +void SensorHitChecker::initGroup(HitSensor* pSensor) { if (MR::isSensorPlayer(pSensor)) { pSensor->mSensorGroup = mPlayerGroup; - } - else if (MR::isSensorRide(pSensor)) { + } else if (MR::isSensorRide(pSensor)) { pSensor->mSensorGroup = mRideGroup; - } - else if (pSensor->isType(0x7F)) { + } else if (pSensor->isType(0x7F)) { pSensor->mSensorGroup = mEyeGroup; - } - else if (pSensor->isType(0x4A) || pSensor->isType(0x4C) - || pSensor->isType(0x15) || pSensor->isType(0x47) - || pSensor->isType(0x1F) || MR::isSensorRush(pSensor) || MR::isSensorAutoRush(pSensor)) { + } else if (pSensor->isType(0x4A) || pSensor->isType(0x4C) || pSensor->isType(0x15) || pSensor->isType(0x47) || pSensor->isType(0x1F) || MR::isSensorRush(pSensor) || MR::isSensorAutoRush(pSensor)) { pSensor->mSensorGroup = mSimpleGroup; - } - else { + } else { if (MR::isSensorMapObj(pSensor)) { pSensor->mSensorGroup = mMapObjGroup; - } - else { + } else { pSensor->mSensorGroup = mCharacterGroup; } } @@ -55,11 +48,11 @@ void SensorHitChecker::movement() { } #ifdef NON_MATCHING // Wrong registers -void SensorHitChecker::doObjColGroup(SensorGroup *pGroup1, SensorGroup *pGroup2) const { +void SensorHitChecker::doObjColGroup(SensorGroup* pGroup1, SensorGroup* pGroup2) const { s32 group1SensorCount = pGroup1->mSensorCount; for (s32 i = 0; i < group1SensorCount; i++) { HitSensor* curGroup1Sensor = pGroup1->mSensors[i]; - bool group1Sensorvalidated = false; + bool group1Sensorvalidated = false; if (curGroup1Sensor->mValidByHost && curGroup1Sensor->mValidBySystem) { group1Sensorvalidated = true; @@ -69,7 +62,7 @@ void SensorHitChecker::doObjColGroup(SensorGroup *pGroup1, SensorGroup *pGroup2) s32 group2SensorCount = pGroup2->mSensorCount; for (s32 x = 0; x < group2SensorCount; x++) { HitSensor* curGroup2Sensor = pGroup2->mSensors[x]; - bool group2Validated = false; + bool group2Validated = false; if (curGroup2Sensor->mValidByHost && curGroup2Sensor->mValidBySystem) { group2Validated = true; @@ -82,14 +75,14 @@ void SensorHitChecker::doObjColGroup(SensorGroup *pGroup1, SensorGroup *pGroup2) } } } -#endif +#endif #ifdef NON_MATCHING // Same register issue -void SensorHitChecker::doObjColInSameGroup(SensorGroup *pSensorGroup) const { +void SensorHitChecker::doObjColInSameGroup(SensorGroup* pSensorGroup) const { s32 sensorGroupCount = pSensorGroup->mSensorCount; for (s32 i = 0; i < sensorGroupCount; i++) { HitSensor* pFirstSensor = pSensorGroup->mSensors[i]; - bool isFirstSensorValid = false; + bool isFirstSensorValid = false; if (pFirstSensor->mValidByHost && pFirstSensor->mValidBySystem) { isFirstSensorValid = true; @@ -98,7 +91,7 @@ void SensorHitChecker::doObjColInSameGroup(SensorGroup *pSensorGroup) const { if (isFirstSensorValid && !MR::isClipped(pFirstSensor->mHost)) { for (s32 x = 0; x < sensorGroupCount; x++) { HitSensor* pSecondSensor = pSensorGroup->mSensors[x]; - bool isSecondSensorValid = false; + bool isSecondSensorValid = false; if (pSecondSensor->mValidByHost && pSecondSensor->mValidBySystem) { isSecondSensorValid = true; @@ -114,7 +107,7 @@ void SensorHitChecker::doObjColInSameGroup(SensorGroup *pSensorGroup) const { #endif #ifdef NON_MATCHING // Wrong registers -void SensorHitChecker::checkAttack(HitSensor *pSensor1, HitSensor *pSensor2) const { +void SensorHitChecker::checkAttack(HitSensor* pSensor1, HitSensor* pSensor2) const { if (pSensor1->mHost != pSensor2->mHost) { f32 xPos = pSensor1->mPosition.x - pSensor2->mPosition.x; f32 yPos = pSensor1->mPosition.y - pSensor2->mPosition.y; @@ -132,17 +125,18 @@ void SensorHitChecker::checkAttack(HitSensor *pSensor1, HitSensor *pSensor2) con } } } -#endif +#endif namespace MR { - void initHitSensorGroup(HitSensor *pSensor) { + void initHitSensorGroup(HitSensor* pSensor) { MR::getSceneObj(SceneObj_SensorHitChecker)->initGroup(pSensor); } -}; +}; // namespace MR SensorHitChecker::~SensorHitChecker() {} -SensorHitChecker::SensorHitChecker(const char *pName) : NameObj(pName) { +SensorHitChecker::SensorHitChecker(const char* pName) + : NameObj(pName) { mPlayerGroup = nullptr; mRideGroup = nullptr; mEyeGroup = nullptr; @@ -158,7 +152,7 @@ SensorHitChecker::SensorHitChecker(const char *pName) : NameObj(pName) { mCharacterGroup = new SensorGroup(0x400, "Character"); } -SensorGroup::SensorGroup(int maxSensors, const char *a2) { +SensorGroup::SensorGroup(int maxSensors, const char* a2) { mMaxSensors = maxSensors; mSensorCount = 0; mSensors = nullptr; @@ -169,16 +163,16 @@ SensorGroup::SensorGroup(int maxSensors, const char *a2) { } } -void SensorGroup::add(HitSensor *pSensor) { +void SensorGroup::add(HitSensor* pSensor) { mSensors[mSensorCount] = pSensor; mSensorCount++; pSensor->mSensorGroup = this; } -void SensorGroup::remove(HitSensor *pSensor) { +void SensorGroup::remove(HitSensor* pSensor) { for (s32 i = 0; i < mSensorCount; i++) { if (mSensors[i] == pSensor) { - u32 count = mSensorCount -1; + u32 count = mSensorCount - 1; mSensors[i] = mSensors[count]; mSensorCount--; break; diff --git a/src/Game/LiveActor/ShadowController.cpp b/src/Game/LiveActor/ShadowController.cpp index cfca29926..34145c75c 100644 --- a/src/Game/LiveActor/ShadowController.cpp +++ b/src/Game/LiveActor/ShadowController.cpp @@ -1,7 +1,8 @@ #include "Game/LiveActor/ShadowController.hpp" #include "Game/LiveActor/ShadowDrawer.hpp" -ShadowControllerHolder::ShadowControllerHolder() : NameObj("影管理"), _C(), _18(), _24(false) { +ShadowControllerHolder::ShadowControllerHolder() + : NameObj("影管理"), _C(), _18(), _24(false) { mFarClip = 4000.0f; _C.init(0x500); _18.init(0x400); @@ -18,7 +19,7 @@ void ShadowControllerHolder::movement() { void ShadowControllerHolder::initAfterPlacement() { ShadowController* pController; - int size = _C.size(); + int size = _C.size(); for (u32 i = 0; i < size; i++) { pController = _C[i]; @@ -42,11 +43,12 @@ void ShadowControllerHolder::updateController() { _18.clear(); } -ShadowControllerList::ShadowControllerList(LiveActor *pActor, u32 listCount) : mShadowList(), mHost(pActor) { +ShadowControllerList::ShadowControllerList(LiveActor* pActor, u32 listCount) + : mShadowList(), mHost(pActor) { mShadowList.init(listCount); } -void ShadowControllerList::addController(ShadowController *pController) { +void ShadowControllerList::addController(ShadowController* pController) { mShadowList.push_back(pController); } @@ -58,7 +60,7 @@ ShadowController* ShadowControllerList::getController(u32 idx) const { return mShadowList[idx]; } -ShadowController* ShadowControllerList::getController(const char *pName) const { +ShadowController* ShadowControllerList::getController(const char* pName) const { if (mShadowList.size() == 1) { return mShadowList[0]; } @@ -117,30 +119,27 @@ LiveActor* ShadowController::getHost() const { return mActor; } -void ShadowController::setShadowDrawer(ShadowDrawer *pDrawer) { +void ShadowController::setShadowDrawer(ShadowDrawer* pDrawer) { mDrawer = pDrawer; pDrawer->setShadowController(this); } -void ShadowController::getDropPos(TVec3f *pOut) const { +void ShadowController::getDropPos(TVec3f* pOut) const { if (mDropPos) { pOut->set(*mDropPos); - } - else { + } else { if (_1C) { PSMTXMultVec(_1C, (const Vec*)&_30, (Vec*)pOut); - } - else { + } else { pOut->set(_30); } } } -void ShadowController::getDropDir(TVec3f *pOut) const { +void ShadowController::getDropDir(TVec3f* pOut) const { if (mDropDir) { pOut->set(*mDropDir); - } - else { + } else { pOut->set(_3C); } } @@ -149,20 +148,18 @@ f32 ShadowController::getDropLength() const { return mDropLength; } -void ShadowController::getProjectionPos(TVec3f *pOut) const { +void ShadowController::getProjectionPos(TVec3f* pOut) const { if (mProjPos) { pOut->set(*mProjPos); - } - else { + } else { pOut->set(_48); } } -void ShadowController::getProjectionNormal(TVec3f *pOut) const { +void ShadowController::getProjectionNormal(TVec3f* pOut) const { if (mProjNorm) { pOut->set(*mProjNorm); - } - else { + } else { pOut->set(_54); } } @@ -175,7 +172,7 @@ bool ShadowController::isDraw() const { if (_67) { return false; } - + if (!_71) { return false; } @@ -207,30 +204,30 @@ bool ShadowController::isCalcShadowGravity() const { } */ -void ShadowController::setGroupName(const char *pName) { +void ShadowController::setGroupName(const char* pName) { mGroupName = pName; } -void ShadowController::setDropPosPtr(const TVec3f *pDropPos) { +void ShadowController::setDropPosPtr(const TVec3f* pDropPos) { mDropPos = pDropPos; _1C = 0; } -void ShadowController::setDropPosFix(const TVec3f &rPos) { +void ShadowController::setDropPosFix(const TVec3f& rPos) { _30.set(rPos); mDropPos = 0; _1C = 0; } -void ShadowController::setDropDirPtr(const TVec3f *pDropDir) { +void ShadowController::setDropDirPtr(const TVec3f* pDropDir) { mDropDir = pDropDir; _61 = 0; } -void ShadowController::setDropDirFix(const TVec3f &a1) { +void ShadowController::setDropDirFix(const TVec3f& a1) { _3C.set(a1); mDropDir = 0; - _61= 0; + _61 = 0; } void ShadowController::setDropLength(f32 len) { @@ -249,7 +246,7 @@ void ShadowController::setDropTypeSurface() { _62 = 1; } -void ShadowController::setProjectionFix(const TVec3f &a1, const TVec3f &a2, bool a3) { +void ShadowController::setProjectionFix(const TVec3f& a1, const TVec3f& a2, bool a3) { _48.set(a1); _54.set(a2); _63 = a3; @@ -307,7 +304,7 @@ void ShadowController::offCalcDropPrivateGravity() { _61 = 3; } -void ShadowController::setCollisionPartsFilter(CollisionPartsFilterBase *pBase) { +void ShadowController::setCollisionPartsFilter(CollisionPartsFilterBase* pBase) { mCollisionPartsFilter = pBase; } @@ -340,5 +337,4 @@ void ShadowController::invalidate() { } ShadowControllerHolder::~ShadowControllerHolder() { - } diff --git a/src/Game/LiveActor/ShadowDrawer.cpp b/src/Game/LiveActor/ShadowDrawer.cpp index 190911334..606a36401 100644 --- a/src/Game/LiveActor/ShadowDrawer.cpp +++ b/src/Game/LiveActor/ShadowDrawer.cpp @@ -1,6 +1,7 @@ #include "Game/LiveActor/ShadowDrawer.hpp" -ShadowDrawer::ShadowDrawer(const char *pName) : NameObj(pName) { +ShadowDrawer::ShadowDrawer(const char* pName) + : NameObj(pName) { mController = 0; } @@ -8,10 +9,9 @@ ShadowController* ShadowDrawer::getController() const { return mController; } -void ShadowDrawer::setShadowController(ShadowController *pController) { +void ShadowDrawer::setShadowController(ShadowController* pController) { mController = pController; } ShadowDrawer::~ShadowDrawer() { - } \ No newline at end of file diff --git a/src/Game/LiveActor/ShadowSurfaceDrawer.cpp b/src/Game/LiveActor/ShadowSurfaceDrawer.cpp index 855379604..3871227d0 100644 --- a/src/Game/LiveActor/ShadowSurfaceDrawer.cpp +++ b/src/Game/LiveActor/ShadowSurfaceDrawer.cpp @@ -30,11 +30,11 @@ void ShadowSurfaceDrawInit::initDraw() { } #endif -ShadowSurfaceDrawer::ShadowSurfaceDrawer(const char *pName) : ShadowDrawer(pName) { +ShadowSurfaceDrawer::ShadowSurfaceDrawer(const char* pName) + : ShadowDrawer(pName) { MR::createSceneObj(SceneObj_ShadowSurfaceDrawInit); MR::connectToScene(this, -1, -1, -1, 0x26); } ShadowSurfaceDrawInit::~ShadowSurfaceDrawInit() { - } \ No newline at end of file diff --git a/src/Game/LiveActor/ShadowVolumeBox.cpp b/src/Game/LiveActor/ShadowVolumeBox.cpp index 5ef5e99df..30adb1ff6 100644 --- a/src/Game/LiveActor/ShadowVolumeBox.cpp +++ b/src/Game/LiveActor/ShadowVolumeBox.cpp @@ -1,6 +1,6 @@ #include "Game/LiveActor/ShadowVolumeBox.hpp" -void ShadowVolumeBox::setSize(const TVec3f &rSize) { +void ShadowVolumeBox::setSize(const TVec3f& rSize) { mSize.set(rSize); } @@ -50,5 +50,4 @@ void ShadowVolumeBox::drawShape() const { } ShadowVolumeBox::~ShadowVolumeBox() { - } diff --git a/src/Game/LiveActor/ShadowVolumeCylinder.cpp b/src/Game/LiveActor/ShadowVolumeCylinder.cpp index 1e28f04f0..2e16e9c00 100644 --- a/src/Game/LiveActor/ShadowVolumeCylinder.cpp +++ b/src/Game/LiveActor/ShadowVolumeCylinder.cpp @@ -1,6 +1,7 @@ #include "Game/LiveActor/ShadowVolumeCylinder.hpp" -ShadowVolumeCylinder::ShadowVolumeCylinder() : ShadowVolumeModel("影描画[ボリューム円柱]") { +ShadowVolumeCylinder::ShadowVolumeCylinder() + : ShadowVolumeModel("影描画[ボリューム円柱]") { mRadius = 100.0f; initVolumeModel("ShadowVolumeCylinder"); } diff --git a/src/Game/LiveActor/ShadowVolumeDrawer.cpp b/src/Game/LiveActor/ShadowVolumeDrawer.cpp index bee8e506a..73eb92060 100644 --- a/src/Game/LiveActor/ShadowVolumeDrawer.cpp +++ b/src/Game/LiveActor/ShadowVolumeDrawer.cpp @@ -4,14 +4,16 @@ namespace { static Color8 sShapeColor(0xC0, 0xC0, 0, 4); static Color8 sDebugShapeColor(0xFF, 0, 0, 0x80); -}; +}; // namespace -ShadowVolumeDrawInit::ShadowVolumeDrawInit() : NameObj("シャドウボリューム描画初期化") { +ShadowVolumeDrawInit::ShadowVolumeDrawInit() + : NameObj("シャドウボリューム描画初期化") { MR::FunctorV0F func(*MR::setupShadowVolumeDraw); MR::registerPreDrawFunction(func, 0x27); } -ShadowVolumeDrawer::ShadowVolumeDrawer(const char *pName) : ShadowDrawer(pName) { +ShadowVolumeDrawer::ShadowVolumeDrawer(const char* pName) + : ShadowDrawer(pName) { mStartDrawShapeOffset = 0.0f; mEndDrawShapeOffset = 0.0f; mIsCutDropShadow = false; @@ -35,7 +37,7 @@ void ShadowVolumeDrawer::offCutDropShadow() { mIsCutDropShadow = false; } -void ShadowVolumeDrawer::calcBaseDropPosition(TVec3f *pVec) const { +void ShadowVolumeDrawer::calcBaseDropPosition(TVec3f* pVec) const { calcBaseDropPosition(pVec, getController()); } @@ -45,7 +47,7 @@ f32 ShadowVolumeDrawer::calcBaseDropLength() const { #ifdef NON_MATCHING // reg usage issues at the bottom -f32 ShadowVolumeDrawer::calcBaseDropLength(const ShadowController *pController) const { +f32 ShadowVolumeDrawer::calcBaseDropLength(const ShadowController* pController) const { f32 length = pController->getDropLength(); if (mIsCutDropShadow) { @@ -61,11 +63,9 @@ f32 ShadowVolumeDrawer::calcBaseDropLength(const ShadowController *pController) #endif void ShadowVolumeDrawer::loadModelDrawMtx() const { - } void ShadowVolumeDrawer::drawShape() const { - } bool ShadowVolumeDrawer::isDraw() const { @@ -92,5 +92,4 @@ void ShadowVolumeDrawer::draw() const { } ShadowVolumeDrawInit::~ShadowVolumeDrawInit() { - } \ No newline at end of file diff --git a/src/Game/LiveActor/ShadowVolumeLine.cpp b/src/Game/LiveActor/ShadowVolumeLine.cpp index b8eb6ae38..dc4a57139 100644 --- a/src/Game/LiveActor/ShadowVolumeLine.cpp +++ b/src/Game/LiveActor/ShadowVolumeLine.cpp @@ -1,6 +1,7 @@ #include "Game/LiveActor/ShadowVolumeLine.hpp" -ShadowVolumeLine::ShadowVolumeLine() : ShadowVolumeDrawer("影描画[ボリュームライン]") { +ShadowVolumeLine::ShadowVolumeLine() + : ShadowVolumeDrawer("影描画[ボリュームライン]") { mFromShadowController = 0; mToShadowController = 0; mFromWidth = 100.0f; @@ -15,11 +16,11 @@ void ShadowVolumeLine::loadModelDrawMtx() const { GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); } -void ShadowVolumeLine::setFromShadowController(const ShadowController *pController) { +void ShadowVolumeLine::setFromShadowController(const ShadowController* pController) { mFromShadowController = pController; } -void ShadowVolumeLine::setToShadowController(const ShadowController *pController) { +void ShadowVolumeLine::setToShadowController(const ShadowController* pController) { mToShadowController = pController; } @@ -32,5 +33,4 @@ void ShadowVolumeLine::setToWidth(f32 width) { } ShadowVolumeLine::~ShadowVolumeLine() { - } \ No newline at end of file diff --git a/src/Game/LiveActor/ShadowVolumeModel.cpp b/src/Game/LiveActor/ShadowVolumeModel.cpp index 6134d4236..45d8bc3d3 100644 --- a/src/Game/LiveActor/ShadowVolumeModel.cpp +++ b/src/Game/LiveActor/ShadowVolumeModel.cpp @@ -1,11 +1,12 @@ #include "Game/LiveActor/ShadowVolumeModel.hpp" #include "Game/Util.hpp" -ShadowVolumeModel::ShadowVolumeModel(const char *pName) : ShadowVolumeDrawer(pName) { +ShadowVolumeModel::ShadowVolumeModel(const char* pName) + : ShadowVolumeDrawer(pName) { mModelData = 0; } -void ShadowVolumeModel::initVolumeModel(const char *pModelName) { +void ShadowVolumeModel::initVolumeModel(const char* pModelName) { mModelData = MR::getJ3DModelData(pModelName); } diff --git a/src/Game/LiveActor/ShadowVolumeOval.cpp b/src/Game/LiveActor/ShadowVolumeOval.cpp index fddb14bb2..d9e58c69b 100644 --- a/src/Game/LiveActor/ShadowVolumeOval.cpp +++ b/src/Game/LiveActor/ShadowVolumeOval.cpp @@ -1,6 +1,7 @@ #include "Game/LiveActor/ShadowVolumeOval.hpp" -ShadowVolumeOval::ShadowVolumeOval() : ShadowVolumeModel("影描画[ボリューム楕球]") { +ShadowVolumeOval::ShadowVolumeOval() + : ShadowVolumeModel("影描画[ボリューム楕球]") { mSize.x = 100.0f; mSize.y = 100.0f; mSize.z = 200.0f; @@ -9,7 +10,7 @@ ShadowVolumeOval::ShadowVolumeOval() : ShadowVolumeModel("影描画[ボリュー bool ShadowVolumeOval::isDraw() const { ShadowController* controller = getController(); - bool ret = false; + bool ret = false; if (controller->isProjected()) { if (controller->isDraw()) { @@ -20,7 +21,7 @@ bool ShadowVolumeOval::isDraw() const { return ret; } -void ShadowVolumeOval::setSize(register const TVec3f &rVec) { +void ShadowVolumeOval::setSize(register const TVec3f& rVec) { __asm { psq_l f0, 0(rVec), 0, 0 lfs f1, 8(rVec) diff --git a/src/Game/LiveActor/ShadowVolumeOvalPole.cpp b/src/Game/LiveActor/ShadowVolumeOvalPole.cpp index 2a8874885..ccb1dff60 100644 --- a/src/Game/LiveActor/ShadowVolumeOvalPole.cpp +++ b/src/Game/LiveActor/ShadowVolumeOvalPole.cpp @@ -1,17 +1,17 @@ #include "Game/LiveActor/ShadowVolumeOvalPole.hpp" ShadowVolumeOvalPole::~ShadowVolumeOvalPole() { - } -ShadowVolumeOvalPole::ShadowVolumeOvalPole() : ShadowVolumeModel("影描画[ボリューム楕円柱]") { +ShadowVolumeOvalPole::ShadowVolumeOvalPole() + : ShadowVolumeModel("影描画[ボリューム楕円柱]") { mSize.x = 100.0f; mSize.y = 100.0f; mSize.z = 200.0f; initVolumeModel("ShadowVolumeCylinder"); } -void ShadowVolumeOvalPole::setSize(register const TVec3f &rVec) { +void ShadowVolumeOvalPole::setSize(register const TVec3f& rVec) { __asm { psq_l f0, 0(rVec), 0, 0 lfs f1, 8(rVec) diff --git a/src/Game/LiveActor/ShadowVolumeSphere.cpp b/src/Game/LiveActor/ShadowVolumeSphere.cpp index 9cd3acb9f..d8899b5f3 100644 --- a/src/Game/LiveActor/ShadowVolumeSphere.cpp +++ b/src/Game/LiveActor/ShadowVolumeSphere.cpp @@ -1,10 +1,10 @@ #include "Game/LiveActor/ShadowVolumeSphere.hpp" ShadowVolumeSphere::~ShadowVolumeSphere() { - } -ShadowVolumeSphere::ShadowVolumeSphere() : ShadowVolumeModel("影描画[ボリューム球]") { +ShadowVolumeSphere::ShadowVolumeSphere() + : ShadowVolumeModel("影描画[ボリューム球]") { mRadius = 100.0f; initVolumeModel("ShadowVolumeSphere"); } @@ -15,7 +15,7 @@ void ShadowVolumeSphere::setRadius(f32 radius) { bool ShadowVolumeSphere::isDraw() const { ShadowController* controller = getController(); - bool ret = false; + bool ret = false; if (controller->isProjected() && controller->isDraw()) { ret = true; diff --git a/src/Game/LiveActor/Spine.cpp b/src/Game/LiveActor/Spine.cpp index 1ee722b00..3a9d99824 100644 --- a/src/Game/LiveActor/Spine.cpp +++ b/src/Game/LiveActor/Spine.cpp @@ -1,14 +1,12 @@ #include "Game/LiveActor/Spine.hpp" #include "Game/LiveActor/ActorStateKeeper.hpp" -Spine::Spine(void *pExecutor, const Nerve *pNerve) : - mExecutor(pExecutor), - mCurrNerve(pNerve), - mNextNerve(nullptr), - mStep(0), - mStateKeeper(nullptr) -{ - +Spine::Spine(void* pExecutor, const Nerve* pNerve) + : mExecutor(pExecutor), + mCurrNerve(pNerve), + mNextNerve(nullptr), + mStep(0), + mStateKeeper(nullptr) { } void Spine::update() { @@ -18,7 +16,7 @@ void Spine::update() { changeNerve(); } -void Spine::setNerve(const Nerve *pNerve) { +void Spine::setNerve(const Nerve* pNerve) { if (mStep >= 0) { mCurrNerve->executeOnEnd(this); } @@ -27,7 +25,7 @@ void Spine::setNerve(const Nerve *pNerve) { mStep = -1; } -const Nerve* Spine::getCurrentNerve() const{ +const Nerve* Spine::getCurrentNerve() const { if (mNextNerve != nullptr) { return mNextNerve; } diff --git a/src/Game/LiveActor/SpotMarkLight.cpp b/src/Game/LiveActor/SpotMarkLight.cpp index 68ea3e0a9..877b5078a 100644 --- a/src/Game/LiveActor/SpotMarkLight.cpp +++ b/src/Game/LiveActor/SpotMarkLight.cpp @@ -1,6 +1,7 @@ #include "Game/LiveActor/SpotMarkLight.hpp" -SpotMarkLight::SpotMarkLight(LiveActor *pActor, f32 a3, f32 a4, MtxPtr mtx) : PartsModel(pActor, "マーク光柱", "SpotMarkLight", mtx, -1, false) { +SpotMarkLight::SpotMarkLight(LiveActor* pActor, f32 a3, f32 a4, MtxPtr mtx) + : PartsModel(pActor, "マーク光柱", "SpotMarkLight", mtx, -1, false) { _9B = false; if (!mtx) { @@ -22,8 +23,7 @@ void SpotMarkLight::control() { _9B = true; } } - } - else if (_9B && MR::isBrkStopped(this)) { + } else if (_9B && MR::isBrkStopped(this)) { MR::startBrk(this, "Appear"); _9B = false; } @@ -34,5 +34,4 @@ void SpotMarkLight::calcAndSetBaseMtx() { } SpotMarkLight::~SpotMarkLight() { - } diff --git a/src/Game/LiveActor/ViewGroupCtrl.cpp b/src/Game/LiveActor/ViewGroupCtrl.cpp index 85941186b..e9a01d54a 100644 --- a/src/Game/LiveActor/ViewGroupCtrl.cpp +++ b/src/Game/LiveActor/ViewGroupCtrl.cpp @@ -14,7 +14,7 @@ ViewGroupCtrl::ViewGroupCtrl() { } } -void ViewGroupCtrl::initActorInfo(ClippingActorInfo *pInfo, s32 groupID) { +void ViewGroupCtrl::initActorInfo(ClippingActorInfo* pInfo, s32 groupID) { pInfo->_12 = groupID; if (groupID >= mMaxViewGroupId) { @@ -22,7 +22,7 @@ void ViewGroupCtrl::initActorInfo(ClippingActorInfo *pInfo, s32 groupID) { } } -void ViewGroupCtrl::initViewGroup(ClippingActorInfoList *pList) { +void ViewGroupCtrl::initViewGroup(ClippingActorInfoList* pList) { for (s32 i = 0; i < pList->_4; i++) { s32 id = pList->mClippingActorList[i]->_12; @@ -35,10 +35,9 @@ void ViewGroupCtrl::initViewGroup(ClippingActorInfoList *pList) { } void ViewGroupCtrl::endInitViewGroupTable() { - } -void ViewGroupCtrl::entryLodCtrl(LodCtrl *pCtrl, const JMapInfoIter &rIter) { +void ViewGroupCtrl::entryLodCtrl(LodCtrl* pCtrl, const JMapInfoIter& rIter) { s32 groupID = -1; if (MR::getJMapInfoViewGroupID(rIter, &groupID)) { pCtrl->mViewGroupID = groupID; diff --git a/src/Game/LiveActor/VolumeModelDrawer.cpp b/src/Game/LiveActor/VolumeModelDrawer.cpp index 52fe6dab6..a97b4240b 100644 --- a/src/Game/LiveActor/VolumeModelDrawer.cpp +++ b/src/Game/LiveActor/VolumeModelDrawer.cpp @@ -7,12 +7,14 @@ #include "Game/Util/ObjUtil.hpp" #include -VolumeModelDrawInit::VolumeModelDrawInit() : NameObj("ボリュームモデル描画初期化") { +VolumeModelDrawInit::VolumeModelDrawInit() + : NameObj("ボリュームモデル描画初期化") { MR::FunctorV0F func(*MR::setupShadowVolumeDraw); MR::registerPreDrawFunction(func, 0x1C); } -VolumeModelDrawer::VolumeModelDrawer(const char *pName, const char *pFileName, MtxPtr mtx) : NameObj(pName) { +VolumeModelDrawer::VolumeModelDrawer(const char* pName, const char* pFileName, MtxPtr mtx) + : NameObj(pName) { mMtx = 0; mModelData = 0; mColor.r = 0xFF; @@ -65,9 +67,7 @@ void VolumeModelDrawer::loadModelDrawMtx() const { } VolumeModelDrawer::~VolumeModelDrawer() { - } VolumeModelDrawInit::~VolumeModelDrawInit() { - } \ No newline at end of file diff --git a/src/Game/Map/ActorAppearSwitchListener.cpp b/src/Game/Map/ActorAppearSwitchListener.cpp index 29b3e1072..6a906e19f 100644 --- a/src/Game/Map/ActorAppearSwitchListener.cpp +++ b/src/Game/Map/ActorAppearSwitchListener.cpp @@ -2,12 +2,10 @@ #include "Game/LiveActor/LiveActor.hpp" #include "Game/Util.hpp" -ActorAppearSwitchListener::ActorAppearSwitchListener(LiveActor *pActor, bool usesOn, bool usesOff) : - mActor(pActor), - mUsesOn(usesOn), - mUsesOff(usesOff) -{ - +ActorAppearSwitchListener::ActorAppearSwitchListener(LiveActor* pActor, bool usesOn, bool usesOff) + : mActor(pActor), + mUsesOn(usesOn), + mUsesOff(usesOff) { } void ActorAppearSwitchListener::listenSwitchOnEvent() { diff --git a/src/Game/Map/Air.cpp b/src/Game/Map/Air.cpp index 47a53fa60..004711d51 100644 --- a/src/Game/Map/Air.cpp +++ b/src/Game/Map/Air.cpp @@ -6,15 +6,16 @@ namespace NrvAir { NEW_NERVE(HostTypeIn, Air, In); NEW_NERVE(HostTypeOut, Air, Out); -}; +}; // namespace NrvAir -Air::Air(const char *pName) : LiveActor(pName) { +Air::Air(const char* pName) + : LiveActor(pName) { _8C = 0; _8D = 0; mDistance = 70.0f; } -void Air::init(const JMapInfoIter &rIter) { +void Air::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); const char* object_name = 0; MR::getObjectName(&object_name, rIter); @@ -51,8 +52,7 @@ void Air::init(const JMapInfoIter &rIter) { if (val) { makeActorDead(); } - } - else { + } else { appear(); } } @@ -67,8 +67,7 @@ void Air::appear() { MR::tryStartAllAnim(this, "Appear"); MR::setAllAnimFrameAtEnd(this, "Appear"); setNerve(&NrvAir::HostTypeIn::sInstance); - } - else { + } else { MR::tryStartAllAnim(this, "Disappear"); MR::setAllAnimFrameAtEnd(this, "Disappear"); MR::hideModel(this); @@ -80,11 +79,11 @@ bool Air::isDrawing() const { if (!MR::isDead(this)) { return !MR::isHiddenModel(this); } - + return false; } -void Air::initModel(const char *pModelName) { +void Air::initModel(const char* pModelName) { initModelManagerWithAnm(pModelName, 0, false); } @@ -115,7 +114,7 @@ void Air::appearFadeIn() { void Air::appearFadeOut() { makeActorAppeared(); MR::tryStartAllAnim(this, "Disappear"); - setNerve(&NrvAir::HostTypeOut::sInstance); + setNerve(&NrvAir::HostTypeOut::sInstance); } void Air::exeIn() { @@ -152,14 +151,13 @@ void Air::exeOut() { } Air::~Air() { - } -ProjectionMapAir::ProjectionMapAir(const char *pName) : Air(pName) { - +ProjectionMapAir::ProjectionMapAir(const char* pName) + : Air(pName) { } -void ProjectionMapAir::initModel(const char *pModelName) { +void ProjectionMapAir::initModel(const char* pModelName) { initModelManagerWithAnm(pModelName, nullptr, true); ProjmapEffectMtxSetter* mtxSetter = MR::initDLMakerProjmapEffectMtxSetter(this); MR::newDifferedDLBuffer(this); @@ -170,24 +168,26 @@ void Air::setFarClipping() { MR::setClippingFarMax(this); } -AirFar100m::AirFar100m(const char *pName) : Air(pName) { - +AirFar100m::AirFar100m(const char* pName) + : Air(pName) { } void AirFar100m::setFarClipping() { MR::setClippingFar100m(this); } -PriorDrawAir::PriorDrawAir(const char *pName) : Air(pName) { +PriorDrawAir::PriorDrawAir(const char* pName) + : Air(pName) { MR::createSceneObj(SceneObj_PriorDrawAirHolder); MR::getSceneObj(SceneObj_PriorDrawAirHolder)->add(this); } -PriorDrawAirHolder::PriorDrawAirHolder() : NameObj("先描画大気保持") { +PriorDrawAirHolder::PriorDrawAirHolder() + : NameObj("先描画大気保持") { mAirCount = 0; } -void PriorDrawAirHolder::add(PriorDrawAir *pAir) { +void PriorDrawAirHolder::add(PriorDrawAir* pAir) { s32 airCnt = mAirCount++; mAirs[airCnt] = pAir; } @@ -212,20 +212,16 @@ namespace MR { return MR::getSceneObj(SceneObj_PriorDrawAirHolder)->isExistValidDrawAir(); } -}; +}; // namespace MR AirFar100m::~AirFar100m() { - } ProjectionMapAir::~ProjectionMapAir() { - } PriorDrawAir::~PriorDrawAir() { - } PriorDrawAirHolder::~PriorDrawAirHolder() { - } diff --git a/src/Game/Map/BezierRail.cpp b/src/Game/Map/BezierRail.cpp index 77ab2b2c6..69a52c567 100644 --- a/src/Game/Map/BezierRail.cpp +++ b/src/Game/Map/BezierRail.cpp @@ -6,7 +6,7 @@ #include "JSystem/JGeometry/TMatrix.hpp" namespace { - void calcRailDirection(TVec3f *pOut, const RailPart *pRailPart, f32 a3) { + void calcRailDirection(TVec3f* pOut, const RailPart* pRailPart, f32 a3) { pRailPart->calcVelocity(pOut, a3); f32 v8; @@ -14,8 +14,7 @@ namespace { if (MR::isNearZero(*pOut, 0.001f)) { if ((a3 < 0.5f)) { v8 = 0.0099999998f + a3; - } - else { + } else { v8 = a3; a3 = a3 - 0.0099999998f; } @@ -29,9 +28,9 @@ namespace { MR::normalize(pOut); } -}; +}; // namespace -void BezierRailPart::set(const TVec3f &a1, const TVec3f &a2, const TVec3f &a3, const TVec3f &a4) { +void BezierRailPart::set(const TVec3f& a1, const TVec3f& a2, const TVec3f& a3, const TVec3f& a4) { TVec3f v21, v20, v19, v18, v17, v16; TVec3f v15(a2); @@ -66,7 +65,7 @@ void BezierRailPart::set(const TVec3f &a1, const TVec3f &a2, const TVec3f &a3, c mLength = getLength(0.0f, 1.0f, 0xA); } -void BezierRailPart::calcPos(TVec3f *pOut, f32 a2) const { +void BezierRailPart::calcPos(TVec3f* pOut, f32 a2) const { f32 v7 = 3.0f * a2; f32 v10 = ((3.0f * a2) * a2); f32 v9 = (a2 * (a2 * a2)); @@ -85,7 +84,7 @@ void BezierRailPart::calcPos(TVec3f *pOut, f32 a2) const { pOut->add(v14); } -void BezierRailPart::calcVelocity(TVec3f *pOut, f32 a2) const { +void BezierRailPart::calcVelocity(TVec3f* pOut, f32 a2) const { f32 v5 = (a2 * a2); f32 v7 = (2.0f * a2); @@ -113,25 +112,25 @@ f32 BezierRail::getPartLength(int idx) const { return mRailParts[idx].getTotalLength(); } -void BezierRail::calcPos(TVec3f *pOut, f32 a2) const { +void BezierRail::calcPos(TVec3f* pOut, f32 a2) const { const RailPart* part; - f32 param; + f32 param; getIncludedSection(&part, ¶m, a2, 1); part->calcPos(pOut, part->getParam(param)); } -void BezierRail::calcDirection(TVec3f *pOut, f32 a2) const { +void BezierRail::calcDirection(TVec3f* pOut, f32 a2) const { const RailPart* part; - f32 param; + f32 param; getIncludedSection(&part, ¶m, a2, 1); calcRailDirection(pOut, part, part->getParam(param)); } -void BezierRail::calcPosDir(TVec3f *pPos, TVec3f *pDir, f32 a3) const { +void BezierRail::calcPosDir(TVec3f* pPos, TVec3f* pDir, f32 a3) const { const RailPart* part; - f32 param; + f32 param; getIncludedSection(&part, ¶m, a3, 1); f32 val = part->getParam(param); @@ -141,10 +140,10 @@ void BezierRail::calcPosDir(TVec3f *pPos, TVec3f *pDir, f32 a3) const { #ifdef NON_MATCHING // regalloc issues -f32 BezierRail::getNearestRailPosCoord(const TVec3f &a1) const { +f32 BezierRail::getNearestRailPosCoord(const TVec3f& a1) const { RailPart* part = mRailParts; - int idx = 0; - + int idx = 0; + f32 length = part->getTotalLength(); f32 nearestParam = part->getNearestParam(a1, 100.0f / length); @@ -179,8 +178,7 @@ f32 BezierRail::getNearestRailPosCoord(const TVec3f &a1) const { f32 BezierRail::getRailPosCoord(int idx) const { if (!idx) { return 0.0f; - } - else { + } else { if (mIsClosed || mPointNum - 1 != idx) { return _10[idx - 1]; } @@ -189,12 +187,12 @@ f32 BezierRail::getRailPosCoord(int idx) const { return getTotalLength(); } -void BezierRail::calcCurrentRailCtrlPointIter(JMapInfoIter *pIter, f32 a2, bool a3) const { +void BezierRail::calcCurrentRailCtrlPointIter(JMapInfoIter* pIter, f32 a2, bool a3) const { int idx = getCurrentCtrlPointIndex(a2, a3); calcRailCtrlPointIter(pIter, idx); } -void BezierRail::calcRailCtrlPointIter(JMapInfoIter *pIter, int idx) const { +void BezierRail::calcRailCtrlPointIter(JMapInfoIter* pIter, int idx) const { pIter->mIndex = idx; pIter->mInfo = _18; } diff --git a/src/Game/Map/CollisionCategorizedKeeper.cpp b/src/Game/Map/CollisionCategorizedKeeper.cpp index ea4554634..8cd0fc7ef 100644 --- a/src/Game/Map/CollisionCategorizedKeeper.cpp +++ b/src/Game/Map/CollisionCategorizedKeeper.cpp @@ -8,22 +8,22 @@ TVec3f CollisionParts::getTrans() { return translation; } -void CollisionCategorizedKeeper::addToZone(CollisionParts *pParts, s32 zone) { +void CollisionCategorizedKeeper::addToZone(CollisionParts* pParts, s32 zone) { mZones[zone]->addParts(pParts); mZoneCount++; } -void CollisionCategorizedKeeper::removeFromZone(CollisionParts *pParts, s32 zone) { +void CollisionCategorizedKeeper::removeFromZone(CollisionParts* pParts, s32 zone) { mZones[zone]->eraseParts(pParts); mZoneCount--; } -void CollisionCategorizedKeeper::addToGlobal(CollisionParts *pParts) { +void CollisionCategorizedKeeper::addToGlobal(CollisionParts* pParts) { mZones[0]->addParts(pParts); mZoneCount++; } -void CollisionCategorizedKeeper::removeFromGlobal(CollisionParts *pParts) { +void CollisionCategorizedKeeper::removeFromGlobal(CollisionParts* pParts) { mZones[0]->eraseParts(pParts); mZoneCount--; } diff --git a/src/Game/Map/CollisionCode.cpp b/src/Game/Map/CollisionCode.cpp index d7aa32468..c8e42d229 100644 --- a/src/Game/Map/CollisionCode.cpp +++ b/src/Game/Map/CollisionCode.cpp @@ -4,7 +4,7 @@ CollisionCode::CollisionCode() : mFloorTable(0), mWallTable(0), mSoundTable(0), mCameraTable(0) { - + createFloorTable(); createWallTable(); createSoundTable(); @@ -19,14 +19,14 @@ CodeTable::CodeTable(u32 maxNum) { mNames = new const char*[maxNum]; } -void CodeTable::add(const char *pName, u32 num) { +void CodeTable::add(const char* pName, u32 num) { mHashCodes[mNumCodes] = MR::getHashCode(pName); _C[mNumCodes] = num; mNames[mNumCodes] = pName; mNumCodes++; } -const char* CollisionCode::getFloorCodeString(const Triangle &rTriangle) { +const char* CollisionCode::getFloorCodeString(const Triangle& rTriangle) { JMapInfoIter iter = rTriangle.getAttributes(); u32 code = getCode(iter, mFloorTable, "Floor_code"); @@ -40,22 +40,22 @@ const char* CodeTable::getString(u32 val) { } } - return "NoIter"; + return "NoIter"; } -const char* CollisionCode::getWallCodeString(const Triangle &rTriangle) { +const char* CollisionCode::getWallCodeString(const Triangle& rTriangle) { JMapInfoIter iter = rTriangle.getAttributes(); u32 code = getCode(iter, mWallTable, "Wall_code"); return mWallTable->getString(code); } -const char* CollisionCode::getSoundCodeString(const Triangle &rTriangle) { +const char* CollisionCode::getSoundCodeString(const Triangle& rTriangle) { JMapInfoIter iter = rTriangle.getAttributes(); return getSoundCodeString(iter); } -const char* CollisionCode::getSoundCodeString(const JMapInfoIter &rIter) { +const char* CollisionCode::getSoundCodeString(const JMapInfoIter& rIter) { if (!rIter.isValid()) { return "nullptr"; } @@ -68,10 +68,9 @@ const char* CollisionCode::getSoundCodeString(const JMapInfoIter &rIter) { if (ret) { return mSoundTable->getString(code); } - } - else { + } else { const char* code = 0; - + bool ret = rIter.getValue("Sound_code", &code); if (ret) { @@ -82,12 +81,12 @@ const char* CollisionCode::getSoundCodeString(const JMapInfoIter &rIter) { return "nullptr"; } -u32 CollisionCode::getCameraID(const Triangle &rTriangle) { +u32 CollisionCode::getCameraID(const Triangle& rTriangle) { JMapInfoIter iter = rTriangle.getAttributes(); return getCameraID(iter); } -u32 CollisionCode::getCode(const JMapInfoIter &rIter, CodeTable *pCodeTable, const char *pName) { +u32 CollisionCode::getCode(const JMapInfoIter& rIter, CodeTable* pCodeTable, const char* pName) { if (!rIter.isValid()) { return 0; } @@ -100,8 +99,7 @@ u32 CollisionCode::getCode(const JMapInfoIter &rIter, CodeTable *pCodeTable, con if (ret) { return code; } - } - else { + } else { const char* code = 0; bool ret = rIter.getValue(pName, &code); @@ -116,7 +114,7 @@ u32 CollisionCode::getCode(const JMapInfoIter &rIter, CodeTable *pCodeTable, con break; } } - + return ret_code; } } @@ -206,23 +204,23 @@ void CollisionCode::createCameraTable() { mCameraTable->add("Through", 1); } -u32 CollisionCode::getFloorCode(const JMapInfoIter &rIter) { +u32 CollisionCode::getFloorCode(const JMapInfoIter& rIter) { return getCode(rIter, mFloorTable, "Floor_code"); } -u32 CollisionCode::getWallCode(const JMapInfoIter &rIter) { +u32 CollisionCode::getWallCode(const JMapInfoIter& rIter) { return getCode(rIter, mWallTable, "Wall_code"); } -u32 CollisionCode::getSoundCode(const JMapInfoIter &rIter) { +u32 CollisionCode::getSoundCode(const JMapInfoIter& rIter) { return getCode(rIter, mSoundTable, "Sound_code"); } -u32 CollisionCode::getCameraCode(const JMapInfoIter &rIter) { +u32 CollisionCode::getCameraCode(const JMapInfoIter& rIter) { return getCode(rIter, mCameraTable, "Camera_through"); } -u32 CollisionCode::getCameraID(const JMapInfoIter &rIter) { +u32 CollisionCode::getCameraID(const JMapInfoIter& rIter) { if (!rIter.isValid()) { return -1; } diff --git a/src/Game/Map/CollisionDirector.cpp b/src/Game/Map/CollisionDirector.cpp index e7cd0fadb..eff4d1a94 100644 --- a/src/Game/Map/CollisionDirector.cpp +++ b/src/Game/Map/CollisionDirector.cpp @@ -6,12 +6,13 @@ #define NR_CATEGORIZED_KEEPERS 4 -CollisionDirector::CollisionDirector() : NameObj("地形コリジョン") { +CollisionDirector::CollisionDirector() + : NameObj("地形コリジョン") { mKeepers = nullptr; mCode = nullptr; mCode = new CollisionCode(); - mKeepers = new CollisionCategorizedKeeper *[NR_CATEGORIZED_KEEPERS]; + mKeepers = new CollisionCategorizedKeeper*[NR_CATEGORIZED_KEEPERS]; for (s32 i = 0; i < NR_CATEGORIZED_KEEPERS; i++) { mKeepers[i] = new CollisionCategorizedKeeper(i); @@ -21,15 +22,12 @@ CollisionDirector::CollisionDirector() : NameObj("地形コリジョン") { } CollisionDirector::~CollisionDirector() { - } -void CollisionDirector::init(const JMapInfoIter &rIter) { - +void CollisionDirector::init(const JMapInfoIter& rIter) { } void CollisionDirector::initAfterPlacement() { - } void CollisionDirector::movement() { diff --git a/src/Game/Map/CollisionParts.cpp b/src/Game/Map/CollisionParts.cpp index c0cfb68f7..10f3a88d1 100644 --- a/src/Game/Map/CollisionParts.cpp +++ b/src/Game/Map/CollisionParts.cpp @@ -30,8 +30,8 @@ CollisionParts::CollisionParts() { PSMTXInverse(reinterpret_cast(&mBaseMatrix), reinterpret_cast(&mInvBaseMatrix)); } -void CollisionParts::init(const TPos3f &a1, HitSensor *pHitSensor, const void *pKclData, const void *pMapInfo, s32 keeperIndex, bool a6) { - mServer->init(const_cast(pKclData), pMapInfo); +void CollisionParts::init(const TPos3f& a1, HitSensor* pHitSensor, const void* pKclData, const void* pMapInfo, s32 keeperIndex, bool a6) { + mServer->init(const_cast(pKclData), pMapInfo); mHitSensor = pHitSensor; resetAllMtx(a1); @@ -39,9 +39,9 @@ void CollisionParts::init(const TPos3f &a1, HitSensor *pHitSensor, const void *p TVec3f scale; mBaseMatrix.getScale(scale); - CollisionDirector *director = MR::getCollisionDirector(); - CollisionCategorizedKeeper *keeper = director->mKeepers[keeperIndex]; - s32 zoneID = MR::getCurrentPlacementZoneId(); + CollisionDirector* director = MR::getCollisionDirector(); + CollisionCategorizedKeeper* keeper = director->mKeepers[keeperIndex]; + s32 zoneID = MR::getCurrentPlacementZoneId(); mZone = keeper->getZone(zoneID); @@ -57,7 +57,7 @@ void CollisionParts::addToBelongZone() { s32 index = mKeeperIndex; s32 zoneID = mZone->mZoneID; - CollisionDirector *director = MR::getCollisionDirector(); + CollisionDirector* director = MR::getCollisionDirector(); director->mKeepers[index]->addToZone(this, zoneID); } @@ -65,25 +65,25 @@ void CollisionParts::removeFromBelongZone() { s32 index = mKeeperIndex; s32 zoneID = mZone->mZoneID; - CollisionDirector *director = MR::getCollisionDirector(); + CollisionDirector* director = MR::getCollisionDirector(); director->mKeepers[index]->removeFromZone(this, zoneID); } -void CollisionParts::initWithAutoEqualScale(const TPos3f &a1, HitSensor *pHitSensor, const void *pKclData, const void *pMapInfo, s32 keeperIndex, bool a6) { +void CollisionParts::initWithAutoEqualScale(const TPos3f& a1, HitSensor* pHitSensor, const void* pKclData, const void* pMapInfo, s32 keeperIndex, bool a6) { _CF = true; _D0 = false; init(a1, pHitSensor, pKclData, pMapInfo, keeperIndex, a6); } -void CollisionParts::initWithNotUsingScale(const TPos3f &a1, HitSensor *pHitSensor, const void *pKclData, const void *pMapInfo, s32 keeperIndex, bool a6) { +void CollisionParts::initWithNotUsingScale(const TPos3f& a1, HitSensor* pHitSensor, const void* pKclData, const void* pMapInfo, s32 keeperIndex, bool a6) { _CF = false; _D0 = true; init(a1, pHitSensor, pKclData, pMapInfo, keeperIndex, a6); } -void CollisionParts::resetAllMtx(const TPos3f &a1) { +void CollisionParts::resetAllMtx(const TPos3f& a1) { bool reset = false; if (_CD || _CE) { @@ -122,14 +122,14 @@ void CollisionParts::forceResetAllMtxAndSetUpdateMtxOneTime() { _CE = true; } -void CollisionParts::resetAllMtxPrivate(const TPos3f &a1) { +void CollisionParts::resetAllMtxPrivate(const TPos3f& a1) { JMath::gekko_ps_copy12(&mPrevBaseMatrix, &a1); JMath::gekko_ps_copy12(&mBaseMatrix, &a1); JMath::gekko_ps_copy12(&mMatrix, &a1); PSMTXInverse(reinterpret_cast(&mBaseMatrix), reinterpret_cast(&mInvBaseMatrix)); } -void CollisionParts::setMtx(const TPos3f &matrix) { +void CollisionParts::setMtx(const TPos3f& matrix) { JMath::gekko_ps_copy12(&mMatrix, &matrix); } @@ -148,16 +148,13 @@ void CollisionParts::updateMtx() { if (MR::isSameMtx(reinterpret_cast(&mMatrix), reinterpret_cast(&mBaseMatrix))) { _D4++; } - } - else { + } else { if (MR::isSameMtx(reinterpret_cast(&mMatrix), reinterpret_cast(&mBaseMatrix))) { _D4++; - } - else { + } else { if (_CE) { _D4 = 1; - } - else { + } else { _D4 = 0; } @@ -185,7 +182,7 @@ void CollisionParts::updateMtx() { #ifdef NON_MATCHING // Issues with assignments of scaleDiff f32 CollisionParts::makeEqualScale(MtxPtr matrix) { - TPos3f &mtx = *reinterpret_cast(matrix); + TPos3f& mtx = *reinterpret_cast(matrix); TVec3f scale; mtx.getScale(scale); @@ -199,14 +196,13 @@ f32 CollisionParts::makeEqualScale(MtxPtr matrix) { return scale.x; } - f32 uniformScale = 1.0f; + f32 uniformScale = 1.0f; TVec3f invScale; if (_D0) { invScale.set(uniformScale / scale.x, uniformScale / scale.y, uniformScale / scale.z); uniformScale = 1.0f; - } - else if (_CF) { + } else if (_CF) { uniformScale = (scale.x + scale.y + scale.z) / 3.0f; invScale.set(uniformScale / scale.x, uniformScale / scale.y, uniformScale / scale.z); } @@ -244,12 +240,12 @@ void CollisionParts::updateBoundingSphereRangePrivate(f32 scale) { _D8 = scale * mServer->mMaxVertexDistance; } -const char *CollisionParts::getHostName() const { +const char* CollisionParts::getHostName() const { if (mHitSensor == nullptr) { return nullptr; } - LiveActor *actor = mHitSensor->mHost; + LiveActor* actor = mHitSensor->mHost; if (actor == nullptr) { return nullptr; @@ -264,7 +260,7 @@ s32 CollisionParts::getPlacementZoneID() const { #ifdef NON_MATCHING // Instruction order -void CollisionParts::projectToPlane(TVec3f *pProjected, const TVec3f &rPos, const TVec3f &rOrigin, const TVec3f &rNormal) { +void CollisionParts::projectToPlane(TVec3f* pProjected, const TVec3f& rPos, const TVec3f& rOrigin, const TVec3f& rNormal) { TVec3f projected = rPos; TVec3f relative = rPos; @@ -279,8 +275,8 @@ void CollisionParts::projectToPlane(TVec3f *pProjected, const TVec3f &rPos, cons } #endif -void CollisionParts::calcForceMovePower(TVec3f *a1, const TVec3f &a2) const { - TVec3f tStack88 = a2; +void CollisionParts::calcForceMovePower(TVec3f* a1, const TVec3f& a2) const { + TVec3f tStack88 = a2; TMtx34f auStack76; PSMTXInverse((MtxPtr)&mPrevBaseMatrix, reinterpret_cast(&auStack76)); diff --git a/src/Game/Map/FileSelectEffect.cpp b/src/Game/Map/FileSelectEffect.cpp index 38f073246..28aeca9a9 100644 --- a/src/Game/Map/FileSelectEffect.cpp +++ b/src/Game/Map/FileSelectEffect.cpp @@ -4,13 +4,14 @@ namespace { NEW_NERVE(FileSelectEffectNrvAppear, FileSelectEffect, Appear); NEW_NERVE(FileSelectEffectNrvWait, FileSelectEffect, Wait); NEW_NERVE(FileSelectEffectNrvDisappear, FileSelectEffect, Disappear); -}; +}; // namespace -FileSelectEffect::FileSelectEffect(const char *pName) : LiveActor(pName) { +FileSelectEffect::FileSelectEffect(const char* pName) + : LiveActor(pName) { mEffectFrame = 0.0f; } -void FileSelectEffect::init(const JMapInfoIter &rIter) { +void FileSelectEffect::init(const JMapInfoIter& rIter) { initModelManagerWithAnm("MiniatureGalaxySelect", nullptr, false); MR::connectToSceneMapObj(this); MR::invalidateClipping(this); @@ -37,7 +38,6 @@ void FileSelectEffect::exeAppear() { } void FileSelectEffect::exeWait() { - } void FileSelectEffect::exeDisappear() { @@ -55,5 +55,4 @@ void FileSelectEffect::exeDisappear() { // FileSelectEffect::calcAndSetBaseMtx FileSelectEffect::~FileSelectEffect() { - } diff --git a/src/Game/Map/FileSelectFunc.cpp b/src/Game/Map/FileSelectFunc.cpp index f4c2e8a93..0dd7d97f9 100644 --- a/src/Game/Map/FileSelectFunc.cpp +++ b/src/Game/Map/FileSelectFunc.cpp @@ -13,7 +13,7 @@ namespace { "System_FileSelect_Icon003", "System_FileSelect_Icon004", }; -}; +}; // namespace namespace FileSelectFunc { u32 getMiiNameBufferSize() { @@ -22,18 +22,17 @@ namespace FileSelectFunc { void copyMiiName(u16* pName, const FileSelectIconID& rIcon) { if (rIcon.isFellow()) { - const char* pMessageId = sIconNameMessageID[rIcon.getFellowID()]; + const char* pMessageId = sIconNameMessageID[rIcon.getFellowID()]; const wchar_t* pMessage = MR::getGameMessageDirect(pMessageId); MR::copyMemory(pName, pMessage, getMiiNameBufferSize() * sizeof(wchar_t)); - } - else if (rIcon.isMii()) { + } else if (rIcon.isMii()) { RFLAdditionalInfo info; - RFLErrcode err = RFLGetAdditionalInfo(&info, RFLDataSource_Official, nullptr, rIcon.getMiiIndex()); + RFLErrcode err = RFLGetAdditionalInfo(&info, RFLDataSource_Official, nullptr, rIcon.getMiiIndex()); if (err == RFLErrcode_Success) { MR::copyMemory(pName, info.name, getMiiNameBufferSize() * sizeof(wchar_t)); } } } -}; +}; // namespace FileSelectFunc diff --git a/src/Game/Map/FileSelectIconID.cpp b/src/Game/Map/FileSelectIconID.cpp index 9bfd26695..4af61fc8b 100644 --- a/src/Game/Map/FileSelectIconID.cpp +++ b/src/Game/Map/FileSelectIconID.cpp @@ -1,9 +1,8 @@ #include "Game/Map/FileSelectIconID.hpp" -FileSelectIconID::FileSelectIconID() : - mIsMii(false), - mData(0) -{} +FileSelectIconID::FileSelectIconID() + : mIsMii(false), + mData(0) {} FileSelectIconID::FileSelectIconID(const FileSelectIconID& rOther) { mIsMii = rOther.mIsMii; diff --git a/src/Game/Map/GroundChecker.cpp b/src/Game/Map/GroundChecker.cpp index 0e3fd0a37..285654fc9 100644 --- a/src/Game/Map/GroundChecker.cpp +++ b/src/Game/Map/GroundChecker.cpp @@ -1,6 +1,7 @@ #include "Game/Map/GroundChecker.hpp" -GroundChecker::GroundChecker(const char *pName, f32 a2, f32 a3) : LiveActor(pName) { +GroundChecker::GroundChecker(const char* pName, f32 a2, f32 a3) + : LiveActor(pName) { _8C = 1.0f; _90 = 0.0f; MR::invalidateClipping(this); @@ -13,5 +14,4 @@ void GroundChecker::bringFriction(f32 a1, f32 a2) { } GroundChecker::~GroundChecker() { - } \ No newline at end of file diff --git a/src/Game/Map/Halo.cpp b/src/Game/Map/Halo.cpp index 7bc88f928..79d733a89 100644 --- a/src/Game/Map/Halo.cpp +++ b/src/Game/Map/Halo.cpp @@ -1,6 +1,7 @@ #include "Game/Map/Halo.hpp" -Halo::Halo(const char *pName) : MapObjActor(pName) { +Halo::Halo(const char* pName) + : MapObjActor(pName) { mDistance = 70.0f; } @@ -34,13 +35,12 @@ void Halo::appear() { if (MR::isExistBpk(this, anim)) { J3DFrameCtrl* ctrl = MR::getBpkCtrl(this); MR::setBpkFrame(this, ctrl->mEndFrame); - } if (MR::isExistBtp(this, anim)) { J3DFrameCtrl* ctrl = MR::getBtpCtrl(this); MR::setBpkFrame(this, ctrl->mEndFrame); } - + if (MR::isExistBrk(this, anim)) { J3DFrameCtrl* ctrl = MR::getBrkCtrl(this); MR::setBrkFrame(this, ctrl->mEndFrame); @@ -48,8 +48,7 @@ void Halo::appear() { MR::hideModel(this); setNerve(&NrvHalo::HostTypeDisappear::sInstance); - } - else { + } else { MR::startAllAnim(this, "Appear"); setNerve(&NrvHalo::HostTypeAppear::sInstance); } @@ -59,7 +58,7 @@ f32 Halo::getDistance() const { return MR::calcDistanceToPlayer(this); } -void Halo::connectToScene(const MapObjActorInitInfo &rIter) { +void Halo::connectToScene(const MapObjActorInitInfo& rIter) { MR::connectToSceneAir(this); } @@ -69,9 +68,8 @@ bool Halo::isDistanceAppear() const { f32 d = mDistance * 100.0f; if (d < v1) { return v1 < getDistance(); - } - else { - return getDistance() < v1; + } else { + return getDistance() < v1; } } @@ -91,22 +89,18 @@ bool Halo::isDistanceDisappear() const { void Halo::exeDisappear() { if (!MR::isHiddenModel(this)) { - bool flag; + bool flag; const char* anim = "Disappear"; if (MR::isExistBtk(this, anim) && MR::isBtkStopped(this)) { flag = true; - } - else if (MR::isExistBpk(this, anim) && MR::isBpkStopped(this)) { + } else if (MR::isExistBpk(this, anim) && MR::isBpkStopped(this)) { flag = true; - } - else if (MR::isExistBtp(this, anim) && MR::isBtpStopped(this)) { + } else if (MR::isExistBtp(this, anim) && MR::isBtpStopped(this)) { flag = true; - } - else if (MR::isExistBrk(this, anim) && MR::isBrkStopped(this)) { + } else if (MR::isExistBrk(this, anim) && MR::isBrkStopped(this)) { flag = true; - } - else { + } else { flag = false; } @@ -122,15 +116,15 @@ void Halo::exeDisappear() { } } -PowerStarHalo::PowerStarHalo(const char *pName) : Halo(pName) { +PowerStarHalo::PowerStarHalo(const char* pName) + : Halo(pName) { _C8 = -1; } Halo::~Halo() { - } -void PowerStarHalo::init(const JMapInfoIter &rIter) { +void PowerStarHalo::init(const JMapInfoIter& rIter) { Halo::init(rIter); MR::getJMapInfoArg1NoInit(rIter, &_C8); if (_C8 == -1) { @@ -141,8 +135,7 @@ void PowerStarHalo::init(const JMapInfoIter &rIter) { void PowerStarHalo::appear() { if (isNerve(&NrvPowerStarHalo::HostTypeWaitScenarioOpeningEnd::sInstance)) { makeActorAppeared(); - } - else { + } else { Halo::appear(); } } @@ -164,21 +157,20 @@ void PowerStarHalo::exeWaitScenarioOpeningEnd() { } PowerStarHalo::~PowerStarHalo() { - } -/* todo -- ordering of these functions is wrong */ -void NrvPowerStarHalo::HostTypeWaitScenarioOpeningEnd::execute(Spine *pSpine) const { +/* todo -- ordering of these functions is wrong */ +void NrvPowerStarHalo::HostTypeWaitScenarioOpeningEnd::execute(Spine* pSpine) const { PowerStarHalo* halo = reinterpret_cast(pSpine->mExecutor); halo->exeWaitScenarioOpeningEnd(); } -void NrvHalo::HostTypeDisappear::execute(Spine *pSpine) const { +void NrvHalo::HostTypeDisappear::execute(Spine* pSpine) const { Halo* halo = reinterpret_cast(pSpine->mExecutor); halo->exeDisappear(); } -void NrvHalo::HostTypeAppear::execute(Spine *pSpine) const { +void NrvHalo::HostTypeAppear::execute(Spine* pSpine) const { Halo* halo = reinterpret_cast(pSpine->mExecutor); if (halo->isDistanceDisappear()) { MR::startAllAnim(halo, "Disappear"); diff --git a/src/Game/Map/HitInfo.cpp b/src/Game/Map/HitInfo.cpp index 8d244196a..f2747ba16 100644 --- a/src/Game/Map/HitInfo.cpp +++ b/src/Game/Map/HitInfo.cpp @@ -16,14 +16,14 @@ Triangle::Triangle() { mPos[2].zero(); } -void Triangle::fillData(CollisionParts *pParts, u32 index, HitSensor *pSensor) { +void Triangle::fillData(CollisionParts* pParts, u32 index, HitSensor* pSensor) { mParts = pParts; mIdx = index; mSensor = pSensor; - KCollisionServer *server = pParts->mServer; - MtxPtr matrix; - KC_PrismData *prism = server->getPrismData(index); + KCollisionServer* server = pParts->mServer; + MtxPtr matrix; + KC_PrismData* prism = server->getPrismData(index); mNormals[0].set(*server->getFaceNormal(prism)); mNormals[1].set(*server->getEdgeNormal1(prism)); @@ -32,10 +32,10 @@ void Triangle::fillData(CollisionParts *pParts, u32 index, HitSensor *pSensor) { matrix = reinterpret_cast(&mParts->mBaseMatrix); - PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[0]), reinterpret_cast(&mNormals[0])); - PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[1]), reinterpret_cast(&mNormals[1])); - PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[2]), reinterpret_cast(&mNormals[2])); - PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[3]), reinterpret_cast(&mNormals[3])); + PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[0]), reinterpret_cast(&mNormals[0])); + PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[1]), reinterpret_cast(&mNormals[1])); + PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[2]), reinterpret_cast(&mNormals[2])); + PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[3]), reinterpret_cast(&mNormals[3])); MR::normalize(&mNormals[0]); MR::normalize(&mNormals[1]); @@ -46,12 +46,12 @@ void Triangle::fillData(CollisionParts *pParts, u32 index, HitSensor *pSensor) { mPos[1].set(server->getPos(prism, 1)); mPos[2].set(server->getPos(prism, 2)); - PSMTXMultVecSR(matrix, reinterpret_cast(&mPos[0]), reinterpret_cast(&mPos[0])); - PSMTXMultVecSR(matrix, reinterpret_cast(&mPos[1]), reinterpret_cast(&mPos[1])); - PSMTXMultVecSR(matrix, reinterpret_cast(&mPos[2]), reinterpret_cast(&mPos[2])); + PSMTXMultVecSR(matrix, reinterpret_cast(&mPos[0]), reinterpret_cast(&mPos[0])); + PSMTXMultVecSR(matrix, reinterpret_cast(&mPos[1]), reinterpret_cast(&mPos[1])); + PSMTXMultVecSR(matrix, reinterpret_cast(&mPos[2]), reinterpret_cast(&mPos[2])); } -const char *Triangle::getHostName() const { +const char* Triangle::getHostName() const { return mParts->getHostName(); } @@ -67,107 +67,100 @@ bool Triangle::isValid() const { return mIdx != 0xFFFFFFFF; } -const TVec3f *Triangle::getNormal(int index) const { +const TVec3f* Triangle::getNormal(int index) const { return &mNormals[index]; } -const TVec3f *Triangle::getFaceNormal() const { +const TVec3f* Triangle::getFaceNormal() const { return &mNormals[0]; } -const TVec3f *Triangle::getEdgeNormal(int index) const { +const TVec3f* Triangle::getEdgeNormal(int index) const { return &mNormals[index + 1]; } -const TVec3f *Triangle::getPos(int index) const { +const TVec3f* Triangle::getPos(int index) const { return &mPos[index]; } -const TVec3f *Triangle::calcAndGetNormal(int index) { - KCollisionServer *server = mParts->mServer; - KC_PrismData *prism = server->getPrismData(mIdx); +const TVec3f* Triangle::calcAndGetNormal(int index) { + KCollisionServer* server = mParts->mServer; + KC_PrismData* prism = server->getPrismData(mIdx); MtxPtr matrix = reinterpret_cast(&mParts->mBaseMatrix); switch (index) { - case 0: { - mNormals[0].set(*server->getFaceNormal(prism)); - PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[0]), reinterpret_cast(&mNormals[0])); - MR::normalize(&mNormals[0]); + case 0: { + mNormals[0].set(*server->getFaceNormal(prism)); + PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[0]), reinterpret_cast(&mNormals[0])); + MR::normalize(&mNormals[0]); - return &mNormals[0]; - } - break; - case 1: { - mNormals[1].set(*server->getEdgeNormal1(prism)); - PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[1]), reinterpret_cast(&mNormals[1])); - MR::normalize(&mNormals[1]); + return &mNormals[0]; + } break; + case 1: { + mNormals[1].set(*server->getEdgeNormal1(prism)); + PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[1]), reinterpret_cast(&mNormals[1])); + MR::normalize(&mNormals[1]); - return &mNormals[1]; - } - break; - case 2: { - mNormals[2].set(*server->getEdgeNormal2(prism)); - PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[2]), reinterpret_cast(&mNormals[2])); - MR::normalize(&mNormals[2]); - - return &mNormals[2]; - } - break; - case 3: { - mNormals[3].set(*server->getEdgeNormal3(prism)); - PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[3]), reinterpret_cast(&mNormals[3])); - MR::normalize(&mNormals[3]); + return &mNormals[1]; + } break; + case 2: { + mNormals[2].set(*server->getEdgeNormal2(prism)); + PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[2]), reinterpret_cast(&mNormals[2])); + MR::normalize(&mNormals[2]); - return &mNormals[3]; - } - break; + return &mNormals[2]; + } break; + case 3: { + mNormals[3].set(*server->getEdgeNormal3(prism)); + PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[3]), reinterpret_cast(&mNormals[3])); + MR::normalize(&mNormals[3]); + + return &mNormals[3]; + } break; } return &mNormals[index]; } -const TVec3f *Triangle::calcAndGetEdgeNormal(int index) { - KCollisionServer *server = mParts->mServer; - KC_PrismData *prism = server->getPrismData(mIdx); +const TVec3f* Triangle::calcAndGetEdgeNormal(int index) { + KCollisionServer* server = mParts->mServer; + KC_PrismData* prism = server->getPrismData(mIdx); MtxPtr matrix = reinterpret_cast(&mParts->mBaseMatrix); switch (index) { - case 0: { - mNormals[1].set(*server->getEdgeNormal1(prism)); - PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[1]), reinterpret_cast(&mNormals[1])); - MR::normalize(&mNormals[1]); + case 0: { + mNormals[1].set(*server->getEdgeNormal1(prism)); + PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[1]), reinterpret_cast(&mNormals[1])); + MR::normalize(&mNormals[1]); - return &mNormals[1]; - } - break; - case 1: { - mNormals[2].set(*server->getEdgeNormal2(prism)); - PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[2]), reinterpret_cast(&mNormals[2])); - MR::normalize(&mNormals[2]); + return &mNormals[1]; + } break; + case 1: { + mNormals[2].set(*server->getEdgeNormal2(prism)); + PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[2]), reinterpret_cast(&mNormals[2])); + MR::normalize(&mNormals[2]); - return &mNormals[2]; - } - break; - case 2: { - mNormals[3].set(*server->getEdgeNormal3(prism)); - PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[3]), reinterpret_cast(&mNormals[3])); - MR::normalize(&mNormals[3]); + return &mNormals[2]; + } break; + case 2: { + mNormals[3].set(*server->getEdgeNormal3(prism)); + PSMTXMultVecSR(matrix, reinterpret_cast(&mNormals[3]), reinterpret_cast(&mNormals[3])); + MR::normalize(&mNormals[3]); - return &mNormals[3]; - } - break; + return &mNormals[3]; + } break; } return &mNormals[index + 1]; } -const TVec3f *Triangle::calcAndGetPos(int index) { - KCollisionServer *server = mParts->mServer; - KC_PrismData *prism = server->getPrismData(mIdx); +const TVec3f* Triangle::calcAndGetPos(int index) { + KCollisionServer* server = mParts->mServer; + KC_PrismData* prism = server->getPrismData(mIdx); - TVec3f *pos = &mPos[index]; + TVec3f* pos = &mPos[index]; pos->set(server->getPos(prism, index)); @@ -176,7 +169,7 @@ const TVec3f *Triangle::calcAndGetPos(int index) { return pos; } -void Triangle::calcForceMovePower(TVec3f *a1, const TVec3f &a2) const { +void Triangle::calcForceMovePower(TVec3f* a1, const TVec3f& a2) const { mParts->calcForceMovePower(a1, a2); } @@ -192,20 +185,21 @@ JMapInfoIter Triangle::getAttributes() const { return mParts->mServer->getAttributes(mIdx); } -TPos3f *Triangle::getBaseMtx() const { +TPos3f* Triangle::getBaseMtx() const { return &mParts->mBaseMatrix; } -TPos3f *Triangle::getBaseInvMtx() const { +TPos3f* Triangle::getBaseInvMtx() const { return &mParts->mInvBaseMatrix; } -TPos3f *Triangle::getPrevBaseMtx() const { +TPos3f* Triangle::getPrevBaseMtx() const { return &mParts->mPrevBaseMatrix; } -HitInfo::HitInfo() : mParentTriangle(), _60(0.0f), - mHitPos(0, 0, 0), _70(0, 0, 0), _7C(0, 0, 0) { +HitInfo::HitInfo() + : mParentTriangle(), _60(0.0f), + mHitPos(0, 0, 0), _70(0, 0, 0), _7C(0, 0, 0) { _88 = 0; } diff --git a/src/Game/Map/KCollision.cpp b/src/Game/Map/KCollision.cpp index 432a41ac6..e2e273a51 100644 --- a/src/Game/Map/KCollision.cpp +++ b/src/Game/Map/KCollision.cpp @@ -2,7 +2,7 @@ #include "Game/Util/JMapInfo.hpp" #include "Game/Util/MathUtil.hpp" -Fxyz &Fxyz::operator=(const Fxyz &rOther) { +Fxyz& Fxyz::operator=(const Fxyz& rOther) { x = rOther.x; y = rOther.y; z = rOther.z; @@ -10,7 +10,7 @@ Fxyz &Fxyz::operator=(const Fxyz &rOther) { return *this; } -void KCollisionServer::V3u::setUsingCast(const TVec3f &rPos) { +void KCollisionServer::V3u::setUsingCast(const TVec3f& rPos) { x = static_cast(rPos.x); y = static_cast(rPos.y); z = static_cast(rPos.z); @@ -22,7 +22,7 @@ KCollisionServer::KCollisionServer() { mMaxVertexDistance = 1.0f; } -void KCollisionServer::init(void *pData, const void *pMapData) { +void KCollisionServer::init(void* pData, const void* pMapData) { setData(pData); if (pMapData != nullptr) { @@ -30,14 +30,14 @@ void KCollisionServer::init(void *pData, const void *pMapData) { } } -void KCollisionServer::setData(void *pData) { - mFile = reinterpret_cast(pData); +void KCollisionServer::setData(void* pData) { + mFile = reinterpret_cast(pData); if (isBinaryInitialized(pData)) { - mFile->mPos = reinterpret_cast(reinterpret_cast(mFile) + mFile->mPosOffset); - mFile->mNorms = reinterpret_cast(reinterpret_cast(mFile) + mFile->mNormOffset); - mFile->mPrisms = reinterpret_cast(reinterpret_cast(mFile) + mFile->mPrismOffset); - mFile->mOctree = reinterpret_cast(reinterpret_cast(mFile) + mFile->mOctreeOffset); + mFile->mPos = reinterpret_cast(reinterpret_cast(mFile) + mFile->mPosOffset); + mFile->mNorms = reinterpret_cast(reinterpret_cast(mFile) + mFile->mNormOffset); + mFile->mPrisms = reinterpret_cast(reinterpret_cast(mFile) + mFile->mPrismOffset); + mFile->mOctree = reinterpret_cast(reinterpret_cast(mFile) + mFile->mOctreeOffset); } } @@ -50,11 +50,11 @@ void KCollisionServer::setData(void *pData) { } }*/ -bool KCollisionServer::isBinaryInitialized(const void *pData) { - return reinterpret_cast(pData)[0] < 0; +bool KCollisionServer::isBinaryInitialized(const void* pData) { + return reinterpret_cast(pData)[0] < 0; } -bool KCollisionServer::isNearParallelNormal(const KC_PrismData *pPrism) const { +bool KCollisionServer::isNearParallelNormal(const KC_PrismData* pPrism) const { TVec3f edge0 = mFile->mNorms[pPrism->mEdgeIndices[0]]; TVec3f edge1 = mFile->mNorms[pPrism->mEdgeIndices[1]]; TVec3f edge2 = mFile->mNorms[pPrism->mEdgeIndices[2]]; @@ -68,98 +68,96 @@ bool KCollisionServer::isNearParallelNormal(const KC_PrismData *pPrism) const { return isNear; } -s32 KCollisionServer::toIndex(const KC_PrismData *pPrism) const { +s32 KCollisionServer::toIndex(const KC_PrismData* pPrism) const { return pPrism - (mFile->mPrisms + 1); } -TVec3f *KCollisionServer::getFaceNormal(const KC_PrismData *pPrism) const { +TVec3f* KCollisionServer::getFaceNormal(const KC_PrismData* pPrism) const { return &mFile->mNorms[pPrism->mNormalIndex]; } -TVec3f *KCollisionServer::getEdgeNormal1(const KC_PrismData *pPrism) const { +TVec3f* KCollisionServer::getEdgeNormal1(const KC_PrismData* pPrism) const { return &mFile->mNorms[pPrism->mEdgeIndices[0]]; } -TVec3f *KCollisionServer::getEdgeNormal2(const KC_PrismData *pPrism) const { +TVec3f* KCollisionServer::getEdgeNormal2(const KC_PrismData* pPrism) const { return &mFile->mNorms[pPrism->mEdgeIndices[1]]; } -TVec3f *KCollisionServer::getEdgeNormal3(const KC_PrismData *pPrism) const { +TVec3f* KCollisionServer::getEdgeNormal3(const KC_PrismData* pPrism) const { return &mFile->mNorms[pPrism->mEdgeIndices[2]]; } -TVec3f *KCollisionServer::getNormal(u32 index) const { +TVec3f* KCollisionServer::getNormal(u32 index) const { return &mFile->mNorms[index]; } -void KCollisionServer::calXvec(const Fxyz *pVecA, const Fxyz *pVecB, Fxyz *pDst) const { +void KCollisionServer::calXvec(const Fxyz* pVecA, const Fxyz* pVecB, Fxyz* pDst) const { pDst->x = pVecA->z * pVecB->y - pVecA->y * pVecB->z; pDst->y = pVecA->x * pVecB->z - pVecA->z * pVecB->x; pDst->z = pVecA->y * pVecB->x - pVecA->x * pVecB->y; } -TVec3f KCollisionServer::getPos(const KC_PrismData *pPrism, int vertexIndex) const { +TVec3f KCollisionServer::getPos(const KC_PrismData* pPrism, int vertexIndex) const { switch (vertexIndex) { - case 0: { - TVec3f *pos = &mFile->mPos[pPrism->mPositionIndex]; + case 0: { + TVec3f* pos = &mFile->mPos[pPrism->mPositionIndex]; - return TVec3f(pos->x, pos->y, pos->z); - } - case 1: { - Fxyz *pos = reinterpret_cast(&mFile->mPos[pPrism->mPositionIndex]); - Fxyz *edge2 = reinterpret_cast(&mFile->mNorms[pPrism->mEdgeIndices[2]]); + return TVec3f(pos->x, pos->y, pos->z); + } + case 1: { + Fxyz* pos = reinterpret_cast(&mFile->mPos[pPrism->mPositionIndex]); + Fxyz* edge2 = reinterpret_cast(&mFile->mNorms[pPrism->mEdgeIndices[2]]); - Fxyz finalPos; + Fxyz finalPos; - calXvec( - reinterpret_cast(&mFile->mNorms[pPrism->mEdgeIndices[1]]), - reinterpret_cast(&mFile->mNorms[pPrism->mNormalIndex]), - &finalPos - ); + calXvec( + reinterpret_cast(&mFile->mNorms[pPrism->mEdgeIndices[1]]), + reinterpret_cast(&mFile->mNorms[pPrism->mNormalIndex]), + &finalPos); - f32 sideLength = pPrism->mHeight / (finalPos.x * edge2->x + finalPos.y * edge2->y + finalPos.z * edge2->z); + f32 sideLength = pPrism->mHeight / (finalPos.x * edge2->x + finalPos.y * edge2->y + finalPos.z * edge2->z); - finalPos.x = pos->x + sideLength * finalPos.x; - finalPos.y = pos->y + sideLength * finalPos.y; - finalPos.z = pos->z + sideLength * finalPos.z; + finalPos.x = pos->x + sideLength * finalPos.x; + finalPos.y = pos->y + sideLength * finalPos.y; + finalPos.z = pos->z + sideLength * finalPos.z; - return TVec3f(finalPos.x, finalPos.y, finalPos.z); - } - case 2: { - Fxyz *pos = reinterpret_cast(&mFile->mPos[pPrism->mPositionIndex]); - Fxyz *edge2 = reinterpret_cast(&mFile->mNorms[pPrism->mEdgeIndices[2]]); + return TVec3f(finalPos.x, finalPos.y, finalPos.z); + } + case 2: { + Fxyz* pos = reinterpret_cast(&mFile->mPos[pPrism->mPositionIndex]); + Fxyz* edge2 = reinterpret_cast(&mFile->mNorms[pPrism->mEdgeIndices[2]]); - Fxyz finalPos; + Fxyz finalPos; - calXvec( - reinterpret_cast(&mFile->mNorms[pPrism->mNormalIndex]), - reinterpret_cast(&mFile->mNorms[pPrism->mEdgeIndices[0]]), - &finalPos - ); + calXvec( + reinterpret_cast(&mFile->mNorms[pPrism->mNormalIndex]), + reinterpret_cast(&mFile->mNorms[pPrism->mEdgeIndices[0]]), + &finalPos); - f32 sideLength = pPrism->mHeight / (finalPos.x * edge2->x + finalPos.y * edge2->y + finalPos.z * edge2->z); + f32 sideLength = pPrism->mHeight / (finalPos.x * edge2->x + finalPos.y * edge2->y + finalPos.z * edge2->z); - finalPos.x = pos->x + sideLength * finalPos.x; - finalPos.y = pos->y + sideLength * finalPos.y; - finalPos.z = pos->z + sideLength * finalPos.z; + finalPos.x = pos->x + sideLength * finalPos.x; + finalPos.y = pos->y + sideLength * finalPos.y; + finalPos.z = pos->z + sideLength * finalPos.z; - return TVec3f(finalPos.x, finalPos.y, finalPos.z); - } - default: - return TVec3f(0.0f, 0.0f, 0.0f); + return TVec3f(finalPos.x, finalPos.y, finalPos.z); + } + default: + return TVec3f(0.0f, 0.0f, 0.0f); } } -KC_PrismData *KCollisionServer::getPrismData(u32 index) const { +KC_PrismData* KCollisionServer::getPrismData(u32 index) const { return &mFile->mPrisms[1 + index]; } s32 KCollisionServer::getTriangleNum() const { - return (reinterpret_cast(mFile->mOctree) - reinterpret_cast(mFile->mPrisms + 1)) / sizeof(KC_PrismData); + return (reinterpret_cast(mFile->mOctree) - reinterpret_cast(mFile->mPrisms + 1)) / sizeof(KC_PrismData); } JMapInfoIter KCollisionServer::getAttributes(u32 index) const { - KC_PrismData *prism = &mFile->mPrisms[1 + index]; + KC_PrismData* prism = &mFile->mPrisms[1 + index]; JMapInfoIter iter; iter.mInfo = mapInfo; @@ -170,10 +168,10 @@ JMapInfoIter KCollisionServer::getAttributes(u32 index) const { #ifdef NON_MATCHING // Register mismatch -s32 *KCollisionServer::searchBlock(s32 *a1, const u32 &rX, const u32 &rY, const u32 &rZ) const { - KCLFile *file = mFile; - s32 blockWidthShift = file->mBlockWidthShift; - u8 *octree = reinterpret_cast(file->mOctree); +s32* KCollisionServer::searchBlock(s32* a1, const u32& rX, const u32& rY, const u32& rZ) const { + KCLFile* file = mFile; + s32 blockWidthShift = file->mBlockWidthShift; + u8* octree = reinterpret_cast(file->mOctree); *a1 = blockWidthShift; s32 offset = ((rX >> blockWidthShift) | ((rZ >> blockWidthShift) << file->mBlockXYShift) | ((rY >> blockWidthShift) << file->mBlockXShift)) * 4; @@ -182,13 +180,13 @@ s32 *KCollisionServer::searchBlock(s32 *a1, const u32 &rX, const u32 &rY, const offset = 0; } - while ((offset = *reinterpret_cast(octree + offset)) >= 0) { + while ((offset = *reinterpret_cast(octree + offset)) >= 0) { octree += offset; s32 uVar7 = --(*a1); offset = ((((rZ >> uVar7) & 1) << 2) | (((rY >> uVar7) & 1) << 1) | ((rX >> uVar7) & 1)) * 4; } - return reinterpret_cast(octree + (offset & 0x7FFFFFFF)); + return reinterpret_cast(octree + (offset & 0x7FFFFFFF)); } #endif diff --git a/src/Game/Map/KCollisionPlus.cpp b/src/Game/Map/KCollisionPlus.cpp index 205c487f5..68b949b3c 100644 --- a/src/Game/Map/KCollisionPlus.cpp +++ b/src/Game/Map/KCollisionPlus.cpp @@ -19,7 +19,7 @@ return true; }*/ -bool KCollisionServer::outCheck(const TVec3f *pPosA, const TVec3f *pPosB, V3u *pPointA, V3u *pPointB) const { +bool KCollisionServer::outCheck(const TVec3f* pPosA, const TVec3f* pPosB, V3u* pPointA, V3u* pPointB) const { objectSpaceToLocalSpace(pPointA, *pPosA); objectSpaceToLocalSpace(pPointB, *pPosB); @@ -60,7 +60,7 @@ bool KCollisionServer::outCheck(const TVec3f *pPosA, const TVec3f *pPosB, V3u *p return true; } -void KCollisionServer::objectSpaceToLocalSpace(V3u *pPoint, const TVec3f &rPos) const { +void KCollisionServer::objectSpaceToLocalSpace(V3u* pPoint, const TVec3f& rPos) const { pPoint->x = static_cast(rPos.x - mFile->mMin.x); pPoint->y = static_cast(rPos.y - mFile->mMin.y); pPoint->z = static_cast(rPos.z - mFile->mMin.z); diff --git a/src/Game/Map/KoopaBattleMapPlate.cpp b/src/Game/Map/KoopaBattleMapPlate.cpp index 87f4b08cc..b06e6044b 100644 --- a/src/Game/Map/KoopaBattleMapPlate.cpp +++ b/src/Game/Map/KoopaBattleMapPlate.cpp @@ -6,9 +6,8 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/SoundUtil.hpp" -KoopaBattleMapPlate::KoopaBattleMapPlate(const char* pName) : - LiveActor(pName) -{ +KoopaBattleMapPlate::KoopaBattleMapPlate(const char* pName) + : LiveActor(pName) { _8C.identity(); } @@ -17,7 +16,6 @@ void KoopaBattleMapPlate::calcAndSetBaseMtx() { } KoopaBattleMapPlate::~KoopaBattleMapPlate() { - } void KoopaBattleMapPlate::init(const JMapInfoIter& rIter) { @@ -41,7 +39,7 @@ void KoopaBattleMapPlate::init(const JMapInfoIter& rIter) { makeActorAppeared(); } -bool KoopaBattleMapPlate::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool KoopaBattleMapPlate::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (msg != ACTMES_KOOPA_HIP_DROP_ATTACK) { return false; } diff --git a/src/Game/Map/KoopaBattleMapStair.cpp b/src/Game/Map/KoopaBattleMapStair.cpp index 880367835..0f6ac9c18 100644 --- a/src/Game/Map/KoopaBattleMapStair.cpp +++ b/src/Game/Map/KoopaBattleMapStair.cpp @@ -11,14 +11,15 @@ namespace NrvKoopaBattleMapStair { NEW_NERVE(KoopaBattleMapStairNrvWaitFall, KoopaBattleMapStair, WaitFall); NEW_NERVE(KoopaBattleMapStairNrvFall, KoopaBattleMapStair, Fall); NEW_NERVE(KoopaBattleMapStairNrvDisappear, KoopaBattleMapStair, Disappear); -}; +}; // namespace NrvKoopaBattleMapStair struct OffsetPair { f32 _0; f32 _4; }; -KoopaBattleMapStair::KoopaBattleMapStair(const char *pName) : LiveActor(pName) { +KoopaBattleMapStair::KoopaBattleMapStair(const char* pName) + : LiveActor(pName) { mFireTimer = 300; _90 = -1; _94 = 0; @@ -36,7 +37,7 @@ KoopaBattleMapStair::KoopaBattleMapStair(const char *pName) : LiveActor(pName) { _BC = 240; } -void KoopaBattleMapStair::init(const JMapInfoIter &rIter) { +void KoopaBattleMapStair::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::getJMapInfoArg0NoInit(rIter, &mFireTimer); MR::getJMapInfoArg1NoInit(rIter, &_94); @@ -50,8 +51,7 @@ void KoopaBattleMapStair::init(const JMapInfoIter &rIter) { initModelManagerWithAnm(objName, nullptr, false); if (MR::isEqualString(objName, "KoopaBattleMapStairBig")) { mIsStairBig = 1; - } - else if (MR::isEqualString(objName, "KoopaBattleMapStairTurn")) { + } else if (MR::isEqualString(objName, "KoopaBattleMapStairTurn")) { mIsStairTurn = 1; } @@ -65,8 +65,7 @@ void KoopaBattleMapStair::init(const JMapInfoIter &rIter) { MR::needStageSwitchReadA(this, rIter); if (mIsStairBig) { MR::setClippingTypeSphere(this, 800.0f); - } - else { + } else { MR::setClippingTypeSphere(this, 500.0f); } @@ -103,38 +102,35 @@ bool KoopaBattleMapStair::isRequestAttackVs3() const { namespace { static OffsetPair offset_table[8] = { - { 0.0f, -1.0f}, - { 1.0f, -1.0f }, - {1.0f, 0.0f }, - { 1.0f, 1.0f }, - { 0.0f, 1.0f }, - { -1.0f, 1.0f }, - { -1.0f, 0.0f }, - { -1.0f, -1.0f } - }; + {0.0f, -1.0f}, + {1.0f, -1.0f}, + {1.0f, 0.0f}, + {1.0f, 1.0f}, + {0.0f, 1.0f}, + {-1.0f, 1.0f}, + {-1.0f, 0.0f}, + {-1.0f, -1.0f}}; - void updateNearestPos(TVec3f *pPos, f32 *pTable, const TVec3f &a3, const TVec3f &a4, s32 a5, s32 a6) { + void updateNearestPos(TVec3f* pPos, f32* pTable, const TVec3f& a3, const TVec3f& a4, s32 a5, s32 a6) { if (a5 < 0) { f32 dist = PSVECDistance(&a3, &a4); if (dist > *pTable) { - - } - else { + + } else { pPos->set(a3); *pTable = dist; } - } - else if (a5 == a6) { + } else if (a5 == a6) { pPos->set(a3); } } -}; +}; // namespace -f32 KoopaBattleMapStair::calcAndSetTargetPos(TVec3f *pPos, const TVec3f &a2) { +f32 KoopaBattleMapStair::calcAndSetTargetPos(TVec3f* pPos, const TVec3f& a2) { TVec3f v41, v40, v39; MR::calcActorAxis(&v39, &v40, &v41, this); TVec3f v38 = (v40 * 100) + mPosition; - f32 v20 = PSVECDistance(&v38, &a2); + f32 v20 = PSVECDistance(&v38, &a2); pPos->set(v38); s32 val; if (mIsStairBig) { @@ -143,15 +139,13 @@ f32 KoopaBattleMapStair::calcAndSetTargetPos(TVec3f *pPos, const TVec3f &a2) { TVec3f v31 = (v38 + (v39 * 600.0f) * offset_table[i]._0) + (v41 * 400.0f * offset_table[i]._4); updateNearestPos(pPos, &v20, v31, a2, val, i); } - } - else if (mIsStairTurn) { + } else if (mIsStairTurn) { TVec3f v30 = v39 * 140.0f; TVec3f tmp = v38 + (v41 * 300.0f); TVec3f v27(tmp); JMathInlineVEC::PSVECSubtract(&v27, &v30, &v27); updateNearestPos(pPos, &v20, v27, a2, -1, -1); - } - else { + } else { val = _98; for (s32 i = 0; i < 8; i++) { TVec3f v21 = (v38 + (v39 * 300.0f) * offset_table[i]._0) + (v41 * 200.0f * offset_table[i]._4); diff --git a/src/Game/Map/LavaShellTower.cpp b/src/Game/Map/LavaShellTower.cpp index 047e60907..7021ac5d8 100644 --- a/src/Game/Map/LavaShellTower.cpp +++ b/src/Game/Map/LavaShellTower.cpp @@ -7,13 +7,13 @@ namespace NrvLavaShellTower { NEW_NERVE(HostTypeWait, LavaShellTower, Wait); NEW_NERVE(HostTypeDemo, LavaShellTower, Demo); NEW_NERVE(HostTypeDone, LavaShellTower, Done); -}; +}; // namespace NrvLavaShellTower -LavaShellTower::LavaShellTower(const char *pName) : MapObjActor(pName) { - +LavaShellTower::LavaShellTower(const char* pName) + : MapObjActor(pName) { } -void LavaShellTower::init(const JMapInfoIter &rIter) { +void LavaShellTower::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; info.setupHioNode("地形オブジェ"); @@ -28,7 +28,6 @@ void LavaShellTower::init(const JMapInfoIter &rIter) { } void LavaShellTower::exeWait() { - } void LavaShellTower::exeDemo() { @@ -47,9 +46,7 @@ void LavaShellTower::exeDemo() { } void LavaShellTower::exeDone() { - } -void LavaShellTower::initCaseUseSwitchB(const MapObjActorInitInfo &) { - +void LavaShellTower::initCaseUseSwitchB(const MapObjActorInitInfo&) { } diff --git a/src/Game/Map/LavaSunPlanet.cpp b/src/Game/Map/LavaSunPlanet.cpp index b4c3c421d..3c5f235c5 100644 --- a/src/Game/Map/LavaSunPlanet.cpp +++ b/src/Game/Map/LavaSunPlanet.cpp @@ -6,7 +6,8 @@ #include "Game/Util/LiveActorUtil.hpp" #include "revolution/types.h" -LavaSunPlanet::LavaSunPlanet(const char *pName) : LiveActor(pName) { +LavaSunPlanet::LavaSunPlanet(const char* pName) + : LiveActor(pName) { mRotator = nullptr; mObjName = nullptr; mLodCtrl = nullptr; @@ -21,10 +22,9 @@ void LavaSunPlanet::control() { } void LavaSunPlanet::calcAndSetBaseMtx() { - if (mRotator == nullptr) { + if (mRotator == nullptr) { LiveActor::calcAndSetBaseMtx(); - } - else { + } else { TPos3f mtx; mtx.setInline(mRotator->getRotateMtx()); mtx.mMtx[0][3] = mPosition.x; @@ -34,7 +34,7 @@ void LavaSunPlanet::calcAndSetBaseMtx() { } } -void LavaSunPlanet::init(const JMapInfoIter &rIter) { +void LavaSunPlanet::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::getObjectName(&mObjName, rIter); initModelManagerWithAnm(mObjName, nullptr, true); @@ -50,8 +50,7 @@ void LavaSunPlanet::init(const JMapInfoIter &rIter) { if (MR::isExistAnim(this, mObjName)) { MR::startAllAnim(this, mObjName); - } - else if (!MR::isExistEffectTexMtx(this)) { + } else if (!MR::isExistEffectTexMtx(this)) { calcAnim(); MR::offCalcAnim(this); } @@ -69,5 +68,4 @@ void LavaSunPlanet::init(const JMapInfoIter &rIter) { } LavaSunPlanet::~LavaSunPlanet() { - } diff --git a/src/Game/Map/LightDataHolder.cpp b/src/Game/Map/LightDataHolder.cpp index a30702f47..a26cc3c20 100644 --- a/src/Game/Map/LightDataHolder.cpp +++ b/src/Game/Map/LightDataHolder.cpp @@ -12,7 +12,7 @@ LightDataHolder::LightDataHolder() { #ifdef NON_MATCHING // regalloc issues -AreaLightInfo* LightDataHolder::findAreaLight(const char *pName) const { +AreaLightInfo* LightDataHolder::findAreaLight(const char* pName) const { for (s32 i = 0; i < mLightCount; i++) { AreaLightInfo* inf = &mLights[i]; diff --git a/src/Game/Map/LightDirector.cpp b/src/Game/Map/LightDirector.cpp index 8ae9a4cbf..9c19417a3 100644 --- a/src/Game/Map/LightDirector.cpp +++ b/src/Game/Map/LightDirector.cpp @@ -2,7 +2,7 @@ #include "Game/Map/LightFunction.hpp" #include "Game/Util.hpp" -void LightDirector::init(const JMapInfoIter &rIter) { +void LightDirector::init(const JMapInfoIter& rIter) { MR::connectToSceneMapObjMovement(this); LightFunction::loadAllLightWhite(); mHolder = new LightDataHolder(); @@ -21,5 +21,4 @@ void LightDirector::movement() { } LightDirector::~LightDirector() { - } \ No newline at end of file diff --git a/src/Game/Map/LightFunction.cpp b/src/Game/Map/LightFunction.cpp index b6cb32891..7d1070b25 100644 --- a/src/Game/Map/LightFunction.cpp +++ b/src/Game/Map/LightFunction.cpp @@ -19,7 +19,7 @@ ResourceHolder* LightFunction::loadLightArchive() { // LightFunction::createLightDataParser // LightFunction::createZoneDataParser -void LightFunction::getAreaLightLightData(JMapInfo *pInfo, int idx, AreaLightInfo *pLightInfo) { +void LightFunction::getAreaLightLightData(JMapInfo* pInfo, int idx, AreaLightInfo* pLightInfo) { MR::getCsvDataStr(&pLightInfo->mAreaLightName, pInfo, "AreaLightName", idx); MR::getCsvDataS32(&pLightInfo->mInterpolate, pInfo, "Interpolate", idx); getDataActorLightInfo(pInfo, idx, &pLightInfo->mPlayerLight, "Player"); diff --git a/src/Game/Map/LightZoneDataHolder.cpp b/src/Game/Map/LightZoneDataHolder.cpp index addd9ccae..8da7ac640 100644 --- a/src/Game/Map/LightZoneDataHolder.cpp +++ b/src/Game/Map/LightZoneDataHolder.cpp @@ -13,7 +13,7 @@ void ZoneLightID::clear() { mLightID = -1; } -bool ZoneLightID::isTargetArea(const LightArea *pLightArea) const { +bool ZoneLightID::isTargetArea(const LightArea* pLightArea) const { if (_0 == pLightArea->mPlacedZoneID && mLightID == pLightArea->mObjArg0) { return false; } @@ -54,7 +54,7 @@ void LightZoneDataHolder::initZoneData() { } } -const char* LightZoneDataHolder::getAreaLightNameInZoneData(const ZoneLightID &zoneID) const { +const char* LightZoneDataHolder::getAreaLightNameInZoneData(const ZoneLightID& zoneID) const { s32 val = zoneID._0; if (val < 0) { @@ -71,7 +71,7 @@ const char* LightZoneDataHolder::getDefaultStageAreaLightName() const { void LightZoneInfo::init(s32 zoneID) { const char* zoneName = MR::getZoneNameFromZoneId(zoneID); - JMapInfo* parser = 0; + JMapInfo* parser = 0; mAreaCount = LightFunction::createZoneDataParser(zoneName, &parser); mAreaInfo = new AreaInfo[mAreaCount]; diff --git a/src/Game/Map/NamePosHolder.cpp b/src/Game/Map/NamePosHolder.cpp index e07240998..f09e22124 100644 --- a/src/Game/Map/NamePosHolder.cpp +++ b/src/Game/Map/NamePosHolder.cpp @@ -2,7 +2,8 @@ #include "Game/Scene/SceneObjHolder.hpp" #include "Game/Util/SceneUtil.hpp" -NamePosHolder::NamePosHolder() : NameObj("位置テーブル保持") { +NamePosHolder::NamePosHolder() + : NameObj("位置テーブル保持") { mPosNum = 0; mInfos = 0; mPosNum = MR::getGeneralPosNum(); @@ -17,15 +18,13 @@ NamePosHolder::NamePosHolder() : NameObj("位置テーブル保持") { } NamePosInfo::NamePosInfo() { - } namespace MR { NamePosHolder* getNamePosHolder() { return MR::getSceneObj(SceneObj_NamePosHolder); } -}; +}; // namespace MR NamePosHolder::~NamePosHolder() { - } diff --git a/src/Game/Map/OceanRing.cpp b/src/Game/Map/OceanRing.cpp index 7cacb5d40..75f8a4e6c 100644 --- a/src/Game/Map/OceanRing.cpp +++ b/src/Game/Map/OceanRing.cpp @@ -17,7 +17,8 @@ namespace { static f32 sEdgePointNum = 2.0f; }; -OceanRing::OceanRing(const char *pName) : LiveActor(pName) { +OceanRing::OceanRing(const char* pName) + : LiveActor(pName) { mWaterPointNum = 0; mSegCount = 0; mStride = 15; @@ -56,7 +57,7 @@ OceanRing::OceanRing(const char *pName) : LiveActor(pName) { mClippingBox.mMax.zero(); } -void OceanRing::init(const JMapInfoIter &rIter) { +void OceanRing::init(const JMapInfoIter& rIter) { MR::connectToScene(this, 0x22, -1, -1, 0x8); MR::initDefaultPos(this, rIter); initRailRider(rIter); @@ -70,13 +71,11 @@ void OceanRing::init(const JMapInfoIter &rIter) { if (arg0 == 0) { mOceanRingPipe = new OceanRingPipe(this, mWidthMax, 1200.0f); mOceanRingPipe->init(rIter); - } - else { + } else { if (arg0 == 2) { mWaveHeight1 = 20.0f; mWaveHeight2 = 30.0f; - } - else { + } else { mWaveHeight1 = 50.0f; mWaveHeight2 = 80.0f; } @@ -99,14 +98,14 @@ void OceanRing::initAfterPlacement() { } } -bool OceanRing::isInWater(const TVec3f &rVec) const { +bool OceanRing::isInWater(const TVec3f& rVec) const { if (!mClippingBox.intersectsPoint(rVec)) { return false; - } + } TVec3f nearPos; - f32 pos = calcNearestPos(rVec, &nearPos, nullptr, nullptr); - f32 w = (mWidthMax * calcCurrentWidthRate(pos)); + f32 pos = calcNearestPos(rVec, &nearPos, nullptr, nullptr); + f32 w = (mWidthMax * calcCurrentWidthRate(pos)); if (PSVECDistance(&nearPos, &rVec) > w) { return false; @@ -120,10 +119,10 @@ bool OceanRing::isInWater(const TVec3f &rVec) const { } // https://decomp.me/scratch/bZJMh -bool OceanRing::calcWaterInfo(const TVec3f &a1, const TVec3f &a2, WaterInfo *pInfo) const { +bool OceanRing::calcWaterInfo(const TVec3f& a1, const TVec3f& a2, WaterInfo* pInfo) const { TVec3f v23, v24; - f32 nearestPos = calcNearestPos(a1, &v24, &v23, nullptr); - f32 v9 = (mWidthMax * calcCurrentWidthRate(nearestPos)); + f32 nearestPos = calcNearestPos(a1, &v24, &v23, nullptr); + f32 v9 = (mWidthMax * calcCurrentWidthRate(nearestPos)); TVec3f streamVec; calcStreamVec(a1, nearestPos, &streamVec); pInfo->mStreamVec.set(streamVec); @@ -157,8 +156,7 @@ bool OceanRing::calcWaterInfo(const TVec3f &a1, const TVec3f &a2, WaterInfo *pIn v18.scale(v9); v18.add(v24); pInfo->mEdgePos.set(v18); - } - else { + } else { MR::normalize(&v19); v19.scale(v9); v19.add(v24); @@ -170,19 +168,19 @@ bool OceanRing::calcWaterInfo(const TVec3f &a1, const TVec3f &a2, WaterInfo *pIn } // https://decomp.me/scratch/7aoXp -f32 OceanRing::calcNearestPos(const TVec3f &a1, TVec3f *a2, TVec3f *a3, TVec3f *a4) const { +f32 OceanRing::calcNearestPos(const TVec3f& a1, TVec3f* a2, TVec3f* a3, TVec3f* a4) const { WaterPoint* point = mWaterPoints[7]; - f32 origDist = PSVECDistance(&point->mOrigPos, &a1); - u32 v12 = 0; - u32 v13 = 1; + f32 origDist = PSVECDistance(&point->mOrigPos, &a1); + u32 v12 = 0; + u32 v13 = 1; - for (s32 i = 15; ; i += 15) { + for (s32 i = 15;; i += 15) { if (v13 >= mSegCount) { break; } WaterPoint* pnt = mWaterPoints[i + 7]; - f32 dist = PSVECDistance(&pnt->mOrigPos, &a1); + f32 dist = PSVECDistance(&pnt->mOrigPos, &a1); if (dist < origDist) { origDist = dist; @@ -198,17 +196,15 @@ f32 OceanRing::calcNearestPos(const TVec3f &a1, TVec3f *a2, TVec3f *a3, TVec3f * if (v12 <= 0 || v12 >= mSegCount - 1) { a2->set(point->mOrigPos); v33 = v12; - } - else { + } else { WaterPoint* v20 = mWaterPoints[0xF * v12 - 8]; WaterPoint* v21 = mWaterPoints[0xF * v12 + 0x16]; - f32 v22 = PSVECDistance(&v20->mOrigPos, &a1); + f32 v22 = PSVECDistance(&v20->mOrigPos, &a1); v33 = v12; if (v22 < PSVECDistance(&v21->mOrigPos, &a1)) { v18 = (200.0f * ((v33 - 4.503601774854144e15f) + MR::calcPerpendicFootToLine(a2, a1, point->mOrigPos, v20->mOrigPos))); - } - else { + } else { v18 = (200.0f * ((v33 - 4.503601774854144e15f) + MR::calcPerpendicFootToLine(a2, a1, point->mOrigPos, v21->mOrigPos))); } } @@ -221,7 +217,7 @@ f32 OceanRing::calcNearestPos(const TVec3f &a1, TVec3f *a2, TVec3f *a3, TVec3f * TVec3f v29; TVec3f v26(-v30); PSVECCrossProduct(&MR::getRailDirection(this), (const Vec*)&v26, (Vec*)&v29); - f32 v24 = (mWidthMax * calcCurrentWidthRate(v18)); + f32 v24 = (mWidthMax * calcCurrentWidthRate(v18)); TVec3f v28(v29); v28.scale(-v24); v28.add(*a2); @@ -238,7 +234,7 @@ f32 OceanRing::calcNearestPos(const TVec3f &a1, TVec3f *a2, TVec3f *a3, TVec3f * return v18; } -f32 OceanRing::calcWaveHeight(const TVec3f &a1, f32 a2, TVec3f *a3) const { +f32 OceanRing::calcWaveHeight(const TVec3f& a1, f32 a2, TVec3f* a3) const { MR::setRailCoord((OceanRing*)this, a2); TVec3f v43(a1); v43.sub(MR::getRailPos(this)); @@ -247,17 +243,17 @@ f32 OceanRing::calcWaveHeight(const TVec3f &a1, f32 a2, TVec3f *a3) const { TVec3f v30(-v42); TVec3f v37; PSVECCrossProduct((const Vec*)&MR::getRailDirection(this), &v30, &v37); - f32 dot = v43.dot(v37); - u32 v11 = mStride - 1; - f32 v12 = (1200.0f + dot); - s32 v44 = (7.0f + (dot / 171.42857f)); - s32 v13 = MR::clamp(v44, 0, v11); - u32 v14 = mSegCount - 1; - s32 v46 = (a2 / 200.0f); - s32 v15 = MR::clamp(v46, 0, v14); + f32 dot = v43.dot(v37); + u32 v11 = mStride - 1; + f32 v12 = (1200.0f + dot); + s32 v44 = (7.0f + (dot / 171.42857f)); + s32 v13 = MR::clamp(v44, 0, v11); + u32 v14 = mSegCount - 1; + s32 v46 = (a2 / 200.0f); + s32 v15 = MR::clamp(v46, 0, v14); WaterPoint* point = getPoint(v13, v15); - f32 v17 = point->calcHeight(mWaveTheta1, mWaveTheta2, mWaveHeight1, mWaveHeight2, v12, a2); - TVec3f v36(v37); + f32 v17 = point->calcHeight(mWaveTheta1, mWaveTheta2, mWaveHeight1, mWaveHeight2, v12, a2); + TVec3f v36(v37); v36.scale(-10.0f); TVec3f v35(v37); v35.scale(10.0f); @@ -285,18 +281,17 @@ f32 OceanRing::calcWaveHeight(const TVec3f &a1, f32 a2, TVec3f *a3) const { if (MR::isNearZero(*a3, 0.001f)) { a3->set(-v42); - } - else { + } else { MR::normalize(a3); } return v17; } -void OceanRing::calcStreamVec(const TVec3f &a1, f32 a2, TVec3f *pStreamVec) const { +void OceanRing::calcStreamVec(const TVec3f& a1, f32 a2, TVec3f* pStreamVec) const { pStreamVec->zero(); - f32 v8 = (mWidthMax * calcCurrentWidthRate(a2)); - f32 v9 = (10.0f * calcCurrentFlowSpeedRate(a2)); + f32 v8 = (mWidthMax * calcCurrentWidthRate(a2)); + f32 v9 = (10.0f * calcCurrentFlowSpeedRate(a2)); TVec3f near(mNearestPos); near.sub(a1); if (PSVECMag(&near) < v8) { @@ -369,9 +364,9 @@ void OceanRing::initPoints() { if ((7 - v19) < sEdgePointNum) { ease = MR::getEaseOutValue((7 - v19) / sEdgePointNum, 0.0f, 1.0f, 1.0f); } - + mWaterPoints[v15] = new WaterPoint(v21, v23, ((j + 7) * 171.42857f), (i * v6), ease, currentFlowSpeed); - v7++; + v7++; v15++; } @@ -384,7 +379,7 @@ void OceanRing::updatePoints() { _B4 = 1; return; } - + mNearPosToPlayer = calcNearestPos(*MR::getPlayerPos(), &mNearestPos, &mNearestDir, nullptr); if (PSVECDistance(&mNearestPos, MR::getPlayerPos()) > 5000.0f) { _B4 = 1; @@ -396,7 +391,7 @@ void OceanRing::updatePoints() { updatePointsInLine(0, mSegCount - 1, 0, 0); return; } - + bool flag = true; if (MR::getCamZdir().dot(mNearestDir) < 0.0f) { flag = false; @@ -407,8 +402,7 @@ void OceanRing::updatePoints() { if (flag) { v8 = v16 - 8; v9 = v16 + mObjArg1; - } - else { + } else { v9 = v16 + 8; v8 = v16 - mObjArg1; } @@ -419,20 +413,19 @@ void OceanRing::updatePoints() { updatePointsInLine(v10, v11, 3, 3); return; } - + if (v8 >= 0 && v9 < mSegCount) { updatePointsInLine(v8, v9, 3, 3); return; } - + if (v8 >= 0) { s32 v13 = mSegCount - 1; if (v9 > v13) { s32 v12 = mSegCount - 1; updatePointsInLine(0, v9, 0, 3); updatePointsInLine((v12 + v8) % v12, mSegCount - 1, 3, 0); - } - else { + } else { updatePointsInLine(v8, v13, 3, 0); updatePointsInLine(0, (v13 + v9) % v13, 0, 3); } @@ -444,7 +437,7 @@ void OceanRing::updatePointsInLine(s32 a1, s32 a2, s32 a3, s32 a4) { s32 v12; s32 v10; s32 i; - + v10 = a1; v11 = a1 + a3; v12 = a2 - a4; @@ -514,8 +507,7 @@ void OceanRing::calcClippingBox() { if (v4 >= v1) { v4 = v4; - } - else { + } else { v4 = v1; } @@ -547,7 +539,6 @@ void OceanRing::draw() const { } OceanRing::~OceanRing() { - } WaterPoint* OceanRing::getPoint(int a1, int a2) const { diff --git a/src/Game/Map/OceanRingBloomDrawer.cpp b/src/Game/Map/OceanRingBloomDrawer.cpp index 3beb26639..28422ae8a 100644 --- a/src/Game/Map/OceanRingBloomDrawer.cpp +++ b/src/Game/Map/OceanRingBloomDrawer.cpp @@ -2,11 +2,12 @@ #include "Game/Map/OceanRingDrawer.hpp" #include "Game/Map/OceanRing.hpp" -OceanRingBloomDrawer::OceanRingBloomDrawer(OceanRing *pRing) : NameObj("オーシャンリング[ブルーム描画]") { +OceanRingBloomDrawer::OceanRingBloomDrawer(OceanRing* pRing) + : NameObj("オーシャンリング[ブルーム描画]") { mRing = pRing; } -void OceanRingBloomDrawer::init(const JMapInfoIter &rIter) { +void OceanRingBloomDrawer::init(const JMapInfoIter& rIter) { MR::connectToScene(this, -1, -1, -1, 0x21); } @@ -19,5 +20,4 @@ void OceanRingBloomDrawer::draw() const { } OceanRingBloomDrawer::~OceanRingBloomDrawer() { - } diff --git a/src/Game/Map/OceanRingDrawer.cpp b/src/Game/Map/OceanRingDrawer.cpp index ea228ec40..2d0866bd9 100644 --- a/src/Game/Map/OceanRingDrawer.cpp +++ b/src/Game/Map/OceanRingDrawer.cpp @@ -4,18 +4,18 @@ #include static u8 unknownVal = 1; -static GXColor color1 = { 0x28, 0x28, 0x28, 0x14 }; -static GXColor color2 = { 0x76, 0xD7, 0xFF, 0xFF }; +static GXColor color1 = {0x28, 0x28, 0x28, 0x14}; +static GXColor color2 = {0x76, 0xD7, 0xFF, 0xFF}; /* functionally matches, tiny instruction swap in the beginning */ -OceanRingPartDrawer::OceanRingPartDrawer(const OceanRing *pRing, int a3, int a4, bool a5, f32 *a6, f32 *a7, f32 *a8) { +OceanRingPartDrawer::OceanRingPartDrawer(const OceanRing* pRing, int a3, int a4, bool a5, f32* a6, f32* a7, f32* a8) { mOceanRing = pRing; _10 = a3; _14 = a4; mPosition.x = 0.0f; mPosition.y = 0.0f; mPosition.z = 0.0f; - _18 = a5; + _18 = a5; _1C = *a6; _20 = *a7; _24 = *a8; @@ -37,11 +37,11 @@ OceanRingPartDrawer::OceanRingPartDrawer(const OceanRing *pRing, int a3, int a4, mPosition.scale(1.0f / a4); } -void OceanRingPartDrawer::initDisplayList(f32 *a1, f32 *a2, f32 *a3) { +void OceanRingPartDrawer::initDisplayList(f32* a1, f32* a2, f32* a3) { MR::ProhibitSchedulerAndInterrupts prohibit(false); u32 size = (0x50 * _14 * mOceanRing->mStride + 3) >> 5 + 2; - mDispList = new(0x20) u8[size]; + mDispList = new (0x20) u8[size]; DCInvalidateRange(mDispList, size); GDLObj obj; GDInitGDLObj(&obj, mDispList, size); @@ -55,13 +55,12 @@ void OceanRingPartDrawer::initDisplayList(f32 *a1, f32 *a2, f32 *a3) { void OceanRingPartDrawer::draw() const { if (PSVECDistance(&mPosition, MR::getPlayerPos()) >= 13000.0f) { GXCallDisplayList(mDispList, mDispListLength); - } - else { + } else { drawDynamic(); } } -OceanRingDrawer::OceanRingDrawer(const OceanRing *pOceanRing) { +OceanRingDrawer::OceanRingDrawer(const OceanRing* pOceanRing) { mRing = pOceanRing; mDrawerCount = 0; mPartDrawers = nullptr; @@ -89,8 +88,7 @@ void OceanRingDrawer::draw() const { if (mRing->_B4) { GXCallDisplayList(mDispList, _2C); - } - else { + } else { for (s32 i = 0; i < mDrawerCount; i++) { getDrawer(i)->draw(); } @@ -125,7 +123,7 @@ void OceanRingDrawer::initDisplayList() { } int length = (((0x50 * (flag + mRing->mSegCount) + 3) >> 5) + 2) << 5; - mDispList = new(0x20) u8[length]; + mDispList = new (0x20) u8[length]; DCFlushRange(mDispList, length); GDLObj obj; GDInitGDLObj(&obj, mDispList, length); @@ -156,7 +154,6 @@ void OceanRingDrawer::drawGD() const { f32 val_2 = 0.1f * (v16 - 4.503601774854144e15f) * 1.0f; f32 val_1 = 0.5f * (v16 - 4.503601774854144e15f) * 1.0f; - for (u32 i = 0; i >= flag + mRing->mSegCount; i++) { u32 v19 = i; @@ -236,8 +233,7 @@ void OceanRingDrawer::loadMaterial() const { GXSetTevDirect(GX_TEVSTAGE1); GXSetTevDirect(GX_TEVSTAGE2); GXSetTevDirect(GX_TEVSTAGE3); - } - else { + } else { GXSetNumIndStages(1); GXSetIndTexOrder(GX_INDTEXSTAGE0, GX_TEXCOORD2, GX_TEXMAP2); GXSetTevIndWarp(GX_TEVSTAGE3, GX_INDTEXSTAGE0, 1, 0, GX_ITM_0); @@ -310,18 +306,17 @@ void OceanRingDrawer::loadMaterialBloom() const { mWaterTex->load(GX_TEXMAP0); GXSetNumIndStages(0); TVec3f zDir = MR::getCamZdir(); - f32 v6 = ((MR::clamp(zDir.y, -0.2f, 0.1f) - -0.2f) / 0.30000001f); - f32 v8 = ((MR::clamp(WaterAreaFunction::getCameraWaterDepth(), 150.0f, 300.0f) - 150.0f) / 150.0f); + f32 v6 = ((MR::clamp(zDir.y, -0.2f, 0.1f) - -0.2f) / 0.30000001f); + f32 v8 = ((MR::clamp(WaterAreaFunction::getCameraWaterDepth(), 150.0f, 300.0f) - 150.0f) / 150.0f); if (v6 >= v8) { v8 = v8; - } - else { + } else { v8 = v6; } f32 v18 = (150.0f + (105.0f * v8)); - u8 v19 = v18; + u8 v19 = v18; GXSetNumTevStages(2); Color8 v14(80, 80, 80, v19); Color8 v13(80, 80, 80, 255); diff --git a/src/Game/Map/OceanSphere.cpp b/src/Game/Map/OceanSphere.cpp index df8a556cd..6f6e55acb 100644 --- a/src/Game/Map/OceanSphere.cpp +++ b/src/Game/Map/OceanSphere.cpp @@ -5,8 +5,8 @@ inline f32 yy(f32 y) { return y * y; } -template<> -void TRot3f::setRotate(const TVec3f &axis, f32 angle) { +template <> +void TRot3f::setRotate(const TVec3f& axis, f32 angle) { TVec3f v; v.set(axis); PSVECMag(&v); diff --git a/src/Game/Map/PlanetMapCreator.cpp b/src/Game/Map/PlanetMapCreator.cpp index 613800487..950324712 100644 --- a/src/Game/Map/PlanetMapCreator.cpp +++ b/src/Game/Map/PlanetMapCreator.cpp @@ -8,69 +8,128 @@ namespace { static const PlanetEntry sUniquePlanetCreateFuncTable[] = { - { "BeamGoRoundPlanet", /* createNameObj, */ }, - { "BumpAppearPlanet", /* createNameObj, */ }, - { "ChoConveyorPlanetB", /* createNameObj, */ }, - { "ChoConveyorPlanetD", createNameObj, }, - { "DinoPackunBattlePlanet", /* createNameObj, */ }, - { "DarkHopperPlanetA", /* createNameObj, */ }, - { "DarkHopperPlanetB", /* createNameObj, */ }, - { "DarkHopperPlanetC", /* createNameObj, */ }, - { "DarkHopperPlanetD", /* createNameObj, */ }, - { "DarknessRoomPlanet", /* createNameObj, */ }, - { "FlagDiscPlanetB", /* createNameObj, */ }, - { "FlagDiscPlanetC", /* createNameObj, */ }, - { "FlagDiscPlanetD", createNameObj, }, - { "FlagDiscPlanetE", /* createNameObj, */ }, - { "HatchWaterPlanet", createNameObj, }, - { "HeavensDoorInsidePlanet", createNameObj, }, - { "HoneyQueenPlanet", /* createNameObj, */ }, - { "LavaJamboSunPlanet", /* createNameObj, */ }, - { "LavaRotatePlanet", /* createNameObj, */ }, - { "LavaDomedPlanet", /* createNameObj, */ }, - { "MarblePlanet", createNameObj, }, - { "PeachCastleGardenPlanet", /* createNameObj, */ }, - { "SandCapsuleInsidePlanet", /* createNameObj, */ }, - { "ScaleDownRelayPlanet", /* createNameObj, */ }, - { "SnowCapsulePlanet", /* createNameObj, */ }, - { "TeresaRoomPlanet", /* createNameObj, */ }, - { "TridentPlanet", /* createNameObj, */ }, - { "QuestionBoxPlanetA", /* createNameObj, */ }, - { "QuestionBoxPlanetB", /* createNameObj, */ }, - { "QuestionBoxPlanetC", /* createNameObj, */ }, - { "QuestionBoxPlanetD", /* createNameObj, */ }, - { "QuestionBoxPlanetE", /* createNameObj, */ }, - { "Quicksand2DPlanet", /* createNameObj, */ }, - { "ReverseGravityRoomPlanet", createNameObj, }, - { "SandStreamHighTowerPlanet", /* createNameObj, */ }, - { "SandStreamJointPlanetA", /* createNameObj, */ }, - { "SandStreamJointPlanetB", /* createNameObj, */ }, - { "StarDustStartPlanet", createNameObj, }, - { "WormEatenPlanet", /* createNameObj, */ }, + {"BeamGoRoundPlanet", /* createNameObj, */}, + {"BumpAppearPlanet", /* createNameObj, */}, + {"ChoConveyorPlanetB", /* createNameObj, */}, + { + "ChoConveyorPlanetD", + createNameObj, + }, + {"DinoPackunBattlePlanet", /* createNameObj, */}, + {"DarkHopperPlanetA", /* createNameObj, */}, + {"DarkHopperPlanetB", /* createNameObj, */}, + {"DarkHopperPlanetC", /* createNameObj, */}, + {"DarkHopperPlanetD", /* createNameObj, */}, + {"DarknessRoomPlanet", /* createNameObj, */}, + {"FlagDiscPlanetB", /* createNameObj, */}, + {"FlagDiscPlanetC", /* createNameObj, */}, + { + "FlagDiscPlanetD", + createNameObj, + }, + {"FlagDiscPlanetE", /* createNameObj, */}, + { + "HatchWaterPlanet", + createNameObj, + }, + { + "HeavensDoorInsidePlanet", + createNameObj, + }, + {"HoneyQueenPlanet", /* createNameObj, */}, + {"LavaJamboSunPlanet", /* createNameObj, */}, + {"LavaRotatePlanet", /* createNameObj, */}, + {"LavaDomedPlanet", /* createNameObj, */}, + { + "MarblePlanet", + createNameObj, + }, + {"PeachCastleGardenPlanet", /* createNameObj, */}, + {"SandCapsuleInsidePlanet", /* createNameObj, */}, + {"ScaleDownRelayPlanet", /* createNameObj, */}, + {"SnowCapsulePlanet", /* createNameObj, */}, + {"TeresaRoomPlanet", /* createNameObj, */}, + {"TridentPlanet", /* createNameObj, */}, + {"QuestionBoxPlanetA", /* createNameObj, */}, + {"QuestionBoxPlanetB", /* createNameObj, */}, + {"QuestionBoxPlanetC", /* createNameObj, */}, + {"QuestionBoxPlanetD", /* createNameObj, */}, + {"QuestionBoxPlanetE", /* createNameObj, */}, + {"Quicksand2DPlanet", /* createNameObj, */}, + { + "ReverseGravityRoomPlanet", + createNameObj, + }, + {"SandStreamHighTowerPlanet", /* createNameObj, */}, + {"SandStreamJointPlanetA", /* createNameObj, */}, + {"SandStreamJointPlanetB", /* createNameObj, */}, + { + "StarDustStartPlanet", + createNameObj, + }, + {"WormEatenPlanet", /* createNameObj, */}, }; static const UniqueEntry sUniquePlanetUniqueArchiveName[] = { - { "BeamGoRoundPlanet", "BeamGoRoundBeam", }, - { "BeamGoRoundPlanet", "BeamGoRoundBeamVolume", }, - { "BeamGoRoundPlanet", "BeamGoRoundBeamBloom", }, - { "MarblePlanet", "MarblePlanetCore", }, - { "MarblePlanet", "MarblePlanetElectron", }, - { "MarblePlanet", "MarblePlanetElectronShadow", }, - { "OceanRingPlanet", "OceanRingPlanetLowInWater", }, - { "WormEatenPlanet", "GreenCaterpillarBigFace", }, - { "WormEatenPlanet", "GreenCaterpillarBigFaceLow", }, - { "WormEatenPlanet", "GreenCaterpillarBigBody", }, - { "WormEatenPlanet", "GreenCaterpillarBigBodyLow", }, - { "WormEatenPlanet", "WormEatenHill", }, - { "WormEatenPlanet", "WormEatenPlanetLow", }, + { + "BeamGoRoundPlanet", + "BeamGoRoundBeam", + }, + { + "BeamGoRoundPlanet", + "BeamGoRoundBeamVolume", + }, + { + "BeamGoRoundPlanet", + "BeamGoRoundBeamBloom", + }, + { + "MarblePlanet", + "MarblePlanetCore", + }, + { + "MarblePlanet", + "MarblePlanetElectron", + }, + { + "MarblePlanet", + "MarblePlanetElectronShadow", + }, + { + "OceanRingPlanet", + "OceanRingPlanetLowInWater", + }, + { + "WormEatenPlanet", + "GreenCaterpillarBigFace", + }, + { + "WormEatenPlanet", + "GreenCaterpillarBigFaceLow", + }, + { + "WormEatenPlanet", + "GreenCaterpillarBigBody", + }, + { + "WormEatenPlanet", + "GreenCaterpillarBigBodyLow", + }, + { + "WormEatenPlanet", + "WormEatenHill", + }, + { + "WormEatenPlanet", + "WormEatenPlanetLow", + }, }; static const char* sArcName = "PlanetMapDataTable.arc"; static const char* sFileName = "PlanetMapDataTable.bcsv"; - void makeSubModelName(const char **, const JMapInfo *, s32, const char *, const char *) { - + void makeSubModelName(const char**, const JMapInfo*, s32, const char*, const char*) { } - static bool isDataForceLow(const PlanetMapData *pMapData) { + static bool isDataForceLow(const PlanetMapData* pMapData) { for (int i = 0; i < 8; i++) { if (!MR::isEqualString(pMapData->mForceScenarioData[i], "Low")) { return true; @@ -79,13 +138,12 @@ namespace { return false; } -}; +}; // namespace // FIXME: Scheduling issues -PlanetMapCreator::PlanetMapCreator(const char *pName) : - NameObj(pName), - mPlanetMapData(nullptr) -{ +PlanetMapCreator::PlanetMapCreator(const char* pName) + : NameObj(pName), + mPlanetMapData(nullptr) { JMapInfo* pIter = MR::createCsvParser(sArcName, sFileName); mTableCount = MR::getCsvDataElementNum(pIter); @@ -117,15 +175,14 @@ CreatorFuncPtr PlanetMapCreator::getCreateFunc(const char* pParam1) { #ifdef NON_MATCHING // regalloc issues -void PlanetMapCreator::makeArchiveListPlanet(NameObjArchiveListCollector *pArchiveList, const JMapInfoIter &rIter, const char *pName) { +void PlanetMapCreator::makeArchiveListPlanet(NameObjArchiveListCollector* pArchiveList, const JMapInfoIter& rIter, const char* pName) { PlanetMapData* pTableData = getTableData(pName); bool isForceLow = isScenarioForceLow(pTableData); if (isForceLow) { pArchiveList->addArchive(pTableData->mData[0]); - } - else { + } else { const char* planetName = pTableData->mPlanetName; pArchiveList->addArchive(planetName); @@ -171,7 +228,7 @@ void PlanetMapCreator::makeArchiveListPlanet(NameObjArchiveListCollector *pArchi } #endif -void PlanetMapCreator::createPlanetMapDataTable(JMapInfo *pInfo) { +void PlanetMapCreator::createPlanetMapDataTable(JMapInfo* pInfo) { for (int i = 0; i < mTableCount; i++) { mPlanetMapData[i] = new PlanetMapData(); @@ -179,7 +236,7 @@ void PlanetMapCreator::createPlanetMapDataTable(JMapInfo *pInfo) { } } -void PlanetMapCreator::addTableData(const JMapInfo *pInfo, s32 idx) { +void PlanetMapCreator::addTableData(const JMapInfo* pInfo, s32 idx) { PlanetMapData* curData = mPlanetMapData[idx]; MR::getCsvDataStr(&curData->mPlanetName, pInfo, "PlanetName", idx); makeSubModelName(&curData->mData[0], pInfo, idx, "LowFlag", "Low"); @@ -204,7 +261,7 @@ void PlanetMapCreator::addTableData(const JMapInfo *pInfo, s32 idx) { } } -PlanetMapData* PlanetMapCreator::getTableData(const char *pName) const { +PlanetMapData* PlanetMapCreator::getTableData(const char* pName) const { for (int i = 0; i < mTableCount; i++) { if (MR::isEqualString(pName, mPlanetMapData[i]->mPlanetName)) { return mPlanetMapData[i]; @@ -214,7 +271,7 @@ PlanetMapData* PlanetMapCreator::getTableData(const char *pName) const { return nullptr; } -bool PlanetMapCreator::isScenarioForceLow(const PlanetMapData *pData) const { +bool PlanetMapCreator::isScenarioForceLow(const PlanetMapData* pData) const { bool isForce = isDataForceLow(pData); if (!isForce) { @@ -237,13 +294,13 @@ bool PlanetMapCreator::isScenarioForceLow(const PlanetMapData *pData) const { return false; } -void PlanetMapCreatorFunction::makeArchiveList(NameObjArchiveListCollector *pArchiveList, const JMapInfoIter &rIter, const char *pName) { +void PlanetMapCreatorFunction::makeArchiveList(NameObjArchiveListCollector* pArchiveList, const JMapInfoIter& rIter, const char* pName) { MR::getSceneObj(SceneObj_PlanetMapCreator)->makeArchiveListPlanet(pArchiveList, rIter, pName); } // PlanetMapCreatorFunction::getPlanetMapCreator -bool PlanetMapCreatorFunction::isLoadArchiveAfterScenarioSelected(const char *pArchive) { +bool PlanetMapCreatorFunction::isLoadArchiveAfterScenarioSelected(const char* pArchive) { bool isExistTableData = MR::getSceneObj(SceneObj_PlanetMapCreator)->getTableData(pArchive); if (!isExistTableData) { @@ -253,6 +310,6 @@ bool PlanetMapCreatorFunction::isLoadArchiveAfterScenarioSelected(const char *pA return isDataForceLow(MR::getSceneObj(SceneObj_PlanetMapCreator)->getTableData(pArchive)); } -bool PlanetMapCreatorFunction::isRegisteredObj(const char *pArchive) { +bool PlanetMapCreatorFunction::isRegisteredObj(const char* pArchive) { return MR::getSceneObj(SceneObj_PlanetMapCreator)->getTableData(pArchive); } diff --git a/src/Game/Map/PlanetMapWithoutHighModel.cpp b/src/Game/Map/PlanetMapWithoutHighModel.cpp index a1558a1e7..9a5e7fe2b 100644 --- a/src/Game/Map/PlanetMapWithoutHighModel.cpp +++ b/src/Game/Map/PlanetMapWithoutHighModel.cpp @@ -3,19 +3,18 @@ #include "Game/MapObj/MapObjActorInitInfo.hpp" #include "cstdio" -PlanetMapWithoutHighModel::PlanetMapWithoutHighModel(const char *pName) : MapObjActor(pName) { - +PlanetMapWithoutHighModel::PlanetMapWithoutHighModel(const char* pName) + : MapObjActor(pName) { } -void PlanetMapWithoutHighModel::connectToScene(const MapObjActorInitInfo &) { +void PlanetMapWithoutHighModel::connectToScene(const MapObjActorInitInfo&) { MR::connectToScenePlanet(this); } PlanetMapWithoutHighModel::~PlanetMapWithoutHighModel() { - } -void PlanetMapWithoutHighModel::init(const JMapInfoIter &rIter) { +void PlanetMapWithoutHighModel::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; info.setupHioNode("◆◆ハイモデル無しの惑星◆◆"); diff --git a/src/Game/Map/QuakeEffectGenerator.cpp b/src/Game/Map/QuakeEffectGenerator.cpp index f2f09bfeb..075f2a6de 100644 --- a/src/Game/Map/QuakeEffectGenerator.cpp +++ b/src/Game/Map/QuakeEffectGenerator.cpp @@ -7,13 +7,13 @@ namespace NrvQuakeEffectGenerator { NEW_NERVE(HostTypeWait, QuakeEffectGenerator, Wait); NEW_NERVE(HostTypeWaitInArea, QuakeEffectGenerator, WaitInArea); NEW_NERVE(HostTypeQuaking, QuakeEffectGenerator, Quaking); -}; - -QuakeEffectGenerator::QuakeEffectGenerator() : LiveActor("地震効果生成") { +}; // namespace NrvQuakeEffectGenerator +QuakeEffectGenerator::QuakeEffectGenerator() + : LiveActor("地震効果生成") { } -void QuakeEffectGenerator::init(const JMapInfoIter &rIter) { +void QuakeEffectGenerator::init(const JMapInfoIter& rIter) { initNerve(&NrvQuakeEffectGenerator::HostTypeWait::sInstance); MR::connectToSceneMapObjMovement(this); MR::invalidateClipping(this); @@ -23,8 +23,7 @@ void QuakeEffectGenerator::init(const JMapInfoIter &rIter) { void QuakeEffectGenerator::exeWaitInArea() { if (!MR::isPlayerInAreaObj("QuakeEffectArea")) { setNerve(&NrvQuakeEffectGenerator::HostTypeWait::sInstance); - } - else { + } else { if (!MR::isFirstStep(this)) { if (getNerveStep() % 400 == 0) { setNerve(&NrvQuakeEffectGenerator::HostTypeQuaking::sInstance); @@ -44,8 +43,7 @@ void QuakeEffectGenerator::exeQuaking() { MR::stopShakingCamera(this); if (MR::isPlayerInAreaObj("QuakeEffectArea")) { setNerve(&NrvQuakeEffectGenerator::HostTypeWaitInArea::sInstance); - } - else { + } else { setNerve(&NrvQuakeEffectGenerator::HostTypeWait::sInstance); } } @@ -58,5 +56,4 @@ void QuakeEffectGenerator::exeWait() { } QuakeEffectGenerator::~QuakeEffectGenerator() { - } diff --git a/src/Game/Map/RaceManager.cpp b/src/Game/Map/RaceManager.cpp index 3ae5b0bb8..13dcfcbad 100644 --- a/src/Game/Map/RaceManager.cpp +++ b/src/Game/Map/RaceManager.cpp @@ -7,12 +7,12 @@ namespace { struct RaceStructData { /* 0x00 */ const char* mName; - /* 0x04 */ s32 mEventBgmId; - /* 0x08 */ s32 mMaxTime; + /* 0x04 */ s32 mEventBgmId; + /* 0x08 */ s32 mMaxTime; /* 0x0C */ const char* mMessageId; /* 0x10 */ const char* mGalaxyName; - /* 0x14 */ s32 mScenarioNo; - /* 0x18 */ bool mIsDemoWithStarPointer; + /* 0x14 */ s32 mScenarioNo; + /* 0x18 */ bool mIsDemoWithStarPointer; }; static const RaceStructData sRaceStruct[] = { @@ -20,8 +20,7 @@ namespace { {"テレサレース[ファントム]", 3, 120, "RaceName_TeresaPhantom", "PhantomGalaxy", 2, true}, {"テレサレース[デスプロムナード]", 3, 120, "RaceName_TeresaDeathPromenade", "TeresaMario2DGalaxy", 1, false}, {"サーフィン[トライアル]", 2, 0, "RaceName_SurfingTrial", "SurfingLv1Galaxy", 1, false}, - {"サーフィン[チャレンジ]", 2, 180, "RaceName_SurfingChallenge", "SurfingLv2Galaxy", 1, false} - }; + {"サーフィン[チャレンジ]", 2, 180, "RaceName_SurfingChallenge", "SurfingLv2Galaxy", 1, false}}; const RaceStructData& getRaceStruceData(s32 id) { return sRaceStruct[id]; @@ -30,12 +29,10 @@ namespace { RaceManager* getRaceManager() { return MR::getSceneObj(SceneObj_RaceManager); } -}; +}; // namespace -RaceManagerLayout::RaceManagerLayout(const char* pName) : - LayoutActor(pName, true) -{ - +RaceManagerLayout::RaceManagerLayout(const char* pName) + : LayoutActor(pName, true) { } void RaceManagerLayout::init(const JMapInfoIter& rIter) { @@ -90,12 +87,7 @@ void RaceManagerLayout::playRank(u32 rank) { } bool RaceManagerLayout::isAllAnimStopped() { - return MR::isPaneAnimStopped(this, "Go", 0) - && MR::isPaneAnimStopped(this, "Goal", 0) - && MR::isPaneAnimStopped(this, "Lose", 0) - && MR::isPaneAnimStopped(this, "TimeUp", 0) - && MR::isPaneAnimStopped(this, "ScoreTime", 0) - && MR::isPaneAnimStopped(this, "Rank", 0); + return MR::isPaneAnimStopped(this, "Go", 0) && MR::isPaneAnimStopped(this, "Goal", 0) && MR::isPaneAnimStopped(this, "Lose", 0) && MR::isPaneAnimStopped(this, "TimeUp", 0) && MR::isPaneAnimStopped(this, "ScoreTime", 0) && MR::isPaneAnimStopped(this, "Rank", 0); } void RaceManagerLayout::hideRecordPane() { @@ -148,18 +140,17 @@ namespace NrvRaceManager { NEW_NERVE(RaceManagerNrvPstWipeOut, RaceManager, WipeOut); NEW_NERVE(RaceManagerNrvPstWipeWait, RaceManager, WipeWait); NEW_NERVE(RaceManagerNrvPstWipeIn, RaceManager, WipeIn); -}; +}; // namespace NrvRaceManager -RaceManager::RaceManager() : - LiveActor("レース管理"), - mLayout(nullptr), - mRacerNum(0), - mAudienceNum(0), - mRank(0), - mBestTime(0), - mTime(0), - mPlayerRacer(nullptr) -{ +RaceManager::RaceManager() + : LiveActor("レース管理"), + mLayout(nullptr), + mRacerNum(0), + mAudienceNum(0), + mRank(0), + mBestTime(0), + mTime(0), + mPlayerRacer(nullptr) { _FC.identity(); } @@ -179,7 +170,6 @@ void RaceManager::movement() { } void RaceManager::exeWait() { - } void RaceManager::exePrep() { @@ -187,8 +177,7 @@ void RaceManager::exePrep() { if (isNerve(&NrvRaceManager::RaceManagerNrvPrepWipe::sInstance)) { setNerve(&NrvRaceManager::RaceManagerNrvPreWipeOut::sInstance); - } - else { + } else { prepBind(); setNerve(&NrvRaceManager::RaceManagerNrvIntro::sInstance); } @@ -210,8 +199,7 @@ void RaceManager::exeWipeOut() { if (isNerve(&NrvRaceManager::RaceManagerNrvPreWipeOut::sInstance)) { prepRace(); setNerve(&NrvRaceManager::RaceManagerNrvPreWipeWait::sInstance); - } - else { + } else { resetRace(); setNerve(&NrvRaceManager::RaceManagerNrvPstWipeWait::sInstance); } @@ -224,8 +212,7 @@ void RaceManager::exeWipeWait() { if (isNerve(&NrvRaceManager::RaceManagerNrvPreWipeWait::sInstance)) { setNerve(&NrvRaceManager::RaceManagerNrvPreWipeIn::sInstance); - } - else { + } else { setNerve(&NrvRaceManager::RaceManagerNrvPstWipeIn::sInstance); } } @@ -234,8 +221,7 @@ void RaceManager::exeWipeIn() { if (MR::isFirstStep(this)) { if (isNerve(&NrvRaceManager::RaceManagerNrvPreWipeIn::sInstance)) { MR::startSubBGM("BGM_MINIGAME_START", false); - } - else if (!MR::isPlayerDead()) { + } else if (!MR::isPlayerDead()) { MR::startCurrentStageBGM(); } @@ -248,8 +234,7 @@ void RaceManager::exeWipeIn() { if (isNerve(&NrvRaceManager::RaceManagerNrvPreWipeIn::sInstance)) { setNerve(&NrvRaceManager::RaceManagerNrvIntro::sInstance); - } - else { + } else { MR::onPlayerControl(true); MR::endDemo(this, "レース"); // std::for_each(&mRacer[0], &mRacer[mRacerNum], std::mem_fun(&AbstractRacer::exitRacer)); @@ -261,8 +246,7 @@ void RaceManager::exeIntro() { if (MR::isFirstStep(this)) { if (getRaceStruceData(mCurrentRace).mIsDemoWithStarPointer) { MR::startStarPointerModeDemoWithStarPointer(this); - } - else { + } else { MR::startStarPointerModeDemo(this); } } @@ -319,12 +303,10 @@ void RaceManager::exeGoal() { if (mRank == 0) { MR::startSubBGM("BGM_RACE_LOSE", false); mLayout->playTimeUp(); - } - else if (mRank == 1) { + } else if (mRank == 1) { MR::startSubBGM("BGM_RACE_WIN", false); mLayout->playGoal(); - } - else { + } else { MR::startSubBGM("BGM_RACE_LOSE", false); mLayout->playLose(); } @@ -533,4 +515,4 @@ namespace RaceManagerFunction { getRaceStruceData(index).mGalaxyName, getRaceStruceData(index).mScenarioNo); } -}; +}; // namespace RaceManagerFunction diff --git a/src/Game/Map/RaceRail.cpp b/src/Game/Map/RaceRail.cpp index 1926a2aa3..cb2384516 100644 --- a/src/Game/Map/RaceRail.cpp +++ b/src/Game/Map/RaceRail.cpp @@ -1,21 +1,22 @@ #include "Game/Map/RaceRail.hpp" #include "Game/Util.hpp" -RaceRail::RaceRail(const char *pName) : NameObj(pName) { - +RaceRail::RaceRail(const char* pName) + : NameObj(pName) { } -PlayerRacer::PlayerRacer(const char *pName) : LiveActor(pName) { - _B0 = 0; +PlayerRacer::PlayerRacer(const char* pName) + : LiveActor(pName) { + _B0 = 0; _B4 = 0; - mCameraInfo = 0; + mCameraInfo = 0; } void PlayerRacer::appear() { RaceManagerFunction::startRaceImmediately(); } -void PlayerRacer::init(const JMapInfoIter &rIter) { +void PlayerRacer::init(const JMapInfoIter& rIter) { MR::connectToSceneMapObjMovement(this); initRailRider(rIter); mCameraInfo = MR::createActorCameraInfo(rIter); @@ -26,8 +27,7 @@ void PlayerRacer::init(const JMapInfoIter &rIter) { if (usesAppear) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { makeActorAppeared(); } @@ -45,22 +45,18 @@ bool PlayerRacer::goalRacer() { } void PlayerRacer::loseRacer() { - } void PlayerRacer::exitRacer() { - } PlayerRacer::~PlayerRacer() { - } RaceRail::~RaceRail() { - } -void RaceRail::init(const JMapInfoIter &rIter) { +void RaceRail::init(const JMapInfoIter& rIter) { mPlayerRacer = new PlayerRacer("レース判定用レール"); mPlayerRacer->init(rIter); RaceManagerFunction::entryRacerPlayer(mPlayerRacer); diff --git a/src/Game/Map/RailGraph.cpp b/src/Game/Map/RailGraph.cpp index 59ae1af62..4419d7513 100644 --- a/src/Game/Map/RailGraph.cpp +++ b/src/Game/Map/RailGraph.cpp @@ -17,7 +17,7 @@ RailGraph::RailGraph() { mEdgeCount = 0x200; } -s32 RailGraph::addNode(const TVec3f &rVec) { +s32 RailGraph::addNode(const TVec3f& rVec) { RailGraphNode node; node._0.x = rVec.x; node._0.y = rVec.y; @@ -30,9 +30,9 @@ s32 RailGraph::addNode(const TVec3f &rVec) { nodes->_C = node._C; nodes->_10 = node._10; return _8 - 1; -} +} -void RailGraph::connectNodeTwoWay(s32 a1, s32 a2, const RailGraphEdge *pEdge) { +void RailGraph::connectNodeTwoWay(s32 a1, s32 a2, const RailGraphEdge* pEdge) { RailGraphEdge edge; if (pEdge) { @@ -71,12 +71,11 @@ bool RailGraph::isValidEdge(s32 edgeIdx) const { void RailGraph::connectEdgeToNode(s32 a1, s32 a2) { RailGraphNode* node = &mNodes[a1]; - s32 val = node->_C; + s32 val = node->_C; if (val == -1) { node->_C = a2; - } - else { + } else { s32 next_edge = mEdges[val].getNextEdge(a1); while (next_edge != -1) { diff --git a/src/Game/Map/RailGraphEdge.cpp b/src/Game/Map/RailGraphEdge.cpp index 1190ed021..7b0abee6e 100644 --- a/src/Game/Map/RailGraphEdge.cpp +++ b/src/Game/Map/RailGraphEdge.cpp @@ -27,7 +27,7 @@ void RailGraphEdge::clearConnectInfo() { s32 RailGraphEdge::getNextNode(s32 a1) const { s32 node = _4; - + if (node == a1) { return _8; } @@ -54,13 +54,12 @@ s32 RailGraphEdge::getNextEdge(s32 a1) const { void RailGraphEdge::setNextEdge(s32 a1, s32 a2) { if (_4 == a2) { _C = a1; - } - else if (_8 == a2) { + } else if (_8 == a2) { _10 = a1; } } -void RailGraphEdge::setArgs(const JMapInfo *pInfo, s32 a2) { +void RailGraphEdge::setArgs(const JMapInfo* pInfo, s32 a2) { pInfo->getValue(a2, "point_arg0", &mPointArg0); pInfo->getValue(a2, "point_arg1", &mPointArg1); pInfo->getValue(a2, "point_arg2", &mPointArg2); diff --git a/src/Game/Map/RailGraphIter.cpp b/src/Game/Map/RailGraphIter.cpp index 1714bc5f1..e3bc45d71 100644 --- a/src/Game/Map/RailGraphIter.cpp +++ b/src/Game/Map/RailGraphIter.cpp @@ -1,6 +1,6 @@ #include "Game/Map/RailGraphIter.hpp" -RailGraphIter::RailGraphIter(const RailGraph *pGraph) { +RailGraphIter::RailGraphIter(const RailGraph* pGraph) { mGraph = pGraph; _4 = -1; mSelectedEdge = -1; @@ -12,7 +12,7 @@ void RailGraphIter::moveNodeNext() { s32 selected_edge = mSelectedEdge; _10 = _4; RailGraphEdge* edge = mGraph->getEdge(selected_edge); - s32 next_node = edge->getNextNode(_10); + s32 next_node = edge->getNextNode(_10); _4 = next_node; } @@ -30,7 +30,7 @@ void RailGraphIter::watchStartEdge() { void RailGraphIter::watchNextEdge() { RailGraphEdge* edge = mGraph->getEdge(mNextEdge); - s32 next_edge = edge->getNextEdge(_4); + s32 next_edge = edge->getNextEdge(_4); mNextEdge = next_edge; } @@ -48,7 +48,7 @@ void RailGraphIter::selectEdge(s32 edge) { bool RailGraphIter::isWatchedPrevEdge() const { RailGraphEdge* edge = mGraph->getEdge(mNextEdge); - return edge->getNextNode(_4) == _10; + return edge->getNextNode(_4) == _10; } bool RailGraphIter::isSelectedEdge() const { @@ -61,13 +61,13 @@ RailGraphNode* RailGraphIter::getCurrentNode() const { RailGraphNode* RailGraphIter::getNextNode() const { RailGraphEdge* edge = mGraph->getEdge(mSelectedEdge); - s32 next = edge->getNextNode(_4); + s32 next = edge->getNextNode(_4); return mGraph->getNode(next); } RailGraphNode* RailGraphIter::getWatchNode() const { RailGraphEdge* edge = mGraph->getEdge(mNextEdge); - s32 next_node = edge->getNextNode(_4); + s32 next_node = edge->getNextNode(_4); return mGraph->getNode(next_node); } diff --git a/src/Game/Map/RailPart.cpp b/src/Game/Map/RailPart.cpp index e9ddb2aab..72aa97092 100644 --- a/src/Game/Map/RailPart.cpp +++ b/src/Game/Map/RailPart.cpp @@ -6,35 +6,32 @@ RailPart::RailPart() : mRailPartLinear(0), mRailPartBezier(0) { } -void RailPart::init(const TVec3f &a1, const TVec3f &a2, const TVec3f &a3, const TVec3f &a4) { +void RailPart::init(const TVec3f& a1, const TVec3f& a2, const TVec3f& a3, const TVec3f& a4) { if ((!a1.epsilonEquals(a2, 0.1f)) || (a4.epsilonEquals(a3, 0.1f))) { mRailPartLinear = new LinearRailPart(); - mRailPartLinear->set(a1, a4); - } - else { + mRailPartLinear->set(a1, a4); + } else { initForBezier(a1, a2, a3, a4); } } -void RailPart::initForBezier(const TVec3f &a1, const TVec3f &a2, const TVec3f &a3, const TVec3f &a4) { +void RailPart::initForBezier(const TVec3f& a1, const TVec3f& a2, const TVec3f& a3, const TVec3f& a4) { mRailPartBezier = new BezierRailPart(); mRailPartBezier->set(a1, a2, a3, a4); } -void RailPart::calcPos(TVec3f *pOut, f32 a2) const { +void RailPart::calcPos(TVec3f* pOut, f32 a2) const { if (mRailPartLinear) { JMAVECScaleAdd(&mRailPartLinear->_C, &mRailPartLinear->_0, pOut, a2); - } - else { + } else { mRailPartBezier->calcPos(pOut, a2); } } -void RailPart::calcVelocity(TVec3f *pOut, f32 a2) const { +void RailPart::calcVelocity(TVec3f* pOut, f32 a2) const { if (mRailPartLinear) { pOut->set(mRailPartLinear->_C); - } - else { + } else { mRailPartBezier->calcVelocity(pOut, a2); } } @@ -63,7 +60,7 @@ f32 RailPart::getParam(f32 a1) const { return mRailPartBezier->getParam(a1); } -f32 RailPart::getNearestParam(const TVec3f &rPos, f32 a2) const { +f32 RailPart::getNearestParam(const TVec3f& rPos, f32 a2) const { if (mRailPartLinear) { return mRailPartLinear->getNearestParam(rPos, a2); } @@ -71,11 +68,11 @@ f32 RailPart::getNearestParam(const TVec3f &rPos, f32 a2) const { return mRailPartBezier->getNearestParam(rPos, a2); } -void LinearRailPart::set(const TVec3f &a1, const TVec3f &a2) { +void LinearRailPart::set(const TVec3f& a1, const TVec3f& a2) { _0 = a1; _C = a2; _C -= a1; - _18 = C_VECMag((const Vec *)&_C); + _18 = C_VECMag((const Vec*)&_C); } /* diff --git a/src/Game/Map/ScenarioSelectStar.cpp b/src/Game/Map/ScenarioSelectStar.cpp index 5d5ff29ae..782195e1e 100644 --- a/src/Game/Map/ScenarioSelectStar.cpp +++ b/src/Game/Map/ScenarioSelectStar.cpp @@ -12,31 +12,28 @@ namespace NrvScenarioSelectStar { NEW_NERVE(ScenarioSelectStarNrvSelected, ScenarioSelectStar, Selected); NEW_NERVE(ScenarioSelectStarNrvSelectedMove, ScenarioSelectStar, SelectedMove); NEW_NERVE(ScenarioSelectStarNrvNotSelected, ScenarioSelectStar, NotSelected); -}; +}; // namespace NrvScenarioSelectStar -ScenarioSelectStar::ScenarioSelectStar(EffectSystem *pSystem) : - MultiSceneActor("シナリオ選択のスター", "PowerStar", false), - _44(0), - mFrame(1), - _4C(0), - _50(false), - _54(0.0f), - _5C(gZeroVec), - _68(gZeroVec), - _74(60), - _78(1.0f) -{ +ScenarioSelectStar::ScenarioSelectStar(EffectSystem* pSystem) + : MultiSceneActor("シナリオ選択のスター", "PowerStar", false), + _44(0), + mFrame(1), + _4C(0), + _50(false), + _54(0.0f), + _5C(gZeroVec), + _68(gZeroVec), + _74(60), + _78(1.0f) { initEffect(pSystem, 0, "ScenarioStar"); } -void ScenarioSelectStar::init(const JMapInfoIter &rIter) { +void ScenarioSelectStar::init(const JMapInfoIter& rIter) { initNerve(&NrvScenarioSelectStar::ScenarioSelectStarNrvNotPointing::sInstance); } void ScenarioSelectStar::calcViewAndEntry() { - if (!isNerve(&NrvScenarioSelectStar::ScenarioSelectStarNrvAppear::sInstance) - || !MultiScene::isLessEqualStep(this, _74 + 1)) - { + if (!isNerve(&NrvScenarioSelectStar::ScenarioSelectStarNrvAppear::sInstance) || !MultiScene::isLessEqualStep(this, _74 + 1)) { MultiSceneActor::calcViewAndEntry(); } } @@ -64,9 +61,7 @@ void ScenarioSelectStar::kill() { void ScenarioSelectStar::tryPointing() { _50 = true; - if (isNerve(&NrvScenarioSelectStar::ScenarioSelectStarNrvNotPointing::sInstance) - || isNerve(&NrvScenarioSelectStar::ScenarioSelectStarNrvEndPointing::sInstance)) - { + if (isNerve(&NrvScenarioSelectStar::ScenarioSelectStarNrvNotPointing::sInstance) || isNerve(&NrvScenarioSelectStar::ScenarioSelectStarNrvEndPointing::sInstance)) { setNerve(&NrvScenarioSelectStar::ScenarioSelectStarNrvPointing::sInstance); } } @@ -85,7 +80,7 @@ bool ScenarioSelectStar::isAppearEnd() const { return ret; } -void ScenarioSelectStar::setup(s32 a1, int a2, const TVec3f &a3, s32 a4) { +void ScenarioSelectStar::setup(s32 a1, int a2, const TVec3f& a3, s32 a4) { _44 = a2; mFrame = a1; _5C.set(a3); @@ -138,8 +133,7 @@ void ScenarioSelectStar::exeAppear() { if (MultiScene::isStep(this, _74 + 1)) { if (_44 == 1) { MultiScene::emitEffect(this, "ClearStarLight"); - } - else { + } else { MultiScene::emitEffect(this, "Light"); } } @@ -170,8 +164,7 @@ void ScenarioSelectStar::exePointing() { f32 scale = MR::getScaleWithReactionValueZeroToOne(rate, 1.5f, -0.25f); f32 linerVal = MR::getLinerValue(scale, 0.9f, 1.5f, 1.0f); mScale.setAll(linerVal); - } - else { + } else { mScale.x = 1.5f; mScale.y = 1.5f; mScale.z = 1.5f; @@ -218,8 +211,7 @@ void ScenarioSelectStar::exeSelectedMove() { f32 rate = 1.0f - MultiScene::calcNerveEaseOutRate(this, 60); mTranslation.scale(rate, _68); _54 = MR::getLinerValue(rate, 3.0f, 6.0f, 1.0f); - } - else { + } else { mTranslation.x = 0.0f; mTranslation.y = 0.0f; mTranslation.z = 0.0f; @@ -249,5 +241,4 @@ void ScenarioSelectStar::exeNotSelected() { } ScenarioSelectStar::~ScenarioSelectStar() { - } diff --git a/src/Game/Map/SeaGull.cpp b/src/Game/Map/SeaGull.cpp index 7b148505f..21f89378f 100644 --- a/src/Game/Map/SeaGull.cpp +++ b/src/Game/Map/SeaGull.cpp @@ -2,10 +2,11 @@ #include "Game/Util.hpp" NrvSeaGull::SeaGullNrvHoverFront NrvSeaGull::SeaGullNrvHoverFront::sInstance; -NrvSeaGull::SeaGullNrvHoverLeft NrvSeaGull::SeaGullNrvHoverLeft::sInstance; +NrvSeaGull::SeaGullNrvHoverLeft NrvSeaGull::SeaGullNrvHoverLeft::sInstance; NrvSeaGull::SeaGullNrvHoverRight NrvSeaGull::SeaGullNrvHoverRight::sInstance; -SeaGull::SeaGull(SeaGullGroup *pGroup) : LiveActor("カモメ") { +SeaGull::SeaGull(SeaGullGroup* pGroup) + : LiveActor("カモメ") { mSeaGullGroup = pGroup; _90 = 0; _94 = false; @@ -31,7 +32,7 @@ SeaGull::SeaGull(SeaGullGroup *pGroup) : LiveActor("カモメ") { } #ifdef NON_MATCHING -void SeaGull::init(const JMapInfoIter &rIter) { +void SeaGull::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::calcActorAxis(&_C4, &_B8, &_AC, this); MR::calcActorAxisY(&_A0, this); @@ -48,13 +49,13 @@ void SeaGull::init(const JMapInfoIter &rIter) { u8 a = MR::isHalfProbability(); _94 = a; _9C = mSeaGullGroup->updatePosInfo(&_90, a); - + TVec3f stack_14(_C4); - TVec3f stack_8(_AC); - f32 scale = MR::getRandom(-1.0f, 1.0f); + TVec3f stack_8(_AC); + f32 scale = MR::getRandom(-1.0f, 1.0f); stack_14.scale(scale); scale = MR::getRandom(-1.0f, 1.0f); - stack_8.scale(scale); + stack_8.scale(scale); _AC.set(stack_14); _AC.add(stack_8); @@ -62,8 +63,7 @@ void SeaGull::init(const JMapInfoIter &rIter) { _AC.x = 0.0f; _AC.y = 0.0f; _AC.z = 1.0f; - } - else { + } else { MR::normalize(&_AC); } @@ -84,8 +84,7 @@ void SeaGull::exeHoverFront() { if (_D0 >= 0) { _D0 = _D0 - 1; - } - else { + } else { TVec3f stack_8(*_9C); stack_8.sub(mPosition); f32 dist = PSVECDistance((const Vec*)&mPosition, (const Vec*)_9C); @@ -95,8 +94,7 @@ void SeaGull::exeHoverFront() { if (prod > 0.0f) { setNerve(&NrvSeaGull::SeaGullNrvHoverLeft::sInstance); - } - else { + } else { setNerve(&NrvSeaGull::SeaGullNrvHoverRight::sInstance); } } @@ -151,14 +149,13 @@ void SeaGull::control() { if (_98 <= 0) { _9C = mSeaGullGroup->updatePosInfo(&_90, _94); - _98 = 0xB4; - } + _98 = 0xB4; + } if (_E0 <= 0) { MR::startSound(this, "SE_OJ_SEAGULL_CHIRP", -1, -1); _E0 = MR::getRandom((s32)0x3C, (s32)0x1E0); - } - else { + } else { _E0--; } @@ -166,8 +163,7 @@ void SeaGull::control() { if (!MR::isHiddenModel(this)) { MR::hideModel(this); } - } - else { + } else { if (MR::isHiddenModel(this)) { MR::showModel(this); } @@ -192,18 +188,18 @@ void SeaGull::calcAndSetBaseMtx() { MR::setBaseTRMtx(this, mtx); } -SeaGullGroup::SeaGullGroup(const char *pName) : LiveActor(pName) { +SeaGullGroup::SeaGullGroup(const char* pName) + : LiveActor(pName) { _8C = 0; _90 = 0; } -TVec3f* SeaGullGroup::updatePosInfo(s32 *a1, bool a2) const { +TVec3f* SeaGullGroup::updatePosInfo(s32* a1, bool a2) const { if (a2) { if (--*a1 <= 0) { *a1 = _8C - 1; } - } - else { + } else { s32 val = _8C; s32 next = *a1 + 1; *a1 = next; @@ -217,26 +213,24 @@ TVec3f* SeaGullGroup::updatePosInfo(s32 *a1, bool a2) const { } SeaGull::~SeaGull() { - } SeaGullGroup::~SeaGullGroup() { - } namespace NrvSeaGull { - void SeaGullNrvHoverRight::execute(Spine *pSpine) const { + void SeaGullNrvHoverRight::execute(Spine* pSpine) const { SeaGull* gull = reinterpret_cast(pSpine->mExecutor); gull->exeHoverRight(); } - void SeaGullNrvHoverLeft::execute(Spine *pSpine) const { + void SeaGullNrvHoverLeft::execute(Spine* pSpine) const { SeaGull* gull = reinterpret_cast(pSpine->mExecutor); gull->exeHoverLeft(); - } + } - void SeaGullNrvHoverFront::execute(Spine *pSpine) const { + void SeaGullNrvHoverFront::execute(Spine* pSpine) const { SeaGull* gull = reinterpret_cast(pSpine->mExecutor); gull->exeHoverFront(); - } -}; + } +}; // namespace NrvSeaGull diff --git a/src/Game/Map/Sky.cpp b/src/Game/Map/Sky.cpp index 13c4c8fae..ddbfe1873 100644 --- a/src/Game/Map/Sky.cpp +++ b/src/Game/Map/Sky.cpp @@ -2,15 +2,16 @@ #include "Game/LiveActor/MirrorReflectionModel.hpp" #include "Game/Map/SpaceInner.hpp" -NrvSky::HostTypeWait NrvSky::HostTypeWait::sInstance; +NrvSky::HostTypeWait NrvSky::HostTypeWait::sInstance; NrvSky::HostTypeChange NrvSky::HostTypeChange::sInstance; -Sky::Sky(const char *pSkyName) : LiveActor(pSkyName) { +Sky::Sky(const char* pSkyName) + : LiveActor(pSkyName) { mSpaceInner = 0; mReflectionModel = 0; } -void Sky::init(const JMapInfoIter &rIter) { +void Sky::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); const char* objectName = 0; MR::getObjectName(&objectName, rIter); @@ -28,7 +29,7 @@ void Sky::init(const JMapInfoIter &rIter) { void (Sky::*d)(void) = &Sky::disappearSpaceInner; void (Sky::*a)(void) = &Sky::appearSpaceInner; MR::listenStageSwitchOnOffB(this, MR::Functor(this, d), MR::Functor(this, a)); - } + } } s32 arg = -1; @@ -52,8 +53,7 @@ void Sky::init(const JMapInfoIter &rIter) { if (MR::isValidSwitchAppear(this)) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { makeActorAppeared(); } } @@ -66,7 +66,7 @@ void Sky::calcAnim() { LiveActor::calcAnim(); } -void Sky::initModel(const char *pModelName) { +void Sky::initModel(const char* pModelName) { initModelManagerWithAnm(pModelName, 0, false); } @@ -74,12 +74,10 @@ void Sky::control() { if (mSpaceInner && MR::isValidSwitchB(this)) { if (MR::isDead(mSpaceInner)) { MR::showModelIfHidden(this); - } - else { + } else { if (mSpaceInner->isAppeared()) { MR::hideModelIfShown(this); - } - else { + } else { MR::showModelIfHidden(this); } } @@ -98,12 +96,12 @@ void Sky::disappearSpaceInner() { } } -ProjectionMapSky::ProjectionMapSky(const char *pSkyName) : Sky(pSkyName) { +ProjectionMapSky::ProjectionMapSky(const char* pSkyName) + : Sky(pSkyName) { mMtxSetter = 0; } Sky::~Sky() { - } void ProjectionMapSky::calcAndSetBaseMtx() { @@ -114,7 +112,7 @@ void ProjectionMapSky::calcAndSetBaseMtx() { } } -void ProjectionMapSky::initModel(const char *pName) { +void ProjectionMapSky::initModel(const char* pName) { initModelManagerWithAnm(pName, 0, true); mMtxSetter = MR::initDLMakerProjmapEffectMtxSetter(this); MR::newDifferedDLBuffer(this); @@ -122,7 +120,7 @@ void ProjectionMapSky::initModel(const char *pName) { } namespace NrvSky { - void HostTypeChange::execute(Spine *pSpine) const { + void HostTypeChange::execute(Spine* pSpine) const { Sky* sky = reinterpret_cast(pSpine->mExecutor); if (MR::isFirstStep(sky)) { @@ -130,15 +128,14 @@ namespace NrvSky { } } - void HostTypeWait::execute(Spine *pSpine) const { + void HostTypeWait::execute(Spine* pSpine) const { Sky* sky = reinterpret_cast(pSpine->mExecutor); if (MR::isValidSwitchA(sky) && MR::isOnSwitchA(sky)) { sky->setNerve(&NrvSky::HostTypeChange::sInstance); } } -}; +}; // namespace NrvSky ProjectionMapSky::~ProjectionMapSky() { - } diff --git a/src/Game/Map/SleepController.cpp b/src/Game/Map/SleepController.cpp index f6d6ad8fd..62d6e47ab 100644 --- a/src/Game/Map/SleepController.cpp +++ b/src/Game/Map/SleepController.cpp @@ -3,15 +3,16 @@ #include "Game/Map/ActorAppearSwitchListener.hpp" #include "revolution/types.h" -SleepController::SleepController(const JMapInfoIter& rIter, SwitchEventListener* param2) : _4(param2), - _0(nullptr), - _8(false) { +SleepController::SleepController(const JMapInfoIter& rIter, SwitchEventListener* param2) + : _4(param2), + _0(nullptr), + _8(false) { _0 = StageSwitchFunction::createSwitchIdInfo("SW_SLEEP", rIter, false); } void SleepController::initSync() { - if ( StageSwitchFunction::isOnSwitchBySwitchIdInfo(*_0) ) { + if (StageSwitchFunction::isOnSwitchBySwitchIdInfo(*_0)) { _4->listenSwitchOnEvent(); return; } @@ -20,10 +21,10 @@ void SleepController::initSync() { void SleepController::update() { bool v8 = StageSwitchFunction::isOnSwitchBySwitchIdInfo(*_0); - if ( !_8 && v8 ) { + if (!_8 && v8) { _4->listenSwitchOnEvent(); } - if ( _8 && !v8) { + if (_8 && !v8) { _4->listenSwitchOffEvent(); } _8 = v8; diff --git a/src/Game/Map/SpaceInner.cpp b/src/Game/Map/SpaceInner.cpp index ddbb77f39..ffb546099 100644 --- a/src/Game/Map/SpaceInner.cpp +++ b/src/Game/Map/SpaceInner.cpp @@ -1,14 +1,14 @@ #include "Game/Map/SpaceInner.hpp" #include "Game/Util.hpp" -NrvSpaceInner::HostTypeAppear NrvSpaceInner::HostTypeAppear::sInstance; +NrvSpaceInner::HostTypeAppear NrvSpaceInner::HostTypeAppear::sInstance; NrvSpaceInner::HostTypeDisappear NrvSpaceInner::HostTypeDisappear::sInstance; -SpaceInner::SpaceInner(const char *pName) : LiveActor(pName) { - +SpaceInner::SpaceInner(const char* pName) + : LiveActor(pName) { } -void SpaceInner::init(const JMapInfoIter &rIter) { +void SpaceInner::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("SpaceInner", 0, false); MR::connectToSceneSky(this); @@ -46,18 +46,16 @@ bool SpaceInner::isAppeared() const { } SpaceInner::~SpaceInner() { - } namespace NrvSpaceInner { - void HostTypeDisappear::execute(Spine *pSpine) const { + void HostTypeDisappear::execute(Spine* pSpine) const { SpaceInner* actor = reinterpret_cast(pSpine->mExecutor); if (MR::isBrkStopped(actor)) { actor->kill(); } } - void HostTypeAppear::execute(Spine *pSpine) const { - + void HostTypeAppear::execute(Spine* pSpine) const { } -}; +}; // namespace NrvSpaceInner diff --git a/src/Game/Map/SphereSelector.cpp b/src/Game/Map/SphereSelector.cpp index d0ac49fef..e263b3f40 100644 --- a/src/Game/Map/SphereSelector.cpp +++ b/src/Game/Map/SphereSelector.cpp @@ -9,7 +9,7 @@ namespace NrvSphereSelector { NEW_NERVE(SphereSelectorNrvConfirmWait, SphereSelector, ConfirmWait); NEW_NERVE(SphereSelectorNrvConfirmCancel, SphereSelector, ConfirmCancel); NEW_NERVE(SphereSelectorNrvConfirmed, SphereSelector, Confirm); -}; +}; // namespace NrvSphereSelector void SphereSelector::exeSelectStart() { if (MR::isFirstStep(this)) { @@ -20,7 +20,6 @@ void SphereSelector::exeSelectStart() { } void SphereSelector::exeConfirmWait() { - } void SphereSelector::exeConfirm() { diff --git a/src/Game/Map/StageSwitch.cpp b/src/Game/Map/StageSwitch.cpp index ceef6ec30..9ec6fcffb 100644 --- a/src/Game/Map/StageSwitch.cpp +++ b/src/Game/Map/StageSwitch.cpp @@ -9,18 +9,18 @@ bool BitFlag128::get(int idx) const { } void BitFlag128::set(int bit_index, bool setTrue) { - u32 valIdx = bit_index / 32; + u32 valIdx = bit_index / 32; u32& flag = mFlags[valIdx]; if (setTrue) { flag |= (1 << (bit_index % 32)); - } - else { + } else { flag &= ~(1 << (bit_index % 32)); } } -ZoneSwitch::ZoneSwitch() : BitFlag128() { +ZoneSwitch::ZoneSwitch() + : BitFlag128() { s32 idx = 0; while (idx < 0x80) { @@ -28,7 +28,7 @@ ZoneSwitch::ZoneSwitch() : BitFlag128() { } } -SwitchIdInfo::SwitchIdInfo(s32 switchID, const JMapInfoIter &rIter) { +SwitchIdInfo::SwitchIdInfo(s32 switchID, const JMapInfoIter& rIter) { mIDInfo = nullptr; mIsGlobal = switchID >= 1000; mIDInfo = new JMapIdInfo(switchID, rIter); @@ -42,19 +42,19 @@ s32 SwitchIdInfo::getSwitchNo() const { return mIDInfo->_0; } -void StageSwitchContainer::createAndAddZone(const SwitchIdInfo &rInfo) { +void StageSwitchContainer::createAndAddZone(const SwitchIdInfo& rInfo) { if (findZoneSwitchFromTable(rInfo)) { return; } - ZoneSwitch* s = new ZoneSwitch(); + ZoneSwitch* s = new ZoneSwitch(); ContainerSwitch sw; sw.mData = rInfo.mIDInfo->mZoneID; sw.mSwitch = s; mSwitches.push_back(sw); } -ZoneSwitch* StageSwitchContainer::getZoneSwitch(const SwitchIdInfo &rInfo) { +ZoneSwitch* StageSwitchContainer::getZoneSwitch(const SwitchIdInfo& rInfo) { if (rInfo.mIsGlobal) { return mGlobalSwitches; } @@ -62,7 +62,7 @@ ZoneSwitch* StageSwitchContainer::getZoneSwitch(const SwitchIdInfo &rInfo) { return findZoneSwitchFromTable(rInfo); } -ZoneSwitch* StageSwitchContainer::findZoneSwitchFromTable(const SwitchIdInfo &rInfo) { +ZoneSwitch* StageSwitchContainer::findZoneSwitchFromTable(const SwitchIdInfo& rInfo) { for (int i = 0; i < mSwitches.size(); i++) { ContainerSwitch* pContainer = &mSwitches[i]; @@ -130,9 +130,9 @@ bool StageSwitchCtrl::isValidSwitchDead() const { // reg use bool StageSwitchCtrl::isOnAllSwitchAfterB(int idx) const { for (s32 i = 0; i < idx; i++) { - s32 switchNo = i + mSW_B->getSwitchNo(); + s32 switchNo = i + mSW_B->getSwitchNo(); StageSwitchContainer* pContainer = MR::getSceneObj(SceneObj_StageSwitchContainer); - + if (!pContainer->getZoneSwitch(*mSW_B)->get(switchNo)) { return false; } @@ -144,10 +144,10 @@ bool StageSwitchCtrl::isOnAllSwitchAfterB(int idx) const { // isOnAnyOneSwitchAfterB -SwitchIdInfo* StageSwitchFunction::createSwitchIdInfo(const char *pSwitchName, const JMapInfoIter &rIter, bool unused) { - s32 switchNo; +SwitchIdInfo* StageSwitchFunction::createSwitchIdInfo(const char* pSwitchName, const JMapInfoIter& rIter, bool unused) { + s32 switchNo; bool res = rIter.getValue(pSwitchName, &switchNo); - + if (!res) { return nullptr; } @@ -161,14 +161,14 @@ SwitchIdInfo* StageSwitchFunction::createSwitchIdInfo(const char *pSwitchName, c if (switchNo < 0x3E8) { StageSwitchContainer* pContainer = MR::getSceneObj(SceneObj_StageSwitchContainer); - pContainer->createAndAddZone(*inf); + pContainer->createAndAddZone(*inf); } return inf; } -void StageSwitchFunction::onSwitchBySwitchIdInfo(const SwitchIdInfo &rSwitchId) { - s32 switchNo = rSwitchId.getSwitchNo(); +void StageSwitchFunction::onSwitchBySwitchIdInfo(const SwitchIdInfo& rSwitchId) { + s32 switchNo = rSwitchId.getSwitchNo(); StageSwitchContainer* pContainer = MR::getSceneObj(SceneObj_StageSwitchContainer); ZoneSwitch* pZoneSwitch = pContainer->getZoneSwitch(rSwitchId); @@ -178,8 +178,8 @@ void StageSwitchFunction::onSwitchBySwitchIdInfo(const SwitchIdInfo &rSwitchId) } } -void StageSwitchFunction::offSwitchBySwitchIdInfo(const SwitchIdInfo &rSwitchId) { - s32 switchNo = rSwitchId.getSwitchNo(); +void StageSwitchFunction::offSwitchBySwitchIdInfo(const SwitchIdInfo& rSwitchId) { + s32 switchNo = rSwitchId.getSwitchNo(); StageSwitchContainer* pContainer = MR::getSceneObj(SceneObj_StageSwitchContainer); ZoneSwitch* pZoneSwitch = pContainer->getZoneSwitch(rSwitchId); @@ -189,8 +189,8 @@ void StageSwitchFunction::offSwitchBySwitchIdInfo(const SwitchIdInfo &rSwitchId) } } -bool StageSwitchFunction::isOnSwitchBySwitchIdInfo(const SwitchIdInfo &rSwitchId) { - s32 switchNo = rSwitchId.getSwitchNo(); +bool StageSwitchFunction::isOnSwitchBySwitchIdInfo(const SwitchIdInfo& rSwitchId) { + s32 switchNo = rSwitchId.getSwitchNo(); StageSwitchContainer* pContainer = MR::getSceneObj(SceneObj_StageSwitchContainer); ZoneSwitch* pZoneSwitch = pContainer->getZoneSwitch(rSwitchId); @@ -199,29 +199,26 @@ bool StageSwitchFunction::isOnSwitchBySwitchIdInfo(const SwitchIdInfo &rSwitchId } namespace MR { - StageSwitchCtrl* createStageSwitchCtrl(NameObj *pObj, const JMapInfoIter &rIter) { + StageSwitchCtrl* createStageSwitchCtrl(NameObj* pObj, const JMapInfoIter& rIter) { return new StageSwitchCtrl(rIter); } -}; +}; // namespace MR StageSwitchContainer::~StageSwitchContainer() { - } -StageSwitchContainer::StageSwitchContainer() : - NameObj("ステージスイッチ"), - mSwitches(), - mGlobalSwitches() -{ +StageSwitchContainer::StageSwitchContainer() + : NameObj("ステージスイッチ"), + mSwitches(), + mGlobalSwitches() { mGlobalSwitches = new ZoneSwitch(); } -StageSwitchCtrl::StageSwitchCtrl(const JMapInfoIter &rIter) : - mSW_A(nullptr), - mSW_B(nullptr), - mSW_Appear(nullptr), - mSW_Dead(nullptr) -{ +StageSwitchCtrl::StageSwitchCtrl(const JMapInfoIter& rIter) + : mSW_A(nullptr), + mSW_B(nullptr), + mSW_Appear(nullptr), + mSW_Dead(nullptr) { mSW_A = StageSwitchFunction::createSwitchIdInfo("SW_A", rIter, true); mSW_B = StageSwitchFunction::createSwitchIdInfo("SW_B", rIter, true); mSW_Appear = StageSwitchFunction::createSwitchIdInfo("SW_APPEAR", rIter, false); diff --git a/src/Game/Map/SunshadeMapHolder.cpp b/src/Game/Map/SunshadeMapHolder.cpp index 10a5e3ce2..ce1638175 100644 --- a/src/Game/Map/SunshadeMapHolder.cpp +++ b/src/Game/Map/SunshadeMapHolder.cpp @@ -1,14 +1,15 @@ #include "Game/Map/SunshadeMapHolder.hpp" #include "Game/Scene/SceneObjHolder.hpp" -SunshadeMapHolder::SunshadeMapHolder() : NameObj("日よけコリジョン管理") { +SunshadeMapHolder::SunshadeMapHolder() + : NameObj("日よけコリジョン管理") { _C.x = 0.0f; _C.y = 1.0f; _C.z = 0.0f; } namespace MR { - bool isInShadeFromTheSun(const TVec3f &rPos, f32 a2) { + bool isInShadeFromTheSun(const TVec3f& rPos, f32 a2) { if (!MR::isInAreaObj("SunLightArea", rPos)) { return true; } @@ -18,7 +19,7 @@ namespace MR { } SunshadeMapHolder* holder = MR::getSceneObj(SceneObj_SunshadeMapHolder); - TVec3f pos; + TVec3f pos; pos.setPS(holder->_C); return Collision::checkStrikeLineToSunshade(rPos, pos * a2, 0, nullptr, nullptr) != false; } @@ -26,8 +27,7 @@ namespace MR { void createSunshadeMapHolder() { MR::createSceneObj(SceneObj_SunshadeMapHolder); } -}; +}; // namespace MR SunshadeMapHolder::~SunshadeMapHolder() { - } diff --git a/src/Game/Map/SunshadeMapParts.cpp b/src/Game/Map/SunshadeMapParts.cpp index 1da731e89..c2a5e85cf 100644 --- a/src/Game/Map/SunshadeMapParts.cpp +++ b/src/Game/Map/SunshadeMapParts.cpp @@ -3,7 +3,8 @@ #include "Game/MapObj/GeneralMapParts.hpp" #include "Game/Map/SunshadeMapHolder.hpp" -SunshadeMapParts::SunshadeMapParts(const char *pName) : GeneralMapParts(pName) { +SunshadeMapParts::SunshadeMapParts(const char* pName) + : GeneralMapParts(pName) { mCollision = nullptr; } @@ -16,16 +17,15 @@ void SunshadeMapParts::calcAnim() { } namespace MR { - SunshadeMapParts* createSunshadeMapParts(const char *pName) { + SunshadeMapParts* createSunshadeMapParts(const char* pName) { return new SunshadeMapParts(pName); } -}; +}; // namespace MR SunshadeMapParts::~SunshadeMapParts() { - } -void SunshadeMapParts::init(const JMapInfoIter &rIter) { +void SunshadeMapParts::init(const JMapInfoIter& rIter) { GeneralMapParts::init(rIter); MR::createSunshadeMapHolder(); mCollision = MR::tryCreateCollisionSunshade(this, getSensor("body")); diff --git a/src/Game/Map/SwitchSynchronizer.cpp b/src/Game/Map/SwitchSynchronizer.cpp index a131e1542..bc3949ae4 100644 --- a/src/Game/Map/SwitchSynchronizer.cpp +++ b/src/Game/Map/SwitchSynchronizer.cpp @@ -2,12 +2,13 @@ #include "Game/Map/StageSwitch.hpp" #include "Game/Util/ObjUtil.hpp" -SwitchSynchronizer::SwitchSynchronizer(const char *pName) : NameObj(pName) { +SwitchSynchronizer::SwitchSynchronizer(const char* pName) + : NameObj(pName) { mSwitchCtrl = nullptr; _10 = 1; } -void SwitchSynchronizer::init(const JMapInfoIter &rIter) { +void SwitchSynchronizer::init(const JMapInfoIter& rIter) { MR::connectToSceneMapObjMovement(this); mSwitchCtrl = MR::createStageSwitchCtrl(this, rIter); } @@ -23,8 +24,7 @@ void SwitchSynchronizer::movement() { mSwitchCtrl->onSwitchA(); return; } - } - else { + } else { if (mSwitchCtrl->isOnSwitchA() && !mSwitchCtrl->isOnSwitchB()) { mSwitchCtrl->offSwitchA(); return; @@ -37,5 +37,4 @@ void SwitchSynchronizer::movement() { } SwitchSynchronizer::~SwitchSynchronizer() { - } diff --git a/src/Game/Map/TimerSwitch.cpp b/src/Game/Map/TimerSwitch.cpp index e9d495724..4c211b72d 100644 --- a/src/Game/Map/TimerSwitch.cpp +++ b/src/Game/Map/TimerSwitch.cpp @@ -1,11 +1,12 @@ #include "Game/Map/TimerSwitch.hpp" -TimerSwitch::TimerSwitch(const char *pName) : LiveActor(pName) { +TimerSwitch::TimerSwitch(const char* pName) + : LiveActor(pName) { mTimerLength = -1; mCurrentTime = -1; } -void TimerSwitch::init(const JMapInfoIter &rIter) { +void TimerSwitch::init(const JMapInfoIter& rIter) { MR::connectToSceneMapObjMovement(this); MR::getJMapInfoArg0NoInit(rIter, &mTimerLength); MR::needStageSwitchWriteA(this, rIter); @@ -31,5 +32,4 @@ void TimerSwitch::control() { } TimerSwitch::~TimerSwitch() { - } diff --git a/src/Game/Map/WaterInfo.cpp b/src/Game/Map/WaterInfo.cpp index df51c541c..1e54f59ea 100644 --- a/src/Game/Map/WaterInfo.cpp +++ b/src/Game/Map/WaterInfo.cpp @@ -8,7 +8,7 @@ bool WaterInfo::isInWater() const { if (mWaterArea || mOceanBowl || mOceanRing || mOceanSphere) { return true; } - + return false; } diff --git a/src/Game/Map/WaterPoint.cpp b/src/Game/Map/WaterPoint.cpp index 597818281..4d1ab587d 100644 --- a/src/Game/Map/WaterPoint.cpp +++ b/src/Game/Map/WaterPoint.cpp @@ -1,9 +1,8 @@ #include "Game/Map/WaterPoint.hpp" #include "Game/Util.hpp" -WaterPoint::WaterPoint(const TVec3f &rPos, const TVec3f &rUpVec, f32 coordAcrossRail, f32 coordOnRail, f32 height, f32 flowSpeedRate) : - mPosition(rPos), mOrigPos(rPos), mCoordAcrossRail(coordAcrossRail), mCoordOnRail(coordOnRail), mUpVec(rUpVec), mHeight(height), mFlowSpeedRate(flowSpeedRate), mAlpha(-1) { - +WaterPoint::WaterPoint(const TVec3f& rPos, const TVec3f& rUpVec, f32 coordAcrossRail, f32 coordOnRail, f32 height, f32 flowSpeedRate) + : mPosition(rPos), mOrigPos(rPos), mCoordAcrossRail(coordAcrossRail), mCoordOnRail(coordOnRail), mUpVec(rUpVec), mHeight(height), mFlowSpeedRate(flowSpeedRate), mAlpha(-1) { } void WaterPoint::initAfterPlacement() { diff --git a/src/Game/Map/WaterRoad.cpp b/src/Game/Map/WaterRoad.cpp index b34cd248b..44c4eb67e 100644 --- a/src/Game/Map/WaterRoad.cpp +++ b/src/Game/Map/WaterRoad.cpp @@ -17,15 +17,14 @@ void WaterRoadModelInfo::initDisplayList() { void WaterRoadModelInfo::drawGD() const { if (mIsLow) { loadMaterialLow(); - } - else { + } else { loadMaterialHigh(0); } GXCallDisplayList(mList, mDLLength); } -s32 WaterRoadModelInfo::calcDemoDrawPointNum(const WaterRoad *pRoad) const { +s32 WaterRoadModelInfo::calcDemoDrawPointNum(const WaterRoad* pRoad) const { s32 ret = 1; for (; ret < _8; ret++) { @@ -37,7 +36,7 @@ s32 WaterRoadModelInfo::calcDemoDrawPointNum(const WaterRoad *pRoad) const { return _8; } -void WaterRoadModelInfo::loadMaterialHigh(const WaterRoad *pRoad) const { +void WaterRoadModelInfo::loadMaterialHigh(const WaterRoad* pRoad) const { GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_NRM, GX_POS_XY, GX_S16, 0x10); GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_POS_XYZ, GX_F32, 0); @@ -52,8 +51,8 @@ void WaterRoadModelInfo::loadMaterialHigh(const WaterRoad *pRoad) const { GXSetArray(GX_VA_POS, _10, 0xC); GXSetArray(GX_VA_NRM, _14, 6); GXLoadPosMtxImm(MR::getCameraViewMtx(), 0); - GXLoadNrmMtxImm(MR::getCameraViewMtx(), 0); - GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 0x1E, 0, 0x7D); + GXLoadNrmMtxImm(MR::getCameraViewMtx(), 0); + GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 0x1E, 0, 0x7D); GXSetTexCoordGen2(GX_TEXCOORD1, GX_TG_MTX2x4, GX_TG_TEX1, 0x21, 0, 0x7D); GXSetTexCoordGen2(GX_TEXCOORD2, GX_TG_MTX2x4, GX_TG_TEX2, 0x24, 0, 0x7D); GXSetTexCoordGen2(GX_TEXCOORD3, GX_TG_MTX3x4, GX_TG_POS, 0x27, 0, 0x7D); @@ -75,26 +74,26 @@ void WaterRoadModelInfo::loadMaterialHigh(const WaterRoad *pRoad) const { GXSetNumIndStages(1); GXSetIndTexOrder(GX_INDTEXSTAGE0, GX_TEXCOORD2, GX_TEXMAP1); GXSetTevIndWarp(GX_TEVSTAGE3, GX_INDTEXSTAGE0, 1, 0, GX_ITM_0); - + f32 offset[2][3]; offset[0][1] = 0.0f; offset[0][0] = 0.2f; offset[0][2] = 0.0f; - offset[1][0] = 0.0f; + offset[1][0] = 0.0f; offset[1][1] = 0.2f; offset[1][2] = 0.0f; GXSetIndTexMtx(GX_ITM_0, offset, 0); GXSetNumTevStages(5); - const GXColor color_0 = { 0x28, 0x28, 0x28, 0x14 }; + const GXColor color_0 = {0x28, 0x28, 0x28, 0x14}; GXSetTevColor(GX_TEVREG0, color_0); - const GXColor color_1 = { 0x55, 0x96, 0xBE, 0xFF }; + const GXColor color_1 = {0x55, 0x96, 0xBE, 0xFF}; GXSetTevColor(GX_TEVREG1, color_1); if (pRoad) { - const GXColor color_2 = { 0xFF, 0xFF, 0xFF, pRoad->_9C }; - GXSetTevColor(GX_TEVREG2, color_2); + const GXColor color_2 = {0xFF, 0xFF, 0xFF, pRoad->_9C}; + GXSetTevColor(GX_TEVREG2, color_2); } GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL); @@ -123,8 +122,7 @@ void WaterRoadModelInfo::loadMaterialHigh(const WaterRoad *pRoad) const { if (pRoad && pRoad->_9C != 0xFF) { GXSetTevAlphaIn(GX_TEVSTAGE4, GX_CA_A2, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO); - } - else { + } else { GXSetTevAlphaIn(GX_TEVSTAGE4, GX_CA_KONST, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO); } @@ -175,9 +173,9 @@ void WaterRoadModelInfo::loadMaterialLow() const { GXLoadTexMtxImm((const MtxPtr)&pos.mMtx, 0x27, GX_MTX2x4); GXSetNumIndStages(0); GXSetNumTevStages(4); - const GXColor color_0 = { 0x28, 0x28, 0x28, 0x14 }; + const GXColor color_0 = {0x28, 0x28, 0x28, 0x14}; GXSetTevColor(GX_TEVREG0, color_0); - const GXColor color_1 = { 0x55, 0x96, 0xBE, 0xFF }; + const GXColor color_1 = {0x55, 0x96, 0xBE, 0xFF}; GXSetTevColor(GX_TEVREG1, color_1); GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL); GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_TEXC, GX_CC_ZERO, GX_CC_ZERO, GX_CC_ZERO); diff --git a/src/Game/MapObj/AirBubble.cpp b/src/Game/MapObj/AirBubble.cpp index 922930f2a..c43941117 100644 --- a/src/Game/MapObj/AirBubble.cpp +++ b/src/Game/MapObj/AirBubble.cpp @@ -1,7 +1,8 @@ #include "Game/LiveActor/HitSensor.hpp" #include "Game/MapObj/AirBubble.hpp" -AirBubble::AirBubble(const char *pName) : LiveActor(pName) { +AirBubble::AirBubble(const char* pName) + : LiveActor(pName) { _A4.x = 0.0f; _A4.y = 0.0f; _A4.z = 1.0f; @@ -9,7 +10,7 @@ AirBubble::AirBubble(const char *pName) : LiveActor(pName) { _C4 = 360; } -void AirBubble::init(const JMapInfoIter &rIter) { +void AirBubble::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::useStageSwitchWriteDead(this, rIter); initModelManagerWithAnm("AirBubble", nullptr, false); @@ -47,10 +48,9 @@ void AirBubble::kill() { } void AirBubble::control() { - } -void AirBubble::appearMove(const TVec3f &a1, s32 a2) { +void AirBubble::appearMove(const TVec3f& a1, s32 a2) { _8C.set(a1); mPosition.set(a1); appear(); @@ -70,14 +70,13 @@ void AirBubble::exeBreak() { } } -bool AirBubble::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { +bool AirBubble::receiveMsgPush(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver)) { if (isNerve(&NrvAirBubble::AirBubbleNrvKillWait::sInstance)) { MR::incPlayerOxygen(8); kill(); return true; - } - else { + } else { setNerve(&NrvAirBubble::AirBubbleNrvBreak::sInstance); } @@ -87,7 +86,7 @@ bool AirBubble::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { return false; } -bool AirBubble::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool AirBubble::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { bool res; if (MR::isMsgItemShow(msg)) { @@ -101,13 +100,11 @@ bool AirBubble::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceive if (MR::isMsgItemStartMove(msg)) { _C9 = 1; return true; - } - else if (MR::isMsgItemEndMove(msg)) { + } else if (MR::isMsgItemEndMove(msg)) { _C9 = 0; _8C = mPosition; return true; - } - else if (MR::isMsgSpinStormRange(msg) && canSpinGet()) { + } else if (MR::isMsgSpinStormRange(msg) && canSpinGet()) { TVec3f stack_8(pSender->mPosition); stack_8 -= mPosition; @@ -129,7 +126,6 @@ bool AirBubble::canSpinGet() const { } AirBubble::~AirBubble() { - } namespace NrvAirBubble { @@ -138,26 +134,26 @@ namespace NrvAirBubble { INIT_NERVE(AirBubbleNrvBreak); INIT_NERVE(AirBubbleNrvKillWait); - void AirBubbleNrvKillWait::execute(Spine *pSpine) const { + void AirBubbleNrvKillWait::execute(Spine* pSpine) const { AirBubble* bubble = reinterpret_cast(pSpine->mExecutor); - + if (MR::isGreaterStep(bubble, 90)) { bubble->kill(); } } - void AirBubbleNrvBreak::execute(Spine *pSpine) const { + void AirBubbleNrvBreak::execute(Spine* pSpine) const { AirBubble* bubble = reinterpret_cast(pSpine->mExecutor); bubble->exeBreak(); } - void AirBubbleNrvMove::execute(Spine *pSpine) const { + void AirBubbleNrvMove::execute(Spine* pSpine) const { AirBubble* bubble = reinterpret_cast(pSpine->mExecutor); bubble->exeMove(); } - void AirBubbleNrvWait::execute(Spine *pSpine) const { + void AirBubbleNrvWait::execute(Spine* pSpine) const { AirBubble* bubble = reinterpret_cast(pSpine->mExecutor); bubble->exeWait(); } -}; +}; // namespace NrvAirBubble diff --git a/src/Game/MapObj/AirBubbleGenerator.cpp b/src/Game/MapObj/AirBubbleGenerator.cpp index 1dffd4fee..067ef37e3 100644 --- a/src/Game/MapObj/AirBubbleGenerator.cpp +++ b/src/Game/MapObj/AirBubbleGenerator.cpp @@ -2,16 +2,16 @@ #include "Game/MapObj/AirBubbleHolder.hpp" AirBubbleGenerator::~AirBubbleGenerator() { - } -AirBubbleGenerator::AirBubbleGenerator(const char *pName) : LiveActor(pName) { +AirBubbleGenerator::AirBubbleGenerator(const char* pName) + : LiveActor(pName) { _8C = 0; mSpawnDelay = 180; mBubbleDuration = -1; } -void AirBubbleGenerator::init(const JMapInfoIter &rIter) { +void AirBubbleGenerator::init(const JMapInfoIter& rIter) { MR::createAirBubbleHolder(); MR::initDefaultPos(this, rIter); initModelManagerWithAnm("AirBubbleGenerator", nullptr, false); @@ -24,18 +24,16 @@ void AirBubbleGenerator::init(const JMapInfoIter &rIter) { MR::getJMapInfoArg0NoInit(rIter, &mSpawnDelay); MR::getJMapInfoArg1NoInit(rIter, &mBubbleDuration); initSound(2, false); - + if (MR::useStageSwitchReadAppear(this, rIter)) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { makeActorAppeared(); } } void AirBubbleGenerator::control() { - } void AirBubbleGenerator::exeWait() { @@ -66,4 +64,4 @@ void AirBubbleGenerator::exeGenerate() { namespace NrvAirBubbleGenerator { INIT_NERVE(AirBubbleGenerateNrvWait); INIT_NERVE(AirBubbleGeneratorNrvGenerate); -}; +}; // namespace NrvAirBubbleGenerator diff --git a/src/Game/MapObj/AirBubbleHolder.cpp b/src/Game/MapObj/AirBubbleHolder.cpp index 74493783c..76aba19d9 100644 --- a/src/Game/MapObj/AirBubbleHolder.cpp +++ b/src/Game/MapObj/AirBubbleHolder.cpp @@ -2,10 +2,11 @@ #include "Game/MapObj/AirBubble.hpp" #include "Game/Scene/SceneObjHolder.hpp" -AirBubbleHolder::AirBubbleHolder(const char *pName) : LiveActorGroup(pName, 64) { } +AirBubbleHolder::AirBubbleHolder(const char* pName) + : LiveActorGroup(pName, 64) {} #ifdef NON_MATCHING // AirBubble isn't finished so the size is wrong -void AirBubbleHolder::init(const JMapInfoIter &rIter) { +void AirBubbleHolder::init(const JMapInfoIter& rIter) { for (s32 i = 0; i < 32; i++) { AirBubble* bubble = new AirBubble("空気アワ(共用)"); bubble->initWithoutIter(); @@ -15,12 +16,11 @@ void AirBubbleHolder::init(const JMapInfoIter &rIter) { } #endif -void AirBubbleHolder::appearAirBubble(const TVec3f &a1, s32 a2) { +void AirBubbleHolder::appearAirBubble(const TVec3f& a1, s32 a2) { AirBubble* bubble; if (getDeadActor()) { bubble = reinterpret_cast(getDeadActor()); - } - else { + } else { bubble = nullptr; } @@ -34,7 +34,7 @@ namespace MR { return static_cast(MR::createSceneObj(SceneObj_AirBubbleHolder)); } - void appearAirBubble(const TVec3f &a1, s32 a2) { + void appearAirBubble(const TVec3f& a1, s32 a2) { MR::getSceneObj(SceneObj_AirBubbleHolder)->appearAirBubble(a1, a2); } -}; +}; // namespace MR diff --git a/src/Game/MapObj/AnmModelObj.cpp b/src/Game/MapObj/AnmModelObj.cpp index 6c83ca8ee..e15ca4b97 100644 --- a/src/Game/MapObj/AnmModelObj.cpp +++ b/src/Game/MapObj/AnmModelObj.cpp @@ -5,26 +5,26 @@ namespace { const char* cFollowjointName = "Move"; const char* cAnimFileName = "Move"; const char* cEndLoopEffectName = "EndLoop"; -}; +}; // namespace -AnmModelObj::AnmModelObj(const char *pName) : MapObjActor(pName) { +AnmModelObj::AnmModelObj(const char* pName) + : MapObjActor(pName) { mJointPos.x = 0.0f; mJointPos.y = 0.0f; mJointPos.z = 0.0f; } -void AnmModelObj::init(const JMapInfoIter &rIter) { +void AnmModelObj::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoSimpleMapObj(&info); info.setupNerve(&NrvAnmModelObj::HostTypeWait::sInstance); MapObjActorUtil::setupInitInfoTypical(&info, mObjectName); initialize(rIter, info); - + if (MR::isExistJoint(this, cFollowjointName)) { MR::copyJointPos(this, cFollowjointName, &mJointPos); - } - else { + } else { mJointPos.set(mPosition); } @@ -45,15 +45,14 @@ void AnmModelObj::exeMove() { startInner(); } - s32 steps = MR::StageEffect::getStopSeSteps(mObjectName); + s32 steps = MR::StageEffect::getStopSeSteps(mObjectName); const char* movingSE = MR::StageEffect::getMovingSe(mObjectName); if (movingSE != nullptr) { if (steps > 0) { if (MR::isLessStep(this, steps)) { MR::startLevelSound(this, movingSE, -1, -1, -1); } - } - else { + } else { MR::startLevelSound(this, movingSE, -1, -1, -1); } } @@ -75,8 +74,7 @@ void AnmModelObj::exeMove() { moveInner(); if (MR::isExistJoint(this, cFollowjointName)) { MR::copyJointPos(this, cFollowjointName, &mJointPos); - } - else { + } else { mJointPos.set(mPosition); } @@ -88,11 +86,9 @@ void AnmModelObj::exeMove() { if (isKilledAtMoveDone()) { kill(); - } - else if (isRepeat()) { + } else if (isRepeat()) { setNerve(&NrvAnmModelObj::HostTypeWait::sInstance); - } - else { + } else { setNerve(&NrvAnmModelObj::HostTypeDone::sInstance); } } @@ -118,15 +114,14 @@ void AnmModelObj::exeWait() { } } -AnmModelSwitchMove::AnmModelSwitchMove(const char *pName) : AnmModelObj(pName) { - +AnmModelSwitchMove::AnmModelSwitchMove(const char* pName) + : AnmModelObj(pName) { } AnmModelObj::~AnmModelObj() { - } -void AnmModelSwitchMove::init(const JMapInfoIter &rIter) { +void AnmModelSwitchMove::init(const JMapInfoIter& rIter) { AnmModelObj::init(rIter); if (MR::isDemoCast(this, nullptr)) { @@ -148,11 +143,11 @@ bool AnmModelSwitchMove::isOnStartAnmTrigger() const { return MR::isOnSwitchA(this); } -AnmModelGroundOnMove::AnmModelGroundOnMove(const char *pName) : AnmModelObj(pName) { - +AnmModelGroundOnMove::AnmModelGroundOnMove(const char* pName) + : AnmModelObj(pName) { } -void AnmModelGroundOnMove::init(const JMapInfoIter &rIter) { +void AnmModelGroundOnMove::init(const JMapInfoIter& rIter) { AnmModelObj::init(rIter); MR::useStageSwitchWriteB(this, rIter); } @@ -167,11 +162,11 @@ bool AnmModelGroundOnMove::isOnStartAnmTrigger() const { return MR::isOnPlayer(getSensor("body")); } -AnmModelBindMove::AnmModelBindMove(const char *pName) : AnmModelObj(pName) { - +AnmModelBindMove::AnmModelBindMove(const char* pName) + : AnmModelObj(pName) { } -void AnmModelBindMove::init(const JMapInfoIter &rIter) { +void AnmModelBindMove::init(const JMapInfoIter& rIter) { AnmModelObj::init(rIter); MR::useStageSwitchWriteB(this, rIter); } @@ -182,7 +177,7 @@ void AnmModelBindMove::control() { } } -bool AnmModelBindMove::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool AnmModelBindMove::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return msg == ACTMES_IS_REFLECTION_G_CAPTURE; } @@ -196,15 +191,15 @@ bool AnmModelBindMove::isOnStartAnmTrigger() const { return false; } -AnmModelSwitchMoveEventCamera::AnmModelSwitchMoveEventCamera(const char *pName) : AnmModelSwitchMove(pName) { +AnmModelSwitchMoveEventCamera::AnmModelSwitchMoveEventCamera(const char* pName) + : AnmModelSwitchMove(pName) { mCameraInfo = nullptr; } AnmModelSwitchMove::~AnmModelSwitchMove() { - } -void AnmModelSwitchMoveEventCamera::init(const JMapInfoIter &rIter) { +void AnmModelSwitchMoveEventCamera::init(const JMapInfoIter& rIter) { AnmModelObj::init(rIter); if (MR::isDemoCast(this, nullptr) && MR::tryRegisterDemoActionNerve(this, &NrvAnmModelObj::HostTypeMove::sInstance, nullptr)) { setNerve(&NrvAnmModelObj::HostTypeWait::sInstance); @@ -222,8 +217,7 @@ bool AnmModelSwitchMoveEventCamera::isDone() const { s32 frames = MR::getActorCameraFrames(this, info); if (frames <= 0) { return MR::isBckOneTimeAndStopped(this); - } - else { + } else { return MR::isGreaterEqualStep(this, frames); } } @@ -239,33 +233,27 @@ void AnmModelSwitchMoveEventCamera::stopInner() { } AnmModelGroundOnMove::~AnmModelGroundOnMove() { - } AnmModelBindMove::~AnmModelBindMove() { - } AnmModelSwitchMoveEventCamera::~AnmModelSwitchMoveEventCamera() { - } namespace NrvAnmModelObj { INIT_NERVE(HostTypeWait); INIT_NERVE(HostTypeMove); INIT_NERVE(HostTypeDone); -}; +}; // namespace NrvAnmModelObj void AnmModelObj::startInner() { - } void AnmModelObj::moveInner() { - } void AnmModelObj::stopInner() { - } bool AnmModelObj::isKilledAtMoveDone() const { @@ -277,23 +265,18 @@ bool AnmModelObj::isRepeat() const { } void AnmModelObj::control() { - } -void AnmModelObj::initCaseNoUseSwitchB(const MapObjActorInitInfo &) { - +void AnmModelObj::initCaseNoUseSwitchB(const MapObjActorInitInfo&) { } -void AnmModelObj::initCaseUseSwitchB(const MapObjActorInitInfo &) { - +void AnmModelObj::initCaseUseSwitchB(const MapObjActorInitInfo&) { } -void AnmModelObj::initCaseNoUseSwitchA(const MapObjActorInitInfo &) { - +void AnmModelObj::initCaseNoUseSwitchA(const MapObjActorInitInfo&) { } -void AnmModelObj::initCaseUseSwitchA(const MapObjActorInitInfo &) { - +void AnmModelObj::initCaseUseSwitchA(const MapObjActorInitInfo&) { } bool AnmModelBindMove::isRepeat() const { diff --git a/src/Game/MapObj/ArrowSwitch.cpp b/src/Game/MapObj/ArrowSwitch.cpp index 6faeae0e3..47ad777ad 100644 --- a/src/Game/MapObj/ArrowSwitch.cpp +++ b/src/Game/MapObj/ArrowSwitch.cpp @@ -3,10 +3,11 @@ #include "math_types.hpp" namespace { - const f32 sRotYTargetList[4] = { 0.0f, 90.0f, 180.0f, -90.0f }; + const f32 sRotYTargetList[4] = {0.0f, 90.0f, 180.0f, -90.0f}; }; -ArrowSwitch::ArrowSwitch(const char *pName) : LiveActor(pName) { +ArrowSwitch::ArrowSwitch(const char* pName) + : LiveActor(pName) { _8C = 0.0f; mRotationIdx = 0; _94 = 0.0f; @@ -67,7 +68,6 @@ void ArrowSwitch::init(const JMapInfoIter &rIter) { */ void ArrowSwitch::control() { - } void ArrowSwitch::calcAndSetBaseMtx() { @@ -94,25 +94,25 @@ void ArrowSwitch::calcAndSetBaseMtx() { MR::setBaseTRMtx(this, pos); } -void ArrowSwitch::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void ArrowSwitch::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver)) { MR::sendMsgPush(pReceiver, pSender); } } -bool ArrowSwitch::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool ArrowSwitch::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgPlayerHitAll(msg)) { return requestPunch(pSender, pReceiver); - } + } return false; } -bool ArrowSwitch::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { +bool ArrowSwitch::receiveMsgPush(HitSensor* pSender, HitSensor* pReceiver) { return false; } -bool ArrowSwitch::requestPunch(HitSensor *pSender, HitSensor *pReceiver) { +bool ArrowSwitch::requestPunch(HitSensor* pSender, HitSensor* pReceiver) { if (getSensor("body") != pReceiver) { return false; } @@ -128,17 +128,14 @@ bool ArrowSwitch::requestPunch(HitSensor *pSender, HitSensor *pReceiver) { if (isPlusLimit()) { _9D = 0; - } - else if (isMinusLimit()) { + } else if (isMinusLimit()) { _9D = 1; - } - else { + } else { f32 dot = side.dot(direction); if (dot > 0.0f) { _9D = 1; - } - else { + } else { _9D = 0; } } @@ -150,35 +147,35 @@ bool ArrowSwitch::requestPunch(HitSensor *pSender, HitSensor *pReceiver) { _9F = 1; MR::invalidateClipping(this); setNerve(&NrvArrowSwitch::ArrowSwitchNrvRotate::sInstance); - return true; + return true; } void ArrowSwitch::listenOnSwitch() { if (mRotationIdx == 0) { - switch(_98) { - case 2: - case -1: - _9D = 1; - _94 = 6.0f; - mRotationIdx = 2; - break; - case 3: - _9D = 0; - _94 = 6.0f; - mRotationIdx = 2; - break; - case 0: - _9D = 1; - _94 = -6.0f; - mRotationIdx = 1; - break; - case 1: - _9D = 0; - _94 = -6.0f; - mRotationIdx = 3; - break; - default: - return; + switch (_98) { + case 2: + case -1: + _9D = 1; + _94 = 6.0f; + mRotationIdx = 2; + break; + case 3: + _9D = 0; + _94 = 6.0f; + mRotationIdx = 2; + break; + case 0: + _9D = 1; + _94 = -6.0f; + mRotationIdx = 1; + break; + case 1: + _9D = 0; + _94 = -6.0f; + mRotationIdx = 3; + break; + default: + return; } MR::invalidateClipping(this); @@ -190,20 +187,20 @@ void ArrowSwitch::listenOffSwitch() { if (mRotationIdx != 0) { mRotationIdx = 0; - switch(_98) { - case 2: - case 0: - case -1: - _9D = 0; - _94 = -6.0f; - break; - case 1: - case 3: - _9D = 1; - _94 = 6.0f; - break; - default: - return; + switch (_98) { + case 2: + case 0: + case -1: + _9D = 0; + _94 = -6.0f; + break; + case 1: + case 3: + _9D = 1; + _94 = 6.0f; + break; + default: + return; } MR::invalidateClipping(this); @@ -215,8 +212,7 @@ void ArrowSwitch::exeWait() { if (MR::isFirstStep(this)) { if (mRotationIdx != 0) { MR::startBtk(this, "On"); - } - else { + } else { MR::startBtk(this, "Off"); } @@ -255,8 +251,7 @@ void ArrowSwitch::exeRotate() { if (MR::isValidSwitchA(this) && _9F) { if (mRotationIdx != 0) { MR::onSwitchA(this); - } - else { + } else { MR::offSwitchA(this); } @@ -267,8 +262,7 @@ void ArrowSwitch::exeRotate() { _9F = 0; if (_9C) { setNerve(&NrvArrowSwitch::ArrowSwitchNrvLock::sInstance); - } - else { + } else { setNerve(&NrvArrowSwitch::ArrowSwitchNrvWait::sInstance); } } @@ -279,8 +273,7 @@ void ArrowSwitch::exeLock() { if (MR::isFirstStep(this)) { if (mRotationIdx == 0) { MR::startBtk(this, "Off"); - } - else { + } else { MR::startBtk(this, "On"); } @@ -291,31 +284,31 @@ void ArrowSwitch::exeLock() { bool ArrowSwitch::isPlusLimit() const { switch (_98) { - case 2: - return mRotationIdx == 2; - case 0: - return mRotationIdx == 1; - case 1: - return mRotationIdx == 0; - case 3: - return mRotationIdx == 0; - default: - return false; + case 2: + return mRotationIdx == 2; + case 0: + return mRotationIdx == 1; + case 1: + return mRotationIdx == 0; + case 3: + return mRotationIdx == 0; + default: + return false; } } bool ArrowSwitch::isMinusLimit() const { switch (_98) { - case 2: - return mRotationIdx == 0; - case 0: - return mRotationIdx == 0; - case 1: - return mRotationIdx == 3; - case 3: - return mRotationIdx == 2; - default: - return false; + case 2: + return mRotationIdx == 0; + case 0: + return mRotationIdx == 0; + case 1: + return mRotationIdx == 3; + case 3: + return mRotationIdx == 2; + default: + return false; } } @@ -338,22 +331,21 @@ namespace NrvArrowSwitch { INIT_NERVE(ArrowSwitchNrvRotate); INIT_NERVE(ArrowSwitchNrvLock); - void ArrowSwitchNrvLock::execute(Spine *pSpine) const { + void ArrowSwitchNrvLock::execute(Spine* pSpine) const { ArrowSwitch* sw = reinterpret_cast(pSpine->mExecutor); sw->exeLock(); } - void ArrowSwitchNrvRotate::execute(Spine *pSpine) const { + void ArrowSwitchNrvRotate::execute(Spine* pSpine) const { ArrowSwitch* sw = reinterpret_cast(pSpine->mExecutor); sw->exeRotate(); } - void ArrowSwitchNrvWait::execute(Spine *pSpine) const { + void ArrowSwitchNrvWait::execute(Spine* pSpine) const { ArrowSwitch* sw = reinterpret_cast(pSpine->mExecutor); sw->exeWait(); } -}; +}; // namespace NrvArrowSwitch ArrowSwitch::~ArrowSwitch() { - } diff --git a/src/Game/MapObj/ArrowSwitchMulti.cpp b/src/Game/MapObj/ArrowSwitchMulti.cpp index ed3adc287..6147e9dbc 100644 --- a/src/Game/MapObj/ArrowSwitchMulti.cpp +++ b/src/Game/MapObj/ArrowSwitchMulti.cpp @@ -3,14 +3,15 @@ #include "Game/Map/StageSwitch.hpp" #include "math_types.hpp" -ArrowSwitchTarget::ArrowSwitchTarget(const char *pName) : NameObj(pName) { +ArrowSwitchTarget::ArrowSwitchTarget(const char* pName) + : NameObj(pName) { mJMapIDInfo = nullptr; mStageSwitchCtrl = nullptr; mTargetIdx = -1; MR::createArrowSwitchMultiHolder(); } -void ArrowSwitchTarget::init(const JMapInfoIter &rIter) { +void ArrowSwitchTarget::init(const JMapInfoIter& rIter) { s32 arg; MR::getJMapInfoArg0WithInit(rIter, &arg); mJMapIDInfo = new JMapIdInfo(arg, rIter); @@ -42,8 +43,8 @@ void ArrowSwitchTarget::offTarget() { } } - -ArrowSwitchMulti::ArrowSwitchMulti(const char *pName) : LiveActor(pName) { +ArrowSwitchMulti::ArrowSwitchMulti(const char* pName) + : LiveActor(pName) { mIDInfo = nullptr; _A0 = 0.0f; _A4 = 0.0f; @@ -57,11 +58,11 @@ ArrowSwitchMulti::ArrowSwitchMulti(const char *pName) : LiveActor(pName) { } } -void ArrowSwitchMulti::registerTarget(ArrowSwitchTarget *pTarget) { +void ArrowSwitchMulti::registerTarget(ArrowSwitchTarget* pTarget) { mTargetArray[pTarget->mTargetIdx] = pTarget; } -void ArrowSwitchMulti::init(const JMapInfoIter &rIter) { +void ArrowSwitchMulti::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("ArrowSwitch", nullptr, false); MR::connectToSceneNoSilhouettedMapObjStrongLight(this); @@ -72,8 +73,7 @@ void ArrowSwitchMulti::init(const JMapInfoIter &rIter) { if (MR::isInAreaObj("PlaneModeCube", mPosition)) { initHitSensor(1); MR::addHitSensorMapObj(this, "body", 8, 100.0f, TVec3f(0.0f, 50.0f, 250.0f)); - } - else { + } else { initHitSensor(2); MR::addHitSensorMapObj(this, "body", 8, 100.0f, TVec3f(0.0f, 50.0f, 250.0f)); MR::addHitSensorMapObjMoveCollision(this, "collision", 8, 0.0f, TVec3f(0.0f, 0.0f, 0.0f)); @@ -87,7 +87,6 @@ void ArrowSwitchMulti::init(const JMapInfoIter &rIter) { } void ArrowSwitchMulti::control() { - } void ArrowSwitchMulti::calcAndSetBaseMtx() { @@ -114,15 +113,15 @@ void ArrowSwitchMulti::calcAndSetBaseMtx() { MR::setBaseTRMtx(this, pos); } -bool ArrowSwitchMulti::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool ArrowSwitchMulti::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgPlayerHitAll(msg)) { return requestPunch(pSender, pReceiver); - } + } return false; } -bool ArrowSwitchMulti::requestPunch(HitSensor *pSender, HitSensor *pReceiver) { +bool ArrowSwitchMulti::requestPunch(HitSensor* pSender, HitSensor* pReceiver) { if (getSensor("body") != pReceiver) { return false; } @@ -134,8 +133,7 @@ bool ArrowSwitchMulti::requestPunch(HitSensor *pSender, HitSensor *pReceiver) { if (_B0) { _AC++; _A4 = 6.0f; - } - else { + } else { _AC--; _A4 = -6.0f; } @@ -143,15 +141,14 @@ bool ArrowSwitchMulti::requestPunch(HitSensor *pSender, HitSensor *pReceiver) { _AC = (_AC + 4) % 4; MR::invalidateClipping(this); setNerve(&NrvArrowSwitchMulti::ArrowSwitchMultiNrvRotate::sInstance); - return true; + return true; } void ArrowSwitchMulti::exeWait() { if (MR::isFirstStep(this)) { if (_AC % 2 == 1) { MR::startBtk(this, "On"); - } - else { + } else { MR::startBtk(this, "Off"); } @@ -162,24 +159,22 @@ void ArrowSwitchMulti::exeWait() { // ArrowSwitchMulti::exeRotate ArrowSwitchMulti::~ArrowSwitchMulti() { - } ArrowSwitchTarget::~ArrowSwitchTarget() { - } namespace NrvArrowSwitchMulti { INIT_NERVE(ArrowSwitchMultiNrvWait); INIT_NERVE(ArrowSwitchMultiNrvRotate); - void ArrowSwitchMultiNrvRotate::execute(Spine *pSpine) const { + void ArrowSwitchMultiNrvRotate::execute(Spine* pSpine) const { ArrowSwitchMulti* sw = reinterpret_cast(pSpine->mExecutor); sw->exeRotate(); } - void ArrowSwitchMultiNrvWait::execute(Spine *pSpine) const { + void ArrowSwitchMultiNrvWait::execute(Spine* pSpine) const { ArrowSwitchMulti* sw = reinterpret_cast(pSpine->mExecutor); sw->exeWait(); } -}; \ No newline at end of file +}; // namespace NrvArrowSwitchMulti \ No newline at end of file diff --git a/src/Game/MapObj/ArrowSwitchMultiHolder.cpp b/src/Game/MapObj/ArrowSwitchMultiHolder.cpp index 508796a8d..db90bb316 100644 --- a/src/Game/MapObj/ArrowSwitchMultiHolder.cpp +++ b/src/Game/MapObj/ArrowSwitchMultiHolder.cpp @@ -1,14 +1,14 @@ #include "Game/MapObj/ArrowSwitchMultiHolder.hpp" #include "Game/Scene/SceneObjHolder.hpp" -ArrowSwitchMultiHolder::ArrowSwitchMultiHolder() : DeriveActorGroup("複数方向矢印スイッチ管理", 0x10) { - +ArrowSwitchMultiHolder::ArrowSwitchMultiHolder() + : DeriveActorGroup("複数方向矢印スイッチ管理", 0x10) { } -ArrowSwitchMulti* ArrowSwitchMultiHolder::findSwitch(const JMapIdInfo *pInfo) { +ArrowSwitchMulti* ArrowSwitchMultiHolder::findSwitch(const JMapIdInfo* pInfo) { for (s32 i = 0; i < mObjectCount; i++) { ArrowSwitchMulti* sw = reinterpret_cast(getActor(i)); - JMapIdInfo* inf = sw->mIDInfo; + JMapIdInfo* inf = sw->mIDInfo; bool isSame = false; if (inf->_0 == pInfo->_0 && inf->mZoneID == pInfo->mZoneID) { @@ -28,11 +28,11 @@ namespace MR { MR::createSceneObj(SceneObj_ArrowSwitchMultiHolder); } - void registerArrowSwitchMulti(ArrowSwitchMulti *pSwitch) { + void registerArrowSwitchMulti(ArrowSwitchMulti* pSwitch) { MR::getSceneObj(SceneObj_ArrowSwitchMultiHolder)->registerActor(pSwitch); } - void registerArrowSwitchTarget(ArrowSwitchTarget *pTarget) { + void registerArrowSwitchTarget(ArrowSwitchTarget* pTarget) { MR::getSceneObj(SceneObj_ArrowSwitchMultiHolder)->findSwitch(pTarget->mJMapIDInfo)->registerTarget(pTarget); } -}; \ No newline at end of file +}; // namespace MR \ No newline at end of file diff --git a/src/Game/MapObj/AssemblyBlock.cpp b/src/Game/MapObj/AssemblyBlock.cpp index 25f45a3ad..a20053113 100644 --- a/src/Game/MapObj/AssemblyBlock.cpp +++ b/src/Game/MapObj/AssemblyBlock.cpp @@ -6,7 +6,8 @@ namespace { static const char* sReturnPosName = "合体ブロック故郷点"; }; -AssemblyBlock::AssemblyBlock(const char *pName) : LiveActor(pName) { +AssemblyBlock::AssemblyBlock(const char* pName) + : LiveActor(pName) { _11C = -1; mActivationRange = -1.0f; _124.x = 0.0f; @@ -21,12 +22,12 @@ AssemblyBlock::AssemblyBlock(const char *pName) : LiveActor(pName) { _EC.identity(); } -void AssemblyBlock::init(const JMapInfoIter &rIter) { +void AssemblyBlock::init(const JMapInfoIter& rIter) { TVec3f stack_3C; TVec3f stack_30; TVec3f stack_24; TVec3f stack_18; - char name[0x100]; + char name[0x100]; MR::initDefaultPos(this, rIter); MR::tryRegisterNamePosLinkObj(this, rIter); @@ -44,8 +45,7 @@ void AssemblyBlock::init(const JMapInfoIter &rIter) { if (MR::isEqualString(name, "AssemblyBlockPartsTimerA")) { _13C = true; - } - else { + } else { _13C = false; } @@ -55,8 +55,7 @@ void AssemblyBlock::init(const JMapInfoIter &rIter) { if (MR::isEqualSubString(name, "PartsIce")) { MR::connectToSceneIndirectMapObj(this); - } - else { + } else { MR::connectToSceneMapObj(this); } @@ -83,15 +82,13 @@ void AssemblyBlock::init(const JMapInfoIter &rIter) { MR::getJMapInfoArg7NoInit(rIter, &_11C); if (MR::getRandom((s32)0, (s32)2)) { _130 = 0.0f; - } - else { + } else { _130 = -0.1f; } if (_11C == -1) { initEffectKeeper(0, "AssemblyBlock", false); - } - else { + } else { initEffectKeeper(0, nullptr, false); } @@ -119,8 +116,7 @@ void AssemblyBlock::exeAssemble() { if (_13C) { MR::startSound(this, "SE_OJ_ASSEMBLE_BLOCK_ST_F_", -1, -1); - } - else { + } else { MR::startSound(this, "SE_OJ_ASSEMBLE_BLOCK_START", -1, -1); } @@ -133,8 +129,7 @@ void AssemblyBlock::exeAssemble() { if (MR::isStep(this, 10)) { if (_13C) { MR::startSound(this, "SE_OJ_ASSEMBLE_BLOCK_ED_F", -1, -1); - } - else { + } else { MR::startSound(this, "SE_OJ_ASSEMBLE_BLOCK_END", -1, -1); } @@ -155,8 +150,7 @@ void AssemblyBlock::exeAssembleWait() { if (!_11C) { setNerve(&NrvAssemblyBlock::AssemblyBlockNrvTimer::sInstance); - } - else { + } else { tryStartReturn(); } } @@ -168,8 +162,7 @@ void AssemblyBlock::exeReturn() { if (_13C) { MR::startSound(this, "SE_OJ_ASSEMBLE_BLOCK_RET_F", -1, -1); - } - else { + } else { MR::startSound(this, "SE_OJ_ASSEMBLE_BLOCK_RETURN", -1, -1); } @@ -192,8 +185,7 @@ void AssemblyBlock::exeTimer() { if (MR::isStep(this, mActivationTime)) { if (_13C) { MR::startSound(this, "SE_OJ_ASSEMBLE_BLOCK_VAN_F", -1, -1); - } - else { + } else { MR::startSound(this, "SE_OJ_ASSEMBLE_BLOCK_VANISH", -1, -1); } @@ -242,7 +234,6 @@ bool AssemblyBlock::tryStartReturn() { } AssemblyBlock::~AssemblyBlock() { - } namespace NrvAssemblyBlock { @@ -251,4 +242,4 @@ namespace NrvAssemblyBlock { INIT_NERVE(AssemblyBlockNrvAssembleWait); INIT_NERVE(AssemblyBlockNrvReturn); INIT_NERVE(AssemblyBlockNrvTimer); -}; +}; // namespace NrvAssemblyBlock diff --git a/src/Game/MapObj/AstroCore.cpp b/src/Game/MapObj/AstroCore.cpp index 6ec1ac877..20178d5f9 100644 --- a/src/Game/MapObj/AstroCore.cpp +++ b/src/Game/MapObj/AstroCore.cpp @@ -12,15 +12,14 @@ namespace { 480.0f, 540.0f, 600.0f, - 0.0f - }; + 0.0f}; }; -AstroCore::AstroCore(const char *pName) : MapObjActor(pName) { - +AstroCore::AstroCore(const char* pName) + : MapObjActor(pName) { } -void AstroCore::init(const JMapInfoIter &rIter) { +void AstroCore::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoSimpleMapObj(&info); @@ -35,7 +34,7 @@ void AstroCore::init(const JMapInfoIter &rIter) { info.setupSound(4); info.setupNoAppearRiddleSE(); initialize(rIter, info); - AstroDemoFunction::tryRegisterGrandStarReturnWithFunctionAndSimpleCast(this, rIter, MR::FunctorV0M(this, &AstroCore::startDemo)); + AstroDemoFunction::tryRegisterGrandStarReturnWithFunctionAndSimpleCast(this, rIter, MR::FunctorV0M(this, &AstroCore::startDemo)); } void AstroCore::exeGrow() { @@ -53,7 +52,7 @@ void AstroCore::exeGrow() { } } -bool AstroCore::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool AstroCore::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return false; } @@ -62,8 +61,8 @@ void AstroCore::startDemo() { } void AstroCore::startAnimGrow() { - s32 v3 = MR::clamp(AstroDemoFunction::getOpenedAstroDomeNum() + 1, 0, 6); - s32 v4 = MR::clamp(v3, 0, 6); + s32 v3 = MR::clamp(AstroDemoFunction::getOpenedAstroDomeNum() + 1, 0, 6); + s32 v4 = MR::clamp(v3, 0, 6); char buf[32]; snprintf(buf, sizeof(buf), "Revival%d", v4); MR::startAllAnim(this, buf); @@ -71,8 +70,8 @@ void AstroCore::startAnimGrow() { } void AstroCore::setStateBeforeGrow() { - s32 v3 = MR::clamp(AstroDemoFunction::getOpenedAstroDomeNum(), 0, 6); - s32 v4 = MR::clamp(v3, 0, 6); + s32 v3 = MR::clamp(AstroDemoFunction::getOpenedAstroDomeNum(), 0, 6); + s32 v4 = MR::clamp(v3, 0, 6); char buf[32]; snprintf(buf, sizeof(buf), "Revival%d", v4); MR::startAllAnim(this, buf); @@ -80,7 +79,7 @@ void AstroCore::setStateBeforeGrow() { getSensor(nullptr)->mRadius = sSensorSizeTable[v3]; } -void AstroCore::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void AstroCore::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver)) { MR::sendMsgPush(pReceiver, pSender); } @@ -89,8 +88,7 @@ void AstroCore::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { namespace NrvAstroCore { INIT_NERVE(AstroCoreNrvWait); INIT_NERVE(AstroCoreNrvGrow); -}; +}; // namespace NrvAstroCore AstroCore::~AstroCore() { - } diff --git a/src/Game/MapObj/AstroCountDownPlate.cpp b/src/Game/MapObj/AstroCountDownPlate.cpp index 70d827d17..c274c3204 100644 --- a/src/Game/MapObj/AstroCountDownPlate.cpp +++ b/src/Game/MapObj/AstroCountDownPlate.cpp @@ -7,15 +7,16 @@ namespace { const char* cMaterialName10 = "StarNumber01_v_x(2)"; const char* cLastBattleDemoName = "ロゼッタ最終決戦デモ"; const char* cStartCountDownDemoName = "ロゼッタカウントダウン開始デモ"; -}; +}; // namespace -AstroCountDownPlate::AstroCountDownPlate(const char *pName) : LiveActor(pName) { +AstroCountDownPlate::AstroCountDownPlate(const char* pName) + : LiveActor(pName) { _8C.mInfo = j3dDefaultTexMtxInfo; _120.mInfo = j3dDefaultTexMtxInfo; _1B4 = 0; } -void AstroCountDownPlate::init(const JMapInfoIter &rIter) { +void AstroCountDownPlate::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("AstroCountDownPlate", nullptr, true); initTextureAtNumLeftStar(); @@ -24,14 +25,14 @@ void AstroCountDownPlate::init(const JMapInfoIter &rIter) { initEffectKeeper(0, nullptr, false); initSound(2, false); MR::invalidateClipping(this); - + if (MR::tryRegisterDemoCast(this, cStartCountDownDemoName, rIter)) { - MR::FunctorV0M startDemoFunc = MR::Functor(this, &AstroCountDownPlate::startDemoStartCountDown); + MR::FunctorV0M startDemoFunc = MR::Functor(this, &AstroCountDownPlate::startDemoStartCountDown); MR::tryRegisterDemoActionFunctorDirect(this, startDemoFunc, cStartCountDownDemoName, nullptr); } if (MR::tryRegisterDemoCast(this, cLastBattleDemoName, rIter)) { - MR::FunctorV0M lastBattleFunc = MR::Functor(this, &AstroCountDownPlate::startDemoLastBattle); + MR::FunctorV0M lastBattleFunc = MR::Functor(this, &AstroCountDownPlate::startDemoLastBattle); MR::tryRegisterDemoActionFunctorDirect(this, lastBattleFunc, cLastBattleDemoName, nullptr); } @@ -106,8 +107,7 @@ void AstroCountDownPlate::setNumLeftStar() { void AstroCountDownPlate::selectNrvWait() { if (AstroMapObjFunction::isAlreadyRevival("AstroCountDownPlate", -1)) { setNerve(&NrvAstroCountDownPlate::AstroCountDownPlateNrvAlive::sInstance); - } - else { + } else { setNerve(&NrvAstroCountDownPlate::AstroCountDownPlateNrvDead::sInstance); } @@ -118,14 +118,12 @@ void AstroCountDownPlate::setupStateWait() { if (isNerve(&NrvAstroCountDownPlate::AstroCountDownPlateNrvDead::sInstance)) { MR::hideMaterial(this, cMaterialName01); MR::hideMaterial(this, cMaterialName10); - } - else { + } else { MR::showMaterial(this, cMaterialName01); MR::showMaterial(this, cMaterialName10); if (!MR::isOnGameEventFlagViewNormalEnding()) { MR::startBrk(this, "Red"); - } - else { + } else { MR::startBrk(this, "Green"); } } @@ -144,8 +142,7 @@ namespace NrvAstroCountDownPlate { INIT_NERVE(AstroCountDownPlateNrvAlive); INIT_NERVE(AstroCountDownPlateNrvRevival); INIT_NERVE(AstroCountDownPlateNrvCountToZero); -}; +}; // namespace NrvAstroCountDownPlate AstroCountDownPlate::~AstroCountDownPlate() { - } diff --git a/src/Game/MapObj/AstroDome.cpp b/src/Game/MapObj/AstroDome.cpp index a64f64cd4..280174d42 100644 --- a/src/Game/MapObj/AstroDome.cpp +++ b/src/Game/MapObj/AstroDome.cpp @@ -2,13 +2,13 @@ #include "Game/MapObj/AstroMapObjFunction.hpp" #include "Game/Map/SphereSelector.hpp" -AstroDome::AstroDome(const char *pName) : MapObjActor(pName) { - +AstroDome::AstroDome(const char* pName) + : MapObjActor(pName) { } -void AstroDome::init(const JMapInfoIter &rIter) { +void AstroDome::init(const JMapInfoIter& rIter) { MapObjActorInitInfo info; - s32 domeId = AstroMapObjFunction::getDomeIdFromArg0(rIter); + s32 domeId = AstroMapObjFunction::getDomeIdFromArg0(rIter); info.setupModelName(AstroMapObjFunction::getModelName("AstroDome", domeId)); info.setupNerve(&NrvAstroDome::AstroDomeNrvWait::sInstance); MapObjActorUtil::setupInitInfoSimpleMapObj(&info); @@ -59,19 +59,17 @@ void AstroDome::control() { if (MR::isEqualString(mObjectName, "AstroDomeObservatory")) { if (MR::isTimeKeepDemoActive()) { MR::hideMaterial(this, "Z_SpotLight_v"); - } - else { + } else { MR::showMaterial(this, "Z_SpotLight_v"); } } } -bool AstroDome::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool AstroDome::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (SphereSelectorFunction::isMsgSelectStart(msg)) { setNerve(&NrvAstroDome::AstroDomeNrvDisappear::sInstance); return true; - } - else if (SphereSelectorFunction::isMsgSelectEnd(msg)) { + } else if (SphereSelectorFunction::isMsgSelectEnd(msg)) { appear(); return true; } @@ -80,11 +78,10 @@ bool AstroDome::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceive } AstroDome::~AstroDome() { - } namespace NrvAstroDome { INIT_NERVE(AstroDomeNrvWait); INIT_NERVE(AstroDomeNrvDisappear); INIT_NERVE(AstroDomeNrvAppear); -}; \ No newline at end of file +}; // namespace NrvAstroDome \ No newline at end of file diff --git a/src/Game/MapObj/AstroDomeAsteroid.cpp b/src/Game/MapObj/AstroDomeAsteroid.cpp index b809e0624..c54520261 100644 --- a/src/Game/MapObj/AstroDomeAsteroid.cpp +++ b/src/Game/MapObj/AstroDomeAsteroid.cpp @@ -1,11 +1,12 @@ #include "Game/MapObj/AstroDomeAsteroid.hpp" #include "Game/Map/SphereSelector.hpp" -AstroDomeAsteroid::AstroDomeAsteroid(const char *pName) : LiveActor(pName) { +AstroDomeAsteroid::AstroDomeAsteroid(const char* pName) + : LiveActor(pName) { mRotationMtx.identity(); } -void AstroDomeAsteroid::init(const JMapInfoIter &rIter) { +void AstroDomeAsteroid::init(const JMapInfoIter& rIter) { initModelManagerWithAnm("AstroDomeAsteroid", nullptr, false); MR::connectToSceneMapObj(this); MR::invalidateClipping(this); @@ -35,12 +36,11 @@ void AstroDomeAsteroid::calcAndSetBaseMtx() { MR::setBaseTRMtx(this, other); } -bool AstroDomeAsteroid::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool AstroDomeAsteroid::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return SphereSelectorFunction::trySyncAppearMsgSelectStart(this, msg); } AstroDomeAsteroid::~AstroDomeAsteroid() { - } namespace NrvAstroDomeAsteroid { diff --git a/src/Game/MapObj/AstroDomeBlueStar.cpp b/src/Game/MapObj/AstroDomeBlueStar.cpp index 1038638c6..01d79551e 100644 --- a/src/Game/MapObj/AstroDomeBlueStar.cpp +++ b/src/Game/MapObj/AstroDomeBlueStar.cpp @@ -4,11 +4,12 @@ #include "Game/Util/DemoUtil.hpp" #include "Game/Util/ObjUtil.hpp" -AstroDomeBlueStar::CaptureActor::CaptureActor() : LiveActor("キャプチャ用アクター") { +AstroDomeBlueStar::CaptureActor::CaptureActor() + : LiveActor("キャプチャ用アクター") { _8C.identity(); } -void AstroDomeBlueStar::CaptureActor::init(const JMapInfoIter &rIter) { +void AstroDomeBlueStar::CaptureActor::init(const JMapInfoIter& rIter) { MR::connectToSceneMapObjDecorationMovement(this); initEffectKeeper(0, "GCapture", false); MR::setEffectHostMtx(this, "LightSplash", _8C); @@ -39,11 +40,12 @@ namespace NrvAstroDomeBlueStar { NEW_NERVE(AstroDomeBlueStarNrvGalaxyConfirmStart, AstroDomeBlueStar, GalaxyConfirmStart); NEW_NERVE(AstroDomeBlueStarNrvGalaxyConfirm, AstroDomeBlueStar, GalaxyConfirm); NEW_NERVE(AstroDomeBlueStarNrvGalaxyConfirmCancel, AstroDomeBlueStar, GalaxyConfirmCancel); -}; +}; // namespace NrvAstroDomeBlueStar + +AstroDomeBlueStar::AstroDomeBlueStar(const char* pName) + : LiveActor(pName), mCaptureRibbon(nullptr), _F0(0), mCaptureActor(nullptr), + mZoomPos(gZeroVec) { -AstroDomeBlueStar::AstroDomeBlueStar(const char *pName) : LiveActor(pName), mCaptureRibbon(nullptr), _F0(0), mCaptureActor(nullptr), - mZoomPos(gZeroVec) { - _90.identity(); _C0.identity(); } diff --git a/src/Game/MapObj/AstroDomeCameraController.cpp b/src/Game/MapObj/AstroDomeCameraController.cpp index 246b2e22e..59077a30f 100644 --- a/src/Game/MapObj/AstroDomeCameraController.cpp +++ b/src/Game/MapObj/AstroDomeCameraController.cpp @@ -20,7 +20,7 @@ namespace { Vec cDefaultUp; Vec cZoomInPos; Vec cZoomOutPos; -} +} // namespace namespace NrvAstroDomeCameraController { NEW_NERVE(AstroDomeCameraControllerNrvGalaxySelectStart, AstroDomeCameraController, GalaxySelectStart); @@ -28,10 +28,10 @@ namespace NrvAstroDomeCameraController { NEW_NERVE(AstroDomeCameraControllerNrvGalaxyConfirmStart, AstroDomeCameraController, GalaxyConfirmStart); NEW_NERVE(AstroDomeCameraControllerNrvGalaxyConfirm, AstroDomeCameraController, GalaxyConfirm); NEW_NERVE(AstroDomeCameraControllerNrvGalaxyConfirmCancel, AstroDomeCameraController, GalaxyConfirmCancel); -} - -AstroDomeCameraController::AstroDomeCameraController(const char* pName) : LiveActor(pName), _8C(gZeroVec), _104(0.0f) ,_108(gZeroVec) {} +} // namespace NrvAstroDomeCameraController +AstroDomeCameraController::AstroDomeCameraController(const char* pName) + : LiveActor(pName), _8C(gZeroVec), _104(0.0f), _108(gZeroVec) {} void AstroDomeCameraController::init(const JMapInfoIter& rIter) { MR::connectToSceneMapObjMovement(this); @@ -83,17 +83,17 @@ bool AstroDomeCameraController::receiveOtherMsg(u32 v1, HitSensor* pSender, HitS } void AstroDomeCameraController::calcZoomOutPos(TVec3f* v1) const { - SphereSelectorFunction::calcOffsetPos(v1, gZeroVec, TVec3f(0.0f,0.0f, -22000.0f), _8C.negateInline(), TVec3f(0.0f, 1.0f, 0.0f)); + SphereSelectorFunction::calcOffsetPos(v1, gZeroVec, TVec3f(0.0f, 0.0f, -22000.0f), _8C.negateInline(), TVec3f(0.0f, 1.0f, 0.0f)); } -void AstroDomeCameraController::calcZoomInPos(TVec3f* v1, const TVec3f & v2) const { +void AstroDomeCameraController::calcZoomInPos(TVec3f* v1, const TVec3f& v2) const { TVec3f zoomOutPos; calcZoomOutPos(&zoomOutPos); SphereSelectorFunction::calcOffsetPos(v1, SphereSelectorFunction::getSelectedActorTrans(), cZoomInPos, SphereSelectorFunction::getSelectedActorTrans() - zoomOutPos, v2); } void AstroDomeCameraController::exeGalaxySelectStart() { - s32 STF = SphereSelectorFunction::getSelectStartFrame(); + s32 STF = SphereSelectorFunction::getSelectStartFrame(); TVec3f stack; if (MR::isFirstStep(this)) { calcZoomOutPos(&stack); diff --git a/src/Game/MapObj/AstroDomeComet.cpp b/src/Game/MapObj/AstroDomeComet.cpp index 3cdb7eb8c..a2a3ec9ec 100644 --- a/src/Game/MapObj/AstroDomeComet.cpp +++ b/src/Game/MapObj/AstroDomeComet.cpp @@ -9,22 +9,22 @@ namespace { static const char* cCometBrkName[5] = { - "Red", "Blue", "White", "Yellow", "Purple" - }; + "Red", "Blue", "White", "Yellow", "Purple"}; }; namespace NrvAstroDomeComet { NEW_NERVE(AstroDomeCometNrvSelect, AstroDomeComet, Select); NEW_NERVE(AstroDomeCometNrvConfirm, AstroDomeComet, Confirm); -}; +}; // namespace NrvAstroDomeComet -AstroDomeComet::AstroDomeComet(const char *pName) : LiveActor(pName) { +AstroDomeComet::AstroDomeComet(const char* pName) + : LiveActor(pName) { mBloomModel = nullptr; mMiniGalaxy = nullptr; mPointingActors = nullptr; } -void AstroDomeComet::init(const JMapInfoIter &rIter) { +void AstroDomeComet::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("AstroDomeComet", nullptr, false); initSubModel(); @@ -95,7 +95,7 @@ void AstroDomeComet::calcAndSetBaseMtx() { LiveActor::calcAndSetBaseMtx(); } -bool AstroDomeComet::receiveOtherMsg(u32 msg, HitSensor *, HitSensor *) { +bool AstroDomeComet::receiveOtherMsg(u32 msg, HitSensor*, HitSensor*) { if (SphereSelectorFunction::trySyncAppearMsgSelectStart(this, msg)) { return true; } @@ -105,8 +105,7 @@ bool AstroDomeComet::receiveOtherMsg(u32 msg, HitSensor *, HitSensor *) { setNerve(&NrvAstroDomeComet::AstroDomeCometNrvConfirm::sInstance); return true; } - } - else if (SphereSelectorFunction::isMsgConfirmCancel(msg)) { + } else if (SphereSelectorFunction::isMsgConfirmCancel(msg)) { setNerve(&NrvAstroDomeComet::AstroDomeCometNrvSelect::sInstance); return true; } @@ -149,5 +148,4 @@ void AstroDomeComet::exeConfirm() { } AstroDomeComet::~AstroDomeComet() { - } diff --git a/src/Game/MapObj/AstroDomeDemoAstroGalaxy.cpp b/src/Game/MapObj/AstroDomeDemoAstroGalaxy.cpp index 2c79a63d9..9e7f0239a 100644 --- a/src/Game/MapObj/AstroDomeDemoAstroGalaxy.cpp +++ b/src/Game/MapObj/AstroDomeDemoAstroGalaxy.cpp @@ -1,10 +1,10 @@ #include "Game/MapObj/AstroDomeDemoAstroGalaxy.hpp" -AstroDomeDemoAstroGalaxy::AstroDomeDemoAstroGalaxy(const char *pName) : MapObjActor(pName) { - +AstroDomeDemoAstroGalaxy::AstroDomeDemoAstroGalaxy(const char* pName) + : MapObjActor(pName) { } -void AstroDomeDemoAstroGalaxy::init(const JMapInfoIter &rIter) { +void AstroDomeDemoAstroGalaxy::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoSimpleMapObj(&info); @@ -12,14 +12,12 @@ void AstroDomeDemoAstroGalaxy::init(const JMapInfoIter &rIter) { initialize(rIter, info); f32 color; - + if (MR::hasGrandStar(5)) { color = 2.0f; - } - else if (MR::hasGrandStar(3)) { + } else if (MR::hasGrandStar(3)) { color = 1.0f; - } - else { + } else { color = 0.0f; } @@ -27,5 +25,4 @@ void AstroDomeDemoAstroGalaxy::init(const JMapInfoIter &rIter) { } AstroDomeDemoAstroGalaxy::~AstroDomeDemoAstroGalaxy() { - } diff --git a/src/Game/MapObj/AstroDomeGalaxySelector.cpp b/src/Game/MapObj/AstroDomeGalaxySelector.cpp index cda03d59d..956151752 100644 --- a/src/Game/MapObj/AstroDomeGalaxySelector.cpp +++ b/src/Game/MapObj/AstroDomeGalaxySelector.cpp @@ -32,14 +32,15 @@ namespace NrvAstroDomeGalaxySelector { NEW_NERVE(AstroDomeGalaxySelectorNrvDemoDomeLecture, AstroDomeGalaxySelector, DemoDomeLecture); NEW_NERVE(AstroDomeGalaxySelectorNrvGalaxyMoveLecture, AstroDomeGalaxySelector, GalaxyMoveLecture); NEW_NERVE(AstroDomeGalaxySelectorNrvWaitStartDemo, AstroDomeGalaxySelector, WaitStartDemo); -} +} // namespace NrvAstroDomeGalaxySelector namespace { const char* cDemoNameDomeLecture = "ドームレクチャー２"; const char* cDemoNameJumpOut = "マリオ飛び出し"; -} +} // namespace -AstroDomeGalaxySelector::AstroDomeGalaxySelector(const char* pName) : LiveActor(pName) { +AstroDomeGalaxySelector::AstroDomeGalaxySelector(const char* pName) + : LiveActor(pName) { pDomeCamCtrl = 0; pGSBackButton = 0; pGSInfo = 0; @@ -119,8 +120,7 @@ bool AstroDomeGalaxySelector::tryStartLectureDemo(const Nerve* pNerve) { MR::requestStartTimeKeepDemoWithoutCinemaFrame(this, cDemoNameDomeLecture, pNerve, &NrvAstroDomeGalaxySelector::AstroDomeGalaxySelectorNrvWaitStartDemo::sInstance, 0); return true; } - } - else if (isNerve(&NrvAstroDomeGalaxySelector::AstroDomeGalaxySelectorNrvGalaxyConfirmStart::sInstance)) { + } else if (isNerve(&NrvAstroDomeGalaxySelector::AstroDomeGalaxySelectorNrvGalaxyConfirmStart::sInstance)) { if (!MR::isOnGameEventFlagEndButlerGalaxyMoveLecture()) { MR::requestStartTimeKeepDemoWithoutCinemaFrame(this, cDemoNameDomeLecture, pNerve, &NrvAstroDomeGalaxySelector::AstroDomeGalaxySelectorNrvWaitStartDemo::sInstance, 0); return true; @@ -143,17 +143,15 @@ void AstroDomeGalaxySelector::exeGalaxySelect() { pGSBackButton->appear(); } if (SphereSelectorFunction::isValidPointing() && MR::testCorePadTriggerB(WPAD_CHAN0)) { - MR::startSystemSE("SE_SY_GALAXY_DECIDE_CANCEL", -1, -1); - if (pGSBackButton->isAppearing()) { - pGSBackButton->kill(); - } - else { - pGSBackButton->disappear(); - } + MR::startSystemSE("SE_SY_GALAXY_DECIDE_CANCEL", -1, -1); + if (pGSBackButton->isAppearing()) { + pGSBackButton->kill(); + } else { + pGSBackButton->disappear(); + } SphereSelectorFunction::selectCancel(false); setNerve(&NrvAstroDomeGalaxySelector::AstroDomeGalaxySelectorNrvGalaxySelectCancel::sInstance); - } - else { + } else { if (!MR::isOnGameEventFlagOffAstroDomeGuidance()) { MR::requestPointerGuidanceNoInformation(); } @@ -163,8 +161,7 @@ void AstroDomeGalaxySelector::exeGalaxySelect() { MR::startSystemSE("SE_SY_BUTTON_CURSOR_ON", -1, -1); } _9C = true; - } - else { + } else { _9C = false; } if (SphereSelectorFunction::isPointingTarget(this)) { @@ -203,7 +200,7 @@ void AstroDomeGalaxySelector::exeGalaxyConfirm() { if (pGConfirmLayout->isSelectedYes()) { SphereSelectorFunction::confirmed(); MR::requestStartTimeKeepDemoMarioPuppetable(this, cDemoNameJumpOut, &NrvAstroDomeGalaxySelector::AstroDomeGalaxySelectorNrvDemoJumpOut::sInstance, - &NrvAstroDomeGalaxySelector::AstroDomeGalaxySelectorNrvWaitStartDemo::sInstance, 0); + &NrvAstroDomeGalaxySelector::AstroDomeGalaxySelectorNrvWaitStartDemo::sInstance, 0); } else { SphereSelectorFunction::confirmCancel(false); setNerve(&NrvAstroDomeGalaxySelector::AstroDomeGalaxySelectorNrvGalaxyConfirmCancel::sInstance); diff --git a/src/Game/MapObj/AstroDomeOrbit.cpp b/src/Game/MapObj/AstroDomeOrbit.cpp index 26be3df3f..9ad1a7b16 100644 --- a/src/Game/MapObj/AstroDomeOrbit.cpp +++ b/src/Game/MapObj/AstroDomeOrbit.cpp @@ -10,27 +10,25 @@ namespace { static f32 cRotateOutermost[3] = { - 20.0f, 45.0f, 0.0f - }; + 20.0f, 45.0f, 0.0f}; static f32 cRadius[5] = { - 4000.0f, 6200.0f, 8100.0f, 10300.0f, 12000.0f - }; + 4000.0f, 6200.0f, 8100.0f, 10300.0f, 12000.0f}; static f32 cRadiusLastDome[4] = { - 4000.0f, 6700.0f, 9100.0f, 11800.0f - }; + 4000.0f, 6700.0f, 9100.0f, 11800.0f}; static Color8 cColor(0x13, 0xB1, 0xFF, 0xFF); static Color8 cBloomColor(0, 0xB4, 0x64, 0xFF); -}; +}; // namespace -AstroDomeOrbit::AstroDomeOrbit() : LiveActor("天文ドームの軌道") { +AstroDomeOrbit::AstroDomeOrbit() + : LiveActor("天文ドームの軌道") { _8C = 5000.0f; _90 = 0.0f; } -void AstroDomeOrbit::init(const JMapInfoIter &rIter) { +void AstroDomeOrbit::init(const JMapInfoIter& rIter) { MR::connectToScene(this, -1, -1, -1, 0x1F); MR::invalidateClipping(this); MR::createAdaptorAndConnectToDrawBloomModel("天文ドーム軌道ブルーム描画", MR::Functor_Inline(this, &AstroDomeOrbit::drawBloom)); @@ -58,7 +56,7 @@ void AstroDomeOrbit::drawBloom() const { } void AstroDomeOrbit::setup(s32 radiusIdx) { - s32 miniNum = MiniatureGalaxyFunction::getMiniatureGalaxyNum(); + s32 miniNum = MiniatureGalaxyFunction::getMiniatureGalaxyNum(); f32* domes = cRadiusLastDome; if (radiusIdx == 5) { @@ -73,7 +71,7 @@ void AstroDomeOrbit::setup(s32 radiusIdx) { f32 z = cRotateOutermost[0]; f32 y = cRotateOutermost[1]; f32 x = cRotateOutermost[2]; - + mRotation.set(z, y, x); } } @@ -82,7 +80,7 @@ void AstroDomeOrbit::moveCoord() { _90 = calcRepeatedRotateCoord(-0.050000001f + _90); } -void AstroDomeOrbit::calcGalaxyPos(TVec3f *pPos) const { +void AstroDomeOrbit::calcGalaxyPos(TVec3f* pPos) const { f32 v4 = ((6.2831855f * calcRepeatedRotateCoord(_90) / 360.0f)); f32 v5 = MR::sin(v4); f32 v6 = MR::cos(v4); @@ -96,7 +94,7 @@ void AstroDomeOrbit::calcGalaxyPos(TVec3f *pPos) const { rotateMtx.mult(*pPos, *pPos); } -void AstroDomeOrbit::initDraw(const Color8 &rColor) const { +void AstroDomeOrbit::initDraw(const Color8& rColor) const { GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); GXClearVtxDesc(); GXSetVtxDesc(GX_VA_POS, GX_DIRECT); @@ -125,8 +123,7 @@ void AstroDomeOrbit::drawCelling(f32 a2, bool a3, f32 a4) const { if (a3) { v16.y += (0.5f * a4); - } - else { + } else { v16.y -= (0.5f * a4); } @@ -149,8 +146,7 @@ void AstroDomeOrbit::drawCelling(f32 a2, bool a3, f32 a4) const { if (a3) { GXPosition3f32(v14.x, v14.y, v14.z); GXPosition3f32(v13.x, v13.y, v13.z); - } - else { + } else { GXPosition3f32(v13.x, v13.y, v13.z); GXPosition3f32(v14.x, v14.y, v14.z); } @@ -165,17 +161,16 @@ void AstroDomeOrbit::drawSide(f32 a2, bool a3, f32 a4) const { f32 v9; if (a3) { v9 = _8C + (0.5f * a2); - } - else { + } else { v9 = _8C - (0.5f * a2); } GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, 0x82); for (s32 i = 0; i < 65; i++) { - f32 v11 = 6.2831855f * (i * 0.015625f); - f32 v12 = MR::sin(v11); - f32 v13 = MR::cos(v11); + f32 v11 = 6.2831855f * (i * 0.015625f); + f32 v12 = MR::sin(v11); + f32 v13 = MR::cos(v11); TVec3f v17; v17.set(v13, 0.0f, v12); TVec3f v16; @@ -190,8 +185,7 @@ void AstroDomeOrbit::drawSide(f32 a2, bool a3, f32 a4) const { if (a3) { GXPosition3f32(v16.x, v16.y, v16.z); GXPosition3f32(v15.x, v15.y, v15.z); - } - else { + } else { GXPosition3f32(v15.x, v14, v15.z); GXPosition3f32(v16.x, v16.y, v16.z); } @@ -203,5 +197,4 @@ f32 AstroDomeOrbit::calcRepeatedRotateCoord(f32 coord) const { } AstroDomeOrbit::~AstroDomeOrbit() { - } diff --git a/src/Game/MapObj/AstroMapBoard.cpp b/src/Game/MapObj/AstroMapBoard.cpp index bc3d9698a..7cf4a543b 100644 --- a/src/Game/MapObj/AstroMapBoard.cpp +++ b/src/Game/MapObj/AstroMapBoard.cpp @@ -10,11 +10,11 @@ namespace NrvAstroMapBoard { NERVE_DECL_NULL(AstroMapBoardNrvWait); }; -AstroMapBoard::AstroMapBoard(const char *pName) : MapObjActor(pName) { - +AstroMapBoard::AstroMapBoard(const char* pName) + : MapObjActor(pName) { } -void AstroMapBoard::init(const JMapInfoIter &rIter) { +void AstroMapBoard::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoSimpleMapObj(&info); @@ -29,13 +29,12 @@ void AstroMapBoard::init(const JMapInfoIter &rIter) { if (MR::isButlerMapAppear()) { makeActorAppeared(); - } - else { + } else { makeActorDead(); } } -void AstroMapBoard::connectToScene(const MapObjActorInitInfo &rInfo) { +void AstroMapBoard::connectToScene(const MapObjActorInitInfo& rInfo) { MR::connectToSceneIndirectMapObj(this); } @@ -46,7 +45,6 @@ void AstroMapBoard::initAfterPlacement() { } AstroMapBoard::~AstroMapBoard() { - } namespace NrvAstroMapBoard { diff --git a/src/Game/MapObj/AstroMapObj.cpp b/src/Game/MapObj/AstroMapObj.cpp index b04852fb7..8e733a237 100644 --- a/src/Game/MapObj/AstroMapObj.cpp +++ b/src/Game/MapObj/AstroMapObj.cpp @@ -21,13 +21,14 @@ namespace NrvAstroMapObj { NEW_NERVE(AstroMapObjNrvAliveAfterDemo, AstroMapObj, Wait); NEW_NERVE(AstroMapObjNrvRevival, AstroMapObj, Revival); NEW_NERVE(AstroMapObjNrvOpen, AstroMapObj, Open); -} +} // namespace NrvAstroMapObj namespace { s32 sAstroPathAppearStep = 90; } -AstroMapObj::AstroMapObj(const char* pName) : MapObjActor(pName) { +AstroMapObj::AstroMapObj(const char* pName) + : MapObjActor(pName) { _C4 = 0; _C8 = 0; _CC = 0; @@ -36,7 +37,7 @@ AstroMapObj::AstroMapObj(const char* pName) : MapObjActor(pName) { _D8 = -1; } -void AstroMapObj::init(const JMapInfoIter& rIter) { // Pain +void AstroMapObj::init(const JMapInfoIter& rIter) { // Pain MR::getObjectName(&_CC, rIter); MapObjActorInitInfo mapObjInitInfo = MapObjActorInitInfo(); _D8 = AstroMapObjFunction::getDomeIdFromArg0(rIter); @@ -114,14 +115,13 @@ void AstroMapObj::setStateDoorOpenOrClose() { MR::setAllAnimFrameAtEnd(this, "Open"); MR::validateCollisionParts(_D4); MR::invalidateCollisionParts(_D0); - } - else { + } else { if (!LiveActor::isNerve(&NrvAstroMapObj::AstroMapObjNrvDead::sInstance)) { MR::tryStartAllAnim(this, "Open"); MR::setAllAnimFrameAndStop(this, "Open", 0.0f); } - MR::invalidateCollisionParts(_D4); - MR::validateCollisionParts(_D0); + MR::invalidateCollisionParts(_D4); + MR::validateCollisionParts(_D0); } } } @@ -130,8 +130,7 @@ void AstroMapObj::setStateDoorOpenOrClose() { void AstroMapObj::selectNrvWait() { if (AstroMapObjFunction::isAlreadyRevival(_CC, _D8)) { setNerve(&NrvAstroMapObj::AstroMapObjNrvAlive::sInstance); - } - else { + } else { setNerve(&NrvAstroMapObj::AstroMapObjNrvDead::sInstance); } } @@ -140,16 +139,14 @@ void AstroMapObj::exeWait() { if (MR::isFirstStep(this)) { if (LiveActor::isNerve(&NrvAstroMapObj::AstroMapObjNrvDead::sInstance)) { setStateDead(); - } - else if (LiveActor::isNerve(&NrvAstroMapObj::AstroMapObjNrvAlive::sInstance)) { + } else if (LiveActor::isNerve(&NrvAstroMapObj::AstroMapObjNrvAlive::sInstance)) { setStateAlive(); } } if (AstroMapObj::isPlayMachineSE() && (isNerve(&NrvAstroMapObj::AstroMapObjNrvAlive::sInstance) || isNerve(&NrvAstroMapObj::AstroMapObjNrvAliveAfterDemo::sInstance))) { if (MR::isEqualString(_CC, "AstroRotateStepA")) { MR::startLevelSound(this, "SE_OJ_LV_ASTRO_ENGINE_1", -1, -1, -1); - } - else if (MR::isEqualString(_CC, "AstroRotateStepB")) { + } else if (MR::isEqualString(_CC, "AstroRotateStepB")) { MR::startLevelSound(this, "SE_OJ_LV_ASTRO_ENGINE_2", -1, -1, -1); } } @@ -174,21 +171,17 @@ void AstroMapObj::exeRevival() { tryStartAllAnimAndEffect("Revival"); if (MR::isEqualString(_CC, "AstroStarPlate")) { MR::startSound(this, "SE_OJ_ASTRO_PLATE_REVIVAL", -1, -1); - } - else if (MR::isEqualString(mObjectName, "AstroRotateStepA")) { + } else if (MR::isEqualString(mObjectName, "AstroRotateStepA")) { MR::startSound(this, "SE_OJ_ASTRO_STEP_REVIVAL", -1, -1); - } - else if (MR::isEqualString(mObjectName, "AstroRotateStepB")) { + } else if (MR::isEqualString(mObjectName, "AstroRotateStepB")) { MR::startSound(this, "SE_OJ_ASTRO_STEP_REVIVAL", -1, -1); } } if (MR::isEqualString(_CC, "AstroRotateStepA")) { MR::startLevelSound(this, "SE_OJ_LV_ASTRO_ENGINE_1", -1, -1, -1); - } - else if (MR::isEqualString(_CC, "AstroRotateStepB")) { + } else if (MR::isEqualString(_CC, "AstroRotateStepB")) { MR::startLevelSound(this, "SE_OJ_LV_ASTRO_ENGINE_2", -1, -1, -1); - } - else if (MR::isEqualString(_CC, "AstroStarPlate") && MR::isGreaterStep(this, sAstroPathAppearStep)) { + } else if (MR::isEqualString(_CC, "AstroStarPlate") && MR::isGreaterStep(this, sAstroPathAppearStep)) { MR::startAtmosphereLevelSE("SE_AT_LV_ASTRO_PATH_APPEAR", -1, -1); } if (AstroMapObj::isEndRevival()) { @@ -205,8 +198,7 @@ void AstroMapObj::startDemo() { if (AstroMapObjFunction::isEnableRevival(_CC, _D8)) { setNerve(&NrvAstroMapObj::AstroMapObjNrvRevival::sInstance); } - } - else if (AstroMapObjFunction::isEnableOpen(_CC, _D8)) { + } else if (AstroMapObjFunction::isEnableOpen(_CC, _D8)) { setNerve(&NrvAstroMapObj::AstroMapObjNrvOpen::sInstance); } } @@ -249,7 +241,8 @@ void AstroMapObj::initCaseUseSwitchB(const MapObjActorInitInfo&) {} void AstroMapObj::initCaseNoUseSwitchA(const MapObjActorInitInfo&) {} void AstroMapObj::initCaseUseSwitchA(const MapObjActorInitInfo&) {} -AstroSimpleObj::AstroSimpleObj(const char* pName) : SimpleMapObjFarMax(pName) { +AstroSimpleObj::AstroSimpleObj(const char* pName) + : SimpleMapObjFarMax(pName) { _C4 = 0; _C8 = 0; } @@ -269,5 +262,4 @@ void AstroSimpleObj::control() { } AstroSimpleObj::~AstroSimpleObj() { - } diff --git a/src/Game/MapObj/AstroMapObjFunction.cpp b/src/Game/MapObj/AstroMapObjFunction.cpp index 9b77b4bff..5a3a64965 100644 --- a/src/Game/MapObj/AstroMapObjFunction.cpp +++ b/src/Game/MapObj/AstroMapObjFunction.cpp @@ -7,57 +7,57 @@ #include namespace { - s32 getNumGrandStarForRevival(const char *pName, s32 domeId) { + s32 getNumGrandStarForRevival(const char* pName, s32 domeId) { const char* modelName = AstroMapObjFunction::getModelName(pName, domeId); - if ( MR::isEqualString(modelName, "AstroDomeEntranceObservatory") ) + if (MR::isEqualString(modelName, "AstroDomeEntranceObservatory")) return 1; - if ( MR::isEqualString(modelName, "AstroDomeEntranceWell") ) + if (MR::isEqualString(modelName, "AstroDomeEntranceWell")) return 1; - if ( MR::isEqualString(modelName, "AstroBaseA") ) + if (MR::isEqualString(modelName, "AstroBaseA")) return 1; - if ( MR::isEqualString(modelName, "AstroBaseCenterB") ) + if (MR::isEqualString(modelName, "AstroBaseCenterB")) return 1; - if ( MR::isEqualString(modelName, "AstroRotateStepA") ) + if (MR::isEqualString(modelName, "AstroRotateStepA")) return 1; - if ( MR::isEqualString(modelName, "AstroDecoratePartsA") ) + if (MR::isEqualString(modelName, "AstroDecoratePartsA")) return 1; - if ( MR::isEqualString(modelName, "AstroDecoratePartsGearA") ) + if (MR::isEqualString(modelName, "AstroDecoratePartsGearA")) return 1; - if ( MR::isEqualString(modelName, "AstroParking") ) + if (MR::isEqualString(modelName, "AstroParking")) return 1; - if ( MR::isEqualString(modelName, "AstroDomeEntranceKitchen") ) + if (MR::isEqualString(modelName, "AstroDomeEntranceKitchen")) return 3; - if ( MR::isEqualString(modelName, "AstroDomeEntranceBedRoom") ) + if (MR::isEqualString(modelName, "AstroDomeEntranceBedRoom")) return 3; - if ( MR::isEqualString(modelName, "AstroBaseB") ) + if (MR::isEqualString(modelName, "AstroBaseB")) return 3; - if ( MR::isEqualString(modelName, "AstroBaseKitchen") ) + if (MR::isEqualString(modelName, "AstroBaseKitchen")) return 3; - if ( MR::isEqualString(modelName, "AstroLibrary") ) + if (MR::isEqualString(modelName, "AstroLibrary")) return 3; - if ( MR::isEqualString(modelName, "AstroCountDownPlate") ) + if (MR::isEqualString(modelName, "AstroCountDownPlate")) return 5; - if ( MR::isEqualString(modelName, "AstroDomeEntranceMachine") ) + if (MR::isEqualString(modelName, "AstroDomeEntranceMachine")) return 5; - if ( MR::isEqualString(modelName, "AstroDomeEntranceTower") ) + if (MR::isEqualString(modelName, "AstroDomeEntranceTower")) return 5; - if ( MR::isEqualString(modelName, "AstroBaseC") ) + if (MR::isEqualString(modelName, "AstroBaseC")) return 5; - if ( MR::isEqualString(modelName, "AstroBaseCenterA") ) + if (MR::isEqualString(modelName, "AstroBaseCenterA")) return 5; - if ( MR::isEqualString(modelName, "AstroBaseCenterTop") ) + if (MR::isEqualString(modelName, "AstroBaseCenterTop")) return 5; - if ( MR::isEqualString(modelName, "AstroRotateStepB") ) + if (MR::isEqualString(modelName, "AstroRotateStepB")) return 5; s32 res = -1; - if ( domeId != -1 ) + if (domeId != -1) res = domeId; return res; } - - s32 getNumGrandStarForOpen(const char *pName, s32 domeId) { + + s32 getNumGrandStarForOpen(const char* pName, s32 domeId) { s32 num = -1; if (domeId != -1) { @@ -66,12 +66,12 @@ namespace { return num; } -}; +}; // namespace -void AstroMapObjFunction::makeArchiveListFromArg0(NameObjArchiveListCollector *pList, const JMapInfoIter &rIter) { +void AstroMapObjFunction::makeArchiveListFromArg0(NameObjArchiveListCollector* pList, const JMapInfoIter& rIter) { s32 domeId = -1; MR::getJMapInfoArg0NoInit(rIter, &domeId); - s32 domeIdx = domeId; + s32 domeIdx = domeId; const char* objName; MR::getObjectName(&objName, rIter); const char* modelName = AstroMapObjFunction::getModelName(objName, domeIdx); @@ -83,12 +83,12 @@ void AstroMapObjFunction::makeArchiveListFromArg0(NameObjArchiveListCollector *p } } -void AstroMapObjFunction::makeArchiveListAstroNamePlate(NameObjArchiveListCollector *pList, const JMapInfoIter &rIter) { +void AstroMapObjFunction::makeArchiveListAstroNamePlate(NameObjArchiveListCollector* pList, const JMapInfoIter& rIter) { pList->addArchive("GalaxyNamePlate"); pList->addArchive(cAstroNamePlateArcName); } -bool AstroMapObjFunction::isAlreadyRevival(const char *pName, s32 domeId) { +bool AstroMapObjFunction::isAlreadyRevival(const char* pName, s32 domeId) { if (MR::isEqualString(pName, "AstroChildRoom")) { return MR::isOnGameEventFlagChildsRoom(); } @@ -101,7 +101,7 @@ bool AstroMapObjFunction::isAlreadyRevival(const char *pName, s32 domeId) { return openNum >= ::getNumGrandStarForRevival(pName, domeId); } -bool AstroMapObjFunction::isEnableRevival(const char *pName, s32 domeId) { +bool AstroMapObjFunction::isEnableRevival(const char* pName, s32 domeId) { if (MR::isEqualString(pName, "AstroChildRoom")) { return true; } @@ -110,7 +110,7 @@ bool AstroMapObjFunction::isEnableRevival(const char *pName, s32 domeId) { return ::getNumGrandStarForRevival(pName, domeId) == openNum + 1; } -bool AstroMapObjFunction::isAlreadyOpen(const char *pName, s32 domeId) { +bool AstroMapObjFunction::isAlreadyOpen(const char* pName, s32 domeId) { if (MR::isEqualString(pName, "AstroLibrary")) { return MR::isOnGameEventFlagLibraryRoom(); } @@ -120,37 +120,33 @@ bool AstroMapObjFunction::isAlreadyOpen(const char *pName, s32 domeId) { return openNum >= ::getNumGrandStarForOpen(pName, domeId); } -bool AstroMapObjFunction::isEnableOpen(const char *pName, s32 domeId) { +bool AstroMapObjFunction::isEnableOpen(const char* pName, s32 domeId) { s32 openNum = AstroDemoFunction::getOpenedAstroDomeNum(); return ::getNumGrandStarForOpen(pName, domeId) == openNum + 1; } -s32 AstroMapObjFunction::getDomeIdFromArg0(const JMapInfoIter &rIter) { +s32 AstroMapObjFunction::getDomeIdFromArg0(const JMapInfoIter& rIter) { s32 domeId = -1; MR::getJMapInfoArg0NoInit(rIter, &domeId); return domeId; } -const char* AstroMapObjFunction::getModelName(const char *pName, s32 domeIdx) { +const char* AstroMapObjFunction::getModelName(const char* pName, s32 domeIdx) { const char** tbl = nullptr; if (MR::isEqualString(pName, "AstroDome")) { tbl = cAstroDomeNameTable; - } - else if (MR::isEqualString(pName, "AstroDomeSky")) { + } else if (MR::isEqualString(pName, "AstroDomeSky")) { tbl = cAstroDomeSkyNameTable; - } - else if (MR::isEqualString(pName, "AstroDomeEntrance")) { + } else if (MR::isEqualString(pName, "AstroDomeEntrance")) { tbl = cAstroDomeEntranceNameTable; - } - else if (MR::isEqualString(pName, "AstroStarPlate")) { + } else if (MR::isEqualString(pName, "AstroStarPlate")) { tbl = cAstroStarPlateNameTable; } if (tbl != nullptr) { return tbl[domeIdx - 1]; - } - else { + } else { return pName; } } diff --git a/src/Game/MapObj/AstroOverlookObj.cpp b/src/Game/MapObj/AstroOverlookObj.cpp index e1ca62453..2a8c538b4 100644 --- a/src/Game/MapObj/AstroOverlookObj.cpp +++ b/src/Game/MapObj/AstroOverlookObj.cpp @@ -1,6 +1,7 @@ #include "Game/MapObj/AstroOverlookObj.hpp" -AstroOverlookObj::AstroOverlookObj(const char *pName) : LiveActor(pName) { +AstroOverlookObj::AstroOverlookObj(const char* pName) + : LiveActor(pName) { _8C = 0; MR::connectToSceneMapObjMovement(this); MR::invalidateClipping(this); @@ -11,8 +12,7 @@ void AstroOverlookObj::control() { if (MR::getCurrentAstroOverlookAreaObj()) { MR::deactivateDefaultGameLayout(); _8C = 1; - } - else { + } else { if (_8C == 1) { MR::activateDefaultGameLayout(); _8C = 0; @@ -21,5 +21,4 @@ void AstroOverlookObj::control() { } AstroOverlookObj::~AstroOverlookObj() { - } \ No newline at end of file diff --git a/src/Game/MapObj/BallOpener.cpp b/src/Game/MapObj/BallOpener.cpp index c2c8748e6..8479f5ee6 100644 --- a/src/Game/MapObj/BallOpener.cpp +++ b/src/Game/MapObj/BallOpener.cpp @@ -3,10 +3,10 @@ #include "Game/Util/GeometryBindUtil.hpp" BallOpener::~BallOpener() { - } -BallOpener::BallOpener(const char *pName) : LiveActor(pName) { +BallOpener::BallOpener(const char* pName) + : LiveActor(pName) { mSensor = nullptr; _A0.set(0, 0, 0); _AC.set(0, 0, 0); @@ -15,7 +15,7 @@ BallOpener::BallOpener(const char *pName) : LiveActor(pName) { _8C = new BindCone(mPosition, TVec3f(0.0f, 1.0f, 0.0f), 400.0f, 200.0f); } -void BallOpener::init(const JMapInfoIter &rIter) { +void BallOpener::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("BallOpener", nullptr, false); MR::connectToSceneMapObj(this); @@ -37,7 +37,6 @@ void BallOpener::initAfterPlacement() { } void BallOpener::control() { - } // BallOpener::receiveOtherMsg @@ -63,9 +62,8 @@ void BallOpener::exeSetCenter() { if (_B8.squared() < 0.000099999997f) { _C4++; - } - else { - _C4 = 0; + } else { + _C4 = 0; } if (_C4 == 1) { @@ -104,4 +102,4 @@ namespace NrvBallOpener { INIT_NERVE(BallOpenerNrvWait); INIT_NERVE(BallOpenerNrvSetCenter); INIT_NERVE(BallOpenerNrvOpen); -}; \ No newline at end of file +}; // namespace NrvBallOpener \ No newline at end of file diff --git a/src/Game/MapObj/BallRail.cpp b/src/Game/MapObj/BallRail.cpp index b41b55ff4..771366bf7 100644 --- a/src/Game/MapObj/BallRail.cpp +++ b/src/Game/MapObj/BallRail.cpp @@ -2,7 +2,8 @@ #include "Game/MapObj/BallRail.hpp" #include -BallRail::BallRail(const char *pName) : LiveActor(pName) { +BallRail::BallRail(const char* pName) + : LiveActor(pName) { mRailPoints = nullptr; _90 = nullptr; mNumPoints = 0; @@ -11,11 +12,11 @@ BallRail::BallRail(const char *pName) : LiveActor(pName) { _AC = 100.0f; } -void BallRail::init(const JMapInfoIter &rIter) { +void BallRail::init(const JMapInfoIter& rIter) { if (MR::getJMapInfoArg0NoInit(rIter, &mAcceleration)) { mAcceleration /= 1000.0f; } - + if (MR::getJMapInfoArg1NoInit(rIter, &mDeceleration)) { mDeceleration /= 1000.0f; } @@ -38,13 +39,10 @@ void BallRail::init(const JMapInfoIter &rIter) { } void BallRail::control() { - } -bool BallRail::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - if (msg == ACTMES_SPHERE_PLAYER_BINDED - && isNerve(&NrvBallRail::BallRailNrvWait::sInstance)) - { +bool BallRail::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + if (msg == ACTMES_SPHERE_PLAYER_BINDED && isNerve(&NrvBallRail::BallRailNrvWait::sInstance)) { TVec3f v9(pSender->mHost->mVelocity); TVec3f v8 = pSender->mPosition - pReceiver->mPosition; @@ -58,8 +56,7 @@ bool BallRail::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver MR::zeroVelocity(pSender->mHost); return false; - } - else { + } else { _90 = pSender; return true; @@ -197,12 +194,11 @@ void BallRail::exeNoBind() { } } -BallRailPoint::BallRailPoint() : _0(0, 0, 0), _C(1, 0, 0), _18(0, 1, 0), _24(0, 0, 1) { - +BallRailPoint::BallRailPoint() + : _0(0, 0, 0), _C(1, 0, 0), _18(0, 1, 0), _24(0, 0, 1) { } BallRail::~BallRail() { - } namespace NrvBallRail { @@ -210,4 +206,4 @@ namespace NrvBallRail { INIT_NERVE(BallRailNrvSetUp); INIT_NERVE(BallRailNrvRun); INIT_NERVE(BallRailNrvNoBind); -}; +}; // namespace NrvBallRail diff --git a/src/Game/MapObj/Banekiti.cpp b/src/Game/MapObj/Banekiti.cpp index ee1458ab7..3e7047991 100644 --- a/src/Game/MapObj/Banekiti.cpp +++ b/src/Game/MapObj/Banekiti.cpp @@ -1,12 +1,13 @@ #include "Game/MapObj/Banekiti.hpp" -Banekiti::Banekiti(const char *pName) : LiveActor(pName) { +Banekiti::Banekiti(const char* pName) + : LiveActor(pName) { mAnimScaleCtrl = nullptr; mBindStarPointer = nullptr; mRailMover = nullptr; } -void Banekiti::init(const JMapInfoIter &rIter) { +void Banekiti::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("Banekiti", nullptr, false); MR::connectToSceneMapObjStrongLight(this); @@ -83,7 +84,7 @@ void Banekiti::control() { } } -bool Banekiti::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool Banekiti::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgStarPieceAttack(msg)) { mAnimScaleCtrl->startHitReaction(); @@ -93,7 +94,7 @@ bool Banekiti::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pR return false; } -bool Banekiti::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool Banekiti::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (!MR::isSensorPlayer(pSender)) { return false; } @@ -106,7 +107,7 @@ bool Banekiti::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver setNerve(&NrvBanekiti::BanekitiNrvRepel::sInstance); return true; - } + } return false; } @@ -116,23 +117,23 @@ namespace NrvBanekiti { INIT_NERVE(BanekitiNrvRepel); INIT_NERVE(BanekitiNrvDPDSwoon); - void BanekitiNrvWait::execute(Spine *pSpine) const { - Banekiti *pActor = (Banekiti*)pSpine->mExecutor; - pActor->exeWait(); - } + void BanekitiNrvWait::execute(Spine* pSpine) const { + Banekiti* pActor = (Banekiti*)pSpine->mExecutor; + pActor->exeWait(); + } - void BanekitiNrvRepel::execute(Spine *pSpine) const { - Banekiti *pActor = (Banekiti*)pSpine->mExecutor; - pActor->exeRepel(); - } + void BanekitiNrvRepel::execute(Spine* pSpine) const { + Banekiti* pActor = (Banekiti*)pSpine->mExecutor; + pActor->exeRepel(); + } - void BanekitiNrvDPDSwoon::execute(Spine *pSpine) const { - Banekiti *pActor = (Banekiti*)pSpine->mExecutor; - pActor->exeDPDSwoon(); - } + void BanekitiNrvDPDSwoon::execute(Spine* pSpine) const { + Banekiti* pActor = (Banekiti*)pSpine->mExecutor; + pActor->exeDPDSwoon(); + } - void BanekitiNrvDPDSwoon::executeOnEnd(Spine *pSpine) const { - Banekiti *pActor = (Banekiti*)pSpine->mExecutor; - pActor->endDPDSwoon(); - } -}; + void BanekitiNrvDPDSwoon::executeOnEnd(Spine* pSpine) const { + Banekiti* pActor = (Banekiti*)pSpine->mExecutor; + pActor->endDPDSwoon(); + } +}; // namespace NrvBanekiti diff --git a/src/Game/MapObj/BattleShipElevator.cpp b/src/Game/MapObj/BattleShipElevator.cpp index 18e79f068..3d65aeb74 100644 --- a/src/Game/MapObj/BattleShipElevator.cpp +++ b/src/Game/MapObj/BattleShipElevator.cpp @@ -2,15 +2,14 @@ #include "Game/Map/CollisionParts.hpp" #include "Game/Util/DemoUtil.hpp" -BattleShipElevator::BattleShipElevator(const char *pName) : MapObjActor(pName) { - +BattleShipElevator::BattleShipElevator(const char* pName) + : MapObjActor(pName) { } BattleShipElevator::~BattleShipElevator() { - } -void BattleShipElevator::init(const JMapInfoIter &rIter) { +void BattleShipElevator::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; info.setupHioNode("地形オブジェ"); @@ -41,7 +40,7 @@ void BattleShipElevator::control() { } } -bool BattleShipElevator::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BattleShipElevator::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (!isNerve(&NrvBattleShipElevator::BattleShipElevatorNrvWait::sInstance)) { return false; } @@ -60,14 +59,14 @@ namespace NrvBattleShipElevator { INIT_NERVE(BattleShipElevatorNrvMove); INIT_NERVE(BattleShipElevatorNrvEnd); - void BattleShipElevatorNrvWait::execute(Spine *pSpine) const { - } + void BattleShipElevatorNrvWait::execute(Spine* pSpine) const { + } - void BattleShipElevatorNrvMove::execute(Spine *pSpine) const { + void BattleShipElevatorNrvMove::execute(Spine* pSpine) const { BattleShipElevator* planet = reinterpret_cast(pSpine->mExecutor); planet->exeMove(); - } + } - void BattleShipElevatorNrvEnd::execute(Spine *pSpine) const { - } -}; \ No newline at end of file + void BattleShipElevatorNrvEnd::execute(Spine* pSpine) const { + } +}; // namespace NrvBattleShipElevator \ No newline at end of file diff --git a/src/Game/MapObj/BeamGoRoundPlanet.cpp b/src/Game/MapObj/BeamGoRoundPlanet.cpp index 486bf91a7..106526114 100644 --- a/src/Game/MapObj/BeamGoRoundPlanet.cpp +++ b/src/Game/MapObj/BeamGoRoundPlanet.cpp @@ -5,13 +5,14 @@ #include "Game/Util/PlayerUtil.hpp" #include -BeamGoRoundBeam::BeamGoRoundBeam(MtxPtr mtx) : LiveActor("ビームゴーラウンドビーム") { +BeamGoRoundBeam::BeamGoRoundBeam(MtxPtr mtx) + : LiveActor("ビームゴーラウンドビーム") { mModelDrawer = nullptr; mBloomModel = nullptr; mBeamJointMtx = mtx; } -void BeamGoRoundBeam::init(const JMapInfoIter &rIter) { +void BeamGoRoundBeam::init(const JMapInfoIter& rIter) { initModelManagerWithAnm("BeamGoRoundBeam", nullptr, false); mPosition.set(mBeamJointMtx[0][3], mBeamJointMtx[1][3], mBeamJointMtx[2][3]); MR::connectToScene(this, 0x22, 0x5, 0x19, 0x1C); @@ -34,8 +35,8 @@ void BeamGoRoundBeam::draw() const { mModelDrawer->draw(); } -void BeamGoRoundBeam::updateHitSensor(HitSensor *pSensor) { - f32 radius = pSensor->mRadius; +void BeamGoRoundBeam::updateHitSensor(HitSensor* pSensor) { + f32 radius = pSensor->mRadius; TVec3f up; MR::calcUpVec(&up, this); TVec3f v7; @@ -45,7 +46,7 @@ void BeamGoRoundBeam::updateHitSensor(HitSensor *pSensor) { MR::calcPerpendicFootToLineInside(&pSensor->mPosition, *MR::getPlayerPos(), v7, v6); } -void BeamGoRoundBeam::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void BeamGoRoundBeam::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver)) { if (MR::isSensorEnemyAttack(pSender)) { MR::sendMsgEnemyAttackElectric(pReceiver, pSender); @@ -57,13 +58,14 @@ namespace NrvBeamGoRoundPlanet { NEW_NERVE(BeamGoRoundPlanetNrvWait, BeamGoRoundPlanet, Wait); }; -BeamGoRoundPlanet::BeamGoRoundPlanet(const char *pName) : MapObjActor(pName) { +BeamGoRoundPlanet::BeamGoRoundPlanet(const char* pName) + : MapObjActor(pName) { mBeams = nullptr; _C8 = nullptr; _CC = nullptr; } -void BeamGoRoundPlanet::init(const JMapInfoIter &rIter) { +void BeamGoRoundPlanet::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; info.setupHioNode(""); @@ -87,7 +89,7 @@ void BeamGoRoundPlanet::exeWait() { MR::startLevelSound(this, "SE_OJ_LV_BEAM_GO_ROUND", -1, -1, -1); } -void BeamGoRoundPlanet::connectToScene(const MapObjActorInitInfo &) { +void BeamGoRoundPlanet::connectToScene(const MapObjActorInitInfo&) { MR::connectToScenePlanet(this); } @@ -103,9 +105,7 @@ void BeamGoRoundPlanet::initBeam() { } BeamGoRoundBeam::~BeamGoRoundBeam() { - } BeamGoRoundPlanet::~BeamGoRoundPlanet() { - } diff --git a/src/Game/MapObj/BeeFlowerHover.cpp b/src/Game/MapObj/BeeFlowerHover.cpp index e8e1af2f6..006acb364 100644 --- a/src/Game/MapObj/BeeFlowerHover.cpp +++ b/src/Game/MapObj/BeeFlowerHover.cpp @@ -1,7 +1,8 @@ #include "Game/MapObj/BeeFlowerHover.hpp" #include "Game/LiveActor/LodCtrl.hpp" -BeeFlowerHover::BeeFlowerHover(const char *pName) : LiveActor(pName) { +BeeFlowerHover::BeeFlowerHover(const char* pName) + : LiveActor(pName) { mLodCtrlPlanet = 0; _BC = 50.0f; mRailMover = 0; @@ -12,7 +13,7 @@ BeeFlowerHover::BeeFlowerHover(const char *pName) : LiveActor(pName) { _8C.identity(); } -void BeeFlowerHover::init(const JMapInfoIter &rIter) { +void BeeFlowerHover::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("BeeFlowerHover", 0, false); MR::connectToSceneMapObj(this); @@ -49,15 +50,13 @@ void BeeFlowerHover::init(const JMapInfoIter &rIter) { if (mRailMover) { MR::initAndSetRailClipping(&_CC, this, 100.0f, 500.0f); - } - else { + } else { MR::setClippingTypeSphereContainsModelBoundingBox(this, 100.0f); } if (mRailMover) { MR::onCalcGravity(this); - } - else { + } else { MR::calcGravity(this); } @@ -87,9 +86,8 @@ void BeeFlowerHover::exeSoftTouchWait() { if (!MR::isPlayerElementModeBee()) { setNerve(&NrvBeeFlowerHover::BeeFlowerHoverNrvHardTouch::sInstance); - } - else { - + } else { + if (MR::isOnPlayer(getSensor(0))) { setNerve(&NrvBeeFlowerHover::BeeFlowerHoverNrvWait::sInstance); } @@ -124,21 +122,21 @@ void BeeFlowerHover::exeRecover() { if (MR::isGreaterEqualStep(this, 0x3C) && MR::isBckStopped(this) && !MR::isHiddenModel(this)) { MR::validateCollisionParts(this); - setNerve(&NrvBeeFlowerHover::BeeFlowerHoverNrvWait::sInstance); + setNerve(&NrvBeeFlowerHover::BeeFlowerHoverNrvWait::sInstance); } } #ifdef NON_MATCHING -void BeeFlowerHover::control() { +void BeeFlowerHover::control() { if (!isNerve(&NrvBeeFlowerHover::BeeFlowerHoverNrvRecover::sInstance)) { mLodCtrlPlanet->update(); - + if (mLodCtrlPlanet->isShowLowModel()) { return; } } - f32 v5 = _BC; + f32 v5 = _BC; TVec3f v11; v5 = v5 * 0.017453292f; v11.y = 1.0f; @@ -158,11 +156,11 @@ void BeeFlowerHover::control() { f32 v7 = cos(v5); v12.mMtx[0][0] = v7 + ((1.0f - v7) * (v10.x * v10.x)); v12.mMtx[1][1] = v7 + ((1.0f - v7) * (v10.y * v10.y)); - + v12.mMtx[2][2] = v7 + ((1.0f - v7) * (v10.z * v10.z)); - //f32 val_3 = - + //f32 val_3 = + v12.mMtx[0][1] = (v10.y * ((1.0f - v7) * v10.x)) - (v6 * v10.z); v12.mMtx[1][0] = (v10.y * ((1.0f - v7) * v10.x)) + (v6 * v10.z); v12.mMtx[0][2] = (v10.z * ((1.0f - v7) * v10.x)) + (v6 * v10.y); @@ -185,8 +183,7 @@ void BeeFlowerHover::calcAndSetBaseMtx() { if (mRailPosture) { stack_8.concat(mRailPosture->_18); - } - else { + } else { MR::makeMtxRotate(stack_8.toMtxPtr(), mRotation); } @@ -197,7 +194,7 @@ void BeeFlowerHover::calcAndSetBaseMtx() { MR::setBaseTRMtx(this, stack_8); } -bool BeeFlowerHover::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BeeFlowerHover::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (!isNerve(&NrvBeeFlowerHover::BeeFlowerHoverNrvWait::sInstance)) { return false; } @@ -205,8 +202,7 @@ bool BeeFlowerHover::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pRe if (MR::isMsgFloorTouch(msg)) { if (MR::isPlayerElementModeBee()) { setNerve(&NrvBeeFlowerHover::BeeFlowerHoverNrvSoftTouch::sInstance); - } - else { + } else { setNerve(&NrvBeeFlowerHover::BeeFlowerHoverNrvHardTouch::sInstance); } @@ -217,7 +213,6 @@ bool BeeFlowerHover::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pRe } BeeFlowerHover::~BeeFlowerHover() { - } namespace NrvBeeFlowerHover { @@ -227,31 +222,31 @@ namespace NrvBeeFlowerHover { INIT_NERVE(BeeFlowerHoverNrvHardTouch); INIT_NERVE(BeeFlowerHoverNrvRecover); - void BeeFlowerHoverNrvRecover::execute(Spine *pSpine) const { + void BeeFlowerHoverNrvRecover::execute(Spine* pSpine) const { BeeFlowerHover* flower = reinterpret_cast(pSpine->mExecutor); flower->exeRecover(); } - void BeeFlowerHoverNrvHardTouch::execute(Spine *pSpine) const { + void BeeFlowerHoverNrvHardTouch::execute(Spine* pSpine) const { BeeFlowerHover* flower = reinterpret_cast(pSpine->mExecutor); flower->exeHardTouch(); } - void BeeFlowerHoverNrvSoftTouchWait::execute(Spine *pSpine) const { + void BeeFlowerHoverNrvSoftTouchWait::execute(Spine* pSpine) const { BeeFlowerHover* flower = reinterpret_cast(pSpine->mExecutor); flower->exeSoftTouchWait(); } - void BeeFlowerHoverNrvSoftTouch::execute(Spine *pSpine) const { + void BeeFlowerHoverNrvSoftTouch::execute(Spine* pSpine) const { BeeFlowerHover* flower = reinterpret_cast(pSpine->mExecutor); flower->exeSoftTouch(); } - void BeeFlowerHoverNrvWait::execute(Spine *pSpine) const { + void BeeFlowerHoverNrvWait::execute(Spine* pSpine) const { BeeFlowerHover* flower = reinterpret_cast(pSpine->mExecutor); - + if (MR::isFirstStep(flower)) { MR::startBck(flower, "Wait", 0); } } -}; +}; // namespace NrvBeeFlowerHover diff --git a/src/Game/MapObj/BenefitItemInvincible.cpp b/src/Game/MapObj/BenefitItemInvincible.cpp index 105a13f13..d21aba4ac 100644 --- a/src/Game/MapObj/BenefitItemInvincible.cpp +++ b/src/Game/MapObj/BenefitItemInvincible.cpp @@ -5,11 +5,12 @@ namespace { const f32 cAppearThrowFwdSpd = 5.0f; const f32 cAppearThrowUpSpd = 10.0f; const f32 cBoundUpSpd = 20.0f; -}; +}; // namespace -BenefitItemInvincible::BenefitItemInvincible(const char *pName) : BenefitItemObj(pName, "PowerupInvincible") { +BenefitItemInvincible::BenefitItemInvincible(const char* pName) + : BenefitItemObj(pName, "PowerupInvincible") { if (MR::isGalaxyDarkCometAppearInCurrentStage()) { - _D8 = 1; + _D8 = 1; } } @@ -20,7 +21,7 @@ void BenefitItemInvincible::exeCatch() { kill(); } -void BenefitItemInvincible::init(const JMapInfoIter &rIter) { +void BenefitItemInvincible::init(const JMapInfoIter& rIter) { BenefitItemObj::init(rIter); if (!_D8) { @@ -69,7 +70,7 @@ void BenefitItemInvincible::appearThrowUp() { // BenefitItemInvincible::initEscape // BenefitItemInvincible::doEscape -void BenefitItemInvincible::runEfx(const char *pEffect) { +void BenefitItemInvincible::runEfx(const char* pEffect) { char str[0x40]; if (!strcmp(pEffect, "Glow")) { strcpy(str, pEffect); @@ -78,7 +79,7 @@ void BenefitItemInvincible::runEfx(const char *pEffect) { } } -void BenefitItemInvincible::stopEfx(const char *pEffect) { +void BenefitItemInvincible::stopEfx(const char* pEffect) { char str[0x40]; if (!strcmp(pEffect, "Glow")) { strcpy(str, pEffect); @@ -88,9 +89,7 @@ void BenefitItemInvincible::stopEfx(const char *pEffect) { } BenefitItemInvincible::~BenefitItemInvincible() { - } -void BenefitItemInvincible::runBck(const char *) { - +void BenefitItemInvincible::runBck(const char*) { } diff --git a/src/Game/MapObj/BenefitItemLifeUp.cpp b/src/Game/MapObj/BenefitItemLifeUp.cpp index c9913cdb0..c1c9bd6d9 100644 --- a/src/Game/MapObj/BenefitItemLifeUp.cpp +++ b/src/Game/MapObj/BenefitItemLifeUp.cpp @@ -1,7 +1,8 @@ #include "Game/MapObj/BenefitItemLifeUp.hpp" #include -BenefitItemLifeUp::BenefitItemLifeUp(const char *pName) : BenefitItemObj(pName, "KinokoLifeUp") { +BenefitItemLifeUp::BenefitItemLifeUp(const char* pName) + : BenefitItemObj(pName, "KinokoLifeUp") { if (MR::isGalaxyDarkCometAppearInCurrentStage()) { _D8 = 1; } @@ -26,18 +27,18 @@ void BenefitItemLifeUp::initModelAndEfx() { MR::addHitSensorMapObj(this, "body", 4, 50.0f, offs); } -void BenefitItemLifeUp::runEfx(const char *pName) { +void BenefitItemLifeUp::runEfx(const char* pName) { char str[0x40]; strcpy(str, pName); strcat(str, "LifeUp"); MR::emitEffect(this, str); } -void BenefitItemLifeUp::init(const JMapInfoIter &rIter) { +void BenefitItemLifeUp::init(const JMapInfoIter& rIter) { BenefitItemObj::init(rIter); } -void BenefitItemLifeUp::stopEfx(const char *pName) { +void BenefitItemLifeUp::stopEfx(const char* pName) { char str[0x40]; strcpy(str, pName); strcat(str, "LifeUp"); @@ -45,5 +46,4 @@ void BenefitItemLifeUp::stopEfx(const char *pName) { } BenefitItemLifeUp::~BenefitItemLifeUp() { - } diff --git a/src/Game/MapObj/BenefitItemObj.cpp b/src/Game/MapObj/BenefitItemObj.cpp index dce329844..c7f958dc9 100644 --- a/src/Game/MapObj/BenefitItemObj.cpp +++ b/src/Game/MapObj/BenefitItemObj.cpp @@ -2,23 +2,23 @@ #include "Game/MapObj/BenefitItemObj.hpp" #include "JSystem/JGeometry/TUtil.hpp" -s16 def = 600; +s16 def = 600; static f32 zero = 0.0f; namespace { - const f32 cAppearThrowFwdSpd = 5.0f; - const f32 cBoundUpSpd = 20.0f; - const f32 cAppearThrowUpSpd = 10.0f; - const f32 cAppearThrowUpSpd2 = 15.0f; - const f32 cGravity = 0.5f; - const f32 cReflectWallX = 0.30000001f; + const f32 cAppearThrowFwdSpd = 5.0f; + const f32 cBoundUpSpd = 20.0f; + const f32 cAppearThrowUpSpd = 10.0f; + const f32 cAppearThrowUpSpd2 = 15.0f; + const f32 cGravity = 0.5f; + const f32 cReflectWallX = 0.30000001f; static f32 cSpdRotateY = JGeometry::TUtil::PI() / 60.0f; -}; +}; // namespace void ShadowClipActor::endClipped() { LiveActor::endClipped(); if (MR::isClipped(_8C)) { - _8C->endClipped(); + _8C->endClipped(); } } @@ -28,7 +28,8 @@ void ShadowClipActor::control() { } } -BenefitItemObj::BenefitItemObj(const char *pName, const char *pPowerUp) : LiveActor(pName) { +BenefitItemObj::BenefitItemObj(const char* pName, const char* pPowerUp) + : LiveActor(pName) { _138 = 0; _D8 = 0; _E2 = 0; @@ -57,7 +58,7 @@ void BenefitItemObj::initModelAndEfx() { MR::addHitSensor(this, "body", ATYPE_KINOKO_ONEUP, 4, 50.0f, TVec3f(0.0f, 50.0f, 0.0f)); } -void BenefitItemObj::init(const JMapInfoIter &rIter) { +void BenefitItemObj::init(const JMapInfoIter& rIter) { LiveActor::init(rIter); if (MR::isValidInfo(rIter)) { MR::initDefaultPos(this, rIter); @@ -110,31 +111,30 @@ void BenefitItemObj::init(const JMapInfoIter &rIter) { MR::getJMapInfoArg5NoInit(rIter, &arg5); MR::getJMapInfoArg6NoInit(rIter, &arg6); MR::getJMapInfoArg7NoInit(rIter, &arg7); - } - else { + } else { _E1 = 1; _DF = 0; _DA = 0; _D9 = 0; } - switch(arg0) { - case -1: - case 0: - _DF = 0; - break; + switch (arg0) { + case -1: + case 0: + _DF = 0; + break; } - switch(arg1 & 0xF) { - case 1: - _D9 = 1; - break; - case 2: - _D9 = 2; - break; - case 3: - _D9 = 3; - break; + switch (arg1 & 0xF) { + case 1: + _D9 = 1; + break; + case 2: + _D9 = 2; + break; + case 3: + _D9 = 3; + break; } if (arg1 != -1 && (arg1 & 0x80) != 0) { @@ -142,15 +142,15 @@ void BenefitItemObj::init(const JMapInfoIter &rIter) { } switch (arg2) { - case 1: - _DA = 1; - break; - case 2: - _DA = 2; - break; - case 3: - _DA = 3; - break; + case 1: + _DA = 1; + break; + case 2: + _DA = 2; + break; + case 3: + _DA = 3; + break; } bool setClipType = false; @@ -160,21 +160,21 @@ void BenefitItemObj::init(const JMapInfoIter &rIter) { _DC = 0; - switch(arg4) { - case -1: - _DC = 1; - break; - case 1: - _DC = 2; - break; - case 2: - _DC = 3; - break; - case 3: - _DC = 4; - break; + switch (arg4) { + case -1: + _DC = 1; + break; + case 1: + _DC = 2; + break; + case 2: + _DC = 3; + break; + case 3: + _DC = 4; + break; } - + if (arg5 == 1 && MR::isValidInfo(rIter)) { MR::initActorCamera(this, rIter, &mCameraInfo); _E4 = 1; @@ -195,7 +195,7 @@ void BenefitItemObj::init(const JMapInfoIter &rIter) { MR::useStageSwitchWriteDead(this, rIter); if (MR::useStageSwitchReadAppear(this, rIter)) { - MR::FunctorV0M appearFunc = MR::Functor(this, &BenefitItemObj::appear); + MR::FunctorV0M appearFunc = MR::Functor(this, &BenefitItemObj::appear); MR::listenStageSwitchOnAppear(this, appearFunc); _E1 = 1; } @@ -205,21 +205,17 @@ void BenefitItemObj::init(const JMapInfoIter &rIter) { if (_D8) { _DF = 0; makeActorDead(); - } - else { + } else { if (_DF) { makeActorAppeared(); if (_E1) { MR::invalidateHitSensors(this); - } - else { + } else { runEfx("Glow"); } - } - else if (_E1) { + } else if (_E1) { makeActorDead(); - } - else { + } else { makeActorAppeared(); runEfx("Glow"); } @@ -245,16 +241,13 @@ void BenefitItemObj::init(const JMapInfoIter &rIter) { if ((_DC & 0x2) != 0) { MR::onCalcShadowDropPrivateGravity(this, nullptr); MR::onCalcShadow(this, nullptr); - } - else { + } else { MR::onCalcShadowDropPrivateGravityOneTime(this, nullptr); MR::onCalcShadowOneTime(this, nullptr); } - } - else if ((_DC & 0x2) != 0) { + } else if ((_DC & 0x2) != 0) { MR::onCalcShadow(this, nullptr); - } - else { + } else { MR::onCalcShadowOneTime(this, nullptr); } @@ -281,22 +274,22 @@ void BenefitItemObj::appear() { _E1 = 0; _DF = 1; - switch(_D9) { - case 0: - if (_DA) { - setNerve(&NrvBenefitItemObj::HostTypeNrvPreEscape::sInstance); - } - MR::validateHitSensors(this); - break; - case 1: - appearGround(); - break; - case 2: - appearThrowUp(); - break; - case 3: - appearThrowUpQuestionBox(); - break; + switch (_D9) { + case 0: + if (_DA) { + setNerve(&NrvBenefitItemObj::HostTypeNrvPreEscape::sInstance); + } + MR::validateHitSensors(this); + break; + case 1: + appearGround(); + break; + case 2: + appearThrowUp(); + break; + case 3: + appearThrowUpQuestionBox(); + break; } LiveActor::calcAndSetBaseMtx(); @@ -345,13 +338,12 @@ void BenefitItemObj::appearThrowUp() { } */ -void BenefitItemObj::shoot(const TVec3f &a2, const TVec3f &a3, bool a4) { +void BenefitItemObj::shoot(const TVec3f& a2, const TVec3f& a3, bool a4) { mPosition = a2; - + if (_D9) { _D9 = 2; - } - else { + } else { _D9 = 3; } @@ -434,12 +426,10 @@ void BenefitItemObj::exeWait() { } #endif - void BenefitItemObj::doRotateY() { if (isNerve(&NrvBenefitItemObj::HostTypeNrvAppearGround::sInstance)) { _EC = 0.0f; - } - else { + } else { _EC = (f32)fmod((6.2831855f + ((_EC + cSpdRotateY) - zero)), 6.283185482025146) + zero; } } @@ -501,11 +491,11 @@ void BenefitItemObj::exeCatch() { mPosition.set(mHitSensorActor->mPosition); } -bool BenefitItemObj::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BenefitItemObj::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return MR::isMsgStarPieceReflect(msg); } -bool BenefitItemObj::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BenefitItemObj::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isDead(this)) { return false; } @@ -535,11 +525,7 @@ bool BenefitItemObj::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pRe return false; } - if (isNerve(&NrvBenefitItemObj::HostTypeNrvWait::sInstance) - || isNerve(&NrvBenefitItemObj::HostTypeNrvShoot::sInstance) - || isNerve(&NrvBenefitItemObj::HostTypeNrvAppearGround::sInstance) - || isNerve(&NrvBenefitItemObj::HostTypeNrvEscape::sInstance)) - { + if (isNerve(&NrvBenefitItemObj::HostTypeNrvWait::sInstance) || isNerve(&NrvBenefitItemObj::HostTypeNrvShoot::sInstance) || isNerve(&NrvBenefitItemObj::HostTypeNrvAppearGround::sInstance) || isNerve(&NrvBenefitItemObj::HostTypeNrvEscape::sInstance)) { mHitSensorActor = pSender->mHost; setNerve(&NrvBenefitItemObj::HostTypeNrvCatch::sInstance); MR::tryRumblePadWeak(this, 0); @@ -566,8 +552,7 @@ void BenefitItemObj::exeAppearGround() { if (MR::isBckStopped(this)) { if (_DA) { setNerve(&NrvBenefitItemObj::HostTypeNrvPreEscape::sInstance); - } - else { + } else { setNerve(&NrvBenefitItemObj::HostTypeNrvWait::sInstance); } @@ -669,7 +654,7 @@ void BenefitItemObj::exeEscape() { if (MR::isFirstStep(this)) { MR::invalidateClipping(this); MR::onBind(this); - initEscape(); + initEscape(); } doEscape(); @@ -698,12 +683,10 @@ void BenefitItemObj::exeEscape() { if (_B0 == 0x3C) { _B2 = 4; _B4 = 2; - } - else if (_B0 == 0x78) { + } else if (_B0 == 0x78) { _B2 = 8; _B4 = 3; - } - else if (_B0 == 0xB4) { + } else if (_B0 == 0xB4) { _B2 = 12; _B4 = 4; _B6 = 12; @@ -733,15 +716,13 @@ void BenefitItemObj::exeEscape() { if (_DC && (_DC & 0x2) == 0) { if ((_DC & 0x1) != 0) { MR::onCalcShadowOneTime(this, nullptr); - } - else { + } else { MR::onCalcShadowDropPrivateGravityOneTime(this, nullptr); } } } void BenefitItemObj::calcAndSetBaseMtx() { - } void BenefitItemObj::calcAndSetBaseMtxInMovement() { @@ -755,12 +736,10 @@ void BenefitItemObj::calcAndSetBaseMtxInMovement() { MtxPtr mtx = MR::tmpMtxRotYRad(_EC); PSMTXConcat(_F0, mtx, getBaseMtx()); - } - else { + } else { if (MR::isBindedGround(this)) { _A4 = *MR::getGroundNormal(this); - } - else if (MR::isBindedWall(this)) { + } else if (MR::isBindedWall(this)) { _A4 = *MR::getWallNormal(this); } @@ -774,8 +753,7 @@ void BenefitItemObj::calcAndSetBaseMtxInMovement() { if (!MR::isNearZero(stack_8, 0.001f)) { if (MR::isSameDirection(_A4, stack_8, 0.0099999998f)) { MR::setMtxTrans(getBaseMtx(), mPosition); - } - else { + } else { TPos3f pos; MR::makeMtxUpFrontPos(&pos, _A4, stack_8, mPosition); MR::blendMtx(_F0, pos.toMtxPtr(), 0.2f, _F0); @@ -792,14 +770,14 @@ void BenefitItemObj::setFollowMtx(MtxPtr mtx) { MR::extractMtxTrans(mtx, &mPosition); } -void BenefitItemObj::runBck(const char *pBckName) { +void BenefitItemObj::runBck(const char* pBckName) { MR::startBck(this, pBckName, nullptr); } -void BenefitItemObj::runEfx(const char *pEfxName) { +void BenefitItemObj::runEfx(const char* pEfxName) { MR::emitEffect(this, pEfxName); } -void BenefitItemObj::stopEfx(const char *pEfxName) { +void BenefitItemObj::stopEfx(const char* pEfxName) { MR::deleteEffect(this, pEfxName); } diff --git a/src/Game/MapObj/BigBubbleDrawer.cpp b/src/Game/MapObj/BigBubbleDrawer.cpp index a1c4635a6..dee2f2e11 100644 --- a/src/Game/MapObj/BigBubbleDrawer.cpp +++ b/src/Game/MapObj/BigBubbleDrawer.cpp @@ -10,7 +10,7 @@ BigBubbleDrawer::BigBubbleDrawer() { void BigBubbleDrawer::setUpDraw() const { setUpMaterial(); -} +} void BigBubbleDrawer::setUpVertexFormat() const { GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0); @@ -22,7 +22,7 @@ void BigBubbleDrawer::setUpVertexFormat() const { GXSetVtxDesc(GX_VA_TEX0, GX_DIRECT); } -void BigBubbleDrawer::setUpTexture() const { +void BigBubbleDrawer::setUpTexture() const { GXSetNumTexGens(2); GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 0x1E, 0, 0x7D); GXSetTexCoordGen2(GX_TEXCOORD1, GX_TG_MTX3x4, GX_TG_NRM, 0x21, 0, 0x7D); @@ -41,7 +41,7 @@ void BigBubbleDrawer::setUpTexture() const { mBubbleTexture->load(GX_TEXMAP1); } -void BigBubbleDrawer::setUpTevStage() const { +void BigBubbleDrawer::setUpTevStage() const { GXSetNumTevStages(3); GXSetTevColor(GX_TEVREG0, (GXColor&)sTevColor0); GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD0, GX_TEXMAP0, GX_COLOR_NULL); @@ -71,10 +71,10 @@ void BigBubbleDrawer::setUpPixelFormat() const { GXSetZMode(1, GX_LEQUAL, 0); GXSetZCompLoc(0); GXSetCullMode(GX_CULL_BACK); - GXSetClipMode(GX_CLIP_ENABLE); + GXSetClipMode(GX_CLIP_ENABLE); } -void BigBubbleDrawer::setUpMaterial() const { +void BigBubbleDrawer::setUpMaterial() const { setUpVertexFormat(); GXSetNumChans(1); GXSetChanCtrl(GX_COLOR0A0, 0, GX_SRC_REG, GX_SRC_REG, 0, GX_DF_NONE, GX_AF_NONE); diff --git a/src/Game/MapObj/BigBubbleMoveLimitter.cpp b/src/Game/MapObj/BigBubbleMoveLimitter.cpp index af90fc6f3..d5fcc8130 100644 --- a/src/Game/MapObj/BigBubbleMoveLimitter.cpp +++ b/src/Game/MapObj/BigBubbleMoveLimitter.cpp @@ -1,11 +1,12 @@ #include "Game/MapObj/BigBubbleMoveLimitter.hpp" -BigBubbleMoveLimitter::BigBubbleMoveLimitter(const char *pName, s32 a2) : NameObj(pName), - _C(-1), _10(0, 0, 0), _1C(0, 1, 0), _28(1, 0, 0), _34(0, 1, 0), _40(0, 0, 1) { - _5C = -1; - _4C = 500.0f; - _50 = 500.0f; - _54 = 500.0f; - _58 = 500.0f; - _60 = a2; - } \ No newline at end of file +BigBubbleMoveLimitter::BigBubbleMoveLimitter(const char* pName, s32 a2) + : NameObj(pName), + _C(-1), _10(0, 0, 0), _1C(0, 1, 0), _28(1, 0, 0), _34(0, 1, 0), _40(0, 0, 1) { + _5C = -1; + _4C = 500.0f; + _50 = 500.0f; + _54 = 500.0f; + _58 = 500.0f; + _60 = a2; +} \ No newline at end of file diff --git a/src/Game/MapObj/BigFan.cpp b/src/Game/MapObj/BigFan.cpp index 34898a3e5..721ae46a3 100644 --- a/src/Game/MapObj/BigFan.cpp +++ b/src/Game/MapObj/BigFan.cpp @@ -3,7 +3,8 @@ #include "Game/LiveActor/ModelObj.hpp" #include "JSystem/JMath/JMath.hpp" -BigFan::BigFan(const char *pName) : LiveActor(pName) { +BigFan::BigFan(const char* pName) + : LiveActor(pName) { mWindModel = 0; _90.x = 0.0f; _90.y = 0.0f; @@ -15,7 +16,7 @@ BigFan::BigFan(const char *pName) : LiveActor(pName) { BigFanFunction::registerBigFan(this); } -void BigFan::init(const JMapInfoIter &rIter) { +void BigFan::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); const char* object_name; MR::getObjectName(&object_name, rIter); @@ -39,8 +40,7 @@ void BigFan::init(const JMapInfoIter &rIter) { if (MR::isEqualStageName("TeresaMario2DGalaxy")) { mIsTeresaGalaxy = true; - } - else { + } else { mIsTeresaGalaxy = false; } @@ -109,7 +109,6 @@ void BigFan::calcWindInfo(TVec3f *pWindInfo, const TVec3f &a2) { */ void BigFan::control() { - } void BigFan::start() { @@ -126,8 +125,7 @@ void BigFan::exeStart() { if (mIsTeresaGalaxy) { MR::startSound(this, "SE_OJ_BIG_FAN_START_FAR", -1, -1); - } - else { + } else { MR::startSound(this, "SE_OJ_BIG_FAN_START", -1, -1); } } @@ -145,8 +143,7 @@ void BigFan::exeWait() { if (mIsTeresaGalaxy) { MR::startLevelSound(this, "SE_OJ_LV_BIG_FAN_FAR", -1, -1, -1); - } - else { + } else { MR::startLevelSound(this, "SE_OJ_LV_BIG_FAN", -1, -1, -1); } } @@ -156,26 +153,25 @@ namespace NrvBigFan { INIT_NERVE(BigFanNrvStart); INIT_NERVE(BigFanNrvWait); - void BigFanNrvWait::execute(Spine *pSpine) const { + void BigFanNrvWait::execute(Spine* pSpine) const { BigFan* fan = reinterpret_cast(pSpine->mExecutor); fan->exeWait(); } - void BigFanNrvStart::execute(Spine *pSpine) const { + void BigFanNrvStart::execute(Spine* pSpine) const { BigFan* fan = reinterpret_cast(pSpine->mExecutor); fan->exeStart(); } - void BigFanNrvStop::execute(Spine *pSpine) const { + void BigFanNrvStop::execute(Spine* pSpine) const { BigFan* fan = reinterpret_cast(pSpine->mExecutor); - + if (MR::isFirstStep(fan)) { MR::startAction(fan, "Appear"); MR::stopBck(fan); } } -}; +}; // namespace NrvBigFan BigFan::~BigFan() { - } diff --git a/src/Game/MapObj/BigFanHolder.cpp b/src/Game/MapObj/BigFanHolder.cpp index 40dca2b27..07a5b8cfb 100644 --- a/src/Game/MapObj/BigFanHolder.cpp +++ b/src/Game/MapObj/BigFanHolder.cpp @@ -2,8 +2,8 @@ #include "Game/MapObj/BigFan.hpp" #include "Game/Scene/SceneObjHolder.hpp" -BigFanHolder::BigFanHolder() : DeriveActorGroup("大型扇風機管理", 0x20) { - +BigFanHolder::BigFanHolder() + : DeriveActorGroup("大型扇風機管理", 0x20) { } /* @@ -47,23 +47,21 @@ void BigFanFunction::createBigFanHolder() { MR::createSceneObj(SceneObj_BigFanHolder); } -void BigFanFunction::calcWindInfo(TVec3f *a1, const TVec3f &a2, f32 *a3) { +void BigFanFunction::calcWindInfo(TVec3f* a1, const TVec3f& a2, f32* a3) { if (!MR::isExistSceneObj(SceneObj_BigFanHolder)) { a1->zero(); if (a3) { *a3 = 0.0f; } - } - else { + } else { MR::getSceneObj(SceneObj_BigFanHolder)->calcWindInfo(a1, a2, a3); } } -void BigFanFunction::registerBigFan(BigFan *pFan) { +void BigFanFunction::registerBigFan(BigFan* pFan) { MR::getSceneObj(SceneObj_BigFanHolder)->registerActor(pFan); } BigFanHolder::~BigFanHolder() { - } diff --git a/src/Game/MapObj/BlackHole.cpp b/src/Game/MapObj/BlackHole.cpp index f1b54e31b..0abcbda70 100644 --- a/src/Game/MapObj/BlackHole.cpp +++ b/src/Game/MapObj/BlackHole.cpp @@ -5,7 +5,7 @@ // BlackHole::BlackHole -void BlackHole::init(const JMapInfoIter &rIter) { +void BlackHole::init(const JMapInfoIter& rIter) { initMapToolInfo(rIter); initModel(); MR::connectToSceneMapObj(this); @@ -17,8 +17,7 @@ void BlackHole::init(const JMapInfoIter &rIter) { f32 val = 500.0f * _9C; if (radius >= val) { radius = radius; - } - else { + } else { radius = val; } @@ -43,8 +42,7 @@ void BlackHole::init(const JMapInfoIter &rIter) { if (uses) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { makeActorAppeared(); } } @@ -75,7 +73,7 @@ bool BlackHole::tryStartDemoCamera() { return false; } -void BlackHole::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void BlackHole::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (!isNerve(&NrvBlackHole::BlackHoleNrvWait::sInstance)) { return; } @@ -97,7 +95,7 @@ void BlackHole::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { #ifdef NON_MATCHING // shrug -void BlackHole::initMapToolInfo(const JMapInfoIter &rIter) { +void BlackHole::initMapToolInfo(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::useStageSwitchReadA(this, rIter); MR::useStageSwitchReadAppear(this, rIter); @@ -109,23 +107,20 @@ void BlackHole::initMapToolInfo(const JMapInfoIter &rIter) { if (_A4 == 0) { _A0 = 500.0f * mScale.z; - } - else { + } else { TVec3f stack_C; stack_C.setInlineXYPS(mScale); _A0 = PSVECMag(stack_C); } - f32 arg0; + f32 arg0; bool ret = MR::getJMapInfoArg0NoInit(rIter, &arg0); if (ret) { _9C = arg0 / 1000.0f; - } - else if (_A4) { + } else if (_A4) { _9C = 1.0f; - } - else { + } else { _9C = mScale.x; } } @@ -146,16 +141,16 @@ void BlackHole::initCubeBox() { _A8.mMtx[2][3] = mPosition.z; _A4 = new TBox3f(); TVec3f stack_8(0.5f * (1000.0f * -mScale.x), 0.5f * (1000.0f * -mScale.y), 0.5f * (1000.0f * -mScale.z)); - TVec3f stack_14(0.5f * (1000.0f * mScale.x), 0.5f * (1000.0f, mScale.z), 0.5f * (1000.0f * mScale.y)); + TVec3f stack_14(0.5f * (1000.0f * mScale.x), 0.5f * (1000.0f, mScale.z), 0.5f * (1000.0f * mScale.y)); _A4->mMin.set(stack_8); _A4->mMax.set(stack_14); } #endif -bool BlackHole::isInCubeBox(const TVec3f &rVec) const { +bool BlackHole::isInCubeBox(const TVec3f& rVec) const { TVec3f stack_8; _A8.multTranspose(rVec, stack_8); - bool ret = false; + bool ret = false; TBox3f* box = _A4; if (stack_8.x >= box->mMin.x && stack_8.y >= box->mMin.y && stack_8.z >= box->mMin.z && stack_8.x < box->mMax.x && stack_8.y < box->mMax.y && stack_8.z < box->mMax.z) { ret = true; @@ -197,33 +192,32 @@ void BlackHole::exeDisappear() { mScale.setAll(nerveEaseIn); mBlackHoleModel->mScale.setAll(0.5f * blackHoleEase); - if (MR::isStep(this, 0x5A)) { + if (MR::isStep(this, 0x5A)) { kill(); } } BlackHole::~BlackHole() { - } namespace NrvBlackHole { - BlackHoleNrvWait BlackHoleNrvWait::sInstance; - BlackHoleNrvDemo BlackHoleNrvDemo::sInstance; + BlackHoleNrvWait BlackHoleNrvWait::sInstance; + BlackHoleNrvDemo BlackHoleNrvDemo::sInstance; BlackHoleNrvDisappear BlackHoleNrvDisappear::sInstance; - void BlackHoleNrvDisappear::execute(Spine *pSpine) const { + void BlackHoleNrvDisappear::execute(Spine* pSpine) const { BlackHole* blackHole = reinterpret_cast(pSpine->mExecutor); blackHole->exeDisappear(); } - void BlackHoleNrvDemo::execute(Spine *pSpine) const { + void BlackHoleNrvDemo::execute(Spine* pSpine) const { BlackHole* blackHole = reinterpret_cast(pSpine->mExecutor); MR::startLevelSound(blackHole, "SE_OJ_LV_BLACK_HOLE", -1, -1, -1); } - void BlackHoleNrvWait::execute(Spine *pSpine) const { + void BlackHoleNrvWait::execute(Spine* pSpine) const { BlackHole* blackHole = reinterpret_cast(pSpine->mExecutor); blackHole->exeWait(); } -}; +}; // namespace NrvBlackHole diff --git a/src/Game/MapObj/BlueChip.cpp b/src/Game/MapObj/BlueChip.cpp index 136578178..a09cd24d1 100644 --- a/src/Game/MapObj/BlueChip.cpp +++ b/src/Game/MapObj/BlueChip.cpp @@ -1,9 +1,8 @@ #include "Game/MapObj/BlueChip.hpp" -BlueChip::BlueChip(const char *pName) : ChipBase(pName, 0, "BlueChip") { - +BlueChip::BlueChip(const char* pName) + : ChipBase(pName, 0, "BlueChip") { } BlueChip::~BlueChip() { - } \ No newline at end of file diff --git a/src/Game/MapObj/BreakableCage.cpp b/src/Game/MapObj/BreakableCage.cpp index ace02b574..1d0cfd9d9 100644 --- a/src/Game/MapObj/BreakableCage.cpp +++ b/src/Game/MapObj/BreakableCage.cpp @@ -2,7 +2,8 @@ #include "Game/MapObj/BreakableCage.hpp" #include "Game/MapObj/PowerStar.hpp" -BreakableCage::BreakableCage(const char *pName) : LiveActor(pName) { +BreakableCage::BreakableCage(const char* pName) + : LiveActor(pName) { mBreakModel = nullptr; mCageType = CAGE_INVALID; mRotationSpeed = 0.0f; @@ -136,7 +137,7 @@ void BreakableCage::kill() { #ifndef NON_MATCHING void BreakableCage::calcAndSetBaseMtx() { if (mCageType == CAGE_NORMAL) { - f32 v2 = (0.017453292f * mRotation.y); + f32 v2 = (0.017453292f * mRotation.y); TVec3f stack_C; TVec3f stack_14(0.0f, 1.0f, 0.0f); TPos3f stack_20; @@ -147,8 +148,8 @@ void BreakableCage::calcAndSetBaseMtx() { PSVECMag(&stack_C); PSVECNormalize(&stack_C, &stack_C); TPos3f stack_50; - f32 v3 = sin(v2); - f32 v4 = cos(v2); + f32 v3 = sin(v2); + f32 v4 = cos(v2); stack_50.mMtx[0][0] = v4 + ((1.0f - v4) * (stack_C.x * stack_C.x)); stack_50.mMtx[1][1] = v4 + ((1.0f - v4) * (stack_C.y * stack_C.y)); stack_50.mMtx[2][2] = v4 + ((1.0f - v4) * (stack_C.z * stack_C.z)); @@ -161,39 +162,36 @@ void BreakableCage::calcAndSetBaseMtx() { stack_20.concat(mMtx, stack_50); MR::setBaseTRMtx(this, stack_20); - } - else { + } else { MR::setBaseTRMtx(this, mMtx); } } #endif -bool BreakableCage::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BreakableCage::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { bool result; if (MR::isMsgJetTurtleAttack(msg)) { result = tryBreak(); - } - else { + } else { result = false; } return result; } -bool BreakableCage::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool BreakableCage::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { bool result; if (MR::isMsgEnemyAttackFire(msg) || MR::isMsgEnemyAttackFireStrong(msg)) { result = false; - } - else { + } else { result = tryBreak(); } return result; } -void BreakableCage::initMapToolInfo(const JMapInfoIter &rIter) { +void BreakableCage::initMapToolInfo(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::useStageSwitchReadAppear(this, rIter); MR::useStageSwitchWriteA(this, rIter); @@ -207,15 +205,14 @@ void BreakableCage::initMapToolInfo(const JMapInfoIter &rIter) { if (isTypeCage()) { MR::getJMapInfoArg1NoInit(rIter, &mIgnoreGravity); - } - else { + } else { mIgnoreGravity = true; } MR::getJMapInfoArg2NoInit(rIter, &mDelayDeadActivate); } -void BreakableCage::initModel(const char *pName, const JMapInfoIter &rIter) { +void BreakableCage::initModel(const char* pName, const JMapInfoIter& rIter) { initModelManagerWithAnm(pName, nullptr, false); if (isTypeCage()) { ModelObj* obj = MR::createModelObjMapObjStrongLight("壊れる籠壊れモデル", "BreakableCageBreak", mMtx.toMtxPtr()); @@ -230,11 +227,11 @@ void BreakableCage::initModel(const char *pName, const JMapInfoIter &rIter) { s32 model_id = MR::getDummyDisplayModelId(rIter, -1); switch (model_id) { - case 4: - MR::startBck(mItemModel, "Rotation", nullptr); - break; - case 7: - break; + case 4: + MR::startBck(mItemModel, "Rotation", nullptr); + break; + case 7: + break; } } } @@ -258,9 +255,9 @@ void BreakableCage::initBaseMtxForCage() { */ bool BreakableCage::isTypeCage() const { - bool res = true; - bool v3 = true; - bool v4 = true; + bool res = true; + bool v3 = true; + bool v4 = true; CageType type = mCageType; if (type && type != CAGE_LARGE) { @@ -283,7 +280,7 @@ bool BreakableCage::isAppearPowerStar() const { if (mItemModel != nullptr && MR::getDummyDisplayModelId(mItemModel) == 7) { res = true; } - + return res; } @@ -291,8 +288,7 @@ bool BreakableCage::tryBreak() { if (isNerve(&NrvBreakableCage::BreakableCageNrvWait::sInstance)) { if (mCameraInfo != nullptr) { MR::requestStartDemoWithoutCinemaFrame(this, "破壊", &NrvBreakableCage::BreakableCageNrvBreak::sInstance, &NrvBreakableCage::BreakableCageNrvWaitStartDemoBreak::sInstance); - } - else { + } else { setNerve(&NrvBreakableCage::BreakableCageNrvBreak::sInstance); } @@ -316,8 +312,8 @@ void BreakableCage::exeWait() { } void BreakableCage::exeBreak() { - u32 v2 = 1; - u32 v3 = 0; + u32 v2 = 1; + u32 v3 = 0; ActorCameraInfo* inf; if (mDelayDeadActivate || mItemModel != nullptr || mCageType == (s32)3 || mCageType == CAGE_TRASH) { @@ -329,13 +325,13 @@ void BreakableCage::exeBreak() { } if (MR::isFirstStep(this)) { - switch(mCageType) { - case CAGE_FIX: - MR::startSound(this, "SE_OJ_BREAK_FIXATION_BREAK", -1, -1); - break; - default: - MR::startSound(this, "SE_OJ_IRON_CAGE_BREAK", -1, -1); - break; + switch (mCageType) { + case CAGE_FIX: + MR::startSound(this, "SE_OJ_BREAK_FIXATION_BREAK", -1, -1); + break; + default: + MR::startSound(this, "SE_OJ_IRON_CAGE_BREAK", -1, -1); + break; } MR::hideModel(this); @@ -355,16 +351,14 @@ void BreakableCage::exeBreak() { if (isTypeCage()) { mBreakModel->appear(); MR::startBck(mBreakModel, "Break", nullptr); - } - else { + } else { MR::emitEffect(this, "Break"); } if (isAppearPowerStar()) { if (mItemModel != nullptr) { MR::requestAppearPowerStar(this, mItemModel->mPosition); - } - else { + } else { MR::requestAppearPowerStar(this, this, 150.0f); } @@ -382,8 +376,7 @@ void BreakableCage::exeBreak() { if (isAppearPowerStar() || mCameraInfo != nullptr) { MR::stopSceneAtStep(this, 2, 16); - } - else if (MR::isNearPlayer(this, 1500.0f)) { + } else if (MR::isNearPlayer(this, 1500.0f)) { f32 radius = getSensor("body")->mRadius; if (!MR::isJudgedToClipFrustum(mPosition, radius)) { MR::stopSceneAtStep(this, 2, 6); @@ -394,14 +387,12 @@ void BreakableCage::exeBreak() { if (mCameraInfo != nullptr) { canDoSwitch = MR::isStep(this, 120); - } - else if (isTypeCage()) { + } else if (isTypeCage()) { canDoSwitch = MR::isBckStopped(mBreakModel); - } - else { + } else { canDoSwitch = MR::isEffectValid(this, "Break") == false; } - + if (canDoSwitch) { if (!v2 && MR::isValidSwitchDead(this)) { MR::onSwitchDead(this); @@ -421,7 +412,6 @@ void BreakableCage::exeBreak() { } BreakableCage::~BreakableCage() { - } namespace NrvBreakableCage { @@ -429,17 +419,16 @@ namespace NrvBreakableCage { INIT_NERVE(BreakableCageNrvWaitStartDemoBreak); INIT_NERVE(BreakableCageNrvBreak); - void BreakableCageNrvBreak::execute(Spine *pSpine) const { + void BreakableCageNrvBreak::execute(Spine* pSpine) const { BreakableCage* cage = reinterpret_cast(pSpine->mExecutor); cage->exeBreak(); } - void BreakableCageNrvWaitStartDemoBreak::execute(Spine *pSpine) const { - + void BreakableCageNrvWaitStartDemoBreak::execute(Spine* pSpine) const { } - void BreakableCageNrvWait::execute(Spine *pSpine) const { + void BreakableCageNrvWait::execute(Spine* pSpine) const { BreakableCage* cage = reinterpret_cast(pSpine->mExecutor); cage->exeWait(); } -}; +}; // namespace NrvBreakableCage diff --git a/src/Game/MapObj/BumpAppearPlanet.cpp b/src/Game/MapObj/BumpAppearPlanet.cpp index d26e41e7f..4b2224dcd 100644 --- a/src/Game/MapObj/BumpAppearPlanet.cpp +++ b/src/Game/MapObj/BumpAppearPlanet.cpp @@ -7,14 +7,15 @@ namespace NrvBumpAppearPlanet { NEW_NERVE(BumpAppearPlanetNrvWait, BumpAppearPlanet, Wait); NEW_NERVE(BumpAppearPlanetNrvBumpOut, BumpAppearPlanet, BumpOut); NEW_NERVE(BumpAppearPlanetNrvBumpIn, BumpAppearPlanet, BumpIn); -}; +}; // namespace NrvBumpAppearPlanet -BumpAppearPlanet::BumpAppearPlanet(const char *pName) : MapObjActor(pName) { +BumpAppearPlanet::BumpAppearPlanet(const char* pName) + : MapObjActor(pName) { _C4 = nullptr; _C8 = nullptr; } -void BumpAppearPlanet::init(const JMapInfoIter &rIter) { +void BumpAppearPlanet::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoPlanet(&info); @@ -74,5 +75,4 @@ void BumpAppearPlanet::startBumpIn() { } BumpAppearPlanet::~BumpAppearPlanet() { - } diff --git a/src/Game/MapObj/Candlestand.cpp b/src/Game/MapObj/Candlestand.cpp index 02dd0cc30..2fcbdc566 100644 --- a/src/Game/MapObj/Candlestand.cpp +++ b/src/Game/MapObj/Candlestand.cpp @@ -2,50 +2,49 @@ #include "Game/MapObj/Candlestand.hpp" struct Param { - const char* mObjName; // 0x0 - f32 mClippingRadius; // 0x4 - f32 mSensorRange; // 0x8 - f32 _C; - f32 _10; - f32 _14; - bool mCanUseSwitch; // 0x18 + const char* mObjName; // 0x0 + f32 mClippingRadius; // 0x4 + f32 mSensorRange; // 0x8 + f32 _C; + f32 _10; + f32 _14; + bool mCanUseSwitch; // 0x18 }; namespace { static Param sParams[3] = { - { - "PhantomCandlestand", - 500.0f, // mClippingRadius - 50.0f, // mSensorRange - 220.0f, // 0xC - 0.0f, // 0x14 - false // mCanUseSwitch + { + "PhantomCandlestand", + 500.0f, // mClippingRadius + 50.0f, // mSensorRange + 220.0f, // 0xC + 0.0f, // 0x14 + false // mCanUseSwitch }, { - "TeresaMansionCandlestand", - 800.0f, // mClippingRadius - 70.0f, // mSensorRange - 300.0f, // 0xC - 220.0f, // 0x10 - -5.0f, // 0x14 - false // mCanUseSwitch + "TeresaMansionCandlestand", + 800.0f, // mClippingRadius + 70.0f, // mSensorRange + 300.0f, // 0xC + 220.0f, // 0x10 + -5.0f, // 0x14 + false // mCanUseSwitch }, { - "CandlestandIceVolcano", - 500.0f, // mClippingRadius - 150.0f, // mSensorRange - 220.0f, // 0xC - 0.0f, // 0x10 - 0.0f, // 0x14 - true // mCanUseSwitch - } - }; + "CandlestandIceVolcano", + 500.0f, // mClippingRadius + 150.0f, // mSensorRange + 220.0f, // 0xC + 0.0f, // 0x10 + 0.0f, // 0x14 + true // mCanUseSwitch + }}; Param* get(s32 idx) { return &sParams[idx]; } - Param* getParam(const char *pObjName) NO_INLINE { + Param* getParam(const char* pObjName) NO_INLINE { for (s32 i = 0; i < 3; i++) { if (MR::isEqualString(pObjName, get(i)->mObjName)) { return get(i); @@ -54,15 +53,16 @@ namespace { return nullptr; } -}; +}; // namespace -Candlestand::Candlestand(const char *pName) : MapObjActor(pName) { +Candlestand::Candlestand(const char* pName) + : MapObjActor(pName) { mItem = -1; mHasItemAppear = false; mSpinPtclCb = nullptr; } -void Candlestand::init(const JMapInfoIter &rIter) { +void Candlestand::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoSimpleMapObj(&info); @@ -94,8 +94,7 @@ void Candlestand::init(const JMapInfoIter &rIter) { if (getParam(mObjectName)->mCanUseSwitch) { if (MR::isValidSwitchA(this)) { setNerve(&NrvCandlestand::HostTypeWaitFire::sInstance); - } - else { + } else { setNerve(&NrvCandlestand::HostTypeBurn::sInstance); } } @@ -114,24 +113,20 @@ void Candlestand::makeActorAppeared() { void Candlestand::startClipped() { MapObjActor::startClipped(); - if (isNerve(&NrvCandlestand::HostTypeBurn::sInstance) - || isNerve(&NrvCandlestand::HostTypeAttack::sInstance)) - { + if (isNerve(&NrvCandlestand::HostTypeBurn::sInstance) || isNerve(&NrvCandlestand::HostTypeAttack::sInstance)) { deleteEffectFire(); } } void Candlestand::endClipped() { - if (isNerve(&NrvCandlestand::HostTypeBurn::sInstance) - || isNerve(&NrvCandlestand::HostTypeAttack::sInstance)) - { + if (isNerve(&NrvCandlestand::HostTypeBurn::sInstance) || isNerve(&NrvCandlestand::HostTypeAttack::sInstance)) { emitEffectFire(); } MapObjActor::endClipped(); } -void Candlestand::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void Candlestand::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (!isNerve(&NrvCandlestand::HostTypeBurn::sInstance)) { return; } @@ -150,7 +145,7 @@ void Candlestand::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { setNerve(&NrvCandlestand::HostTypeAttack::sInstance); } -bool Candlestand::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool Candlestand::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (!isNerve(&NrvCandlestand::HostTypeWaitFire::sInstance)) { return false; } @@ -170,7 +165,7 @@ bool Candlestand::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor return true; } -bool Candlestand::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool Candlestand::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (!isNerve(&NrvCandlestand::HostTypeWaitFire::sInstance)) { return false; } @@ -190,15 +185,12 @@ bool Candlestand::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor * return true; } -bool Candlestand::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - if (MR::isInSpinStormRange(msg, pSender, pReceiver, (350.0f * mScale.x)) - && isNerve(&NrvCandlestand::HostTypeBurn::sInstance)) - { +bool Candlestand::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + if (MR::isInSpinStormRange(msg, pSender, pReceiver, (350.0f * mScale.x)) && isNerve(&NrvCandlestand::HostTypeBurn::sInstance)) { if (getParam(mObjectName)->mCanUseSwitch) { setNerve(&NrvCandlestand::HostTypeFlicker::sInstance); return true; - } - else { + } else { setNerve(&NrvCandlestand::HostTypeExtinguish::sInstance); return true; } @@ -207,13 +199,11 @@ bool Candlestand::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pRecei return false; } - void Candlestand::emitEffectFire() { if (isObjectName("TeresaMansionCandlestand")) { MR::emitEffect(this, "Fire01"); MR::emitEffect(this, "Fire02"); - } - else { + } else { MR::emitEffect(this, "Fire"); } } @@ -222,8 +212,7 @@ void Candlestand::deleteEffectFire() { if (isObjectName("TeresaMansionCandlestand")) { MR::deleteEffect(this, "Fire01"); MR::deleteEffect(this, "Fire02"); - } - else { + } else { MR::deleteEffect(this, "Fire"); } } @@ -232,8 +221,7 @@ void Candlestand::emitEffectExtinguishFire() { if (isObjectName("TeresaMansionCandlestand")) { MR::emitEffectWithParticleCallBack(this, "Extinguish01", mSpinPtclCb); MR::emitEffectWithParticleCallBack(this, "Extinguish02", mSpinPtclCb); - } - else { + } else { MR::emitEffectWithParticleCallBack(this, "Extinguish", mSpinPtclCb); } } @@ -284,8 +272,7 @@ void Candlestand::exeFlicker() { if (isObjectName("TeresaMansionCandlestand")) { MR::emitEffect(this, "Extinguish01"); MR::emitEffect(this, "Extinguish02"); - } - else { + } else { MR::emitEffect(this, "Extinguish"); } @@ -301,8 +288,7 @@ void Candlestand::exeFlicker() { void Candlestand::exeAttack() { if (MR::isStep(this, 0x1E)) { setNerve(&NrvCandlestand::HostTypeBurn::sInstance); - } - else { + } else { MR::startLevelSound(this, "SE_OJ_LV_PHANTOM_TOACH_BURN", -1, -1, -1); } } @@ -312,7 +298,6 @@ void Candlestand::exeBurn() { } Candlestand::~Candlestand() { - } namespace NrvCandlestand { @@ -322,4 +307,4 @@ namespace NrvCandlestand { INIT_NERVE(HostTypeAttack); INIT_NERVE(HostTypeExtinguish); INIT_NERVE(HostTypeFlicker); -}; \ No newline at end of file +}; // namespace NrvCandlestand \ No newline at end of file diff --git a/src/Game/MapObj/CannonFortressBreakStep.cpp b/src/Game/MapObj/CannonFortressBreakStep.cpp index 35fc51142..ea763e0b9 100644 --- a/src/Game/MapObj/CannonFortressBreakStep.cpp +++ b/src/Game/MapObj/CannonFortressBreakStep.cpp @@ -7,13 +7,13 @@ namespace NrvCannonFortressBreakStep { NEW_NERVE(CannonFortressBreakStepNrvFallStart, CannonFortressBreakStep, FallStart); NEW_NERVE(CannonFortressBreakStepNrvFall, CannonFortressBreakStep, Fall); NEW_NERVE(CannonFortressBreakStepNrvBreak, CannonFortressBreakStep, Break); -}; +}; // namespace NrvCannonFortressBreakStep -CannonFortressBreakStep::CannonFortressBreakStep(const char *pName) : MapObjActor(pName) { - +CannonFortressBreakStep::CannonFortressBreakStep(const char* pName) + : MapObjActor(pName) { } -void CannonFortressBreakStep::init(const JMapInfoIter &rIter) { +void CannonFortressBreakStep::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; info.setupHioNode("地形オブジェ"); @@ -52,7 +52,6 @@ void CannonFortressBreakStep::exeFall() { } } - void CannonFortressBreakStep::exeBreak() { if (MR::isFirstStep(this)) { MR::startSound(this, "SE_OJ_CNFORT_BKSTEP_FALL_ED", -1, -1); @@ -65,14 +64,12 @@ void CannonFortressBreakStep::startFall() { setNerve(&NrvCannonFortressBreakStep::CannonFortressBreakStepNrvFallStart::sInstance); } -void CannonFortressBreakStep::initCaseUseSwitchB(const MapObjActorInitInfo &rInfo) { +void CannonFortressBreakStep::initCaseUseSwitchB(const MapObjActorInitInfo& rInfo) { MR::listenStageSwitchOnB(this, MR::Functor_Inline(this, &CannonFortressBreakStep::startFall)); } -void CannonFortressBreakStep::initCaseNoUseSwitchB(const MapObjActorInitInfo &) { - +void CannonFortressBreakStep::initCaseNoUseSwitchB(const MapObjActorInitInfo&) { } CannonFortressBreakStep::~CannonFortressBreakStep() { - } diff --git a/src/Game/MapObj/CapsuleCage.cpp b/src/Game/MapObj/CapsuleCage.cpp index 0ec93a459..c5b5ab4bf 100644 --- a/src/Game/MapObj/CapsuleCage.cpp +++ b/src/Game/MapObj/CapsuleCage.cpp @@ -1,10 +1,11 @@ #include "Game/MapObj/CapsuleCage.hpp" -CapsuleCage::CapsuleCage(const char *pName) : MapObjActor(pName) { +CapsuleCage::CapsuleCage(const char* pName) + : MapObjActor(pName) { mInfo = nullptr; } -void CapsuleCage::init(const JMapInfoIter &rIter) { +void CapsuleCage::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoSimpleMapObj(&info); @@ -42,8 +43,7 @@ void CapsuleCage::exeOpen() { if (mInfo != nullptr) { setNerve(&NrvCapsuleCage::CapsuleCageNrvEndCamera::sInstance); - } - else { + } else { kill(); } } @@ -58,12 +58,12 @@ void CapsuleCage::kill() { MapObjActor::kill(); } -void CapsuleCage::connectToScene(const MapObjActorInitInfo &rInfo) { +void CapsuleCage::connectToScene(const MapObjActorInitInfo& rInfo) { MR::connectToSceneIndirectMapObj(this); } -void CapsuleCage::initCaseUseSwitchB(const MapObjActorInitInfo &rInfo) { - MR::FunctorV0M openFunc = MR::Functor_Inline(this, &CapsuleCage::startOpen); +void CapsuleCage::initCaseUseSwitchB(const MapObjActorInitInfo& rInfo) { + MR::FunctorV0M openFunc = MR::Functor_Inline(this, &CapsuleCage::startOpen); MR::listenStageSwitchOnB(this, openFunc); } @@ -72,8 +72,7 @@ void CapsuleCage::startOpen() { if (mInfo != nullptr) { MR::requestStartDemoWithoutCinemaFrame(this, cDemoCameraName, &NrvCapsuleCage::CapsuleCageNrvStartCamera::sInstance, nullptr); - } - else { + } else { setNerve(&NrvCapsuleCage::CapsuleCageNrvOpen::sInstance); } } @@ -89,20 +88,16 @@ namespace NrvCapsuleCage { INIT_NERVE(CapsuleCageNrvStartCamera); INIT_NERVE(CapsuleCageNrvOpen); INIT_NERVE(CapsuleCageNrvEndCamera); -}; - -void CapsuleCage::initCaseNoUseSwitchB(const MapObjActorInitInfo &) { +}; // namespace NrvCapsuleCage +void CapsuleCage::initCaseNoUseSwitchB(const MapObjActorInitInfo&) { } -void CapsuleCage::initCaseNoUseSwitchA(const MapObjActorInitInfo &) { - +void CapsuleCage::initCaseNoUseSwitchA(const MapObjActorInitInfo&) { } -void CapsuleCage::initCaseUseSwitchA(const MapObjActorInitInfo &) { - +void CapsuleCage::initCaseUseSwitchA(const MapObjActorInitInfo&) { } CapsuleCage::~CapsuleCage() { - } diff --git a/src/Game/MapObj/ChipBase.cpp b/src/Game/MapObj/ChipBase.cpp index 63cd314fa..d35b449e6 100644 --- a/src/Game/MapObj/ChipBase.cpp +++ b/src/Game/MapObj/ChipBase.cpp @@ -12,24 +12,22 @@ namespace NrvChipBase { NEW_NERVE(ChipBaseNrvFlashing, ChipBase, Flashing); NEW_NERVE(ChipBaseNrvHide, ChipBase, Hide); NEW_NERVE(ChipBaseNrvGot, ChipBase, Got); -}; +}; // namespace NrvChipBase -ChipBase::ChipBase(const char *pName, s32 chipType, const char *pChipName) : - LiveActor(pName), - mFlashingCtrl(nullptr), - mRailMover(nullptr), - mAirBubble(nullptr), - mChipName(pChipName), - mHost(nullptr), - mClippingRange(0.0f, 0.0f, 0.0f), - mGroupID(-1), - mChipType(chipType), - _B5(false) -{ - +ChipBase::ChipBase(const char* pName, s32 chipType, const char* pChipName) + : LiveActor(pName), + mFlashingCtrl(nullptr), + mRailMover(nullptr), + mAirBubble(nullptr), + mChipName(pChipName), + mHost(nullptr), + mClippingRange(0.0f, 0.0f, 0.0f), + mGroupID(-1), + mChipType(chipType), + _B5(false) { } -void ChipBase::init(const JMapInfoIter &rIter) { +void ChipBase::init(const JMapInfoIter& rIter) { MR::createChipHolder(mChipType); initJMapParam(rIter); initModel(rIter); @@ -48,8 +46,7 @@ void ChipBase::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchReadAppear(this, rIter)) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { makeActorAppeared(); } } @@ -76,8 +73,7 @@ void ChipBase::initSensor() { if (mAirBubble != nullptr) { radius = 150.0f; - } - else { + } else { radius = 80.0f; } @@ -85,11 +81,10 @@ void ChipBase::initSensor() { } #ifdef NON_MATCHING -void ChipBase::initShadow(const JMapInfoIter &rIter) { +void ChipBase::initShadow(const JMapInfoIter& rIter) { if (MR::isValidInfo(rIter)) { MR::getJMapInfoArg2WithInit(rIter, &_B5); - } - else { + } else { _B5 = false; } @@ -101,8 +96,7 @@ void ChipBase::initShadow(const JMapInfoIter &rIter) { if (shadowShape == 0) { MR::initShadowVolumeCylinder(this, 50.0f * mScale.x); _B5 = false; - } - else { + } else { MR::initShadowVolumeSphere(this, 50.0f * mScale.x); } @@ -114,15 +108,14 @@ void ChipBase::initShadow(const JMapInfoIter &rIter) { if (mRailMover || _B5) { MR::onCalcShadowDropPrivateGravity(this, 0); - } - else { + } else { MR::onCalcShadowOneTime(this, 0); MR::onCalcShadowDropPrivateGravityOneTime(this, 0); } } #endif -void ChipBase::initJMapParam(const JMapInfoIter &rIter) { +void ChipBase::initJMapParam(const JMapInfoIter& rIter) { if (MR::isValidInfo(rIter)) { MR::initDefaultPos(this, rIter); MR::getJMapInfoArg0NoInit(rIter, &mGroupID); @@ -149,7 +142,7 @@ void ChipBase::setGroupID(s32 id) { mGroupID = id; } -void ChipBase::setHost(LiveActor *pActor) { +void ChipBase::setHost(LiveActor* pActor) { mHost = pActor; } @@ -204,7 +197,7 @@ void ChipBase::appearFlashing(s32 a1) { setNerve(&NrvChipBase::ChipBaseNrvFlashing::sInstance); } -bool ChipBase::requestGet(HitSensor *pSender, HitSensor *pReceiver) { +bool ChipBase::requestGet(HitSensor* pSender, HitSensor* pReceiver) { if (isGettable()) { MR::noticeGetChip(mChipType, this, mGroupID); setNerve(&NrvChipBase::ChipBaseNrvGot::sInstance); @@ -266,7 +259,6 @@ bool ChipBase::requestEndControl() { } void ChipBase::exeDeactive() { - } void ChipBase::exeWait() { @@ -292,7 +284,6 @@ void ChipBase::exeFlashing() { } void ChipBase::exeHide() { - } #ifdef NON_MATCHING @@ -311,8 +302,7 @@ void ChipBase::exeGot() { if (!mChipType) { MR::startSystemSE("SE_SY_BLUECHIP_GET", MR::getGotChipCount(mChipType, mGroupID), -1); - } - else if (mChipType == 1) { + } else if (mChipType == 1) { MR::startSystemSE("SE_SY_YELLOWCHIP_GET", MR::getGotChipCount(mChipType, mGroupID), -1); } } @@ -330,11 +320,10 @@ bool ChipBase::isGettable() const { return false; } - return isNerve(&NrvChipBase::ChipBaseNrvWait::sInstance) - || isNerve(&NrvChipBase::ChipBaseNrvFlashing::sInstance); + return isNerve(&NrvChipBase::ChipBaseNrvWait::sInstance) || isNerve(&NrvChipBase::ChipBaseNrvFlashing::sInstance); } -bool ChipBase::isNeedBubble(const JMapInfoIter &rIter) { +bool ChipBase::isNeedBubble(const JMapInfoIter& rIter) { if (!MR::isValidInfo(rIter)) { return false; } @@ -345,7 +334,7 @@ bool ChipBase::isNeedBubble(const JMapInfoIter &rIter) { return arg3; } -void ChipBase::makeArchiveList(NameObjArchiveListCollector *pList, const JMapInfoIter &rIter) { +void ChipBase::makeArchiveList(NameObjArchiveListCollector* pList, const JMapInfoIter& rIter) { if (ChipBase::isNeedBubble(rIter)) { pList->addArchive("AirBubble"); } diff --git a/src/Game/MapObj/ChipCounter.cpp b/src/Game/MapObj/ChipCounter.cpp index 1306337a6..1bddeea6e 100644 --- a/src/Game/MapObj/ChipCounter.cpp +++ b/src/Game/MapObj/ChipCounter.cpp @@ -14,11 +14,11 @@ namespace { "Chip2", "Chip3", "Chip4", - "Chip5" - }; -}; + "Chip5"}; +}; // namespace -ChipCounter::ChipCounter(const char *pName, s32 type) : LayoutActor(pName, true) { +ChipCounter::ChipCounter(const char* pName, s32 type) + : LayoutActor(pName, true) { mCollectCounter = 0; mCount = 0; mType = type; @@ -26,16 +26,16 @@ ChipCounter::ChipCounter(const char *pName, s32 type) : LayoutActor(pName, true) _30 = 1.0f; } -void ChipCounter::init(const JMapInfoIter &rIter) { +void ChipCounter::init(const JMapInfoIter& rIter) { MR::connectToSceneLayout(this); - switch(mType) { - case 0: - initLayoutManager("BlueChipCounter", 2); - break; - case 1: - initLayoutManager("YellowChipCounter", 2); - break; + switch (mType) { + case 0: + initLayoutManager("BlueChipCounter", 2); + break; + case 1: + initLayoutManager("YellowChipCounter", 2); + break; } initNerve(&NrvChipCounter::ChipCounterNrvHide::sInstance); @@ -59,8 +59,7 @@ void ChipCounter::control() { if (_30 < 0.0f) { _30 = 0.0f; } - } - else { + } else { _30 += 0.050000001f; if (_30 > 1.0f) { @@ -88,8 +87,7 @@ void ChipCounter::setCount(s32 count) { } MR::startPaneAnim(this, sChipPainName[i], "ChipGet", 0); - } - else { + } else { MR::setPaneAnimFrameAndStop(this, sChipPainName[i], 0.0f, 0); } } diff --git a/src/Game/MapObj/ChipGroup.cpp b/src/Game/MapObj/ChipGroup.cpp index f8687e7b0..ef5e7fe08 100644 --- a/src/Game/MapObj/ChipGroup.cpp +++ b/src/Game/MapObj/ChipGroup.cpp @@ -5,7 +5,7 @@ // ChipGroup::updateUIRange // ChipGroup::movement -void ChipGroup::registerChip(ChipBase *pChip) { +void ChipGroup::registerChip(ChipBase* pChip) { if (_6C) { pChip->makeActorDead(); } @@ -38,16 +38,15 @@ bool ChipGroup::isComplete() const { return true; } -BlueChipGroup::BlueChipGroup(const char *pName) : ChipGroup(pName, 0) { - +BlueChipGroup::BlueChipGroup(const char* pName) + : ChipGroup(pName, 0) { } ChipGroup::~ChipGroup() { - } -YellowChipGroup::YellowChipGroup(const char *pName) : ChipGroup(pName, 1) { - +YellowChipGroup::YellowChipGroup(const char* pName) + : ChipGroup(pName, 1) { } // ChipGroup::init @@ -55,9 +54,7 @@ YellowChipGroup::YellowChipGroup(const char *pName) : ChipGroup(pName, 1) { // ChipGroup::receiveAppearRequest BlueChipGroup::~BlueChipGroup() { - } YellowChipGroup::~YellowChipGroup() { - } diff --git a/src/Game/MapObj/ChipHolder.cpp b/src/Game/MapObj/ChipHolder.cpp index 269f413e7..2b5e60347 100644 --- a/src/Game/MapObj/ChipHolder.cpp +++ b/src/Game/MapObj/ChipHolder.cpp @@ -5,7 +5,8 @@ #include "Game/Util/PlayerUtil.hpp" #include "Game/Util/JMapInfo.hpp" -ChipHolder::ChipHolder(const char* pName, s32 chipType) : NameObj(pName) { +ChipHolder::ChipHolder(const char* pName, s32 chipType) + : NameObj(pName) { mChipCounter = nullptr; mChipGroups = nullptr; mNumChipGroups = 0; @@ -33,14 +34,14 @@ ChipGroup* ChipHolder::findChipGroup(s32 chipGroupType) const { ChipHolder* MR::createChipHolder(s32 chipHolderType) { ChipHolder* result; - + switch (chipHolderType) { - case ChipHolder::Chip_Blue: - result = (ChipHolder*)createSceneObj(SceneObj_BlueChipHolder); - break; - case ChipHolder::Chip_Yellow: - result = (ChipHolder*)createSceneObj(SceneObj_YellowChipHolder); - break; + case ChipHolder::Chip_Blue: + result = (ChipHolder*)createSceneObj(SceneObj_BlueChipHolder); + break; + case ChipHolder::Chip_Yellow: + result = (ChipHolder*)createSceneObj(SceneObj_YellowChipHolder); + break; } return result; @@ -48,14 +49,14 @@ ChipHolder* MR::createChipHolder(s32 chipHolderType) { ChipHolder* MR::getChipHolder(s32 chipType) { switch (chipType) { - case ChipHolder::Chip_Blue: - return (ChipHolder*) getSceneObjHolder()->getObj(SceneObj_BlueChipHolder); - - case ChipHolder::Chip_Yellow: - return (ChipHolder*) getSceneObjHolder()->getObj(SceneObj_YellowChipHolder); - - default: - return nullptr; + case ChipHolder::Chip_Blue: + return (ChipHolder*)getSceneObjHolder()->getObj(SceneObj_BlueChipHolder); + + case ChipHolder::Chip_Yellow: + return (ChipHolder*)getSceneObjHolder()->getObj(SceneObj_YellowChipHolder); + + default: + return nullptr; } } @@ -69,7 +70,7 @@ void MR::registerChip(s32 chipHolderType, ChipBase* pChip, s32 chipGroupType) { void MR::noticeGetChip(s32 chipHolderType, ChipBase* pChip, s32 chipGroupType) { ChipHolder* holder = getChipHolder(chipHolderType); - ChipGroup* group = holder->findChipGroup(chipGroupType); + ChipGroup* group = holder->findChipGroup(chipGroupType); group->noticeGet(pChip); holder->mChipCounter->setCount(group->getGotCount()); incPlayerOxygen(8); @@ -118,21 +119,19 @@ void MR::deactivateChipLayout() { } } - ChipHolder::~ChipHolder() { - } void ChipHolder::init(const JMapInfoIter& rIter) { mChipGroups = new ChipGroup*[0x40]; switch (mChipType) { - case Chip_Blue: - mChipCounter = new ChipCounter("ブルーチップカウンター", mChipType); - break; - case Chip_Yellow: - mChipCounter = new ChipCounter("イエローチップカウンター", mChipType); - break; + case Chip_Blue: + mChipCounter = new ChipCounter("ブルーチップカウンター", mChipType); + break; + case Chip_Yellow: + mChipCounter = new ChipCounter("イエローチップカウンター", mChipType); + break; } mChipCounter->initWithoutIter(); diff --git a/src/Game/MapObj/ChooChooTrain.cpp b/src/Game/MapObj/ChooChooTrain.cpp index 60ef967ff..a4fb2d293 100644 --- a/src/Game/MapObj/ChooChooTrain.cpp +++ b/src/Game/MapObj/ChooChooTrain.cpp @@ -2,7 +2,8 @@ #include "Game/Util.hpp" #include "Game/Util/Array.hpp" -ChooChooTrain::ChooChooTrain(const char *pName) : LiveActor(pName), mModelArray() { +ChooChooTrain::ChooChooTrain(const char* pName) + : LiveActor(pName), mModelArray() { _98.x = 0.0f; _98.y = 0.0f; _98.z = 0.0f; @@ -26,7 +27,7 @@ void ChooChooTrain::endClipped() { } } -void ChooChooTrain::init(const JMapInfoIter &rIter) { +void ChooChooTrain::init(const JMapInfoIter& rIter) { if (MR::isValidInfo(rIter)) { MR::isConnectedWithRail(rIter); } @@ -96,7 +97,7 @@ void ChooChooTrain::control() { MR::moveTransToCurrentRailPos(this); TVec3f stack_74(MR::getRailDirection(this)); MR::turnDirectionAndGravityH(this, stack_74, 0.5f, 1.0f); - f32 railCoord = MR::getRailCoord(this); + f32 railCoord = MR::getRailCoord(this); TVec3f stack_68; MR::calcFrontVec(&stack_68, this); TVec3f stack_5C; @@ -123,8 +124,7 @@ void ChooChooTrain::control() { if (mWhistleTimer < 0) { MR::startSound(this, "SE_OJ_TOY_SL_WHISTLE", -1, -1); mWhistleTimer = MR::getRandom((s32)0xB4, (s32)0x258); - } - else { + } else { mWhistleTimer--; } } \ No newline at end of file diff --git a/src/Game/MapObj/CircleCoinGroup.cpp b/src/Game/MapObj/CircleCoinGroup.cpp index fb3c6550b..c201c0a8d 100644 --- a/src/Game/MapObj/CircleCoinGroup.cpp +++ b/src/Game/MapObj/CircleCoinGroup.cpp @@ -1,11 +1,11 @@ #include "Game/MapObj/CircleCoinGroup.hpp" - -CircleCoinGroup::CircleCoinGroup(const char *pName) : CoinGroup(pName) { +CircleCoinGroup::CircleCoinGroup(const char* pName) + : CoinGroup(pName) { mCoinRadius = 200.0f; } -void CircleCoinGroup::initCoinArray(const JMapInfoIter &rIter) { +void CircleCoinGroup::initCoinArray(const JMapInfoIter& rIter) { MR::getJMapInfoArg2NoInit(rIter, &mCoinRadius); MR::initDefaultPos(this, rIter); } @@ -13,20 +13,19 @@ void CircleCoinGroup::initCoinArray(const JMapInfoIter &rIter) { /* CircleCoinGroup::placementCoin */ namespace MR { - NameObj* createCircleCoinGroup(const char *pName) { + NameObj* createCircleCoinGroup(const char* pName) { CircleCoinGroup* group = new CircleCoinGroup(pName); return group; } - NameObj* createCirclePurpleCoinGroup(const char *pName) { + NameObj* createCirclePurpleCoinGroup(const char* pName) { CircleCoinGroup* group = new CircleCoinGroup(pName); group->mIsPurpleCoinGroup = true; return group; } -}; +}; // namespace MR CircleCoinGroup::~CircleCoinGroup() { - } const char* CircleCoinGroup::getCoinName() const { diff --git a/src/Game/MapObj/ClipArea.cpp b/src/Game/MapObj/ClipArea.cpp index 6f774167f..c4f62e0e0 100644 --- a/src/Game/MapObj/ClipArea.cpp +++ b/src/Game/MapObj/ClipArea.cpp @@ -18,9 +18,10 @@ namespace { Color8 sShapeColor(0, 0, 0, 4); Color8 sDebugShapeColor(255, 0, 0, 128); -} +} // namespace -ClipArea::ClipArea(const char * pName) : LiveActor(pName) { +ClipArea::ClipArea(const char* pName) + : LiveActor(pName) { mShape = 0; mBaseMatrix.identity(); MR::createClipAreaHolder(); @@ -29,7 +30,7 @@ ClipArea::ClipArea(const char * pName) : LiveActor(pName) { void ClipArea::init(const JMapInfoIter& rIter) { initBaseMatrix(rIter); - MR::connectToScene(this, 0. -1, -1, -1, 42); + MR::connectToScene(this, 0. - 1, -1, -1, 42); } void ClipArea::initBaseMatrix(const JMapInfoIter& rIter) { @@ -79,9 +80,9 @@ namespace MR { void setClipBottomConeArea(ClipArea* mArea) { mArea->mShape = new ClipAreaShapeCone(1); } -} +} // namespace MR -MtxPtr ClipArea::getBaseMtx() const { +MtxPtr ClipArea::getBaseMtx() const { return (MtxPtr)&mBaseMatrix; } diff --git a/src/Game/MapObj/ClipAreaDrop.cpp b/src/Game/MapObj/ClipAreaDrop.cpp index 6bd2bc0f3..c0bea6cde 100644 --- a/src/Game/MapObj/ClipAreaDrop.cpp +++ b/src/Game/MapObj/ClipAreaDrop.cpp @@ -13,7 +13,8 @@ namespace NrvClipAreaDrop { NEW_NERVE(ClipAreaDropNrvWait, ClipAreaDrop, Wait); } -ClipAreaDrop::ClipAreaDrop(const char* pName) : ClipArea(pName) { +ClipAreaDrop::ClipAreaDrop(const char* pName) + : ClipArea(pName) { _C0 = 0; _C4 = 0.0f; setShape(_C0 = new ClipAreaShapeSphere); @@ -50,8 +51,7 @@ void ClipAreaDrop::exeWait() { f32 f = 0; if (MR::isLessStep(this, 15)) { f = MR::calcNerveEaseOutValue(this, 15, 0.0f, _C4); - } - else { + } else { f = MR::calcNerveEaseInOutValue(this, 0x3C, 0xF0, _C4, 0.0); } _C0->mRadius = f; diff --git a/src/Game/MapObj/ClipAreaDropHolder.cpp b/src/Game/MapObj/ClipAreaDropHolder.cpp index b0bdec386..6b4d873e5 100644 --- a/src/Game/MapObj/ClipAreaDropHolder.cpp +++ b/src/Game/MapObj/ClipAreaDropHolder.cpp @@ -4,7 +4,8 @@ #include "Game/NameObj/NameObj.hpp" #include "Game/Scene/SceneObjHolder.hpp" -ClipAreaDropHolder::ClipAreaDropHolder() : DeriveActorGroup("クリップエリアのしずく管理", 32) { +ClipAreaDropHolder::ClipAreaDropHolder() + : DeriveActorGroup("クリップエリアのしずく管理", 32) { ClipAreaDrop* pClipArea = 0; for (int i = 0; i < 32; i++) { pClipArea = new ClipAreaDrop("クリップエリアのしずく"); @@ -28,8 +29,8 @@ namespace MR { bool appearClipAreaDrop(const TVec3f& rPos, f32 f) { ClipAreaDrop* pClipArea = getDeadClipAreaDrop(); - - if (!pClipArea) + + if (!pClipArea) return false; pClipArea->mPosition.set(rPos); @@ -37,5 +38,5 @@ namespace MR { pClipArea->appear(); return true; } -} +} // namespace MR ClipAreaDropHolder::~ClipAreaDropHolder() {} diff --git a/src/Game/MapObj/ClipAreaDropLaser.cpp b/src/Game/MapObj/ClipAreaDropLaser.cpp index 5d73be2da..1bf1a3d7e 100644 --- a/src/Game/MapObj/ClipAreaDropLaser.cpp +++ b/src/Game/MapObj/ClipAreaDropLaser.cpp @@ -22,8 +22,8 @@ void sdata2() { f32 f3 = -1.0f; } - -ClipAreaDropLaser::ClipAreaDropLaser(const char* pName) : LiveActor(pName) { +ClipAreaDropLaser::ClipAreaDropLaser(const char* pName) + : LiveActor(pName) { mNumPointsToDraw = 0.0f; mPointIndexToSkipDraw = -1; mDrawCount = -1; @@ -48,7 +48,6 @@ void ClipAreaDropLaser::init(const JMapInfoIter& rIter) { makeActorAppeared(); } void ClipAreaDropLaser::control() { - } void ClipAreaDropLaser::draw() const { @@ -58,9 +57,9 @@ void ClipAreaDropLaser::draw() const { GXSetZMode(GX_TRUE, GX_LEQUAL, GX_FALSE); for (int r29 = 1; r29 < mNumPointsToDraw; r29++) { - int u1 = mDrawCount-(r29-1); - int u2 = mDrawCount-r29; - + int u1 = mDrawCount - (r29 - 1); + int u2 = mDrawCount - r29; + if (u1 < 0) u1 += 0x40; if (u2 < 0) @@ -92,7 +91,7 @@ void ClipAreaDropLaser::exeMove() { incrementDrawCount(); if (MR::isRailReachedGoal(this)) { mPointIndexToSkipDraw = mDrawCount; - railPoint = MR::getRailPointNum(this)-1; + railPoint = MR::getRailPointNum(this) - 1; MR::moveCoordAndTransToRailStartPoint(this); } mPoints[mDrawCount].set(mPosition); @@ -122,12 +121,10 @@ void ClipAreaDropLaser::incrementDrawCount() { } } - ClipAreaDropLaser::~ClipAreaDropLaser() { - } namespace NrvClipAreaDropLaser { ClipAreaDropLaserNrvWait(ClipAreaDropLaserNrvWait::sInstance); ClipAreaDropLaserNrvMove(ClipAreaDropLaserNrvMove::sInstance); -} +} // namespace NrvClipAreaDropLaser diff --git a/src/Game/MapObj/ClipAreaHolder.cpp b/src/Game/MapObj/ClipAreaHolder.cpp index 9c572f7aa..274f7be44 100644 --- a/src/Game/MapObj/ClipAreaHolder.cpp +++ b/src/Game/MapObj/ClipAreaHolder.cpp @@ -6,19 +6,17 @@ namespace { ClipAreaHolder* getClipAreaHolder() { return MR::getSceneObj(SceneObj_ClipAreaHolder); } -}; +}; // namespace -ClipAreaHolder::ClipAreaHolder(const char* pName) : - LiveActorGroup(pName, 64), - mIsActive(true) -{ +ClipAreaHolder::ClipAreaHolder(const char* pName) + : LiveActorGroup(pName, 64), + mIsActive(true) { const MR::FunctorV0F func(*MR::setupShadowVolumeDraw); MR::registerPreDrawFunction(func, 42); } void ClipAreaHolder::init(const JMapInfoIter& rIter) { - } namespace MR { @@ -49,4 +47,4 @@ namespace MR { void deactivateClipArea() { getClipAreaHolder()->mIsActive = false; } -} +} // namespace MR diff --git a/src/Game/MapObj/ClipAreaMovable.cpp b/src/Game/MapObj/ClipAreaMovable.cpp index a01dcdc1a..6418d21a8 100644 --- a/src/Game/MapObj/ClipAreaMovable.cpp +++ b/src/Game/MapObj/ClipAreaMovable.cpp @@ -13,7 +13,8 @@ #include "JSystem/JMath/JMath.hpp" #include "revolution/mtx.h" -ClipAreaMovable::ClipAreaMovable(const char* pName) : ClipArea(pName) { +ClipAreaMovable::ClipAreaMovable(const char* pName) + : ClipArea(pName) { mMapPartsRailMover = 0; mMapPartsRotator = 0; } @@ -23,7 +24,7 @@ void ClipAreaMovable::init(const JMapInfoIter& rIter) { MR::connectToScene(this, 0x1C, -1, -1, 0x2A); MR::setGroupClipping(this, rIter, 0x40); f32 f = MR::getMaxAbsElement(mScale); - MR::setClippingTypeSphere(this, f*1400.0f); + MR::setClippingTypeSphere(this, f * 1400.0f); initMoveFunction(rIter); initHitSensor(1); TVec3f stack_8 = TVec3f(0.0f, 0.0f, 0.0f); @@ -93,7 +94,7 @@ void ClipAreaMovable::updateMatrix() { mtx.concat(mMapPartsRotator->getRotateMtx(), mtx); register ClipAreaMovable* regThis = this; - register TMtx34f* regMtx = &mtx; + register TMtx34f* regMtx = &mtx; mtx[0][3] = mPosition.x; mtx[1][3] = mPosition.y; diff --git a/src/Game/MapObj/ClipAreaShape.cpp b/src/Game/MapObj/ClipAreaShape.cpp index 453979edc..a566b9c0d 100644 --- a/src/Game/MapObj/ClipAreaShape.cpp +++ b/src/Game/MapObj/ClipAreaShape.cpp @@ -1,11 +1,12 @@ #include "Game/MapObj/ClipAreaShape.hpp" #include -ClipAreaShape::ClipAreaShape(const char *pName) : mModelData(nullptr) { +ClipAreaShape::ClipAreaShape(const char* pName) + : mModelData(nullptr) { mModelData = MR::getJ3DModelData(pName); } -bool ClipAreaShape::isInArea(const TVec3f &a1, f32 a2, const TPos3f &a3, const TVec3f &a4) const { +bool ClipAreaShape::isInArea(const TVec3f& a1, f32 a2, const TPos3f& a3, const TVec3f& a4) const { if (MR::isNearZero(a4.x, 0.001f) || (MR::isNearZero(a4.y, 0.001f) || MR::isNearZero(a4.z, 0.001f))) { return false; } @@ -22,12 +23,12 @@ bool ClipAreaShape::isInArea(const TVec3f &a1, f32 a2, const TPos3f &a3, const T return isInArea(srcVec); } -void ClipAreaShape::calcVolumeMatrix(TPos3f *pVolMtx, const TPos3f &rSrcMtx, const TVec3f &a3) const { +void ClipAreaShape::calcVolumeMatrix(TPos3f* pVolMtx, const TPos3f& rSrcMtx, const TVec3f& a3) const { pVolMtx->set(rSrcMtx); MR::preScaleMtx(pVolMtx->toMtxPtr(), a3); } -void ClipAreaShape::drawVolumeShape(const TPos3f &rMtx, const TVec3f &rPos) const { +void ClipAreaShape::drawVolumeShape(const TPos3f& rMtx, const TVec3f& rPos) const { TPos3f volMtx; volMtx.identity(); calcVolumeMatrix(&volMtx, rMtx, rPos); @@ -36,30 +37,21 @@ void ClipAreaShape::drawVolumeShape(const TPos3f &rMtx, const TVec3f &rPos) cons MR::drawSimpleModel(mModelData); } -bool ClipAreaShapeSphere::isInArea(register const TVec3f &rVec) const { +bool ClipAreaShapeSphere::isInArea(register const TVec3f& rVec) const { register const ClipAreaShapeSphere* sphere = this; __asm volatile { - psq_l f1, 0(rVec), 0, 0 - lfs f0, sphere->mRadius - ps_mul f1, f1, f1 - lfs f2, 8(rVec) - ps_madd f2, f2, f2, f1 - ps_sum0 f2, f2, f1, f1 - fcmpo, cr0, f2, f0 - mfcr r3 - srwi r3, r3, 31 - blr - }; + psq_l f1, 0(rVec), 0, 0 lfs f0, sphere->mRadius ps_mul f1, f1, f1 lfs f2, 8(rVec)ps_madd f2, f2, f2, f1 ps_sum0 f2, f2, f1, f1 fcmpo, cr0, f2, f0 mfcr r3 srwi r3, r3, 31 blr}; } -ClipAreaShapeCone::ClipAreaShapeCone(s32 a1) : ClipAreaShape("ClipVolumeSphere") { +ClipAreaShapeCone::ClipAreaShapeCone(s32 a1) + : ClipAreaShape("ClipVolumeSphere") { _8 = 500.0f; _C = 1000.0f; _10 = a1; } -bool ClipAreaShapeCone::isInArea(const TVec3f &rVec) const { +bool ClipAreaShapeCone::isInArea(const TVec3f& rVec) const { f32 v3 = (rVec.y / _C); if (!MR::isInRange(v3, 0.0f, 1.0f)) { @@ -71,10 +63,10 @@ bool ClipAreaShapeCone::isInArea(const TVec3f &rVec) const { } f32 v23 = ((rVec.x * rVec.x) + (rVec.z * rVec.z)); - f32 v24 = (v3 * _8) * (v3 * _8); + f32 v24 = (v3 * _8) * (v3 * _8); return v23 == v24; } -bool ClipAreaShape::isInArea(const TVec3f &) const { +bool ClipAreaShape::isInArea(const TVec3f&) const { return false; } \ No newline at end of file diff --git a/src/Game/MapObj/ClipFieldMapParts.cpp b/src/Game/MapObj/ClipFieldMapParts.cpp index b75e7becc..77c2698c6 100644 --- a/src/Game/MapObj/ClipFieldMapParts.cpp +++ b/src/Game/MapObj/ClipFieldMapParts.cpp @@ -1,16 +1,15 @@ #include "Game/LiveActor/HitSensor.hpp" #include "Game/MapObj/ClipFieldMapParts.hpp" -ClipFieldMapParts::ClipFieldMapParts(const char *pName) : GeneralMapParts(pName) { - +ClipFieldMapParts::ClipFieldMapParts(const char* pName) + : GeneralMapParts(pName) { } void ClipFieldMapParts::control() { if (MR::isValidSwitchA(this)) { if (MR::isOnSwitchA(this)) { MR::validateCollisionParts(this); - } - else { + } else { MR::invalidateCollisionParts(this); } } @@ -23,10 +22,9 @@ void ClipFieldMapParts::connectToScene() { } ClipFieldMapParts::~ClipFieldMapParts() { - } -void ClipFieldMapParts::init(const JMapInfoIter &rIter) { +void ClipFieldMapParts::init(const JMapInfoIter& rIter) { GeneralMapParts::init(rIter); MR::needStageSwitchReadA(this, rIter); getSensor("body")->setType(0x49); diff --git a/src/Game/MapObj/ClipFieldSwitch.cpp b/src/Game/MapObj/ClipFieldSwitch.cpp index af31152ae..c6ffd7c72 100644 --- a/src/Game/MapObj/ClipFieldSwitch.cpp +++ b/src/Game/MapObj/ClipFieldSwitch.cpp @@ -2,11 +2,10 @@ #include "Game/MapObj/ClipAreaHolder.hpp" ClipFieldSwitch::~ClipFieldSwitch() { - } -ClipFieldSwitch::ClipFieldSwitch(const char *pName) : LiveActor(pName) { - +ClipFieldSwitch::ClipFieldSwitch(const char* pName) + : LiveActor(pName) { } void ClipFieldSwitch::control() { @@ -19,8 +18,7 @@ void ClipFieldSwitch::control() { if (MR::isValidSwitchB(this)) { MR::offSwitchB(this); } - } - else { + } else { if (MR::isValidSwitchA(this)) { MR::offSwitchA(this); } @@ -31,7 +29,7 @@ void ClipFieldSwitch::control() { } } -void ClipFieldSwitch::init(const JMapInfoIter &rIter) { +void ClipFieldSwitch::init(const JMapInfoIter& rIter) { MR::connectToSceneMapObjMovement(this); MR::useStageSwitchWriteA(this, rIter); MR::useStageSwitchWriteB(this, rIter); diff --git a/src/Game/MapObj/CocoNut.cpp b/src/Game/MapObj/CocoNut.cpp index eeeea8117..ab801b8bd 100644 --- a/src/Game/MapObj/CocoNut.cpp +++ b/src/Game/MapObj/CocoNut.cpp @@ -6,571 +6,555 @@ #include "JSystem/JMath.hpp" #include "math_types.hpp" -inline void negateInternalInline(const TVec3f &src, TVec3f *dst) { - JGeometry::negateInternal((f32 *)&src, (f32 *)dst); +inline void negateInternalInline(const TVec3f& src, TVec3f* dst) { + JGeometry::negateInternal((f32*)&src, (f32*)dst); } -CocoNut::CocoNut(const char *pName) : LiveActor(pName), - _8C(0.0f), - _90(0.0f), - //_94(0.0f, 1.0f), - _D0(55.0f), - _D4(false), - _138(0), - _13C(0), - mSpawnPosition(gZeroVec), - _14C(false), - _150(gZeroVec), - mSphericalShadow(false), - mRespawnWhenOutOfView(false), - _15E(false), - mContinueRolling(false) -{ - _A0.identity(); - _D8.identity(); - _108.identity(); +CocoNut::CocoNut(const char* pName) + : LiveActor(pName), + _8C(0.0f), + _90(0.0f), + //_94(0.0f, 1.0f), + _D0(55.0f), + _D4(false), + _138(0), + _13C(0), + mSpawnPosition(gZeroVec), + _14C(false), + _150(gZeroVec), + mSphericalShadow(false), + mRespawnWhenOutOfView(false), + _15E(false), + mContinueRolling(false) { + _A0.identity(); + _D8.identity(); + _108.identity(); } CocoNut::~CocoNut() { } -void CocoNut::init(const JMapInfoIter &rIter) { - initMapToolInfo(rIter); - initModel(); - MR::connectToSceneNoSilhouettedMapObjStrongLight(this); - MR::initLightCtrl(this); - initSensor(); - initBinder(_D0, 0.0f, 0); - MR::onCalcGravity(this); - initEffect(); - initSound(6, 0); +void CocoNut::init(const JMapInfoIter& rIter) { + initMapToolInfo(rIter); + initModel(); + MR::connectToSceneNoSilhouettedMapObjStrongLight(this); + MR::initLightCtrl(this); + initSensor(); + initBinder(_D0, 0.0f, 0); + MR::onCalcGravity(this); + initEffect(); + initSound(6, 0); - if (!mSphericalShadow) { - MR::initShadowVolumeCylinder(this, _D0); - } - else { - MR::initShadowVolumeSphere(this, _D0); - } + if (!mSphericalShadow) { + MR::initShadowVolumeCylinder(this, _D0); + } else { + MR::initShadowVolumeSphere(this, _D0); + } - MR::setShadowDropLength(this, nullptr, 1500.0f); + MR::setShadowDropLength(this, nullptr, 1500.0f); - s32 stack_8; - if (MR::getJMapInfoClippingGroupID(rIter, &stack_8)) { - MR::setGroupClipping(this, rIter, 32); - _15E = true; - } - else { - MR::setClippingFar200m(this); - } + s32 stack_8; + if (MR::getJMapInfoClippingGroupID(rIter, &stack_8)) { + MR::setGroupClipping(this, rIter, 32); + _15E = true; + } else { + MR::setClippingFar200m(this); + } - MR::tryRegisterDemoCast(this, rIter); + MR::tryRegisterDemoCast(this, rIter); - if (!mSphericalShadow) { - initNerve(&NrvCocoNut::CocoNutNrvWaitOnBind::sInstance); - } - else { - initNerve(&NrvCocoNut::CocoNutNrvWait::sInstance); - } + if (!mSphericalShadow) { + initNerve(&NrvCocoNut::CocoNutNrvWaitOnBind::sInstance); + } else { + initNerve(&NrvCocoNut::CocoNutNrvWait::sInstance); + } - makeActorAppeared(); + makeActorAppeared(); } void CocoNut::initAfterPlacement() { - TPos3f stack_50; + TPos3f stack_50; - TVec3f gravity(mGravity); - MR::makeMtxTR(&stack_50.mMtx[0], this); + TVec3f gravity(mGravity); + MR::makeMtxTR(&stack_50.mMtx[0], this); - _94.set(stack_50.mMtx[0][2], stack_50.mMtx[1][2], stack_50.mMtx[2][2]); + _94.set(stack_50.mMtx[0][2], stack_50.mMtx[1][2], stack_50.mMtx[2][2]); - if (MR::isSameDirection(_94, gravity, 0.01f)) { - TVec3f gravityNegated; - negateInternalInline(gravity, &gravityNegated); + if (MR::isSameDirection(_94, gravity, 0.01f)) { + TVec3f gravityNegated; + negateInternalInline(gravity, &gravityNegated); - TPos3f stack_20; - MR::makeMtxUpNoSupport(&stack_20, gravityNegated); - _94.set(stack_20.mMtx[0][2], stack_20.mMtx[1][2], stack_20.mMtx[2][2]); - } + TPos3f stack_20; + MR::makeMtxUpNoSupport(&stack_20, gravityNegated); + _94.set(stack_20.mMtx[0][2], stack_20.mMtx[1][2], stack_20.mMtx[2][2]); + } } void CocoNut::startClipped() { - if (isNerve(&NrvCocoNut::CocoNutNrvReplaceReady::sInstance)) { - if (!MR::isDemoActive()) { - _90 = 0.0f; - _8C = 0.0f; - _150.zero(); - mVelocity.zero(); - MR::onBind(this); - MR::onCalcGravity(this); - MR::showModel(this); - MR::validateHitSensors(this); - if (!mSphericalShadow) { - _D4 = false; - setNerve(&NrvCocoNut::CocoNutNrvWait::sInstance); - } - else { - setNerve(&NrvCocoNut::CocoNutNrvWaitOnBind::sInstance); - } - } - } - else if (mRespawnWhenOutOfView) { - statusToHide(); - mPosition.set(mSpawnPosition); - setNerve(&NrvCocoNut::CocoNutNrvReplaceReady::sInstance); - } - LiveActor::startClipped(); + if (isNerve(&NrvCocoNut::CocoNutNrvReplaceReady::sInstance)) { + if (!MR::isDemoActive()) { + _90 = 0.0f; + _8C = 0.0f; + _150.zero(); + mVelocity.zero(); + MR::onBind(this); + MR::onCalcGravity(this); + MR::showModel(this); + MR::validateHitSensors(this); + if (!mSphericalShadow) { + _D4 = false; + setNerve(&NrvCocoNut::CocoNutNrvWait::sInstance); + } else { + setNerve(&NrvCocoNut::CocoNutNrvWaitOnBind::sInstance); + } + } + } else if (mRespawnWhenOutOfView) { + statusToHide(); + mPosition.set(mSpawnPosition); + setNerve(&NrvCocoNut::CocoNutNrvReplaceReady::sInstance); + } + LiveActor::startClipped(); } -void CocoNut::hit(const TVec3f &a1, f32 a2) { - setFrontVec(a1); +void CocoNut::hit(const TVec3f& a1, f32 a2) { + setFrontVec(a1); - f32 var_f0; - if (a2 < 1.5f) { - var_f0 = 1.5f; - } - else if (a2 > 35.0f) { - var_f0 = 35.0f; - } - else { - var_f0 = a2; - } + f32 var_f0; + if (a2 < 1.5f) { + var_f0 = 1.5f; + } else if (a2 > 35.0f) { + var_f0 = 35.0f; + } else { + var_f0 = a2; + } - _8C = var_f0; - if (!isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance)) { - setNerve(&NrvCocoNut::CocoNutNrvMove::sInstance); - } + _8C = var_f0; + if (!isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance)) { + setNerve(&NrvCocoNut::CocoNutNrvMove::sInstance); + } } -bool CocoNut::isPossibleToHit(const TVec3f &a1, const TVec3f &a2, const TVec3f &a3) const { - TVec3f stack_2C; - TVec3f stack_20; - TVec3f stack_14; - TVec3f stack_8; +bool CocoNut::isPossibleToHit(const TVec3f& a1, const TVec3f& a2, const TVec3f& a3) const { + TVec3f stack_2C; + TVec3f stack_20; + TVec3f stack_14; + TVec3f stack_8; - stack_2C.sub(a2, a1); - if (MR::normalizeOrZero(&stack_2C)) { - return false; - } - if (MR::normalizeOrZero(a3, &stack_14)) { - return false; - } - if (isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance)) { - if (MR::normalizeOrZero(mVelocity, &stack_8)) { - return false; - } - stack_20.sub(stack_14, stack_8); - if (MR::normalizeOrZero(&stack_20)) { - return false; - } - } - else { - stack_20.set(stack_14); - } - return stack_2C.dot(stack_20) < 0.0f; + stack_2C.sub(a2, a1); + if (MR::normalizeOrZero(&stack_2C)) { + return false; + } + if (MR::normalizeOrZero(a3, &stack_14)) { + return false; + } + if (isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance)) { + if (MR::normalizeOrZero(mVelocity, &stack_8)) { + return false; + } + stack_20.sub(stack_14, stack_8); + if (MR::normalizeOrZero(&stack_20)) { + return false; + } + } else { + stack_20.set(stack_14); + } + return stack_2C.dot(stack_20) < 0.0f; } f32 CocoNut::calcMoveSpeed() const { - return !isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance) ? 0.0f : MR::max(_8C, PSVECMag(&_150)); + return !isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance) ? 0.0f : MR::max(_8C, PSVECMag(&_150)); } void CocoNut::initSensor() { - initHitSensor(2); - MR::addHitSensor(this, "body", ATYPE_COCO_NUT, 16, 65.0f * mScale.x, TVec3f(0.0f, 0.0f, 0.0f)); - MR::addHitSensor(this, "eye", ATYPE_EYE, 16, 1.1f * mScale.x, TVec3f(0.0f, 0.0f, 0.0f)); + initHitSensor(2); + MR::addHitSensor(this, "body", ATYPE_COCO_NUT, 16, 65.0f * mScale.x, TVec3f(0.0f, 0.0f, 0.0f)); + MR::addHitSensor(this, "eye", ATYPE_EYE, 16, 1.1f * mScale.x, TVec3f(0.0f, 0.0f, 0.0f)); } void CocoNut::initModel() { - initModelManagerWithAnm(getModelName(), nullptr, false); + initModelManagerWithAnm(getModelName(), nullptr, false); } void CocoNut::initEffect() { - initEffectKeeper(0, "CocoNut", false); - MR::setEffectHostMtx(this, "RollingSmoke", _D8.toMtxPtr()); - MR::setEffectHostMtx(this, "RollingSmokeAttrWater", _D8.toMtxPtr()); - MR::setEffectHostMtx(this, "RollingSmokeAttrSand", _D8.toMtxPtr()); - MR::setEffectHostMtx(this, "Land", _D8.toMtxPtr()); - MR::setEffectHostMtx(this, "LandAttrWater", _D8.toMtxPtr()); - MR::setEffectHostMtx(this, "WaterColumn", _D8.toMtxPtr()); - MR::setEffectHostMtx(this, getBreakEffectName(), _D8.toMtxPtr()); - MR::setEffectHostMtx(this, "SpinHitMark", _108.toMtxPtr()); + initEffectKeeper(0, "CocoNut", false); + MR::setEffectHostMtx(this, "RollingSmoke", _D8.toMtxPtr()); + MR::setEffectHostMtx(this, "RollingSmokeAttrWater", _D8.toMtxPtr()); + MR::setEffectHostMtx(this, "RollingSmokeAttrSand", _D8.toMtxPtr()); + MR::setEffectHostMtx(this, "Land", _D8.toMtxPtr()); + MR::setEffectHostMtx(this, "LandAttrWater", _D8.toMtxPtr()); + MR::setEffectHostMtx(this, "WaterColumn", _D8.toMtxPtr()); + MR::setEffectHostMtx(this, getBreakEffectName(), _D8.toMtxPtr()); + MR::setEffectHostMtx(this, "SpinHitMark", _108.toMtxPtr()); } #ifdef NON_MATCHING // hell function void CocoNut::updateRotate(f32 a1) { - TMtx34f stack_38; - TVec3f stack_2C; - TVec3f stack_20; - TVec3f stack_14; - TVec3f stack_8; + TMtx34f stack_38; + TVec3f stack_2C; + TVec3f stack_20; + TVec3f stack_14; + TVec3f stack_8; - negateInternalInline(mGravity, &stack_20); - if (!MR::normalizeOrZero(mVelocity, &stack_2C) && !MR::isSameDirection(stack_2C, stack_20, 0.01f)) { + negateInternalInline(mGravity, &stack_20); + if (!MR::normalizeOrZero(mVelocity, &stack_2C) && !MR::isSameDirection(stack_2C, stack_20, 0.01f)) { - PSVECCrossProduct(stack_2C, stack_20, stack_14); + PSVECCrossProduct(stack_2C, stack_20, stack_14); - f32 temp1 = PSVECMag(mVelocity) * -180.0f; - f32 temp2 = a1 * temp1; - f32 f = PI_180 * (temp2 / (PI * getSize())); + f32 temp1 = PSVECMag(mVelocity) * -180.0f; + f32 temp2 = a1 * temp1; + f32 f = PI_180 * (temp2 / (PI * getSize())); - stack_38.mMtx[0][3] = 0.0f; - stack_38.mMtx[1][3] = 0.0f; - stack_38.mMtx[2][3] = 0.0f; + stack_38.mMtx[0][3] = 0.0f; + stack_38.mMtx[1][3] = 0.0f; + stack_38.mMtx[2][3] = 0.0f; - stack_8.set(stack_14); - PSVECMag(stack_8); - PSVECNormalize(stack_8, stack_8); + stack_8.set(stack_14); + PSVECMag(stack_8); + PSVECNormalize(stack_8, stack_8); - f32 fsin = sin(f); - f32 fcos = cos(f); - f32 rx = stack_8.x; - f32 ry = stack_8.y; - f32 rz = stack_8.z; - f32 fcos1 = 1.0f - fcos; + f32 fsin = sin(f); + f32 fcos = cos(f); + f32 rx = stack_8.x; + f32 ry = stack_8.y; + f32 rz = stack_8.z; + f32 fcos1 = 1.0f - fcos; - stack_38.mMtx[0][0] = (rx * rx * fcos1) + fcos; - stack_38.mMtx[0][1] = fcos1 * rx * ry - (fsin * rz); - stack_38.mMtx[0][2] = fcos1 * rx * rz + (fsin * ry); - stack_38.mMtx[1][0] = fcos1 * rx * ry + (fsin * rz); - stack_38.mMtx[1][1] = (ry * ry * fcos1) + fcos; - stack_38.mMtx[1][2] = fcos1 * ry * rz - (fsin * rx); - stack_38.mMtx[2][0] = fcos1 * rx * rz - (fsin * ry); - stack_38.mMtx[2][1] = fcos1 * ry * rz + (fsin * rx); - stack_38.mMtx[2][2] = (rz * rz * fcos1) + fcos; + stack_38.mMtx[0][0] = (rx * rx * fcos1) + fcos; + stack_38.mMtx[0][1] = fcos1 * rx * ry - (fsin * rz); + stack_38.mMtx[0][2] = fcos1 * rx * rz + (fsin * ry); + stack_38.mMtx[1][0] = fcos1 * rx * ry + (fsin * rz); + stack_38.mMtx[1][1] = (ry * ry * fcos1) + fcos; + stack_38.mMtx[1][2] = fcos1 * ry * rz - (fsin * rx); + stack_38.mMtx[2][0] = fcos1 * rx * rz - (fsin * ry); + stack_38.mMtx[2][1] = fcos1 * ry * rz + (fsin * rx); + stack_38.mMtx[2][2] = (rz * rz * fcos1) + fcos; - _A0.concat(stack_38, _A0); - } + _A0.concat(stack_38, _A0); + } } #endif void CocoNut::updateGravity() { - TVec3f stack_8; + TVec3f stack_8; - f32 f31 = _13C ? 0.4f : 1.0f; - stack_8.set(mGravity); - f32 f0 = _90 + f31; + f32 f31 = _13C ? 0.4f : 1.0f; + stack_8.set(mGravity); + f32 f0 = _90 + f31; - f32 f2 = f0 >= 25.0f ? 25.0f : f0; - _90 = f2; - stack_8.scale((f32)(f64)f2); // real - mVelocity.add(stack_8); + f32 f2 = f0 >= 25.0f ? 25.0f : f0; + _90 = f2; + stack_8.scale((f32)(f64)f2); // real + mVelocity.add(stack_8); } #ifdef NON_MATCHING // issues around MR::deleteEffect and PSVECNormalize calls void CocoNut::processMove() { - TVec3f stack_2C; - TVec3f stack_20; - TVec3f stack_14; - TVec3f stack_8; + TVec3f stack_2C; + TVec3f stack_20; + TVec3f stack_14; + TVec3f stack_8; - if (isOnGround()) { - f32 temp_f31 = calcMoveSpeed(); - bool temp_r31 = MR::isBindedGroundWater(this); - const TVec3f *temp_r3_1 = MR::getGroundNormal(this); - if (2.5f < _90) { - if (mGravity.dot(*temp_r3_1) < 0.0f) { - _90 *= 0.5f; - s32 var_r5 = 100.0f * (temp_f31 / 35.0f); - if (var_r5 > 100) { - var_r5 = 100; - } - if (var_r5 > 0) { - if (temp_r31) { - MR::startSound(this, "SE_OJ_COCONUT_BOUND_WATER", var_r5, -1); - } - else { - MR::startSound(this, "SE_OJ_COCONUT_BOUND", var_r5, -1); - } - } - } - if (_138 >= 10 && 3.0f < _90) { - MR::emitEffect(this, "Land"); - } - } - else { - _90 = 0.0f; - } - MR::emitEffect(this, "RollingSmoke"); - s32 var_r5_2 = 100.0f * (temp_f31 / 35.0f); - if (var_r5_2 > 100) { - var_r5_2 = 100; - } - if (var_r5_2 >= 10) { - if (temp_r31) { - MR::startLevelSound(this, "SE_OJ_LV_COCONUT_ROLL_WATER", var_r5_2, -1, -1); - } - else { - MR::startLevelSound(this, "SE_OJ_LV_COCONUT_ROLL", var_r5_2, -1, -1); - } - } - _8C *= 0.925f; - _14C = MR::calcVelocityAreaMoveOnGround(&stack_2C, this); - if (_14C) { - _150.set(stack_2C); - _150.scaleInline(0.75f); - } - _138 = 0; - _13C = false; - updateRotate(1.0f); - } - else { - // volatile? - if (_138 < 10) { - _138++; - } - else { - MR::deleteEffect(this, "RollingSmoke"); - } - updateRotate(0.75f); - } + if (isOnGround()) { + f32 temp_f31 = calcMoveSpeed(); + bool temp_r31 = MR::isBindedGroundWater(this); + const TVec3f* temp_r3_1 = MR::getGroundNormal(this); + if (2.5f < _90) { + if (mGravity.dot(*temp_r3_1) < 0.0f) { + _90 *= 0.5f; + s32 var_r5 = 100.0f * (temp_f31 / 35.0f); + if (var_r5 > 100) { + var_r5 = 100; + } + if (var_r5 > 0) { + if (temp_r31) { + MR::startSound(this, "SE_OJ_COCONUT_BOUND_WATER", var_r5, -1); + } else { + MR::startSound(this, "SE_OJ_COCONUT_BOUND", var_r5, -1); + } + } + } + if (_138 >= 10 && 3.0f < _90) { + MR::emitEffect(this, "Land"); + } + } else { + _90 = 0.0f; + } + MR::emitEffect(this, "RollingSmoke"); + s32 var_r5_2 = 100.0f * (temp_f31 / 35.0f); + if (var_r5_2 > 100) { + var_r5_2 = 100; + } + if (var_r5_2 >= 10) { + if (temp_r31) { + MR::startLevelSound(this, "SE_OJ_LV_COCONUT_ROLL_WATER", var_r5_2, -1, -1); + } else { + MR::startLevelSound(this, "SE_OJ_LV_COCONUT_ROLL", var_r5_2, -1, -1); + } + } + _8C *= 0.925f; + _14C = MR::calcVelocityAreaMoveOnGround(&stack_2C, this); + if (_14C) { + _150.set(stack_2C); + _150.scaleInline(0.75f); + } + _138 = 0; + _13C = false; + updateRotate(1.0f); + } else { + // volatile? + if (_138 < 10) { + _138++; + } else { + MR::deleteEffect(this, "RollingSmoke"); + } + updateRotate(0.75f); + } - if (getWallNormal(&stack_20) && _94.dot(stack_20) < 0.0f) { - stack_14.set(_94); - PSVECMag(stack_14); - PSVECNormalize(stack_14, stack_14); + if (getWallNormal(&stack_20) && _94.dot(stack_20) < 0.0f) { + stack_14.set(_94); + PSVECMag(stack_14); + PSVECNormalize(stack_14, stack_14); - stack_8.set(stack_20); - PSVECMag(stack_8); - PSVECNormalize(stack_8, stack_8); + stack_8.set(stack_20); + PSVECMag(stack_8); + PSVECNormalize(stack_8, stack_8); - f32 ok2 = -2.0f * stack_14.dot(stack_8); - JMAVECScaleAdd(stack_8, _94, _94, ok2); + f32 ok2 = -2.0f * stack_14.dot(stack_8); + JMAVECScaleAdd(stack_8, _94, _94, ok2); - PSVECMag(_94); - PSVECNormalize(_94, _94); - _94.normalize(_94); + PSVECMag(_94); + PSVECNormalize(_94, _94); + _94.normalize(_94); - _8C *= 0.8f; + _8C *= 0.8f; - MR::startSound(this, "SE_OJ_COCONUT_BOUND", 100.0f * (calcMoveSpeed() / 35.0f), -1); - } - setFrontVec(_94); - mVelocity.set(_94); - mVelocity.scale(_8C); + MR::startSound(this, "SE_OJ_COCONUT_BOUND", 100.0f * (calcMoveSpeed() / 35.0f), -1); + } + setFrontVec(_94); + mVelocity.set(_94); + mVelocity.scale(_8C); - bool ok = _14C && _138 < 10; - if (!ok) { - _150.scaleInline(0.925f); - } - mVelocity.add(_150); - updateGravity(); + bool ok = _14C && _138 < 10; + if (!ok) { + _150.scaleInline(0.925f); + } + mVelocity.add(_150); + updateGravity(); } #endif -void CocoNut::setFrontVec(const TVec3f &a1) { - TVec3f stack_14; - TVec3f stack_8(mGravity); - if (!MR::normalizeOrZero(a1, &stack_14)) { - if (MR::isSameDirection(a1, stack_8, 0.01f)) { - _94.set(stack_14); - } - else { - MR::vecKillElement(stack_14, stack_8, &_94); - MR::normalize(&_94); - } - } +void CocoNut::setFrontVec(const TVec3f& a1) { + TVec3f stack_14; + TVec3f stack_8(mGravity); + if (!MR::normalizeOrZero(a1, &stack_14)) { + if (MR::isSameDirection(a1, stack_8, 0.01f)) { + _94.set(stack_14); + } else { + MR::vecKillElement(stack_14, stack_8, &_94); + MR::normalize(&_94); + } + } } -bool CocoNut::tryHit(HitSensor *pOtherSensor, HitSensor *pMySensor) { - CocoNut *nut = reinterpret_cast(pMySensor->mHost); - if (!isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance)) { - return false; - } - f32 moveSpeed = nut->calcMoveSpeed(); - if (calcMoveSpeed() < moveSpeed) { - return false; - } - TVec3f *otherSensorPos = &pOtherSensor->mPosition; - TVec3f *mySensorPos = &pMySensor->mPosition; - if (!nut->isPossibleToHit(*mySensorPos, *otherSensorPos, mVelocity)) { - return false; - } +bool CocoNut::tryHit(HitSensor* pOtherSensor, HitSensor* pMySensor) { + CocoNut* nut = reinterpret_cast(pMySensor->mHost); + if (!isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance)) { + return false; + } + f32 moveSpeed = nut->calcMoveSpeed(); + if (calcMoveSpeed() < moveSpeed) { + return false; + } + TVec3f* otherSensorPos = &pOtherSensor->mPosition; + TVec3f* mySensorPos = &pMySensor->mPosition; + if (!nut->isPossibleToHit(*mySensorPos, *otherSensorPos, mVelocity)) { + return false; + } - TVec3f stack_1C; - TVec3f stack_10; - f32 stack_C; - f32 stack_8; - calcHitSpeedAndFrontVec(&stack_C, &stack_8, &stack_1C, &stack_10, *otherSensorPos, *mySensorPos); - hit(stack_1C, stack_C); - nut->hit(stack_10, stack_8); - return true; + TVec3f stack_1C; + TVec3f stack_10; + f32 stack_C; + f32 stack_8; + calcHitSpeedAndFrontVec(&stack_C, &stack_8, &stack_1C, &stack_10, *otherSensorPos, *mySensorPos); + hit(stack_1C, stack_C); + nut->hit(stack_10, stack_8); + return true; } -bool CocoNut::tryPushedFromActor(HitSensor *pOtherSensor, HitSensor *pMySensor) { - TVec3f stack_34; - TVec3f stack_28; - TVec3f stack_1C; - TVec3f stack_10; - f32 stack_C; - f32 stack_8; +bool CocoNut::tryPushedFromActor(HitSensor* pOtherSensor, HitSensor* pMySensor) { + TVec3f stack_34; + TVec3f stack_28; + TVec3f stack_1C; + TVec3f stack_10; + f32 stack_C; + f32 stack_8; - TVec3f *otherSensorPos = &pOtherSensor->mPosition; - TVec3f *mySensorPos = &pMySensor->mPosition; - if (_13C) { - return false; - } - if (isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance)) { - stack_34.sub(*otherSensorPos, *mySensorPos); - MR::normalize(&stack_34); - if (0.0f < stack_34.dot(_94)) { - return false; - } - calcHitSpeedAndFrontVec(&stack_C, &stack_8, &stack_28, &stack_1C, *otherSensorPos, *mySensorPos); - hit(stack_28, stack_C); - } - else { - f32 mySensorRadius = pMySensor->mRadius; - f32 otherSensorRadius = pOtherSensor->mRadius; - if (((otherSensorRadius + mySensorRadius) - PSVECDistance(otherSensorPos, mySensorPos)) < 0.0f) { - return false; - } - stack_10.sub(*otherSensorPos, *mySensorPos); - if (MR::normalizeOrZero(&stack_10)) { - return false; - } - hit(stack_10, 1.5f); - } - return true; + TVec3f* otherSensorPos = &pOtherSensor->mPosition; + TVec3f* mySensorPos = &pMySensor->mPosition; + if (_13C) { + return false; + } + if (isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance)) { + stack_34.sub(*otherSensorPos, *mySensorPos); + MR::normalize(&stack_34); + if (0.0f < stack_34.dot(_94)) { + return false; + } + calcHitSpeedAndFrontVec(&stack_C, &stack_8, &stack_28, &stack_1C, *otherSensorPos, *mySensorPos); + hit(stack_28, stack_C); + } else { + f32 mySensorRadius = pMySensor->mRadius; + f32 otherSensorRadius = pOtherSensor->mRadius; + if (((otherSensorRadius + mySensorRadius) - PSVECDistance(otherSensorPos, mySensorPos)) < 0.0f) { + return false; + } + stack_10.sub(*otherSensorPos, *mySensorPos); + if (MR::normalizeOrZero(&stack_10)) { + return false; + } + hit(stack_10, 1.5f); + } + return true; } void CocoNut::reviseFrontVec() { - HitSensor *sensor; + HitSensor* sensor; - HitSensor *eye = getSensor("eye"); - LiveActor *found_actor = nullptr; + HitSensor* eye = getSensor("eye"); + LiveActor* found_actor = nullptr; - for (int i = 0; i < eye->mSensorCount; i++) { - sensor = eye->mSensors[i]; - if ((sensor->isType(0x26) || sensor->isType(0x56)) && !MR::isDead(sensor->mHost)) { - found_actor = sensor->mHost; - break; - } - } - if (found_actor == nullptr) { - return; - } + for (int i = 0; i < eye->mSensorCount; i++) { + sensor = eye->mSensors[i]; + if ((sensor->isType(0x26) || sensor->isType(0x56)) && !MR::isDead(sensor->mHost)) { + found_actor = sensor->mHost; + break; + } + } + if (found_actor == nullptr) { + return; + } - TVec3f stack_28(mGravity); - TVec3f stack_20; - TVec3f stack_14; - TVec3f stack_8; + TVec3f stack_28(mGravity); + TVec3f stack_20; + TVec3f stack_14; + TVec3f stack_8; - stack_14.sub(found_actor->mPosition, this->mPosition); - if (!MR::isSameDirection(stack_14, stack_20, 0.01f)) { - MR::vecKillElement(stack_14, stack_20, &stack_8); - MR::normalize(&stack_8); - f32 temp_f31 = stack_8.dot(_94); - if (MR::cosDegree(15.0f) < temp_f31) { - JMAVECLerp(&_94, &stack_8, &_94, 0.8f); - } - } + stack_14.sub(found_actor->mPosition, this->mPosition); + if (!MR::isSameDirection(stack_14, stack_20, 0.01f)) { + MR::vecKillElement(stack_14, stack_20, &stack_8); + MR::normalize(&stack_8); + f32 temp_f31 = stack_8.dot(_94); + if (MR::cosDegree(15.0f) < temp_f31) { + JMAVECLerp(&_94, &stack_8, &_94, 0.8f); + } + } } void CocoNut::statusToWait() { - mVelocity.zero(); - _90 = 0.0f; - _8C = 0.0f; - _150.zero(); - MR::validateClipping(this); - if (!mSphericalShadow && !MR::isBindedGroundIce(this)) { - _D4 = true; - MR::offBind(this); - MR::offCalcGravity(this); - if (!isNerve(&NrvCocoNut::CocoNutNrvWait::sInstance)) { - setNerve(&NrvCocoNut::CocoNutNrvWait::sInstance); - } - } - else { - setNerve(&NrvCocoNut::CocoNutNrvWaitOnBind::sInstance); - } + mVelocity.zero(); + _90 = 0.0f; + _8C = 0.0f; + _150.zero(); + MR::validateClipping(this); + if (!mSphericalShadow && !MR::isBindedGroundIce(this)) { + _D4 = true; + MR::offBind(this); + MR::offCalcGravity(this); + if (!isNerve(&NrvCocoNut::CocoNutNrvWait::sInstance)) { + setNerve(&NrvCocoNut::CocoNutNrvWait::sInstance); + } + } else { + setNerve(&NrvCocoNut::CocoNutNrvWaitOnBind::sInstance); + } } void CocoNut::tryMoveEnd() { - if (isOnGround()) { - bool var_r3 = _14C && _138 < 10; - if (!var_r3 && calcMoveSpeed() < 1.5f && (!mContinueRolling || !isContactWithOtherCocoNut())) { - statusToWait(); - return; - } - } - if (sendMsgToBindedSensor()) { - setNerve(&NrvCocoNut::CocoNutNrvBreak::sInstance); - return; - } - if (!tryDisappear()) { - _8C = MR::max(_8C, 1.5f); - } + if (isOnGround()) { + bool var_r3 = _14C && _138 < 10; + if (!var_r3 && calcMoveSpeed() < 1.5f && (!mContinueRolling || !isContactWithOtherCocoNut())) { + statusToWait(); + return; + } + } + if (sendMsgToBindedSensor()) { + setNerve(&NrvCocoNut::CocoNutNrvBreak::sInstance); + return; + } + if (!tryDisappear()) { + _8C = MR::max(_8C, 1.5f); + } } bool CocoNut::tryDisappear() { - TVec3f stack_14; - stack_14.scale(-100.0f, mGravity); - if (MR::isInWater(this, stack_14)) { - setNerve(&NrvCocoNut::CocoNutNrvInWater::sInstance); - return true; - } - if (MR::isInDeath(this, TVec3f(0.0f, 0.0f, 0.0f))) { - setNerve(&NrvCocoNut::CocoNutNrvBreak::sInstance); - return true; - } - return false; + TVec3f stack_14; + stack_14.scale(-100.0f, mGravity); + if (MR::isInWater(this, stack_14)) { + setNerve(&NrvCocoNut::CocoNutNrvInWater::sInstance); + return true; + } + if (MR::isInDeath(this, TVec3f(0.0f, 0.0f, 0.0f))) { + setNerve(&NrvCocoNut::CocoNutNrvBreak::sInstance); + return true; + } + return false; } -bool CocoNut::isValidPushedFromPlayer(const HitSensor *arg0, const HitSensor *arg1) const { - if (_90 < 0.0f) { - return false; - } - if (isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance) && MR::isLessStep(this, 15)) { - return false; - } - TVec3f *playerVelocity = MR::getPlayerVelocity(); - f32 nutVelocitySquared = mVelocity.squared(); - if (playerVelocity->squared() < nutVelocitySquared) { - return false; - } - TVec3f stack_14; - stack_14.sub(arg0->mPosition, arg1->mPosition); - if (MR::normalizeOrZero(&stack_14)) { - return false; - } - TVec3f stack_8; - if (MR::normalizeOrZero(*playerVelocity, &stack_8)) { - return false; - } - if (stack_14.dot(stack_8) < MR::cosDegree(45.0f)) { - return false; - } +bool CocoNut::isValidPushedFromPlayer(const HitSensor* arg0, const HitSensor* arg1) const { + if (_90 < 0.0f) { + return false; + } + if (isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance) && MR::isLessStep(this, 15)) { + return false; + } + TVec3f* playerVelocity = MR::getPlayerVelocity(); + f32 nutVelocitySquared = mVelocity.squared(); + if (playerVelocity->squared() < nutVelocitySquared) { + return false; + } + TVec3f stack_14; + stack_14.sub(arg0->mPosition, arg1->mPosition); + if (MR::normalizeOrZero(&stack_14)) { + return false; + } + TVec3f stack_8; + if (MR::normalizeOrZero(*playerVelocity, &stack_8)) { + return false; + } + if (stack_14.dot(stack_8) < MR::cosDegree(45.0f)) { + return false; + } - return true; + return true; } #ifdef NON_MATCHING // the frsqrte is most likely an inlined function. possibly JGeometry::TUtil::sqrt -void CocoNut::calcHitSpeedAndFrontVec(f32 *arg0, f32 *arg1, TVec3f *arg2, TVec3f *arg3, const TVec3f &arg4, const TVec3f &arg5) const { - TVec3f stack_14; - TVec3f stack_8; +void CocoNut::calcHitSpeedAndFrontVec(f32* arg0, f32* arg1, TVec3f* arg2, TVec3f* arg3, const TVec3f& arg4, const TVec3f& arg5) const { + TVec3f stack_14; + TVec3f stack_8; - arg3->sub(arg5, arg4); - MR::normalize(arg3); - stack_14.set(mGravity); - PSVECCrossProduct(arg3, stack_14, arg2); - MR::normalize(arg2); - if (MR::normalizeOrZero(mVelocity, &stack_8)) { - stack_8.set(_94); - } - f32 var_f30 = stack_8.dot(*arg2); - if (var_f30 < 0.0f) { - negateInternalInline(stack_14, &stack_14); - PSVECCrossProduct(arg3, stack_14, arg2); - MR::normalize(arg2); - var_f30 = stack_8.dot(*arg2); - } + arg3->sub(arg5, arg4); + MR::normalize(arg3); + stack_14.set(mGravity); + PSVECCrossProduct(arg3, stack_14, arg2); + MR::normalize(arg2); + if (MR::normalizeOrZero(mVelocity, &stack_8)) { + stack_8.set(_94); + } + f32 var_f30 = stack_8.dot(*arg2); + if (var_f30 < 0.0f) { + negateInternalInline(stack_14, &stack_14); + PSVECCrossProduct(arg3, stack_14, arg2); + MR::normalize(arg2); + var_f30 = stack_8.dot(*arg2); + } - f32 temp_f2 = 1.0f - (var_f30 * var_f30); + f32 temp_f2 = 1.0f - (var_f30 * var_f30); - f32 var_f31; - if (temp_f2 > 0.0f) { + f32 var_f31; + if (temp_f2 > 0.0f) { f32 temp_f31 = __frsqrte(temp_f2); f32 temp_f3 = temp_f31 * temp_f2; var_f31 = -((temp_f3 * temp_f31) - 3.0f) * temp_f3 * 0.5f; @@ -578,122 +562,119 @@ void CocoNut::calcHitSpeedAndFrontVec(f32 *arg0, f32 *arg1, TVec3f *arg2, TVec3f var_f31 = temp_f2; } - f32 temp_f1_2 = calcMoveSpeed(); - *arg1 = temp_f1_2 * var_f31; - *arg0 = temp_f1_2 * var_f30; + f32 temp_f1_2 = calcMoveSpeed(); + *arg1 = temp_f1_2 * var_f31; + *arg0 = temp_f1_2 * var_f30; } #endif bool CocoNut::isOnGround() const { - if (0.0f < _90 && MR::isOnGround(this)) { - const TVec3f *groundNormal = MR::getGroundNormal(this); - if (groundNormal->dot(mGravity) < MR::cosDegree(120.0f)) { - return true; - } - } + if (0.0f < _90 && MR::isOnGround(this)) { + const TVec3f* groundNormal = MR::getGroundNormal(this); + if (groundNormal->dot(mGravity) < MR::cosDegree(120.0f)) { + return true; + } + } - return false; + return false; } -bool CocoNut::getWallNormal(TVec3f *arg0) const { - if (MR::isBindedWall(this)) { - arg0->set(*MR::getWallNormal(this)); - return true; - } +bool CocoNut::getWallNormal(TVec3f* arg0) const { + if (MR::isBindedWall(this)) { + arg0->set(*MR::getWallNormal(this)); + return true; + } - if (0.0f < _90 && (MR::isOnGround(this)) && !isOnGround()) { - arg0->set(*MR::getGroundNormal(this)); - return true; - } + if (0.0f < _90 && (MR::isOnGround(this)) && !isOnGround()) { + arg0->set(*MR::getGroundNormal(this)); + return true; + } - return false; + return false; } bool CocoNut::sendMsgToBindedSensor() { - if (MR::isBindedGround(this)) { - return sendMsgEnemyAttackToBindedSensor(MR::getGroundSensor(this)); - } + if (MR::isBindedGround(this)) { + return sendMsgEnemyAttackToBindedSensor(MR::getGroundSensor(this)); + } - if (MR::isBindedWall(this)) { - return sendMsgEnemyAttackToBindedSensor(MR::getWallSensor(this)); - } + if (MR::isBindedWall(this)) { + return sendMsgEnemyAttackToBindedSensor(MR::getWallSensor(this)); + } - if (MR::isBindedRoof(this)) { - return sendMsgEnemyAttackToBindedSensor(MR::getRoofSensor(this)); - } + if (MR::isBindedRoof(this)) { + return sendMsgEnemyAttackToBindedSensor(MR::getRoofSensor(this)); + } - return false; + return false; } -bool CocoNut::sendMsgEnemyAttackToBindedSensor(HitSensor *pSensor) { - if (_13C) { - return MR::sendMsgEnemyAttack(pSensor, getSensor("body")); - } +bool CocoNut::sendMsgEnemyAttackToBindedSensor(HitSensor* pSensor) { + if (_13C) { + return MR::sendMsgEnemyAttack(pSensor, getSensor("body")); + } - return false; + return false; } -bool CocoNut::isValidReceiveMsg(const HitSensor *pSensor) const { - return ( - isNerve(&NrvCocoNut::CocoNutNrvWait::sInstance) - || isNerve(&NrvCocoNut::CocoNutNrvWaitOnBind::sInstance) - || isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance) - ) && pSensor == getSensor("body"); +bool CocoNut::isValidReceiveMsg(const HitSensor* pSensor) const { + return ( + isNerve(&NrvCocoNut::CocoNutNrvWait::sInstance) || isNerve(&NrvCocoNut::CocoNutNrvWaitOnBind::sInstance) || isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance)) && + pSensor == getSensor("body"); } -const char *CocoNut::getModelName() { - bool watermelonMode = MR::isStarPieceCounterStop(); - return watermelonMode ? "Watermelon" : "CocoNut"; +const char* CocoNut::getModelName() { + bool watermelonMode = MR::isStarPieceCounterStop(); + return watermelonMode ? "Watermelon" : "CocoNut"; } -const char *CocoNut::getBreakEffectName() { - bool watermelonMode = MR::isStarPieceCounterStop(); - return watermelonMode ? "BreakWatermelon" : "CocoNutBreak"; +const char* CocoNut::getBreakEffectName() { + bool watermelonMode = MR::isStarPieceCounterStop(); + return watermelonMode ? "BreakWatermelon" : "CocoNutBreak"; } -void CocoNut::makeArchiveList(NameObjArchiveListCollector *pArchiveList, const JMapInfoIter &rIter) { - pArchiveList->addArchive(getModelName()); +void CocoNut::makeArchiveList(NameObjArchiveListCollector* pArchiveList, const JMapInfoIter& rIter) { + pArchiveList->addArchive(getModelName()); } void CocoNut::calcAndSetBaseMtx() { - _A0.mMtx[0][3] = this->mPosition.x; - _A0.mMtx[1][3] = this->mPosition.y; - _A0.mMtx[2][3] = this->mPosition.z; + _A0.mMtx[0][3] = this->mPosition.x; + _A0.mMtx[1][3] = this->mPosition.y; + _A0.mMtx[2][3] = this->mPosition.z; - MR::setBaseTRMtx(this, _A0); + MR::setBaseTRMtx(this, _A0); - if (isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance) && MR::isOnGround(this)) { - const TVec3f *groundNormal = MR::getGroundNormal(this); - f32 temp_f31 = _D0; + if (isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance) && MR::isOnGround(this)) { + const TVec3f* groundNormal = MR::getGroundNormal(this); + f32 temp_f31 = _D0; - TVec3f stack_8(*groundNormal); - stack_8.scale(temp_f31); + TVec3f stack_8(*groundNormal); + stack_8.scale(temp_f31); - TVec3f stack_14; - stack_14.sub(mPosition, stack_8); + TVec3f stack_14; + stack_14.sub(mPosition, stack_8); - if (MR::isSameDirection(*groundNormal, _94, 0.01f)) { - MR::makeMtxUpNoSupportPos(&_D8, *groundNormal, stack_14); - } - else { - MR::makeMtxUpFrontPos(&_D8, *groundNormal, _94, stack_14); - } + if (MR::isSameDirection(*groundNormal, _94, 0.01f)) { + MR::makeMtxUpNoSupportPos(&_D8, *groundNormal, stack_14); + } else { + MR::makeMtxUpFrontPos(&_D8, *groundNormal, _94, stack_14); + } - f32 temp_f9 = mScale.x; - _D8.mMtx[0][0] *= temp_f9; - _D8.mMtx[0][1] *= temp_f9; - _D8.mMtx[0][2] *= temp_f9; - _D8.mMtx[1][0] *= temp_f9; - _D8.mMtx[1][1] *= temp_f9; - _D8.mMtx[1][2] *= temp_f9; - _D8.mMtx[2][0] *= temp_f9; - _D8.mMtx[2][1] *= temp_f9; - _D8.mMtx[2][2] *= temp_f9; - } + f32 temp_f9 = mScale.x; + _D8.mMtx[0][0] *= temp_f9; + _D8.mMtx[0][1] *= temp_f9; + _D8.mMtx[0][2] *= temp_f9; + _D8.mMtx[1][0] *= temp_f9; + _D8.mMtx[1][1] *= temp_f9; + _D8.mMtx[1][2] *= temp_f9; + _D8.mMtx[2][0] *= temp_f9; + _D8.mMtx[2][1] *= temp_f9; + _D8.mMtx[2][2] *= temp_f9; + } } -void CocoNut::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { - if (!isValidReceiveMsg(pSender)) { +void CocoNut::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { + if (!isValidReceiveMsg(pSender)) { return; } @@ -701,290 +682,280 @@ void CocoNut::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { if (!MR::isPlayerHipDropFalling()) { MR::sendMsgPush(pReceiver, pSender); } - } - else if (pReceiver->isType(0x17)) { + } else if (pReceiver->isType(0x17)) { if (MR::sendMsgPush(pReceiver, pSender)) { MR::startSound(this, "SE_OJ_COCONUT_HIT", -1, -1); } - } - else if (_13C && isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance) && MR::sendMsgToEnemyAttackBlow(pReceiver, pSender)) { + } else if (_13C && isNerve(&NrvCocoNut::CocoNutNrvMove::sInstance) && MR::sendMsgToEnemyAttackBlow(pReceiver, pSender)) { MR::startSound(this, "SE_OJ_COCONUT_HIT", -1, -1); setNerve(&NrvCocoNut::CocoNutNrvBreak::sInstance); - } - else { + } else { MR::sendMsgPush(pReceiver, pSender); - } + } } -bool CocoNut::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { - if (!isValidReceiveMsg(pReceiver)) { - return false; - } +bool CocoNut::receiveMsgPush(HitSensor* pSender, HitSensor* pReceiver) { + if (!isValidReceiveMsg(pReceiver)) { + return false; + } - if (pSender->isType(0x17)) { - return tryHit(pReceiver, pSender); - } + if (pSender->isType(0x17)) { + return tryHit(pReceiver, pSender); + } - return tryPushedFromActor(pReceiver, pSender); + return tryPushedFromActor(pReceiver, pSender); } -bool CocoNut::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - if (!isValidReceiveMsg(pReceiver)) { - return false; - } +bool CocoNut::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + if (!isValidReceiveMsg(pReceiver)) { + return false; + } - if (!MR::isMsgPlayerHitAll(msg) - && !MR::isMsgPlayerTrample(msg) - && !MR::isMsgPlayerHipDrop(msg) - && !MR::isMsgStarPieceReflect(msg)) - { - return false; - } + if (!MR::isMsgPlayerHitAll(msg) && !MR::isMsgPlayerTrample(msg) && !MR::isMsgPlayerHipDrop(msg) && !MR::isMsgStarPieceReflect(msg)) { + return false; + } - f32 var_f31; - f32 var_f30; + f32 var_f31; + f32 var_f30; - if (MR::isMsgPlayerSpinAttack(msg)) { - var_f31 = 35.0f; - var_f30 = -20.0f; - MR::startSound(this, "SE_PM_SPIN_HIT", -1, -1); - MR::startSound(this, "SE_OJ_COCONUT_LAUNCH", -1, -1); - emitEffectSpinHit(pSender, pReceiver); - _13C = true; - } - else if (MR::isMsgPlayerHipDrop(msg) || MR::isMsgInvincibleAttack(msg)) { - var_f31 = 25.0f; - var_f30 = -15.0f; - MR::startSound(this, "SE_OJ_COCONUT_FLIP_M", -1, -1); + if (MR::isMsgPlayerSpinAttack(msg)) { + var_f31 = 35.0f; + var_f30 = -20.0f; + MR::startSound(this, "SE_PM_SPIN_HIT", -1, -1); + MR::startSound(this, "SE_OJ_COCONUT_LAUNCH", -1, -1); + emitEffectSpinHit(pSender, pReceiver); + _13C = true; + } else if (MR::isMsgPlayerHipDrop(msg) || MR::isMsgInvincibleAttack(msg)) { + var_f31 = 25.0f; + var_f30 = -15.0f; + MR::startSound(this, "SE_OJ_COCONUT_FLIP_M", -1, -1); - if (MR::isMsgPlayerHipDrop(msg)) { - MR::sendMsgAwayJump(pSender, pReceiver); - } - } - else { - var_f31 = 10.0f; - var_f30 = -5.0f; - MR::startSound(this, "SE_OJ_COCONUT_FLIP_S", -1, -1); - } + if (MR::isMsgPlayerHipDrop(msg)) { + MR::sendMsgAwayJump(pSender, pReceiver); + } + } else { + var_f31 = 10.0f; + var_f30 = -5.0f; + MR::startSound(this, "SE_OJ_COCONUT_FLIP_S", -1, -1); + } - _8C = var_f31; - _90 = var_f30; - TVec3f stack_2C; - TVec3f stack_20; - TVec3f stack_14; - stack_2C.sub(pReceiver->mPosition, pSender->mPosition); + _8C = var_f31; + _90 = var_f30; + TVec3f stack_2C; + TVec3f stack_20; + TVec3f stack_14; + stack_2C.sub(pReceiver->mPosition, pSender->mPosition); - if (MR::isMsgStarPieceReflect(msg) && !MR::normalizeOrZero(stack_2C, &stack_20) && !MR::normalizeOrZero(pSender->mHost->mVelocity, &stack_14)) { - if (stack_20.dot(stack_14) < MR::cosDegree(60.0f)) { - TVec3f stack_8(stack_14); - stack_8.scale(65.0f); - stack_2C.add(stack_8); - } - } + if (MR::isMsgStarPieceReflect(msg) && !MR::normalizeOrZero(stack_2C, &stack_20) && !MR::normalizeOrZero(pSender->mHost->mVelocity, &stack_14)) { + if (stack_20.dot(stack_14) < MR::cosDegree(60.0f)) { + TVec3f stack_8(stack_14); + stack_8.scale(65.0f); + stack_2C.add(stack_8); + } + } - setFrontVec(stack_2C); + setFrontVec(stack_2C); - if (MR::isMsgPlayerSpinAttack(msg)) { - reviseFrontVec(); - } + if (MR::isMsgPlayerSpinAttack(msg)) { + reviseFrontVec(); + } - setNerve(&NrvCocoNut::CocoNutNrvMove::sInstance); - return true; + setNerve(&NrvCocoNut::CocoNutNrvMove::sInstance); + return true; } -bool CocoNut::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - f32 temp_f0; - f32 temp_f1; - f32 var_f2; +bool CocoNut::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + f32 temp_f0; + f32 temp_f1; + f32 var_f2; - if (!isValidReceiveMsg(pReceiver)) { - return false; - } + if (!isValidReceiveMsg(pReceiver)) { + return false; + } - if (MR::isMsgPlayerKick(msg)) { - if (isValidPushedFromPlayer(pReceiver, pSender)) { - TVec3f *playerVelocity = MR::getPlayerVelocity(); - setFrontVec(*playerVelocity); - temp_f1 = _94.dot(*playerVelocity); - var_f2 = 18.0f; - temp_f0 = 1.1f * temp_f1; + if (MR::isMsgPlayerKick(msg)) { + if (isValidPushedFromPlayer(pReceiver, pSender)) { + TVec3f* playerVelocity = MR::getPlayerVelocity(); + setFrontVec(*playerVelocity); + temp_f1 = _94.dot(*playerVelocity); + var_f2 = 18.0f; + temp_f0 = 1.1f * temp_f1; - _8C = MR::max(var_f2, temp_f0); - _90 = -(0.7f * temp_f1); - MR::startSound(this, "SE_OJ_COCONUT_FLIP_S", -1, -1); - setNerve(&NrvCocoNut::CocoNutNrvMove::sInstance); - return true; - } - } - else if (MR::isMsgHitmarkEmit(msg)) { - return true; - } + _8C = MR::max(var_f2, temp_f0); + _90 = -(0.7f * temp_f1); + MR::startSound(this, "SE_OJ_COCONUT_FLIP_S", -1, -1); + setNerve(&NrvCocoNut::CocoNutNrvMove::sInstance); + return true; + } + } else if (MR::isMsgHitmarkEmit(msg)) { + return true; + } - return false; + return false; } -void CocoNut::initMapToolInfo(const JMapInfoIter &rIter) { - MR::initDefaultPos(this, rIter); - MR::getJMapInfoArg0NoInit(rIter, &mSphericalShadow); - MR::getJMapInfoArg1NoInit(rIter, &mRespawnWhenOutOfView); - MR::getJMapInfoArg2NoInit(rIter, &mContinueRolling); - _D0 = 55.0f * mScale.x; - mSpawnPosition.set(mPosition); +void CocoNut::initMapToolInfo(const JMapInfoIter& rIter) { + MR::initDefaultPos(this, rIter); + MR::getJMapInfoArg0NoInit(rIter, &mSphericalShadow); + MR::getJMapInfoArg1NoInit(rIter, &mRespawnWhenOutOfView); + MR::getJMapInfoArg2NoInit(rIter, &mContinueRolling); + _D0 = 55.0f * mScale.x; + mSpawnPosition.set(mPosition); } void CocoNut::statusToHide() { - mVelocity.zero(); - MR::offBind(this); - MR::offCalcGravity(this); - MR::hideModel(this); - MR::invalidateHitSensors(this); - MR::clearHitSensors(this); - MR::deleteEffectAll(this); + mVelocity.zero(); + MR::offBind(this); + MR::offCalcGravity(this); + MR::hideModel(this); + MR::invalidateHitSensors(this); + MR::clearHitSensors(this); + MR::deleteEffectAll(this); } -void CocoNut::emitEffectSpinHit(const HitSensor *pOtherSensor, const HitSensor *pMySensor) { - TVec3f point; // point 70% of the way between pOtherSensor and pMySensor - JMAVECLerp(&pOtherSensor->mPosition, &pMySensor->mPosition, &point, 0.7f); - _108.mMtx[0][0] = 1.0f; - _108.mMtx[1][0] = 0.0f; - _108.mMtx[2][0] = 0.0f; - _108.mMtx[0][1] = 0.0f; - _108.mMtx[1][1] = 1.0f; - _108.mMtx[2][1] = 0.0f; - _108.mMtx[0][2] = 0.0f; - _108.mMtx[1][3] = 0.0f; - _108.mMtx[2][3] = 1.0f; - _108.mMtx[0][3] = point.x; - _108.mMtx[1][3] = point.y; - _108.mMtx[2][3] = point.z; - MR::emitEffect(this, "SpinHitMark"); +void CocoNut::emitEffectSpinHit(const HitSensor* pOtherSensor, const HitSensor* pMySensor) { + TVec3f point; // point 70% of the way between pOtherSensor and pMySensor + JMAVECLerp(&pOtherSensor->mPosition, &pMySensor->mPosition, &point, 0.7f); + _108.mMtx[0][0] = 1.0f; + _108.mMtx[1][0] = 0.0f; + _108.mMtx[2][0] = 0.0f; + _108.mMtx[0][1] = 0.0f; + _108.mMtx[1][1] = 1.0f; + _108.mMtx[2][1] = 0.0f; + _108.mMtx[0][2] = 0.0f; + _108.mMtx[1][3] = 0.0f; + _108.mMtx[2][3] = 1.0f; + _108.mMtx[0][3] = point.x; + _108.mMtx[1][3] = point.y; + _108.mMtx[2][3] = point.z; + MR::emitEffect(this, "SpinHitMark"); } bool CocoNut::isContactWithOtherCocoNut() const { - HitSensor *body = getSensor("body"); - for (int i = 0; i < body->mSensorCount; i++) { - HitSensor *sensor = body->mSensors[i]; - if (body->mSensors[i]->isType(0x17)) { - return true; - } - } - return false; + HitSensor* body = getSensor("body"); + for (int i = 0; i < body->mSensorCount; i++) { + HitSensor* sensor = body->mSensors[i]; + if (body->mSensors[i]->isType(0x17)) { + return true; + } + } + return false; } void CocoNut::exeWait() { - if (MR::isFirstStep(this)) { - MR::deleteEffect(this, "RollingSmoke"); - } - if (!_D4) { - if (tryDisappear()) { - return; - } - updateGravity(); - } - if (!_D4 && MR::isOnGround(this)) { - statusToWait(); - } + if (MR::isFirstStep(this)) { + MR::deleteEffect(this, "RollingSmoke"); + } + if (!_D4) { + if (tryDisappear()) { + return; + } + updateGravity(); + } + if (!_D4 && MR::isOnGround(this)) { + statusToWait(); + } } void CocoNut::exeWaitOnBind() { - if (MR::isFirstStep(this)) { - MR::deleteEffect(this, "RollingSmoke"); - } - if (!tryDisappear()) { - updateGravity(); - if (MR::isOnGround(this)) { - statusToWait(); - } - } + if (MR::isFirstStep(this)) { + MR::deleteEffect(this, "RollingSmoke"); + } + if (!tryDisappear()) { + updateGravity(); + if (MR::isOnGround(this)) { + statusToWait(); + } + } } void CocoNut::exeMove() { - if (MR::isFirstStep(this)) { - _138 = 0; - _14C = false; - _150.zero(); - MR::onBind(this); - MR::onCalcGravity(this); - MR::calcGravity(this); - if (!_15E) { - MR::invalidateClipping(this); - } - } - if (_13C && MR::isStep(this, 1)) { - MR::stopScene(4); - } - processMove(); - tryMoveEnd(); + if (MR::isFirstStep(this)) { + _138 = 0; + _14C = false; + _150.zero(); + MR::onBind(this); + MR::onCalcGravity(this); + MR::calcGravity(this); + if (!_15E) { + MR::invalidateClipping(this); + } + } + if (_13C && MR::isStep(this, 1)) { + MR::stopScene(4); + } + processMove(); + tryMoveEnd(); } void CocoNut::exeInWater() { - if (MR::isFirstStep(this)) { - mVelocity.zero(); - MR::offBind(this); - MR::offCalcGravity(this); - MR::hideModel(this); - MR::invalidateHitSensors(this); - MR::clearHitSensors(this); - MR::deleteEffectAll(this); - TVec3f gravityNegated; - negateInternalInline(mGravity, &gravityNegated); - MR::makeMtxUpNoSupportPos(&_D8, gravityNegated, mPosition); - MR::emitEffect(this, "WaterColumn"); - MR::startSound(this, "SE_OJ_FALL_IN_WATER_M", -1, -1); - MR::releaseSoundHandle(this, "SE_OJ_FALL_IN_WATER_M"); - } - if (!MR::isEffectValid(this, "WaterColumn")) { - mPosition.set(mSpawnPosition); - setNerve(&NrvCocoNut::CocoNutNrvReplaceReady::sInstance); - } + if (MR::isFirstStep(this)) { + mVelocity.zero(); + MR::offBind(this); + MR::offCalcGravity(this); + MR::hideModel(this); + MR::invalidateHitSensors(this); + MR::clearHitSensors(this); + MR::deleteEffectAll(this); + TVec3f gravityNegated; + negateInternalInline(mGravity, &gravityNegated); + MR::makeMtxUpNoSupportPos(&_D8, gravityNegated, mPosition); + MR::emitEffect(this, "WaterColumn"); + MR::startSound(this, "SE_OJ_FALL_IN_WATER_M", -1, -1); + MR::releaseSoundHandle(this, "SE_OJ_FALL_IN_WATER_M"); + } + if (!MR::isEffectValid(this, "WaterColumn")) { + mPosition.set(mSpawnPosition); + setNerve(&NrvCocoNut::CocoNutNrvReplaceReady::sInstance); + } } void CocoNut::exeBreak() { - if (MR::isFirstStep(this)) { - statusToHide(); - TVec3f gravityNegated; - negateInternalInline(mGravity, &gravityNegated); - MR::makeMtxUpNoSupportPos(&_D8, gravityNegated, mPosition); - MR::emitEffect(this, getBreakEffectName()); - } - if (!MR::isEffectValid(this, getBreakEffectName())) { - mPosition.set(mSpawnPosition); - setNerve(&NrvCocoNut::CocoNutNrvReplaceReady::sInstance); - } + if (MR::isFirstStep(this)) { + statusToHide(); + TVec3f gravityNegated; + negateInternalInline(mGravity, &gravityNegated); + MR::makeMtxUpNoSupportPos(&_D8, gravityNegated, mPosition); + MR::emitEffect(this, getBreakEffectName()); + } + if (!MR::isEffectValid(this, getBreakEffectName())) { + mPosition.set(mSpawnPosition); + setNerve(&NrvCocoNut::CocoNutNrvReplaceReady::sInstance); + } } namespace NrvCocoNut { - INIT_NERVE(CocoNutNrvWait) - INIT_NERVE(CocoNutNrvWaitOnBind) - INIT_NERVE(CocoNutNrvMove) - INIT_NERVE(CocoNutNrvInWater) - INIT_NERVE(CocoNutNrvBreak) - INIT_NERVE(CocoNutNrvReplaceReady) + INIT_NERVE(CocoNutNrvWait) + INIT_NERVE(CocoNutNrvWaitOnBind) + INIT_NERVE(CocoNutNrvMove) + INIT_NERVE(CocoNutNrvInWater) + INIT_NERVE(CocoNutNrvBreak) + INIT_NERVE(CocoNutNrvReplaceReady) - void CocoNutNrvReplaceReady::execute(Spine *pSpine) const { - CocoNut *nut = reinterpret_cast(pSpine->mExecutor); - if (MR::isFirstStep(nut)) { - MR::validateClipping(nut); - } - } - void CocoNutNrvBreak::execute(Spine *pSpine) const { - CocoNut *nut = reinterpret_cast(pSpine->mExecutor); - nut->exeBreak(); - } - void CocoNutNrvInWater::execute(Spine *pSpine) const { - CocoNut *nut = reinterpret_cast(pSpine->mExecutor); - nut->exeInWater(); - } - void CocoNutNrvMove::execute(Spine *pSpine) const { - CocoNut *nut = reinterpret_cast(pSpine->mExecutor); - nut->exeMove(); - } - void CocoNutNrvWaitOnBind::execute(Spine *pSpine) const { - CocoNut *nut = reinterpret_cast(pSpine->mExecutor); - nut->exeWaitOnBind(); - } - void CocoNutNrvWait::execute(Spine *pSpine) const { - CocoNut *nut = reinterpret_cast(pSpine->mExecutor); - nut->exeWait(); - } -} + void CocoNutNrvReplaceReady::execute(Spine* pSpine) const { + CocoNut* nut = reinterpret_cast(pSpine->mExecutor); + if (MR::isFirstStep(nut)) { + MR::validateClipping(nut); + } + } + void CocoNutNrvBreak::execute(Spine* pSpine) const { + CocoNut* nut = reinterpret_cast(pSpine->mExecutor); + nut->exeBreak(); + } + void CocoNutNrvInWater::execute(Spine* pSpine) const { + CocoNut* nut = reinterpret_cast(pSpine->mExecutor); + nut->exeInWater(); + } + void CocoNutNrvMove::execute(Spine* pSpine) const { + CocoNut* nut = reinterpret_cast(pSpine->mExecutor); + nut->exeMove(); + } + void CocoNutNrvWaitOnBind::execute(Spine* pSpine) const { + CocoNut* nut = reinterpret_cast(pSpine->mExecutor); + nut->exeWaitOnBind(); + } + void CocoNutNrvWait::execute(Spine* pSpine) const { + CocoNut* nut = reinterpret_cast(pSpine->mExecutor); + nut->exeWait(); + } +} // namespace NrvCocoNut diff --git a/src/Game/MapObj/CoconutTree.cpp b/src/Game/MapObj/CoconutTree.cpp index b60008d03..bf9c28a5b 100644 --- a/src/Game/MapObj/CoconutTree.cpp +++ b/src/Game/MapObj/CoconutTree.cpp @@ -1,15 +1,14 @@ #include "Game/MapObj/CoconutTree.hpp" #include "Game/Util.hpp" -CoconutTree::CoconutTree(const char *pName) : LiveActor(pName) { - +CoconutTree::CoconutTree(const char* pName) + : LiveActor(pName) { } CoconutTree::~CoconutTree() { - } -void CoconutTree::init(const JMapInfoIter &rIter) { +void CoconutTree::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("CoconutTree", nullptr, false); MR::connectToSceneMapObj(this); diff --git a/src/Game/MapObj/Coin.cpp b/src/Game/MapObj/Coin.cpp index a10608a3f..16bb32f3c 100644 --- a/src/Game/MapObj/Coin.cpp +++ b/src/Game/MapObj/Coin.cpp @@ -5,7 +5,8 @@ #include "Game/Util.hpp" #include "JSystem/JMath/JMath.hpp" -Coin::Coin(const char *pName) : LiveActor(pName) { +Coin::Coin(const char* pName) + : LiveActor(pName) { mHostInfo = nullptr; mFlashCtrl = nullptr; mAirBubble = nullptr; @@ -24,7 +25,7 @@ Coin::Coin(const char *pName) : LiveActor(pName) { mIsNeedBubble = false; } -void Coin::init(const JMapInfoIter &rIter) { +void Coin::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm(mIsPurpleCoin ? "PurpleCoin" : "Coin", nullptr, false); MR::connectToSceneItemStrongLight(this); @@ -64,17 +65,15 @@ void Coin::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchReadAppear(this, rIter)) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { appearFixInit(); } if (MR::useStageSwitchReadB(this, rIter)) { - MR::FunctorV0M deadFunc = MR::Functor(this, &Coin::makeActorDead); + MR::FunctorV0M deadFunc = MR::Functor(this, &Coin::makeActorDead); MR::listenStageSwitchOnB(this, deadFunc); } - } - else { + } else { makeActorDead(); } @@ -85,7 +84,7 @@ void Coin::initAfterPlacement() { MR::setClippingRangeIncludeShadow(this, &mClippingRange, 150.0f); } -void Coin::initShadow(const JMapInfoIter &rIter) { +void Coin::initShadow(const JMapInfoIter& rIter) { f32 arg_5 = -1.0f; s32 arg_6 = -1; @@ -95,15 +94,15 @@ void Coin::initShadow(const JMapInfoIter &rIter) { } switch (arg_6) { - case 0: - MR::initShadowSurfaceCircle(this, 50.0f); - break; - case 1: - MR::initShadowVolumeCylinder(this, 50.0f); - break; - default: - MR::initShadowVolumeSphere(this, 50.0f); - break; + case 0: + MR::initShadowSurfaceCircle(this, 50.0f); + break; + case 1: + MR::initShadowVolumeCylinder(this, 50.0f); + break; + default: + MR::initShadowVolumeSphere(this, 50.0f); + break; } MR::setShadowDropPositionPtr(this, nullptr, &mDropPosition); @@ -113,7 +112,7 @@ void Coin::initShadow(const JMapInfoIter &rIter) { } } -void Coin::setShadowAndPoseModeFromJMapIter(const JMapInfoIter &rIter) { +void Coin::setShadowAndPoseModeFromJMapIter(const JMapInfoIter& rIter) { bool arg_3 = false; MR::getJMapInfoArg3WithInit(rIter, &arg_3); _B9 = arg_3; @@ -132,15 +131,13 @@ void Coin::makeActorAppeared() { if (!mIsPurpleCoin && MR::isGalaxyDarkCometAppearInCurrentStage()) { LiveActor::makeActorDead(); - } - else { + } else { LiveActor::makeActorAppeared(); if (mIsNeedBubble) { mAirBubble->makeActorAppeared(); MR::setSensorRadius(this, "coin", 150.0f); - } - else { + } else { MR::setSensorRadius(this, "coin", 55.0f); } @@ -172,19 +169,16 @@ void Coin::calcAndSetBaseMtx() { if (_BA) { MR::makeMtxTR(pos.toMtxPtr(), this); - } - else { + } else { MR::makeMtxUpNoSupportPos(&pos, another_vec, mPosition); } if (isNerve(&NrvCoin::CoinNrvSpinDrained::sInstance)) { pos.concat(pos, MR::getCoinHiSpeedRotateYMatrix()); - } - else { + } else { if (mIsInWater) { pos.concat(pos, MR::getCoinInWaterRotateYMatrix()); - } - else { + } else { pos.concat(pos, MR::getCoinRotateYMatrix()); } } @@ -192,36 +186,29 @@ void Coin::calcAndSetBaseMtx() { MR::setBaseTRMtx(this, pos); } -bool Coin::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool Coin::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { bool result; - + if (MR::isMsgItemGet(msg)) { noticeGetCoin(); MR::emitEffect(this, "CoinGet"); mFlashCtrl->end(); kill(); result = true; - } - else if (MR::isMsgItemPull(msg)) { + } else if (MR::isMsgItemPull(msg)) { result = requestSpinDrain(); - } - else if (MR::isMsgItemShow(msg)) { + } else if (MR::isMsgItemShow(msg)) { result = requestShow(); - } - else if (MR::isMsgItemHide(msg)) { + } else if (MR::isMsgItemHide(msg)) { result = requestHide(); - } - else if (MR::isMsgItemStartMove(msg)) { + } else if (MR::isMsgItemStartMove(msg)) { result = requestStartControl(); - } - else if (MR::isMsgItemEndMove(msg)) { + } else if (MR::isMsgItemEndMove(msg)) { result = requestEndControl(); - } - else if (MR::isMsgInhaleBlackHole(msg)) { + } else if (MR::isMsgInhaleBlackHole(msg)) { kill(); result = true; - } - else { + } else { result = false; } @@ -256,7 +243,7 @@ void Coin::exeFixTimer() { } } -void Coin::exeMove() { +void Coin::exeMove() { if (MR::isFirstStep(this)) { mFlashCtrl->start(_B0); MR::onCalcShadow(this, nullptr); @@ -271,12 +258,10 @@ void Coin::exeMove() { MR::emitEffect(this, "LavaFall"); MR::startSound(this, "SE_OJ_FALL_IN_MAGMA_S", -1, -1); kill(); - } - else { + } else { if (MR::isInDeath(this, TVec3f(0.0f, 0.0f, 0.0f))) { kill(); - } - else { + } else { MR::calcGravityOrZero(this); if (MR::isPressedRoofAndGround(this)) { @@ -380,7 +365,7 @@ void Coin::appearFixTimer(s32 a1, s32 a2) { setNerve(&NrvCoin::CoinNrvFixTimer::sInstance); } -void Coin::appearMove(const TVec3f &a1, const TVec3f &a2, s32 a3, s32 a4) { +void Coin::appearMove(const TVec3f& a1, const TVec3f& a2, s32 a3, s32 a4) { mPosition.set(a1); makeActorAppeared(); MR::invalidateClipping(this); @@ -394,8 +379,7 @@ void Coin::appearMove(const TVec3f &a1, const TVec3f &a2, s32 a3, s32 a4) { mGravity.x = 0.0f; mGravity.y = -1.0f; mGravity.z = 0.0f; - } - else { + } else { mGravity.set(-stack_14); } @@ -405,13 +389,12 @@ void Coin::appearMove(const TVec3f &a1, const TVec3f &a2, s32 a3, s32 a4) { setNerve(&NrvCoin::CoinNrvMove::sInstance); } -void Coin::appearHop(const TVec3f &a1, const TVec3f &a2) { +void Coin::appearHop(const TVec3f& a1, const TVec3f& a2) { if (MR::isNearZero(a2, 0.001f)) { mGravity.x = 0.0f; mGravity.y = -1.0f; mGravity.z = 0.0f; - } - else { + } else { MR::normalize(-a2, &mGravity); } @@ -464,7 +447,7 @@ bool Coin::requestStartControl() { if (MR::isDead(this)) { return false; } - + if (!isNerve(&NrvCoin::CoinNrvFix::sInstance) && !isNerve(&NrvCoin::CoinNrvFixHide::sInstance)) { return false; } @@ -545,8 +528,7 @@ void Coin::noticeGetCoin() { if (mIsPurpleCoin) { MR::incPurpleCoin(); MR::startSystemSE("SE_SY_PURPLE_COIN", -1, -1); - } - else { + } else { MR::incCoin(1); MR::startSystemSE("SE_SY_COIN", -1, -1); mHostInfo->_C++; @@ -556,13 +538,12 @@ void Coin::noticeGetCoin() { void Coin::setLife(s32 life) { if (life < 0) { _B0 = 0x258; - } - else { + } else { _B0 = life; } } -void Coin::setHostInfo(CoinHostInfo *pInfo) { +void Coin::setHostInfo(CoinHostInfo* pInfo) { mHostInfo = pInfo; } @@ -570,8 +551,7 @@ void Coin::setCalcShadowMode() { if (_B9) { MR::onCalcShadow(this, nullptr); MR::onCalcShadowDropPrivateGravity(this, nullptr); - } - else { + } else { MR::onCalcShadowOneTime(this, nullptr); MR::onCalcShadowDropPrivateGravityOneTime(this, nullptr); } @@ -580,8 +560,7 @@ void Coin::setCalcShadowMode() { void Coin::setCannotTime(s32 time) { if (time < 0) { mCannotTime = 0x1E; - } - else { + } else { mCannotTime = time; } } @@ -620,21 +599,19 @@ void Coin::calcRebouond() { void Coin::attenuateVelocity() { f32 velocity; - + if (mIsInWater) { velocity = 0.80000001f; - } - else if (MR::isOnGround(this)) { + } else if (MR::isOnGround(this)) { velocity = 0.89999998f; - } - else { + } else { velocity = 0.995f; } MR::attenuateVelocity(this, velocity); } -bool Coin::isNeedBubble(const JMapInfoIter &rIter) { +bool Coin::isNeedBubble(const JMapInfoIter& rIter) { if (!MR::isValidInfo(rIter)) { return false; } @@ -644,14 +621,14 @@ bool Coin::isNeedBubble(const JMapInfoIter &rIter) { return arg; } -void Coin::makeArchiveList(NameObjArchiveListCollector *pList, const JMapInfoIter &rIter) { +void Coin::makeArchiveList(NameObjArchiveListCollector* pList, const JMapInfoIter& rIter) { if (Coin::isNeedBubble(rIter)) { pList->addArchive("AirBubble"); } } namespace MR { - NameObj* createDirectSetCoin(const char *pName) { + NameObj* createDirectSetCoin(const char* pName) { Coin* coin = new Coin(pName); MR::createCoinHolder(); MR::createCoinRotater(); @@ -659,7 +636,7 @@ namespace MR { return coin; } - NameObj* createCoin(const NameObj *pObj, const char *pName) { + NameObj* createCoin(const NameObj* pObj, const char* pName) { Coin* coin = new Coin(pName); MR::createCoinHolder(); MR::createCoinRotater(); @@ -667,7 +644,7 @@ namespace MR { return coin; } - NameObj* createDirectSetPurpleCoin(const char *pName) { + NameObj* createDirectSetPurpleCoin(const char* pName) { Coin* coin = new Coin(pName); coin->mIsPurpleCoin = true; MR::createPurpleCoinHolder(); @@ -676,7 +653,7 @@ namespace MR { return coin; } - NameObj* createPurpleCoin(const NameObj *pObj, const char *pName) { + NameObj* createPurpleCoin(const NameObj* pObj, const char* pName) { Coin* coin = new Coin(pName); coin->mIsPurpleCoin = true; MR::createPurpleCoinHolder(); @@ -684,7 +661,7 @@ namespace MR { MR::addToPurpleCoinHolder(pObj, coin); return coin; } -}; +}; // namespace MR namespace NrvCoin { INIT_NERVE(CoinNrvNonActive); @@ -696,46 +673,44 @@ namespace NrvCoin { INIT_NERVE(CoinNrvMove); INIT_NERVE(CoinNrvHop); - void CoinNrvHop::execute(Spine *pSpine) const { + void CoinNrvHop::execute(Spine* pSpine) const { Coin* coin = reinterpret_cast(pSpine->mExecutor); coin->exeHop(); } - void CoinNrvMove::execute(Spine *pSpine) const { + void CoinNrvMove::execute(Spine* pSpine) const { Coin* coin = reinterpret_cast(pSpine->mExecutor); coin->exeMove(); } - void CoinNrvSpinDrained::execute(Spine *pSpine) const { + void CoinNrvSpinDrained::execute(Spine* pSpine) const { Coin* coin = reinterpret_cast(pSpine->mExecutor); coin->exeSpinDrained(); } - void CoinNrvControled::execute(Spine *pSpine) const { + void CoinNrvControled::execute(Spine* pSpine) const { Coin* coin = reinterpret_cast(pSpine->mExecutor); coin->exeControled(); } - void CoinNrvFixTimer::execute(Spine *pSpine) const { + void CoinNrvFixTimer::execute(Spine* pSpine) const { Coin* coin = reinterpret_cast(pSpine->mExecutor); coin->exeFixTimer(); } - void CoinNrvFixHide::execute(Spine *pSpine) const { - + void CoinNrvFixHide::execute(Spine* pSpine) const { } - void CoinNrvFix::execute(Spine *pSpine) const { + void CoinNrvFix::execute(Spine* pSpine) const { Coin* coin = reinterpret_cast(pSpine->mExecutor); coin->exeFix(); } - void CoinNrvNonActive::execute(Spine *pSpine) const { + void CoinNrvNonActive::execute(Spine* pSpine) const { Coin* coin = reinterpret_cast(pSpine->mExecutor); coin->exeNonActive(); } -}; +}; // namespace NrvCoin Coin::~Coin() { - } diff --git a/src/Game/MapObj/CoinBox.cpp b/src/Game/MapObj/CoinBox.cpp index 2074d9e4f..cf188d9c4 100644 --- a/src/Game/MapObj/CoinBox.cpp +++ b/src/Game/MapObj/CoinBox.cpp @@ -1,15 +1,14 @@ #include "Game/LiveActor/HitSensor.hpp" #include "Game/MapObj/CoinBox.hpp" -CoinBox::CoinBox(const char *pName) : LiveActor(pName) { - +CoinBox::CoinBox(const char* pName) + : LiveActor(pName) { } CoinBox::~CoinBox() { - } -void CoinBox::init(const JMapInfoIter &rIter) { +void CoinBox::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::connectToSceneMapObjMovement(this); initSound(6, false); @@ -39,7 +38,7 @@ void CoinBox::exeHit() { MR::getRotatedAxisY(&axis_y, mRotation); MR::calcGravityOrZero(this); TVec3f stack_38; - f32 val = MR::vecKillElement(axis_y, mGravity, &stack_38); + f32 val = MR::vecKillElement(axis_y, mGravity, &stack_38); TVec3f stack_8 = stack_38 * 10.0f; TVec3f stack_2C((mGravity * val) * 30.0f); @@ -49,11 +48,8 @@ void CoinBox::exeHit() { } } -bool CoinBox::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - if (msg == ACTMES_TORNADO_ATTACK - || msg == ACTMES_TORNADO_STORM_RANGE - || msg == ACTMES_SPIN_STORM_RANGE) - { +bool CoinBox::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + if (msg == ACTMES_TORNADO_ATTACK || msg == ACTMES_TORNADO_STORM_RANGE || msg == ACTMES_SPIN_STORM_RANGE) { setNerve(&NrvCoinBox::CoinBoxNrvHit::sInstance); return true; @@ -66,12 +62,11 @@ namespace NrvCoinBox { INIT_NERVE(CoinBoxNrvWait); INIT_NERVE(CoinBoxNrvHit); - void CoinBoxNrvHit::execute(Spine *pSpine) const { + void CoinBoxNrvHit::execute(Spine* pSpine) const { CoinBox* box = reinterpret_cast(pSpine->mExecutor); box->exeHit(); } - void CoinBoxNrvWait::execute(Spine *pSpine) const { - + void CoinBoxNrvWait::execute(Spine* pSpine) const { } -}; +}; // namespace NrvCoinBox diff --git a/src/Game/MapObj/CoinGroup.cpp b/src/Game/MapObj/CoinGroup.cpp index 0fd4a99ba..2a0c62442 100644 --- a/src/Game/MapObj/CoinGroup.cpp +++ b/src/Game/MapObj/CoinGroup.cpp @@ -1,7 +1,8 @@ #include "Game/MapObj/CoinGroup.hpp" #include "Game/Util.hpp" -CoinGroup::CoinGroup(const char *pName) : LiveActor(pName) { +CoinGroup::CoinGroup(const char* pName) + : LiveActor(pName) { mCoinArray = nullptr; mCameraInfo = nullptr; mCoinCount = 0; @@ -9,7 +10,7 @@ CoinGroup::CoinGroup(const char *pName) : LiveActor(pName) { mIsPurpleCoinGroup = false; } -void CoinGroup::init(const JMapInfoIter &rIter) { +void CoinGroup::init(const JMapInfoIter& rIter) { s32 count = 0; MR::getJMapInfoArg0NoInit(rIter, &count); mCoinCount = count; @@ -20,8 +21,7 @@ void CoinGroup::init(const JMapInfoIter &rIter) { for (u32 i = 0; i < mCoinCount; i++) { if (mIsPurpleCoinGroup) { mCoinArray[i] = reinterpret_cast(MR::createPurpleCoin(this, getCoinName())); - } - else { + } else { mCoinArray[i] = reinterpret_cast(MR::createCoin(this, getCoinName())); } @@ -43,27 +43,24 @@ void CoinGroup::init(const JMapInfoIter &rIter) { placementCoin(); if (MR::tryRegisterDemoCast(this, rIter)) { - MR::FunctorV0M demoFunc = MR::Functor(this, &CoinGroup::appearCoinAll); + MR::FunctorV0M demoFunc = MR::Functor(this, &CoinGroup::appearCoinAll); MR::registerDemoActionFunctor(this, demoFunc, "コイン出現"); - } - else if (MR::useStageSwitchReadAppear(this, rIter)) { + } else if (MR::useStageSwitchReadAppear(this, rIter)) { MR::connectToSceneMapObjMovement(this); MR::syncStageSwitchAppear(this); MR::initActorCamera(this, rIter, &mCameraInfo); if (MR::isExistActorCamera(mCameraInfo)) { initNerve(&NrvCoinGroup::CoinGroupNrvDemoAppear::sInstance); - } - else { + } else { initNerve(&NrvCoinGroup::CoinGroupNrvAppear::sInstance); } - } - else { + } else { appearCoinFix(); } if (MR::useStageSwitchReadB(this, rIter)) { - MR::FunctorV0M killFunc = MR::Functor(this, &CoinGroup::killCoinAll); + MR::FunctorV0M killFunc = MR::Functor(this, &CoinGroup::killCoinAll); MR::listenStageSwitchOnB(this, killFunc); } @@ -80,8 +77,7 @@ void CoinGroup::killCoinAll() { void CoinGroup::appearCoinAll() { if (mTimeLimit >= 0) { appearCoinAllTimer(); - } - else { + } else { appearCoinFix(); } } @@ -98,7 +94,7 @@ void CoinGroup::appearCoinAllTimer() { } } -void CoinGroup::setCoinTrans(s32 coinIndex, const TVec3f &rPos) { +void CoinGroup::setCoinTrans(s32 coinIndex, const TVec3f& rPos) { Coin* coin = mCoinArray[coinIndex]; coin->mPosition.x = rPos.x; coin->mPosition.y = rPos.y; @@ -107,7 +103,7 @@ void CoinGroup::setCoinTrans(s32 coinIndex, const TVec3f &rPos) { void CoinGroup::appear() { LiveActor::appear(); - + if (isNerve(&NrvCoinGroup::CoinGroupNrvDemoAppear::sInstance)) { MR::requestStartDemo(this, "出現", &NrvCoinGroup::CoinGroupNrvDemoAppear::sInstance, &NrvCoinGroup::CoinGroupNrvTryStartDemo::sInstance); } @@ -117,8 +113,7 @@ void CoinGroup::exeAppear() { if (MR::isStep(this, 3)) { if (mIsPurpleCoinGroup) { MR::startSystemSE("SE_SY_PURPLE_COIN_APPEAR", -1, -1); - } - else { + } else { MR::startSystemSE("SE_SY_COIN_APPEAR", -1, -1); } @@ -149,30 +144,28 @@ namespace NrvCoinGroup { INIT_NERVE(CoinGroupNrvDemoAppear); INIT_NERVE(CoinGroupNrvKill); - void CoinGroupNrvKill::execute(Spine *pSpine) const { + void CoinGroupNrvKill::execute(Spine* pSpine) const { CoinGroup* coin = reinterpret_cast(pSpine->mExecutor); coin->kill(); } - void CoinGroupNrvDemoAppear::execute(Spine *pSpine) const { + void CoinGroupNrvDemoAppear::execute(Spine* pSpine) const { CoinGroup* coin = reinterpret_cast(pSpine->mExecutor); coin->exeDemoAppear(); } - void CoinGroupNrvTryStartDemo::execute(Spine *pSpine) const { - + void CoinGroupNrvTryStartDemo::execute(Spine* pSpine) const { } - void CoinGroupNrvAppear::execute(Spine *pSpine) const { + void CoinGroupNrvAppear::execute(Spine* pSpine) const { CoinGroup* coin = reinterpret_cast(pSpine->mExecutor); coin->exeAppear(); } -}; +}; // namespace NrvCoinGroup const char* CoinGroup::getCoinName() const { return "コイン(グループ配置)"; } void CoinGroup::placementCoin() { - } \ No newline at end of file diff --git a/src/Game/MapObj/CoinHolder.cpp b/src/Game/MapObj/CoinHolder.cpp index 29ad6a6e0..6d46172ec 100644 --- a/src/Game/MapObj/CoinHolder.cpp +++ b/src/Game/MapObj/CoinHolder.cpp @@ -3,11 +3,12 @@ #include "Game/NameObj/NameObj.hpp" #include "Game/Scene/SceneObjHolder.hpp" -CoinHolder::CoinHolder(const char *pName) : DeriveActorGroup(pName, 0x200), mHostInfoArr(nullptr), mHostInfoCount(0) { +CoinHolder::CoinHolder(const char* pName) + : DeriveActorGroup(pName, 0x200), mHostInfoArr(nullptr), mHostInfoCount(0) { mHostInfoArr = new CoinHostInfo[0x200]; } -bool CoinHolder::hopCoin(const NameObj *pObj, const TVec3f &a2, const TVec3f &a3) { +bool CoinHolder::hopCoin(const NameObj* pObj, const TVec3f& a2, const TVec3f& a3) { CoinHostInfo* hostInfo = findHostInfo(pObj); if (hostInfo->_8 >= hostInfo->_4) { @@ -19,31 +20,31 @@ bool CoinHolder::hopCoin(const NameObj *pObj, const TVec3f &a2, const TVec3f &a3 if (coin) { coin->setHostInfo(hostInfo); coin->appearHop(a2, a3); - return true; + return true; } return false; } - -bool CoinHolder::appearCoinFix(const NameObj *pObj, const TVec3f &a2, s32 a3) { + +bool CoinHolder::appearCoinFix(const NameObj* pObj, const TVec3f& a2, s32 a3) { TVec3f stack_8(0.0f, 0.0f, 0.0f); return appearCoin(pObj, a2, stack_8, a3, -1, -1, a3 == 1 ? 0.0f : 4.0f); } -bool CoinHolder::appearCoinPop(const NameObj *pObj, const TVec3f &a2, s32 a3) { +bool CoinHolder::appearCoinPop(const NameObj* pObj, const TVec3f& a2, s32 a3) { TVec3f stack_20; MR::calcGravityVector(this, a2, &stack_20, nullptr, nullptr); TVec3f stack_14 = (-stack_20).scaleInline(25.0f); return appearCoin(pObj, a2, stack_14, a3, -1, -1, a3 == 1 ? 0.0f : 4.0f); } -bool CoinHolder::appearCoinToVelocity(const NameObj *pObj, const TVec3f &a2, const TVec3f &a3, s32 a4) { +bool CoinHolder::appearCoinToVelocity(const NameObj* pObj, const TVec3f& a2, const TVec3f& a3, s32 a4) { return appearCoin(pObj, a2, a3, a4, -1, -1, a4 == 1 ? 0.0f : 4.0f); -} +} // CoinHolder::appearCoinCircle -CoinHostInfo* CoinHolder::declare(const NameObj *pObj, s32 a2) { +CoinHostInfo* CoinHolder::declare(const NameObj* pObj, s32 a2) { if (a2 <= 0) { return nullptr; } @@ -59,7 +60,7 @@ CoinHostInfo* CoinHolder::declare(const NameObj *pObj, s32 a2) { return hostInfo; } -s32 CoinHolder::getDeclareRemnantCoinCount(const NameObj *pObj) const { +s32 CoinHolder::getDeclareRemnantCoinCount(const NameObj* pObj) const { CoinHostInfo* hostInfo = findHostInfo(pObj); if (MR::isGalaxyDarkCometAppearInCurrentStage()) { @@ -69,7 +70,7 @@ s32 CoinHolder::getDeclareRemnantCoinCount(const NameObj *pObj) const { return hostInfo->_4 - hostInfo->_8; } -CoinHostInfo* CoinHolder::findHostInfo(const NameObj *pObj) const { +CoinHostInfo* CoinHolder::findHostInfo(const NameObj* pObj) const { for (s32 i = 0; i < mHostInfoCount; i++) { if (mHostInfoArr[i].mHostActor == pObj) { return &mHostInfoArr[i]; @@ -79,7 +80,7 @@ CoinHostInfo* CoinHolder::findHostInfo(const NameObj *pObj) const { return nullptr; } -void CoinHolder::init(const JMapInfoIter &rIter) { +void CoinHolder::init(const JMapInfoIter& rIter) { for (int i = 0; i < 0x20; i++) { Coin* coin = new Coin("コイン(共用)"); coin->initWithoutIter(); @@ -101,8 +102,8 @@ namespace MR { void addToCoinHolder(const NameObj* pNameObj, Coin* pCoin) { //Grabs the Coin holder obj, then discards that and does it again????? SceneObjHolder* holder = MR::getSceneObjHolder(); - holder->getObj(SceneObj_CoinHolder); + holder->getObj(SceneObj_CoinHolder); CoinHolder* coinHolder = (CoinHolder*)MR::getSceneObjHolder()->getObj(SceneObj_CoinHolder); pCoin->setHostInfo(coinHolder->declare(pNameObj, 1)); } -}; +}; // namespace MR diff --git a/src/Game/MapObj/CoinReplica.cpp b/src/Game/MapObj/CoinReplica.cpp index a6dae8517..00f094644 100644 --- a/src/Game/MapObj/CoinReplica.cpp +++ b/src/Game/MapObj/CoinReplica.cpp @@ -1,6 +1,7 @@ #include "Game/MapObj/CoinReplica.hpp" -CoinReplica::CoinReplica(const char *pName) : NameObj(pName) { +CoinReplica::CoinReplica(const char* pName) + : NameObj(pName) { mCoin = nullptr; } @@ -28,7 +29,7 @@ void CoinReplica::removeCoin() { } } -void CoinReplica::init(const JMapInfoIter &rIter) { +void CoinReplica::init(const JMapInfoIter& rIter) { mCoin = reinterpret_cast(MR::createCoin(this, "コイン(レプリカ用)")); MR::initDefaultPos(mCoin, rIter); mCoin->initWithoutIter(); @@ -44,8 +45,7 @@ void CoinReplica::init(const JMapInfoIter &rIter) { void (CoinReplica::*d)(void) = &CoinReplica::deactiveCoin; void (CoinReplica::*a)(void) = &CoinReplica::activeCoin; MR::listenNameObjStageSwitchOnOffA(this, switchCtrl, MR::Functor(this, d), MR::Functor(this, a)); - } - else { + } else { void (CoinReplica::*d)(void) = &CoinReplica::deactiveCoin; void (CoinReplica::*a)(void) = &CoinReplica::activeCoinWithGravity; MR::listenNameObjStageSwitchOnOffA(this, switchCtrl, MR::Functor(this, d), MR::Functor(this, a)); @@ -60,5 +60,4 @@ void CoinReplica::init(const JMapInfoIter &rIter) { } CoinReplica::~CoinReplica() { - } \ No newline at end of file diff --git a/src/Game/MapObj/CoinRotater.cpp b/src/Game/MapObj/CoinRotater.cpp index 5d17b895f..a21ef32bc 100644 --- a/src/Game/MapObj/CoinRotater.cpp +++ b/src/Game/MapObj/CoinRotater.cpp @@ -4,7 +4,8 @@ #include "Game/Util/MtxUtil.hpp" #include "Game/Util/ObjUtil.hpp" -CoinRotater::CoinRotater(const char *pName) : NameObj(pName) { +CoinRotater::CoinRotater(const char* pName) + : NameObj(pName) { _C = 0.0f; _10 = 0.0f; _14 = 0.0f; @@ -53,8 +54,7 @@ namespace MR { TMtx34f& getCoinInWaterRotateYMatrix() { return MR::getSceneObj(SceneObj_CoinRotater)->mWaterRotateMtx; } -}; +}; // namespace MR CoinRotater::~CoinRotater() { - } diff --git a/src/Game/MapObj/CoinSpot.cpp b/src/Game/MapObj/CoinSpot.cpp index 0533ec8dc..b0f805903 100644 --- a/src/Game/MapObj/CoinSpot.cpp +++ b/src/Game/MapObj/CoinSpot.cpp @@ -1,13 +1,14 @@ #include "Game/MapObj/CoinSpot.hpp" -CoinSpot::CoinSpot(const char *pName) : LiveActor(pName) { +CoinSpot::CoinSpot(const char* pName) + : LiveActor(pName) { _8C = 8; _90 = 0; _94 = 4; _98 = 0; } -void CoinSpot::init(const JMapInfoIter &rIter) { +void CoinSpot::init(const JMapInfoIter& rIter) { MR::connectToSceneMapObjMovementCalcAnim(this); MR::initDefaultPos(this, rIter); s32 arg = 0; @@ -15,8 +16,7 @@ void CoinSpot::init(const JMapInfoIter &rIter) { if (arg <= 0) { _8C = arg; - } - else { + } else { _8C = 8; } @@ -65,8 +65,7 @@ void CoinSpot::exeIsInTornado() { } _90 = 0; - } - else { + } else { _94 = 0; } @@ -76,25 +75,23 @@ void CoinSpot::exeIsInTornado() { } } -void CoinSpot::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { - +void CoinSpot::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { } CoinSpot::~CoinSpot() { - } namespace NrvCoinSpot { INIT_NERVE(CoinSpotNrvWait); INIT_NERVE(CoinSpotNrvIsInTornado); - void CoinSpotNrvIsInTornado::execute(Spine *pSpine) const { + void CoinSpotNrvIsInTornado::execute(Spine* pSpine) const { CoinSpot* spot = reinterpret_cast(pSpine->mExecutor); spot->exeIsInTornado(); } - - void CoinSpotNrvWait::execute(Spine *pSpine) const { + + void CoinSpotNrvWait::execute(Spine* pSpine) const { CoinSpot* spot = reinterpret_cast(pSpine->mExecutor); spot->exeWait(); } -}; \ No newline at end of file +}; // namespace NrvCoinSpot \ No newline at end of file diff --git a/src/Game/MapObj/CollapsePlane.cpp b/src/Game/MapObj/CollapsePlane.cpp index 84efb0454..4fa2ad381 100644 --- a/src/Game/MapObj/CollapsePlane.cpp +++ b/src/Game/MapObj/CollapsePlane.cpp @@ -1,7 +1,8 @@ #include "Game/MapObj/CollapsePlane.hpp" #include "Game/Enemy/AnimScaleController.hpp" -CollapsePlane::CollapsePlane(const char *pName) : MapObjActor(pName) { +CollapsePlane::CollapsePlane(const char* pName) + : MapObjActor(pName) { mScaleController = nullptr; mStarPointerBind = nullptr; mJointController = nullptr; @@ -9,7 +10,7 @@ CollapsePlane::CollapsePlane(const char *pName) : MapObjActor(pName) { mTimer = 140; } -void CollapsePlane::init(const JMapInfoIter &rIter) { +void CollapsePlane::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; info.setupHioNode("地形オブジェ"); @@ -54,8 +55,7 @@ void CollapsePlane::exeCollapse() { MR::startSound(this, "SE_OJ_COLLAPSE_PLANE_VANISH", -1, -1); _D0 = -1; setNerve(&NrvCollapsePlane::CollapsePlaneNrvEnd::sInstance); - } - else { + } else { _D0 += 1; } } @@ -68,8 +68,7 @@ void CollapsePlane::exeDPDStop() { if (MR::updateActorState(this, mStarPointerBind)) { if (_D0 != -1) { setNerve(&NrvCollapsePlane::CollapsePlaneNrvCollapse::sInstance); - } - else { + } else { setNerve(&NrvCollapsePlane::CollapsePlaneNrvWait::sInstance); } } @@ -94,8 +93,8 @@ void CollapsePlane::control() { tryDPDStop(); } -bool CollapsePlane::calcJointPlane(TPos3f *pPos, const JointControllerInfo &) { - f32 new_scale = (1.0f - ((0.69999999f * _D0)) / mTimer); +bool CollapsePlane::calcJointPlane(TPos3f* pPos, const JointControllerInfo&) { + f32 new_scale = (1.0f - ((0.69999999f * _D0)) / mTimer); TMtx34f mtx; mtx.identity(); MR::preScaleMtx(mtx.toMtxPtr(), new_scale, 1.0f, new_scale); @@ -128,8 +127,7 @@ namespace NrvCollapsePlane { INIT_NERVE(CollapsePlaneNrvCollapse); INIT_NERVE(CollapsePlaneNrvDPDStop); INIT_NERVE(CollapsePlaneNrvEnd); -}; +}; // namespace NrvCollapsePlane CollapsePlane::~CollapsePlane() { - } diff --git a/src/Game/MapObj/CollectCounter.cpp b/src/Game/MapObj/CollectCounter.cpp index 344470f40..ef454ef10 100644 --- a/src/Game/MapObj/CollectCounter.cpp +++ b/src/Game/MapObj/CollectCounter.cpp @@ -1,12 +1,13 @@ #include "Game/MapObj/CollectCounter.hpp" #include "Game/Util.hpp" -CollectCounter::CollectCounter(const char *pName) : LayoutActor(pName, true) { +CollectCounter::CollectCounter(const char* pName) + : LayoutActor(pName, true) { mFollowPosition.x = 0.0f; mFollowPosition.y = 0.0f; } -void CollectCounter::init(const JMapInfoIter &rIter) { +void CollectCounter::init(const JMapInfoIter& rIter) { MR::connectToSceneLayout(this); initLayoutManager("CollectCounter", 1); initNerve(&NrvCollectCounter::CollectCounterNrvHide::sInstance); @@ -35,7 +36,7 @@ bool CollectCounter::tryEndShow() { } void CollectCounter::setPosition() { - f32 point_rad = MR::calcPointRadius2D(*MR::getPlayerCenterPos(), 75.0f); + f32 point_rad = MR::calcPointRadius2D(*MR::getPlayerCenterPos(), 75.0f); TVec2f screen_pos; MR::calcScreenPosition(&screen_pos, *MR::getPlayerCenterPos()); screen_pos.y -= point_rad; @@ -44,24 +45,22 @@ void CollectCounter::setPosition() { } CollectCounter::~CollectCounter() { - } namespace NrvCollectCounter { CollectCounterNrvHide CollectCounterNrvHide::sInstance; CollectCounterNrvShow CollectCounterNrvShow::sInstance; - void CollectCounterNrvShow::execute(Spine *pSpine) const { + void CollectCounterNrvShow::execute(Spine* pSpine) const { CollectCounter* counter = reinterpret_cast(pSpine->mExecutor); - + if (MR::isFirstStep(counter)) { MR::startAnim(counter, "Appear", 0); } - + counter->tryEndShow(); } - void CollectCounterNrvHide::execute(Spine *pSpine) const { - + void CollectCounterNrvHide::execute(Spine* pSpine) const { } -}; +}; // namespace NrvCollectCounter diff --git a/src/Game/MapObj/CollisionBlocker.cpp b/src/Game/MapObj/CollisionBlocker.cpp index 5dd8f215e..01acc02cd 100644 --- a/src/Game/MapObj/CollisionBlocker.cpp +++ b/src/Game/MapObj/CollisionBlocker.cpp @@ -1,10 +1,10 @@ #include "Game/MapObj/CollisionBlocker.hpp" -CollisionBlocker::CollisionBlocker(const char *pName) : LiveActor(pName) { - +CollisionBlocker::CollisionBlocker(const char* pName) + : LiveActor(pName) { } -void CollisionBlocker::init(const JMapInfoIter &rIter) { +void CollisionBlocker::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initHitSensor(1); @@ -26,7 +26,7 @@ void CollisionBlocker::init(const JMapInfoIter &rIter) { } if (MR::useStageSwitchReadB(this, rIter)) { - MR::FunctorV0M breakFunc = MR::Functor(this, &CollisionBlocker::forceBreak); + MR::FunctorV0M breakFunc = MR::Functor(this, &CollisionBlocker::forceBreak); MR::listenStageSwitchOnB(this, breakFunc); } } @@ -36,12 +36,11 @@ void CollisionBlocker::forceBreak() { kill(); } -void CollisionBlocker::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void CollisionBlocker::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver)) { MR::sendArbitraryMsg(ACTMES_PUSH_FORCE, pReceiver, pSender); } } CollisionBlocker::~CollisionBlocker() { - } diff --git a/src/Game/MapObj/CrystalCage.cpp b/src/Game/MapObj/CrystalCage.cpp index 697907bc7..5a590555c 100644 --- a/src/Game/MapObj/CrystalCage.cpp +++ b/src/Game/MapObj/CrystalCage.cpp @@ -5,15 +5,16 @@ #include "JSystem/JMath.hpp" #include "math_types.hpp" -CrystalCage::CrystalCage(const char *pName) : LiveActor(pName), - mCrystalCageType(0), mBreakObj(nullptr), _C4(1), _C8(0), mRumbleCalc(nullptr), _D0(0.0f, 0.0f, 1.0f), _DC(gZeroVec), _E8(gZeroVec), - mDisplayModel(nullptr), _F8(gZeroVec), _104(0), _108(-1), mIsBreakObjVisible(false), mPlayRiddleSFX(false), mHasBinding(false), _110(gZeroVec) { - _94.identity(); +CrystalCage::CrystalCage(const char* pName) + : LiveActor(pName), + mCrystalCageType(0), mBreakObj(nullptr), _C4(1), _C8(0), mRumbleCalc(nullptr), _D0(0.0f, 0.0f, 1.0f), _DC(gZeroVec), _E8(gZeroVec), + mDisplayModel(nullptr), _F8(gZeroVec), _104(0), _108(-1), mIsBreakObjVisible(false), mPlayRiddleSFX(false), mHasBinding(false), _110(gZeroVec) { + _94.identity(); } -void CrystalCage::init(const JMapInfoIter &rIter) { +void CrystalCage::init(const JMapInfoIter& rIter) { const char* obj_name; - TVec3f v23; + TVec3f v23; MR::getObjectName(&obj_name, rIter); initMapToolInfo(rIter); MR::calcGravity(this); @@ -48,7 +49,7 @@ void CrystalCage::init(const JMapInfoIter &rIter) { if (mCrystalCageType == 2) { f32 mult = mScale.x * 250.0f; _C4 = 2; - + v21.x = 0.0f; v21.y = mult; v21.z = 0.0f; @@ -56,28 +57,25 @@ void CrystalCage::init(const JMapInfoIter &rIter) { if (_108 == -1) { MR::declarePowerStar(this); - } - else { + } else { MR::declarePowerStar(this, _108); } - } - else { + } else { if (!mCrystalCageType) { v23.set(-30.0f, 100.0f, -30.0f); - } - else { + } else { v23.set(0.0f, 200.0f, 0.0f); } mDisplayModel = MR::createDummyDisplayModelCrystalItem(this, rIter, v23, TVec3f(0.0f, 0.0f, 0.0f)); - + if (mDisplayModel) { switch (MR::getDummyDisplayModelId(rIter, -1)) { - case 0: - MR::declareCoin(this, 1); - break; - case 4: - MR::startBva(mDisplayModel, "Freeze"); + case 0: + MR::declareCoin(this, 1); + break; + case 4: + MR::startBva(mDisplayModel, "Freeze"); } } } @@ -112,8 +110,7 @@ void CrystalCage::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchReadAppear(this, rIter)) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { makeActorAppeared(); } } @@ -160,20 +157,19 @@ void CrystalCage::forceBreak() { MR::invalidateCollisionParts(this); MR::invalidateHitSensors(this); setNerve(&NrvCrystalCage::CrystalCageNrvBreak::sInstance); - } - else { + } else { kill(); } } } -void CrystalCage::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void CrystalCage::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (!mCrystalCageType) { MR::sendMsgPush(pReceiver, pSender); } } -bool CrystalCage::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool CrystalCage::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (!isNerve(&NrvCrystalCage::CrystalCageNrvWait::sInstance)) { return false; } @@ -199,8 +195,7 @@ bool CrystalCage::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor MR::setBvaFrameAndStop(this, 1.0f); if (mCrystalCageType == 2) { MR::startSound(this, "SE_OJ_CRYSTAL_CAGE_L_DAMAGE", -1, -1); - } - else { + } else { MR::startSound(this, "SE_OJ_CRYSTAL_CAGE_S_DAMAGE", -1, -1); } @@ -215,7 +210,7 @@ bool CrystalCage::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor return false; } -bool CrystalCage::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool CrystalCage::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (mCrystalCageType != 2 && isNerve(&NrvCrystalCage::CrystalCageNrvWait::sInstance)) { MR::invalidateClipping(this); MR::invalidateCollisionParts(this); @@ -227,28 +222,25 @@ bool CrystalCage::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor * return false; } -void CrystalCage::initMapToolInfo(const JMapInfoIter &rIter) { +void CrystalCage::initMapToolInfo(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); _DC.set(mPosition); if (MR::isEqualObjectName(rIter, "CrystalCageS")) { mCrystalCageType = 0; - } - else if (MR::isEqualObjectName(rIter, "CrystalCageM")) { + } else if (MR::isEqualObjectName(rIter, "CrystalCageM")) { mCrystalCageType = 1; - } - else { + } else { mCrystalCageType = 2; } if (mCrystalCageType == 2) { MR::getJMapInfoArg0NoInit(rIter, &_108); - } - else { + } else { MR::useStageSwitchWriteDead(this, rIter); if (MR::useStageSwitchReadA(this, rIter)) { - MR::FunctorV0M forceFunc = MR::Functor_Inline(this, &CrystalCage::forceBreak); + MR::FunctorV0M forceFunc = MR::Functor_Inline(this, &CrystalCage::forceBreak); MR::listenStageSwitchOnA(this, forceFunc); } @@ -296,7 +288,7 @@ void CrystalCage::tryOnSwitchDead() { } } -void CrystalCage::exeWait() { +void CrystalCage::exeWait() { if (_C8 > 0) { _C8--; } @@ -307,8 +299,7 @@ void CrystalCage::exeWait() { TVec3f v9; v9.scale(mRumbleCalc->_C.y, _D0); JMathInlineVEC::PSVECAdd(&_DC, &v9, &mPosition); - } - else { + } else { mPosition.set(_DC); } } @@ -330,8 +321,7 @@ void CrystalCage::exeBreak() { if (MR::isFirstStep(this)) { if (mIsBreakObjVisible) { MR::hideModel(this); - } - else { + } else { MR::setBvaFrameAndStop(this, mCrystalCageType == 2 ? 2.0f : 1.0f); mPosition.set(_F8); } @@ -350,12 +340,10 @@ void CrystalCage::exeBreak() { MR::startSound(this, "SE_OJ_CRYSTAL_CAGE_L_BREAK", -1, -1); if (_108 == -1) { MR::requestAppearPowerStar(this, mDisplayModel->mPosition); - } - else { + } else { MR::requestAppearPowerStar(this, _108, mDisplayModel->mPosition); } - } - else { + } else { MR::emitEffect(this, "Break"); MR::startSound(this, "SE_OJ_CRYSTAL_CAGE_S_BREAK", -1, -1); @@ -390,8 +378,7 @@ void CrystalCage::exeBreak() { if (MR::isBckStopped(mBreakObj)) { if (mIsBreakObjVisible) { kill(); - } - else { + } else { setNerve(&NrvCrystalCage::CrystalCageNrvBreakAfter::sInstance); } } @@ -409,22 +396,21 @@ namespace NrvCrystalCage { INIT_NERVE(CrystalCageNrvBreak); INIT_NERVE(CrystalCageNrvBreakAfter); - void CrystalCageNrvBreakAfter::execute(Spine *pSpine) const { + void CrystalCageNrvBreakAfter::execute(Spine* pSpine) const { CrystalCage* cage = reinterpret_cast(pSpine->mExecutor); cage->exeBreakAfter(); } - void CrystalCageNrvBreak::execute(Spine *pSpine) const { + void CrystalCageNrvBreak::execute(Spine* pSpine) const { CrystalCage* cage = reinterpret_cast(pSpine->mExecutor); cage->exeBreak(); } - void CrystalCageNrvWait::execute(Spine *pSpine) const { + void CrystalCageNrvWait::execute(Spine* pSpine) const { CrystalCage* cage = reinterpret_cast(pSpine->mExecutor); cage->exeWait(); } -}; +}; // namespace NrvCrystalCage CrystalCage::~CrystalCage() { - } diff --git a/src/Game/MapObj/CrystalCageMoving.cpp b/src/Game/MapObj/CrystalCageMoving.cpp index 787c7e9c8..3f63bb222 100644 --- a/src/Game/MapObj/CrystalCageMoving.cpp +++ b/src/Game/MapObj/CrystalCageMoving.cpp @@ -2,7 +2,8 @@ #include "Game/MapObj/CrystalCageMoving.hpp" #include "JSystem/JMath/JMath.hpp" -CrystalCageMoving::CrystalCageMoving(const char *pName) : MapObjActor(pName) { +CrystalCageMoving::CrystalCageMoving(const char* pName) + : MapObjActor(pName) { mTicoModel = nullptr; mCameraInfo = nullptr; _FC.x = 0.0f; @@ -12,7 +13,7 @@ CrystalCageMoving::CrystalCageMoving(const char *pName) : MapObjActor(pName) { _C8.identity(); } -void CrystalCageMoving::init(const JMapInfoIter &rIter) { +void CrystalCageMoving::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; info.setupHioNode("地形オブジェ"); @@ -134,7 +135,7 @@ void CrystalCageMoving::control() { } } -bool CrystalCageMoving::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool CrystalCageMoving::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (isNerveTypeEnd()) { return false; } @@ -148,38 +149,35 @@ bool CrystalCageMoving::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor * return false; } -void CrystalCageMoving::crashMario(HitSensor *pSender, HitSensor *pReceiver) { +void CrystalCageMoving::crashMario(HitSensor* pSender, HitSensor* pReceiver) { MR::tryRumblePadVeryStrong(this, 0); MR::shakeCameraVeryStrong(); if (_108) { setNerve(&NrvCrystalCageMoving::CrystalCageMovingNrvBreakSmall::sInstance); - } - else { + } else { f32 sensorDist = PSVECDistance(&pReceiver->mPosition, &pSender->mPosition); f32 sensorObjDist = PSVECDistance(&mPosition, &pSender->mPosition); if (sensorDist < 30.0f && sensorObjDist < 450.0f) { setNerve(&NrvCrystalCageMoving::CrystalCageMovingNrvBreakAll::sInstance); - } - else { + } else { setNerve(&NrvCrystalCageMoving::CrystalCageMovingNrvBreakBig::sInstance); } } } -void CrystalCageMoving::updateHitSensor(HitSensor *pSensor) { +void CrystalCageMoving::updateHitSensor(HitSensor* pSensor) { if (!_108) { pSensor->mPosition.set(mPosition); - } - else { - f32 radius = pSensor->mRadius; + } else { + f32 radius = pSensor->mRadius; TMtx34f joint_mtx; joint_mtx.set(MR::getJointMtx(this, nullptr)); TVec3f joint_pos; - f32 z = joint_mtx.mMtx[2][1]; - f32 y = joint_mtx.mMtx[1][1]; - f32 x = joint_mtx.mMtx[0][1]; + f32 z = joint_mtx.mMtx[2][1]; + f32 y = joint_mtx.mMtx[1][1]; + f32 x = joint_mtx.mMtx[0][1]; joint_pos.set(x, y, z); TVec3f stack_14; JMAVECScaleAdd(&joint_pos, &mPosition, &stack_14, (-450.0f + radius)); @@ -187,15 +185,15 @@ void CrystalCageMoving::updateHitSensor(HitSensor *pSensor) { JMAVECScaleAdd(&joint_pos, &mPosition, &stack_8, (450.0f - radius)); MR::calcPerpendicFootToLineInside(&pSensor->mPosition, *MR::getPlayerPos(), stack_14, stack_8); } -} +} -void CrystalCageMoving::connectToScene(const MapObjActorInitInfo &rInfo) { +void CrystalCageMoving::connectToScene(const MapObjActorInitInfo& rInfo) { if (rInfo.mConnectToScene) { MR::connectToSceneCrystal(this); } } -void CrystalCageMoving::initDummyModel(const JMapInfoIter &rIter) { +void CrystalCageMoving::initDummyModel(const JMapInfoIter& rIter) { _C8.set(MR::getJointMtx(this, 0)); TVec3f stack_8; PSMTXMultVec(_C8.toMtxPtr(), &sDummyModelOffset, &stack_8); @@ -227,12 +225,12 @@ void CrystalCageMoving::startBreakDemo() { bool CrystalCageMoving::isNerveTypeEnd() const { bool ret = false; - if (isNerve(&NrvCrystalCageMoving::CrystalCageMovingNrvBreakBig::sInstance) || - isNerve(&NrvCrystalCageMoving::CrystalCageMovingNrvBreakSmall::sInstance) || - isNerve(&NrvCrystalCageMoving::CrystalCageMovingNrvBreakAll::sInstance) || - isNerve(&NrvCrystalCageMoving::CrystalCageMovingNrvDemoTicoMove::sInstance) || - isNerve(&NrvCrystalCageMoving::CrystalCageMovingNrvDemoTicoStop::sInstance) || - isNerve(&NrvCrystalCageMoving::CrystalCageMovingNrvDemoTicoChange::sInstance)) { + if (isNerve(&NrvCrystalCageMoving::CrystalCageMovingNrvBreakBig::sInstance) || + isNerve(&NrvCrystalCageMoving::CrystalCageMovingNrvBreakSmall::sInstance) || + isNerve(&NrvCrystalCageMoving::CrystalCageMovingNrvBreakAll::sInstance) || + isNerve(&NrvCrystalCageMoving::CrystalCageMovingNrvDemoTicoMove::sInstance) || + isNerve(&NrvCrystalCageMoving::CrystalCageMovingNrvDemoTicoStop::sInstance) || + isNerve(&NrvCrystalCageMoving::CrystalCageMovingNrvDemoTicoChange::sInstance)) { ret = true; } @@ -240,7 +238,6 @@ bool CrystalCageMoving::isNerveTypeEnd() const { } CrystalCageMoving::~CrystalCageMoving() { - } namespace NrvCrystalCageMoving { @@ -253,46 +250,44 @@ namespace NrvCrystalCageMoving { INIT_NERVE(CrystalCageMovingNrvDemoTicoStop); INIT_NERVE(CrystalCageMovingNrvDemoTicoChange); - void CrystalCageMovingNrvDemoTicoChange::execute(Spine *pSpine) const { + void CrystalCageMovingNrvDemoTicoChange::execute(Spine* pSpine) const { CrystalCageMoving* cage = reinterpret_cast(pSpine->mExecutor); cage->exeDemoTicoChange(); } - void CrystalCageMovingNrvDemoTicoStop::execute(Spine *pSpine) const { + void CrystalCageMovingNrvDemoTicoStop::execute(Spine* pSpine) const { CrystalCageMoving* cage = reinterpret_cast(pSpine->mExecutor); cage->exeDemoTicoStop(); } - void CrystalCageMovingNrvDemoTicoMove::execute(Spine *pSpine) const { + void CrystalCageMovingNrvDemoTicoMove::execute(Spine* pSpine) const { CrystalCageMoving* cage = reinterpret_cast(pSpine->mExecutor); cage->exeDemoTicoMove(); } - void CrystalCageMovingNrvBreakAll::execute(Spine *pSpine) const { + void CrystalCageMovingNrvBreakAll::execute(Spine* pSpine) const { CrystalCageMoving* cage = reinterpret_cast(pSpine->mExecutor); cage->exeBreakAll(); } - void CrystalCageMovingNrvBreakSmall::execute(Spine *pSpine) const { + void CrystalCageMovingNrvBreakSmall::execute(Spine* pSpine) const { CrystalCageMoving* cage = reinterpret_cast(pSpine->mExecutor); cage->exeBreakSmall(); } - void CrystalCageMovingNrvWaitSmall::execute(Spine *) const { - + void CrystalCageMovingNrvWaitSmall::execute(Spine*) const { } - void CrystalCageMovingNrvBreakBig::executeOnEnd(Spine *pSpine) const { + void CrystalCageMovingNrvBreakBig::executeOnEnd(Spine* pSpine) const { CrystalCageMoving* cage = reinterpret_cast(pSpine->mExecutor); MR::endActorCamera(cage, cage->mCameraInfo, true, -1); } - void CrystalCageMovingNrvBreakBig::execute(Spine *pSpine) const { + void CrystalCageMovingNrvBreakBig::execute(Spine* pSpine) const { CrystalCageMoving* cage = reinterpret_cast(pSpine->mExecutor); cage->exeBreakBig(); } - void CrystalCageMovingNrvWaitBig::execute(Spine *) const { - + void CrystalCageMovingNrvWaitBig::execute(Spine*) const { } -}; +}; // namespace NrvCrystalCageMoving diff --git a/src/Game/MapObj/CrystalSwitch.cpp b/src/Game/MapObj/CrystalSwitch.cpp index ebe42a6f0..4dee8d9f2 100644 --- a/src/Game/MapObj/CrystalSwitch.cpp +++ b/src/Game/MapObj/CrystalSwitch.cpp @@ -3,14 +3,15 @@ /* Note -- this file was compiled super early on in the game's life, so it was compiled under -O2 where the release build is -O4,p. Keep this in mind! */ -CrystalSwitch::CrystalSwitch(const char *pName) : LiveActor(pName) { +CrystalSwitch::CrystalSwitch(const char* pName) + : LiveActor(pName) { _8C = 0; _90 = 300; mRotateSpeed = 0.0f; _98 = 0; } -void CrystalSwitch::init(const JMapInfoIter &rIter) { +void CrystalSwitch::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("CrystalSwitch", nullptr, false); MR::connectToSceneMapObj(this); @@ -35,13 +36,13 @@ void CrystalSwitch::control() { _98 = 0; } -void CrystalSwitch::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void CrystalSwitch::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver)) { pReceiver->receiveMessage(41, pSender); } } -bool CrystalSwitch::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool CrystalSwitch::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { _98 = 1; return true; } @@ -110,8 +111,7 @@ void CrystalSwitch::calcRotSpeed() { if (mRotateSpeed > 10.0f) { mRotateSpeed = 10.0f; } - } - else { + } else { if (mRotateSpeed > 10.0f) { mRotateSpeed = 10.0f; } @@ -126,7 +126,6 @@ void CrystalSwitch::calcRotSpeed() { } CrystalSwitch::~CrystalSwitch() { - } namespace NrvCrystalSwitch { @@ -135,9 +134,9 @@ namespace NrvCrystalSwitch { INIT_NERVE(CrystalSwitchNrvOn); INIT_NERVE(CrystalSwitchNrvSwitchUp); - void CrystalSwitchNrvSwitchUp::execute(Spine *pSpine) const { + void CrystalSwitchNrvSwitchUp::execute(Spine* pSpine) const { CrystalSwitch* crystal = reinterpret_cast(pSpine->mExecutor); - + if (MR::isFirstStep(crystal)) { MR::startBpk(crystal, "Off"); } @@ -145,18 +144,18 @@ namespace NrvCrystalSwitch { crystal->tryOff(); } - void CrystalSwitchNrvOn::execute(Spine *pSpine) const { + void CrystalSwitchNrvOn::execute(Spine* pSpine) const { CrystalSwitch* crystal = reinterpret_cast(pSpine->mExecutor); crystal->exeOn(); } - void CrystalSwitchNrvSwitchDown::execute(Spine *pSpine) const { + void CrystalSwitchNrvSwitchDown::execute(Spine* pSpine) const { CrystalSwitch* crystal = reinterpret_cast(pSpine->mExecutor); crystal->exeSwitchDown(); } - void CrystalSwitchNrvOff::execute(Spine *pSpine) const { + void CrystalSwitchNrvOff::execute(Spine* pSpine) const { CrystalSwitch* crystal = reinterpret_cast(pSpine->mExecutor); crystal->exeOff(); } -}; +}; // namespace NrvCrystalSwitch diff --git a/src/Game/MapObj/CutBushModelObj.cpp b/src/Game/MapObj/CutBushModelObj.cpp index 9455e8fe2..7b7250afc 100644 --- a/src/Game/MapObj/CutBushModelObj.cpp +++ b/src/Game/MapObj/CutBushModelObj.cpp @@ -1,7 +1,8 @@ #include "Game/MapObj/CutBushModelObj.hpp" #include "Game/Util.hpp" -CutBushModelObj::CutBushModelObj(const char *pName, const char *pObjName, bool useLight, MtxPtr mtx) : LiveActor(pName) { +CutBushModelObj::CutBushModelObj(const char* pName, const char* pObjName, bool useLight, MtxPtr mtx) + : LiveActor(pName) { mMtx = mtx; initModelManagerWithAnm(pObjName, nullptr, false); MR::connectToSceneNoSilhouettedMapObjWeakLightNoMovement(this); @@ -17,7 +18,7 @@ CutBushModelObj::CutBushModelObj(const char *pName, const char *pObjName, bool u } } -void CutBushModelObj::init(const JMapInfoIter &rIter) { +void CutBushModelObj::init(const JMapInfoIter& rIter) { makeActorAppeared(); } @@ -31,12 +32,10 @@ void CutBushModelObj::calcAndSetBaseMtx() { if (mMtx) { mPosition.set(mMtx[0][3], mMtx[1][3], mMtx[2][3]); MR::setBaseTRMtx(this, mMtx); - } - else { + } else { LiveActor::calcAndSetBaseMtx(); } } CutBushModelObj::~CutBushModelObj() { - } \ No newline at end of file diff --git a/src/Game/MapObj/DashRing.cpp b/src/Game/MapObj/DashRing.cpp index 8324f35c9..91422a4ac 100644 --- a/src/Game/MapObj/DashRing.cpp +++ b/src/Game/MapObj/DashRing.cpp @@ -1,10 +1,9 @@ #include "Game/MapObj/DashRing.hpp" DashRing::~DashRing() { - } -void DashRing::initCommon(const JMapInfoIter &rIter, const char *pName) { +void DashRing::initCommon(const JMapInfoIter& rIter, const char* pName) { MR::initDefaultPos(this, rIter); _A4 = 0; _A6 = 0; @@ -14,8 +13,7 @@ void DashRing::initCommon(const JMapInfoIter &rIter, const char *pName) { initModelManagerWithAnm(pName, nullptr, false); MR::connectToSceneMapObj(this); _B4 = 1; - } - else { + } else { MR::connectToScene(this, 34, -1, -1, 56); } @@ -23,7 +21,7 @@ void DashRing::initCommon(const JMapInfoIter &rIter, const char *pName) { MR::addHitSensorMapObj(this, "body", 4, 1000.0f, TVec3f(0.0f, 0.0f, 0.0f)); MR::validateClipping(this); calcAxis(); - + _A8 = 300; _AC = 120; _B0 = 2.5f; @@ -83,7 +81,7 @@ void DashRing::calcAndSetBaseMtx() { void DashRing::calcAxis() { TVec3f stack_8(0.0f, 1.0f, 0.0f); - Mtx mtx; + Mtx mtx; MR::makeMtxTR(mtx, 0.0f, 0.0f, 0.0f, mRotation.x, mRotation.y, mRotation.z); PSMTXMultVec(mtx, &stack_8, &stack_8); mAxis = stack_8; @@ -98,8 +96,7 @@ void DashRing::calcSubAxis() { stack_8.x = stack_14.y; stack_8.y = -stack_14.x; stack_8.z = 0.0f; - } - else { + } else { stack_8.x = stack_14.x; stack_8.y = 0.0f; stack_8.z = -stack_14.y; @@ -111,6 +108,6 @@ void DashRing::calcSubAxis() { // DashRing::draw -void DashRing::init(const JMapInfoIter &rIter) { +void DashRing::init(const JMapInfoIter& rIter) { initCommon(rIter, "DashRing"); } diff --git a/src/Game/MapObj/DeadLeaves.cpp b/src/Game/MapObj/DeadLeaves.cpp index 59208c1aa..bd7b3da8e 100644 --- a/src/Game/MapObj/DeadLeaves.cpp +++ b/src/Game/MapObj/DeadLeaves.cpp @@ -1,11 +1,12 @@ #include "Game/MapObj/DeadLeaves.hpp" #include "Game/MapObj/MapObjActorInitInfo.hpp" -DeadLeaves::DeadLeaves(const char *pName) : MapObjActor(pName) { +DeadLeaves::DeadLeaves(const char* pName) + : MapObjActor(pName) { mItemType = -1; } -void DeadLeaves::init(const JMapInfoIter &rIter) { +void DeadLeaves::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoSimpleMapObj(&info); @@ -21,8 +22,7 @@ void DeadLeaves::init(const JMapInfoIter &rIter) { if (mItemType == 0) { MR::declareCoin(this, 1); - } - else if (mItemType == 1) { + } else if (mItemType == 1) { MR::declareStarPiece(this, 3); } } @@ -34,8 +34,7 @@ void DeadLeaves::exeSpin() { if (mItemType == 0) { MR::appearCoinPop(this, mPosition, 1); - } - else if (mItemType == 1) { + } else if (mItemType == 1) { bool appear = MR::appearStarPiece(this, mPosition, 3, 10.0f, 40.0f, false); if (appear) { MR::startSound(this, "SE_OJ_STAR_PIECE_BURST", -1, -1); @@ -48,7 +47,7 @@ void DeadLeaves::exeSpin() { } } -bool DeadLeaves::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool DeadLeaves::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgPlayerSpinAttack(msg)) { setNerve(&NrvDeadLeaves::DeadLeavesNrvSpin::sInstance); return true; @@ -58,19 +57,17 @@ bool DeadLeaves::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor * } DeadLeaves::~DeadLeaves() { - } namespace NrvDeadLeaves { INIT_NERVE(DeadLeavesNrvWait); INIT_NERVE(DeadLeavesNrvSpin); - void DeadLeavesNrvSpin::execute(Spine *pSpine) const { + void DeadLeavesNrvSpin::execute(Spine* pSpine) const { DeadLeaves* leaves = reinterpret_cast(pSpine->mExecutor); leaves->exeSpin(); } - void DeadLeavesNrvWait::execute(Spine *pSpine) const { - + void DeadLeavesNrvWait::execute(Spine* pSpine) const { } -}; \ No newline at end of file +}; // namespace NrvDeadLeaves \ No newline at end of file diff --git a/src/Game/MapObj/DesertLandMoveSwitch.cpp b/src/Game/MapObj/DesertLandMoveSwitch.cpp index 6f784b08e..266750660 100644 --- a/src/Game/MapObj/DesertLandMoveSwitch.cpp +++ b/src/Game/MapObj/DesertLandMoveSwitch.cpp @@ -21,7 +21,8 @@ #include "revolution/mtx.h" #include "revolution/types.h" -DesertLandMoveSwitch::DesertLandMoveSwitch(const char* pName) : LiveActor(pName) { +DesertLandMoveSwitch::DesertLandMoveSwitch(const char* pName) + : LiveActor(pName) { mCollisionParts = 0; mSpringValue = new SpringValue(); mMapObjConnector = new MapObjConnector(this); @@ -42,8 +43,7 @@ void DesertLandMoveSwitch::init(const JMapInfoIter& rIter) { MR::connectToSceneMapObj(this); if (stack_C == -1) { initNerve(&NrvDesertLandMoveSwitch::HostTypeWait::sInstance); - } - else { + } else { MR::startBck(this, "On", 0); MR::setAllAnimFrameAtEnd(this, "End"); initNerve(&NrvDesertLandMoveSwitch::HostTypeOn::sInstance); @@ -70,9 +70,9 @@ void DesertLandMoveSwitch::calcAnim() { f32 val = mSpringValue->_4; if (!MR::isNearZero(val, 0.001f)) { TVec3f stack_20; - f32 f3 = mtx2[2][3]; - f32 f2 = mtx2[1][3]; - f32 f1 = mtx2[0][3]; + f32 f3 = mtx2[2][3]; + f32 f2 = mtx2[1][3]; + f32 f1 = mtx2[0][3]; stack_20.set(f1, f2, f3); TVec3f stack_14, stack_8; MR::calcUpVec(&stack_14, this); @@ -172,15 +172,14 @@ void DesertLandMoveSwitch::updateTimerSE() { if (lf <= s) { if (step2 == s) { return MR::startSystemSE("SE_SY_TIMER_A_0", -1, -1); - } - else { - if (!(lf%60)) { - if (lf 0) { updateTimerSE(); if (MR::isStep(this, _9C)) setNerve(&NrvDesertLandMoveSwitch::HostTypeReturn::sInstance); - } - else if (!MR::isOnSwitchA(this)) + } else if (!MR::isOnSwitchA(this)) setNerve(&NrvDesertLandMoveSwitch::HostTypeReturn::sInstance); } @@ -248,14 +246,13 @@ void DesertLandMoveSwitch::exeReturn() { else if (MR::isBckStopped(this)) { setNerve(&NrvDesertLandMoveSwitch::HostTypeWait::sInstance); } - } namespace NrvDesertLandMoveSwitch { HostTypeWait(HostTypeWait::sInstance); HostTypeSwitchDown(HostTypeSwitchDown::sInstance); HostTypeOn(HostTypeOn::sInstance); HostTypeReturn(HostTypeReturn::sInstance); -}; +}; // namespace NrvDesertLandMoveSwitch void SpringValue::reset() { _4 = _0; diff --git a/src/Game/MapObj/DesertMovingLand.cpp b/src/Game/MapObj/DesertMovingLand.cpp index 69f3357ff..5dfeb5146 100644 --- a/src/Game/MapObj/DesertMovingLand.cpp +++ b/src/Game/MapObj/DesertMovingLand.cpp @@ -9,7 +9,8 @@ #include "JSystem/JGeometry/TVec.hpp" #include "revolution/mtx.h" -DesertMovingLand::DesertMovingLand(const char* pName) : MapObjActor(pName), _C4(gZeroVec), _D0(gZeroVec) { +DesertMovingLand::DesertMovingLand(const char* pName) + : MapObjActor(pName), _C4(gZeroVec), _D0(gZeroVec) { _DC = 720; _E0 = 720; _E4.identity(); @@ -29,7 +30,7 @@ void DesertMovingLand::init(const JMapInfoIter& rIter) { if (!MR::isValidSwitchA(this)) setNerve(&NrvDesertMovingLand::HostTypeWaitBottom::sInstance); - MtxPtr jointMtx = MR::getJointMtx(this, mObjectName); + MtxPtr jointMtx = MR::getJointMtx(this, mObjectName); HitSensor* pSensorMove = getSensor(0); MR::initCollisionParts(this, "Move", pSensorMove, jointMtx); @@ -37,21 +38,20 @@ void DesertMovingLand::init(const JMapInfoIter& rIter) { MR::invalidateCollisionParts(this); else MR::validateCollisionParts(this); - + f32 arg = 2000.0f; MR::getJMapInfoArg0NoInit(rIter, &arg); MR::getJMapInfoArg1NoInit(rIter, &_DC); MR::getJMapInfoArg2NoInit(rIter, &_E0); TVec3f stack_3C; MR::calcUpVec(&stack_3C, this); - + if (MR::isValidSwitchA(this)) { _C4.set(mPosition); - _D0.set(_C4-stack_3C.scaleInline(arg)); - } - else { + _D0.set(_C4 - stack_3C.scaleInline(arg)); + } else { _D0.set(mPosition); - _C4.set(_D0+stack_3C.scaleInline(arg)); + _C4.set(_D0 + stack_3C.scaleInline(arg)); } MR::setBodySensorTypePress(this); } @@ -67,10 +67,10 @@ void DesertMovingLand::control() { } void DesertMovingLand::startDemo() { - MtxPtr playerBaseMtx = MR::getPlayerDemoActor()->getBaseMtx(); + MtxPtr playerBaseMtx = MR::getPlayerDemoActor()->getBaseMtx(); TMtx34f stack_38; stack_38.set(playerBaseMtx); - MtxPtr jointMtx = MR::getJointMtx(this, mObjectName); + MtxPtr jointMtx = MR::getJointMtx(this, mObjectName); TMtx34f stack_8; stack_8.set(jointMtx); stack_8.invert(stack_8); @@ -78,7 +78,7 @@ void DesertMovingLand::startDemo() { } void DesertMovingLand::updateDemoPlayerPos() { - MtxPtr jointMtx = MR::getJointMtx(this, mObjectName); + MtxPtr jointMtx = MR::getJointMtx(this, mObjectName); TMtx34f stack_8; stack_8.set(jointMtx); stack_8.concat(stack_8, _E4); @@ -90,8 +90,7 @@ void DesertMovingLand::exeWait() { if (MR::isValidSwitchA(this) && MR::isOnSwitchA(this) && isNerve(&NrvDesertMovingLand::HostTypeWaitTop::sInstance)) { startDemo(); setNerve(&NrvDesertMovingLand::HostTypeMoveDownSign::sInstance); - } - else if (MR::isOnSwitchB(this) && isNerve(&NrvDesertMovingLand::HostTypeWaitBottom::sInstance)) { + } else if (MR::isOnSwitchB(this) && isNerve(&NrvDesertMovingLand::HostTypeWaitBottom::sInstance)) { startDemo(); setNerve(&NrvDesertMovingLand::HostTypeMoveUpSign::sInstance); } @@ -99,8 +98,8 @@ void DesertMovingLand::exeWait() { void DesertMovingLand::exeMoveDown() { if (MR::isFirstStep(this)) { - TVec3f stack_8(_D0-_C4); - stack_8.setLength(PSVECMag(&stack_8)/_DC); + TVec3f stack_8(_D0 - _C4); + stack_8.setLength(PSVECMag(&stack_8) / _DC); mVelocity.set(stack_8); MR::startAtmosphereSE("SE_OJ_DESERT_LAND_MOVE_ST", -1, -1); } @@ -124,8 +123,8 @@ void DesertMovingLand::exeMoveDown() { void DesertMovingLand::exeMoveUp() { if (MR::isFirstStep(this)) { - TVec3f stack_8(_C4-_D0); - stack_8.setLength(PSVECMag(&stack_8)/_E0); + TVec3f stack_8(_C4 - _D0); + stack_8.setLength(PSVECMag(&stack_8) / _E0); mVelocity.set(stack_8); MR::startAtmosphereSE("SE_OJ_DESERT_LAND_MOVE_ST", -1, -1); } @@ -159,8 +158,7 @@ void DesertMovingLand::exeMoveSign() { MR::shakeCameraInfinity(this, 0.15000001f, 1.2f); } - - + MR::startLevelSound(this, "SE_OJ_LV_DESERT_LAND_SIGN", -1, -1, -1); MR::tryRumblePadMiddle(this, 0); if (MR::isBckStopped(this)) { @@ -190,18 +188,15 @@ void DesertMovingLand::connectToScene(const MapObjActorInitInfo& rInfo) { } void DesertMovingLand::initCaseNoUseSwitchB(const MapObjActorInitInfo& rInfo) { - } void DesertMovingLand::initCaseUseSwitchB(const MapObjActorInitInfo& rInfo) { - } void DesertMovingLand::initCaseUseSwitchA(const MapObjActorInitInfo& rInfo) { - } -DesertMovingLand::~DesertMovingLand() {}; +DesertMovingLand::~DesertMovingLand(){}; namespace NrvDesertMovingLand { HostTypeWaitTop(HostTypeWaitTop::sInstance); @@ -211,4 +206,4 @@ namespace NrvDesertMovingLand { HostTypeMoveDownSign(HostTypeMoveDownSign::sInstance); HostTypeMoveUpSign(HostTypeMoveUpSign::sInstance); HostTypeStop(HostTypeStop::sInstance); -}; +}; // namespace NrvDesertMovingLand diff --git a/src/Game/MapObj/DynamicCollisionObj.cpp b/src/Game/MapObj/DynamicCollisionObj.cpp index f20a27d0a..344bb50b3 100644 --- a/src/Game/MapObj/DynamicCollisionObj.cpp +++ b/src/Game/MapObj/DynamicCollisionObj.cpp @@ -2,7 +2,8 @@ #include "Game/Map/KCollision.hpp" #include "Game/MapObj/DynamicCollisionObj.hpp" -DynamicCollisionObj::DynamicCollisionObj(const char *pName) : LiveActor(pName) { +DynamicCollisionObj::DynamicCollisionObj(const char* pName) + : LiveActor(pName) { _A4 = 0; _9C = 0; _11C = 0; @@ -10,7 +11,7 @@ DynamicCollisionObj::DynamicCollisionObj(const char *pName) : LiveActor(pName) { _AC = 0; } -void DynamicCollisionObj::init(const JMapInfoIter &rIter) { +void DynamicCollisionObj::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::connectToScene(this, 42, 8, -1, 25); diff --git a/src/Game/MapObj/EarthenPipe.cpp b/src/Game/MapObj/EarthenPipe.cpp index ac248b7f7..89c3f7179 100644 --- a/src/Game/MapObj/EarthenPipe.cpp +++ b/src/Game/MapObj/EarthenPipe.cpp @@ -2,7 +2,8 @@ #include "Game/AudioLib/AudWrap.hpp" #include "Game/GameAudio/AudStageBgmTable.hpp" -EarthenPipe::EarthenPipe(const char *pName) : LiveActor(pName) { +EarthenPipe::EarthenPipe(const char* pName) + : LiveActor(pName) { _8C.x = 0.0f; _8C.y = 0.0f; _8C.z = 0.0f; @@ -31,7 +32,7 @@ EarthenPipe::EarthenPipe(const char *pName) : LiveActor(pName) { _BC.identity(); } -void EarthenPipe::init(const JMapInfoIter &rIter) { +void EarthenPipe::init(const JMapInfoIter& rIter) { MR::createSceneObj(SceneObj_EarthenPipeMediator); MR::getSceneObj(SceneObj_EarthenPipeMediator)->entry(this, rIter); MR::initDefaultPos(this, rIter); @@ -44,7 +45,7 @@ void EarthenPipe::init(const JMapInfoIter &rIter) { s32 arg7 = 0; MR::getJMapInfoArg7NoInit(rIter, &arg7); bool isWaterPipe = false; - + if (MR::isObjectName(rIter, "EarthenPipeInWater")) { isWaterPipe = true; } @@ -67,15 +68,14 @@ void EarthenPipe::init(const JMapInfoIter &rIter) { f32 y = v25.mMtx[1][1]; f32 x = v25.mMtx[0][1]; _98.set(x, y, z); - } - else { + } else { _98.set(mGravity); f32 _x = _98.x; f32 mult = -1.0f; f32 x = _x * mult; f32 y = _98.y * mult; f32 z = _98.z * mult; - + _98.x = x; _98.y = y; _98.z = z; @@ -99,8 +99,7 @@ void EarthenPipe::init(const JMapInfoIter &rIter) { if (isWaterPipe) { initHitSensor(3); - } - else { + } else { initHitSensor(1); } @@ -113,8 +112,7 @@ void EarthenPipe::init(const JMapInfoIter &rIter) { if (mPipeMode == 3) { MR::initCollisionParts(this, "EarthenPipeS", getSensor("binder"), mTopJointMtx); - } - else { + } else { MR::initCollisionParts(this, "EarthenPipe", getSensor("binder"), mTopJointMtx); } @@ -143,8 +141,7 @@ void EarthenPipe::init(const JMapInfoIter &rIter) { MR::tryStartAllAnim(mPipeStreamModel, "EarthenPipeStream"); mPipeStreamModel->appear(); _19C = 1; - } - else { + } else { _19C = 0; } @@ -155,8 +152,7 @@ void EarthenPipe::init(const JMapInfoIter &rIter) { if (mPipeStreamModel != nullptr) { MR::registerDemoSimpleCastAll(mPipeStreamModel); } - } - else if (MR::isEqualStageName("HeavensDoorGalaxy")) { + } else if (MR::isEqualStageName("HeavensDoorGalaxy")) { MR::registerDemoSimpleCastAll(this); } @@ -188,17 +184,15 @@ bool EarthenPipe::tryHideDown() { if (!mPipeMode || (mPipeMode - 3) <= 1u) { setNerve(&NrvEarthenPipe::EarthenPipeNrvInvalid::sInstance); return false; - } - else { + } else { if (mPipeMode == 2) { mPipeMode = 0; setNerve(&NrvEarthenPipe::EarthenPipeNrvInvalid::sInstance); return false; - } - else { + } else { setNerve(&NrvEarthenPipe::EarthenPipeNrvWaitToHideDown::sInstance); return true; - } + } } } @@ -207,8 +201,7 @@ bool EarthenPipe::isNerveShowUp() const { if (isNerve(&NrvEarthenPipe::EarthenPipeNrvShowUp::sInstance) || isNerve(&NrvEarthenPipe::EarthenPipeNrvShowUp::sInstance)) { ret = true; - } - else { + } else { ret = false; } @@ -226,8 +219,7 @@ void EarthenPipe::exeWait() { _19C = 1; } } - } - else if (MR::isValidHitSensor(this, "binder")) { + } else if (MR::isValidHitSensor(this, "binder")) { MR::invalidateHitSensors(this); if (mPipeStreamModel != nullptr) { mPipeStreamModel->kill(); @@ -262,8 +254,7 @@ void EarthenPipe::exePlayerIn() { JMath::gekko_ps_copy12(&_F0, _B0->getBaseMtx()); if (_B0->tryShowUp()) { setNerve(&NrvEarthenPipe::EarthenPipeNrvTargetPipeShowUp::sInstance); - } - else { + } else { setNerve(&NrvEarthenPipe::EarthenPipeNrvPlayerOut::sInstance); } } @@ -317,18 +308,16 @@ void EarthenPipe::exePlayerOut() { } } -inline bool isNear(const LiveActor *actor) { +inline bool isNear(const LiveActor* actor) { return !(MR::isNearPlayer(actor, 100.0f)); } void EarthenPipe::exeInvalid() { bool near; - if (MR::isGreaterStep(this, 0x1E) && MR::isOnGroundPlayer() - || mPipeMode == 4 && isNear(this) - || MR::isPlayerSwimming() && isNear(this)) { - MR::validateClipping(this); - MR::validateHitSensors(this); - setNerve(&NrvEarthenPipe::EarthenPipeNrvWait::sInstance); + if (MR::isGreaterStep(this, 0x1E) && MR::isOnGroundPlayer() || mPipeMode == 4 && isNear(this) || MR::isPlayerSwimming() && isNear(this)) { + MR::validateClipping(this); + MR::validateHitSensors(this); + setNerve(&NrvEarthenPipe::EarthenPipeNrvWait::sInstance); } } @@ -400,7 +389,7 @@ void EarthenPipe::processBgmPlayerIn() { s32 idx = _B0->mMusicChangeIdx; if (idx >= 0) { u32 bgmId = AudStageBgmTable::getBgmId(MR::getCurrentStageName(), idx); - if (bgmId != -1 ) { + if (bgmId != -1) { s32 cur = AudWrap::getBgmMgr()->_10; if (cur != bgmId) { MR::stopStageBGM(60); @@ -440,13 +429,14 @@ void EarthenPipe::processBgmPlayerOut() { if (bgm != nullptr) { bgm->changeTrackMuteState(bgmState, 0); } - } + } } - } + } } } -EarthenPipeMediator::EarthenPipeMediator() : NameObj("土管仲介者") { +EarthenPipeMediator::EarthenPipeMediator() + : NameObj("土管仲介者") { mNumEntries = 0; mPipeEntries = nullptr; mPipeEntries = new Entry[0x20]; @@ -458,13 +448,13 @@ EarthenPipeMediator::EarthenPipeMediator() : NameObj("土管仲介者") { } } -void EarthenPipeMediator::entry(EarthenPipe *pPipe, const JMapInfoIter &rIter) { +void EarthenPipeMediator::entry(EarthenPipe* pPipe, const JMapInfoIter& rIter) { s32 pipeID = -1; MR::getJMapInfoArg3NoInit(rIter, &pipeID); for (s32 i = 0; i < mNumEntries; i++) { EarthenPipeMediator::Entry* entry = &mPipeEntries[i]; - + if (pipeID == entry->mPipeID) { entry->_4 = pPipe; entry->_0->_B0 = pPipe; @@ -480,11 +470,9 @@ void EarthenPipeMediator::entry(EarthenPipe *pPipe, const JMapInfoIter &rIter) { } EarthenPipe::~EarthenPipe() { - } EarthenPipeMediator::~EarthenPipeMediator() { - } namespace NrvEarthenPipe { @@ -500,8 +488,7 @@ namespace NrvEarthenPipe { INIT_NERVE(EarthenPipeNrvPlayerIn); INIT_NERVE(EarthenPipeNrvReady); INIT_NERVE(EarthenPipeNrvWait); -}; - +}; // namespace NrvEarthenPipe void EarthenPipe::exeWaitToHideDown() { if (MR::isStep(this, 0x28)) { @@ -520,5 +507,4 @@ MtxPtr EarthenPipe::getBaseMtx() const { } void EarthenPipe::calcAnim() { - } diff --git a/src/Game/MapObj/ExterminationChecker.cpp b/src/Game/MapObj/ExterminationChecker.cpp index 3efcb9c85..05c0ebd3f 100644 --- a/src/Game/MapObj/ExterminationChecker.cpp +++ b/src/Game/MapObj/ExterminationChecker.cpp @@ -2,7 +2,8 @@ #include "Game/MapObj/KeySwitch.hpp" #include "Game/LiveActor/LiveActorGroup.hpp" -ExterminationChecker::ExterminationChecker(const char *pName) : LiveActor(pName) { +ExterminationChecker::ExterminationChecker(const char* pName) + : LiveActor(pName) { mGroup = nullptr; mKeySwitch = nullptr; mKeySwitchPos.x = 0.0f; @@ -12,13 +13,13 @@ ExterminationChecker::ExterminationChecker(const char *pName) : LiveActor(pName) _A1 = 0; } -void ExterminationChecker::init(const JMapInfoIter &rIter) { +void ExterminationChecker::init(const JMapInfoIter& rIter) { MR::connectToSceneMapObjMovement(this); s32 objNum = MR::getChildObjNum(rIter); - mGroup = new LiveActorGroup("アクター管理", objNum); + mGroup = new LiveActorGroup("アクター管理", objNum); for (s32 i = 0; i < objNum; i++) { - const char* objName = nullptr; + const char* objName = nullptr; MR::getChildObjName(&objName, rIter, i); LiveActor* actor = findEntry(objName)(MR::getJapaneseObjectName(objName)); MR::initChildObj(actor, rIter, i); @@ -42,14 +43,12 @@ void ExterminationChecker::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchReadAppear(this, rIter)) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { makeActorAppeared(); } } void ExterminationChecker::control() { - } void ExterminationChecker::exeWatching() { @@ -103,23 +102,22 @@ void ExterminationChecker::exeAppearKeySwitch() { } namespace MR { - NameObj* createExterminationPowerStar(const char *pName) { + NameObj* createExterminationPowerStar(const char* pName) { ExterminationChecker* checker = new ExterminationChecker(pName); checker->_A0 = 1; checker->_A1 = 0; return checker; } - - NameObj* createExterminationKeySwitch(const char *pName) { + + NameObj* createExterminationKeySwitch(const char* pName) { ExterminationChecker* checker = new ExterminationChecker(pName); checker->_A0 = 0; checker->_A1 = 1; return checker; } -}; +}; // namespace MR ExterminationChecker::~ExterminationChecker() { - } namespace NrvExterminationChecker { @@ -127,4 +125,4 @@ namespace NrvExterminationChecker { INIT_NERVE(ExterminationCheckerNrvTryStartDemoAppear); INIT_NERVE(ExterminationCheckerNrvAppearStar); INIT_NERVE(ExterminationCheckerNrvAppearKeySwitch); -}; +}; // namespace NrvExterminationChecker diff --git a/src/Game/MapObj/FallingSmallRock.cpp b/src/Game/MapObj/FallingSmallRock.cpp index b75d4a66d..cfa1a6f8f 100644 --- a/src/Game/MapObj/FallingSmallRock.cpp +++ b/src/Game/MapObj/FallingSmallRock.cpp @@ -1,10 +1,10 @@ #include "Game/MapObj/FallingSmallRock.hpp" -FallingSmallRock::FallingSmallRock(const char *pName) : LiveActor(pName) { - +FallingSmallRock::FallingSmallRock(const char* pName) + : LiveActor(pName) { } -void FallingSmallRock::init(const JMapInfoIter &rIter) { +void FallingSmallRock::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initSound(4, false); initBinder(10.0f, 800.0f, 0); @@ -36,7 +36,7 @@ void FallingSmallRock::exeMove() { } MR::startLevelSound(this, "SE_AT_LV_FALLING_ROCK", -1, -1, -1); - + if (MR::isBinded(this)) { makeActorDead(); } @@ -49,10 +49,9 @@ void FallingSmallRock::exeWait() { } FallingSmallRock::~FallingSmallRock() { - } namespace NrvFallingSmallRock { INIT_NERVE(HostTypeWait); INIT_NERVE(HostTypeMove); -}; \ No newline at end of file +}; // namespace NrvFallingSmallRock \ No newline at end of file diff --git a/src/Game/MapObj/FireBar.cpp b/src/Game/MapObj/FireBar.cpp index a554c25a9..aa5172181 100644 --- a/src/Game/MapObj/FireBar.cpp +++ b/src/Game/MapObj/FireBar.cpp @@ -3,18 +3,17 @@ #include "JSystem/JMath/JMath.hpp" FireBarBall::~FireBarBall() { - } FireBar::~FireBar() { - } -FireBarBall::FireBarBall(LiveActor *pParent) : ModelObj("ファイアバー玉", "FireBarBall", 0, 0xB, -2, -2, false) { +FireBarBall::FireBarBall(LiveActor* pParent) + : ModelObj("ファイアバー玉", "FireBarBall", 0, 0xB, -2, -2, false) { mFireBarParent = pParent; -} +} -void FireBarBall::init(const JMapInfoIter &rIter) { +void FireBarBall::init(const JMapInfoIter& rIter) { f32 shadowDropDist = 100.0f; MR::getJMapInfoArg6NoInit(rIter, &shadowDropDist); @@ -65,13 +64,13 @@ void FireBarBall::endClipped() { void FireBarBall::controlEmitEffect() { if (MR::isNearPlayerAnyTime(this, 5000.0f)) { MR::emitEffect(this, "FireBarBall"); - } - else { + } else { MR::deleteEffect(this, "FireBarBall"); } } -FireBar::FireBar(const char *pName) : LiveActor(pName) { +FireBar::FireBar(const char* pName) + : LiveActor(pName) { mFireBalls = 0; mFireBallCount = 5; _94.x = 0.0f; @@ -82,7 +81,7 @@ FireBar::FireBar(const char *pName) : LiveActor(pName) { mStickDistance = 140.0f; } -void FireBar::init(const JMapInfoIter &rIter) { +void FireBar::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("FireBarCore", 0, false); MR::connectToSceneMapObj(this); @@ -165,7 +164,7 @@ void FireBar::makeActorDead() { LiveActor::makeActorDead(); } -void FireBar::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void FireBar::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayerOrRide(pReceiver) && MR::isSensorEnemyAttack(pSender)) { MR::sendMsgEnemyAttackFire(pReceiver, pSender); } @@ -175,7 +174,7 @@ void FireBar::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { #ifdef NON_MATCHING // meh -void FireBar::initFireBarBall(const JMapInfoIter &rIter) { +void FireBar::initFireBarBall(const JMapInfoIter& rIter) { mFireBalls = new FireBarBall*[mFireBallCount]; s32 totalNum = mFireBallCount; totalNum /= mStickCount; @@ -221,8 +220,7 @@ void FireBar::fixFireBarBall() { MR::normalize(scaled, &norm); JMAVECScaleAdd((const Vec*)&norm, (const Vec*)&mPosition, (Vec*)&final_pos, mStickDistance); JMAVECScaleAdd((const Vec*)&up_vec, (const Vec*)&final_pos, (Vec*)&final_pos, 50.0f); - } - else { + } else { JMathInlineVEC::PSVECAdd((const Vec*)&final_pos, (const Vec*)&scaled, (Vec*)&final_pos); } @@ -233,8 +231,8 @@ void FireBar::fixFireBarBall() { namespace NrvFireBar { FireBarNrvWait FireBarNrvWait::sInstance; - void FireBarNrvWait::execute(Spine *pSpine) const { + void FireBarNrvWait::execute(Spine* pSpine) const { FireBar* bar = reinterpret_cast(pSpine->mExecutor); bar->exeWait(); } -}; +}; // namespace NrvFireBar diff --git a/src/Game/MapObj/FirePressure.cpp b/src/Game/MapObj/FirePressure.cpp index f169be666..255f0cc0b 100644 --- a/src/Game/MapObj/FirePressure.cpp +++ b/src/Game/MapObj/FirePressure.cpp @@ -4,31 +4,30 @@ #include FirePressure::~FirePressure() { - } -FirePressure::FirePressure(const char *pName) : PressureBase(pName) { +FirePressure::FirePressure(const char* pName) + : PressureBase(pName) { mDisableCollsion = false; } -void FirePressure::init(const JMapInfoIter &rIter) { +void FirePressure::init(const JMapInfoIter& rIter) { PressureBase::init(rIter); MR::getJMapInfoArg7NoInit(rIter, &mDisableCollsion); } -void FirePressure::initBullet(const JMapInfoIter &rIter) { +void FirePressure::initBullet(const JMapInfoIter& rIter) { MR::createSceneObj(SceneObj_FirePressureBulletHolder); } bool FirePressure::shotBullet(f32 a1) { FirePressureBulletHolder* hldr = MR::getSceneObj(SceneObj_FirePressureBulletHolder); - FirePressureBullet* bullet = hldr->callEmptyBullet(); + FirePressureBullet* bullet = hldr->callEmptyBullet(); // do we have an empty bullet slot available? if (bullet == nullptr) { return false; - } - else { + } else { TPos3f gunPoint; calcGunPointFromCannon(&gunPoint); bullet->shotFireBullet(this, gunPoint, a1, isShotTypeFollow(), mDisableCollsion); @@ -36,13 +35,13 @@ bool FirePressure::shotBullet(f32 a1) { } } -void FirePressure::calcGunPointFromCannon(TPos3f *pOutPoint) { +void FirePressure::calcGunPointFromCannon(TPos3f* pOutPoint) { Mtx jointMtx; JMath::gekko_ps_copy12(jointMtx, MR::getJointMtx(this, "Cannon1")); TVec3f stack_2C; - f32 z = jointMtx[2][0]; - f32 y = jointMtx[1][0]; - f32 x = jointMtx[0][0]; + f32 z = jointMtx[2][0]; + f32 y = jointMtx[1][0]; + f32 x = jointMtx[0][0]; stack_2C.set(x, y, z); TVec3f stack_20; z = jointMtx[2][3]; diff --git a/src/Game/MapObj/FirePressureBullet.cpp b/src/Game/MapObj/FirePressureBullet.cpp index bf09061d2..d63e2075f 100644 --- a/src/Game/MapObj/FirePressureBullet.cpp +++ b/src/Game/MapObj/FirePressureBullet.cpp @@ -1,6 +1,7 @@ #include "Game/MapObj/FirePressureBullet.hpp" -FirePressureBullet::FirePressureBullet(const char *pName) : LiveActor(pName) { +FirePressureBullet::FirePressureBullet(const char* pName) + : LiveActor(pName) { _8C.x = 0.0f; _8C.y = 0.0f; _8C.z = 0.0f; @@ -10,7 +11,7 @@ FirePressureBullet::FirePressureBullet(const char *pName) : LiveActor(pName) { _A1 = false; } -void FirePressureBullet::init(const JMapInfoIter &rIter) { +void FirePressureBullet::init(const JMapInfoIter& rIter) { initModelManagerWithAnm("FireBullet", nullptr, false); MR::connectToSceneMapObj(this); initHitSensor(1); @@ -31,11 +32,11 @@ void FirePressureBullet::kill() { void FirePressureBullet::calcAndSetBaseMtx() { TPos3f mtx; - MR::calcMtxFromGravityAndZAxis(&mtx, this,mGravity, _8C); + MR::calcMtxFromGravityAndZAxis(&mtx, this, mGravity, _8C); MR::setBaseTRMtx(this, mtx); } -void FirePressureBullet::shotFireBullet(LiveActor *pActor, const TPos3f &rPos, const f32 &a3, bool a4, bool a5) { +void FirePressureBullet::shotFireBullet(LiveActor* pActor, const TPos3f& rPos, const f32& a3, bool a4, bool a5) { f32 v7 = rPos.mMtx[2][2]; f32 v9 = rPos.mMtx[1][2]; f32 v11 = rPos.mMtx[0][2]; @@ -74,20 +75,18 @@ void FirePressureBullet::exeFly() { MR::turnDirectionToTargetDegree(this, &_8C, *MR::getPlayerPos(), 3.0f); mVelocity.scale(_9C, _8C); } - + if (isCrash()) { kill(); - } - else if (MR::isStep(this, 300)) { + } else if (MR::isStep(this, 300)) { kill(); } } -void FirePressureBullet::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void FirePressureBullet::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorEnemy(pReceiver) || MR::isSensorMapObj(pReceiver)) { kill(); - } - else if (!MR::isSensorPlayer(pReceiver) && MR::sendMsgEnemyAttackFire(pReceiver, pSender)) { + } else if (!MR::isSensorPlayer(pReceiver) && MR::sendMsgEnemyAttackFire(pReceiver, pSender)) { kill(); } } @@ -101,7 +100,6 @@ bool FirePressureBullet::isCrash() const { } FirePressureBullet::~FirePressureBullet() { - } namespace NrvFirePressureBullet { diff --git a/src/Game/MapObj/FirePressureBulletHolder.cpp b/src/Game/MapObj/FirePressureBulletHolder.cpp index 1cb74017f..5ed7ced72 100644 --- a/src/Game/MapObj/FirePressureBulletHolder.cpp +++ b/src/Game/MapObj/FirePressureBulletHolder.cpp @@ -1,7 +1,7 @@ #include "Game/MapObj/FirePressureBulletHolder.hpp" -FirePressureBulletHolder::FirePressureBulletHolder(const char *pName) : NameObj(pName) { - +FirePressureBulletHolder::FirePressureBulletHolder(const char* pName) + : NameObj(pName) { } FirePressureBullet* FirePressureBulletHolder::callEmptyBullet() { @@ -15,10 +15,9 @@ FirePressureBullet* FirePressureBulletHolder::callEmptyBullet() { } FirePressureBulletHolder::~FirePressureBulletHolder() { - } -void FirePressureBulletHolder::init(const JMapInfoIter &rIter) { +void FirePressureBulletHolder::init(const JMapInfoIter& rIter) { for (u32 i = 0; i < 8; i++) { mBullets[i] = new FirePressureBullet("ファイアプレッシャーの弾"); mBullets[i]->initWithoutIter(); diff --git a/src/Game/MapObj/FirePressureRadiate.cpp b/src/Game/MapObj/FirePressureRadiate.cpp index 4ac3b9417..dd9f354d3 100644 --- a/src/Game/MapObj/FirePressureRadiate.cpp +++ b/src/Game/MapObj/FirePressureRadiate.cpp @@ -1,6 +1,7 @@ #include "Game/MapObj/FirePressureRadiate.hpp" -FirePressureRadiate::FirePressureRadiate(const char *pName) : LiveActor(pName) { +FirePressureRadiate::FirePressureRadiate(const char* pName) + : LiveActor(pName) { mJointController = nullptr; mCannonRotation = 0.0f; mWaitTime = 300; @@ -13,7 +14,7 @@ FirePressureRadiate::FirePressureRadiate(const char *pName) : LiveActor(pName) { mRadiateMtx.identity(); } -void FirePressureRadiate::init(const JMapInfoIter &rIter) { +void FirePressureRadiate::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("FirePressure", nullptr, false); MR::connectToSceneNoShadowedMapObjStrongLight(this); @@ -42,8 +43,7 @@ void FirePressureRadiate::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchWriteA(this, rIter)) { MR::listenStageSwitchOnOffA(this, MR::Functor(this, &FirePressureRadiate::startWait), MR::Functor(this, &FirePressureRadiate::startRelax)); initNerve(&NrvFirePressureRadiate::FirePressureRadiateNrvRelax::sInstance); - } - else { + } else { initNerve(&NrvFirePressureRadiate::FirePressureRadiateNrvWait::sInstance); } @@ -51,8 +51,7 @@ void FirePressureRadiate::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchReadAppear(this, rIter)) { makeActorDead(); - } - else { + } else { makeActorAppeared(); } } @@ -70,7 +69,7 @@ void FirePressureRadiate::initAfterPlacement() { } _DC = first == this; - } + } } void FirePressureRadiate::calcAndSetBaseMtx() { @@ -133,8 +132,7 @@ void FirePressureRadiate::exeRadiateMargin() { if (mGroup != nullptr) { setNerve(&NrvFirePressureRadiate::FirePressureRadiateNrvSyncWait::sInstance); - } - else { + } else { setNerve(&NrvFirePressureRadiate::FirePressureRadiateNrvWait::sInstance); } @@ -156,30 +154,27 @@ void FirePressureRadiate::control() { f32 liner = MR::getLinerValue(_CC / 70.0f, 51.0f, _D4, 1.0f); _D0 = liner; _CC = _CC + 1; - } - else { + } else { _CC = -1; _D0 = _D4; } } } -void FirePressureRadiate::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void FirePressureRadiate::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorEnemyAttack(pSender) && MR::isSensorPlayerOrRide(pReceiver)) { MR::sendMsgEnemyAttackFire(pReceiver, pSender); - } - else if (MR::isSensorMapObj(pSender) && (MR::isSensorPlayer(pReceiver) || MR::isSensorEnemy(pReceiver))) { + } else if (MR::isSensorMapObj(pSender) && (MR::isSensorPlayer(pReceiver) || MR::isSensorEnemy(pReceiver))) { MR::sendMsgPush(pReceiver, pSender); } } -bool FirePressureRadiate::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool FirePressureRadiate::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (msg == ACTMES_GROUP_MOVE_STOP) { setNerve(&NrvFirePressureRadiate::FirePressureRadiateNrvSyncWait::sInstance); return true; - } - else if (msg == ACTMES_GROUP_MOVE_START) { + } else if (msg == ACTMES_GROUP_MOVE_START) { setNerve(&NrvFirePressureRadiate::FirePressureRadiateNrvWait::sInstance); return true; @@ -215,9 +210,9 @@ void FirePressureRadiate::calcRadiateEffectMtx() { } #ifdef NON_MATCHING -bool FirePressureRadiate::calcJointCannon(TPos3f *pOutPos, const JointControllerInfo &) { +bool FirePressureRadiate::calcJointCannon(TPos3f* pOutPos, const JointControllerInfo&) { TVec3f v9(0.0f, 0.0f, 1.0f); - f32 rotDegree = (0.017453292f * mCannonRotation); + f32 rotDegree = (0.017453292f * mCannonRotation); TPos3f v10; v10.mMtx[0][3] = 0.0f; v10.mMtx[1][3] = 0.0f; @@ -249,8 +244,7 @@ namespace NrvFirePressureRadiate { INIT_NERVE(FirePressureRadiateNrvPrepareToRadiate); INIT_NERVE(FirePressureRadiateNrvRadiate); INIT_NERVE(FirePressureRadiateNrvRadiateMargin); -}; - -FirePressureRadiate::~ FirePressureRadiate() { +}; // namespace NrvFirePressureRadiate +FirePressureRadiate::~FirePressureRadiate() { } diff --git a/src/Game/MapObj/FlameGun.cpp b/src/Game/MapObj/FlameGun.cpp index 9825ea687..48f864bb5 100644 --- a/src/Game/MapObj/FlameGun.cpp +++ b/src/Game/MapObj/FlameGun.cpp @@ -1,13 +1,14 @@ #include "Game/MapObj/FlameGun.hpp" -FlameGun::FlameGun(const char *pName) : LiveActor(pName) { +FlameGun::FlameGun(const char* pName) + : LiveActor(pName) { _8C.x = 0.0f; _8C.y = -1.0f; _8C.z = 0.0f; mState = -1; } -void FlameGun::init(const JMapInfoIter &rIter) { +void FlameGun::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::setGroupClipping(this, rIter, 32); s32 arg = 0; @@ -16,18 +17,17 @@ void FlameGun::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchReadA(this, rIter)) { initNerve(&NrvFlameGun::HostTypeNrvSwitchWait::sInstance); - } - else { + } else { switch (mState) { - case 0: - initNerve(&NrvFlameGun::HostTypeNrvSwitchWait::sInstance); - break; - case 1: - initNerve(&NrvFlameGun::HostTypeNrvRotate::sInstance); - break; - case 2: - initNerve(&NrvFlameGun::HostTypeNrvRadiateOnly::sInstance); - break; + case 0: + initNerve(&NrvFlameGun::HostTypeNrvSwitchWait::sInstance); + break; + case 1: + initNerve(&NrvFlameGun::HostTypeNrvRotate::sInstance); + break; + case 2: + initNerve(&NrvFlameGun::HostTypeNrvRadiateOnly::sInstance); + break; } } @@ -72,15 +72,15 @@ void FlameGun::exeSwitchWait() { if (MR::isValidSwitchA(this) && MR::isOnSwitchA(this)) { switch (mState) { - case 0: - setNerve(&NrvFlameGun::HostTypeNrvPreRadiate::sInstance); - break; - case 1: - setNerve(&NrvFlameGun::HostTypeNrvRotate::sInstance); - break; - case 2: - setNerve(&NrvFlameGun::HostTypeNrvRadiateOnly::sInstance); - break; + case 0: + setNerve(&NrvFlameGun::HostTypeNrvPreRadiate::sInstance); + break; + case 1: + setNerve(&NrvFlameGun::HostTypeNrvRotate::sInstance); + break; + case 2: + setNerve(&NrvFlameGun::HostTypeNrvRadiateOnly::sInstance); + break; } } } @@ -147,14 +147,13 @@ void FlameGun::exeRadiateOnly() { // FlameGun::updateHitSensor -void FlameGun::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void FlameGun::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (!MR::sendMsgEnemyAttackFire(pReceiver, pSender)) { MR::sendMsgPush(pReceiver, pSender); } } FlameGun::~FlameGun() { - } namespace NrvFlameGun { @@ -164,4 +163,4 @@ namespace NrvFlameGun { INIT_NERVE(HostTypeNrvRadiate); INIT_NERVE(HostTypeNrvRotate); INIT_NERVE(HostTypeNrvRadiateOnly); -}; \ No newline at end of file +}; // namespace NrvFlameGun \ No newline at end of file diff --git a/src/Game/MapObj/FlipPanel.cpp b/src/Game/MapObj/FlipPanel.cpp index 7124041af..7068341d5 100644 --- a/src/Game/MapObj/FlipPanel.cpp +++ b/src/Game/MapObj/FlipPanel.cpp @@ -5,7 +5,8 @@ #include "Game/Util.hpp" #include "JSystem/JMath/JMath.hpp" -FlipPanel::FlipPanel(const char *pName) : MapObjActor(pName) { +FlipPanel::FlipPanel(const char* pName) + : MapObjActor(pName) { mDelegator = 0; mFlipPanelGroup = 0; _CC = 0; @@ -14,7 +15,7 @@ FlipPanel::FlipPanel(const char *pName) : MapObjActor(pName) { mIsReverse = false; } -void FlipPanel::init(const JMapInfoIter &rIter) { +void FlipPanel::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; info.setupHioNode("地形オブジェ"); @@ -34,9 +35,8 @@ void FlipPanel::init(const JMapInfoIter &rIter) { if (mIsReverse) { MapObjActorUtil::appearBloomModel(this); - } - else { - MapObjActorUtil::killBloomModel(this); + } else { + MapObjActorUtil::killBloomModel(this); } } @@ -47,12 +47,11 @@ void FlipPanel::exeFrontLand() { if (mIsReverse) { MapObjActorUtil::appearBloomModel(this); ModelObj* bloomModel = mBloomModel; - u32 frameMax = MR::getBrkFrameMax(bloomModel); - u32 val = sBloomSyncStep / frameMax; - frameMax = sBloomSyncStep - (val) * frameMax; + u32 frameMax = MR::getBrkFrameMax(bloomModel); + u32 val = sBloomSyncStep / frameMax; + frameMax = sBloomSyncStep - (val)*frameMax; MR::setBrkFrame(bloomModel, frameMax); - } - else { + } else { MapObjActorUtil::killBloomModel(this); } @@ -76,13 +75,12 @@ void FlipPanel::exeBackLand() { if (mIsReverse) { MapObjActorUtil::killBloomModel(this); - } - else { + } else { MapObjActorUtil::appearBloomModel(this); ModelObj* bloomModel = mBloomModel; - u32 frameMax = MR::getBrkFrameMax(bloomModel); - u32 val = sBloomSyncStep / frameMax; - frameMax = sBloomSyncStep - (val) * frameMax; + u32 frameMax = MR::getBrkFrameMax(bloomModel); + u32 val = sBloomSyncStep / frameMax; + frameMax = sBloomSyncStep - (val)*frameMax; MR::setBrkFrame(bloomModel, frameMax); } @@ -113,8 +111,7 @@ void FlipPanel::exeWait() { if (checkPlayerOnTop()) { if (isNerve(&NrvFlipPanel::FlipPanelNrvFront::sInstance)) { setNerve(&NrvFlipPanel::FlipPanelNrvBackLand::sInstance); - } - else { + } else { setNerve(&NrvFlipPanel::FlipPanelNrvFrontLand::sInstance); } } @@ -140,8 +137,7 @@ void FlipPanel::appear() { MapObjActor::appear(); if (mIsReverse) { MapObjActorUtil::appearBloomModel(this); - } - else { + } else { MapObjActorUtil::killBloomModel(this); } } @@ -151,9 +147,9 @@ void FlipPanel::endClipped() { if (MR::getBrkCtrl(mBloomModel)) { ModelObj* bloomModel = mBloomModel; - u32 frameMax = MR::getBrkFrameMax(bloomModel); - u32 val = sBloomSyncStep / frameMax; - frameMax = sBloomSyncStep - (val) * frameMax; + u32 frameMax = MR::getBrkFrameMax(bloomModel); + u32 val = sBloomSyncStep / frameMax; + frameMax = sBloomSyncStep - (val)*frameMax; MR::setBrkFrame(bloomModel, frameMax); } } @@ -162,11 +158,11 @@ void FlipPanel::calcAndSetBaseMtx() { MapObjActor::calcAndSetBaseMtx(); if (_CC) { - mDelegator->registerCallBack(); + mDelegator->registerCallBack(); } } -bool FlipPanel::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool FlipPanel::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (isNerve(&NrvFlipPanel::FlipPanelNrvEnd::sInstance)) { return false; } @@ -187,7 +183,7 @@ bool FlipPanel::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceive return false; } -bool FlipPanel::calcJointMove(TPos3f *pPos, const JointControllerInfo &rInfo) { +bool FlipPanel::calcJointMove(TPos3f* pPos, const JointControllerInfo& rInfo) { if (!_CC) { return false; } @@ -223,10 +219,8 @@ bool FlipPanel::checkPlayerOnTop() { TVec3f* groundNormal = MR::getPlayerGroundNormal(); - bool ret = JGeometry::TUtil::epsilonEquals(upVec.x, groundNormal->x, 0.0000038146973f) - && JGeometry::TUtil::epsilonEquals(upVec.y, groundNormal->y, 0.0000038146973f) - && JGeometry::TUtil::epsilonEquals(upVec.z, groundNormal->z, 0.0000038146973f); - + bool ret = JGeometry::TUtil::epsilonEquals(upVec.x, groundNormal->x, 0.0000038146973f) && JGeometry::TUtil::epsilonEquals(upVec.y, groundNormal->y, 0.0000038146973f) && JGeometry::TUtil::epsilonEquals(upVec.z, groundNormal->z, 0.0000038146973f); + if (!ret) { _D0 = 0; return false; @@ -241,7 +235,8 @@ bool FlipPanel::checkPlayerOnTop() { return true; } -FlipPanelObserver::FlipPanelObserver(const char *pName) : LiveActor(pName) { +FlipPanelObserver::FlipPanelObserver(const char* pName) + : LiveActor(pName) { _8C = 0; _90 = 0; mDemoDelay = 0; @@ -250,7 +245,7 @@ FlipPanelObserver::FlipPanelObserver(const char *pName) : LiveActor(pName) { sBloomSyncStep = 0; } -void FlipPanelObserver::init(const JMapInfoIter &rIter) { +void FlipPanelObserver::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::connectToSceneMapObjMovement(this); initHitSensor(1); @@ -264,8 +259,7 @@ void FlipPanelObserver::init(const JMapInfoIter &rIter) { if (mPowerStarId != -1) { if (!mPowerStarId) { MR::declarePowerStar(this); - } - else { + } else { MR::declarePowerStar(this, mPowerStarId); } } @@ -275,19 +269,17 @@ void FlipPanelObserver::init(const JMapInfoIter &rIter) { if (MR::isEqualStageName("HeavensDoorGalaxy")) { _9C = 1; - } - else { + } else { _9C = 0; } initNerve(&NrvFlipPanelObserver::FlipPanelObserverNrvWait::sInstance); bool ret = MR::useStageSwitchReadAppear(this, rIter); - if (ret) { + if (ret) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { makeActorAppeared(); } } @@ -300,8 +292,7 @@ void FlipPanelObserver::exeWait() { if (_90 == _8C->mObjectCount - 1 && MR::tryStartDemo(this, "FlipPanelComplete")) { setNerve(&NrvFlipPanelObserver::FlipPanelObserverNrvComplete::sInstance); - } - else { + } else { sBloomSyncStep++; } } @@ -319,8 +310,7 @@ void FlipPanelObserver::exeComplete() { if (mPowerStarId != -1) { if (!mPowerStarId) { MR::requestAppearPowerStar(this, mPosition); - } - else { + } else { MR::requestAppearPowerStar(this, mPowerStarId, mPosition); } } @@ -345,21 +335,18 @@ void FlipPanelObserver::initAfterPlacement() { } } -bool FlipPanelObserver::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool FlipPanelObserver::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (msg == ACTMES_SUCCESS) { if (!_90) { if (_9C) { MR::startSystemME("ME_FLIP_PANEL_INV_OFF_FIRST"); - } - else { + } else { MR::startSystemME("ME_FLIP_PANEL_ON_FIRST"); } - } - else { + } else { if (_9C) { MR::startSystemME("ME_FLIP_PANEL_INV_OFF"); - } - else { + } else { MR::startSystemME("ME_FLIP_PANEL_ON"); } } @@ -367,12 +354,10 @@ bool FlipPanelObserver::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor * _90++; return true; - } - else if (msg == ACTMES_FAILURE) { + } else if (msg == ACTMES_FAILURE) { if (_9C) { MR::startSystemME("ME_FLIP_PANEL_INV_ON"); - } - else { + } else { MR::startSystemME("ME_FLIP_PANEL_OFF"); } @@ -385,72 +370,70 @@ bool FlipPanelObserver::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor * } namespace NrvFlipPanel { - FlipPanelNrvFrontLand FlipPanelNrvFrontLand::sInstance; - FlipPanelNrvBackLand FlipPanelNrvBackLand::sInstance; - FlipPanelNrvFront FlipPanelNrvFront::sInstance; - FlipPanelNrvBack FlipPanelNrvBack::sInstance; + FlipPanelNrvFrontLand FlipPanelNrvFrontLand::sInstance; + FlipPanelNrvBackLand FlipPanelNrvBackLand::sInstance; + FlipPanelNrvFront FlipPanelNrvFront::sInstance; + FlipPanelNrvBack FlipPanelNrvBack::sInstance; FlipPanelNrvEndPrepare FlipPanelNrvEndPrepare::sInstance; - FlipPanelNrvEnd FlipPanelNrvEnd::sInstance; -}; + FlipPanelNrvEnd FlipPanelNrvEnd::sInstance; +}; // namespace NrvFlipPanel namespace NrvFlipPanelObserver { - FlipPanelObserverNrvWait FlipPanelObserverNrvWait::sInstance; + FlipPanelObserverNrvWait FlipPanelObserverNrvWait::sInstance; FlipPanelObserverNrvComplete FlipPanelObserverNrvComplete::sInstance; FlipPanelObserverNrvDemoWait FlipPanelObserverNrvDemoWait::sInstance; -}; +}; // namespace NrvFlipPanelObserver -void NrvFlipPanelObserver::FlipPanelObserverNrvDemoWait::execute(Spine *pSpine) const { +void NrvFlipPanelObserver::FlipPanelObserverNrvDemoWait::execute(Spine* pSpine) const { FlipPanelObserver* obs = reinterpret_cast(pSpine->mExecutor); obs->exeDemoWait(); } -void NrvFlipPanelObserver::FlipPanelObserverNrvComplete::execute(Spine *pSpine) const { +void NrvFlipPanelObserver::FlipPanelObserverNrvComplete::execute(Spine* pSpine) const { FlipPanelObserver* obs = reinterpret_cast(pSpine->mExecutor); obs->exeComplete(); } -void NrvFlipPanelObserver::FlipPanelObserverNrvWait::execute(Spine *pSpine) const { +void NrvFlipPanelObserver::FlipPanelObserverNrvWait::execute(Spine* pSpine) const { FlipPanelObserver* obs = reinterpret_cast(pSpine->mExecutor); obs->exeWait(); } -void NrvFlipPanel::FlipPanelNrvEnd::execute(Spine *pSpine) const { +void NrvFlipPanel::FlipPanelNrvEnd::execute(Spine* pSpine) const { FlipPanel* panel = reinterpret_cast(pSpine->mExecutor); panel->exeEnd(); } -void NrvFlipPanel::FlipPanelNrvEndPrepare::execute(Spine *pSpine) const { +void NrvFlipPanel::FlipPanelNrvEndPrepare::execute(Spine* pSpine) const { FlipPanel* panel = reinterpret_cast(pSpine->mExecutor); - + if (MR::isStep(panel, 0x14)) { panel->setNerve(&NrvFlipPanel::FlipPanelNrvEnd::sInstance); } } -void NrvFlipPanel::FlipPanelNrvBack::execute(Spine *pSpine) const { +void NrvFlipPanel::FlipPanelNrvBack::execute(Spine* pSpine) const { FlipPanel* panel = reinterpret_cast(pSpine->mExecutor); panel->exeWait(); } -void NrvFlipPanel::FlipPanelNrvFront::execute(Spine *pSpine) const { +void NrvFlipPanel::FlipPanelNrvFront::execute(Spine* pSpine) const { FlipPanel* panel = reinterpret_cast(pSpine->mExecutor); panel->exeWait(); } -void NrvFlipPanel::FlipPanelNrvBackLand::execute(Spine *pSpine) const { +void NrvFlipPanel::FlipPanelNrvBackLand::execute(Spine* pSpine) const { FlipPanel* panel = reinterpret_cast(pSpine->mExecutor); panel->exeBackLand(); } -void NrvFlipPanel::FlipPanelNrvFrontLand::execute(Spine *pSpine) const { +void NrvFlipPanel::FlipPanelNrvFrontLand::execute(Spine* pSpine) const { FlipPanel* panel = reinterpret_cast(pSpine->mExecutor); panel->exeFrontLand(); } FlipPanel::~FlipPanel() { - } FlipPanelObserver::~FlipPanelObserver() { - } \ No newline at end of file diff --git a/src/Game/MapObj/FloaterFloatingForce.cpp b/src/Game/MapObj/FloaterFloatingForce.cpp index 74007b9c0..fc2ed0773 100644 --- a/src/Game/MapObj/FloaterFloatingForce.cpp +++ b/src/Game/MapObj/FloaterFloatingForce.cpp @@ -3,26 +3,26 @@ #include "math_types.hpp" FloaterFloatingForce::~FloaterFloatingForce() { - } -FloaterFloatingForce::FloaterFloatingForce(LiveActor *pActor, const char *pName) : MapPartsFunction(pActor, "浮力"), _18(pName), _1C(gZeroVec) { +FloaterFloatingForce::FloaterFloatingForce(LiveActor* pActor, const char* pName) + : MapPartsFunction(pActor, "浮力"), _18(pName), _1C(gZeroVec) { _28.setPS(TVec3f(0.0f, 1.0f, 0.0f)); mMoveCondition = 0.0f; } -void FloaterFloatingForce::init(const JMapInfoIter &rIter) { +void FloaterFloatingForce::init(const JMapInfoIter& rIter) { s32 moveType = 0; MR::getMapPartsArgMoveConditionType(&moveType, rIter); mMoveCondition = moveType; } -void FloaterFloatingForce::start() { +void FloaterFloatingForce::start() { _1C.x = mHost->mPosition.x; _1C.y = mHost->mPosition.y; _1C.z = mHost->mPosition.z; TSMtxf matrix; - f32 x, y, z; + f32 x, y, z; matrix.setInline_2(mHost->getBaseMtx()); x = matrix.mMtx[0][1]; y = matrix.mMtx[1][1]; diff --git a/src/Game/MapObj/FloaterFloatingForceTypeNormal.cpp b/src/Game/MapObj/FloaterFloatingForceTypeNormal.cpp index 2a19fe092..cc22f5f0e 100644 --- a/src/Game/MapObj/FloaterFloatingForceTypeNormal.cpp +++ b/src/Game/MapObj/FloaterFloatingForceTypeNormal.cpp @@ -3,14 +3,15 @@ #include "Game/LiveActor/Spine.hpp" #include "Game/Util/MapPartsUtil.hpp" -FloaterFloatingForceTypeNormal::FloaterFloatingForceTypeNormal(LiveActor *pActor, const char *pName) : FloaterFloatingForce(pActor, pName) { +FloaterFloatingForceTypeNormal::FloaterFloatingForceTypeNormal(LiveActor* pActor, const char* pName) + : FloaterFloatingForce(pActor, pName) { mRotateAngle = 0.0f; mRotateSpeed = 0.0f; _40 = 0.0f; _44 = 0.0f; } -void FloaterFloatingForceTypeNormal::init(const JMapInfoIter &rIter) { +void FloaterFloatingForceTypeNormal::init(const JMapInfoIter& rIter) { FloaterFloatingForce::init(rIter); MR::getMapPartsArgRotateSpeed(&mRotateSpeed, rIter); MR::getMapPartsArgRotateAngle(&mRotateAngle, rIter); @@ -49,8 +50,7 @@ void FloaterFloatingForceTypeNormal::soundMoveSE() { void FloaterFloatingForceTypeNormal::setStateMove() { if (MR::isOnPlayer(MR::getBodySensor(mHost))) { MapPartsFunction::setNerve(&NrvFloaterFloatingForceTypeNormal::HostTypeMoveOnPlayer::sInstance); - } - else { + } else { MapPartsFunction::setNerve(&NrvFloaterFloatingForceTypeNormal::HostTypeMoveOffPlayer::sInstance); } } @@ -90,7 +90,6 @@ void FloaterFloatingForceTypeNormal::exeMove() { } FloaterFloatingForceTypeNormal::~FloaterFloatingForceTypeNormal() { - } namespace NrvFloaterFloatingForceTypeNormal { @@ -99,29 +98,29 @@ namespace NrvFloaterFloatingForceTypeNormal { INIT_NERVE(HostTypeMoveOffPlayer); INIT_NERVE(HostTypeMoveOnPlayer); - void HostTypeMoveOnPlayer::execute(Spine *pSpine) const { + void HostTypeMoveOnPlayer::execute(Spine* pSpine) const { FloaterFloatingForceTypeNormal* floater = reinterpret_cast(pSpine->mExecutor); floater->exeMove(); } - void HostTypeMoveOffPlayer::execute(Spine *pSpine) const { + void HostTypeMoveOffPlayer::execute(Spine* pSpine) const { FloaterFloatingForceTypeNormal* floater = reinterpret_cast(pSpine->mExecutor); floater->exeMove(); } - void HostTypeMoveFirst::execute(Spine *pSpine) const { + void HostTypeMoveFirst::execute(Spine* pSpine) const { FloaterFloatingForceTypeNormal* floater = reinterpret_cast(pSpine->mExecutor); floater->exeMoveFirst(); } - void HostTypeWait::execute(Spine *pSpine) const { + void HostTypeWait::execute(Spine* pSpine) const { FloaterFloatingForceTypeNormal* floater = reinterpret_cast(pSpine->mExecutor); - + if (floater->isFirstStep()) { floater->_40 = 0.0f; } } -}; +}; // namespace NrvFloaterFloatingForceTypeNormal const TVec3f& FloaterFloatingForceTypeNormal::getCurrentVelocity() const { return mVelocity; diff --git a/src/Game/MapObj/FloaterFunction.cpp b/src/Game/MapObj/FloaterFunction.cpp index 4a943b476..8d98b139e 100644 --- a/src/Game/MapObj/FloaterFunction.cpp +++ b/src/Game/MapObj/FloaterFunction.cpp @@ -1,7 +1,7 @@ #include "Game/MapObj/FloaterFunction.hpp" #include "Game/Util/StringUtil.hpp" -namespace { +namespace { struct SeName { /* 0x0 */ const char* mObjName; /* 0x4 */ const char* mSeGroundOn; @@ -10,98 +10,68 @@ namespace { }; static const SeName sSeNameTable[] = { - { - "LavaHomeFloaterA", - "SE_OJ_LAVA_FLOATER_ON", - "SE_OJ_LV_LAVA_FLOATER_DOWN", - "SE_OJ_LV_LAVA_FLOATER_UP" - }, - { - "LavaHomeFloaterB", - "SE_OJ_LAVA_FLOATER_ON_METAL", - "SE_OJ_LV_LAVA_FLOATER_DOWN", - "SE_OJ_LV_LAVA_FLOATER_UP" - }, - { - "LavaFloatingStepA", - "SE_OJ_LAVA_FLOATER_ON_METAL", - "SE_OJ_LV_LAVA_FLOATER_DOWN", - "SE_OJ_LV_LAVA_FLOATER_UP" - }, - { - "LavaFloatingStepB", - "SE_OJ_LAVA_FLOATER_ON_METAL", - "SE_OJ_LV_LAVA_FLOATER_DOWN", - "SE_OJ_LV_LAVA_FLOATER_UP" - }, - { - "LavaFloatingStepC", - "SE_OJ_LAVA_FLOATER_ON_METAL", - "SE_OJ_LV_LAVA_FLOATER_DOWN", - "SE_OJ_LV_LAVA_FLOATER_UP" - }, - { - "LavaFloatingStepD", - "SE_OJ_LAVA_FLOATER_ON_METAL", - "SE_OJ_LV_LAVA_FLOATER_DOWN", - "SE_OJ_LV_LAVA_FLOATER_UP" - }, - { - "IceVolcanoFloaterA", - "SE_OJ_LAVA_FLOATER_ON", - "SE_OJ_LV_LAVA_FLOATER_DOWN", - "SE_OJ_LV_LAVA_FLOATER_UP" - }, - { - "IceVolcanoFloaterB", - "SE_OJ_LAVA_FLOATER_ON", - "SE_OJ_LV_LAVA_FLOATER_DOWN", - "SE_OJ_LV_LAVA_FLOATER_UP" - }, - { - "FloaterOtakingFloaterA", - "SE_OJ_LAVA_FLOATER_ON_METAL", - "SE_OJ_LV_LAVA_FLOATER_DOWN", - "SE_OJ_LV_LAVA_FLOATER_UP" - }, - { - "OceanPierFloaterA", - nullptr, - nullptr, - nullptr - }, - { - "OceanHexagonFloater", - nullptr, - nullptr, - nullptr - }, - { - "PhantomShipBoxFloaterA", - nullptr, - nullptr, - nullptr - }, - { - "PhantomShipBoxFloaterB", - nullptr, - nullptr, - nullptr - }, - { - "PhantomShipBoxFloaterC", - nullptr, - nullptr, - nullptr - }, - { - "IceMountainFloaterA", - nullptr, - "SE_OJ_LV_ICE_M_FLOATER_DOWN", - "SE_OJ_LV_ICE_M_FLOATER_UP" - }, + {"LavaHomeFloaterA", + "SE_OJ_LAVA_FLOATER_ON", + "SE_OJ_LV_LAVA_FLOATER_DOWN", + "SE_OJ_LV_LAVA_FLOATER_UP"}, + {"LavaHomeFloaterB", + "SE_OJ_LAVA_FLOATER_ON_METAL", + "SE_OJ_LV_LAVA_FLOATER_DOWN", + "SE_OJ_LV_LAVA_FLOATER_UP"}, + {"LavaFloatingStepA", + "SE_OJ_LAVA_FLOATER_ON_METAL", + "SE_OJ_LV_LAVA_FLOATER_DOWN", + "SE_OJ_LV_LAVA_FLOATER_UP"}, + {"LavaFloatingStepB", + "SE_OJ_LAVA_FLOATER_ON_METAL", + "SE_OJ_LV_LAVA_FLOATER_DOWN", + "SE_OJ_LV_LAVA_FLOATER_UP"}, + {"LavaFloatingStepC", + "SE_OJ_LAVA_FLOATER_ON_METAL", + "SE_OJ_LV_LAVA_FLOATER_DOWN", + "SE_OJ_LV_LAVA_FLOATER_UP"}, + {"LavaFloatingStepD", + "SE_OJ_LAVA_FLOATER_ON_METAL", + "SE_OJ_LV_LAVA_FLOATER_DOWN", + "SE_OJ_LV_LAVA_FLOATER_UP"}, + {"IceVolcanoFloaterA", + "SE_OJ_LAVA_FLOATER_ON", + "SE_OJ_LV_LAVA_FLOATER_DOWN", + "SE_OJ_LV_LAVA_FLOATER_UP"}, + {"IceVolcanoFloaterB", + "SE_OJ_LAVA_FLOATER_ON", + "SE_OJ_LV_LAVA_FLOATER_DOWN", + "SE_OJ_LV_LAVA_FLOATER_UP"}, + {"FloaterOtakingFloaterA", + "SE_OJ_LAVA_FLOATER_ON_METAL", + "SE_OJ_LV_LAVA_FLOATER_DOWN", + "SE_OJ_LV_LAVA_FLOATER_UP"}, + {"OceanPierFloaterA", + nullptr, + nullptr, + nullptr}, + {"OceanHexagonFloater", + nullptr, + nullptr, + nullptr}, + {"PhantomShipBoxFloaterA", + nullptr, + nullptr, + nullptr}, + {"PhantomShipBoxFloaterB", + nullptr, + nullptr, + nullptr}, + {"PhantomShipBoxFloaterC", + nullptr, + nullptr, + nullptr}, + {"IceMountainFloaterA", + nullptr, + "SE_OJ_LV_ICE_M_FLOATER_DOWN", + "SE_OJ_LV_ICE_M_FLOATER_UP"}, }; -}; +}; // namespace namespace { const SeName* getSeNameTable(const char* pObjName) { @@ -115,7 +85,7 @@ namespace { return nullptr; } -}; +}; // namespace namespace FloaterFunction { const char* getSeGroundOn(const char* pObjName) { @@ -131,15 +101,10 @@ namespace FloaterFunction { } bool isExistImpactOnRide(const char* pObjName) { - return MR::isEqualString("LavaHomeFloaterA", pObjName) - || MR::isEqualString("LavaHomeFloaterB", pObjName) - || MR::isEqualString("LavaFloatingStepA", pObjName) - || MR::isEqualString("LavaFloatingStepB", pObjName) - || MR::isEqualString("LavaFloatingStepC", pObjName) - || MR::isEqualString("LavaFloatingStepD", pObjName); + return MR::isEqualString("LavaHomeFloaterA", pObjName) || MR::isEqualString("LavaHomeFloaterB", pObjName) || MR::isEqualString("LavaFloatingStepA", pObjName) || MR::isEqualString("LavaFloatingStepB", pObjName) || MR::isEqualString("LavaFloatingStepC", pObjName) || MR::isEqualString("LavaFloatingStepD", pObjName); } bool isExistSpeedUpLanding(const char* pObjName) { return MR::isEqualString("FloaterOtakingFloaterA", pObjName); } -}; +}; // namespace FloaterFunction diff --git a/src/Game/MapObj/Fountain.cpp b/src/Game/MapObj/Fountain.cpp index 99e74acca..4466ee9ed 100644 --- a/src/Game/MapObj/Fountain.cpp +++ b/src/Game/MapObj/Fountain.cpp @@ -1,6 +1,7 @@ #include "Game/MapObj/Fountain.hpp" -Fountain::Fountain(const char *pName) : LiveActor(pName) { +Fountain::Fountain(const char* pName) + : LiveActor(pName) { mFountainName = nullptr; _90.x = 0.0f; _90.y = 1.0f; @@ -8,22 +9,22 @@ Fountain::Fountain(const char *pName) : LiveActor(pName) { } #ifdef NON_MATCHING -void Fountain::init(const JMapInfoIter &rIter) { +void Fountain::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); TMtx34f mtx; mtx.identity(); TVec3f v30 = mRotation * 0.017453292f; - f32 v10 = v30.z; - f32 v11 = v30.y; - f32 v12 = v30.x; - f32 v13 = cos(v30.z); - f32 v14 = cos(v11); - f32 v15 = cos(v12); - f32 v16 = sin(v10); - f32 v17 = sin(v11); - f32 v18 = sin(v12); - f32 v19 = v18; - f32 v20 = (v18 * v14); + f32 v10 = v30.z; + f32 v11 = v30.y; + f32 v12 = v30.x; + f32 v13 = cos(v30.z); + f32 v14 = cos(v11); + f32 v15 = cos(v12); + f32 v16 = sin(v10); + f32 v17 = sin(v11); + f32 v18 = sin(v12); + f32 v19 = v18; + f32 v20 = (v18 * v14); mtx.mMtx[0][0] = v14 * v13; mtx.mMtx[2][1] = v18 * v14; mtx.mMtx[1][0] = v14 * v16; @@ -55,8 +56,7 @@ void Fountain::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchReadAppear(this, rIter)) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { appear(); } } @@ -67,8 +67,7 @@ void Fountain::appear() { if (MR::isValidSwitchA(this)) { setNerve(&NrvFountain::HostTypeWait::sInstance); - } - else { + } else { setNerve(&NrvFountain::HostTypeMove::sInstance); } } @@ -81,7 +80,6 @@ void Fountain::startClipped() { } } - void Fountain::endClipped() { LiveActor::endClipped(); @@ -112,10 +110,9 @@ void Fountain::exeMove() { } Fountain::~Fountain() { - } namespace NrvFountain { INIT_NERVE(HostTypeWait); INIT_NERVE(HostTypeMove); -}; +}; // namespace NrvFountain diff --git a/src/Game/MapObj/FountainBig.cpp b/src/Game/MapObj/FountainBig.cpp index 63e6601cb..592277c92 100644 --- a/src/Game/MapObj/FountainBig.cpp +++ b/src/Game/MapObj/FountainBig.cpp @@ -1,7 +1,8 @@ #include "Game/LiveActor/HitSensor.hpp" #include "Game/MapObj/FountainBig.hpp" -FountainBig::FountainBig(const char *pName) : LiveActor(pName) { +FountainBig::FountainBig(const char* pName) + : LiveActor(pName) { mClippingRadius.x = 0.0f; mClippingRadius.y = 0.0f; mClippingRadius.z = 0.0f; @@ -9,10 +10,9 @@ FountainBig::FountainBig(const char *pName) : LiveActor(pName) { } FountainBig::~FountainBig() { - } -void FountainBig::init(const JMapInfoIter &rIter) { +void FountainBig::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("FountainBig", nullptr, false); MR::connectToSceneMapObj(this); @@ -74,8 +74,7 @@ void FountainBig::exeSpout() { if (spoutTimer >= 60 && MR::isOnGroundPlayer()) { mSpoutTimer = -1; MR::validateHitSensors(this); - } - else { + } else { mSpoutTimer++; } } @@ -106,8 +105,8 @@ void FountainBig::exeSpoutEnd() { } } -void FountainBig::updateHitSensor(HitSensor *pSensor) { - f32 pSensorY = pSensor->mRadius; +void FountainBig::updateHitSensor(HitSensor* pSensor) { + f32 pSensorY = pSensor->mRadius; TVec3f vec1, vec2, vec3; MR::calcUpVec(&vec1, this); JMAVECScaleAdd(&vec1, &mPosition, &vec2, pSensorY); @@ -115,22 +114,20 @@ void FountainBig::updateHitSensor(HitSensor *pSensor) { MR::calcPerpendicFootToLineInside(&pSensor->mPosition, *MR::getPlayerPos(), vec2, vec3); } -void FountainBig::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void FountainBig::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver)) { if (MR::isPlayerElementModeBee()) { bool check = false; if (MR::isOnGroundPlayer()) { check = MR::sendMsgEnemyAttackFlipWeak(pReceiver, pSender); - } - else { + } else { check = MR::sendMsgEnemyAttackFlip(pReceiver, pSender); } if (check) { mSpoutTimer = 0; - MR::invalidateHitSensors(this); + MR::invalidateHitSensors(this); } - } - else { + } else { MR::tryRumblePadWeak(this, 0); MR::sendArbitraryMsg(ACTMES_FOUNTAINJUMP, pReceiver, pSender); } @@ -143,4 +140,4 @@ namespace NrvFountainBig { INIT_NERVE(FountainBigNrvSignStop); INIT_NERVE(FountainBigNrvSpout); INIT_NERVE(FountainBigNrvSpoutEnd); -}; +}; // namespace NrvFountainBig diff --git a/src/Game/MapObj/GCapture.cpp b/src/Game/MapObj/GCapture.cpp index dbf4d7f39..f6845315b 100644 --- a/src/Game/MapObj/GCapture.cpp +++ b/src/Game/MapObj/GCapture.cpp @@ -11,7 +11,7 @@ namespace NrvGCapture { NEW_NERVE(GCaptureNrvHold, GCapture, Hold); NEW_NERVE(GCaptureNrvBreak, GCapture, Break); NEW_NERVE(GCaptureNrvCoolDown, GCapture, CoolDown); -}; +}; // namespace NrvGCapture void GCapture::draw() const { mCaptureRibbon->draw(); @@ -19,7 +19,7 @@ void GCapture::draw() const { // GCapture::control -void GCapture::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void GCapture::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (_108) { if (!MR::isSensorAutoRush(pSender)) { if (MR::tryGetItem(pSender, pReceiver)) { @@ -29,18 +29,18 @@ void GCapture::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { } } -void GCapture::updateRibbon(const TVec3f &rVec, s32 a2) { +void GCapture::updateRibbon(const TVec3f& rVec, s32 a2) { TVec3f v13(mPosition); v13 -= rVec; TVec3f v12; MR::normalizeOrZero(v13, &v12); - f32 scalar = _128; + f32 scalar = _128; TVec3f v9(v12); v9.scale(scalar); TVec3f v10(v9); v10.scale(180.0f); v13 -= v10; - f32 rate = MR::calcNerveRate(this, a2); + f32 rate = MR::calcNerveRate(this, a2); TVec3f v8(v13); v8.scale(rate * rate); TVec3f v11(rVec); @@ -49,18 +49,17 @@ void GCapture::updateRibbon(const TVec3f &rVec, s32 a2) { updateRibbonPointEffectMatrix(v11); } -void GCapture::updateRibbonPointEffectMatrix(const TVec3f &rVec) { +void GCapture::updateRibbonPointEffectMatrix(const TVec3f& rVec) { TVec3f v5; - f32 z = _8C.mMtx[2][3]; - f32 y = _8C.mMtx[1][3]; - f32 x = _8C.mMtx[0][3]; + f32 z = _8C.mMtx[2][3]; + f32 y = _8C.mMtx[1][3]; + f32 x = _8C.mMtx[0][3]; v5.set(x, y, z); TVec3f v4(v5); v4 -= rVec; if (MR::isNearZero(v4, 0.001f)) { _8C.setTrans(rVec); - } - else { + } else { MR::makeMtxUpNoSupportPos(&_8C, v4, rVec); } } diff --git a/src/Game/MapObj/GeneralMapParts.cpp b/src/Game/MapObj/GeneralMapParts.cpp index 49c7ff9d0..38ab5f873 100644 --- a/src/Game/MapObj/GeneralMapParts.cpp +++ b/src/Game/MapObj/GeneralMapParts.cpp @@ -2,7 +2,8 @@ #include "Game/LiveActor/LiveActor.hpp" #include "Game/Util/BaseMatrixFollowTargetHolder.hpp" -GeneralMapParts::GeneralMapParts(const char *pName) : MapParts(pName) { +GeneralMapParts::GeneralMapParts(const char* pName) + : MapParts(pName) { mCameraInfo = nullptr; mMoveConditionType = 0; mSignMotionType = 0; @@ -18,7 +19,7 @@ GeneralMapParts::GeneralMapParts(const char *pName) : MapParts(pName) { _E5 = 0; } -void GeneralMapParts::init(const JMapInfoIter &rIter) { +void GeneralMapParts::init(const JMapInfoIter& rIter) { MapParts::init(rIter); MR::getMapPartsArgShadowType(&mShadowType, rIter); MR::initMapPartsShadow(this, rIter); @@ -30,7 +31,7 @@ void GeneralMapParts::init(const JMapInfoIter &rIter) { initSensorType(rIter); initGravity(rIter); MR::useStageSwitchWriteDead(this, rIter); - + if (MR::useStageSwitchReadB(this, rIter)) { void (GeneralMapParts::*switchOff)(void) = &GeneralMapParts::receiveMsgSwitchBOff; void (GeneralMapParts::*switchOn)(void) = &GeneralMapParts::receiveMsgSwitchBOn; @@ -40,8 +41,7 @@ void GeneralMapParts::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchReadAppear(this, rIter)) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { appear(); } @@ -69,18 +69,16 @@ void GeneralMapParts::appear() { if (MR::isValidSwitchB(this)) { setNerve(&NrvGeneralMapParts::HostTypeWait::sInstance); - } - else if (!MR::isMoveStartTypeUnconditional(mMoveConditionType)) { + } else if (!MR::isMoveStartTypeUnconditional(mMoveConditionType)) { setNerve(&NrvGeneralMapParts::HostTypeWaitForPlayerOn::sInstance); - } - else { + } else { startMove(); } } // GeneralMapParts::kill -bool GeneralMapParts::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool GeneralMapParts::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (mAppearController->receiveMsg(msg)) { return true; } @@ -152,8 +150,7 @@ void GeneralMapParts::calcAndSetBaseMtx() { if (!(v5 || v3 || v7)) { LiveActor::calcAndSetBaseMtx(); - } - else { + } else { TPos3f mtx; mtx.identity(); @@ -176,12 +173,12 @@ void GeneralMapParts::calcAndSetBaseMtx() { } } -void GeneralMapParts::initMapPartsFunction(const JMapInfoIter &rIter) { +void GeneralMapParts::initMapPartsFunction(const JMapInfoIter& rIter) { mAppearController = new MapPartsAppearController(this); mAppearController->init(rIter); mFunctionArray.push_back(mAppearController); f32 rotate_speed = 0.0f; - MR::getMapPartsArgRotateSpeed(&rotate_speed, rIter); + MR::getMapPartsArgRotateSpeed(&rotate_speed, rIter); bool hasRotateSpeed = 0.0f != rotate_speed; if (hasRotateSpeed) { @@ -205,26 +202,23 @@ void GeneralMapParts::initMapPartsFunction(const JMapInfoIter &rIter) { } } -void GeneralMapParts::initSensorType(const JMapInfoIter &rIter) { +void GeneralMapParts::initSensorType(const JMapInfoIter& rIter) { if (MR::isMapPartsPressOn(rIter)) { MR::setBodySensorTypePress(this); - } - else if (!isFixed()) { + } else if (!isFixed()) { MR::setBodySensorTypeMoveCollision(this); - } - else { + } else { MR::setBodySensorTypeMapObj(this); } } -void GeneralMapParts::initGravity(const JMapInfoIter &rIter) { +void GeneralMapParts::initGravity(const JMapInfoIter& rIter) { MR::addBaseMatrixFollowTarget(this, rIter, nullptr, nullptr); if (!MR::isMapPartsShadowTypeNone(mShadowType)) { if (isFixed()) { MR::calcGravity(this); - } - else { + } else { MR::onCalcGravity(this); } } @@ -273,8 +267,7 @@ bool GeneralMapParts::isFixed() const { void GeneralMapParts::startMove() { if (!MR::hasMapPartsMoveStartSignMotion(mSignMotionType)) { setNerve(&NrvGeneralMapParts::HostTypeMoveStart::sInstance); - } - else { + } else { if (mRailPosture) { mRailPosture->start(); } @@ -325,8 +318,7 @@ void GeneralMapParts::exeMoveStart() { } setNerve(&NrvGeneralMapParts::HostTypeWaitForPlayerOn::sInstance); - } - else { + } else { if (MR::isStep(this, MapParts::getMoveStartSignalTime())) { if (mRailMover) { mRailMover->start(); @@ -347,26 +339,26 @@ namespace NrvGeneralMapParts { INIT_NERVE(HostTypeMoveStart); INIT_NERVE(HostTypeMove); - void HostTypeMove::execute(Spine *pSpine) const { + void HostTypeMove::execute(Spine* pSpine) const { GeneralMapParts* part = reinterpret_cast(pSpine->mExecutor); part->exeWait(); } - void HostTypeMoveStart::execute(Spine *pSpine) const { + void HostTypeMoveStart::execute(Spine* pSpine) const { GeneralMapParts* part = reinterpret_cast(pSpine->mExecutor); part->exeMoveStart(); } - void HostTypeWaitForPlayerOn::execute(Spine *pSpine) const { + void HostTypeWaitForPlayerOn::execute(Spine* pSpine) const { GeneralMapParts* part = reinterpret_cast(pSpine->mExecutor); if (MR::isOnPlayer(MR::getBodySensor(part))) { part->broadcastMsgToAllFunctions(0xCA); - part->startMove(); + part->startMove(); } } - void HostTypeWait::execute(Spine *pSpine) const { + void HostTypeWait::execute(Spine* pSpine) const { GeneralMapParts* part = reinterpret_cast(pSpine->mExecutor); part->exeWait(); } -}; +}; // namespace NrvGeneralMapParts diff --git a/src/Game/MapObj/GreenCaterpillarBig.cpp b/src/Game/MapObj/GreenCaterpillarBig.cpp index c7200a0c4..c86ca6ae3 100644 --- a/src/Game/MapObj/GreenCaterpillarBig.cpp +++ b/src/Game/MapObj/GreenCaterpillarBig.cpp @@ -1,15 +1,15 @@ #include "Game/MapObj/GreenCaterpillarBig.hpp" -GreenCaterpillarBigBody::GreenCaterpillarBigBody(LiveActor *pCaterpillar, MtxPtr mtx) : - ModelObj("オオムイムイ体", "GreenCaterpillarBigBody", mtx, -2, -2, -2, false) { - mCaterpillar = pCaterpillar; - mFrontVec.x = 0.0f; - mFrontVec.y = 0.0f; - mFrontVec.z = 1.0f; - mPlanetLOD = nullptr; - } +GreenCaterpillarBigBody::GreenCaterpillarBigBody(LiveActor* pCaterpillar, MtxPtr mtx) + : ModelObj("オオムイムイ体", "GreenCaterpillarBigBody", mtx, -2, -2, -2, false) { + mCaterpillar = pCaterpillar; + mFrontVec.x = 0.0f; + mFrontVec.y = 0.0f; + mFrontVec.z = 1.0f; + mPlanetLOD = nullptr; +} -void GreenCaterpillarBigBody::init(const JMapInfoIter &rIter) { +void GreenCaterpillarBigBody::init(const JMapInfoIter& rIter) { MR::invalidateClipping(this); mPlanetLOD = MR::createLodCtrlPlanet(this, rIter, -1.0f, -1); mPlanetLOD->validate(); @@ -18,7 +18,7 @@ void GreenCaterpillarBigBody::init(const JMapInfoIter &rIter) { makeActorDead(); } -void GreenCaterpillarBigBody::setPosAndDirection(LiveActor *pActor) { +void GreenCaterpillarBigBody::setPosAndDirection(LiveActor* pActor) { TVec3f jointPos; MR::copyJointPos(mCaterpillar, "FollowPoint", &jointPos); mPosition.setPS(jointPos); @@ -36,14 +36,13 @@ void GreenCaterpillarBigBody::control() { void GreenCaterpillarBigBody::calcAndSetBaseMtx() { if (MR::isNearZero(mFrontVec, 0.001f)) { LiveActor::calcAndSetBaseMtx(); - } - else { + } else { MtxPtr jointMtx = MR::getJointMtx(mCaterpillar, "FollowPoint"); TVec3f pos; pos.set(jointMtx[0][1], jointMtx[1][1], jointMtx[2][1]); TPos3f frontUpPos; MR::makeMtxFrontUpPos(&frontUpPos, mFrontVec, pos, mPosition); - MR::setBaseTRMtx(this, frontUpPos); + MR::setBaseTRMtx(this, frontUpPos); } } @@ -65,7 +64,8 @@ void GreenCaterpillarBigBody::calcBodyDir(LiveActor *pActor, TVec3f *pOutDir) { } */ -GreenCaterpillarBig::GreenCaterpillarBig(const char *pName) : LiveActor(pName) { +GreenCaterpillarBig::GreenCaterpillarBig(const char* pName) + : LiveActor(pName) { mBodyArray = nullptr; mBodyArrayLength = 0; mCurBodyParts = 0; @@ -75,7 +75,7 @@ GreenCaterpillarBig::GreenCaterpillarBig(const char *pName) : LiveActor(pName) { mPlanetLOD = nullptr; } -void GreenCaterpillarBig::init(const JMapInfoIter &rIter) { +void GreenCaterpillarBig::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("GreenCaterpillarBigFace", nullptr, false); MR::connectToSceneMapObj(this); @@ -111,8 +111,7 @@ void GreenCaterpillarBig::exeWriggle() { if (MR::isRailReachedGoal(this)) { setNerve(&NrvGreenCaterpillarBig::GreenCaterpillarBigNrvEndAdjust::sInstance); - } - else { + } else { _9C = 0; _9D = 0; @@ -128,18 +127,16 @@ void GreenCaterpillarBig::exeWriggle() { MR::tryRumblePadStrong(this, 0); MR::shakeCameraNormal(); MR::startSound(this, "SE_OJ_GRN_CATERP_IN", -1, -1); - } - else if (point_arg == 1.0f) { + } else if (point_arg == 1.0f) { setNerve(&NrvGreenCaterpillarBig::GreenCaterpillarBigNrvRest::sInstance); - } - else if (point_arg == 2.0f) { + } else if (point_arg == 2.0f) { leaveApple(); } } } } -void GreenCaterpillarBig::initBodyParts(const JMapInfoIter &rIter) { +void GreenCaterpillarBig::initBodyParts(const JMapInfoIter& rIter) { s32 count = MR::getRailTotalLength(this) / 300.0f; mBodyArrayLength = count; mBodyArray = new GreenCaterpillarBigBody*[count]; @@ -217,11 +214,9 @@ void GreenCaterpillarBig::leaveApple() { } GreenCaterpillarBigBody::~GreenCaterpillarBigBody() { - } GreenCaterpillarBig::~GreenCaterpillarBig() { - } namespace NrvGreenCaterpillarBig { @@ -231,32 +226,32 @@ namespace NrvGreenCaterpillarBig { INIT_NERVE(GreenCaterpillarBigNrvEndAdjust); INIT_NERVE(GreenCaterpillarBigNrvEnd); - void GreenCaterpillarBigNrvEnd::execute(Spine *pSpine) const { + void GreenCaterpillarBigNrvEnd::execute(Spine* pSpine) const { GreenCaterpillarBig* caterpillar = reinterpret_cast(pSpine->mExecutor); if (MR::isFirstStep(caterpillar)) { MR::startBck(caterpillar, "Wait", nullptr); } } - void GreenCaterpillarBigNrvEndAdjust::execute(Spine *pSpine) const { + void GreenCaterpillarBigNrvEndAdjust::execute(Spine* pSpine) const { GreenCaterpillarBig* caterpillar = reinterpret_cast(pSpine->mExecutor); if (MR::isStep(caterpillar, 0x78)) { caterpillar->setNerve(&NrvGreenCaterpillarBig::GreenCaterpillarBigNrvEnd::sInstance); } } - void GreenCaterpillarBigNrvRest::execute(Spine *pSpine) const { + void GreenCaterpillarBigNrvRest::execute(Spine* pSpine) const { GreenCaterpillarBig* caterpillar = reinterpret_cast(pSpine->mExecutor); MR::startLevelSound(caterpillar, "SE_OJ_LV_GRN_CATERP_EAT", -1, -1, -1); } - void GreenCaterpillarBigNrvWriggle::execute(Spine *pSpine) const { + void GreenCaterpillarBigNrvWriggle::execute(Spine* pSpine) const { GreenCaterpillarBig* caterpillar = reinterpret_cast(pSpine->mExecutor); caterpillar->exeWriggle(); } - void GreenCaterpillarBigNrvHide::execute(Spine *pSpine) const { + void GreenCaterpillarBigNrvHide::execute(Spine* pSpine) const { GreenCaterpillarBig* caterpillar = reinterpret_cast(pSpine->mExecutor); MR::startLevelSound(caterpillar, "SE_OJ_LV_GRN_CATERP_EAT", -1, -1, -1); } -}; +}; // namespace NrvGreenCaterpillarBig diff --git a/src/Game/MapObj/HatchWaterPlanet.cpp b/src/Game/MapObj/HatchWaterPlanet.cpp index 32953a630..6b842e257 100644 --- a/src/Game/MapObj/HatchWaterPlanet.cpp +++ b/src/Game/MapObj/HatchWaterPlanet.cpp @@ -2,12 +2,13 @@ #include "Game/LiveActor/LodCtrl.hpp" #include "Game/LiveActor/ModelObj.hpp" -HatchWaterPlanet::HatchWaterPlanet(const char *pName) : LiveActor(pName) { +HatchWaterPlanet::HatchWaterPlanet(const char* pName) + : LiveActor(pName) { mPlanetLODCtrl = nullptr; mCollisionParts = nullptr; } -void HatchWaterPlanet::init(const JMapInfoIter &rIter) { +void HatchWaterPlanet::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("HatchWaterPlanet", nullptr, false); MR::connectToScenePlanet(this); @@ -60,7 +61,6 @@ void HatchWaterPlanet::exeWaitAfterOpen() { } HatchWaterPlanet::~HatchWaterPlanet() { - } namespace NrvHatchWaterPlanet { @@ -68,17 +68,16 @@ namespace NrvHatchWaterPlanet { INIT_NERVE(HatchWaterPlanetNrvOpen); INIT_NERVE(HatchWaterPlanetNrvWaitAfterOpen); - void HatchWaterPlanetNrvWaitAfterOpen::execute(Spine *pSpine) const { + void HatchWaterPlanetNrvWaitAfterOpen::execute(Spine* pSpine) const { HatchWaterPlanet* planet = reinterpret_cast(pSpine->mExecutor); planet->exeWaitAfterOpen(); } - void HatchWaterPlanetNrvOpen::execute(Spine *pSpine) const { + void HatchWaterPlanetNrvOpen::execute(Spine* pSpine) const { HatchWaterPlanet* planet = reinterpret_cast(pSpine->mExecutor); planet->exeOpen(); } - void HatchWaterPlanetNrvWait::execute(Spine *pSpine) const { - + void HatchWaterPlanetNrvWait::execute(Spine* pSpine) const { } -}; \ No newline at end of file +}; // namespace NrvHatchWaterPlanet \ No newline at end of file diff --git a/src/Game/MapObj/HeavensDoorDemoObj.cpp b/src/Game/MapObj/HeavensDoorDemoObj.cpp index fae65c939..f0e2d837e 100644 --- a/src/Game/MapObj/HeavensDoorDemoObj.cpp +++ b/src/Game/MapObj/HeavensDoorDemoObj.cpp @@ -3,15 +3,15 @@ #include "Game/MapObj/StageEffectDataTable.hpp" #include "Game/Util/Functor.hpp" -HeavensDoorDemoObj::HeavensDoorDemoObj(const char *pName) : MapObjActor(pName) { +HeavensDoorDemoObj::HeavensDoorDemoObj(const char* pName) + : MapObjActor(pName) { _C4 = false; } HeavensDoorDemoObj::~HeavensDoorDemoObj() { - } -void HeavensDoorDemoObj::init(const JMapInfoIter &rIter) { +void HeavensDoorDemoObj::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoSimpleMapObj(&info); @@ -20,8 +20,7 @@ void HeavensDoorDemoObj::init(const JMapInfoIter &rIter) { } if (MapObjActor::isObjectName("HeavensDoorAppearStepA")) { info.setupNerve(&NrvHeavensDoorDemoObj::HeavensDoorDemoObjNrvAppear::sInstance); - } - else { + } else { info.setupNerve(&NrvHeavensDoorDemoObj::HeavensDoorDemoObjNrvWait::sInstance); } MapObjActorUtil::setupInitInfoTypical(&info, mObjectName); @@ -35,7 +34,7 @@ void HeavensDoorDemoObj::init(const JMapInfoIter &rIter) { MR::tryRegisterDemoActionFunctor(this, MR::Functor_Inline(this, &HeavensDoorDemoObj::startInsideCageDemo), "消滅"); } } -} +} void HeavensDoorDemoObj::exeAppear() { if (MR::isFirstStep(this)) { @@ -88,11 +87,10 @@ void HeavensDoorDemoObj::control() { } } -void HeavensDoorDemoObj::connectToScene(const MapObjActorInitInfo &info) { +void HeavensDoorDemoObj::connectToScene(const MapObjActorInitInfo& info) { if (MapObjActor::isObjectName("HeavensDoorInsideCage")) { MR::connectToSceneIndirectMapObj(this); - } - else { + } else { MapObjActor::connectToScene(info); } } @@ -107,18 +105,18 @@ namespace NrvHeavensDoorDemoObj { INIT_NERVE(HeavensDoorDemoObjNrvWait); INIT_NERVE(HeavensDoorDemoObjNrvVanish); - void HeavensDoorDemoObjNrvAppear::execute(Spine *pSpine) const { + void HeavensDoorDemoObjNrvAppear::execute(Spine* pSpine) const { HeavensDoorDemoObj* door = reinterpret_cast(pSpine->mExecutor); door->exeAppear(); - } + } - void HeavensDoorDemoObjNrvWait::execute(Spine *pSpine) const { + void HeavensDoorDemoObjNrvWait::execute(Spine* pSpine) const { HeavensDoorDemoObj* door = reinterpret_cast(pSpine->mExecutor); door->exeWait(); - } + } - void HeavensDoorDemoObjNrvVanish::execute(Spine *pSpine) const { + void HeavensDoorDemoObjNrvVanish::execute(Spine* pSpine) const { HeavensDoorDemoObj* door = reinterpret_cast(pSpine->mExecutor); door->exeVanish(); - } -}; + } +}; // namespace NrvHeavensDoorDemoObj diff --git a/src/Game/MapObj/HipDropMoveObj.cpp b/src/Game/MapObj/HipDropMoveObj.cpp index 143af84b1..85c27b04c 100644 --- a/src/Game/MapObj/HipDropMoveObj.cpp +++ b/src/Game/MapObj/HipDropMoveObj.cpp @@ -4,14 +4,14 @@ #include "Game/Util.hpp" HipDropDemoMoveObj::~HipDropDemoMoveObj() { - } -HipDropMoveObj::HipDropMoveObj(const char *pName) : LiveActor(pName) { +HipDropMoveObj::HipDropMoveObj(const char* pName) + : LiveActor(pName) { mObjectName = 0; } -void HipDropMoveObj::init(const JMapInfoIter &rIter) { +void HipDropMoveObj::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::getObjectName(&mObjectName, rIter); initModelManagerWithAnm(mObjectName, 0, false); @@ -24,7 +24,7 @@ void HipDropMoveObj::init(const JMapInfoIter &rIter) { sensor.y = 0.0f; sensor.z = 0.0f; HitSensor* jointSensor = MR::addHitSensorAtJointMapObj(this, "body", cSwitchJointName, 0, 225.0f, sensor); - MtxPtr mtx = MR::getJointMtx(this, cMoveJointName); + MtxPtr mtx = MR::getJointMtx(this, cMoveJointName); MR::initCollisionParts(this, mObjectName, jointSensor, mtx); MR::setClippingTypeSphereContainsModelBoundingBox(this, 100.0f); MR::setGroupClipping(this, rIter, 8); @@ -34,12 +34,11 @@ void HipDropMoveObj::init(const JMapInfoIter &rIter) { makeActorAppeared(); } -bool HipDropMoveObj::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool HipDropMoveObj::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgPlayerHipDropFloor(msg)) { if (!isNerve(&NrvHipDropMoveObj::HostTypeWait::sInstance)) { return false; - } - else { + } else { f32 radius = pReceiver->mRadius; f32 dist = MR::calcDistanceToPlayer(pReceiver->mPosition); if (radius < dist) { @@ -73,7 +72,7 @@ void HipDropMoveObj::exeMove() { moveStart(); } - s32 steps = MR::StageEffect::getStopSeSteps(mObjectName); + s32 steps = MR::StageEffect::getStopSeSteps(mObjectName); const char* movingSe = MR::StageEffect::getMovingSe(mObjectName); if (movingSe) { @@ -81,8 +80,7 @@ void HipDropMoveObj::exeMove() { if (MR::isLessStep(this, steps)) { MR::startLevelSound(this, movingSe, -1, -1, -1); } - } - else { + } else { MR::startLevelSound(this, movingSe, -1, -1, -1); } } @@ -121,23 +119,23 @@ void HipDropMoveObj::exeMove() { moveEnd(); setNerve(&NrvHipDropMoveObj::HostTypeDone::sInstance); - } + } } -HipDropDemoMoveObj::HipDropDemoMoveObj(const char *pName) : HipDropMoveObj(pName) { +HipDropDemoMoveObj::HipDropDemoMoveObj(const char* pName) + : HipDropMoveObj(pName) { mMtx.identity(); } HipDropMoveObj::~HipDropMoveObj() { - } void HipDropDemoMoveObj::moveStart() { MR::startBckPlayer("Wait", (char*)nullptr); - MtxPtr mtx = MR::getPlayerDemoActor()->getBaseMtx(); + MtxPtr mtx = MR::getPlayerDemoActor()->getBaseMtx(); TMtx34f stack_38; stack_38.set(mtx); - MtxPtr jointMtx = MR::getJointMtx(this, cMoveJointName); + MtxPtr jointMtx = MR::getJointMtx(this, cMoveJointName); TMtx34f stack_8; stack_8.set(jointMtx); stack_8.invert(stack_8); @@ -146,15 +144,15 @@ void HipDropDemoMoveObj::moveStart() { void HipDropDemoMoveObj::moving() { if (MR::isDemoActive()) { - MtxPtr jointMtx = MR::getJointMtx(this, cMoveJointName); + MtxPtr jointMtx = MR::getJointMtx(this, cMoveJointName); TMtx34f stack_8; stack_8.set(jointMtx); stack_8.concat(stack_8, mMtx); - TVec3f vec; + TVec3f vec; LiveActor* demoActor = MR::getPlayerDemoActor(); - f32 z = stack_8.mMtx[2][3]; - f32 y = stack_8.mMtx[1][3]; - f32 x = stack_8.mMtx[0][3]; + f32 z = stack_8.mMtx[2][3]; + f32 y = stack_8.mMtx[1][3]; + f32 x = stack_8.mMtx[0][3]; demoActor->mPosition.set(x, y, z); MR::setPlayerBaseMtx((MtxPtr)&stack_8); } @@ -166,27 +164,22 @@ namespace NrvHipDropMoveObj { HostTypeDone HostTypeDone::sInstance; void HostTypeDone::execute(Spine* pSpine) const { - } - void HostTypeMove::execute(Spine *pSpine) const { + void HostTypeMove::execute(Spine* pSpine) const { HipDropMoveObj* obj = reinterpret_cast(pSpine->mExecutor); obj->exeMove(); } void HostTypeWait::execute(Spine* pSpine) const { - } -}; +}; // namespace NrvHipDropMoveObj void HipDropMoveObj::moveStart() { - } void HipDropMoveObj::moving() { - } void HipDropMoveObj::moveEnd() { - } diff --git a/src/Game/MapObj/HipDropRock.cpp b/src/Game/MapObj/HipDropRock.cpp index 635d00570..d886fe68a 100644 --- a/src/Game/MapObj/HipDropRock.cpp +++ b/src/Game/MapObj/HipDropRock.cpp @@ -8,8 +8,8 @@ #include "JSystem/JGeometry/TVec.hpp" #include "revolution/mtx.h" - -HipDropRock::HipDropRock(const char *pName) : LiveActor(pName) { +HipDropRock::HipDropRock(const char* pName) + : LiveActor(pName) { mModel = nullptr; _C0 = -1; _C4 = -1; @@ -17,7 +17,7 @@ HipDropRock::HipDropRock(const char *pName) : LiveActor(pName) { _90.identity(); } -void HipDropRock::init(const JMapInfoIter &rIter) { +void HipDropRock::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("HipDropRock", nullptr, false); initBreakModel(); @@ -30,7 +30,7 @@ void HipDropRock::init(const JMapInfoIter &rIter) { MR::useStageSwitchWriteDead(this, rIter); MR::useStageSwitchWriteB(this, rIter); HipDropRock::initItem(rIter); - MR::getJMapInfoArg7NoInit(rIter, &_C8); + MR::getJMapInfoArg7NoInit(rIter, &_C8); if (MR::tryRegisterDemoCast(this, rIter)) { MR::tryRegisterDemoCast(mModel, rIter); } @@ -38,7 +38,7 @@ void HipDropRock::init(const JMapInfoIter &rIter) { makeActorAppeared(); } -bool HipDropRock::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool HipDropRock::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (isNerve(&NrvHipDropRock::HipDropRockNrvBreak::sInstance)) { return false; } @@ -67,7 +67,7 @@ void HipDropRock::initBreakModel() { mModel->makeActorDead(); } -void HipDropRock::initItem(const JMapInfoIter &rIter) { +void HipDropRock::initItem(const JMapInfoIter& rIter) { MR::getJMapInfoArg0NoInit(rIter, &_C0); MR::getJMapInfoArg1NoInit(rIter, &_C4); if (_C0 == 1 && _C4 == -1) { @@ -75,21 +75,19 @@ void HipDropRock::initItem(const JMapInfoIter &rIter) { } if (!_C0) { MR::declareCoin(this, 1); - } - else if (_C0 == 1){ + } else if (_C0 == 1) { MR::declareStarPiece(this, _C4); } } void HipDropRock::appearItem() { if (_C0 != -1) { - if (!_C0) { + if (!_C0) { MR::appearCoinPop(this, mPosition, 1); - } - else if (_C0 == 1){ + } else if (_C0 == 1) { MR::appearStarPiece(this, mPosition, _C4, 10.0f, 40.0f, false); - MR::startSound(this, "SE_OJ_STAR_PIECE_BURST", -1, -1); - } + MR::startSound(this, "SE_OJ_STAR_PIECE_BURST", -1, -1); + } } } @@ -100,8 +98,7 @@ void HipDropRock::exeBreak() { MR::invalidateClipping(this); if (_C8) { MR::hideModel(this); - } - else { + } else { MR::startBva(this, "BreakLevel"); } mModel->makeActorAppeared(); @@ -111,7 +108,7 @@ void HipDropRock::exeBreak() { MR::onSwitchB(this); } HipDropRock::appearItem(); - } + } if (MR::isStep(this, 30) && MR::isValidSwitchDead(this)) { MR::onSwitchDead(this); } @@ -119,8 +116,7 @@ void HipDropRock::exeBreak() { mModel->kill(); if (_C8) { kill(); - } - else { + } else { setNerve(&NrvHipDropRock::HipDropRockNrvWreck::sInstance); } } @@ -131,18 +127,18 @@ namespace NrvHipDropRock { INIT_NERVE(HipDropRockNrvBreak); INIT_NERVE(HipDropRockNrvWreck); - void HipDropRockNrvWait::execute(Spine *pSpine) const { - HipDropRock *pActor = (HipDropRock*)pSpine->mExecutor; - pActor->ValClip1(); - } + void HipDropRockNrvWait::execute(Spine* pSpine) const { + HipDropRock* pActor = (HipDropRock*)pSpine->mExecutor; + pActor->ValClip1(); + } - void HipDropRockNrvBreak::execute(Spine *pSpine) const { - HipDropRock *pActor = (HipDropRock*)pSpine->mExecutor; - pActor->exeBreak(); - } + void HipDropRockNrvBreak::execute(Spine* pSpine) const { + HipDropRock* pActor = (HipDropRock*)pSpine->mExecutor; + pActor->exeBreak(); + } - void HipDropRockNrvWreck::execute(Spine *pSpine) const { - HipDropRock *pActor = (HipDropRock*)pSpine->mExecutor; - pActor->ValClip2(); - } -}; + void HipDropRockNrvWreck::execute(Spine* pSpine) const { + HipDropRock* pActor = (HipDropRock*)pSpine->mExecutor; + pActor->ValClip2(); + } +}; // namespace NrvHipDropRock diff --git a/src/Game/MapObj/HipDropSwitch.cpp b/src/Game/MapObj/HipDropSwitch.cpp index 7eac9f278..c1107f437 100644 --- a/src/Game/MapObj/HipDropSwitch.cpp +++ b/src/Game/MapObj/HipDropSwitch.cpp @@ -15,9 +15,10 @@ namespace NrvHipDropSwitch { NEW_NERVE(HipDropSwitchNrvOff, HipDropSwitch, Off); NEW_NERVE(HipDropSwitchNrvSwitchDown, HipDropSwitch, SwitchDown); NEW_NERVE(HipDropSwitchNrvOn, HipDropSwitch, On); -}; +}; // namespace NrvHipDropSwitch -HipDropSwitch::HipDropSwitch(const char *pName) : LiveActor(pName) { +HipDropSwitch::HipDropSwitch(const char* pName) + : LiveActor(pName) { _8C = 0; mConnector = nullptr; _98 = nullptr; @@ -30,7 +31,7 @@ HipDropSwitch::HipDropSwitch(const char *pName) : LiveActor(pName) { _9C.identity(); } -void HipDropSwitch::init(const JMapInfoIter &rIter) { +void HipDropSwitch::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("HipDropSwitch", nullptr, false); MR::connectToSceneMapObjDecorationStrongLight(this); @@ -52,8 +53,7 @@ void HipDropSwitch::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchReadAppear(this, rIter)) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { makeActorAppeared(); } } @@ -75,20 +75,19 @@ void HipDropSwitch::calcAndSetBaseMtx() { mConnector->connect(); } -bool HipDropSwitch::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool HipDropSwitch::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgStarPieceAttack(msg)) { _CE = 1; return true; - } - else if (MR::isMsgPlayerHipDropFloor(msg) && _98->mHitSensor == pReceiver && !_CC) { + } else if (MR::isMsgPlayerHipDropFloor(msg) && _98->mHitSensor == pReceiver && !_CC) { _CC = 1; return true; } - + return false; } -bool HipDropSwitch::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool HipDropSwitch::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgFloorTouch(msg) && _98->mHitSensor == pReceiver) { _CE = 1; return _CD == 0; @@ -166,5 +165,4 @@ void HipDropSwitch::exeOn() { } HipDropSwitch::~HipDropSwitch() { - } diff --git a/src/Game/MapObj/IceStep.cpp b/src/Game/MapObj/IceStep.cpp index 71a94fb6a..350b5d161 100644 --- a/src/Game/MapObj/IceStep.cpp +++ b/src/Game/MapObj/IceStep.cpp @@ -1,14 +1,13 @@ #include "Game/MapObj/IceStep.hpp" -IceStep::IceStep(const char *pName) : LiveActor(pName) { - +IceStep::IceStep(const char* pName) + : LiveActor(pName) { } IceStep::~IceStep() { - } -void IceStep::init(const JMapInfoIter &rIter) { +void IceStep::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("IceStep", nullptr, false); MR::connectToSceneMapObjStrongLight(this); @@ -35,20 +34,20 @@ void IceStep::exeWait() { } switch (mTimer) { - case 0x12C: - MR::startBpk(this, "TimeOutLong"); - break; - case 0x78: - MR::startBpk(this, "TimeOutShort"); - break; - case 1: - destroy(); - break; - case 0: - if (MR::isBckStopped(this)) { - kill(); - } - break; + case 0x12C: + MR::startBpk(this, "TimeOutLong"); + break; + case 0x78: + MR::startBpk(this, "TimeOutShort"); + break; + case 1: + destroy(); + break; + case 0: + if (MR::isBckStopped(this)) { + kill(); + } + break; } } @@ -99,11 +98,11 @@ void IceStep::doHit() { mTimer = 0; } -bool IceStep::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool IceStep::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return false; } -bool IceStep::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool IceStep::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isOnPlayer(this)) { return false; } @@ -112,15 +111,14 @@ bool IceStep::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pRec doHit(); return true; } - + return false; } void IceStep::control() { - } namespace NrvIceStep { INIT_NERVE(IceStepNrvWait); INIT_NERVE(IceStepNrvHit); -}; +}; // namespace NrvIceStep diff --git a/src/Game/MapObj/InvisiblePolygonObj.cpp b/src/Game/MapObj/InvisiblePolygonObj.cpp index 08ec23ec4..73b36146a 100644 --- a/src/Game/MapObj/InvisiblePolygonObj.cpp +++ b/src/Game/MapObj/InvisiblePolygonObj.cpp @@ -1,20 +1,20 @@ #include "Game/MapObj/InvisiblePolygonObj.hpp" #include -InvisiblePolygonObj::InvisiblePolygonObj(const char *pName) : LiveActor(pName) { +InvisiblePolygonObj::InvisiblePolygonObj(const char* pName) + : LiveActor(pName) { mMatrix.identity(); } -void InvisiblePolygonObj::init(const JMapInfoIter &rIter) { +void InvisiblePolygonObj::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initCollision(rIter); MR::connectToSceneMapObj(this); MR::setClippingTypeSphere(this, MR::getCollisionBoundingSphereRange(this)); if (MR::useStageSwitchReadAppear(this, rIter)) { - MR::syncStageSwitchAppear(this); + MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { makeActorAppeared(); } } @@ -22,19 +22,18 @@ void InvisiblePolygonObj::init(const JMapInfoIter &rIter) { void InvisiblePolygonObj::initBaseMtx() { if (0.0f == mRotation.x && 0.0f == mRotation.z) { MR::makeMtxTransRotateY(mMatrix.toMtxPtr(), this); - } - else { + } else { MR::makeMtxTR(mMatrix.toMtxPtr(), this); } } -void InvisiblePolygonObj::initCollision(const JMapInfoIter &rIter) { +void InvisiblePolygonObj::initCollision(const JMapInfoIter& rIter) { InvisiblePolygonObj::initBaseMtx(); const char* name = nullptr; - char pName[0x40]; + char pName[0x40]; MR::getObjectName(&name, rIter); - snprintf(pName, sizeof(pName), "%s.arc", name); - ResourceHolder *resource = MR::createAndAddResourceHolder(pName); + snprintf(pName, sizeof(pName), "%s.arc", name); + ResourceHolder* resource = MR::createAndAddResourceHolder(pName); initHitSensor(1); HitSensor* sensor = MR::addBodyMessageSensorMapObj(this); MR::initCollisionPartsFromResourceHolder(this, name, sensor, resource, nullptr); diff --git a/src/Game/MapObj/InvisiblePolygonObjGCapture.cpp b/src/Game/MapObj/InvisiblePolygonObjGCapture.cpp index 742efbfa8..631157d0b 100644 --- a/src/Game/MapObj/InvisiblePolygonObjGCapture.cpp +++ b/src/Game/MapObj/InvisiblePolygonObjGCapture.cpp @@ -1,9 +1,9 @@ #include "Game/MapObj/InvisiblePolygonObjGCapture.hpp" -InvisiblePolygonObjGCapture::InvisiblePolygonObjGCapture(const char *pName) : InvisiblePolygonObj(pName) { - +InvisiblePolygonObjGCapture::InvisiblePolygonObjGCapture(const char* pName) + : InvisiblePolygonObj(pName) { } -bool InvisiblePolygonObjGCapture::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool InvisiblePolygonObjGCapture::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return msg == ACTMES_IS_NO_BREAK_G_CAPTURE; } \ No newline at end of file diff --git a/src/Game/MapObj/ItemAppearStone.cpp b/src/Game/MapObj/ItemAppearStone.cpp index 7b126d6f6..8f69fe0ca 100644 --- a/src/Game/MapObj/ItemAppearStone.cpp +++ b/src/Game/MapObj/ItemAppearStone.cpp @@ -1,10 +1,10 @@ #include "Game/MapObj/ItemAppearStone.hpp" -ItemAppearStone::ItemAppearStone(const char *pName) : LiveActor(pName) { - +ItemAppearStone::ItemAppearStone(const char* pName) + : LiveActor(pName) { } -void ItemAppearStone::init(const JMapInfoIter &rIter) { +void ItemAppearStone::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); const char* model_name = 0; MR::getObjectName(&model_name, rIter); @@ -27,7 +27,6 @@ void ItemAppearStone::kill() { } void ItemAppearStone::calcAndSetBaseMtx() { - } void ItemAppearStone::exeWait() { @@ -40,14 +39,13 @@ void ItemAppearStone::exeWait() { } ItemAppearStone::~ItemAppearStone() { - } namespace NrvItemAppearStone { INIT_NERVE(HostTypeWait); - void HostTypeWait::execute(Spine *pSpine) const { + void HostTypeWait::execute(Spine* pSpine) const { ItemAppearStone* stone = reinterpret_cast(pSpine->mExecutor); stone->exeWait(); } -}; \ No newline at end of file +}; // namespace NrvItemAppearStone \ No newline at end of file diff --git a/src/Game/MapObj/ItemBlock.cpp b/src/Game/MapObj/ItemBlock.cpp index 3505cf417..783ff0e8c 100644 --- a/src/Game/MapObj/ItemBlock.cpp +++ b/src/Game/MapObj/ItemBlock.cpp @@ -3,145 +3,146 @@ #include "JSystem/JGeometry/TVec.hpp" namespace NrvItemBlock { - INIT_NERVE(ItemBlockNrvStandby); - INIT_NERVE(ItemBlockNrvWait); - INIT_NERVE(ItemBlockNrvAppearItem); - INIT_NERVE(ItemBlockNrvAppearItemSplash); + INIT_NERVE(ItemBlockNrvStandby); + INIT_NERVE(ItemBlockNrvWait); + INIT_NERVE(ItemBlockNrvAppearItem); + INIT_NERVE(ItemBlockNrvAppearItemSplash); - void ItemBlockNrvAppearItemSplash::execute(Spine *pSpine) const { - ItemBlock *block = reinterpret_cast(pSpine->mExecutor); - block->exeAppearItemSplash(); - } + void ItemBlockNrvAppearItemSplash::execute(Spine* pSpine) const { + ItemBlock* block = reinterpret_cast(pSpine->mExecutor); + block->exeAppearItemSplash(); + } - void ItemBlockNrvAppearItem::execute(Spine *pSpine) const { - ItemBlock *block = reinterpret_cast(pSpine->mExecutor); - block->exeAppearItem(); - } + void ItemBlockNrvAppearItem::execute(Spine* pSpine) const { + ItemBlock* block = reinterpret_cast(pSpine->mExecutor); + block->exeAppearItem(); + } - void ItemBlockNrvWait::execute(Spine *pSpine) const { - ItemBlock *block = reinterpret_cast(pSpine->mExecutor); - block->exeWait(); - } + void ItemBlockNrvWait::execute(Spine* pSpine) const { + ItemBlock* block = reinterpret_cast(pSpine->mExecutor); + block->exeWait(); + } - void ItemBlockNrvStandby::execute(Spine *pSpine) const { - ItemBlock *block = reinterpret_cast(pSpine->mExecutor); - if (MR::isFirstStep(block)) { - MR::startBck(block, "Wait", nullptr); - } - } -}; + void ItemBlockNrvStandby::execute(Spine* pSpine) const { + ItemBlock* block = reinterpret_cast(pSpine->mExecutor); + if (MR::isFirstStep(block)) { + MR::startBck(block, "Wait", nullptr); + } + } +}; // namespace NrvItemBlock namespace { - static Color8 hPointLight(0xFF, 0xE6, 0, 0xFF); + static Color8 hPointLight(0xFF, 0xE6, 0, 0xFF); }; -ItemBlock::ItemBlock(const char *pName) : LiveActor(pName) { - mKind = 0; - mTimer = 0; - mItemCount = 8; - _98 = 0; - mCalcShadowOneTime = false; +ItemBlock::ItemBlock(const char* pName) + : LiveActor(pName) { + mKind = 0; + mTimer = 0; + mItemCount = 8; + _98 = 0; + mCalcShadowOneTime = false; } -void ItemBlock::init(const JMapInfoIter &rIter) { - MR::initDefaultPos(this, rIter); - checkKind(rIter); - initBlock(); - MR::connectToSceneMapObjStrongLight(this); - MR::useStageSwitchSleep(this, rIter); - initEffectKeeper(1, "CoinBlock", false); - initSound(4, false); - initNerve(&NrvItemBlock::ItemBlockNrvStandby::sInstance); - s32 arg = -1; - MR::getJMapInfoArg4NoInit(rIter, &arg); - MR::initShadowVolumeBox(this, TVec3f(150.0f, 150.0f, 150.0f)); - MR::setShadowVolumeStartDropOffset(this, 0, 77.0f); +void ItemBlock::init(const JMapInfoIter& rIter) { + MR::initDefaultPos(this, rIter); + checkKind(rIter); + initBlock(); + MR::connectToSceneMapObjStrongLight(this); + MR::useStageSwitchSleep(this, rIter); + initEffectKeeper(1, "CoinBlock", false); + initSound(4, false); + initNerve(&NrvItemBlock::ItemBlockNrvStandby::sInstance); + s32 arg = -1; + MR::getJMapInfoArg4NoInit(rIter, &arg); + MR::initShadowVolumeBox(this, TVec3f(150.0f, 150.0f, 150.0f)); + MR::setShadowVolumeStartDropOffset(this, 0, 77.0f); - if (arg != -1) { - MR::setShadowDropLength(this, nullptr, arg); - } + if (arg != -1) { + MR::setShadowDropLength(this, nullptr, arg); + } - MR::onShadowVolumeCutDropLength(this, nullptr); - MR::excludeCalcShadowToMyCollision(this, nullptr); + MR::onShadowVolumeCutDropLength(this, nullptr); + MR::excludeCalcShadowToMyCollision(this, nullptr); - if (mCalcShadowOneTime) { - MR::onCalcShadowOneTime(this, nullptr); - } else { - MR::onCalcShadow(this, nullptr); - } + if (mCalcShadowOneTime) { + MR::onCalcShadowOneTime(this, nullptr); + } else { + MR::onCalcShadow(this, nullptr); + } - if (MR::isZeroGravity(this)) { - TVec3f upVec; - MR::calcUpVec(&upVec, this); - MR::setShadowDropDirection(this, 0, -upVec); - } else { - MR::calcGravity(this); - } + if (MR::isZeroGravity(this)) { + TVec3f upVec; + MR::calcUpVec(&upVec, this); + MR::setShadowDropDirection(this, 0, -upVec); + } else { + MR::calcGravity(this); + } - MR::offCalcGravity(this); - MR::setGroupClipping(this, rIter, 16); - MR::validateClipping(this); + MR::offCalcGravity(this); + MR::setGroupClipping(this, rIter, 16); + MR::validateClipping(this); - appear(); + appear(); } void ItemBlock::startClipped() { - LiveActor::startClipped(); - MR::forceDeleteEffect(this, "Glow"); + LiveActor::startClipped(); + MR::forceDeleteEffect(this, "Glow"); } void ItemBlock::endClipped() { - LiveActor::endClipped(); - MR::emitEffect(this, "Glow"); + LiveActor::endClipped(); + MR::emitEffect(this, "Glow"); } -void ItemBlock::checkKind(const JMapInfoIter &rIter) { - const char *name = nullptr; - MR::getObjectName(&name, rIter); +void ItemBlock::checkKind(const JMapInfoIter& rIter) { + const char* name = nullptr; + MR::getObjectName(&name, rIter); - if (MR::isEqualString(name, "ItemBlockSwitch")) { - MR::needStageSwitchWriteDead(this, rIter); - mKind = 5; - } else if (MR::isEqualString(name, "TimerCoinBlock")) { - mKind = 1; - MR::declareCoin(this, 10); - } else if (MR::isEqualString(name, "SplashCoinBlock")) { - mKind = 2; - MR::declareCoin(this, mItemCount); - } else if (MR::isEqualString(name, "TimerPieceBlock")) { - mKind = 3; - MR::declareStarPiece(this, 20); - } else if (MR::isEqualString(name, "SplashPieceBlock")) { - mKind = 4; - MR::declareStarPiece(this, mItemCount); - } + if (MR::isEqualString(name, "ItemBlockSwitch")) { + MR::needStageSwitchWriteDead(this, rIter); + mKind = 5; + } else if (MR::isEqualString(name, "TimerCoinBlock")) { + mKind = 1; + MR::declareCoin(this, 10); + } else if (MR::isEqualString(name, "SplashCoinBlock")) { + mKind = 2; + MR::declareCoin(this, mItemCount); + } else if (MR::isEqualString(name, "TimerPieceBlock")) { + mKind = 3; + MR::declareStarPiece(this, 20); + } else if (MR::isEqualString(name, "SplashPieceBlock")) { + mKind = 4; + MR::declareStarPiece(this, mItemCount); + } - s32 arg = -1; + s32 arg = -1; - if (mKind == 2 || mKind == 4) { - arg = -1; - MR::getJMapInfoArg0NoInit(rIter, &arg); + if (mKind == 2 || mKind == 4) { + arg = -1; + MR::getJMapInfoArg0NoInit(rIter, &arg); - if (arg >= 0) { - mItemCount = arg; - } else { - mItemCount = 8; - } - } + if (arg >= 0) { + mItemCount = arg; + } else { + mItemCount = 8; + } + } - if (mKind == 1 || mKind == 3) { - MR::getJMapInfoArg1NoInit(rIter, &arg); + if (mKind == 1 || mKind == 3) { + MR::getJMapInfoArg1NoInit(rIter, &arg); - if (arg == -1) { - mTimer = 240; - } else { - mTimer = arg; - } - } + if (arg == -1) { + mTimer = 240; + } else { + mTimer = arg; + } + } - arg = -1; - MR::getJMapInfoArg2NoInit(rIter, &arg); - mCalcShadowOneTime = !(arg - 1); + arg = -1; + MR::getJMapInfoArg2NoInit(rIter, &arg); + mCalcShadowOneTime = !(arg - 1); } /*void ItemBlock::initBlock() { @@ -158,20 +159,20 @@ void ItemBlock::checkKind(const JMapInfoIter &rIter) { }*/ void ItemBlock::appear() { - LiveActor::appear(); - initNerve(&NrvItemBlock::ItemBlockNrvStandby::sInstance); + LiveActor::appear(); + initNerve(&NrvItemBlock::ItemBlockNrvStandby::sInstance); - if (mKind >= 6 || mKind < 1) { - return; - } + if (mKind >= 6 || mKind < 1) { + return; + } - MR::startBrk(this, "CoinBlock"); + MR::startBrk(this, "CoinBlock"); } void ItemBlock::kill() { - MR::startSound(this, "SE_EM_EXPLODE_S", -1, -1); - MR::emitEffect(this, "Break"); - LiveActor::kill(); + MR::startSound(this, "SE_EM_EXPLODE_S", -1, -1); + MR::emitEffect(this, "Break"); + LiveActor::kill(); } /*void ItemBlock::control() { @@ -180,63 +181,60 @@ void ItemBlock::kill() { MR::requestPointLight(this, TVec3f(upVec * 100.0f), hPointLight, 0.998646f, -1); }*/ -bool ItemBlock::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - if (MR::isMsgPlayerUpperPunch(msg) - && MR::isPlayerExistDown(this, 0.0f, 0.25f) - && tryStartJumpPunch()) - { - MR::sendArbitraryMsg(ACTMES_REFLECT_V, pSender, pReceiver); - return true; - } +bool ItemBlock::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + if (MR::isMsgPlayerUpperPunch(msg) && MR::isPlayerExistDown(this, 0.0f, 0.25f) && tryStartJumpPunch()) { + MR::sendArbitraryMsg(ACTMES_REFLECT_V, pSender, pReceiver); + return true; + } - return false; + return false; } bool ItemBlock::tryStartJumpPunch() { - if (isNerve(&NrvItemBlock::ItemBlockNrvStandby::sInstance)) { - if (mKind == 1 || mKind == 3) { - MR::startBck(this, "Appear", nullptr); - calcAnim(); - mNoCalcAnim = true; - setNerve(&NrvItemBlock::ItemBlockNrvAppearItem::sInstance); - } else if (mKind == 2 || (u32)(mKind - 4) <= 1) { - setNerve(&NrvItemBlock::ItemBlockNrvAppearItemSplash::sInstance); - } + if (isNerve(&NrvItemBlock::ItemBlockNrvStandby::sInstance)) { + if (mKind == 1 || mKind == 3) { + MR::startBck(this, "Appear", nullptr); + calcAnim(); + mNoCalcAnim = true; + setNerve(&NrvItemBlock::ItemBlockNrvAppearItem::sInstance); + } else if (mKind == 2 || (u32)(mKind - 4) <= 1) { + setNerve(&NrvItemBlock::ItemBlockNrvAppearItemSplash::sInstance); + } - return true; - } + return true; + } - if (isNerve(&NrvItemBlock::ItemBlockNrvWait::sInstance)) { - if (mKind == 1 || mKind == 3) { - if (mKind == 1) { - if (MR::getDeclareRemnantCoinCount(this) == 1) { - mTimer = 0; - } - } else { - if (!(MR::getDeclareRemnantStarPieceCountNotExist(this) - 11)) { - mTimer = 0; - } - } + if (isNerve(&NrvItemBlock::ItemBlockNrvWait::sInstance)) { + if (mKind == 1 || mKind == 3) { + if (mKind == 1) { + if (MR::getDeclareRemnantCoinCount(this) == 1) { + mTimer = 0; + } + } else { + if (!(MR::getDeclareRemnantStarPieceCountNotExist(this) - 11)) { + mTimer = 0; + } + } - MR::startBck(this, "Appear", nullptr); - calcAnim(); - mNoCalcAnim = true; - setNerve(&NrvItemBlock::ItemBlockNrvAppearItem::sInstance); + MR::startBck(this, "Appear", nullptr); + calcAnim(); + mNoCalcAnim = true; + setNerve(&NrvItemBlock::ItemBlockNrvAppearItem::sInstance); - return true; - } - } + return true; + } + } - return false; + return false; } void ItemBlock::exeWait() { - if (MR::isFirstStep(this)) { - MR::startBck(this, "Wait", nullptr); - MR::invalidateClipping(this); - } + if (MR::isFirstStep(this)) { + MR::startBck(this, "Wait", nullptr); + MR::invalidateClipping(this); + } - decTimer(); + decTimer(); } /*void ItemBlock::exeAppearItem() { @@ -290,47 +288,46 @@ void ItemBlock::exeWait() { }*/ void ItemBlock::exeAppearItemSplash() { - if (MR::isFirstStep(this)) { - MR::forceDeleteEffect(this, "Glow"); - MR::startBck(this, "Bomb", nullptr); - } + if (MR::isFirstStep(this)) { + MR::forceDeleteEffect(this, "Glow"); + MR::startBck(this, "Bomb", nullptr); + } - if (!MR::isBckStopped(this)) { - return; - } + if (!MR::isBckStopped(this)) { + return; + } - if (mKind == 2) { - if (mItemCount == 1) { - MR::appearCoinPop(this, mPosition, 1); - } else { - MR::appearCoinCircle(this, mPosition, mItemCount); - } - } else if (mKind == 4) { - MR::appearStarPiece(this, mPosition, mItemCount, 10.0f, 40.0f, false); - MR::startSound(this, "SE_OJ_STAR_PIECE_BURST", -1, -1); - } else if (mKind == 5) { - MR::onSwitchDead(this); - } + if (mKind == 2) { + if (mItemCount == 1) { + MR::appearCoinPop(this, mPosition, 1); + } else { + MR::appearCoinCircle(this, mPosition, mItemCount); + } + } else if (mKind == 4) { + MR::appearStarPiece(this, mPosition, mItemCount, 10.0f, 40.0f, false); + MR::startSound(this, "SE_OJ_STAR_PIECE_BURST", -1, -1); + } else if (mKind == 5) { + MR::onSwitchDead(this); + } - mTimer = 0; - kill(); + mTimer = 0; + kill(); } void ItemBlock::decTimer() { - --mTimer; - if (mTimer > 0) { - return; - } - mTimer = 0; + --mTimer; + if (mTimer > 0) { + return; + } + mTimer = 0; } void ItemBlock::calcAnim() { - if (!mNoCalcAnim) { - LiveActor::calcAnim(); - } - mNoCalcAnim = false; + if (!mNoCalcAnim) { + LiveActor::calcAnim(); + } + mNoCalcAnim = false; } ItemBlock::~ItemBlock() { - } diff --git a/src/Game/MapObj/KeySwitch.cpp b/src/Game/MapObj/KeySwitch.cpp index cf92ba6a3..dfe492829 100644 --- a/src/Game/MapObj/KeySwitch.cpp +++ b/src/Game/MapObj/KeySwitch.cpp @@ -2,15 +2,15 @@ #include "JSystem/JMath/JMath.hpp" KeySwitch::~KeySwitch() { - } -KeySwitch::KeySwitch(const char *pName) : LiveActor(pName) { +KeySwitch::KeySwitch(const char* pName) + : LiveActor(pName) { mCameraInfo = 0; mCurDemoFrame = -1; } -void KeySwitch::init(const JMapInfoIter &rIter) { +void KeySwitch::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("KeySwitch", 0, false); MR::connectToSceneMapObjDecoration(this); @@ -43,27 +43,25 @@ void KeySwitch::init(const JMapInfoIter &rIter) { if (usesSwitch || !MR::isValidInfo(rIter)) { initNerve(&NrvKeySwitch::KeySwitchNrvDemoStart::sInstance); - - } - else { + + } else { initNerve(&NrvKeySwitch::KeySwitchNrvWait::sInstance); } if (usesSwitch || !MR::isValidInfo(rIter)) { makeActorDead(); - } - else { + } else { makeActorAppeared(); } } -void KeySwitch::initKeySwitchByOwner(const JMapInfoIter &rIter) { +void KeySwitch::initKeySwitchByOwner(const JMapInfoIter& rIter) { initWithoutIter(); MR::needStageSwitchWriteA(this, rIter); MR::initActorCamera(this, rIter, &mCameraInfo); } -void KeySwitch::appearKeySwitch(const TVec3f &rVec) { +void KeySwitch::appearKeySwitch(const TVec3f& rVec) { MR::resetPosition(this, rVec); MR::onCalcGravity(this); MR::invalidateClipping(this); @@ -161,18 +159,17 @@ void KeySwitch::control() { MR::endDemo(this, cDemoName); mCameraInfo = 0; mCurDemoFrame = -1; - } - else { + } else { mCurDemoFrame = mCurDemoFrame + 1; } } } -bool KeySwitch::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool KeySwitch::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return MR::isMsgStarPieceReflect(msg); } -bool KeySwitch::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool KeySwitch::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgStarPieceReflect(msg)) { return true; } @@ -233,18 +230,18 @@ namespace NrvKeySwitch { INIT_NERVE(KeySwitchNrvAppear); INIT_NERVE(KeySwitchNrvWait); - void KeySwitchNrvWait::execute(Spine *pSpine) const { + void KeySwitchNrvWait::execute(Spine* pSpine) const { KeySwitch* key = reinterpret_cast(pSpine->mExecutor); key->exeWait(); } - void KeySwitchNrvAppear::execute(Spine *pSpine) const { + void KeySwitchNrvAppear::execute(Spine* pSpine) const { KeySwitch* key = reinterpret_cast(pSpine->mExecutor); key->exeAppear(); } - void KeySwitchNrvDemoStart::execute(Spine *pSpine) const { + void KeySwitchNrvDemoStart::execute(Spine* pSpine) const { KeySwitch* key = reinterpret_cast(pSpine->mExecutor); key->exeDemoStart(); } -}; +}; // namespace NrvKeySwitch diff --git a/src/Game/MapObj/KillerGunnerSingle.cpp b/src/Game/MapObj/KillerGunnerSingle.cpp index fcfc71a96..c8f8a1ff5 100644 --- a/src/Game/MapObj/KillerGunnerSingle.cpp +++ b/src/Game/MapObj/KillerGunnerSingle.cpp @@ -1,11 +1,11 @@ #include "Game/LiveActor/HitSensor.hpp" #include "Game/MapObj/KillerGunnerSingle.hpp" -KillerGunnerSingle::KillerGunnerSingle(const char *pName) : LiveActor(pName) { - +KillerGunnerSingle::KillerGunnerSingle(const char* pName) + : LiveActor(pName) { } -void KillerGunnerSingle::init(const JMapInfoIter &rIter) { +void KillerGunnerSingle::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("KillerGunnerSingle", nullptr, false); MR::connectToSceneEnvironment(this); @@ -26,7 +26,7 @@ void KillerGunnerSingle::init(const JMapInfoIter &rIter) { makeActorAppeared(); } -void KillerGunnerSingle::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void KillerGunnerSingle::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (isNerve(&NrvKillerGunnerSingle::HostTypeShoot::sInstance)) { if (MR::isSensorPlayer(pReceiver)) { if (MR::isNear(pSender, pReceiver, pSender->mRadius)) { @@ -88,7 +88,6 @@ inline void KillerGunnerSingle::exeAttack() { } KillerGunnerSingle::~KillerGunnerSingle() { - } namespace NrvKillerGunnerSingle { @@ -96,4 +95,4 @@ namespace NrvKillerGunnerSingle { INIT_NERVE(HostTypeShoot); INIT_NERVE(HostTypeCharge); INIT_NERVE(HostTypeWait); -}; \ No newline at end of file +}; // namespace NrvKillerGunnerSingle \ No newline at end of file diff --git a/src/Game/MapObj/LargeChain.cpp b/src/Game/MapObj/LargeChain.cpp index ce1bea9ee..a68f3bbea 100644 --- a/src/Game/MapObj/LargeChain.cpp +++ b/src/Game/MapObj/LargeChain.cpp @@ -4,14 +4,15 @@ namespace { static f32 sPartsLength = 200.0f; }; -LargeChain::LargeChain(const char *pName) : LiveActor(pName) { +LargeChain::LargeChain(const char* pName) + : LiveActor(pName) { _8C = nullptr; _90 = nullptr; mChainArray = nullptr; mChainCount = 1; } -void LargeChain::init(const JMapInfoIter &rIter) { +void LargeChain::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); s32 chainLen; MR::getJMapInfoArg0NoInit(rIter, &chainLen); @@ -56,12 +57,11 @@ void LargeChain::exeBreak() { if (!(getNerveStep() % 5)) { s32 step = getNerveStep() / 5; - + if (step == 0) { - _8C->breakChainParts(); - } - else { - if (step == mChainCount - 1) { + _8C->breakChainParts(); + } else { + if (step == mChainCount - 1) { _90->breakChainParts(); } } @@ -74,7 +74,6 @@ void LargeChain::exeBreak() { } LargeChainParts::~LargeChainParts() { - } void LargeChain::invalidateClippingAllChainParts() { @@ -84,10 +83,9 @@ void LargeChain::invalidateClippingAllChainParts() { } LargeChain::~LargeChain() { - } namespace NrvLargeChain { INIT_NERVE(LargeChainNrvWait); INIT_NERVE(LargeChainNrvBreak); -}; \ No newline at end of file +}; // namespace NrvLargeChain \ No newline at end of file diff --git a/src/Game/MapObj/LargeChainParts.cpp b/src/Game/MapObj/LargeChainParts.cpp index 827195e86..d71600a4a 100644 --- a/src/Game/MapObj/LargeChainParts.cpp +++ b/src/Game/MapObj/LargeChainParts.cpp @@ -1,22 +1,21 @@ #include "Game/MapObj/LargeChainParts.hpp" -LargeChainParts::LargeChainParts(const char *pName) : LiveActor(pName) { - +LargeChainParts::LargeChainParts(const char* pName) + : LiveActor(pName) { } void LargeChainParts::breakChainParts() { kill(); } -void LargeChainParts::initChainParts(TVec3f *pPos, TVec3f *pRot, TVec3f *pScale, bool isFixedPoint) { +void LargeChainParts::initChainParts(TVec3f* pPos, TVec3f* pRot, TVec3f* pScale, bool isFixedPoint) { mPosition.set(*pPos); mRotation.set(*pRot); mScale.set(*pScale); if (isFixedPoint) { initModelManagerWithAnm("LargeChainFixPoint", nullptr, false); - } - else { + } else { initModelManagerWithAnm("LargeChain", nullptr, false); } @@ -25,8 +24,7 @@ void LargeChainParts::initChainParts(TVec3f *pPos, TVec3f *pRot, TVec3f *pScale, MR::addBodyMessageSensorMapObj(this); if (isFixedPoint) { MR::initCollisionParts(this, "LargeChainFixPoint", getSensor("body"), nullptr); - } - else { + } else { MR::initCollisionParts(this, "LargeChain", getSensor("body"), nullptr); } diff --git a/src/Game/MapObj/LavaBallRisingPlanetLava.cpp b/src/Game/MapObj/LavaBallRisingPlanetLava.cpp index 5e1857232..29bc6e329 100644 --- a/src/Game/MapObj/LavaBallRisingPlanetLava.cpp +++ b/src/Game/MapObj/LavaBallRisingPlanetLava.cpp @@ -1,10 +1,10 @@ #include "Game/MapObj/LavaBallRisingPlanetLava.hpp" -LavaBallRisingPlanetLava::LavaBallRisingPlanetLava(const char *pName) : MapObjActor(pName) { - +LavaBallRisingPlanetLava::LavaBallRisingPlanetLava(const char* pName) + : MapObjActor(pName) { } -void LavaBallRisingPlanetLava::init(const JMapInfoIter &rIter) { +void LavaBallRisingPlanetLava::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; info.setupHioNode("地形オブジェ"); @@ -22,8 +22,7 @@ void LavaBallRisingPlanetLava::exeWait() { if (!MR::isLessStep(this, 120)) { if (isNerve(&NrvLavaBallRisingPlanetLava::LavaBallRisingPlanetLavaNrvWaitSmall::sInstance)) { setNerve(&NrvLavaBallRisingPlanetLava::LavaBallRisingPlanetLavaNrvScaleUp::sInstance); - } - else { + } else { setNerve(&NrvLavaBallRisingPlanetLava::LavaBallRisingPlanetLavaNrvScaleDown::sInstance); } } @@ -50,7 +49,6 @@ void LavaBallRisingPlanetLava::exeScaleDown() { } LavaBallRisingPlanetLava::~LavaBallRisingPlanetLava() { - } namespace NrvLavaBallRisingPlanetLava { @@ -58,4 +56,4 @@ namespace NrvLavaBallRisingPlanetLava { INIT_NERVE(LavaBallRisingPlanetLavaNrvWaitBig); INIT_NERVE(LavaBallRisingPlanetLavaNrvScaleUp); INIT_NERVE(LavaBallRisingPlanetLavaNrvScaleDown); -}; \ No newline at end of file +}; // namespace NrvLavaBallRisingPlanetLava \ No newline at end of file diff --git a/src/Game/MapObj/LavaGalaxyParts.cpp b/src/Game/MapObj/LavaGalaxyParts.cpp index ac5073a95..b5259c4c1 100644 --- a/src/Game/MapObj/LavaGalaxyParts.cpp +++ b/src/Game/MapObj/LavaGalaxyParts.cpp @@ -1,10 +1,10 @@ #include "Game/MapObj/LavaGalaxyParts.hpp" LavaGalaxyParts::~LavaGalaxyParts() { - } -LavaGalaxyParts::LavaGalaxyParts(const char *pName) : LiveActor(pName) { +LavaGalaxyParts::LavaGalaxyParts(const char* pName) + : LiveActor(pName) { mLodCtrl = nullptr; mMtxSetter = nullptr; } @@ -13,7 +13,7 @@ void LavaGalaxyParts::initAfterPlacement() { if (mMtxSetter != nullptr) { TVec3f upper; MR::calcMapGroundUpper(&upper, this); - f32 dist = PSVECDistance(&mPosition, &upper); + f32 dist = PSVECDistance(&mPosition, &upper); TVec3f neg = mPosition - upper; if (neg.dot(mGravity) < 0.0f) { dist *= -1.0f; @@ -23,7 +23,7 @@ void LavaGalaxyParts::initAfterPlacement() { localOffs.z = 0.0f; localOffs.x = 0.0f; localOffs.y = dist; - + TVec3f bruh; bruh.x = localOffs.x; bruh.y = localOffs.y; diff --git a/src/Game/MapObj/LavaHomeVolcanoFlow.cpp b/src/Game/MapObj/LavaHomeVolcanoFlow.cpp index 616f29a90..43503e9b6 100644 --- a/src/Game/MapObj/LavaHomeVolcanoFlow.cpp +++ b/src/Game/MapObj/LavaHomeVolcanoFlow.cpp @@ -13,9 +13,10 @@ namespace NrvLavaHomeVolcanoFlow { NEW_NERVE(HostTypeWait, LavaHomeVolcanoFlow, Wait); NEW_NERVE(HostTypeMove, LavaHomeVolcanoFlow, Move); NEW_NERVE(HostTypeDone, LavaHomeVolcanoFlow, Wait); -}; +}; // namespace NrvLavaHomeVolcanoFlow -LavaHomeVolcanoFlow::LavaHomeVolcanoFlow(const char* pName) : LiveActor(pName) { } +LavaHomeVolcanoFlow::LavaHomeVolcanoFlow(const char* pName) + : LiveActor(pName) {} void LavaHomeVolcanoFlow::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); @@ -32,18 +33,16 @@ void LavaHomeVolcanoFlow::init(const JMapInfoIter& rIter) { void LavaHomeVolcanoFlow::startClipped() { LiveActor::startClipped(); - if (isNerve(&NrvLavaHomeVolcanoFlow::HostTypeMove::sInstance) - || isNerve(&NrvLavaHomeVolcanoFlow::HostTypeDone::sInstance)) { + if (isNerve(&NrvLavaHomeVolcanoFlow::HostTypeMove::sInstance) || isNerve(&NrvLavaHomeVolcanoFlow::HostTypeDone::sInstance)) { MR::deleteEffect(this, "Loop"); } } void LavaHomeVolcanoFlow::endClipped() { LiveActor::endClipped(); - if (isNerve(&NrvLavaHomeVolcanoFlow::HostTypeMove::sInstance) - || isNerve(&NrvLavaHomeVolcanoFlow::HostTypeDone::sInstance)) { + if (isNerve(&NrvLavaHomeVolcanoFlow::HostTypeMove::sInstance) || isNerve(&NrvLavaHomeVolcanoFlow::HostTypeDone::sInstance)) { MR::emitEffect(this, "Loop"); - } + } } void LavaHomeVolcanoFlow::exeWait() { @@ -60,7 +59,7 @@ void LavaHomeVolcanoFlow::exeMove() { if (MR::isFirstStep(this)) { MR::startBck(this, "LavaHomeVolcanoFlow", nullptr); } - MR::startLevelSound(this, "SE_OJ_LV_VOLCANO_EXPL_SIGN", -1, -1, -1); + MR::startLevelSound(this, "SE_OJ_LV_VOLCANO_EXPL_SIGN", -1, -1, -1); if (MR::isStep(this, 60)) { MR::emitEffect(this, "Active"); MR::emitEffect(this, "Loop"); @@ -70,4 +69,4 @@ void LavaHomeVolcanoFlow::exeMove() { } } -LavaHomeVolcanoFlow::~LavaHomeVolcanoFlow() { } +LavaHomeVolcanoFlow::~LavaHomeVolcanoFlow() {} diff --git a/src/Game/MapObj/LavaJamboSunPlanet.cpp b/src/Game/MapObj/LavaJamboSunPlanet.cpp index b6dfd194d..a526eb81f 100644 --- a/src/Game/MapObj/LavaJamboSunPlanet.cpp +++ b/src/Game/MapObj/LavaJamboSunPlanet.cpp @@ -19,9 +19,10 @@ namespace NrvLavaJamboSunPlanet { NEW_NERVE(HostTypeWait, LavaJamboSunPlanet, Wait); NEW_NERVE(HostTypePause, LavaJamboSunPlanet, Wait); NEW_NERVE(HostTypeMove, LavaJamboSunPlanet, Move); -}; +}; // namespace NrvLavaJamboSunPlanet -LavaJamboSunPlanet::LavaJamboSunPlanet(const char* pName) : LiveActor(pName) { +LavaJamboSunPlanet::LavaJamboSunPlanet(const char* pName) + : LiveActor(pName) { mBloomModel = nullptr; mLodCtrl = nullptr; _94 = 0.0f; @@ -63,7 +64,7 @@ void LavaJamboSunPlanet::exeWait() { setNerve(&NrvLavaJamboSunPlanet::HostTypeMove::sInstance); return; } - if ( isNerve(&NrvLavaJamboSunPlanet::HostTypePause::sInstance) && MR::isOnSwitchB(this)) { + if (isNerve(&NrvLavaJamboSunPlanet::HostTypePause::sInstance) && MR::isOnSwitchB(this)) { setNerve(&NrvLavaJamboSunPlanet::HostTypeMove::sInstance); } } @@ -77,11 +78,10 @@ void LavaJamboSunPlanet::exeMove() { MR::getCurrentRailPointArg1NoInit(this, &v3); if (v3 == 1) { setNerve(&NrvLavaJamboSunPlanet::HostTypePause::sInstance); - } else if (MR::isRailReachedGoal(this)) { + } else if (MR::isRailReachedGoal(this)) { setNerve(&NrvLavaJamboSunPlanet::HostTypeWait::sInstance); } } LavaJamboSunPlanet::~LavaJamboSunPlanet() { - } diff --git a/src/Game/MapObj/LavaSteam.cpp b/src/Game/MapObj/LavaSteam.cpp index 979d3413d..3813d625c 100644 --- a/src/Game/MapObj/LavaSteam.cpp +++ b/src/Game/MapObj/LavaSteam.cpp @@ -7,7 +7,8 @@ #include "math_types.hpp" #include "revolution/types.h" -LavaSteam::LavaSteam(const char* pName) : LiveActor(pName) { +LavaSteam::LavaSteam(const char* pName) + : LiveActor(pName) { f32 f = 1.0f; f32 g = 0.0f; _8C.x = g; @@ -29,16 +30,15 @@ void LavaSteam::init(const JMapInfoIter& rIter) { vec.y = 250.0f; vec.z = 0.0f; HitSensor* pSensor = MR::addHitSensorMapObj(this, "body", 8, 250.0f, vec); - + MR::setClippingTypeSphere(this, 250.0f, &pSensor->mPosition); MR::setGroupClipping(this, rIter, 0x10); initNerve(&NrvLavaSteam::HostTypeWait::sInstance); - + if (MR::useStageSwitchReadA(this, rIter)) { setNerve(&NrvLavaSteam::HostTypeWaitForSwitchOn::sInstance); MR::listenStageSwitchOnA(this, MR::Functor(this, &LavaSteam::startSteam)); - } - else if (MR::tryRegisterDemoCast(this, rIter)) { + } else if (MR::tryRegisterDemoCast(this, rIter)) { setNerve(&NrvLavaSteam::HostTypeWaitForSwitchOn::sInstance); MR::registerDemoActionFunctor(this, MR::Functor(this, &LavaSteam::startSteam), 0); } @@ -52,17 +52,17 @@ void LavaSteam::init(const JMapInfoIter& rIter) { void LavaSteam::initAfterPlacement() { TRot3f mtx; mtx.identity(); - TVec3f vec = mRotation*PI_180; + TVec3f vec = mRotation * PI_180; f32 vecz = vec.z; f32 vecy = vec.y; f32 vecx = vec.x; - f32 v11 = cos(vecz); + f32 v11 = cos(vecz); f32 v12 = cos(vecy); f32 v13 = cos(vecx); f32 v15 = sin(vecy); - f32 v14 = sin(vecz); + f32 v14 = sin(vecz); f32 v16 = sin(vecx); mtx.mMtx[0][0] = v12 * v11; @@ -81,22 +81,22 @@ void LavaSteam::initAfterPlacement() { #endif #ifdef NON_MATCHING -void LavaSteam::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void LavaSteam::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { TVec3f stack_64; TVec3f stack_58; - f32 stack_2C, stack_54; - + f32 stack_2C, stack_54; + if (!isNerve(&NrvLavaSteam::HostTypeWait::sInstance) && !isNerve(&NrvLavaSteam::HostTypeWaitForSwitchOn::sInstance)) { if (MR::isSensorPlayerOrRide(pReceiver)) { f32 rad = pReceiver->mRadius; - f32 f31 = rad*0.69999999f; - + f32 f31 = rad * 0.69999999f; + if (isNerve(&NrvLavaSteam::HostTypeSteam::sInstance)) { - TVec3f stack_30 =_8C*400.0f; + TVec3f stack_30 = _8C * 400.0f; TVec3f stack_3C = TVec3f(mPosition); - + JMathInlineVEC::PSVECAdd2(&stack_3C, &stack_30, &stack_3C); - + TVec3f stack_48; stack_48.set(stack_3C); @@ -104,17 +104,17 @@ void LavaSteam::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { TVec3f stack_20; stack_20.set(pReceiver->mPosition); - + f32 dist = JMathInlineVEC::PSVECSquareDistance((Vec*)&stack_48, (Vec*)&stack_20); - f32 s = (stack_54+f31); + f32 s = (stack_54 + f31); stack_2C = f31; - - if ((dist <= s*s) & 3 && MR::sendMsgEnemyAttackFire(pReceiver, pSender)) + + if ((dist <= s * s) & 3 && MR::sendMsgEnemyAttackFire(pReceiver, pSender)) return; } - + if (isNerve(&NrvLavaSteam::HostTypeSteam::sInstance)) { - TVec3f stack_14 = _8C*330.0f; + TVec3f stack_14 = _8C * 330.0f; stack_58.set(mPosition); stack_64.set(stack_14); @@ -124,11 +124,11 @@ void LavaSteam::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { f32 sq1 = stack_8.squared(); f32 sq2 = stack_64.squared(); f32 _64dot8 = stack_64.dot(stack_8); - f32 ff1 = sq2*sq1; - f32 ff2 = _64dot8/sq2; - f32 squ3 = JGeometry::TUtil::sqrt((ff1-(_64dot8*_64dot8))/sq2); + f32 ff1 = sq2 * sq1; + f32 ff2 = _64dot8 / sq2; + f32 squ3 = JGeometry::TUtil::sqrt((ff1 - (_64dot8 * _64dot8)) / sq2); - if (0.0f <= ff2 && ff2 <= 1.0f && squ3 < (10.0f+f31) && MR::sendMsgEnemyAttackFire(pReceiver, pSender)) + if (0.0f <= ff2 && ff2 <= 1.0f && squ3 < (10.0f + f31) && MR::sendMsgEnemyAttackFire(pReceiver, pSender)) return; } } @@ -143,7 +143,7 @@ void LavaSteam::startClipped() { void LavaSteam::endClipped() { LiveActor::endClipped(); - + if (isNerve(&NrvLavaSteam::HostTypeWaitForSwitchOn::sInstance)) return; } @@ -163,8 +163,8 @@ void LavaSteam::exeWait() { } if (MR::isGreaterStep(this, 82)) { - f32 c = 90-getNerveStep(); - _98.setAll(MR::getEaseInValue(c*=0.125f, 0.001, 1.0, 1.0)); + f32 c = 90 - getNerveStep(); + _98.setAll(MR::getEaseInValue(c *= 0.125f, 0.001, 1.0, 1.0)); } if (MR::isStep(this, 90)) @@ -180,7 +180,7 @@ void LavaSteam::exeSteam() { MR::emitEffect(this, "Steam"); MR::validateHitSensors(this); } - + MR::startLevelSound(this, "SE_OJ_LV_LAVA_STEAM_OUT", -1, -1, -1); if (MR::isStep(this, 90)) { @@ -190,7 +190,6 @@ void LavaSteam::exeSteam() { } LavaSteam::~LavaSteam() { - } namespace NrvLavaSteam { void HostTypeSteamEnd::execute(Spine* pSpine) const { @@ -204,4 +203,4 @@ namespace NrvLavaSteam { HostTypeWaitForSwitchOn(HostTypeWaitForSwitchOn::sInstance); HostTypeSteam(HostTypeSteam::sInstance); HostTypeSteamEnd(HostTypeSteamEnd::sInstance); -} +} // namespace NrvLavaSteam diff --git a/src/Game/MapObj/LotusLeaf.cpp b/src/Game/MapObj/LotusLeaf.cpp index cc7a4dd48..770638ef8 100644 --- a/src/Game/MapObj/LotusLeaf.cpp +++ b/src/Game/MapObj/LotusLeaf.cpp @@ -20,9 +20,10 @@ namespace NrvLotusLeaf { NEW_NERVE(HostTypeShakeOnPlayer, LotusLeaf, Shake); NEW_NERVE(HostTypeShake, LotusLeaf, Shake); NEW_NERVE(HostTypeWaitPlayerOn, LotusLeaf, WaitPlayerOn); -} +} // namespace NrvLotusLeaf -LotusLeaf::LotusLeaf(const char* pName) : LiveActor(pName) { +LotusLeaf::LotusLeaf(const char* pName) + : LiveActor(pName) { _8C.zero(); //_8C.z = 0; _98 = 0.0f; @@ -31,7 +32,7 @@ LotusLeaf::LotusLeaf(const char* pName) : LiveActor(pName) { LotusLeaf::~LotusLeaf() {} -void LotusLeaf::init(const JMapInfoIter &rIter) { +void LotusLeaf::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); _8C.set(mPosition); initModelManagerWithAnm("LotusLeaf", nullptr, false); @@ -56,8 +57,9 @@ void LotusLeaf::exeWait() { convergeToInitPos(); if (MR::isFirstStep(this)) { MR::deleteEffect(this, "LotusLeafRipple"); - } - if (MR::isOnPlayer(this)) setNerve(&NrvLotusLeaf::HostTypeShakeOnPlayer::sInstance); + } + if (MR::isOnPlayer(this)) + setNerve(&NrvLotusLeaf::HostTypeShakeOnPlayer::sInstance); } void LotusLeaf::exeWaitPlayerOn() { @@ -79,12 +81,12 @@ void LotusLeaf::exeShake() { } f32 v1 = 6.2831855f / _9C; - f32 value = JMath::sSinCosTable.cosLapRad( v1 * getNerveStep()); + f32 value = JMath::sSinCosTable.cosLapRad(v1 * getNerveStep()); //* 0.95f + -mPosition.y _9C = -_98 * 0.65f; _98 = v1; mVelocity.y = _9C - mPosition.y; - if (value <= _8C.y) { + if (value <= _8C.y) { _8C.zero(); } if (isNerve(&NrvLotusLeaf::HostTypeShake::sInstance)) { @@ -96,7 +98,7 @@ void LotusLeaf::exeShake() { return; } f32 f_a = value - mVelocity.y; - if ( MR::isNearZero(f_a, 0.000099999997f) && MR::isNearZero(f_a, 0.000099999997f)) { + if (MR::isNearZero(f_a, 0.000099999997f) && MR::isNearZero(f_a, 0.000099999997f)) { mVelocity.zero(); if (isNerve(&NrvLotusLeaf::HostTypeShakeOnPlayer::sInstance)) { setNerve(&NrvLotusLeaf::HostTypeWaitPlayerOn::sInstance); diff --git a/src/Game/MapObj/MagicBell.cpp b/src/Game/MapObj/MagicBell.cpp index 368013df3..85d86e049 100644 --- a/src/Game/MapObj/MagicBell.cpp +++ b/src/Game/MapObj/MagicBell.cpp @@ -1,6 +1,7 @@ #include "Game/MapObj/MagicBell.hpp" -MagicBell::MagicBell(const char *pName) : LiveActor(pName) { +MagicBell::MagicBell(const char* pName) + : LiveActor(pName) { mBellSwinger = nullptr; mSurface1Mtx = nullptr; mSurface2Mtx = nullptr; @@ -11,7 +12,7 @@ MagicBell::MagicBell(const char *pName) : LiveActor(pName) { mHitMarkPosition.z = 0.0f; } -void MagicBell::init(const JMapInfoIter &rIter) { +void MagicBell::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("Bell", nullptr, false); mSurface2Mtx = MR::getJointMtx(this, "polySurface2"); @@ -38,7 +39,6 @@ void MagicBell::init(const JMapInfoIter &rIter) { void MagicBell::exeWait() { if (MR::isFirstStep(this)) { - } if (!tryRing()) { @@ -121,7 +121,7 @@ void MagicBell::exeRing() } */ -void MagicBell::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void MagicBell::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver)) { MR::sendMsgPush(pReceiver, pSender); } @@ -149,10 +149,9 @@ bool MagicBell::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *p } */ -bool MagicBell::tryRing() -{ +bool MagicBell::tryRing() { if (!MR::isExecScenarioStarter() && MR::isStarPointerPointing(this, 0, 0, "弱")) { - TVec2f *v4(MR::getStarPointerScreenVelocity(0)); + TVec2f* v4(MR::getStarPointerScreenVelocity(0)); if (((v4->x * v4->x) + (v4->y * v4->y)) > 64.0f) { TVec3f v12; MR::getStarPointerWorldVelocityDirection(&v12, 0); @@ -160,8 +159,7 @@ bool MagicBell::tryRing() v12.set(MR::getRandom(-1.0f, 1.0f), MR::getRandom(-1.0f, 1.0f), MR::getRandom(-1.0f, 1.0f)); if (MR::isNearZero(v12, 0.001f)) { v12.set(1.0f, 0.0f, 0.0f); - } - else { + } else { MR::normalize(&v12); } } @@ -174,9 +172,8 @@ bool MagicBell::tryRing() return false; } -void MagicBell::startRing(const TVec3f &a1, const TVec3f &a2) -{ - f32 v10 = PSVECMag(&mBellSwinger->mAcceleration); +void MagicBell::startRing(const TVec3f& a1, const TVec3f& a2) { + f32 v10 = PSVECMag(&mBellSwinger->mAcceleration); TVec3f v13(mBellSwinger->mAcceleration); v13.scale(-1.0f); mBellSwinger->accel(v13); @@ -190,13 +187,12 @@ void MagicBell::startRing(const TVec3f &a1, const TVec3f &a2) } MagicBell::~MagicBell() { - } namespace NrvMagicBell { INIT_NERVE(MagicBellNrvWait); INIT_NERVE(MagicBellNrvRing); -}; +}; // namespace NrvMagicBell MtxPtr MagicBell::getBaseMtx() const { return mSurface2Mtx; diff --git a/src/Game/MapObj/ManholeCover.cpp b/src/Game/MapObj/ManholeCover.cpp index bc8a3df5b..9c40de41f 100644 --- a/src/Game/MapObj/ManholeCover.cpp +++ b/src/Game/MapObj/ManholeCover.cpp @@ -1,6 +1,6 @@ #include "Game/MapObj/ManholeCover.hpp" -void ManholeCover::init(const JMapInfoIter &rIter) { +void ManholeCover::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; info.setupHioNode("地形オブジェ"); @@ -18,7 +18,7 @@ void ManholeCover::init(const JMapInfoIter &rIter) { MapObjActor::initialize(rIter, info); } -bool ManholeCover::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool ManholeCover::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (!MR::isMsgPlayerHipDropFloor(msg) && !MR::isMsgPlayerUpperPunch(msg) || !isNerve(&NrvManholeCover::HostTypeWait::sInstance) && !isNerve(&NrvManholeCover::HostTypeRattle::sInstance)) { return false; } diff --git a/src/Game/MapObj/MapObjActor.cpp b/src/Game/MapObj/MapObjActor.cpp index acd28c3c4..668d6969a 100644 --- a/src/Game/MapObj/MapObjActor.cpp +++ b/src/Game/MapObj/MapObjActor.cpp @@ -26,9 +26,10 @@ namespace { const char* cFollowJointName = "Move"; const char* cEffectNameBreak = "Break"; const char* cBckNameBreak = "Break"; -}; +}; // namespace -MapObjActor::MapObjActor(const char *pName) : LiveActor(pName) { +MapObjActor::MapObjActor(const char* pName) + : LiveActor(pName) { mObjectName = 0; mPlanetLodCtrl = 0; mBloomModel = 0; @@ -47,7 +48,8 @@ MapObjActor::MapObjActor(const char *pName) : LiveActor(pName) { mDoneNrv = &NrvMapObjActor::HostTypeDone::sInstance; } -MapObjActor::MapObjActor(const char *pName, const char *pObjName) : LiveActor(pName) { +MapObjActor::MapObjActor(const char* pName, const char* pObjName) + : LiveActor(pName) { mObjectName = pObjName; mPlanetLodCtrl = 0; mBloomModel = 0; @@ -65,7 +67,7 @@ MapObjActor::MapObjActor(const char *pName, const char *pObjName) : LiveActor(pN mDoneNrv = &NrvMapObjActor::HostTypeDone::sInstance; } -void MapObjActor::init(const JMapInfoIter &rIter) { +void MapObjActor::init(const JMapInfoIter& rIter) { if (mObjectName) { return; } @@ -90,7 +92,7 @@ void MapObjActor::appear() { if (mBloomModel) { mBloomModel->appear(); - } + } if (MR::isExistEffectKeeper(this)) { const char* appearEffectName = cEffectNameAppear; @@ -128,49 +130,44 @@ void MapObjActor::kill() { LiveActor::kill(); } -bool MapObjActor::isObjectName(const char *pName) const { +bool MapObjActor::isObjectName(const char* pName) const { return MR::isEqualString(pName, mObjectName); } -void MapObjActor::connectToScene(const MapObjActorInitInfo &rInfo) { +void MapObjActor::connectToScene(const MapObjActorInitInfo& rInfo) { if (rInfo.mConnectToScene) { if (MR::isExistCollisionResource(this, mObjectName)) { s32 type = rInfo._5C; if (type == 1) { MR::connectToSceneCollisionMapObjStrongLight(this); - } - else if (type == 2) { + } else if (type == 2) { MR::connectToSceneCollisionMapObjWeakLight(this); - } - else { + } else { MR::connectToSceneCollisionMapObj(this); } - } - else if (rInfo._5C == 1) { + } else if (rInfo._5C == 1) { MR::connectToSceneMapObjStrongLight(this); - } - else { + } else { MR::connectToSceneMapObj(this); } } } -void MapObjActor::initCaseUseSwitchA(const MapObjActorInitInfo &) { +void MapObjActor::initCaseUseSwitchA(const MapObjActorInitInfo&) { setNerve(mWaitNrv); } -void MapObjActor::initCaseNoUseSwitchA(const MapObjActorInitInfo &) { - +void MapObjActor::initCaseNoUseSwitchA(const MapObjActorInitInfo&) { } -void MapObjActor::initCaseUseSwitchB(const MapObjActorInitInfo &rInfo) { +void MapObjActor::initCaseUseSwitchB(const MapObjActorInitInfo& rInfo) { void (MapObjActor::*end)(void) = &MapObjActor::endMapPartsFunctions; void (MapObjActor::*start)(void) = &MapObjActor::startMapPartsFunctions; MR::listenStageSwitchOnOffB(this, MR::Functor(this, end), MR::Functor(this, start)); } -void MapObjActor::initCaseNoUseSwitchB(const MapObjActorInitInfo &rInfo) { +void MapObjActor::initCaseNoUseSwitchB(const MapObjActorInitInfo& rInfo) { MapObjActorUtil::startAllMapPartsFunctions(this); } @@ -264,8 +261,7 @@ void MapObjActor::calcAndSetBaseMtx() { if (!v3) { LiveActor::calcAndSetBaseMtx(); - } - else { + } else { TPos3f mtx; mtx.identity(); @@ -298,13 +294,12 @@ void MapObjActor::endClipped() { tryDeleteWaitEffect(); } -bool MapObjActor::tryCreateBreakModel(const MapObjActorInitInfo &rInfo) { +bool MapObjActor::tryCreateBreakModel(const MapObjActorInitInfo& rInfo) { char buf[0x100]; if (rInfo._80) { snprintf(buf, sizeof(buf), "%s", rInfo._80); - } - else { + } else { snprintf(buf, sizeof(buf), "%sBreak", mObjectName); } @@ -315,8 +310,7 @@ bool MapObjActor::tryCreateBreakModel(const MapObjActorInitInfo &rInfo) { if (MR::isEqualString(mObjectName, "SandUpDownTowerBreakableWallB")) { MtxPtr baseMtx = getBaseMtx(); mModelObj = MR::createModelObjMapObj("壊れモデル", buf, baseMtx); - } - else { + } else { MtxPtr baseMtx = getBaseMtx(); mModelObj = MR::createModelObjMapObjStrongLight("壊れモデル", buf, baseMtx); } @@ -411,8 +405,8 @@ void MapObjActor::exeMove() { if (MR::isFirstStep(this)) { const char* moveName = cBckNameMove; if (MR::isExistBck(this, moveName)) { - MR::startBck(this, moveName, 0); - } + MR::startBck(this, moveName, 0); + } } if (MR::isExistBck(this, cBckNameMove) && MR::isBckStopped(this)) { @@ -420,7 +414,7 @@ void MapObjActor::exeMove() { } } -void MapObjActorUtil::startAllMapPartsFunctions(const MapObjActor *pActor) { +void MapObjActorUtil::startAllMapPartsFunctions(const MapObjActor* pActor) { if (pActor->mRotator) { pActor->mRotator->start(); } @@ -442,7 +436,7 @@ void MapObjActorUtil::startAllMapPartsFunctions(const MapObjActor *pActor) { } } -void MapObjActorUtil::endAllMapPartsFunctions(const MapObjActor *pActor) { +void MapObjActorUtil::endAllMapPartsFunctions(const MapObjActor* pActor) { if (pActor->mRotator) { pActor->mRotator->end(); } @@ -460,7 +454,7 @@ void MapObjActorUtil::endAllMapPartsFunctions(const MapObjActor *pActor) { } } -void MapObjActorUtil::pauseAllMapPartsFunctions(const MapObjActor *pActor) { +void MapObjActorUtil::pauseAllMapPartsFunctions(const MapObjActor* pActor) { if (pActor->mRotator) { pActor->mRotator->_14 = 0; } @@ -474,7 +468,7 @@ void MapObjActorUtil::pauseAllMapPartsFunctions(const MapObjActor *pActor) { } } -void MapObjActorUtil::resumeAllMapPartsFunctions(const MapObjActor *pActor) { +void MapObjActorUtil::resumeAllMapPartsFunctions(const MapObjActor* pActor) { if (pActor->mRotator) { pActor->mRotator->_14 = 1; } @@ -488,53 +482,53 @@ void MapObjActorUtil::resumeAllMapPartsFunctions(const MapObjActor *pActor) { } } -bool MapObjActorUtil::isRotatorMoving(const MapObjActor *pActor) { +bool MapObjActorUtil::isRotatorMoving(const MapObjActor* pActor) { return pActor->mRotator->isMoving(); } -bool MapObjActorUtil::isRailMoverWorking(const MapObjActor *pActor) { +bool MapObjActorUtil::isRailMoverWorking(const MapObjActor* pActor) { return pActor->mRailMover->isWorking(); } -bool MapObjActorUtil::isRailMoverReachedEnd(const MapObjActor *pActor) { +bool MapObjActorUtil::isRailMoverReachedEnd(const MapObjActor* pActor) { return pActor->mRailMover->isReachedEnd(); } -f32 MapObjActorUtil::getSeesaw1AxisAngularSpeed(const MapObjActor *pActor) { +f32 MapObjActorUtil::getSeesaw1AxisAngularSpeed(const MapObjActor* pActor) { return pActor->mRotator->_40.mMtx[2][2]; } -void MapObjActorUtil::forceRotateSeesaw1Axis(const MapObjActor *pActor, f32 a2) { +void MapObjActorUtil::forceRotateSeesaw1Axis(const MapObjActor* pActor, f32 a2) { pActor->mRotator->_40.mMtx[2][3] = a2; } -void MapObjActorUtil::startRotator(const MapObjActor *pActor) { +void MapObjActorUtil::startRotator(const MapObjActor* pActor) { pActor->mRotator->start(); } -void MapObjActorUtil::startRailMover(const MapObjActor *pActor) { +void MapObjActorUtil::startRailMover(const MapObjActor* pActor) { pActor->mRailMover->start(); } -void MapObjActorUtil::endRotator(const MapObjActor *pActor) { +void MapObjActorUtil::endRotator(const MapObjActor* pActor) { pActor->mRotator->end(); } -void MapObjActorUtil::pauseRotator(const MapObjActor *pActor) { +void MapObjActorUtil::pauseRotator(const MapObjActor* pActor) { pActor->mRotator->_14 = 0; } -void MapObjActorUtil::resetRailMoverToInitPos(const MapObjActor *pActor) { +void MapObjActorUtil::resetRailMoverToInitPos(const MapObjActor* pActor) { pActor->mRailMover->resetToInitPos(); } -void MapObjActorUtil::startBreak(MapObjActor *pActor) { +void MapObjActorUtil::startBreak(MapObjActor* pActor) { if (!MapObjActorUtil::tryStartBreak(pActor)) { pActor->kill(); } } -bool MapObjActorUtil::tryStartBreak(MapObjActor *pActor) { +bool MapObjActorUtil::tryStartBreak(MapObjActor* pActor) { const char* stopSe = MR::StageEffect::getStopSe(pActor->mObjectName); if (stopSe) { MR::startSound(pActor, stopSe, -1, -1); @@ -548,21 +542,19 @@ bool MapObjActorUtil::tryStartBreak(MapObjActor *pActor) { ModelObj* modelObj = pActor->mModelObj; if (modelObj) { pActor->mModelObj->appear(); - const char* breakName = (const char *)cBckNameBreak; + const char* breakName = (const char*)cBckNameBreak; MR::startAllAnim(modelObj, breakName); if (MR::isExistBva(pActor, breakName)) { MR::startBva(pActor, breakName); MR::setBvaFrameAndStop(pActor, 1.0f); - } - else { + } else { MR::hideModel(pActor); } MR::invalidateClipping(modelObj); return true; - } - else { + } else { const char* breakName = cBckNameBreak; if (MR::isExistBck(pActor, breakName)) { MR::startAllAnim(pActor, breakName); @@ -574,7 +566,7 @@ bool MapObjActorUtil::tryStartBreak(MapObjActor *pActor) { return false; } -bool MapObjActorUtil::isBreakStopped(const MapObjActor *pActor) { +bool MapObjActorUtil::isBreakStopped(const MapObjActor* pActor) { const LiveActor* actor = pActor->mModelObj; if (!pActor->mModelObj && MR::isExistBck(pActor, cBckNameBreak)) { @@ -588,11 +580,11 @@ bool MapObjActorUtil::isBreakStopped(const MapObjActor *pActor) { return MR::isBckOneTimeAndStopped(actor); } -void MapObjActorUtil::killBloomModel(MapObjActor *pActor) { +void MapObjActorUtil::killBloomModel(MapObjActor* pActor) { pActor->mBloomModel->kill(); } -void MapObjActorUtil::appearBloomModel(MapObjActor *pActor) { +void MapObjActorUtil::appearBloomModel(MapObjActor* pActor) { pActor->mBloomModel->appear(); char buf[0x100]; snprintf(buf, sizeof(buf), "%sBloom", pActor->mObjectName); @@ -600,17 +592,16 @@ void MapObjActorUtil::appearBloomModel(MapObjActor *pActor) { } namespace NrvMapObjActor { - void HostTypeDone::execute(Spine *pSpine) const { - + void HostTypeDone::execute(Spine* pSpine) const { } - void HostTypeMove::execute(Spine *pSpine) const { + void HostTypeMove::execute(Spine* pSpine) const { MapObjActor* actor = reinterpret_cast(pSpine->mExecutor); actor->exeMove(); } - void HostTypeWait::execute(Spine *pSpine) const { + void HostTypeWait::execute(Spine* pSpine) const { MapObjActor* actor = reinterpret_cast(pSpine->mExecutor); actor->exeWait(); } -}; +}; // namespace NrvMapObjActor diff --git a/src/Game/MapObj/MapObjActorInitInfo.cpp b/src/Game/MapObj/MapObjActorInitInfo.cpp index 14fce79f1..1bcccff9e 100644 --- a/src/Game/MapObj/MapObjActorInitInfo.cpp +++ b/src/Game/MapObj/MapObjActorInitInfo.cpp @@ -1,7 +1,6 @@ #include "Game/MapObj/MapObjActorInitInfo.hpp" #include "Game/Util.hpp" - // scheduling issues with the paired single set MapObjActorInitInfo::MapObjActorInitInfo() { mSetDefaultPosition = 0; @@ -9,21 +8,21 @@ MapObjActorInitInfo::MapObjActorInitInfo() { mInitBinder = 0; mHasEffect = 0; mHasSensors = 0; - mHasShadows = 0; + mHasShadows = 0; mCalcGravity = 0; mProjectMapMtx = 0; mInitFur = 0; mHasRailMover = 0; mHasRotator = 0; - mHasRailRotator = 0; + mHasRailRotator = 0; _C = 0; - _D = 0; + _D = 0; mUsesRailPosture = 0; mDoesBaseMtxFollowTarget = 0; mIsAffectedByScale = 0; mUseMirrorReflection = 0; mModelName = 0; - mHioNode = 0; + mHioNode = 0; _1C = 0; mSensorSize = 0.0f; mSensorOffset.zero(); @@ -54,7 +53,7 @@ MapObjActorInitInfo::MapObjActorInitInfo() { mNoUseLOD = 0; } -void MapObjActorInitInfo::setupHioNode(const char *pName) { +void MapObjActorInitInfo::setupHioNode(const char* pName) { mHioNode = pName; } @@ -62,7 +61,7 @@ void MapObjActorInitInfo::setupDefaultPos() { mSetDefaultPosition = true; } -void MapObjActorInitInfo::setupModelName(const char *pName) { +void MapObjActorInitInfo::setupModelName(const char* pName) { mModelName = pName; } @@ -76,7 +75,7 @@ void MapObjActorInitInfo::setupBinder(f32 binderRadius, f32 binderCenterY) { mBinderCenterY = binderCenterY; } -void MapObjActorInitInfo::setupEffect(const char *pName) { +void MapObjActorInitInfo::setupEffect(const char* pName) { mEffectName = pName; mHasEffect = true; } @@ -85,7 +84,7 @@ void MapObjActorInitInfo::setupSound(s32 id) { mSound = id; } -void MapObjActorInitInfo::setupSoundPos(TVec3f *pPos) { +void MapObjActorInitInfo::setupSoundPos(TVec3f* pPos) { mSoundPos = pPos; } diff --git a/src/Game/MapObj/MapObjConnector.cpp b/src/Game/MapObj/MapObjConnector.cpp index 643d988b8..6a85119d9 100644 --- a/src/Game/MapObj/MapObjConnector.cpp +++ b/src/Game/MapObj/MapObjConnector.cpp @@ -2,7 +2,7 @@ #include "Game/Util.hpp" #include "JSystem/JMath.hpp" -MapObjConnector::MapObjConnector(LiveActor *pActor) { +MapObjConnector::MapObjConnector(LiveActor* pActor) { mHost = pActor; _4 = 0; _8.identity(); diff --git a/src/Game/MapObj/MapParts.cpp b/src/Game/MapObj/MapParts.cpp index 04cacd99e..8d0fc8b74 100644 --- a/src/Game/MapObj/MapParts.cpp +++ b/src/Game/MapObj/MapParts.cpp @@ -8,14 +8,14 @@ namespace { }; MapParts::~MapParts() { - } -MapParts::MapParts(const char *pName) : LiveActor(pName) { +MapParts::MapParts(const char* pName) + : LiveActor(pName) { _8C.zero(); } -void MapParts::init(const JMapInfoIter &rIter) { +void MapParts::init(const JMapInfoIter& rIter) { if (MR::isConnectedWithRail(rIter)) { initRailRider(rIter); } @@ -45,7 +45,7 @@ void MapParts::connectToScene() { MR::connectToSceneMapParts(this); } -void MapParts::initModelAndCollision(const JMapInfoIter &rIter) { +void MapParts::initModelAndCollision(const JMapInfoIter& rIter) { char name[0x30]; MR::getMapPartsObjectName(name, sizeof(name), rIter); initModelManagerWithAnm(name, nullptr, false); @@ -56,14 +56,13 @@ void MapParts::initModelAndCollision(const JMapInfoIter &rIter) { sensor_offs.x = 0.0f; sensor_offs.y = 0.0f; sensor_offs.z = 0.0f; - u32 sensorNum = getSensorNumMax(); + u32 sensorNum = getSensorNumMax(); HitSensor* sensor = MR::addHitSensorMapObj(this, "body", sensorNum, 100.0f, sensor_offs); if (MR::isExistJoint(this, cFollowjointName)) { MtxPtr jointMtx = MR::getJointMtx(this, cFollowjointName); MR::initCollisionParts(this, name, sensor, jointMtx); MR::tryCreateCollisionAllOtherCategory(this, jointMtx, sensor, nullptr, nullptr, nullptr); - } - else { + } else { MR::initCollisionParts(this, name, sensor, nullptr); MR::tryCreateCollisionAllOtherCategory(this, sensor, nullptr, nullptr, nullptr); } @@ -79,8 +78,7 @@ void MapParts::initModelAndCollision(const JMapInfoIter &rIter) { trueSensorOffset.setPS(lerpVec); JMathInlineVEC::PSVECSubtract(&trueSensorOffset, &mPosition, &trueSensorOffset); MR::setSensorOffset(this, "body", trueSensorOffset); - } - else { + } else { sensorRange = MR::getCollisionBoundingSphereRange(this); } diff --git a/src/Game/MapObj/MapPartsAppearController.cpp b/src/Game/MapObj/MapPartsAppearController.cpp index e9e8ad81c..bdbf66ac6 100644 --- a/src/Game/MapObj/MapPartsAppearController.cpp +++ b/src/Game/MapObj/MapPartsAppearController.cpp @@ -3,13 +3,14 @@ #include "Game/Util/MapPartsUtil.hpp" #include "Game/Util/PostureHolder.hpp" -MapPartsAppearController::MapPartsAppearController(LiveActor *pActor) : MapPartsFunction(pActor, "出現制御") { +MapPartsAppearController::MapPartsAppearController(LiveActor* pActor) + : MapPartsFunction(pActor, "出現制御") { mSignMotionType = 0; mPostureHolder = nullptr; _20 = 0; } -void MapPartsAppearController::init(const JMapInfoIter &rIter) { +void MapPartsAppearController::init(const JMapInfoIter& rIter) { MapPartsFunction::initNerve(&NrvMapPartsAppearController::HostTypeWait::sInstance); initSwitchMessenger(rIter); MR::getMapPartsArgSignMotionType(&mSignMotionType, rIter); @@ -28,7 +29,7 @@ void MapPartsAppearController::storeCurrentPosture() { mPostureHolder->store(mHost); } -void MapPartsAppearController::initSwitchMessenger(const JMapInfoIter &rIter) { +void MapPartsAppearController::initSwitchMessenger(const JMapInfoIter& rIter) { if (MR::isExistStageSwitchAppear(rIter)) { void (MapPartsAppearController::*k)(void) = &MapPartsAppearController::startKill; void (MapPartsAppearController::*s)(void) = &MapPartsAppearController::startAppear; @@ -78,8 +79,7 @@ void MapPartsAppearController::startKill() { if (isNerve(&NrvMapPartsAppearController::HostTypeWait::sInstance)) { if (MR::hasMapPartsVanishSignMotion(mSignMotionType)) { setNerve(&NrvMapPartsAppearController::HostTypeDisappear::sInstance); - } - else { + } else { killHost(); } } @@ -92,7 +92,7 @@ void MapPartsAppearController::appearHost() { mHost->appear(); mPostureHolder->store(mHost); } - + if (MR::isHiddenModel(mHost)) { MR::showModel(mHost); } @@ -111,8 +111,7 @@ void MapPartsAppearController::exeDisappear() { LiveActor* host = mHost; if (MR::isHiddenModel(host)) { MR::showModel(host); - } - else { + } else { MR::hideModel(host); } } @@ -128,16 +127,14 @@ namespace NrvMapPartsAppearController { INIT_NERVE(HostTypeWait); INIT_NERVE(HostTypeDisappear); - void HostTypeDisappear::execute(Spine *pSpine) const { + void HostTypeDisappear::execute(Spine* pSpine) const { MapPartsAppearController* ctrl = reinterpret_cast(pSpine->mExecutor); ctrl->exeDisappear(); } - void HostTypeWait::execute(Spine *pSpine) const { - + void HostTypeWait::execute(Spine* pSpine) const { } -}; +}; // namespace NrvMapPartsAppearController MapPartsAppearController::~MapPartsAppearController() { - } \ No newline at end of file diff --git a/src/Game/MapObj/MapPartsBreaker.cpp b/src/Game/MapObj/MapPartsBreaker.cpp index 16898e1bc..59aef992b 100644 --- a/src/Game/MapObj/MapPartsBreaker.cpp +++ b/src/Game/MapObj/MapPartsBreaker.cpp @@ -50,17 +50,16 @@ namespace NrvMapPartsBreaker { INIT_NERVE(HostTypeReactToTornado); INIT_NERVE(HostTypeBreak); - void HostTypeBreak::execute(Spine *pSpine) const { + void HostTypeBreak::execute(Spine* pSpine) const { MapPartsBreaker* breaker = reinterpret_cast(pSpine->mExecutor); breaker->exeBreak(); } - void HostTypeReactToTornado::execute(Spine *pSpine) const { + void HostTypeReactToTornado::execute(Spine* pSpine) const { MapPartsBreaker* breaker = reinterpret_cast(pSpine->mExecutor); breaker->exeReactToTornado(); } - void HostTypeWait::execute(Spine *pSpine) const { - + void HostTypeWait::execute(Spine* pSpine) const { } -}; +}; // namespace NrvMapPartsBreaker diff --git a/src/Game/MapObj/MapPartsFloatingForce.cpp b/src/Game/MapObj/MapPartsFloatingForce.cpp index 0128a1f75..84822bb49 100644 --- a/src/Game/MapObj/MapPartsFloatingForce.cpp +++ b/src/Game/MapObj/MapPartsFloatingForce.cpp @@ -20,7 +20,8 @@ void SpringStep::setSpringBaseValue(f32 val) { mSpringValue->setParam((f64)val, 0.0f, mSpeed, mAngle, 0.0f); } -MapPartsFloatingForce::MapPartsFloatingForce(LiveActor *pActor) : MapPartsFunction(pActor, "浮力") { +MapPartsFloatingForce::MapPartsFloatingForce(LiveActor* pActor) + : MapPartsFunction(pActor, "浮力") { mSpringStep = 0; mObjectName = 0; _20 = 0.0f; @@ -35,25 +36,24 @@ MapPartsFloatingForce::MapPartsFloatingForce(LiveActor *pActor) : MapPartsFuncti _5C = 0.0f; } -void MapPartsFloatingForce::init(const JMapInfoIter &rIter) { +void MapPartsFloatingForce::init(const JMapInfoIter& rIter) { initNerve(&NrvMapPartsFloatingForce::HostTypeWait::sInstance); MR::getMapPartsArgRotateAccelType(&mRotateAccelType, rIter); if (mRotateAccelType != 1) { initForNormalMotion(rIter); - } - else { + } else { initForSpringMotion(rIter); } MR::useStageSwitchReadA(mHost, rIter); } -void MapPartsFloatingForce::setObjectName(const char *pName) { +void MapPartsFloatingForce::setObjectName(const char* pName) { mObjectName = pName; } -void MapPartsFloatingForce::initForNormalMotion(const JMapInfoIter &rIter) { +void MapPartsFloatingForce::initForNormalMotion(const JMapInfoIter& rIter) { s32 condition_type = 0; MR::getMapPartsArgMoveConditionType(&condition_type, rIter); _20 = condition_type; @@ -61,7 +61,7 @@ void MapPartsFloatingForce::initForNormalMotion(const JMapInfoIter &rIter) { MR::getMapPartsArgRotateAngle(&mRotateAngle, rIter); } -void MapPartsFloatingForce::initForSpringMotion(const JMapInfoIter &rIter) { +void MapPartsFloatingForce::initForSpringMotion(const JMapInfoIter& rIter) { s32 condition_type = 0; MR::getMapPartsArgMoveConditionType(&condition_type, rIter); _20 = condition_type; @@ -81,16 +81,13 @@ void MapPartsFloatingForce::updateVelocity() { if (MR::isOnPlayer(MR::getBodySensor(mHost))) { if (_20 <= _48) { _4C = MR::converge(_4C, 0.0f, 0.050000001f); - } - else { + } else { _4C = _4C + (0.000099999997f * mRotateSpeed); } - } - else { + } else { if (_48 <= 0.0f) { _4C = MR::converge(_4C, 0.0f, 0.050000001f); - } - else { + } else { _4C = _4C - (0.000099999997f * mRotateAngle); } } @@ -168,7 +165,6 @@ void MapPartsFloatingForce::exeMoveSpring() { // MapPartsFloatingForce::exeMoveReturn MapPartsFloatingForce::~MapPartsFloatingForce() { - } namespace NrvMapPartsFloatingForce { @@ -177,23 +173,23 @@ namespace NrvMapPartsFloatingForce { INIT_NERVE(HostTypeMoveSpring); INIT_NERVE(HostTypeMoveReturn); - void HostTypeMoveReturn::execute(Spine *pSpine) const { + void HostTypeMoveReturn::execute(Spine* pSpine) const { MapPartsFloatingForce* force = reinterpret_cast(pSpine->mExecutor); force->exeMoveReturn(); } - void HostTypeMoveSpring::execute(Spine *pSpine) const { + void HostTypeMoveSpring::execute(Spine* pSpine) const { MapPartsFloatingForce* force = reinterpret_cast(pSpine->mExecutor); force->exeMoveSpring(); } - void HostTypeMove::execute(Spine *pSpine) const { + void HostTypeMove::execute(Spine* pSpine) const { MapPartsFloatingForce* force = reinterpret_cast(pSpine->mExecutor); force->exeMove(); } - void HostTypeWait::execute(Spine *pSpine) const { + void HostTypeWait::execute(Spine* pSpine) const { MapPartsFloatingForce* force = reinterpret_cast(pSpine->mExecutor); force->exeWait(); } -}; +}; // namespace NrvMapPartsFloatingForce diff --git a/src/Game/MapObj/MapPartsFunction.cpp b/src/Game/MapObj/MapPartsFunction.cpp index 1df036222..ec85f1ded 100644 --- a/src/Game/MapObj/MapPartsFunction.cpp +++ b/src/Game/MapObj/MapPartsFunction.cpp @@ -2,7 +2,8 @@ #include "Game/LiveActor/LiveActor.hpp" #include "Game/LiveActor/Spine.hpp" -MapPartsFunction::MapPartsFunction(LiveActor *pActor, const char *pName) : NameObj(pName != 0 ? pName : "マップパーツ機能") { +MapPartsFunction::MapPartsFunction(LiveActor* pActor, const char* pName) + : NameObj(pName != 0 ? pName : "マップパーツ機能") { mSpine = 0; mHost = pActor; _14 = 1; @@ -20,11 +21,11 @@ void MapPartsFunction::movement() { } } -void MapPartsFunction::initNerve(const Nerve *pNerve) { +void MapPartsFunction::initNerve(const Nerve* pNerve) { mSpine = new Spine(this, pNerve); } -void MapPartsFunction::setNerve(const Nerve *pNerve) { +void MapPartsFunction::setNerve(const Nerve* pNerve) { mSpine->setNerve(pNerve); } @@ -36,7 +37,7 @@ bool MapPartsFunction::isStep(s32 step) const { return step == mSpine->mStep; } -bool MapPartsFunction::isNerve(const Nerve *pNerve) const { +bool MapPartsFunction::isNerve(const Nerve* pNerve) const { return mSpine->getCurrentNerve() == pNerve; } diff --git a/src/Game/MapObj/MapPartsRailGuideDrawer.cpp b/src/Game/MapObj/MapPartsRailGuideDrawer.cpp index 8cce30c02..cea820d5f 100644 --- a/src/Game/MapObj/MapPartsRailGuideDrawer.cpp +++ b/src/Game/MapObj/MapPartsRailGuideDrawer.cpp @@ -9,12 +9,12 @@ void MapPartsRailGuideDrawer::end() { hide(); } -void MapPartsRailGuideDrawer::initGuidePoints(const JMapInfoIter &rIter) { +void MapPartsRailGuideDrawer::initGuidePoints(const JMapInfoIter& rIter) { s32 shadowType = 0; MR::getMapPartsArgShadowType(&shadowType, rIter); bool hasShadow = MR::hasMapPartsShadow(shadowType); - f32 railLength = MR::getRailTotalLength(mHost); - f32 curLen = 0.0f; + f32 railLength = MR::getRailTotalLength(mHost); + f32 curLen = 0.0f; while (curLen < railLength) { MapPartsRailGuidePoint* pnt = new MapPartsRailGuidePoint(mHost, _424, curLen, hasShadow); @@ -37,5 +37,4 @@ void MapPartsRailGuideDrawer::initGuidePoints(const JMapInfoIter &rIter) { } MapPartsRailGuideDrawer::~MapPartsRailGuideDrawer() { - } diff --git a/src/Game/MapObj/MapPartsRailGuideHolder.cpp b/src/Game/MapObj/MapPartsRailGuideHolder.cpp index 97eec881a..7a5a8d37b 100644 --- a/src/Game/MapObj/MapPartsRailGuideHolder.cpp +++ b/src/Game/MapObj/MapPartsRailGuideHolder.cpp @@ -1,15 +1,14 @@ #include "Game/MapObj/MapPartsRailGuideHolder.hpp" MapPartsRailGuideHolder::~MapPartsRailGuideHolder() { - } -MapPartsRailGuideHolder::MapPartsRailGuideHolder() : NameObj("レールガイド保持") { +MapPartsRailGuideHolder::MapPartsRailGuideHolder() + : NameObj("レールガイド保持") { mNumRailGuides = 0; } -void MapPartsRailGuideHolder::init(const JMapInfoIter &) { - +void MapPartsRailGuideHolder::init(const JMapInfoIter&) { } /* diff --git a/src/Game/MapObj/MapPartsRailGuidePoint.cpp b/src/Game/MapObj/MapPartsRailGuidePoint.cpp index 711ef6446..e307fcde5 100644 --- a/src/Game/MapObj/MapPartsRailGuidePoint.cpp +++ b/src/Game/MapObj/MapPartsRailGuidePoint.cpp @@ -1,14 +1,16 @@ #include "Game/MapObj/MapPartsRailGuidePoint.hpp" #include "Game/Util.hpp" -MapPartsRailGuidePoint::MapPartsRailGuidePoint(const LiveActor *pActor, const char *pName, f32 a3, bool a4) : LiveActor("レイル点") { +MapPartsRailGuidePoint::MapPartsRailGuidePoint(const LiveActor* pActor, const char* pName, f32 a3, bool a4) + : LiveActor("レイル点") { _8C = a3; _90 = a4; initModelManagerWithAnm(pName, 0, false); MR::calcRailPosAtCoord(&mPosition, pActor, _8C); } -MapPartsRailGuidePoint::MapPartsRailGuidePoint(const LiveActor *pActor, const char *pName, int a3, bool a4) : LiveActor("レイル点") { +MapPartsRailGuidePoint::MapPartsRailGuidePoint(const LiveActor* pActor, const char* pName, int a3, bool a4) + : LiveActor("レイル点") { _90 = a4; _8C = 0.0f; initModelManagerWithAnm(pName, 0, false); @@ -16,7 +18,7 @@ MapPartsRailGuidePoint::MapPartsRailGuidePoint(const LiveActor *pActor, const ch _8C = MR::getRailPointCoord(pActor, a3); } -void MapPartsRailGuidePoint::init(const JMapInfoIter &rIter) { +void MapPartsRailGuidePoint::init(const JMapInfoIter& rIter) { MR::connectToSceneMapObjNoMovement(this); if (_90) { @@ -29,5 +31,4 @@ void MapPartsRailGuidePoint::init(const JMapInfoIter &rIter) { } MapPartsRailGuidePoint::~MapPartsRailGuidePoint() { - } \ No newline at end of file diff --git a/src/Game/MapObj/MapPartsRailPointPassChecker.cpp b/src/Game/MapObj/MapPartsRailPointPassChecker.cpp index 120de2d36..aef794717 100644 --- a/src/Game/MapObj/MapPartsRailPointPassChecker.cpp +++ b/src/Game/MapObj/MapPartsRailPointPassChecker.cpp @@ -1,7 +1,8 @@ #include "Game/MapObj/MapPartsRailPointPassChecker.hpp" #include "Game/Util.hpp" -MapPartsRailPointPassChecker::MapPartsRailPointPassChecker(LiveActor *pActor) : MapPartsFunction(pActor, "レール点通過チェッカー") { +MapPartsRailPointPassChecker::MapPartsRailPointPassChecker(LiveActor* pActor) + : MapPartsFunction(pActor, "レール点通過チェッカー") { mRailPointNo = -1; } @@ -9,11 +10,10 @@ void MapPartsRailPointPassChecker::movement() { mRailPointNo = MR::getCurrentRailPointNo(mHost); } - void MapPartsRailPointPassChecker::start() { mRailPointNo = MR::getCurrentRailPointNo(mHost); } - + bool MapPartsRailPointPassChecker::isPassed() const { return MR::getCurrentRailPointNo(mHost) != mRailPointNo; } @@ -25,7 +25,7 @@ bool MapPartsRailPointPassChecker::isReachedEnd() const { bool MapPartsRailPointPassChecker::isPassedStartPoint() const { if (MR::getCurrentRailPointNo(mHost) <= 0) { return false; - } + } return MR::getCurrentRailPointNo(mHost) != mRailPointNo; } @@ -40,7 +40,6 @@ bool MapPartsRailPointPassChecker::isPassedEndPoint() const { } MapPartsRailPointPassChecker::~MapPartsRailPointPassChecker() { - } bool MapPartsRailPointPassChecker::isWorking() const { diff --git a/src/Game/MapObj/MapPartsRotator.cpp b/src/Game/MapObj/MapPartsRotator.cpp index 41315543f..685662beb 100644 --- a/src/Game/MapObj/MapPartsRotator.cpp +++ b/src/Game/MapObj/MapPartsRotator.cpp @@ -4,7 +4,8 @@ #ifdef NON_MATCHING // floating reg order on the inlined matrix set, but oh well -MapPartsRotator::MapPartsRotator(LiveActor *pActor) : MapPartsFunction(pActor, "自身回転") { +MapPartsRotator::MapPartsRotator(LiveActor* pActor) + : MapPartsFunction(pActor, "自身回転") { _18 = 0.0f; mRotateAngle = 0.0f; mRotateStopTime = 0; @@ -24,7 +25,7 @@ MapPartsRotator::MapPartsRotator(LiveActor *pActor) : MapPartsFunction(pActor, " } #endif -void MapPartsRotator::init(const JMapInfoIter &rIter) { +void MapPartsRotator::init(const JMapInfoIter& rIter) { MR::getMapPartsArgRotateAngle(&mRotateAngle, rIter); MR::getMapPartsArgRotateAxis(&mRotateAxis, rIter); MR::getMapPartsArgRotateAccelType(&mRotateAccelType, rIter); @@ -32,22 +33,20 @@ void MapPartsRotator::init(const JMapInfoIter &rIter) { MR::getMapPartsArgRotateStopTime(&mRotateStopTime, rIter); MR::getMapPartsArgRotateType(&mRotateType, rIter); MR::getMapPartsArgSignMotionType(&mSignMotionType, rIter); - + if (MR::isNearZero(_18, 0.001f)) { initNerve(&NrvMapPartsRotator::HostTypeNeverMove::sInstance); - } - else { + } else { initNerve(&NrvMapPartsRotator::HostTypeWait::sInstance); } bool cond = 0.0f < _18; - f32 angle; + f32 angle; if (cond) { angle = mRotateAngle; - } - else { - angle = -mRotateAngle; + } else { + angle = -mRotateAngle; } mTargetAngle = angle; @@ -97,20 +96,18 @@ void MapPartsRotator::restartAtEnd() { if (MR::hasMapPartsMoveStartSignMotion(mSignMotionType)) { setNerve(&NrvMapPartsRotator::HostTypeRotateStart::sInstance); - } - else { + } else { setNerve(&NrvMapPartsRotator::HostTypeRotate::sInstance); } } } -void MapPartsRotator::initRotateSpeed(const JMapInfoIter &rIter) { +void MapPartsRotator::initRotateSpeed(const JMapInfoIter& rIter) { if (mRotateAccelType == 2) { s32 rotate_time = 0; MR::getMapPartsArgRotateTime(&rotate_time, rIter); _18 = mRotateAngle / rotate_time; - } - else { + } else { MR::getMapPartsArgRotateSpeed(&mRotateSpeed, rIter); _18 *= 0.0099999998f; } @@ -120,66 +117,63 @@ void MapPartsRotator::initRotateSpeed(const JMapInfoIter &rIter) { } } -void MapPartsRotator::calcRotateAxisDir(AxisType type, TVec3f *pDir) const { +void MapPartsRotator::calcRotateAxisDir(AxisType type, TVec3f* pDir) const { f32 x, y, z; switch (type) { - case 0: - z = _40.mMtx[2][0]; - y = _40.mMtx[1][0]; - x = _40.mMtx[0][0]; - pDir->set(x, y, z); - break; - case 1: - z = _40.mMtx[2][1]; - y = _40.mMtx[1][1]; - x = _40.mMtx[0][1]; - pDir->set(x, y, z); - break; - case 2: - z = _40.mMtx[2][2]; - y = _40.mMtx[1][2]; - x = _40.mMtx[0][2]; - pDir->set(x, y, z); - break; + case 0: + z = _40.mMtx[2][0]; + y = _40.mMtx[1][0]; + x = _40.mMtx[0][0]; + pDir->set(x, y, z); + break; + case 1: + z = _40.mMtx[2][1]; + y = _40.mMtx[1][1]; + x = _40.mMtx[0][1]; + pDir->set(x, y, z); + break; + case 2: + z = _40.mMtx[2][2]; + y = _40.mMtx[1][2]; + x = _40.mMtx[0][2]; + pDir->set(x, y, z); + break; } } MapPartsRotator::~MapPartsRotator() { - } namespace NrvMapPartsRotator { - HostTypeNeverMove HostTypeNeverMove::sInstance; - HostTypeWait HostTypeWait::sInstance; + HostTypeNeverMove HostTypeNeverMove::sInstance; + HostTypeWait HostTypeWait::sInstance; HostTypeRotateStart HostTypeRotateStart::sInstance; - HostTypeRotate HostTypeRotate::sInstance; - HostTypeStopAtEnd HostTypeStopAtEnd::sInstance; + HostTypeRotate HostTypeRotate::sInstance; + HostTypeStopAtEnd HostTypeStopAtEnd::sInstance; - void HostTypeStopAtEnd::execute(Spine *pSpine) const { + void HostTypeStopAtEnd::execute(Spine* pSpine) const { MapPartsRotator* rotator = reinterpret_cast(pSpine->mExecutor); if (rotator->isStep(rotator->mRotateStopTime)) { rotator->restartAtEnd(); } } - void HostTypeRotate::execute(Spine *pSpine) const { + void HostTypeRotate::execute(Spine* pSpine) const { MapPartsRotator* rotator = reinterpret_cast(pSpine->mExecutor); rotator->exeRotate(); } - void HostTypeRotateStart::execute(Spine *pSpine) const { + void HostTypeRotateStart::execute(Spine* pSpine) const { MapPartsRotator* rotator = reinterpret_cast(pSpine->mExecutor); rotator->exeRotateStart(); } - void HostTypeWait::execute(Spine *pSpine) const { - + void HostTypeWait::execute(Spine* pSpine) const { } - void HostTypeNeverMove::execute(Spine *pSpine) const { - + void HostTypeNeverMove::execute(Spine* pSpine) const { } -}; +}; // namespace NrvMapPartsRotator bool MapPartsRotator::isOnReverse() const { return mIsOnReverse; diff --git a/src/Game/MapObj/MarblePlanet.cpp b/src/Game/MapObj/MarblePlanet.cpp index f5422d436..b594acb55 100644 --- a/src/Game/MapObj/MarblePlanet.cpp +++ b/src/Game/MapObj/MarblePlanet.cpp @@ -3,7 +3,8 @@ #include "Game/MapObj/MarblePlanet.hpp" #include "JSystem/JMath.hpp" -MarblePlanet::MarblePlanet(const char *pName) : LiveActor(pName) { +MarblePlanet::MarblePlanet(const char* pName) + : LiveActor(pName) { mCorePlanetModel = 0; mPlanetElectrons = 0; mWatermelonCollision = 0; @@ -11,7 +12,7 @@ MarblePlanet::MarblePlanet(const char *pName) : LiveActor(pName) { mRemainingElectrons = 3; } -void MarblePlanet::init(const JMapInfoIter &rIter) { +void MarblePlanet::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("MarblePlanet", 0, false); MR::connectToScenePlanet(this); @@ -38,41 +39,40 @@ void MarblePlanet::exeScaleUpCore() { MR::shakeCameraNormal(); mRemainingElectrons = mRemainingElectrons - 1; switch (mRemainingElectrons) { - case 0: - MR::emitEffect(this, "Break"); - MR::startSound(this, "SE_OJ_MARBLE_HIT_CORE_3", -1, -1); - MR::startSystemSE("SE_SY_MARBLE_HIT_CORE_3", -1, -1); - break; - case 1: - MR::emitEffect(this, "Smoke6f"); - MR::startSound(this, "SE_OJ_MARBLE_HIT_CORE_2", -1, -1); - MR::startSystemSE("SE_SY_MARBLE_HIT_CORE_2", -1, -1); - break; - case 2: - default: - MR::emitEffect(this, "Smoke3f"); - MR::startSound(this, "SE_OJ_MARBLE_HIT_CORE_1", -1, -1); - MR::startSystemSE("SE_SY_MARBLE_HIT_CORE_1", -1, -1); - break; + case 0: + MR::emitEffect(this, "Break"); + MR::startSound(this, "SE_OJ_MARBLE_HIT_CORE_3", -1, -1); + MR::startSystemSE("SE_SY_MARBLE_HIT_CORE_3", -1, -1); + break; + case 1: + MR::emitEffect(this, "Smoke6f"); + MR::startSound(this, "SE_OJ_MARBLE_HIT_CORE_2", -1, -1); + MR::startSystemSE("SE_SY_MARBLE_HIT_CORE_2", -1, -1); + break; + case 2: + default: + MR::emitEffect(this, "Smoke3f"); + MR::startSound(this, "SE_OJ_MARBLE_HIT_CORE_1", -1, -1); + MR::startSystemSE("SE_SY_MARBLE_HIT_CORE_1", -1, -1); + break; } if (mRemainingElectrons <= 0) { setNerve(&NrvMarblePlanet::MarblePlanetNrvBreakCore::sInstance); return; - } - else { + } else { s32 electronCount = mNumElectrons; f32 frameMax = MR::getBckFrameMax(mCorePlanetModel); f32 frame = ((electronCount - mRemainingElectrons) * frameMax) / electronCount; MR::setBckFrameAndStop(mCorePlanetModel, frame); MR::setBtkFrameAndStop(mCorePlanetModel, frame); - } + } } f32 nerveRate = MR::calcNerveRate(this, 0x1E); f32 scale = MR::getScaleWithReactionValueZeroToOne(nerveRate, 0.5f, -0.5f); mCorePlanetModel->mScale.setAll(MR::getLinerValue(scale, 1.3f, 1.0f, 1.0f)); - + if (MR::isStep(this, 0x1E)) { setNerve(&NrvMarblePlanet::MarblePlanetNrvWait::sInstance); } @@ -122,7 +122,7 @@ void MarblePlanet::kill() { LiveActor::kill(); } -bool MarblePlanet::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool MarblePlanet::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (isNerve(&NrvMarblePlanet::MarblePlanetNrvScaleUpCore::sInstance)) { return false; } @@ -146,30 +146,31 @@ void MarblePlanet::initCoreAndElectron() { TVec3f front; MR::calcFrontVec(&front, this); - + TVec3f* pos; - int i = 0; + int i = 0; if (mNumElectrons > 0) { pos = &mPosition; for (; i < mNumElectrons; i++) { - if (i != 0) { - TVec3f up; - MR::calcUpVec(&up, this); - MR::rotateVecDegree(&front, up, (360.0f / mNumElectrons)); - } - - TVec3f position; - JMAVECScaleAdd(&front, pos, &position, 1000.0f); - TVec3f rotation; - rotation.setAll((360.0f * i) / mNumElectrons); - mPlanetElectrons[i] = new MarblePlanetElectron(this, position, rotation, "ビー玉惑星電子"); - mPlanetElectrons[i]->initWithoutIter(); + if (i != 0) { + TVec3f up; + MR::calcUpVec(&up, this); + MR::rotateVecDegree(&front, up, (360.0f / mNumElectrons)); } + + TVec3f position; + JMAVECScaleAdd(&front, pos, &position, 1000.0f); + TVec3f rotation; + rotation.setAll((360.0f * i) / mNumElectrons); + mPlanetElectrons[i] = new MarblePlanetElectron(this, position, rotation, "ビー玉惑星電子"); + mPlanetElectrons[i]->initWithoutIter(); + } } } -MarblePlanetElectron::MarblePlanetElectron(LiveActor *pPlanet, const TVec3f &rPosition, const TVec3f &rRotation, const char *pName) : LiveActor(pName) { +MarblePlanetElectron::MarblePlanetElectron(LiveActor* pPlanet, const TVec3f& rPosition, const TVec3f& rRotation, const char* pName) + : LiveActor(pName) { mParentPlanet = static_cast(pPlanet); mElectronShadow = 0; _94.x = 0.0f; @@ -179,7 +180,7 @@ MarblePlanetElectron::MarblePlanetElectron(LiveActor *pPlanet, const TVec3f &rPo mRotation.set(rRotation); } -void MarblePlanetElectron::init(const JMapInfoIter &rIter) { +void MarblePlanetElectron::init(const JMapInfoIter& rIter) { initModelManagerWithAnm("MarblePlanetElectron", 0, false); MR::connectToScenePlanet(this); initHitSensor(1); @@ -234,13 +235,12 @@ void MarblePlanetElectron::control() { } } -void MarblePlanetElectron::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void MarblePlanetElectron::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorEnemy(pReceiver)) { if (MR::sendMsgEnemyAttack(pReceiver, pSender)) { mElectronShadow->kill(); kill(); - } - else { + } else { bool isNear = !MR::isNear(this, pReceiver->mHost->mPosition, 440.0f); if (!isNear) { @@ -258,7 +258,7 @@ void MarblePlanetElectron::attackSensor(HitSensor *pSender, HitSensor *pReceiver } } -bool MarblePlanetElectron::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool MarblePlanetElectron::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (isNerve(&NrvMarblePlanetElectron::MarblePlanetElectronNrvAttack::sInstance)) { return false; } @@ -271,7 +271,7 @@ bool MarblePlanetElectron::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, H return false; } -bool MarblePlanetElectron::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { +bool MarblePlanetElectron::receiveMsgPush(HitSensor* pSender, HitSensor* pReceiver) { if (!MR::isSensorEnemy(pSender)) { return false; } @@ -295,12 +295,13 @@ void MarblePlanetElectron::crashElectron(HitSensor *pSensor) { } */ -MarblePlanetElectronShadow::MarblePlanetElectronShadow(LiveActor *pElectronPtr, const TVec3f &rVec, const char *pName) : LiveActor(pName) { +MarblePlanetElectronShadow::MarblePlanetElectronShadow(LiveActor* pElectronPtr, const TVec3f& rVec, const char* pName) + : LiveActor(pName) { mParentElectron = static_cast(pElectronPtr); _90 = &rVec; } -void MarblePlanetElectronShadow::init(const JMapInfoIter &rIter) { +void MarblePlanetElectronShadow::init(const JMapInfoIter& rIter) { initModelManagerWithAnm("MarblePlanetElectronShadow", 0, false); MR::connectToScenePlanet(this); MR::invalidateClipping(this); @@ -320,50 +321,46 @@ void MarblePlanetElectronShadow::calcAndSetBaseMtx() { */ MarblePlanet::~MarblePlanet() { - } MarblePlanetElectron::~MarblePlanetElectron() { - } MarblePlanetElectronShadow::~MarblePlanetElectronShadow() { - } namespace NrvMarblePlanet { INIT_NERVE(MarblePlanetNrvWait); INIT_NERVE(MarblePlanetNrvScaleUpCore); INIT_NERVE(MarblePlanetNrvBreakCore); -}; +}; // namespace NrvMarblePlanet namespace NrvMarblePlanetElectron { INIT_NERVE(MarblePlanetElectronNrvMove); INIT_NERVE(MarblePlanetElectronNrvAttack); - void MarblePlanetElectronNrvAttack::execute(Spine *pSpine) const { + void MarblePlanetElectronNrvAttack::execute(Spine* pSpine) const { MarblePlanetElectron* electron = reinterpret_cast(pSpine->mExecutor); electron->exeAttack(); } - void MarblePlanetElectronNrvMove::execute(Spine *pSpine) const { + void MarblePlanetElectronNrvMove::execute(Spine* pSpine) const { MarblePlanetElectron* electron = reinterpret_cast(pSpine->mExecutor); electron->exeMove(); } -}; +}; // namespace NrvMarblePlanetElectron namespace NrvMarblePlanet { - void MarblePlanetNrvBreakCore::execute(Spine *pSpine) const { + void MarblePlanetNrvBreakCore::execute(Spine* pSpine) const { MarblePlanet* marble = reinterpret_cast(pSpine->mExecutor); marble->exeBreakCore(); } - void MarblePlanetNrvScaleUpCore::execute(Spine *pSpine) const { + void MarblePlanetNrvScaleUpCore::execute(Spine* pSpine) const { MarblePlanet* marble = reinterpret_cast(pSpine->mExecutor); marble->exeScaleUpCore(); } - void MarblePlanetNrvWait::execute(Spine *pSpine) const { - + void MarblePlanetNrvWait::execute(Spine* pSpine) const { } -}; +}; // namespace NrvMarblePlanet diff --git a/src/Game/MapObj/MarioLauncherAttractor.cpp b/src/Game/MapObj/MarioLauncherAttractor.cpp index bac6b0096..42f6833b7 100644 --- a/src/Game/MapObj/MarioLauncherAttractor.cpp +++ b/src/Game/MapObj/MarioLauncherAttractor.cpp @@ -1,45 +1,45 @@ #include "Game/MapObj/MarioLauncherAttractor.hpp" #include "Game/Util.hpp" -MarioLauncherAttractor::MarioLauncherAttractor(const char *pName) : LiveActor(pName) { - mGravityCreator = nullptr; +MarioLauncherAttractor::MarioLauncherAttractor(const char* pName) + : LiveActor(pName) { + mGravityCreator = nullptr; } -void MarioLauncherAttractor::init(const JMapInfoIter &rIter) { - MR::initDefaultPos(this, rIter); - initModelManagerWithAnm("MarioLauncherAttractor", nullptr, nullptr); +void MarioLauncherAttractor::init(const JMapInfoIter& rIter) { + MR::initDefaultPos(this, rIter); + initModelManagerWithAnm("MarioLauncherAttractor", nullptr, nullptr); - // Create and initialize gravity - mGravityCreator = new PointGravityCreator(); - mGravityCreator->createFromJMap(rIter); - PlanetGravity* pGravity = mGravityCreator->getGravity(); - pGravity->mGravityType = GRAVITY_TYPE_MARIO_LAUNCHER; + // Create and initialize gravity + mGravityCreator = new PointGravityCreator(); + mGravityCreator->createFromJMap(rIter); + PlanetGravity* pGravity = mGravityCreator->getGravity(); + pGravity->mGravityType = GRAVITY_TYPE_MARIO_LAUNCHER; - // Set clipping & scale - f32 clipping = pGravity->mRange / 1000.0f; - MR::setClippingTypeSphere(this, pGravity->mRange); - MR::setClippingFar200m(this); + // Set clipping & scale + f32 clipping = pGravity->mRange / 1000.0f; + MR::setClippingTypeSphere(this, pGravity->mRange); + MR::setClippingFar200m(this); - TVec3f _8; // unused - _8.x = clipping; - _8.y = clipping; - _8.z = clipping; - mScale.x = clipping; - mScale.y = clipping; - mScale.z = clipping; + TVec3f _8; // unused + _8.x = clipping; + _8.y = clipping; + _8.z = clipping; + mScale.x = clipping; + mScale.y = clipping; + mScale.z = clipping; - // Connect to executor, init nerve and start animation - MR::connectToSceneMapObj(this); - initNerve(&NrvMarioLauncherAttractor::MarioLauncherAttractorNrvWait::sInstance); - MR::startBtk(this, "MarioLauncherAttractor"); + // Connect to executor, init nerve and start animation + MR::connectToSceneMapObj(this); + initNerve(&NrvMarioLauncherAttractor::MarioLauncherAttractorNrvWait::sInstance); + MR::startBtk(this, "MarioLauncherAttractor"); - makeActorAppeared(); + makeActorAppeared(); } namespace NrvMarioLauncherAttractor { - void MarioLauncherAttractorNrvWait::execute(Spine *pSpine) const { + void MarioLauncherAttractorNrvWait::execute(Spine* pSpine) const { + } - } - - MarioLauncherAttractorNrvWait(MarioLauncherAttractorNrvWait::sInstance); -}; + MarioLauncherAttractorNrvWait(MarioLauncherAttractorNrvWait::sInstance); +}; // namespace NrvMarioLauncherAttractor diff --git a/src/Game/MapObj/MechaKoopaPartsArm.cpp b/src/Game/MapObj/MechaKoopaPartsArm.cpp index b3c8bab22..f84f1eda8 100644 --- a/src/Game/MapObj/MechaKoopaPartsArm.cpp +++ b/src/Game/MapObj/MechaKoopaPartsArm.cpp @@ -1,11 +1,12 @@ #include "Game/MapObj/MechaKoopaPartsArm.hpp" #include "Game/Util.hpp" -MechaKoopaPartsArm::MechaKoopaPartsArm(const char *pName) : MapObjActor(pName) { +MechaKoopaPartsArm::MechaKoopaPartsArm(const char* pName) + : MapObjActor(pName) { mIsRightArm = false; } -void MechaKoopaPartsArm::init(const JMapInfoIter &rIter) { +void MechaKoopaPartsArm::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); mIsRightArm = isObjectName("MechaKoopaPartsArmRight"); MapObjActorInitInfo info; @@ -30,8 +31,7 @@ void MechaKoopaPartsArm::exeWait() { if (MapObjActorUtil::isRotatorMoving(this)) { if (isNerve(&NrvMechaKoopaPartsArm::MechaKoopaPartsArmNrvWaitFront::sInstance)) { setNerve(&NrvMechaKoopaPartsArm::MechaKoopaPartsArmNrvMoveStartRear::sInstance); - } - else { + } else { setNerve(&NrvMechaKoopaPartsArm::MechaKoopaPartsArmNrvMoveStartFront::sInstance); } } @@ -43,8 +43,7 @@ void MechaKoopaPartsArm::exeMoveStart() { if (isNerve(&NrvMechaKoopaPartsArm::MechaKoopaPartsArmNrvMoveStartFront::sInstance)) { MR::startBck(this, "Front", nullptr); - } - else { + } else { MR::startBck(this, "Rear", nullptr); } @@ -58,8 +57,7 @@ void MechaKoopaPartsArm::exeMoveStart() { if (MR::isBckStopped(this)) { if (isNerve(&NrvMechaKoopaPartsArm::MechaKoopaPartsArmNrvMoveStartFront::sInstance)) { setNerve(&NrvMechaKoopaPartsArm::MechaKoopaPartsArmNrvMoveFront::sInstance); - } - else { + } else { setNerve(&NrvMechaKoopaPartsArm::MechaKoopaPartsArmNrvMoveRear::sInstance); } } @@ -73,8 +71,7 @@ void MechaKoopaPartsArm::exeMove() { if (isNerve(&NrvMechaKoopaPartsArm::MechaKoopaPartsArmNrvMoveFront::sInstance)) { setNerve(&NrvMechaKoopaPartsArm::MechaKoopaPartsArmNrvWaitFront::sInstance); - } - else { + } else { setNerve(&NrvMechaKoopaPartsArm::MechaKoopaPartsArmNrvWaitRear::sInstance); } } @@ -106,15 +103,14 @@ void MechaKoopaPartsArm::exeBreak() { } } -void MechaKoopaPartsArm::initCaseUseSwitchB(const MapObjActorInitInfo &rInfo) { +void MechaKoopaPartsArm::initCaseUseSwitchB(const MapObjActorInitInfo& rInfo) { if (mIsRightArm) { - MR::FunctorV0M breakFunc = MR::Functor(this, &MechaKoopaPartsArm::startBreak); + MR::FunctorV0M breakFunc = MR::Functor(this, &MechaKoopaPartsArm::startBreak); MR::listenStageSwitchOnB(this, breakFunc); } } -void MechaKoopaPartsArm::initCaseNoUseSwitchB(const MapObjActorInitInfo &) { - +void MechaKoopaPartsArm::initCaseNoUseSwitchB(const MapObjActorInitInfo&) { } void MechaKoopaPartsArm::startBreak() { @@ -131,57 +127,56 @@ namespace NrvMechaKoopaPartsArm { INIT_NERVE(MechaKoopaPartsArmNrvBreakStart); INIT_NERVE(MechaKoopaPartsArmNrvBreak); - void MechaKoopaPartsArmNrvBreak::execute(Spine *pSpine) const { + void MechaKoopaPartsArmNrvBreak::execute(Spine* pSpine) const { MechaKoopaPartsArm* arm = reinterpret_cast(pSpine->mExecutor); arm->exeBreak(); } - void MechaKoopaPartsArmNrvBreakStart::execute(Spine *pSpine) const { + void MechaKoopaPartsArmNrvBreakStart::execute(Spine* pSpine) const { MechaKoopaPartsArm* arm = reinterpret_cast(pSpine->mExecutor); arm->exeBreakStart(); } - void MechaKoopaPartsArmNrvMoveRear::execute(Spine *pSpine) const { + void MechaKoopaPartsArmNrvMoveRear::execute(Spine* pSpine) const { MechaKoopaPartsArm* arm = reinterpret_cast(pSpine->mExecutor); arm->exeMove(); } - void MechaKoopaPartsArmNrvMoveFront::execute(Spine *pSpine) const { + void MechaKoopaPartsArmNrvMoveFront::execute(Spine* pSpine) const { MechaKoopaPartsArm* arm = reinterpret_cast(pSpine->mExecutor); arm->exeMove(); } - void MechaKoopaPartsArmNrvMoveStartRear::executeOnEnd(Spine *pSpine) const { + void MechaKoopaPartsArmNrvMoveStartRear::executeOnEnd(Spine* pSpine) const { MechaKoopaPartsArm* arm = reinterpret_cast(pSpine->mExecutor); MapObjActorUtil::resumeAllMapPartsFunctions(arm); } - void MechaKoopaPartsArmNrvMoveStartRear::execute(Spine *pSpine) const { + void MechaKoopaPartsArmNrvMoveStartRear::execute(Spine* pSpine) const { MechaKoopaPartsArm* arm = reinterpret_cast(pSpine->mExecutor); arm->exeMoveStart(); } - void MechaKoopaPartsArmNrvMoveStartFront::executeOnEnd(Spine *pSpine) const { + void MechaKoopaPartsArmNrvMoveStartFront::executeOnEnd(Spine* pSpine) const { MechaKoopaPartsArm* arm = reinterpret_cast(pSpine->mExecutor); MapObjActorUtil::resumeAllMapPartsFunctions(arm); } - void MechaKoopaPartsArmNrvMoveStartFront::execute(Spine *pSpine) const { + void MechaKoopaPartsArmNrvMoveStartFront::execute(Spine* pSpine) const { MechaKoopaPartsArm* arm = reinterpret_cast(pSpine->mExecutor); arm->exeMoveStart(); } - void MechaKoopaPartsArmNrvWaitRear::execute(Spine *pSpine) const { + void MechaKoopaPartsArmNrvWaitRear::execute(Spine* pSpine) const { MechaKoopaPartsArm* arm = reinterpret_cast(pSpine->mExecutor); arm->exeWait(); } - void MechaKoopaPartsArmNrvWaitFront::execute(Spine *pSpine) const { + void MechaKoopaPartsArmNrvWaitFront::execute(Spine* pSpine) const { MechaKoopaPartsArm* arm = reinterpret_cast(pSpine->mExecutor); arm->exeWait(); } -}; +}; // namespace NrvMechaKoopaPartsArm MechaKoopaPartsArm::~MechaKoopaPartsArm() { - } \ No newline at end of file diff --git a/src/Game/MapObj/MechaKoopaPartsHead.cpp b/src/Game/MapObj/MechaKoopaPartsHead.cpp index 6661c3247..f6a391b0d 100644 --- a/src/Game/MapObj/MechaKoopaPartsHead.cpp +++ b/src/Game/MapObj/MechaKoopaPartsHead.cpp @@ -1,10 +1,10 @@ #include "Game/MapObj/MechaKoopaPartsHead.hpp" -MechaKoopaPartsHead::MechaKoopaPartsHead(const char *pName) : MapObjActor(pName) { - +MechaKoopaPartsHead::MechaKoopaPartsHead(const char* pName) + : MapObjActor(pName) { } -void MechaKoopaPartsHead::init(const JMapInfoIter &rIter) { +void MechaKoopaPartsHead::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo initInfo; initInfo.setupHioNode("地形オブジェ"); @@ -47,7 +47,7 @@ void MechaKoopaPartsHead::exeDemoBreak() { MR::emitEffect(this, "Explosion"); MR::startSound(this, "SE_BM_MECHA_KOOPA_BREAK_FIRE_ST", -1, -1); } - + if (MR::isGreaterStep(this, 300)) { MR::startLevelSound(this, "SE_BM_LV_MECHA_KOOPA_BREAK_FIRE", -1, -1, -1); } @@ -70,7 +70,7 @@ void MechaKoopaPartsHead::exeDemoWhiteWait() { if (MR::isValidSwitchA(this)) { MR::offSwitchA(this); } - + MR::setPlayerPos("爆破デモ後マリオ"); MR::setPlayerStateWait(); } @@ -98,7 +98,6 @@ void MechaKoopaPartsHead::exeDemoAppearStar() { } MechaKoopaPartsHead::~MechaKoopaPartsHead() { - } namespace NrvMechaKoopaPartsHead { @@ -109,48 +108,43 @@ namespace NrvMechaKoopaPartsHead { INIT_NERVE(MechaKoopaPartsHeadNrvDemoWhiteFadeIn); INIT_NERVE(MechaKoopaPartsHeadNrvDemoAppearStar); - void MechaKoopaPartsHeadNrvDemoAppearStar::execute(Spine *pSpine) const { + void MechaKoopaPartsHeadNrvDemoAppearStar::execute(Spine* pSpine) const { MechaKoopaPartsHead* head = reinterpret_cast(pSpine->mExecutor); head->exeDemoAppearStar(); } - void MechaKoopaPartsHeadNrvDemoWhiteFadeIn::execute(Spine *pSpine) const { + void MechaKoopaPartsHeadNrvDemoWhiteFadeIn::execute(Spine* pSpine) const { MechaKoopaPartsHead* head = reinterpret_cast(pSpine->mExecutor); head->exeDemoWhiteFadeIn(); } - void MechaKoopaPartsHeadNrvDemoWhiteWait::execute(Spine *pSpine) const { + void MechaKoopaPartsHeadNrvDemoWhiteWait::execute(Spine* pSpine) const { MechaKoopaPartsHead* head = reinterpret_cast(pSpine->mExecutor); head->exeDemoWhiteWait(); } - void MechaKoopaPartsHeadNrvDemoWhiteFadeOut::execute(Spine *pSpine) const { + void MechaKoopaPartsHeadNrvDemoWhiteFadeOut::execute(Spine* pSpine) const { MechaKoopaPartsHead* head = reinterpret_cast(pSpine->mExecutor); head->exeDemoWhiteFadeOut(); } - void MechaKoopaPartsHeadNrvDemoBreak::execute(Spine *pSpine) const { + void MechaKoopaPartsHeadNrvDemoBreak::execute(Spine* pSpine) const { MechaKoopaPartsHead* head = reinterpret_cast(pSpine->mExecutor); head->exeDemoBreak(); } - void MechaKoopaPartsHeadNrvWait::execute(Spine *pSpine) const { - + void MechaKoopaPartsHeadNrvWait::execute(Spine* pSpine) const { } -}; - -void MechaKoopaPartsHead::initCaseNoUseSwitchB(const MapObjActorInitInfo &) { +}; // namespace NrvMechaKoopaPartsHead +void MechaKoopaPartsHead::initCaseNoUseSwitchB(const MapObjActorInitInfo&) { } -void MechaKoopaPartsHead::initCaseUseSwitchB(const MapObjActorInitInfo &) { - +void MechaKoopaPartsHead::initCaseUseSwitchB(const MapObjActorInitInfo&) { } -void MechaKoopaPartsHead::initCaseNoUseSwitchA(const MapObjActorInitInfo &) { - +void MechaKoopaPartsHead::initCaseNoUseSwitchA(const MapObjActorInitInfo&) { } -void MechaKoopaPartsHead::initCaseUseSwitchA(const MapObjActorInitInfo &) { - +void MechaKoopaPartsHead::initCaseUseSwitchA(const MapObjActorInitInfo&) { } \ No newline at end of file diff --git a/src/Game/MapObj/MercatorFixParts.cpp b/src/Game/MapObj/MercatorFixParts.cpp index faa212b76..365c7fe53 100644 --- a/src/Game/MapObj/MercatorFixParts.cpp +++ b/src/Game/MapObj/MercatorFixParts.cpp @@ -1,19 +1,19 @@ #include "Game/MapObj/MercatorFixParts.hpp" #include "Game/AreaObj/MercatorTransformCube.hpp" -MercatorFixParts::MercatorFixParts(const char *pName) : LiveActor(pName) { +MercatorFixParts::MercatorFixParts(const char* pName) + : LiveActor(pName) { mAppearController = nullptr; } -bool MercatorFixParts::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool MercatorFixParts::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return mAppearController->receiveMsg(msg); } MercatorFixParts::~MercatorFixParts() { - } -void MercatorFixParts::init(const JMapInfoIter &rIter) { +void MercatorFixParts::init(const JMapInfoIter& rIter) { char name[0x100]; MR::getMapPartsObjectName(name, sizeof(name), rIter); MR::initDefaultPosForMercator(this, rIter, false); @@ -33,8 +33,7 @@ void MercatorFixParts::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchReadAppear(this, rIter)) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { makeActorAppeared(); } diff --git a/src/Game/MapObj/MercatorRailMoveParts.cpp b/src/Game/MapObj/MercatorRailMoveParts.cpp index f473cb074..ff8342408 100644 --- a/src/Game/MapObj/MercatorRailMoveParts.cpp +++ b/src/Game/MapObj/MercatorRailMoveParts.cpp @@ -3,7 +3,8 @@ #include "Game/MapObj/MapPartsRailRotator.hpp" #include "Game/AreaObj/MercatorTransformCube.hpp" -MercatorRailMoveParts::MercatorRailMoveParts(const char *pName) : LiveActor(pName) { +MercatorRailMoveParts::MercatorRailMoveParts(const char* pName) + : LiveActor(pName) { mRailMover = nullptr; mRailRotator = nullptr; mAppearController = nullptr; @@ -19,13 +20,13 @@ void MercatorRailMoveParts::initAfterPlacement() { TPos3f rotate; MR::convertMercatorPlaneToSphereTransAndRotate(&trans, &rotate, mLocalTrans, false); mPosition.set(trans); - + if (MR::isValidSwitchB(this)) { mIsNotMoving = true; } } -bool MercatorRailMoveParts::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool MercatorRailMoveParts::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (mAppearController->receiveMsg(msg)) { return true; } @@ -63,8 +64,7 @@ void MercatorRailMoveParts::calcAndSetBaseMtx() { if (mRailRotator->isWorking()) { baseMtx.concat(mRailRotator->_5C, baseMtx); - } - else { + } else { baseMtx.set(mRotateMtx); } @@ -87,7 +87,7 @@ void MercatorRailMoveParts::updatePose() { mRotateMtx.set(mtx); } -void MercatorRailMoveParts::init(const JMapInfoIter &rIter) { +void MercatorRailMoveParts::init(const JMapInfoIter& rIter) { char objName[0x100]; MR::getMapPartsObjectName(objName, sizeof(objName), rIter); MR::initDefaultPosForMercator(this, rIter, false); @@ -125,8 +125,7 @@ void MercatorRailMoveParts::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchReadAppear(this, rIter)) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { makeActorAppeared(); } @@ -136,5 +135,4 @@ void MercatorRailMoveParts::init(const JMapInfoIter &rIter) { } MercatorRailMoveParts::~MercatorRailMoveParts() { - } diff --git a/src/Game/MapObj/MercatorRotateParts.cpp b/src/Game/MapObj/MercatorRotateParts.cpp index c5dc9c5b5..66f2d151e 100644 --- a/src/Game/MapObj/MercatorRotateParts.cpp +++ b/src/Game/MapObj/MercatorRotateParts.cpp @@ -1,7 +1,8 @@ #include "Game/MapObj/MercatorRotateParts.hpp" #include "Game/AreaObj/MercatorTransformCube.hpp" -MercatorRotateParts::MercatorRotateParts(const char *pName) : LiveActor(pName) { +MercatorRotateParts::MercatorRotateParts(const char* pName) + : LiveActor(pName) { mRotator = nullptr; mAppearController = nullptr; } @@ -16,19 +17,19 @@ void MercatorRotateParts::initAfterPlacement() { mAppearController->storeCurrentPosture(); } -bool MercatorRotateParts::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool MercatorRotateParts::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return mAppearController->receiveMsg(msg); } void MercatorRotateParts::control() { mRotator->movement(); -} +} void MercatorRotateParts::calcAndSetBaseMtx() { - TVec3f trans; - TPos3f rotate; + TVec3f trans; + TPos3f rotate; TMtx34f mtx; - TPos3f baseMtx; + TPos3f baseMtx; baseMtx.identity(); MR::makeMtxRotate(mtx.toMtxPtr(), mLocalRotate.x, mLocalRotate.y, mLocalRotate.z); baseMtx.concat(mRotator->getRotateMtx(), mtx); @@ -40,7 +41,7 @@ void MercatorRotateParts::calcAndSetBaseMtx() { MR::setBaseTRMtx(this, baseMtx); } -void MercatorRotateParts::init(const JMapInfoIter &rIter) { +void MercatorRotateParts::init(const JMapInfoIter& rIter) { char objName[0x100]; MR::getMapPartsObjectName(objName, sizeof(objName), rIter); MR::initDefaultPos(this, rIter); @@ -61,8 +62,7 @@ void MercatorRotateParts::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchReadAppear(this, rIter)) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { makeActorAppeared(); } @@ -70,5 +70,4 @@ void MercatorRotateParts::init(const JMapInfoIter &rIter) { } MercatorRotateParts::~MercatorRotateParts() { - } diff --git a/src/Game/MapObj/MeteoContainer.cpp b/src/Game/MapObj/MeteoContainer.cpp index e2cde225e..960148feb 100644 --- a/src/Game/MapObj/MeteoContainer.cpp +++ b/src/Game/MapObj/MeteoContainer.cpp @@ -1,11 +1,11 @@ #include "Game/LiveActor/HitSensor.hpp" #include "Game/MapObj/MeteoContainer.hpp" -MeteoContainer::MeteoContainer(const char *pName) : LiveActor(pName) { - +MeteoContainer::MeteoContainer(const char* pName) + : LiveActor(pName) { } -void MeteoContainer::init(const JMapInfoIter &rIter) { +void MeteoContainer::init(const JMapInfoIter& rIter) { const char* objName = nullptr; if (!MR::getObjectName(&objName, rIter)) { @@ -46,23 +46,20 @@ void MeteoContainer::kill() { } void MeteoContainer::control() { - } -void MeteoContainer::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void MeteoContainer::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver)) { pReceiver->receiveMessage(41, pSender); } } -bool MeteoContainer::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { +bool MeteoContainer::receiveMsgPush(HitSensor* pSender, HitSensor* pReceiver) { return MR::isSensorPlayer(pSender); } -bool MeteoContainer::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - if (msg == ACTMES_TORNADO_ATTACK - && isNerve(&NrvMeteoContainer::MeteoContainerNrvWait::sInstance)) - { +bool MeteoContainer::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + if (msg == ACTMES_TORNADO_ATTACK && isNerve(&NrvMeteoContainer::MeteoContainerNrvWait::sInstance)) { setNerve(&NrvMeteoContainer::MeteoContainerNrvDestroy::sInstance); return true; @@ -82,12 +79,10 @@ void MeteoContainer::exeDestroy() { } } - MeteoContainer::~MeteoContainer() { - } namespace NrvMeteoContainer { INIT_NERVE(MeteoContainerNrvWait); INIT_NERVE(MeteoContainerNrvDestroy); -}; +}; // namespace NrvMeteoContainer diff --git a/src/Game/MapObj/MiniatureGalaxy.cpp b/src/Game/MapObj/MiniatureGalaxy.cpp index c1f2eb8ea..d71fe3db2 100644 --- a/src/Game/MapObj/MiniatureGalaxy.cpp +++ b/src/Game/MapObj/MiniatureGalaxy.cpp @@ -1,6 +1,6 @@ #include "Game/MapObj/MiniatureGalaxy.hpp" #include "Game/LiveActor/LiveActor.hpp" -MiniatureGalaxy::MiniatureGalaxy(const char* pName) : LiveActor(pName) { - +MiniatureGalaxy::MiniatureGalaxy(const char* pName) + : LiveActor(pName) { } diff --git a/src/Game/MapObj/NeedlePlant.cpp b/src/Game/MapObj/NeedlePlant.cpp index ca5e78fae..06fd99e26 100644 --- a/src/Game/MapObj/NeedlePlant.cpp +++ b/src/Game/MapObj/NeedlePlant.cpp @@ -17,13 +17,14 @@ namespace NrvNeedlePlant { NEW_NERVE(NeedlePlantNrvWait, NeedlePlant, Wait); NEW_NERVE(NeedlePlantNrvShake, NeedlePlant, Shake); -}; +}; // namespace NrvNeedlePlant -NeedlePlant::NeedlePlant(const char *pName) : MapObjActor(pName) { - _C4 = -1; +NeedlePlant::NeedlePlant(const char* pName) + : MapObjActor(pName) { + _C4 = -1; } -void NeedlePlant::init(const JMapInfoIter &rIter) { +void NeedlePlant::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; info.setupHioNode("地形オブジェ"); @@ -57,7 +58,7 @@ void NeedlePlant::exeShake() { MR::startBck(this, "Shake", nullptr); MR::startSound(this, "SE_OJ_LEAVES_SWING", -1, -1); } - + if (MR::isBckStopped(this)) { setNerve(&NrvNeedlePlant::NeedlePlantNrvWait::sInstance); } @@ -76,7 +77,7 @@ void NeedlePlant::kill() { MapObjActor::kill(); } -void NeedlePlant::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void NeedlePlant::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { // TODO: Possible inline. https://decomp.me/scratch/zwlUm if (MR::calcDistance(pSender, pReceiver, nullptr) > 70.0f * mScale.x + pReceiver->mRadius) { return; @@ -94,11 +95,11 @@ void NeedlePlant::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { } } -bool NeedlePlant::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { +bool NeedlePlant::receiveMsgPush(HitSensor* pSender, HitSensor* pReceiver) { if (isNerve(&NrvNeedlePlant::NeedlePlantNrvShake::sInstance)) { return false; } - + if (!MR::isSensorEnemy(pSender)) { return false; } @@ -106,7 +107,7 @@ bool NeedlePlant::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { return true; } -bool NeedlePlant::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool NeedlePlant::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgStarPieceReflect(msg)) { setNerve(&NrvNeedlePlant::NeedlePlantNrvShake::sInstance); return true; @@ -118,12 +119,12 @@ bool NeedlePlant::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor } } -bool NeedlePlant::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool NeedlePlant::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { kill(); return true; } -void NeedlePlant::connectToScene(const MapObjActorInitInfo &) { +void NeedlePlant::connectToScene(const MapObjActorInitInfo&) { MR::connectToSceneNoShadowedMapObj(this); } @@ -131,6 +132,6 @@ NeedlePlant::~NeedlePlant() {} inline void NeedlePlant::exeWait() { if (MR::isFirstStep(this)) { - MR::tryStartAllAnim(this, mObjectName); + MR::tryStartAllAnim(this, mObjectName); } } diff --git a/src/Game/MapObj/NormalMapBase.cpp b/src/Game/MapObj/NormalMapBase.cpp index 1f9e22da7..44c708af9 100644 --- a/src/Game/MapObj/NormalMapBase.cpp +++ b/src/Game/MapObj/NormalMapBase.cpp @@ -11,7 +11,8 @@ #include #include -NormalMapBase::NormalMapBase(const char *pName) : LiveActor(pName) { +NormalMapBase::NormalMapBase(const char* pName) + : LiveActor(pName) { mBtkPlayer = nullptr; _150 = 0; for (u32 i = 0; i < 0x10; i++) { @@ -26,7 +27,7 @@ NormalMapBase::NormalMapBase(const char *pName) : LiveActor(pName) { _4C5 = 0; } -void NormalMapBase::setup(const char *pName) { +void NormalMapBase::setup(const char* pName) { _4C5 = 1; _4C4 = 1; initModelManagerWithAnm(pName, nullptr, false); @@ -37,7 +38,7 @@ void NormalMapBase::setup(const char *pName) { MR::invalidateClipping(this); mHeight = 128; mWidth = 128; - _4B8 = new(0x20) JUTTexture(mHeight, mWidth, GX_TF_IA8); + _4B8 = new (0x20) JUTTexture(mHeight, mWidth, GX_TF_IA8); appear(); } @@ -51,7 +52,6 @@ void NormalMapBase::initNormalMap() { // ... void NormalMapBase::control() { - } void NormalMapBase::calcAnim() { @@ -64,7 +64,7 @@ void NormalMapBase::calcAnim() { // ... -void NormalMapBase::loadTexMtxBtk(J3DMaterial *pMaterial) const { +void NormalMapBase::loadTexMtxBtk(J3DMaterial* pMaterial) const { if (mBtkPlayer != nullptr) { if (_150) { GXLoadTexMtxImm(_184[pMaterial->mIndex], 0x1E, GX_MTX2x4); @@ -95,25 +95,25 @@ void NormalMapBase::draw() const { GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_POS_XYZ, GX_F32, 0); MtxPtr cameraViewMtx = MR::getCameraViewMtx(); TPos3f v7; - Mtx mtx; + Mtx mtx; PSMTXIdentity(mtx); MR::makeMtxTRS(mtx, this); PSMTXConcat(cameraViewMtx, mtx, mtx); PSMTXCopy((const MtxPtr)mtx, (MtxPtr)_F4); - + MR::makeMtxTR(v7, this); MR::normalize(&v7); switch (_EC) { - case 0: - drawSetting(v7); - break; - case 1: - drawSettingForDebug(v7); - break; - case 2: - drawSettingForCapture(v7); - break; + case 0: + drawSetting(v7); + break; + case 1: + drawSettingForDebug(v7); + break; + case 2: + drawSettingForCapture(v7); + break; } shapeAnalyzeDraw(MR::getJ3DModel(this)); @@ -124,7 +124,7 @@ void NormalMapBase::draw() const { // ... -bool NormalMapBase::isNormalMapMaterial(const char *pName) const { +bool NormalMapBase::isNormalMapMaterial(const char* pName) const { if (strstr(pName, "Normal")) { return true; } @@ -132,11 +132,11 @@ bool NormalMapBase::isNormalMapMaterial(const char *pName) const { return strstr(pName, "Nrm") != 0; } -void NormalMapBase::standardDraw(J3DModel *pModel) const { +void NormalMapBase::standardDraw(J3DModel* pModel) const { if ((_138 & 0x10) == 0) { for (u16 i = 0; i < pModel->mModelData->mMaterialTable.mMaterialCount; i++) { J3DMaterial* mat = pModel->mModelData->getMaterial(i); - const char* matName = MR::getMaterialName(pModel->mModelData, mat->mIndex); + const char* matName = MR::getMaterialName(pModel->mModelData, mat->mIndex); if (!isNormalMapMaterial(matName)) { MR::simpleDraw(pModel, mat); } @@ -155,27 +155,23 @@ void NormalMapBase::loadDiffuseGradTex(GXTexMapID mapID) const { if (_138 & 1) { GXInitTexObjLOD(&obj, GX_NEAR, GX_NEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1); - } - else { + } else { GXInitTexObjLOD(&obj, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1); } GXLoadTexObj(&obj, mapID); } -void NormalMapBase::loadNormalTex(const JUTTexture *pTex, GXTexMapID id) const { +void NormalMapBase::loadNormalTex(const JUTTexture* pTex, GXTexMapID id) const { GXTexObj obj; GXInitTexObj(&obj, pTex->mImage, pTex->mTIMG->mWidth, pTex->mTIMG->mHeight, GX_TF_RGBA8, GX_CLAMP, GX_CLAMP, GX_FALSE); if ((_13A & 2) != 0 && (_13A & 0x4) != 0) { GXInitTexObjLOD(&obj, GX_NEAR, GX_NEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1); - } - else if ((_13A & 0x2) != 0) { + } else if ((_13A & 0x2) != 0) { GXInitTexObjLOD(&obj, GX_NEAR, GX_LINEAR, 0.0, 0.0, 0.0, 0, 0, GX_ANISO_1); - } - else if ((_13A & 0x4) != 0) { + } else if ((_13A & 0x4) != 0) { GXInitTexObjLOD(&obj, GX_LINEAR, GX_NEAR, 0.0, 0.0, 0.0, 0, 0, GX_ANISO_1); - } - else { + } else { GXInitTexObjLOD(&obj, GX_LINEAR, GX_LINEAR, 0.0, 0.0, 0.0, 0, 0, GX_ANISO_1); } @@ -194,11 +190,9 @@ void NormalMapBase::drawSetting(MtxPtr mtx) const { if (mHardLightColorMask) { GXSetChanCtrl(GX_COLOR0, 1, GX_SRC_REG, GX_SRC_VTX, mHardLightColorMask, GX_DF_CLAMP, GX_AF_NONE); - } - else if (mUseModelLightReg) { + } else if (mUseModelLightReg) { GXSetChanCtrl(GX_COLOR0, 1, GX_SRC_REG, GX_SRC_REG, 0, GX_DF_CLAMP, GX_AF_NONE); - } - else { + } else { GXSetChanCtrl(GX_COLOR0, 1, GX_SRC_VTX, GX_SRC_VTX, 0, GX_DF_CLAMP, GX_AF_NONE); } @@ -212,8 +206,7 @@ void NormalMapBase::drawSetting(MtxPtr mtx) const { void NormalMapBase::setTevForObject_Material() const { if (mBtkPlayer && _150) { GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 0x1E, 0, 0x7D); - } - else { + } else { GXSetTexCoordGen2(GX_TEXCOORD0, GX_TG_MTX2x4, GX_TG_TEX0, 0x3C, 0, 0x7D); } @@ -293,50 +286,49 @@ void NormalMapBase::setTevForObject() const { GXSetTevAlphaIn(GX_TEVSTAGE2, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_APREV); GXSetTevAlphaOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); - switch (mBackLightMode) - { - case 0: - GXSetTevColorIn(GX_TEVSTAGE3, GX_CC_ZERO, GX_CC_ONE, GX_CC_CPREV, GX_CC_APREV); - break; - case 1: - GXSetTevColorIn(GX_TEVSTAGE3, GX_CC_ZERO, GX_CC_APREV, GX_CC_CPREV, GX_CC_ZERO); - break; - case 2: - GXSetTevColorIn(GX_TEVSTAGE2, GX_CC_C1, GX_CC_C2, GX_CC_TEXC, GX_CC_APREV); - GXSetTevColorOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); - GXSetTevColorIn(GX_TEVSTAGE3, GX_CC_ZERO, GX_CC_C2, GX_CC_CPREV, GX_CC_C0); - break; - case 3: - GXSetNumTevStages(3); - GXSetTevColorIn(GX_TEVSTAGE2, GX_CC_C1, GX_CC_C2, GX_CC_TEXC, GX_CC_APREV); - GXSetTevColorOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); - GXSetTevAlphaIn(GX_TEVSTAGE2, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_KONST); - GXSetTevAlphaOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); - break; - case 4: - case 7: - GXSetNumTevStages(3); - GXSetTevColorIn(GX_TEVSTAGE2, GX_CC_ZERO, GX_CC_C2, GX_CC_ONE, GX_CC_ZERO); - GXSetTevColorOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); - GXSetTevAlphaIn(GX_TEVSTAGE2, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_KONST); - GXSetTevAlphaOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); - break; - case 5: - GXSetNumTevStages(3); - GXSetTevColorIn(GX_TEVSTAGE2, GX_CC_ZERO, GX_CC_ONE, GX_CC_TEXC, GX_CC_ZERO); - GXSetTevColorOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); - GXSetTevAlphaIn(GX_TEVSTAGE2, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_KONST); - GXSetTevAlphaOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); - break; - case 6: - GXSetNumTevStages(1); - GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ONE, GX_CC_RASC, GX_CC_ZERO); - GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); - GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_KONST); - GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); - break; - default: - break; + switch (mBackLightMode) { + case 0: + GXSetTevColorIn(GX_TEVSTAGE3, GX_CC_ZERO, GX_CC_ONE, GX_CC_CPREV, GX_CC_APREV); + break; + case 1: + GXSetTevColorIn(GX_TEVSTAGE3, GX_CC_ZERO, GX_CC_APREV, GX_CC_CPREV, GX_CC_ZERO); + break; + case 2: + GXSetTevColorIn(GX_TEVSTAGE2, GX_CC_C1, GX_CC_C2, GX_CC_TEXC, GX_CC_APREV); + GXSetTevColorOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); + GXSetTevColorIn(GX_TEVSTAGE3, GX_CC_ZERO, GX_CC_C2, GX_CC_CPREV, GX_CC_C0); + break; + case 3: + GXSetNumTevStages(3); + GXSetTevColorIn(GX_TEVSTAGE2, GX_CC_C1, GX_CC_C2, GX_CC_TEXC, GX_CC_APREV); + GXSetTevColorOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE2, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_KONST); + GXSetTevAlphaOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); + break; + case 4: + case 7: + GXSetNumTevStages(3); + GXSetTevColorIn(GX_TEVSTAGE2, GX_CC_ZERO, GX_CC_C2, GX_CC_ONE, GX_CC_ZERO); + GXSetTevColorOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE2, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_KONST); + GXSetTevAlphaOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); + break; + case 5: + GXSetNumTevStages(3); + GXSetTevColorIn(GX_TEVSTAGE2, GX_CC_ZERO, GX_CC_ONE, GX_CC_TEXC, GX_CC_ZERO); + GXSetTevColorOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE2, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_KONST); + GXSetTevAlphaOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); + break; + case 6: + GXSetNumTevStages(1); + GXSetTevColorIn(GX_TEVSTAGE0, GX_CC_ZERO, GX_CC_ONE, GX_CC_RASC, GX_CC_ZERO); + GXSetTevColorOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); + GXSetTevAlphaIn(GX_TEVSTAGE0, GX_CA_ZERO, GX_CA_ZERO, GX_CA_ZERO, GX_CA_KONST); + GXSetTevAlphaOp(GX_TEVSTAGE0, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1, GX_TEVPREV); + break; + default: + break; } GXSetTevColorOp(GX_TEVSTAGE3, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_2, 1, GX_TEVPREV); diff --git a/src/Game/MapObj/NormalMapTestObj.cpp b/src/Game/MapObj/NormalMapTestObj.cpp index cb0741898..13992e0f5 100644 --- a/src/Game/MapObj/NormalMapTestObj.cpp +++ b/src/Game/MapObj/NormalMapTestObj.cpp @@ -4,11 +4,12 @@ #include "Game/Util/JMapInfo.hpp" #include "Game/Util/LiveActorUtil.hpp" -NormalMapTestObj::NormalMapTestObj(const char* pName) : NormalMapBase(pName) { } -NormalMapTestObj::~NormalMapTestObj() { } +NormalMapTestObj::NormalMapTestObj(const char* pName) + : NormalMapBase(pName) {} +NormalMapTestObj::~NormalMapTestObj() {} -void NormalMapTestObj::init(const JMapInfoIter &rIfter) { - MR::initDefaultPos(this,rIfter); +void NormalMapTestObj::init(const JMapInfoIter& rIfter) { + MR::initDefaultPos(this, rIfter); NormalMapBase::setup("NormalMapTestObj"); initHitSensor(1); MR::addBodyMessageSensorMapObj(this); diff --git a/src/Game/MapObj/Note.cpp b/src/Game/MapObj/Note.cpp index 2040092b8..738f5147c 100644 --- a/src/Game/MapObj/Note.cpp +++ b/src/Game/MapObj/Note.cpp @@ -3,7 +3,8 @@ #include "Game/Scene/SceneObjHolder.hpp" #include "Game/Screen/NoteCounter.hpp" -Note::Note(const char *pName, const TVec3f &rRailDirection, NoteFairy *pParent) : LiveActor(pName) { +Note::Note(const char* pName, const TVec3f& rRailDirection, NoteFairy* pParent) + : LiveActor(pName) { mParentFairy = pParent; _90.set(0.0f); mRailDirection.setPS(rRailDirection); @@ -13,7 +14,7 @@ Note::Note(const char *pName, const TVec3f &rRailDirection, NoteFairy *pParent) mFlashCtrl = nullptr; } -void Note::init(const JMapInfoIter &rIter) { +void Note::init(const JMapInfoIter& rIter) { MR::createSceneObj(SceneObj_NoteGroup); _90.set(mPosition); initModelManagerWithAnm("Note", nullptr, false); @@ -106,7 +107,7 @@ void Note::calcAndSetBaseMtx() { } */ -void Note::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void Note::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayerOrRide(pReceiver)) { if (!isNerve(&NrvNote::NoteNrvFlyUp::sInstance)) { MR::emitEffect(this, "Get"); @@ -117,11 +118,12 @@ void Note::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { } } -NoteGroup::NoteGroup() : LiveActorGroup("音符グループ", 0x100) { +NoteGroup::NoteGroup() + : LiveActorGroup("音符グループ", 0x100) { mRotation = 0.0f; } -void NoteGroup::init(const JMapInfoIter &rIter) { +void NoteGroup::init(const JMapInfoIter& rIter) { MR::connectToSceneMapObjMovement(this); } @@ -134,15 +136,13 @@ void NoteGroup::movement() { */ Note::~Note() { - } NoteGroup::~NoteGroup() { - } namespace NrvNote { INIT_NERVE(NoteNrvWait); INIT_NERVE(NoteNrvCountDown); INIT_NERVE(NoteNrvFlyUp); -}; +}; // namespace NrvNote diff --git a/src/Game/MapObj/NoteFairy.cpp b/src/Game/MapObj/NoteFairy.cpp index a3554c02e..276e535eb 100644 --- a/src/Game/MapObj/NoteFairy.cpp +++ b/src/Game/MapObj/NoteFairy.cpp @@ -3,7 +3,8 @@ #include "Game/Scene/SceneObjHolder.hpp" #include "Game/Screen/NoteCounter.hpp" -NoteFairy::NoteFairy(const char *pName) : LiveActor(pName) { +NoteFairy::NoteFairy(const char* pName) + : LiveActor(pName) { _8C.x = 0.0f; _8C.y = 0.0f; _8C.z = 0.0f; @@ -30,7 +31,7 @@ NoteFairy::NoteFairy(const char *pName) : LiveActor(pName) { mCameraInfo = nullptr; } -void NoteFairy::init(const JMapInfoIter &rIter) { +void NoteFairy::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); s32 noteNum = -1; MR::getJMapInfoArg0WithInit(rIter, ¬eNum); @@ -40,11 +41,20 @@ void NoteFairy::init(const JMapInfoIter &rIter) { MR::getJMapInfoArg3WithInit(rIter, &mAppearanceType); switch (mAppearanceType) { - case -1: break; - case 1: break; - case 3: _CC = 1; break; - case 5: _CD = 1; break; - case 6: _CD = 1; _D0 = 1; break; + case -1: + break; + case 1: + break; + case 3: + _CC = 1; + break; + case 5: + _CD = 1; + break; + case 6: + _CD = 1; + _D0 = 1; + break; } MR::getJMapInfoArg4WithInit(rIter, &mSong); @@ -53,9 +63,8 @@ void NoteFairy::init(const JMapInfoIter &rIter) { MR::getJMapInfoArg6WithInit(rIter, &arg6); if (arg6 > 0) { - _CF = false; - } - else { + _CF = false; + } else { _CF = true; } @@ -67,11 +76,9 @@ void NoteFairy::init(const JMapInfoIter &rIter) { if (powerStarType == 2) { mPowerStarSpawnType = 1; - } - else if (powerStarType == 3) { + } else if (powerStarType == 3) { mPowerStarSpawnType = 2; - } - else { + } else { mPowerStarSpawnType = 0; } } @@ -92,38 +99,32 @@ void NoteFairy::init(const JMapInfoIter &rIter) { if (noteNum > 0) { if (mSong < 0) { mMelodyNoteNum = noteNum; - } - else { + } else { mMelodyNoteNum = MR::getRemixMelodyNoteNum(mSong); } mNoteCoord = MR::getRailTotalLength(this) / mMelodyNoteNum; - } - else { + } else { if (noteNum == -2) { s32 pointNum = MR::getRailPointNum(this); if (mSong < 0) { mMelodyNoteNum = pointNum; - } - else { + } else { mMelodyNoteNum = MR::getRemixMelodyNoteNum(mSong); } if (railArg < 0) { mNoteCoord = 200.0f; - } - else { + } else { mNoteCoord = railArg; } _D1 = true; - } - else { - if (mSong < 0) { + } else { + if (mSong < 0) { mMelodyNoteNum = MR::getRailTotalLength(this) / mNoteCoord; - } - else { + } else { mMelodyNoteNum = MR::getRemixMelodyNoteNum(mSong); mNoteCoord = MR::getRailTotalLength(this) / mMelodyNoteNum; } @@ -137,8 +138,7 @@ void NoteFairy::init(const JMapInfoIter &rIter) { if (_D1) { MR::calcRailPointPos(&stack_24, this, i); - } - else { + } else { stack_24.set(MR::getRailPos(this)); MR::moveCoord(this, mNoteCoord); } @@ -171,8 +171,7 @@ void NoteFairy::init(const JMapInfoIter &rIter) { void NoteFairy::control() { if (!isNerve(&NrvNoteFairy::NoteFairyNrvHide::sInstance) && MR::isValidSwitchB(this) && !MR::isOnSwitchB(this)) { kill(); - } - else if (MR::isPowerStarGetDemoActive()) { + } else if (MR::isPowerStarGetDemoActive()) { kill(); } } @@ -209,17 +208,17 @@ void NoteFairy::exeHide() { MR::moveVolumeStageBGMForNoteFairy(0.0f, 30); } - switch(mAppearanceType) { - case 1: - case 2: - case 3: - setNerve(&NrvNoteFairy::NoteFairyNrvStartAppearDemo::sInstance); - return; - case 4: - case 5: - case 6: - setNerve(&NrvNoteFairy::NoteFairyNrvRailMoveStart::sInstance); - return; + switch (mAppearanceType) { + case 1: + case 2: + case 3: + setNerve(&NrvNoteFairy::NoteFairyNrvStartAppearDemo::sInstance); + return; + case 4: + case 5: + case 6: + setNerve(&NrvNoteFairy::NoteFairyNrvRailMoveStart::sInstance); + return; } setNerve(&NrvNoteFairy::NoteFairyNrvAppearNote::sInstance); @@ -252,8 +251,7 @@ void NoteFairy::exeRailMoveStart() { if (_CD) { setNerve(&NrvNoteFairy::NoteFairyNrvAppearNoteBloom::sInstance); - } - else if (MR::isStep(this, 0)) { + } else if (MR::isStep(this, 0)) { enterDemoAppear(&NrvNoteFairy::NoteFairyNrvAppearNoteBloom::sInstance, false); } } @@ -348,12 +346,10 @@ void NoteFairy::exeEndWait() { s32 timeLeft = mTimeLimit - getNerveStep(); if (timeLeft <= 170) { MR::startSystemLevelSE("SE_RS_LV_NOTE_TIMER_FAST", 0, -1); - } - else { + } else { if (timeLeft <= mTimeLimit / 2) { MR::startSystemLevelSE("SE_RS_LV_NOTE_TIMER_MIDDLE", 30, -1); - } - else { + } else { MR::startSystemLevelSE("SE_RS_LV_NOTE_TIMER_SLOW", 85, -1); } } @@ -380,28 +376,27 @@ void NoteFairy::exeSuccess() { } switch (mPowerStarSpawnType) { - case 1: - MR::requestAppearPowerStar(this, mLastGotNote->mPosition); - break; - case 2: - MR::requestAppearPowerStar(this, mLastGotNote->mPosition); - break; - case 0: - MR::requestAppearPowerStar(this, _8C); - break; + case 1: + MR::requestAppearPowerStar(this, mLastGotNote->mPosition); + break; + case 2: + MR::requestAppearPowerStar(this, mLastGotNote->mPosition); + break; + case 0: + MR::requestAppearPowerStar(this, _8C); + break; } setNerve(&NrvNoteFairy::NoteFairyNrvEndWait::sInstance); } } -void NoteFairy::enterDemoAppear(const Nerve *pNerve, bool hasNoFrame) { +void NoteFairy::enterDemoAppear(const Nerve* pNerve, bool hasNoFrame) { MR::startActorCameraTargetSelf(this, mCameraInfo, -1); if (hasNoFrame) { MR::requestStartDemo(this, "出現", pNerve, nullptr); - } - else { + } else { MR::requestStartDemoWithoutCinemaFrame(this, "出現", pNerve, nullptr); } @@ -419,7 +414,7 @@ bool NoteFairy::isDeadAllNotes() { return true; } -void NoteFairy::setLastGotNote(Note *pNote) { +void NoteFairy::setLastGotNote(Note* pNote) { mLastGotNote = pNote; } @@ -431,22 +426,21 @@ f32 NoteFairy::getNoteCoord(s32 val) { return val * mNoteCoord; } -bool NoteFairy::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool NoteFairy::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (msg == ACTMES_SUCCESS) { killAllNotes(); switch (mCompletionJingle) { - case -1: - break; - case 0: - MR::startSound(this, "SE_SY_TOTAL_COMPLETE", -1, -1); - break; + case -1: + break; + case 0: + MR::startSound(this, "SE_SY_TOTAL_COMPLETE", -1, -1); + break; } if (mHasDemo) { setNerve(&NrvNoteFairy::NoteFairyNrvSuccessDemo::sInstance); - } - else { + } else { setNerve(&NrvNoteFairy::NoteFairyNrvSuccess::sInstance); } @@ -457,7 +451,6 @@ bool NoteFairy::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceive } NoteFairy::~NoteFairy() { - } namespace NrvNoteFairy { @@ -470,4 +463,4 @@ namespace NrvNoteFairy { INIT_NERVE(NoteFairyNrvEndWait); INIT_NERVE(NoteFairyNrvSuccessDemo); INIT_NERVE(NoteFairyNrvSuccess); -}; +}; // namespace NrvNoteFairy diff --git a/src/Game/MapObj/PTimerSwitch.cpp b/src/Game/MapObj/PTimerSwitch.cpp index fe4187c93..68a609ce8 100644 --- a/src/Game/MapObj/PTimerSwitch.cpp +++ b/src/Game/MapObj/PTimerSwitch.cpp @@ -2,166 +2,167 @@ #include "Game/Map/CollisionParts.hpp" #include "Game/MapObj/PTimerSwitch.hpp" -PTimerSwitch::PTimerSwitch(const char *pName) : LiveActor(pName) { - mSwitchCollision = nullptr; - mConnector = nullptr; - _94 = 0; - _98 = false; +PTimerSwitch::PTimerSwitch(const char* pName) + : LiveActor(pName) { + mSwitchCollision = nullptr; + mConnector = nullptr; + _94 = 0; + _98 = false; } void PTimerSwitch::reset() { - LiveActor::appear(); - setNerve(&NrvPTimerSwitch::PTimerSwitchNrvOff::sInstance); - MR::validateCollisionParts(mSwitchCollision); - MR::startBck(this, "Wait", 0); - _94 = 0; - _98 = false; + LiveActor::appear(); + setNerve(&NrvPTimerSwitch::PTimerSwitchNrvOff::sInstance); + MR::validateCollisionParts(mSwitchCollision); + MR::startBck(this, "Wait", 0); + _94 = 0; + _98 = false; } void PTimerSwitch::init(const JMapInfoIter& rIter) { - MR::initDefaultPos(this, rIter); - initModelManagerWithAnm("PTimerSwitch", nullptr, false); - MR::connectToSceneMapObj(this); - initHitSensor(2); - MR::addHitSensorMapObj(this, "body", 16, 0.0f, TVec3f(0.0f, 0.0f, 0.0f)); - MR::addHitSensor(this, "hit", ATYPE_SWITCH, 16, 120.0f, TVec3f(0.0f, 50.0f, 0.0f)); - MR::initCollisionParts(this, "PTimerSwitch", getSensor("body"), 0); - mSwitchCollision = MR::createCollisionPartsFromLiveActor(this, "Move", getSensor("hit"), (MR::CollisionScaleType)2); - initSound(4, false); - MR::needStageSwitchWriteA(this, rIter); - initNerve(&NrvPTimerSwitch::PTimerSwitchNrvOff::sInstance); - initEffectKeeper(0, nullptr, false); - MR::startBck(this, "Move", 0); - mConnector = new MapObjConnector(this); - appear(); + MR::initDefaultPos(this, rIter); + initModelManagerWithAnm("PTimerSwitch", nullptr, false); + MR::connectToSceneMapObj(this); + initHitSensor(2); + MR::addHitSensorMapObj(this, "body", 16, 0.0f, TVec3f(0.0f, 0.0f, 0.0f)); + MR::addHitSensor(this, "hit", ATYPE_SWITCH, 16, 120.0f, TVec3f(0.0f, 50.0f, 0.0f)); + MR::initCollisionParts(this, "PTimerSwitch", getSensor("body"), 0); + mSwitchCollision = MR::createCollisionPartsFromLiveActor(this, "Move", getSensor("hit"), (MR::CollisionScaleType)2); + initSound(4, false); + MR::needStageSwitchWriteA(this, rIter); + initNerve(&NrvPTimerSwitch::PTimerSwitchNrvOff::sInstance); + initEffectKeeper(0, nullptr, false); + MR::startBck(this, "Move", 0); + mConnector = new MapObjConnector(this); + appear(); } void PTimerSwitch::initAfterPlacement() { - mConnector->attachToUnder(); + mConnector->attachToUnder(); } void PTimerSwitch::appear() { - reset(); + reset(); } void PTimerSwitch::kill() { - LiveActor::kill(); - MR::emitEffect(this, "Delete"); - MR::invalidateCollisionParts(mSwitchCollision); + LiveActor::kill(); + MR::emitEffect(this, "Delete"); + MR::invalidateCollisionParts(mSwitchCollision); } void PTimerSwitch::calcAnim() { - LiveActor::calcAnim(); - TPos3f mtx; - mtx.setInline(MR::getJointMtx(this, "Move")); - mSwitchCollision->setMtx(mtx); + LiveActor::calcAnim(); + TPos3f mtx; + mtx.setInline(MR::getJointMtx(this, "Move")); + mSwitchCollision->setMtx(mtx); } void PTimerSwitch::control() { - if (_98) { - ++_94; - } else if (_94 > 0) { - --_94; - } + if (_98) { + ++_94; + } else if (_94 > 0) { + --_94; + } - _98 = false; + _98 = false; } void PTimerSwitch::calcAndSetBaseMtx() { - LiveActor::calcAndSetBaseMtx(); - mConnector->connect(); + LiveActor::calcAndSetBaseMtx(); + mConnector->connect(); } -bool PTimerSwitch::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - return false; +bool PTimerSwitch::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + return false; } -bool PTimerSwitch::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - if (!MR::isMsgPlayerTrample(msg)) { - return false; - } +bool PTimerSwitch::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + if (!MR::isMsgPlayerTrample(msg)) { + return false; + } - if (pReceiver->mType != 0x4f) { - return false; - } + if (pReceiver->mType != 0x4f) { + return false; + } - if (!isNerve(&NrvPTimerSwitch::PTimerSwitchNrvOff::sInstance)) { - return false; - } + if (!isNerve(&NrvPTimerSwitch::PTimerSwitchNrvOff::sInstance)) { + return false; + } - _98 = true; - return true; + _98 = true; + return true; } bool PTimerSwitch::trySwitchDown() { - if (_94 > 0) { - setNerve(&NrvPTimerSwitch::PTimerSwitchNrvSwitchDown::sInstance); - return true; - } + if (_94 > 0) { + setNerve(&NrvPTimerSwitch::PTimerSwitchNrvSwitchDown::sInstance); + return true; + } - return false; + return false; } bool PTimerSwitch::tryOn() { - if (MR::isBckStopped(this)) { - setNerve(&NrvPTimerSwitch::PTimerSwitchNrvOn::sInstance); - return true; - } + if (MR::isBckStopped(this)) { + setNerve(&NrvPTimerSwitch::PTimerSwitchNrvOn::sInstance); + return true; + } - return false; + return false; } void PTimerSwitch::exeOff() { - if (MR::isFirstStep(this)) { - MR::validateClipping(this); - MR::offSwitchA(this); - } + if (MR::isFirstStep(this)) { + MR::validateClipping(this); + MR::offSwitchA(this); + } - if (!trySwitchDown()) { - return; - } + if (!trySwitchDown()) { + return; + } } void PTimerSwitch::exeSwitchDown() { - if (MR::isFirstStep(this)) { - MR::startBck(this, "On", nullptr); - MR::invalidateClipping(this); - } + if (MR::isFirstStep(this)) { + MR::startBck(this, "On", nullptr); + MR::invalidateClipping(this); + } - if (!tryOn()) { - return; - } + if (!tryOn()) { + return; + } } void PTimerSwitch::exeOn() { - if (MR::isFirstStep(this)) { - MR::onSwitchA(this); - MR::shakeCameraNormal(); - MR::startSound(this, "SE_OJ_SWITCH_1", -1, -1); - } + if (MR::isFirstStep(this)) { + MR::onSwitchA(this); + MR::shakeCameraNormal(); + MR::startSound(this, "SE_OJ_SWITCH_1", -1, -1); + } - if (MR::isGreaterStep(this, 25)) { - kill(); - } + if (MR::isGreaterStep(this, 25)) { + kill(); + } } namespace NrvPTimerSwitch { - INIT_NERVE(PTimerSwitchNrvOn); - INIT_NERVE(PTimerSwitchNrvSwitchDown); - INIT_NERVE(PTimerSwitchNrvOff); + INIT_NERVE(PTimerSwitchNrvOn); + INIT_NERVE(PTimerSwitchNrvSwitchDown); + INIT_NERVE(PTimerSwitchNrvOff); - void PTimerSwitchNrvOn::execute(Spine *pSpine) const { - PTimerSwitch *actor = reinterpret_cast(pSpine->mExecutor); - actor->exeOn(); - } + void PTimerSwitchNrvOn::execute(Spine* pSpine) const { + PTimerSwitch* actor = reinterpret_cast(pSpine->mExecutor); + actor->exeOn(); + } - void PTimerSwitchNrvSwitchDown::execute(Spine *pSpine) const { - PTimerSwitch *actor = reinterpret_cast(pSpine->mExecutor); - actor->exeSwitchDown(); - } + void PTimerSwitchNrvSwitchDown::execute(Spine* pSpine) const { + PTimerSwitch* actor = reinterpret_cast(pSpine->mExecutor); + actor->exeSwitchDown(); + } - void PTimerSwitchNrvOff::execute(Spine *pSpine) const { - PTimerSwitch *actor = reinterpret_cast(pSpine->mExecutor); - actor->exeOff(); - } -} + void PTimerSwitchNrvOff::execute(Spine* pSpine) const { + PTimerSwitch* actor = reinterpret_cast(pSpine->mExecutor); + actor->exeOff(); + } +} // namespace NrvPTimerSwitch diff --git a/src/Game/MapObj/PalmIsland.cpp b/src/Game/MapObj/PalmIsland.cpp index a27d9cc49..a5e1ce162 100644 --- a/src/Game/MapObj/PalmIsland.cpp +++ b/src/Game/MapObj/PalmIsland.cpp @@ -14,9 +14,10 @@ namespace NrvPalmIsland { NEW_NERVE(PalmIslandNrvWait, PalmIsland, Wait); NEW_NERVE(PalmIslandNrvFloat, PalmIsland, Float); -}; +}; // namespace NrvPalmIsland -PalmIsland::PalmIsland(const char *pName) : LiveActor(pName) { +PalmIsland::PalmIsland(const char* pName) + : LiveActor(pName) { _8C = 0; _90.x = 0.0f; _90.y = 0.0f; @@ -26,7 +27,7 @@ PalmIsland::PalmIsland(const char *pName) : LiveActor(pName) { PalmIsland::~PalmIsland() {} -void PalmIsland::init(const JMapInfoIter &rIter) { +void PalmIsland::init(const JMapInfoIter& rIter) { HitSensor* sensor; MR::initDefaultPos(this, rIter); initModelManagerWithAnm("PalmIsland", nullptr, false); @@ -55,7 +56,7 @@ void PalmIsland::exeFloat() { MR::emitEffect(this, "Ripple"); MR::setEffectHostSRT(this, "Ripple", &_90, nullptr, nullptr); } - f32 value = JMath::sSinCosTable.sinLapRad(90.0f + 1.44f * getNerveStep()) * 1.5f; + f32 value = JMath::sSinCosTable.sinLapRad(90.0f + 1.44f * getNerveStep()) * 1.5f; bool temp = false; if (value > 0.0f) { diff --git a/src/Game/MapObj/PeachCastleGardenPlanet.cpp b/src/Game/MapObj/PeachCastleGardenPlanet.cpp index 8a058fbf0..8c8b47fdc 100644 --- a/src/Game/MapObj/PeachCastleGardenPlanet.cpp +++ b/src/Game/MapObj/PeachCastleGardenPlanet.cpp @@ -8,15 +8,16 @@ namespace NrvPeachCastleGardenPlanet { NEW_NERVE(PeachCastleGardenPlanetNrvWait, PeachCastleGardenPlanet, Wait); NEW_NERVE(PeachCastleGardenPlanetNrvDamage, PeachCastleGardenPlanet, Damage); -} +} // namespace NrvPeachCastleGardenPlanet -PeachCastleGardenPlanet::PeachCastleGardenPlanet(const char* pName) : MapObjActor(pName) { +PeachCastleGardenPlanet::PeachCastleGardenPlanet(const char* pName) + : MapObjActor(pName) { _C4 = 0; } PeachCastleGardenPlanet::~PeachCastleGardenPlanet() {} -void PeachCastleGardenPlanet::init(const JMapInfoIter &rIter) { +void PeachCastleGardenPlanet::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoPlanet(&info); @@ -29,7 +30,7 @@ void PeachCastleGardenPlanet::startDamage() { setNerve(&NrvPeachCastleGardenPlanet::PeachCastleGardenPlanetNrvDamage::sInstance); } -void PeachCastleGardenPlanet::connectToScene(const MapObjActorInitInfo &Ifter) { +void PeachCastleGardenPlanet::connectToScene(const MapObjActorInitInfo& Ifter) { MR::connectToScenePlanet(this); } @@ -45,6 +46,6 @@ void PeachCastleGardenPlanet::exeDamage() { } } -void PeachCastleGardenPlanet::initCaseUseSwitchA(const MapObjActorInitInfo &Ifter) { - MR::listenStageSwitchOnA(this, MR::FunctorV0M(this, &PeachCastleGardenPlanet::startDamage)); +void PeachCastleGardenPlanet::initCaseUseSwitchA(const MapObjActorInitInfo& Ifter) { + MR::listenStageSwitchOnA(this, MR::FunctorV0M(this, &PeachCastleGardenPlanet::startDamage)); } diff --git a/src/Game/MapObj/PhantomShipBridge.cpp b/src/Game/MapObj/PhantomShipBridge.cpp index 22591810a..97ec96d37 100644 --- a/src/Game/MapObj/PhantomShipBridge.cpp +++ b/src/Game/MapObj/PhantomShipBridge.cpp @@ -7,14 +7,15 @@ namespace NrvPhantomShipBridge { NEW_NERVE(HostTypeWait, PhantomShipBridge, Wait); NEW_NERVE(HostTypeMoveA, PhantomShipBridge, MoveA); NEW_NERVE(HostTypeMoveB, PhantomShipBridge, MoveB); -}; +}; // namespace NrvPhantomShipBridge -PhantomShipBridge::PhantomShipBridge(const char *pName) : LiveActor(pName) { +PhantomShipBridge::PhantomShipBridge(const char* pName) + : LiveActor(pName) { _8C = nullptr; mIsNutShipBridge = 0; } -void PhantomShipBridge::init(const JMapInfoIter &rIter) { +void PhantomShipBridge::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); const char* objName; MR::getObjectName(&objName, rIter); @@ -39,11 +40,10 @@ void PhantomShipBridge::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchReadB(this, rIter)) { MR::listenStageSwitchOnB(this, MR::Functor_Inline(this, &PhantomShipBridge::startMoveB)); } - + if (MR::useStageSwitchReadA(this, rIter)) { MR::listenStageSwitchOnA(this, MR::Functor_Inline(this, &PhantomShipBridge::startMoveA)); - } - else { + } else { setStateMoveA(); } } @@ -81,8 +81,7 @@ void PhantomShipBridge::exeMoveA() { if (MR::isLessStep(this, 55)) { if (mIsNutShipBridge == 1) { MR::startLevelSound(this, "SE_OJ_LV_NUT_SHIP_BRIDGE_MV", -1, -1, -1); - } - else { + } else { MR::startLevelSound(this, "SE_OJ_LV_FALL_BRIDGE_FALL", -1, -1, -1); } } @@ -90,8 +89,7 @@ void PhantomShipBridge::exeMoveA() { if (MR::isStep(this, 55)) { if (mIsNutShipBridge == 1) { MR::startSound(this, "SE_OJ_NUT_SHIP_BRIDGE_ED", -1, -1); - } - else { + } else { MR::startSound(this, "SE_OJ_FALL_BRIDGE_LAND", -1, -1); } @@ -103,8 +101,7 @@ void PhantomShipBridge::exeMoveB() { if (MR::isFirstStep(this)) { if (mIsNutShipBridge == 1) { MR::startSound(this, "SE_OJ_NUT_SHIP_BRIDGE_ST", -1, -1); - } - else { + } else { MR::startSound(this, "SE_OJ_PTM_SHIP_BRIDGE_FALL", -1, -1); } @@ -114,8 +111,7 @@ void PhantomShipBridge::exeMoveB() { if (MR::isLessStep(this, 55)) { if (mIsNutShipBridge == 1) { MR::startLevelSound(this, "SE_OJ_LV_NUT_SHIP_BRIDGE_MV", -1, -1, -1); - } - else { + } else { MR::startLevelSound(this, "SE_OJ_LV_FALL_BRIDGE_FALL", -1, -1, -1); } } @@ -123,8 +119,7 @@ void PhantomShipBridge::exeMoveB() { if (MR::isStep(this, 55)) { if (mIsNutShipBridge == 1) { MR::startSound(this, "SE_OJ_NUT_SHIP_BRIDGE_ED", -1, -1); - } - else { + } else { MR::startSound(this, "SE_OJ_FALL_BRIDGE_LAND", -1, -1); } @@ -133,9 +128,7 @@ void PhantomShipBridge::exeMoveB() { } void PhantomShipBridge::exeWait() { - } PhantomShipBridge::~PhantomShipBridge() { - } diff --git a/src/Game/MapObj/PicketSwitch.cpp b/src/Game/MapObj/PicketSwitch.cpp index bca400309..4b668c8e2 100644 --- a/src/Game/MapObj/PicketSwitch.cpp +++ b/src/Game/MapObj/PicketSwitch.cpp @@ -1,15 +1,14 @@ #include "Game/LiveActor/HitSensor.hpp" #include "Game/MapObj/PicketSwitch.hpp" -PicketSwitch::PicketSwitch(const char *pName) : LiveActor(pName) { - +PicketSwitch::PicketSwitch(const char* pName) + : LiveActor(pName) { } PicketSwitch::~PicketSwitch() { - } -void PicketSwitch::init(const JMapInfoIter &rIter) { +void PicketSwitch::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::needStageSwitchWriteA(this, rIter); const char* pName; @@ -30,7 +29,7 @@ void PicketSwitch::exeFirstDrop() { MR::startBck(this, "First", nullptr); MR::tryRumblePadStrong(this, 0); MR::startSound(this, "SE_OJ_PICKET_SWITCH_DROP", -1, -1); - } + } } void PicketSwitch::exeLastDrop() { @@ -48,13 +47,13 @@ void PicketSwitch::exeLastDrop() { } } -bool PicketSwitch::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool PicketSwitch::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgPlayerHipDropFloor(msg)) { if (pReceiver->isType(79)) { if (isNerve(&NrvPicketSwitch::PicketSwitchNrvWait::sInstance)) { setNerve(&NrvPicketSwitch::PicketSwitchNrvLastDrop::sInstance); return true; - } + } if ((isNerve(&NrvPicketSwitch::PicketSwitchNrvFirstDrop::sInstance))) { if (MR::isBckStopped(this)) { setNerve(&NrvPicketSwitch::PicketSwitchNrvLastDrop::sInstance); @@ -72,18 +71,18 @@ namespace NrvPicketSwitch { INIT_NERVE(PicketSwitchNrvFirstDrop); INIT_NERVE(PicketSwitchNrvLastDrop); - void PicketSwitchNrvWait::execute(Spine *pSpine) const { - PicketSwitch *pActor = (PicketSwitch*)pSpine->mExecutor; - pActor->exeWait(); - } + void PicketSwitchNrvWait::execute(Spine* pSpine) const { + PicketSwitch* pActor = (PicketSwitch*)pSpine->mExecutor; + pActor->exeWait(); + } - void PicketSwitchNrvFirstDrop::execute(Spine *pSpine) const { - PicketSwitch *pActor = (PicketSwitch*)pSpine->mExecutor; - pActor->exeFirstDrop(); - } + void PicketSwitchNrvFirstDrop::execute(Spine* pSpine) const { + PicketSwitch* pActor = (PicketSwitch*)pSpine->mExecutor; + pActor->exeFirstDrop(); + } - void PicketSwitchNrvLastDrop::execute(Spine *pSpine) const { - PicketSwitch *pActor = (PicketSwitch*)pSpine->mExecutor; - pActor->exeLastDrop(); - } -}; \ No newline at end of file + void PicketSwitchNrvLastDrop::execute(Spine* pSpine) const { + PicketSwitch* pActor = (PicketSwitch*)pSpine->mExecutor; + pActor->exeLastDrop(); + } +}; // namespace NrvPicketSwitch \ No newline at end of file diff --git a/src/Game/MapObj/PowerStar.cpp b/src/Game/MapObj/PowerStar.cpp index 98c627fcd..fd7222cc1 100644 --- a/src/Game/MapObj/PowerStar.cpp +++ b/src/Game/MapObj/PowerStar.cpp @@ -8,27 +8,26 @@ #include "math_types.hpp" const GXColor lightColor[5] = { - {0x96, 0x96, 0x32, 0 }, - {0x32, 0x32, 0x96, 0 }, - {0x32, 0x96, 0x32, 0 }, - {0x96, 0x32, 0x32, 0 }, - {0x64, 0x64, 0x64, 0 }, + {0x96, 0x96, 0x32, 0}, + {0x32, 0x32, 0x96, 0}, + {0x32, 0x96, 0x32, 0}, + {0x96, 0x32, 0x32, 0}, + {0x64, 0x64, 0x64, 0}, }; namespace { - void setupColor(LiveActor *pActor, bool useFrame, int frame) { + void setupColor(LiveActor* pActor, bool useFrame, int frame) { MR::startBtp(pActor, "PowerStar"); MR::setBtpFrameAndStop(pActor, useFrame ? 0.0f : frame); MR::startBva(pActor, "PowerStar"); MR::setBvaFrameAndStop(pActor, useFrame ? 1.0f : 0.0f); } - void setupColorGrandStar(LiveActor *pActor, bool dontStartRecover) { + void setupColorGrandStar(LiveActor* pActor, bool dontStartRecover) { if (dontStartRecover) { MR::showMaterial(pActor, "GrandStarEmpty"); MR::hideMaterial(pActor, "FooMat"); - } - else { + } else { MR::showMaterial(pActor, "FooMat"); MR::hideMaterial(pActor, "GrandStarEmpty"); MR::startBrk(pActor, "Recover"); @@ -36,13 +35,13 @@ namespace { } } - void requestPointLight(const LiveActor *pActor, int a2) { + void requestPointLight(const LiveActor* pActor, int a2) { TVec3f jointPos; MR::copyJointPos(pActor, "PowerStar", &jointPos); MR::requestPointLight(pActor, TVec3f(jointPos), lightColor[a2], 1.0f, -1); } -}; +}; // namespace namespace NrvPowerStar { NEW_NERVE(PowerStarNrvWaitStartAppear, PowerStar, WaitStartAppear); @@ -54,33 +53,32 @@ namespace NrvPowerStar { NEW_NERVE(PowerStarNrvWeakNoRotate, PowerStar, WeakNoRotate); NEW_NERVE(PowerStarNrvWeakToWait, PowerStar, WeakToWait); NEW_NERVE(PowerStarNrvStageClearDemo, PowerStar, StageClearDemo); -}; +}; // namespace NrvPowerStar -PowerStar::PowerStar(const char *pName) : - LiveActor(pName), - mPowerStarId(-1), - mIsInDemo(false), - mAppearPosition(gZeroVec), - _A0(gZeroVec), - _AC(gZeroVec), - mPowerStarModelObj(nullptr), - _11C(0), - mColorFrame(0), - mIsGrandStar(false), - _125(false), - _126(false), - _127(false), - mCameraInfo(nullptr), - mCameraActor(nullptr), - mLuigiNPC(nullptr), - _164(false) -{ +PowerStar::PowerStar(const char* pName) + : LiveActor(pName), + mPowerStarId(-1), + mIsInDemo(false), + mAppearPosition(gZeroVec), + _A0(gZeroVec), + _AC(gZeroVec), + mPowerStarModelObj(nullptr), + _11C(0), + mColorFrame(0), + mIsGrandStar(false), + _125(false), + _126(false), + _127(false), + mCameraInfo(nullptr), + mCameraActor(nullptr), + mLuigiNPC(nullptr), + _164(false) { _B8.identity(); _E8.identity(); _134.identity(); } -void PowerStar::init(const JMapInfoIter &rIter) { +void PowerStar::init(const JMapInfoIter& rIter) { mIsGrandStar = MR::isEqualObjectName(rIter, "GrandStar"); initMapToolInfo(rIter); @@ -89,8 +87,7 @@ void PowerStar::init(const JMapInfoIter &rIter) { if (mIsGrandStar) { MR::connectToSceneIndirectMapObj(this); initSensorGrandStar(); - } - else { + } else { MR::connectToSceneNoSilhouettedMapObj(this); initHitSensor(1); MR::addHitSensor(this, "body", ATYPE_POWER_STAR_BIND, 8, 75.0f, TVec3f(0.0f, 0.0f, 0.0f)); @@ -100,14 +97,13 @@ void PowerStar::init(const JMapInfoIter &rIter) { if (MR::isGalaxyGhostCometAppearInCurrentStage()) { MR::invalidateClipping(this); - } - else { + } else { MR::setClippingTypeSphere(this, 5000.0f); } initShadow(rIter); MR::initActorCamera(this, rIter, &mCameraInfo); - ModelObj* power_star_mdl = mPowerStarModelObj; + ModelObj* power_star_mdl = mPowerStarModelObj; ActorCameraInfo* cam_info = mCameraInfo; MR::initAnimCamera(power_star_mdl, cam_info, mIsGrandStar ? "GrandStarGet" : "PowerStarGet"); @@ -136,18 +132,15 @@ void PowerStar::init(const JMapInfoIter &rIter) { if (mPowerStarId == -1) { if (mIsInDemo) { makeActorDead(); - } - else { + } else { makeActorAppeared(); } - } - else { + } else { makeActorAppeared(); } } void PowerStar::initAfterPlacement() { - } void PowerStar::appear() { @@ -171,13 +164,12 @@ void PowerStar::requestAppear() { if (MR::isStageKoopaVs()) { MR::requestStartDemoMarioPuppetableWithoutCinemaFrame(this, cAppearDemoName, &NrvPowerStar::PowerStarNrvAppearDemoKoopa::sInstance, nullptr); - } - else { + } else { MR::requestStartDemoWithoutCinemaFrame(this, cAppearDemoName, &NrvPowerStar::PowerStarNrvAppearDemoRise::sInstance, nullptr); } } -void PowerStar::setDemoAppearPos(const TVec3f &rVec) { +void PowerStar::setDemoAppearPos(const TVec3f& rVec) { bool isGroupExist = MR::getGroupFromArray(this); if (isGroupExist) { @@ -196,72 +188,64 @@ void PowerStar::offAppearDemo() { mIsInDemo = false; } -void PowerStar::setupColor(LiveActor *pActor, const NameObj *a2, s32 a3) { +void PowerStar::setupColor(LiveActor* pActor, const NameObj* a2, s32 a3) { bool hasPowerStar; - s32 val = 0; + s32 val = 0; hasPowerStar = MR::hasPowerStarInCurrentStageWithDeclarer(a2->mName, a3); if (MR::isPowerStarGreenInCurrentStageWithDeclarer(a2->mName, a3)) { val = 2; - } - else if (MR::isPowerStarRedInCurrentStageWithDeclarer(a2->mName, a3)) { + } else if (MR::isPowerStarRedInCurrentStageWithDeclarer(a2->mName, a3)) { val = 3; } if (MR::isGrandStarInCurrentStageWithDeclarer(a2->mName, a3)) { ::setupColorGrandStar(pActor, hasPowerStar); - } - else { + } else { ::setupColor(pActor, hasPowerStar, val); } } -void PowerStar::setupColorAtResultSequence(LiveActor *pPowerStar, bool a2) { +void PowerStar::setupColorAtResultSequence(LiveActor* pPowerStar, bool a2) { bool hasStarAtRes; - s32 val = 0; + s32 val = 0; hasStarAtRes = MR::hasPowerStarAtResultSequence(); if (MR::isPowerStarGreenAtResultSequence()) { val = 2; - } - else if (MR::isPowerStarRedAtResultSequence()) { + } else if (MR::isPowerStarRedAtResultSequence()) { val = 3; } if (a2) { ::setupColorGrandStar(pPowerStar, hasStarAtRes); - } - else { + } else { ::setupColor(pPowerStar, hasStarAtRes, val); } } -void PowerStar::requestPointLight(const LiveActor *pActor, const NameObj *a2, s32 a3) { +void PowerStar::requestPointLight(const LiveActor* pActor, const NameObj* a2, s32 a3) { s32 colorIdx = 0; if (MR::hasPowerStarInCurrentStageWithDeclarer(a2->mName, a3)) { colorIdx = 4; - } - else if (MR::isPowerStarGreenInCurrentStageWithDeclarer(a2->mName, a3)) { + } else if (MR::isPowerStarGreenInCurrentStageWithDeclarer(a2->mName, a3)) { colorIdx = 2; - } - else if (MR::isPowerStarRedInCurrentStageWithDeclarer(a2->mName, a3)) { + } else if (MR::isPowerStarRedInCurrentStageWithDeclarer(a2->mName, a3)) { colorIdx = 3; } ::requestPointLight(pActor, colorIdx); } -void PowerStar::requestPointLightAtResultSequence(const LiveActor *pActor) { +void PowerStar::requestPointLightAtResultSequence(const LiveActor* pActor) { s32 val = 0; if (MR::hasPowerStarAtResultSequence()) { val = 4; - } - else if (MR::isPowerStarGreenAtResultSequence()) { + } else if (MR::isPowerStarGreenAtResultSequence()) { val = 2; - } - else if (MR::isPowerStarRedAtResultSequence()) { + } else if (MR::isPowerStarRedAtResultSequence()) { val = 3; } @@ -288,13 +272,13 @@ bool PowerStar::isCurrentStageKoopaVs3() { return MR::isStageKoopaVs3(); } -void PowerStar::initShadowPowerStar(LiveActor *pActor, bool a2) { +void PowerStar::initShadowPowerStar(LiveActor* pActor, bool a2) { MR::initShadowFromCSV(pActor, "Shadow"); MR::invalidateShadowAll(pActor); MR::validateShadowGroup(pActor, a2 ? "円柱" : "通常"); } -void PowerStar::makeArchiveList(NameObjArchiveListCollector *pCollector, const JMapInfoIter &rIter) { +void PowerStar::makeArchiveList(NameObjArchiveListCollector* pCollector, const JMapInfoIter& rIter) { if (MR::isPowerStarGetDemoWithLuigiCurrentGalaxy()) { pCollector->addArchive("LuigiNPC"); } @@ -306,13 +290,12 @@ void PowerStar::control() { if (isNerve(&NrvPowerStar::PowerStarNrvStageClearDemo::sInstance)) { MR::copyJointPos(mPowerStarModelObj, "PowerStar", &jointPos); - } - else { + } else { MR::copyJointPos(this, "PowerStar", &jointPos); } bool cond = (isNerve(&NrvPowerStar::PowerStarNrvAppearDemoKoopa::sInstance) && MR::isStageKoopaVs3()) ? true : false; - s32 val = cond ? 0x78 : -1; + s32 val = cond ? 0x78 : -1; MR::requestPointLight(this, TVec3f(jointPos), lightColor[mColorFrame], 1.0f, val); } @@ -320,7 +303,7 @@ void PowerStar::control() { #ifdef NON_MATCHING void PowerStar::calcAndSetBaseMtx() { - f32 derp = 0.017453292f * mRotation.y; + f32 derp = 0.017453292f * mRotation.y; TVec3f stack_14(0.0f, 1.0f, 0.0f); TPos3f pos; pos.zeroTrans(); @@ -346,7 +329,7 @@ void PowerStar::calcAndSetBaseMtx() { } #endif -bool PowerStar::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool PowerStar::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgStarPieceReflect(msg)) { return true; } @@ -354,8 +337,8 @@ bool PowerStar::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *p return MR::isMsgJetTurtleAttack(msg); } -bool PowerStar::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - switch(msg) { +bool PowerStar::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + switch (msg) { case 0x98: return true; case 0x92: @@ -376,7 +359,7 @@ bool PowerStar::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceive return false; } -void PowerStar::initMapToolInfo(const JMapInfoIter &rIter) { +void PowerStar::initMapToolInfo(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::getJMapInfoArg0NoInit(rIter, &mPowerStarId); MR::getJMapInfoArg1NoInit(rIter, &_125); @@ -393,14 +376,12 @@ void PowerStar::initMapToolInfo(const JMapInfoIter &rIter) { if (mIsGrandStar) { frame = 0; - } - else { + } else { frame = getBtpFrameCurrentStage(mPowerStarId); } mColorFrame = frame; - } - else { + } else { mColorFrame = 4; } } @@ -411,21 +392,19 @@ void PowerStar::initModel() { if (mIsGrandStar) { ::setupColorGrandStar(this, mColorFrame_v == 4); - } - else { + } else { ::setupColor(this, mColorFrame_v == 4, mColorFrame_v); } if (mIsGrandStar) { - MtxPtr pMtx = (MtxPtr)&_E8; + MtxPtr pMtx = (MtxPtr)&_E8; const char* pName = "グランドスターデモモデル"; mPowerStarModelObj = MR::createModelObjIndirectMapObj(pName, mIsGrandStar ? "GrandStar" : "PowerStar", pMtx); ::setupColorGrandStar(mPowerStarModelObj, mColorFrame_v == 4); - } - else { - MtxPtr pMtx = (MtxPtr)&_E8; + } else { + MtxPtr pMtx = (MtxPtr)&_E8; const char* pName = "パワースターデモモデル"; mPowerStarModelObj = MR::createModelObjNoSilhouettedMapObj(pName, mIsGrandStar ? "GrandStar" : "PowerStar", pMtx); @@ -449,27 +428,27 @@ void PowerStar::initModel() { void PowerStar::initSensorGrandStar() { initHitSensor(6); - TVec3f body1Offs = TVec3f(0.0f, 100.0f, 0.0f); + TVec3f body1Offs = TVec3f(0.0f, 100.0f, 0.0f); const char* body1Name = "body1"; MR::addHitSensorMtx(this, body1Name, ATYPE_POWER_STAR_BIND, 8, 60.0f, getBaseMtx(), body1Offs); - TVec3f body2Offs = TVec3f(-95.0f, 35.0f, 0.0f); + TVec3f body2Offs = TVec3f(-95.0f, 35.0f, 0.0f); const char* body2Name = "body2"; MR::addHitSensorMtx(this, body2Name, ATYPE_POWER_STAR_BIND, 8, 60.0f, getBaseMtx(), body2Offs); - TVec3f body3Offs = TVec3f(-55.0f, -75.0f, 0.0f); + TVec3f body3Offs = TVec3f(-55.0f, -75.0f, 0.0f); const char* body3Name = "body3"; MR::addHitSensorMtx(this, body3Name, ATYPE_POWER_STAR_BIND, 8, 60.0f, getBaseMtx(), body3Offs); - TVec3f body4Offs = TVec3f(55.0f, -75.0f, 0.0f); + TVec3f body4Offs = TVec3f(55.0f, -75.0f, 0.0f); const char* body4Name = "body4"; MR::addHitSensorMtx(this, body4Name, ATYPE_POWER_STAR_BIND, 8, 60.0f, getBaseMtx(), body4Offs); - TVec3f body5Offs = TVec3f(95.0f, 35.0f, 0.0f); + TVec3f body5Offs = TVec3f(95.0f, 35.0f, 0.0f); const char* body5Name = "body5"; MR::addHitSensorMtx(this, body5Name, ATYPE_POWER_STAR_BIND, 8, 60.0f, getBaseMtx(), body5Offs); - TVec3f body6Offs = TVec3f(0.0f, 0.0f, 0.0f); + TVec3f body6Offs = TVec3f(0.0f, 0.0f, 0.0f); const char* body6Name = "body6"; MR::addHitSensorMtx(this, body6Name, ATYPE_POWER_STAR_BIND, 8, 80.0f, getBaseMtx(), body6Offs); } -void PowerStar::initShadow(const JMapInfoIter &rIter) { +void PowerStar::initShadow(const JMapInfoIter& rIter) { if (!mIsGrandStar) { bool arg3 = false; MR::getJMapInfoArg3NoInit(rIter, &arg3); @@ -477,8 +456,7 @@ void PowerStar::initShadow(const JMapInfoIter &rIter) { MR::initShadowFromCSV(this, "Shadow"); MR::invalidateShadowAll(this); MR::validateShadowGroup(this, thing ? "円柱" : "通常"); - } - else { + } else { MR::initShadowFromCSV(this, "Shadow"); } } @@ -525,9 +503,9 @@ void PowerStar::endAppearDemo() { setNerve(&NrvPowerStar::PowerStarNrvWait::sInstance); } -PowerStarAppearPoint* PowerStar::getNearestAppearPoint(const TVec3f &rPos) const { - LiveActorGroup* pGroup = MR::getGroupFromArray(this); - f32 minDist = 3.4028235e38f; +PowerStarAppearPoint* PowerStar::getNearestAppearPoint(const TVec3f& rPos) const { + LiveActorGroup* pGroup = MR::getGroupFromArray(this); + f32 minDist = 3.4028235e38f; PowerStarAppearPoint* pNearestAppearPoint = nullptr; for (int i = 0; i < pGroup->mObjectCount; i++) { @@ -565,36 +543,31 @@ ActorCameraInfo* PowerStar::getAppearCameraInfo() const { void PowerStar::requestAppearOrWait() { if (MR::isDemoCast(this, 0)) { setNerve(&NrvPowerStar::PowerStarNrvWeak::sInstance); - } - else if (mIsInDemo) { + } else if (mIsInDemo) { if (_11C) { MR::invalidateClipping(this); MR::requestMovementOn(this); if (MR::isStageKoopaVs()) { setNerve(&NrvPowerStar::PowerStarNrvAppearDemoKoopa::sInstance); - } - else { + } else { setNerve(&NrvPowerStar::PowerStarNrvAppearDemoRise::sInstance); } - } - else { + } else { requestAppear(); } - } - else { + } else { setNerve(&NrvPowerStar::PowerStarNrvWait::sInstance); } } -void PowerStar::calcAppearDemoRiseTrans(TVec3f *pOutTrans, f32 a2) const { +void PowerStar::calcAppearDemoRiseTrans(TVec3f* pOutTrans, f32 a2) const { if (_125) { MR::calcGravityVector(this, _AC, pOutTrans, 0, 0); pOutTrans->x *= -a2; pOutTrans->y = (pOutTrans->y * -a2); pOutTrans->z = (pOutTrans->z * -a2); - } - else { + } else { TVec3f vec; vec.y = a2; vec.x = 0.0f; @@ -614,8 +587,7 @@ void PowerStar::processWait(f32 val) { if (mIsGrandStar) { if (MR::changeShowModelFlagSyncNearClipping(this, 250.0f)) { MR::onDrawEffect(this); - } - else { + } else { MR::offDrawEffect(this); } } @@ -624,8 +596,7 @@ void PowerStar::processWait(f32 val) { if (MR::isJudgedToClipFrustum100m(mPosition, 5000.0f)) { MR::hideModelAndOnCalcAnimIfShown(this); MR::forceDeleteEffect(this, "Light"); - } - else { + } else { MR::showModelIfHidden(this); MR::emitEffect(this, "Light"); } @@ -634,8 +605,7 @@ void PowerStar::processWait(f32 val) { if (!_164) { if (MR::isInWater(this, TVec3f(0.0f, 0.0f, 0.0f))) { MR::startLevelSound(this, "SE_OJ_LV_POW_STAR_EXIST_W", -1, -1, -1); - } - else { + } else { MR::startLevelSound(this, "SE_OJ_LV_POW_STAR_EXIST", -1, -1, -1); } } @@ -643,7 +613,6 @@ void PowerStar::processWait(f32 val) { #endif void PowerStar::exeWaitStartAppear() { - } #ifdef NON_MATCHING @@ -662,8 +631,7 @@ void PowerStar::exeAppearDemoRise() { TVec3f stack_8(0.0f, 0.0f, 0.0f); if (MR::isInWater(this, stack_8)) { MR::startLevelSound(this, "SE_OJ_LV_POW_STAR_EXIST_W", -1, -1, -1); - } - else { + } else { MR::startLevelSound(this, "SE_OJ_LV_POW_STAR_EXIST", -1, -1, -1); } @@ -734,5 +702,4 @@ void PowerStar::exeWeakToWait() { // PowerStar::exeStageClearDemo PowerStar::~PowerStar() { - } diff --git a/src/Game/MapObj/PowerStarAppearPoint.cpp b/src/Game/MapObj/PowerStarAppearPoint.cpp index 866cf4ab1..9e433c6cd 100644 --- a/src/Game/MapObj/PowerStarAppearPoint.cpp +++ b/src/Game/MapObj/PowerStarAppearPoint.cpp @@ -1,15 +1,15 @@ #include "Game/MapObj/PowerStarAppearPoint.hpp" #include "Game/Util.hpp" -PowerStarAppearPoint::PowerStarAppearPoint(const char *pName) : LiveActor(pName) { +PowerStarAppearPoint::PowerStarAppearPoint(const char* pName) + : LiveActor(pName) { mCameraInfo = 0; } PowerStarAppearPoint::~PowerStarAppearPoint() { - } -void PowerStarAppearPoint::init(const JMapInfoIter &rIter) { +void PowerStarAppearPoint::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::joinToGroupArray(this, rIter, "パワースター出現ポイントグループ", 0x10); MR::initActorCamera(this, rIter, &mCameraInfo); diff --git a/src/Game/MapObj/PowerStarHolder.cpp b/src/Game/MapObj/PowerStarHolder.cpp index 28eabe487..98002a849 100644 --- a/src/Game/MapObj/PowerStarHolder.cpp +++ b/src/Game/MapObj/PowerStarHolder.cpp @@ -1,16 +1,16 @@ #include "Game/MapObj/PowerStarHolder.hpp" #include "Game/NPC/EventDirector.hpp" -PowerStarHolder::PowerStarHolder(const char *pName) : NameObj(pName) { +PowerStarHolder::PowerStarHolder(const char* pName) + : NameObj(pName) { mNumInfos = 0; MR::zeroMemory(mInfos, sizeof(mInfos)); } -void PowerStarHolder::init(const JMapInfoIter &) { - +void PowerStarHolder::init(const JMapInfoIter&) { } -void PowerStarHolder::registerPowerStar(PowerStar *pStar, int starNum) { +void PowerStarHolder::registerPowerStar(PowerStar* pStar, int starNum) { PowerStarRequestInfo* info = new PowerStarRequestInfo(); info->mStar = pStar; info->mStarNum = starNum; @@ -19,7 +19,7 @@ void PowerStarHolder::registerPowerStar(PowerStar *pStar, int starNum) { mNumInfos++; } -void PowerStarHolder::requestAppearPowerStar(int starNum, const TVec3f *pPos, bool forceAppear) { +void PowerStarHolder::requestAppearPowerStar(int starNum, const TVec3f* pPos, bool forceAppear) { PowerStarRequestInfo* info = findPowerStarRequestInfo(starNum); info->mIsAppear = true; PowerStar* star = info->mStar; @@ -31,8 +31,7 @@ void PowerStarHolder::requestAppearPowerStar(int starNum, const TVec3f *pPos, bo if (forceAppear) { star->_11C = true; star->appear(); - } - else { + } else { star->requestAppear(); } } @@ -70,10 +69,10 @@ PowerStarRequestInfo* PowerStarHolder::findPowerStarRequestInfo(int starNum) con } namespace MR { - void registerPowerStar(PowerStar *pStar, int starNum) { + void registerPowerStar(PowerStar* pStar, int starNum) { EventFunction::getPowerStarHolder()->registerPowerStar(pStar, starNum); } -}; +}; // namespace MR bool PowerStarFunction::isEndPowerStarAppearDemo(int starNum) { return EventFunction::getPowerStarHolder()->getAppearedPowerStar(starNum)->isEndAppearDemo(); @@ -84,5 +83,4 @@ PowerStar* PowerStarFunction::findPowerStar(int starNum) { } PowerStarHolder::~PowerStarHolder() { - } diff --git a/src/Game/MapObj/PressureBase.cpp b/src/Game/MapObj/PressureBase.cpp index 15db95ac1..d03796814 100644 --- a/src/Game/MapObj/PressureBase.cpp +++ b/src/Game/MapObj/PressureBase.cpp @@ -1,11 +1,12 @@ #include "Game/MapObj/PressureBase.hpp" -PressureMessenger::PressureMessenger(MsgSharedGroup *pGroup, const char *pName) : LiveActor(pName) { +PressureMessenger::PressureMessenger(MsgSharedGroup* pGroup, const char* pName) + : LiveActor(pName) { mSharedGroup = pGroup; _90 = 0; } -void PressureMessenger::init(const JMapInfoIter &rIter) { +void PressureMessenger::init(const JMapInfoIter& rIter) { MR::connectToSceneMapObjMovement(this); initHitSensor(1); MR::addBodyMessageSensorMapObj(this); @@ -21,7 +22,8 @@ void PressureMessenger::exeSync() { } } -PressureBase::PressureBase(const char *pName) : LiveActor(pName) { +PressureBase::PressureBase(const char* pName) + : LiveActor(pName) { mJointController = nullptr; mFront.x = 0.0f; mFront.y = 0.0f; @@ -37,7 +39,7 @@ PressureBase::PressureBase(const char *pName) : LiveActor(pName) { _BC = 0; } -void PressureBase::init(const JMapInfoIter &rIter) { +void PressureBase::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); const char* objName; MR::getObjectName(&objName, rIter); @@ -60,7 +62,7 @@ void PressureBase::init(const JMapInfoIter &rIter) { //_B0 = ((frame ^ mWaitTime >> 1) - (frame ^ mWaitTime) < 0; initBullet(rIter); MR::getJMapInfoArg2NoInit(rIter, &mBallSpeed); - MR::getJMapInfoArg3NoInit(rIter, &mShotType); + MR::getJMapInfoArg3NoInit(rIter, &mShotType); MR::calcGravity(this); MR::setGroupClipping(this, rIter, 32); mGroup = MR::joinToGroupArray(this, rIter, "プレッシャー軍団", 0x20); @@ -72,27 +74,24 @@ void PressureBase::init(const JMapInfoIter &rIter) { mMessenger = new PressureMessenger(mGroup, "プレッシャー同期メッセンジャー"); mMessenger->initWithoutIter(); } - } MR::tryRegisterDemoCast(this, rIter); MR::useStageSwitchSleep(this, rIter); - + if (MR::useStageSwitchReadA(this, rIter)) { void (PressureBase::*relaxFunc)(void) = &PressureBase::startRelax; void (PressureBase::*waitFunc)(void) = &PressureBase::startWait; MR::listenStageSwitchOnOffA(this, MR::Functor(this, relaxFunc), MR::Functor(this, waitFunc)); initNerve(&NrvPressureBase::PressureBaseNrvRelax::sInstance); - } - else { + } else { initNerve(&NrvPressureBase::PressureBaseNrvFirstWait::sInstance); } if (MR::useStageSwitchReadAppear(this, rIter)) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { makeActorAppeared(); } } @@ -131,8 +130,7 @@ void PressureBase::exeBound() { if (MR::isFirstStep(this)) { if (isNerve(&NrvPressureBase::PressureBaseNrvRelaxStart::sInstance)) { MR::startBck(this, "SwitchOff", nullptr); - } - else { + } else { MR::startBck(this, "SwitchOn", nullptr); } } @@ -143,16 +141,14 @@ void PressureBase::exeBound() { if (isNerve(&NrvPressureBase::PressureBaseNrvRelaxStart::sInstance)) { _9C = mNozzleRotation + scale; - } - else { + } else { _9C = -45.0f - scale; } if (MR::isStep(this, 0x14)) { if (isNerve(&NrvPressureBase::PressureBaseNrvRelaxStart::sInstance)) { setNerve(&NrvPressureBase::PressureBaseNrvRelax::sInstance); - } - else { + } else { setNerve(&NrvPressureBase::PressureBaseNrvWait::sInstance); } } @@ -161,8 +157,7 @@ void PressureBase::exeBound() { void PressureBase::exeWait() { if (mWaitTime == MR::getBckFrameMax(this, "ShotStart") + getNerveStep()) { setNerve(&NrvPressureBase::PressureBaseNrvPrepareToShot::sInstance); - } - else if (MR::isStep(this, mWaitTime)) { + } else if (MR::isStep(this, mWaitTime)) { setNerve(&NrvPressureBase::PressureBaseNrvShot::sInstance); } } @@ -181,8 +176,7 @@ void PressureBase::exeShot() { if (MR::isFirstStep(this)) { if (_B0) { MR::startBck(this, "ShortShot", nullptr); - } - else { + } else { MR::startBck(this, "Shot", nullptr); } } @@ -191,8 +185,7 @@ void PressureBase::exeShot() { if (MR::isStep(this, 0x36)) { shotBullet(mBallSpeed); } - } - else { + } else { if (MR::isStep(this, 0x10)) { shotBullet(mBallSpeed); } @@ -201,27 +194,25 @@ void PressureBase::exeShot() { if (MR::isBckStopped(this)) { if (mGroup != nullptr) { setNerve(&NrvPressureBase::PressureBaseNrvSyncWait::sInstance); - } - else { + } else { setNerve(&NrvPressureBase::PressureBaseNrvWait::sInstance); } } } -void PressureBase::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void PressureBase::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver) || MR::isSensorEnemy(pReceiver)) { MR::sendMsgPush(pReceiver, pSender); } } -bool PressureBase::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool PressureBase::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { return MR::isMsgStarPieceReflect(msg); } -bool PressureBase::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool PressureBase::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (msg == ACTMES_GROUP_MOVE_START) { - bool v5 = isNerve(&NrvPressureBase::PressureBaseNrvRelaxStart::sInstance) - || isNerve(&NrvPressureBase::PressureBaseNrvRelax::sInstance); + bool v5 = isNerve(&NrvPressureBase::PressureBaseNrvRelaxStart::sInstance) || isNerve(&NrvPressureBase::PressureBaseNrvRelax::sInstance); if (v5) { return false; @@ -242,8 +233,7 @@ void PressureBase::startWait() { } void PressureBase::startRelax() { - bool isRelax = isNerve(&NrvPressureBase::PressureBaseNrvRelaxStart::sInstance) - || isNerve(&NrvPressureBase::PressureBaseNrvRelax::sInstance); + bool isRelax = isNerve(&NrvPressureBase::PressureBaseNrvRelaxStart::sInstance) || isNerve(&NrvPressureBase::PressureBaseNrvRelax::sInstance); if (!isRelax) { MR::startSound(this, "SE_OJ_W_PRESS_HEAD_OFF", -1, -1); @@ -251,8 +241,7 @@ void PressureBase::startRelax() { } } -void PressureBase::initBullet(const JMapInfoIter &) { - +void PressureBase::initBullet(const JMapInfoIter&) { } bool PressureBase::shotBullet(f32) { @@ -283,22 +272,22 @@ namespace NrvPressureBase { INIT_NERVE(PressureBaseNrvPrepareToShot); INIT_NERVE(PressureBaseNrvShot); - void PressureBaseNrvShot::execute(Spine *pSpine) const { + void PressureBaseNrvShot::execute(Spine* pSpine) const { PressureBase* pressure = reinterpret_cast(pSpine->mExecutor); pressure->exeShot(); } - void PressureBaseNrvPrepareToShot::execute(Spine *pSpine) const { + void PressureBaseNrvPrepareToShot::execute(Spine* pSpine) const { PressureBase* pressure = reinterpret_cast(pSpine->mExecutor); pressure->exePrepareToShot(); } - void PressureBaseNrvWait::execute(Spine *pSpine) const { + void PressureBaseNrvWait::execute(Spine* pSpine) const { PressureBase* pressure = reinterpret_cast(pSpine->mExecutor); pressure->exeWait(); } - void PressureBaseNrvFirstWait::execute(Spine *pSpine) const { + void PressureBaseNrvFirstWait::execute(Spine* pSpine) const { PressureBase* pressure = reinterpret_cast(pSpine->mExecutor); if (MR::isStep(pressure, pressure->mWaitTime)) { @@ -306,11 +295,10 @@ namespace NrvPressureBase { } } - void PressureBaseNrvSyncWait::execute(Spine *pSpine) const { - + void PressureBaseNrvSyncWait::execute(Spine* pSpine) const { } - void PressureBaseNrvRelax::execute(Spine *pSpine) const { + void PressureBaseNrvRelax::execute(Spine* pSpine) const { PressureBase* pressure = reinterpret_cast(pSpine->mExecutor); if (MR::isFirstStep(pressure)) { @@ -318,24 +306,23 @@ namespace NrvPressureBase { } } - void PressureBaseNrvWaitStart::execute(Spine *pSpine) const { + void PressureBaseNrvWaitStart::execute(Spine* pSpine) const { PressureBase* pressure = reinterpret_cast(pSpine->mExecutor); pressure->exeBound(); } - void PressureBaseNrvRelaxStart::execute(Spine *pSpine) const { + void PressureBaseNrvRelaxStart::execute(Spine* pSpine) const { PressureBase* pressure = reinterpret_cast(pSpine->mExecutor); pressure->exeBound(); } -}; +}; // namespace NrvPressureBase namespace NrvPressureMessenger { - void PressureMessengerNrvSync::execute(Spine *pSpine) const { + void PressureMessengerNrvSync::execute(Spine* pSpine) const { PressureMessenger* mess = reinterpret_cast(pSpine->mExecutor); mess->exeSync(); } -}; +}; // namespace NrvPressureMessenger PressureMessenger::~PressureMessenger() { - } \ No newline at end of file diff --git a/src/Game/MapObj/PrizeRing.cpp b/src/Game/MapObj/PrizeRing.cpp index 64763abf9..4b44158ec 100644 --- a/src/Game/MapObj/PrizeRing.cpp +++ b/src/Game/MapObj/PrizeRing.cpp @@ -1,21 +1,21 @@ #include "Game/MapObj/PrizeRing.hpp" -PrizeRing::PrizeRing() : ModelObj("PrizeRing", "PrizeRing", nullptr, -2, -2, -2, false) { +PrizeRing::PrizeRing() + : ModelObj("PrizeRing", "PrizeRing", nullptr, -2, -2, -2, false) { _90 = 800; } PrizeRing::~PrizeRing() { - } -void PrizeRing::init(const JMapInfoIter &rIter) { +void PrizeRing::init(const JMapInfoIter& rIter) { initNerve(&NrvPrizeRing::PrizeRingStart::sInstance); initHitSensor(1); TVec3f vec; - vec.x = 0.0f; - vec.y = 0.0f; - vec.z = 0.0f; - MR::addHitSensorMapObjSimple(this, "body", 4, 300.0f, vec); + vec.x = 0.0f; + vec.y = 0.0f; + vec.z = 0.0f; + MR::addHitSensorMapObjSimple(this, "body", 4, 300.0f, vec); makeActorDead(); } @@ -47,8 +47,7 @@ void PrizeRing::setNervePass() { bool PrizeRing::isReadyToPass() const { if (MR::isDead(this)) { return false; - } - else { + } else { return isNerve(&NrvPrizeRing::PrizeRingReadyToPass::sInstance); } } @@ -56,8 +55,7 @@ bool PrizeRing::isReadyToPass() const { bool PrizeRing::isReadyToKill() const { if (MR::isDead(this)) { return false; - } - else { + } else { return isNerve(&NrvPrizeRing::PrizeRingReadyToKill::sInstance); } } @@ -105,7 +103,7 @@ void PrizeRing::exePass() { if (MR::isFirstStep(this)) { MR::startBck(this, "End", nullptr); MR::startBrk(this, "End"); - MR::tryRumblePadMiddle(this, 0); + MR::tryRumblePadMiddle(this, 0); PrizeRing::playSound(); } @@ -123,12 +121,12 @@ bool PrizeRing::isPassed() const { } */ -void PrizeRing::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void PrizeRing::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver)) { if (!PrizeRing::isPassed()) { setNerve(&NrvPrizeRing::PrizeRingReadyToPass::sInstance); } - } + } } namespace NrvPrizeRing { @@ -137,33 +135,32 @@ namespace NrvPrizeRing { INIT_NERVE(PrizeRingTimeout); INIT_NERVE(PrizeRingReadyToPass); INIT_NERVE(PrizeRingPass); - INIT_NERVE(PrizeRingReadyToKill); + INIT_NERVE(PrizeRingReadyToKill); - void PrizeRingStart::execute(Spine *pSpine) const { - PrizeRing *pActor = (PrizeRing*)pSpine->mExecutor; - pActor->exeStart(); - } + void PrizeRingStart::execute(Spine* pSpine) const { + PrizeRing* pActor = (PrizeRing*)pSpine->mExecutor; + pActor->exeStart(); + } - void PrizeRingLoop::execute(Spine *pSpine) const { - PrizeRing *pActor = (PrizeRing*)pSpine->mExecutor; - pActor->exeLoop(); - } + void PrizeRingLoop::execute(Spine* pSpine) const { + PrizeRing* pActor = (PrizeRing*)pSpine->mExecutor; + pActor->exeLoop(); + } - void PrizeRingTimeout::execute(Spine *pSpine) const { - PrizeRing *pActor = (PrizeRing*)pSpine->mExecutor; - pActor->exeTimeout(); - } - void PrizeRingReadyToPass::execute(Spine *pSpine) const { - } + void PrizeRingTimeout::execute(Spine* pSpine) const { + PrizeRing* pActor = (PrizeRing*)pSpine->mExecutor; + pActor->exeTimeout(); + } + void PrizeRingReadyToPass::execute(Spine* pSpine) const { + } - void PrizeRingPass::execute(Spine *pSpine) const { - PrizeRing *pActor = (PrizeRing*)pSpine->mExecutor; - pActor->exePass(); - } - - void PrizeRingReadyToKill::execute(Spine *pSpine) const { - PrizeRing *pActor = (PrizeRing*)pSpine->mExecutor; - pActor->exeReadyToKill(); - } -}; + void PrizeRingPass::execute(Spine* pSpine) const { + PrizeRing* pActor = (PrizeRing*)pSpine->mExecutor; + pActor->exePass(); + } + void PrizeRingReadyToKill::execute(Spine* pSpine) const { + PrizeRing* pActor = (PrizeRing*)pSpine->mExecutor; + pActor->exeReadyToKill(); + } +}; // namespace NrvPrizeRing diff --git a/src/Game/MapObj/PunchingKinoko.cpp b/src/Game/MapObj/PunchingKinoko.cpp index 310f7ae40..3d1ae7151 100644 --- a/src/Game/MapObj/PunchingKinoko.cpp +++ b/src/Game/MapObj/PunchingKinoko.cpp @@ -1,14 +1,15 @@ #include #include "Game/MapObj/PunchingKinoko.hpp" -PunchingKinoko::PunchingKinoko(const char *pName) : LiveActor(pName), - mGroundChecker(nullptr), mScaleController(nullptr), mDelegator(nullptr), _98(-1), _9C(0, 0, 0), _A8(0, 1, 0) { - mStarPointerHitCoolDown = 0; - _B8 = true; - mInvincibleHitCoolDown = -1; +PunchingKinoko::PunchingKinoko(const char* pName) + : LiveActor(pName), + mGroundChecker(nullptr), mScaleController(nullptr), mDelegator(nullptr), _98(-1), _9C(0, 0, 0), _A8(0, 1, 0) { + mStarPointerHitCoolDown = 0; + _B8 = true; + mInvincibleHitCoolDown = -1; } -void PunchingKinoko::init(const JMapInfoIter &rIter) { +void PunchingKinoko::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("PunchingKinoko", nullptr, false); MR::connectToSceneNoSilhouettedMapObj(this); @@ -22,7 +23,7 @@ void PunchingKinoko::init(const JMapInfoIter &rIter) { mScaleController = new AnimScaleController(nullptr); - TVec3f *groundCheckerPos = &mGroundChecker->mPosition; + TVec3f* groundCheckerPos = &mGroundChecker->mPosition; MR::initStarPointerTargetAtPos(this, 70.0f, groundCheckerPos, TVec3f(0, 0, 0)); initShadow(); @@ -36,7 +37,7 @@ void PunchingKinoko::init(const JMapInfoIter &rIter) { makeActorAppeared(); if (MR::useStageSwitchReadB(this, rIter) != 0) { - MR::FunctorV0M functor = MR::Functor(this, &PunchingKinoko::kill); + MR::FunctorV0M functor = MR::Functor(this, &PunchingKinoko::kill); MR::listenStageSwitchOnB(this, functor); } MR::useStageSwitchSleep(this, rIter); @@ -58,7 +59,7 @@ void PunchingKinoko::initShadow() { MR::addShadowVolumeLine(this, "つた", this, "体", 10.0f, this, "頭", 10.0f); } -void PunchingKinoko::initCamera(const JMapInfoIter &rIter) { +void PunchingKinoko::initCamera(const JMapInfoIter& rIter) { MR::getJMapInfoArg7WithInit(rIter, &_98); if (_98 != -1) { MR::declareCameraRegisterVec(this, _98, &_9C); @@ -69,7 +70,7 @@ void PunchingKinoko::initJointControl() { mDelegator = MR::createJointDelegatorWithNullChildFunc(this, &PunchingKinoko::ballMtxCallBack, "Ball"); } -bool PunchingKinoko::ballMtxCallBack(TPos3f *a1, const JointControllerInfo &joint) { +bool PunchingKinoko::ballMtxCallBack(TPos3f* a1, const JointControllerInfo& joint) { TVec3f stack_8; PSVECSubtract(&mGroundChecker->mPosition, &mPosition, &stack_8); MR::orthogonalize(a1); @@ -83,7 +84,7 @@ bool PunchingKinoko::ballMtxCallBack(TPos3f *a1, const JointControllerInfo &join MR::scaleMtxToDir(&stack_14, _A8, mScaleController->_C); a1->concat(stack_14, *a1); - TVec3f *groundCheckerPos = &mGroundChecker->mPosition; + TVec3f* groundCheckerPos = &mGroundChecker->mPosition; a1->mMtx[0][0] = groundCheckerPos->x; a1->mMtx[1][1] = groundCheckerPos->y; a1->mMtx[2][2] = groundCheckerPos->z; @@ -196,7 +197,7 @@ void PunchingKinoko::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { } */ -bool PunchingKinoko::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool PunchingKinoko::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (isCrushed()) { return false; } @@ -248,7 +249,7 @@ bool PunchingKinoko::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSens return false; } -bool PunchingKinoko::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool PunchingKinoko::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (isCrushed()) { return false; } @@ -268,7 +269,7 @@ bool PunchingKinoko::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSenso return false; } -bool PunchingKinoko::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { +bool PunchingKinoko::receiveMsgPush(HitSensor* pSender, HitSensor* pReceiver) { if (isCrushed()) { return false; } @@ -282,8 +283,7 @@ bool PunchingKinoko::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { f32 fVar1 = stack_14.dot(mGroundChecker->mVelocity); if (fVar1 < 0.0f) { fVar1 = 3.0f; - } - else { + } else { fVar1 = 3.0f - fVar1; } @@ -297,7 +297,7 @@ bool PunchingKinoko::receiveMsgPush(HitSensor *pSender, HitSensor *pReceiver) { return false; } -bool PunchingKinoko::requestPunch(HitSensor *pOtherSensor, HitSensor *pMySensor) { +bool PunchingKinoko::requestPunch(HitSensor* pOtherSensor, HitSensor* pMySensor) { if (isCrushed()) { return false; } @@ -325,7 +325,7 @@ bool PunchingKinoko::requestPunch(HitSensor *pOtherSensor, HitSensor *pMySensor) return false; } -bool PunchingKinoko::requestEnemyBlow(HitSensor *pOtherSensor, HitSensor *pMySensor) { +bool PunchingKinoko::requestEnemyBlow(HitSensor* pOtherSensor, HitSensor* pMySensor) { if (!isEnableBlowed()) { return false; } @@ -342,7 +342,7 @@ bool PunchingKinoko::requestEnemyBlow(HitSensor *pOtherSensor, HitSensor *pMySen return true; } -bool PunchingKinoko::requestTrample(HitSensor *pOtherSensor, HitSensor *pMySensor) { +bool PunchingKinoko::requestTrample(HitSensor* pOtherSensor, HitSensor* pMySensor) { if (isEnableTrample()) { TVec3f stack_14; MR::calcSensorDirectionNormalize(&stack_14, pOtherSensor, pMySensor); @@ -376,9 +376,9 @@ void PunchingKinoko::exeWait() { TVec3f stack_2C; MR::calcPositionUpOffset(&stack_38, this, 130.0f); - TVec3f *groundCheckerPos = &mGroundChecker->mPosition; - TVec3f stack_20; - TVec3f stack_14(stack_38); + TVec3f* groundCheckerPos = &mGroundChecker->mPosition; + TVec3f stack_20; + TVec3f stack_14(stack_38); PSVECSubtract(&stack_14, groundCheckerPos, &stack_14); stack_20 = stack_14; @@ -402,20 +402,19 @@ void PunchingKinoko::exeWait() { } } _B8 = true; - } - else { + } else { _B8 = false; } MR::vecBlend(_9C, mPosition, &_9C, 0.05f); } void PunchingKinoko::exeSwing() { - f32 var2 = MR::calcVelocityLength(mGroundChecker); + f32 var2 = MR::calcVelocityLength(mGroundChecker); TVec3f stack_20; MR::calcPositionUpOffset(&stack_20, this, 130.0f); - TVec3f *groundCheckerPos = &mGroundChecker->mPosition; - TVec3f stack_14(stack_20); + TVec3f* groundCheckerPos = &mGroundChecker->mPosition; + TVec3f stack_14(stack_20); PSVECSubtract(&stack_14, groundCheckerPos, &stack_14); TVec3f stack_8(stack_14); @@ -448,13 +447,12 @@ void PunchingKinoko::exePointSnaped() { void PunchingKinoko::exePunched() { if (MR::isFirstStep(this)) { - } MR::startLevelSound(this, "SE_OJ_LV_PNC_KINOKO_PUNCHED", -1, -1, -1); addVelocityKeepHeight(); MR::attenuateVelocity(mGroundChecker, 0.99f); - HitSensor *sensor = getSensor("Head"); + HitSensor* sensor = getSensor("Head"); MR::sendMsgEnemyAttackToBindedSensor(mGroundChecker, sensor); _9C.set(mGroundChecker->mPosition); @@ -469,7 +467,7 @@ void PunchingKinoko::exePunchedBrake() { MR::startLevelSound(this, "SE_OJ_LV_PNC_KINOKO_PUNCHED", -1, -1, -1); _9C.set(mGroundChecker->mPosition); if (!MR::isGreaterStep(this, 40)) { - HitSensor *sensor = getSensor("Head"); + HitSensor* sensor = getSensor("Head"); if (!MR::sendMsgEnemyAttackToBindedSensor(mGroundChecker, sensor)) { return; } @@ -499,8 +497,7 @@ void PunchingKinoko::exeCrushed() { TVec3f stack_8(_A8); stack_8.scale(20.0f); mGroundChecker->mPosition.add(stack_8); - } - else { + } else { _A8.set(mGravity); } @@ -518,7 +515,6 @@ void PunchingKinoko::exeCrushed() { void PunchingKinoko::exeCrushedEnd() { if (MR::isFirstStep(this)) { - } if (MR::isStep(this, 10)) { @@ -529,9 +525,9 @@ void PunchingKinoko::exeCrushedEnd() { TVec3f stack_20; MR::calcPositionUpOffset(&stack_20, this, 130.0f); - TVec3f *groundCheckerPos = &mGroundChecker->mPosition; - TVec3f stack_14; - TVec3f stack_8(stack_20); + TVec3f* groundCheckerPos = &mGroundChecker->mPosition; + TVec3f stack_14; + TVec3f stack_8(stack_20); PSVECSubtract(&stack_8, groundCheckerPos, &stack_8); stack_14 = stack_8; stack_14.scale(0.008f); @@ -553,8 +549,7 @@ void PunchingKinoko::addVelocityKeepHeight() { } bool PunchingKinoko::isEnablePunched() const { - if (isNerve(&NrvPunchingKinoko::PunchingKinokoNrvWait::sInstance) - || isNerve(&NrvPunchingKinoko::PunchingKinokoNrvSwing::sInstance)) { + if (isNerve(&NrvPunchingKinoko::PunchingKinokoNrvWait::sInstance) || isNerve(&NrvPunchingKinoko::PunchingKinokoNrvSwing::sInstance)) { return true; } return false; @@ -565,11 +560,7 @@ bool PunchingKinoko::isEnableHitPlayer() const { } bool PunchingKinoko::isEnableEnemyAttack() const { - if (isNerve(&NrvPunchingKinoko::PunchingKinokoNrvSwing::sInstance) - || isNerve(&NrvPunchingKinoko::PunchingKinokoNrvPunched::sInstance) - || isNerve(&NrvPunchingKinoko::PunchingKinokoNrvPunchedBrake::sInstance) - || isNerve(&NrvPunchingKinoko::PunchingKinokoNrvPointSnaped::sInstance)) - { + if (isNerve(&NrvPunchingKinoko::PunchingKinokoNrvSwing::sInstance) || isNerve(&NrvPunchingKinoko::PunchingKinokoNrvPunched::sInstance) || isNerve(&NrvPunchingKinoko::PunchingKinokoNrvPunchedBrake::sInstance) || isNerve(&NrvPunchingKinoko::PunchingKinokoNrvPointSnaped::sInstance)) { return true; } @@ -577,9 +568,7 @@ bool PunchingKinoko::isEnableEnemyAttack() const { } bool PunchingKinoko::isEnableCrushed() const { - if (isNerve(&NrvPunchingKinoko::PunchingKinokoNrvWait::sInstance) - || isNerve(&NrvPunchingKinoko::PunchingKinokoNrvCrushedEnd::sInstance)) - { + if (isNerve(&NrvPunchingKinoko::PunchingKinokoNrvWait::sInstance) || isNerve(&NrvPunchingKinoko::PunchingKinokoNrvCrushedEnd::sInstance)) { return true; } @@ -587,9 +576,7 @@ bool PunchingKinoko::isEnableCrushed() const { } bool PunchingKinoko::isEnableTrample() const { - if (isNerve(&NrvPunchingKinoko::PunchingKinokoNrvCrushed::sInstance) - || isNerve(&NrvPunchingKinoko::PunchingKinokoNrvCrushedEnd::sInstance)) - { + if (isNerve(&NrvPunchingKinoko::PunchingKinokoNrvCrushed::sInstance) || isNerve(&NrvPunchingKinoko::PunchingKinokoNrvCrushedEnd::sInstance)) { return false; } @@ -614,40 +601,39 @@ namespace NrvPunchingKinoko { INIT_NERVE(PunchingKinokoNrvCrushed); INIT_NERVE(PunchingKinokoNrvCrushedEnd); - void PunchingKinokoNrvWait::execute(Spine *pSpine) const { + void PunchingKinokoNrvWait::execute(Spine* pSpine) const { PunchingKinoko* kinoko = reinterpret_cast(pSpine->mExecutor); kinoko->exeWait(); }; - void PunchingKinokoNrvSwing::execute(Spine *pSpine) const { + void PunchingKinokoNrvSwing::execute(Spine* pSpine) const { PunchingKinoko* kinoko = reinterpret_cast(pSpine->mExecutor); kinoko->exeSwing(); }; - void PunchingKinokoNrvPunched::execute(Spine *pSpine) const { + void PunchingKinokoNrvPunched::execute(Spine* pSpine) const { PunchingKinoko* kinoko = reinterpret_cast(pSpine->mExecutor); kinoko->exePunched(); }; - void PunchingKinokoNrvPunchedBrake::execute(Spine *pSpine) const { + void PunchingKinokoNrvPunchedBrake::execute(Spine* pSpine) const { PunchingKinoko* kinoko = reinterpret_cast(pSpine->mExecutor); kinoko->exePunchedBrake(); }; - void PunchingKinokoNrvHitted::execute(Spine *pSpine) const { + void PunchingKinokoNrvHitted::execute(Spine* pSpine) const { PunchingKinoko* kinoko = reinterpret_cast(pSpine->mExecutor); kinoko->exeHitted(); }; - void PunchingKinokoNrvPointSnaped::execute(Spine *pSpine) const { + void PunchingKinokoNrvPointSnaped::execute(Spine* pSpine) const { PunchingKinoko* kinoko = reinterpret_cast(pSpine->mExecutor); kinoko->exePointSnaped(); }; - void PunchingKinokoNrvCrushed::execute(Spine *pSpine) const { + void PunchingKinokoNrvCrushed::execute(Spine* pSpine) const { PunchingKinoko* kinoko = reinterpret_cast(pSpine->mExecutor); kinoko->exeCrushed(); }; - void PunchingKinokoNrvCrushedEnd::execute(Spine *pSpine) const { + void PunchingKinokoNrvCrushedEnd::execute(Spine* pSpine) const { PunchingKinoko* kinoko = reinterpret_cast(pSpine->mExecutor); kinoko->exeCrushedEnd(); }; -}; +}; // namespace NrvPunchingKinoko PunchingKinoko::~PunchingKinoko() { - } diff --git a/src/Game/MapObj/PurpleCoinHolder.cpp b/src/Game/MapObj/PurpleCoinHolder.cpp index 2e30f27cb..8b6d1e648 100644 --- a/src/Game/MapObj/PurpleCoinHolder.cpp +++ b/src/Game/MapObj/PurpleCoinHolder.cpp @@ -4,7 +4,8 @@ #include "Game/Scene/SceneObjHolder.hpp" #include "Game/Util.hpp" -PurpleCoinHolder::PurpleCoinHolder() : DeriveActorGroup("パープルコイン管理", 0x100) { +PurpleCoinHolder::PurpleCoinHolder() + : DeriveActorGroup("パープルコイン管理", 0x100) { mStarter = nullptr; MR::declarePowerStarCoin100(); MR::createPurpleCoinCounter(); @@ -25,17 +26,16 @@ namespace MR { MR::createSceneObj(SceneObj_PurpleCoinHolder); } - void addToPurpleCoinHolder(const NameObj *pObj, Coin *pCoin) { + void addToPurpleCoinHolder(const NameObj* pObj, Coin* pCoin) { MR::getSceneObj(SceneObj_PurpleCoinHolder)->registerActor(pCoin); } - void registPurpleCoinStarter(PurpleCoinStarter *pStarter) { + void registPurpleCoinStarter(PurpleCoinStarter* pStarter) { PurpleCoinHolder* holder = MR::getSceneObj(SceneObj_PurpleCoinHolder); holder->mStarter = pStarter; pStarter->setHost(holder); } -}; +}; // namespace MR PurpleCoinHolder::~PurpleCoinHolder() { - } \ No newline at end of file diff --git a/src/Game/MapObj/PurpleCoinStarter.cpp b/src/Game/MapObj/PurpleCoinStarter.cpp index 38c827d09..7d8afcb95 100644 --- a/src/Game/MapObj/PurpleCoinStarter.cpp +++ b/src/Game/MapObj/PurpleCoinStarter.cpp @@ -1,19 +1,20 @@ #include "Game/MapObj/PurpleCoinStarter.hpp" #include "Game/Util.hpp" -PurpleCoinStarter::PurpleCoinStarter(const char *pName) : NameObj(pName) { +PurpleCoinStarter::PurpleCoinStarter(const char* pName) + : NameObj(pName) { mCoinHolder = nullptr; mSwitchCtrl = nullptr; } -void PurpleCoinStarter::init(const JMapInfoIter &rIter) { +void PurpleCoinStarter::init(const JMapInfoIter& rIter) { mSwitchCtrl = MR::createStageSwitchCtrl(this, rIter); - MR::listenNameObjStageSwitchOnAppear(this, mSwitchCtrl, MR::FunctorV0M(this, &PurpleCoinStarter::start)); + MR::listenNameObjStageSwitchOnAppear(this, mSwitchCtrl, MR::FunctorV0M(this, &PurpleCoinStarter::start)); MR::createPurpleCoinHolder(); MR::registPurpleCoinStarter(this); } -void PurpleCoinStarter::setHost(PurpleCoinHolder *pHolder) { +void PurpleCoinStarter::setHost(PurpleCoinHolder* pHolder) { mCoinHolder = pHolder; } @@ -22,5 +23,4 @@ void PurpleCoinStarter::start() { } PurpleCoinStarter::~PurpleCoinStarter() { - } \ No newline at end of file diff --git a/src/Game/MapObj/QuarterRollGravityRoomArrow.cpp b/src/Game/MapObj/QuarterRollGravityRoomArrow.cpp index afc2ee804..5b0bf6a53 100644 --- a/src/Game/MapObj/QuarterRollGravityRoomArrow.cpp +++ b/src/Game/MapObj/QuarterRollGravityRoomArrow.cpp @@ -6,8 +6,8 @@ #include "Game/Util/JMapInfo.hpp" #include "Game/Util/LiveActorUtil.hpp" -QuarterRollGravityRoomArrow::QuarterRollGravityRoomArrow(const char* pName) : MapObjActor(pName) { - +QuarterRollGravityRoomArrow::QuarterRollGravityRoomArrow(const char* pName) + : MapObjActor(pName) { } void QuarterRollGravityRoomArrow::init(const JMapInfoIter& rIter) { @@ -18,7 +18,6 @@ void QuarterRollGravityRoomArrow::init(const JMapInfoIter& rIter) { initialize(rIter, info); } - void QuarterRollGravityRoomArrow::exeRollOnA() { if (MR::isFirstStep(this)) { MR::startBck(this, "RollGravityA", 0); @@ -41,7 +40,7 @@ void QuarterRollGravityRoomArrow::exeRollOnB() { } void QuarterRollGravityRoomArrow::exeRollOffB() { - if (MR::isFirstStep(this)) + if (MR::isFirstStep(this)) MR::startBck(this, "RollGravityBReverse", 0); if (MR::isBckStopped(this)) setNerve(&NrvQuarterRollGravityRoomArrow::QuarterRollGravityRoomArrowNrvWait::sInstance); @@ -82,4 +81,4 @@ namespace NrvQuarterRollGravityRoomArrow { QuarterRollGravityRoomArrowNrvRollOffA(QuarterRollGravityRoomArrowNrvRollOffA::sInstance); QuarterRollGravityRoomArrowNrvRollOnB(QuarterRollGravityRoomArrowNrvRollOnB::sInstance); QuarterRollGravityRoomArrowNrvRollOffB(QuarterRollGravityRoomArrowNrvRollOffB::sInstance); -} +} // namespace NrvQuarterRollGravityRoomArrow diff --git a/src/Game/MapObj/RailMoveObj.cpp b/src/Game/MapObj/RailMoveObj.cpp index f47b7f2b1..82df042b4 100644 --- a/src/Game/MapObj/RailMoveObj.cpp +++ b/src/Game/MapObj/RailMoveObj.cpp @@ -3,12 +3,13 @@ #include "Game/MapObj/MapPartsRailRotator.hpp" #include "Game/MapObj/StageEffectDataTable.hpp" -RailMoveObj::RailMoveObj(const char *pName) : MapObjActor(pName) { +RailMoveObj::RailMoveObj(const char* pName) + : MapObjActor(pName) { _C4.zero(); _D0 = 0; } -void RailMoveObj::init(const JMapInfoIter &rIter) { +void RailMoveObj::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; info.setupHioNode("地形オブジェ"); @@ -32,8 +33,7 @@ void RailMoveObj::init(const JMapInfoIter &rIter) { f32 radius = 0.0f; MR::calcModelBoundingRadius(&radius, this); MR::initAndSetRailClipping(&_C4, this, 100.0f, radius); - } - else { + } else { setNerve(&NrvRailMoveObj::HostTypeDone::sInstance); } @@ -77,13 +77,12 @@ void RailMoveObj::endClipped() { } } -void RailMoveObj::initCaseUseSwitchB(const MapObjActorInitInfo &rInitInfo) { +void RailMoveObj::initCaseUseSwitchB(const MapObjActorInitInfo& rInitInfo) { MapObjActor::initCaseUseSwitchB(rInitInfo); setNerve(&NrvRailMoveObj::HostTypeWait::sInstance); } -void RailMoveObj::initCaseNoUseSwitchB(const MapObjActorInitInfo &) { - +void RailMoveObj::initCaseNoUseSwitchB(const MapObjActorInitInfo&) { } void RailMoveObj::startMoveInner() { @@ -125,10 +124,8 @@ bool RailMoveObj::isMoving() const { return MapObjActorUtil::isRailMoverWorking(this); } -bool RailMoveObj::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - if (msg == ACTMES_MAPPARTS_DISAPPEAR_WITH_BLINK - && isNerve(&NrvRailMoveObj::HostTypeMove::sInstance)) - { +bool RailMoveObj::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + if (msg == ACTMES_MAPPARTS_DISAPPEAR_WITH_BLINK && isNerve(&NrvRailMoveObj::HostTypeMove::sInstance)) { kill(); return true; @@ -163,24 +160,23 @@ void RailMoveObj::exeMove() { if (mRailMover->isReachedEnd()) { if (mRailMover->isDone() && endMove()) { setNerve(&NrvRailMoveObj::HostTypeDone::sInstance); - } - else { + } else { doAtEndPoint(); } } } -RailMoveObjPress::RailMoveObjPress(const char *pName) : RailMoveObj(pName) { - +RailMoveObjPress::RailMoveObjPress(const char* pName) + : RailMoveObj(pName) { } -void RailMoveObjPress::init(const JMapInfoIter &rIter) { +void RailMoveObjPress::init(const JMapInfoIter& rIter) { RailMoveObj::init(rIter); MR::setBodySensorType(this, 0x76); } -RailMoveObjBreakAtEnd::RailMoveObjBreakAtEnd(const char *pName) : RailMoveObj(pName) { - +RailMoveObjBreakAtEnd::RailMoveObjBreakAtEnd(const char* pName) + : RailMoveObj(pName) { } void RailMoveObjBreakAtEnd::doAtEndPoint() { @@ -193,16 +189,16 @@ void RailMoveObjBreakAtEnd::doAtEndPoint() { kill(); } -void RailMoveIndirectObj::connectToScene(const MapObjActorInitInfo &rInfo) { +void RailMoveIndirectObj::connectToScene(const MapObjActorInitInfo& rInfo) { MR::connectToSceneIndirectMapObj(this); } -void RailMoveObjSwitchShadow::init(const JMapInfoIter &rIter) { +void RailMoveObjSwitchShadow::init(const JMapInfoIter& rIter) { RailMoveObj::init(rIter); MR::invalidateShadow(this, 0); } -void RailMoveObjSwitchShadow::initCaseUseSwitchA(const MapObjActorInitInfo &rInfo) { +void RailMoveObjSwitchShadow::initCaseUseSwitchA(const MapObjActorInitInfo& rInfo) { void (RailMoveObjSwitchShadow::*startFunc)(void) = &RailMoveObjSwitchShadow::startOnShadow; MR::listenStageSwitchOnA(this, MR::Functor(this, startFunc)); } @@ -211,11 +207,12 @@ void RailMoveObjSwitchShadow::startOnShadow() { MR::validateShadow(this, 0); } -RailDemoMoveObj::RailDemoMoveObj(const char *pName) : RailMoveObj(pName) { +RailDemoMoveObj::RailDemoMoveObj(const char* pName) + : RailMoveObj(pName) { mDemoControl = 0; } -void RailDemoMoveObj::init(const JMapInfoIter &rIter) { +void RailDemoMoveObj::init(const JMapInfoIter& rIter) { RailMoveObj::init(rIter); mDemoControl = new DemoCtrlBase(this, mObjectName); mDemoControl->init(rIter); @@ -266,15 +263,15 @@ bool RailDemoMoveObj::endMove() { return mDemoControl->isDone(); } -RailRotateMoveObj::RailRotateMoveObj(const char *pName) : RailMoveObj(pName) { - +RailRotateMoveObj::RailRotateMoveObj(const char* pName) + : RailMoveObj(pName) { } -void RailRotateMoveObj::setupInitInfo(const JMapInfoIter &rIter, MapObjActorInitInfo *pInfo) { +void RailRotateMoveObj::setupInitInfo(const JMapInfoIter& rIter, MapObjActorInitInfo* pInfo) { pInfo->setupRailRotator(); } -bool RailRotateMoveObj::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool RailRotateMoveObj::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (msg == ACTMES_MAPPARTS_START_ROTATE_AT_POINT) { return tryStartRotateAtPoint(); } @@ -291,7 +288,7 @@ bool RailRotateMoveObj::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor * return RailMoveObj::receiveOtherMsg(msg, pSender, pReceiver); } -void RailRotateMoveObj::initCaseUseSwitchB(const MapObjActorInitInfo &rInfo) { +void RailRotateMoveObj::initCaseUseSwitchB(const MapObjActorInitInfo& rInfo) { setNerve(&NrvRailMoveObj::HostTypeWait::sInstance); void (RailRotateMoveObj::*pauseFunc)(void) = &MapObjActor::pauseMapPartsFunctions; MR::listenStageSwitchOffB(this, MR::Functor(this, pauseFunc)); @@ -313,7 +310,7 @@ bool RailRotateMoveObj::tryStartRotateAtPoint() { bool RailRotateMoveObj::tryStartRotateBetweenPoints() { MapPartsRailRotator* rail_rotator = mRailRotator; - s32 cur_point = MR::getCurrentRailPointNo(this); + s32 cur_point = MR::getCurrentRailPointNo(this); if (!rail_rotator->hasRotationBetweenPoints(cur_point)) { return false; @@ -322,7 +319,7 @@ bool RailRotateMoveObj::tryStartRotateBetweenPoints() { f32 next_time = 0.0f; mRailMover->calcTimeToNextRailPoint(&next_time); MapPartsRailRotator* uhm = mRailRotator; - s32 new_point = MR::getCurrentRailPointNo(this); + s32 new_point = MR::getCurrentRailPointNo(this); uhm->rotateBetweenPoints(new_point, next_time); return true; } @@ -333,47 +330,41 @@ namespace NrvRailMoveObj { INIT_NERVE(HostTypeMove); INIT_NERVE(HostTypeDone); - void HostTypeDone::execute(Spine *pSpine) const { + void HostTypeDone::execute(Spine* pSpine) const { RailMoveObj* obj = reinterpret_cast(pSpine->mExecutor); obj->exeWait(); } - void HostTypeMove::execute(Spine *pSpine) const { + void HostTypeMove::execute(Spine* pSpine) const { RailMoveObj* obj = reinterpret_cast(pSpine->mExecutor); obj->exeMove(); } - void HostTypeWaitForPlayerOn::execute(Spine *pSpine) const { + void HostTypeWaitForPlayerOn::execute(Spine* pSpine) const { RailMoveObj* obj = reinterpret_cast(pSpine->mExecutor); obj->exeWait(); } - void HostTypeWait::execute(Spine *pSpine) const { + void HostTypeWait::execute(Spine* pSpine) const { RailMoveObj* obj = reinterpret_cast(pSpine->mExecutor); obj->exeWait(); } -}; +}; // namespace NrvRailMoveObj RailMoveObjPress::~RailMoveObjPress() { - } RailMoveObjBreakAtEnd::~RailMoveObjBreakAtEnd() { - } RailMoveIndirectObj::~RailMoveIndirectObj() { - } RailMoveObjSwitchShadow::~RailMoveObjSwitchShadow() { - } RailDemoMoveObj::~RailDemoMoveObj() { - } RailRotateMoveObj::~RailRotateMoveObj() { - } diff --git a/src/Game/MapObj/RainCloud.cpp b/src/Game/MapObj/RainCloud.cpp index 76ab170fc..98860fb67 100644 --- a/src/Game/MapObj/RainCloud.cpp +++ b/src/Game/MapObj/RainCloud.cpp @@ -18,13 +18,14 @@ namespace NrvRainCloud { NEW_NERVE(RainCloudNrvEnd, RainCloud, End); NEW_NERVE(RainCloudNrvSoftTouch, RainCloud, SoftTouch); NEW_NERVE(RainCloudNrvHardTouch, RainCloud, HardTouch); -}; +}; // namespace NrvRainCloud namespace { static s32 sThunderStep = 0x8C; } -RainCloud::RainCloud(const char *pName) : LiveActor(pName) { +RainCloud::RainCloud(const char* pName) + : LiveActor(pName) { mCloudCylinder = nullptr; mRailMover = nullptr; _F4 = 0; @@ -39,7 +40,7 @@ RainCloud::RainCloud(const char *pName) : LiveActor(pName) { _C0.identity(); } -void RainCloud::init(const JMapInfoIter &rIter) { +void RainCloud::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("RainCloud", nullptr, false); MR::getJMapInfoArg3NoInit(rIter, &_10D); @@ -56,12 +57,11 @@ void RainCloud::init(const JMapInfoIter &rIter) { initHitSensor(2); MR::addBodyMessageSensorMapObj(this); MR::addHitSensorCallbackMapObjSimple(this, "drop_water", 4, 150.0f); - } - else { + } else { initHitSensor(1); MR::addBodyMessageSensorMapObj(this); } - + MR::initCollisionParts(this, "RainCloud", getSensor("body"), nullptr); initEffectKeeper(0, nullptr, false); if (!_10D) { @@ -87,8 +87,7 @@ void RainCloud::init(const JMapInfoIter &rIter) { MR::excludeCalcShadowToMyCollision(this, nullptr); MR::onShadowVolumeCutDropLength(this, nullptr); MR::onCalcShadow(this, nullptr); - } - else { + } else { _108 = 2000.0f; MR::invalidateShadow(this, nullptr); } @@ -113,17 +112,16 @@ void RainCloud::init(const JMapInfoIter &rIter) { if (_10D) { MR::startBpk(this, "Fine"); MR::startBpk(_F4->_14, "Fine"); - } - else { + } else { MR::startBpk(this, "Rain"); MR::startBpk(_F4->_14, "Rain"); } - + initNerve(&NrvRainCloud::RainCloudNrvWait::sInstance); makeActorAppeared(); } -void RainCloud::makeArchiveList(NameObjArchiveListCollector *pCollector, const JMapInfoIter &rIter) { +void RainCloud::makeArchiveList(NameObjArchiveListCollector* pCollector, const JMapInfoIter& rIter) { bool arg3 = false; MR::getJMapInfoArg3NoInit(rIter, &arg3); pCollector->addArchive("RainCloud"); @@ -222,12 +220,10 @@ void RainCloud::control() { if (mRailMover != nullptr && !isNerve(&NrvRainCloud::RainCloudNrvEnd::sInstance) && (mRailMover->movement(), mPosition.set(mRailMover->_28), MR::isMapPartsRailMovePassedEndPointRepeat(mRailMover))) { setNerve(&NrvRainCloud::RainCloudNrvDisappear::sInstance); - } - else { + } else { if (MR::isShadowProjected(this, nullptr)) { _104 = MR::getShadowProjectionLength(this, nullptr); - } - else { + } else { _104 = _108; } @@ -238,7 +234,7 @@ void RainCloud::control() { } } -void RainCloud::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void RainCloud::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver)) { if (MR::isPlayerElementModeBee()) { MR::curePlayerElementMode(); @@ -249,8 +245,8 @@ void RainCloud::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { } } -void RainCloud::updateHitSensor(HitSensor *pSensor) { - f32 radius = pSensor->mRadius; +void RainCloud::updateHitSensor(HitSensor* pSensor) { + f32 radius = pSensor->mRadius; TVec3f v7; JMAVECScaleAdd(&mGravity, &mPosition, &v7, radius); TVec3f v6; @@ -279,9 +275,7 @@ void RainCloud::endClipped() { } void RainCloud::switchEffect() { - bool v2 = isNerve(&NrvRainCloud::RainCloudNrvAppear::sInstance) - || isNerve(&NrvRainCloud::RainCloudNrvDisappear::sInstance) - || isNerve(&NrvRainCloud::RainCloudNrvEnd::sInstance); + bool v2 = isNerve(&NrvRainCloud::RainCloudNrvAppear::sInstance) || isNerve(&NrvRainCloud::RainCloudNrvDisappear::sInstance) || isNerve(&NrvRainCloud::RainCloudNrvEnd::sInstance); if (v2) { if (MR::isEffectValid(this, "Splash")) { @@ -291,12 +285,11 @@ void RainCloud::switchEffect() { if (MR::isEffectValid(this, "Line20")) { MR::deleteEffect(this, "Line20"); } - + if (MR::isEffectValid(this, "Line10")) { MR::deleteEffect(this, "Line10"); } - } - else { + } else { bool v3; if (MR::isShadowProjected(this, nullptr)) { v3 = _104 > 1500.0f; @@ -309,8 +302,7 @@ void RainCloud::switchEffect() { if (!MR::isEffectValid(this, "Splash")) { MR::emitEffect(this, "Splash"); } - } - else { + } else { v3 = true; MR::deleteEffect(this, "Splash"); } @@ -320,8 +312,7 @@ void RainCloud::switchEffect() { MR::deleteEffect(this, "Line20"); MR::emitEffect(this, "Line10"); } - } - else { + } else { MR::deleteEffect(this, "Line10"); MR::emitEffect(this, "Line20"); } @@ -329,5 +320,4 @@ void RainCloud::switchEffect() { } RainCloud::~RainCloud() { - } diff --git a/src/Game/MapObj/ReverseGravityRoomPlanet.cpp b/src/Game/MapObj/ReverseGravityRoomPlanet.cpp index 01da90589..70c6e5537 100644 --- a/src/Game/MapObj/ReverseGravityRoomPlanet.cpp +++ b/src/Game/MapObj/ReverseGravityRoomPlanet.cpp @@ -1,10 +1,10 @@ #include "Game/MapObj/ReverseGravityRoomPlanet.hpp" -ReverseGravityRoomPlanet::ReverseGravityRoomPlanet(const char *pName) : MapObjActor(pName) { - +ReverseGravityRoomPlanet::ReverseGravityRoomPlanet(const char* pName) + : MapObjActor(pName) { } -void ReverseGravityRoomPlanet::init(const JMapInfoIter &rIter) { +void ReverseGravityRoomPlanet::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; info.setupHioNode("惑星"); @@ -36,7 +36,7 @@ void ReverseGravityRoomPlanet::exeUpStart() { } } -void ReverseGravityRoomPlanet::initCaseUseSwitchA(const MapObjActorInitInfo &rIter) { +void ReverseGravityRoomPlanet::initCaseUseSwitchA(const MapObjActorInitInfo& rIter) { void (ReverseGravityRoomPlanet::*startOff)(void) = &ReverseGravityRoomPlanet::startSwitchOff; void (ReverseGravityRoomPlanet::*startOn)(void) = &ReverseGravityRoomPlanet::startSwitchOn; MR::listenStageSwitchOnOffA(this, MR::Functor(this, startOff), MR::Functor(this, startOn)); @@ -56,25 +56,22 @@ namespace NrvReverseGravityRoomPlanet { INIT_NERVE(ReverseGravityRoomPlanetNrvUpStart); INIT_NERVE(ReverseGravityRoomPlanetNrvUpWait); - void ReverseGravityRoomPlanetNrvUpWait::execute(Spine *pSpine) const { - + void ReverseGravityRoomPlanetNrvUpWait::execute(Spine* pSpine) const { } - void ReverseGravityRoomPlanetNrvUpStart::execute(Spine *pSpine) const { + void ReverseGravityRoomPlanetNrvUpStart::execute(Spine* pSpine) const { ReverseGravityRoomPlanet* planet = reinterpret_cast(pSpine->mExecutor); planet->exeUpStart(); } - void ReverseGravityRoomPlanetNrvDownWait::execute(Spine *pSpine) const { - + void ReverseGravityRoomPlanetNrvDownWait::execute(Spine* pSpine) const { } - void ReverseGravityRoomPlanetNrvDownStart::execute(Spine *pSpine) const { + void ReverseGravityRoomPlanetNrvDownStart::execute(Spine* pSpine) const { ReverseGravityRoomPlanet* planet = reinterpret_cast(pSpine->mExecutor); planet->exeDownStart(); } -}; +}; // namespace NrvReverseGravityRoomPlanet ReverseGravityRoomPlanet::~ReverseGravityRoomPlanet() { - } \ No newline at end of file diff --git a/src/Game/MapObj/RevolvingWay.cpp b/src/Game/MapObj/RevolvingWay.cpp index 547252951..4e4bab638 100644 --- a/src/Game/MapObj/RevolvingWay.cpp +++ b/src/Game/MapObj/RevolvingWay.cpp @@ -17,9 +17,10 @@ namespace NrvRevolvingWay { NEW_NERVE(RevolvingWayNrvWait, RevolvingWay, Wait); }; -RevolvingWay::~RevolvingWay() { } +RevolvingWay::~RevolvingWay() {} -RevolvingWay::RevolvingWay(const char* pName) : LiveActor(pName), _8C(0.0f, 1.0f) { +RevolvingWay::RevolvingWay(const char* pName) + : LiveActor(pName), _8C(0.0f, 1.0f) { _9C.x = 0.0f; _9C.y = 0.0f; _9C.z = 0.0f; @@ -39,7 +40,7 @@ void RevolvingWay::init(const JMapInfoIter& rIter) { makeActorAppeared(); } -void RevolvingWay::control() { } +void RevolvingWay::control() {} void RevolvingWay::calcAndSetBaseMtx() { MR::setBaseTRMtx(this, _8C); @@ -59,14 +60,13 @@ void RevolvingWay::exeWait() { void RevolvingWay::addAccelMoment() { TVec3f stack_14; - if (MR::isStarPointerPointing(this, 0, true, "弱") && MR::testCorePadButtonB(WPAD_CHAN0) - && MR::calcStarPointerStrokeRotateMoment(&stack_14, mPosition, _A8, 0)) { + if (MR::isStarPointerPointing(this, 0, true, "弱") && MR::testCorePadButtonB(WPAD_CHAN0) && MR::calcStarPointerStrokeRotateMoment(&stack_14, mPosition, _A8, 0)) { TVec3f stack_8; stack_8.setPS(stack_14); f32 temp = 0.04f; stack_8 *= temp; JMathInlineVEC::PSVECAdd(&_9C, &stack_8, &_9C); - f32 mag = PSVECMag(&_9C); + f32 mag = PSVECMag(&_9C); if (mag > 0.15f) { _9C *= (0.15f / mag); } diff --git a/src/Game/MapObj/Rock.cpp b/src/Game/MapObj/Rock.cpp index 2b3006c0e..e3be4b3b3 100644 --- a/src/Game/MapObj/Rock.cpp +++ b/src/Game/MapObj/Rock.cpp @@ -4,35 +4,35 @@ #include "math_types.hpp" namespace { - const Vec cWeakSensorOffset = { 0.0f, 0.0f, -150.0f }; + const Vec cWeakSensorOffset = {0.0f, 0.0f, -150.0f}; }; -Rock::Rock(f32 a1, const char *pName) : LiveActor(pName), - mParentCreator(nullptr), mRockType(NormalRock), mBreakModel(nullptr), - _98(a1), _9C(0), _9D(0), _A0(gZeroVec), _AC(255.0f), _B0(0.0f), - _E4(gZeroVec), mCurrentRailPoint(-1), _F0(1.5f), _F8(gZeroVec), - _110(0), _114(0), mBarkTimer(0), _11C(0), _120(gZeroVec), - _12C(nullptr), _130(0), _134(8), _138(0.0f), mRollSoundTimer(0), _140(0) - { - +Rock::Rock(f32 a1, const char* pName) + : LiveActor(pName), + mParentCreator(nullptr), mRockType(NormalRock), mBreakModel(nullptr), + _98(a1), _9C(0), _9D(0), _A0(gZeroVec), _AC(255.0f), _B0(0.0f), + _E4(gZeroVec), mCurrentRailPoint(-1), _F0(1.5f), _F8(gZeroVec), + _110(0), _114(0), mBarkTimer(0), _11C(0), _120(gZeroVec), + _12C(nullptr), _130(0), _134(8), _138(0.0f), mRollSoundTimer(0), _140(0) { + _B4.identity(); } -void Rock::init(const JMapInfoIter &rIter) { +void Rock::init(const JMapInfoIter& rIter) { mRockType = Rock::getType(rIter); if (mRockType != NormalRock) { switch (mRockType) { - case WanwanRolling: - setName("ワンワン"); - break; - case WanwanRollingMini: - setName("ミニワンワン"); - break; - case WanwanRollingGold: - setName("ゴールドワンワン"); - MR::declarePowerStar(this); - break; + case WanwanRolling: + setName("ワンワン"); + break; + case WanwanRollingMini: + setName("ミニワンワン"); + break; + case WanwanRollingGold: + setName("ゴールドワンワン"); + MR::declarePowerStar(this); + break; } _134 = 45; @@ -56,20 +56,17 @@ void Rock::init(const JMapInfoIter &rIter) { if (mRockType == WanwanRollingMini) { radius = 0.30000001f; - } - else { + } else { radius = mScale.x; } MR::initShadowVolumeCylinder(this, 225.0f * radius); MR::setShadowDropLength(this, nullptr, shadowDrop); - } - else { + } else { f32 radius; if (mRockType == WanwanRollingMini) { radius = 0.30000001f; - } - else { + } else { radius = mScale.x; } @@ -103,9 +100,8 @@ void Rock::appear() { if (mRockType == NormalRock) { setBtkForEnvironmentMap(this, "Size"); - - } - else if (mRockType == WanwanRolling) { + + } else if (mRockType == WanwanRolling) { setBtkForEnvironmentMap(this, "WanwanRolling"); } @@ -113,8 +109,7 @@ void Rock::appear() { if (!MR::isLoopRail(this)) { MR::offBind(this); setNerve(&NrvRock::RockNrvAppear::sInstance); - } - else { + } else { MR::onBind(this); setNerve(&NrvRock::RockNrvMove::sInstance); } @@ -135,7 +130,7 @@ s32 Rock::getAppearFrame() { return 0x55; } -Rock::Type Rock::getType(const JMapInfoIter &rIter) { +Rock::Type Rock::getType(const JMapInfoIter& rIter) { if (MR::isEqualObjectName(rIter, "WanwanRolling")) { return WanwanRolling; } @@ -164,30 +159,30 @@ s32 Rock::getAppearStarPieceNum(Type type) { void Rock::initModel() { switch (mRockType) { - case NormalRock: - initModelManagerWithAnm("Rock", nullptr, false); - mBreakModel = MR::createModelObjMapObjStrongLight("ゴロゴロ岩壊れモデル", "RockBreak", nullptr); - mBreakModel->initWithoutIter(); - mBreakModel->mScale.set(mScale); - mBreakModel->makeActorDead(); - break; - case WanwanRolling: - initModelManagerWithAnm("WanwanRolling", nullptr, false); - mBreakModel = MR::createModelObjMapObjStrongLight("ワンワン壊れモデル", "WanwanRollingBreak", nullptr); - mBreakModel->initWithoutIter(); - mBreakModel->mScale.set(mScale); - mBreakModel->makeActorDead(); - break; - case WanwanRollingMini: - initModelManagerWithAnm("WanwanRollingMini", nullptr, false); - break; - case WanwanRollingGold: - initModelManagerWithAnm("WanwanRolling", nullptr, false); - mBreakModel = MR::createModelObjMapObjStrongLight("ゴールドワンワン壊れモデル", "WanwanRollingGoldBreak", nullptr); - mBreakModel->initWithoutIter(); - mBreakModel->mScale.set(mScale); - mBreakModel->makeActorDead(); - break; + case NormalRock: + initModelManagerWithAnm("Rock", nullptr, false); + mBreakModel = MR::createModelObjMapObjStrongLight("ゴロゴロ岩壊れモデル", "RockBreak", nullptr); + mBreakModel->initWithoutIter(); + mBreakModel->mScale.set(mScale); + mBreakModel->makeActorDead(); + break; + case WanwanRolling: + initModelManagerWithAnm("WanwanRolling", nullptr, false); + mBreakModel = MR::createModelObjMapObjStrongLight("ワンワン壊れモデル", "WanwanRollingBreak", nullptr); + mBreakModel->initWithoutIter(); + mBreakModel->mScale.set(mScale); + mBreakModel->makeActorDead(); + break; + case WanwanRollingMini: + initModelManagerWithAnm("WanwanRollingMini", nullptr, false); + break; + case WanwanRollingGold: + initModelManagerWithAnm("WanwanRolling", nullptr, false); + mBreakModel = MR::createModelObjMapObjStrongLight("ゴールドワンワン壊れモデル", "WanwanRollingGoldBreak", nullptr); + mBreakModel->initWithoutIter(); + mBreakModel->mScale.set(mScale); + mBreakModel->makeActorDead(); + break; } if (mBreakModel != nullptr) { @@ -201,8 +196,7 @@ void Rock::initSensor() { if (mRockType != NormalRock) { initHitSensor(1); v2 = 43; - } - else { + } else { initHitSensor(2); v2 = 42; } @@ -210,8 +204,7 @@ void Rock::initSensor() { f32 v3; if (mRockType == WanwanRollingMini) { v3 = 0.30000001f; - } - else { + } else { v3 = mScale.x; } @@ -229,8 +222,7 @@ void Rock::initSensor() { void Rock::initEffect() { if (mRockType == WanwanRollingMini) { initEffectKeeper(0, "WanwanRolling", false); - } - else { + } else { initEffectKeeper(0, nullptr, false); } @@ -261,7 +253,6 @@ bool Rock::move(f32 coord) { _F0 = 0.2f; } - MR::getCurrentRailPointArg1WithInit(this, &pntArg); if (pntArg >= 0) { @@ -280,8 +271,7 @@ bool Rock::isInClippingRange() const { if (mRockType == WanwanRollingMini) { v2 = 0.30000001f; - } - else { + } else { v2 = mScale.x; } @@ -293,15 +283,14 @@ bool Rock::isInClippingRange() const { if (mRockType == WanwanRollingMini) { v4 = 0.30000001f; - } - else { + } else { v4 = mScale.x; } if (MR::isJudgedToNearClip(mPosition, (400.0f * v4))) { return true; } - + return false; } @@ -311,15 +300,13 @@ void Rock::startSoundWanwanVoice() { if (MR::calcDistanceToPlayer(this) <= 600.0f) { if (mRockType == WanwanRollingMini) { MR::startSound(this, "SE_EV_WANWANROLLMINI_WANWAN", -1, -1); - } - else { + } else { MR::startSound(this, "SE_EV_WANWANROLL_WANWAN", -1, -1); } mBarkTimer = 0; } - } - else { + } else { mBarkTimer++; } } @@ -327,7 +314,7 @@ void Rock::startSoundWanwanVoice() { // Rock::startRollLevelSound -bool Rock::tryFreeze(const Nerve *pNerve) { +bool Rock::tryFreeze(const Nerve* pNerve) { if (MR::isStarPointerPointing2POnPressButton(this, "", true, false)) { _11C = 0; _120.set(mPosition); @@ -347,8 +334,7 @@ void Rock::rumblePadAndCamera() { if (dist < 1000.0f) { MR::shakeCameraNormal(); - } - else if (dist < 2000.0f) { + } else if (dist < 2000.0f) { MR::shakeCameraWeak(); } } @@ -357,7 +343,7 @@ void Rock::setNerveBreak(bool a1) { if (a1 && mRockType <= 1u) { appearStarPiece(); } - + setNerve(&NrvRock::RockNrvBreak::sInstance); } @@ -387,7 +373,6 @@ void Rock::appearStarPiece() { // Rock::exeFreeze Rock::~Rock() { - } namespace NrvRock { @@ -397,4 +382,4 @@ namespace NrvRock { INIT_NERVE(RockNrvMoveInvalidBind); INIT_NERVE(RockNrvBreak); INIT_NERVE(RockNrvFreeze); -}; +}; // namespace NrvRock diff --git a/src/Game/MapObj/RosettaChair.cpp b/src/Game/MapObj/RosettaChair.cpp index 4709c3862..f9fc72493 100644 --- a/src/Game/MapObj/RosettaChair.cpp +++ b/src/Game/MapObj/RosettaChair.cpp @@ -1,10 +1,9 @@ #include "Game/MapObj/RosettaChair.hpp" -RosettaChair::RosettaChair(const char *pName) : - LiveActor(pName), - _8C(0.0f, 0.0f, 0.0f), - _98(0.0f, 0.0f, 0.0f) -{ +RosettaChair::RosettaChair(const char* pName) + : LiveActor(pName), + _8C(0.0f, 0.0f, 0.0f), + _98(0.0f, 0.0f, 0.0f) { _A0.identity(); } @@ -15,7 +14,7 @@ void RosettaChair::setDefaultPose() { MR::validateCollisionParts(this); } -void RosettaChair::init(const JMapInfoIter &rIter) { +void RosettaChair::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("RosettaChair", nullptr, false); MR::connectToSceneMapObj(this); diff --git a/src/Game/MapObj/RosettaPictureBook.cpp b/src/Game/MapObj/RosettaPictureBook.cpp index 7776d11ad..a567e7cdf 100644 --- a/src/Game/MapObj/RosettaPictureBook.cpp +++ b/src/Game/MapObj/RosettaPictureBook.cpp @@ -15,7 +15,7 @@ namespace { const s32 hFadeOutFrame = 60; const s32 hFadeInFrame = 60; -}; +}; // namespace namespace NrvRosettaPictureBook { NEW_NERVE(HostTypeNrvWait, RosettaPictureBook, Wait); @@ -23,15 +23,13 @@ namespace NrvRosettaPictureBook { NEW_NERVE(HostTypeNrvFadeOut, RosettaPictureBook, FadeOut); NEW_NERVE(HostTypeNrvReading, RosettaPictureBook, Reading); NEW_NERVE(HostTypeNrvFadeIn, RosettaPictureBook, FadeIn); -}; +}; // namespace NrvRosettaPictureBook -RosettaPictureBook::RosettaPictureBook(const char* pName) : - LiveActor(pName), - mLayout(nullptr), - mIconAButton(nullptr), - mIsValidOpenIconAButton(false) -{ - +RosettaPictureBook::RosettaPictureBook(const char* pName) + : LiveActor(pName), + mLayout(nullptr), + mIconAButton(nullptr), + mIsValidOpenIconAButton(false) { } void RosettaPictureBook::init(const JMapInfoIter& rIter) { @@ -84,8 +82,7 @@ void RosettaPictureBook::exeWait() { MR::startSystemSE("SE_SY_TALK_BUTTON_APPEAR", -1, -1); mIconAButton->openWithRead(); } - } - else if (mIconAButton->isOpen()) { + } else if (mIconAButton->isOpen()) { mIconAButton->term(); } @@ -109,7 +106,6 @@ void RosettaPictureBook::exeWait() { } void RosettaPictureBook::exeDemoWait() { - } void RosettaPictureBook::exeFadeOut() { diff --git a/src/Game/MapObj/RotateMoveObj.cpp b/src/Game/MapObj/RotateMoveObj.cpp index fb6d47b3e..5ee736b2e 100644 --- a/src/Game/MapObj/RotateMoveObj.cpp +++ b/src/Game/MapObj/RotateMoveObj.cpp @@ -2,7 +2,7 @@ #include "Game/MapObj/StageEffectDataTable.hpp" #include "Game/MapObj/MapPartsRotator.hpp" -void RotateMoveObj::init(const JMapInfoIter &rIter) { +void RotateMoveObj::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoSimpleMapObj(&info); @@ -15,7 +15,7 @@ void RotateMoveObj::init(const JMapInfoIter &rIter) { initialize(rIter, info); bool v5 = true; - s32 condType = 0; + s32 condType = 0; MR::getMapPartsArgMoveConditionType(&condType, rIter); if (!MR::isMoveStartTypeUnconditional(condType)) { @@ -24,7 +24,7 @@ void RotateMoveObj::init(const JMapInfoIter &rIter) { } if (MR::isDemoCast(this, nullptr)) { - MR::FunctorV0M setStateFunc = MR::Functor(this, &RotateMoveObj::setStateMove); + MR::FunctorV0M setStateFunc = MR::Functor(this, &RotateMoveObj::setStateMove); if (MR::tryRegisterDemoActionFunctor(this, setStateFunc, nullptr)) { v5 = false; @@ -47,8 +47,7 @@ void RotateMoveObj::initCaseUseSwitchB(const MapObjActorInitInfo &rInfo) { MR::listenStageSwitchOnOffB(this, MR::FunctorV0M(this, &RotateMoveObj::pauseMapPartsFunctions), setFunc); }*/ -void RotateMoveObj::initCaseNoUseSwitchB(const MapObjActorInitInfo &rInfo) { - +void RotateMoveObj::initCaseNoUseSwitchB(const MapObjActorInitInfo& rInfo) { } void RotateMoveObj::setStateMove() { @@ -67,15 +66,13 @@ void RotateMoveObj::exeMove() { if (!MapObjActorUtil::isRotatorMoving(this)) { setNerve(&NrvRotateMoveObj::HostTypeStop::sInstance); - } - else { + } else { if (mRotator->_14) { if (MR::isEqualString(mObjectName, "OceanRingRuinsGearBig") || MR::isEqualString(mObjectName, "OceanRingRuinsGearSmall")) { if (mRotator->getRotateSpeed() != 0.0f) { MR::StageEffect::tryStageEffectMoving(this, mObjectName); } - } - else { + } else { MR::StageEffect::tryStageEffectMoving(this, mObjectName); } } @@ -85,8 +82,7 @@ void RotateMoveObj::exeMove() { void RotateMoveObj::exeStop() { if (MapObjActorUtil::isRotatorMoving(this)) { setNerve(&NrvRotateMoveObj::HostTypeMove::sInstance); - } - else if (MR::isFirstStep(this)) { + } else if (MR::isFirstStep(this)) { MR::StageEffect::tryStageEffectStop(this, mObjectName); } } @@ -102,9 +98,7 @@ namespace NrvRotateMoveObj { INIT_NERVE(HostTypeWait); INIT_NERVE(HostTypeMove); INIT_NERVE(HostTypeStop); -}; +}; // namespace NrvRotateMoveObj RotateMoveObj::~RotateMoveObj() { - } - \ No newline at end of file diff --git a/src/Game/MapObj/SandCapsuleInsidePlanet.cpp b/src/Game/MapObj/SandCapsuleInsidePlanet.cpp index 7948b15fc..fe63bbb0f 100644 --- a/src/Game/MapObj/SandCapsuleInsidePlanet.cpp +++ b/src/Game/MapObj/SandCapsuleInsidePlanet.cpp @@ -1,10 +1,10 @@ #include "Game/MapObj/SandCapsuleInsidePlanet.hpp" -SandCapsuleInsidePlanet::SandCapsuleInsidePlanet(const char *pName) : MapObjActor(pName) { - +SandCapsuleInsidePlanet::SandCapsuleInsidePlanet(const char* pName) + : MapObjActor(pName) { } -void SandCapsuleInsidePlanet::init(const JMapInfoIter &rIter) { +void SandCapsuleInsidePlanet::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoPlanet(&info); @@ -14,7 +14,7 @@ void SandCapsuleInsidePlanet::init(const JMapInfoIter &rIter) { MR::setBrkFrameEndAndStop(this); } -void SandCapsuleInsidePlanet::initCaseUseSwitchA(const MapObjActorInitInfo &rInfo) { +void SandCapsuleInsidePlanet::initCaseUseSwitchA(const MapObjActorInitInfo& rInfo) { void (SandCapsuleInsidePlanet::*offFunc)(void) = &SandCapsuleInsidePlanet::startOff; void (SandCapsuleInsidePlanet::*onFunc)(void) = &SandCapsuleInsidePlanet::startOn; MR::listenStageSwitchOnOffA(this, MR::Functor(this, onFunc), MR::Functor(this, offFunc)); @@ -33,5 +33,4 @@ namespace NrvSandCapsuleInsidePlanet { }; SandCapsuleInsidePlanet::~SandCapsuleInsidePlanet() { - } \ No newline at end of file diff --git a/src/Game/MapObj/ScrewSwitch.cpp b/src/Game/MapObj/ScrewSwitch.cpp index ef8c1109b..e0766e01c 100644 --- a/src/Game/MapObj/ScrewSwitch.cpp +++ b/src/Game/MapObj/ScrewSwitch.cpp @@ -22,9 +22,10 @@ namespace NrvScrewSwitch { NEW_NERVE(ScrewSwitchNrvAdjust, ScrewSwitch, Adjust); NEW_NERVE(ScrewSwitchNrvScrew, ScrewSwitch, Screw); NEW_NERVE(ScrewSwitchNrvEnd, ScrewSwitch, End); -} +} // namespace NrvScrewSwitch -ScrewSwitch::ScrewSwitch(const char* pName) : LiveActor(pName) { +ScrewSwitch::ScrewSwitch(const char* pName) + : LiveActor(pName) { mCollisionParts = nullptr; _90 = nullptr; mMapObjConnector = nullptr; @@ -45,7 +46,7 @@ void ScrewSwitch::init(const JMapInfoIter& rIter) { TVec3f var1; var1.scale(-150.0f, mGravity); MR::addHitSensorAtJoint(this, "binder", "Screw", ATYPE_BINDER, 8, 150.0f, var1); - MtxPtr jointMtx = MR::getJointMtx(this, "Screw"); + MtxPtr jointMtx = MR::getJointMtx(this, "Screw"); HitSensor* Sensor = getSensor("binder"); MR::initCollisionParts(this, "ScrewCol", Sensor, jointMtx); mCollisionParts = MR::createCollisionPartsFromLiveActor(this, "ScrewReceiveCol", getSensor("body"), MR::getJointMtx(this, "ScrewReceive"), (MR::CollisionScaleType)1); @@ -63,7 +64,7 @@ void ScrewSwitch::exeAdjust() { MR::startBrk(this, "ScrewSwitchOn"); MR::setBrkFrameAndStop(this, 0.0f); } - f32 step = getNerveStep() / 3.0f; + f32 step = getNerveStep() / 3.0f; HitSensor* sensor = getSensor("body"); JMAVECLerp((const Vec*)_90, &sensor->mPosition, &mPosition, step); if (MR::isStep(this, 3)) { @@ -114,7 +115,7 @@ void ScrewSwitch::control() { mCollisionParts->setMtx(); } -bool ScrewSwitch::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool ScrewSwitch::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgRushBegin(msg) && MR::isSensorPlayer(pSender) && MR::isOnPlayer(getSensor("binder"))) { _90 = pSender->mHost; MR::startSound(_90, "SE_PV_TWIST_START", -1, -1); @@ -138,7 +139,7 @@ void ScrewSwitch::updateBindActorMtx() { pos.mMtx[0][3] = Sensor->mPosition.x; pos.mMtx[1][3] = Sensor->mPosition.y; pos.mMtx[2][3] = Sensor->mPosition.z; - + MR::setBaseTRMtx(_90, pos); } diff --git a/src/Game/MapObj/ShootingStar.cpp b/src/Game/MapObj/ShootingStar.cpp index 757d95c34..962066821 100644 --- a/src/Game/MapObj/ShootingStar.cpp +++ b/src/Game/MapObj/ShootingStar.cpp @@ -1,12 +1,13 @@ #include "Game/MapObj/ShootingStar.hpp" -ShootingStar::ShootingStar(const char *pName) : LiveActor(pName), _8C(0, 0, 0), _98(0, 0, 1), _A4(0, -1, 0) { +ShootingStar::ShootingStar(const char* pName) + : LiveActor(pName), _8C(0, 0, 0), _98(0, 0, 1), _A4(0, -1, 0) { _B0 = 5; _B4 = 0xF0; _B8 = 2000.0f; } -void ShootingStar::init(const JMapInfoIter &rIter) { +void ShootingStar::init(const JMapInfoIter& rIter) { initModelManagerWithAnm("ShootingStar", nullptr, false); MR::connectToSceneMapObj(this); MR::initDefaultPos(this, rIter); @@ -37,16 +38,15 @@ void ShootingStar::init(const JMapInfoIter &rIter) { MR::initShadowVolumeSphere(this, 30.0f); if (MR::useStageSwitchReadAppear(this, rIter)) { - MR::listenStageSwitchOnOffAppear(this, MR::FunctorV0M(this, &LiveActor::kill), MR::FunctorV0M(this, &ShootingStar::appearPreShooting)); + MR::listenStageSwitchOnOffAppear(this, MR::FunctorV0M(this, &LiveActor::kill), MR::FunctorV0M(this, &ShootingStar::appearPreShooting)); makeActorDead(); - } - else { + } else { makeActorAppeared(); } LiveActor::calcAndSetBaseMtx(); TSMtxf matrix; - f32 x, y, z; + f32 x, y, z; matrix.setInline_2(getBaseMtx()); x = matrix.mMtx[0][1]; y = matrix.mMtx[1][1]; @@ -111,22 +111,21 @@ namespace NrvShootingStar { INIT_NERVE(HostTypeNrvShooting); INIT_NERVE(HostTypeNrvWaitForNextShoot); - void HostTypeNrvWaitForNextShoot::execute(Spine *pSpine) const { + void HostTypeNrvWaitForNextShoot::execute(Spine* pSpine) const { ShootingStar* star = reinterpret_cast(pSpine->mExecutor); star->exeWaitForNextShoot(); } - void HostTypeNrvShooting::execute(Spine *pSpine) const { + void HostTypeNrvShooting::execute(Spine* pSpine) const { ShootingStar* star = reinterpret_cast(pSpine->mExecutor); star->exeShooting(); } - void HostTypeNrvPreShooting::execute(Spine *pSpine) const { + void HostTypeNrvPreShooting::execute(Spine* pSpine) const { ShootingStar* star = reinterpret_cast(pSpine->mExecutor); star->exePreShooting(); } -}; +}; // namespace NrvShootingStar ShootingStar::~ShootingStar() { - } diff --git a/src/Game/MapObj/SimpleClipPartsObj.cpp b/src/Game/MapObj/SimpleClipPartsObj.cpp index 59ae47efa..d21015bde 100644 --- a/src/Game/MapObj/SimpleClipPartsObj.cpp +++ b/src/Game/MapObj/SimpleClipPartsObj.cpp @@ -12,11 +12,12 @@ namespace NrvSimpleClipPartsObj { NEW_NERVE(HostTypeWait, SimpleClipPartsObj, Wait); } -SimpleClipPartsObj::SimpleClipPartsObj(const char* pName) : MapObjActor(pName) {} +SimpleClipPartsObj::SimpleClipPartsObj(const char* pName) + : MapObjActor(pName) {} SimpleClipPartsObj::~SimpleClipPartsObj() {} -void SimpleClipPartsObj::init(const JMapInfoIter &rIfter) { +void SimpleClipPartsObj::init(const JMapInfoIter& rIfter) { MapObjActor::init(rIfter); MapObjActorInitInfo info; info.setupRailMover(); @@ -39,24 +40,24 @@ void SimpleClipPartsObj::control() { } } -void SimpleClipPartsObj::connectToScene(const MapObjActorInitInfo &Ifter) { +void SimpleClipPartsObj::connectToScene(const MapObjActorInitInfo& Ifter) { if (Ifter.mConnectToScene) { MR::connectToClippedMapParts(this); } } -void SimpleClipPartsObj::initCaseUseSwitchA(const MapObjActorInitInfo &Ifter) {} +void SimpleClipPartsObj::initCaseUseSwitchA(const MapObjActorInitInfo& Ifter) {} -void SimpleClipPartsObj::initCaseNoUseSwitchA(const MapObjActorInitInfo &Ifter) {} +void SimpleClipPartsObj::initCaseNoUseSwitchA(const MapObjActorInitInfo& Ifter) {} -void SimpleClipPartsObj::initCaseUseSwitchB(const MapObjActorInitInfo &Ifter) { +void SimpleClipPartsObj::initCaseUseSwitchB(const MapObjActorInitInfo& Ifter) { void (MapObjActor::*start)(void) = &MapObjActor::startMapPartsFunctions; void (MapObjActor::*end)(void) = &MapObjActor::endMapPartsFunctions; MR::listenStageSwitchOnOffB(this, MR::Functor(this, start), MR::Functor(this, end)); setStateWait(); } -void SimpleClipPartsObj::initCaseNoUseSwitchB(const MapObjActorInitInfo &Ifter) { +void SimpleClipPartsObj::initCaseNoUseSwitchB(const MapObjActorInitInfo& Ifter) { MapObjActor::startMapPartsFunctions(); } diff --git a/src/Game/MapObj/SimpleFloaterObj.cpp b/src/Game/MapObj/SimpleFloaterObj.cpp index cfb5bc2e1..a16d44e65 100644 --- a/src/Game/MapObj/SimpleFloaterObj.cpp +++ b/src/Game/MapObj/SimpleFloaterObj.cpp @@ -9,24 +9,25 @@ namespace NrvSimpleFloaterObj { NEW_NERVE(SimpleFloaterObjNrvWait, SimpleFloaterObj, Wait); -}; +}; -SimpleFloaterObj::SimpleFloaterObj(const char *pName) : LiveActor(pName) { +SimpleFloaterObj::SimpleFloaterObj(const char* pName) + : LiveActor(pName) { _8C = 0; - _90 = nullptr; + _90 = nullptr; _94.set(0.0f, 0.0f, 0.0f); } SimpleFloaterObj::~SimpleFloaterObj() {} -void SimpleFloaterObj::init(const JMapInfoIter & rIfter) { +void SimpleFloaterObj::init(const JMapInfoIter& rIfter) { MR::initDefaultPos(this, rIfter); MR::getObjectName(&_8C, rIfter); initModelManagerWithAnm(_8C, nullptr, false); MR::connectToSceneMapObj(this); initHitSensor(1); MR::addBodyMessageSensorMapObj(this); - HitSensor* mSensor = getSensor(nullptr); + HitSensor* mSensor = getSensor(nullptr); MR::initCollisionParts(this, _8C, mSensor, nullptr); initEffectKeeper(0, nullptr, false); _94.set(mPosition); @@ -43,14 +44,12 @@ void SimpleFloaterObj::init(const JMapInfoIter & rIfter) { void SimpleFloaterObj::exeWait() { if (MR::isFirstStep(this)) { - } if (!isVelocityClose() && !MR::isEffectValid(this, cEffectName)) { MR::emitEffect(this, cEffectName); - } - else if (isVelocityClose() && MR::isEffectValid(this, cEffectName)) { - MR::deleteEffect(this, cEffectName); + } else if (isVelocityClose() && MR::isEffectValid(this, cEffectName)) { + MR::deleteEffect(this, cEffectName); } _90->movement(); diff --git a/src/Game/MapObj/SimpleMapObj.cpp b/src/Game/MapObj/SimpleMapObj.cpp index 10fe547df..b6901e800 100644 --- a/src/Game/MapObj/SimpleMapObj.cpp +++ b/src/Game/MapObj/SimpleMapObj.cpp @@ -1,6 +1,6 @@ #include "Game/MapObj/SimpleMapObj.hpp" -void SimpleMapObj::init(const JMapInfoIter &rIter) { +void SimpleMapObj::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoSimpleMapObj(&info); @@ -11,49 +11,48 @@ void SimpleMapObj::init(const JMapInfoIter &rIter) { initialize(rIter, info); } -void SimpleEnvironmentObj::connectToScene(const MapObjActorInitInfo &rInfo) { +void SimpleEnvironmentObj::connectToScene(const MapObjActorInitInfo& rInfo) { if (rInfo.mConnectToScene) { if (rInfo._5C == 1) { MR::connectToSceneEnvironmentStrongLight(this); return; - } - else if (rInfo._5C != 1) { + } else if (rInfo._5C != 1) { MR::connectToSceneEnvironment(this); return; } } } -void SimpleMapObjFarMax::init(const JMapInfoIter &rIter) { +void SimpleMapObjFarMax::init(const JMapInfoIter& rIter) { SimpleMapObj::init(rIter); MR::setClippingFarMax(this); } -void SimpleMapObjNoSilhouetted::connectToScene(const MapObjActorInitInfo &rInfo) { +void SimpleMapObjNoSilhouetted::connectToScene(const MapObjActorInitInfo& rInfo) { if (rInfo.mConnectToScene) { if (rInfo._5C == 1) { MR::connectToSceneNoSilhouettedMapObjStrongLight(this); return; - } - else if (rInfo._5C != 1) { + } else if (rInfo._5C != 1) { MR::connectToSceneNoSilhouettedMapObj(this); return; } } } -void SimpleTextureSwitchChangeObj::initCaseUseSwitchA(const MapObjActorInitInfo &rInfo) { - MR::FunctorV0M func = MR::Functor(this, &SimpleTextureSwitchChangeObj::changeTexture); +void SimpleTextureSwitchChangeObj::initCaseUseSwitchA(const MapObjActorInitInfo& rInfo) { + MR::FunctorV0M func = MR::Functor(this, &SimpleTextureSwitchChangeObj::changeTexture); MR::listenStageSwitchOnA(this, func); } -void GlaringLight::connectToScene(const MapObjActorInitInfo &rInfo) { +void GlaringLight::connectToScene(const MapObjActorInitInfo& rInfo) { if (rInfo.mConnectToScene) { MR::connectToScene(this, 0x22, 5, 0x22, -1); } } -SimpleMirrorObj::SimpleMirrorObj(const char *pName, const char *a2, MtxPtr mtx) : MapObjActor(pName) { +SimpleMirrorObj::SimpleMirrorObj(const char* pName, const char* a2, MtxPtr mtx) + : MapObjActor(pName) { mMtx = mtx; MR::createMirrorCamera(); } @@ -61,30 +60,29 @@ SimpleMirrorObj::SimpleMirrorObj(const char *pName, const char *a2, MtxPtr mtx) void SimpleMirrorObj::calcAndSetBaseMtx() { if (!mMtx) { MapObjActor::calcAndSetBaseMtx(); - } - else { + } else { TPos3f reflectionPos; reflectionPos.set(mMtx); MR::setMirrorReflectionInfoFromMtxYUp(reflectionPos); f32 z = reflectionPos.mMtx[2][3]; f32 y = reflectionPos.mMtx[1][3]; - f32 x = reflectionPos.mMtx[0][3]; + f32 x = reflectionPos.mMtx[0][3]; mPosition.set(x, y, z); MR::setBaseTRMtx(this, mMtx); } } -void SimpleMirrorReflectionObj::init(const JMapInfoIter &rIter) { +void SimpleMirrorReflectionObj::init(const JMapInfoIter& rIter) { SimpleMapObj::init(rIter); MR::invalidateClipping(this); } -void SimpleMirrorReflectionObj::connectToScene(const MapObjActorInitInfo &rInfo) { +void SimpleMirrorReflectionObj::connectToScene(const MapObjActorInitInfo& rInfo) { MR::connectToSceneMirrorMapObjNoMovement(this); } namespace { - const SoundEffectDataEntry* getSeParam(const char *pName) { + const SoundEffectDataEntry* getSeParam(const char* pName) { for (u32 i = 0; i < 8; i++) { if (MR::isEqualString(pName, sSeDataTable[i].objectName)) { return &sSeDataTable[i]; @@ -93,18 +91,19 @@ namespace { return nullptr; } -}; +}; // namespace -SimpleSeesawObj::SimpleSeesawObj(const char *pName) : MapObjActor(pName) { +SimpleSeesawObj::SimpleSeesawObj(const char* pName) + : MapObjActor(pName) { _C4.identity(); } -void SimpleSeesawObj::init(const JMapInfoIter &rIter) { +void SimpleSeesawObj::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoSimpleMapObj(&info); const SoundEffectDataEntry* entry = getSeParam(mObjectName); - const char* sound_name = entry != nullptr ? entry->soundName : nullptr; + const char* sound_name = entry != nullptr ? entry->soundName : nullptr; entry = getSeParam(mObjectName); MapObjActorUtil::setupInitInfoSeesaw(&info, rIter, sound_name, entry != nullptr ? entry->_8 : 0.0f); initialize(rIter, info); @@ -114,13 +113,13 @@ void SimpleSeesawObj::control() { MapObjActor::control(); } -void SimpleMapObjPush::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void SimpleMapObjPush::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver)) { MR::sendMsgPush(pReceiver, pSender); } } -void UFOKinokoUnderConstruction::init(const JMapInfoIter &rIter) { +void UFOKinokoUnderConstruction::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; info.setupFarClipping(-1.0f); @@ -133,8 +132,7 @@ void UFOKinokoUnderConstruction::init(const JMapInfoIter &rIter) { if (MR::isUFOKinokoUnderConstruction()) { info.mModelName = "UFOKinokoUnderConstruction"; - } - else { + } else { info.mModelName = "UFOKinokoLandingAstro"; } } @@ -146,21 +144,20 @@ void UFOKinokoUnderConstruction::init(const JMapInfoIter &rIter) { } namespace MR { - void makeArchiveListUFOKinokoUnderConstruction(NameObjArchiveListCollector *pArchiveList, const JMapInfoIter &rIter) { + void makeArchiveListUFOKinokoUnderConstruction(NameObjArchiveListCollector* pArchiveList, const JMapInfoIter& rIter) { const char* archive; if (MR::isUFOKinokoBeforeConstruction()) { archive = "UFOKinokoUnderConstruction"; - } - else { + } else { archive = "UFOKinokoLandingAstro"; } pArchiveList->addArchive(archive); } -}; +}; // namespace MR -void SimpleEnvironmentObj::init(const JMapInfoIter &rIter) { +void SimpleEnvironmentObj::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoSimpleMapObj(&info); @@ -173,15 +170,14 @@ void SimpleTextureSwitchChangeObj::changeTexture() { MR::setBtkFrameAndStop(this, getChangedTextureNo()); } -void SimpleMirrorObj::init(const JMapInfoIter &rIter) { +void SimpleMirrorObj::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; - bool hasMtx = false; + bool hasMtx = false; if (!mMtx) { MapObjActorUtil::setupInitInfoSimpleMapObj(&info); - } - else { + } else { info.setupHioNode("地形オブジェ"); info.setupConnectToScene(); info.setupEffect(nullptr); @@ -201,37 +197,28 @@ s32 SimpleTextureSwitchChangeObj::getChangedTextureNo() const { } SimpleEnvironmentObj::~SimpleEnvironmentObj() { - } SimpleMapObjNoSilhouetted::~SimpleMapObjNoSilhouetted() { - } SimpleTextureSwitchChangeObj::~SimpleTextureSwitchChangeObj() { - } GlaringLight::~GlaringLight() { - } SimpleMirrorObj::~SimpleMirrorObj() { - } SimpleMirrorReflectionObj::~SimpleMirrorReflectionObj() { - } SimpleSeesawObj::~SimpleSeesawObj() { - } SimpleMapObjPush::~SimpleMapObjPush() { - } UFOKinokoUnderConstruction::~UFOKinokoUnderConstruction() { - } diff --git a/src/Game/MapObj/SimpleNormalMapObj.cpp b/src/Game/MapObj/SimpleNormalMapObj.cpp index baad32b4c..7e292f793 100644 --- a/src/Game/MapObj/SimpleNormalMapObj.cpp +++ b/src/Game/MapObj/SimpleNormalMapObj.cpp @@ -6,12 +6,11 @@ #include "Game/Util/ObjUtil.hpp" #include "revolution/types.h" +SimpleNormalMapObj::SimpleNormalMapObj(const char* pName) + : NormalMapBase(pName) {} +SimpleNormalMapObj::~SimpleNormalMapObj() {} -SimpleNormalMapObj::SimpleNormalMapObj(const char *pName) : NormalMapBase(pName) { } -SimpleNormalMapObj::~SimpleNormalMapObj() { } - - -void SimpleNormalMapObj::init(const JMapInfoIter & rIter) { +void SimpleNormalMapObj::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); char v6[0x100]; MR::getMapPartsObjectNameIfExistShapeID(v6, sizeof(v6), rIter); diff --git a/src/Game/MapObj/SimpleTimerObj.cpp b/src/Game/MapObj/SimpleTimerObj.cpp index 2a4500d73..5765ff6fe 100644 --- a/src/Game/MapObj/SimpleTimerObj.cpp +++ b/src/Game/MapObj/SimpleTimerObj.cpp @@ -1,12 +1,13 @@ #include "Game/MapObj/SimpleTimerObj.hpp" -SimpleTimerObj::SimpleTimerObj(const char *pName) : MapObjActor(pName) { +SimpleTimerObj::SimpleTimerObj(const char* pName) + : MapObjActor(pName) { mFlashingCtrl = 0; mTimer = 600; mTimeLeft = 0; } -void SimpleTimerObj::init(const JMapInfoIter &rIter) { +void SimpleTimerObj::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoSimpleMapObj(&info); @@ -43,21 +44,19 @@ void SimpleTimerObj::control() { if (mTimeLeft == 120) { mFlashingCtrl->start(120); - } - else if (mTimeLeft != 0) { + } else if (mTimeLeft != 0) { kill(); } } SimpleTimerObj::~SimpleTimerObj() { - } namespace NrvSimpleTimerObj { INIT_NERVE(SimpleTimerObjNrvTimer); - void SimpleTimerObjNrvTimer::execute(Spine *pSpine) const { + void SimpleTimerObjNrvTimer::execute(Spine* pSpine) const { SimpleTimerObj* timer_obj = reinterpret_cast(pSpine->mExecutor); timer_obj->exeTimer(); } -}; \ No newline at end of file +}; // namespace NrvSimpleTimerObj \ No newline at end of file diff --git a/src/Game/MapObj/SnowCapsulePlanet.cpp b/src/Game/MapObj/SnowCapsulePlanet.cpp index 0d959a391..1de37d4f5 100644 --- a/src/Game/MapObj/SnowCapsulePlanet.cpp +++ b/src/Game/MapObj/SnowCapsulePlanet.cpp @@ -1,16 +1,16 @@ #include "Game/MapObj/SnowCapsulePlanet.hpp" #include "Game/Map/CollisionParts.hpp" -SnowCapsulePlanet::SnowCapsulePlanet(const char *pName) : MapObjActor(pName) { +SnowCapsulePlanet::SnowCapsulePlanet(const char* pName) + : MapObjActor(pName) { mDoor1 = nullptr; mDoor2 = nullptr; } SnowCapsulePlanet::~SnowCapsulePlanet() { - } -void SnowCapsulePlanet::init(const JMapInfoIter &rIter) { +void SnowCapsulePlanet::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoPlanet(&info); @@ -21,8 +21,7 @@ void SnowCapsulePlanet::init(const JMapInfoIter &rIter) { mDoor1 = MR::createCollisionPartsFromLiveActor(this, "Open", getSensor("body"), (MR::CollisionScaleType)2); mDoor2 = MR::createCollisionPartsFromLiveActor(this, "Close", getSensor("body"), (MR::CollisionScaleType)2); MR::validateCollisionParts(mDoor2); - if ( MR::isDemoCast(this, nullptr)) - { + if (MR::isDemoCast(this, nullptr)) { MR::tryRegisterDemoActionNerve(this, &NrvSnowCapsulePlanet::SnowCapsulePlanetNrvOpen::sInstance, nullptr); } } @@ -47,15 +46,14 @@ namespace NrvSnowCapsulePlanet { INIT_NERVE(SnowCapsulePlanetNrvOpenWait); INIT_NERVE(SnowCapsulePlanetNrvOpen); - void SnowCapsulePlanetNrvCloseWait::execute(Spine *pSpine) const { - } + void SnowCapsulePlanetNrvCloseWait::execute(Spine* pSpine) const { + } - void SnowCapsulePlanetNrvOpenWait::execute(Spine *pSpine) const { - } + void SnowCapsulePlanetNrvOpenWait::execute(Spine* pSpine) const { + } - void SnowCapsulePlanetNrvOpen::execute(Spine *pSpine) const { + void SnowCapsulePlanetNrvOpen::execute(Spine* pSpine) const { SnowCapsulePlanet* planet = reinterpret_cast(pSpine->mExecutor); - planet->exeOpen(); - } -}; - + planet->exeOpen(); + } +}; // namespace NrvSnowCapsulePlanet diff --git a/src/Game/MapObj/SnowMan.cpp b/src/Game/MapObj/SnowMan.cpp index 3ab3505c3..bfe13413e 100644 --- a/src/Game/MapObj/SnowMan.cpp +++ b/src/Game/MapObj/SnowMan.cpp @@ -19,9 +19,10 @@ namespace NrvSnowMan { NEW_NERVE(SnowManNrvMeltBody, SnowMan, MeltBody); NEW_NERVE(SnowManNrvDownHead, SnowMan, DownHead); NEW_NERVE(SnowManNrvDownBody, SnowMan, DownBody); -} +} // namespace NrvSnowMan -SnowMan::SnowMan(const char* pName) : LiveActor(pName) { +SnowMan::SnowMan(const char* pName) + : LiveActor(pName) { mHeadCollisionParts = nullptr; mBodyCollisionParts = nullptr; mAnimScaleCtrl = nullptr; @@ -30,14 +31,14 @@ SnowMan::SnowMan(const char* pName) : LiveActor(pName) { SnowMan::~SnowMan() {} -void SnowMan::init(const JMapInfoIter &rIfter) { - MR::initDefaultPos(this,rIfter); +void SnowMan::init(const JMapInfoIter& rIfter) { + MR::initDefaultPos(this, rIfter); initModelManagerWithAnm("SnowMan", nullptr, false); MR::connectToSceneMapObjStrongLight(this); initHitSensor(2); MR::addMessageSensorMapObj(this, "head"); MR::addMessageSensorMapObj(this, "body"); - mHeadCollisionParts = MR::createCollisionPartsFromLiveActor(this, "HeadCol", getSensor("head"), MR::getJointMtx(this, "Head"), (MR::CollisionScaleType)1); + mHeadCollisionParts = MR::createCollisionPartsFromLiveActor(this, "HeadCol", getSensor("head"), MR::getJointMtx(this, "Head"), (MR::CollisionScaleType)1); mBodyCollisionParts = MR::createCollisionPartsFromLiveActor(this, "BodyCol", getSensor("body"), MR::getJointMtx(this, "Body"), (MR::CollisionScaleType)1); MR::validateCollisionParts(mHeadCollisionParts); MR::validateCollisionParts(mBodyCollisionParts); @@ -48,7 +49,7 @@ void SnowMan::init(const JMapInfoIter &rIfter) { mAnimScaleParam->_28 = 0.80000001f; mAnimScaleCtrl = new AnimScaleController(mAnimScaleParam); initEffectKeeper(0, nullptr, false); - initSound(4,false); + initSound(4, false); MR::useStageSwitchWriteA(this, rIfter); MR::useStageSwitchWriteB(this, rIfter); MR::useStageSwitchWriteDead(this, rIfter); @@ -59,8 +60,8 @@ void SnowMan::init(const JMapInfoIter &rIfter) { void SnowMan::control() { if (mHeadCollisionParts->_CC) { mHeadCollisionParts->setMtx(); - } - + } + if (mBodyCollisionParts->_CC) { mBodyCollisionParts->setMtx(); } @@ -68,13 +69,13 @@ void SnowMan::control() { } void SnowMan::kill() { - if (MR::isValidSwitchDead(this)){ + if (MR::isValidSwitchDead(this)) { MR::onSwitchDead(this); } LiveActor::kill(); } -bool SnowMan::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool SnowMan::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgFireBallAttack(msg)) { if (pReceiver == getSensor("head")) { damageHead(); @@ -188,7 +189,7 @@ void SnowMan::exeDownBody() { MR::onSwitchB(this); } } - + if (MR::isBckStopped(this)) { kill(); } diff --git a/src/Game/MapObj/SnowplowSwitch.cpp b/src/Game/MapObj/SnowplowSwitch.cpp index f5a72769a..bcda4854e 100644 --- a/src/Game/MapObj/SnowplowSwitch.cpp +++ b/src/Game/MapObj/SnowplowSwitch.cpp @@ -1,10 +1,11 @@ #include "Game/MapObj/SnowplowSwitch.hpp" -SnowplowSwitch::SnowplowSwitch(const char *pName) : LiveActor(pName) { +SnowplowSwitch::SnowplowSwitch(const char* pName) + : LiveActor(pName) { _8C = 0; } -bool SnowplowSwitch::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool SnowplowSwitch::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (msg == ACTMES_ASK_HIDDEN_BY_SNOW) { return _8C == 0; } @@ -21,10 +22,9 @@ bool SnowplowSwitch::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pRe } SnowplowSwitch::~SnowplowSwitch() { - } -void SnowplowSwitch::init(const JMapInfoIter &rIter) { +void SnowplowSwitch::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::connectToSceneMapObjMovement(this); MR::invalidateClipping(this); @@ -35,8 +35,7 @@ void SnowplowSwitch::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchReadAppear(this, rIter)) { MR::syncStageSwitchAppear(this); makeActorDead(); - } - else { + } else { makeActorAppeared(); } } \ No newline at end of file diff --git a/src/Game/MapObj/SoundEmitter.cpp b/src/Game/MapObj/SoundEmitter.cpp index 1faacdde7..3c8ce49f4 100644 --- a/src/Game/MapObj/SoundEmitter.cpp +++ b/src/Game/MapObj/SoundEmitter.cpp @@ -15,24 +15,22 @@ namespace { const JAISoundID sSeTable[33] = { - JAISoundID(0x1) - }; + JAISoundID(0x1)}; } namespace NrvSoundEmitter { NEW_NERVE(SoundEmitterNrvStandBy, SoundEmitter, StandBy); NEW_NERVE(SoundEmitterNrvPlaySound, SoundEmitter, PlaySound); -} +} // namespace NrvSoundEmitter -SoundEmitter::SoundEmitter(const char* pName) : LiveActor(pName) { +SoundEmitter::SoundEmitter(const char* pName) + : LiveActor(pName) { _8C = -1; - } SoundEmitter::~SoundEmitter() { - } -void SoundEmitter::init(const JMapInfoIter & rIter) { +void SoundEmitter::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::getJMapInfoArg0NoInit(rIter, &_8C); MR::connectToSceneMapObjMovement(this); @@ -62,47 +60,45 @@ void SoundEmitter::control() { void SoundEmitter::exePlaySound() { RailRider* rider = mRailRider; - s32 v3 = -1; - if (rider) - { - switch(_8C) - { - case 0xd: - case 0x11: - case 0x12: { - rider->moveToNearestPos(*MR::getCameraWatchPos()); - } break; - default: { - rider->moveToNearestPos(MR::getCamPos()); - } break; + s32 v3 = -1; + if (rider) { + switch (_8C) { + case 0xd: + case 0x11: + case 0x12: { + rider->moveToNearestPos(*MR::getCameraWatchPos()); + } break; + default: { + rider->moveToNearestPos(MR::getCamPos()); + } break; } mPosition.x = mRailRider->mCurPos.x; mPosition.y = mRailRider->mCurPos.y; mPosition.z = mRailRider->mCurPos.z; } - + switch (_8C) { - case 9: - case 0xA: - case 0xB: { - if (MR::calcDistanceToPlayer(this) < 1000.0f) { - return; - } - } break; - case 0x16: - case 0x17: { - if (MR::isDemoActive("ロゼッタ状況説明デモ")) { - return; - } - } break; - case 0x1A: { - v3 = 5; - } break; - case 0x1E: { - MR::startSystemSE("SE_SY_READ_RIDDLE_S", -1, -1); - kill(); + case 9: + case 0xA: + case 0xB: { + if (MR::calcDistanceToPlayer(this) < 1000.0f) { return; - } break; + } + } break; + case 0x16: + case 0x17: { + if (MR::isDemoActive("ロゼッタ状況説明デモ")) { + return; + } + } break; + case 0x1A: { + v3 = 5; + } break; + case 0x1E: { + MR::startSystemSE("SE_SY_READ_RIDDLE_S", -1, -1); + kill(); + return; + } break; } if (_8C >= 0) { MR::startLevelSound(this, sSeTable[_8C], -1, -1, v3); @@ -110,9 +106,9 @@ void SoundEmitter::exePlaySound() { } inline void SoundEmitter::exeStandBy() { - if ( MR::isValidSwitchAppear(this)) { - if ( MR::isOnSwitchAppear(this) ) { + if (MR::isValidSwitchAppear(this)) { + if (MR::isOnSwitchAppear(this)) { setNerve(&NrvSoundEmitter::SoundEmitterNrvPlaySound::sInstance); } - } + } } diff --git a/src/Game/MapObj/SpaceMine.cpp b/src/Game/MapObj/SpaceMine.cpp index 26a5edd58..aca1dd9bd 100644 --- a/src/Game/MapObj/SpaceMine.cpp +++ b/src/Game/MapObj/SpaceMine.cpp @@ -1,13 +1,14 @@ #include "Game/MapObj/SpaceMine.hpp" #include "math_types.hpp" -SpaceMine::SpaceMine(const char *pName) : MapObjActor(pName), mClippingRange(gZeroVec) { +SpaceMine::SpaceMine(const char* pName) + : MapObjActor(pName), mClippingRange(gZeroVec) { _C4 = 1.0f; _D4 = -1; _D8 = 0; } -void SpaceMine::init(const JMapInfoIter &rIter) { +void SpaceMine::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; info.setupHioNode("地形オブジェ"); @@ -77,16 +78,15 @@ void SpaceMine::initAfterPlacement() { } } -void SpaceMine::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void SpaceMine::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::sendMsgEnemyAttackExplosion(pReceiver, pSender)) { kill(); - } - else { + } else { MR::sendMsgPush(pReceiver, pSender); } } -bool SpaceMine::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool SpaceMine::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgInvincibleAttack(msg)) { kill(); return true; @@ -164,20 +164,19 @@ void SpaceMine::exeAppear() { } SpaceMine::~SpaceMine() { - } namespace NrvSpaceMine { - void HostTypeAppear::execute(Spine *pSpine) const { + void HostTypeAppear::execute(Spine* pSpine) const { SpaceMine* mine = reinterpret_cast(pSpine->mExecutor); mine->exeAppear(); } - void HostTypeWait::execute(Spine *pSpine) const { + void HostTypeWait::execute(Spine* pSpine) const { SpaceMine* mine = reinterpret_cast(pSpine->mExecutor); mine->exeWait(); } INIT_NERVE(HostTypeWait); INIT_NERVE(HostTypeAppear); -}; +}; // namespace NrvSpaceMine diff --git a/src/Game/MapObj/SpiderMapBlock.cpp b/src/Game/MapObj/SpiderMapBlock.cpp index cb28e5120..f516f2315 100644 --- a/src/Game/MapObj/SpiderMapBlock.cpp +++ b/src/Game/MapObj/SpiderMapBlock.cpp @@ -10,16 +10,17 @@ #include "JSystem/JGeometry/TVec.hpp" #include "revolution/mtx.h" -SpiderMapBlock::SpiderMapBlock(const char* pName) : LiveActor(pName) { +SpiderMapBlock::SpiderMapBlock(const char* pName) + : LiveActor(pName) { _8C = 0.0f; } bool SpiderMapBlock::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { - if (MR::isMsgPlayerHipDropFloor(msg)) { + if (MR::isMsgPlayerHipDropFloor(msg)) { kill(); - return true; - } - return false; + return true; + } + return false; } bool SpiderMapBlock::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { @@ -28,7 +29,6 @@ bool SpiderMapBlock::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSenso } SpiderMapBlock::~SpiderMapBlock() { - } void SpiderMapBlock::init(const JMapInfoIter& rIter) { @@ -48,7 +48,7 @@ void SpiderMapBlock::init(const JMapInfoIter& rIter) { void SpiderMapBlock::kill() { MR::startSound(this, "SE_OJ_ROCK_BREAK", -1, -1); MR::emitEffect(this, "Break"); - MtxPtr baseMtx = getBaseMtx(); + MtxPtr baseMtx = getBaseMtx(); TVec3f v4(baseMtx[0][1], baseMtx[1][1], 0.0f); MR::normalizeOrZero(&v4); v4.x *= 35.0f; diff --git a/src/Game/MapObj/SpinDriver.cpp b/src/Game/MapObj/SpinDriver.cpp index 715aea6e4..9c876bc32 100644 --- a/src/Game/MapObj/SpinDriver.cpp +++ b/src/Game/MapObj/SpinDriver.cpp @@ -4,10 +4,11 @@ #include #include "math_types.hpp" -SpinDriver::SpinDriver(const char *pName) : LiveActor(pName), - _8C(nullptr), mShootPath(nullptr), mSpinDriverCamera(nullptr), _98(0, 0, 0, 1), _A8(0, 0, 0, 1), - _B8(0, 0, 0), _C4(0, 0, 0), _D0(0, 0, 1), _DC(0, 0, 0), _E8(0, 1, 0), _F4(0, 0, 0), _104(0.0f), _100(40.0f), _108(0.0f), _10C(0, 0, 0) { - +SpinDriver::SpinDriver(const char* pName) + : LiveActor(pName), + _8C(nullptr), mShootPath(nullptr), mSpinDriverCamera(nullptr), _98(0, 0, 0, 1), _A8(0, 0, 0, 1), + _B8(0, 0, 0), _C4(0, 0, 0), _D0(0, 0, 1), _DC(0, 0, 0), _E8(0, 1, 0), _F4(0, 0, 0), _104(0.0f), _100(40.0f), _108(0.0f), _10C(0, 0, 0) { + _11C = 0.0f; _120 = -1.0f; _124 = 300; @@ -22,7 +23,7 @@ SpinDriver::SpinDriver(const char *pName) : LiveActor(pName), _142 = 0; } -void SpinDriver::init(const JMapInfoIter &rIter) { +void SpinDriver::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("SpinDriver", nullptr, false); MR::connectToSceneNoSilhouettedMapObjStrongLight(this); @@ -48,14 +49,13 @@ void SpinDriver::init(const JMapInfoIter &rIter) { MR::initShadowVolumeFlatModel(this, "SpinDriverShadow", MR::getJointMtx(this, "SpinDriver")); initParamFromJMapInfo(rIter); MR::setClippingFar200m(this); - + if (MR::useStageSwitchReadAppear(this, rIter)) { MR::syncStageSwitchAppear(this); makeActorDead(); mSpinDriverCamera->initAppearCamera(rIter, this); - - } - else { + + } else { makeActorAppeared(); } @@ -66,11 +66,10 @@ void SpinDriver::initAfterPlacement() { SpinDriverUtil::setShadowAndClipping(this, &_10C, _120, 300.0f, &_118); } -void SpinDriver::initParamFromJMapInfo(const JMapInfoIter &rIter) { +void SpinDriver::initParamFromJMapInfo(const JMapInfoIter& rIter) { if (!mShootPath) { MR::getJMapInfoArg0NoInit(rIter, &_100); - } - else { + } else { MR::getJMapInfoArg0NoInit(rIter, &_124); } @@ -83,19 +82,18 @@ void SpinDriver::initParamFromJMapInfo(const JMapInfoIter &rIter) { s32 arg4 = 0; if (MR::getJMapInfoArg4NoInit(rIter, &arg4)) { - _142 = !(arg4 - 1); + _142 = !(arg4 - 1); } } -void SpinDriver::initShootPath(const JMapInfoIter &rIter) { +void SpinDriver::initShootPath(const JMapInfoIter& rIter) { if (MR::isConnectedWithRail(rIter)) { mShootPath = new SpinDriverShootPath(); _134 = 0.0f; MR::getJMapInfoArg5NoInit(rIter, &_134); mShootPath->initUsingParabolic(rIter, mPosition); mShootPath->calcInitPose(&_E8, &_D0, &_DC, _134); - } - else { + } else { Mtx mtx; MR::makeMtxRotate(mtx, mRotation); f32 z = mtx[2][0]; @@ -113,7 +111,7 @@ void SpinDriver::initShootPath(const JMapInfoIter &rIter) { } } -void SpinDriver::initEventCamera(const JMapInfoIter &rIter) { +void SpinDriver::initEventCamera(const JMapInfoIter& rIter) { mSpinDriverCamera = new SpinDriverCamera(); mSpinDriverCamera->init(rIter, this); MR::isConnectedWithRail(rIter); @@ -124,8 +122,7 @@ void SpinDriver::appear() { MR::invalidateClipping(this); if (mSpinDriverCamera->isUseAppearCamera(this)) { MR::requestStartDemo(this, "出現", &NrvSpinDriver::SpinDriverNrvAppear::sInstance, &NrvSpinDriver::SpinDriverNrvTryDemo::sInstance); - } - else { + } else { setNerve(&NrvSpinDriver::SpinDriverNrvAppear::sInstance); } } @@ -187,7 +184,7 @@ void SpinDriver::calcAndSetBaseMtx() { MR::setBaseTRMtx(this, position); } -bool SpinDriver::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool SpinDriver::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (msg == ACTMES_IS_RUSH_TAKEOVER) { _13C = 60; @@ -234,8 +231,7 @@ bool SpinDriver::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiv } bool SpinDriver::tryStartShoot() { - bool isSwingOrPointed = MR::isPadSwing(WPAD_CHAN0) - || MR::isPlayerPointedBy2POnTriggerButton(); + bool isSwingOrPointed = MR::isPadSwing(WPAD_CHAN0) || MR::isPlayerPointedBy2POnTriggerButton(); if (isSwingOrPointed) { MR::startSound(_8C, "SE_PM_SPIN_ATTACK", -1, -1); @@ -305,7 +301,7 @@ bool SpinDriver::trySwitchOff() { kill(); return true; } - + return false; } @@ -316,8 +312,7 @@ void SpinDriver::exeNonActive() { MR::startBpk(this, "Wait"); } - bool isSwingOrPointed = MR::isPadSwing(WPAD_CHAN0) - || MR::isPlayerPointedBy2POnTriggerButton(); + bool isSwingOrPointed = MR::isPadSwing(WPAD_CHAN0) || MR::isPlayerPointedBy2POnTriggerButton(); if (isSwingOrPointed) { f32 v3 = _108; @@ -358,8 +353,7 @@ void SpinDriver::exeWait() { MR::startBpk(this, "Wait"); } - bool isSwingOrPointed = MR::isPadSwing(WPAD_CHAN0) - || MR::isPlayerPointedBy2POnTriggerButton(); + bool isSwingOrPointed = MR::isPadSwing(WPAD_CHAN0) || MR::isPlayerPointedBy2POnTriggerButton(); if (isSwingOrPointed) { _108 += 0.050000001f; @@ -372,8 +366,7 @@ void SpinDriver::exeWait() { MR::emitEffect(this, "SpinDriverLight"); MR::startCSSound("CS_SPIN_BIND", nullptr, 0); } - } - else { + } else { MR::deleteEffect(this, "SpinDriverLight"); } @@ -385,8 +378,7 @@ void SpinDriver::exeWait() { void SpinDriver::exeCapture() { if (tryForceCancel()) { MR::deleteEffect(this, "SpinDriverLight"); - } - else { + } else { if (MR::isFirstStep(this)) { MR::startBckPlayer("SpinDriverWait", "SpinDriverCapture"); MR::startBck(this, "Active", nullptr); @@ -453,8 +445,7 @@ void SpinDriver::exeShoot() { if (MR::hasME()) { MR::startSystemME("ME_MAGIC"); - } - else { + } else { MR::startSystemSE("SE_SY_S_SPIN_DRV_ME_ALT", -1, -1); } @@ -469,7 +460,7 @@ void SpinDriver::exeShoot() { MR::shakeCameraNormal(); MR::tryRumblePadVeryStrong(this, 0); } - + if (mShootPath) { updateBindPosition(); updateCamera(); @@ -490,9 +481,8 @@ void SpinDriver::exeShoot() { if (MR::isStep(this, _130)) { MR::startBckPlayer("Fall", "SpinDriverFall"); } - } - else { - f32 v3 = _100; + } else { + f32 v3 = _100; TVec3f v5(_E8); v5 *= v3; _C4 = v5; @@ -580,7 +570,7 @@ void SpinDriver::cancelBind() { } void SpinDriver::updateBindPosition() { - f32 step = getNerveStep() / (f32)_124; + f32 step = getNerveStep() / (f32)_124; TVec3f stack_20(_B8); TVec3f position; mShootPath->calcPosition(&position, step); @@ -689,7 +679,7 @@ void SpinDriver::endCamera() { bool SpinDriver::canStartBind() const { return isNerve(&NrvSpinDriver::SpinDriverNrvWait::sInstance); -} +} /* bool SpinDriver::canBind(HitSensor *pSensor) const { @@ -713,7 +703,6 @@ bool SpinDriver::canBind(HitSensor *pSensor) const { */ SpinDriver::~SpinDriver() { - } namespace NrvSpinDriver { @@ -726,42 +715,41 @@ namespace NrvSpinDriver { INIT_NERVE(SpinDriverNrvShoot); INIT_NERVE(SpinDriverNrvCoolDown); - void SpinDriverNrvCoolDown::execute(Spine *pSpine) const { + void SpinDriverNrvCoolDown::execute(Spine* pSpine) const { SpinDriver* spinDriver = reinterpret_cast(pSpine->mExecutor); spinDriver->exeCoolDown(); } - void SpinDriverNrvShoot::execute(Spine *pSpine) const { + void SpinDriverNrvShoot::execute(Spine* pSpine) const { SpinDriver* spinDriver = reinterpret_cast(pSpine->mExecutor); spinDriver->exeShoot(); } - void SpinDriverNrvShootStart::execute(Spine *pSpine) const { + void SpinDriverNrvShootStart::execute(Spine* pSpine) const { SpinDriver* spinDriver = reinterpret_cast(pSpine->mExecutor); spinDriver->exeShootStart(); } - void SpinDriverNrvCapture::execute(Spine *pSpine) const { + void SpinDriverNrvCapture::execute(Spine* pSpine) const { SpinDriver* spinDriver = reinterpret_cast(pSpine->mExecutor); spinDriver->exeCapture(); } - void SpinDriverNrvWait::execute(Spine *pSpine) const { + void SpinDriverNrvWait::execute(Spine* pSpine) const { SpinDriver* spinDriver = reinterpret_cast(pSpine->mExecutor); spinDriver->exeWait(); } - void SpinDriverNrvAppear::execute(Spine *pSpine) const { + void SpinDriverNrvAppear::execute(Spine* pSpine) const { SpinDriver* spinDriver = reinterpret_cast(pSpine->mExecutor); spinDriver->exeAppear(); } - void SpinDriverNrvNonActive::execute(Spine *pSpine) const { + void SpinDriverNrvNonActive::execute(Spine* pSpine) const { SpinDriver* spinDriver = reinterpret_cast(pSpine->mExecutor); spinDriver->exeNonActive(); } - void SpinDriverNrvTryDemo::execute(Spine *pSpine) const { - + void SpinDriverNrvTryDemo::execute(Spine* pSpine) const { } -}; +}; // namespace NrvSpinDriver diff --git a/src/Game/MapObj/SpinDriverCamera.cpp b/src/Game/MapObj/SpinDriverCamera.cpp index afb1c41bf..7ea3a94b9 100644 --- a/src/Game/MapObj/SpinDriverCamera.cpp +++ b/src/Game/MapObj/SpinDriverCamera.cpp @@ -8,7 +8,7 @@ SpinDriverCamera::SpinDriverCamera() { mAppearCameraFrame = 0; } -void SpinDriverCamera::startAppearCamera(LiveActor *pActor, const TVec3f &a2, const TVec3f &a3, const TVec3f &a4) { +void SpinDriverCamera::startAppearCamera(LiveActor* pActor, const TVec3f& a2, const TVec3f& a3, const TVec3f& a4) { if (mCameraInfo) { mAppearCameraFrame = MR::getMultiActorCameraFrames(pActor, mCameraInfo, "出現イベント用"); @@ -21,7 +21,7 @@ void SpinDriverCamera::startAppearCamera(LiveActor *pActor, const TVec3f &a2, co } } -void SpinDriverCamera::endAppearCamera(LiveActor *pActor) { +void SpinDriverCamera::endAppearCamera(LiveActor* pActor) { if (mCameraInfo && mAppearCameraFrame > 0) { MR::endMultiActorCamera(pActor, mCameraInfo, "出現イベント用", false, -1); } @@ -31,13 +31,13 @@ u32 SpinDriverCamera::getAppearCameraFrames() const { return mAppearCameraFrame; } -void SpinDriverCamera::update(const TVec3f &a1, const TVec3f &a2) { +void SpinDriverCamera::update(const TVec3f& a1, const TVec3f& a2) { if (mCamera) { - switch(mCamera->isEnd()) { - case false: - mCamera->update(); - updateTargetMatrix(a1, a2); - break; + switch (mCamera->isEnd()) { + case false: + mCamera->update(); + updateTargetMatrix(a1, a2); + break; } } } @@ -57,16 +57,16 @@ void SpinDriverCamera::end() { // SpinDriverCamera::updateTargetMatrix -BOOL SpinDriverCamera::isUseAppearCamera(LiveActor *pActor) const { +BOOL SpinDriverCamera::isUseAppearCamera(LiveActor* pActor) const { if (!mCameraInfo) { return false; } - + u32 frames = MR::getMultiActorCameraFrames(pActor, mCameraInfo, "出現イベント用"); return (-frames & ~frames) >> 31; } -void SpinDriverCamera::init(const JMapInfoIter &rIter, LiveActor *pActor) { +void SpinDriverCamera::init(const JMapInfoIter& rIter, LiveActor* pActor) { ActorCameraInfo info(rIter); if (info.mCameraSetID != -1) { @@ -75,11 +75,11 @@ void SpinDriverCamera::init(const JMapInfoIter &rIter, LiveActor *pActor) { mCamera = new MultiEventCamera(); mCamera->setUp(pActor->mName, new ActorCameraInfo(rIter), arg3); mCamera->setEndCameraTypeAtLanding(); - mTargetMtx = new CameraTargetMtx("カメラターゲットダミー"); + mTargetMtx = new CameraTargetMtx("カメラターゲットダミー"); } } -void SpinDriverCamera::initAppearCamera(const JMapInfoIter &rIter, LiveActor *pActor) { +void SpinDriverCamera::initAppearCamera(const JMapInfoIter& rIter, LiveActor* pActor) { ActorCameraInfo info(rIter); if (info.mCameraSetID != -1) { MR::initMultiActorCamera(pActor, rIter, &mCameraInfo, "出現イベント用"); diff --git a/src/Game/MapObj/SpinDriverOperateRing.cpp b/src/Game/MapObj/SpinDriverOperateRing.cpp index f68bc918d..2d88f9515 100644 --- a/src/Game/MapObj/SpinDriverOperateRing.cpp +++ b/src/Game/MapObj/SpinDriverOperateRing.cpp @@ -1,24 +1,23 @@ #include "Game/MapObj/SpinDriverOperateRing.hpp" -SpinDriverOperateRing::SpinDriverOperateRing(const char *pName) : LiveActor(pName), - _8C(0, 0, 0), _98(0, 0, 0), _A4(0, 0, 0), mAccelerate(0, 0, 0), mDirection(0, 0, 0) - { - _E0 = 0; - _C8 = 0.0f; - _CC = 0.0f; - _D0 = 0.0f; - mRadiusRate = 0.0f; - _D8 = 0.0f; - _DC = 0.0f; +SpinDriverOperateRing::SpinDriverOperateRing(const char* pName) + : LiveActor(pName), + _8C(0, 0, 0), _98(0, 0, 0), _A4(0, 0, 0), mAccelerate(0, 0, 0), mDirection(0, 0, 0) { + _E0 = 0; + _C8 = 0.0f; + _CC = 0.0f; + _D0 = 0.0f; + mRadiusRate = 0.0f; + _D8 = 0.0f; + _DC = 0.0f; } -void SpinDriverOperateRing::init(const JMapInfoIter &rIter) { +void SpinDriverOperateRing::init(const JMapInfoIter& rIter) { makeActorAppeared(); MR::invalidateClipping(this); } void SpinDriverOperateRing::control() { - } void SpinDriverOperateRing::setRadiusRate(f32 rate) { @@ -29,15 +28,14 @@ void SpinDriverOperateRing::reset() { resetVelocityAndTrans(); } -void SpinDriverOperateRing::update(const TVec3f &a1, const TVec3f &a2) { +void SpinDriverOperateRing::update(const TVec3f& a1, const TVec3f& a2) { _8C.set(a1); _98.set(a2); if (mRadiusRate <= 0.0f) { resetVelocityAndTrans(); - } - else { - + } else { + updateControlPoint(a2); addAccelToOperatePlane(a2); TVec3f stack_8; @@ -50,7 +48,7 @@ void SpinDriverOperateRing::update(const TVec3f &a1, const TVec3f &a2) { } #ifdef NON_MATCHING -void SpinDriverOperateRing::updateDirection(const TVec3f &rVec) { +void SpinDriverOperateRing::updateDirection(const TVec3f& rVec) { TVec3f stack_20; TVec3f direction(mDirection); direction.scale(0.89999998f); @@ -70,8 +68,8 @@ void SpinDriverOperateRing::resetVelocityAndTrans() { _DC = 0.0f; } -void SpinDriverOperateRing::addAccelToOperatePlane(const TVec3f &rVec) { - f32 dot = -rVec.dot(_A4); +void SpinDriverOperateRing::addAccelToOperatePlane(const TVec3f& rVec) { + f32 dot = -rVec.dot(_A4); TVec3f scalar(rVec); scalar.scale(0.050000001f * dot); mAccelerate += scalar; @@ -81,7 +79,7 @@ void SpinDriverOperateRing::addAccelToCenter() { f32 norm = MR::normalize(_DC, 0.1f, 1.0f); if (norm > 0.000099999997f) { - f32 scalar = ((0.5f * norm) / _D8); + f32 scalar = ((0.5f * norm) / _D8); TVec3f accel(_A4); accel.scale(scalar); mAccelerate += accel; @@ -95,13 +93,11 @@ void SpinDriverOperateRing::attenuateVelocity() { } SpinDriverOperateRing::~SpinDriverOperateRing() { - } namespace NrvSpinDriverOperateRing { INIT_NERVE(SpinDriverOperateRingNrvWait); - void SpinDriverOperateRingNrvWait::execute(Spine *) const { - + void SpinDriverOperateRingNrvWait::execute(Spine*) const { } -}; +}; // namespace NrvSpinDriverOperateRing diff --git a/src/Game/MapObj/SpinDriverPathDrawer.cpp b/src/Game/MapObj/SpinDriverPathDrawer.cpp index 2358036fe..7100235c2 100644 --- a/src/Game/MapObj/SpinDriverPathDrawer.cpp +++ b/src/Game/MapObj/SpinDriverPathDrawer.cpp @@ -2,10 +2,10 @@ #include "Game/Scene/SceneObjHolder.hpp" #include +SpinDriverPathDrawInit::SpinDriverPathDrawInit() + : NameObj("スピンドライバーレール描画初期化"), + mOrangeTexture(nullptr), mGreenTexture(nullptr), mPinkTexture(nullptr), mMaskTexture(nullptr), mIsPathAtOpa(false) { -SpinDriverPathDrawInit::SpinDriverPathDrawInit() : NameObj("スピンドライバーレール描画初期化"), - mOrangeTexture(nullptr), mGreenTexture(nullptr), mPinkTexture(nullptr), mMaskTexture(nullptr), mIsPathAtOpa(false) { - void (SpinDriverPathDrawInit::*drawFunc)(void) = &SpinDriverPathDrawInit::initDraw; MR::registerPreDrawFunction(MR::Functor(this, drawFunc), 18); mOrangeTexture = new JUTTexture(MR::loadTexFromArc("SpinDriverPath.arc", "NormalColor.bti"), 0); @@ -14,7 +14,8 @@ SpinDriverPathDrawInit::SpinDriverPathDrawInit() : NameObj("スピンドライ mMaskTexture = new JUTTexture(MR::loadTexFromArc("SpinDriverPath.arc", "Mask.bti"), 0); } -SpinDriverPathDrawer::SpinDriverPathDrawer(SpinDriverShootPath *pShootPath) : LiveActor("パス描画") { +SpinDriverPathDrawer::SpinDriverPathDrawer(SpinDriverShootPath* pShootPath) + : LiveActor("パス描画") { mShootPath = pShootPath; _90 = 0; _94 = 0; @@ -61,7 +62,7 @@ void SpinDriverPathDrawInit::initDraw() { GXSetCullMode(GX_CULL_NONE); GXSetClipMode(GX_CLIP_ENABLE); Color8 color = Color8(0); - GXSetFog(GX_FOG_NONE, 0.0f, 0.0f, 0.0f, 0.0f, (GXColor&)color); + GXSetFog(GX_FOG_NONE, 0.0f, 0.0f, 0.0f, 0.0f, (GXColor&)color); GXSetFogRangeAdj(GX_FALSE, 0, nullptr); mMaskTexture->load(GX_TEXMAP1); } @@ -75,7 +76,7 @@ namespace MR { void setSpinDriverPathColorGreen() { MR::getSceneObj(SceneObj_SpinDriverPathDrawInit)->mGreenTexture->load(GX_TEXMAP0); } - + void setSpinDriverPathColorPink() { MR::getSceneObj(SceneObj_SpinDriverPathDrawInit)->mPinkTexture->load(GX_TEXMAP0); } @@ -95,9 +96,9 @@ namespace MR { void offDrawSpinDriverPathAtOpa() { MR::getSceneObj(SceneObj_SpinDriverPathDrawInit)->mIsPathAtOpa = false; } -}; +}; // namespace MR -void SpinDriverPathDrawer::init(const JMapInfoIter &rIter) { +void SpinDriverPathDrawer::init(const JMapInfoIter& rIter) { MR::connectToScene(this, -1, -1, -1, 0x12); initPositionList(75.0f, 20.0f); initClipping(); @@ -122,15 +123,14 @@ void SpinDriverPathDrawer::initPathEnd() { if (arg >= 0) { _B8 = arg / 1000.0f; - } - else { + } else { _B8 = 0.0f; } } f32 SpinDriverPathDrawer::calcDrawCode() const { if (_B8 <= 0.0f) { - return _AC; + return _AC; } f32 val = 1.0f - _B8; @@ -140,7 +140,7 @@ f32 SpinDriverPathDrawer::calcDrawCode() const { f32 SpinDriverPathDrawer::calcDrawBaseCode() const { if (_B8 <= 0.0f) { - return _B0; + return _B0; } f32 val = _B0; @@ -174,8 +174,7 @@ void SpinDriverPathDrawer::setColorPink() { void SpinDriverPathDrawer::setMaskLength(f32 mask) { if (mask < 1.0f) { mMaskLength = 1.0f; - } - else { + } else { mMaskLength = mask; } } @@ -183,15 +182,14 @@ void SpinDriverPathDrawer::setMaskLength(f32 mask) { void SpinDriverPathDrawer::setFadeScale(f32 fade) { if (fade < 0.001f) { mFadeScale = 0.001f; - } - else { + } else { mFadeScale = fade; } } // SpinDriverPathDrawer::draw -void SpinDriverPathDrawer::sendPoint(const TVec3f &a1, f32 a2, f32 a3) { +void SpinDriverPathDrawer::sendPoint(const TVec3f& a1, f32 a2, f32 a3) { GXWGFifo.f32 = a1.x; GXWGFifo.f32 = a1.y; GXWGFifo.f32 = a1.z; @@ -200,9 +198,7 @@ void SpinDriverPathDrawer::sendPoint(const TVec3f &a1, f32 a2, f32 a3) { } SpinDriverPathDrawer::~SpinDriverPathDrawer() { - } SpinDriverPathDrawInit::~SpinDriverPathDrawInit() { - } diff --git a/src/Game/MapObj/SpinDriverShootPath.cpp b/src/Game/MapObj/SpinDriverShootPath.cpp index 02b9dd87b..5fd1dd23c 100644 --- a/src/Game/MapObj/SpinDriverShootPath.cpp +++ b/src/Game/MapObj/SpinDriverShootPath.cpp @@ -6,16 +6,16 @@ SpinDriverShootPath::SpinDriverShootPath() { mPath = nullptr; mStartPosition.x = 0.0f; mStartPosition.y = 0.0f; - mStartPosition.z = 0.0f; + mStartPosition.z = 0.0f; mUsesParabolic = false; } -void SpinDriverShootPath::init(const JMapInfoIter &rIter) { +void SpinDriverShootPath::init(const JMapInfoIter& rIter) { mRailRider = new RailRider(rIter); mUsesParabolic = false; } -void SpinDriverShootPath::initUsingParabolic(const JMapInfoIter &rIter, const TVec3f &rStartingPosition) { +void SpinDriverShootPath::initUsingParabolic(const JMapInfoIter& rIter, const TVec3f& rStartingPosition) { mRailRider = new RailRider(rIter); mUsesParabolic = mRailRider->getPointNum() <= 2; @@ -23,10 +23,10 @@ void SpinDriverShootPath::initUsingParabolic(const JMapInfoIter &rIter, const TV mPath = new ParabolicPath(); } - setStartPosition(rStartingPosition); -} + setStartPosition(rStartingPosition); +} -void SpinDriverShootPath::setStartPosition(const TVec3f &rStartPos) { +void SpinDriverShootPath::setStartPosition(const TVec3f& rStartPos) { if (mUsesParabolic) { TVec3f start(mRailRider->mStartPos); TVec3f end(mRailRider->mEndPos); @@ -42,15 +42,14 @@ void SpinDriverShootPath::setStartPosition(const TVec3f &rStartPos) { mStartPosition.setPS(startPos); } -void SpinDriverShootPath::calcPosition(TVec3f *pOutPosition, f32 a2) const { +void SpinDriverShootPath::calcPosition(TVec3f* pOutPosition, f32 a2) const { if (mUsesParabolic) { mPath->calcPosition(pOutPosition, a2); - } - else { + } else { f32 length = mRailRider->getTotalLength(); mRailRider->calcPosAtCoord(pOutPosition, a2 * length); - f32 norm = MR::normalize(a2, 0.0f, 0.5f); - f32 easeOut = MR::getEaseOutValue(norm, 1.0f, 0.0f, 1.0f); + f32 norm = MR::normalize(a2, 0.0f, 0.5f); + f32 easeOut = MR::getEaseOutValue(norm, 1.0f, 0.0f, 1.0f); TVec3f pos(mStartPosition); pos.x *= easeOut; pos.y *= easeOut; @@ -59,22 +58,20 @@ void SpinDriverShootPath::calcPosition(TVec3f *pOutPosition, f32 a2) const { } } -void SpinDriverShootPath::calcDirection(TVec3f *pOutDirection, f32 a2, f32 a3) const { +void SpinDriverShootPath::calcDirection(TVec3f* pOutDirection, f32 a2, f32 a3) const { f32 v6; f32 v7; - + if (a2 < a3) { v6 = a3; v7 = 0.0f; - } - else { + } else { v6 = 1.0f; v7 = (1.0f - a3); if (a2 > v7) { v7 = v7; - } - else { + } else { v7 = a2; v6 = (a2 + a3); } diff --git a/src/Game/MapObj/SpinLeverSwitch.cpp b/src/Game/MapObj/SpinLeverSwitch.cpp index 830f3169d..5b136fdf5 100644 --- a/src/Game/MapObj/SpinLeverSwitch.cpp +++ b/src/Game/MapObj/SpinLeverSwitch.cpp @@ -1,15 +1,15 @@ #include "Game/MapObj/SpinLeverSwitch.hpp" -SpinLeverSwitch::SpinLeverSwitch(const char *pName) : LiveActor(pName) { +SpinLeverSwitch::SpinLeverSwitch(const char* pName) + : LiveActor(pName) { mConnector = nullptr; mConnector = new MapObjConnector(this); -} - -SpinLeverSwitch::~SpinLeverSwitch(){ - } -void SpinLeverSwitch::init(const JMapInfoIter &rIter) { +SpinLeverSwitch::~SpinLeverSwitch() { +} + +void SpinLeverSwitch::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("SpinLeverSwitch", nullptr, false); MR::connectToSceneMapObj(this); @@ -23,8 +23,7 @@ void SpinLeverSwitch::init(const JMapInfoIter &rIter) { MR::setGroupClipping(this, rIter, 16); if (returnedValue) { initNerve(&NrvSpinLeverSwitch::SpinLeverSwitchNrvWait::sInstance); - } - else { + } else { MR::startBck(this, "On", 0); MR::setBckFrameAndStop(this, MR::getBckFrameMax(this)); MR::startBrk(this, "On"); @@ -43,17 +42,17 @@ void SpinLeverSwitch::calcAndSetBaseMtx() { mConnector->connect(); } -void SpinLeverSwitch::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { - if (MR::isSensorPlayer(pReceiver)){ +void SpinLeverSwitch::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { + if (MR::isSensorPlayer(pReceiver)) { if (pSender == (getSensor("spin"))) { if (MR::sendMsgPush(pReceiver, pSender)) { return; } - } + } } } -bool SpinLeverSwitch::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool SpinLeverSwitch::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (!isNerve(&NrvSpinLeverSwitch::SpinLeverSwitchNrvWait::sInstance)) { return false; } @@ -85,8 +84,7 @@ void SpinLeverSwitch::exeSwitchOn() { MR::startBrk(this, "On"); if (MR::isInWater(this, TVec3f(0.0f, 0.0f, 0.0f))) { MR::startSound(this, "SE_OJ_SPIN_LEVER_SW_HIT_W", -1, -1); - } - else { + } else { MR::startSound(this, "SE_OJ_SPIN_LEVER_SW_HIT", -1, -1); } MR::tryRumblePadStrong(this, 0); @@ -95,10 +93,9 @@ void SpinLeverSwitch::exeSwitchOn() { if (MR::isStep(this, 8)) { if (MR::isInWater(this, TVec3f(0.0f, 0.0f, 0.0f))) { MR::startSound(this, "SE_OJ_SPIN_LEVER_SW_ON_W", -1, -1); - } - else { + } else { MR::startSound(this, "SE_OJ_SPIN_LEVER_SW_ON", -1, -1); - } + } } if (MR::isStep(this, 15)) { MR::onSwitchA(this); @@ -113,16 +110,16 @@ namespace NrvSpinLeverSwitch { INIT_NERVE(SpinLeverSwitchNrvSwitchOn); INIT_NERVE(SpinLeverSwitchNrvEnd); - void SpinLeverSwitchNrvWait::execute(Spine *pSpine) const { - SpinLeverSwitch *pActor = (SpinLeverSwitch*)pSpine->mExecutor; - pActor->exeWait(); - } + void SpinLeverSwitchNrvWait::execute(Spine* pSpine) const { + SpinLeverSwitch* pActor = (SpinLeverSwitch*)pSpine->mExecutor; + pActor->exeWait(); + } - void SpinLeverSwitchNrvSwitchOn::execute(Spine *pSpine) const { - SpinLeverSwitch *pActor = (SpinLeverSwitch*)pSpine->mExecutor; - pActor->exeSwitchOn(); - } + void SpinLeverSwitchNrvSwitchOn::execute(Spine* pSpine) const { + SpinLeverSwitch* pActor = (SpinLeverSwitch*)pSpine->mExecutor; + pActor->exeSwitchOn(); + } - void SpinLeverSwitchNrvEnd::execute(Spine *pSpine) const { - } -}; \ No newline at end of file + void SpinLeverSwitchNrvEnd::execute(Spine* pSpine) const { + } +}; // namespace NrvSpinLeverSwitch \ No newline at end of file diff --git a/src/Game/MapObj/SubmarineVolcanoBigColumn.cpp b/src/Game/MapObj/SubmarineVolcanoBigColumn.cpp index d5dcc278b..b913ad8ee 100644 --- a/src/Game/MapObj/SubmarineVolcanoBigColumn.cpp +++ b/src/Game/MapObj/SubmarineVolcanoBigColumn.cpp @@ -7,12 +7,13 @@ namespace { static f32 sShakeDistance = 800.0f; }; -SubmarineVolcanoBigColumn::SubmarineVolcanoBigColumn(const char *pName) : LiveActor(pName) { +SubmarineVolcanoBigColumn::SubmarineVolcanoBigColumn(const char* pName) + : LiveActor(pName) { mBreakModel = nullptr; mIsSmallColumn = false; } -void SubmarineVolcanoBigColumn::init(const JMapInfoIter &rIter) { +void SubmarineVolcanoBigColumn::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); const char* objName; MR::getObjectName(&objName, rIter); @@ -74,8 +75,7 @@ void SubmarineVolcanoBigColumn::exeBreak() { if (mIsSmallColumn) { MR::startSound(this, "SE_OJ_SMN_VOLC_COL_S_BREAK", -1, -1); - } - else { + } else { MR::startSound(this, "SE_OJ_SMN_VOLC_COL_L_BREAK", -1, -1); } } @@ -90,7 +90,7 @@ void SubmarineVolcanoBigColumn::pauseOff() { MR::requestMovementOn(mBreakModel); } -bool SubmarineVolcanoBigColumn::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool SubmarineVolcanoBigColumn::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (isNerve(&NrvSubmarineVolcanoBigColumn::SubmarineVolcanoBigColumnNrvWait::sInstance)) { setNerve(&NrvSubmarineVolcanoBigColumn::SubmarineVolcanoBigColumnNrvBreak::sInstance); return true; @@ -99,7 +99,7 @@ bool SubmarineVolcanoBigColumn::receiveMsgEnemyAttack(u32 msg, HitSensor *pSende return false; } -void SubmarineVolcanoBigColumn::initBreakModel(const char *pModelName) { +void SubmarineVolcanoBigColumn::initBreakModel(const char* pModelName) { char buf[256]; snprintf(buf, sizeof(buf), "%sBreak", pModelName); mBreakModel = MR::createModelObjMapObj("海底火山石柱壊れモデル", buf, getBaseMtx()); @@ -108,10 +108,9 @@ void SubmarineVolcanoBigColumn::initBreakModel(const char *pModelName) { } SubmarineVolcanoBigColumn::~SubmarineVolcanoBigColumn() { - } namespace NrvSubmarineVolcanoBigColumn { INIT_NERVE(SubmarineVolcanoBigColumnNrvWait); INIT_NERVE(SubmarineVolcanoBigColumnNrvBreak); -}; \ No newline at end of file +}; // namespace NrvSubmarineVolcanoBigColumn \ No newline at end of file diff --git a/src/Game/MapObj/Sun.cpp b/src/Game/MapObj/Sun.cpp index 19f71ff46..1fc34bceb 100644 --- a/src/Game/MapObj/Sun.cpp +++ b/src/Game/MapObj/Sun.cpp @@ -1,15 +1,14 @@ #include "Game/MapObj/Sun.hpp" #include "Game/Util.hpp" -Sun::Sun(const char *pName) : LiveActor(pName) { - +Sun::Sun(const char* pName) + : LiveActor(pName) { } Sun::~Sun() { - } -void Sun::init(const JMapInfoIter &rIter) { +void Sun::init(const JMapInfoIter& rIter) { initModelManagerWithAnm("Sun", nullptr, false); MR::connectToSceneSun(this); MR::invalidateClipping(this); diff --git a/src/Game/MapObj/SuperSpinDriver.cpp b/src/Game/MapObj/SuperSpinDriver.cpp index 65b141719..c28e8304f 100644 --- a/src/Game/MapObj/SuperSpinDriver.cpp +++ b/src/Game/MapObj/SuperSpinDriver.cpp @@ -23,8 +23,7 @@ bool SuperSpinDriver::tryForceCancel() { } bool SuperSpinDriver::tryShootStart() { - bool isSwingOrPointed = MR::isPadSwing(WPAD_CHAN0) - || MR::isPlayerPointedBy2POnTriggerButton(); + bool isSwingOrPointed = MR::isPadSwing(WPAD_CHAN0) || MR::isPlayerPointedBy2POnTriggerButton(); if (isSwingOrPointed) { MR::deleteEffect(this, "SuperSpinDriverLight"); @@ -77,8 +76,7 @@ void SuperSpinDriver::requestAppear() { if (mSpinDriverCamera->isUseAppearCamera(this)) { MR::requestStartDemo(this, "出現", &NrvSuperSpinDriver::SuperSpinDriverNrvAppear::sInstance, &NrvSuperSpinDriver::SuperSpinDriverNrvTryDemo::sInstance); - } - else { + } else { setNerve(&NrvSuperSpinDriver::SuperSpinDriverNrvAppear::sInstance); } } @@ -88,8 +86,7 @@ void SuperSpinDriver::requestEmptyAppear() { if (mSpinDriverCamera->isUseAppearCamera(this)) { MR::requestStartDemo(this, "出現", &NrvSuperSpinDriver::SuperSpinDriverNrvEmptyAppear::sInstance, &NrvSuperSpinDriver::SuperSpinDriverNrvTryDemo::sInstance); - } - else { + } else { setNerve(&NrvSuperSpinDriver::SuperSpinDriverNrvEmptyAppear::sInstance); } } @@ -97,8 +94,7 @@ void SuperSpinDriver::requestEmptyAppear() { void SuperSpinDriver::requestActive() { if (isNerve(&NrvSuperSpinDriver::SuperSpinDriverNrvNonActive::sInstance)) { requestAppear(); - } - else if (isNerve(&NrvSuperSpinDriver::SuperSpinDriverNrvEmptyNonActive::sInstance)) { + } else if (isNerve(&NrvSuperSpinDriver::SuperSpinDriverNrvEmptyNonActive::sInstance)) { requestEmptyAppear(); } } @@ -218,9 +214,8 @@ void SuperSpinDriver::exeWait() { MR::emitEffect(this, "SuperSpinDriverLight"); MR::startCSSound("CS_SPIN_BIND", nullptr, 0); } - - } - else { + + } else { MR::deleteEffect(this, "SuperSpinDriverLight"); } @@ -230,8 +225,7 @@ void SuperSpinDriver::exeWait() { void SuperSpinDriver::exeCapture() { if (tryForceCancel()) { MR::deleteEffect(this, "SuperSpinDriverLight"); - } - else { + } else { if (MR::isFirstStep(this)) { MR::emitEffect(this, "SuperSpinDriverLight"); MR::startBckPlayer("SpinDriverWait", "SuperSpinDriverCapture"); @@ -368,7 +362,6 @@ bool SuperSpinDriver::isRightToUse() const { void SuperSpinDriver::exeCoolDown() { // BUG, is supposed to be a conditional to call tryEndCoolDown if (MR::isFirstStep(this)) { - } if (!tryEndCoolDown()) { @@ -382,18 +375,18 @@ void SuperSpinDriver::exeShootOnEnd() { } namespace MR { - NameObj* createSuperSpinDriverYellow(const char *pName) { + NameObj* createSuperSpinDriverYellow(const char* pName) { return new SuperSpinDriver(pName, 0); } - NameObj* createSuperSpinDriverGreen(const char *pName) { + NameObj* createSuperSpinDriverGreen(const char* pName) { return new SuperSpinDriver(pName, 1); } - NameObj* createSuperSpinDriverPink(const char *pName) { + NameObj* createSuperSpinDriverPink(const char* pName) { return new SuperSpinDriver(pName, 2); } -}; +}; // namespace MR namespace NrvSuperSpinDriver { INIT_NERVE(SuperSpinDriverNrvTryDemo); @@ -407,4 +400,4 @@ namespace NrvSuperSpinDriver { INIT_NERVE(SuperSpinDriverNrvShootStart); INIT_NERVE(SuperSpinDriverNrvShoot); INIT_NERVE(SuperSpinDriverNrvCoolDown); -}; +}; // namespace NrvSuperSpinDriver diff --git a/src/Game/MapObj/SurprisedGalaxy.cpp b/src/Game/MapObj/SurprisedGalaxy.cpp index 7d442bcc3..7fe4db3dc 100644 --- a/src/Game/MapObj/SurprisedGalaxy.cpp +++ b/src/Game/MapObj/SurprisedGalaxy.cpp @@ -1,17 +1,16 @@ #include "Game/MapObj/SurprisedGalaxy.hpp" #include -SurprisedGalaxy::SurprisedGalaxy(const char *pName) : LiveActor(pName) { - +SurprisedGalaxy::SurprisedGalaxy(const char* pName) + : LiveActor(pName) { } -void SurprisedGalaxy::init(const JMapInfoIter &rIter) { +void SurprisedGalaxy::init(const JMapInfoIter& rIter) { const char* name; MR::getObjectName(&name, rIter); if (!strcmp(name, "SurprisedGalaxy")) { mGalaxyName = "SurfingLv1Galaxy"; - } - else { + } else { mGalaxyName = &name[strlen("Surp")]; } MR::initDefaultPos(this, rIter); @@ -29,21 +28,18 @@ void SurprisedGalaxy::init(const JMapInfoIter &rIter) { if (MR::useStageSwitchReadAppear(this, rIter)) { makeActorDead(); MR::syncStageSwitchAppear(this); - } - else { + } else { makeActorAppeared(); if (MR::isGalaxyAppearGreenDriver(mGalaxyName)) { if (!MR::isOnGameEventFlagGreenDriver()) { makeActorDead(); } - } - else if (!MR::isOnGameEventFlagViewCompleteEndingMarioAndLuigi()) { + } else if (!MR::isOnGameEventFlagViewCompleteEndingMarioAndLuigi()) { makeActorDead(); } } } - void SurprisedGalaxy::appear() { LiveActor::appear(); } @@ -52,7 +48,7 @@ void SurprisedGalaxy::kill() { LiveActor::kill(); } -void SurprisedGalaxy::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void SurprisedGalaxy::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayerOrRide(pReceiver)) { if (!isNerve(&NrvSurprisedGalaxy::SurprisedGalaxyNrvExit::sInstance)) { setNerve(&NrvSurprisedGalaxy::SurprisedGalaxyNrvExit::sInstance); @@ -77,15 +73,15 @@ void SurprisedGalaxy::exeExit() { } } -bool SurprisedGalaxy::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool SurprisedGalaxy::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { switch (msg) { - case 152: - if (isNerve(&NrvSurprisedGalaxy::SurprisedGalaxyNrvWait::sInstance)) { - setNerve(&NrvSurprisedGalaxy::SurprisedGalaxyNrvExit::sInstance); - } - return false; - default: - break; + case 152: + if (isNerve(&NrvSurprisedGalaxy::SurprisedGalaxyNrvWait::sInstance)) { + setNerve(&NrvSurprisedGalaxy::SurprisedGalaxyNrvExit::sInstance); + } + return false; + default: + break; } return false; } @@ -94,11 +90,11 @@ namespace NrvSurprisedGalaxy { INIT_NERVE(SurprisedGalaxyNrvExit); INIT_NERVE(SurprisedGalaxyNrvWait); - void SurprisedGalaxyNrvExit::execute(Spine *pSpine) const { - SurprisedGalaxy *pActor = (SurprisedGalaxy*)pSpine->mExecutor; - pActor->exeExit(); - } + void SurprisedGalaxyNrvExit::execute(Spine* pSpine) const { + SurprisedGalaxy* pActor = (SurprisedGalaxy*)pSpine->mExecutor; + pActor->exeExit(); + } - void SurprisedGalaxyNrvWait::execute(Spine *pSpine) const { - } -}; \ No newline at end of file + void SurprisedGalaxyNrvWait::execute(Spine* pSpine) const { + } +}; // namespace NrvSurprisedGalaxy \ No newline at end of file diff --git a/src/Game/MapObj/Swinger.cpp b/src/Game/MapObj/Swinger.cpp index 3c080490f..3964f9b1d 100644 --- a/src/Game/MapObj/Swinger.cpp +++ b/src/Game/MapObj/Swinger.cpp @@ -1,18 +1,16 @@ #include "Game/MapObj/Swinger.hpp" #include "Game/Util/MathUtil.hpp" -Swinger::Swinger(const TVec3f *a1, MtxPtr a2, f32 a3, f32 a4, f32 a5, const TVec3f *a6) +Swinger::Swinger(const TVec3f* a1, MtxPtr a2, f32 a3, f32 a4, f32 a5, const TVec3f* a6) : _0(a1), _4(0), _8(0.0f), mAcceleration(0.0f), _20(0.0f, -1.0f, 0.0f), _2C(a3), _30(a4), _34(a5), _38(a6), - _3C((*a2)[0], (*a2)[4], (*a2)[8]), _48((*a2)[1], (*a2)[5], (*a2)[9]), _54((*a2)[2], (*a2)[6], (*a2)[10]) -{ + _3C((*a2)[0], (*a2)[4], (*a2)[8]), _48((*a2)[1], (*a2)[5], (*a2)[9]), _54((*a2)[2], (*a2)[6], (*a2)[10]) { _8.set(_0->x, (_0->y - _2C), _0->z); _60.identity(); _60.setInline(a2); _60.setTrans(*_0); } -void Swinger::accel(const TVec3f& a1) -{ +void Swinger::accel(const TVec3f& a1) { mAcceleration.add(a1); } @@ -61,8 +59,7 @@ void Swinger::update() } */ -void Swinger::updateSwingMtx(const TVec3f &a1) -{ +void Swinger::updateSwingMtx(const TVec3f& a1) { _48.set(_20); _48.x *= -1.0f; _48.y *= -1.0f; diff --git a/src/Game/MapObj/SwitchBox.cpp b/src/Game/MapObj/SwitchBox.cpp index 53062420b..265df4c24 100644 --- a/src/Game/MapObj/SwitchBox.cpp +++ b/src/Game/MapObj/SwitchBox.cpp @@ -3,189 +3,188 @@ #include "Game/Util.hpp" #include "JSystem/JGeometry/TVec.hpp" -SwitchBox::SwitchBox(const char *pName) : LiveActor(pName) { - +SwitchBox::SwitchBox(const char* pName) + : LiveActor(pName) { } -void SwitchBox::init(const JMapInfoIter &rIter) { - MR::initDefaultPos(this, rIter); - initModelManagerWithAnm("SwitchBox", nullptr, false); - MR::connectToSceneMapObjNoCalcAnim(this); - initSound(2, false); - initNerve(&NrvSwitchBox::SwitchBoxNrvWait::sInstance); - initEffectKeeper(3, nullptr, false); - f32 newScale = mScale.x * 90.0f; - initHitSensor(2); - MR::addHitSensorMapObj(this, "body", 8, newScale, TVec3f(0.0f, newScale, 0.0f)); +void SwitchBox::init(const JMapInfoIter& rIter) { + MR::initDefaultPos(this, rIter); + initModelManagerWithAnm("SwitchBox", nullptr, false); + MR::connectToSceneMapObjNoCalcAnim(this); + initSound(2, false); + initNerve(&NrvSwitchBox::SwitchBoxNrvWait::sInstance); + initEffectKeeper(3, nullptr, false); + f32 newScale = mScale.x * 90.0f; + initHitSensor(2); + MR::addHitSensorMapObj(this, "body", 8, newScale, TVec3f(0.0f, newScale, 0.0f)); - s32 local_38 = 1; + s32 local_38 = 1; - if (MR::checkJMapDataEntries(rIter)) { - MR::getJMapInfoArg1NoInit(rIter, &local_38); - } + if (MR::checkJMapDataEntries(rIter)) { + MR::getJMapInfoArg1NoInit(rIter, &local_38); + } - setNerve(&NrvSwitchBox::SwitchBoxNrvWait::sInstance); - MR::initCollisionParts(this, "SwitchBox", getSensor("body"), nullptr); - MR::validateClipping(this); + setNerve(&NrvSwitchBox::SwitchBoxNrvWait::sInstance); + MR::initCollisionParts(this, "SwitchBox", getSensor("body"), nullptr); + MR::validateClipping(this); - _92 = 0; + _92 = 0; - if (local_38) { - _92 = 1; - } + if (local_38) { + _92 = 1; + } - if (_92) { - MR::initShadowVolumeBox(this, TVec3f(150.0f, 150.0f, 150.0f)); - MR::setShadowVolumeStartDropOffset(this, nullptr, 77.0f); - MR::setShadowVolumeEndDropOffset(this, nullptr, 150.0f); - MR::onShadowVolumeCutDropLength(this, nullptr); - MR::excludeCalcShadowToMyCollision(this, nullptr); - MR::onCalcGravity(this); - MR::onCalcShadowOneTime(this, nullptr); - } + if (_92) { + MR::initShadowVolumeBox(this, TVec3f(150.0f, 150.0f, 150.0f)); + MR::setShadowVolumeStartDropOffset(this, nullptr, 77.0f); + MR::setShadowVolumeEndDropOffset(this, nullptr, 150.0f); + MR::onShadowVolumeCutDropLength(this, nullptr); + MR::excludeCalcShadowToMyCollision(this, nullptr); + MR::onCalcGravity(this); + MR::onCalcShadowOneTime(this, nullptr); + } - MR::addToAttributeGroupSearchTurtle(this); + MR::addToAttributeGroupSearchTurtle(this); - if (MR::useStageSwitchReadAppear(this, rIter)) { - MR::syncStageSwitchAppear(this); - } + if (MR::useStageSwitchReadAppear(this, rIter)) { + MR::syncStageSwitchAppear(this); + } - MR::needStageSwitchWriteDead(this, rIter); - appear(); + MR::needStageSwitchWriteDead(this, rIter); + appear(); } void SwitchBox::initAfterPlacement() { - } void SwitchBox::exeWait() { - if (_8c != 0) { - --_8c; - } + if (_8c != 0) { + --_8c; + } - if (_8e != 0) { - --_8e; - if (_8e == 0) { - _90 = 1; - } - } + if (_8e != 0) { + --_8e; + if (_8e == 0) { + _90 = 1; + } + } - if (_90 == 0) { - setNerve(&NrvSwitchBox::SwitchBoxNrvHit::sInstance); - } + if (_90 == 0) { + setNerve(&NrvSwitchBox::SwitchBoxNrvHit::sInstance); + } } void SwitchBox::exeHit() { - if (getNerveStep() == 0) { - getSensor("body")->invalidate(); - } + if (getNerveStep() == 0) { + getSensor("body")->invalidate(); + } - if (getNerveStep() == 5) { - MR::hideModel(this); - } + if (getNerveStep() == 5) { + MR::hideModel(this); + } - if (getNerveStep() == 15) { - kill(); - } + if (getNerveStep() == 15) { + kill(); + } } void SwitchBox::appear() { - MR::offSwitchDead(this); + MR::offSwitchDead(this); - _90 = 1; - _8e = 0; - _8c = 0; + _90 = 1; + _8e = 0; + _8c = 0; - LiveActor::appear(); - MR::showModel(this); - setNerve(&NrvSwitchBox::SwitchBoxNrvWait::sInstance); + LiveActor::appear(); + MR::showModel(this); + setNerve(&NrvSwitchBox::SwitchBoxNrvWait::sInstance); } void SwitchBox::kill() { - MR::onSwitchDead(this); - LiveActor::kill(); + MR::onSwitchDead(this); + LiveActor::kill(); } -void SwitchBox::doHit(HitSensor *pSender, HitSensor *pReceiver) { - if (_90 != 0) { - --_90; - } +void SwitchBox::doHit(HitSensor* pSender, HitSensor* pReceiver) { + if (_90 != 0) { + --_90; + } - if (_90 == 0) { - MR::invalidateCollisionParts(this); - } + if (_90 == 0) { + MR::invalidateCollisionParts(this); + } - _8e = 30; + _8e = 30; - if (MR::isInWater(this, TVec3f(0.0f, 0.0f, 0.0f))) { - MR::startSound(this, "SE_OJ_S_BLOCK_BREAK_W", -1, -1); - MR::emitEffect(this, "BreakWater"); - } else { - MR::startSound(this, "SE_OJ_S_BLOCK_BREAK", -1, -1); - MR::emitEffect(this, "Break"); - } + if (MR::isInWater(this, TVec3f(0.0f, 0.0f, 0.0f))) { + MR::startSound(this, "SE_OJ_S_BLOCK_BREAK_W", -1, -1); + MR::emitEffect(this, "BreakWater"); + } else { + MR::startSound(this, "SE_OJ_S_BLOCK_BREAK", -1, -1); + MR::emitEffect(this, "Break"); + } } -bool SwitchBox::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - if (MR::isMsgPlayerUpperPunch(msg) && _90 != 0) { - doHit(pSender, pReceiver); - pSender->receiveMessage(0x40, pReceiver); - return true; - } +bool SwitchBox::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + if (MR::isMsgPlayerUpperPunch(msg) && _90 != 0) { + doHit(pSender, pReceiver); + pSender->receiveMessage(0x40, pReceiver); + return true; + } - if (MR::isMsgPlayerHitAll(msg) && _90 != 0) { - doHit(pSender, pReceiver); - return true; - } + if (MR::isMsgPlayerHitAll(msg) && _90 != 0) { + doHit(pSender, pReceiver); + return true; + } - if (MR::isMsgPlayerHipDrop(msg) || MR::isMsgPlayerHipDropFloor(msg)) { - if (_8c != 0) { - doHit(pSender, pReceiver); - return true; - } + if (MR::isMsgPlayerHipDrop(msg) || MR::isMsgPlayerHipDropFloor(msg)) { + if (_8c != 0) { + doHit(pSender, pReceiver); + return true; + } - return true; - } + return true; + } - return false; + return false; } -bool SwitchBox::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - if (_90 != 0) { - doHit(pSender, pReceiver); - return true; - } +bool SwitchBox::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + if (_90 != 0) { + doHit(pSender, pReceiver); + return true; + } - return false; + return false; } -bool SwitchBox::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { - if (msg == ACTMES_IS_PUNCH_ENABLE) { - return _90; - } +bool SwitchBox::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { + if (msg == ACTMES_IS_PUNCH_ENABLE) { + return _90; + } - if (msg == ACTMES_IS_BROKEN) { - return !_90; - } + if (msg == ACTMES_IS_BROKEN) { + return !_90; + } - if (MR::isMsgFloorTouch(msg)) { - _8c = 2; - } + if (MR::isMsgFloorTouch(msg)) { + _8c = 2; + } - return false; + return false; } namespace NrvSwitchBox { - INIT_NERVE(SwitchBoxNrvWait); - INIT_NERVE(SwitchBoxNrvHit); + INIT_NERVE(SwitchBoxNrvWait); + INIT_NERVE(SwitchBoxNrvHit); - void SwitchBoxNrvHit::execute(Spine *pSpine) const { - SwitchBox *pActor = reinterpret_cast(pSpine->mExecutor); - pActor->exeHit(); - } + void SwitchBoxNrvHit::execute(Spine* pSpine) const { + SwitchBox* pActor = reinterpret_cast(pSpine->mExecutor); + pActor->exeHit(); + } - void SwitchBoxNrvWait::execute(Spine *pSpine) const { - SwitchBox *pActor = reinterpret_cast(pSpine->mExecutor); - pActor->exeWait(); - } -}; + void SwitchBoxNrvWait::execute(Spine* pSpine) const { + SwitchBox* pActor = reinterpret_cast(pSpine->mExecutor); + pActor->exeWait(); + } +}; // namespace NrvSwitchBox diff --git a/src/Game/MapObj/TimeAppearObj.cpp b/src/Game/MapObj/TimeAppearObj.cpp index a41804d4c..207519343 100644 --- a/src/Game/MapObj/TimeAppearObj.cpp +++ b/src/Game/MapObj/TimeAppearObj.cpp @@ -1,11 +1,11 @@ #include "Game/MapObj/TimeAppearObj.hpp" #include "Game/Util.hpp" -TimeAppearObj::TimeAppearObj(const char *pName) : MapObjActor(pName), mTimer(0x1E) { - +TimeAppearObj::TimeAppearObj(const char* pName) + : MapObjActor(pName), mTimer(0x1E) { } -void TimeAppearObj::init(const JMapInfoIter &rIter) { +void TimeAppearObj::init(const JMapInfoIter& rIter) { MapObjActorInitInfo info; info.setupModelName("KoopaBattleMapStairTurn"); info.setupSound(4); @@ -39,22 +39,21 @@ void TimeAppearObj::appear() { } TimeAppearObj::~TimeAppearObj() { - } namespace NrvTimeAppearObj { INIT_NERVE(TimeAppearObjNrvHide); INIT_NERVE(TimeAppearObjNrvEnd); - void TimeAppearObjNrvEnd::execute(Spine *pSpine) const { + void TimeAppearObjNrvEnd::execute(Spine* pSpine) const { TimeAppearObj* obj = reinterpret_cast(pSpine->mExecutor); obj->exeEnd(); } - void TimeAppearObjNrvHide::execute(Spine *pSpine) const { + void TimeAppearObjNrvHide::execute(Spine* pSpine) const { TimeAppearObj* obj = reinterpret_cast(pSpine->mExecutor); if (MR::isStep(obj, obj->mTimer)) { obj->setNerve(&NrvTimeAppearObj::TimeAppearObjNrvEnd::sInstance); } } -}; \ No newline at end of file +}; // namespace NrvTimeAppearObj \ No newline at end of file diff --git a/src/Game/MapObj/TransparentWall.cpp b/src/Game/MapObj/TransparentWall.cpp index 6297aa805..625021476 100644 --- a/src/Game/MapObj/TransparentWall.cpp +++ b/src/Game/MapObj/TransparentWall.cpp @@ -5,17 +5,18 @@ #include "Game/Util/LiveActorUtil.hpp" #include "Game/Util/PlayerUtil.hpp" -TransparentWall::TransparentWall(const char* pName) : InvisiblePolygonObj(pName) {} +TransparentWall::TransparentWall(const char* pName) + : InvisiblePolygonObj(pName) {} TransparentWall::~TransparentWall() {} -void TransparentWall::init(const JMapInfoIter &rIfter) { +void TransparentWall::init(const JMapInfoIter& rIfter) { InvisiblePolygonObj::init(rIfter); MR::getJMapInfoArg4WithInit(rIfter, &_BC); makeActorAppeared(); _C0 = false; MR::invalidateCollisionParts(this); - HitSensor* sensor = getSensor("body"); + HitSensor* sensor = getSensor("body"); sensor->setType(87); } @@ -55,7 +56,7 @@ void TransparentWall::control() { if ((_BC & 2048)) { r29 = MR::isPlayerTeresaDisappear(); } - + if (r29) { MR::invalidateCollisionParts(this); _C0 = false; diff --git a/src/Game/MapObj/TreasureBoxCracked.cpp b/src/Game/MapObj/TreasureBoxCracked.cpp index 46c665e60..5deb62ef0 100644 --- a/src/Game/MapObj/TreasureBoxCracked.cpp +++ b/src/Game/MapObj/TreasureBoxCracked.cpp @@ -1,5 +1,5 @@ #include "Game/MapObj/TreasureBoxCracked.hpp" -TreasureBoxCracked::TreasureBoxCracked(const char *pName) : LiveActor(pName) { - +TreasureBoxCracked::TreasureBoxCracked(const char* pName) + : LiveActor(pName) { } diff --git a/src/Game/MapObj/TreasureSpot.cpp b/src/Game/MapObj/TreasureSpot.cpp index 9128ca315..fe5efc35f 100644 --- a/src/Game/MapObj/TreasureSpot.cpp +++ b/src/Game/MapObj/TreasureSpot.cpp @@ -1,11 +1,12 @@ #include "Game/MapObj/TreasureSpot.hpp" #include "Game/Util.hpp" -TreasureSpot::TreasureSpot(const char *pName) : MapObjActor(pName) { +TreasureSpot::TreasureSpot(const char* pName) + : MapObjActor(pName) { mIsCoinFlower = false; } -void TreasureSpot::init(const JMapInfoIter &rIter) { +void TreasureSpot::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); MapObjActorInitInfo info; MapObjActorUtil::setupInitInfoSimpleMapObj(&info); @@ -29,14 +30,13 @@ void TreasureSpot::exeSpout() { if (mIsCoinFlower) { MR::startBck(this, "Bloom", 0); MR::startSound(this, "SE_OJ_COIN_FLOWER_BLOOM", -1, -1); - } - else { + } else { setNerve(&NrvTreasureSpot::TreasureSpotNrvEnd::sInstance); kill(); return; } } - + if (mIsCoinFlower) { if (MR::isBckStopped(this)) { setNerve(&NrvTreasureSpot::TreasureSpotNrvEnd::sInstance); @@ -50,7 +50,7 @@ void TreasureSpot::control() { } } -bool TreasureSpot::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool TreasureSpot::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (isNerve(&NrvTreasureSpot::TreasureSpotNrvSpout::sInstance)) { return false; } @@ -78,8 +78,7 @@ bool TreasureSpot::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor void TreasureSpot::switchEmitGlow() { if (!MR::isNearPlayerAnyTime(this, 2000.0f)) { MR::deleteEffect(this, "Glow"); - } - else { + } else { if (MR::isNearPlayerAnyTime(this, 2000.0f)) { if (!MR::isEffectValid(this, "Glow")) { MR::emitEffect(this, "Glow"); @@ -89,7 +88,6 @@ void TreasureSpot::switchEmitGlow() { } TreasureSpot::~TreasureSpot() { - } namespace NrvTreasureSpot { @@ -97,16 +95,14 @@ namespace NrvTreasureSpot { INIT_NERVE(TreasureSpotNrvEnd); INIT_NERVE(TreasureSpotNrvSpout); - void TreasureSpotNrvSpout::execute(Spine *pSpine) const { + void TreasureSpotNrvSpout::execute(Spine* pSpine) const { TreasureSpot* spot = reinterpret_cast(pSpine->mExecutor); spot->exeSpout(); } - void TreasureSpotNrvEnd::execute(Spine *pSpine) const { - + void TreasureSpotNrvEnd::execute(Spine* pSpine) const { } - void TreasureSpotNrvWait::execute(Spine *pSpine) const { - + void TreasureSpotNrvWait::execute(Spine* pSpine) const { } -}; \ No newline at end of file +}; // namespace NrvTreasureSpot \ No newline at end of file diff --git a/src/Game/MapObj/UFOBase.cpp b/src/Game/MapObj/UFOBase.cpp index 5d3ddbf45..61304243e 100644 --- a/src/Game/MapObj/UFOBase.cpp +++ b/src/Game/MapObj/UFOBase.cpp @@ -23,7 +23,8 @@ #include #include -UFOBase::UFOBase(const char *pName) : LiveActor(pName) { +UFOBase::UFOBase(const char* pName) + : LiveActor(pName) { mCollisionParts = nullptr; mLODCtrl = nullptr; mModel = nullptr; @@ -38,9 +39,9 @@ UFOBase::UFOBase(const char *pName) : LiveActor(pName) { _B4 = nullptr; } -void UFOBase::init(const JMapInfoIter &rIter) { +void UFOBase::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); - const char *name; + const char* name; MR::getObjectName(&name, rIter); initModelManagerWithAnm(name, nullptr, false); _B4 = name; @@ -74,8 +75,7 @@ void UFOBase::init(const JMapInfoIter &rIter) { if (MR::isMoveStartTypeUnconditional(_AC)) { initNerve(&NrvUFOBase::UFOBaseNrvWait::sInstance); - } - else { + } else { initNerve(&NrvUFOBase::UFOBaseNrvWaitForPlayerOn::sInstance); } makeActorAppeared(); @@ -127,11 +127,10 @@ void UFOBase::control() { if (MR::isEqualString("UFONormalB", _B4)) { MR::startLevelSound(this, "SE_OJ_LV_UFO_NORM_B_WORK", -1, -1, -1); - } - else if (MR::isEqualString("UFOBattleStageD", _B4)) { + } else if (MR::isEqualString("UFOBattleStageD", _B4)) { MR::startLevelSound(this, "SE_OJ_LV_UFO_BTL_D_ROTATE", -1, -1, -1); } - + if (mRailMover) { mRailMover->movement(); mPosition.x = mRailMover->_28.x; @@ -140,8 +139,7 @@ void UFOBase::control() { if (mRailMover->isWorking()) { if (MR::isEqualString("UFOBattleStageC", _B4)) { MR::startLevelSound(this, "SE_OJ_LV_UFO_BTL_C_MOVE", -1, -1, -1); - } - else { + } else { MR::startLevelSound(this, "SE_OJ_LV_UFO_MOVE", -1, -1, -1); } } @@ -150,8 +148,7 @@ void UFOBase::control() { MR::shakeCameraNormal(); if (MR::isEqualString("UFOBattleStageC", _B4)) { MR::startSound(this, "SE_OJ_UFO_BTL_C_STOP", -1, -1); - } - else { + } else { MR::startSound(this, "SE_OJ_UFO_MOVE_END", -1, -1); } _B0 = true; @@ -168,12 +165,12 @@ void UFOBase::calcAndSetBaseMtx() { MR::setBaseTRMtx(this, mtx); } -void UFOBase::initSubModel(const JMapInfoIter &rIter, const char *name) { +void UFOBase::initSubModel(const JMapInfoIter& rIter, const char* name) { mLODCtrl = MR::createLodCtrlMapObj(this, rIter, 100.0f); if (MR::isExistSubModel(name, "Bloom")) { char pChar[0x100]; snprintf(pChar, 0x100u, "%sBloom", name); - const char *name2 = mName; + const char* name2 = mName; mModel = MR::createModelObjBloomModel(name2, pChar, getBaseMtx()); f32 num = 500.0f; MR::calcModelBoundingRadius(&num, this); @@ -189,19 +186,19 @@ void UFOBase::exeWait() { } } -UFOSolid::UFOSolid(const char *pName) : UFOBase(pName) { - +UFOSolid::UFOSolid(const char* pName) + : UFOBase(pName) { } -UFOBreakable::UFOBreakable(const char *pName) : UFOBase(pName) { - +UFOBreakable::UFOBreakable(const char* pName) + : UFOBase(pName) { } void UFOBreakable::initSensorType() { MR::addHitSensor(this, "body", ATYPE_KILLER_TARGET_MAPOBJ, 8, 100.0f, TVec3f(0.0f, 0.0f, 0.0f)); } -bool UFOBreakable::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool UFOBreakable::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgExplosionAttack(msg) && !isNerve(&NrvUFOBase::UFOBaseNrvBreak::sInstance)) { setNerve(&NrvUFOBase::UFOBaseNrvBreak::sInstance); return true; @@ -210,28 +207,28 @@ bool UFOBreakable::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor } namespace NrvUFOBase { - INIT_NERVE(UFOBaseNrvWait); - INIT_NERVE(UFOBaseNrvWaitForPlayerOn); - INIT_NERVE(UFOBaseNrvMove); - INIT_NERVE(UFOBaseNrvBreak); + INIT_NERVE(UFOBaseNrvWait); + INIT_NERVE(UFOBaseNrvWaitForPlayerOn); + INIT_NERVE(UFOBaseNrvMove); + INIT_NERVE(UFOBaseNrvBreak); - void UFOBaseNrvWait::execute(Spine *pSpine) const { - UFOBase *pActor = (UFOBase*)pSpine->mExecutor; - pActor->exeWait(); - } + void UFOBaseNrvWait::execute(Spine* pSpine) const { + UFOBase* pActor = (UFOBase*)pSpine->mExecutor; + pActor->exeWait(); + } - void UFOBaseNrvWaitForPlayerOn::execute(Spine *pSpine) const { - UFOBase *pActor = (UFOBase*)pSpine->mExecutor; - pActor->exeWaitForPlayerOn(); - } - - void UFOBaseNrvMove::execute(Spine *pSpine) const { - UFOBase *pActor = (UFOBase*)pSpine->mExecutor; - pActor->exeMove(); - } - - void UFOBaseNrvBreak::execute(Spine *pSpine) const { - UFOBase *pActor = (UFOBase*)pSpine->mExecutor; - pActor->kill(); - } -}; + void UFOBaseNrvWaitForPlayerOn::execute(Spine* pSpine) const { + UFOBase* pActor = (UFOBase*)pSpine->mExecutor; + pActor->exeWaitForPlayerOn(); + } + + void UFOBaseNrvMove::execute(Spine* pSpine) const { + UFOBase* pActor = (UFOBase*)pSpine->mExecutor; + pActor->exeMove(); + } + + void UFOBaseNrvBreak::execute(Spine* pSpine) const { + UFOBase* pActor = (UFOBase*)pSpine->mExecutor; + pActor->kill(); + } +}; // namespace NrvUFOBase diff --git a/src/Game/MapObj/UFOKinoko.cpp b/src/Game/MapObj/UFOKinoko.cpp index 9b48f2b98..969adb8cd 100644 --- a/src/Game/MapObj/UFOKinoko.cpp +++ b/src/Game/MapObj/UFOKinoko.cpp @@ -3,19 +3,18 @@ #include "Game/MapObj/MapObjActorInitInfo.hpp" #include "Game/MapObj/StageEffectDataTable.hpp" -UFOKinoko::UFOKinoko(const char *pName) : MapObjActor(pName) { - +UFOKinoko::UFOKinoko(const char* pName) + : MapObjActor(pName) { } UFOKinoko::~UFOKinoko() { - } -void UFOKinoko::init(const JMapInfoIter &rIter) { +void UFOKinoko::init(const JMapInfoIter& rIter) { MapObjActor::init(rIter); s32 argShadowType = -1; MR::getMapPartsArgShadowType(&argShadowType, rIter); - bool hasShadow = !MR::isMapPartsShadowTypeNone(argShadowType); + bool hasShadow = !MR::isMapPartsShadowTypeNone(argShadowType); MapObjActorInitInfo info; info.setupHioNode("地形オブジェ"); info.setupDefaultPos(); @@ -40,7 +39,7 @@ void UFOKinoko::init(const JMapInfoIter &rIter) { initialize(rIter, info); MapObjActorUtil::startRotator(this); if (MR::isDemoCast(this, nullptr)) { - MR::FunctorV0M functor = MR::Functor(this, &UFOKinoko::startMove); + MR::FunctorV0M functor = MR::Functor(this, &UFOKinoko::startMove); MR::tryRegisterDemoActionFunctor(this, functor, "ＵＦＯキノコ登場"); } } @@ -50,13 +49,12 @@ void UFOKinoko::control() { MR::StageEffect::tryStageEffectMoving(this, mObjectName); } -void UFOKinoko::initCaseUseSwitchB(const MapObjActorInitInfo &) { - MR::FunctorV0M functor = MR::Functor(this, &UFOKinoko::startMove); +void UFOKinoko::initCaseUseSwitchB(const MapObjActorInitInfo&) { + MR::FunctorV0M functor = MR::Functor(this, &UFOKinoko::startMove); MR::listenStageSwitchOnB(this, functor); } -void UFOKinoko::initCaseNoUseSwitchB(const MapObjActorInitInfo &) { - +void UFOKinoko::initCaseNoUseSwitchB(const MapObjActorInitInfo&) { } void UFOKinoko::startMove() { @@ -66,7 +64,7 @@ void UFOKinoko::startMove() { setNerve(&NrvUFOKinoko::HostTypeMove::sInstance); } -void UFOKinoko::makeArchiveList(NameObjArchiveListCollector *pArchiveList, const JMapInfoIter &rIter) { +void UFOKinoko::makeArchiveList(NameObjArchiveListCollector* pArchiveList, const JMapInfoIter& rIter) { bool arg7 = false; MR::getJMapInfoArg7NoInit(rIter, &arg7); if (arg7) { @@ -97,15 +95,14 @@ namespace NrvUFOKinoko { INIT_NERVE(HostTypeMove) INIT_NERVE(HostTypeStop) - void HostTypeWait::execute(Spine *pSpine) const { - + void HostTypeWait::execute(Spine* pSpine) const { } - void HostTypeMove::execute(Spine *pSpine) const { + void HostTypeMove::execute(Spine* pSpine) const { UFOKinoko* ufo = reinterpret_cast(pSpine->mExecutor); ufo->exeMove(); } - void HostTypeStop::execute(Spine *pSpine) const { + void HostTypeStop::execute(Spine* pSpine) const { UFOKinoko* ufo = reinterpret_cast(pSpine->mExecutor); ufo->exeStop(); } -}; +}; // namespace NrvUFOKinoko diff --git a/src/Game/MapObj/ValveSwitch.cpp b/src/Game/MapObj/ValveSwitch.cpp index 0c89fb243..a8e59ce57 100644 --- a/src/Game/MapObj/ValveSwitch.cpp +++ b/src/Game/MapObj/ValveSwitch.cpp @@ -1,16 +1,17 @@ #include "Game/LiveActor/HitSensor.hpp" #include "Game/MapObj/ValveSwitch.hpp" -ValveSwitch::ValveSwitch(const char *pName) : LiveActor(pName) { +ValveSwitch::ValveSwitch(const char* pName) + : LiveActor(pName) { _8C = nullptr; mObjConnector = nullptr; _C4 = false; - + mObjConnector = new MapObjConnector(this); _90.identity(); } -void ValveSwitch::init(const JMapInfoIter &rIter) { +void ValveSwitch::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); MR::needStageSwitchWriteA(this, rIter); initModelManagerWithAnm("ValveSwitch", nullptr, false); @@ -51,8 +52,7 @@ void ValveSwitch::exeWait() { if (_C4) { MR::startBck(this, "ValveSwitchReverseOn", nullptr); - } - else { + } else { MR::startBck(this, "ValveSwitchOn", nullptr); } @@ -66,7 +66,7 @@ void ValveSwitch::exeAdjust() { MR::setBrkFrameAndStop(this, 0.0f); } - f32 step = getNerveStep() / 3.0f; + f32 step = getNerveStep() / 3.0f; HitSensor* sensor = getSensor("body"); JMAVECLerp(&_8C->mPosition, &sensor->mPosition, &_8C->mPosition, step); @@ -79,8 +79,7 @@ void ValveSwitch::exeValve() { if (MR::isFirstStep(this)) { if (_C4) { MR::startBck(this, "ValveSwitchReverseOn", nullptr); - } - else { + } else { MR::startBck(this, "ValveSwitchOn", nullptr); } @@ -131,8 +130,7 @@ namespace NrvValveSwitch { INIT_NERVE(ValveSwitchNrvAdjust); INIT_NERVE(ValveSwitchNrvValve); INIT_NERVE(ValveSwitchNrvEnd); -}; +}; // namespace NrvValveSwitch ValveSwitch::~ValveSwitch() { - } diff --git a/src/Game/MapObj/WatchTowerRotateStep.cpp b/src/Game/MapObj/WatchTowerRotateStep.cpp index c963e9533..aea47b170 100644 --- a/src/Game/MapObj/WatchTowerRotateStep.cpp +++ b/src/Game/MapObj/WatchTowerRotateStep.cpp @@ -2,18 +2,19 @@ #include "Game/Util.hpp" #include "Inline.hpp" -NrvWatchTowerRotateStep::WatchTowerRotateStepNrvWait NrvWatchTowerRotateStep::WatchTowerRotateStepNrvWait::sInstance; +NrvWatchTowerRotateStep::WatchTowerRotateStepNrvWait NrvWatchTowerRotateStep::WatchTowerRotateStepNrvWait::sInstance; NrvWatchTowerRotateStep::WatchTowerRotateStepNrvMoveStart NrvWatchTowerRotateStep::WatchTowerRotateStepNrvMoveStart::sInstance; -NrvWatchTowerRotateStep::WatchTowerRotateStepNrvMove NrvWatchTowerRotateStep::WatchTowerRotateStepNrvMove::sInstance; +NrvWatchTowerRotateStep::WatchTowerRotateStepNrvMove NrvWatchTowerRotateStep::WatchTowerRotateStepNrvMove::sInstance; -WatchTowerRotateStep::WatchTowerRotateStep(const char *pName) : LiveActor(pName) { +WatchTowerRotateStep::WatchTowerRotateStep(const char* pName) + : LiveActor(pName) { mRotDeg.x = 0.0f; mRotDeg.y = 0.0f; mRotDeg.z = 0.0f; mLifts = nullptr; } -void WatchTowerRotateStep::init(const JMapInfoIter &rIter) { +void WatchTowerRotateStep::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("WatchTowerRotateStep", nullptr, false); MR::connectToSceneMapObj(this); @@ -22,9 +23,9 @@ void WatchTowerRotateStep::init(const JMapInfoIter &rIter) { MR::addBodyMessageSensorMapObj(this); MR::initCollisionParts(this, "WatchTowerRotateStep", getSensor(nullptr), nullptr); initEffectKeeper(0, nullptr, false); - initSound(4, false); + initSound(4, false); MR::setClippingTypeSphereContainsModelBoundingBox(this, 1500.0f); - + bool demoCast = MR::tryRegisterDemoCast(this, rIter); if (demoCast) { @@ -36,8 +37,7 @@ void WatchTowerRotateStep::init(const JMapInfoIter &rIter) { if (demoCast) { initNerve(&NrvWatchTowerRotateStep::WatchTowerRotateStepNrvWait::sInstance); - } - else { + } else { initNerve(&NrvWatchTowerRotateStep::WatchTowerRotateStepNrvMove::sInstance); } @@ -99,9 +99,9 @@ void WatchTowerRotateStep::exeMoveStart() { } namespace NrvWatchTowerRotateStep { - void WatchTowerRotateStepNrvMove::execute(Spine *pSpine) const { + void WatchTowerRotateStepNrvMove::execute(Spine* pSpine) const { WatchTowerRotateStep* pActor = reinterpret_cast(pSpine->mExecutor); - TVec3f frontVec; + TVec3f frontVec; MR::calcFrontVec(&frontVec, pActor); MR::rotateVecDegree(&pActor->mRotDeg, frontVec, 0.3f); @@ -109,9 +109,9 @@ namespace NrvWatchTowerRotateStep { MR::startLevelSound(pActor, "SE_OJ_LV_WATCH_TOWER_ROTATE", -1, -1, -1); } - void WatchTowerRotateStepNrvMoveStart::execute(Spine *pSpine) const { + void WatchTowerRotateStepNrvMoveStart::execute(Spine* pSpine) const { reinterpret_cast(pSpine->mExecutor)->exeMoveStart(); } - void WatchTowerRotateStepNrvWait::execute(Spine *pSpine) const {} -}; + void WatchTowerRotateStepNrvWait::execute(Spine* pSpine) const {} +}; // namespace NrvWatchTowerRotateStep diff --git a/src/Game/MapObj/WaterLeakPipe.cpp b/src/Game/MapObj/WaterLeakPipe.cpp index 32f9d60f9..7bdc72e51 100644 --- a/src/Game/MapObj/WaterLeakPipe.cpp +++ b/src/Game/MapObj/WaterLeakPipe.cpp @@ -1,19 +1,16 @@ #include "Game/MapObj/WaterLeakPipe.hpp" - -IceStepNoSlip::~IceStepNoSlip() { +IceStepNoSlip::~IceStepNoSlip() { } WaterLeakPipe::~WaterLeakPipe() { - } - -IceStepNoSlip::IceStepNoSlip(MtxPtr mtx) : ModelObj("アイス床", "IceStepNoSlip", mtx, 0x1A, -2, -2, false) { - +IceStepNoSlip::IceStepNoSlip(MtxPtr mtx) + : ModelObj("アイス床", "IceStepNoSlip", mtx, 0x1A, -2, -2, false) { } -void IceStepNoSlip::init(const JMapInfoIter &rIter) { +void IceStepNoSlip::init(const JMapInfoIter& rIter) { ModelObj::init(rIter); initHitSensor(1); MR::addBodyMessageSensorMapObj(this); @@ -39,9 +36,10 @@ void IceStepNoSlip::exeBreak() { namespace NrvIceStepNoSlip { INIT_NERVE(IceStepNoSlipNrvAppear); INIT_NERVE(IceStepNoSlipNrvBreak); -}; +}; // namespace NrvIceStepNoSlip -WaterLeakPipe::WaterLeakPipe(const char *pName) : LiveActor(pName) { +WaterLeakPipe::WaterLeakPipe(const char* pName) + : LiveActor(pName) { mIceStep = nullptr; mPipeHeight = 500.0f; mTopMtx = nullptr; @@ -51,7 +49,7 @@ WaterLeakPipe::WaterLeakPipe(const char *pName) : LiveActor(pName) { _9C.z = 0.0f; } -void WaterLeakPipe::init(const JMapInfoIter &rIter) { +void WaterLeakPipe::init(const JMapInfoIter& rIter) { TVec3f upVec, offs; MR::initDefaultPos(this, rIter); initModelManagerWithAnm("WaterLeakPipe", nullptr, false); @@ -81,7 +79,7 @@ void WaterLeakPipe::exeWait() { if (MR::isFirstStep(this)) { MR::emitEffect(this, "Splash"); } - + MR::startLevelSound(this, "SE_OJ_LV_WATER_LEAK", -1, -1, -1); } @@ -91,11 +89,9 @@ void WaterLeakPipe::exeFreeze() { mIceStep->appear(); MR::startSound(this, "SE_OJ_ICE_FLOOR_FREEZE", -1, -1); MR::invalidateClipping(this); - } - else if (MR::isOnPlayer(mIceStep) && MR::isPlayerElementModeIce()) { + } else if (MR::isOnPlayer(mIceStep) && MR::isPlayerElementModeIce()) { setNerve(&NrvWaterLeakPipe::WaterLeakPipeNrvFreeze::sInstance); - } - else if (MR::isStep(this, 15)) { + } else if (MR::isStep(this, 15)) { mIceStep->setNerve(&NrvIceStepNoSlip::IceStepNoSlipNrvBreak::sInstance); MR::startSound(this, "SE_OJ_ICE_FLOOR_MELT", -1, -1); MR::validateClipping(this); @@ -152,8 +148,7 @@ void WaterLeakPipe::initPipeHeight() { namespace NrvWaterLeakPipe { INIT_NERVE(WaterLeakPipeNrvWait); INIT_NERVE(WaterLeakPipeNrvFreeze); -}; +}; // namespace NrvWaterLeakPipe void WaterLeakPipe::calcAnim() { - } diff --git a/src/Game/MapObj/WaterPressureBullet.cpp b/src/Game/MapObj/WaterPressureBullet.cpp index 98a1dde68..fd3b4440e 100644 --- a/src/Game/MapObj/WaterPressureBullet.cpp +++ b/src/Game/MapObj/WaterPressureBullet.cpp @@ -3,7 +3,8 @@ #include "Game/MapObj/WaterPressureBullet.hpp" #include "JSystem/JMath/JMath.hpp" -WaterPressureBullet::WaterPressureBullet(const char *pName) : LiveActor(pName) { +WaterPressureBullet::WaterPressureBullet(const char* pName) + : LiveActor(pName) { _8C.x = 0.0f; _8C.y = 0.0f; _8C.z = 0.0f; @@ -19,7 +20,7 @@ WaterPressureBullet::WaterPressureBullet(const char *pName) : LiveActor(pName) { mCameraInfo = nullptr; } -void WaterPressureBullet::init(const JMapInfoIter &rIter) { +void WaterPressureBullet::init(const JMapInfoIter& rIter) { initModelManagerWithAnm("WaterBullet", nullptr, false); MR::connectToSceneMapObjStrongLight(this); initHitSensor(2); @@ -68,19 +69,17 @@ void WaterPressureBullet::control() { if (v1 && MR::isStarPointerPointing2POnTriggerButton(this, "弱", true, false)) { kill(); - } - else { + } else { TVec3f stack_8; if (MR::isNearZero(mVelocity, 0.001)) { stack_8.set(mGravity); - } - else { + } else { stack_8.set(mVelocity); } - + f32 val = (45.511112f * MR::negFloat(2.5f)); MR::turnVecToVecCosOnPlane(&_8C, stack_8, _98, JMASCos(val)); - } + } } #endif @@ -90,7 +89,7 @@ void WaterPressureBullet::calcAndSetBaseMtx() { MR::setBaseTRMtx(this, pos); } -void WaterPressureBullet::shotWaterBullet(LiveActor *pActor, const TPos3f &rPos, f32 a3, bool a4, bool a5, bool a6, ActorCameraInfo **pInfo) { +void WaterPressureBullet::shotWaterBullet(LiveActor* pActor, const TPos3f& rPos, f32 a3, bool a4, bool a5, bool a6, ActorCameraInfo** pInfo) { f32 z = rPos.mMtx[2][2]; f32 y = rPos.mMtx[1][2]; f32 x = rPos.mMtx[0][2]; @@ -99,7 +98,7 @@ void WaterPressureBullet::shotWaterBullet(LiveActor *pActor, const TPos3f &rPos, _B0 = a4; _B1 = a5; _B2 = a6; - mCameraInfo = pInfo; + mCameraInfo = pInfo; _8C.set(x, y, z); mVelocity.scale(_A8, _8C); z = rPos.mMtx[2][3]; @@ -166,7 +165,7 @@ void WaterPressureBullet::exeFly() { TVec3f* vel = &mVelocity; TVec3f* grav = &mGravity; - f32 dot = grav->dot(mVelocity); + f32 dot = grav->dot(mVelocity); JMAVECScaleAdd(grav, vel, vel, -dot); } @@ -193,13 +192,13 @@ void WaterPressureBullet::exeSpinKill() { kill(); } -void WaterPressureBullet::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void WaterPressureBullet::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorMapObj(pReceiver)) { kill(); } } -bool WaterPressureBullet::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool WaterPressureBullet::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgFireBallAttack(msg)) { kill(); return true; @@ -208,15 +207,12 @@ bool WaterPressureBullet::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, Hi return false; } -bool WaterPressureBullet::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool WaterPressureBullet::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isDead(this)) { return false; } - if (MR::isMsgAutoRushBegin(msg) - && MR::isSensorPlayer(pSender) - && mHostActor == nullptr) - { + if (MR::isMsgAutoRushBegin(msg) && MR::isSensorPlayer(pSender) && mHostActor == nullptr) { if (MR::isDemoActive()) { kill(); @@ -225,23 +221,19 @@ bool WaterPressureBullet::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor if (!inviteMario(pSender)) { return false; - } - else { + } else { MR::startSound(this, "SE_OJ_W_PRESS_BUBBLE_IN", -1, -1); MR::startSound(mHostActor, "SE_PV_CATCH", -1, -1); return true; } - } - else if (msg == ACTMES_IS_RUSH_TAKEOVER) { + } else if (msg == ACTMES_IS_RUSH_TAKEOVER) { return true; - } - else if (msg == ACTMES_RUSH_CANCEL) { + } else if (msg == ACTMES_RUSH_CANCEL) { kill(); return true; - } - else if (msg == ACTMES_UPDATE_BASEMTX && mHostActor != nullptr) { + } else if (msg == ACTMES_UPDATE_BASEMTX && mHostActor != nullptr) { updateSuffererMtx(); return true; @@ -268,17 +260,16 @@ bool WaterPressureBullet::endHostCamera() const { return false; } -bool WaterPressureBullet::inviteMario(HitSensor *pSensor) { +bool WaterPressureBullet::inviteMario(HitSensor* pSensor) { MR::tryRumblePadMiddle(this, 0); if (MR::isOnGroundPlayer() && MR::isNearAngleDegree(mVelocity, mGravity, 60.0f)) { if (_B1) { TVec3f* vel = &mVelocity; TVec3f* grav = &mGravity; - f32 dot = grav->dot(mVelocity); + f32 dot = grav->dot(mVelocity); JMAVECScaleAdd(grav, vel, vel, -dot); - } - else { + } else { kill(); MR::sendArbitraryMsg(ACTMES_ENEMY_ATTACK_FLIP_VERYWEAK, pSensor, getSensor("body")); @@ -303,8 +294,7 @@ void WaterPressureBullet::updateSuffererMtx() { TVec3f front; MR::calcFrontVec(&front, mHostActor); MR::calcMtxFromGravityAndZAxis(&pos, mHostActor, mGravity, front); - } - else { + } else { MtxPtr mtx = getBaseMtx(); pos.setInline(mtx); } @@ -313,20 +303,19 @@ void WaterPressureBullet::updateSuffererMtx() { } WaterPressureBullet::~WaterPressureBullet() { - } namespace NrvWaterPressureBullet { INIT_NERVE(WaterPressureBulletNrvFly); INIT_NERVE(WaterPressureBulletNrvSpinKill); - void WaterPressureBulletNrvSpinKill::execute(Spine *pSpine) const { + void WaterPressureBulletNrvSpinKill::execute(Spine* pSpine) const { WaterPressureBullet* bullet = reinterpret_cast(pSpine->mExecutor); bullet->exeSpinKill(); } - void WaterPressureBulletNrvFly::execute(Spine *pSpine) const { + void WaterPressureBulletNrvFly::execute(Spine* pSpine) const { WaterPressureBullet* bullet = reinterpret_cast(pSpine->mExecutor); bullet->exeFly(); } -}; +}; // namespace NrvWaterPressureBullet diff --git a/src/Game/MapObj/WaterPressureBulletHolder.cpp b/src/Game/MapObj/WaterPressureBulletHolder.cpp index eee574660..841f243d2 100644 --- a/src/Game/MapObj/WaterPressureBulletHolder.cpp +++ b/src/Game/MapObj/WaterPressureBulletHolder.cpp @@ -1,7 +1,7 @@ #include "Game/MapObj/WaterPressureBulletHolder.hpp" -WaterPressureBulletHolder::WaterPressureBulletHolder(const char *pName) : NameObj(pName) { - +WaterPressureBulletHolder::WaterPressureBulletHolder(const char* pName) + : NameObj(pName) { } WaterPressureBullet* WaterPressureBulletHolder::callEmptyBullet() { @@ -15,10 +15,9 @@ WaterPressureBullet* WaterPressureBulletHolder::callEmptyBullet() { } WaterPressureBulletHolder::~WaterPressureBulletHolder() { - } -void WaterPressureBulletHolder::init(const JMapInfoIter &rIter) { +void WaterPressureBulletHolder::init(const JMapInfoIter& rIter) { for (u32 i = 0; i < 0x10; i++) { mBullets[i] = new WaterPressureBullet("ウォータープレッシャーの弾"); mBullets[i]->initWithoutIter(); diff --git a/src/Game/MapObj/WaveFloatingForce.cpp b/src/Game/MapObj/WaveFloatingForce.cpp index 31c5151ac..25ef12465 100644 --- a/src/Game/MapObj/WaveFloatingForce.cpp +++ b/src/Game/MapObj/WaveFloatingForce.cpp @@ -1,7 +1,7 @@ #include "Game/MapObj/WaveFloatingForce.hpp" #include -WaveFloatingForce::WaveFloatingForce(const LiveActor *pActor, s32 a2, f32 a3, bool a4) { +WaveFloatingForce::WaveFloatingForce(const LiveActor* pActor, s32 a2, f32 a3, bool a4) { mActor = pActor; _4 = a2; _8 = a3; diff --git a/src/Game/MapObj/YellowChip.cpp b/src/Game/MapObj/YellowChip.cpp index ae5096c88..f1c899d6a 100644 --- a/src/Game/MapObj/YellowChip.cpp +++ b/src/Game/MapObj/YellowChip.cpp @@ -1,9 +1,8 @@ #include "Game/MapObj/YellowChip.hpp" -YellowChip::YellowChip(const char *pName) : ChipBase(pName, 1, "YellowChip") { - +YellowChip::YellowChip(const char* pName) + : ChipBase(pName, 1, "YellowChip") { } YellowChip::~YellowChip() { - } \ No newline at end of file diff --git a/src/Game/NPC/Butler.cpp b/src/Game/NPC/Butler.cpp index 027cf46f0..1d5ad8c1a 100644 --- a/src/Game/NPC/Butler.cpp +++ b/src/Game/NPC/Butler.cpp @@ -45,7 +45,7 @@ namespace { const char* cDemoNameDomeLecture2 = "ドームレクチャー2"; const char* cDemoNameStarPiece1 = "スターピース解説前半"; const char* cDemoNameStarPiece2 = "スターピース解説後半"; -}; +}; // namespace namespace NrvButler { NEW_NERVE(ButlerNrvStarPieceReaction, Butler, StarPieceReaction); @@ -54,9 +54,10 @@ namespace NrvButler { NEW_NERVE(ButlerNrvDemoStarPiece2, Butler, DemoStarPiece2); NEW_NERVE(ButlerNrvDemoShowGalaxyMap, Butler, DemoShowGalaxyMap); NEW_NERVE(ButlerNrvWaitStartDemo, Butler, DemoWait); -}; +}; // namespace NrvButler -Butler::Butler(const char *pName) : NPCActor(pName){ +Butler::Butler(const char* pName) + : NPCActor(pName) { mTalkMessage = nullptr; _160 = false; _164 = 0; @@ -67,15 +68,13 @@ Butler::Butler(const char *pName) : NPCActor(pName){ } NPCActor::~NPCActor() { - } Butler::~Butler() { - } -void Butler::init(const JMapInfoIter &rIter) { - const char *dome; +void Butler::init(const JMapInfoIter& rIter) { + const char* dome; MR::getJMapInfoArg0NoInit(rIter, &_170); NPCActorCaps caps = "Butler"; caps.setDefault(); @@ -87,21 +86,20 @@ void Butler::init(const JMapInfoIter &rIter) { caps.mUseShadow = true; caps._38 = 0; NPCActor::initialize(rIter, caps); - setDefaults2(); + setDefaults2(); _13C = "Spin"; - const char *wait = "Wait"; - const char *talk = "Talk"; + const char* wait = "Wait"; + const char* talk = "Talk"; mParam._14 = wait; mParam._18 = wait; mParam._1C = talk; - mParam._20 = talk; + mParam._20 = talk; MR::useStageSwitchWriteA(this, rIter); MR::useStageSwitchWriteB(this, rIter); - + if (MR::isOnGameEventFlagEndButlerStarPieceLecture()) { dome = "AstroGalaxy_Butler000"; - } - else { + } else { dome = "AstroDome_Butler017"; } mButlerState = new ButlerStateStarPieceReaction(this, rIter, dome); @@ -110,8 +108,7 @@ void Butler::init(const JMapInfoIter &rIter) { if (_170) { initForAstroDome(rIter); - } - else { + } else { initForAstroGalaxy(rIter); } } @@ -134,40 +131,39 @@ void Butler::kill() { void Butler::killIfBatlerMapAppear() { if (MR::isButlerMapAppear()) { kill(); - } - else { + } else { MR::setDefaultPose(this); - MR::startBckNoInterpole(this, "Wait"); + MR::startBckNoInterpole(this, "Wait"); } } -void Butler::startDemoButlerReport(const char *event) { +void Butler::startDemoButlerReport(const char* event) { s32 eventNum = 2; s32 executingStorySequenceEventNum = GameSequenceFunction::getExecutingStorySequenceEventNum(); // executingStorySequenceEventNum is an enum not yet documented switch (executingStorySequenceEventNum) { - case 4: - eventNum = 2; - break; + case 4: + eventNum = 2; + break; - case 5: - eventNum = 3; - break; + case 5: + eventNum = 3; + break; - case 6: - eventNum = 4; - break; + case 6: + eventNum = 4; + break; - case 7: - eventNum = 5; - break; + case 7: + eventNum = 5; + break; - case 8: - eventNum = 6; - break; + case 8: + eventNum = 6; + break; - default: - break; + default: + break; } DemoFunction::setDemoTalkMessageCtrlDirect(this, mTalkMessage[eventNum << 0], event); MR::invalidateClipping(this); @@ -186,8 +182,7 @@ void Butler::startDemoDomeLecture2() { s32 i = 0; if (!MR::isOnGameEventFlagEndButlerDomeLecture()) { i = 0; - } - else if (!MR::isOnGameEventFlagEndButlerGalaxyMoveLecture()) { + } else if (!MR::isOnGameEventFlagEndButlerGalaxyMoveLecture()) { i = 1; } DemoFunction::setDemoTalkMessageCtrlDirect(this, mTalkMessage[i], "ドームレクチャー２"); @@ -214,19 +209,19 @@ void Butler::startDemoStarPiece2() { MR::offSwitchB(this); static_cast(MR::getPairedGroupMember(this))->forceKillStarPieceAll(false); MR::getPairedGroupMember(this)->kill(); - + _160 = false; MR::invalidateClipping(this); LiveActor::appear(); setNerve(&NrvButler::ButlerNrvDemo::sInstance); - setNerve(&NrvButler::ButlerNrvDemoStarPiece2::sInstance); + setNerve(&NrvButler::ButlerNrvDemoStarPiece2::sInstance); } void Butler::tryStartShowGalaxyMap() { bool storySequence = GameSequenceFunction::getExecutingStorySequenceEventNum() == 8; if (storySequence) { - setNerve(&NrvButler::ButlerNrvDemoShowGalaxyMap::sInstance); + setNerve(&NrvButler::ButlerNrvDemoShowGalaxyMap::sInstance); } } @@ -236,20 +231,20 @@ void Butler::resetStatus() { } bool Butler::messageBranchFunc(u32 msg) { - bool stupidBool; - const char *triLeg; + bool stupidBool; + const char* triLeg; switch (msg) { - case 0: - return _160; - case 1: - stupidBool = false; - triLeg = "TriLegLv1Galaxy"; - if (MR::isOnGameEventFlagGalaxyOpen(triLeg) || MR::canOpenGalaxy(triLeg)) { - stupidBool = true; - } - return stupidBool; - default: - return false; + case 0: + return _160; + case 1: + stupidBool = false; + triLeg = "TriLegLv1Galaxy"; + if (MR::isOnGameEventFlagGalaxyOpen(triLeg) || MR::canOpenGalaxy(triLeg)) { + stupidBool = true; + } + return stupidBool; + default: + return false; } } @@ -258,7 +253,7 @@ void Butler::control() { if (!MR::isDemoActive()) { MR::requestStarPieceLectureGuidance(); MR::requestCounterLayoutAppearanceForTicoEat(false); - } + } tryReplaceStarPieceIfExecLecture(); } @@ -270,43 +265,37 @@ void Butler::control() { if (NPCActor::isPointingSe()) { MR::startDPDHitSound(); MR::startSound(this, "SE_SV_BUTLER_POINT", -1, -1); - } if (_160) { bool temp = _171; if (MR::isStarPointerPointing1P(this, "弱", false, false)) { _171 = true; - } - else { + } else { _171 = false; } if (!temp && _171 == 1) { MR::startSystemSE("SE_SY_TICOFAT_POINT", -1, -1); - } + } } NPCActor::control(); } -bool Butler::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool Butler::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (_160 || MR::isOnGameEventFlagEndButlerStarPieceLecture()) { if (MR::isMsgLockOnStarPieceShoot(msg)) { return true; - } - else if (MR::isMsgStarPieceReflect(msg)) { + } else if (MR::isMsgStarPieceReflect(msg)) { return false; - } - else if (MR::isMsgStarPieceAttack(msg)) { + } else if (MR::isMsgStarPieceAttack(msg)) { if (_160) { _164++; if (tryStartStarPieceReaction()) { MR::startSystemSE("SE_SY_STAR_PIECE_STOCK_MAX", -1, -1); } - } - else { - bool v1 = isNerve(mWaitNerve) - || isNerve(&NrvButler::ButlerNrvStarPieceReaction::sInstance); + } else { + bool v1 = isNerve(mWaitNerve) || isNerve(&NrvButler::ButlerNrvStarPieceReaction::sInstance); if (v1) { setNerve(&NrvButler::ButlerNrvStarPieceReaction::sInstance); @@ -318,85 +307,82 @@ bool Butler::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pRec return NPCActor::receiveMsgPlayerAttack(msg, pSender, pReceiver); } -bool Butler::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool Butler::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (SphereSelectorFunction::trySyncKillMsgSelectStart(this, msg)) { return true; - } - else { + } else { return MR::isMsgHitmarkEmit(msg); } } -void Butler::initTalkCtrlArray(const JMapInfoIter &rIter) { - mTalkMessage = new TalkMessageCtrl *[0x7]; +void Butler::initTalkCtrlArray(const JMapInfoIter& rIter) { + mTalkMessage = new TalkMessageCtrl*[0x7]; for (s32 i = 0; i < 7; i++) { mTalkMessage[i] = createTalkCtrl(rIter, cMessageId[i]); } } -void Butler::initForAstroDome(const JMapInfoIter &rIter) { +void Butler::initForAstroDome(const JMapInfoIter& rIter) { MR::tryRegisterDemoCast(this, rIter); AstroDemoFunction::tryRegisterDemo(this, "パワースター帰還", rIter); - const MR::FunctorBase& func1 = MR::Functor(this, &Butler::killIfBatlerMapAppear); - const char *demoNameButlerReport = cDemoNameButlerReport; + const MR::FunctorBase& func1 = MR::Functor(this, &Butler::killIfBatlerMapAppear); + const char* demoNameButlerReport = cDemoNameButlerReport; const MR::FunctorBase& func2 = MR::Functor(this, &Butler::startDemoButlerReport, demoNameButlerReport); MR::initDemoSheetTalkAnim(this, rIter, demoNameButlerReport, "DemoButlerReport", mTalkMessage[2]); MR::registerDemoActionFunctorDirect(this, func2, demoNameButlerReport, "開始"); MR::registerDemoActionFunctorDirect(this, func1, demoNameButlerReport, "バトラーリセット"); - const char *demoNameDomeLecture1 = cDemoNameDomeLecture1; + const char* demoNameDomeLecture1 = cDemoNameDomeLecture1; MR::registerDemoCast(this, demoNameDomeLecture1, rIter); DemoFunction::tryCreateDemoTalkAnimCtrlForSceneDirect(this, demoNameDomeLecture1, rIter, "DemoButlerDomeLecture1", nullptr, 0, 0); DemoFunction::registerDemoTalkMessageCtrlDirect(this, createTalkCtrl(rIter, "AstroDome_Butler023"), demoNameDomeLecture1); MR::registerDemoActionFunctorDirect(this, MR::Functor(this, &Butler::startDemoDomeLecture1), demoNameDomeLecture1, nullptr); const MR::FunctorBase& func3 = MR::Functor(this, &Butler::startDemoDomeLecture2); - TalkMessageCtrl* talkMsg1 = *mTalkMessage; + TalkMessageCtrl* talkMsg1 = *mTalkMessage; MR::initDemoSheetTalkAnimFunctor(this, rIter, cDemoNameDomeLecture2, "DemoButlerDomeLecture2", talkMsg1, func3); - const MR::FunctorBase& func4 = MR::Functor(this, &Butler::startDemoStarPiece1); - const MR::FunctorBase& func5 = MR::Functor(this, &Butler::resetStatus); - TalkMessageCtrl *talkMsg2 = createTalkCtrl(rIter, "AstroDome_Butler011"); - const char *demoNameStarPiece1 = cDemoNameStarPiece1; + const MR::FunctorBase& func4 = MR::Functor(this, &Butler::startDemoStarPiece1); + const MR::FunctorBase& func5 = MR::Functor(this, &Butler::resetStatus); + TalkMessageCtrl* talkMsg2 = createTalkCtrl(rIter, "AstroDome_Butler011"); + const char* demoNameStarPiece1 = cDemoNameStarPiece1; MR::initDemoSheetTalkAnim(this, rIter, demoNameStarPiece1, "DemoButlerStarPiece1", talkMsg2); MR::registerDemoActionFunctorDirect(this, func4, demoNameStarPiece1, "開始"); - MR::registerDemoActionFunctorDirect(this, func5, demoNameStarPiece1, "バトラーリセット"); - const MR::FunctorBase& func6 = MR::Functor(this, &Butler::startDemoStarPiece2); - const MR::FunctorBase& func7 = MR::Functor(this, &Butler::resetStatus); - TalkMessageCtrl *talkMsg3 = createTalkCtrl(rIter, "AstroDome_Butler014"); - const char *demoNameStarPiece2 = cDemoNameStarPiece2; + MR::registerDemoActionFunctorDirect(this, func5, demoNameStarPiece1, "バトラーリセット"); + const MR::FunctorBase& func6 = MR::Functor(this, &Butler::startDemoStarPiece2); + const MR::FunctorBase& func7 = MR::Functor(this, &Butler::resetStatus); + TalkMessageCtrl* talkMsg3 = createTalkCtrl(rIter, "AstroDome_Butler014"); + const char* demoNameStarPiece2 = cDemoNameStarPiece2; MR::initDemoSheetTalkAnim(this, rIter, demoNameStarPiece2, "DemoButlerStarPiece2", talkMsg3); MR::registerDemoActionFunctorDirect(this, func6, demoNameStarPiece2, "開始"); - MR::registerDemoActionFunctorDirect(this, func7, demoNameStarPiece2, "バトラーリセット"); + MR::registerDemoActionFunctorDirect(this, func7, demoNameStarPiece2, "バトラーリセット"); MR::joinToGroupArray(this, rIter, nullptr, 32); MR::registerBranchFunc(mMsgCtrl, TalkMessageFunc_Inline(this, &Butler::messageBranchFunc)); SphereSelectorFunction::registerTarget(this); if (MR::isButlerMapAppear()) { makeActorDead(); - } - else { + } else { makeActorAppeared(); } } -void Butler::initForAstroGalaxy(const JMapInfoIter &rIter) { +void Butler::initForAstroGalaxy(const JMapInfoIter& rIter) { const char* nameGreenDriver = cDemoNameGreenDriver; MR::registerDemoCast(this, nameGreenDriver, rIter); DemoFunction::registerDemoTalkMessageCtrlDirect(this, mTalkMessage[5], nameGreenDriver); MR::registerDemoActionFunctorDirect(this, MR::Functor(this, &Butler::startDemoButlerReport, nameGreenDriver), nameGreenDriver, "開始"); MR::registerDemoActionFunctorDirect(this, MR::Functor(this, &Butler::tryStartShowGalaxyMap), nameGreenDriver, "マップ表示"); - const char *grandStarName = AstroDemoFunction::getGrandStarReturnDemoName(0); + const char* grandStarName = AstroDemoFunction::getGrandStarReturnDemoName(0); AstroDemoFunction::tryRegisterDemo(this, grandStarName, rIter); AstroDemoFunction::tryRegisterDemo(this, "ロゼッタ状況説明デモ", rIter); AstroDemoFunction::tryRegisterSimpleCastIfAstroGalaxy(this); if (MR::isButlerMapAppear()) { makeActorDead(); - } - else { + } else { makeActorAppeared(); } } -TalkMessageCtrl* Butler::createTalkCtrl(const JMapInfoIter &rIter, const char *talk) { +TalkMessageCtrl* Butler::createTalkCtrl(const JMapInfoIter& rIter, const char* talk) { TVec3f vec; vec.setPSZeroVec(); return MR::createTalkCtrlDirectOnRootNodeAutomatic(this, rIter, talk, vec, MR::getJointMtx(this, "Body")); @@ -436,27 +422,23 @@ void Butler::tryReplaceStarPieceIfExecLecture() { } bool Butler::tryStartStarPieceReaction() { - bool isNerveOn = isNerve(mWaitNerve) - || isNerve(&NrvButler::ButlerNrvStarPieceReaction::sInstance); + bool isNerveOn = isNerve(mWaitNerve) || isNerve(&NrvButler::ButlerNrvStarPieceReaction::sInstance); if (isNerveOn && _164 <= 5) { setNerve(&NrvButler::ButlerNrvStarPieceReaction::sInstance); return (_164 >= 5); - } - else { - isNerveOn = isNerve(mWaitNerve) - || isNerve(&NrvButler::ButlerNrvStarPieceReaction::sInstance); + } else { + isNerveOn = isNerve(mWaitNerve) || isNerve(&NrvButler::ButlerNrvStarPieceReaction::sInstance); if (!isNerveOn && _164 == 5) { MR::requestStartTimeKeepDemoMarioPuppetable(this, "スターピース解説後半", nullptr, &NrvButler::ButlerNrvWaitStartDemo::sInstance, nullptr); return true; } - + if (_164 > 5 && !isNerve(&NrvButler::ButlerNrvStarPieceReaction::sInstance) && !isNerve(&NrvButler::ButlerNrvWaitStartDemo::sInstance)) { MR::requestStartTimeKeepDemoMarioPuppetable(this, "スターピース解説後半", nullptr, &NrvButler::ButlerNrvWaitStartDemo::sInstance, nullptr); return true; - } - else { + } else { return false; } } @@ -476,8 +458,7 @@ void Butler::exeStarPieceReaction() { if (mButlerState->update()) { if (reaction) { MR::requestStartTimeKeepDemoMarioPuppetable(this, "スターピース解説後半", nullptr, &NrvButler::ButlerNrvWaitStartDemo::sInstance, nullptr); - } - else { + } else { forceNerveToWait(); } } @@ -507,7 +488,7 @@ void Butler::exeDemoStarPiece2() { if (MR::isDemoPartStep("説明１→説明２", 29)) { MR::overlayWithPreviousScreen(2); } - + if (MR::isDemoPartLastStep("終了")) { MR::onGameEventFlagEndButlerStarPieceLecture(); setNerve(&NrvButler::ButlerNrvDemo::sInstance); @@ -530,5 +511,4 @@ void Butler::exeDemoShowGalaxyMap() { } void Butler::exeDemoWait() { - } diff --git a/src/Game/NPC/ButlerExplain.cpp b/src/Game/NPC/ButlerExplain.cpp index 193d48aef..b441bb815 100644 --- a/src/Game/NPC/ButlerExplain.cpp +++ b/src/Game/NPC/ButlerExplain.cpp @@ -10,15 +10,14 @@ namespace NrvButlerExplain { NEW_NERVE(ButlerExplainNrvDemo, ButlerExplain, Demo); }; -ButlerExplain::ButlerExplain(const char *pName) : NPCActor(pName){ - +ButlerExplain::ButlerExplain(const char* pName) + : NPCActor(pName) { } ButlerExplain::~ButlerExplain() { - } -void ButlerExplain::init(const JMapInfoIter &rIter) { +void ButlerExplain::init(const JMapInfoIter& rIter) { NPCActorCaps caps("ButlerExplain"); caps.setDefault(); caps.mObjectName = "Butler"; @@ -44,5 +43,4 @@ void ButlerExplain::startDemo() { } void ButlerExplain::exeDemo() { - } diff --git a/src/Game/NPC/ButlerMap.cpp b/src/Game/NPC/ButlerMap.cpp index 355a51b4b..55d6608b5 100644 --- a/src/Game/NPC/ButlerMap.cpp +++ b/src/Game/NPC/ButlerMap.cpp @@ -34,18 +34,18 @@ namespace NrvButlerMap { NEW_NERVE(ButlerMapNrvLectureDemoShowMap, ButlerMap, LectureDemoShowMap); NEW_NERVE(ButlerMapNrvLectureDemoShowMapAfter, ButlerMap, LectureDemoShowMapAfter); NEW_NERVE(ButlerMapNrvStarPieceReaction, ButlerMap, StarPieceReaction); -}; +}; // namespace NrvButlerMap -ButlerMap::ButlerMap(const char *pName) : NPCActor(pName){ +ButlerMap::ButlerMap(const char* pName) + : NPCActor(pName) { _15C = nullptr; _160 = false; } ButlerMap::~ButlerMap() { - } -void ButlerMap::init(const JMapInfoIter &rIter) { +void ButlerMap::init(const JMapInfoIter& rIter) { MR::getJMapInfoArg0NoInit(rIter, &_160); NPCActorCaps caps("ButlerMap"); caps.mObjectName = "Butler"; @@ -58,24 +58,24 @@ void ButlerMap::init(const JMapInfoIter &rIter) { caps.mUseShadow = true; caps._38 = false; NPCActor::initialize(rIter, caps); - setDefaults2(); - _13C = "Spin"; - const char *wait = "Wait"; - const char *talk = "Talk"; + setDefaults2(); + _13C = "Spin"; + const char* wait = "Wait"; + const char* talk = "Talk"; mParam._14 = wait; mParam._18 = wait; mParam._1C = talk; - mParam._20 = talk; + mParam._20 = talk; MR::createSceneObj(119); MR::tryRegisterDemoCast(this, rIter); MR::tryRegisterDemoCast(this, "バトラー報告", rIter); - TVec3f vec; - const char* demoNameMapLecture = cDemoNameMapLecture; + TVec3f vec; + const char* demoNameMapLecture = cDemoNameMapLecture; vec.setPSZeroVec(); - TalkMessageCtrl *talkMessage = MR::createTalkCtrlDirectOnRootNodeAutomatic(this, rIter, "AstroGalaxy_ButlerMap001", vec, MR::getJointMtx(this, "Body")); + TalkMessageCtrl* talkMessage = MR::createTalkCtrlDirectOnRootNodeAutomatic(this, rIter, "AstroGalaxy_ButlerMap001", vec, MR::getJointMtx(this, "Body")); if (MR::tryInitDemoSheetTalkAnim(this, rIter, demoNameMapLecture, "DemoButlerMapLecture", talkMessage)) { - const char *demoNameMapLecture = cDemoNameMapLecture; - const MR::FunctorBase& func = MR::Functor(this, &ButlerMap::startLectureDemo); + const char* demoNameMapLecture = cDemoNameMapLecture; + const MR::FunctorBase& func = MR::Functor(this, &ButlerMap::startLectureDemo); MR::registerDemoActionFunctorDirect(this, func, demoNameMapLecture, "開始"); MR::registerDemoActionFunctorDirect(this, MR::Functor(this, &ButlerMap::resetStatus), demoNameMapLecture, "バトラーリセット"); } @@ -85,13 +85,12 @@ void ButlerMap::init(const JMapInfoIter &rIter) { if (_160) { SphereSelectorFunction::registerTarget(this); } - + _15C = new ButlerStateStarPieceReaction(this, rIter, "AstroGalaxy_Butler000"); _15C->init(); if (MR::isButlerMapAppear()) { makeActorAppeared(); - } - else { + } else { makeActorDead(); } } @@ -127,7 +126,7 @@ void ButlerMap::control() { MR::startSound(this, "SE_SM_NPC_TRAMPLED", -1, -1); MR::startSound(this, "SE_SV_BUTLER_TRAMPLED", -1, -1); } - + if (NPCActor::isPointingSe()) { MR::startDPDHitSound(); MR::startSound(this, "SE_SV_BUTLER_POINT", -1, -1); @@ -135,7 +134,7 @@ void ButlerMap::control() { NPCActor::control(); } -bool ButlerMap::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool ButlerMap::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgLockOnStarPieceShoot(msg)) { return true; } @@ -149,17 +148,15 @@ bool ButlerMap::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *p setNerve(&NrvButlerMap::ButlerMapNrvStarPieceReaction::sInstance); } return true; - } - else { + } else { return NPCActor::receiveMsgPlayerAttack(msg, pSender, pReceiver); } } -bool ButlerMap::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool ButlerMap::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (SphereSelectorFunction::trySyncKillMsgSelectStart(this, msg)) { return true; - } - else { + } else { return MR::isMsgHitmarkEmit(msg); } } @@ -175,12 +172,10 @@ void ButlerMap::exeShowGalaxyMap() { if (MR::isFirstStep(this)) { if (_160) { MR::startGalaxyMapLayout(); - } - else { + } else { MR::startAstroMapLayout(); } - } - else { + } else { forceNerveToWait(); } } @@ -189,8 +184,7 @@ void ButlerMap::exeLectureDemoShowMap() { if (MR::isFirstStep(this)) { MR::startAstroMapLayoutForNewDomeDiscover(); MR::forceOpenWipeFade(); - } - else { + } else { setNerve(&NrvButlerMap::ButlerMapNrvLectureDemoShowMapAfter::sInstance); } } @@ -210,7 +204,7 @@ void ButlerMap::exeStarPieceReaction() { if (MR::isFirstStep(this)) { _15C->appear(); } - + if (_15C->update()) { forceNerveToWait(); } diff --git a/src/Game/NPC/ButlerStateStarPieceReaction.cpp b/src/Game/NPC/ButlerStateStarPieceReaction.cpp index ad9c3a1f0..901ff1523 100644 --- a/src/Game/NPC/ButlerStateStarPieceReaction.cpp +++ b/src/Game/NPC/ButlerStateStarPieceReaction.cpp @@ -12,12 +12,11 @@ namespace NrvButlerStateStarPieceReaction { NEW_NERVE(ButlerStateStarPieceReactionNrvWait, ButlerStateStarPieceReaction, Wait); }; -ButlerStateStarPieceReaction::ButlerStateStarPieceReaction(LiveActor *pHost, const JMapInfoIter &rIter, const char *pName) : - ActorStateBase("バトラースターピース反応"), - mHost(pHost), - mTalkMessage(nullptr), - _14(false) -{ +ButlerStateStarPieceReaction::ButlerStateStarPieceReaction(LiveActor* pHost, const JMapInfoIter& rIter, const char* pName) + : ActorStateBase("バトラースターピース反応"), + mHost(pHost), + mTalkMessage(nullptr), + _14(false) { mTalkMessage = MR::createTalkCtrlDirectOnRootNodeAutomatic(pHost, rIter, pName, TVec3f(0.0f, 180.0f, 0.0f), nullptr); } @@ -40,9 +39,9 @@ void ButlerStateStarPieceReaction::exeWait() { } if (_14) { - MR::tryTalkForce(mTalkMessage); + MR::tryTalkForce(mTalkMessage); } - + if (MR::isBckStopped(mHost)) { kill(); } diff --git a/src/Game/NPC/CollectTico.cpp b/src/Game/NPC/CollectTico.cpp index d73a7fe3a..673df256b 100644 --- a/src/Game/NPC/CollectTico.cpp +++ b/src/Game/NPC/CollectTico.cpp @@ -12,15 +12,16 @@ namespace NrvCollectTico { NEW_NERVE(CollectTicoNrvCompleteDemo, CollectTico, CompleteDemo); NEW_NERVE(CollectTicoNrvFlash, CollectTico, Flash); NEW_NERVE(CollectTicoNrvAppearPowerStar, CollectTico, AppearPowerStar); -}; +}; // namespace NrvCollectTico -CollectTico::CollectTico(const char *pName) : LiveActor(pName) { +CollectTico::CollectTico(const char* pName) + : LiveActor(pName) { mStrayTicos = nullptr; mTicoNum = 0; _A0 = 0; } -void CollectTico::init(const JMapInfoIter &rIter) { +void CollectTico::init(const JMapInfoIter& rIter) { MR::connectToSceneNpcMovement(this); mTicoNum = MR::getChildObjNum(rIter); mStrayTicos = new StrayTico*[mTicoNum]; @@ -139,9 +140,7 @@ void CollectTico::startAppearPowerStar() { } void CollectTico::exeTryStartDemo() { - } CollectTico::~CollectTico() { - } diff --git a/src/Game/NPC/CometEventExecutorTimeLimit.cpp b/src/Game/NPC/CometEventExecutorTimeLimit.cpp index 2fe01409e..2e7cb9be1 100644 --- a/src/Game/NPC/CometEventExecutorTimeLimit.cpp +++ b/src/Game/NPC/CometEventExecutorTimeLimit.cpp @@ -5,12 +5,10 @@ namespace NrvCometEventExecutorTimeLimit { NEW_NERVE(CometEventExecutorTimeLimitStartEvent, CometEventExecutorTimeLimit, StartEvent); }; -CometEventExecutorTimeLimit::CometEventExecutorTimeLimit(u32 timeLimit) : - LiveActor("制限時間コメット実行者"), - mTimeLimitLayout(nullptr), - mTimeLimit(timeLimit) -{ - +CometEventExecutorTimeLimit::CometEventExecutorTimeLimit(u32 timeLimit) + : LiveActor("制限時間コメット実行者"), + mTimeLimitLayout(nullptr), + mTimeLimit(timeLimit) { } void CometEventExecutorTimeLimit::init(const JMapInfoIter&) { diff --git a/src/Game/NPC/CometEventKeeper.cpp b/src/Game/NPC/CometEventKeeper.cpp index 600d75b0c..724769b07 100644 --- a/src/Game/NPC/CometEventKeeper.cpp +++ b/src/Game/NPC/CometEventKeeper.cpp @@ -5,8 +5,8 @@ struct GalaxyTimeLimitInfo { /* 0x0 */ const char* mGalaxyName; - /* 0x4 */ s32 mScenarioNo; - /* 0x8 */ u32 mTimeLimit; + /* 0x4 */ s32 mScenarioNo; + /* 0x8 */ u32 mTimeLimit; }; namespace { @@ -23,13 +23,11 @@ namespace { }; }; -CometEventKeeper::CometEventKeeper() : - mExecutorTimeLimit(nullptr), - mScreenFilter(nullptr), - mCometName(nullptr), - mCometStateIndex(0) -{ - +CometEventKeeper::CometEventKeeper() + : mExecutorTimeLimit(nullptr), + mScreenFilter(nullptr), + mCometName(nullptr), + mCometStateIndex(0) { } void CometEventKeeper::init() { diff --git a/src/Game/NPC/EventDirector.cpp b/src/Game/NPC/EventDirector.cpp index b02387647..7464f65c2 100644 --- a/src/Game/NPC/EventDirector.cpp +++ b/src/Game/NPC/EventDirector.cpp @@ -6,15 +6,13 @@ #include "Game/NPC/TimeAttackEventKeeper.hpp" #include "Game/Scene/SceneObjHolder.hpp" -EventDirector::EventDirector() : - NameObj("イベント指揮"), - mPowerStarEventKeeper(nullptr), - mStageStateKeeper(nullptr), - mPowerStarHolder(nullptr), - mCometEventKeeper(nullptr), - mTimeAttackEventKeeper(nullptr) -{ - +EventDirector::EventDirector() + : NameObj("イベント指揮"), + mPowerStarEventKeeper(nullptr), + mStageStateKeeper(nullptr), + mPowerStarHolder(nullptr), + mCometEventKeeper(nullptr), + mTimeAttackEventKeeper(nullptr) { } void EventDirector::init(const JMapInfoIter& rIter) { @@ -62,7 +60,7 @@ namespace EventFunction { getCometEventKeeper()->endCometEvent(); getTimeAttackEventKeeper()->endEvent(); } -}; +}; // namespace EventFunction namespace MR { void declareEventPowerStar(const char* pParam1, s32 param2, bool param3) { @@ -104,4 +102,4 @@ namespace MR { return PowerStarFunction::isEndPowerStarAppearDemo(starId); } -}; +}; // namespace MR diff --git a/src/Game/NPC/HoneyBee.cpp b/src/Game/NPC/HoneyBee.cpp index 9febd6c74..ff54254b2 100644 --- a/src/Game/NPC/HoneyBee.cpp +++ b/src/Game/NPC/HoneyBee.cpp @@ -26,9 +26,10 @@ namespace NrvHoneyBee { NEW_NERVE(HoneyBeeNrvJumpLecture, HoneyBee, JumpLecture); NEW_NERVE(HoneyBeeNrvFlyLectureA, HoneyBee, FlyLectureA); NEW_NERVE(HoneyBeeNrvFlyLectureB, HoneyBee, FlyLectureB); -}; +}; // namespace NrvHoneyBee -HoneyBee::HoneyBee(const char *pName) : NPCActor(pName){ +HoneyBee::HoneyBee(const char* pName) + : NPCActor(pName) { _15C = -1; _19C = 0; _1A0 = 0.0f; @@ -37,23 +38,22 @@ HoneyBee::HoneyBee(const char *pName) : NPCActor(pName){ } HoneyBee::~HoneyBee() { - } -void HoneyBee::makeArchiveList(NameObjArchiveListCollector *pArchive, const JMapInfoIter &rIter) { +void HoneyBee::makeArchiveList(NameObjArchiveListCollector* pArchive, const JMapInfoIter& rIter) { const char* name; MR::getObjectName(&name, rIter); NPCActorItem npcItem = name; - s32 arg = -1; + s32 arg = -1; MR::getJMapInfoArg0NoInit(rIter, &arg); if (MR::getNPCItemData(&npcItem, arg)) { NPCActor::addArchive(pArchive, npcItem); } } -void HoneyBee::init(const JMapInfoIter &rIter) { - f32 radius; - s32 arg; +void HoneyBee::init(const JMapInfoIter& rIter) { + f32 radius; + s32 arg; NPCActorCaps caps = "HoneyBee"; caps.setDefault(); caps._38 = 0; @@ -68,78 +68,78 @@ void HoneyBee::init(const JMapInfoIter &rIter) { arg = 0; MR::getJMapInfoArg0NoInit(rIter, &arg); s32 switchTemp = _19C = arg; - setDefaultsParam(); + setDefaultsParam(); _128 = 0; _12C = 450.0f; switch (switchTemp) { - case 0: - _128 = 1; - break; + case 0: + _128 = 1; + break; - case 1: - caps.mWaitNerve = &NrvHoneyBee::HoneyBeeNrvJumpLecture::sInstance; - break; + case 1: + caps.mWaitNerve = &NrvHoneyBee::HoneyBeeNrvJumpLecture::sInstance; + break; - case 2: - caps.mWaitNerve = &NrvHoneyBee::HoneyBeeNrvFly::sInstance; - break; + case 2: + caps.mWaitNerve = &NrvHoneyBee::HoneyBeeNrvFly::sInstance; + break; - case 3: - {mParam.setNoTurnAction("SleepWait");} - break; + case 3: { + mParam.setNoTurnAction("SleepWait"); + } break; - case 4: - mParam.setNoTurnAction("StickWait"); - break; + case 4: + mParam.setNoTurnAction("StickWait"); + break; - case 5: - mParam.setSingleAction("GatekeeperWait"); - _128 = 1; - break; + case 5: + mParam.setSingleAction("GatekeeperWait"); + _128 = 1; + break; - case 6: - caps.mWaitNerve = &NrvHoneyBee::HoneyBeeNrvDropLecture::sInstance; - break; + case 6: + caps.mWaitNerve = &NrvHoneyBee::HoneyBeeNrvDropLecture::sInstance; + break; - case 7: - mParam.setSingleAction("Flustered"); - _128 = 1; - break; + case 7: + mParam.setSingleAction("Flustered"); + _128 = 1; + break; - case 8: - caps.mWaitNerve = &NrvHoneyBee::HoneyBeeNrvFlyLectureA::sInstance; - caps.mTalkMtx = _160; - caps.mMessageOffset.zero(); - break; - - case 9: - caps.mWaitNerve = &NrvHoneyBee::HoneyBeeNrvFlyLectureB::sInstance; - caps.mTalkMtx = _160; - caps.mMessageOffset.zero(); - break; - - default: - break; + case 8: + caps.mWaitNerve = &NrvHoneyBee::HoneyBeeNrvFlyLectureA::sInstance; + caps.mTalkMtx = _160; + caps.mMessageOffset.zero(); + break; + + case 9: + caps.mWaitNerve = &NrvHoneyBee::HoneyBeeNrvFlyLectureB::sInstance; + caps.mTalkMtx = _160; + caps.mMessageOffset.zero(); + break; + + default: + break; } NPCActor::initialize(rIter, caps); NPCActorItem item = ("HoneyBee"); switch (_19C) { - case 8: - case 9: - radius = 0.0f; - _160.set(getBaseMtx()); - MR::extractMtxTrans(_160, &_190); - MR::calcModelBoundingRadius(&radius, this); - TVec3f vec; - vec.x = 0.0f; - vec.y = 0.0f; - vec.z = 0.0f; - MR::setShadowDropPositionAtJoint(this, nullptr, "Center", &vec); - MR::onCalcShadow(this, nullptr); - MR::setClippingTypeSphere(this, radius, &_190); - mLodCtrl->invalidate(); - break; + case 8: + case 9: + radius = 0.0f; + _160.set(getBaseMtx()); + MR::extractMtxTrans(_160, &_190); + MR::calcModelBoundingRadius(&radius, this); + TVec3f vec; + vec.x = 0.0f; + vec.y = 0.0f; + vec.z = 0.0f; + MR::setShadowDropPositionAtJoint(this, nullptr, "Center", &vec); + MR::onCalcShadow(this, nullptr); + MR::setClippingTypeSphere(this, radius, &_190); + mLodCtrl->invalidate(); + break; } MR::getNPCItemData(&item, _19C); NPCActor::equipment(item, false); @@ -155,20 +155,20 @@ void HoneyBee::calcAndSetBaseMtx() { void HoneyBee::control() { if (_D8) { MR::startSound(this, "SE_SM_NPC_TRAMPLED", -1, -1); - MR::startSound(this, "SE_SV_HONEYBEE_TRAMPLED", -1, -1); + MR::startSound(this, "SE_SV_HONEYBEE_TRAMPLED", -1, -1); } if (NPCActor::isPointingSe()) { MR::startDPDHitSound(); - MR::startSound(this, "SE_SV_HONEYBEE_POINT", -1, -1); + MR::startSound(this, "SE_SV_HONEYBEE_POINT", -1, -1); } if (_D9) { - MR::startSound(this, "SE_SV_HONEYBEE_SPIN", -1, -1); + MR::startSound(this, "SE_SV_HONEYBEE_SPIN", -1, -1); } if (_DB) { - MR::startSound(this, "SE_SV_HONEYBEE_STAR_PIECE_HIT", -1, -1); + MR::startSound(this, "SE_SV_HONEYBEE_STAR_PIECE_HIT", -1, -1); } NPCActor::control(); @@ -179,7 +179,7 @@ void HoneyBee::control() { if (_19C != 3 && _19C != 4) { _1A0 = MR::calcFloatOffset(this, _1A0, 120.0f); - } + } } void HoneyBee::exeWait() { @@ -212,8 +212,7 @@ void HoneyBee::exeFly() { if (!MR::isBckPlaying(this, "WalkWait")) { MR::startBck(this, "Wait", nullptr); } - } - else { + } else { if (!MR::isBckPlaying(this, "FlyWait")) { MR::startBck(this, "FlyWait", nullptr); } @@ -234,8 +233,7 @@ void HoneyBee::exeDropLecture() { if (MR::isGreaterStep(this, 120)) { MR::startBck(this, "HipDropWait", nullptr); } - } - else if (MR::isBckLooped(this)) { + } else if (MR::isBckLooped(this)) { setNerve(&NrvHoneyBee::HoneyBeeNrvDropLecture::sInstance); } } @@ -253,8 +251,7 @@ void HoneyBee::exeJumpLecture() { if (MR::isGreaterStep(this, 120)) { MR::startBck(this, "FlyLectureWait", nullptr); } - } - else if (MR::isBckLooped(this)) { + } else if (MR::isBckLooped(this)) { setNerve(&NrvHoneyBee::HoneyBeeNrvJumpLecture::sInstance); } } @@ -278,19 +275,19 @@ void HoneyBee::exeFlyLectureB() { } namespace MR { - void ActorTalkParam::setNoTurnAction(const char *a) { + void ActorTalkParam::setNoTurnAction(const char* a) { _14 = a; _1C = a; - _18 = 0; + _18 = 0; _20 = 0; _0 = 0; _1 = 0; } - void ActorTalkParam::setSingleAction(const char *a) { + void ActorTalkParam::setSingleAction(const char* a) { _14 = a; _18 = a; _1C = a; _20 = a; - } -}; + } +}; // namespace MR diff --git a/src/Game/NPC/HoneyQueen.cpp b/src/Game/NPC/HoneyQueen.cpp index 35ee07791..ff30d4849 100644 --- a/src/Game/NPC/HoneyQueen.cpp +++ b/src/Game/NPC/HoneyQueen.cpp @@ -27,17 +27,17 @@ namespace NrvHoneyQueen { NEW_NERVE(HoneyQueenNrvItch, HoneyQueen, Itch); NEW_NERVE(HoneyQueenNrvEvent, HoneyQueen, Event); NEW_NERVE(HoneyQueenNrvAfter, HoneyQueen, After); -}; +}; // namespace NrvHoneyQueen -HoneyQueen::HoneyQueen(const char *pName) : NPCActor(pName){ +HoneyQueen::HoneyQueen(const char* pName) + : NPCActor(pName) { mNpcModel = nullptr; } HoneyQueen::~HoneyQueen() { - } -void HoneyQueen::init(const JMapInfoIter &rIter) { +void HoneyQueen::init(const JMapInfoIter& rIter) { NPCActorCaps caps = "HoneyQueen"; caps.setDefault(); caps.mWaitNerve = &NrvHoneyQueen::HoneyQueenNrvWait::sInstance; @@ -75,8 +75,7 @@ void HoneyQueen::init(const JMapInfoIter &rIter) { MR::registerDemoActionFunctor(this, MR::Functor(this, &HoneyQueen::talkEntry), "謁見"); MR::tryRegisterDemoCast(mNpcModel, rIter); _188 = 1; - } - else { + } else { _188 = 0; } @@ -84,8 +83,7 @@ void HoneyQueen::init(const JMapInfoIter &rIter) { setNerve(&NrvHoneyQueen::HoneyQueenNrvDemo::sInstance); MR::listenStageSwitchOnA(this, MR::Functor(this, &HoneyQueen::switchFunc)); MR::needStageSwitchWriteB(this, rIter); - } - else { + } else { MR::useStageSwitchWriteA(this, rIter); } mLodCtrl->setDistanceToLow(10000.0f); @@ -107,12 +105,12 @@ void HoneyQueen::control() { void HoneyQueen::calcAnim() { LiveActor::calcAnim(); for (s32 i = 0; i < 10; i++) { - CollisionParts** centerParts = &mCenterPart; + CollisionParts** centerParts = &mCenterPart; centerParts[i]->setMtx(); } } -void HoneyQueen::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void HoneyQueen::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver)) { if (MR::isSensor(pSender, "TouchJump")) { MR::sendMsgTouchJump(pReceiver, pSender); @@ -120,7 +118,7 @@ void HoneyQueen::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { } } -bool HoneyQueen::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool HoneyQueen::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgPlayerSpinAttack(msg)) { return false; } @@ -155,8 +153,7 @@ void HoneyQueen::exeWait() { if (MR::isTalkTalking(mMsgCtrl)) { MR::tryStartBckAndBtp(this, "Talk", nullptr); - } - else { + } else { MR::tryStartBckAndBtp(this, "Wait", nullptr); } } @@ -189,7 +186,7 @@ void HoneyQueen::exeTalk() { void HoneyQueen::exeItch() { if (MR::isFirstStep(this)) { - MR::tryStartBckAndBtp(this, "EventWait", nullptr); + MR::tryStartBckAndBtp(this, "EventWait", nullptr); } TVec3f vec; vec.set(((2.0f * (_B0.x * _B0.z)) + (2.0f * (_B0.h * _B0.y))), (2.0f * (_B0.y * _B0.z)) - (2.0f * (_B0.h * _B0.x)), (1.0f - (2.0f * (_B0.x * _B0.x))) - (2.0f * (_B0.y * _B0.y))); diff --git a/src/Game/NPC/KinopioAstro.cpp b/src/Game/NPC/KinopioAstro.cpp index cfe03cf15..ec2178ba9 100644 --- a/src/Game/NPC/KinopioAstro.cpp +++ b/src/Game/NPC/KinopioAstro.cpp @@ -1,6 +1,5 @@ #include "JSystem/JKernel/JKRArchive.hpp" -s32 JKRArchive::getExpandedResSize(const void* pResource) const -{ - return getResSize(pResource); +s32 JKRArchive::getExpandedResSize(const void* pResource) const { + return getResSize(pResource); } \ No newline at end of file diff --git a/src/Game/NPC/KoopaJr.cpp b/src/Game/NPC/KoopaJr.cpp index 24c713899..54998f476 100644 --- a/src/Game/NPC/KoopaJr.cpp +++ b/src/Game/NPC/KoopaJr.cpp @@ -14,14 +14,15 @@ namespace NrvKoopaJr { NEW_NERVE(HostTypeShipBattleShipDamage, KoopaJr, ShipBattleShipDamage); NEW_NERVE(HostTypeShipBattleDemoTalkStart, KoopaJr, ShipBattleDemoTalkStart); NEW_NERVE(HostTypeShipBattleDemoTalkWait, KoopaJr, ShipBattleDemoTalkWait); -}; +}; // namespace NrvKoopaJr -KoopaJr::KoopaJr(const char *pName) : NPCActor(pName) { +KoopaJr::KoopaJr(const char* pName) + : NPCActor(pName) { _15C = 0; _15D = 0; } -void KoopaJr::init(const JMapInfoIter &rIter) { +void KoopaJr::init(const JMapInfoIter& rIter) { NPCActor::init(rIter); initModelManagerWithAnm("KoopaJr", nullptr, false); NPCActorCaps caps("KoopaJr"); @@ -63,7 +64,7 @@ void KoopaJr::init(const JMapInfoIter &rIter) { if (mLodCtrl != nullptr) { mLodCtrl->setDistanceToMiddleAndLow(5000.0f, 10000.0f); } - + MR::onCalcShadow(this, nullptr); MR::setShadowDropLength(this, nullptr, 200.0f); makeActorAppeared(); @@ -131,8 +132,7 @@ void KoopaJr::exeWait() { } setNerve(&NrvKoopaJr::HostTypeReaction::sInstance); - } - else { + } else { MR::tryStartTurnAction(this); } } @@ -167,8 +167,7 @@ void KoopaJr::exeShipBattleAppear() { if (MR::isFirstStep(this)) { if (MR::isEqualStageName("TriLegLv1Galaxy")) { MR::startBck(this, "RoboAppearDemo", nullptr); - } - else { + } else { MR::startBck(this, "AppearDemo", nullptr); } } @@ -226,5 +225,4 @@ void KoopaJr::exeShipBattleDemoTalkWait() { } KoopaJr::~KoopaJr() { - } diff --git a/src/Game/NPC/LuigiNPC.cpp b/src/Game/NPC/LuigiNPC.cpp index 8dc6a10d9..81e90759f 100644 --- a/src/Game/NPC/LuigiNPC.cpp +++ b/src/Game/NPC/LuigiNPC.cpp @@ -38,18 +38,18 @@ namespace NrvLuigiNPC { NEW_NERVE(LuigiNPCNrvOnTreeFall, LuigiNPC, OnTreeFall); NEW_NERVE(LuigiNPCNrvOnTreeLand, LuigiNPC, OnTreeLand); -}; +}; // namespace NrvLuigiNPC -LuigiNPC::LuigiNPC(const char *pName) : NPCActor(pName){ +LuigiNPC::LuigiNPC(const char* pName) + : NPCActor(pName) { mTakeOutStar = nullptr; _160 = -1; } LuigiNPC::~LuigiNPC() { - } -void LuigiNPC::makeArchiveList(NameObjArchiveListCollector *pArchive, const JMapInfoIter &rIter) { +void LuigiNPC::makeArchiveList(NameObjArchiveListCollector* pArchive, const JMapInfoIter& rIter) { pArchive->addArchive("LuigiNPC"); pArchive->addArchive("LuigiNPCMiddle"); pArchive->addArchive("LuigiNPCLow"); @@ -63,7 +63,7 @@ bool LuigiNPC::eventFunc(u32 msg) { if (msg == 0) { return mTakeOutStar->takeOut(); } - + if (msg == 1) { MR::onGameEventFlagTalkedToLuigiAfterRescued(); } @@ -71,7 +71,7 @@ bool LuigiNPC::eventFunc(u32 msg) { return true; } -void LuigiNPC::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void LuigiNPC::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver) && isNerve(&NrvLuigiNPC::LuigiNPCNrvOnTreeWait::sInstance)) { setNerve(&NrvLuigiNPC::LuigiNPCNrvOnTreeTouch::sInstance); } @@ -79,7 +79,7 @@ void LuigiNPC::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { NPCActor::attackSensor(pSender, pReceiver); } -bool LuigiNPC::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool LuigiNPC::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgStartPowerStarGet(msg)) { makeActorDead(); return true; @@ -88,7 +88,7 @@ bool LuigiNPC::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver return false; } -bool LuigiNPC::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool LuigiNPC::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (_160 == 3) { if (MR::isMsgPlayerTrample(msg) || MR::isMsgPlayerHipDrop(msg)) { MR::startSound(this, "SE_SM_NPC_TRAMPLED", -1, -1); @@ -98,13 +98,7 @@ bool LuigiNPC::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pR MR::startSound(this, "SE_SM_STAR_PIECE_HIT", -1, -1); } - if ((MR::isMsgPlayerSpinAttack(msg) - || MR::isMsgPlayerTrample(msg) - || MR::isMsgPlayerHipDrop(msg) - || MR::isMsgStarPieceReflect(msg)) - && (isNerve(&NrvLuigiNPC::LuigiNPCNrvOnTreeWait::sInstance) - || isNerve(&NrvLuigiNPC::LuigiNPCNrvOnTreeTouch::sInstance))) - { + if ((MR::isMsgPlayerSpinAttack(msg) || MR::isMsgPlayerTrample(msg) || MR::isMsgPlayerHipDrop(msg) || MR::isMsgStarPieceReflect(msg)) && (isNerve(&NrvLuigiNPC::LuigiNPCNrvOnTreeWait::sInstance) || isNerve(&NrvLuigiNPC::LuigiNPCNrvOnTreeTouch::sInstance))) { setNerve(&NrvLuigiNPC::LuigiNPCNrvOnTreeFall::sInstance); } } @@ -112,8 +106,8 @@ bool LuigiNPC::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pR return NPCActor::receiveMsgPlayerAttack(msg, pSender, pReceiver); } -void LuigiNPC::init(const JMapInfoIter &rIter) { - const char *objectName; +void LuigiNPC::init(const JMapInfoIter& rIter) { + const char* objectName; MR::getObjectName(&objectName, rIter); NPCActorCaps caps(objectName); caps.setDefault(); @@ -130,35 +124,38 @@ void LuigiNPC::init(const JMapInfoIter &rIter) { setWaitAction(); setNerve(&NrvLuigiNPC::LuigiNPCNrvWait::sInstance); switch (_160) { - case 0: - setNerve(&NrvLuigiNPC::LuigiNPCNrvAfraidWait::sInstance); - setAfraidAction(); - break; + case 0: + setNerve(&NrvLuigiNPC::LuigiNPCNrvAfraidWait::sInstance); + setAfraidAction(); + break; - case 1: - if (!MR::isOnGameEventFlagLuigiRescued() || MR::isLuigiDisappearFromAstroGalaxyOrHiding()) { - makeActorDead(); - } - AstroDemoFunction::tryRegisterDemoForLuigiAndKinopio(this, rIter); - break; - - case 2: - break; - - case 4: - MR::useStageSwitchReadA(this, rIter); - MR::useStageSwitchWriteB(this, rIter); - setNerve(&NrvLuigiNPC::LuigiNPCNrvArrestedWait::sInstance); - break; + case 1: + if (!MR::isOnGameEventFlagLuigiRescued() || MR::isLuigiDisappearFromAstroGalaxyOrHiding()) { + makeActorDead(); + } + AstroDemoFunction::tryRegisterDemoForLuigiAndKinopio(this, rIter); + break; - case 3: - MR::onCalcShadowDropPrivateGravity(this, nullptr); - {TVec3f v3(0.0f, 0.0f, -25.0f); MR::setShadowDropPositionAtJoint(this, nullptr, "Center", &v3);} - setNerve(&NrvLuigiNPC::LuigiNPCNrvOnTreeWait::sInstance); - break; - - default: - break; + case 2: + break; + + case 4: + MR::useStageSwitchReadA(this, rIter); + MR::useStageSwitchWriteB(this, rIter); + setNerve(&NrvLuigiNPC::LuigiNPCNrvArrestedWait::sInstance); + break; + + case 3: + MR::onCalcShadowDropPrivateGravity(this, nullptr); + { + TVec3f v3(0.0f, 0.0f, -25.0f); + MR::setShadowDropPositionAtJoint(this, nullptr, "Center", &v3); + } + setNerve(&NrvLuigiNPC::LuigiNPCNrvOnTreeWait::sInstance); + break; + + default: + break; } if (isDeclarePowerStarType()) { @@ -173,10 +170,9 @@ void LuigiNPC::init(const JMapInfoIter &rIter) { if (MR::isValidSwitchB(this)) { MR::onSwitchB(this); } - } - else { + } else { makeActorDead(); - } + } } } @@ -184,8 +180,8 @@ void LuigiNPC::initAfterPlacement() { NPCActor::initAfterPlacement(); if (_160 == 3) { Triangle tri; - TVec3f v1, v3; - MR::calcFrontVec(&v1, this); + TVec3f v1, v3; + MR::calcFrontVec(&v1, this); TVec3f vec(v1 * 500.0f); if (MR::getFirstPolyOnLineToMap(&v3, &tri, mPosition, vec)) { mPosition.set(v3 - (v1 * 16.0f)); @@ -203,17 +199,16 @@ bool LuigiNPC::trySetNerveAfraid() { if (MR::isNearPlayer(mMsgCtrl, -1.0f) && !MR::inMessageArea(mMsgCtrl) && !MR::isPlayerElementModeTeresa()) { return MR::trySetNerve(this, &NrvLuigiNPC::LuigiNPCNrvAfraidWait::sInstance); } - + if (MR::isNearPlayer(mMsgCtrl, -1.0f) && MR::isPlayerElementModeTeresa()) { return MR::trySetNerve(this, &NrvLuigiNPC::LuigiNPCNrvAfraidSquat::sInstance); - } - else { + } else { return MR::trySetNerve(this, &NrvLuigiNPC::LuigiNPCNrvAfraidWait::sInstance); - } + } } void LuigiNPC::setWaitAction() { - const char *turn = "Turn"; + const char* turn = "Turn"; mParam._14 = "Wait"; mParam._18 = turn; mParam._1C = "Talk"; @@ -225,13 +220,13 @@ void LuigiNPC::setWaitAction() { void LuigiNPC::setAfraidAction() { _128 = false; - const char *afraidWait = "AfraidWait"; - const char *afraid = "Afraid"; - const char *afraidTalk = "AfraidTalk"; + const char* afraidWait = "AfraidWait"; + const char* afraid = "Afraid"; + const char* afraidTalk = "AfraidTalk"; mParam._14 = afraidWait; mParam._18 = afraid; mParam._1C = afraidTalk; - mParam._20 = afraid; + mParam._20 = afraid; } bool LuigiNPC::trySetNerveArrested() { @@ -253,7 +248,7 @@ void LuigiNPC::exeWait() { if (MR::isFirstStep(this)) { setWaitAction(); } - + MR::tryTalkNearPlayerAndStartTalkAction(this); if (MR::tryStartReactionAndPushNerve(this, &NrvLuigiNPC::LuigiNPCNrvReaction::sInstance)) { return; @@ -286,7 +281,6 @@ void LuigiNPC::exeReaction() { void LuigiNPC::exeTakeOutStar() { if (MR::isFirstStep(this)) { - } if (MR::isStep(this, 87)) { @@ -294,7 +288,7 @@ void LuigiNPC::exeTakeOutStar() { } if (MR::isGreaterStep(this, 87)) { - ModelObj *starModel = mTakeOutStar->mStarModel; + ModelObj* starModel = mTakeOutStar->mStarModel; MR::startLevelSound(starModel, "SE_OJ_LV_POW_STAR_EXIST", -1, -1, -1); } } @@ -320,8 +314,7 @@ void LuigiNPC::exeAfraidSquat() { if (trySetNerveAfraid()) { setNerve(&NrvLuigiNPC::LuigiNPCNrvAfraidRise::sInstance); - } - else { + } else { MR::tryTalkNearPlayer(mMsgCtrl); } } @@ -329,7 +322,7 @@ void LuigiNPC::exeAfraidSquat() { void LuigiNPC::exeAfraidRise() { if (MR::isFirstStep(this)) { MR::startAction(this, "SquatEnd"); - } + } if (MR::isBckOneTimeAndStopped(this)) { setNerve(&NrvLuigiNPC::LuigiNPCNrvAfraidWait::sInstance); @@ -340,8 +333,7 @@ void LuigiNPC::exeArrestedWait() { if (!trySetNerveArrested()) { if (MR::tryTalkNearPlayer(mMsgCtrl)) { MR::tryStartAction(this, "ArrestedTalk"); - } - else { + } else { MR::tryStartAction(this, "Arrested"); } } @@ -405,7 +397,7 @@ void LuigiNPC::exeOnTreeFall() { void LuigiNPC::exeOnTreeLand() { if (MR::isFirstStep(this)) { MR::startAction(this, "TreeLand"); - MR::startSound(this, "SE_SM_LUIGI_LAND", -1, -1); + MR::startSound(this, "SE_SM_LUIGI_LAND", -1, -1); } if (MR::isActionEnd(this)) { diff --git a/src/Game/NPC/MiiDatabase.cpp b/src/Game/NPC/MiiDatabase.cpp index b6849bb45..29533662e 100644 --- a/src/Game/NPC/MiiDatabase.cpp +++ b/src/Game/NPC/MiiDatabase.cpp @@ -7,5 +7,4 @@ MiiDatabase::~MiiDatabase() { } JKRFileFinder::~JKRFileFinder() { - } diff --git a/src/Game/NPC/MiiFaceIcon.cpp b/src/Game/NPC/MiiFaceIcon.cpp index 28075db87..9e62d4354 100644 --- a/src/Game/NPC/MiiFaceIcon.cpp +++ b/src/Game/NPC/MiiFaceIcon.cpp @@ -5,28 +5,25 @@ #include #include -MiiFaceIcon::MiiFaceIcon(u16 width, u16 height, const MiiFaceRecipe& rRecipe, const char* pName) : - NameObj(pName), - mIndex(0), - mIsFavoriteColorBG(false), - mWidth(width), - mHeight(height), - mRecipe(new MiiFaceRecipe(rRecipe)), - mImageBuffer(nullptr), - mIsCreated(false), - mMakeIconResult(RFLErrcode_Unknown), - mIsRequestMakeIcon(false) -{ +MiiFaceIcon::MiiFaceIcon(u16 width, u16 height, const MiiFaceRecipe& rRecipe, const char* pName) + : NameObj(pName), + mIndex(0), + mIsFavoriteColorBG(false), + mWidth(width), + mHeight(height), + mRecipe(new MiiFaceRecipe(rRecipe)), + mImageBuffer(nullptr), + mIsCreated(false), + mMakeIconResult(RFLErrcode_Unknown), + mIsRequestMakeIcon(false) { createImageBuffer(); MR::registerMiiFaceIcon(this); } void MiiFaceIcon::init(const JMapInfoIter& rIter) { - } void MiiFaceIcon::movement() { - } // FIXME: Stack accesses are ordered incorrectly. @@ -37,8 +34,7 @@ void MiiFaceIcon::drawIcon() { if (mIsFavoriteColorBG) { mMakeIconResult = mRecipe->makeIconWithFavoriteColor(mImageBuffer, mWidth, mHeight); - } - else { + } else { GXColor bgColor; bgColor.r = 0; bgColor.g = 0; @@ -65,11 +61,11 @@ void MiiFaceIcon::setIndex(u16 index) { void MiiFaceIcon::createImageBuffer() { ResTIMG* pImageBuffer; - u16 width; - u16 height; - u32 imageBufferSize = mWidth * mHeight * 2 + sizeof(ResTIMG); + u16 width; + u16 height; + u32 imageBufferSize = mWidth * mHeight * 2 + sizeof(ResTIMG); - mImageBuffer = new(sizeof(ResTIMG)) u8[imageBufferSize]; + mImageBuffer = new (sizeof(ResTIMG)) u8[imageBufferSize]; MR::zeroMemory(mImageBuffer, imageBufferSize); height = mHeight; diff --git a/src/Game/NPC/MiiFaceIconHolder.cpp b/src/Game/NPC/MiiFaceIconHolder.cpp index 6420e2911..f461f9b56 100644 --- a/src/Game/NPC/MiiFaceIconHolder.cpp +++ b/src/Game/NPC/MiiFaceIconHolder.cpp @@ -5,12 +5,11 @@ #include "Game/Util/Functor.hpp" #include "Game/Util/ObjUtil.hpp" -MiiFaceIconHolder::MiiFaceIconHolder(u32 iconNum, const char* pName) : - NameObj(pName), - mIconNumMax(iconNum), - mIconNum(0), - mIcon(new MiiFaceIcon*[iconNum]) -{ +MiiFaceIconHolder::MiiFaceIconHolder(u32 iconNum, const char* pName) + : NameObj(pName), + mIconNumMax(iconNum), + mIconNum(0), + mIcon(new MiiFaceIcon*[iconNum]) { MR::FunctorV0M drawFunc( this, &MiiFaceIconHolder::drawIcons); @@ -39,4 +38,4 @@ namespace MR { MR::createSceneObj(SceneObj_MiiFaceIconHolder); getMiiFaceIconHolder()->registerIcon(pIcon); } -}; +}; // namespace MR diff --git a/src/Game/NPC/MiiFaceParts.cpp b/src/Game/NPC/MiiFaceParts.cpp index e42f8f833..dce0a5862 100644 --- a/src/Game/NPC/MiiFaceParts.cpp +++ b/src/Game/NPC/MiiFaceParts.cpp @@ -6,25 +6,23 @@ #include #include -MiiFaceParts::MiiFaceParts(const char* pName, const MiiFaceRecipe& rRecipe) : - LiveActor(pName), - mCharModel(nullptr), - _90(nullptr), - mRecipe(nullptr), - _CC(nullptr), - _D0(false) -{ +MiiFaceParts::MiiFaceParts(const char* pName, const MiiFaceRecipe& rRecipe) + : LiveActor(pName), + mCharModel(nullptr), + _90(nullptr), + mRecipe(nullptr), + _CC(nullptr), + _D0(false) { mRecipe = new MiiFaceRecipe(rRecipe); MR::createSceneObj(SceneObj_MiiFacePartsHolder); } MiiFaceParts::~MiiFaceParts() { - } void MiiFaceParts::init(const JMapInfoIter& rIter) { - _90 = new(32) u8[mRecipe->getModelBufferSize()]; + _90 = new (32) u8[mRecipe->getModelBufferSize()]; mCharModel = new RFLCharModel; _D1 = true; } @@ -34,8 +32,7 @@ void MiiFaceParts::calcAnim() { _CC->calc(); mPosition.set(_C8[0][3], _C8[1][3], _C8[2][3]); PSMTXCopy(_C8, _98); - } - else { + } else { MR::makeMtxTR(_98, mPosition, mRotation); } MR::preScaleMtx(_98, mScale); @@ -59,8 +56,7 @@ void MiiFaceParts::drawOpa(const RFLDrawCoreSetting* pSetting) const { if (pSetting != nullptr) { RFLDrawOpaCore(mCharModel, pSetting); - } - else { + } else { RFLDrawOpa(mCharModel); } } @@ -72,8 +68,7 @@ void MiiFaceParts::drawXlu(const RFLDrawCoreSetting* pSetting) const { if (pSetting != nullptr) { RFLDrawXluCore(mCharModel, pSetting); - } - else { + } else { RFLDrawXlu(mCharModel); } } diff --git a/src/Game/NPC/MiiFacePartsHolder.cpp b/src/Game/NPC/MiiFacePartsHolder.cpp index e634aa1da..81ea555f4 100644 --- a/src/Game/NPC/MiiFacePartsHolder.cpp +++ b/src/Game/NPC/MiiFacePartsHolder.cpp @@ -12,13 +12,11 @@ #include #include -MiiFacePartsHolder::MiiFacePartsHolder(int numParts) : - LiveActorGroup("Mii顔モデル保持", numParts), - JKRDisposer(), - mRFLWorkBuffer(nullptr), - _34(nullptr) -{ - +MiiFacePartsHolder::MiiFacePartsHolder(int numParts) + : LiveActorGroup("Mii顔モデル保持", numParts), + JKRDisposer(), + mRFLWorkBuffer(nullptr), + _34(nullptr) { } MiiFacePartsHolder::~MiiFacePartsHolder() { @@ -28,11 +26,11 @@ MiiFacePartsHolder::~MiiFacePartsHolder() { } void MiiFacePartsHolder::init(const JMapInfoIter& rIter) { - mRFLWorkBuffer = new(MR::getSceneHeapGDDR3(), 32) u8[RFLGetWorkSize(false)]; + mRFLWorkBuffer = new (MR::getSceneHeapGDDR3(), 32) u8[RFLGetWorkSize(false)]; JKRMemArchive* pArchive = reinterpret_cast(MR::receiveArchive("/ObjectData/MiiFaceDatabase.arc")); - void* pResBuffer = pArchive->getResource("/RFL_Res.dat"); - u32 resSize = pArchive->getResSize(pResBuffer); + void* pResBuffer = pArchive->getResource("/RFL_Res.dat"); + u32 resSize = pArchive->getResSize(pResBuffer); _38 = RFLInitResAsync(mRFLWorkBuffer, pResBuffer, resSize, false); MR::connectToScene(this, -1, 6, -1, 37); @@ -130,8 +128,7 @@ bool MiiFacePartsHolder::isInitEnd() const { } bool MiiFacePartsHolder::isError() const { - return _38 != RFLErrcode_Success - && _38 != RFLErrcode_Busy; + return _38 != RFLErrcode_Success && _38 != RFLErrcode_Busy; } MiiFaceParts* MiiFacePartsHolder::createPartsFromReceipe(const char* pName, const MiiFaceRecipe& rRecipe) { @@ -177,10 +174,10 @@ void MiiFacePartsHolder::drawEachActor(DrawPartsFuncPtr pDrawFunc, const RFLDraw // FIXME: Enumerated GX types might be defined incorrectly? void MiiFacePartsHolder::setTevOpa() const { - GXColorS10 color1 = { 0, 0, 0, -89 }; + GXColorS10 color1 = {0, 0, 0, -89}; GXSetTevColorS10(GX_TEVREG1, color1); - GXColorS10 color2 = { 0, 0, 0, 246 }; + GXColorS10 color2 = {0, 0, 0, 246}; GXSetTevColorS10(GX_TEVREG2, color2); GXSetTevDirect(GX_TEVSTAGE1); @@ -201,10 +198,10 @@ void MiiFacePartsHolder::setTevOpa() const { GXSetChanCtrl(GX_COLOR0, GX_TRUE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT3, GX_DF_CLAMP, GX_AF_NONE); GXSetChanCtrl(GX_ALPHA0, GX_TRUE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT4, GX_DF_SIGN, GX_AF_NONE); - GXColor ambColor = { 128, 128, 128, 128 }; + GXColor ambColor = {128, 128, 128, 128}; GXSetChanAmbColor(GX_COLOR0A0, ambColor); - GXColor matColor = { 165, 165, 165, 255 }; + GXColor matColor = {165, 165, 165, 255}; GXSetChanMatColor(GX_COLOR0A0, matColor); GXSetZMode(GX_TRUE, GX_EQUAL, GX_TRUE); @@ -212,10 +209,10 @@ void MiiFacePartsHolder::setTevOpa() const { // FIXME: Enumerated GX types might be defined incorrectly? void MiiFacePartsHolder::setTevXlu() const { - GXColorS10 color1 = { 0, 0, 0, -89 }; + GXColorS10 color1 = {0, 0, 0, -89}; GXSetTevColorS10(GX_TEVREG1, color1); - GXColorS10 color2 = { 0, 0, 0, 246 }; + GXColorS10 color2 = {0, 0, 0, 246}; GXSetTevColorS10(GX_TEVREG2, color2); GXSetTevDirect(GX_TEVSTAGE1); @@ -234,10 +231,10 @@ void MiiFacePartsHolder::setTevXlu() const { GXSetNumChans(1); GXSetChanCtrl(GX_COLOR0, GX_TRUE, GX_SRC_REG, GX_SRC_REG, GX_LIGHT3, GX_DF_CLAMP, GX_AF_NONE); - GXColor ambColor = { 128, 128, 128, 128 }; + GXColor ambColor = {128, 128, 128, 128}; GXSetChanAmbColor(GX_COLOR0A0, ambColor); - GXColor matColor = { 165, 165, 165, 255 }; + GXColor matColor = {165, 165, 165, 255}; GXSetChanMatColor(GX_COLOR0A0, matColor); GXSetZMode(GX_TRUE, GX_EQUAL, GX_TRUE); diff --git a/src/Game/NPC/MiiFaceRecipe.cpp b/src/Game/NPC/MiiFaceRecipe.cpp index 176308da3..e2b56224a 100644 --- a/src/Game/NPC/MiiFaceRecipe.cpp +++ b/src/Game/NPC/MiiFaceRecipe.cpp @@ -1,12 +1,11 @@ #include "Game/NPC/MiiFaceRecipe.hpp" -MiiFaceRecipe::MiiFaceRecipe(RFLDataSource dataSource, int index, RFLResolution resolution, u32 expressionFlag) : - mDataSource(dataSource), - mMiddleDB(nullptr), - mIndex(index), - mResolution(resolution), - mExpressionFlag(expressionFlag) -{} +MiiFaceRecipe::MiiFaceRecipe(RFLDataSource dataSource, int index, RFLResolution resolution, u32 expressionFlag) + : mDataSource(dataSource), + mMiddleDB(nullptr), + mIndex(index), + mResolution(resolution), + mExpressionFlag(expressionFlag) {} void MiiFaceRecipe::setDatabase(RFLMiddleDB* pMiddleDB) { mMiddleDB = pMiddleDB; diff --git a/src/Game/NPC/NPCActor.cpp b/src/Game/NPC/NPCActor.cpp index 9aaaaa9b8..cd61167fd 100644 --- a/src/Game/NPC/NPCActor.cpp +++ b/src/Game/NPC/NPCActor.cpp @@ -2,7 +2,7 @@ #include "Game/NPC/NPCActorItem.hpp" #include "Game/Util.hpp" -NPCActorCaps::NPCActorCaps(const char *pName) { +NPCActorCaps::NPCActorCaps(const char* pName) { _0 = pName; _C = 0; _D = 0; @@ -81,7 +81,8 @@ void NPCActorCaps::setIndirect() { } #ifdef NON_MATCHING -NPCActor::NPCActor(const char *pName) : LiveActor(pName) { +NPCActor::NPCActor(const char* pName) + : LiveActor(pName) { _8C = 0; _90 = 0; _94 = 0; @@ -139,11 +140,11 @@ NPCActor::NPCActor(const char *pName) : LiveActor(pName) { } #endif -void NPCActor::makeArchiveList(NameObjArchiveListCollector *pCollector, const JMapInfoIter &rIter) { +void NPCActor::makeArchiveList(NameObjArchiveListCollector* pCollector, const JMapInfoIter& rIter) { const char* name; MR::getObjectName(&name, rIter); NPCActorItem item(name); - s32 item_type = -1; + s32 item_type = -1; MR::getJMapInfoArg7NoInit(rIter, &item_type); bool ret = MR::getNPCItemData(&item, item_type); @@ -153,7 +154,7 @@ void NPCActor::makeArchiveList(NameObjArchiveListCollector *pCollector, const JM } } -void NPCActor::addArchive(NameObjArchiveListCollector *pCollector, const NPCActorItem &rItem) { +void NPCActor::addArchive(NameObjArchiveListCollector* pCollector, const NPCActorItem& rItem) { if (!MR::isNullOrEmptyString(rItem.mActor) && MR::isNPCItemFileExist(rItem.mActor)) { pCollector->addArchive(rItem.mActor); } @@ -163,11 +164,11 @@ void NPCActor::addArchive(NameObjArchiveListCollector *pCollector, const NPCActo } } -void NPCActor::makeArchiveListDefault(NameObjArchiveListCollector *pCollector, const JMapInfoIter &rIter) { +void NPCActor::makeArchiveListDefault(NameObjArchiveListCollector* pCollector, const JMapInfoIter& rIter) { const char* name; MR::getObjectName(&name, rIter); NPCActorItem item(name); - bool ret = MR::getNPCItemData(&item, 0); + bool ret = MR::getNPCItemData(&item, 0); if (ret) { NPCActor::addArchive(pCollector, item); @@ -182,7 +183,7 @@ void NPCActor::setInitPose() { _C0.set(mPosition); } -void NPCActor::init(const JMapInfoIter &rIter) { +void NPCActor::init(const JMapInfoIter& rIter) { LiveActor::init(rIter); } diff --git a/src/Game/NPC/NPCSupportRail.cpp b/src/Game/NPC/NPCSupportRail.cpp index 1b5cde7a3..3661c5b24 100644 --- a/src/Game/NPC/NPCSupportRail.cpp +++ b/src/Game/NPC/NPCSupportRail.cpp @@ -3,11 +3,12 @@ #include "revolution/types.h" #include -NPCSupportRail::NPCSupportRail(const char* pName) : LiveActor(pName) {} +NPCSupportRail::NPCSupportRail(const char* pName) + : LiveActor(pName) {} NPCSupportRail::~NPCSupportRail() {} -void NPCSupportRail::init(const JMapInfoIter &rIter) { +void NPCSupportRail::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initRailRider(rIter); MR::joinToGroupArray(this, rIter, nullptr, 32); diff --git a/src/Game/NPC/Peach.cpp b/src/Game/NPC/Peach.cpp index 3a196ce0a..3b1a6fc1e 100644 --- a/src/Game/NPC/Peach.cpp +++ b/src/Game/NPC/Peach.cpp @@ -4,11 +4,11 @@ namespace NrvPeach { NEW_NERVE(PeachNrvWait, Peach, Wait); }; -Peach::Peach(const char *pName) : NPCActor(pName) { - +Peach::Peach(const char* pName) + : NPCActor(pName) { } -void Peach::init(const JMapInfoIter &rIter) { +void Peach::init(const JMapInfoIter& rIter) { NPCActorCaps caps("Peach"); caps.setDefault(); caps.mWaitNerve = &NrvPeach::PeachNrvWait::sInstance; @@ -26,5 +26,4 @@ void Peach::exeWait() { } Peach::~Peach() { - } diff --git a/src/Game/NPC/PenguinMaster.cpp b/src/Game/NPC/PenguinMaster.cpp index 4e9024107..a3b1c3be9 100644 --- a/src/Game/NPC/PenguinMaster.cpp +++ b/src/Game/NPC/PenguinMaster.cpp @@ -11,18 +11,17 @@ namespace NrvPenguinMaster { NEW_NERVE(PenguinMasterNrvWait, PenguinMaster, Wait); NEW_NERVE(PenguinMasterNrvReaction, PenguinMaster, Reaction); -}; - -PenguinMaster::PenguinMaster(const char *pName) : NPCActor(pName){ +}; // namespace NrvPenguinMaster +PenguinMaster::PenguinMaster(const char* pName) + : NPCActor(pName) { } PenguinMaster::~PenguinMaster() { - } -void PenguinMaster::init(const JMapInfoIter &rIter) { - f32 stack = 0.0f; +void PenguinMaster::init(const JMapInfoIter& rIter) { + f32 stack = 0.0f; NPCActorCaps caps = "PenguinMaster"; caps.setDefault(); caps.mUseHitSensors = false; @@ -45,20 +44,19 @@ void PenguinMaster::init(const JMapInfoIter &rIter) { mParam._0 = false; mParam._1 = false; _134 = "Trampled"; - _13C = "Reaction"; - _130 = "Reaction"; + _13C = "Reaction"; + _130 = "Reaction"; _138 = "Pointing"; if (mMsgCtrl) { MR::setDistanceToTalk(mMsgCtrl, 350.0f); } } -bool PenguinMaster::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool PenguinMaster::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgPlayerSpinAttack(msg)) { _E3 = true; return true; - } - else { + } else { return NPCActor::receiveMsgPlayerAttack(msg, pSender, pReceiver); } } @@ -71,7 +69,7 @@ void PenguinMaster::exeWait() { void PenguinMaster::exeReaction() { if (_D8) { MR::startSound(this, "SE_SV_PENGUIN_OLD_TRAMPLED", -1, -1); - MR::startSound(this, "SE_SM_PENGUIN_TRAMPLED", -1, -1); + MR::startSound(this, "SE_SM_PENGUIN_TRAMPLED", -1, -1); } if (isPointingSe()) { @@ -80,16 +78,16 @@ void PenguinMaster::exeReaction() { } if (_D9) { - MR::startSound(this, "SE_SV_PENGUIN_OLD_SPIN_HIT", -1, -1); + MR::startSound(this, "SE_SV_PENGUIN_OLD_SPIN_HIT", -1, -1); } if (_DB) { - MR::startSound(this, "SE_SV_PENGUIN_OLD_STAR_PIECE", -1, -1); + MR::startSound(this, "SE_SV_PENGUIN_OLD_STAR_PIECE", -1, -1); } if (!MR::tryStartReactionAndPopNerve(this)) { if (MR::tryStartReactionAndPopNerve(this)) { - return; + return; } } } diff --git a/src/Game/NPC/PenguinStudent.cpp b/src/Game/NPC/PenguinStudent.cpp index 9774b2c81..6ed513b0a 100644 --- a/src/Game/NPC/PenguinStudent.cpp +++ b/src/Game/NPC/PenguinStudent.cpp @@ -23,19 +23,19 @@ namespace NrvPenguinStudent { NEW_NERVE(PenguinStudentNrvSwim, PenguinStudent, Swim); NEW_NERVE(PenguinStudentNrvLead, PenguinStudent, Lead); NEW_NERVE(PenguinStudentNrvSlow, PenguinStudent, Slow); -}; +}; // namespace NrvPenguinStudent -PenguinStudent::PenguinStudent(const char *pName) : NPCActor(pName){ +PenguinStudent::PenguinStudent(const char* pName) + : NPCActor(pName) { mRemovableTurtle = nullptr; mActor = nullptr; _15C = -1; } PenguinStudent::~PenguinStudent() { - } -void PenguinStudent::init(const JMapInfoIter &rIter) { +void PenguinStudent::init(const JMapInfoIter& rIter) { MR::initDefaultPosAndQuat(this, rIter); MR::getJMapInfoArg0NoInit(rIter, &_15C); initModelManagerWithAnm("Penguin", nullptr, false); @@ -64,8 +64,7 @@ void PenguinStudent::init(const JMapInfoIter &rIter) { if (_15C == -1) { mRemovableTurtle = new RemovableTurtle(this, true); setNerve(&NrvPenguinStudent::PenguinStudentNrvSlow::sInstance); - } - else { + } else { s32 arg1 = 10; MR::getJMapInfoArg1NoInit(rIter, &arg1); _168 = 100.0f * arg1; @@ -81,7 +80,7 @@ void PenguinStudent::init(const JMapInfoIter &rIter) { MR::onCalcShadow(this, nullptr); if (mMsgCtrl) { MR::registerBranchFunc(mMsgCtrl, TalkMessageFunc_Inline(this, &PenguinStudent::branchFunc)); - } + } makeActorAppeared(); } @@ -102,12 +101,9 @@ bool PenguinStudent::branchFunc(u32 msg) { } bool PenguinStudent::tryReleaseTurtle() { - if (_15C == -1 - && isNerve(&NrvPenguinStudent::PenguinStudentNrvLead::sInstance) - && mRemovableTurtle->isPullRange() - && mRemovableTurtle->tryRemove()) { - setNerve(&NrvPenguinStudent::PenguinStudentNrvSlow::sInstance); - return true; + if (_15C == -1 && isNerve(&NrvPenguinStudent::PenguinStudentNrvLead::sInstance) && mRemovableTurtle->isPullRange() && mRemovableTurtle->tryRemove()) { + setNerve(&NrvPenguinStudent::PenguinStudentNrvSlow::sInstance); + return true; } return false; } @@ -115,7 +111,7 @@ bool PenguinStudent::tryReleaseTurtle() { void PenguinStudent::exeSwim() { if (MR::isFirstStep(this)) { MR::tryStartAction(this, "Swim"); - MR::setBckFrameAtRandom(this); + MR::setBckFrameAtRandom(this); } f32 speed = ((200.0f * MR::getRailCoordSpeed(mActor)) / 7.0f); MR::setRailCoord(this, MR::getRailCoord(mActor) - _168); @@ -152,7 +148,7 @@ void PenguinStudent::exeSlow() { if (MR::isFirstStep(this)) { _11C = "Swim"; _120 = "Swim"; - _10C = 5.0f; + _10C = 5.0f; } MR::tryStartMoveTalkAction(this); @@ -167,7 +163,7 @@ void PenguinStudent::exeSlow() { } } -void PenguinStudent::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void PenguinStudent::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver)) { tryReleaseTurtle(); } @@ -175,7 +171,7 @@ void PenguinStudent::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { NPCActor::attackSensor(pSender, pReceiver); } -bool PenguinStudent::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool PenguinStudent::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgSpinStormRange(msg) && tryReleaseTurtle()) { return true; } diff --git a/src/Game/NPC/PowerStarEventKeeper.cpp b/src/Game/NPC/PowerStarEventKeeper.cpp index 26a612a92..1bf325d8e 100644 --- a/src/Game/NPC/PowerStarEventKeeper.cpp +++ b/src/Game/NPC/PowerStarEventKeeper.cpp @@ -36,7 +36,7 @@ void PowerStarEventKeeper::initStarInfoTable() { // PowerStarEventKeeper::declareStar -bool PowerStarEventKeeper::isGreen(const char *pName, s32 starNum) const { +bool PowerStarEventKeeper::isGreen(const char* pName, s32 starNum) const { if (starNum < 0) { starNum = findStarID(pName); } @@ -48,7 +48,7 @@ bool PowerStarEventKeeper::isGreen(const char *pName, s32 starNum) const { return MR::isPowerStarGreenInCurrentStage(starNum); } -bool PowerStarEventKeeper::isRed(const char *pName, s32 starNum) const { +bool PowerStarEventKeeper::isRed(const char* pName, s32 starNum) const { if (starNum < 0) { starNum = findStarID(pName); } @@ -60,7 +60,7 @@ bool PowerStarEventKeeper::isRed(const char *pName, s32 starNum) const { return MR::isPowerStarRedInCurrentStage(starNum); } -bool PowerStarEventKeeper::isGrand(const char *pName, s32 starNum) const { +bool PowerStarEventKeeper::isGrand(const char* pName, s32 starNum) const { if (starNum < 0) { starNum = findStarID(pName); } @@ -77,7 +77,7 @@ bool PowerStarEventKeeper::isGrand(const char *pName, s32 starNum) const { // PowerStarEventKeeper::isExistPowerStarAtScenario // PowerStarEventKeeper::isCorrectStarIdWithBBS -bool PowerStarEventKeeper::isSuccess(const char *pName, s32 starNum) const { +bool PowerStarEventKeeper::isSuccess(const char* pName, s32 starNum) const { if (starNum < 0) { starNum = findStarID(pName); } diff --git a/src/Game/NPC/RosettaReading.cpp b/src/Game/NPC/RosettaReading.cpp index 620d4a23b..297858063 100644 --- a/src/Game/NPC/RosettaReading.cpp +++ b/src/Game/NPC/RosettaReading.cpp @@ -22,19 +22,17 @@ namespace { s32 getChapterNumberMax() { return MR::getPictureBookChapterCanRead(); } -}; +}; // namespace namespace NrvRosettaReading { NEW_NERVE(RosettaReadingNrvPictureBookBefore, RosettaReading, PictureBookBefore); NEW_NERVE(RosettaReadingNrvPictureBook, RosettaReading, PictureBook); NEW_NERVE(RosettaReadingNrvPictureBookAfter, RosettaReading, PictureBookAfter); -}; +}; // namespace NrvRosettaReading -RosettaReading::RosettaReading(const char* pName) : - LiveActor(pName), - mPictureBookLayout(nullptr) -{ - +RosettaReading::RosettaReading(const char* pName) + : LiveActor(pName), + mPictureBookLayout(nullptr) { } void RosettaReading::init(const JMapInfoIter& rIter) { @@ -83,10 +81,7 @@ void RosettaReading::makeArchiveList(NameObjArchiveListCollector* pCollector, co } void RosettaReading::exePictureBookBefore() { - if (MR::isDemoPartActive("朗読開始") - || MR::isDemoPartActive("ロゼッタ会話[開始]") - || MR::isDemoPartLessEqualStep("絵本デモ開始", 60)) - { + if (MR::isDemoPartActive("朗読開始") || MR::isDemoPartActive("ロゼッタ会話[開始]") || MR::isDemoPartLessEqualStep("絵本デモ開始", 60)) { MR::startSystemLevelSE("SE_SM_LV_TICO_WAIT_LIBRARY", -1, -1); } @@ -122,9 +117,7 @@ void RosettaReading::exePictureBook() { } void RosettaReading::exePictureBookAfter() { - if (MR::isDemoPartGreaterStep("絵本デモ終了", 30) - || MR::isDemoPartActive("ロゼッタ会話[終了]")) - { + if (MR::isDemoPartGreaterStep("絵本デモ終了", 30) || MR::isDemoPartActive("ロゼッタ会話[終了]")) { MR::startSystemLevelSE("SE_SM_LV_TICO_WAIT_LIBRARY", -1, -1); } diff --git a/src/Game/NPC/SignBoard.cpp b/src/Game/NPC/SignBoard.cpp index b7dfbf1c7..99fdb39f4 100644 --- a/src/Game/NPC/SignBoard.cpp +++ b/src/Game/NPC/SignBoard.cpp @@ -8,11 +8,11 @@ namespace NrvSignBoard { NEW_NERVE(SignBoardNrvWait, SignBoard, Wait); }; -SignBoard::SignBoard(const char *pName) : NPCActor(pName) { - +SignBoard::SignBoard(const char* pName) + : NPCActor(pName) { } -void SignBoard::init(const JMapInfoIter &rIter) { +void SignBoard::init(const JMapInfoIter& rIter) { NPCActorCaps caps("Signboard"); caps.setDefault(); caps.mWaitNerve = &NrvSignBoard::SignBoardNrvWait::sInstance; @@ -26,17 +26,16 @@ void SignBoard::init(const JMapInfoIter &rIter) { initialize(rIter, caps); getSensor("Body")->setType(127); FollowCollisionArea* area = new FollowCollisionArea(TVec3f(130.0f, 160.0f, 20.0f), getBaseMtx(), 80.0f); - TVec3f v8; + TVec3f v8; MR::getUpVecFromQuat(&v8, _A0); MR::setShadowProjection(this, nullptr, mPosition, v8, true); MR::offCalcShadow(this, nullptr); } void SignBoard::control() { - } -void SignBoard::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void SignBoard::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorEnemy(pReceiver)) { MR::sendMsgPush(pReceiver, pSender); } @@ -47,5 +46,4 @@ void SignBoard::exeWait() { } SignBoard::~SignBoard() { - } diff --git a/src/Game/NPC/StageStateKeeper.cpp b/src/Game/NPC/StageStateKeeper.cpp index c964ae574..30576c8db 100644 --- a/src/Game/NPC/StageStateKeeper.cpp +++ b/src/Game/NPC/StageStateKeeper.cpp @@ -1,7 +1,5 @@ #include "Game/NPC/StageStateKeeper.hpp" -StageStateKeeper::StageStateKeeper() : - mIsPowerStarAppeared(false) -{ - +StageStateKeeper::StageStateKeeper() + : mIsPowerStarAppeared(false) { } diff --git a/src/Game/NPC/TalkMessageCtrl.cpp b/src/Game/NPC/TalkMessageCtrl.cpp index 96a00e368..974f6e2d6 100644 --- a/src/Game/NPC/TalkMessageCtrl.cpp +++ b/src/Game/NPC/TalkMessageCtrl.cpp @@ -5,34 +5,31 @@ #ifdef NON_MATCHING // one liner regswap with mNodeCtrl->mCurrentNode -void TalkMessageCtrl::createMessage(const JMapInfoIter &rIter, const char *pName) { +void TalkMessageCtrl::createMessage(const JMapInfoIter& rIter, const char* pName) { mNodeCtrl = new TalkNodeCtrl(); mNodeCtrl->createFlowNode(this, rIter, pName, &mCameraInfo); - + if (mNodeCtrl->mCurrentNode != nullptr) { mAlreadyDoneFlags = MR::setupAlreadyDoneFlag(((MessageNode*)mNodeCtrl->mCurrentNode)->mMessage, rIter, &_3C); - } - else { + } else { _3C = 1; } } #endif -void TalkMessageCtrl::createMessageDirect(const JMapInfoIter &rIter, const char *pName) { +void TalkMessageCtrl::createMessageDirect(const JMapInfoIter& rIter, const char* pName) { mNodeCtrl = new TalkNodeCtrl(); mNodeCtrl->createFlowNodeDirect(this, rIter, pName, &mCameraInfo); _3C = 1; } - // ... void TalkMessageCtrl::rootNodePst() { TalkNodeCtrl* ctrl = mNodeCtrl; if (!ctrl->isExistNextNode()) { ctrl->resetFlowNode(); - } - else { + } else { ctrl->forwardFlowNode(); } @@ -45,27 +42,26 @@ void TalkMessageCtrl::rootNodeSel(bool a1) { if (a1) { ctrl->forwardCurrentBranchNode(true); - } - else { + } else { ctrl->forwardCurrentBranchNode(false); } ctrl->recordTempFlowNode(); } -void TalkMessageCtrl::registerBranchFunc(const TalkMessageFuncBase &rFunc) { +void TalkMessageCtrl::registerBranchFunc(const TalkMessageFuncBase& rFunc) { mBranchFunc = rFunc.clone(); } -void TalkMessageCtrl::registerEventFunc(const TalkMessageFuncBase &rFunc) { +void TalkMessageCtrl::registerEventFunc(const TalkMessageFuncBase& rFunc) { mEventFunc = rFunc.clone(); } -void TalkMessageCtrl::registerAnimeFunc(const TalkMessageFuncBase &rFunc) { +void TalkMessageCtrl::registerAnimeFunc(const TalkMessageFuncBase& rFunc) { mAnimeFunc = rFunc.clone(); } -void TalkMessageCtrl::registerKillFunc(const TalkMessageFuncBase &rFunc) { +void TalkMessageCtrl::registerKillFunc(const TalkMessageFuncBase& rFunc) { mKillFunc = rFunc.clone(); } @@ -73,7 +69,7 @@ void TalkMessageCtrl::readMessage() { if (mIsOnReadNodeAuto) { mNodeCtrl->readMessage(); } - + if (!_3C) { MR::updateAlreadyDoneFlag(mAlreadyDoneFlags, 1); } @@ -87,10 +83,10 @@ bool TalkMessageCtrl::isSelectYesNo() const { } switch (node->mNextIdx) { - case 16: - return false; - case 14: - return false; + case 16: + return false; + case 14: + return false; } return true; @@ -100,8 +96,7 @@ u32 TalkMessageCtrl::getMessageID() const { TalkNodeCtrl* ctrl = mNodeCtrl; if (ctrl->getCurrentNodeMessage() != nullptr) { return ctrl->getCurrentNodeMessage()->mIndex; - } - else { + } else { return ctrl->mCurrentNodeIdx; } } @@ -131,8 +126,7 @@ void TalkMessageCtrl::startCamera(s32 a1) { TalkMessageInfo* inf = &mNodeCtrl->mMessageInfo; if (inf->isCameraNormal()) { MR::startNPCTalkCamera(this, mHostActor->getBaseMtx(), 1.0f, a1); - } - else if (inf->isCameraEvent()) { + } else if (inf->isCameraEvent()) { if (inf->_4) { mCameraInfo->mCameraSetID = inf->_4; MR::startMultiActorCameraNoTarget(mHostActor, mCameraInfo, "会話", a1); @@ -143,73 +137,73 @@ void TalkMessageCtrl::startCamera(s32 a1) { const char* TalkMessageCtrl::getBranchID() const { TalkNode* node = mNodeCtrl->getNextNodeBranch(); - if (node == nullptr || node->mIndex != 0 ) { + if (node == nullptr || node->mIndex != 0) { return nullptr; } const char* result = nullptr; switch (node->mNextIdx) { - case 0: - result = "PenguinRace"; - break; - case 1: - result = "SwimmingSchool"; - break; - case 2: - result = "PenguinRace"; - break; - case 3: - result = "BombTimeAttackLv1"; - break; - case 4: - result = "PhantomTeresaRacer"; - break; - case 5: - result = "BombTimeAttackLv2"; - break; - case 6: - result = "TrialSurfingCoach"; - break; - case 7: - result = "TrialSurfingHowTo"; - break; - case 8: - result = "DeathPromenadeTeresaRacer"; - break; - case 9: - result = "RosettaFinalBattle"; - break; - case 10: - result = "CometTico"; - break; - case 11: - result = "TransformTico"; - break; - case 12: - result = "ChallengeSurfingCoach"; - break; - case 13: - result = "TicoShopExchange"; - break; - case 14: - result = "TicoShopWhich"; - break; - case 15: - result = "KinopioPurple"; - break; - case 16: - result = "CometTicoTell"; - break; - case 17: - result = "TrialTamakoroHowTo"; - break; - case 18: - result = "KnockOnTheDoor"; - break; - case 19: - result = "LedPattern"; - break; + case 0: + result = "PenguinRace"; + break; + case 1: + result = "SwimmingSchool"; + break; + case 2: + result = "PenguinRace"; + break; + case 3: + result = "BombTimeAttackLv1"; + break; + case 4: + result = "PhantomTeresaRacer"; + break; + case 5: + result = "BombTimeAttackLv2"; + break; + case 6: + result = "TrialSurfingCoach"; + break; + case 7: + result = "TrialSurfingHowTo"; + break; + case 8: + result = "DeathPromenadeTeresaRacer"; + break; + case 9: + result = "RosettaFinalBattle"; + break; + case 10: + result = "CometTico"; + break; + case 11: + result = "TransformTico"; + break; + case 12: + result = "ChallengeSurfingCoach"; + break; + case 13: + result = "TicoShopExchange"; + break; + case 14: + result = "TicoShopWhich"; + break; + case 15: + result = "KinopioPurple"; + break; + case 16: + result = "CometTicoTell"; + break; + case 17: + result = "TrialTamakoroHowTo"; + break; + case 18: + result = "KnockOnTheDoor"; + break; + case 19: + result = "LedPattern"; + break; } return result; diff --git a/src/Game/NPC/TalkMessageInfo.cpp b/src/Game/NPC/TalkMessageInfo.cpp index 926f2eb61..58e0aa486 100644 --- a/src/Game/NPC/TalkMessageInfo.cpp +++ b/src/Game/NPC/TalkMessageInfo.cpp @@ -1,15 +1,13 @@ #include "Game/NPC/TalkMessageInfo.hpp" -TalkMessageInfo::TalkMessageInfo() : - _0(0), - _4(0), - _6(0), - mCameraType(2), - mTalkType(0), - _A(-1), - _B(-1) -{ - +TalkMessageInfo::TalkMessageInfo() + : _0(0), + _4(0), + _6(0), + mCameraType(2), + mTalkType(0), + _A(-1), + _B(-1) { } bool TalkMessageInfo::isNormalTalk() const { diff --git a/src/Game/NPC/TalkNodeCtrl.cpp b/src/Game/NPC/TalkNodeCtrl.cpp index 78846dc12..c1a085928 100644 --- a/src/Game/NPC/TalkNodeCtrl.cpp +++ b/src/Game/NPC/TalkNodeCtrl.cpp @@ -4,7 +4,7 @@ #include void TalkMessageHistory::entry(u16 msgID) { - mHistory[mCount++] = msgID; + mHistory[mCount++] = msgID; } bool TalkMessageHistory::search(u16 msgID) const { @@ -17,7 +17,8 @@ bool TalkMessageHistory::search(u16 msgID) const { return false; } -TalkNodeCtrl::TalkNodeCtrl() : _0(0), mCurrentNodeIdx(-1), mMessageInfo() { +TalkNodeCtrl::TalkNodeCtrl() + : _0(0), mCurrentNodeIdx(-1), mMessageInfo() { mHistory.mCount = 0; _38 = nullptr; mCurrentNode = nullptr; @@ -51,12 +52,11 @@ void TalkNodeCtrl::forwardFlowNode() { } if (node->mNodeType == 1) { - u16 idx = node->mNextIdx; + u16 idx = node->mNextIdx; MessageData* msg = MessageSystem::getSceneMessageData(); mCurrentNode = msg->getNode(idx); - } - else if (node->mNodeType == 3) { - u16 idx = node->mIndex; + } else if (node->mNodeType == 3) { + u16 idx = node->mIndex; MessageData* msg = MessageSystem::getSceneMessageData(); mCurrentNode = msg->getBranchNode(idx); } @@ -84,7 +84,7 @@ bool TalkNodeCtrl::isCurrentNodeEvent() const { TalkNode* TalkNodeCtrl::getNextNode() const { TalkNode* node = mCurrentNode; - u16 idx; + u16 idx; if (node == nullptr) { return nullptr; @@ -95,8 +95,7 @@ TalkNode* TalkNodeCtrl::getNextNode() const { if (idx != 0xFFFF) { return MessageSystem::getSceneMessageData()->getNode(idx); } - } - else if (node->mNodeType == 3) { + } else if (node->mNodeType == 3) { idx = node->mIndex; MessageData* msg = MessageSystem::getSceneMessageData(); @@ -112,7 +111,7 @@ TalkNode* TalkNodeCtrl::getNextNode() const { TalkNode* TalkNodeCtrl::getNextNodeBranch() const { TalkNode* node = getNextNode(); - + if (node == nullptr) { return nullptr; } @@ -146,7 +145,7 @@ TalkNode* TalkNodeCtrl::getCurrentNodeEvent() const { TalkNode* TalkNodeCtrl::getNextNodeEvent() const { TalkNode* node = getNextNode(); - + if (node == nullptr) { return nullptr; } @@ -155,15 +154,14 @@ TalkNode* TalkNodeCtrl::getNextNodeEvent() const { } void TalkNodeCtrl::updateMessage() { - u16 idx; - u8 groupID; + u16 idx; + u8 groupID; TalkNode* cur = mCurrentNode; if (cur != nullptr) { if (cur->mNodeType != 1) { mMessageInfo._0 = 0; - } - else { + } else { idx = cur->mIndex; groupID = cur->mGroupID; MessageData* msg = MessageSystem::getSceneMessageData(); @@ -174,8 +172,7 @@ void TalkNodeCtrl::updateMessage() { if (nextBranchNode != nullptr) { mNodeData = nextBranchNode->mIndex; - } - else { + } else { mNodeData = -1; } } @@ -214,12 +211,11 @@ void TalkNodeCtrl::forwardCurrentBranchNode(bool storeCurrent) { TalkNode* cur = mCurrentNode; if (storeCurrent) { - u16 group = cur->mNextGroup; + u16 group = cur->mNextGroup; MessageData* msg = MessageSystem::getSceneMessageData(); mCurrentNode = msg->getBranchNode(group); - } - else { - u16 group = cur->mNextGroup; + } else { + u16 group = cur->mNextGroup; MessageData* msg = MessageSystem::getSceneMessageData(); mCurrentNode = msg->getBranchNode(group + 1); } @@ -229,9 +225,9 @@ void TalkNodeCtrl::forwardCurrentBranchNode(bool storeCurrent) { #ifdef NON_MATCHING // refuses to load the msgID before the getCurrentPlacementZoneName() call -void TalkNodeCtrl::createFlowNode(TalkMessageCtrl *pMsgCtrl, const JMapInfoIter &rIter, const char *pName, ActorCameraInfo **pCameraInf) { +void TalkNodeCtrl::createFlowNode(TalkMessageCtrl* pMsgCtrl, const JMapInfoIter& rIter, const char* pName, ActorCameraInfo** pCameraInf) { char buf[0x100]; - s32 msgID = MR::getMessageID(rIter); + s32 msgID = MR::getMessageID(rIter); snprintf(buf, sizeof(buf), "%s_%s%03d", MR::getCurrentPlacementZoneName(), pName, msgID); createFlowNodeDirect(pMsgCtrl, rIter, buf, pCameraInf); } diff --git a/src/Game/NPC/TalkState.cpp b/src/Game/NPC/TalkState.cpp index d0083aa8a..72403d2a9 100644 --- a/src/Game/NPC/TalkState.cpp +++ b/src/Game/NPC/TalkState.cpp @@ -12,14 +12,12 @@ #include "Game/Util/SoundUtil.hpp" #include "revolution/types.h" -TalkState::TalkState() : - _04(nullptr), - mBalloon(nullptr) -{ - +TalkState::TalkState() + : _04(nullptr), + mBalloon(nullptr) { } -void TalkState::init(TalkMessageCtrl *pArg1, TalkBalloon *pBalloon) { +void TalkState::init(TalkMessageCtrl* pArg1, TalkBalloon* pBalloon) { _04 = pArg1; mBalloon = pBalloon; mMessageID = _04->getMessageID(); @@ -33,42 +31,41 @@ void TalkState::balloonOff() const { MR::hideScreen(mBalloon); } -bool TalkState::isLostMessage(const TalkMessageCtrl *pArg1) const { +bool TalkState::isLostMessage(const TalkMessageCtrl* pArg1) const { if (pArg1 == nullptr) { return true; } if (pArg1 != _04) { - return true; + return true; } return _04->getMessageID() != mMessageID; }; -bool TalkState::isSelfInterrupt(const TalkMessageCtrl *pArg1) const { +bool TalkState::isSelfInterrupt(const TalkMessageCtrl* pArg1) const { if (pArg1 == nullptr) { return false; } if (pArg1 != _04) { - return false; + return false; } - + return _04->getMessageID() != mMessageID; } - -bool TalkStateShort::prep(const TalkMessageCtrl *pArg1) { +bool TalkStateShort::prep(const TalkMessageCtrl* pArg1) { return !TalkState::isLostMessage(pArg1); } -bool TalkStateShort::talk(const TalkMessageCtrl *) { +bool TalkStateShort::talk(const TalkMessageCtrl*) { return false; } void TalkStateShort::open() { mBalloon->open(_04); - LiveActor* actor = _04->mHostActor; + LiveActor* actor = _04->mHostActor; TalkMessageInfo* info = TalkFunction::getMessageInfo(_04); MR::startTalkSound(info->_6, actor); } @@ -77,7 +74,6 @@ void TalkStateShort::clos() { mBalloon->close(); } - TalkStateEvent::TalkStateEvent() { _18 = nullptr; _14 = nullptr; @@ -85,7 +81,7 @@ TalkStateEvent::TalkStateEvent() { _1D = true; } -bool TalkStateEvent::prep(const TalkMessageCtrl *pArg1) { +bool TalkStateEvent::prep(const TalkMessageCtrl* pArg1) { return !TalkState::isLostMessage(pArg1); } @@ -104,7 +100,7 @@ void TalkStateEvent::open() { if (!MR::isTimeKeepDemoActive() || !info->isCameraNormal()) { _04->startCamera(-1); } - + mBalloon->open(_04); } @@ -112,7 +108,7 @@ void TalkStateEvent::clos() { mBalloon->close(); } -bool TalkStateEvent::talk(const TalkMessageCtrl *pArg1) { +bool TalkStateEvent::talk(const TalkMessageCtrl* pArg1) { if (MR::testCorePadButtonA(0)) { if (_10++ > 10) { for (int i = 0; i < 2; i++) { @@ -144,11 +140,11 @@ bool TalkStateEvent::talk(const TalkMessageCtrl *pArg1) { mPageCount++; return !mBalloon->turnPage(); } - + return false; } -bool TalkStateEvent::term(const TalkMessageCtrl *pArg1) { +bool TalkStateEvent::term(const TalkMessageCtrl* pArg1) { if (_14++ > 30) { _14 = 0; return true; @@ -165,7 +161,7 @@ bool TalkStateNormal::test() { if (!_18->isEnableTalkPlayerStateNormal() || !MR::testCorePadTriggerA(0)) { return false; } - + return TalkStateEvent::test(); } @@ -174,7 +170,7 @@ void TalkStateNormal::clos() { mBalloon->close(); } -bool TalkStateNormal::term(const TalkMessageCtrl *pArg1) { +bool TalkStateNormal::term(const TalkMessageCtrl* pArg1) { if (pArg1 != nullptr && pArg1 != _04) { return true; } @@ -187,7 +183,7 @@ bool TalkStateNormal::term(const TalkMessageCtrl *pArg1) { } // Stuck at 99% because assembly string labels don't match, even though the code *should* be correct. -bool TalkStateNormal::prep(const TalkMessageCtrl *pArg1) { +bool TalkStateNormal::prep(const TalkMessageCtrl* pArg1) { if (TalkStateNormal::isLostMessage(pArg1)) { _24->term(); return false; @@ -198,7 +194,7 @@ bool TalkStateNormal::prep(const TalkMessageCtrl *pArg1) { if (!_18->isEnableTalkPlayerStateNormal()) { _24->term(); } else if (!MR::testCorePadTriggerA(0)) { - TalkMessageInfo *info = TalkFunction::getMessageInfo(_04); + TalkMessageInfo* info = TalkFunction::getMessageInfo(_04); if (!_24->isOpen()) { if (info->isBalloonSign()) { _24->openWithRead(); @@ -216,8 +212,7 @@ bool TalkStateNormal::prep(const TalkMessageCtrl *pArg1) { return true; } - -void TalkStateCompose::init(TalkMessageCtrl *pArg1, TalkBalloon *pArg2) { +void TalkStateCompose::init(TalkMessageCtrl* pArg1, TalkBalloon* pArg2) { TalkState::init(pArg1, pArg2); mSecondBalloon->open(pArg1); } @@ -235,7 +230,7 @@ void TalkStateCompose::open() { mSecondBalloon->close(); } -bool TalkStateCompose::prep(const TalkMessageCtrl *pArg1) { +bool TalkStateCompose::prep(const TalkMessageCtrl* pArg1) { bool unknownBool = true; if (TalkState::isLostMessage(pArg1)) { @@ -262,8 +257,8 @@ void TalkStateHolder::pauseOff() { MR::requestMovementOn(_04); } -u32 TalkStateHolder::getState(const TalkMessageCtrl *pArg1) { - TalkMessageInfo *info = TalkFunction::getMessageInfo(pArg1); +u32 TalkStateHolder::getState(const TalkMessageCtrl* pArg1) { + TalkMessageInfo* info = TalkFunction::getMessageInfo(pArg1); if (info->isNormalTalk()) { return mTalkNormal; diff --git a/src/Game/NPC/Tico.cpp b/src/Game/NPC/Tico.cpp index 7f78fd405..352462741 100644 --- a/src/Game/NPC/Tico.cpp +++ b/src/Game/NPC/Tico.cpp @@ -32,7 +32,7 @@ namespace NrvTico { NEW_NERVE(TicoNrvGuide2, Tico, Guide2); NEW_NERVE(TicoNrvGuide3, Tico, Guide3); NEW_NERVE(TicoNrvLead0, Tico, Lead0); -}; +}; // namespace NrvTico namespace { static Color8 hPointLight[6] = { @@ -41,17 +41,16 @@ namespace { Color8(0, 0xFF, 0x32, 0xFF), Color8(0xFF, 0, 0, 0xFF), Color8(0x78, 0, 0xFF, 0xFF), - Color8(0xFF, 0x64,0x64, 0xFF) - }; + Color8(0xFF, 0x64, 0x64, 0xFF)}; }; -Tico::Tico(const char *pName) : NPCActor(pName), _15C(0), _160(0.0f, 0.0f, 0.0f), - _16C(0.0f), mDemoGetPower(nullptr), _174(0), _178(0), _17C(255, 255, 255, 255), - _180(0), mDemoStarter(this) { - +Tico::Tico(const char* pName) + : NPCActor(pName), _15C(0), _160(0.0f, 0.0f, 0.0f), + _16C(0.0f), mDemoGetPower(nullptr), _174(0), _178(0), _17C(255, 255, 255, 255), + _180(0), mDemoStarter(this) { } -void Tico::makeArchiveList(NameObjArchiveListCollector *pCollector, const JMapInfoIter &rIter) { +void Tico::makeArchiveList(NameObjArchiveListCollector* pCollector, const JMapInfoIter& rIter) { if (MR::isObjectName(rIter, "TicoBaby")) { pCollector->addArchive("TicoBaby"); return; @@ -67,7 +66,7 @@ void Tico::initBase(s32 color) { initBase(iter, color); } -void Tico::initBase(const JMapInfoIter &rIter, s32 color) { +void Tico::initBase(const JMapInfoIter& rIter, s32 color) { NPCActorCaps caps("Tico"); caps.setDefault(); caps._E = 0; @@ -88,9 +87,9 @@ void Tico::initBase(const JMapInfoIter &rIter, s32 color) { setDefaults2(); _13C = "Spin"; _12C = 1000.0f; - const char *wait = "Wait"; - const char *talk = "Talk"; - const char *fly = "Fly"; + const char* wait = "Wait"; + const char* talk = "Talk"; + const char* fly = "Fly"; mParam._14 = wait; mParam._18 = wait; mParam._1C = talk; @@ -105,9 +104,8 @@ void Tico::initBase(const JMapInfoIter &rIter, s32 color) { if (color != -1) { MR::startBrk(this, "ColorChange"); MR::setBrkFrameAndStop(this, color); - _17C = hPointLight[color]; - } - else { + _17C = hPointLight[color]; + } else { _17C = hPointLight[5]; } @@ -118,7 +116,7 @@ void Tico::initBase(const JMapInfoIter &rIter, s32 color) { _178 = MR::getJointMtx(this, "Body"); } -void Tico::initMessage(const JMapInfoIter &rIter, const char *pMsg) { +void Tico::initMessage(const JMapInfoIter& rIter, const char* pMsg) { if (initTalkCtrl(rIter, pMsg, TVec3f(0.0f, 120.0f, 0.0f), nullptr)) { TalkMessageCtrl* ctrl = mMsgCtrl; MR::registerKillFunc(mMsgCtrl, TalkMessageFunc(this, &Tico::killFunc)); @@ -129,7 +127,7 @@ void Tico::initMessage(const JMapInfoIter &rIter, const char *pMsg) { MR::offRootNodeAutomatic(_174); } -void Tico::initMessage(const char *pMsg) { +void Tico::initMessage(const char* pMsg) { JMapInfoIter iter(0, -1); if (initTalkCtrl(iter, pMsg, TVec3f(0.0f, 120.0f, 0.0f), nullptr)) { TalkMessageCtrl* ctrl = mMsgCtrl; @@ -141,7 +139,7 @@ void Tico::initMessage(const char *pMsg) { MR::offRootNodeAutomatic(_174); } -void Tico::init(const JMapInfoIter &rIter) { +void Tico::init(const JMapInfoIter& rIter) { s32 color = 0; MR::getJMapInfoArg0NoInit(rIter, &color); s32 behavior = 0; @@ -167,16 +165,13 @@ void Tico::init(const JMapInfoIter &rIter) { if (MR::isDemoCast(this, "チコガイドデモ")) { if (clr == -1) { _15C = 5; - } - else { + } else { _15C = 6; } - } - else { + } else { if (MR::isDemoCast(this, "青チコ変身")) { _15C = 1; - } - else { + } else { if (MR::isDemoCast(this, "赤いスター")) { _15C = 9; MR::useStageSwitchWriteA(this, rIter); @@ -188,38 +183,37 @@ void Tico::init(const JMapInfoIter &rIter) { } switch (_15C) { - case 5: - mDemoGetPower = new TicoDemoGetPower(this, rIter); - setNerve(&NrvTico::TicoNrvSpin0::sInstance); - break; - case 1: - setNerve(&NrvTico::TicoNrvBlue0::sInstance); - break; - case 9: - if (MR::isOnGameEventFlagRosettaTalkAboutTicoInTower()) { - makeActorAppeared(); - setNerve(&NrvTico::TicoNrvRed1::sInstance); - } - else { - setNerve(&NrvTico::TicoNrvRed0::sInstance); - } - break; - case 6: - MR::offRootNodeAutomatic(mMsgCtrl); - setNerve(&NrvTico::TicoNrvGuide0::sInstance); - break; - case 7: - setNerve(&NrvTico::TicoNrvLead0::sInstance); - pushNerve(&NrvTico::TicoNrvAppear::sInstance); - break; - case 3: - setNerve(&NrvTico::TicoNrvTalk::sInstance); - break; - case 8: - setNerve(&NrvTico::TicoNrvNoReaction::sInstance); - break; - default: - break; + case 5: + mDemoGetPower = new TicoDemoGetPower(this, rIter); + setNerve(&NrvTico::TicoNrvSpin0::sInstance); + break; + case 1: + setNerve(&NrvTico::TicoNrvBlue0::sInstance); + break; + case 9: + if (MR::isOnGameEventFlagRosettaTalkAboutTicoInTower()) { + makeActorAppeared(); + setNerve(&NrvTico::TicoNrvRed1::sInstance); + } else { + setNerve(&NrvTico::TicoNrvRed0::sInstance); + } + break; + case 6: + MR::offRootNodeAutomatic(mMsgCtrl); + setNerve(&NrvTico::TicoNrvGuide0::sInstance); + break; + case 7: + setNerve(&NrvTico::TicoNrvLead0::sInstance); + pushNerve(&NrvTico::TicoNrvAppear::sInstance); + break; + case 3: + setNerve(&NrvTico::TicoNrvTalk::sInstance); + break; + case 8: + setNerve(&NrvTico::TicoNrvNoReaction::sInstance); + break; + default: + break; } } @@ -236,8 +230,7 @@ void Tico::control() { if (isNerve(_180)) { NPCActor::control(); - } - else { + } else { if (!MR::isTimeKeepDemoActive()) { MR::startLevelSound(this, "SE_SM_LV_TICO_WAIT", -1, -1, -1); } @@ -253,7 +246,7 @@ void Tico::control() { } } -bool Tico::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool Tico::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgStarPieceReflect(msg)) { return false; } @@ -299,7 +292,7 @@ void Tico::exeReaction() { MR::startDPDHitSound(); MR::startSound(this, "SE_SV_TICO_POINT", -1, -1); } - + if (_DB) { MR::limitedStarPieceHitSound(); MR::startSound(this, "SE_BM_BUTLER_ABSORB", -1, -1); @@ -335,8 +328,7 @@ void Tico::exeNoReaction() { if (MR::tryTalkNearPlayerAndStartTalkAction(this)) { setNerve(&NrvTico::TicoNrvWait::sInstance); } - } - else { + } else { MR::tryStartTurnAction(this); } } @@ -345,8 +337,7 @@ void Tico::exeWait() { if (!tryReaction()) { if (mMsgCtrl != nullptr) { MR::tryTalkNearPlayerAndStartTalkAction(this); - } - else { + } else { MR::tryStartTurnAction(this); } } @@ -420,13 +411,11 @@ void Tico::exeGuide1() { MR::forwardNode(mMsgCtrl); MR::forwardNode(mMsgCtrl); setNerve(&NrvTico::TicoNrvGuide2::sInstance); - } - else { + } else { if (MR::countHideGroupMember(this) != 0) { MR::forwardNode(mMsgCtrl); setNerve(&NrvTico::TicoNrvGuide2::sInstance); - } - else { + } else { MR::tryTalkNearPlayerAndStartTalkAction(this); if (tryReaction()) { return; @@ -439,8 +428,7 @@ void Tico::exeGuide2() { if (MR::countShowGroupMember(this) == 0) { MR::forwardNode(mMsgCtrl); setNerve(&NrvTico::TicoNrvGuide3::sInstance); - } - else { + } else { MR::tryTalkNearPlayerAndStartTalkAction(this); if (tryReaction()) { return; @@ -452,8 +440,7 @@ void Tico::exeGuide3() { if (!MR::isFirstStep(this)) { if (MR::tryTalkNearPlayerAtEndAndStartTalkAction(this) && MR::isExistNextNode(mMsgCtrl)) { MR::forwardNode(mMsgCtrl); - } - else { + } else { if (tryReaction()) { return; } @@ -464,8 +451,7 @@ void Tico::exeGuide3() { void Tico::exeLead0() { if (mMsgCtrl != nullptr) { MR::tryTalkForceAndStartMoveTalkAction(this); - } - else { + } else { MR::tryStartMoveTurnAction(this); } diff --git a/src/Game/NPC/TicoAstro.cpp b/src/Game/NPC/TicoAstro.cpp index 1179dad8b..01d95dda2 100644 --- a/src/Game/NPC/TicoAstro.cpp +++ b/src/Game/NPC/TicoAstro.cpp @@ -1,36 +1,35 @@ #include "Game/NPC/TicoAstro.hpp" #include "Game/Util/EventUtil.hpp" -TicoAstro::TicoAstro(const char *pName) : Tico(pName) { - +TicoAstro::TicoAstro(const char* pName) + : Tico(pName) { } -void TicoAstro::init(const JMapInfoIter &rIter) { +void TicoAstro::init(const JMapInfoIter& rIter) { Tico::init(rIter); s32 arg2 = -1; MR::getJMapInfoArg2NoInit(rIter, &arg2); switch (arg2) { - case 0: - if (MR::calcCurrentGreenStarNum() <= 0) { - makeActorDead(); - } - break; - case 1: - if (MR::calcCurrentGreenStarNum() > 1) { - return; - } - + case 0: + if (MR::calcCurrentGreenStarNum() <= 0) { makeActorDead(); - break; - case 2: - if (MR::calcCurrentGreenStarNum() <= 2) { - makeActorDead(); - } - break; + } + break; + case 1: + if (MR::calcCurrentGreenStarNum() > 1) { + return; + } + + makeActorDead(); + break; + case 2: + if (MR::calcCurrentGreenStarNum() <= 2) { + makeActorDead(); + } + break; } } TicoAstro::~TicoAstro() { - } diff --git a/src/Game/NPC/TicoComet.cpp b/src/Game/NPC/TicoComet.cpp index 3028c0d5c..7892d3262 100644 --- a/src/Game/NPC/TicoComet.cpp +++ b/src/Game/NPC/TicoComet.cpp @@ -17,13 +17,13 @@ namespace NrvTicoEat { NEW_NERVE(TicoEatNrvEatPst, TicoEat, EatPst); NEW_NERVE(TicoEatNrvEatEnd, TicoEat, EatEnd); NEW_NERVE(TicoEatNrvReaction, TicoEat, Reaction); -}; +}; // namespace NrvTicoEat namespace NrvTicoComet { NEW_NERVE(TicoCometNrvDemoAnim, TicoComet, DemoAnim); NEW_NERVE(TicoCometNrvDemoFade, TicoComet, DemoFade); NEW_NERVE(TicoCometNrvDemoEnd, TicoComet, DemoEnd); -}; +}; // namespace NrvTicoComet namespace { class TicoEatParam : public AnimScaleParam { @@ -31,22 +31,24 @@ namespace { TicoEatParam(); }; - TicoEatParam::TicoEatParam() : AnimScaleParam() { + TicoEatParam::TicoEatParam() + : AnimScaleParam() { _20 = 0.12f; _24 = 0.12f; _28 = 0.89999998f; } static TicoEatParam sParam; -}; +}; // namespace -TicoEat::TicoEat(const char *pName) : Tico(pName) { +TicoEat::TicoEat(const char* pName) + : Tico(pName) { _190 = 0; _194 = 0; _198 = 0; } -void TicoEat::init(const JMapInfoIter &rIter) { +void TicoEat::init(const JMapInfoIter& rIter) { mScaleController = new AnimScaleController(&sParam); mReactionNerve = &NrvTicoEat::TicoEatNrvReaction::sInstance; _178 = MR::getJointMtx(this, "Center"); @@ -67,7 +69,7 @@ void TicoEat::control() { Tico::control(); } -bool TicoEat::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool TicoEat::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgStarPieceGift(msg)) { if (_198 == _194) { MR::startAction(this, "Eat0"); @@ -109,7 +111,7 @@ bool TicoEat::tryEat() { if (isEmptyNerve()) { pushNerve(&NrvTicoEat::TicoEatNrvEatPre::sInstance); } - + if (isNerve(&NrvTicoEat::TicoEatNrvEatEnd::sInstance)) { popNerve(); return true; @@ -130,7 +132,7 @@ bool TicoEat::eventFunc(u32 event) { if (event == 1) { MR::forceAppearStarPieceCounterForTicoFat(); } - + if (event == 2) { MR::disappearStarPieceCounterForTicoFat(); } @@ -144,7 +146,7 @@ void TicoEat::exeReaction() { } startReactionSound(); - + if (MR::tryStartReactionAndPopNerve(this)) { return; } @@ -156,10 +158,9 @@ void TicoEat::exeEatPre() { MR::startBva(this, "Big0"); } - TVec3f neg; TVec3f dir = MR::getCamZdir(); - + JMathInlineVEC::PSVECNegate(&dir, &neg); if (MR::turnQuatZDirRad(&_A0, _A0, neg, 0.034906585f)) { popAndPushNerve(&NrvTicoEat::TicoEatNrvEatNow::sInstance); @@ -168,7 +169,6 @@ void TicoEat::exeEatPre() { void TicoEat::exeEatNow() { if (MR::isFirstStep(this)) { - } if (_198 != 0 && MR::isIntervalStep(this, 100 / _194)) { @@ -193,14 +193,13 @@ void TicoEat::exeEatPst() { } void TicoEat::exeEatEnd() { - } -TicoComet::TicoComet(const char *pName) : TicoEat(pName) { - +TicoComet::TicoComet(const char* pName) + : TicoEat(pName) { } -void TicoComet::init(const JMapInfoIter &rIter) { +void TicoComet::init(const JMapInfoIter& rIter) { NPCActorCaps caps("TicoComet"); NPCActorItem item; item.mActor = "TicoComet"; @@ -328,9 +327,7 @@ void TicoComet::exeDemoFade() { } void TicoComet::exeDemoEnd() { - } void TicoEat::startReactionSound() { - } diff --git a/src/Game/NPC/TicoDemoGetPower.cpp b/src/Game/NPC/TicoDemoGetPower.cpp index 28a2b4377..cccd3a0fc 100644 --- a/src/Game/NPC/TicoDemoGetPower.cpp +++ b/src/Game/NPC/TicoDemoGetPower.cpp @@ -6,12 +6,11 @@ namespace NrvTicoDemoGetPower { NEW_NERVE(TicoDemoGetPowerNrvWait, TicoDemoGetPower, Wait); NEW_NERVE(TicoDemoGetPowerNrvDemo, TicoDemoGetPower, Demo); -}; +}; // namespace NrvTicoDemoGetPower -TicoDemoGetPower::TicoDemoGetPower(Tico *pTico, const JMapInfoIter &rIter) : - NerveExecutor("チコゲットパワーデモ実行者"), - mTico(pTico) -{ +TicoDemoGetPower::TicoDemoGetPower(Tico* pTico, const JMapInfoIter& rIter) + : NerveExecutor("チコゲットパワーデモ実行者"), + mTico(pTico) { initNerve(&NrvTicoDemoGetPower::TicoDemoGetPowerNrvWait::sInstance); DemoFunction::tryCreateDemoTalkAnimCtrlForScene(mTico, rIter, "DemoGetPower", "スピンゲット[デモ1]", 0, 0); MR::registerDemoActionFunctor(mTico, MR::Functor_Inline(this, &TicoDemoGetPower::startDemo), "スピンゲット[デモ1]"); @@ -25,7 +24,6 @@ void TicoDemoGetPower::startDemo() { } void TicoDemoGetPower::exeWait() { - } void TicoDemoGetPower::exeDemo() { diff --git a/src/Game/NPC/TicoDomeLecture.cpp b/src/Game/NPC/TicoDomeLecture.cpp index b38abffad..42513fff5 100644 --- a/src/Game/NPC/TicoDomeLecture.cpp +++ b/src/Game/NPC/TicoDomeLecture.cpp @@ -8,18 +8,18 @@ namespace NrvTicoDomeLecture { NEW_NERVE(TicoDomeLectureNrvWait, TicoDomeLecture, Wait); NEW_NERVE(TicoDomeLectureNrvMove, TicoDomeLecture, Move); NEW_NERVE(TicoDomeLectureNrvMetamorphosis, TicoDomeLecture, Metamorphosis); -}; +}; // namespace NrvTicoDomeLecture namespace { - const static Vec cMoveEndPos = { 0.0f, -70.0f, 0.0f }; - const static Vec cMoveEndRotate = { 30.0f, 130.0f, 0.0f }; + const static Vec cMoveEndPos = {0.0f, -70.0f, 0.0f}; + const static Vec cMoveEndRotate = {30.0f, 130.0f, 0.0f}; +} // namespace + +TicoDomeLecture::TicoDomeLecture(const char* pName) + : LiveActor(pName), _8C(gZeroVec), _98(gZeroVec) { } -TicoDomeLecture::TicoDomeLecture(const char *pName) : LiveActor(pName), _8C(gZeroVec), _98(gZeroVec) { - -} - -void TicoDomeLecture::init(const JMapInfoIter &rIter) { +void TicoDomeLecture::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); _8C.set(mPosition); _98.set(mRotation); @@ -62,7 +62,7 @@ void TicoDomeLecture::exeMove() { MR::startLevelSound(this, "SE_SM_LV_TICO_WAIT", -1, -1, -1); MR::startLevelSound(this, "SE_SM_LV_TICO_FLY_DEMO", -1, -1, -1); if (MR::isDemoPartActive(demoName)) { - f32 easeOut = MR::calcNerveEaseOutRate(this, MR::getDemoPartTotalStep(demoName) -1); + f32 easeOut = MR::calcNerveEaseOutRate(this, MR::getDemoPartTotalStep(demoName) - 1); TVec3f v5(cMoveEndPos); JMAVECLerp(&_8C, &v5, &mPosition, easeOut); TVec3f v4(cMoveEndRotate); @@ -86,5 +86,4 @@ void TicoDomeLecture::exeMetamorphosis() { } TicoDomeLecture::~TicoDomeLecture() { - } diff --git a/src/Game/NPC/TicoFat.cpp b/src/Game/NPC/TicoFat.cpp index 9af7b42ac..2fc2e114f 100644 --- a/src/Game/NPC/TicoFat.cpp +++ b/src/Game/NPC/TicoFat.cpp @@ -38,7 +38,7 @@ namespace NrvTicoFat { NEW_NERVE(TicoFatNrvWipeIn, TicoFat, WipeIn); NEW_NERVE(TicoFatNrvInfo, TicoFat, Info); NEW_NERVE(TicoFatNrvAfter, TicoFat, After); -}; +}; // namespace NrvTicoFat namespace { class TicoFatParam : public AnimScaleParam { @@ -50,12 +50,12 @@ namespace { } }; - static const char* sInfoMessageID = "InformationPlanet"; + static const char* sInfoMessageID = "InformationPlanet"; static TicoFatParam sParam; - static Color8 hPointLight = Color8(0xFF, 0x7D, 0xE6, 0xFF); -}; + static Color8 hPointLight = Color8(0xFF, 0x7D, 0xE6, 0xFF); +}; // namespace -const char* TicoFat::getActionName(const char *pName) { +const char* TicoFat::getActionName(const char* pName) { if (calcScale() > 1.6f) { if (!strcmp(pName, "Eat")) { return "eat2"; @@ -72,8 +72,7 @@ const char* TicoFat::getActionName(const char *pName) { if (!strcmp(pName, "Joy")) { return "joy2"; } - } - else { + } else { if (calcScale() > 1.3f) { if (!strcmp(pName, "Eat")) { return "eat1"; @@ -90,8 +89,7 @@ const char* TicoFat::getActionName(const char *pName) { if (!strcmp(pName, "Joy")) { return "joy1"; } - } - else { + } else { if (!strcmp(pName, "Eat")) { return "eat0"; } @@ -113,7 +111,8 @@ const char* TicoFat::getActionName(const char *pName) { return pName; } -TicoFat::TicoFat(const char *pName) : NPCActor(pName) { +TicoFat::TicoFat(const char* pName) + : NPCActor(pName) { mCameraInfo = nullptr; mItem = nullptr; mShootPath = nullptr; @@ -128,14 +127,14 @@ TicoFat::TicoFat(const char *pName) : NPCActor(pName) { _1AC.identity(); } -void TicoFat::makeArchiveList(NameObjArchiveListCollector *pCollector, const JMapInfoIter &rIter) { +void TicoFat::makeArchiveList(NameObjArchiveListCollector* pCollector, const JMapInfoIter& rIter) { NPCActorItem item("TicoFat"); if (MR::getNPCItemData(&item, 0)) { NPCActor::addArchive(pCollector, item); } } -void TicoFat::init(const JMapInfoIter &rIter) { +void TicoFat::init(const JMapInfoIter& rIter) { NPCActorCaps caps("TicoFat"); NPCActorItem item("TicoFat"); caps.setDefault(); @@ -162,15 +161,15 @@ void TicoFat::init(const JMapInfoIter &rIter) { _1DC = itemType; switch (_1DC) { - case 0: - mItem = MR::createKinokoOneUp(); - break; - case 1: - mItem = MR::createKinokoSuper(); - break; - case -1: - case 2: - break; + case 0: + mItem = MR::createKinokoOneUp(); + break; + case 1: + mItem = MR::createKinokoSuper(); + break; + case -1: + case 2: + break; } if (mItem != nullptr) { @@ -241,7 +240,7 @@ void TicoFat::init(const JMapInfoIter &rIter) { const char* talkActionName = getActionName("Talk"); mParam._1C = talkActionName; mParam._20 = talkActionName; - + if (!enableAppear()) { makeActorDead(); } @@ -270,7 +269,7 @@ void TicoFat::setCameraParam() { xDir.set(((1.0f - (2.0f * (_B0.y * _B0.y))) - (2.0f * (_B0.z * _B0.z))), ((2.0f * (_B0.x * _B0.y)) + (2.0f * (_B0.h * _B0.z))), ((2.0f * (_B0.x * _B0.z)) - (2.0f * (_B0.h * _B0.y)))); yDir.set(((2.0f * (_B0.x * _B0.y)) - (2.0f * (_B0.h * _B0.z))), ((1.0f - (2.0f * (_B0.x * _B0.x))) - (2.0f * (_B0.z * _B0.z))), ((2.0f * (_B0.y * _B0.z)) + (2.0f * (_B0.h * _B0.x)))); zDir.set(((2.0f * (_B0.x * _B0.z)) + (2.0f * (_B0.h * _B0.y))), ((2.0f * (_B0.y * _B0.z)) - (2.0f * (_B0.h * _B0.x))), ((1.0f - (2.0f * (_B0.x * _B0.x))) - (2.0f * (_B0.y * _B0.y)))); - + v18.setPS2(_C0); TVec3f* ptr = &v18; MR::setProgrammableCameraParam("デブチコカメラ", (*ptr + (xDir * 0.0f) + (yDir * 0.0f)) + (zDir * 0.0f), (*ptr + (xDir * 0.0f)) + ((yDir * 100.0f)) + (zDir * MR::getLinerValueFromMinMax(calcScale(), 1.0f, 1.9f, 1300.0f, 1680.0f)), yDir, false); @@ -281,20 +280,17 @@ void TicoFat::control() { TVec3f trans; MR::extractMtxTrans(MR::getJointMtx(this, "Center"), &trans); MR::requestPointLight(this, TVec3f(trans), hPointLight, 0.99864602f, -1); - if (isNerve(&NrvTicoFat::TicoFatNrvPrep::sInstance) || isNerve(&NrvTicoFat::TicoFatNrvWait::sInstance) || isNerve(&NrvTicoFat::TicoFatNrvPoint::sInstance) - || isNerve(&NrvTicoFat::TicoFatNrvEat::sInstance) || isNerve(&NrvTicoFat::TicoFatNrvChem::sInstance) - || isNerve(&NrvTicoFat::TicoFatNrvFullness::sInstance) || isNerve(&NrvTicoFat::TicoFatNrvDemo::sInstance)) { - MR::startLevelSound(this, "SE_SM_LV_TICO_WAIT", -1, -1, -1); - } + if (isNerve(&NrvTicoFat::TicoFatNrvPrep::sInstance) || isNerve(&NrvTicoFat::TicoFatNrvWait::sInstance) || isNerve(&NrvTicoFat::TicoFatNrvPoint::sInstance) || isNerve(&NrvTicoFat::TicoFatNrvEat::sInstance) || isNerve(&NrvTicoFat::TicoFatNrvChem::sInstance) || isNerve(&NrvTicoFat::TicoFatNrvFullness::sInstance) || isNerve(&NrvTicoFat::TicoFatNrvDemo::sInstance)) { + MR::startLevelSound(this, "SE_SM_LV_TICO_WAIT", -1, -1, -1); + } updateGoods(); _204--; if (mStartEat) { if (!_1E0) { MR::invalidateClipping(this); - if (isNerve(&NrvTicoFat::TicoFatNrvPoint::sInstance) || isNerve(&NrvTicoFat::TicoFatNrvEat::sInstance) - || isNerve(&NrvTicoFat::TicoFatNrvChem::sInstance) || isNerve(&NrvTicoFat::TicoFatNrvWait::sInstance)) { - + if (isNerve(&NrvTicoFat::TicoFatNrvPoint::sInstance) || isNerve(&NrvTicoFat::TicoFatNrvEat::sInstance) || isNerve(&NrvTicoFat::TicoFatNrvChem::sInstance) || isNerve(&NrvTicoFat::TicoFatNrvWait::sInstance)) { + setNerve(&NrvTicoFat::TicoFatNrvTest::sInstance); } } @@ -302,13 +298,11 @@ void TicoFat::control() { if (!_1E0 || MR::isPlayerElementModeInvincible() || MR::isPlayerFlying()) { _178 = 0; _174 = 0; - } - else { + } else { updateGuidance(); if (_174 > 0) { updatePointing(); - } - else { + } else { _178 = 0; } } @@ -320,8 +314,7 @@ void TicoFat::control() { MR::startGlobalEventCamera("デブチコカメラ", arg, 120); setCameraParam(); } - } - else { + } else { if (_170) { _170 = 0; MR::endGlobalEventCamera("デブチコカメ", 120, true); @@ -340,14 +333,13 @@ void TicoFat::control() { } mMeter->requestAppear(); - } - else { + } else { mMeter->requestDisappear(); } } } -bool TicoFat::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool TicoFat::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgStarPieceReflect(msg)) { return false; } @@ -356,12 +348,10 @@ bool TicoFat::receiveMsgPlayerAttack(u32 msg, HitSensor *pSender, HitSensor *pRe MR::limitedStarPieceHitSound(); _E5 = 1; return true; - } - else if (MR::isMsgStarPieceGift(msg)) { + } else if (MR::isMsgStarPieceGift(msg)) { receiveStarPiece(MR::getNumStarPieceGift(msg)); return true; - } - else { + } else { return NPCActor::receiveMsgPlayerAttack(msg, pSender, pReceiver); } } @@ -372,11 +362,11 @@ void TicoFat::calcAndSetBaseMtx() { bool TicoFat::eventFunc(u32 var) { switch (var) { - case 0: - startEat(); - break; - case 1: - return false; + case 0: + startEat(); + break; + case 1: + return false; } return true; @@ -398,8 +388,7 @@ void TicoFat::setScale(f32 scale) { f32 v5 = (scale - 1.0f) / 0.89999998f; if (1.0f >= v5) { v5 = v5; - } - else { + } else { v5 = 1.0f; } @@ -411,8 +400,7 @@ void TicoFat::setScale(f32 scale) { f32 v7 = 1.5f; if (scale >= 1.5f) { v7 = v7; - } - else { + } else { v7 = scale; } @@ -420,8 +408,7 @@ void TicoFat::setScale(f32 scale) { f32 v8 = 1.5f; if (scale >= 1.5f) { v8 = v8; - } - else { + } else { v8 = scale; } MR::setDistanceToTalk(_16C, (280.0f * v8)); @@ -435,30 +422,24 @@ void TicoFat::setMessage(s32 msg) { MR::resetNode(_16C); switch (msg) { - case 1: - { - if (1.0f == v5) { - nodeCount = 1; - } - else if (v5 >= 0.5f) { - nodeCount = 2; - } - else if (v5 >= 0.25f) { - nodeCount = 3; - } - else if (v5 >= 0.050000001f) { - nodeCount = 4; - } - else { - nodeCount = 5; - } - } - break; - case 2: - nodeCount = 6; - break; - case 0: - break; + case 1: { + if (1.0f == v5) { + nodeCount = 1; + } else if (v5 >= 0.5f) { + nodeCount = 2; + } else if (v5 >= 0.25f) { + nodeCount = 3; + } else if (v5 >= 0.050000001f) { + nodeCount = 4; + } else { + nodeCount = 5; + } + } break; + case 2: + nodeCount = 6; + break; + case 0: + break; } for (s32 i = 0; i < nodeCount; i++) { @@ -494,8 +475,7 @@ void TicoFat::receiveStarPiece(s32 num) { if (isNerve(&NrvTicoFat::TicoFatNrvEat::sInstance)) { MR::setBckRate(this, MR::calcNerveValue(this, 0, 180, 1.0f, 1.6f)); - } - else { + } else { if (!isEmptyNerve()) { popNerve(); } @@ -512,7 +492,7 @@ bool TicoFat::enableAppear() { return true; } -void TicoFat::initStarPieceSaveData(const JMapInfoIter &rIter) { +void TicoFat::initStarPieceSaveData(const JMapInfoIter& rIter) { if (MR::getJMapInfoArg7WithInit(rIter, &_1EC)) { s32 starPieceNum = MR::getStarPieceNumGivingToTicoSeed(_1EC); _1E0 = (_1E4 - starPieceNum <= 0) ? 0 : _1E4 - starPieceNum; @@ -520,7 +500,6 @@ void TicoFat::initStarPieceSaveData(const JMapInfoIter &rIter) { } void TicoFat::addStarPieceSaveData(s32) { - } void TicoFat::appearInformation() const { @@ -544,8 +523,7 @@ void TicoFat::disappear(bool a1) { MR::addStarPieceGivingToTicoSeed(_1EC, _1E4); } MR::callAppearAllGroupMember(this); - } - else { + } else { MR::callMakeActorAppearedAllGroupMember(this); } @@ -560,8 +538,7 @@ bool TicoFat::tryMetamorphosis() { MR::callRequestMovementOnAllGroupMember(this); MR::requestMovementOn(_94); MR::requestMovementOn(_98); - } - else { + } else { setNerve(&NrvTicoFat::TicoFatNrvMeta::sInstance); } @@ -575,7 +552,7 @@ void TicoFat::emitScreenEffect() { void TicoFat::updateScreenEffect() { const TVec3f camPos = MR::getCamPos(); - TVec3f v19(mPosition); + TVec3f v19(mPosition); JMathInlineVEC::PSVECSubtract(&v19, &camPos, &v19); MR::normalizeOrZero(&v19); MR::makeMtxFrontUpPos(&_17C, -MR::getCamZdir(), MR::getCamYdir(), MR::getCamPos() + (v19 * 500.0f)); @@ -622,8 +599,7 @@ void TicoFat::updateGuidance() { if (isNear) { _174 = 8; - } - else { + } else { s32 a = _174 - 1; _174 = *(data_806B2194 < a ? &a : &data_806B2194); } @@ -634,15 +610,13 @@ void TicoFat::updatePointing() { if (isNerve(&NrvTicoFat::TicoFatNrvEat::sInstance)) { isPointing = MR::isStarPointerPointing1PWithoutCheckZ(this, nullptr, false, false); - } - else { + } else { isPointing = MR::isStarPointerPointing(this, 0, false, nullptr); } if (isPointing) { _178 = 4; - } - else { + } else { s32 a = _178 - 1; _178 = *(data_806B2198 < a ? &a : &data_806B2198); } @@ -652,8 +626,7 @@ void TicoFat::updateGoods() { if (MR::isNearPlayer(this, 2000.0f)) { MR::tryStartBck(_94, "TicoFatGoodsStarPiece", nullptr); MR::tryStartBck(_98, "TicoFatGoodsStarPiece", nullptr); - } - else { + } else { MR::tryStartBck(_94, "TicoFatGoodsStarPieceFar", nullptr); MR::tryStartBck(_98, "TicoFatGoodsStarPieceFar", nullptr); } @@ -695,8 +668,7 @@ void TicoFat::exePrep() { if (!MR::tryStartReactionAndPushNerve(this, &NrvTicoFat::TicoFatNrvReaction::sInstance) && !MR::isPlayerElementModeInvincible()) { if (mStartEat) { setNerve(&NrvTicoFat::TicoFatNrvWait::sInstance); - } - else if (mMsgCtrl != nullptr) { + } else if (mMsgCtrl != nullptr) { MR::tryTalkNearPlayerAndStartTalkAction(this); } } @@ -717,8 +689,7 @@ void TicoFat::exeWait() { if (!MR::tryStartReactionAndPushNerve(this, &NrvTicoFat::TicoFatNrvReaction::sInstance)) { if (_178 > 0) { setNerve(&NrvTicoFat::TicoFatNrvPoint::sInstance); - } - else { + } else { turnToDefault(mParam._8); MR::tryTalkNearPlayer(_16C); MR::tryStartTalkAction(this); @@ -735,8 +706,7 @@ void TicoFat::exePoint() { if (!MR::tryStartReactionAndPushNerve(this, &NrvTicoFat::TicoFatNrvReaction::sInstance)) { if (_178 <= 0) { setNerve(&NrvTicoFat::TicoFatNrvWait::sInstance); - } - else { + } else { turnToDefault(mParam._8); MR::tryTalkForce(_16C); } @@ -746,8 +716,7 @@ void TicoFat::exePoint() { void TicoFat::exeEat() { if (MR::isFirstStep(this)) { MR::startAction(this, getActionName("EatStart")); - } - else { + } else { f32 frame = MR::getBckFrame(this); if (MR::tryStartAction(this, getActionName("Eat"))) { MR::setBckFrame(this, frame); @@ -775,8 +744,7 @@ void TicoFat::exeChem() { if (_178 > 0) { _174 = 8; setNerve(&NrvTicoFat::TicoFatNrvPoint::sInstance); - } - else { + } else { _174 = 0; setNerve(&NrvTicoFat::TicoFatNrvWait::sInstance); } @@ -860,8 +828,7 @@ void TicoFat::exeDemo() { MR::endMultiActorCamera(this, mCameraInfo, "変身", false, -1); if (_1DC == -1 && MR::isExistRail(this)) { setNerve(&NrvTicoFat::TicoFatNrvFly::sInstance); - } - else { + } else { MR::setNPCActorPos(this, mPosition); setNerve(&NrvTicoFat::TicoFatNrvWipeOut::sInstance); } @@ -881,17 +848,15 @@ void TicoFat::exeFly() { f32 v4 = _1F8 / mShootPath->getTotalLength(); if (1.0f >= v4) { v4 = v4; - } - else { + } else { v4 = 1.0f; } - + f32 easeIn; if (v4 < 0.5f) { easeIn = MR::getEaseInValue((2.0f * v4) * (2.0f * v4), 0.0f, 0.5f, 1.0f); - } - else { + } else { f32 v6 = (2.0f * (1.0f - v4)); easeIn = (1.0f - MR::getEaseInValue((v6 * v6), 0.0f, 0.5f, 1.0f)); } @@ -976,7 +941,6 @@ void TicoFat::exeInfo() { void TicoFat::exeAfter() { if (MR::isFirstStep(this)) { - } if (MR::isGreaterEqualStep(this, 60)) { @@ -988,5 +952,4 @@ void TicoFat::exeAfter() { } TicoFat::~TicoFat() { - } diff --git a/src/Game/NPC/TicoGalaxy.cpp b/src/Game/NPC/TicoGalaxy.cpp index f94605e3f..6727598e7 100644 --- a/src/Game/NPC/TicoGalaxy.cpp +++ b/src/Game/NPC/TicoGalaxy.cpp @@ -11,11 +11,12 @@ namespace { static const char* sInfoMessageID = "InformationGalaxy"; }; -TicoGalaxy::TicoGalaxy(const char *pName) : TicoFat(pName) { +TicoGalaxy::TicoGalaxy(const char* pName) + : TicoFat(pName) { mGalaxyName = nullptr; } -void TicoGalaxy::init(const JMapInfoIter &rIter) { +void TicoGalaxy::init(const JMapInfoIter& rIter) { TicoFat::init(rIter); _1F0 = 2; if (MR::isOnTicoGalaxyAlreadyTalk(_1EC)) { @@ -35,7 +36,7 @@ void TicoGalaxy::initAfterPlacement() { void TicoGalaxy::shootStarPiece() { s32 v5 = 5; if (_1E0 <= 5) { - v5 = _1E0; + v5 = _1E0; } if (MR::giftStarPieceToTarget(getSensor("Mouth"), v5)) { @@ -53,7 +54,7 @@ bool TicoGalaxy::enableAppear() { return MR::isAppearGalaxy(mGalaxyName); } -void TicoGalaxy::initStarPieceSaveData(const JMapInfoIter &rIter) { +void TicoGalaxy::initStarPieceSaveData(const JMapInfoIter& rIter) { MR::getJMapInfoArg7WithInit(rIter, &_1EC); mGalaxyName = GameEventFlagTable::getExclamationGalaxyNameFromIndex(_1EC); _1E4 = GameEventFlagTable::getStarPieceNumToOpenExclamationGalaxy(mGalaxyName); @@ -69,8 +70,7 @@ void TicoGalaxy::disappear(bool a1) { if (a1) { MR::onGameEventFlagGalaxyOpen(mGalaxyName); MR::callAppearAllGroupMember(this); - } - else { + } else { mStarRing->appear(); } } @@ -81,5 +81,4 @@ void TicoGalaxy::appearInformation() const { } TicoGalaxy::~TicoGalaxy() { - } diff --git a/src/Game/NPC/TicoRail.cpp b/src/Game/NPC/TicoRail.cpp index 107f85f2a..d3c6d2a6a 100644 --- a/src/Game/NPC/TicoRail.cpp +++ b/src/Game/NPC/TicoRail.cpp @@ -18,9 +18,10 @@ namespace NrvTicoRail { NEW_NERVE(TicoRailNrvTalk, TicoRail, Talk); NEW_NERVE(TicoRailNrvTalkCancel, TicoRail, TalkCancel); NEW_NERVE(TicoRailNrvGoodBye, TicoRail, GoodBye); -}; +}; // namespace NrvTicoRail -TicoRail::TicoRail(const char *pName) : LiveActor(pName) { +TicoRail::TicoRail(const char* pName) + : LiveActor(pName) { _8C.x = 0.0f; _8C.y = 0.0f; _8C.z = 0.0f; @@ -28,7 +29,7 @@ TicoRail::TicoRail(const char *pName) : LiveActor(pName) { mLodCtrl = nullptr; } -void TicoRail::init(const JMapInfoIter &rIter) { +void TicoRail::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("Tico", nullptr, false); MR::connectToSceneNpc(this); @@ -51,8 +52,7 @@ void TicoRail::init(const JMapInfoIter &rIter) { s32 rand = MR::getRandom(0l, 2l); if (rand == 0) { initNerve(&NrvTicoRail::TicoRailNrvWait::sInstance); - } - else if (rand == 1) { + } else if (rand == 1) { initNerve(&NrvTicoRail::TicoRailNrvMove::sInstance); } makeActorAppeared(); @@ -78,11 +78,9 @@ void TicoRail::exeLookAround() { f32 rotate = 0.0f; if (MR::isLessStep(this, 40)) { rotate = 1.2f; - } - else if (MR::isLessStep(this, 120)) { + } else if (MR::isLessStep(this, 120)) { rotate = -1.2f; - } - else if (MR::isLessStep(this, 160)) { + } else if (MR::isLessStep(this, 160)) { rotate = 1.2f; } @@ -90,8 +88,7 @@ void TicoRail::exeLookAround() { if (MR::isStep(this, 160)) { if (MR::getRandom(0l, 2l) == 0) { setNerve(&NrvTicoRail::TicoRailNrvMoveSign::sInstance); - } - else { + } else { setNerve(&NrvTicoRail::TicoRailNrvMoveSignAndTurn::sInstance); } } @@ -105,9 +102,9 @@ void TicoRail::exeMoveSign() { } } - f32 rate = MR::calcNerveRate(this, MR::getBckFrameMax(this)); + f32 rate = MR::calcNerveRate(this, MR::getBckFrameMax(this)); const TVec3f* railDirection = &MR::getRailDirection(this); - TVec3f reversedDir; + TVec3f reversedDir; JMathInlineVEC::PSVECNegate(railDirection, &reversedDir); MR::blendVec(&_8C, reversedDir, MR::getRailDirection(this), rate); if (MR::isBckStopped(this)) { @@ -233,13 +230,11 @@ void TicoRail::control() { mLodCtrl->update(); } -void TicoRail::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void TicoRail::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver)) { MR::sendMsgPush(pReceiver, pSender); - } - else if (MR::isSensorNpc(pReceiver)) { - bool v6 = isNerve(&NrvTicoRail::TicoRailNrvTalkStart::sInstance) || isNerve(&NrvTicoRail::TicoRailNrvTalk::sInstance) - || isNerve(&NrvTicoRail::TicoRailNrvTalkCancel::sInstance) || isNerve(&NrvTicoRail::TicoRailNrvGoodBye::sInstance); + } else if (MR::isSensorNpc(pReceiver)) { + bool v6 = isNerve(&NrvTicoRail::TicoRailNrvTalkStart::sInstance) || isNerve(&NrvTicoRail::TicoRailNrvTalk::sInstance) || isNerve(&NrvTicoRail::TicoRailNrvTalkCancel::sInstance) || isNerve(&NrvTicoRail::TicoRailNrvGoodBye::sInstance); if (v6) { return; @@ -248,23 +243,18 @@ void TicoRail::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { if (MR::sendArbitraryMsg(ACTMES_TICO_RAIL_TOUCH, pReceiver, pSender)) { _98 = pReceiver->mHost; setNerve(&NrvTicoRail::TicoRailNrvTalkStart::sInstance); - } - else if (!MR::isExistRail(pReceiver->mHost) || (MR::isRailGoingToEnd(this) != MR::isRailGoingToEnd(pReceiver->mHost))) { + } else if (!MR::isExistRail(pReceiver->mHost) || (MR::isRailGoingToEnd(this) != MR::isRailGoingToEnd(pReceiver->mHost))) { setNerve(&NrvTicoRail::TicoRailNrvTalkCancel::sInstance); } } } - -bool TicoRail::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool TicoRail::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (msg != ACTMES_TICO_RAIL_TOUCH) { return false; } - bool v8 = isNerve(&NrvTicoRail::TicoRailNrvTalkStart::sInstance) - || isNerve(&NrvTicoRail::TicoRailNrvTalk::sInstance) - || isNerve(&NrvTicoRail::TicoRailNrvTalkCancel::sInstance) - || isNerve(&NrvTicoRail::TicoRailNrvGoodBye::sInstance); + bool v8 = isNerve(&NrvTicoRail::TicoRailNrvTalkStart::sInstance) || isNerve(&NrvTicoRail::TicoRailNrvTalk::sInstance) || isNerve(&NrvTicoRail::TicoRailNrvTalkCancel::sInstance) || isNerve(&NrvTicoRail::TicoRailNrvGoodBye::sInstance); if (v8) { return false; @@ -288,17 +278,15 @@ bool TicoRail::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver return true; } -bool TicoRail::isSameRailActor(const LiveActor *pActor) const { +bool TicoRail::isSameRailActor(const LiveActor* pActor) const { if (!MR::isExistRail(pActor)) { return false; } - bool ret = MR::getRailPointPosStart(this) == MR::getRailPointPosStart(pActor) - && (MR::getRailPointPosEnd(this) == MR::getRailPointPosEnd(pActor)); + bool ret = MR::getRailPointPosStart(this) == MR::getRailPointPosStart(pActor) && (MR::getRailPointPosEnd(this) == MR::getRailPointPosEnd(pActor)); return ret; } TicoRail::~TicoRail() { - } diff --git a/src/Game/NPC/TicoReading.cpp b/src/Game/NPC/TicoReading.cpp index 1edcc4994..73e6d263b 100644 --- a/src/Game/NPC/TicoReading.cpp +++ b/src/Game/NPC/TicoReading.cpp @@ -8,11 +8,11 @@ namespace NrvTicoReading { NEW_NERVE(TicoReadingNrvWait, TicoReading, Wait); }; -TicoReading::TicoReading(const char *pName) : LiveActor(pName) { - +TicoReading::TicoReading(const char* pName) + : LiveActor(pName) { } -void TicoReading::init(const JMapInfoIter &rIter) { +void TicoReading::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("Tico", nullptr, false); MR::connectToSceneNpc(this); @@ -46,5 +46,4 @@ void TicoReading::exeWait() { } TicoReading::~TicoReading() { - } diff --git a/src/Game/NPC/TicoShop.cpp b/src/Game/NPC/TicoShop.cpp index 77cabcb25..1b2798aa1 100644 --- a/src/Game/NPC/TicoShop.cpp +++ b/src/Game/NPC/TicoShop.cpp @@ -7,7 +7,8 @@ namespace NrvTicoShop { NEW_NERVE(TicoShopNrvDemo, TicoShop, Demo); }; -TicoShop::TicoShop(const char *pName) : TicoComet(pName) { +TicoShop::TicoShop(const char* pName) + : TicoComet(pName) { mOneUp = nullptr; mLifeUp = nullptr; mChoseOneUp = false; @@ -26,7 +27,7 @@ void TicoShop::kill() { NPCActor::kill(); } -void TicoShop::init(const JMapInfoIter &rIter) { +void TicoShop::init(const JMapInfoIter& rIter) { NPCActorCaps caps("TicoShop"); NPCActorItem item("TicoShop"); item._4 = ""; @@ -129,5 +130,4 @@ void TicoShop::exeDemo() { } TicoShop::~TicoShop() { - } diff --git a/src/Game/NPC/TicoStarRing.cpp b/src/Game/NPC/TicoStarRing.cpp index 9d6cfc699..71dbaf001 100644 --- a/src/Game/NPC/TicoStarRing.cpp +++ b/src/Game/NPC/TicoStarRing.cpp @@ -8,17 +8,17 @@ namespace NrvTicoStarRing { NEW_NERVE(TicoStarRingNrvWait, TicoStarRing, Wait); }; -TicoStarRing::TicoStarRing(const char *pName) : Tico(pName) { +TicoStarRing::TicoStarRing(const char* pName) + : Tico(pName) { mGalaxy = nullptr; _194 = nullptr; mTicoGalaxy = nullptr; } -void TicoStarRing::init(const JMapInfoIter &rIter) { +void TicoStarRing::init(const JMapInfoIter& rIter) { if (MR::isValidInfo(rIter)) { initBase(rIter, 2); - } - else { + } else { initBase(5); } @@ -28,26 +28,25 @@ void TicoStarRing::init(const JMapInfoIter &rIter) { s32 galaxy = 0; MR::getJMapInfoArg0NoInit(rIter, &galaxy); switch (galaxy) { - case 0: - mGalaxy = "TamakoroExLv2Galaxy"; - break; - case 1: - mGalaxy = "SurfingLv2Galaxy"; - break; - case 2: - mGalaxy = "CubeBubbleExLv2Galaxy"; - break; - case 3: - mGalaxy = "PeachCastleFinalGalaxy"; - break; + case 0: + mGalaxy = "TamakoroExLv2Galaxy"; + break; + case 1: + mGalaxy = "SurfingLv2Galaxy"; + break; + case 2: + mGalaxy = "CubeBubbleExLv2Galaxy"; + break; + case 3: + mGalaxy = "PeachCastleFinalGalaxy"; + break; } MR::setMessageArgToCurrentGalaxyName(mMsgCtrl, mGalaxy); if (!MR::isAppearGalaxy(mGalaxy)) { makeActorDead(); } - } - else { + } else { mGalaxy = "unknown"; } @@ -67,7 +66,7 @@ void TicoStarRing::kill() { } } -void TicoStarRing::initialize(LiveActor *pGalaxy, LiveActor *a2, const char *pGalaxyName) { +void TicoStarRing::initialize(LiveActor* pGalaxy, LiveActor* a2, const char* pGalaxyName) { mTicoGalaxy = pGalaxy; _194 = a2; mGalaxy = pGalaxyName; @@ -86,5 +85,4 @@ void TicoStarRing::exeWait() { } TicoStarRing::~TicoStarRing() { - } diff --git a/src/Game/NPC/TimeAttackEventKeeper.cpp b/src/Game/NPC/TimeAttackEventKeeper.cpp index 0eacf99aa..2d0c93fd2 100644 --- a/src/Game/NPC/TimeAttackEventKeeper.cpp +++ b/src/Game/NPC/TimeAttackEventKeeper.cpp @@ -1,14 +1,11 @@ #include "Game/LiveActor/LiveActor.hpp" #include "Game/NPC/TimeAttackEventKeeper.hpp" -TimeAttackEventKeeper::TimeAttackEventKeeper() : - _0(nullptr) -{ - +TimeAttackEventKeeper::TimeAttackEventKeeper() + : _0(nullptr) { } void TimeAttackEventKeeper::init(bool) { - } void TimeAttackEventKeeper::startEventIfExecute() { diff --git a/src/Game/NPC/TrickRabbit.cpp b/src/Game/NPC/TrickRabbit.cpp index 58e8b1524..fc2ade678 100644 --- a/src/Game/NPC/TrickRabbit.cpp +++ b/src/Game/NPC/TrickRabbit.cpp @@ -50,12 +50,13 @@ //_E0(0), //_E1(0), //mParabolicPath(new ParabolicPath) { -// +// //} -TrickRabbit::TrickRabbit(const char* pName) : LiveActor(pName), -_8C(0.0f, 0.0f, 0.0f, 1.0f), -_9C(0, 0, 1) { +TrickRabbit::TrickRabbit(const char* pName) + : LiveActor(pName), + _8C(0.0f, 0.0f, 0.0f, 1.0f), + _9C(0, 0, 1) { mRabbitStateWaitStart = nullptr; mRabbitStateCaught = nullptr; mMultiEventCamera = nullptr; @@ -88,12 +89,12 @@ void TrickRabbit::init(const JMapInfoIter& rIter) { MR::onEmitEffectSyncClipping(this, "Light"); MR::onForceDeleteEffectSyncClipping(this, "Light"); f32 f = mScale.x; - MR::initShadowVolumeSphere(this, f*45.0f); + MR::initShadowVolumeSphere(this, f * 45.0f); mFootPrint = TrickRabbitUtil::createRabbitFootPrint(this); initRoute(rIter); f32 zero = 0.0f; - mTalkMessageCtrl = MR::createTalkCtrlDirect(this, rIter, "TrickRabbit", TVec3f(0.0f,120.0f,0.0f), 0); + mTalkMessageCtrl = MR::createTalkCtrlDirect(this, rIter, "TrickRabbit", TVec3f(0.0f, 120.0f, 0.0f), 0); initDemoCamera(rIter); initState(); initTimer(); @@ -131,7 +132,7 @@ void TrickRabbit::initSensor() { void TrickRabbit::initBind() { f32 f = mScale.x; - initBinder(f*60.0f, f*60.0f, 0); + initBinder(f * 60.0f, f * 60.0f, 0); MR::onCalcGravity(this); } @@ -142,7 +143,7 @@ void TrickRabbit::initRoute(const JMapInfoIter& rIter) { void TrickRabbit::initDemoCamera(const JMapInfoIter& rIter) { ActorCameraInfo stack_8 = ActorCameraInfo(rIter); - + if (stack_8.mCameraSetID == -1) return; @@ -175,10 +176,9 @@ void TrickRabbit::calcAndSetBaseMtx() { void TrickRabbit::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (MR::isSensorPlayer(pReceiver)) { if (isCaughtable()) { - if (pSender == getSensor("Catch")) + if (pSender == getSensor("Catch")) requestCaught(); - } - else + } else MR::sendMsgPush(pReceiver, pSender); } } @@ -197,7 +197,7 @@ bool TrickRabbit::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSensor* if (isNerve(&NrvTrickRabbit::TrickRabbitNrvWaitStart::sInstance) || isNerve(&NrvTrickRabbit::TrickRabbitNrvGiveUp::sInstance)) { return mRabbitStateWaitStart->receiveMsgPlayerAttack(msg, pSender, pReceiver); } - + if (MR::isMsgStarPieceAttack(msg)) { MR::limitedStarPieceHitSound(); MR::startSound(this, "SE_SM_RABBIT_STAR_PIECE_HIT", -1, -1); @@ -235,7 +235,7 @@ bool TrickRabbit::receiveMsgTrample() { if (isNerve(&NrvTrickRabbit::TrickRabbitNrvJump::sInstance) && MR::isGreaterStep(this, 1)) l = 1; - if (l) + if (l) setNerve(&NrvTrickRabbit::TrickRabbitNrvFallDown::sInstance); else setNerve(&NrvTrickRabbit::TrickRabbitNrvTumble::sInstance); @@ -249,7 +249,7 @@ bool TrickRabbit::requestCaught() { MR::showModel(this); MR::validateShadow(this, 0); } - + MR::invalidateClipping(this); MR::forwardNode(mTalkMessageCtrl); setNerve(&NrvTrickRabbit::TrickRabbitNrvCaught::sInstance); @@ -272,12 +272,10 @@ bool TrickRabbit::tryStartDemoRunnaway() { MR::hideModelAndOnCalcAnim(this); MR::invalidateShadow(this, 0); } - } - else { + } else { setNerve(&NrvTrickRabbit::TrickRabbitNrvDemoEnd::sInstance); } return true; - } return false; @@ -298,7 +296,7 @@ bool TrickRabbit::tryRunaway() { ::RunnawayNodeSelector stack_8 = ::RunnawayNodeSelector(); MR::moveNodeNearPosition(mRailGraphIter, mPosition, -1.0f, &stack_8); - TVec3f stack_C(mPosition-*MR::getPlayerPos()); + TVec3f stack_C(mPosition - *MR::getPlayerPos()); selectEdgeRunnaway(mRailGraphIter, stack_C, -0.30000001f); setNerve(&NrvTrickRabbit::TrickRabbitNrvRunaway::sInstance); return true; @@ -310,9 +308,9 @@ bool TrickRabbit::tryBrakeTurn() { if (MR::isGreaterStep(this, 0x3C) && MR::isNearPlayer(this, 600.0f)) { TVec3f stack_2C; TVec3f stack_20; - TVec3f stack_14(*MR::getPlayerPos()-mPosition); + TVec3f stack_14(*MR::getPlayerPos() - mPosition); stack_2C.set(stack_14); - TVec3f stack_8(*MR::getNextNodePosition(mRailGraphIter)-mPosition); + TVec3f stack_8(*MR::getNextNodePosition(mRailGraphIter) - mPosition); stack_20.set(stack_8); MR::normalizeOrZero(&stack_2C); MR::normalizeOrZero(&stack_20); @@ -334,7 +332,6 @@ bool TrickRabbit::tryBrakeTurnEnd() { return false; } - bool TrickRabbit::tryStop() { bool isNear = !MR::isNearPlayer(this, 1500.0f); if (isNear) { @@ -458,7 +455,7 @@ void TrickRabbit::exeWaitStart() { mRabbitStateWaitStart->setTalkActionName("StartEvent"); mRabbitStateWaitStart->_1C = true; } - + if (MR::updateActorState(this, (ActorStateBaseInterface*)mRabbitStateWaitStart) && !tryStartDemoRunnaway()) setNerve(&NrvTrickRabbit::TrickRabbitNrvTryStartDemoRunnaway::sInstance); } @@ -493,7 +490,7 @@ void TrickRabbit::exeDemoJump() { TVec3f stack_14(mPosition); doJump(); if (tryDemoJump()) { - TVec3f stack_8(mPosition-stack_14); + TVec3f stack_8(mPosition - stack_14); mVelocity.set(stack_8); } } @@ -507,7 +504,7 @@ void TrickRabbit::exeDemoEnd() { } } doWait(); - if (MR::isStep(this,0x1E)) { + if (MR::isStep(this, 0x1E)) { endDemoRunnaway(); } } @@ -518,7 +515,7 @@ void TrickRabbit::exeWait() { MR::showModel(this); MR::validateShadow(this, 0); } - + MR::startAction(this, "FollowMe"); } @@ -532,7 +529,7 @@ void TrickRabbit::exeRunaway() { doRunaway(); if (_D0 < 125.0f) { MR::moveNextNode(mRailGraphIter); - TVec3f stack_8(mPosition-*MR::getPlayerPos()); + TVec3f stack_8(mPosition - *MR::getPlayerPos()); selectEdgeRunnaway(mRailGraphIter, stack_8, 0.0f); } @@ -551,7 +548,7 @@ void TrickRabbit::exeBrakeTurn() { MR::attenuateVelocity(this, 0.93000001f); MR::reboundVelocityFromCollision(this, 0.0f, 0.0f, 1.0f); - TVec3f stack_8(*MR::getNextNodePosition(mRailGraphIter)-mPosition); + TVec3f stack_8(*MR::getNextNodePosition(mRailGraphIter) - mPosition); MR::turnVecToVecCosOnPlane(&_9C, stack_8, mGravity, -1.0f); if (tryBrakeTurnEnd()) @@ -570,14 +567,14 @@ void TrickRabbit::exeJumpStart() { } void TrickRabbit::exeJump() { - if (MR::isFirstStep(this)) + if (MR::isFirstStep(this)) setUpJumpParamFromJMap(); TVec3f stack_14(mPosition); doJump(); if (tryJumpEnd()) { - TVec3f stack_8(mPosition-stack_14); + TVec3f stack_8(mPosition - stack_14); mVelocity.set(stack_8); } } @@ -589,10 +586,9 @@ void TrickRabbit::exeFallDown() { if (!MR::isBindedGround(this)) { if (!MR::isBindedGround(this)) MR::addVelocityToGravity(this, 1.0f); - + MR::attenuateVelocity(this, 0.85000002f); - } - else + } else MR::attenuateVelocity(this, 0.85000002f); MR::reboundVelocityFromCollision(this, 0.0f, 0.0f, 1.0f); @@ -629,7 +625,7 @@ void TrickRabbit::exeComebackRoute() { doJump(); if (tryJumpEnd()) { - TVec3f stack_8(mPosition-stack_14); + TVec3f stack_8(mPosition - stack_14); mVelocity.set(stack_8); } } @@ -645,11 +641,9 @@ void TrickRabbit::exeTumble() { MR::attenuateVelocity(this, 0.99000001f); MR::reboundVelocityFromCollision(this, 0.0f, 0.0f, 1.0f); - } - else + } else MR::zeroVelocity(this); - if (tryEndTumble()) return; } @@ -677,25 +671,25 @@ void TrickRabbit::exeWaitPowerStarDemo() { if (MR::isFirstStep(this)) { MR::endDemo(this, "捕まり"); MR::startAfterBossBGM(); - TVec3f stack_14(mPosition-(mGravity*200.0f)); + TVec3f stack_14(mPosition - (mGravity * 200.0f)); MR::requestAppearPowerStar(this, stack_14); MR::startAction(this, "Wait"); mFootPrint->clear(); } MR::zeroVelocity(this); - + if (!MR::isOnGround(this) && !MR::isBindedGround(this)) MR::addVelocityToGravity(this, 1.0f); if (MR::isNearPlayer(this, 70.0f)) { MR::getPlayerFrontVec(&stack_20); - mVelocity+=stack_20; + mVelocity += stack_20; } MR::reboundVelocityFromCollision(this, 0.0f, 0.0f, 1.0f); MR::turnDirectionToPlayerDegreeHorizon(this, &_9C, 30.0f); - + if (tryEndPowerStarDemo()) MR::forwardNode(mTalkMessageCtrl); } @@ -709,7 +703,7 @@ void TrickRabbit::exeGiveUp() { } void TrickRabbit::doWait() { - if (!MR::isBindedGround(this)) + if (!MR::isBindedGround(this)) MR::addVelocityToGravity(this, 1.0f); MR::attenuateVelocity(this, 0.85000002f); @@ -722,38 +716,38 @@ void TrickRabbit::doRunaway() { MR::startAction(this, "Run"); if (MR::checkPassBckFrame(this, 0.0f)) - updateFootPrint(); + updateFootPrint(); if (MR::checkPassBckFrame(this, 3.0f)) MR::startSound(this, "SE_SM_RABBIT_JUMP", -1, -1); TVec3f stack_14(*MR::getNextNodePosition(mRailGraphIter)); - f32 arg = MR::getSelectEdgeArg1(mRailGraphIter); - arg=arg/100.0f; + f32 arg = MR::getSelectEdgeArg1(mRailGraphIter); + arg = arg / 100.0f; if (arg < 0.0f) arg = 1.0f; - if (!MR::isBindedGround(this)) + if (!MR::isBindedGround(this)) MR::addVelocityToGravity(this, 1.0f); - TVec3f stack_8(stack_14-mPosition); - addMovingAccel(stack_8, 2.4000001f*arg); + TVec3f stack_8(stack_14 - mPosition); + addMovingAccel(stack_8, 2.4000001f * arg); addKeepRouteRange(1.0f, 100.0f, 400.0f); MR::attenuateVelocity(this, 0.85000002f); MR::reboundVelocityFromCollision(this, 0.0f, 0.0f, 1.0f); } void TrickRabbit::doJumpStart() { - if (MR::isFirstStep(this)) + if (MR::isFirstStep(this)) MR::startAction(this, "JumpStart"); updateFootPrint(); - if (MR::isBckOneTimeAndStopped(this)) + if (MR::isBckOneTimeAndStopped(this)) MR::startAction(this, "JumpStartLoop"); - TVec3f stack_8(*MR::getNextNodePosition(mRailGraphIter)-mPosition); + TVec3f stack_8(*MR::getNextNodePosition(mRailGraphIter) - mPosition); MR::turnVecToVecCosOnPlane(&_9C, stack_8, mGravity, 0.99000001f); if (!MR::isBindedGround(this)) @@ -769,12 +763,12 @@ void TrickRabbit::doJump() { MR::startSound(this, "SE_SM_RABBIT_JUMP", -1, -1); MR::offBind(this); } - MR::turnVecToVecCosOnPlane(&_9C, (*MR::getNextNodePosition(mRailGraphIter)-mPosition), mGravity, 0.89999998f); + MR::turnVecToVecCosOnPlane(&_9C, (*MR::getNextNodePosition(mRailGraphIter) - mPosition), mGravity, 0.89999998f); TVec3f stack_5C; mParabolicPath->calcPosition(&stack_5C, MR::calcNerveRate(this, _CC)); - if (!checkDivingThicket((mPosition-(mGravity*70.0f)), stack_5C-mPosition)) - checkDivingThicket((stack_5C-(mGravity*70.0f)), (mPosition-stack_5C)); + if (!checkDivingThicket((mPosition - (mGravity * 70.0f)), stack_5C - mPosition)) + checkDivingThicket((stack_5C - (mGravity * 70.0f)), (mPosition - stack_5C)); mPosition.set(stack_5C); } @@ -790,8 +784,8 @@ void TrickRabbit::tearDownWait() { bool TrickRabbit::checkDivingThicket(const TVec3f& rVec1, const TVec3f& rVec2) { Triangle stack_44 = Triangle(); - TPos3f stack_14; - TVec3f stack_8; + TPos3f stack_14; + TVec3f stack_8; if (!MR::getFirstPolyOnLineToMap(&stack_8, &stack_44, rVec1, rVec2)) return false; @@ -805,14 +799,13 @@ bool TrickRabbit::checkDivingThicket(const TVec3f& rVec1, const TVec3f& rVec2) { bool TrickRabbit::selectEdgeStartEvent(RailGraphIter* pIter) { bool b = false; pIter->watchStartEdge(); - while(!pIter->isWatchEndEdge()) { + while (!pIter->isWatchEndEdge()) { if (!MR::isWatchedPrevEdge(pIter) && MR::getWatchEdgeArg7(pIter) < -1) { pIter->selectEdge(); b = true; } - - pIter->watchNextEdge(); + pIter->watchNextEdge(); }; return b; } @@ -835,17 +828,16 @@ void TrickRabbit::selectEdgeRunnaway(RailGraphIter* pIter, const TVec3f& rVec, f MR::calcWatchEdgeDirection(pIter, &stack_8); f32 dot = stack_8.dot(stack_14); v17 = 1; - + if (arg != -1) { if (arg != _D8) v17 = 0; } - + bool v18 = dot > f; bool isWatched = !MR::isWatchedPrevEdge(pIter); bool v20 = 0; - if (!r29 || v17) { if (!r29 && v17) v20 = 1; @@ -855,16 +847,16 @@ void TrickRabbit::selectEdgeRunnaway(RailGraphIter* pIter, const TVec3f& rVec, f goto endif; } if (!r28 && v18) { - v20 = 1; - } + v20 = 1; + } } if (!v20) { - if (r27 && !isWatched){ + if (r27 && !isWatched) { goto endif; } if (!r27 && isWatched) - v20 = 1; + v20 = 1; } if (!v20) { @@ -881,7 +873,7 @@ void TrickRabbit::selectEdgeRunnaway(RailGraphIter* pIter, const TVec3f& rVec, f } } } - endif: + endif: pIter->watchNextEdge(); } } @@ -896,38 +888,37 @@ void TrickRabbit::controlRouteLevel() { if (!_E0) return; - if (_D8 ==_DC) + if (_D8 == _DC) return; if (!_D4) { _D8 = _DC; _E0 = false; - } - else { - _D4 -=1; + } else { + _D4 -= 1; } } void TrickRabbit::addMovingAccel(const TVec3f& rVec, f32 f) { TVec3f stack_20(mGravity); - f32 dot = stack_20.dot(rVec); + f32 dot = stack_20.dot(rVec); TVec3f stack_14; JMAVECScaleAdd(&stack_20, &rVec, &stack_14, -dot); MR::separateScalarAndDirection(&_D0, &stack_14, stack_14); - if (!MR::isNearZero(stack_14, 0.001f)) + if (!MR::isNearZero(stack_14, 0.001f)) MR::turnVecToVecCos(&_9C, _9C, stack_14, 0.98000002f, stack_20, 0.02f); - TVec3f stack_8(_9C*f); - mVelocity+=stack_8; + TVec3f stack_8(_9C * f); + mVelocity += stack_8; } void TrickRabbit::addKeepRouteRange(f32 f1, f32 f2, f32 f3) { TVec3f* nextNodePos = MR::getNextNodePosition(mRailGraphIter); TVec3f* currentNodePos = MR::getCurrentNodePosition(mRailGraphIter); - TVec3f stack_3C; + TVec3f stack_3C; - f32 f = MR::getFootPoint(*currentNodePos,*nextNodePos, mPosition, &stack_3C); + f32 f = MR::getFootPoint(*currentNodePos, *nextNodePos, mPosition, &stack_3C); if (f < 0.0f) { stack_3C.set(*MR::getCurrentNodePosition(mRailGraphIter)); } @@ -935,15 +926,15 @@ void TrickRabbit::addKeepRouteRange(f32 f1, f32 f2, f32 f3) { stack_3C.set(*MR::getNextNodePosition(mRailGraphIter)); } - TVec3f stack_30; - TVec3f stack_24(stack_3C-mPosition); + TVec3f stack_30; + TVec3f stack_24(stack_3C - mPosition); TVec3f* grav = &mGravity; - f32 dot = grav->dot(stack_24); + f32 dot = grav->dot(stack_24); JMAVECScaleAdd(grav, &stack_24, &stack_30, dot); f32 scalar; MR::separateScalarAndDirection(&scalar, &stack_30, stack_30); f32 norm = MR::normalize(scalar, f2, f3); - mVelocity+=((stack_30*norm)*f1); + mVelocity += ((stack_30 * norm) * f1); } void TrickRabbit::updateFootPrint() { @@ -998,9 +989,8 @@ void TrickRabbit::setUpJumpParam() { _CC = calcDefaultJumpTime(); } - void TrickRabbit::setUpJumpParamFromJMap() { - f32 f = calcJumpHeight(); + f32 f = calcJumpHeight(); TVec3f stack_8(-mGravity); mParabolicPath->initFromUpVectorAddHeight(mPosition, *MR::getNextNodePosition(mRailGraphIter), stack_8, f); _CC = calcJumpTime(); @@ -1012,14 +1002,14 @@ s32 TrickRabbit::calcDefaultJumpTime() const { if (f <= 0) return 0; else - return (s32)(1/f); + return (s32)(1 / f); } s32 TrickRabbit::calcJumpStartTime() const { s32 arg = MR::getSelectEdgeArg1(mRailGraphIter); if (arg >= 0) return arg; - else + else return 0x14; } @@ -1034,8 +1024,7 @@ f32 TrickRabbit::calcJumpHeight() const { f32 arg = (f32)MR::getSelectEdgeArg3(mRailGraphIter); if (arg < 0.0f) { return 100.0f; - } - else { + } else { return arg; } } @@ -1055,21 +1044,18 @@ void TrickRabbit::updateTime() { if (v > 0) { if (v <= 120) { - if (!(v%60)) { + if (!(v % 60)) { MR::startSystemSE("SE_SY_E3_TIMER_COUNT_4", -1, -1); } - } - else if (v <= 360) { - if (!(v%60)){ + } else if (v <= 360) { + if (!(v % 60)) { MR::startSystemSE("SE_SY_E3_TIMER_COUNT_2", -1, -1); } - } - else if (v <= 1200) { - if (!(v%60)) { + } else if (v <= 1200) { + if (!(v % 60)) { MR::startSystemSE("SE_SY_E3_TIMER_COUNT_1", -1, -1); } } - } if (!_E4) { MR::startSoundPlayer("SE_PM_LAST_DAMAGE", -1); @@ -1077,7 +1063,6 @@ void TrickRabbit::updateTime() { } } - namespace NrvTrickRabbit { void TrickRabbitNrvComebackRoute::executeOnEnd(Spine* pSpine) const { TrickRabbit* pThis = (TrickRabbit*)pSpine->mExecutor; @@ -1153,4 +1138,4 @@ namespace NrvTrickRabbit { TrickRabbitNrvCaught(TrickRabbitNrvCaught::sInstance); TrickRabbitNrvWaitPowerStarDemo(TrickRabbitNrvWaitPowerStarDemo::sInstance); TrickRabbitNrvGiveUp(TrickRabbitNrvGiveUp::sInstance); -} +} // namespace NrvTrickRabbit diff --git a/src/Game/NPC/TrickRabbitFreeRun.cpp b/src/Game/NPC/TrickRabbitFreeRun.cpp index 6a4fe8a26..9c7bce87a 100644 --- a/src/Game/NPC/TrickRabbitFreeRun.cpp +++ b/src/Game/NPC/TrickRabbitFreeRun.cpp @@ -1,16 +1,16 @@ #include "Game/NPC/TrickRabbitFreeRun.hpp" -TrickRabbitFreeRun::TrickRabbitFreeRun(const char* pName) : LiveActor(pName), -_8C(0.0f, 0.0f, 0.0f, 1.0f), -_9C(0.0f, 0.0f, 1.0f), -_A8(0), -_AC(0), -_B0(0), -_B4(0), -mTalkCtrl(0), -mFootPrint(0), -mSpotMarkLight(0) { - +TrickRabbitFreeRun::TrickRabbitFreeRun(const char* pName) + : LiveActor(pName), + _8C(0.0f, 0.0f, 0.0f, 1.0f), + _9C(0.0f, 0.0f, 1.0f), + _A8(0), + _AC(0), + _B0(0), + _B4(0), + mTalkCtrl(0), + mFootPrint(0), + mSpotMarkLight(0) { } void TrickRabbitFreeRun::init(const JMapInfoIter& rIter) { diff --git a/src/Game/NWC24/LuigiMailDirector.cpp b/src/Game/NWC24/LuigiMailDirector.cpp index a7351f082..15537d97d 100644 --- a/src/Game/NWC24/LuigiMailDirector.cpp +++ b/src/Game/NWC24/LuigiMailDirector.cpp @@ -11,26 +11,23 @@ namespace { const char* cLostMessageID = "KinopioEmergencyLetter_000"; const char* cFoundMessageID = "KinopioEmergencyLetter_001"; -}; +}; // namespace -LuigiMailDirector::LuigiMailDirector() : - mLostMessageLength(0), - mLostMessage(nullptr), - mFoundMessageLength(0), - mFoundMessage(nullptr), - mLostMessageNum(0), - mFoundMessageNum(0) -{} +LuigiMailDirector::LuigiMailDirector() + : mLostMessageLength(0), + mLostMessage(nullptr), + mFoundMessageLength(0), + mFoundMessage(nullptr), + mLostMessageNum(0), + mFoundMessageNum(0) {} void LuigiMailDirector::initAfterResourceLoaded() { - u32 lostMessageLength = MR::getStringLengthWithMessageTag(MR::getGameMessageDirect(cLostMessageID)) - + FileSelectFunc::getMiiNameBufferSize(); + u32 lostMessageLength = MR::getStringLengthWithMessageTag(MR::getGameMessageDirect(cLostMessageID)) + FileSelectFunc::getMiiNameBufferSize(); mLostMessageLength = lostMessageLength; mLostMessage = new wchar_t[lostMessageLength]; - u32 foundMessageLength = MR::getStringLengthWithMessageTag(MR::getGameMessageDirect(cFoundMessageID)) - + FileSelectFunc::getMiiNameBufferSize(); + u32 foundMessageLength = MR::getStringLengthWithMessageTag(MR::getGameMessageDirect(cFoundMessageID)) + FileSelectFunc::getMiiNameBufferSize(); mFoundMessageLength = foundMessageLength; mFoundMessage = new wchar_t[foundMessageLength]; @@ -108,8 +105,7 @@ void LuigiMailDirector::sendMail(u8 delayHours) { if (mLostMessageNum != 0) { sendMailObj.setMessageDirect(mLostMessage); - } - else if (mFoundMessageNum != 0) { + } else if (mFoundMessageNum != 0) { sendMailObj.setMessageDirect(mFoundMessage); } @@ -155,23 +151,21 @@ void LuigiMailDirector::writeSendSize() { prepareMessage(); const u16* pMailSender = reinterpret_cast(MR::getMailSender("WiiMessageFromKinopio")); - u32 mailSize = 0; - s32 lostMessageNum = mLostMessageNum; - s32 foundMessageNum = mFoundMessageNum; + u32 mailSize = 0; + s32 lostMessageNum = mLostMessageNum; + s32 foundMessageNum = mFoundMessageNum; if (lostMessageNum != 0 || foundMessageNum != 0) { if (lostMessageNum != 0) { mailSize = MR::calcWiiMailSize(pMailSender, reinterpret_cast(mLostMessage), 0, 0); - } - else if (foundMessageNum != 0) { + } else if (foundMessageNum != 0) { mailSize = MR::calcWiiMailSize(pMailSender, reinterpret_cast(mFoundMessage), 0, 0); } } if (MR::checkWiiMailLimit(mailSize)) { MR::updateWiiMailSentSize(mailSize); - } - else { + } else { mLostMessageNum = 0; mFoundMessageNum = 0; } @@ -205,11 +199,9 @@ u8 LuigiMailDirector::calcDelayHours() const { // FIXME: Missing addi and clrlwi instructions within return statements. if (td.hour >= 1 && td.hour < 13) { return 13 - td.hour; - } - else if (td.hour < 1) { + } else if (td.hour < 1) { return 1 - td.hour; - } - else { + } else { return 25 - td.hour; } } diff --git a/src/Game/NWC24/NWC24Function.cpp b/src/Game/NWC24/NWC24Function.cpp index 1b9701d5d..f97068d0a 100644 --- a/src/Game/NWC24/NWC24Function.cpp +++ b/src/Game/NWC24/NWC24Function.cpp @@ -12,7 +12,7 @@ namespace { /// @param[out] pTicks An optional pointer to initialize with the current number of ticks. /// @return `true` if the most recent message was sent today, `false` otherwise. bool isLastUpdateToday(OSTime* pTicks) { - OSTime ticks; + OSTime ticks; OSCalendarTime tdSent; OSCalendarTime td; @@ -26,11 +26,9 @@ namespace { *pTicks = ticks; } - return td.year == tdSent.year - && td.mon == tdSent.mon - && td.mday == tdSent.mday; + return td.year == tdSent.year && td.mon == tdSent.mon && td.mday == tdSent.mday; } -}; +}; // namespace namespace MR { // calcWiiMailSize @@ -46,7 +44,7 @@ namespace MR { } void updateWiiMailSentSize(u32 mailSize) { - u32 sentBytes = GameDataFunction::getSysConfigFileSentBytes(); + u32 sentBytes = GameDataFunction::getSysConfigFileSentBytes(); OSTime ticks; if (!isLastUpdateToday(&ticks)) { @@ -62,4 +60,4 @@ namespace MR { const wchar_t* getMailSender(const char* pMessageId) { return MR::getGameMessageDirect(pMessageId); } -}; +}; // namespace MR diff --git a/src/Game/NWC24/NWC24Messenger.cpp b/src/Game/NWC24/NWC24Messenger.cpp index b18324408..bdcd51b7e 100644 --- a/src/Game/NWC24/NWC24Messenger.cpp +++ b/src/Game/NWC24/NWC24Messenger.cpp @@ -23,11 +23,10 @@ namespace { NWC24Messenger* getNWC24Messenger() NO_INLINE { return SingletonHolder::get()->mSequenceDirector->mNWC24Messenger; } -}; +}; // namespace -NWC24Messenger::NWC24Messenger(const char* pName) : - NameObj(pName) -{ +NWC24Messenger::NWC24Messenger(const char* pName) + : NameObj(pName) { mForegroundTask = new NWC24MessengerSub::SendTask(); mBackgroundTaskArray = new NWC24MessengerSub::SendTask[BACKGROUND_TASK_NUM]; mSendState = new NWC24MessengerSub::SendState(this); @@ -52,16 +51,15 @@ void NWC24Messenger::draw() const { } void NWC24Messenger::send( - const char* pTaskName, + const char* pTaskName, const wchar_t* pMessage, const wchar_t* pAltName, - const u8* pPicture, - u32 pictureSize, - bool isBG, - bool isMsgLedPattern, - u16 tag, - u8 delayHours) -{ + const u8* pPicture, + u32 pictureSize, + bool isBG, + bool isMsgLedPattern, + u16 tag, + u8 delayHours) { if (_1C) { return; } @@ -78,8 +76,7 @@ void NWC24Messenger::send( } pTask = &mBackgroundTaskArray[i]; - } - else { + } else { pTask = mForegroundTask; } @@ -151,7 +148,7 @@ void NWC24Messenger::prepareReset() { bool NWC24Messenger::isRunning() const { NWC24Err err; - u32 value; + u32 value; return !mSystem->isSent(&err, &value); } @@ -164,16 +161,12 @@ void NWC24Messenger::reset() { } NWC24MessengerSub::SendTask* NWC24Messenger::findTask(const char* pTaskName) const { - if (MR::isEqualString(mForegroundTask->mTaskName, pTaskName) - && mForegroundTask->_0) - { + if (MR::isEqualString(mForegroundTask->mTaskName, pTaskName) && mForegroundTask->_0) { return mForegroundTask; } for (int i = 0; i < BACKGROUND_TASK_NUM; i++) { - if (MR::isEqualString(mBackgroundTaskArray[i].mTaskName, pTaskName) - && mBackgroundTaskArray[i]._0) - { + if (MR::isEqualString(mBackgroundTaskArray[i].mTaskName, pTaskName) && mBackgroundTaskArray[i]._0) { return &mBackgroundTaskArray[i]; } } @@ -186,8 +179,7 @@ NWC24MessengerSub::SendTask* NWC24Messenger::selectTask() const { if (mForegroundTask->_0 && !mForegroundTask->_2) { pTask = mForegroundTask; - } - else { + } else { for (int i = 0; i < BACKGROUND_TASK_NUM; i++) { if (!mBackgroundTaskArray[i]._0) { continue; @@ -228,16 +220,15 @@ namespace NWC24MessengerSub { NEW_NERVE(SendStateNrvCloseErrorFG, SendState, CloseErrorFG); NEW_NERVE(SendStateNrvSendFullErrorFG, SendState, SendFullErrorFG); NEW_NERVE(SendStateNrvWaitCloseSysInfoMini, SendState, WaitCloseSysInfoMini); - }; + }; // namespace - SendState::SendState(NWC24Messenger* pHost) : - NerveExecutor("送信状態"), - mHost(pHost), - mTask(nullptr), - mWindow(nullptr), - mMiniWindow(nullptr), - _18(nullptr) - { + SendState::SendState(NWC24Messenger* pHost) + : NerveExecutor("送信状態"), + mHost(pHost), + mTask(nullptr), + mWindow(nullptr), + mMiniWindow(nullptr), + _18(nullptr) { initNerve(&SendStateNrvWait::sInstance); } @@ -311,8 +302,7 @@ namespace NWC24MessengerSub { } setNerve(&SendStateNrvOpenFG::sInstance); - } - else { + } else { setNerve(&SendStateNrvOpenBG::sInstance); } } @@ -331,17 +321,14 @@ namespace NWC24MessengerSub { if (mTask->mRetryNo >= sRetryMax) { mHost->clearBackgroundTask(); setNerve(&SendStateNrvWait::sInstance); - } - else { + } else { setNerve(&SendStateNrvRetry::sInstance); } - } - else { + } else { mHost->clearBackgroundTask(); setNerve(&SendStateNrvWait::sInstance); } - } - else { + } else { setNerve(&SendStateNrvRunBG::sInstance); } } @@ -360,19 +347,16 @@ namespace NWC24MessengerSub { if (mTask->mErr != NWC24_OK) { mHost->clearBackgroundTask(); setNerve(&SendStateNrvWait::sInstance); - } - else { + } else { doneTask(); if (selectTask() != nullptr) { if (!mTask->mIsBG) { setNerve(&SendStateNrvRunFG::sInstance); - } - else { + } else { setNerve(&SendStateNrvRunBG::sInstance); } - } - else { + } else { setNerve(&SendStateNrvCloseBG::sInstance); } } @@ -391,16 +375,13 @@ namespace NWC24MessengerSub { if (mTask->mRetryNo >= sRetryMax) { setNerveAfterSysInfoWindowMiniDisappear(&SendStateNrvRetryErrorFG::sInstance); - } - else { + } else { setNerve(&SendStateNrvRetry::sInstance); } - } - else { + } else { setNerveAfterSysInfoWindowMiniDisappear(&SendStateNrvOpenErrorFG::sInstance); } - } - else { + } else { setNerve(&SendStateNrvRunFG::sInstance); } } @@ -418,8 +399,7 @@ namespace NWC24MessengerSub { if (hasFatalErrorOccured()) { setNerveAfterSysInfoWindowMiniDisappear(&SendStateNrvSendFatalErrorFG::sInstance); - } - else { + } else { setNerve(&SendStateNrvCloseFG::sInstance); } } @@ -427,11 +407,9 @@ namespace NWC24MessengerSub { void SendState::exeCloseFG() { if (!closeSystem()) { setNerveAfterSysInfoWindowMiniDisappear(&SendStateNrvCloseErrorFG::sInstance); - } - else if (mTask->mErr != NWC24_OK) { + } else if (mTask->mErr != NWC24_OK) { setNerveAfterSysInfoWindowMiniDisappear(&SendStateNrvSendFullErrorFG::sInstance); - } - else { + } else { setNerveAfterSysInfoWindowMiniDisappear(&SendStateNrvUpdateLimitFG::sInstance); } } @@ -632,23 +610,20 @@ namespace NWC24MessengerSub { bool SendState::isRestorableError() const { NWC24Err err = mTask->mErr; - return err == NWC24_ERR_MUTEX - || err == NWC24_ERR_BUSY - || err == NWC24_ERR_INPROGRESS; + return err == NWC24_ERR_MUTEX || err == NWC24_ERR_BUSY || err == NWC24_ERR_INPROGRESS; } bool SendState::send() { if (!mHost->mSystem->send( - reinterpret_cast(mTask->mMessage), - reinterpret_cast(mTask->mAltName), - nullptr, - 0, - mTask->mPicture, - mTask->mPictureSize, - mTask->mTag, - mTask->mIsMsgLedPattern, - mTask->mDelayHours)) - { + reinterpret_cast(mTask->mMessage), + reinterpret_cast(mTask->mAltName), + nullptr, + 0, + mTask->mPicture, + mTask->mPictureSize, + mTask->mTag, + mTask->mIsMsgLedPattern, + mTask->mDelayHours)) { setNerve(&SendStateNrvRetry::sInstance); return false; @@ -674,8 +649,7 @@ namespace NWC24MessengerSub { } bool SendState::hasFatalErrorOccured() const { - return mTask->mErr != NWC24_OK - && mTask->mErr != NWC24_ERR_FULL; + return mTask->mErr != NWC24_OK && mTask->mErr != NWC24_ERR_FULL; } void SendState::doneTask() { @@ -714,44 +688,39 @@ namespace NWC24MessengerSub { void SendState::setNerveAfterSysInfoWindowMiniDisappear(const Nerve* pNerve) { if (isEndSysInfoMini()) { setNerve(pNerve); - } - else { + } else { _18 = pNerve; setNerve(&SendStateNrvWaitCloseSysInfoMini::sInstance); } } - SendTask::SendTask() : - _0(false), - mIsBG(false), - _2(false), - mIsMsgLedPattern(false), - mRetryNo(0), - mErr(NWC24_OK), - mErrCode(0), - mSentSize(0), - mTaskName(nullptr), - mMessage(nullptr), - mAltName(nullptr) - { - + SendTask::SendTask() + : _0(false), + mIsBG(false), + _2(false), + mIsMsgLedPattern(false), + mRetryNo(0), + mErr(NWC24_OK), + mErrCode(0), + mSentSize(0), + mTaskName(nullptr), + mMessage(nullptr), + mAltName(nullptr) { } -}; +}; // namespace NWC24MessengerSub namespace MR { - SendMailObj::SendMailObj(const char* pTaskName) : - mTaskName(pTaskName), - mMessage(nullptr), - mSenderID(nullptr), - mImage(nullptr), - mImageSize(0), - mIsBG(true), - mIsLed(true), - mTag(0), - mDelay(0) - { - + SendMailObj::SendMailObj(const char* pTaskName) + : mTaskName(pTaskName), + mMessage(nullptr), + mSenderID(nullptr), + mImage(nullptr), + mImageSize(0), + mIsBG(true), + mIsLed(true), + mTag(0), + mDelay(0) { } void SendMailObj::setMessageDirect(const wchar_t* pMessage) { @@ -802,4 +771,4 @@ namespace MR { bool isMailErrorHappened(const char* pTaskName) { return getNWC24Messenger()->isError(pTaskName); } -}; +}; // namespace MR diff --git a/src/Game/NWC24/NWC24SendThread.cpp b/src/Game/NWC24/NWC24SendThread.cpp index 1f1f87273..55b754899 100644 --- a/src/Game/NWC24/NWC24SendThread.cpp +++ b/src/Game/NWC24/NWC24SendThread.cpp @@ -11,12 +11,12 @@ NWC24SendThread::NWC24SendThread(s32 priority, JKRHeap* pHeap) { pHeap = MR::getCurrentHeap(); } - mMessage = new(pHeap, 0) OSMessage[mMessageMax]; + mMessage = new (pHeap, 0) OSMessage[mMessageMax]; initMsgSendStatus(); OSInitMessageQueue(&mMessageQueue, &mMessage, mMessageMax); - u8* pStackBase = new(pHeap, 0) u8[STACK_SIZE]; + u8* pStackBase = new (pHeap, 0) u8[STACK_SIZE]; OSCreateThread( this, @@ -32,14 +32,13 @@ NWC24SendThread::NWC24SendThread(s32 priority, JKRHeap* pHeap) { bool NWC24SendThread::requestSend( const u16* pText, const u16* pAltName, - const u8* pLetter, - u32 letterSize, - const u8* pPicture, - u32 pictureSize, - u16 tag, - bool isMsgLedPattern, - u8 delayHours) -{ + const u8* pLetter, + u32 letterSize, + const u8* pPicture, + u32 pictureSize, + u16 tag, + bool isMsgLedPattern, + u8 delayHours) { BOOL status = OSDisableInterrupts(); if (mMessageQueue.usedCount >= mMessageQueue.msgCount) { @@ -77,8 +76,7 @@ bool NWC24SendThread::isDone(NWC24Err* pErr, u32* pSize) { OSRestoreInterrupts(status); return true; - } - else { + } else { *pErr = NWC24_OK; OSRestoreInterrupts(status); @@ -201,15 +199,13 @@ bool NWC24SendThread::checkTotalSize(MsgSendStatus* pMsgSendStatus) { if (pMsgSendStatus->mLetter == nullptr) { letterSize = 0; - } - else { + } else { letterSize = pMsgSendStatus->mLetterSize; } if (pMsgSendStatus->mPicture == nullptr) { pictureSize = 0; - } - else { + } else { pictureSize = pMsgSendStatus->mPictureSize; } diff --git a/src/Game/NWC24/NWC24System.cpp b/src/Game/NWC24/NWC24System.cpp index 64ee983b6..f832ea986 100644 --- a/src/Game/NWC24/NWC24System.cpp +++ b/src/Game/NWC24/NWC24System.cpp @@ -8,24 +8,23 @@ #define VF_DRIVE_WORKSIZE (16 * 1024) extern "C" { - NWC24Err NWC24OpenLib(void*); - NWC24Err NWC24CloseLib(void); - s32 NWC24GetErrorCode(void); - void VFInitEx(void*, u32); +NWC24Err NWC24OpenLib(void*); +NWC24Err NWC24CloseLib(void); +s32 NWC24GetErrorCode(void); +void VFInitEx(void*, u32); }; namespace { static u32 sWorkSize = VF_DRIVE_WORKSIZE; }; -NWC24System::NWC24System(JKRHeap* pHeap, s32 threadPriority) : - _0(false), - mWorkBuffer(nullptr), - mVFWorkBuffer(nullptr) -{ - mVFWorkBuffer = new(pHeap, 32) u8[sWorkSize]; +NWC24System::NWC24System(JKRHeap* pHeap, s32 threadPriority) + : _0(false), + mWorkBuffer(nullptr), + mVFWorkBuffer(nullptr) { + mVFWorkBuffer = new (pHeap, 32) u8[sWorkSize]; VFInitEx(mVFWorkBuffer, sWorkSize); - mWorkBuffer = new(pHeap, 32) u8[NWC24_WORK_MEM_SIZE]; + mWorkBuffer = new (pHeap, 32) u8[NWC24_WORK_MEM_SIZE]; mSendThread = new NWC24SendThread(threadPriority, pHeap); } @@ -44,8 +43,7 @@ bool NWC24System::open(NWC24Err* pErr, s32* pErrCode) { _0 = false; return false; - } - else { + } else { _0 = true; return true; @@ -63,8 +61,7 @@ bool NWC24System::close(NWC24Err* pErr) { if (err != NWC24_OK) { return false; - } - else { + } else { return true; } } @@ -72,14 +69,13 @@ bool NWC24System::close(NWC24Err* pErr) { bool NWC24System::send( const u16* pText, const u16* pAltName, - const u8* pLetter, - u32 letterSize, - const u8* pPicture, - u32 pictureSize, - u16 tag, - bool isMsgLedPattern, - u8 delayHours) -{ + const u8* pLetter, + u32 letterSize, + const u8* pPicture, + u32 pictureSize, + u16 tag, + bool isMsgLedPattern, + u8 delayHours) { return mSendThread->requestSend( pText, pAltName, diff --git a/src/Game/NWC24/ReceiverTagMail.cpp b/src/Game/NWC24/ReceiverTagMail.cpp index 0880eedfb..57f3cf822 100644 --- a/src/Game/NWC24/ReceiverTagMail.cpp +++ b/src/Game/NWC24/ReceiverTagMail.cpp @@ -7,17 +7,15 @@ #include "Game/Util/MessageUtil.hpp" #include "Game/Util/StringUtil.hpp" -ReceiverTagMail::ReceiverTagMail(const char* pTaskName, const char* pMessageID, const char* pSenderID) : - mMessage(nullptr), - mMessageLength(0), - mIsError(false), - _18(1) -{ +ReceiverTagMail::ReceiverTagMail(const char* pTaskName, const char* pMessageID, const char* pSenderID) + : mMessage(nullptr), + mMessageLength(0), + mIsError(false), + _18(1) { mTaskName = pTaskName; mMessageID = pMessageID; mSenderID = pSenderID; - mMessageLength = MR::getStringLengthWithMessageTag(MR::getGameMessageDirect(mMessageID)) - + FileSelectFunc::getMiiNameBufferSize(); + mMessageLength = MR::getStringLengthWithMessageTag(MR::getGameMessageDirect(mMessageID)) + FileSelectFunc::getMiiNameBufferSize(); mMessage = new wchar_t[mMessageLength]; MR::zeroMemory(mMessage, mMessageLength * sizeof(wchar_t)); diff --git a/src/Game/NWC24/UTF16Util.cpp b/src/Game/NWC24/UTF16Util.cpp index 6c788470c..3b97b42a6 100644 --- a/src/Game/NWC24/UTF16Util.cpp +++ b/src/Game/NWC24/UTF16Util.cpp @@ -1,7 +1,7 @@ #include "Game/NWC24/UTF16Util.hpp" namespace MR { - size_t strlenUTF16(const u16 *pStr) { + size_t strlenUTF16(const u16* pStr) { for (int len = 0; len < 1024; len++) { if (*pStr++ != '\0') { continue; @@ -12,4 +12,4 @@ namespace MR { return 0; } -}; +}; // namespace MR diff --git a/src/Game/NameObj/ModelChangableObjFactory.cpp b/src/Game/NameObj/ModelChangableObjFactory.cpp index d4fcfa7e2..9eeb6277b 100644 --- a/src/Game/NameObj/ModelChangableObjFactory.cpp +++ b/src/Game/NameObj/ModelChangableObjFactory.cpp @@ -10,29 +10,68 @@ namespace { const Model2CreateFunc cModelChangableObjCreatorTable[] = { - { nullptr, "AssemblyBlock", createNameObj, }, - { nullptr, "ClipFieldMapParts", createNameObj, }, - { nullptr, "FlexibleSphere", /* createNameObj, */ }, - { nullptr, "MercatorFixParts", createNameObj, }, - { nullptr, "MercatorRailMoveParts", createNameObj, }, - { nullptr, "MercatorRotateParts", createNameObj, }, - { nullptr, "TripodBossFixParts", createNameObj, }, - { nullptr, "TripodBossRailMoveParts", createNameObj, }, - { nullptr, "TripodBossRotateParts", createNameObj, }, - { nullptr, "TripodBossRotateParts", createNameObj, }, - { nullptr, "SimpleNormalMapObj", createNameObj, }, - { nullptr, "SunshadeMapParts", /* MR::createSunshadeMapParts, */ }, + { + nullptr, + "AssemblyBlock", + createNameObj, + }, + { + nullptr, + "ClipFieldMapParts", + createNameObj, + }, + {nullptr, "FlexibleSphere", /* createNameObj, */}, + { + nullptr, + "MercatorFixParts", + createNameObj, + }, + { + nullptr, + "MercatorRailMoveParts", + createNameObj, + }, + { + nullptr, + "MercatorRotateParts", + createNameObj, + }, + { + nullptr, + "TripodBossFixParts", + createNameObj, + }, + { + nullptr, + "TripodBossRailMoveParts", + createNameObj, + }, + { + nullptr, + "TripodBossRotateParts", + createNameObj, + }, + { + nullptr, + "TripodBossRotateParts", + createNameObj, + }, + { + nullptr, + "SimpleNormalMapObj", + createNameObj, + }, + {nullptr, "SunshadeMapParts", /* MR::createSunshadeMapParts, */}, }; - const Model2CreateFunc* getModel2CreateFunc(const char *pName) { + const Model2CreateFunc* getModel2CreateFunc(const char* pName) { for (s32 i = 0; i < sizeof(cModelChangableObjCreatorTable) / sizeof(*cModelChangableObjCreatorTable); i++) { const Model2CreateFunc* pModel2CreateFunc = &cModelChangableObjCreatorTable[i]; - bool v7; + bool v7; if (pModel2CreateFunc->_0 != nullptr) { v7 = strncmp(pName, pModel2CreateFunc->_0, strlen(pModel2CreateFunc->_0)) == 0; - } - else { + } else { v7 = strcmp(pName, pModel2CreateFunc->mArchiveName) == 0; } @@ -43,10 +82,10 @@ namespace { return nullptr; } -}; +}; // namespace namespace MR { - CreatorFuncPtr getModelChangableObjCreator(const char *pName) { + CreatorFuncPtr getModelChangableObjCreator(const char* pName) { const Model2CreateFunc* pModel2CreateFunc = getModel2CreateFunc(pName); if (pModel2CreateFunc != nullptr) { @@ -56,14 +95,14 @@ namespace MR { return nullptr; } - void requestMountModelChangableObjArchives(const char *pName, s32 a2) { + void requestMountModelChangableObjArchives(const char* pName, s32 a2) { char objectName[128]; MR::getMapPartsObjectName(objectName, sizeof(objectName), pName, a2); MR::mountAsyncArchiveByObjectOrLayoutName(objectName, nullptr); } - bool isReadResourceFromDVDAtModelChangableObj(const char *pName, s32 a2) { + bool isReadResourceFromDVDAtModelChangableObj(const char* pName, s32 a2) { char objectName[128]; char archiveName[128]; @@ -72,4 +111,4 @@ namespace MR { return !MR::isLoadedFile(archiveName); } -}; +}; // namespace MR diff --git a/src/Game/NameObj/MovementOnOffGroupHolder.cpp b/src/Game/NameObj/MovementOnOffGroupHolder.cpp index 11ab2479d..6ce7aa11e 100644 --- a/src/Game/NameObj/MovementOnOffGroupHolder.cpp +++ b/src/Game/NameObj/MovementOnOffGroupHolder.cpp @@ -2,12 +2,11 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/StringUtil.hpp" -MovementOnOffGroupHolder::MovementOnOffGroupHolder(const char *pName) : - NameObj(pName), - mGroups() -{} +MovementOnOffGroupHolder::MovementOnOffGroupHolder(const char* pName) + : NameObj(pName), + mGroups() {} -NameObjGroup* MovementOnOffGroupHolder::joinToGroup(const char *pName, NameObj *pobj, u32 a3) { +NameObjGroup* MovementOnOffGroupHolder::joinToGroup(const char* pName, NameObj* pobj, u32 a3) { NameObjGroup* pGroup = findGroupFromName(pName); if (pGroup == nullptr) { @@ -19,7 +18,7 @@ NameObjGroup* MovementOnOffGroupHolder::joinToGroup(const char *pName, NameObj * return pGroup; } -void MovementOnOffGroupHolder::onMovementGroup(const char *pGroupName) { +void MovementOnOffGroupHolder::onMovementGroup(const char* pGroupName) { NameObjGroup* pGroup = findGroupFromName(pGroupName); for (int i = 0; i < pGroup->mObjectCount; i++) { @@ -27,7 +26,7 @@ void MovementOnOffGroupHolder::onMovementGroup(const char *pGroupName) { } } -NameObjGroup* MovementOnOffGroupHolder::createGroup(const char *pGroupName, u32 count) { +NameObjGroup* MovementOnOffGroupHolder::createGroup(const char* pGroupName, u32 count) { NameObjGroup* pGroup = new NameObjGroup(pGroupName, count); pGroup->initWithoutIter(); @@ -36,7 +35,7 @@ NameObjGroup* MovementOnOffGroupHolder::createGroup(const char *pGroupName, u32 return pGroup; } -NameObjGroup* MovementOnOffGroupHolder::findGroupFromName(const char *pName) const { +NameObjGroup* MovementOnOffGroupHolder::findGroupFromName(const char* pName) const { for (u32 i = 0; i < mGroups.size(); i++) { if (MR::isEqualString(mGroups[i]->mName, pName)) { return mGroups[i]; @@ -47,5 +46,4 @@ NameObjGroup* MovementOnOffGroupHolder::findGroupFromName(const char *pName) con } MovementOnOffGroupHolder::~MovementOnOffGroupHolder() { - } diff --git a/src/Game/NameObj/NameObj.cpp b/src/Game/NameObj/NameObj.cpp index 8b3b00158..040b46bd9 100644 --- a/src/Game/NameObj/NameObj.cpp +++ b/src/Game/NameObj/NameObj.cpp @@ -7,40 +7,32 @@ #define FLAG_SUSPEND 2u #define FLAG_RESUME 4u -NameObj::NameObj(const char* pName) : - mName(pName), - mFlag(0), - mExecutorIdx(-1) -{ +NameObj::NameObj(const char* pName) + : mName(pName), + mFlag(0), + mExecutorIdx(-1) { SingletonHolder::get()->add(this); } NameObj::~NameObj() { - } void NameObj::init(const JMapInfoIter& rIter) { - } void NameObj::initAfterPlacement() { - } void NameObj::movement() { - } void NameObj::draw() const { - } void NameObj::calcAnim() { - } void NameObj::calcViewAndEntry() { - } void NameObj::initWithoutIter() { diff --git a/src/Game/NameObj/NameObjAdaptor.cpp b/src/Game/NameObj/NameObjAdaptor.cpp index 95d77cc92..829f6ea65 100644 --- a/src/Game/NameObj/NameObjAdaptor.cpp +++ b/src/Game/NameObj/NameObjAdaptor.cpp @@ -1,13 +1,11 @@ #include "Game/NameObj/NameObjAdaptor.hpp" -NameObjAdaptor::NameObjAdaptor(const char *pName) : - NameObj(pName), - mMovementFunc(nullptr), - mCalcAnimFunc(nullptr), - mCalcViewFunc(nullptr), - mDrawAnimFunc(nullptr) -{ - +NameObjAdaptor::NameObjAdaptor(const char* pName) + : NameObj(pName), + mMovementFunc(nullptr), + mCalcAnimFunc(nullptr), + mCalcViewFunc(nullptr), + mDrawAnimFunc(nullptr) { } NameObjAdaptor::~NameObjAdaptor() { @@ -41,14 +39,14 @@ void NameObjAdaptor::draw() const { } } -void NameObjAdaptor::connectToMovement(const MR::FunctorBase &rFunctor) { +void NameObjAdaptor::connectToMovement(const MR::FunctorBase& rFunctor) { mMovementFunc = rFunctor.clone(nullptr); } -void NameObjAdaptor::connectToCalcAnim(const MR::FunctorBase &rFunctor) { +void NameObjAdaptor::connectToCalcAnim(const MR::FunctorBase& rFunctor) { mCalcAnimFunc = rFunctor.clone(nullptr); } -void NameObjAdaptor::connectToDraw(const MR::FunctorBase &rFunctor) { +void NameObjAdaptor::connectToDraw(const MR::FunctorBase& rFunctor) { mDrawAnimFunc = rFunctor.clone(nullptr); } diff --git a/src/Game/NameObj/NameObjArchiveListCollector.cpp b/src/Game/NameObj/NameObjArchiveListCollector.cpp index 6d5a060f5..73f2ca324 100644 --- a/src/Game/NameObj/NameObjArchiveListCollector.cpp +++ b/src/Game/NameObj/NameObjArchiveListCollector.cpp @@ -5,7 +5,7 @@ NameObjArchiveListCollector::NameObjArchiveListCollector() { mCount = 0; } -void NameObjArchiveListCollector::addArchive(const char *pArchive) { +void NameObjArchiveListCollector::addArchive(const char* pArchive) { char* str = mArchiveNames[mCount]; MR::copyString(str, pArchive, 0x40); mCount++; diff --git a/src/Game/NameObj/NameObjCategoryList.cpp b/src/Game/NameObj/NameObjCategoryList.cpp index 8c08050aa..6342484db 100644 --- a/src/Game/NameObj/NameObjCategoryList.cpp +++ b/src/Game/NameObj/NameObjCategoryList.cpp @@ -1,6 +1,6 @@ #include "Game/NameObj/NameObjCategoryList.hpp" -NameObjCategoryList::NameObjCategoryList(u32 count, const CategoryListInitialTable *pTable, NameObjMethod pMethod, bool a4, const char * /* unused */) { +NameObjCategoryList::NameObjCategoryList(u32 count, const CategoryListInitialTable* pTable, NameObjMethod pMethod, bool a4, const char* /* unused */) { NameObjMethod method; method = pMethod; mDelegator = new NameObjRealDelegator(method); @@ -9,7 +9,7 @@ NameObjCategoryList::NameObjCategoryList(u32 count, const CategoryListInitialTab initTable(count, pTable); } -NameObjCategoryList::NameObjCategoryList(u32 count, const CategoryListInitialTable *pTable, NameObjMethodConst pMethod, bool a4, const char * /* unused */) { +NameObjCategoryList::NameObjCategoryList(u32 count, const CategoryListInitialTable* pTable, NameObjMethodConst pMethod, bool a4, const char* /* unused */) { NameObjMethodConst method; method = pMethod; mDelegatorConst = new NameObjRealDelegator(method); @@ -34,17 +34,17 @@ void NameObjCategoryList::execute(int idx) { } } -void NameObjCategoryList::incrementCheck(NameObj */*unused*/, int index) { +void NameObjCategoryList::incrementCheck(NameObj* /*unused*/, int index) { mCategoryInfo[index].mCheck++; } void NameObjCategoryList::allocateBuffer() { if (_D) { for (int i = 0; i < mCategoryInfo.size(); i++) { - NameObjCategoryList::CategoryInfo* inf = &mCategoryInfo[i]; - u32 size = inf->mCheck; - NameObj** nameObjArr = new NameObj*[size]; - MR::Vector >* arr = &mCategoryInfo[i].mNameObjArr; + NameObjCategoryList::CategoryInfo* inf = &mCategoryInfo[i]; + u32 size = inf->mCheck; + NameObj** nameObjArr = new NameObj*[size]; + MR::Vector>* arr = &mCategoryInfo[i].mNameObjArr; arr->mArray.mArr = nameObjArr; arr->mArray.mMaxSize = size; } @@ -53,19 +53,19 @@ void NameObjCategoryList::allocateBuffer() { } } -void NameObjCategoryList::add(NameObj *pObj, int idx) { +void NameObjCategoryList::add(NameObj* pObj, int idx) { mCategoryInfo[idx].mNameObjArr.push_back(pObj); } // NameObjCategoryList::remove -void NameObjCategoryList::registerExecuteBeforeFunction(const MR::FunctorBase &rFunc, int idx) { +void NameObjCategoryList::registerExecuteBeforeFunction(const MR::FunctorBase& rFunc, int idx) { NameObjCategoryList::CategoryInfo* pCategoryInfo = &mCategoryInfo[idx]; pCategoryInfo->_C = rFunc.clone(nullptr); } -void NameObjCategoryList::initTable(u32 count, const CategoryListInitialTable *pTable) { +void NameObjCategoryList::initTable(u32 count, const CategoryListInitialTable* pTable) { mCategoryInfo.init(count); for (CategoryInfo* pCategoryInfo = mCategoryInfo.begin(); pCategoryInfo != mCategoryInfo.end(); pCategoryInfo++) { @@ -74,8 +74,8 @@ void NameObjCategoryList::initTable(u32 count, const CategoryListInitialTable *p for (const CategoryListInitialTable* pEntry = &pTable[0]; pEntry->mIndex != -1; pEntry++) { if (!_D) { - u32 size = pEntry->mCount; - NameObj** arr = new NameObj*[size]; + u32 size = pEntry->mCount; + NameObj** arr = new NameObj*[size]; NameObjCategoryList::CategoryInfo* inf = &mCategoryInfo[pEntry->mIndex]; inf->mNameObjArr.mArray.mArr = arr; inf->mNameObjArr.mArray.mMaxSize = size; @@ -86,12 +86,10 @@ void NameObjCategoryList::initTable(u32 count, const CategoryListInitialTable *p } } -NameObjCategoryList::CategoryInfo::CategoryInfo() : - mNameObjArr() -{} +NameObjCategoryList::CategoryInfo::CategoryInfo() + : mNameObjArr() {} NameObjCategoryList::CategoryInfo::~CategoryInfo() { - } NameObjCategoryList::~NameObjCategoryList() { diff --git a/src/Game/NameObj/NameObjExecuteHolder.cpp b/src/Game/NameObj/NameObjExecuteHolder.cpp index 3c9936d92..ff30dba51 100644 --- a/src/Game/NameObj/NameObjExecuteHolder.cpp +++ b/src/Game/NameObj/NameObjExecuteHolder.cpp @@ -1,7 +1,7 @@ #include "Game/NameObj/NameObjExecuteHolder.hpp" #include "Game/NameObj/NameObjListExecutor.hpp" #include "Game/Scene/SceneObjHolder.hpp" -#include "Game/System/GameSystem.hpp" +#include "Game/System/GameSystem.hpp" #include "Game/System/GameSystemSceneController.hpp" #include "Game/SingletonHolder.hpp" @@ -9,22 +9,20 @@ namespace { NameObjExecuteHolder* getNameObjExecuteHolder() { return MR::getSceneObj(SceneObj_NameObjExecuteHolder); } -}; +}; // namespace -NameObjExecuteInfo::NameObjExecuteInfo() : - mExecutedObj(nullptr), - _4(0), - _5(0), - _6(-1), - _7(-1), - _8(-1), - _9(-1), - _A(-1) -{ - +NameObjExecuteInfo::NameObjExecuteInfo() + : mExecutedObj(nullptr), + _4(0), + _5(0), + _6(-1), + _7(-1), + _8(-1), + _9(-1), + _A(-1) { } -void NameObjExecuteInfo::setConnectInfo(NameObj *pObj, int a2, int a3, int a4, int a5) { +void NameObjExecuteInfo::setConnectInfo(NameObj* pObj, int a2, int a3, int a4, int a5) { _4 = 2; mExecutedObj = pObj; _5 = 2; @@ -55,21 +53,19 @@ void NameObjExecuteInfo::initConnectting() { if (_4 == 1) { _4 = 4; connectToScene(); - } - else { + } else { _4 = 5; } if (_5 == 1) { _5 = 4; connectToDraw(); - } - else { + } else { _5 = 5; } } -void NameObjExecuteInfo::requestConnect(u8 *pData) { +void NameObjExecuteInfo::requestConnect(u8* pData) { switch (*pData) { case 2: *pData = 1; @@ -86,7 +82,7 @@ void NameObjExecuteInfo::requestConnect(u8 *pData) { } } -void NameObjExecuteInfo::requestDisconnect(u8 *pData, bool a2) { +void NameObjExecuteInfo::requestDisconnect(u8* pData, bool a2) { u8 val; switch (*pData) { @@ -186,7 +182,7 @@ void NameObjExecuteInfo::disconnectToScene() { if (_7 != -1) { pListExecutor->removeToCalcAnim(mExecutedObj, _7); - } + } } void NameObjExecuteInfo::connectToDraw() { @@ -215,7 +211,7 @@ void NameObjExecuteInfo::disconnectToDraw() { } } -void NameObjExecuteHolder::registerActor(NameObj *pObj, int a2, int a3, int a4, int a5) { +void NameObjExecuteHolder::registerActor(NameObj* pObj, int a2, int a3, int a4, int a5) { mExecuteArray[mExecuteArraySize].setConnectInfo(pObj, a2, a3, a4, a5); pObj->mExecutorIdx = mExecuteArraySize; mExecuteArraySize++; @@ -227,7 +223,7 @@ void NameObjExecuteHolder::initConnectting() { } } -void NameObjExecuteHolder::connectToScene(NameObj *pObj) { +void NameObjExecuteHolder::connectToScene(NameObj* pObj) { NameObjExecuteInfo* pInfo = getConnectToSceneInfo(pObj); if (pInfo == nullptr) { @@ -239,7 +235,7 @@ void NameObjExecuteHolder::connectToScene(NameObj *pObj) { _18 = true; } -void NameObjExecuteHolder::connectToDraw(NameObj *pObj) { +void NameObjExecuteHolder::connectToDraw(NameObj* pObj) { NameObjExecuteInfo* pInfo = getConnectToSceneInfo(pObj); if (pInfo == nullptr) { @@ -251,7 +247,7 @@ void NameObjExecuteHolder::connectToDraw(NameObj *pObj) { _1A = true; } -void NameObjExecuteHolder::disconnectToScene(NameObj *pObj) { +void NameObjExecuteHolder::disconnectToScene(NameObj* pObj) { NameObjExecuteInfo* pInfo = getConnectToSceneInfo(pObj); if (pInfo == nullptr) { @@ -263,7 +259,7 @@ void NameObjExecuteHolder::disconnectToScene(NameObj *pObj) { _19 = true; } -void NameObjExecuteHolder::disconnectToDraw(NameObj *pObj) { +void NameObjExecuteHolder::disconnectToDraw(NameObj* pObj) { NameObjExecuteInfo* pInfo = getConnectToSceneInfo(pObj); if (pInfo == nullptr) { @@ -275,9 +271,9 @@ void NameObjExecuteHolder::disconnectToDraw(NameObj *pObj) { _1B = true; } -bool NameObjExecuteHolder::isConnectToDraw(const NameObj *pObj) const { +bool NameObjExecuteHolder::isConnectToDraw(const NameObj* pObj) const { NameObjExecuteInfo* pInfo = getConnectToSceneInfo(pObj); - bool ret = pInfo != nullptr && pInfo->_5 == 3; + bool ret = pInfo != nullptr && pInfo->_5 == 3; return ret; } @@ -354,7 +350,7 @@ void NameObjExecuteHolder::requestMovementOff(int idx) { } } -NameObjExecuteInfo* NameObjExecuteHolder::getConnectToSceneInfo(const NameObj *pObj) const { +NameObjExecuteInfo* NameObjExecuteHolder::getConnectToSceneInfo(const NameObj* pObj) const { if (pObj->mExecutorIdx >= 0) { return &mExecuteArray[pObj->mExecutorIdx]; } @@ -363,7 +359,7 @@ NameObjExecuteInfo* NameObjExecuteHolder::getConnectToSceneInfo(const NameObj *p } namespace MR { - void registerNameObjToExecuteHolder(NameObj *pObj, int a2, int a3, int a4, int a5) { + void registerNameObjToExecuteHolder(NameObj* pObj, int a2, int a3, int a4, int a5) { getNameObjExecuteHolder()->registerActor(pObj, a2, a3, a4, a5); } @@ -371,23 +367,23 @@ namespace MR { getNameObjExecuteHolder()->initConnectting(); } - void connectToSceneTemporarily(NameObj *pObj) { + void connectToSceneTemporarily(NameObj* pObj) { getNameObjExecuteHolder()->connectToScene(pObj); } - void disconnectToSceneTemporarily(NameObj *pObj) { + void disconnectToSceneTemporarily(NameObj* pObj) { getNameObjExecuteHolder()->disconnectToScene(pObj); } - void connectToDrawTemporarily(NameObj *pObj) { + void connectToDrawTemporarily(NameObj* pObj) { getNameObjExecuteHolder()->connectToDraw(pObj); } - void disconnectToDrawTemporarily(NameObj *pObj) { + void disconnectToDrawTemporarily(NameObj* pObj) { getNameObjExecuteHolder()->disconnectToDraw(pObj); } - - bool isConnectToDrawTemporarily(const NameObj *pObj) { + + bool isConnectToDrawTemporarily(const NameObj* pObj) { return getNameObjExecuteHolder()->isConnectToDraw(pObj); } @@ -419,21 +415,20 @@ namespace MR { getNameObjExecuteHolder()->requestMovementOff(category); } - void findActorLightInfo(const LiveActor *pActor) { + void findActorLightInfo(const LiveActor* pActor) { getNameObjExecuteHolder()->getConnectToSceneInfo(pActor)->findLightInfo(); } -}; +}; // namespace MR -NameObjExecuteHolder::NameObjExecuteHolder(int size) : - NameObj("connectToScene情報保持"), - mExecuteArray(nullptr), - mExecuteArrayMaxSize(size), - mExecuteArraySize(0), - _18(false), - _19(false), - _1A(false), - _1B(false), - _1C(false) -{ +NameObjExecuteHolder::NameObjExecuteHolder(int size) + : NameObj("connectToScene情報保持"), + mExecuteArray(nullptr), + mExecuteArrayMaxSize(size), + mExecuteArraySize(0), + _18(false), + _19(false), + _1A(false), + _1B(false), + _1C(false) { mExecuteArray = new NameObjExecuteInfo[mExecuteArrayMaxSize]; } diff --git a/src/Game/NameObj/NameObjFactory.cpp b/src/Game/NameObj/NameObjFactory.cpp index 27631b795..bdaaf3e78 100644 --- a/src/Game/NameObj/NameObjFactory.cpp +++ b/src/Game/NameObj/NameObjFactory.cpp @@ -1,28 +1,28 @@ #include "Game/NameObj/NameObjFactory.hpp" namespace { - template - NameObj* createCenterOriginCube(const char *pName) { + template + NameObj* createCenterOriginCube(const char* pName) { return new T(0, pName); } - template - NameObj* createBaseOriginCube(const char *pName) { + template + NameObj* createBaseOriginCube(const char* pName) { return new T(1, pName); } - template - NameObj* createSphere(const char *pName) { + template + NameObj* createSphere(const char* pName) { return new T(2, pName); } - template - NameObj* createBaseOriginCylinder(const char *pName) { + template + NameObj* createBaseOriginCylinder(const char* pName) { return new T(3, pName); } - template - NameObj* createBowl(const char *pName) { + template + NameObj* createBowl(const char* pName) { return new T(4, pName); } @@ -37,1730 +37,7899 @@ namespace { "MorphItemNeoTeresa", }; const NameObjFactory::Name2CreateFunc cCreateTable[] = { - { "SwitchCube", nullptr, nullptr, }, - { "SwitchSphere", nullptr, nullptr, }, - { "SwitchCylinder", nullptr, nullptr, }, - { "CubeCameraBox", createCenterOriginCube, nullptr, }, - { "CubeCameraCylinder", createBaseOriginCylinder, nullptr, }, - { "CubeCameraSphere", createSphere, nullptr, }, - { "CubeCameraBowl", createBowl, nullptr, }, - { "EffectCylinder", nullptr, nullptr, }, - { "BindEndCube", nullptr, nullptr, }, - { "DeathCube", createBaseOriginCube, nullptr, }, - { "DeathSphere", createSphere, nullptr, }, - { "DeathCylinder", createBaseOriginCylinder, nullptr, }, - { "PullBackCube", nullptr, nullptr, }, - { "PullBackCylinder", nullptr, nullptr, }, - { "RestartCube", createBaseOriginCube, nullptr, }, - { "WarpCube", createBaseOriginCube, nullptr, }, - { "TripodBossStepStartArea", createSphere, nullptr, }, - { "ChangeBgmCube", createBaseOriginCube, nullptr, }, - { "BgmProhibitArea", createSphere, nullptr, }, - { "SoundEmitterCube", nullptr, nullptr, }, - { "SoundEmitterSphere", nullptr, nullptr, }, - { "WaterCube", nullptr, nullptr, }, - { "WaterSphere", nullptr, nullptr, }, - { "WaterCylinder", nullptr, nullptr, }, - { "FallsCube", nullptr, nullptr, }, - { "PlaneModeCube", nullptr, nullptr, }, - { "PlaneCircularModeCube", nullptr, nullptr, }, - { "PipeModeCube", nullptr, nullptr, }, - { "TowerModeCylinder", nullptr, nullptr, }, - { "BloomCube", createCenterOriginCube, nullptr, }, - { "BloomSphere", createSphere, nullptr, }, - { "BloomCylinder", createBaseOriginCylinder, nullptr, }, - { "SimpleBloomCube", nullptr, nullptr, }, - { "SimpleBloomSphere", nullptr, nullptr, }, - { "SimpleBloomCylinder", nullptr, nullptr, }, - { "ScreenBlurCube", nullptr, nullptr, }, - { "ScreenBlurSphere", nullptr, nullptr, }, - { "ScreenBlurCylinder", nullptr, nullptr, }, - { "DepthOfFieldCube", createCenterOriginCube, nullptr, }, - { "DepthOfFieldSphere", createSphere, nullptr, }, - { "DepthOfFieldCylinder", createBaseOriginCylinder, nullptr, }, - { "ClipAreaCenterBox", nullptr, "ClipVolumeBox", }, - { "ClipAreaBottomBox", nullptr, "ClipVolumeBox", }, - { "ClipAreaTopCone", nullptr, "ClipVolumeSphere", }, - { "ClipAreaBottomCone", nullptr, "ClipVolumeSphere", }, - { "ClipAreaSphere", nullptr, "ClipVolumeSphere", }, - { "LightCtrlCube", createBaseOriginCube, nullptr, }, - { "LightCtrlCylinder", createBaseOriginCylinder, nullptr, }, - { "PlaneCollisionCube", nullptr, nullptr, }, - { "ForbidTriangleJumpCube", nullptr, nullptr, }, - { "ForbidWaterSearchCube", nullptr, nullptr, }, - { "QuakeEffectAreaCube", nullptr, nullptr, }, - { "HazeCube", createBaseOriginCube, nullptr, }, - { "LensFlareArea", createBaseOriginCube, nullptr, }, - { "CameraRepulsiveSphere", createNameObj, nullptr, }, - { "CameraRepulsiveCylinder", createNameObj, nullptr, }, - { "SunLightAreaBox", createBaseOriginCube, nullptr, }, - { "GlaringLightAreaCylinder", nullptr, nullptr, }, - { "BigBubbleGoalAreaBox", createBaseOriginCube, nullptr, }, - { "BigBubbleGoalAreaCylinder", createBaseOriginCylinder, nullptr, }, - { "BigBubbleGoalAreaSphere", createSphere, nullptr, }, - { "BigBubbleCameraBox", createBaseOriginCube, nullptr, }, - { "BigBubbleCameraCylinder", createBaseOriginCylinder, nullptr, }, - { "BigBubbleCameraSphere", createSphere, nullptr, }, - { "BigBubbleSwitchBox", nullptr, nullptr, }, - { "BigBubbleSwitchCylinder", nullptr, nullptr, }, - { "BigBubbleSwitchSphere", nullptr, nullptr, }, - { "ViewGroupCtrlCube", nullptr, nullptr, }, - { "AudioEffectCube", createBaseOriginCube, nullptr, }, - { "AudioEffectSphere", createSphere, nullptr, }, - { "AudioEffectCylinder", createBaseOriginCylinder, nullptr, }, - { "PlayerSeCube", nullptr, nullptr, }, - { "PlayerSeSphere", nullptr, nullptr, }, - { "PlayerSeCylinder", nullptr, nullptr, }, - { "MercatorCube", nullptr, nullptr, }, - { "AstroChangeStageCube", createBaseOriginCube, nullptr, }, - { "BlueStarGuidanceCube", nullptr, nullptr, }, - { "TicoSeedGuidanceCube", nullptr, nullptr, }, - { "MessageAreaCube", createBaseOriginCube, nullptr, }, - { "MessageAreaCylinder", createBaseOriginCylinder, nullptr, }, - { "SmokeEffectColorAreaCube", createBaseOriginCube, nullptr, }, - { "BeeWallShortDistAreaCube", createBaseOriginCube, nullptr, }, - { "ExtraWallCheckArea", createBaseOriginCube, nullptr, }, - { "ExtraWallCheckCylinder", createBaseOriginCylinder, nullptr, }, - { "MirrorAreaCube", createBaseOriginCube, nullptr, }, - { "SpinGuidanceCube", nullptr, "SpinGuidance", }, - { "TamakoroMoveGuidanceCube", nullptr, "BallGuidance", }, - { "TamakoroJumpGuidanceCube", nullptr, "BallGuidance", }, - { "HeavySteeringCube", createBaseOriginCube, nullptr, }, - { "NonSleepCube", createBaseOriginCube, nullptr, }, - { "AreaMoveSphere", createSphere, nullptr, }, - { "DodoryuClosedCylinder", nullptr, nullptr, }, - { "DashChargeCylinder", nullptr, nullptr, }, - { "RasterScrollCube", nullptr, nullptr, }, - { "OnimasuCube", nullptr, nullptr, }, - { "ForbidJumpCube", nullptr, nullptr, }, - { "CollisionArea", createCenterOriginCube, nullptr, }, - { "AstroOverlookAreaCylinder", nullptr, nullptr, }, - { "CelestrialSphere", nullptr, nullptr, }, - { "DarkMatterCube", nullptr, nullptr, }, - { "DarkMatterCylinder", nullptr, nullptr, }, - { "Mario", nullptr, nullptr, }, - { "MarioActor", nullptr, nullptr, }, - { "Caretaker", nullptr, "Caretaker", }, - { "Rabbit", nullptr, "MoonRabbit", }, - { "TalkSyati", nullptr, "Syati", }, - { "CollectTico", createNameObj, "StrayTico", }, - { "TrickRabbit", nullptr, "TrickRabbit", }, - { "TrickRabbitFreeRun", nullptr, "TrickRabbit", }, - { "TrickRabbitFreeRunCollect", nullptr, "TrickRabbit", }, - { "RunawayRabbitCollect", nullptr, "TrickRabbit", }, - { "TrickRabbitGhost", nullptr, "TrickRabbit", }, - { "Kinopio", nullptr, "Kinopio", }, - { "KinopioAstro", nullptr, "Kinopio", }, - { "HoneyBee", nullptr, "HoneyBee", }, - { "HoneyQueen", nullptr, "HoneyQueen", }, - { "Peach", createNameObj, "Peach", }, - { "Penguin", nullptr, "Penguin", }, - { "PenguinCoach", nullptr, "PenguinCoach", }, - { "PenguinMaster", nullptr, "PenguinMaster", }, - { "PenguinRacer", nullptr, "Penguin", }, - { "PenguinRacerLeader", nullptr, "Penguin", }, - { "PenguinSkater", nullptr, "Penguin", }, - { "PenguinStudent", nullptr, "Penguin", }, - { "SignBoard", createNameObj, "SignBoard", }, - { "Syati", nullptr, "Syati", }, - { "Tico", createNameObj, nullptr, }, - { "TicoComet", createNameObj, "TicoComet", }, - { "TicoShop", createNameObj, "TicoShop", }, - { "TicoStarRing", createNameObj, "Tico", }, - { "TicoAstro", createNameObj, nullptr, }, - { "TicoBaby", createNameObj, nullptr, }, - { "DemoRabbit", nullptr, nullptr, }, - { "TicoFat", createNameObj, "TicoFat", }, - { "TicoGalaxy", createNameObj, "TicoFat", }, - { "TicoRail", createNameObj, "Tico", }, - { "TicoReading", createNameObj, "Tico", }, - { "TicoDomeLecture", createNameObj, "Tico", }, - { "Rosetta", nullptr, nullptr, }, - { "RosettaReading", createNameObj, "RosettaReading", }, - { "RosettaPictureBook", createNameObj, "RosettaPictureBook", }, - { "LuigiNPC", nullptr, nullptr, }, - { "LuigiEvent", nullptr, nullptr, }, - { "TeresaRacer", nullptr, "TeresaRacer", }, - { "NPCSupportRail", nullptr, nullptr, }, - { "GhostPlayer", nullptr, nullptr, }, - { "Butler", createNameObj, "Butler", }, - { "ButlerMap", createNameObj, "Butler", }, - { "ButlerExplain", createNameObj, "Butler", }, - { "DemoKoopaJrShip", nullptr, "KoopaJrShip", }, - { "Creeper", nullptr, "Creeper", }, - { "JetTurtle", nullptr, "Koura", }, - { "Fluff", nullptr, "Fluff", }, - { "FluffWind", nullptr, nullptr, }, - { "Tamakoro", nullptr, "Tamakoro", }, - { "TamakoroWithTutorial", nullptr, "Tamakoro", }, - { "GoldenTurtle", nullptr, "KouraShine", }, - { "JumpBranch", nullptr, "JumpBranch", }, - { "Plant", nullptr, "Plant", }, - { "Pole", createNameObj, "Pole", }, - { "PoleNoModel", createNameObj, "Pole", }, - { "PoleSquare", createNameObj, "PoleSquare", }, - { "PoleSquareNoModel", createNameObj, "PoleSquare", }, - { "SurfRay", nullptr, "SurfRay", }, - { "SwingRope", nullptr, "SwingRope", }, - { "SpaceCocoon", nullptr, "SpaceCocoon", }, - { "Trapeze", nullptr, "Trapeze", }, - { "TreeCube", createNameObj, "TreeCube", }, - { "WaterRoad", nullptr, "WaterWave", }, - { "WarpPod", nullptr, "WarpPod", }, - { "CoinBox", createNameObj, nullptr, }, - { "PunchBox", nullptr, "PunchBox", }, - { "SwitchBox", createNameObj, "SwitchBox", }, - { "NormalMapTestObj", nullptr, "NormalMapTestObj", }, - { "Takobo", nullptr, "Takobo", }, - { "Karikari", nullptr, "Karipon", }, - { "KoteBug", nullptr, "KoteBug", }, - { "Balloonfish", nullptr, "Balloonfish", }, - { "BombHei", nullptr, "BombHei", }, - { "Bomb", nullptr, "BombHei", }, - { "Jiraira", nullptr, "Jiraira", }, - { "BombHeiLauncher", nullptr, "BombHeiLauncher", }, - { "BombLauncher", nullptr, "BombHeiLauncher", }, - { "SpinDriver", createNameObj, "SpinDriver", }, - { "SuperSpinDriver", MR::createSuperSpinDriverYellow, "SuperSpinDriver", }, - { "SuperSpinDriverGreen", MR::createSuperSpinDriverGreen, "SuperSpinDriver", }, - { "SuperSpinDriverPink", MR::createSuperSpinDriverPink, "SuperSpinDriver", }, - { "Kuribo", createNameObj, "Kuribo", }, - { "KuriboChief", nullptr, "KuriboChief", }, - { "KuriboMini", nullptr, "KuriboMini", }, - { "Kabokuri", nullptr, "Kabokuri", }, - { "TakoHei", nullptr, "TakoHei", }, - { "OtaRock", nullptr, "OtaRock", }, - { "Meramera", nullptr, "Meramera", }, - { "IceMeramera", nullptr, "IceMeramera", }, - { "EyeBeamer", nullptr, "EyeBeamer", }, - { "BigBirikyu", nullptr, "BigBirikyu", }, - { "Birikyu", nullptr, "Birikyu", }, - { "HomingKiller", nullptr, "HomingKiller", }, - { "CocoSambo", nullptr, "CocoSamboBody", }, - { "SamboHead", nullptr, "SamboHead", }, - { "BegomanBaby", nullptr, "BegomanBaby", }, - { "BegomanSpring", nullptr, "BegomanSpring", }, - { "BegomanSpringHide", nullptr, "BegomanSpring", }, - { "BegomanSpike", nullptr, "BegomanSpike", }, - { "BegomanLauncher", nullptr, "BegomanLauncher", }, - { "TogeBegomanLauncher", nullptr, "BegomanLauncher", }, - { "BegomanBabyLauncher", nullptr, "BegomanLauncher", }, - { "FireBubble", nullptr, "FireBubble", }, - { "BallBeamer", nullptr, "BallBeamer", }, - { "JumpBeamer", nullptr, "JumpBeamerBody", }, - { "JumpGuarder", nullptr, "JumpGuarder", }, - { "RingBeamer", createNameObj, "RingBeamer", }, - { "Pukupuku", nullptr, "Pukupuku", }, - { "BombTeresa", nullptr, "BombTeresa", }, - { "Teresa", nullptr, "Teresa", }, - { "TeresaChief", nullptr, "Teresa", }, - { "TeresaWater", nullptr, "TeresaWater", }, - { "Torpedo", nullptr, "Torpedo", }, - { "Dossun", createNameObj, "Dossun", }, - { "Onimasu", nullptr, "Onimasu", }, - { "OnimasuPivot", nullptr, "Onimasu", }, - { "Unizo", nullptr, "Unizo", }, - { "UnizoLand", nullptr, "UnizoLand", }, - { "UnizoShoal", nullptr, "UnizoShoal", }, - { "UnizoLauncher", nullptr, "UnizoLand", }, - { "Kiraira", nullptr, "Kiraira", }, - { "KirairaRail", nullptr, "Kiraira", }, - { "NokonokoLand", nullptr, "NokonokoLand", }, - { "Gesso", nullptr, "Gesso", }, - { "Poihana", nullptr, "Poihana", }, - { "Snakehead", nullptr, "Snakehead", }, - { "SnakeheadSmall", nullptr, "SnakeheadSmall", }, - { "Jellyfish", nullptr, "Jellyfish", }, - { "JellyfishElectric", nullptr, "JellyfishElectric", }, - { "Kanina", nullptr, "Kanina", }, - { "KaninaRed", nullptr, "KaninaRed", }, - { "Mogu", nullptr, "Mogu", }, - { "Mogucchi", nullptr, "Mogucchi", }, - { "MogucchiRefuseTerritory", nullptr, nullptr, }, - { "KoopaJrShip", nullptr, "KoopaJrShip", }, - { "Hanachan", nullptr, "HanachanHead", }, - { "JumpSpider", nullptr, "JumpSpider", }, - { "StringSpider", nullptr, "StringSpider", }, - { "PackunPetit", createNameObj, "PackunPetit", }, - { "StinkBugSmall", nullptr, "StinkBugSmall", }, - { "StinkBugParent", nullptr, "StinkBugParent", }, - { "BasaBasa", nullptr, "BasaBasa", }, - { "BasaBasaIce", nullptr, "BasaBasaIce", }, - { "Metbo", nullptr, "Metbo", }, - { "BombBird", nullptr, "BombBird", }, - { "MechanicKoopaMini", nullptr, "MechanicKoopaMini", }, - { "Karon", nullptr, "Karon", }, - { "HammerHeadPackun", nullptr, "PackunFlower", }, - { "DharmaSambo", nullptr, "DharmaSambo", }, - { "SearchBeamer", nullptr, "SearchBeamer", }, - { "Petari", nullptr, "Petari", }, - { "MagnumKiller", nullptr, "MagnumKiller", }, - { "BossBegoman", nullptr, "BossBegoman", }, - { "BossStinkBug", nullptr, "BossStinkBug", }, - { "DinoPackun", nullptr, "DinoPackun", }, - { "DinoPackunVs2", nullptr, "DinoPackun2", }, - { "Dodoryu", nullptr, "Dodoryu", }, - { "KoopaVs1", nullptr, "Koopa", }, - { "KoopaVs2", nullptr, "Koopa", }, - { "KoopaVs3", nullptr, "Koopa", }, - { "OtaKing", nullptr, nullptr, }, - { "Polta", nullptr, "Polta", }, - { "SkeletalFishBoss", createNameObj, "SkeletalFishBoss", }, - { "SkeletalFishBaby", createNameObj, "SnakeFish", }, - { "SkeletalFishBabyRail", createNameObj, nullptr, }, - { "SkeletalFishBossRail", createNameObj, nullptr, }, - { "TombSpider", nullptr, "TombSpider", }, - { "BossKameck", MR::createBossKameck1, "BossKameck", }, - { "BossKameck2", MR::createBossKameck2, "BossKameck", }, - { "FireBallBeamKameck", nullptr, "Kameck", }, - { "TurtleBeamKameck", nullptr, "Kameck", }, - { "TripodBoss", MR::createTripodBoss, "TripodBoss", }, - { "Tripod2Boss", MR::createTripod2Boss, "Tripod2Boss", }, - { "TripodBossBaseJointPosition", createNameObj, nullptr, }, - { "TripodBossKillerGenerater", createNameObj, "TripodBossKillerCannon", }, - { "TripodBossStepPoint", createNameObj, nullptr, }, - { "TripodBossCore", createNameObj, "TripodBossCore", }, - { "TripodBossCoin", createNameObj, nullptr, }, - { "TripodBossKinokoOneUp", createNameObj, "KinokoOneUp", }, - { "TripodBossShell", createNameObj, "TripodBossShell", }, - { "TripodBossGuardWall", createNameObj, "TripodBossGuardWall", }, - { "TriPodBossBodyA", createNameObj, "TriPodBossBodyA", }, - { "TripodBossBodyABloom", createNameObj, "TripodBossBodyABloom", }, - { "TriPodBossLeg1A", createNameObj, "TriPodBossLeg1A", }, - { "TriPodBossLeg1B", createNameObj, "TriPodBossLeg1B", }, - { "TriPodBossLeg1C", createNameObj, "TriPodBossLeg1C", }, - { "TriPodBossLeg2A", createNameObj, "TriPodBossLeg2A", }, - { "TriPodBossLeg2ABloom", createNameObj, "TriPodBossLeg2ABloom", }, - { "TriPodBossLeg3A", createNameObj, "TriPodBossLeg3A", }, - { "TriPodBossLeg3B", createNameObj, "TriPodBossLeg3B", }, - { "TriPodBossLeg3C", createNameObj, "TriPodBossLeg3C", }, - { "TripodBossFoot", createNameObj, "TripodBossFoot", }, - { "TripodBossFootBloom", createNameObj, "TripodBossFootBloom", }, - { "TriPodBossLegBottom", createNameObj, "TriPodBossLegBottom", }, - { "TripodBossEyeLight", createNameObj, "TripodBossEyeLight", }, - { "TripodBossEyeLightBloom", createNameObj, "TripodBossEyeLightBloom", }, - { "TriPodBossGearA", createNameObj, "TriPodBossGearA", }, - { "TriPodBossGearB", createNameObj, "TriPodBossGearB", }, - { "TriPodBossGearC", createNameObj, "TriPodBossGearC", }, - { "TriPodBossGearSmallA", createNameObj, "TriPodBossGearSmallA", }, - { "TriPodBossGearSmallB", createNameObj, "TriPodBossGearSmallB", }, - { "TriPodBossGearSmallC", createNameObj, "TriPodBossGearSmallC", }, - { "TriPodBossGearBody", createNameObj, "TriPodBossGearBody", }, - { "TripodBossUpperKillerCannon", createNameObj, "TripodBossKillerCannon", }, - { "TripodBossUnderKillerCannon", createNameObj, "TripodBossKillerCannon", }, - { "TripodBossBottomKillerCannon", createNameObj, "TripodBossKillerCannon", }, - { "SpiderAttachPoint", nullptr, "SpiderThreadAttachPoint", }, - { "SpiderCoin", nullptr, "Coin", }, - { "SpiderMapBlock", createNameObj, "SpiderMapBlock", }, - { "ArrowSwitch", createNameObj, "ArrowSwitch", }, - { "ArrowSwitchMulti", createNameObj, "ArrowSwitch", }, - { "ArrowSwitchTarget", createNameObj, nullptr, }, - { "AstroOverlookObj", createNameObj, nullptr, }, - { "BlueStarCupsulePlanet", nullptr, "BlueStarCupsulePlanet", }, - { "BigFan", createNameObj, "BigFan", }, - { "BigFanNoLeg", createNameObj, "BigFanNoLeg", }, - { "ClipAreaDropLaser", nullptr, "ClipVolumeSphere", }, - { "RevolvingWay", nullptr, "RevolvingWay", }, - { "SoundEmitter", nullptr, nullptr, }, - { "JumpHole", nullptr, "JumpHole", }, - { "BallOpener", createNameObj, "BallOpener", }, - { "DragonHeadFlower", nullptr, "DragonHeadFlower", }, - { "ConcreteBlock", nullptr, "ConcreteBlock", }, - { "SphereRailDash", nullptr, nullptr, }, - { "SnowplowSwitch", nullptr, nullptr, }, - { "BallRail", createNameObj, nullptr, }, - { "FallDownBridge", nullptr, "FallDownBridge", }, - { "RockCreator", nullptr, "Rock", }, - { "MeteoContainer", createNameObj, "MeteoContainer", }, - { "MagicBell", createNameObj, "Bell", }, - { "FlowerGroup", nullptr, "Flower", }, - { "FlowerBlueGroup", nullptr, "FlowerBlue", }, - { "CutBushGroup", nullptr, "CutBush", }, - { "SmallStone", nullptr, "SmallStone", }, - { "CircleShell", nullptr, "CircleShell", }, - { "CircleStrawberry", nullptr, "CircleStrawberry", }, - { "Tsukidashikun", nullptr, "Tsukidashikun", }, - { "TsukidashikunBig", nullptr, "TsukidashikunBig", }, - { "TimerCoinBlock", createNameObj, "CoinBlock", }, - { "SplashCoinBlock", createNameObj, "CoinBlock", }, - { "TimerPieceBlock", createNameObj, "CoinBlock", }, - { "SplashPieceBlock", createNameObj, "CoinBlock", }, - { "ItemBlockSwitch", createNameObj, "CoinBlock", }, - { "ExterminationCheckerKuribo", nullptr, "Kuribo", }, - { "ExterminationKuriboKeySwitch", nullptr, "Kuribo", }, - { "ExterminationSkeletalFishBaby", nullptr, "SnakeFish", }, - { "ExterminationMeramera", nullptr, "Meramera", }, - { "ShootingStar", createNameObj, "ShootingStar", }, - { "FlameGun", createNameObj, "FlameGun", }, - { "BenefitItemOneUp", nullptr, "KinokoOneUp", }, - { "BenefitItemLifeUp", createNameObj, "KinokoLifeUp", }, - { "BenefitItemInvincible", createNameObj, "PowerupInvincible", }, - { "CoinSpot", createNameObj, nullptr, }, - { "CollisionBlocker", createNameObj, nullptr, }, - { "LotusLeaf", nullptr, "LotusLeaf", }, - { "PunchingKinoko", createNameObj, "PunchingKinoko", }, - { "DesertMovingLand", nullptr, "DesertMovingLand", }, - { "DesertMovingLandSmall", nullptr, "DesertMovingLandSmall", }, - { "NoteFairy", createNameObj, nullptr, }, - { "EarthenPipe", createNameObj, "EarthenPipe", }, - { "EarthenPipeInWater", createNameObj, "EarthenPipe", }, - { "ElectricRail", nullptr, "ElectricRail", }, - { "ElectricRailMoving", nullptr, "ElectricRailMoving", }, - { "WanwanRolling", nullptr, "WanwanRolling", }, - { "WanwanRollingMini", nullptr, "WanwanRollingMini", }, - { "WanwanRollingGold", nullptr, "WanwanRollingGold", }, - { "BreakableCage", createNameObj, "BreakableCage", }, - { "BreakableCageRotate", createNameObj, "BreakableCage", }, - { "BreakableCageL", createNameObj, "BreakableCageL", }, - { "BreakableFixation", createNameObj, "BreakableFixation", }, - { "BreakableTrash", createNameObj, "BreakableTrash", }, - { "BigBubble", nullptr, "BigBubble", }, - { "BigBubbleMoveLimitterCylinder", nullptr, nullptr, }, - { "BigBubbleMoveLimitterPlane", nullptr, nullptr, }, - { "BigBubbleGenerator", nullptr, "AirBubbleGenerator", }, - { "BigObstructBubbleGenerator", nullptr, "AirBubbleGenerator", }, - { "GCaptureTarget", nullptr, "GCaptureTarget", }, - { "AsteroidA", createNameObj, "AsteroidA", }, - { "AsteroidB", createNameObj, "AsteroidB", }, - { "AsteroidC", createNameObj, "AsteroidC", }, - { "AsteroidD", createNameObj, "AsteroidD", }, - { "SpaceStickA", createNameObj, "SpaceStickA", }, - { "SpaceStickB", createNameObj, "SpaceStickB", }, - { "BlackHole", createNameObj, "BlackHole", }, - { "BlackHoleCube", createNameObj, "BlackHole", }, - { "KillerGunnerSingle", createNameObj, "KillerGunnerSingle", }, - { "KillerGunnerDouble", createNameObj, "KillerGunnerDouble", }, - { "KillerGunnerTriple", createNameObj, "KillerGunnerTriple", }, - { "PowerStar", createNameObj, "PowerStar", }, - { "GrandStar", createNameObj, "GrandStar", }, - { "PowerStarAppearPoint", createNameObj, nullptr, }, - { "CocoNut", createNameObj, nullptr, }, - { "CoconutTree", createNameObj, "CoconutTree", }, - { "CoconutTreeLeaf", nullptr, "CoconutTreeLeaf", }, - { "CollapsePlane", createNameObj, "CollapsePlane", }, - { "WoodBox", createNameObj, "WoodBox", }, - { "ItemBubble", nullptr, "ItemBubble", }, - { "SpinningBox", nullptr, "SpinningBox", }, - { "ElectricBall", nullptr, "ElectricBall", }, - { "SpaceMine", createNameObj, "SpaceMine", }, - { "MorphItemNeoHopper", nullptr, "PowerupHopper", }, - { "MorphItemNeoBee", nullptr, "PowerUpBee", }, - { "MorphItemNeoTeresa", nullptr, "PowerupTeresa", }, - { "MorphItemNeoIce", nullptr, "PowerupIce", }, - { "MorphItemNeoFire", nullptr, "PowerupFire", }, - { "MorphItemNeoFoo", nullptr, "PowerupFoo", }, - { "AirBubble", createNameObj, "AirBubble", }, - { "AirBubbleGenerator", createNameObj, "AirBubbleGenerator", }, - { "Butterfly", nullptr, "Butterfly", }, - { "Pompon2Plant", nullptr, "Pompon2Plant", }, - { "Pompon4Plant", nullptr, "Pompon4Plant", }, - { "LavaGeyser", nullptr, "LavaGeyser", }, - { "LavaProminence", nullptr, "LavaProminence", }, - { "LavaProminenceTriple", nullptr, "LavaProminenceTriple", }, - { "LavaProminenceEnvironment", nullptr, "LavaProminenceEnvironment", }, - { "LavaProminenceWithoutShadow", nullptr, "LavaProminence", }, - { "LavaObstacleRockShell", createNameObj, "LavaObstacleRockShell", }, - { "LavaObstacleRockHomeA", createNameObj, "LavaObstacleRockHomeA", }, - { "LavaObstacleRockHomeB", nullptr, "LavaObstacleRockHomeB", }, - { "LavaHomeFloaterB", nullptr, "LavaHomeFloaterB", }, - { "LavaFloatingStepA", nullptr, "LavaFloatingStepA", }, - { "LavaFloatingStepB", nullptr, "LavaFloatingStepB", }, - { "LavaFloatingStepC", nullptr, "LavaFloatingStepC", }, - { "LavaFloatingStepD", nullptr, "LavaFloatingStepD", }, - { "LavaHomeSeesaw", nullptr, "LavaHomeSeesaw", }, - { "LavaHomeVolcanoFlow", nullptr, "LavaHomeVolcanoFlow", }, - { "LavaHomeVolcanoInnerFlow", createNameObj, "LavaHomeVolcanoInnerFlow", }, - { "LavaRotatePlanetStartStep", createNameObj, "LavaRotatePlanetStartStep", }, - { "LavaBreakBridge", createNameObj, "LavaBreakBridge", }, - { "LavaBreakRockA", nullptr, "LavaBreakRockA", }, - { "LavaBreakRockB", createNameObj, "LavaBreakRockB", }, - { "LavaBreakRockC", createNameObj, "LavaBreakRockC", }, - { "LavaBreakRockD", createNameObj, "LavaBreakRockD", }, - { "LavaBreakColumn", nullptr, "LavaBreakColumn", }, - { "LavaShellTower", createNameObj, "LavaShellTower", }, - { "LavaFallDownColumnA", createNameObj, "LavaFallDownColumnA", }, - { "LavaFallDownColumnB", createNameObj, "LavaFallDownColumnB", }, - { "LavaShellTowerStep", nullptr, "LavaShellTowerStep", }, - { "LavaStepA", nullptr, "LavaStepA", }, - { "LavaStepB", nullptr, "LavaStepB", }, - { "LavaStepC", nullptr, "LavaStepC", }, - { "LavaSteam", nullptr, "LavaSteam", }, - { "LavaStrangeRock", nullptr, "LavaStrangeRock", }, - { "LavaStrangeRockL", nullptr, "LavaStrangeRockL", }, - { "LavaStrangeRockTable", nullptr, "LavaStrangeRockTable", }, - { "LavaSpaceStickA", createNameObj, "LavaSpaceStickA", }, - { "LavaSpaceStickB", createNameObj, "LavaSpaceStickB", }, - { "LavaBlackUFO", createNameObj, "LavaBlackUFO", }, - { "CrystalCageS", createNameObj, "CrystalCageS", }, - { "CrystalCageM", createNameObj, "CrystalCageM", }, - { "CrystalCageL", createNameObj, "CrystalCageL", }, - { "CrystalCageMoving", createNameObj, "CrystalCageMoving", }, - { "ShellfishCoin", nullptr, "Shellfish", }, - { "ShellfishYellowChip", nullptr, "Shellfish", }, - { "SeaBottomBigDoorA", createNameObj, "SeaBottomBigDoorA", }, - { "SeaBottomBigDoorB", createNameObj, "SeaBottomBigDoorB", }, - { "SeaBottomBigDoorC", createNameObj, "SeaBottomBigDoorC", }, - { "FloaterLandPartsFrame", createNameObj, "FloaterLandPartsFrame", }, - { "OceanFloaterTypeU", nullptr, "OceanFloaterTypeU", }, - { "DashRing", createNameObj, "DashRing", }, - { "MeteorStrike", nullptr, "MeteorStrike", }, - { "MeteorStrikeEnvironment", nullptr, "MeteorStrike", }, - { "MeteorCannon", nullptr, "MeteorStrike", }, - { "BrightObj", nullptr, "LensFlare", }, - { "BrightSun", nullptr, "LensFlare", }, - { "PhantomTorch", nullptr, nullptr, }, - { "PhantomBonfire", nullptr, nullptr, }, - { "PhantomCandlestand", nullptr, "PhantomCandlestand", }, - { "CandlestandIceVolcano", nullptr, "CandlestandIceVolcano", }, - { "MarioLauncher", nullptr, "MarioLauncher", }, - { "MarioLauncherAttractor", nullptr, "MarioLauncherAttractor", }, - { "WaterBazooka", nullptr, "WaterBazooka", }, - { "ElectricBazooka", nullptr, "ElectricBazooka", }, - { "WaterPressure", nullptr, "WaterPressure", }, - { "FirePressure", createNameObj, "FirePressure", }, - { "IronCannonLauncher", nullptr, "IronCannonLauncher", }, - { "IronCannonLauncherPoint", nullptr, nullptr, }, - { "FirePressureRadiate", createNameObj, "FirePressure", }, - { "TemplateStageGeometry", createNameObj, "TemplateStageGeometry", }, - { "SunkenShip", nullptr, "SunkenShip", }, - { "BeeFlowerHover", createNameObj, "BeeFlowerHover", }, - { "WaterfallCaveCover", nullptr, "WaterfallCaveCover", }, - { "WaterfallCaveNoBreakCover", createNameObj, "WaterfallCaveNoBreakCover", }, - { "PalmIsland", createNameObj, "PalmIsland", }, - { "IceMerameraKing", nullptr, "IceMerameraKing", }, - { "OceanPierFloaterA", nullptr, "OceanPierFloaterA", }, - { "HeavenlyBeachTopRock", nullptr, "HeavenlyBeachTopRock", }, - { "HeavenlyBeachUnderRock", nullptr, "HeavenlyBeachUnderRock", }, - { "OceanSmallTurtle", nullptr, "OceanSmallTurtle", }, - { "OceanHexagonFloater", nullptr, "OceanHexagonFloater", }, - { "SpringWaterFloaterA", nullptr, "SpringWaterFloaterA", }, - { "SpringWaterFloaterB", nullptr, "SpringWaterFloaterB", }, - { "ShutterDoorB", nullptr, "ShutterDoorB", }, - { "ShutterDoorC", nullptr, "ShutterDoorC", }, - { "ShutterDoorD", nullptr, "ShutterDoorD", }, - { "ShutterDoorE", nullptr, "ShutterDoorE", }, - { "SeaBottomTriplePropellerStand", createNameObj, "SeaBottomTriplePropellerStand", }, - { "SeaBottomTriplePropeller", nullptr, "SeaBottomTriplePropeller", }, - { "OceanFloaterTowerRotateStepA", createNameObj, "OceanFloaterTowerRotateStepA", }, - { "OceanFloaterTowerRotateStepB", createNameObj, "OceanFloaterTowerRotateStepB", }, - { "OceanFloaterTowerRotateStepC", createNameObj, "OceanFloaterTowerRotateStepC", }, - { "OceanFloaterTowerRotateStepD", createNameObj, "OceanFloaterTowerRotateStepD", }, - { "LargeChain", createNameObj, "LargeChain", }, - { "IcicleRock", nullptr, "IcicleRock", }, - { "ItemAppearStoneSpinDriver", nullptr, "ItemAppearStoneSpinDriver", }, - { "SnowFloor", nullptr, nullptr, }, - { "SnowFloorTile", nullptr, nullptr, }, - { "FlipPanel", createNameObj, "FlipPanel", }, - { "FlipPanelObserver", createNameObj, nullptr, }, - { "FlipPanelReverse", createNameObj, "FlipPanelReverse", }, - { "FlipPanelFrame", createNameObj, "FlipPanelFrame", }, - { "PhantomTowerMoveStepA", nullptr, "PhantomTowerMoveStepA", }, - { "SideSpikeMoveStepA", nullptr, "SideSpikeMoveStepA", }, - { "SpaceMineRailA", createNameObj, "SpaceMineRailA", }, - { "SpaceMineRail5m", createNameObj, "SpaceMineRail5m", }, - { "SandUpDownTowerTop", nullptr, "SandUpDownTowerTop", }, - { "SandUpDownTowerBottom", nullptr, "SandUpDownTowerBottom", }, - { "SandUpDownKillerGunnerBase", createNameObj, "SandUpDownKillerGunnerBase", }, - { "SandUpDownTriRock", nullptr, "SandUpDownTriRock", }, - { "JumpStand", nullptr, "JumpStand", }, - { "CaretakerGarbage", createNameObj, "CaretakerGarbage", }, - { "GlassBottleTall", createNameObj, "GlassBottleTall", }, - { "HopperBeltConveyerRotatePartsA", createNameObj, "HopperBeltConveyerRotatePartsA", }, - { "HopperBeltConveyerMovePartsA", nullptr, "HopperBeltConveyerMovePartsA", }, - { "ChooChooTrain", createNameObj, "ChooChooTrain", }, - { "SandRiverLightA", nullptr, "SandRiverLightA", }, - { "SnowMan", nullptr, "SnowMan", }, - { "SnowBlockA", nullptr, "SnowBlockA", }, - { "ShockWaveGenerator", nullptr, "ShockWaveGenerator", }, - { "DangerSignBoard", createNameObj, "DangerSignBoard", }, - { "Banekiti", nullptr, "Banekiti", }, - { "MirrorModelTest", createNameObj, "MirrorModelTest", }, - { "MirrorModelPeachCastle", createNameObj, "MirrorModelPeachCastle", }, - { "MirrorModelTwinFallLake", createNameObj, "MirrorModelTwinFallLake", }, - { "MirrorReflectionTest", createNameObj, "MirrorReflectionTest", }, - { "MirrorReflectionPeachCastle", createNameObj, "MirrorReflectionPeachCastle", }, - { "MirrorReflectionTwinFallLake", createNameObj, "MirrorReflectionTwinFallLake", }, - { "PhantomFirewood", createNameObj, "PhantomFirewood", }, - { "ArrowBoard", createNameObj, "ArrowBoard", }, - { "TeresaRoomGlaringLight", nullptr, "TeresaRoomGlaringLight", }, - { "SpaceDustWoodA", createNameObj, "SpaceDustWoodA", }, - { "SpaceDustWoodB", createNameObj, "SpaceDustWoodB", }, - { "TeresaRoomDoor", nullptr, "TeresaRoomDoor", }, - { "TrampleStar", nullptr, "TrampleStar", }, - { "ReverseGravityTowerInside", nullptr, "ReverseGravityTowerInside", }, - { "HipDropRock", createNameObj, "HipDropRock", }, - { "DropOfWaterCore", createNameObj, "DropOfWaterCore", }, - { "WatchTowerRotateStep", nullptr, "WatchTowerRotateStep", }, - { "ForestAppearStepA", createNameObj, "ForestAppearStepA", }, - { "ForestObstacleWoodA", createNameObj, "ForestObstacleWoodA", }, - { "AstroDomeAsteroid", nullptr, "AstroDomeAsteroid", }, - { "AstroDomeBlueStar", nullptr, "GCaptureTarget", }, - { "AstroDomeComet", createNameObj, "AstroDomeComet", }, - { "AstroDomeDemoAstroGalaxy", nullptr, "AstroDomeDemoAstroGalaxy", }, - { "SphereSelectorHandle", nullptr, nullptr, }, - { "ForestWoodCover", createNameObj, "ForestWoodCover", }, - { "KoopaShipManholeCover", nullptr, "KoopaShipManholeCover", }, - { "StarDustStepA", createNameObj, "StarDustStepA", }, - { "StarDustStepB", createNameObj, "StarDustStepB", }, - { "TreasureSpot", nullptr, "TreasureSpot", }, - { "CoinFlower", nullptr, "CoinFlower", }, - { "StarDustRollingStepA", createNameObj, "StarDustRollingStepA", }, - { "AsteroidMoveA", createNameObj, "AsteroidMoveA", }, - { "StarPieceCluster", createNameObj, "StarPieceCluster", }, - { "SpaceSeparatorA", createNameObj, "SpaceSeparatorA", }, - { "SpaceSeparatorB", createNameObj, "SpaceSeparatorB", }, - { "ForestNarrowStepA", createNameObj, "ForestNarrowStepA", }, - { "ForestHomeGate", createNameObj, "ForestHomeGate", }, - { "RGTowerPressGroundA", nullptr, "RGTowerPressGroundA", }, - { "WeatherVane", createNameObj, "WeatherVane", }, - { "RainCloud", nullptr, "RainCloud", }, - { "PowerStarKeeperA", createNameObj, "PowerStarKeeperA", }, - { "PowerStarKeeperB", createNameObj, "PowerStarKeeperB", }, - { "PowerStarKeeperC", createNameObj, "PowerStarKeeperC", }, - { "ForestPoihanaFenceA", createNameObj, "ForestPoihanaFenceA", }, - { "ForestPoihanaFenceB", createNameObj, "ForestPoihanaFenceB", }, - { "TeresaMansionBridgeA", createNameObj, "TeresaMansionBridgeA", }, - { "TeresaMansionBridgeB", createNameObj, "TeresaMansionBridgeB", }, - { "DarknessRoomDoorA", nullptr, "DarknessRoomDoorA", }, - { "TeresaMansionDoorA", nullptr, "TeresaMansionDoorA", }, - { "TeresaMansionDoorB", nullptr, "TeresaMansionDoorB", }, - { "TeresaMansionEntranceDoor", nullptr, "TeresaMansionEntranceDoor", }, - { "WaterBazookaTowerMoveStepA", createNameObj, "WaterBazookaTowerMoveStepA", }, - { "WaterBazookaTowerMoveStepB", nullptr, "WaterBazookaTowerMoveStepB", }, - { "WaterBazookaTowerMoveStepC", nullptr, "WaterBazookaTowerMoveStepC", }, - { "QuestionBoxMoveStepA", nullptr, "QuestionBoxMoveStepA", }, - { "QuestionBoxMoveStepB", nullptr, "QuestionBoxMoveStepB", }, - { "QuestionBoxMoveStepC", nullptr, "QuestionBoxMoveStepC", }, - { "ForestHomeBridge", createNameObj, "ForestHomeBridge", }, - { "ForestBarricadeRockA", createNameObj, "ForestBarricadeRockA", }, - { "ReverseGravityRoomPressGroundA", nullptr, "ReverseGravityRoomPressGroundA", }, - { "ReverseGravityRoomPressGroundB", nullptr, "ReverseGravityRoomPressGroundB", }, - { "ReverseGravityRoomPressGroundC", nullptr, "ReverseGravityRoomPressGroundC", }, - { "ReverseGravityRoomPressGroundD", nullptr, "ReverseGravityRoomPressGroundD", }, - { "ReverseGravityRoomPressGroundE", nullptr, "ReverseGravityRoomPressGroundE", }, - { "RollingOvalPlanetParts", createNameObj, "RollingOvalPlanetParts", }, - { "TeresaMansionLightA", nullptr, "TeresaMansionLightA", }, - { "TeresaMansionLightB", nullptr, "TeresaMansionLightB", }, - { "TeresaMansionCandlestand", nullptr, "TeresaMansionCandlestand", }, - { "TeresaMansionHoleCover", nullptr, "TeresaMansionHoleCover", }, - { "KoopaStatue", nullptr, "KoopaStatue", }, - { "TeresaPicture", nullptr, "TeresaPicture", }, - { "KinokoOneUpPicture", nullptr, "KinokoOneUpPicture", }, - { "FireBar", createNameObj, "FireBarCore", }, - { "BattleShipMovePartsA", createNameObj, "BattleShipMovePartsA", }, - { "BattleShipMovePartsB", createNameObj, "BattleShipMovePartsB", }, - { "BattleShipElevator", nullptr, "BattleShipElevator", }, - { "BattleShipElevatorCover", createNameObj, "BattleShipElevatorCover", }, - { "TeresaRaceSpaceStickA", createNameObj, "TeresaRaceSpaceStickA", }, - { "TeresaRaceSpaceStickB", createNameObj, "TeresaRaceSpaceStickB", }, - { "TeresaRaceSpaceStickC", createNameObj, "TeresaRaceSpaceStickC", }, - { "TeresaRacePartsA", createNameObj, "TeresaRacePartsA", }, - { "TeresaRacePartsB", nullptr, "TeresaRacePartsB", }, - { "NeedlePlant", nullptr, "NeedlePlant", }, - { "NeedlePlantFly", nullptr, "NeedlePlantFly", }, - { "BeeWallClimbPartsA", nullptr, "BeeWallClimbPartsA", }, - { "PeachCastleTownAfterAttack", createNameObj, "PeachCastleTownAfterAttack", }, - { "PeachCastleTownBeforeAttack", createNameObj, "PeachCastleTownBeforeAttack", }, - { "PeachCastleTownGate", createNameObj, "PeachCastleTownGate", }, - { "PhantomDecoratePartsA", createNameObj, "PhantomDecoratePartsA", }, - { "PhantomDecoratePartsB", createNameObj, "PhantomDecoratePartsB", }, - { "PhantomDecoratePartsHole", createNameObj, "PhantomDecoratePartsHole", }, - { "CocoonStepA", createNameObj, "CocoonStepA", }, - { "CocoonStepB", createNameObj, "CocoonStepB", }, - { "SpaceCannonLauncher", createNameObj, "SpaceCannonLauncher", }, - { "TrapBaseA", createNameObj, "TrapBaseA", }, - { "SweetsDecoratePartsSpoon", createNameObj, "SweetsDecoratePartsSpoon", }, - { "SweetsDecoratePartsFork", createNameObj, "SweetsDecoratePartsFork", }, - { "SeesawMoveNutA", nullptr, "SeesawMoveNutA", }, - { "SeesawMoveNutB", nullptr, "SeesawMoveNutB", }, - { "SeesawMoveNutC", nullptr, "SeesawMoveNutC", }, - { "TwisterSan", nullptr, "TwisterSan", }, - { "TwisterSanSlim", nullptr, "TwisterSanSlim", }, - { "SunakazeKun", nullptr, "SunakazeKun", }, - { "SandStreamMoveStepsA", createNameObj, "SandStreamMoveStepsA", }, - { "SandStreamMoveStepsB", createNameObj, "SandStreamMoveStepsB", }, - { "WaterLeakPipe", nullptr, "WaterLeakPipe", }, - { "BroadBeanMoveStepA", nullptr, "BroadBeanMoveStepA", }, - { "BroadBeanMoveStepB", nullptr, "BroadBeanMoveStepB", }, - { "ColorPencil", createNameObj, "ColorPencil", }, - { "TeresaRacePartsBallA", createNameObj, "TeresaRacePartsBallA", }, - { "SandCapsulePressGround", nullptr, "SandCapsulePressGround", }, - { "RayGunPlanetPartsScrew", nullptr, "RayGunPlanetPartsScrew", }, - { "RayGunPlanetPartsGear", createNameObj, "RayGunPlanetPartsGear", }, - { "BreakDownFixStepA", createNameObj, "BreakDownFixStepA", }, - { "SandStreamHighTowerMoveStepA", nullptr, "SandStreamHighTowerMoveStepA", }, - { "DriftWood", nullptr, "DriftWood", }, - { "ToyFactoryDecoratePartsGearA", createNameObj, "ToyFactoryDecoratePartsGearA", }, - { "MiniMechaKoopaPartsMoveStepA", nullptr, "MiniMechaKoopaPartsMoveStepA", }, - { "MiniMechaKoopaPartsGear", createNameObj, "MiniMechaKoopaPartsGear", }, - { "MiniMechaKoopaPartsCage", createNameObj, "MiniMechaKoopaPartsCage", }, - { "AsteroidBlockRotateStepA", createNameObj, "AsteroidBlockRotateStepA", }, - { "SandUpDownTowerBreakableWallA", nullptr, "SandUpDownTowerBreakableWallA", }, - { "SandUpDownTowerBreakableWallB", nullptr, "SandUpDownTowerBreakableWallB", }, - { "HoleDeathSandMoveStepA", nullptr, "HoleDeathSandMoveStepA", }, - { "SandUpDownTowerMoveStepA", nullptr, "SandUpDownTowerMoveStepA", }, - { "DeathSandLandPartsA", createNameObj, "DeathSandLandPartsA", }, - { "DeathSandLandPartsB", createNameObj, "DeathSandLandPartsB", }, - { "DeathSandLandPlatformStepA", createNameObj, "DeathSandLandPlatformStepA", }, - { "DeathSandEnvironmentSapotenA", createNameObj, "DeathSandEnvironmentSapotenA", }, - { "DeathSandEnvironmentSapotenB", createNameObj, "DeathSandEnvironmentSapotenB", }, - { "DeathSandEnvironmentRock", createNameObj, "DeathSandEnvironmentRock", }, - { "DeathSandEnvironmentPyramid", createNameObj, "DeathSandEnvironmentPyramid", }, - { "UFOSandObstacleA", createNameObj, "UFOSandObstacleA", }, - { "UFOSandObstacleB", createNameObj, "UFOSandObstacleB", }, - { "UFOSandObstacleC", createNameObj, "UFOSandObstacleC", }, - { "SweetDecoratePartsOrange", createNameObj, "SweetDecoratePartsOrange", }, - { "CapsuleCage", createNameObj, "CapsuleCage", }, - { "KameckShipLv1", createNameObj, "KameckShipLv1", }, - { "LavaBallRisingPlanetLava", nullptr, "LavaBallRisingPlanetLava", }, - { "StrongBlock", createNameObj, "StrongBlock", }, - { "ChoConveyorChocoA", createNameObj, "ChoConveyorChocoA", }, - { "ChoConveyorMoveChocoA", nullptr, "ChoConveyorMoveChocoA", }, - { "HoneyQueenLeafA", nullptr, "HoneyQueenLeafA", }, - { "ForestHomePartsTree", createNameObj, "ForestHomePartsTree", }, - { "ForestHomePartsTreeTower", createNameObj, "ForestHomePartsTreeTower", }, - { "RosettaChair", nullptr, "RosettaChair", }, - { "GravityLightA", nullptr, "GravityLightA", }, - { "GravityLightRoad", nullptr, "GravityLightRoad", }, - { "PoltaBattlePlanetPartsA", createNameObj, "PoltaBattlePlanetPartsA", }, - { "HeavenlyBeachTimerStepA", nullptr, "HeavenlyBeachTimerStepA", }, - { "HeavenlyBeachTimerStepB", nullptr, "HeavenlyBeachTimerStepB", }, - { "ReverseKingdomTreeA", createNameObj, "ReverseKingdomTreeA", }, - { "FloaterOtakingFloaterA", nullptr, "FloaterOtakingFloaterA", }, - { "WindMillPropeller", createNameObj, "WindMillPropeller", }, - { "WindMillPropellerMini", createNameObj, "WindMillPropellerMini", }, - { "LavaRotateStepsRotatePartsA", createNameObj, "LavaRotateStepsRotatePartsA", }, - { "LavaRotateStepsRotatePartsB", createNameObj, "LavaRotateStepsRotatePartsB", }, - { "LavaRotateStepsRotatePartsC", createNameObj, "LavaRotateStepsRotatePartsC", }, - { "LavaRotateStepsRotatePartsD", createNameObj, "LavaRotateStepsRotatePartsD", }, - { "QuickSand2DMovePartsA", createNameObj, "QuickSand2DMovePartsA", }, - { "BiriBiriBegomanSpikePistonA", nullptr, "BiriBiriBegomanSpikePistonA", }, - { "HugeBattleShipPlanetEntrance", createNameObj, "HugeBattleShipPlanetEntrance", }, - { "MysteryGravityRoomBridgeA", createNameObj, "MysteryGravityRoomBridgeA", }, - { "DeadLeaves", nullptr, "DeadLeaves", }, - { "PrologueDirector", nullptr, "DemoLetter", }, - { "DeathPromenadeMovePartsSpuareA", nullptr, "DeathPromenadeMovePartsSpuareA", }, - { "DeathPromenadeRotateCircleL", createNameObj, "DeathPromenadeRotateCircleL", }, - { "DeathPromenadeRotateCircleS", createNameObj, "DeathPromenadeRotateCircleS", }, - { "FlexibleSandPlanetPartsA", nullptr, "FlexibleSandPlanetPartsA", }, - { "DarkHopperRotateStepA", nullptr, "DarkHopperRotateStepA", }, - { "DarkHopperPlanetPartsA", createNameObj, "DarkHopperPlanetPartsA", }, - { "DarkHopperPlanetPartsC", createNameObj, "DarkHopperPlanetPartsC", }, - { "DarkHopperPlanetPartsD", createNameObj, "DarkHopperPlanetPartsD", }, - { "ClockworkHandle", nullptr, "ClockworkHandle", }, - { "MiniMechaKoopaPartsFan", createNameObj, "MiniMechaKoopaPartsFan", }, - { "RockRoadCircleA", createNameObj, "RockRoadCircleA", }, - { "AssemblyBlockPartsA", createNameObj, "AssemblyBlockPartsA", }, - { "AssemblyBlockPartsB", createNameObj, "AssemblyBlockPartsB", }, - { "AssemblyBlockPartsC", createNameObj, "AssemblyBlockPartsC", }, - { "AssemblyBlockPartsD", createNameObj, "AssemblyBlockPartsD", }, - { "AssemblyBlockPartsE", createNameObj, "AssemblyBlockPartsE", }, - { "AssemblyBlockPartsIceB", createNameObj, "AssemblyBlockPartsIceB", }, - { "AssemblyBlockPartsIceC", createNameObj, "AssemblyBlockPartsIceC", }, - { "AssemblyBlockPartsIceD", createNameObj, "AssemblyBlockPartsIceD", }, - { "AssemblyBlockPartsIceE", createNameObj, "AssemblyBlockPartsIceE", }, - { "AssemblyBlockPartsTimerA", createNameObj, "AssemblyBlockPartsTimerA", }, - { "HellBallGuidePartsA", createNameObj, "HellBallGuidePartsA", }, - { "HellBallRotatePartsA", createNameObj, "HellBallRotatePartsA", }, - { "HellBallRotatePartsB", createNameObj, "HellBallRotatePartsB", }, - { "HellBallRotatePartsC", createNameObj, "HellBallRotatePartsC", }, - { "HellBallRotatePartsD", createNameObj, "HellBallRotatePartsD", }, - { "HellBallRotatePartsE", createNameObj, "HellBallRotatePartsE", }, - { "HellBallRotatePartsF", createNameObj, "HellBallRotatePartsF", }, - { "HellBallRotatePartsG", createNameObj, "HellBallRotatePartsG", }, - { "IceSlipRoad", createNameObj, "IceSlipRoad", }, - { "CandyLiftA", createNameObj, "CandyLiftA", }, - { "CandyLiftB", createNameObj, "CandyLiftB", }, - { "SurfingRaceTutorialParts", createNameObj, "SurfingRaceTutorialParts", }, - { "SurfingRaceMainGate", createNameObj, "SurfingRaceMainGate", }, - { "SurfingRaceSubGate", createNameObj, "SurfingRaceSubGate", }, - { "SurfingRaceStep", createNameObj, "SurfingRaceStep", }, - { "SurfingRaceSignBoard", createNameObj, "SurfingRaceSignBoard", }, - { "SurfingRaceVictoryStand", createNameObj, "SurfingRaceVictoryStand", }, - { "HeavensDoorFlowerA", createNameObj, "HeavensDoorFlowerA", }, - { "HeavensDoorHouseDoor", createNameObj, "HeavensDoorHouseDoor", }, - { "HeavensDoorAppearStepAAfter", createNameObj, "HeavensDoorAppearStepAAfter", }, - { "HeavensDoorAppearStepA", nullptr, "HeavensDoorAppearStepA", }, - { "HeavensDoorMiddleRotatePartsA", createNameObj, "HeavensDoorMiddleRotatePartsA", }, - { "HeavensDoorMiddleRotatePartsB", createNameObj, "HeavensDoorMiddleRotatePartsB", }, - { "HeavensDoorInsideCage", nullptr, "HeavensDoorInsideCage", }, - { "HeavensDoorInsidePlanetPartsA", nullptr, "HeavensDoorInsidePlanetPartsA", }, - { "HeavensDoorInsideRotatePartsA", createNameObj, "HeavensDoorInsideRotatePartsA", }, - { "HeavensDoorInsideRotatePartsB", createNameObj, "HeavensDoorInsideRotatePartsB", }, - { "HeavensDoorInsideRotatePartsC", createNameObj, "HeavensDoorInsideRotatePartsC", }, - { "MechaKoopaPartsHead", createNameObj, "MechaKoopaPartsHead", }, - { "MechaKoopaPartsCollar", createNameObj, "MechaKoopaPartsCollar", }, - { "MechaKoopaPartsBreast", nullptr, "MechaKoopaPartsBreast", }, - { "MechaKoopaPartsArmRight", createNameObj, "MechaKoopaPartsArmRight", }, - { "MechaKoopaPartsArmLeft", createNameObj, "MechaKoopaPartsArmLeft", }, - { "MechaKoopaPartsBody", nullptr, "MechaKoopaPartsBody", }, - { "MechaKoopaPartsCaterpillar", nullptr, "MechaKoopaPartsCaterpillar", }, - { "MechaKoopaPartsRollerA", createNameObj, "MechaKoopaPartsRollerA", }, - { "MechaKoopaPartsMoveStepA", nullptr, "MechaKoopaPartsMoveStepA", }, - { "MechaKoopaPartsWreckA", createNameObj, "MechaKoopaPartsWreckA", }, - { "CannonFortressBreakStepA", createNameObj, "CannonFortressBreakStepA", }, - { "CannonFortressRotateBreakStepA", createNameObj, "CannonFortressRotateBreakStepA", }, - { "CannonFortressRotateBreakStepB", createNameObj, "CannonFortressRotateBreakStepB", }, - { "CannonFortressRotateBreakStepC", createNameObj, "CannonFortressRotateBreakStepC", }, - { "CannonFortressMoveWall", nullptr, "CannonFortressMoveWall", }, - { "SpaceShipStep", nullptr, "SpaceShipStep", }, - { "QuarterRollGravityRoomArrow", nullptr, "QuarterRollGravityRoomArrow", }, - { "NutShipFleetBridge", nullptr, "NutShipFleetBridge", }, - { "IceVolcanoMoveStepA", nullptr, "IceVolcanoMoveStepA", }, - { "IceVolcanoBalanceStepA", nullptr, "IceVolcanoBalanceStepA", }, - { "IceVolcanoBalanceStepB", nullptr, "IceVolcanoBalanceStepB", }, - { "IceVolcanoFloaterA", nullptr, "IceVolcanoFloaterA", }, - { "IceVolcanoFloaterB", nullptr, "IceVolcanoFloaterB", }, - { "IceVolcanoAppearStepA", nullptr, "IceVolcanoAppearStepA", }, - { "IceVolcanoAppearStepB", nullptr, "IceVolcanoAppearStepB", }, - { "IceVolcanoClimbingWall", nullptr, "IceVolcanoClimbingWall", }, - { "IceMountainFloaterA", nullptr, "IceMountainFloaterA", }, - { "IceMountainSeesawNoSlipA", nullptr, "IceMountainSeesawNoSlipA", }, - { "IceMountainSeesawSlipA", nullptr, "IceMountainSeesawSlipA", }, - { "IceMountainSeesawSlipB", nullptr, "IceMountainSeesawSlipB", }, - { "IceMountainSeesawSlipC", nullptr, "IceMountainSeesawSlipC", }, - { "IceMountainSeesawSlipD", nullptr, "IceMountainSeesawSlipD", }, - { "IceRingBumpyPartsA", nullptr, "IceRingBumpyPartsA", }, - { "IceWaterUpDownParts", nullptr, "IceWaterUpDownParts", }, - { "LavaUpDownParts", nullptr, "LavaUpDownParts", }, - { "IceUpDownShutterDoorA", nullptr, "IceUpDownShutterDoorA", }, - { "IceLavaIslandSnowStepA", createNameObj, "IceLavaIslandSnowStepA", }, - { "IceLavaIslandIceMovableStepA", nullptr, "IceLavaIslandIceMovableStepA", }, - { "IceLavaIslandLavaMovableStepA", nullptr, "IceLavaIslandLavaMovableStepA", }, - { "HoleBeltConveyerPartsA", nullptr, "HoleBeltConveyerPartsA", }, - { "HoleBeltConveyerPartsB", nullptr, "HoleBeltConveyerPartsB", }, - { "HoleBeltConveyerPartsC", nullptr, "HoleBeltConveyerPartsC", }, - { "HoleBeltConveyerPartsD", nullptr, "HoleBeltConveyerPartsD", }, - { "HoleBeltConveyerPartsE", nullptr, "HoleBeltConveyerPartsE", }, - { "HoleBeltConveyerPartsF", nullptr, "HoleBeltConveyerPartsF", }, - { "HoleBeltConveyerPartsG", createNameObj, "HoleBeltConveyerPartsG", }, - { "HoleBeltConveyerPartsH", nullptr, "HoleBeltConveyerPartsH", }, - { "ChallengeBallAccelCylinderA", createNameObj, "ChallengeBallAccelCylinderA", }, - { "ChallengeBallGearA", createNameObj, "ChallengeBallGearA", }, - { "ChallengeBallMoveGroundA", nullptr, "ChallengeBallMoveGroundA", }, - { "ChallengeBallMoveGroundB", nullptr, "ChallengeBallMoveGroundB", }, - { "ChallengeBallRotateBridgeA", createNameObj, "ChallengeBallRotateBridgeA", }, - { "ChallengeBallVanishingRoadA", createNameObj, "ChallengeBallVanishingRoadA", }, - { "TrialBubbleTimerMoveWallA", nullptr, "TrialBubbleTimerMoveWallA", }, - { "TrialBubbleRotateWallA", createNameObj, "TrialBubbleRotateWallA", }, - { "TrialBubbleRevolvingPartsA", createNameObj, "TrialBubbleRevolvingPartsA", }, - { "TrialBubbleMoveWallA", nullptr, "TrialBubbleMoveWallA", }, - { "CubeBubbleExHomeStep", createNameObj, "CubeBubbleExHomeStep", }, - { "CubeBubbleExStartStep", createNameObj, "CubeBubbleExStartStep", }, - { "CubeBubbleExRotateWallS", createNameObj, "CubeBubbleExRotateWallS", }, - { "CubeBubbleExRotateWallL", createNameObj, "CubeBubbleExRotateWallL", }, - { "CubeBubbleExPartsA", createNameObj, "CubeBubbleExPartsA", }, - { "UFONormalB", nullptr, "UFONormalB", }, - { "UFONormalD", nullptr, "UFONormalD", }, - { "UFOStrongA", nullptr, "UFOStrongA", }, - { "UFOBattleStageC", nullptr, "UFOBattleStageC", }, - { "UFOBattleStageD", nullptr, "UFOBattleStageD", }, - { "UFOBattleStageE", nullptr, "UFOBattleStageE", }, - { "UFOKinoko", nullptr, "UFOKinoko", }, - { "UFOKinokoLanding", createNameObj, "UFOKinokoLanding", }, - { "UFOBlueStarCupsule", nullptr, "UFOBlueStarCupsule", }, - { "KoopaShipA", createNameObj, "KoopaShipA", }, - { "KoopaShipB", createNameObj, "KoopaShipB", }, - { "KoopaShipC", createNameObj, "KoopaShipC", }, - { "KoopaShipD", createNameObj, "KoopaShipD", }, - { "KoopaShipE", createNameObj, "KoopaShipE", }, - { "KoopaShipSeesawStep", nullptr, "KoopaShipSeesawStep", }, - { "KoopaJrSmallShipA", nullptr, "KoopaJrSmallShipA", }, - { "KoopaJrSmallShipAGuidePoint", createNameObj, "KoopaJrSmallShipAGuidePoint", }, - { "KoopaJrKillerShipA", createNameObj, "KoopaJrKillerShipA", }, - { "KoopaJrNormalShipA", createNameObj, "KoopaJrNormalShipA", }, - { "WaterRoadCaveStepA", nullptr, "WaterRoadCaveStepA", }, - { "WaterRoadCaveStepB", createNameObj, "WaterRoadCaveStepB", }, - { "WaterRoadCaveRotateGround", createNameObj, "WaterRoadCaveRotateGround", }, - { "SubmarineVolcanoInside", createNameObj, "SubmarineVolcanoInside", }, - { "SubmarineVolcanoBigColumn", nullptr, "SubmarineVolcanoBigColumn", }, - { "SubmarineVolcanoSmallColumn", nullptr, "SubmarineVolcanoSmallColumn", }, - { "OnimasuPlanetPartsGoal", createNameObj, "OnimasuPlanetPartsGoal", }, - { "OnimasuPlanetObstaclePartsA", createNameObj, "OnimasuPlanetObstaclePartsA", }, - { "OnimasuPlanetRailMovePartsA", nullptr, "OnimasuPlanetRailMovePartsA", }, - { "OnimasuPlanetRotatePartsA", createNameObj, "OnimasuPlanetRotatePartsA", }, - { "OnimasuPlanetRotatePartsB", createNameObj, "OnimasuPlanetRotatePartsB", }, - { "PhantomShipPropellerSmall", nullptr, "PhantomShipPropellerSmall", }, - { "PhantomShipPropellerBig", nullptr, "PhantomShipPropellerBig", }, - { "PhantomShipHandle", nullptr, "PhantomShipHandle", }, - { "PhantomShipBridge", createNameObj, "PhantomShipBridge", }, - { "TakoBarrelA", nullptr, "TakoBarrelA", }, - { "TakoBarrelB", createNameObj, "TakoBarrelB", }, - { "KoopaRestarterVs3", nullptr, nullptr, }, - { "KoopaPowerUpSwitch", nullptr, nullptr, }, - { "KoopaSwitchKeeper", nullptr, nullptr, }, - { "KoopaViewSwitchKeeper", nullptr, nullptr, }, - { "KoopaBattleMapStair", createNameObj, "KoopaBattleMapStair", }, - { "KoopaBattleMapPlate", createNameObj, "KoopaPlate", }, - { "KoopaBattleMapCoinPlate", nullptr, "KoopaPlateCoin", }, - { "KoopaBattleMapStairBig", createNameObj, "KoopaBattleMapStairBig", }, - { "KoopaBattleMapStairTurn", createNameObj, "KoopaBattleMapStairTurn", }, - { "KoopaBattleMapStairturnAppear", nullptr, "KoopaBattleMapStairTurn", }, - { "KoopaVS1PartsSpiralRoad", createNameObj, "KoopaVS1PartsSpiralRoad", }, - { "KoopaVS1PartsMoveStepA", nullptr, "KoopaVS1PartsMoveStepA", }, - { "KoopaVS1PartsMoveStepB", nullptr, "KoopaVS1PartsMoveStepB", }, - { "KoopaVS1PartsRotateMoveStepA", nullptr, "KoopaVS1PartsRotateMoveStepA", }, - { "KoopaVS1PartsRotateMoveStepB", nullptr, "KoopaVS1PartsRotateMoveStepB", }, - { "KoopaVS1PartsReverseGRoad", createNameObj, "KoopaVS1PartsReverseGRoad", }, - { "KoopaVS1PartsStairRoad", createNameObj, "KoopaVS1PartsStairRoad", }, - { "KoopaVS1PartsBattleStage", createNameObj, "KoopaVS1PartsBattleStage", }, - { "KoopaVS2PartsReverseGRoadA", createNameObj, "KoopaVS2PartsReverseGRoadA", }, - { "KoopaVS2PartsReverseGRoadB", createNameObj, "KoopaVS2PartsReverseGRoadB", }, - { "KoopaVS2PartsStartRestStep", createNameObj, "KoopaVS2PartsStartRestStep", }, - { "KoopaVS2PartsRestStepA", createNameObj, "KoopaVS2PartsRestStepA", }, - { "KoopaVS2PartsRestStepB", createNameObj, "KoopaVS2PartsRestStepB", }, - { "KoopaVS2PartsRestStepC", createNameObj, "KoopaVS2PartsRestStepC", }, - { "KoopaVS2PartsRestClipC", nullptr, "KoopaVS2PartsRestClipC", }, - { "KoopaVS2PartsRestStepD", createNameObj, "KoopaVS2PartsRestStepD", }, - { "KoopaVS2PartsRestStepE", createNameObj, "KoopaVS2PartsRestStepE", }, - { "KoopaVS2PartsRestStepF", createNameObj, "KoopaVS2PartsRestStepF", }, - { "KoopaVS2PartsRestStepG", createNameObj, "KoopaVS2PartsRestStepG", }, - { "KoopaVS2PartsDarkMatterA", createNameObj, "KoopaVS2PartsDarkMatterA", }, - { "KoopaVS2PartsDarkMatterB", createNameObj, "KoopaVS2PartsDarkMatterB", }, - { "KoopaVS2PartsDarkMatterC", createNameObj, "KoopaVS2PartsDarkMatterC", }, - { "KoopaVS2PartsDarkMatterD", createNameObj, "KoopaVS2PartsDarkMatterD", }, - { "KoopaVS2PartsDarkMatterE", createNameObj, "KoopaVS2PartsDarkMatterE", }, - { "KoopaVS2PartsStartMoveStepA", createNameObj, "KoopaVS2PartsStartMoveStepA", }, - { "KoopaVS2PartsStartMoveStepB", createNameObj, "KoopaVS2PartsStartMoveStepB", }, - { "KoopaVS2PartsStartMoveStepC", nullptr, "KoopaVS2PartsStartMoveStepC", }, - { "KoopaVS2PartsRollingStep", createNameObj, "KoopaVS2PartsRollingStep", }, - { "KoopaVS2Parts2DMoveStepBarA", nullptr, "KoopaVS2Parts2DMoveStepBarA", }, - { "KoopaVS2Parts2DMoveStepBarB", nullptr, "KoopaVS2Parts2DMoveStepBarB", }, - { "KoopaVS2Parts2DMoveStepSBarB", nullptr, "KoopaVS2Parts2DMoveStepSBarB", }, - { "KoopaVS2Parts2DMoveStepConvex", nullptr, "KoopaVS2Parts2DMoveStepConvex", }, - { "KoopaVS2Parts2DMoveStepLShape", nullptr, "KoopaVS2Parts2DMoveStepLShape", }, - { "KoopaVS2Parts2DMoveStepCross", nullptr, "KoopaVS2Parts2DMoveStepCross", }, - { "KoopaVS2PartsJoinedMoveStep", nullptr, "KoopaVS2PartsJoinedMoveStep", }, - { "KoopaVS2PartsJoinedMoveClip", nullptr, "KoopaVS2PartsJoinedMoveClip", }, - { "KoopaVS2PartsSquareMoveStepA", nullptr, "KoopaVS2PartsSquareMoveStepA", }, - { "KoopaVS2PartsSquareMoveClipA", nullptr, "KoopaVS2PartsSquareMoveClipA", }, - { "KoopaVS2PartsSquareMoveStepB", nullptr, "KoopaVS2PartsSquareMoveStepB", }, - { "KoopaVS2PartsSquareMoveClipB", nullptr, "KoopaVS2PartsSquareMoveClipB", }, - { "KoopaVS2PartsClipAreaDisplayA", nullptr, "KoopaVS2PartsClipAreaDisplayA", }, - { "KoopaVS2PartsStairBig", createNameObj, "KoopaVS2PartsStairBig", }, - { "KoopaVS2Parts2DRailGuideA", createNameObj, "KoopaVS2Parts2DRailGuideA", }, - { "KoopaVS3RotateStepA", createNameObj, "KoopaVS3RotateStepA", }, - { "KoopaVS3RotateStepB", createNameObj, "KoopaVS3RotateStepB", }, - { "KoopaVS3RotateStepD", createNameObj, "KoopaVS3RotateStepD", }, - { "KoopaVS3RotateStepsA", createNameObj, "KoopaVS3RotateStepsA", }, - { "KoopaVS3Parts2DWallA", createNameObj, "KoopaVS3Parts2DWallA", }, - { "TreasureBoxCrackedEmpty", createNameObj, "TreasureBoxCracked", }, - { "TreasureBoxCrackedCoin", createNameObj, "TreasureBoxCracked", }, - { "TreasureBoxCrackedYellowChip", createNameObj, "TreasureBoxCracked", }, - { "TreasureBoxCrackedBlueChip", createNameObj, "TreasureBoxCracked", }, - { "TreasureBoxCrackedKinokoOneUp", createNameObj, "TreasureBoxCracked", }, - { "TreasureBoxCrackedKinokoLifeUp", createNameObj, "TreasureBoxCracked", }, - { "TreasureBoxCrackedAirBubble", createNameObj, "TreasureBoxCracked", }, - { "TreasureBoxCrackedPowerStar", createNameObj, "TreasureBoxCracked", }, - { "TreasureBoxEmpty", createNameObj, "TreasureBox", }, - { "TreasureBoxCoin", createNameObj, "TreasureBox", }, - { "TreasureBoxYellowChip", createNameObj, "TreasureBox", }, - { "TreasureBoxBlueChip", createNameObj, "TreasureBox", }, - { "TreasureBoxKinokoOneUp", createNameObj, "TreasureBox", }, - { "TreasureBoxKinokoLifeUp", createNameObj, "TreasureBox", }, - { "TreasureBoxGoldEmpty", createNameObj, "TreasureBoxGold", }, - { "OceanRingRuinsMove", nullptr, "OceanRingRuinsMove", }, - { "OceanRingRuinsGearSmall", createNameObj, "OceanRingRuinsGearSmall", }, - { "OceanRingRuinsGearBig", createNameObj, "OceanRingRuinsGearBig", }, - { "OceanRingRuinsColumn", createNameObj, "OceanRingRuinsColumn", }, - { "OceanRingRuinsBase", createNameObj, "OceanRingRuinsBase", }, - { "KameckShip", createNameObj, "KameckShip", }, - { "BeachParasol", createNameObj, "BeachParasol", }, - { "BeachChair", createNameObj, "BeachChair", }, - { "GhostShipCaveMoveGroundA", nullptr, "GhostShipCaveMoveGroundA", }, - { "GhostShipCaveMoveGroundB", nullptr, "GhostShipCaveMoveGroundB", }, - { "PhantomShipBoxFloaterA", nullptr, "PhantomShipBoxFloaterA", }, - { "PhantomShipBoxFloaterB", nullptr, "PhantomShipBoxFloaterB", }, - { "PhantomShipBoxFloaterC", nullptr, "PhantomShipBoxFloaterC", }, - { "PhantomCaveStepA", createNameObj, "PhantomCaveStepA", }, - { "GhostShipCaveClosedRockA", createNameObj, "GhostShipCaveClosedRockA", }, - { "GhostShipBrokenHead", createNameObj, "GhostShipBrokenHead", }, - { "CannonUnderConstructionA", createNameObj, "CannonUnderConstructionA", }, - { "CannonUnderConstructionB", createNameObj, "CannonUnderConstructionB", }, - { "GhostShipCavePipeCollision", nullptr, "GhostShipCavePipeCollision", }, - { "AstroMapBoard", nullptr, "AstroMapBoard", }, - { "AstroCore", createNameObj, "AstroCore", }, - { "AstroCountDownPlate", createNameObj, "AstroCountDownPlate", }, - { "AstroDome", createNameObj, nullptr, }, - { "AstroDomeEntrance", createNameObj, nullptr, }, - { "AstroStarPlate", createNameObj, nullptr, }, - { "AstroBaseA", createNameObj, "AstroBaseA", }, - { "AstroBaseB", createNameObj, "AstroBaseB", }, - { "AstroBaseC", createNameObj, "AstroBaseC", }, - { "AstroBaseKitchen", createNameObj, "AstroBaseKitchen", }, - { "AstroBaseCenterA", createNameObj, "AstroBaseCenterA", }, - { "AstroBaseCenterB", createNameObj, "AstroBaseCenterB", }, - { "AstroBaseCenterTop", createNameObj, "AstroBaseCenterTop", }, - { "AstroRotateStepA", createNameObj, "AstroRotateStepA", }, - { "AstroRotateStepB", createNameObj, "AstroRotateStepB", }, - { "AstroDecoratePartsA", createNameObj, "AstroDecoratePartsA", }, - { "AstroDecoratePartsGearA", createNameObj, "AstroDecoratePartsGearA", }, - { "AstroChildRoom", createNameObj, "AstroChildRoom", }, - { "AstroParking", createNameObj, "AstroParking", }, - { "AstroLibrary", createNameObj, "AstroLibrary", }, - { "AstroRoomLibrary", createNameObj, "AstroRoomLibrary", }, - { "AstroTorchLightRed", nullptr, nullptr, }, - { "AstroTorchLightBlue", nullptr, nullptr, }, - { "EffectTicoS", nullptr, nullptr, }, - { "EffectTicoL", nullptr, nullptr, }, - { "UFOKinokoUnderConstruction", nullptr, nullptr, }, - { "UFOKinokoLandingAstro", createNameObj, "UFOKinokoLandingAstro", }, - { "AstroDomeSky", nullptr, nullptr, }, - { "WhiteRoom", createNameObj, "WhiteRoom", }, - { "VROrbit", createNameObj, "VROrbit", }, - { "VRDarkSpace", createNameObj, "VRDarkSpace", }, - { "VRSandwichSun", createNameObj, "VRSandwichSun", }, - { "SummerSky", createNameObj, "SummerSky", }, - { "GalaxySky", createNameObj, "GalaxySky", }, - { "MilkyWaySky", createNameObj, "MilkyWaySky", }, - { "HalfGalaxySky", createNameObj, "HalfGalaxySky", }, - { "GreenPlanetOrbitSky", createNameObj, "GreenPlanetOrbitSky", }, - { "PhantomSky", createNameObj, "PhantomSky", }, - { "KoopaVS1Sky", createNameObj, "KoopaVS1Sky", }, - { "KoopaVS2Sky", createNameObj, "KoopaVS2Sky", }, - { "FamicomMarioSky", createNameObj, "FamicomMarioSky", }, - { "DesertSky", createNameObj, "DesertSky", }, - { "ChildRoomSky", createNameObj, "ChildRoomSky", }, - { "AuroraSky", createNameObj, "AuroraSky", }, - { "CloudSky", createNameObj, "CloudSky", }, - { "RockPlanetOrbitSky", createNameObj, "RockPlanetOrbitSky", }, - { "StarrySky", createNameObj, "StarrySky", }, - { "AstroDomeSkyA", createNameObj, "AstroDomeSkyA", }, - { "HomeAir", createNameObj, "HomeAir", }, - { "SphereAir", createNameObj, "SphereAir", }, - { "SunsetAir", createNameObj, "SunsetAir", }, - { "FineAir", createNameObj, "FineAir", }, - { "DimensionAir", createNameObj, "DimensionAir", }, - { "DarknessRoomAir", createNameObj, "DarknessRoomAir", }, - { "TwilightAir", createNameObj, "TwilightAir", }, - { "ZoneHalo", createNameObj, "ZoneHalo", }, - { "PowerStarHalo", createNameObj, "PowerStarHalo", }, - { "Coin", MR::createDirectSetCoin, "Coin", }, - { "PurpleCoin", MR::createDirectSetPurpleCoin, "PurpleCoin", }, - { "RailCoin", nullptr, nullptr, }, - { "CircleCoinGroup", MR::createCircleCoinGroup, nullptr, }, - { "PurpleRailCoin", nullptr, "PurpleCoin", }, - { "CirclePurpleCoinGroup", MR::createCirclePurpleCoinGroup, "PurpleCoin", }, - { "PurpleCoinStarter", createNameObj, nullptr, }, - { "CoinReplica", createNameObj, nullptr, }, - { "QuestionCoin", nullptr, "QuestionCoin", }, - { "BlueChip", createNameObj, "BlueChip", }, - { "YellowChip", createNameObj, "YellowChip", }, - { "BlueChipGroup", createNameObj, nullptr, }, - { "YellowChipGroup", createNameObj, nullptr, }, - { "StarPiece", nullptr, "StarPiece", }, - { "StarPieceFlow", nullptr, nullptr, }, - { "StarPieceGroup", nullptr, nullptr, }, - { "StarPieceFollowGroup", nullptr, nullptr, }, - { "StarPieceMother", nullptr, "StarPieceMother", }, - { "StarPieceSpot", nullptr, nullptr, }, - { "OceanBowl", nullptr, "WaterWave", }, - { "OceanRing", nullptr, "OceanRing", }, - { "OceanRingAndFlag", nullptr, "OceanRing", }, - { "OceanSphere", nullptr, "WaterWave", }, - { "WhirlPool", nullptr, nullptr, }, - { "WhirlPoolAccelerator", nullptr, "Whirlpool", }, - { "FishGroupA", nullptr, "FishA", }, - { "FishGroupB", nullptr, "FishB", }, - { "FishGroupC", nullptr, "FishC", }, - { "FishGroupD", nullptr, "FishD", }, - { "FishGroupE", nullptr, "FishE", }, - { "FishGroupF", nullptr, "FishF", }, - { "Flag", nullptr, "Flag", }, - { "FlagKoopaA", nullptr, "FlagKoopaA", }, - { "FlagKoopaB", nullptr, "FlagKoopaB", }, - { "FlagRaceA", nullptr, "FlagRaceA", }, - { "FlagKoopaCastle", nullptr, "FlagKoopaCastle", }, - { "FlagPeachCastleA", nullptr, "FlagPeachCastleA", }, - { "FlagPeachCastleB", nullptr, "FlagPeachCastleB", }, - { "FlagPeachCastleC", nullptr, "FlagPeachCastleC", }, - { "FlagSurfing", nullptr, "FlagSurfing", }, - { "FlagTamakoro", nullptr, "FlagTamakoro", }, - { "SeaGullGroup", createNameObj, "SeaGull", }, - { "WaterPlant", nullptr, "WaterPlant", }, - { "HitWallTimerSwitch", nullptr, "HitWallTimerSwitch", }, - { "PTimerSwitch", nullptr, "PTimerSwitch", }, - { "CrystalSwitch", createNameObj, "CrystalSwitch", }, - { "HipDropSwitch", createNameObj, "HipDropSwitch", }, - { "HipDropTimerSwitch", nullptr, "HipDropTimerSwitch", }, - { "DesertLandUpSwitch", nullptr, "DesertLandUpSwitch", }, - { "DesertLandDownSwitch", nullptr, "DesertLandDownSwitch", }, - { "ScrewSwitch", nullptr, "ScrewSwitch", }, - { "ScrewSwitchReverse", nullptr, "ScrewSwitchReverse", }, - { "PicketSwitch", nullptr, "PicketSwitch", }, - { "PicketSwitchBig", nullptr, "PicketSwitchBig", }, - { "ValveSwitch", nullptr, "ValveSwitch", }, - { "KeySwitch", createNameObj, "KeySwitch", }, - { "SpinLeverSwitch", nullptr, "SpinLeverSwitch", }, - { "EffectObjSample", nullptr, nullptr, }, - { "ShootingStarArea", nullptr, nullptr, }, - { "IcePlanetLight", nullptr, nullptr, }, - { "IceLayerBreak", nullptr, nullptr, }, - { "LavaSparksS", nullptr, nullptr, }, - { "LavaSparksL", nullptr, nullptr, }, - { "SpaceDustS", nullptr, nullptr, }, - { "SpaceDustL", nullptr, nullptr, }, - { "BirdLouseS", nullptr, nullptr, }, - { "BirdLouseL", nullptr, nullptr, }, - { "SnowS", nullptr, nullptr, }, - { "FallingSmallRock", nullptr, nullptr, }, - { "LavaHomeVolcanoFallingRock", nullptr, nullptr, }, - { "Fountain", createNameObj, nullptr, }, - { "FountainBig", createNameObj, "FountainBig", }, - { "WaterfallS", nullptr, nullptr, }, - { "WaterfallL", nullptr, nullptr, }, - { "DrainPipeBubbleA", nullptr, nullptr, }, - { "DrainPipeBubbleB", nullptr, nullptr, }, - { "WaterDropTop", nullptr, nullptr, }, - { "WaterDropBottom", nullptr, nullptr, }, - { "WaterDropMiddle", nullptr, nullptr, }, - { "SubmarineSteam", nullptr, nullptr, }, - { "SubmarineVolcano", nullptr, nullptr, }, - { "WaterLayerBreak", nullptr, nullptr, }, - { "StarPieceClusterBreak", nullptr, nullptr, }, - { "FireworksA", nullptr, nullptr, }, - { "BattleShipExplosionRock", nullptr, nullptr, }, - { "BattleShipExplosionMetal", nullptr, nullptr, }, - { "ForestWaterfallS", nullptr, nullptr, }, - { "ForestWaterfallL", nullptr, nullptr, }, - { "SandBreezeS", nullptr, nullptr, }, - { "SandBreezeL", nullptr, nullptr, }, - { "SpringJetWater", nullptr, nullptr, }, - { "SandUpDownKGBaseEffect", nullptr, nullptr, }, - { "SandUpDownTowerTopEffect", nullptr, nullptr, }, - { "UFOSandObstacleAEffect", nullptr, nullptr, }, - { "UFOSandObstacleBEffect", nullptr, nullptr, }, - { "UFOSandObstacleCEffect", nullptr, nullptr, }, - { "GravityDust", nullptr, nullptr, }, - { "Steam", nullptr, nullptr, }, - { "FallRedLeaf", nullptr, nullptr, }, - { "FallGreenLeaf", nullptr, nullptr, }, - { "IcicleRockLight", nullptr, nullptr, }, - { "TwinFallLakeWaterFall", nullptr, nullptr, }, - { "EffectTeresa", nullptr, nullptr, }, - { "UFOKinokoLandingBlackSmoke", nullptr, nullptr, }, - { "InvisibleWall10x10", nullptr, "InvisibleWall10x10", }, - { "InvisibleWall10x20", nullptr, "InvisibleWall10x20", }, - { "InvisibleWallJump10x10", nullptr, "InvisibleWallJump10x10", }, - { "InvisibleWallJump10x20", nullptr, "InvisibleWallJump10x20", }, - { "InvisibleWallGCapture10x10", nullptr, "InvisibleWallGCapture10x10", }, - { "InvisibleWallGCapture10x20", nullptr, "InvisibleWallGCapture10x20", }, - { "PolygonCodeRecoveryPlate", nullptr, "PolygonCodeRecoveryPlate", }, - { "PolygonCodeRecoveryBowl", nullptr, "PolygonCodeRecoveryBowl", }, - { "InvisibleWallBattleShipA", nullptr, "InvisibleWallBattleShipA", }, - { "InvisibleWaterfall", nullptr, "InvisibleWaterfall", }, - { "InvisibleWaterfallTwinFallLake", nullptr, "InvisibleWaterfallTwinFallLake", }, - { "StatusFloor", nullptr, "StatusFloor", }, - { "GlobalCubeGravity", MR::createGlobalCubeGravityObj, nullptr, }, - { "GlobalConeGravity", MR::createGlobalConeGravityObj, nullptr, }, - { "GlobalDiskGravity", MR::createGlobalDiskGravityObj, nullptr, }, - { "GlobalDiskTorusGravity", MR::createGlobalDiskTorusGravityObj, nullptr, }, - { "GlobalPlaneGravity", MR::createGlobalPlaneGravityObj, nullptr, }, - { "GlobalPlaneGravityInBox", MR::createGlobalPlaneInBoxGravityObj, nullptr, }, - { "GlobalPlaneGravityInCylinder", MR::createGlobalPlaneInCylinderGravityObj, nullptr, }, - { "GlobalPointGravity", MR::createGlobalPointGravityObj, nullptr, }, - { "GlobalSegmentGravity", MR::createGlobalSegmentGravityObj, nullptr, }, - { "GlobalWireGravity", MR::createGlobalWireGravityObj, nullptr, }, - { "MiniEggStarGalaxy", nullptr, nullptr, }, - { "MiniHoneyBeeKingdomGalaxy", nullptr, nullptr, }, - { "MiniFlipPanelExGalaxy", nullptr, nullptr, }, - { "MiniSurfingLv1Galaxy", nullptr, nullptr, }, - { "MiniTriLegLv1Galaxy", nullptr, nullptr, }, - { "MiniStarDustGalaxy", nullptr, nullptr, }, - { "MiniTamakoroExLv1Galaxy", nullptr, nullptr, }, - { "MiniBattleShipGalaxy", nullptr, nullptr, }, - { "MiniBreakDownPlanetGalaxy", nullptr, nullptr, }, - { "MiniKoopaBattleVs1Galaxy", nullptr, nullptr, }, - { "MiniHeavenlyBeachGalaxy", nullptr, nullptr, }, - { "MiniCubeBubbleExLv1Galaxy", nullptr, nullptr, }, - { "MiniPhantomGalaxy", nullptr, nullptr, }, - { "MiniOceanFloaterLandGalaxy", nullptr, nullptr, }, - { "MiniKoopaJrShipLv1Galaxy", nullptr, nullptr, }, - { "MiniCosmosGardenGalaxy", nullptr, nullptr, }, - { "MiniIceVolcanoGalaxy", nullptr, nullptr, }, - { "MiniHoneyBeeExGalaxy", nullptr, nullptr, }, - { "MiniSandClockGalaxy", nullptr, nullptr, }, - { "MiniKoopaBattleVs2Galaxy", nullptr, nullptr, }, - { "MiniReverseKingdomGalaxy", nullptr, nullptr, }, - { "MiniOceanRingGalaxy", nullptr, nullptr, }, - { "MiniFactoryGalaxy", nullptr, nullptr, }, - { "MiniSkullSharkGalaxy", nullptr, nullptr, }, - { "MiniFloaterOtaKingGalaxy", nullptr, nullptr, }, - { "MiniOceanPhantomCaveGalaxy", nullptr, nullptr, }, - { "MiniCannonFleetGalaxy", nullptr, nullptr, }, - { "MiniDarkRoomGalaxy", nullptr, nullptr, }, - { "MiniHellProminenceGalaxy", nullptr, nullptr, }, - { "MiniKoopaBattleVs3Galaxy", nullptr, nullptr, }, - { "SurprisedGalaxy", nullptr, "MiniSurprisedGalaxy", }, - { "SurpBeltConveyerExGalaxy", nullptr, "MiniSurprisedGalaxy", }, - { "SurpCocoonExGalaxy", nullptr, "MiniSurprisedGalaxy", }, - { "SurpTearDropGalaxy", nullptr, "MiniSurprisedGalaxy", }, - { "SurpTeresaMario2DGalaxy", nullptr, "MiniSurprisedGalaxy", }, - { "SurpSnowCapsuleGalaxy", nullptr, "MiniSurprisedGalaxy", }, - { "SurpTransformationExGalaxy", nullptr, "MiniSurprisedGalaxy", }, - { "SurpFishTunnelGalaxy", nullptr, "MiniSurprisedGalaxy", }, - { "SurpTamakoroExLv2Galaxy", nullptr, "MiniSurprisedGalaxy", }, - { "SurpSurfingLv2Galaxy", nullptr, "MiniSurprisedGalaxy", }, - { "SurpCubeBubbleExLv2Galaxy", nullptr, "MiniSurprisedGalaxy", }, - { "SurpPeachCastleFinalGalaxy", nullptr, "MiniSurprisedGalaxy", }, - { "ClipFieldSwitch", createNameObj, nullptr, }, - { "FallOutFieldDraw", nullptr, nullptr, }, - { "ClipFieldFillDraw", nullptr, nullptr, }, - { "SpotLightVolumeDraw", nullptr, nullptr, }, - { "GroupSwitchWatcher", nullptr, nullptr, }, - { "RaceRail", nullptr, nullptr, }, - { "TimerSwitch", createNameObj, nullptr, }, - { "SwitchSynchronizerReverse", nullptr, nullptr, }, - { "MovieStarter", nullptr, "CinemaSuper", }, - { "DemoGroup", nullptr, nullptr, }, - { "DemoSubGroup", nullptr, nullptr, }, - { "AstroDomeDemoStarter", nullptr, "SuperSpinDriver", }, - { "AstroDomeGalaxySelector", nullptr, nullptr, }, - { "StarReturnDemoStarter", nullptr, nullptr, }, - { "GrandStarReturnDemoStarter", nullptr, "GrandStar", }, - { "ScenarioStarter", nullptr, "Welcome", }, - { "FileSelector", nullptr, nullptr, }, + { + "SwitchCube", + nullptr, + nullptr, + }, + { + "SwitchSphere", + nullptr, + nullptr, + }, + { + "SwitchCylinder", + nullptr, + nullptr, + }, + { + "CubeCameraBox", + createCenterOriginCube, + nullptr, + }, + { + "CubeCameraCylinder", + createBaseOriginCylinder, + nullptr, + }, + { + "CubeCameraSphere", + createSphere, + nullptr, + }, + { + "CubeCameraBowl", + createBowl, + nullptr, + }, + { + "EffectCylinder", + nullptr, + nullptr, + }, + { + "BindEndCube", + nullptr, + nullptr, + }, + { + "DeathCube", + createBaseOriginCube, + nullptr, + }, + { + "DeathSphere", + createSphere, + nullptr, + }, + { + "DeathCylinder", + createBaseOriginCylinder, + nullptr, + }, + { + "PullBackCube", + nullptr, + nullptr, + }, + { + "PullBackCylinder", + nullptr, + nullptr, + }, + { + "RestartCube", + createBaseOriginCube, + nullptr, + }, + { + "WarpCube", + createBaseOriginCube, + nullptr, + }, + { + "TripodBossStepStartArea", + createSphere, + nullptr, + }, + { + "ChangeBgmCube", + createBaseOriginCube, + nullptr, + }, + { + "BgmProhibitArea", + createSphere, + nullptr, + }, + { + "SoundEmitterCube", + nullptr, + nullptr, + }, + { + "SoundEmitterSphere", + nullptr, + nullptr, + }, + { + "WaterCube", + nullptr, + nullptr, + }, + { + "WaterSphere", + nullptr, + nullptr, + }, + { + "WaterCylinder", + nullptr, + nullptr, + }, + { + "FallsCube", + nullptr, + nullptr, + }, + { + "PlaneModeCube", + nullptr, + nullptr, + }, + { + "PlaneCircularModeCube", + nullptr, + nullptr, + }, + { + "PipeModeCube", + nullptr, + nullptr, + }, + { + "TowerModeCylinder", + nullptr, + nullptr, + }, + { + "BloomCube", + createCenterOriginCube, + nullptr, + }, + { + "BloomSphere", + createSphere, + nullptr, + }, + { + "BloomCylinder", + createBaseOriginCylinder, + nullptr, + }, + { + "SimpleBloomCube", + nullptr, + nullptr, + }, + { + "SimpleBloomSphere", + nullptr, + nullptr, + }, + { + "SimpleBloomCylinder", + nullptr, + nullptr, + }, + { + "ScreenBlurCube", + nullptr, + nullptr, + }, + { + "ScreenBlurSphere", + nullptr, + nullptr, + }, + { + "ScreenBlurCylinder", + nullptr, + nullptr, + }, + { + "DepthOfFieldCube", + createCenterOriginCube, + nullptr, + }, + { + "DepthOfFieldSphere", + createSphere, + nullptr, + }, + { + "DepthOfFieldCylinder", + createBaseOriginCylinder, + nullptr, + }, + { + "ClipAreaCenterBox", + nullptr, + "ClipVolumeBox", + }, + { + "ClipAreaBottomBox", + nullptr, + "ClipVolumeBox", + }, + { + "ClipAreaTopCone", + nullptr, + "ClipVolumeSphere", + }, + { + "ClipAreaBottomCone", + nullptr, + "ClipVolumeSphere", + }, + { + "ClipAreaSphere", + nullptr, + "ClipVolumeSphere", + }, + { + "LightCtrlCube", + createBaseOriginCube, + nullptr, + }, + { + "LightCtrlCylinder", + createBaseOriginCylinder, + nullptr, + }, + { + "PlaneCollisionCube", + nullptr, + nullptr, + }, + { + "ForbidTriangleJumpCube", + nullptr, + nullptr, + }, + { + "ForbidWaterSearchCube", + nullptr, + nullptr, + }, + { + "QuakeEffectAreaCube", + nullptr, + nullptr, + }, + { + "HazeCube", + createBaseOriginCube, + nullptr, + }, + { + "LensFlareArea", + createBaseOriginCube, + nullptr, + }, + { + "CameraRepulsiveSphere", + createNameObj, + nullptr, + }, + { + "CameraRepulsiveCylinder", + createNameObj, + nullptr, + }, + { + "SunLightAreaBox", + createBaseOriginCube, + nullptr, + }, + { + "GlaringLightAreaCylinder", + nullptr, + nullptr, + }, + { + "BigBubbleGoalAreaBox", + createBaseOriginCube, + nullptr, + }, + { + "BigBubbleGoalAreaCylinder", + createBaseOriginCylinder, + nullptr, + }, + { + "BigBubbleGoalAreaSphere", + createSphere, + nullptr, + }, + { + "BigBubbleCameraBox", + createBaseOriginCube, + nullptr, + }, + { + "BigBubbleCameraCylinder", + createBaseOriginCylinder, + nullptr, + }, + { + "BigBubbleCameraSphere", + createSphere, + nullptr, + }, + { + "BigBubbleSwitchBox", + nullptr, + nullptr, + }, + { + "BigBubbleSwitchCylinder", + nullptr, + nullptr, + }, + { + "BigBubbleSwitchSphere", + nullptr, + nullptr, + }, + { + "ViewGroupCtrlCube", + nullptr, + nullptr, + }, + { + "AudioEffectCube", + createBaseOriginCube, + nullptr, + }, + { + "AudioEffectSphere", + createSphere, + nullptr, + }, + { + "AudioEffectCylinder", + createBaseOriginCylinder, + nullptr, + }, + { + "PlayerSeCube", + nullptr, + nullptr, + }, + { + "PlayerSeSphere", + nullptr, + nullptr, + }, + { + "PlayerSeCylinder", + nullptr, + nullptr, + }, + { + "MercatorCube", + nullptr, + nullptr, + }, + { + "AstroChangeStageCube", + createBaseOriginCube, + nullptr, + }, + { + "BlueStarGuidanceCube", + nullptr, + nullptr, + }, + { + "TicoSeedGuidanceCube", + nullptr, + nullptr, + }, + { + "MessageAreaCube", + createBaseOriginCube, + nullptr, + }, + { + "MessageAreaCylinder", + createBaseOriginCylinder, + nullptr, + }, + { + "SmokeEffectColorAreaCube", + createBaseOriginCube, + nullptr, + }, + { + "BeeWallShortDistAreaCube", + createBaseOriginCube, + nullptr, + }, + { + "ExtraWallCheckArea", + createBaseOriginCube, + nullptr, + }, + { + "ExtraWallCheckCylinder", + createBaseOriginCylinder, + nullptr, + }, + { + "MirrorAreaCube", + createBaseOriginCube, + nullptr, + }, + { + "SpinGuidanceCube", + nullptr, + "SpinGuidance", + }, + { + "TamakoroMoveGuidanceCube", + nullptr, + "BallGuidance", + }, + { + "TamakoroJumpGuidanceCube", + nullptr, + "BallGuidance", + }, + { + "HeavySteeringCube", + createBaseOriginCube, + nullptr, + }, + { + "NonSleepCube", + createBaseOriginCube, + nullptr, + }, + { + "AreaMoveSphere", + createSphere, + nullptr, + }, + { + "DodoryuClosedCylinder", + nullptr, + nullptr, + }, + { + "DashChargeCylinder", + nullptr, + nullptr, + }, + { + "RasterScrollCube", + nullptr, + nullptr, + }, + { + "OnimasuCube", + nullptr, + nullptr, + }, + { + "ForbidJumpCube", + nullptr, + nullptr, + }, + { + "CollisionArea", + createCenterOriginCube, + nullptr, + }, + { + "AstroOverlookAreaCylinder", + nullptr, + nullptr, + }, + { + "CelestrialSphere", + nullptr, + nullptr, + }, + { + "DarkMatterCube", + nullptr, + nullptr, + }, + { + "DarkMatterCylinder", + nullptr, + nullptr, + }, + { + "Mario", + nullptr, + nullptr, + }, + { + "MarioActor", + nullptr, + nullptr, + }, + { + "Caretaker", + nullptr, + "Caretaker", + }, + { + "Rabbit", + nullptr, + "MoonRabbit", + }, + { + "TalkSyati", + nullptr, + "Syati", + }, + { + "CollectTico", + createNameObj, + "StrayTico", + }, + { + "TrickRabbit", + nullptr, + "TrickRabbit", + }, + { + "TrickRabbitFreeRun", + nullptr, + "TrickRabbit", + }, + { + "TrickRabbitFreeRunCollect", + nullptr, + "TrickRabbit", + }, + { + "RunawayRabbitCollect", + nullptr, + "TrickRabbit", + }, + { + "TrickRabbitGhost", + nullptr, + "TrickRabbit", + }, + { + "Kinopio", + nullptr, + "Kinopio", + }, + { + "KinopioAstro", + nullptr, + "Kinopio", + }, + { + "HoneyBee", + nullptr, + "HoneyBee", + }, + { + "HoneyQueen", + nullptr, + "HoneyQueen", + }, + { + "Peach", + createNameObj, + "Peach", + }, + { + "Penguin", + nullptr, + "Penguin", + }, + { + "PenguinCoach", + nullptr, + "PenguinCoach", + }, + { + "PenguinMaster", + nullptr, + "PenguinMaster", + }, + { + "PenguinRacer", + nullptr, + "Penguin", + }, + { + "PenguinRacerLeader", + nullptr, + "Penguin", + }, + { + "PenguinSkater", + nullptr, + "Penguin", + }, + { + "PenguinStudent", + nullptr, + "Penguin", + }, + { + "SignBoard", + createNameObj, + "SignBoard", + }, + { + "Syati", + nullptr, + "Syati", + }, + { + "Tico", + createNameObj, + nullptr, + }, + { + "TicoComet", + createNameObj, + "TicoComet", + }, + { + "TicoShop", + createNameObj, + "TicoShop", + }, + { + "TicoStarRing", + createNameObj, + "Tico", + }, + { + "TicoAstro", + createNameObj, + nullptr, + }, + { + "TicoBaby", + createNameObj, + nullptr, + }, + { + "DemoRabbit", + nullptr, + nullptr, + }, + { + "TicoFat", + createNameObj, + "TicoFat", + }, + { + "TicoGalaxy", + createNameObj, + "TicoFat", + }, + { + "TicoRail", + createNameObj, + "Tico", + }, + { + "TicoReading", + createNameObj, + "Tico", + }, + { + "TicoDomeLecture", + createNameObj, + "Tico", + }, + { + "Rosetta", + nullptr, + nullptr, + }, + { + "RosettaReading", + createNameObj, + "RosettaReading", + }, + { + "RosettaPictureBook", + createNameObj, + "RosettaPictureBook", + }, + { + "LuigiNPC", + nullptr, + nullptr, + }, + { + "LuigiEvent", + nullptr, + nullptr, + }, + { + "TeresaRacer", + nullptr, + "TeresaRacer", + }, + { + "NPCSupportRail", + nullptr, + nullptr, + }, + { + "GhostPlayer", + nullptr, + nullptr, + }, + { + "Butler", + createNameObj, + "Butler", + }, + { + "ButlerMap", + createNameObj, + "Butler", + }, + { + "ButlerExplain", + createNameObj, + "Butler", + }, + { + "DemoKoopaJrShip", + nullptr, + "KoopaJrShip", + }, + { + "Creeper", + nullptr, + "Creeper", + }, + { + "JetTurtle", + nullptr, + "Koura", + }, + { + "Fluff", + nullptr, + "Fluff", + }, + { + "FluffWind", + nullptr, + nullptr, + }, + { + "Tamakoro", + nullptr, + "Tamakoro", + }, + { + "TamakoroWithTutorial", + nullptr, + "Tamakoro", + }, + { + "GoldenTurtle", + nullptr, + "KouraShine", + }, + { + "JumpBranch", + nullptr, + "JumpBranch", + }, + { + "Plant", + nullptr, + "Plant", + }, + { + "Pole", + createNameObj, + "Pole", + }, + { + "PoleNoModel", + createNameObj, + "Pole", + }, + { + "PoleSquare", + createNameObj, + "PoleSquare", + }, + { + "PoleSquareNoModel", + createNameObj, + "PoleSquare", + }, + { + "SurfRay", + nullptr, + "SurfRay", + }, + { + "SwingRope", + nullptr, + "SwingRope", + }, + { + "SpaceCocoon", + nullptr, + "SpaceCocoon", + }, + { + "Trapeze", + nullptr, + "Trapeze", + }, + { + "TreeCube", + createNameObj, + "TreeCube", + }, + { + "WaterRoad", + nullptr, + "WaterWave", + }, + { + "WarpPod", + nullptr, + "WarpPod", + }, + { + "CoinBox", + createNameObj, + nullptr, + }, + { + "PunchBox", + nullptr, + "PunchBox", + }, + { + "SwitchBox", + createNameObj, + "SwitchBox", + }, + { + "NormalMapTestObj", + nullptr, + "NormalMapTestObj", + }, + { + "Takobo", + nullptr, + "Takobo", + }, + { + "Karikari", + nullptr, + "Karipon", + }, + { + "KoteBug", + nullptr, + "KoteBug", + }, + { + "Balloonfish", + nullptr, + "Balloonfish", + }, + { + "BombHei", + nullptr, + "BombHei", + }, + { + "Bomb", + nullptr, + "BombHei", + }, + { + "Jiraira", + nullptr, + "Jiraira", + }, + { + "BombHeiLauncher", + nullptr, + "BombHeiLauncher", + }, + { + "BombLauncher", + nullptr, + "BombHeiLauncher", + }, + { + "SpinDriver", + createNameObj, + "SpinDriver", + }, + { + "SuperSpinDriver", + MR::createSuperSpinDriverYellow, + "SuperSpinDriver", + }, + { + "SuperSpinDriverGreen", + MR::createSuperSpinDriverGreen, + "SuperSpinDriver", + }, + { + "SuperSpinDriverPink", + MR::createSuperSpinDriverPink, + "SuperSpinDriver", + }, + { + "Kuribo", + createNameObj, + "Kuribo", + }, + { + "KuriboChief", + nullptr, + "KuriboChief", + }, + { + "KuriboMini", + nullptr, + "KuriboMini", + }, + { + "Kabokuri", + nullptr, + "Kabokuri", + }, + { + "TakoHei", + nullptr, + "TakoHei", + }, + { + "OtaRock", + nullptr, + "OtaRock", + }, + { + "Meramera", + nullptr, + "Meramera", + }, + { + "IceMeramera", + nullptr, + "IceMeramera", + }, + { + "EyeBeamer", + nullptr, + "EyeBeamer", + }, + { + "BigBirikyu", + nullptr, + "BigBirikyu", + }, + { + "Birikyu", + nullptr, + "Birikyu", + }, + { + "HomingKiller", + nullptr, + "HomingKiller", + }, + { + "CocoSambo", + nullptr, + "CocoSamboBody", + }, + { + "SamboHead", + nullptr, + "SamboHead", + }, + { + "BegomanBaby", + nullptr, + "BegomanBaby", + }, + { + "BegomanSpring", + nullptr, + "BegomanSpring", + }, + { + "BegomanSpringHide", + nullptr, + "BegomanSpring", + }, + { + "BegomanSpike", + nullptr, + "BegomanSpike", + }, + { + "BegomanLauncher", + nullptr, + "BegomanLauncher", + }, + { + "TogeBegomanLauncher", + nullptr, + "BegomanLauncher", + }, + { + "BegomanBabyLauncher", + nullptr, + "BegomanLauncher", + }, + { + "FireBubble", + nullptr, + "FireBubble", + }, + { + "BallBeamer", + nullptr, + "BallBeamer", + }, + { + "JumpBeamer", + nullptr, + "JumpBeamerBody", + }, + { + "JumpGuarder", + nullptr, + "JumpGuarder", + }, + { + "RingBeamer", + createNameObj, + "RingBeamer", + }, + { + "Pukupuku", + nullptr, + "Pukupuku", + }, + { + "BombTeresa", + nullptr, + "BombTeresa", + }, + { + "Teresa", + nullptr, + "Teresa", + }, + { + "TeresaChief", + nullptr, + "Teresa", + }, + { + "TeresaWater", + nullptr, + "TeresaWater", + }, + { + "Torpedo", + nullptr, + "Torpedo", + }, + { + "Dossun", + createNameObj, + "Dossun", + }, + { + "Onimasu", + nullptr, + "Onimasu", + }, + { + "OnimasuPivot", + nullptr, + "Onimasu", + }, + { + "Unizo", + nullptr, + "Unizo", + }, + { + "UnizoLand", + nullptr, + "UnizoLand", + }, + { + "UnizoShoal", + nullptr, + "UnizoShoal", + }, + { + "UnizoLauncher", + nullptr, + "UnizoLand", + }, + { + "Kiraira", + nullptr, + "Kiraira", + }, + { + "KirairaRail", + nullptr, + "Kiraira", + }, + { + "NokonokoLand", + nullptr, + "NokonokoLand", + }, + { + "Gesso", + nullptr, + "Gesso", + }, + { + "Poihana", + nullptr, + "Poihana", + }, + { + "Snakehead", + nullptr, + "Snakehead", + }, + { + "SnakeheadSmall", + nullptr, + "SnakeheadSmall", + }, + { + "Jellyfish", + nullptr, + "Jellyfish", + }, + { + "JellyfishElectric", + nullptr, + "JellyfishElectric", + }, + { + "Kanina", + nullptr, + "Kanina", + }, + { + "KaninaRed", + nullptr, + "KaninaRed", + }, + { + "Mogu", + nullptr, + "Mogu", + }, + { + "Mogucchi", + nullptr, + "Mogucchi", + }, + { + "MogucchiRefuseTerritory", + nullptr, + nullptr, + }, + { + "KoopaJrShip", + nullptr, + "KoopaJrShip", + }, + { + "Hanachan", + nullptr, + "HanachanHead", + }, + { + "JumpSpider", + nullptr, + "JumpSpider", + }, + { + "StringSpider", + nullptr, + "StringSpider", + }, + { + "PackunPetit", + createNameObj, + "PackunPetit", + }, + { + "StinkBugSmall", + nullptr, + "StinkBugSmall", + }, + { + "StinkBugParent", + nullptr, + "StinkBugParent", + }, + { + "BasaBasa", + nullptr, + "BasaBasa", + }, + { + "BasaBasaIce", + nullptr, + "BasaBasaIce", + }, + { + "Metbo", + nullptr, + "Metbo", + }, + { + "BombBird", + nullptr, + "BombBird", + }, + { + "MechanicKoopaMini", + nullptr, + "MechanicKoopaMini", + }, + { + "Karon", + nullptr, + "Karon", + }, + { + "HammerHeadPackun", + nullptr, + "PackunFlower", + }, + { + "DharmaSambo", + nullptr, + "DharmaSambo", + }, + { + "SearchBeamer", + nullptr, + "SearchBeamer", + }, + { + "Petari", + nullptr, + "Petari", + }, + { + "MagnumKiller", + nullptr, + "MagnumKiller", + }, + { + "BossBegoman", + nullptr, + "BossBegoman", + }, + { + "BossStinkBug", + nullptr, + "BossStinkBug", + }, + { + "DinoPackun", + nullptr, + "DinoPackun", + }, + { + "DinoPackunVs2", + nullptr, + "DinoPackun2", + }, + { + "Dodoryu", + nullptr, + "Dodoryu", + }, + { + "KoopaVs1", + nullptr, + "Koopa", + }, + { + "KoopaVs2", + nullptr, + "Koopa", + }, + { + "KoopaVs3", + nullptr, + "Koopa", + }, + { + "OtaKing", + nullptr, + nullptr, + }, + { + "Polta", + nullptr, + "Polta", + }, + { + "SkeletalFishBoss", + createNameObj, + "SkeletalFishBoss", + }, + { + "SkeletalFishBaby", + createNameObj, + "SnakeFish", + }, + { + "SkeletalFishBabyRail", + createNameObj, + nullptr, + }, + { + "SkeletalFishBossRail", + createNameObj, + nullptr, + }, + { + "TombSpider", + nullptr, + "TombSpider", + }, + { + "BossKameck", + MR::createBossKameck1, + "BossKameck", + }, + { + "BossKameck2", + MR::createBossKameck2, + "BossKameck", + }, + { + "FireBallBeamKameck", + nullptr, + "Kameck", + }, + { + "TurtleBeamKameck", + nullptr, + "Kameck", + }, + { + "TripodBoss", + MR::createTripodBoss, + "TripodBoss", + }, + { + "Tripod2Boss", + MR::createTripod2Boss, + "Tripod2Boss", + }, + { + "TripodBossBaseJointPosition", + createNameObj, + nullptr, + }, + { + "TripodBossKillerGenerater", + createNameObj, + "TripodBossKillerCannon", + }, + { + "TripodBossStepPoint", + createNameObj, + nullptr, + }, + { + "TripodBossCore", + createNameObj, + "TripodBossCore", + }, + { + "TripodBossCoin", + createNameObj, + nullptr, + }, + { + "TripodBossKinokoOneUp", + createNameObj, + "KinokoOneUp", + }, + { + "TripodBossShell", + createNameObj, + "TripodBossShell", + }, + { + "TripodBossGuardWall", + createNameObj, + "TripodBossGuardWall", + }, + { + "TriPodBossBodyA", + createNameObj, + "TriPodBossBodyA", + }, + { + "TripodBossBodyABloom", + createNameObj, + "TripodBossBodyABloom", + }, + { + "TriPodBossLeg1A", + createNameObj, + "TriPodBossLeg1A", + }, + { + "TriPodBossLeg1B", + createNameObj, + "TriPodBossLeg1B", + }, + { + "TriPodBossLeg1C", + createNameObj, + "TriPodBossLeg1C", + }, + { + "TriPodBossLeg2A", + createNameObj, + "TriPodBossLeg2A", + }, + { + "TriPodBossLeg2ABloom", + createNameObj, + "TriPodBossLeg2ABloom", + }, + { + "TriPodBossLeg3A", + createNameObj, + "TriPodBossLeg3A", + }, + { + "TriPodBossLeg3B", + createNameObj, + "TriPodBossLeg3B", + }, + { + "TriPodBossLeg3C", + createNameObj, + "TriPodBossLeg3C", + }, + { + "TripodBossFoot", + createNameObj, + "TripodBossFoot", + }, + { + "TripodBossFootBloom", + createNameObj, + "TripodBossFootBloom", + }, + { + "TriPodBossLegBottom", + createNameObj, + "TriPodBossLegBottom", + }, + { + "TripodBossEyeLight", + createNameObj, + "TripodBossEyeLight", + }, + { + "TripodBossEyeLightBloom", + createNameObj, + "TripodBossEyeLightBloom", + }, + { + "TriPodBossGearA", + createNameObj, + "TriPodBossGearA", + }, + { + "TriPodBossGearB", + createNameObj, + "TriPodBossGearB", + }, + { + "TriPodBossGearC", + createNameObj, + "TriPodBossGearC", + }, + { + "TriPodBossGearSmallA", + createNameObj, + "TriPodBossGearSmallA", + }, + { + "TriPodBossGearSmallB", + createNameObj, + "TriPodBossGearSmallB", + }, + { + "TriPodBossGearSmallC", + createNameObj, + "TriPodBossGearSmallC", + }, + { + "TriPodBossGearBody", + createNameObj, + "TriPodBossGearBody", + }, + { + "TripodBossUpperKillerCannon", + createNameObj, + "TripodBossKillerCannon", + }, + { + "TripodBossUnderKillerCannon", + createNameObj, + "TripodBossKillerCannon", + }, + { + "TripodBossBottomKillerCannon", + createNameObj, + "TripodBossKillerCannon", + }, + { + "SpiderAttachPoint", + nullptr, + "SpiderThreadAttachPoint", + }, + { + "SpiderCoin", + nullptr, + "Coin", + }, + { + "SpiderMapBlock", + createNameObj, + "SpiderMapBlock", + }, + { + "ArrowSwitch", + createNameObj, + "ArrowSwitch", + }, + { + "ArrowSwitchMulti", + createNameObj, + "ArrowSwitch", + }, + { + "ArrowSwitchTarget", + createNameObj, + nullptr, + }, + { + "AstroOverlookObj", + createNameObj, + nullptr, + }, + { + "BlueStarCupsulePlanet", + nullptr, + "BlueStarCupsulePlanet", + }, + { + "BigFan", + createNameObj, + "BigFan", + }, + { + "BigFanNoLeg", + createNameObj, + "BigFanNoLeg", + }, + { + "ClipAreaDropLaser", + nullptr, + "ClipVolumeSphere", + }, + { + "RevolvingWay", + nullptr, + "RevolvingWay", + }, + { + "SoundEmitter", + nullptr, + nullptr, + }, + { + "JumpHole", + nullptr, + "JumpHole", + }, + { + "BallOpener", + createNameObj, + "BallOpener", + }, + { + "DragonHeadFlower", + nullptr, + "DragonHeadFlower", + }, + { + "ConcreteBlock", + nullptr, + "ConcreteBlock", + }, + { + "SphereRailDash", + nullptr, + nullptr, + }, + { + "SnowplowSwitch", + nullptr, + nullptr, + }, + { + "BallRail", + createNameObj, + nullptr, + }, + { + "FallDownBridge", + nullptr, + "FallDownBridge", + }, + { + "RockCreator", + nullptr, + "Rock", + }, + { + "MeteoContainer", + createNameObj, + "MeteoContainer", + }, + { + "MagicBell", + createNameObj, + "Bell", + }, + { + "FlowerGroup", + nullptr, + "Flower", + }, + { + "FlowerBlueGroup", + nullptr, + "FlowerBlue", + }, + { + "CutBushGroup", + nullptr, + "CutBush", + }, + { + "SmallStone", + nullptr, + "SmallStone", + }, + { + "CircleShell", + nullptr, + "CircleShell", + }, + { + "CircleStrawberry", + nullptr, + "CircleStrawberry", + }, + { + "Tsukidashikun", + nullptr, + "Tsukidashikun", + }, + { + "TsukidashikunBig", + nullptr, + "TsukidashikunBig", + }, + { + "TimerCoinBlock", + createNameObj, + "CoinBlock", + }, + { + "SplashCoinBlock", + createNameObj, + "CoinBlock", + }, + { + "TimerPieceBlock", + createNameObj, + "CoinBlock", + }, + { + "SplashPieceBlock", + createNameObj, + "CoinBlock", + }, + { + "ItemBlockSwitch", + createNameObj, + "CoinBlock", + }, + { + "ExterminationCheckerKuribo", + nullptr, + "Kuribo", + }, + { + "ExterminationKuriboKeySwitch", + nullptr, + "Kuribo", + }, + { + "ExterminationSkeletalFishBaby", + nullptr, + "SnakeFish", + }, + { + "ExterminationMeramera", + nullptr, + "Meramera", + }, + { + "ShootingStar", + createNameObj, + "ShootingStar", + }, + { + "FlameGun", + createNameObj, + "FlameGun", + }, + { + "BenefitItemOneUp", + nullptr, + "KinokoOneUp", + }, + { + "BenefitItemLifeUp", + createNameObj, + "KinokoLifeUp", + }, + { + "BenefitItemInvincible", + createNameObj, + "PowerupInvincible", + }, + { + "CoinSpot", + createNameObj, + nullptr, + }, + { + "CollisionBlocker", + createNameObj, + nullptr, + }, + { + "LotusLeaf", + nullptr, + "LotusLeaf", + }, + { + "PunchingKinoko", + createNameObj, + "PunchingKinoko", + }, + { + "DesertMovingLand", + nullptr, + "DesertMovingLand", + }, + { + "DesertMovingLandSmall", + nullptr, + "DesertMovingLandSmall", + }, + { + "NoteFairy", + createNameObj, + nullptr, + }, + { + "EarthenPipe", + createNameObj, + "EarthenPipe", + }, + { + "EarthenPipeInWater", + createNameObj, + "EarthenPipe", + }, + { + "ElectricRail", + nullptr, + "ElectricRail", + }, + { + "ElectricRailMoving", + nullptr, + "ElectricRailMoving", + }, + { + "WanwanRolling", + nullptr, + "WanwanRolling", + }, + { + "WanwanRollingMini", + nullptr, + "WanwanRollingMini", + }, + { + "WanwanRollingGold", + nullptr, + "WanwanRollingGold", + }, + { + "BreakableCage", + createNameObj, + "BreakableCage", + }, + { + "BreakableCageRotate", + createNameObj, + "BreakableCage", + }, + { + "BreakableCageL", + createNameObj, + "BreakableCageL", + }, + { + "BreakableFixation", + createNameObj, + "BreakableFixation", + }, + { + "BreakableTrash", + createNameObj, + "BreakableTrash", + }, + { + "BigBubble", + nullptr, + "BigBubble", + }, + { + "BigBubbleMoveLimitterCylinder", + nullptr, + nullptr, + }, + { + "BigBubbleMoveLimitterPlane", + nullptr, + nullptr, + }, + { + "BigBubbleGenerator", + nullptr, + "AirBubbleGenerator", + }, + { + "BigObstructBubbleGenerator", + nullptr, + "AirBubbleGenerator", + }, + { + "GCaptureTarget", + nullptr, + "GCaptureTarget", + }, + { + "AsteroidA", + createNameObj, + "AsteroidA", + }, + { + "AsteroidB", + createNameObj, + "AsteroidB", + }, + { + "AsteroidC", + createNameObj, + "AsteroidC", + }, + { + "AsteroidD", + createNameObj, + "AsteroidD", + }, + { + "SpaceStickA", + createNameObj, + "SpaceStickA", + }, + { + "SpaceStickB", + createNameObj, + "SpaceStickB", + }, + { + "BlackHole", + createNameObj, + "BlackHole", + }, + { + "BlackHoleCube", + createNameObj, + "BlackHole", + }, + { + "KillerGunnerSingle", + createNameObj, + "KillerGunnerSingle", + }, + { + "KillerGunnerDouble", + createNameObj, + "KillerGunnerDouble", + }, + { + "KillerGunnerTriple", + createNameObj, + "KillerGunnerTriple", + }, + { + "PowerStar", + createNameObj, + "PowerStar", + }, + { + "GrandStar", + createNameObj, + "GrandStar", + }, + { + "PowerStarAppearPoint", + createNameObj, + nullptr, + }, + { + "CocoNut", + createNameObj, + nullptr, + }, + { + "CoconutTree", + createNameObj, + "CoconutTree", + }, + { + "CoconutTreeLeaf", + nullptr, + "CoconutTreeLeaf", + }, + { + "CollapsePlane", + createNameObj, + "CollapsePlane", + }, + { + "WoodBox", + createNameObj, + "WoodBox", + }, + { + "ItemBubble", + nullptr, + "ItemBubble", + }, + { + "SpinningBox", + nullptr, + "SpinningBox", + }, + { + "ElectricBall", + nullptr, + "ElectricBall", + }, + { + "SpaceMine", + createNameObj, + "SpaceMine", + }, + { + "MorphItemNeoHopper", + nullptr, + "PowerupHopper", + }, + { + "MorphItemNeoBee", + nullptr, + "PowerUpBee", + }, + { + "MorphItemNeoTeresa", + nullptr, + "PowerupTeresa", + }, + { + "MorphItemNeoIce", + nullptr, + "PowerupIce", + }, + { + "MorphItemNeoFire", + nullptr, + "PowerupFire", + }, + { + "MorphItemNeoFoo", + nullptr, + "PowerupFoo", + }, + { + "AirBubble", + createNameObj, + "AirBubble", + }, + { + "AirBubbleGenerator", + createNameObj, + "AirBubbleGenerator", + }, + { + "Butterfly", + nullptr, + "Butterfly", + }, + { + "Pompon2Plant", + nullptr, + "Pompon2Plant", + }, + { + "Pompon4Plant", + nullptr, + "Pompon4Plant", + }, + { + "LavaGeyser", + nullptr, + "LavaGeyser", + }, + { + "LavaProminence", + nullptr, + "LavaProminence", + }, + { + "LavaProminenceTriple", + nullptr, + "LavaProminenceTriple", + }, + { + "LavaProminenceEnvironment", + nullptr, + "LavaProminenceEnvironment", + }, + { + "LavaProminenceWithoutShadow", + nullptr, + "LavaProminence", + }, + { + "LavaObstacleRockShell", + createNameObj, + "LavaObstacleRockShell", + }, + { + "LavaObstacleRockHomeA", + createNameObj, + "LavaObstacleRockHomeA", + }, + { + "LavaObstacleRockHomeB", + nullptr, + "LavaObstacleRockHomeB", + }, + { + "LavaHomeFloaterB", + nullptr, + "LavaHomeFloaterB", + }, + { + "LavaFloatingStepA", + nullptr, + "LavaFloatingStepA", + }, + { + "LavaFloatingStepB", + nullptr, + "LavaFloatingStepB", + }, + { + "LavaFloatingStepC", + nullptr, + "LavaFloatingStepC", + }, + { + "LavaFloatingStepD", + nullptr, + "LavaFloatingStepD", + }, + { + "LavaHomeSeesaw", + nullptr, + "LavaHomeSeesaw", + }, + { + "LavaHomeVolcanoFlow", + nullptr, + "LavaHomeVolcanoFlow", + }, + { + "LavaHomeVolcanoInnerFlow", + createNameObj, + "LavaHomeVolcanoInnerFlow", + }, + { + "LavaRotatePlanetStartStep", + createNameObj, + "LavaRotatePlanetStartStep", + }, + { + "LavaBreakBridge", + createNameObj, + "LavaBreakBridge", + }, + { + "LavaBreakRockA", + nullptr, + "LavaBreakRockA", + }, + { + "LavaBreakRockB", + createNameObj, + "LavaBreakRockB", + }, + { + "LavaBreakRockC", + createNameObj, + "LavaBreakRockC", + }, + { + "LavaBreakRockD", + createNameObj, + "LavaBreakRockD", + }, + { + "LavaBreakColumn", + nullptr, + "LavaBreakColumn", + }, + { + "LavaShellTower", + createNameObj, + "LavaShellTower", + }, + { + "LavaFallDownColumnA", + createNameObj, + "LavaFallDownColumnA", + }, + { + "LavaFallDownColumnB", + createNameObj, + "LavaFallDownColumnB", + }, + { + "LavaShellTowerStep", + nullptr, + "LavaShellTowerStep", + }, + { + "LavaStepA", + nullptr, + "LavaStepA", + }, + { + "LavaStepB", + nullptr, + "LavaStepB", + }, + { + "LavaStepC", + nullptr, + "LavaStepC", + }, + { + "LavaSteam", + nullptr, + "LavaSteam", + }, + { + "LavaStrangeRock", + nullptr, + "LavaStrangeRock", + }, + { + "LavaStrangeRockL", + nullptr, + "LavaStrangeRockL", + }, + { + "LavaStrangeRockTable", + nullptr, + "LavaStrangeRockTable", + }, + { + "LavaSpaceStickA", + createNameObj, + "LavaSpaceStickA", + }, + { + "LavaSpaceStickB", + createNameObj, + "LavaSpaceStickB", + }, + { + "LavaBlackUFO", + createNameObj, + "LavaBlackUFO", + }, + { + "CrystalCageS", + createNameObj, + "CrystalCageS", + }, + { + "CrystalCageM", + createNameObj, + "CrystalCageM", + }, + { + "CrystalCageL", + createNameObj, + "CrystalCageL", + }, + { + "CrystalCageMoving", + createNameObj, + "CrystalCageMoving", + }, + { + "ShellfishCoin", + nullptr, + "Shellfish", + }, + { + "ShellfishYellowChip", + nullptr, + "Shellfish", + }, + { + "SeaBottomBigDoorA", + createNameObj, + "SeaBottomBigDoorA", + }, + { + "SeaBottomBigDoorB", + createNameObj, + "SeaBottomBigDoorB", + }, + { + "SeaBottomBigDoorC", + createNameObj, + "SeaBottomBigDoorC", + }, + { + "FloaterLandPartsFrame", + createNameObj, + "FloaterLandPartsFrame", + }, + { + "OceanFloaterTypeU", + nullptr, + "OceanFloaterTypeU", + }, + { + "DashRing", + createNameObj, + "DashRing", + }, + { + "MeteorStrike", + nullptr, + "MeteorStrike", + }, + { + "MeteorStrikeEnvironment", + nullptr, + "MeteorStrike", + }, + { + "MeteorCannon", + nullptr, + "MeteorStrike", + }, + { + "BrightObj", + nullptr, + "LensFlare", + }, + { + "BrightSun", + nullptr, + "LensFlare", + }, + { + "PhantomTorch", + nullptr, + nullptr, + }, + { + "PhantomBonfire", + nullptr, + nullptr, + }, + { + "PhantomCandlestand", + nullptr, + "PhantomCandlestand", + }, + { + "CandlestandIceVolcano", + nullptr, + "CandlestandIceVolcano", + }, + { + "MarioLauncher", + nullptr, + "MarioLauncher", + }, + { + "MarioLauncherAttractor", + nullptr, + "MarioLauncherAttractor", + }, + { + "WaterBazooka", + nullptr, + "WaterBazooka", + }, + { + "ElectricBazooka", + nullptr, + "ElectricBazooka", + }, + { + "WaterPressure", + nullptr, + "WaterPressure", + }, + { + "FirePressure", + createNameObj, + "FirePressure", + }, + { + "IronCannonLauncher", + nullptr, + "IronCannonLauncher", + }, + { + "IronCannonLauncherPoint", + nullptr, + nullptr, + }, + { + "FirePressureRadiate", + createNameObj, + "FirePressure", + }, + { + "TemplateStageGeometry", + createNameObj, + "TemplateStageGeometry", + }, + { + "SunkenShip", + nullptr, + "SunkenShip", + }, + { + "BeeFlowerHover", + createNameObj, + "BeeFlowerHover", + }, + { + "WaterfallCaveCover", + nullptr, + "WaterfallCaveCover", + }, + { + "WaterfallCaveNoBreakCover", + createNameObj, + "WaterfallCaveNoBreakCover", + }, + { + "PalmIsland", + createNameObj, + "PalmIsland", + }, + { + "IceMerameraKing", + nullptr, + "IceMerameraKing", + }, + { + "OceanPierFloaterA", + nullptr, + "OceanPierFloaterA", + }, + { + "HeavenlyBeachTopRock", + nullptr, + "HeavenlyBeachTopRock", + }, + { + "HeavenlyBeachUnderRock", + nullptr, + "HeavenlyBeachUnderRock", + }, + { + "OceanSmallTurtle", + nullptr, + "OceanSmallTurtle", + }, + { + "OceanHexagonFloater", + nullptr, + "OceanHexagonFloater", + }, + { + "SpringWaterFloaterA", + nullptr, + "SpringWaterFloaterA", + }, + { + "SpringWaterFloaterB", + nullptr, + "SpringWaterFloaterB", + }, + { + "ShutterDoorB", + nullptr, + "ShutterDoorB", + }, + { + "ShutterDoorC", + nullptr, + "ShutterDoorC", + }, + { + "ShutterDoorD", + nullptr, + "ShutterDoorD", + }, + { + "ShutterDoorE", + nullptr, + "ShutterDoorE", + }, + { + "SeaBottomTriplePropellerStand", + createNameObj, + "SeaBottomTriplePropellerStand", + }, + { + "SeaBottomTriplePropeller", + nullptr, + "SeaBottomTriplePropeller", + }, + { + "OceanFloaterTowerRotateStepA", + createNameObj, + "OceanFloaterTowerRotateStepA", + }, + { + "OceanFloaterTowerRotateStepB", + createNameObj, + "OceanFloaterTowerRotateStepB", + }, + { + "OceanFloaterTowerRotateStepC", + createNameObj, + "OceanFloaterTowerRotateStepC", + }, + { + "OceanFloaterTowerRotateStepD", + createNameObj, + "OceanFloaterTowerRotateStepD", + }, + { + "LargeChain", + createNameObj, + "LargeChain", + }, + { + "IcicleRock", + nullptr, + "IcicleRock", + }, + { + "ItemAppearStoneSpinDriver", + nullptr, + "ItemAppearStoneSpinDriver", + }, + { + "SnowFloor", + nullptr, + nullptr, + }, + { + "SnowFloorTile", + nullptr, + nullptr, + }, + { + "FlipPanel", + createNameObj, + "FlipPanel", + }, + { + "FlipPanelObserver", + createNameObj, + nullptr, + }, + { + "FlipPanelReverse", + createNameObj, + "FlipPanelReverse", + }, + { + "FlipPanelFrame", + createNameObj, + "FlipPanelFrame", + }, + { + "PhantomTowerMoveStepA", + nullptr, + "PhantomTowerMoveStepA", + }, + { + "SideSpikeMoveStepA", + nullptr, + "SideSpikeMoveStepA", + }, + { + "SpaceMineRailA", + createNameObj, + "SpaceMineRailA", + }, + { + "SpaceMineRail5m", + createNameObj, + "SpaceMineRail5m", + }, + { + "SandUpDownTowerTop", + nullptr, + "SandUpDownTowerTop", + }, + { + "SandUpDownTowerBottom", + nullptr, + "SandUpDownTowerBottom", + }, + { + "SandUpDownKillerGunnerBase", + createNameObj, + "SandUpDownKillerGunnerBase", + }, + { + "SandUpDownTriRock", + nullptr, + "SandUpDownTriRock", + }, + { + "JumpStand", + nullptr, + "JumpStand", + }, + { + "CaretakerGarbage", + createNameObj, + "CaretakerGarbage", + }, + { + "GlassBottleTall", + createNameObj, + "GlassBottleTall", + }, + { + "HopperBeltConveyerRotatePartsA", + createNameObj, + "HopperBeltConveyerRotatePartsA", + }, + { + "HopperBeltConveyerMovePartsA", + nullptr, + "HopperBeltConveyerMovePartsA", + }, + { + "ChooChooTrain", + createNameObj, + "ChooChooTrain", + }, + { + "SandRiverLightA", + nullptr, + "SandRiverLightA", + }, + { + "SnowMan", + nullptr, + "SnowMan", + }, + { + "SnowBlockA", + nullptr, + "SnowBlockA", + }, + { + "ShockWaveGenerator", + nullptr, + "ShockWaveGenerator", + }, + { + "DangerSignBoard", + createNameObj, + "DangerSignBoard", + }, + { + "Banekiti", + nullptr, + "Banekiti", + }, + { + "MirrorModelTest", + createNameObj, + "MirrorModelTest", + }, + { + "MirrorModelPeachCastle", + createNameObj, + "MirrorModelPeachCastle", + }, + { + "MirrorModelTwinFallLake", + createNameObj, + "MirrorModelTwinFallLake", + }, + { + "MirrorReflectionTest", + createNameObj, + "MirrorReflectionTest", + }, + { + "MirrorReflectionPeachCastle", + createNameObj, + "MirrorReflectionPeachCastle", + }, + { + "MirrorReflectionTwinFallLake", + createNameObj, + "MirrorReflectionTwinFallLake", + }, + { + "PhantomFirewood", + createNameObj, + "PhantomFirewood", + }, + { + "ArrowBoard", + createNameObj, + "ArrowBoard", + }, + { + "TeresaRoomGlaringLight", + nullptr, + "TeresaRoomGlaringLight", + }, + { + "SpaceDustWoodA", + createNameObj, + "SpaceDustWoodA", + }, + { + "SpaceDustWoodB", + createNameObj, + "SpaceDustWoodB", + }, + { + "TeresaRoomDoor", + nullptr, + "TeresaRoomDoor", + }, + { + "TrampleStar", + nullptr, + "TrampleStar", + }, + { + "ReverseGravityTowerInside", + nullptr, + "ReverseGravityTowerInside", + }, + { + "HipDropRock", + createNameObj, + "HipDropRock", + }, + { + "DropOfWaterCore", + createNameObj, + "DropOfWaterCore", + }, + { + "WatchTowerRotateStep", + nullptr, + "WatchTowerRotateStep", + }, + { + "ForestAppearStepA", + createNameObj, + "ForestAppearStepA", + }, + { + "ForestObstacleWoodA", + createNameObj, + "ForestObstacleWoodA", + }, + { + "AstroDomeAsteroid", + nullptr, + "AstroDomeAsteroid", + }, + { + "AstroDomeBlueStar", + nullptr, + "GCaptureTarget", + }, + { + "AstroDomeComet", + createNameObj, + "AstroDomeComet", + }, + { + "AstroDomeDemoAstroGalaxy", + nullptr, + "AstroDomeDemoAstroGalaxy", + }, + { + "SphereSelectorHandle", + nullptr, + nullptr, + }, + { + "ForestWoodCover", + createNameObj, + "ForestWoodCover", + }, + { + "KoopaShipManholeCover", + nullptr, + "KoopaShipManholeCover", + }, + { + "StarDustStepA", + createNameObj, + "StarDustStepA", + }, + { + "StarDustStepB", + createNameObj, + "StarDustStepB", + }, + { + "TreasureSpot", + nullptr, + "TreasureSpot", + }, + { + "CoinFlower", + nullptr, + "CoinFlower", + }, + { + "StarDustRollingStepA", + createNameObj, + "StarDustRollingStepA", + }, + { + "AsteroidMoveA", + createNameObj, + "AsteroidMoveA", + }, + { + "StarPieceCluster", + createNameObj, + "StarPieceCluster", + }, + { + "SpaceSeparatorA", + createNameObj, + "SpaceSeparatorA", + }, + { + "SpaceSeparatorB", + createNameObj, + "SpaceSeparatorB", + }, + { + "ForestNarrowStepA", + createNameObj, + "ForestNarrowStepA", + }, + { + "ForestHomeGate", + createNameObj, + "ForestHomeGate", + }, + { + "RGTowerPressGroundA", + nullptr, + "RGTowerPressGroundA", + }, + { + "WeatherVane", + createNameObj, + "WeatherVane", + }, + { + "RainCloud", + nullptr, + "RainCloud", + }, + { + "PowerStarKeeperA", + createNameObj, + "PowerStarKeeperA", + }, + { + "PowerStarKeeperB", + createNameObj, + "PowerStarKeeperB", + }, + { + "PowerStarKeeperC", + createNameObj, + "PowerStarKeeperC", + }, + { + "ForestPoihanaFenceA", + createNameObj, + "ForestPoihanaFenceA", + }, + { + "ForestPoihanaFenceB", + createNameObj, + "ForestPoihanaFenceB", + }, + { + "TeresaMansionBridgeA", + createNameObj, + "TeresaMansionBridgeA", + }, + { + "TeresaMansionBridgeB", + createNameObj, + "TeresaMansionBridgeB", + }, + { + "DarknessRoomDoorA", + nullptr, + "DarknessRoomDoorA", + }, + { + "TeresaMansionDoorA", + nullptr, + "TeresaMansionDoorA", + }, + { + "TeresaMansionDoorB", + nullptr, + "TeresaMansionDoorB", + }, + { + "TeresaMansionEntranceDoor", + nullptr, + "TeresaMansionEntranceDoor", + }, + { + "WaterBazookaTowerMoveStepA", + createNameObj, + "WaterBazookaTowerMoveStepA", + }, + { + "WaterBazookaTowerMoveStepB", + nullptr, + "WaterBazookaTowerMoveStepB", + }, + { + "WaterBazookaTowerMoveStepC", + nullptr, + "WaterBazookaTowerMoveStepC", + }, + { + "QuestionBoxMoveStepA", + nullptr, + "QuestionBoxMoveStepA", + }, + { + "QuestionBoxMoveStepB", + nullptr, + "QuestionBoxMoveStepB", + }, + { + "QuestionBoxMoveStepC", + nullptr, + "QuestionBoxMoveStepC", + }, + { + "ForestHomeBridge", + createNameObj, + "ForestHomeBridge", + }, + { + "ForestBarricadeRockA", + createNameObj, + "ForestBarricadeRockA", + }, + { + "ReverseGravityRoomPressGroundA", + nullptr, + "ReverseGravityRoomPressGroundA", + }, + { + "ReverseGravityRoomPressGroundB", + nullptr, + "ReverseGravityRoomPressGroundB", + }, + { + "ReverseGravityRoomPressGroundC", + nullptr, + "ReverseGravityRoomPressGroundC", + }, + { + "ReverseGravityRoomPressGroundD", + nullptr, + "ReverseGravityRoomPressGroundD", + }, + { + "ReverseGravityRoomPressGroundE", + nullptr, + "ReverseGravityRoomPressGroundE", + }, + { + "RollingOvalPlanetParts", + createNameObj, + "RollingOvalPlanetParts", + }, + { + "TeresaMansionLightA", + nullptr, + "TeresaMansionLightA", + }, + { + "TeresaMansionLightB", + nullptr, + "TeresaMansionLightB", + }, + { + "TeresaMansionCandlestand", + nullptr, + "TeresaMansionCandlestand", + }, + { + "TeresaMansionHoleCover", + nullptr, + "TeresaMansionHoleCover", + }, + { + "KoopaStatue", + nullptr, + "KoopaStatue", + }, + { + "TeresaPicture", + nullptr, + "TeresaPicture", + }, + { + "KinokoOneUpPicture", + nullptr, + "KinokoOneUpPicture", + }, + { + "FireBar", + createNameObj, + "FireBarCore", + }, + { + "BattleShipMovePartsA", + createNameObj, + "BattleShipMovePartsA", + }, + { + "BattleShipMovePartsB", + createNameObj, + "BattleShipMovePartsB", + }, + { + "BattleShipElevator", + nullptr, + "BattleShipElevator", + }, + { + "BattleShipElevatorCover", + createNameObj, + "BattleShipElevatorCover", + }, + { + "TeresaRaceSpaceStickA", + createNameObj, + "TeresaRaceSpaceStickA", + }, + { + "TeresaRaceSpaceStickB", + createNameObj, + "TeresaRaceSpaceStickB", + }, + { + "TeresaRaceSpaceStickC", + createNameObj, + "TeresaRaceSpaceStickC", + }, + { + "TeresaRacePartsA", + createNameObj, + "TeresaRacePartsA", + }, + { + "TeresaRacePartsB", + nullptr, + "TeresaRacePartsB", + }, + { + "NeedlePlant", + nullptr, + "NeedlePlant", + }, + { + "NeedlePlantFly", + nullptr, + "NeedlePlantFly", + }, + { + "BeeWallClimbPartsA", + nullptr, + "BeeWallClimbPartsA", + }, + { + "PeachCastleTownAfterAttack", + createNameObj, + "PeachCastleTownAfterAttack", + }, + { + "PeachCastleTownBeforeAttack", + createNameObj, + "PeachCastleTownBeforeAttack", + }, + { + "PeachCastleTownGate", + createNameObj, + "PeachCastleTownGate", + }, + { + "PhantomDecoratePartsA", + createNameObj, + "PhantomDecoratePartsA", + }, + { + "PhantomDecoratePartsB", + createNameObj, + "PhantomDecoratePartsB", + }, + { + "PhantomDecoratePartsHole", + createNameObj, + "PhantomDecoratePartsHole", + }, + { + "CocoonStepA", + createNameObj, + "CocoonStepA", + }, + { + "CocoonStepB", + createNameObj, + "CocoonStepB", + }, + { + "SpaceCannonLauncher", + createNameObj, + "SpaceCannonLauncher", + }, + { + "TrapBaseA", + createNameObj, + "TrapBaseA", + }, + { + "SweetsDecoratePartsSpoon", + createNameObj, + "SweetsDecoratePartsSpoon", + }, + { + "SweetsDecoratePartsFork", + createNameObj, + "SweetsDecoratePartsFork", + }, + { + "SeesawMoveNutA", + nullptr, + "SeesawMoveNutA", + }, + { + "SeesawMoveNutB", + nullptr, + "SeesawMoveNutB", + }, + { + "SeesawMoveNutC", + nullptr, + "SeesawMoveNutC", + }, + { + "TwisterSan", + nullptr, + "TwisterSan", + }, + { + "TwisterSanSlim", + nullptr, + "TwisterSanSlim", + }, + { + "SunakazeKun", + nullptr, + "SunakazeKun", + }, + { + "SandStreamMoveStepsA", + createNameObj, + "SandStreamMoveStepsA", + }, + { + "SandStreamMoveStepsB", + createNameObj, + "SandStreamMoveStepsB", + }, + { + "WaterLeakPipe", + nullptr, + "WaterLeakPipe", + }, + { + "BroadBeanMoveStepA", + nullptr, + "BroadBeanMoveStepA", + }, + { + "BroadBeanMoveStepB", + nullptr, + "BroadBeanMoveStepB", + }, + { + "ColorPencil", + createNameObj, + "ColorPencil", + }, + { + "TeresaRacePartsBallA", + createNameObj, + "TeresaRacePartsBallA", + }, + { + "SandCapsulePressGround", + nullptr, + "SandCapsulePressGround", + }, + { + "RayGunPlanetPartsScrew", + nullptr, + "RayGunPlanetPartsScrew", + }, + { + "RayGunPlanetPartsGear", + createNameObj, + "RayGunPlanetPartsGear", + }, + { + "BreakDownFixStepA", + createNameObj, + "BreakDownFixStepA", + }, + { + "SandStreamHighTowerMoveStepA", + nullptr, + "SandStreamHighTowerMoveStepA", + }, + { + "DriftWood", + nullptr, + "DriftWood", + }, + { + "ToyFactoryDecoratePartsGearA", + createNameObj, + "ToyFactoryDecoratePartsGearA", + }, + { + "MiniMechaKoopaPartsMoveStepA", + nullptr, + "MiniMechaKoopaPartsMoveStepA", + }, + { + "MiniMechaKoopaPartsGear", + createNameObj, + "MiniMechaKoopaPartsGear", + }, + { + "MiniMechaKoopaPartsCage", + createNameObj, + "MiniMechaKoopaPartsCage", + }, + { + "AsteroidBlockRotateStepA", + createNameObj, + "AsteroidBlockRotateStepA", + }, + { + "SandUpDownTowerBreakableWallA", + nullptr, + "SandUpDownTowerBreakableWallA", + }, + { + "SandUpDownTowerBreakableWallB", + nullptr, + "SandUpDownTowerBreakableWallB", + }, + { + "HoleDeathSandMoveStepA", + nullptr, + "HoleDeathSandMoveStepA", + }, + { + "SandUpDownTowerMoveStepA", + nullptr, + "SandUpDownTowerMoveStepA", + }, + { + "DeathSandLandPartsA", + createNameObj, + "DeathSandLandPartsA", + }, + { + "DeathSandLandPartsB", + createNameObj, + "DeathSandLandPartsB", + }, + { + "DeathSandLandPlatformStepA", + createNameObj, + "DeathSandLandPlatformStepA", + }, + { + "DeathSandEnvironmentSapotenA", + createNameObj, + "DeathSandEnvironmentSapotenA", + }, + { + "DeathSandEnvironmentSapotenB", + createNameObj, + "DeathSandEnvironmentSapotenB", + }, + { + "DeathSandEnvironmentRock", + createNameObj, + "DeathSandEnvironmentRock", + }, + { + "DeathSandEnvironmentPyramid", + createNameObj, + "DeathSandEnvironmentPyramid", + }, + { + "UFOSandObstacleA", + createNameObj, + "UFOSandObstacleA", + }, + { + "UFOSandObstacleB", + createNameObj, + "UFOSandObstacleB", + }, + { + "UFOSandObstacleC", + createNameObj, + "UFOSandObstacleC", + }, + { + "SweetDecoratePartsOrange", + createNameObj, + "SweetDecoratePartsOrange", + }, + { + "CapsuleCage", + createNameObj, + "CapsuleCage", + }, + { + "KameckShipLv1", + createNameObj, + "KameckShipLv1", + }, + { + "LavaBallRisingPlanetLava", + nullptr, + "LavaBallRisingPlanetLava", + }, + { + "StrongBlock", + createNameObj, + "StrongBlock", + }, + { + "ChoConveyorChocoA", + createNameObj, + "ChoConveyorChocoA", + }, + { + "ChoConveyorMoveChocoA", + nullptr, + "ChoConveyorMoveChocoA", + }, + { + "HoneyQueenLeafA", + nullptr, + "HoneyQueenLeafA", + }, + { + "ForestHomePartsTree", + createNameObj, + "ForestHomePartsTree", + }, + { + "ForestHomePartsTreeTower", + createNameObj, + "ForestHomePartsTreeTower", + }, + { + "RosettaChair", + nullptr, + "RosettaChair", + }, + { + "GravityLightA", + nullptr, + "GravityLightA", + }, + { + "GravityLightRoad", + nullptr, + "GravityLightRoad", + }, + { + "PoltaBattlePlanetPartsA", + createNameObj, + "PoltaBattlePlanetPartsA", + }, + { + "HeavenlyBeachTimerStepA", + nullptr, + "HeavenlyBeachTimerStepA", + }, + { + "HeavenlyBeachTimerStepB", + nullptr, + "HeavenlyBeachTimerStepB", + }, + { + "ReverseKingdomTreeA", + createNameObj, + "ReverseKingdomTreeA", + }, + { + "FloaterOtakingFloaterA", + nullptr, + "FloaterOtakingFloaterA", + }, + { + "WindMillPropeller", + createNameObj, + "WindMillPropeller", + }, + { + "WindMillPropellerMini", + createNameObj, + "WindMillPropellerMini", + }, + { + "LavaRotateStepsRotatePartsA", + createNameObj, + "LavaRotateStepsRotatePartsA", + }, + { + "LavaRotateStepsRotatePartsB", + createNameObj, + "LavaRotateStepsRotatePartsB", + }, + { + "LavaRotateStepsRotatePartsC", + createNameObj, + "LavaRotateStepsRotatePartsC", + }, + { + "LavaRotateStepsRotatePartsD", + createNameObj, + "LavaRotateStepsRotatePartsD", + }, + { + "QuickSand2DMovePartsA", + createNameObj, + "QuickSand2DMovePartsA", + }, + { + "BiriBiriBegomanSpikePistonA", + nullptr, + "BiriBiriBegomanSpikePistonA", + }, + { + "HugeBattleShipPlanetEntrance", + createNameObj, + "HugeBattleShipPlanetEntrance", + }, + { + "MysteryGravityRoomBridgeA", + createNameObj, + "MysteryGravityRoomBridgeA", + }, + { + "DeadLeaves", + nullptr, + "DeadLeaves", + }, + { + "PrologueDirector", + nullptr, + "DemoLetter", + }, + { + "DeathPromenadeMovePartsSpuareA", + nullptr, + "DeathPromenadeMovePartsSpuareA", + }, + { + "DeathPromenadeRotateCircleL", + createNameObj, + "DeathPromenadeRotateCircleL", + }, + { + "DeathPromenadeRotateCircleS", + createNameObj, + "DeathPromenadeRotateCircleS", + }, + { + "FlexibleSandPlanetPartsA", + nullptr, + "FlexibleSandPlanetPartsA", + }, + { + "DarkHopperRotateStepA", + nullptr, + "DarkHopperRotateStepA", + }, + { + "DarkHopperPlanetPartsA", + createNameObj, + "DarkHopperPlanetPartsA", + }, + { + "DarkHopperPlanetPartsC", + createNameObj, + "DarkHopperPlanetPartsC", + }, + { + "DarkHopperPlanetPartsD", + createNameObj, + "DarkHopperPlanetPartsD", + }, + { + "ClockworkHandle", + nullptr, + "ClockworkHandle", + }, + { + "MiniMechaKoopaPartsFan", + createNameObj, + "MiniMechaKoopaPartsFan", + }, + { + "RockRoadCircleA", + createNameObj, + "RockRoadCircleA", + }, + { + "AssemblyBlockPartsA", + createNameObj, + "AssemblyBlockPartsA", + }, + { + "AssemblyBlockPartsB", + createNameObj, + "AssemblyBlockPartsB", + }, + { + "AssemblyBlockPartsC", + createNameObj, + "AssemblyBlockPartsC", + }, + { + "AssemblyBlockPartsD", + createNameObj, + "AssemblyBlockPartsD", + }, + { + "AssemblyBlockPartsE", + createNameObj, + "AssemblyBlockPartsE", + }, + { + "AssemblyBlockPartsIceB", + createNameObj, + "AssemblyBlockPartsIceB", + }, + { + "AssemblyBlockPartsIceC", + createNameObj, + "AssemblyBlockPartsIceC", + }, + { + "AssemblyBlockPartsIceD", + createNameObj, + "AssemblyBlockPartsIceD", + }, + { + "AssemblyBlockPartsIceE", + createNameObj, + "AssemblyBlockPartsIceE", + }, + { + "AssemblyBlockPartsTimerA", + createNameObj, + "AssemblyBlockPartsTimerA", + }, + { + "HellBallGuidePartsA", + createNameObj, + "HellBallGuidePartsA", + }, + { + "HellBallRotatePartsA", + createNameObj, + "HellBallRotatePartsA", + }, + { + "HellBallRotatePartsB", + createNameObj, + "HellBallRotatePartsB", + }, + { + "HellBallRotatePartsC", + createNameObj, + "HellBallRotatePartsC", + }, + { + "HellBallRotatePartsD", + createNameObj, + "HellBallRotatePartsD", + }, + { + "HellBallRotatePartsE", + createNameObj, + "HellBallRotatePartsE", + }, + { + "HellBallRotatePartsF", + createNameObj, + "HellBallRotatePartsF", + }, + { + "HellBallRotatePartsG", + createNameObj, + "HellBallRotatePartsG", + }, + { + "IceSlipRoad", + createNameObj, + "IceSlipRoad", + }, + { + "CandyLiftA", + createNameObj, + "CandyLiftA", + }, + { + "CandyLiftB", + createNameObj, + "CandyLiftB", + }, + { + "SurfingRaceTutorialParts", + createNameObj, + "SurfingRaceTutorialParts", + }, + { + "SurfingRaceMainGate", + createNameObj, + "SurfingRaceMainGate", + }, + { + "SurfingRaceSubGate", + createNameObj, + "SurfingRaceSubGate", + }, + { + "SurfingRaceStep", + createNameObj, + "SurfingRaceStep", + }, + { + "SurfingRaceSignBoard", + createNameObj, + "SurfingRaceSignBoard", + }, + { + "SurfingRaceVictoryStand", + createNameObj, + "SurfingRaceVictoryStand", + }, + { + "HeavensDoorFlowerA", + createNameObj, + "HeavensDoorFlowerA", + }, + { + "HeavensDoorHouseDoor", + createNameObj, + "HeavensDoorHouseDoor", + }, + { + "HeavensDoorAppearStepAAfter", + createNameObj, + "HeavensDoorAppearStepAAfter", + }, + { + "HeavensDoorAppearStepA", + nullptr, + "HeavensDoorAppearStepA", + }, + { + "HeavensDoorMiddleRotatePartsA", + createNameObj, + "HeavensDoorMiddleRotatePartsA", + }, + { + "HeavensDoorMiddleRotatePartsB", + createNameObj, + "HeavensDoorMiddleRotatePartsB", + }, + { + "HeavensDoorInsideCage", + nullptr, + "HeavensDoorInsideCage", + }, + { + "HeavensDoorInsidePlanetPartsA", + nullptr, + "HeavensDoorInsidePlanetPartsA", + }, + { + "HeavensDoorInsideRotatePartsA", + createNameObj, + "HeavensDoorInsideRotatePartsA", + }, + { + "HeavensDoorInsideRotatePartsB", + createNameObj, + "HeavensDoorInsideRotatePartsB", + }, + { + "HeavensDoorInsideRotatePartsC", + createNameObj, + "HeavensDoorInsideRotatePartsC", + }, + { + "MechaKoopaPartsHead", + createNameObj, + "MechaKoopaPartsHead", + }, + { + "MechaKoopaPartsCollar", + createNameObj, + "MechaKoopaPartsCollar", + }, + { + "MechaKoopaPartsBreast", + nullptr, + "MechaKoopaPartsBreast", + }, + { + "MechaKoopaPartsArmRight", + createNameObj, + "MechaKoopaPartsArmRight", + }, + { + "MechaKoopaPartsArmLeft", + createNameObj, + "MechaKoopaPartsArmLeft", + }, + { + "MechaKoopaPartsBody", + nullptr, + "MechaKoopaPartsBody", + }, + { + "MechaKoopaPartsCaterpillar", + nullptr, + "MechaKoopaPartsCaterpillar", + }, + { + "MechaKoopaPartsRollerA", + createNameObj, + "MechaKoopaPartsRollerA", + }, + { + "MechaKoopaPartsMoveStepA", + nullptr, + "MechaKoopaPartsMoveStepA", + }, + { + "MechaKoopaPartsWreckA", + createNameObj, + "MechaKoopaPartsWreckA", + }, + { + "CannonFortressBreakStepA", + createNameObj, + "CannonFortressBreakStepA", + }, + { + "CannonFortressRotateBreakStepA", + createNameObj, + "CannonFortressRotateBreakStepA", + }, + { + "CannonFortressRotateBreakStepB", + createNameObj, + "CannonFortressRotateBreakStepB", + }, + { + "CannonFortressRotateBreakStepC", + createNameObj, + "CannonFortressRotateBreakStepC", + }, + { + "CannonFortressMoveWall", + nullptr, + "CannonFortressMoveWall", + }, + { + "SpaceShipStep", + nullptr, + "SpaceShipStep", + }, + { + "QuarterRollGravityRoomArrow", + nullptr, + "QuarterRollGravityRoomArrow", + }, + { + "NutShipFleetBridge", + nullptr, + "NutShipFleetBridge", + }, + { + "IceVolcanoMoveStepA", + nullptr, + "IceVolcanoMoveStepA", + }, + { + "IceVolcanoBalanceStepA", + nullptr, + "IceVolcanoBalanceStepA", + }, + { + "IceVolcanoBalanceStepB", + nullptr, + "IceVolcanoBalanceStepB", + }, + { + "IceVolcanoFloaterA", + nullptr, + "IceVolcanoFloaterA", + }, + { + "IceVolcanoFloaterB", + nullptr, + "IceVolcanoFloaterB", + }, + { + "IceVolcanoAppearStepA", + nullptr, + "IceVolcanoAppearStepA", + }, + { + "IceVolcanoAppearStepB", + nullptr, + "IceVolcanoAppearStepB", + }, + { + "IceVolcanoClimbingWall", + nullptr, + "IceVolcanoClimbingWall", + }, + { + "IceMountainFloaterA", + nullptr, + "IceMountainFloaterA", + }, + { + "IceMountainSeesawNoSlipA", + nullptr, + "IceMountainSeesawNoSlipA", + }, + { + "IceMountainSeesawSlipA", + nullptr, + "IceMountainSeesawSlipA", + }, + { + "IceMountainSeesawSlipB", + nullptr, + "IceMountainSeesawSlipB", + }, + { + "IceMountainSeesawSlipC", + nullptr, + "IceMountainSeesawSlipC", + }, + { + "IceMountainSeesawSlipD", + nullptr, + "IceMountainSeesawSlipD", + }, + { + "IceRingBumpyPartsA", + nullptr, + "IceRingBumpyPartsA", + }, + { + "IceWaterUpDownParts", + nullptr, + "IceWaterUpDownParts", + }, + { + "LavaUpDownParts", + nullptr, + "LavaUpDownParts", + }, + { + "IceUpDownShutterDoorA", + nullptr, + "IceUpDownShutterDoorA", + }, + { + "IceLavaIslandSnowStepA", + createNameObj, + "IceLavaIslandSnowStepA", + }, + { + "IceLavaIslandIceMovableStepA", + nullptr, + "IceLavaIslandIceMovableStepA", + }, + { + "IceLavaIslandLavaMovableStepA", + nullptr, + "IceLavaIslandLavaMovableStepA", + }, + { + "HoleBeltConveyerPartsA", + nullptr, + "HoleBeltConveyerPartsA", + }, + { + "HoleBeltConveyerPartsB", + nullptr, + "HoleBeltConveyerPartsB", + }, + { + "HoleBeltConveyerPartsC", + nullptr, + "HoleBeltConveyerPartsC", + }, + { + "HoleBeltConveyerPartsD", + nullptr, + "HoleBeltConveyerPartsD", + }, + { + "HoleBeltConveyerPartsE", + nullptr, + "HoleBeltConveyerPartsE", + }, + { + "HoleBeltConveyerPartsF", + nullptr, + "HoleBeltConveyerPartsF", + }, + { + "HoleBeltConveyerPartsG", + createNameObj, + "HoleBeltConveyerPartsG", + }, + { + "HoleBeltConveyerPartsH", + nullptr, + "HoleBeltConveyerPartsH", + }, + { + "ChallengeBallAccelCylinderA", + createNameObj, + "ChallengeBallAccelCylinderA", + }, + { + "ChallengeBallGearA", + createNameObj, + "ChallengeBallGearA", + }, + { + "ChallengeBallMoveGroundA", + nullptr, + "ChallengeBallMoveGroundA", + }, + { + "ChallengeBallMoveGroundB", + nullptr, + "ChallengeBallMoveGroundB", + }, + { + "ChallengeBallRotateBridgeA", + createNameObj, + "ChallengeBallRotateBridgeA", + }, + { + "ChallengeBallVanishingRoadA", + createNameObj, + "ChallengeBallVanishingRoadA", + }, + { + "TrialBubbleTimerMoveWallA", + nullptr, + "TrialBubbleTimerMoveWallA", + }, + { + "TrialBubbleRotateWallA", + createNameObj, + "TrialBubbleRotateWallA", + }, + { + "TrialBubbleRevolvingPartsA", + createNameObj, + "TrialBubbleRevolvingPartsA", + }, + { + "TrialBubbleMoveWallA", + nullptr, + "TrialBubbleMoveWallA", + }, + { + "CubeBubbleExHomeStep", + createNameObj, + "CubeBubbleExHomeStep", + }, + { + "CubeBubbleExStartStep", + createNameObj, + "CubeBubbleExStartStep", + }, + { + "CubeBubbleExRotateWallS", + createNameObj, + "CubeBubbleExRotateWallS", + }, + { + "CubeBubbleExRotateWallL", + createNameObj, + "CubeBubbleExRotateWallL", + }, + { + "CubeBubbleExPartsA", + createNameObj, + "CubeBubbleExPartsA", + }, + { + "UFONormalB", + nullptr, + "UFONormalB", + }, + { + "UFONormalD", + nullptr, + "UFONormalD", + }, + { + "UFOStrongA", + nullptr, + "UFOStrongA", + }, + { + "UFOBattleStageC", + nullptr, + "UFOBattleStageC", + }, + { + "UFOBattleStageD", + nullptr, + "UFOBattleStageD", + }, + { + "UFOBattleStageE", + nullptr, + "UFOBattleStageE", + }, + { + "UFOKinoko", + nullptr, + "UFOKinoko", + }, + { + "UFOKinokoLanding", + createNameObj, + "UFOKinokoLanding", + }, + { + "UFOBlueStarCupsule", + nullptr, + "UFOBlueStarCupsule", + }, + { + "KoopaShipA", + createNameObj, + "KoopaShipA", + }, + { + "KoopaShipB", + createNameObj, + "KoopaShipB", + }, + { + "KoopaShipC", + createNameObj, + "KoopaShipC", + }, + { + "KoopaShipD", + createNameObj, + "KoopaShipD", + }, + { + "KoopaShipE", + createNameObj, + "KoopaShipE", + }, + { + "KoopaShipSeesawStep", + nullptr, + "KoopaShipSeesawStep", + }, + { + "KoopaJrSmallShipA", + nullptr, + "KoopaJrSmallShipA", + }, + { + "KoopaJrSmallShipAGuidePoint", + createNameObj, + "KoopaJrSmallShipAGuidePoint", + }, + { + "KoopaJrKillerShipA", + createNameObj, + "KoopaJrKillerShipA", + }, + { + "KoopaJrNormalShipA", + createNameObj, + "KoopaJrNormalShipA", + }, + { + "WaterRoadCaveStepA", + nullptr, + "WaterRoadCaveStepA", + }, + { + "WaterRoadCaveStepB", + createNameObj, + "WaterRoadCaveStepB", + }, + { + "WaterRoadCaveRotateGround", + createNameObj, + "WaterRoadCaveRotateGround", + }, + { + "SubmarineVolcanoInside", + createNameObj, + "SubmarineVolcanoInside", + }, + { + "SubmarineVolcanoBigColumn", + nullptr, + "SubmarineVolcanoBigColumn", + }, + { + "SubmarineVolcanoSmallColumn", + nullptr, + "SubmarineVolcanoSmallColumn", + }, + { + "OnimasuPlanetPartsGoal", + createNameObj, + "OnimasuPlanetPartsGoal", + }, + { + "OnimasuPlanetObstaclePartsA", + createNameObj, + "OnimasuPlanetObstaclePartsA", + }, + { + "OnimasuPlanetRailMovePartsA", + nullptr, + "OnimasuPlanetRailMovePartsA", + }, + { + "OnimasuPlanetRotatePartsA", + createNameObj, + "OnimasuPlanetRotatePartsA", + }, + { + "OnimasuPlanetRotatePartsB", + createNameObj, + "OnimasuPlanetRotatePartsB", + }, + { + "PhantomShipPropellerSmall", + nullptr, + "PhantomShipPropellerSmall", + }, + { + "PhantomShipPropellerBig", + nullptr, + "PhantomShipPropellerBig", + }, + { + "PhantomShipHandle", + nullptr, + "PhantomShipHandle", + }, + { + "PhantomShipBridge", + createNameObj, + "PhantomShipBridge", + }, + { + "TakoBarrelA", + nullptr, + "TakoBarrelA", + }, + { + "TakoBarrelB", + createNameObj, + "TakoBarrelB", + }, + { + "KoopaRestarterVs3", + nullptr, + nullptr, + }, + { + "KoopaPowerUpSwitch", + nullptr, + nullptr, + }, + { + "KoopaSwitchKeeper", + nullptr, + nullptr, + }, + { + "KoopaViewSwitchKeeper", + nullptr, + nullptr, + }, + { + "KoopaBattleMapStair", + createNameObj, + "KoopaBattleMapStair", + }, + { + "KoopaBattleMapPlate", + createNameObj, + "KoopaPlate", + }, + { + "KoopaBattleMapCoinPlate", + nullptr, + "KoopaPlateCoin", + }, + { + "KoopaBattleMapStairBig", + createNameObj, + "KoopaBattleMapStairBig", + }, + { + "KoopaBattleMapStairTurn", + createNameObj, + "KoopaBattleMapStairTurn", + }, + { + "KoopaBattleMapStairturnAppear", + nullptr, + "KoopaBattleMapStairTurn", + }, + { + "KoopaVS1PartsSpiralRoad", + createNameObj, + "KoopaVS1PartsSpiralRoad", + }, + { + "KoopaVS1PartsMoveStepA", + nullptr, + "KoopaVS1PartsMoveStepA", + }, + { + "KoopaVS1PartsMoveStepB", + nullptr, + "KoopaVS1PartsMoveStepB", + }, + { + "KoopaVS1PartsRotateMoveStepA", + nullptr, + "KoopaVS1PartsRotateMoveStepA", + }, + { + "KoopaVS1PartsRotateMoveStepB", + nullptr, + "KoopaVS1PartsRotateMoveStepB", + }, + { + "KoopaVS1PartsReverseGRoad", + createNameObj, + "KoopaVS1PartsReverseGRoad", + }, + { + "KoopaVS1PartsStairRoad", + createNameObj, + "KoopaVS1PartsStairRoad", + }, + { + "KoopaVS1PartsBattleStage", + createNameObj, + "KoopaVS1PartsBattleStage", + }, + { + "KoopaVS2PartsReverseGRoadA", + createNameObj, + "KoopaVS2PartsReverseGRoadA", + }, + { + "KoopaVS2PartsReverseGRoadB", + createNameObj, + "KoopaVS2PartsReverseGRoadB", + }, + { + "KoopaVS2PartsStartRestStep", + createNameObj, + "KoopaVS2PartsStartRestStep", + }, + { + "KoopaVS2PartsRestStepA", + createNameObj, + "KoopaVS2PartsRestStepA", + }, + { + "KoopaVS2PartsRestStepB", + createNameObj, + "KoopaVS2PartsRestStepB", + }, + { + "KoopaVS2PartsRestStepC", + createNameObj, + "KoopaVS2PartsRestStepC", + }, + { + "KoopaVS2PartsRestClipC", + nullptr, + "KoopaVS2PartsRestClipC", + }, + { + "KoopaVS2PartsRestStepD", + createNameObj, + "KoopaVS2PartsRestStepD", + }, + { + "KoopaVS2PartsRestStepE", + createNameObj, + "KoopaVS2PartsRestStepE", + }, + { + "KoopaVS2PartsRestStepF", + createNameObj, + "KoopaVS2PartsRestStepF", + }, + { + "KoopaVS2PartsRestStepG", + createNameObj, + "KoopaVS2PartsRestStepG", + }, + { + "KoopaVS2PartsDarkMatterA", + createNameObj, + "KoopaVS2PartsDarkMatterA", + }, + { + "KoopaVS2PartsDarkMatterB", + createNameObj, + "KoopaVS2PartsDarkMatterB", + }, + { + "KoopaVS2PartsDarkMatterC", + createNameObj, + "KoopaVS2PartsDarkMatterC", + }, + { + "KoopaVS2PartsDarkMatterD", + createNameObj, + "KoopaVS2PartsDarkMatterD", + }, + { + "KoopaVS2PartsDarkMatterE", + createNameObj, + "KoopaVS2PartsDarkMatterE", + }, + { + "KoopaVS2PartsStartMoveStepA", + createNameObj, + "KoopaVS2PartsStartMoveStepA", + }, + { + "KoopaVS2PartsStartMoveStepB", + createNameObj, + "KoopaVS2PartsStartMoveStepB", + }, + { + "KoopaVS2PartsStartMoveStepC", + nullptr, + "KoopaVS2PartsStartMoveStepC", + }, + { + "KoopaVS2PartsRollingStep", + createNameObj, + "KoopaVS2PartsRollingStep", + }, + { + "KoopaVS2Parts2DMoveStepBarA", + nullptr, + "KoopaVS2Parts2DMoveStepBarA", + }, + { + "KoopaVS2Parts2DMoveStepBarB", + nullptr, + "KoopaVS2Parts2DMoveStepBarB", + }, + { + "KoopaVS2Parts2DMoveStepSBarB", + nullptr, + "KoopaVS2Parts2DMoveStepSBarB", + }, + { + "KoopaVS2Parts2DMoveStepConvex", + nullptr, + "KoopaVS2Parts2DMoveStepConvex", + }, + { + "KoopaVS2Parts2DMoveStepLShape", + nullptr, + "KoopaVS2Parts2DMoveStepLShape", + }, + { + "KoopaVS2Parts2DMoveStepCross", + nullptr, + "KoopaVS2Parts2DMoveStepCross", + }, + { + "KoopaVS2PartsJoinedMoveStep", + nullptr, + "KoopaVS2PartsJoinedMoveStep", + }, + { + "KoopaVS2PartsJoinedMoveClip", + nullptr, + "KoopaVS2PartsJoinedMoveClip", + }, + { + "KoopaVS2PartsSquareMoveStepA", + nullptr, + "KoopaVS2PartsSquareMoveStepA", + }, + { + "KoopaVS2PartsSquareMoveClipA", + nullptr, + "KoopaVS2PartsSquareMoveClipA", + }, + { + "KoopaVS2PartsSquareMoveStepB", + nullptr, + "KoopaVS2PartsSquareMoveStepB", + }, + { + "KoopaVS2PartsSquareMoveClipB", + nullptr, + "KoopaVS2PartsSquareMoveClipB", + }, + { + "KoopaVS2PartsClipAreaDisplayA", + nullptr, + "KoopaVS2PartsClipAreaDisplayA", + }, + { + "KoopaVS2PartsStairBig", + createNameObj, + "KoopaVS2PartsStairBig", + }, + { + "KoopaVS2Parts2DRailGuideA", + createNameObj, + "KoopaVS2Parts2DRailGuideA", + }, + { + "KoopaVS3RotateStepA", + createNameObj, + "KoopaVS3RotateStepA", + }, + { + "KoopaVS3RotateStepB", + createNameObj, + "KoopaVS3RotateStepB", + }, + { + "KoopaVS3RotateStepD", + createNameObj, + "KoopaVS3RotateStepD", + }, + { + "KoopaVS3RotateStepsA", + createNameObj, + "KoopaVS3RotateStepsA", + }, + { + "KoopaVS3Parts2DWallA", + createNameObj, + "KoopaVS3Parts2DWallA", + }, + { + "TreasureBoxCrackedEmpty", + createNameObj, + "TreasureBoxCracked", + }, + { + "TreasureBoxCrackedCoin", + createNameObj, + "TreasureBoxCracked", + }, + { + "TreasureBoxCrackedYellowChip", + createNameObj, + "TreasureBoxCracked", + }, + { + "TreasureBoxCrackedBlueChip", + createNameObj, + "TreasureBoxCracked", + }, + { + "TreasureBoxCrackedKinokoOneUp", + createNameObj, + "TreasureBoxCracked", + }, + { + "TreasureBoxCrackedKinokoLifeUp", + createNameObj, + "TreasureBoxCracked", + }, + { + "TreasureBoxCrackedAirBubble", + createNameObj, + "TreasureBoxCracked", + }, + { + "TreasureBoxCrackedPowerStar", + createNameObj, + "TreasureBoxCracked", + }, + { + "TreasureBoxEmpty", + createNameObj, + "TreasureBox", + }, + { + "TreasureBoxCoin", + createNameObj, + "TreasureBox", + }, + { + "TreasureBoxYellowChip", + createNameObj, + "TreasureBox", + }, + { + "TreasureBoxBlueChip", + createNameObj, + "TreasureBox", + }, + { + "TreasureBoxKinokoOneUp", + createNameObj, + "TreasureBox", + }, + { + "TreasureBoxKinokoLifeUp", + createNameObj, + "TreasureBox", + }, + { + "TreasureBoxGoldEmpty", + createNameObj, + "TreasureBoxGold", + }, + { + "OceanRingRuinsMove", + nullptr, + "OceanRingRuinsMove", + }, + { + "OceanRingRuinsGearSmall", + createNameObj, + "OceanRingRuinsGearSmall", + }, + { + "OceanRingRuinsGearBig", + createNameObj, + "OceanRingRuinsGearBig", + }, + { + "OceanRingRuinsColumn", + createNameObj, + "OceanRingRuinsColumn", + }, + { + "OceanRingRuinsBase", + createNameObj, + "OceanRingRuinsBase", + }, + { + "KameckShip", + createNameObj, + "KameckShip", + }, + { + "BeachParasol", + createNameObj, + "BeachParasol", + }, + { + "BeachChair", + createNameObj, + "BeachChair", + }, + { + "GhostShipCaveMoveGroundA", + nullptr, + "GhostShipCaveMoveGroundA", + }, + { + "GhostShipCaveMoveGroundB", + nullptr, + "GhostShipCaveMoveGroundB", + }, + { + "PhantomShipBoxFloaterA", + nullptr, + "PhantomShipBoxFloaterA", + }, + { + "PhantomShipBoxFloaterB", + nullptr, + "PhantomShipBoxFloaterB", + }, + { + "PhantomShipBoxFloaterC", + nullptr, + "PhantomShipBoxFloaterC", + }, + { + "PhantomCaveStepA", + createNameObj, + "PhantomCaveStepA", + }, + { + "GhostShipCaveClosedRockA", + createNameObj, + "GhostShipCaveClosedRockA", + }, + { + "GhostShipBrokenHead", + createNameObj, + "GhostShipBrokenHead", + }, + { + "CannonUnderConstructionA", + createNameObj, + "CannonUnderConstructionA", + }, + { + "CannonUnderConstructionB", + createNameObj, + "CannonUnderConstructionB", + }, + { + "GhostShipCavePipeCollision", + nullptr, + "GhostShipCavePipeCollision", + }, + { + "AstroMapBoard", + nullptr, + "AstroMapBoard", + }, + { + "AstroCore", + createNameObj, + "AstroCore", + }, + { + "AstroCountDownPlate", + createNameObj, + "AstroCountDownPlate", + }, + { + "AstroDome", + createNameObj, + nullptr, + }, + { + "AstroDomeEntrance", + createNameObj, + nullptr, + }, + { + "AstroStarPlate", + createNameObj, + nullptr, + }, + { + "AstroBaseA", + createNameObj, + "AstroBaseA", + }, + { + "AstroBaseB", + createNameObj, + "AstroBaseB", + }, + { + "AstroBaseC", + createNameObj, + "AstroBaseC", + }, + { + "AstroBaseKitchen", + createNameObj, + "AstroBaseKitchen", + }, + { + "AstroBaseCenterA", + createNameObj, + "AstroBaseCenterA", + }, + { + "AstroBaseCenterB", + createNameObj, + "AstroBaseCenterB", + }, + { + "AstroBaseCenterTop", + createNameObj, + "AstroBaseCenterTop", + }, + { + "AstroRotateStepA", + createNameObj, + "AstroRotateStepA", + }, + { + "AstroRotateStepB", + createNameObj, + "AstroRotateStepB", + }, + { + "AstroDecoratePartsA", + createNameObj, + "AstroDecoratePartsA", + }, + { + "AstroDecoratePartsGearA", + createNameObj, + "AstroDecoratePartsGearA", + }, + { + "AstroChildRoom", + createNameObj, + "AstroChildRoom", + }, + { + "AstroParking", + createNameObj, + "AstroParking", + }, + { + "AstroLibrary", + createNameObj, + "AstroLibrary", + }, + { + "AstroRoomLibrary", + createNameObj, + "AstroRoomLibrary", + }, + { + "AstroTorchLightRed", + nullptr, + nullptr, + }, + { + "AstroTorchLightBlue", + nullptr, + nullptr, + }, + { + "EffectTicoS", + nullptr, + nullptr, + }, + { + "EffectTicoL", + nullptr, + nullptr, + }, + { + "UFOKinokoUnderConstruction", + nullptr, + nullptr, + }, + { + "UFOKinokoLandingAstro", + createNameObj, + "UFOKinokoLandingAstro", + }, + { + "AstroDomeSky", + nullptr, + nullptr, + }, + { + "WhiteRoom", + createNameObj, + "WhiteRoom", + }, + { + "VROrbit", + createNameObj, + "VROrbit", + }, + { + "VRDarkSpace", + createNameObj, + "VRDarkSpace", + }, + { + "VRSandwichSun", + createNameObj, + "VRSandwichSun", + }, + { + "SummerSky", + createNameObj, + "SummerSky", + }, + { + "GalaxySky", + createNameObj, + "GalaxySky", + }, + { + "MilkyWaySky", + createNameObj, + "MilkyWaySky", + }, + { + "HalfGalaxySky", + createNameObj, + "HalfGalaxySky", + }, + { + "GreenPlanetOrbitSky", + createNameObj, + "GreenPlanetOrbitSky", + }, + { + "PhantomSky", + createNameObj, + "PhantomSky", + }, + { + "KoopaVS1Sky", + createNameObj, + "KoopaVS1Sky", + }, + { + "KoopaVS2Sky", + createNameObj, + "KoopaVS2Sky", + }, + { + "FamicomMarioSky", + createNameObj, + "FamicomMarioSky", + }, + { + "DesertSky", + createNameObj, + "DesertSky", + }, + { + "ChildRoomSky", + createNameObj, + "ChildRoomSky", + }, + { + "AuroraSky", + createNameObj, + "AuroraSky", + }, + { + "CloudSky", + createNameObj, + "CloudSky", + }, + { + "RockPlanetOrbitSky", + createNameObj, + "RockPlanetOrbitSky", + }, + { + "StarrySky", + createNameObj, + "StarrySky", + }, + { + "AstroDomeSkyA", + createNameObj, + "AstroDomeSkyA", + }, + { + "HomeAir", + createNameObj, + "HomeAir", + }, + { + "SphereAir", + createNameObj, + "SphereAir", + }, + { + "SunsetAir", + createNameObj, + "SunsetAir", + }, + { + "FineAir", + createNameObj, + "FineAir", + }, + { + "DimensionAir", + createNameObj, + "DimensionAir", + }, + { + "DarknessRoomAir", + createNameObj, + "DarknessRoomAir", + }, + { + "TwilightAir", + createNameObj, + "TwilightAir", + }, + { + "ZoneHalo", + createNameObj, + "ZoneHalo", + }, + { + "PowerStarHalo", + createNameObj, + "PowerStarHalo", + }, + { + "Coin", + MR::createDirectSetCoin, + "Coin", + }, + { + "PurpleCoin", + MR::createDirectSetPurpleCoin, + "PurpleCoin", + }, + { + "RailCoin", + nullptr, + nullptr, + }, + { + "CircleCoinGroup", + MR::createCircleCoinGroup, + nullptr, + }, + { + "PurpleRailCoin", + nullptr, + "PurpleCoin", + }, + { + "CirclePurpleCoinGroup", + MR::createCirclePurpleCoinGroup, + "PurpleCoin", + }, + { + "PurpleCoinStarter", + createNameObj, + nullptr, + }, + { + "CoinReplica", + createNameObj, + nullptr, + }, + { + "QuestionCoin", + nullptr, + "QuestionCoin", + }, + { + "BlueChip", + createNameObj, + "BlueChip", + }, + { + "YellowChip", + createNameObj, + "YellowChip", + }, + { + "BlueChipGroup", + createNameObj, + nullptr, + }, + { + "YellowChipGroup", + createNameObj, + nullptr, + }, + { + "StarPiece", + nullptr, + "StarPiece", + }, + { + "StarPieceFlow", + nullptr, + nullptr, + }, + { + "StarPieceGroup", + nullptr, + nullptr, + }, + { + "StarPieceFollowGroup", + nullptr, + nullptr, + }, + { + "StarPieceMother", + nullptr, + "StarPieceMother", + }, + { + "StarPieceSpot", + nullptr, + nullptr, + }, + { + "OceanBowl", + nullptr, + "WaterWave", + }, + { + "OceanRing", + nullptr, + "OceanRing", + }, + { + "OceanRingAndFlag", + nullptr, + "OceanRing", + }, + { + "OceanSphere", + nullptr, + "WaterWave", + }, + { + "WhirlPool", + nullptr, + nullptr, + }, + { + "WhirlPoolAccelerator", + nullptr, + "Whirlpool", + }, + { + "FishGroupA", + nullptr, + "FishA", + }, + { + "FishGroupB", + nullptr, + "FishB", + }, + { + "FishGroupC", + nullptr, + "FishC", + }, + { + "FishGroupD", + nullptr, + "FishD", + }, + { + "FishGroupE", + nullptr, + "FishE", + }, + { + "FishGroupF", + nullptr, + "FishF", + }, + { + "Flag", + nullptr, + "Flag", + }, + { + "FlagKoopaA", + nullptr, + "FlagKoopaA", + }, + { + "FlagKoopaB", + nullptr, + "FlagKoopaB", + }, + { + "FlagRaceA", + nullptr, + "FlagRaceA", + }, + { + "FlagKoopaCastle", + nullptr, + "FlagKoopaCastle", + }, + { + "FlagPeachCastleA", + nullptr, + "FlagPeachCastleA", + }, + { + "FlagPeachCastleB", + nullptr, + "FlagPeachCastleB", + }, + { + "FlagPeachCastleC", + nullptr, + "FlagPeachCastleC", + }, + { + "FlagSurfing", + nullptr, + "FlagSurfing", + }, + { + "FlagTamakoro", + nullptr, + "FlagTamakoro", + }, + { + "SeaGullGroup", + createNameObj, + "SeaGull", + }, + { + "WaterPlant", + nullptr, + "WaterPlant", + }, + { + "HitWallTimerSwitch", + nullptr, + "HitWallTimerSwitch", + }, + { + "PTimerSwitch", + nullptr, + "PTimerSwitch", + }, + { + "CrystalSwitch", + createNameObj, + "CrystalSwitch", + }, + { + "HipDropSwitch", + createNameObj, + "HipDropSwitch", + }, + { + "HipDropTimerSwitch", + nullptr, + "HipDropTimerSwitch", + }, + { + "DesertLandUpSwitch", + nullptr, + "DesertLandUpSwitch", + }, + { + "DesertLandDownSwitch", + nullptr, + "DesertLandDownSwitch", + }, + { + "ScrewSwitch", + nullptr, + "ScrewSwitch", + }, + { + "ScrewSwitchReverse", + nullptr, + "ScrewSwitchReverse", + }, + { + "PicketSwitch", + nullptr, + "PicketSwitch", + }, + { + "PicketSwitchBig", + nullptr, + "PicketSwitchBig", + }, + { + "ValveSwitch", + nullptr, + "ValveSwitch", + }, + { + "KeySwitch", + createNameObj, + "KeySwitch", + }, + { + "SpinLeverSwitch", + nullptr, + "SpinLeverSwitch", + }, + { + "EffectObjSample", + nullptr, + nullptr, + }, + { + "ShootingStarArea", + nullptr, + nullptr, + }, + { + "IcePlanetLight", + nullptr, + nullptr, + }, + { + "IceLayerBreak", + nullptr, + nullptr, + }, + { + "LavaSparksS", + nullptr, + nullptr, + }, + { + "LavaSparksL", + nullptr, + nullptr, + }, + { + "SpaceDustS", + nullptr, + nullptr, + }, + { + "SpaceDustL", + nullptr, + nullptr, + }, + { + "BirdLouseS", + nullptr, + nullptr, + }, + { + "BirdLouseL", + nullptr, + nullptr, + }, + { + "SnowS", + nullptr, + nullptr, + }, + { + "FallingSmallRock", + nullptr, + nullptr, + }, + { + "LavaHomeVolcanoFallingRock", + nullptr, + nullptr, + }, + { + "Fountain", + createNameObj, + nullptr, + }, + { + "FountainBig", + createNameObj, + "FountainBig", + }, + { + "WaterfallS", + nullptr, + nullptr, + }, + { + "WaterfallL", + nullptr, + nullptr, + }, + { + "DrainPipeBubbleA", + nullptr, + nullptr, + }, + { + "DrainPipeBubbleB", + nullptr, + nullptr, + }, + { + "WaterDropTop", + nullptr, + nullptr, + }, + { + "WaterDropBottom", + nullptr, + nullptr, + }, + { + "WaterDropMiddle", + nullptr, + nullptr, + }, + { + "SubmarineSteam", + nullptr, + nullptr, + }, + { + "SubmarineVolcano", + nullptr, + nullptr, + }, + { + "WaterLayerBreak", + nullptr, + nullptr, + }, + { + "StarPieceClusterBreak", + nullptr, + nullptr, + }, + { + "FireworksA", + nullptr, + nullptr, + }, + { + "BattleShipExplosionRock", + nullptr, + nullptr, + }, + { + "BattleShipExplosionMetal", + nullptr, + nullptr, + }, + { + "ForestWaterfallS", + nullptr, + nullptr, + }, + { + "ForestWaterfallL", + nullptr, + nullptr, + }, + { + "SandBreezeS", + nullptr, + nullptr, + }, + { + "SandBreezeL", + nullptr, + nullptr, + }, + { + "SpringJetWater", + nullptr, + nullptr, + }, + { + "SandUpDownKGBaseEffect", + nullptr, + nullptr, + }, + { + "SandUpDownTowerTopEffect", + nullptr, + nullptr, + }, + { + "UFOSandObstacleAEffect", + nullptr, + nullptr, + }, + { + "UFOSandObstacleBEffect", + nullptr, + nullptr, + }, + { + "UFOSandObstacleCEffect", + nullptr, + nullptr, + }, + { + "GravityDust", + nullptr, + nullptr, + }, + { + "Steam", + nullptr, + nullptr, + }, + { + "FallRedLeaf", + nullptr, + nullptr, + }, + { + "FallGreenLeaf", + nullptr, + nullptr, + }, + { + "IcicleRockLight", + nullptr, + nullptr, + }, + { + "TwinFallLakeWaterFall", + nullptr, + nullptr, + }, + { + "EffectTeresa", + nullptr, + nullptr, + }, + { + "UFOKinokoLandingBlackSmoke", + nullptr, + nullptr, + }, + { + "InvisibleWall10x10", + nullptr, + "InvisibleWall10x10", + }, + { + "InvisibleWall10x20", + nullptr, + "InvisibleWall10x20", + }, + { + "InvisibleWallJump10x10", + nullptr, + "InvisibleWallJump10x10", + }, + { + "InvisibleWallJump10x20", + nullptr, + "InvisibleWallJump10x20", + }, + { + "InvisibleWallGCapture10x10", + nullptr, + "InvisibleWallGCapture10x10", + }, + { + "InvisibleWallGCapture10x20", + nullptr, + "InvisibleWallGCapture10x20", + }, + { + "PolygonCodeRecoveryPlate", + nullptr, + "PolygonCodeRecoveryPlate", + }, + { + "PolygonCodeRecoveryBowl", + nullptr, + "PolygonCodeRecoveryBowl", + }, + { + "InvisibleWallBattleShipA", + nullptr, + "InvisibleWallBattleShipA", + }, + { + "InvisibleWaterfall", + nullptr, + "InvisibleWaterfall", + }, + { + "InvisibleWaterfallTwinFallLake", + nullptr, + "InvisibleWaterfallTwinFallLake", + }, + { + "StatusFloor", + nullptr, + "StatusFloor", + }, + { + "GlobalCubeGravity", + MR::createGlobalCubeGravityObj, + nullptr, + }, + { + "GlobalConeGravity", + MR::createGlobalConeGravityObj, + nullptr, + }, + { + "GlobalDiskGravity", + MR::createGlobalDiskGravityObj, + nullptr, + }, + { + "GlobalDiskTorusGravity", + MR::createGlobalDiskTorusGravityObj, + nullptr, + }, + { + "GlobalPlaneGravity", + MR::createGlobalPlaneGravityObj, + nullptr, + }, + { + "GlobalPlaneGravityInBox", + MR::createGlobalPlaneInBoxGravityObj, + nullptr, + }, + { + "GlobalPlaneGravityInCylinder", + MR::createGlobalPlaneInCylinderGravityObj, + nullptr, + }, + { + "GlobalPointGravity", + MR::createGlobalPointGravityObj, + nullptr, + }, + { + "GlobalSegmentGravity", + MR::createGlobalSegmentGravityObj, + nullptr, + }, + { + "GlobalWireGravity", + MR::createGlobalWireGravityObj, + nullptr, + }, + { + "MiniEggStarGalaxy", + nullptr, + nullptr, + }, + { + "MiniHoneyBeeKingdomGalaxy", + nullptr, + nullptr, + }, + { + "MiniFlipPanelExGalaxy", + nullptr, + nullptr, + }, + { + "MiniSurfingLv1Galaxy", + nullptr, + nullptr, + }, + { + "MiniTriLegLv1Galaxy", + nullptr, + nullptr, + }, + { + "MiniStarDustGalaxy", + nullptr, + nullptr, + }, + { + "MiniTamakoroExLv1Galaxy", + nullptr, + nullptr, + }, + { + "MiniBattleShipGalaxy", + nullptr, + nullptr, + }, + { + "MiniBreakDownPlanetGalaxy", + nullptr, + nullptr, + }, + { + "MiniKoopaBattleVs1Galaxy", + nullptr, + nullptr, + }, + { + "MiniHeavenlyBeachGalaxy", + nullptr, + nullptr, + }, + { + "MiniCubeBubbleExLv1Galaxy", + nullptr, + nullptr, + }, + { + "MiniPhantomGalaxy", + nullptr, + nullptr, + }, + { + "MiniOceanFloaterLandGalaxy", + nullptr, + nullptr, + }, + { + "MiniKoopaJrShipLv1Galaxy", + nullptr, + nullptr, + }, + { + "MiniCosmosGardenGalaxy", + nullptr, + nullptr, + }, + { + "MiniIceVolcanoGalaxy", + nullptr, + nullptr, + }, + { + "MiniHoneyBeeExGalaxy", + nullptr, + nullptr, + }, + { + "MiniSandClockGalaxy", + nullptr, + nullptr, + }, + { + "MiniKoopaBattleVs2Galaxy", + nullptr, + nullptr, + }, + { + "MiniReverseKingdomGalaxy", + nullptr, + nullptr, + }, + { + "MiniOceanRingGalaxy", + nullptr, + nullptr, + }, + { + "MiniFactoryGalaxy", + nullptr, + nullptr, + }, + { + "MiniSkullSharkGalaxy", + nullptr, + nullptr, + }, + { + "MiniFloaterOtaKingGalaxy", + nullptr, + nullptr, + }, + { + "MiniOceanPhantomCaveGalaxy", + nullptr, + nullptr, + }, + { + "MiniCannonFleetGalaxy", + nullptr, + nullptr, + }, + { + "MiniDarkRoomGalaxy", + nullptr, + nullptr, + }, + { + "MiniHellProminenceGalaxy", + nullptr, + nullptr, + }, + { + "MiniKoopaBattleVs3Galaxy", + nullptr, + nullptr, + }, + { + "SurprisedGalaxy", + nullptr, + "MiniSurprisedGalaxy", + }, + { + "SurpBeltConveyerExGalaxy", + nullptr, + "MiniSurprisedGalaxy", + }, + { + "SurpCocoonExGalaxy", + nullptr, + "MiniSurprisedGalaxy", + }, + { + "SurpTearDropGalaxy", + nullptr, + "MiniSurprisedGalaxy", + }, + { + "SurpTeresaMario2DGalaxy", + nullptr, + "MiniSurprisedGalaxy", + }, + { + "SurpSnowCapsuleGalaxy", + nullptr, + "MiniSurprisedGalaxy", + }, + { + "SurpTransformationExGalaxy", + nullptr, + "MiniSurprisedGalaxy", + }, + { + "SurpFishTunnelGalaxy", + nullptr, + "MiniSurprisedGalaxy", + }, + { + "SurpTamakoroExLv2Galaxy", + nullptr, + "MiniSurprisedGalaxy", + }, + { + "SurpSurfingLv2Galaxy", + nullptr, + "MiniSurprisedGalaxy", + }, + { + "SurpCubeBubbleExLv2Galaxy", + nullptr, + "MiniSurprisedGalaxy", + }, + { + "SurpPeachCastleFinalGalaxy", + nullptr, + "MiniSurprisedGalaxy", + }, + { + "ClipFieldSwitch", + createNameObj, + nullptr, + }, + { + "FallOutFieldDraw", + nullptr, + nullptr, + }, + { + "ClipFieldFillDraw", + nullptr, + nullptr, + }, + { + "SpotLightVolumeDraw", + nullptr, + nullptr, + }, + { + "GroupSwitchWatcher", + nullptr, + nullptr, + }, + { + "RaceRail", + nullptr, + nullptr, + }, + { + "TimerSwitch", + createNameObj, + nullptr, + }, + { + "SwitchSynchronizerReverse", + nullptr, + nullptr, + }, + { + "MovieStarter", + nullptr, + "CinemaSuper", + }, + { + "DemoGroup", + nullptr, + nullptr, + }, + { + "DemoSubGroup", + nullptr, + nullptr, + }, + { + "AstroDomeDemoStarter", + nullptr, + "SuperSpinDriver", + }, + { + "AstroDomeGalaxySelector", + nullptr, + nullptr, + }, + { + "StarReturnDemoStarter", + nullptr, + nullptr, + }, + { + "GrandStarReturnDemoStarter", + nullptr, + "GrandStar", + }, + { + "ScenarioStarter", + nullptr, + "Welcome", + }, + { + "FileSelector", + nullptr, + nullptr, + }, }; const NameObjFactory::Name2Archive cName2ArchiveNamesTable[] = { - { "AirBubbleGenerator", "AirBubble", }, - { "AssemblyBlockPartsTimerA", "AssemblyBlockPartsTimerABloom", }, - { "AstroDomeBlueStar", "GCaptureRibbon", }, - { "AstroDomeComet", "AstroDomeCometBloom", }, - { "AstroDomeDemoStarter", "AstroDomeDemoCamera", }, - { "AstroDomeDemoStarter", "SpinDriverPath", }, - { "AstroDomeGalaxySelector", "BackButton", }, - { "AstroDomeGalaxySelector", "GalaxySelect", }, - { "BasaBasa", "BasaBasaHang", }, - { "BasaBasaIce", "BasaBasaIceHang", }, - { "BeeFlowerHover", "BeeFlowerHoverLow", }, - { "BegomanBabyLauncher", "BegomanBaby", }, - { "BegomanLauncher", "BegomanSpring", }, - { "BegomanLauncher", "BegomanSpringHead", }, - { "BegomanSpike", "BegomanBrokenPiece", }, - { "BegomanSpike", "BegomanSpikeHead", }, - { "BegomanSpring", "BegomanSpringHead", }, - { "BegomanSpringHide", "BegomanBaby", }, - { "BegomanSpringHide", "BegomanSpringHead", }, - { "BigBubbleGenerator", "BigBubble", }, - { "BigFan", "BigFanWind", }, - { "BigFanNoLeg", "BigFanWind", }, - { "BigObstructBubbleGenerator", "BigBubble", }, - { "BlackHole", "BlackHoleRange", }, - { "BlackHoleCube", "BlackHoleRange", }, - { "BlueStar", "BlueStarDemo", }, - { "BlueStarCupsulePlanet", "GCaptureRibbon", }, - { "BombBird", "BombBirdBomb", }, - { "BombHeiLauncher", "BombHei", }, - { "BombLauncher", "BombHei", }, - { "BossBegoman", "BegomanBaby", }, - { "BossBegoman", "BossBegomanHead", }, - { "BossKameck", "BossKameckBattleDemo", }, - { "BossKameck", "BossKameckFireBall", }, - { "BossKameck", "Koura", }, - { "BossKameck2", "BossKameckBarrier", }, - { "BossKameck2", "BossKameckBattleDemo", }, - { "BossKameck2", "BossKameckFireBall", }, - { "BossKameck2", "Koura", }, - { "BossStinkBug", "BossStinkBugBomb", }, - { "BossStinkBug", "BossStinkBugBombLauncher", }, - { "BossStinkBug", "BossStinkBugDemo", }, - { "BossStinkBug", "BossStinkBugWing", }, - { "BreakableCage", "BreakableCageBreak", }, - { "BreakableCageRotate", "BreakableCageBreak", }, - { "BreakableCageL", "BreakableCageBreak", }, - { "BreakableTrash", "BreakableCageBreak", }, - { "BrightObj", "GlareGlow", }, - { "BrightObj", "GlareLine", }, - { "BrightSun", "GlareGlow", }, - { "BrightSun", "GlareLine", }, - { "BrightSun", "Sun", }, - { "ButlerMap", "AllStarList", }, - { "ButlerMap", "BackButton", }, - { "ButlerMap", "MapButton", }, - { "ButlerMap", "MapDomeIcon", }, - { "ButlerMap", "MapGalaxyBG", }, - { "ButlerMap", "MapGalaxyIcon", }, - { "ButlerMap", "MapGrandGalaxy", }, - { "ButlerMap", "GalaxyDetail", }, - { "ButlerMap", "GalaxyInfoTexture", }, - { "ButlerMap", "IconComet", }, - { "ButlerMap", "IconMario", }, - { "ButlerMap", "MapTicoIcon", }, - { "ButlerMap", "MapTitle", }, - { "ChainedBall", "IronBall", }, - { "ChooChooTrain", "ChooChooTrainBody", }, - { "CocoSambo", "CocoSamboHead", }, - { "CollectTico", "ItemBubble", }, - { "ConcreteBlock", "ConcreteBlockBreak", }, - { "Creeper", "CreeperFlower", }, - { "Creeper", "CreeperLeaf", }, - { "CrystalCageL", "CrystalCageLBreak", }, - { "CrystalCageMoving", "Tico", }, - { "CrystalCageS", "CrystalCageSBreak", }, - { "CrystalCageM", "CrystalCageSBreak", }, - { "DemoKoopaJrShip", "KoopaJr", }, - { "DemoKoopaJrShip", "KoopaJrMiddle", }, - { "DemoKoopaJrShip", "KoopaJrLow", }, - { "DharmaSambo", "DharmaSamboParts", }, - { "DinoPackun", "DinoPackunDemoPosition", }, - { "DinoPackun", "DinoPackunEggShell", }, - { "DinoPackun", "DinoPackunEggShellBreak", }, - { "DinoPackun", "DinoPackunTailBall", }, - { "DinoPackunVs2", "DinoPackunDemoPosition", }, - { "DinoPackunVs2", "DinoPackunEggShell", }, - { "DinoPackunVs2", "DinoPackunEggShellBreak", }, - { "DinoPackunVs2", "DinoPackunFireBall", }, - { "DinoPackunVs2", "DinoPackunTailBall", }, - { "Dodoryu", "DodoryuBank", }, - { "Dodoryu", "DodoryuHillA", }, - { "Dodoryu", "DodoryuHillB", }, - { "Dodoryu", "DodoryuHillC", }, - { "Dodoryu", "DodoryuLeadHill", }, - { "Dodoryu", "DodoryuRabbit", }, - { "EarthenPipeInWater", "EarthenPipeStream", }, - { "ElectricBazooka", "ElectricBazookaBreak", }, - { "ElectricBazooka", "ElectricBullet", }, - { "ElectricBazooka", "MogucchiShooter", }, - { "ElectricBazooka", "WaterBazookaCapsule", }, - { "ElectricRail", "ElectricRailPoint", }, - { "ElectricRailMoving", "ElectricRailPoint", }, - { "ExterminationSkeletalFishBaby", "AirBubble", }, - { "ExterminationKuriboKeySwitch", "KeySwitch", }, - { "EyeBeamer", "EyeBeamerBeam", }, - { "EyeBeamer", "EyeBeamerBeamBloom", }, - { "EyeBeamer", "EyeBeamerBeamVolume", }, - { "FileSelector", "FileInfo", }, - { "FileSelector", "FileSelect", }, - { "FileSelector", "FileSelectDataPlanet", }, - { "FileSelector", "FileSelectDataMario", }, - { "FileSelector", "FileSelectDataYoshi", }, - { "FileSelector", "FileSelectDataLuigi", }, - { "FileSelector", "FileSelectDataPeach", }, - { "FileSelector", "FileSelectDataKinopio", }, - { "FileSelector", "CometNearOrbitSky", }, - { "FileSelector", "MiiFaceDatabase", }, - { "FileSelector", "BackButton", }, - { "FileSelector", "FileNumber", }, - { "FileSelector", "TitleLogo", }, - { "FileSelector", "PressStart", }, - { "FileSelector", "MiiSelect", }, - { "FileSelector", "MiiSelect", }, - { "FileSelector", "MiiIcon", }, - { "FileSelector", "MiiConfirmIcon", }, - { "FileSelector", "BrosButton", }, - { "FileSelector", "P2Manual", }, - { "FileSelector", "MiniatureGalaxySelect", }, - { "FileSelector", "SysPALInfo", }, - { "FileSelector", "MiiFont", }, - { "FireBallBeamKameck", "BossKameckFireBall", }, - { "FireBar", "FireBarBall", }, - { "FirePressure", "FireBullet", }, - { "FlipPanel", "FlipPanelBloom", }, - { "FlipPanelReverse", "FlipPanelReverseBloom", }, - { "Fluff", "FluffLeaf", }, - { "GCaptureTarget", "GCaptureRibbon", }, - { "GhostPlayer", "Race", }, - { "GrandStarReturnDemoStarter", "SpinDriverPath", }, - { "GrandStarReturnDemoStarter", "DemoAstroReturn", }, - { "GrandStarReturnDemoStarter", "ResultWindow", }, - { "GravityLightA", "GravityLightALightVolume", }, - { "HammerHeadPackun", "PackunLeaf", }, - { "Hanachan", "HanachanBody", }, - { "Hanachan", "HanachanBodyS", }, - { "HazeCube", "ShimmerBoard", }, - { "HeavensDoorInsidePlanetPartsA", "HeavensDoorInsidePlanetPartsABloom", }, - { "HipDropRock", "HipDropRockBreak", }, - { "HoneyBee", "HoneyBeeLow", }, - { "HoneyBee", "HoneyBeeMIddle", }, - { "HoneyQueen", "HoneyQueenLow", }, - { "HoneyQueen", "HoneyQueenMiddle", }, - { "HoneyQueen", "HoneyQueenWing", }, - { "IceMerameraKing", "IceManIce", }, - { "IceMerameraKing", "IceMerameraKingShock", }, - { "IceMerameraKing", "IceMerameraKingBreak", }, - { "IcicleRock", "IcicleRockBreak", }, - { "IronBall", "BallTornado", }, - { "IronBall", "IronBallSpin", }, - { "IronCannonLauncher", "KoopaJrShipCannonShell", }, - { "IronCannonLauncherPoint", "KoopaJrShipCannonShell", }, - { "JumpBeamer", "JumpBeamerBeam", }, - { "JumpBeamer", "JumpBeamerBeamBloom", }, - { "JumpBeamer", "JumpBeamerHead", }, - { "JumpGuarder", "BegomanBaby", }, - { "JumpGuarder", "JumpGuarderHead", }, - { "Kabokuri", "KabokuriBreak", }, - { "Kabokuri", "Kuribo", }, - { "Kart", "Coin", }, - { "Kinopio", "KinopioMiddle", }, - { "Kinopio", "KinopioLow", }, - { "KinopioAstro", "KinopioMiddle", }, - { "KinopioAstro", "KinopioLow", }, - { "Kiraira", "KirairaChain", }, - { "Kiraira", "KirairaFixPointBottom", }, - { "Kiraira", "KirairaFixPointTop", }, - { "KoopaJr", "KoopaJrLow", }, - { "KoopaJr", "KoopaJrMiddle", }, - { "KoopaJrNormalShipA", "KoopaJrNormalShipALow", }, - { "KoopaJrShip", "KoopaJr", }, - { "KoopaJrShip", "KoopaJrLow", }, - { "KoopaJrShip", "KoopaJrMiddle", }, - { "KoopaJrShip", "KoopaJrShipBreak", }, - { "KoopaJrShip", "KoopaJrShipCannonMainShell", }, - { "KoopaJrShip", "KoopaJrShipCannonShell", }, - { "KoopaJrShip", "KoopaJrShipPod", }, - { "KoopaJrShip", "Kameck", }, - { "KoopaJrShip", "HomingKiller", }, - { "KoopaJrShip", "BossKameckFireBall", }, - { "KoopaShipE", "KoopaShipELow", }, - { "KoopaStatue", "KoopaStatueBreak", }, - { "KoopaVs1", "KoopaPlate", }, - { "KoopaVs1", "KoopaPlateCoin", }, - { "KoopaVs1", "KoopaPlateDamage", }, - { "KoopaVs1", "KoopaPlanetShadow", }, - { "KoopaVs1", "KoopaArmorBreak", }, - { "KoopaVs1", "KoopaBattleMapPlanet", }, - { "KoopaVs1", "KoopaBattleMapPlanetBloom", }, - { "KoopaVs1", "KoopaFire", }, - { "KoopaVs1", "KoopaFireBloom", }, - { "KoopaVs1", "KoopaShockWave", }, - { "KoopaVs1", "KoopaShockWaveBloom", }, - { "KoopaVs1", "KoopaShockWaveShadow", }, - { "KoopaVs1", "KoopaThorn", }, - { "KoopaVs1", "KoopaThornBreak", }, - { "KoopaVs1", "MeteorStrike", }, - { "KoopaVs1", "MeteorStrikeBreak", }, - { "KoopaVs2", "KoopaArmorBreak", }, - { "KoopaVs2", "KoopaBattleMapPlanetVs2", }, - { "KoopaVs2", "KoopaBattleMapPlanetVs2Bloom", }, - { "KoopaVs2", "KoopaFire", }, - { "KoopaVs2", "KoopaFireBloom", }, - { "KoopaVs2", "KoopaPlate", }, - { "KoopaVs2", "KoopaPlateCoin", }, - { "KoopaVs2", "KoopaPlateDamage", }, - { "KoopaVs2", "KoopaRollBall", }, - { "KoopaVs2", "KoopaShockWave", }, - { "KoopaVs2", "KoopaShockWaveBloom", }, - { "KoopaVs2", "KoopaShockWaveShadow", }, - { "KoopaVs2", "KoopaThorn", }, - { "KoopaVs2", "KoopaThornBreak", }, - { "KoopaVs3", "KoopaArmorBreak", }, - { "KoopaVs3", "KoopaBattleMapPlanetVs3Lv1", }, - { "KoopaVs3", "KoopaBattleMapPlanetVs3Lv2", }, - { "KoopaVs3", "KoopaBattleMapPlanetVs3Lv3", }, - { "KoopaVs3", "KoopaFire", }, - { "KoopaVs3", "KoopaFireBloom", }, - { "KoopaVs3", "KoopaPlateDamage", }, - { "KoopaVs3", "KoopaPlanetShadow", }, - { "KoopaVs3", "KoopaRollBall", }, - { "KoopaVs3", "KoopaRock", }, - { "KoopaVs3", "KoopaRockBreak", }, - { "KoopaVs3", "KoopaShockWave", }, - { "KoopaVs3", "KoopaShockWaveBloom", }, - { "KoopaVs3", "KoopaShockWaveShadow", }, - { "KoopaVs3", "KoopaThorn", }, - { "KoopaVs3", "KoopaThornBreak", }, - { "KoopaVs3", "KoopaVS3HoleSunPlanet", }, - { "KoopaVs3", "KoopaVS3HoleSunPlanetBloom", }, - { "KoopaVs3", "KoopaVS3HoleSunInsidePlanet", }, - { "KoopaVs3", "KoopaVS3HoleSunInsidePlanetBloom", }, - { "KoopaVs3", "MeteorStrike", }, - { "KoopaVs3", "MeteorStrikeBreak", }, - { "KoopaVs3", "Peach", }, - { "KoopaVs3", "PeachMiddle", }, - { "KoopaVs3", "PeachLow", }, - { "KoopaVs3", "KoopaJr", }, - { "KoopaVs3", "KoopaJrMiddle", }, - { "KoopaVs3", "KoopaJrLow", }, - { "KoopaVs3", "KoopaJrShip", }, - { "LargeChain", "LargeChainFixPoint", }, - { "LavaProminence", "LavaProminenceBloom", }, - { "LavaProminenceEnvironment", "LavaProminenceEnvironmentBloom", }, - { "LavaProminenceTriple", "LavaProminenceTripleBloom", }, - { "LavaProminenceWithoutShadow", "LavaProminenceBloom", }, - { "LavaStrangeRockL", "LavaStrangeRockLLow", }, - { "LODTestPlanet", "LODTestBillboard", }, - { "LODTestPlanet", "LODTestLowPolygon", }, - { "MarioLauncher", "Telescope", }, - { "MarioLauncher", "Sight", }, - { "MechaKoopaPartsBody", "MechaKoopaPartsBodyLow", }, - { "MeteorCannon", "MeteorCannonBreak", }, - { "MeteorStrike", "MeteorStrikeBreak", }, - { "Mogu", "MoguHole", }, - { "Mogu", "MoguStone", }, - { "Mogucchi", "MogucchiHillA", }, - { "Mogucchi", "MogucchiHillB", }, - { "Mogucchi", "MogucchiHillC", }, - { "Mogucchi", "MogucchiHole", }, - { "NokonokoLand", "Koura", }, - { "NoteFairy", "Note", }, - { "OceanBowl", "WaterCameraFilter", }, - { "OceanRing", "WaterCameraFilter", }, - { "OceanRing", "WaterWave", }, - { "OceanRingAndFlag", "FlagSurfing", }, - { "OceanRingAndFlag", "WaterCameraFilter", }, - { "OceanRingAndFlag", "WaterWave", }, - { "OceanSphere", "WaterCameraFilter", }, - { "OtaRock", "FireBall", }, - { "PackunPetit", "PackunPetitHead", }, - { "Peach", "PeachLow", }, - { "Peach", "PeachMiddle", }, - { "PeachCastleTownBeforeAttack", "PeachCastleTownBeforeAttackBloom", }, - { "Penguin", "PenguinLow", }, - { "Penguin", "PenguinMiddle", }, - { "PenguinCoach", "TiltGuidance", }, - { "PenguinSkater", "PenguinLow", }, - { "PenguinSkater", "PenguinMiddle", }, - { "PenguinStudent", "KouraShine", }, - { "PenguinStudent", "PenguinLow", }, - { "PenguinStudent", "PenguinMiddle", }, - { "Plant", "PlantLeaf", }, - { "Plant", "PlantSeed", }, - { "Plant", "PlantTop", }, - { "Polta", "PoltaArmBreak", }, - { "Polta", "PoltaBodyBreak", }, - { "Polta", "PoltaFormationRock", }, - { "Polta", "PoltaGroundRock", }, - { "Polta", "PoltaGroundRockBreak", }, - { "Polta", "PoltaLeftArm", }, - { "Polta", "PoltaRightArm", }, - { "Polta", "PoltaRock", }, - { "PrologueDirector", "PeachLetterMini", }, - { "PrologueDirector", "PrologueDemo", }, - { "PrologueDirector", "DemoPeachCastleGate", }, - { "Rabbit", "MoonRabbitLow", }, - { "Rabbit", "MoonRabbitMiddle", }, - { "RaceRail", "Race", }, - { "RingBeamer", "JumpBeamerBeam", }, - { "RingBeamer", "JumpBeamerBeamBloom", }, - { "RockBall", "BallTornado", }, - { "RockCreator", "RockBreak", }, - { "Ruby", "LODTestLow", }, - { "Ruby", "LODTestMiddle", }, - { "RunawayRabbitCollect", "SpotMarkLight", }, - { "RunawayRabbitCollect", "Tico", }, - { "RunawayRabbitCollect", "TicoBaby", }, - { "RunawayRabbitCollect", "TrickRabbitBaby", }, - { "SandUpDownTowerBreakableWallA", "SandUpDownTowerBreakableWallBreak", }, - { "SandUpDownTowerBreakableWallB", "SandUpDownTowerBreakableWallBreak", }, - { "SkeletalFishBaby", "AirBubble", }, - { "SkeletalFishBoss", "SkeletalFishBossHeadA", }, - { "SkeletalFishBoss", "SkeletalFishBossLight", }, - { "SkeletalFishBoss", "SkeletalFishBossLightBloom", }, - { "SkeletalFishBoss", "SkeletalFishBossScarFlash", }, - { "SkeletalFishBoss", "SkeletalFishBossBreak", }, - { "SkeletalFishBoss", "SkeletalFishBossShadow", }, - { "SkeletalFishBoss", "SkeletalFishGuard", }, - { "SkeletalFishBoss", "SkeletalFishGUardShadow", }, - { "Snakehead", "SnakeheadShadow", }, - { "SnakeheadSmall", "SnakeheadSmallShadow", }, - { "SpiderCoin", "SpaceCocoon", }, - { "SpinDriver", "SpinDriverShadow", }, - { "StarReturnDemoStarter", "ResultWindow", }, - { "StringSpider", "StringSpiderString", }, - { "SubmarineVolcanoBigColumn", "SubmarineVolcanoBigColumnBreak", }, - { "SubmarineVolcanoSmallColumn", "AirBubble", }, - { "SubmarineVolcanoSmallColumn", "SubmarineVolcanoSmallColumnBreak", }, - { "SuperSpinDriver", "SpinDriverPath", }, - { "SuperSpinDriver", "SuperSpinDriverShadow", }, - { "SuperSpinDriverGreen", "SpinDriverPath", }, - { "SuperSpinDriverGreen", "SuperSpinDriverEmpty", }, - { "SuperSpinDriverGreen", "SuperSpinDriverShadow", }, - { "SuperSpinDriverRed", "SpinDriverPath", }, - { "SuperSpinDriverRed", "SuperSpinDriverEmpty", }, - { "SuperSpinDriverRed", "SuperSpinDriverShadow", }, - { "Syati", "PrizeRing", }, - { "Syati", "Race", }, - { "Takobo", "IceBox", }, - { "TakoHei", "TakoHeiInk", }, - { "TamakoroWithTutorial", "BallGuidance", }, - { "TamakoroWithTutorial", "SignBoard", }, - { "TeresaMansionLightA", "TeresaMansionGlaringLightA", }, - { "TeresaMansionLightA", "TeresaMansionLightALightVolume", }, - { "TeresaMansionLightB", "TeresaMansionGlaringLightB", }, - { "TeresaMansionLightB", "TeresaMansionGlaringLightBBloom", }, - { "TeresaMansionLightB", "TeresaMansionLightBLightVolume", }, - { "SandRiverLightA", "SandRiverGlaringLightA", }, - { "SandRiverLightA", "SandRiverLightALightVolume", }, - { "TicoFat", "StarPieceTargetMeter", }, - { "TicoFat", "StarPieceTargetCounter", }, - { "TicoGalaxy", "StarPieceTargetMeter", }, - { "TicoGalaxy", "StarPieceTargetCounter", }, - { "TicoStarRing", "TicoLow", }, - { "TicoStarRing", "TicoMiddle", }, - { "TicoRail", "TicoLow", }, - { "TicoRail", "TicoMiddle", }, - { "TogeBegomanLauncher", "BegomanBrokenPiece", }, - { "TogeBegomanLauncher", "BegomanSpike", }, - { "TogeBegomanLauncher", "BegomanSpikeHead", }, - { "TombSpider", "SpiderThread", }, - { "TombSpider", "TombSpiderCocoon", }, - { "TombSpider", "TombSpiderGland", }, - { "TombSpider", "TombSpiderPlanet", }, - { "TombSpider", "TombSpiderPlanetLow", }, - { "TombSpider", "TombSpiderVitalSpot", }, - { "Torpedo", "TorpedoPropeller", }, - { "Torpedo", "TorpedoLight", }, - { "TreasureBoxCrackedAirBubble", "AirBubble", }, - { "TrickRabbit", "SpotMarkLight", }, - { "TrickRabbitGhost", "SpotMarkLight", }, - { "TrickRabbitFreeRun", "SpotMarkLight", }, - { "TrickRabbitFreeRunCollect", "SpotMarkLight", }, - { "TrickRabbitFreeRunCollect", "BombTimer", }, - { "Tripod2Boss", "Tripod2BossLow", }, - { "Tripod2Boss", "Tripod2BossLegShadow", }, - { "TripodBoss", "TripodBossLegShadow", }, - { "TripodBoss", "TripodBossLow", }, - { "TripodBoss", "GrandStar", }, - { "TripodBossBottomKillerCannon", "HomingKiller", }, - { "TripodBossCore", "TripodBossCoreBloom", }, - { "TripodBossCore", "TripodBossCoreBreak", }, - { "TripodBossKillerGenerater", "HomingKiller", }, - { "TripodBossShell", "TripodBossShellBreak", }, - { "TripodBossUnderKillerCannon", "HomingKiller", }, - { "TripodBossUpperKillerCannon", "HomingKiller", }, - { "TurtleBeamKameck", "Koura", }, - { "UFOBattleStageA", "UFOBattleStageABloom", }, - { "UFOBlueStarCupsule", "GCaptureRibbon", }, - { "Unizo", "UnizoBreak", }, - { "UnizoLand", "UnizoLandBreak", }, - { "UnizoLauncher", "UnizoLandBreak", }, - { "UnizoShoal", "UnizoShoalBreak", }, - { "WanwanRolling", "WanwanRollingBreak", }, - { "WanwanRollingGold", "WanwanRollingGoldBreak", }, - { "WatchTowerRotateStep", "WatchTowerRotateStepLift", }, - { "WaterBazooka", "MogucchiShooter", }, - { "WaterBazooka", "WaterBazookaBreak", }, - { "WaterBazooka", "WaterBazookaCapsule", }, - { "WaterBazooka", "WaterBullet", }, - { "WaterfallCaveCover", "WaterfallCaveCoverBreak", }, - { "WaterLeakPipe", "IceStepNoSlip", }, - { "WaterPressure", "WaterBullet", }, - { "WaterRoad", "WaterCameraFilter", }, - { "WaterCube", "WaterCameraFilter", }, - { "WaterSphere", "WaterCameraFilter", }, - { "WaterCylinder", "WaterCameraFilter", }, - { "WhirlPoolAccelerator", "WaterCameraFilter", }, - { "WhiteRoom", "WhiteRoomBloom", }, - { "WoodBox", "WoodBoxBreak", }, - { "SummerSky", "SpaceInner", }, - { "KoopaBattleMapPole", "FlagKoopaCastle", }, - { "AsteroidB", "AsteroidBLow", }, - { "AsteroidC", "AsteroidCLow", }, - { "AsteroidD", "AsteroidDLow", }, - { "SpaceStickA", "SpaceStickALow", }, - { "SpaceStickB", "SpaceStickBLow", }, - { "LavaBlackUFO", "LavaBlackUFOLow", }, - { "LavaStepA", "LavaStepALow", }, - { "LavaStepB", "LavaStepBLow", }, - { "LavaStepC", "LavaStepCLow", }, - { "LavaFloatingStepA", "LavaFloatingStepALow", }, - { "LavaRotatePlanetStartStep", "LavaRotatePlanetStartStepLow", }, - { "SweetsDecoratePartsFork", "SweetsDecoratePartsForkLow", }, - { "SweetsDecoratePartsSpoon", "SweetsDecoratePartsSpoonLow", }, - { "MovieStarter", "MoviePadRumblePrologueA", }, - { "MovieStarter", "MoviePadRumblePrologueB", }, - { "MovieStarter", "MoviePadRumbleFinalBattle", }, - { "MovieStarter", "MoviePadRumbleEpilogueA", }, - { "MovieStarter", "MoviePadRumbleEndingA", }, - { "MovieStarter", "MoviePadRumbleEndingB", }, + { + "AirBubbleGenerator", + "AirBubble", + }, + { + "AssemblyBlockPartsTimerA", + "AssemblyBlockPartsTimerABloom", + }, + { + "AstroDomeBlueStar", + "GCaptureRibbon", + }, + { + "AstroDomeComet", + "AstroDomeCometBloom", + }, + { + "AstroDomeDemoStarter", + "AstroDomeDemoCamera", + }, + { + "AstroDomeDemoStarter", + "SpinDriverPath", + }, + { + "AstroDomeGalaxySelector", + "BackButton", + }, + { + "AstroDomeGalaxySelector", + "GalaxySelect", + }, + { + "BasaBasa", + "BasaBasaHang", + }, + { + "BasaBasaIce", + "BasaBasaIceHang", + }, + { + "BeeFlowerHover", + "BeeFlowerHoverLow", + }, + { + "BegomanBabyLauncher", + "BegomanBaby", + }, + { + "BegomanLauncher", + "BegomanSpring", + }, + { + "BegomanLauncher", + "BegomanSpringHead", + }, + { + "BegomanSpike", + "BegomanBrokenPiece", + }, + { + "BegomanSpike", + "BegomanSpikeHead", + }, + { + "BegomanSpring", + "BegomanSpringHead", + }, + { + "BegomanSpringHide", + "BegomanBaby", + }, + { + "BegomanSpringHide", + "BegomanSpringHead", + }, + { + "BigBubbleGenerator", + "BigBubble", + }, + { + "BigFan", + "BigFanWind", + }, + { + "BigFanNoLeg", + "BigFanWind", + }, + { + "BigObstructBubbleGenerator", + "BigBubble", + }, + { + "BlackHole", + "BlackHoleRange", + }, + { + "BlackHoleCube", + "BlackHoleRange", + }, + { + "BlueStar", + "BlueStarDemo", + }, + { + "BlueStarCupsulePlanet", + "GCaptureRibbon", + }, + { + "BombBird", + "BombBirdBomb", + }, + { + "BombHeiLauncher", + "BombHei", + }, + { + "BombLauncher", + "BombHei", + }, + { + "BossBegoman", + "BegomanBaby", + }, + { + "BossBegoman", + "BossBegomanHead", + }, + { + "BossKameck", + "BossKameckBattleDemo", + }, + { + "BossKameck", + "BossKameckFireBall", + }, + { + "BossKameck", + "Koura", + }, + { + "BossKameck2", + "BossKameckBarrier", + }, + { + "BossKameck2", + "BossKameckBattleDemo", + }, + { + "BossKameck2", + "BossKameckFireBall", + }, + { + "BossKameck2", + "Koura", + }, + { + "BossStinkBug", + "BossStinkBugBomb", + }, + { + "BossStinkBug", + "BossStinkBugBombLauncher", + }, + { + "BossStinkBug", + "BossStinkBugDemo", + }, + { + "BossStinkBug", + "BossStinkBugWing", + }, + { + "BreakableCage", + "BreakableCageBreak", + }, + { + "BreakableCageRotate", + "BreakableCageBreak", + }, + { + "BreakableCageL", + "BreakableCageBreak", + }, + { + "BreakableTrash", + "BreakableCageBreak", + }, + { + "BrightObj", + "GlareGlow", + }, + { + "BrightObj", + "GlareLine", + }, + { + "BrightSun", + "GlareGlow", + }, + { + "BrightSun", + "GlareLine", + }, + { + "BrightSun", + "Sun", + }, + { + "ButlerMap", + "AllStarList", + }, + { + "ButlerMap", + "BackButton", + }, + { + "ButlerMap", + "MapButton", + }, + { + "ButlerMap", + "MapDomeIcon", + }, + { + "ButlerMap", + "MapGalaxyBG", + }, + { + "ButlerMap", + "MapGalaxyIcon", + }, + { + "ButlerMap", + "MapGrandGalaxy", + }, + { + "ButlerMap", + "GalaxyDetail", + }, + { + "ButlerMap", + "GalaxyInfoTexture", + }, + { + "ButlerMap", + "IconComet", + }, + { + "ButlerMap", + "IconMario", + }, + { + "ButlerMap", + "MapTicoIcon", + }, + { + "ButlerMap", + "MapTitle", + }, + { + "ChainedBall", + "IronBall", + }, + { + "ChooChooTrain", + "ChooChooTrainBody", + }, + { + "CocoSambo", + "CocoSamboHead", + }, + { + "CollectTico", + "ItemBubble", + }, + { + "ConcreteBlock", + "ConcreteBlockBreak", + }, + { + "Creeper", + "CreeperFlower", + }, + { + "Creeper", + "CreeperLeaf", + }, + { + "CrystalCageL", + "CrystalCageLBreak", + }, + { + "CrystalCageMoving", + "Tico", + }, + { + "CrystalCageS", + "CrystalCageSBreak", + }, + { + "CrystalCageM", + "CrystalCageSBreak", + }, + { + "DemoKoopaJrShip", + "KoopaJr", + }, + { + "DemoKoopaJrShip", + "KoopaJrMiddle", + }, + { + "DemoKoopaJrShip", + "KoopaJrLow", + }, + { + "DharmaSambo", + "DharmaSamboParts", + }, + { + "DinoPackun", + "DinoPackunDemoPosition", + }, + { + "DinoPackun", + "DinoPackunEggShell", + }, + { + "DinoPackun", + "DinoPackunEggShellBreak", + }, + { + "DinoPackun", + "DinoPackunTailBall", + }, + { + "DinoPackunVs2", + "DinoPackunDemoPosition", + }, + { + "DinoPackunVs2", + "DinoPackunEggShell", + }, + { + "DinoPackunVs2", + "DinoPackunEggShellBreak", + }, + { + "DinoPackunVs2", + "DinoPackunFireBall", + }, + { + "DinoPackunVs2", + "DinoPackunTailBall", + }, + { + "Dodoryu", + "DodoryuBank", + }, + { + "Dodoryu", + "DodoryuHillA", + }, + { + "Dodoryu", + "DodoryuHillB", + }, + { + "Dodoryu", + "DodoryuHillC", + }, + { + "Dodoryu", + "DodoryuLeadHill", + }, + { + "Dodoryu", + "DodoryuRabbit", + }, + { + "EarthenPipeInWater", + "EarthenPipeStream", + }, + { + "ElectricBazooka", + "ElectricBazookaBreak", + }, + { + "ElectricBazooka", + "ElectricBullet", + }, + { + "ElectricBazooka", + "MogucchiShooter", + }, + { + "ElectricBazooka", + "WaterBazookaCapsule", + }, + { + "ElectricRail", + "ElectricRailPoint", + }, + { + "ElectricRailMoving", + "ElectricRailPoint", + }, + { + "ExterminationSkeletalFishBaby", + "AirBubble", + }, + { + "ExterminationKuriboKeySwitch", + "KeySwitch", + }, + { + "EyeBeamer", + "EyeBeamerBeam", + }, + { + "EyeBeamer", + "EyeBeamerBeamBloom", + }, + { + "EyeBeamer", + "EyeBeamerBeamVolume", + }, + { + "FileSelector", + "FileInfo", + }, + { + "FileSelector", + "FileSelect", + }, + { + "FileSelector", + "FileSelectDataPlanet", + }, + { + "FileSelector", + "FileSelectDataMario", + }, + { + "FileSelector", + "FileSelectDataYoshi", + }, + { + "FileSelector", + "FileSelectDataLuigi", + }, + { + "FileSelector", + "FileSelectDataPeach", + }, + { + "FileSelector", + "FileSelectDataKinopio", + }, + { + "FileSelector", + "CometNearOrbitSky", + }, + { + "FileSelector", + "MiiFaceDatabase", + }, + { + "FileSelector", + "BackButton", + }, + { + "FileSelector", + "FileNumber", + }, + { + "FileSelector", + "TitleLogo", + }, + { + "FileSelector", + "PressStart", + }, + { + "FileSelector", + "MiiSelect", + }, + { + "FileSelector", + "MiiSelect", + }, + { + "FileSelector", + "MiiIcon", + }, + { + "FileSelector", + "MiiConfirmIcon", + }, + { + "FileSelector", + "BrosButton", + }, + { + "FileSelector", + "P2Manual", + }, + { + "FileSelector", + "MiniatureGalaxySelect", + }, + { + "FileSelector", + "SysPALInfo", + }, + { + "FileSelector", + "MiiFont", + }, + { + "FireBallBeamKameck", + "BossKameckFireBall", + }, + { + "FireBar", + "FireBarBall", + }, + { + "FirePressure", + "FireBullet", + }, + { + "FlipPanel", + "FlipPanelBloom", + }, + { + "FlipPanelReverse", + "FlipPanelReverseBloom", + }, + { + "Fluff", + "FluffLeaf", + }, + { + "GCaptureTarget", + "GCaptureRibbon", + }, + { + "GhostPlayer", + "Race", + }, + { + "GrandStarReturnDemoStarter", + "SpinDriverPath", + }, + { + "GrandStarReturnDemoStarter", + "DemoAstroReturn", + }, + { + "GrandStarReturnDemoStarter", + "ResultWindow", + }, + { + "GravityLightA", + "GravityLightALightVolume", + }, + { + "HammerHeadPackun", + "PackunLeaf", + }, + { + "Hanachan", + "HanachanBody", + }, + { + "Hanachan", + "HanachanBodyS", + }, + { + "HazeCube", + "ShimmerBoard", + }, + { + "HeavensDoorInsidePlanetPartsA", + "HeavensDoorInsidePlanetPartsABloom", + }, + { + "HipDropRock", + "HipDropRockBreak", + }, + { + "HoneyBee", + "HoneyBeeLow", + }, + { + "HoneyBee", + "HoneyBeeMIddle", + }, + { + "HoneyQueen", + "HoneyQueenLow", + }, + { + "HoneyQueen", + "HoneyQueenMiddle", + }, + { + "HoneyQueen", + "HoneyQueenWing", + }, + { + "IceMerameraKing", + "IceManIce", + }, + { + "IceMerameraKing", + "IceMerameraKingShock", + }, + { + "IceMerameraKing", + "IceMerameraKingBreak", + }, + { + "IcicleRock", + "IcicleRockBreak", + }, + { + "IronBall", + "BallTornado", + }, + { + "IronBall", + "IronBallSpin", + }, + { + "IronCannonLauncher", + "KoopaJrShipCannonShell", + }, + { + "IronCannonLauncherPoint", + "KoopaJrShipCannonShell", + }, + { + "JumpBeamer", + "JumpBeamerBeam", + }, + { + "JumpBeamer", + "JumpBeamerBeamBloom", + }, + { + "JumpBeamer", + "JumpBeamerHead", + }, + { + "JumpGuarder", + "BegomanBaby", + }, + { + "JumpGuarder", + "JumpGuarderHead", + }, + { + "Kabokuri", + "KabokuriBreak", + }, + { + "Kabokuri", + "Kuribo", + }, + { + "Kart", + "Coin", + }, + { + "Kinopio", + "KinopioMiddle", + }, + { + "Kinopio", + "KinopioLow", + }, + { + "KinopioAstro", + "KinopioMiddle", + }, + { + "KinopioAstro", + "KinopioLow", + }, + { + "Kiraira", + "KirairaChain", + }, + { + "Kiraira", + "KirairaFixPointBottom", + }, + { + "Kiraira", + "KirairaFixPointTop", + }, + { + "KoopaJr", + "KoopaJrLow", + }, + { + "KoopaJr", + "KoopaJrMiddle", + }, + { + "KoopaJrNormalShipA", + "KoopaJrNormalShipALow", + }, + { + "KoopaJrShip", + "KoopaJr", + }, + { + "KoopaJrShip", + "KoopaJrLow", + }, + { + "KoopaJrShip", + "KoopaJrMiddle", + }, + { + "KoopaJrShip", + "KoopaJrShipBreak", + }, + { + "KoopaJrShip", + "KoopaJrShipCannonMainShell", + }, + { + "KoopaJrShip", + "KoopaJrShipCannonShell", + }, + { + "KoopaJrShip", + "KoopaJrShipPod", + }, + { + "KoopaJrShip", + "Kameck", + }, + { + "KoopaJrShip", + "HomingKiller", + }, + { + "KoopaJrShip", + "BossKameckFireBall", + }, + { + "KoopaShipE", + "KoopaShipELow", + }, + { + "KoopaStatue", + "KoopaStatueBreak", + }, + { + "KoopaVs1", + "KoopaPlate", + }, + { + "KoopaVs1", + "KoopaPlateCoin", + }, + { + "KoopaVs1", + "KoopaPlateDamage", + }, + { + "KoopaVs1", + "KoopaPlanetShadow", + }, + { + "KoopaVs1", + "KoopaArmorBreak", + }, + { + "KoopaVs1", + "KoopaBattleMapPlanet", + }, + { + "KoopaVs1", + "KoopaBattleMapPlanetBloom", + }, + { + "KoopaVs1", + "KoopaFire", + }, + { + "KoopaVs1", + "KoopaFireBloom", + }, + { + "KoopaVs1", + "KoopaShockWave", + }, + { + "KoopaVs1", + "KoopaShockWaveBloom", + }, + { + "KoopaVs1", + "KoopaShockWaveShadow", + }, + { + "KoopaVs1", + "KoopaThorn", + }, + { + "KoopaVs1", + "KoopaThornBreak", + }, + { + "KoopaVs1", + "MeteorStrike", + }, + { + "KoopaVs1", + "MeteorStrikeBreak", + }, + { + "KoopaVs2", + "KoopaArmorBreak", + }, + { + "KoopaVs2", + "KoopaBattleMapPlanetVs2", + }, + { + "KoopaVs2", + "KoopaBattleMapPlanetVs2Bloom", + }, + { + "KoopaVs2", + "KoopaFire", + }, + { + "KoopaVs2", + "KoopaFireBloom", + }, + { + "KoopaVs2", + "KoopaPlate", + }, + { + "KoopaVs2", + "KoopaPlateCoin", + }, + { + "KoopaVs2", + "KoopaPlateDamage", + }, + { + "KoopaVs2", + "KoopaRollBall", + }, + { + "KoopaVs2", + "KoopaShockWave", + }, + { + "KoopaVs2", + "KoopaShockWaveBloom", + }, + { + "KoopaVs2", + "KoopaShockWaveShadow", + }, + { + "KoopaVs2", + "KoopaThorn", + }, + { + "KoopaVs2", + "KoopaThornBreak", + }, + { + "KoopaVs3", + "KoopaArmorBreak", + }, + { + "KoopaVs3", + "KoopaBattleMapPlanetVs3Lv1", + }, + { + "KoopaVs3", + "KoopaBattleMapPlanetVs3Lv2", + }, + { + "KoopaVs3", + "KoopaBattleMapPlanetVs3Lv3", + }, + { + "KoopaVs3", + "KoopaFire", + }, + { + "KoopaVs3", + "KoopaFireBloom", + }, + { + "KoopaVs3", + "KoopaPlateDamage", + }, + { + "KoopaVs3", + "KoopaPlanetShadow", + }, + { + "KoopaVs3", + "KoopaRollBall", + }, + { + "KoopaVs3", + "KoopaRock", + }, + { + "KoopaVs3", + "KoopaRockBreak", + }, + { + "KoopaVs3", + "KoopaShockWave", + }, + { + "KoopaVs3", + "KoopaShockWaveBloom", + }, + { + "KoopaVs3", + "KoopaShockWaveShadow", + }, + { + "KoopaVs3", + "KoopaThorn", + }, + { + "KoopaVs3", + "KoopaThornBreak", + }, + { + "KoopaVs3", + "KoopaVS3HoleSunPlanet", + }, + { + "KoopaVs3", + "KoopaVS3HoleSunPlanetBloom", + }, + { + "KoopaVs3", + "KoopaVS3HoleSunInsidePlanet", + }, + { + "KoopaVs3", + "KoopaVS3HoleSunInsidePlanetBloom", + }, + { + "KoopaVs3", + "MeteorStrike", + }, + { + "KoopaVs3", + "MeteorStrikeBreak", + }, + { + "KoopaVs3", + "Peach", + }, + { + "KoopaVs3", + "PeachMiddle", + }, + { + "KoopaVs3", + "PeachLow", + }, + { + "KoopaVs3", + "KoopaJr", + }, + { + "KoopaVs3", + "KoopaJrMiddle", + }, + { + "KoopaVs3", + "KoopaJrLow", + }, + { + "KoopaVs3", + "KoopaJrShip", + }, + { + "LargeChain", + "LargeChainFixPoint", + }, + { + "LavaProminence", + "LavaProminenceBloom", + }, + { + "LavaProminenceEnvironment", + "LavaProminenceEnvironmentBloom", + }, + { + "LavaProminenceTriple", + "LavaProminenceTripleBloom", + }, + { + "LavaProminenceWithoutShadow", + "LavaProminenceBloom", + }, + { + "LavaStrangeRockL", + "LavaStrangeRockLLow", + }, + { + "LODTestPlanet", + "LODTestBillboard", + }, + { + "LODTestPlanet", + "LODTestLowPolygon", + }, + { + "MarioLauncher", + "Telescope", + }, + { + "MarioLauncher", + "Sight", + }, + { + "MechaKoopaPartsBody", + "MechaKoopaPartsBodyLow", + }, + { + "MeteorCannon", + "MeteorCannonBreak", + }, + { + "MeteorStrike", + "MeteorStrikeBreak", + }, + { + "Mogu", + "MoguHole", + }, + { + "Mogu", + "MoguStone", + }, + { + "Mogucchi", + "MogucchiHillA", + }, + { + "Mogucchi", + "MogucchiHillB", + }, + { + "Mogucchi", + "MogucchiHillC", + }, + { + "Mogucchi", + "MogucchiHole", + }, + { + "NokonokoLand", + "Koura", + }, + { + "NoteFairy", + "Note", + }, + { + "OceanBowl", + "WaterCameraFilter", + }, + { + "OceanRing", + "WaterCameraFilter", + }, + { + "OceanRing", + "WaterWave", + }, + { + "OceanRingAndFlag", + "FlagSurfing", + }, + { + "OceanRingAndFlag", + "WaterCameraFilter", + }, + { + "OceanRingAndFlag", + "WaterWave", + }, + { + "OceanSphere", + "WaterCameraFilter", + }, + { + "OtaRock", + "FireBall", + }, + { + "PackunPetit", + "PackunPetitHead", + }, + { + "Peach", + "PeachLow", + }, + { + "Peach", + "PeachMiddle", + }, + { + "PeachCastleTownBeforeAttack", + "PeachCastleTownBeforeAttackBloom", + }, + { + "Penguin", + "PenguinLow", + }, + { + "Penguin", + "PenguinMiddle", + }, + { + "PenguinCoach", + "TiltGuidance", + }, + { + "PenguinSkater", + "PenguinLow", + }, + { + "PenguinSkater", + "PenguinMiddle", + }, + { + "PenguinStudent", + "KouraShine", + }, + { + "PenguinStudent", + "PenguinLow", + }, + { + "PenguinStudent", + "PenguinMiddle", + }, + { + "Plant", + "PlantLeaf", + }, + { + "Plant", + "PlantSeed", + }, + { + "Plant", + "PlantTop", + }, + { + "Polta", + "PoltaArmBreak", + }, + { + "Polta", + "PoltaBodyBreak", + }, + { + "Polta", + "PoltaFormationRock", + }, + { + "Polta", + "PoltaGroundRock", + }, + { + "Polta", + "PoltaGroundRockBreak", + }, + { + "Polta", + "PoltaLeftArm", + }, + { + "Polta", + "PoltaRightArm", + }, + { + "Polta", + "PoltaRock", + }, + { + "PrologueDirector", + "PeachLetterMini", + }, + { + "PrologueDirector", + "PrologueDemo", + }, + { + "PrologueDirector", + "DemoPeachCastleGate", + }, + { + "Rabbit", + "MoonRabbitLow", + }, + { + "Rabbit", + "MoonRabbitMiddle", + }, + { + "RaceRail", + "Race", + }, + { + "RingBeamer", + "JumpBeamerBeam", + }, + { + "RingBeamer", + "JumpBeamerBeamBloom", + }, + { + "RockBall", + "BallTornado", + }, + { + "RockCreator", + "RockBreak", + }, + { + "Ruby", + "LODTestLow", + }, + { + "Ruby", + "LODTestMiddle", + }, + { + "RunawayRabbitCollect", + "SpotMarkLight", + }, + { + "RunawayRabbitCollect", + "Tico", + }, + { + "RunawayRabbitCollect", + "TicoBaby", + }, + { + "RunawayRabbitCollect", + "TrickRabbitBaby", + }, + { + "SandUpDownTowerBreakableWallA", + "SandUpDownTowerBreakableWallBreak", + }, + { + "SandUpDownTowerBreakableWallB", + "SandUpDownTowerBreakableWallBreak", + }, + { + "SkeletalFishBaby", + "AirBubble", + }, + { + "SkeletalFishBoss", + "SkeletalFishBossHeadA", + }, + { + "SkeletalFishBoss", + "SkeletalFishBossLight", + }, + { + "SkeletalFishBoss", + "SkeletalFishBossLightBloom", + }, + { + "SkeletalFishBoss", + "SkeletalFishBossScarFlash", + }, + { + "SkeletalFishBoss", + "SkeletalFishBossBreak", + }, + { + "SkeletalFishBoss", + "SkeletalFishBossShadow", + }, + { + "SkeletalFishBoss", + "SkeletalFishGuard", + }, + { + "SkeletalFishBoss", + "SkeletalFishGUardShadow", + }, + { + "Snakehead", + "SnakeheadShadow", + }, + { + "SnakeheadSmall", + "SnakeheadSmallShadow", + }, + { + "SpiderCoin", + "SpaceCocoon", + }, + { + "SpinDriver", + "SpinDriverShadow", + }, + { + "StarReturnDemoStarter", + "ResultWindow", + }, + { + "StringSpider", + "StringSpiderString", + }, + { + "SubmarineVolcanoBigColumn", + "SubmarineVolcanoBigColumnBreak", + }, + { + "SubmarineVolcanoSmallColumn", + "AirBubble", + }, + { + "SubmarineVolcanoSmallColumn", + "SubmarineVolcanoSmallColumnBreak", + }, + { + "SuperSpinDriver", + "SpinDriverPath", + }, + { + "SuperSpinDriver", + "SuperSpinDriverShadow", + }, + { + "SuperSpinDriverGreen", + "SpinDriverPath", + }, + { + "SuperSpinDriverGreen", + "SuperSpinDriverEmpty", + }, + { + "SuperSpinDriverGreen", + "SuperSpinDriverShadow", + }, + { + "SuperSpinDriverRed", + "SpinDriverPath", + }, + { + "SuperSpinDriverRed", + "SuperSpinDriverEmpty", + }, + { + "SuperSpinDriverRed", + "SuperSpinDriverShadow", + }, + { + "Syati", + "PrizeRing", + }, + { + "Syati", + "Race", + }, + { + "Takobo", + "IceBox", + }, + { + "TakoHei", + "TakoHeiInk", + }, + { + "TamakoroWithTutorial", + "BallGuidance", + }, + { + "TamakoroWithTutorial", + "SignBoard", + }, + { + "TeresaMansionLightA", + "TeresaMansionGlaringLightA", + }, + { + "TeresaMansionLightA", + "TeresaMansionLightALightVolume", + }, + { + "TeresaMansionLightB", + "TeresaMansionGlaringLightB", + }, + { + "TeresaMansionLightB", + "TeresaMansionGlaringLightBBloom", + }, + { + "TeresaMansionLightB", + "TeresaMansionLightBLightVolume", + }, + { + "SandRiverLightA", + "SandRiverGlaringLightA", + }, + { + "SandRiverLightA", + "SandRiverLightALightVolume", + }, + { + "TicoFat", + "StarPieceTargetMeter", + }, + { + "TicoFat", + "StarPieceTargetCounter", + }, + { + "TicoGalaxy", + "StarPieceTargetMeter", + }, + { + "TicoGalaxy", + "StarPieceTargetCounter", + }, + { + "TicoStarRing", + "TicoLow", + }, + { + "TicoStarRing", + "TicoMiddle", + }, + { + "TicoRail", + "TicoLow", + }, + { + "TicoRail", + "TicoMiddle", + }, + { + "TogeBegomanLauncher", + "BegomanBrokenPiece", + }, + { + "TogeBegomanLauncher", + "BegomanSpike", + }, + { + "TogeBegomanLauncher", + "BegomanSpikeHead", + }, + { + "TombSpider", + "SpiderThread", + }, + { + "TombSpider", + "TombSpiderCocoon", + }, + { + "TombSpider", + "TombSpiderGland", + }, + { + "TombSpider", + "TombSpiderPlanet", + }, + { + "TombSpider", + "TombSpiderPlanetLow", + }, + { + "TombSpider", + "TombSpiderVitalSpot", + }, + { + "Torpedo", + "TorpedoPropeller", + }, + { + "Torpedo", + "TorpedoLight", + }, + { + "TreasureBoxCrackedAirBubble", + "AirBubble", + }, + { + "TrickRabbit", + "SpotMarkLight", + }, + { + "TrickRabbitGhost", + "SpotMarkLight", + }, + { + "TrickRabbitFreeRun", + "SpotMarkLight", + }, + { + "TrickRabbitFreeRunCollect", + "SpotMarkLight", + }, + { + "TrickRabbitFreeRunCollect", + "BombTimer", + }, + { + "Tripod2Boss", + "Tripod2BossLow", + }, + { + "Tripod2Boss", + "Tripod2BossLegShadow", + }, + { + "TripodBoss", + "TripodBossLegShadow", + }, + { + "TripodBoss", + "TripodBossLow", + }, + { + "TripodBoss", + "GrandStar", + }, + { + "TripodBossBottomKillerCannon", + "HomingKiller", + }, + { + "TripodBossCore", + "TripodBossCoreBloom", + }, + { + "TripodBossCore", + "TripodBossCoreBreak", + }, + { + "TripodBossKillerGenerater", + "HomingKiller", + }, + { + "TripodBossShell", + "TripodBossShellBreak", + }, + { + "TripodBossUnderKillerCannon", + "HomingKiller", + }, + { + "TripodBossUpperKillerCannon", + "HomingKiller", + }, + { + "TurtleBeamKameck", + "Koura", + }, + { + "UFOBattleStageA", + "UFOBattleStageABloom", + }, + { + "UFOBlueStarCupsule", + "GCaptureRibbon", + }, + { + "Unizo", + "UnizoBreak", + }, + { + "UnizoLand", + "UnizoLandBreak", + }, + { + "UnizoLauncher", + "UnizoLandBreak", + }, + { + "UnizoShoal", + "UnizoShoalBreak", + }, + { + "WanwanRolling", + "WanwanRollingBreak", + }, + { + "WanwanRollingGold", + "WanwanRollingGoldBreak", + }, + { + "WatchTowerRotateStep", + "WatchTowerRotateStepLift", + }, + { + "WaterBazooka", + "MogucchiShooter", + }, + { + "WaterBazooka", + "WaterBazookaBreak", + }, + { + "WaterBazooka", + "WaterBazookaCapsule", + }, + { + "WaterBazooka", + "WaterBullet", + }, + { + "WaterfallCaveCover", + "WaterfallCaveCoverBreak", + }, + { + "WaterLeakPipe", + "IceStepNoSlip", + }, + { + "WaterPressure", + "WaterBullet", + }, + { + "WaterRoad", + "WaterCameraFilter", + }, + { + "WaterCube", + "WaterCameraFilter", + }, + { + "WaterSphere", + "WaterCameraFilter", + }, + { + "WaterCylinder", + "WaterCameraFilter", + }, + { + "WhirlPoolAccelerator", + "WaterCameraFilter", + }, + { + "WhiteRoom", + "WhiteRoomBloom", + }, + { + "WoodBox", + "WoodBoxBreak", + }, + { + "SummerSky", + "SpaceInner", + }, + { + "KoopaBattleMapPole", + "FlagKoopaCastle", + }, + { + "AsteroidB", + "AsteroidBLow", + }, + { + "AsteroidC", + "AsteroidCLow", + }, + { + "AsteroidD", + "AsteroidDLow", + }, + { + "SpaceStickA", + "SpaceStickALow", + }, + { + "SpaceStickB", + "SpaceStickBLow", + }, + { + "LavaBlackUFO", + "LavaBlackUFOLow", + }, + { + "LavaStepA", + "LavaStepALow", + }, + { + "LavaStepB", + "LavaStepBLow", + }, + { + "LavaStepC", + "LavaStepCLow", + }, + { + "LavaFloatingStepA", + "LavaFloatingStepALow", + }, + { + "LavaRotatePlanetStartStep", + "LavaRotatePlanetStartStepLow", + }, + { + "SweetsDecoratePartsFork", + "SweetsDecoratePartsForkLow", + }, + { + "SweetsDecoratePartsSpoon", + "SweetsDecoratePartsSpoonLow", + }, + { + "MovieStarter", + "MoviePadRumblePrologueA", + }, + { + "MovieStarter", + "MoviePadRumblePrologueB", + }, + { + "MovieStarter", + "MoviePadRumbleFinalBattle", + }, + { + "MovieStarter", + "MoviePadRumbleEpilogueA", + }, + { + "MovieStarter", + "MoviePadRumbleEndingA", + }, + { + "MovieStarter", + "MoviePadRumbleEndingB", + }, }; const NameObjFactory::Name2MakeArchiveListFunc cName2MakeArchiveListFuncTable[] = { - { "BallBeamer", BallBeamer::makeArchiveList, }, - { "BreakableCage", MR::makeArchiveListDummyDisplayModel, }, - { "BreakableCageRotate", MR::makeArchiveListDummyDisplayModel, }, - { "BreakableCageL", MR::makeArchiveListDummyDisplayModel, }, - { "CrystalCageS", MR::makeArchiveListDummyDisplayModel, }, - { "CrystalCageM", MR::makeArchiveListDummyDisplayModel, }, - { "DemoRabbit", /* DemoRabbit::makeArchiveList, */ }, - { "GhostPlayer", /* GhostPlayer::makeArchiveList, */ }, - { "KuriboChief", /* KuriboChief::makeArchiveList, */ }, - { "YellowChip", ChipBase::makeArchiveList, }, - { "BlueChip", ChipBase::makeArchiveList, }, - { "CocoNut", CocoNut::makeArchiveList, }, - { "Coin", Coin::makeArchiveList, }, - { "PurpleCoin", Coin::makeArchiveList, }, - { "RailCoin", Coin::makeArchiveList, }, - { "CircleCoinGroup", Coin::makeArchiveList, }, - { "PurpleRailCoin", Coin::makeArchiveList, }, - { "CirclePurpleCoinGroup", Coin::makeArchiveList, }, - { "OtaKing", /* OtaKing::makeArchiveList, */ }, - { "OtaRock", /* OtaRock::makeArchiveList, */ }, - { "PowerStar", PowerStar::makeArchiveList, }, - { "RainCloud", RainCloud::makeArchiveList, }, - { "RosettaReading", RosettaReading::makeArchiveList, }, - { "RosettaPictureBook", RosettaPictureBook::makeArchiveList, }, - { "RunawayTico", /* RunawayTico::makeArchiveList, */ }, - { "Teresa", MR::makeArchiveListDummyDisplayModel, }, - { "Caretaker", /* Caretaker::makeArchiveList, */ }, - { "Kinopio", NPCActor::makeArchiveList, }, - { "KinopioAstro", /* KinopioAstro::makeArchiveList, */ }, - { "Tico", Tico::makeArchiveList, }, - { "TicoAstro", Tico::makeArchiveList, }, - { "TicoComet", NPCActor::makeArchiveListDefault, }, - { "TicoShop", NPCActor::makeArchiveListDefault, }, - { "TicoFat", TicoFat::makeArchiveList, }, - { "TicoGalaxy", TicoFat::makeArchiveList, }, - { "PenguinRacer", NPCActor::makeArchiveListDefault, }, - { "PenguinRacerLeader", NPCActor::makeArchiveListDefault, }, - { "Rosetta", /* Rosetta::makeArchiveList, */ }, - { "HoneyBee", HoneyBee::makeArchiveList, }, - { "LuigiNPC", LuigiNPC::makeArchiveList, }, - { "LuigiEvent", LuigiNPC::makeArchiveList, }, - { "StarReturnDemoStarter", /* StarReturnDemoStarter::makeArchiveList, */ }, - { "UFOKinoko", UFOKinoko::makeArchiveList, }, - { "UFOKinokoUnderConstruction", MR::makeArchiveListUFOKinokoUnderConstruction, }, - { "SunakazeKun", /* Sandstorm::makeArchiveList, */ }, - { "AstroDome", AstroMapObjFunction::makeArchiveListFromArg0, }, - { "AstroDomeEntrance", AstroMapObjFunction::makeArchiveListFromArg0, }, - { "AstroDomeSky", AstroMapObjFunction::makeArchiveListFromArg0, }, - { "AstroDomeGalaxySelector", /* GalaxySelectInfo::makeArchiveList, */ }, - { "AstroStarPlate", AstroMapObjFunction::makeArchiveListFromArg0, }, - { "AstroLibrary", /* AstroMapObj::makeArchiveListAstroNamePlate, */ }, - { "AstroChildRoom", /* AstroMapObj::makeArchiveListAstroNamePlate, */ }, - { "AstroParking", /* AstroMapObj::makeArchiveListAstroNamePlate, */ }, - { "MiniEggStarGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniHoneyBeeKingdomGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniFlipPanelExGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniSurfingLv1Galaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniTriLegLv1Galaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniStarDustGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniTamakoroExLv1Galaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniBattleShipGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniBreakDownPlanetGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniKoopaBattleVs1Galaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniHeavenlyBeachGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniCubeBubbleExLv1Galaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniPhantomGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniOceanFloaterLandGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniKoopaJrShipLv1Galaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniCosmosGardenGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniIceVolcanoGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniHoneyBeeExGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniSandClockGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniKoopaBattleVs2Galaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniReverseKingdomGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniOceanRingGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniFactoryGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniSkullSharkGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniFloaterOtaKingGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniOceanPhantomCaveGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniCannonFleetGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniDarkRoomGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniHellProminenceGalaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "MiniKoopaBattleVs3Galaxy", /* MiniatureGalaxy::makeArchiveList, */ }, - { "Hopper", /* MorphItemObjNeo::makeArchiveList, */ }, - { "BenefitItemInvincible", /* MorphItemObjNeo::makeArchiveList, */ }, - { "MorphItemNeoBee", /* MorphItemObjNeo::makeArchiveList, */ }, - { "MorphItemNeoFire", /* MorphItemObjNeo::makeArchiveList, */ }, - { "MorphItemNeoFoo", /* MorphItemObjNeo::makeArchiveList, */ }, - { "MorphItemNeoHopper", /* MorphItemObjNeo::makeArchiveList, */ }, - { "MorphItemNeoIce", /* MorphItemObjNeo::makeArchiveList, */ }, - { "MorphItemNeoTeresa", /* MorphItemObjNeo::makeArchiveList, */ }, + { + "BallBeamer", + BallBeamer::makeArchiveList, + }, + { + "BreakableCage", + MR::makeArchiveListDummyDisplayModel, + }, + { + "BreakableCageRotate", + MR::makeArchiveListDummyDisplayModel, + }, + { + "BreakableCageL", + MR::makeArchiveListDummyDisplayModel, + }, + { + "CrystalCageS", + MR::makeArchiveListDummyDisplayModel, + }, + { + "CrystalCageM", + MR::makeArchiveListDummyDisplayModel, + }, + {"DemoRabbit", /* DemoRabbit::makeArchiveList, */}, + {"GhostPlayer", /* GhostPlayer::makeArchiveList, */}, + {"KuriboChief", /* KuriboChief::makeArchiveList, */}, + { + "YellowChip", + ChipBase::makeArchiveList, + }, + { + "BlueChip", + ChipBase::makeArchiveList, + }, + { + "CocoNut", + CocoNut::makeArchiveList, + }, + { + "Coin", + Coin::makeArchiveList, + }, + { + "PurpleCoin", + Coin::makeArchiveList, + }, + { + "RailCoin", + Coin::makeArchiveList, + }, + { + "CircleCoinGroup", + Coin::makeArchiveList, + }, + { + "PurpleRailCoin", + Coin::makeArchiveList, + }, + { + "CirclePurpleCoinGroup", + Coin::makeArchiveList, + }, + {"OtaKing", /* OtaKing::makeArchiveList, */}, + {"OtaRock", /* OtaRock::makeArchiveList, */}, + { + "PowerStar", + PowerStar::makeArchiveList, + }, + { + "RainCloud", + RainCloud::makeArchiveList, + }, + { + "RosettaReading", + RosettaReading::makeArchiveList, + }, + { + "RosettaPictureBook", + RosettaPictureBook::makeArchiveList, + }, + {"RunawayTico", /* RunawayTico::makeArchiveList, */}, + { + "Teresa", + MR::makeArchiveListDummyDisplayModel, + }, + {"Caretaker", /* Caretaker::makeArchiveList, */}, + { + "Kinopio", + NPCActor::makeArchiveList, + }, + {"KinopioAstro", /* KinopioAstro::makeArchiveList, */}, + { + "Tico", + Tico::makeArchiveList, + }, + { + "TicoAstro", + Tico::makeArchiveList, + }, + { + "TicoComet", + NPCActor::makeArchiveListDefault, + }, + { + "TicoShop", + NPCActor::makeArchiveListDefault, + }, + { + "TicoFat", + TicoFat::makeArchiveList, + }, + { + "TicoGalaxy", + TicoFat::makeArchiveList, + }, + { + "PenguinRacer", + NPCActor::makeArchiveListDefault, + }, + { + "PenguinRacerLeader", + NPCActor::makeArchiveListDefault, + }, + {"Rosetta", /* Rosetta::makeArchiveList, */}, + { + "HoneyBee", + HoneyBee::makeArchiveList, + }, + { + "LuigiNPC", + LuigiNPC::makeArchiveList, + }, + { + "LuigiEvent", + LuigiNPC::makeArchiveList, + }, + {"StarReturnDemoStarter", /* StarReturnDemoStarter::makeArchiveList, */}, + { + "UFOKinoko", + UFOKinoko::makeArchiveList, + }, + { + "UFOKinokoUnderConstruction", + MR::makeArchiveListUFOKinokoUnderConstruction, + }, + {"SunakazeKun", /* Sandstorm::makeArchiveList, */}, + { + "AstroDome", + AstroMapObjFunction::makeArchiveListFromArg0, + }, + { + "AstroDomeEntrance", + AstroMapObjFunction::makeArchiveListFromArg0, + }, + { + "AstroDomeSky", + AstroMapObjFunction::makeArchiveListFromArg0, + }, + {"AstroDomeGalaxySelector", /* GalaxySelectInfo::makeArchiveList, */}, + { + "AstroStarPlate", + AstroMapObjFunction::makeArchiveListFromArg0, + }, + {"AstroLibrary", /* AstroMapObj::makeArchiveListAstroNamePlate, */}, + {"AstroChildRoom", /* AstroMapObj::makeArchiveListAstroNamePlate, */}, + {"AstroParking", /* AstroMapObj::makeArchiveListAstroNamePlate, */}, + {"MiniEggStarGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniHoneyBeeKingdomGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniFlipPanelExGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniSurfingLv1Galaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniTriLegLv1Galaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniStarDustGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniTamakoroExLv1Galaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniBattleShipGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniBreakDownPlanetGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniKoopaBattleVs1Galaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniHeavenlyBeachGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniCubeBubbleExLv1Galaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniPhantomGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniOceanFloaterLandGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniKoopaJrShipLv1Galaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniCosmosGardenGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniIceVolcanoGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniHoneyBeeExGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniSandClockGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniKoopaBattleVs2Galaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniReverseKingdomGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniOceanRingGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniFactoryGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniSkullSharkGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniFloaterOtaKingGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniOceanPhantomCaveGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniCannonFleetGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniDarkRoomGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniHellProminenceGalaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"MiniKoopaBattleVs3Galaxy", /* MiniatureGalaxy::makeArchiveList, */}, + {"Hopper", /* MorphItemObjNeo::makeArchiveList, */}, + {"BenefitItemInvincible", /* MorphItemObjNeo::makeArchiveList, */}, + {"MorphItemNeoBee", /* MorphItemObjNeo::makeArchiveList, */}, + {"MorphItemNeoFire", /* MorphItemObjNeo::makeArchiveList, */}, + {"MorphItemNeoFoo", /* MorphItemObjNeo::makeArchiveList, */}, + {"MorphItemNeoHopper", /* MorphItemObjNeo::makeArchiveList, */}, + {"MorphItemNeoIce", /* MorphItemObjNeo::makeArchiveList, */}, + {"MorphItemNeoTeresa", /* MorphItemObjNeo::makeArchiveList, */}, }; -}; +}; // namespace namespace NameObjFactory { - CreatorFuncPtr getCreator(const char *pName) { + CreatorFuncPtr getCreator(const char* pName) { if (PlanetMapCreatorFunction::isRegisteredObj(pName)) { return PlanetMapCreatorFunction::getPlanetMapCreator(pName); } @@ -1774,7 +7943,7 @@ namespace NameObjFactory { return pName2CreateFunc->mCreateFunc; } - void requestMountObjectArchives(const char *pName, const JMapInfoIter &rIter) { + void requestMountObjectArchives(const char* pName, const JMapInfoIter& rIter) { NameObjArchiveListCollector archiveList; getMountObjectArchiveList(&archiveList, pName, rIter); @@ -1783,7 +7952,7 @@ namespace NameObjFactory { } } - bool isReadResourceFromDVD(const char *pName, const JMapInfoIter &rIter) { + bool isReadResourceFromDVD(const char* pName, const JMapInfoIter& rIter) { NameObjArchiveListCollector archiveList; getMountObjectArchiveList(&archiveList, pName, rIter); @@ -1796,7 +7965,7 @@ namespace NameObjFactory { return false; } - bool isPlayerArchiveLoaderObj(const char *pArchive) { + bool isPlayerArchiveLoaderObj(const char* pArchive) { for (s32 i = 0; i < sizeof(cPlayerArchiveLoaderObjTable) / sizeof(*cPlayerArchiveLoaderObjTable); i++) { if (MR::isEqualStringCase(cPlayerArchiveLoaderObjTable[i], pArchive)) { return true; @@ -1806,15 +7975,14 @@ namespace NameObjFactory { return false; } - const Name2CreateFunc* getName2CreateFunc(const char *pName, const Name2CreateFunc *pTable) { + const Name2CreateFunc* getName2CreateFunc(const char* pName, const Name2CreateFunc* pTable) { if (pTable == nullptr) { pTable = cCreateTable; } for (const Name2CreateFunc* pName2CreateFunc = pTable; - pName2CreateFunc != cCreateTable + sizeof(cCreateTable) / sizeof(*cCreateTable); - pName2CreateFunc++) - { + pName2CreateFunc != cCreateTable + sizeof(cCreateTable) / sizeof(*cCreateTable); + pName2CreateFunc++) { if (pName2CreateFunc->mName == nullptr) { continue; } @@ -1829,11 +7997,10 @@ namespace NameObjFactory { return nullptr; } - void getMountObjectArchiveList(NameObjArchiveListCollector *pArchiveList, const char *pName, const JMapInfoIter &rIter) { + void getMountObjectArchiveList(NameObjArchiveListCollector* pArchiveList, const char* pName, const JMapInfoIter& rIter) { if (PlanetMapCreatorFunction::isRegisteredObj(pName)) { PlanetMapCreatorFunction::makeArchiveList(pArchiveList, rIter, pName); - } - else { + } else { const Name2CreateFunc* pName2CreateFunc = getName2CreateFunc(pName, nullptr); if (pName2CreateFunc != nullptr && pName2CreateFunc->mArchiveName != nullptr) { @@ -1841,22 +8008,20 @@ namespace NameObjFactory { } for (const Name2Archive* pName2Archive = cName2ArchiveNamesTable; - pName2Archive != cName2ArchiveNamesTable + sizeof(cName2ArchiveNamesTable) / sizeof(*cName2ArchiveNamesTable); - pName2Archive++) - { + pName2Archive != cName2ArchiveNamesTable + sizeof(cName2ArchiveNamesTable) / sizeof(*cName2ArchiveNamesTable); + pName2Archive++) { if (MR::isEqualString(pName2Archive->mObjectName, pName)) { pArchiveList->addArchive(pName2Archive->mArchiveName); } } for (const Name2MakeArchiveListFunc* pName2ArchiveFunc = cName2MakeArchiveListFuncTable; - pName2ArchiveFunc != cName2MakeArchiveListFuncTable + sizeof(cName2MakeArchiveListFuncTable) / sizeof(*cName2MakeArchiveListFuncTable); - pName2ArchiveFunc++) - { + pName2ArchiveFunc != cName2MakeArchiveListFuncTable + sizeof(cName2MakeArchiveListFuncTable) / sizeof(*cName2MakeArchiveListFuncTable); + pName2ArchiveFunc++) { if (MR::isEqualString(pName2ArchiveFunc->mName, pName)) { pName2ArchiveFunc->mArchiveFunc(pArchiveList, rIter); } } } } -}; +}; // namespace NameObjFactory diff --git a/src/Game/NameObj/NameObjFinder.cpp b/src/Game/NameObj/NameObjFinder.cpp index 6d32f1479..5bc310acb 100644 --- a/src/Game/NameObj/NameObjFinder.cpp +++ b/src/Game/NameObj/NameObjFinder.cpp @@ -4,6 +4,6 @@ #include "Game/System/GameSystemSceneController.hpp" #include "Game/SingletonHolder.hpp" -NameObj* NameObjFinder::find(const char *pName) { +NameObj* NameObjFinder::find(const char* pName) { return SingletonHolder::get()->mSceneController->mObjHolder->find(pName); } diff --git a/src/Game/NameObj/NameObjGroup.cpp b/src/Game/NameObj/NameObjGroup.cpp index 1f239b348..c08c3df73 100644 --- a/src/Game/NameObj/NameObjGroup.cpp +++ b/src/Game/NameObj/NameObjGroup.cpp @@ -1,7 +1,8 @@ #include "Game/NameObj/NameObjGroup.hpp" #include "Game/Util.hpp" -NameObjGroup::NameObjGroup(const char *pGroupName, int maxCount) : NameObj(pGroupName) { +NameObjGroup::NameObjGroup(const char* pGroupName, int maxCount) + : NameObj(pGroupName) { _C = 0; mObjectCount = 0; mObjects = 0; @@ -12,7 +13,7 @@ NameObjGroup::~NameObjGroup() { delete[] mObjects; } -void NameObjGroup::registerObj(NameObj *pObj) { +void NameObjGroup::registerObj(NameObj* pObj) { mObjects[mObjectCount] = pObj; mObjectCount++; } diff --git a/src/Game/NameObj/NameObjHolder.cpp b/src/Game/NameObj/NameObjHolder.cpp index 15e427ab5..322edad8b 100644 --- a/src/Game/NameObj/NameObjHolder.cpp +++ b/src/Game/NameObj/NameObjHolder.cpp @@ -30,8 +30,8 @@ void NameObjHolder::syncWithFlags() { // Missing stack variables? void NameObjHolder::callMethodAllObj(NameObjMethod pMethod) { NameObjMethod method = pMethod; - NameObj** begin = mObjArray1.begin(); - NameObj** end = mObjArray1.end(); + NameObj** begin = mObjArray1.begin(); + NameObj** end = mObjArray1.end(); for (NameObj** p = begin; p != end; p++) { (*p->*method)(); diff --git a/src/Game/NameObj/NameObjListExecutor.cpp b/src/Game/NameObj/NameObjListExecutor.cpp index 3f8be5096..473fe8f55 100644 --- a/src/Game/NameObj/NameObjListExecutor.cpp +++ b/src/Game/NameObj/NameObjListExecutor.cpp @@ -27,7 +27,7 @@ void NameObjListExecutor::init() { initDrawList(); } -s16 NameObjListExecutor::registerDrawBuffer(LiveActor *pActor, int a2) { +s16 NameObjListExecutor::registerDrawBuffer(LiveActor* pActor, int a2) { return mBufferHolder->registerDrawBuffer(pActor, a2); } @@ -38,57 +38,57 @@ void NameObjListExecutor::allocateDrawBufferActorList() { mBufferHolder->allocateActorListBuffer(); } -void NameObjListExecutor::registerPreDrawFunction(const MR::FunctorBase &rFunc, int a2) { +void NameObjListExecutor::registerPreDrawFunction(const MR::FunctorBase& rFunc, int a2) { mDrawList->registerExecuteBeforeFunction(rFunc, a2); } -void NameObjListExecutor::findLightInfo(LiveActor *pActor, int a2, int a3) const { +void NameObjListExecutor::findLightInfo(LiveActor* pActor, int a2, int a3) const { mBufferHolder->findLightInfo(pActor, a2, a3); } // NameObjListExecutor::findLightInfo -void NameObjListExecutor::incrementCheckMovement(NameObj *pObj, int category) { +void NameObjListExecutor::incrementCheckMovement(NameObj* pObj, int category) { mMovementList->incrementCheck(pObj, category); } -void NameObjListExecutor::incrementCheckCalcAnim(NameObj *pObj, int category) { +void NameObjListExecutor::incrementCheckCalcAnim(NameObj* pObj, int category) { mCalcAnimList->incrementCheck(pObj, category); } -void NameObjListExecutor::incrementCheckDraw(NameObj *pObj, int category) { +void NameObjListExecutor::incrementCheckDraw(NameObj* pObj, int category) { mDrawList->incrementCheck(pObj, category); } -void NameObjListExecutor::addToMovement(NameObj *pObj, int category) { +void NameObjListExecutor::addToMovement(NameObj* pObj, int category) { mMovementList->add(pObj, category); } -void NameObjListExecutor::addToCalcAnim(NameObj *pObj, int category) { +void NameObjListExecutor::addToCalcAnim(NameObj* pObj, int category) { mCalcAnimList->add(pObj, category); } -void NameObjListExecutor::addToDrawBuffer(LiveActor *pActor, int a2, int a3) { +void NameObjListExecutor::addToDrawBuffer(LiveActor* pActor, int a2, int a3) { mBufferHolder->active(pActor, a2, a3); } -void NameObjListExecutor::addToDraw(NameObj *pObj, int category) { +void NameObjListExecutor::addToDraw(NameObj* pObj, int category) { mDrawList->add(pObj, category); } -void NameObjListExecutor::removeToMovement(NameObj *pObj, int category) { +void NameObjListExecutor::removeToMovement(NameObj* pObj, int category) { mMovementList->remove(pObj, category); } -void NameObjListExecutor::removeToCalcAnim(NameObj *pObj, int category) { +void NameObjListExecutor::removeToCalcAnim(NameObj* pObj, int category) { mCalcAnimList->remove(pObj, category); } -void NameObjListExecutor::removeToDrawBuffer(LiveActor *pActor, int a2, int a3) { +void NameObjListExecutor::removeToDrawBuffer(LiveActor* pActor, int a2, int a3) { mBufferHolder->deactive(pActor, a2, a3); } -void NameObjListExecutor::removeToDraw(NameObj *pObj, int category) { +void NameObjListExecutor::removeToDraw(NameObj* pObj, int category) { mDrawList->remove(pObj, category); } @@ -125,17 +125,13 @@ void NameObjListExecutor::executeDraw(int category) { } void NameObjListExecutor::initMovementList() { - } void NameObjListExecutor::initCalcAnimList() { - } void NameObjListExecutor::initCalcViewAndEntryList() { - } void NameObjListExecutor::initDrawList() { - } \ No newline at end of file diff --git a/src/Game/NameObj/NameObjRegister.cpp b/src/Game/NameObj/NameObjRegister.cpp index 3106fcefb..22fe7355d 100644 --- a/src/Game/NameObj/NameObjRegister.cpp +++ b/src/Game/NameObj/NameObjRegister.cpp @@ -1,13 +1,13 @@ #include "Game/NameObj/NameObjRegister.hpp" -void NameObjRegister::setCurrentHolder(NameObjHolder *pHolder) { +void NameObjRegister::setCurrentHolder(NameObjHolder* pHolder) { mHolder = pHolder; } -void NameObjRegister::add(NameObj *pObj) { +void NameObjRegister::add(NameObj* pObj) { mHolder->add(pObj); } -NameObjRegister::NameObjRegister() : mHolder(0) { - +NameObjRegister::NameObjRegister() + : mHolder(0) { } \ No newline at end of file diff --git a/src/Game/Player/FireMarioBall.cpp b/src/Game/Player/FireMarioBall.cpp index 64f7a6688..d0eff82cc 100644 --- a/src/Game/Player/FireMarioBall.cpp +++ b/src/Game/Player/FireMarioBall.cpp @@ -23,15 +23,16 @@ namespace { f32 cForceKillDistance = 3000.0f; f32 cBoundReduction = 0.9f; f32 cGravityAcc = 2.0f; -} +} // namespace namespace NrvFireMarioBall { NEW_NERVE(FireMarioBallNrvThrow, FireMarioBall, Throw); } FireMarioBall::~FireMarioBall() {} - -FireMarioBall::FireMarioBall(const char* pName) : LiveActor(pName) { + +FireMarioBall::FireMarioBall(const char* pName) + : LiveActor(pName) { _8C = 0; } @@ -64,7 +65,7 @@ void FireMarioBall::kill() { LiveActor::kill(); } -void FireMarioBall::appearAndThrow(const TVec3f& v1 , const TVec3f& v2) { +void FireMarioBall::appearAndThrow(const TVec3f& v1, const TVec3f& v2) { mPosition.set(v1); mVelocity.set(v2 * cThrowSpeed); mRotation.set(0.0f, 57.295776f * JMath::sAtanTable.atan2_(mVelocity.x, mVelocity.z), 0.0f); @@ -72,7 +73,7 @@ void FireMarioBall::appearAndThrow(const TVec3f& v1 , const TVec3f& v2) { appear(); } -void FireMarioBall::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void FireMarioBall::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (!MR::isSensorPlayer(pReceiver)) { attackFire(pReceiver); } @@ -97,14 +98,11 @@ void FireMarioBall::initSensor() { HitSensor* FireMarioBall::isBindedAny() const { if (MR::isBindedGround(this)) { return MR::getGroundSensor(this); - } - else if (MR::isBindedWall(this)) { + } else if (MR::isBindedWall(this)) { return MR::getWallSensor(this); - } - else if (MR::isBindedRoof(this)) { + } else if (MR::isBindedRoof(this)) { return MR::getRoofSensor(this); - } - else + } else return nullptr; } @@ -121,12 +119,10 @@ bool FireMarioBall::tryToKill() { kill(); return true; } - } - else { + } else { _90 = 3; - } - } - else { + } + } else { _90 = 0; } if (!MR::isNearPlayer(this, cForceKillDistance)) { @@ -153,13 +149,11 @@ void FireMarioBall::exeThrow() { const TVec3f* v1 = MR::getGroundNormal(this); mVelocity += -*v1 * MR::vecKillElement(mVelocity, *v1, &mVelocity) * cBoundReduction; - } - else if (MR::isBindedRoof(this)) { + } else if (MR::isBindedRoof(this)) { MR::startSound(this, "SE_OJ_MARIO_FIRE_BALL_BOUND", -1, -1); const TVec3f* v2 = MR::getRoofNormal(this); mVelocity += -*v2 * MR::vecKillElement(mVelocity, *v2, &mVelocity) * cBoundReduction; - } - else { + } else { TVec3f grav; MR::calcGravityVector(this, &grav, nullptr, 0); mVelocity += grav * cGravityAcc; diff --git a/src/Game/Player/GroupChecker.cpp b/src/Game/Player/GroupChecker.cpp index ab782b231..9421caac2 100644 --- a/src/Game/Player/GroupChecker.cpp +++ b/src/Game/Player/GroupChecker.cpp @@ -1,19 +1,17 @@ #include "Game/Player/GroupChecker.hpp" -GroupChecker::GroupChecker(const char *pName, u32 a2) : NameObj(pName) -{ +GroupChecker::GroupChecker(const char* pName, u32 a2) + : NameObj(pName) { mHashTable = new HashSortTable(a2); } -void GroupChecker::initAfterPlacement() -{ +void GroupChecker::initAfterPlacement() { mHashTable->sort(); } -void GroupChecker::add(const NameObj *pObj) -{ - const char *name = pObj->mName; - u32 hashCode = MR::getHashCode(name); +void GroupChecker::add(const NameObj* pObj) { + const char* name = pObj->mName; + u32 hashCode = MR::getHashCode(name); mHashTable->add(name, 0, true); } @@ -27,8 +25,8 @@ GroupChecker::~GroupChecker() {} GroupCheckManager::~GroupCheckManager() {} -GroupCheckManager::GroupCheckManager(const char *pName) : NameObj(pName) -{ +GroupCheckManager::GroupCheckManager(const char* pName) + : NameObj(pName) { mShellSearchGroup = new GroupChecker("カメサーチ対象物グループ", 0x20); mSpinningBoxSearchGroup = new GroupChecker("スピニングボックス反射グループ", 0x8); _14 = 2; diff --git a/src/Game/Player/Mario.cpp b/src/Game/Player/Mario.cpp index d4468498e..637183d75 100644 --- a/src/Game/Player/Mario.cpp +++ b/src/Game/Player/Mario.cpp @@ -43,8 +43,8 @@ #include "Game/Util/DirectDraw.hpp" #include "revolution/mtx.h" -Mario::Mario(MarioActor *actor) : MarioModule(actor) -{ +Mario::Mario(MarioActor* actor) + : MarioModule(actor) { initMember(); mVelocity.zero(); _13C.zero(); @@ -406,14 +406,12 @@ void Mario::updateTimers() { _434--; } MarioHang* hang = mHang; - u16 hangTimer = hang->mHangTimer; + u16 hangTimer = hang->mHangTimer; if (hangTimer == 0) { return; - } - else { + } else { hang->mHangTimer = hangTimer + -1; } - } /* @@ -496,19 +494,18 @@ bool Mario::isEnableCheckGround() { return !isStatusActive(6); } -void Mario::setGroundNorm(const TVec3f &rVec) { +void Mario::setGroundNorm(const TVec3f& rVec) { MR::isNearZero(mAirGravityVec, 0.001f); TVec3f negRVec = -rVec; if (MR::diffAngleAbs(negRVec, mAirGravityVec) > 1.4959966f) { - } - else { + } else { _368 = rVec; _374 = -rVec; } } // Nearly matches -void Mario::createMtxDir(MtxPtr mtx, const TVec3f &rFront, const TVec3f &rUp, const TVec3f &rSide) { +void Mario::createMtxDir(MtxPtr mtx, const TVec3f& rFront, const TVec3f& rUp, const TVec3f& rSide) { TVec3f side; TVec3f front; TVec3f up; @@ -522,20 +519,17 @@ void Mario::createMtxDir(MtxPtr mtx, const TVec3f &rFront, const TVec3f &rUp, co f32 upAngleDiff = MR::diffAngleAbs(up, _938); if (sideAngleDiff < mActor->mConst->getTable()->mVibrationAbsorbAngleS) { side = _950; - } - else { + } else { _950 = side; } if (frontAngleDiff < mActor->mConst->getTable()->mVibrationAbsorbAngleF) { front = _944; - } - else { + } else { _944 = front; } if (upAngleDiff < mActor->mConst->getTable()->mVibrationAbsorbAngleH) { up = _938; - } - else { + } else { _938 = up; } } @@ -577,7 +571,6 @@ bool Mario::isNonFixHeadVec() const { return false; } return mActor->_EA4; - } /* void Mario::createDirectionMtx(MtxPtr mtx) { @@ -617,7 +610,7 @@ bool Mario::isNonFixHeadVec() const { MR::setMtxTrans(mtx, 0.0f, 0.0f, 0.0f); } */ -void Mario::slopeTiltHead(TVec3f *pVec) { +void Mario::slopeTiltHead(TVec3f* pVec) { if (mMovementStates._1) { if (_8F0 > 0.0f && !mMovementStates._23) { float blendFactor = _8F0 / 5.0f; @@ -626,8 +619,7 @@ void Mario::slopeTiltHead(TVec3f *pVec) { } MR::vecBlend(_368, *pVec, pVec, blendFactor); MR::normalize(pVec); - } - else if (mDrawStates._4) { + } else if (mDrawStates._4) { MR::vecBlend(_368, *pVec, pVec, 0.2); MR::normalize(pVec); } @@ -646,21 +638,18 @@ void Mario::fixFrontVecByGravity() { MR::normalizeOrZero(&side); if (_344.dot(side) >= 0.0f) { _344 = side; - } - else { + } else { _344 = -side; } if (mSideVec.dot(_344) >= 0.0f) { mSideVec = _344; MR::normalize(&mSideVec); - } - else { - // TVec3f stack_14 = -_344; + } else { + // TVec3f stack_14 = -_344; mSideVec = -_344; MR::normalize(&mSideVec); } - } - else if (_1C._2) { + } else if (_1C._2) { TVec3f side2; PSVECCrossProduct(&up, &mFrontVec, &side2); MR::normalizeOrZero(&side2); @@ -686,7 +675,7 @@ void Mario::fixFrontVecFromUpSide() { if (MR::isNearZero(frontVec, 0.001f) == false) { setFrontVec(frontVec); _22C = mFrontVec; - float scaleFactor = PSVECMag((Vec*)&_328); + float scaleFactor = PSVECMag((Vec*)&_328); TVec3f scaledFront(mFrontVec); // inlined when it shouldn't be scaledFront.scale(scaleFactor); _328 = scaledFront; @@ -702,47 +691,44 @@ void Mario::fixSideVecFromFrontUp() { } } -void Mario::setSideVec(const TVec3f &rSide) { +void Mario::setSideVec(const TVec3f& rSide) { mSideVec = rSide; MR::normalize(&mSideVec); } -void Mario::setHeadVec(const TVec3f &rHead) { +void Mario::setHeadVec(const TVec3f& rHead) { mHeadVec = rHead; MR::normalize(&mHeadVec); } -void Mario::setFrontVec(const TVec3f &rFront) { +void Mario::setFrontVec(const TVec3f& rFront) { TVec3f plusMinus6A0; TVec3f frontWithout6A0; if (mMovementStates._37 && !isStatusActive(0x22)) { if (getCamDirZ().dot(_6A0) > 0.0f) { plusMinus6A0 = _6A0; - } - else { + } else { TVec3f neg6A0 = -_6A0; plusMinus6A0 = neg6A0; } if (plusMinus6A0.dot(rFront) > 0.0f) { // maybe this reflects rFront around _6A0?? (very unsure) - float f1 = MR::vecKillElement(rFront, plusMinus6A0, &frontWithout6A0); + float f1 = MR::vecKillElement(rFront, plusMinus6A0, &frontWithout6A0); TVec3f scaled6A0(plusMinus6A0); scaled6A0.scale(f1); frontWithout6A0 -= scaled6A0; MR::normalizeOrZero(&frontWithout6A0); mFrontVec = frontWithout6A0; - } - else { + } else { mFrontVec = rFront; } - } - else { + } else { mFrontVec = rFront; } MR::normalize(&mFrontVec); } -void Mario::setFrontVecKeepUp(const TVec3f &rFront, f32 blendFactor) { +void Mario::setFrontVecKeepUp(const TVec3f& rFront, f32 blendFactor) { TVec3f blendedFront; if (MR::isNearZero(rFront, 0.001f) == false) { TVec3f normalizedFront(rFront); @@ -759,22 +745,21 @@ void Mario::setFrontVecKeepUp(const TVec3f &rFront, f32 blendFactor) { } } -void Mario::setFrontVecKeepUpAngle(const TVec3f &frontVec, f32 angle) { +void Mario::setFrontVecKeepUpAngle(const TVec3f& frontVec, f32 angle) { if (MR::isNearZero(frontVec, 0.001f) == false) { f32 angleDiff = MR::diffAngleAbs(mFrontVec, frontVec); if (angleDiff != 0.0f) { if (angleDiff < angle) { setFrontVecKeepUp(frontVec); - } - else { - setFrontVecKeepUp(frontVec, angle/angleDiff); + } else { + setFrontVecKeepUp(frontVec, angle / angleDiff); } } } } -void Mario::setFrontVecKeepUp(const TVec3f &rFront, u32 _750_set) { - Mtx rotMtx; +void Mario::setFrontVecKeepUp(const TVec3f& rFront, u32 _750_set) { + Mtx rotMtx; TVec3f rotFrontVec; TVec3f rotVec2; PSMTXRotAxisRad(rotMtx, &mHeadVec, _74C); @@ -786,8 +771,7 @@ void Mario::setFrontVecKeepUp(const TVec3f &rFront, u32 _750_set) { float angleDiff2 = MR::diffAngleAbs(rFront, rotVec2); if (angleDiff2 < angleDiff) { _74C = -angleDiff; - } - else { + } else { _74C = angleDiff; } } @@ -797,7 +781,7 @@ void Mario::setFrontVecKeepUp(const TVec3f &rFront, u32 _750_set) { } } -void Mario::setFrontVecKeepUp(const TVec3f &rFront) { +void Mario::setFrontVecKeepUp(const TVec3f& rFront) { TVec3f front = mFrontVec; TVec3f side; TVec3f blendedFront; @@ -821,14 +805,14 @@ void Mario::setFrontVecKeepUp(const TVec3f &rFront) { PSVECCrossProduct(&mSideVec, &mHeadVec, &front2); setFrontVec(front2); _22C = mFrontVec; - f32 _328mag = PSVECMag(&_328); + f32 _328mag = PSVECMag(&_328); TVec3f scaledFront(mFrontVec); scaledFront.scale(_328mag); _328 = scaledFront; _344 = mSideVec; } -void Mario::setFrontVecKeepSide(const TVec3f &rFront) { +void Mario::setFrontVecKeepSide(const TVec3f& rFront) { TVec3f headVec; TVec3f front; if (MR::isNearZero(rFront, 0.001f) == false) { @@ -837,27 +821,26 @@ void Mario::setFrontVecKeepSide(const TVec3f &rFront) { PSVECCrossProduct(&mFrontVec, &mSideVec, &headVec); if (MR::normalizeOrZero(&headVec) != nullptr) { const TVec3f* gravity = getGravityVec(); - TVec3f up = -(*gravity); + TVec3f up = -(*gravity); mHeadVec = up; MR::normalize(&mHeadVec); - } - else { + } else { mHeadVec = headVec; MR::normalize(&mHeadVec); } PSVECCrossProduct(&mSideVec, &mHeadVec, &front); setFrontVec(front); _22C = mFrontVec; - float _328mag = PSVECMag(&_328); + float _328mag = PSVECMag(&_328); TVec3f scaledFront(mFrontVec); scaledFront.scale(_328mag); _328 = scaledFront; } -void Mario::setHeadAndFrontVecFromRotate(const TVec3f &rRotate) { +void Mario::setHeadAndFrontVecFromRotate(const TVec3f& rRotate) { TVec3f frontVec = TVec3f(0.0f, 0.0f, 1.0f); TVec3f headVec = TVec3f(0.0f, 1.0f, 0.0f); - Mtx mtx; + Mtx mtx; MR::makeMtxTR(mtx, 0.0f, 0.0f, 0.0f, rRotate.x, rRotate.y, rRotate.z); PSMTXMultVec(mtx, (Vec*)&frontVec, (Vec*)&frontVec); PSMTXMultVecSR(mtx, (Vec*)&headVec, (Vec*)&headVec); @@ -866,7 +849,7 @@ void Mario::setHeadAndFrontVecFromRotate(const TVec3f &rRotate) { setFrontVecKeepUp(frontVec); } -void Mario::forceSetHeadVecKeepSide(const TVec3f &rVec) { +void Mario::forceSetHeadVecKeepSide(const TVec3f& rVec) { mHeadVec = rVec; _1FC = rVec; if (MR::isSameDirection(rVec, mSideVec, 0.01f)) { @@ -881,9 +864,9 @@ void Mario::forceSetHeadVecKeepSide(const TVec3f &rVec) { void Mario::draw() const { if (mDrawStates._1) { TDDraw::cameraInit3D(); - TDDraw::setup(0,1,0); + TDDraw::setup(0, 1, 0); TVec3f* p_2A0 = &mActor->_2A0; - TVec3f diff31C_2A0(mShadowPos); + TVec3f diff31C_2A0(mShadowPos); diff31C_2A0 -= *p_2A0; TDDraw::drawCylinder(mPosition, diff31C_2A0, 32.0f, 0xffff0010, 0xff000004, 8); TVec3f diff2A0_31C(mActor->_2A0); @@ -891,7 +874,7 @@ void Mario::draw() const { f32 diffMag = PSVECMag(&diff2A0_31C); MR::normalize(&diff2A0_31C); TVec3f _31CPlusStuff(mShadowPos); - f32 _37CMod10 = mActor->_37C % 0xa; + f32 _37CMod10 = mActor->_37C % 0xa; _31CPlusStuff += diff2A0_31C.scaleInline(diffMag).scaleInline(0.125f).scaleInline(_37CMod10).scaleInline(0.1f); f32 one_eighth = 0.125f; for (u32 i = 0; i < 8; i++) { @@ -920,7 +903,7 @@ void Mario::draw() const { */ -void Mario::addTrans(const TVec3f &rShift, const char *a2) { +void Mario::addTrans(const TVec3f& rShift, const char* a2) { mPosition += rShift; TVec3f _148shift(_148); _148shift -= rShift; @@ -932,7 +915,7 @@ void Mario::addTrans(const TVec3f &rShift, const char *a2) { _148shiftTemp = __fabsf(_148shift.y); _148Temp = __fabsf(_148.y); if (_148Temp <= _148shiftTemp) { - _148.y= 0.0f; + _148.y = 0.0f; } _148shiftTemp = __fabsf(_148shift.z); _148Temp = __fabsf(_148.z); @@ -941,7 +924,7 @@ void Mario::addTrans(const TVec3f &rShift, const char *a2) { } } -void Mario::setTrans(const TVec3f &rShift, const char *a2) { +void Mario::setTrans(const TVec3f& rShift, const char* a2) { TVec3f reqShift(rShift); reqShift -= mPosition; mPosition = rShift; @@ -955,7 +938,7 @@ void Mario::setTrans(const TVec3f &rShift, const char *a2) { _148shiftTemp = __fabsf(_148shift.y); _148Temp = __fabsf(_148.y); if (_148Temp <= _148shiftTemp) { - _148.y= 0.0f; + _148.y = 0.0f; } _148shiftTemp = __fabsf(_148shift.z); _148Temp = __fabsf(_148.z); @@ -986,8 +969,7 @@ bool Mario::isInvincible() const { } if (mMovementStates._1F) { return true; - } - else { + } else { return mActor->_3D8 != false; } } @@ -995,21 +977,19 @@ bool Mario::isInvincible() const { bool Mario::isCeiling() const { if (_4C8->isValid() == false) { return false; - } - else { + } else { return !MR::isNearZero(_3A4, 0.001f); } } -void Mario::setGravityVec(const TVec3f &rGravity) { +void Mario::setGravityVec(const TVec3f& rGravity) { if (MR::isSameDirection(mAirGravityVec, rGravity, 0.01)) { if (MR::isOppositeDirection(mAirGravityVec, rGravity, 0.01)) { _10._24 = 1; _10._25 = 1; } _1E4.zero(); - } - else { + } else { PSVECCrossProduct(&mAirGravityVec, &rGravity, &_1E4); MR::normalizeOrZero(&_1E4); f32 frontDot = __fabsf(mFrontVec.dot(_1E4)); @@ -1027,24 +1007,21 @@ void Mario::setGravityVec(const TVec3f &rGravity) { } void Mario::updateSoundCode() { - s32 soundCode = -1; + s32 soundCode = -1; Mario* pPlayer = getPlayer(); if (pPlayer->mMovementStates._1) { if (mGroundPolygon->isValid()) { soundCode = MR::getSoundCodeIndex(mGroundPolygon->getAttributes()); } - } - else if (_45C->isValid()) { + } else if (_45C->isValid()) { soundCode = MR::getSoundCodeIndex(_45C->getAttributes()); } if (isStatusActive(1)) { if (mMovementStates._8) { soundCode = MR::getSoundCodeIndex(mFrontWallTriangle->getAttributes()); - } - else if (mMovementStates._19) { + } else if (mMovementStates._19) { soundCode = MR::getSoundCodeIndex(mBackWallTriangle->getAttributes()); - } - else if (mMovementStates._1A) { + } else if (mMovementStates._1A) { soundCode = MR::getSoundCodeIndex(mSideWallTriangle->getAttributes()); } } @@ -1085,19 +1062,18 @@ bool Mario::isForceStopRush() const { goto exit_true; } goto exit_false; - - exit_true: - return true; - exit_false: - return false; +exit_true: + return true; +exit_false: + return false; } -const TVec3f &Mario::getShadowNorm() const { +const TVec3f& Mario::getShadowNorm() const { return *_45C->getNormal(0); } -const TVec3f &Mario::getAirGravityVec() const { +const TVec3f& Mario::getAirGravityVec() const { MR::isNearZero(this->mAirGravityVec, 0.001f); return mAirGravityVec; } @@ -1382,7 +1358,7 @@ const TVec3f* Mario::getGravityVec() const { if (isStatusActive(0x1e) || isStatusActive(0x1d)) { return &_790; } - if (mMovementStates._1 && !isSlipFloorCode(_960)) { + if (mMovementStates._1 && !isSlipFloorCode(_960)) { if (mActor->mAlphaEnable) { return &mAirGravityVec; } @@ -1399,26 +1375,22 @@ const TVec3f* Mario::getGravityVec() const { if (isSwimming()) { if (mSwim->_19C >= -150.0f && mDrawStates._F && MR::isNearZero(_38C, 0.001f) == false) { return &_38C; - } + } return &mAirGravityVec; } MR::isNearZero(mAirGravityVec, 0.001f); bool b1 = true; if (_430 == 0xc) { b1 = false; - } - else if (_430 == 0xd) { + } else if (_430 == 0xd) { b1 = false; } - if (!isSlipFloorCode(_960) && b1 && !isPlayerModeHopper() && !isPlayerModeTeresa() && !isDamaging() - && !isStatusActive(6) && !isStatusActive(4) && !isStatusActive(0x13) && _430 != 5 && mActor->_334 == 0 - && mMovementStates.jumping && !mMovementStates._22 && _3BC < 8) { - return &_374; + if (!isSlipFloorCode(_960) && b1 && !isPlayerModeHopper() && !isPlayerModeTeresa() && !isDamaging() && !isStatusActive(6) && !isStatusActive(4) && !isStatusActive(0x13) && _430 != 5 && mActor->_334 == 0 && mMovementStates.jumping && !mMovementStates._22 && _3BC < 8) { + return &_374; } return &mAirGravityVec; } - void Mario::touchWater() { if (mActor->isActionOk("水解除") && mMorphResetTimer == 0) { mMorphResetTimer = 10; diff --git a/src/Game/Player/MarioActor.cpp b/src/Game/Player/MarioActor.cpp index 600e3f394..8e15c21ec 100644 --- a/src/Game/Player/MarioActor.cpp +++ b/src/Game/Player/MarioActor.cpp @@ -23,8 +23,7 @@ #include "JSystem/JAudio2/JAIAudible.hpp" #include "JSystem/JMath/JMath.hpp" -Triangle &Triangle::operator=(const Triangle &rOther) -{ +Triangle& Triangle::operator=(const Triangle& rOther) { mParts = rOther.mParts; mIdx = rOther.mIdx; mSensor = rOther.mSensor; @@ -39,8 +38,8 @@ Triangle &Triangle::operator=(const Triangle &rOther) return *this; } -MarioActor::MarioActor(const char *pName) : LiveActor(pName), _1B0(0xFFFFFFFF) -{ +MarioActor::MarioActor(const char* pName) + : LiveActor(pName), _1B0(0xFFFFFFFF) { initMember(); mMario = new Mario(this); _930 = 0; @@ -227,8 +226,7 @@ MarioActor::MarioActor(const char *pName) : LiveActor(pName), _1B0(0xFFFFFFFF) static f32 BASE_ROTATION = 0.0f; -void MarioActor::init(const JMapInfoIter &rInfo) -{ +void MarioActor::init(const JMapInfoIter& rInfo) { s32 initialAnimation = -1; if (!MR::isValidInfo(rInfo)) { return; @@ -253,8 +251,7 @@ struct DUMMY { u8 _0[0x30]; }; -void MarioActor::init2(const TVec3f &a, const TVec3f &b, s32 initialAnimation) -{ +void MarioActor::init2(const TVec3f& a, const TVec3f& b, s32 initialAnimation) { _8C = 1; gIsLuigi = false; if (MR::isPlayerLuigi()) { @@ -340,13 +337,13 @@ void MarioActor::init2(const TVec3f &a, const TVec3f &b, s32 initialAnimation) _B48->setTexture(MR::getTexFromArc("Footprint.bti", this)); switch (initialAnimation) { case 1: - mMario->changeAnimation("基本", (const char *)nullptr); + mMario->changeAnimation("基本", (const char*)nullptr); break; case 2: mMario->changeAnimationNonStop("ウォークイン"); break; default: - mMario->changeAnimation("ステージインA", (const char *)nullptr); + mMario->changeAnimation("ステージインA", (const char*)nullptr); break; } updateTransForCamera(); @@ -364,7 +361,7 @@ void MarioActor::init2(const TVec3f &a, const TVec3f &b, s32 initialAnimation) _4C4 = -_4B8; _482 = true; appear(); - _482 = false; // do we change this to control appearances? + _482 = false; // do we change this to control appearances? _1C6 = 0; _1C8 = 0.0f; _1CC = 0.0f; @@ -381,16 +378,15 @@ void MarioActor::init2(const TVec3f &a, const TVec3f &b, s32 initialAnimation) _F40 = 0; _F42 = 1; for (int i = 0; i < 0x1E; i++) { - JAIAudible &rAudible = _F3C[i]; + JAIAudible& rAudible = _F3C[i]; rAudible._0 = 1.0f; rAudible._4 = 0.0f; rAudible._8 = 0.0f; } - _8C = 0; // is this to indicate that we are in the process of initialization? + _8C = 0; // is this to indicate that we are in the process of initialization? } -void MarioActor::initAfterPlacement() -{ +void MarioActor::initAfterPlacement() { updateGravityVec(true, true); mMario->mAirGravityVec = _240; mMario->mHeadVec = -_240; @@ -412,80 +408,69 @@ void MarioActor::initAfterOpeningDemo() { _37C = 0; } -void MarioActor::calcBaseFrontVec(const TVec3f &rVec) -{ +void MarioActor::calcBaseFrontVec(const TVec3f& rVec) { TVec3f cross, j(0.0f, 1.0f, 0.0f); - f32 y = j.dot(rVec); + f32 y = j.dot(rVec); if (y < -0.99f) { _258.set(0.0f, 0.0f, 1.0f); - } - else { + } else { f32 cosine; if (MR::makeAxisAndCosignVecToVec(&cross, &cosine, rVec, j)) { TVec3f k(0.0f, 0.0f, 1.0f); - Mtx transformation; + Mtx transformation; PSMTXRotAxisRad(transformation, &cross, -JMAAcosRadian(cosine)); PSMTXMultVecSR(transformation, &k, &_258); MR::normalize(&_258); - } - else { + } else { _258.set(0.0f, 0.0f, 1.0f); } } } -void MarioActor::playSound(const char *pName, s32 duration) { +void MarioActor::playSound(const char* pName, s32 duration) { mMario->playSound(pName, duration); } -void MarioActor::changeAnimation(const char *pName, const char *pNewName) -{ +void MarioActor::changeAnimation(const char* pName, const char* pNewName) { mMario->changeAnimation(pName, pNewName); } -void MarioActor::changeAnimationNonStop(const char *pName) -{ +void MarioActor::changeAnimationNonStop(const char* pName) { mMario->changeAnimationNonStop(pName); } -void MarioActor::changeAnimationUpper(const char *pName) -{ +void MarioActor::changeAnimationUpper(const char* pName) { if (!mMario->_71C) { if (isAnimationRun("基本")) { mMario->changeAnimationUpper(pName, nullptr); return; } } - mMario->changeAnimation(pName, (const char *)nullptr); + mMario->changeAnimation(pName, (const char*)nullptr); } -void MarioActor::stopAnimation(const char *pName) -{ - mMario->stopAnimation(pName, (const char *)nullptr); +void MarioActor::stopAnimation(const char* pName) { + mMario->stopAnimation(pName, (const char*)nullptr); } -bool MarioActor::isAnimationRun(const char *pName) const -{ +bool MarioActor::isAnimationRun(const char* pName) const { return mMario->isAnimationRun(pName); } -void MarioActor::changeNullAnimation(const char *pName, s8 num) -{ +void MarioActor::changeNullAnimation(const char* pName, s8 num) { mNullAnimation->appear(); MR::startBck(mNullAnimation, pName, nullptr); _B92 = num; } -bool MarioActor::isStopNullAnimation() const -{ +bool MarioActor::isStopNullAnimation() const { if (!MR::isBckStopped(mNullAnimation)) { return MR::isDead(mNullAnimation); } return true; } -void MarioActor::changeGameOverAnimation() -{ +void MarioActor::changeGameOverAnimation() { int animation = 0; if (mMario->isStatusActive(0x12)) { mMario->closeStatus(nullptr); @@ -585,8 +570,7 @@ void MarioActor::changeGameOverAnimation() case 5: if (mMario->getMovementStates()._1) { mMario->changeAnimationNonStop("座りダウン"); - } - else { + } else { mMario->changeAnimationNonStop("奈落ダウン"); } break; @@ -611,14 +595,12 @@ void MarioActor::changeGameOverAnimation() _A6E = false; } -XjointTransform *MarioActor::getJointCtrl(const char *pName) const -{ - XanimeCore *pCore = mMarioAnim->mXanimePlayer->mCore; +XjointTransform* MarioActor::getJointCtrl(const char* pName) const { + XanimeCore* pCore = mMarioAnim->mXanimePlayer->mCore; return pCore->getJointTransform(MR::getJointIndex(this, pName)); } -bool MarioActor::isTurning() const -{ +bool MarioActor::isTurning() const { return getMovementStates().turning; } @@ -649,8 +631,7 @@ bool MarioActor::isJumpRising() const { bool MarioActor::isItemSwinging() const { if (mMario->isAnimationRun("テニスショット左") || mMario->isAnimationRun("テニスショット右") || mMario->isAnimationRun("テニスショット中")) { return true; - } - else { + } else { return false; } } @@ -687,13 +668,11 @@ bool MarioActor::isSleeping() const { return ret; } -bool MarioActor::isDebugMode() const -{ +bool MarioActor::isDebugMode() const { return getMovementStates().debugMode; } -void MarioActor::updateRotationInfo() -{ +void MarioActor::updateRotationInfo() { TRot3f stack_44; PSMTXConcat(getBaseMtx(), _E3C.toMtxPtr(), stack_44.toMtxPtr()); MR::makeRTFromMtxPtr(nullptr, &mRotation, stack_44.toMtxPtr(), true); @@ -709,8 +688,7 @@ void MarioActor::updateRotationInfo() _324.mult(57.2957763672f); if (MR::isSameDirection(_240, mMario->mFrontVec, .01f)) { _A18 = mRotation; - } - else { + } else { TPos3f stack_14; TVec3f stack_8 = -_240; MR::makeMtxUpFront(&stack_14, stack_8, mMario->mFrontVec); @@ -724,8 +702,7 @@ void MarioActor::updateRotationInfo() } } -void MarioActor::exeWait() -{ +void MarioActor::exeWait() { if (_FB8 != 0) { _FB8--; if (_FB8 == 0) { @@ -735,8 +712,7 @@ void MarioActor::exeWait() } } -void MarioActor::movement() -{ +void MarioActor::movement() { _468.y = 0; _378++; _1E1 = 0; @@ -789,18 +765,16 @@ void MarioActor::movement() mMario->mJumpVec += (-getGravityVec()).scaleInline(scale); } } - } - else if (getMovementStates()._23) { + } else if (getMovementStates()._23) { TVec3f stack_104(mMario->_8F8); MR::normalizeOrZero(&stack_104); TVec3f stack_F8; - f32 elementA = MR::vecKillElement(stack_134, stack_104, &stack_F8); - f32 elementB = MR::vecKillElement(mVelocity, stack_104, &stack_F8); + f32 elementA = MR::vecKillElement(stack_134, stack_104, &stack_F8); + f32 elementB = MR::vecKillElement(mVelocity, stack_104, &stack_F8); if (PSVECMag(&mVelocity) > 20.0f && elementA < elementB * 0.5f) { if (mMario->isAnimationRun("坂すべり下向きあおむけ")) { mMario->push(mMario->mFrontVec.scaleInline(5.0f)); - } - else if (mMario->isAnimationRun("坂すべり上向きうつぶせ")) { + } else if (mMario->isAnimationRun("坂すべり上向きうつぶせ")) { mMario->push(mMario->mFrontVec.scaleInline(-5.0f)); } mMario->mDrawStates._2 = true; @@ -808,9 +782,9 @@ void MarioActor::movement() } if (getMovementStates().jumping && !mAlphaEnable) { if (stack_128.dot(getGravityVec()) < -40.0f) { - TVec3f stack_EC(mPosition - getGravityVec().scaleInline(100.0f)); - TVec3f stack_E0; - Triangle *pTmp = mMario->getTmpPolygon(); + TVec3f stack_EC(mPosition - getGravityVec().scaleInline(100.0f)); + TVec3f stack_E0; + Triangle* pTmp = mMario->getTmpPolygon(); if (MR::getFirstPolyOnLineToMap(&stack_E0, pTmp, stack_EC, getGravityVec().scaleInline(200.f))) { TVec3f stack_D4; @@ -822,14 +796,12 @@ void MarioActor::movement() mMario->updateGroundInfo(); } } - } - else if (stack_128.dot(getGravityVec()) > 40.0f) { + } else if (stack_128.dot(getGravityVec()) > 40.0f) { if (mMario->_4C8->isValid()) { if (MR::isSensorPressObj(mMario->_4C8->mSensor)) { mMario->mDrawStates._1E = true; } - } - else { + } else { const u32 stop = mBinder->mPlaneNum; for (int i = 0; i < stop; i++) { if (MR::isSensorPressObj(mBinder->getPlane(i)->mSensor)) { @@ -838,8 +810,8 @@ void MarioActor::movement() } } if ((mMario->mShadowPos - mPosition).dot(getGravityVec()) < 0.0f) { - bool eject = true; - CollisionParts *parts = mMario->_45C->mParts; + bool eject = true; + CollisionParts* parts = mMario->_45C->mParts; if (parts && !mMario->_45C->mParts->_D4) { TVec3f stack_C8, stack_BC, stack_B0; PSMTXMultVec(parts->mInvBaseMatrix.toMtxPtr(), &mMario->mShadowPos, &stack_C8); @@ -863,30 +835,25 @@ void MarioActor::movement() } } } - } - else if (mMario->getMovementStates()._1) { + } else if (mMario->getMovementStates()._1) { const u32 stop = mBinder->mPlaneNum; - bool eject = false; + bool eject = false; for (u32 i = 0; i < stop; i++) { - const Triangle *plane = mBinder->getPlane(i); + const Triangle* plane = mBinder->getPlane(i); if (!MR::isSensorPressObj(plane->mSensor)) { continue; } if (mMario->_368.dot(*plane->getNormal(0)) > 0.0f) { if (mMario->_72C < 200.0f) { eject = true; - } - else if (plane->getNormal(0)->dot(stack_134) < 0.0f) { + } else if (plane->getNormal(0)->dot(stack_134) < 0.0f) { eject = true; - } - else { + } else { eject = false; } - } - else if (plane->getNormal(0)->dot(stack_134) < 0.0f) { + } else if (plane->getNormal(0)->dot(stack_134) < 0.0f) { eject = true; - } - else if (mMario->_5FC) { + } else if (mMario->_5FC) { if (!MR::isWallCodeNoAction(plane) && !mMario->isOnimasuBinderPressSkip()) { _3B4 = mMario->_368; mMario->_10._1D = false; @@ -899,7 +866,7 @@ void MarioActor::movement() } if (eject) { TVec3f stack_98; - f32 element = MR::vecKillElement(stack_134, mMario->_368, &stack_98); + f32 element = MR::vecKillElement(stack_134, mMario->_368, &stack_98); mPosition -= mMario->_368.scaleInline(element); } } @@ -917,10 +884,9 @@ void MarioActor::movement() _F40 = (u16)(_F40 + 1) % _F42; } -void MarioActor::control() -{ +void MarioActor::control() { if (mSuperKinokoCollected) { - if (MR::tryStartDemoWithoutCinemaFrame(this, "マリオスーパー化")) { // 6-up camera + if (MR::tryStartDemoWithoutCinemaFrame(this, "マリオスーパー化")) { // 6-up camera mSuperKinokoCollected = false; changeMaxLife(6); MR::stopAnimFrame(this); @@ -929,8 +895,7 @@ void MarioActor::control() MR::startSystemSE("SE_SY_SUPER_KINOKO_GET", -1, -1); _3DA = 0x5a; } - } - else if (mPowerupCollected) { + } else if (mPowerupCollected) { if (MR::tryStartDemoWithoutCinemaFrame(this, "マリオ変身")) { mPowerupCollected = false; mTransforming = true; @@ -948,8 +913,7 @@ void MarioActor::control() _294 = mPosition; } -void MarioActor::control2() -{ +void MarioActor::control2() { if ((_3D8 && mPlayerMode) || _3DA) { mMario->_350.zero(); mMario->_35C.zero(); @@ -963,8 +927,7 @@ void MarioActor::control2() mMario->checkEnforceMove(); mPosition = mMario->mPosition; } - } - else { + } else { if (_BC4) { _BC4--; } @@ -973,16 +936,14 @@ void MarioActor::control2() if (!_EA4) { if (!_F44) { MR::offBind(this); - } - else { + } else { MR::onBind(this); } } _978 = mVelocity; if (getDrawStates()._B) { mBinder->_1EC._1 = false; - } - else { + } else { mBinder->_1EC._1 = true; } if (mMario->isDamaging()) { @@ -991,8 +952,7 @@ void MarioActor::control2() } } -void MarioActor::controlMain() -{ +void MarioActor::controlMain() { if (_3C0) { _7DC = 0; _930 = 0; @@ -1008,8 +968,7 @@ void MarioActor::controlMain() _7DC = 0; _930 = 0; careMovingObject(); - } - else { + } else { mVelocity.zero(); updateBehavior(); updateRotationInfo(); @@ -1022,8 +981,7 @@ void MarioActor::controlMain() } } -void MarioActor::updateBehavior() -{ +void MarioActor::updateBehavior() { updateLife(); updatePlayerMode(); _37C++; @@ -1042,7 +1000,7 @@ void MarioActor::updateBehavior() updateEffect(); if (_B94 && !--_B94) { mMario->stopAnimationUpper("ハンマー投げ回転中", nullptr); - mMario->stopAnimation("ハンマー投げ回転中", (const char *)nullptr); + mMario->stopAnimation("ハンマー投げ回転中", (const char*)nullptr); } updatePunching(); if (!doPressing() && !doStun() && !doRush()) { @@ -1070,27 +1028,23 @@ void MarioActor::updateBehavior() } } -void MarioActor::updateBindRatio() -{ +void MarioActor::updateBindRatio() { if (!_934 && !MR::isNearZero(_978 - _264, 0.001f)) { - f32 mag = PSVECMag(&_978); + f32 mag = PSVECMag(&_978); TVec3f stack_38(_978); stack_38 -= _264; if (mag / PSVECMag(&stack_38) < 2.0f) { _984 += 0.1f; - } - else { + } else { _984 -= 0.01f; } - } - else if (!MR::isNearZero(_978, 0.001f)) { + } else if (!MR::isNearZero(_978, 0.001f)) { _984 -= 0.01f; } _984 = MR::clamp(_984, 0.0f, 1.0f); } -bool MarioActor::isInPunchTimerRange() const -{ +bool MarioActor::isInPunchTimerRange() const { bool ret = false; if (_3E6) { ret = MR::isInRange(_945, 6.0f, 20.0f); @@ -1098,8 +1052,7 @@ bool MarioActor::isInPunchTimerRange() const return ret; } -void MarioActor::updatePunching() -{ +void MarioActor::updatePunching() { if (_944) { bool canSpinring = true; _944--; @@ -1115,19 +1068,18 @@ void MarioActor::updatePunching() canPunch = true; } if (canPunch) { - const Mario::MovementStates &moveStates = getMovementStates(); + const Mario::MovementStates& moveStates = getMovementStates(); if (moveStates._8 || moveStates._1A || moveStates._19) { mMario->tryWallPunch(); } } } if (mMario->isAnimationRun("ハンマー投げリリース") && mMario->getMovementStates()._1 && !_38C && !mMario->_420 && mMario->Mario::isStickOn()) { - mMario->stopAnimation(nullptr, (const char *)nullptr); + mMario->stopAnimation(nullptr, (const char*)nullptr); } } -bool MarioActor::doRush() -{ +bool MarioActor::doRush() { if (_934) { tryCoinPull(); tryRushInRush(); @@ -1149,16 +1101,14 @@ bool MarioActor::doRush() if (!MR::getWaterAreaObj(&stack_44, mPosition)) { mMario->forceExitSwim(); } - } - else if (!selectWaterInOut(_924->mHost->mName)) { + } else if (!selectWaterInOut(_924->mHost->mName)) { s32 initial = mMario->mSwim->_144; mMario->mSwim->checkWaterCube(false); if ((int)mMario->mSwim->_144 != initial) { if (mMario->mSwim->_144 <= 1 && (u32)initial - 2 <= 1) { playEffectRT("水面ジャンプ水柱", mMario->mSwim->_160, mMario->mSwim->_16C); emitEffectWaterColumn(mMario->mSwim->_160, mMario->mSwim->_16C); - } - else if ((u32)initial <= 1 && mMario->mSwim->_144 - 2 <= 1) { + } else if ((u32)initial <= 1 && mMario->mSwim->_144 - 2 <= 1) { playEffectRT("水面ジャンプ水柱", -mMario->_328, mMario->mSwim->_16C); emitEffectWaterColumn(mMario->mSwim->_160, mMario->mSwim->_16C); } @@ -1166,8 +1116,7 @@ bool MarioActor::doRush() mWaterLife = 8; MR::getGameSceneLayoutHolder()->changeLifeMeterModeGround(); mMario->forceExitSwim(); - } - else if (initial == 0) { + } else if (initial == 0) { MR::getGameSceneLayoutHolder()->changeLifeMeterModeWater(); } } @@ -1188,19 +1137,16 @@ bool MarioActor::doRush() } updateSwingTimer(); return true; - } - else { + } else { _7E2 = false; return false; } } -void MarioActor::updateSwingTimer() -{ +void MarioActor::updateSwingTimer() { if (_934) { stopSpinTicoEffect(false); - } - else { + } else { if (_948) { _948--; } @@ -1229,8 +1175,7 @@ void MarioActor::updateSwingTimer() } } -void MarioActor::updateSwingAction() -{ +void MarioActor::updateSwingAction() { if (isJumping() && mPlayerMode != 6 && !mMario->isStatusActive(0x18)) { _946 = 0; } @@ -1249,8 +1194,7 @@ void MarioActor::updateSwingAction() if (!isPunching()) { if (_948) { _948 += 0x96; - } - else { + } else { _948 += 0x12c; } } @@ -1315,15 +1259,13 @@ void MarioActor::updateSwingAction() if (requestSpinJump2P) { MR::start2PJumpAssistSound(); } - } - else if (!getMovementStates()._F && !mMario->isAnimationRun("地上ひねり")) { - const char *pLastAnimationName = mMarioAnim->mXanimePlayerUpper->getCurrentAnimationName(); + } else if (!getMovementStates()._F && !mMario->isAnimationRun("地上ひねり")) { + const char* pLastAnimationName = mMarioAnim->mXanimePlayerUpper->getCurrentAnimationName(); if (mPlayerMode == 4) { if (!mMario->isAnimationRun("ハチスピン")) { didSpinPunch = trySpinPunch(); } - } - else { + } else { didSpinPunch = trySpinPunch(); } _974 = 0; @@ -1337,13 +1279,11 @@ void MarioActor::updateSwingAction() mMario->playSound("声スピン", -1); mMario->playSound("スピンジャンプ", -1); } - mMario->changeAnimation("ハチスピン空中", (const char *)nullptr); - } - else if (getMovementStates()._A || mAlphaEnable) { - mMario->changeAnimation("サマーソルト", (const char *)nullptr); - } - else { - mMario->changeAnimation("ハチスピン", (const char *)nullptr); + mMario->changeAnimation("ハチスピン空中", (const char*)nullptr); + } else if (getMovementStates()._A || mAlphaEnable) { + mMario->changeAnimation("サマーソルト", (const char*)nullptr); + } else { + mMario->changeAnimation("ハチスピン", (const char*)nullptr); } } if (didSpinPunch) { @@ -1366,7 +1306,7 @@ void MarioActor::updateSwingAction() break; } mMario->startTeresaDisappear(); - const MarioConstTable *pConstants = mConst->getTable(); + const MarioConstTable* pConstants = mConst->getTable(); _946 = pConstants->mTeresaWallThroughTime + pConstants->mSpinIntervalTime; break; case 5: @@ -1374,14 +1314,12 @@ void MarioActor::updateSwingAction() break; } if (isJumping()) { - mMario->changeAnimation("ハチスピン空中", (const char *)nullptr); - } - else { + mMario->changeAnimation("ハチスピン空中", (const char*)nullptr); + } else { if (getMovementStates()._A || mAlphaEnable) { - mMario->changeAnimation("サマーソルト", (const char *)nullptr); // Summersault - } - else { - mMario->changeAnimation("ハチスピン", (const char *)nullptr); + mMario->changeAnimation("サマーソルト", (const char*)nullptr); // Summersault + } else { + mMario->changeAnimation("ハチスピン", (const char*)nullptr); } } _946 = mConst->getTable()->mSpinIntervalTime + 0x22; @@ -1394,14 +1332,12 @@ bool MarioActor::checkClapCatchStart() { _6D0 = 0; tryCoinPullInRush(); return true; - } - else { + } else { return false; } } -void MarioActor::updateRealMtx() -{ +void MarioActor::updateRealMtx() { updateBaseScaleMtx(); getRealMtx(_C2C.toMtxPtr(), "HandL"); getRealMtx(_C5C.toMtxPtr(), "HandR"); @@ -1447,8 +1383,7 @@ void MarioActor::setUpperRotateY(f32 angle) { mMarioAnim->setUpperRotateY(angle); } -void MarioActor::decLife(u16 amt) -{ +void MarioActor::decLife(u16 amt) { if (getMovementStates()._1F) { return; } @@ -1482,28 +1417,23 @@ void MarioActor::decLife(u16 amt) mMaxHealth = 3; } -void MarioActor::decLifeLarge() -{ +void MarioActor::decLifeLarge() { decLife(0); } -void MarioActor::decLifeMiddle() -{ +void MarioActor::decLifeMiddle() { decLife(0); } -void MarioActor::decLifeSmall() -{ +void MarioActor::decLifeSmall() { decLife(0); } -void MarioActor::resetWaterLife() -{ +void MarioActor::resetWaterLife() { mWaterLife = 8; } -void MarioActor::updateLife() -{ +void MarioActor::updateLife() { if (!_388) { return; } @@ -1516,10 +1446,9 @@ void MarioActor::updateLife() mHealth--; } -static const char *sMiddleWaterLifeReduction = "水中ライフ減少"; +static const char* sMiddleWaterLifeReduction = "水中ライフ減少"; -void MarioActor::incLife(u32 amt) -{ +void MarioActor::incLife(u32 amt) { if (isEnableNerveChange() && !_3E4) { const u32 health = getHealth(); if (mHealth != mMaxHealth) { @@ -1539,24 +1468,20 @@ void MarioActor::incLife(u32 amt) } } -void MarioActor::changeMaxLife(s32 max) -{ +void MarioActor::changeMaxLife(s32 max) { mMaxHealth = max; while (mHealth != max) { if (mHealth > max) { decLife(0); - } - else if (mHealth < max) { + } else if (mHealth < max) { incLife(1); - } - else { + } else { break; } } } -bool MarioActor::doPressing() -{ +bool MarioActor::doPressing() { if (!_390) { return false; } @@ -1567,7 +1492,7 @@ bool MarioActor::doPressing() setNerve(&NrvMarioActor::MarioActorNrvGameOver::sInstance); } if (!_390) { - mMario->changeAnimation("つぶれ解除", (const char *)nullptr); + mMario->changeAnimation("つぶれ解除", (const char*)nullptr); _F44 = true; } } @@ -1578,7 +1503,7 @@ bool MarioActor::doPressing() setNerve(&NrvMarioActor::MarioActorNrvGameOver::sInstance); } if (!_390) { - mMario->changeAnimation("つぶれ解除", (const char *)nullptr); + mMario->changeAnimation("つぶれ解除", (const char*)nullptr); _F44 = true; } break; @@ -1601,8 +1526,7 @@ bool MarioActor::doPressing() return true; } -void MarioActor::careMovingObject() -{ +void MarioActor::careMovingObject() { if (_1E0) { return; } @@ -1622,8 +1546,7 @@ void MarioActor::careMovingObject() mMario->updateFloorCode(); } -bool MarioActor::doStun() -{ +bool MarioActor::doStun() { if (_38C) { mMario->mDrawStates._1A = true; resetSensorCount(); @@ -1641,17 +1564,15 @@ bool MarioActor::doStun() } mMario->inputStick(); return true; - } - else { + } else { return false; } } -void MarioActor::scaleMtx(MtxPtr rawMtx) -{ - TVec3f i, j, k; - const TRot3f *pMtx = (TRot3f *)rawMtx; - f32 scalar = 0.35f * (1.0f - _3B0) + 1.0f; +void MarioActor::scaleMtx(MtxPtr rawMtx) { + TVec3f i, j, k; + const TRot3f* pMtx = (TRot3f*)rawMtx; + f32 scalar = 0.35f * (1.0f - _3B0) + 1.0f; pMtx->getXDir(i); pMtx->getYDir(j); pMtx->getZDir(k); @@ -1678,17 +1599,15 @@ void MarioActor::scaleMtx(MtxPtr rawMtx) rawMtx[2][2] = k.z; } -void MarioActor::updateBaseScaleMtx() -{ +void MarioActor::updateBaseScaleMtx() { if (mMario->mMovementStates._3C) { PSMTXScale(_BF8.toMtxPtr(), mScale.x, mScale.y, mScale.z); - } - else { + } else { PSMTXIdentity(_BF8.toMtxPtr()); } } -void MarioActor::getRealMtx(MtxPtr mtx, const char *pName) const { +void MarioActor::getRealMtx(MtxPtr mtx, const char* pName) const { PSMTXConcat(MR::getJointMtx(this, pName), _BF8, mtx); TVec3f stack_8(mMario->_13C); MR::addTransMtx(mtx, stack_8); @@ -1714,14 +1633,13 @@ void MarioActor::forceSetBaseMtx(MtxPtr mtx) { void MarioActor::setBlendMtxTimer(u16 a1) { if (a1 == 0) { _EA0 = 1.0f; - } - else { + } else { _EA0 = 0.0f; } mBlendMtxTimer = a1; } -void MarioActor::getGroundPos(TVec3f *dst) const { +void MarioActor::getGroundPos(TVec3f* dst) const { *dst = mMario->mGroundPos; } diff --git a/src/Game/Player/MarioActorBlackHole.cpp b/src/Game/Player/MarioActorBlackHole.cpp index 58b96a5d5..6637eb288 100644 --- a/src/Game/Player/MarioActorBlackHole.cpp +++ b/src/Game/Player/MarioActorBlackHole.cpp @@ -4,27 +4,27 @@ void MarioActor::initBlackHoleOut() { mPosRelativeToBlackHole = mPosition - mBlackHolePosition; - + TVec3f normalisedRelativePos(mPosRelativeToBlackHole); TVec3f normalisedRelativeCameraPos = mCamPos - mBlackHolePosition; - + MR::normalizeOrZero(&normalisedRelativeCameraPos); MR::normalizeOrZero(&normalisedRelativePos); - - Mtx rotation; + + Mtx rotation; TVec3f rotateAxis; - + PSVECCrossProduct(&normalisedRelativeCameraPos, &normalisedRelativePos, &rotateAxis); - - f32 mag = PSVECMag(&mPosRelativeToBlackHole); + + f32 mag = PSVECMag(&mPosRelativeToBlackHole); TVec3f killed; - f32 flt = MR::vecKillElement(mCamPos - mPosition, mCamDirZ, &killed); + f32 flt = MR::vecKillElement(mCamPos - mPosition, mCamDirZ, &killed); flt *= mConst->getTable()->mBlackHoleFirstRadius; - + PSMTXRotAxisRad(rotation, &rotateAxis, atan(flt / mag)); PSMTXMultVec(rotation, &mPosRelativeToBlackHole, &mBlackHoleRotateAxis); MR::normalizeOrZero(&mBlackHoleRotateAxis); - + damageDropThrowMemoSensor(); MR::removeAllClingingKarikari(); } @@ -33,85 +33,84 @@ void MarioActor::exeGameOverBlackHole2() { if (MR::isFirstStep(this)) { MR::setCubeBgmChangeInvalid(); MR::clearBgmQueue(); - + if (!(mBlackHole->tryStartDemoCamera()) && !(mMario->mMovementStates_HIGH_WORD >> 8 & 0x1)) { MR::startBlackHoleCamera("ブラックホール", mBlackHolePosition, mPosition); } - + _F44 = false; - + changeAnimationNonStop("ブラックホール落下"); playEffect("共通ブラックホール"); playSound("ブラックホール吸い込まれ", -1); playEffect(changeMorphString("DieBlackHole")); initBlackHoleOut(); - + mMario->mMovementStates_HIGH_WORD |= 0x8; - + MR::startStarPointerModeDemoMarioDeath(this); MR::deactivateDefaultGameLayout(); } - + if (getNerveStep() == 60) { - + if (!MR::getPlayerLeft()) { MR::startPlayerEvent("ゲームオーバー"); - } - else { + } else { MR::startPlayerEvent("マリオ奈落"); } } - + if (getNerveStep() == mConst->getTable()->mBlackHoleHideTime) { _482 = true; - + MR::hidePlayer(); MR::emitEffect(this, "ブラックホール消滅"); } - + f32 nervestepfloat = getNerveStep(); f32 flt = 1.0f; - + if (nervestepfloat < 180.0f) { - flt = MR::sqrt(nervestepfloat/180.0f); + flt = MR::sqrt(nervestepfloat / 180.0f); } - + f32 angle = mConst->getTable()->mBlackHoleRotateSpeed; angle = nervestepfloat * angle; angle = flt * angle; - + if (angle > mConst->getTable()->mBlackHoleRotateLimit) { angle = mConst->getTable()->mBlackHoleRotateLimit; } - + Mtx rotationMatrix; - PSMTXRotAxisRad(rotationMatrix,&mBlackHoleRotateAxis, angle); + PSMTXRotAxisRad(rotationMatrix, &mBlackHoleRotateAxis, angle); PSMTXMultVec(rotationMatrix, &mPosRelativeToBlackHole, &mPosRelativeToBlackHole); - + TVec3f camDirZNegate; JMathInlineVEC::PSVECNegate(&mCamDirZ, &camDirZNegate); MR::vecBlendSphere(mBlackHoleRotateAxis, camDirZNegate, &mBlackHoleRotateAxis, 0.01f); - + f32 distChangeFactor = 180 - getNerveStep(); - + if (distChangeFactor < 0.0f) { distChangeFactor = 0.0f; } - - f32 newDistToBlackHole = PSVECMag(&mPosRelativeToBlackHole) * distChangeFactor/(1+distChangeFactor); - + + f32 newDistToBlackHole = PSVECMag(&mPosRelativeToBlackHole) * distChangeFactor / (1 + distChangeFactor); + mPosRelativeToBlackHole.setLength(newDistToBlackHole); - + f32 scale = getNerveStep() * mConst->getTable()->mBlackHoleScaleSpeed; - scale = 1-scale; - + scale = 1 - scale; + if (scale < mConst->getTable()->mBlackHoleScaleLimit) { scale = mConst->getTable()->mBlackHoleScaleLimit; } - + mScale.set(scale); - + mPosition = mBlackHolePosition + mPosRelativeToBlackHole; - + mVelocity.zero(); } diff --git a/src/Game/Player/MarioActorClap.cpp b/src/Game/Player/MarioActorClap.cpp index 7071c7a1c..c492ae778 100644 --- a/src/Game/Player/MarioActorClap.cpp +++ b/src/Game/Player/MarioActorClap.cpp @@ -5,11 +5,11 @@ void MarioActor::bodyClap() { u32 i = 0; for (u32 i = 0; i < _7DC; i++) { - TVec3f stack_14(_6DC[i]->mPosition); - TVec3f stack_8(stack_14); - JMathInlineVEC::PSVECSubtract2(&stack_8, &_2A0, &stack_8); - if (PSVECMag(&stack_8) < 100.0f) { - _6DC[i]->receiveMessage(0x87, getSensor("body")); - } + TVec3f stack_14(_6DC[i]->mPosition); + TVec3f stack_8(stack_14); + JMathInlineVEC::PSVECSubtract2(&stack_8, &_2A0, &stack_8); + if (PSVECMag(&stack_8) < 100.0f) { + _6DC[i]->receiveMessage(0x87, getSensor("body")); + } } } diff --git a/src/Game/Player/MarioActorDraw.cpp b/src/Game/Player/MarioActorDraw.cpp index 0d4a4d379..edadbdd7c 100644 --- a/src/Game/Player/MarioActorDraw.cpp +++ b/src/Game/Player/MarioActorDraw.cpp @@ -4,8 +4,7 @@ #include "Game/Player/ModelHolder.hpp" #include "Game/Player/TornadoMario.hpp" -void MarioActor::drawMarioModel() const -{ +void MarioActor::drawMarioModel() const { if (isAllHidden()) { return; } @@ -35,7 +34,7 @@ void MarioActor::drawMarioModel() const drawSphereMask(); bool res = drawDarkMask(); - J3DModelX *model = mModels[mCurrModel]; + J3DModelX* model = mModels[mCurrModel]; if (res) { model->mFlags._10 = true; @@ -54,12 +53,10 @@ void MarioActor::drawMarioModel() const MR::showJoint(model, "HandR0"); MR::showJoint(model, "HandL0"); MR::showJoint(model, "Face0"); - } - else { + } else { if (mCurrModel == 4) { model->setDynamicDL(nullptr, 0); - } - else { + } else { model->setDynamicDL(mDL[mCurrDL], mDLSize); } } @@ -82,7 +79,7 @@ void MarioActor::drawMarioModel() const drawHand(); if (!MR::isHiddenModel(_A5C)) { - J3DModelX *cool = (J3DModelX *)MR::getJ3DModel(_A5C); + J3DModelX* cool = (J3DModelX*)MR::getJ3DModel(_A5C); cool->setDynamicDL(mDL[mCurrDL], mDLSize); cool->directDraw(nullptr); } diff --git a/src/Game/Player/MarioActorInit.cpp b/src/Game/Player/MarioActorInit.cpp index 6d9bba434..d24fa6e47 100644 --- a/src/Game/Player/MarioActorInit.cpp +++ b/src/Game/Player/MarioActorInit.cpp @@ -1,7 +1,6 @@ #include "Game/Player/MarioActor.hpp" -void MarioActor::initMember() -{ +void MarioActor::initMember() { _8C = 0; mDLchanger = nullptr; for (int i = 0; i < 0x40; i++) { diff --git a/src/Game/Player/MarioAnimator.cpp b/src/Game/Player/MarioAnimator.cpp index 9b628efd8..2ca400207 100644 --- a/src/Game/Player/MarioAnimator.cpp +++ b/src/Game/Player/MarioAnimator.cpp @@ -5,14 +5,13 @@ #include "Game/Animation/XanimePlayer.hpp" #include "Game/Player/MarioAnimatorData.hpp" -MarioAnimator::MarioAnimator(MarioActor *actor) : MarioModule(actor) -{ +MarioAnimator::MarioAnimator(MarioActor* actor) + : MarioModule(actor) { init(); } -void MarioAnimator::init() -{ - XanimeSwapTable *luigiAnimations = nullptr; +void MarioAnimator::init() { + XanimeSwapTable* luigiAnimations = nullptr; if (gIsLuigi) { luigiAnimations = luigiAnimeSwapTable; } @@ -63,13 +62,11 @@ void MarioAnimator::init() PSMTXCopy(MR::tmpMtxRotYRad(3.14159274101f), _DC.toMtxPtr()); } -bool MarioAnimator::isAnimationStop() const -{ +bool MarioAnimator::isAnimationStop() const { return mXanimePlayer->mCurrentAnimation == mXanimePlayer->mDefaultAnimation; } -void MarioAnimator::change(const char *name) -{ +void MarioAnimator::change(const char* name) { if (mActor->_B90) { return; @@ -79,19 +76,17 @@ void MarioAnimator::change(const char *name) mXanimePlayer->changeAnimation(name); } - const char *bck = mXanimePlayer->getCurrentBckName(); + const char* bck = mXanimePlayer->getCurrentBckName(); if (bck) { - const XanimeGroupInfo *info = mXanimePlayer->mCurrentAnimation; + const XanimeGroupInfo* info = mXanimePlayer->mCurrentAnimation; if (info->_18 == 2) { f32 arg1 = info->_14, arg2 = info->_10; getPlayer()->startBas(bck, false, arg1, arg2); - } - else { + } else { getPlayer()->startBas(bck, false, 0.0f, 0.0f); } mActor->setBlink(bck); - } - else { + } else { getPlayer()->startBas(nullptr, false, 0.0f, 0.0f); mActor->setBlink(nullptr); } @@ -100,26 +95,22 @@ void MarioAnimator::change(const char *name) entryCallback(name); } -void MarioAnimator::changeUpper(const char *name) -{ +void MarioAnimator::changeUpper(const char* name) { mXanimePlayerUpper->changeAnimation(name); _6C = true; } -void MarioAnimator::changeDefault(const char *name) -{ +void MarioAnimator::changeDefault(const char* name) { getPlayer()->startBas(nullptr, false, 0.0f, 0.0f); mXanimePlayer->setDefaultAnimation(name); } -void MarioAnimator::changeDefaultUpper(const char *name) -{ +void MarioAnimator::changeDefaultUpper(const char* name) { if (name) { mUpperDefaultSet = true; mXanimePlayerUpper->setDefaultAnimation(name); - } - else { + } else { mUpperDefaultSet = false; } } diff --git a/src/Game/Player/MarioConst.cpp b/src/Game/Player/MarioConst.cpp index 7f64a20a8..2d3ceb5c1 100644 --- a/src/Game/Player/MarioConst.cpp +++ b/src/Game/Player/MarioConst.cpp @@ -493,8 +493,7 @@ static MarioConstTable gMarioConstDefault = { /* mLookMaxAngleVP */ 0.5f, /* mLookMaxAngleVM */ 0.1f, /* mLookShoulderMoveMax */ 8.0f, - /* mRushInBlendTimer */ 4 -}; + /* mRushInBlendTimer */ 4}; static MarioConstTable gMarioConstDefault2 = { /* mJumpHeight */ {22.0f, 26.0f, 34.71f, 24.0f, 32.0f, 15.0f, 32.0f, 22.0f, 1.0f}, @@ -989,8 +988,7 @@ static MarioConstTable gMarioConstDefault2 = { /* mLookMaxAngleVP */ 0.5f, /* mLookMaxAngleVM */ 0.1f, /* mLookShoulderMoveMax */ 8.0f, - /* mRushInBlendTimer */ 4 -}; + /* mRushInBlendTimer */ 4}; MarioConst::MarioConst() { mTable[0] = &gMarioConstDefault; diff --git a/src/Game/Player/MarioDamageStun.cpp b/src/Game/Player/MarioDamageStun.cpp index d61fc0ef4..965e23536 100644 --- a/src/Game/Player/MarioDamageStun.cpp +++ b/src/Game/Player/MarioDamageStun.cpp @@ -2,11 +2,12 @@ #include "Game/Player/Mario.hpp" #include "Game/Player/MarioActor.hpp" -MarioStun::MarioStun(MarioActor* pActor) : MarioState(pActor, 0xe), _12(0), _14(0) { +MarioStun::MarioStun(MarioActor* pActor) + : MarioState(pActor, 0xe), _12(0), _14(0) { } bool MarioStun::close() { - stopAnimation("しびれ", (char*) nullptr); // "hesitation" + stopAnimation("しびれ", (char*)nullptr); // "hesitation" return true; } @@ -30,8 +31,7 @@ bool MarioStun::update() { _12 = 1; if (!getPlayer()->mMovementStates._1) { _14 = 0xa; - } - else { + } else { _14 = 0x1e; } if (getPlayer()->mMovementStates._1) { diff --git a/src/Game/Player/MarioEffect.cpp b/src/Game/Player/MarioEffect.cpp index 5a5893090..1a224a7c0 100644 --- a/src/Game/Player/MarioEffect.cpp +++ b/src/Game/Player/MarioEffect.cpp @@ -1,8 +1,8 @@ #include "Game/Player/MarioEffect.hpp" -MarioEffect::MarioEffect(MarioActor *actor) : MarioModule(actor), _1C(0xFFFFFFFF), _20(0xFFFFFFFF) -{ - SomeData *i = _54; +MarioEffect::MarioEffect(MarioActor* actor) + : MarioModule(actor), _1C(0xFFFFFFFF), _20(0xFFFFFFFF) { + SomeData* i = _54; // SomeData *end = _54 + 0x100; do { PSMTXIdentity(i->_4.toMtxPtr()); diff --git a/src/Game/Player/MarioHolder.cpp b/src/Game/Player/MarioHolder.cpp index 94067dc3b..c07d7d0fd 100644 --- a/src/Game/Player/MarioHolder.cpp +++ b/src/Game/Player/MarioHolder.cpp @@ -1,26 +1,24 @@ #include "Game/Player/MarioHolder.hpp" #include "Game/Scene/SceneObjHolder.hpp" -MarioHolder::MarioHolder() : - NameObj("マリオ保持") -{ +MarioHolder::MarioHolder() + : NameObj("マリオ保持") { mActor = nullptr; } MarioHolder::~MarioHolder() { - } -void MarioHolder::setMarioActor(MarioActor *pActor) { +void MarioHolder::setMarioActor(MarioActor* pActor) { mActor = pActor; } -MarioActor *MarioHolder::getMarioActor() const { +MarioActor* MarioHolder::getMarioActor() const { return mActor; } namespace MR { - MarioHolder *getMarioHolder() { + MarioHolder* getMarioHolder() { return MR::getSceneObj(SceneObj_MarioHolder); } } // namespace MR diff --git a/src/Game/Player/MarioInit.cpp b/src/Game/Player/MarioInit.cpp index 32c706468..3804b8c0e 100644 --- a/src/Game/Player/MarioInit.cpp +++ b/src/Game/Player/MarioInit.cpp @@ -1,7 +1,6 @@ #include "Game/Player/Mario.hpp" -void Mario::initMember() -{ +void Mario::initMember() { _40.zero(); _4C.zero(); PSMTXIdentity(_F4.toMtxPtr()); diff --git a/src/Game/Player/MarioMessenger.cpp b/src/Game/Player/MarioMessenger.cpp index c040dcd2e..f1e8e4af7 100644 --- a/src/Game/Player/MarioMessenger.cpp +++ b/src/Game/Player/MarioMessenger.cpp @@ -4,10 +4,9 @@ #define ARRAY_SIZE 32 -MarioMessenger::MarioMessenger(HitSensor* pSender) : - NameObj("マリオメッセンジャー"), - mSender(pSender) -{ +MarioMessenger::MarioMessenger(HitSensor* pSender) + : NameObj("マリオメッセンジャー"), + mSender(pSender) { mReceiverArray = new HitSensor*[ARRAY_SIZE]; mMsgArray = new u32[ARRAY_SIZE]; mArraySize = 0; @@ -34,5 +33,4 @@ void MarioMessenger::addRequest(HitSensor* pReceiver, u32 msg) { } MarioMessenger::~MarioMessenger() { - } diff --git a/src/Game/Player/MarioModule.cpp b/src/Game/Player/MarioModule.cpp index 80ef27e24..3a8a783e5 100644 --- a/src/Game/Player/MarioModule.cpp +++ b/src/Game/Player/MarioModule.cpp @@ -36,7 +36,7 @@ bool MarioModule::isStatusActiveID(u32 id) const { return mActor->mMario->isStatusActive(id); } -bool MarioModule::isStatusActiveS(MarioState *pState) const { +bool MarioModule::isStatusActiveS(MarioState* pState) const { return mActor->mMario->isStatusActive(pState->mStatusId); } @@ -68,7 +68,7 @@ bool MarioModule::isPlayerModeFoo() const { return mActor->mPlayerMode == 7; } -void MarioModule::changeAnimation(const char *pAnim1, const char *pAnim2) { +void MarioModule::changeAnimation(const char* pAnim1, const char* pAnim2) { if (!mActor->_B90) { if (pAnim2) { mActor->mMarioAnim->changeDefault(pAnim2); @@ -79,22 +79,20 @@ void MarioModule::changeAnimation(const char *pAnim1, const char *pAnim2) { } } -void MarioModule::stopAnimation(const char *pAnim1, const char *pAnim2) { +void MarioModule::stopAnimation(const char* pAnim1, const char* pAnim2) { if (!mActor->_B90) { if (pAnim2) { mActor->mMarioAnim->changeDefault(pAnim2); } if (pAnim1) { mActor->mMarioAnim->mXanimePlayer->stopAnimation(pAnim1); - } - else { + } else { mActor->mMarioAnim->mXanimePlayer->stopAnimation(); } - } } -bool MarioModule::isDefaultAnimationRun(const char *pAnim) const { +bool MarioModule::isDefaultAnimationRun(const char* pAnim) const { return mActor->mMarioAnim->isDefaultAnimationRun(pAnim); } @@ -102,12 +100,11 @@ void MarioModule::changeAnimationInterpoleFrame(u32 a1) { return mActor->mMarioAnim->mXanimePlayer->changeInterpoleFrame(a1); } -bool MarioModule::isAnimationRun(const char *pAnimName) const { +bool MarioModule::isAnimationRun(const char* pAnimName) const { if (!pAnimName) { XanimePlayer* pXanimePlayer = mActor->mMarioAnim->mXanimePlayer; return pXanimePlayer->mCurrentAnimation != pXanimePlayer->mDefaultAnimation; - } - else { + } else { bool run = mActor->mMarioAnim->mXanimePlayer->isRun(pAnimName); if (mActor->mMarioAnim->_6C) { run |= mActor->mMarioAnim->mXanimePlayerUpper->isRun(pAnimName); @@ -116,34 +113,33 @@ bool MarioModule::isAnimationRun(const char *pAnimName) const { } } -bool MarioModule::isAnimationTerminate(const char *pAnim) const { +bool MarioModule::isAnimationTerminate(const char* pAnim) const { if (pAnim) { return mActor->mMarioAnim->mXanimePlayer->isTerminate(pAnim); } return mActor->mMarioAnim->mXanimePlayer->isTerminate(); } -bool MarioModule::isAnimationTerminateUpper(const char *pAnim) const { +bool MarioModule::isAnimationTerminateUpper(const char* pAnim) const { if (pAnim) { return mActor->mMarioAnim->mXanimePlayerUpper->isTerminate(pAnim); } return mActor->mMarioAnim->mXanimePlayerUpper->isTerminate(); } -const char* MarioModule::getAnimationStringPointer(const char *pAnim) const { +const char* MarioModule::getAnimationStringPointer(const char* pAnim) const { return mActor->mMarioAnim->mXanimePlayer->getNameStringPointer(pAnim); } const char* MarioModule::getCurrentBckName() const { if (mActor->mMarioAnim->mXanimePlayer->isAnimationRunSimple()) { return mActor->mMarioAnim->mXanimePlayer->getCurrentBckName(); - } - else { + } else { return mActor->mMarioAnim->mCurrBck; } } -void MarioModule::changeAnimationUpper(const char *pAnim1, const char *pAnim2) { +void MarioModule::changeAnimationUpper(const char* pAnim1, const char* pAnim2) { if (!mActor->_B90) { mActor->mMarioAnim->changeDefaultUpper(pAnim2); if (pAnim1) { @@ -152,7 +148,7 @@ void MarioModule::changeAnimationUpper(const char *pAnim1, const char *pAnim2) { } } -void MarioModule::changeAnimationUpperWeak(const char *pAnim1, const char *pAnim2) { +void MarioModule::changeAnimationUpperWeak(const char* pAnim1, const char* pAnim2) { if (!mActor->mMarioAnim->_6C && !mActor->_B90) { mActor->mMarioAnim->changeDefaultUpper(pAnim2); if (pAnim1) { @@ -161,7 +157,7 @@ void MarioModule::changeAnimationUpperWeak(const char *pAnim1, const char *pAnim } } -void MarioModule::stopAnimationUpper(const char *pAnim1, const char *pAnim2) { +void MarioModule::stopAnimationUpper(const char* pAnim1, const char* pAnim2) { if (!mActor->_B90) { mActor->mMarioAnim->changeDefaultUpper(pAnim2); mActor->mMarioAnim->stopUpper(pAnim1); @@ -177,15 +173,15 @@ f32 MarioModule::getAnimationFrame() const { } // regswap -void MarioModule::changeAnimation(const char *pAnim, u32 index) { +void MarioModule::changeAnimation(const char* pAnim, u32 index) { if (!mActor->_B90) { - changeAnimation(pAnim, (char*) nullptr); + changeAnimation(pAnim, (char*)nullptr); mActor->mMario->_A6C[index] = 1; } } // regswap again (see above) -bool MarioModule::isAnimationRun(const char *pAnim, u32 index) { +bool MarioModule::isAnimationRun(const char* pAnim, u32 index) { if (mActor->mMario->_A6C[index] == 0) { return false; } @@ -200,9 +196,9 @@ bool MarioModule::isAnimationRun(const char *pAnim, u32 index) { } // regwap again -void MarioModule::stopAnimation(const char *pAnim, u32 index) { +void MarioModule::stopAnimation(const char* pAnim, u32 index) { if (!mActor->_B90 && mActor->mMario->_A6C[index]) { - stopAnimation(pAnim, (char*) nullptr); + stopAnimation(pAnim, (char*)nullptr); mActor->mMario->_A6C[index] = 0; } } @@ -211,8 +207,7 @@ void MarioModule::setJointGlobalMtx(u16 a1, MtxPtr mtx) { XjointTransform* pTransform = mActor->mMarioAnim->mXanimePlayer->mCore->mTransformList; if (pTransform == 0) { pTransform = 0; - } - else { + } else { pTransform += a1; } pTransform->_64 = mtx; @@ -235,7 +230,7 @@ TVec3f& MarioModule::getWorldPadDir() const { } // regswap -bool MarioModule::calcWorldPadDir(TVec3f *pDest, f32 a2, f32 a3, bool a4) { +bool MarioModule::calcWorldPadDir(TVec3f* pDest, f32 a2, f32 a3, bool a4) { pDest->zero(); if (MR::isNearZero(a2, 0.001f) && MR::isNearZero(a3, 0.001f)) { return false; @@ -244,22 +239,17 @@ bool MarioModule::calcWorldPadDir(TVec3f *pDest, f32 a2, f32 a3, bool a4) { if (__fabsf(a3) > mActor->mConst->getTable()->mStickMarginYstart) { if (__fabsf(a2) < mActor->mConst->getTable()->mStickMarginX) { a2 = 0.0f; - } - else if (a2 > 0.0f) { + } else if (a2 > 0.0f) { a2 = (a2 - mActor->mConst->getTable()->mStickMarginX) / (1.0f - mActor->mConst->getTable()->mStickMarginX); - } - else { + } else { a2 = (a2 + mActor->mConst->getTable()->mStickMarginX) / (1.0f - mActor->mConst->getTable()->mStickMarginX); } - } - else if (__fabsf(a2) > mActor->mConst->getTable()->mStickMarginXstart) { + } else if (__fabsf(a2) > mActor->mConst->getTable()->mStickMarginXstart) { if (__fabsf(a3) < mActor->mConst->getTable()->mStickMarginY) { a3 = 0.0f; - } - else if (a3 > 0.0f) { + } else if (a3 > 0.0f) { a3 = (a3 - mActor->mConst->getTable()->mStickMarginY) / (1.0f - mActor->mConst->getTable()->mStickMarginY); - } - else { + } else { a3 = (a3 + mActor->mConst->getTable()->mStickMarginY) / (1.0f - mActor->mConst->getTable()->mStickMarginY); } } @@ -268,7 +258,7 @@ bool MarioModule::calcWorldPadDir(TVec3f *pDest, f32 a2, f32 a3, bool a4) { return true; } -void MarioModule::addVelocity(const TVec3f &rAdd) { +void MarioModule::addVelocity(const TVec3f& rAdd) { mActor->mMario->mVelocity += rAdd; } @@ -277,7 +267,7 @@ void MarioModule::addVelocity(const TVec3f &rAdd) { MR::vecScaleAdd(&mActor->mMario->_160, &rAdd, scale); } */ -void MarioModule::addVelocityAfter(const TVec3f &rAdd) { +void MarioModule::addVelocityAfter(const TVec3f& rAdd) { mActor->mMario->mVelocityAfter += rAdd; } @@ -289,23 +279,21 @@ TVec3f& MarioModule::getVelocity() const { return mActor->mMario->mVelocity; } -void MarioModule::addTrans(const TVec3f &rShift, const char *pName) { +void MarioModule::addTrans(const TVec3f& rShift, const char* pName) { mActor->mMario->addTrans(rShift, pName); } - // regswap void MarioModule::cutGravityElementFromJumpVec(bool a1) { if (a1) { MR::vecKillElement(mActor->mMario->mJumpVec, mActor->_240, &mActor->mMario->mJumpVec); - } - else { + } else { TVec3f* pJumpVec = &mActor->mMario->mJumpVec; MR::vecKillElement(*pJumpVec, mActor->getGravityVec(), pJumpVec); } } -void MarioModule::cutVecElementFromJumpVec(const TVec3f &rCut) { +void MarioModule::cutVecElementFromJumpVec(const TVec3f& rCut) { MR::vecKillElement(mActor->mMario->mJumpVec, rCut, &mActor->mMario->mJumpVec); } @@ -313,69 +301,69 @@ TVec3f& MarioModule::getJumpVec() const { return mActor->mMario->mJumpVec; } -void MarioModule::setJumpVec(const TVec3f &rVec) { +void MarioModule::setJumpVec(const TVec3f& rVec) { mActor->mMario->mJumpVec.setPS2(rVec); } -void MarioModule::playEffect(const char *pEffectName) { +void MarioModule::playEffect(const char* pEffectName) { mActor->playEffect(pEffectName); } -void MarioModule::playEffectTarns(const char *pEffectName, const TVec3f &rTrans) { +void MarioModule::playEffectTarns(const char* pEffectName, const TVec3f& rTrans) { mActor->playEffectTrans(pEffectName, rTrans); } -void MarioModule::playEffectRT(const char *pEffectName, const TVec3f &a2, const TVec3f &a3) { +void MarioModule::playEffectRT(const char* pEffectName, const TVec3f& a2, const TVec3f& a3) { mActor->playEffectRT(pEffectName, a2, a3); } -void MarioModule::playEffectRTZ(const char *pEffectName, const TVec3f &a2, const TVec3f &a3) { +void MarioModule::playEffectRTZ(const char* pEffectName, const TVec3f& a2, const TVec3f& a3) { mActor->playEffectRTZ(pEffectName, a2, a3); } -void MarioModule::playEffectRTW(const char *pEffectName, const TVec3f &a2, const TVec3f &a3) { +void MarioModule::playEffectRTW(const char* pEffectName, const TVec3f& a2, const TVec3f& a3) { mActor->playEffectRTW(pEffectName, a2, a3); } -void MarioModule::playEffectSRT(const char *pEffectName, float a2, const TVec3f &a3, const TVec3f &a4) { +void MarioModule::playEffectSRT(const char* pEffectName, float a2, const TVec3f& a3, const TVec3f& a4) { mActor->playEffectSRT(pEffectName, a2, a3, a4); } -void MarioModule::stopEffect(const char *pEffectName) { +void MarioModule::stopEffect(const char* pEffectName) { mActor->stopEffect(pEffectName); } -void MarioModule::stopEffectForce(const char *pEffectName) { +void MarioModule::stopEffectForce(const char* pEffectName) { mActor->stopEffectForce(pEffectName); } -bool MarioModule::playSound(const char *pSoundName, s32 a2) { +bool MarioModule::playSound(const char* pSoundName, s32 a2) { return mActor->mMario->playSoundJ(pSoundName, a2); } -void MarioModule::stopSound(const char *pSoundName, u32 a2) { +void MarioModule::stopSound(const char* pSoundName, u32 a2) { mActor->mMario->stopSoundJ(pSoundName, a2); } void MarioModule::startCamVib(u32 strength) { switch (strength) { - case 1: - MR::shakeCameraWeak(); - return; - case 2: - MR::shakeCameraWeak(); - return; - case 0: - MR::shakeCameraNormal(); - return; - case 3: - MR::shakeCameraNormalStrong(); - return; - case 4: - MR::shakeCameraStrong(); - return; - default: - return; + case 1: + MR::shakeCameraWeak(); + return; + case 2: + MR::shakeCameraWeak(); + return; + case 0: + MR::shakeCameraNormal(); + return; + case 3: + MR::shakeCameraNormalStrong(); + return; + case 4: + MR::shakeCameraStrong(); + return; + default: + return; } } @@ -397,24 +385,24 @@ TVec3f& MarioModule::getCamDirZ() const { void MarioModule::startPadVib(u32 strength) { switch (strength) { - case 1: - MR::tryRumblePadVeryWeak(mActor, 0); - return; - case 0: - MR::tryRumblePadWeak(mActor, 0); - return; - case 2: - MR::tryRumblePadMiddle(mActor, 0); - return; - case 3: - MR::tryRumblePadStrong(mActor, 0); - return; - default: - return; + case 1: + MR::tryRumblePadVeryWeak(mActor, 0); + return; + case 0: + MR::tryRumblePadWeak(mActor, 0); + return; + case 2: + MR::tryRumblePadMiddle(mActor, 0); + return; + case 3: + MR::tryRumblePadStrong(mActor, 0); + return; + default: + return; } } -void MarioModule::startPadVib(const char *a1) { +void MarioModule::startPadVib(const char* a1) { MR::tryRumblePad(mActor, a1, 0); } @@ -492,21 +480,21 @@ bool MarioModule::isOnSlipGround() const { } bool MarioModule::isSlipFloorCode(s32 a1) const { - switch(a1) { - case 2: - return true; - case 3: - case 0xd: - case 0x14: - case 0x15: - case 0x16: - case 0x1e: - return false; + switch (a1) { + case 2: + return true; + case 3: + case 0xd: + case 0x14: + case 0x15: + case 0x16: + case 0x1e: + return false; } return true; } -bool MarioModule::isSlipPolygon(const Triangle *pTri) const { +bool MarioModule::isSlipPolygon(const Triangle* pTri) const { if (!pTri->isValid()) { return false; } @@ -534,7 +522,7 @@ u32 MarioModule::getFloorCode() const { return mActor->mMario->_95C->getCode(mActor->mMario->mGroundPolygon); } -f32 MarioModule::calcPolygonAngleD(const Triangle *pTri) const { +f32 MarioModule::calcPolygonAngleD(const Triangle* pTri) const { if (pTri->isValid() == false) { return 0.0f; } @@ -544,12 +532,12 @@ f32 MarioModule::calcPolygonAngleD(const Triangle *pTri) const { return calcAngleD(*pTri->getNormal(0)); } -f32 MarioModule::calcAngleD(const TVec3f &rVec) const { +f32 MarioModule::calcAngleD(const TVec3f& rVec) const { float f31 = (MR::acosEx(-mActor->mMario->getAirGravityVec().dot(rVec)) / 3.14159f) * 180.0f; if (MR::isNearZero(f31, 1.0f)) { f31 = 0.0f; } - if (MR::isNearZero(f31-90.0f, 1.0f)) { + if (MR::isNearZero(f31 - 90.0f, 1.0f)) { f31 = 90.0f; } return f31; @@ -559,7 +547,7 @@ Triangle* MarioModule::getTmpPolygon() const { return mActor->mMario->mTmpPolygon; } -bool MarioModule::sendPunch(HitSensor *pSensor, bool a2) { +bool MarioModule::sendPunch(HitSensor* pSensor, bool a2) { if (!pSensor) { return false; } @@ -570,11 +558,10 @@ bool MarioModule::sendPunch(HitSensor *pSensor, bool a2) { return ret; } -HitSensor* MarioModule::getSensor(const Triangle *pTri) const { +HitSensor* MarioModule::getSensor(const Triangle* pTri) const { if (pTri->isValid() == false) { return nullptr; - } - else { + } else { return pTri->mSensor; } } @@ -590,16 +577,16 @@ bool MarioModule::isInputDisable() const { if (mActor->mMario->isStatusActive(12)) { return true; } - if (isAnimationRun("ハード着地")) { // "Hard landing" + if (isAnimationRun("ハード着地")) { // "Hard landing" return true; } - if (isAnimationRun("中ダメージ着地")) { + if (isAnimationRun("中ダメージ着地")) { return true; } - if (isAnimationRun("中後ダメージ着地")) { + if (isAnimationRun("中後ダメージ着地")) { return true; } - if (isAnimationRun("ステージインB")) { + if (isAnimationRun("ステージインB")) { return true; } return mActor->_3C0; diff --git a/src/Game/Player/MarioMove2D.cpp b/src/Game/Player/MarioMove2D.cpp index 9d0291009..cfe30ee37 100644 --- a/src/Game/Player/MarioMove2D.cpp +++ b/src/Game/Player/MarioMove2D.cpp @@ -1,7 +1,6 @@ #include "Game/Player/Mario.hpp" -void Mario::clear2DStick() -{ +void Mario::clear2DStick() { _60E = 0; _60F = 0; _610 = 0; diff --git a/src/Game/Player/MarioNullBck.cpp b/src/Game/Player/MarioNullBck.cpp index c9224e3a6..8afb26106 100644 --- a/src/Game/Player/MarioNullBck.cpp +++ b/src/Game/Player/MarioNullBck.cpp @@ -1,13 +1,14 @@ #include "Game/Player/MarioNullBck.hpp" #include "Game/Util/MtxUtil.hpp" -MarioNullBck::MarioNullBck(const char *pName) : LiveActor(pName) { +MarioNullBck::MarioNullBck(const char* pName) + : LiveActor(pName) { } -MarioNullBck::~MarioNullBck(){ +MarioNullBck::~MarioNullBck() { } -void MarioNullBck::init(const JMapInfoIter &rIter) { +void MarioNullBck::init(const JMapInfoIter& rIter) { initModelManagerWithAnm("MarioDummyItem", nullptr, false); MR::startBck(this, "PickUpBall", nullptr); makeActorDead(); @@ -18,11 +19,11 @@ void MarioNullBck::appear() { LiveActor::appear(); } -void MarioNullBck::getLastPos(TVec3f *pDest) { +void MarioNullBck::getLastPos(TVec3f* pDest) { MR::copyJointPos(this, "DummyItem", pDest); } -bool MarioNullBck::getFramePos(f32 a1, TVec3f *a2, TVec3f *a3) { +bool MarioNullBck::getFramePos(f32 a1, TVec3f* a2, TVec3f* a3) { bool ret = false; if (MR::isDead(this)) { return true; diff --git a/src/Game/Player/MarioSlip.cpp b/src/Game/Player/MarioSlip.cpp index 29237af3b..477d34198 100644 --- a/src/Game/Player/MarioSlip.cpp +++ b/src/Game/Player/MarioSlip.cpp @@ -1,7 +1,6 @@ #include "Game/Player/Mario.hpp" -void Mario::clearSlope() -{ +void Mario::clearSlope() { _8F0 = 0.0f; mMovementStates._23 = false; _8F8.zero(); diff --git a/src/Game/Player/MarioSound.cpp b/src/Game/Player/MarioSound.cpp index fd1822e29..90decea12 100644 --- a/src/Game/Player/MarioSound.cpp +++ b/src/Game/Player/MarioSound.cpp @@ -2,8 +2,8 @@ #include struct SoundList { - const char *name; - u32 _4; + const char* name; + u32 _4; u32 _8; u32 _C; @@ -14,1657 +14,1657 @@ struct SoundList { SoundList soundlist[206] = { { - "声小ジャンプ", // name - 0x10000, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声小ジャンプ", // name + 0x10000, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "声中ジャンプ", // name - 0x10001, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声大ジャンプ", // name - 0x10002, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声後ジャンプ", // name - 0x10003, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声幅ジャンプ", // name - 0x10004, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声物ジャンプ", // name - 0x10005, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声高飛び込み", // name - 0x1004f, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声尻ドロップ", // name - 0x10007, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声尻ドロップ着地", // name - 0x10032, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声着地停止", // name - 0x10006, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声ステージイン着地", // name - 0x10031, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声小ダメージ", // name - 0x10008, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声大ダメージ", // name - 0x10009, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声最終ダメージ", // name - 0x1000d, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声炎ダメージ", // name - 0x10017, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声電気ダメージ", // name - 0x10019, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声電気ダメージ終了", // name - 0x10039, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声倒れ", // name - 0x1000e, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声落下死亡", // name - 0x10018, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声しびれ", // name - 0x10008, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声氷ダメージ", // name - 0x1003e, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声つぶれダメージ", // name - 0x1004d, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声スピン", // name - 0x10033, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声スピンキャンセル", // name - 0x10035, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声パンチ", // name - 0x1000a, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声踏み", // name - 0x10034, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声蹴り", // name - 0x1000b, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "声中ジャンプ", // name + 0x10001, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "声トルネード", // name - 0x1000c, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声壁反射", // name - 0x10013, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声投げ", // name - 0x10010, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声壁押し", // name - 0x1000f, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声壁体当たり", // name - 0x10053, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声スピン尻ドロップ", // name - 0x1000a, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声軽い力み", // name - 0x10012, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "声大ジャンプ", // name + 0x10002, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "声崖つかまり", // name - 0x10041, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声崖つかまり終了", // name - 0x10042, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "声後ジャンプ", // name + 0x10003, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "声炎ダメージ中", // name - 0x1001a, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "声幅ジャンプ", // name + 0x10004, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "声炎ダメージ終了", // name - 0x1001b, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声氷ダメージ終了", // name - 0x1003f, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声針ダメージ", // name - 0x10027, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声針ダメージ中", // name - 0x10028, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声針ダメージ終了", // name - 0x10036, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "声物ジャンプ", // name + 0x10005, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "声水中ダメージ", // name - 0x1003b, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声水中最終ダメージ", // name - 0x1003c, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声冷水ダメージ", // name - 0x10052, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声スケキヨ開始", // name - 0x10043, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声スケキヨ終了", // name - 0x10044, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声足埋まり開始", // name - 0x10045, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声足埋まり終了", // name - 0x10046, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声あくび", // name - 0x1001f, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声いびき１", // name - 0x10020, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声いびき２", // name - 0x10021, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声噴水ジャンプ", // name - 0x10025, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声ランニングキック", // name - 0x1000b, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "声砂脱出", // name - 0x1000f, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "声高飛び込み", // name + 0x1004f, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "声投げられ", // name - 0x10026, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声尻ドロップ", // name + 0x10007, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "声慌て", // name - 0x10025, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声尻ドロップ着地", // name + 0x10032, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "声しゃがむ", // name - 0x1004e, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声着地停止", // name + 0x10006, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "声砂沈み", // name - 0x10050, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声ステージイン着地", // name + 0x10031, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "声砂沈み死亡", // name - 0x10051, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声小ダメージ", // name + 0x10008, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "声沼沈み", // name - 0x10050, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声大ダメージ", // name + 0x10009, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "声沼沈み死亡", // name - 0x10051, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声最終ダメージ", // name + 0x1000d, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "足音左", // name - 0x20025, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声炎ダメージ", // name + 0x10017, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "足音右", // name - 0x20026, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声電気ダメージ", // name + 0x10019, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "ジャンプ踏切", // name - 0x20029, // 0x4 - 0x4000000, // 0x8 - 0x805c98eb, // 0xC - 0, // 0x10 - 0, // 0x14 + "声電気ダメージ終了", // name + 0x10039, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "着地", // name - 0x2002a, // 0x4 - 0x4000000, // 0x8 - 0x805c98ff, // 0xC - 0, // 0x10 - 0, // 0x14 + "声倒れ", // name + 0x1000e, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "重い着地", // name - 0x20038, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声落下死亡", // name + 0x10018, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "掴み", // name - 0x20003, // 0x4 + "声しびれ", // name + 0x10008, // 0x4 0, // 0x8 0, // 0xC 0, // 0x10 0, // 0x14 }, { - "ぶらさがり", // name - 0x2002b, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声氷ダメージ", // name + 0x1003e, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "尻ドロップ回転", // name - 0x20005, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声つぶれダメージ", // name + 0x1004d, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "尻ドロップ着地", // name - 0x20006, // 0x4 - 0x4000000, // 0x8 - 0x805c98ff, // 0xC - 0, // 0x10 - 0, // 0x14 + "声スピン", // name + 0x10033, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "スピン尻ドロップ回転", // name - 0x20087, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声スピンキャンセル", // name + 0x10035, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "スピン尻ドロップ落下", // name - 0x20088, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声パンチ", // name + 0x1000a, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "中ジャンプ", // name - 0x20007, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声踏み", // name + 0x10034, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "大ジャンプ", // name - 0x20008, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声蹴り", // name + 0x1000b, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "後ジャンプ", // name - 0x20009, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声トルネード", // name + 0x1000c, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "幅ジャンプ", // name - 0x2000a, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声壁反射", // name + 0x10013, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "トルネードジャンプ", // name - 0x2000e, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声投げ", // name + 0x10010, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "スピンジャンプ", // name - 0x2002c, // 0x4 - 0x4000000, // 0x8 - 0x805c98eb, // 0xC - 0, // 0x10 - 0, // 0x14 + "声壁押し", // name + 0x1000f, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "トランポリンジャンプ小", // name - 0x50187, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声壁体当たり", // name + 0x10053, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "トランポリンジャンプ大", // name - 0x50188, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声スピン尻ドロップ", // name + 0x1000a, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "スリップアップ", // name - 0x2000c, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声軽い力み", // name + 0x10012, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "ダメージ", // name - 0x20010, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声崖つかまり", // name + 0x10041, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "炎ダメージ", // name - 0x20021, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声崖つかまり終了", // name + 0x10042, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "針ダメージ", // name - 0x20082, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声炎ダメージ中", // name + 0x1001a, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "電気ダメージ", // name - 0x2002f, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声炎ダメージ終了", // name + 0x1001b, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "壁反射", // name - 0x20033, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声氷ダメージ終了", // name + 0x1003f, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "プレスダメージ", // name - 0x20016, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声針ダメージ", // name + 0x10027, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "氷ダメージ", // name - 0x20075, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声針ダメージ中", // name + 0x10028, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "倒れ", // name - 0x20013, // 0x4 - 0x4000000, // 0x8 - 0x805c9a48, // 0xC - 0, // 0x10 - 0, // 0x14 + "声針ダメージ終了", // name + 0x10036, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "吹っ飛び倒れ", // name - 0x20017, // 0x4 - 0x4000000, // 0x8 - 0x805c98ff, // 0xC - 0, // 0x10 - 0, // 0x14 + "声水中ダメージ", // name + 0x1003b, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "坂滑り", // name - 0x20023, // 0x4 - 0x9000000, // 0x8 - 0x805c9a67, // 0xC - 0, // 0x10 - 0, // 0x14 + "声水中最終ダメージ", // name + 0x1003c, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "ルイージ滑り", // name - 0x20099, // 0x4 - 0x9000000, // 0x8 - 0x805c9a67, // 0xC - 0, // 0x10 - 0, // 0x14 + "声冷水ダメージ", // name + 0x10052, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "パンチ風切り", // name - 0x2001e, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声スケキヨ開始", // name + 0x10043, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "炎ダメージ復帰バウンド", // name - 0x20035, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声スケキヨ終了", // name + 0x10044, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "炎ダメージ炎上中", // name - 0x20034, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声足埋まり開始", // name + 0x10045, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "氷ダメージ終了", // name - 0x20076, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声足埋まり終了", // name + 0x10046, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "引き戻し基本", // name - 0x20036, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声あくび", // name + 0x1001f, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "引き戻し浮遊", // name - 0x20037, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声いびき１", // name + 0x10020, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "引き戻し泡破裂", // name - 0x50087, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声いびき２", // name + 0x10021, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "はねとばされ", // name - 0x2001a, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声噴水ジャンプ", // name + 0x10025, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "結界ヒット", // name - 0x20069, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声ランニングキック", // name + 0x1000b, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "壁衝突", // name - 0x20085, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声砂脱出", // name + 0x1000f, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "投げられ", // name - 0x20086, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声投げられ", // name + 0x10026, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "ヘリコプタージャンプ", // name - 0x2001b, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声慌て", // name + 0x10025, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "滞空開始", // name - 0x2001c, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "声しゃがむ", // name + 0x1004e, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "滞空中", // name - 0x2001d, // 0x4 + "声砂沈み", // name + 0x10050, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "声砂沈み死亡", // name + 0x10051, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "声沼沈み", // name + 0x10050, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "声沼沈み死亡", // name + 0x10051, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "足音左", // name + 0x20025, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "足音右", // name + 0x20026, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "ジャンプ踏切", // name + 0x20029, // 0x4 + 0x4000000, // 0x8 + 0x805c98eb, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "着地", // name + 0x2002a, // 0x4 + 0x4000000, // 0x8 + 0x805c98ff, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "重い着地", // name + 0x20038, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "掴み", // name + 0x20003, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "ぶらさがり", // name + 0x2002b, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "尻ドロップ回転", // name + 0x20005, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "尻ドロップ着地", // name + 0x20006, // 0x4 + 0x4000000, // 0x8 + 0x805c98ff, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "スピン尻ドロップ回転", // name + 0x20087, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "スピン尻ドロップ落下", // name + 0x20088, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "中ジャンプ", // name + 0x20007, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "大ジャンプ", // name + 0x20008, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "後ジャンプ", // name + 0x20009, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "幅ジャンプ", // name + 0x2000a, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "トルネードジャンプ", // name + 0x2000e, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "スピンジャンプ", // name + 0x2002c, // 0x4 + 0x4000000, // 0x8 + 0x805c98eb, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "トランポリンジャンプ小", // name + 0x50187, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "トランポリンジャンプ大", // name + 0x50188, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "スリップアップ", // name + 0x2000c, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "ダメージ", // name + 0x20010, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "炎ダメージ", // name + 0x20021, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "針ダメージ", // name + 0x20082, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "電気ダメージ", // name + 0x2002f, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "壁反射", // name + 0x20033, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "プレスダメージ", // name + 0x20016, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "氷ダメージ", // name + 0x20075, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "倒れ", // name + 0x20013, // 0x4 + 0x4000000, // 0x8 + 0x805c9a48, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "吹っ飛び倒れ", // name + 0x20017, // 0x4 + 0x4000000, // 0x8 + 0x805c98ff, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "坂滑り", // name + 0x20023, // 0x4 + 0x9000000, // 0x8 + 0x805c9a67, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "ルイージ滑り", // name + 0x20099, // 0x4 + 0x9000000, // 0x8 + 0x805c9a67, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "パンチ風切り", // name + 0x2001e, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "炎ダメージ復帰バウンド", // name + 0x20035, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "炎ダメージ炎上中", // name + 0x20034, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "氷ダメージ終了", // name + 0x20076, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "引き戻し基本", // name + 0x20036, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "引き戻し浮遊", // name + 0x20037, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "引き戻し泡破裂", // name + 0x50087, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "はねとばされ", // name + 0x2001a, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "結界ヒット", // name + 0x20069, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "壁衝突", // name + 0x20085, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "投げられ", // name + 0x20086, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "ヘリコプタージャンプ", // name + 0x2001b, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "滞空開始", // name + 0x2001c, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "滞空中", // name + 0x2001d, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "ホッパー跳ね返り", // name + 0x20052, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "ホッパージャンプ溜め", // name + 0x20053, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "ホッパージャンプ", // name + 0x20054, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "テレサ浮遊", // name + 0x20061, // 0x4 0x1000000, // 0x8 0, // 0xC 0, // 0x10 0, // 0x14 }, { - "ホッパー跳ね返り", // name - 0x20052, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "テレサ踏ん張り", // name + 0x20024, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "ホッパージャンプ溜め", // name - 0x20053, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "テレサ壁反射", // name + 0x20062, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "ホッパージャンプ", // name - 0x20054, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "テレサ消える", // name + 0x2006a, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "テレサ浮遊", // name - 0x20061, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "テレサ現れる", // name + 0x2006b, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "テレサ踏ん張り", // name - 0x20024, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "テレサ風に乗る", // name + 0x2007c, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "テレサ壁反射", // name - 0x20062, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "テレサ消える", // name - 0x2006a, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "テレサ現れる", // name - 0x2006b, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "テレサ風に乗る", // name - 0x2007c, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "ハチ飛行中", // name - 0x20063, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "スケキヨ開始", // name - 0x20057, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "スケキヨ終了", // name - 0x20059, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "スケキヨ終了スピン", // name - 0x20083, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "スケート足", // name - 0x20064, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "スケート滑り", // name - 0x20065, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "スケートジャンプ", // name - 0x20066, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "スケート着地", // name - 0x20067, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "スケートスピン", // name - 0x20068, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "ハチ壁くっつき", // name - 0x2006d, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "ハチ壁歩き左", // name - 0x2006e, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "ハチ壁歩き右", // name - 0x2006f, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "ハチ壁ジャンプ", // name - 0x20070, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, - { - "砂沈み", // name - 0x20077, // 0x4 + "ハチ飛行中", // name + 0x20063, // 0x4 0x1000000, // 0x8 0, // 0xC 0, // 0x10 0, // 0x14 }, { - "砂脱出", // name - 0x20078, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "スケキヨ開始", // name + 0x20057, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "砂強制沈み", // name - 0x2007a, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "スケキヨ終了", // name + 0x20059, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "砂死亡", // name - 0x20079, // 0x4 + "スケキヨ終了スピン", // name + 0x20083, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "スケート足", // name + 0x20064, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "スケート滑り", // name + 0x20065, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "スケートジャンプ", // name + 0x20066, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "スケート着地", // name + 0x20067, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "スケートスピン", // name + 0x20068, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "ハチ壁くっつき", // name + 0x2006d, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "ハチ壁歩き左", // name + 0x2006e, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "ハチ壁歩き右", // name + 0x2006f, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "ハチ壁ジャンプ", // name + 0x20070, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "砂沈み", // name + 0x20077, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "砂脱出", // name + 0x20078, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "砂強制沈み", // name + 0x2007a, // 0x4 0x1000000, // 0x8 0, // 0xC 0, // 0x10 0, // 0x14 }, { - "沼強制沈み", // name - 0x2007d, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "砂死亡", // name + 0x20079, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "沼死亡", // name - 0x2007e, // 0x4 + "沼強制沈み", // name + 0x2007d, // 0x4 0x1000000, // 0x8 0, // 0xC 0, // 0x10 0, // 0x14 }, { - "毒沼脱出", // name - 0x20096, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "沼死亡", // name + 0x2007e, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "毒沼ダメージ", // name - 0x20097, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "毒沼脱出", // name + 0x20096, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "ダークマター沈み", // name - 0x20095, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "毒沼ダメージ", // name + 0x20097, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "惑星貫通中", // name - 0x20080, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "ダークマター沈み", // name + 0x20095, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "惑星貫通終了", // name - 0x20081, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "惑星貫通中", // name + 0x20080, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "フー滞空中", // name - 0x2008a, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "惑星貫通終了", // name + 0x20081, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "フー加速", // name - 0x2008b, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "フー滞空中", // name + 0x2008a, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "フー飛行中", // name - 0x2008c, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "フー加速", // name + 0x2008b, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "フーブレーキ", // name - 0x2008d, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "フー飛行中", // name + 0x2008c, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "ワープポッド入り", // name - 0x20092, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "フーブレーキ", // name + 0x2008d, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "ワープポッド出", // name - 0x20093, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "ワープポッド入り", // name + 0x20092, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "ワープポッド移動", // name - 0x20094, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "ワープポッド出", // name + 0x20093, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, - { - "スペシャルダッシュ強", // name - 0x2009b, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + { + "ワープポッド移動", // name + 0x20094, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "スペシャルダッシュ弱", // name - 0x2009c, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "スペシャルダッシュ強", // name + 0x2009b, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "ダッシュ加速強成功", // name - 0x42, // 0x4 - 0x2000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "スペシャルダッシュ弱", // name + 0x2009c, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "ブラックホール吸い込まれ", // name - 0x20031, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "ダッシュ加速強成功", // name + 0x42, // 0x4 + 0x2000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水歩行突入", // name - 0x2003b, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "ブラックホール吸い込まれ", // name + 0x20031, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水歩行脱出", // name - 0x2003c, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水歩行突入", // name + 0x2003b, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水面ウエイト", // name - 0x2003d, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水歩行脱出", // name + 0x2003c, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水中ウエイト", // name - 0x2003e, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水面ウエイト", // name + 0x2003d, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水落下突入", // name - 0x2003f, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水中ウエイト", // name + 0x2003e, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水ジャンプ脱出", // name - 0x20040, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水落下突入", // name + 0x2003f, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水面一掻き", // name - 0x20041, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水ジャンプ脱出", // name + 0x20040, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水中一掻き", // name - 0x20042, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水面一掻き", // name + 0x20041, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水面バタ足", // name - 0x20043, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水中一掻き", // name + 0x20042, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水中バタ足", // name - 0x20044, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水面バタ足", // name + 0x20043, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水面潜り", // name - 0x20045, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水中バタ足", // name + 0x20044, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水中潜り", // name - 0x20046, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水面潜り", // name + 0x20045, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水面スピン開始", // name - 0x20047, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水中潜り", // name + 0x20046, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水面スピン", // name - 0x20048, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水面スピン開始", // name + 0x20047, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水中スピン開始", // name - 0x20049, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水面スピン", // name + 0x20048, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水中スピン", // name - 0x2004a, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水中スピン開始", // name + 0x20049, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水面ダメージ", // name - 0x2004b, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水中スピン", // name + 0x2004a, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水中ダメージ", // name - 0x2004c, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水面ダメージ", // name + 0x2004b, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "亀ジェット泳ぎ", // name - 0x5005b, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水中ダメージ", // name + 0x2004c, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水底接触", // name - 0x20001, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "亀ジェット泳ぎ", // name + 0x5005b, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "亀壁ヒット", // name - 0x5005e, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水底接触", // name + 0x20001, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "亀ブレーキ", // name - 0x2008e, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "亀壁ヒット", // name + 0x5005e, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "亀加速", // name - 0x2008f, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "亀ブレーキ", // name + 0x2008e, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水跳ね左足", // name - 0x2005a, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "亀加速", // name + 0x2008f, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水跳ね右足", // name - 0x2005b, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水跳ね左足", // name + 0x2005a, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水跳ね左足小", // name - 0x2005c, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水跳ね右足", // name + 0x2005b, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水跳ね右足小", // name - 0x2005d, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水跳ね左足小", // name + 0x2005c, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水跳ねジャンプ", // name - 0x2005e, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水跳ね右足小", // name + 0x2005d, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水跳ね着地", // name - 0x2005f, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水跳ねジャンプ", // name + 0x2005e, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水跳ね手", // name - 0x20060, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水跳ね着地", // name + 0x2005f, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水弾かれ", // name - 0x2006c, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水跳ね手", // name + 0x20060, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水面滑り", // name - 0x20089, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水弾かれ", // name + 0x2006c, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "トルネード風", // name - 0x2000d, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "水面滑り", // name + 0x20089, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "スリップ", // name - 0x2000b, // 0x4 - 0x9000000, // 0x8 - 0x805c9a67, // 0xC - 0, // 0x10 - 0, // 0x14 + "トルネード風", // name + 0x2000d, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "最後の一撃", // name - 0x20012, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "スリップ", // name + 0x2000b, // 0x4 + 0x9000000, // 0x8 + 0x805c9a67, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "空中ふんばり", // name - 0x20024, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "最後の一撃", // name + 0x20012, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "スピン許可", // name - 0x2007b, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "空中ふんばり", // name + 0x20024, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "スピン回復終了", // name - 0x2009a, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "スピン許可", // name + 0x2007b, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "トルネード飛行", // name - 0x20091, // 0x4 - 0x1000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "スピン回復終了", // name + 0x2009a, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "ライフ警告", // name - 0x5, // 0x4 - 0x3000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "トルネード飛行", // name + 0x20091, // 0x4 + 0x1000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "ライフ回復", // name - 0x6, // 0x4 - 0x2000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "ライフ警告", // name + 0x5, // 0x4 + 0x3000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "水中ライフ減少", // name - 0x40, // 0x4 - 0x2000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "ライフ回復", // name + 0x6, // 0x4 + 0x2000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, { - "酸素減少警告", // name - 0x3d, // 0x4 - 0x2000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, + "水中ライフ減少", // name + 0x40, // 0x4 + 0x2000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, + { + "酸素減少警告", // name + 0x3d, // 0x4 + 0x2000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, { - "無酸素警告", // name - 0x3e, // 0x4 - 0x2000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, + "無酸素警告", // name + 0x3e, // 0x4 + 0x2000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, { - "酸素回復", // name - 0x37, // 0x4 - 0x2000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, + "酸素回復", // name + 0x37, // 0x4 + 0x2000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, { - "酸素完全回復", // name - 0x38, // 0x4 - 0x2000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, + "酸素完全回復", // name + 0x38, // 0x4 + 0x2000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, { - "水面酸素回復", // name - 0x49, // 0x4 - 0x3000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, + "水面酸素回復", // name + 0x49, // 0x4 + 0x3000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, { - "水面酸素完全回復", // name - 0x4a, // 0x4 - 0x2000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, + "水面酸素完全回復", // name + 0x4a, // 0x4 + 0x2000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, { - "無酸素ダメージ", // name - 0x39, // 0x4 - 0x2000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, + "無酸素ダメージ", // name + 0x39, // 0x4 + 0x2000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, { - "ハチ体力回復", // name - 0x3a, // 0x4 - 0x3000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, + "ハチ体力回復", // name + 0x3a, // 0x4 + 0x3000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, { - "ハチ体力完全回復", // name - 0x3b, // 0x4 - 0x2000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, + "ハチ体力完全回復", // name + 0x3b, // 0x4 + 0x2000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, { - "ハチ体力切れ", // name - 0x3c, // 0x4 - 0x2000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, + "ハチ体力切れ", // name + 0x3c, // 0x4 + 0x2000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, { - "変身解除", // name - 0x10, // 0x4 - 0x2000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, + "変身解除", // name + 0x10, // 0x4 + 0x2000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, { - "呪い解除", // name - 0x5a, // 0x4 - 0x2000000, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 - }, + "呪い解除", // name + 0x5a, // 0x4 + 0x2000000, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 + }, { - "", // name - 0, // 0x4 - 0, // 0x8 - 0, // 0xC - 0, // 0x10 - 0, // 0x14 + "", // name + 0, // 0x4 + 0, // 0x8 + 0, // 0xC + 0, // 0x10 + 0, // 0x14 }, }; struct SoundSwapList { - const char *name; + const char* name; u32 offset1; u32 offset2; @@ -1673,8 +1673,7 @@ struct SoundSwapList { SoundSwapList soundswaplist[1] = {{"", 0, 0, 0}}; -void Mario::initSound() -{ +void Mario::initSound() { u32 length = initSoundTable(soundlist, 0); _96C = new HashSortTable(length); for (u32 i = 0; i < length; i++) { @@ -1686,14 +1685,13 @@ void Mario::initSound() struct OffsetView { u32 offset; - u8 padding[12]; + u8 padding[12]; }; -u32 Mario::initSoundTable(SoundList *list, u32 globalTablePosition) -{ - OffsetView *currswap = (OffsetView *)((u32 *)soundswaplist + globalTablePosition); - SoundList *pos = list; - int i = 0; +u32 Mario::initSoundTable(SoundList* list, u32 globalTablePosition) { + OffsetView* currswap = (OffsetView*)((u32*)soundswaplist + globalTablePosition); + SoundList* pos = list; + int i = 0; while (true) { pos = list + i; if (pos->name[0] == '\0') { diff --git a/src/Game/Player/MarioState.cpp b/src/Game/Player/MarioState.cpp index 8194e21b4..fec7c5fd0 100644 --- a/src/Game/Player/MarioState.cpp +++ b/src/Game/Player/MarioState.cpp @@ -1,7 +1,7 @@ #include "Game/Player/MarioState.hpp" -MarioState::MarioState(MarioActor *actor, u32 statusId) : MarioModule(actor) -{ +MarioState::MarioState(MarioActor* actor, u32 statusId) + : MarioModule(actor) { _8 = 0; mStatusId = statusId; _10 = 0; diff --git a/src/Game/Player/MarioSwim.cpp b/src/Game/Player/MarioSwim.cpp index 68bdb988e..569a7a3d7 100644 --- a/src/Game/Player/MarioSwim.cpp +++ b/src/Game/Player/MarioSwim.cpp @@ -15,7 +15,22 @@ namespace { f32 cFrontAccSpinSurface[20] = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 8.0f, 6.0f, 4.0f, 2.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}; f32 cWeightTable[16] = { - 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, + 0.0f, + 0.0f, + 0.0f, + 0.0f, + 1.0f, }; f32 cWeightTableSP[4] = {0.0f, 0.0f, 0.75f, 0.25f}; @@ -30,18 +45,16 @@ namespace { // In const mem region? const f32 cTurnMotionSpeed = 5.0f; -} // namespace +} // namespace -bool Mario::isSwimming() const -{ +bool Mario::isSwimming() const { if (isStatusActive(6)) { return true; } return isStatusActive(24); } -bool Mario::forceStartSwimAndShoot(const TVec3f &v) -{ +bool Mario::forceStartSwimAndShoot(const TVec3f& v) { WaterInfo waterInfo; if (!MR::getWaterAreaObj(&waterInfo, mActor->mPosition)) { return false; @@ -51,8 +64,7 @@ bool Mario::forceStartSwimAndShoot(const TVec3f &v) return true; } -bool Mario::forceExitSwim() -{ +bool Mario::forceExitSwim() { if (!isStatusActive(6)) { return false; } @@ -61,8 +73,7 @@ bool Mario::forceExitSwim() return true; } -void MarioSwim::setDamage(const TVec3f &v, u16 damage) -{ +void MarioSwim::setDamage(const TVec3f& v, u16 damage) { _A0 = v; _AE = damage; _4C = 0.0f; @@ -117,18 +128,15 @@ bool Mario::checkStartSwim() } */ -void Mario::startSwim() -{ +void Mario::startSwim() { if (!isStatusActive(6)) { if (getPlayer()->isDamaging()) { mSwim->_9D = 4; playSound("水落下突入", -1); - } - else if (getPlayer()->getMovementStates().jumping) { + } else if (getPlayer()->getMovementStates().jumping) { mSwim->_9D = 1; playSound("水落下突入", -1); - } - else { + } else { mSwim->_9D = 0; playSound("水歩行突入", -1); } @@ -148,8 +156,8 @@ void Mario::startSwim() } } -MarioSwim::MarioSwim(MarioActor *actor) : MarioState(actor, 6), _F4() -{ +MarioSwim::MarioSwim(MarioActor* actor) + : MarioState(actor, 6), _F4() { _18 = 0; _19 = 0; _1A = 0; @@ -238,13 +246,11 @@ MarioSwim::MarioSwim(MarioActor *actor) : MarioState(actor, 6), _F4() _14 = new MarineSnow(); } -void MarioSwim::init() -{ +void MarioSwim::init() { _EA = mActor->getConst().getTable()->mOxygenMax; } -inline f32 getSpecialNumber() -{ +inline f32 getSpecialNumber() { return 1.74532938004f; } @@ -471,29 +477,24 @@ bool MarioSwim::start() } */ -static inline f32 getTwoPi() -{ +static inline f32 getTwoPi() { return 6.28318548203f; } -static inline f32 funConversions1(u32 a, u16 tmp) -{ +static inline f32 funConversions1(u32 a, u16 tmp) { return a * getTwoPi() / tmp; } -static inline f32 funVecTime(const MarioSwim &self) -{ +static inline f32 funVecTime(const MarioSwim& self) { return self.getTrans().y - self._19C; } -static inline f32 funCalcTime() -{ - f32 tmp = 0.0f; // This line is included only to fix a register allocation mismatch +static inline f32 funCalcTime() { + f32 tmp = 0.0f; // This line is included only to fix a register allocation mismatch return 40.0f; } -f32 MarioSwim::getSurface() const -{ +f32 MarioSwim::getSurface() const { f32 fr1f = funVecTime(*this); f32 fr1e = funCalcTime(); f32 fr1d = 0.00999999977648f; @@ -508,19 +509,16 @@ f32 MarioSwim::getSurface() const return fr1f + fr1d * (fr1e * (MR::sin(ftmp + funConversions1(_24, tmp)) - 1.0f)); } -inline f32 procAngle(f32 l, f32 r) -{ +inline f32 procAngle(f32 l, f32 r) { return l * (1.0f - r); } // possibly related to other calculations that take similar form? (eg getSwimValue) -inline f32 calculate(f32 stick) -{ +inline f32 calculate(f32 stick) { return cLimitAngleSink + (cLimitAngleWait - cLimitAngleSink) * stick; } -static inline TVec3f createAndScale(f32 scalar, const TVec3f &v) -{ +static inline TVec3f createAndScale(f32 scalar, const TVec3f& v) { TVec3f ret(v); ret.scale(scalar); return ret; @@ -1108,8 +1106,7 @@ bool MarioSwim::update() * compiler does not cull these variables * */ -void dummyFunction() -{ +void dummyFunction() { cFrontAcc[0] = 1.0f; cFrontAccSpin[0] = 1.0f; cFrontAccSpinSurface[0] = 1.0f; diff --git a/src/Game/Player/MarioSwimDamage.cpp b/src/Game/Player/MarioSwimDamage.cpp index 8aa96e34b..54f380816 100644 --- a/src/Game/Player/MarioSwimDamage.cpp +++ b/src/Game/Player/MarioSwimDamage.cpp @@ -6,13 +6,11 @@ bool Mario::checkWaterDamage() { mMovementStates._1B = 0; mSwim->addDamage(_7C4); return true; - } - else if (mMovementStates._27) { + } else if (mMovementStates._27) { mMovementStates._27 = 0; mSwim->addFaint(_7C4); return true; - } - else { + } else { return false; } } diff --git a/src/Game/Player/MarioTask.cpp b/src/Game/Player/MarioTask.cpp index eb732d68d..d681203c8 100644 --- a/src/Game/Player/MarioTask.cpp +++ b/src/Game/Player/MarioTask.cpp @@ -1,7 +1,6 @@ #include "Game/Player/Mario.hpp" -void Mario::initTask() -{ +void Mario::initTask() { for (int i = 0; i < 0xb; i++) { _984[i] = nullptr; } diff --git a/src/Game/RhythmLib/AudBgmTempoAdjuster.cpp b/src/Game/RhythmLib/AudBgmTempoAdjuster.cpp index 51aecb0d7..0171db85c 100644 --- a/src/Game/RhythmLib/AudBgmTempoAdjuster.cpp +++ b/src/Game/RhythmLib/AudBgmTempoAdjuster.cpp @@ -19,7 +19,7 @@ void AudBgmTempoAdjuster::init() { _25 = false; } -void AudBgmTempoAdjuster::setStream(JAIStream *pStream) { +void AudBgmTempoAdjuster::setStream(JAIStream* pStream) { BOOL inter = OSDisableInterrupts(); init(); mStream = pStream; @@ -37,7 +37,7 @@ void AudBgmTempoAdjuster::reject() { f32 AudBgmTempoAdjuster::calcAdjustRate(f32 a1, f32 a2) { bool val = false; - f32 v4 = ((a1 - 500.0f) / (_4 * ((60.0f * AudParams::streamSampleRate) / a2))); + f32 v4 = ((a1 - 500.0f) / (_4 * ((60.0f * AudParams::streamSampleRate) / a2))); if (v4 < 0.0f) { val = true; diff --git a/src/Game/Ride/BigBubble.cpp b/src/Game/Ride/BigBubble.cpp index f88515a9d..84b9bfba5 100644 --- a/src/Game/Ride/BigBubble.cpp +++ b/src/Game/Ride/BigBubble.cpp @@ -19,7 +19,7 @@ namespace NrvBigBubble { NEW_NERVE(BigBubbleNrvEscape, BigBubble, Escape); NEW_NERVE(BigBubbleNrvGoal, BigBubble, Goal); NEW_NERVE(BigBubbleNrvMerged, BigBubble, Merged); -}; +}; // namespace NrvBigBubble /* BigBubble::BigBubble(const char *pName) : LiveActor(pName), _8C(0), _90(0), _94(0), _98(0), _9C(0), _148(0, 0, 0, 1), _158(0, 0, 0, 1) { @@ -85,18 +85,18 @@ void BigBubble::setActionType(s32 v1) { case 0: { _231 = false; _232 = true; - } + } default: { return; - } + } case 1: { _231 = false; _232 = false; - } + } } } -void BigBubble::setHost(LiveActor *mActor) { +void BigBubble::setHost(LiveActor* mActor) { this->_94 = mActor; } @@ -194,8 +194,7 @@ void BigBubble::exeWait() { addCoriolisAccel(); if (_22C) { MR::zeroVelocity(this); - } - else { + } else { updateNormalVelocity(); } if (tryAutoBreak()) { @@ -248,7 +247,7 @@ bool BigBubble::isBindMario() const { return _98; } -bool BigBubble::isDraw() const { +bool BigBubble::isDraw() const { return (!_22E && !_230 && !MR::isDead(this)); } @@ -306,6 +305,6 @@ void BigBubble::exeAppear() { BigBubble::~BigBubble() {} -MtxPtr BigBubble::getBaseMtx() const { +MtxPtr BigBubble::getBaseMtx() const { return (MtxPtr)&_118; } diff --git a/src/Game/Ride/Pole.cpp b/src/Game/Ride/Pole.cpp index 31f2ff938..e49d4d827 100644 --- a/src/Game/Ride/Pole.cpp +++ b/src/Game/Ride/Pole.cpp @@ -19,34 +19,33 @@ namespace NrvPole { NEW_NERVE(PoleNrvBindHandstandWait, Pole, BindHandstandWait); NEW_NERVE(PoleNrvBindHandstandEnd, Pole, BindHandstandEnd); NEW_NERVE(PoleNrvBindHandstandTurn, Pole, BindHandstandTurn); -}; +}; // namespace NrvPole -Pole::Pole(const char *pName) : - LiveActor(pName), - _8C(0.0f, 0.0f, 0.0f), - _98(0.0f, 0.0f, 0.0f), - _A4(0.0f), - _A8(false), - _A9(false), - _AA(false), - _AB(false), - _AC(false), - _B0(0.0f), - _B4(0.0f), - mActor(nullptr), - mInfo(nullptr), - _C0(0.0f, 0.0f, 0.0f), - _CC(1.0f, 0.0f, 0.0f), - _D8(0.0f, 1.0f, 0.0f), - _E4(0.0f, 0.0f, 1.0f), - _120(nullptr), - _124(nullptr) -{ +Pole::Pole(const char* pName) + : LiveActor(pName), + _8C(0.0f, 0.0f, 0.0f), + _98(0.0f, 0.0f, 0.0f), + _A4(0.0f), + _A8(false), + _A9(false), + _AA(false), + _AB(false), + _AC(false), + _B0(0.0f), + _B4(0.0f), + mActor(nullptr), + mInfo(nullptr), + _C0(0.0f, 0.0f, 0.0f), + _CC(1.0f, 0.0f, 0.0f), + _D8(0.0f, 1.0f, 0.0f), + _E4(0.0f, 0.0f, 1.0f), + _120(nullptr), + _124(nullptr) { _F0.identity(); _128.identity(); } -void Pole::init(const JMapInfoIter &rIter) { +void Pole::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); _8C.set(mPosition); f32 fNum = 100.0f * mScale.y; @@ -61,7 +60,7 @@ void Pole::init(const JMapInfoIter &rIter) { if (num == 1) { _AC = true; } - const char *name = nullptr; + const char* name = nullptr; MR::getObjectName(&name, rIter); if (strstr(name, "NoModel")) { _AA = true; @@ -99,19 +98,16 @@ void Pole::init(const JMapInfoIter &rIter) { initModelManagerWithAnm(name, nullptr, false); if (_AC) { MR::initCollisionParts(this, "Pole9m", getSensor("ride"), nullptr); - } - else { + } else { MR::initCollisionParts(this, name, getSensor("ride"), nullptr); } - } - else { + } else { _128.set(vec); if (MR::isEqualString(name, "PoleNoModel")) { - ResourceHolder *resource1 = MR::createAndAddResourceHolder("Pole.arc"); + ResourceHolder* resource1 = MR::createAndAddResourceHolder("Pole.arc"); MR::initCollisionPartsFromResourceHolder(this, "Pole", getSensor("ride"), resource1, _128.toMtxPtr()); - } - else { - ResourceHolder *resource2 = MR::createAndAddResourceHolder("PoleSquare.arc"); + } else { + ResourceHolder* resource2 = MR::createAndAddResourceHolder("PoleSquare.arc"); MR::initCollisionPartsFromResourceHolder(this, "PoleSquare", getSensor("ride"), resource2, _128.toMtxPtr()); } } @@ -123,8 +119,7 @@ void Pole::init(const JMapInfoIter &rIter) { MR::hideMaterial(this, "PoleTopStopMat_v"); } Pole::updateTopPos(_A4); - } - else { + } else { if (MR::isEqualString(name, "TreeCube")) { _A4 = 800.0f; } @@ -143,8 +138,7 @@ void Pole::init(const JMapInfoIter &rIter) { if (_AA) { MR::connectToSceneMapObjMovement(this); - } - else { + } else { MR::connectToSceneMapObj(this); } @@ -152,7 +146,7 @@ void Pole::init(const JMapInfoIter &rIter) { MR::initActorCamera(this, rIter, &mInfo); initNerve(&NrvPole::PoleNrvFree::sInstance); _C0.set(_D8); - f32 var1 = _A4; + f32 var1 = _A4; _C0.scale(var1 / 2); _C0.add(_8C); f32 var2 = _A4; @@ -161,8 +155,7 @@ void Pole::init(const JMapInfoIter &rIter) { if (MR::tryRegisterDemoCast(this, rIter)) { makeActorDead(); - } - else { + } else { makeActorAppeared(); } } @@ -216,10 +209,9 @@ void Pole::exeFreeInvalid() { void Pole::exeBindStart() { if (MR::isFirstStep(this)) { if (_A9) { - MR::startBckPlayer("SquarePoleStart", (const char *)nullptr); - } - else { - MR::startBckPlayer("TreeClimbStart", (const char *)nullptr); + MR::startBckPlayer("SquarePoleStart", (const char*)nullptr); + } else { + MR::startBckPlayer("TreeClimbStart", (const char*)nullptr); } } @@ -228,8 +220,8 @@ void Pole::exeBindStart() { if (isNerve(&NrvPole::PoleNrvBindStartFast::sInstance)) { num = 9.0f; } - J3DFrameCtrl* ctrl = MR::getBckCtrl(mActor); - s16 frame = ctrl->mEndFrame; + J3DFrameCtrl* ctrl = MR::getBckCtrl(mActor); + s16 frame = ctrl->mEndFrame; mRotation.y += (num * MR::getEaseOutValue(1.0f - ((f32)getNerveStep() / frame), 0.0f, 1.0f, 1.0f)); } @@ -242,11 +234,10 @@ void Pole::exeBindWait() { if (MR::isFirstStep(this)) { if (_A9) { if (!MR::isBckPlaying(mActor, "SquarePoleWait")) { - MR::startBckPlayer("SquarePoleWait", (const char *)nullptr); + MR::startBckPlayer("SquarePoleWait", (const char*)nullptr); } - } - else { - MR::startBckPlayer("TreeWait", (const char *)nullptr); + } else { + MR::startBckPlayer("TreeWait", (const char*)nullptr); } _B4 = 0.0f; } @@ -254,17 +245,16 @@ void Pole::exeBindWait() { if (!tryJump(false, 0.0f)) { if (!isNerve(&NrvPole::PoleNrvBindTurnEnd::sInstance)) { if (tryTurn()) { - return; + return; } - } - else if (!isEnableTurn()) { + } else if (!isEnableTurn()) { setNerve(&NrvPole::PoleNrvBindWait::sInstance); return; } if (!tryClimbUp()) { if (tryFallDown()) { - return; + return; } } } @@ -333,12 +323,11 @@ void Pole::exeBindTurn() { void Pole::exeBindClimbUp() { if (MR::isFirstStep(this)) { if (_A9) { - MR::startBckPlayer("SquarePoleClimb", (const char *)nullptr); + MR::startBckPlayer("SquarePoleClimb", (const char*)nullptr); MR::setBckRate(mActor, 1.6f); - } - else { - MR::startBckPlayer("TreeClimb", (const char *)nullptr); - MR::setBckRate(mActor, 1.75f); + } else { + MR::startBckPlayer("TreeClimb", (const char*)nullptr); + MR::setBckRate(mActor, 1.75f); } _B4 = 0.0f; } @@ -346,8 +335,7 @@ void Pole::exeBindClimbUp() { if (!tryJump(false, 0) && !tryTurn() && !tryFallDown()) { if (0.0f == getPoleSubPadStickY()) { setNerve(&NrvPole::PoleNrvBindWait::sInstance); - } - else { + } else { _B0 += 6.0f; if (_B0 > _A4) { _B0 = _A4; @@ -355,17 +343,15 @@ void Pole::exeBindClimbUp() { updateBindTrans(); setNerve(&NrvPole::PoleNrvBindHandstandStart::sInstance); return; - } - else if (_A9) { + } else if (_A9) { if (!MR::isBckPlaying(mActor, "SquarePolePushWait")) { - MR::startBckPlayer("SquarePolePushWait", (const char *)nullptr); + MR::startBckPlayer("SquarePolePushWait", (const char*)nullptr); } } - } - else { + } else { MR::tryRumblePadVeryWeak(this, 0); } - updateBindTrans(); + updateBindTrans(); } } } @@ -373,18 +359,16 @@ void Pole::exeBindClimbUp() { void Pole::exeBindFallDown() { if (MR::isFirstStep(this)) { if (_A9) { - MR::startBckPlayer("SquarePoleFall", (const char *)nullptr); - } - else { - MR::startBckPlayer("TreeFall", (const char *)nullptr); + MR::startBckPlayer("SquarePoleFall", (const char*)nullptr); + } else { + MR::startBckPlayer("TreeFall", (const char*)nullptr); } } if (_A9) { _B4 -= 0.5f; _B4 = _B4 >= -18.0f ? _B4 : -18.0f; - } - else { + } else { _B4 -= 0.3f; _B4 = _B4 >= -15.0f ? _B4 : -15.0f; } @@ -415,8 +399,7 @@ void Pole::exeBindFallDown() { MR::endBindAndPlayerWait(this); mActor = nullptr; setNerve(&NrvPole::PoleNrvFreeInvalid::sInstance); - } - else if(!tryJump(false, 0.0f) && !tryTurn() && !tryClimbUp()) { + } else if (!tryJump(false, 0.0f) && !tryTurn() && !tryClimbUp()) { if (0.0f == getPoleSubPadStickY()) { setNerve(&NrvPole::PoleNrvBindWait::sInstance); } @@ -425,7 +408,7 @@ void Pole::exeBindFallDown() { void Pole::exeBindHandstandStart() { if (MR::isFirstStep(this)) { - MR::startBckPlayer("TreeHandstandStart", (const char *)nullptr); + MR::startBckPlayer("TreeHandstandStart", (const char*)nullptr); MR::startSound(mActor, "SE_PM_POLE_STAND", -1, -1); MR::startSound(mActor, "SE_PV_LIFT_UP", -1, -1); } @@ -434,8 +417,7 @@ void Pole::exeBindHandstandStart() { if (Pole::tryJump(false, 0.0f)) { return; } - } - else { + } else { if (Pole::tryJump(true, 0.0f)) { return; } @@ -450,7 +432,7 @@ void Pole::exeBindHandstandStart() { void Pole::exeBindHandstandWait() { if (MR::isFirstStep(this)) { - MR::startBckPlayer("TreeHandstandWait", (const char *)nullptr); + MR::startBckPlayer("TreeHandstandWait", (const char*)nullptr); } if (!Pole::tryJump(true, 0.0f) && !Pole::tryHandstandTurn()) { @@ -462,23 +444,21 @@ void Pole::exeBindHandstandWait() { void Pole::exeBindHandstandEnd() { if (MR::isFirstStep(this)) { - MR::startBckPlayer("TreeHandstandEnd", (const char *)nullptr); + MR::startBckPlayer("TreeHandstandEnd", (const char*)nullptr); } if (MR::isLessStep(this, 25)) { if (tryJump(true, 0.0f)) { return; } - } - else if (tryJump(false, 0.0f)) { + } else if (tryJump(false, 0.0f)) { return; - } if (!tryTurn()) { if (MR::isBckStopped(mActor)) { setNerve(&NrvPole::PoleNrvBindWait::sInstance); - } + } } } @@ -499,15 +479,14 @@ void Pole::exeBindHandstandTurn() { } */ -void Pole::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { +void Pole::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (mActor && MR::isSensorRide(pSender)) { MR::tryGetItem(pSender, pReceiver); - } - else if (MR::isSensorPush(pSender)) { + } else if (MR::isSensorPush(pSender)) { switch (isNerve(&NrvPole::PoleNrvFreeInvalid::sInstance)) { case false: if (MR::isOnGroundPlayer()) { - MR::sendMsgPush(pReceiver, pSender); + MR::sendMsgPush(pReceiver, pSender); } break; default: @@ -516,7 +495,7 @@ void Pole::attackSensor(HitSensor *pSender, HitSensor *pReceiver) { } } -bool Pole::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool Pole::receiveMsgEnemyAttack(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (mActor && MR::isSensor(pReceiver, "bind")) { MR::endActorCamera(this, mInfo, true, -1); MR::endBindAndPlayerDamageMsg(this, msg); @@ -527,39 +506,34 @@ bool Pole::receiveMsgEnemyAttack(u32 msg, HitSensor *pSender, HitSensor *pReceiv return false; } -bool Pole::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { +bool Pole::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) { if (MR::isMsgIsRushTakeOver(msg)) { return true; - } - else { + } else { if (MR::isMsgAutoRushBegin(msg)) { if (MR::isOnGroundPlayer() || isNerve(&NrvPole::PoleNrvFreeInvalid::sInstance)) { return false; - } - else { + } else { TVec3f v23(*MR::getPlayerVelocity()); MR::vecKillElement(v23, _D8, &v23); f32 v8 = PSVECMag(&v23); f32 v11 = _D8.dot(*MR::getPlayerVelocity()); if (__fabsf(v8) < 5.0f && v11 > 1.0f) { return false; - } - else { + } else { TVec3f v22(mPosition); v22.sub(*MR::getPlayerPos()); MR::vecKillElement(v22, _D8, &v22); if (MR::isNearZero(v22, 0.001f)) { v22.set(_E4); - } - else { + } else { MR::normalize(&v22); } _F0.mult(v22, v22); v22.y = 0.0f; if (!MR::isNearZero(v22, 0.001f)) { MR::normalize(&v22); - } - else { + } else { v22.set(_E4); } mActor = pSender->mHost; @@ -569,17 +543,15 @@ bool Pole::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { mRotation.y = 90.0f * temp; } TVec3f v21(mPosition); - v21.sub(_8C); - _B0 = v21.dot(_D8); + v21.sub(_8C); + _B0 = v21.dot(_D8); f32 v16 = _A4; f32 temp; if (_B0 < 120.0f) { temp = 120.0f; - } - else if (_B0 > v16){ + } else if (_B0 > v16) { temp = v16; - } - else { + } else { temp = _B0; } _B0 = temp; @@ -592,20 +564,17 @@ bool Pole::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { MR::tryRumblePadWeak(this, 0); if (v8 > 10.0f) { setNerve(&NrvPole::PoleNrvBindStartFast::sInstance); - } - else { + } else { if (v8 > 6.0f) { - setNerve(&NrvPole::PoleNrvBindStart::sInstance); - } - else { + setNerve(&NrvPole::PoleNrvBindStart::sInstance); + } else { setNerve(&NrvPole::PoleNrvBindWait::sInstance); } - } - return false; + } + return false; } } - } - else if (MR::isMsgUpdateBaseMtx(msg)) { + } else if (MR::isMsgUpdateBaseMtx(msg)) { TMtx34f v24; TMtx34f v25; v25.identity(); @@ -626,8 +595,7 @@ bool Pole::receiveOtherMsg(u32 msg, HitSensor *pSender, HitSensor *pReceiver) { v25.mMtx[2][3] = mPosition.z; MR::setBaseTRMtx(mActor, v25.toMtxPtr()); return true; - } - else { + } else { if (MR::isMsgRushCancel(msg)) { if (!MR::isDemoActive()) { MR::startSound(mActor, "SE_PM_JUMP_M", -1, -1); @@ -701,10 +669,9 @@ bool Pole::tryTurn() { if (isEnableTurn()) { if (getPoleSubPadStickX() > 0.0f) { setNerve(&NrvPole::PoleNrvBindTurnLeft::sInstance); - } - else { + } else { setNerve(&NrvPole::PoleNrvBindTurnRight::sInstance); - } + } return true; } return false; @@ -735,9 +702,9 @@ bool Pole::tryHandstandTurn() { } bool Pole::isEnableTurn() const { - f32 num = __fabsf(getPoleSubPadStickX()); + f32 num = __fabsf(getPoleSubPadStickX()); - if ( num > 0.8f) { + if (num > 0.8f) { return true; } return false; @@ -749,7 +716,7 @@ void Pole::updateBindTrans() { mPosition.add(_8C); } -void Pole::calcGravityMtx(TPos3f *pos) { +void Pole::calcGravityMtx(TPos3f* pos) { pos->identity(); MR::calcGravity(this); TVec3f vec(-mGravity.x, -mGravity.y, -mGravity.z); @@ -775,8 +742,7 @@ f32 Pole::getPoleSubPadStickX() const { if (_AB) { f32 negNum = -MR::getSubPadStickX(WPAD_CHAN0); return negNum; - } - else { + } else { return MR::getSubPadStickX(WPAD_CHAN0); } } @@ -785,8 +751,7 @@ f32 Pole::getPoleSubPadStickY() const { if (_AB) { f32 negNum = -MR::getSubPadStickY(WPAD_CHAN0); return negNum; - } - else { + } else { return MR::getSubPadStickY(WPAD_CHAN0); } } @@ -794,8 +759,7 @@ f32 Pole::getPoleSubPadStickY() const { MtxPtr Pole::getBaseMtx() const { if (_AA) { return (MtxPtr)&_128; - } - else { + } else { return LiveActor::getBaseMtx(); } } diff --git a/src/Game/Ride/SphereAccelSensorController.cpp b/src/Game/Ride/SphereAccelSensorController.cpp index b9cb61bcd..a05114509 100644 --- a/src/Game/Ride/SphereAccelSensorController.cpp +++ b/src/Game/Ride/SphereAccelSensorController.cpp @@ -4,22 +4,19 @@ #include "JSystem/JMath/JMath.hpp" #include "revolution/wpad.h" -SphereAccelSensorController::SphereAccelSensorController() : - _58(0), _5C(0), _74(0), _78(0), - _7C(0.15f), _80(1.0f), _84(1.7f), _88(2.5f), - _8C(0), _90(0), - _94(1.0f), _98(0.0f), _9C(0.0f), _A0(0.0f), - _A4(-1.0f), _A8(0.0f), _AC(1.0f), - _B0(0), _B4(0.0f), _B8(0) -{ - +SphereAccelSensorController::SphereAccelSensorController() + : _58(0), _5C(0), _74(0), _78(0), + _7C(0.15f), _80(1.0f), _84(1.7f), _88(2.5f), + _8C(0), _90(0), + _94(1.0f), _98(0.0f), _9C(0.0f), _A0(0.0f), + _A4(-1.0f), _A8(0.0f), _AC(1.0f), + _B0(0), _B4(0.0f), _B8(0) { } void SphereAccelSensorController::getPadAcceleration(TVec3f* pAccel) { if (_B8 == 0) { MR::getCorePadAcceleration(pAccel, WPAD_CHAN0); - } - else { + } else { MR::getSubPadAcceleration(pAccel, WPAD_CHAN0); } } @@ -27,8 +24,7 @@ void SphereAccelSensorController::getPadAcceleration(TVec3f* pAccel) { bool SphereAccelSensorController::testBrake() const { if (_B8 == 0) { return MR::testCorePadButtonA(WPAD_CHAN0); - } - else { + } else { bool brake = false; if (MR::testSubPadButtonZ(WPAD_CHAN0) || MR::testSubPadButtonC(WPAD_CHAN0)) { brake = true; @@ -46,7 +42,6 @@ bool SphereAccelSensorController::doBrake() const { } void SphereAccelSensorController::update(const TVec3f&) { - } void SphereAccelSensorController::clacXY(f32* pX, f32* pY) { @@ -57,39 +52,35 @@ void SphereAccelSensorController::clacXY(f32* pX, f32* pY) { f32 d8; if (_B8 == 0) { d8 = 0.08726646f; // 0.5f * sin(5.0f) - } - else { + } else { d8 = 0.1745329f; // 1.0f * sin(1.0f) } f32 d5; if (_B8 == 0) { d5 = 0.4363323f; // 2.5f * sin(1.0f) - } - else { + } else { d5 = 0.6981317f; // 4.0f * sin(1.0f) } f32 d7; if (_B8 == 0) { d7 = 0.4363323f; // 2.5f * sin(1.0f) - } - else { + } else { d7 = 0.3926991f; // 2.25f * sin(1.0f) } f32 d4; if (_B8 == 0) { d4 = 0.1745329f; // 1.0f * sin(1.0f) - } - else { + } else { d4 = 0.7853982f; // 4.5f * sin(1.0f) } TVec3f padAccel; getPadAcceleration(&padAccel); - f32 d6 = 0.0f; + f32 d6 = 0.0f; TVec2f accelXY(padAccel.x, __fabsf(padAccel.y)); if (accelXY.dot(accelXY) > 0.0000038146973f) { @@ -98,7 +89,7 @@ void SphereAccelSensorController::clacXY(f32* pX, f32* pY) { d6 = JMAAsinRadian(accelXY.x); } - f32 d2 = 0.0f; + f32 d2 = 0.0f; TVec2f accelYZ(-padAccel.y, padAccel.z); if (accelYZ.dot(accelYZ) > 0.0000038146973f) { // if mag of accelYZ > 0.002f @@ -117,8 +108,7 @@ void SphereAccelSensorController::clacXY(f32* pX, f32* pY) { if (d4 >= 0.0f) { //v2.y = SOME_TABLE[(u32)(d4 * tableScaleValue)][0]; v2.y = 1.0f; // temp for now to get other code to match - } - else { + } else { //v2.y = -SOME_TABLE[(u32)(d4 * -tableScaleValue)][0]; v2.y = -1.0f; // temp for now to get other code to match } @@ -135,26 +125,22 @@ void SphereAccelSensorController::clacXY(f32* pX, f32* pY) { f32 x; if (d8 > __fabsf(d6)) { x = 0.0f; - } - else { + } else { if (d6 > 0.0f) { d6 -= d8; - } - else { + } else { d6 += d8; } x = d6 / (d5 - d8); } - + f32 y; if (d8 > __fabsf(d2)) { y = 0.0f; - } - else { + } else { if (d2 > 0.0f) { d2 -= d8; - } - else { + } else { d2 += d8; } y = d2 / (d7 - d8); @@ -165,9 +151,7 @@ void SphereAccelSensorController::clacXY(f32* pX, f32* pY) { } void SphereController::notifyDeactivate() { - } void SphereController::notifyActivate() { - } diff --git a/src/Game/Ride/SphereController.cpp b/src/Game/Ride/SphereController.cpp index 2242569a2..dd3a54469 100644 --- a/src/Game/Ride/SphereController.cpp +++ b/src/Game/Ride/SphereController.cpp @@ -1,9 +1,7 @@ #include "Game/Ride/SphereController.hpp" -SphereController::SphereController() : - _4(0) -{ - +SphereController::SphereController() + : _4(0) { } f32 SphereController::calcMoveVector(TVec3f* pDst, const TVec3f& rSrc) { @@ -11,7 +9,6 @@ f32 SphereController::calcMoveVector(TVec3f* pDst, const TVec3f& rSrc) { } void SphereController::update(const TVec3f& sSrc) { - } bool SphereController::doBrake() const { diff --git a/src/Game/Ride/SpherePadController.cpp b/src/Game/Ride/SpherePadController.cpp index 73ce28875..f12865f56 100644 --- a/src/Game/Ride/SpherePadController.cpp +++ b/src/Game/Ride/SpherePadController.cpp @@ -7,8 +7,7 @@ #include "JSystem/JGeometry/TUtil.hpp" #include "revolution/wpad.h" - -template<> +template <> void TRot3f::setRotate(const TVec3f& v1, const TVec3f& v2) { // warning, does not match because of the quaternion rotation inline // though logic is correct. @@ -17,10 +16,8 @@ void TRot3f::setRotate(const TVec3f& v1, const TVec3f& v2) { this->setRotateQuaternionInline(q); } -SpherePadController::SpherePadController() : - SphereController() -{ - +SpherePadController::SpherePadController() + : SphereController() { } f32 SpherePadController::calcMoveVector(TVec3f* v1, const TVec3f& v2) { @@ -35,7 +32,6 @@ f32 SpherePadController::calcJumpPower() const { } void SpherePadController::update(const TVec3f&) { - } void SpherePadController::clacXY(f32* x, f32* y) { @@ -78,16 +74,14 @@ f32 SpherePadController::calcDirSphereMove(TVec3f* v1, const TVec3f& v2, u32 u1) rotMtx.mult33(dirX); rotMtx.mult33(dirY); v1->set(-dirX * x - dirY * y); - } - else { + } else { rotMtx.setRotate(dirY, -v2); rotMtx.mult33(dirX); rotMtx.mult33(dirZ); v1->set(dirX * x - dirZ * y); } MR::separateScalarAndDirection(&mag, v1, *v1); - } - else { + } else { v1->z = 0.0f; v1->y = 0.0f; v1->x = 0.0f; @@ -96,6 +90,6 @@ f32 SpherePadController::calcDirSphereMove(TVec3f* v1, const TVec3f& v2, u32 u1) if (mag > 1.0f) { mag = 1.0f; } - + return mag; } diff --git a/src/Game/Ride/SurfRay.cpp b/src/Game/Ride/SurfRay.cpp index 1af1f59f7..53844f375 100644 --- a/src/Game/Ride/SurfRay.cpp +++ b/src/Game/Ride/SurfRay.cpp @@ -2,7 +2,6 @@ #include "Game/LiveActor/MaterialCtrl.hpp" #include "Game/LiveActor/ActorJointCtrl.hpp" - namespace NrvSurfRay { NEW_NERVE(SurfRayNrvWaitPlayer, SurfRay, WaitPlayer); NEW_NERVE(SurfRayNrvTurnToWait, SurfRay, TurnToWait); @@ -19,7 +18,7 @@ namespace NrvSurfRay { NEW_NERVE(SurfRayNrvWipeOut, SurfRay, WipeOut); NEW_NERVE(SurfRayNrvWipeIn, SurfRay, WipeIn); NEW_NERVE(SurfRayNrvReady, SurfRay, Ready); -}; +}; // namespace NrvSurfRay inline f32 min(f32 a, f32 b) { if (a >= b) { @@ -32,8 +31,8 @@ namespace { bool calcWaterShadowPos(TVec3f* pShadowPos, const TVec3f& pStartPos, const TVec3f& pShadowDir) { pShadowPos->set(pStartPos); TVec3f sample(pStartPos); - int count = 0; - bool test; + int count = 0; + bool test; do { WaterInfo waterInfo = WaterInfo(); if (MR::getWaterAreaObj(&waterInfo, sample)) { @@ -47,52 +46,50 @@ namespace { } while (++count < 10); return false; } -} +} // namespace -SurfRay::SurfRay(const char* pName, s32 pChannel) : - LiveActor(pName), - mSurfSpeed(0.0f), - mOrthoSpeed(0.0f), - mOrthoVelocity(0.0f, 0.0f, 0.0f), - mSteerRate(0.0f), - mSteerAccel(0.0f), - mFront(0.0f, 0.0f, 1.0f), - mUp(0.0f, 1.0f, 0.0f), - mSide(1.0f, 0.0f, 0.0f), - mBaseUp(0.0f, 1.0f, 0.0f), - mBaseSide(1.0f, 0.0f, 0.0f), - mGroundNormal(0.0f, 1.0f, 0.0f), - mWarpPos(0.0f, 0.0f, 0.0f), - mRider(nullptr), - mChannel(pChannel), - mRayTilt(0.0f), - mInWater(false), - mAirtime(0), - mWaterNormal(0.0f, 1.0f, 0.0f), - mTwistBufferSize(8), - mWaterShadowPos(0.0f, 0.0f, 0.0f), - mShadowAlpha(0.0f), - mTwistBuffer(nullptr), - mInTutorialArea(false), - mInTutorial(false), - mLectureIdx(0), - mActorJointCtrl(nullptr), - mProjmapFxMtxSetter(nullptr) -{ +SurfRay::SurfRay(const char* pName, s32 pChannel) + : LiveActor(pName), + mSurfSpeed(0.0f), + mOrthoSpeed(0.0f), + mOrthoVelocity(0.0f, 0.0f, 0.0f), + mSteerRate(0.0f), + mSteerAccel(0.0f), + mFront(0.0f, 0.0f, 1.0f), + mUp(0.0f, 1.0f, 0.0f), + mSide(1.0f, 0.0f, 0.0f), + mBaseUp(0.0f, 1.0f, 0.0f), + mBaseSide(1.0f, 0.0f, 0.0f), + mGroundNormal(0.0f, 1.0f, 0.0f), + mWarpPos(0.0f, 0.0f, 0.0f), + mRider(nullptr), + mChannel(pChannel), + mRayTilt(0.0f), + mInWater(false), + mAirtime(0), + mWaterNormal(0.0f, 1.0f, 0.0f), + mTwistBufferSize(8), + mWaterShadowPos(0.0f, 0.0f, 0.0f), + mShadowAlpha(0.0f), + mTwistBuffer(nullptr), + mInTutorialArea(false), + mInTutorial(false), + mLectureIdx(0), + mActorJointCtrl(nullptr), + mProjmapFxMtxSetter(nullptr) { mEffectHostMtx.identity(); } void SurfRay::init(const JMapInfoIter& pMapInfoIter) { if (MR::hasRetryGalaxySequence()) { MR::resetPosition(this, "スタート位置（サーフィン）"); - } - else { + } else { MR::initDefaultPos(this, pMapInfoIter); } resetAllInfo(); initModelManagerWithAnm("SurfRay", 0, this != nullptr); - + mProjmapFxMtxSetter = MR::initDLMakerProjmapEffectMtxSetter(this); MR::newDifferedDLBuffer(this); mProjmapFxMtxSetter->updateMtxUseBaseMtx(); @@ -105,7 +102,7 @@ void SurfRay::init(const JMapInfoIter& pMapInfoIter) { initHitSensor(2); MR::addHitSensorRide(this, "body", 8, 260.0f, TVec3f(0.0f, 0.0f, 0.0f)); MR::addHitSensorBinder(this, "bind", 8, 300.0f, TVec3f(0.0f, 0.0f, 0.0f)); - + initBinder(200.0f, 50.0f, 8); initEffectKeeper(0, 0, false); MR::setEffectHostMtx(this, "Ripple", mEffectHostMtx); @@ -128,11 +125,10 @@ void SurfRay::init(const JMapInfoIter& pMapInfoIter) { mTwistBuffer = new f32[mTwistBufferSize]; for (s32 count = 0; count < mTwistBufferSize; count++) { mTwistBuffer[count] = 0.0f; - } MR::joinToGroupArray(this, pMapInfoIter, 0, 32); - if (!MR::hasRetryGalaxySequence()){ + if (!MR::hasRetryGalaxySequence()) { mInTutorialArea = true; } @@ -220,7 +216,7 @@ void SurfRay::exeRideJump() { if (MR::isFirstStep(this)) { MR::startBckPlayerJ("サーフィンジャンプ"); MR::startBck(this, "Jump", 0); - MR::startSound(mRider,"SE_PV_JUMP_S",-1,-1); + MR::startSound(mRider, "SE_PV_JUMP_S", -1, -1); } if (!updateRide() && mVelocity.dot(mGravity) > 0.0f) { @@ -232,7 +228,7 @@ void SurfRay::exeRideJumpHigh() { if (MR::isFirstStep(this)) { MR::startBckPlayerJ("サーフィンハイジャンプ"); MR::startBck(this, "Jump", 0); - MR::startSound(mRider,"SE_PV_JUMP_JOY",-1,-1); + MR::startSound(mRider, "SE_PV_JUMP_JOY", -1, -1); } if (!updateRide() && mVelocity.dot(mGravity) > 0.0f) { @@ -248,7 +244,7 @@ void SurfRay::exeRideFall() { if (!updateRide() && mVelocity.dot(mGravity) > 0.0f && mInWater) { setNerve(&NrvSurfRay::SurfRayNrvRideLand::sInstance); - MR::startSound(this,"SE_SM_SURF_RAY_LANDW",-1,-1); + MR::startSound(this, "SE_SM_SURF_RAY_LANDW", -1, -1); } } @@ -268,7 +264,7 @@ void SurfRay::exeTutorial() { updateRide(); mOrthoVelocity.mult(0.5f); mFront.set(v1); - + mSurfSpeed = 0.0f; mRotation.z *= 0.85f; @@ -278,22 +274,22 @@ void SurfRay::exeTutorial() { MR::startBckPlayerJ("サーフィン着地"); MR::startBck(this, "Land", 0); } - if (MR::isBckOneTimeAndStoppedPlayer()){ - MR::startBckPlayer("SurfLectureUnbalance", (const char *)0); + if (MR::isBckOneTimeAndStoppedPlayer()) { + MR::startBckPlayer("SurfLectureUnbalance", (const char*)0); } - if (MR::isBckOneTimeAndStopped(this)){ + if (MR::isBckOneTimeAndStopped(this)) { MR::startBck(this, "LectureUnbalance", 0); } break; case 2: if (MR::isFirstStep(this)) { - MR::startBckPlayer("SurfLectureUnbalance", (const char *)0); + MR::startBckPlayer("SurfLectureUnbalance", (const char*)0); MR::startBck(this, "LectureUnbalance", 0); } break; case 3: if (MR::isFirstStep(this)) { - MR::startBckPlayer("SurfRide", (const char *)0); + MR::startBckPlayer("SurfRide", (const char*)0); MR::startBck(this, "Wait", 0); } break; @@ -301,14 +297,14 @@ void SurfRay::exeTutorial() { case 8: case 12: if (MR::isFirstStep(this)) { - MR::startBckPlayer("SurfLectureAnswer", (const char *)0); + MR::startBckPlayer("SurfLectureAnswer", (const char*)0); MR::startBck(this, "LectureAnswer", 0); - MR::startSound(this,"SE_SM_SURF_RAY_JUMPOUT1",-1,-1); + MR::startSound(this, "SE_SM_SURF_RAY_JUMPOUT1", -1, -1); } - if (MR::isBckOneTimeAndStoppedPlayer()){ - MR::startBckPlayer("SurfRideLoop", (const char *)0); + if (MR::isBckOneTimeAndStoppedPlayer()) { + MR::startBckPlayer("SurfRideLoop", (const char*)0); } - if (MR::isBckOneTimeAndStopped(this)){ + if (MR::isBckOneTimeAndStopped(this)) { MR::startBck(this, "Wait", 0); } break; @@ -317,7 +313,7 @@ void SurfRay::exeTutorial() { case 9: case 10: if (MR::isFirstStep(this)) { - MR::startBckPlayer("SurfRideLoop", (const char *)0); + MR::startBckPlayer("SurfRideLoop", (const char*)0); MR::startBck(this, "Wait", 0); } break; @@ -326,12 +322,11 @@ void SurfRay::exeTutorial() { if (MR::isFirstStep(this)) { MR::startBckPlayerJ("サーフィン傾き開始"); } - + f32 rot = __fabsf((mRotation.z / 70.0f) * 0.6f); if (mRotation.z < 0.0f) { MR::setBckBlendWeight(1.0f - rot, rot, 0.0f); - } - else { + } else { MR::setBckBlendWeight(1.0f - rot, 0.0f, rot); } break; @@ -340,8 +335,6 @@ void SurfRay::exeTutorial() { default: break; } - - } void SurfRay::exeWipeOut() { @@ -386,7 +379,6 @@ void SurfRay::exeReady() { mOrthoVelocity.mult(0.5f); mSurfSpeed = 0.0f; mRotation.z = 0.0f; - } void SurfRay::control() { @@ -439,8 +431,7 @@ bool SurfRay::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) if (MR::isMsgAutoRushBegin(msg)) { if (MR::getPlayerVelocity()->y > 0.0f) { // inline MarioAccess::getVelocity ?? return false; - } - else { + } else { mRider = MR::getSensorHost(pSender); MR::startStarPointerMode1PInvalid2PValid(this); MR::invalidateClipping(this); @@ -454,49 +445,48 @@ bool SurfRay::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) mActorJointCtrl->resetDynamicCtrl(); if (mInTutorial) { setNerve(&NrvSurfRay::SurfRayNrvTutorial::sInstance); - } - else { + } else { setNerve(&NrvSurfRay::SurfRayNrvReady::sInstance); } return true; } } - + if (MR::isMsgUpdateBaseMtx(msg)) { updateRiderMtx(); return true; } - + if (MR::isMsgRushCancel(msg)) { mRider = nullptr; setNerve(&NrvSurfRay::SurfRayNrvRideFree::sInstance); return true; } - + if (MR::isMsgTutorialStart(msg)) { MR::setPlayerPos(mPosition); mInTutorial = true; return true; } - + if (MR::isMsgTutorialNext(msg)) { mLectureIdx++; setNerve(&NrvSurfRay::SurfRayNrvTutorial::sInstance); return true; } - + if (MR::isMsgTutorialPrev(msg)) { mLectureIdx--; setNerve(&NrvSurfRay::SurfRayNrvTutorial::sInstance); return true; } - + if (MR::isMsgTutorialPass(msg)) { mInTutorial = false; setNerve(&NrvSurfRay::SurfRayNrvRideFree::sInstance); return true; } - + if (MR::isMsgTutorialOmit(msg)) { mInTutorialArea = false; MR::resetPosition(this, "スタート位置（サーフィン）"); @@ -506,17 +496,17 @@ bool SurfRay::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) MR::resetCameraMan(); return true; } - + if (MR::isMsgRaceReady(msg)) { setNerve(&NrvSurfRay::SurfRayNrvReady::sInstance); return true; } - + if (MR::isMsgRaceStart(msg)) { setNerve(&NrvSurfRay::SurfRayNrvRideFree::sInstance); return true; } - + if (MR::isMsgRaceReset(msg)) { MR::endBindAndPlayerWait(this); resetAllInfo(); @@ -525,19 +515,19 @@ bool SurfRay::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver) kill(); return true; } - + return false; } void SurfRay::resetAllInfo() { TRot3f rotMtx; rotMtx.identity(); - MR::makeMtxRotate(reinterpret_cast(&rotMtx),mRotation); - + MR::makeMtxRotate(reinterpret_cast(&rotMtx), mRotation); + rotMtx.getXDirInline(mSide); rotMtx.getYDirInline(mUp); rotMtx.getZDirInline(mFront); - + mBaseUp.set(mUp); mBaseSide.set(mSide); @@ -561,16 +551,16 @@ bool SurfRay::updateRideAccel() { if (updateRide()) { return true; } - + if (tryJumpOrFall()) { return true; } - + if (!MR::testCorePadButtonA(mChannel)) { setNerve(&NrvSurfRay::SurfRayNrvRideFree::sInstance); return true; } - + return false; } @@ -578,7 +568,7 @@ bool SurfRay::updateRideFree() { if (updateRide()) { return true; } - + if (tryJumpOrFall()) { return true; } @@ -587,7 +577,7 @@ bool SurfRay::updateRideFree() { setNerve(&NrvSurfRay::SurfRayNrvRideAccel::sInstance); return true; } - + return false; } @@ -596,8 +586,7 @@ bool SurfRay::updateRide() { mInTutorialArea = false; setNerve(&NrvSurfRay::SurfRayNrvWipeOut::sInstance); return true; - } - else { + } else { MR::calcGravity(this); updateToWater(); updateInfo(); @@ -613,18 +602,16 @@ void SurfRay::updateInfo() { if (MR::isBindedGround(this)) { f32 sfxLvl = MR::getLinerValueFromMinMax(mSurfSpeed, 0.0f, 40.0f, 100.0f, 1000.0f); MR::startLevelSound(this, "SE_SM_LV_SURF_RAY_LAND", sfxLvl, -1, -1); - if (MR::reboundVelocityFromCollision(this, 0.3f, 10.0f, 1.0f) - && PSVECMag(&mVelocity) > 5.0f) { + if (MR::reboundVelocityFromCollision(this, 0.3f, 10.0f, 1.0f) && PSVECMag(&mVelocity) > 5.0f) { MR::tryRumblePadMiddle(this, mChannel); } } if (MR::isBindedWall(this)) { if (mVelocity.dot(*MR::getWallNormal(this)) < -10.0f) { - MR::startSound(this,"SE_SM_SURF_RAY_HIT_WALL",-1,-1); + MR::startSound(this, "SE_SM_SURF_RAY_HIT_WALL", -1, -1); } - if (MR::reboundVelocityFromCollision(this, 0.8f, 10.0f, 1.0f) - && PSVECMag(&mVelocity) > 5.0f) { + if (MR::reboundVelocityFromCollision(this, 0.8f, 10.0f, 1.0f) && PSVECMag(&mVelocity) > 5.0f) { MR::tryRumblePadMiddle(this, mChannel); } } @@ -641,8 +628,7 @@ void SurfRay::updateToMap() { TVec3f v1(mGravity); if (mInWater) { v1.scale(0.1); - } - else { + } else { v1.scale(0.8); } mOrthoVelocity.add(v1); @@ -661,11 +647,9 @@ void SurfRay::updateToMap() { MR::vecBlend(mFront, v2, &v3, 0.1); PSVECCrossProduct(&mBaseUp, &v3, &mBaseSide); } - } - else if (mInWater) { + } else if (mInWater) { MR::vecBlendSphere(mBaseUp, mWaterNormal, &mBaseUp, 0.1f); - } - else { + } else { TVec3f v4(mGravity); v4.scale(-1.0f); MR::vecBlendSphere(mBaseUp, v4, &mBaseUp, 0.02f); @@ -685,13 +669,10 @@ void SurfRay::updateToWater() { if (mAirtime > 80 && PSVECMag(&mOrthoVelocity) > 20.0f) { MR::startSound(this, "SE_SM_SURF_RAY_JUMPIN2", -1, -1); - } - else if (mAirtime > 5 && PSVECMag(&mOrthoVelocity) > 10.0f) { + } else if (mAirtime > 5 && PSVECMag(&mOrthoVelocity) > 10.0f) { MR::startSound(this, "SE_SM_SURF_RAY_JUMPIN1", lvl, -1); - } - else { + } else { MR::startSound(this, "SE_SM_SURF_RAY_JUMPIN0", lvl, -1); - } } @@ -708,16 +689,14 @@ void SurfRay::updateToWater() { if (innerProd > 0.0f && mWaterInfo._4 < innerProd) { TVec3f v2(mGravity); mVelocity.sub(mGravity.scaleInline(innerProd).scaleInline(1.5f)); - } - else { + } else { f32 camWaterDepth = mWaterInfo.mCamWaterDepth; f32 waveHeight = mWaterInfo.mWaveHeight; f32 f0 = camWaterDepth + waveHeight; mVelocity.sub(mGravity.scaleInline(f0).scaleInline(0.01f)); } - - } - else { + + } else { if (mInWater) { f32 lvl = MR::getLinerValueFromMinMax(mSurfSpeed, 0.0f, 30.0f, 200.0f, 1000.0f); MR::startSound(this, "SE_SM_SURF_RAY_JUMPOUT1", lvl, -1); @@ -727,25 +706,22 @@ void SurfRay::updateToWater() { } WaterInfo waterInfo; - TVec3f v(mPosition.addOperatorInLine(mGravity.scaleInline(20.0f))); + TVec3f v(mPosition.addOperatorInLine(mGravity.scaleInline(20.0f))); if (MR::getWaterAreaObj(&waterInfo, v)) { mShadowAlpha -= 10.0f; - } - else if (calcWaterShadowPos(&mWaterShadowPos, mPosition, mGravity)) { + } else if (calcWaterShadowPos(&mWaterShadowPos, mPosition, mGravity)) { mShadowAlpha += 10.0f; - } - else { + } else { mShadowAlpha -= 10.0f; } mShadowAlpha = MR::clamp(mShadowAlpha, 0.0f, 64.0f); MR::setShadowSurfaceOvalAlpha(this, 0, (u8)mShadowAlpha & 0xff); } -void SurfRay::updateAccel(){ - if (MR::testCorePadButtonA(mChannel)){ +void SurfRay::updateAccel() { + if (MR::testCorePadButtonA(mChannel)) { mSurfSpeed += 0.5f; - } - else { + } else { mSurfSpeed *= 0.99f; } mSurfSpeed = MR::clamp(mSurfSpeed, 0.0f, 40.0f); @@ -754,18 +730,15 @@ void SurfRay::updateAccel(){ MR::tryDeleteEffect(this, "SwimSplash"); MR::tryDeleteEffect(this, "RunDashSplash"); MR::tryDeleteEffect(this, "Ripple"); - } - else if (mSurfSpeed > 20.0f) { + } else if (mSurfSpeed > 20.0f) { MR::tryEmitEffect(this, "RunDashSplash"); MR::tryDeleteEffect(this, "SwimSplash"); MR::tryDeleteEffect(this, "Ripple"); - } - else if (mSurfSpeed > 6.0f) { + } else if (mSurfSpeed > 6.0f) { MR::tryEmitEffect(this, "SwimSplash"); MR::tryDeleteEffect(this, "RunDashSplash"); MR::tryDeleteEffect(this, "Ripple"); - } - else { + } else { MR::tryEmitEffect(this, "Ripple"); MR::tryDeleteEffect(this, "RunDashSplash"); MR::tryDeleteEffect(this, "SwimSplash"); @@ -774,8 +747,7 @@ void SurfRay::updateAccel(){ if (MR::isBinded(this)) { mOrthoVelocity.mult(0.9f); - } - else { + } else { mOrthoVelocity.mult(0.995f); } @@ -800,25 +772,22 @@ void SurfRay::updateRotate() { if (twistAngle > 0.0f) { twistAngle += clamp_z; - } - else if (twistAngle < 0.0f) { + } else if (twistAngle < 0.0f) { twistAngle -= clamp_z; } steerAccel = MR::clamp(twistAngle, -1.5f, 1.5f); accel_x = accel.x; - + if (accel_x < 0.0f) { f32 tiltClamp = MR::clamp(accel_x, -1.0f, 0.0f); mRayTilt = MR::getInterpolateValue(0.3f, mRayTilt, tiltClamp); - } - else if (accel_x > 0.0f) { + } else if (accel_x > 0.0f) { f32 tiltClamp = MR::clamp(accel_x, 0.0f, 1.0f); mRayTilt = MR::getInterpolateValue(0.3f, mRayTilt, tiltClamp); } - - } - else { + + } else { mRayTilt = MR::getInterpolateValue(0.3f, mRayTilt, 0.0f); steerAccel = mSteerAccel * 0.95f; } @@ -826,12 +795,11 @@ void SurfRay::updateRotate() { mSteerAccel = steerAccel; mSteerRate += steerAccel; mSteerRate = MR::clamp(mSteerRate, -30.0f, 30.0f); - } - else { + } else { mRayTilt = MR::getInterpolateValue(0.3f, mRayTilt, 0.0f); mSteerAccel = 0.0f; } - + mSteerRate *= 0.95f; f32 abs = __fabsf(mSteerRate); if (abs < 0.1f) { @@ -841,12 +809,11 @@ void SurfRay::updateRotate() { mRotation.z *= 0.7f; mRotation.z += mSteerRate; mRotation.z = MR::clamp(mRotation.z, -70.0f, 70.0f); - + f32 rayTilt = MR::clamp(mRayTilt * 1.2f, -1.0f, 1.0f); if (rayTilt > 0.0f) { MR::setBckBlendWeight(1.0f - rayTilt, 0.0f, rayTilt); - } - else { + } else { MR::setBckBlendWeight(rayTilt + 1.0f, -rayTilt, 0.0f); } @@ -854,14 +821,13 @@ void SurfRay::updateRotate() { mtx.identity(); mtx.setRotateInline(mBaseUp, -mRotation.z * 0.00028f); mtx.mult(mFront, mFront); - + int idx = mTwistBufferSize - 1; while (idx >= 1) { - mTwistBuffer[idx] = mTwistBuffer[idx-1]; + mTwistBuffer[idx] = mTwistBuffer[idx - 1]; idx--; } mTwistBuffer[0] = accel_x; - } void SurfRay::updateSound() { @@ -869,8 +835,7 @@ void SurfRay::updateSound() { if (mSurfSpeed > 2.5f && mSurfSpeed < 25.0f) { if (mSurfSpeed < 14.0f) { lvl = MR::getLinerValueFromMinMax(mSurfSpeed, 2.5f, 7.5f, 0.1f, 1.0f); - } - else { + } else { lvl = MR::getLinerValueFromMinMax(mSurfSpeed, 14.0f, 25.0f, 1.0f, 0.0f); } MR::startLevelSound(this, "SE_SM_LV_SURF_RAY_MOVE0", lvl * 1000.0f, -1, -1); @@ -897,18 +862,16 @@ void SurfRay::updateSound() { } } - if (PSVECMag(&mVelocity) > 32.0f) { lvl = MR::getLinerValueFromMinMax(PSVECMag(&mVelocity), 32.0f, 50.0f, 0.1f, 1.0f); MR::startLevelSound(this, "SE_SM_SURF_RAY_MOVE_WIND", lvl * 1000.0f, -1, -1); } - + f32 normalizeZ = __fabsf(mRotation.z) / 70.0f; if (mInWater && normalizeZ > 0.45f) { lvl = MR::getLinerValueFromMinMax(mSurfSpeed, 0.0f, 25.0f, 100.0f, 1000.0f); MR::startLevelSound(this, "SE_SM_LV_SURF_RAY_CURVE", lvl, -1, -1); } - } void SurfRay::updateRiderMtx() { @@ -932,7 +895,7 @@ bool SurfRay::tryInWater() { if (MR::getWaterAreaObj(&mWaterInfo, v1)) { return true; } - + TVec3f v2(mUp.scaleInline(150.0f).addOperatorInLine(mPosition)); if (MR::getWaterAreaObj(&mWaterInfo, v2)) { return true; @@ -967,7 +930,7 @@ bool SurfRay::tryInWater() { bool SurfRay::tryJumpOrFall() { if (MR::isPadSwing(0) && (MR::isBinded(this) || mWaterInfo.isInWater() || mAirtime < 15)) { - f32 f0 = (mSurfSpeed / 40.0f) * (((70.0f - __fabsf(mRotation.z)) * 5.0f) / 70.0f) + 15.0f; + f32 f0 = (mSurfSpeed / 40.0f) * (((70.0f - __fabsf(mRotation.z)) * 5.0f) / 70.0f) + 15.0f; TVec3f v1(mGroundNormal); if (mWaterInfo.isInWater()) { @@ -989,17 +952,14 @@ bool SurfRay::tryJumpOrFall() { if (PSVECMag(&mOrthoVelocity) > 23.0f) { setNerve(&NrvSurfRay::SurfRayNrvRideJumpHigh::sInstance); - } - else { + } else { setNerve(&NrvSurfRay::SurfRayNrvRideJump::sInstance); } return true; - } - else if (mAirtime > 45) { + } else if (mAirtime > 45) { setNerve(&NrvSurfRay::SurfRayNrvRideFall::sInstance); return true; - } - else { + } else { return false; } } @@ -1007,7 +967,7 @@ bool SurfRay::tryJumpOrFall() { bool SurfRay::isTwistStart() const { u32 idx = 1; f32 maxTwist = 0.0f; - + for (s32 cnt = mTwistBufferSize; cnt > 1; cnt--) { f32 twistDiff = __fabsf(mTwistBuffer[0] - mTwistBuffer[idx]); if (twistDiff > maxTwist) { @@ -1021,15 +981,13 @@ bool SurfRay::isTwistStart() const { bool SurfRay::isRotateStart() const { // wow.. *this* matches... - + if (mInTutorial) { if (mLectureIdx == 7 || mLectureIdx == 11) { return true; } return false; - } - else { + } else { return mSurfSpeed > 3.0f || MR::testCorePadButtonA(mChannel); } - } diff --git a/src/Game/Ride/SurfRayTutorial.cpp b/src/Game/Ride/SurfRayTutorial.cpp index fa4680566..16c6a40e1 100644 --- a/src/Game/Ride/SurfRayTutorial.cpp +++ b/src/Game/Ride/SurfRayTutorial.cpp @@ -23,7 +23,7 @@ namespace NrvSurfRayTutorial { NEW_NERVE(SurfRayTutorialNrvTutorialTurnRightUpkeep, SurfRayTutorial, TutorialTurnRightUpkeep); NEW_NERVE(SurfRayTutorialNrvTutorialTurnRightSuccess, SurfRayTutorial, TutorialTurnRightSuccess); NEW_NERVE(SurfRayTutorialNrvTutorialAllEnd, SurfRayTutorial, TutorialAllEnd); -}; +}; // namespace NrvSurfRayTutorial namespace { static const s32 sStepTalk = 150; @@ -34,17 +34,16 @@ namespace { // static const f32 sPadAccelTurnMinX = _; // static const f32 sPadAccelTurnLimitZ = _; // static const f32 sPadAccelTurnLimitY = _; -}; +}; // namespace -SurfRayTutorial::SurfRayTutorial(LiveActor* pHost, TalkMessageCtrl* pTalkCtrl, const JMapInfoIter& rIter) : - NerveExecutor("チュートリアル演出"), - mHost(pHost), - mIsTutorialPass(false), - mPadAccel(0.0f, 0.0f, 0.0f), - mTalkCtrl(pTalkCtrl), - mChangeStep(0), - _28(0) -{ +SurfRayTutorial::SurfRayTutorial(LiveActor* pHost, TalkMessageCtrl* pTalkCtrl, const JMapInfoIter& rIter) + : NerveExecutor("チュートリアル演出"), + mHost(pHost), + mIsTutorialPass(false), + mPadAccel(0.0f, 0.0f, 0.0f), + mTalkCtrl(pTalkCtrl), + mChangeStep(0), + _28(0) { initNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialAllStart::sInstance); mSurfingGuidance = new SurfingGuidance(); @@ -94,8 +93,7 @@ void SurfRayTutorial::exeTutorialStraightFailure() { if (mChangeStep++ == sStepToOK) { nextTutorial(); } - } - else { + } else { mChangeStep = 0; } @@ -124,8 +122,7 @@ void SurfRayTutorial::exeTutorialStraightUpkeep() { nextTutorial(); return; } - } - else if (mChangeStep++ == sStepToOK) { + } else if (mChangeStep++ == sStepToOK) { prevTutorial(); MR::startSystemSE("SE_SY_SURF_TUTORIAL_NG", -1, -1); mSurfingGuidance->levelOffReady(); @@ -169,8 +166,7 @@ void SurfRayTutorial::exeTutorialTurnLeftFailure() { if (mChangeStep++ == sStepToOK) { nextTutorial(); } - } - else { + } else { mChangeStep = 0; } @@ -199,8 +195,7 @@ void SurfRayTutorial::exeTutorialTurnLeftUpkeep() { nextTutorial(); return; } - } - else if (mChangeStep++ == sStepToOK) { + } else if (mChangeStep++ == sStepToOK) { prevTutorial(); MR::startSystemSE("SE_SY_SURF_TUTORIAL_NG", -1, -1); mSurfingGuidance->turnLeftReady(); @@ -244,8 +239,7 @@ void SurfRayTutorial::exeTutorialTurnRightFailure() { if (mChangeStep++ == sStepToOK) { nextTutorial(); } - } - else { + } else { mChangeStep = 0; } @@ -274,8 +268,7 @@ void SurfRayTutorial::exeTutorialTurnRightUpkeep() { nextTutorial(); return; } - } - else if (mChangeStep++ == sStepToOK) { + } else if (mChangeStep++ == sStepToOK) { prevTutorial(); MR::startSystemSE("SE_SY_SURF_TUTORIAL_NG", -1, -1); mSurfingGuidance->turnRightReady(); @@ -311,9 +304,7 @@ void SurfRayTutorial::exeTutorialAllEnd() { } bool SurfRayTutorial::isSuccessStraight() const { - if (__fabsf(mPadAccel.x) < sPadAccelStraightMinX - && __fabsf(mPadAccel.y) < sPadAccelStraightMinY) - { + if (__fabsf(mPadAccel.x) < sPadAccelStraightMinX && __fabsf(mPadAccel.y) < sPadAccelStraightMinY) { return true; } @@ -355,41 +346,29 @@ void SurfRayTutorial::omitTutorial() const { void SurfRayTutorial::nextTutorial() { if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialAllStart::sInstance)) { setNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialStraightStart::sInstance); - } - else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialStraightStart::sInstance)) { + } else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialStraightStart::sInstance)) { setNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialStraightFailure::sInstance); - } - else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialStraightFailure::sInstance)) { + } else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialStraightFailure::sInstance)) { setNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialStraightUpkeep::sInstance); - } - else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialStraightUpkeep::sInstance)) { + } else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialStraightUpkeep::sInstance)) { setNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialStraightSuccess::sInstance); - } - else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialStraightSuccess::sInstance)) { + } else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialStraightSuccess::sInstance)) { setNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnLeftStart::sInstance); - } - else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnLeftStart::sInstance)) { + } else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnLeftStart::sInstance)) { setNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnLeftFailure::sInstance); - } - else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnLeftFailure::sInstance)) { + } else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnLeftFailure::sInstance)) { setNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnLeftUpkeep::sInstance); - } - else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnLeftUpkeep::sInstance)) { + } else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnLeftUpkeep::sInstance)) { setNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnLeftSuccess::sInstance); - } - else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnLeftSuccess::sInstance)) { + } else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnLeftSuccess::sInstance)) { setNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnRightStart::sInstance); - } - else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnRightStart::sInstance)) { + } else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnRightStart::sInstance)) { setNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnRightFailure::sInstance); - } - else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnRightFailure::sInstance)) { + } else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnRightFailure::sInstance)) { setNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnRightUpkeep::sInstance); - } - else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnRightUpkeep::sInstance)) { + } else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnRightUpkeep::sInstance)) { setNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnRightSuccess::sInstance); - } - else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnRightSuccess::sInstance)) { + } else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnRightSuccess::sInstance)) { setNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialAllEnd::sInstance); } @@ -399,11 +378,9 @@ void SurfRayTutorial::nextTutorial() { void SurfRayTutorial::prevTutorial() { if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialStraightUpkeep::sInstance)) { setNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialStraightFailure::sInstance); - } - else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnLeftUpkeep::sInstance)) { + } else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnLeftUpkeep::sInstance)) { setNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnLeftFailure::sInstance); - } - else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnRightUpkeep::sInstance)) { + } else if (isNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnRightUpkeep::sInstance)) { setNerve(&NrvSurfRayTutorial::SurfRayTutorialNrvTutorialTurnRightFailure::sInstance); } diff --git a/src/Game/Ride/Tamakoro.cpp b/src/Game/Ride/Tamakoro.cpp index 9f1149135..3ddb98caa 100644 --- a/src/Game/Ride/Tamakoro.cpp +++ b/src/Game/Ride/Tamakoro.cpp @@ -25,7 +25,6 @@ #include "revolution/mtx.h" #include "revolution/wpad.h" - namespace NrvTamakoro { NEW_NERVE(TamakoroNrvStandByTutorial, Tamakoro, StandByTutorial); NEW_NERVE(TamakoroNrvStandByBind, Tamakoro, StandByBind); @@ -47,38 +46,37 @@ namespace NrvTamakoro { NEW_NERVE(TamakoroNrvRideRailFast, Tamakoro, RideRailFast); NEW_NERVE(TamakoroNrvRideRailFastEnd, Tamakoro, RideRailFastEnd); NEW_NERVE(TamakoroNrvBindEnd, Tamakoro, BindEnd); -} +} // namespace NrvTamakoro -Tamakoro::Tamakoro(const char* pName) : - LiveActor(pName), - mAccelSensorCtrl(nullptr), - mTutorial(nullptr), - mJointCtrl(nullptr), - mBaseQuat(0, 0, 0, 1), - mRotateQuat(0, 0, 0, 1), - mRingUp(0, 1, 0), - mKickVel(0, 0, 0), - mMarioBindRequestPos(0, 0, 0), - mMarioRotateUp(0, 1, 0), - mMarioPos(0, 0, 0), - mMoment(0, 0, 0), - mMarioRotateFront(0, 0, 1), - mDirectionToMario(0, 0, 0), - mMoveVec(0, 0, 0), - mAirTime(0), - mMoveSpeed(0.0f), - mMarioRotateYAngle(0.0f), - mMarioOffset(0.0f), - mMarioOffsetVelocity(0.0f), - mBgmCtrl(nullptr), - mControlDisabled(false), - mHasTutorial(false) -{ +Tamakoro::Tamakoro(const char* pName) + : LiveActor(pName), + mAccelSensorCtrl(nullptr), + mTutorial(nullptr), + mJointCtrl(nullptr), + mBaseQuat(0, 0, 0, 1), + mRotateQuat(0, 0, 0, 1), + mRingUp(0, 1, 0), + mKickVel(0, 0, 0), + mMarioBindRequestPos(0, 0, 0), + mMarioRotateUp(0, 1, 0), + mMarioPos(0, 0, 0), + mMoment(0, 0, 0), + mMarioRotateFront(0, 0, 1), + mDirectionToMario(0, 0, 0), + mMoveVec(0, 0, 0), + mAirTime(0), + mMoveSpeed(0.0f), + mMarioRotateYAngle(0.0f), + mMarioOffset(0.0f), + mMarioOffsetVelocity(0.0f), + mBgmCtrl(nullptr), + mControlDisabled(false), + mHasTutorial(false) { mAccelSensorCtrl = new SphereAccelSensorController(); mBgmCtrl = new AudTamakoroBgmCtrl(); } -void Tamakoro::init(const JMapInfoIter &rIter) { +void Tamakoro::init(const JMapInfoIter& rIter) { MR::initDefaultPos(this, rIter); initModelManagerWithAnm("Tamakoro", 0, false); MR::connectToScene(this, 0x29, 7, 0x1a, -1); @@ -91,13 +89,13 @@ void Tamakoro::init(const JMapInfoIter &rIter) { MR::onCalcGravity(this); initBinder(150.0f, 0.0f, 16); initNerve(&NrvTamakoro::TamakoroNrvStandByBind::sInstance); - + MR::declarePowerStar(this); bool hasPowerStar = MR::hasPowerStarInCurrentStageWithDeclarer(mName, -1); MR::startBva(this, "Tamakoro"); MR::setBvaFrameAndStop(this, (s32)hasPowerStar); MR::useStageSwitchWriteA(this, rIter); - + if (mHasTutorial) { setNerve(&NrvTamakoro::TamakoroNrvStandByTutorial::sInstance); mTutorial = new TamakoroTutorial("タマコロチュートリアル"); @@ -124,8 +122,7 @@ bool Tamakoro::ringMtxCallBack(TPos3f* pMtx, const JointControllerInfo& pJointCt if (MR::isNearZero(mMoveVec, 0.001f) || MR::isSameDirection(mMoveVec, mRingUp, 0.01f)) { MR::makeMtxUpNoSupport(pMtx, mRingUp); - } - else { + } else { MR::makeMtxUpFront(pMtx, mRingUp, mMoveVec); } @@ -160,7 +157,7 @@ void Tamakoro::updateBindActorMatrix() { JMAVECScaleAdd(&mGravity, &mMarioPos, &mMarioPos, -mMarioOffset); } } - + // quaternion rotation TPos3f mtx; mtx.setRotateQuaternionInline(mRotateQuat); @@ -178,7 +175,7 @@ void Tamakoro::updateRingUpVec() { MR::normalizeOrZero(&v1); MR::turnVecToVecDegree(&up, up, v1, 45.0f, TVec3f(0, 1, 0)); } - + MR::turnVecToVecDegree(&mRingUp, mRingUp, up, 4.0f, TVec3f(0, 1, 0)); } @@ -213,19 +210,17 @@ void Tamakoro::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { bool set; if (pReceiver->isType(0x7A)) { set = pReceiver->receiveMessage(0xAD, pSender); - } - else { + } else { set = false; } if (set) { setNerve(&NrvTamakoro::TamakoroNrvDashRail::sInstance); return; } - + if (pReceiver->isType(0x79)) { set = pReceiver->receiveMessage(0xAD, pSender); - } - else { + } else { set = false; } if (set) { @@ -235,8 +230,7 @@ void Tamakoro::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { if (pReceiver->isType(0x7B)) { set = pReceiver->receiveMessage(0xAD, pSender); - } - else { + } else { set = false; } if (set) { @@ -320,12 +314,12 @@ bool Tamakoro::receiveOtherMsg(u32 msg, HitSensor* pSender, HitSensor* pReceiver if (msg == 0xB3 && requestEndBind()) { return true; } - + return false; } bool Tamakoro::requestBind(HitSensor* pSensor) { - if (!isNerve(&NrvTamakoro::TamakoroNrvStandByBind::sInstance)) { + if (!isNerve(&NrvTamakoro::TamakoroNrvStandByBind::sInstance)) { return false; } @@ -358,19 +352,17 @@ bool Tamakoro::requestBind(HitSensor* pSensor) { MR::zeroVelocity(this); MR::invalidateHitSensor(this, "Bind"); - TVec3f vel(*MR::getPlayerVelocity()); MR::normalizeOrZero(&vel); f32 cosBetweenVelAndToThis = -vThisToSensor.dot(vel); - + if (cosBetweenVelAndToThis > MR::cosDegree(40.0f) && cosVerticalAngle > MR::cosDegree(35.0f)) { // if angle between vel and "to this" < 40 degrees and vertical angle to sensor < 35 degrees setNerve(&NrvTamakoro::TamakoroNrvBindStartLand::sInstance); - } - else { + } else { setNerve(&NrvTamakoro::TamakoroNrvBindStart::sInstance); - - TVec3f v3; // vec order shenanigans... not used + + TVec3f v3; // vec order shenanigans... not used TVec3f vPlayerToThis; vPlayerToThis = mPosition - mMarioPos; @@ -381,8 +373,7 @@ bool Tamakoro::requestBind(HitSensor* pSensor) { f32 dot = vPlayerToThis.dot(mMarioRotateFront); if (dot > 0.0f) { mMarioRotateFront.set(vPlayerToThis); - } - else { + } else { mMarioRotateFront.set(-vPlayerToThis); } } @@ -396,7 +387,7 @@ bool Tamakoro::requestBind(HitSensor* pSensor) { bool Tamakoro::requestEndBind() { if (!isNerve(&NrvTamakoro::TamakoroNrvBindEnd::sInstance) && !isNerve(&NrvTamakoro::TamakoroNrvStandByBind::sInstance)) { - MR::startBckPlayer("SwingRopeSpin", (const char *)0); + MR::startBckPlayer("SwingRopeSpin", (const char*)0); MR::endBindAndPlayerForceJump(this, mMarioRotateFront.multiplyOperatorInline(-5.0f).addOperatorInLine(mGravity.multiplyOperatorInline(-35.0f)), 0); MR::hideModel(this); MR::invalidateHitSensors(this); @@ -420,10 +411,9 @@ bool Tamakoro::requestTutorialEnd() { MR::zeroVelocity(this); if (MR::isEqualStageName("HellProminenceGalaxy")) { - MR::startStageBGM("BGM_TAMAKORO_2",false); - } - else { - MR::startStageBGM("BGM_TAMAKORO",false); + MR::startStageBGM("BGM_TAMAKORO_2", false); + } else { + MR::startStageBGM("BGM_TAMAKORO", false); } mBgmCtrl->init(); @@ -481,7 +471,7 @@ bool Tamakoro::tryLand() { setNerve(&NrvTamakoro::TamakoroNrvLand::sInstance); return true; } - + if (MR::isGreaterStep(this, 2) && MR::isBindedGround(this)) { mMarioOffsetVelocity = -f1; setNerve(&NrvTamakoro::TamakoroNrvWait::sInstance); @@ -493,14 +483,13 @@ bool Tamakoro::tryLand() { void Tamakoro::reactionCollision() { f32 hitPower; - + f32 wallHitPower = MR::calcHitPowerToWall(this); f32 groundHitPower = MR::calcHitPowerToGround(this); - + if (wallHitPower >= groundHitPower) { hitPower = wallHitPower; - } - else { + } else { hitPower = groundHitPower; } @@ -520,40 +509,36 @@ void Tamakoro::reactionCollision() { if (hitPower > 60.0f) { MR::tryRumblePadStrong(this, WPAD_CHAN0); MR::shakeCameraStrong(); - } - else if (hitPower > 25.0f) { + } else if (hitPower > 25.0f) { MR::tryRumblePadMiddle(this, WPAD_CHAN0); MR::shakeCameraNormalWeak(); - } - else if (hitPower > 5.0f) { + } else if (hitPower > 5.0f) { MR::tryRumblePadWeak(this, WPAD_CHAN0); MR::shakeCameraWeak(); - } + } } inline void Tamakoro::exeStandByTutorial() { - TVec3f vel(mVelocity); // unused! woo! + TVec3f vel(mVelocity); // unused! woo! MR::reboundVelocityFromCollision(this, 0.0f, 0.0f, 1.0f); MR::addVelocityToGravity(this, 2.0f); f32 attenuation; if (MR::isBindedGround(this)) { attenuation = 0.95f; - } - else { + } else { attenuation = 0.995f; } MR::attenuateVelocity(this, attenuation); } inline void Tamakoro::exeStandByBind() { - TVec3f vel(mVelocity); // unused! woo! + TVec3f vel(mVelocity); // unused! woo! MR::reboundVelocityFromCollision(this, 0.0f, 0.0f, 1.0f); MR::addVelocityToGravity(this, 2.0f); f32 attenuation; if (MR::isBindedGround(this)) { attenuation = 0.95f; - } - else { + } else { attenuation = 0.995f; } MR::attenuateVelocity(this, attenuation); @@ -561,7 +546,7 @@ inline void Tamakoro::exeStandByBind() { void Tamakoro::exeBindStart() { if (MR::isFirstStep(this)) { - MR::startBckPlayer("SlideStomachRecover", (const char *)0); + MR::startBckPlayer("SlideStomachRecover", (const char*)0); MR::tryRumblePadWeak(this, WPAD_CHAN0); mDirectionToMario.set(-mGravity); if (MR::normalizeOrZero(&mMarioRotateFront)) { @@ -572,7 +557,7 @@ void Tamakoro::exeBindStart() { // smoothly transition arc from bind request position // to top of the ball using the nerve rate as time - f32 time = MR::calcNerveRate(this, 40); + f32 time = MR::calcNerveRate(this, 40); TVec3f expectMario; JMAVECScaleAdd(&mDirectionToMario, &mPosition, &expectMario, 150.0f); TVec3f horizontalVec; @@ -580,9 +565,9 @@ void Tamakoro::exeBindStart() { time = (time * 2.0f) - 1.0f; TVec3f upVec; upVec.set(mGravity.multiplyOperatorInline(-(time * time * -150.0f + 150.0f))); - + MR::blendQuatUpFront(&mRotateQuat, -mGravity, mMarioRotateFront, 0.1f, 0.1f); - + mMarioPos.set(horizontalVec.addOperatorInLine(upVec)); if (MR::isGreaterStep(this, 40)) { @@ -594,19 +579,18 @@ void Tamakoro::exeBindStartLand() { if (MR::isFirstStep(this)) { if (!isNeedTutorial()) { if (MR::isEqualStageName("HellProminenceGalaxy")) { - MR::startStageBGM("BGM_TAMAKORO_2",false); - } - else { - MR::startStageBGM("BGM_TAMAKORO",false); + MR::startStageBGM("BGM_TAMAKORO_2", false); + } else { + MR::startStageBGM("BGM_TAMAKORO", false); } mBgmCtrl->init(); } - MR::startBckPlayer("Land","BallLand"); + MR::startBckPlayer("Land", "BallLand"); MR::tryRumblePadMiddle(this, WPAD_CHAN0); mDirectionToMario.set(mMarioPos - mPosition); - if (MR::normalizeOrZero(&mDirectionToMario)){ + if (MR::normalizeOrZero(&mDirectionToMario)) { mDirectionToMario.set(-mGravity); } JMAVECScaleAdd(&mDirectionToMario, &mPosition, &mMarioPos, 150.0f); @@ -615,7 +599,7 @@ void Tamakoro::exeBindStartLand() { if (MR::normalizeOrZero(&mMarioRotateUp)) { mMarioRotateUp.set(-mGravity); } - + MR::emitEffectHit(this, mMarioPos, mMarioPos - mPosition, "TamakoroLand"); MR::startSoundPlayer("SE_PV_CATCH", -1); MR::startSound(this, "SE_SM_RIDE_START", -1, -1); @@ -631,13 +615,11 @@ void Tamakoro::exeBindStartLand() { if (isNeedTutorial()) { mTutorial->requestStart(); setNerve(&NrvTamakoro::TamakoroNrvTutorial::sInstance); - } - else { + } else { mTutorial->requestEnd(); setNerve(&NrvTamakoro::TamakoroNrvWait::sInstance); } } - } void Tamakoro::exeTutorial() { @@ -671,21 +653,20 @@ void Tamakoro::exeWait() { reactionCollision(); addVelocityOperate(); - TVec3f vel(mVelocity); // unused! woo! + TVec3f vel(mVelocity); // unused! woo! MR::reboundVelocityFromCollision(this, 0.0f, 0.0f, 1.0f); MR::addVelocityToGravity(this, 2.0f); f32 attenuation; if (MR::isBindedGround(this)) { attenuation = 0.99f; - } - else { + } else { attenuation = 0.995f; } MR::attenuateVelocity(this, attenuation); updateMoveBckBlend(PSVECMag(&mMoment) * 150.0f); updateMarioPose(3.0f); updateMarioOffset(); - + if (tryJump() || tryFall()) { return; } @@ -699,17 +680,16 @@ void Tamakoro::exeFall() { mMarioOffset = MR::clamp(mMarioOffset, 0.0f, 150.0f); reactionCollision(); - + if (!tryLand()) { addVelocityOperate(); - TVec3f vel(mVelocity); // unused! woo! + TVec3f vel(mVelocity); // unused! woo! MR::reboundVelocityFromCollision(this, 0.0f, 0.0f, 1.0f); MR::addVelocityToGravity(this, 2.0f); f32 attenuation; if (MR::isBindedGround(this)) { attenuation = 0.99f; - } - else { + } else { attenuation = 0.995f; } MR::attenuateVelocity(this, attenuation); @@ -736,39 +716,36 @@ void Tamakoro::exeJump() { } addVelocityOperate(); - TVec3f vel(mVelocity); // unused! woo! + TVec3f vel(mVelocity); // unused! woo! MR::reboundVelocityFromCollision(this, 0.0f, 0.0f, 1.0f); MR::addVelocityToGravity(this, 2.0f); f32 attenuation; if (MR::isBindedGround(this)) { attenuation = 0.99f; - } - else { + } else { attenuation = 0.995f; } MR::attenuateVelocity(this, attenuation); updateMarioPose(3.0f); - } void Tamakoro::exeBumpWall() { if (MR::isFirstStep(this)) { - MR::startBckPlayer("BallHit", (const char *)0); + MR::startBckPlayer("BallHit", (const char*)0); MR::tryRumblePadMiddle(this, WPAD_CHAN0); MR::shakeCameraNormalWeak(); - } + } reactionCollision(); addVelocityOperate(); - TVec3f vel(mVelocity); // unused! woo! + TVec3f vel(mVelocity); // unused! woo! MR::reboundVelocityFromCollision(this, 0.0f, 0.0f, 1.0f); MR::addVelocityToGravity(this, 2.0f); f32 attenuation; if (MR::isBindedGround(this)) { attenuation = 0.99f; - } - else { + } else { attenuation = 0.995f; } MR::attenuateVelocity(this, attenuation); @@ -783,23 +760,22 @@ void Tamakoro::exeBumpWall() { void Tamakoro::exeLand() { if (MR::isFirstStep(this)) { - MR::startBckPlayer("Land", (const char *)0); + MR::startBckPlayer("Land", (const char*)0); MR::tryRumblePadMiddle(this, WPAD_CHAN0); MR::shakeCameraNormalWeak(); MR::startSound(this, "SE_SM_IRONSPH_LAND", -1, -1); - } + } reactionCollision(); addVelocityOperate(); - TVec3f vel(mVelocity); // unused! woo! + TVec3f vel(mVelocity); // unused! woo! MR::reboundVelocityFromCollision(this, 0.0f, 0.0f, 1.0f); MR::addVelocityToGravity(this, 2.0f); f32 attenuation; if (MR::isBindedGround(this)) { - attenuation = 0.88f; // ?? - } - else { + attenuation = 0.88f; // ?? + } else { attenuation = 0.995f; } MR::attenuateVelocity(this, attenuation); @@ -846,7 +822,7 @@ void Tamakoro::exeJumpHoleLaunch() { mMarioOffset += 3.0f; mMarioOffset = MR::clamp(mMarioOffset, 0.0f, 150.0f); - + updateMarioPose(3.0f); } @@ -891,19 +867,17 @@ void Tamakoro::exeDashRailEnd() { return; } - TVec3f vel(mVelocity); // unused! woo! + TVec3f vel(mVelocity); // unused! woo! MR::reboundVelocityFromCollision(this, 0.0f, 0.0f, 1.0f); MR::addVelocityToGravity(this, 2.0f); f32 attenuation; if (MR::isBindedGround(this)) { attenuation = 0.99f; - } - else { + } else { attenuation = 0.995f; } MR::attenuateVelocity(this, attenuation); updateMarioPose(10.0f); - } void Tamakoro::exeRideRail() { @@ -921,7 +895,7 @@ void Tamakoro::exeRideRail() { void Tamakoro::exeRideRailFastStart() { if (MR::isFirstStep(this)) { - MR::startBckPlayer("BallRollStart", (const char *)0); + MR::startBckPlayer("BallRollStart", (const char*)0); MR::setBckRatePlayer(1.5); } updateRideRail(); @@ -933,12 +907,12 @@ void Tamakoro::exeRideRailFastStart() { void Tamakoro::exeRideRailFast() { if (MR::isFirstStep(this)) { - MR::startBckPlayer("BallRoll", (const char *)0); + MR::startBckPlayer("BallRoll", (const char*)0); MR::setBckRatePlayer(1.5); } mControlDisabled = true; f32 mag = updateRideRail(); - + MR::setBckRatePlayer(PSVECMag(&mVelocity) / 60.0f); if (mag < 30.0f) { @@ -948,7 +922,7 @@ void Tamakoro::exeRideRailFast() { void Tamakoro::exeRideRailFastEnd() { if (MR::isFirstStep(this)) { - MR::startBckPlayer("BallRollEnd", (const char *)0); + MR::startBckPlayer("BallRollEnd", (const char*)0); MR::setBckRatePlayer(1.5); } updateRideRail(); @@ -983,27 +957,25 @@ void Tamakoro::addVelocityOperate() { mMoveSpeed = mAccelSensorCtrl->calcMoveVector(&mMoveVec, mGravity); TVec3f* vel = &mVelocity; // this needs to be like this to match... - f32 scale; + f32 scale; if (MR::isBindedGround(this)) { scale = 0.4f; - } - else { + } else { scale = 0.2f; } - + JMAVECScaleAdd(&mMoveVec, vel, &mVelocity, mMoveSpeed * scale); } f32 Tamakoro::updateRideRail() { mMoveVec.set(mVelocity); - if (MR::normalizeOrZero(&mMoveVec)){ + if (MR::normalizeOrZero(&mMoveVec)) { mMoveSpeed = 0.5f; - } - else { + } else { mMoveSpeed = 0.0f; } - + f32 mag = PSVECMag(&mMoment) * 150.0f; updateMarioPose(15.0f); @@ -1014,22 +986,20 @@ f32 Tamakoro::updateRideRail() { void Tamakoro::updateMoment() { if (isGroundMomentBall()) { - TVec3f moment; + TVec3f moment; const TVec3f* up; //TVec3f tmpVec; if (MR::isBindedGround(this)) { up = MR::getGroundNormal(this); - } - else { + } else { TVec3f tmpVec(-mGravity); up = &tmpVec; } - + MR::calcMomentRollBall(&moment, mVelocity, *up, 150.0f); MR::vecBlend(mMoment, moment, &mMoment, 0.25f); startRotateLevelSound(); - } - else { + } else { mMoment.mult(0.98f); } } @@ -1037,27 +1007,25 @@ void Tamakoro::updateMoment() { void Tamakoro::updateAirTime() { if (MR::isBindedGround(this)) { mAirTime = 0; - } - else { + } else { mAirTime++; } } void Tamakoro::updateMarioPose(f32 pDegree) { TVec3f v1; - + // these *need* to be pointers to match... TVec3f* vel = &mVelocity; TVec3f* grav = &mGravity; - f32 dot = grav->dot(*vel); + f32 dot = grav->dot(*vel); JMAVECScaleAdd(grav, vel, &v1, -dot); // v1.rejection(vel, grav); if (MR::isNearZero(v1, 0.001f)) { if (mMoveSpeed > 0.001f) { MR::turnDirectionDegree(this, &mMarioRotateFront, mMoveVec, pDegree * mMoveSpeed); } - } - else { + } else { MR::turnDirectionDegree(this, &mMarioRotateFront, v1, pDegree); } @@ -1071,8 +1039,7 @@ void Tamakoro::updateMarioPose(f32 pDegree) { f32 sign; if (mMoveVec.dot(xDir) >= 0.0f) { sign = 1.0f; - } - else { + } else { sign = -1.0f; } dot = sign * dot; @@ -1080,7 +1047,6 @@ void Tamakoro::updateMarioPose(f32 pDegree) { } mMarioRotateYAngle *= 0.9f; - TVec3f up; up.set(-mGravity); mMarioRotateUp.set(-mGravity); @@ -1100,14 +1066,13 @@ void Tamakoro::updateMarioPose(f32 pDegree) { MR::blendQuatUpFront(&mRotateQuat, mMarioRotateUp, mMarioRotateFront, 0.1f, 0.25f); f32 rotY = mMarioRotateYAngle; - MR::setPlayerUpperRotateY(0.017453292f * rotY); // sin(1.0f) + MR::setPlayerUpperRotateY(0.017453292f * rotY); // sin(1.0f) } - void Tamakoro::updateMarioOffset() { f32 decay = (mMarioOffsetVelocity - 1.0f); decay *= 0.99f; - + mMarioOffsetVelocity = decay; mMarioOffset += decay; mMarioOffset = MR::clamp(mMarioOffset, 0.0f, 150.0f); @@ -1117,36 +1082,32 @@ void Tamakoro::updateMoveBckBlend(f32 pSpeed) { f32 w0 = 0.0f; f32 w1 = 0.0f; f32 w2 = 0.0f; - f32 w3 = 0.0f; + f32 w3 = 0.0f; f32 rate = 0.0f; f32 limit1 = 0.25f; f32 limit2 = 6.0f; f32 limit3 = 18.0f; - - + if (pSpeed < limit1) { w1 = MR::normalize(pSpeed, 0.0f, 0.25f); w0 = 1.0f - w1; rate = MR::getLinerValue(w1, 1.0f, 1.0f, 1.0f); - } - else if (pSpeed < limit2) { + } else if (pSpeed < limit2) { w2 = MR::normalize(pSpeed, 0.25, 6.0f); w1 = 1.0f - w2; rate = MR::getLinerValue(w2, 1.0f, 2.0f, 1.0f); - } - else if (pSpeed < limit3) { + } else if (pSpeed < limit3) { w3 = MR::normalize(pSpeed, 6.0f, 18.0f); w2 = 1.0f - w3; rate = MR::getLinerValue(w3, 2.0f, 3.0f, 1.0f); - } - else { + } else { w3 = 1.0f; rate = (pSpeed / 18.0f) * 3.0f; if (rate > 4.0f) { rate = 4.0f; } } - + MR::setBckBlendWeight(w0, w1, w2, w3); MR::setBckRatePlayer(rate); } @@ -1162,32 +1123,21 @@ void Tamakoro::updateSquatBckBlend(f32 pSpeed) { } bool Tamakoro::isEnablePushPlayer() const { - if (isNerve(&NrvTamakoro::TamakoroNrvStandByTutorial::sInstance) - || isNerve(&NrvTamakoro::TamakoroNrvStandByBind::sInstance)) { + if (isNerve(&NrvTamakoro::TamakoroNrvStandByTutorial::sInstance) || isNerve(&NrvTamakoro::TamakoroNrvStandByBind::sInstance)) { return true; } return false; } bool Tamakoro::isEnableEnemyAttack() const { - if (isNerve(&NrvTamakoro::TamakoroNrvWait::sInstance) - || isNerve(&NrvTamakoro::TamakoroNrvFall::sInstance) - || isNerve(&NrvTamakoro::TamakoroNrvJump::sInstance) - || isNerve(&NrvTamakoro::TamakoroNrvBumpWall::sInstance) - || isNerve(&NrvTamakoro::TamakoroNrvDashRailEnd::sInstance) - || isNerve(&NrvTamakoro::TamakoroNrvLand::sInstance)) { + if (isNerve(&NrvTamakoro::TamakoroNrvWait::sInstance) || isNerve(&NrvTamakoro::TamakoroNrvFall::sInstance) || isNerve(&NrvTamakoro::TamakoroNrvJump::sInstance) || isNerve(&NrvTamakoro::TamakoroNrvBumpWall::sInstance) || isNerve(&NrvTamakoro::TamakoroNrvDashRailEnd::sInstance) || isNerve(&NrvTamakoro::TamakoroNrvLand::sInstance)) { return true; } return false; } bool Tamakoro::isEnableBallBind() const { - if (isNerve(&NrvTamakoro::TamakoroNrvWait::sInstance) - || isNerve(&NrvTamakoro::TamakoroNrvFall::sInstance) - || isNerve(&NrvTamakoro::TamakoroNrvJump::sInstance) - || isNerve(&NrvTamakoro::TamakoroNrvBumpWall::sInstance) - || isNerve(&NrvTamakoro::TamakoroNrvDashRailEnd::sInstance) - || isNerve(&NrvTamakoro::TamakoroNrvLand::sInstance)) { + if (isNerve(&NrvTamakoro::TamakoroNrvWait::sInstance) || isNerve(&NrvTamakoro::TamakoroNrvFall::sInstance) || isNerve(&NrvTamakoro::TamakoroNrvJump::sInstance) || isNerve(&NrvTamakoro::TamakoroNrvBumpWall::sInstance) || isNerve(&NrvTamakoro::TamakoroNrvDashRailEnd::sInstance) || isNerve(&NrvTamakoro::TamakoroNrvLand::sInstance)) { return true; } return false; @@ -1198,27 +1148,21 @@ bool Tamakoro::isEnebleHitCollisionMessage() const { } bool Tamakoro::isUseMarioOffset() const { - if (isNerve(&NrvTamakoro::TamakoroNrvBindStart::sInstance) - || isNerve(&NrvTamakoro::TamakoroNrvBindStartLand::sInstance)) { + if (isNerve(&NrvTamakoro::TamakoroNrvBindStart::sInstance) || isNerve(&NrvTamakoro::TamakoroNrvBindStartLand::sInstance)) { return false; } return true; } bool Tamakoro::isGroundMomentBall() const { - if (MR::isBindedGround(this) || isRideRail() - || isNerve(&NrvTamakoro::TamakoroNrvDashRail::sInstance) - || isNerve(&NrvTamakoro::TamakoroNrvJumpHole::sInstance)) { + if (MR::isBindedGround(this) || isRideRail() || isNerve(&NrvTamakoro::TamakoroNrvDashRail::sInstance) || isNerve(&NrvTamakoro::TamakoroNrvJumpHole::sInstance)) { return true; } return false; } bool Tamakoro::isRideRail() const { - if (isNerve(&NrvTamakoro::TamakoroNrvRideRail::sInstance) - || isNerve(&NrvTamakoro::TamakoroNrvRideRailFastStart::sInstance) - || isNerve(&NrvTamakoro::TamakoroNrvRideRailFast::sInstance) - || isNerve(&NrvTamakoro::TamakoroNrvRideRailFastEnd::sInstance)) { + if (isNerve(&NrvTamakoro::TamakoroNrvRideRail::sInstance) || isNerve(&NrvTamakoro::TamakoroNrvRideRailFastStart::sInstance) || isNerve(&NrvTamakoro::TamakoroNrvRideRailFast::sInstance) || isNerve(&NrvTamakoro::TamakoroNrvRideRailFastEnd::sInstance)) { return true; } return false; @@ -1237,12 +1181,11 @@ void Tamakoro::startRotateLevelSound() { if (mag <= 0.001f) { return; } - + s32 lvl = ((mag * 10000.0f) / TWO_PI); if (isNerve(&NrvTamakoro::TamakoroNrvRideRail::sInstance)) { MR::startLevelSound(this, "SE_SM_LV_IRONSPH_ROLL_RAIL", lvl, -1, -1); - } - else { + } else { MR::startLevelSound(this, "SE_SM_LV_IRONSPH_ROLL1", lvl, -1, -1); } } @@ -1253,4 +1196,4 @@ namespace MR { tamakoro->setTutorial(); return tamakoro; } -}; +}; // namespace MR diff --git a/src/Game/Ride/TamakoroTutorial.cpp b/src/Game/Ride/TamakoroTutorial.cpp index f478d975a..d7c7e5f51 100644 --- a/src/Game/Ride/TamakoroTutorial.cpp +++ b/src/Game/Ride/TamakoroTutorial.cpp @@ -30,24 +30,22 @@ namespace NrvTamakoroTutorial { NEW_NERVE(HostTypeNrvTrampleBack, TamakoroTutorial, Trample); NEW_NERVE(HostTypeNrvRecoverFront, TamakoroTutorial, Recover); NEW_NERVE(HostTypeNrvRecoverBack, TamakoroTutorial, Recover); -}; +}; // namespace NrvTamakoroTutorial namespace { - static TVec3f hRaiseAcc = TVec3f(0.0f, -1.0f, 0.0f); + static TVec3f hRaiseAcc = TVec3f(0.0f, -1.0f, 0.0f); static const f32 hRaiseCheckDegree = 30.0f; static const f32 hDistToStartTutorial = 400.0f; -}; +}; // namespace -TamakoroTutorial::TamakoroTutorial(const char* pName) : - LiveActor(pName), - mHost(nullptr), - mTalkCtrl(nullptr), - mTalkCtrlAutomatic(nullptr), - mPadAccel(0.0f, 0.0f, 0.0f), - _A4(false), - _A5(false) -{ - +TamakoroTutorial::TamakoroTutorial(const char* pName) + : LiveActor(pName), + mHost(nullptr), + mTalkCtrl(nullptr), + mTalkCtrlAutomatic(nullptr), + mPadAccel(0.0f, 0.0f, 0.0f), + _A4(false), + _A5(false) { } void TamakoroTutorial::init(const JMapInfoIter& rIter) { @@ -75,8 +73,7 @@ void TamakoroTutorial::init(const JMapInfoIter& rIter) { initNerve(&NrvTamakoroTutorial::HostTypeNrvFirst::sInstance); _A5 = false; - } - else { + } else { mTalkCtrl = MR::createTalkCtrl(this, rIter, "SignBoard", TVec3f(0.0f, 0.0f, 0.0f), nullptr); initNerve(&NrvTamakoroTutorial::HostTypeNrvWait::sInstance); @@ -126,23 +123,16 @@ void TamakoroTutorial::exeFirst() { f32 distPlayerToTutorial = MR::calcDistanceToPlayer(mPosition); f32 distPlayerToTamakoro = MR::calcDistanceToPlayer(mHost->mPosition); - if (MR::isOnGroundPlayer() - && !MR::isExecScenarioStarter() - && (distPlayerToTutorial < hDistToStartTutorial - || distPlayerToTamakoro < hDistToStartTutorial)) - { + if (MR::isOnGroundPlayer() && !MR::isExecScenarioStarter() && (distPlayerToTutorial < hDistToStartTutorial || distPlayerToTamakoro < hDistToStartTutorial)) { setNerve(&NrvTamakoroTutorial::HostTypeNrvFirstForceTalk::sInstance); } - } - else { + } else { if (MR::isFirstStep(this)) { getSensor("push")->invalidate(); mHost->startRide(); } - if (MR::tryTalkNearPlayerAtEnd(mTalkCtrlAutomatic) - && MR::tryTalkSelectLeft(mTalkCtrlAutomatic)) - { + if (MR::tryTalkNearPlayerAtEnd(mTalkCtrlAutomatic) && MR::tryTalkSelectLeft(mTalkCtrlAutomatic)) { MR::resetNode(mTalkCtrl); MR::forwardNode(mTalkCtrl); setNerve(&NrvTamakoroTutorial::HostTypeNrvWaitRide::sInstance); @@ -194,7 +184,6 @@ void TamakoroTutorial::exeWaitRaiseTalk() { pPlayerActionGuidance->_36 = true; if (MR::isFirstStep(this)) { - } MR::tryTalkForceWithoutDemo(mTalkCtrl); @@ -218,8 +207,7 @@ void TamakoroTutorial::exeWaitRaiseStable() { if (!MR::isNearAngleDegree(::hRaiseAcc, mPadAccel, hRaiseCheckDegree)) { setNerve(&NrvTamakoroTutorial::HostTypeNrvWaitRaiseTalk::sInstance); MR::startSystemSE("SE_SY_SURF_TUTORIAL_NG", -1, -1); - } - else { + } else { startTimerSound(getNerveStep(), 1); if (MR::isGreaterStep(this, 60)) { @@ -268,8 +256,7 @@ void TamakoroTutorial::exeFinalTalk() { if (MR::tryTalkForceWithoutDemoAtEnd(mTalkCtrl)) { if (MR::isExistNextNode(mTalkCtrl)) { setNerve(&NrvTamakoroTutorial::HostTypeNrvFinalTalk::sInstance); - } - else { + } else { mHost->requestTutorialEnd(); MR::onGameEventFlagTamakoroTutorialAtFirst(); setNerve(&NrvTamakoroTutorial::HostTypeNrvWait::sInstance); @@ -278,14 +265,11 @@ void TamakoroTutorial::exeFinalTalk() { } void TamakoroTutorial::exeWait() { - if (isNerve(&NrvTamakoroTutorial::HostTypeNrvDirectRide::sInstance) - && MR::isFirstStep(this)) - { + if (isNerve(&NrvTamakoroTutorial::HostTypeNrvDirectRide::sInstance) && MR::isFirstStep(this)) { mHost->requestTutorialEnd(); MR::onGameEventFlagTamakoroTutorialAtFirst(); setNerve(&NrvTamakoroTutorial::HostTypeNrvWait::sInstance); - } - else if (_A5 && MR::tryTalkNearPlayerAtEnd(mTalkCtrl)) { + } else if (_A5 && MR::tryTalkNearPlayerAtEnd(mTalkCtrl)) { MR::tryForwardNode(mTalkCtrl); } } @@ -296,8 +280,7 @@ void TamakoroTutorial::exeTrample() { if (isNerve(&NrvTamakoroTutorial::HostTypeNrvTrampleFront::sInstance)) { MR::startAction(this, "DownFront"); - } - else { + } else { MR::startAction(this, "DownBack"); } } @@ -305,12 +288,10 @@ void TamakoroTutorial::exeTrample() { if (MR::isActionEnd(this) && MR::isGreaterStep(this, 60) && !_A4) { if (isNerve(&NrvTamakoroTutorial::HostTypeNrvTrampleFront::sInstance)) { setNerve(&NrvTamakoroTutorial::HostTypeNrvRecoverFront::sInstance); - } - else { + } else { setNerve(&NrvTamakoroTutorial::HostTypeNrvRecoverBack::sInstance); } - } - else { + } else { _A4 = false; } } @@ -321,8 +302,7 @@ void TamakoroTutorial::exeRecover() { if (isNerve(&NrvTamakoroTutorial::HostTypeNrvRecoverFront::sInstance)) { MR::startAction(this, "RevivalFront"); - } - else { + } else { MR::startAction(this, "RevivalBack"); } } @@ -333,9 +313,7 @@ void TamakoroTutorial::exeRecover() { } void TamakoroTutorial::attackSensor(HitSensor* pSender, HitSensor* pReceiver) { - if (!isNerve(&NrvTamakoroTutorial::HostTypeNrvTrampleFront::sInstance) - && !isNerve(&NrvTamakoroTutorial::HostTypeNrvTrampleBack::sInstance)) - { + if (!isNerve(&NrvTamakoroTutorial::HostTypeNrvTrampleFront::sInstance) && !isNerve(&NrvTamakoroTutorial::HostTypeNrvTrampleBack::sInstance)) { MR::sendMsgPush(pReceiver, pSender); } @@ -352,10 +330,7 @@ bool TamakoroTutorial::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSe return true; } - if (isNerve(&NrvTamakoroTutorial::HostTypeNrvWait::sInstance) - || isNerve(&NrvTamakoroTutorial::HostTypeNrvRecoverFront::sInstance) - || isNerve(&NrvTamakoroTutorial::HostTypeNrvRecoverBack::sInstance)) - { + if (isNerve(&NrvTamakoroTutorial::HostTypeNrvWait::sInstance) || isNerve(&NrvTamakoroTutorial::HostTypeNrvRecoverFront::sInstance) || isNerve(&NrvTamakoroTutorial::HostTypeNrvRecoverBack::sInstance)) { TVec3f v1 = pSender->mPosition; v1 -= pReceiver->mPosition; TVec3f v2; @@ -364,8 +339,7 @@ bool TamakoroTutorial::receiveMsgPlayerAttack(u32 msg, HitSensor* pSender, HitSe if (0.0f < v2.dot(v1)) { setNerve(&NrvTamakoroTutorial::HostTypeNrvTrampleBack::sInstance); - } - else { + } else { setNerve(&NrvTamakoroTutorial::HostTypeNrvTrampleFront::sInstance); } @@ -389,16 +363,15 @@ void TamakoroTutorial::updateHitSensor(HitSensor* pSensor) { MR::calcUpVec(&upVec, this); TVec3f vHostToPlayer(*MR::getPlayerCenterPos()); vHostToPlayer -= mHost->mPosition; - + f32 dot = upVec.dot(vHostToPlayer); pSensor->mPosition.set(mHost->mPosition); TVec3f up(upVec); up.mult(dot); - - pSensor->mPosition.addInLine(up); + pSensor->mPosition.addInLine(up); } void TamakoroTutorial::startTimerSound(s32 step, s32 param2) { diff --git a/src/Game/Scene/GameScene.cpp b/src/Game/Scene/GameScene.cpp index 947fc03b6..6fae7d001 100644 --- a/src/Game/Scene/GameScene.cpp +++ b/src/Game/Scene/GameScene.cpp @@ -28,7 +28,7 @@ namespace { CometRetryButton* getCometRetryButton() { return MR::getSceneObj(SceneObj_CometRetryButton); } -}; +}; // namespace namespace NrvGameScene { NEW_NERVE(GameSceneScenarioOpeningCamera, GameScene, ScenarioOpeningCamera); @@ -44,19 +44,17 @@ namespace NrvGameScene { NEW_NERVE(GameSceneTimeUp, GameScene, TimeUp); NEW_NERVE(GameSceneGalaxyMap, GameScene, GalaxyMap); NEW_NERVE(GameSceneStaffRoll, GameScene, StaffRoll); -}; +}; // namespace NrvGameScene -GameScene::GameScene() : - Scene("GameScene"), - _14(0), - mScenarioCamera(nullptr), - mPauseCtrl(nullptr), - mPauseSeq(nullptr), - mStageClearSeq(nullptr), - mDraw3D(true), - _29(1) -{ - +GameScene::GameScene() + : Scene("GameScene"), + _14(0), + mScenarioCamera(nullptr), + mPauseCtrl(nullptr), + mPauseSeq(nullptr), + mStageClearSeq(nullptr), + mDraw3D(true), + _29(1) { } GameScene::~GameScene() { @@ -105,8 +103,7 @@ void GameScene::init() { if (!MR::isScenarioDecided()) { MR::receiveAllRequestedFile(); - } - else { + } else { SceneFunction::initAfterScenarioSelected(); NPCFunction::createNPCData(); SceneFunction::startActorFileLoadScenario(); @@ -149,11 +146,9 @@ void GameScene::start() { if (MR::isGlobalTimerEnd()) { MR::forceCloseWipeCircle(); - } - else if (!MR::hasRetryGalaxySequence()) { + } else if (!MR::hasRetryGalaxySequence()) { startStagePlayFirst(); - } - else { + } else { startStagePlayRetry(); } } @@ -162,9 +157,7 @@ void GameScene::update() { mPauseCtrl->updateNerve(); updateNerve(); - bool isTimeUp = MR::isGlobalTimerEnd() - && !isNerve(&NrvGameScene::GameSceneTimeUp::sInstance) - && MR::isGreaterEqualStep(this, 2); + bool isTimeUp = MR::isGlobalTimerEnd() && !isNerve(&NrvGameScene::GameSceneTimeUp::sInstance) && MR::isGreaterEqualStep(this, 2); if (isTimeUp) { setNerve(&NrvGameScene::GameSceneTimeUp::sInstance); @@ -186,8 +179,7 @@ void GameScene::draw() const { void GameScene::calcAnim() { if (isPlayMovie()) { SceneFunction::executeCalcAnimListOnPlayingMovie(); - } - else { + } else { SceneFunction::executeCalcAnimList(); } @@ -219,8 +211,7 @@ void GameScene::requestEndGameOverDemo() { void GameScene::requestEndMissDemo() { if (MR::isExistSceneObj(SceneObj_CometRetryButton)) { setNerve(&NrvGameScene::GameSceneCometRetryAfterMiss::sInstance); - } - else { + } else { MR::requestChangeStageAfterMiss(); } } @@ -246,8 +237,7 @@ bool GameScene::isExecScenarioStarter() const { } bool GameScene::isExecStageClearDemo() const { - return isNerve(&NrvGameScene::GameScenePowerStarGet::sInstance) - || isNerve(&NrvGameScene::GameSceneGrandStarGet::sInstance); + return isNerve(&NrvGameScene::GameScenePowerStarGet::sInstance) || isNerve(&NrvGameScene::GameSceneGrandStarGet::sInstance); } void GameScene::exeScenarioOpeningCamera() { @@ -263,15 +253,15 @@ void GameScene::exeScenarioOpeningCamera() { MR::stopStageBGM(0); MR::startStageBGMFromStageName("Game", MR::getCurrentStageName(), MR::getCurrentScenarioNo()); setNerve(&NrvGameScene::GameSceneAction::sInstance); - } - else { + } else { setNerve(&NrvGameScene::GameSceneScenarioStarter::sInstance); } } } void GameScene::exeCometRetryAfterMiss() { - CometRetryButton* pCometRetryButton = getCometRetryButton();; + CometRetryButton* pCometRetryButton = getCometRetryButton(); + ; if (MR::isFirstStep(this)) { getCometRetryButton()->appear(); @@ -299,8 +289,7 @@ void GameScene::exePlayMovie() { setNerve(&NrvGameScene::GameSceneAction::sInstance); SceneFunction::movementStopSceneController(); SceneFunction::executeMovementList(); - } - else { + } else { SceneFunction::executeMovementListOnPlayingMovie(); } } @@ -313,8 +302,7 @@ void GameScene::exeGalaxyMap() { if (!MR::isActiveGalaxyMapLayout()) { MR::endStarPointerMode(this); setNerve(&NrvGameScene::GameSceneAction::sInstance); - } - else { + } else { CategoryList::execute(MR::MovementType_LayoutOnPause); } } @@ -332,21 +320,18 @@ void GameScene::initSequences() { mPauseCtrl = new GameScenePauseControl(this); mPauseCtrl->registerNervePauseMenu(&NrvGameScene::GameScenePauseMenu::sInstance); - MR::FunctorV0M func = MR::Functor_Inline(mPauseCtrl, &GameScenePauseControl::requestPauseMenuOff); + MR::FunctorV0M func = MR::Functor_Inline(mPauseCtrl, &GameScenePauseControl::requestPauseMenuOff); mPauseSeq->initWindowMenu(func); } void GameScene::initEffect() { if (MR::isEqualStageName("CosmosGardenGalaxy")) { SceneFunction::initEffectSystem(5120, 384); - } - else if (MR::isEqualStageName("KoopaBattleVs1Galaxy")) { + } else if (MR::isEqualStageName("KoopaBattleVs1Galaxy")) { SceneFunction::initEffectSystem(6144, 512); - } - else if (MR::isEqualStageName("AstroGalaxy")) { + } else if (MR::isEqualStageName("AstroGalaxy")) { SceneFunction::initEffectSystem(3072, 512); - } - else { + } else { SceneFunction::initEffectSystem(3072, 256); } } @@ -362,16 +347,14 @@ void GameScene::drawMirror() const { CategoryList::drawXlu(MR::DrawBufferType_MirrorMapObj); CategoryList::execute(MR::DrawType_CaptureScreenIndirect); MR::clearZBuffer(); - GXColor c = { 0, 0, -1, 0 }; + GXColor c = {0, 0, -1, 0}; MR::fillScreen(c); } } // inline bool GameScene::isPlayMovie() const { - return MR::isActiveMoviePlayer() - || MR::isMoviePlayingOnSequence() - || isNerve(&NrvGameScene::GameScenePlayMovie::sInstance); + return MR::isActiveMoviePlayer() || MR::isMoviePlayingOnSequence() || isNerve(&NrvGameScene::GameScenePlayMovie::sInstance); } void GameScene::draw3D() const { @@ -437,8 +420,7 @@ void GameScene::draw3D() const { void GameScene::draw2D() const { if (isPlayMovie()) { SceneFunction::executeDrawList2DMovie(); - } - else { + } else { SceneFunction::executeDrawList2DNormal(); } @@ -475,23 +457,18 @@ void GameScene::startStagePlayFirst() { MR::stopStageBGM(0); MR::startStageBGMFromStageName("Game", MR::getCurrentStageName(), MR::getCurrentScenarioNo()); } - } - else if (MR::isBeginScenarioStarter()) { + } else if (MR::isBeginScenarioStarter()) { MR::forceToBlankCinemaFrame(); MR::forceOpenWipeFade(); setNerve(&NrvGameScene::GameSceneScenarioStarter::sInstance); - } - else { + } else { if (MR::isStageBeginFadeWipe()) { MR::openWipeFade(180); - } - else if (MR::isStageBeginTitleWipe()) { + } else if (MR::isStageBeginTitleWipe()) { MR::openWipeFade(30); - } - else if (MR::isStageBeginWithoutWipe()) { + } else if (MR::isStageBeginWithoutWipe()) { MR::forceOpenWipeFade(); - } - else { + } else { MR::openWipeCircle(-1); } @@ -509,12 +486,10 @@ void GameScene::startStagePlayRetry() { if (MR::isEqualStageName("SurfingLv1Galaxy") && MR::getPlayerRestartIdInfo()->_0 == 1) { MR::stopSubBGM(0); MR::stopStageBGM(0); - } - else if (MR::isEqualStageName("SurfingLv2Galaxy") && MR::getPlayerRestartIdInfo()->_0 == 1) { + } else if (MR::isEqualStageName("SurfingLv2Galaxy") && MR::getPlayerRestartIdInfo()->_0 == 1) { MR::stopSubBGM(0); MR::stopStageBGM(0); - } - else { + } else { MR::stopSubBGM(0); MR::stopStageBGM(0); MR::startStageBGMFromStageName("Game", MR::getCurrentStageName(), MR::getCurrentScenarioNo()); @@ -525,13 +500,7 @@ void GameScene::startStagePlayRetry() { } bool GameScene::isPermitToPauseMenu() const { - return !MR::isStageDisablePauseMenu() - && isNerve(&NrvGameScene::GameSceneAction::sInstance) - && !MR::isDemoActive() - && !MR::isWipeActive() - && !MR::isWipeBlank() - && !MR::isPlayerDead() - && !MR::isPlayerDamaging(); + return !MR::isStageDisablePauseMenu() && isNerve(&NrvGameScene::GameSceneAction::sInstance) && !MR::isDemoActive() && !MR::isWipeActive() && !MR::isWipeBlank() && !MR::isPlayerDead() && !MR::isPlayerDamaging(); } void GameScene::requestShowGalaxyMap() { @@ -558,8 +527,7 @@ void GameScene::stageClear() { if (MR::isFirstStep(this)) { if (isNerve(&NrvGameScene::GameScenePowerStarGet::sInstance)) { mStageClearSeq->startPowerStarGetDemo(); - } - else if (isNerve(&NrvGameScene::GameSceneGrandStarGet::sInstance)) { + } else if (isNerve(&NrvGameScene::GameSceneGrandStarGet::sInstance)) { mStageClearSeq->startGrandStarGetDemo(); } } @@ -597,7 +565,6 @@ void GameScene::exePowerStarGet() { void GameScene::exePauseMenu() { if (MR::isFirstStep(this)) { - } mPauseSeq->movement(); diff --git a/src/Game/Scene/GameSceneFunction.cpp b/src/Game/Scene/GameSceneFunction.cpp index 449801cae..11a95e4f3 100644 --- a/src/Game/Scene/GameSceneFunction.cpp +++ b/src/Game/Scene/GameSceneFunction.cpp @@ -8,7 +8,7 @@ namespace { GameScene* getGameScene() NO_INLINE { return static_cast(SingletonHolder::get()->mSceneController->mScene); } -}; +}; // namespace namespace GameSceneFunction { void notifyEndScenarioStarter() { @@ -78,4 +78,4 @@ namespace GameSceneFunction { pGameScene->mDraw3D = false; } -}; +}; // namespace GameSceneFunction diff --git a/src/Game/Scene/GameScenePauseControl.cpp b/src/Game/Scene/GameScenePauseControl.cpp index f3f321bf4..d32978cb6 100644 --- a/src/Game/Scene/GameScenePauseControl.cpp +++ b/src/Game/Scene/GameScenePauseControl.cpp @@ -10,7 +10,8 @@ namespace { NEW_NERVE(GameScenePauseControlNormal, GameScenePauseControl, Normal); }; -GameScenePauseControl::GameScenePauseControl(GameScene *pScene) : NerveExecutor("GameSceneポーズ制御") { +GameScenePauseControl::GameScenePauseControl(GameScene* pScene) + : NerveExecutor("GameSceneポーズ制御") { mScene = pScene; mPauseChecker = nullptr; mPauseMenuOff = false; @@ -19,7 +20,7 @@ GameScenePauseControl::GameScenePauseControl(GameScene *pScene) : NerveExecutor( mPauseChecker = new PauseButtonCheckerInGame(); } -void GameScenePauseControl::registerNervePauseMenu(const Nerve *pNerve) { +void GameScenePauseControl::registerNervePauseMenu(const Nerve* pNerve) { mPauseMenuNerve = pNerve; } @@ -47,7 +48,7 @@ bool GameScenePauseControl::tryStartPauseMenu() { mScene->setNerve(mPauseMenuNerve); return true; } - + if (mPauseChecker->isPermitToPlusPause()) { mScene->mPauseSeq->startPause(GamePauseSequence::ActivePause); mScene->setNerve(mPauseMenuNerve); @@ -59,5 +60,4 @@ bool GameScenePauseControl::tryStartPauseMenu() { } GameScenePauseControl::~GameScenePauseControl() { - } diff --git a/src/Game/Scene/GameSceneScenarioOpeningCameraState.cpp b/src/Game/Scene/GameSceneScenarioOpeningCameraState.cpp index 84bb72050..b0fc870f9 100644 --- a/src/Game/Scene/GameSceneScenarioOpeningCameraState.cpp +++ b/src/Game/Scene/GameSceneScenarioOpeningCameraState.cpp @@ -17,11 +17,10 @@ namespace { NEW_NERVE(GameSceneScenarioOpeningCameraStateWait, GameSceneScenarioOpeningCameraState, Wait); NEW_NERVE(GameSceneScenarioOpeningCameraStatePlay, GameSceneScenarioOpeningCameraState, Play); -}; +}; // namespace -GameSceneScenarioOpeningCameraState::GameSceneScenarioOpeningCameraState() : - NerveExecutor("シナリオ開始カメラ再生") -{ +GameSceneScenarioOpeningCameraState::GameSceneScenarioOpeningCameraState() + : NerveExecutor("シナリオ開始カメラ再生") { mBaseMtx.identity(); initNerve(&GameSceneScenarioOpeningCameraStatePlay::sInstance); mScenarioTitle = new ScenarioTitle(); @@ -65,7 +64,6 @@ void GameSceneScenarioOpeningCameraState::end() { } void GameSceneScenarioOpeningCameraState::exeWait() { - } void GameSceneScenarioOpeningCameraState::exePlay() { @@ -79,8 +77,7 @@ void GameSceneScenarioOpeningCameraState::exePlay() { end(); MR::forceToBlankCinemaFrame(); setNerve(&GameSceneScenarioOpeningCameraStateWait::sInstance); - } - else { + } else { if (MR::isStep(this, MR::getStartAnimCameraFrame() - 60)) { MR::tryFrameToBlankCinemaFrame(); mScenarioTitle->end(); @@ -102,5 +99,5 @@ bool GameSceneScenarioOpeningCameraState::trySkipTrigger() const { return false; } - return !MR::isAlreadyVisitedCurrentStageAndScenario() ? false : MR::testSystemPadTriggerDecide(); + return !MR::isAlreadyVisitedCurrentStageAndScenario() ? false : MR::testSystemPadTriggerDecide(); } diff --git a/src/Game/Scene/IntermissionScene.cpp b/src/Game/Scene/IntermissionScene.cpp index 3f95a32c9..64f1c19a9 100644 --- a/src/Game/Scene/IntermissionScene.cpp +++ b/src/Game/Scene/IntermissionScene.cpp @@ -5,7 +5,8 @@ #include #include -IntermissionScene::IntermissionScene() : Scene("IntermissionScene") { +IntermissionScene::IntermissionScene() + : Scene("IntermissionScene") { _54 = 0; mState[0] = 0; } @@ -30,13 +31,13 @@ void IntermissionScene::draw() const { v4.a = 255; graph.setColor(v1, v1, v1, v4); - f32 height = JUTVideo::sManager->mRenderModeObj->efbHeight; - f32 width = MR::getScreenWidth(); + f32 height = JUTVideo::sManager->mRenderModeObj->efbHeight; + f32 width = MR::getScreenWidth(); TBox2f box(0.0f, 0.0f, 0.0f + height, 0.0f + width); graph.fillBox(box); } -void IntermissionScene::setCurrentSceneControllerState(const char *pState, ...) { +void IntermissionScene::setCurrentSceneControllerState(const char* pState, ...) { va_list list; va_start(list, pState); vsnprintf(mState, sizeof(mState), pState, list); diff --git a/src/Game/Scene/LogoScene.cpp b/src/Game/Scene/LogoScene.cpp index f6b612c1c..383aec1be 100644 --- a/src/Game/Scene/LogoScene.cpp +++ b/src/Game/Scene/LogoScene.cpp @@ -39,14 +39,13 @@ namespace { NEW_NERVE(LogoSceneMountGameData, LogoScene, MountGameData); NEW_NERVE(LogoSceneWaitReadDoneSystemArchive, LogoScene, WaitReadDoneSystemArchive); NEW_NERVE(LogoSceneDeactive, LogoScene, Deactive); -}; +}; // namespace -LogoScene::LogoScene() : - Scene("LogoScene"), - mIsbnManager(nullptr), - mStrapLayout(nullptr), - mLogoFader(nullptr) -{ +LogoScene::LogoScene() + : Scene("LogoScene"), + mIsbnManager(nullptr), + mStrapLayout(nullptr), + mLogoFader(nullptr) { MainLoopFramework::sManager->mUseVFilter = false; MainLoopFramework::sManager->mUseAlpha = false; } @@ -60,8 +59,7 @@ LogoScene::~LogoScene() { void LogoScene::init() { if (MR::isEqualString(MR::getCurrentRegionPrefix(), "Cn")) { initNerve(&LogoSceneCensorshipFadein::sInstance); - } - else { + } else { initNerve(&LogoSceneStrapFadein::sInstance); } @@ -96,9 +94,7 @@ void LogoScene::draw() const { MR::clearZBuffer(); MR::drawInitFor2DModel(); - bool isCensorship = isNerve(&LogoSceneCensorshipFadein::sInstance) - || isNerve(&LogoSceneCensorshipDisplay::sInstance) - || isNerve(&LogoSceneCensorshipFadeout::sInstance); + bool isCensorship = isNerve(&LogoSceneCensorshipFadein::sInstance) || isNerve(&LogoSceneCensorshipDisplay::sInstance) || isNerve(&LogoSceneCensorshipFadeout::sInstance); if (isCensorship) { MR::setupDrawForNW4RLayout(1.0f, true); @@ -115,14 +111,7 @@ void LogoScene::draw() const { } bool LogoScene::isDisplayStrapRemineder() const { - return isNerve(&LogoSceneDeactive::sInstance) - || isNerve(&LogoSceneCensorshipFadein::sInstance) - || isNerve(&LogoSceneCensorshipDisplay::sInstance) - || isNerve(&LogoSceneCensorshipFadeout::sInstance) - || isNerve(&LogoSceneStrapFadein::sInstance) - || isNerve(&LogoSceneStrapDisplay::sInstance) - || isNerve(&LogoSceneStrapFadeout::sInstance) - || isNerve(&LogoSceneWaitReadDoneSystemArchive::sInstance); + return isNerve(&LogoSceneDeactive::sInstance) || isNerve(&LogoSceneCensorshipFadein::sInstance) || isNerve(&LogoSceneCensorshipDisplay::sInstance) || isNerve(&LogoSceneCensorshipFadeout::sInstance) || isNerve(&LogoSceneStrapFadein::sInstance) || isNerve(&LogoSceneStrapDisplay::sInstance) || isNerve(&LogoSceneStrapFadeout::sInstance) || isNerve(&LogoSceneWaitReadDoneSystemArchive::sInstance); } void LogoScene::exeCensorshipFadein() { @@ -179,10 +168,7 @@ void LogoScene::exeStrapDisplay() { MR::setAnimRate(mStrapLayout, 0.0f, 0); } - if (MR::isGreaterStep(this, STRAP_DISPLAY_MIN_FRAME) - && (MR::testCorePadTriggerAnyWithoutHome(WPAD_CHAN0) - || MR::isGreaterEqualStep(this, STRAP_DISPLAY_MAX_FRAME))) - { + if (MR::isGreaterStep(this, STRAP_DISPLAY_MIN_FRAME) && (MR::testCorePadTriggerAnyWithoutHome(WPAD_CHAN0) || MR::isGreaterEqualStep(this, STRAP_DISPLAY_MAX_FRAME))) { setNerve(&LogoSceneStrapFadeout::sInstance); } } diff --git a/src/Game/Scene/MultiSceneActor.cpp b/src/Game/Scene/MultiSceneActor.cpp index 71fd78a0f..62c99dff1 100644 --- a/src/Game/Scene/MultiSceneActor.cpp +++ b/src/Game/Scene/MultiSceneActor.cpp @@ -8,23 +8,21 @@ #include #include -MultiSceneActor::MultiSceneActor(const char* pName, const char* pModelName, bool param3) : - NameObj(pName), - mTranslation(0.0f, 0.0f, 0.0f), - mRotation(0.0f, 0.0f, 0.0f), - mScale(1.0f, 1.0f, 1.0f), - _30(true), - mModelManager(nullptr), - mEffectSystem(nullptr), - mEffectKeeper(nullptr), - mSpine(nullptr) -{ +MultiSceneActor::MultiSceneActor(const char* pName, const char* pModelName, bool param3) + : NameObj(pName), + mTranslation(0.0f, 0.0f, 0.0f), + mRotation(0.0f, 0.0f, 0.0f), + mScale(1.0f, 1.0f, 1.0f), + _30(true), + mModelManager(nullptr), + mEffectSystem(nullptr), + mEffectKeeper(nullptr), + mSpine(nullptr) { mModelManager = new ModelManager(); mModelManager->init(pModelName, nullptr, param3); } void MultiSceneActor::init(const JMapInfoIter& rIter) { - } void MultiSceneActor::movement() { @@ -226,8 +224,7 @@ namespace MultiScene { MtxPtr getJointMtx(const MultiSceneActor* pActor, const char* pParam2) { return MR::getJointMtx(pActor->getModelManager()->getJ3DModel(), (const char*)pParam2); } -}; +}; // namespace MultiScene void MultiSceneActor::control() { - } diff --git a/src/Game/Scene/PlacementStateChecker.cpp b/src/Game/Scene/PlacementStateChecker.cpp index ab51a8c8c..b3f68eb41 100644 --- a/src/Game/Scene/PlacementStateChecker.cpp +++ b/src/Game/Scene/PlacementStateChecker.cpp @@ -1,11 +1,9 @@ #include "Game/Scene/PlacementStateChecker.hpp" #include "Game/Scene/SceneObjHolder.hpp" -PlacementStateChecker::PlacementStateChecker(const char *pName) : - NameObj(pName), - mCurrentZoneId(-1) -{ - +PlacementStateChecker::PlacementStateChecker(const char* pName) + : NameObj(pName), + mCurrentZoneId(-1) { } void PlacementStateChecker::setCurrentPlacementZoneId(int zoneID) { @@ -24,4 +22,4 @@ namespace MR { PlacementStateChecker* getPlacementStateChecker() { return MR::getSceneObj(SceneObj_PlacementStateChecker); } -}; +}; // namespace MR diff --git a/src/Game/Scene/PlayTimerScene.cpp b/src/Game/Scene/PlayTimerScene.cpp index 2fd110dff..d08df49f5 100644 --- a/src/Game/Scene/PlayTimerScene.cpp +++ b/src/Game/Scene/PlayTimerScene.cpp @@ -15,15 +15,14 @@ namespace NrvPlayTimerScene { NEW_NERVE(PlayTimerSceneNormal, PlayTimerScene, Normal); NEW_NERVE(PlayTimerSceneTimeUp, PlayTimerScene, TimeUp); NEW_NERVE(PlayTimerSceneFadeoutAfterTimeUp, PlayTimerScene, FadeoutAfterTimeUp); -}; +}; // namespace NrvPlayTimerScene -PlayTimerScene::PlayTimerScene() : - Scene("PlayTimerScene"), - mTimeLimitLayout(nullptr), - mTimeUpLayout(nullptr), - mTimeUpWaitFrame(sTimeUpWaitFrame), - _20(nullptr) -{ +PlayTimerScene::PlayTimerScene() + : Scene("PlayTimerScene"), + mTimeLimitLayout(nullptr), + mTimeUpLayout(nullptr), + mTimeUpWaitFrame(sTimeUpWaitFrame), + _20(nullptr) { initNerve(&NrvPlayTimerScene::PlayTimerSceneNormal::sInstance); _20 = new ValueControl(30); @@ -76,7 +75,7 @@ void PlayTimerScene::update() { void PlayTimerScene::draw() const { J2DOrthoGraphSimple graph; graph.setPort(); - u8 color = MR::lerp(0, 255, _20->getValue()); + u8 color = MR::lerp(0, 255, _20->getValue()); JUtility::TColor v1; v1.r = color; v1.g = color; @@ -84,8 +83,8 @@ void PlayTimerScene::draw() const { v1.a = color; graph.setColor(v1, v1, v1, v1); - f32 height = JUTVideo::sManager->mRenderModeObj->efbHeight; - f32 width = MR::getScreenWidth(); + f32 height = JUTVideo::sManager->mRenderModeObj->efbHeight; + f32 width = MR::getScreenWidth(); TBox2f box(0.0f, 0.0f, 0.0f + height, 0.0f + width); graph.fillBox(box); } diff --git a/src/Game/Scene/ScenarioSelectScene.cpp b/src/Game/Scene/ScenarioSelectScene.cpp index bfbfde1d3..cfb3e8e6e 100644 --- a/src/Game/Scene/ScenarioSelectScene.cpp +++ b/src/Game/Scene/ScenarioSelectScene.cpp @@ -28,7 +28,7 @@ namespace NrvScenarioSelectScene { NEW_NERVE(ScenarioSelectSceneNrvWaitDisappearLayout, ScenarioSelectScene, WaitDisappearLayout); NEW_NERVE(ScenarioSelectSceneNrvWaitResumeInitializeThreadIfRequestedReset, ScenarioSelectScene, WaitResumeInitializeThreadIfRequestedReset); NEW_NERVE(ScenarioSelectSceneNrvWaitResumeInitializeThreadIfCanceledSelect, ScenarioSelectScene, WaitResumeInitializeThreadIfCanceledSelect); -}; +}; // namespace NrvScenarioSelectScene namespace { J3DDrawBuffer* createDrawBuffer() { @@ -44,23 +44,20 @@ namespace { return true; } - return false; } -}; +}; // namespace -ScenarioSelectScene::ScenarioSelectScene() : - Scene("シナリオ選択シーン"), - _14(0), - _15(0), - _16(0), - mScenarioLayout(nullptr), - mCinemaFrame(nullptr), - _28(0), - mEffectSystem(nullptr), - mCameraContext(nullptr) -{ - +ScenarioSelectScene::ScenarioSelectScene() + : Scene("シナリオ選択シーン"), + _14(0), + _15(0), + _16(0), + mScenarioLayout(nullptr), + mCinemaFrame(nullptr), + _28(0), + mEffectSystem(nullptr), + mCameraContext(nullptr) { } void ScenarioSelectScene::init() { @@ -155,7 +152,7 @@ bool ScenarioSelectScene::isExecForeground() const { bool ret = false; if (_14 && !isNerve(&NrvScenarioSelectScene::ScenarioSelectSceneNrvDeactive::sInstance)) { if (_15 == 0) { - ret = true; + ret = true; } } @@ -177,16 +174,16 @@ void ScenarioSelectScene::setupCameraMtx() const { bool ScenarioSelectScene::trySetCurrentScenarioNo() const { if (mScenarioLayout->_28) { if (!MR::isScenarioDecided()) { - s32 scenarioNo = mScenarioLayout->getSelectedScenarioNo(); - s32 placedNo = scenarioNo; + s32 scenarioNo = mScenarioLayout->getSelectedScenarioNo(); + s32 placedNo = scenarioNo; GalaxyStatusAccessor accessor = MR::makeCurrentGalaxyStatusAccessor(); if (accessor.isHiddenStar(scenarioNo)) { placedNo = MR::getPlacedHiddenStarScenarioNo(MR::getCurrentStageName(), scenarioNo); } - + MR::setCurrentScenarioNo(placedNo, scenarioNo); } - + return true; } @@ -224,18 +221,15 @@ void ScenarioSelectScene::exeDeactive() { } void ScenarioSelectScene::exeInvalidScenarioSelect() { - } void ScenarioSelectScene::exeStartScenarioSelect() { if (MR::isFirstStep(this)) { - bool isSpecificStage = MR::isStageKoopaVs3() - || MR::isEqualStageName("HeavensDoorGalaxy"); + bool isSpecificStage = MR::isStageKoopaVs3() || MR::isEqualStageName("HeavensDoorGalaxy"); if (isSpecificStage) { MR::openSystemWipeFade(-1); - } - else { + } else { MR::openSystemWipeWhiteFade(-1); } @@ -263,8 +257,7 @@ void ScenarioSelectScene::exeWaitScenarioSelect() { if (trySetCurrentScenarioNo()) { MR::endStarPointerMode(this); setNerve(&NrvScenarioSelectScene::ScenarioSelectSceneNrvWaitResumeInitializeThread::sInstance); - } - else if (mScenarioLayout->isCanceled()) { + } else if (mScenarioLayout->isCanceled()) { MR::endStarPointerMode(this); setNerve(&NrvScenarioSelectScene::ScenarioSelectSceneNrvWaitResumeInitializeThreadIfCanceledSelect::sInstance); } @@ -285,8 +278,7 @@ void ScenarioSelectScene::exeWaitInitializeEnd() { if (MR::isDead(mScenarioLayout)) { MR::Effect::forceDeleteAllEmitters(mEffectSystem); setNerve(&NrvScenarioSelectScene::ScenarioSelectSceneNrvDeactive::sInstance); - } - else if (mScenarioLayout->isReadyToDisappear()) { + } else if (mScenarioLayout->isReadyToDisappear()) { setNerve(&NrvScenarioSelectScene::ScenarioSelectSceneNrvWaitDisappearLayout::sInstance); } } @@ -329,5 +321,4 @@ void ScenarioSelectScene::exeWaitResumeInitializeThreadIfCanceledSelect() { } ScenarioSelectScene::~ScenarioSelectScene() { - } diff --git a/src/Game/Scene/Scene.cpp b/src/Game/Scene/Scene.cpp index 08df3a67d..726a3ae29 100644 --- a/src/Game/Scene/Scene.cpp +++ b/src/Game/Scene/Scene.cpp @@ -1,6 +1,7 @@ #include "Game/Scene/Scene.hpp" -Scene::Scene(const char *pName) : NerveExecutor(pName) { +Scene::Scene(const char* pName) + : NerveExecutor(pName) { mListExecutor = nullptr; _C = 0; mSceneObjHolder = nullptr; @@ -17,23 +18,18 @@ Scene::~Scene() { } void Scene::init() { - } void Scene::start() { - } void Scene::update() { - } - -void Scene::draw() const { +void Scene::draw() const { } void Scene::calcAnim() { - } void Scene::initNameObjListExecutor() { diff --git a/src/Game/Scene/SceneDataInitializer.cpp b/src/Game/Scene/SceneDataInitializer.cpp index 3f5a6fc63..b1c0ec512 100644 --- a/src/Game/Scene/SceneDataInitializer.cpp +++ b/src/Game/Scene/SceneDataInitializer.cpp @@ -3,7 +3,8 @@ #include "Game/Scene/SceneObjHolder.hpp" #include "Game/Screen/LuigiLetter.hpp" -SceneDataInitializer::SceneDataInitializer() : NameObj("SceneDataInitializer") { +SceneDataInitializer::SceneDataInitializer() + : NameObj("SceneDataInitializer") { mFileLoader = nullptr; mDataHolder = nullptr; } @@ -19,7 +20,7 @@ void SceneDataInitializer::startStageFileLoad() { void SceneDataInitializer::startStageFileLoadAfterScenarioSelected() { NameObjArchiveListCollector collector; - JMapInfoIter iter; + JMapInfoIter iter; iter.mInfo = nullptr; iter.mIndex = -1; @@ -52,5 +53,4 @@ void SceneDataInitializer::initAfterScenarioSelected() { } SceneDataInitializer::~SceneDataInitializer() { - } diff --git a/src/Game/Scene/SceneExecutor.cpp b/src/Game/Scene/SceneExecutor.cpp index caf54fdda..6376c834d 100644 --- a/src/Game/Scene/SceneExecutor.cpp +++ b/src/Game/Scene/SceneExecutor.cpp @@ -163,7 +163,7 @@ void SceneFunction::executeDrawBufferListNormalOpaBeforeVolumeShadow() { void SceneFunction::executeDrawBufferListNormalOpaBeforeSilhouette() { CategoryList::drawOpa(MR::DrawBufferType_NoShadowedMapObj); - CategoryList::drawOpa(MR::DrawBufferType_NoShadowedMapObjStrongLight); + CategoryList::drawOpa(MR::DrawBufferType_NoShadowedMapObjStrongLight); } void SceneFunction::executeDrawBufferListNormalOpa() { @@ -245,9 +245,8 @@ void SceneFunction::executeDrawListXlu() { MR::reinitGX(); CategoryList::execute(MR::DrawType_VolumeModel); CategoryList::execute(MR::DrawType_0x30); - if ( !MR::isDrawSpinDriverPathAtOpa() ) - { - CategoryList::execute(MR::DrawType_SpinDriverPathDrawer); + if (!MR::isDrawSpinDriverPathAtOpa()) { + CategoryList::execute(MR::DrawType_SpinDriverPathDrawer); } CategoryList::execute(MR::DrawType_ClipAreaDropLaser); CategoryList::execute(MR::DrawType_SpiderThread); diff --git a/src/Game/Scene/SceneFactory.cpp b/src/Game/Scene/SceneFactory.cpp index b709021e1..724d1f194 100644 --- a/src/Game/Scene/SceneFactory.cpp +++ b/src/Game/Scene/SceneFactory.cpp @@ -10,7 +10,7 @@ namespace { /* 0x4 */ Scene* (*mCreateFunc)(); }; - template + template Scene* createScene() { return new T(); } @@ -20,7 +20,7 @@ namespace { {"Intermission", createScene}, {"Logo", createScene}, }; -}; +}; // namespace namespace MR { Scene* createScene(const char* pName) { @@ -42,4 +42,4 @@ namespace MR { return (*pIter->mCreateFunc)(); } -}; +}; // namespace MR diff --git a/src/Game/Scene/SceneFunction.cpp b/src/Game/Scene/SceneFunction.cpp index f35eb6f1c..e36e8bd70 100644 --- a/src/Game/Scene/SceneFunction.cpp +++ b/src/Game/Scene/SceneFunction.cpp @@ -11,7 +11,7 @@ namespace { SceneDataInitializer* getSceneDataInitializer() { return MR::getSceneObj(SceneObj_SceneDataInitializer); } -}; +}; // namespace void SceneFunction::startStageFileLoad() { MR::createSceneObj(SceneObj_SceneDataInitializer); @@ -133,5 +133,4 @@ void CategoryList::requestMovementOff(MR::MovementType type) { } void SceneFunction::createHioBasicNode(Scene*) { - } diff --git a/src/Game/Scene/SceneNameObjListExecutor.cpp b/src/Game/Scene/SceneNameObjListExecutor.cpp index f36ffe81d..55e936e9f 100644 --- a/src/Game/Scene/SceneNameObjListExecutor.cpp +++ b/src/Game/Scene/SceneNameObjListExecutor.cpp @@ -2,211 +2,883 @@ namespace { const CategoryListInitialTable cMovementListInitTable[] = { - { 0, 1, }, - { 1, 16, }, - { 2, 1, }, - { 3, 16, }, - { 4, 1, }, - { 5, 1, }, - { 6, 32, }, - { 7, 16, }, - { 8, 1, }, - { 9, 1, }, - { 10, 1, }, - { 27, 1, }, - { 11, 1, }, - { 12, 32, }, - { 13, 256, }, - { 14, 96, }, - { 15, 32, }, - { 16, 1, }, - { 19, 8, }, - { 17, 8, }, - { 18, 16, }, - { 22, 1, }, - { 24, 1, }, - { 25, 1, }, - { 32, 1, }, - { 45, 1, }, - { 26, 1, }, - { 29, 96, }, - { 37, 16, }, - { 38, 32, }, - { 39, 1, }, - { 40, 96, }, - { 31, 128, }, - { 42, 1024, }, - { 43, 768, }, - { 21, 64, }, - { 28, 2048, }, - { 30, 1024, }, - { 41, 256, }, - { 34, 2048, }, - { 35, 512, }, - { 44, 512, }, - { 33, 512, }, - { 36, 8, }, - { 23, 4, }, - { 20, 1, }, - { -1, 0, }, + { + 0, + 1, + }, + { + 1, + 16, + }, + { + 2, + 1, + }, + { + 3, + 16, + }, + { + 4, + 1, + }, + { + 5, + 1, + }, + { + 6, + 32, + }, + { + 7, + 16, + }, + { + 8, + 1, + }, + { + 9, + 1, + }, + { + 10, + 1, + }, + { + 27, + 1, + }, + { + 11, + 1, + }, + { + 12, + 32, + }, + { + 13, + 256, + }, + { + 14, + 96, + }, + { + 15, + 32, + }, + { + 16, + 1, + }, + { + 19, + 8, + }, + { + 17, + 8, + }, + { + 18, + 16, + }, + { + 22, + 1, + }, + { + 24, + 1, + }, + { + 25, + 1, + }, + { + 32, + 1, + }, + { + 45, + 1, + }, + { + 26, + 1, + }, + { + 29, + 96, + }, + { + 37, + 16, + }, + { + 38, + 32, + }, + { + 39, + 1, + }, + { + 40, + 96, + }, + { + 31, + 128, + }, + { + 42, + 1024, + }, + { + 43, + 768, + }, + { + 21, + 64, + }, + { + 28, + 2048, + }, + { + 30, + 1024, + }, + { + 41, + 256, + }, + { + 34, + 2048, + }, + { + 35, + 512, + }, + { + 44, + 512, + }, + { + 33, + 512, + }, + { + 36, + 8, + }, + { + 23, + 4, + }, + { + 20, + 1, + }, + { + -1, + 0, + }, }; const CategoryListInitialTable cCalcAnimListInitTable[] = { - { 21, 1, }, - { 13, 96, }, - { 14, 32, }, - { 15, 8, }, - { 9, 8, }, - { 10, 32, }, - { 6, 96, }, - { 8, 2048, }, - { 3, 128, }, - { 0, 1280, }, - { 2, 1024, }, - { 5, 1280, }, - { 7, 256, }, - { 11, 768, }, - { 12, 256, }, - { 16, 512, }, - { 1, 96, }, - { 4, 512, }, - { 17, 128, }, - { 18, 128, }, - { 19, 1, }, - { 20, 2, }, - { -1, 0, }, + { + 21, + 1, + }, + { + 13, + 96, + }, + { + 14, + 32, + }, + { + 15, + 8, + }, + { + 9, + 8, + }, + { + 10, + 32, + }, + { + 6, + 96, + }, + { + 8, + 2048, + }, + { + 3, + 128, + }, + { + 0, + 1280, + }, + { + 2, + 1024, + }, + { + 5, + 1280, + }, + { + 7, + 256, + }, + { + 11, + 768, + }, + { + 12, + 256, + }, + { + 16, + 512, + }, + { + 1, + 96, + }, + { + 4, + 512, + }, + { + 17, + 128, + }, + { + 18, + 128, + }, + { + 19, + 1, + }, + { + 20, + 2, + }, + { + -1, + 0, + }, }; const DrawBufferInitialTable cDrawBufferListInitTable[] = { - { 38, 16, -1, 0, }, - { 4, 64, 3, 0, }, - { 29, 64, 3, 0, }, - { 20, 4, 0, 0, }, - { 21, 8, 0, 0, }, - { 22, 8, 0, 0, }, - { 23, 1, 2, 0, }, - { 16, 80, 1, 0, }, - { 18, 64, 1, 0, }, - { 19, 64, 1, 0, }, - { 31, 64, 1, 0, }, - { 0, 32, 3, 0, }, - { 24, 64, 3, 0, }, - { 25, 64, 3, 0, }, - { 26, 64, 3, 0, }, - { 27, 16, 1, 0, }, - { 28, 64, 1, 0, }, - { 40, 64, 3, 0, }, - { 17, 32, 1, 0, }, - { 11, 64, 3, 0, }, - { 12, 64, 1, 0, }, - { 13, 64, 3, 0, }, - { 14, 64, 2, 0, }, - { 15, 64, 1, 0, }, - { 8, 256, 3, 0, }, - { 9, 32, 2, 0, }, - { 10, 64, 1, 0, }, - { 39, 256, 3, 2, }, - { 32, 8, 3, 0, }, - { 33, 8, 1, 0, }, - { 34, 8, 3, 0, }, - { 5, 64, 3, 0, }, - { 1, 4, 3, 0, }, - { 2, 8, 3, 0, }, - { 3, 4, 3, 0, }, - { 6, 64, 3, 0, }, - { 7, 64, 3, 0, }, - { 35, 1, 3, 0, }, - { 30, 16, 3, 0, }, - { 36, 16, -1, 1, }, - { 37, 16, -1, 1, }, - { -1, 0, -1, 0, }, + { + 38, + 16, + -1, + 0, + }, + { + 4, + 64, + 3, + 0, + }, + { + 29, + 64, + 3, + 0, + }, + { + 20, + 4, + 0, + 0, + }, + { + 21, + 8, + 0, + 0, + }, + { + 22, + 8, + 0, + 0, + }, + { + 23, + 1, + 2, + 0, + }, + { + 16, + 80, + 1, + 0, + }, + { + 18, + 64, + 1, + 0, + }, + { + 19, + 64, + 1, + 0, + }, + { + 31, + 64, + 1, + 0, + }, + { + 0, + 32, + 3, + 0, + }, + { + 24, + 64, + 3, + 0, + }, + { + 25, + 64, + 3, + 0, + }, + { + 26, + 64, + 3, + 0, + }, + { + 27, + 16, + 1, + 0, + }, + { + 28, + 64, + 1, + 0, + }, + { + 40, + 64, + 3, + 0, + }, + { + 17, + 32, + 1, + 0, + }, + { + 11, + 64, + 3, + 0, + }, + { + 12, + 64, + 1, + 0, + }, + { + 13, + 64, + 3, + 0, + }, + { + 14, + 64, + 2, + 0, + }, + { + 15, + 64, + 1, + 0, + }, + { + 8, + 256, + 3, + 0, + }, + { + 9, + 32, + 2, + 0, + }, + { + 10, + 64, + 1, + 0, + }, + { + 39, + 256, + 3, + 2, + }, + { + 32, + 8, + 3, + 0, + }, + { + 33, + 8, + 1, + 0, + }, + { + 34, + 8, + 3, + 0, + }, + { + 5, + 64, + 3, + 0, + }, + { + 1, + 4, + 3, + 0, + }, + { + 2, + 8, + 3, + 0, + }, + { + 3, + 4, + 3, + 0, + }, + { + 6, + 64, + 3, + 0, + }, + { + 7, + 64, + 3, + 0, + }, + { + 35, + 1, + 3, + 0, + }, + { + 30, + 16, + 3, + 0, + }, + { + 36, + 16, + -1, + 1, + }, + { + 37, + 16, + -1, + 1, + }, + { + -1, + 0, + -1, + 0, + }, }; const CategoryListInitialTable cDrawListInitTable[] = { - { 60, 128, }, - { 61, 32, }, - { 62, 32, }, - { 63, 1, }, - { 64, 8, }, - { 66, 8, }, - { 65, 3, }, - { 67, 32, }, - { 68, 32, }, - { 69, 1, }, - { 45, 1, }, - { 47, 2, }, - { 48, 16, }, - { 49, 1, }, - { 59, 1, }, - { 70, 1, }, - { 46, 1, }, - { 78, 1, }, - { 81, 1, }, - { 38, 256, }, - { 39, 1024, }, - { 40, 4, }, - { 41, 1, }, - { 7, 8, }, - { 8, 16, }, - { 9, 8, }, - { 10, 8, }, - { 11, 8, }, - { 12, 16, }, - { 13, 64, }, - { 51, 1, }, - { 56, 16, }, - { 57, 16, }, - { 58, 1, }, - { 34, 4, }, - { 35, 4, }, - { 36, 4, }, - { 37, 1, }, - { 79, 1, }, - { 80, 1, }, - { 26, 64, }, - { 28, 64, }, - { 32, 8, }, - { 0, 256, }, - { 2, 64, }, - { 1, 64, }, - { 3, 64, }, - { 4, 64, }, - { 5, 64, }, - { 6, 64, }, - { 14, 1, }, - { 15, 1, }, - { 16, 32, }, - { 17, 64, }, - { 23, 32, }, - { 24, 256, }, - { 25, 16, }, - { 43, 1, }, - { 44, 1, }, - { 42, 256, }, - { 18, 64, }, - { 19, 64, }, - { 20, 64, }, - { 21, 1, }, - { 22, 64, }, - { 50, 2, }, - { 30, 1, }, - { 31, 8, }, - { 27, 256, }, - { 29, 1024, }, - { 52, 1, }, - { 53, 1, }, - { 54, 64, }, - { 33, 32, }, - { 55, 4, }, - { 71, 1, }, - { 72, 1, }, - { 73, 1, }, - { 76, 1, }, - { 77, 1, }, - { 74, 2, }, - { 75, 1, }, - { 82, 256, }, - { -1, 0, }, + { + 60, + 128, + }, + { + 61, + 32, + }, + { + 62, + 32, + }, + { + 63, + 1, + }, + { + 64, + 8, + }, + { + 66, + 8, + }, + { + 65, + 3, + }, + { + 67, + 32, + }, + { + 68, + 32, + }, + { + 69, + 1, + }, + { + 45, + 1, + }, + { + 47, + 2, + }, + { + 48, + 16, + }, + { + 49, + 1, + }, + { + 59, + 1, + }, + { + 70, + 1, + }, + { + 46, + 1, + }, + { + 78, + 1, + }, + { + 81, + 1, + }, + { + 38, + 256, + }, + { + 39, + 1024, + }, + { + 40, + 4, + }, + { + 41, + 1, + }, + { + 7, + 8, + }, + { + 8, + 16, + }, + { + 9, + 8, + }, + { + 10, + 8, + }, + { + 11, + 8, + }, + { + 12, + 16, + }, + { + 13, + 64, + }, + { + 51, + 1, + }, + { + 56, + 16, + }, + { + 57, + 16, + }, + { + 58, + 1, + }, + { + 34, + 4, + }, + { + 35, + 4, + }, + { + 36, + 4, + }, + { + 37, + 1, + }, + { + 79, + 1, + }, + { + 80, + 1, + }, + { + 26, + 64, + }, + { + 28, + 64, + }, + { + 32, + 8, + }, + { + 0, + 256, + }, + { + 2, + 64, + }, + { + 1, + 64, + }, + { + 3, + 64, + }, + { + 4, + 64, + }, + { + 5, + 64, + }, + { + 6, + 64, + }, + { + 14, + 1, + }, + { + 15, + 1, + }, + { + 16, + 32, + }, + { + 17, + 64, + }, + { + 23, + 32, + }, + { + 24, + 256, + }, + { + 25, + 16, + }, + { + 43, + 1, + }, + { + 44, + 1, + }, + { + 42, + 256, + }, + { + 18, + 64, + }, + { + 19, + 64, + }, + { + 20, + 64, + }, + { + 21, + 1, + }, + { + 22, + 64, + }, + { + 50, + 2, + }, + { + 30, + 1, + }, + { + 31, + 8, + }, + { + 27, + 256, + }, + { + 29, + 1024, + }, + { + 52, + 1, + }, + { + 53, + 1, + }, + { + 54, + 64, + }, + { + 33, + 32, + }, + { + 55, + 4, + }, + { + 71, + 1, + }, + { + 72, + 1, + }, + { + 73, + 1, + }, + { + 76, + 1, + }, + { + 77, + 1, + }, + { + 74, + 2, + }, + { + 75, + 1, + }, + { + 82, + 256, + }, + { + -1, + 0, + }, }; static bool sVar = true; -}; +}; // namespace void SceneNameObjListExecutor::initMovementList() { mMovementList = new NameObjCategoryList( diff --git a/src/Game/Scene/SceneNameObjMovementController.cpp b/src/Game/Scene/SceneNameObjMovementController.cpp index ea033ae50..493e10d27 100644 --- a/src/Game/Scene/SceneNameObjMovementController.cpp +++ b/src/Game/Scene/SceneNameObjMovementController.cpp @@ -47,16 +47,15 @@ namespace { CategoryList::requestMovementOn(MR::MovementType_AudCameraWatcher); CategoryList::requestMovementOn(MR::MovementType_AudEffectDirector); } -}; +}; // namespace namespace { NEW_NERVE(StopSceneStateControlNone, StopSceneStateControl, None); NEW_NERVE(StopSceneStateControlStopped, StopSceneStateControl, Stopped); -}; +}; // namespace -StopSceneStateControl::StopSceneStateControl() : - NerveExecutor("StopSceneStateControl") -{ +StopSceneStateControl::StopSceneStateControl() + : NerveExecutor("StopSceneStateControl") { initNerve(&::StopSceneStateControlNone::sInstance); _8 = MR::MovementControlType_0; @@ -71,19 +70,16 @@ void StopSceneStateControl::requestStopSceneFor(MR::MovementControlType param1, setNerve(&::StopSceneStateControlStopped::sInstance); executeStopCategories(param1); - } - else if (isNerve(&::StopSceneStateControlStopped::sInstance)) { + } else if (isNerve(&::StopSceneStateControlStopped::sInstance)) { return; } - } - else if (isNerve(&::StopSceneStateControlNone::sInstance)) { + } else if (isNerve(&::StopSceneStateControlNone::sInstance)) { _8 = param1; _C = pParam2; setNerve(&::StopSceneStateControlStopped::sInstance); executeStopCategories(param1); - } - else if (!isNerve(&::StopSceneStateControlStopped::sInstance)) { + } else if (!isNerve(&::StopSceneStateControlStopped::sInstance)) { return; } } @@ -103,8 +99,7 @@ void StopSceneStateControl::requestStopSceneOverwrite(const NameObj* pParam1) { setNerve(&::StopSceneStateControlStopped::sInstance); executeStopCategories(MR::MovementControlType_5); - } - else { + } else { if (isNerve(&::StopSceneStateControlNone::sInstance)) { return; } @@ -130,8 +125,7 @@ void StopSceneStateControl::requestPlaySceneFor(MR::MovementControlType param1, if (isNerve(&::StopSceneStateControlStopped::sInstance)) { return; } - } - else { + } else { if (isNerve(&::StopSceneStateControlNone::sInstance)) { return; } @@ -183,18 +177,15 @@ void StopSceneStateControl::executeStopCategories(MR::MovementControlType param1 } void StopSceneStateControl::exeNone() { - } void StopSceneStateControl::exeStopped() { - } -SceneNameObjMovementController::SceneNameObjMovementController() : - NameObj("SceneNameObjMovementController"), - _C(false), - mStopSceneStateControl(nullptr) -{ +SceneNameObjMovementController::SceneNameObjMovementController() + : NameObj("SceneNameObjMovementController"), + _C(false), + mStopSceneStateControl(nullptr) { mStopSceneStateControl = new StopSceneStateControl(); } @@ -232,4 +223,4 @@ namespace MR { void notifyRequestNameObjMovementOnOff() { getSceneNameObjMovementController()->notifyRequestNameObjMovementOnOff(true); } -}; +}; // namespace MR diff --git a/src/Game/Scene/SceneObjHolder.cpp b/src/Game/Scene/SceneObjHolder.cpp index f7c9b39b1..5fcd78442 100644 --- a/src/Game/Scene/SceneObjHolder.cpp +++ b/src/Game/Scene/SceneObjHolder.cpp @@ -446,4 +446,4 @@ namespace MR { return MR::getSceneObjHolder()->isExist(id); } -}; +}; // namespace MR diff --git a/src/Game/Scene/ScenePlayingResult.cpp b/src/Game/Scene/ScenePlayingResult.cpp index d99481199..d7a869e84 100644 --- a/src/Game/Scene/ScenePlayingResult.cpp +++ b/src/Game/Scene/ScenePlayingResult.cpp @@ -19,7 +19,7 @@ namespace { MR::requestOneUp(); } } -}; +}; // namespace void ScenePlayingResult::incCoin(int num) { s32 prevNum = mCoinNum; @@ -68,13 +68,10 @@ s32 ScenePlayingResult::getStarPieceNum() const { } ScenePlayingResult::~ScenePlayingResult() { - } -ScenePlayingResult::ScenePlayingResult() : - NameObj("プレイ結果保持"), - mCoinNum(0), - mPurpleCoinNum(0) -{ - +ScenePlayingResult::ScenePlayingResult() + : NameObj("プレイ結果保持"), + mCoinNum(0), + mPurpleCoinNum(0) { } diff --git a/src/Game/Scene/StageDataHolder.cpp b/src/Game/Scene/StageDataHolder.cpp index d5538737e..da60b7ef6 100644 --- a/src/Game/Scene/StageDataHolder.cpp +++ b/src/Game/Scene/StageDataHolder.cpp @@ -11,37 +11,31 @@ JMapInfoIter JMapInfo::end() const { } namespace { - static bool isPrioPlacementObjInfo(const char *pName) NO_INLINE { - return MR::isEqualStringCase(pName, "AreaObjInfo") - || MR::isEqualStringCase(pName, "PlanetObjInfo") - || MR::isEqualStringCase(pName, "DemoObjInfo") - || MR::isEqualStringCase(pName, "CameraCubeInfo"); + static bool isPrioPlacementObjInfo(const char* pName) NO_INLINE { + return MR::isEqualStringCase(pName, "AreaObjInfo") || MR::isEqualStringCase(pName, "PlanetObjInfo") || MR::isEqualStringCase(pName, "DemoObjInfo") || MR::isEqualStringCase(pName, "CameraCubeInfo"); } - static void calcPlacementInfoNum(int *a1, int *a2, const MR::AssignableArray &rArray) NO_INLINE { + static void calcPlacementInfoNum(int* a1, int* a2, const MR::AssignableArray& rArray) NO_INLINE { *a1 = 0; *a2 = 0; for (const JMapInfo* pInfo = rArray.begin(); pInfo != rArray.end(); pInfo++) { if (::isPrioPlacementObjInfo(pInfo->getName())) { int size; - + if (pInfo->mData != nullptr) { size = pInfo->mData->mNumEntries; - } - else { + } else { size = 0; } *a1 += size; - } - else { + } else { int size; if (pInfo->mData != nullptr) { size = pInfo->mData->mNumEntries; - } - else { + } else { size = 0; } @@ -50,19 +44,18 @@ namespace { } } - static void attachJmpInfoToPlacementInfoOrdered(PlacementInfoOrdered *a1, PlacementInfoOrdered *a2, PlacementInfoOrdered *a3, const MR::AssignableArray &rArray) NO_INLINE { + static void attachJmpInfoToPlacementInfoOrdered(PlacementInfoOrdered* a1, PlacementInfoOrdered* a2, PlacementInfoOrdered* a3, const MR::AssignableArray& rArray) NO_INLINE { for (const JMapInfo* pInfo = rArray.begin(); pInfo != rArray.end(); pInfo++) { if (::isPrioPlacementObjInfo(pInfo->getName())) { a1->attach(pInfo, nullptr); - } - else { + } else { a2->attach(pInfo, a3); } } } -}; +}; // namespace -void StageDataHolder::init(const JMapInfoIter &rIter) { +void StageDataHolder::init(const JMapInfoIter& rIter) { if (!mZoneID) { initTableData(); } @@ -149,15 +142,15 @@ void StageDataHolder::initPlacement() { _10C->initPlacement(); } -JMapInfo StageDataHolder::getCommonPathPointInfo(const JMapInfo **ppOut, int idx) const { +JMapInfo StageDataHolder::getCommonPathPointInfo(const JMapInfo** ppOut, int idx) const { const JMapInfo* pInfo = findJmpInfoFromArray(&mPathObjs, "CommonPathInfo"); - JMapInfoIter pathIter = pInfo->findElement("l_id", idx, 0); + JMapInfoIter pathIter = pInfo->findElement("l_id", idx, 0); return getCommonPathPointInfoFromRailDataIndex(ppOut, pathIter.mIndex); } -JMapInfo StageDataHolder::getCommonPathPointInfoFromRailDataIndex(const JMapInfo **ppInfo, int idx) const { +JMapInfo StageDataHolder::getCommonPathPointInfoFromRailDataIndex(const JMapInfo** ppInfo, int idx) const { const JMapInfo* pInfo = findJmpInfoFromArray(&mPathObjs, "CommonPathInfo"); - char buf[0x80]; + char buf[0x80]; snprintf(buf, sizeof(buf), "CommonPathPointInfo.%d", idx); *ppInfo = findJmpInfoFromArray(&mPathObjs, buf); return *pInfo; @@ -165,17 +158,17 @@ JMapInfo StageDataHolder::getCommonPathPointInfoFromRailDataIndex(const JMapInfo s32 StageDataHolder::getCurrentStartCameraId() const { JMapInfoIter marioIter = makeCurrentMarioJMapInfoIter(); - s32 cameraID; - bool ret = marioIter.mInfo->getValue(marioIter.mIndex, "Camera_id", &cameraID); + s32 cameraID; + bool ret = marioIter.mInfo->getValue(marioIter.mIndex, "Camera_id", &cameraID); if (ret) { return cameraID; - } + } return -1; } -void StageDataHolder::getStartCameraIdInfoFromStartDataIndex(JMapIdInfo *pInfo, int startDataIdx) const { +void StageDataHolder::getStartCameraIdInfoFromStartDataIndex(JMapIdInfo* pInfo, int startDataIdx) const { JMapInfoIter copy; JMapInfoIter startIter = getStartJMapInfoIterFromStartDataIndex(startDataIdx); copy = startIter; @@ -184,7 +177,7 @@ void StageDataHolder::getStartCameraIdInfoFromStartDataIndex(JMapIdInfo *pInfo, pInfo->initalize(cameraID, copy); } -const StageDataHolder* StageDataHolder::findPlacedStageDataHolder(const JMapInfoIter &rIter) const { +const StageDataHolder* StageDataHolder::findPlacedStageDataHolder(const JMapInfoIter& rIter) const { s32 data = (s32)rIter.mInfo->mData + rIter.mInfo->mData->mDataOffset + rIter.mInfo->mData->mEntrySize * rIter.mIndex; if (_E4 <= data && data < _E8) { @@ -195,7 +188,7 @@ const StageDataHolder* StageDataHolder::findPlacedStageDataHolder(const JMapInfo const StageDataHolder* pHolder = mStageDataArray[i]->findPlacedStageDataHolder(rIter); if (pHolder != nullptr) { - return pHolder; + return pHolder; } } @@ -209,7 +202,7 @@ const StageDataHolder* StageDataHolder::getStageDataHolderFromZoneId(int zoneID) for (s32 i = 0; i < mStageDataHolderCount; i++) { StageDataHolder* pHolder = mStageDataArray[i]; - s32 curZoneID = pHolder->mZoneID; + s32 curZoneID = pHolder->mZoneID; if (zoneID == curZoneID) { return pHolder; @@ -237,23 +230,23 @@ bool StageDataHolder::isPlacedZone(int zoneID) const { return false; } -const char* StageDataHolder::getJapaneseObjectName(const char *pName) const { - const JMapInfoIter englishName = mObjNameTbl->findElement("en_name", pName, 0); +const char* StageDataHolder::getJapaneseObjectName(const char* pName) const { + const JMapInfoIter englishName = mObjNameTbl->findElement("en_name", pName, 0); if (englishName == mObjNameTbl->end()) { return 0; } const char* japaneseName; - englishName.mInfo->getValue(englishName.mIndex, "jp_name", &japaneseName); + englishName.mInfo->getValue(englishName.mIndex, "jp_name", &japaneseName); return japaneseName; } -void* StageDataHolder::getStageArchiveResource(const char *pName) { +void* StageDataHolder::getStageArchiveResource(const char* pName) { return mArchive->getResource(0x3F3F3F3F, pName); } -s32 StageDataHolder::getStageArchiveResourceSize(void *pData) { +s32 StageDataHolder::getStageArchiveResourceSize(void* pData) { return mArchive->getResSize(pData); } @@ -264,14 +257,14 @@ void StageDataHolder::initPlacementMario() { MR::getObjectName(&objName, iter); CreationFuncPtr funcPtr = NameObjFactory::getCreator(objName); - NameObj* obj = funcPtr("マリオアクター"); + NameObj* obj = funcPtr("マリオアクター"); obj->init(iter); MR::clearCurrentPlacementZoneId(); } void StageDataHolder::initTableData() { JKRArchive* archive = (JKRArchive*)MR::receiveArchive("/StageData/ObjTableTable.arc"); - void* tableFile = archive->getResource(0x3F3F3F3F, "ObjNameTable.tbl"); + void* tableFile = archive->getResource(0x3F3F3F3F, "ObjNameTable.tbl"); mObjNameTbl = new JMapInfo(); mObjNameTbl->attach(tableFile); @@ -308,7 +301,7 @@ void StageDataHolder::initPlacementInfoOrderedCommon() { _100->sort(); } -const JMapInfo* StageDataHolder::findJmpInfoFromArray(const MR::AssignableArray *pInfoArr, const char *pName) const { +const JMapInfo* StageDataHolder::findJmpInfoFromArray(const MR::AssignableArray* pInfoArr, const char* pName) const { for (const JMapInfo* pInfo = pInfoArr->begin(); pInfo != pInfoArr->end(); pInfo++) { if (MR::isEqualStringCase(pInfo->getName(), pName)) { return pInfo; @@ -320,12 +313,12 @@ const JMapInfo* StageDataHolder::findJmpInfoFromArray(const MR::AssignableArray< JMapInfoIter StageDataHolder::getStartJMapInfoIterFromStartDataIndex(int idx_) const { int idx = idx_; - + for (JMapInfo* pInfo = mStartObjs.mArr; pInfo != mStartObjs.end(); pInfo++) { const JMapData* curData = pInfo->mData; - bool isValid = curData; - int curIdx = isValid ? curData->mNumEntries : 0; - + bool isValid = curData; + int curIdx = isValid ? curData->mNumEntries : 0; + if (idx < curIdx) { JMapInfoIter iter; iter.mInfo = pInfo; @@ -341,7 +334,7 @@ JMapInfoIter StageDataHolder::getStartJMapInfoIterFromStartDataIndex(int idx_) c for (s32 i = 0; i < mStageDataHolderCount; i++) { StageDataHolder* pHolder = mStageDataArray[i]; - int startPosNum = pHolder->getStartPosNum(); + int startPosNum = pHolder->getStartPosNum(); if (idx < startPosNum) { return pHolder->getStartJMapInfoIterFromStartDataIndex(idx); @@ -367,7 +360,7 @@ void StageDataHolder::calcDataAddress() { updateDataAddress(&mPathObjs); } -void StageDataHolder::calcPlacementMtx(const JMapInfoIter &rIter) { +void StageDataHolder::calcPlacementMtx(const JMapInfoIter& rIter) { TVec3f pos; rIter.getValue("pos_x", &pos.x); rIter.getValue("pos_y", &pos.y); @@ -381,7 +374,7 @@ void StageDataHolder::calcPlacementMtx(const JMapInfoIter &rIter) { MR::makeMtxTR(mPlacementMtx, pos, rot); } -void StageDataHolder::updateDataAddress(const MR::AssignableArray *pInfoArray) { +void StageDataHolder::updateDataAddress(const MR::AssignableArray* pInfoArray) { for (const JMapInfo* pInfo = pInfoArray->begin(); pInfo != pInfoArray->end(); pInfo++) { if ((u32)pInfo->mData < _E4) { _E4 = (u32)pInfo->mData; @@ -399,4 +392,4 @@ namespace MR { StageDataHolder* getStageDataHolder() { return getSceneObj(SceneObj_StageDataHolder); } -}; +}; // namespace MR diff --git a/src/Game/Scene/StageFileLoader.cpp b/src/Game/Scene/StageFileLoader.cpp index b80dfcc5d..35e376fa5 100644 --- a/src/Game/Scene/StageFileLoader.cpp +++ b/src/Game/Scene/StageFileLoader.cpp @@ -6,7 +6,7 @@ #include #include -StageFileLoader::StageFileLoader(const char *pName) { +StageFileLoader::StageFileLoader(const char* pName) { mZoneCount = 0; makeStageArchiveNameList(); } @@ -31,7 +31,7 @@ void StageFileLoader::makeStageArchiveNameList() { for (int i = 0; i < mZoneCount; i++) { const char* zoneName = access.getZoneName(i); - char path[0x100]; + char path[0x100]; snprintf(path, sizeof(path), "/StageData/%s.arc", zoneName); u32 len = strlen(path) + 1; mStageFiles[i] = new char[len]; @@ -39,17 +39,17 @@ void StageFileLoader::makeStageArchiveNameList() { } } -void StageFileLoader::makeStageArchiveName(char *buf, u32 len, const char *pZoneName) { +void StageFileLoader::makeStageArchiveName(char* buf, u32 len, const char* pZoneName) { snprintf(buf, len, "/StageData/%s.arc", pZoneName); } -void StageFileLoader::mountFilesInStageMapFile(const char *pName) { +void StageFileLoader::mountFilesInStageMapFile(const char* pName) { JKRArchive* archive = 0; - JKRHeap* heap = 0; + JKRHeap* heap = 0; MR::getMountedArchiveAndHeap(pName, &archive, &heap); - void* res; + void* res; const char* curName; - s32 fileCount = archive->countFile("/arc") - 2; + s32 fileCount = archive->countFile("/arc") - 2; if (fileCount > 0) { JKRArcFinder* firstFile = archive->getFirstFile("/arc"); diff --git a/src/Game/Scene/StageResourceLoader.cpp b/src/Game/Scene/StageResourceLoader.cpp index 674661244..e0d87e50f 100644 --- a/src/Game/Scene/StageResourceLoader.cpp +++ b/src/Game/Scene/StageResourceLoader.cpp @@ -8,4 +8,4 @@ namespace MR { bool isLoadStageScenarioResource() { return true; } -}; +}; // namespace MR diff --git a/src/Game/Scene/StopSceneController.cpp b/src/Game/Scene/StopSceneController.cpp index 2a35d17d8..c526b1faf 100644 --- a/src/Game/Scene/StopSceneController.cpp +++ b/src/Game/Scene/StopSceneController.cpp @@ -1,16 +1,18 @@ #include "Game/Scene/StopSceneController.hpp" #include "Game/Util.hpp" -StopSceneDelayRequest::StopSceneDelayRequest() : NameObj("シーン硬直遅延発行") { +StopSceneDelayRequest::StopSceneDelayRequest() + : NameObj("シーン硬直遅延発行") { _C = 0; _10 = 0; MR::connectToScene(this, 1, -1, -1, -1); } -StopSceneController::StopSceneController() : NameObj("StopSceneController") { +StopSceneController::StopSceneController() + : NameObj("StopSceneController") { mDelayRequests = nullptr; _10 = 0; - + mDelayRequests = new NameObjGroup("シーン硬直遅延発行者の管理", 16); for (s32 i = 0; i < 16; i++) { @@ -34,8 +36,7 @@ void StopSceneController::requestStopScene(s32 a1) { } _10 = a1; - } - else { + } else { _10 = a1; } } @@ -54,9 +55,7 @@ bool StopSceneController::isSceneStopped() const { } StopSceneDelayRequest::~StopSceneDelayRequest() { - } StopSceneController::~StopSceneController() { - } diff --git a/src/Game/Screen/BackButton.cpp b/src/Game/Screen/BackButton.cpp index 00e41efa6..a45ec037c 100644 --- a/src/Game/Screen/BackButton.cpp +++ b/src/Game/Screen/BackButton.cpp @@ -4,12 +4,11 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/SoundUtil.hpp" -BackButton::BackButton(const char* pName, bool param2) : - LayoutActor(pName, true), - mPaneCtrl(nullptr), - _24(false), - _25(true) -{ +BackButton::BackButton(const char* pName, bool param2) + : LayoutActor(pName, true), + mPaneCtrl(nullptr), + _24(false), + _25(true) { if (param2) { MR::connectToSceneLayoutDecoration(this); } @@ -43,7 +42,6 @@ bool BackButton::isPointing() const { } BackButton::~BackButton() { - } void BackButton::init(const JMapInfoIter& rIter) { diff --git a/src/Game/Screen/BatteryInfo.cpp b/src/Game/Screen/BatteryInfo.cpp index 999d64169..4c4642c14 100644 --- a/src/Game/Screen/BatteryInfo.cpp +++ b/src/Game/Screen/BatteryInfo.cpp @@ -10,7 +10,7 @@ namespace { static const s32 sDisplayFrameBatteryLow = 120; static const s32 sLowIntervalFrame = 18000; static const s32 sDisplayFrameBatteryNone = 450; -}; +}; // namespace namespace { NEW_NERVE(BatteryInfoEnought, BatteryInfo, Enought); @@ -25,14 +25,13 @@ namespace { NEW_NERVE(BatteryInfoNone, BatteryInfo, None); NEW_NERVE(BatteryInfoNoneDisappear, BatteryInfo, NoneDisappear); NEW_NERVE(BatteryInfoNoneHide, BatteryInfo, NoneHide); -}; +}; // namespace -BatteryInfo::BatteryInfo(LayoutActor* pHost, const char* pPaneName, int channel) : - NerveExecutor("BatteryInfo"), - mHost(pHost), - mPaneName(pPaneName), - mChannel(channel) -{ +BatteryInfo::BatteryInfo(LayoutActor* pHost, const char* pPaneName, int channel) + : NerveExecutor("BatteryInfo"), + mHost(pHost), + mPaneName(pPaneName), + mChannel(channel) { initNerve(&BatteryInfoNoneHide::sInstance); MR::createAndAddPaneCtrl(mHost, mPaneName, 1); MR::hidePane(mHost, mPaneName); @@ -45,11 +44,9 @@ void BatteryInfo::exeEnought() { if (MR::getWPad(mChannel)->getBattery() == -1) { setNerve(&BatteryInfoNoneHide::sInstance); - } - else if (MR::getWPad(mChannel)->getBattery() == 0) { + } else if (MR::getWPad(mChannel)->getBattery() == 0) { setNerve(&BatteryInfoCriticalAppear::sInstance); - } - else if (MR::getWPad(mChannel)->getBattery() == 1) { + } else if (MR::getWPad(mChannel)->getBattery() == 1) { setNerve(&BatteryInfoLowAppear::sInstance); } } @@ -87,18 +84,14 @@ void BatteryInfo::exeLowHide() { if (MR::getWPad(mChannel)->getBattery() == -1) { if (mChannel == WPAD_CHAN1) { setNerve(&BatteryInfoNoneAppear::sInstance); - } - else { + } else { setNerve(&BatteryInfoNoneHide::sInstance); } - } - else if (MR::getWPad(mChannel)->getBattery() == 0) { + } else if (MR::getWPad(mChannel)->getBattery() == 0) { setNerve(&BatteryInfoCriticalAppear::sInstance); - } - else if (MR::getWPad(mChannel)->getBattery() > 1) { + } else if (MR::getWPad(mChannel)->getBattery() > 1) { setNerve(&BatteryInfoEnought::sInstance); - } - else if (MR::isGreaterStep(this, sLowIntervalFrame)) { + } else if (MR::isGreaterStep(this, sLowIntervalFrame)) { setNerve(&BatteryInfoLowAppear::sInstance); } } @@ -178,8 +171,7 @@ bool BatteryInfo::tryChangeNerveWithBatteryLeftAlreadyAppear() { case -1: if (mChannel == WPAD_CHAN1) { pNerve = &BatteryInfoNoneAppear::sInstance; - } - else { + } else { pNerve = &BatteryInfoDisappear::sInstance; } break; @@ -203,12 +195,10 @@ bool BatteryInfo::tryChangeNerveWithBatteryLeftAlreadyAppear() { return false; } -BatteryLayout::BatteryLayout() : - LayoutActor("BatteryLayout", true), - mInfo1P(nullptr), - mInfo2P(nullptr) -{ - +BatteryLayout::BatteryLayout() + : LayoutActor("BatteryLayout", true), + mInfo1P(nullptr), + mInfo2P(nullptr) { } void BatteryLayout::init(const JMapInfoIter& rIter) { diff --git a/src/Game/Screen/BombTimerLayout.cpp b/src/Game/Screen/BombTimerLayout.cpp index 5aa2a4786..c9d98d964 100644 --- a/src/Game/Screen/BombTimerLayout.cpp +++ b/src/Game/Screen/BombTimerLayout.cpp @@ -12,14 +12,13 @@ namespace NrvBombTimerLayout { NEW_NERVE(BombTimerLayoutNrvWait, BombTimerLayout, Wait); NEW_NERVE(BombTimerLayoutNrvDanger, BombTimerLayout, Danger); NEW_NERVE(BombTimerLayoutNrvEnd, BombTimerLayout, End); -}; +}; // namespace NrvBombTimerLayout -BombTimerLayout::BombTimerLayout(bool param1) : - LayoutActor("ボムタイマーレイアウト", true), - mDangerTransFrame(sDangerTransFrame), - mFrame(0), - mIsSuspend(false) -{ +BombTimerLayout::BombTimerLayout(bool param1) + : LayoutActor("ボムタイマーレイアウト", true), + mDangerTransFrame(sDangerTransFrame), + mFrame(0), + mIsSuspend(false) { if (param1) { MR::connectToSceneLayout(this); } diff --git a/src/Game/Screen/BrosButton.cpp b/src/Game/Screen/BrosButton.cpp index 0fdc3b2c4..efa1a736a 100644 --- a/src/Game/Screen/BrosButton.cpp +++ b/src/Game/Screen/BrosButton.cpp @@ -10,13 +10,12 @@ namespace { NEW_NERVE(BrosButtonNrvSelect, BrosButton, Select); NEW_NERVE(BrosButtonNrvDecide, BrosButton, Decide); NEW_NERVE(BrosButtonNrvDisappear, BrosButton, Disappear); -}; +}; // namespace -BrosButton::BrosButton(const char* pName) : - LayoutActor(pName, true), - mIsSelectedMario(true), - mPaneCtrl(nullptr) -{} +BrosButton::BrosButton(const char* pName) + : LayoutActor(pName, true), + mIsSelectedMario(true), + mPaneCtrl(nullptr) {} void BrosButton::init(const JMapInfoIter& rIter) { initLayoutManager("BrosButton", 1); @@ -72,8 +71,7 @@ void BrosButton::exeSelect() { if (mIsSelectedMario == true) { MR::stopSystemSE("SE_SY_FILE_SEL_SW_LUIGI", 0); MR::startSystemSE("SE_SY_FILE_SEL_SW_MARIO", -1, -1); - } - else { + } else { MR::stopSystemSE("SE_SY_FILE_SEL_SW_MARIO", 0); MR::startSystemSE("SE_SY_FILE_SEL_SW_LUIGI", -1, -1); } @@ -82,7 +80,6 @@ void BrosButton::exeSelect() { } void BrosButton::exeDecide() { - } void BrosButton::exeDisappear() { diff --git a/src/Game/Screen/ButtonPaneController.cpp b/src/Game/Screen/ButtonPaneController.cpp index 708b3ca0a..7211ed951 100644 --- a/src/Game/Screen/ButtonPaneController.cpp +++ b/src/Game/Screen/ButtonPaneController.cpp @@ -19,27 +19,26 @@ namespace NrvButtonPaneController { NEW_NERVE(ButtonPaneControllerNrvDecidedWait, ButtonPaneController, DecidedWait); NEW_NERVE(ButtonPaneControllerNrvDecidedToDisappear, ButtonPaneController, DecidedToDisappear); NEW_NERVE(ButtonPaneControllerNrvDisappear, ButtonPaneController, Disappear); -}; +}; // namespace NrvButtonPaneController -ButtonPaneController::ButtonPaneController(LayoutActor* pHost, const char* pPaneName, const char* pBoundingPaneName, u32 animIndex, bool param5) : - NerveExecutor(pPaneName), - mHost(pHost), - mPaneName(pPaneName), - mBoundingPaneName(pBoundingPaneName), - mAnimIndex(animIndex), - _18(param5), - mPointingAnimStartFrame(0.0f), - mIsSelected(false), - mIsPointing(false), - _22(true), - _23(false), - mAppearAnimName("ButtonAppear"), - mWaitAnimName("ButtonWait"), - mDecideAnimName("ButtonDecide"), - mPointingAnimName("ButtonSelectIn"), - mNotPointingAnimName("ButtonSelectOut"), - mDisappearAnimName("ButtonEnd") -{ +ButtonPaneController::ButtonPaneController(LayoutActor* pHost, const char* pPaneName, const char* pBoundingPaneName, u32 animIndex, bool param5) + : NerveExecutor(pPaneName), + mHost(pHost), + mPaneName(pPaneName), + mBoundingPaneName(pBoundingPaneName), + mAnimIndex(animIndex), + _18(param5), + mPointingAnimStartFrame(0.0f), + mIsSelected(false), + mIsPointing(false), + _22(true), + _23(false), + mAppearAnimName("ButtonAppear"), + mWaitAnimName("ButtonWait"), + mDecideAnimName("ButtonDecide"), + mPointingAnimName("ButtonSelectIn"), + mNotPointingAnimName("ButtonSelectOut"), + mDisappearAnimName("ButtonEnd") { if (!MR::isExistPaneCtrl(pHost, pPaneName)) { MR::createAndAddPaneCtrl(pHost, pPaneName, 1); } @@ -64,8 +63,7 @@ void ButtonPaneController::appear() { if (mAppearAnimName != nullptr) { setNerve(&NrvButtonPaneController::ButtonPaneControllerNrvAppear::sInstance); - } - else { + } else { MR::showPane(mHost, mPaneName); setNerve(&NrvButtonPaneController::ButtonPaneControllerNrvWait::sInstance); } @@ -204,13 +202,10 @@ bool ButtonPaneController::tryPointing(bool param1) { return false; } - if (isNerve(&NrvButtonPaneController::ButtonPaneControllerNrvWait::sInstance) - || isNerve(&NrvButtonPaneController::ButtonPaneControllerNrvNotPointing::sInstance)) - { + if (isNerve(&NrvButtonPaneController::ButtonPaneControllerNrvWait::sInstance) || isNerve(&NrvButtonPaneController::ButtonPaneControllerNrvNotPointing::sInstance)) { if (isNerve(&NrvButtonPaneController::ButtonPaneControllerNrvNotPointing::sInstance)) { mPointingAnimStartFrame = calcPointingAnimStartFrame(); - } - else { + } else { mPointingAnimStartFrame = 0.0f; } @@ -230,8 +225,7 @@ bool ButtonPaneController::tryNotPointing(bool param1) { if (isNerve(&NrvButtonPaneController::ButtonPaneControllerNrvPointing::sInstance)) { if (isNerve(&NrvButtonPaneController::ButtonPaneControllerNrvPointing::sInstance)) { mPointingAnimStartFrame = calcPointingAnimStartFrame(); - } - else { + } else { mPointingAnimStartFrame = 0.0f; } @@ -295,8 +289,7 @@ void ButtonPaneController::exePointing() { if (tryNotPointing(isPointingPane())) { return; } - } - else if (tryNotPointing(mIsPointing)) { + } else if (tryNotPointing(mIsPointing)) { return; } } @@ -318,17 +311,14 @@ void ButtonPaneController::exeDecided() { if (_18) { setNerveAtAnimStopped(&NrvButtonPaneController::ButtonPaneControllerNrvDecidedToDisappear::sInstance); - } - else if (_22) { + } else if (_22) { setNerveAtAnimStopped(&NrvButtonPaneController::ButtonPaneControllerNrvDisappear::sInstance); - } - else { + } else { setNerveAtAnimStopped(&NrvButtonPaneController::ButtonPaneControllerNrvDecidedWait::sInstance); } } void ButtonPaneController::exeDecidedWait() { - } void ButtonPaneController::exeDecidedToDisappear() { @@ -338,8 +328,7 @@ void ButtonPaneController::exeDecidedToDisappear() { if (_22) { setNerveAtAnimStopped(&NrvButtonPaneController::ButtonPaneControllerNrvDisappear::sInstance); - } - else { + } else { setNerveAtAnimStopped(&NrvButtonPaneController::ButtonPaneControllerNrvDecidedWait::sInstance); } } diff --git a/src/Game/Screen/CameraInfo.cpp b/src/Game/Screen/CameraInfo.cpp index 8adaec779..18e9043f6 100644 --- a/src/Game/Screen/CameraInfo.cpp +++ b/src/Game/Screen/CameraInfo.cpp @@ -15,13 +15,12 @@ namespace NrvCameraInfo { NEW_NERVE(CameraInfoNrvNormal, CameraInfo, Normal); NEW_NERVE(CameraInfoNrvFirstPerson, CameraInfo, FirstPerson); NEW_NERVE(CameraInfoNrvEnd, CameraInfo, End); -}; +}; // namespace NrvCameraInfo -CameraInfo::CameraInfo(const char* pName) : - LayoutActor(pName, true), - mStep(-1), - mIsActive(true) -{} +CameraInfo::CameraInfo(const char* pName) + : LayoutActor(pName, true), + mStep(-1), + mIsActive(true) {} void CameraInfo::init(const JMapInfoIter& rIter) { initLayoutManager("CameraInfo", 2); @@ -106,22 +105,19 @@ void CameraInfo::exeNormal() { if (MR::isPossibleToShiftToFirstPersonCamera()) { MR::showPane(this, "LineU"); - } - else { + } else { MR::hidePane(this, "LineU"); } if (MR::isCameraPossibleToRoundLeft()) { MR::showPane(this, "LineL"); - } - else { + } else { MR::hidePane(this, "LineL"); } if (MR::isCameraPossibleToRoundRight()) { MR::showPane(this, "LineR"); - } - else { + } else { MR::hidePane(this, "LineR"); } @@ -159,8 +155,7 @@ void CameraInfo::updateCameraNG() { MR::showPane(this, "Forbid"); MR::startPaneAnim(this, "Forbid", "Forbid", 0); } - } - else if (MR::isPaneAnimStopped(this, "Forbid", 0)) { + } else if (MR::isPaneAnimStopped(this, "Forbid", 0)) { MR::hidePane(this, "Forbid"); } } @@ -197,10 +192,7 @@ bool CameraInfo::tryShow() { return false; } - bool isTriggerAnyDir = MR::testCorePadTriggerUp(WPAD_CHAN0) - || MR::testCorePadTriggerDown(WPAD_CHAN0) - || MR::testCorePadTriggerLeft(WPAD_CHAN0) - || MR::testCorePadTriggerRight(WPAD_CHAN0); + bool isTriggerAnyDir = MR::testCorePadTriggerUp(WPAD_CHAN0) || MR::testCorePadTriggerDown(WPAD_CHAN0) || MR::testCorePadTriggerLeft(WPAD_CHAN0) || MR::testCorePadTriggerRight(WPAD_CHAN0); if (!isTriggerAnyDir) { return false; @@ -224,10 +216,7 @@ bool CameraInfo::tryHide() { return false; } - bool isTriggerAnyDir = MR::testCorePadTriggerUp(WPAD_CHAN0) - || MR::testCorePadTriggerDown(WPAD_CHAN0) - || MR::testCorePadTriggerLeft(WPAD_CHAN0) - || MR::testCorePadTriggerRight(WPAD_CHAN0); + bool isTriggerAnyDir = MR::testCorePadTriggerUp(WPAD_CHAN0) || MR::testCorePadTriggerDown(WPAD_CHAN0) || MR::testCorePadTriggerLeft(WPAD_CHAN0) || MR::testCorePadTriggerRight(WPAD_CHAN0); if (isTriggerAnyDir || getNerveStep() == 0) { mStep = 0; @@ -253,8 +242,7 @@ bool CameraInfo::tryChangeCameraStateNerve() { } return false; - } - else if (!isNerve(&NrvCameraInfo::CameraInfoNrvNormal::sInstance)) { + } else if (!isNerve(&NrvCameraInfo::CameraInfoNrvNormal::sInstance)) { setNerve(&NrvCameraInfo::CameraInfoNrvNormal::sInstance); return true; diff --git a/src/Game/Screen/CaptureScreenDirector.cpp b/src/Game/Screen/CaptureScreenDirector.cpp index a7dba246c..0af8dc593 100644 --- a/src/Game/Screen/CaptureScreenDirector.cpp +++ b/src/Game/Screen/CaptureScreenDirector.cpp @@ -9,22 +9,20 @@ namespace { const TimingInfo cTimingInfo[] = { - { "GameScreen", 32, true, 1 }, - { "Indirect", 1, false, 0 }, - { "Camera", 4, true, 1 }, - { "WipeMap", 5, true, 1 }, - { "SystemWipe", 20, false, 1 }, - { "Unused", 16, false, 0 } - }; + {"GameScreen", 32, true, 1}, + {"Indirect", 1, false, 0}, + {"Camera", 4, true, 1}, + {"WipeMap", 5, true, 1}, + {"SystemWipe", 20, false, 1}, + {"Unused", 16, false, 0}}; }; -CaptureScreenDirector::CaptureScreenDirector() : - NameObj("画面キャプチャ"), - _C(nullptr), - mTimingType("Indirect"), - mTexture(nullptr), - _18(false) -{ +CaptureScreenDirector::CaptureScreenDirector() + : NameObj("画面キャプチャ"), + _C(nullptr), + mTimingType("Indirect"), + mTexture(nullptr), + _18(false) { MR::CurrentHeapRestorer heapRestorer(MR::getStationedHeapGDDR3()); mTexture = new JUTTexture( @@ -104,10 +102,9 @@ const TimingInfo* CaptureScreenDirector::findFromName(const char* pName) const { return nullptr; } -CaptureScreenActor::CaptureScreenActor(u32 param1, const char* pCameraName) : - NameObj("画面キャプチャ"), - mCameraName(pCameraName) -{ +CaptureScreenActor::CaptureScreenActor(u32 param1, const char* pCameraName) + : NameObj("画面キャプチャ"), + mCameraName(pCameraName) { MR::connectToScene(this, -1, -1, -1, param1); } diff --git a/src/Game/Screen/CenterScreenBlur.cpp b/src/Game/Screen/CenterScreenBlur.cpp index 4c58307b0..99c722b40 100644 --- a/src/Game/Screen/CenterScreenBlur.cpp +++ b/src/Game/Screen/CenterScreenBlur.cpp @@ -9,18 +9,16 @@ namespace NrvCenterScreenBlur { NEW_NERVE(CenterScreenBlurNrvFadeIn, CenterScreenBlur, FadeIn); NEW_NERVE(CenterScreenBlurNrvKeep, CenterScreenBlur, Keep); NEW_NERVE(CenterScreenBlurNrvFadeOut, CenterScreenBlur, FadeOut); -}; +}; // namespace NrvCenterScreenBlur -CenterScreenBlur::CenterScreenBlur() : - LiveActor("画面中心ブラー"), - _8C(0), - _90(0), - _94(0), - _98(0.0f), - _9C(0), - _A0(0.0f) -{ - +CenterScreenBlur::CenterScreenBlur() + : LiveActor("画面中心ブラー"), + _8C(0), + _90(0), + _94(0), + _98(0.0f), + _9C(0), + _A0(0.0f) { } void CenterScreenBlur::init(const JMapInfoIter& rIter) { @@ -42,7 +40,7 @@ void CenterScreenBlur::appear() { void CenterScreenBlur::draw() const { if (!MR::isDead(this)) { f32 a = _98 * _A0; - u8 b = _9C * _A0; + u8 b = _9C * _A0; MR::drawFullScreenBlur(a, a, b, b); } diff --git a/src/Game/Screen/CinemaFrame.cpp b/src/Game/Screen/CinemaFrame.cpp index a952b5f99..b05c2d7e9 100644 --- a/src/Game/Screen/CinemaFrame.cpp +++ b/src/Game/Screen/CinemaFrame.cpp @@ -12,11 +12,10 @@ namespace NrvCinemaFrame { NEW_NERVE(CinemaFrameNrvFrameToBlank, CinemaFrame, FrameToBlank); NEW_NERVE(CinemaFrameNrvBlankToFrame, CinemaFrame, BlankToFrame); NEW_NERVE(CinemaFrameNrvFrameToScreen, CinemaFrame, FrameToScreen); -}; +}; // namespace NrvCinemaFrame -CinemaFrame::CinemaFrame(bool param1) : - LayoutActor("シネマフレーム", true) -{ +CinemaFrame::CinemaFrame(bool param1) + : LayoutActor("シネマフレーム", true) { if (param1) { MR::connectToScene(this, 14, 13, -1, 69); } @@ -40,9 +39,7 @@ void CinemaFrame::tryScreenToFrame() { appear(); } - result = isNerve(&NrvCinemaFrame::CinemaFrameNrvFrame::sInstance) - || isNerve(&NrvCinemaFrame::CinemaFrameNrvScreenToFrame::sInstance) - || isNerve(&NrvCinemaFrame::CinemaFrameNrvBlankToFrame::sInstance); + result = isNerve(&NrvCinemaFrame::CinemaFrameNrvFrame::sInstance) || isNerve(&NrvCinemaFrame::CinemaFrameNrvScreenToFrame::sInstance) || isNerve(&NrvCinemaFrame::CinemaFrameNrvBlankToFrame::sInstance); if (!result) { setNerve(&NrvCinemaFrame::CinemaFrameNrvScreenToFrame::sInstance); @@ -56,8 +53,7 @@ void CinemaFrame::tryFrameToBlank() { appear(); } - result = isNerve(&NrvCinemaFrame::CinemaFrameNrvBlank::sInstance) - || isNerve(&NrvCinemaFrame::CinemaFrameNrvFrameToBlank::sInstance); + result = isNerve(&NrvCinemaFrame::CinemaFrameNrvBlank::sInstance) || isNerve(&NrvCinemaFrame::CinemaFrameNrvFrameToBlank::sInstance); if (!result) { setNerve(&NrvCinemaFrame::CinemaFrameNrvFrameToBlank::sInstance); @@ -71,9 +67,7 @@ void CinemaFrame::tryBlankToFrame() { appear(); } - result = isNerve(&NrvCinemaFrame::CinemaFrameNrvFrame::sInstance) - || isNerve(&NrvCinemaFrame::CinemaFrameNrvScreenToFrame::sInstance) - || isNerve(&NrvCinemaFrame::CinemaFrameNrvBlankToFrame::sInstance); + result = isNerve(&NrvCinemaFrame::CinemaFrameNrvFrame::sInstance) || isNerve(&NrvCinemaFrame::CinemaFrameNrvScreenToFrame::sInstance) || isNerve(&NrvCinemaFrame::CinemaFrameNrvBlankToFrame::sInstance); if (!result) { setNerve(&NrvCinemaFrame::CinemaFrameNrvBlankToFrame::sInstance); @@ -87,8 +81,7 @@ void CinemaFrame::tryFrameToScreen() { appear(); } - result = isNerve(&NrvCinemaFrame::CinemaFrameNrvScreen::sInstance) - || isNerve(&NrvCinemaFrame::CinemaFrameNrvFrameToScreen::sInstance); + result = isNerve(&NrvCinemaFrame::CinemaFrameNrvScreen::sInstance) || isNerve(&NrvCinemaFrame::CinemaFrameNrvFrameToScreen::sInstance); if (!result) { setNerve(&NrvCinemaFrame::CinemaFrameNrvFrameToScreen::sInstance); @@ -120,9 +113,7 @@ void CinemaFrame::forceToBlank() { } bool CinemaFrame::isStop() const { - return isNerve(&NrvCinemaFrame::CinemaFrameNrvScreen::sInstance) - || isNerve(&NrvCinemaFrame::CinemaFrameNrvFrame::sInstance) - || isNerve(&NrvCinemaFrame::CinemaFrameNrvBlank::sInstance); + return isNerve(&NrvCinemaFrame::CinemaFrameNrvScreen::sInstance) || isNerve(&NrvCinemaFrame::CinemaFrameNrvFrame::sInstance) || isNerve(&NrvCinemaFrame::CinemaFrameNrvBlank::sInstance); } void CinemaFrame::exeScreen() { diff --git a/src/Game/Screen/CoinCounter.cpp b/src/Game/Screen/CoinCounter.cpp index 8d2dd4ab0..3aa7b9037 100644 --- a/src/Game/Screen/CoinCounter.cpp +++ b/src/Game/Screen/CoinCounter.cpp @@ -11,25 +11,24 @@ namespace { const s32 cInvalidCountUpInterval = 3; const f32 cAstroLocationOffsetY = 40.0f; -}; +}; // namespace namespace NrvCoinCounter { NEW_NERVE(CoinCounterNrvHide, CoinCounter, Hide); NEW_NERVE(CoinCounterNrvAppear, CoinCounter, Appear); NEW_NERVE(CoinCounterNrvWait, CoinCounter, Wait); NEW_NERVE(CoinCounterNrvDisappear, CoinCounter, Disappear); -}; +}; // namespace NrvCoinCounter -CoinCounter::CoinCounter(const char* pName) : - LayoutActor(pName, true), - mCoinNum(0), - mCoinDisplayNum(0), - mInvalidCountUpFrame(0), - mLayoutAppearer(nullptr), - mPaneRumbler(nullptr), - mIsForceAppear(false), - mFollowPos(0.0f, 0.0f) -{} +CoinCounter::CoinCounter(const char* pName) + : LayoutActor(pName, true), + mCoinNum(0), + mCoinDisplayNum(0), + mInvalidCountUpFrame(0), + mLayoutAppearer(nullptr), + mPaneRumbler(nullptr), + mIsForceAppear(false), + mFollowPos(0.0f, 0.0f) {} void CoinCounter::init(const JMapInfoIter& rIter) { initLayoutManager("CoinCounter", 2); @@ -88,8 +87,7 @@ void CoinCounter::updateCounter() { if (mInvalidCountUpFrame > 0) { mInvalidCountUpFrame--; - } - else if (mCoinDisplayNum < mCoinNum) { + } else if (mCoinDisplayNum < mCoinNum) { if (isNerve(&NrvCoinCounter::CoinCounterNrvWait::sInstance)) { mInvalidCountUpFrame = cInvalidCountUpInterval; mCoinDisplayNum++; @@ -102,8 +100,7 @@ void CoinCounter::updateCounter() { if (!isNerve(&NrvCoinCounter::CoinCounterNrvAppear::sInstance)) { if (!isNerve(&NrvCoinCounter::CoinCounterNrvWait::sInstance)) { setNerve(&NrvCoinCounter::CoinCounterNrvAppear::sInstance); - } - else { + } else { setNerve(&NrvCoinCounter::CoinCounterNrvWait::sInstance); } } @@ -113,8 +110,7 @@ void CoinCounter::updateCounter() { if (mCoinDisplayNum >= 100) { pPaneName = "Position100"; - } - else if (mCoinDisplayNum >= 10) { + } else if (mCoinDisplayNum >= 10) { pPaneName = "Position010"; } @@ -136,8 +132,7 @@ void CoinCounter::exeAppear() { if (MR::isStageAstroLocation()) { mLayoutAppearer->appear(TVec2f(0.0f, cAstroLocationOffsetY)); - } - else { + } else { mLayoutAppearer->appear(TVec2f(0.0f, 0.0f)); } diff --git a/src/Game/Screen/CometRetryButton.cpp b/src/Game/Screen/CometRetryButton.cpp index 79ed3d7f1..30c663c52 100644 --- a/src/Game/Screen/CometRetryButton.cpp +++ b/src/Game/Screen/CometRetryButton.cpp @@ -15,15 +15,13 @@ namespace NrvCometRetryButton { NEW_NERVE(HostTypeNrvDecided, CometRetryButton, Decided); NEW_NERVE(HostTypeNrvEndRetry, CometRetryButton, End); NEW_NERVE(HostTypeNrvEndGoBackAstroDome, CometRetryButton, End); -}; +}; // namespace NrvCometRetryButton -CometRetryButton::CometRetryButton(const char* pName) : - LayoutActor(pName, true), - mButtonYesPaneCtrl(nullptr), - mButtonNoPaneCtrl(nullptr), - mPlayerMissLeft(nullptr) -{ - +CometRetryButton::CometRetryButton(const char* pName) + : LayoutActor(pName, true), + mButtonYesPaneCtrl(nullptr), + mButtonNoPaneCtrl(nullptr), + mPlayerMissLeft(nullptr) { } // FIXME: There are a lot of register swaps. @@ -102,8 +100,7 @@ void CometRetryButton::exeWait() { if (mButtonYesPaneCtrl->trySelect() || mButtonNoPaneCtrl->trySelect()) { if (mButtonYesPaneCtrl->mIsSelected) { MR::startSystemSE("SE_SY_TALK_SELECT_YES", -1, -1); - } - else if (mButtonNoPaneCtrl->mIsSelected) { + } else if (mButtonNoPaneCtrl->mIsSelected) { MR::startSystemSE("SE_SY_TALK_SELECT_NO", -1, -1); } @@ -118,8 +115,7 @@ void CometRetryButton::exeDecided() { if (mButtonYesPaneCtrl->isDecidedWait()) { setNerve(&NrvCometRetryButton::HostTypeNrvEndRetry::sInstance); } - } - else if (mButtonNoPaneCtrl->mIsSelected) { + } else if (mButtonNoPaneCtrl->mIsSelected) { if (mButtonNoPaneCtrl->isDecidedWait()) { setNerve(&NrvCometRetryButton::HostTypeNrvEndGoBackAstroDome::sInstance); } @@ -137,8 +133,7 @@ void CometRetryButton::exeEnd() { if (mButtonYesPaneCtrl->isHidden() && mButtonNoPaneCtrl->isHidden()) { if (isNerve(&NrvCometRetryButton::HostTypeNrvEndRetry::sInstance)) { MR::requestChangeStageAfterMiss(); - } - else { + } else { MR::requestChangeStageGoBackAstroDome(); } diff --git a/src/Game/Screen/CountUpPaneRumbler.cpp b/src/Game/Screen/CountUpPaneRumbler.cpp index 7c255fa9a..c40b54ecd 100644 --- a/src/Game/Screen/CountUpPaneRumbler.cpp +++ b/src/Game/Screen/CountUpPaneRumbler.cpp @@ -7,12 +7,11 @@ namespace { const f32 cRumbleFreq = 2.0f; const f32 cRumbleAmp = 8.0f; const s32 cRumbleFrame = 15; -}; +}; // namespace -CountUpPaneRumbler::CountUpPaneRumbler(LayoutActor* pHost, const char* pPaneName) : - mRumbleCalculator(nullptr), - mPosition(0.0f, 0.0f) -{ +CountUpPaneRumbler::CountUpPaneRumbler(LayoutActor* pHost, const char* pPaneName) + : mRumbleCalculator(nullptr), + mPosition(0.0f, 0.0f) { mRumbleCalculator = new RumbleCalculatorCosMultLinear(cRumbleFreq, HALF_PI, cRumbleAmp, cRumbleFrame); connectPane(pHost, pPaneName); diff --git a/src/Game/Screen/CounterLayoutAppearer.cpp b/src/Game/Screen/CounterLayoutAppearer.cpp index 56973f2e2..52319e810 100644 --- a/src/Game/Screen/CounterLayoutAppearer.cpp +++ b/src/Game/Screen/CounterLayoutAppearer.cpp @@ -8,15 +8,14 @@ namespace NrvCounterLayoutAppearer { NEW_NERVE(CounterLayoutAppearerNrvAppear, CounterLayoutAppearer, Appear); NEW_NERVE(CounterLayoutAppearerNrvShow, CounterLayoutAppearer, Show); NEW_NERVE(CounterLayoutAppearerNrvDisappear, CounterLayoutAppearer, Disappear); -}; +}; // namespace NrvCounterLayoutAppearer -CounterLayoutAppearer::CounterLayoutAppearer(LayoutActor* pActor, const TVec2f& param2) : - NerveExecutor("カウンタ出現制御"), - mLayout(pActor), - _C(param2.x, param2.y), - mFollowPos(0.0f, 0.0f), - _1C(0.0f, 0.0f) -{ +CounterLayoutAppearer::CounterLayoutAppearer(LayoutActor* pActor, const TVec2f& param2) + : NerveExecutor("カウンタ出現制御"), + mLayout(pActor), + _C(param2.x, param2.y), + mFollowPos(0.0f, 0.0f), + _1C(0.0f, 0.0f) { MR::setFollowPos(&mFollowPos, pActor, nullptr); MR::setFollowTypeAdd(mLayout, nullptr); initNerve(&NrvCounterLayoutAppearer::CounterLayoutAppearerNrvHide::sInstance); @@ -73,7 +72,6 @@ void CounterLayoutAppearer::setAppearOffset(const TVec2f& param1) { } void CounterLayoutAppearer::exeHide() { - } void CounterLayoutAppearer::exeAppear() { diff --git a/src/Game/Screen/CounterLayoutController.cpp b/src/Game/Screen/CounterLayoutController.cpp index 21f84a7b0..a1cfe082a 100644 --- a/src/Game/Screen/CounterLayoutController.cpp +++ b/src/Game/Screen/CounterLayoutController.cpp @@ -16,23 +16,22 @@ namespace { const s32 cJudgeNotMovingFrame = 60; const s32 cShowWaitFrame = 240; -}; +}; // namespace namespace NrvCounterLayoutController { NEW_NERVE(CounterLayoutControllerNrvPlayerMoving, CounterLayoutController, PlayerMoving); NEW_NERVE(CounterLayoutControllerNrvPlayerNotMoving, CounterLayoutController, PlayerNotMoving); -}; +}; // namespace NrvCounterLayoutController -CounterLayoutController::CounterLayoutController() : - LayoutActor("カウンタ系レイアウト制御", true), - mPlayerNotMovingFrame(0), - _24(false), - mCoinCounter(nullptr), - mStarPieceCounter(nullptr), - mPlayerLeft(nullptr), - mStarCounter(nullptr), - mHPMeter(nullptr) -{} +CounterLayoutController::CounterLayoutController() + : LayoutActor("カウンタ系レイアウト制御", true), + mPlayerNotMovingFrame(0), + _24(false), + mCoinCounter(nullptr), + mStarPieceCounter(nullptr), + mPlayerLeft(nullptr), + mStarCounter(nullptr), + mHPMeter(nullptr) {} void CounterLayoutController::init(const JMapInfoIter& rIter) { MR::connectToSceneLayout(this); @@ -53,8 +52,7 @@ void CounterLayoutController::init(const JMapInfoIter& rIter) { void CounterLayoutController::appear() { if (_24) { mStarPieceCounter->appear(); - } - else { + } else { appearAllCounterWithoutStar(); } @@ -125,26 +123,15 @@ bool CounterLayoutController::isHiddenOrWaitAllLayout() const { */ bool CounterLayoutController::isPlayerMoving() const { - if (!MR::isPlayerElementModeHopper() - && !MR::isPlayerElementModeTeresa() - && !MR::isPlayerSwimming() - && !MR::isOnGroundPlayer()) - { + if (!MR::isPlayerElementModeHopper() && !MR::isPlayerElementModeTeresa() && !MR::isPlayerSwimming() && !MR::isOnGroundPlayer()) { return true; } - if (!MR::isNearZero(MR::getSubPadStickX(WPAD_CHAN0), 0.001f) - || !MR::isNearZero(MR::getSubPadStickY(WPAD_CHAN0), 0.001f) - || MR::testPadButtonAnyWithoutHome(WPAD_CHAN0) - || MR::isCorePadSwing(WPAD_CHAN0) - || MR::isSubPadSwing(WPAD_CHAN0)) - { + if (!MR::isNearZero(MR::getSubPadStickX(WPAD_CHAN0), 0.001f) || !MR::isNearZero(MR::getSubPadStickY(WPAD_CHAN0), 0.001f) || MR::testPadButtonAnyWithoutHome(WPAD_CHAN0) || MR::isCorePadSwing(WPAD_CHAN0) || MR::isSubPadSwing(WPAD_CHAN0)) { return true; } - if (isNerve(&NrvCounterLayoutController::CounterLayoutControllerNrvPlayerMoving::sInstance) - && !isHiddenOrWaitAllLayout()) - { + if (isNerve(&NrvCounterLayoutController::CounterLayoutControllerNrvPlayerMoving::sInstance) && !isHiddenOrWaitAllLayout()) { return true; } @@ -190,15 +177,13 @@ void CounterLayoutController::exePlayerMoving() { if (tryEndTicoEatStarPiece()) { setNerve(&NrvCounterLayoutController::CounterLayoutControllerNrvPlayerMoving::sInstance); - } - else if (!isPlayerMoving()) { + } else if (!isPlayerMoving()) { mPlayerNotMovingFrame++; if (mPlayerNotMovingFrame > cJudgeNotMovingFrame) { setNerve(&NrvCounterLayoutController::CounterLayoutControllerNrvPlayerNotMoving::sInstance); } - } - else { + } else { mPlayerNotMovingFrame = 0; } } @@ -212,8 +197,7 @@ void CounterLayoutController::exePlayerNotMoving() { if (tryEndTicoEatStarPiece()) { setNerve(&NrvCounterLayoutController::CounterLayoutControllerNrvPlayerNotMoving::sInstance); - } - else if (isPlayerMoving() && isWaitToDisappearCounter(this)) { + } else if (isPlayerMoving() && isWaitToDisappearCounter(this)) { hideAllLayout(); setNerve(&NrvCounterLayoutController::CounterLayoutControllerNrvPlayerMoving::sInstance); } diff --git a/src/Game/Screen/EncouragePal60Window.cpp b/src/Game/Screen/EncouragePal60Window.cpp index 1761dff0b..e6673dc17 100644 --- a/src/Game/Screen/EncouragePal60Window.cpp +++ b/src/Game/Screen/EncouragePal60Window.cpp @@ -10,11 +10,10 @@ namespace { NEW_NERVE(EncouragePal60WindowAppear, EncouragePal60Window, Appear); NEW_NERVE(EncouragePal60WindowDisplay, EncouragePal60Window, Display); NEW_NERVE(EncouragePal60WindowDisappear, EncouragePal60Window, Disappear); -}; +}; // namespace -EncouragePal60Window::EncouragePal60Window() : - LayoutActor("PAL60推奨画面", true) -{} +EncouragePal60Window::EncouragePal60Window() + : LayoutActor("PAL60推奨画面", true) {} void EncouragePal60Window::init(const JMapInfoIter& rIter) { initLayoutManager("SysPALInfo", 1); diff --git a/src/Game/Screen/ErrorMessageWindow.cpp b/src/Game/Screen/ErrorMessageWindow.cpp index a09d4a938..e8c6ed7d5 100644 --- a/src/Game/Screen/ErrorMessageWindow.cpp +++ b/src/Game/Screen/ErrorMessageWindow.cpp @@ -10,14 +10,12 @@ namespace { NEW_NERVE(ErrorMessageWindowDisplay, ErrorMessageWindow, Display); NEW_NERVE(ErrorMessageWindowDisappear, ErrorMessageWindow, Disappear); NEW_NERVE(ErrorMessageWindowDisappearBeforeAppear, ErrorMessageWindow, DisappearBeforeAppear); -}; +}; // namespace -ErrorMessageWindow::ErrorMessageWindow() : - LayoutActor("エラーメッセージ表示", false), - mMessageId(nullptr), - mTexture(nullptr) -{ - +ErrorMessageWindow::ErrorMessageWindow() + : LayoutActor("エラーメッセージ表示", false), + mMessageId(nullptr), + mTexture(nullptr) { } void ErrorMessageWindow::init(const JMapInfoIter& rIter) { @@ -46,8 +44,7 @@ void ErrorMessageWindow::appearWithMessage(const char* pMessageId, MessageType m if (MR::isDead(this)) { appear(); setNerve(&ErrorMessageWindowAppear::sInstance); - } - else { + } else { setNerve(&ErrorMessageWindowDisappearBeforeAppear::sInstance); } } @@ -81,8 +78,7 @@ void ErrorMessageWindow::exeAppear() { MR::hidePane(this, "ErrorMessage"); MR::replacePaneTexture(this, "PicDummy", mTexture, 0); MR::setTextBoxMessageRecursive(this, "ErrorTextHalf", pMessage); - } - else { + } else { MR::hidePane(this, "PicDummy"); MR::hidePane(this, "ErrorTextHalf"); MR::showPane(this, "ErrorMessage"); diff --git a/src/Game/Screen/FileSelectButton.cpp b/src/Game/Screen/FileSelectButton.cpp index 7994d4cb5..66a7a6f41 100644 --- a/src/Game/Screen/FileSelectButton.cpp +++ b/src/Game/Screen/FileSelectButton.cpp @@ -12,11 +12,10 @@ namespace { NEW_NERVE(FileSelectButtonNrvSelect, FileSelectButton, Select); NEW_NERVE(FileSelectButtonNrvWait, FileSelectButton, Wait); NEW_NERVE(FileSelectButtonNrvDisappear, FileSelectButton, Disappear); -}; +}; // namespace -FileSelectButton::FileSelectButton(const char* pName) : - LayoutActor(pName, true) -{ +FileSelectButton::FileSelectButton(const char* pName) + : LayoutActor(pName, true) { for (int i = 0; i < sizeof(mButtonCtrl) / sizeof(*mButtonCtrl); i++) { mButtonCtrl[i] = nullptr; mCallbackFunctor[i] = nullptr; @@ -63,8 +62,7 @@ void FileSelectButton::setCallbackFunctor( const MR::FunctorBase& rCopyFunctor, const MR::FunctorBase& rMiiFunctor, const MR::FunctorBase& rDeleteFunctor, - const MR::FunctorBase& rManualFunctor) -{ + const MR::FunctorBase& rManualFunctor) { mCallbackFunctor[0] = rStartFunctor.clone(nullptr); mCallbackFunctor[1] = rCopyFunctor.clone(nullptr); mCallbackFunctor[2] = rMiiFunctor.clone(nullptr); @@ -96,7 +94,6 @@ void FileSelectButton::exeSelect() { } void FileSelectButton::exeWait() { - } void FileSelectButton::exeDisappear() { diff --git a/src/Game/Screen/FileSelectInfo.cpp b/src/Game/Screen/FileSelectInfo.cpp index d39b4883b..4492b9c53 100644 --- a/src/Game/Screen/FileSelectInfo.cpp +++ b/src/Game/Screen/FileSelectInfo.cpp @@ -15,36 +15,35 @@ namespace { NEW_NERVE(FileSelectInfoNrvAppear, FileSelectInfo, Appear); NEW_NERVE(FileSelectInfoNrvDisplay, FileSelectInfo, Display); NEW_NERVE(FileSelectInfoNrvDisappear, FileSelectInfo, Disappear); -}; +}; // namespace namespace FileSelectInfoSub { NEW_NERVE(SlideStateNrvNormalPos, SlideState, NormalPos); NEW_NERVE(SlideStateNrvSliding, SlideState, Sliding); NEW_NERVE(SlideStateNrvSlidePos, SlideState, SlidePos); NEW_NERVE(SlideStateNrvSlidingBack, SlideState, SlidingBack); -}; +}; // namespace FileSelectInfoSub namespace FileSelectInfoSub { NEW_NERVE(CharaStateNrvMario, CharaState, Mario); NEW_NERVE(CharaStateNrvToLuigi, CharaState, ToLuigi); NEW_NERVE(CharaStateNrvLuigi, CharaState, Luigi); NEW_NERVE(CharaStateNrvToMario, CharaState, ToMario); -}; +}; // namespace FileSelectInfoSub // FIXME: Any issues are likely related to dynamically allocating memory for the wide character buffer. -FileSelectInfo::FileSelectInfo(s32 nameBufferSize, const char* pName) : - LayoutActor(pName, 1), - mNumber(0), - mStarNum(0), - mStarPieceNum(0), - mNameBufferSize(nameBufferSize * sizeof(wchar_t)), - mName(new wchar_t[nameBufferSize]), - mMissNum(-1), - mIsSelectedMarioPrev(true), - mIsSelectedMario(true), - mIsViewNormalEnding(false), - mIsViewCompleteEnding(false) -{ +FileSelectInfo::FileSelectInfo(s32 nameBufferSize, const char* pName) + : LayoutActor(pName, 1), + mNumber(0), + mStarNum(0), + mStarPieceNum(0), + mNameBufferSize(nameBufferSize * sizeof(wchar_t)), + mName(new wchar_t[nameBufferSize]), + mMissNum(-1), + mIsSelectedMarioPrev(true), + mIsSelectedMario(true), + mIsViewNormalEnding(false), + mIsViewCompleteEnding(false) { mSlideState = new FileSelectInfoSub::SlideState(this); mCharaState = new FileSelectInfoSub::CharaState(this); @@ -65,8 +64,7 @@ void FileSelectInfo::appear() { MR::startAnim(this, "Appear", 0); MR::setAnimFrame(this, animFrame, 0); - } - else { + } else { MR::startAnim(this, "Appear", 0); } @@ -80,8 +78,7 @@ void FileSelectInfo::disappear() { if (!MR::isDead(this) && !isNerve(&FileSelectInfoNrvDisappear::sInstance)) { if (isNerve(&FileSelectInfoNrvAppear::sInstance)) { animFrame = MR::getAnimFrame(this, 0); - } - else { + } else { MR::startAnim(this, "Appear", 0); animFrame = MR::getAnimCtrl(this, 0)->mEndFrame - 1.0f; @@ -103,17 +100,16 @@ void FileSelectInfo::slideBack() { } void FileSelectInfo::setInfo( - u16* pName, - s32 number, - s32 starNum, - s32 starPieceNum, - bool isSelectedMario, - bool isViewNormalEnding, - bool isViewCompleteEnding, + u16* pName, + s32 number, + s32 starNum, + s32 starPieceNum, + bool isSelectedMario, + bool isViewNormalEnding, + bool isViewCompleteEnding, const wchar_t* pDateMessage, const wchar_t* pTimeMessage, - s32 missNum) -{ + s32 missNum) { mNumber = number; mStarNum = starNum; mStarPieceNum = starPieceNum; @@ -136,18 +132,13 @@ void FileSelectInfo::change() { if (mIsSelectedMarioPrev && !mIsSelectedMario) { pCharaState = mCharaState; - if (!pCharaState->isNerve(&FileSelectInfoSub::CharaStateNrvLuigi::sInstance) - && !pCharaState->isNerve(&FileSelectInfoSub::CharaStateNrvToLuigi::sInstance)) - { + if (!pCharaState->isNerve(&FileSelectInfoSub::CharaStateNrvLuigi::sInstance) && !pCharaState->isNerve(&FileSelectInfoSub::CharaStateNrvToLuigi::sInstance)) { pCharaState->setNerve(&FileSelectInfoSub::CharaStateNrvToLuigi::sInstance); } - } - else if (!mIsSelectedMarioPrev && mIsSelectedMario) { + } else if (!mIsSelectedMarioPrev && mIsSelectedMario) { pCharaState = mCharaState; - if (!pCharaState->isNerve(&FileSelectInfoSub::CharaStateNrvMario::sInstance) - && !pCharaState->isNerve(&FileSelectInfoSub::CharaStateNrvToMario::sInstance)) - { + if (!pCharaState->isNerve(&FileSelectInfoSub::CharaStateNrvMario::sInstance) && !pCharaState->isNerve(&FileSelectInfoSub::CharaStateNrvToMario::sInstance)) { pCharaState->setNerve(&FileSelectInfoSub::CharaStateNrvToMario::sInstance); } } @@ -159,8 +150,7 @@ void FileSelectInfo::forceChange() { if (mIsSelectedMarioPrev && !mIsSelectedMario) { mCharaState->setNerve(&FileSelectInfoSub::CharaStateNrvLuigi::sInstance); reflectInfo(); - } - else if (!mIsSelectedMarioPrev && mIsSelectedMario) { + } else if (!mIsSelectedMarioPrev && mIsSelectedMario) { mCharaState->setNerve(&FileSelectInfoSub::CharaStateNrvMario::sInstance); reflectInfo(); } @@ -180,7 +170,6 @@ void FileSelectInfo::exeAppear() { void FileSelectInfo::exeDisplay() { if (MR::isFirstStep(this)) { - } } @@ -210,22 +199,19 @@ void FileSelectInfo::reflectInfo() { if (mMissNum >= 0) { MR::setTextBoxNumberRecursive(this, "MissCounter", mMissNum); MR::showPane(this, "MissCounter"); - } - else { + } else { MR::hidePane(this, "MissCounter"); } if (mIsViewNormalEnding) { MR::showPane(this, "Complete1"); - } - else { + } else { MR::hidePane(this, "Complete1"); } if (mIsViewCompleteEnding) { MR::showPane(this, "Complete2"); - } - else { + } else { MR::hidePane(this, "Complete2"); } @@ -237,22 +223,19 @@ void FileSelectInfo::reflectInfo() { if (mIsSelectedMarioPrev) { MR::showPane(this, "TxtMario"); MR::hidePane(this, "TxtLuigi"); - } - else { + } else { MR::hidePane(this, "TxtMario"); MR::showPane(this, "TxtLuigi"); } - } - else { + } else { MR::hidePane(this, "BrosIcon"); } } namespace FileSelectInfoSub { - SlideState::SlideState(FileSelectInfo* pHost) : - NerveExecutor("スライド状態"), - mHost(pHost) - { + SlideState::SlideState(FileSelectInfo* pHost) + : NerveExecutor("スライド状態"), + mHost(pHost) { initNerve(&SlideStateNrvNormalPos::sInstance); } @@ -289,13 +272,12 @@ namespace FileSelectInfoSub { setNerve(&SlideStateNrvNormalPos::sInstance); } } -}; +}; // namespace FileSelectInfoSub namespace FileSelectInfoSub { - CharaState::CharaState(FileSelectInfo* pHost) : - NerveExecutor("キャラ選択状態"), - mHost(pHost) - { + CharaState::CharaState(FileSelectInfo* pHost) + : NerveExecutor("キャラ選択状態"), + mHost(pHost) { initNerve(&CharaStateNrvMario::sInstance); } @@ -338,4 +320,4 @@ namespace FileSelectInfoSub { setNerve(&CharaStateNrvMario::sInstance); } } -}; +}; // namespace FileSelectInfoSub diff --git a/src/Game/Screen/FileSelectNumber.cpp b/src/Game/Screen/FileSelectNumber.cpp index d7146ba83..ce9882ba5 100644 --- a/src/Game/Screen/FileSelectNumber.cpp +++ b/src/Game/Screen/FileSelectNumber.cpp @@ -9,14 +9,12 @@ namespace { NEW_NERVE(FileSelectNumberNrvAppear, FileSelectNumber, Appear); NEW_NERVE(FileSelectNumberNrvWait, FileSelectNumber, Wait); NEW_NERVE(FileSelectNumberNrvEnd, FileSelectNumber, End); -}; +}; // namespace -FileSelectNumber::FileSelectNumber(const char* pName) : - LayoutActor(pName, true), - mNumber(-1), - mSelectAnimCtrl(nullptr) -{ - +FileSelectNumber::FileSelectNumber(const char* pName) + : LayoutActor(pName, true), + mNumber(-1), + mSelectAnimCtrl(nullptr) { } void FileSelectNumber::init(const JMapInfoIter& rIter) { @@ -29,15 +27,14 @@ void FileSelectNumber::init(const JMapInfoIter& rIter) { void FileSelectNumber::appear() { J3DFrameCtrl* pAnimCtrl; - f32 animFrame; + f32 animFrame; if (MR::isDead(this)) { LayoutActor::appear(); MR::startAnim(this, "Appear", 0); setNerve(&FileSelectNumberNrvAppear::sInstance); mSelectAnimCtrl->appear(); - } - else if (isNerve(&FileSelectNumberNrvEnd::sInstance)) { + } else if (isNerve(&FileSelectNumberNrvEnd::sInstance)) { animFrame = MR::getAnimFrame(this, 0); MR::startAnim(this, "Appear", 0); @@ -51,7 +48,7 @@ void FileSelectNumber::appear() { void FileSelectNumber::disappear() { J3DFrameCtrl* pAnimCtrl; - f32 animFrame; + f32 animFrame; if (isNerve(&FileSelectNumberNrvAppear::sInstance)) { animFrame = MR::getAnimFrame(this, 0); @@ -62,8 +59,7 @@ void FileSelectNumber::disappear() { MR::setAnimFrame(this, pAnimCtrl->mEndFrame - animFrame, 0); setNerve(&FileSelectNumberNrvEnd::sInstance); - } - else if (isNerve(&FileSelectNumberNrvWait::sInstance)) { + } else if (isNerve(&FileSelectNumberNrvWait::sInstance)) { MR::startAnim(this, "End", 0); setNerve(&FileSelectNumberNrvEnd::sInstance); } @@ -89,7 +85,6 @@ void FileSelectNumber::control() { void FileSelectNumber::exeAppear() { if (MR::isFirstStep(this)) { - } if (MR::isAnimStopped(this, 0)) { @@ -98,12 +93,10 @@ void FileSelectNumber::exeAppear() { } void FileSelectNumber::exeWait() { - } void FileSelectNumber::exeEnd() { if (MR::isFirstStep(this)) { - } if (MR::isAnimStopped(this, 0)) { @@ -117,10 +110,9 @@ namespace FileSelectNumberSub { NEW_NERVE(SelectAnimControllerNrvSelectOutStart, SelectAnimController, SelectOutStart); NEW_NERVE(SelectAnimControllerNrvSelectOut, SelectAnimController, SelectOut); - SelectAnimController::SelectAnimController(LayoutActor* pHost) : - NerveExecutor("セレクトアニメ制御"), - mHost(pHost) - { + SelectAnimController::SelectAnimController(LayoutActor* pHost) + : NerveExecutor("セレクトアニメ制御"), + mHost(pHost) { initNerve(&SelectAnimControllerNrvSelectOut::sInstance); } @@ -140,8 +132,7 @@ namespace FileSelectNumberSub { setNerve(&SelectAnimControllerNrvSelectInStart::sInstance); _C = nullptr; - } - else if (isNerve(&SelectAnimControllerNrvSelectOutStart::sInstance)) { + } else if (isNerve(&SelectAnimControllerNrvSelectOutStart::sInstance)) { _C = &SelectAnimControllerNrvSelectIn::sInstance; } } @@ -151,8 +142,7 @@ namespace FileSelectNumberSub { setNerve(&SelectAnimControllerNrvSelectOutStart::sInstance); _C = nullptr; - } - else if (isNerve(&SelectAnimControllerNrvSelectInStart::sInstance)) { + } else if (isNerve(&SelectAnimControllerNrvSelectInStart::sInstance)) { _C = &SelectAnimControllerNrvSelectOut::sInstance; } } @@ -165,8 +155,7 @@ namespace FileSelectNumberSub { if (MR::isAnimStopped(mHost, 0)) { if (_C == &SelectAnimControllerNrvSelectOut::sInstance) { setNerve(&SelectAnimControllerNrvSelectOutStart::sInstance); - } - else { + } else { setNerve(&SelectAnimControllerNrvSelectIn::sInstance); } @@ -175,7 +164,6 @@ namespace FileSelectNumberSub { } void SelectAnimController::exeSelectIn() { - } void SelectAnimController::exeSelectOutStart() { @@ -186,8 +174,7 @@ namespace FileSelectNumberSub { if (MR::isAnimStopped(mHost, 0)) { if (_C == &SelectAnimControllerNrvSelectIn::sInstance) { setNerve(&SelectAnimControllerNrvSelectInStart::sInstance); - } - else { + } else { setNerve(&SelectAnimControllerNrvSelectOut::sInstance); } @@ -196,6 +183,5 @@ namespace FileSelectNumberSub { } void SelectAnimController::exeSelectOut() { - } -}; +}; // namespace FileSelectNumberSub diff --git a/src/Game/Screen/FullnessMeter.cpp b/src/Game/Screen/FullnessMeter.cpp index 6832b00d1..658a00c04 100644 --- a/src/Game/Screen/FullnessMeter.cpp +++ b/src/Game/Screen/FullnessMeter.cpp @@ -10,14 +10,13 @@ namespace NrvFullnessMeter { NEW_NERVE(FullnessMeterNrvAppear, FullnessMeter, Appear); NEW_NERVE(FullnessMeterNrvWait, FullnessMeter, Wait); NEW_NERVE(FullnessMeterNrvEnd, FullnessMeter, End); -}; +}; // namespace NrvFullnessMeter -FullnessMeter::FullnessMeter(LiveActor *pHost, s32 a2, s32 a3) : - LayoutActor("満腹計", true), - _20(a3), - _24(a2), - mHost(pHost) -{ +FullnessMeter::FullnessMeter(LiveActor* pHost, s32 a2, s32 a3) + : LayoutActor("満腹計", true), + _20(a3), + _24(a2), + mHost(pHost) { MR::connectToSceneTalkLayout(this); initLayoutManager("StarPieceTargetMeter", 1); MR::createAndAddPaneCtrl(this, "TargetMeter", 1); @@ -28,7 +27,7 @@ FullnessMeter::FullnessMeter(LiveActor *pHost, s32 a2, s32 a3) : initNerve(&NrvFullnessMeter::FullnessMeterNrvAppear::sInstance); } -void FullnessMeter::init(const JMapInfoIter &rIter) { +void FullnessMeter::init(const JMapInfoIter& rIter) { MR::startPaneAnim(this, "TargetMeter", "Count", 0); MR::setPaneAnimFrameAndStop(this, "TargetMeter", 0.0f, 0); } @@ -67,8 +66,7 @@ void FullnessMeter::requestAppear() { void FullnessMeter::requestDisappear() { if (MR::isDead(this) || isNerve(&NrvFullnessMeter::FullnessMeterNrvEnd::sInstance)) { return; - } - else { + } else { setNerve(&NrvFullnessMeter::FullnessMeterNrvEnd::sInstance); MR::hideScreen(this); MR::startAnim(mTargetCounter, "End", 0); @@ -93,7 +91,6 @@ void FullnessMeter::exeAppear() { void FullnessMeter::exeWait() { if (MR::isFirstStep(this)) { - } } diff --git a/src/Game/Screen/GalaxyCometScreenFilter.cpp b/src/Game/Screen/GalaxyCometScreenFilter.cpp index df5cda287..9eb15396b 100644 --- a/src/Game/Screen/GalaxyCometScreenFilter.cpp +++ b/src/Game/Screen/GalaxyCometScreenFilter.cpp @@ -3,10 +3,9 @@ #include "Game/Util/ObjUtil.hpp" #include "Game/Util/LayoutUtil.hpp" -GalaxyCometScreenFilter::GalaxyCometScreenFilter() : - LayoutActor("コメット用画面塗り潰し", true), - _20(true) -{ +GalaxyCometScreenFilter::GalaxyCometScreenFilter() + : LayoutActor("コメット用画面塗り潰し", true), + _20(true) { MR::connectToScene(this, 14, 13, -1, 65); initLayoutManager("CometScreenFilter", 1); appear(); diff --git a/src/Game/Screen/GalaxyConfirmLayout.cpp b/src/Game/Screen/GalaxyConfirmLayout.cpp index 80ac0ff99..339cb63f3 100644 --- a/src/Game/Screen/GalaxyConfirmLayout.cpp +++ b/src/Game/Screen/GalaxyConfirmLayout.cpp @@ -10,14 +10,12 @@ namespace NrvGalaxyConfirmLayout { NEW_NERVE(GalaxyConfirmLayoutNrvSelecting, GalaxyConfirmLayout, Selecting); NEW_NERVE(GalaxyConfirmLayoutNrvSelectedBackButton, GalaxyConfirmLayout, SelectedBackButton); NEW_NERVE(GalaxyConfirmLayoutNrvSelected, GalaxyConfirmLayout, Selected); -}; +}; // namespace NrvGalaxyConfirmLayout -GalaxyConfirmLayout::GalaxyConfirmLayout() : - LayoutActor("ギャラクシー確認レイアウト", true), - mPaneCtrl(nullptr), - mBackButton(nullptr) -{ - +GalaxyConfirmLayout::GalaxyConfirmLayout() + : LayoutActor("ギャラクシー確認レイアウト", true), + mPaneCtrl(nullptr), + mBackButton(nullptr) { } void GalaxyConfirmLayout::init(const JMapInfoIter& rIter) { @@ -39,8 +37,7 @@ void GalaxyConfirmLayout::appear() { } bool GalaxyConfirmLayout::isSelected() const { - return isNerve(&NrvGalaxyConfirmLayout::GalaxyConfirmLayoutNrvSelected::sInstance) - || isNerve(&NrvGalaxyConfirmLayout::GalaxyConfirmLayoutNrvSelectedBackButton::sInstance); + return isNerve(&NrvGalaxyConfirmLayout::GalaxyConfirmLayoutNrvSelected::sInstance) || isNerve(&NrvGalaxyConfirmLayout::GalaxyConfirmLayoutNrvSelectedBackButton::sInstance); } bool GalaxyConfirmLayout::isSelectedYes() const { @@ -59,8 +56,7 @@ void GalaxyConfirmLayout::control() { void GalaxyConfirmLayout::exeSelecting() { if (mBackButton->_24) { setNerve(&NrvGalaxyConfirmLayout::GalaxyConfirmLayoutNrvSelectedBackButton::sInstance); - } - else { + } else { if (mPaneCtrl->isPointingTrigger()) { MR::startSystemSE("SE_SY_BUTTON_CURSOR_ON", -1, -1); } @@ -69,8 +65,7 @@ void GalaxyConfirmLayout::exeSelecting() { MR::startSystemSE("SE_SY_GALAXY_DECIDE_OK", -1, -1); mBackButton->disappear(); setNerve(&NrvGalaxyConfirmLayout::GalaxyConfirmLayoutNrvSelected::sInstance); - } - else if (!mBackButton->isAppearing() && !mPaneCtrl->isAppearing() && MR::testCorePadTriggerB(WPAD_CHAN0)) { + } else if (!mBackButton->isAppearing() && !mPaneCtrl->isAppearing() && MR::testCorePadTriggerB(WPAD_CHAN0)) { MR::startSystemSE("SE_SY_GALAXY_DECIDE_CANCEL", -1, -1); mPaneCtrl->disappear(); mBackButton->disappear(); diff --git a/src/Game/Screen/GalaxyMapBackground.cpp b/src/Game/Screen/GalaxyMapBackground.cpp index 4895ef05e..015ae657d 100644 --- a/src/Game/Screen/GalaxyMapBackground.cpp +++ b/src/Game/Screen/GalaxyMapBackground.cpp @@ -1,9 +1,8 @@ #include "Game/Screen/GalaxyMapBackground.hpp" #include "Game/Util/LayoutUtil.hpp" -GalaxyMapBackground::GalaxyMapBackground() : - LayoutActor("背景", true) -{ +GalaxyMapBackground::GalaxyMapBackground() + : LayoutActor("背景", true) { initLayoutManager("MapGalaxyBg", 1); } diff --git a/src/Game/Screen/GalaxyMapCometIcon.cpp b/src/Game/Screen/GalaxyMapCometIcon.cpp index c3f3a23fd..baab67a6e 100644 --- a/src/Game/Screen/GalaxyMapCometIcon.cpp +++ b/src/Game/Screen/GalaxyMapCometIcon.cpp @@ -2,12 +2,11 @@ #include "Game/Util/EventUtil.hpp" #include "Game/Util/LayoutUtil.hpp" -GalaxyMapCometIcon::GalaxyMapCometIcon(const char* pName, LayoutActor* pParam2, const char* pParam3) : - LayoutActor(pName, true), - _20(pName), - _24(pParam2), - _28(pParam3) -{} +GalaxyMapCometIcon::GalaxyMapCometIcon(const char* pName, LayoutActor* pParam2, const char* pParam3) + : LayoutActor(pName, true), + _20(pName), + _24(pParam2), + _28(pParam3) {} void GalaxyMapCometIcon::appear() { LayoutActor::appear(); @@ -25,11 +24,9 @@ void GalaxyMapCometIcon::calcAnimForCapture(const nw4r::lyt::DrawInfo& rDrawInfo } void GalaxyMapCometIcon::control() { - } GalaxyMapCometIcon::~GalaxyMapCometIcon() { - } void GalaxyMapCometIcon::init(const JMapInfoIter& rIter) { @@ -46,8 +43,7 @@ void GalaxyMapCometIcon::syncStatus() { if (cometId < 0) { MR::hideLayout(this); - } - else { + } else { MR::showLayout(this); MR::startAnim(this, "Color", 1); MR::setCometAnimFromId(this, cometId, 1); diff --git a/src/Game/Screen/GalaxyMapDomeIcon.cpp b/src/Game/Screen/GalaxyMapDomeIcon.cpp index 3e9465375..d90512ea6 100644 --- a/src/Game/Screen/GalaxyMapDomeIcon.cpp +++ b/src/Game/Screen/GalaxyMapDomeIcon.cpp @@ -20,16 +20,12 @@ namespace { rIter.getValue("MapPaneName", &pMapPaneName); rIter.getValue("name", &pName); - if (pMapPaneName != nullptr - && pName != nullptr - && strstr(pMapPaneName, _4) != nullptr) - { + if (pMapPaneName != nullptr && pName != nullptr && strstr(pMapPaneName, _4) != nullptr) { execute(pName); } } virtual void execute(const char* pParam1) { - } /* 0x04 */ char _4[11]; @@ -38,16 +34,12 @@ namespace { class CheckerIsExistNewGalaxy : public AstroDomeCheckerBase { public: - CheckerIsExistNewGalaxy(int param1) : - AstroDomeCheckerBase(param1) - { - + CheckerIsExistNewGalaxy(int param1) + : AstroDomeCheckerBase(param1) { } virtual void execute(const char* pParam1) { - if (MR::canOpenGalaxy(pParam1) - && !MR::isOnGameEventFlagGalaxyOpen(pParam1)) - { + if (MR::canOpenGalaxy(pParam1) && !MR::isOnGameEventFlagGalaxyOpen(pParam1)) { mIsPass = true; } } @@ -55,10 +47,8 @@ namespace { class CheckerIsComplete : public AstroDomeCheckerBase { public: - CheckerIsComplete(int param1) : - AstroDomeCheckerBase(param1) - { - + CheckerIsComplete(int param1) + : AstroDomeCheckerBase(param1) { } virtual void execute(const char* pParam1) { @@ -71,18 +61,16 @@ namespace { } } }; -}; +}; // namespace -GalaxyMapDomeIcon::GalaxyMapDomeIcon(int param1, LayoutActor* pHost, const char* pPaneName, const char* pParam4) : - LayoutActor(pPaneName, true), - _20(param1), - mHost(pHost), - mPaneName(pPaneName), - _2C(pParam4), - mNamePlate(nullptr), - mMode(0) -{ - +GalaxyMapDomeIcon::GalaxyMapDomeIcon(int param1, LayoutActor* pHost, const char* pPaneName, const char* pParam4) + : LayoutActor(pPaneName, true), + _20(param1), + mHost(pHost), + mPaneName(pPaneName), + _2C(pParam4), + mNamePlate(nullptr), + mMode(0) { } void GalaxyMapDomeIcon::appear() { @@ -133,14 +121,11 @@ void GalaxyMapDomeIcon::draw() const { s32 GalaxyMapDomeIcon::calcDomeStatus() const { if (isComplete()) { return 3; - } - else if (hasNewGalaxy()) { + } else if (hasNewGalaxy()) { return 1; - } - else if (MR::hasGrandStar(_20)) { + } else if (MR::hasGrandStar(_20)) { return 2; - } - else { + } else { return 0; } } @@ -174,8 +159,7 @@ void GalaxyMapDomeIcon::init(const JMapInfoIter& rIter) { void GalaxyMapDomeIcon::control() { if (MR::isHiddenPane(mHost, _2C)) { MR::hideLayout(mNamePlate); - } - else { + } else { MR::showLayout(mNamePlate); mNamePlate->show(MR::getScenarioNameOnCurrentLanguage("AstroDome", _20), false); } @@ -187,8 +171,7 @@ void GalaxyMapDomeIcon::syncStatus() { if (domeStatus == 0) { MR::hideLayout(this); MR::hidePane(mHost, _2C); - } - else { + } else { MR::showLayout(this); MR::showPane(mHost, _2C); } @@ -202,8 +185,7 @@ void GalaxyMapDomeIcon::syncStatus() { MR::startAnim(this, "SelectIn", 1); MR::setAnimFrameAndStopAtEnd(this, 1); MR::startAnim(this, "Blink", 0); - } - else { + } else { MR::startAnim(this, "Wait", 1); } } diff --git a/src/Game/Screen/GalaxyMapGalaxyPlain.cpp b/src/Game/Screen/GalaxyMapGalaxyPlain.cpp index b66013f3b..b565355f4 100644 --- a/src/Game/Screen/GalaxyMapGalaxyPlain.cpp +++ b/src/Game/Screen/GalaxyMapGalaxyPlain.cpp @@ -13,25 +13,23 @@ #ifdef __cplusplus extern "C" { - extern int swprintf(wchar_t*, size_t, const wchar_t*, ...); +extern int swprintf(wchar_t*, size_t, const wchar_t*, ...); }; #endif -GalaxyMapGalaxyPlain::GalaxyMapGalaxyPlain(const LayoutActor* pHost) : - LayoutActor("Galaxy情報簡易表示", true), - mHost(pHost), - mPaneName(nullptr), - mNamePlate(nullptr), - mGalaxyName(nullptr), - _30(false) -{ - +GalaxyMapGalaxyPlain::GalaxyMapGalaxyPlain(const LayoutActor* pHost) + : LayoutActor("Galaxy情報簡易表示", true), + mHost(pHost), + mPaneName(nullptr), + mNamePlate(nullptr), + mGalaxyName(nullptr), + _30(false) { } void GalaxyMapGalaxyPlain::show(const char* pGalaxyName, const char* pPaneName) { - wchar_t* pDstGalaxyName; + wchar_t* pDstGalaxyName; const wchar_t* pShortGalaxyName; - wchar_t* pFontTagIter; + wchar_t* pFontTagIter; appear(); @@ -40,16 +38,13 @@ void GalaxyMapGalaxyPlain::show(const char* pGalaxyName, const char* pPaneName) if (!MR::isOnGameEventFlagGalaxyOpen(pGalaxyName)) { swprintf(pDstGalaxyName, GALAXY_NAME_BUFFER_SIZE, L"?"); - } - else { + } else { pShortGalaxyName = MR::getGalaxyNameShortOnCurrentLanguage(pGalaxyName); - pFontTagIter = pDstGalaxyName - + swprintf(pDstGalaxyName, GALAXY_NAME_BUFFER_SIZE, L"%ls ", pShortGalaxyName); + pFontTagIter = pDstGalaxyName + swprintf(pDstGalaxyName, GALAXY_NAME_BUFFER_SIZE, L"%ls ", pShortGalaxyName); if (MR::isStarComplete(pGalaxyName)) { MR::addPictureFontTag(pFontTagIter, 80); - } - else { + } else { pFontTagIter = MR::addPictureFontTag(pFontTagIter, 55); pFontTagIter = MR::addPictureFontTag(pFontTagIter, 64); @@ -67,7 +62,7 @@ void GalaxyMapGalaxyPlain::init(const JMapInfoIter& rIter) { mNamePlate->initWithoutIter(); mNamePlate->setShowBalloonNozzle(false); - mGalaxyName = new(MR::getSceneHeapGDDR3(), 0) wchar_t[GALAXY_NAME_BUFFER_SIZE]; + mGalaxyName = new (MR::getSceneHeapGDDR3(), 0) wchar_t[GALAXY_NAME_BUFFER_SIZE]; } void GalaxyMapGalaxyPlain::appear() { diff --git a/src/Game/Screen/GalaxyMapMarioIcon.cpp b/src/Game/Screen/GalaxyMapMarioIcon.cpp index 4e9aa1d46..29782f829 100644 --- a/src/Game/Screen/GalaxyMapMarioIcon.cpp +++ b/src/Game/Screen/GalaxyMapMarioIcon.cpp @@ -2,11 +2,10 @@ #include "Game/Util/EventUtil.hpp" #include "Game/Util/LayoutUtil.hpp" -GalaxyMapMarioIcon::GalaxyMapMarioIcon(LayoutActor* pParam1, const char* pParam2) : - LayoutActor("マリオ", true), - _20(pParam1), - _24(pParam2) -{} +GalaxyMapMarioIcon::GalaxyMapMarioIcon(LayoutActor* pParam1, const char* pParam2) + : LayoutActor("マリオ", true), + _20(pParam1), + _24(pParam2) {} void GalaxyMapMarioIcon::init(const JMapInfoIter& rIter) { f32 animFrame; @@ -17,8 +16,7 @@ void GalaxyMapMarioIcon::init(const JMapInfoIter& rIter) { if (MR::isPlayerLuigi()) { animFrame = 1.0f; - } - else { + } else { animFrame = 0.0f; } diff --git a/src/Game/Screen/GalaxyMapSelectButton.cpp b/src/Game/Screen/GalaxyMapSelectButton.cpp index a73054555..5d97691db 100644 --- a/src/Game/Screen/GalaxyMapSelectButton.cpp +++ b/src/Game/Screen/GalaxyMapSelectButton.cpp @@ -13,14 +13,12 @@ namespace { NEW_NERVE(GalaxyMapSelectButtonBetweenListToMapFadein, GalaxyMapSelectButton, BetweenListToMapFadein); NEW_NERVE(GalaxyMapSelectButtonBetweenMapToListFadeout, GalaxyMapSelectButton, BetweenMapToListFadeout); NEW_NERVE(GalaxyMapSelectButtonBetweenMapToListFadein, GalaxyMapSelectButton, BetweenMapToListFadein); -}; +}; // namespace -GalaxyMapSelectButton::GalaxyMapSelectButton() : - LayoutActor("選択用ボタン", true), - _20(nullptr), - mPaneCtrl(nullptr) -{ - +GalaxyMapSelectButton::GalaxyMapSelectButton() + : LayoutActor("選択用ボタン", true), + _20(nullptr), + mPaneCtrl(nullptr) { } void GalaxyMapSelectButton::init(const JMapInfoIter& rIter) { @@ -60,14 +58,12 @@ void GalaxyMapSelectButton::changeToStarList() { } void GalaxyMapSelectButton::exeHide() { - } void GalaxyMapSelectButton::exeAstroMapWait() { if (_20 != nullptr && _20 == &GalaxyMapSelectButtonStarListWait::sInstance) { setNerve(&GalaxyMapSelectButtonBetweenMapToListFadeout::sInstance); - } - else if (mPaneCtrl->trySelect()) { + } else if (mPaneCtrl->trySelect()) { MR::startSystemSE("SE_SY_GALAMAP_DECIDE", -1, -1); } } diff --git a/src/Game/Screen/GalaxyMapTicoIcon.cpp b/src/Game/Screen/GalaxyMapTicoIcon.cpp index d9d13ae92..df9fa4e62 100644 --- a/src/Game/Screen/GalaxyMapTicoIcon.cpp +++ b/src/Game/Screen/GalaxyMapTicoIcon.cpp @@ -4,14 +4,13 @@ #include "Game/Util/LayoutUtil.hpp" #include -GalaxyMapTicoIcon::GalaxyMapTicoIcon(int exclamationGalaxyIndex, const char* pGalaxyName, LayoutActor* pHost, const char* pPaneName) : - LayoutActor(pGalaxyName, true), - mExclamationGalaxyIndex(exclamationGalaxyIndex), - mGalaxyName(pGalaxyName), - mHost(pHost), - mPaneName(nullptr), - mMode(0) -{ +GalaxyMapTicoIcon::GalaxyMapTicoIcon(int exclamationGalaxyIndex, const char* pGalaxyName, LayoutActor* pHost, const char* pPaneName) + : LayoutActor(pGalaxyName, true), + mExclamationGalaxyIndex(exclamationGalaxyIndex), + mGalaxyName(pGalaxyName), + mHost(pHost), + mPaneName(nullptr), + mMode(0) { u32 paneNameLen = strlen(pPaneName) + 1; mPaneName = new char[paneNameLen]; @@ -31,13 +30,11 @@ void GalaxyMapTicoIcon::appear() { } void GalaxyMapTicoIcon::syncStatus() { - f32 starPieceRate = static_cast(MR::getStarPieceNumGivingToTicoGalaxy(mExclamationGalaxyIndex)) - / MR::getStarPieceNumMaxGivingToTicoGalaxy(mExclamationGalaxyIndex); + f32 starPieceRate = static_cast(MR::getStarPieceNumGivingToTicoGalaxy(mExclamationGalaxyIndex)) / MR::getStarPieceNumMaxGivingToTicoGalaxy(mExclamationGalaxyIndex); if (!MR::isAppearGalaxy(mGalaxyName) || 1.0f <= starPieceRate) { MR::hideLayout(this); - } - else { + } else { MR::startAnim(this, "TicoMeter", 2); MR::setAnimFrameAndStop(this, starPieceRate * MR::getAnimFrameMax(this, 2), 2); @@ -45,8 +42,7 @@ void GalaxyMapTicoIcon::syncStatus() { MR::startAnim(this, "SelectIn", 0); MR::setAnimFrameAndStopAtEnd(this, 0); MR::startAnim(this, "Blink", 1); - } - else { + } else { MR::startAnim(this, "Wait", 0); MR::startAnim(this, "Blink", 1); MR::setAnimFrameAndStop(this, 0.0f, 1); diff --git a/src/Game/Screen/GalaxyMapTitle.cpp b/src/Game/Screen/GalaxyMapTitle.cpp index 7ec9004c0..652109212 100644 --- a/src/Game/Screen/GalaxyMapTitle.cpp +++ b/src/Game/Screen/GalaxyMapTitle.cpp @@ -8,12 +8,11 @@ namespace { NEW_NERVE(GalaxyMapTitleDisappear, GalaxyMapTitle, Disappear); NEW_NERVE(GalaxyMapTitleAppearToAnother, GalaxyMapTitle, AppearToAnother); NEW_NERVE(GalaxyMapTitleDisappearToAnother, GalaxyMapTitle, DisappearToAnother); -}; +}; // namespace -GalaxyMapTitle::GalaxyMapTitle() : - LayoutActor("MapTitle", true), - mMessageID(nullptr) -{} +GalaxyMapTitle::GalaxyMapTitle() + : LayoutActor("MapTitle", true), + mMessageID(nullptr) {} void GalaxyMapTitle::init(const JMapInfoIter& rIter) { initLayoutManager("MapTitle", 1); diff --git a/src/Game/Screen/GalaxyNamePlate.cpp b/src/Game/Screen/GalaxyNamePlate.cpp index 30b877f83..ba0fdd764 100644 --- a/src/Game/Screen/GalaxyNamePlate.cpp +++ b/src/Game/Screen/GalaxyNamePlate.cpp @@ -14,18 +14,17 @@ namespace NrvGalaxyNamePlate { NEW_NERVE(GalaxyNamePlateNrvAppearReady, GalaxyNamePlate, AppearReady); NEW_NERVE(GalaxyNamePlateNrvAppear, GalaxyNamePlate, Appear); NEW_NERVE(GalaxyNamePlateNrvWait, GalaxyNamePlate, Wait); -}; +}; // namespace NrvGalaxyNamePlate -GalaxyNamePlate::GalaxyNamePlate(const char* pGalaxyName, bool param2) : - LayoutActor("ギャラクシー名プレート", true), - mGalaxyName(pGalaxyName), - _24(false), - _25(false), - mShowBalloonNozzle(true), - mDrawerEntry(nullptr), - _2C(0), - _30(true) -{ +GalaxyNamePlate::GalaxyNamePlate(const char* pGalaxyName, bool param2) + : LayoutActor("ギャラクシー名プレート", true), + mGalaxyName(pGalaxyName), + _24(false), + _25(false), + mShowBalloonNozzle(true), + mDrawerEntry(nullptr), + _2C(0), + _30(true) { initLayoutManager("GalaxyNamePlate", 3); if (param2) { @@ -59,7 +58,7 @@ void GalaxyNamePlate::showOpen(bool a1) { show(MR::getGalaxyNameShortOnCurrentLanguage(mGalaxyName), 2, true, a1); } -void GalaxyNamePlate::show(const wchar_t *pName, bool a2) { +void GalaxyNamePlate::show(const wchar_t* pName, bool a2) { show(pName, 2, a2, true); } @@ -78,8 +77,7 @@ void GalaxyNamePlate::exeAppearReady() { if (!_24) { kill(); - } - else { + } else { MR::setNerveAtStep(this, &NrvGalaxyNamePlate::GalaxyNamePlateNrvAppear::sInstance, cAppearReadyFrame); } } @@ -92,8 +90,7 @@ void GalaxyNamePlate::exeAppear() { if (!_24) { kill(); - } - else { + } else { MR::setNerveAtAnimStopped(this, &NrvGalaxyNamePlate::GalaxyNamePlateNrvWait::sInstance, 0); } } diff --git a/src/Game/Screen/GalaxySelectBackButton.cpp b/src/Game/Screen/GalaxySelectBackButton.cpp index 0eeb43c04..74193f9f1 100644 --- a/src/Game/Screen/GalaxySelectBackButton.cpp +++ b/src/Game/Screen/GalaxySelectBackButton.cpp @@ -8,12 +8,10 @@ namespace NrvGalaxySelectBackButton { NEW_NERVE(GalaxySelectBackButtonNrvAppear, GalaxySelectBackButton, Appear); NEW_NERVE(GalaxySelectBackButtonNrvDisappear, GalaxySelectBackButton, Disappear); NEW_NERVE(GalaxySelectBackButtonNrvDecide, GalaxySelectBackButton, Decide); -}; +}; // namespace NrvGalaxySelectBackButton -GalaxySelectBackButton::GalaxySelectBackButton() : - LayoutActor("ギャラクシー選択戻るボタン", true) -{ - +GalaxySelectBackButton::GalaxySelectBackButton() + : LayoutActor("ギャラクシー選択戻るボタン", true) { } void GalaxySelectBackButton::init(const JMapInfoIter&) { diff --git a/src/Game/Screen/GamePauseSequence.cpp b/src/Game/Screen/GamePauseSequence.cpp index 192f55d2f..b16d54b21 100644 --- a/src/Game/Screen/GamePauseSequence.cpp +++ b/src/Game/Screen/GamePauseSequence.cpp @@ -16,15 +16,13 @@ namespace { NEW_NERVE(GamePauseSequenceActivePauseMenu, GamePauseSequence, ActivePauseMenu); NEW_NERVE(GamePauseSequenceActivePowerStarList, GamePauseSequence, ActivePowerStarList); NEW_NERVE(GamePauseSequenceSceneInformation, GamePauseSequence, SceneInformation); -}; +}; // namespace -GamePauseSequence::GamePauseSequence() : - LayoutActor("ポーズ画面管理", true), - mMenuType(ActivePause), - mPauseMenu(nullptr), - mWindowMenuFunc(nullptr) -{ - +GamePauseSequence::GamePauseSequence() + : LayoutActor("ポーズ画面管理", true), + mMenuType(ActivePause), + mPauseMenu(nullptr), + mWindowMenuFunc(nullptr) { } void GamePauseSequence::init(const JMapInfoIter& rIter) { @@ -36,7 +34,7 @@ void GamePauseSequence::init(const JMapInfoIter& rIter) { initNerve(&GamePauseSequenceDeactive::sInstance); } -void GamePauseSequence::initWindowMenu(const MR::FunctorBase &rFunc) { +void GamePauseSequence::initWindowMenu(const MR::FunctorBase& rFunc) { mWindowMenuFunc = rFunc.clone(nullptr); } @@ -68,7 +66,6 @@ void GamePauseSequence::deactivate() { } void GamePauseSequence::exeDeactive() { - } void GamePauseSequence::exeActivePauseMenu() { @@ -79,7 +76,6 @@ void GamePauseSequence::exeActivePauseMenu() { void GamePauseSequence::exeActivePowerStarList() { if (MR::isFirstStep(this)) { - } if (!MR::isActiveGalaxyMapLayout()) { @@ -88,5 +84,4 @@ void GamePauseSequence::exeActivePowerStarList() { } void GamePauseSequence::exeSceneInformation() { - } diff --git a/src/Game/Screen/GameSceneLayoutHolder.cpp b/src/Game/Screen/GameSceneLayoutHolder.cpp index eda708751..f1af5dc6f 100644 --- a/src/Game/Screen/GameSceneLayoutHolder.cpp +++ b/src/Game/Screen/GameSceneLayoutHolder.cpp @@ -14,21 +14,20 @@ #include "Game/Util/LayoutUtil.hpp" #include "Game/Util/ObjUtil.hpp" -GameSceneLayoutHolder::GameSceneLayoutHolder() : - NameObj("ゲームシーンのレイアウト保持"), - mCameraInfo(nullptr), - mInformationMessage(nullptr), - mMarioMeter(nullptr), - mMarioSubMeter(nullptr), - mMissLayout(nullptr), - mNoteCounter(nullptr), - mYesNoLayout(nullptr), - mPurpleCoinCounter(nullptr), - _30(false), - _31(false), - mCounterLayoutCtrl(nullptr), - mIsActiveDefaultGameLayout(true) -{ +GameSceneLayoutHolder::GameSceneLayoutHolder() + : NameObj("ゲームシーンのレイアウト保持"), + mCameraInfo(nullptr), + mInformationMessage(nullptr), + mMarioMeter(nullptr), + mMarioSubMeter(nullptr), + mMissLayout(nullptr), + mNoteCounter(nullptr), + mYesNoLayout(nullptr), + mPurpleCoinCounter(nullptr), + _30(false), + _31(false), + mCounterLayoutCtrl(nullptr), + mIsActiveDefaultGameLayout(true) { MR::joinToNameObjGroup(this, "IgnorePauseNameObj"); MR::connectToSceneLayoutMovement(this); @@ -183,4 +182,4 @@ namespace MR { GameSceneLayoutHolder* getGameSceneLayoutHolder() { return MR::getSceneObj(SceneObj_GameSceneLayoutHolder); } -}; +}; // namespace MR diff --git a/src/Game/Screen/GameStageClearSequence.cpp b/src/Game/Screen/GameStageClearSequence.cpp index 3207a1822..5ebd12bc4 100644 --- a/src/Game/Screen/GameStageClearSequence.cpp +++ b/src/Game/Screen/GameStageClearSequence.cpp @@ -11,15 +11,16 @@ namespace NrvGameStageClearSequence { NEW_NERVE(GameStageClearSequencePowerStarGetDemo, GameStageClearSequence, PowerStarGetDemo); NEW_NERVE(GameStageClearSequenceGrandStarGetDemo, GameStageClearSequence, GrandStarGetDemo); -}; +}; // namespace NrvGameStageClearSequence -GameStageClearSequence::GameStageClearSequence() : LayoutActor("ステージクリアシーケンス", true) { +GameStageClearSequence::GameStageClearSequence() + : LayoutActor("ステージクリアシーケンス", true) { mEffectLayout = nullptr; mFollowPos.x = 0.0f; mFollowPos.y = 0.0f; } -void GameStageClearSequence::init(const JMapInfoIter &rIter) { +void GameStageClearSequence::init(const JMapInfoIter& rIter) { mEffectLayout = new SimpleEffectLayout("スター取得", "GetStar", 1, -1); mEffectLayout->initWithoutIter(); MR::setFollowPos(&mFollowPos, mEffectLayout, nullptr); @@ -99,8 +100,7 @@ void GameStageClearSequence::exeGrandStarGetDemo() { if (MR::isStep(this, 53)) { if (PowerStar::isCurrentStageKoopaVs3()) { MR::startSubBGM("BGM_GRAND_STAR_GET_2", false); - } - else { + } else { MR::startSubBGM("BGM_GRAND_STAR_GET", false); } } @@ -120,8 +120,7 @@ void GameStageClearSequence::exeGrandStarGetDemo() { MR::requestChangeStageAfterStageClear(); kill(); } - } - else { + } else { if (MR::isStep(this, 670)) { MR::closeWipeCircle(-1); } diff --git a/src/Game/Screen/IconAButton.cpp b/src/Game/Screen/IconAButton.cpp index ae2cec72b..5d7e5683b 100644 --- a/src/Game/Screen/IconAButton.cpp +++ b/src/Game/Screen/IconAButton.cpp @@ -8,18 +8,16 @@ namespace NrvIconAButton { NEW_NERVE(IconAButtonNrvOpen, IconAButton, Open); NEW_NERVE(IconAButtonNrvWait, IconAButton, Wait); NEW_NERVE(IconAButtonNrvTerm, IconAButton, Term); -}; +}; // namespace NrvIconAButton -IconAButton::IconAButton(bool connectToScene, bool connectToPause) : - LayoutActor("Aボタンアイコン", true), - mFollowPos(0.0f, 0.0f), - mFollowActor(nullptr) -{ +IconAButton::IconAButton(bool connectToScene, bool connectToPause) + : LayoutActor("Aボタンアイコン", true), + mFollowPos(0.0f, 0.0f), + mFollowActor(nullptr) { if (connectToScene) { if (connectToPause) { MR::connectToSceneLayoutOnPause(this); - } - else { + } else { MR::connectToSceneTalkLayout(this); } } @@ -27,7 +25,7 @@ IconAButton::IconAButton(bool connectToScene, bool connectToPause) : mFollowPaneName[0] = '\0'; } -void IconAButton::init(const JMapInfoIter &rIter) { +void IconAButton::init(const JMapInfoIter& rIter) { initLayoutManager("IconAButton", 1); initNerve(&NrvIconAButton::IconAButtonNrvOpen::sInstance); MR::startAnim(this, "Appear", 0); @@ -35,7 +33,7 @@ void IconAButton::init(const JMapInfoIter &rIter) { kill(); } -void IconAButton::setFollowActorPane(LayoutActor *pActor, const char *pName) { +void IconAButton::setFollowActorPane(LayoutActor* pActor, const char* pName) { mFollowActor = pActor; snprintf(mFollowPaneName, sizeof(mFollowPaneName), "%s", pName); @@ -86,10 +84,7 @@ void IconAButton::openWithoutMessage() { void IconAButton::term() { bool isAlive = !MR::isDead(this); - if (isAlive - && (isNerve(&NrvIconAButton::IconAButtonNrvWait::sInstance) - || isNerve(&NrvIconAButton::IconAButtonNrvOpen::sInstance))) - { + if (isAlive && (isNerve(&NrvIconAButton::IconAButtonNrvWait::sInstance) || isNerve(&NrvIconAButton::IconAButtonNrvOpen::sInstance))) { setNerve(&NrvIconAButton::IconAButtonNrvTerm::sInstance); } } diff --git a/src/Game/Screen/IconComet.cpp b/src/Game/Screen/IconComet.cpp index 8eeb74255..5eba08bc8 100644 --- a/src/Game/Screen/IconComet.cpp +++ b/src/Game/Screen/IconComet.cpp @@ -7,18 +7,16 @@ namespace NrvIconComet { NEW_NERVE(IconCometNrvWait, IconComet, Wait); }; -IconComet::IconComet() : - LayoutActor("コメットアイコン", true) -{ - +IconComet::IconComet() + : LayoutActor("コメットアイコン", true) { } -void IconComet::init(const JMapInfoIter &rIter) { +void IconComet::init(const JMapInfoIter& rIter) { initLayoutManager("IconComet", 1); initNerve(&NrvIconComet::IconCometNrvWait::sInstance); } -bool IconComet::appearIfLanding(const char *pStageName) { +bool IconComet::appearIfLanding(const char* pStageName) { if (!MR::isGalaxyCometLandInStage(pStageName)) { return false; } @@ -35,5 +33,4 @@ void IconComet::appearByCometNameId(int id) { } void IconComet::exeWait() { - } diff --git a/src/Game/Screen/ImageEffectBase.cpp b/src/Game/Screen/ImageEffectBase.cpp index 29298ccab..4099e856b 100644 --- a/src/Game/Screen/ImageEffectBase.cpp +++ b/src/Game/Screen/ImageEffectBase.cpp @@ -1,12 +1,10 @@ #include "Game/Screen/ImageEffectBase.hpp" -ImageEffectBase::ImageEffectBase(const char* pName) : - NameObj(pName), - _C(false), - _D(false), - _10(0.0f) -{ - +ImageEffectBase::ImageEffectBase(const char* pName) + : NameObj(pName), + _C(false), + _D(false), + _10(0.0f) { } void ImageEffectBase::calcAnim() { @@ -17,8 +15,7 @@ void ImageEffectBase::calcAnim() { if (_10 > 1.0f) { _10 = 1.0f; } - } - else if (isSomething()) { + } else if (isSomething()) { _10 -= 1.0f / 15.0f; if (_10 < 0.0f) { @@ -31,21 +28,16 @@ void ImageEffectBase::calcAnim() { } void ImageEffectBase::calcAnimSub() { - } void ImageEffectBase::notifyTurnOn() { - } void ImageEffectBase::notifyTurnOff() { - } void ImageEffectBase::notifyForceOn() { - } void ImageEffectBase::notifyForceOff() { - } diff --git a/src/Game/Screen/InformationMessage.cpp b/src/Game/Screen/InformationMessage.cpp index e987ccc46..5c218cfc4 100644 --- a/src/Game/Screen/InformationMessage.cpp +++ b/src/Game/Screen/InformationMessage.cpp @@ -10,13 +10,12 @@ namespace NrvInformationMessage { NEW_NERVE(InformationMessageNrvAppear, InformationMessage, Appear); NEW_NERVE(InformationMessageNrvWait, InformationMessage, Wait); NEW_NERVE(InformationMessageNrvDisappear, InformationMessage, Disappear); -}; +}; // namespace NrvInformationMessage -InformationMessage::InformationMessage() : - LayoutActor("インフォメーションメッセージ", true), - mAButtonIcon(nullptr), - mIsCenter(false) -{} +InformationMessage::InformationMessage() + : LayoutActor("インフォメーションメッセージ", true), + mAButtonIcon(nullptr), + mIsCenter(false) {} void InformationMessage::init(const JMapInfoIter& rIter) { initLayoutManager("InformationWindow", 2); @@ -39,8 +38,7 @@ void InformationMessage::appear() { if (mIsCenter) { MR::hidePaneRecursive(this, "InfoWindowUp"); MR::showPaneRecursive(this, "InfoWindowCenter"); - } - else { + } else { MR::showPaneRecursive(this, "InfoWindowUp"); MR::hidePaneRecursive(this, "InfoWindowCenter"); } diff --git a/src/Game/Screen/InformationObserver.cpp b/src/Game/Screen/InformationObserver.cpp index 9f0207477..7f26d193c 100644 --- a/src/Game/Screen/InformationObserver.cpp +++ b/src/Game/Screen/InformationObserver.cpp @@ -12,7 +12,7 @@ struct InformationObserverAttribute { /* 0x00 */ const char* mMessageId; - /* 0x04 */ bool _4; + /* 0x04 */ bool _4; /* 0x08 */ const char* mFirstMorphBgmName; /* 0x0C */ const char* mBgmName; }; @@ -38,19 +38,18 @@ namespace { InformationObserver* getInformationObserver() { return MR::getSceneObj(SceneObj_InformationObserver); } -}; +}; // namespace namespace NrvInformationObserver { NEW_NERVE(InformationObserverNrvWait, InformationObserver, Wait); NEW_NERVE(InformationObserverNrvDisp, InformationObserver, Disp); -}; +}; // namespace NrvInformationObserver -InformationObserver::InformationObserver() : - LiveActor("初出監視"), - mType(Type_Bee), - _90(false), - mDisplayFrame(-1) -{} +InformationObserver::InformationObserver() + : LiveActor("初出監視"), + mType(Type_Bee), + _90(false), + mDisplayFrame(-1) {} void InformationObserver::init(const JMapInfoIter& rIter) { MR::connectToSceneLayoutMovement(this); @@ -68,8 +67,7 @@ void InformationObserver::entry(TYPE type, LiveActor* pParam2) { if (_90) { MR::pauseTimeKeepDemo(_94); setNerve(&NrvInformationObserver::InformationObserverNrvDisp::sInstance); - } - else { + } else { MR::requestStartDemoWithoutCinemaFrame( this, "初出表示", @@ -81,15 +79,13 @@ void InformationObserver::entry(TYPE type, LiveActor* pParam2) { } void InformationObserver::exeWait() { - } void InformationObserver::exeDisp() { if (MR::isFirstStep(this)) { if (mType == Type_LifeUp && MR::isPlayerLuigi()) { MR::appearInformationMessage(MR::getLayoutMessageDirect("InformationObserverLifeUpLuigi"), true); - } - else { + } else { MR::appearInformationMessage(MR::getLayoutMessageDirect(sAttr[mType].mMessageId), true); } @@ -111,8 +107,7 @@ void InformationObserver::exeDisp() { if (_90) { MR::resumeTimeKeepDemo(_94); - } - else { + } else { MR::endDemo(this, "初出表示"); } @@ -120,8 +115,7 @@ void InformationObserver::exeDisp() { if (mType == Type_Flying) { MR::stopSubBGM(5); MR::startStageBGM(sAttr[mType].mBgmName, false); - } - else { + } else { MR::startSubBGM(sAttr[mType].mBgmName, false); } } @@ -205,4 +199,4 @@ namespace InformationObserverFunction { void explainSpin(LiveActor* pParam1) { getInformationObserver()->entry(InformationObserver::Type_Spin, pParam1); } -}; +}; // namespace InformationObserverFunction diff --git a/src/Game/Screen/IsbnManager.cpp b/src/Game/Screen/IsbnManager.cpp index ff0b21d99..b9282e991 100644 --- a/src/Game/Screen/IsbnManager.cpp +++ b/src/Game/Screen/IsbnManager.cpp @@ -19,24 +19,21 @@ const char* IsbnManager::cOtherNumberPaneName[] = { "T_number_09", }; -IsbnManager::IsbnManager(MEMAllocator* pAllocator) : - _0(true), - mpAllocator(pAllocator), - mpLayout(nullptr), - mpResAccessor(nullptr), - mDrawInfo(), - _68(0), - _64(180), - _66(180), - mpIsbnBuffer(nullptr), - mpLayoutBuffer(nullptr), - mpResAccBuffer(nullptr) -{ - +IsbnManager::IsbnManager(MEMAllocator* pAllocator) + : _0(true), + mpAllocator(pAllocator), + mpLayout(nullptr), + mpResAccessor(nullptr), + mDrawInfo(), + _68(0), + _64(180), + _66(180), + mpIsbnBuffer(nullptr), + mpLayoutBuffer(nullptr), + mpResAccBuffer(nullptr) { } IsbnManager::~IsbnManager() { - } void IsbnManager::setAdjustRate(f32 x, f32 y) { @@ -55,8 +52,7 @@ bool IsbnManager::calc(bool param1) { if (param1 && _68 > _64) { result = true; - } - else if (_68 > _66) { + } else if (_68 > _66) { result = true; } diff --git a/src/Game/Screen/LayoutActor.cpp b/src/Game/Screen/LayoutActor.cpp index ff8b00f27..b6e1dd2fc 100644 --- a/src/Game/Screen/LayoutActor.cpp +++ b/src/Game/Screen/LayoutActor.cpp @@ -4,14 +4,12 @@ #include "Game/Screen/PaneEffectKeeper.hpp" #include "Game/Util/LayoutUtil.hpp" -LayoutActor::LayoutActor(const char *pName, bool) : - NameObj(pName), - mManager(nullptr), - mSpine(nullptr), - mPaneEffectKeeper(nullptr), - mStarPointerTargetKeeper(nullptr) -{ - +LayoutActor::LayoutActor(const char* pName, bool) + : NameObj(pName), + mManager(nullptr), + mSpine(nullptr), + mPaneEffectKeeper(nullptr), + mStarPointerTargetKeeper(nullptr) { } void LayoutActor::movement() { @@ -58,11 +56,11 @@ void LayoutActor::kill() { mFlag.mIsDead = true; } -void LayoutActor::setNerve(const Nerve *pNerve) const { +void LayoutActor::setNerve(const Nerve* pNerve) const { mSpine->setNerve(pNerve); } -bool LayoutActor::isNerve(const Nerve *pNerve) const { +bool LayoutActor::isNerve(const Nerve* pNerve) const { return mSpine->getCurrentNerve() == pNerve; } @@ -90,19 +88,19 @@ LayoutManager* LayoutActor::getLayoutManager() const { // LayoutActor::createPaneMtxRef // LayoutActor::getPaneMtxRef -void LayoutActor::initLayoutManager(const char *pName, u32 a2) { +void LayoutActor::initLayoutManager(const char* pName, u32 a2) { mManager = new LayoutManager(pName, true, a2, 0x100); } -void LayoutActor::initLayoutManagerNoConvertFilename(const char *pName, u32 a2) { +void LayoutActor::initLayoutManagerNoConvertFilename(const char* pName, u32 a2) { mManager = new LayoutManager(pName, false, a2, 0x100); } -void LayoutActor::initLayoutManagerWithTextBoxBufferLength(const char *pName, u32 textBoxBufferLength, u32 a3) { +void LayoutActor::initLayoutManagerWithTextBoxBufferLength(const char* pName, u32 textBoxBufferLength, u32 a3) { mManager = new LayoutManager(pName, false, a3, textBoxBufferLength); } -void LayoutActor::initNerve(const Nerve *pNerve) { +void LayoutActor::initNerve(const Nerve* pNerve) { mSpine = new Spine(this, pNerve); } diff --git a/src/Game/Screen/LayoutPaneCtrl.cpp b/src/Game/Screen/LayoutPaneCtrl.cpp index 9188dcb5d..42d0c2b46 100644 --- a/src/Game/Screen/LayoutPaneCtrl.cpp +++ b/src/Game/Screen/LayoutPaneCtrl.cpp @@ -3,14 +3,13 @@ #include "Game/Screen/LayoutPaneCtrl.hpp" #include -LayoutPaneCtrl::LayoutPaneCtrl(LayoutManager* pHost, const char* pPaneName, u32 animLayerNum) : - mHost(pHost), - mPane(nullptr), - mPaneIndex(-1), - mAnmPlayerArray(animLayerNum), - mFollowType(0), - mFollowPos(nullptr) -{ +LayoutPaneCtrl::LayoutPaneCtrl(LayoutManager* pHost, const char* pPaneName, u32 animLayerNum) + : mHost(pHost), + mPane(nullptr), + mPaneIndex(-1), + mAnmPlayerArray(animLayerNum), + mFollowType(0), + mFollowPos(nullptr) { mPane = mHost->getPane(pPaneName); for (u32 i = 0; i < mAnmPlayerArray.size(); i++) { @@ -36,8 +35,7 @@ void LayoutPaneCtrl::start(const char* pAnimName, u32 layer) { if (pAnmPlayer->mAnimTransform != nullptr) { if (mHost->_61) { mPane->UnbindAnimation(pAnmPlayer->mAnimTransform, true); - } - else { + } else { mHost->unbindPaneCtrlAnim(this, pAnmPlayer->mAnimTransform); } } @@ -47,8 +45,7 @@ void LayoutPaneCtrl::start(const char* pAnimName, u32 layer) { if (mHost->_61) { mPane->UnbindAnimation(pAnmPlayer->mAnimTransform, true); mPane->BindAnimation(pAnmPlayer->mAnimTransform, true); - } - else { + } else { mHost->bindPaneCtrlAnim(this, pAnmPlayer->mAnimTransform); } } diff --git a/src/Game/Screen/LogoFader.cpp b/src/Game/Screen/LogoFader.cpp index ec81771b2..5d7259af7 100644 --- a/src/Game/Screen/LogoFader.cpp +++ b/src/Game/Screen/LogoFader.cpp @@ -11,14 +11,13 @@ namespace { NEW_NERVE(LogoFaderNrvDisplay, LogoFader, Display); NEW_NERVE(LogoFaderNrvFadeIn, LogoFader, FadeIn); NEW_NERVE(LogoFaderNrvFadeOut, LogoFader, FadeOut); -}; +}; // namespace -LogoFader::LogoFader(const char* pName) : - LayoutActor(pName, true), - _20(true), - mMaxStep(30), - mRate(0.0f) -{ +LogoFader::LogoFader(const char* pName) + : LayoutActor(pName, true), + _20(true), + mMaxStep(30), + mRate(0.0f) { initNerve(&LogoFaderNrvDisplay::sInstance); kill(); } @@ -90,6 +89,5 @@ void LogoFader::startFadeOut() { } bool LogoFader::isFadeEnd() const { - return isNerve(&LogoFaderNrvDisplay::sInstance) - || isNerve(&LogoFaderNrvBlank::sInstance); + return isNerve(&LogoFaderNrvDisplay::sInstance) || isNerve(&LogoFaderNrvBlank::sInstance); } diff --git a/src/Game/Screen/LuigiLetter.cpp b/src/Game/Screen/LuigiLetter.cpp index f6f835814..ef65af8b4 100644 --- a/src/Game/Screen/LuigiLetter.cpp +++ b/src/Game/Screen/LuigiLetter.cpp @@ -13,16 +13,14 @@ namespace NrvLuigiLetter { NEW_NERVE(HostTypeNrvAppear, LuigiLetter, Appear); NEW_NERVE(HostTypeNrvWait, LuigiLetter, Wait); NEW_NERVE(HostTypeNrvEnd, LuigiLetter, End); -}; +}; // namespace NrvLuigiLetter -LuigiLetter::LuigiLetter(bool param1, const char* pParam2) : - LayoutActor("ルイージの手紙", true), - mTexture(nullptr), - mAButtonIcon(nullptr), - _28(pParam2), - _2C(param1) -{ - +LuigiLetter::LuigiLetter(bool param1, const char* pParam2) + : LayoutActor("ルイージの手紙", true), + mTexture(nullptr), + mAButtonIcon(nullptr), + _28(pParam2), + _2C(param1) { } void LuigiLetter::init(const JMapInfoIter& rIter) { @@ -45,8 +43,7 @@ void LuigiLetter::init(const JMapInfoIter& rIter) { if (_2C) { MR::connectToSceneTalkLayoutNoMovement(this); MR::connectToSceneTalkLayoutNoMovement(mAButtonIcon); - } - else { + } else { MR::connectToSceneLayoutOnPauseMovementCalcAnim(this); MR::connectToSceneLayoutOnPauseNoMovement(mAButtonIcon); } @@ -127,4 +124,4 @@ namespace MR { LuigiLetter* createLuigiLetterForMenu() { return new LuigiLetter(false, MR::getLuigiLetterGalaxyName()); } -}; +}; // namespace MR diff --git a/src/Game/Screen/Manual2P.cpp b/src/Game/Screen/Manual2P.cpp index 15bfae7be..89a252cd4 100644 --- a/src/Game/Screen/Manual2P.cpp +++ b/src/Game/Screen/Manual2P.cpp @@ -18,23 +18,21 @@ namespace { NEW_NERVE(Manual2PNrvScrollLeft, Manual2P, ScrollLeft); NEW_NERVE(Manual2PNrvScrollLeftAfter, Manual2P, ScrollLeftAfter); NEW_NERVE(Manual2PNrvDisappear, Manual2P, Disappear); -}; +}; // namespace -Manual2P::Manual2P(const char* pName) : - LayoutActor(pName, true), - mPageIndex(0), - _24(0), - mLeftPaneCtrl(nullptr), - mRightPaneCtrl(nullptr), - _30(false), - _31(false), - mBackButton(nullptr) -{ - +Manual2P::Manual2P(const char* pName) + : LayoutActor(pName, true), + mPageIndex(0), + _24(0), + mLeftPaneCtrl(nullptr), + mRightPaneCtrl(nullptr), + _30(false), + _31(false), + mBackButton(nullptr) { } void Manual2P::init(const JMapInfoIter& rIter) { - s32 i; + s32 i; char messageId[128]; initLayoutManager("P2Manual", 2); @@ -60,8 +58,7 @@ void Manual2P::init(const JMapInfoIter& rIter) { do { snprintf(messageId, sizeof(messageId), "%s%03d", "2PGuidance", i + 1); i++; - } - while (MR::isExistGameMessage(messageId)); + } while (MR::isExistGameMessage(messageId)); _24 = i; } @@ -92,10 +89,7 @@ void Manual2P::exeAppear() { reflectPageIndex(); } - if (MR::isAnimStopped(this, 0) - && mLeftPaneCtrl->isWait() - && mRightPaneCtrl->isWait()) - { + if (MR::isAnimStopped(this, 0) && mLeftPaneCtrl->isWait() && mRightPaneCtrl->isWait()) { setNerve(&Manual2PNrvWait::sInstance); } } diff --git a/src/Game/Screen/MarioMeter.cpp b/src/Game/Screen/MarioMeter.cpp index d5ed7ddbf..73892808d 100644 --- a/src/Game/Screen/MarioMeter.cpp +++ b/src/Game/Screen/MarioMeter.cpp @@ -3,7 +3,8 @@ #include "Game/Screen/SuddenDeathMeter.hpp" #include "Game/Util/ObjUtil.hpp" -MarioMeter::MarioMeter(const char *pName) : NameObj(pName) { +MarioMeter::MarioMeter(const char* pName) + : NameObj(pName) { mHitPointMeter = nullptr; mSuddenDeathMeter = nullptr; mUseSuddenDeath = false; @@ -14,8 +15,7 @@ void MarioMeter::initLifeCount(s32 life) { mUseSuddenDeath = true; mSuddenDeathMeter->initCount(life); mHitPointMeter->kill(); - } - else { + } else { mUseSuddenDeath = false; mHitPointMeter->initCount(life); mSuddenDeathMeter->kill(); @@ -30,8 +30,7 @@ void MarioMeter::powerUp() { if (mUseSuddenDeath) { MR::requestMovementOn(mSuddenDeathMeter); mSuddenDeathMeter->requestPowerUp(); - } - else { + } else { MR::requestMovementOn(mHitPointMeter); mHitPointMeter->requestPowerUp(); } @@ -58,10 +57,9 @@ void MarioMeter::deactivate() { } MarioMeter::~MarioMeter() { - } -void MarioMeter::init(const JMapInfoIter &rIter) { +void MarioMeter::init(const JMapInfoIter& rIter) { mHitPointMeter = new MeterLayout("通常HPメーター", "HitPointMeter"); mHitPointMeter->initWithoutIter(); mSuddenDeathMeter = new SuddenDeathMeter("サドンデスHPメーター", "SuddenDeathMeter"); diff --git a/src/Game/Screen/MarioSubMeter.cpp b/src/Game/Screen/MarioSubMeter.cpp index 4c0330d01..debb7de09 100644 --- a/src/Game/Screen/MarioSubMeter.cpp +++ b/src/Game/Screen/MarioSubMeter.cpp @@ -1,8 +1,8 @@ #include "Game/Screen/MarioSubMeter.hpp" #include "Game/Screen/SubMeterLayout.hpp" -MarioSubMeter::MarioSubMeter(const char *pName) : NameObj(pName) -{ +MarioSubMeter::MarioSubMeter(const char* pName) + : NameObj(pName) { mFlyMeter = nullptr; mAirMeter = nullptr; mActiveMeter = nullptr; @@ -57,10 +57,9 @@ void MarioSubMeter::deactivate() { } MarioSubMeter::~MarioSubMeter() { - } -void MarioSubMeter::init(const JMapInfoIter &rIter) { +void MarioSubMeter::init(const JMapInfoIter& rIter) { mFlyMeter = new SubMeterLayout("ハチメーター", "FlyMeter"); mFlyMeter->initWithoutIter(); diff --git a/src/Game/Screen/MessageTagSkipTagProcessor.cpp b/src/Game/Screen/MessageTagSkipTagProcessor.cpp index 4bb8151f9..16be6b20e 100644 --- a/src/Game/Screen/MessageTagSkipTagProcessor.cpp +++ b/src/Game/Screen/MessageTagSkipTagProcessor.cpp @@ -1,23 +1,21 @@ #include "Game/Screen/MessageTagSkipTagProcessor.hpp" -MessageTagSkipTagProcessor::MessageTagSkipTagProcessor() : nw4r::ut::TagProcessorBase() { - +MessageTagSkipTagProcessor::MessageTagSkipTagProcessor() + : nw4r::ut::TagProcessorBase() { } -nw4r::ut::TagProcessorBase::Operation MessageTagSkipTagProcessor::CalcRect(nw4r::ut::Rect *pRect, u16 code, ContextType *pPrintContext) { +nw4r::ut::TagProcessorBase::Operation MessageTagSkipTagProcessor::CalcRect(nw4r::ut::Rect* pRect, u16 code, ContextType* pPrintContext) { if (code != 0x1A) { return nw4r::ut::TagProcessorBase::CalcRect(pRect, code, pPrintContext); - } - else { + } else { return skipTag(pRect, pPrintContext, false); } } -nw4r::ut::TagProcessorBase::Operation MessageTagSkipTagProcessor::Process(u16 code, ContextType *pPrintContext) { +nw4r::ut::TagProcessorBase::Operation MessageTagSkipTagProcessor::Process(u16 code, ContextType* pPrintContext) { if (code != 0x1A) { return nw4r::ut::TagProcessorBase::Process(code, pPrintContext); - } - else { + } else { return skipTag(nullptr, pPrintContext, false); } } diff --git a/src/Game/Screen/MiiConfirmIcon.cpp b/src/Game/Screen/MiiConfirmIcon.cpp index 307955866..f46307884 100644 --- a/src/Game/Screen/MiiConfirmIcon.cpp +++ b/src/Game/Screen/MiiConfirmIcon.cpp @@ -6,12 +6,10 @@ namespace { NEW_NERVE(MiiConfirmIconNrvAppear, MiiConfirmIcon, Appear); NEW_NERVE(MiiConfirmIconNrvWait, MiiConfirmIcon, Wait); NEW_NERVE(MiiConfirmIconNrvDisappear, MiiConfirmIcon, Disappear); -}; +}; // namespace -MiiConfirmIcon::MiiConfirmIcon(const char* pName) : - LayoutActor(pName, true) -{ - +MiiConfirmIcon::MiiConfirmIcon(const char* pName) + : LayoutActor(pName, true) { } void MiiConfirmIcon::init(const JMapInfoIter& rIter) { diff --git a/src/Game/Screen/MiiSelect.cpp b/src/Game/Screen/MiiSelect.cpp index 13f44db19..537598150 100644 --- a/src/Game/Screen/MiiSelect.cpp +++ b/src/Game/Screen/MiiSelect.cpp @@ -19,11 +19,10 @@ namespace { NEW_NERVE(MiiSelectNrvSelected, MiiSelect, Selected); NEW_NERVE(MiiSelectNrvDisappear, MiiSelect, Disappear); NEW_NERVE(MiiSelectNrvDummySelected, MiiSelect, DummySelected); -}; +}; // namespace -MiiSelect::MiiSelect(const char* pName) : - LayoutActor(pName, true) -{ +MiiSelect::MiiSelect(const char* pName) + : LayoutActor(pName, true) { _28 = new MR::BitArray(5); _2C = 0; _2E = 0; @@ -167,8 +166,7 @@ void MiiSelect::exeWait() { if (!_20[0]->isHidden() && (MR::testCorePadTriggerLeft(WPAD_CHAN0) || MR::testSubPadStickTriggerLeft(WPAD_CHAN0))) { callbackLeft(); - } - else if (!_20[1]->isHidden() && (MR::testCorePadTriggerRight(WPAD_CHAN0) || MR::testSubPadStickTriggerRight(WPAD_CHAN0))) { + } else if (!_20[1]->isHidden() && (MR::testCorePadTriggerRight(WPAD_CHAN0) || MR::testSubPadStickTriggerRight(WPAD_CHAN0))) { callbackRight(); } } @@ -220,7 +218,6 @@ void MiiSelect::exeScrollRight() { } void MiiSelect::exeSelected() { - } void MiiSelect::exeDisappear() { @@ -234,7 +231,6 @@ void MiiSelect::exeDisappear() { } void MiiSelect::exeDummySelected() { - } void MiiSelect::control() { @@ -320,14 +316,12 @@ void MiiSelect::updateButtons() { if (_20[1]->isHidden()) { _20[1]->appear(); } - } - else { + } else { if (_1EC - 8 < 0) { if (!_20[0]->isHidden()) { _20[0]->disappear(); } - } - else if (_20[0]->isHidden()) { + } else if (_20[0]->isHidden()) { _20[0]->appear(); } @@ -335,8 +329,7 @@ void MiiSelect::updateButtons() { if (!_20[1]->isHidden()) { _20[1]->disappear(); } - } - else if (_20[1]->isHidden()) { + } else if (_20[1]->isHidden()) { _20[1]->appear(); } } @@ -350,17 +343,14 @@ void MiiSelect::collectValidMiiIndex() { RFLAdditionalInfo additionalInfo; - if (RFLGetAdditionalInfo(&additionalInfo, RFLDataSource_Official, nullptr, i) - != RFLErrcode_Success) - { + if (RFLGetAdditionalInfo(&additionalInfo, RFLDataSource_Official, nullptr, i) != RFLErrcode_Success) { continue; } if (additionalInfo.favorite == 1) { _30[_2E] = static_cast(i); _2E++; - } - else { + } else { _5C[_58] = static_cast(i); _58++; } @@ -431,11 +421,9 @@ void MiiSelect::getIconID(FileSelectIconID* pIconID, s32 param2) const { v++; } - } - else if (param2 < _2E + _2C) { + } else if (param2 < _2E + _2C) { pIconID->setMiiIndex(_30[param2 - _2C]); - } - else { + } else { pIconID->setMiiIndex(_5C[param2 - _2E - _2C]); } } @@ -458,10 +446,9 @@ void MiiSelect::onSelectDummy() { } namespace MiiSelectSub { - Page::Page(MiiSelect* pHost) : - mHost(pHost), - _20(true) - { + Page::Page(MiiSelect* pHost) + : mHost(pHost), + _20(true) { for (int i = 0; i < sizeof(mIconArray) / sizeof(*mIconArray); i++) { mIconArray[i] = new MiiSelectIcon(-1, -1, -1, "Miiセレクト用アイコン"); } @@ -527,7 +514,7 @@ namespace MiiSelectSub { mIconArray[i]->prohibit(); } } -}; +}; // namespace MiiSelectSub s32 MiiSelect::getIconNum() { return _58 + _2E + _2C; diff --git a/src/Game/Screen/MiiSelectIcon.cpp b/src/Game/Screen/MiiSelectIcon.cpp index f015b0c5b..faa1f5c54 100644 --- a/src/Game/Screen/MiiSelectIcon.cpp +++ b/src/Game/Screen/MiiSelectIcon.cpp @@ -23,20 +23,19 @@ namespace { NEW_NERVE(MiiSelectIconNrvSelected, MiiSelectIcon, Selected); NEW_NERVE(MiiSelectIconNrvDisappear, MiiSelectIcon, Disappear); NEW_NERVE(MiiSelectIconNrvInvalid, MiiSelectIcon, Invalid); -}; +}; // namespace -MiiSelectIcon::MiiSelectIcon(int param1, int param2, int param3, const char* pName) : - LayoutActor(pName, true), - _20(nullptr), - _24(nullptr), - _28(nullptr), - mIcon(nullptr), - mMiiTexMap(nullptr), - mFellowTexMap(nullptr), - mIconID(new FileSelectIconID()), - mIsMiiDummy(false), - _3D(true) -{ +MiiSelectIcon::MiiSelectIcon(int param1, int param2, int param3, const char* pName) + : LayoutActor(pName, true), + _20(nullptr), + _24(nullptr), + _28(nullptr), + mIcon(nullptr), + mMiiTexMap(nullptr), + mFellowTexMap(nullptr), + mIconID(new FileSelectIconID()), + mIsMiiDummy(false), + _3D(true) { initLayoutManager("MiiIcon", 1); MR::createAndAddPaneCtrl(this, "MarioIcon", 3); MR::createAndAddPaneCtrl(this, "MiiIcon", 3); @@ -79,8 +78,7 @@ void MiiSelectIcon::appear(const FileSelectIconID& rIconID) { MR::hidePane(this, "MiiIcon"); MR::showPane(this, "MarioIcon"); setNerve(&MiiSelectIconNrvWait::sInstance); - } - else if (rIconID.isMii()) { + } else if (rIconID.isMii()) { MR::hideLayout(this); mIcon->setIndex(rIconID.getMiiIndex()); @@ -111,7 +109,7 @@ void MiiSelectIcon::appearMiiDummy() { } MR::showLayout(this); - MR::startAnim(this, "Character",0); + MR::startAnim(this, "Character", 0); MR::setAnimFrameAndStop(this, 5.0f, 0); MR::startPaneAnim(this, "MarioIcon", "Character", 1); MR::setPaneAnimFrameAndStop(this, "MarioIcon", 5.0f, 1); @@ -127,9 +125,7 @@ void MiiSelectIcon::appearMiiDummy() { } void MiiSelectIcon::validate() { - if (isNerve(&MiiSelectIconNrvSelected::sInstance) - || isNerve(&MiiSelectIconNrvInvalid::sInstance)) - { + if (isNerve(&MiiSelectIconNrvSelected::sInstance) || isNerve(&MiiSelectIconNrvInvalid::sInstance)) { _24->forceToWait(); _28->forceToWait(); setNerve(&MiiSelectIconNrvWait::sInstance); @@ -213,15 +209,13 @@ void MiiSelectIcon::exeWait() { } void MiiSelectIcon::exeSelected() { - } void MiiSelectIcon::exeDisappear() { if (_20->isHidden()) { if (_20 == _24) { _28->forceToHide(); - } - else { + } else { _24->forceToHide(); } @@ -230,7 +224,6 @@ void MiiSelectIcon::exeDisappear() { } void MiiSelectIcon::exeInvalid() { - } void MiiSelectIcon::appear() { diff --git a/src/Game/Screen/MissLayout.cpp b/src/Game/Screen/MissLayout.cpp index c3bb1198f..90fcf7a6a 100644 --- a/src/Game/Screen/MissLayout.cpp +++ b/src/Game/Screen/MissLayout.cpp @@ -7,12 +7,10 @@ namespace { NEW_NERVE(MissLayoutNrvWait, MissLayout, Wait); NEW_NERVE(MissLayoutNrvActive, MissLayout, Active); NEW_NERVE(MissLayoutNrvEnd, MissLayout, End); -}; +}; // namespace -MissLayout::MissLayout() : - LayoutActor("ミス!", true) -{ - +MissLayout::MissLayout() + : LayoutActor("ミス!", true) { } void MissLayout::init(const JMapInfoIter& rIter) { @@ -43,7 +41,6 @@ void MissLayout::start() { } void MissLayout::exeWait() { - } void MissLayout::exeActive() { @@ -62,5 +59,4 @@ void MissLayout::exeActive() { } void MissLayout::exeEnd() { - } diff --git a/src/Game/Screen/MoviePlayerSimple.cpp b/src/Game/Screen/MoviePlayerSimple.cpp index 8ddfed3b1..47a9df83d 100644 --- a/src/Game/Screen/MoviePlayerSimple.cpp +++ b/src/Game/Screen/MoviePlayerSimple.cpp @@ -15,10 +15,10 @@ #include namespace { - static const s16 sCinemaFrameHeightTop = 44; - static const s16 sCinemaFrameHeightBottom = 412; - static const GXColor sCinemaFrameColor = { 0, 0, 0, 255 }; -}; + static const s16 sCinemaFrameHeightTop = 44; + static const s16 sCinemaFrameHeightBottom = 412; + static const GXColor sCinemaFrameColor = {0, 0, 0, 255}; +}; // namespace namespace { NEW_NERVE(MoviePlayerSimpleOff, MoviePlayerSimple, SimpleOff); @@ -26,16 +26,15 @@ namespace { NEW_NERVE(MoviePlayerSimplePreload, MoviePlayerSimple, Preload); NEW_NERVE(MoviePlayerSimplePlaying, MoviePlayerSimple, Playing); NEW_NERVE(MoviePlayerSimpleSuspend, MoviePlayerSimple, SimpleSuspend); -}; +}; // namespace -MoviePlayerSimple::MoviePlayerSimple() : - LayoutActor("ムービープレイヤー", true), - JKRDisposer(), - mMovie(nullptr), - mPlayerWrapper(nullptr), - _44(false), - _45(false) -{ +MoviePlayerSimple::MoviePlayerSimple() + : LayoutActor("ムービープレイヤー", true), + JKRDisposer(), + mMovie(nullptr), + mPlayerWrapper(nullptr), + _44(false), + _45(false) { mMovie = new Movie(); mMovie->mMovieName = ""; mMovie->mBuffer = nullptr; @@ -54,7 +53,7 @@ MoviePlayerSimple::~MoviePlayerSimple() { JKRHeap::destroy(mHeap); } -void MoviePlayerSimple::init(const JMapInfoIter &rIter) { +void MoviePlayerSimple::init(const JMapInfoIter& rIter) { MR::connectToSceneMovie(this); mPlayerWrapper = new THPSimplePlayerWrapper("THPシンプルプレイヤーのラッパ"); @@ -75,16 +74,14 @@ void MoviePlayerSimple::draw() const { fillColor.a = 255; MR::fillScreen(fillColor); - } - else { + } else { drawCinemaFrame(); u32 frameBufferWidth; if (MR::isScreen16Per9()) { frameBufferWidth = MR::getFrameBufferWidth(); - } - else { + } else { frameBufferWidth = 832; } @@ -96,7 +93,7 @@ void MoviePlayerSimple::draw() const { } } -void MoviePlayerSimple::startMovie(const char *pMovieName, bool a2) { +void MoviePlayerSimple::startMovie(const char* pMovieName, bool a2) { if (!MR::isFileExist(pMovieName, false)) { OSPanic(__FILE__, 0xDB, "Moive File NOT found."); } @@ -122,10 +119,7 @@ bool MoviePlayerSimple::isMovieActive() const { return false; } - return isNerve(&MoviePlayerSimpleOpen::sInstance) - || isNerve(&MoviePlayerSimplePreload::sInstance) - || isNerve(&MoviePlayerSimplePlaying::sInstance) - || isNerve(&MoviePlayerSimpleSuspend::sInstance); + return isNerve(&MoviePlayerSimpleOpen::sInstance) || isNerve(&MoviePlayerSimplePreload::sInstance) || isNerve(&MoviePlayerSimplePlaying::sInstance) || isNerve(&MoviePlayerSimpleSuspend::sInstance); } bool MoviePlayerSimple::isMoviePlaying() const { @@ -153,8 +147,7 @@ void MoviePlayerSimple::setFrameRateDefault() { if (MR::isNearZero(frameRate - 59.94f, 0.001f)) { mMovie->mFrameRateDefault = 1; - } - else if (MR::isNearZero(frameRate - 29.97f, 0.001f)) { + } else if (MR::isNearZero(frameRate - 29.97f, 0.001f)) { mMovie->mFrameRateDefault = 2; } } @@ -168,7 +161,6 @@ void MoviePlayerSimple::setUnpauseHomeButtonFlag() { } void MoviePlayerSimple::exeSimpleOff() { - } void MoviePlayerSimple::exeOpen() { @@ -181,7 +173,7 @@ void MoviePlayerSimple::exeOpen() { mMovie->_20 = 0; mMovie->_19 = false; setFrameRateDefault(); - mMovie->mBuffer = new(mHeap, 32) u8[mPlayerWrapper->calcNeedMemory()]; + mMovie->mBuffer = new (mHeap, 32) u8[mPlayerWrapper->calcNeedMemory()]; mPlayerWrapper->setBuffer(mMovie->mBuffer); mPlayerWrapper->preLoad(_44 != false); setNerve(&MoviePlayerSimplePreload::sInstance); @@ -234,7 +226,6 @@ void MoviePlayerSimple::exePlaying() { } void MoviePlayerSimple::exeSimpleSuspend() { - } void MoviePlayerSimple::control() { @@ -273,11 +264,11 @@ u32 MoviePlayerSimple::calcNeedMemoryForMovieWorks() { void MoviePlayerSimple::drawCinemaFrame() const { MR::fillScreenSetup(sCinemaFrameColor); - s16 width = MR::getFrameBufferWidth(); + s16 width = MR::getFrameBufferWidth(); TBox2s top(0, 0, width, sCinemaFrameHeightTop); MR::fillScreenArea(top._0, top._8); - s16 height = MR::getFrameBufferHeight(); + s16 height = MR::getFrameBufferHeight(); TBox2s bottom(0, sCinemaFrameHeightBottom, width, height); MR::fillScreenArea(bottom._0, bottom._8); } diff --git a/src/Game/Screen/MoviePlayingSequence.cpp b/src/Game/Screen/MoviePlayingSequence.cpp index 82ead85ee..d426a214c 100644 --- a/src/Game/Screen/MoviePlayingSequence.cpp +++ b/src/Game/Screen/MoviePlayingSequence.cpp @@ -172,15 +172,14 @@ namespace { } } - const char* getMovieName(const MoviePlayingInfo *pInfo) NO_INLINE { + const char* getMovieName(const MoviePlayingInfo* pInfo) NO_INLINE { if (MR::isPlayerLuigi() && pInfo->mMovieNameLuigi != nullptr) { return pInfo->mMovieNameLuigi; - } - else { + } else { return pInfo->mMovieName; } } -}; +}; // namespace namespace NrvMoviePlayingSequence { NEW_NERVE(HostTypeWait, MoviePlayingSequence, Wait); @@ -189,7 +188,7 @@ namespace NrvMoviePlayingSequence { NEW_NERVE(HostTypePlay, MoviePlayingSequence, Play); NEW_NERVE(HostTypeCloseWipeOnPlaying, MoviePlayingSequence, CloseWipeOnPlaying); NEW_NERVE(HostTypeEndWait, MoviePlayingSequence, EndWait); -}; +}; // namespace NrvMoviePlayingSequence const char* MoviePlayingSequence::getMovieName(MoviePlayingSequence::MovieType type) { if (type == MovieType_PrologueA) { @@ -220,10 +219,9 @@ const char* MoviePlayingSequence::getMovieName(MoviePlayingSequence::MovieType t } // https://decomp.me/scratch/O5orZ -MoviePlayingSequence::MoviePlayingSequence(const char *pName, s32 movieType) : - LayoutActor(pName, true), - mSubtitles() -{ +MoviePlayingSequence::MoviePlayingSequence(const char* pName, s32 movieType) + : LayoutActor(pName, true), + mSubtitles() { mInfo = &sInfoTable[movieType]; mPadRumbler = new DemoPadRumbler(getMovieName(MovieType(movieType))); @@ -239,7 +237,7 @@ MoviePlayingSequence::MoviePlayingSequence(const char *pName, s32 movieType) : for (s32 i = 0; i < subtitleNum; i++) { if (MovieSubtitlesUtil::isExistSubtitles(mInfo->mMovieName, i)) { const MoviePlayingInfo* pInfo = mInfo; - MovieSubtitles* pSubtitles = new MovieSubtitles(MovieSubtitlesUtil::getSubtitlesMessageId(pInfo->mMovieName, i), MovieSubtitlesUtil::getSubtitlesAppearTime(pInfo->mMovieName, i)); + MovieSubtitles* pSubtitles = new MovieSubtitles(MovieSubtitlesUtil::getSubtitlesMessageId(pInfo->mMovieName, i), MovieSubtitlesUtil::getSubtitlesAppearTime(pInfo->mMovieName, i)); mSubtitles.push_back(pSubtitles); } @@ -259,7 +257,6 @@ void MoviePlayingSequence::kill() { } void MoviePlayingSequence::exeWait() { - } void MoviePlayingSequence::exePlayWait() { @@ -273,8 +270,7 @@ void MoviePlayingSequence::exePlayWait() { if (mInfo->mOpenWipeType == WipeType_SystemWipeWhiteFade) { val = false; - } - else { + } else { val = mInfo->mOpenWipeType != WipeType_WipeWhiteFade; } @@ -298,8 +294,7 @@ void MoviePlayingSequence::exePlayStart() { if (MR::isFirstStep(this)) { MR::startMoviePlayer(::getMovieName(mInfo)); MR::tryFrameToScreenCinemaFrame(); - } - else if (MR::isMoviePlayerPlaying()) { + } else if (MR::isMoviePlayerPlaying()) { MR::setMovieVolume(0.0f, 0); setNerve(&NrvMoviePlayingSequence::HostTypePlay::sInstance); } @@ -353,14 +348,13 @@ bool MoviePlayingSequence::tryEnd() { } return false; - } - else { + } else { s32 closeWipeFrame = MR::getMovieTotalFrame() - mInfo->mCloseWipeTime; if (closeWipeFrame <= MR::getMovieCurrentFrame()) { setNerve(&NrvMoviePlayingSequence::HostTypeCloseWipeOnPlaying::sInstance); - return true; + return true; } return false; @@ -410,12 +404,10 @@ void MoviePlayingSequence::exeEndWait() { if (MR::isEqualStringCase(pInfo->mMovieName, "/MovieData/FinalBattle.thp")) { MR::requestStartScenarioSelect(pInfo->mStageName); noWipe = true; - } - else if (pInfo->mStageName != nullptr) { + } else if (pInfo->mStageName != nullptr) { MR::requestChangeStageInGameMoving(pInfo->mStageName, 1); noWipe = true; - } - else { + } else { noWipe = false; } @@ -449,9 +441,10 @@ namespace { MoviePlayingSequence* getMoviePlayingSequence(int idx) { return getMoviePlayingSequenceHolder()->getSequence(idx); } -}; +}; // namespace -MoviePlayingSequenceHolder::MoviePlayingSequenceHolder(const char *pName) : NameObj(pName) { +MoviePlayingSequenceHolder::MoviePlayingSequenceHolder(const char* pName) + : NameObj(pName) { s32 diff; mSequence.init(7); @@ -462,8 +455,7 @@ MoviePlayingSequenceHolder::MoviePlayingSequenceHolder(const char *pName) : Name if (pMovieName == nullptr) { *pSequence = nullptr; - } - else { + } else { *pSequence = new MoviePlayingSequence(pMovieName, diff); } } @@ -535,4 +527,4 @@ namespace MR { return false; } -}; +}; // namespace MR diff --git a/src/Game/Screen/MovieStarter.cpp b/src/Game/Screen/MovieStarter.cpp index df95c7528..3c8ec54e2 100644 --- a/src/Game/Screen/MovieStarter.cpp +++ b/src/Game/Screen/MovieStarter.cpp @@ -3,19 +3,17 @@ #include "Game/Util/EventUtil.hpp" #include "Game/Util/JMapUtil.hpp" -MovieStarter::MovieStarter(const char *pName) : - LiveActor(pName), - mMovieType(-1) -{ - +MovieStarter::MovieStarter(const char* pName) + : LiveActor(pName), + mMovieType(-1) { } -void MovieStarter::init(const JMapInfoIter &rIter) { +void MovieStarter::init(const JMapInfoIter& rIter) { MR::connectToSceneLayoutMovement(this); MR::invalidateClipping(this); if (MR::useStageSwitchReadAppear(this, rIter)) { - MR::FunctorV0M appearFunc = MR::Functor_Inline(this, &MovieStarter::appear); + MR::FunctorV0M appearFunc = MR::Functor_Inline(this, &MovieStarter::appear); MR::listenStageSwitchOnAppear(this, appearFunc); } diff --git a/src/Game/Screen/MovieSubtitles.cpp b/src/Game/Screen/MovieSubtitles.cpp index 5432f6ac1..38f7a01c0 100644 --- a/src/Game/Screen/MovieSubtitles.cpp +++ b/src/Game/Screen/MovieSubtitles.cpp @@ -10,13 +10,12 @@ namespace NrvMovieSubtitles { NEW_NERVE(HostTypeWait, MovieSubtitles, Wait); NEW_NERVE(HostTypeTalk, MovieSubtitles, Talk); NEW_NERVE(HostTypeTalkWait, MovieSubtitles, TalkWait); -}; +}; // namespace NrvMovieSubtitles -MovieSubtitles::MovieSubtitles(const char *pMessageId, s32 appearTime) : - LayoutActor("ムービーの字幕", true), - mFormerText(nullptr), - mAppearTime(appearTime) -{ +MovieSubtitles::MovieSubtitles(const char* pMessageId, s32 appearTime) + : LayoutActor("ムービーの字幕", true), + mFormerText(nullptr), + mAppearTime(appearTime) { MR::connectToScene(this, 19, 15, -1, 64); initLayoutManager("CinemaSuper", 1); @@ -33,7 +32,6 @@ void MovieSubtitles::appear() { } void MovieSubtitles::exeWait() { - } void MovieSubtitles::exeTalk() { @@ -51,8 +49,7 @@ void MovieSubtitles::exeTalkWait() { if (mFormerText->hasNextPage()) { mFormerText->nextPage(); setNerve(&NrvMovieSubtitles::HostTypeTalk::sInstance); - } - else { + } else { kill(); } } diff --git a/src/Game/Screen/MovieSubtitlesDataTable.cpp b/src/Game/Screen/MovieSubtitlesDataTable.cpp index ab43d0fcd..3cd0c0ba3 100644 --- a/src/Game/Screen/MovieSubtitlesDataTable.cpp +++ b/src/Game/Screen/MovieSubtitlesDataTable.cpp @@ -1,13 +1,15 @@ #include "Game/Screen/MovieSubtitlesDataTable.hpp" #include "Game/Util/StringUtil.hpp" -#define ENTRY(name, step, appear) { name, step, appear } -#define NULL_ENTRY { nullptr, -1, -1 } +#define ENTRY(name, step, appear) \ + { name, step, appear } +#define NULL_ENTRY \ + { nullptr, -1, -1 } namespace { static const SubtitlesInfo sSubtitlesInfo[] = { { - "/MovieData/PrologueA.thp", + "/MovieData/PrologueA.thp", { ENTRY("Layout_StoryDemoKoopaTalk000", 3887, 132), ENTRY("Layout_StoryDemoKoopaTalk001", 4020, 154), @@ -17,7 +19,7 @@ namespace { }, }, { - "/MovieData/PrologueB.thp", + "/MovieData/PrologueB.thp", { ENTRY("Layout_StoryDemoPeachTalk000", 4920, 120), ENTRY("Layout_StoryDemoKameckTalk000", 5460, 180), @@ -27,7 +29,7 @@ namespace { }, }, { - "/MovieData/FinalBattle.thp", + "/MovieData/FinalBattle.thp", { ENTRY("Layout_StoryDemoRosettaTalk000", 2970, 159), ENTRY("Layout_StoryDemoRosettaTalk006", 3130, 180), @@ -37,7 +39,7 @@ namespace { }, }, { - "/MovieData/EpilogueA.thp", + "/MovieData/EpilogueA.thp", { ENTRY("Layout_StoryDemoKoopaTalk005", 4607, 187), ENTRY("Layout_StoryDemoKoopaTalk006", 4795, 226), @@ -47,7 +49,7 @@ namespace { }, }, { - "/MovieData/EpilogueB.thp", + "/MovieData/EpilogueB.thp", { NULL_ENTRY, NULL_ENTRY, @@ -57,7 +59,7 @@ namespace { }, }, { - "/MovieData/EndingA.thp", + "/MovieData/EndingA.thp", { ENTRY("Layout_StoryDemoRosettaTalk001", 4980, 119), ENTRY("Layout_StoryDemoRosettaTalk002", 5100, 149), @@ -67,7 +69,7 @@ namespace { }, }, { - "/MovieData/EndingB.thp", + "/MovieData/EndingB.thp", { ENTRY("Layout_StoryDemoRosettaTalk004", 1860, 134), ENTRY("Layout_StoryDemoRosettaTalk005", 1995, 275), @@ -78,7 +80,7 @@ namespace { }, }; - const SubtitlesInfo* getSubtitlesInfo(const char *pMovieName) { + const SubtitlesInfo* getSubtitlesInfo(const char* pMovieName) { for (s32 i = 0; i < sizeof(sSubtitlesInfo) / sizeof(*sSubtitlesInfo); i++) { if (MR::isEqualString(pMovieName, sSubtitlesInfo[i].mMovieName)) { return &sSubtitlesInfo[i]; @@ -87,18 +89,18 @@ namespace { return nullptr; } -}; +}; // namespace namespace MovieSubtitlesUtil { - const SubtitlesMessageInfo* getSubtitlesMessageInfo(const char *pMovieName, s32 idx) { + const SubtitlesMessageInfo* getSubtitlesMessageInfo(const char* pMovieName, s32 idx) { return &getSubtitlesInfo(pMovieName)->mMessageInfo[idx]; } - bool isExistSubtitles(const char *pMovieName, s32 idx) { + bool isExistSubtitles(const char* pMovieName, s32 idx) { return getSubtitlesMessageInfo(pMovieName, idx)->mMessageID != nullptr; } - const char* getSubtitlesMessageId(const char *pMovieName, s32 idx) { + const char* getSubtitlesMessageId(const char* pMovieName, s32 idx) { const SubtitlesMessageInfo* pSubtitles = getSubtitlesMessageInfo(pMovieName, idx); if (pSubtitles != nullptr) { @@ -108,7 +110,7 @@ namespace MovieSubtitlesUtil { return nullptr; } - s32 getSubtitlesStartStep(const char *pMovieName, s32 idx) { + s32 getSubtitlesStartStep(const char* pMovieName, s32 idx) { const SubtitlesMessageInfo* pSubtitles = getSubtitlesMessageInfo(pMovieName, idx); if (pSubtitles != nullptr) { @@ -118,7 +120,7 @@ namespace MovieSubtitlesUtil { return 0; } - s32 getSubtitlesAppearTime(const char *pMovieName, s32 idx) { + s32 getSubtitlesAppearTime(const char* pMovieName, s32 idx) { const SubtitlesMessageInfo* pSubtitles = getSubtitlesMessageInfo(pMovieName, idx); if (pSubtitles != nullptr) { @@ -128,7 +130,7 @@ namespace MovieSubtitlesUtil { return 0; } - s32 getSubtitlesMessageNum(const char *pMovieName) { + s32 getSubtitlesMessageNum(const char* pMovieName) { s32 size = sizeof(sSubtitlesInfo->mMessageInfo) / sizeof(*sSubtitlesInfo->mMessageInfo); for (s32 i = 0; i < size; i++) { @@ -141,4 +143,4 @@ namespace MovieSubtitlesUtil { return size; } -}; +}; // namespace MovieSubtitlesUtil diff --git a/src/Game/Screen/NoteCounter.cpp b/src/Game/Screen/NoteCounter.cpp index 187f8a1a7..92822f68a 100644 --- a/src/Game/Screen/NoteCounter.cpp +++ b/src/Game/Screen/NoteCounter.cpp @@ -11,7 +11,7 @@ namespace { static const s32 sStepMove = 10; static const f32 sTransMinY = -100.0f; static const f32 sTransMaxY = 0.0f; -}; +}; // namespace namespace NrvNoteCounter { NEW_NERVE(NoteCounterNrvShow, NoteCounter, Show); @@ -19,17 +19,16 @@ namespace NrvNoteCounter { NEW_NERVE(NoteCounterNrvShowToHide, NoteCounter, ShowToHide); NEW_NERVE(NoteCounterNrvHideToShow, NoteCounter, HideToShow); NEW_NERVE(NoteCounterNrvHide, NoteCounter, Hide); -}; +}; // namespace NrvNoteCounter -NoteCounter::NoteCounter(const char* pName) : - LayoutActor(pName, true), - mNoteNum(0), - mNoteAddNum(0), - mNoteMissNum(0), - mMelodyNo(-1), - mRailLength(0.0f), - mHost(nullptr) -{} +NoteCounter::NoteCounter(const char* pName) + : LayoutActor(pName, true), + mNoteNum(0), + mNoteAddNum(0), + mNoteMissNum(0), + mMelodyNo(-1), + mRailLength(0.0f), + mHost(nullptr) {} void NoteCounter::init(const JMapInfoIter& rIter) { initNerve(&NrvNoteCounter::NoteCounterNrvHide::sInstance); @@ -44,12 +43,9 @@ void NoteCounter::declareNoteNumMaxAndMelody(LiveActor* pHost, s32 noteNum, s32 mMelodyNo = melodyNo; mRailLength = railLength; - if (isNerve(&NrvNoteCounter::NoteCounterNrvHide::sInstance) - || isNerve(&NrvNoteCounter::NoteCounterNrvShowToHide::sInstance)) - { + if (isNerve(&NrvNoteCounter::NoteCounterNrvHide::sInstance) || isNerve(&NrvNoteCounter::NoteCounterNrvShowToHide::sInstance)) { setNerve(&NrvNoteCounter::NoteCounterNrvHideToShow::sInstance); - } - else if (isNerve(&NrvNoteCounter::NoteCounterNrvShowWait::sInstance)) { + } else if (isNerve(&NrvNoteCounter::NoteCounterNrvShowWait::sInstance)) { setNerve(&NrvNoteCounter::NoteCounterNrvShow::sInstance); } } @@ -57,7 +53,6 @@ void NoteCounter::declareNoteNumMaxAndMelody(LiveActor* pHost, s32 noteNum, s32 // NoteCounter::add void NoteCounter::exeShow() { - } void NoteCounter::exeShowWait() { @@ -125,4 +120,4 @@ namespace MR { pNoteCounter->mNoteMissNum++; pNoteCounter->tryEndDisp(); } -}; +}; // namespace MR diff --git a/src/Game/Screen/OdhConverter.cpp b/src/Game/Screen/OdhConverter.cpp index b77a3fce6..b05445c00 100644 --- a/src/Game/Screen/OdhConverter.cpp +++ b/src/Game/Screen/OdhConverter.cpp @@ -22,35 +22,32 @@ namespace { OdhConverter* getConverter() { return MR::getSceneObj(SceneObj_OdhConverter); } -}; +}; // namespace -OdhConverter::OdhConverter() : - LayoutActor("ODH-jpeg変換", true), - mCaptureWidth(cCaptureWidth), - mCaptureHeight(cCaptureHeight), - mLimitSize(cLimitSize), - mIsRequestedCapture(false), - mImage(nullptr), - mCaptureImage(nullptr) -{ - +OdhConverter::OdhConverter() + : LayoutActor("ODH-jpeg変換", true), + mCaptureWidth(cCaptureWidth), + mCaptureHeight(cCaptureHeight), + mLimitSize(cLimitSize), + mIsRequestedCapture(false), + mImage(nullptr), + mCaptureImage(nullptr) { } void OdhConverter::init(const JMapInfoIter& rIter) { MR::connectToScene(this, -1, -1, -1, 62); MR::CurrentHeapRestorer heapRestorer(MR::getSceneHeapGDDR3()); - mImage = new(32) u8[mLimitSize]; - mCaptureImage = new(32) u8[mCaptureWidth * mCaptureHeight * 3]; + mImage = new (32) u8[mLimitSize]; + mCaptureImage = new (32) u8[mCaptureWidth * mCaptureHeight * 3]; } void OdhConverter::draw() const { - } void OdhConverter::convert() { const GXRenderModeObj* pRenderModeObj; - u8* pScreenTexImage; + u8* pScreenTexImage; pScreenTexImage = MR::getScreenTexImage(); pRenderModeObj = JUTVideo::sManager->mRenderModeObj; @@ -89,10 +86,10 @@ namespace MR { void setPortCaptureOdhImage() { Mtx44 mtx; - f32 bottom; - f32 right; - f32 top; - f32 left; + f32 bottom; + f32 right; + f32 top; + f32 left; top = getFrameBufferHeight() * 0.5f - cCaptureOffsetX; left = -getFrameBufferWidth() * 0.5f + cCaptureOffsetY; @@ -126,4 +123,4 @@ namespace MR { return pDrawAdaptor; } -}; +}; // namespace MR diff --git a/src/Game/Screen/OneUpBoard.cpp b/src/Game/Screen/OneUpBoard.cpp index 416cf836c..1cf5a69e2 100644 --- a/src/Game/Screen/OneUpBoard.cpp +++ b/src/Game/Screen/OneUpBoard.cpp @@ -9,12 +9,10 @@ namespace NrvOneUpBoard { NEW_NERVE(HostTypeWait, OneUpBoard, Wait); NEW_NERVE(HostTypeAppear, OneUpBoard, Appear); -}; +}; // namespace NrvOneUpBoard -OneUpBoard::OneUpBoard() : - LayoutActor("1UPボード", true) -{ - +OneUpBoard::OneUpBoard() + : LayoutActor("1UPボード", true) { } void OneUpBoard::init(const JMapInfoIter& rIter) { @@ -43,18 +41,16 @@ void OneUpBoard::calcPos() { pos.y -= 60.0f; pos.y = pos.y >= 160.0f - ? pos.y - : 160.0f; + ? pos.y + : 160.0f; setTrans(pos); } void OneUpBoard::control() { - } void OneUpBoard::exeWait() { - } void OneUpBoard::exeAppear() { diff --git a/src/Game/Screen/PauseMenu.cpp b/src/Game/Screen/PauseMenu.cpp index 01c31d7c9..cf3cdc479 100644 --- a/src/Game/Screen/PauseMenu.cpp +++ b/src/Game/Screen/PauseMenu.cpp @@ -16,14 +16,13 @@ namespace { const s32 cBackSequenceFadeFrame = 90; bool isInvalidBackAstroDome() { - return !MR::isOnGameEventFlagUseAstroDome() - || (MR::isStageAstroLocation() && !MR::isEqualStageName("HeavensDoorGalaxy")); + return !MR::isOnGameEventFlagUseAstroDome() || (MR::isStageAstroLocation() && !MR::isEqualStageName("HeavensDoorGalaxy")); } bool isStageHideScenarioTitle() { return MR::isStageBeginPrologueEvent() || MR::isStageAstroLocation(); } -}; +}; // namespace namespace NrvPauseMenu { NEW_NERVE(PauseMenuNrvSelecting, PauseMenu, Selecting); @@ -32,22 +31,20 @@ namespace NrvPauseMenu { NEW_NERVE(PauseMenuNrvConfirm, PauseMenu, Confirm); NEW_NERVE(PauseMenuNrvGameDataSave, PauseMenu, GameDataSave); NEW_NERVE(PauseMenuNrvLuigiLetter, PauseMenu, LuigiLetter); -}; +}; // namespace NrvPauseMenu -PauseMenu::PauseMenu() : - LayoutActor("ポーズメニュー", true), - _20(nullptr), - _24(nullptr), - _28(0.0f, 50.0f), - _30(nullptr), - mLuigiLetter(nullptr), - _38(nullptr), - mStageTitleOffset(0.0f, 39.0f), - mCoinNumPos(0.0f, 0.0f), - mStarPieceNumPos(0.0f, 0.0f), - _54(true) -{ - +PauseMenu::PauseMenu() + : LayoutActor("ポーズメニュー", true), + _20(nullptr), + _24(nullptr), + _28(0.0f, 50.0f), + _30(nullptr), + mLuigiLetter(nullptr), + _38(nullptr), + mStageTitleOffset(0.0f, 39.0f), + mCoinNumPos(0.0f, 0.0f), + mStarPieceNumPos(0.0f, 0.0f), + _54(true) { } void PauseMenu::init(const JMapInfoIter& rIter) { @@ -84,15 +81,13 @@ void PauseMenu::init(const JMapInfoIter& rIter) { if (MR::isEqualStageName("AstroDome")) { MR::setTextBoxMessageRecursive(this, "ShaStageTitle", MR::getCurrentScenarioNameOnCurrentLanguage()); - } - else { + } else { MR::setTextBoxMessageRecursive(this, "ShaStageTitle", MR::getCurrentGalaxyNameOnCurrentLanguage()); } if (isStageHideScenarioTitle()) { MR::hidePaneRecursive(this, "ScenarioTitle"); - } - else { + } else { MR::setTextBoxMessageRecursive(this, "ScenarioTitle", MR::getCurrentScenarioNameOnCurrentLanguage()); } @@ -108,8 +103,7 @@ void PauseMenu::init(const JMapInfoIter& rIter) { _38 = new ButtonPaneController(this, "LetterButton", "BoxButton3", 0, true); _38->_22 = false; - } - else { + } else { MR::hidePaneRecursive(this, "LetterButton"); } @@ -158,18 +152,15 @@ void PauseMenu::appear() { if (coinNum >= 100) { pCoinPanePos = "CPosition3"; - } - else if (coinNum >= 10) { + } else if (coinNum >= 10) { pCoinPanePos = "CPosition2"; } if (starPieceNum >= 1000) { pPiecePanePos = "PPosition4"; - } - else if (starPieceNum >= 100) { + } else if (starPieceNum >= 100) { pPiecePanePos = "PPosition3"; - } - else if (starPieceNum >= 10) { + } else if (starPieceNum >= 10) { pPiecePanePos = "PPosition2"; } @@ -198,8 +189,7 @@ void PauseMenu::control() { if (_24 != nullptr) { _24->update(); - } - else { + } else { _28.x = 0.0f; _28.y = 50.0f; } @@ -222,11 +212,7 @@ void PauseMenu::startPaneAnimWithoutButton(const char* pAnimName) { } bool PauseMenu::isPaneAnimStoppedWithoutButton() const { - return MR::isPaneAnimStopped(this, "BG", 0) - && MR::isPaneAnimStopped(this, "PicStagebase", 0) - && MR::isPaneAnimStopped(this, "PicStagebase1", 0) - && MR::isPaneAnimStopped(this, "Stars", 0) - && MR::isPaneAnimStopped(this, "Counter", 0); + return MR::isPaneAnimStopped(this, "BG", 0) && MR::isPaneAnimStopped(this, "PicStagebase", 0) && MR::isPaneAnimStopped(this, "PicStagebase1", 0) && MR::isPaneAnimStopped(this, "Stars", 0) && MR::isPaneAnimStopped(this, "Counter", 0); } void PauseMenu::forceToWaitAllButton() { @@ -274,8 +260,8 @@ void PauseMenu::exeDisappear() { void PauseMenu::exeConfirm() { if (MR::isFirstStep(this)) { const char* pMessageId = isInvalidBackAstroDome() - ? "PauseMenu_ConfirmEndGame" - : "PauseMenu_ConfirmBackAstroDome"; + ? "PauseMenu_ConfirmEndGame" + : "PauseMenu_ConfirmBackAstroDome"; _30->appear(pMessageId, SysInfoWindow::Type_YesNo, SysInfoWindow::TextPos_Center, SysInfoWindow::MessageType_System); } @@ -286,12 +272,10 @@ void PauseMenu::exeConfirm() { if (isInvalidBackAstroDome()) { MR::requestChangeSceneTitle(); - } - else { + } else { MR::requestChangeStageGoBackAstroDome(); } - } - else { + } else { forceToWaitAllButton(); setNerve(&NrvPauseMenu::PauseMenuNrvSelecting::sInstance); } @@ -309,8 +293,7 @@ void PauseMenu::exeGameDataSave() { if (GameSequenceFunction::isSuccessSaveDataHandleSequence()) { setNerve(&NrvPauseMenu::PauseMenuNrvConfirm::sInstance); - } - else { + } else { forceToWaitAllButton(); setNerve(&NrvPauseMenu::PauseMenuNrvSelecting::sInstance); } diff --git a/src/Game/Screen/PeachLetter.cpp b/src/Game/Screen/PeachLetter.cpp index 1fde60ed3..3267577f9 100644 --- a/src/Game/Screen/PeachLetter.cpp +++ b/src/Game/Screen/PeachLetter.cpp @@ -11,13 +11,11 @@ namespace NrvPeachLetter { NEW_NERVE(PeachLetterNrvAppear, PeachLetter, Appear); NEW_NERVE(PeachLetterNrvWait, PeachLetter, Wait); NEW_NERVE(PeachLetterNrvEnd, PeachLetter, End); -}; +}; // namespace NrvPeachLetter -PeachLetter::PeachLetter(const char* pName) : - LayoutActor(pName, true), - mAButtonIcon(nullptr) -{ - +PeachLetter::PeachLetter(const char* pName) + : LayoutActor(pName, true), + mAButtonIcon(nullptr) { } void PeachLetter::init(const JMapInfoIter&) { diff --git a/src/Game/Screen/PictureBookCloseButton.cpp b/src/Game/Screen/PictureBookCloseButton.cpp index 9e8142b87..36a07079b 100644 --- a/src/Game/Screen/PictureBookCloseButton.cpp +++ b/src/Game/Screen/PictureBookCloseButton.cpp @@ -9,13 +9,12 @@ namespace NrvPictureBookCloseButton { NEW_NERVE(PictureBookCloseButtonNrvSelect, PictureBookCloseButton, Select); NEW_NERVE(PictureBookCloseButtonNrvSelected, PictureBookCloseButton, Selected); NEW_NERVE(PictureBookCloseButtonNrvNotSelected, PictureBookCloseButton, NotSelected); -}; +}; // namespace NrvPictureBookCloseButton -PictureBookCloseButton::PictureBookCloseButton(bool canCloseWithPad) : - LayoutActor("絵本閉じるボタン", true), - mPaneCtrl(nullptr), - mCanCloseWithPad(canCloseWithPad) -{} +PictureBookCloseButton::PictureBookCloseButton(bool canCloseWithPad) + : LayoutActor("絵本閉じるボタン", true), + mPaneCtrl(nullptr), + mCanCloseWithPad(canCloseWithPad) {} void PictureBookCloseButton::init(const JMapInfoIter& rIter) { initLayoutManager("BackButton", 1); @@ -72,7 +71,6 @@ void PictureBookCloseButton::control() { } void PictureBookCloseButton::exeSelect() { - } void PictureBookCloseButton::exeSelected() { diff --git a/src/Game/Screen/PictureBookLayout.cpp b/src/Game/Screen/PictureBookLayout.cpp index 88cb64392..0b8f2ecdb 100644 --- a/src/Game/Screen/PictureBookLayout.cpp +++ b/src/Game/Screen/PictureBookLayout.cpp @@ -23,8 +23,8 @@ namespace { const s32 cWaitNoTextFrame = 60; const s32 cFadeTextFrame = 30; // const s32 cReadedSpeedRate - const s32 cPageNextEndNormalSeStep = 81; - const s32 cPageNextEndFastSeStep = 27; + const s32 cPageNextEndNormalSeStep = 81; + const s32 cPageNextEndFastSeStep = 27; const char* cContentsPaneName[] = { "Chapter1", "Chapter2", @@ -82,7 +82,7 @@ namespace { return 1; } -}; +}; // namespace namespace NrvPictureBookLayout { NEW_NERVE(PictureBookLayoutNrvOpen, PictureBookLayout, Open); @@ -96,30 +96,29 @@ namespace NrvPictureBookLayout { NEW_NERVE(PictureBookLayoutNrvPageNext, PictureBookLayout, PageNext); NEW_NERVE(PictureBookLayoutNrvFadeOut, PictureBookLayout, FadeOut); NEW_NERVE(PictureBookLayoutNrvClose, PictureBookLayout, Close); -}; +}; // namespace NrvPictureBookLayout -PictureBookLayout::PictureBookLayout(s32 chapterMin, s32 chapterMax, bool isRosettaReading) : - LayoutActor("絵本レイアウト", true), - mChapterMin(chapterMin), - mChapterMax(chapterMax), - mChapterRosettaMax(chapterMax), - mChapterNo(1), - mPageNo(0), - mTextIndex(0), - mNotReadedChapterNo(-1), - mNotReadedPageNo(-1), - mNotReadedTextIndex(-1), - _44(nullptr), - _48(nullptr), - mTitleTexMap(nullptr), - mCoverFrontTexMap(nullptr), - mCoverBackTexMap(nullptr), - mNextItemDir(1), - mIsNextItemFast(false), - mIconAButton(nullptr), - mContentsButtonPaneController(nullptr), - mCloseButton(nullptr) -{ +PictureBookLayout::PictureBookLayout(s32 chapterMin, s32 chapterMax, bool isRosettaReading) + : LayoutActor("絵本レイアウト", true), + mChapterMin(chapterMin), + mChapterMax(chapterMax), + mChapterRosettaMax(chapterMax), + mChapterNo(1), + mPageNo(0), + mTextIndex(0), + mNotReadedChapterNo(-1), + mNotReadedPageNo(-1), + mNotReadedTextIndex(-1), + _44(nullptr), + _48(nullptr), + mTitleTexMap(nullptr), + mCoverFrontTexMap(nullptr), + mCoverBackTexMap(nullptr), + mNextItemDir(1), + mIsNextItemFast(false), + mIconAButton(nullptr), + mContentsButtonPaneController(nullptr), + mCloseButton(nullptr) { if (!isRosettaReading) { mContentsButtonPaneController = new ButtonPaneController*[getChapterMax()]; } @@ -157,8 +156,7 @@ void PictureBookLayout::appear() { if (mContentsButtonPaneController == nullptr) { MR::hidePaneRecursive(this, "Contents"); - } - else { + } else { hideContents(); } @@ -166,8 +164,7 @@ void PictureBookLayout::appear() { if (mContentsButtonPaneController == nullptr) { setNerve(&NrvPictureBookLayout::PictureBookLayoutNrvFadeIn::sInstance); - } - else { + } else { setNerve(&NrvPictureBookLayout::PictureBookLayoutNrvOpen::sInstance); } @@ -271,8 +268,7 @@ bool PictureBookLayout::updateText() { MR::setTextBoxGameMessageRecursive(this, "Title", messageId); return true; - } - else { + } else { char messageId[64]; snprintf(messageId, sizeof(messageId), "PictureBookChapter%d_Page%d_%03d", mChapterNo, mPageNo, mTextIndex); @@ -293,8 +289,7 @@ void PictureBookLayout::updateTexture() { if (mNextItemDir > 0) { pageNo = mPageNo - 1; - } - else { + } else { pageNo = mPageNo; } @@ -303,9 +298,8 @@ void PictureBookLayout::updateTexture() { MR::replacePaneTexture(this, "PicLeftPage", pTexMap, 0); MR::replacePaneTexture(this, "PicTurnRightPage", pTexMap, 0); - } - else { - s32 texMapIndex = textureNum + pageNo - 1; + } else { + s32 texMapIndex = textureNum + pageNo - 1; nw4r::lyt::TexMap* pTexMap = _48[texMapIndex % textureNum - 1]; MR::replacePaneTexture(this, "PicLeftPage", pTexMap, 0); @@ -314,8 +308,7 @@ void PictureBookLayout::updateTexture() { if (mNextItemDir > 0) { pageNo = mPageNo + 1; - } - else { + } else { pageNo = mPageNo; } @@ -324,9 +317,8 @@ void PictureBookLayout::updateTexture() { MR::replacePaneTexture(this, "PicRightPage", pTexMap, 0); MR::replacePaneTexture(this, "PicTurnLeftPage", pTexMap, 0); - } - else { - s32 texMapIndex = textureNum + pageNo - 1; + } else { + s32 texMapIndex = textureNum + pageNo - 1; nw4r::lyt::TexMap* pTexMap = _48[texMapIndex % textureNum - 1]; MR::replacePaneTexture(this, "PicRightPage", pTexMap, 0); @@ -358,8 +350,7 @@ bool PictureBookLayout::pageNext() { if (mPageNo != 0) { if (mNextItemDir > 0) { mTextIndex = 0; - } - else { + } else { mTextIndex = getCurrentMaxTextIndex(); } } @@ -377,8 +368,7 @@ bool PictureBookLayout::chapterNext() { if (mNextItemDir > 0) { mPageNo = 0; mTextIndex = 0; - } - else { + } else { mPageNo = getPageNum(mChapterNo); mTextIndex = getCurrentMaxTextIndex(); } @@ -405,16 +395,13 @@ s32 PictureBookLayout::getReadSpeed() const { if (b) { return 3; - } - else { + } else { return 1; } } bool PictureBookLayout::isBookEndCurrentText() const { - return mChapterNo == 9 - && mPageNo == getPageNum(9) - && mTextIndex == getCurrentMaxTextIndex(); + return mChapterNo == 9 && mPageNo == getPageNum(9) && mTextIndex == getCurrentMaxTextIndex(); } void PictureBookLayout::setTextAlpha(f32 alpha) { @@ -436,10 +423,7 @@ bool PictureBookLayout::isValidCloseButton() const { return false; } - return isNerve(&NrvPictureBookLayout::PictureBookLayoutNrvOpen::sInstance) - || isNerve(&NrvPictureBookLayout::PictureBookLayoutNrvContentsSelect::sInstance) - || isNerve(&NrvPictureBookLayout::PictureBookLayoutNrvOpen::sInstance) - || mPageNo == 0; + return isNerve(&NrvPictureBookLayout::PictureBookLayoutNrvOpen::sInstance) || isNerve(&NrvPictureBookLayout::PictureBookLayoutNrvContentsSelect::sInstance) || isNerve(&NrvPictureBookLayout::PictureBookLayoutNrvOpen::sInstance) || mPageNo == 0; } bool PictureBookLayout::isSelectedCloseButton() const { @@ -526,8 +510,7 @@ void PictureBookLayout::exeContentsSelect() { if (mCloseButton->trySelect()) { setNerve(&NrvPictureBookLayout::PictureBookLayoutNrvContentsFadeOut::sInstance); - } - else { + } else { for (s32 i = 0; i < mChapterMax; i++) { if (mContentsButtonPaneController[i]->isPointingTrigger()) { MR::startSystemSE("SE_SY_PICBOOK_CONTENTS_CUR", -1, -1); @@ -565,8 +548,7 @@ void PictureBookLayout::exeContentsFadeOut() { setNerve(&NrvPictureBookLayout::PictureBookLayoutNrvClose::sInstance); } } - } - else { + } else { if (MR::isStep(this, stepMax)) { MR::closeWipeFade(cFadeFrame); } @@ -591,8 +573,7 @@ void PictureBookLayout::exeFadeIn() { if (mNextItemDir > 0) { alpha = 0.0f; - } - else { + } else { alpha = 1.0f; } @@ -604,8 +585,7 @@ void PictureBookLayout::exeFadeIn() { if (mNextItemDir > 0) { animFrame = MR::getAnimFrameMax(this, (u32)0); - } - else { + } else { animFrame = 0.0f; } @@ -636,16 +616,14 @@ void PictureBookLayout::exeFadeInText() { if (mContentsButtonPaneController != nullptr) { mCloseButton->appear(); } - } - else { + } else { MR::showPaneRecursive(this, "Text"); MR::showPaneRecursive(this, "PicToneDown"); MR::startPaneAnim(this, "Text", "TextColor", 0); if (isReadedCurrentText()) { MR::setPaneAnimFrameAndStop(this, "Text", 1.0f, 0); - } - else { + } else { MR::setPaneAnimFrameAndStop(this, "Text", 0.0f, 0); } } @@ -666,21 +644,18 @@ void PictureBookLayout::exeFadeInText() { if (mPageNo == 8) { if (mTextIndex >= 1) { MR::stopStageBGM(120); - } - else if (MR::isStopOrFadeoutBgmName("STM_PROLOGUE_01_B")) { + } else if (MR::isStopOrFadeoutBgmName("STM_PROLOGUE_01_B")) { MR::startStageBGM("STM_PROLOGUE_01_B", false); } } - } - else if (MR::isStopOrFadeoutBgmName("STM_PROLOGUE_01")) { + } else if (MR::isStopOrFadeoutBgmName("STM_PROLOGUE_01")) { MR::startStageBGM("STM_PROLOGUE_01", 0); } if (isBookEndCurrentText()) { MR::setTextBoxHorizontalPositionCenterRecursive(this, "Text"); MR::setTextBoxVerticalPositionCenterRecursive(this, "Text"); - } - else { + } else { MR::setTextBoxHorizontalPositionLeftRecursive(this, "Text"); MR::setTextBoxVerticalPositionTopRecursive(this, "Text"); } @@ -715,11 +690,8 @@ void PictureBookLayout::exeWaitWithText() { if (isValidCloseButton() && mCloseButton->trySelect()) { setNerve(&NrvPictureBookLayout::PictureBookLayoutNrvFadeOutText::sInstance); - } - else { - bool isTriggerNextPage = MR::testCorePadTriggerA(WPAD_CHAN0) - || MR::testCorePadTriggerRight(WPAD_CHAN0) - || MR::testSubPadStickTriggerRight(WPAD_CHAN0); + } else { + bool isTriggerNextPage = MR::testCorePadTriggerA(WPAD_CHAN0) || MR::testCorePadTriggerRight(WPAD_CHAN0) || MR::testSubPadStickTriggerRight(WPAD_CHAN0); if (isTriggerNextPage) { MR::startSystemSE("SE_SY_TALK_FOCUS_ITEM", -1, -1); @@ -737,10 +709,8 @@ void PictureBookLayout::exeWaitWithText() { mNextItemDir = 1; setNerve(&NrvPictureBookLayout::PictureBookLayoutNrvFadeOutText::sInstance); - } - else { - bool isTriggerPrevPage = MR::testCorePadTriggerLeft(WPAD_CHAN0) - || MR::testSubPadStickTriggerLeft(WPAD_CHAN0); + } else { + bool isTriggerPrevPage = MR::testCorePadTriggerLeft(WPAD_CHAN0) || MR::testSubPadStickTriggerLeft(WPAD_CHAN0); if (isTriggerPrevPage) { if (mChapterMin < mChapterNo || mPageNo > 0 || mTextIndex > 0) { @@ -781,25 +751,20 @@ void PictureBookLayout::exeFadeOutText() { if (MR::isGreaterStep(this, step) && MR::isDead(mCloseButton)) { setNerve(&NrvPictureBookLayout::PictureBookLayoutNrvClose::sInstance); } - } - else if (MR::isStep(this, step)) { + } else if (MR::isStep(this, step)) { if (textNext()) { setNerve(&NrvPictureBookLayout::PictureBookLayoutNrvFadeInText::sInstance); - } - else if (pageNext()) { + } else if (pageNext()) { setNerve(&NrvPictureBookLayout::PictureBookLayoutNrvPageNext::sInstance); - } - else if (chapterNext()) { + } else if (chapterNext()) { if (MR::isPlayingStageBgmName("STM_PROLOGUE_01_B")) { MR::stopStageBGM(120); } setNerve(&NrvPictureBookLayout::PictureBookLayoutNrvFadeOut::sInstance); - } - else if (mContentsButtonPaneController == nullptr) { + } else if (mContentsButtonPaneController == nullptr) { setNerve(&NrvPictureBookLayout::PictureBookLayoutNrvFadeOut::sInstance); - } - else { + } else { setNerve(&NrvPictureBookLayout::PictureBookLayoutNrvClose::sInstance); } } @@ -814,15 +779,13 @@ void PictureBookLayout::exePageNext() { if (mNextItemDir > 0) { MR::startAnim(this, "PageNext", 0); - } - else { + } else { MR::startAnimReverseOneTime(this, "PageNext", 0); } if (mIsNextItemFast) { MR::startSystemSE("SE_SY_PICTUREBOOK_NEXT_F_ST", -1, -1); - } - else { + } else { MR::startSystemSE("SE_SY_PICTUREBOOK_NEXT_ST", -1, -1); } @@ -833,8 +796,7 @@ void PictureBookLayout::exePageNext() { if (MR::isStep(this, cPageNextEndFastSeStep)) { MR::startSystemSE("SE_SY_PICTUREBOOK_NEXT_F_ED", -1, -1); } - } - else if (MR::isStep(this, cPageNextEndNormalSeStep)) { + } else if (MR::isStep(this, cPageNextEndNormalSeStep)) { MR::startSystemSE("SE_SY_PICTUREBOOK_NEXT_ED", -1, -1); } @@ -856,8 +818,7 @@ void PictureBookLayout::exeFadeOut() { if (mChapterMax >= mChapterNo) { setNerve(&NrvPictureBookLayout::PictureBookLayoutNrvFadeIn::sInstance); - } - else { + } else { kill(); } } @@ -876,8 +837,7 @@ void PictureBookLayout::exeClose() { MR::replacePaneTexture(this, "PicLeftPage", pTexMap, 0); MR::replacePaneTexture(this, "PicTurnRightPage", pTexMap, 0); - } - else { + } else { pTexMap = _48[mPageNo - 2]; MR::replacePaneTexture(this, "PicLeftPage", pTexMap, 0); diff --git a/src/Game/Screen/PlayerActionGuidance.cpp b/src/Game/Screen/PlayerActionGuidance.cpp index d27f9359d..258bb52e4 100644 --- a/src/Game/Screen/PlayerActionGuidance.cpp +++ b/src/Game/Screen/PlayerActionGuidance.cpp @@ -12,13 +12,13 @@ namespace { static const s32 sSuspendFrame = 60; static const s32 sChangeSoundFrame = 40; -}; +}; // namespace namespace MR { PlayerActionGuidance* getPlayerActionGuidance() { return MR::getSceneObj(SceneObj_PlayerActionGuidance); } -}; +}; // namespace MR namespace { NEW_NERVE(PlayerActionGuidanceWaitFocusIn, PlayerActionGuidance, WaitFocusIn); @@ -26,21 +26,19 @@ namespace { NEW_NERVE(PlayerActionGuidanceDisplay, PlayerActionGuidance, Display); NEW_NERVE(PlayerActionGuidanceSuspend, PlayerActionGuidance, Suspend); NEW_NERVE(PlayerActionGuidanceFadeout, PlayerActionGuidance, Fadeout); -}; +}; // namespace -PlayerActionGuidance::PlayerActionGuidance() : - LayoutActor("プレイヤーアクションガイダンス", true), - mSpinLayout(nullptr), - mTamakoroLayout(nullptr), - mCurrentLayout(nullptr), - mGuidanceState(3), - mGuidancePrevState(3), - _34(false), - _35(false), - _36(false), - _37(false) -{ - +PlayerActionGuidance::PlayerActionGuidance() + : LayoutActor("プレイヤーアクションガイダンス", true), + mSpinLayout(nullptr), + mTamakoroLayout(nullptr), + mCurrentLayout(nullptr), + mGuidanceState(3), + mGuidancePrevState(3), + _34(false), + _35(false), + _36(false), + _37(false) { } void PlayerActionGuidance::control() { @@ -49,18 +47,15 @@ void PlayerActionGuidance::control() { if (mSpinLayout != nullptr && isInVolumePlayer("SpinGuidanceCube", false)) { mCurrentLayout = mSpinLayout; _35 = true; - } - else if (mTamakoroLayout != nullptr && (_36 || isInVolumePlayer("TamakoroMoveGuidanceCube", true))) { + } else if (mTamakoroLayout != nullptr && (_36 || isInVolumePlayer("TamakoroMoveGuidanceCube", true))) { mCurrentLayout = mTamakoroLayout; mGuidanceState = 3; _35 = true; - } - else if (mTamakoroLayout != nullptr && (_36 || isInVolumePlayer("TamakoroJumpGuidanceCube", true))) { + } else if (mTamakoroLayout != nullptr && (_36 || isInVolumePlayer("TamakoroJumpGuidanceCube", true))) { mCurrentLayout = mTamakoroLayout; mGuidanceState = 4; _35 = true; - } - else { + } else { _35 = false; } @@ -188,8 +183,7 @@ void PlayerActionGuidance::exeSuspend() { if (!_35) { hideAllLayout(); setNerve(&PlayerActionGuidanceWaitFocusIn::sInstance); - } - else { + } else { setNerve(&PlayerActionGuidanceFadein::sInstance); } } @@ -203,8 +197,7 @@ void PlayerActionGuidance::exeFadeout() { if (MR::isAnimStopped(mCurrentLayout, 0)) { if (_35) { setNerve(&PlayerActionGuidanceSuspend::sInstance); - } - else { + } else { hideAllLayout(); setNerve(&PlayerActionGuidanceWaitFocusIn::sInstance); } @@ -269,8 +262,7 @@ bool PlayerActionGuidance::isInVolumePlayer(const char* pObjName, bool param2) c if (param2) { return pObj->isOnSwitchA() == true; - } - else { + } else { return pObj->isOnSwitchA() == false; } } diff --git a/src/Game/Screen/PlayerLeft.cpp b/src/Game/Screen/PlayerLeft.cpp index 46f1bcede..798206e7c 100644 --- a/src/Game/Screen/PlayerLeft.cpp +++ b/src/Game/Screen/PlayerLeft.cpp @@ -12,15 +12,14 @@ namespace NrvPlayerLeft { NEW_NERVE(PlayerLeftNrvAppear, PlayerLeft, Appear); NEW_NERVE(PlayerLeftNrvWait, PlayerLeft, Wait); NEW_NERVE(PlayerLeftNrvDisappear, PlayerLeft, Disappear); -}; +}; // namespace NrvPlayerLeft -PlayerLeft::PlayerLeft(const char* pName) : - LayoutActor(pName, true), - mPlayerLeft(0), - mLayoutAppearer(nullptr), - mPaneRumbler(nullptr), - mIsForceAppear(false) -{} +PlayerLeft::PlayerLeft(const char* pName) + : LayoutActor(pName, true), + mPlayerLeft(0), + mLayoutAppearer(nullptr), + mPaneRumbler(nullptr), + mIsForceAppear(false) {} void PlayerLeft::init(const JMapInfoIter& rIter) { initLayoutManager("PlayerLeft", 3); @@ -121,8 +120,7 @@ void PlayerLeft::exeWait() { if (isValidAppearSituation()) { setNerve(&NrvPlayerLeft::PlayerLeftNrvWait::sInstance); - } - else if (!mIsForceAppear && CounterLayoutController::isWaitToDisappearCounter(this)) { + } else if (!mIsForceAppear && CounterLayoutController::isWaitToDisappearCounter(this)) { setNerve(&NrvPlayerLeft::PlayerLeftNrvDisappear::sInstance); } } diff --git a/src/Game/Screen/PlayerMissLeft.cpp b/src/Game/Screen/PlayerMissLeft.cpp index 28f58bbd8..f139e16b5 100644 --- a/src/Game/Screen/PlayerMissLeft.cpp +++ b/src/Game/Screen/PlayerMissLeft.cpp @@ -9,20 +9,19 @@ namespace { const s32 hCountDownTime = 15; const s32 hEndTime = 90; -}; +}; // namespace namespace NrvPlayerMissLeft { NEW_NERVE(HostTypeNrvAppearWait, PlayerMissLeft, AppearWait); NEW_NERVE(HostTypeNrvAppear, PlayerMissLeft, Appear); NEW_NERVE(HostTypeNrvWait, PlayerMissLeft, Wait); NEW_NERVE(HostTypeNrvEnd, PlayerMissLeft, End); -}; +}; // namespace NrvPlayerMissLeft -PlayerMissLeft::PlayerMissLeft(const char* pName) : - LayoutActor(pName, true), - mLayoutAppearer(nullptr), - mPaneRumbler(nullptr) -{} +PlayerMissLeft::PlayerMissLeft(const char* pName) + : LayoutActor(pName, true), + mLayoutAppearer(nullptr), + mPaneRumbler(nullptr) {} void PlayerMissLeft::init(const JMapInfoIter& rIter) { initLayoutManager("PlayerLeft", 3); @@ -65,8 +64,7 @@ void PlayerMissLeft::exeAppear() { if (MR::isPlayerLuigi()) { MR::startAnim(this, "Luigi", 2); MR::setAnimFrameAndStop(this, 1.0f, 2); - } - else { + } else { MR::startAnim(this, "Luigi", 2); MR::setAnimFrameAndStop(this, 0.0f, 2); } diff --git a/src/Game/Screen/PrologueLetter.cpp b/src/Game/Screen/PrologueLetter.cpp index 6de968d71..f3ad371c8 100644 --- a/src/Game/Screen/PrologueLetter.cpp +++ b/src/Game/Screen/PrologueLetter.cpp @@ -10,12 +10,11 @@ namespace { NEW_NERVE(PrologueLetterNrvAppear, PrologueLetter, Appear); NEW_NERVE(PrologueLetterNrvWait, PrologueLetter, Wait); NEW_NERVE(PrologueLetterNrvDisappear, PrologueLetter, Disappear); -}; +}; // namespace -PrologueLetter::PrologueLetter(const char* pName) : - LayoutActor(pName, true), - mAButtonIcon(nullptr) -{} +PrologueLetter::PrologueLetter(const char* pName) + : LayoutActor(pName, true), + mAButtonIcon(nullptr) {} void PrologueLetter::init(const JMapInfoIter& rIter) { initLayoutManager("PeachLetterMini", 1); diff --git a/src/Game/Screen/ProloguePictureBook.cpp b/src/Game/Screen/ProloguePictureBook.cpp index b9696b3dc..fa8a00dbf 100644 --- a/src/Game/Screen/ProloguePictureBook.cpp +++ b/src/Game/Screen/ProloguePictureBook.cpp @@ -16,13 +16,12 @@ namespace NrvProloguePictureBook { NEW_NERVE(ProloguePictureBookPlaying, ProloguePictureBook, Playing); NEW_NERVE(ProloguePictureBookKeyWait, ProloguePictureBook, KeyWait); NEW_NERVE(ProloguePictureBookEnd, ProloguePictureBook, End); -}; +}; // namespace NrvProloguePictureBook -ProloguePictureBook::ProloguePictureBook() : - LayoutActor("プロローグの絵本", true), - mAButtonIcon(nullptr), - mPage(0) -{} +ProloguePictureBook::ProloguePictureBook() + : LayoutActor("プロローグの絵本", true), + mAButtonIcon(nullptr), + mPage(0) {} void ProloguePictureBook::init(const JMapInfoIter& rIter) { MR::connectToSceneLayout(this); @@ -59,8 +58,7 @@ void ProloguePictureBook::exePlaying() { if (MR::isAnimStopped(this, 0)) { setNerve(&NrvProloguePictureBook::ProloguePictureBookEnd::sInstance); - } - else { + } else { int index = mPage + 1; if (sBookPageInfo[index] < 0) { @@ -99,7 +97,6 @@ void ProloguePictureBook::exeKeyWait() { } void ProloguePictureBook::exeEnd() { - } bool ProloguePictureBook::isEnd() const { diff --git a/src/Game/Screen/PurpleCoinCounter.cpp b/src/Game/Screen/PurpleCoinCounter.cpp index 465bbb8ca..de1db556b 100644 --- a/src/Game/Screen/PurpleCoinCounter.cpp +++ b/src/Game/Screen/PurpleCoinCounter.cpp @@ -13,18 +13,16 @@ namespace { namespace NrvPurpleCoinCounter { NEW_NERVE(PurpleCoinCounterNrvAppear, PurpleCoinCounter, Appear); NEW_NERVE(PurpleCoinCounterNrvWait, PurpleCoinCounter, Wait); -}; +}; // namespace NrvPurpleCoinCounter -PurpleCoinCounter::PurpleCoinCounter(const char* pName) : - LayoutActor(pName, true), - mPurpleCoinNum(0), - mPurpleCoinDisplayNum(0), - mInvalidCountUpFrame(0), - mLayoutAppearer(nullptr), - mPaneRumbler(nullptr), - mIsValid(false) -{ - +PurpleCoinCounter::PurpleCoinCounter(const char* pName) + : LayoutActor(pName, true), + mPurpleCoinNum(0), + mPurpleCoinDisplayNum(0), + mInvalidCountUpFrame(0), + mLayoutAppearer(nullptr), + mPaneRumbler(nullptr), + mIsValid(false) { } void PurpleCoinCounter::init(const JMapInfoIter& rIter) { @@ -76,8 +74,7 @@ void PurpleCoinCounter::updateCounter() { if (mInvalidCountUpFrame > 0) { mInvalidCountUpFrame--; - } - else if (mPurpleCoinDisplayNum < mPurpleCoinNum) { + } else if (mPurpleCoinDisplayNum < mPurpleCoinNum) { if (isNerve(&NrvPurpleCoinCounter::PurpleCoinCounterNrvWait::sInstance)) { mInvalidCountUpFrame = cInvalidCountUpInterval; mPurpleCoinDisplayNum++; @@ -90,8 +87,7 @@ void PurpleCoinCounter::updateCounter() { if (!isNerve(&NrvPurpleCoinCounter::PurpleCoinCounterNrvAppear::sInstance)) { if (!isNerve(&NrvPurpleCoinCounter::PurpleCoinCounterNrvWait::sInstance)) { setNerve(&NrvPurpleCoinCounter::PurpleCoinCounterNrvAppear::sInstance); - } - else { + } else { setNerve(&NrvPurpleCoinCounter::PurpleCoinCounterNrvWait::sInstance); } } @@ -113,5 +109,4 @@ void PurpleCoinCounter::exeAppear() { } void PurpleCoinCounter::exeWait() { - } diff --git a/src/Game/Screen/SaveIcon.cpp b/src/Game/Screen/SaveIcon.cpp index f82a0f45a..a637ce9d6 100644 --- a/src/Game/Screen/SaveIcon.cpp +++ b/src/Game/Screen/SaveIcon.cpp @@ -1,10 +1,9 @@ #include "Game/Screen/SaveIcon.hpp" #include "Game/Util/LayoutUtil.hpp" -SaveIcon::SaveIcon(const LayoutActor* pActor) : - LayoutActor("SaveIcon", true), - mActor(pActor) -{ +SaveIcon::SaveIcon(const LayoutActor* pActor) + : LayoutActor("SaveIcon", true), + mActor(pActor) { initLayoutManager("IconSave", 1); } diff --git a/src/Game/Screen/ScenarioSelectLayout.cpp b/src/Game/Screen/ScenarioSelectLayout.cpp index 45196455d..3bf8cc5fc 100644 --- a/src/Game/Screen/ScenarioSelectLayout.cpp +++ b/src/Game/Screen/ScenarioSelectLayout.cpp @@ -23,31 +23,30 @@ namespace { "Star4", "Star5", "Star6", - "Star7" - }; + "Star7"}; const char* cQuestionPaneName[] = { "NewStar1", "NewStar2", }; - const f32 cPointingTargetRadius = 60.0f; - const s32 cDecideFrame = 40; - const s32 cSelectedAccelStartStep = 60; - const s32 cSelectedAccelFrame = 150; - const f32 cSelectedEffectRateMin = 2.0f; - const f32 cSelectedEffectRateMax = 15.0f; - const f32 cSelectedEffectSpeedMin = 9.0f; - const f32 cSelectedEffectSpeedMax = 15.0f; - const s32 cSelectedEndAnimStartStep = 60; - const s32 cSelectedFadeOutStartStep = 180; - const s32 cSelectedFadeOutFrame = 30; - const s32 cSelectedFadeInFrame = 180; - const s32 cCancelFadeOutFrame = 90; + const f32 cPointingTargetRadius = 60.0f; + const s32 cDecideFrame = 40; + const s32 cSelectedAccelStartStep = 60; + const s32 cSelectedAccelFrame = 150; + const f32 cSelectedEffectRateMin = 2.0f; + const f32 cSelectedEffectRateMax = 15.0f; + const f32 cSelectedEffectSpeedMin = 9.0f; + const f32 cSelectedEffectSpeedMax = 15.0f; + const s32 cSelectedEndAnimStartStep = 60; + const s32 cSelectedFadeOutStartStep = 180; + const s32 cSelectedFadeOutFrame = 30; + const s32 cSelectedFadeInFrame = 180; + const s32 cCancelFadeOutFrame = 90; const TVec3f cSkyTrans = TVec3f(0.0f, 0.0f, -10000.0f); - const f32 cSkyScale = 10.0f; - const s32 cCometWarningWaitFrame = 15; - const s32 cCometWarningFrame = 180; -}; + const f32 cSkyScale = 10.0f; + const s32 cCometWarningWaitFrame = 15; + const s32 cCometWarningFrame = 180; +}; // namespace namespace NrvScenarioSelectLayout { NEW_NERVE(ScenarioSelectLayoutNrvAppearStar, ScenarioSelectLayout, AppearStar); @@ -61,26 +60,25 @@ namespace NrvScenarioSelectLayout { NEW_NERVE(ScenarioSelectLayoutNrvAppearCometWarning, ScenarioSelectLayout, AppearCometWarning); NEW_NERVE(ScenarioSelectLayoutNrvWaitCometWarning, ScenarioSelectLayout, WaitCometWarning); NEW_NERVE(ScenarioSelectLayoutNrvDisappearCometWarning, ScenarioSelectLayout, DisappearCometWarning); -}; +}; // namespace NrvScenarioSelectLayout -ScenarioSelectLayout::ScenarioSelectLayout(EffectSystem *pEffectSystem, const CameraContext *pCameraContext) : - LayoutActor("シナリオ選択レイアウト", true), - mSelectedScenarioNo(-1), - _24(0), - _28(false), - mStar(nullptr), - mScenarioSky(nullptr), - mEffectSystem(pEffectSystem), - mCameraContext(pCameraContext), - mNewTextFollowPos(0.0f, 0.0f), - mNewGreenTextFollowPos(0.0f, 0.0f), - mStarTopFollowPos(0.0f, 0.0f), - mBackButton(nullptr), - mMarioPaneFollowPos(0.0f, 0.0f), - mMarioPaneName(nullptr), - _A4(0), - _A8(-1) -{ +ScenarioSelectLayout::ScenarioSelectLayout(EffectSystem* pEffectSystem, const CameraContext* pCameraContext) + : LayoutActor("シナリオ選択レイアウト", true), + mSelectedScenarioNo(-1), + _24(0), + _28(false), + mStar(nullptr), + mScenarioSky(nullptr), + mEffectSystem(pEffectSystem), + mCameraContext(pCameraContext), + mNewTextFollowPos(0.0f, 0.0f), + mNewGreenTextFollowPos(0.0f, 0.0f), + mStarTopFollowPos(0.0f, 0.0f), + mBackButton(nullptr), + mMarioPaneFollowPos(0.0f, 0.0f), + mMarioPaneName(nullptr), + _A4(0), + _A8(-1) { mEffectHostMtx.identity(); for (s32 i = 0; i < sizeof(mQuestionPane) / sizeof(*mQuestionPane); i++) { @@ -88,7 +86,7 @@ ScenarioSelectLayout::ScenarioSelectLayout(EffectSystem *pEffectSystem, const Ca } } -void ScenarioSelectLayout::init(const JMapInfoIter &rIter) { +void ScenarioSelectLayout::init(const JMapInfoIter& rIter) { initLayoutManager("ScenarioSelect", 1); MR::createAndAddPaneCtrl(this, "ScenarioSelect", 1); MR::createAndAddPaneCtrl(this, "ScenarioFrame", 1); @@ -204,21 +202,15 @@ void ScenarioSelectLayout::disappear() { } bool ScenarioSelectLayout::isAppearStarEnd() const { - return !MR::isDead(this) - && !isNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvAppearStar::sInstance) - && !isNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvAppearCometWarning::sInstance) - && !isNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvWaitCometWarning::sInstance) - && !isNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvDisappearCometWarning::sInstance); + return !MR::isDead(this) && !isNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvAppearStar::sInstance) && !isNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvAppearCometWarning::sInstance) && !isNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvWaitCometWarning::sInstance) && !isNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvDisappearCometWarning::sInstance); } bool ScenarioSelectLayout::isEndAnimStartStep() const { - return isNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvAfterScenarioSelected::sInstance) - && MR::isStep(this, cSelectedEndAnimStartStep); + return isNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvAfterScenarioSelected::sInstance) && MR::isStep(this, cSelectedEndAnimStartStep); } bool ScenarioSelectLayout::isCanceled() const { - return isNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvCancel::sInstance) - || isNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvCancelFadeOut::sInstance); + return isNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvCancel::sInstance) || isNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvCancelFadeOut::sInstance); } void ScenarioSelectLayout::control() { @@ -232,19 +224,16 @@ void ScenarioSelectLayout::control() { // ScenarioSelectLayout::updateSelectedScenario void ScenarioSelectLayout::updateScenarioText() { - bool isEndAnimStep = isNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvAfterScenarioSelected::sInstance) - && MR::isGreaterEqualStep(this, cSelectedEndAnimStartStep); + bool isEndAnimStep = isNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvAfterScenarioSelected::sInstance) && MR::isGreaterEqualStep(this, cSelectedEndAnimStartStep); if (!MR::isHiddenPane(this, "Scenario") && (mSelectedScenarioNo <= 0 || _A8 == mSelectedScenarioNo)) { fadeInText(); - } - else if (!isEndAnimStep && mSelectedScenarioNo > 0) { + } else if (!isEndAnimStep && mSelectedScenarioNo > 0) { if (_A4 == 0) { if (MR::isPaneAnimStopped(this, "Scenario", 0) && mSelectedScenarioNo <= 0) { fadeOutText(); } - } - else if (MR::isPaneAnimStopped(this, "Scenario", 0)) { + } else if (MR::isPaneAnimStopped(this, "Scenario", 0)) { MR::hidePaneRecursive(this, "Scenario"); } } @@ -393,13 +382,12 @@ void ScenarioSelectLayout::setPlayerLeft() { if (MR::getPlayerLeft() < 10) { mMarioPaneName = "MarioPosition10"; - } - else { + } else { mMarioPaneName = "MarioPosition01"; } } -void ScenarioSelectLayout::startAnimAllNewPane(const char *pAnimName) { +void ScenarioSelectLayout::startAnimAllNewPane(const char* pAnimName) { MR::startPaneAnim(this, "New", pAnimName, 0); MR::startPaneAnim(this, "NewStarGreen", pAnimName, 0); @@ -421,7 +409,7 @@ void ScenarioSelectLayout::exeDisappearCometWarning() { MR::startPaneAnimAtFirstStep(this, "CometAppear", "CometEnd", 0); MR::setNerveAtPaneAnimStopped(this, "CometAppear", &NrvScenarioSelectLayout::ScenarioSelectLayoutNrvAppear::sInstance, 0); } - + void ScenarioSelectLayout::exeCancelFadeOut() { kill(); } @@ -441,13 +429,12 @@ void ScenarioSelectLayout::exeAppearStar() { MR::startSystemLevelSE("SE_DM_LV_SENARIO_SE_FLY", -1, -1); if (isAppearStarEndAll()) { - s32 scenarioNo; + s32 scenarioNo; bool needsAppearComet; if (!MR::isScenarioDecided()) { needsAppearComet = false; - } - else { + } else { scenarioNo = MR::getCurrentScenarioNo(); needsAppearComet = false; GalaxyStatusAccessor galaxyAccessor = MR::makeCurrentGalaxyStatusAccessor(); @@ -461,8 +448,7 @@ void ScenarioSelectLayout::exeAppearStar() { if (needsAppearComet) { setNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvAppearCometWarning::sInstance); - } - else { + } else { setNerve(&NrvScenarioSelectLayout::ScenarioSelectLayoutNrvAppear::sInstance); } } @@ -510,8 +496,7 @@ void ScenarioSelectLayout::exeDecide() { if (mStar[i] == getSelectedStar()) { mStar[i]->select(); - } - else { + } else { mStar[i]->notSelect(); } } @@ -521,7 +506,7 @@ void ScenarioSelectLayout::exeDecide() { updateScenarioText(); MR::startSystemLevelSE("SE_DM_LV_SENARIO_SEL_FLY", -1, -1); - MR::setNerveAtStep(this, &NrvScenarioSelectLayout::ScenarioSelectLayoutNrvAfterScenarioSelected::sInstance, cDecideFrame); + MR::setNerveAtStep(this, &NrvScenarioSelectLayout::ScenarioSelectLayoutNrvAfterScenarioSelected::sInstance, cDecideFrame); } void ScenarioSelectLayout::exeAfterScenarioSelected() { @@ -555,7 +540,7 @@ void ScenarioSelectLayout::exeDisappear() { if (MR::isFirstStep(this)) { MR::hideLayout(this); MR::getEffect(this, "ScenarioSelectEffect")->forceDelete(mEffectSystem); - + for (s32 i = 0; i < 7; i++) { ScenarioSelectStar* star = mStar[i]; @@ -591,9 +576,9 @@ void ScenarioSelectLayout::exeCancel() { void ScenarioSelectLayout::exeAppearCometWarning() { if (MR::isStep(this, cCometWarningWaitFrame)) { - int id = MR::getEncounterGalaxyCometNameId(MR::getCurrentStageName()); + int id = MR::getEncounterGalaxyCometNameId(MR::getCurrentStageName()); const char* cometName = MR::getCometNameFromId(id); - char cometMsg[256]; + char cometMsg[256]; MR::makeCometMessageID(cometMsg, sizeof(cometMsg), cometName); MR::setTextBoxGameMessageRecursive(this, "TextComet", "GalaxyInfo_CometAppearR"); MR::setTextBoxArgGameMessageRecursive(this, "TextComet", cometMsg, 0); diff --git a/src/Game/Screen/ScenarioTitle.cpp b/src/Game/Screen/ScenarioTitle.cpp index 948cba13a..40bbd8cf6 100644 --- a/src/Game/Screen/ScenarioTitle.cpp +++ b/src/Game/Screen/ScenarioTitle.cpp @@ -8,12 +8,10 @@ namespace { NEW_NERVE(ScenarioTitleAppear, ScenarioTitle, Appear); NEW_NERVE(ScenarioTitleWait, ScenarioTitle, Wait); NEW_NERVE(ScenarioTitleEnd, ScenarioTitle, End); -}; +}; // namespace -ScenarioTitle::ScenarioTitle() : - LayoutActor("シナリオ名表示", true) -{ - +ScenarioTitle::ScenarioTitle() + : LayoutActor("シナリオ名表示", true) { } void ScenarioTitle::init(const JMapInfoIter& rInfo) { @@ -43,7 +41,6 @@ void ScenarioTitle::exeAppear() { } void ScenarioTitle::exeWait() { - } void ScenarioTitle::exeEnd() { diff --git a/src/Game/Screen/SceneWipeHolder.cpp b/src/Game/Screen/SceneWipeHolder.cpp index 2ac556531..37c7f3e17 100644 --- a/src/Game/Screen/SceneWipeHolder.cpp +++ b/src/Game/Screen/SceneWipeHolder.cpp @@ -6,9 +6,8 @@ #include "Game/Screen/WipeRing.hpp" #include "Game/Util/ObjUtil.hpp" -SceneWipeHolder::SceneWipeHolder() : - WipeHolderBase(8, "シーンワイプ保持") -{ +SceneWipeHolder::SceneWipeHolder() + : WipeHolderBase(8, "シーンワイプ保持") { WipeLayoutBase* pWipeLayout; pWipeLayout = new WipeRing(1, "円ワイプ"); @@ -59,4 +58,4 @@ namespace SceneWipeHolderFunction { void forceCloseWipe(const char* pWipeName) { getSceneWipeHolder()->forceClose(pWipeName); } -}; +}; // namespace SceneWipeHolderFunction diff --git a/src/Game/Screen/ScreenPreserver.cpp b/src/Game/Screen/ScreenPreserver.cpp index 741d63751..fa9153aa9 100644 --- a/src/Game/Screen/ScreenPreserver.cpp +++ b/src/Game/Screen/ScreenPreserver.cpp @@ -1,10 +1,9 @@ #include "Game/Screen/ScreenPreserver.hpp" #include "Game/Util/ScreenUtil.hpp" -ScreenPreserver::ScreenPreserver() : - NameObj(""), - mIsActive(false) -{ +ScreenPreserver::ScreenPreserver() + : NameObj(""), + mIsActive(false) { for (s32 i = 0; i < sizeof(_D) / sizeof(*_D); i++) { _D[i] = 0; } diff --git a/src/Game/Screen/SimpleLayout.cpp b/src/Game/Screen/SimpleLayout.cpp index 4d2998c06..2d6d41574 100644 --- a/src/Game/Screen/SimpleLayout.cpp +++ b/src/Game/Screen/SimpleLayout.cpp @@ -1,17 +1,15 @@ #include "Game/Screen/SimpleLayout.hpp" #include "Game/Util/ObjUtil.hpp" -SimpleLayout::SimpleLayout(const char *pName, const char *pLayoutName, u32 a3, int a4) : - LayoutActor(pName, true) -{ +SimpleLayout::SimpleLayout(const char* pName, const char* pLayoutName, u32 a3, int a4) + : LayoutActor(pName, true) { int v1 = a4 >= 0 ? a4 : 60; MR::connectToScene(this, 14, 13, -1, v1); initLayoutManager(pLayoutName, a3); } -SimpleEffectLayout::SimpleEffectLayout(const char *pName, const char *pLayoutName, u32 a3, int a4) : - SimpleLayout(pName, pLayoutName, a3, a4) -{ +SimpleEffectLayout::SimpleEffectLayout(const char* pName, const char* pLayoutName, u32 a3, int a4) + : SimpleLayout(pName, pLayoutName, a3, a4) { initEffectKeeper(0, nullptr, nullptr); } diff --git a/src/Game/Screen/StaffRoll.cpp b/src/Game/Screen/StaffRoll.cpp index 0f3a06c7e..1d71bf14b 100644 --- a/src/Game/Screen/StaffRoll.cpp +++ b/src/Game/Screen/StaffRoll.cpp @@ -117,7 +117,7 @@ namespace { // static const _ sDoubleInterval = _; // static const _ sTripleInterval = _; static const f32 sEndLogoPosY = 220.0f; -}; +}; // namespace namespace { const StaffRollParam* getStaffRollParam() { @@ -145,17 +145,15 @@ namespace { return nullptr; } -}; +}; // namespace namespace NrvStaffRollLine { NEW_NERVE(StaffRollLineNrvScroll, StaffRollLine, Scroll); }; -StaffRollLine::StaffRollLine(const char* pName) : - LayoutActor(pName, true), - mPosition(0.0f, 0.0f) -{ - +StaffRollLine::StaffRollLine(const char* pName) + : LayoutActor(pName, true), + mPosition(0.0f, 0.0f) { } void StaffRollLine::init(const JMapInfoIter& rIter) { @@ -188,11 +186,9 @@ namespace NrvStaffRollPicture { NEW_NERVE(StaffRollPictureNrvWork, StaffRollPicture, Work); }; -StaffRollPicture::StaffRollPicture(const char* pName) : - LayoutActor(pName, true), - mReplaceTexture(nullptr) -{ - +StaffRollPicture::StaffRollPicture(const char* pName) + : LayoutActor(pName, true), + mReplaceTexture(nullptr) { } void StaffRollPicture::init(const JMapInfoIter& rIter) { @@ -221,15 +217,14 @@ void StaffRollPicture::exeWork() { } void StaffRollPicture::initReplaceTexture() { - char replaceTextureName[64]; + char replaceTextureName[64]; const char* pReplaceTexturePrefix; mReplaceTexture = new nw4r::lyt::TexMap*[PICTURE_TEXTURE_NUM]; if (MR::isStarCompleteAllGalaxy()) { pReplaceTexturePrefix = cReplaceTexturePrefixComp; - } - else { + } else { pReplaceTexturePrefix = cReplaceTexturePrefixHalf; } @@ -245,14 +240,11 @@ void StaffRollPicture::startPictureAction(s32 replaceTextureId, const char* pPan if (MR::isEqualString(pPaneName, "PictureLU")) { pChildPaneName = "PicLU"; - } - else if (MR::isEqualString(pPaneName, "PictureLD")) { + } else if (MR::isEqualString(pPaneName, "PictureLD")) { pChildPaneName = "PicLD"; - } - else if (MR::isEqualString(pPaneName, "PictureRU")) { + } else if (MR::isEqualString(pPaneName, "PictureRU")) { pChildPaneName = "PicRU"; - } - else if (MR::isEqualString(pPaneName, "PictureRD")) { + } else if (MR::isEqualString(pPaneName, "PictureRD")) { pChildPaneName = "PicRD"; } @@ -293,22 +285,20 @@ namespace NrvStaffRoll { NEW_NERVE(StaffRollNrvPrepareSave, StaffRoll, PrepareSave); NEW_NERVE(StaffRollNrvSave, StaffRoll, Save); NEW_NERVE(StaffRollNrvEnd, StaffRoll, End); -}; +}; // namespace NrvStaffRoll -StaffRoll::StaffRoll(const char* pName) : - LayoutActor(pName, true), - mInfo(nullptr), - mLine(nullptr), - mPicture(nullptr), - mMsg(nullptr), - mMsgLineNum(0), - mMsgLine(0), - mTitleLogoPos(0.0f, 0.0f), - mEndLogoPos(0.0f, 0.0f), - _48(-1), - _4C(0) -{ - +StaffRoll::StaffRoll(const char* pName) + : LayoutActor(pName, true), + mInfo(nullptr), + mLine(nullptr), + mPicture(nullptr), + mMsg(nullptr), + mMsgLineNum(0), + mMsgLine(0), + mTitleLogoPos(0.0f, 0.0f), + mEndLogoPos(0.0f, 0.0f), + _48(-1), + _4C(0) { } void StaffRoll::init(const JMapInfoIter& rIter) { @@ -371,8 +361,7 @@ void StaffRoll::startInfo() { } bool StaffRoll::isPauseOrEnd() const { - return isNerve(&NrvStaffRoll::StaffRollNrvPauseForEndingMovie::sInstance) - || isNerve(&NrvStaffRoll::StaffRollNrvEnd::sInstance); + return isNerve(&NrvStaffRoll::StaffRollNrvPauseForEndingMovie::sInstance) || isNerve(&NrvStaffRoll::StaffRollNrvEnd::sInstance); } bool StaffRoll::isNextLineEmpty() const { @@ -473,8 +462,7 @@ void StaffRoll::exeAllRights() { if (MR::isStep(this, sStepToThankYouVoice)) { if (MR::isPlayerLuigi()) { MR::startSystemSE("SE_SY_THANK_YOU_LUIGI", -1, -1); - } - else { + } else { MR::startSystemSE("SE_SY_E3_THANK_YOU", -1, -1); } } @@ -499,24 +487,19 @@ void StaffRoll::exeInfoAppear() { if (MR::isFirstStep(this)) { if (isNerve(&NrvStaffRoll::StaffRollNrvInfoPictureBookAppear::sInstance)) { pMessageId = "System_Result005"; - } - else if (isNerve(&NrvStaffRoll::StaffRollNrvInfoCometAppear::sInstance)) { + } else if (isNerve(&NrvStaffRoll::StaffRollNrvInfoCometAppear::sInstance)) { pMessageId = "StaffRollInfo_Comet"; - } - else if (isNerve(&NrvStaffRoll::StaffRollNrvInfoLuigiAppear::sInstance)) { + } else if (isNerve(&NrvStaffRoll::StaffRollNrvInfoLuigiAppear::sInstance)) { if (MR::isPlayerLuigi()) { pMessageId = "StaffRollInfo_FinalGalaxyOpen"; - } - else { + } else { pMessageId = "StaffRollInfo_Luigi"; } } MR::startSubBGM("BGM_NEW_GALAXY", false); - if (isNerve(&NrvStaffRoll::StaffRollNrvInfoLuigiAppear::sInstance) - && !MR::isPlayerLuigi()) - { + if (isNerve(&NrvStaffRoll::StaffRollNrvInfoLuigiAppear::sInstance) && !MR::isPlayerLuigi()) { MR::startSystemSE("SE_SY_LUIGI_MODE_APPEAR", -1, -1); } @@ -533,11 +516,9 @@ void StaffRoll::exeInfoAppear() { if (isNerve(&NrvStaffRoll::StaffRollNrvInfoPictureBookAppear::sInstance)) { setNerve(&NrvStaffRoll::StaffRollNrvInfoPictureBookDisappear::sInstance); - } - else if (isNerve(&NrvStaffRoll::StaffRollNrvInfoCometAppear::sInstance)) { + } else if (isNerve(&NrvStaffRoll::StaffRollNrvInfoCometAppear::sInstance)) { setNerve(&NrvStaffRoll::StaffRollNrvInfoCometDisappear::sInstance); - } - else if (isNerve(&NrvStaffRoll::StaffRollNrvInfoLuigiAppear::sInstance)) { + } else if (isNerve(&NrvStaffRoll::StaffRollNrvInfoLuigiAppear::sInstance)) { setNerve(&NrvStaffRoll::StaffRollNrvInfoLuigiDisappear::sInstance); } } @@ -593,7 +574,6 @@ void StaffRoll::exeSave() { } void StaffRoll::exeEnd() { - } void StaffRoll::movement() { @@ -615,8 +595,7 @@ void StaffRoll::movement() { if (MR::isPlayingStageBgm()) { _4C++; } - } - else { + } else { _4C++; } } @@ -653,19 +632,15 @@ void StaffRoll::draw() const { void StaffRoll::setNrvNextInfo() { if (isNerve(&NrvStaffRoll::StaffRollNrvPrepareInfo::sInstance)) { setNerve(&NrvStaffRoll::StaffRollNrvPauseForEndingMovie::sInstance); - } - else if (!MR::isOnGameEventFlagViewNormalEnding() && isNerve(&NrvStaffRoll::StaffRollNrvRestart::sInstance)) { + } else if (!MR::isOnGameEventFlagViewNormalEnding() && isNerve(&NrvStaffRoll::StaffRollNrvRestart::sInstance)) { setNerve(&NrvStaffRoll::StaffRollNrvInfoPictureBookAppear::sInstance); - } - else if (isNerve(&NrvStaffRoll::StaffRollNrvInfoPictureBookDisappear::sInstance)) { + } else if (isNerve(&NrvStaffRoll::StaffRollNrvInfoPictureBookDisappear::sInstance)) { MR::onGameEventFlagViewNormalEnding(); setNerve(&NrvStaffRoll::StaffRollNrvInfoCometAppear::sInstance); - } - else if (!MR::isOnGameEventFlagViewCompleteEnding() && MR::isStarCompleteAllGalaxy()) { + } else if (!MR::isOnGameEventFlagViewCompleteEnding() && MR::isStarCompleteAllGalaxy()) { setNerve(&NrvStaffRoll::StaffRollNrvInfoLuigiAppear::sInstance); MR::onGameEventFlagViewCompleteEnding(); - } - else { + } else { setNerve(&NrvStaffRoll::StaffRollNrvPrepareSave::sInstance); } } @@ -687,16 +662,14 @@ bool StaffRoll::tryGenerateLine() { if (isNextLineEmpty()) { lineLeading = ::getStaffRollParam()->mEmptyLineLeading; - } - else { + } else { lineLeading = ::getStaffRollParam()->mLineLeading; } if (_48 * ::getStaffRollParam()->mScrollSpeed >= lineLeading) { if (mMsgLine < mMsgLineNum) { _48 = 0; - } - else { + } else { _48 = -1; } } @@ -720,4 +693,4 @@ namespace MR { StaffRoll* getStaffRoll() { return MR::getSceneObj(SceneObj_StaffRoll); } -}; +}; // namespace MR diff --git a/src/Game/Screen/StageResultInformer.cpp b/src/Game/Screen/StageResultInformer.cpp index e606ee011..b760a55a6 100644 --- a/src/Game/Screen/StageResultInformer.cpp +++ b/src/Game/Screen/StageResultInformer.cpp @@ -20,13 +20,13 @@ namespace MR { extern void startAstroMapLayoutForNewGalaxyDiscover(); extern void startAstroMapLayoutForNewTicoGalaxyDiscover(); -}; +}; // namespace MR namespace { static const s32 sWaitBeforeCountUpPowerStar = 85; static const s32 sWaitAppearInformationWindow = 15; static const s32 sWaitDisplayStarPieceCount = 45; -}; +}; // namespace namespace { NEW_NERVE(StageResultInformerAppearGetPowerStar, StageResultInformer, AppearGetPowerStar); @@ -51,12 +51,11 @@ namespace { NEW_NERVE(DisplayInformationForResultDisplay, DisplayInformationForResult, Display); NEW_NERVE(DisplayInformationForResultDisappear, DisplayInformationForResult, Disappear); NEW_NERVE(DisplayInformationForResultIdle, DisplayInformationForResult, Idle); -}; +}; // namespace -DisplayInformationForResult::DisplayInformationForResult(StageResultInformer* pHost) : - NerveExecutor("DisplayInformationForResult"), - mHost(pHost) -{ +DisplayInformationForResult::DisplayInformationForResult(StageResultInformer* pHost) + : NerveExecutor("DisplayInformationForResult"), + mHost(pHost) { initNerve(&::DisplayInformationForResultIdle::sInstance); } @@ -64,8 +63,7 @@ void DisplayInformationForResult::exeAppear() { if (MR::isFirstStep(this)) { if (MR::isEqualString(mMessageId, "System_Result009")) { MR::startSubBGM("BGM_GALAXY_COMPLETE", false); - } - else { + } else { MR::startSubBGM("BGM_NEW_GALAXY", false); } @@ -94,17 +92,15 @@ void DisplayInformationForResult::exeDisappear() { } void DisplayInformationForResult::exeIdle() { - } -StageResultInformer::StageResultInformer() : - LayoutActor("リザルト通知", true), - mInformationDisplayer(nullptr), - mSequenceChecker(nullptr), - mIconAButton(nullptr), - _30(false), - _31(false) -{ +StageResultInformer::StageResultInformer() + : LayoutActor("リザルト通知", true), + mInformationDisplayer(nullptr), + mSequenceChecker(nullptr), + mIconAButton(nullptr), + _30(false), + _31(false) { mInformationDisplayer = new DisplayInformationForResult(this); mSequenceChecker = new StageResultSequenceChecker(); } @@ -269,8 +265,7 @@ void StageResultInformer::exeDisplayGetStarPiece() { if (mClearedStarPieceNum == 0) { MR::startSystemSE("SE_SY_STAR_PIECE_SUM_UP", -1, -1); - } - else if (mClearedStarPieceNum == 0) { + } else if (mClearedStarPieceNum == 0) { MR::startSystemSE("SE_SY_STAR_PIECE_SUM_UP_END", -1, -1); } } @@ -293,8 +288,7 @@ void StageResultInformer::exeDisplayGetStarPiece() { if (hasStarPiece) { setNerve(&::StageResultInformerDisappearGetStarPiece::sInstance); - } - else { + } else { setNerve(&::StageResultInformerWaitBeforeDisappearGetStarPiece::sInstance); } } @@ -337,8 +331,7 @@ void StageResultInformer::exeShowNewGalaxyDiscover() { void StageResultInformer::exeShowGalaxyMap() { if (MR::isFirstStep(this)) { MR::startAstroMapLayoutForNewGalaxyDiscover(); - } - else { + } else { decideNextNerve(); } } @@ -371,8 +364,7 @@ void StageResultInformer::exeShowTicoGalaxyAppear() { void StageResultInformer::exeShowAstroMapForTico() { if (MR::isFirstStep(this)) { MR::startAstroMapLayoutForNewTicoGalaxyDiscover(); - } - else { + } else { decideNextNerve(); } } @@ -430,8 +422,7 @@ bool StageResultInformer::tryShowAndKeyWaitInformationWindow(const char* pMessag if (!isNotIdle) { if (pNerve != nullptr) { setNerve(pNerve); - } - else { + } else { decideNextNerve(); } @@ -444,14 +435,12 @@ bool StageResultInformer::tryShowAndKeyWaitInformationWindow(const char* pMessag void StageResultInformer::setCounterPaneShowHide( bool isShowTotalStarPane, bool isShowBestScorePane, - bool isShowTotalPiecePane) -{ + bool isShowTotalPiecePane) { const char* pPaneName = "TotalStar"; if (isShowTotalStarPane) { MR::showPane(this, pPaneName); - } - else { + } else { MR::hidePane(this, pPaneName); } @@ -459,8 +448,7 @@ void StageResultInformer::setCounterPaneShowHide( if (isShowBestScorePane) { MR::showPane(this, pPaneName); - } - else { + } else { MR::hidePane(this, pPaneName); } @@ -468,8 +456,7 @@ void StageResultInformer::setCounterPaneShowHide( if (isShowTotalPiecePane) { MR::showPane(this, pPaneName); - } - else { + } else { MR::hidePane(this, pPaneName); } } diff --git a/src/Game/Screen/StarCounter.cpp b/src/Game/Screen/StarCounter.cpp index cd0b8122f..56dbe13f0 100644 --- a/src/Game/Screen/StarCounter.cpp +++ b/src/Game/Screen/StarCounter.cpp @@ -11,14 +11,13 @@ namespace NrvStarCounter { NEW_NERVE(StarCounterNrvWait, StarCounter, Wait); NEW_NERVE(StarCounterNrvCountUp, StarCounter, CountUp); NEW_NERVE(StarCounterNrvDisappear, StarCounter, Disappear); -}; +}; // namespace NrvStarCounter -StarCounter::StarCounter() : - LayoutActor("スターカウンタ", true), - mPowerStarNum(0), - mLayoutAppearer(nullptr), - mPaneRumbler(nullptr) -{} +StarCounter::StarCounter() + : LayoutActor("スターカウンタ", true), + mPowerStarNum(0), + mLayoutAppearer(nullptr), + mPaneRumbler(nullptr) {} void StarCounter::init(const JMapInfoIter& rIter) { initLayoutManager("StarCounter", 2); diff --git a/src/Game/Screen/StarPieceCounter.cpp b/src/Game/Screen/StarPieceCounter.cpp index b03b5692d..18df9c3a3 100644 --- a/src/Game/Screen/StarPieceCounter.cpp +++ b/src/Game/Screen/StarPieceCounter.cpp @@ -18,27 +18,25 @@ namespace { const f32 cBaseOffsetEatTicoY = -120.0f; const f32 cBaseOffsetTicoFatY = -94.0f; const s32 cHideFrameMinTicoEat = 20; -}; +}; // namespace namespace NrvStarPieceCounter { NEW_NERVE(StarPieceCounterNrvHide, StarPieceCounter, Hide); NEW_NERVE(StarPieceCounterNrvAppear, StarPieceCounter, Appear); NEW_NERVE(StarPieceCounterNrvWait, StarPieceCounter, Wait); NEW_NERVE(StarPieceCounterNrvDisappear, StarPieceCounter, Disappear); -}; +}; // namespace NrvStarPieceCounter -StarPieceCounter::StarPieceCounter(const char* pName) : - LayoutActor(pName, true), - mStarPieceNum(0), - mStarPieceDisplayNum(0), - mInvalidCountUpFrame(0), - mLayoutAppearer(nullptr), - mPaneRumbler(nullptr), - mFollowPos(0.0f, 0.0f), - _3C(0), - mMode(0) -{ - +StarPieceCounter::StarPieceCounter(const char* pName) + : LayoutActor(pName, true), + mStarPieceNum(0), + mStarPieceDisplayNum(0), + mInvalidCountUpFrame(0), + mLayoutAppearer(nullptr), + mPaneRumbler(nullptr), + mFollowPos(0.0f, 0.0f), + _3C(0), + mMode(0) { } void StarPieceCounter::init(const JMapInfoIter& rIter) { @@ -144,27 +142,21 @@ void StarPieceCounter::updateCounter() { if (isDispCenter()) { if (mStarPieceDisplayNum >= 1000) { pPaneName = "TPosition1000"; - } - else if (mStarPieceDisplayNum >= 100) { + } else if (mStarPieceDisplayNum >= 100) { pPaneName = "TPosition0100"; - } - else if (mStarPieceDisplayNum >= 10) { + } else if (mStarPieceDisplayNum >= 10) { pPaneName = "TPosition0010"; - } - else { + } else { pPaneName = "TPosition0001"; } MR::setTextBoxNumberRecursive(this, "TCounter", mStarPieceDisplayNum); - } - else { + } else { if (mStarPieceDisplayNum >= 100) { pPaneName = "Position100"; - } - else if (mStarPieceDisplayNum >= 10) { + } else if (mStarPieceDisplayNum >= 10) { pPaneName = "Position010"; - } - else { + } else { pPaneName = "Position001"; } @@ -181,26 +173,22 @@ void StarPieceCounter::updateCounterValue() { if (mInvalidCountUpFrame > 0) { mInvalidCountUpFrame--; - } - else if (mStarPieceDisplayNum != mStarPieceNum) { + } else if (mStarPieceDisplayNum != mStarPieceNum) { if (isNerve(&NrvStarPieceCounter::StarPieceCounterNrvWait::sInstance)) { if (mStarPieceDisplayNum < mStarPieceNum) { mStarPieceDisplayNum++; MR::startAnim(this, "Flash", 0); MR::emitEffect(this, MR::isStageAstroLocation() - ? "TStarPieceCounterLight" - : "StarPieceCounterLight"); - } - else if (mMode == 1) { + ? "TStarPieceCounterLight" + : "StarPieceCounterLight"); + } else if (mMode == 1) { if (mStarPieceDisplayNum - mStarPieceNum > 10) { mStarPieceDisplayNum -= cDecCounterValueFast; - } - else { + } else { mStarPieceDisplayNum = mStarPieceNum; } - } - else { + } else { mStarPieceDisplayNum--; } @@ -212,8 +200,7 @@ void StarPieceCounter::updateCounterValue() { if (!isNerve(&NrvStarPieceCounter::StarPieceCounterNrvAppear::sInstance)) { if (!isNerve(&NrvStarPieceCounter::StarPieceCounterNrvWait::sInstance)) { setNerve(&NrvStarPieceCounter::StarPieceCounterNrvAppear::sInstance); - } - else { + } else { setNerve(&NrvStarPieceCounter::StarPieceCounterNrvWait::sInstance); } } @@ -225,8 +212,7 @@ bool StarPieceCounter::isValidAppearSituation() const { return !MR::isExistStarPointerGuidanceFrame1P(); } - return MR::isStarPointerInScreenAnyPort(0) - && !CounterLayoutController::isInvalidSystemStateShowCounter(); + return MR::isStarPointerInScreenAnyPort(0) && !CounterLayoutController::isInvalidSystemStateShowCounter(); } bool StarPieceCounter::isDispCenter() const { @@ -234,9 +220,7 @@ bool StarPieceCounter::isDispCenter() const { } bool StarPieceCounter::tryChangeModeTicoEat(int mode) { - if (isNerve(&NrvStarPieceCounter::StarPieceCounterNrvAppear::sInstance) - || isNerve(&NrvStarPieceCounter::StarPieceCounterNrvDisappear::sInstance)) - { + if (isNerve(&NrvStarPieceCounter::StarPieceCounterNrvAppear::sInstance) || isNerve(&NrvStarPieceCounter::StarPieceCounterNrvDisappear::sInstance)) { return false; } @@ -265,8 +249,8 @@ void StarPieceCounter::exeHide() { } s32 step = mMode != 0 - ? cHideFrameMinTicoEat - : cHideFrameMin; + ? cHideFrameMinTicoEat + : cHideFrameMin; if (MR::isGreaterStep(this, step) && isValidAppearSituation()) { setNerve(&NrvStarPieceCounter::StarPieceCounterNrvAppear::sInstance); @@ -286,13 +270,11 @@ void StarPieceCounter::exeAppear() { if (MR::isStageAstroLocation()) { MR::showPaneRecursive(this, "PicTStarPiece"); MR::hidePaneRecursive(this, "PicNStarPiece"); - } - else { + } else { MR::showPaneRecursive(this, "PicNStarPiece"); MR::hidePaneRecursive(this, "PicTStarPiece"); } - } - else { + } else { MR::showPaneRecursive(this, "StarPieceCounter"); MR::hidePaneRecursive(this, "TSPieceCounter"); mLayoutAppearer->setAppearOffset(TVec2f(cAppearOffsetRightX, 0.0f)); @@ -302,8 +284,7 @@ void StarPieceCounter::exeAppear() { if (mMode != 0) { y = cBaseOffsetTicoFatY; - } - else if (_3C == 2) { + } else if (_3C == 2) { y = cBaseOffsetEatTicoY; } diff --git a/src/Game/Screen/SubMeterLayout.cpp b/src/Game/Screen/SubMeterLayout.cpp index 39387e5aa..65e3a6fe0 100644 --- a/src/Game/Screen/SubMeterLayout.cpp +++ b/src/Game/Screen/SubMeterLayout.cpp @@ -4,15 +4,16 @@ namespace { static f32 sScreenOffsetX = 60.0f; static f32 sScreenOffsetY = -70.0f; -}; +}; // namespace -SubMeterLayout::SubMeterLayout(const char *pName, const char *pLayoutName) : LayoutActor(pName, true) { +SubMeterLayout::SubMeterLayout(const char* pName, const char* pLayoutName) + : LayoutActor(pName, true) { MR::connectToSceneLayout(this); initLayoutManager(pLayoutName, 1); MR::createAndAddPaneCtrl(this, "Count", 1); } -void SubMeterLayout::init(const JMapInfoIter &rIter) { +void SubMeterLayout::init(const JMapInfoIter& rIter) { MR::startPaneAnim(this, "Count", "Count", 0); MR::setPaneAnimFrameAndStop(this, "Count", 0.0f, 0); appear(); @@ -52,38 +53,37 @@ void SubMeterLayout::requestFrameOut() { } void SubMeterLayout::control() { - switch(_20) { - case 0: - break; - case 1: - if (MR::isAnimStopped(this, 0)) { - MR::startAnim(this, "Wait", 0); - _26 = 0; - _20 += 1; - } - break; - case 2: - if (_22 < 0x40) { - MR::startAnim(this, "Danger", 0); - _20 = 3; - } - break; - case 3: - if (_22 > 0x40) { - MR::startAnim(this, "Wait", 0); - MR::setAnimRate(this, 1.0f, 0); - _20 = 2; - } - else { - MR::setAnimRate(this, ((0x40 - _22) * 1.0f / 32.0f) + 1.0f, 0); - } - break; - case 4: - if (MR::isAnimStopped(this, 0)) { - MR::hideLayout(this); - _20 = 0; - } - break; + switch (_20) { + case 0: + break; + case 1: + if (MR::isAnimStopped(this, 0)) { + MR::startAnim(this, "Wait", 0); + _26 = 0; + _20 += 1; + } + break; + case 2: + if (_22 < 0x40) { + MR::startAnim(this, "Danger", 0); + _20 = 3; + } + break; + case 3: + if (_22 > 0x40) { + MR::startAnim(this, "Wait", 0); + MR::setAnimRate(this, 1.0f, 0); + _20 = 2; + } else { + MR::setAnimRate(this, ((0x40 - _22) * 1.0f / 32.0f) + 1.0f, 0); + } + break; + case 4: + if (MR::isAnimStopped(this, 0)) { + MR::hideLayout(this); + _20 = 0; + } + break; } bool flag = true; @@ -92,20 +92,18 @@ void SubMeterLayout::control() { if (!MR::isPlayerOnWaterSurface()) { flag = false; } - } - else if (!MR::isOnGroundPlayer()) { + } else if (!MR::isOnGroundPlayer()) { flag = false; } if (flag) { - if (((_20 + 0xFE) & 0xFF) <= 1u && _22 == 0x80) { + if (((_20 + 0xFE) & 0xFF) <= 1u && _22 == 0x80) { if (++_26 == 60) { MR::startAnim(this, "End", 0); _20 = 5; } } - } - else if (_20 == 5) { + } else if (_20 == 5) { _20 = 1; _26 = 0; MR::startAnim(this, "Appear", 0); diff --git a/src/Game/Screen/SuddenDeathMeter.cpp b/src/Game/Screen/SuddenDeathMeter.cpp index a2afeccb4..5b67e0f75 100644 --- a/src/Game/Screen/SuddenDeathMeter.cpp +++ b/src/Game/Screen/SuddenDeathMeter.cpp @@ -18,22 +18,21 @@ namespace NrvSuddenDeathMeter { NEW_NERVE(SuddenDeathMeterNrvBreakMeter, SuddenDeathMeter, BreakMeter); NEW_NERVE(SuddenDeathMeterNrvZeroMeter, SuddenDeathMeter, ZeroMeter); NEW_NERVE(SuddenDeathMeterNrvZeroMeterBreak, SuddenDeathMeter, ZeroMeterBreak); -} // namespace NrvSuddenDeathMeter +} // namespace NrvSuddenDeathMeter -SuddenDeathMeter::SuddenDeathMeter(const char *a1, const char *a2) : - LayoutActor(a1, true), - mCountUpPaneRumbler(nullptr), - mFollowPosW(0.0f, 0.0f), - _2C(0.0f, 0.0f), - mCount(1), - _38(0.0f), - _3C(1.0f) -{ +SuddenDeathMeter::SuddenDeathMeter(const char* a1, const char* a2) + : LayoutActor(a1, true), + mCountUpPaneRumbler(nullptr), + mFollowPosW(0.0f, 0.0f), + _2C(0.0f, 0.0f), + mCount(1), + _38(0.0f), + _3C(1.0f) { MR::connectToSceneLayout(this); initLayoutManager(a2, 3); } -void SuddenDeathMeter::init(const JMapInfoIter &rIter) { +void SuddenDeathMeter::init(const JMapInfoIter& rIter) { MR::createAndAddPaneCtrl(this, "HitPointMeter", 2); MR::createAndAddPaneCtrl(this, "HitPointNumber", 1); MR::createAndAddPaneCtrl(this, "Font", 2); @@ -173,18 +172,18 @@ void SuddenDeathMeter::initCount(s32 count) { void SuddenDeathMeter::setCount(s32 count) { s32 prevCount = mCount; mCount = count; - if (count >= prevCount) return; + if (count >= prevCount) + return; if (count == 0) { setNerve(&NrvSuddenDeathMeter::SuddenDeathMeterNrvZeroMeter::sInstance); - } - else { + } else { setNerve(&NrvSuddenDeathMeter::SuddenDeathMeterNrvBreakMeter::sInstance); } } // void SuddenDeathMeter::calcMarioHeadPosition(TVec2f *pos) const; -void SuddenDeathMeter::calcPowerUpMeterBasePosition(TVec2f *pos) const { +void SuddenDeathMeter::calcPowerUpMeterBasePosition(TVec2f* pos) const { pos->x = MR::getPaneTransX(this, "MoveMeterW"); pos->y = MR::getPaneTransY(this, "MoveMeterW"); } diff --git a/src/Game/Screen/SurfingGuidance.cpp b/src/Game/Screen/SurfingGuidance.cpp index 593027ba0..0f75b674d 100644 --- a/src/Game/Screen/SurfingGuidance.cpp +++ b/src/Game/Screen/SurfingGuidance.cpp @@ -16,18 +16,16 @@ namespace { NEW_NERVE(SurfingGuidanceTurnRightHold, SurfingGuidance, TurnRightHold); NEW_NERVE(SurfingGuidanceTurnRightSuccess, SurfingGuidance, TurnRightSuccess); NEW_NERVE(SurfingGuidanceFadeOut, SurfingGuidance, FadeOut); -}; +}; // namespace -SurfingGuidance::SurfingGuidance() : - LayoutActor("サーフィンガイダンス", true), - _20(0), - _24(0.0f), - _2C(0) -{ - +SurfingGuidance::SurfingGuidance() + : LayoutActor("サーフィンガイダンス", true), + _20(0), + _24(0.0f), + _2C(0) { } -void SurfingGuidance::init(const JMapInfoIter &rIter) { +void SurfingGuidance::init(const JMapInfoIter& rIter) { MR::connectToSceneLayout(this); initLayoutManager("TiltGuidance", 3); initNerve(&SurfingGuidanceFadeIn::sInstance); diff --git a/src/Game/Screen/SysInfoWindow.cpp b/src/Game/Screen/SysInfoWindow.cpp index 9e0596ddb..565aaf149 100644 --- a/src/Game/Screen/SysInfoWindow.cpp +++ b/src/Game/Screen/SysInfoWindow.cpp @@ -9,8 +9,8 @@ namespace { const MessageChangeFuncTableEntry cMessageChangeFuncTable[] = { - { MR::setTextBoxSystemMessageRecursive }, - { MR::setTextBoxGameMessageRecursive }, + {MR::setTextBoxSystemMessageRecursive}, + {MR::setTextBoxGameMessageRecursive}, }; }; @@ -18,18 +18,17 @@ namespace NrvSysInfoWindow { NEW_NERVE(SysInfoWindowNrvAppear, SysInfoWindow, Appear); NEW_NERVE(SysInfoWindowNrvWait, SysInfoWindow, Wait); NEW_NERVE(SysInfoWindowNrvDisappear, SysInfoWindow, Disappear); -}; +}; // namespace NrvSysInfoWindow -SysInfoWindow::SysInfoWindow(SysInfoWindowType windowType, SysInfoExecuteType executeType) : - LayoutActor("システム用インフォメーションウィンドウ", true), - mWindowType(windowType), - mType(Type_Key), - mYesNoSelector(nullptr), - mIconAButton(nullptr), - mTextParentPaneName(nullptr), - mWindowParentPaneName(nullptr), - _38(executeType == ExecuteType_Children) -{ +SysInfoWindow::SysInfoWindow(SysInfoWindowType windowType, SysInfoExecuteType executeType) + : LayoutActor("システム用インフォメーションウィンドウ", true), + mWindowType(windowType), + mType(Type_Key), + mYesNoSelector(nullptr), + mIconAButton(nullptr), + mTextParentPaneName(nullptr), + mWindowParentPaneName(nullptr), + _38(executeType == ExecuteType_Children) { switch (windowType) { case WindowType_Normal: mTextParentPaneName = "InfoWindow"; @@ -212,8 +211,7 @@ void SysInfoWindow::exeWait() { MR::startCSSound("CS_CLICK_CLOSE", 0, 0); setNerve(&NrvSysInfoWindow::SysInfoWindowNrvDisappear::sInstance); } - } - else if (mYesNoSelector != nullptr) { + } else if (mYesNoSelector != nullptr) { if (mYesNoSelector->isDisappearStart()) { setNerve(&NrvSysInfoWindow::SysInfoWindowNrvDisappear::sInstance); } @@ -233,10 +231,7 @@ void SysInfoWindow::exeDisappear() { } if (MR::isPaneAnimStopped(this, mTextParentPaneName, 0)) { - if (mType == Type_Key - || mType == Type_Blocking - || mYesNoSelector != nullptr && !mYesNoSelector->_C) - { + if (mType == Type_Key || mType == Type_Blocking || mYesNoSelector != nullptr && !mYesNoSelector->_C) { kill(); } } @@ -292,4 +287,4 @@ namespace MR { return pWindow; } -}; +}; // namespace MR diff --git a/src/Game/Screen/THPSimplePlayerWrapper.cpp b/src/Game/Screen/THPSimplePlayerWrapper.cpp index 0122ea652..605e6d1f3 100644 --- a/src/Game/Screen/THPSimplePlayerWrapper.cpp +++ b/src/Game/Screen/THPSimplePlayerWrapper.cpp @@ -11,29 +11,28 @@ #include static u16 VolumeTable[] = -{ - 0, 2, 8, 18, 32, 50, 73, 99, - 130, 164, 203, 245, 292, 343, 398, 457, - 520, 587, 658, 733, 812, 895, 983, 1074, - 1170, 1269, 1373, 1481, 1592, 1708, 1828, 1952, - 2080, 2212, 2348, 2488, 2632, 2781, 2933, 3090, - 3250, 3415, 3583, 3756, 3933, 4114, 4298, 4487, - 4680, 4877, 5079, 5284, 5493, 5706, 5924, 6145, - 6371, 6600, 6834, 7072, 7313, 7559, 7809, 8063, - 8321, 8583, 8849, 9119, 9394, 9672, 9954, 10241, - 10531, 10826, 11125, 11427, 11734, 12045, 12360, 12679, - 13002, 13329, 13660, 13995, 14335, 14678, 15025, 15377, - 15732, 16092, 16456, 16823, 17195, 17571, 17951, 18335, - 18723, 19115, 19511, 19911, 20316, 20724, 21136, 21553, - 21974, 22398, 22827, 23260, 23696, 24137, 24582, 25031, - 25484, 25941, 26402, 26868, 27337, 27810, 28288, 28769, - 29255, 29744, 30238, 30736, 31238, 31744, 32254, 32768 -}; + { + 0, 2, 8, 18, 32, 50, 73, 99, + 130, 164, 203, 245, 292, 343, 398, 457, + 520, 587, 658, 733, 812, 895, 983, 1074, + 1170, 1269, 1373, 1481, 1592, 1708, 1828, 1952, + 2080, 2212, 2348, 2488, 2632, 2781, 2933, 3090, + 3250, 3415, 3583, 3756, 3933, 4114, 4298, 4487, + 4680, 4877, 5079, 5284, 5493, 5706, 5924, 6145, + 6371, 6600, 6834, 7072, 7313, 7559, 7809, 8063, + 8321, 8583, 8849, 9119, 9394, 9672, 9954, 10241, + 10531, 10826, 11125, 11427, 11734, 12045, 12360, 12679, + 13002, 13329, 13660, 13995, 14335, 14678, 15025, 15377, + 15732, 16092, 16456, 16823, 17195, 17571, 17951, 18335, + 18723, 19115, 19511, 19911, 20316, 20724, 21136, 21553, + 21974, 22398, 22827, 23260, 23696, 24137, 24582, 25031, + 25484, 25941, 26402, 26868, 27337, 27810, 28288, 28769, + 29255, 29744, 30238, 30736, 31238, 31744, 32254, 32768}; static s32 WorkBuffer[16] __attribute__((aligned(32))); THPSimplePlayerStaticAudio THPSimplePlayerWrapper::mStaticAudioPlayer; -THPSimplePlayerWrapper* THPSimplePlayerStaticAudio::mPlayer; +THPSimplePlayerWrapper* THPSimplePlayerStaticAudio::mPlayer; namespace NrvTHPSimplePlayerWrapper { NEW_NERVE(HostTypeWait, THPSimplePlayerWrapper, Wait); @@ -42,18 +41,17 @@ namespace NrvTHPSimplePlayerWrapper { NEW_NERVE(HostTypeReadVideoComp, THPSimplePlayerWrapper, ReadVideoComp); NEW_NERVE(HostTypeReadAudioComp, THPSimplePlayerWrapper, ReadAudioComp); NEW_NERVE(HostTypeReadPreLoad, THPSimplePlayerWrapper, ReadPreLoad); -}; - - +}; // namespace NrvTHPSimplePlayerWrapper namespace { - void dvdCallBackFunc(s32 a1, DVDFileInfo *pFileInfo) { + void dvdCallBackFunc(s32 a1, DVDFileInfo* pFileInfo) { THPSimplePlayerWrapper* player = (THPSimplePlayerWrapper*)pFileInfo->cb.userData; player->dvdCallBack(a1); } -}; +}; // namespace -THPSimplePlayerWrapper::THPSimplePlayerWrapper(const char *pName) : NerveExecutor(pName) { +THPSimplePlayerWrapper::THPSimplePlayerWrapper(const char* pName) + : NerveExecutor(pName) { _8 = 0; _9 = 0; _C = 0; @@ -84,8 +82,8 @@ THPSimplePlayerWrapper::THPSimplePlayerWrapper(const char *pName) : NerveExecuto mSoundBufferIndex = 0; _30C = 0; _310 = 0; - mSoundBuffer[0] = new(32) s32[0x230]; - mSoundBuffer[1] = new(32) s32[0x230]; + mSoundBuffer[0] = new (32) s32[0x230]; + mSoundBuffer[1] = new (32) s32[0x230]; MR::zeroMemory(mSoundBuffer[0], 0x8C0); MR::zeroMemory(mSoundBuffer[1], 0x8C0); DCFlushRange(mSoundBuffer[0], 0x8C0); @@ -131,7 +129,7 @@ void THPSimplePlayerWrapper::quit() { _8 = 0; } -bool THPSimplePlayerWrapper::open(const char *pName) { +bool THPSimplePlayerWrapper::open(const char* pName) { if (!tryDvdOpen(pName)) { return false; } @@ -147,8 +145,7 @@ bool THPSimplePlayerWrapper::close() { if (mAudioState == 1) { return false; } - } - else { + } else { mAudioState = 0; } @@ -258,15 +255,15 @@ bool THPSimplePlayerWrapper::loadStop() { DVDCancel(&mFileInfo.cb); mReadProgress = 0; } - + for (s32 i = 0; i < 0x14; i++) { mReadBuffer[i].isValid = 0; } - - for (s32 i = 0 ; i < 0x14; i++) { + + for (s32 i = 0; i < 0x14; i++) { mAudioBuffer[i].validSample = 0; } - + mTextureSet[0].frameNumber = -1; mTextureSet[1].frameNumber = -1; mCurOffset = mHeader.movieDataOffsets; @@ -290,7 +287,7 @@ s32 THPSimplePlayerWrapper::decode(s32 audio) { bool isValid = mReadBuffer[mNextDecodeIndex].isValid == true; if (isValid) { u32* compSize = (u32*)mReadBuffer[mNextDecodeIndex].ptr + 2; - u8* ptr = mReadBuffer[mNextDecodeIndex].ptr + mFrameComp.numComponents * 4 + 8; + u8* ptr = mReadBuffer[mNextDecodeIndex].ptr + mFrameComp.numComponents * 4 + 8; if (mAudioExist) { if (audio < 0 || audio >= mAudioInfo.sndNumTracks) { @@ -300,42 +297,40 @@ s32 THPSimplePlayerWrapper::decode(s32 audio) { if (mAudioBuffer[mAudioDecodeIndex].validSample == 0) { for (s32 i = 0; i < mFrameComp.numComponents; i++) { switch (mFrameComp.frameComp[i]) { - case 0: - if (!videoDecode(ptr)) { - return 1; - } - break; - case 1: - u32 sample = THPAudioDecode(mAudioBuffer[mAudioDecodeIndex].buffer, ptr + (*compSize) * audio, 0); - s32 interrupt = OSDisableInterrupts(); - mAudioBuffer[mAudioDecodeIndex].validSample = sample; - mAudioBuffer[mAudioDecodeIndex].curPtr = mAudioBuffer[mAudioDecodeIndex].buffer; - OSRestoreInterrupts(interrupt); - mAudioDecodeIndex++; - - if (mAudioDecodeIndex >= 20) { - mAudioDecodeIndex = 0; - } - - break; - } - - ptr += *compSize; - compSize++; - } - } - else { - return 3; - } - } - else { - for (s32 i = 0; i < mFrameComp.numComponents; i++) { - switch (mFrameComp.frameComp[i]) { case 0: if (!videoDecode(ptr)) { return 1; } break; + case 1: + u32 sample = THPAudioDecode(mAudioBuffer[mAudioDecodeIndex].buffer, ptr + (*compSize) * audio, 0); + s32 interrupt = OSDisableInterrupts(); + mAudioBuffer[mAudioDecodeIndex].validSample = sample; + mAudioBuffer[mAudioDecodeIndex].curPtr = mAudioBuffer[mAudioDecodeIndex].buffer; + OSRestoreInterrupts(interrupt); + mAudioDecodeIndex++; + + if (mAudioDecodeIndex >= 20) { + mAudioDecodeIndex = 0; + } + + break; + } + + ptr += *compSize; + compSize++; + } + } else { + return 3; + } + } else { + for (s32 i = 0; i < mFrameComp.numComponents; i++) { + switch (mFrameComp.frameComp[i]) { + case 0: + if (!videoDecode(ptr)) { + return 1; + } + break; } ptr += *compSize; @@ -352,7 +347,7 @@ s32 THPSimplePlayerWrapper::decode(s32 audio) { return 2; } -s32 THPSimplePlayerWrapper::drawCurrentFrame(_GXRenderModeObj *rmode, u32 x, u32 y, u32 polyW, u32 polyH) { +s32 THPSimplePlayerWrapper::drawCurrentFrame(_GXRenderModeObj* rmode, u32 x, u32 y, u32 polyW, u32 polyH) { if (mTextureSet[_310].frameNumber < 0) { return -1; } @@ -365,7 +360,7 @@ s32 THPSimplePlayerWrapper::drawCurrentFrame(_GXRenderModeObj *rmode, u32 x, u32 return ret; } -bool THPSimplePlayerWrapper::getVideoInfo(THPVideoInfo *pInfo) const { +bool THPSimplePlayerWrapper::getVideoInfo(THPVideoInfo* pInfo) const { if (!mOpen) { return false; } @@ -390,14 +385,14 @@ s32 THPSimplePlayerWrapper::getTotalFrame() const { return 0; } -bool THPSimplePlayerWrapper::videoDecode(u8 *pFile) { - if (THPVideoDecode(pFile, - mTextureSet[_310].ytexture, - mTextureSet[_310].utexture, - mTextureSet[_310].vtexture, - mTHPWork)) { - return false; - } +bool THPSimplePlayerWrapper::videoDecode(u8* pFile) { + if (THPVideoDecode(pFile, + mTextureSet[_310].ytexture, + mTextureSet[_310].utexture, + mTextureSet[_310].vtexture, + mTHPWork)) { + return false; + } mTextureSet[_310].frameNumber = mReadBuffer[mNextDecodeIndex].frameNumber; return true; @@ -410,8 +405,7 @@ void THPSimplePlayerWrapper::readFrameAsync() { mTotalReadFrame = 0; mCurOffset = mHeader.movieDataOffsets; mReadSize = mHeader.firstFrameSize; - } - else { + } else { return; } } @@ -442,8 +436,7 @@ void THPSimplePlayerWrapper::dvdCallBack(s32 result) { if (result == -1) { mDvdError = 1; return; - } - else if (result == -3) { + } else if (result == -3) { return; } @@ -470,9 +463,9 @@ void THPSimplePlayerWrapper::readAsyncCallBack(s32 a1) { !isNerve(&NrvTHPSimplePlayerWrapper::HostTypeReadFrameComp::sInstance) && !isNerve(&NrvTHPSimplePlayerWrapper::HostTypeReadVideoComp::sInstance) && !isNerve(&NrvTHPSimplePlayerWrapper::HostTypeReadAudioComp::sInstance)) { - isNerve(&NrvTHPSimplePlayerWrapper::HostTypeReadPreLoad::sInstance); + isNerve(&NrvTHPSimplePlayerWrapper::HostTypeReadPreLoad::sInstance); } - + DVDClose(&mFileInfo); return; } @@ -517,10 +510,10 @@ void THPSimplePlayerWrapper::readAsyncCallBack(s32 a1) { } s32 THPSimplePlayerWrapper::getNextBuffer(u32 idx) const { - return ((idx) + 1 >= 0x14 ? 0 : (idx) + 1); + return ((idx) + 1 >= 0x14 ? 0 : (idx) + 1); } -bool THPSimplePlayerWrapper::tryDvdOpen(const char *pFileName) { +bool THPSimplePlayerWrapper::tryDvdOpen(const char* pFileName) { if (!_8) { return false; } @@ -559,11 +552,11 @@ void THPSimplePlayerWrapper::setupParams() { } namespace { - void readAsyncCallBackFunc(s32 a1, DVDFileInfo *pInfo) { + void readAsyncCallBackFunc(s32 a1, DVDFileInfo* pInfo) { THPSimplePlayerWrapper* player = (THPSimplePlayerWrapper*)pInfo->cb.userData; player->readAsyncCallBack(a1); } -}; +}; // namespace void THPSimplePlayerWrapper::exeReadHeader() { if (MR::isFirstStep(this)) { @@ -659,12 +652,12 @@ bool THPSimplePlayerWrapper::checkComponentsInFrame(s32 comp) { } switch (mFrameComp.frameComp[comp]) { - case 0: - setNerve(&NrvTHPSimplePlayerWrapper::HostTypeReadVideoComp::sInstance); - return true; - case 1: - setNerve(&NrvTHPSimplePlayerWrapper::HostTypeReadAudioComp::sInstance); - return true; + case 0: + setNerve(&NrvTHPSimplePlayerWrapper::HostTypeReadVideoComp::sInstance); + return true; + case 1: + setNerve(&NrvTHPSimplePlayerWrapper::HostTypeReadAudioComp::sInstance); + return true; } return false; @@ -684,8 +677,7 @@ bool THPSimplePlayerWrapper::tryFinishDvdOpen() { void THPSimplePlayerWrapper::initAudio() { if (!SCGetSoundMode()) { _30C = 1; - } - else { + } else { _30C = 0; } @@ -713,14 +705,14 @@ s16* THPSimplePlayerWrapper::audioCallback(s32 sample) { return (s16*)mSoundBuffer[mSoundBufferIndex]; } -void THPSimplePlayerWrapper::mixAudio(s16 *pDest, u32 sample) { - u32 sampleNum, requestSample; - s32 mix; +void THPSimplePlayerWrapper::mixAudio(s16* pDest, u32 sample) { + u32 sampleNum, requestSample; + s32 mix; s16 *libsrc, *thpsrc; - u16 attenuation; + u16 attenuation; if (isAudioProcessValid()) { - if (_2F0) { + if (_2F0) { _2F0 = 0; _2F4 = 0.0f; _2F8 = 0.001f; @@ -731,114 +723,106 @@ void THPSimplePlayerWrapper::mixAudio(s16 *pDest, u32 sample) { if (!mAudioBuffer[idx1].validSample || !mAudioBuffer[idx2].validSample) { MR::zeroMemory(pDest, sample * sizeof(s16*)); return; - } - } - else if (!mAudioBuffer[(mAudioOutputIndex + 1) % 0x14].validSample) { + } + } else if (!mAudioBuffer[(mAudioOutputIndex + 1) % 0x14].validSample) { MR::zeroMemory(pDest, sample * sizeof(s16*)); return; } do { - if (mAudioBuffer[mAudioOutputIndex].validSample) { - if (mAudioBuffer[mAudioOutputIndex].validSample >= sample) { - sampleNum = sample; - } - else { - sampleNum = mAudioBuffer[mAudioOutputIndex].validSample; - } - - thpsrc = mAudioBuffer[mAudioOutputIndex].curPtr; - - for (u32 i = 0; i < sampleNum; i++) { - if (mRampCount) { - mRampCount--; - mCurrentVolume += mDeltaVolume; - } - else { - mCurrentVolume = mTargetVolume; + if (mAudioBuffer[mAudioOutputIndex].validSample) { + if (mAudioBuffer[mAudioOutputIndex].validSample >= sample) { + sampleNum = sample; + } else { + sampleNum = mAudioBuffer[mAudioOutputIndex].validSample; } - f32 vol = mCurrentVolume; + thpsrc = mAudioBuffer[mAudioOutputIndex].curPtr; - if (_2FC > 0) { - s32 v19 = _2FC - 1; - vol = 0.0f; - _2FC = v19; - if (v19 < 0) { - _2FC = 0; + for (u32 i = 0; i < sampleNum; i++) { + if (mRampCount) { + mRampCount--; + mCurrentVolume += mDeltaVolume; + } else { + mCurrentVolume = mTargetVolume; + } + + f32 vol = mCurrentVolume; + + if (_2FC > 0) { + s32 v19 = _2FC - 1; + vol = 0.0f; + _2FC = v19; + if (v19 < 0) { + _2FC = 0; + } + } else if (_2F4 < 1.0f) { + vol = mCurrentVolume * _2F4; + f32 v20 = _2F4 + _2F8; + _2F4 += _2F8; + + if (v20 >= 1.0f) { + _2F4 = 1.0f; + _2F8 = 0.0f; + } + } + + attenuation = VolumeTable[(s32)vol]; + mix = ((attenuation * (*thpsrc)) >> 15); + + if (mix < -32768) { + mix = -32768; + } + + if (mix > 32767) { + mix = 32767; + } + + *pDest = (s16)mix; + *thpsrc = 0; + pDest++; + thpsrc++; + + mix = ((attenuation * (*thpsrc)) >> 15); + + if (mix < -32768) { + mix = -32768; + } + if (mix > 32767) { + mix = 32767; + } + + *pDest = (s16)mix; + *thpsrc = 0; + pDest++; + thpsrc++; + + if (_30C) { + s32 diff = *(pDest - 2) + (*(pDest - 1)); + f32 v16 = (diff / 2); + *(pDest - 1) = *(pDest - 2) = 0.70700002f * v16; } } - else if (_2F4 < 1.0f) { - vol = mCurrentVolume * _2F4; - f32 v20 = _2F4 + _2F8; - _2F4 += _2F8; - if (v20 >= 1.0f) { - _2F4 = 1.0f; - _2F8 = 0.0f; - } - } - - attenuation = VolumeTable[(s32)vol]; - mix = ((attenuation * (*thpsrc)) >> 15); - - if (mix < -32768) { - mix = -32768; - } - - if (mix > 32767) { - mix = 32767; - } - - - *pDest = (s16)mix; - *thpsrc = 0; - pDest++; - thpsrc++; - - mix = ((attenuation * (*thpsrc)) >> 15); - - if (mix < -32768) - { - mix = -32768; - } - if (mix > 32767) - { - mix = 32767; - } - - *pDest = (s16)mix; - *thpsrc = 0; - pDest++; - thpsrc++; - - if (_30C) { - s32 diff = *(pDest - 2) + (*(pDest - 1)); - f32 v16 = (diff / 2); - *(pDest - 1) = *(pDest - 2) = 0.70700002f * v16; + sample -= sampleNum; + mAudioBuffer[mAudioOutputIndex].validSample -= sampleNum; + mAudioBuffer[mAudioOutputIndex].curPtr = thpsrc; + + if (mAudioBuffer[mAudioOutputIndex].validSample == 0) { + mAudioOutputIndex++; + if (mAudioOutputIndex >= 0x14) { + mAudioOutputIndex = 0; + } } + if (sample == 0) + break; + } else { + MR::zeroMemory(pDest, sample * sizeof(s16*)); + return; } - - sample -= sampleNum; - mAudioBuffer[mAudioOutputIndex].validSample -= sampleNum; - mAudioBuffer[mAudioOutputIndex].curPtr = thpsrc; - - if (mAudioBuffer[mAudioOutputIndex].validSample == 0) { - mAudioOutputIndex++; - if (mAudioOutputIndex >= 0x14) { - mAudioOutputIndex = 0; - } - } - if (sample == 0) break; - } - else { - MR::zeroMemory(pDest, sample * sizeof(s16*)); - return; - } } while (true); - - } - else { + + } else { MR::zeroMemory(pDest, sample * sizeof(s16*)); } } @@ -884,8 +868,7 @@ bool THPSimplePlayerWrapper::setVolume(s32 volume, s32 time) { if (time > 0) { mRampCount = 32 * time; mDeltaVolume = (mTargetVolume - mCurrentVolume) / (f32)mRampCount; - } - else { + } else { mRampCount = 0; mCurrentVolume = mTargetVolume; } @@ -913,7 +896,5 @@ s16* THPSimplePlayerStaticAudio::audioCallback(s32 audio) { return player->audioCallback(audio); } - THPSimplePlayerStaticAudio::THPSimplePlayerStaticAudio() { - } diff --git a/src/Game/Screen/TimeLimitLayout.cpp b/src/Game/Screen/TimeLimitLayout.cpp index 9e247fe6d..ca6a79a50 100644 --- a/src/Game/Screen/TimeLimitLayout.cpp +++ b/src/Game/Screen/TimeLimitLayout.cpp @@ -27,19 +27,17 @@ namespace NrvTimeLimitLayout { NEW_NERVE(TimeLimitLayoutScaleDown, TimeLimitLayout, ScaleDown); NEW_NERVE(TimeLimitLayoutFadeout, TimeLimitLayout, Fadeout); NEW_NERVE(TimeLimitLayoutTimeUpReady, TimeLimitLayout, TimeUpReady); -}; +}; // namespace NrvTimeLimitLayout -TimeLimitLayout::TimeLimitLayout(u32 timeLimit) : - LayoutActor("タイムリミット", true), - mTime(0), - mTimeLimit(timeLimit), - mScaleCtrl(nullptr), - mAlphaCtrl(nullptr), - mCurrentTiming(nullptr), - mIsSuspend(false), - _35(false) -{ - +TimeLimitLayout::TimeLimitLayout(u32 timeLimit) + : LayoutActor("タイムリミット", true), + mTime(0), + mTimeLimit(timeLimit), + mScaleCtrl(nullptr), + mAlphaCtrl(nullptr), + mCurrentTiming(nullptr), + mIsSuspend(false), + _35(false) { } void TimeLimitLayout::init(const JMapInfoIter& rIter) { @@ -158,8 +156,7 @@ void TimeLimitLayout::exeScaleKeep() { if (MR::isGreaterStep(this, mCurrentTiming->mScaleKeepFrame)) { if (mCurrentTiming->mIsScaleDown) { setNerve(&NrvTimeLimitLayout::TimeLimitLayoutScaleDown::sInstance); - } - else { + } else { setNerve(&NrvTimeLimitLayout::TimeLimitLayoutCountDown::sInstance); } } @@ -177,8 +174,7 @@ void TimeLimitLayout::exeScaleDown() { if (mScaleCtrl->mFrame == mScaleCtrl->mMaxFrame) { if (mCurrentTiming->_A && !_35) { setNerve(&NrvTimeLimitLayout::TimeLimitLayoutFadeout::sInstance); - } - else { + } else { setNerve(&NrvTimeLimitLayout::TimeLimitLayoutCountDown::sInstance); } } @@ -199,7 +195,6 @@ void TimeLimitLayout::exeFadeout() { } void TimeLimitLayout::exeTimeUpReady() { - } void TimeLimitLayout::control() { @@ -227,13 +222,11 @@ bool TimeLimitLayout::updateNormal() { if (timeLeft % 60 == 0 && timeLeft != 0) { MR::startSystemSE("SE_SY_E3_TIMER_COUNT_4", -1, -1); } - } - else if (timeLeft <= 360) { + } else if (timeLeft <= 360) { if (timeLeft % 60 == 0) { MR::startSystemSE("SE_SY_E3_TIMER_COUNT_2", -1, -1); } - } - else if (timeLeft <= 600) { + } else if (timeLeft <= 600) { if (timeLeft % 60 == 0) { MR::startSystemSE("SE_SY_E3_TIMER_COUNT_1", -1, -1); } diff --git a/src/Game/Screen/TitleSequenceProduct.cpp b/src/Game/Screen/TitleSequenceProduct.cpp index 51477d015..a01cecc7b 100644 --- a/src/Game/Screen/TitleSequenceProduct.cpp +++ b/src/Game/Screen/TitleSequenceProduct.cpp @@ -15,13 +15,12 @@ namespace { }; namespace TitleSequenceProductSub { - LogoLayout::LogoLayout() : - SimpleLayout("ロゴ", "TitleLogo", 2, -1) - { + LogoLayout::LogoLayout() + : SimpleLayout("ロゴ", "TitleLogo", 2, -1) { initEffectKeeper(1, "TitleLogo", nullptr); kill(); } -}; +}; // namespace TitleSequenceProductSub namespace { NEW_NERVE(TitleSequenceProductDisplayEncouragePal60Window, TitleSequenceProduct, DisplayEncouragePal60Window); @@ -31,20 +30,18 @@ namespace { NEW_NERVE(TitleSequenceProductLogoDisplay, TitleSequenceProduct, LogoDisplay); NEW_NERVE(TitleSequenceProductDecide, TitleSequenceProduct, Decide); NEW_NERVE(TitleSequenceProductDead, TitleSequenceProduct, Dead); -}; +}; // namespace -TitleSequenceProduct::TitleSequenceProduct() : - NerveExecutor(""), - mLogoLayout(nullptr), - mPressStartLayout(nullptr), - mEncouragePal60Window(nullptr), - mAButtonChecker(nullptr), - mBButtonChecker(nullptr) -{ +TitleSequenceProduct::TitleSequenceProduct() + : NerveExecutor(""), + mLogoLayout(nullptr), + mPressStartLayout(nullptr), + mEncouragePal60Window(nullptr), + mAButtonChecker(nullptr), + mBButtonChecker(nullptr) { if (MR::isDisplayEncouragePal60Window()) { initNerve(&TitleSequenceProductDisplayEncouragePal60Window::sInstance); - } - else { + } else { initNerve(&TitleSequenceProductBgmPrepare::sInstance); } @@ -64,8 +61,8 @@ void TitleSequenceProduct::exeDisplayEncouragePal60Window() { if (MR::isFirstStep(this)) { OSTime timeAnnounced = GameDataFunction::getSysConfigFileTimeAnnounced(); OSTime ticks = OSGetTime(); - s32 day = OSTicksToSeconds(ticks) / (60 * 60 * 24); - s32 dayAnnounced = OSTicksToSeconds(timeAnnounced) / (60 * 60 * 24); + s32 day = OSTicksToSeconds(ticks) / (60 * 60 * 24); + s32 dayAnnounced = OSTicksToSeconds(timeAnnounced) / (60 * 60 * 24); if (timeAnnounced == 0 || ticks < timeAnnounced || dayAnnounced < day) { mEncouragePal60Window->appear(); @@ -136,8 +133,7 @@ void TitleSequenceProduct::exeLogoDisplay() { MR::startCSSound("CS_CLICK_CLOSE", 0, 0); MR::tryRumblePadMiddle(this, 0); setNerve(&TitleSequenceProductDecide::sInstance); - } - else { + } else { updateButtonReaction(mAButtonChecker, "ReactionA"); updateButtonReaction(mBButtonChecker, "ReactionB"); updatePressStartReaction(); @@ -170,8 +166,7 @@ void TitleSequenceProduct::exeDead() { void TitleSequenceProduct::appear() { if (mIsDisplayEncouragePal60Window) { setNerve(&TitleSequenceProductDisplayEncouragePal60Window::sInstance); - } - else { + } else { setNerve(&TitleSequenceProductBgmPrepare::sInstance); } } @@ -188,8 +183,7 @@ void TitleSequenceProduct::updateButtonReaction(TriggerChecker* pButtonChecker, if (pButtonChecker->getOnTrigger()) { MR::startAnim(mLogoLayout, pAnimName, 1); MR::setAnimFrameAndStop(mLogoLayout, 0.0f, 1); - } - else if (pButtonChecker->getOffTrigger()) { + } else if (pButtonChecker->getOffTrigger()) { MR::startAnim(mLogoLayout, pAnimName, 1); } } @@ -197,8 +191,7 @@ void TitleSequenceProduct::updateButtonReaction(TriggerChecker* pButtonChecker, void TitleSequenceProduct::updatePressStartReaction() { if (mAButtonChecker->getOnTrigger()) { MR::startAnim(mPressStartLayout, "ButtonReaction", 0); - } - else if (mBButtonChecker->getOnTrigger()) { + } else if (mBButtonChecker->getOnTrigger()) { MR::startAnim(mPressStartLayout, "ButtonReaction", 0); } } diff --git a/src/Game/Screen/WipeFade.cpp b/src/Game/Screen/WipeFade.cpp index ace76c969..a9bc38fff 100644 --- a/src/Game/Screen/WipeFade.cpp +++ b/src/Game/Screen/WipeFade.cpp @@ -2,12 +2,11 @@ #include "Game/Util/LayoutUtil.hpp" #include "Game/Util/DrawUtil.hpp" -WipeFade::WipeFade(const char* pName, const Color8& rFillColor) : - WipeLayoutBase(pName), - mIsWipeIn(false), - mStepNum(30), - mStep(30) -{ +WipeFade::WipeFade(const char* pName, const Color8& rFillColor) + : WipeLayoutBase(pName), + mIsWipeIn(false), + mStepNum(30), + mStep(30) { mFillColor = rFillColor; } diff --git a/src/Game/Screen/WipeGameOver.cpp b/src/Game/Screen/WipeGameOver.cpp index 7cf23e7c2..5313d093c 100644 --- a/src/Game/Screen/WipeGameOver.cpp +++ b/src/Game/Screen/WipeGameOver.cpp @@ -5,12 +5,10 @@ namespace NrvWipeGameOver { NEW_NERVE(WipeGameOverWait, WipeGameOver, Wait); NEW_NERVE(WipeGameOverActive, WipeGameOver, Active); -}; +}; // namespace NrvWipeGameOver -WipeGameOver::WipeGameOver() : - WipeLayoutBase("ゲームオーバー") -{ - +WipeGameOver::WipeGameOver() + : WipeLayoutBase("ゲームオーバー") { } void WipeGameOver::init(const JMapInfoIter& rIter) { @@ -59,7 +57,6 @@ bool WipeGameOver::isWipeOut() const { } void WipeGameOver::exeWait() { - } void WipeGameOver::exeActive() { diff --git a/src/Game/Screen/WipeHolderBase.cpp b/src/Game/Screen/WipeHolderBase.cpp index 0827a484c..0227e9027 100644 --- a/src/Game/Screen/WipeHolderBase.cpp +++ b/src/Game/Screen/WipeHolderBase.cpp @@ -2,11 +2,10 @@ #include "Game/Screen/WipeLayoutBase.hpp" #include -WipeHolderBase::WipeHolderBase(u32 num, const char *pName) : - NameObj(pName), - mCurrentWipeLayout(), - mWipeLayoutArray() -{ +WipeHolderBase::WipeHolderBase(u32 num, const char* pName) + : NameObj(pName), + mCurrentWipeLayout(), + mWipeLayoutArray() { mWipeLayoutArray.init(num); } diff --git a/src/Game/Screen/WipeKoopa.cpp b/src/Game/Screen/WipeKoopa.cpp index 7bbf302c2..a8fd82bde 100644 --- a/src/Game/Screen/WipeKoopa.cpp +++ b/src/Game/Screen/WipeKoopa.cpp @@ -7,13 +7,11 @@ namespace { NEW_NERVE(WipeKoopaNrvWait, WipeKoopa, Wait); NEW_NERVE(WipeKoopaNrvWipeOut, WipeKoopa, WipeOut); NEW_NERVE(WipeKoopaNrvClose, WipeKoopa, Close); -}; +}; // namespace -WipeKoopa::WipeKoopa() : - WipeLayoutBase("クッパ"), - mStepNum(90) -{ - +WipeKoopa::WipeKoopa() + : WipeLayoutBase("クッパ"), + mStepNum(90) { } void WipeKoopa::init(const JMapInfoIter& rIter) { @@ -22,7 +20,6 @@ void WipeKoopa::init(const JMapInfoIter& rIter) { } void WipeKoopa::exeWait() { - } void WipeKoopa::exeWipeOut() { @@ -46,7 +43,6 @@ void WipeKoopa::exeWipeOut() { } void WipeKoopa::exeClose() { - } void WipeKoopa::wipe(s32 step) { @@ -55,8 +51,7 @@ void WipeKoopa::wipe(s32 step) { if (step > 0) { mStepNum = step; - } - else { + } else { mStepNum = 90; } } diff --git a/src/Game/Screen/YesNoController.cpp b/src/Game/Screen/YesNoController.cpp index 5a3c849a2..6d92e2414 100644 --- a/src/Game/Screen/YesNoController.cpp +++ b/src/Game/Screen/YesNoController.cpp @@ -10,7 +10,7 @@ namespace { static const char* sDefaultCursorSE = "SE_SY_TALK_FOCUS_ITEM"; static const char* sDefaultYesSE = "SE_SY_TALK_SELECT_YES"; static const char* sDefaultNoSE = "SE_SY_TALK_SELECT_NO"; -}; +}; // namespace namespace NrvYesNoController { NEW_NERVE(YesNoControllerNrvSelecting, YesNoController, Selecting); @@ -18,18 +18,17 @@ namespace NrvYesNoController { NEW_NERVE(YesNoControllerNrvDisappear, YesNoController, Disappear); NEW_NERVE(YesNoControllerNrvSelected, YesNoController, Selected); NEW_NERVE(YesNoControllerNrvNotSelected, YesNoController, NotSelected); -}; +}; // namespace NrvYesNoController -YesNoController::YesNoController(LayoutActor* pHost) : - NerveExecutor("はい／いいえ選択制御"), - mHost(pHost), - _C(false), - mButtonYesPaneCtrl(nullptr), - mButtonNoPaneCtrl(nullptr), - mCursorSE(nullptr), - mYesSE(nullptr), - mNoSE(nullptr) -{ +YesNoController::YesNoController(LayoutActor* pHost) + : NerveExecutor("はい／いいえ選択制御"), + mHost(pHost), + _C(false), + mButtonYesPaneCtrl(nullptr), + mButtonNoPaneCtrl(nullptr), + mCursorSE(nullptr), + mYesSE(nullptr), + mNoSE(nullptr) { mButtonYesPaneCtrl = new ButtonPaneController(mHost, "Right", "BoxRight", 0, true); mButtonYesPaneCtrl->_22 = false; @@ -113,8 +112,7 @@ void YesNoController::exeSelecting() { if (mButtonYesPaneCtrl->isPointingTrigger()) { if (mCursorSE != nullptr) { MR::startSystemSE(mCursorSE, -1, -1); - } - else { + } else { MR::startSystemSE(sDefaultCursorSE, -1, -1); } @@ -125,8 +123,7 @@ void YesNoController::exeSelecting() { if (mButtonNoPaneCtrl->isPointingTrigger()) { if (mCursorSE != nullptr) { MR::startSystemSE(mCursorSE, -1, -1); - } - else { + } else { MR::startSystemSE(sDefaultCursorSE, -1, -1); } @@ -159,24 +156,19 @@ void YesNoController::exeDecided() { if (isSelectedYes) { if (mYesSE != nullptr) { MR::startSystemSE(mYesSE, -1, -1); - } - else { + } else { MR::startSystemSE(sDefaultYesSE, -1, -1); } - } - else { + } else { if (mNoSE != nullptr) { MR::startSystemSE(mNoSE, -1, -1); - } - else { + } else { MR::startSystemSE(sDefaultNoSE, -1, -1); } } } - if ((isSelectedYes && mButtonYesPaneCtrl->isDecidedWait()) - || (!isSelectedYes && mButtonNoPaneCtrl->isDecidedWait())) - { + if ((isSelectedYes && mButtonYesPaneCtrl->isDecidedWait()) || (!isSelectedYes && mButtonNoPaneCtrl->isDecidedWait())) { setNerve(&NrvYesNoController::YesNoControllerNrvDisappear::sInstance); } } @@ -190,8 +182,7 @@ void YesNoController::exeDisappear() { if (mButtonYesPaneCtrl->isHidden() && mButtonNoPaneCtrl->isHidden()) { if (mButtonYesPaneCtrl->mIsSelected || mButtonNoPaneCtrl->mIsSelected) { setNerve(&NrvYesNoController::YesNoControllerNrvSelected::sInstance); - } - else { + } else { setNerve(&NrvYesNoController::YesNoControllerNrvNotSelected::sInstance); } } diff --git a/src/Game/Screen/YesNoLayout.cpp b/src/Game/Screen/YesNoLayout.cpp index 6f98474b0..476b91811 100644 --- a/src/Game/Screen/YesNoLayout.cpp +++ b/src/Game/Screen/YesNoLayout.cpp @@ -9,12 +9,10 @@ namespace NrvYesNoLayout { NEW_NERVE(YesNoLayoutNrvSelecting, YesNoLayout, Selecting); }; -YesNoLayout::YesNoLayout() : - SimpleLayout("Yes/Noレイアウト", "SelectButton", 1, 68), - mController(nullptr), - _24(false) -{ - +YesNoLayout::YesNoLayout() + : SimpleLayout("Yes/Noレイアウト", "SelectButton", 1, 68), + mController(nullptr), + _24(false) { } void YesNoLayout::init(const JMapInfoIter& rIter) { diff --git a/src/Game/Speaker/SpkData.cpp b/src/Game/Speaker/SpkData.cpp index 168222ef6..07de7ed39 100644 --- a/src/Game/Speaker/SpkData.cpp +++ b/src/Game/Speaker/SpkData.cpp @@ -1,6 +1,6 @@ #include "Game/Speaker/SpkData.hpp" -SpkData::SpkData(JKRArchive * archive) { +SpkData::SpkData(JKRArchive* archive) { mArchive = archive; } diff --git a/src/Game/Speaker/SpkMixingBuffer.cpp b/src/Game/Speaker/SpkMixingBuffer.cpp index d29a8b0ee..33c8cac35 100644 --- a/src/Game/Speaker/SpkMixingBuffer.cpp +++ b/src/Game/Speaker/SpkMixingBuffer.cpp @@ -3,14 +3,14 @@ #include "JSystem/JAudio2/JASCalc.hpp" #include "JSystem/JAudio2/JASGlobal.hpp" -SpkMixingBuffer::SpkMixingBuffer(JKRHeap *pHeap) { +SpkMixingBuffer::SpkMixingBuffer(JKRHeap* pHeap) { for (int i = 0; i < 4; i++) { - mSamples[i] = new(pHeap, 0) s16[0x28]; + mSamples[i] = new (pHeap, 0) s16[0x28]; JASCalc::bzero((void*)mSamples[i], 0x50); } } -void SpkMixingBuffer::mix(s32 a1, s16 *a2, s32 a3, f32 a4, s32 a5) { +void SpkMixingBuffer::mix(s32 a1, s16* a2, s32 a3, f32 a4, s32 a5) { //for (int i = 0; i < ) } diff --git a/src/Game/Speaker/SpkSound.cpp b/src/Game/Speaker/SpkSound.cpp index e7111cb3d..f6cc130c8 100644 --- a/src/Game/Speaker/SpkSound.cpp +++ b/src/Game/Speaker/SpkSound.cpp @@ -24,8 +24,7 @@ SpkSoundVolume::SpkSoundVolume() { void SpkSoundVolume::setRelease(s32 release) { if (release > 0) { _4 = 1.0f / release; - } - else { + } else { _4 = 1.0f; } @@ -37,8 +36,7 @@ void SpkSoundVolume::setFadeOut(s32 fadeOut) { if (fadeOut > 0) { _C = 1.0f / fadeOut; - } - else { + } else { _C = 1.0f; } @@ -46,8 +44,8 @@ void SpkSoundVolume::setFadeOut(s32 fadeOut) { OSRestoreInterrupts(status); } -SpkSound::SpkSound() : JSUPtrLink(this), mSoundHandle(nullptr), _14(-1), _18(0), _1C(0), _20(0), _24(100), _28(0), _2C(0), _30(-1), _34(-1), _38(0), _3C(-1) { - +SpkSound::SpkSound() + : JSUPtrLink(this), mSoundHandle(nullptr), _14(-1), _18(0), _1C(0), _20(0), _24(100), _28(0), _2C(0), _30(-1), _34(-1), _38(0), _3C(-1) { } #ifdef NON_MATCHING @@ -68,13 +66,12 @@ void SpkSound::stop(s32 a1) { if (fade) { mVolume.setFadeOut(fade); - } - else { + } else { mVolume.setRelease(_28); } } -void SpkSound::attachHandle(SpkSoundHandle *pHandle) { +void SpkSound::attachHandle(SpkSoundHandle* pHandle) { if (mSoundHandle) { releaseHandle(); } @@ -106,13 +103,14 @@ bool SpkSound::start(s32 a1, s32 a2) { void SpkSound::unlock() { if (_38 != 1) { - return; + return; } _38 = 2; } -SpkSoundHolder::SpkSoundHolder() : JASGlobalInstance(this) { +SpkSoundHolder::SpkSoundHolder() + : JASGlobalInstance(this) { _44 = 0xA; _40 = 1.0f; @@ -126,4 +124,4 @@ bool SpkSoundHolder::update(s32 a1) { bool ret = updateEachSound(a1); OSRestoreInterrupts(status); return ret; -} \ No newline at end of file +} \ No newline at end of file diff --git a/src/Game/Speaker/SpkSpeakerCtrl.cpp b/src/Game/Speaker/SpkSpeakerCtrl.cpp index 8d75fa911..f50e5cad0 100644 --- a/src/Game/Speaker/SpkSpeakerCtrl.cpp +++ b/src/Game/Speaker/SpkSpeakerCtrl.cpp @@ -4,17 +4,17 @@ #include #include -SpkSoundHandle sAdjustSoundHandle[WPAD_MAX_CONTROLLERS]; +SpkSoundHandle sAdjustSoundHandle[WPAD_MAX_CONTROLLERS]; SpkMixingBuffer* sMixingBuffer; -SpeakerInfo sSpeakerInfo[WPAD_MAX_CONTROLLERS]; +SpeakerInfo sSpeakerInfo[WPAD_MAX_CONTROLLERS]; namespace { SpeakerInfo& getSpeakerInfo(s32 idx) { return sSpeakerInfo[idx]; } -}; +}; // namespace -void SpkSpeakerCtrl::setMixingBuffer(SpkMixingBuffer *pMixingBuffer) { +void SpkSpeakerCtrl::setMixingBuffer(SpkMixingBuffer* pMixingBuffer) { BOOL status = OSDisableInterrupts(); sMixingBuffer = pMixingBuffer; OSRestoreInterrupts(status); @@ -35,12 +35,11 @@ void SpkSpeakerCtrl::connect(s32 idx) { void SpkSpeakerCtrl::setSpeakerOn(s32 idx) { BOOL state = OSDisableInterrupts(); - s32 val = WPADControlSpeaker(idx, 1, SpkSpeakerCtrl::setSpeakerOnCallback); + s32 val = WPADControlSpeaker(idx, 1, SpkSpeakerCtrl::setSpeakerOnCallback); if (val == -2) { sSpeakerInfo[idx]._24 = 1; - } - else { + } else { sSpeakerInfo[idx]._24 = 0; } @@ -52,8 +51,7 @@ void SpkSpeakerCtrl::setSpeakerOnCallback(s32 idx, s32 a2) { if (a2 == 0) { sSpeakerInfo[idx]._24 = 0; SpkSpeakerCtrl::setSpeakerPlay(idx); - } - else { + } else { if (a2 == -3) { sSpeakerInfo[idx]._24 = 1; } @@ -64,12 +62,11 @@ void SpkSpeakerCtrl::setSpeakerOnCallback(s32 idx, s32 a2) { void SpkSpeakerCtrl::setSpeakerPlay(s32 idx) { BOOL state = OSDisableInterrupts(); - s32 val = WPADControlSpeaker(idx, 4, SpkSpeakerCtrl::startPlayCallback); - + s32 val = WPADControlSpeaker(idx, 4, SpkSpeakerCtrl::startPlayCallback); + if (val == -2) { sSpeakerInfo[idx]._24 = 2; - } - else { + } else { sSpeakerInfo[idx]._24 = 0; } @@ -86,8 +83,7 @@ void SpkSpeakerCtrl::startPlayCallback(s32 idx, s32 a2) { inf->_24 = 0; inf->_30 = 28800; memset(&sSpeakerInfo[idx]._2, 0, 0x20); - } - else { + } else { if (enabled == -3) { sSpeakerInfo[idx]._24 = 2; } @@ -105,15 +101,15 @@ void SpkSpeakerCtrl::setSpeakerOff(s32 idx) { void SpkSpeakerCtrl::retryConnection(s32 idx) { switch (sSpeakerInfo[idx]._24) { - case 0: - case 3: - break; - case 1: - SpkSpeakerCtrl::setSpeakerOn(idx); - break; - case 2: - SpkSpeakerCtrl::setSpeakerPlay(idx); - break; + case 0: + case 3: + break; + case 1: + SpkSpeakerCtrl::setSpeakerOn(idx); + break; + case 2: + SpkSpeakerCtrl::setSpeakerPlay(idx); + break; } } @@ -134,25 +130,25 @@ void SpkSpeakerCtrl::framework() { void SpkSpeakerCtrl::reconnectProcess(s32 idx) { if (sSpeakerInfo[idx]._0) { switch (sSpeakerInfo[idx]._28) { - case 0: - break; - case 1: - SpkSpeakerCtrl::setSpeakerOff(idx); - sSpeakerInfo[idx]._28 = 2; - sSpeakerInfo[idx]._2C = 0x14; - break; - case 2: - sSpeakerInfo[idx]._2C--; + case 0: + break; + case 1: + SpkSpeakerCtrl::setSpeakerOff(idx); + sSpeakerInfo[idx]._28 = 2; + sSpeakerInfo[idx]._2C = 0x14; + break; + case 2: + sSpeakerInfo[idx]._2C--; - if (sSpeakerInfo[idx]._2C <= 0) { - sSpeakerInfo[idx]._2C = -1; - sSpeakerInfo[idx]._28 = 3; - } - break; - case 3: - SpkSpeakerCtrl::setSpeakerOn(idx); - sSpeakerInfo[idx]._28 = 0; - break; + if (sSpeakerInfo[idx]._2C <= 0) { + sSpeakerInfo[idx]._2C = -1; + sSpeakerInfo[idx]._28 = 3; + } + break; + case 3: + SpkSpeakerCtrl::setSpeakerOn(idx); + sSpeakerInfo[idx]._28 = 0; + break; } } } @@ -172,7 +168,7 @@ void SpkSpeakerCtrl::continuousUsingProcess(s32 idx) { } } -void SpkSpeakerCtrl::updateSpeaker(OSAlarm *, OSContext *) { +void SpkSpeakerCtrl::updateSpeaker(OSAlarm*, OSContext*) { for (s32 i = 0; i < WPAD_MAX_CONTROLLERS; i++) { if (sMixingBuffer != nullptr) { SpeakerInfo& inf = getSpeakerInfo(i); @@ -186,24 +182,22 @@ void SpkSpeakerCtrl::updateSpeaker(OSAlarm *, OSContext *) { BOOL en = OSDisableInterrupts(); if (!WPADCanSendStreamData(i)) { - + OSRestoreInterrupts(en); - } - else { + } else { if (inf._22) { v5 = false; inf._22 = 0; } const s16* samples = sMixingBuffer->getSamples(i); - u8 data[16]; + u8 data[16]; WENCGetEncodeData(&inf._2, v5, samples, 40, data); WPADSendStreamData(i, data, 0x14); OSRestoreInterrupts(en); } } - } - else { + } else { inf._22 = 1; } } @@ -213,19 +207,15 @@ void SpkSpeakerCtrl::updateSpeaker(OSAlarm *, OSContext *) { } bool SpkSpeakerCtrl::isEnable(s32 idx) { - return WPADIsSpeakerEnabled(idx) - && sSpeakerInfo[idx]._1 != 0 - && sSpeakerInfo[idx]._24 == 0 - && sMixingBuffer != nullptr; + return WPADIsSpeakerEnabled(idx) && sSpeakerInfo[idx]._1 != 0 && sSpeakerInfo[idx]._24 == 0 && sMixingBuffer != nullptr; } void SpkSpeakerCtrl::extensionProcess(s32, s32) { - } f32 SpkSpeakerCtrl::getDeviceVolume(s32 channel) { if (channel >= WPAD_CHAN0 && !WPADIsSpeakerEnabled(channel)) { - return 0.0f; + return 0.0f; } return WPADGetSpeakerVolume() / 127.0f; diff --git a/src/Game/Speaker/SpkSystem.cpp b/src/Game/Speaker/SpkSystem.cpp index 5ac2a2d5f..0e5b8c4db 100644 --- a/src/Game/Speaker/SpkSystem.cpp +++ b/src/Game/Speaker/SpkSystem.cpp @@ -1,7 +1,8 @@ #include "Game/Speaker/SpkSystem.hpp" #include "Game/Speaker/SpkSpeakerCtrl.hpp" -SpkSystem::SpkSystem(JKRHeap *pHeap) : JASGlobalInstance(this) { +SpkSystem::SpkSystem(JKRHeap* pHeap) + : JASGlobalInstance(this) { mData = nullptr; if (!pHeap) { @@ -9,14 +10,14 @@ SpkSystem::SpkSystem(JKRHeap *pHeap) : JASGlobalInstance(this) { } mHeap = pHeap; - mMixBuffer = new(pHeap, 0) SpkMixingBuffer(pHeap); - mSoundHolder = new(pHeap, 0) SpkSoundHolder(); + mMixBuffer = new (pHeap, 0) SpkMixingBuffer(pHeap); + mSoundHolder = new (pHeap, 0) SpkSoundHolder(); SpkSpeakerCtrl::setup(); SpkSpeakerCtrl::setMixingBuffer(mMixBuffer); } -void SpkSystem::setResource(JKRArchive *pArchive, u16 a2, u16 a3) { - mData = new(mHeap, 0) SpkData(pArchive); +void SpkSystem::setResource(JKRArchive* pArchive, u16 a2, u16 a3) { + mData = new (mHeap, 0) SpkData(pArchive); mData->loadTable(a2); mData->loadWave(a3); } @@ -26,7 +27,7 @@ void SpkSystem::framework() { mSoundHolder->framework(); } -void SpkSystem::startSound(s32 a1, s32 a2, SpkSoundHandle *pHandle) { +void SpkSystem::startSound(s32 a1, s32 a2, SpkSoundHandle* pHandle) { mSoundHolder->startSound(a1, a2, pHandle); } @@ -47,8 +48,7 @@ void SpkSystem::reconnect(s32 chan) { for (int i = 0; i < 4; i++) { SpkSpeakerCtrl::reconnect(i); } - } - else { + } else { SpkSpeakerCtrl::reconnect(chan); } } diff --git a/src/Game/Speaker/SpkTable.cpp b/src/Game/Speaker/SpkTable.cpp index 8d49b4d13..dc68cdd46 100644 --- a/src/Game/Speaker/SpkTable.cpp +++ b/src/Game/Speaker/SpkTable.cpp @@ -4,5 +4,5 @@ SpkTable::SpkTable() { mInitialized = false; mResourceCount = 0; mEntryOffset = 0; - mDataOffsets = 0; + mDataOffsets = 0; } diff --git a/src/Game/Speaker/SpkWave.cpp b/src/Game/Speaker/SpkWave.cpp index 14ce002ee..9eeb95b2a 100644 --- a/src/Game/Speaker/SpkWave.cpp +++ b/src/Game/Speaker/SpkWave.cpp @@ -1,10 +1,8 @@ #include "Game/Speaker/SpkWave.hpp" #include -SpkWave::SpkWave() : - mResource(nullptr) -{ - +SpkWave::SpkWave() + : mResource(nullptr) { } void SpkWave::setResource(void* pResource) { diff --git a/src/Game/System/AlreadyDoneFlagInGalaxy.cpp b/src/Game/System/AlreadyDoneFlagInGalaxy.cpp index 83c267711..71687f9b2 100644 --- a/src/Game/System/AlreadyDoneFlagInGalaxy.cpp +++ b/src/Game/System/AlreadyDoneFlagInGalaxy.cpp @@ -8,7 +8,7 @@ AlreadyDoneInfo::AlreadyDoneInfo() { _2 = 0xFFFF; _4 = 0xFFFF; - clear(); + clear(); } void AlreadyDoneInfo::clear() { @@ -17,14 +17,14 @@ void AlreadyDoneInfo::clear() { _4 = 0xFFFF; } -void AlreadyDoneInfo::init(const char *pInfo, s32 a2, s32 a3) { +void AlreadyDoneInfo::init(const char* pInfo, s32 a2, s32 a3) { u32 val = MR::getHashCode(pInfo) & 0x7FFF; _2 = a2; _0 = val; - _4 = a3; + _4 = a3; } - -bool AlreadyDoneInfo::isEqual(const AlreadyDoneInfo &otherInfo) const { + +bool AlreadyDoneInfo::isEqual(const AlreadyDoneInfo& otherInfo) const { bool ret = 0; if ((otherInfo._0 & 0x7FFF) == (_0 & 0x7FFF)) { @@ -54,7 +54,7 @@ void AlreadyDoneFlagInGalaxy::clear() { } #ifdef NON_MATCHING -u32 AlreadyDoneFlagInGalaxy::setupFlag(const char *pName, const JMapInfoIter &rIter, u32 *a3) { +u32 AlreadyDoneFlagInGalaxy::setupFlag(const char* pName, const JMapInfoIter& rIter, u32* a3) { u32 result; s32 linkID = -1; @@ -71,14 +71,13 @@ u32 AlreadyDoneFlagInGalaxy::setupFlag(const char *pName, const JMapInfoIter &rI infs++; } - u32 v10 = _8; + u32 v10 = _8; AlreadyDoneInfo* new_infs = &mDoneInfos[v10]; if (infs != new_infs) { result = infs - mDoneInfos; *a3 = (infs->_0 >> 15) & 0x1; - } - else { + } else { result = _8; _8 = v10 + 1; new_infs->_0 = info._0; diff --git a/src/Game/System/ArchiveHolder.cpp b/src/Game/System/ArchiveHolder.cpp index 45ab3d816..eb71553c0 100644 --- a/src/Game/System/ArchiveHolder.cpp +++ b/src/Game/System/ArchiveHolder.cpp @@ -2,15 +2,15 @@ #include "Game/Util.hpp" #include -ArchiveHolderArchiveEntry::ArchiveHolderArchiveEntry(void *pData, JKRHeap *pHeap, const char *pName) { +ArchiveHolderArchiveEntry::ArchiveHolderArchiveEntry(void* pData, JKRHeap* pHeap, const char* pName) { mHeap = pHeap; mArchive = nullptr; mArchiveName = nullptr; - JKRMemArchive* archive = new(pHeap, 0) JKRMemArchive(); + JKRMemArchive* archive = new (pHeap, 0) JKRMemArchive(); archive->mountFixed(pData, JKR_MEM_BREAK_FLAG_0); mArchive = archive; - s32 len = strlen(pName) + 1; - char* name = new(pHeap, 0) char[len]; + s32 len = strlen(pName) + 1; + char* name = new (pHeap, 0) char[len]; mArchiveName = name; MR::copyString(mArchiveName, pName, len); } @@ -29,9 +29,9 @@ ArchiveHolder::ArchiveHolder() { OSInitMutex(&mMutex); } -ArchiveHolderArchiveEntry* ArchiveHolder::createAndAdd(void *pData, JKRHeap *pHeap, const char *pName) { - ArchiveHolderArchiveEntry* entry = new(pHeap, 0) ArchiveHolderArchiveEntry(pData, pHeap, pName); - OSMutex* mutex = &mMutex; +ArchiveHolderArchiveEntry* ArchiveHolder::createAndAdd(void* pData, JKRHeap* pHeap, const char* pName) { + ArchiveHolderArchiveEntry* entry = new (pHeap, 0) ArchiveHolderArchiveEntry(pData, pHeap, pName); + OSMutex* mutex = &mMutex; OSLockMutex(mutex); s32 num = mCurEntryNum; mCurEntryNum = num + 1; @@ -40,12 +40,12 @@ ArchiveHolderArchiveEntry* ArchiveHolder::createAndAdd(void *pData, JKRHeap *pHe return entry; } -JKRMemArchive* ArchiveHolder::getArchive(const char *pName) const { +JKRMemArchive* ArchiveHolder::getArchive(const char* pName) const { ArchiveHolderArchiveEntry* entry = findEntry(pName); return (entry != nullptr) ? entry->mArchive : nullptr; } -void ArchiveHolder::getArchiveAndHeap(const char *pName, JKRArchive** pArchive, JKRHeap** pHeap) const { +void ArchiveHolder::getArchiveAndHeap(const char* pName, JKRArchive** pArchive, JKRHeap** pHeap) const { ArchiveHolderArchiveEntry* entry = findEntry(pName); if (entry != nullptr) { @@ -56,7 +56,7 @@ void ArchiveHolder::getArchiveAndHeap(const char *pName, JKRArchive** pArchive, // void ArchiveHolder::removeIfIsEqualHeap(JKRHeap *pHeap) -ArchiveHolderArchiveEntry* ArchiveHolder::findEntry(const char *pName) const { +ArchiveHolderArchiveEntry* ArchiveHolder::findEntry(const char* pName) const { for (ArchiveHolderArchiveEntry** i = first(); i != last(); i++) { if (MR::isEqualStringCase((*i)->mArchiveName, pName)) { return *i; diff --git a/src/Game/System/BinaryDataChunkHolder.cpp b/src/Game/System/BinaryDataChunkHolder.cpp index dc34c88e9..0c3c65c17 100644 --- a/src/Game/System/BinaryDataChunkHolder.cpp +++ b/src/Game/System/BinaryDataChunkHolder.cpp @@ -1,6 +1,6 @@ #include "Game/System/BinaryDataChunkHolder.hpp" -void BinaryDataChunkHolder::addChunk(BinaryDataChunkBase *pChunk) { +void BinaryDataChunkHolder::addChunk(BinaryDataChunkBase* pChunk) { s32 numChunks = mNumChunks; mNumChunks = numChunks + 1; mChunks[numChunks] = pChunk; diff --git a/src/Game/System/ConfigDataHolder.cpp b/src/Game/System/ConfigDataHolder.cpp index abb765f35..be4b2b9ef 100644 --- a/src/Game/System/ConfigDataHolder.cpp +++ b/src/Game/System/ConfigDataHolder.cpp @@ -5,12 +5,11 @@ #include #include -ConfigDataHolder::ConfigDataHolder() : - mChunkHolder(nullptr), - mCreateChunk(nullptr), - mMii(nullptr), - mMisc(nullptr) -{ +ConfigDataHolder::ConfigDataHolder() + : mChunkHolder(nullptr), + mCreateChunk(nullptr), + mMii(nullptr), + mMisc(nullptr) { mChunkHolder = new BinaryDataChunkHolder(64, 3); mCreateChunk = new ConfigDataCreateChunk(); mMii = new ConfigDataMii(); @@ -91,9 +90,8 @@ bool ConfigDataHolder::loadFromFileBinary(const char* pName, const u8* pBuffer, return mChunkHolder->loadFromFileBinary(pBuffer, size); } -ConfigDataCreateChunk::ConfigDataCreateChunk() : - mIsCreated(false) -{ +ConfigDataCreateChunk::ConfigDataCreateChunk() + : mIsCreated(false) { initializeData(); } diff --git a/src/Game/System/ConfigDataMii.cpp b/src/Game/System/ConfigDataMii.cpp index f3642025f..f913a7f6e 100644 --- a/src/Game/System/ConfigDataMii.cpp +++ b/src/Game/System/ConfigDataMii.cpp @@ -14,11 +14,10 @@ #define ICON_ID_KINOPIO 4 #define ICON_ID_PEACH 5 -ConfigDataMii::ConfigDataMii() : - mFlag(0), - mIconId(ICON_ID_MARIO), - mMiiId(nullptr) -{ +ConfigDataMii::ConfigDataMii() + : mFlag(0), + mIconId(ICON_ID_MARIO), + mMiiId(nullptr) { mMiiId = new u8[sizeof(RFLCreateID)]; initializeData(); @@ -61,8 +60,7 @@ s32 ConfigDataMii::deserialize(const u8* pBuffer, u32 size) { if ((mFlag & FLAG_UNK1) != 0) { mIconId = ICON_ID_MII; } - } - else { + } else { stream.read(&mIconId, sizeof(mIconId)); } @@ -82,8 +80,7 @@ void ConfigDataMii::setMiiOrIconId(const void* pMiiId, const u32* pIconId) { mFlag |= FLAG_UNK2; mIconId = ICON_ID_MII; - } - else { + } else { MR::fillMemory(mMiiId, 0, sizeof(RFLCreateID)); mIconId = *pIconId; diff --git a/src/Game/System/ConfigDataMisc.cpp b/src/Game/System/ConfigDataMisc.cpp index 25907c2bc..cd85c12aa 100644 --- a/src/Game/System/ConfigDataMisc.cpp +++ b/src/Game/System/ConfigDataMisc.cpp @@ -2,14 +2,13 @@ #include #include -#define FLAG_LAST_LOADED_MARIO 0x1 -#define FLAG_COMPLETE_ENDING_MARIO 0x2 -#define FLAG_COMPLETE_ENDING_LUIGI 0x4 +#define FLAG_LAST_LOADED_MARIO 0x1 +#define FLAG_COMPLETE_ENDING_MARIO 0x2 +#define FLAG_COMPLETE_ENDING_LUIGI 0x4 -ConfigDataMisc::ConfigDataMisc() : - mFlag(FLAG_LAST_LOADED_MARIO), - mLastModified(0) -{ +ConfigDataMisc::ConfigDataMisc() + : mFlag(FLAG_LAST_LOADED_MARIO), + mLastModified(0) { initializeData(); } @@ -44,8 +43,7 @@ s32 ConfigDataMisc::deserialize(const u8* pBuffer, u32 size) { if (stream.getAvailable() == 0) { mLastModified = 0; - } - else { + } else { OSTime lastModified; stream.read(&lastModified, sizeof(lastModified)); mLastModified = lastModified; @@ -66,8 +64,7 @@ bool ConfigDataMisc::isLastLoadedMario() const { void ConfigDataMisc::setLastLoadedMario(bool lastLoadedMario) { if (lastLoadedMario) { mFlag |= FLAG_LAST_LOADED_MARIO; - } - else { + } else { mFlag &= ~FLAG_LAST_LOADED_MARIO; } } diff --git a/src/Game/System/DrawBufferGroup.cpp b/src/Game/System/DrawBufferGroup.cpp index 6ad779d0d..e449325e5 100644 --- a/src/Game/System/DrawBufferGroup.cpp +++ b/src/Game/System/DrawBufferGroup.cpp @@ -2,7 +2,8 @@ #include -DrawBufferGroup::DrawBufferGroup() : _0(), _C() { +DrawBufferGroup::DrawBufferGroup() + : _0(), _C() { mCount = 0; _1C = -1; _20 = -1; @@ -13,9 +14,9 @@ void DrawBufferGroup::init(s32 count) { _C.init(count); } -s32 DrawBufferGroup::registerDrawBuffer(LiveActor *pActor) { +s32 DrawBufferGroup::registerDrawBuffer(LiveActor* pActor) { const char* pModelName = MR::getModelResName(pActor); - s32 idx = findExecuterIndex(pModelName); + s32 idx = findExecuterIndex(pModelName); // executer does not exist if (idx < 0) { @@ -34,9 +35,9 @@ s32 DrawBufferGroup::registerDrawBuffer(LiveActor *pActor) { return idx; } -void DrawBufferGroup::active(LiveActor *pActor, s32 a2) { +void DrawBufferGroup::active(LiveActor* pActor, s32 a2) { DrawBufferExecuter* exec = _0[a2]; - bool isEmpty = !(exec->_8 != 0); + bool isEmpty = !(exec->_8 != 0); exec->add(pActor); if (isEmpty) { @@ -46,7 +47,7 @@ void DrawBufferGroup::active(LiveActor *pActor, s32 a2) { // DrawBufferGroup::deactive -void DrawBufferGroup::findLightInfo(LiveActor *pActor, s32 a2) { +void DrawBufferGroup::findLightInfo(LiveActor* pActor, s32 a2) { MR::initActorLightInfoLightType(pActor, _1C); _0[a2]->findLightInfo(pActor); @@ -62,7 +63,7 @@ void DrawBufferGroup::findLightInfo(LiveActor *pActor, s32 a2) { } #ifdef NON_MATCHING -// mem_fun doesn't get inlined...why? +// mem_fun doesn't get inlined...why? void DrawBufferGroup::entry() { for_each(_C.begin(), _C.end(), mem_fun(&DrawBufferExecuter::calcViewAndEntry)); } @@ -80,7 +81,7 @@ void DrawBufferGroup::setLightType(s32 type) { _20 = type; } -s32 DrawBufferGroup::findExecuterIndex(const char *pName) const { +s32 DrawBufferGroup::findExecuterIndex(const char* pName) const { for (u32 i = 0; i < _0.size(); i++) { if (MR::isEqualString(_0[i]->mName, pName)) { return i; diff --git a/src/Game/System/DrawSyncManager.cpp b/src/Game/System/DrawSyncManager.cpp index 08f9567e3..c25de8eab 100644 --- a/src/Game/System/DrawSyncManager.cpp +++ b/src/Game/System/DrawSyncManager.cpp @@ -47,7 +47,6 @@ u32 Fifo::getLoopIdx(u32 idx) { u32 Fifo::getCount() { if (mLoopIdx <= _C) { return _C - mLoopIdx; - } return _C + mCount + 1 - mLoopIdx; diff --git a/src/Game/System/FileHolder.cpp b/src/Game/System/FileHolder.cpp index fdb256c70..fb1f091dd 100644 --- a/src/Game/System/FileHolder.cpp +++ b/src/Game/System/FileHolder.cpp @@ -1,6 +1,6 @@ #include "Game/System/FileHolder.hpp" -FileHolderFileEntry::FileHolderFileEntry(const char *pName, JKRHeap *pHeap, void *pData) { +FileHolderFileEntry::FileHolderFileEntry(const char* pName, JKRHeap* pHeap, void* pData) { mEntryNum = DVDConvertPathToEntrynum(pName); mContext = 0; mHeap = pHeap; @@ -17,7 +17,7 @@ FileHolderFileEntry::FileHolderFileEntry(const char *pName, JKRHeap *pHeap, void FileHolderFileEntry::~FileHolderFileEntry() { if (mContextSet) { - if (mContext) { + if (mContext) { delete (u8*)mContext; } } @@ -31,7 +31,7 @@ void FileHolderFileEntry::waitReadDone() { } } -void FileHolderFileEntry::setContext(void *pData, JKRHeap *pHeap) { +void FileHolderFileEntry::setContext(void* pData, JKRHeap* pHeap) { mContext = pData; mHeap = pHeap; @@ -43,30 +43,29 @@ FileHolder::FileHolder() { mArray.init(0x180); } -FileHolderFileEntry* FileHolder::add(const char *pName, JKRHeap *pHeap, void *pData) { - FileHolderFileEntry* pEntry = new(pHeap, 0) FileHolderFileEntry(pName, pHeap, pData); +FileHolderFileEntry* FileHolder::add(const char* pName, JKRHeap* pHeap, void* pData) { + FileHolderFileEntry* pEntry = new (pHeap, 0) FileHolderFileEntry(pName, pHeap, pData); mArray.push_back(pEntry); return pEntry; } -bool FileHolder::isExist(const char *pFile) const { +bool FileHolder::isExist(const char* pFile) const { return findEntry(pFile); } -void* FileHolder::getContext(const char *pFile) const { +void* FileHolder::getContext(const char* pFile) const { return findEntry(pFile)->mContext; } // FileHolder::removeIfIsEqualHeap -FileHolderFileEntry** FileHolder::removeFile(const char *pFile) { +FileHolderFileEntry** FileHolder::removeFile(const char* pFile) { FileHolderFileEntry** p; - FileHolderFileEntry* pEntry = findEntry(pFile); + FileHolderFileEntry* pEntry = findEntry(pFile); for (p = mArray.begin(); p != mArray.end() && *p != pEntry; p++) { - } delete *p; @@ -74,7 +73,7 @@ FileHolderFileEntry** FileHolder::removeFile(const char *pFile) { return mArray.erase(p); } -FileHolderFileEntry* FileHolder::findEntry(const char *pFile) const { +FileHolderFileEntry* FileHolder::findEntry(const char* pFile) const { s32 entryNum = DVDConvertPathToEntrynum(pFile); for (FileHolderFileEntry* const* pEntry = mArray.begin(); pEntry != mArray.end(); pEntry++) { diff --git a/src/Game/System/FileLoader.cpp b/src/Game/System/FileLoader.cpp index 05f794891..ebd5e2f3b 100644 --- a/src/Game/System/FileLoader.cpp +++ b/src/Game/System/FileLoader.cpp @@ -18,7 +18,7 @@ FileLoader::FileLoader() { mRequestedFileCount = 0; } -void FileLoader::requestLoadToMainRAM(const char *pName, u8 *pData, JKRHeap* pHeap, JKRDvdRipper::EAllocDirection direction, bool jam) { +void FileLoader::requestLoadToMainRAM(const char* pName, u8* pData, JKRHeap* pHeap, JKRDvdRipper::EAllocDirection direction, bool jam) { if (isNeedToLoad(pName)) { if (pHeap == nullptr) { pHeap = MR::getCurrentHeap(); @@ -31,14 +31,13 @@ void FileLoader::requestLoadToMainRAM(const char *pName, u8 *pData, JKRHeap* pHe if (jam) { OSJamMessage(&mLoaderThread->mQueue, info, OS_MESSAGE_NOBLOCK); - } - else { + } else { OSSendMessage(&mLoaderThread->mQueue, info, OS_MESSAGE_NOBLOCK); } } } -void FileLoader::requestMountArchive(const char *pName, JKRHeap* pHeap, bool jam) { +void FileLoader::requestMountArchive(const char* pName, JKRHeap* pHeap, bool jam) { if (isNeedToLoad(pName)) { if (pHeap == nullptr) { pHeap = MR::getCurrentHeap(); @@ -51,22 +50,21 @@ void FileLoader::requestMountArchive(const char *pName, JKRHeap* pHeap, bool jam if (jam) { OSJamMessage(&mLoaderThread->mQueue, info, OS_MESSAGE_NOBLOCK); - } - else { + } else { OSSendMessage(&mLoaderThread->mQueue, info, OS_MESSAGE_NOBLOCK); } } } -bool FileLoader::isLoaded(const char *pName) const { +bool FileLoader::isLoaded(const char* pName) const { return mFileHolder->isExist(pName); } -bool FileLoader::isMountedArchive(const char *pName) const { +bool FileLoader::isMountedArchive(const char* pName) const { return mArchiveHolder->getArchive(pName) != nullptr; } -void* FileLoader::receiveFile(const char *pName) { +void* FileLoader::receiveFile(const char* pName) { const RequestFileInfo* info = getRequestFileInfoConst(pName); if (info != nullptr) { info->mFileEntry->waitReadDone(); @@ -75,7 +73,7 @@ void* FileLoader::receiveFile(const char *pName) { return mFileHolder->getContext(pName); } -JKRMemArchive* FileLoader::receiveArchive(const char *pName) { +JKRMemArchive* FileLoader::receiveArchive(const char* pName) { const RequestFileInfo* info = getRequestFileInfoConst(pName); if (info != nullptr) { info->mFileEntry->waitReadDone(); diff --git a/src/Game/System/FileLoaderThread.cpp b/src/Game/System/FileLoaderThread.cpp index c6f4d637d..98102a58c 100644 --- a/src/Game/System/FileLoaderThread.cpp +++ b/src/Game/System/FileLoaderThread.cpp @@ -2,7 +2,7 @@ #include "Game/System/FileRipper.hpp" namespace { - void* loadFileUsingRipper(RequestFileInfo *pInfo) { + void* loadFileUsingRipper(RequestFileInfo* pInfo) { s32 val = 0; if (pInfo->mRequestType != 1) { @@ -11,12 +11,10 @@ namespace { return FileRipper::loadToMainRAM(pInfo->mFileName, (u8*)pInfo->mFileEntry->mContext, true, pInfo->mFileEntry->mHeap, (FileRipper::AllocDirection)val); } -}; +}; // namespace -FileLoaderThread::FileLoaderThread(int priority, int msgCount, JKRHeap *pHeap) : - OSThreadWrapper(0x8000, msgCount, priority, pHeap) -{ - +FileLoaderThread::FileLoaderThread(int priority, int msgCount, JKRHeap* pHeap) + : OSThreadWrapper(0x8000, msgCount, priority, pHeap) { } void* FileLoaderThread::run() { @@ -39,7 +37,7 @@ void* FileLoaderThread::run() { } /* this function matches in other compiler versions */ -void FileLoaderThread::loadToMainRAM(RequestFileInfo *pInfo) { +void FileLoaderThread::loadToMainRAM(RequestFileInfo* pInfo) { pInfo->_88 = 1; void* data = ::loadFileUsingRipper(pInfo); pInfo->mFileEntry->setContext(data, pInfo->mFileEntry->mHeap); @@ -47,7 +45,7 @@ void FileLoaderThread::loadToMainRAM(RequestFileInfo *pInfo) { } /* same with this one */ -void FileLoaderThread::mountArchiveAndStartCreateResource(RequestFileInfo *pInfo) { +void FileLoaderThread::mountArchiveAndStartCreateResource(RequestFileInfo* pInfo) { pInfo->_88 = 1; void* data = ::loadFileUsingRipper(pInfo); MR::createAndAddArchive(data, pInfo->mFileEntry->mHeap, pInfo->mFileName); diff --git a/src/Game/System/FileRipper.cpp b/src/Game/System/FileRipper.cpp index 8d822bd90..980a79bed 100644 --- a/src/Game/System/FileRipper.cpp +++ b/src/Game/System/FileRipper.cpp @@ -6,21 +6,21 @@ namespace { OSMutex sDecompMutex; - u8 *sReadBuffer; - u8 *sReadBufferEnd; - u8 *sReadBufferLimit; - s32 sReadDvdOffset; - u32 sReadDvdLeftSize; - DVDFileInfo *sSrcFileInfo; -} + u8* sReadBuffer; + u8* sReadBufferEnd; + u8* sReadBufferLimit; + s32 sReadDvdOffset; + u32 sReadDvdLeftSize; + DVDFileInfo* sSrcFileInfo; +} // namespace -void FileRipper::setup(u32 size, JKRHeap *pHeap) { +void FileRipper::setup(u32 size, JKRHeap* pHeap) { sReadBuffer = new (pHeap, 0x40) u8[size]; sReadBufferEnd = sReadBuffer + size; OSInitMutex(&sDecompMutex); } -s32 FileRipper::checkCompressed(const u8 *pData) { +s32 FileRipper::checkCompressed(const u8* pData) { if (pData[0] == 'Y' && pData[1] == 'a' && pData[3] == '0') { if (pData[2] == 'y') { return 1; @@ -34,12 +34,12 @@ s32 FileRipper::checkCompressed(const u8 *pData) { return 0; } -void* FileRipper::loadToMainRAM(const char *fpath, u8 *dest, bool decompress, JKRHeap *pHeap, AllocDirection allocDir) { +void* FileRipper::loadToMainRAM(const char* fpath, u8* dest, bool decompress, JKRHeap* pHeap, AllocDirection allocDir) { bool alloced = false; - s32 compression = 0; - u8 *copySrc = 0; - u32 decompressedSize; - + s32 compression = 0; + u8* copySrc = 0; + u32 decompressedSize; + if (!MR::isFileExist(fpath, false)) { OSPanic(__FILE__, 0x70, "File isn't exist."); } @@ -53,13 +53,12 @@ void* FileRipper::loadToMainRAM(const char *fpath, u8 *dest, bool decompress, JK if (decompress) { u8 buf[0x60]; - copySrc = (u8 *)((u32)(buf + 0x3f) / 0x40 * 0x40); + copySrc = (u8*)((u32)(buf + 0x3f) / 0x40 * 0x40); while (true) { s32 result = DVDReadPrio(&fileInfo, copySrc, 0x20, 0, 2); if (result >= 0) { break; - } - else if (result == -3) { + } else if (result == -3) { return 0; } VIWaitForRetrace(); @@ -72,17 +71,16 @@ void* FileRipper::loadToMainRAM(const char *fpath, u8 *dest, bool decompress, JK if (decompress && compression) { if (!dest) { int align = allocDir == 0 ? 0x40 : -0x40; - dest = (u8 *)JKRHeap::alloc(decompressedSize, align, pHeap); + dest = (u8*)JKRHeap::alloc(decompressedSize, align, pHeap); alloced = true; } if (!dest) { return 0; } - } - else { + } else { if (!dest) { int align = allocDir == 0 ? 0x40 : -0x40; - dest = (u8 *)JKRHeap::alloc(fsize, align, pHeap); + dest = (u8*)JKRHeap::alloc(fsize, align, pHeap); alloced = true; } if (!dest) { @@ -117,8 +115,7 @@ void* FileRipper::loadToMainRAM(const char *fpath, u8 *dest, bool decompress, JK VIWaitForRetrace(); } return dest; - } - else if (compression == 2) { + } else if (compression == 2) { bool success = decompressFromDVD(&fileInfo, dest, fsize, decompressedSize, copySrc, copySrc ? 0x20 : 0); if (!success) { if (alloced) { @@ -127,8 +124,7 @@ void* FileRipper::loadToMainRAM(const char *fpath, u8 *dest, bool decompress, JK dest = 0; } return dest; - } - else { + } else { if (alloced) { JKRHeap::free(dest, 0); } @@ -137,36 +133,33 @@ void* FileRipper::loadToMainRAM(const char *fpath, u8 *dest, bool decompress, JK } bool FileRipper::decompressFromDVD( - DVDFileInfo *fileInfo, - void *dest, - u32 readSize, - u32 destSize, - const u8 *currentPos, - u32 copySize -) { + DVDFileInfo* fileInfo, + void* dest, + u32 readSize, + u32 destSize, + const u8* currentPos, + u32 copySize) { OSLockMutex(&sDecompMutex); - + sSrcFileInfo = fileInfo; sReadDvdOffset = 0; sReadDvdLeftSize = readSize; sReadBufferLimit = sReadBufferEnd - 0x19; - - u8 *buf; + + u8* buf; if (currentPos) { MR::copyMemory(sReadBufferEnd - copySize, currentPos, copySize); sReadDvdOffset += copySize; sReadDvdLeftSize -= copySize; buf = readSrcDataNext(sReadBufferEnd - copySize); - } - else { + } else { buf = readSrcDataFirst(); } bool result; if (buf) { - result = decompressSzsSub(buf, (u8 *)dest); - } - else { + result = decompressSzsSub(buf, (u8*)dest); + } else { result = false; } @@ -176,17 +169,17 @@ bool FileRipper::decompressFromDVD( return result; } -bool FileRipper::decompressSzsSub(u8 *src, u8 *dest) { - u8 *copy_src; +bool FileRipper::decompressSzsSub(u8* src, u8* dest) { + u8* copy_src; u32 group_count = 0; u32 group_head = 0; - + if (src[0] != 'Y' || src[1] != 'a' || src[2] != 'z' || src[3] != '0') { return false; } - - u32 data_len = *(u32 *)(src + 4); - u8 *dest_end = dest + data_len; + + u32 data_len = *(u32*)(src + 4); + u8* dest_end = dest + data_len; src += 0x10; do { @@ -207,8 +200,7 @@ bool FileRipper::decompressSzsSub(u8 *src, u8 *dest) { if (dest == dest_end) { break; } - } - else { + } else { u8 b1 = *src++; u8 b2 = *src++; @@ -219,8 +211,7 @@ bool FileRipper::decompressSzsSub(u8 *src, u8 *dest) { u32 copy_len = b1 >> 4; if (copy_len == 0) { copy_len = *src++ + 0x12; - } - else { + } else { copy_len += 2; } do { @@ -235,22 +226,21 @@ bool FileRipper::decompressSzsSub(u8 *src, u8 *dest) { group_head <<= 1; --group_count; } while (dest < dest_end); - + return true; } u8* FileRipper::readSrcDataFirst() { - u8 *readBuf = sReadBuffer; + u8* readBuf = sReadBuffer; u32 readSize = sReadBufferEnd - sReadBuffer; if (sReadDvdLeftSize < readSize) { readSize = sReadDvdLeftSize; } - while(true) { + while (true) { s32 result = DVDReadPrio(sSrcFileInfo, readBuf, readSize, sReadDvdOffset, 2); if (result >= 0) { break; - } - else if (result == -3) { + } else if (result == -3) { return 0; } VIWaitForRetrace(); @@ -261,27 +251,25 @@ u8* FileRipper::readSrcDataFirst() { return readBuf; } -u8* FileRipper::readSrcDataNext(u8 *buf) { +u8* FileRipper::readSrcDataNext(u8* buf) { u32 size = sReadBufferEnd - buf; - u8 *start; + u8* start; if ((size & 0x1f) != 0) { start = sReadBuffer + 0x20 - (size & 0x1f); - } - else { + } else { start = sReadBuffer; } MR::copyMemory(start, buf, size); - u8 *readBuf = start + size; + u8* readBuf = start + size; u32 readSize = sReadBufferEnd - readBuf; if (sReadDvdLeftSize < readSize) { readSize = sReadDvdLeftSize; } - while(true) { + while (true) { s32 result = DVDReadPrio(sSrcFileInfo, readBuf, readSize, sReadDvdOffset, 2); if (result >= 0) { break; - } - else if (result == -3) { + } else if (result == -3) { return 0; } VIWaitForRetrace(); diff --git a/src/Game/System/FindingLuigiEventScheduler.cpp b/src/Game/System/FindingLuigiEventScheduler.cpp index 7a8d74430..52de4f2dd 100644 --- a/src/Game/System/FindingLuigiEventScheduler.cpp +++ b/src/Game/System/FindingLuigiEventScheduler.cpp @@ -24,220 +24,211 @@ #define STATE_HIDING 0xff03 #define STATE_END 0xff04 -FindingLuigiEventScheduler::FindingLuigiEventScheduler() : - mLuigiLostStageName(nullptr), - mLuigiLostStarID(-1), - mLuigiMailDirector(nullptr) -{} +FindingLuigiEventScheduler::FindingLuigiEventScheduler() + : mLuigiLostStageName(nullptr), + mLuigiLostStarID(-1), + mLuigiMailDirector(nullptr) {} void FindingLuigiEventScheduler::initAfterResourceLoaded() { - mLuigiMailDirector = new LuigiMailDirector(); - mLuigiMailDirector->initAfterResourceLoaded(); + mLuigiMailDirector = new LuigiMailDirector(); + mLuigiMailDirector->initAfterResourceLoaded(); } void FindingLuigiEventScheduler::setStateHiding() { - GameDataFunction::setGameEventValue("LuigiEventState", STATE_HIDING); - getHidingGalaxyNameAndStarId(&mLuigiLostStageName, &mLuigiLostStarID); + GameDataFunction::setGameEventValue("LuigiEventState", STATE_HIDING); + getHidingGalaxyNameAndStarId(&mLuigiLostStageName, &mLuigiLostStarID); } -void FindingLuigiEventScheduler::getHidingGalaxyNameAndStarId(const char **pStageName, s32 *pStarID) const { - char printBuffer[25] = "SpecialStarFindingLuigi1"; - s32 index = 1; +void FindingLuigiEventScheduler::getHidingGalaxyNameAndStarId(const char** pStageName, s32* pStarID) const { + char printBuffer[25] = "SpecialStarFindingLuigi1"; + s32 index = 1; - do { - snprintf(printBuffer, 0x19, "SpecialStarFindingLuigi%1d", index); - if (!GameDataFunction::isOnGameEventFlag(printBuffer)) { - // found event flag that is not completed - GameEventFlagAccessor accessor = GameEventFlagTable::makeAccessor(printBuffer); - *pStageName = accessor.getGalaxyName(); - *pStarID = accessor.getStarId(); - return; - } - } while (++index <= 3); - - // all events completed - *pStageName = nullptr; - *pStarID = -1; -} + do { + snprintf(printBuffer, 0x19, "SpecialStarFindingLuigi%1d", index); + if (!GameDataFunction::isOnGameEventFlag(printBuffer)) { + // found event flag that is not completed + GameEventFlagAccessor accessor = GameEventFlagTable::makeAccessor(printBuffer); + *pStageName = accessor.getGalaxyName(); + *pStarID = accessor.getStarId(); + return; + } + } while (++index <= 3); + + // all events completed + *pStageName = nullptr; + *pStarID = -1; +} bool FindingLuigiEventScheduler::isActive() const { - bool luigiIsActive = (GameDataFunction::getGameEventValue("LuigiEventState") & 0xffff) != STATE_NULL; - if (luigiIsActive) { - // If luigi not in null state, return if luigi is not rescued - luigiIsActive = (GameDataFunction::getGameEventValue("LuigiEventState") & 0xffff) != STATE_RESCUED; - } - return luigiIsActive; + bool luigiIsActive = (GameDataFunction::getGameEventValue("LuigiEventState") & 0xffff) != STATE_NULL; + if (luigiIsActive) { + // If luigi not in null state, return if luigi is not rescued + luigiIsActive = (GameDataFunction::getGameEventValue("LuigiEventState") & 0xffff) != STATE_RESCUED; + } + return luigiIsActive; } -bool FindingLuigiEventScheduler::isDisappear() const { - // return if luigi is in the "Disappear"/"Lost" state - return (GameDataFunction::getGameEventValue("LuigiEventState") & 0xffff) == STATE_DISAPPEAR; +bool FindingLuigiEventScheduler::isDisappear() const { + // return if luigi is in the "Disappear"/"Lost" state + return (GameDataFunction::getGameEventValue("LuigiEventState") & 0xffff) == STATE_DISAPPEAR; } bool FindingLuigiEventScheduler::isHiding() const { - // return if luigi is in the "Hiding" state (after getting the letter) - return (GameDataFunction::getGameEventValue("LuigiEventState") & 0xffff) == STATE_HIDING; + // return if luigi is in the "Hiding" state (after getting the letter) + return (GameDataFunction::getGameEventValue("LuigiEventState") & 0xffff) == STATE_HIDING; } bool FindingLuigiEventScheduler::isEnd() const { - // return if all luigi is in state where all luigi stars have been completed - return (GameDataFunction::getGameEventValue("LuigiEventState") & 0xffff) == STATE_END; + // return if all luigi is in state where all luigi stars have been completed + return (GameDataFunction::getGameEventValue("LuigiEventState") & 0xffff) == STATE_END; } void FindingLuigiEventScheduler::sendMail() { - mLuigiMailDirector->sendMail(); + mLuigiMailDirector->sendMail(); } void FindingLuigiEventScheduler::writeSendSize() { - mLuigiMailDirector->writeSendSize(); + mLuigiMailDirector->writeSendSize(); } void FindingLuigiEventScheduler::clearLostAndFoundCount() { - if (mLuigiMailDirector != nullptr) { - mLuigiMailDirector->reset(); - } + if (mLuigiMailDirector != nullptr) { + mLuigiMailDirector->reset(); + } } void FindingLuigiEventScheduler::syncWithGameEventFlag() { - u32 eventValue = GameDataFunction::getGameEventValue("LuigiEventState"); - if ((eventValue & 0xffff) == STATE_HIDING) { - GameDataFunction::setGameEventValue("LuigiEventState", STATE_HIDING); - getHidingGalaxyNameAndStarId(&mLuigiLostStageName, &mLuigiLostStarID); - } + u32 eventValue = GameDataFunction::getGameEventValue("LuigiEventState"); + if ((eventValue & 0xffff) == STATE_HIDING) { + GameDataFunction::setGameEventValue("LuigiEventState", STATE_HIDING); + getHidingGalaxyNameAndStarId(&mLuigiLostStageName, &mLuigiLostStarID); + } } s32 FindingLuigiEventScheduler::calcPowerStarIndexLuigiHas() const { - - if (!GameDataFunction::isOnGameEventFlag("SpecialStarLuigiRescued")) { - return 0; - } - - char printBuffer[25] = "SpecialStarFindingLuigi1"; - s32 index = 1; - do { - snprintf(printBuffer, 0x19, "SpecialStarFindingLuigi%1d", index); - if (!GameDataFunction::isOnGameEventFlag(printBuffer)) { - return index; - } - } while (++index <= 3); - - // all events completed - return 4; + if (!GameDataFunction::isOnGameEventFlag("SpecialStarLuigiRescued")) { + return 0; + } + + char printBuffer[25] = "SpecialStarFindingLuigi1"; + s32 index = 1; + + do { + snprintf(printBuffer, 0x19, "SpecialStarFindingLuigi%1d", index); + if (!GameDataFunction::isOnGameEventFlag(printBuffer)) { + return index; + } + } while (++index <= 3); + + // all events completed + return 4; } bool FindingLuigiEventScheduler::isState(u32 state) const { - u32 luigiEventState; - if (state == 0) { - // check if in countdown state - luigiEventState = GameDataFunction::getGameEventValue("LuigiEventState"); - return (luigiEventState & 0xffff) <= 5; - } - else { - // check if state matches value exactly - luigiEventState = GameDataFunction::getGameEventValue("LuigiEventState"); - return state == (luigiEventState & 0xffff); - } + u32 luigiEventState; + if (state == 0) { + // check if in countdown state + luigiEventState = GameDataFunction::getGameEventValue("LuigiEventState"); + return (luigiEventState & 0xffff) <= 5; + } else { + // check if state matches value exactly + luigiEventState = GameDataFunction::getGameEventValue("LuigiEventState"); + return state == (luigiEventState & 0xffff); + } } -void FindingLuigiEventScheduler::setStateReturnAstroGalaxy(int event) -{ - if (GameDataFunction::calcCurrentPowerStarNum() > 108) { - // safeguard if above 109 stars, force luigi to get lost - mLuigiMailDirector->lost(); - GameDataFunction::setGameEventValue("LuigiEventState", STATE_DISAPPEAR); - } - else { - // if before the 109 star safeguard, set countdown state normally - GameDataFunction::setGameEventValue("LuigiEventState", event); - } - return; +void FindingLuigiEventScheduler::setStateReturnAstroGalaxy(int event) { + if (GameDataFunction::calcCurrentPowerStarNum() > 108) { + // safeguard if above 109 stars, force luigi to get lost + mLuigiMailDirector->lost(); + GameDataFunction::setGameEventValue("LuigiEventState", STATE_DISAPPEAR); + } else { + // if before the 109 star safeguard, set countdown state normally + GameDataFunction::setGameEventValue("LuigiEventState", event); + } + return; } -void FindingLuigiEventScheduler::update(const GalaxyMoveArgument& rMoveArg) -{ - switch (rMoveArg.mMoveType) { - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - break; - case 6: - // On Normal Level Load - syncWithGameEventFlag(); - mLuigiMailDirector->reset(); - break; - case 7: - // On Title Screen - GameDataFunction::setGameEventValue("LuigiEventState", STATE_NULL); - break; - default: - break; - } +void FindingLuigiEventScheduler::update(const GalaxyMoveArgument& rMoveArg) { + switch (rMoveArg.mMoveType) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + break; + case 6: + // On Normal Level Load + syncWithGameEventFlag(); + mLuigiMailDirector->reset(); + break; + case 7: + // On Title Screen + GameDataFunction::setGameEventValue("LuigiEventState", STATE_NULL); + break; + default: + break; + } } -void FindingLuigiEventScheduler::updateOnStageResult(const char *pClearedStageName, s32 clearedStarID) -{ - u32 luigiEventState = GameDataFunction::getGameEventValue("LuigiEventState"); - if ((luigiEventState & 0xffff) == STATE_NULL && - GameDataFunction::isOnGameEventFlag("SpecialStarLuigiRescued")) { - // if luigi in null state but has been rescued from Ghostly Galaxy - // force into rescued state by default - GameDataFunction::setGameEventValue("LuigiEventState", STATE_RESCUED); - } - else { +void FindingLuigiEventScheduler::updateOnStageResult(const char* pClearedStageName, s32 clearedStarID) { + u32 luigiEventState = GameDataFunction::getGameEventValue("LuigiEventState"); + if ((luigiEventState & 0xffff) == STATE_NULL && + GameDataFunction::isOnGameEventFlag("SpecialStarLuigiRescued")) { + // if luigi in null state but has been rescued from Ghostly Galaxy + // force into rescued state by default + GameDataFunction::setGameEventValue("LuigiEventState", STATE_RESCUED); + } else { - luigiEventState = GameDataFunction::getGameEventValue("LuigiEventState"); - if ((luigiEventState & 0xffff) == STATE_RESCUED) { - if (!GameSequenceFunction::hasPowerStarYetAtResultSequence()) { - // if new star collected while luigi is in rescued state - if (GameDataFunction::calcCurrentPowerStarNum() > 108 || - GameDataFunction::isOnGameEventFlag("LuigiTalkAfterRescued")) { - // if number of stars safeguard passed or eventflag open - // of speaking to luigi in garage after rescued from ghostly galaxy - // force luigi to lost state - mLuigiMailDirector->lost(); - GameDataFunction::setGameEventValue("LuigiEventState", STATE_DISAPPEAR); - return; - } - } - } + luigiEventState = GameDataFunction::getGameEventValue("LuigiEventState"); + if ((luigiEventState & 0xffff) == STATE_RESCUED) { + if (!GameSequenceFunction::hasPowerStarYetAtResultSequence()) { + // if new star collected while luigi is in rescued state + if (GameDataFunction::calcCurrentPowerStarNum() > 108 || + GameDataFunction::isOnGameEventFlag("LuigiTalkAfterRescued")) { + // if number of stars safeguard passed or eventflag open + // of speaking to luigi in garage after rescued from ghostly galaxy + // force luigi to lost state + mLuigiMailDirector->lost(); + GameDataFunction::setGameEventValue("LuigiEventState", STATE_DISAPPEAR); + return; + } + } + } - luigiEventState = GameDataFunction::getGameEventValue("LuigiEventState"); - if ((luigiEventState & 0xffff) == STATE_HIDING && - MR::isEqualString(mLuigiLostStageName, pClearedStageName) && - mLuigiLostStarID == clearedStarID) { - // if Luigi was hiding and just rescued him - mLuigiMailDirector->found(); - if (calcPowerStarIndexLuigiHas() == 4) { - // if got all luigi stars, set luigi to "completed" state - GameDataFunction::setGameEventValue("LuigiEventState", STATE_END); - } - else { - // set countdown for 5 stars - setStateReturnAstroGalaxy(5); - } - return; - } + luigiEventState = GameDataFunction::getGameEventValue("LuigiEventState"); + if ((luigiEventState & 0xffff) == STATE_HIDING && + MR::isEqualString(mLuigiLostStageName, pClearedStageName) && + mLuigiLostStarID == clearedStarID) { + // if Luigi was hiding and just rescued him + mLuigiMailDirector->found(); + if (calcPowerStarIndexLuigiHas() == 4) { + // if got all luigi stars, set luigi to "completed" state + GameDataFunction::setGameEventValue("LuigiEventState", STATE_END); + } else { + // set countdown for 5 stars + setStateReturnAstroGalaxy(5); + } + return; + } - if (isState(0)) { - // if in countdown state - luigiEventState = GameDataFunction::getGameEventValue("LuigiEventState"); - u32 countdown = luigiEventState & 0xffff; - - if (countdown != 0 && --countdown == 0) { - // if just counted down to 0 - // set luigi to lost state - mLuigiMailDirector->lost(); - GameDataFunction::setGameEventValue("LuigiEventState", STATE_DISAPPEAR); - } - else { - // if countdown was already 0, or countdown not hit 0 yet, - // try to return normally (w/ 108 star check), and count down - setStateReturnAstroGalaxy(countdown); - } - } - } + if (isState(0)) { + // if in countdown state + luigiEventState = GameDataFunction::getGameEventValue("LuigiEventState"); + u32 countdown = luigiEventState & 0xffff; + + if (countdown != 0 && --countdown == 0) { + // if just counted down to 0 + // set luigi to lost state + mLuigiMailDirector->lost(); + GameDataFunction::setGameEventValue("LuigiEventState", STATE_DISAPPEAR); + } else { + // if countdown was already 0, or countdown not hit 0 yet, + // try to return normally (w/ 108 star check), and count down + setStateReturnAstroGalaxy(countdown); + } + } + } } diff --git a/src/Game/System/FunctionAsyncExecutor.cpp b/src/Game/System/FunctionAsyncExecutor.cpp index 3efa6d2d6..f170f517c 100644 --- a/src/Game/System/FunctionAsyncExecutor.cpp +++ b/src/Game/System/FunctionAsyncExecutor.cpp @@ -4,12 +4,11 @@ #include #include -FunctionAsyncExecInfo::FunctionAsyncExecInfo(MR::FunctorBase *pFunc, int priority, const char *pName) : - mFunc(pFunc), - mPriority(priority), - mName(pName), - mIsEnd(false) -{ +FunctionAsyncExecInfo::FunctionAsyncExecInfo(MR::FunctorBase* pFunc, int priority, const char* pName) + : mFunc(pFunc), + mPriority(priority), + mName(pName), + mIsEnd(false) { OSInitMessageQueue(&mQueue, &mMessage, 1); } @@ -18,7 +17,7 @@ FunctionAsyncExecInfo::~FunctionAsyncExecInfo() { } void FunctionAsyncExecInfo::execute() { - OSThread* pThread = OSGetCurrentThread(); + OSThread* pThread = OSGetCurrentThread(); OSPriority priorityPrev = OSGetThreadPriority(pThread); OSSetThreadPriority(pThread, mPriority); @@ -26,11 +25,10 @@ void FunctionAsyncExecInfo::execute() { OSSetThreadPriority(pThread, priorityPrev); } -FunctionAsyncExecutorThread::FunctionAsyncExecutorThread(JKRHeap *pHeap) : - OSThreadWrapper(0x10000, 4, 1, pHeap), - mIsSuspended(false), - mName(nullptr) -{ +FunctionAsyncExecutorThread::FunctionAsyncExecutorThread(JKRHeap* pHeap) + : OSThreadWrapper(0x10000, 4, 1, pHeap), + mIsSuspended(false), + mName(nullptr) { } void* FunctionAsyncExecutorThread::run() { @@ -52,15 +50,14 @@ void* FunctionAsyncExecutorThread::run() { } } -FunctionAsyncExecutorOnMainThread::FunctionAsyncExecutorOnMainThread(OSThread* pThread) : - mThread(pThread), - _0(false) -{ +FunctionAsyncExecutorOnMainThread::FunctionAsyncExecutorOnMainThread(OSThread* pThread) + : mThread(pThread), + _0(false) { OSInitMessageQueue(&mQueue, mMsgArray, sizeof(mMsgArray) / sizeof(*mMsgArray)); } void FunctionAsyncExecutorOnMainThread::update() { - OSMessage msg; + OSMessage msg; FunctionAsyncExecInfo* info; if (OSReceiveMessage(&mQueue, &msg, OS_MESSAGE_NOBLOCK)) { @@ -76,12 +73,11 @@ void FunctionAsyncExecutorOnMainThread::update() { } } -FunctionAsyncExecutor::FunctionAsyncExecutor() : - mMainThreadExec(nullptr), - mHolders(), - _410(nullptr), - _414(nullptr) -{ +FunctionAsyncExecutor::FunctionAsyncExecutor() + : mMainThreadExec(nullptr), + mHolders(), + _410(nullptr), + _414(nullptr) { s32 size = sizeof(mThreads) / sizeof(*mThreads); for (s32 i = 0; i < size; i++) { @@ -99,30 +95,29 @@ void FunctionAsyncExecutor::update() { mMainThreadExec->update(); } -void FunctionAsyncExecutor::start(const MR::FunctorBase &rFunc, int priority, const char *pName) { - FunctionAsyncExecInfo* info = createAndAddExecInfo(rFunc, priority, pName); +void FunctionAsyncExecutor::start(const MR::FunctorBase& rFunc, int priority, const char* pName) { + FunctionAsyncExecInfo* info = createAndAddExecInfo(rFunc, priority, pName); FunctionAsyncExecutorThread* thread = getSuspendThread(); OSSendMessage(&thread->mQueue, info, OS_MESSAGE_NOBLOCK); } -bool FunctionAsyncExecutor::startOnMainThread(const MR::FunctorBase &rFunc, const char *pName) { +bool FunctionAsyncExecutor::startOnMainThread(const MR::FunctorBase& rFunc, const char* pName) { FunctionAsyncExecutorOnMainThread* thread = mMainThreadExec; - bool isSameThread = OSGetCurrentThread() == thread->mThread; + bool isSameThread = OSGetCurrentThread() == thread->mThread; if (isSameThread) { rFunc(); return false; - } - else { + } else { FunctionAsyncExecInfo* info = createAndAddExecInfo(rFunc, 0, pName); OSSendMessage(&mMainThreadExec->mQueue, info, OS_MESSAGE_NOBLOCK); return true; } } -void FunctionAsyncExecutor::waitForEnd(const char *pName) { +void FunctionAsyncExecutor::waitForEnd(const char* pName) { OSLockMutex(&MR::MutexHolder<2>::sMutex); - FunctionAsyncExecInfo** cur = mHolders.begin(); + FunctionAsyncExecInfo** cur = mHolders.begin(); FunctionAsyncExecInfo* const* lst = mHolders.end(); while (cur != lst && !(*cur)->isSame(pName)) { @@ -153,7 +148,7 @@ void FunctionAsyncExecutor::waitForEnd(const char *pName) { } /* this matches but on a different compiler version */ -bool FunctionAsyncExecutor::isEnd(const char *pName) const { +bool FunctionAsyncExecutor::isEnd(const char* pName) const { OSLockMutex(&MR::MutexHolder<2>::sMutex); FunctionAsyncExecInfo* const* cur = mHolders.begin(); FunctionAsyncExecInfo* const* lst = mHolders.end(); @@ -167,7 +162,7 @@ bool FunctionAsyncExecutor::isEnd(const char *pName) const { return info->mIsEnd; } -OSThread* FunctionAsyncExecutor::getOSThread(const char *pName) { +OSThread* FunctionAsyncExecutor::getOSThread(const char* pName) { s32 size = sizeof(mThreads) / sizeof(*mThreads); for (s32 i = 0; i < size; i++) { @@ -181,9 +176,9 @@ OSThread* FunctionAsyncExecutor::getOSThread(const char *pName) { return nullptr; } -FunctionAsyncExecInfo* FunctionAsyncExecutor::createAndAddExecInfo(const MR::FunctorBase &rFunc, int priority, const char *pName) { - MR::FunctorBase* func = rFunc.clone(_414); - FunctionAsyncExecInfo* info = new(_410, 0) FunctionAsyncExecInfo(func, priority, pName); +FunctionAsyncExecInfo* FunctionAsyncExecutor::createAndAddExecInfo(const MR::FunctorBase& rFunc, int priority, const char* pName) { + MR::FunctorBase* func = rFunc.clone(_414); + FunctionAsyncExecInfo* info = new (_410, 0) FunctionAsyncExecInfo(func, priority, pName); OSLockMutex(&MR::MutexHolder<2>::sMutex); mHolders.push_back(info); diff --git a/src/Game/System/GalaxyCometScheduler.cpp b/src/Game/System/GalaxyCometScheduler.cpp index 89a33c08a..53010aaa6 100644 --- a/src/Game/System/GalaxyCometScheduler.cpp +++ b/src/Game/System/GalaxyCometScheduler.cpp @@ -5,154 +5,154 @@ #include "Game/System/GameDataFunction.hpp" #include "Game/System/GalaxyStatusAccessor.hpp" -#define COMET_CATEGORY_NORMAL 0 +#define COMET_CATEGORY_NORMAL 0 #define COMET_CATEGORY_COIN_100 1 const GalaxyCometTimePaper sCometTimeTableGrandGalaxy1[] = { - { "EggStarGalaxy", COMET_CATEGORY_NORMAL }, - { "HoneyBeeKingdomGalaxy", COMET_CATEGORY_NORMAL }, - { "HoneyBeeKingdomGalaxy", COMET_CATEGORY_COIN_100 }, - { "EggStarGalaxy", COMET_CATEGORY_COIN_100 }, - { "EggStarGalaxy", COMET_CATEGORY_NORMAL }, - { "HoneyBeeKingdomGalaxy", COMET_CATEGORY_NORMAL }, - { "EggStarGalaxy", COMET_CATEGORY_COIN_100 }, - { "HoneyBeeKingdomGalaxy", COMET_CATEGORY_COIN_100 }, - { "EggStarGalaxy", COMET_CATEGORY_NORMAL }, - { "HoneyBeeKingdomGalaxy", COMET_CATEGORY_COIN_100 }, - { "EggStarGalaxy", COMET_CATEGORY_COIN_100 }, - { "HoneyBeeKingdomGalaxy", COMET_CATEGORY_NORMAL }, - { "HoneyBeeKingdomGalaxy", COMET_CATEGORY_NORMAL }, - { "EggStarGalaxy", COMET_CATEGORY_NORMAL }, - { "HoneyBeeKingdomGalaxy", COMET_CATEGORY_COIN_100 }, - { "EggStarGalaxy", COMET_CATEGORY_COIN_100 }, - { nullptr, 0 }, + {"EggStarGalaxy", COMET_CATEGORY_NORMAL}, + {"HoneyBeeKingdomGalaxy", COMET_CATEGORY_NORMAL}, + {"HoneyBeeKingdomGalaxy", COMET_CATEGORY_COIN_100}, + {"EggStarGalaxy", COMET_CATEGORY_COIN_100}, + {"EggStarGalaxy", COMET_CATEGORY_NORMAL}, + {"HoneyBeeKingdomGalaxy", COMET_CATEGORY_NORMAL}, + {"EggStarGalaxy", COMET_CATEGORY_COIN_100}, + {"HoneyBeeKingdomGalaxy", COMET_CATEGORY_COIN_100}, + {"EggStarGalaxy", COMET_CATEGORY_NORMAL}, + {"HoneyBeeKingdomGalaxy", COMET_CATEGORY_COIN_100}, + {"EggStarGalaxy", COMET_CATEGORY_COIN_100}, + {"HoneyBeeKingdomGalaxy", COMET_CATEGORY_NORMAL}, + {"HoneyBeeKingdomGalaxy", COMET_CATEGORY_NORMAL}, + {"EggStarGalaxy", COMET_CATEGORY_NORMAL}, + {"HoneyBeeKingdomGalaxy", COMET_CATEGORY_COIN_100}, + {"EggStarGalaxy", COMET_CATEGORY_COIN_100}, + {nullptr, 0}, }; const GalaxyCometTimePaper sCometTimeTableGrandGalaxy2[] = { - { "StarDustGalaxy", COMET_CATEGORY_NORMAL }, - { "StarDustGalaxy", COMET_CATEGORY_COIN_100 }, - { "BattleShipGalaxy", COMET_CATEGORY_NORMAL }, - { "BattleShipGalaxy", COMET_CATEGORY_COIN_100 }, - { "StarDustGalaxy", COMET_CATEGORY_COIN_100 }, - { "BattleShipGalaxy", COMET_CATEGORY_NORMAL }, - { "StarDustGalaxy", COMET_CATEGORY_NORMAL }, - { "BattleShipGalaxy", COMET_CATEGORY_COIN_100 }, - { "StarDustGalaxy", COMET_CATEGORY_NORMAL }, - { "StarDustGalaxy", COMET_CATEGORY_COIN_100 }, - { "BattleShipGalaxy", COMET_CATEGORY_NORMAL }, - { "BattleShipGalaxy", COMET_CATEGORY_COIN_100 }, - { "StarDustGalaxy", COMET_CATEGORY_NORMAL }, - { "BattleShipGalaxy", COMET_CATEGORY_NORMAL }, - { "StarDustGalaxy", COMET_CATEGORY_COIN_100 }, - { "BattleShipGalaxy", COMET_CATEGORY_COIN_100 }, - { nullptr, 0 }, + {"StarDustGalaxy", COMET_CATEGORY_NORMAL}, + {"StarDustGalaxy", COMET_CATEGORY_COIN_100}, + {"BattleShipGalaxy", COMET_CATEGORY_NORMAL}, + {"BattleShipGalaxy", COMET_CATEGORY_COIN_100}, + {"StarDustGalaxy", COMET_CATEGORY_COIN_100}, + {"BattleShipGalaxy", COMET_CATEGORY_NORMAL}, + {"StarDustGalaxy", COMET_CATEGORY_NORMAL}, + {"BattleShipGalaxy", COMET_CATEGORY_COIN_100}, + {"StarDustGalaxy", COMET_CATEGORY_NORMAL}, + {"StarDustGalaxy", COMET_CATEGORY_COIN_100}, + {"BattleShipGalaxy", COMET_CATEGORY_NORMAL}, + {"BattleShipGalaxy", COMET_CATEGORY_COIN_100}, + {"StarDustGalaxy", COMET_CATEGORY_NORMAL}, + {"BattleShipGalaxy", COMET_CATEGORY_NORMAL}, + {"StarDustGalaxy", COMET_CATEGORY_COIN_100}, + {"BattleShipGalaxy", COMET_CATEGORY_COIN_100}, + {nullptr, 0}, }; const GalaxyCometTimePaper sCometTimeTableGrandGalaxy3[] = { - { "PhantomGalaxy", COMET_CATEGORY_NORMAL }, - { "HeavenlyBeachGalaxy", COMET_CATEGORY_NORMAL }, - { "PhantomGalaxy", COMET_CATEGORY_COIN_100 }, - { "HeavenlyBeachGalaxy", COMET_CATEGORY_COIN_100 }, - { "HeavenlyBeachGalaxy", COMET_CATEGORY_NORMAL }, - { "PhantomGalaxy", COMET_CATEGORY_COIN_100 }, - { "HeavenlyBeachGalaxy", COMET_CATEGORY_COIN_100 }, - { "PhantomGalaxy", COMET_CATEGORY_NORMAL }, - { "HeavenlyBeachGalaxy", COMET_CATEGORY_COIN_100 }, - { "PhantomGalaxy", COMET_CATEGORY_NORMAL }, - { "HeavenlyBeachGalaxy", COMET_CATEGORY_NORMAL }, - { "PhantomGalaxy", COMET_CATEGORY_COIN_100 }, - { "PhantomGalaxy", COMET_CATEGORY_NORMAL }, - { "HeavenlyBeachGalaxy", COMET_CATEGORY_COIN_100 }, - { "PhantomGalaxy", COMET_CATEGORY_COIN_100 }, - { "HeavenlyBeachGalaxy", COMET_CATEGORY_NORMAL }, - { nullptr, 0 }, + {"PhantomGalaxy", COMET_CATEGORY_NORMAL}, + {"HeavenlyBeachGalaxy", COMET_CATEGORY_NORMAL}, + {"PhantomGalaxy", COMET_CATEGORY_COIN_100}, + {"HeavenlyBeachGalaxy", COMET_CATEGORY_COIN_100}, + {"HeavenlyBeachGalaxy", COMET_CATEGORY_NORMAL}, + {"PhantomGalaxy", COMET_CATEGORY_COIN_100}, + {"HeavenlyBeachGalaxy", COMET_CATEGORY_COIN_100}, + {"PhantomGalaxy", COMET_CATEGORY_NORMAL}, + {"HeavenlyBeachGalaxy", COMET_CATEGORY_COIN_100}, + {"PhantomGalaxy", COMET_CATEGORY_NORMAL}, + {"HeavenlyBeachGalaxy", COMET_CATEGORY_NORMAL}, + {"PhantomGalaxy", COMET_CATEGORY_COIN_100}, + {"PhantomGalaxy", COMET_CATEGORY_NORMAL}, + {"HeavenlyBeachGalaxy", COMET_CATEGORY_COIN_100}, + {"PhantomGalaxy", COMET_CATEGORY_COIN_100}, + {"HeavenlyBeachGalaxy", COMET_CATEGORY_NORMAL}, + {nullptr, 0}, }; const GalaxyCometTimePaper sCometTimeTableGrandGalaxy4[] = { - { "SandClockGalaxy", COMET_CATEGORY_NORMAL }, - { "CosmosGardenGalaxy", COMET_CATEGORY_NORMAL }, - { "IceVolcanoGalaxy", COMET_CATEGORY_NORMAL }, - { "CosmosGardenGalaxy", COMET_CATEGORY_COIN_100 }, - { "SandClockGalaxy", COMET_CATEGORY_NORMAL }, - { "CosmosGardenGalaxy", COMET_CATEGORY_NORMAL }, - { "SandClockGalaxy", COMET_CATEGORY_COIN_100 }, - { "CosmosGardenGalaxy", COMET_CATEGORY_COIN_100 }, - { "SandClockGalaxy", COMET_CATEGORY_NORMAL }, - { "IceVolcanoGalaxy", COMET_CATEGORY_COIN_100 }, - { "SandClockGalaxy", COMET_CATEGORY_COIN_100 }, - { "CosmosGardenGalaxy", COMET_CATEGORY_NORMAL }, - { "IceVolcanoGalaxy", COMET_CATEGORY_NORMAL }, - { "CosmosGardenGalaxy", COMET_CATEGORY_COIN_100 }, - { "IceVolcanoGalaxy", COMET_CATEGORY_COIN_100 }, - { "SandClockGalaxy", COMET_CATEGORY_NORMAL }, - { "IceVolcanoGalaxy", COMET_CATEGORY_NORMAL }, - { "CosmosGardenGalaxy", COMET_CATEGORY_COIN_100 }, - { "SandClockGalaxy", COMET_CATEGORY_COIN_100 }, - { "IceVolcanoGalaxy", COMET_CATEGORY_COIN_100 }, - { "CosmosGardenGalaxy", COMET_CATEGORY_NORMAL }, - { "IceVolcanoGalaxy", COMET_CATEGORY_NORMAL }, - { "SandClockGalaxy", COMET_CATEGORY_COIN_100 }, - { "IceVolcanoGalaxy", COMET_CATEGORY_COIN_100 }, - { nullptr, 0 }, + {"SandClockGalaxy", COMET_CATEGORY_NORMAL}, + {"CosmosGardenGalaxy", COMET_CATEGORY_NORMAL}, + {"IceVolcanoGalaxy", COMET_CATEGORY_NORMAL}, + {"CosmosGardenGalaxy", COMET_CATEGORY_COIN_100}, + {"SandClockGalaxy", COMET_CATEGORY_NORMAL}, + {"CosmosGardenGalaxy", COMET_CATEGORY_NORMAL}, + {"SandClockGalaxy", COMET_CATEGORY_COIN_100}, + {"CosmosGardenGalaxy", COMET_CATEGORY_COIN_100}, + {"SandClockGalaxy", COMET_CATEGORY_NORMAL}, + {"IceVolcanoGalaxy", COMET_CATEGORY_COIN_100}, + {"SandClockGalaxy", COMET_CATEGORY_COIN_100}, + {"CosmosGardenGalaxy", COMET_CATEGORY_NORMAL}, + {"IceVolcanoGalaxy", COMET_CATEGORY_NORMAL}, + {"CosmosGardenGalaxy", COMET_CATEGORY_COIN_100}, + {"IceVolcanoGalaxy", COMET_CATEGORY_COIN_100}, + {"SandClockGalaxy", COMET_CATEGORY_NORMAL}, + {"IceVolcanoGalaxy", COMET_CATEGORY_NORMAL}, + {"CosmosGardenGalaxy", COMET_CATEGORY_COIN_100}, + {"SandClockGalaxy", COMET_CATEGORY_COIN_100}, + {"IceVolcanoGalaxy", COMET_CATEGORY_COIN_100}, + {"CosmosGardenGalaxy", COMET_CATEGORY_NORMAL}, + {"IceVolcanoGalaxy", COMET_CATEGORY_NORMAL}, + {"SandClockGalaxy", COMET_CATEGORY_COIN_100}, + {"IceVolcanoGalaxy", COMET_CATEGORY_COIN_100}, + {nullptr, 0}, }; const GalaxyCometTimePaper sCometTimeTableGrandGalaxy5[] = { - { "OceanRingGalaxy", COMET_CATEGORY_COIN_100 }, - { "ReverseKingdomGalaxy", COMET_CATEGORY_NORMAL }, - { "OceanRingGalaxy", COMET_CATEGORY_NORMAL }, - { "ReverseKingdomGalaxy", COMET_CATEGORY_COIN_100 }, - { "FactoryGalaxy", COMET_CATEGORY_NORMAL }, - { "OceanRingGalaxy", COMET_CATEGORY_COIN_100 }, - { "FactoryGalaxy", COMET_CATEGORY_NORMAL }, - { "ReverseKingdomGalaxy", COMET_CATEGORY_NORMAL }, - { "FactoryGalaxy", COMET_CATEGORY_COIN_100 }, - { "OceanRingGalaxy", COMET_CATEGORY_NORMAL }, - { "ReverseKingdomGalaxy", COMET_CATEGORY_NORMAL }, - { "FactoryGalaxy", COMET_CATEGORY_COIN_100 }, - { "OceanRingGalaxy", COMET_CATEGORY_NORMAL }, - { "ReverseKingdomGalaxy", COMET_CATEGORY_COIN_100 }, - { "FactoryGalaxy", COMET_CATEGORY_NORMAL }, - { "ReverseKingdomGalaxy", COMET_CATEGORY_NORMAL }, - { "FactoryGalaxy", COMET_CATEGORY_COIN_100 }, - { "OceanRingGalaxy", COMET_CATEGORY_COIN_100 }, - { "FactoryGalaxy", COMET_CATEGORY_NORMAL }, - { "ReverseKingdomGalaxy", COMET_CATEGORY_COIN_100 }, - { "OceanRingGalaxy", COMET_CATEGORY_NORMAL }, - { "FactoryGalaxy", COMET_CATEGORY_COIN_100 }, - { "OceanRingGalaxy", COMET_CATEGORY_COIN_100 }, - { "ReverseKingdomGalaxy", COMET_CATEGORY_COIN_100 }, - { nullptr, 0 }, + {"OceanRingGalaxy", COMET_CATEGORY_COIN_100}, + {"ReverseKingdomGalaxy", COMET_CATEGORY_NORMAL}, + {"OceanRingGalaxy", COMET_CATEGORY_NORMAL}, + {"ReverseKingdomGalaxy", COMET_CATEGORY_COIN_100}, + {"FactoryGalaxy", COMET_CATEGORY_NORMAL}, + {"OceanRingGalaxy", COMET_CATEGORY_COIN_100}, + {"FactoryGalaxy", COMET_CATEGORY_NORMAL}, + {"ReverseKingdomGalaxy", COMET_CATEGORY_NORMAL}, + {"FactoryGalaxy", COMET_CATEGORY_COIN_100}, + {"OceanRingGalaxy", COMET_CATEGORY_NORMAL}, + {"ReverseKingdomGalaxy", COMET_CATEGORY_NORMAL}, + {"FactoryGalaxy", COMET_CATEGORY_COIN_100}, + {"OceanRingGalaxy", COMET_CATEGORY_NORMAL}, + {"ReverseKingdomGalaxy", COMET_CATEGORY_COIN_100}, + {"FactoryGalaxy", COMET_CATEGORY_NORMAL}, + {"ReverseKingdomGalaxy", COMET_CATEGORY_NORMAL}, + {"FactoryGalaxy", COMET_CATEGORY_COIN_100}, + {"OceanRingGalaxy", COMET_CATEGORY_COIN_100}, + {"FactoryGalaxy", COMET_CATEGORY_NORMAL}, + {"ReverseKingdomGalaxy", COMET_CATEGORY_COIN_100}, + {"OceanRingGalaxy", COMET_CATEGORY_NORMAL}, + {"FactoryGalaxy", COMET_CATEGORY_COIN_100}, + {"OceanRingGalaxy", COMET_CATEGORY_COIN_100}, + {"ReverseKingdomGalaxy", COMET_CATEGORY_COIN_100}, + {nullptr, 0}, }; const GalaxyCometTimePaper sCometTimeTableGrandGalaxy6[] = { - { "CannonFleetGalaxy", COMET_CATEGORY_COIN_100 }, - { "OceanPhantomCaveGalaxy", COMET_CATEGORY_COIN_100 }, - { "CannonFleetGalaxy", COMET_CATEGORY_NORMAL }, - { "HellProminenceGalaxy", COMET_CATEGORY_NORMAL }, - { "CannonFleetGalaxy", COMET_CATEGORY_COIN_100 }, - { "HellProminenceGalaxy", COMET_CATEGORY_COIN_100 }, - { "OceanPhantomCaveGalaxy", COMET_CATEGORY_NORMAL }, - { "CannonFleetGalaxy", COMET_CATEGORY_COIN_100 }, - { "OceanPhantomCaveGalaxy", COMET_CATEGORY_COIN_100 }, - { "CannonFleetGalaxy", COMET_CATEGORY_COIN_100 }, - { "HellProminenceGalaxy", COMET_CATEGORY_NORMAL }, - { "OceanPhantomCaveGalaxy", COMET_CATEGORY_COIN_100 }, - { "CannonFleetGalaxy", COMET_CATEGORY_NORMAL }, - { "HellProminenceGalaxy", COMET_CATEGORY_COIN_100 }, - { "OceanPhantomCaveGalaxy", COMET_CATEGORY_NORMAL }, - { "HellProminenceGalaxy", COMET_CATEGORY_NORMAL }, - { "CannonFleetGalaxy", COMET_CATEGORY_NORMAL }, - { "OceanPhantomCaveGalaxy", COMET_CATEGORY_NORMAL }, - { "HellProminenceGalaxy", COMET_CATEGORY_COIN_100 }, - { "CannonFleetGalaxy", COMET_CATEGORY_NORMAL }, - { "HellProminenceGalaxy", COMET_CATEGORY_NORMAL }, - { "OceanPhantomCaveGalaxy", COMET_CATEGORY_COIN_100 }, - { "HellProminenceGalaxy", COMET_CATEGORY_COIN_100 }, - { "OceanPhantomCaveGalaxy", COMET_CATEGORY_NORMAL }, - { nullptr, 0 }, + {"CannonFleetGalaxy", COMET_CATEGORY_COIN_100}, + {"OceanPhantomCaveGalaxy", COMET_CATEGORY_COIN_100}, + {"CannonFleetGalaxy", COMET_CATEGORY_NORMAL}, + {"HellProminenceGalaxy", COMET_CATEGORY_NORMAL}, + {"CannonFleetGalaxy", COMET_CATEGORY_COIN_100}, + {"HellProminenceGalaxy", COMET_CATEGORY_COIN_100}, + {"OceanPhantomCaveGalaxy", COMET_CATEGORY_NORMAL}, + {"CannonFleetGalaxy", COMET_CATEGORY_COIN_100}, + {"OceanPhantomCaveGalaxy", COMET_CATEGORY_COIN_100}, + {"CannonFleetGalaxy", COMET_CATEGORY_COIN_100}, + {"HellProminenceGalaxy", COMET_CATEGORY_NORMAL}, + {"OceanPhantomCaveGalaxy", COMET_CATEGORY_COIN_100}, + {"CannonFleetGalaxy", COMET_CATEGORY_NORMAL}, + {"HellProminenceGalaxy", COMET_CATEGORY_COIN_100}, + {"OceanPhantomCaveGalaxy", COMET_CATEGORY_NORMAL}, + {"HellProminenceGalaxy", COMET_CATEGORY_NORMAL}, + {"CannonFleetGalaxy", COMET_CATEGORY_NORMAL}, + {"OceanPhantomCaveGalaxy", COMET_CATEGORY_NORMAL}, + {"HellProminenceGalaxy", COMET_CATEGORY_COIN_100}, + {"CannonFleetGalaxy", COMET_CATEGORY_NORMAL}, + {"HellProminenceGalaxy", COMET_CATEGORY_NORMAL}, + {"OceanPhantomCaveGalaxy", COMET_CATEGORY_COIN_100}, + {"HellProminenceGalaxy", COMET_CATEGORY_COIN_100}, + {"OceanPhantomCaveGalaxy", COMET_CATEGORY_NORMAL}, + {nullptr, 0}, }; -const GalaxyCometTimePaper * const sGalaxyCometTimerPaper[] = { +const GalaxyCometTimePaper* const sGalaxyCometTimerPaper[] = { sCometTimeTableGrandGalaxy1, sCometTimeTableGrandGalaxy2, sCometTimeTableGrandGalaxy3, @@ -161,24 +161,23 @@ const GalaxyCometTimePaper * const sGalaxyCometTimerPaper[] = { sCometTimeTableGrandGalaxy6, }; -const GalaxyCometSerializeInfo cSerializeInfoPurpleCometAppear = { 0x0007, 0 }; +const GalaxyCometSerializeInfo cSerializeInfoPurpleCometAppear = {0x0007, 0}; const GalaxyCometSerializeInfo cSerializeInfoFirstContact[] = { - { 0x0001, 0 }, - { 0x0000, 0 }, - { 0x0000, 0 }, - { 0x0000, 0 }, - { 0x0000, 0 }, - { 0x0000, 0 }, + {0x0001, 0}, + {0x0000, 0}, + {0x0000, 0}, + {0x0000, 0}, + {0x0000, 0}, + {0x0000, 0}, }; -GalaxyCometTimeTable::GalaxyCometTimeTable(const GalaxyCometTimePaper *pTimePaper) : - mState(nullptr), - mTimePaper(nullptr), - mTimePaperPos(0), - mIsReady(false), - mIsHide(false) -{ +GalaxyCometTimeTable::GalaxyCometTimeTable(const GalaxyCometTimePaper* pTimePaper) + : mState(nullptr), + mTimePaper(nullptr), + mTimePaperPos(0), + mIsReady(false), + mIsHide(false) { mState = new GalaxyCometState(); mTimePaper = pTimePaper; mTimePaperPos = 0; @@ -192,7 +191,7 @@ void GalaxyCometTimeTable::update() { } void GalaxyCometTimeTable::checkIsReady() { - s32 pos; + s32 pos; bool foundSuitableTimePaperPos = findSuitableTimePaperPos(&pos, -1); if (mIsReady != foundSuitableTimePaperPos) { @@ -203,7 +202,7 @@ void GalaxyCometTimeTable::checkIsReady() { } } -void GalaxyCometTimeTable::serializeStateToGameData(GalaxyCometSerializeInfo *pInfo) { +void GalaxyCometTimeTable::serializeStateToGameData(GalaxyCometSerializeInfo* pInfo) { s32 stateIndex = mState->getStateIndex(); pInfo->mStateIndexPacked = (mTimePaperPos << 1) + stateIndex; @@ -211,15 +210,15 @@ void GalaxyCometTimeTable::serializeStateToGameData(GalaxyCometSerializeInfo *pI pInfo->mPastSecond = pastSecond; } -void GalaxyCometTimeTable::deserializeStateFromGameData(const GalaxyCometSerializeInfo *pInfo) { +void GalaxyCometTimeTable::deserializeStateFromGameData(const GalaxyCometSerializeInfo* pInfo) { u32 stateIndex = pInfo->mStateIndexPacked; u32 stateMask = stateIndex >> 31; u32 timePaperPos = stateIndex >> 1; - + stateIndex &= 1; stateIndex ^= stateMask; mTimePaperPos = timePaperPos; - + s32 state = stateIndex - stateMask; mState->setStateAndPastSecond(state, pInfo->mPastSecond); } @@ -231,7 +230,7 @@ bool GalaxyCometTimeTable::isLand() const { return mState->isLand(); } -bool GalaxyCometTimeTable::isIncluded(const char *galaxyName) const { +bool GalaxyCometTimeTable::isIncluded(const char* galaxyName) const { for (s32 i = 0; mTimePaper[i].mGalaxyName != nullptr; i++) { if (MR::isEqualString(galaxyName, mTimePaper[i].mGalaxyName)) { return true; @@ -253,7 +252,7 @@ void GalaxyCometTimeTable::updateTimePaperPos() { mIsHide = mState->isHide(); } -bool GalaxyCometTimeTable::findSuitableTimePaperPos(s32 *pResultPos, s32 startPos) const { +bool GalaxyCometTimeTable::findSuitableTimePaperPos(s32* pResultPos, s32 startPos) const { s32 timePaperPos = startPos; s32 length = calcTimePaperLength(); for (s32 i = 0; i < length; i++) { @@ -262,18 +261,18 @@ bool GalaxyCometTimeTable::findSuitableTimePaperPos(s32 *pResultPos, s32 startPo timePaperPos = 0; } - s32 category = mTimePaper[timePaperPos].mCategory; - const char *galaxyName = mTimePaper[timePaperPos].mGalaxyName; - bool canAppear; + s32 category = mTimePaper[timePaperPos].mCategory; + const char* galaxyName = mTimePaper[timePaperPos].mGalaxyName; + bool canAppear; switch (category) { - case COMET_CATEGORY_NORMAL: - canAppear = MR::canAppearNormalComet(galaxyName); - break; - case COMET_CATEGORY_COIN_100: - canAppear = MR::canAppearCoin100Comet(galaxyName); - break; - default: - canAppear = false; + case COMET_CATEGORY_NORMAL: + canAppear = MR::canAppearNormalComet(galaxyName); + break; + case COMET_CATEGORY_COIN_100: + canAppear = MR::canAppearCoin100Comet(galaxyName); + break; + default: + canAppear = false; } if (canAppear) { @@ -288,7 +287,8 @@ bool GalaxyCometTimeTable::findSuitableTimePaperPos(s32 *pResultPos, s32 startPo s32 GalaxyCometTimeTable::calcTimePaperLength() const { s32 length = 0; - for (; mTimePaper[length].mGalaxyName != nullptr; length++); + for (; mTimePaper[length].mGalaxyName != nullptr; length++) + ; return length; } @@ -297,10 +297,9 @@ void GalaxyCometTimeTable::advance() { updateTimePaperPos(); } -GalaxyCometScheduler::GalaxyCometScheduler() : - mTimeTables(), - mEnabled(true) -{ +GalaxyCometScheduler::GalaxyCometScheduler() + : mTimeTables(), + mEnabled(true) { mTimeTables.init(6); for (s32 i = 0; i < mTimeTables.size(); i++) { mTimeTables[i] = new GalaxyCometTimeTable(sGalaxyCometTimerPaper[i]); @@ -374,7 +373,7 @@ void GalaxyCometScheduler::setScheduleFirstContact() { void GalaxyCometScheduler::setScheduleMostForwardCometAppear() { if (isHideAll()) { for (s32 i = 0; i < mTimeTables.size(); i++) { - GalaxyCometTimeTable *timeTable = mTimeTables[i]; + GalaxyCometTimeTable* timeTable = mTimeTables[i]; if (timeTable->mIsReady) { if (timeTable->isLand()) { break; @@ -387,11 +386,11 @@ void GalaxyCometScheduler::setScheduleMostForwardCometAppear() { } } -bool GalaxyCometScheduler::isCometLand(const char *pGalaxyName) const { +bool GalaxyCometScheduler::isCometLand(const char* pGalaxyName) const { for (s32 i = 0; i < mTimeTables.size(); i++) { - GalaxyCometTimeTable *timeTable = mTimeTables[i]; + GalaxyCometTimeTable* timeTable = mTimeTables[i]; if (timeTable->isLand()) { - const char *name = timeTable->mTimePaper[timeTable->mTimePaperPos].mGalaxyName; + const char* name = timeTable->mTimePaper[timeTable->mTimePaperPos].mGalaxyName; if (MR::isEqualString(name, pGalaxyName)) { return true; } @@ -400,31 +399,31 @@ bool GalaxyCometScheduler::isCometLand(const char *pGalaxyName) const { return false; } -s32 GalaxyCometScheduler::getEncounterCometPowerStarId(const char *pGalaxyName) const { +s32 GalaxyCometScheduler::getEncounterCometPowerStarId(const char* pGalaxyName) const { MR::makeGalaxyStatusAccessor(pGalaxyName); - GalaxyCometTimeTable *timeTable = findFromGalaxy(pGalaxyName); + GalaxyCometTimeTable* timeTable = findFromGalaxy(pGalaxyName); switch (timeTable->getCometCategory()) { - case COMET_CATEGORY_NORMAL: - return 4; - case COMET_CATEGORY_COIN_100: - return 5; - default: - return 0; + case COMET_CATEGORY_NORMAL: + return 4; + case COMET_CATEGORY_COIN_100: + return 5; + default: + return 0; } } -const char *GalaxyCometScheduler::getEncounterCometName(const char *pGalaxyName) const { +const char* GalaxyCometScheduler::getEncounterCometName(const char* pGalaxyName) const { GalaxyStatusAccessor statusAccessor = MR::makeGalaxyStatusAccessor(pGalaxyName); - s32 id = getEncounterCometPowerStarId(pGalaxyName); + s32 id = getEncounterCometPowerStarId(pGalaxyName); return statusAccessor.getCometName(id); } -GalaxyCometTimeTable *GalaxyCometScheduler::findFromGalaxy(const char *pGalaxyName) const { +GalaxyCometTimeTable* GalaxyCometScheduler::findFromGalaxy(const char* pGalaxyName) const { for (s32 i = 0; i < mTimeTables.size(); i++) { - GalaxyCometTimeTable *timeTable = mTimeTables[i]; - s32 pos = timeTable->mTimePaperPos; - const char *name = timeTable->mTimePaper[pos].mGalaxyName; + GalaxyCometTimeTable* timeTable = mTimeTables[i]; + s32 pos = timeTable->mTimePaperPos; + const char* name = timeTable->mTimePaper[pos].mGalaxyName; if (MR::isEqualString(name, pGalaxyName)) { return timeTable; @@ -435,7 +434,7 @@ GalaxyCometTimeTable *GalaxyCometScheduler::findFromGalaxy(const char *pGalaxyNa bool GalaxyCometScheduler::isHideAll() const { for (s32 i = 0; i < mTimeTables.size(); i++) { - GalaxyCometTimeTable *timeTable = mTimeTables[i]; + GalaxyCometTimeTable* timeTable = mTimeTables[i]; if (timeTable->isLand()) { return false; } @@ -443,9 +442,9 @@ bool GalaxyCometScheduler::isHideAll() const { return true; } -s32 GalaxyCometScheduler::getStateValueIncluded(const char *pGalaxyName) { +s32 GalaxyCometScheduler::getStateValueIncluded(const char* pGalaxyName) { for (s32 i = 0; i < mTimeTables.size(); i++) { - GalaxyCometTimeTable *timeTable = mTimeTables[i]; + GalaxyCometTimeTable* timeTable = mTimeTables[i]; if (timeTable->isIncluded(pGalaxyName)) { s32 state = timeTable->mState->getStateIndex(); s32 pos = timeTable->mTimePaperPos; diff --git a/src/Game/System/GalaxyCometState.cpp b/src/Game/System/GalaxyCometState.cpp index cccf2d6d2..0b8cb0124 100644 --- a/src/Game/System/GalaxyCometState.cpp +++ b/src/Game/System/GalaxyCometState.cpp @@ -7,12 +7,11 @@ namespace { NEW_NERVE(GalaxyCometStateHide, GalaxyCometState, Hide); NEW_NERVE(GalaxyCometStateLand, GalaxyCometState, Land); -}; +}; // namespace -GalaxyCometState::GalaxyCometState() : - NerveExecutor("GalaxyCometState"), - mIsUpdateNerve(true) -{ +GalaxyCometState::GalaxyCometState() + : NerveExecutor("GalaxyCometState"), + mIsUpdateNerve(true) { initNerve(&GalaxyCometStateLand::sInstance); } @@ -35,9 +34,9 @@ bool GalaxyCometState::isHide() const { } void GalaxyCometState::forceToNext() { - Nerve *pNerve = isLand() - ? static_cast(&GalaxyCometStateHide::sInstance) - : static_cast(&GalaxyCometStateLand::sInstance); + Nerve* pNerve = isLand() + ? static_cast(&GalaxyCometStateHide::sInstance) + : static_cast(&GalaxyCometStateLand::sInstance); setNerve(pNerve); } @@ -66,9 +65,7 @@ void GalaxyCometState::setStateAndPastSecond(int state, u16 pastSecond) { } void GalaxyCometState::exeHide() { - } void GalaxyCometState::exeLand() { - } diff --git a/src/Game/System/GalaxyMoveArgument.cpp b/src/Game/System/GalaxyMoveArgument.cpp index 7030ece7b..51d696a33 100644 --- a/src/Game/System/GalaxyMoveArgument.cpp +++ b/src/Game/System/GalaxyMoveArgument.cpp @@ -3,24 +3,22 @@ #include "Game/Util/SceneUtil.hpp" #include "Game/Util/StringUtil.hpp" -GalaxyMoveArgument::GalaxyMoveArgument(u32 moveType, const char *pStageName, s32 scenarioNo, const JMapIdInfo *pMapIdInfo) : - mMoveType(moveType), - mStageName(pStageName), - mScenarioNo(scenarioNo), - _C(-1) -{ +GalaxyMoveArgument::GalaxyMoveArgument(u32 moveType, const char* pStageName, s32 scenarioNo, const JMapIdInfo* pMapIdInfo) + : mMoveType(moveType), + mStageName(pStageName), + mScenarioNo(scenarioNo), + _C(-1) { mIDInfo._0 = -1; mIDInfo.mZoneID = -1; if (pMapIdInfo != nullptr) { mIDInfo = *pMapIdInfo; - } - else { + } else { mIDInfo = MR::getInitializeStartIdInfo(); } } -bool GalaxyMoveArgument::isEqualStage(const char *pStageName) const { +bool GalaxyMoveArgument::isEqualStage(const char* pStageName) const { if (mStageName == nullptr) { return false; } @@ -28,6 +26,6 @@ bool GalaxyMoveArgument::isEqualStage(const char *pStageName) const { return MR::isEqualString(pStageName, mStageName); } -bool GalaxyMoveArgument::isEqualStageScenario(const char *pStageName, int scenarioNo) const { +bool GalaxyMoveArgument::isEqualStageScenario(const char* pStageName, int scenarioNo) const { return isEqualStage(pStageName) && scenarioNo == mScenarioNo; } diff --git a/src/Game/System/GalaxyStatusAccessor.cpp b/src/Game/System/GalaxyStatusAccessor.cpp index e035401d2..7a77ffe0e 100644 --- a/src/Game/System/GalaxyStatusAccessor.cpp +++ b/src/Game/System/GalaxyStatusAccessor.cpp @@ -5,9 +5,8 @@ #include "Game/Util/SceneUtil.hpp" #include "Game/Util/StringUtil.hpp" -GalaxyStatusAccessor::GalaxyStatusAccessor(const ScenarioData* pScenarioData) : - mScenarioData(pScenarioData) -{} +GalaxyStatusAccessor::GalaxyStatusAccessor(const ScenarioData* pScenarioData) + : mScenarioData(pScenarioData) {} const char* GalaxyStatusAccessor::getName() const { return mScenarioData->mGalaxyName; @@ -17,15 +16,15 @@ s32 GalaxyStatusAccessor::getScenarioNum() const { return mScenarioData->getScenarioNum(); } -s32 GalaxyStatusAccessor::getPowerStarNum() const { +s32 GalaxyStatusAccessor::getPowerStarNum() const { return mScenarioData->getPowerStarNum(); } -s32 GalaxyStatusAccessor::getZoneNum() const { +s32 GalaxyStatusAccessor::getZoneNum() const { return mScenarioData->getZoneNum(); } -s32 GalaxyStatusAccessor::getZoneId(const char *pZone) const { +s32 GalaxyStatusAccessor::getZoneId(const char* pZone) const { return mScenarioData->getZoneId(pZone); } @@ -34,25 +33,21 @@ const char* GalaxyStatusAccessor::getZoneName(int zoneId) const { } const char* GalaxyStatusAccessor::getCometName(s32 scenarioNo) const { - const char *pCometName = nullptr; + const char* pCometName = nullptr; if (mScenarioData->getValueString("Comet", scenarioNo, &pCometName)) { return pCometName; - } - else { + } else { return nullptr; } } bool GalaxyStatusAccessor::isValidNormalComet(s32 scenarioNo) const { - return isExistAnyComet() - && scenarioNo == getNormalCometScenarioNo(); + return isExistAnyComet() && scenarioNo == getNormalCometScenarioNo(); } bool GalaxyStatusAccessor::isCometStar(s32 scenarioNo) const { - return isExistAnyComet() - && scenarioNo == getNormalCometScenarioNo() - || isValidCoin100(scenarioNo); + return isExistAnyComet() && scenarioNo == getNormalCometScenarioNo() || isValidCoin100(scenarioNo); } bool GalaxyStatusAccessor::isExistGrandStar() const { @@ -67,15 +62,14 @@ bool GalaxyStatusAccessor::isExistGrandStar() const { #ifdef NON_MATCHING // The good old registers problem bool GalaxyStatusAccessor::isExistAnyComet() const { - const char *pIsComet; + const char* pIsComet; for (s32 i = 1; i <= mScenarioData->getScenarioNum(); i++) { - const char *pComet; + const char* pComet; if (mScenarioData->getValueString("Comet", i, &pComet)) { pIsComet = pComet; - } - else { + } else { pIsComet = nullptr; } @@ -86,23 +80,22 @@ bool GalaxyStatusAccessor::isExistAnyComet() const { return false; } -#endif +#endif s32 GalaxyStatusAccessor::getNormalCometScenarioNo() const { - const char *pNormal; + const char* pNormal; for (s32 i = 1; i <= mScenarioData->getScenarioNum(); i++) { - const char *pIsNormal = nullptr; + const char* pIsNormal = nullptr; if (mScenarioData->getValueString("Comet", i, &pIsNormal)) { pNormal = pIsNormal; - } - else { + } else { pNormal = nullptr; } if (pNormal && !isValidCoin100(i)) { - return i; + return i; } } @@ -110,20 +103,19 @@ s32 GalaxyStatusAccessor::getNormalCometScenarioNo() const { } s32 GalaxyStatusAccessor::getCoin100CometScenarioNo() const { - const char *pPurpleComet; + const char* pPurpleComet; for (s32 i = 1; i <= mScenarioData->getScenarioNum(); i++) { - const char *pCometName = nullptr; + const char* pCometName = nullptr; if (mScenarioData->getValueString("Comet", i, &pCometName)) { pPurpleComet = pCometName; - } - else { + } else { pPurpleComet = nullptr; } if (pPurpleComet && isValidCoin100(i)) { - return i; + return i; } } @@ -171,19 +163,18 @@ bool GalaxyStatusAccessor::hasPowerStar(s32 scenarioNo) const { } s32 GalaxyStatusAccessor::getNormalScenarioNum() const { - const char *pCometName; - s32 scenarioNum = 0; + const char* pCometName; + s32 scenarioNum = 0; for (s32 i = 0; i < mScenarioData->getScenarioNum(); i++) { - const char *pScenarioComet = nullptr; + const char* pScenarioComet = nullptr; if (mScenarioData->getValueString("Comet", i + 1, &pScenarioComet)) { pCometName = pScenarioComet; - } - else { + } else { pCometName = nullptr; } - + if (!pCometName) { scenarioNum++; } @@ -193,14 +184,14 @@ s32 GalaxyStatusAccessor::getNormalScenarioNum() const { } const char* GalaxyStatusAccessor::getAppearPowerStarObjName(s32 scenarioNo) const { - const char *pObjName; - bool ret = mScenarioData->getValueString("AppearPowerStarObj", scenarioNo, &pObjName); + const char* pObjName; + bool ret = mScenarioData->getValueString("AppearPowerStarObj", scenarioNo, &pObjName); - if (isValidCoin100(scenarioNo)){ + if (isValidCoin100(scenarioNo)) { return "１００枚コイン"; } - if (ret){ + if (ret) { return pObjName; } @@ -212,20 +203,18 @@ u32 GalaxyStatusAccessor::getActivePowerStarId(s32 scenarioNo) const { if (mScenarioData->getValueU32("PowerStarId", scenarioNo, &powerStarId)) { return powerStarId; - } - else { + } else { return 0; } } bool GalaxyStatusAccessor::isValidCoin100(s32 scenarioNo) const { - const char *pPurpleComet; - const char *pCometName = nullptr; + const char* pPurpleComet; + const char* pCometName = nullptr; if (mScenarioData->getValueString("Comet", scenarioNo, &pCometName)) { pPurpleComet = pCometName; - } - else { + } else { pPurpleComet = nullptr; } @@ -241,11 +230,11 @@ bool GalaxyStatusAccessor::isHiddenStar(s32 scenarioNo) const { } namespace MR { - GalaxyStatusAccessor makeGalaxyStatusAccessor(const char *pGalaxyName) { + GalaxyStatusAccessor makeGalaxyStatusAccessor(const char* pGalaxyName) { return ScenarioDataFunction::getScenarioDataParser().makeAccessor(pGalaxyName); } GalaxyStatusAccessor makeCurrentGalaxyStatusAccessor() { return ScenarioDataFunction::getScenarioDataParser().makeAccessor(MR::getCurrentStageName()); } -}; +}; // namespace MR diff --git a/src/Game/System/GameDataConst.cpp b/src/Game/System/GameDataConst.cpp index 34407b2f4..295b90768 100644 --- a/src/Game/System/GameDataConst.cpp +++ b/src/Game/System/GameDataConst.cpp @@ -4,55 +4,55 @@ #include "Game/Util.hpp" #include -s32 GameDataConst::getPowerStarNumToOpenGalaxy(const char *pGalaxy) { +s32 GameDataConst::getPowerStarNumToOpenGalaxy(const char* pGalaxy) { JMapInfo info; info.attach(&GalaxyIDBCSV); JMapInfoIter element; - element = info.findElement("name", pGalaxy, 0); + element = info.findElement("name", pGalaxy, 0); u32 powerStarNum = 0; element.getValue("PowerStarNum", &powerStarNum); return powerStarNum; } -bool GameDataConst::isPowerStarGreen(const char *pName, s32 a2) { +bool GameDataConst::isPowerStarGreen(const char* pName, s32 a2) { return isPowerStarSpecial(pName, a2, "SpecialStarGreen"); } -bool GameDataConst::isPowerStarRed(const char *pName, s32 a2) { +bool GameDataConst::isPowerStarRed(const char* pName, s32 a2) { return isPowerStarSpecial(pName, a2, "SpecialStarRed"); } -bool GameDataConst::isPowerStarLuigiHas(const char *pName, s32 a2) { +bool GameDataConst::isPowerStarLuigiHas(const char* pName, s32 a2) { return isPowerStarSpecial(pName, a2, "SpecialStarFindingLuigi"); } -bool GameDataConst::isGrandStar(const char *pName, s32 a2) { +bool GameDataConst::isGrandStar(const char* pName, s32 a2) { return isPowerStarSpecial(pName, a2, "SpecialStarGrand"); } -bool GameDataConst::isGalaxyLuigiArrested(const char *pGalaxy, s32 starId) { +bool GameDataConst::isGalaxyLuigiArrested(const char* pGalaxy, s32 starId) { GameEventFlagAccessor accessor = GameEventFlagTable::makeAccessor("SpecialStarLuigiRescued"); - bool ret = false; - const char* galaxyName = accessor.getGalaxyName(); + bool ret = false; + const char* galaxyName = accessor.getGalaxyName(); if (MR::isEqualString(galaxyName, pGalaxy) && ((starId == -1) || starId == accessor.getStarId())) { ret = true; - } + } return ret; } - -bool GameDataConst::isGalaxyAppearGreenDriver(const char *pGalaxyName) { + +bool GameDataConst::isGalaxyAppearGreenDriver(const char* pGalaxyName) { char buf[0x30]; snprintf(buf, sizeof(buf), "Appear%s", pGalaxyName); return !GameEventFlagTable::isExist(buf) ? false : GameEventFlagTable::isDependedAnother(buf, "SpecialStarGreenAll"); } -u32 GameDataConst::getIncludedGrandGalaxyId(const char *pGalaxy) { +u32 GameDataConst::getIncludedGrandGalaxyId(const char* pGalaxy) { JMapInfo info; info.attach(&GalaxyIDBCSV); JMapInfoIter element; - element = info.findElement("name", pGalaxy, 0); + element = info.findElement("name", pGalaxy, 0); u32 grandGalaxyNo = 0; element.getValue("GrandGalaxyNo", &grandGalaxyNo); return grandGalaxyNo; diff --git a/src/Game/System/GameEventFlag.cpp b/src/Game/System/GameEventFlag.cpp index 91d769404..1fd70cdd2 100644 --- a/src/Game/System/GameEventFlag.cpp +++ b/src/Game/System/GameEventFlag.cpp @@ -1,7 +1,6 @@ #include "Game/System/GameEventFlag.hpp" - -GameEventFlagAccessor::GameEventFlagAccessor(const GameEventFlag *flag) { +GameEventFlagAccessor::GameEventFlagAccessor(const GameEventFlag* flag) { mFlag = flag; } diff --git a/src/Game/System/GameEventFlagChecker.cpp b/src/Game/System/GameEventFlagChecker.cpp index df9f3ea6b..b9e6212af 100644 --- a/src/Game/System/GameEventFlagChecker.cpp +++ b/src/Game/System/GameEventFlagChecker.cpp @@ -3,7 +3,6 @@ #include "Game/SingletonHolder.hpp" - GameEventFlagChecker::GameEventFlagChecker(GameDataHolder* holder) { mDataHolder = holder; mFlagStorage = nullptr; @@ -11,9 +10,9 @@ GameEventFlagChecker::GameEventFlagChecker(GameDataHolder* holder) { mFlagStorage = new GameEventFlagStorage(); } -bool GameEventFlagChecker::canOn(const char *flagName) const { +bool GameEventFlagChecker::canOn(const char* flagName) const { const GameEventFlag* flag = GameEventFlagTable::findFlag(flagName); - + switch (flag->mType) { case 0: return true; @@ -28,8 +27,8 @@ bool GameEventFlagChecker::canOn(const char *flagName) const { case 4: const char* condition1 = flag->mRequirement1; const char* condition2 = flag->mRequirement2; - bool condition1True = condition1 != nullptr ? isOn(condition1) : true; - bool condition2True = condition2 != nullptr ? isOn(condition2) : true; + bool condition1True = condition1 != nullptr ? isOn(condition1) : true; + bool condition2True = condition2 != nullptr ? isOn(condition2) : true; return condition1True && condition2True; case 5: return mDataHolder->isPassedStoryEvent(flag->mEventValueName); @@ -41,8 +40,8 @@ bool GameEventFlagChecker::canOn(const char *flagName) const { return isOn(flag->mEventValueName); case 8: GameEventFlagAccessor accessor = GameEventFlagAccessor(flag); - s32 needStarPieceNum = accessor.getNeedStarPieceNum(); - return mDataHolder->getStarPieceNumGivingToTicoSeed(flag->StarPieceIndex + 8) >= needStarPieceNum; + s32 needStarPieceNum = accessor.getNeedStarPieceNum(); + return mDataHolder->getStarPieceNumGivingToTicoSeed(flag->StarPieceIndex + 8) >= needStarPieceNum; case 9: GameEventFlagAccessor accessor2 = GameEventFlagAccessor(flag); @@ -52,38 +51,38 @@ bool GameEventFlagChecker::canOn(const char *flagName) const { return mDataHolder->getGameEventValue(accessor2.getEventValueName()) == false; case 10: - return mDataHolder->isCompleteMarioAndLuigi(); + return mDataHolder->isCompleteMarioAndLuigi(); default: - return false; + return false; } } -bool GameEventFlagChecker::isOn(const char *flagName) const { +bool GameEventFlagChecker::isOn(const char* flagName) const { const GameEventFlag* flag = GameEventFlagTable::findFlag(flagName); - if(flag->saveFlag & 0x1){ + if (flag->saveFlag & 0x1) { return canOn(flagName); } - switch(flag->mType){ - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - case 9: - return mFlagStorage->isOn(flag); - case 7: - case 8: - case 10: - case 11: - default: - return false; + switch (flag->mType) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 9: + return mFlagStorage->isOn(flag); + case 7: + case 8: + case 10: + case 11: + default: + return false; } } -bool GameEventFlagChecker::tryOn(const char *flagName) { +bool GameEventFlagChecker::tryOn(const char* flagName) { if (canOn(flagName) == false) { return false; } @@ -94,23 +93,23 @@ bool GameEventFlagChecker::tryOn(const char *flagName) { return false; } - switch(flag->mType){ - case 3: - case 5: - case 7: - case 8: - case 10: - case 11: - return false; - case 0: - case 1: - case 2: - case 4: - case 6: - case 9: - default: - mFlagStorage->set(flag,true); - return true; + switch (flag->mType) { + case 3: + case 5: + case 7: + case 8: + case 10: + case 11: + return false; + case 0: + case 1: + case 2: + case 4: + case 6: + case 9: + default: + mFlagStorage->set(flag, true); + return true; } } @@ -122,17 +121,17 @@ GameEventFlagStorage* GameEventFlagChecker::getChunk() { return mFlagStorage; } -bool GameEventFlagChecker::isOnGalaxy(const char * galaxyName) const { +bool GameEventFlagChecker::isOnGalaxy(const char* galaxyName) const { if (mDataHolder->calcCurrentPowerStarNum() < GameDataConst::getPowerStarNumToOpenGalaxy(galaxyName)) { return false; } return isOnGalaxyDepended(galaxyName); } -bool GameEventFlagChecker::isOnGalaxyDepended(const char * galaxyName) const { +bool GameEventFlagChecker::isOnGalaxyDepended(const char* galaxyName) const { const char* dependedFlags[3]; - s32 length = GameEventFlagTable::getGalaxyDependedFlags(dependedFlags, 3, galaxyName); + s32 length = GameEventFlagTable::getGalaxyDependedFlags(dependedFlags, 3, galaxyName); bool isDependedOn = true; for (s32 i = 0; i < length; i++) { @@ -144,13 +143,12 @@ bool GameEventFlagChecker::isOnGalaxyDepended(const char * galaxyName) const { return isDependedOn; } -bool GameEventFlagChecker::isOnComet(const GameEventFlag *flag) const { +bool GameEventFlagChecker::isOnComet(const GameEventFlag* flag) const { const char* galaxyName = flag->mGalaxyName; - if(isOn(flag->mRequirement) == false){ + if (isOn(flag->mRequirement) == false) { return false; } return mDataHolder->hasPowerStar(galaxyName, flag->mStarID) != false; - } diff --git a/src/Game/System/GameEventFlagStorage.cpp b/src/Game/System/GameEventFlagStorage.cpp index df1039e06..df246c6d1 100644 --- a/src/Game/System/GameEventFlagStorage.cpp +++ b/src/Game/System/GameEventFlagStorage.cpp @@ -3,17 +3,16 @@ #include "JSystem/JSupport/JSUMemoryOutputStream.hpp" #include "JSystem/JSupport/JSUMemoryInputStream.hpp" - GameEventFlagStorage::GameEventFlagStorage() { mFlagBitArray = nullptr; mFlagBitArray = new MR::BitArray(GameEventFlagTable::getTableSize()); } -void GameEventFlagStorage::set(const GameEventFlag *pFlag, bool flag_set) { +void GameEventFlagStorage::set(const GameEventFlag* pFlag, bool flag_set) { mFlagBitArray->set(GameEventFlagTable::getIndex(pFlag), flag_set); } -bool GameEventFlagStorage::isOn(const GameEventFlag *pFlag) const { +bool GameEventFlagStorage::isOn(const GameEventFlag* pFlag) const { return mFlagBitArray->isOn(GameEventFlagTable::getIndex(pFlag)); } @@ -22,36 +21,35 @@ u32 GameEventFlagStorage::getSignature() const { } // some bullshit use of r30 instead of r31 for absolutely no reason??? -s32 GameEventFlagStorage::serialize(u8 *pData, u32 size) const { - JSUMemoryOutputStream stream(pData,size); +s32 GameEventFlagStorage::serialize(u8* pData, u32 size) const { + JSUMemoryOutputStream stream(pData, size); for (GameEventFlagIter iter = GameEventFlagTable::getBeginIter(); !iter.isEnd(); iter.goNext()) { if (!(iter.getFlag()->saveFlag & 0x1)) { GameEventFlagAccessor accessor(iter.getFlag()); - s16 shortHash = MR::getHashCode(accessor.getName()) & 0x7FFF; - s16 data = shortHash | (mFlagBitArray->isOn(GameEventFlagTable::getIndex(iter.getFlag())) ? 0x8000 : 0); + s16 shortHash = MR::getHashCode(accessor.getName()) & 0x7FFF; + s16 data = shortHash | (mFlagBitArray->isOn(GameEventFlagTable::getIndex(iter.getFlag())) ? 0x8000 : 0); stream.write(&data, 2); } } return stream.mPosition; } -s32 GameEventFlagStorage::deserialize(const u8 *pData, u32 size) { - s32 deserializationFailed = false; - JSUMemoryInputStream stream(pData,size); - - for(int i = 0; i < (int)size/2; i++) { +s32 GameEventFlagStorage::deserialize(const u8* pData, u32 size) { + s32 deserializationFailed = false; + JSUMemoryInputStream stream(pData, size); + + for (int i = 0; i < (int)size / 2; i++) { u16 data; - stream.read(&data,2); + stream.read(&data, 2); + + bool extractedFlag = (data >> 15) & 0x1; + int index = GameEventFlagTable::getIndexFromHashCode(data & 0x7FFF); - bool extractedFlag = (data>>15) & 0x1; - int index = GameEventFlagTable::getIndexFromHashCode(data & 0x7FFF); - if (index >= 0) { - mFlagBitArray->set(index,extractedFlag); - } - else { + mFlagBitArray->set(index, extractedFlag); + } else { deserializationFailed = true; } } diff --git a/src/Game/System/GameEventFlagTable.cpp b/src/Game/System/GameEventFlagTable.cpp index e22531b7f..25c1b045d 100644 --- a/src/Game/System/GameEventFlagTable.cpp +++ b/src/Game/System/GameEventFlagTable.cpp @@ -7,205 +7,203 @@ #include #include - namespace { static const GameEventFlag sGameEventFlagStatic[] = { - {"AppearFlipPanelExGalaxy", 2, 1, 0, 0, 0, "FlipPanelExGalaxy", 0}, - {"AppearSurfingLv1Galaxy", 2, 1, 0, 0, 0, "SurfingLv1Galaxy", 0}, - {"AppearTamakoroExLv1Galaxy", 2, 1, 0, 0, 0, "TamakoroExLv1Galaxy", 0}, - {"AppearBreakDownPlanetGalaxy", 2, 1, 0, 0, 0, "BreakDownPlanetGalaxy", 0}, - {"AppearCubeBubbleExLv1Galaxy", 2, 1, 0, 0, 0, "CubeBubbleExLv1Galaxy", 0}, - {"StarNumOceanFloaterLandGalaxy", 2, 1, 0, 0, 0, "OceanFloaterLandGalaxy", 0}, - {"SpecialStarOpenOceanFloaterLandGalaxy", 3, 1, 1, 0, 0, "HeavenlyBeachGalaxy", 0}, - {"AppearOceanFloaterLandGalaxy", 4, 1, 0, 0, 0, "StarNumOceanFloaterLandGalaxy", "SpecialStarOpenOceanFloaterLandGalaxy"}, - {"StarNumHoneyBeeExGalaxy", 2, 1, 0, 0, 0, "HoneyBeeExGalaxy", 0}, - {"SpecialStarOpenHoneyBeeExGalaxy", 3, 1, 1, 0, 0, "HoneyBeeKingdomGalaxy", 0}, - {"AppearHoneyBeeExGalaxy", 4, 1, 0, 0, 0, "StarNumHoneyBeeExGalaxy", "SpecialStarOpenHoneyBeeExGalaxy"}, - {"StarNumSkullSharkGalaxy", 2, 1, 0, 0, 0, "SkullSharkGalaxy", 0}, - {"SpecialStarOpenSkullSharkGalaxy", 3, 1, 1, 0, 0, "TearDropGalaxy", 0}, - {"AppearSkullSharkGalaxy", 4, 1, 0, 0, 0, "StarNumSkullSharkGalaxy", "SpecialStarOpenSkullSharkGalaxy"}, - {"StarNumDarkRoomGalaxy", 2, 1, 0, 0, 0, "DarkRoomGalaxy", 0}, - {"SpecialStarOpenDarkRoomGalaxy", 3, 1, 1, 0, 0, "FactoryGalaxy", 0}, - {"AppearDarkRoomGalaxy", 4, 1, 0, 0, 0, "StarNumDarkRoomGalaxy", "SpecialStarOpenDarkRoomGalaxy"}, - {"ハチマリオ初変身", 0, 0, 0, 0, 0, 0, 0}, - {"テレサマリオ初変身", 0, 0, 0, 0, 0, 0, 0}, - {"ホッパーマリオ初変身", 0, 0, 0, 0, 0, 0, 0}, - {"ファイアマリオ初変身", 0, 0, 0, 0, 0, 0, 0}, - {"アイスマリオ初変身", 0, 0, 0, 0, 0, 0, 0}, - {"フライングマリオ初変身", 0, 0, 0, 0, 0, 0, 0}, - {"無敵マリオ初変身", 0, 0, 0, 0, 0, 0, 0}, - {"ライフアップキノコ解説", 0, 0, 0, 0, 0, 0, 0}, - {"１ＵＰキノコ解説", 0, 0, 0, 0, 0, 0, 0}, - {"サーフィンチュートリアル", 0, 0, 0, 0, 0, 0, 0}, - {"タマコロチュートリアル", 0, 0, 0, 0, 0, 0, 0}, - {"PeachCastleGardenGalaxy", 6, 1, 0, 0, 0, 0, 0}, - {"EpilogueDemoStage", 6, 1, 0, 0, 0, 0, 0}, - {"HeavensDoorGalaxy", 6, 1, 0, 0, 0, 0, 0}, - {"EggStarGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"HoneyBeeKingdomGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"FlipPanelExGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"SurfingLv1Galaxy", 6, 0, 0, 0, 0, 0, 0}, - {"BeltConveyerExGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"TriLegLv1Galaxy", 6, 0, 0, 0, 0, 0, 0}, - {"StarDustGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"TamakoroExLv1Galaxy", 6, 0, 0, 0, 0, 0, 0}, - {"BattleShipGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"BreakDownPlanetGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"CocoonExGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"KoopaBattleVs1Galaxy", 6, 0, 0, 0, 0, 0, 0}, - {"HeavenlyBeachGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"CubeBubbleExLv1Galaxy", 6, 0, 0, 0, 0, 0, 0}, - {"PhantomGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"OceanFloaterLandGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"TearDropGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"TeresaMario2DGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"KoopaJrShipLv1Galaxy", 6, 0, 0, 0, 0, 0, 0}, - {"CosmosGardenGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"IceVolcanoGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"HoneyBeeExGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"SandClockGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"SnowCapsuleGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"KoopaBattleVs2Galaxy", 6, 0, 0, 0, 0, 0, 0}, - {"ReverseKingdomGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"OceanRingGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"SkullSharkGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"FactoryGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"TransformationExGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"FloaterOtaKingGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"OceanPhantomCaveGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"CannonFleetGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"DarkRoomGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"HellProminenceGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"FishTunnelGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"KoopaBattleVs3Galaxy", 6, 0, 0, 0, 0, 0, 0}, - {"TamakoroExLv2Galaxy", 6, 0, 0, 0, 0, 0, 0}, - {"SurfingLv2Galaxy", 6, 0, 0, 0, 0, 0, 0}, - {"CubeBubbleExLv2Galaxy", 6, 0, 0, 0, 0, 0, 0}, - {"PeachCastleFinalGalaxy", 6, 0, 0, 0, 0, 0, 0}, - {"NormalCometEggStarGalaxy", 7, 1, 1, 0, 0, "EggStarGalaxy", "EventCometStarter"}, - {"NormalCometHoneyBeeKingdomGalaxy", 7, 1, 1, 0, 0, "HoneyBeeKingdomGalaxy", "EventCometStarter"}, - {"NormalCometStarDustGalaxy", 7, 1, 2, 0, 0, "StarDustGalaxy", "EventCometStarter"}, - {"NormalCometBattleShipGalaxy", 7, 1, 3, 0, 0, "BattleShipGalaxy", "EventCometStarter"}, - {"NormalCometHeavenlyBeachGalaxy", 7, 1, 3, 0, 0, "HeavenlyBeachGalaxy", "EventCometStarter"}, - {"NormalCometPhantomGalaxy", 7, 1, 3, 0, 0, "PhantomGalaxy", "EventCometStarter"}, - {"NormalCometCosmosGardenGalaxy", 7, 1, 3, 0, 0, "CosmosGardenGalaxy", "EventCometStarter"}, - {"NormalCometIceVolcanoGalaxy", 7, 1, 1, 0, 0, "IceVolcanoGalaxy", "EventCometStarter"}, - {"NormalCometSandClockGalaxy", 7, 1, 3, 0, 0, "SandClockGalaxy", "EventCometStarter"}, - {"NormalCometReverseKingdomGalaxy", 7, 1, 3, 0, 0, "ReverseKingdomGalaxy", "EventCometStarter"}, - {"NormalCometOceanRingGalaxy", 7, 1, 1, 0, 0, "OceanRingGalaxy", "EventCometStarter"}, - {"NormalCometFactoryGalaxy", 7, 1, 6, 0, 0, "FactoryGalaxy", "EventCometStarter"}, - {"NormalCometOceanPhantomCaveGalaxy", 7, 1, 2, 0, 0, "OceanPhantomCaveGalaxy", "EventCometStarter"}, - {"NormalCometCannonFleetGalaxy", 7, 1, 3, 0, 0, "CannonFleetGalaxy", "EventCometStarter"}, - {"NormalCometHellProminenceGalaxy", 7, 1, 2, 0, 0, "HellProminenceGalaxy", "EventCometStarter"}, - {"SpecialStarCoin100CometRelease", 3, 1, 5, 0, 0, "EggStarGalaxy", 0}, - {"EventCoin100CometStarter", 4, 1, 0, 0, 0, "EventCometStarter", "SpecialStarCoin100CometRelease"}, - {"Coin100CometEggStarGalaxy", 7, 1, 1, 0, 0, "EggStarGalaxy", "ViewNormalEnding"}, - {"Coin100CometHoneyBeeKingdomGalaxy", 7, 1, 1, 0, 0, "HoneyBeeKingdomGalaxy", "EventCoin100CometStarter"}, - {"Coin100CometStarDustGalaxy", 7, 1, 1, 0, 0, "StarDustGalaxy", "EventCoin100CometStarter"}, - {"Coin100CometBattleShipGalaxy", 7, 1, 1, 0, 0, "BattleShipGalaxy", "EventCoin100CometStarter"}, - {"Coin100CometHeavenlyBeachGalaxy", 7, 1, 1, 0, 0, "HeavenlyBeachGalaxy", "EventCoin100CometStarter"}, - {"Coin100CometPhantomGalaxy", 7, 1, 2, 0, 0, "PhantomGalaxy", "EventCoin100CometStarter"}, - {"Coin100CometCosmosGardenGalaxy", 7, 1, 1, 0, 0, "CosmosGardenGalaxy", "EventCoin100CometStarter"}, - {"Coin100CometIceVolcanoGalaxy", 7, 1, 1, 0, 0, "IceVolcanoGalaxy", "EventCoin100CometStarter"}, - {"Coin100CometSandClockGalaxy", 7, 1, 2, 0, 0, "SandClockGalaxy", "EventCoin100CometStarter"}, - {"Coin100CometReverseKingdomGalaxy", 7, 1, 3, 0, 0, "ReverseKingdomGalaxy", "EventCoin100CometStarter"}, - {"Coin100CometOceanRingGalaxy", 7, 1, 3, 0, 0, "OceanRingGalaxy", "EventCoin100CometStarter"}, - {"Coin100CometFactoryGalaxy", 7, 1, 2, 0, 0, "FactoryGalaxy", "EventCoin100CometStarter"}, - {"Coin100CometOceanPhantomCaveGalaxy", 7, 1, 1, 0, 0, "OceanPhantomCaveGalaxy", "EventCoin100CometStarter"}, - {"Coin100CometCannonFleetGalaxy", 7, 1, 2, 0, 0, "CannonFleetGalaxy", "EventCoin100CometStarter"}, - {"Coin100CometHellProminenceGalaxy", 7, 1, 3, 0, 0, "HellProminenceGalaxy", "EventCoin100CometStarter"}, - {"SpecialStarGrand1", 3, 1, 1, 0, 0, "HeavensDoorGalaxy", 0}, - {"SpecialStarGrand2", 3, 1, 1, 0, 0, "TriLegLv1Galaxy", 0}, - {"SpecialStarGrand3", 3, 1, 1, 0, 0, "KoopaBattleVs1Galaxy", 0}, - {"SpecialStarGrand4", 3, 1, 1, 0, 0, "KoopaJrShipLv1Galaxy", 0}, - {"SpecialStarGrand5", 3, 1, 1, 0, 0, "KoopaBattleVs2Galaxy", 0}, - {"SpecialStarGrand6", 3, 1, 1, 0, 0, "FloaterOtaKingGalaxy", 0}, - {"SpecialStarGrand7", 3, 1, 1, 0, 0, "KoopaBattleVs3Galaxy", 0}, - {"SpecialStarGreen1", 3, 1, 7, 0, 0, "BattleShipGalaxy", 0}, - {"SpecialStarGreen2", 3, 1, 2, 0, 0, "OceanFloaterLandGalaxy", 0}, - {"SpecialStarGreen3", 3, 1, 7, 0, 0, "SandClockGalaxy", 0}, - {"SpecialStarGreen1/2", 4, 1, 0, 0, 0, "SpecialStarGreen1", "SpecialStarGreen2"}, - {"SpecialStarGreenAll", 4, 1, 0, 0, 0, "SpecialStarGreen1/2", "SpecialStarGreen3"}, - {"SpecialStarRed1", 3, 1, 2, 0, 0, "HeavensDoorGalaxy", 0}, - {"AppearHeavensDoorGalaxy", 4, 1, 0, 0, 0, "SpecialStarRed1", 0}, - {"EventCometStarter", 1, 1, 13, 0, 0, 0, 0}, - {"EventKinopioExplorerRescued", 3, 1, 1, 0, 0, "HoneyBeeKingdomGalaxy", 0}, - {"EventKinopioExplorerOrganize", 1, 1, 7, 0, 0, 0, 0}, - {"ExOpen1CocoonExGalaxy", 3, 1, 3, 0, 0, "StarDustGalaxy", 0}, - {"ExOpen1TearDropGalaxy", 3, 1, 1, 0, 0, "HeavenlyBeachGalaxy", 0}, - {"ExOpen1FishTunnelGalaxy", 3, 1, 1, 0, 0, "SandClockGalaxy", 0}, - {"ExOpenCommonBase", 3, 1, 1, 0, 0, "PhantomGalaxy", 0}, - {"ExOpenSubTransformationExGalaxy", 3, 1, 2, 0, 0, "OceanRingGalaxy", 0}, - {"ExOpenSubTeresaMario2DGalaxy", 3, 1, 2, 0, 0, "HeavensDoorGalaxy", 0}, - {"ExOpen1TransformationExGalaxy", 4, 1, 0, 0, 0, "ExOpenCommonBase", "ExOpenSubTransformationExGalaxy"}, - {"ExOpen1TeresaMario2DGalaxy", 4, 1, 0, 0, 0, "ExOpenCommonBase", "ExOpenSubTeresaMario2DGalaxy"}, - {"ExOpen1SnowCapsuleGalaxy", 3, 1, 1, 0, 0, "HellProminenceGalaxy", 0}, - {"ExOpen1BeltConveyerExGalaxy", 1, 1, 7, 0, 0, 0, 0}, - {"AppearBeltConveyerExGalaxy", 4, 1, 0, 0, 0, "SpecialStarGrand1", "ExOpen1BeltConveyerExGalaxy"}, - {"AppearCocoonExGalaxy", 4, 1, 0, 0, 0, "SpecialStarGrand2", "ExOpen1CocoonExGalaxy"}, - {"AppearTearDropGalaxy", 4, 1, 0, 0, 0, "SpecialStarGrand3", "ExOpen1TearDropGalaxy"}, - {"AppearFishTunnelGalaxy", 4, 1, 0, 0, 0, "SpecialStarGrand4", "ExOpen1FishTunnelGalaxy"}, - {"AppearTransformationExGalaxy", 4, 1, 0, 0, 0, "SpecialStarGrand5", "ExOpen1TransformationExGalaxy"}, - {"AppearTeresaMario2DGalaxy", 4, 1, 0, 0, 0, "SpecialStarGrand6", "ExOpen1TeresaMario2DGalaxy"}, - {"AppearSnowCapsuleGalaxy", 4, 1, 0, 0, 0, "SpecialStarGrand6", "ExOpen1SnowCapsuleGalaxy"}, - {"StarPieceBeltConveyerExGalaxy", 8, 1, 0, 40, 0, "BeltConveyerExGalaxy", 0}, - {"StarPieceCocoonExGalaxy", 8, 1, 1, 40, 0, "CocoonExGalaxy", 0}, - {"StarPieceTearDropGalaxy", 8, 1, 2, 60, 0, "TearDropGalaxy", 0}, - {"StarPieceFishTunnelGalaxy", 8, 1, 6, 80, 0, "FishTunnelGalaxy", 0}, - {"StarPieceTransformationExGalaxy", 8, 1, 5, 100, 0, "TransformationExGalaxy", 0}, - {"StarPieceTeresaMario2DGalaxy", 8, 1, 3, 120, 0, "TeresaMario2DGalaxy", 0}, - {"StarPieceSnowCapsuleGalaxy", 8, 1, 4, 160, 0, "SnowCapsuleGalaxy", 0}, - {"AppearTamakoroExLv2Galaxy", 4, 1, 0, 0, 0, "SpecialStarGreenAll", 0}, - {"AppearSurfingLv2Galaxy", 4, 1, 0, 0, 0, "SpecialStarGreenAll", 0}, - {"AppearCubeBubbleExLv2Galaxy", 4, 1, 0, 0, 0, "SpecialStarGreenAll", 0}, - {"AppearPeachCastleFinalGalaxy", 4, 1, 0, 0, 0, "ViewCompleteMarioAndLuigi", 0}, - {"LibraryOpenRequirement", 9, 1, 0, 0, 0, "LibraryOpenNewStarCount", "SpecialStarGrand3"}, - {"StarNumPictureBookB", 1, 1, 24, 0, 0, 0, 0}, - {"StarNumPictureBookC", 1, 1, 28, 0, 0, 0, 0}, - {"StarNumPictureBookD", 1, 1, 32, 0, 0, 0, 0}, - {"StarNumPictureBookE", 1, 1, 40, 0, 0, 0, 0}, - {"StarNumPictureBookF", 1, 1, 49, 0, 0, 0, 0}, - {"StarNumPictureBookG", 1, 1, 58, 0, 0, 0, 0}, - {"PictureBookA", 4, 1, 0, 0, 0, "LibraryOpenRequirement", 0}, - {"PictureBookB", 4, 1, 0, 0, 0, "StarNumPictureBookB", "LibraryOpenRequirement"}, - {"PictureBookC", 4, 1, 0, 0, 0, "StarNumPictureBookC", "LibraryOpenRequirement"}, - {"PictureBookD", 4, 1, 0, 0, 0, "StarNumPictureBookD", "LibraryOpenRequirement"}, - {"PictureBookE", 4, 1, 0, 0, 0, "StarNumPictureBookE", "LibraryOpenRequirement"}, - {"PictureBookF", 4, 1, 0, 0, 0, "StarNumPictureBookF", "LibraryOpenRequirement"}, - {"PictureBookG", 4, 1, 0, 0, 0, "StarNumPictureBookG", "LibraryOpenRequirement"}, - {"PictureBookH", 3, 1, 1, 0, 0, "KoopaBattleVs3Galaxy", 0}, - {"PictureBookI", 3, 1, 1, 0, 0, "KoopaBattleVs3Galaxy", 0}, - {"SpecialStarLuigiRescued", 3, 1, 1, 0, 0, "PhantomGalaxy", 0}, - {"LuigiTalkAfterRescued", 4, 0, 0, 0, 0, "SpecialStarLuigiRescued", 0}, - {"SpecialStarFindingLuigi1", 3, 1, 6, 0, 0, "EggStarGalaxy", 0}, - {"SpecialStarFindingLuigi2", 3, 1, 7, 0, 0, "BattleShipGalaxy", 0}, - {"SpecialStarFindingLuigi3", 3, 1, 6, 0, 0, "HoneyBeeKingdomGalaxy", 0}, - {"RosettaTalkAboutTico", 4, 0, 0, 0, 0, "SpecialStarGrand6", 0}, - {"RosettaTalkAfterNormalEnding", 4, 0, 0, 0, 0, "ViewNormalEnding", 0}, - {"ViewNormalEnding", 4, 1, 0, 0, 0, "PictureBookH", 0}, - {"PowerStarComplete", 1, 1, 120, 0, 0, 0, 0}, - {"ViewCompleteEnding", 4, 0, 0, 0, 0, "PowerStarComplete", 0}, - {"ViewCompleteMarioAndLuigi", 10, 1, 0, 0, 0, 0, 0}, - {"SpecialStarFinalChallenge", 3, 1, 1, 0, 0, "PeachCastleFinalGalaxy", 0}, - {"StarPieceCounterStop", 0, 0, 0, 0, 0, 0, 0}, - {"PlayHeavensDoorGalaxy1", 4, 1, 0, 0, 0, 0, 0}, - {"PlayHeavensDoorGalaxy2", 4, 1, 0, 0, 0, "SpecialStarGrand6", 0}, - {"[同期]ピーチ城浮上後", 11, 1, 0, 0, 0, "PlayHeavensDoorGalaxy1", "ピーチ城浮上後"}, - {"PlayEggStarGalaxy1", 4, 1, 0, 0, 0, "SpecialStarGrand1", 0}, - {"[同期]バトラー情報Ａ", 11, 1, 0, 0, 0, "PlayEggStarGalaxy1", "バトラー情報Ａ"}, - {"SpecialStarEggStarGalaxy1", 3, 1, 1, 0, 0, "EggStarGalaxy", 0}, - {"PlayEggStarGalaxy2", 4, 1, 0, 0, 0, "SpecialStarEggStarGalaxy1", 0}, - {"[同期]スターピースレクチャー", 11, 1, 0, 0, 0, "PlayEggStarGalaxy2", "スターピースレクチャー"}, - {"PowerStarNumForButlerKoopaDemo", 2, 1, 0, 0, 0, "KoopaBattleVs1Galaxy", 0}, - {"[同期]クッパスタープラント発見", 11, 1, 0, 0, 0, "PowerStarNumForButlerKoopaDemo", "クッパスタープラント発見"} - }; + {"AppearFlipPanelExGalaxy", 2, 1, 0, 0, 0, "FlipPanelExGalaxy", 0}, + {"AppearSurfingLv1Galaxy", 2, 1, 0, 0, 0, "SurfingLv1Galaxy", 0}, + {"AppearTamakoroExLv1Galaxy", 2, 1, 0, 0, 0, "TamakoroExLv1Galaxy", 0}, + {"AppearBreakDownPlanetGalaxy", 2, 1, 0, 0, 0, "BreakDownPlanetGalaxy", 0}, + {"AppearCubeBubbleExLv1Galaxy", 2, 1, 0, 0, 0, "CubeBubbleExLv1Galaxy", 0}, + {"StarNumOceanFloaterLandGalaxy", 2, 1, 0, 0, 0, "OceanFloaterLandGalaxy", 0}, + {"SpecialStarOpenOceanFloaterLandGalaxy", 3, 1, 1, 0, 0, "HeavenlyBeachGalaxy", 0}, + {"AppearOceanFloaterLandGalaxy", 4, 1, 0, 0, 0, "StarNumOceanFloaterLandGalaxy", "SpecialStarOpenOceanFloaterLandGalaxy"}, + {"StarNumHoneyBeeExGalaxy", 2, 1, 0, 0, 0, "HoneyBeeExGalaxy", 0}, + {"SpecialStarOpenHoneyBeeExGalaxy", 3, 1, 1, 0, 0, "HoneyBeeKingdomGalaxy", 0}, + {"AppearHoneyBeeExGalaxy", 4, 1, 0, 0, 0, "StarNumHoneyBeeExGalaxy", "SpecialStarOpenHoneyBeeExGalaxy"}, + {"StarNumSkullSharkGalaxy", 2, 1, 0, 0, 0, "SkullSharkGalaxy", 0}, + {"SpecialStarOpenSkullSharkGalaxy", 3, 1, 1, 0, 0, "TearDropGalaxy", 0}, + {"AppearSkullSharkGalaxy", 4, 1, 0, 0, 0, "StarNumSkullSharkGalaxy", "SpecialStarOpenSkullSharkGalaxy"}, + {"StarNumDarkRoomGalaxy", 2, 1, 0, 0, 0, "DarkRoomGalaxy", 0}, + {"SpecialStarOpenDarkRoomGalaxy", 3, 1, 1, 0, 0, "FactoryGalaxy", 0}, + {"AppearDarkRoomGalaxy", 4, 1, 0, 0, 0, "StarNumDarkRoomGalaxy", "SpecialStarOpenDarkRoomGalaxy"}, + {"ハチマリオ初変身", 0, 0, 0, 0, 0, 0, 0}, + {"テレサマリオ初変身", 0, 0, 0, 0, 0, 0, 0}, + {"ホッパーマリオ初変身", 0, 0, 0, 0, 0, 0, 0}, + {"ファイアマリオ初変身", 0, 0, 0, 0, 0, 0, 0}, + {"アイスマリオ初変身", 0, 0, 0, 0, 0, 0, 0}, + {"フライングマリオ初変身", 0, 0, 0, 0, 0, 0, 0}, + {"無敵マリオ初変身", 0, 0, 0, 0, 0, 0, 0}, + {"ライフアップキノコ解説", 0, 0, 0, 0, 0, 0, 0}, + {"１ＵＰキノコ解説", 0, 0, 0, 0, 0, 0, 0}, + {"サーフィンチュートリアル", 0, 0, 0, 0, 0, 0, 0}, + {"タマコロチュートリアル", 0, 0, 0, 0, 0, 0, 0}, + {"PeachCastleGardenGalaxy", 6, 1, 0, 0, 0, 0, 0}, + {"EpilogueDemoStage", 6, 1, 0, 0, 0, 0, 0}, + {"HeavensDoorGalaxy", 6, 1, 0, 0, 0, 0, 0}, + {"EggStarGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"HoneyBeeKingdomGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"FlipPanelExGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"SurfingLv1Galaxy", 6, 0, 0, 0, 0, 0, 0}, + {"BeltConveyerExGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"TriLegLv1Galaxy", 6, 0, 0, 0, 0, 0, 0}, + {"StarDustGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"TamakoroExLv1Galaxy", 6, 0, 0, 0, 0, 0, 0}, + {"BattleShipGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"BreakDownPlanetGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"CocoonExGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"KoopaBattleVs1Galaxy", 6, 0, 0, 0, 0, 0, 0}, + {"HeavenlyBeachGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"CubeBubbleExLv1Galaxy", 6, 0, 0, 0, 0, 0, 0}, + {"PhantomGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"OceanFloaterLandGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"TearDropGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"TeresaMario2DGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"KoopaJrShipLv1Galaxy", 6, 0, 0, 0, 0, 0, 0}, + {"CosmosGardenGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"IceVolcanoGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"HoneyBeeExGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"SandClockGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"SnowCapsuleGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"KoopaBattleVs2Galaxy", 6, 0, 0, 0, 0, 0, 0}, + {"ReverseKingdomGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"OceanRingGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"SkullSharkGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"FactoryGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"TransformationExGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"FloaterOtaKingGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"OceanPhantomCaveGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"CannonFleetGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"DarkRoomGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"HellProminenceGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"FishTunnelGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"KoopaBattleVs3Galaxy", 6, 0, 0, 0, 0, 0, 0}, + {"TamakoroExLv2Galaxy", 6, 0, 0, 0, 0, 0, 0}, + {"SurfingLv2Galaxy", 6, 0, 0, 0, 0, 0, 0}, + {"CubeBubbleExLv2Galaxy", 6, 0, 0, 0, 0, 0, 0}, + {"PeachCastleFinalGalaxy", 6, 0, 0, 0, 0, 0, 0}, + {"NormalCometEggStarGalaxy", 7, 1, 1, 0, 0, "EggStarGalaxy", "EventCometStarter"}, + {"NormalCometHoneyBeeKingdomGalaxy", 7, 1, 1, 0, 0, "HoneyBeeKingdomGalaxy", "EventCometStarter"}, + {"NormalCometStarDustGalaxy", 7, 1, 2, 0, 0, "StarDustGalaxy", "EventCometStarter"}, + {"NormalCometBattleShipGalaxy", 7, 1, 3, 0, 0, "BattleShipGalaxy", "EventCometStarter"}, + {"NormalCometHeavenlyBeachGalaxy", 7, 1, 3, 0, 0, "HeavenlyBeachGalaxy", "EventCometStarter"}, + {"NormalCometPhantomGalaxy", 7, 1, 3, 0, 0, "PhantomGalaxy", "EventCometStarter"}, + {"NormalCometCosmosGardenGalaxy", 7, 1, 3, 0, 0, "CosmosGardenGalaxy", "EventCometStarter"}, + {"NormalCometIceVolcanoGalaxy", 7, 1, 1, 0, 0, "IceVolcanoGalaxy", "EventCometStarter"}, + {"NormalCometSandClockGalaxy", 7, 1, 3, 0, 0, "SandClockGalaxy", "EventCometStarter"}, + {"NormalCometReverseKingdomGalaxy", 7, 1, 3, 0, 0, "ReverseKingdomGalaxy", "EventCometStarter"}, + {"NormalCometOceanRingGalaxy", 7, 1, 1, 0, 0, "OceanRingGalaxy", "EventCometStarter"}, + {"NormalCometFactoryGalaxy", 7, 1, 6, 0, 0, "FactoryGalaxy", "EventCometStarter"}, + {"NormalCometOceanPhantomCaveGalaxy", 7, 1, 2, 0, 0, "OceanPhantomCaveGalaxy", "EventCometStarter"}, + {"NormalCometCannonFleetGalaxy", 7, 1, 3, 0, 0, "CannonFleetGalaxy", "EventCometStarter"}, + {"NormalCometHellProminenceGalaxy", 7, 1, 2, 0, 0, "HellProminenceGalaxy", "EventCometStarter"}, + {"SpecialStarCoin100CometRelease", 3, 1, 5, 0, 0, "EggStarGalaxy", 0}, + {"EventCoin100CometStarter", 4, 1, 0, 0, 0, "EventCometStarter", "SpecialStarCoin100CometRelease"}, + {"Coin100CometEggStarGalaxy", 7, 1, 1, 0, 0, "EggStarGalaxy", "ViewNormalEnding"}, + {"Coin100CometHoneyBeeKingdomGalaxy", 7, 1, 1, 0, 0, "HoneyBeeKingdomGalaxy", "EventCoin100CometStarter"}, + {"Coin100CometStarDustGalaxy", 7, 1, 1, 0, 0, "StarDustGalaxy", "EventCoin100CometStarter"}, + {"Coin100CometBattleShipGalaxy", 7, 1, 1, 0, 0, "BattleShipGalaxy", "EventCoin100CometStarter"}, + {"Coin100CometHeavenlyBeachGalaxy", 7, 1, 1, 0, 0, "HeavenlyBeachGalaxy", "EventCoin100CometStarter"}, + {"Coin100CometPhantomGalaxy", 7, 1, 2, 0, 0, "PhantomGalaxy", "EventCoin100CometStarter"}, + {"Coin100CometCosmosGardenGalaxy", 7, 1, 1, 0, 0, "CosmosGardenGalaxy", "EventCoin100CometStarter"}, + {"Coin100CometIceVolcanoGalaxy", 7, 1, 1, 0, 0, "IceVolcanoGalaxy", "EventCoin100CometStarter"}, + {"Coin100CometSandClockGalaxy", 7, 1, 2, 0, 0, "SandClockGalaxy", "EventCoin100CometStarter"}, + {"Coin100CometReverseKingdomGalaxy", 7, 1, 3, 0, 0, "ReverseKingdomGalaxy", "EventCoin100CometStarter"}, + {"Coin100CometOceanRingGalaxy", 7, 1, 3, 0, 0, "OceanRingGalaxy", "EventCoin100CometStarter"}, + {"Coin100CometFactoryGalaxy", 7, 1, 2, 0, 0, "FactoryGalaxy", "EventCoin100CometStarter"}, + {"Coin100CometOceanPhantomCaveGalaxy", 7, 1, 1, 0, 0, "OceanPhantomCaveGalaxy", "EventCoin100CometStarter"}, + {"Coin100CometCannonFleetGalaxy", 7, 1, 2, 0, 0, "CannonFleetGalaxy", "EventCoin100CometStarter"}, + {"Coin100CometHellProminenceGalaxy", 7, 1, 3, 0, 0, "HellProminenceGalaxy", "EventCoin100CometStarter"}, + {"SpecialStarGrand1", 3, 1, 1, 0, 0, "HeavensDoorGalaxy", 0}, + {"SpecialStarGrand2", 3, 1, 1, 0, 0, "TriLegLv1Galaxy", 0}, + {"SpecialStarGrand3", 3, 1, 1, 0, 0, "KoopaBattleVs1Galaxy", 0}, + {"SpecialStarGrand4", 3, 1, 1, 0, 0, "KoopaJrShipLv1Galaxy", 0}, + {"SpecialStarGrand5", 3, 1, 1, 0, 0, "KoopaBattleVs2Galaxy", 0}, + {"SpecialStarGrand6", 3, 1, 1, 0, 0, "FloaterOtaKingGalaxy", 0}, + {"SpecialStarGrand7", 3, 1, 1, 0, 0, "KoopaBattleVs3Galaxy", 0}, + {"SpecialStarGreen1", 3, 1, 7, 0, 0, "BattleShipGalaxy", 0}, + {"SpecialStarGreen2", 3, 1, 2, 0, 0, "OceanFloaterLandGalaxy", 0}, + {"SpecialStarGreen3", 3, 1, 7, 0, 0, "SandClockGalaxy", 0}, + {"SpecialStarGreen1/2", 4, 1, 0, 0, 0, "SpecialStarGreen1", "SpecialStarGreen2"}, + {"SpecialStarGreenAll", 4, 1, 0, 0, 0, "SpecialStarGreen1/2", "SpecialStarGreen3"}, + {"SpecialStarRed1", 3, 1, 2, 0, 0, "HeavensDoorGalaxy", 0}, + {"AppearHeavensDoorGalaxy", 4, 1, 0, 0, 0, "SpecialStarRed1", 0}, + {"EventCometStarter", 1, 1, 13, 0, 0, 0, 0}, + {"EventKinopioExplorerRescued", 3, 1, 1, 0, 0, "HoneyBeeKingdomGalaxy", 0}, + {"EventKinopioExplorerOrganize", 1, 1, 7, 0, 0, 0, 0}, + {"ExOpen1CocoonExGalaxy", 3, 1, 3, 0, 0, "StarDustGalaxy", 0}, + {"ExOpen1TearDropGalaxy", 3, 1, 1, 0, 0, "HeavenlyBeachGalaxy", 0}, + {"ExOpen1FishTunnelGalaxy", 3, 1, 1, 0, 0, "SandClockGalaxy", 0}, + {"ExOpenCommonBase", 3, 1, 1, 0, 0, "PhantomGalaxy", 0}, + {"ExOpenSubTransformationExGalaxy", 3, 1, 2, 0, 0, "OceanRingGalaxy", 0}, + {"ExOpenSubTeresaMario2DGalaxy", 3, 1, 2, 0, 0, "HeavensDoorGalaxy", 0}, + {"ExOpen1TransformationExGalaxy", 4, 1, 0, 0, 0, "ExOpenCommonBase", "ExOpenSubTransformationExGalaxy"}, + {"ExOpen1TeresaMario2DGalaxy", 4, 1, 0, 0, 0, "ExOpenCommonBase", "ExOpenSubTeresaMario2DGalaxy"}, + {"ExOpen1SnowCapsuleGalaxy", 3, 1, 1, 0, 0, "HellProminenceGalaxy", 0}, + {"ExOpen1BeltConveyerExGalaxy", 1, 1, 7, 0, 0, 0, 0}, + {"AppearBeltConveyerExGalaxy", 4, 1, 0, 0, 0, "SpecialStarGrand1", "ExOpen1BeltConveyerExGalaxy"}, + {"AppearCocoonExGalaxy", 4, 1, 0, 0, 0, "SpecialStarGrand2", "ExOpen1CocoonExGalaxy"}, + {"AppearTearDropGalaxy", 4, 1, 0, 0, 0, "SpecialStarGrand3", "ExOpen1TearDropGalaxy"}, + {"AppearFishTunnelGalaxy", 4, 1, 0, 0, 0, "SpecialStarGrand4", "ExOpen1FishTunnelGalaxy"}, + {"AppearTransformationExGalaxy", 4, 1, 0, 0, 0, "SpecialStarGrand5", "ExOpen1TransformationExGalaxy"}, + {"AppearTeresaMario2DGalaxy", 4, 1, 0, 0, 0, "SpecialStarGrand6", "ExOpen1TeresaMario2DGalaxy"}, + {"AppearSnowCapsuleGalaxy", 4, 1, 0, 0, 0, "SpecialStarGrand6", "ExOpen1SnowCapsuleGalaxy"}, + {"StarPieceBeltConveyerExGalaxy", 8, 1, 0, 40, 0, "BeltConveyerExGalaxy", 0}, + {"StarPieceCocoonExGalaxy", 8, 1, 1, 40, 0, "CocoonExGalaxy", 0}, + {"StarPieceTearDropGalaxy", 8, 1, 2, 60, 0, "TearDropGalaxy", 0}, + {"StarPieceFishTunnelGalaxy", 8, 1, 6, 80, 0, "FishTunnelGalaxy", 0}, + {"StarPieceTransformationExGalaxy", 8, 1, 5, 100, 0, "TransformationExGalaxy", 0}, + {"StarPieceTeresaMario2DGalaxy", 8, 1, 3, 120, 0, "TeresaMario2DGalaxy", 0}, + {"StarPieceSnowCapsuleGalaxy", 8, 1, 4, 160, 0, "SnowCapsuleGalaxy", 0}, + {"AppearTamakoroExLv2Galaxy", 4, 1, 0, 0, 0, "SpecialStarGreenAll", 0}, + {"AppearSurfingLv2Galaxy", 4, 1, 0, 0, 0, "SpecialStarGreenAll", 0}, + {"AppearCubeBubbleExLv2Galaxy", 4, 1, 0, 0, 0, "SpecialStarGreenAll", 0}, + {"AppearPeachCastleFinalGalaxy", 4, 1, 0, 0, 0, "ViewCompleteMarioAndLuigi", 0}, + {"LibraryOpenRequirement", 9, 1, 0, 0, 0, "LibraryOpenNewStarCount", "SpecialStarGrand3"}, + {"StarNumPictureBookB", 1, 1, 24, 0, 0, 0, 0}, + {"StarNumPictureBookC", 1, 1, 28, 0, 0, 0, 0}, + {"StarNumPictureBookD", 1, 1, 32, 0, 0, 0, 0}, + {"StarNumPictureBookE", 1, 1, 40, 0, 0, 0, 0}, + {"StarNumPictureBookF", 1, 1, 49, 0, 0, 0, 0}, + {"StarNumPictureBookG", 1, 1, 58, 0, 0, 0, 0}, + {"PictureBookA", 4, 1, 0, 0, 0, "LibraryOpenRequirement", 0}, + {"PictureBookB", 4, 1, 0, 0, 0, "StarNumPictureBookB", "LibraryOpenRequirement"}, + {"PictureBookC", 4, 1, 0, 0, 0, "StarNumPictureBookC", "LibraryOpenRequirement"}, + {"PictureBookD", 4, 1, 0, 0, 0, "StarNumPictureBookD", "LibraryOpenRequirement"}, + {"PictureBookE", 4, 1, 0, 0, 0, "StarNumPictureBookE", "LibraryOpenRequirement"}, + {"PictureBookF", 4, 1, 0, 0, 0, "StarNumPictureBookF", "LibraryOpenRequirement"}, + {"PictureBookG", 4, 1, 0, 0, 0, "StarNumPictureBookG", "LibraryOpenRequirement"}, + {"PictureBookH", 3, 1, 1, 0, 0, "KoopaBattleVs3Galaxy", 0}, + {"PictureBookI", 3, 1, 1, 0, 0, "KoopaBattleVs3Galaxy", 0}, + {"SpecialStarLuigiRescued", 3, 1, 1, 0, 0, "PhantomGalaxy", 0}, + {"LuigiTalkAfterRescued", 4, 0, 0, 0, 0, "SpecialStarLuigiRescued", 0}, + {"SpecialStarFindingLuigi1", 3, 1, 6, 0, 0, "EggStarGalaxy", 0}, + {"SpecialStarFindingLuigi2", 3, 1, 7, 0, 0, "BattleShipGalaxy", 0}, + {"SpecialStarFindingLuigi3", 3, 1, 6, 0, 0, "HoneyBeeKingdomGalaxy", 0}, + {"RosettaTalkAboutTico", 4, 0, 0, 0, 0, "SpecialStarGrand6", 0}, + {"RosettaTalkAfterNormalEnding", 4, 0, 0, 0, 0, "ViewNormalEnding", 0}, + {"ViewNormalEnding", 4, 1, 0, 0, 0, "PictureBookH", 0}, + {"PowerStarComplete", 1, 1, 120, 0, 0, 0, 0}, + {"ViewCompleteEnding", 4, 0, 0, 0, 0, "PowerStarComplete", 0}, + {"ViewCompleteMarioAndLuigi", 10, 1, 0, 0, 0, 0, 0}, + {"SpecialStarFinalChallenge", 3, 1, 1, 0, 0, "PeachCastleFinalGalaxy", 0}, + {"StarPieceCounterStop", 0, 0, 0, 0, 0, 0, 0}, + {"PlayHeavensDoorGalaxy1", 4, 1, 0, 0, 0, 0, 0}, + {"PlayHeavensDoorGalaxy2", 4, 1, 0, 0, 0, "SpecialStarGrand6", 0}, + {"[同期]ピーチ城浮上後", 11, 1, 0, 0, 0, "PlayHeavensDoorGalaxy1", "ピーチ城浮上後"}, + {"PlayEggStarGalaxy1", 4, 1, 0, 0, 0, "SpecialStarGrand1", 0}, + {"[同期]バトラー情報Ａ", 11, 1, 0, 0, 0, "PlayEggStarGalaxy1", "バトラー情報Ａ"}, + {"SpecialStarEggStarGalaxy1", 3, 1, 1, 0, 0, "EggStarGalaxy", 0}, + {"PlayEggStarGalaxy2", 4, 1, 0, 0, 0, "SpecialStarEggStarGalaxy1", 0}, + {"[同期]スターピースレクチャー", 11, 1, 0, 0, 0, "PlayEggStarGalaxy2", "スターピースレクチャー"}, + {"PowerStarNumForButlerKoopaDemo", 2, 1, 0, 0, 0, "KoopaBattleVs1Galaxy", 0}, + {"[同期]クッパスタープラント発見", 11, 1, 0, 0, 0, "PowerStarNumForButlerKoopaDemo", "クッパスタープラント発見"}}; struct GameEventFlagSortLt { - bool operator()(GameEventFlagTableInstance::Key *key1, GameEventFlagTableInstance::Key *key2) { + bool operator()(GameEventFlagTableInstance::Key* key1, GameEventFlagTableInstance::Key* key2) { return (key1->mHashCode < key2->mHashCode) ? true : false; } }; -}; +}; // namespace bool GameEventFlagIter::isEnd() const { if (GameEventFlagIter::isValid() == false) { @@ -228,33 +226,31 @@ const GameEventFlag* GameEventFlagIter::getFlag() const { bool GameEventFlagIter::isValid() const { if (mIter >= 0) { return true; - } - else { + } else { return false; } } -GameEventFlagTableInstance::GameEventFlagTableInstance() { +GameEventFlagTableInstance::GameEventFlagTableInstance() { mSortTable = nullptr; mLength = 0; GameEventFlagTableInstance::initSortTable(); } -const GameEventFlag* GameEventFlagTableInstance::findFlag(const char *flagName) { +const GameEventFlag* GameEventFlagTableInstance::findFlag(const char* flagName) { int i; u16 hashCode = MR::getHashCode(flagName); i = mLength; i = (i * 8) / 8; - GameEventFlagTableInstance::Key *key = mSortTable; + GameEventFlagTableInstance::Key* key = mSortTable; while (i > 0) { int mid = i / 2; if ((&key[i / 2])->mHashCode < hashCode) { i -= mid + 1; key = &key[mid] + 1; - } - else { + } else { i = mid; } } @@ -267,7 +263,7 @@ const GameEventFlag* GameEventFlagTableInstance::findFlag(const char *flagName) } void GameEventFlagTableInstance::initSortTable() { - s32 tableLength = sizeof(sGameEventFlagStatic)/sizeof(*sGameEventFlagStatic); + s32 tableLength = sizeof(sGameEventFlagStatic) / sizeof(*sGameEventFlagStatic); mSortTable = new GameEventFlagTableInstance::Key[tableLength]; mLength = tableLength; @@ -279,154 +275,151 @@ void GameEventFlagTableInstance::initSortTable() { std::sort(&mSortTable[0], &mSortTable[mLength], GameEventFlagSortLt()); } -namespace GameEventFlagTable{ +namespace GameEventFlagTable { -GameEventFlagIter getBeginIter() { - return GameEventFlagIter(); -} - -GameEventFlagAccessor makeAccessor(const char* flagName) { - return findFlag(flagName); -} - -s32 getTableSize() { - return sizeof(sGameEventFlagStatic)/sizeof(*sGameEventFlagStatic); -} - -const GameEventFlag* getFlag(int index) { - if (index < 0 || index >= getTableSize()) { - return nullptr; - } - else { - return &sGameEventFlagStatic[index]; - } -} - -const GameEventFlag* findFlag(const char* flagName) { - return SingletonHolder::get()->findFlag(flagName); -} - -const char* getEventFlagNameSpecialPowerStar(const char *galaxyName, s32 starId) { - for (GameEventFlagIter iter = getBeginIter(); !iter.isEnd(); iter.goNext()) { - GameEventFlagAccessor flagAccessor = GameEventFlagAccessor(iter.getFlag()); - - if (flagAccessor.isTypeSpecialStar() && flagAccessor.getStarId() == starId) { - if(MR::isEqualString(galaxyName, flagAccessor.getGalaxyName())) { - return flagAccessor.getName(); - } - } - } - return nullptr; -} - - bool isPowerStarType(const char *galaxyName, s32 starId, const char *starType) { - const char* name = getEventFlagNameSpecialPowerStar(galaxyName, starId); - if (name == nullptr) { - return false; + GameEventFlagIter getBeginIter() { + return GameEventFlagIter(); } - return MR::isEqualString(name, starType); - }; + GameEventFlagAccessor makeAccessor(const char* flagName) { + return findFlag(flagName); + } -s32 calcExclamationGalaxyNum() { - s32 num = -1; + s32 getTableSize() { + return sizeof(sGameEventFlagStatic) / sizeof(*sGameEventFlagStatic); + } - for (GameEventFlagIter iter = getBeginIter(); !iter.isEnd(); iter.goNext()) { - GameEventFlagAccessor flagAccessor = GameEventFlagAccessor(iter.getFlag()); - - if(flagAccessor.isTypeStarPiece() && num < flagAccessor.getStarPieceIndex()) { - num = flagAccessor.getStarPieceIndex(); + const GameEventFlag* getFlag(int index) { + if (index < 0 || index >= getTableSize()) { + return nullptr; + } else { + return &sGameEventFlagStatic[index]; } } - return num + 1; -}; - -const char* getExclamationGalaxyNameFromIndex(int index) { - for (GameEventFlagIter iter = getBeginIter(); !iter.isEnd(); iter.goNext()) { - GameEventFlagAccessor flagAccessor = GameEventFlagAccessor(iter.getFlag()); - - if (flagAccessor.isTypeStarPiece() && flagAccessor.getStarPieceIndex() == index) { - return flagAccessor.getGalaxyNameWithStarPiece(); - } + const GameEventFlag* findFlag(const char* flagName) { + return SingletonHolder::get()->findFlag(flagName); } - return nullptr; -}; - -bool isExist(const char * flagName) { - return findFlag(flagName) != nullptr; -}; - -int getIndex(const GameEventFlag *eventFlag) { - return eventFlag - &sGameEventFlagStatic[0]; -}; - -bool isDependedAnother(const char *flagName1, const char *flagName2) { - const GameEventFlag *flag1 = findFlag(flagName1); - - if (flag1->mType == 0x4) { - if (flag1->mRequirement1 != nullptr && MR::isEqualString(flag1->mRequirement1, flagName2)) { - return true; - } - else if (flag1->mRequirement2 != nullptr && MR::isEqualString(flag1->mRequirement2, flagName2)) { - return true; - } - } - else if (flag1->mType == 0x06) { - const char* dependedFlags[3]; - s32 length = getGalaxyDependedFlags(dependedFlags, 3, flagName1); - - for (s32 i = 0; i < length; i++) { - if (MR::isEqualString(dependedFlags[i], flagName2)) { - return true; - } - } - } - - return false; -}; - -int getIndexFromHashCode(u16 hashCode) { - for (GameEventFlagIter iter = getBeginIter(); !iter.isEnd(); iter.goNext()) { - - if (!(iter.getFlag()->saveFlag & 0x1)) { + const char* getEventFlagNameSpecialPowerStar(const char* galaxyName, s32 starId) { + for (GameEventFlagIter iter = getBeginIter(); !iter.isEnd(); iter.goNext()) { GameEventFlagAccessor flagAccessor = GameEventFlagAccessor(iter.getFlag()); - if ((MR::getHashCode(flagAccessor.getName()) &0x7FFF) == hashCode) { - return getFlag(iter.mIter) - &sGameEventFlagStatic[0]; + if (flagAccessor.isTypeSpecialStar() && flagAccessor.getStarId() == starId) { + if (MR::isEqualString(galaxyName, flagAccessor.getGalaxyName())) { + return flagAccessor.getName(); + } } } + return nullptr; } - return -1; -}; - -s32 calcSpecialPowerStarNum(const char *powerStarType) { - s32 num = 0; - - for (GameEventFlagIter iter = getBeginIter(); !iter.isEnd(); iter.goNext()) { - GameEventFlagAccessor flagAccessor = GameEventFlagAccessor(iter.getFlag()); - - if (flagAccessor.isTypeSpecialStar() && strstr(flagAccessor.getName(), powerStarType)) { - num++; + bool isPowerStarType(const char* galaxyName, s32 starId, const char* starType) { + const char* name = getEventFlagNameSpecialPowerStar(galaxyName, starId); + if (name == nullptr) { + return false; } + + return MR::isEqualString(name, starType); + }; + + s32 calcExclamationGalaxyNum() { + s32 num = -1; + + for (GameEventFlagIter iter = getBeginIter(); !iter.isEnd(); iter.goNext()) { + GameEventFlagAccessor flagAccessor = GameEventFlagAccessor(iter.getFlag()); + + if (flagAccessor.isTypeStarPiece() && num < flagAccessor.getStarPieceIndex()) { + num = flagAccessor.getStarPieceIndex(); + } + } + + return num + 1; + }; + + const char* getExclamationGalaxyNameFromIndex(int index) { + for (GameEventFlagIter iter = getBeginIter(); !iter.isEnd(); iter.goNext()) { + GameEventFlagAccessor flagAccessor = GameEventFlagAccessor(iter.getFlag()); + + if (flagAccessor.isTypeStarPiece() && flagAccessor.getStarPieceIndex() == index) { + return flagAccessor.getGalaxyNameWithStarPiece(); + } + } + + return nullptr; + }; + + bool isExist(const char* flagName) { + return findFlag(flagName) != nullptr; + }; + + int getIndex(const GameEventFlag* eventFlag) { + return eventFlag - &sGameEventFlagStatic[0]; + }; + + bool isDependedAnother(const char* flagName1, const char* flagName2) { + const GameEventFlag* flag1 = findFlag(flagName1); + + if (flag1->mType == 0x4) { + if (flag1->mRequirement1 != nullptr && MR::isEqualString(flag1->mRequirement1, flagName2)) { + return true; + } else if (flag1->mRequirement2 != nullptr && MR::isEqualString(flag1->mRequirement2, flagName2)) { + return true; + } + } else if (flag1->mType == 0x06) { + const char* dependedFlags[3]; + s32 length = getGalaxyDependedFlags(dependedFlags, 3, flagName1); + + for (s32 i = 0; i < length; i++) { + if (MR::isEqualString(dependedFlags[i], flagName2)) { + return true; + } + } + } + + return false; + }; + + int getIndexFromHashCode(u16 hashCode) { + for (GameEventFlagIter iter = getBeginIter(); !iter.isEnd(); iter.goNext()) { + + if (!(iter.getFlag()->saveFlag & 0x1)) { + GameEventFlagAccessor flagAccessor = GameEventFlagAccessor(iter.getFlag()); + + if ((MR::getHashCode(flagAccessor.getName()) & 0x7FFF) == hashCode) { + return getFlag(iter.mIter) - &sGameEventFlagStatic[0]; + } + } + } + + return -1; + }; + + s32 calcSpecialPowerStarNum(const char* powerStarType) { + s32 num = 0; + + for (GameEventFlagIter iter = getBeginIter(); !iter.isEnd(); iter.goNext()) { + GameEventFlagAccessor flagAccessor = GameEventFlagAccessor(iter.getFlag()); + + if (flagAccessor.isTypeSpecialStar() && strstr(flagAccessor.getName(), powerStarType)) { + num++; + } + } + + return num; + }; + + s32 getStarPieceNumToOpenExclamationGalaxy(const char* galaxyName) { + char dest[0x40]; + + snprintf(dest, sizeof(dest), "StarPiece%s", galaxyName); + + GameEventFlagAccessor flagAccessor = makeAccessor(dest); + return flagAccessor.getNeedStarPieceNum(); } - return num; -}; + s32 calcGreenPowerStarNum() { + return calcSpecialPowerStarNum("SpecialStarGreen"); + } -s32 getStarPieceNumToOpenExclamationGalaxy(const char *galaxyName) { - char dest[0x40]; - - snprintf(dest, sizeof(dest), "StarPiece%s", galaxyName); - - GameEventFlagAccessor flagAccessor = makeAccessor(dest); - return flagAccessor.getNeedStarPieceNum(); -} - -s32 calcGreenPowerStarNum() { - return calcSpecialPowerStarNum("SpecialStarGreen"); -} - -} +} // namespace GameEventFlagTable diff --git a/src/Game/System/GameSequenceDirector.cpp b/src/Game/System/GameSequenceDirector.cpp index dc581de40..3cb2b0e25 100644 --- a/src/Game/System/GameSequenceDirector.cpp +++ b/src/Game/System/GameSequenceDirector.cpp @@ -7,12 +7,11 @@ #include "Game/Util/Functor.hpp" #include -GameSequenceDirector::GameSequenceDirector() : - mGameDataTemporaryInGalaxy(nullptr), - mGameSequenceProgress(nullptr), - mSaveDataHandleSequence(nullptr), - mNWC24Messenger(nullptr) -{ +GameSequenceDirector::GameSequenceDirector() + : mGameDataTemporaryInGalaxy(nullptr), + mGameSequenceProgress(nullptr), + mSaveDataHandleSequence(nullptr), + mNWC24Messenger(nullptr) { mSaveDataHandleSequence = new SaveDataHandleSequence(); mSaveDataHandleSequence->registerFunctorOnSaveSuccess( MR::Functor(this, &GameSequenceDirector::executeOnSaveSuccess)); diff --git a/src/Game/System/GameSequenceFunction.cpp b/src/Game/System/GameSequenceFunction.cpp index 489307091..56892adb0 100644 --- a/src/Game/System/GameSequenceFunction.cpp +++ b/src/Game/System/GameSequenceFunction.cpp @@ -32,7 +32,7 @@ namespace { NWC24Messenger* getNWC24Messenger() NO_INLINE { return SingletonHolder::get()->mSequenceDirector->mNWC24Messenger; } -}; +}; // namespace namespace GameSequenceFunction { void activateGalaxyCometScheduler() { @@ -164,8 +164,7 @@ namespace GameSequenceFunction { return false; } - return MR::isEqualString(getClearedStageName(), pClearedStageName) - && getClearedPowerStarId() == clearedPowerStarId; + return MR::isEqualString(getClearedStageName(), pClearedStageName) && getClearedPowerStarId() == clearedPowerStarId; } bool isPowerStarGreenAtResultSequence() { @@ -288,9 +287,7 @@ namespace GameSequenceFunction { } void storeSceneStartGameDataHolder() { - if (!GameDataFunction::isPassedStoryEvent("チコガイドデモ終了") - || GameDataFunction::hasGrandStar(1)) - { + if (!GameDataFunction::isPassedStoryEvent("チコガイドデモ終了") || GameDataFunction::hasGrandStar(1)) { getSaveDataHandleSequence()->backupCurrentUserFile(); } } @@ -307,13 +304,10 @@ namespace GameSequenceFunction { void startGameDataSaveSequence(bool isConfirmRemind, bool isSaveAndQuitMsg) { getGameSequenceProgress()->getGalaxyCometScheduler()->updateStateToGameData(); - if (GameDataFunction::isPassedStoryEvent("ピーチ城浮上後") - && !GameDataFunction::hasGrandStar(1)) - { + if (GameDataFunction::isPassedStoryEvent("ピーチ城浮上後") && !GameDataFunction::hasGrandStar(1)) { getSaveDataHandleSequence()->startSaveBackup(isConfirmRemind, isSaveAndQuitMsg); - } - else { + } else { getSaveDataHandleSequence()->startSave(isConfirmRemind, isSaveAndQuitMsg); } } -}; +}; // namespace GameSequenceFunction diff --git a/src/Game/System/GameSequenceProgress.cpp b/src/Game/System/GameSequenceProgress.cpp index ff93f82ff..718c90d28 100644 --- a/src/Game/System/GameSequenceProgress.cpp +++ b/src/Game/System/GameSequenceProgress.cpp @@ -35,21 +35,20 @@ namespace { NEW_NERVE(GameSequenceProgressNormal, GameSequenceProgress, Normal); NEW_NERVE(GameSequenceProgressGalaxyMove, GameSequenceProgress, GalaxyMove); NEW_NERVE(GameSequenceProgressResetProcessing, GameSequenceProgress, ResetProcessing); -}; +}; // namespace -GameSequenceProgress::GameSequenceProgress() : - NerveExecutor("シーケンス進行"), - mStarPointerOnOffController(nullptr), - mStorySequenceExecutor(nullptr), - mFindingLuigiEventScheduler(nullptr), - mGalaxyCometScheduler(nullptr), - mLuigiLeftSupplier(nullptr), - mPlayerMissLeft(nullptr), - _20(0), - _24(false), - _25(false), - _26(true) -{ +GameSequenceProgress::GameSequenceProgress() + : NerveExecutor("シーケンス進行"), + mStarPointerOnOffController(nullptr), + mStorySequenceExecutor(nullptr), + mFindingLuigiEventScheduler(nullptr), + mGalaxyCometScheduler(nullptr), + mLuigiLeftSupplier(nullptr), + mPlayerMissLeft(nullptr), + _20(0), + _24(false), + _25(false), + _26(true) { initNerve(&::GameSequenceProgressBooting::sInstance); mStarPointerOnOffController = new StarPointerOnOffController(); @@ -76,9 +75,7 @@ void GameSequenceProgress::update() { mGalaxyCometScheduler->update(); } - if (!isNerve(&::GameSequenceProgressResetProcessing::sInstance) - && GameSystemFunction::isResetProcessing()) - { + if (!isNerve(&::GameSequenceProgressResetProcessing::sInstance) && GameSystemFunction::isResetProcessing()) { setNerve(&::GameSequenceProgressResetProcessing::sInstance); } @@ -100,17 +97,13 @@ void GameSequenceProgress::startScene() { if (MR::isEqualSceneName("Logo")) { mStarPointerOnOffController->setStateToBase(this); - } - else if (MR::isEqualSceneName("Title")) { + } else if (MR::isEqualSceneName("Title")) { mStarPointerOnOffController->setStateToBase(this); - } - else if (MR::isEqualSceneName("ThankYou")) { + } else if (MR::isEqualSceneName("ThankYou")) { mStarPointerOnOffController->setStateToBase(this); - } - else if (MR::isStageFileSelect()) { + } else if (MR::isStageFileSelect()) { mStarPointerOnOffController->setStateToBase(this); - } - else { + } else { mStarPointerOnOffController->setStateToBase(this); MR::startStarPointerModeGame(this); } @@ -147,8 +140,7 @@ void GameSequenceProgress::endScene() { MR::requestChangeSceneAfterBoot(); GameSystemFunction::setResetOperationApplicationReset(); setNerve(&::GameSequenceProgressWaitGoToFirstScene::sInstance); - } - else if (!isNerve(&GameSequenceProgressWaitGoToFirstScene::sInstance)) { + } else if (!isNerve(&GameSequenceProgressWaitGoToFirstScene::sInstance)) { MR::requestChangeSceneTitle(); } } @@ -178,7 +170,6 @@ GalaxyCometScheduler* GameSequenceProgress::getGalaxyCometScheduler() { void GameSequenceProgress::exeBooting() { if (MR::isFirstStep(this)) { - } if (GameSequenceFunction::isReadyToStartScene()) { @@ -206,13 +197,11 @@ void GameSequenceProgress::exeNormal() { requestGalaxyMove(GalaxyMoveArgument(3, nullptr, 1, nullptr)); _25 = false; - } - else { + } else { startScene(); GameSequenceFunction::startScene(); } - } - else if (GameSequenceFunction::isReadyToStartScene()) { + } else if (GameSequenceFunction::isReadyToStartScene()) { setNerve(&::GameSequenceProgressNormal::sInstance); } } @@ -261,9 +250,7 @@ bool GameSequenceProgress::isScenePermittedIsUpdateWiiRemoteStatus() { } bool GameSequenceProgress::isSceneLongAutoSleepWiiRemote() { - if (MR::isEqualSceneName("Game") - && MR::isEqualStageName("EpilogueDemoStage")) - { + if (MR::isEqualSceneName("Game") && MR::isEqualStageName("EpilogueDemoStage")) { return true; } @@ -271,9 +258,7 @@ bool GameSequenceProgress::isSceneLongAutoSleepWiiRemote() { } void GameSequenceProgress::updateGameDataBeforeChangeScene() { - if (GameSequenceFunction::hasStageResultSequence() - && GameSequenceFunction::isPowerStarAtResultSequence("KoopaBattleVs3Galaxy", 1)) - { + if (GameSequenceFunction::hasStageResultSequence() && GameSequenceFunction::isPowerStarAtResultSequence("KoopaBattleVs3Galaxy", 1)) { GameSequenceFunction::reflectStageResultSequenceCoin(); GameDataFunction::addStockedStarPiece( GameSequenceFunction::getClearedStarPieceNum()); @@ -300,22 +285,16 @@ void GameSequenceProgress::resetGameDataAfterChangeScene(const GalaxyMoveArgumen break; } - if (rParam1.isEqualStageScenario("HeavensDoorGalaxy", 1) - && mStorySequenceExecutor->isEqualStageScenarioBefore("PeachCastleGardenGalaxy", 1) - && rParam1.mMoveType == 0) - { + if (rParam1.isEqualStageScenario("HeavensDoorGalaxy", 1) && mStorySequenceExecutor->isEqualStageScenarioBefore("PeachCastleGardenGalaxy", 1) && rParam1.mMoveType == 0) { GameDataFunction::addStarPiece(starPieceNum); GameDataFunction::setLast1upStarPieceNum(last1upStarPieceNum); } } void GameSequenceProgress::updateGameDataGalaxyVisitedFlag() { - if (MR::isEqualSceneName("Game") - && !_25 - && !isNerve(&::GameSequenceProgressResetProcessing::sInstance)) - { + if (MR::isEqualSceneName("Game") && !_25 && !isNerve(&::GameSequenceProgressResetProcessing::sInstance)) { const char* pStageName = MR::getCurrentStageName(); - s32 scenarioNo = MR::getCurrentScenarioNo(); + s32 scenarioNo = MR::getCurrentScenarioNo(); GameDataFunction::onGalaxyScenarioFlagAlreadyVisited( pStageName, @@ -324,11 +303,7 @@ void GameSequenceProgress::updateGameDataGalaxyVisitedFlag() { } void GameSequenceProgress::setMinFrameBeforeStartNextStage(const GalaxyMoveArgument& rParam1) { - if (MR::isEqualSceneName("Game") - && MR::isEqualStageName("PeachCastleGardenGalaxy") - && MR::isEqualString(rParam1.mStageName, "HeavensDoorGalaxy") - && rParam1.mScenarioNo == 1) - { + if (MR::isEqualSceneName("Game") && MR::isEqualStageName("PeachCastleGardenGalaxy") && MR::isEqualString(rParam1.mStageName, "HeavensDoorGalaxy") && rParam1.mScenarioNo == 1) { _20 = 300; _24 = true; } @@ -343,9 +318,7 @@ void GameSequenceProgress::offLuigiLeftSupply() { } void GameSequenceProgress::countDownGameEventValueFromNewPowerStar() { - if (GameSequenceFunction::hasStageResultSequence() - && !GameSequenceFunction::hasPowerStarYetAtResultSequence()) - { + if (GameSequenceFunction::hasStageResultSequence() && !GameSequenceFunction::hasPowerStarYetAtResultSequence()) { for (GameEventFlagIter iter = GameEventFlagTable::getBeginIter(); !iter.isEnd(); iter.goNext()) { GameEventFlagAccessor accessor(iter.getFlag()); diff --git a/src/Game/System/GameSystem.cpp b/src/Game/System/GameSystem.cpp index 775174a02..588062fb0 100644 --- a/src/Game/System/GameSystem.cpp +++ b/src/Game/System/GameSystem.cpp @@ -43,7 +43,7 @@ namespace NrvGameSystem { NEW_NERVE(GameSystemLoadStationedArchive, GameSystem, LoadStationedArchive); NEW_NERVE(GameSystemWaitForReboot, GameSystem, WaitForReboot); NEW_NERVE(GameSystemNormal, GameSystem, Normal); -}; +}; // namespace NrvGameSystem void main(void) { OSInitFastCast(); @@ -70,22 +70,20 @@ void main(void) { } } -GameSystem::GameSystem() : - NerveExecutor("GameSystem"), - mFifoBase(nullptr), - mSequenceDirector(nullptr), - mErrorWatcher(nullptr), - mFontHolder(nullptr), - mFrameControl(nullptr), - mObjHolder(nullptr), - mSceneController(nullptr), - mStationedArchiveLoader(nullptr), - mHomeButtonLayout(nullptr), - mSystemWipeHolder(nullptr), - mHomeButtonStateNotifier(nullptr), - mIsExecuteLoadSystemArchive(false) -{ - +GameSystem::GameSystem() + : NerveExecutor("GameSystem"), + mFifoBase(nullptr), + mSequenceDirector(nullptr), + mErrorWatcher(nullptr), + mFontHolder(nullptr), + mFrameControl(nullptr), + mObjHolder(nullptr), + mSceneController(nullptr), + mStationedArchiveLoader(nullptr), + mHomeButtonLayout(nullptr), + mSystemWipeHolder(nullptr), + mHomeButtonStateNotifier(nullptr), + mIsExecuteLoadSystemArchive(false) { } void GameSystem::init() { @@ -133,9 +131,7 @@ void GameSystem::exeInitializeAudio() { updateSceneController(); - if (MR::isEndFunctionAsyncExecute(INIT_AUDIO_KEY) - && mObjHolder->mSysWrapper->isLoadDoneWaveDataAtSystemInit()) - { + if (MR::isEndFunctionAsyncExecute(INIT_AUDIO_KEY) && mObjHolder->mSysWrapper->isLoadDoneWaveDataAtSystemInit()) { MR::waitForEndFunctionAsyncExecute(INIT_AUDIO_KEY); setNerve(&NrvGameSystem::GameSystemInitializeLogoScene::sInstance); } @@ -144,8 +140,7 @@ void GameSystem::exeInitializeAudio() { void GameSystem::exeInitializeLogoScene() { if (GameSystemFunction::isResetProcessing()) { setNerve(&NrvGameSystem::GameSystemWaitForReboot::sInstance); - } - else { + } else { if (MR::isFirstStep(this)) { MR::requestChangeScene("Logo"); } @@ -164,7 +159,6 @@ void GameSystem::exeLoadStationedArchive() { } void GameSystem::exeWaitForReboot() { - } void GameSystem::exeNormal() { @@ -174,7 +168,7 @@ void GameSystem::exeNormal() { void GameSystem::initGX() { if (mFifoBase == nullptr) { - mFifoBase = new(32) u8[GX_FIFO_SIZE]; + mFifoBase = new (32) u8[GX_FIFO_SIZE]; } GXInit(mFifoBase, GX_FIFO_SIZE); @@ -203,9 +197,7 @@ inline bool isSystemNormal(const GameSystem* pGameSystem) { } bool GameSystem::isPreparedReset() const { - return isSystemWaitForReboot(this) - || isSystemNormal(this) - || mStationedArchiveLoader->isPreparedReset(); + return isSystemWaitForReboot(this) || isSystemNormal(this) || mStationedArchiveLoader->isPreparedReset(); } void GameSystem::frameLoop() { @@ -244,9 +236,7 @@ void GameSystem::update() { mErrorWatcher->movement(); } - mDimmingWatcher->_5 = mErrorWatcher->isWarning() - || mHomeButtonLayout->isActive() - || GameSequenceFunction::isActiveSaveDataHandleSequence(); + mDimmingWatcher->_5 = mErrorWatcher->isWarning() || mHomeButtonLayout->isActive() || GameSequenceFunction::isActiveSaveDataHandleSequence(); mDimmingWatcher->update(); updateNerve(); } @@ -254,9 +244,9 @@ void GameSystem::update() { void GameSystem::updateSceneController() { bool isSceneUpdate = true; bool isResetProcessing = SingletonHolder::get()->isActive(); - + mObjHolder->updateAudioSystem(); - + if (isResetProcessing) { isSceneUpdate = false; } @@ -269,13 +259,12 @@ void GameSystem::updateSceneController() { isSceneUpdate = false; } - mHomeButtonStateNotifier->update(mHomeButtonLayout->isActive() - || GameSystemFunction::isOccurredSystemWarning()); + mHomeButtonStateNotifier->update(mHomeButtonLayout->isActive() || GameSystemFunction::isOccurredSystemWarning()); if (isSceneUpdate || isResetProcessing) { mSequenceDirector->update(); } - + if (isSceneUpdate || mSceneController->isFirstUpdateSceneNerveNormal()) { if (mSystemWipeHolder != nullptr) { mSystemWipeHolder->movement(); @@ -283,7 +272,7 @@ void GameSystem::updateSceneController() { mSceneController->updateScene(); } - + if (isResetProcessing) { mSceneController->updateSceneDuringResetProcessing(); } diff --git a/src/Game/System/GameSystemDimmingWatcher.cpp b/src/Game/System/GameSystemDimmingWatcher.cpp index d19d32461..a368ceb2d 100644 --- a/src/Game/System/GameSystemDimmingWatcher.cpp +++ b/src/Game/System/GameSystemDimmingWatcher.cpp @@ -2,11 +2,10 @@ #include "Game/Util/TriggerChecker.hpp" #include -GameSystemDimmingWatcher::GameSystemDimmingWatcher() : - mChecker(nullptr), - _4(true), - _5(false) -{ +GameSystemDimmingWatcher::GameSystemDimmingWatcher() + : mChecker(nullptr), + _4(true), + _5(false) { mChecker = new TriggerChecker(); } @@ -15,8 +14,7 @@ void GameSystemDimmingWatcher::update() { if (mChecker->getOnTrigger()) { VIEnableDimming(true); - } - else if (mChecker->getOffTrigger()) { + } else if (mChecker->getOffTrigger()) { VIEnableDimming(false); } } diff --git a/src/Game/System/GameSystemException.cpp b/src/Game/System/GameSystemException.cpp index 839011b01..0425fc564 100644 --- a/src/Game/System/GameSystemException.cpp +++ b/src/Game/System/GameSystemException.cpp @@ -13,17 +13,17 @@ void* GameSystemException::sMapFileUsingBuffer; namespace { bool isBootWPAD() { - bool ret = false; + bool ret = false; GameSystemObjHolder* objHolder = SingletonHolder::get()->mObjHolder; if (objHolder != nullptr && objHolder->mWPadHolder != nullptr) { ret = true; } - + return ret; } - const s32 cDispExceptionCommand[8] = { 8, 4, 1, 2, 0x100, 0x10, 0, 0 }; -}; + const s32 cDispExceptionCommand[8] = {8, 4, 1, 2, 0x100, 0x10, 0, 0}; +}; // namespace void GameSystemException::init() { JUTDirectPrint* print = JUTDirectPrint::start(); @@ -49,7 +49,7 @@ void GameSystemException::init() { GameSystemException::sMapFileUsingBuffer = new u8[0x10]; } -void GameSystemException::handleException(u16 a1, OSContext *pContext, u32 a3, u32 a4) { +void GameSystemException::handleException(u16 a1, OSContext* pContext, u32 a3, u32 a4) { if (!JUTVideo::sManager) { JUTException::sConsole->mOutput = 2; JUTException::sConsole->mVisible = false; diff --git a/src/Game/System/GameSystemFrameControl.cpp b/src/Game/System/GameSystemFrameControl.cpp index 42bd3a238..b0525a438 100644 --- a/src/Game/System/GameSystemFrameControl.cpp +++ b/src/Game/System/GameSystemFrameControl.cpp @@ -1,9 +1,8 @@ #include "Game/System/GameSystemFrameControl.hpp" #include "Game/System/MainLoopFramework.hpp" -GameSystemFrameControl::GameSystemFrameControl() : - mIs60fps(true) -{ +GameSystemFrameControl::GameSystemFrameControl() + : mIs60fps(true) { setMovement60fps(); } @@ -12,8 +11,7 @@ void GameSystemFrameControl::setMovement60fps() { if (VIGetTvFormat() == VI_PAL) { MainLoopFramework::sManager->setTickRateFromFrame(1); - } - else { + } else { MainLoopFramework* pFramework = MainLoopFramework::sManager; pFramework->mRetraceCount = 1; pFramework->mTickDuration = 0; diff --git a/src/Game/System/GameSystemFunction.cpp b/src/Game/System/GameSystemFunction.cpp index 8148df3df..38aacdb1d 100644 --- a/src/Game/System/GameSystemFunction.cpp +++ b/src/Game/System/GameSystemFunction.cpp @@ -37,7 +37,7 @@ namespace { SaveDataHandleSequence* getSaveDataHandleSequence() NO_INLINE { return SingletonHolder::get()->mSequenceDirector->mSaveDataHandleSequence; } -}; +}; // namespace namespace GameSystemFunction { void loadAudioStaticWaveData() { @@ -270,8 +270,7 @@ namespace GameSystemFunction { } bool isPreparedFadeinSystem() { - return SingletonHolder::get()->isPreparedReset() - && SingletonHolder::get()->mSceneController->isPreparedReset(); + return SingletonHolder::get()->isPreparedReset() && SingletonHolder::get()->mSceneController->isPreparedReset(); } void restartSceneController() { @@ -279,8 +278,6 @@ namespace GameSystemFunction { } bool isDisplayStrapRemineder() { - return MR::isEqualSceneName("Logo") - && getLogoScene() != nullptr - && getLogoScene()->isDisplayStrapRemineder(); + return MR::isEqualSceneName("Logo") && getLogoScene() != nullptr && getLogoScene()->isDisplayStrapRemineder(); } -}; +}; // namespace GameSystemFunction diff --git a/src/Game/System/GameSystemObjHolder.cpp b/src/Game/System/GameSystemObjHolder.cpp index 6bd470eda..85bb1a800 100644 --- a/src/Game/System/GameSystemObjHolder.cpp +++ b/src/Game/System/GameSystemObjHolder.cpp @@ -17,20 +17,19 @@ #include "Game/SingletonHolder.hpp" #include -GameSystemObjHolder::GameSystemObjHolder() : - mObjHolder(nullptr), - mParticleResHolder(nullptr), - mRenderModeObj(nullptr), - mCaptureScreenDir(nullptr), - mScreenPreserver(nullptr), - mSysWrapper(nullptr), - mWPadHolder(nullptr), - mAsyncExec(nullptr), - mMsgHolder(nullptr), - mStarPointerDir(nullptr), - mRandom(0), - mLanguage(MR::getDecidedLanguageFromIPL()) -{ +GameSystemObjHolder::GameSystemObjHolder() + : mObjHolder(nullptr), + mParticleResHolder(nullptr), + mRenderModeObj(nullptr), + mCaptureScreenDir(nullptr), + mScreenPreserver(nullptr), + mSysWrapper(nullptr), + mWPadHolder(nullptr), + mAsyncExec(nullptr), + mMsgHolder(nullptr), + mStarPointerDir(nullptr), + mRandom(0), + mLanguage(MR::getDecidedLanguageFromIPL()) { initDvd(); initNAND(); initNameObj(); @@ -46,7 +45,7 @@ void GameSystemObjHolder::initAfterStationedResourceLoaded() { void GameSystemObjHolder::initMessageResource() { JKRArchive* pArchive = nullptr; - JKRHeap* pHeap = nullptr; + JKRHeap* pHeap = nullptr; MR::getMountedArchiveAndHeap("ErrorMessageArchive.arc", &pArchive, &pHeap); char systemFilePath[128]; diff --git a/src/Game/System/GameSystemResetAndPowerProcess.cpp b/src/Game/System/GameSystemResetAndPowerProcess.cpp index 642b36825..0b2505e84 100644 --- a/src/Game/System/GameSystemResetAndPowerProcess.cpp +++ b/src/Game/System/GameSystemResetAndPowerProcess.cpp @@ -13,7 +13,7 @@ namespace { static const s32 sFadeinoutFrame = 30; static const s32 sResetWaitFrame = 15; -}; +}; // namespace namespace NrvGameSystemResetAndPowerProcess { NEW_NERVE(GameSystemResetAndPowerProcessPolling, GameSystemResetAndPowerProcess, Polling); @@ -22,7 +22,7 @@ namespace NrvGameSystemResetAndPowerProcess { NEW_NERVE(GameSystemResetAndPowerProcessReset, GameSystemResetAndPowerProcess, Reset); NEW_NERVE(GameSystemResetAndPowerProcessWaitPrepareFadein, GameSystemResetAndPowerProcess, WaitPrepareFadein); NEW_NERVE(GameSystemResetAndPowerProcessFadein, GameSystemResetAndPowerProcess, Fadein); -}; +}; // namespace NrvGameSystemResetAndPowerProcess void GameSystemResetAndPowerProcess::init(const JMapInfoIter& rIter) { initNerve(&NrvGameSystemResetAndPowerProcess::GameSystemResetAndPowerProcessPolling::sInstance); @@ -75,20 +75,16 @@ void GameSystemResetAndPowerProcess::notifyCheckDiskResult(bool param1) { void GameSystemResetAndPowerProcess::exePolling() { if (tryAcceptPowerOff()) { setNerve(&NrvGameSystemResetAndPowerProcess::GameSystemResetAndPowerProcessWaitResetPermitted::sInstance); - } - else if (mResetTriggerChecker->getOnTrigger()) { + } else if (mResetTriggerChecker->getOnTrigger()) { setNerve(&NrvGameSystemResetAndPowerProcess::GameSystemResetAndPowerProcessWaitResetPermitted::sInstance); } } void GameSystemResetAndPowerProcess::exeWaitResetPermitted() { - if (GameSystemFunction::isPermitToResetAudioSystem() - && GameSystemFunction::isPermitToResetSaveDataHandleSequence()) - { + if (GameSystemFunction::isPermitToResetAudioSystem() && GameSystemFunction::isPermitToResetSaveDataHandleSequence()) { if (_5E) { mFadeinValueControl->setZero(); - } - else { + } else { mFadeinValueControl->setDirToZero(); } @@ -172,8 +168,7 @@ void GameSystemResetAndPowerProcess::exeFadein() { GameSystemFunction::restartControllerLeaveWatcher(); GameSystemFunction::restartSceneController(); setNerve(&NrvGameSystemResetAndPowerProcess::GameSystemResetAndPowerProcessWaitResetPermitted::sInstance); - } - else { + } else { if (MR::isFirstStep(this)) { mFadeinValueControl->setDirToOneResetFrame(); } @@ -225,10 +220,7 @@ bool GameSystemResetAndPowerProcess::tryAcceptPowerOff() { } bool GameSystemResetAndPowerProcess::isResetAcceptAudio() const { - if (mResetOperation != 0 - && MR::isGreaterStep(this, 2) - && GameSystemFunction::isDoneResetAudioSystem()) - { + if (mResetOperation != 0 && MR::isGreaterStep(this, 2) && GameSystemFunction::isDoneResetAudioSystem()) { return true; } @@ -248,15 +240,14 @@ void GameSystemResetAndPowerProcess::handleCheckDiskAsync(s32 result, DVDCommand SingletonHolder::get()->notifyCheckDiskResult(result != 0); } -GameSystemResetAndPowerProcess::GameSystemResetAndPowerProcess() : - LayoutActor("リセット・電源", false), - mResetTriggerChecker(nullptr), - mFadeinValueControl(nullptr), - mResetOperation(1), - _5C(true), - mIsValidPowerOff(false), - _5E(false) -{ +GameSystemResetAndPowerProcess::GameSystemResetAndPowerProcess() + : LayoutActor("リセット・電源", false), + mResetTriggerChecker(nullptr), + mFadeinValueControl(nullptr), + mResetOperation(1), + _5C(true), + mIsValidPowerOff(false), + _5E(false) { mResetTriggerChecker = new TriggerChecker(); mFadeinValueControl = new ValueControl(sFadeinoutFrame); diff --git a/src/Game/System/GameSystemSceneController.cpp b/src/Game/System/GameSystemSceneController.cpp index 184e555e1..61ab4726e 100644 --- a/src/Game/System/GameSystemSceneController.cpp +++ b/src/Game/System/GameSystemSceneController.cpp @@ -20,7 +20,7 @@ namespace { AudSystemWrapper* getAudioSystemWrapper() NO_INLINE { return SingletonHolder::get()->mObjHolder->mSysWrapper; } -}; +}; // namespace namespace NrvGameSystemSceneController { NEW_NERVE(GameSystemSceneControllerNotInitialized, GameSystemSceneController, NotInitialized); @@ -34,11 +34,10 @@ namespace NrvGameSystemSceneController { NEW_NERVE(GameSystemSceneControllerWaitDrawDoneSceneForDestroy, GameSystemSceneController, WaitDrawDoneScene); NEW_NERVE(GameSystemSceneControllerDestroySceneForDestroy, GameSystemSceneController, DestroyScene); NEW_NERVE(GameSystemSceneControllerDestroyed, GameSystemSceneController, Destroyed); -}; +}; // namespace NrvGameSystemSceneController -SceneControlInfo::SceneControlInfo() : - mStartIdInfo(nullptr) -{ +SceneControlInfo::SceneControlInfo() + : mStartIdInfo(nullptr) { mScene[0] = '\0'; mStage[0] = '\0'; mCurrentScenarioNo = 1; @@ -46,30 +45,29 @@ SceneControlInfo::SceneControlInfo() : mStartIdInfo = new JMapIdInfo(MR::getInitializeStartIdInfo()); } -void SceneControlInfo::setScene(const char *pSceneName) { +void SceneControlInfo::setScene(const char* pSceneName) { snprintf(mScene, sizeof(mScene), "%s", pSceneName); } -void SceneControlInfo::setStage(const char *pStageName) { +void SceneControlInfo::setStage(const char* pStageName) { snprintf(mStage, sizeof(mStage), "%s", pStageName); } -void SceneControlInfo::setStartIdInfo(const JMapIdInfo &rInfo) { +void SceneControlInfo::setStartIdInfo(const JMapIdInfo& rInfo) { *mStartIdInfo = rInfo; } -GameSystemSceneController::GameSystemSceneController() : - _98(nullptr), - _9C(nullptr), - _A0(false), - mScenarioParser(nullptr), - mObjHolder(nullptr), - mScene(nullptr), - mSceneInitializeState(State_NotInit), - mIntermissionScene(nullptr), - mPlayTimerScene(nullptr), - mScenarioSelectScene(nullptr) -{ +GameSystemSceneController::GameSystemSceneController() + : _98(nullptr), + _9C(nullptr), + _A0(false), + mScenarioParser(nullptr), + mObjHolder(nullptr), + mScene(nullptr), + mSceneInitializeState(State_NotInit), + mIntermissionScene(nullptr), + mPlayTimerScene(nullptr), + mScenarioSelectScene(nullptr) { mObjHolder = new NameObjHolder(0x1300); _98 = new Spine(this, &NrvGameSystemSceneController::GameSystemSceneControllerNotInitialized::sInstance); mIntermissionScene = static_cast(MR::createScene("Intermission")); @@ -111,9 +109,7 @@ void GameSystemSceneController::checkRequestAndChangeScene() { void GameSystemSceneController::initializeScene() { mSceneInitializeState = State_Init; - if (SingletonHolder::get()->mFileCacheHeap == nullptr - || !isSameAtNextSceneAndStage()) - { + if (SingletonHolder::get()->mFileCacheHeap == nullptr || !isSameAtNextSceneAndStage()) { SingletonHolder::get()->createFileCacheHeapOnGameHeap(0x1040400); } @@ -156,8 +152,7 @@ void GameSystemSceneController::destroyScene() { if (tryDestroyFileCacheHeap(false)) { SingletonHolder::get()->destroyGameHeap(); - } - else { + } else { SingletonHolder::get()->destroySceneHeap(); } } @@ -167,42 +162,27 @@ bool GameSystemSceneController::isStopSound() const { return false; } - if (MR::isEqualStageName("AstroDome") - && MR::isEqualString(_4C.mScene, "Game")) - { + if (MR::isEqualStageName("AstroDome") && MR::isEqualString(_4C.mScene, "Game")) { return false; } - if (MR::isEqualStageName("AstroGalaxy") - && MR::isEqualString(_4C.mScene, "Game") - && MR::isEqualString(_4C.mStage, "AstroDome")) - { + if (MR::isEqualStageName("AstroGalaxy") && MR::isEqualString(_4C.mScene, "Game") && MR::isEqualString(_4C.mStage, "AstroDome")) { return false; } - if (MR::isEqualStageName("LibraryRoom") - && MR::isEqualString(_4C.mScene, "Game")) - { + if (MR::isEqualStageName("LibraryRoom") && MR::isEqualString(_4C.mScene, "Game")) { return false; } - if (MR::isEqualStageName("AstroGalaxy") - && MR::isEqualString(_4C.mScene, "Game") - && MR::isEqualString(_4C.mStage, "LibraryRoom")) - { + if (MR::isEqualStageName("AstroGalaxy") && MR::isEqualString(_4C.mScene, "Game") && MR::isEqualString(_4C.mStage, "LibraryRoom")) { return false; } - if (MR::isEqualStageName("HeavensDoorGalaxy") - && MR::isEqualString(_4C.mScene, "Game")) - { + if (MR::isEqualStageName("HeavensDoorGalaxy") && MR::isEqualString(_4C.mScene, "Game")) { return false; } - if (MR::isEqualStageName("AstroGalaxy") - && MR::isEqualString(_4C.mScene, "Game") - && MR::isEqualString(_4C.mStage, "HeavensDoorGalaxy")) - { + if (MR::isEqualStageName("AstroGalaxy") && MR::isEqualString(_4C.mScene, "Game") && MR::isEqualString(_4C.mStage, "HeavensDoorGalaxy")) { return false; } @@ -211,14 +191,12 @@ bool GameSystemSceneController::isStopSound() const { bool GameSystemSceneController::isReadyToStartScene() const { // FIXME: Probably an inline of `Spine::isNerve` - return !(_98->getCurrentNerve() == &NrvGameSystemSceneController::GameSystemSceneControllerReadyToStartScene::sInstance) - && !mScenarioSelectScene->isScenarioSelecting(); + return !(_98->getCurrentNerve() == &NrvGameSystemSceneController::GameSystemSceneControllerReadyToStartScene::sInstance) && !mScenarioSelectScene->isScenarioSelecting(); } bool GameSystemSceneController::isFirstUpdateSceneNerveNormal() const { // FIXME: Probably an inline of `Spine::isNerve` - return !(_98->getCurrentNerve() == &NrvGameSystemSceneController::GameSystemSceneControllerNormal::sInstance) - && _98->mStep == 1; + return !(_98->getCurrentNerve() == &NrvGameSystemSceneController::GameSystemSceneControllerNormal::sInstance) && _98->mStep == 1; } void GameSystemSceneController::startScene() { @@ -276,8 +254,7 @@ SceneObjHolder* GameSystemSceneController::getSceneObjHolder() const { } bool GameSystemSceneController::isExistSceneObjHolder() const { - return mScene != nullptr - && mScene->mSceneObjHolder != nullptr; + return mScene != nullptr && mScene->mSceneObjHolder != nullptr; } s32 GameSystemSceneController::getCurrentScenarioNo() const { @@ -330,27 +307,22 @@ void GameSystemSceneController::exeNotInitialized() { } void GameSystemSceneController::exeNormal() { - } void GameSystemSceneController::exeWaitDrawDoneScene() { const Nerve* pNerve; - bool isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerWaitDrawDoneScene::sInstance - == _98->getCurrentNerve(); + bool isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerWaitDrawDoneScene::sInstance == _98->getCurrentNerve(); if (isNerve) { if (mScene != nullptr) { pNerve = &NrvGameSystemSceneController::GameSystemSceneControllerDestroyScene::sInstance; - } - else { + } else { pNerve = &NrvGameSystemSceneController::GameSystemSceneControllerChangeWaveBank::sInstance; } - } - else if (mScene != nullptr) { + } else if (mScene != nullptr) { pNerve = &NrvGameSystemSceneController::GameSystemSceneControllerDestroySceneForDestroy::sInstance; - } - else { + } else { pNerve = &NrvGameSystemSceneController::GameSystemSceneControllerDestroyed::sInstance; } @@ -368,8 +340,7 @@ void GameSystemSceneController::exeDestroyScene() { if (MR::tryEndFunctionAsyncExecute("シーン破棄")) { const Nerve* pNerve = &NrvGameSystemSceneController::GameSystemSceneControllerChangeWaveBank::sInstance; - bool isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerDestroySceneForDestroy::sInstance - == _98->getCurrentNerve(); + bool isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerDestroySceneForDestroy::sInstance == _98->getCurrentNerve(); if (isNerve) { pNerve = &NrvGameSystemSceneController::GameSystemSceneControllerDestroyed::sInstance; @@ -384,8 +355,8 @@ void GameSystemSceneController::exeChangeWaveBank() { mIntermissionScene->setCurrentSceneControllerState("[change Wave Data]"); bool isPlayerLuigi = GameSystemFunction::isCreatedGameDataHolder() - ? MR::isPlayerLuigi() - : false; + ? MR::isPlayerLuigi() + : false; getAudioSystemWrapper()->loadStageWaveData(_4C.mScene, _4C.mStage, isPlayerLuigi); } @@ -447,9 +418,7 @@ void GameSystemSceneController::restartGameAfterResetting() { // GameSystemSceneController::isExistRequest bool GameSystemSceneController::isSameAtNextSceneAndStage() const { - return MR::isEqualString(_0.mScene, _4C.mScene) - && MR::isEqualString(_0.mStage, _4C.mStage) - && _0.mCurrentScenarioNo == _4C.mCurrentScenarioNo; + return MR::isEqualString(_0.mScene, _4C.mScene) && MR::isEqualString(_0.mStage, _4C.mStage) && _0.mCurrentScenarioNo == _4C.mCurrentScenarioNo; } void GameSystemSceneController::updateSceneControlInfo() { @@ -480,78 +449,67 @@ Scene* GameSystemSceneController::getCurrentSceneForExecute() const { const Nerve* GameSystemSceneController::getNextNerveOnResetProcessing() const { bool isNerve; - isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerWaitDrawDoneSceneForDestroy::sInstance - == _98->getCurrentNerve(); + isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerWaitDrawDoneSceneForDestroy::sInstance == _98->getCurrentNerve(); if (isNerve) { return nullptr; } - isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerDestroySceneForDestroy::sInstance - == _98->getCurrentNerve(); + isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerDestroySceneForDestroy::sInstance == _98->getCurrentNerve(); if (isNerve) { return nullptr; } - isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerDestroyed::sInstance - == _98->getCurrentNerve(); + isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerDestroyed::sInstance == _98->getCurrentNerve(); if (isNerve) { return nullptr; } - isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerDestroyScene::sInstance - == _98->getCurrentNerve(); + isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerDestroyScene::sInstance == _98->getCurrentNerve(); if (isNerve) { return nullptr; } - isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerChangeWaveBank::sInstance - == _98->getCurrentNerve(); + isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerChangeWaveBank::sInstance == _98->getCurrentNerve(); if (isNerve) { return nullptr; } - isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerNotInitialized::sInstance - == _98->getCurrentNerve(); + isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerNotInitialized::sInstance == _98->getCurrentNerve(); if (isNerve) { return &NrvGameSystemSceneController::GameSystemSceneControllerDestroyed::sInstance; } - isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerWaitDrawDoneScene::sInstance - == _98->getCurrentNerve(); + isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerWaitDrawDoneScene::sInstance == _98->getCurrentNerve(); if (isNerve) { return nullptr; } - isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerNormal::sInstance - == _98->getCurrentNerve(); + isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerNormal::sInstance == _98->getCurrentNerve(); if (isNerve) { return nullptr; } - isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerInitializeScene::sInstance - == _98->getCurrentNerve(); + isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerInitializeScene::sInstance == _98->getCurrentNerve(); if (isNerve) { return nullptr; } - isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerInvalidateSystemWipe::sInstance - == _98->getCurrentNerve(); + isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerInvalidateSystemWipe::sInstance == _98->getCurrentNerve(); if (isNerve) { return nullptr; } - isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerReadyToStartScene::sInstance - == _98->getCurrentNerve(); + isNerve = &NrvGameSystemSceneController::GameSystemSceneControllerReadyToStartScene::sInstance == _98->getCurrentNerve(); if (isNerve) { return nullptr; @@ -561,10 +519,7 @@ const Nerve* GameSystemSceneController::getNextNerveOnResetProcessing() const { } bool GameSystemSceneController::tryDestroyFileCacheHeap(bool param1) { - if (!param1 - && SingletonHolder::get()->mFileCacheHeap != nullptr - && isSameAtNextSceneAndStage()) - { + if (!param1 && SingletonHolder::get()->mFileCacheHeap != nullptr && isSameAtNextSceneAndStage()) { return false; } @@ -579,8 +534,7 @@ void GameSystemSceneController::requestChangeNerve(const Nerve* pNerve) { if (_A0) { pNextNerve = getNextNerveOnResetProcessing(); - } - else { + } else { pNextNerve = nullptr; } diff --git a/src/Game/System/GameSystemStationedArchiveLoader.cpp b/src/Game/System/GameSystemStationedArchiveLoader.cpp index 412bd1b97..333357c47 100644 --- a/src/Game/System/GameSystemStationedArchiveLoader.cpp +++ b/src/Game/System/GameSystemStationedArchiveLoader.cpp @@ -21,22 +21,19 @@ namespace { NEW_NERVE(GameSystemStationedArchiveLoaderEnd, GameSystemStationedArchiveLoader, End); NEW_NERVE(GameSystemStationedArchiveLoaderSuspended, GameSystemStationedArchiveLoader, Suspended); NEW_NERVE(GameSystemStationedArchiveLoaderChangeArchivePlayer, GameSystemStationedArchiveLoader, ChangeArchivePlayer); -}; +}; // namespace -bool ConditionIfIsNotPlayer::isExecute(const MR::StationedFileInfo *pInfo) const { - return pInfo->mLoadType != 2 - && pInfo->mLoadType != 3; +bool ConditionIfIsNotPlayer::isExecute(const MR::StationedFileInfo* pInfo) const { + return pInfo->mLoadType != 2 && pInfo->mLoadType != 3; } -ConditionUsePlayerHeap::ConditionUsePlayerHeap() : - mNapaHeap(nullptr), - mGDDRHeap(nullptr), - mIsDataMario(true) -{ - +ConditionUsePlayerHeap::ConditionUsePlayerHeap() + : mNapaHeap(nullptr), + mGDDRHeap(nullptr), + mIsDataMario(true) { } -bool ConditionUsePlayerHeap::isExecute(const MR::StationedFileInfo *pInfo) const { +bool ConditionUsePlayerHeap::isExecute(const MR::StationedFileInfo* pInfo) const { s32 type = 3; if (mIsDataMario) { @@ -46,7 +43,7 @@ bool ConditionUsePlayerHeap::isExecute(const MR::StationedFileInfo *pInfo) const return pInfo->mLoadType == type; } -JKRHeap* ConditionUsePlayerHeap::getProperHeap(const MR::StationedFileInfo *pInfo) const { +JKRHeap* ConditionUsePlayerHeap::getProperHeap(const MR::StationedFileInfo* pInfo) const { switch (pInfo->mHeapType) { case 0: return mNapaHeap; @@ -59,12 +56,11 @@ JKRHeap* ConditionUsePlayerHeap::getProperHeap(const MR::StationedFileInfo *pInf } } -PlayerHeapHolder::PlayerHeapHolder() : - mCondition(nullptr), - mNapaHeap(nullptr), - mGDDRHeap(nullptr), - mIsDataMario(true) -{ +PlayerHeapHolder::PlayerHeapHolder() + : mCondition(nullptr), + mNapaHeap(nullptr), + mGDDRHeap(nullptr), + mIsDataMario(true) { ConditionUsePlayerHeap* condition = new ConditionUsePlayerHeap(); mNapaHeap = PlayerHeapHolder::createHeap(0x500000, MR::getStationedHeapNapa()); JKRExpHeap* gddr = PlayerHeapHolder::createHeap(0x500000, MR::getStationedHeapGDDR3()); @@ -116,11 +112,10 @@ JKRExpHeap* PlayerHeapHolder::createHeap(u32 size, JKRHeap* pParent) { return JKRExpHeap::create(size, pParent, true); } -GameSystemStationedArchiveLoader::GameSystemStationedArchiveLoader() : - NerveExecutor("常駐データ初期化"), - mHeapHolder(nullptr), - _C(false) -{ +GameSystemStationedArchiveLoader::GameSystemStationedArchiveLoader() + : NerveExecutor("常駐データ初期化"), + mHeapHolder(nullptr), + _C(false) { initNerve(&::GameSystemStationedArchiveLoaderLoadAudio1stWaveData::sInstance); } @@ -133,8 +128,7 @@ bool GameSystemStationedArchiveLoader::isDone() const { } bool GameSystemStationedArchiveLoader::isPreparedReset() const { - return isNerve(&::GameSystemStationedArchiveLoaderEnd::sInstance) - || isNerve(&::GameSystemStationedArchiveLoaderSuspended::sInstance); + return isNerve(&::GameSystemStationedArchiveLoaderEnd::sInstance) || isNerve(&::GameSystemStationedArchiveLoaderSuspended::sInstance); } void GameSystemStationedArchiveLoader::prepareReset() { @@ -142,11 +136,7 @@ void GameSystemStationedArchiveLoader::prepareReset() { return; } - if (isNerve(&::GameSystemStationedArchiveLoaderEnd::sInstance) - || isNerve(&::GameSystemStationedArchiveLoaderSuspended::sInstance) - || isNerve(&::GameSystemStationedArchiveLoaderChangeArchivePlayer::sInstance) - || isNerve(&::GameSystemStationedArchiveLoaderInitializeGameData::sInstance)) - { + if (isNerve(&::GameSystemStationedArchiveLoaderEnd::sInstance) || isNerve(&::GameSystemStationedArchiveLoaderSuspended::sInstance) || isNerve(&::GameSystemStationedArchiveLoaderChangeArchivePlayer::sInstance) || isNerve(&::GameSystemStationedArchiveLoaderInitializeGameData::sInstance)) { return; } @@ -178,8 +168,7 @@ void GameSystemStationedArchiveLoader::exeLoadAudio1stWaveData() { if (GameSystemFunction::isLoadedAudioStaticWaveData()) { if (trySuspend()) { setNerve(&::GameSystemStationedArchiveLoaderSuspended::sInstance); - } - else { + } else { setNerve(&::GameSystemStationedArchiveLoaderLoadStationedArchiveOthers::sInstance); } } @@ -198,8 +187,7 @@ void GameSystemStationedArchiveLoader::exeLoadStationedArchivePlayer() { MR::Functor(this, &GameSystemStationedArchiveLoader::startToLoadStationedArchivePlayer, true), 14, "常駐リソース読み込み"); - } - else if (trySuspend()) { + } else if (trySuspend()) { MR::suspendAsyncExecuteThread("常駐リソース読み込み"); setNerve(&::GameSystemStationedArchiveLoaderSuspended::sInstance); return; @@ -219,14 +207,12 @@ void GameSystemStationedArchiveLoader::exeLoadStationedArchivePlayer() { void GameSystemStationedArchiveLoader::exeLoadStationedArchiveOthers() { if (MR::isFirstStep(this)) { if (!tryAsyncExecuteIfNotSuspend( - MR::Functor_Inline(this, &GameSystemStationedArchiveLoader::startToLoadStationedArchiveOthers), - "常駐リソース読み込み")) - { + MR::Functor_Inline(this, &GameSystemStationedArchiveLoader::startToLoadStationedArchiveOthers), + "常駐リソース読み込み")) { setNerve(&::GameSystemStationedArchiveLoaderSuspended::sInstance); return; } - } - else if (trySuspend()) { + } else if (trySuspend()) { MR::suspendAsyncExecuteThread("常駐リソース読み込み"); setNerve(&::GameSystemStationedArchiveLoaderSuspended::sInstance); return; @@ -248,11 +234,9 @@ void GameSystemStationedArchiveLoader::exeInitializeGameData() { } void GameSystemStationedArchiveLoader::exeEnd() { - } void GameSystemStationedArchiveLoader::exeSuspended() { - } void GameSystemStationedArchiveLoader::exeChangeArchivePlayer() { @@ -280,7 +264,7 @@ bool GameSystemStationedArchiveLoader::trySuspend() { return true; } -bool GameSystemStationedArchiveLoader::tryAsyncExecuteIfNotSuspend(const MR::FunctorBase &rFunctor, const char *pName) { +bool GameSystemStationedArchiveLoader::tryAsyncExecuteIfNotSuspend(const MR::FunctorBase& rFunctor, const char* pName) { if (trySuspend()) { return false; } @@ -308,8 +292,7 @@ void GameSystemStationedArchiveLoader::createAndAddPlayerArchives(bool isDataMar if (isDataMario) { pMarioAnimeHolder->newMaterialAnmBuffer( static_cast(MR::createAndAddResourceHolder("Mario.arc")->mModelResTable->getRes("mario"))); - } - else { + } else { pMarioAnimeHolder->newMaterialAnmBuffer( static_cast(MR::createAndAddResourceHolder("Luigi.arc")->mModelResTable->getRes("luigi"))); } diff --git a/src/Game/System/HeapMemoryWatcher.cpp b/src/Game/System/HeapMemoryWatcher.cpp index 03a4bede4..d416a5a50 100644 --- a/src/Game/System/HeapMemoryWatcher.cpp +++ b/src/Game/System/HeapMemoryWatcher.cpp @@ -8,25 +8,24 @@ JKRExpHeap* HeapMemoryWatcher::sRootHeapGDDR3; namespace { - JKRExpHeap* createExpHeap(u32 size, JKRHeap *pHeap, bool a3) NO_INLINE { + JKRExpHeap* createExpHeap(u32 size, JKRHeap* pHeap, bool a3) NO_INLINE { JKRExpHeap* heap; if (a3) { - void* data = new(pHeap, -4) u8[size]; + void* data = new (pHeap, -4) u8[size]; heap = JKRExpHeap::create(data, size, pHeap, true); - } - else { + } else { heap = JKRExpHeap::create(size, pHeap, true); } if (MR::isEqualCurrentHeap(heap)) { - JKRHeap::sRootHeap->becomeCurrentHeap(); + JKRHeap::sRootHeap->becomeCurrentHeap(); } return heap; } - JKRSolidHeap* createSolidHeap(u32 size, JKRHeap *pHeap) { + JKRSolidHeap* createSolidHeap(u32 size, JKRHeap* pHeap) { JKRSolidHeap* heap = JKRSolidHeap::create(size, pHeap, true); if (MR::isEqualCurrentHeap(heap)) { @@ -36,19 +35,19 @@ namespace { return heap; } - void destroyHeapAndSetNULL(JKRHeap **pHeap) { + void destroyHeapAndSetNULL(JKRHeap** pHeap) { if (*pHeap != nullptr) { JKRHeap::destroy(*pHeap); *pHeap = nullptr; } } -}; +}; // namespace -JKRHeap* HeapMemoryWatcher::getHeapNapa(const JKRHeap *pHeap) { +JKRHeap* HeapMemoryWatcher::getHeapNapa(const JKRHeap* pHeap) { if (pHeap == mStationedHeapNapa || pHeap == mStationedHeapGDDR) { return mStationedHeapNapa; } - + if (pHeap == mSceneHeapNapa || pHeap == mSceneHeapGDDR) { return mSceneHeapNapa; } @@ -56,7 +55,7 @@ JKRHeap* HeapMemoryWatcher::getHeapNapa(const JKRHeap *pHeap) { return nullptr; } -JKRHeap* HeapMemoryWatcher::getHeapGDDR3(const JKRHeap *pHeap) { +JKRHeap* HeapMemoryWatcher::getHeapGDDR3(const JKRHeap* pHeap) { if (pHeap == mStationedHeapNapa || pHeap == mStationedHeapGDDR) { return mStationedHeapGDDR; } @@ -119,9 +118,9 @@ void HeapMemoryWatcher::destroyGameHeap() { void HeapMemoryWatcher::createRootHeap() { JKRExpHeap* heap; - void* newHi; - u32 arenaHi, arenaLo; - + void* newHi; + u32 arenaHi, arenaLo; + JKRExpHeap::createRoot(1, true); arenaLo = (u32)OSGetMEM2ArenaLo(); arenaHi = (u32)OSGetMEM2ArenaHi(); @@ -143,7 +142,7 @@ void HeapMemoryWatcher::createHeaps() { mAudSystemHeap = createSolidHeap(0x1E0000, JKRHeap::sRootHeap); mStationedHeapNapa = createExpHeap(0x900000, JKRHeap::sRootHeap, false); JKRHeap* gddr = HeapMemoryWatcher::sRootHeapGDDR3; - u32 thing = OSRoundUp32B(WPADGetWorkMemorySize()) + 208; + u32 thing = OSRoundUp32B(WPADGetWorkMemorySize()) + 208; mWPadHeap = createExpHeap(thing, gddr, false); mHomeButtonLayoutHeap = createExpHeap(0x80000, HeapMemoryWatcher::sRootHeapGDDR3, false); mStationedHeapGDDR = createExpHeap(0x1400000, HeapMemoryWatcher::sRootHeapGDDR3, false); @@ -155,26 +154,24 @@ void HeapMemoryWatcher::createGameHeap() { mGameHeapGDDR = createExpHeap(-1, HeapMemoryWatcher::sRootHeapGDDR3, false); } -HeapMemoryWatcher::HeapMemoryWatcher() : - mStationedHeapNapa(nullptr), - mStationedHeapGDDR(nullptr), - mGameHeapNapa(nullptr), - mGameHeapGDDR(nullptr), - mFileCacheHeap(nullptr), - mSceneHeapNapa(nullptr), - mSceneHeapGDDR(nullptr), - mWPadHeap(nullptr), - mHomeButtonLayoutHeap(nullptr), - mAudSystemHeap(nullptr) -{ +HeapMemoryWatcher::HeapMemoryWatcher() + : mStationedHeapNapa(nullptr), + mStationedHeapGDDR(nullptr), + mGameHeapNapa(nullptr), + mGameHeapGDDR(nullptr), + mFileCacheHeap(nullptr), + mSceneHeapNapa(nullptr), + mSceneHeapGDDR(nullptr), + mWPadHeap(nullptr), + mHomeButtonLayoutHeap(nullptr), + mAudSystemHeap(nullptr) { JKRHeap::setErrorHandler(HeapMemoryWatcher::memoryErrorCallback); - createHeaps(); + createHeaps(); } -void HeapMemoryWatcher::memoryErrorCallback(void *, u32, int) { +void HeapMemoryWatcher::memoryErrorCallback(void*, u32, int) { OSPanic(__FILE__, 0x219, ""); } void HeapMemoryWatcher::checkRestMemory() { - } diff --git a/src/Game/System/HomeButtonMenuWrapper.cpp b/src/Game/System/HomeButtonMenuWrapper.cpp index 3310e0bc3..52d1f3890 100644 --- a/src/Game/System/HomeButtonMenuWrapper.cpp +++ b/src/Game/System/HomeButtonMenuWrapper.cpp @@ -4,34 +4,33 @@ #include #include -void (*HBMCreateRSO)(const HBMDataInfo *); +void (*HBMCreateRSO)(const HBMDataInfo*); void (*HBMInitRSO)(void); -void (*HBMCalcRSO)(const HBMControllerData *); +void (*HBMCalcRSO)(const HBMControllerData*); void (*HBMDrawRSO)(void); s32 (*HBMGetSelectBtnNumRSO)(void); void (*HBMSetAdjustFlagRSO)(int); void (*HBMStartBlackOutRSO)(void); static RSOExportFuncTable exp_tbl[] = { - { "HBMCreateRSO", (u32*)&HBMCreateRSO }, - { "HBMInitRSO", (u32*)&HBMInitRSO }, - { "HBMCalcRSO", (u32*)&HBMCalcRSO }, - { "HBMDrawRSO", (u32*)&HBMDrawRSO }, - { "HBMGetSelectBtnNumRSO", (u32*)&HBMGetSelectBtnNumRSO }, - { "HBMSetAdjustFlagRSO", (u32*)&HBMSetAdjustFlagRSO }, - { "HBMStartBlackOutRSO", (u32*)&HBMStartBlackOutRSO } -}; + {"HBMCreateRSO", (u32*)&HBMCreateRSO}, + {"HBMInitRSO", (u32*)&HBMInitRSO}, + {"HBMCalcRSO", (u32*)&HBMCalcRSO}, + {"HBMDrawRSO", (u32*)&HBMDrawRSO}, + {"HBMGetSelectBtnNumRSO", (u32*)&HBMGetSelectBtnNumRSO}, + {"HBMSetAdjustFlagRSO", (u32*)&HBMSetAdjustFlagRSO}, + {"HBMStartBlackOutRSO", (u32*)&HBMStartBlackOutRSO}}; typedef void (*ProloguePtr)(BOOL); void RSO::setupRsoHomeButtonMenu() { - u32 i; - RSOObjectHeader* rsoPtr ; - RSOExportFuncTable* pTbl; + u32 i; + RSOObjectHeader* rsoPtr; + RSOExportFuncTable* pTbl; const RSOObjectHeader* symbolTable = reinterpret_cast(MR::receiveFile("/ModuleData/product.sel")); - int jumpCodeSize; - void* bss; - void* jumps; + int jumpCodeSize; + void* bss; + void* jumps; RSOListInit((void*)symbolTable); if (symbolTable != nullptr) { @@ -39,14 +38,13 @@ void RSO::setupRsoHomeButtonMenu() { if (jumpCodeSize == 0) { jumps = nullptr; - } - else { - jumps = new(MR::getStationedHeapGDDR3(), 0) char[jumpCodeSize]; + } else { + jumps = new (MR::getStationedHeapGDDR3(), 0) char[jumpCodeSize]; RSOMakeJumpCode(symbolTable, jumps); } rsoPtr = reinterpret_cast(MR::receiveFile("/ModuleData/HomeButtonMenuWrapperRSO.rso")); if (rsoPtr->mBssSize) { - bss = new(MR::getStationedHeapGDDR3(), 0) char[rsoPtr->mBssSize]; + bss = new (MR::getStationedHeapGDDR3(), 0) char[rsoPtr->mBssSize]; } RSOLinkList((void*)rsoPtr, bss); @@ -55,7 +53,7 @@ void RSO::setupRsoHomeButtonMenu() { RSOLinkJump(rsoPtr, symbolTable, jumps); reinterpret_cast(rsoPtr->mProlog)(RSOIsImportSymbolResolvedAll(rsoPtr)); for (i = 0; i < 7; i++) { - pTbl=&exp_tbl[i]; + pTbl = &exp_tbl[i]; RSOFindExportSymbolAddr(rsoPtr, pTbl->mSymbolName); *(pTbl->mSymbolPtr) = (u32)RSOFindExportSymbolAddr(rsoPtr, pTbl->mSymbolName); } @@ -63,7 +61,7 @@ void RSO::setupRsoHomeButtonMenu() { } } -void RSO::HBMCreate(const HBMDataInfo *pInfo) { +void RSO::HBMCreate(const HBMDataInfo* pInfo) { (*HBMCreateRSO)(pInfo); } @@ -71,7 +69,7 @@ void RSO::HBMInit() { (*HBMInitRSO)(); } -void RSO::HBMCalc(const HBMControllerData *pData) { +void RSO::HBMCalc(const HBMControllerData* pData) { (*HBMCalcRSO)(pData); } @@ -91,4 +89,4 @@ void RSO::HBMStartBlackOut() { (*HBMStartBlackOutRSO)(); } -void _unresolved(void) { } +void _unresolved(void) {} diff --git a/src/Game/System/HomeButtonStateNotifier.cpp b/src/Game/System/HomeButtonStateNotifier.cpp index e50b34dce..88cb4dbb2 100644 --- a/src/Game/System/HomeButtonStateNotifier.cpp +++ b/src/Game/System/HomeButtonStateNotifier.cpp @@ -1,10 +1,9 @@ #include "Game/Screen/MoviePlayerSimple.hpp" #include "Game/System/HomeButtonStateNotifier.hpp" -HomeButtonStateNotifier::HomeButtonStateNotifier() : - _0(false), - mMoviePlayer(nullptr) -{} +HomeButtonStateNotifier::HomeButtonStateNotifier() + : _0(false), + mMoviePlayer(nullptr) {} void HomeButtonStateNotifier::update(bool param1) { if ((_0 || !param1) && _0 && !param1) { diff --git a/src/Game/System/Language.cpp b/src/Game/System/Language.cpp index f59ddd46b..b8a383e58 100644 --- a/src/Game/System/Language.cpp +++ b/src/Game/System/Language.cpp @@ -36,7 +36,8 @@ namespace { const u8 cLanguageMap[][10] = { - { // RMGJ + { + // RMGJ LANGUAGE_JPJAPANESE, LANGUAGE_USENGLISH, LANGUAGE_EUGERMAN, @@ -48,7 +49,8 @@ namespace { LANGUAGE_CNSIMPCHINESE, LANGUAGE_KRKOREAN, }, - { // RMGE + { + // RMGE LANGUAGE_JPJAPANESE, LANGUAGE_USENGLISH, LANGUAGE_EUGERMAN, @@ -60,7 +62,8 @@ namespace { LANGUAGE_CNSIMPCHINESE, LANGUAGE_KRKOREAN, }, - { // RMGP + { + // RMGP LANGUAGE_JPJAPANESE, LANGUAGE_EUENGLISH, LANGUAGE_EUGERMAN, @@ -72,7 +75,8 @@ namespace { LANGUAGE_CNSIMPCHINESE, LANGUAGE_KRKOREAN, }, - { // ??? + { + // ??? LANGUAGE_JPJAPANESE, LANGUAGE_USENGLISH, LANGUAGE_EUGERMAN, @@ -84,7 +88,8 @@ namespace { LANGUAGE_CNSIMPCHINESE, LANGUAGE_KRKOREAN, }, - { // RMGK + { + // RMGK LANGUAGE_JPJAPANESE, LANGUAGE_USENGLISH, LANGUAGE_EUGERMAN, @@ -96,7 +101,8 @@ namespace { LANGUAGE_CNSIMPCHINESE, LANGUAGE_KRKOREAN, }, - { // ??? + { + // ??? LANGUAGE_JPJAPANESE, LANGUAGE_USENGLISH, LANGUAGE_EUGERMAN, @@ -123,7 +129,7 @@ namespace { {LANGUAGE_CNSIMPCHINESE, "CnSimpChinese"}, {LANGUAGE_KRKOREAN, "KrKorean"}, }; -}; +}; // namespace namespace MR { u32 getDecidedLanguageFromIPL() { @@ -132,14 +138,12 @@ namespace MR { if (language < 0) { i = 0; - } - else { + } else { s32 size = sizeof(cLanguageMap[4]) / sizeof(*cLanguageMap[4]); if (language <= size) { i = language; - } - else { + } else { i = size; } } @@ -201,4 +205,4 @@ namespace MR { const char* getLanguagePrefixByIndex(u32 index) { return cLanguages[index].mName; } -}; +}; // namespace MR diff --git a/src/Game/System/LayoutHolder.cpp b/src/Game/System/LayoutHolder.cpp index 6ab649761..ca1699e0c 100644 --- a/src/Game/System/LayoutHolder.cpp +++ b/src/Game/System/LayoutHolder.cpp @@ -10,14 +10,14 @@ namespace { ".brlan", nullptr, }; -}; +}; // namespace -LayoutHolder::LayoutHolder(JKRArchive &rArchive) : nw4r::lyt::ResourceAccessor(), mArchive(&rArchive) { +LayoutHolder::LayoutHolder(JKRArchive& rArchive) + : nw4r::lyt::ResourceAccessor(), mArchive(&rArchive) { initializeArc(); } LayoutHolder::~LayoutHolder() { - } /* diff --git a/src/Game/System/LuigiLeftSupplier.cpp b/src/Game/System/LuigiLeftSupplier.cpp index bea56bbf2..fc879f234 100644 --- a/src/Game/System/LuigiLeftSupplier.cpp +++ b/src/Game/System/LuigiLeftSupplier.cpp @@ -1,17 +1,14 @@ #include "Game/System/GameDataFunction.hpp" #include "Game/System/LuigiLeftSupplier.hpp" -LuigiLeftSupplier::LuigiLeftSupplier() : - _0(false) -{ - +LuigiLeftSupplier::LuigiLeftSupplier() + : _0(false) { } void LuigiLeftSupplier::syncWithFlags() { if (!GameDataFunction::isDataMario()) { _0 = true; - } - else { + } else { _0 = false; } } diff --git a/src/Game/System/MainLoopFramework.cpp b/src/Game/System/MainLoopFramework.cpp index 7eeec0690..d841d9545 100644 --- a/src/Game/System/MainLoopFramework.cpp +++ b/src/Game/System/MainLoopFramework.cpp @@ -17,14 +17,14 @@ MR::BothDirList MainLoopFrameworkAlarm::sList(false); GXTexObj clear_z_tobj; -Mtx e_mtx = { { 1f, 0f, 0f, 0f }, - { 0f, 1f, 0f, 0f }, - { 0f, 0f, 1f, 0f } }; +Mtx e_mtx = {{1f, 0f, 0f, 0f}, + {0f, 1f, 0f, 0f}, + {0f, 0f, 1f, 0f}}; -u32 clearZTexData[] = { 0x00FF00FF, 0x00FF00FF, 0x00FF00FF, 0x00FF00FF, - 0x00FF00FF, 0x00FF00FF, 0x00FF00FF, 0x00FF00FF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, - 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF }; +u32 clearZTexData[] = {0x00FF00FF, 0x00FF00FF, 0x00FF00FF, 0x00FF00FF, + 0x00FF00FF, 0x00FF00FF, 0x00FF00FF, 0x00FF00FF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF}; namespace { s32 getDisplayingXfbIndex() NO_INLINE; @@ -34,7 +34,7 @@ namespace { void waitDrawDoneAndSetAlarm(); void handleGXAbortAlarm(OSAlarm*, OSContext*); -} +} // namespace void MainLoopFramework::ctor_subroutine(bool useAlpha) { mClearColor = (GXColor){0, 0, 0, 0}; @@ -59,8 +59,7 @@ void MainLoopFramework::ctor_subroutine(bool useAlpha) { GX_TF_Z24X8, GX_REPEAT, GX_REPEAT, - GX_FALSE - ); + GX_FALSE); GXInitTexObjLOD( &clear_z_tobj, GX_NEAR, @@ -68,8 +67,7 @@ void MainLoopFramework::ctor_subroutine(bool useAlpha) { 0f, 0f, 0f, GX_FALSE, GX_FALSE, - GX_ANISO_1 - ); + GX_ANISO_1); mRenderInterval = 1; mRenderCounter = 0; mDoRenderFrame = false; @@ -84,8 +82,7 @@ MainLoopFramework::~MainLoopFramework() { } MainLoopFramework* MainLoopFramework::createManager( - const GXRenderModeObj* pRenderModeObj, void* xfb1, void* xfb2, void* xfb3, bool useAlpha -) { + const GXRenderModeObj* pRenderModeObj, void* xfb1, void* xfb2, void* xfb3, bool useAlpha) { if (pRenderModeObj) { JUTVideo::sManager->setRenderMode(pRenderModeObj); } @@ -119,8 +116,7 @@ void MainLoopFramework::prepareCopyDisp() { JUTVideo::sManager->mRenderModeObj->aa, JUTVideo::sManager->mRenderModeObj->sample_pattern, mUseVFilter, - JUTVideo::sManager->mRenderModeObj->vfilter - ); + JUTVideo::sManager->mRenderModeObj->vfilter); GXSetCopyClamp((GXFBClamp)mCopyClamp); GXSetDispCopyGamma((GXGamma)mDispCopyGamma); GXSetZMode(GX_TRUE, GX_LEQUAL, GX_TRUE); @@ -152,8 +148,7 @@ void MainLoopFramework::exchangeXfb_double() { pXfbMgr->mLastDrawnXfbIndex = pXfbMgr->mDrawingXfbIndex; GXDrawDone(); JUTVideo::dummyNoDrawWait(); - } - else { + } else { JUTVideo::drawDoneStart(); } if (!_C) { @@ -163,8 +158,7 @@ void MainLoopFramework::exchangeXfb_double() { s16 lastIdx = pXfbMgr->mDrawingXfbIndex; pXfbMgr->mLastDrawnXfbIndex = lastIdx; pXfbMgr->mDrawingXfbIndex = lastIdx >= 0 ? lastIdx ^ 1 : 0; - } - else { + } else { clearEfb(mClearColor); if (pXfbMgr->mDrawingXfbIndex < 0) { pXfbMgr->mDrawingXfbIndex = 0; @@ -176,7 +170,7 @@ namespace { s32 getDisplayingXfbIndex() { return JUTXfb::getManager()->getDisplayingXfbIndex(); } -} +} // namespace void MainLoopFramework::exchangeXfb_triple() { JUTXfb* pXfbMgr = JUTXfb::sManager; @@ -211,12 +205,10 @@ void MainLoopFramework::preGX() { if (JUTVideo::sManager->mRenderModeObj->aa) { GXSetPixelFmt(GX_PF_RGB565_Z16, GX_ZC_LINEAR); GXSetDither(GX_TRUE); - } - else if (mUseAlpha) { + } else if (mUseAlpha) { GXSetPixelFmt(GX_PF_RGBA6_Z24, GX_ZC_LINEAR); GXSetDither(GX_TRUE); - } - else { + } else { GXSetPixelFmt(GX_PF_RGB8_Z24, GX_ZC_LINEAR); GXSetDither(GX_FALSE); } @@ -224,11 +216,10 @@ void MainLoopFramework::preGX() { void MainLoopFramework::endGX() { J2DOrthoGraph ortho( - 0f, 0f, - JUTVideo::sManager->mRenderModeObj->fbWidth, - JUTVideo::sManager->mRenderModeObj->efbHeight, - -1f, 1f - ); + 0f, 0f, + JUTVideo::sManager->mRenderModeObj->fbWidth, + JUTVideo::sManager->mRenderModeObj->efbHeight, + -1f, 1f); if (JUTConsoleManager::sManager) { ortho.setPort(); JUTConsoleManager::sManager->draw(); @@ -254,22 +245,21 @@ void MainLoopFramework::beginRender() { if (mDoRenderFrame) { JUTXfb* xfb = JUTXfb::sManager; switch (xfb->mBufferMode) { - case 1: - if (xfb->_1C != 2) { - xfb->_1C = 1; - clearEfb(mClearColor); - } - else { - xfb->_1C = 1; - } - xfb->mDrawingXfbIndex = mSingleBufferIndex; - break; - case 2: - exchangeXfb_double(); - break; - case 3: - exchangeXfb_triple(); - break; + case 1: + if (xfb->_1C != 2) { + xfb->_1C = 1; + clearEfb(mClearColor); + } else { + xfb->_1C = 1; + } + xfb->mDrawingXfbIndex = mSingleBufferIndex; + break; + case 2: + exchangeXfb_double(); + break; + case 3: + exchangeXfb_triple(); + break; } } @@ -287,14 +277,14 @@ void MainLoopFramework::endRender() { if (mDoRenderFrame) { JUTXfb* xfb = JUTXfb::sManager; switch (xfb->mBufferMode) { - case 1: - drawendXfb_single(); - break; - case 2: - break; - case 3: - copyXfb_triple(); - break; + case 1: + drawendXfb_single(); + break; + case 2: + break; + case 3: + copyXfb_triple(); + break; } } calcCombinationRatio(); @@ -304,19 +294,19 @@ void MainLoopFramework::endFrame() { if (mDoRenderFrame) { JUTXfb* xfb = JUTXfb::sManager; switch (xfb->mBufferMode) { - case 1: - break; - case 2: - waitDrawDoneAndSetAlarm(); - GXFlush(); - break; - case 3: - waitDrawDoneAndSetAlarm(); - GXFlush(); - break; + case 1: + break; + case 2: + waitDrawDoneAndSetAlarm(); + GXFlush(); + break; + case 3: + waitDrawDoneAndSetAlarm(); + GXFlush(); + break; } } - + if (mDoRenderFrame) { static s8 lbl_806B6ED4; if (!lbl_806B6ED4) { @@ -345,8 +335,8 @@ void MainLoopFramework::clearEfb(GXColor color) { } void MainLoopFramework::clearEfb(int param1, int param2, int param3, int param4, GXColor color) { - u16 fbWidth = JUTVideo::sManager->mRenderModeObj->fbWidth; - u16 efbHeight = JUTVideo::sManager->mRenderModeObj->efbHeight; + u16 fbWidth = JUTVideo::sManager->mRenderModeObj->fbWidth; + u16 efbHeight = JUTVideo::sManager->mRenderModeObj->efbHeight; Mtx44 proj; C_MTXOrtho(proj, 0f, efbHeight, 0f, fbWidth, 0f, 1f); GXSetProjection(proj, GX_ORTHOGRAPHIC); @@ -448,7 +438,7 @@ namespace { void waitForTick(u32 tickDuration, u16 retraceCount) { if (tickDuration) { static s64 nextTime; - static s8 timeInitialized; + static s8 timeInitialized; if (!timeInitialized) { nextTime = OSGetTime(); timeInitialized = 1; @@ -459,10 +449,9 @@ namespace { currentTime = OSGetTime(); } nextTime = currentTime + tickDuration; - } - else { + } else { static u32 nextCount; - static s8 countInitialized; + static s8 countInitialized; if (!countInitialized) { nextCount = VIGetRetraceCount(); countInitialized = 1; @@ -476,13 +465,13 @@ namespace { if (!OSReceiveMessage(&JUTVideo::sManager->mMessageQueue, (OSMessage*)&msg, 1)) { msg = dummy; } - } while((s32)(msg - nextCount) < 0); + } while ((s32)(msg - nextCount) < 0); nextCount = msg + count; } } void waitDrawDoneAndSetAlarm() { - MainLoopFrameworkAlarm alarm; + MainLoopFrameworkAlarm alarm; MR::BothDirLink link(&alarm); { MR::ProhibitSchedulerAndInterrupts prohibit(false); @@ -515,4 +504,4 @@ namespace { GXSetDrawDone(); DrawSyncManager::prepareReset(); } -} +} // namespace diff --git a/src/Game/System/MessageHolder.cpp b/src/Game/System/MessageHolder.cpp index fd10f1862..b269d2e78 100644 --- a/src/Game/System/MessageHolder.cpp +++ b/src/Game/System/MessageHolder.cpp @@ -20,7 +20,7 @@ namespace { } return nullptr; } -} +} // namespace bool MessageData::getMessageDirect(TalkMessageInfo* pMessageInfo, const char* pMessage) const { s32 messageIndex = findMessageIndex(pMessage); @@ -36,7 +36,7 @@ bool MessageData::getMessage(TalkMessageInfo* pMessageInfo, u16, u16 infoToolInd pMessageInfo->_0 = reinterpret_cast(mDataBlock + 1) + *reinterpret_cast(pInfoTool); pMessageInfo->_4 = *reinterpret_cast(pInfoTool + 4); pMessageInfo->_6 = *(pInfoTool + 6); - pMessageInfo->mCameraType =*(pInfoTool + 7); + pMessageInfo->mCameraType = *(pInfoTool + 7); pMessageInfo->mTalkType = *(pInfoTool + 8); pMessageInfo->_A = *(pInfoTool + 0xa); pMessageInfo->_B = *(pInfoTool + 0xb); @@ -46,7 +46,7 @@ bool MessageData::getMessage(TalkMessageInfo* pMessageInfo, u16, u16 infoToolInd TalkNode* MessageData::findNode(const char* pMessage) const { s32 messageIndex = findMessageIndex(pMessage); - + for (int i = 0; i < mFlowBlock->mNodeCount; i++) { TalkNode* pNode = reinterpret_cast(mFlowBlock + 1) + i; if (pNode->mNodeType == 1 && pNode->mIndex == messageIndex) { @@ -113,7 +113,7 @@ MessageData::MessageData(const char* pArchiveName) { mFLI1Block = nullptr; JKRArchive* pArchive = nullptr; - JKRHeap* pHeap = nullptr; + JKRHeap* pHeap = nullptr; MR::getMountedArchiveAndHeap(pArchiveName, &pArchive, &pHeap); u8* msgData = (u8*)pArchive->getResource("Message.bmg"); diff --git a/src/Game/System/NANDErrorSequence.cpp b/src/Game/System/NANDErrorSequence.cpp index 975dc8734..fd3ffc304 100644 --- a/src/Game/System/NANDErrorSequence.cpp +++ b/src/Game/System/NANDErrorSequence.cpp @@ -22,17 +22,16 @@ namespace { NEW_NERVE(NANDErrorSequenceGoWiiMenu, NANDErrorSequence, GoWiiMenu); NEW_NERVE(NANDErrorSequenceCheckEnableToCreateOnPreloading, NANDErrorSequence, CheckEnableToCreateOnPreloading); NEW_NERVE(NANDErrorSequenceCheckEnableToCreateAfterRemove, NANDErrorSequence, CheckEnableToCreateAfterRemove); -}; +}; // namespace -NANDErrorSequence::NANDErrorSequence(SaveDataHandleSequence* pHost, SysInfoWindow* pParam2, SysInfoWindow*) : - ActorStateBase("NANDError"), - mHost(pHost), - mSystemMessageId(nullptr), - _14(false), - _15(false), - mResult(0), - mSysInfoWindow(pParam2) -{ +NANDErrorSequence::NANDErrorSequence(SaveDataHandleSequence* pHost, SysInfoWindow* pParam2, SysInfoWindow*) + : ActorStateBase("NANDError"), + mHost(pHost), + mSystemMessageId(nullptr), + _14(false), + _15(false), + mResult(0), + mSysInfoWindow(pParam2) { initNerve(&NANDErrorSequenceIdle::sInstance); kill(); resetParam(); @@ -134,9 +133,7 @@ bool NANDErrorSequence::isPermitToReset() const { } void NANDErrorSequence::prepareReset() { - if (isNerve(&NANDErrorSequenceError::sInstance) - || isNerve(&NANDErrorSequenceErrorToFreeze::sInstance)) - { + if (isNerve(&NANDErrorSequenceError::sInstance) || isNerve(&NANDErrorSequenceErrorToFreeze::sInstance)) { GameSystemFunction::setResetOperationReturnToMenu(); } } @@ -146,15 +143,7 @@ bool NANDErrorSequence::isPreparedReset() const { return true; } - if (isNerve(&NANDErrorSequenceIdle::sInstance) - || isNerve(&NANDErrorSequenceError::sInstance) - || isNerve(&NANDErrorSequenceRemoveConfirm::sInstance) - || isNerve(&NANDErrorSequenceRemoveDoneKeyWait::sInstance) - || isNerve(&NANDErrorSequenceNoSaveConfirmBeforeRemove::sInstance) - || isNerve(&NANDErrorSequenceNoSaveConfirmLessBlockOrInode::sInstance) - || isNerve(&NANDErrorSequenceLessBlockOrInodeConfirm::sInstance) - || isNerve(&NANDErrorSequenceGoWiiMenu::sInstance)) - { + if (isNerve(&NANDErrorSequenceIdle::sInstance) || isNerve(&NANDErrorSequenceError::sInstance) || isNerve(&NANDErrorSequenceRemoveConfirm::sInstance) || isNerve(&NANDErrorSequenceRemoveDoneKeyWait::sInstance) || isNerve(&NANDErrorSequenceNoSaveConfirmBeforeRemove::sInstance) || isNerve(&NANDErrorSequenceNoSaveConfirmLessBlockOrInode::sInstance) || isNerve(&NANDErrorSequenceLessBlockOrInodeConfirm::sInstance) || isNerve(&NANDErrorSequenceGoWiiMenu::sInstance)) { return true; } @@ -169,7 +158,6 @@ void NANDErrorSequence::restoreFromReset() { } void NANDErrorSequence::exeIdle() { - } void NANDErrorSequence::exeError() { @@ -201,7 +189,6 @@ void NANDErrorSequence::exeErrorToFreeze() { } for (;;) { - } } @@ -214,8 +201,7 @@ void NANDErrorSequence::exeRemoveConfirm() { if (isSelectedYes) { setNerve(&NANDErrorSequenceRemove::sInstance); - } - else { + } else { setNerve(&NANDErrorSequenceNoSaveConfirmBeforeRemove::sInstance); } } @@ -233,8 +219,7 @@ void NANDErrorSequence::exeRemove() { if (resultCode.isSuccess() || resultCode.isNoExistFile()) { setNerve(&NANDErrorSequenceRemoveDoneKeyWait::sInstance); - } - else if (tryNoRecoverErroSequence(resultCode.getCode())) { + } else if (tryNoRecoverErroSequence(resultCode.getCode())) { // FIXME: cmpwi instruction should not be optimized out. } } @@ -256,8 +241,7 @@ void NANDErrorSequence::exeNoSaveConfirmBeforeRemove() { mResult = 3; kill(); - } - else { + } else { setNerve(&NANDErrorSequenceRemoveConfirm::sInstance); } } @@ -273,8 +257,7 @@ void NANDErrorSequence::exeNoSaveConfirmLessBlockOrInode() { mResult = 2; kill(); - } - else { + } else { setNerve(&NANDErrorSequenceLessBlockOrInodeConfirm::sInstance); } } @@ -288,8 +271,7 @@ void NANDErrorSequence::exeLessBlockOrInodeConfirm() { if (isSelectedYes) { setNerve(&NANDErrorSequenceGoWiiMenu::sInstance); - } - else { + } else { setNerve(&NANDErrorSequenceNoSaveConfirmLessBlockOrInode::sInstance); } } @@ -326,15 +308,7 @@ void NANDErrorSequence::exeCheckEnableToCreateAfterRemove() { } bool NANDErrorSequence::isEnablePointer() const { - if (isNerve(&NANDErrorSequenceError::sInstance) - || isNerve(&NANDErrorSequenceErrorToFreeze::sInstance) - || isNerve(&NANDErrorSequenceRemoveConfirm::sInstance) - || isNerve(&NANDErrorSequenceRemoveDoneKeyWait::sInstance) - || isNerve(&NANDErrorSequenceNoSaveConfirmBeforeRemove::sInstance) - || isNerve(&NANDErrorSequenceNoSaveConfirmLessBlockOrInode::sInstance) - || isNerve(&NANDErrorSequenceLessBlockOrInodeConfirm::sInstance) - || isNerve(&NANDErrorSequenceGoWiiMenu::sInstance)) - { + if (isNerve(&NANDErrorSequenceError::sInstance) || isNerve(&NANDErrorSequenceErrorToFreeze::sInstance) || isNerve(&NANDErrorSequenceRemoveConfirm::sInstance) || isNerve(&NANDErrorSequenceRemoveDoneKeyWait::sInstance) || isNerve(&NANDErrorSequenceNoSaveConfirmBeforeRemove::sInstance) || isNerve(&NANDErrorSequenceNoSaveConfirmLessBlockOrInode::sInstance) || isNerve(&NANDErrorSequenceLessBlockOrInodeConfirm::sInstance) || isNerve(&NANDErrorSequenceGoWiiMenu::sInstance)) { return true; } @@ -350,7 +324,6 @@ bool NANDErrorSequence::isResultFileCorrupted() const { } void NANDErrorSequence::control() { - } void NANDErrorSequence::resetParam() { diff --git a/src/Game/System/NANDManager.cpp b/src/Game/System/NANDManager.cpp index 4315af918..6f8ef69bc 100644 --- a/src/Game/System/NANDManager.cpp +++ b/src/Game/System/NANDManager.cpp @@ -24,7 +24,7 @@ bool NANDRequestInfo::isDone() const { return _40 == 0; } -const char* NANDRequestInfo::setMove(const char *pPath, const char *pDestDir) { +const char* NANDRequestInfo::setMove(const char* pPath, const char* pDestDir) { init(); mType = 0; @@ -34,7 +34,7 @@ const char* NANDRequestInfo::setMove(const char *pPath, const char *pDestDir) { return mPath; } -const char* NANDRequestInfo::setWriteSeq(const char *pName, const void *pBuf, u32 fsBlock, u8 permission, u8 attr) { +const char* NANDRequestInfo::setWriteSeq(const char* pName, const void* pBuf, u32 fsBlock, u8 permission, u8 attr) { init(); mWriteBuf = pBuf; @@ -47,7 +47,7 @@ const char* NANDRequestInfo::setWriteSeq(const char *pName, const void *pBuf, u3 return mPath; } -const char* NANDRequestInfo::setReadSeq(const char *pName, void *pBuf, u32 fsBlock, u32 *pLength) { +const char* NANDRequestInfo::setReadSeq(const char* pName, void* pBuf, u32 fsBlock, u32* pLength) { init(); mReadBuf = pBuf; @@ -59,7 +59,7 @@ const char* NANDRequestInfo::setReadSeq(const char *pName, void *pBuf, u32 fsBlo return mPath; } -const char* NANDRequestInfo::setCheck(u32 fsBlock, u32 inode, u32 *pAnswer) { +const char* NANDRequestInfo::setCheck(u32 fsBlock, u32 inode, u32* pAnswer) { init(); mFsBlock = fsBlock; @@ -70,16 +70,15 @@ const char* NANDRequestInfo::setCheck(u32 fsBlock, u32 inode, u32 *pAnswer) { return mPath; } -NANDManager::NANDManager() : - mManagerThread(nullptr) -{ +NANDManager::NANDManager() + : mManagerThread(nullptr) { mManagerThread = new NANDManagerThread(13, 256, MR::getStationedHeapNapa()); OSResumeThread(mManagerThread->mThread); OSInitMutex(&mMutex); } -bool NANDManager::addRequest(NANDRequestInfo *pRequestInfo) { +bool NANDManager::addRequest(NANDRequestInfo* pRequestInfo) { OSLockMutex(&mMutex); pRequestInfo->_40 = 1; bool ret = OSSendMessage(&mManagerThread->mQueue, pRequestInfo, OS_MESSAGE_NOBLOCK); @@ -97,8 +96,7 @@ bool NANDResultCode::isSuccess() const { } bool NANDResultCode::isSaveDataCorrupted() const { - return getCode() == NAND_RESULT_ECC_CRIT - || getCode() == NAND_RESULT_AUTHENTICATION; + return getCode() == NAND_RESULT_ECC_CRIT || getCode() == NAND_RESULT_AUTHENTICATION; } bool NANDResultCode::isNANDCorrupted() const { @@ -118,8 +116,7 @@ bool NANDResultCode::isNoExistFile() const { } bool NANDResultCode::isBusyOrAllocFailed() const { - return getCode() == NAND_RESULT_BUSY - || getCode() == NAND_RESULT_ALLOC_FAILED; + return getCode() == NAND_RESULT_BUSY || getCode() == NAND_RESULT_ALLOC_FAILED; } bool NANDResultCode::isUnknown() const { @@ -127,12 +124,12 @@ bool NANDResultCode::isUnknown() const { } namespace MR { - void addRequestToNANDManager(NANDRequestInfo *pRequestInfo) { + void addRequestToNANDManager(NANDRequestInfo* pRequestInfo) { SingletonHolder::get()->addRequest(pRequestInfo); } -}; +}; // namespace MR -const char* NANDRequestInfo::setDelete(const char *pName) { +const char* NANDRequestInfo::setDelete(const char* pName) { init(); mType = 1; snprintf(mPath, sizeof(mPath), "%s", pName); diff --git a/src/Game/System/NANDManagerThread.cpp b/src/Game/System/NANDManagerThread.cpp index 404e90aaa..0f1b423a9 100644 --- a/src/Game/System/NANDManagerThread.cpp +++ b/src/Game/System/NANDManagerThread.cpp @@ -1,10 +1,8 @@ #include "Game/System/NANDManagerThread.hpp" #include "Game/System/NANDManager.hpp" -NANDManagerThread::NANDManagerThread(int priority, int msgCount, JKRHeap *pHeap) : - OSThreadWrapper(0x8000, msgCount, priority, pHeap) -{ - +NANDManagerThread::NANDManagerThread(int priority, int msgCount, JKRHeap* pHeap) + : OSThreadWrapper(0x8000, msgCount, priority, pHeap) { } void* NANDManagerThread::run() { @@ -36,14 +34,14 @@ void* NANDManagerThread::run() { } pRequestInfo->_40 = 0; - + if (pRequestInfo->_54 != nullptr) { (pRequestInfo->_54)(pRequestInfo); } } } -void NANDManagerThread::executeWriteSequence(NANDRequestInfo *pRequestInfo) { +void NANDManagerThread::executeWriteSequence(NANDRequestInfo* pRequestInfo) { pRequestInfo->mResult = NANDCreate(pRequestInfo->mPath, pRequestInfo->mPermission, pRequestInfo->mAttribute); if (pRequestInfo->mResult == NAND_RESULT_OK || pRequestInfo->mResult == NAND_RESULT_EXISTS) { @@ -52,15 +50,13 @@ void NANDManagerThread::executeWriteSequence(NANDRequestInfo *pRequestInfo) { if (pRequestInfo->mResult != NAND_RESULT_OK) { pRequestInfo->mFsBlock = 0; - } - else { + } else { pRequestInfo->mResult = NANDWrite(&info, pRequestInfo->mWriteBuf, pRequestInfo->mFsBlock); if (pRequestInfo->mResult < NAND_RESULT_OK) { NANDClose(&info); pRequestInfo->mFsBlock = 0; - } - else { + } else { pRequestInfo->mFsBlock = pRequestInfo->mResult; pRequestInfo->mResult = NANDClose(&info); } @@ -68,7 +64,7 @@ void NANDManagerThread::executeWriteSequence(NANDRequestInfo *pRequestInfo) { } } -void NANDManagerThread::executeReadSequence(NANDRequestInfo *pRequestInfo) { +void NANDManagerThread::executeReadSequence(NANDRequestInfo* pRequestInfo) { NANDFileInfo info; pRequestInfo->mResult = NANDOpen(pRequestInfo->mPath, &info, NAND_ACCESS_READ); @@ -94,15 +90,13 @@ void NANDManagerThread::executeReadSequence(NANDRequestInfo *pRequestInfo) { pRequestInfo->mFsBlock = 0; pRequestInfo->mResult = NAND_RESULT_AUTHENTICATION; NANDClose(&info); - } - else { + } else { pRequestInfo->mResult = NANDRead(&info, pRequestInfo->mReadBuf, length); if (pRequestInfo->mResult < NAND_RESULT_OK) { NANDClose(&info); pRequestInfo->mFsBlock = 0; - } - else { + } else { pRequestInfo->mFsBlock = pRequestInfo->mResult; pRequestInfo->mResult = NANDClose(&info); } diff --git a/src/Game/System/NerveExecutor.cpp b/src/Game/System/NerveExecutor.cpp index 777bfb218..0987a2572 100644 --- a/src/Game/System/NerveExecutor.cpp +++ b/src/Game/System/NerveExecutor.cpp @@ -1,9 +1,8 @@ #include "Game/LiveActor/Spine.hpp" #include "Game/System/NerveExecutor.hpp" -NerveExecutor::NerveExecutor(const char* pName) : - mSpine(nullptr) -{} +NerveExecutor::NerveExecutor(const char* pName) + : mSpine(nullptr) {} NerveExecutor::~NerveExecutor() { delete mSpine; diff --git a/src/Game/System/OSThreadWrapper.cpp b/src/Game/System/OSThreadWrapper.cpp index 3e3112ae9..9af9649e5 100644 --- a/src/Game/System/OSThreadWrapper.cpp +++ b/src/Game/System/OSThreadWrapper.cpp @@ -1,7 +1,7 @@ #include "Game/System/OSThreadWrapper.hpp" #include -OSThreadWrapper::OSThreadWrapper(u32 stackSize, int messageCount, int priority, JKRHeap *pHeap) { +OSThreadWrapper::OSThreadWrapper(u32 stackSize, int messageCount, int priority, JKRHeap* pHeap) { if (pHeap == nullptr) { pHeap = JKRHeap::sCurrentHeap; } @@ -24,18 +24,18 @@ OSThreadWrapper::~OSThreadWrapper() { delete[] mMessageArray; } -void OSThreadWrapper::initMessageQueue(JKRHeap *pHeap, int messageCount) { +void OSThreadWrapper::initMessageQueue(JKRHeap* pHeap, int messageCount) { mMessageCount = messageCount; - mMessageArray = new(pHeap, 0) OSMessage[mMessageCount]; + mMessageArray = new (pHeap, 0) OSMessage[mMessageCount]; OSInitMessageQueue(&mQueue, mMessageArray, mMessageCount); } -void OSThreadWrapper::initHeapSpecified(JKRHeap *pHeap, u32 stackSize, int priority) { +void OSThreadWrapper::initHeapSpecified(JKRHeap* pHeap, u32 stackSize, int priority) { mHeap = pHeap; mStackSize = stackSize & ~31; - mStack = new(mHeap, 32) u8[mStackSize]; - mThread = new(mHeap, 32) OSThread(); + mStack = new (mHeap, 32) u8[mStackSize]; + mThread = new (mHeap, 32) OSThread(); OSCreateThread( mThread, diff --git a/src/Game/System/PauseButtonCheckerInGame.cpp b/src/Game/System/PauseButtonCheckerInGame.cpp index 12c4f77bc..7f53b90c9 100644 --- a/src/Game/System/PauseButtonCheckerInGame.cpp +++ b/src/Game/System/PauseButtonCheckerInGame.cpp @@ -5,25 +5,21 @@ namespace { static const s32 sHoldCounterMax = 12; }; -PauseButtonCheckerInGame::PauseButtonCheckerInGame() : - mPlusHoldFrame(0), - mMinusHoldFrame(0) -{ - +PauseButtonCheckerInGame::PauseButtonCheckerInGame() + : mPlusHoldFrame(0), + mMinusHoldFrame(0) { } void PauseButtonCheckerInGame::update() { if (MR::testCorePadButtonPlus(WPAD_CHAN0)) { mPlusHoldFrame++; - } - else { + } else { mPlusHoldFrame = 0; } if (MR::testCorePadButtonMinus(WPAD_CHAN0)) { mMinusHoldFrame++; - } - else { + } else { mMinusHoldFrame = 0; } } diff --git a/src/Game/System/ResourceHolder.cpp b/src/Game/System/ResourceHolder.cpp index 06ea59063..2079b8722 100644 --- a/src/Game/System/ResourceHolder.cpp +++ b/src/Game/System/ResourceHolder.cpp @@ -3,8 +3,8 @@ #include "Game/System/ResourceHolder.hpp" namespace { - const char* sModelExt[2] = { ".bdl", ".bmd" }; - const char* sMotionExt[2] = { ".bck", ".bca" }; + const char* sModelExt[2] = {".bdl", ".bmd"}; + const char* sMotionExt[2] = {".bck", ".bca"}; const char* sBtkExt = ".btk"; const char* sBpkExt = ".bpk"; const char* sBtpExt = ".btp"; @@ -14,4 +14,4 @@ namespace { const char* sBmtExt = ".bmt"; const char* sBvaExt = ".bva"; const char* sBanmtExt = ".banmt"; -}; +}; // namespace diff --git a/src/Game/System/ResourceHolderManager.cpp b/src/Game/System/ResourceHolderManager.cpp index 573f232b1..037d9f4f9 100644 --- a/src/Game/System/ResourceHolderManager.cpp +++ b/src/Game/System/ResourceHolderManager.cpp @@ -13,10 +13,8 @@ namespace { class GDCurrentRestorer { public: - GDCurrentRestorer() : - mObj(__GDCurrentDL) - { - + GDCurrentRestorer() + : mObj(__GDCurrentDL) { } ~GDCurrentRestorer() { @@ -26,7 +24,7 @@ namespace { private: /* 0x0 */ GDLObj* mObj; }; -}; +}; // namespace ResourceHolderManager::ResourceHolderManager() { mResourceArray.clear(); @@ -62,10 +60,7 @@ void ResourceHolderManager::removeIfIsEqualHeap(JKRHeap* pHeap) { } for (ResourceHolderManagerName2Resource* pIter = mResourceArray.begin(); pIter != mResourceArray.end(); pIter++) { - if (pIter->mHeap != pHeap - && MR::getHeapNapa(pIter->mHeap) != pHeap - && MR::getHeapGDDR3(pIter->mHeap) != pHeap) - { + if (pIter->mHeap != pHeap && MR::getHeapNapa(pIter->mHeap) != pHeap && MR::getHeapGDDR3(pIter->mHeap) != pHeap) { continue; } @@ -93,15 +88,13 @@ void ResourceHolderManager::removeIfIsEqualHeap(JKRHeap* pHeap) { } void ResourceHolderManager::startCreateResourceHolderOnMainThread(const char* pParam1, CreateResourceHolderArgs* pArgs) { - MR::FunctorV2M func - = MR::Functor(SingletonHolder::get(), createResourceHolder, pParam1, pArgs); + MR::FunctorV2M func = MR::Functor(SingletonHolder::get(), createResourceHolder, pParam1, pArgs); MR::startFunctionAsyncExecuteOnMainThread(func, pParam1); } void ResourceHolderManager::startCreateLayoutHolderOnMainThread(const char* pParam1, CreateResourceHolderArgs* pArgs) { - MR::FunctorV2M func - = MR::Functor(SingletonHolder::get(), createLayoutHolder, pParam1, pArgs); + MR::FunctorV2M func = MR::Functor(SingletonHolder::get(), createLayoutHolder, pParam1, pArgs); MR::startFunctionAsyncExecuteOnMainThread(func, pParam1); } @@ -129,9 +122,8 @@ ResourceHolderManagerName2Resource* ResourceHolderManager::createAndAddInner(con } ResourceHolderManagerName2Resource* ResourceHolderManager::createAndAddInnerStationed(const char* pParam1, FuncPtrC pParam2) { - CreateResourceHolderArgs args = CreateResourceHolderArgs(); - MR::FunctorV2M func - = MR::Functor(this, pParam2, pParam1, &args); + CreateResourceHolderArgs args = CreateResourceHolderArgs(); + MR::FunctorV2M func = MR::Functor(this, pParam2, pParam1, &args); MR::startFunctionAsyncExecuteOnMainThread(func, pParam1); @@ -142,7 +134,7 @@ ResourceHolderManagerName2Resource* ResourceHolderManager::createAndAddInnerStat void ResourceHolderManager::createResourceHolder(const char* pParam1, CreateResourceHolderArgs* pArgs) { GDCurrentRestorer gdRestorer = GDCurrentRestorer(); - JKRArchive* pArchive; + JKRArchive* pArchive; MR::getMountedArchiveAndHeap(pParam1, &pArchive, &pArgs->mHeap); MR::CurrentHeapRestorer heapRestorer(pArgs->mHeap); @@ -152,7 +144,7 @@ void ResourceHolderManager::createResourceHolder(const char* pParam1, CreateReso void ResourceHolderManager::createLayoutHolder(const char* pParam1, CreateResourceHolderArgs* pArgs) { GDCurrentRestorer gdRestorer = GDCurrentRestorer(); - JKRArchive* pArchive; + JKRArchive* pArchive; MR::getMountedArchiveAndHeap(pParam1, &pArchive, &pArgs->mHeap); MR::CurrentHeapRestorer heapRestorer(pArgs->mHeap); @@ -180,7 +172,6 @@ ResourceHolderManagerName2Resource* ResourceHolderManager::find(const char* pPar ResourceHolderManagerName2Resource* pEnd = mResourceArray.end(); for (pIter = mResourceArray.begin(); pIter != pEnd && pIter->mHash != name2Resource.mHash; pIter++) { - } if (pIter == pEnd) { @@ -190,11 +181,10 @@ ResourceHolderManagerName2Resource* ResourceHolderManager::find(const char* pPar return pIter; } -ResourceHolderManagerName2Resource::ResourceHolderManagerName2Resource() : - mResourceHolder(nullptr), - mLayoutHolder(nullptr), - mHeap(nullptr) -{} +ResourceHolderManagerName2Resource::ResourceHolderManagerName2Resource() + : mResourceHolder(nullptr), + mLayoutHolder(nullptr), + mHeap(nullptr) {} ResourceHolderManagerName2Resource& ResourceHolderManagerName2Resource::operator=(const ResourceHolderManagerName2Resource& other) { mResourceHolder = other.mResourceHolder; @@ -205,8 +195,7 @@ ResourceHolderManagerName2Resource& ResourceHolderManagerName2Resource::operator return *this; } -CreateResourceHolderArgs::CreateResourceHolderArgs() : - mResourceHolder(nullptr), - mLayoutHolder(nullptr), - mHeap(nullptr) -{} +CreateResourceHolderArgs::CreateResourceHolderArgs() + : mResourceHolder(nullptr), + mLayoutHolder(nullptr), + mHeap(nullptr) {} diff --git a/src/Game/System/ResourceInfo.cpp b/src/Game/System/ResourceInfo.cpp index 6defd9265..bcfbae6f6 100644 --- a/src/Game/System/ResourceInfo.cpp +++ b/src/Game/System/ResourceInfo.cpp @@ -13,7 +13,7 @@ ResFileInfo::ResFileInfo() { _C = 0; } -ResTable::ResTable() +ResTable::ResTable() : mFileInfoTable(0), mCount(0) { } @@ -21,7 +21,7 @@ void ResTable::newFileInfoTable(u32 count) { mFileInfoTable = new ResFileInfo[count]; } -ResFileInfo* ResTable::add(const char *pName, void *pRes, bool stripExt) { +ResFileInfo* ResTable::add(const char* pName, void* pRes, bool stripExt) { ResFileInfo* curInfo = &mFileInfoTable[mCount]; curInfo->mResource = pRes; curInfo->setName(pName, stripExt); @@ -37,11 +37,11 @@ void* ResTable::getRes(u32 idx) const { return mFileInfoTable[idx].mResource; } -void* ResTable::getRes(const char *pName) const { +void* ResTable::getRes(const char* pName) const { return findRes(pName); } -ResFileInfo* ResTable::findFileInfo(const char *pName) const { +ResFileInfo* ResTable::findFileInfo(const char* pName) const { int resIdx = getResIndex(pName); if (resIdx != -1) { return &mFileInfoTable[resIdx]; @@ -54,11 +54,11 @@ ResFileInfo* ResTable::getFileInfo(u32 idx) const { return &mFileInfoTable[idx]; } -bool ResTable::isExistRes(const char *pRes) const { +bool ResTable::isExistRes(const char* pRes) const { return getResIndex(pRes) != -1; } -void* ResTable::findRes(const char *pName) const { +void* ResTable::findRes(const char* pName) const { int idx = getResIndex(pName); if (idx != -1) { @@ -68,7 +68,7 @@ void* ResTable::findRes(const char *pName) const { return 0; } -int ResTable::getResIndex(const char *pName) const { +int ResTable::getResIndex(const char* pName) const { u32 hash = MR::getHashCodeLower(pName); for (int i = 0; i < mCount; i++) { @@ -82,7 +82,7 @@ int ResTable::getResIndex(const char *pName) const { return -1; } -const char* ResTable::findResName(const void *pRes) const { +const char* ResTable::findResName(const void* pRes) const { for (int i = 0; i < mCount; i++) { ResFileInfo* inf = &mFileInfoTable[i]; if (pRes == inf->mResource) { @@ -93,11 +93,11 @@ const char* ResTable::findResName(const void *pRes) const { return 0; } -const char* ResTable::getResName(const void *pResource) const { +const char* ResTable::getResName(const void* pResource) const { return findResName(pResource); } -void ResFileInfo::setName(const char *pName, bool stripExt) { +void ResFileInfo::setName(const char* pName, bool stripExt) { size_t len = strlen(pName) + 1; mName = new char[len]; diff --git a/src/Game/System/SaveDataHandleSequence.cpp b/src/Game/System/SaveDataHandleSequence.cpp index faffc4347..4b849aee0 100644 --- a/src/Game/System/SaveDataHandleSequence.cpp +++ b/src/Game/System/SaveDataHandleSequence.cpp @@ -29,31 +29,30 @@ namespace { NEW_NERVE(SaveDataHandleSequencePreLoadDone, SaveDataHandleSequence, PreLoadDone); NEW_NERVE(SaveDataHandleSequenceNoSaveConfirmRemind, SaveDataHandleSequence, NoSaveConfirmRemind); NEW_NERVE(SaveDataHandleSequenceErrorHandling, SaveDataHandleSequence, ErrorHandling); -}; +}; // namespace -SaveDataHandleSequence::SaveDataHandleSequence() : - NerveExecutor("セーブ/ロード"), - mSysConfigFile(nullptr), - mCurrentUserFile(nullptr), - mBackupUserFile(nullptr), - mSaveDataHandler(nullptr), - mNANDErrorSequence(nullptr), - mSysInfoWindowConfirm(nullptr), - mSysInfoWindowSave(nullptr), - _24(0), - mIsConfirmRemind(false), - mIsSaveAndQuitMsg(false), - _2A(false), - _2B(false), - _2C(false), - mWorkUserFile(nullptr), - mNerveForError(nullptr), - mTempBuffer(nullptr), - mOnSaveSuccessFunc(nullptr), - mJustBeforeSaveFunc(nullptr), - mSaveIcon(nullptr) -{ - mTempBuffer = new(32) u8[SaveDataHandler::getEnoughtTempBufferSize()]; +SaveDataHandleSequence::SaveDataHandleSequence() + : NerveExecutor("セーブ/ロード"), + mSysConfigFile(nullptr), + mCurrentUserFile(nullptr), + mBackupUserFile(nullptr), + mSaveDataHandler(nullptr), + mNANDErrorSequence(nullptr), + mSysInfoWindowConfirm(nullptr), + mSysInfoWindowSave(nullptr), + _24(0), + mIsConfirmRemind(false), + mIsSaveAndQuitMsg(false), + _2A(false), + _2B(false), + _2C(false), + mWorkUserFile(nullptr), + mNerveForError(nullptr), + mTempBuffer(nullptr), + mOnSaveSuccessFunc(nullptr), + mJustBeforeSaveFunc(nullptr), + mSaveIcon(nullptr) { + mTempBuffer = new (32) u8[SaveDataHandler::getEnoughtTempBufferSize()]; initNerve(&SaveDataHandleSequenceNoOperation::sInstance); } @@ -218,28 +217,15 @@ bool SaveDataHandleSequence::isPreparedReset() const { return false; } - if (isNerve(&SaveDataHandleSequenceNoOperation::sInstance) - || isNerve(&SaveDataHandleSequenceSaveConfirm::sInstance) - || isNerve(&SaveDataHandleSequenceSaveDoneKeyWait::sInstance) - || isNerve(&SaveDataHandleSequenceNoSaveConfirmRemind::sInstance)) - { + if (isNerve(&SaveDataHandleSequenceNoOperation::sInstance) || isNerve(&SaveDataHandleSequenceSaveConfirm::sInstance) || isNerve(&SaveDataHandleSequenceSaveDoneKeyWait::sInstance) || isNerve(&SaveDataHandleSequenceNoSaveConfirmRemind::sInstance)) { return true; } - if (isNerve(&SaveDataHandleSequencePreLoad::sInstance) - || isNerve(&SaveDataHandleSequencePreLoadDone::sInstance) - || isNerve(&SaveDataHandleSequenceSave::sInstance) - || isNerve(&SaveDataHandleSequenceSaveWindowDisappear::sInstance) - || isNerve(&SaveDataHandleSequenceSaveAllWithoutKeyWait::sInstance) - || isNerve(&SaveDataHandleSequenceSaveAllWithoutKeyWaitDisappear::sInstance) - || isNerve(&SaveDataHandleSequenceSaveAllWithoutWindow::sInstance)) - { + if (isNerve(&SaveDataHandleSequencePreLoad::sInstance) || isNerve(&SaveDataHandleSequencePreLoadDone::sInstance) || isNerve(&SaveDataHandleSequenceSave::sInstance) || isNerve(&SaveDataHandleSequenceSaveWindowDisappear::sInstance) || isNerve(&SaveDataHandleSequenceSaveAllWithoutKeyWait::sInstance) || isNerve(&SaveDataHandleSequenceSaveAllWithoutKeyWaitDisappear::sInstance) || isNerve(&SaveDataHandleSequenceSaveAllWithoutWindow::sInstance)) { return false; } - if (isNerve(&SaveDataHandleSequenceCheckEnableToCreate::sInstance) - || isNerve(&SaveDataHandleSequenceErrorHandling::sInstance)) - { + if (isNerve(&SaveDataHandleSequenceCheckEnableToCreate::sInstance) || isNerve(&SaveDataHandleSequenceErrorHandling::sInstance)) { return mNANDErrorSequence->isPreparedReset(); } @@ -314,9 +300,8 @@ void SaveDataHandleSequence::exeSaveConfirm() { mWorkUserFile->setCreated(); mWorkUserFile->updateLastModified(); setNerve(&SaveDataHandleSequenceSave::sInstance); - } - else { - bool isSelectedYes = false; + } else { + bool isSelectedYes = false; const char* pSystemMessageId = "System_Save00"; if (mIsSaveAndQuitMsg) { @@ -331,11 +316,9 @@ void SaveDataHandleSequence::exeSaveConfirm() { mWorkUserFile->setCreated(); mWorkUserFile->updateLastModified(); setNerve(&SaveDataHandleSequenceSave::sInstance); - } - else if (mIsConfirmRemind) { + } else if (mIsConfirmRemind) { setNerve(&SaveDataHandleSequenceNoSaveConfirmRemind::sInstance); - } - else { + } else { setNerve(&SaveDataHandleSequenceNoOperation::sInstance); _24 = 3; @@ -361,8 +344,7 @@ void SaveDataHandleSequence::exeSave() { bool isErr = true; executeSaveFinish(&isErr, &SaveDataHandleSequenceSaveConfirm::sInstance); - } - else if (trySave()) { + } else if (trySave()) { setNerve(&SaveDataHandleSequenceSaveWindowDisappear::sInstance); } } @@ -412,8 +394,7 @@ void SaveDataHandleSequence::exeSaveAllWithoutKeyWait() { bool isErr = true; executeSaveFinish(&isErr, &SaveDataHandleSequenceSaveAllWithoutKeyWait::sInstance); - } - else if (trySave()) { + } else if (trySave()) { setNerve(&SaveDataHandleSequenceSaveAllWithoutKeyWaitDisappear::sInstance); } } @@ -455,8 +436,7 @@ void SaveDataHandleSequence::exeSaveAllWithoutWindow() { bool isErr = true; executeSaveFinish(&isErr, &SaveDataHandleSequenceSaveAllWithoutKeyWait::sInstance); - } - else { + } else { bool isErr = false; if (!trySaveWithoutWindow(&isErr, &SaveDataHandleSequenceSaveAllWithoutWindow::sInstance)) { @@ -490,17 +470,14 @@ void SaveDataHandleSequence::exePreLoad() { if (resultCode.isSuccess()) { setNerve(&SaveDataHandleSequencePreLoadDone::sInstance); - } - else if (resultCode.isNoExistFile()) { + } else if (resultCode.isNoExistFile()) { setNerve(&SaveDataHandleSequenceCheckEnableToCreate::sInstance); - } - else if (resultCode.isSaveDataCorrupted()) { + } else if (resultCode.isSaveDataCorrupted()) { mNerveForError = &SaveDataHandleSequenceNoOperation::sInstance; mNANDErrorSequence->startRemoveFile(); setNerve(&SaveDataHandleSequenceErrorHandling::sInstance); - } - else if (tryNANDErrorSequence(resultCode.getCode())) { + } else if (tryNANDErrorSequence(resultCode.getCode())) { // FIXME: cmpwi instruction should not be optimized out. } } @@ -511,8 +488,7 @@ void SaveDataHandleSequence::exePreLoadDone() { mNANDErrorSequence->startRemoveFile(); setNerve(&SaveDataHandleSequenceErrorHandling::sInstance); - } - else { + } else { restoreSysConfigFile(mSysConfigFile); _24 = 2; @@ -531,8 +507,7 @@ void SaveDataHandleSequence::exeNoSaveConfirmRemind() { _24 = 2; setNerve(&SaveDataHandleSequenceNoOperation::sInstance); - } - else { + } else { setNerve(&SaveDataHandleSequenceSaveConfirm::sInstance); } } @@ -691,16 +666,11 @@ bool SaveDataHandleSequence::tryNoSave() { } bool SaveDataHandleSequence::isEnablePointer() const { - if (isNerve(&SaveDataHandleSequenceNoOperation::sInstance) - || isNerve(&SaveDataHandleSequencePreLoad::sInstance) - || isNerve(&SaveDataHandleSequencePreLoadDone::sInstance)) - { + if (isNerve(&SaveDataHandleSequenceNoOperation::sInstance) || isNerve(&SaveDataHandleSequencePreLoad::sInstance) || isNerve(&SaveDataHandleSequencePreLoadDone::sInstance)) { return false; } - if (isNerve(&SaveDataHandleSequenceCheckEnableToCreate::sInstance) - && !mNANDErrorSequence->isEnablePointer()) - { + if (isNerve(&SaveDataHandleSequenceCheckEnableToCreate::sInstance) && !mNANDErrorSequence->isEnablePointer()) { return false; } diff --git a/src/Game/System/ScenarioDataParser.cpp b/src/Game/System/ScenarioDataParser.cpp index dd0076b31..5dd23f925 100644 --- a/src/Game/System/ScenarioDataParser.cpp +++ b/src/Game/System/ScenarioDataParser.cpp @@ -1,9 +1,9 @@ #include "Game/System/ScenarioDataParser.hpp" #include "Game/Util.hpp" -bool ScenarioData::getValueString(const char *pKey, s32 a2, const char **pOut) const { +bool ScenarioData::getValueString(const char* pKey, s32 a2, const char** pOut) const { ScenarioDataIter inf = getScenarioDataIter(a2); - bool ret = inf._0->getValue(inf.mCur, pKey, pOut); + bool ret = inf._0->getValue(inf.mCur, pKey, pOut); if (ret) { if (MR::isEqualString(*pOut, "")) { @@ -16,7 +16,7 @@ bool ScenarioData::getValueString(const char *pKey, s32 a2, const char **pOut) c const char* ScenarioData::getZoneName(s32 zoneID) const { const char* zoneName = 0; - mZoneList->getValue(zoneID, "ZoneName", &zoneName); + mZoneList->getValue(zoneID, "ZoneName", &zoneName); return zoneName; } @@ -28,10 +28,10 @@ s32 ScenarioData::getZoneNum() const { return 0; } -s32 ScenarioData::getZoneId(const char *pZoneName) const { +s32 ScenarioData::getZoneId(const char* pZoneName) const { for (s32 i = 0; i < getZoneNum(); i++) { const char* zoneName = 0; - mZoneList->getValue(i, "ZoneName", &zoneName); + mZoneList->getValue(i, "ZoneName", &zoneName); if (MR::isEqualStringCase(zoneName, pZoneName)) { return i; @@ -50,7 +50,6 @@ void ScenarioDataIter::goNext() { } ScenarioDataParser::~ScenarioDataParser() { - } namespace MR { diff --git a/src/Game/System/ScenarioProgressTestRun.cpp b/src/Game/System/ScenarioProgressTestRun.cpp index 537f9bf43..878c964f1 100644 --- a/src/Game/System/ScenarioProgressTestRun.cpp +++ b/src/Game/System/ScenarioProgressTestRun.cpp @@ -1,5 +1,4 @@ #include "Game/System/ScenarioProgressTestRun.hpp" -ScenarioProgressTestRun::ScenarioProgressTestRun(GameDataHolder* pHost) : - mHost(pHost) -{} +ScenarioProgressTestRun::ScenarioProgressTestRun(GameDataHolder* pHost) + : mHost(pHost) {} diff --git a/src/Game/System/StageResultSequenceChecker.cpp b/src/Game/System/StageResultSequenceChecker.cpp index e339fa040..faf687cf4 100644 --- a/src/Game/System/StageResultSequenceChecker.cpp +++ b/src/Game/System/StageResultSequenceChecker.cpp @@ -36,18 +36,15 @@ bool StageResultSequenceChecker::isAddPictureBook() const { } bool StageResultSequenceChecker::isJustOpenLibraryRoom() const { - return mCheckListPrev.mPictureBookChapterCanRead == 0 - && mCheckListPrev.mPictureBookChapterCanRead < mCheckListAfter.mPictureBookChapterCanRead; + return mCheckListPrev.mPictureBookChapterCanRead == 0 && mCheckListPrev.mPictureBookChapterCanRead < mCheckListAfter.mPictureBookChapterCanRead; } bool StageResultSequenceChecker::isJustGetGreenStarFirst() const { - return mCheckListPrev.mGreenStarNum == 0 - && mCheckListAfter.mGreenStarNum == 1; + return mCheckListPrev.mGreenStarNum == 0 && mCheckListAfter.mGreenStarNum == 1; } bool StageResultSequenceChecker::isJustCompleteGalaxy() const { - return mCheckListPrev.mIsCompleteGalaxy == false - && mCheckListAfter.mIsCompleteGalaxy == true; + return mCheckListPrev.mIsCompleteGalaxy == false && mCheckListAfter.mIsCompleteGalaxy == true; } s32 StageResultSequenceChecker::getPrevPowerStarNum() const { @@ -75,7 +72,7 @@ void StageResultSequenceChecker::fillCheckListIfComplete(StageResultSequenceChec } bool StageResultSequenceChecker::isJustOpenGalaxyWithoutChallengeGalaxy() const { - if (mCheckListPrev.mGalaxyNumCanOpen >= mCheckListAfter.mGalaxyNumCanOpen) { + if (mCheckListPrev.mGalaxyNumCanOpen >= mCheckListAfter.mGalaxyNumCanOpen) { return false; } diff --git a/src/Game/System/StationedArchiveLoader.cpp b/src/Game/System/StationedArchiveLoader.cpp index 3fa2c8b3e..b8c4047d0 100644 --- a/src/Game/System/StationedArchiveLoader.cpp +++ b/src/Game/System/StationedArchiveLoader.cpp @@ -7,7 +7,6 @@ #include StationedArchiveLoader::Condition::~Condition() { - } JKRHeap* StationedArchiveLoader::Condition::getProperHeap(const MR::StationedFileInfo* pInfo) const { @@ -74,7 +73,7 @@ void StationedArchiveLoader::createAndAddResourcesFromTable(const Condition& rCo } void StationedArchiveLoader::loadScenarioData(JKRHeap* pHeap) { - DVDDir dir; + DVDDir dir; DVDDirEntry dirEntry; DVDOpenDir("/StageData", &dir); diff --git a/src/Game/System/StationedFileInfo.cpp b/src/Game/System/StationedFileInfo.cpp index fa1157fed..95757e223 100644 --- a/src/Game/System/StationedFileInfo.cpp +++ b/src/Game/System/StationedFileInfo.cpp @@ -2,200 +2,964 @@ namespace MR { const StationedFileInfo cStationedFileInfo[] = { - { 0, 2, "/ObjectData/MarioAnime.arc", }, - { 0, 2, "/ObjectData/BoneMario.arc", }, - { 0, 2, "/ObjectData/Mario.arc", }, - { 0, 2, "/ObjectData/MarioFace.arc", }, - { 0, 2, "/ObjectData/MarioShadow.arc", }, - { 1, 2, "/ObjectData/MarioTornado.arc", }, - { 0, 3, "/ObjectData/MarioAnime.arc", }, - { 0, 3, "/ObjectData/BoneLuigi.arc", }, - { 0, 3, "/ObjectData/Luigi.arc", }, - { 0, 3, "/ObjectData/LuigiFace.arc", }, - { 0, 3, "/ObjectData/LuigiShadow.arc", }, - { 1, 3, "/ObjectData/LuigiTornado.arc", }, - { 0, 4, "/ObjectData/MarioHandL.arc", }, - { 0, 4, "/ObjectData/MarioHandR.arc", }, - { 0, 4, "/ObjectData/MarioDummyItem.arc", }, - { 0, 4, "/ObjectData/IceStep.arc", }, - { 0, 4, "/ObjectData/MarioFireBall.arc", }, - { 1, 4, "/ObjectData/MarineSnow.arc", }, - { 1, 4, "/ObjectData/MarioFreezeIce.arc", }, - { 1, 4, "/ObjectData/SpinTico.arc", }, - { 1, 4, "/ObjectData/Coin.arc", }, - { 1, 4, "/ObjectData/KinokoOneUp.arc", }, - { 1, 4, "/ObjectData/KinokoLifeUp.arc", }, - { 1, 4, "/ObjectData/PowerUpLife.arc", }, - { 1, 4, "/ObjectData/Kinoko.arc", }, - { 1, 4, "/ObjectData/SearchLightCone.arc", }, - { 1, 4, "/ObjectData/ShadowVolumeCylinder.arc", }, - { 1, 4, "/ObjectData/ShadowVolumeSphere.arc", }, - { 1, 4, "/ObjectData/ShadowVolumeOval.arc", }, - { 1, 4, "/ObjectData/StarPiece.arc", }, - { 1, 4, "/ObjectData/WaterColumn.arc", }, - { 1, 4, "/ObjectData/YellowChip.arc", }, - { 1, 4, "/ObjectData/StarPointerBlur.arc", }, - { 1, 4, "/ObjectData/PowerStar.arc", }, - { 1, 4, "/ObjectData/Koura.arc", }, - { 1, 4, "/ObjectData/RailPoint.arc", }, - { 1, 5, "/LayoutData/ScenarioSelect.arc", }, - { 1, 5, "/LayoutData/BackButton.arc", }, - { 1, 4, "/ObjectData/ScenarioSelectSky.arc", }, - { 1, 5, "/LayoutData/MapTicoIcon.arc", }, - { 1, 5, "/LayoutData/GalaxyNamePlate.arc", }, - { 1, 5, "/LayoutData/IconComet.arc", }, - { 1, 5, "/LayoutData/MapTitle.arc", }, - { 1, 5, "/LayoutData/GalaxyDetail.arc", }, - { 1, 5, "/LayoutData/ResultWindow.arc", }, - { 1, 5, "/LayoutData/MapGalaxyIcon.arc", }, - { 1, 5, "/LayoutData/IconMario.arc", }, - { 1, 5, "/LayoutData/MapButton.arc", }, - { 1, 5, "/LayoutData/MapDomeIcon.arc", }, - { 1, 5, "/LayoutData/AllStarList.arc", }, - { 1, 4, "/ObjectData/SuperSpinDriver.arc", }, - { 1, 5, "/LayoutData/PauseMenu.arc", }, - { 1, 5, "/LayoutData/MapGalaxyBG.arc", }, - { 1, 5, "/LayoutData/MapGrandGalaxy.arc", }, - { 1, 4, "/ObjectData/SpinDriverPath.arc", }, - { 1, 4, "/ObjectData/MarioHair.arc", }, - { 1, 4, "/ObjectData/VROrbit.arc", }, - { 1, 4, "/ObjectData/Butler.arc", }, - { 1, 4, "/ObjectData/GalaxyInfoTexture.arc", }, - { 1, 4, "/ObjectData/Butterfly.arc", }, - { 1, 4, "/ObjectData/AstroNamePlateData.arc", }, - { 1, 4, "/ObjectData/SuperSpinDriverShadow.arc", }, - { 1, 5, "/LayoutData/StarPieceTargetMeter.arc", }, - { 1, 4, "/ObjectData/KinopioGoodsPickel.arc", }, - { 1, 4, "/ObjectData/SignBoard.arc", }, - { 1, 4, "/ObjectData/TicoLow.arc", }, - { 1, 4, "/ObjectData/CutBush.arc", }, - { 1, 4, "/ObjectData/CrystalBox.arc", }, - { 1, 4, "/ObjectData/TicoMiddle.arc", }, - { 1, 4, "/ObjectData/DemoAstroReturn.arc", }, - { 1, 4, "/ObjectData/AstroMapBoard.arc", }, - { 1, 4, "/ObjectData/KinopioLow.arc", }, - { 1, 4, "/ObjectData/SuperSpinDriverEmpty.arc", }, - { 1, 4, "/ObjectData/PowerupFoo.arc", }, - { 1, 4, "/ObjectData/KinopioGoodsMailBag.arc", }, - { 1, 4, "/ObjectData/WoodBox.arc", }, - { 1, 4, "/ObjectData/TicoFatGoodsStarPiece.arc", }, - { 1, 4, "/ObjectData/KinopioMiddle.arc", }, - { 1, 4, "/ObjectData/WoodBoxBreak.arc", }, - { 1, 4, "/ObjectData/CrystalBoxBreak.arc", }, - { 1, 4, "/ObjectData/KinopioGoodsLight.arc", }, - { 1, 4, "/ObjectData/AstroDecoratePartsA.arc", }, - { 1, 4, "/ObjectData/KinopioGoodsRucksack.arc", }, - { 1, 4, "/ObjectData/MiniSurprisedGalaxy.arc", }, - { 1, 4, "/ObjectData/AstroStarPlateObservatory.arc", }, - { 1, 4, "/ObjectData/AstroStarPlateWell.arc", }, - { 1, 4, "/ObjectData/AstroStarPlateBedRoom.arc", }, - { 1, 4, "/ObjectData/WarpPod.arc", }, - { 1, 4, "/ObjectData/RosettaLow.arc", }, - { 1, 4, "/ObjectData/AstroCore.arc", }, - { 1, 4, "/ObjectData/AstroDecoratePartsGearA.arc", }, - { 1, 4, "/ObjectData/Tico.arc", }, - { 1, 4, "/ObjectData/AstroStarPlateMachine.arc", }, - { 1, 4, "/ObjectData/TicoFat.arc", }, - { 1, 4, "/ObjectData/AstroStarPlateKitchen.arc", }, - { 1, 4, "/ObjectData/AstroRotateStepB.arc", }, - { 1, 4, "/ObjectData/AstroParking.arc", }, - { 1, 4, "/ObjectData/AstroStarPlateTower.arc", }, - { 1, 4, "/ObjectData/RosettaMiddle.arc", }, - { 1, 4, "/ObjectData/Kinopio.arc", }, - { 1, 4, "/ObjectData/AstroBaseCenterTop.arc", }, - { 1, 4, "/ObjectData/GrandStar.arc", }, - { 1, 4, "/ObjectData/AstroBaseKitchen.arc", }, - { 1, 4, "/ObjectData/AstroBaseCenterA.arc", }, - { 1, 4, "/ObjectData/AstroLibrary.arc", }, - { 1, 4, "/ObjectData/AstroRotateStepA.arc", }, - { 1, 4, "/ObjectData/AstroBaseCenterB.arc", }, - { 1, 4, "/ObjectData/AstroBaseC.arc", }, - { 1, 4, "/ObjectData/AstroDomeEntranceMachine.arc", }, - { 1, 4, "/ObjectData/AstroDomeEntranceBedRoom.arc", }, - { 1, 4, "/ObjectData/AstroDomeEntranceObservatory.arc", }, - { 1, 4, "/ObjectData/AstroDomeEntranceKitchen.arc", }, - { 1, 4, "/ObjectData/AstroChildRoom.arc", }, - { 1, 4, "/ObjectData/TicoCometGoodsStar.arc", }, - { 1, 4, "/ObjectData/LuigiNPCLow.arc", }, - { 1, 4, "/ObjectData/LuigiNPCMiddle.arc", }, - { 1, 4, "/ObjectData/TicoComet.arc", }, - { 1, 4, "/ObjectData/GlareGlow.arc", }, - { 1, 4, "/ObjectData/GlareLine.arc", }, - { 1, 4, "/ObjectData/LensFlare.arc", }, - { 1, 4, "/ObjectData/Sun.arc", }, - { 1, 5, "/LayoutData/GalaxyInfo.arc", }, - { 1, 5, "/LayoutData/GalaxySelect.arc", }, - { 1, 4, "/ObjectData/GCaptureRibbon.arc", }, - { 1, 4, "/ObjectData/MiniatureGalaxySelect.arc", }, - { 1, 4, "/ObjectData/AstroDomeDemoCamera.arc", }, - { 1, 4, "/ObjectData/MiniatureGalaxyShadow.arc", }, - { 1, 4, "/ObjectData/AstroDomeCometBloom.arc", }, - { 1, 4, "/ObjectData/GCaptureTarget.arc", }, - { 1, 4, "/ObjectData/AstroDomeDemoAstroGalaxy.arc", }, - { 1, 4, "/ObjectData/AstroDomeComet.arc", }, - { 1, 4, "/ObjectData/MiniatureGalaxyUnknown.arc", }, - { 1, 4, "/ObjectData/DemoSheet.arc", }, - { 1, 4, "/ObjectData/LightData.arc", }, - { 1, 4, "/ObjectData/NPCData.arc", }, - { 1, 5, "/LayoutData/AirMeter.arc", }, - { 1, 5, "/LayoutData/BatteryInfo.arc", }, - { 1, 5, "/LayoutData/BlueChipCounter.arc", }, - { 1, 5, "/LayoutData/CameraInfo.arc", }, - { 1, 5, "/LayoutData/CinemaFrame.arc", }, - { 1, 5, "/LayoutData/CinemaSuper.arc", }, - { 1, 5, "/LayoutData/CoinCounter.arc", }, - { 1, 5, "/LayoutData/CollectCounter.arc", }, - { 1, 5, "/LayoutData/CometScreenFilter.arc", }, - { 1, 5, "/LayoutData/CommandStream.arc", }, - { 1, 5, "/LayoutData/DPDPointer.arc", }, - { 1, 5, "/LayoutData/DPDPointerSub.arc", }, - { 1, 5, "/LayoutData/DPDPointerNumber.arc", }, - { 1, 5, "/LayoutData/FlyMeter.arc", }, - { 1, 5, "/LayoutData/GetStar.arc", }, - { 1, 5, "/LayoutData/HitPointMeter.arc", }, - { 1, 5, "/LayoutData/SuddenDeathMeter.arc", }, - { 1, 5, "/LayoutData/IconAButton.arc", }, - { 1, 5, "/LayoutData/IconSave.arc", }, - { 1, 5, "/LayoutData/InformationWindow.arc", }, - { 1, 5, "/LayoutData/OneUp.arc", }, - { 1, 5, "/LayoutData/PlayerLeft.arc", }, - { 1, 5, "/LayoutData/PointerGuidance.arc", }, - { 1, 5, "/LayoutData/PurpleCoinCounter.arc", }, - { 1, 5, "/LayoutData/RetryButton.arc", }, - { 1, 5, "/LayoutData/SelectButton.arc", }, - { 1, 5, "/LayoutData/SignBoardBalloon.arc", }, - { 1, 5, "/LayoutData/StageTitle.arc", }, - { 1, 5, "/LayoutData/StarCounter.arc", }, - { 1, 5, "/LayoutData/StarPieceCounter.arc", }, - { 1, 5, "/LayoutData/SysInfoWindow.arc", }, - { 1, 5, "/LayoutData/SysInfoWindowMini.arc", }, - { 1, 5, "/LayoutData/TalkBalloonEvent.arc", }, - { 1, 5, "/LayoutData/TalkBalloonStretch.arc", }, - { 1, 5, "/LayoutData/TalkBalloonLetter.arc", }, - { 1, 5, "/LayoutData/TooBad.arc", }, - { 1, 5, "/LayoutData/WipeKoopa.arc", }, - { 1, 5, "/LayoutData/WipeRing.arc", }, - { 1, 5, "/LayoutData/YellowChipCounter.arc", }, - { 1, 0, "/HomeButton2/SpeakerSe.arc", }, - { 1, 0, "/HomeButton2/home.csv", }, - { 1, 0, "/HomeButton2/config.txt", }, - { 1, 1, "/ParticleData/Effect.arc", }, - { 1, 1, "/StageData/ObjNameTable.arc", }, - { 1, 4, "/ObjectData/ErrorMessageImage.arc", }, - { 1, 4, "/ObjectData/PlanetMapDataTable.arc", }, - { 1, 5, "/LayoutData/TimeLimit.arc", }, - { 1, 5, "/LayoutData/TimeUp.arc", }, - { 1, 0, "/ModuleData/HomeButtonMenuWrapperRSO.rso", }, - { 1, 0, "/ModuleData/product.sel", }, - { 1, 4, "/ObjectData/SaveIconBanner.arc", }, - { 1, 0, "/LayoutData/HomeButton.arc", }, - { 1, 1, "/LayoutData/Font.arc", }, - { 1, 1, "/MessageData/Message.arc", }, - { 1, 5, "/LayoutData/GameOver.arc", }, - { 0, 0, nullptr, }, + { + 0, + 2, + "/ObjectData/MarioAnime.arc", + }, + { + 0, + 2, + "/ObjectData/BoneMario.arc", + }, + { + 0, + 2, + "/ObjectData/Mario.arc", + }, + { + 0, + 2, + "/ObjectData/MarioFace.arc", + }, + { + 0, + 2, + "/ObjectData/MarioShadow.arc", + }, + { + 1, + 2, + "/ObjectData/MarioTornado.arc", + }, + { + 0, + 3, + "/ObjectData/MarioAnime.arc", + }, + { + 0, + 3, + "/ObjectData/BoneLuigi.arc", + }, + { + 0, + 3, + "/ObjectData/Luigi.arc", + }, + { + 0, + 3, + "/ObjectData/LuigiFace.arc", + }, + { + 0, + 3, + "/ObjectData/LuigiShadow.arc", + }, + { + 1, + 3, + "/ObjectData/LuigiTornado.arc", + }, + { + 0, + 4, + "/ObjectData/MarioHandL.arc", + }, + { + 0, + 4, + "/ObjectData/MarioHandR.arc", + }, + { + 0, + 4, + "/ObjectData/MarioDummyItem.arc", + }, + { + 0, + 4, + "/ObjectData/IceStep.arc", + }, + { + 0, + 4, + "/ObjectData/MarioFireBall.arc", + }, + { + 1, + 4, + "/ObjectData/MarineSnow.arc", + }, + { + 1, + 4, + "/ObjectData/MarioFreezeIce.arc", + }, + { + 1, + 4, + "/ObjectData/SpinTico.arc", + }, + { + 1, + 4, + "/ObjectData/Coin.arc", + }, + { + 1, + 4, + "/ObjectData/KinokoOneUp.arc", + }, + { + 1, + 4, + "/ObjectData/KinokoLifeUp.arc", + }, + { + 1, + 4, + "/ObjectData/PowerUpLife.arc", + }, + { + 1, + 4, + "/ObjectData/Kinoko.arc", + }, + { + 1, + 4, + "/ObjectData/SearchLightCone.arc", + }, + { + 1, + 4, + "/ObjectData/ShadowVolumeCylinder.arc", + }, + { + 1, + 4, + "/ObjectData/ShadowVolumeSphere.arc", + }, + { + 1, + 4, + "/ObjectData/ShadowVolumeOval.arc", + }, + { + 1, + 4, + "/ObjectData/StarPiece.arc", + }, + { + 1, + 4, + "/ObjectData/WaterColumn.arc", + }, + { + 1, + 4, + "/ObjectData/YellowChip.arc", + }, + { + 1, + 4, + "/ObjectData/StarPointerBlur.arc", + }, + { + 1, + 4, + "/ObjectData/PowerStar.arc", + }, + { + 1, + 4, + "/ObjectData/Koura.arc", + }, + { + 1, + 4, + "/ObjectData/RailPoint.arc", + }, + { + 1, + 5, + "/LayoutData/ScenarioSelect.arc", + }, + { + 1, + 5, + "/LayoutData/BackButton.arc", + }, + { + 1, + 4, + "/ObjectData/ScenarioSelectSky.arc", + }, + { + 1, + 5, + "/LayoutData/MapTicoIcon.arc", + }, + { + 1, + 5, + "/LayoutData/GalaxyNamePlate.arc", + }, + { + 1, + 5, + "/LayoutData/IconComet.arc", + }, + { + 1, + 5, + "/LayoutData/MapTitle.arc", + }, + { + 1, + 5, + "/LayoutData/GalaxyDetail.arc", + }, + { + 1, + 5, + "/LayoutData/ResultWindow.arc", + }, + { + 1, + 5, + "/LayoutData/MapGalaxyIcon.arc", + }, + { + 1, + 5, + "/LayoutData/IconMario.arc", + }, + { + 1, + 5, + "/LayoutData/MapButton.arc", + }, + { + 1, + 5, + "/LayoutData/MapDomeIcon.arc", + }, + { + 1, + 5, + "/LayoutData/AllStarList.arc", + }, + { + 1, + 4, + "/ObjectData/SuperSpinDriver.arc", + }, + { + 1, + 5, + "/LayoutData/PauseMenu.arc", + }, + { + 1, + 5, + "/LayoutData/MapGalaxyBG.arc", + }, + { + 1, + 5, + "/LayoutData/MapGrandGalaxy.arc", + }, + { + 1, + 4, + "/ObjectData/SpinDriverPath.arc", + }, + { + 1, + 4, + "/ObjectData/MarioHair.arc", + }, + { + 1, + 4, + "/ObjectData/VROrbit.arc", + }, + { + 1, + 4, + "/ObjectData/Butler.arc", + }, + { + 1, + 4, + "/ObjectData/GalaxyInfoTexture.arc", + }, + { + 1, + 4, + "/ObjectData/Butterfly.arc", + }, + { + 1, + 4, + "/ObjectData/AstroNamePlateData.arc", + }, + { + 1, + 4, + "/ObjectData/SuperSpinDriverShadow.arc", + }, + { + 1, + 5, + "/LayoutData/StarPieceTargetMeter.arc", + }, + { + 1, + 4, + "/ObjectData/KinopioGoodsPickel.arc", + }, + { + 1, + 4, + "/ObjectData/SignBoard.arc", + }, + { + 1, + 4, + "/ObjectData/TicoLow.arc", + }, + { + 1, + 4, + "/ObjectData/CutBush.arc", + }, + { + 1, + 4, + "/ObjectData/CrystalBox.arc", + }, + { + 1, + 4, + "/ObjectData/TicoMiddle.arc", + }, + { + 1, + 4, + "/ObjectData/DemoAstroReturn.arc", + }, + { + 1, + 4, + "/ObjectData/AstroMapBoard.arc", + }, + { + 1, + 4, + "/ObjectData/KinopioLow.arc", + }, + { + 1, + 4, + "/ObjectData/SuperSpinDriverEmpty.arc", + }, + { + 1, + 4, + "/ObjectData/PowerupFoo.arc", + }, + { + 1, + 4, + "/ObjectData/KinopioGoodsMailBag.arc", + }, + { + 1, + 4, + "/ObjectData/WoodBox.arc", + }, + { + 1, + 4, + "/ObjectData/TicoFatGoodsStarPiece.arc", + }, + { + 1, + 4, + "/ObjectData/KinopioMiddle.arc", + }, + { + 1, + 4, + "/ObjectData/WoodBoxBreak.arc", + }, + { + 1, + 4, + "/ObjectData/CrystalBoxBreak.arc", + }, + { + 1, + 4, + "/ObjectData/KinopioGoodsLight.arc", + }, + { + 1, + 4, + "/ObjectData/AstroDecoratePartsA.arc", + }, + { + 1, + 4, + "/ObjectData/KinopioGoodsRucksack.arc", + }, + { + 1, + 4, + "/ObjectData/MiniSurprisedGalaxy.arc", + }, + { + 1, + 4, + "/ObjectData/AstroStarPlateObservatory.arc", + }, + { + 1, + 4, + "/ObjectData/AstroStarPlateWell.arc", + }, + { + 1, + 4, + "/ObjectData/AstroStarPlateBedRoom.arc", + }, + { + 1, + 4, + "/ObjectData/WarpPod.arc", + }, + { + 1, + 4, + "/ObjectData/RosettaLow.arc", + }, + { + 1, + 4, + "/ObjectData/AstroCore.arc", + }, + { + 1, + 4, + "/ObjectData/AstroDecoratePartsGearA.arc", + }, + { + 1, + 4, + "/ObjectData/Tico.arc", + }, + { + 1, + 4, + "/ObjectData/AstroStarPlateMachine.arc", + }, + { + 1, + 4, + "/ObjectData/TicoFat.arc", + }, + { + 1, + 4, + "/ObjectData/AstroStarPlateKitchen.arc", + }, + { + 1, + 4, + "/ObjectData/AstroRotateStepB.arc", + }, + { + 1, + 4, + "/ObjectData/AstroParking.arc", + }, + { + 1, + 4, + "/ObjectData/AstroStarPlateTower.arc", + }, + { + 1, + 4, + "/ObjectData/RosettaMiddle.arc", + }, + { + 1, + 4, + "/ObjectData/Kinopio.arc", + }, + { + 1, + 4, + "/ObjectData/AstroBaseCenterTop.arc", + }, + { + 1, + 4, + "/ObjectData/GrandStar.arc", + }, + { + 1, + 4, + "/ObjectData/AstroBaseKitchen.arc", + }, + { + 1, + 4, + "/ObjectData/AstroBaseCenterA.arc", + }, + { + 1, + 4, + "/ObjectData/AstroLibrary.arc", + }, + { + 1, + 4, + "/ObjectData/AstroRotateStepA.arc", + }, + { + 1, + 4, + "/ObjectData/AstroBaseCenterB.arc", + }, + { + 1, + 4, + "/ObjectData/AstroBaseC.arc", + }, + { + 1, + 4, + "/ObjectData/AstroDomeEntranceMachine.arc", + }, + { + 1, + 4, + "/ObjectData/AstroDomeEntranceBedRoom.arc", + }, + { + 1, + 4, + "/ObjectData/AstroDomeEntranceObservatory.arc", + }, + { + 1, + 4, + "/ObjectData/AstroDomeEntranceKitchen.arc", + }, + { + 1, + 4, + "/ObjectData/AstroChildRoom.arc", + }, + { + 1, + 4, + "/ObjectData/TicoCometGoodsStar.arc", + }, + { + 1, + 4, + "/ObjectData/LuigiNPCLow.arc", + }, + { + 1, + 4, + "/ObjectData/LuigiNPCMiddle.arc", + }, + { + 1, + 4, + "/ObjectData/TicoComet.arc", + }, + { + 1, + 4, + "/ObjectData/GlareGlow.arc", + }, + { + 1, + 4, + "/ObjectData/GlareLine.arc", + }, + { + 1, + 4, + "/ObjectData/LensFlare.arc", + }, + { + 1, + 4, + "/ObjectData/Sun.arc", + }, + { + 1, + 5, + "/LayoutData/GalaxyInfo.arc", + }, + { + 1, + 5, + "/LayoutData/GalaxySelect.arc", + }, + { + 1, + 4, + "/ObjectData/GCaptureRibbon.arc", + }, + { + 1, + 4, + "/ObjectData/MiniatureGalaxySelect.arc", + }, + { + 1, + 4, + "/ObjectData/AstroDomeDemoCamera.arc", + }, + { + 1, + 4, + "/ObjectData/MiniatureGalaxyShadow.arc", + }, + { + 1, + 4, + "/ObjectData/AstroDomeCometBloom.arc", + }, + { + 1, + 4, + "/ObjectData/GCaptureTarget.arc", + }, + { + 1, + 4, + "/ObjectData/AstroDomeDemoAstroGalaxy.arc", + }, + { + 1, + 4, + "/ObjectData/AstroDomeComet.arc", + }, + { + 1, + 4, + "/ObjectData/MiniatureGalaxyUnknown.arc", + }, + { + 1, + 4, + "/ObjectData/DemoSheet.arc", + }, + { + 1, + 4, + "/ObjectData/LightData.arc", + }, + { + 1, + 4, + "/ObjectData/NPCData.arc", + }, + { + 1, + 5, + "/LayoutData/AirMeter.arc", + }, + { + 1, + 5, + "/LayoutData/BatteryInfo.arc", + }, + { + 1, + 5, + "/LayoutData/BlueChipCounter.arc", + }, + { + 1, + 5, + "/LayoutData/CameraInfo.arc", + }, + { + 1, + 5, + "/LayoutData/CinemaFrame.arc", + }, + { + 1, + 5, + "/LayoutData/CinemaSuper.arc", + }, + { + 1, + 5, + "/LayoutData/CoinCounter.arc", + }, + { + 1, + 5, + "/LayoutData/CollectCounter.arc", + }, + { + 1, + 5, + "/LayoutData/CometScreenFilter.arc", + }, + { + 1, + 5, + "/LayoutData/CommandStream.arc", + }, + { + 1, + 5, + "/LayoutData/DPDPointer.arc", + }, + { + 1, + 5, + "/LayoutData/DPDPointerSub.arc", + }, + { + 1, + 5, + "/LayoutData/DPDPointerNumber.arc", + }, + { + 1, + 5, + "/LayoutData/FlyMeter.arc", + }, + { + 1, + 5, + "/LayoutData/GetStar.arc", + }, + { + 1, + 5, + "/LayoutData/HitPointMeter.arc", + }, + { + 1, + 5, + "/LayoutData/SuddenDeathMeter.arc", + }, + { + 1, + 5, + "/LayoutData/IconAButton.arc", + }, + { + 1, + 5, + "/LayoutData/IconSave.arc", + }, + { + 1, + 5, + "/LayoutData/InformationWindow.arc", + }, + { + 1, + 5, + "/LayoutData/OneUp.arc", + }, + { + 1, + 5, + "/LayoutData/PlayerLeft.arc", + }, + { + 1, + 5, + "/LayoutData/PointerGuidance.arc", + }, + { + 1, + 5, + "/LayoutData/PurpleCoinCounter.arc", + }, + { + 1, + 5, + "/LayoutData/RetryButton.arc", + }, + { + 1, + 5, + "/LayoutData/SelectButton.arc", + }, + { + 1, + 5, + "/LayoutData/SignBoardBalloon.arc", + }, + { + 1, + 5, + "/LayoutData/StageTitle.arc", + }, + { + 1, + 5, + "/LayoutData/StarCounter.arc", + }, + { + 1, + 5, + "/LayoutData/StarPieceCounter.arc", + }, + { + 1, + 5, + "/LayoutData/SysInfoWindow.arc", + }, + { + 1, + 5, + "/LayoutData/SysInfoWindowMini.arc", + }, + { + 1, + 5, + "/LayoutData/TalkBalloonEvent.arc", + }, + { + 1, + 5, + "/LayoutData/TalkBalloonStretch.arc", + }, + { + 1, + 5, + "/LayoutData/TalkBalloonLetter.arc", + }, + { + 1, + 5, + "/LayoutData/TooBad.arc", + }, + { + 1, + 5, + "/LayoutData/WipeKoopa.arc", + }, + { + 1, + 5, + "/LayoutData/WipeRing.arc", + }, + { + 1, + 5, + "/LayoutData/YellowChipCounter.arc", + }, + { + 1, + 0, + "/HomeButton2/SpeakerSe.arc", + }, + { + 1, + 0, + "/HomeButton2/home.csv", + }, + { + 1, + 0, + "/HomeButton2/config.txt", + }, + { + 1, + 1, + "/ParticleData/Effect.arc", + }, + { + 1, + 1, + "/StageData/ObjNameTable.arc", + }, + { + 1, + 4, + "/ObjectData/ErrorMessageImage.arc", + }, + { + 1, + 4, + "/ObjectData/PlanetMapDataTable.arc", + }, + { + 1, + 5, + "/LayoutData/TimeLimit.arc", + }, + { + 1, + 5, + "/LayoutData/TimeUp.arc", + }, + { + 1, + 0, + "/ModuleData/HomeButtonMenuWrapperRSO.rso", + }, + { + 1, + 0, + "/ModuleData/product.sel", + }, + { + 1, + 4, + "/ObjectData/SaveIconBanner.arc", + }, + { + 1, + 0, + "/LayoutData/HomeButton.arc", + }, + { + 1, + 1, + "/LayoutData/Font.arc", + }, + { + 1, + 1, + "/MessageData/Message.arc", + }, + { + 1, + 5, + "/LayoutData/GameOver.arc", + }, + { + 0, + 0, + nullptr, + }, }; const StationedFileInfo* getStationedFileInfoTable() { return cStationedFileInfo; } -}; +}; // namespace MR diff --git a/src/Game/System/SysConfigFile.cpp b/src/Game/System/SysConfigFile.cpp index ff0e7f6fb..5dca3851c 100644 --- a/src/Game/System/SysConfigFile.cpp +++ b/src/Game/System/SysConfigFile.cpp @@ -2,9 +2,8 @@ #include "Game/System/SysConfigFile.hpp" #include "Game/Util/MemoryUtil.hpp" -SysConfigChunk::SysConfigChunk() : - mHeaderSerializer(nullptr) -{ +SysConfigChunk::SysConfigChunk() + : mHeaderSerializer(nullptr) { initHeaderSerializer(); initializeData(); } @@ -18,12 +17,12 @@ u32 SysConfigChunk::getSignature() const { } s32 SysConfigChunk::deserialize(const u8* pBuffer, u32 size) { - s32 result; + s32 result; const char* pName; BinaryDataContentAccessor accessor = BinaryDataContentAccessor(const_cast(pBuffer)); - u32 headerSize = accessor.getHeaderSize(); - u8* pData = const_cast(pBuffer) + headerSize; + u32 headerSize = accessor.getHeaderSize(); + u8* pData = const_cast(pBuffer) + headerSize; pName = "mTimeAnnounced"; mTimeAnnounced = *static_cast(accessor.getPointer(pName, pData)); @@ -60,10 +59,9 @@ void SysConfigChunk::initHeaderSerializer() { mHeaderSerializer->flush(); } -SysConfigFile::SysConfigFile() : - mChunk(nullptr), - mChunkHolder(nullptr) -{ +SysConfigFile::SysConfigFile() + : mChunk(nullptr), + mChunkHolder(nullptr) { mChunkHolder = new BinaryDataChunkHolder(0x3000, 8); mChunk = new SysConfigChunk(); @@ -105,14 +103,14 @@ void SysConfigFile::loadFromDataBinary(const u8* pBuffer, u32 size) { } s32 SysConfigChunk::serialize(u8* pBuffer, u32 size) const { - void* pSrcBuffer = mHeaderSerializer->mStream.mBuffer; + void* pSrcBuffer = mHeaderSerializer->mStream.mBuffer; const char* pName; MR::copyMemory(pBuffer, pSrcBuffer, mHeaderSerializer->getHeaderSize()); - u32 headerSize = mHeaderSerializer->getHeaderSize(); + u32 headerSize = mHeaderSerializer->getHeaderSize(); BinaryDataContentAccessor accessor = BinaryDataContentAccessor(static_cast(mHeaderSerializer->mStream.mBuffer)); - u8* pData = pBuffer + headerSize; + u8* pData = pBuffer + headerSize; pName = "mTimeAnnounced"; OSTime* pTimeAnnounced = static_cast(accessor.getPointer(pName, pData)); diff --git a/src/Game/System/UserFile.cpp b/src/Game/System/UserFile.cpp index 2adec480f..a30d32999 100644 --- a/src/Game/System/UserFile.cpp +++ b/src/Game/System/UserFile.cpp @@ -6,14 +6,13 @@ #define USER_NAME_SIZE (RFL_NAME_LEN + 1) -UserFile::UserFile() : - mGameDataHolder(nullptr), - mConfigDataHolder(nullptr), - mIsPlayerMario(true), - mIsGameDataCorrupted(false), - mIsConfigDataCorrupted(false), - mUserName(nullptr) -{ +UserFile::UserFile() + : mGameDataHolder(nullptr), + mConfigDataHolder(nullptr), + mIsPlayerMario(true), + mIsGameDataCorrupted(false), + mIsConfigDataCorrupted(false), + mUserName(nullptr) { mGameDataHolder = new GameDataHolder(this); mConfigDataHolder = new ConfigDataHolder(); mUserName = new wchar_t[USER_NAME_SIZE]; @@ -50,8 +49,7 @@ bool UserFile::isLastLoadedMario() const { } bool UserFile::isOnCompleteEndingMarioAndLuigi() const { - return mConfigDataHolder->isOnCompleteEndingMario() - && mConfigDataHolder->isOnCompleteEndingLuigi(); + return mConfigDataHolder->isOnCompleteEndingMario() && mConfigDataHolder->isOnCompleteEndingLuigi(); } OSTime UserFile::getLastModified() const { @@ -73,8 +71,7 @@ void UserFile::setLastLoadedMario(bool lastLoadedMario) { void UserFile::onCompleteEndingCurrentPlayer() { if (mIsPlayerMario) { mConfigDataHolder->onCompleteEndingMario(); - } - else { + } else { mConfigDataHolder->onCompleteEndingLuigi(); } } diff --git a/src/Game/System/WPad.cpp b/src/Game/System/WPad.cpp index e65429201..f5ce609a8 100644 --- a/src/Game/System/WPad.cpp +++ b/src/Game/System/WPad.cpp @@ -10,24 +10,23 @@ #include "Game/System/WPadRumble.hpp" #include "Game/System/WPadStick.hpp" -WPad::WPad(s32 channel) : - mChannel(channel), - mReadInfo(nullptr), - mButton(nullptr), - mPointer(nullptr), - mCorePadAccel(nullptr), - mCorePadSwing(nullptr), - _18(nullptr), - _1C(nullptr), - mStick(nullptr), - mSubPadAccel(nullptr), - mSubPadSwing(nullptr), - mLeaveWatcher(nullptr), - mInfoChecker(nullptr), - _34(true), - mIsConnected(false), - mIsSubPadConnected(false) -{ +WPad::WPad(s32 channel) + : mChannel(channel), + mReadInfo(nullptr), + mButton(nullptr), + mPointer(nullptr), + mCorePadAccel(nullptr), + mCorePadSwing(nullptr), + _18(nullptr), + _1C(nullptr), + mStick(nullptr), + mSubPadAccel(nullptr), + mSubPadSwing(nullptr), + mLeaveWatcher(nullptr), + mInfoChecker(nullptr), + _34(true), + mIsConnected(false), + mIsSubPadConnected(false) { mButton = new WPadButton(this); mPointer = new WPadPointer(this); mCorePadAccel = new WPadAcceleration(this, WPAD_DEV_CORE); @@ -90,7 +89,6 @@ s32 WPad::getBattery() const { } void WPad::resetPad() { - } void WPad::connected() { @@ -159,13 +157,11 @@ void WPad::getInfoCallback(s32 chan, s32 result) { namespace MR { bool isDeviceFreeStyle(const KPADStatus* pStatus) { - return pStatus != nullptr - && pStatus->wpad_err == WPAD_ERR_NONE - && pStatus->dev_type == WPAD_DEV_FREESTYLE; + return pStatus != nullptr && pStatus->wpad_err == WPAD_ERR_NONE && pStatus->dev_type == WPAD_DEV_FREESTYLE; } // getPadDataForExceptionNoInit -}; +}; // namespace MR KPADStatus* WPad::getKPadStatus(u32 index) const { return mReadInfo->getKPadStatus(index); @@ -195,8 +191,7 @@ bool WPad::getAcceleration(TVec3f* pAccel, u32 deviceType) const { if (deviceType == WPAD_DEV_CORE) { pAcceleration = mCorePadAccel; - } - else { + } else { pAcceleration = mSubPadAccel; } @@ -208,8 +203,7 @@ bool WPad::getPastAcceleration(TVec3f* pAccel, s32 param2, u32 deviceType) const if (deviceType == WPAD_DEV_CORE) { pAcceleration = mCorePadAccel; - } - else { + } else { pAcceleration = mSubPadAccel; } diff --git a/src/Game/System/WPadButton.cpp b/src/Game/System/WPadButton.cpp index aaa1473c0..008761aa7 100644 --- a/src/Game/System/WPadButton.cpp +++ b/src/Game/System/WPadButton.cpp @@ -1,15 +1,14 @@ #include "Game/System/WPad.hpp" #include "Game/System/WPadButton.hpp" -WPadButton::WPadButton(const WPad* pPad) : - mPad(pPad), - mHold(0), - mTrigger(0), - mRelease(0), - mRepeat(0), - mDelaySec(1.0f / 2.4f), - mPulseSec(1.0f / 6.0f) -{ +WPadButton::WPadButton(const WPad* pPad) + : mPad(pPad), + mHold(0), + mTrigger(0), + mRelease(0), + mRepeat(0), + mDelaySec(1.0f / 2.4f), + mPulseSec(1.0f / 6.0f) { KPADSetBtnRepeat(mPad->mChannel, mDelaySec, mPulseSec); } @@ -22,8 +21,7 @@ void WPadButton::update() { if (mHold != 0) { mTrigger = pStatus->trig & ~mHold & KPAD_BUTTON_MASK; - } - else { + } else { mTrigger = pStatus->trig; } diff --git a/src/Game/System/WPadHolder.cpp b/src/Game/System/WPadHolder.cpp index e1e06db17..6b33efa91 100644 --- a/src/Game/System/WPadHolder.cpp +++ b/src/Game/System/WPadHolder.cpp @@ -10,10 +10,9 @@ #define KPAD_STATUS_ARRAY_SIZE 120 -WPadReadDataInfo::WPadReadDataInfo() : - mStatusArray(nullptr), - mValidStatusCount(0) -{ +WPadReadDataInfo::WPadReadDataInfo() + : mStatusArray(nullptr), + mValidStatusCount(0) { mStatusArray = new KPADStatus[KPAD_STATUS_ARRAY_SIZE]; MR::zeroMemory(mStatusArray, sizeof(KPADStatus) * KPAD_STATUS_ARRAY_SIZE); @@ -31,10 +30,9 @@ u32 WPadReadDataInfo::getValidStatusCount() const { return mValidStatusCount; } -WPadHolder::WPadHolder() : - mReadDataInfoArray(nullptr), - mMode(WPAD_SENSOR_BAR_POS_TOP) -{ +WPadHolder::WPadHolder() + : mReadDataInfoArray(nullptr), + mMode(WPAD_SENSOR_BAR_POS_TOP) { WPADRegisterAllocator(MR::allocFromWPadHeap, MR::freeFromWPadHeap); KPADInit(); @@ -94,7 +92,7 @@ void WPadHolder::update() { } void WPadHolder::initSensorBarPosition() { - u8 sensorBarPosition = WPADGetSensorBarPosition(); + u8 sensorBarPosition = WPADGetSensorBarPosition(); f32 level = 0.0f; switch (sensorBarPosition) { @@ -138,7 +136,7 @@ namespace { WPadHolder* getWPadHolder() NO_INLINE { return SingletonHolder::get()->mObjHolder->mWPadHolder; } -}; +}; // namespace namespace MR { WPad* getWPad(s32 channel) { @@ -173,4 +171,4 @@ namespace MR { WPADSetAutoSleepTime(minute); } -}; +}; // namespace MR diff --git a/src/Game/System/WPadInfoChecker.cpp b/src/Game/System/WPadInfoChecker.cpp index 3f4b99d65..18d0907ef 100644 --- a/src/Game/System/WPadInfoChecker.cpp +++ b/src/Game/System/WPadInfoChecker.cpp @@ -5,9 +5,8 @@ namespace { static const s32 sCheckInfoInterval = 18000; }; -WPadInfoChecker::WPadInfoChecker(WPad *pPad) : - mPad(pPad) -{ +WPadInfoChecker::WPadInfoChecker(WPad* pPad) + : mPad(pPad) { reset(); } @@ -34,12 +33,10 @@ void WPadInfoChecker::update() { if (mPad->mIsConnected) { if (mCheckInfoFrame <= 0) { startCheck(); - } - else { + } else { mCheckInfoFrame--; } - } - else { + } else { reset(); } } diff --git a/src/Game/System/WPadLeaveWatcher.cpp b/src/Game/System/WPadLeaveWatcher.cpp index 8265dd084..2ddd464a5 100644 --- a/src/Game/System/WPadLeaveWatcher.cpp +++ b/src/Game/System/WPadLeaveWatcher.cpp @@ -4,12 +4,10 @@ namespace { static const s32 sLeaveLongTime = 3600; }; -WPadLeaveWatcher::WPadLeaveWatcher(WPad* pPad) : - mPad(pPad), - mStep(0), - mIsSuspend(false) -{ - +WPadLeaveWatcher::WPadLeaveWatcher(WPad* pPad) + : mPad(pPad), + mStep(0), + mIsSuspend(false) { } // WPadLeaveWatcher::update diff --git a/src/Game/System/WPadPointer.cpp b/src/Game/System/WPadPointer.cpp index 96c7b88ce..f99e49e08 100644 --- a/src/Game/System/WPadPointer.cpp +++ b/src/Game/System/WPadPointer.cpp @@ -18,7 +18,7 @@ WPadPointer::WPadPointer(const WPad* pPad) { _38 = 0; _3C = 0; mEnablePastCount = 0; - _44 = 0; + _44 = 0; _45 = 0; mPointingPosArray = new TVec2f[0x78]; mHorizonArray = new TVec2f[0x78]; @@ -31,7 +31,7 @@ void WPadPointer::reset() { for (s32 i = 0; i < _C; i++) { TVec2f* cur = &mPointingPosArray[i]; cur->x = 0.0f; - cur->y = 0.0f; + cur->y = 0.0f; cur = &mHorizonArray[i]; cur->x = 0.0f; cur->y = 0.0f; @@ -42,14 +42,13 @@ void WPadPointer::reset() { _38 = 0; mEnablePastCount = 0; _2C = 0; - mIsPointInScreen = false; + mIsPointInScreen = false; _45 = 0; KPADSetPosParam(mPad->mChannel, mPosPlayRadius, mPosSensitivity); KPADSetHoriParam(mPad->mChannel, mHoriPlayRadius, mHoriSensitivity); KPADSetDistParam(mPad->mChannel, mDistPlayRadius, mDistSensitivity); } - void WPadPointer::setSensorBarLevel(f32 lvl) { KPADSetSensorHeight(mPad->mChannel, lvl); } @@ -86,12 +85,10 @@ void WPadPointer::setSensorBarLevel(f32 lvl) { } }*/ - void WPadPointer::getPointingPos(TVec2f* pOut) const { if (mIsPointInScreen != 0) { pOut->set(mPointingPosArray[mEnablePastCount - 1]); - } - else { + } else { pOut->x = 0.0f; pOut->y = 0.0f; } @@ -100,8 +97,7 @@ void WPadPointer::getPointingPos(TVec2f* pOut) const { void WPadPointer::getHorizonVec(TVec2f* pOut) const { if (mIsPointInScreen != 0) { pOut->set(mHorizonArray[mEnablePastCount - 1]); - } - else { + } else { pOut->x = 0.0f; pOut->y = 0.0f; } diff --git a/src/Game/System/WPadRumble.cpp b/src/Game/System/WPadRumble.cpp index 7db964eba..67b1a3a4d 100644 --- a/src/Game/System/WPadRumble.cpp +++ b/src/Game/System/WPadRumble.cpp @@ -23,12 +23,10 @@ void RumbleChannel::update() { if (_4 == true) { _E = _0->mPattern[0]; _C = 1; - } - else { + } else { clear(); } - } - else { + } else { _E = _0->mPattern[0]; _C++; } @@ -42,15 +40,14 @@ void RumbleChannel::setPattern(const void* pParam1, const RumblePattern& rParam2 _4 = param4; } -WPadRumble::WPadRumble(WPad* pPad) : - mPad(pPad), - _8(false), - _C(1), - _B0(0), - _B4(0), - _B8(false), - _BC(0) -{ +WPadRumble::WPadRumble(WPad* pPad) + : mPad(pPad), + _8(false), + _C(1), + _B0(0), + _B4(0), + _B8(false), + _BC(0) { if (sInstanceForCallback == nullptr) { sInstanceForCallback = new WPadRumble*[MR::getWPadMaxCount()]; @@ -108,8 +105,7 @@ void WPadRumble::update() { _BC--; stop(); - } - else { + } else { WPadRumble* pRumble = getRumbleInstance(); if (pRumble != nullptr) { @@ -136,16 +132,14 @@ void WPadRumble::updateRumble() { } pause(); - } - else { + } else { if (b) { if (!_8) { _8 = true; WPADControlMotor(mPad->mChannel, WPAD_MOTOR_RUMBLE); } - } - else if (_8) { + } else if (_8) { _8 = false; pause(); @@ -153,14 +147,12 @@ void WPadRumble::updateRumble() { if (b) { _B0 = 5; - } - else { + } else { s32 temp = _B0 - 1; if (temp < -9) { temp = -9; - } - else { + } else { if (temp <= 5) { temp = _B0; } diff --git a/src/Game/System/WPadRumbleData.cpp b/src/Game/System/WPadRumbleData.cpp index 56af731d1..1c9bec839 100644 --- a/src/Game/System/WPadRumbleData.cpp +++ b/src/Game/System/WPadRumbleData.cpp @@ -641,7 +641,7 @@ static RumblePattern gRumblePatternTable[] = { WPAD_MOTOR_RUMBLE, }, }, - { }, + {}, }; namespace RumbleData { @@ -671,7 +671,6 @@ namespace RumbleData { } void checkHashCollision() { - } u32 getTableSize() { @@ -681,4 +680,4 @@ namespace RumbleData { RumblePattern* getData(u16 index) { return &gRumblePatternTable[index]; } -}; +}; // namespace RumbleData diff --git a/src/Game/System/WPadStick.cpp b/src/Game/System/WPadStick.cpp index 5808bda86..fae700229 100644 --- a/src/Game/System/WPadStick.cpp +++ b/src/Game/System/WPadStick.cpp @@ -12,19 +12,17 @@ namespace { static const f32 sIsOnValue = 0.2f; }; -WPadStick::WPadStick(const WPad* pPad) : - mPad(pPad), - mStick(0.0f, 0.0f), - mSpeed(0.0f), - mHold(STICK_FLAG_NONE), - mTrigger(STICK_FLAG_NONE), - mRelease(STICK_FLAG_NONE), - mIsTriggerUp(false), - mIsTriggerDown(false), - mIsHoldUp(false), - mIsHoldDown(false) -{ - +WPadStick::WPadStick(const WPad* pPad) + : mPad(pPad), + mStick(0.0f, 0.0f), + mSpeed(0.0f), + mHold(STICK_FLAG_NONE), + mTrigger(STICK_FLAG_NONE), + mRelease(STICK_FLAG_NONE), + mIsTriggerUp(false), + mIsTriggerDown(false), + mIsHoldUp(false), + mIsHoldDown(false) { } void WPadStick::update() { @@ -36,8 +34,8 @@ void WPadStick::update() { TVec2f stickEx(pStatus->ex_status.fs.stick.x, pStatus->ex_status.fs.stick.y); TVec2f stickPrev = mStick; - f32 deltaX = stickEx.x - stickPrev.x; - f32 deltaY = stickEx.y - stickPrev.y; + f32 deltaX = stickEx.x - stickPrev.x; + f32 deltaY = stickEx.y - stickPrev.y; mSpeed = JGeometry::TUtil::sqrt(deltaX * deltaX + deltaY * deltaY); u32 flagPrev = STICK_FLAG_NONE; @@ -84,23 +82,19 @@ void WPadStick::update() { mIsTriggerDown = false; mIsHoldUp = false; mIsHoldDown = false; - } - else if (mStick.y > 0.0f) { + } else if (mStick.y > 0.0f) { if (mIsHoldUp) { mIsTriggerUp = false; - } - else { + } else { mIsTriggerUp = true; } mIsHoldUp = true; mIsHoldDown = false; - } - else { + } else { if (mIsHoldDown) { mIsTriggerDown = false; - } - else { + } else { mIsTriggerDown = true; } diff --git a/src/Game/Util/ActorCameraUtil.cpp b/src/Game/Util/ActorCameraUtil.cpp index d79e979c7..428d5c78c 100644 --- a/src/Game/Util/ActorCameraUtil.cpp +++ b/src/Game/Util/ActorCameraUtil.cpp @@ -5,32 +5,31 @@ #include namespace { - char* createActorCameraName (char *, u32, const LiveActor *, const ActorCameraInfo *); - char* createMultiActorCameraName (char *, u32, const LiveActor *, const ActorCameraInfo *, const char *); -}; + char* createActorCameraName(char*, u32, const LiveActor*, const ActorCameraInfo*); + char* createMultiActorCameraName(char*, u32, const LiveActor*, const ActorCameraInfo*, const char*); +}; // namespace namespace MR { - ActorCameraInfo* createActorCameraInfo(const JMapInfoIter &rIter) { + ActorCameraInfo* createActorCameraInfo(const JMapInfoIter& rIter) { return new ActorCameraInfo(rIter); } - bool createActorCameraInfoIfExist(const JMapInfoIter &rIter, ActorCameraInfo **pInfo) { + bool createActorCameraInfoIfExist(const JMapInfoIter& rIter, ActorCameraInfo** pInfo) { ActorCameraInfo newInfo(rIter); if (newInfo.mCameraSetID == -1) { return false; - } - else { + } else { (*pInfo) = new ActorCameraInfo(rIter); return true; } } - bool initActorCamera(const LiveActor *pActor, const JMapInfoIter &rIter, ActorCameraInfo **pInfo) { + bool initActorCamera(const LiveActor* pActor, const JMapInfoIter& rIter, ActorCameraInfo** pInfo) { return initMultiActorCamera(pActor, rIter, pInfo, nullptr); } - bool initMultiActorCamera(const LiveActor *pActor, const JMapInfoIter &rIter, ActorCameraInfo **pInfo, const char *pName) { + bool initMultiActorCamera(const LiveActor* pActor, const JMapInfoIter& rIter, ActorCameraInfo** pInfo, const char* pName) { if (*pInfo == nullptr) { *pInfo = new ActorCameraInfo(rIter); } @@ -54,42 +53,42 @@ namespace MR { return true; } */ - void initActorCameraProgrammable(const LiveActor *pActor) { + void initActorCameraProgrammable(const LiveActor* pActor) { declareEventCameraProgrammable(pActor->mName); } - bool startActorCameraNoTarget(const LiveActor *pActor, const ActorCameraInfo *pInfo, s32 a3) { + bool startActorCameraNoTarget(const LiveActor* pActor, const ActorCameraInfo* pInfo, s32 a3) { CameraTargetArg target = CameraTargetArg(); return startMultiActorCameraTargetOther(pActor, pInfo, nullptr, target, a3); } - bool startActorCameraTargetPlayer(const LiveActor *pActor, const ActorCameraInfo *pInfo, s32 a3) { + bool startActorCameraTargetPlayer(const LiveActor* pActor, const ActorCameraInfo* pInfo, s32 a3) { CameraTargetArg target = CameraTargetArg(); setCameraTargetToPlayer(&target); return startMultiActorCameraTargetOther(pActor, pInfo, nullptr, target, a3); } - bool startActorCameraTargetSelf(const LiveActor *pActor, const ActorCameraInfo *pInfo, s32 a3) { + bool startActorCameraTargetSelf(const LiveActor* pActor, const ActorCameraInfo* pInfo, s32 a3) { CameraTargetArg target = CameraTargetArg(pActor); return startMultiActorCameraTargetOther(pActor, pInfo, nullptr, target, a3); } - bool startActorCameraTargetOther(const LiveActor *pActor, const ActorCameraInfo *pInfo, const CameraTargetArg &rTarget, s32 a4) { + bool startActorCameraTargetOther(const LiveActor* pActor, const ActorCameraInfo* pInfo, const CameraTargetArg& rTarget, s32 a4) { return startMultiActorCameraTargetOther(pActor, pInfo, nullptr, rTarget, a4); } - bool startMultiActorCameraNoTarget(const LiveActor *pActor, const ActorCameraInfo *pInfo, const char *pName, s32 a4) { + bool startMultiActorCameraNoTarget(const LiveActor* pActor, const ActorCameraInfo* pInfo, const char* pName, s32 a4) { CameraTargetArg target = CameraTargetArg(); return startMultiActorCameraTargetOther(pActor, pInfo, pName, target, a4); } - bool startMultiActorCameraTargetPlayer(const LiveActor *pActor, const ActorCameraInfo *pInfo, const char *pName, s32 a4) { + bool startMultiActorCameraTargetPlayer(const LiveActor* pActor, const ActorCameraInfo* pInfo, const char* pName, s32 a4) { CameraTargetArg target = CameraTargetArg(); setCameraTargetToPlayer(&target); - return startMultiActorCameraTargetOther(pActor, pInfo, pName, target, a4); + return startMultiActorCameraTargetOther(pActor, pInfo, pName, target, a4); } - bool startMultiActorCameraTargetSelf(const LiveActor *pActor, const ActorCameraInfo *pInfo, const char *pName, s32 a4) { + bool startMultiActorCameraTargetSelf(const LiveActor* pActor, const ActorCameraInfo* pInfo, const char* pName, s32 a4) { return startMultiActorCameraTargetOther(pActor, pInfo, pName, CameraTargetArg(pActor), a4); } @@ -111,41 +110,39 @@ namespace MR { } } */ - - void startActorCameraProgrammable(const LiveActor *pActor, s32 a2) { + + void startActorCameraProgrammable(const LiveActor* pActor, s32 a2) { startGlobalEventCameraNoTarget(pActor->mName, a2); } - bool endActorCamera(const LiveActor *pActor, const ActorCameraInfo *pInfo, bool a3, s32 a4) { + bool endActorCamera(const LiveActor* pActor, const ActorCameraInfo* pInfo, bool a3, s32 a4) { return endMultiActorCamera(pActor, pInfo, nullptr, a3, a4); } - bool endActorCameraAtLanding(const LiveActor *pActor, const ActorCameraInfo *pInfo, s32 a3) { + bool endActorCameraAtLanding(const LiveActor* pActor, const ActorCameraInfo* pInfo, s32 a3) { return endMultiActorCameraAtLanding(pActor, pInfo, nullptr, a3); } - void endActorCameraProgrammable(const LiveActor *pActor, s32 a2, bool a3) { + void endActorCameraProgrammable(const LiveActor* pActor, s32 a2, bool a3) { endGlobalEventCamera(pActor->mName, a2, a3); } - bool isActiveActorCamera(const LiveActor *pActor, const ActorCameraInfo *pInfo) { + bool isActiveActorCamera(const LiveActor* pActor, const ActorCameraInfo* pInfo) { return isActiveMultiActorCamera(pActor, pInfo, nullptr); } - void setProgrammableCameraParam(const LiveActor *pActor, const TVec3f &v1, const TVec3f &v2, const TVec3f &v3) { + void setProgrammableCameraParam(const LiveActor* pActor, const TVec3f& v1, const TVec3f& v2, const TVec3f& v3) { setProgrammableCameraParam(pActor->mName, v1, v2, v3, true); } - void setProgrammableCameraParamFovy(const LiveActor *pActor, f32 fov) { + void setProgrammableCameraParamFovy(const LiveActor* pActor, f32 fov) { setProgrammableCameraParamFovy(pActor->mName, fov); } -}; +}; // namespace MR -CameraTargetArg::CameraTargetArg() : - mTargetObj(nullptr), - mTargetMtx(nullptr), - mLiveActor(nullptr), - mMarioActor(nullptr) -{ - +CameraTargetArg::CameraTargetArg() + : mTargetObj(nullptr), + mTargetMtx(nullptr), + mLiveActor(nullptr), + mMarioActor(nullptr) { } diff --git a/src/Game/Util/ActorMovementUtil.cpp b/src/Game/Util/ActorMovementUtil.cpp index b9cd29ef3..7d55820e9 100644 --- a/src/Game/Util/ActorMovementUtil.cpp +++ b/src/Game/Util/ActorMovementUtil.cpp @@ -21,7 +21,7 @@ #include namespace { - void calcRotate(LiveActor *pActor, const TVec3f &a2, f32 a3); /* { + void calcRotate(LiveActor* pActor, const TVec3f& a2, f32 a3); /* { TPos3f stack_44; TVec3f stack_38; TVec3f stack_2c; @@ -71,7 +71,7 @@ namespace { }; namespace MR { - f32 calcDistance(const HitSensor *pSensor1, const HitSensor *pSensor2, TVec3f *a3) { + f32 calcDistance(const HitSensor* pSensor1, const HitSensor* pSensor2, TVec3f* a3) { TVec3f sensor2_pos(pSensor2->mPosition); JMathInlineVEC::PSVECSubtract((Vec*)&sensor2_pos, (Vec*)&pSensor1->mPosition, (Vec*)&sensor2_pos); @@ -80,8 +80,7 @@ namespace MR { if (a3) { if (mag > 0.0f) { PSVECScale((Vec*)&sensor2_pos, (Vec*)a3, 1.0f / mag); - } - else { + } else { a3->zero(); } } @@ -89,37 +88,37 @@ namespace MR { return mag; } - f32 calcDistance(const LiveActor *pActor, const TVec3f &rVec) { - return PSVECDistance((Vec*)&pActor->mPosition, &(const Vec &)rVec); + f32 calcDistance(const LiveActor* pActor, const TVec3f& rVec) { + return PSVECDistance((Vec*)&pActor->mPosition, &(const Vec&)rVec); } - f32 calcDistanceHorizontal(const LiveActor *pActor, const TVec3f &a2, const TVec3f &a3) { + f32 calcDistanceHorizontal(const LiveActor* pActor, const TVec3f& a2, const TVec3f& a3) { TVec3f stack_8(a2); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&pActor->mPosition, (Vec*)&stack_8); MR::vecKillElement(stack_8, a3, &stack_8); return PSVECMag((Vec*)&stack_8); } - f32 calcDistanceVertical(const LiveActor *pActor, const TVec3f &a2, const TVec3f &a3) { + f32 calcDistanceVertical(const LiveActor* pActor, const TVec3f& a2, const TVec3f& a3) { TVec3f stack_8(a2); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&pActor->mPosition, (Vec*)&stack_8); stack_8.scale(a3.dot(stack_8), a3); return PSVECMag((Vec*)&stack_8); } - f32 calcDistanceVertical(const LiveActor *pActor, const TVec3f &a2) { - const TVec3f &grav = pActor->mGravity; - TVec3f stack_8(a2); + f32 calcDistanceVertical(const LiveActor* pActor, const TVec3f& a2) { + const TVec3f& grav = pActor->mGravity; + TVec3f stack_8(a2); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&pActor->mPosition, (Vec*)&stack_8); stack_8.scale(grav.dot(stack_8), grav); return PSVECMag((Vec*)&stack_8); } - f32 calcDistanceToPlayer(const LiveActor *pActor) { + f32 calcDistanceToPlayer(const LiveActor* pActor) { return (!MR::isExistSceneObj(SceneObj_MarioHolder) ? FLOAT_MAX : PSVECDistance((Vec*)&pActor->mPosition, (Vec*)MR::getPlayerPos())); } - f32 calcDistanceToPlayerH(const LiveActor *pActor) { + f32 calcDistanceToPlayerH(const LiveActor* pActor) { if (MR::isExistSceneObj(SceneObj_MarioHolder) == false) { return FLOAT_MAX; } @@ -129,31 +128,31 @@ namespace MR { return PSVECMag((Vec*)&stack_8); } - bool isNear(const HitSensor *pSensor_1, const HitSensor *pSensor_2, f32 dist) { + bool isNear(const HitSensor* pSensor_1, const HitSensor* pSensor_2, f32 dist) { f32 sqr = pSensor_1->mPosition.squared(pSensor_2->mPosition); return sqr < (dist * dist); } - bool isNear(const LiveActor *pActor_1, const LiveActor *pActor_2, f32 dist) { + bool isNear(const LiveActor* pActor_1, const LiveActor* pActor_2, f32 dist) { f32 sqr = pActor_1->mPosition.squared(pActor_2->mPosition); return sqr < (dist * dist); } - bool isNear(const LiveActor *pActor, const TVec3f &rVec, f32 dist) { + bool isNear(const LiveActor* pActor, const TVec3f& rVec, f32 dist) { f32 sqr = pActor->mPosition.squared(rVec); return sqr < (dist * dist); } - bool isNearPlayer(const LiveActor *pActor, f32 dist) { + bool isNearPlayer(const LiveActor* pActor, f32 dist) { return (MR::isPlayerHidden() ? false : MR::isNearPlayerAnyTime(pActor, dist)); } - bool isNearPlayerAnyTime(const LiveActor *pActor, f32 dist) { + bool isNearPlayerAnyTime(const LiveActor* pActor, f32 dist) { f32 sqr = pActor->mPosition.squared(*MR::getPlayerPos()); return sqr < (dist * dist); } - bool isNearPlayer(const TVec3f &rPos, f32 dist) { + bool isNearPlayer(const TVec3f& rPos, f32 dist) { if (MR::isPlayerHidden()) { return false; } @@ -180,72 +179,71 @@ namespace MR { return (stack_14.squared() < a2 * a2); } */ - bool isNearPlayerHorizontal(const LiveActor *pActor, f32 dist) { + bool isNearPlayerHorizontal(const LiveActor* pActor, f32 dist) { TVec3f stack_14; if (isPlayerHidden()) { return false; } TVec3f* playerPos = getPlayerPos(); - TVec3f stack_8(pActor->mPosition); + TVec3f stack_8(pActor->mPosition); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)playerPos, (Vec*)&stack_8); float f1 = vecKillElement(stack_8, pActor->mGravity, &stack_14); return (stack_14.squared() < dist * dist); } - - void calcFrontVec(TVec3f *pFrontVec, const LiveActor *pActor) { + + void calcFrontVec(TVec3f* pFrontVec, const LiveActor* pActor) { MtxPtr mtx = pActor->getBaseMtx(); pFrontVec->set(mtx[0][2], mtx[1][2], mtx[2][2]); } - void calcUpVec(TVec3f *pUpVec, const LiveActor *pActor) { + void calcUpVec(TVec3f* pUpVec, const LiveActor* pActor) { MtxPtr mtx = pActor->getBaseMtx(); pUpVec->set(mtx[0][1], mtx[1][1], mtx[2][1]); } - void calcSideVec(TVec3f *pSideVec, const LiveActor *pActor) { + void calcSideVec(TVec3f* pSideVec, const LiveActor* pActor) { MtxPtr mtx = pActor->getBaseMtx(); pSideVec->set(mtx[0][0], mtx[1][0], mtx[2][0]); } - void calcPositionUpOffset(TVec3f *a1, const LiveActor *pActor, f32 a3) { - TVec3f stack_8; - TVec3f *stack_c = a1; + void calcPositionUpOffset(TVec3f* a1, const LiveActor* pActor, f32 a3) { + TVec3f stack_8; + TVec3f* stack_c = a1; MR::calcUpVec(&stack_8, pActor); JMAVECScaleAdd((Vec*)&stack_8, (Vec*)&pActor->mPosition, (Vec*)stack_c, a3); } - void calcVecToPlayerH(TVec3f *pToPlayerHVec, const LiveActor *pActor, const TVec3f *a3) { + void calcVecToPlayerH(TVec3f* pToPlayerHVec, const LiveActor* pActor, const TVec3f* a3) { calcVecToTargetPosH(pToPlayerHVec, pActor, *MR::getPlayerPos(), a3); } - void calcVecFromPlayerH(TVec3f *pFromPlayerHVec, const LiveActor *pActor) { + void calcVecFromPlayerH(TVec3f* pFromPlayerHVec, const LiveActor* pActor) { calcVecToTargetPosH(pFromPlayerHVec, pActor, *MR::getPlayerPos(), nullptr); pFromPlayerHVec->scale(-1.0f); } - void calcVecToTargetPosH(TVec3f *pToTargetHVec, const LiveActor *pActor, const TVec3f &a3, const TVec3f *a4) { + void calcVecToTargetPosH(TVec3f* pToTargetHVec, const LiveActor* pActor, const TVec3f& a3, const TVec3f* a4) { pToTargetHVec->set(a3); - TVec3f *vec = pToTargetHVec; + TVec3f* vec = pToTargetHVec; JMathInlineVEC::PSVECSubtract((Vec*)vec, (Vec*)&pActor->mPosition, (Vec*)vec); if (a4 == nullptr) { MR::vecKillElement(*pToTargetHVec, pActor->mGravity, pToTargetHVec); - } - else { + } else { MR::vecKillElement(*pToTargetHVec, *a4, pToTargetHVec); } MR::normalizeOrZero(pToTargetHVec); } - void calcVecFromTargetPosH(TVec3f *pFromTargetHVec, const LiveActor *pActor, const TVec3f &a3, const TVec3f *a4) { + void calcVecFromTargetPosH(TVec3f* pFromTargetHVec, const LiveActor* pActor, const TVec3f& a3, const TVec3f* a4) { calcVecToTargetPosH(pFromTargetHVec, pActor, a3, a4); pFromTargetHVec->scale(-1.0f); } - bool isFaceToTargetDegree(const LiveActor *pActor, const TVec3f &a2, const TVec3f &a3, f32 a4) { + bool isFaceToTargetDegree(const LiveActor* pActor, const TVec3f& a2, const TVec3f& a3, f32 a4) { TVec3f stack_8(a2); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&pActor->mPosition, (Vec*)&stack_8); @@ -253,7 +251,7 @@ namespace MR { return MR::isNearAngleDegree(stack_8, a3, a4); } - bool isFaceToPlayerDegree(const LiveActor *pActor, const TVec3f &a2, f32 a3) { + bool isFaceToPlayerDegree(const LiveActor* pActor, const TVec3f& a2, f32 a3) { TVec3f stack_8(*MR::getPlayerPos()); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&pActor->mPosition, (Vec*)&stack_8); @@ -261,7 +259,7 @@ namespace MR { return MR::isNearAngleDegree(stack_8, a2, a3); } - bool isFaceToTargetDegree(const LiveActor *pActor, const TVec3f &a2, f32 a3) { + bool isFaceToTargetDegree(const LiveActor* pActor, const TVec3f& a2, f32 a3) { TVec3f stack_14; MR::calcFrontVec(&stack_14, pActor); @@ -271,7 +269,7 @@ namespace MR { return MR::isNearAngleDegree(stack_8, stack_14, a3); } - bool isFaceToPlayerDegree(const LiveActor *pActor, f32 a2) { + bool isFaceToPlayerDegree(const LiveActor* pActor, f32 a2) { TVec3f stack_14; MR::calcFrontVec(&stack_14, pActor); @@ -281,7 +279,7 @@ namespace MR { return MR::isNearAngleDegree(stack_8, stack_14, a2); } - bool isFaceToPlayerDegreeHV(const LiveActor *pActor, const TVec3f &a2, f32 a3, f32 a4) { + bool isFaceToPlayerDegreeHV(const LiveActor* pActor, const TVec3f& a2, f32 a3, f32 a4) { TVec3f stack_8(*MR::getPlayerPos()); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&pActor->mPosition, (Vec*)&stack_8); @@ -289,25 +287,25 @@ namespace MR { return MR::isNearAngleDegreeHV(stack_8, a2, pActor->mGravity, a3, a4); } - bool isFaceToTargetHorizontalDegree(const LiveActor *pActor, const TVec3f &a2, const TVec3f &a3, f32 a4) { + bool isFaceToTargetHorizontalDegree(const LiveActor* pActor, const TVec3f& a2, const TVec3f& a3, f32 a4) { TVec3f stack_20; TVec3f stack_14; TVec3f stack_8(a2); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&pActor->mPosition, (Vec*)&stack_8); - const TVec3f *grav = &pActor->mGravity; + const TVec3f* grav = &pActor->mGravity; JMAVECScaleAdd((Vec*)grav, (Vec*)&stack_8, (Vec*)&stack_20, -pActor->mGravity.dot(stack_8)); JMAVECScaleAdd((Vec*)grav, (Vec*)&a3, (Vec*)&stack_14, -pActor->mGravity.dot(a3)); return MR::isNearAngleDegree(stack_20, stack_14, a4); } - bool isFaceToPlayerHorizontalDegree(const LiveActor *pActor, const TVec3f &a2, f32 a3) { + bool isFaceToPlayerHorizontalDegree(const LiveActor* pActor, const TVec3f& a2, f32 a3) { return MR::isFaceToTargetHorizontalDegree(pActor, *MR::getPlayerPos(), a2, a3); } - bool isClockwiseToDir(const LiveActor *pActor, const TVec3f &v1, const TVec3f &v2) { + bool isClockwiseToDir(const LiveActor* pActor, const TVec3f& v1, const TVec3f& v2) { TVec3f stack_14; TVec3f stack_8; PSVECCrossProduct((Vec*)&pActor->mGravity, (Vec*)&v2, (Vec*)&stack_8); @@ -315,7 +313,7 @@ namespace MR { return (stack_14.dot(v1) >= 0.0f); } - bool isClockwiseToPlayer(const LiveActor *pActor, const TVec3f &v1) { + bool isClockwiseToPlayer(const LiveActor* pActor, const TVec3f& v1) { TVec3f stack_20(*getPlayerPos()); JMathInlineVEC::PSVECSubtract((Vec*)&stack_20, (Vec*)&pActor->mPosition, (Vec*)&stack_20); TVec3f stack_14; @@ -323,7 +321,6 @@ namespace MR { TVec3f stack_8; normalizeOrZero(stack_14, &stack_8); return (stack_8.dot(v1) >= 0.0f); - } // Minor mismatch: The sideVec initialization uses void* TVec3() from Xanimecore @@ -335,26 +332,24 @@ namespace MR { return (stack_8.dot(sideVec) >= 0.0f); } */ - bool isLeftSideFromPlayer(const LiveActor *pActor) { + bool isLeftSideFromPlayer(const LiveActor* pActor) { TVec3f stack_14; getPlayerSideVec(&stack_14); TVec3f* playerPos = getPlayerPos(); - TVec3f stack_8(pActor->mPosition); + TVec3f stack_8(pActor->mPosition); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)playerPos, (Vec*)&stack_8); return (stack_14.dot(stack_8) >= 0.0f); } - bool isInSightConePlayer(const LiveActor *pActor, const TVec3f &a2, f32 dist, f32 angle) { - return isNearPlayerAnyTime(pActor, dist) - && isFaceToPlayerDegree(pActor, a2, angle); + bool isInSightConePlayer(const LiveActor* pActor, const TVec3f& a2, f32 dist, f32 angle) { + return isNearPlayerAnyTime(pActor, dist) && isFaceToPlayerDegree(pActor, a2, angle); } - bool isInSightFanPlayer(const LiveActor *pActor, const TVec3f &a2, f32 dist, f32 a3, f32 a4) { - return isNearPlayerAnyTime(pActor, dist) - && isFaceToPlayerDegreeHV(pActor, a2, a3, a4); + bool isInSightFanPlayer(const LiveActor* pActor, const TVec3f& a2, f32 dist, f32 a3, f32 a4) { + return isNearPlayerAnyTime(pActor, dist) && isFaceToPlayerDegreeHV(pActor, a2, a3, a4); } - - bool isBindedWallFront(const LiveActor *pActor, const TVec3f &v1, float a3) { + + bool isBindedWallFront(const LiveActor* pActor, const TVec3f& v1, float a3) { if (isBindedWall(pActor)) { TVec3f wallNormal(*getWallNormal(pActor)); // stack_8 if (v1.dot(wallNormal) < -a3) { @@ -364,7 +359,7 @@ namespace MR { return false; } - bool isOnPlayer(const LiveActor *pActor) { + bool isOnPlayer(const LiveActor* pActor) { return isActorOnPlayer(pActor); } @@ -403,7 +398,7 @@ namespace MR { normalizeOrZero(&stack_2c); return (a3 < upVec.dot(stack_2c)); } */ - + // Minor mismatch: Stack positions of stack_8 (== scaledDownVec) and stack_14 are switched /* bool isExistPlayerDown(const LiveActor *pActor, float a2, float a3) { TVec3f stack_38 = TVec3f(*getPlayerCenterPos()); @@ -420,75 +415,73 @@ namespace MR { return (a3 < stack_2c.dot(stack_38)); } */ - bool isInWater(const LiveActor *pActor, const TVec3f &rOffset) { + bool isInWater(const LiveActor* pActor, const TVec3f& rOffset) { TVec3f stack_8(pActor->mPosition); stack_8.add(rOffset); return MR::isInWater(stack_8); } - bool isInDeath(const LiveActor *pActor, const TVec3f &rOffset) { + bool isInDeath(const LiveActor* pActor, const TVec3f& rOffset) { TVec3f stack_8(pActor->mPosition); stack_8.add(rOffset); return MR::isInDeath(stack_8); } - void makeMtxTR(MtxPtr mtx, const LiveActor *pActor) { + void makeMtxTR(MtxPtr mtx, const LiveActor* pActor) { MR::makeMtxTR(mtx, - pActor->mPosition.x, pActor->mPosition.y, pActor->mPosition.z, - pActor->mRotation.x, pActor->mRotation.y, pActor->mRotation.z); + pActor->mPosition.x, pActor->mPosition.y, pActor->mPosition.z, + pActor->mRotation.x, pActor->mRotation.y, pActor->mRotation.z); } - void makeMtxTRS(MtxPtr mtx, const LiveActor *pActor) { + void makeMtxTRS(MtxPtr mtx, const LiveActor* pActor) { MR::makeMtxTRS(mtx, - pActor->mPosition.x, pActor->mPosition.y, pActor->mPosition.z, - pActor->mRotation.x, pActor->mRotation.y, pActor->mRotation.z, - pActor->mScale.x, pActor->mScale.y, pActor->mScale.z); + pActor->mPosition.x, pActor->mPosition.y, pActor->mPosition.z, + pActor->mRotation.x, pActor->mRotation.y, pActor->mRotation.z, + pActor->mScale.x, pActor->mScale.y, pActor->mScale.z); } - void makeMtxTransRotateY(MtxPtr mtx, const LiveActor *pActor) { + void makeMtxTransRotateY(MtxPtr mtx, const LiveActor* pActor) { MR::makeMtxTransRotateY(mtx, - pActor->mPosition.x, pActor->mPosition.y, pActor->mPosition.z, - pActor->mRotation.y); + pActor->mPosition.x, pActor->mPosition.y, pActor->mPosition.z, + pActor->mRotation.y); } - void calcMtxFromGravityAndZAxis(TPos3f *pResult, const LiveActor *pActor, const TVec3f &vGravity, const TVec3f &zAxis) { + void calcMtxFromGravityAndZAxis(TPos3f* pResult, const LiveActor* pActor, const TVec3f& vGravity, const TVec3f& zAxis) { TPos3f pos; // stack_44 pos.setInline(pActor->getBaseMtx()); - TVec3f yDir; // stack_38 - TVec3f zDir; // stack_2c - TVec3f xDir; // stack_20 + TVec3f yDir; // stack_38 + TVec3f zDir; // stack_2c + TVec3f xDir; // stack_20 TVec3f xDir2; // stack_14 if (!isNearZero(vGravity, 0.001f)) { TVec3f stack_8 = -vGravity; yDir = stack_8; - } - else { + } else { pos.getYDir(yDir); } if (!isNearZero(zAxis, 0.001f)) { zDir = zAxis; - } - else { + } else { pos.getZDir(zDir); } PSVECCrossProduct((Vec*)&zDir, (Vec*)&yDir, (Vec*)&xDir); - if (isNearZero(xDir,0.001f)) { + if (isNearZero(xDir, 0.001f)) { pos.getXDir(xDir2); PSVECCrossProduct((Vec*)&xDir2, (Vec*)&yDir, (Vec*)&zDir); } makeMtxUpFrontPos(pResult, yDir, zDir, pActor->mPosition); } - void calcAndSetBaseMtxFromGravityAndZAxis(LiveActor *pActor, const TVec3f &zAxis) { + void calcAndSetBaseMtxFromGravityAndZAxis(LiveActor* pActor, const TVec3f& zAxis) { TPos3f stack_8; stack_8.identity(); calcMtxFromGravityAndZAxis(&stack_8, pActor, pActor->mGravity, zAxis); setBaseTRMtx(pActor, stack_8); } - void calcActorAxis(TVec3f *outputX, TVec3f *outputY, TVec3f *outputZ, const LiveActor *pActor) { + void calcActorAxis(TVec3f* outputX, TVec3f* outputY, TVec3f* outputZ, const LiveActor* pActor) { TRot3f stack_8; stack_8.identity(); makeMtxTR(stack_8, pActor); @@ -497,39 +490,38 @@ namespace MR { stack_8.getZDir(*outputZ); } - void calcActorAxisX(TVec3f *pDest, const LiveActor *pActor) { + void calcActorAxisX(TVec3f* pDest, const LiveActor* pActor) { TRot3f stack_8; stack_8.identity(); makeMtxTR(stack_8, pActor); stack_8.getXDir(*pDest); } - void calcActorAxisY(TVec3f *pDest, const LiveActor *pActor) { + void calcActorAxisY(TVec3f* pDest, const LiveActor* pActor) { TRot3f stack_8; stack_8.identity(); makeMtxTR(stack_8, pActor); stack_8.getYDir(*pDest); } - void calcActorAxisZ(TVec3f *pDest, const LiveActor *pActor) { + void calcActorAxisZ(TVec3f* pDest, const LiveActor* pActor) { TRot3f stack_8; stack_8.identity(); makeMtxTR(stack_8, pActor); stack_8.getZDir(*pDest); } - bool faceToVector(TQuat4f *pQuat, TVec3f a2, f32 a3) { + bool faceToVector(TQuat4f* pQuat, TVec3f a2, f32 a3) { TVec3f yDir; // stack_8 pQuat->getYDir(yDir); normalizeOrZero(&a2); if (vecKillElement(a2, yDir, &a2) > 0.95f) { return false; - } - else { + } else { return turnQuatZDirRad(pQuat, *pQuat, a2, a3 * PI_180); } } - + // Minor mismatch: see isPlayerLeftSide /* bool faceToPoint(MtxPtr mtx, TVec3f a2, f32 a3) { TVec3f stack_14 = TVec3f(mtx[0][3],mtx[1][3], mtx[2][3]); @@ -537,18 +529,18 @@ namespace MR { return faceToVector(mtx, a2, a3); } */ - void makeQuatFromRotate(TQuat4f *pQuat, const LiveActor *pActor) { + void makeQuatFromRotate(TQuat4f* pQuat, const LiveActor* pActor) { makeQuatRotateDegree(pQuat, pActor->mRotation); return; } - void makeQuatAndFrontFromRotate(TQuat4f *pQuat, TVec3f *pVec, const LiveActor *pActor) { + void makeQuatAndFrontFromRotate(TQuat4f* pQuat, TVec3f* pVec, const LiveActor* pActor) { makeQuatRotateDegree(pQuat, pActor->mRotation); pQuat->getZDir(*pVec); return; } - void turnQuatUpToGravity(TQuat4f *pQuatDest, const TQuat4f &pQuatSrc, const LiveActor *pActor) { + void turnQuatUpToGravity(TQuat4f* pQuatDest, const TQuat4f& pQuatSrc, const LiveActor* pActor) { TVec3f yDir; pQuatSrc.getYDir(yDir); @@ -557,19 +549,18 @@ namespace MR { TVec3f xDir; pQuatSrc.getXDir(xDir); q1.setRotate(xDir, PI); - } - else { + } else { q1.setRotate(yDir, -pActor->mGravity); } PSQUATMultiply(reinterpret_cast(&q1), reinterpret_cast(&pQuatSrc), reinterpret_cast(pQuatDest)); pQuatDest->normalize(); } - void blendQuatFromGroundAndFront(TQuat4f *a1, const LiveActor *pActor, const TVec3f &a3, f32 a4, f32 a5) { + void blendQuatFromGroundAndFront(TQuat4f* a1, const LiveActor* pActor, const TVec3f& a3, f32 a4, f32 a5) { MR::blendQuatUpFront(a1, MR::isBindedGround(pActor) ? *MR::getGroundNormal(pActor) : -pActor->mGravity, a3, a4, a5); } - void resetPosition(LiveActor *pActor) { + void resetPosition(LiveActor* pActor) { MR::clearHitSensors(pActor); if (pActor->mBinder != nullptr) { @@ -589,13 +580,13 @@ namespace MR { MR::requestCalcActorShadowAppear(pActor); } - void resetPosition(LiveActor *pActor, const TVec3f &rPosition) { + void resetPosition(LiveActor* pActor, const TVec3f& rPosition) { pActor->mPosition.set(rPosition); MR::resetPosition(pActor); } - void resetPosition(LiveActor *pActor, const char *a2) { + void resetPosition(LiveActor* pActor, const char* a2) { TVec3f pos(0.0f, 0.0f, 0.0f); TVec3f rot(0.0f, 0.0f, 0.0f); MR::findNamePos(a2, &pos, &rot); @@ -605,15 +596,15 @@ namespace MR { MR::resetPosition(pActor); } - - void calcVelocityMoveToDirectionHorizon(TVec3f *a1, const LiveActor *pActor, const TVec3f &a3, f32 a4) { + + void calcVelocityMoveToDirectionHorizon(TVec3f* a1, const LiveActor* pActor, const TVec3f& a3, f32 a4) { TVec3f* pGravity = const_cast(&pActor->mGravity); a1->rejection(a3, *pGravity); normalizeOrZero(a1); a1->scale(a4); } - void calcVelocityMoveToDirectionHorizon(TVec3f *a1, const LiveActor *pActor, const TVec3f &a3, f32 a4, f32 a5, f32 a6, f32 a7) { + void calcVelocityMoveToDirectionHorizon(TVec3f* a1, const LiveActor* pActor, const TVec3f& a3, f32 a4, f32 a5, f32 a6, f32 a7) { TVec3f* pGravity = const_cast(&pActor->mGravity); a1->rejection(a3, *pGravity); float stack_8; @@ -621,7 +612,7 @@ namespace MR { a1->scale(getInterpolateValue(normalize(stack_8, a6, a7), a4, a5)); } - void calcVelocityMoveToDirection(TVec3f *a1, const LiveActor *pActor, const TVec3f &a3, f32 a4) { + void calcVelocityMoveToDirection(TVec3f* a1, const LiveActor* pActor, const TVec3f& a3, f32 a4) { calcVelocityMoveToDirectionHorizon(a1, pActor, a3, a4); if (isOnGround(pActor)) { const TVec3f* pGroundNormal = getGroundNormal(pActor); @@ -629,7 +620,7 @@ namespace MR { } } - void calcVelocityMoveToDirection(TVec3f *a1, const LiveActor *pActor, const TVec3f &a3, f32 a4, f32 a5, f32 a6, f32 a7) { + void calcVelocityMoveToDirection(TVec3f* a1, const LiveActor* pActor, const TVec3f& a3, f32 a4, f32 a5, f32 a6, f32 a7) { calcVelocityMoveToDirectionHorizon(a1, pActor, a3, a4, a5, a6, a7); if (isOnGround(pActor)) { const TVec3f* pGroundNormal = getGroundNormal(pActor); @@ -637,19 +628,19 @@ namespace MR { } } - void calcVelocityMoveToTarget(TVec3f *a1, const LiveActor *pActor, const TVec3f &a3, f32 a4) { + void calcVelocityMoveToTarget(TVec3f* a1, const LiveActor* pActor, const TVec3f& a3, f32 a4) { TVec3f stack_8(a3); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&(pActor->mPosition), (Vec*)&stack_8); calcVelocityMoveToDirection(a1, pActor, stack_8, a4); } - void addVelocityMoveToDirection(LiveActor *pActor, const TVec3f &a2, f32 a3) { + void addVelocityMoveToDirection(LiveActor* pActor, const TVec3f& a2, f32 a3) { TVec3f stack_8; calcVelocityMoveToDirection(&stack_8, pActor, a2, a3); (pActor->mVelocity).add(stack_8); } - void addVelocityMoveToTarget(LiveActor *pActor, const TVec3f &a2, f32 a3) { + void addVelocityMoveToTarget(LiveActor* pActor, const TVec3f& a2, f32 a3) { TVec3f stack_14(a2); JMathInlineVEC::PSVECSubtract((Vec*)&stack_14, (Vec*)&(pActor->mPosition), (Vec*)&stack_14); TVec3f stack_8; @@ -657,7 +648,7 @@ namespace MR { (pActor->mVelocity).add(stack_8); } - void addVelocityMoveToTarget(LiveActor *pActor, const TVec3f &a2, f32 a3, f32 a4, f32 a5, f32 a6) { + void addVelocityMoveToTarget(LiveActor* pActor, const TVec3f& a2, f32 a3, f32 a4, f32 a5, f32 a6) { TVec3f stack_14(a2); JMathInlineVEC::PSVECSubtract((Vec*)&stack_14, (Vec*)&(pActor->mPosition), (Vec*)&stack_14); TVec3f stack_8; @@ -665,7 +656,7 @@ namespace MR { (pActor->mVelocity).add(stack_8); } - void addVelocityAwayFromTarget(LiveActor *pActor, const TVec3f &a2, f32 a3) { + void addVelocityAwayFromTarget(LiveActor* pActor, const TVec3f& a2, f32 a3) { TVec3f stack_14(pActor->mPosition); JMathInlineVEC::PSVECSubtract((Vec*)&stack_14, (Vec*)&a2, (Vec*)&stack_14); TVec3f stack_8; @@ -673,7 +664,7 @@ namespace MR { (pActor->mVelocity).add(stack_8); } - void addVelocityAwayFromTarget(LiveActor *pActor, const TVec3f &a2, f32 a3, f32 a4, f32 a5, f32 a6) { + void addVelocityAwayFromTarget(LiveActor* pActor, const TVec3f& a2, f32 a3, f32 a4, f32 a5, f32 a6) { TVec3f stack_14(pActor->mPosition); JMathInlineVEC::PSVECSubtract((Vec*)&stack_14, (Vec*)&a2, (Vec*)&stack_14); TVec3f stack_8; @@ -681,7 +672,7 @@ namespace MR { (pActor->mVelocity).add(stack_8); } - void addVelocityClockwiseToDirection(LiveActor *pActor, const TVec3f &a2, f32 a3) { + void addVelocityClockwiseToDirection(LiveActor* pActor, const TVec3f& a2, f32 a3) { TVec3f stack_14; if (normalizeOrZero(a2, &stack_14)) { return; @@ -692,27 +683,27 @@ namespace MR { (pActor->mVelocity).add(stack_8); } - void addVelocityClockwiseToTarget(LiveActor *pActor, const TVec3f &a2, f32 a3) { + void addVelocityClockwiseToTarget(LiveActor* pActor, const TVec3f& a2, f32 a3) { TVec3f stack_8(a2); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&(pActor->mPosition), (Vec*)&stack_8); addVelocityClockwiseToDirection(pActor, stack_8, a3); } - void addVelocityClockwiseToPlayer(LiveActor *pActor, f32 a2) { + void addVelocityClockwiseToPlayer(LiveActor* pActor, f32 a2) { TVec3f stack_8(*getPlayerPos()); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&(pActor->mPosition), (Vec*)&stack_8); addVelocityClockwiseToDirection(pActor, stack_8, a2); } - void addVelocityJump(LiveActor *pActor, f32 a2) { + void addVelocityJump(LiveActor* pActor, f32 a2) { TVec3f stack_8(pActor->mGravity); stack_8.scale(-a2); (pActor->mVelocity).add(stack_8); } - bool addVelocityLimit(LiveActor *pActor, const TVec3f &a2) { + bool addVelocityLimit(LiveActor* pActor, const TVec3f& a2) { TVec3f stack_18; - float stack_8; + float stack_8; separateScalarAndDirection(&stack_8, &stack_18, a2); if (isNearZero(stack_18, 0.001f)) { return false; @@ -721,39 +712,37 @@ namespace MR { if (stack_8 <= f1) { return false; } - float f31 = stack_8 - f1; + float f31 = stack_8 - f1; TVec3f stack_c(stack_18); stack_c.scale(f31); pActor->mVelocity.add(stack_c); return true; } - void setVelocityJump(LiveActor *pActor, f32 a2) { + void setVelocityJump(LiveActor* pActor, f32 a2) { TVec3f stack_8(pActor->mGravity); stack_8.scale(-a2); (pActor->mVelocity).set(stack_8); } - void addVelocityToGravity(LiveActor *pActor, f32 a2) { + void addVelocityToGravity(LiveActor* pActor, f32 a2) { TVec3f stack_8(pActor->mGravity); stack_8.scale(a2); (pActor->mVelocity).add(stack_8); } - void addVelocityToGravityOrGround(LiveActor *pActor, f32 a2) { + void addVelocityToGravityOrGround(LiveActor* pActor, f32 a2) { if (isBindedGround(pActor)) { JMAVECScaleAdd((Vec*)getGroundNormal(pActor), (Vec*)&(pActor->mVelocity), (Vec*)&(pActor->mVelocity), -a2); - } - else { - addVelocityToGravity(pActor,a2); + } else { + addVelocityToGravity(pActor, a2); } } - - bool addVelocityToCollisionNormal(LiveActor *pActor, f32 a2) { + + bool addVelocityToCollisionNormal(LiveActor* pActor, f32 a2) { if (isBinded(pActor) == false) { return false; - } - else { + } else { TVec3f stack_14(*getBindedFixReactionVector(pActor)); if (isNearZero(stack_14, 0.001f)) { return false; @@ -766,23 +755,22 @@ namespace MR { } } - void addVelocityKeepHeight(LiveActor *pActor, const TVec3f &a2, f32 a3, f32 a4) { + void addVelocityKeepHeight(LiveActor* pActor, const TVec3f& a2, f32 a3, f32 a4) { addVelocityKeepHeight(pActor, a2, 0.0f, a3, a4); } - void addVelocityKeepHeight(LiveActor *pActor, const TVec3f &a2, f32 a3, f32 a4, f32 a5) { + void addVelocityKeepHeight(LiveActor* pActor, const TVec3f& a2, f32 a3, f32 a4, f32 a5) { TVec3f stack_8(a2); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&(pActor->mPosition), (Vec*)&stack_8); addVelocityToGravity(pActor, a4 * normalizeAbs((pActor->mGravity).dot(stack_8) - a3, -a5, a5)); } - - bool addVelocityKeepHeightUseShadow(LiveActor *pActor, f32 a2, f32 a3, f32 a4, const char *pName) { + + bool addVelocityKeepHeightUseShadow(LiveActor* pActor, f32 a2, f32 a3, f32 a4, const char* pName) { if (pName != nullptr) { if (isShadowProjected(pActor, pName) == false) { return false; } - } - else { + } else { if (isShadowProjectedAny(pActor) == false) { return false; } @@ -790,8 +778,7 @@ namespace MR { float shadowLength; if (pName != nullptr) { shadowLength = getShadowProjectionLength(pActor, pName); - } - else { + } else { shadowLength = getShadowNearProjectionLength(pActor); } shadowLength -= a2; @@ -799,13 +786,12 @@ namespace MR { return true; } - bool addVelocityKeepHeightUseShadow(LiveActor *pActor, f32 a2, f32 a3, f32 a4, f32 a5, const char *pName) { + bool addVelocityKeepHeightUseShadow(LiveActor* pActor, f32 a2, f32 a3, f32 a4, f32 a5, const char* pName) { if (pName != nullptr) { if (isShadowProjected(pActor, pName) == false) { return false; } - } - else { + } else { if (isShadowProjectedAny(pActor) == false) { return false; } @@ -813,21 +799,19 @@ namespace MR { float f1; if (pName != nullptr) { f1 = getShadowProjectionLength(pActor, pName); - } - else { + } else { f1 = getShadowNearProjectionLength(pActor); } f1 -= a2; f1 = normalizeAbs(f1, -a5, a5); if (f1 >= 0.0f) { addVelocityToGravity(pActor, a3 * f1); - } - else { + } else { addVelocityToGravity(pActor, a4 * f1); } return true; } - + // Minor mismatch: Stack variables out of order + one instruction swap /* void addVelocitySeparateHV(LiveActor *pActor, const TVec3f &a2, f32 a3, f32 a4) { TVec3f* pGravity = &pActor->mGravity; @@ -858,7 +842,7 @@ namespace MR { pActor->mVelocity.set(stack_20); } */ - void attenuateVelocity(LiveActor *pActor, f32 scalar) { + void attenuateVelocity(LiveActor* pActor, f32 scalar) { (pActor->mVelocity).scale(scalar); } @@ -873,20 +857,20 @@ namespace MR { pVelocity->add(stack_8); } */ - void restrictVelocity(LiveActor *pActor, f32 speed) { + void restrictVelocity(LiveActor* pActor, f32 speed) { if ((pActor->mVelocity).squared() > speed * speed) { (pActor->mVelocity).setLength(speed); } } - void killVelocityOnGroundH(LiveActor *pActor) { + void killVelocityOnGroundH(LiveActor* pActor) { if (isOnGround(pActor)) { const TVec3f* pNormal = getGroundNormal(pActor); pActor->mVelocity.scale(pNormal->dot(pActor->mVelocity), *pNormal); } } - void killVelocityOnGroundCosH(LiveActor *pActor, f32 a2) { + void killVelocityOnGroundCosH(LiveActor* pActor, f32 a2) { if (isOnGround(pActor) && isFloorPolygonCos(*getGroundNormal(pActor), pActor->mGravity, a2)) { const TVec3f* pNormal = getGroundNormal(pActor); pActor->mVelocity.scale(pNormal->dot(pActor->mVelocity), *pNormal); @@ -904,7 +888,7 @@ namespace MR { } } */ - void forceBindOnGround(LiveActor *pActor, f32 a2, f32 a3) { + void forceBindOnGround(LiveActor* pActor, f32 a2, f32 a3) { if (isShadowProjected(pActor, nullptr)) { TVec3f stack_20; getShadowProjectionPos(pActor, nullptr, &stack_20); @@ -994,27 +978,27 @@ namespace MR { return false; } */ - void zeroVelocity(LiveActor *pActor) { + void zeroVelocity(LiveActor* pActor) { (pActor->mVelocity).zero(); } - void setVelocity(LiveActor *pActor, const TVec3f &speed) { + void setVelocity(LiveActor* pActor, const TVec3f& speed) { (pActor->mVelocity).set(speed); } - void addVelocity(LiveActor *pActor, const TVec3f &speed) { + void addVelocity(LiveActor* pActor, const TVec3f& speed) { (pActor->mVelocity).add(speed); } - void scaleVelocity(LiveActor *pActor, f32 scaleFactor) { + void scaleVelocity(LiveActor* pActor, f32 scaleFactor) { (pActor->mVelocity).scale(scaleFactor); } - f32 calcVelocityLength(const LiveActor *pActor) { + f32 calcVelocityLength(const LiveActor* pActor) { return PSVECMag((Vec*)&(pActor->mVelocity)); } - f32 calcGravitySpeed(const LiveActor *pActor) { + f32 calcGravitySpeed(const LiveActor* pActor) { return (pActor->mVelocity).dot(pActor->mGravity); } @@ -1053,7 +1037,7 @@ namespace MR { } } */ - void setVelocityJumpAwayFromPlayer(LiveActor *pActor, f32 a2, f32 a3) { + void setVelocityJumpAwayFromPlayer(LiveActor* pActor, f32 a2, f32 a3) { TVec3f* pVelocity = &pActor->mVelocity; calcVecToTargetPosH(pVelocity, (pActor), *getPlayerPos(), nullptr); pVelocity->scale(-1.0f); @@ -1076,7 +1060,7 @@ namespace MR { return false } */ - void addVelocityFromPush(LiveActor *pActor, f32 a2, HitSensor *pSensor1, HitSensor *pSensor2) { + void addVelocityFromPush(LiveActor* pActor, f32 a2, HitSensor* pSensor1, HitSensor* pSensor2) { TVec3f stack_14(pSensor2->mPosition); JMathInlineVEC::PSVECSubtract((Vec*)&stack_14, (Vec*)&(pSensor1->mPosition), (Vec*)&stack_14); TVec3f stack_8 = -(pActor->mGravity); @@ -1087,7 +1071,7 @@ namespace MR { addVelocityLimit(pActor, stack_14); } - void addVelocityFromPushHorizon(LiveActor *pActor, f32 speed, HitSensor *pSensor1, HitSensor *pSensor2) { + void addVelocityFromPushHorizon(LiveActor* pActor, f32 speed, HitSensor* pSensor1, HitSensor* pSensor2) { TVec3f stack_8(pSensor2->mPosition); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&(pSensor1->mPosition), (Vec*)&stack_8); vecKillElement(stack_8, pActor->mGravity, &stack_8); @@ -1095,19 +1079,19 @@ namespace MR { (pActor->mVelocity).add(stack_8); } - void addVelocitySeparateHV(LiveActor *pActor, HitSensor *pSensor1, HitSensor *pSensor2, f32 a4, f32 a5) { + void addVelocitySeparateHV(LiveActor* pActor, HitSensor* pSensor1, HitSensor* pSensor2, f32 a4, f32 a5) { TVec3f stack_8(pSensor2->mPosition); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&(pSensor1->mPosition), (Vec*)&stack_8); addVelocitySeparateHV(pActor, stack_8, a4, a5); } - void setVelocitySeparateHV(LiveActor *pActor, HitSensor *pSensor1, HitSensor *pSensor2, f32 a4, f32 a5) { + void setVelocitySeparateHV(LiveActor* pActor, HitSensor* pSensor1, HitSensor* pSensor2, f32 a4, f32 a5) { TVec3f stack_8(pSensor2->mPosition); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&(pSensor1->mPosition), (Vec*)&stack_8); setVelocitySeparateHV(pActor, stack_8, a4, a5); } - void setVelocityBlowAttack(LiveActor *pActor, HitSensor *pSensor1, HitSensor *pSensor2, f32 a4, f32 a5, s32 a6) { + void setVelocityBlowAttack(LiveActor* pActor, HitSensor* pSensor1, HitSensor* pSensor2, f32 a4, f32 a5, s32 a6) { setVelocitySeparateHV(pActor, pSensor1, pSensor2, a4, a5); if (isNearPlayerAnyTime(pActor, 1000.0f)) { stopSceneForDefaultHit(a6); @@ -1127,7 +1111,7 @@ namespace MR { return true; } */ - bool calcVelocityAreaMoveOnGround(TVec3f *a1, const LiveActor *pActor) { + bool calcVelocityAreaMoveOnGround(TVec3f* a1, const LiveActor* pActor) { a1->zero(); if ((isOnGround(pActor) == false) || (isBindedGroundAreaMove(pActor) == false)) { return false; @@ -1136,81 +1120,80 @@ namespace MR { return true; } - bool calcVelocityAreaOrRailMoveOnGround(TVec3f *a1, const LiveActor *pActor) { - return calcVelocityAreaMoveOnGround(a1, pActor) - || calcVelocityRailMoveOnGround(a1, pActor); + bool calcVelocityAreaOrRailMoveOnGround(TVec3f* a1, const LiveActor* pActor) { + return calcVelocityAreaMoveOnGround(a1, pActor) || calcVelocityRailMoveOnGround(a1, pActor); } - void rotateDirectionGravityDegree(const LiveActor *pActor, TVec3f *a2, f32 angle) { + void rotateDirectionGravityDegree(const LiveActor* pActor, TVec3f* a2, f32 angle) { rotateVecRadian(a2, (pActor->mGravity), PI_180 * angle); } - void turnDirection(const LiveActor *pActor, TVec3f *a2, const TVec3f &a3, f32 a4) { + void turnDirection(const LiveActor* pActor, TVec3f* a2, const TVec3f& a3, f32 a4) { turnVecToVecCosOnPlane(a2, a3, (pActor->mGravity), a4); } - void turnDirectionDegree(const LiveActor *pActor, TVec3f *a2, const TVec3f &a3, f32 a4) { + void turnDirectionDegree(const LiveActor* pActor, TVec3f* a2, const TVec3f& a3, f32 a4) { turnVecToVecCosOnPlane(a2, a3, (pActor->mGravity), cosDegree(a4)); } - void turnDirectionToTarget(const LiveActor *pActor, TVec3f *a2, const TVec3f &a3, f32 a4) { + void turnDirectionToTarget(const LiveActor* pActor, TVec3f* a2, const TVec3f& a3, f32 a4) { TVec3f stack_8(a3); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&(pActor->mPosition), (Vec*)&stack_8); turnVecToVecCosOnPlane(a2, stack_8, pActor->mGravity, a4); } - void turnDirectionToTargetDegree(const LiveActor *pActor, TVec3f *a2, const TVec3f &a3, f32 a4) { + void turnDirectionToTargetDegree(const LiveActor* pActor, TVec3f* a2, const TVec3f& a3, f32 a4) { TVec3f stack_8(a3); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&(pActor->mPosition), (Vec*)&stack_8); turnVecToVecCosOnPlane(a2, stack_8, (pActor->mGravity), cosDegree(a4)); } - void turnDirectionToTargetDegreeHorizon(const LiveActor *pActor, TVec3f *a2, const TVec3f &a3, f32 a4) { + void turnDirectionToTargetDegreeHorizon(const LiveActor* pActor, TVec3f* a2, const TVec3f& a3, f32 a4) { TVec3f stack_8(a3); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&(pActor->mPosition), (Vec*)&stack_8); vecKillElement(stack_8, pActor->mGravity, &stack_8); turnVecToVecCosOnPlane(a2, stack_8, pActor->mGravity, cosDegree(a4)); } - void turnDirectionToTargetUseGroundNormalDegree(const LiveActor *pActor, TVec3f *a2, const TVec3f &a3, f32 a4) { + void turnDirectionToTargetUseGroundNormalDegree(const LiveActor* pActor, TVec3f* a2, const TVec3f& a3, f32 a4) { TVec3f stack_8(a3); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&(pActor->mPosition), (Vec*)&stack_8); a4 = cosDegree(a4); turnVecToVecCosOnPlane(a2, stack_8, isBindedGround(pActor) ? *getGroundNormal(pActor) : (pActor->mGravity), a4); } - void turnDirectionToPlayerDegree(const LiveActor *pActor, TVec3f *a2, f32 a3) { + void turnDirectionToPlayerDegree(const LiveActor* pActor, TVec3f* a2, f32 a3) { turnDirectionToTargetDegree(pActor, a2, *getPlayerPos(), a3); } - - void turnDirectionToPlayerDegreeHorizon(const LiveActor *pActor, TVec3f *a2, f32 a3) { + + void turnDirectionToPlayerDegreeHorizon(const LiveActor* pActor, TVec3f* a2, f32 a3) { turnDirectionToTargetDegreeHorizon(pActor, a2, *getPlayerPos(), a3); } - void turnDirectionFromTargetDegree(const LiveActor *pActor, TVec3f *a2, const TVec3f &a3, f32 a4) { + void turnDirectionFromTargetDegree(const LiveActor* pActor, TVec3f* a2, const TVec3f& a3, f32 a4) { TVec3f stack_8(pActor->mPosition); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&a3, (Vec*)&stack_8); turnVecToVecCosOnPlane(a2, stack_8, pActor->mGravity, cosDegree(a4)); } - void turnDirectionFromTargetDegreeHorizon(const LiveActor *pActor, TVec3f *a2, const TVec3f &a3, f32 a4) { + void turnDirectionFromTargetDegreeHorizon(const LiveActor* pActor, TVec3f* a2, const TVec3f& a3, f32 a4) { TVec3f stack_8(pActor->mPosition); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&a3, (Vec*)&stack_8); vecKillElement(stack_8, (pActor->mGravity), &stack_8); turnVecToVecCosOnPlane(a2, stack_8, (pActor->mGravity), cosDegree(a4)); } - void turnDirectionFromPlayerDegree(const LiveActor *pActor, TVec3f *a2, f32 a3) { + void turnDirectionFromPlayerDegree(const LiveActor* pActor, TVec3f* a2, f32 a3) { turnDirectionFromTargetDegree(pActor, a2, *getPlayerPos(), a3); } - void turnDirectionFromPlayerDegreeHorizon(const LiveActor *pActor, TVec3f *a2, f32 a3) { + void turnDirectionFromPlayerDegreeHorizon(const LiveActor* pActor, TVec3f* a2, f32 a3) { turnDirectionFromTargetDegreeHorizon(pActor, a2, *getPlayerPos(), a3); } - f32 turnDirectionAndGravityH(TQuat4f *a1, const LiveActor *pActor, const TVec3f &a3, f32 a4, f32 a5) { + f32 turnDirectionAndGravityH(TQuat4f* a1, const LiveActor* pActor, const TVec3f& a3, f32 a4, f32 a5) { TVec3f stack_20(a3); - vecKillElement(stack_20,pActor->mGravity, &stack_20); + vecKillElement(stack_20, pActor->mGravity, &stack_20); normalizeOrZero(&stack_20); TVec3f stack_14; a1->getZDir(stack_14); @@ -1218,8 +1201,7 @@ namespace MR { float f30 = 1.0f; if (isNearZero(stack_20, 0.001f) == false) { turnVecToVecRadian(&stack_14, stack_14, stack_20, a4, pActor->mGravity); - } - else { + } else { a5 = 1.0f; f30 = 0.1f; } @@ -1240,20 +1222,19 @@ namespace MR { return ret; } */ - void turnDirectionToGround(const LiveActor *pActor, TVec3f *a2) { - + void turnDirectionToGround(const LiveActor* pActor, TVec3f* a2) { + TVec3f stack_8; if (isBindedGround(pActor)) { stack_8.scale(-1.0f, *getGroundNormal(pActor)); - } - else { + } else { stack_8.set(pActor->mGravity); } JMAVECScaleAdd((Vec*)&stack_8, (Vec*)a2, (Vec*)a2, -stack_8.dot(*a2)); normalize(a2); } - - void moveAndTurnToDirection(LiveActor *pActor, TVec3f *a2, const TVec3f &a3, f32 a4, f32 a5, f32 a6, f32 a7) { + + void moveAndTurnToDirection(LiveActor* pActor, TVec3f* a2, const TVec3f& a3, f32 a4, f32 a5, f32 a6, f32 a7) { turnVecToVecCosOnPlane(a2, a3, pActor->mGravity, cosDegree(a7)); turnDirectionToGround(pActor, a2); TVec3f stack_8; @@ -1264,13 +1245,13 @@ namespace MR { addVelocityToGravityOrGround(pActor, a5); } - void moveAndTurnToTarget(LiveActor *pActor, TVec3f *a2, const TVec3f &a3, f32 a4, f32 a5, f32 a6, f32 a7) { + void moveAndTurnToTarget(LiveActor* pActor, TVec3f* a2, const TVec3f& a3, f32 a4, f32 a5, f32 a6, f32 a7) { TVec3f stack_8(a3); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&(pActor->mPosition), (Vec*)&stack_8); moveAndTurnToDirection(pActor, a2, stack_8, a4, a5, a6, a7); } - void moveAndTurnToPlayer(LiveActor *pActor, TVec3f *a2, f32 a3, f32 a4, f32 a5, f32 a6) { + void moveAndTurnToPlayer(LiveActor* pActor, TVec3f* a2, f32 a3, f32 a4, f32 a5, f32 a6) { TVec3f stack_8(*getPlayerPos()); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)&(pActor->mPosition), (Vec*)&stack_8); moveAndTurnToDirection(pActor, a2, stack_8, a3, a4, a5, a6); @@ -1291,21 +1272,21 @@ namespace MR { addVelocityToGravityOrGround(pActor, a5); } */ - void escapeFromPlayer(LiveActor *pActor, TVec3f *a2, f32 a3, f32 a4, f32 a5, f32 a6) { + void escapeFromPlayer(LiveActor* pActor, TVec3f* a2, f32 a3, f32 a4, f32 a5, f32 a6) { TVec3f* playerPos = getPlayerPos(); - TVec3f stack_8(pActor->mPosition); + TVec3f stack_8(pActor->mPosition); JMathInlineVEC::PSVECSubtract((Vec*)&stack_8, (Vec*)playerPos, (Vec*)&stack_8); moveAndTurnToDirection(pActor, a2, stack_8, a3, a4, a5, a6); } - void moveAndTurnToDirection(LiveActor *pActor, const TVec3f &a2, f32 a3, f32 a4, f32 a5, f32 a6) { + void moveAndTurnToDirection(LiveActor* pActor, const TVec3f& a2, f32 a3, f32 a4, f32 a5, f32 a6) { TVec3f stack_8; calcFrontVec(&stack_8, pActor); moveAndTurnToDirection(pActor, &stack_8, a2, a3, a4, a5, a6); calcRotate(pActor, stack_8, a6); } - void moveAndTurnToTarget(LiveActor *pActor, const TVec3f &a2, f32 a3, f32 a4, f32 a5, f32 a6) { + void moveAndTurnToTarget(LiveActor* pActor, const TVec3f& a2, f32 a3, f32 a4, f32 a5, f32 a6) { TVec3f stack_14; calcFrontVec(&stack_14, pActor); normalizeOrZero(&stack_14); @@ -1315,7 +1296,7 @@ namespace MR { calcRotate(pActor, stack_14, a6); } - void moveAndTurnToPlayer(LiveActor *pActor, f32 a2, f32 a3, f32 a4, f32 a5) { + void moveAndTurnToPlayer(LiveActor* pActor, f32 a2, f32 a3, f32 a4, f32 a5) { moveAndTurnToTarget(pActor, *getPlayerPos(), a2, a3, a4, a5); } @@ -1329,4 +1310,4 @@ namespace MR { moveAndTurnToDirection(pActor, &stack_14, stack_8, a3, a4, a5, a6); ::calcRotate(pActor, stack_14, a6); } */ -}; +}; // namespace MR diff --git a/src/Game/Util/ActorSensorUtil.cpp b/src/Game/Util/ActorSensorUtil.cpp index 55ee97264..6a69ec569 100644 --- a/src/Game/Util/ActorSensorUtil.cpp +++ b/src/Game/Util/ActorSensorUtil.cpp @@ -291,8 +291,7 @@ namespace MR { if (getTaking(getSensorHost(pSender)) == pReceiver || getTaken(getSensorHost(pReceiver)) == pSender) { getSensorHost(pSender)->mSensorKeeper->mTaking = nullptr; getSensorHost(pReceiver)->mSensorKeeper->mTaken = nullptr; - } - else { + } else { getSensorHost(pSender)->mSensorKeeper->mTaken = nullptr; getSensorHost(pReceiver)->mSensorKeeper->mTaking = nullptr; } @@ -421,10 +420,7 @@ namespace MR { } bool isSensorItem(const HitSensor* pSensor) { - if (pSensor->isType(ATYPE_COIN) - || pSensor->isType(ATYPE_COIN_RED) - || pSensor->isType(ATYPE_KINOKO_ONEUP)) - { + if (pSensor->isType(ATYPE_COIN) || pSensor->isType(ATYPE_COIN_RED) || pSensor->isType(ATYPE_KINOKO_ONEUP)) { return true; } @@ -626,13 +622,13 @@ namespace MR { bool sendMsgToBindedSensor(u32 msg, LiveActor* pActor, HitSensor* pSender) { HitInfo* info[32]; - u32 size = pActor->mBinder->copyPlaneArrayAndSortingSensor(info, sizeof(info) / sizeof(*info)); + u32 size = pActor->mBinder->copyPlaneArrayAndSortingSensor(info, sizeof(info) / sizeof(*info)); if (size == 0) { return false; } - bool isSent = false; + bool isSent = false; HitSensor* pReceiver = info[0]->mParentTriangle.mSensor; isSent |= pReceiver->receiveMessage(msg, pSender); @@ -690,8 +686,7 @@ namespace MR { if (ratio < getSensorHost(pSender)->mGravity.dot(dir)) { return sendMsgToEnemyAttackTrample(pReceiver, pSender); - } - else { + } else { return sendMsgToEnemyAttackBlow(pReceiver, pSender); } } @@ -723,8 +718,7 @@ namespace MR { if (pGroup != nullptr) { pGroup->sendMsgToGroupMember(msg, pSender, pName); - } - else { + } else { pActor->receiveMessage(msg, pSender, pActor->getSensor(pName)); } } @@ -785,12 +779,7 @@ namespace MR { } bool isMsgPlayerHitAll(u32 msg) { - return msg == ACTMES_PLAYER_PUNCH - || msg == ACTMES_PLAYER_UPPER_PUNCH - || msg == ACTMES_JET_TURTLE_ATTACK - || msg == ACTMES_FIREBALL_ATTACK - || msg == ACTMES_FREEZE_ATTACK - || msg == ACTMES_INVINCIBLE_ATTACK; + return msg == ACTMES_PLAYER_PUNCH || msg == ACTMES_PLAYER_UPPER_PUNCH || msg == ACTMES_JET_TURTLE_ATTACK || msg == ACTMES_FIREBALL_ATTACK || msg == ACTMES_FREEZE_ATTACK || msg == ACTMES_INVINCIBLE_ATTACK; } bool isMsgPlayerSpinAttack(u32 msg) { @@ -1045,4 +1034,4 @@ namespace MR { HitSensor* addBodyMessageSensor(LiveActor* pActor, u32 type) { return addHitSensor(pActor, "body", type, 0, 0.0f, TVec3f(0.0f, 0.0f, 0.0f)); } -}; +}; // namespace MR diff --git a/src/Game/Util/ActorShadowLocalUtil.cpp b/src/Game/Util/ActorShadowLocalUtil.cpp index c3bdf8f1e..31df324bc 100644 --- a/src/Game/Util/ActorShadowLocalUtil.cpp +++ b/src/Game/Util/ActorShadowLocalUtil.cpp @@ -2,19 +2,19 @@ #include "Game/Util/ActorShadowLocalUtil.hpp" namespace ActorShadow { - u32 getShadowControllerCount(const LiveActor *pActor) { + u32 getShadowControllerCount(const LiveActor* pActor) { return pActor->mShadowControllerList->getControllerCount(); } - ShadowController* getShadowController(const LiveActor *pActor, u32 a2) { + ShadowController* getShadowController(const LiveActor* pActor, u32 a2) { return pActor->mShadowControllerList->getController(a2); } - ShadowController* getShadowController(const LiveActor *pActor, const char *pName) { + ShadowController* getShadowController(const LiveActor* pActor, const char* pName) { return pActor->mShadowControllerList->getController(pName); } - ShadowController* createShadowControllerVolumeParam(LiveActor *pActor, const char *pName) { + ShadowController* createShadowControllerVolumeParam(LiveActor* pActor, const char* pName) { ShadowController* pController = new ShadowController(pActor, pName); pController->setDropPosPtr(&pActor->mPosition); pController->setDropDirPtr(&pActor->mGravity); @@ -24,7 +24,7 @@ namespace ActorShadow { return pController; } - ShadowController* createShadowControllerSuefaceParam(LiveActor *pActor, const char *pName) { + ShadowController* createShadowControllerSuefaceParam(LiveActor* pActor, const char* pName) { ShadowController* pController = new ShadowController(pActor, pName); pController->setDropPosPtr(&pActor->mPosition); pController->setDropDirPtr(&pActor->mGravity); @@ -34,23 +34,23 @@ namespace ActorShadow { return pController; } - ShadowDrawer* getShadowSurfaceOval(const LiveActor *pActor, const char *pName) { + ShadowDrawer* getShadowSurfaceOval(const LiveActor* pActor, const char* pName) { return pActor->mShadowControllerList->getController(pName)->getShadowDrawer(); } - ShadowDrawer* getShadowVolumeSphere(const LiveActor *pActor, const char *pName) { + ShadowDrawer* getShadowVolumeSphere(const LiveActor* pActor, const char* pName) { return pActor->mShadowControllerList->getController(pName)->getShadowDrawer(); } - ShadowDrawer* getShadowVolumeCylinder(const LiveActor *pActor, const char *pName) { + ShadowDrawer* getShadowVolumeCylinder(const LiveActor* pActor, const char* pName) { return pActor->mShadowControllerList->getController(pName)->getShadowDrawer(); } - ShadowDrawer* getShadowVolumeBox(const LiveActor *pActor, const char *pName) { + ShadowDrawer* getShadowVolumeBox(const LiveActor* pActor, const char* pName) { return pActor->mShadowControllerList->getController(pName)->getShadowDrawer(); } - ShadowDrawer* getShadowVolumeDrawer(const LiveActor *pActor, const char *pName) { + ShadowDrawer* getShadowVolumeDrawer(const LiveActor* pActor, const char* pName) { return pActor->mShadowControllerList->getController(pName)->getShadowDrawer(); } @@ -77,7 +77,7 @@ namespace ActorShadow { } } */ - void setUpShadowControlFromCSV(ShadowController *pController, LiveActor *pActor, const JMapInfoIter &rIter) { + void setUpShadowControlFromCSV(ShadowController* pController, LiveActor* pActor, const JMapInfoIter& rIter) { float dropLength(1000.0f); rIter.getValue("DropLength", &dropLength); pController->setDropLength(dropLength); @@ -103,7 +103,7 @@ namespace ActorShadow { pActor->mShadowControllerList->addController(pController); return pController; } */ - + // Minor mismatch: register swap /* ShadowSurfaceCircle* createShadowSurfaceCircleFromCSV(LiveActor *pActor, const JMapInfoIter &rIter) { ShadowController* pController = createShadowControlFromCSV(pActor, rIter); @@ -115,4 +115,4 @@ namespace ActorShadow { pSurfaceCircle->setRadius(radius); return pSurfaceCircle; } */ -}; +}; // namespace ActorShadow diff --git a/src/Game/Util/ActorShadowUtil.cpp b/src/Game/Util/ActorShadowUtil.cpp index 40ee3403d..61e9b8d43 100644 --- a/src/Game/Util/ActorShadowUtil.cpp +++ b/src/Game/Util/ActorShadowUtil.cpp @@ -15,19 +15,19 @@ #include "revolution/mtx.h" namespace MR { - void initShadowController(LiveActor *pActor, u32 numShadows) { + void initShadowController(LiveActor* pActor, u32 numShadows) { pActor->initShadowControllerList(numShadows); } - void addShadowSurfaceCircle(LiveActor *pActor, const char *pName, f32 radius) { - ShadowController* pController = ActorShadow::createShadowControllerSuefaceParam(pActor, pName); + void addShadowSurfaceCircle(LiveActor* pActor, const char* pName, f32 radius) { + ShadowController* pController = ActorShadow::createShadowControllerSuefaceParam(pActor, pName); ShadowSurfaceCircle* pCircle = new ShadowSurfaceCircle(); pController->setShadowDrawer(pCircle); pCircle->setRadius(radius); } - void addShadowVolumeSphere(LiveActor *pActor, const char *pName, f32 radius) { - ShadowController* pController = ActorShadow::createShadowControllerVolumeParam(pActor, pName); + void addShadowVolumeSphere(LiveActor* pActor, const char* pName, f32 radius) { + ShadowController* pController = ActorShadow::createShadowControllerVolumeParam(pActor, pName); ShadowVolumeSphere* pSphere = new ShadowVolumeSphere(); pController->setShadowDrawer(pSphere); pSphere->setRadius(radius); @@ -43,15 +43,15 @@ namespace MR { pOval->setSize(rSize); } */ - void addShadowVolumeCylinder(LiveActor *pActor, const char *pName, f32 radius) { - ShadowController* pController = ActorShadow::createShadowControllerVolumeParam(pActor, pName); + void addShadowVolumeCylinder(LiveActor* pActor, const char* pName, f32 radius) { + ShadowController* pController = ActorShadow::createShadowControllerVolumeParam(pActor, pName); ShadowVolumeCylinder* pCylinder = new ShadowVolumeCylinder(); pController->setShadowDrawer(pCylinder); pController->offCalcCollision(); pCylinder->setRadius(radius); - } + } - void addShadowVolumeBox(LiveActor *pActor, const char *pName, const TVec3f &a3) { + void addShadowVolumeBox(LiveActor* pActor, const char* pName, const TVec3f& a3) { addShadowVolumeBox(pActor, pName, a3, pActor->getBaseMtx()); } @@ -65,7 +65,7 @@ namespace MR { pBox->setSize(a3); } */ - void addShadowVolumeLine(LiveActor *pActor1, const char *pName1, LiveActor *pActor2, const char *pName2, f32 fromWidth, LiveActor *pActor3, const char *pName3, f32 toWidth) { + void addShadowVolumeLine(LiveActor* pActor1, const char* pName1, LiveActor* pActor2, const char* pName2, f32 fromWidth, LiveActor* pActor3, const char* pName3, f32 toWidth) { ShadowController* pController = ActorShadow::createShadowControllerVolumeParam(pActor1, pName1); ShadowVolumeLine* pLine = new ShadowVolumeLine(); pController->setShadowDrawer(pLine); @@ -88,206 +88,200 @@ namespace MR { } */ // Wrong value is loaded but only because the FlatModel header is incomplete - void addShadowVolumeFlatModel(LiveActor *pActor, const char *pName1, const char *pName2, MtxPtr mtx) { - ShadowController* pController = ActorShadow::createShadowControllerVolumeParam(pActor, pName1); + void addShadowVolumeFlatModel(LiveActor* pActor, const char* pName1, const char* pName2, MtxPtr mtx) { + ShadowController* pController = ActorShadow::createShadowControllerVolumeParam(pActor, pName1); ShadowVolumeFlatModel* pModel = new ShadowVolumeFlatModel(pName2); pController->setShadowDrawer(pModel); pController->offCalcCollision(); pModel->setBaseMatrixPtr(mtx); } - void setShadowDropPosition(LiveActor *pActor, const char *pName, const TVec3f &rPos) { + void setShadowDropPosition(LiveActor* pActor, const char* pName, const TVec3f& rPos) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); pController->setDropPosFix(rPos); } - void setShadowDropPositionPtr(LiveActor *pActor, const char *pName, const TVec3f *pPos) { + void setShadowDropPositionPtr(LiveActor* pActor, const char* pName, const TVec3f* pPos) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); pController->setDropPosPtr(pPos); } - void setShadowDropPositionMtxPtr(LiveActor *pActor, const char *pName, MtxPtr mtx, const TVec3f *pPos) { + void setShadowDropPositionMtxPtr(LiveActor* pActor, const char* pName, MtxPtr mtx, const TVec3f* pPos) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); pController->setDropPosMtxPtr(mtx, *pPos); } - void setShadowDropPositionAtJoint(LiveActor *pActor, const char *pName1, const char *pName2, const TVec3f *pPos) { - MtxPtr pJoint = getJointMtx(pActor, pName2); + void setShadowDropPositionAtJoint(LiveActor* pActor, const char* pName1, const char* pName2, const TVec3f* pPos) { + MtxPtr pJoint = getJointMtx(pActor, pName2); ShadowController* pController = ActorShadow::getShadowController(pActor, pName1); pController->setDropPosMtxPtr(pJoint, *pPos); - } - void setShadowDropDirection(LiveActor *pActor, const char *pName, const TVec3f &rDir) { + void setShadowDropDirection(LiveActor* pActor, const char* pName, const TVec3f& rDir) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); pController->setDropDirFix(rDir); } - void setShadowDropDirectionPtr(LiveActor *pActor, const char *pName, const TVec3f *pDir) { + void setShadowDropDirectionPtr(LiveActor* pActor, const char* pName, const TVec3f* pDir) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); pController->setDropDirPtr(pDir); } - void setShadowProjection(LiveActor *pActor, const char *pName, const TVec3f &a3, const TVec3f &a4, bool a5) { + void setShadowProjection(LiveActor* pActor, const char* pName, const TVec3f& a3, const TVec3f& a4, bool a5) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); pController->setProjectionFix(a3, a4, a5); } - void setShadowProjectionPtr(LiveActor *pActor, const char *pName, const TVec3f *a3, const TVec3f *a4) { + void setShadowProjectionPtr(LiveActor* pActor, const char* pName, const TVec3f* a3, const TVec3f* a4) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); pController->setProjectionPtr(a3, a4); } - void setShadowDropLength(LiveActor *pActor, const char *pName, f32 length) { + void setShadowDropLength(LiveActor* pActor, const char* pName, f32 length) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); pController->setDropLength(length); } - void setShadowDropStartOffset(LiveActor *pActor, const char *pName, f32 offset) { + void setShadowDropStartOffset(LiveActor* pActor, const char* pName, f32 offset) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); pController->setDropStartOffset(offset); } - void setShadowSurfaceOvalColor(LiveActor *pActor, const char *pName, Color8 color) { + void setShadowSurfaceOvalColor(LiveActor* pActor, const char* pName, Color8 color) { ShadowSurfaceOval* pOval = (ShadowSurfaceOval*)ActorShadow::getShadowSurfaceOval(pActor, pName); pOval->setColor(color); } - void setShadowSurfaceOvalAlpha(LiveActor *pActor, const char *pName, u8 alpha) { + void setShadowSurfaceOvalAlpha(LiveActor* pActor, const char* pName, u8 alpha) { ShadowSurfaceOval* pOval = (ShadowSurfaceOval*)ActorShadow::getShadowSurfaceOval(pActor, pName); pOval->setAlpha(alpha); } - void setShadowVolumeSphereRadius(LiveActor *pActor, const char *pName, f32 radius) { + void setShadowVolumeSphereRadius(LiveActor* pActor, const char* pName, f32 radius) { ShadowVolumeSphere* pSphere = (ShadowVolumeSphere*)ActorShadow::getShadowVolumeSphere(pActor, pName); pSphere->setRadius(radius); } - void setShadowVolumeCylinderRadius(LiveActor *pActor, const char *pName, f32 radius) { + void setShadowVolumeCylinderRadius(LiveActor* pActor, const char* pName, f32 radius) { ShadowVolumeCylinder* pCylinder = (ShadowVolumeCylinder*)ActorShadow::getShadowVolumeCylinder(pActor, pName); pCylinder->setRadius(radius); } - void setShadowVolumeBoxSize(LiveActor *pActor, const char *pName, const TVec3f &rSize) { + void setShadowVolumeBoxSize(LiveActor* pActor, const char* pName, const TVec3f& rSize) { ShadowVolumeBox* pBox = (ShadowVolumeBox*)ActorShadow::getShadowVolumeBox(pActor, pName); pBox->setSize(rSize); } - void setShadowVolumeStartDropOffset(LiveActor *pActor, const char *pName, f32 offset) { + void setShadowVolumeStartDropOffset(LiveActor* pActor, const char* pName, f32 offset) { ShadowVolumeDrawer* pDrawer = (ShadowVolumeDrawer*)ActorShadow::getShadowVolumeDrawer(pActor, pName); pDrawer->setStartDrawShepeOffset(offset); } - void setShadowVolumeEndDropOffset(LiveActor *pActor, const char *pName, f32 offset) { + void setShadowVolumeEndDropOffset(LiveActor* pActor, const char* pName, f32 offset) { ShadowVolumeDrawer* pDrawer = (ShadowVolumeDrawer*)ActorShadow::getShadowVolumeDrawer(pActor, pName); pDrawer->setEndDrawShepeOffset(offset); } - void onShadowVolumeCutDropLength(LiveActor *pActor, const char *pName) { + void onShadowVolumeCutDropLength(LiveActor* pActor, const char* pName) { ShadowVolumeDrawer* pDrawer = (ShadowVolumeDrawer*)ActorShadow::getShadowVolumeDrawer(pActor, pName); pDrawer->onCutDropShadow(); } - void onCalcShadow(LiveActor *pActor, const char *pName) { + void onCalcShadow(LiveActor* pActor, const char* pName) { if (pName != nullptr) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); pController->onCalcCollision(); - } - else { + } else { onCalcShadowAll(pActor); } } - void onCalcShadowAll(LiveActor *pActor) { + void onCalcShadowAll(LiveActor* pActor) { u32 count = ActorShadow::getShadowControllerCount(pActor); for (u32 i = 0; i < count; i++) { ActorShadow::getShadowController(pActor, i)->onCalcCollision(); } } - void onCalcShadowOneTime(LiveActor *pActor, const char *pName) { + void onCalcShadowOneTime(LiveActor* pActor, const char* pName) { if (pName != nullptr) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); pController->onCalcCollisionOneTime(); - } - else { + } else { onCalcShadowOneTimeAll(pActor); } } - void onCalcShadowOneTimeAll(LiveActor *pActor) { + void onCalcShadowOneTimeAll(LiveActor* pActor) { u32 count = ActorShadow::getShadowControllerCount(pActor); for (u32 i = 0; i < count; i++) { ActorShadow::getShadowController(pActor, i)->onCalcCollisionOneTime(); } } - void offCalcShadow(LiveActor *pActor, const char *pName) { + void offCalcShadow(LiveActor* pActor, const char* pName) { if (pName != nullptr) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); pController->offCalcCollision(); - } - else { + } else { offCalcShadowAll(pActor); } } - void offCalcShadowAll(LiveActor *pActor) { + void offCalcShadowAll(LiveActor* pActor) { u32 count = ActorShadow::getShadowControllerCount(pActor); for (u32 i = 0; i < count; i++) { ActorShadow::getShadowController(pActor, i)->offCalcCollision(); } } - void onCalcShadowDropGravity(LiveActor *pActor, const char *pName) { + void onCalcShadowDropGravity(LiveActor* pActor, const char* pName) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); pController->onCalcDropGravity(); } - void onCalcShadowDropGravityOneTime(LiveActor *pActor, const char *pName) { + void onCalcShadowDropGravityOneTime(LiveActor* pActor, const char* pName) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); pController->onCalcDropGravityOneTime(); } - void onCalcShadowDropPrivateGravity(LiveActor *pActor, const char *pName) { + void onCalcShadowDropPrivateGravity(LiveActor* pActor, const char* pName) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); pController->onCalcDropPrivateGravity(); } - void onCalcShadowDropPrivateGravityOneTime(LiveActor *pActor, const char *pName) { + void onCalcShadowDropPrivateGravityOneTime(LiveActor* pActor, const char* pName) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); pController->onCalcDropPrivateGravityOneTime(); } - void offCalcShadowDropPrivateGravity(LiveActor *pActor, const char *pName) { + void offCalcShadowDropPrivateGravity(LiveActor* pActor, const char* pName) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); pController->offCalcDropPrivateGravity(); } - void excludeCalcShadowToMyCollision(LiveActor *pActor, const char *pName) { + void excludeCalcShadowToMyCollision(LiveActor* pActor, const char* pName) { CollisionParts* pCollisionParts = pActor->mCollisionParts; if (pName != nullptr) { excludeCalcShadowToCollision(pActor, pName, pCollisionParts); - } - else { + } else { excludeCalcShadowToSensorAll(pActor, pCollisionParts->mHitSensor); } } - bool isExistShadow(const LiveActor *pActor, const char *pName) { + bool isExistShadow(const LiveActor* pActor, const char* pName) { return ActorShadow::isExistShadowController(pActor, pName); } - void validateShadow(LiveActor *pActor, const char *pName) { + void validateShadow(LiveActor* pActor, const char* pName) { if (pName != nullptr) { ActorShadow::getShadowController(pActor, pName)->validate(); - } - else { + } else { validateShadowAll(pActor); } } - void validateShadowGroup(LiveActor *pActor, const char *pName) { + void validateShadowGroup(LiveActor* pActor, const char* pName) { u32 count = ActorShadow::getShadowControllerCount(pActor); for (u32 i = 0; i < count; i++) { if (isEqualString(ActorShadow::getShadowController(pActor, i)->mGroupName, pName)) { @@ -296,23 +290,22 @@ namespace MR { } } - void validateShadowAll(LiveActor *pActor) { + void validateShadowAll(LiveActor* pActor) { u32 count = ActorShadow::getShadowControllerCount(pActor); for (u32 i = 0; i < count; i++) { ActorShadow::getShadowController(pActor, i)->validate(); } } - void invalidateShadow(LiveActor *pActor, const char *pName) { + void invalidateShadow(LiveActor* pActor, const char* pName) { if (pName != nullptr) { ActorShadow::getShadowController(pActor, pName)->invalidate(); - } - else { + } else { invalidateShadowAll(pActor); } } - void invalidateShadowGroup(LiveActor *pActor, const char *pName) { + void invalidateShadowGroup(LiveActor* pActor, const char* pName) { u32 count = ActorShadow::getShadowControllerCount(pActor); for (u32 i = 0; i < count; i++) { if (isEqualString(ActorShadow::getShadowController(pActor, i)->mGroupName, pName)) { @@ -321,46 +314,44 @@ namespace MR { } } - void invalidateShadowAll(LiveActor *pActor) { + void invalidateShadowAll(LiveActor* pActor) { u32 count = ActorShadow::getShadowControllerCount(pActor); for (u32 i = 0; i < count; i++) { ActorShadow::getShadowController(pActor, i)->invalidate(); } } - void onShadowVisibleSyncHostAll(LiveActor *pActor) { + void onShadowVisibleSyncHostAll(LiveActor* pActor) { u32 count = ActorShadow::getShadowControllerCount(pActor); for (u32 i = 0; i < count; i++) { ActorShadow::getShadowController(pActor, i)->onVisibleSyncHost(); } } - void offShadowVisibleSyncHost(LiveActor *pActor, const char *pName) { + void offShadowVisibleSyncHost(LiveActor* pActor, const char* pName) { if (pName != nullptr) { ActorShadow::getShadowController(pActor, pName)->offVisibleSyncHost(); - } - else { + } else { offShadowVisibleSyncHostAll(pActor); } } - void offShadowVisibleSyncHostAll(LiveActor *pActor) { + void offShadowVisibleSyncHostAll(LiveActor* pActor) { u32 count = ActorShadow::getShadowControllerCount(pActor); for (u32 i = 0; i < count; i++) { ActorShadow::getShadowController(pActor, i)->offVisibleSyncHost(); } } - void onShadowFollowHostScale(LiveActor *pActor, const char *pName) { + void onShadowFollowHostScale(LiveActor* pActor, const char* pName) { if (pName != nullptr) { ActorShadow::getShadowController(pActor, pName)->onFollowHostScale(); - } - else { + } else { onShadowFollowHostScaleAll(pActor); } } - void onShadowFollowHostScaleAll(LiveActor *pActor) { + void onShadowFollowHostScaleAll(LiveActor* pActor) { u32 count = ActorShadow::getShadowControllerCount(pActor); for (u32 i = 0; i < count; i++) { ActorShadow::getShadowController(pActor, i)->onFollowHostScale(); @@ -388,22 +379,20 @@ namespace MR { } } */ - void setClippingRangeIncludeShadow(LiveActor *pActor, TVec3f *a2, f32 a3) { + void setClippingRangeIncludeShadow(LiveActor* pActor, TVec3f* a2, f32 a3) { float stack_8(a3); if (calcClippingRangeIncludeShadow(a2, &stack_8, pActor, a3)) { setClippingTypeSphere(pActor, stack_8, a2); - } - else { + } else { setClippingTypeSphere(pActor, a3); } - } - bool isShadowProjected(const LiveActor *pActor, const char *pName) { + bool isShadowProjected(const LiveActor* pActor, const char* pName) { return ActorShadow::getShadowController(pActor, pName)->isProjected(); } - bool isShadowProjectedAny(const LiveActor *pActor) { + bool isShadowProjectedAny(const LiveActor* pActor) { u32 count = ActorShadow::getShadowControllerCount(pActor); for (u32 i = 0; i < count; i++) { if (ActorShadow::getShadowController(pActor, i)->isProjected()) { @@ -413,15 +402,15 @@ namespace MR { return false; } - void getShadowProjectionPos(const LiveActor *pActor, const char *pName, TVec3f *pResult) { + void getShadowProjectionPos(const LiveActor* pActor, const char* pName, TVec3f* pResult) { ActorShadow::getShadowController(pActor, pName)->getProjectionPos(pResult); } - void getShadowProjectionNormal(const LiveActor *pActor, const char *pName, TVec3f *pResult) { + void getShadowProjectionNormal(const LiveActor* pActor, const char* pName, TVec3f* pResult) { ActorShadow::getShadowController(pActor, pName)->getProjectionNormal(pResult); } - f32 getShadowProjectionLength(const LiveActor *pActor, const char *pName) { + f32 getShadowProjectionLength(const LiveActor* pActor, const char* pName) { ShadowController* pController = ActorShadow::getShadowController(pActor, pName); if (pController->isProjected()) { return pController->getProjectionLength(); @@ -429,12 +418,12 @@ namespace MR { return FLOAT_MAX; } - HitSensor* getShadowProjectedSensor(const LiveActor *pActor, const char *pName) { + HitSensor* getShadowProjectedSensor(const LiveActor* pActor, const char* pName) { return ActorShadow::getShadowController(pActor, pName)->mProjectedSensor; } - f32 getShadowNearProjectionLength(const LiveActor *pActor) { - u32 count = ActorShadow::getShadowControllerCount(pActor); + f32 getShadowNearProjectionLength(const LiveActor* pActor) { + u32 count = ActorShadow::getShadowControllerCount(pActor); float result = FLOAT_MAX; for (u32 i = 0; i < count; i++) { if (ActorShadow::getShadowController(pActor, i)->isProjected()) { @@ -446,4 +435,4 @@ namespace MR { } return result; } -}; +}; // namespace MR diff --git a/src/Game/Util/ActorStateUtil.cpp b/src/Game/Util/ActorStateUtil.cpp index 450d4c7ad..adc48fd6e 100644 --- a/src/Game/Util/ActorStateUtil.cpp +++ b/src/Game/Util/ActorStateUtil.cpp @@ -82,4 +82,4 @@ namespace MR { return false; } -}; +}; // namespace MR diff --git a/src/Game/Util/ActorSwitchUtil.cpp b/src/Game/Util/ActorSwitchUtil.cpp index f9e54755a..6634d143b 100644 --- a/src/Game/Util/ActorSwitchUtil.cpp +++ b/src/Game/Util/ActorSwitchUtil.cpp @@ -7,7 +7,7 @@ #include "Game/Util/ObjUtil.hpp" namespace MR { - bool useStageSwitchReadA(LiveActor *pActor, const JMapInfoIter &rIter) { + bool useStageSwitchReadA(LiveActor* pActor, const JMapInfoIter& rIter) { if (!isValidInfo(rIter)) { return false; } @@ -23,7 +23,7 @@ namespace MR { return true; } - bool useStageSwitchReadB(LiveActor *pActor, const JMapInfoIter &rIter) { + bool useStageSwitchReadB(LiveActor* pActor, const JMapInfoIter& rIter) { if (!isValidInfo(rIter)) { return false; } @@ -39,7 +39,7 @@ namespace MR { return true; } - bool useStageSwitchReadAppear(LiveActor *pActor, const JMapInfoIter &rIter) { + bool useStageSwitchReadAppear(LiveActor* pActor, const JMapInfoIter& rIter) { if (!isValidInfo(rIter)) { return false; } @@ -55,12 +55,12 @@ namespace MR { return true; } - void useStageSwitchSleep(LiveActor *pActor, const JMapInfoIter &rIter) { + void useStageSwitchSleep(LiveActor* pActor, const JMapInfoIter& rIter) { SleepControlFunc::addSleepControl(pActor, rIter); } // Same as useStageSwitchReadA - bool useStageSwitchWriteA(LiveActor *pActor, const JMapInfoIter &rIter) { + bool useStageSwitchWriteA(LiveActor* pActor, const JMapInfoIter& rIter) { if (!isValidInfo(rIter)) { return false; } @@ -77,7 +77,7 @@ namespace MR { } // Same as useStageSwitchReadB - bool useStageSwitchWriteB(LiveActor *pActor, const JMapInfoIter &rIter) { + bool useStageSwitchWriteB(LiveActor* pActor, const JMapInfoIter& rIter) { if (!isValidInfo(rIter)) { return false; } @@ -93,7 +93,7 @@ namespace MR { return true; } - bool useStageSwitchWriteDead(LiveActor *pActor, const JMapInfoIter &rIter) { + bool useStageSwitchWriteDead(LiveActor* pActor, const JMapInfoIter& rIter) { if (!isValidInfo(rIter)) { return false; } @@ -109,116 +109,112 @@ namespace MR { return true; } - bool needStageSwitchReadA(LiveActor *pActor, const JMapInfoIter &rIter) { + bool needStageSwitchReadA(LiveActor* pActor, const JMapInfoIter& rIter) { return useStageSwitchReadA(pActor, rIter); } - bool needStageSwitchReadB(LiveActor *pActor, const JMapInfoIter &rIter) { + bool needStageSwitchReadB(LiveActor* pActor, const JMapInfoIter& rIter) { return useStageSwitchReadB(pActor, rIter); } - bool needStageSwitchReadAppear(LiveActor *pActor, const JMapInfoIter &rIter) { + bool needStageSwitchReadAppear(LiveActor* pActor, const JMapInfoIter& rIter) { return useStageSwitchReadAppear(pActor, rIter); } - bool needStageSwitchWriteA(LiveActor *pActor, const JMapInfoIter &rIter) { + bool needStageSwitchWriteA(LiveActor* pActor, const JMapInfoIter& rIter) { return useStageSwitchWriteA(pActor, rIter); } - bool needStageSwitchWriteB(LiveActor *pActor, const JMapInfoIter &rIter) { + bool needStageSwitchWriteB(LiveActor* pActor, const JMapInfoIter& rIter) { return useStageSwitchWriteB(pActor, rIter); } - bool needStageSwitchWriteDead(LiveActor *pActor, const JMapInfoIter &rIter) { + bool needStageSwitchWriteDead(LiveActor* pActor, const JMapInfoIter& rIter) { return useStageSwitchWriteDead(pActor, rIter); } - bool isValidSwitchA(const LiveActor *pActor) { - return pActor->mStageSwitchCtrl != nullptr - && pActor->mStageSwitchCtrl->isValidSwitchA(); + bool isValidSwitchA(const LiveActor* pActor) { + return pActor->mStageSwitchCtrl != nullptr && pActor->mStageSwitchCtrl->isValidSwitchA(); } - bool isValidSwitchB(const LiveActor *pActor) { - return pActor->mStageSwitchCtrl != nullptr - && pActor->mStageSwitchCtrl->isValidSwitchB(); + bool isValidSwitchB(const LiveActor* pActor) { + return pActor->mStageSwitchCtrl != nullptr && pActor->mStageSwitchCtrl->isValidSwitchB(); } - bool isValidSwitchAppear(const LiveActor *pActor) { - return pActor->mStageSwitchCtrl != nullptr - && pActor->mStageSwitchCtrl->isValidSwitchAppear(); + bool isValidSwitchAppear(const LiveActor* pActor) { + return pActor->mStageSwitchCtrl != nullptr && pActor->mStageSwitchCtrl->isValidSwitchAppear(); } - bool isValidSwitchDead(const LiveActor *pActor) { - return pActor->mStageSwitchCtrl != nullptr - && pActor->mStageSwitchCtrl->isValidSwitchDead(); + bool isValidSwitchDead(const LiveActor* pActor) { + return pActor->mStageSwitchCtrl != nullptr && pActor->mStageSwitchCtrl->isValidSwitchDead(); } - bool isOnSwitchA(const LiveActor *pActor) { + bool isOnSwitchA(const LiveActor* pActor) { return pActor->mStageSwitchCtrl->isOnSwitchA(); } - bool isOnSwitchB(const LiveActor *pActor) { + bool isOnSwitchB(const LiveActor* pActor) { return pActor->mStageSwitchCtrl->isOnSwitchB(); } - bool isOnSwitchAppear(const LiveActor *pActor) { + bool isOnSwitchAppear(const LiveActor* pActor) { return pActor->mStageSwitchCtrl->isOnSwitchAppear(); } - void onSwitchA(LiveActor *pActor) { + void onSwitchA(LiveActor* pActor) { pActor->mStageSwitchCtrl->onSwitchA(); } - void onSwitchB(LiveActor *pActor) { + void onSwitchB(LiveActor* pActor) { pActor->mStageSwitchCtrl->onSwitchB(); } - void onSwitchDead(LiveActor *pActor) { + void onSwitchDead(LiveActor* pActor) { pActor->mStageSwitchCtrl->onSwitchDead(); } - void offSwitchA(LiveActor *pActor) { + void offSwitchA(LiveActor* pActor) { pActor->mStageSwitchCtrl->offSwitchA(); } - void offSwitchB(LiveActor *pActor) { + void offSwitchB(LiveActor* pActor) { pActor->mStageSwitchCtrl->offSwitchB(); } - void offSwitchDead(LiveActor *pActor) { + void offSwitchDead(LiveActor* pActor) { pActor->mStageSwitchCtrl->offSwitchDead(); } - void syncStageSwitchAppear(LiveActor *pActor) { + void syncStageSwitchAppear(LiveActor* pActor) { ActorAppearSwitchListener* pSwitchListener = new ActorAppearSwitchListener(pActor, true, true); getSwitchWatcherHolder()->joinSwitchEventListenerAppear(pActor->mStageSwitchCtrl, pSwitchListener); } - void listenStageSwitchOnAppear(LiveActor *pActor, const MR::FunctorBase &rFunctor) { + void listenStageSwitchOnAppear(LiveActor* pActor, const MR::FunctorBase& rFunctor) { listenNameObjStageSwitchOnAppear(pActor, pActor->mStageSwitchCtrl, rFunctor); } - void listenStageSwitchOnOffAppear(LiveActor *pActor, const MR::FunctorBase &rFunctor1, const MR::FunctorBase &rFunctor2) { + void listenStageSwitchOnOffAppear(LiveActor* pActor, const MR::FunctorBase& rFunctor1, const MR::FunctorBase& rFunctor2) { listenNameObjStageSwitchOnOffAppear(pActor, pActor->mStageSwitchCtrl, rFunctor1, rFunctor2); } - void listenStageSwitchOnA(LiveActor *pActor, const MR::FunctorBase &rFunctor) { + void listenStageSwitchOnA(LiveActor* pActor, const MR::FunctorBase& rFunctor) { listenNameObjStageSwitchOnA(pActor, pActor->mStageSwitchCtrl, rFunctor); } - void listenStageSwitchOnOffA(LiveActor *pActor, const MR::FunctorBase &rFunctor1, const MR::FunctorBase &rFunctor2) { + void listenStageSwitchOnOffA(LiveActor* pActor, const MR::FunctorBase& rFunctor1, const MR::FunctorBase& rFunctor2) { listenNameObjStageSwitchOnOffA(pActor, pActor->mStageSwitchCtrl, rFunctor1, rFunctor2); } - void listenStageSwitchOnB(LiveActor *pActor, const MR::FunctorBase &rFunctor) { + void listenStageSwitchOnB(LiveActor* pActor, const MR::FunctorBase& rFunctor) { listenNameObjStageSwitchOnB(pActor, pActor->mStageSwitchCtrl, rFunctor); } - void listenStageSwitchOffB(LiveActor *pActor, const MR::FunctorBase &rFunctor) { + void listenStageSwitchOffB(LiveActor* pActor, const MR::FunctorBase& rFunctor) { listenNameObjStageSwitchOffB(pActor, pActor->mStageSwitchCtrl, rFunctor); } - void listenStageSwitchOnOffB(LiveActor *pActor, const MR::FunctorBase &rFunctor1, const MR::FunctorBase &rFunctor2) { + void listenStageSwitchOnOffB(LiveActor* pActor, const MR::FunctorBase& rFunctor1, const MR::FunctorBase& rFunctor2) { listenNameObjStageSwitchOnOffB(pActor, pActor->mStageSwitchCtrl, rFunctor1, rFunctor2); } -}; +}; // namespace MR diff --git a/src/Game/Util/AreaObjUtil.cpp b/src/Game/Util/AreaObjUtil.cpp index 8b067dc63..66580ae66 100644 --- a/src/Game/Util/AreaObjUtil.cpp +++ b/src/Game/Util/AreaObjUtil.cpp @@ -5,46 +5,46 @@ namespace MR { - inline AreaObj* getAreaIn(const char *pName, const TVec3f &rPos) { + inline AreaObj* getAreaIn(const char* pName, const TVec3f& rPos) { return getAreaObjContainer()->getAreaObj(pName, rPos); } - AreaObjMgr* getAreaObjManager(const char *pMgrName) { + AreaObjMgr* getAreaObjManager(const char* pMgrName) { return MR::getAreaObjContainer()->getManager(pMgrName); } - AreaObj* getAreaObj(const char *pAreaName, const TVec3f &rVec) { + AreaObj* getAreaObj(const char* pAreaName, const TVec3f& rVec) { return MR::getAreaObjContainer()->getAreaObj(pAreaName, rVec); } - bool isInAreaObj(const char *pAreaName, const TVec3f &rVec) { + bool isInAreaObj(const char* pAreaName, const TVec3f& rVec) { return MR::getAreaObjContainer()->getAreaObj(pAreaName, rVec); } - s32 getAreaObjArg(const AreaObj *pObj, s32 which) { + s32 getAreaObjArg(const AreaObj* pObj, s32 which) { switch (which) { - case 0: - return pObj->mObjArg0; - case 1: - return pObj->mObjArg1; - case 2: - return pObj->mObjArg2; - case 3: - return pObj->mObjArg3; - case 4: - return pObj->mObjArg4; - case 5: - return pObj->mObjArg5; - case 6: - return pObj->mObjArg6; - case 7: - return pObj->mObjArg7; - default: - return -1; + case 0: + return pObj->mObjArg0; + case 1: + return pObj->mObjArg1; + case 2: + return pObj->mObjArg2; + case 3: + return pObj->mObjArg3; + case 4: + return pObj->mObjArg4; + case 5: + return pObj->mObjArg5; + case 6: + return pObj->mObjArg6; + case 7: + return pObj->mObjArg7; + default: + return -1; } } AreaObj* getCurrentAstroOverlookAreaObj() { return getAreaIn("AstroOverlookArea", *MR::getPlayerPos()); } -}; +}; // namespace MR diff --git a/src/Game/Util/BaseMatrixFollowTargetHolder.cpp b/src/Game/Util/BaseMatrixFollowTargetHolder.cpp index 06a2801e5..c64a5ee7a 100644 --- a/src/Game/Util/BaseMatrixFollowTargetHolder.cpp +++ b/src/Game/Util/BaseMatrixFollowTargetHolder.cpp @@ -1,6 +1,6 @@ #include "Game/Util/BaseMatrixFollowTargetHolder.hpp" -BaseMatrixFollower::BaseMatrixFollower(NameObj *pObj, const JMapInfoIter &rIter) { +BaseMatrixFollower::BaseMatrixFollower(NameObj* pObj, const JMapInfoIter& rIter) { mFollowerObj = pObj; mLinkInfo = 0; mFollowTarget = 0; @@ -34,7 +34,7 @@ bool BaseMatrixFollower::isValid() const { return mFollowTarget->isValid(mFollowID); } -BaseMatrixFollowTarget::BaseMatrixFollowTarget(const JMapLinkInfo *pInfo) { +BaseMatrixFollowTarget::BaseMatrixFollowTarget(const JMapLinkInfo* pInfo) { mLinkInfo = pInfo; _30 = 0; mActor = 0; @@ -42,7 +42,7 @@ BaseMatrixFollowTarget::BaseMatrixFollowTarget(const JMapLinkInfo *pInfo) { _0.identity(); } -void BaseMatrixFollowTarget::set(LiveActor *pActor, const TPos3f &a2, const TPos3f *a3, BaseMatrixFollowValidater *pValidator) { +void BaseMatrixFollowTarget::set(LiveActor* pActor, const TPos3f& a2, const TPos3f* a3, BaseMatrixFollowValidater* pValidator) { mValidater = pValidator; mActor = pActor; _0.set(a2); @@ -71,5 +71,4 @@ bool BaseMatrixFollowTarget::isValid(s32 followId) const { } BaseMatrixFollowTargetHolder::~BaseMatrixFollowTargetHolder() { - } \ No newline at end of file diff --git a/src/Game/Util/BitArray.cpp b/src/Game/Util/BitArray.cpp index 009634a5e..4646e8d30 100644 --- a/src/Game/Util/BitArray.cpp +++ b/src/Game/Util/BitArray.cpp @@ -2,10 +2,9 @@ #include "Game/Util/MemoryUtil.hpp" namespace MR { - BitArray::BitArray(int bitNum) : - mArray(nullptr), - mArraySize(bitNum) - { + BitArray::BitArray(int bitNum) + : mArray(nullptr), + mArraySize(bitNum) { int byteNum = (bitNum + 7 & ~7) / 8; mArray = new u8[byteNum]; @@ -25,9 +24,8 @@ namespace MR { if (isOn) { pArray[byteIdx] |= (1 << (bitIdx & 0x7)); - } - else { + } else { pArray[byteIdx] &= ~(1 << (bitIdx & 0x7)); } } -}; +}; // namespace MR diff --git a/src/Game/Util/BothDirList.cpp b/src/Game/Util/BothDirList.cpp index 5021cf730..a70c130d7 100644 --- a/src/Game/Util/BothDirList.cpp +++ b/src/Game/Util/BothDirList.cpp @@ -1,13 +1,11 @@ #include "Game/Util.hpp" namespace MR { - BothDirPtrLink::BothDirPtrLink(void *pLink) : - mValue(pLink), - mList(nullptr), - mPrevLink(nullptr), - mNextLink(nullptr) - { - + BothDirPtrLink::BothDirPtrLink(void* pLink) + : mValue(pLink), + mList(nullptr), + mPrevLink(nullptr), + mNextLink(nullptr) { } BothDirPtrLink::~BothDirPtrLink() { @@ -24,7 +22,7 @@ namespace MR { BothDirPtrList::~BothDirPtrList() { BothDirPtrLink* pLink = mHead; - u32 i = 0; + u32 i = 0; while (i < mCount) { pLink->mList = nullptr; i++; @@ -38,7 +36,7 @@ namespace MR { mCount = 0; } - void BothDirPtrList::setFirst(BothDirPtrLink *pFirst) { + void BothDirPtrList::setFirst(BothDirPtrLink* pFirst) { pFirst->mList = this; pFirst->mPrevLink = nullptr; pFirst->mNextLink = nullptr; @@ -55,8 +53,7 @@ namespace MR { if (success) { if (mCount == 0) { setFirst(pLink); - } - else { + } else { pLink->mList = this; pLink->mPrevLink = mTail; pLink->mNextLink = nullptr; @@ -75,16 +72,13 @@ namespace MR { if (mCount == 1) { mHead = nullptr; mTail = nullptr; - } - else if (pLink == mHead) { + } else if (pLink == mHead) { pLink->mNextLink->mPrevLink = nullptr; mHead = pLink->mNextLink; - } - else if (pLink == mTail) { + } else if (pLink == mTail) { pLink->mPrevLink->mNextLink = nullptr; mTail = pLink->mPrevLink; - } - else { + } else { pLink->mPrevLink->mNextLink = pLink->mNextLink; pLink->mNextLink->mPrevLink = pLink->mPrevLink; } @@ -93,4 +87,4 @@ namespace MR { } return success; } -}; +}; // namespace MR diff --git a/src/Game/Util/CameraUtil.cpp b/src/Game/Util/CameraUtil.cpp index 6824bdb82..9dccb8d31 100644 --- a/src/Game/Util/CameraUtil.cpp +++ b/src/Game/Util/CameraUtil.cpp @@ -18,12 +18,12 @@ #include "revolution/mtx.h" namespace { - void calcNormalizedScreenPosToScreenPos(TVec3f *, const TVec3f &); - char* createRegisterName(const NameObj *, u32); -}; + void calcNormalizedScreenPosToScreenPos(TVec3f*, const TVec3f&); + char* createRegisterName(const NameObj*, u32); +}; // namespace namespace MR { - bool calcScreenPosition(TVec2f *pResult, const TVec3f &rViewMtxMult) { + bool calcScreenPosition(TVec2f* pResult, const TVec3f& rViewMtxMult) { TVec3f normalizedScreenPos; TVec3f screenPos; TVec3f multedViewMtx; @@ -35,7 +35,7 @@ namespace MR { return ret; } - bool calcScreenPosition(TVec3f *pResult, const TVec3f &rViewMtxMult) { + bool calcScreenPosition(TVec3f* pResult, const TVec3f& rViewMtxMult) { TVec3f normalizedScreenPos; TVec3f multedViewMtx; getSceneObj(SceneObj_CameraContext)->getViewMtx()->mult(rViewMtxMult, multedViewMtx); @@ -44,20 +44,20 @@ namespace MR { return ret; } - bool calcNormalizedScreenPosition(TVec3f *pResult, const TVec3f &rViewMtxMult) { + bool calcNormalizedScreenPosition(TVec3f* pResult, const TVec3f& rViewMtxMult) { TVec3f multedViewMtx; getSceneObj(SceneObj_CameraContext)->getViewMtx()->mult(rViewMtxMult, multedViewMtx); return calcNormalizedScreenPositionFromView(pResult, multedViewMtx); } - bool calcWorldRayDirectionFromScreen(TVec3f *pResult, const TVec2f &a2) { + bool calcWorldRayDirectionFromScreen(TVec3f* pResult, const TVec2f& a2) { bool ret = calcWorldPositionFromScreen(pResult, a2, -1.0f); pResult->sub(getCamPos()); return ret; } void loadProjectionMtx() { - GXSetProjection(getSceneObj(SceneObj_CameraContext)->mProjection, (GXProjectionType)nullptr); + GXSetProjection(getSceneObj(SceneObj_CameraContext)->mProjection, (GXProjectionType) nullptr); } void loadViewMtx() { @@ -76,7 +76,7 @@ namespace MR { return &getSceneObj(SceneObj_CameraContext)->mProjection; } - void setCameraViewMtx(const TPos3f &a1, bool a2, bool a3, const TVec3f &a4) { + void setCameraViewMtx(const TPos3f& a1, bool a2, bool a3, const TVec3f& a4) { getSceneObj(SceneObj_CameraContext)->setViewMtx(a1, a2, a3, a4); } @@ -167,19 +167,19 @@ namespace MR { MR::getCameraDirector()->setInterpolation(intr); } - void declareEventCamera(const ActorCameraInfo *pInfo, const char *pEventName) { + void declareEventCamera(const ActorCameraInfo* pInfo, const char* pEventName) { MR::getCameraDirector()->declareEvent(pInfo->mZoneID, pEventName); } - void endEventCamera(const ActorCameraInfo *pInfo, const char *pEventName, bool a3, s32 a4) { + void endEventCamera(const ActorCameraInfo* pInfo, const char* pEventName, bool a3, s32 a4) { MR::getCameraDirector()->endEvent(pInfo->mZoneID, pEventName, a3, a4); } - void endEventCameraAtLanding(const ActorCameraInfo *pInfo, const char *pName, s32 a3) { + void endEventCameraAtLanding(const ActorCameraInfo* pInfo, const char* pName, s32 a3) { getCameraDirector()->endEventAtLanding(pInfo->mZoneID, pName, a3); } - void declareGlobalEventCameraAbyss(const char *pEventName) { + void declareGlobalEventCameraAbyss(const char* pEventName) { MR::getCameraDirector()->declareEvent(0, pEventName); CameraParamChunkEvent* chunk = MR::getCameraDirector()->getEventParameter(0, pEventName); @@ -194,19 +194,19 @@ namespace MR { return getCameraDirector()->isEventCameraActive(); } - bool isEventCameraActive(const ActorCameraInfo *pInfo, const char *pEventName) { + bool isEventCameraActive(const ActorCameraInfo* pInfo, const char* pEventName) { return getCameraDirector()->isEventCameraActive(pInfo->mZoneID, pEventName); } - void declareGlobalEventCamera(const char *pEventName) { + void declareGlobalEventCamera(const char* pEventName) { getCameraDirector()->declareEvent(0, pEventName); } - void endGlobalEventCamera(const char *pEventName, s32 a2, bool a3) { + void endGlobalEventCamera(const char* pEventName, s32 a2, bool a3) { getCameraDirector()->endEvent(0, pEventName, a3, a2); } - void declareGlobalEventCameraFixedThere(const char *pEventName, bool a2, f32 a3) { + void declareGlobalEventCameraFixedThere(const char* pEventName, bool a2, f32 a3) { getCameraDirector()->declareEvent(0, pEventName); CameraParamChunkEvent* pChunk = getCameraDirector()->getEventParameter(0, pEventName); if (pChunk) { @@ -219,19 +219,19 @@ namespace MR { } } - bool isAnimCameraEnd(const ActorCameraInfo *pInfo, const char *pName) { + bool isAnimCameraEnd(const ActorCameraInfo* pInfo, const char* pName) { return getCameraDirector()->isAnimCameraEnd(pInfo->mZoneID, pName); } - void pauseOnAnimCamera(const ActorCameraInfo *pInfo, const char *pName) { + void pauseOnAnimCamera(const ActorCameraInfo* pInfo, const char* pName) { getCameraDirector()->pauseOnAnimCamera(pInfo->mZoneID, pName); } - void pauseOffAnimCamera(const ActorCameraInfo *pInfo, const char *pName) { + void pauseOffAnimCamera(const ActorCameraInfo* pInfo, const char* pName) { getCameraDirector()->pauseOffAnimCamera(pInfo->mZoneID, pName); } - void declareBlackHoleCamera(const char *pEventName) { + void declareBlackHoleCamera(const char* pEventName) { getCameraDirector()->declareEvent(0, pEventName); CameraParamChunkEvent* pChunk = getCameraDirector()->getEventParameter(0, pEventName); if (pChunk) { @@ -243,7 +243,7 @@ namespace MR { } } - void startBlackHoleCamera(const char *pEventName, const TVec3f &a2, const TVec3f &a3) { + void startBlackHoleCamera(const char* pEventName, const TVec3f& a2, const TVec3f& a3) { CameraParamChunkEvent* pChunk = getCameraDirector()->getEventParameter(0, pEventName); if (pChunk) { pChunk->mGeneralParam->mWPoint.set(a2); @@ -261,7 +261,7 @@ namespace MR { getCameraDirector()->endSubjectiveCamera(a1); } - void declareEventCameraProgrammable(const char *pEventName) { + void declareEventCameraProgrammable(const char* pEventName) { getCameraDirector()->declareEvent(0, pEventName); CameraParamChunkEvent* pChunk = getCameraDirector()->getEventParameter(0, pEventName); if (pChunk) { @@ -270,7 +270,7 @@ namespace MR { } } - void setProgrammableCameraParam(const char *pEventName, const TVec3f &rWPoint, const TVec3f &a3, const TVec3f &rUpVec, bool doZeroWOffset) { + void setProgrammableCameraParam(const char* pEventName, const TVec3f& rWPoint, const TVec3f& a3, const TVec3f& rUpVec, bool doZeroWOffset) { CameraParamChunkEvent* pChunk = getCameraDirector()->getEventParameter(0, pEventName); if (pChunk) { pChunk->mGeneralParam->mWPoint.set(rWPoint); @@ -283,7 +283,7 @@ namespace MR { } } - void setProgrammableCameraParamFovy(const char *pEventName, f32 fovy) { + void setProgrammableCameraParamFovy(const char* pEventName, f32 fovy) { CameraParamChunkEvent* pChunk = getCameraDirector()->getEventParameter(0, pEventName); if (pChunk) { pChunk->mExParam.mFovy = fovy; @@ -291,22 +291,21 @@ namespace MR { } } - u32 getEventCameraFrames(const ActorCameraInfo *pInfo, const char *pEventName) { + u32 getEventCameraFrames(const ActorCameraInfo* pInfo, const char* pEventName) { CameraParamChunkEvent* pChunk = getCameraDirector()->getEventParameter(pInfo->mZoneID, pEventName); if (pChunk) { return pChunk->mEvFrame; - } - else { + } else { return 0; } } - void declareCameraRegisterMtx(const NameObj *pObj, u32 a2, MtxPtr mtx) { + void declareCameraRegisterMtx(const NameObj* pObj, u32 a2, MtxPtr mtx) { char* pName = createRegisterName(pObj, a2); getCameraDirector()->mRegisterHolder->declareMtxReg(pName, mtx); } - void declareCameraRegisterVec(const NameObj *pObj, u32 a2, TVec3f *pVec) { + void declareCameraRegisterVec(const NameObj* pObj, u32 a2, TVec3f* pVec) { char* pName = createRegisterName(pObj, a2); getCameraDirector()->mRegisterHolder->declareVecReg(pName, pVec); } @@ -350,7 +349,7 @@ namespace MR { bool isFirstPersonCamera() { return getCameraDirector()->isSubjectiveCamera(); } - + bool isCameraPossibleToRoundLeft() { return getCameraDirector()->isEnableToRoundLeft(); } @@ -367,7 +366,7 @@ namespace MR { return ret; } - void startTalkCamera(const TVec3f &rPosition, const TVec3f &rUp, f32 axisX, f32 axisY, s32 a5) { + void startTalkCamera(const TVec3f& rPosition, const TVec3f& rUp, f32 axisX, f32 axisY, s32 a5) { getCameraDirector()->startTalkCamera(rPosition, rUp, axisX, axisY, a5); } @@ -409,45 +408,45 @@ namespace MR { camTarget.setTarget(); } - void setGameCameraTarget(const CameraTargetArg &rCamTarget) { + void setGameCameraTarget(const CameraTargetArg& rCamTarget) { rCamTarget.setTarget(); } - void changeEventCameraTarget(const ActorCameraInfo *pInfo, const char *pEvetName, const CameraTargetArg &rCamTarget) { + void changeEventCameraTarget(const ActorCameraInfo* pInfo, const char* pEvetName, const CameraTargetArg& rCamTarget) { rCamTarget.setTarget(); } - void startEventCameraNoTarget(const ActorCameraInfo *pInfo, const char *pName, s32 a3) { + void startEventCameraNoTarget(const ActorCameraInfo* pInfo, const char* pName, s32 a3) { CameraTargetArg camTarget = CameraTargetArg(); getCameraDirector()->startEvent(pInfo->mZoneID, pName, camTarget, a3); } - void startEventCameraTargetPlayer(const ActorCameraInfo *pInfo, const char *pName, long a3) { + void startEventCameraTargetPlayer(const ActorCameraInfo* pInfo, const char* pName, long a3) { CameraTargetArg camTarget = CameraTargetArg(); setCameraTargetToPlayer(&camTarget); getCameraDirector()->startEvent(pInfo->mZoneID, pName, camTarget, a3); } - void startEventCamera(const ActorCameraInfo *pInfo, const char *pName, const CameraTargetArg &rCamTarget, s32 a4) { + void startEventCamera(const ActorCameraInfo* pInfo, const char* pName, const CameraTargetArg& rCamTarget, s32 a4) { getCameraDirector()->startEvent(pInfo->mZoneID, pName, rCamTarget, a4); } - void startGlobalEventCameraNoTarget(const char *pName, s32 a2) { + void startGlobalEventCameraNoTarget(const char* pName, s32 a2) { CameraTargetArg camTarget = CameraTargetArg(); getCameraDirector()->startEvent(0, pName, camTarget, a2); } - void startGlobalEventCameraTargetPlayer(const char *pName, s32 a2) { + void startGlobalEventCameraTargetPlayer(const char* pName, s32 a2) { CameraTargetArg camTarget = CameraTargetArg(); setCameraTargetToPlayer(&camTarget); getCameraDirector()->startEvent(0, pName, camTarget, a2); } - void startGlobalEventCamera(const char *pName, const CameraTargetArg &rCamTarget, s32 a3) { + void startGlobalEventCamera(const char* pName, const CameraTargetArg& rCamTarget, s32 a3) { getCameraDirector()->startEvent(0, pName, rCamTarget, a3); } - void startEventCameraAnim(const ActorCameraInfo *pInfo, const char *pEventName, const CameraTargetArg &rCamTarget, long a4, float a5) { + void startEventCameraAnim(const ActorCameraInfo* pInfo, const char* pEventName, const CameraTargetArg& rCamTarget, long a4, float a5) { CameraParamChunkEvent* pChunk = getCameraDirector()->getEventParameter(pInfo->mZoneID, pEventName); if (pChunk) { pChunk->mGeneralParam->mDist = a5; @@ -460,5 +459,5 @@ namespace MR { setCameraTargetToPlayer(&camTarget); camTarget.setTarget(); } - -}; + +}; // namespace MR diff --git a/src/Game/Util/DemoUtil.cpp b/src/Game/Util/DemoUtil.cpp index 2cf57c7e6..e1fd5fc5c 100644 --- a/src/Game/Util/DemoUtil.cpp +++ b/src/Game/Util/DemoUtil.cpp @@ -5,126 +5,122 @@ #include "Game/Scene/GameSceneFunction.hpp" namespace MR { - bool tryRegisterDemoCast(LiveActor *pActor, const JMapInfoIter &rIter) { + bool tryRegisterDemoCast(LiveActor* pActor, const JMapInfoIter& rIter) { return DemoFunction::getDemoDirector()->registerDemoCast(pActor, rIter); } - void registerDemoActionFunctor(const LiveActor *pActor, const MR::FunctorBase &rFunctor, const char *pName) { + void registerDemoActionFunctor(const LiveActor* pActor, const MR::FunctorBase& rFunctor, const char* pName) { DemoFunction::registerDemoActionFunctorFunction(pActor, rFunctor, pName); } - void registerDemoActionNerve(const LiveActor *pActor, const Nerve *pNerve, const char *pName) { + void registerDemoActionNerve(const LiveActor* pActor, const Nerve* pNerve, const char* pName) { DemoFunction::registerDemoActionNerveFunction(pActor, pNerve, pName); } - bool tryRegisterDemoActionFunctor(const LiveActor *pActor, const MR::FunctorBase &rFunctor, const char *pName) { + bool tryRegisterDemoActionFunctor(const LiveActor* pActor, const MR::FunctorBase& rFunctor, const char* pName) { if (!DemoFunction::isRegisteredDemoActionFunctor(pActor)) { return false; - } - else { + } else { DemoFunction::registerDemoActionFunctorFunction(pActor, rFunctor, pName); return true; } } - bool tryRegisterDemoActionNerve(const LiveActor *pActor, const Nerve *pNerve, const char *pName) { + bool tryRegisterDemoActionNerve(const LiveActor* pActor, const Nerve* pNerve, const char* pName) { if (!DemoFunction::isRegisteredDemoActionNerve(pActor)) { return false; - } - else { + } else { DemoFunction::registerDemoActionNerveFunction(pActor, pNerve, pName); return true; } } - bool tryRegisterDemoCast(LiveActor *pActor, const char *pName, const JMapInfoIter &rIter) { + bool tryRegisterDemoCast(LiveActor* pActor, const char* pName, const JMapInfoIter& rIter) { return DemoFunction::getDemoDirector()->registerDemoCast(pActor, pName, rIter); } - void registerDemoCast(LiveActor *pActor, const char *pName, const JMapInfoIter &rIter) { + void registerDemoCast(LiveActor* pActor, const char* pName, const JMapInfoIter& rIter) { DemoFunction::getDemoDirector()->registerDemoCast(pActor, pName, rIter); } - void initTalkAnimDemoCast(LiveActor *pActor, const JMapInfoIter &rIter, const char *pName1, const char *pName2) { + void initTalkAnimDemoCast(LiveActor* pActor, const JMapInfoIter& rIter, const char* pName1, const char* pName2) { DemoFunction::getDemoDirector()->registerDemoCast(pActor, pName1, rIter); DemoFunction::tryCreateDemoTalkAnimCtrlForActorDirect(pActor, pName1, pName2, nullptr); } - void registerDemoActionFunctorDirect(const LiveActor *pActor, const MR::FunctorBase &rFunctor, const char *pName1, const char *pName2) { + void registerDemoActionFunctorDirect(const LiveActor* pActor, const MR::FunctorBase& rFunctor, const char* pName1, const char* pName2) { DemoFunction::registerDemoActionFunctorFunction(pActor, rFunctor, pName1, pName2); } - bool tryRegisterDemoActionFunctorDirect(const LiveActor *pActor, const MR::FunctorBase &rFunctor, const char *pName1, const char *pName2) { + bool tryRegisterDemoActionFunctorDirect(const LiveActor* pActor, const MR::FunctorBase& rFunctor, const char* pName1, const char* pName2) { if (!DemoFunction::isRegisteredDemoActionFunctor(pActor, pName1)) { return false; - } - else { + } else { DemoFunction::registerDemoActionFunctorFunction(pActor, rFunctor, pName1, pName2); return true; } } - bool tryStartDemoRegistered(LiveActor *pActor, const char *pName) { + bool tryStartDemoRegistered(LiveActor* pActor, const char* pName) { return DemoFunction::tryStartDemoRegistered(pActor, pName); } - bool tryStartDemoRegisteredMarioPuppetable(LiveActor *pActor, const char *pName) { + bool tryStartDemoRegisteredMarioPuppetable(LiveActor* pActor, const char* pName) { return DemoFunction::tryStartDemoRegisteredMarioPuppetable(pActor, pName); } - void registerDemoSimpleCastAll(LiveActor *pActor) { + void registerDemoSimpleCastAll(LiveActor* pActor) { DemoFunction::registerDemoSimpleCastAllFunction(pActor); } - void registerDemoSimpleCastAll(LayoutActor *pLayoutActor) { + void registerDemoSimpleCastAll(LayoutActor* pLayoutActor) { DemoFunction::registerDemoSimpleCastAllFunction(pLayoutActor); } - void registerDemoSimpleCastAll(NameObj *pObj) { + void registerDemoSimpleCastAll(NameObj* pObj) { DemoFunction::registerDemoSimpleCastAllFunction(pObj); } - bool isDemoCast(const LiveActor *pActor, const char *pName) { + bool isDemoCast(const LiveActor* pActor, const char* pName) { DemoExecutor* pExecutor = DemoFunction::findDemoExecutor(pActor); if (!pExecutor) { return false; } if (pName) { return DemoFunction::isRegisteredDemoCast(pActor, pName); - } - else { + } else { return DemoFunction::isDemoCast(pExecutor, pActor); } } - bool isRegisteredDemoActionAppear(const LiveActor *pActor) { + bool isRegisteredDemoActionAppear(const LiveActor* pActor) { return DemoFunction::isRegisteredDemoActionAppear(pActor); } - bool isRegisteredDemoActionNerve(const LiveActor *pActor) { + bool isRegisteredDemoActionNerve(const LiveActor* pActor) { return DemoFunction::isRegisteredDemoActionNerve(pActor); } - void endDemo(NameObj *pObj, const char *pName) { + void endDemo(NameObj* pObj, const char* pName) { DemoFunction::getDemoDirector()->endDemo(pObj, pName, false); } - void endDemoWaitCameraInterpolating(NameObj *pObj, const char *pName) { + void endDemoWaitCameraInterpolating(NameObj* pObj, const char* pName) { DemoFunction::getDemoDirector()->endDemo(pObj, pName, true); } - void initDemoSheetTalkAnim(LiveActor *pActor, const JMapInfoIter &rIter, const char *pName1, const char *pName2, TalkMessageCtrl *pTalkCtrl) { + void initDemoSheetTalkAnim(LiveActor* pActor, const JMapInfoIter& rIter, const char* pName1, const char* pName2, TalkMessageCtrl* pTalkCtrl) { tryInitDemoSheetTalkAnim(pActor, rIter, pName1, pName2, pTalkCtrl); } - void initDemoSheetTalkAnimFunctor(LiveActor *pActor, const JMapInfoIter &rIter, const char *pName1, - const char *pName2, TalkMessageCtrl *pTalkCtrl, const MR::FunctorBase &rFunctor) { - if (tryInitDemoSheetTalkAnim(pActor, rIter, pName1, pName2, pTalkCtrl)) { - DemoFunction::registerDemoActionFunctorFunction(pActor, rFunctor, pName1, nullptr); - } + void initDemoSheetTalkAnimFunctor(LiveActor* pActor, const JMapInfoIter& rIter, const char* pName1, + const char* pName2, TalkMessageCtrl* pTalkCtrl, const MR::FunctorBase& rFunctor) { + if (tryInitDemoSheetTalkAnim(pActor, rIter, pName1, pName2, pTalkCtrl)) { + DemoFunction::registerDemoActionFunctorFunction(pActor, rFunctor, pName1, nullptr); + } } - bool isDemoExist(const char *pName) { + bool isDemoExist(const char* pName) { return DemoFunction::getDemoDirector()->isExistTimeKeepDemo(pName); } @@ -132,7 +128,7 @@ namespace MR { return DemoFunction::getDemoDirector()->mIsActive; } - bool isDemoActive(const char *pName) { + bool isDemoActive(const char* pName) { DemoExecutor* pExecutor = DemoFunction::getDemoDirector()->mExecutor; if (pExecutor) { if (isName(pExecutor, pName)) { @@ -142,8 +138,7 @@ namespace MR { char* pDemoName = DemoFunction::getDemoDirector()->getCurrentDemoName(); if (!pDemoName) { return false; - } - else { + } else { return isEqualString(pDemoName, pName); } } @@ -157,8 +152,7 @@ namespace MR { } if (GameSceneFunction::isExecStageClearDemo()) { return false; - } - else { + } else { return !isPlayerConfrontDeath(); } } @@ -170,22 +164,20 @@ namespace MR { return DemoFunction::getDemoDirector()->mExecutor != nullptr; } - bool isDemoActiveRegistered(const LiveActor *pActor) { + bool isDemoActiveRegistered(const LiveActor* pActor) { DemoExecutor* pExecutor = DemoFunction::findDemoExecutor(pActor); if (pExecutor == false) { return false; - } - else { + } else { return DemoFunction::getDemoDirector()->mExecutor == pExecutor; } } - bool isDemoPartExist(const LiveActor *pActor, const char *pName) { + bool isDemoPartExist(const LiveActor* pActor, const char* pName) { DemoExecutor* pExecutor = DemoFunction::findDemoExecutor(pActor); if (pExecutor) { return DemoFunction::isExistDemoPart(pExecutor, pName); - } - else { + } else { return false; } } @@ -194,24 +186,22 @@ namespace MR { return DemoFunction::isDemoLastPartLastStep(); } - bool isDemoPartActive(const char *pName) { + bool isDemoPartActive(const char* pName) { return DemoFunction::isDemoPartActiveFunction(pName); } - bool isDemoPartStep(const char *pName, s32 a2) { + bool isDemoPartStep(const char* pName, s32 a2) { if (DemoFunction::isDemoPartActiveFunction(pName) == false) { return false; - } - else { + } else { return DemoFunction::getDemoPartStepFunction(pName) == a2; } } - bool isDemoPartFirstStep(const char *pName) { + bool isDemoPartFirstStep(const char* pName) { if (DemoFunction::isDemoPartActiveFunction(pName) == false) { return false; - } - else { + } else { return DemoFunction::getDemoPartStepFunction(pName) == 0; } } @@ -227,37 +217,35 @@ namespace MR { } } */ - bool isDemoPartLessEqualStep(const char *pName, s32 a2) { + bool isDemoPartLessEqualStep(const char* pName, s32 a2) { if (DemoFunction::isDemoPartActiveFunction(pName) == false) { return false; - } - else { + } else { return DemoFunction::getDemoPartStepFunction(pName) <= a2; } } - bool isDemoPartGreaterStep(const char *pName, s32 a2) { + bool isDemoPartGreaterStep(const char* pName, s32 a2) { if (DemoFunction::isDemoPartActiveFunction(pName) == false) { return false; - } - else { + } else { return DemoFunction::getDemoPartStepFunction(pName) > a2; } } - s32 getDemoPartTotalStep(const char *pName) { + s32 getDemoPartTotalStep(const char* pName) { return DemoFunction::getDemoPartTotalStepFunction(pName); } - s32 getDemoPartStep(const char *pName) { + s32 getDemoPartStep(const char* pName) { return DemoFunction::getDemoPartStepFunction(pName); } - void pauseTimeKeepDemo(LiveActor *pActor) { + void pauseTimeKeepDemo(LiveActor* pActor) { DemoFunction::pauseTimeKeepDemo(pActor); } - void resumeTimeKeepDemo(LiveActor *pActor) { + void resumeTimeKeepDemo(LiveActor* pActor) { DemoFunction::resumeTimeKeepDemo(pActor); } @@ -265,11 +253,11 @@ namespace MR { return GameSceneFunction::isExecStageClearDemo(); } - const char* getCurrentDemoPartNameMain(const char *pName) { + const char* getCurrentDemoPartNameMain(const char* pName) { return DemoFunction::getCurrentDemoPartNameMain(pName); } - - void endTalkingSequence(NameObj *pObj) { + + void endTalkingSequence(NameObj* pObj) { const char* pName = "会話"; DemoFunction::getDemoDirector()->endDemo(pObj, pName, false); } @@ -277,8 +265,7 @@ namespace MR { bool isSystemTalking() { if (isExistSceneObj(0x19) == false) { return false; - } - else { + } else { return getSceneObj(SceneObj_TalkDirector)->isSystemTalking(); } } @@ -286,8 +273,7 @@ namespace MR { bool isNormalTalking() { if (isExistSceneObj(0x19) == false) { return false; - } - else { + } else { return getSceneObj(SceneObj_TalkDirector)->isNormalTalking(); } } @@ -295,13 +281,12 @@ namespace MR { LiveActor* getTalkingActor() { if (isExistSceneObj(0x19) == false) { return false; - } - else { + } else { return getSceneObj(SceneObj_TalkDirector)->getTalkingActor(); } } - bool isDemoPartTalk(const char *pName) { + bool isDemoPartTalk(const char* pName) { return DemoFunction::isDemoPartTalk(pName); } -}; +}; // namespace MR diff --git a/src/Game/Util/DrawUtil.cpp b/src/Game/Util/DrawUtil.cpp index 701fb815e..d50a60fce 100644 --- a/src/Game/Util/DrawUtil.cpp +++ b/src/Game/Util/DrawUtil.cpp @@ -5,7 +5,7 @@ #include const JUTTexture* mShadowTex; -TVec3f mShadowVec; +TVec3f mShadowVec; namespace { GXTexObj clear_z_tobj; @@ -56,4 +56,4 @@ namespace MR { void deactivateGameSceneDraw3D() { GameSceneFunction::deactivateDraw3D(); } -}; +}; // namespace MR diff --git a/src/Game/Util/EffectUtil.cpp b/src/Game/Util/EffectUtil.cpp index 34bbd86cc..ef95ca830 100644 --- a/src/Game/Util/EffectUtil.cpp +++ b/src/Game/Util/EffectUtil.cpp @@ -11,11 +11,10 @@ #include namespace { - bool isExistEffect(const LiveActor *pActor, const char *pEffectName) { - return MR::isExistEffectKeeper(pActor) - && MR::isRegisteredEffect(pActor, pEffectName); + bool isExistEffect(const LiveActor* pActor, const char* pEffectName) { + return MR::isExistEffectKeeper(pActor) && MR::isRegisteredEffect(pActor, pEffectName); } -}; +}; // namespace namespace MR { void requestEffectStopSceneStart() { @@ -26,162 +25,159 @@ namespace MR { Effect::requestMovementOnAllEmitters(); } - void addEffect(LiveActor *pActor, const char *pEffectName) { + void addEffect(LiveActor* pActor, const char* pEffectName) { pActor->mEffectKeeper->addEffect(pEffectName, pActor); } - MultiEmitter* getEffect(const LiveActor *pActor, const char *pEffectName) { + MultiEmitter* getEffect(const LiveActor* pActor, const char* pEffectName) { return pActor->mEffectKeeper->getEmitter(pEffectName); } - MultiEmitter* getEffect(const LayoutActor *pLayoutActor, const char *pEffectName) { + MultiEmitter* getEffect(const LayoutActor* pLayoutActor, const char* pEffectName) { return pLayoutActor->mPaneEffectKeeper->getEmitter(pEffectName); } - bool isExistEffectKeeper(const LiveActor *pActor) { + bool isExistEffectKeeper(const LiveActor* pActor) { return pActor->mEffectKeeper; } - bool isExistEffectKeeper(const LayoutActor *pLayoutActor) { + bool isExistEffectKeeper(const LayoutActor* pLayoutActor) { return pLayoutActor->mPaneEffectKeeper; } - MultiEmitter* emitEffect(LiveActor *pActor, const char *pEffectName) { + MultiEmitter* emitEffect(LiveActor* pActor, const char* pEffectName) { return pActor->mEffectKeeper->createEmitter(pEffectName); } - MultiEmitter* emitEffectWithScale(LiveActor *pActor, const char *pEffectName, f32 a3, s32 a4) { + MultiEmitter* emitEffectWithScale(LiveActor* pActor, const char* pEffectName, f32 a3, s32 a4) { MultiEmitter* pEmitter = pActor->mEffectKeeper->createEmitter(pEffectName); - TVec3f scaleVec(a3,a3,a3); + TVec3f scaleVec(a3, a3, a3); pEmitter->setGlobalScale(scaleVec, a4); return pEmitter; } - MultiEmitter* emitEffectWithEmitterCallBack(LiveActor *pActor, const char *pEffectName, MultiEmitterCallBackBase *pCallBack) { + MultiEmitter* emitEffectWithEmitterCallBack(LiveActor* pActor, const char* pEffectName, MultiEmitterCallBackBase* pCallBack) { MultiEmitter* pEmitter = pActor->mEffectKeeper->getEmitter(pEffectName); pEmitter->createEmitterWithCallBack(pCallBack); return pEmitter; } - MultiEmitter* emitEffectWithParticleCallBack(LiveActor *pActor, const char *pEffectName, MultiEmitterParticleCallBack *pCallBack) { + MultiEmitter* emitEffectWithParticleCallBack(LiveActor* pActor, const char* pEffectName, MultiEmitterParticleCallBack* pCallBack) { MultiEmitter* pEmitter = pActor->mEffectKeeper->createEmitter(pEffectName); pEmitter->setParticleCallBackPtr(pCallBack, -1); return pEmitter; } - MultiEmitter* tryEmitEffect(LiveActor *pActor, const char *pEffectName) { + MultiEmitter* tryEmitEffect(LiveActor* pActor, const char* pEffectName) { if (::isExistEffect(pActor, pEffectName) == false) { return nullptr; - } - else { + } else { return pActor->mEffectKeeper->createEmitter(pEffectName); } } - bool tryDeleteEffect(LiveActor *pActor, const char *pEffectName) { + bool tryDeleteEffect(LiveActor* pActor, const char* pEffectName) { if (!::isExistEffect(pActor, pEffectName)) { return false; - } - else { + } else { pActor->mEffectKeeper->deleteEmitter(pEffectName); return true; } } - void deleteEffect(LiveActor *pActor, const char *pEffectName) { + void deleteEffect(LiveActor* pActor, const char* pEffectName) { pActor->mEffectKeeper->deleteEmitter(pEffectName); } - void forceDeleteEffect(LiveActor *pActor, const char *pEffectName) { + void forceDeleteEffect(LiveActor* pActor, const char* pEffectName) { pActor->mEffectKeeper->forceDeleteEmitter(pEffectName); } - void deleteEffectAll(LiveActor *pActor) { + void deleteEffectAll(LiveActor* pActor) { pActor->mEffectKeeper->deleteEmitterAll(); } - void forceDeleteEffectAll(LiveActor *pActor) { + void forceDeleteEffectAll(LiveActor* pActor) { pActor->mEffectKeeper->forceDeleteEmitterAll(); } - bool isRegisteredEffect(const LiveActor *pActor, const char *pEffectName) { + bool isRegisteredEffect(const LiveActor* pActor, const char* pEffectName) { if (pEffectName) { return pActor->mEffectKeeper->isRegisteredEmitter(pEffectName); - } - else return pActor->mEffectKeeper; + } else + return pActor->mEffectKeeper; } - bool isEffectValid(const LiveActor *pActor, const char *pEffectName) { + bool isEffectValid(const LiveActor* pActor, const char* pEffectName) { MultiEmitter* pEmitter = pActor->mEffectKeeper->getEmitter(pEffectName); if (pEmitter) { return pEmitter->isValid(); - } - else { + } else { return false; } } - void onDrawEffect(LiveActor *pActor) { + void onDrawEffect(LiveActor* pActor) { pActor->mEffectKeeper->onDraw(); } - void offDrawEffect(LiveActor *pActor) { + void offDrawEffect(LiveActor* pActor) { pActor->mEffectKeeper->offDraw(); } - void pauseOffEffectAll(LiveActor *pActor) { + void pauseOffEffectAll(LiveActor* pActor) { Effect::requestMovementOn(pActor->mEffectKeeper); } - void onEmitEffectSyncClipping(LiveActor *pActor, const char *pEffectName) { + void onEmitEffectSyncClipping(LiveActor* pActor, const char* pEffectName) { pActor->mEffectKeeper->getEmitter(pEffectName)->onCreateSyncClipping(); } - void onForceDeleteEffectSyncClipping(LiveActor *pActor, const char *pEffectName) { + void onForceDeleteEffectSyncClipping(LiveActor* pActor, const char* pEffectName) { pActor->mEffectKeeper->getEmitter(pEffectName)->onForceDeleteSyncClipping(); } - void setEffectName(LiveActor *pActor, const char *pOldName, const char *pNewName) { + void setEffectName(LiveActor* pActor, const char* pOldName, const char* pNewName) { pActor->mEffectKeeper->changeEffectName(pOldName, pNewName); } - void setEffectHostSRT(LiveActor *pActor, const char *pEffectName, const TVec3f *a3, const TVec3f *a4, const TVec3f *a5) { + void setEffectHostSRT(LiveActor* pActor, const char* pEffectName, const TVec3f* a3, const TVec3f* a4, const TVec3f* a5) { pActor->mEffectKeeper->getEmitter(pEffectName)->setHostSRT(a3, a4, a5); } - void setEffectHostMtx(LiveActor *pActor, const char *pEffectName, MtxPtr mtx) { + void setEffectHostMtx(LiveActor* pActor, const char* pEffectName, MtxPtr mtx) { pActor->mEffectKeeper->getEmitter(pEffectName)->setHostMtx(mtx); } - void setEffectBaseScale(LiveActor *pActor, const char *pEffectName, f32 scale) { + void setEffectBaseScale(LiveActor* pActor, const char* pEffectName, f32 scale) { pActor->mEffectKeeper->getEmitter(pEffectName)->setBaseScale(scale); } - - void setEffectLocalScale(LiveActor *pActor, const char *pEffectName, const TVec3f &rScaleVec) { + + void setEffectLocalScale(LiveActor* pActor, const char* pEffectName, const TVec3f& rScaleVec) { pActor->mEffectKeeper->getEmitter(pEffectName)->setLocalScale(rScaleVec, -1); } - void setEffectColor(LiveActor *pActor, const char *pEffectName, u8 colorPrm1, u8 colorPrm2, u8 colorPrm3, u8 colorEnv1, u8 colorEnv2, u8 colorEnv3) { + void setEffectColor(LiveActor* pActor, const char* pEffectName, u8 colorPrm1, u8 colorPrm2, u8 colorPrm3, u8 colorEnv1, u8 colorEnv2, u8 colorEnv3) { pActor->mEffectKeeper->getEmitter(pEffectName)->setGlobalPrmColor(colorPrm1, colorPrm2, colorPrm3, -1); pActor->mEffectKeeper->getEmitter(pEffectName)->setGlobalEnvColor(colorEnv1, colorEnv2, colorEnv3, -1); } - void setEffectPrmColor(LiveActor *pActor, const char *pEffectName, u8 color1, u8 color2, u8 color3) { + void setEffectPrmColor(LiveActor* pActor, const char* pEffectName, u8 color1, u8 color2, u8 color3) { pActor->mEffectKeeper->getEmitter(pEffectName)->setGlobalPrmColor(color1, color2, color3, -1); } - void setEffectEnvColor(LiveActor *pActor, const char *pEffectName, u8 color1, u8 color2, u8 color3) { + void setEffectEnvColor(LiveActor* pActor, const char* pEffectName, u8 color1, u8 color2, u8 color3) { pActor->mEffectKeeper->getEmitter(pEffectName)->setGlobalEnvColor(color1, color2, color3, -1); } - void emitEffectHit(LiveActor *pActor, const TVec3f &a2, const char *pEffectName) { + void emitEffectHit(LiveActor* pActor, const TVec3f& a2, const char* pEffectName) { if (!pEffectName) { pEffectName = "HitMarkNormal"; } pActor->mEffectKeeper->createEmitter(pEffectName)->setGlobalTranslation(a2, -1); } - void emitEffectHit(LiveActor *pActor, const TVec3f &a2, const TVec3f &a3, const char *pEffectName) { + void emitEffectHit(LiveActor* pActor, const TVec3f& a2, const TVec3f& a3, const char* pEffectName) { if (!pEffectName) { pEffectName = "HitMarkNormal"; } @@ -190,34 +186,33 @@ namespace MR { pActor->mEffectKeeper->createEmitter(pEffectName)->setGlobalSRTMatrix(SRTMatrix, -1); } - void emitEffectHit(LiveActor *pActor, MtxPtr mtx, const char *pEffectName) { + void emitEffectHit(LiveActor* pActor, MtxPtr mtx, const char* pEffectName) { if (!pEffectName) { pEffectName = "HitMarkNormal"; } pActor->mEffectKeeper->createEmitter(pEffectName)->setGlobalSRTMatrix(mtx, -1); } - void emitEffectHitBetweenSensors(LiveActor *pActor, const HitSensor *pSensor1, const HitSensor *pSensor2, f32 flt, const char *pEffectName) { + void emitEffectHitBetweenSensors(LiveActor* pActor, const HitSensor* pSensor1, const HitSensor* pSensor2, f32 flt, const char* pEffectName) { TVec3f vecBetween; calcPosBetweenSensors(&vecBetween, pSensor1, pSensor2, flt); emitEffectHit(pActor, vecBetween, pEffectName); } - void initEffectAfterPlacement(LiveActor *pActor) { + void initEffectAfterPlacement(LiveActor* pActor) { EffectKeeper* pEffectKeeper = pActor->mEffectKeeper; pEffectKeeper->initAfterPlacementForAttributeEffect(pActor->getBaseMtx()); } - void updateEffectFloorCode(LiveActor *pActor, const Triangle *pTriangle) { + void updateEffectFloorCode(LiveActor* pActor, const Triangle* pTriangle) { pActor->mEffectKeeper->updateFloorCode(pTriangle); } - void updateEffectFloorCodeLineToMap(LiveActor *pActor, const TVec3f &a2, const TVec3f &a3) { + void updateEffectFloorCodeLineToMap(LiveActor* pActor, const TVec3f& a2, const TVec3f& a3) { Triangle tri = Triangle(); if (getFirstPolyOnLineToMap(nullptr, &tri, a2, a3)) { pActor->mEffectKeeper->updateFloorCode(&tri); - } - else { + } else { pActor->mEffectKeeper->updateFloorCode(nullptr); } } @@ -233,10 +228,10 @@ namespace MR { } */ // Not byte-matching but does the same thing - void initEffectSyncBck(LiveActor *pActor, const char *pEffectName, const char* const *pStrList) { - int i = 0; - const char* const *tempStrList = pStrList; - const char* str; + void initEffectSyncBck(LiveActor* pActor, const char* pEffectName, const char* const* pStrList) { + int i = 0; + const char* const* tempStrList = pStrList; + const char* str; while (str = tempStrList[0], tempStrList = &tempStrList[1], str) { i++; } @@ -251,10 +246,10 @@ namespace MR { } // Instructionswap for some reason - void addEffectHitNormal(LiveActor *pActor, const char *pEffectName) { + void addEffectHitNormal(LiveActor* pActor, const char* pEffectName) { pActor->mEffectKeeper->addEffect("HitMarkNormal", pActor); if (pEffectName) { pActor->mEffectKeeper->changeEffectName("HitMarkNormal", pEffectName); } } -}; +}; // namespace MR diff --git a/src/Game/Util/EventUtil.cpp b/src/Game/Util/EventUtil.cpp index 82339ebf9..c0d302621 100644 --- a/src/Game/Util/EventUtil.cpp +++ b/src/Game/Util/EventUtil.cpp @@ -20,7 +20,7 @@ namespace { ScenePlayingResult* getScenePlayingResult() { return MR::getSceneObj(SceneObj_ScenePlayingResult); } -}; +}; // namespace namespace MR { s32 getPlayerLeft() { @@ -73,8 +73,7 @@ namespace MR { void addStarPiece(int num) { if (MR::isStageAstroLocation()) { GameDataFunction::addStockedStarPiece(num); - } - else { + } else { getScenePlayingResult()->incStarPiece(num); } } @@ -266,7 +265,7 @@ namespace MR { bool isUFOKinokoUnderConstruction() { return !GameDataFunction::isOnGameEventFlag("EventKinopioExplorerOrganize"); } - + bool isButlerMapAppear() { return GameDataFunction::hasGrandStar(2); } @@ -382,10 +381,9 @@ namespace MR { if (GameSequenceFunction::hasStageResultSequence()) { openedAstroDomeNum = GameDataFunction::calcGrandStarNum(GameDataFunction::getSceneStartGameDataHolder()); - } - else { + } else { openedAstroDomeNum = GameDataFunction::calcGrandStarNum(GameDataFunction::getCurrentGameDataHolder()); - } + } if (GameDataFunction::hasGrandStar(7)) { openedAstroDomeNum -= 1; @@ -444,8 +442,8 @@ namespace MR { s32 registerStorageSpinDriverPathDrawRange(const NameObj* pParam1, const JMapInfoIter& rIter, int param3, f32* pParam4) { const char* pStageName = MR::getCurrentStageName(); - int scenarioNo = MR::getCurrentScenarioNo(); - int zoneId = MR::getPlacedZoneId(rIter); + int scenarioNo = MR::getCurrentScenarioNo(); + int zoneId = MR::getPlacedZoneId(rIter); if (param3 <= 0) { return -1; @@ -456,7 +454,7 @@ namespace MR { void updateStorageSpinDriverPathDrawRange(int param1, f32 param2) { const char* pStageName = MR::getCurrentStageName(); - s32 scenarioNo = MR::getCurrentScenarioNo(); + s32 scenarioNo = MR::getCurrentScenarioNo(); GameDataFunction::updateStorageSpinDriverPathDrawRange(pStageName, scenarioNo, param1, param2); } @@ -517,16 +515,16 @@ namespace MR { bool canAppearNormalComet(const char* pGalaxyName) { GalaxyStatusAccessor accessor = MR::makeGalaxyStatusAccessor(pGalaxyName); - bool isOnComet = GameDataFunction::isOnGameEventFlagNormalComet(pGalaxyName); - bool hasPowerStar = GameDataFunction::hasPowerStar(pGalaxyName, accessor.getNormalCometScenarioNo()); + bool isOnComet = GameDataFunction::isOnGameEventFlagNormalComet(pGalaxyName); + bool hasPowerStar = GameDataFunction::hasPowerStar(pGalaxyName, accessor.getNormalCometScenarioNo()); return isOnComet && !hasPowerStar; } bool canAppearCoin100Comet(const char* pGalaxyName) { GalaxyStatusAccessor accessor = MR::makeGalaxyStatusAccessor(pGalaxyName); - bool isOnComet = GameDataFunction::isOnGameEventFlagCoin100Comet(pGalaxyName); - bool hasPowerStar = GameDataFunction::hasPowerStar(pGalaxyName, accessor.getCoin100CometScenarioNo()); + bool isOnComet = GameDataFunction::isOnGameEventFlagCoin100Comet(pGalaxyName); + bool hasPowerStar = GameDataFunction::hasPowerStar(pGalaxyName, accessor.getCoin100CometScenarioNo()); return isOnComet && !hasPowerStar; } @@ -583,8 +581,8 @@ namespace MR { bool isStarComplete(const char* pGalaxyName) { GalaxyStatusAccessor aAccessor = MR::makeGalaxyStatusAccessor(pGalaxyName); GalaxyStatusAccessor bAccessor = MR::makeGalaxyStatusAccessor(pGalaxyName); - s32 powerStarNumOwned = bAccessor.getPowerStarNumOwned(); - s32 powerStarNum = aAccessor.getPowerStarNum(); + s32 powerStarNumOwned = bAccessor.getPowerStarNumOwned(); + s32 powerStarNum = aAccessor.getPowerStarNum(); return powerStarNumOwned == powerStarNum; } @@ -612,7 +610,7 @@ namespace MR { s32 getCoinBestScore(const char* pGalaxyName) { GalaxyStatusAccessor accessor = MR::makeGalaxyStatusAccessor(pGalaxyName); - s32 coinBestScore = 0; + s32 coinBestScore = 0; for (s32 i = 1; i <= accessor.getPowerStarNum(); i++) { if (!MR::isPlacedCoin(pGalaxyName, i)) { @@ -631,7 +629,7 @@ namespace MR { bool isPlacedCoin(const char* pGalaxyName, s32 scenarioNo) { GalaxyStatusAccessor accessor = MR::makeGalaxyStatusAccessor(pGalaxyName); - const char* pCometName = accessor.getCometName(scenarioNo); + const char* pCometName = accessor.getCometName(scenarioNo); return pCometName == nullptr || !MR::isEqualString(pCometName, "Dark"); } @@ -661,9 +659,8 @@ namespace MR { } bool isOnLuigiHiding() { - s32 scenarioNo = MR::getCurrentSelectedScenarioNo(); - bool v1 = scenarioNo != -1 - && GameDataConst::isPowerStarLuigiHas(MR::getCurrentStageName(), scenarioNo); + s32 scenarioNo = MR::getCurrentSelectedScenarioNo(); + bool v1 = scenarioNo != -1 && GameDataConst::isPowerStarLuigiHas(MR::getCurrentStageName(), scenarioNo); if (v1) { return true; @@ -677,15 +674,14 @@ namespace MR { return false; } - s32 scenarioNo = MR::getCurrentSelectedScenarioNo(); - bool v1 = scenarioNo != -1 - && GameDataConst::isPowerStarLuigiHas(MR::getCurrentStageName(), scenarioNo); + s32 scenarioNo = MR::getCurrentSelectedScenarioNo(); + bool v1 = scenarioNo != -1 && GameDataConst::isPowerStarLuigiHas(MR::getCurrentStageName(), scenarioNo); if (v1) { return true; } - s32 starId = 0; + s32 starId = 0; const char* pHidingGalaxyName = nullptr; GameSequenceFunction::getLuigiHidingGalaxyNameAndStarId(&pHidingGalaxyName, &starId); @@ -698,8 +694,7 @@ namespace MR { if (isLuigiDisappearFromAstroGalaxy) { return MR::isOnLuigiHiding(); - } - else { + } else { return isLuigiDisappearFromAstroGalaxy; } } @@ -709,8 +704,7 @@ namespace MR { if (isLuigiDisappearFromAstroGalaxy) { return !MR::isOnLuigiHiding(); - } - else { + } else { return isLuigiDisappearFromAstroGalaxy; } } @@ -730,7 +724,7 @@ namespace MR { // FIXME: Improper stack accesses. const char* getLuigiLetterGalaxyNameForNPC() { - s32 starId; + s32 starId; const char* pGalaxyName; if (GameSequenceFunction::isLuigiDisappearFromAstroGalaxy() || MR::isOnLuigiHiding()) { @@ -899,21 +893,17 @@ namespace MR { s32 getPowerStarLeftToDisplayCountDownPlate() { s32 powerStarNumTarget = MR::isOnGameEventFlagGalaxyOpen("ViewNormalEnding") - ? GameDataFunction::getPowerStarNumMax() - 1 - : GameDataConst::getPowerStarNumToOpenGalaxy("KoopaBattleVs3Galaxy"); + ? GameDataFunction::getPowerStarNumMax() - 1 + : GameDataConst::getPowerStarNumToOpenGalaxy("KoopaBattleVs3Galaxy"); s32 powerStarLeft = powerStarNumTarget - GameDataFunction::calcCurrentPowerStarNum(); if (powerStarLeft < 0) { powerStarLeft = 0; - } - else if (powerStarLeft > powerStarNumTarget) { + } else if (powerStarLeft > powerStarNumTarget) { powerStarLeft = powerStarNumTarget; } - if (GameDataFunction::isEqualJustPowerStarNum(powerStarNumTarget) - || GameDataFunction::isOnJustGameEventFlag("SpecialStarGrand5") - && powerStarLeft == 0) - { + if (GameDataFunction::isEqualJustPowerStarNum(powerStarNumTarget) || GameDataFunction::isOnJustGameEventFlag("SpecialStarGrand5") && powerStarLeft == 0) { powerStarLeft += 1; } @@ -945,8 +935,7 @@ namespace MR { GameEventFlagAccessor accessor = GameEventFlagTable::makeAccessor(key); - return MR::isOnGameEventFlagGalaxyOpen(accessor.getGalaxyName()) - && !MR::isOnGameEventFlagGalaxyOpen(key); + return MR::isOnGameEventFlagGalaxyOpen(accessor.getGalaxyName()) && !MR::isOnGameEventFlagGalaxyOpen(key); } bool isGalaxyRedCometAppearInCurrentStage() { @@ -991,4 +980,4 @@ namespace MR { void onMsgLedPattern() { GameDataFunction::setGameEventValue("MsgLedPattern", 1); } -}; +}; // namespace MR diff --git a/src/Game/Util/FileUtil.cpp b/src/Game/Util/FileUtil.cpp index 5c681c28a..01187863d 100644 --- a/src/Game/Util/FileUtil.cpp +++ b/src/Game/Util/FileUtil.cpp @@ -4,7 +4,6 @@ #include "Game/Util.hpp" #include "Game/SingletonHolder.hpp" - #include #include "Game/Util/SystemUtil.hpp" #include "JSystem/JKernel/JKRArchive.hpp" @@ -16,26 +15,24 @@ namespace MR { extern const char* getCurrentLanguagePrefix(); - bool isFileExist(const char *pFile, bool considerLanguage) { + bool isFileExist(const char* pFile, bool considerLanguage) { s32 entryNum; if (considerLanguage) { entryNum = MR::convertPathToEntrynumConsideringLanguage(pFile); - } - else { + } else { entryNum = DVDConvertPathToEntrynum(pFile); } return entryNum >= 0; } - u32 getFileSize(const char *pFile, bool considerLanguage) { + u32 getFileSize(const char* pFile, bool considerLanguage) { s32 entryNum; if (considerLanguage) { entryNum = MR::convertPathToEntrynumConsideringLanguage(pFile); - } - else { + } else { entryNum = DVDConvertPathToEntrynum(pFile); } @@ -47,7 +44,7 @@ namespace MR { return size; } - s32 convertPathToEntrynumConsideringLanguage(const char *pFile) { + s32 convertPathToEntrynumConsideringLanguage(const char* pFile) { const char* langPrefix = getCurrentLanguagePrefix(); char buf[0x100]; @@ -57,26 +54,23 @@ namespace MR { snprintf(buf, sizeof(buf), "%s", pFile); } - return DVDConvertPathToEntrynum(buf); } void* loadToMainRAM( - const char *pFile, - u8 *pData, - JKRHeap *pHeap, - JKRDvdRipper::EAllocDirection allocDir - ) { + const char* pFile, + u8* pData, + JKRHeap* pHeap, + JKRDvdRipper::EAllocDirection allocDir) { MR::loadAsyncToMainRAM(pFile, pData, pHeap, allocDir); return MR::receiveFile(pFile); } void loadAsyncToMainRAM( - const char *pFile, - u8 *pData, - JKRHeap *pHeap, - JKRDvdRipper::EAllocDirection allocDir - ) { + const char* pFile, + u8* pData, + JKRHeap* pHeap, + JKRDvdRipper::EAllocDirection allocDir) { const char* langPrefix = getCurrentLanguagePrefix(); char buf[0x100]; @@ -87,20 +81,19 @@ namespace MR { } SingletonHolder::get()->requestLoadToMainRAM( - buf, - pData, - pHeap, - allocDir, - false - ); + buf, + pData, + pHeap, + allocDir, + false); } - void* mountArchive(const char *pFile, JKRHeap *pHeap) { + void* mountArchive(const char* pFile, JKRHeap* pHeap) { MR::mountAsyncArchive(pFile, pHeap); return MR::receiveArchive(pFile); } - void mountAsyncArchive(const char *pFile, JKRHeap *pHeap) { + void mountAsyncArchive(const char* pFile, JKRHeap* pHeap) { const char* langPrefix = getCurrentLanguagePrefix(); char buf[0x100]; @@ -113,41 +106,37 @@ namespace MR { SingletonHolder::get()->requestMountArchive(buf, pHeap, false); } - void mountAsyncArchiveByObjectOrLayoutName(const char *pFile, JKRHeap *pHeap) { + void mountAsyncArchiveByObjectOrLayoutName(const char* pFile, JKRHeap* pHeap) { JKRHeap* heap; if (pHeap) { heap = pHeap; - } - else { + } else { heap = MR::getAproposHeapForSceneArchive(0.029999999f); } char objArch[0x100]; bool objArchiveName = MR::makeObjectArchiveFileNameFromPrefix( - objArch, - sizeof(objArch), - pFile, - false - ); + objArch, + sizeof(objArch), + pFile, + false); char layArch[0x100]; bool layoutArchiveName = MR::makeLayoutArchiveFileNameFromPrefix( - layArch, - sizeof(layArch), - pFile, - false - ); + layArch, + sizeof(layArch), + pFile, + false); if (objArchiveName) { MR::mountAsyncArchive(objArch, heap); - } - else if (layoutArchiveName) { + } else if (layoutArchiveName) { MR::mountAsyncArchive(layArch, heap); } } - void* receiveFile(const char *pFile) { + void* receiveFile(const char* pFile) { const char* langPrefix = getCurrentLanguagePrefix(); char buf[0x100]; @@ -160,7 +149,7 @@ namespace MR { return SingletonHolder::get()->receiveFile(buf); } - void* receiveArchive(const char *pFile) { + void* receiveArchive(const char* pFile) { const char* langPrefix = getCurrentLanguagePrefix(); char buf[0x100]; @@ -177,11 +166,11 @@ namespace MR { SingletonHolder::get()->receiveAllRequestedFile(); } - void* createAndAddArchive(void *pData, JKRHeap *pHeap, const char *pFile) { + void* createAndAddArchive(void* pData, JKRHeap* pHeap, const char* pFile) { return SingletonHolder::get()->createAndAddArchive(pData, pHeap, pFile); } - void getMountedArchiveAndHeap(const char *pFile, JKRArchive **pArchive, JKRHeap **pHeap) { + void getMountedArchiveAndHeap(const char* pFile, JKRArchive** pArchive, JKRHeap** pHeap) { const char* langPrefix = getCurrentLanguagePrefix(); char buf[0x100]; @@ -194,7 +183,7 @@ namespace MR { SingletonHolder::get()->getMountedArchiveAndHeap(buf, pArchive, pHeap); } - void removeFileConsideringLanguage(const char *pFile) { + void removeFileConsideringLanguage(const char* pFile) { const char* langPrefix = getCurrentLanguagePrefix(); char buf[0x100]; @@ -207,53 +196,44 @@ namespace MR { SingletonHolder::get()->removeFile(buf); } - void MR::removeResourceAndFileHolderIfIsEqualHeap(JKRHeap* heap) - { + void MR::removeResourceAndFileHolderIfIsEqualHeap(JKRHeap* heap) { SingletonHolder::get()->removeIfIsEqualHeap(heap); SingletonHolder::get()->removeHolderIfIsEqualHeap(heap); } - void *MR::decompressFileFromArchive( - JKRArchive *archive, - const char *filename, - JKRHeap *heap, - int align - ) - { + void* MR::decompressFileFromArchive( + JKRArchive* archive, + const char* filename, + JKRHeap* heap, + int align) { u8* fileData = (u8*)archive->getResource(filename); s32 compressionType = FileRipper::checkCompressed(fileData); u32 fileSize = archive->getResSize(fileData); - + u32 adjustedFileSize = fileSize; - + if (compressionType == 2) //Yaz0 { - u32 decompressedSize = - (fileData[4] << 24) - | (fileData[5] << 16) - | (fileData[6] << 8) - | fileData[7]; + u32 decompressedSize = + (fileData[4] << 24) | (fileData[5] << 16) | (fileData[6] << 8) | fileData[7]; adjustedFileSize = decompressedSize; } - + u8* buffer = new (heap, align) u8[adjustedFileSize]; - + JKRMemArchive::fetchResource_subroutine( - fileData, - fileSize, - buffer, - adjustedFileSize, - compressionType - ); - + fileData, + fileSize, + buffer, + adjustedFileSize, + compressionType); + return buffer; } - - - bool isLoadedFile(const char *pFile) { - const char* langPrefix = getCurrentLanguagePrefix(); + bool isLoadedFile(const char* pFile) { + const char* langPrefix = getCurrentLanguagePrefix(); char buf[0x100]; MR::addFilePrefix(buf, sizeof(buf), pFile, langPrefix); @@ -265,8 +245,8 @@ namespace MR { return SingletonHolder::get()->isLoaded(buf); } - bool isMountedArchive(const char *pFile) { - const char* langPrefix = getCurrentLanguagePrefix(); + bool isMountedArchive(const char* pFile) { + const char* langPrefix = getCurrentLanguagePrefix(); char buf[0x100]; MR::addFilePrefix(buf, sizeof(buf), pFile, langPrefix); @@ -278,7 +258,7 @@ namespace MR { return SingletonHolder::get()->isMountedArchive(buf); } - bool isLoadedObjectOrLayoutArchive(const char *pFile) { + bool isLoadedObjectOrLayoutArchive(const char* pFile) { char objFile[0x100]; bool obj_arch = MR::makeObjectArchiveFileNameFromPrefix(objFile, sizeof(objFile), pFile, false); @@ -287,13 +267,12 @@ namespace MR { if (obj_arch) { return MR::isLoadedFile(objFile); - } - else { + } else { return MR::isLoadedFile(archFile); } } - void makeFileNameConsideringLanguage(char *pName, u32 length, const char *pFile) { + void makeFileNameConsideringLanguage(char* pName, u32 length, const char* pFile) { const char* langPrefix = getCurrentLanguagePrefix(); MR::addFilePrefix(pName, length, pFile, langPrefix); @@ -303,7 +282,7 @@ namespace MR { } } - bool makeObjectArchiveFileName(char *pName, u32 length, const char *pFile) { + bool makeObjectArchiveFileName(char* pName, u32 length, const char* pFile) { snprintf(pName, length, "/ObjectData/%s", pFile); if (MR::isFileExist(pName, true)) { @@ -321,9 +300,9 @@ namespace MR { } bool makeObjectArchiveFileNameFromPrefix( - char *pName, - u32 length, - const char *pFile, + char* pName, + u32 length, + const char* pFile, bool /*unused*/ ) { char buf[0x100]; @@ -331,7 +310,7 @@ namespace MR { return MR::makeObjectArchiveFileName(pName, length, buf); } - bool makeLayoutArchiveFileName(char *pName, u32 length, const char *pFile) { + bool makeLayoutArchiveFileName(char* pName, u32 length, const char* pFile) { snprintf(pName, length, "/Region/LayoutData/%s", pFile); if (MR::isFileExist(pName, false)) { @@ -349,29 +328,27 @@ namespace MR { } bool MR::makeLayoutArchiveFileNameFromPrefix( - char *pName, - u32 length, - const char *pFile, - bool fallback - ) { - char buf[0x40]; - + char* pName, + u32 length, + const char* pFile, + bool fallback) { + char buf[0x40]; + snprintf(buf, sizeof(buf), "%s.arc", pFile); bool hasBaseFile = MR::makeLayoutArchiveFileName(pName, length, buf); - - const char *aspectSuffix = MR::isScreen16Per9() ? "16x9" : "4x3"; + + const char* aspectSuffix = MR::isScreen16Per9() ? "16x9" : "4x3"; snprintf(buf, sizeof(buf), "%s%s.arc", pFile, aspectSuffix); bool hasAspectFile = MR::makeLayoutArchiveFileName(pName, length, buf); - + snprintf(buf, sizeof(buf), "%sReplace.arc", pFile); bool hasReplaceFile = MR::makeLayoutArchiveFileName(pName, length, buf); - + bool fileFound = hasBaseFile || hasAspectFile || hasReplaceFile; - + if (!fileFound && !fallback) { return false; - } - else { + } else { if (hasAspectFile) { aspectSuffix = MR::isScreen16Per9() ? "16x9" : "4x3"; snprintf(buf, sizeof(buf), "%s%s.arc", pFile, aspectSuffix); @@ -380,16 +357,13 @@ namespace MR { } else { snprintf(buf, sizeof(buf), "%s.arc", pFile); } - + MR::makeLayoutArchiveFileName(pName, length, buf); return true; } } - - - - void makeScenarioArchiveFileName(char *pName, u32 length, const char *pFile) { + void makeScenarioArchiveFileName(char* pName, u32 length, const char* pFile) { snprintf(pName, length, "/StageData/%s/%sScenario.arc", pFile, pFile); } -}; +}; // namespace MR diff --git a/src/Game/Util/FixedPosition.cpp b/src/Game/Util/FixedPosition.cpp index a93880487..e75705a26 100644 --- a/src/Game/Util/FixedPosition.cpp +++ b/src/Game/Util/FixedPosition.cpp @@ -1,17 +1,17 @@ #include "Game/Util.hpp" #include "Game/LiveActor/LiveActor.hpp" -FixedPosition::FixedPosition(const LiveActor *pActor, const char *pJointName, const TVec3f &rLocalTrans, const TVec3f &a4) { +FixedPosition::FixedPosition(const LiveActor* pActor, const char* pJointName, const TVec3f& rLocalTrans, const TVec3f& a4) { MtxPtr jointMtx = MR::getJointMtx(pActor, pJointName); init(jointMtx, rLocalTrans, a4); } -FixedPosition::FixedPosition(const LiveActor *pActor, const TVec3f &rLocalTrans, const TVec3f &a3) { +FixedPosition::FixedPosition(const LiveActor* pActor, const TVec3f& rLocalTrans, const TVec3f& a3) { MtxPtr baseMtx = pActor->getBaseMtx(); init(baseMtx, rLocalTrans, a3); } -FixedPosition::FixedPosition(MtxPtr mtx, const TVec3f &rLocalTrans, const TVec3f &a3) { +FixedPosition::FixedPosition(MtxPtr mtx, const TVec3f& rLocalTrans, const TVec3f& a3) { init(mtx, rLocalTrans, a3); } @@ -21,11 +21,11 @@ void FixedPosition::setBaseMtx(MtxPtr mtx) { mBaseMtx = mtx; } -void FixedPosition::setLocalTrans(const TVec3f &rLocalTrans) { +void FixedPosition::setLocalTrans(const TVec3f& rLocalTrans) { mLocalTrans.set(rLocalTrans); } -void FixedPosition::init(MtxPtr mtx, const TVec3f &rLocalTrans, const TVec3f &a3) { +void FixedPosition::init(MtxPtr mtx, const TVec3f& rLocalTrans, const TVec3f& a3) { mBaseMtx = mtx; mLocalTrans.set(rLocalTrans); _10.set(a3); diff --git a/src/Game/Util/GamePadUtil.cpp b/src/Game/Util/GamePadUtil.cpp index 7d74a1096..45d1b0a7c 100644 --- a/src/Game/Util/GamePadUtil.cpp +++ b/src/Game/Util/GamePadUtil.cpp @@ -85,18 +85,7 @@ namespace MR { } bool testPadButtonAnyWithoutHome(s32 channel) { - return testCorePadButtonUp(channel) - || testCorePadButtonDown(channel) - || testCorePadButtonLeft(channel) - || testCorePadButtonRight(channel) - || testCorePadButtonA(channel) - || testCorePadButtonB(channel) - || testCorePadButton1(channel) - || testCorePadButton2(channel) - || testCorePadButtonPlus(channel) - || testCorePadButtonMinus(channel) - || testSubPadButtonC(channel) - || testSubPadButtonZ(channel); + return testCorePadButtonUp(channel) || testCorePadButtonDown(channel) || testCorePadButtonLeft(channel) || testCorePadButtonRight(channel) || testCorePadButtonA(channel) || testCorePadButtonB(channel) || testCorePadButton1(channel) || testCorePadButton2(channel) || testCorePadButtonPlus(channel) || testCorePadButtonMinus(channel) || testSubPadButtonC(channel) || testSubPadButtonZ(channel); } bool testCorePadTriggerUp(s32 channel) { @@ -140,16 +129,7 @@ namespace MR { } bool testCorePadTriggerAnyWithoutHome(s32 channel) { - return testCorePadTriggerUp(channel) - || testCorePadTriggerDown(channel) - || testCorePadTriggerLeft(channel) - || testCorePadTriggerRight(channel) - || testCorePadTriggerA(channel) - || testCorePadTriggerB(channel) - || testCorePadTrigger1(channel) - || testCorePadTrigger2(channel) - || testCorePadTriggerPlus(channel) - || testCorePadTriggerMinus(channel); + return testCorePadTriggerUp(channel) || testCorePadTriggerDown(channel) || testCorePadTriggerLeft(channel) || testCorePadTriggerRight(channel) || testCorePadTriggerA(channel) || testCorePadTriggerB(channel) || testCorePadTrigger1(channel) || testCorePadTrigger2(channel) || testCorePadTriggerPlus(channel) || testCorePadTriggerMinus(channel); } bool testCorePadTriggerHome(s32 channel) { @@ -307,10 +287,10 @@ namespace MR { return pWPad->mButton->testButtonB(); } -}; +}; // namespace MR namespace WPadFunction { WPadRumble* getWPadRumble(s32 channel) { return MR::getWPad(channel)->getRumbleInstance(); } -}; +}; // namespace WPadFunction diff --git a/src/Game/Util/GravityUtil.cpp b/src/Game/Util/GravityUtil.cpp index fb02c32d1..542ce87f2 100644 --- a/src/Game/Util/GravityUtil.cpp +++ b/src/Game/Util/GravityUtil.cpp @@ -6,166 +6,160 @@ #include namespace { - void getJMapInfoArgPlus(const JMapInfoIter &rIter, const char *pFieldName, f32 *pDest) { + void getJMapInfoArgPlus(const JMapInfoIter& rIter, const char* pFieldName, f32* pDest) { + } - } + void getJMapInfoArgPlus(const JMapInfoIter& rIter, const char* pFieldName, s32* pDest) { + // Get row and column of data + s32 row = rIter.mIndex; + const JMapInfo* pInfo = rIter.mInfo; + s32 column = pInfo->searchItemInfo(pFieldName); - void getJMapInfoArgPlus(const JMapInfoIter &rIter, const char *pFieldName, s32 *pDest) { - // Get row and column of data - s32 row = rIter.mIndex; - const JMapInfo* pInfo = rIter.mInfo; - s32 column = pInfo->searchItemInfo(pFieldName); + // Try to read value + s32 result; + bool read = column < 0 ? false : pInfo->getValueFast(row, column, &result); - // Try to read value - s32 result; - bool read = column < 0 ? false : pInfo->getValueFast(row, column, &result); + // Set result if applicable + if (read && result >= 0.0f) { + *pDest = result; + } + } - // Set result if applicable - if (read && result >= 0.0f) { - *pDest = result; - } - } + bool calcGravityVectorOrZero(const NameObj* pActor, const TVec3f& rPosition, u32 gravityType, TVec3f* pDest, GravityInfo* pInfo, u32 host) { + if (!host) { + host = (u32)pActor; + } - bool calcGravityVectorOrZero(const NameObj *pActor, const TVec3f &rPosition, u32 gravityType, TVec3f * pDest, GravityInfo *pInfo, u32 host) { - if (!host) { - host = (u32)pActor; - } + PlanetGravityManager* pPlanetGravityManager = MR::getSceneObj(SceneObj_PlanetGravityManager); - PlanetGravityManager* pPlanetGravityManager - = MR::getSceneObj(SceneObj_PlanetGravityManager); - - return pPlanetGravityManager->calcTotalGravityVector(pDest, pInfo, rPosition, gravityType, host); - } -} + return pPlanetGravityManager->calcTotalGravityVector(pDest, pInfo, rPosition, gravityType, host); + } +} // namespace namespace MR { - void registerGravity(PlanetGravity *pGravity) { - MR::getSceneObj(SceneObj_PlanetGravityManager)->registerGravity(pGravity); - } + void registerGravity(PlanetGravity* pGravity) { + MR::getSceneObj(SceneObj_PlanetGravityManager)->registerGravity(pGravity); + } - bool calcGravityVector(const LiveActor *pActor, TVec3f *pDest, GravityInfo *pInfo, u32 host) { - u32 typeFlags = GRAVITY_TYPE_NORMAL; - return ::calcGravityVectorOrZero(pActor, pActor->mPosition, typeFlags, pDest, pInfo, host); - } + bool calcGravityVector(const LiveActor* pActor, TVec3f* pDest, GravityInfo* pInfo, u32 host) { + u32 typeFlags = GRAVITY_TYPE_NORMAL; + return ::calcGravityVectorOrZero(pActor, pActor->mPosition, typeFlags, pDest, pInfo, host); + } - bool calcGravityVector(const NameObj *pActor, const TVec3f &rPosition, TVec3f *pDest, GravityInfo *pInfo, u32 host) { - u32 typeFlags = GRAVITY_TYPE_NORMAL; - return ::calcGravityVectorOrZero(pActor, rPosition, typeFlags, pDest, pInfo, host); - } + bool calcGravityVector(const NameObj* pActor, const TVec3f& rPosition, TVec3f* pDest, GravityInfo* pInfo, u32 host) { + u32 typeFlags = GRAVITY_TYPE_NORMAL; + return ::calcGravityVectorOrZero(pActor, rPosition, typeFlags, pDest, pInfo, host); + } - bool calcDropShadowVector(const LiveActor *pActor, TVec3f *pDest, GravityInfo *pInfo, u32 host) { - u32 typeFlags = GRAVITY_TYPE_SHADOW; - return ::calcGravityVectorOrZero(pActor, pActor->mPosition, typeFlags, pDest, pInfo, host); - } + bool calcDropShadowVector(const LiveActor* pActor, TVec3f* pDest, GravityInfo* pInfo, u32 host) { + u32 typeFlags = GRAVITY_TYPE_SHADOW; + return ::calcGravityVectorOrZero(pActor, pActor->mPosition, typeFlags, pDest, pInfo, host); + } - bool calcDropShadowVector(const NameObj *pActor, const TVec3f &rPosition, TVec3f *pDest, GravityInfo *pInfo, u32 host) { - u32 typeFlags = GRAVITY_TYPE_SHADOW; - return ::calcGravityVectorOrZero(pActor, rPosition, typeFlags, pDest, pInfo, host); - } + bool calcDropShadowVector(const NameObj* pActor, const TVec3f& rPosition, TVec3f* pDest, GravityInfo* pInfo, u32 host) { + u32 typeFlags = GRAVITY_TYPE_SHADOW; + return ::calcGravityVectorOrZero(pActor, rPosition, typeFlags, pDest, pInfo, host); + } - bool calcGravityAndDropShadowVector(const LiveActor *pActor, TVec3f *pDest, GravityInfo *pInfo, u32 host) { - u32 typeFlags = GRAVITY_TYPE_NORMAL | GRAVITY_TYPE_SHADOW; - return ::calcGravityVectorOrZero(pActor, pActor->mPosition, typeFlags, pDest, pInfo, host); - } + bool calcGravityAndDropShadowVector(const LiveActor* pActor, TVec3f* pDest, GravityInfo* pInfo, u32 host) { + u32 typeFlags = GRAVITY_TYPE_NORMAL | GRAVITY_TYPE_SHADOW; + return ::calcGravityVectorOrZero(pActor, pActor->mPosition, typeFlags, pDest, pInfo, host); + } - bool calcGravityAndMagnetVector(const NameObj *pActor, const TVec3f &rPosition, TVec3f *pDest, GravityInfo *pInfo, u32 host) { - u32 typeFlags = GRAVITY_TYPE_NORMAL | GRAVITY_TYPE_MAGNET; - return ::calcGravityVectorOrZero(pActor, rPosition, typeFlags, pDest, pInfo, host); - } + bool calcGravityAndMagnetVector(const NameObj* pActor, const TVec3f& rPosition, TVec3f* pDest, GravityInfo* pInfo, u32 host) { + u32 typeFlags = GRAVITY_TYPE_NORMAL | GRAVITY_TYPE_MAGNET; + return ::calcGravityVectorOrZero(pActor, rPosition, typeFlags, pDest, pInfo, host); + } - bool calcGravityVectorOrZero(const LiveActor *pActor, TVec3f *pDest, GravityInfo *pInfo, u32 host) { - u32 typeFlags = GRAVITY_TYPE_NORMAL; - return ::calcGravityVectorOrZero(pActor, pActor->mPosition, typeFlags, pDest, pInfo, host); - } + bool calcGravityVectorOrZero(const LiveActor* pActor, TVec3f* pDest, GravityInfo* pInfo, u32 host) { + u32 typeFlags = GRAVITY_TYPE_NORMAL; + return ::calcGravityVectorOrZero(pActor, pActor->mPosition, typeFlags, pDest, pInfo, host); + } - bool calcGravityVectorOrZero(const NameObj *pActor, const TVec3f &rPosition, TVec3f *pDest, GravityInfo *pInfo, u32 host) { - u32 typeFlags = GRAVITY_TYPE_NORMAL; - return ::calcGravityVectorOrZero(pActor, rPosition, typeFlags, pDest, pInfo, host); - } + bool calcGravityVectorOrZero(const NameObj* pActor, const TVec3f& rPosition, TVec3f* pDest, GravityInfo* pInfo, u32 host) { + u32 typeFlags = GRAVITY_TYPE_NORMAL; + return ::calcGravityVectorOrZero(pActor, rPosition, typeFlags, pDest, pInfo, host); + } - bool calcDropShadowVectorOrZero(const NameObj *pActor, const TVec3f &rPosition, TVec3f *pDest, GravityInfo *pInfo, u32 host) { - u32 typeFlags = GRAVITY_TYPE_SHADOW; - return ::calcGravityVectorOrZero(pActor, rPosition, typeFlags, pDest, pInfo, host); - } + bool calcDropShadowVectorOrZero(const NameObj* pActor, const TVec3f& rPosition, TVec3f* pDest, GravityInfo* pInfo, u32 host) { + u32 typeFlags = GRAVITY_TYPE_SHADOW; + return ::calcGravityVectorOrZero(pActor, rPosition, typeFlags, pDest, pInfo, host); + } - bool calcGravityAndDropShadowVectorOrZero(const LiveActor *pActor, TVec3f *pDest, GravityInfo *pInfo, u32 host) { - u32 typeFlags = GRAVITY_TYPE_NORMAL | GRAVITY_TYPE_SHADOW; - return ::calcGravityVectorOrZero(pActor, pActor->mPosition, typeFlags, pDest, pInfo, host); - } + bool calcGravityAndDropShadowVectorOrZero(const LiveActor* pActor, TVec3f* pDest, GravityInfo* pInfo, u32 host) { + u32 typeFlags = GRAVITY_TYPE_NORMAL | GRAVITY_TYPE_SHADOW; + return ::calcGravityVectorOrZero(pActor, pActor->mPosition, typeFlags, pDest, pInfo, host); + } - bool calcAttractMarioLauncherOrZero(const LiveActor *pActor, TVec3f *pDest, GravityInfo *pInfo, u32 host) { - u32 typeFlags = GRAVITY_TYPE_MARIO_LAUNCHER; - return ::calcGravityVectorOrZero(pActor, pActor->mPosition, typeFlags, pDest, pInfo, host); - } + bool calcAttractMarioLauncherOrZero(const LiveActor* pActor, TVec3f* pDest, GravityInfo* pInfo, u32 host) { + u32 typeFlags = GRAVITY_TYPE_MARIO_LAUNCHER; + return ::calcGravityVectorOrZero(pActor, pActor->mPosition, typeFlags, pDest, pInfo, host); + } - bool isZeroGravity(const LiveActor *pActor) { - TVec3f dummyGravity; - return ::calcGravityVectorOrZero(pActor, pActor->mPosition, GRAVITY_TYPE_NORMAL, &dummyGravity, nullptr, 0) == false; - } + bool isZeroGravity(const LiveActor* pActor) { + TVec3f dummyGravity; + return ::calcGravityVectorOrZero(pActor, pActor->mPosition, GRAVITY_TYPE_NORMAL, &dummyGravity, nullptr, 0) == false; + } - bool isLightGravity(const GravityInfo &rInfo) { - PlanetGravity* pGravity = rInfo.mGravityInstance; - return !pGravity ? false : pGravity->mGravityPower == GRAVITY_POWER_LIGHT; - } + bool isLightGravity(const GravityInfo& rInfo) { + PlanetGravity* pGravity = rInfo.mGravityInstance; + return !pGravity ? false : pGravity->mGravityPower == GRAVITY_POWER_LIGHT; + } - void settingGravityParamFromJMap(PlanetGravity *pGravity, const JMapInfoIter &rIter) { - // Get range, distant and priority - f32 argRange = pGravity->mRange; - ::getJMapInfoArgPlus(rIter, "Range", &argRange); - f32 distant = pGravity->mDistant; - pGravity->mRange = argRange; - f32 argDistant = distant; - ::getJMapInfoArgPlus(rIter, "Distant", &argDistant); - s32 priority = pGravity->mPriority; - pGravity->mDistant = argDistant; - s32 argPriority = priority; - ::getJMapInfoArgPlus(rIter, "Priority", &argPriority); - pGravity->setPriority(argPriority); + void settingGravityParamFromJMap(PlanetGravity* pGravity, const JMapInfoIter& rIter) { + // Get range, distant and priority + f32 argRange = pGravity->mRange; + ::getJMapInfoArgPlus(rIter, "Range", &argRange); + f32 distant = pGravity->mDistant; + pGravity->mRange = argRange; + f32 argDistant = distant; + ::getJMapInfoArgPlus(rIter, "Distant", &argDistant); + s32 priority = pGravity->mPriority; + pGravity->mDistant = argDistant; + s32 argPriority = priority; + ::getJMapInfoArgPlus(rIter, "Priority", &argPriority); + pGravity->setPriority(argPriority); - // Get gravity ID - s32 gravityId = pGravity->mGravityId; - ::getJMapInfoArgPlus(rIter, "Gravity_id", &gravityId); - pGravity->mGravityId = gravityId; + // Get gravity ID + s32 gravityId = pGravity->mGravityId; + ::getJMapInfoArgPlus(rIter, "Gravity_id", &gravityId); + pGravity->mGravityId = gravityId; - // Get gravity type and power - getJMapInfoGravityType(rIter, pGravity); - getJMapInfoGravityPower(rIter, pGravity); + // Get gravity type and power + getJMapInfoGravityType(rIter, pGravity); + getJMapInfoGravityPower(rIter, pGravity); - // Check if gravity is inverse - s32 inverse = pGravity->mIsInverse != false; - ::getJMapInfoArgPlus(rIter, "Inverse", &inverse); - pGravity->mIsInverse = inverse; - } + // Check if gravity is inverse + s32 inverse = pGravity->mIsInverse != false; + ::getJMapInfoArgPlus(rIter, "Inverse", &inverse); + pGravity->mIsInverse = inverse; + } - void getJMapInfoGravityType(const JMapInfoIter &rIter, PlanetGravity *pGravity) { - const char *pType = nullptr; + void getJMapInfoGravityType(const JMapInfoIter& rIter, PlanetGravity* pGravity) { + const char* pType = nullptr; - if (rIter.getValue("Gravity_type", &pType)) { - if (!strcmp(pType, "Normal")) { - pGravity->mGravityType = GRAVITY_TYPE_NORMAL; - } - else if (!strcmp(pType, "Shadow")) { - pGravity->mGravityType = GRAVITY_TYPE_SHADOW; - } - else if (!strcmp(pType, "Magnet")) { - pGravity->mGravityType = GRAVITY_TYPE_MAGNET; - } - } - } + if (rIter.getValue("Gravity_type", &pType)) { + if (!strcmp(pType, "Normal")) { + pGravity->mGravityType = GRAVITY_TYPE_NORMAL; + } else if (!strcmp(pType, "Shadow")) { + pGravity->mGravityType = GRAVITY_TYPE_SHADOW; + } else if (!strcmp(pType, "Magnet")) { + pGravity->mGravityType = GRAVITY_TYPE_MAGNET; + } + } + } - void getJMapInfoGravityPower(const JMapInfoIter &rIter, PlanetGravity *pGravity) { - const char *pPower = nullptr; + void getJMapInfoGravityPower(const JMapInfoIter& rIter, PlanetGravity* pGravity) { + const char* pPower = nullptr; - if (rIter.getValue("Power", &pPower)) { - if (!strcmp(pPower, "Light")) { - pGravity->mGravityPower = GRAVITY_POWER_LIGHT; - } - else if (!strcmp(pPower, "Normal")) { - pGravity->mGravityPower = GRAVITY_POWER_NORMAL; - } - else if (!strcmp(pPower, "Heavy")) { - pGravity->mGravityPower = GRAVITY_POWER_HEAVY; - } - } - } -} + if (rIter.getValue("Power", &pPower)) { + if (!strcmp(pPower, "Light")) { + pGravity->mGravityPower = GRAVITY_POWER_LIGHT; + } else if (!strcmp(pPower, "Normal")) { + pGravity->mGravityPower = GRAVITY_POWER_NORMAL; + } else if (!strcmp(pPower, "Heavy")) { + pGravity->mGravityPower = GRAVITY_POWER_HEAVY; + } + } + } +} // namespace MR diff --git a/src/Game/Util/HashUtil.cpp b/src/Game/Util/HashUtil.cpp index 0da4615ff..e38326f5e 100644 --- a/src/Game/Util/HashUtil.cpp +++ b/src/Game/Util/HashUtil.cpp @@ -4,7 +4,7 @@ //needed here for inlining reasons inline int tolower(int c) { - return ((c < 0) || (c >= 0x100)) ? c : (int) (_current_locale.ctype_cmpt_ptr->lower_map_ptr[c]); + return ((c < 0) || (c >= 0x100)) ? c : (int)(_current_locale.ctype_cmpt_ptr->lower_map_ptr[c]); } HashSortTable::HashSortTable(u32 cnt) { @@ -17,13 +17,12 @@ HashSortTable::HashSortTable(u32 cnt) { mHasBeenSorted = false; } -bool HashSortTable::add(const char *pName, u32 a2, bool isValidSkip) { +bool HashSortTable::add(const char* pName, u32 a2, bool isValidSkip) { u32 hash = MR::getHashCode(pName); if (isValidSkip) { return addOrSkip(hash, a2); - } - else { + } else { return add(hash, a2); } } @@ -38,9 +37,9 @@ bool HashSortTable::add(u32 a1, u32 a2) { bool HashSortTable::addOrSkip(u32 a1, u32 a2) { for (u32 i = 0; i < mCurrentLength; i++) { - if (a1 == mHashCodes[i]) { - return false; - } + if (a1 == mHashCodes[i]) { + return false; + } } mHashCodes[mCurrentLength] = a1; @@ -76,8 +75,7 @@ void HashSortTable::sort() { if (upperByte > counter) { _C[counter] = 0xFFFF; _10[counter] = 0; - } - else if (upperByte == counter) { + } else if (upperByte == counter) { _C[counter] = counter2; counter2++; u32 counter3 = 1; @@ -110,7 +108,7 @@ void HashSortTable::sort() { mHasBeenSorted = true; } -bool HashSortTable::search(u32 a1, u32 *a2) { +bool HashSortTable::search(u32 a1, u32* a2) { u8 upperByte = a1 >> 24; if (a2 != nullptr) { @@ -144,19 +142,19 @@ bool HashSortTable::search(u32 a1, u32 *a2) { return false; } -bool HashSortTable::search(const char *a1, u32 *a2) { +bool HashSortTable::search(const char* a1, u32* a2) { u32 hash = MR::getHashCode(a1); return search(hash, a2); } -bool HashSortTable::search(const char *a1, const char *a2, u32 *a3) { +bool HashSortTable::search(const char* a1, const char* a2, u32* a3) { u32 hash = MR::getHashCode(a1) + MR::getHashCode(a2); return search(hash, a3); } -void HashSortTable::swap(const char *a1, const char *a2) { +void HashSortTable::swap(const char* a1, const char* a2) { u32 hash = MR::getHashCode(a1); for (int i = 0; i < mCurrentLength; i++) { @@ -170,7 +168,7 @@ void HashSortTable::swap(const char *a1, const char *a2) { } namespace MR { - u32 getHashCode(const char *pStr) { + u32 getHashCode(const char* pStr) { u32 hash; for (hash = 0; *pStr != '\0'; pStr++) { @@ -180,7 +178,7 @@ namespace MR { return hash; } - u32 getHashCodeLower(const char *pStr) { + u32 getHashCodeLower(const char* pStr) { u32 hash; for (hash = 0; *pStr != '\0'; pStr++) { @@ -189,4 +187,4 @@ namespace MR { return hash; } -}; +}; // namespace MR diff --git a/src/Game/Util/IKJoint.cpp b/src/Game/Util/IKJoint.cpp index a39ce4977..1ab4a9eee 100644 --- a/src/Game/Util/IKJoint.cpp +++ b/src/Game/Util/IKJoint.cpp @@ -1,7 +1,8 @@ #include "Game/Util/IKJoint.hpp" #include "Game/Util.hpp" -IKJoint::IKJoint() : mRootBoneLength(100.0f), mMiddleBoneLength(100.0f), _0(), _30(), _60() { +IKJoint::IKJoint() + : mRootBoneLength(100.0f), mMiddleBoneLength(100.0f), _0(), _30(), _60() { _0.identity(); _60.identity(); _30.identity(); @@ -15,7 +16,7 @@ void IKJoint::setMiddleBoneLength(f32 boneLength) { mMiddleBoneLength = boneLength; } -void IKJoint::setFirstPose(const TVec3f &a1, const TVec3f &a2) { +void IKJoint::setFirstPose(const TVec3f& a1, const TVec3f& a2) { MR::makeMtxSideUp(&_0, a1, a2); } @@ -24,15 +25,12 @@ s32 IKJoint::checkReachIKTarget(f32 a1, f32 a2, f32 a3) { if (a1 > (a2 + a3)) { res = 2; - } - else { + } else { if (a1 < __fabs(a2 - a3)) { res = 1; - } - else { + } else { return res; } - } return res; @@ -76,7 +74,7 @@ f32 IKJoint::calcIKRootAngleCosign(f32 a1, f32 a2, f32 a3) { // IKJoint::update -void IKJoint::updateByLocalRootAndWorldTarget(const TPos3f &a1, const TVec3f &a2, const TVec3f &a3) { +void IKJoint::updateByLocalRootAndWorldTarget(const TPos3f& a1, const TVec3f& a2, const TVec3f& a3) { TPos3f mtx = a1; mtx.invert(a1); TVec3f stack_14; @@ -86,8 +84,8 @@ void IKJoint::updateByLocalRootAndWorldTarget(const TPos3f &a1, const TVec3f &a2 // IKJoint::updateByLocalRootAndDirection -s32 IKJoint::updateByUpVector(const TVec3f &a1, const TVec3f &a2, const TVec3f &a3) { - f32 v9; +s32 IKJoint::updateByUpVector(const TVec3f& a1, const TVec3f& a2, const TVec3f& a3) { + f32 v9; TPos3f mtx; TVec3f sub = a2 - a1; MR::separateScalarAndDirection(&v9, &sub, sub); @@ -98,11 +96,11 @@ s32 IKJoint::updateByUpVector(const TVec3f &a1, const TVec3f &a2, const TVec3f & return v7; } -void IKJoint::getRootJointPosition(TVec3f *pPos) const { +void IKJoint::getRootJointPosition(TVec3f* pPos) const { _30.getTrans(*pPos); } -void IKJoint::getEndJointPosition(TVec3f *pPos) const { +void IKJoint::getEndJointPosition(TVec3f* pPos) const { TVec3f xDir; _60.getXDir(xDir); _60.getTrans(*pPos); diff --git a/src/Game/Util/JMapInfo.cpp b/src/Game/Util/JMapInfo.cpp index 408beeab5..606c31267 100644 --- a/src/Game/Util/JMapInfo.cpp +++ b/src/Game/Util/JMapInfo.cpp @@ -8,7 +8,6 @@ JMapInfo::JMapInfo() { } JMapInfo::~JMapInfo() { - } bool JMapInfo::attach(const void* pData) { @@ -40,7 +39,7 @@ s32 JMapInfo::searchItemInfo(const char* pKey) const { return i; } } - + return -1; } @@ -55,16 +54,16 @@ s32 JMapInfo::getValueType(const char* pItem) const { bool JMapInfo::getValueFast(int entryIndex, int itemIndex, const char** pValueOut) const { const JMapItem* item = &mData->mItems[itemIndex]; - const char* valuePtr = getEntryAddress(mData, mData->mDataOffset, entryIndex) + item->mOffsData; + const char* valuePtr = getEntryAddress(mData, mData->mDataOffset, entryIndex) + item->mOffsData; switch (item->mType) { - case JMAP_VALUE_TYPE_STRING_PTR: - const char* pStringTable = getEntryAddress(mData, mData->mDataOffset, getNumEntries()); - *pValueOut = pStringTable + *reinterpret_cast(valuePtr); - break; - default: - *pValueOut = valuePtr; - break; + case JMAP_VALUE_TYPE_STRING_PTR: + const char* pStringTable = getEntryAddress(mData, mData->mDataOffset, getNumEntries()); + *pValueOut = pStringTable + *reinterpret_cast(valuePtr); + break; + default: + *pValueOut = valuePtr; + break; } return true; @@ -72,22 +71,22 @@ bool JMapInfo::getValueFast(int entryIndex, int itemIndex, const char** pValueOu bool JMapInfo::getValueFast(int entryIndex, int itemIndex, u32* pValueOut) const { const JMapItem* item = &mData->mItems[itemIndex]; - const char* valuePtr = getEntryAddress(mData, mData->mDataOffset, entryIndex) + item->mOffsData; + const char* valuePtr = getEntryAddress(mData, mData->mDataOffset, entryIndex) + item->mOffsData; u32 rawValue; switch (item->mType) { - case JMAP_VALUE_TYPE_LONG: - case JMAP_VALUE_TYPE_LONG_2: - rawValue = *reinterpret_cast(valuePtr); - break; - case JMAP_VALUE_TYPE_SHORT: - rawValue = *reinterpret_cast(valuePtr); - break; - case JMAP_VALUE_TYPE_BYTE: - rawValue = *reinterpret_cast(valuePtr); - break; - default: - return false; + case JMAP_VALUE_TYPE_LONG: + case JMAP_VALUE_TYPE_LONG_2: + rawValue = *reinterpret_cast(valuePtr); + break; + case JMAP_VALUE_TYPE_SHORT: + rawValue = *reinterpret_cast(valuePtr); + break; + case JMAP_VALUE_TYPE_BYTE: + rawValue = *reinterpret_cast(valuePtr); + break; + default: + return false; } *pValueOut = (rawValue & item->mMask) >> item->mShift; @@ -100,28 +99,28 @@ bool JMapInfo::getValueFast(int entryIndex, int itemIndex, s32* pValueOut) const goto FAIL; } const char* valuePtr = getEntryAddress(mData, mData->mDataOffset, entryIndex) + item->mOffsData; - + switch (item->mType) { - case JMAP_VALUE_TYPE_LONG: - if (item->mMask == 0xffffffff) { - *pValueOut = *reinterpret_cast(valuePtr); - break; - } - goto FAIL; - case JMAP_VALUE_TYPE_SHORT: - if (item->mMask == 0xffff) { - *pValueOut = *reinterpret_cast(valuePtr); - break; - } - goto FAIL; - case JMAP_VALUE_TYPE_BYTE: - if (item->mMask == 0xff) { - *pValueOut = *reinterpret_cast(valuePtr); - break; - } - goto FAIL; - default: - goto FAIL; + case JMAP_VALUE_TYPE_LONG: + if (item->mMask == 0xffffffff) { + *pValueOut = *reinterpret_cast(valuePtr); + break; + } + goto FAIL; + case JMAP_VALUE_TYPE_SHORT: + if (item->mMask == 0xffff) { + *pValueOut = *reinterpret_cast(valuePtr); + break; + } + goto FAIL; + case JMAP_VALUE_TYPE_BYTE: + if (item->mMask == 0xff) { + *pValueOut = *reinterpret_cast(valuePtr); + break; + } + goto FAIL; + default: + goto FAIL; } return true; FAIL: @@ -129,7 +128,7 @@ FAIL: } JMapInfoIter MR::findJMapInfoElementNoCase(const JMapInfo* pInfo, const char* key, const char* searchValue, int startIndex) { - int entryIndex = startIndex; + int entryIndex = startIndex; const char* value; while (entryIndex < pInfo->getNumEntries()) { pInfo->getValue(entryIndex, key, &value); @@ -152,11 +151,9 @@ JMapInfoIter JMapInfo::findElementBinary(const char* key, const char* value) con int comparison = strcmp(nextVal, value); if (comparison == 0) { return JMapInfoIter(this, mid); - } - else if (comparison < 0) { + } else if (comparison < 0) { low = mid + 1; - } - else { + } else { high = mid; } } diff --git a/src/Game/Util/JMapUtil.cpp b/src/Game/Util/JMapUtil.cpp index b3d2ebb47..c81c74014 100644 --- a/src/Game/Util/JMapUtil.cpp +++ b/src/Game/Util/JMapUtil.cpp @@ -5,13 +5,13 @@ #include namespace { - bool getJMapInfoRailArg(const JMapInfoIter &rIter, const char *pName, s32 *pOut) NO_INLINE { - s32 val; + bool getJMapInfoRailArg(const JMapInfoIter& rIter, const char* pName, s32* pOut) NO_INLINE { + s32 val; bool hasValue = rIter.getValue(pName, &val); if (!hasValue) { return false; - } + } if (val != -1) { *pOut = val; @@ -21,13 +21,13 @@ namespace { return false; } - bool getJMapInfoArgNoInit(const JMapInfoIter &rIter, const char *pName, s32 *pOut) NO_INLINE { - s32 val; + bool getJMapInfoArgNoInit(const JMapInfoIter& rIter, const char* pName, s32* pOut) NO_INLINE { + s32 val; bool hasValue = rIter.getValue(pName, &val); if (!hasValue) { return false; - } + } if (val != -1) { *pOut = val; @@ -37,8 +37,8 @@ namespace { return false; } - bool getJMapInfoArgNoInit(const JMapInfoIter &rIter, const char *pName, f32 *pOut) NO_INLINE { - s32 val; + bool getJMapInfoArgNoInit(const JMapInfoIter& rIter, const char* pName, f32* pOut) NO_INLINE { + s32 val; bool hasValue = ::getJMapInfoArgNoInit(rIter, pName, &val); if (!hasValue) { @@ -47,34 +47,33 @@ namespace { *pOut = val; return true; - } + } - bool getJMapInfoArgNoInit(const JMapInfoIter &rIter, const char *pName, bool *pOut) NO_INLINE { - s32 val; + bool getJMapInfoArgNoInit(const JMapInfoIter& rIter, const char* pName, bool* pOut) NO_INLINE { + s32 val; bool hasValue = rIter.getValue(pName, &val); if (!hasValue) { return false; - } + } if (val != -1) { *pOut = true; - } - else { + } else { *pOut = false; } return true; } -}; +}; // namespace namespace MR { - bool isValidInfo(const JMapInfoIter &rIter) { + bool isValidInfo(const JMapInfoIter& rIter) { return rIter.isValid(); } - bool isObjectName(const JMapInfoIter &rIter, const char *pName) { - const char *objName = nullptr; + bool isObjectName(const JMapInfoIter& rIter, const char* pName) { + const char* objName = nullptr; if (MR::getObjectName(&objName, rIter)) { return MR::isEqualString(pName, objName); } @@ -82,24 +81,24 @@ namespace MR { return false; } - inline bool getArgAndInit(const JMapInfoIter &rIter, const char *pName, s32 *pOut) { + inline bool getArgAndInit(const JMapInfoIter& rIter, const char* pName, s32* pOut) { *pOut = -1; return ::getJMapInfoArgNoInit(rIter, pName, pOut); } - inline bool getArgAndInit(const JMapInfoIter &rIter, const char *pName, f32 *pOut) { + inline bool getArgAndInit(const JMapInfoIter& rIter, const char* pName, f32* pOut) { *pOut = -1.0f; return ::getJMapInfoArgNoInit(rIter, pName, pOut); } - inline bool getArgAndInit(const JMapInfoIter &rIter, const char *pName, bool *pOut) { + inline bool getArgAndInit(const JMapInfoIter& rIter, const char* pName, bool* pOut) { *pOut = false; return ::getJMapInfoArgNoInit(rIter, pName, pOut); } -}; +}; // namespace MR namespace MR { - bool getJMapInfoTrans(const JMapInfoIter &rIter, TVec3f *pOut) { + bool getJMapInfoTrans(const JMapInfoIter& rIter, TVec3f* pOut) { if (!getJMapInfoTransLocal(rIter, pOut)) { return false; } @@ -111,7 +110,7 @@ namespace MR { return true; } - bool getJMapInfoRotate(const JMapInfoIter &rIter, TVec3f *pOut) { + bool getJMapInfoRotate(const JMapInfoIter& rIter, TVec3f* pOut) { if (!getJMapInfoRotateLocal(rIter, pOut)) { return false; } @@ -126,13 +125,11 @@ namespace MR { pOut->x = std::atan2(-rotateMtx.mMtx[0][1], rotateMtx.mMtx[1][1]); pOut->y = -1.5707964f; pOut->z = 0.0f; - } - else if (rotateMtx.mMtx[2][0] + 1.0f <= 0.001f) { + } else if (rotateMtx.mMtx[2][0] + 1.0f <= 0.001f) { pOut->x = std::atan2(rotateMtx.mMtx[0][1], rotateMtx.mMtx[1][1]); pOut->y = 1.5707964f; pOut->z = 0.0f; - } - else { + } else { pOut->x = std::atan2(rotateMtx.mMtx[2][1], rotateMtx.mMtx[2][2]); pOut->z = std::atan2(rotateMtx.mMtx[1][0], rotateMtx.mMtx[0][0]); pOut->y = asin(-rotateMtx.mMtx[2][0]); @@ -145,11 +142,11 @@ namespace MR { stack_8.z *= 57.29578f; pOut->setPS(stack_8); } - + return true; } - bool getJMapInfoMatrixFromRT(const JMapInfoIter &rIter, TPos3f *pOut) { + bool getJMapInfoMatrixFromRT(const JMapInfoIter& rIter, TPos3f* pOut) { TVec3f trans; if (!getJMapInfoTrans(rIter, &trans)) { return false; @@ -164,185 +161,185 @@ namespace MR { return true; } - bool getJMapInfoArg0WithInit(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoArg0WithInit(const JMapInfoIter& rIter, s32* pOut) { return getArgAndInit(rIter, "Obj_arg0", pOut); } - bool getJMapInfoArg0WithInit(const JMapInfoIter &rIter, f32 *pOut) { + bool getJMapInfoArg0WithInit(const JMapInfoIter& rIter, f32* pOut) { return getArgAndInit(rIter, "Obj_arg0", pOut); } - bool getJMapInfoArg0WithInit(const JMapInfoIter &rIter, bool *pOut) { + bool getJMapInfoArg0WithInit(const JMapInfoIter& rIter, bool* pOut) { return getArgAndInit(rIter, "Obj_arg0", pOut); } - bool getJMapInfoArg1WithInit(const JMapInfoIter &rIter, f32 *pOut) { + bool getJMapInfoArg1WithInit(const JMapInfoIter& rIter, f32* pOut) { return getArgAndInit(rIter, "Obj_arg1", pOut); } - bool getJMapInfoArg1WithInit(const JMapInfoIter &rIter, bool *pOut) { + bool getJMapInfoArg1WithInit(const JMapInfoIter& rIter, bool* pOut) { return getArgAndInit(rIter, "Obj_arg1", pOut); } - bool getJMapInfoArg2WithInit(const JMapInfoIter &rIter, f32 *pOut) { + bool getJMapInfoArg2WithInit(const JMapInfoIter& rIter, f32* pOut) { return getArgAndInit(rIter, "Obj_arg2", pOut); } - bool getJMapInfoArg2WithInit(const JMapInfoIter &rIter, bool *pOut) { + bool getJMapInfoArg2WithInit(const JMapInfoIter& rIter, bool* pOut) { return getArgAndInit(rIter, "Obj_arg2", pOut); } - bool getJMapInfoArg3WithInit(const JMapInfoIter &rIter, f32 *pOut) { + bool getJMapInfoArg3WithInit(const JMapInfoIter& rIter, f32* pOut) { return getArgAndInit(rIter, "Obj_arg3", pOut); } - bool getJMapInfoArg3WithInit(const JMapInfoIter &rIter, bool *pOut) { + bool getJMapInfoArg3WithInit(const JMapInfoIter& rIter, bool* pOut) { return getArgAndInit(rIter, "Obj_arg3", pOut); } - bool getJMapInfoArg4WithInit(const JMapInfoIter &rIter, bool *pOut) { + bool getJMapInfoArg4WithInit(const JMapInfoIter& rIter, bool* pOut) { return getArgAndInit(rIter, "Obj_arg4", pOut); } - bool getJMapInfoArg7WithInit(const JMapInfoIter &rIter, bool *pOut) { + bool getJMapInfoArg7WithInit(const JMapInfoIter& rIter, bool* pOut) { return getArgAndInit(rIter, "Obj_arg7", pOut); } - bool getJMapInfoArg0NoInit(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoArg0NoInit(const JMapInfoIter& rIter, s32* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg0", pOut); } - bool getJMapInfoArg0NoInit(const JMapInfoIter &rIter, f32 *pOut) { + bool getJMapInfoArg0NoInit(const JMapInfoIter& rIter, f32* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg0", pOut); } - bool getJMapInfoArg0NoInit(const JMapInfoIter &rIter, bool *pOut) { + bool getJMapInfoArg0NoInit(const JMapInfoIter& rIter, bool* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg0", pOut); } - bool getJMapInfoArg1NoInit(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoArg1NoInit(const JMapInfoIter& rIter, s32* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg1", pOut); } - bool getJMapInfoArg1NoInit(const JMapInfoIter &rIter, f32 *pOut) { + bool getJMapInfoArg1NoInit(const JMapInfoIter& rIter, f32* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg1", pOut); } - bool getJMapInfoArg1NoInit(const JMapInfoIter &rIter, bool *pOut) { + bool getJMapInfoArg1NoInit(const JMapInfoIter& rIter, bool* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg1", pOut); } - bool getJMapInfoArg2NoInit(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoArg2NoInit(const JMapInfoIter& rIter, s32* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg2", pOut); } - bool getJMapInfoArg2NoInit(const JMapInfoIter &rIter, f32 *pOut) { + bool getJMapInfoArg2NoInit(const JMapInfoIter& rIter, f32* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg2", pOut); } - bool getJMapInfoArg2NoInit(const JMapInfoIter &rIter, bool *pOut) { + bool getJMapInfoArg2NoInit(const JMapInfoIter& rIter, bool* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg2", pOut); } - bool getJMapInfoArg3NoInit(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoArg3NoInit(const JMapInfoIter& rIter, s32* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg3", pOut); } - bool getJMapInfoArg3NoInit(const JMapInfoIter &rIter, f32 *pOut) { + bool getJMapInfoArg3NoInit(const JMapInfoIter& rIter, f32* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg3", pOut); } - bool getJMapInfoArg3NoInit(const JMapInfoIter &rIter, bool *pOut) { + bool getJMapInfoArg3NoInit(const JMapInfoIter& rIter, bool* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg3", pOut); } - bool getJMapInfoArg4NoInit(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoArg4NoInit(const JMapInfoIter& rIter, s32* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg4", pOut); } - bool getJMapInfoArg4NoInit(const JMapInfoIter &rIter, f32 *pOut) { + bool getJMapInfoArg4NoInit(const JMapInfoIter& rIter, f32* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg4", pOut); } - bool getJMapInfoArg4NoInit(const JMapInfoIter &rIter, bool *pOut) { + bool getJMapInfoArg4NoInit(const JMapInfoIter& rIter, bool* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg4", pOut); } - bool getJMapInfoArg5NoInit(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoArg5NoInit(const JMapInfoIter& rIter, s32* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg5", pOut); } - bool getJMapInfoArg5NoInit(const JMapInfoIter &rIter, f32 *pOut) { + bool getJMapInfoArg5NoInit(const JMapInfoIter& rIter, f32* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg5", pOut); } - bool getJMapInfoArg5NoInit(const JMapInfoIter &rIter, bool *pOut) { + bool getJMapInfoArg5NoInit(const JMapInfoIter& rIter, bool* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg5", pOut); } - bool getJMapInfoArg6NoInit(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoArg6NoInit(const JMapInfoIter& rIter, s32* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg6", pOut); } - bool getJMapInfoArg6NoInit(const JMapInfoIter &rIter, f32 *pOut) { + bool getJMapInfoArg6NoInit(const JMapInfoIter& rIter, f32* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg6", pOut); } - bool getJMapInfoArg6NoInit(const JMapInfoIter &rIter, bool *pOut) { + bool getJMapInfoArg6NoInit(const JMapInfoIter& rIter, bool* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg6", pOut); } - bool getJMapInfoArg7NoInit(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoArg7NoInit(const JMapInfoIter& rIter, s32* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg7", pOut); } - bool getJMapInfoArg7NoInit(const JMapInfoIter &rIter, f32 *pOut) { + bool getJMapInfoArg7NoInit(const JMapInfoIter& rIter, f32* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg7", pOut); } - bool getJMapInfoArg7NoInit(const JMapInfoIter &rIter, bool *pOut) { + bool getJMapInfoArg7NoInit(const JMapInfoIter& rIter, bool* pOut) { return ::getJMapInfoArgNoInit(rIter, "Obj_arg7", pOut); } - bool isEqualObjectName(const JMapInfoIter &rIter, const char *pOtherName) { + bool isEqualObjectName(const JMapInfoIter& rIter, const char* pOtherName) { const char* objName; getObjectName(&objName, rIter); return isEqualStringCase(objName, pOtherName); } - s32 getDemoGroupID(const JMapInfoIter &rIter) { + s32 getDemoGroupID(const JMapInfoIter& rIter) { s32 groupID = -1; rIter.getValue("DemoGroupId", &groupID); return groupID; } - s32 getDemoGroupLinkID(const JMapInfoIter &rIter) { + s32 getDemoGroupLinkID(const JMapInfoIter& rIter) { s32 linkID = -1; rIter.getValue("l_id", &linkID); - return linkID; + return linkID; } - bool getJMapInfoRailArg0NoInit(const JMapInfoIter &rIter, s32 *pRailArg0) { + bool getJMapInfoRailArg0NoInit(const JMapInfoIter& rIter, s32* pRailArg0) { return ::getJMapInfoRailArg(rIter, "path_arg0", pRailArg0); } - bool getRailId(const JMapInfoIter &rIter, s32 *pRailID) { - return getArgAndInit(rIter, "CommonPath_ID", pRailID); - } + bool getRailId(const JMapInfoIter& rIter, s32* pRailID) { + return getArgAndInit(rIter, "CommonPath_ID", pRailID); + } - bool getObjectName(const char **pName, const JMapInfoIter &rIter) { + bool getObjectName(const char** pName, const JMapInfoIter& rIter) { if (!rIter.isValid()) { return false; } - if (rIter.getValue("type", pName)) { + if (rIter.getValue("type", pName)) { return true; } return rIter.getValue("name", pName); } - bool isExistJMapArg(const JMapInfoIter &rIter) { + bool isExistJMapArg(const JMapInfoIter& rIter) { if (!rIter.isValid()) { return false; } @@ -351,45 +348,41 @@ namespace MR { return rIter.getValue("Obj_arg0", &val); } - bool getJMapInfoShapeIdWithInit(const JMapInfoIter &rIter, s32 *pShapeID) { + bool getJMapInfoShapeIdWithInit(const JMapInfoIter& rIter, s32* pShapeID) { return rIter.getValue("ShapeModelNo", pShapeID); } - - bool getJMapInfoTransLocal(const JMapInfoIter &rIter, TVec3f *pOut) { + bool getJMapInfoTransLocal(const JMapInfoIter& rIter, TVec3f* pOut) { if (!MR::getValue(rIter, "pos_x", &pOut->x)) { return false; - } - else if (!MR::getValue(rIter, "pos_y", &pOut->y)) { + } else if (!MR::getValue(rIter, "pos_y", &pOut->y)) { return false; } return MR::getValue(rIter, "pos_z", &pOut->z); } - bool getJMapInfoRotateLocal(const JMapInfoIter &rIter, TVec3f *pOut) { + bool getJMapInfoRotateLocal(const JMapInfoIter& rIter, TVec3f* pOut) { if (!MR::getValue(rIter, "dir_x", &pOut->x)) { return false; - } - else if (!MR::getValue(rIter, "dir_y", &pOut->y)) { + } else if (!MR::getValue(rIter, "dir_y", &pOut->y)) { return false; } return MR::getValue(rIter, "dir_z", &pOut->z); } - bool getJMapInfoScale(const JMapInfoIter &rIter, TVec3f *pOut) { + bool getJMapInfoScale(const JMapInfoIter& rIter, TVec3f* pOut) { if (!MR::getValue(rIter, "scale_x", &pOut->x)) { return false; - } - else if (!MR::getValue(rIter, "scale_y", &pOut->y)) { + } else if (!MR::getValue(rIter, "scale_y", &pOut->y)) { return false; } return MR::getValue(rIter, "scale_z", &pOut->z); } - bool getJMapInfoV3f(const JMapInfoIter &rIter, const char *pName, TVec3f *pOut) { + bool getJMapInfoV3f(const JMapInfoIter& rIter, const char* pName, TVec3f* pOut) { char str[0x20]; sprintf(str, "%sX", pName); @@ -407,39 +400,39 @@ namespace MR { return MR::getValue(rIter, str, &pOut->z); } - bool getJMapInfoArg1WithInit(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoArg1WithInit(const JMapInfoIter& rIter, s32* pOut) { return MR::getArgAndInit(rIter, "Obj_arg1", pOut); } - bool getJMapInfoArg2WithInit(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoArg2WithInit(const JMapInfoIter& rIter, s32* pOut) { return MR::getArgAndInit(rIter, "Obj_arg2", pOut); } - bool getJMapInfoArg3WithInit(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoArg3WithInit(const JMapInfoIter& rIter, s32* pOut) { return MR::getArgAndInit(rIter, "Obj_arg3", pOut); } - bool getJMapInfoArg4WithInit(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoArg4WithInit(const JMapInfoIter& rIter, s32* pOut) { return MR::getArgAndInit(rIter, "Obj_arg4", pOut); } - bool getJMapInfoArg5WithInit(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoArg5WithInit(const JMapInfoIter& rIter, s32* pOut) { return MR::getArgAndInit(rIter, "Obj_arg5", pOut); } - bool getJMapInfoArg6WithInit(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoArg6WithInit(const JMapInfoIter& rIter, s32* pOut) { return MR::getArgAndInit(rIter, "Obj_arg6", pOut); } - bool getJMapInfoArg7WithInit(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoArg7WithInit(const JMapInfoIter& rIter, s32* pOut) { return MR::getArgAndInit(rIter, "Obj_arg7", pOut); } - bool getJMapInfoFollowID(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoFollowID(const JMapInfoIter& rIter, s32* pOut) { return MR::getArgAndInit(rIter, "FollowId", pOut); } - bool getJMapInfoGroupID(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoGroupID(const JMapInfoIter& rIter, s32* pOut) { if (MR::getArgAndInit(rIter, "GroupId", pOut)) { return true; } @@ -447,19 +440,19 @@ namespace MR { return MR::getJMapInfoClippingGroupID(rIter, pOut); } - bool getJMapInfoClippingGroupID(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoClippingGroupID(const JMapInfoIter& rIter, s32* pOut) { return MR::getArgAndInit(rIter, "ClippingGroupId", pOut); } - bool getJMapInfoDemoGroupID(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoDemoGroupID(const JMapInfoIter& rIter, s32* pOut) { return MR::getArgAndInit(rIter, "DemoGroupId", pOut); } - bool getJMapInfoLinkID(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoLinkID(const JMapInfoIter& rIter, s32* pOut) { return rIter.getValue("l_id", pOut); } - bool isConnectedWithRail(const JMapInfoIter &rIter) { + bool isConnectedWithRail(const JMapInfoIter& rIter) { if (!rIter.isValid()) { return false; } @@ -468,7 +461,7 @@ namespace MR { return !MR::getArgAndInit(rIter, "CommonPath_ID", &id) ? false : id != -1; } - bool isExistStageSwitchA(const JMapInfoIter &rIter) { + bool isExistStageSwitchA(const JMapInfoIter& rIter) { if (!rIter.isValid()) { return false; } @@ -478,7 +471,7 @@ namespace MR { return id != -1; } - bool isExistStageSwitchB(const JMapInfoIter &rIter) { + bool isExistStageSwitchB(const JMapInfoIter& rIter) { if (!rIter.isValid()) { return false; } @@ -488,7 +481,7 @@ namespace MR { return id != -1; } - bool isExistStageSwitchAppear(const JMapInfoIter &rIter) { + bool isExistStageSwitchAppear(const JMapInfoIter& rIter) { if (!rIter.isValid()) { return false; } @@ -498,7 +491,7 @@ namespace MR { return id != -1; } - bool isExistStageSwitchDead(const JMapInfoIter &rIter) { + bool isExistStageSwitchDead(const JMapInfoIter& rIter) { if (!rIter.isValid()) { return false; } @@ -508,7 +501,7 @@ namespace MR { return id != -1; } - bool isExistStageSwitchSleep(const JMapInfoIter &rIter) { + bool isExistStageSwitchSleep(const JMapInfoIter& rIter) { if (!rIter.isValid()) { return false; } @@ -518,9 +511,9 @@ namespace MR { return id != -1; } - bool getJMapInfoCameraSetID(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoCameraSetID(const JMapInfoIter& rIter, s32* pOut) { *pOut = -1; - + if (!rIter.isValid()) { return false; } @@ -528,9 +521,9 @@ namespace MR { return ::getJMapInfoArgNoInit(rIter, "CameraSetId", pOut); } - bool getJMapInfoViewGroupID(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoViewGroupID(const JMapInfoIter& rIter, s32* pOut) { *pOut = -1; - + if (!rIter.isValid()) { return false; } @@ -538,9 +531,9 @@ namespace MR { return ::getJMapInfoArgNoInit(rIter, "ViewGroupId", pOut); } - bool getJMapInfoMessageID(const JMapInfoIter &rIter, s32 *pOut) { + bool getJMapInfoMessageID(const JMapInfoIter& rIter, s32* pOut) { *pOut = -1; - + if (!rIter.isValid()) { return false; } @@ -548,35 +541,35 @@ namespace MR { return ::getJMapInfoArgNoInit(rIter, "MessageId", pOut); } - s32 getDemoCastID(const JMapInfoIter &rIter) { + s32 getDemoCastID(const JMapInfoIter& rIter) { s32 id = -1; rIter.getValue("CastId", &id); return id; } - const char* getDemoName(const JMapInfoIter &rIter) { + const char* getDemoName(const JMapInfoIter& rIter) { const char* name = nullptr; - rIter.getValue("DemoName", &name); + rIter.getValue("DemoName", &name); return name; } - const char* getDemoSheetName(const JMapInfoIter &rIter) { + const char* getDemoSheetName(const JMapInfoIter& rIter) { const char* name = nullptr; - rIter.getValue("TimeSheetName", &name); + rIter.getValue("TimeSheetName", &name); return name; } - bool getNextLinkRailID(const JMapInfoIter &rIter, s32 *pOut) { + bool getNextLinkRailID(const JMapInfoIter& rIter, s32* pOut) { return rIter.getValue("Path_ID", pOut); } - bool isEqualRailUsage(const JMapInfoIter &rIter, const char *pUsage) { + bool isEqualRailUsage(const JMapInfoIter& rIter, const char* pUsage) { const char* str = nullptr; - rIter.getValue("usage", &str); + rIter.getValue("usage", &str); return isEqualStringCase(str, pUsage); } - void getRailPointPos0(const JMapInfoIter &rIter, TVec3f *pOut) { + void getRailPointPos0(const JMapInfoIter& rIter, TVec3f* pOut) { rIter.getValue("pnt0_x", &pOut->x); rIter.getValue("pnt0_y", &pOut->y); rIter.getValue("pnt0_z", &pOut->z); @@ -586,7 +579,7 @@ namespace MR { } } - void getRailPointPos1(const JMapInfoIter &rIter, TVec3f *pOut) { + void getRailPointPos1(const JMapInfoIter& rIter, TVec3f* pOut) { rIter.getValue("pnt1_x", &pOut->x); rIter.getValue("pnt1_y", &pOut->y); rIter.getValue("pnt1_z", &pOut->z); @@ -596,7 +589,7 @@ namespace MR { } } - void getRailPointPos2(const JMapInfoIter &rIter, TVec3f *pOut) { + void getRailPointPos2(const JMapInfoIter& rIter, TVec3f* pOut) { rIter.getValue("pnt2_x", &pOut->x); rIter.getValue("pnt2_y", &pOut->y); rIter.getValue("pnt2_z", &pOut->z); @@ -606,9 +599,9 @@ namespace MR { } } - bool isLoopRailPathIter(const JMapInfoIter &rIter) { + bool isLoopRailPathIter(const JMapInfoIter& rIter) { const char* status = ""; - rIter.getValue("closed", &status); + rIter.getValue("closed", &status); return isEqualString(status, "CLOSE"); } -}; +}; // namespace MR diff --git a/src/Game/Util/JointController.cpp b/src/Game/Util/JointController.cpp index 16376cd6e..444166d28 100644 --- a/src/Game/Util/JointController.cpp +++ b/src/Game/Util/JointController.cpp @@ -6,11 +6,11 @@ JointController::JointController() { mJoint = 0; } -bool JointController::calcJointMatrix(TPos3f *, const JointControllerInfo &) { +bool JointController::calcJointMatrix(TPos3f*, const JointControllerInfo&) { return 0; } -bool JointController::calcJointMatrixAfterChild(TPos3f *, const JointControllerInfo &) { +bool JointController::calcJointMatrixAfterChild(TPos3f*, const JointControllerInfo&) { return 0; } diff --git a/src/Game/Util/JointUtil.cpp b/src/Game/Util/JointUtil.cpp index acca0d864..01390ff7e 100644 --- a/src/Game/Util/JointUtil.cpp +++ b/src/Game/Util/JointUtil.cpp @@ -10,67 +10,67 @@ #include namespace MR { - J3DJoint* getJoint(J3DModel *pModel, const char *pName) { + J3DJoint* getJoint(J3DModel* pModel, const char* pName) { return pModel->mModelData->mJointTree.mJointNode[(u16)pModel->mModelData->mJointTree.mJointName->getIndex(pName)]; } - J3DJoint* getJoint(const LiveActor *pActor, const char *pName) { + J3DJoint* getJoint(const LiveActor* pActor, const char* pName) { return MR::getJoint(MR::getJ3DModel(pActor), pName); } - J3DJoint* getJoint(const LiveActor *pActor, u16 idx) { + J3DJoint* getJoint(const LiveActor* pActor, u16 idx) { return MR::getJ3DModelData(pActor)->mJointTree.mJointNode[idx]; } - MtxPtr getJointMtx(J3DModel *pModel, const char *pName) { + MtxPtr getJointMtx(J3DModel* pModel, const char* pName) { s32 idx = pModel->mModelData->mJointTree.mJointName->getIndex(pName); return pModel->mMtxBuffer->mpAnmMtx[idx]; } - MtxPtr getJointMtx(const LiveActor *pActor, const char *pName) { + MtxPtr getJointMtx(const LiveActor* pActor, const char* pName) { s32 idx = MR::getJointIndex(pActor, pName); return MR::getJ3DModel(pActor)->mMtxBuffer->mpAnmMtx[idx]; } - MtxPtr getJointMtx(const LiveActor *pActor, int idx) { + MtxPtr getJointMtx(const LiveActor* pActor, int idx) { return MR::getJ3DModel(pActor)->mMtxBuffer->mpAnmMtx[idx]; } - s32 getJointIndex(const LiveActor *pActor, const char *pName) { + s32 getJointIndex(const LiveActor* pActor, const char* pName) { return MR::getJ3DModelData(pActor)->mJointTree.mJointName->getIndex(pName); } - const char* getJointName(const LiveActor *pActor, int idx) { + const char* getJointName(const LiveActor* pActor, int idx) { return MR::getJ3DModelData(pActor)->mJointTree.mJointName->getName(idx); } - s32 getJointNum(const LiveActor *pActor) { + s32 getJointNum(const LiveActor* pActor) { return MR::getJ3DModelData(pActor)->mJointTree.mJointNum; } - - bool isExistJoint(const LiveActor *pActor, const char *pName) { + + bool isExistJoint(const LiveActor* pActor, const char* pName) { return MR::getJ3DModelData(pActor)->mJointTree.mJointName->getIndex(pName) != -1; } - void copyJointPos(J3DModel *pModel, const char *pName, TVec3f *pPos) { + void copyJointPos(J3DModel* pModel, const char* pName, TVec3f* pPos) { MtxPtr jointMtx = MR::getJointMtx(pModel, pName); pPos->set(jointMtx[0][3], jointMtx[1][3], jointMtx[2][3]); } - void copyJointPos(const LiveActor *pActor, const char *pName, TVec3f *pPos) { + void copyJointPos(const LiveActor* pActor, const char* pName, TVec3f* pPos) { copyJointPos(MR::getJ3DModel(pActor), pName, pPos); } - void copyJointPos(J3DModel *pModel, int idx, TVec3f *pPos) { + void copyJointPos(J3DModel* pModel, int idx, TVec3f* pPos) { MtxPtr jointMtx = pModel->mMtxBuffer->mpAnmMtx[idx]; pPos->set(jointMtx[0][3], jointMtx[1][3], jointMtx[2][3]); } - void copyJointPos(const LiveActor *pActor, int idx, TVec3f *pPos) { + void copyJointPos(const LiveActor* pActor, int idx, TVec3f* pPos) { copyJointPos(MR::getJ3DModel(pActor), idx, pPos); } - void copyJointScale(const LiveActor *pActor, const char *pName, TVec3f *pScale) { + void copyJointScale(const LiveActor* pActor, const char* pName, TVec3f* pScale) { TMtx34f mtx; mtx.set(MR::getJointMtx(pActor, pName)); pScale->x = JGeometry::TUtil::sqrt(mtx(2, 0) * mtx(2, 0) + (mtx(0, 0) * mtx(0, 0) + mtx(1, 0) * mtx(1, 0))); @@ -84,17 +84,17 @@ namespace MR { } } - void hideJoint(J3DModel *pModel, const char *pName) { + void hideJoint(J3DModel* pModel, const char* pName) { MR::hideJoint(MR::getJoint(pModel, pName)); } - void hideJoint(const LiveActor *pActor, const char *pName) { + void hideJoint(const LiveActor* pActor, const char* pName) { hideJoint(MR::getJ3DModel(pActor), pName); } - void hideJointAndChildren(J3DJoint *pJoint) { + void hideJointAndChildren(J3DJoint* pJoint) { MR::hideJoint(pJoint); - J3DJoint* j, *i; + J3DJoint *j, *i; for (i = pJoint->mChild; i; i = i->mChild) { for (j = i; j; j = j->mYoung) { MR::hideJointAndChildren(j); @@ -102,31 +102,31 @@ namespace MR { } } - void hideJointAndChildren(J3DModel *pModel, const char *pName) { + void hideJointAndChildren(J3DModel* pModel, const char* pName) { MR::hideJointAndChildren(MR::getJoint(pModel, pName)); } - void hideJointAndChildren(const LiveActor *pActor, const char *pName) { + void hideJointAndChildren(const LiveActor* pActor, const char* pName) { hideJointAndChildren(MR::getJ3DModel(pActor), pName); } - void showJoint(J3DJoint *pJoint) { + void showJoint(J3DJoint* pJoint) { for (J3DMaterial* mat = pJoint->mMesh; mat != nullptr; mat = mat->_4) { mat->mShape->mFlags &= ~1; } } - void showJoint(J3DModel *pModel, const char *pName) { + void showJoint(J3DModel* pModel, const char* pName) { MR::showJoint(MR::getJoint(pModel, pName)); } - void showJoint(const LiveActor *pActor, const char *pName) { + void showJoint(const LiveActor* pActor, const char* pName) { showJoint(MR::getJ3DModel(pActor), pName); } - void showJointAndChildren(J3DJoint *pJoint) { + void showJointAndChildren(J3DJoint* pJoint) { MR::showJoint(pJoint); - J3DJoint* j, *i; + J3DJoint *j, *i; for (i = pJoint->mChild; i; i = i->mChild) { for (j = i; j; j = j->mYoung) { MR::showJointAndChildren(j); @@ -134,23 +134,23 @@ namespace MR { } } - void showJointAndChildren(J3DModel *pModel, const char *pName) { + void showJointAndChildren(J3DModel* pModel, const char* pName) { MR::showJointAndChildren(MR::getJoint(pModel, pName)); } - void showJointAndChildren(const LiveActor *pActor, const char *pName) { + void showJointAndChildren(const LiveActor* pActor, const char* pName) { showJointAndChildren(MR::getJ3DModel(pActor), pName); } - f32 getJointTransX(const J3DJoint *pJoint) { + f32 getJointTransX(const J3DJoint* pJoint) { return pJoint->mTransformInfo.mTranslate.x; } - f32 getJointTransY(const J3DJoint *pJoint) { + f32 getJointTransY(const J3DJoint* pJoint) { return pJoint->mTransformInfo.mTranslate.y; } - f32 getJointTransZ(const J3DJoint *pJoint) { + f32 getJointTransZ(const J3DJoint* pJoint) { return pJoint->mTransformInfo.mTranslate.z; } @@ -189,4 +189,4 @@ namespace MR { } */ -}; +}; // namespace MR diff --git a/src/Game/Util/LayoutUtil.cpp b/src/Game/Util/LayoutUtil.cpp index aa2f239ba..bc7076938 100644 --- a/src/Game/Util/LayoutUtil.cpp +++ b/src/Game/Util/LayoutUtil.cpp @@ -29,7 +29,7 @@ namespace { void hidePaneRecursive(nw4r::lyt::Pane*); void initFrameCtrlReverse(J3DFrameCtrl*); bool getTextDrawRectRecursive(nw4r::ut::Rect*, const nw4r::lyt::Pane*, bool); - u32 getTextLineNumMaxRecursiveSub(const nw4r::lyt::Pane*); + u32 getTextLineNumMaxRecursiveSub(const nw4r::lyt::Pane*); f32 getCometColorAnimFrameFromId(s32 id) { switch (id) { @@ -47,7 +47,7 @@ namespace { return 0.0f; } } -}; +}; // namespace namespace MR { LayoutHolder* createAndAddLayoutHolder(const char* pArcName) { @@ -309,8 +309,7 @@ namespace MR { bool isRegisteredEffect(const LayoutActor* pActor, const char* pParam2) { if (pParam2 != nullptr) { return pActor->mPaneEffectKeeper->getEmitter(pParam2) != nullptr; - } - else { + } else { return pActor->mPaneEffectKeeper != nullptr; } } @@ -492,8 +491,7 @@ namespace MR { if (pPane != nullptr) { return ::getTextLineNumMaxRecursiveSub(pPane); - } - else { + } else { return 0; } } @@ -530,4 +528,4 @@ namespace MR { startAnim(pActor, "Color", animLayer); setAnimFrameAndStop(pActor, ::getCometColorAnimFrameFromId(cometId), animLayer); } -}; +}; // namespace MR diff --git a/src/Game/Util/LiveActorUtil.cpp b/src/Game/Util/LiveActorUtil.cpp index 7c0646ee1..85c1229ca 100644 --- a/src/Game/Util/LiveActorUtil.cpp +++ b/src/Game/Util/LiveActorUtil.cpp @@ -15,9 +15,9 @@ #include namespace { - CollisionParts* createCollisionParts(ResourceHolder *pResHolder, const char *pName, HitSensor *pSensor, const TPos3f &rMtx, MR::CollisionScaleType scaleType, s32 unk) { + CollisionParts* createCollisionParts(ResourceHolder* pResHolder, const char* pName, HitSensor* pSensor, const TPos3f& rMtx, MR::CollisionScaleType scaleType, s32 unk) { CollisionParts* parts = new CollisionParts(); - char kcl[0x80]; + char kcl[0x80]; snprintf(kcl, sizeof(kcl), "%s.kcl", pName); char pa[0x80]; snprintf(pa, sizeof(pa), "%s.pa", pName); @@ -28,29 +28,29 @@ namespace { } switch (scaleType) { - case 0: - parts->initWithAutoEqualScale(rMtx, pSensor, kclRes, paRes, unk, false); - break; - case 1: - parts->initWithNotUsingScale(rMtx, pSensor, kclRes, paRes, unk, false); - break; - case 2: - case 3: - parts->init(rMtx, pSensor, kclRes, paRes, unk, false); - break; + case 0: + parts->initWithAutoEqualScale(rMtx, pSensor, kclRes, paRes, unk, false); + break; + case 1: + parts->initWithNotUsingScale(rMtx, pSensor, kclRes, paRes, unk, false); + break; + case 2: + case 3: + parts->init(rMtx, pSensor, kclRes, paRes, unk, false); + break; } return parts; } -}; +}; // namespace namespace MR { - bool isExistIndirectTexture(const LiveActor *pActor) { + bool isExistIndirectTexture(const LiveActor* pActor) { const char* name = "IndDummy"; return MR::getJ3DModelData(pActor)->mMaterialTable.mTextureNameTable->getIndex(name) != -1; } - void initDefaultPos(LiveActor *pActor, const JMapInfoIter &rIter) { + void initDefaultPos(LiveActor* pActor, const JMapInfoIter& rIter) { if (!rIter.isValid()) { return; } @@ -60,17 +60,17 @@ namespace MR { MR::getJMapInfoScale(rIter, &pActor->mScale); f32 rot_x = fmod(360.0f + (pActor->mRotation.x) - 0.0f, 360.0f); - f32 rot_y = fmod(360.0f + (pActor->mRotation.y) - 0.0f, 360.0f); + f32 rot_y = fmod(360.0f + (pActor->mRotation.y) - 0.0f, 360.0f); pActor->mRotation.x = 0.0f + rot_x; } - void initDefaultPosNoRepeat(LiveActor *pActor, const JMapInfoIter &rIter) { + void initDefaultPosNoRepeat(LiveActor* pActor, const JMapInfoIter& rIter) { MR::getJMapInfoTrans(rIter, &pActor->mPosition); MR::getJMapInfoRotate(rIter, &pActor->mRotation); MR::getJMapInfoScale(rIter, &pActor->mScale); } - bool isValidMovement(const LiveActor *pActor) { + bool isValidMovement(const LiveActor* pActor) { if (pActor->mFlag.mIsDead || pActor->mFlag.mIsClipped) { return false; } @@ -78,7 +78,7 @@ namespace MR { return true; } - bool isValidCalcAnim(const LiveActor *pActor) { + bool isValidCalcAnim(const LiveActor* pActor) { if (pActor->mFlag.mIsDead || pActor->mFlag.mIsClipped || pActor->mFlag.mIsNoCalcAnim) { return false; } @@ -86,7 +86,7 @@ namespace MR { return true; } - bool isValidCalcViewAndEntry(const LiveActor *pActor) { + bool isValidCalcViewAndEntry(const LiveActor* pActor) { if (pActor->mFlag.mIsDead || pActor->mFlag.mIsClipped) { return false; } @@ -94,7 +94,7 @@ namespace MR { return true; } - bool isValidDraw(const LiveActor *pActor) { + bool isValidDraw(const LiveActor* pActor) { if (pActor->mFlag.mIsDead || pActor->mFlag.mIsClipped || pActor->mFlag.mIsHiddenModel) { return false; } @@ -102,7 +102,7 @@ namespace MR { return true; } - void calcAnimDirect(LiveActor *pActor) { + void calcAnimDirect(LiveActor* pActor) { bool isNoCalcAnim = pActor->mFlag.mIsNoCalcAnim; pActor->mFlag.mIsNoCalcAnim = false; pActor->calcAnim(); @@ -111,42 +111,42 @@ namespace MR { } } - void setClippingTypeSphere(LiveActor *pActor, f32 rad) { + void setClippingTypeSphere(LiveActor* pActor, f32 rad) { MR::getClippingDirector()->mActorHolder->setTypeToSphere(pActor, rad, 0); } - void setClippingTypeSphere(LiveActor *pActor, f32 rad, const TVec3f *a3) { + void setClippingTypeSphere(LiveActor* pActor, f32 rad, const TVec3f* a3) { MR::getClippingDirector()->mActorHolder->setTypeToSphere(pActor, rad, a3); } - void setClippingTypeSphereContainsModelBoundingBox(LiveActor *pActor, f32 a2) { + void setClippingTypeSphereContainsModelBoundingBox(LiveActor* pActor, f32 a2) { f32 radius = 0.0f; MR::calcModelBoundingRadius(&radius, pActor); f32 rad = radius + a2; MR::getClippingDirector()->mActorHolder->setTypeToSphere(pActor, rad, 0); } - void setClippingFar50m(LiveActor *pActor) { + void setClippingFar50m(LiveActor* pActor) { MR::getClippingDirector()->mActorHolder->setFarClipLevel(pActor, 7); } - void setClippingFar100m(LiveActor *pActor) { + void setClippingFar100m(LiveActor* pActor) { MR::getClippingDirector()->mActorHolder->setFarClipLevel(pActor, 6); } - void setClippingFar200m(LiveActor *pActor) { + void setClippingFar200m(LiveActor* pActor) { MR::getClippingDirector()->mActorHolder->setFarClipLevel(pActor, 5); } - void setClippingFar300m(LiveActor *pActor) { + void setClippingFar300m(LiveActor* pActor) { MR::getClippingDirector()->mActorHolder->setFarClipLevel(pActor, 4); } - void setClippingFarMax(LiveActor *pActor) { + void setClippingFarMax(LiveActor* pActor) { MR::getClippingDirector()->mActorHolder->setFarClipLevel(pActor, 0); } - void setClippingFar(LiveActor *pActor, f32 clipping) { + void setClippingFar(LiveActor* pActor, f32 clipping) { s32 clip = clipping; switch (clip) { @@ -177,56 +177,55 @@ namespace MR { } } - void setGroupClipping(LiveActor *pActor, const JMapInfoIter &rIter, int a3) { + void setGroupClipping(LiveActor* pActor, const JMapInfoIter& rIter, int a3) { MR::getClippingDirector()->joinToGroupClipping(pActor, rIter, a3); } - void validateClipping(LiveActor *pActor) { + void validateClipping(LiveActor* pActor) { if (pActor->mFlag.mIsInvalidClipping) { MR::getClippingDirector()->mActorHolder->validateClipping(pActor); } } - void invalidateClipping(LiveActor *pActor) { + void invalidateClipping(LiveActor* pActor) { if (pActor->mFlag.mIsInvalidClipping) { if (pActor->mFlag.mIsClipped) { pActor->endClipped(); } - } - else { + } else { MR::getClippingDirector()->mActorHolder->invalidateClipping(pActor); } } - bool isBckStopped(const LiveActor *pActor) { + bool isBckStopped(const LiveActor* pActor) { return pActor->mModelManager->isBckStopped(); } - bool isBtkStopped(const LiveActor *pActor) { + bool isBtkStopped(const LiveActor* pActor) { return pActor->mModelManager->isBtkStopped(); } - bool isBrkStopped(const LiveActor *pActor) { + bool isBrkStopped(const LiveActor* pActor) { return pActor->mModelManager->isBrkStopped(); } - bool isBtpStopped(const LiveActor *pActor) { + bool isBtpStopped(const LiveActor* pActor) { return pActor->mModelManager->isBtpStopped(); } - bool isBpkStopped(const LiveActor *pActor) { + bool isBpkStopped(const LiveActor* pActor) { return pActor->mModelManager->isBpkStopped(); } - bool isBvaStopped(const LiveActor *pActor) { + bool isBvaStopped(const LiveActor* pActor) { return pActor->mModelManager->isBvaStopped(); } - bool isBckOneTimeAndStopped(const LiveActor *pActor) { + bool isBckOneTimeAndStopped(const LiveActor* pActor) { return pActor->mModelManager->isBckStopped(); } - bool isBrkOneTimeAndStopped(const LiveActor *pActor) { + bool isBrkOneTimeAndStopped(const LiveActor* pActor) { return pActor->mModelManager->isBrkStopped(); } @@ -242,38 +241,38 @@ namespace MR { // setBvaFrameAndStop // setBrkFrameEndAndStop - void startBtkAndSetFrameAndStop(const LiveActor *pActor, const char *pBtkName, f32 frame) { + void startBtkAndSetFrameAndStop(const LiveActor* pActor, const char* pBtkName, f32 frame) { startBtk(pActor, pBtkName); setBtkFrameAndStop(pActor, frame); } - void startBrkAndSetFrameAndStop(const LiveActor *pActor, const char *pBrkName, f32 frame) { + void startBrkAndSetFrameAndStop(const LiveActor* pActor, const char* pBrkName, f32 frame) { startBrk(pActor, pBrkName); setBrkFrameAndStop(pActor, frame); } - void startBtpAndSetFrameAndStop(const LiveActor *pActor, const char *pBtpName, f32 frame) { + void startBtpAndSetFrameAndStop(const LiveActor* pActor, const char* pBtpName, f32 frame) { startBtp(pActor, pBtpName); setBtpFrameAndStop(pActor, frame); } - void startBtk(const LiveActor *pActor, const char *pBtkName) { + void startBtk(const LiveActor* pActor, const char* pBtkName) { pActor->mModelManager->startBtk(pBtkName); } - void startBrk(const LiveActor *pActor, const char *pBrkName) { + void startBrk(const LiveActor* pActor, const char* pBrkName) { pActor->mModelManager->startBrk(pBrkName); } - void startBtp(const LiveActor *pActor, const char *pBtpName) { + void startBtp(const LiveActor* pActor, const char* pBtpName) { pActor->mModelManager->startBtp(pBtpName); } - void startBpk(const LiveActor *pActor, const char *pBpkName) { + void startBpk(const LiveActor* pActor, const char* pBpkName) { pActor->mModelManager->startBpk(pBpkName); } - void startBva(const LiveActor *pActor, const char *pBvaName) { + void startBva(const LiveActor* pActor, const char* pBvaName) { pActor->mModelManager->startBva(pBvaName); } @@ -284,28 +283,28 @@ namespace MR { // startBpkIfExist // startBvaIfExist - bool isBtkPlaying(const LiveActor *pActor, const char *pBtkName) { + bool isBtkPlaying(const LiveActor* pActor, const char* pBtkName) { return pActor->mModelManager->isBtkPlaying(pBtkName); } - bool isBrkPlaying(const LiveActor *pActor, const char *pBrkName) { + bool isBrkPlaying(const LiveActor* pActor, const char* pBrkName) { return pActor->mModelManager->isBrkPlaying(pBrkName); } - bool isBtpPlaying(const LiveActor *pActor, const char *pBtpName) { + bool isBtpPlaying(const LiveActor* pActor, const char* pBtpName) { return pActor->mModelManager->isBtpPlaying(pBtpName); } - bool isBpkPlaying(const LiveActor *pActor, const char *pBpkName) { + bool isBpkPlaying(const LiveActor* pActor, const char* pBpkName) { return pActor->mModelManager->isBpkPlaying(pBpkName); } - bool isBvaPlaying(const LiveActor *pActor, const char *pBvaName) { + bool isBvaPlaying(const LiveActor* pActor, const char* pBvaName) { return pActor->mModelManager->isBvaPlaying(pBvaName); } - bool isBckExist(const LiveActor *pActor, const char *pBckName) { - ResTable *pBckResTable = getResourceHolder(pActor)->mMotionResTable; + bool isBckExist(const LiveActor* pActor, const char* pBckName) { + ResTable* pBckResTable = getResourceHolder(pActor)->mMotionResTable; if (pBckResTable->mCount != 0) { if (pBckResTable->isExistRes(pBckName)) { @@ -316,8 +315,8 @@ namespace MR { return false; } - bool isBtkExist(const LiveActor *pActor, const char *pBtkName) { - ResTable *pBtkResTable = getResourceHolder(pActor)->mBtkResTable; + bool isBtkExist(const LiveActor* pActor, const char* pBtkName) { + ResTable* pBtkResTable = getResourceHolder(pActor)->mBtkResTable; if (pBtkResTable->mCount != 0) { if (pBtkResTable->isExistRes(pBtkName)) { @@ -328,8 +327,8 @@ namespace MR { return false; } - bool isBrkExist(const LiveActor *pActor, const char *pBrkName) { - ResTable *pBrkResTable = getResourceHolder(pActor)->mBrkResTable; + bool isBrkExist(const LiveActor* pActor, const char* pBrkName) { + ResTable* pBrkResTable = getResourceHolder(pActor)->mBrkResTable; if (pBrkResTable->mCount != 0) { if (pBrkResTable->isExistRes(pBrkName)) { @@ -340,8 +339,8 @@ namespace MR { return false; } - bool isBpkExist(const LiveActor *pActor, const char *pBpkName) { - ResTable *pBpkResTable = getResourceHolder(pActor)->mBpkResTable; + bool isBpkExist(const LiveActor* pActor, const char* pBpkName) { + ResTable* pBpkResTable = getResourceHolder(pActor)->mBpkResTable; if (pBpkResTable->mCount != 0) { if (pBpkResTable->isExistRes(pBpkName)) { @@ -352,8 +351,8 @@ namespace MR { return false; } - bool isBtpExist(const LiveActor *pActor, const char *pBtpName) { - ResTable *pBtpResTable = getResourceHolder(pActor)->mBtpResTable; + bool isBtpExist(const LiveActor* pActor, const char* pBtpName) { + ResTable* pBtpResTable = getResourceHolder(pActor)->mBtpResTable; if (pBtpResTable->mCount != 0) { if (pBtpResTable->isExistRes(pBtpName)) { @@ -364,8 +363,8 @@ namespace MR { return false; } - bool isBvaExist(const LiveActor *pActor, const char *pBvaName) { - ResTable *pBvaResTable = getResourceHolder(pActor)->mBvaResTable; + bool isBvaExist(const LiveActor* pActor, const char* pBvaName) { + ResTable* pBvaResTable = getResourceHolder(pActor)->mBvaResTable; if (pBvaResTable->mCount != 0) { if (pBvaResTable->isExistRes(pBvaName)) { @@ -378,19 +377,19 @@ namespace MR { // stopBck - void stopBtk(const LiveActor *pActor) { + void stopBtk(const LiveActor* pActor) { pActor->mModelManager->stopBtk(); } - void stopBrk(const LiveActor *pActor) { + void stopBrk(const LiveActor* pActor) { pActor->mModelManager->stopBrk(); } - void stopBtp(const LiveActor *pActor) { + void stopBtp(const LiveActor* pActor) { pActor->mModelManager->stopBtp(); } - void stopBva(const LiveActor *pActor) { + void stopBva(const LiveActor* pActor) { pActor->mModelManager->stopBva(); } @@ -412,7 +411,7 @@ namespace MR { // getBpkCtrl // getBvaCtrl - void updateMaterial(LiveActor *pActor) { + void updateMaterial(LiveActor* pActor) { pActor->mModelManager->updateDL(true); } @@ -420,7 +419,7 @@ namespace MR { // setMirrorReflectionInfoFromModel // changeModelDataTexAll - void initJointTransform(const LiveActor *pActor) { + void initJointTransform(const LiveActor* pActor) { pActor->mModelManager->initJointTransform(); } @@ -436,156 +435,156 @@ namespace MR { // getBrkFrameMax // reflectBckCtrlData - void initLightCtrl(LiveActor *pActor) { + void initLightCtrl(LiveActor* pActor) { pActor->initActorLightCtrl(); pActor->mActorLightCtrl->init(-1, false); } - void initLightCtrlForPlayer(LiveActor *pActor) { + void initLightCtrlForPlayer(LiveActor* pActor) { pActor->initActorLightCtrl(); pActor->mActorLightCtrl->init(-1, false); LightFunction::registerPlayerLightCtrl(pActor->mActorLightCtrl); } - void initLightCtrlNoDrawEnemy(LiveActor *pActor) { + void initLightCtrlNoDrawEnemy(LiveActor* pActor) { pActor->initActorLightCtrl(); pActor->mActorLightCtrl->init(1, true); } - void initLightCtrlNoDrawMapObj(LiveActor *pActor) { + void initLightCtrlNoDrawMapObj(LiveActor* pActor) { pActor->initActorLightCtrl(); pActor->mActorLightCtrl->init(3, true); } - void updateLightCtrl(LiveActor *pActor) { + void updateLightCtrl(LiveActor* pActor) { pActor->mActorLightCtrl->update(false); } - void updateLightCtrlDirect(LiveActor *pActor) { + void updateLightCtrlDirect(LiveActor* pActor) { pActor->mActorLightCtrl->update(true); } - void loadActorLight(const LiveActor *pActor) { + void loadActorLight(const LiveActor* pActor) { pActor->mActorLightCtrl->loadLight(); } - void calcLightPos0(TVec3f *pPos, const LiveActor *pActor) { + void calcLightPos0(TVec3f* pPos, const LiveActor* pActor) { LightFunction::calcLightWorldPos(pPos, pActor->mActorLightCtrl->getActorLight()->mInfo0); } - void calcLightPos1(TVec3f *pPos, const LiveActor *pActor) { + void calcLightPos1(TVec3f* pPos, const LiveActor* pActor) { LightFunction::calcLightWorldPos(pPos, pActor->mActorLightCtrl->getActorLight()->mInfo1); } - const GXColor* getLightAmbientColor(const LiveActor *pActor) { + const GXColor* getLightAmbientColor(const LiveActor* pActor) { return &pActor->mActorLightCtrl->getActorLight()->mColor; } - ActorLightCtrl* getLightCtrl(const LiveActor *pActor) { + ActorLightCtrl* getLightCtrl(const LiveActor* pActor) { return pActor->mActorLightCtrl; } - bool isStep(const LiveActor *pActor, s32 step) { + bool isStep(const LiveActor* pActor, s32 step) { return pActor->getNerveStep() == step; } - bool isFirstStep(const LiveActor *pActor) { + bool isFirstStep(const LiveActor* pActor) { return isStep(pActor, 0); } - bool isLessStep(const LiveActor *pActor, s32 step) { + bool isLessStep(const LiveActor* pActor, s32 step) { return pActor->getNerveStep() < step; } - bool isLessEqualStep(const LiveActor *pActor, s32 step) { + bool isLessEqualStep(const LiveActor* pActor, s32 step) { return pActor->getNerveStep() <= step; } - bool isGreaterStep(const LiveActor *pActor, s32 step) { + bool isGreaterStep(const LiveActor* pActor, s32 step) { return pActor->getNerveStep() > step; } - bool isGreaterEqualStep(const LiveActor *pActor, s32 step) { + bool isGreaterEqualStep(const LiveActor* pActor, s32 step) { return pActor->getNerveStep() >= step; } - bool isIntervalStep(const LiveActor *pActor, s32 step) { + bool isIntervalStep(const LiveActor* pActor, s32 step) { return pActor->getNerveStep() % step == 0; } - bool isNewNerve(const LiveActor *pActor) { + bool isNewNerve(const LiveActor* pActor) { return pActor->getNerveStep() < 0; } - f32 calcNerveRate(const LiveActor *pActor, s32 stepMax) { + f32 calcNerveRate(const LiveActor* pActor, s32 stepMax) { return stepMax <= 0 ? 1.0f : clamp(static_cast(pActor->getNerveStep()) / stepMax, 0.0f, 1.0f); } - f32 calcNerveRate(const LiveActor *pActor, s32 stepMin, s32 stepMax) { + f32 calcNerveRate(const LiveActor* pActor, s32 stepMin, s32 stepMax) { return clamp(normalize(pActor->getNerveStep(), stepMin, stepMax), 0.0f, 1.0f); } - f32 calcNerveEaseInRate(const LiveActor *pActor, s32 stepMax) { + f32 calcNerveEaseInRate(const LiveActor* pActor, s32 stepMax) { return getEaseInValue(calcNerveRate(pActor, stepMax), 0.0f, 1.0f, 1.0f); } - f32 calcNerveEaseOutRate(const LiveActor *pActor, s32 stepMax) { + f32 calcNerveEaseOutRate(const LiveActor* pActor, s32 stepMax) { return getEaseOutValue(calcNerveRate(pActor, stepMax), 0.0f, 1.0f, 1.0f); } - f32 calcNerveEaseOutRate(const LiveActor *pActor, s32 stepMin, s32 stepMax) { + f32 calcNerveEaseOutRate(const LiveActor* pActor, s32 stepMin, s32 stepMax) { return getEaseOutValue(calcNerveRate(pActor, stepMin, stepMax), 0.0f, 1.0f, 1.0f); } - f32 calcNerveEaseInOutRate(const LiveActor *pActor, s32 stepMax) { + f32 calcNerveEaseInOutRate(const LiveActor* pActor, s32 stepMax) { return getEaseInOutValue(calcNerveRate(pActor, stepMax), 0.0f, 1.0f, 1.0f); } - f32 calcNerveEaseInOutRate(const LiveActor *pActor, s32 stepMin, s32 stepMax) { + f32 calcNerveEaseInOutRate(const LiveActor* pActor, s32 stepMin, s32 stepMax) { return getEaseInOutValue(calcNerveRate(pActor, stepMin, stepMax), 0.0f, 1.0f, 1.0f); } - f32 calcNerveValue(const LiveActor *pActor, s32 stepMax, f32 valueStart, f32 valueEnd) { + f32 calcNerveValue(const LiveActor* pActor, s32 stepMax, f32 valueStart, f32 valueEnd) { return getLinerValue(calcNerveRate(pActor, stepMax), valueStart, valueEnd, 1.0f); } - f32 calcNerveValue(const LiveActor *pActor, s32 stepMin, s32 stepMax, f32 valueStart, f32 valueEnd) { + f32 calcNerveValue(const LiveActor* pActor, s32 stepMin, s32 stepMax, f32 valueStart, f32 valueEnd) { return getLinerValue(calcNerveRate(pActor, stepMin, stepMax), valueStart, valueEnd, 1.0f); } - f32 calcNerveEaseInValue(const LiveActor *pActor, s32 stepMax, f32 valueStart, f32 valueEnd) { + f32 calcNerveEaseInValue(const LiveActor* pActor, s32 stepMax, f32 valueStart, f32 valueEnd) { return getEaseInValue(calcNerveRate(pActor, stepMax), valueStart, valueEnd, 1.0f); } - f32 calcNerveEaseInValue(const LiveActor *pActor, s32 stepMin, s32 stepMax, f32 valueStart, f32 valueEnd) { + f32 calcNerveEaseInValue(const LiveActor* pActor, s32 stepMin, s32 stepMax, f32 valueStart, f32 valueEnd) { return getEaseInValue(calcNerveRate(pActor, stepMin, stepMax), valueStart, valueEnd, 1.0f); } - f32 calcNerveEaseOutValue(const LiveActor *pActor, s32 stepMax, f32 valueStart, f32 valueEnd) { + f32 calcNerveEaseOutValue(const LiveActor* pActor, s32 stepMax, f32 valueStart, f32 valueEnd) { return getEaseOutValue(calcNerveRate(pActor, stepMax), valueStart, valueEnd, 1.0f); } - f32 calcNerveEaseInOutValue(const LiveActor *pActor, s32 stepMax, f32 valueStart, f32 valueEnd) { + f32 calcNerveEaseInOutValue(const LiveActor* pActor, s32 stepMax, f32 valueStart, f32 valueEnd) { return getEaseInOutValue(calcNerveRate(pActor, stepMax), valueStart, valueEnd, 1.0f); } - f32 calcNerveEaseInOutValue(const LiveActor *pActor, s32 stepMin, s32 stepMax, f32 valueStart, f32 valueEnd) { + f32 calcNerveEaseInOutValue(const LiveActor* pActor, s32 stepMin, s32 stepMax, f32 valueStart, f32 valueEnd) { return getEaseInOutValue(calcNerveRate(pActor, stepMin, stepMax), valueStart, valueEnd, 1.0f); } - void setNerveAtStep(LiveActor *pActor, const Nerve *pNerve, s32 step) { + void setNerveAtStep(LiveActor* pActor, const Nerve* pNerve, s32 step) { if (pActor->getNerveStep() == step) { pActor->setNerve(pNerve); } } - void setNerveAtBckStopped(LiveActor *pActor, const Nerve *pNerve) { + void setNerveAtBckStopped(LiveActor* pActor, const Nerve* pNerve) { if (pActor->mModelManager->isBckStopped()) { pActor->setNerve(pNerve); } } - bool trySetNerve(LiveActor *pActor, const Nerve *pNerve) { + bool trySetNerve(LiveActor* pActor, const Nerve* pNerve) { if (pActor->isNerve(pNerve)) { return false; } @@ -595,19 +594,19 @@ namespace MR { return true; } - const TVec3f* getGroundNormal(const LiveActor *pActor) { + const TVec3f* getGroundNormal(const LiveActor* pActor) { return pActor->mBinder->mGroundInfo.mParentTriangle.getNormal(0); } - const TVec3f* getWallNormal(const LiveActor *pActor) { + const TVec3f* getWallNormal(const LiveActor* pActor) { return pActor->mBinder->mWallInfo.mParentTriangle.getNormal(0); } - const TVec3f* getRoofNormal(const LiveActor *pActor) { + const TVec3f* getRoofNormal(const LiveActor* pActor) { return pActor->mBinder->mRoofInfo.mParentTriangle.getNormal(0); } - const TVec3f* getBindedNormal(const LiveActor *pActor) { + const TVec3f* getBindedNormal(const LiveActor* pActor) { if (isBindedGround(pActor)) { return getGroundNormal(pActor); } @@ -638,7 +637,7 @@ namespace MR { return getGroundHitPos(pActor); } - + const TVec3f* getGroundHitPos(const LiveActor* pActor) { return &pActor->mBinder->mGroundInfo.mHitPos; } @@ -654,11 +653,11 @@ namespace MR { void calcWallNormalHorizontal(TVec3f* pVec, const LiveActor* pActor) { const TVec3f* normal = getWallNormal(pActor); const TVec3f* grav = &pActor->mGravity; - f32 dot = grav->dot(*normal); + f32 dot = grav->dot(*normal); JMAVECScaleAdd(grav, normal, pVec, -dot); } - f32 calcHitPowerToGround(const LiveActor *pActor) { + f32 calcHitPowerToGround(const LiveActor* pActor) { if (!isBindedGround(pActor)) { return 0.0f; } @@ -667,11 +666,11 @@ namespace MR { if (-dot > 0.0f) { return -dot; } - + return 0.0f; } - f32 calcHitPowerToWall(const LiveActor *pActor) { + f32 calcHitPowerToWall(const LiveActor* pActor) { if (!isBindedWall(pActor)) { return 0.0f; } @@ -680,7 +679,7 @@ namespace MR { if (-dot > 0.0f) { return -dot; } - + return 0.0f; } @@ -714,19 +713,18 @@ namespace MR { return pActor->mBinder->mRadius; } - // setBinderCollisionPartsFilter // setBinderExceptActor - void setBindTriangleFilter(LiveActor *pActor, TriangleFilterBase *pTriangleFilter) { + void setBindTriangleFilter(LiveActor* pActor, TriangleFilterBase* pTriangleFilter) { pActor->mBinder->setTriangleFilter(pTriangleFilter); } - bool isExistBinder(const LiveActor *pActor) { + bool isExistBinder(const LiveActor* pActor) { return pActor->mBinder != nullptr; } - void onEntryDrawBuffer(LiveActor *pActor) { + void onEntryDrawBuffer(LiveActor* pActor) { if (!isNoEntryDrawBuffer(pActor)) { return; } @@ -738,7 +736,7 @@ namespace MR { pActor->mFlag.mIsHiddenModel = false; } - void offEntryDrawBuffer(LiveActor *pActor) { + void offEntryDrawBuffer(LiveActor* pActor) { if (isNoEntryDrawBuffer(pActor)) { return; } @@ -750,15 +748,15 @@ namespace MR { pActor->mFlag.mIsHiddenModel = true; } - bool isDead(const LiveActor *pActor) { + bool isDead(const LiveActor* pActor) { return pActor->mFlag.mIsDead; } - bool isHiddenModel(const LiveActor *pActor) { + bool isHiddenModel(const LiveActor* pActor) { return pActor->mFlag.mIsHiddenModel; } - void showModel(LiveActor *pActor) { + void showModel(LiveActor* pActor) { if (isNoCalcAnim(pActor)) { onCalcAnim(pActor); } @@ -772,7 +770,7 @@ namespace MR { } } - void hideModel(LiveActor *pActor) { + void hideModel(LiveActor* pActor) { if (!isNoCalcAnim(pActor)) { offCalcAnim(pActor); } @@ -786,18 +784,18 @@ namespace MR { } } - void hideModelAndOnCalcAnim(LiveActor *pActor) { + void hideModelAndOnCalcAnim(LiveActor* pActor) { hideModel(pActor); onCalcAnim(pActor); } - void showModelIfHidden(LiveActor *pActor) { + void showModelIfHidden(LiveActor* pActor) { if (isHiddenModel(pActor)) { showModel(pActor); } } - void hideModelIfShown(LiveActor *pActor) { + void hideModelIfShown(LiveActor* pActor) { if (isHiddenModel(pActor)) { return; } @@ -805,7 +803,7 @@ namespace MR { hideModel(pActor); } - void hideModelAndOnCalcAnimIfShown(LiveActor *pActor) { + void hideModelAndOnCalcAnimIfShown(LiveActor* pActor) { if (isHiddenModel(pActor)) { return; } @@ -814,51 +812,51 @@ namespace MR { onCalcAnim(pActor); } - void stopAnimFrame(LiveActor *pActor) { + void stopAnimFrame(LiveActor* pActor) { pActor->mFlag.mIsStoppedAnim = true; } - void releaseAnimFrame(LiveActor *pActor) { + void releaseAnimFrame(LiveActor* pActor) { pActor->mFlag.mIsStoppedAnim = false; } - bool isNoCalcAnim(const LiveActor *pActor) { + bool isNoCalcAnim(const LiveActor* pActor) { return pActor->mFlag.mIsNoCalcAnim; } - void onCalcAnim(LiveActor *pActor) { + void onCalcAnim(LiveActor* pActor) { pActor->mFlag.mIsNoCalcAnim = false; } - void offCalcAnim(LiveActor *pActor) { + void offCalcAnim(LiveActor* pActor) { pActor->mFlag.mIsNoCalcAnim = true; } - bool isNoCalcView(const LiveActor *pActor) { + bool isNoCalcView(const LiveActor* pActor) { return pActor->mFlag.mIsNoCalcView; } - bool isNoEntryDrawBuffer(const LiveActor *pActor) { + bool isNoEntryDrawBuffer(const LiveActor* pActor) { return pActor->mFlag.mIsHiddenModel; } - bool isNoBind(const LiveActor *pActor) { + bool isNoBind(const LiveActor* pActor) { return pActor->mFlag.mIsNoBind; } - void onBind(LiveActor *pActor) { + void onBind(LiveActor* pActor) { pActor->mFlag.mIsNoBind = false; } - void offBind(LiveActor *pActor) { + void offBind(LiveActor* pActor) { pActor->mFlag.mIsNoBind = true; } - bool isCalcGravity(const LiveActor *pActor) { + bool isCalcGravity(const LiveActor* pActor) { return pActor->mFlag.mIsCalcGravity; } - void onCalcGravity(LiveActor *pActor) { + void onCalcGravity(LiveActor* pActor) { if (!isDead(pActor)) { calcGravity(pActor); } @@ -866,21 +864,21 @@ namespace MR { pActor->mFlag.mIsCalcGravity = true; } - void offCalcGravity(LiveActor *pActor) { + void offCalcGravity(LiveActor* pActor) { pActor->mFlag.mIsCalcGravity = false; } - void setCollisionMtx(LiveActor *pActor) { + void setCollisionMtx(LiveActor* pActor) { setCollisionMtx(pActor, getCollisionParts(pActor)); } // setCollisionMtx - CollisionParts* getCollisionParts(const LiveActor *pActor) { + CollisionParts* getCollisionParts(const LiveActor* pActor) { return pActor->mCollisionParts; } - bool isExistCollisionParts(const LiveActor *pActor) { + bool isExistCollisionParts(const LiveActor* pActor) { return pActor->mCollisionParts != nullptr; } -}; +}; // namespace MR diff --git a/src/Game/Util/MathUtil.cpp b/src/Game/Util/MathUtil.cpp index 3768c4340..9e40e5d5d 100644 --- a/src/Game/Util/MathUtil.cpp +++ b/src/Game/Util/MathUtil.cpp @@ -11,9 +11,9 @@ extern "C" int __fpclassifyf(f32); namespace { static f32* gAcosTable; - const f32 cMinDegree = 0.0f; - const f32 cMaxDegree = 360.0f; -}; + const f32 cMinDegree = 0.0f; + const f32 cMaxDegree = 360.0f; +}; // namespace namespace MR { void initAcosTable() { @@ -34,14 +34,12 @@ namespace MR { f32 acosEx(f32 x) { if (__fabsf(x) < 0.98f) { return JMAAcosRadian(x); - } - else if (x < 0.0f) { + } else if (x < 0.0f) { u32 index = static_cast((-x - 0.98f) * 255.0f * 50.0f); f32 acos = gAcosTable[index]; return PI - acos; - } - else { + } else { u32 index = static_cast((x - 0.98f) * 255.0f * 50.0f); return gAcosTable[index]; @@ -78,8 +76,7 @@ namespace MR { f32 getSignHalfProbability() { if (isHalfProbability()) { return -1.0f; - } - else { + } else { return 1.0f; } } @@ -88,9 +85,9 @@ namespace MR { pDst->set(getRandom(-range, range), getRandom(-range, range), getRandom(-range, range)); } - #ifdef NON_MATCHING +#ifdef NON_MATCHING // stack places randVec and otherVec wrongly - void addRandomVector(TVec3f *pOut, const TVec3f &rOtherVec, f32 a3) { + void addRandomVector(TVec3f* pOut, const TVec3f& rOtherVec, f32 a3) { f32 x = getRandom(-range, range); f32 y = getRandom(-range, range); f32 z = getRandom(-range, range); @@ -104,7 +101,7 @@ namespace MR { otherVec.add(randVec); pOut->set(otherVec); } - #endif +#endif void turnRandomVector(TVec3f* pDst, const TVec3f& rSrc, f32 range) { f32 srcLength = rSrc.length(); @@ -113,8 +110,7 @@ namespace MR { if (isNearZero(rSrc, 0.001f)) { pDst->set(rSrc); - } - else { + } else { pDst->setLength(srcLength); } } @@ -200,8 +196,7 @@ namespace MR { if (isOppositeDirection(rParam3, rParam4, 0.01f)) { turnRandomVector(&v1, rParam3, 0.01f); normalize(&v1); - } - else { + } else { v1.set(rParam3); } @@ -214,8 +209,7 @@ namespace MR { *pParam2 = 1.0f; return false; - } - else { + } else { normalize(v2, pParam1); *pParam2 = JGeometry::TUtil::clamp(v1.dot(rParam4), -1.0f, 1.0f); @@ -301,14 +295,12 @@ namespace MR { if (length <= 0.0000038146973f) { pDst->zero(); - } - else { + } else { f32 invSqrt = JGeometry::TUtil::inv_sqrt(sqr); pDst->scale(invSqrt * length, rSrc); } - } - else { + } else { pDst->set(rSrc); } } @@ -319,16 +311,13 @@ namespace MR { if (a2 > a3) { if (a1 < a3) { return false; - } - else { + } else { return !(a1 > a2); } - } - else { + } else { if (a1 < a2) { return false; - } - else { + } else { return !(a1 > a3); } } @@ -396,8 +385,7 @@ namespace MR { if (isNearZero(rVec, 0.001f)) { pDir->zero(); - } - else { + } else { normalize(rVec, pDir); } } @@ -406,12 +394,10 @@ namespace MR { f32 range = max - min; if (!isNearZero(range, 0.001f)) { - - } - else if (x < min) { + + } else if (x < min) { return 0.0f; - } - else { + } else { return 1.0f; } @@ -421,8 +407,7 @@ namespace MR { f32 normalizeAbs(f32 x, f32 min, f32 max) { if (x >= 0.0f) { return normalize(x, min, max); - } - else { + } else { return -normalize(-x, min, max); } } @@ -533,11 +518,9 @@ namespace MR { while (true) { if (angle < 0.0f) { angle += TWO_PI; - } - else if (angle > TWO_PI) { + } else if (angle > TWO_PI) { angle -= TWO_PI; - } - else { + } else { return angle; } } @@ -563,7 +546,7 @@ namespace MR { return res; } - #ifdef NON_MATCHING +#ifdef NON_MATCHING // register use is wrong, and mull is in wrong order for isAngleBetween f32 blendAngle(f32 a1, f32 a2, f32 a3) { f32 a1_n = normalizeAngleAbs(a1); @@ -572,15 +555,14 @@ namespace MR { if (!isAngleBetween(0.5f * (a1_n + a2_n), a1_n, a2_n)) { if (a1_n < a2_n) { a2_n += TWO_PI; - } - else { + } else { a1_n += TWO_PI; } } return normalizeAngleAbs(((1.0f - a3) * a1_n) + (a3 * a2_n)); } - #endif +#endif u8 lerp(u8 start, u8 end, f32 t) { return JGeometry::TUtil::clamp(start + (end - start) * t, 0.0f, 255.0f); @@ -592,7 +574,7 @@ namespace MR { u8 g = lerp(start.g, end.b, t); u8 r = lerp(start.r, end.r, t); - GXColor color = { r, g, b, a }; + GXColor color = {r, g, b, a}; return color; } @@ -600,15 +582,15 @@ namespace MR { //This function implements the selection sort sorting algorithm // on an array of f32 where sortArray is the array to be sorted // and indexArray holds the indices the elements had in the original array - void sortSmall(s32 length, f32 *sortArray, s32 *indexArray){ - for(int i = 0; i < length; i++){ + void sortSmall(s32 length, f32* sortArray, s32* indexArray) { + for (int i = 0; i < length; i++) { indexArray[i] = i; } - for(int index = 0; index < length; index++){ + for (int index = 0; index < length; index++) { f32 element = sortArray[index]; int indexOfSmallestElement = index; - for(int i = index+1; i < length; i++){ - if(element > sortArray[i]){ + for (int i = index + 1; i < length; i++) { + if (element > sortArray[i]) { element = sortArray[i]; indexOfSmallestElement = i; } @@ -625,15 +607,15 @@ namespace MR { //This function implements the selection sort sorting algorithm // on an array of u32 where sortArray is the array to be sorted // and indexArray holds the indices the elements had in the original array - void sortSmall(s32 length, u32 *sortArray, s32 *indexArray){ - for(int i = 0; i < length; i++){ + void sortSmall(s32 length, u32* sortArray, s32* indexArray) { + for (int i = 0; i < length; i++) { indexArray[i] = i; } - for(int index = 0; index < length; index++){ + for (int index = 0; index < length; index++) { u32 element = sortArray[index]; int indexOfSmallestElement = index; - for(int i = index+1; i < length; i++){ - if(element > sortArray[i]){ + for (int i = index + 1; i < length; i++) { + if (element > sortArray[i]) { element = sortArray[i]; indexOfSmallestElement = i; } @@ -647,7 +629,7 @@ namespace MR { } }; - f32 vecKillElement(const TVec3f &a1, const TVec3f &a2, TVec3f *a3) { + f32 vecKillElement(const TVec3f& a1, const TVec3f& a2, TVec3f* a3) { if (isNearZero(a2, 0.001f)) { *a3 = a1; @@ -657,8 +639,8 @@ namespace MR { return PSVECKillElement(&a1, &a2, a3); } - void vecScaleAdd(const register TVec3f *a1, const register TVec3f *a2, register f32 a3) { - #ifdef __MWERKS__ + void vecScaleAdd(const register TVec3f* a1, const register TVec3f* a2, register f32 a3) { +#ifdef __MWERKS__ __asm { psq_l f0, 0(a1), 0, 0 psq_l f3, 0(a2), 0, 0 @@ -669,11 +651,11 @@ namespace MR { psq_st f0, 0(a1), 0, 0 psq_st f2, 8(a1), 1, 0 } - #endif +#endif } - void PSvecBlend(const register TVec3f *a1, const register TVec3f *a2, register TVec3f *a3, register f32 a4, register f32 a5) { - #ifdef __MWERKS__ + void PSvecBlend(const register TVec3f* a1, const register TVec3f* a2, register TVec3f* a3, register f32 a4, register f32 a5) { +#ifdef __MWERKS__ __asm { psq_l f0, 0(a1), 0, 0 psq_l f3, 8(a1), 1, 0 @@ -686,10 +668,10 @@ namespace MR { psq_st f4, 0(a3), 0, 0 psq_st f3, 8(a3), 1, 0 } - #endif +#endif } - void vecBlend(const TVec3f &a1, const TVec3f &a2, TVec3f *a3, f32 a4) { + void vecBlend(const TVec3f& a1, const TVec3f& a2, TVec3f* a3, f32 a4) { PSvecBlend(&a1, &a2, a3, 1.0f - a4, a4); } @@ -712,7 +694,7 @@ namespace MR { // turnVecToPlane - u32 getMinAbsElementIndex(const TVec3f &rVec) { + u32 getMinAbsElementIndex(const TVec3f& rVec) { f64 abs_x = __fabs(rVec.x); f64 abs_y = __fabs(rVec.y); f64 abs_z = __fabs(rVec.z); @@ -728,17 +710,17 @@ namespace MR { return 2; } - f32 getMaxElement(const TVec3f &rVec) { + f32 getMaxElement(const TVec3f& rVec) { f32* vec_arr = (f32*)(&rVec); return vec_arr[getMaxElementIndex(rVec)]; } - f32 getMaxAbsElement(const TVec3f &rVec) { + f32 getMaxAbsElement(const TVec3f& rVec) { f32* vec_arr = (f32*)(&rVec); return vec_arr[getMaxAbsElementIndex(rVec)]; } - u32 getMaxElementIndex(const TVec3f &rVec) { + u32 getMaxElementIndex(const TVec3f& rVec) { if (rVec.x > rVec.y && rVec.x > rVec.z) { return 0; } @@ -750,7 +732,7 @@ namespace MR { return 2; } - u32 getMaxAbsElementIndex(const TVec3f &rVec) { + u32 getMaxAbsElementIndex(const TVec3f& rVec) { f64 abs_x = __fabs(rVec.x); f64 abs_y = __fabs(rVec.y); f64 abs_z = __fabs(rVec.z); @@ -777,11 +759,9 @@ namespace MR { if (x >= 1.0f) { return 0.0f; - } - else if (x <= -1.0f) { + } else if (x <= -1.0f) { return PI; - } - else { + } else { return acosEx(x); } } @@ -793,11 +773,9 @@ namespace MR { if (x >= 1.0f) { return 0.0f; - } - else if (x <= -1.0f) { + } else if (x <= -1.0f) { return PI; - } - else { + } else { return acosEx(x); } } @@ -810,8 +788,7 @@ namespace MR { if (v.dot(rParam2) >= 0.0f) { return angleDiff; - } - else { + } else { return -angleDiff; } } @@ -905,10 +882,7 @@ namespace MR { // setNan bool isNan(const TVec3f& rVec) { - if (__fpclassifyf(rVec.x) == 1 - || __fpclassifyf(rVec.y) == 1 - || __fpclassifyf(rVec.z) == 1) - { + if (__fpclassifyf(rVec.x) == 1 || __fpclassifyf(rVec.y) == 1 || __fpclassifyf(rVec.z) == 1) { return true; } @@ -939,4 +913,4 @@ namespace MR { // getRotatedAxisY // getRotatedAxisZ -}; +}; // namespace MR diff --git a/src/Game/Util/MemoryUtil.cpp b/src/Game/Util/MemoryUtil.cpp index 4ea8e87b3..290889b39 100644 --- a/src/Game/Util/MemoryUtil.cpp +++ b/src/Game/Util/MemoryUtil.cpp @@ -29,7 +29,7 @@ namespace MR { NewDeleteAllocator::alloc, NewDeleteAllocator::free, }; - MEMAllocator NewDeleteAllocator::sAllocator = { &sAllocatorFunc }; + MEMAllocator NewDeleteAllocator::sAllocator = {&sAllocatorFunc}; MEMAllocator* getHomeButtonLayoutAllocator() { JKRHeapAllocator<0>::sHeap = SingletonHolder::get()->mHomeButtonLayoutHeap; @@ -42,7 +42,7 @@ namespace MR { } // MR::getAproposHeapForSceneArchive - + JKRExpHeap* getStationedHeapNapa() { return SingletonHolder::get()->mStationedHeapNapa; } @@ -83,8 +83,7 @@ namespace MR { void fillMemory(void* pDst, u8 ch, u32 size) { if (ch == 0) { zeroMemory(pDst, size); - } - else { + } else { memset(pDst, ch, size); } } @@ -99,7 +98,7 @@ namespace MR { sum = 0; const u16* p = static_cast(pPtr); - u32 checkSize = size / sizeof(u16); + u32 checkSize = size / sizeof(u16); for (int i = 0; i < checkSize; i++, p++) { sum += *p; @@ -119,22 +118,22 @@ namespace MR { return 1; } - template + template void* JKRHeapAllocator::alloc(MEMAllocator* pAllocator, u32 size) { return JKRHeapAllocator::sHeap->alloc(size, 0); } - template + template void JKRHeapAllocator::free(MEMAllocator* pAllocator, void* pPtr) { JKRHeapAllocator::sHeap->free(pPtr); } - template - MEMAllocator JKRHeapAllocator::sAllocator = { &sAllocatorFunc, nullptr, 4, 0 }; + template + MEMAllocator JKRHeapAllocator::sAllocator = {&sAllocatorFunc, nullptr, 4, 0}; - template + template MEMAllocatorFunc JKRHeapAllocator::sAllocatorFunc = { JKRHeapAllocator::alloc, JKRHeapAllocator::free, }; -}; +}; // namespace MR diff --git a/src/Game/Util/ModelUtil.cpp b/src/Game/Util/ModelUtil.cpp index a6fe0f80a..03402b101 100644 --- a/src/Game/Util/ModelUtil.cpp +++ b/src/Game/Util/ModelUtil.cpp @@ -7,20 +7,20 @@ #include "JSystem/JUtility/JUTNameTab.hpp" namespace MR { - u32 getMaterialNo(J3DModelData *pModelData, const char *pMaterialName) { + u32 getMaterialNo(J3DModelData* pModelData, const char* pMaterialName) { return pModelData->mMaterialTable.mNameTable->getIndex(pMaterialName); } - u32 getMaterialNo(J3DModel *pModel, const char *pMaterialName) { + u32 getMaterialNo(J3DModel* pModel, const char* pMaterialName) { return pModel->mModelData->mMaterialTable.mNameTable->getIndex(pMaterialName); } - J3DMaterial* getMaterial(J3DModelData *pModelData, const char *pMaterialName) { + J3DMaterial* getMaterial(J3DModelData* pModelData, const char* pMaterialName) { u16 idx = pModelData->mMaterialTable.mNameTable->getIndex(pMaterialName); return pModelData->mMaterialTable.mMaterials[idx]; } - J3DMaterial* getMaterial(J3DModelData *pModelData, int idx) { + J3DMaterial* getMaterial(J3DModelData* pModelData, int idx) { return pModelData->mMaterialTable.mMaterials[(u16)idx]; } @@ -30,18 +30,18 @@ namespace MR { // getMaterial(const LiveActor *, int) - u16 getMaterialNum(J3DModel *pModel) { + u16 getMaterialNum(J3DModel* pModel) { return pModel->mModelData->mMaterialTable.mMaterialCount; } // updateModelDiffDL // isEnvelope - #ifdef NON_MATCHING +#ifdef NON_MATCHING // some inlining issue - void hideMaterial(J3DModel *pModel, const char *pMaterialName) { + void hideMaterial(J3DModel* pModel, const char* pMaterialName) { J3DShapePacket* pckt = pModel->mMaterialPacket[getMaterialNo(pModel, pMaterialName)]._2C; pckt->mFlags |= 0x10; } - #endif -}; \ No newline at end of file +#endif +}; // namespace MR \ No newline at end of file diff --git a/src/Game/Util/MtxUtil.cpp b/src/Game/Util/MtxUtil.cpp index 6a9d5152b..a57a54fb1 100644 --- a/src/Game/Util/MtxUtil.cpp +++ b/src/Game/Util/MtxUtil.cpp @@ -7,13 +7,13 @@ namespace MR { mtx[2][3] = z; } - void addTransMtx(MtxPtr mtx, const TVec3f &rVec) { + void addTransMtx(MtxPtr mtx, const TVec3f& rVec) { mtx[0][3] += rVec.x; mtx[1][3] += rVec.y; mtx[2][3] += rVec.z; } - void addTransMtxLocal(MtxPtr mtx, const TVec3f &rVec) { + void addTransMtxLocal(MtxPtr mtx, const TVec3f& rVec) { addTransMtxLocalX(mtx, rVec.x); addTransMtxLocalY(mtx, rVec.y); addTransMtxLocalZ(mtx, rVec.z); @@ -37,31 +37,31 @@ namespace MR { mtx[2][3] = mtx[2][3] + (mtx[2][2] * z_coord); } - void extractMtxXDir(MtxPtr mtx, TVec3f *pOut) { + void extractMtxXDir(MtxPtr mtx, TVec3f* pOut) { pOut->x = mtx[0][0]; pOut->y = mtx[1][0]; pOut->z = mtx[2][0]; } - void extractMtxYDir(MtxPtr mtx, TVec3f *pOut) { + void extractMtxYDir(MtxPtr mtx, TVec3f* pOut) { pOut->x = mtx[0][1]; pOut->y = mtx[1][1]; pOut->z = mtx[2][1]; } - void extractMtxZDir(MtxPtr mtx, TVec3f *pOut) { + void extractMtxZDir(MtxPtr mtx, TVec3f* pOut) { pOut->x = mtx[0][2]; pOut->y = mtx[1][2]; pOut->z = mtx[2][2]; } - void extractMtxXYZDir(MtxPtr mtx, TVec3f *pOutX, TVec3f *pOutY, TVec3f *pOutZ) { + void extractMtxXYZDir(MtxPtr mtx, TVec3f* pOutX, TVec3f* pOutY, TVec3f* pOutZ) { MR::extractMtxXDir(mtx, pOutX); MR::extractMtxYDir(mtx, pOutY); MR::extractMtxZDir(mtx, pOutZ); } - - void extractMtxTrans(MtxPtr mtx, TVec3f *pOut) { + + void extractMtxTrans(MtxPtr mtx, TVec3f* pOut) { pOut->x = mtx[0][3]; pOut->y = mtx[1][3]; pOut->z = mtx[2][3]; @@ -80,4 +80,4 @@ namespace MR { return true; } */ -}; +}; // namespace MR diff --git a/src/Game/Util/NPCUtil.cpp b/src/Game/Util/NPCUtil.cpp index b4267aeaf..e4e623ed4 100644 --- a/src/Game/Util/NPCUtil.cpp +++ b/src/Game/Util/NPCUtil.cpp @@ -10,33 +10,32 @@ namespace { static s32 sStarAppearSeStepPenguinCoach = 95; static s32 sStarAppearSeStepTeresaRacer = 89; static s32 sStarAppearSeStepTrickRabbit = 22; -}; +}; // namespace namespace NrvTakeOutStar { NEW_NERVE(TakeOutStarNrvAnim, TakeOutStar, Anim); NEW_NERVE(TakeOutStarNrvDemo, TakeOutStar, Demo); NEW_NERVE(TakeOutStarNrvTerm, TakeOutStar, Term); -}; +}; // namespace NrvTakeOutStar namespace NrvFadeStarter { NEW_NERVE(FadeStarterNrvFade, FadeStarter, Fade); NEW_NERVE(FadeStarterNrvTerm, FadeStarter, Term); -}; +}; // namespace NrvFadeStarter namespace NrvDemoStarter { NEW_NERVE(DemoStarterNrvInit, DemoStarter, Init); NEW_NERVE(DemoStarterNrvFade, DemoStarter, Fade); NEW_NERVE(DemoStarterNrvWait, DemoStarter, Wait); NEW_NERVE(DemoStarterNrvTerm, DemoStarter, Term); -}; +}; // namespace NrvDemoStarter -TakeOutStar::TakeOutStar(NPCActor *pActor, const char *pActionName, const char *pAnimName, const Nerve *pNerve) : - NerveExecutor("パワースター取り出しデモ実行者"), - mActor(pActor), - mNerve(pNerve), - mActionName(pActionName), - mAnimName(pAnimName) -{ +TakeOutStar::TakeOutStar(NPCActor* pActor, const char* pActionName, const char* pAnimName, const Nerve* pNerve) + : NerveExecutor("パワースター取り出しデモ実行者"), + mActor(pActor), + mNerve(pNerve), + mActionName(pActionName), + mAnimName(pAnimName) { mStarModel = MR::createPowerStarDemoModel(mActor, "パワースターデモモデル", pActor->getBaseMtx()); mStarModel->makeActorDead(); @@ -54,8 +53,7 @@ bool TakeOutStar::takeOut() { } bool TakeOutStar::isFirstStep() { - return isNerve(&NrvTakeOutStar::TakeOutStarNrvAnim::sInstance) - && MR::isFirstStep(this); + return isNerve(&NrvTakeOutStar::TakeOutStarNrvAnim::sInstance) && MR::isFirstStep(this); } bool TakeOutStar::isLastStep() { @@ -66,8 +64,7 @@ void TakeOutStar::exeAnim() { if (MR::isFirstStep(this)) { if (mNerve != nullptr) { mActor->pushNerve(mNerve); - } - else { + } else { mActor->tryPushNullNerve(); } @@ -82,22 +79,18 @@ void TakeOutStar::exeAnim() { if (MR::isEqualString(mAnimName, "TakeOutStarCaretaker")) { step = sStarAppearSeStepCaretaker; - } - else if (MR::isEqualString(mAnimName, "TakeOutStarTeresaRacer")) { + } else if (MR::isEqualString(mAnimName, "TakeOutStarTeresaRacer")) { step = sStarAppearSeStepTeresaRacer; - } - else if (MR::isEqualString(mAnimName, "TakeOutStarPenguinCoach")) { + } else if (MR::isEqualString(mAnimName, "TakeOutStarPenguinCoach")) { step = sStarAppearSeStepPenguinCoach; - } - else if (MR::isEqualString(mAnimName, "TakeOutStarTrickRabbit")) { + } else if (MR::isEqualString(mAnimName, "TakeOutStarTrickRabbit")) { step = sStarAppearSeStepTrickRabbit; } if (MR::isGreaterStep(this, step)) { if (MR::isInWater(mStarModel, TVec3f(0.0f, 0.0f, 0.0f))) { MR::startLevelSound(mStarModel, "SE_OJ_LV_POW_STAR_EXIST_W", -1, -1, -1); - } - else { + } else { MR::startLevelSound(mStarModel, "SE_OJ_LV_POW_STAR_EXIST", -1, -1, -1); } } @@ -123,15 +116,13 @@ void TakeOutStar::exeDemo() { } void TakeOutStar::exeTerm() { - } -FadeStarter::FadeStarter(NPCActor *pActor, s32 a2) : - NerveExecutor("フェード開始制御"), - mActor(pActor), - _C(nullptr), - _10(a2) -{ +FadeStarter::FadeStarter(NPCActor* pActor, s32 a2) + : NerveExecutor("フェード開始制御"), + mActor(pActor), + _C(nullptr), + _10(a2) { initNerve(&NrvFadeStarter::FadeStarterNrvFade::sInstance); } @@ -171,13 +162,11 @@ void FadeStarter::exeFade() { } void FadeStarter::exeTerm() { - } -DemoStarter::DemoStarter(NPCActor *pActor) : - NerveExecutor("デモ開始制御"), - mActor(pActor) -{ +DemoStarter::DemoStarter(NPCActor* pActor) + : NerveExecutor("デモ開始制御"), + mActor(pActor) { initNerve(&NrvDemoStarter::DemoStarterNrvInit::sInstance); } @@ -194,7 +183,6 @@ void DemoStarter::start() { } void DemoStarter::exeInit() { - } void DemoStarter::exeFade() { @@ -222,5 +210,4 @@ void DemoStarter::exeWait() { } void DemoStarter::exeTerm() { - } diff --git a/src/Game/Util/NerveUtil.cpp b/src/Game/Util/NerveUtil.cpp index 73542d47e..32eb4fdb8 100644 --- a/src/Game/Util/NerveUtil.cpp +++ b/src/Game/Util/NerveUtil.cpp @@ -66,4 +66,4 @@ namespace MR { pExecutor->setNerve(pNerve); } } -}; +}; // namespace MR diff --git a/src/Game/Util/ObjUtil.cpp b/src/Game/Util/ObjUtil.cpp index d85e779b3..50c6c51f1 100644 --- a/src/Game/Util/ObjUtil.cpp +++ b/src/Game/Util/ObjUtil.cpp @@ -30,352 +30,351 @@ namespace { return inf; } -}; +}; // namespace namespace MR { - void connectToScene(LiveActor *pActor, int a2, int a3, int a4, int a5) { + void connectToScene(LiveActor* pActor, int a2, int a3, int a4, int a5) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), a2, a3, a4, a5); } - void connectToScene(NameObj *pObj, int a2, int a3, int a4, int a5) { + void connectToScene(NameObj* pObj, int a2, int a3, int a4, int a5) { MR::registerNameObjToExecuteHolder(pObj, a2, a3, a4, a5); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneCollisionMapObj(LiveActor *pActor) { + void connectToSceneCollisionMapObj(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x1E, 2, 8, -1); } - void connectToSceneCollisionMapObjMovementCalcAnim(LiveActor *pActor) { + void connectToSceneCollisionMapObjMovementCalcAnim(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x1E, 2, -1, -1); } - void connectToSceneCollisionMapObjWeakLight(LiveActor *pActor) { + void connectToSceneCollisionMapObjWeakLight(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x1E, 2, 9, -1); } - void connectToSceneCollisionMapObjStrongLight(LiveActor *pActor) { + void connectToSceneCollisionMapObjStrongLight(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x1E, 2, 0xA, -1); } - void connectToSceneCollisionEnemy(LiveActor *pActor) { + void connectToSceneCollisionEnemy(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x1F, 3, 0x12, -1); } - void connectToSceneCollisionEnemyMovement(NameObj *pObj) { + void connectToSceneCollisionEnemyMovement(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0x1F, -1, -1, -1); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneCollisionEnemyStrongLight(LiveActor *pActor) { + void connectToSceneCollisionEnemyStrongLight(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x1F, 3, 0xA, -1); } - void connectToSceneCollisionEnemyNoShadowedMapObjStrongLight(LiveActor *pActor) { + void connectToSceneCollisionEnemyNoShadowedMapObjStrongLight(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x1F, 3, 0xC, -1); } - void connectToSceneNpc(LiveActor *pActor) { + void connectToSceneNpc(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x28, 6, 0x10, -1); } - void connectToSceneNpcMovement(LiveActor *pActor) { + void connectToSceneNpcMovement(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x28, -1, -1, -1); } - void connectToSceneRide(LiveActor *pActor) { + void connectToSceneRide(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x29, 7, 0x11, -1); } - void connectToSceneEnemy(LiveActor *pActor) { + void connectToSceneEnemy(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x2A, 8, 0x12, -1); } - void connectToSceneEnemyMovement(NameObj *pObj) { + void connectToSceneEnemyMovement(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0x2A, -1, -1, -1); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneMapObj(LiveActor *pActor) { + void connectToSceneMapObj(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x22, 5, 8, -1); } - void connectToSceneMapObjMovement(NameObj *pObj) { + void connectToSceneMapObjMovement(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0x22, -1, -1, -1); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneMapObjMovementCalcAnim(NameObj *pObj) { + void connectToSceneMapObjMovementCalcAnim(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0x22, 5, -1, -1); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneMapObjNoMovement(LiveActor *pActor) { + void connectToSceneMapObjNoMovement(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), -1, 5, 8, -1); } - void connectToSceneMapObjNoCalcAnim(LiveActor *pActor) { + void connectToSceneMapObjNoCalcAnim(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x22, -1, 8, -1); } - void connectToSceneMapObjNoCalcAnimStrongLight(LiveActor *pActor) { + void connectToSceneMapObjNoCalcAnimStrongLight(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x22, -1, 0xA, -1); } - void connectToSceneMapObjDecoration(LiveActor *pActor) { + void connectToSceneMapObjDecoration(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x23, 0xB, 8, -1); } - void connectToSceneMapObjDecorationStrongLight(LiveActor *pActor) { + void connectToSceneMapObjDecorationStrongLight(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x23, 0xB, 0xA, -1); } - void connectToSceneMapObjDecorationMovement(NameObj *pObj) { + void connectToSceneMapObjDecorationMovement(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0x23, -1, -1, -1); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneMapObjStrongLight(LiveActor *pActor) { + void connectToSceneMapObjStrongLight(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x22, 5, 0xA, -1); } - void connectToSceneMapParts(LiveActor *pActor) { + void connectToSceneMapParts(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x1C, 0, 8, -1); } - void connectToScenePlanet(LiveActor *pActor) { + void connectToScenePlanet(LiveActor* pActor) { if (MR::isExistIndirectTexture(pActor)) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x1D, 1, 0x1D, -1); - } - else { + } else { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x1D, 1, 4, -1); } } - void connectToSceneEnvironment(LiveActor *pActor) { + void connectToSceneEnvironment(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x21, 4, 6, -1); } - void connectToSceneEnvironmentStrongLight(LiveActor *pActor) { + void connectToSceneEnvironmentStrongLight(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x21, 4, 7, -1); } - void connectToClippedMapParts(LiveActor *pActor) { + void connectToClippedMapParts(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x1C, 0, 0, -1); } - void connectToSceneEnemyDecoration(LiveActor *pActor) { + void connectToSceneEnemyDecoration(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x2B, 0xB, 0x13, -1); } - void connectToSceneEnemyDecorationMovement(NameObj *pObj) { + void connectToSceneEnemyDecorationMovement(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0x2B, -1, -1, -1); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneEnemyDecorationMovementCalcAnim(NameObj *pObj) { + void connectToSceneEnemyDecorationMovementCalcAnim(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0x2B, 0xB, -1, -1); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneItem(LiveActor *pActor) { + void connectToSceneItem(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x2C, 0x10, 0xD, -1); } - void connectToSceneItemStrongLight(LiveActor *pActor) { + void connectToSceneItemStrongLight(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x2C, 0x10, 0xF, -1); } - void connectToSceneIndirectEnemy(LiveActor *pActor) { + void connectToSceneIndirectEnemy(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x2A, 8, 0x1C, -1); } - void connectToSceneIndirectNpc(LiveActor *pActor) { + void connectToSceneIndirectNpc(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x28, 6, 0x1B, -1); } - void connectToSceneIndirectMapObj(LiveActor *pActor) { + void connectToSceneIndirectMapObj(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x22, 5, 0x19, -1); } - void connectToSceneIndirectMapObjStrongLight(LiveActor *pActor) { + void connectToSceneIndirectMapObjStrongLight(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(reinterpret_cast(pActor), 0x22, 5, 0x1A, -1); } - void connectToSceneScreenEffectMovement(NameObj *pObj) { + void connectToSceneScreenEffectMovement(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 3, -1, -1, -1); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneAreaObj(NameObj *pObj) { + void connectToSceneAreaObj(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0xD, -1, -1, -1); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToScene3DModelFor2D(LiveActor *pActor) { + void connectToScene3DModelFor2D(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(pActor, 0xE, 0xD, 0x24, -1); } - void connectToSceneLayout(NameObj *pObj) { + void connectToSceneLayout(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0xE, 0xD, -1, 0x3C); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneLayoutMovementCalcAnim(NameObj *pObj) { + void connectToSceneLayoutMovementCalcAnim(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0xE, 0xD, -1, -1); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneLayoutDecoration(NameObj *pObj) { + void connectToSceneLayoutDecoration(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0xF, 0xE, -1, 0x3D); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneTalkLayout(NameObj *pObj) { + void connectToSceneTalkLayout(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0xE, 0xD, -1, 0x43); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneTalkLayoutNoMovement(NameObj *pObj) { + void connectToSceneTalkLayoutNoMovement(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, -1, 0xD, -1, 0x43); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneWipeLayout(NameObj *pObj) { + void connectToSceneWipeLayout(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0x11, 0xD, -1, 0x42); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneLayoutOnPause(NameObj *pObj) { + void connectToSceneLayoutOnPause(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0x12, 0xD, -1, 0x3E); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneLayoutOnPauseNoMovement(NameObj *pObj) { + void connectToSceneLayoutOnPauseNoMovement(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, -1, 0xD, -1, 0x3E); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneLayoutOnPauseMovementCalcAnim(NameObj *pObj) { + void connectToSceneLayoutOnPauseMovementCalcAnim(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0x12, 0xD, -1, -1); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneLayoutMovement(NameObj *pObj) { + void connectToSceneLayoutMovement(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0xE, -1, -1, -1); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneMovie(NameObj *pObj) { + void connectToSceneMovie(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0x10, -1, -1, 0x3F); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneMirrorMapObj(LiveActor *pActor) { + void connectToSceneMirrorMapObj(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(pActor, 0x22, 0xC, 0x27, -1); } - void connectToSceneMirrorMapObjDecoration(LiveActor *pActor) { + void connectToSceneMirrorMapObjDecoration(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(pActor, 0x23, 0xC, 0x27, -1); } - void connectToSceneMirrorMapObjNoMovement(LiveActor *pActor) { + void connectToSceneMirrorMapObjNoMovement(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(pActor, -1, 0xC, 0x27, -1); } - void connectToSceneCamera(NameObj *pObj) { + void connectToSceneCamera(NameObj* pObj) { MR::registerNameObjToExecuteHolder(pObj, 0x2, -1, -1, -1); MR::connectToSceneTemporarily(pObj); MR::connectToDrawTemporarily(pObj); } - void connectToSceneNoShadowedMapObj(LiveActor *pActor) { + void connectToSceneNoShadowedMapObj(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(pActor, 0x22, 0x5, 0xB, -1); } - void connectToSceneNoShadowedMapObjStrongLight(LiveActor *pActor) { + void connectToSceneNoShadowedMapObjStrongLight(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(pActor, 0x22, 0x5, 0xC, -1); } - void connectToSceneNoSilhouettedMapObj(LiveActor *pActor) { + void connectToSceneNoSilhouettedMapObj(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(pActor, 0x22, 0x5, 0xD, -1); } - void connectToSceneNoSilhouettedMapObjStrongLight(LiveActor *pActor) { + void connectToSceneNoSilhouettedMapObjStrongLight(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(pActor, 0x22, 0x5, 0xF, -1); } - void connectToSceneNoSilhouettedMapObjWeakLightNoMovement(LiveActor *pActor) { + void connectToSceneNoSilhouettedMapObjWeakLightNoMovement(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(pActor, -1, 0x5, 0xE, -1); } - void connectToSceneSky(LiveActor *pActor) { + void connectToSceneSky(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(pActor, 0x24, 0x5, 0x1, -1); } - void connectToSceneAir(LiveActor *pActor) { + void connectToSceneAir(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(pActor, 0x24, 0x5, 0x2, -1); } - void connectToSceneSun(LiveActor *pActor) { + void connectToSceneSun(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(pActor, 0x24, 0x5, 0x3, -1); } - void connectToSceneCrystal(LiveActor *pActor) { + void connectToSceneCrystal(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(pActor, 0x22, 0x5, 0x20, -1); } - void connectToSceneNormalMapObj(LiveActor *pActor) { + void connectToSceneNormalMapObj(LiveActor* pActor) { MR::registerNameObjToExecuteHolder(pActor, 0x22, 0x5, -1, 0x18); } - NameObjAdaptor* createDrawAdaptor(const char *pName, const MR::FunctorBase &rFunctor) { + NameObjAdaptor* createDrawAdaptor(const char* pName, const MR::FunctorBase& rFunctor) { NameObjAdaptor* adaptor = new NameObjAdaptor(pName); adaptor->connectToDraw(rFunctor); return adaptor; } - void requestMovementOn(NameObj *pObj) { + void requestMovementOn(NameObj* pObj) { NameObjFunction::requestMovementOn(pObj); } - void requestMovementOn(LiveActor *pActor) { + void requestMovementOn(LiveActor* pActor) { NameObjFunction::requestMovementOn(pActor); if (MR::isExistEffectKeeper(pActor)) { MR::Effect::requestMovementOn(pActor->mEffectKeeper); } } - void requestMovementOn(LayoutActor *pActor) { + void requestMovementOn(LayoutActor* pActor) { NameObjFunction::requestMovementOn(pActor); } - void requestMovementOff(NameObj *pObj) { + void requestMovementOff(NameObj* pObj) { NameObjFunction::requestMovementOff(pObj); } - NameObjGroup* joinToNameObjGroup(NameObj *pObj, const char* pGroupName) { + NameObjGroup* joinToNameObjGroup(NameObj* pObj, const char* pGroupName) { NameObjGroup* pObjGroup = static_cast(NameObjFinder::find(pGroupName)); pObjGroup->registerObj(pObj); @@ -383,21 +382,21 @@ namespace MR { return pObjGroup; } - NameObjGroup* joinToMovementOnOffGroup(const char *pName, NameObj *pObj, u32 a3) { + NameObjGroup* joinToMovementOnOffGroup(const char* pName, NameObj* pObj, u32 a3) { MovementOnOffGroupHolder* pGroupHolder = MR::getSceneObj(SceneObj_MovementOnOffGroupHolder); return pGroupHolder->joinToGroup(pName, pObj, a3); } - void onMovementOnOffGroup(const char *pGroupName) { + void onMovementOnOffGroup(const char* pGroupName) { MR::getSceneObj(SceneObj_MovementOnOffGroupHolder)->onMovementGroup(pGroupName); } - void registerPreDrawFunction(const MR::FunctorBase &rFunc, int a2) { + void registerPreDrawFunction(const MR::FunctorBase& rFunc, int a2) { SingletonHolder::get()->mSceneController->getNameObjListExecutor()->registerPreDrawFunction(rFunc, a2); } - NameObjAdaptor* createAdaptorAndConnectToDrawBloomModel(const char *pName, const MR::FunctorBase &rFunctor) { + NameObjAdaptor* createAdaptorAndConnectToDrawBloomModel(const char* pName, const MR::FunctorBase& rFunctor) { NameObjAdaptor* adaptor = new NameObjAdaptor(pName); adaptor->connectToDraw(rFunctor); MR::registerNameObjToExecuteHolder(adaptor, -1, -1, -1, 0x36); @@ -438,14 +437,14 @@ namespace MR { return ::tryCreateCsvParserLocal(pHolder, pFormat, list); } - JMapInfo* createCsvParser(const char *pArchive, const char *pFormat, ...) { + JMapInfo* createCsvParser(const char* pArchive, const char* pFormat, ...) { ResourceHolder* holder = SingletonHolder::get()->createAndAdd(pArchive, nullptr); - return MR::createCsvParser(holder, pFormat); + return MR::createCsvParser(holder, pFormat); } // MR::tryCreateCsvParser - s32 getCsvDataElementNum(const JMapInfo *pMapInfo) { + s32 getCsvDataElementNum(const JMapInfo* pMapInfo) { if (pMapInfo->mData != nullptr) { return pMapInfo->mData->mNumEntries; } @@ -453,7 +452,7 @@ namespace MR { return 0; } - void getCsvDataStr(const char **pOut , const JMapInfo *pMapInfo, const char *pKey, s32 idx) { + void getCsvDataStr(const char** pOut, const JMapInfo* pMapInfo, const char* pKey, s32 idx) { int v7 = pMapInfo->searchItemInfo(pKey); if (v7 >= 0) { @@ -461,55 +460,54 @@ namespace MR { } } - void getCsvDataStrOrNULL(const char **pOut, const JMapInfo *pMapInfo, const char *pKey, s32 idx) { + void getCsvDataStrOrNULL(const char** pOut, const JMapInfo* pMapInfo, const char* pKey, s32 idx) { getCsvDataStr(pOut, pMapInfo, pKey, idx); if (*pOut[0] == 0) { *pOut = nullptr; } } - void getCsvDataS32(s32 *pOut, const JMapInfo *pMapInfo, const char *pKey, s32 idx) { + void getCsvDataS32(s32* pOut, const JMapInfo* pMapInfo, const char* pKey, s32 idx) { pMapInfo->getValue(idx, pKey, pOut); } - void getCsvDataU8(u8 *pOut, const JMapInfo *pMapInfo, const char *pKey, s32 idx) { + void getCsvDataU8(u8* pOut, const JMapInfo* pMapInfo, const char* pKey, s32 idx) { s32 val = 0; pMapInfo->getValue(idx, pKey, &val); *pOut = val; } - #ifdef NON_MATCHING - void getCsvDataF32(f32 *pOut, const JMapInfo *pMapInfo, const char *pKey, s32 idx) { +#ifdef NON_MATCHING + void getCsvDataF32(f32* pOut, const JMapInfo* pMapInfo, const char* pKey, s32 idx) { int v7 = pMapInfo->searchItemInfo(pKey); if (v7 >= 0) { *pOut = *((f32*)(pMapInfo->mData->mNumEntries + pMapInfo->mData->mDataOffset + idx * (pMapInfo->mData->mEntrySize + static_cast(&pMapInfo->mData->mItems)[v7].mOffsData))); } } - #endif - +#endif + // MR::getCsvDataBool - - bool isName(const NameObj *pObj, const char *pName) { + bool isName(const NameObj* pObj, const char* pName) { return strcmp(pObj->mName, pName) == 0; } - bool isSame(const NameObj *a1, const NameObj *a2) { + bool isSame(const NameObj* a1, const NameObj* a2) { return a1 == a2; } - bool tryRegisterNamePosLinkObj(const NameObj *pObj, const JMapInfoIter &rIter) { + bool tryRegisterNamePosLinkObj(const NameObj* pObj, const JMapInfoIter& rIter) { return MR::getNamePosHolder()->tryRegisterLinkObj(pObj, rIter); } - void findNamePos(const char *pName, MtxPtr mtx) { + void findNamePos(const char* pName, MtxPtr mtx) { MR::tryFindLinkNamePos(nullptr, pName, mtx); } - void findNamePos(const char *pName, TVec3f *a2, TVec3f *a3) { + void findNamePos(const char* pName, TVec3f* a2, TVec3f* a3) { MR::getNamePosHolder()->find(nullptr, pName, a2, a3); } // MR::findNamePosOnGround -}; +}; // namespace MR diff --git a/src/Game/Util/ParabolicPath.cpp b/src/Game/Util/ParabolicPath.cpp index 7033bc6c0..e6ec6e337 100644 --- a/src/Game/Util/ParabolicPath.cpp +++ b/src/Game/Util/ParabolicPath.cpp @@ -1,13 +1,14 @@ #include "Game/Util/ParabolicPath.hpp" #include "Game/Util.hpp" -ParabolicPath::ParabolicPath() : mPosition(0, 0, 0), mAxisY(0, 1, 0), mAxisZ(0, 0, 1) { +ParabolicPath::ParabolicPath() + : mPosition(0, 0, 0), mAxisY(0, 1, 0), mAxisZ(0, 0, 1) { _24 = 0.0f; _28 = 0.0f; _2C = 0.0f; } -void ParabolicPath::initFromUpVectorAddHeight(const TVec3f &a1, const TVec3f &a2, const TVec3f &a3, f32 a4) { +void ParabolicPath::initFromUpVectorAddHeight(const TVec3f& a1, const TVec3f& a2, const TVec3f& a3, f32 a4) { f32 dot = a3.dot(a2 - a1); if (dot < 0.0f) { @@ -29,15 +30,14 @@ void ParabolicPath::calcPosition(TVec3f *pOutPosition, f32 a2) const { } */ -void ParabolicPath::calcDirection(TVec3f *pOutDirection, f32 a2, f32 a3) const { +void ParabolicPath::calcDirection(TVec3f* pOutDirection, f32 a2, f32 a3) const { f32 f0; f32 f31; if (a2 < a3) { f31 = a3; f0 = 0.0f; - } - else { + } else { f0 = 1.0f; f31 = 1.0f - a3; diff --git a/src/Game/Util/PostureHolder.cpp b/src/Game/Util/PostureHolder.cpp index c82ca38df..ba22ea9bc 100644 --- a/src/Game/Util/PostureHolder.cpp +++ b/src/Game/Util/PostureHolder.cpp @@ -1,11 +1,10 @@ #include "Game/LiveActor/LiveActor.hpp" #include "Game/Util/PostureHolder.hpp" -PostureHolder::PostureHolder(const LiveActor* pActor) : - mScale(pActor->mScale), - mRotation(pActor->mRotation), - mPosition(pActor->mPosition) -{} +PostureHolder::PostureHolder(const LiveActor* pActor) + : mScale(pActor->mScale), + mRotation(pActor->mRotation), + mPosition(pActor->mPosition) {} void PostureHolder::store(const LiveActor* pActor) { mScale.set(pActor->mScale); diff --git a/src/Game/Util/RumbleCalculator.cpp b/src/Game/Util/RumbleCalculator.cpp index bc883c24e..c41afb51e 100644 --- a/src/Game/Util/RumbleCalculator.cpp +++ b/src/Game/Util/RumbleCalculator.cpp @@ -27,6 +27,6 @@ void RumbleCalculator::reset() { _C.zero(); } -RumbleCalculatorCosMultLinear::RumbleCalculatorCosMultLinear(f32 a2, f32 a3, f32 a4, u32 a5) : RumbleCalculator(a2, a3, a4, a5) { - +RumbleCalculatorCosMultLinear::RumbleCalculatorCosMultLinear(f32 a2, f32 a3, f32 a4, u32 a5) + : RumbleCalculator(a2, a3, a4, a5) { } \ No newline at end of file diff --git a/src/Game/Util/SceneUtil.cpp b/src/Game/Util/SceneUtil.cpp index 675ada61c..8fb010eb6 100644 --- a/src/Game/Util/SceneUtil.cpp +++ b/src/Game/Util/SceneUtil.cpp @@ -16,7 +16,7 @@ namespace { ScenePlayingResult* getScenePlayingResult() { return MR::getSceneObj(SceneObj_ScenePlayingResult); } -}; +}; // namespace namespace MR { s32 getCurrentScenarioNo() { @@ -74,9 +74,7 @@ namespace MR { } bool isStageAstroLocation() { - return isEqualStageName("AstroGalaxy") - || isEqualStageName("AstroDome") - || isEqualStageName("LibraryRoom"); + return isEqualStageName("AstroGalaxy") || isEqualStageName("AstroDome") || isEqualStageName("LibraryRoom"); } bool isStageSwimAngleLimit() { @@ -84,8 +82,7 @@ namespace MR { } bool isStageStarPieceFollowGroupLimit() { - return isEqualStageName("EggStarGalaxy") - && getCurrentScenarioNo() == 2; + return isEqualStageName("EggStarGalaxy") && getCurrentScenarioNo() == 2; } bool isStageFileSelect() { @@ -93,9 +90,7 @@ namespace MR { } bool isStageKoopaVs() { - return isStageKoopaVs1() - || isStageKoopaVs2() - || isStageKoopaVs3(); + return isStageKoopaVs1() || isStageKoopaVs2() || isStageKoopaVs3(); } bool isStageKoopaVs1() { @@ -123,8 +118,7 @@ namespace MR { } bool isStageSuddenDeathDodoryu() { - return isEqualStageName("CosmosGardenGalaxy") - && getCurrentScenarioNo() == 4; + return isEqualStageName("CosmosGardenGalaxy") && getCurrentScenarioNo() == 4; } void setInitializeStatePlacementPlayer() { @@ -234,4 +228,4 @@ namespace MR { const char* getCurrentPlacementZoneName() { return getZoneNameFromZoneId(getCurrentPlacementZoneId()); } -}; +}; // namespace MR diff --git a/src/Game/Util/ScreenUtil.cpp b/src/Game/Util/ScreenUtil.cpp index 3ea3c1aba..8836e0e43 100644 --- a/src/Game/Util/ScreenUtil.cpp +++ b/src/Game/Util/ScreenUtil.cpp @@ -43,15 +43,13 @@ namespace { void appearInformationMessage(bool hasButtonLayout, bool isCenter) { if (isCenter) { MR::getGameSceneLayoutHolder()->mInformationMessage->setCenter(true); - } - else { + } else { MR::getGameSceneLayoutHolder()->mInformationMessage->setCenter(false); } if (hasButtonLayout) { MR::getGameSceneLayoutHolder()->mInformationMessage->appearWithButtonLayout(); - } - else { + } else { MR::getGameSceneLayoutHolder()->mInformationMessage->appear(); } } @@ -79,7 +77,7 @@ namespace { MoviePlayerSimple* getMoviePlayer() { return MR::getSceneObj(SceneObj_MoviePlayerSimple); } -}; +}; // namespace namespace MR { u32 getViWidth() { @@ -89,8 +87,7 @@ namespace MR { f32 getSafetyVIScreenWidthRatio() { if (isScreen16Per9()) { return 0.87f; - } - else { + } else { return 0.844f; } } @@ -187,8 +184,7 @@ namespace MR { } bool isWipeActive() { - return SceneWipeHolderFunction::getSceneWipeHolder()->isWipeIn() - || SceneWipeHolderFunction::getSceneWipeHolder()->isWipeOut(); + return SceneWipeHolderFunction::getSceneWipeHolder()->isWipeIn() || SceneWipeHolderFunction::getSceneWipeHolder()->isWipeOut(); } bool isWipeBlank() { @@ -233,8 +229,7 @@ namespace MR { } bool isSystemWipeActive() { - return getSystemWipeHolder()->isWipeIn() - || getSystemWipeHolder()->isWipeOut(); + return getSystemWipeHolder()->isWipeIn() || getSystemWipeHolder()->isWipeOut(); } void closeSystemWipeCircleWithCaptureScreen(s32 param1) { @@ -310,13 +305,11 @@ namespace MR { } bool isNormalBloomOn() { - return isExistSceneObj(SceneObj_BloomEffect) - && getNormalBloom()->isSomething(); + return isExistSceneObj(SceneObj_BloomEffect) && getNormalBloom()->isSomething(); } bool isNormalBloomForEachModel() { - return isExistSceneObj(SceneObj_BloomEffect) - && getNormalBloom()->isForEachModel(); + return isExistSceneObj(SceneObj_BloomEffect) && getNormalBloom()->isForEachModel(); } void setNormalBloomIntensity(u8 intensity) { @@ -360,7 +353,6 @@ namespace MR { } void startGlobalTimer() { - } void resetGlobalTimer() { @@ -599,4 +591,4 @@ namespace MR { startSystemSE("SE_SY_1UP", -1, -1); getGameSceneLayoutHolder()->requestOneUp(1); } -}; +}; // namespace MR diff --git a/src/Game/Util/SpringValue.cpp b/src/Game/Util/SpringValue.cpp index c04be4b8f..d1e0e25d8 100644 --- a/src/Game/Util/SpringValue.cpp +++ b/src/Game/Util/SpringValue.cpp @@ -13,7 +13,7 @@ SpringValue::SpringValue(f32 param1, f32 param2, f32 param3, f32 param4, f32 par _4 = param2; _8 = param3; _C = param4; - _10 = param5; + _10 = param5; } void SpringValue::setParam(f32 param1, f32 param2, f32 param3, f32 param4, f32 param5) { @@ -26,7 +26,7 @@ void SpringValue::setParam(f32 param1, f32 param2, f32 param3, f32 param4, f32 p void SpringValue::update() { f32 rF1; - rF1 = _4 +_10; + rF1 = _4 + _10; _4 = _0 - rF1; - _10 = _4 * (( _8 * _C) + _10); + _10 = _4 * ((_8 * _C) + _10); } diff --git a/src/Game/Util/StringUtil.cpp b/src/Game/Util/StringUtil.cpp index 5c84d1dd3..772cb8c6e 100644 --- a/src/Game/Util/StringUtil.cpp +++ b/src/Game/Util/StringUtil.cpp @@ -15,17 +15,17 @@ #ifdef __cplusplus extern "C" { - int strcasecmp(const char*, const char*); - // extern int vswprintf(wchar_t*, size_t, const wchar_t*, va_list); - int wcsncpy(wchar_t*, const wchar_t*, size_t); +int strcasecmp(const char*, const char*); +// extern int vswprintf(wchar_t*, size_t, const wchar_t*, va_list); +int wcsncpy(wchar_t*, const wchar_t*, size_t); }; #endif namespace MR { struct Tag { - u16 _0; - u8 mDataSize; - u8 _3; + u16 _0; + u8 mDataSize; + u8 _3; wchar_t mBuffer[1]; }; @@ -58,8 +58,7 @@ namespace MR { minute = 59; second = 59; centisecond = 99; - } - else { + } else { s32 signedFrame = frame; minute = signedFrame / FRAME_PER_MIN; @@ -79,8 +78,7 @@ namespace MR { if (frame >= FRAME_PER_HOUR) { minute = 59; second = 59; - } - else { + } else { minute = frame / FRAME_PER_MIN; second = (frame % FRAME_PER_MIN) / FRAME_PER_SEC; } @@ -262,8 +260,8 @@ namespace MR { bool isMessageEditorNextTag(const wchar_t* pStr) { const Tag* pTag = reinterpret_cast(pStr); - u8 v1 = pTag->_3; - wchar_t v2 = pTag->mBuffer[0]; + u8 v1 = pTag->_3; + wchar_t v2 = pTag->mBuffer[0]; return v1 == 1 && v2 == 1; } @@ -366,4 +364,4 @@ namespace MR { sscanf(pSrc, "\t{%ff,%ff,%ff,%ff}", &pDst[0], &pDst[1], &pDst[2], &pDst[3]); } -}; +}; // namespace MR diff --git a/src/Game/Util/SwitchEventFunctorListener.cpp b/src/Game/Util/SwitchEventFunctorListener.cpp index ae0dd6f2e..7d6cf004c 100644 --- a/src/Game/Util/SwitchEventFunctorListener.cpp +++ b/src/Game/Util/SwitchEventFunctorListener.cpp @@ -5,11 +5,11 @@ SwitchEventFunctorListener::SwitchEventFunctorListener() { mOffFunctor = nullptr; } -void SwitchEventFunctorListener::setOnFunctor(const MR::FunctorBase &rFunctor) { +void SwitchEventFunctorListener::setOnFunctor(const MR::FunctorBase& rFunctor) { mOnFunctor = rFunctor.clone(nullptr); } -void SwitchEventFunctorListener::setOffFunctor(const MR::FunctorBase &rFunctor) { +void SwitchEventFunctorListener::setOffFunctor(const MR::FunctorBase& rFunctor) { mOffFunctor = rFunctor.clone(nullptr); } diff --git a/src/Game/Util/SystemUtil.cpp b/src/Game/Util/SystemUtil.cpp index 2616729c4..59fe25d27 100644 --- a/src/Game/Util/SystemUtil.cpp +++ b/src/Game/Util/SystemUtil.cpp @@ -20,19 +20,19 @@ namespace MR { GameSystemObjHolder* getGameSystemObjHolder() { return SingletonHolder::get()->mObjHolder; } -}; +}; // namespace MR namespace { FunctionAsyncExecutor* getFunctionAsyncExecutor() NO_INLINE { return MR::getGameSystemObjHolder()->mAsyncExec; } -}; +}; // namespace namespace { NameObjHolder* getSceneNameObjHolder() NO_INLINE { return SingletonHolder::get()->mSceneController->mObjHolder; } -}; +}; // namespace namespace MR { nw4r::ut::Font* getFontOnCurrentLanguage() { @@ -69,7 +69,6 @@ namespace MR { void waitEndChangeArchivePlayer() { while (!GameSystemFunction::isEndChangeArchivePlayer()) { - } } @@ -172,4 +171,4 @@ namespace MR { bool isDisplayEncouragePal60Window() { return VIGetTvFormat() == 1; } -}; +}; // namespace MR diff --git a/src/Game/Util/TriggerChecker.cpp b/src/Game/Util/TriggerChecker.cpp index ea84d07f5..0e9a2ec9e 100644 --- a/src/Game/Util/TriggerChecker.cpp +++ b/src/Game/Util/TriggerChecker.cpp @@ -1,9 +1,8 @@ #include "Game/Util/TriggerChecker.hpp" -TriggerChecker::TriggerChecker() : - mPrevLevel(false), - mCurrLevel(false) -{} +TriggerChecker::TriggerChecker() + : mPrevLevel(false), + mCurrLevel(false) {} void TriggerChecker::update(bool input) { mPrevLevel = mCurrLevel; diff --git a/src/Game/Util/ValueControl.cpp b/src/Game/Util/ValueControl.cpp index a2c6906ae..1c3c42ad5 100644 --- a/src/Game/Util/ValueControl.cpp +++ b/src/Game/Util/ValueControl.cpp @@ -1,10 +1,9 @@ #include "Game/Util/ValueControl.hpp" -ValueControl::ValueControl(int maxFrame) : - mFrame(0), - mMaxFrame(maxFrame), - mDirection(Direction_Forward) -{} +ValueControl::ValueControl(int maxFrame) + : mFrame(0), + mMaxFrame(maxFrame), + mDirection(Direction_Forward) {} void ValueControl::setDirToOne() { mDirection = Direction_Forward; @@ -60,8 +59,7 @@ s32 ValueControl::getDirection() const { void ValueControl::resetFrame() { if (mDirection > 0) { mFrame = 0; - } - else { + } else { mFrame = mMaxFrame; } } diff --git a/src/JSystem/J3DGraphBase/J3DMaterial.cpp b/src/JSystem/J3DGraphBase/J3DMaterial.cpp index b3a8ca324..afce223c5 100644 --- a/src/JSystem/J3DGraphBase/J3DMaterial.cpp +++ b/src/JSystem/J3DGraphBase/J3DMaterial.cpp @@ -14,4 +14,3 @@ void J3DCurrentMtx::setCurrentTexMtx(u8 a1, u8 a2, u8 a3, u8 a4, u8 a5, u8 a6, u _4 = (a8 << 18) | (a7 << 12) & 0xFF000 | a5 & 0xFFF00FFF | (a6 << 6) & 0x3FC0; } #endif - diff --git a/src/JSystem/J3DGraphBase/J3DVertex.cpp b/src/JSystem/J3DGraphBase/J3DVertex.cpp index 9c6359177..d374165fe 100644 --- a/src/JSystem/J3DGraphBase/J3DVertex.cpp +++ b/src/JSystem/J3DGraphBase/J3DVertex.cpp @@ -7,5 +7,4 @@ J3DDrawMtxData::J3DDrawMtxData() { } J3DDrawMtxData::~J3DDrawMtxData() { - } \ No newline at end of file diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp index 985ee6dc9..429535d65 100644 --- a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp @@ -10,7 +10,7 @@ J3DModelLoader::J3DModelLoader() { mEnvelopeSize = 0; } -J3DModelData* J3DModelLoaderDataBase::load(const void *data, u32 flags) { +J3DModelData* J3DModelLoaderDataBase::load(const void* data, u32 flags) { if (data == nullptr) { return nullptr; } diff --git a/src/JSystem/JAudio2/JASSeqCtrl.cpp b/src/JSystem/JAudio2/JASSeqCtrl.cpp index f5320a668..5a9ac5749 100644 --- a/src/JSystem/JAudio2/JASSeqCtrl.cpp +++ b/src/JSystem/JAudio2/JASSeqCtrl.cpp @@ -4,112 +4,118 @@ JASSeqParser JASSeqCtrl::sDefaultParser = JASSeqParser(); JASSeqCtrl::JASSeqCtrl() { - JASSeqReader::init(); - mParser = &sDefaultParser; - mTimer = 0; - mCursorSwap = nullptr; - _48 = 0; - _4C = 0; - _4E = 0; - mIntTimer = 0; - _51 = false; - _54 = 0; - _58 = 0; - JASSeqReader::init(); + JASSeqReader::init(); + mParser = &sDefaultParser; + mTimer = 0; + mCursorSwap = nullptr; + _48 = 0; + _4C = 0; + _4E = 0; + mIntTimer = 0; + _51 = false; + _54 = 0; + _58 = 0; + JASSeqReader::init(); } void JASSeqCtrl::init() { - JASSeqReader::init(); - mParser = &sDefaultParser; - mTimer = 0; - mCursorSwap = nullptr; - _48 = 0; - _4C = 0; - _4E = 0; - mIntTimer = 0; - _54 = 0; - _58 = 0; - _51 = false; + JASSeqReader::init(); + mParser = &sDefaultParser; + mTimer = 0; + mCursorSwap = nullptr; + _48 = 0; + _4C = 0; + _4E = 0; + mIntTimer = 0; + _54 = 0; + _58 = 0; + _51 = false; } -void JASSeqCtrl::start(void *, u32 offset) { - JASSeqReader::init(); - mSeqCursor = (void *)((u8 *)mSeqBuff + offset); +void JASSeqCtrl::start(void*, u32 offset) { + JASSeqReader::init(); + mSeqCursor = (void*)((u8*)mSeqBuff + offset); } -int JASSeqCtrl::tickProc(JASTrack *track) { - if(!mSeqBuff) return 0; - interrupt(JASSeqCtrl::INTR_6); - timerProcess(); - if(_51) { - if(!track->checkNoteStop(0)) return 0; - _51 = false; - } - if(mTimer > 0) mTimer--; - checkIntr(); - - while((!mTimer || mCursorSwap) && !_51) { - if(mParser->parse(track) < 0) return -1; - } +int JASSeqCtrl::tickProc(JASTrack* track) { + if (!mSeqBuff) + return 0; + interrupt(JASSeqCtrl::INTR_6); + timerProcess(); + if (_51) { + if (!track->checkNoteStop(0)) + return 0; + _51 = false; + } + if (mTimer > 0) + mTimer--; + checkIntr(); - return 0; + while ((!mTimer || mCursorSwap) && !_51) { + if (mParser->parse(track) < 0) + return -1; + } + + return 0; } void JASSeqCtrl::interrupt(JASSeqCtrl::IntrType interrupt) { - u32 mask = 1 << interrupt; - if(!(_4E & mask)) return; - _4C |= mask; + u32 mask = 1 << interrupt; + if (!(_4E & mask)) + return; + _4C |= mask; } void JASSeqCtrl::setIntrMask(u32 mask) { - _4E |= mask; + _4E |= mask; } void JASSeqCtrl::clrIntrMask(u32 mask) { - _4E &= ~mask; + _4E &= ~mask; } bool JASSeqCtrl::retIntr() { - if(!mCursorSwap) return false; - mSeqCursor = mCursorSwap; - mCursorSwap = nullptr; - return true; + if (!mCursorSwap) + return false; + mSeqCursor = mCursorSwap; + mCursorSwap = nullptr; + return true; } s32 JASSeqCtrl::findIntr() { - u32 intr = _4E & _4C; - for(u32 i = 0; intr != 0; i++) { - if(intr & 1) { - _4C &= ~(1 << i); - return i; - } - else intr >>= 1; - } - return -1; + u32 intr = _4E & _4C; + for (u32 i = 0; intr != 0; i++) { + if (intr & 1) { + _4C &= ~(1 << i); + return i; + } else + intr >>= 1; + } + return -1; } void JASSeqCtrl::checkIntr() { - s32 intr; - if(!mCursorSwap && (intr = findIntr()) >= 0) { - intr = intr * 3 + _48; - u32 offset = calcSeekAmt(intr); - mCursorSwap = mSeqCursor; - mSeqCursor = (void *)((u8 *)mSeqBuff + offset); - } + s32 intr; + if (!mCursorSwap && (intr = findIntr()) >= 0) { + intr = intr * 3 + _48; + u32 offset = calcSeekAmt(intr); + mCursorSwap = mSeqCursor; + mSeqCursor = (void*)((u8*)mSeqBuff + offset); + } } void JASSeqCtrl::timerProcess() { - if(_54 != 0) { - if(!--_54) { - interrupt(INTR_5); - if(mIntTimer) { - if(--mIntTimer) { - _54 = _58; - } - } - else _54 = _58; - } - } + if (_54 != 0) { + if (!--_54) { + interrupt(INTR_5); + if (mIntTimer) { + if (--mIntTimer) { + _54 = _58; + } + } else + _54 = _58; + } + } } JASSeqParser::JASSeqParser() {} diff --git a/src/JSystem/JAudio2/JASSeqParser.cpp b/src/JSystem/JAudio2/JASSeqParser.cpp index 32c5ab486..8e50dace3 100644 --- a/src/JSystem/JAudio2/JASSeqParser.cpp +++ b/src/JSystem/JAudio2/JASSeqParser.cpp @@ -69,866 +69,820 @@ const static s16 sIIRCutoff[0x208] = { 0x018D, 0x0AA6, 0x049B, 0x7099, 0x0166, 0x09A0, 0x042A, 0x7241, 0x0140, 0x0897, 0x03B7, 0x73EC, 0x0119, 0x078C, 0x0344, 0x759B, 0x00F2, 0x067F, 0x02CF, 0x774D, 0x00CA, 0x056F, 0x025A, 0x7903, - 0x00A3, 0x045D, 0x01E3, 0x7ABD, 0x007A, 0x0349, 0x016C, 0x7C7A -}; + 0x00A3, 0x045D, 0x01E3, 0x7ABD, 0x007A, 0x0349, 0x016C, 0x7C7A}; JASSeqParser::Command JASSeqParser::sCmdInfo[0x60] = { - {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, - {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, - {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, - {&JASSeqParser::cmdNoteOn, 3}, - {&JASSeqParser::cmdNoteOff, 1}, - {&JASSeqParser::cmdNote, 4, 0x40}, - {&JASSeqParser::cmdSetLastNote, 1}, - {nullptr}, {nullptr}, {nullptr}, - {&JASSeqParser::cmdParamE, 2}, - {&JASSeqParser::cmdParamI, 2, 4}, - {&JASSeqParser::cmdParamEI, 3, 0x10}, - {&JASSeqParser::cmdParamII, 3, 0x14}, - {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, - {&JASSeqParser::cmdOpenTrack, 2, 8}, - {&JASSeqParser::cmdCloseTrack, 1}, - {&JASSeqParser::cmdCall, 1, 2}, - {&JASSeqParser::cmdCallF, 2, 8}, - {&JASSeqParser::cmdRet, 0}, - {&JASSeqParser::cmdRetF, 1}, - {&JASSeqParser::cmdJmp, 1, 2}, - {&JASSeqParser::cmdJmpF, 2, 8}, - {&JASSeqParser::cmdJmpTable, 2, 0xb}, - {&JASSeqParser::cmdCallTable, 2, 0xb}, - {&JASSeqParser::cmdLoopS, 1, 1}, - {&JASSeqParser::cmdLoopE, 0}, - {nullptr}, {nullptr}, {nullptr}, - {&JASSeqParser::cmdReadPort, 2}, - {&JASSeqParser::cmdWritePort, 2, 0xc}, - {&JASSeqParser::cmdCheckPortImport, 1}, - {&JASSeqParser::cmdCheckPortExport, 1}, - {&JASSeqParser::cmdParentWritePort, 2, 0xc}, - {&JASSeqParser::cmdChildWritePort, 2, 0xc}, - {&JASSeqParser::cmdParentReadPort, 2}, - {&JASSeqParser::cmdChildReadPort, 2}, - {&JASSeqParser::cmdRegLoad, 2, 4}, - {&JASSeqParser::cmdReg, 3, 0x30}, - {&JASSeqParser::cmdReg, 3, 0x10}, - {&JASSeqParser::cmdRegUni, 2}, - {&JASSeqParser::cmdRegTblLoad, 4, 0xe0}, - {nullptr}, {nullptr}, {nullptr}, - {&JASSeqParser::cmdTempo, 1, 1}, - {&JASSeqParser::cmdBankPrg, 1, 1}, - {&JASSeqParser::cmdBank, 1}, - {&JASSeqParser::cmdPrg, 1}, - {nullptr}, {nullptr}, {nullptr}, - {&JASSeqParser::cmdEnvScaleSet, 2, 4}, - {&JASSeqParser::cmdEnvSet, 2, 8}, - {&JASSeqParser::cmdSimpleADSR, 5, 0x155}, - {&JASSeqParser::cmdBusConnect, 2, 4}, - {&JASSeqParser::cmdIIRCutOff, 1}, - {&JASSeqParser::cmdIIRSet, 4, 0x55}, - {&JASSeqParser::cmdFIRSet, 1, 2}, - {nullptr}, {nullptr}, - {&JASSeqParser::cmdWait, 0}, - {&JASSeqParser::cmdWaitByte, 1}, - {nullptr}, - {&JASSeqParser::cmdSetIntTable, 1, 2}, - {&JASSeqParser::cmdSetInterrupt, 1, 1}, - {&JASSeqParser::cmdDisInterrupt, 1, 1}, - {&JASSeqParser::cmdClrI, 0}, - {&JASSeqParser::cmdRetI, 0}, - {&JASSeqParser::cmdIntTimer, 2, 4}, - {&JASSeqParser::cmdSyncCPU, 1, 1}, - {nullptr}, {nullptr}, {nullptr}, - {&JASSeqParser::cmdPrintf, 0}, - {&JASSeqParser::cmdNop, 0}, - {&JASSeqParser::cmdFinish, 0} -}; + {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, {&JASSeqParser::cmdNoteOn, 3}, {&JASSeqParser::cmdNoteOff, 1}, {&JASSeqParser::cmdNote, 4, 0x40}, {&JASSeqParser::cmdSetLastNote, 1}, {nullptr}, {nullptr}, {nullptr}, {&JASSeqParser::cmdParamE, 2}, {&JASSeqParser::cmdParamI, 2, 4}, {&JASSeqParser::cmdParamEI, 3, 0x10}, {&JASSeqParser::cmdParamII, 3, 0x14}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr}, {&JASSeqParser::cmdOpenTrack, 2, 8}, {&JASSeqParser::cmdCloseTrack, 1}, {&JASSeqParser::cmdCall, 1, 2}, {&JASSeqParser::cmdCallF, 2, 8}, {&JASSeqParser::cmdRet, 0}, {&JASSeqParser::cmdRetF, 1}, {&JASSeqParser::cmdJmp, 1, 2}, {&JASSeqParser::cmdJmpF, 2, 8}, {&JASSeqParser::cmdJmpTable, 2, 0xb}, {&JASSeqParser::cmdCallTable, 2, 0xb}, {&JASSeqParser::cmdLoopS, 1, 1}, {&JASSeqParser::cmdLoopE, 0}, {nullptr}, {nullptr}, {nullptr}, {&JASSeqParser::cmdReadPort, 2}, {&JASSeqParser::cmdWritePort, 2, 0xc}, {&JASSeqParser::cmdCheckPortImport, 1}, {&JASSeqParser::cmdCheckPortExport, 1}, {&JASSeqParser::cmdParentWritePort, 2, 0xc}, {&JASSeqParser::cmdChildWritePort, 2, 0xc}, {&JASSeqParser::cmdParentReadPort, 2}, {&JASSeqParser::cmdChildReadPort, 2}, {&JASSeqParser::cmdRegLoad, 2, 4}, {&JASSeqParser::cmdReg, 3, 0x30}, {&JASSeqParser::cmdReg, 3, 0x10}, {&JASSeqParser::cmdRegUni, 2}, {&JASSeqParser::cmdRegTblLoad, 4, 0xe0}, {nullptr}, {nullptr}, {nullptr}, {&JASSeqParser::cmdTempo, 1, 1}, {&JASSeqParser::cmdBankPrg, 1, 1}, {&JASSeqParser::cmdBank, 1}, {&JASSeqParser::cmdPrg, 1}, {nullptr}, {nullptr}, {nullptr}, {&JASSeqParser::cmdEnvScaleSet, 2, 4}, {&JASSeqParser::cmdEnvSet, 2, 8}, {&JASSeqParser::cmdSimpleADSR, 5, 0x155}, {&JASSeqParser::cmdBusConnect, 2, 4}, {&JASSeqParser::cmdIIRCutOff, 1}, {&JASSeqParser::cmdIIRSet, 4, 0x55}, {&JASSeqParser::cmdFIRSet, 1, 2}, {nullptr}, {nullptr}, {&JASSeqParser::cmdWait, 0}, {&JASSeqParser::cmdWaitByte, 1}, {nullptr}, {&JASSeqParser::cmdSetIntTable, 1, 2}, {&JASSeqParser::cmdSetInterrupt, 1, 1}, {&JASSeqParser::cmdDisInterrupt, 1, 1}, {&JASSeqParser::cmdClrI, 0}, {&JASSeqParser::cmdRetI, 0}, {&JASSeqParser::cmdIntTimer, 2, 4}, {&JASSeqParser::cmdSyncCPU, 1, 1}, {nullptr}, {nullptr}, {nullptr}, {&JASSeqParser::cmdPrintf, 0}, {&JASSeqParser::cmdNop, 0}, {&JASSeqParser::cmdFinish, 0}}; JASSeqParser::Command JASSeqParser::sExtCmdInfo[0xff] = { - {nullptr}, - {&JASSeqParser::cmdDump}, - {nullptr}, {nullptr}, {nullptr}, {nullptr}, {nullptr} -}; + {nullptr}, + {&JASSeqParser::cmdDump}, + {nullptr}, + {nullptr}, + {nullptr}, + {nullptr}, + {nullptr}}; -bool JASSeqParser::conditionCheck(JASTrack *track, BranchCondition cond) { - u16 res = track->mRegs.read(JASRegisterParam::REG_F); - switch(cond) { - case JASSeqParser::COND_ALWAYS: - return true; - case JASSeqParser::COND_NULL: - return !res; - case JASSeqParser::COND_NONNULL: - return res; - case JASSeqParser::COND_1: - return !(res - 1); - case JASSeqParser::COND_NEGATIVE: - return res >= 0x8000; - case JASSeqParser::COND_POSITIVE: - return res < 0x8000; - } - return false; +bool JASSeqParser::conditionCheck(JASTrack* track, BranchCondition cond) { + u16 res = track->mRegs.read(JASRegisterParam::REG_F); + switch (cond) { + case JASSeqParser::COND_ALWAYS: + return true; + case JASSeqParser::COND_NULL: + return !res; + case JASSeqParser::COND_NONNULL: + return res; + case JASSeqParser::COND_1: + return !(res - 1); + case JASSeqParser::COND_NEGATIVE: + return res >= 0x8000; + case JASSeqParser::COND_POSITIVE: + return res < 0x8000; + } + return false; } -void JASSeqParser::writeReg(JASTrack *track, u32 reg, u32 value) { - track->mRegs.write(JASRegisterParam::REG_F, value); - if(reg < 0x40) track->mRegs.write((JASRegisterParam::RegID)reg, value); - else switch(reg - 0x40) { - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - case 8: - case 9: - case 0xA: - case 0xB: - case 0xC: - case 0xD: - case 0xE: - case 0xF: - track->mPorts.mPorts[reg - 0x40] = value; - break; - case 0x22: - track->setTimebase(value); - break; - case 0x23: - track->mTransposeAmt = value; - break; - case 0x24: - track->_230 = value; - break; - case 0x25: - track->mGateLatency = value; - break; - case 0x26: - track->_220 = value; - break; - case 0x27: - track->mBank = (u8)value; - break; - case 0x28: - track->mPrg = (u8)value; - break; - case 0x29: - track->_218 = value; - track->_218 /= 32767f; - break; - case 0x2A: - track->_231 = value; - track->_232 = value >> 8; - break; - case 0x2B: - track->_231 = value; - break; - case 0x2C: - track->_232 = value; - break; - case 0x2D: - track->_224 = value; - break; - case 0x2E: - track->_1E0 = value; - track->_1E0 /= 1524f; - break; - case 0x2F: - track->_1E0 = value; - track->_1E0 /= 12192f; - break; - case 0x30: - track->_1E8 = value; - track->_1E8 *= 0.00390625f; - break; - case 0x31: - track->_1E4 = value; - track->_1E4 *= 0.015625f; - break; - case 0x32: - track->_1EC = value; - track->_1EC *= 0.015625f; - break; - case 0x33: - track->_1F0 = value; - break; - case 0x34: - track->_1F2 = value; - break; - } +void JASSeqParser::writeReg(JASTrack* track, u32 reg, u32 value) { + track->mRegs.write(JASRegisterParam::REG_F, value); + if (reg < 0x40) + track->mRegs.write((JASRegisterParam::RegID)reg, value); + else + switch (reg - 0x40) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + case 0xA: + case 0xB: + case 0xC: + case 0xD: + case 0xE: + case 0xF: + track->mPorts.mPorts[reg - 0x40] = value; + break; + case 0x22: + track->setTimebase(value); + break; + case 0x23: + track->mTransposeAmt = value; + break; + case 0x24: + track->_230 = value; + break; + case 0x25: + track->mGateLatency = value; + break; + case 0x26: + track->_220 = value; + break; + case 0x27: + track->mBank = (u8)value; + break; + case 0x28: + track->mPrg = (u8)value; + break; + case 0x29: + track->_218 = value; + track->_218 /= 32767f; + break; + case 0x2A: + track->_231 = value; + track->_232 = value >> 8; + break; + case 0x2B: + track->_231 = value; + break; + case 0x2C: + track->_232 = value; + break; + case 0x2D: + track->_224 = value; + break; + case 0x2E: + track->_1E0 = value; + track->_1E0 /= 1524f; + break; + case 0x2F: + track->_1E0 = value; + track->_1E0 /= 12192f; + break; + case 0x30: + track->_1E8 = value; + track->_1E8 *= 0.00390625f; + break; + case 0x31: + track->_1E4 = value; + track->_1E4 *= 0.015625f; + break; + case 0x32: + track->_1EC = value; + track->_1EC *= 0.015625f; + break; + case 0x33: + track->_1F0 = value; + break; + case 0x34: + track->_1F2 = value; + break; + } } -u32 JASSeqParser::readReg(JASTrack *track, u32 reg) const { - if(reg < 0x40) return track->mRegs.read((JASRegisterParam::RegID)reg); - else { - u32 ret = 0; - switch(reg - 0x40) { - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - case 8: - case 9: - case 0xA: - case 0xB: - case 0xC: - case 0xD: - case 0xE: - case 0xF: - ret = track->mPorts.mPorts[reg - 0x40]; - break; - // Create a bitmap of the current track's children - case 0x20: - u16 currBit = 1; - JASTrack *child; - for(u32 i = 0; i < 0x10; i++) { - if(child = track->mChildren[i]) { - if(child->_240 == 1) ret |= currBit; - } - currBit <<= 1; - } - break; - case 0x21: - if(!track->mNumStacks) return 0; - ret = track->mPorts.mPorts[track->mNumStacks - 0x20 + 5]; - break; - case 0x22: - ret = track->mTimebase; - break; - case 0x23: - ret = track->mTransposeAmt; - break; - case 0x24: - ret = track->_230; - break; - case 0x25: - ret = track->mGateLatency; - break; - case 0x26: - ret = track->_220; - break; - case 0x27: - ret = track->mBank; - break; - case 0x28: - ret = track->mPrg; - break; - case 0x29: { - f32 tmp = track->_218; - ret = tmp * 32767f; - break; - } - case 0x2A: - ret = track->_232 | track->_231; - break; - case 0x2B: - ret = track->_231; - break; - case 0x2C: - ret = track->_232; - break; - case 0x2D: - ret = track->_224; - break; - case 0x2E: { - f32 tmp = track->_1E0; - ret = tmp * 1524f; - break; - } - case 0x2F: { - f32 tmp = track->_1E0; - ret = tmp * 12192f; - break; - } - case 0x30: { - f32 tmp = track->_1E8; - ret = tmp * 256f; - break; - } - case 0x31: { - f32 tmp = track->_1E4; - ret = tmp * 64f; - break; - } - case 0x32: { - f32 tmp = track->_1EC; - ret = tmp * 64f; - break; - } - case 0x33: - ret = track->_1F0; - break; - case 0x34: - ret = track->_1F2; - break; - } - return ret; - } +u32 JASSeqParser::readReg(JASTrack* track, u32 reg) const { + if (reg < 0x40) + return track->mRegs.read((JASRegisterParam::RegID)reg); + else { + u32 ret = 0; + switch (reg - 0x40) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + case 6: + case 7: + case 8: + case 9: + case 0xA: + case 0xB: + case 0xC: + case 0xD: + case 0xE: + case 0xF: + ret = track->mPorts.mPorts[reg - 0x40]; + break; + // Create a bitmap of the current track's children + case 0x20: + u16 currBit = 1; + JASTrack* child; + for (u32 i = 0; i < 0x10; i++) { + if (child = track->mChildren[i]) { + if (child->_240 == 1) + ret |= currBit; + } + currBit <<= 1; + } + break; + case 0x21: + if (!track->mNumStacks) + return 0; + ret = track->mPorts.mPorts[track->mNumStacks - 0x20 + 5]; + break; + case 0x22: + ret = track->mTimebase; + break; + case 0x23: + ret = track->mTransposeAmt; + break; + case 0x24: + ret = track->_230; + break; + case 0x25: + ret = track->mGateLatency; + break; + case 0x26: + ret = track->_220; + break; + case 0x27: + ret = track->mBank; + break; + case 0x28: + ret = track->mPrg; + break; + case 0x29: { + f32 tmp = track->_218; + ret = tmp * 32767f; + break; + } + case 0x2A: + ret = track->_232 | track->_231; + break; + case 0x2B: + ret = track->_231; + break; + case 0x2C: + ret = track->_232; + break; + case 0x2D: + ret = track->_224; + break; + case 0x2E: { + f32 tmp = track->_1E0; + ret = tmp * 1524f; + break; + } + case 0x2F: { + f32 tmp = track->_1E0; + ret = tmp * 12192f; + break; + } + case 0x30: { + f32 tmp = track->_1E8; + ret = tmp * 256f; + break; + } + case 0x31: { + f32 tmp = track->_1E4; + ret = tmp * 64f; + break; + } + case 0x32: { + f32 tmp = track->_1EC; + ret = tmp * 64f; + break; + } + case 0x33: + ret = track->_1F0; + break; + case 0x34: + ret = track->_1F2; + break; + } + return ret; + } } -s32 JASSeqParser::cmdOpenTrack(JASTrack *track, u32 *args) { - u32 arg0 = args[0], arg1 = args[1]; - JASTrack *child = track->openChild(arg0); - if(!child) return 0; - child->setSeqData(track->mSeqBuff, arg1); - child->start(); - return 0; +s32 JASSeqParser::cmdOpenTrack(JASTrack* track, u32* args) { + u32 arg0 = args[0], arg1 = args[1]; + JASTrack* child = track->openChild(arg0); + if (!child) + return 0; + child->setSeqData(track->mSeqBuff, arg1); + child->start(); + return 0; } -s32 JASSeqParser::cmdCloseTrack(JASTrack *track, u32 *args) { - track->closeChild(args[0]); - return 0; +s32 JASSeqParser::cmdCloseTrack(JASTrack* track, u32* args) { + track->closeChild(args[0]); + return 0; } -s32 JASSeqParser::cmdCall(JASTrack *track, u32 *args) { - track->call(args[0]); - return 0; +s32 JASSeqParser::cmdCall(JASTrack* track, u32* args) { + track->call(args[0]); + return 0; } -s32 JASSeqParser::cmdCallF(JASTrack *track, u32 *args) { - if(conditionCheck(track, (BranchCondition)args[0])) track->call(args[1]); - return 0; +s32 JASSeqParser::cmdCallF(JASTrack* track, u32* args) { + if (conditionCheck(track, (BranchCondition)args[0])) + track->call(args[1]); + return 0; } -s32 JASSeqParser::cmdRet(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdRet(JASTrack* track, u32* args) { track->ret(); return 0; } -s32 JASSeqParser::cmdRetF(JASTrack *track, u32 *args) { - if(conditionCheck(track, (BranchCondition)args[0])) { - track->ret(); - return 0; - } - else return 0; +s32 JASSeqParser::cmdRetF(JASTrack* track, u32* args) { + if (conditionCheck(track, (BranchCondition)args[0])) { + track->ret(); + return 0; + } else + return 0; } -s32 JASSeqParser::cmdJmp(JASTrack *track, u32 *args) { - track->mSeqCursor = (void *)((u8 *)track->mSeqBuff + args[0]); +s32 JASSeqParser::cmdJmp(JASTrack* track, u32* args) { + track->mSeqCursor = (void*)((u8*)track->mSeqBuff + args[0]); return 0; } -s32 JASSeqParser::cmdJmpF(JASTrack *track, u32 *args) { - if(conditionCheck(track, (BranchCondition)args[0])) { - track->mSeqCursor = (void *)((u8 *)track->mSeqBuff + args[1]); - } - return 0; +s32 JASSeqParser::cmdJmpF(JASTrack* track, u32* args) { + if (conditionCheck(track, (BranchCondition)args[0])) { + track->mSeqCursor = (void*)((u8*)track->mSeqBuff + args[1]); + } + return 0; } -inline void mult3(u32 &a) { - a = a * 2 + a; +inline void mult3(u32& a) { + a = a * 2 + a; } -s32 JASSeqParser::cmdJmpTable(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdJmpTable(JASTrack* track, u32* args) { u32 idx = args[0]; mult3(idx); - track->mSeqCursor = (void *)((u8 *)track->mSeqBuff + track->calcSeekAmt(args[1] + idx)); + track->mSeqCursor = (void*)((u8*)track->mSeqBuff + track->calcSeekAmt(args[1] + idx)); return 0; } -s32 JASSeqParser::cmdCallTable(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdCallTable(JASTrack* track, u32* args) { u32 idx = args[0]; mult3(idx); track->call(track->calcSeekAmt(args[1] + idx)); return 0; } -s32 JASSeqParser::cmdLoopS(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdLoopS(JASTrack* track, u32* args) { track->loopStart(args[0]); return 0; } -s32 JASSeqParser::cmdLoopE(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdLoopE(JASTrack* track, u32* args) { track->loopEnd(); return 0; } -s32 JASSeqParser::cmdNote(JASTrack *track, u32 *args) { - execNoteOnGate(track, args[1], args[2], args[3], args[0]); +s32 JASSeqParser::cmdNote(JASTrack* track, u32* args) { + execNoteOnGate(track, args[1], args[2], args[3], args[0]); return 0; } -s32 JASSeqParser::cmdNoteOn(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdNoteOn(JASTrack* track, u32* args) { execNoteOnMidi(track, args[1], args[0], args[2]); return 0; } -s32 JASSeqParser::cmdNoteOff(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdNoteOff(JASTrack* track, u32* args) { execNoteOff(track, args[0]); return 0; } -s32 JASSeqParser::cmdReadPort(JASTrack *track, u32 *args) { - u16 res = track->readPortSelf(args[0]); +s32 JASSeqParser::cmdReadPort(JASTrack* track, u32* args) { + u16 res = track->readPortSelf(args[0]); writeReg(track, args[1], res); return 0; } -s32 JASSeqParser::cmdWritePort(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdWritePort(JASTrack* track, u32* args) { track->writePortSelf(args[0], args[1]); return 0; } -s32 JASSeqParser::cmdParentWritePort(JASTrack *track, u32 *args) { - if(track->mParent) track->mParent->writePort(args[0], args[1]); +s32 JASSeqParser::cmdParentWritePort(JASTrack* track, u32* args) { + if (track->mParent) + track->mParent->writePort(args[0], args[1]); return 0; } -s32 JASSeqParser::cmdChildWritePort(JASTrack *track, u32 *args) { - u8 offset = args[0] >> 4 & 0xf; - u8 port = args[0]; - JASTrack *child = track->mChildren[offset]; - if(child) child->writePort(port & 0xf, args[1]); +s32 JASSeqParser::cmdChildWritePort(JASTrack* track, u32* args) { + u8 offset = args[0] >> 4 & 0xf; + u8 port = args[0]; + JASTrack* child = track->mChildren[offset]; + if (child) + child->writePort(port & 0xf, args[1]); return 0; } -s32 JASSeqParser::cmdParentReadPort(JASTrack *track, u32 *args) { - if(track->mParent) { - u16 res = track->mParent->readPort(args[0]); - writeReg(track, args[1], res); - } +s32 JASSeqParser::cmdParentReadPort(JASTrack* track, u32* args) { + if (track->mParent) { + u16 res = track->mParent->readPort(args[0]); + writeReg(track, args[1], res); + } return 0; } -s32 JASSeqParser::cmdChildReadPort(JASTrack *track, u32 *args) { - u8 offset = args[0] >> 4 & 0xf; - u8 port = args[0]; - JASTrack *child = track->mChildren[offset]; - if(child) { - u16 res = child->readPort(port & 0xf); - writeReg(track, args[1], res); - } +s32 JASSeqParser::cmdChildReadPort(JASTrack* track, u32* args) { + u8 offset = args[0] >> 4 & 0xf; + u8 port = args[0]; + JASTrack* child = track->mChildren[offset]; + if (child) { + u16 res = child->readPort(port & 0xf); + writeReg(track, args[1], res); + } return 0; } -s32 JASSeqParser::cmdCheckPortImport(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdCheckPortImport(JASTrack* track, u32* args) { track->mRegs.write(JASRegisterParam::REG_F, track->mPorts.checkImport(args[0])); return 0; } -s32 JASSeqParser::cmdCheckPortExport(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdCheckPortExport(JASTrack* track, u32* args) { track->mRegs.write(JASRegisterParam::REG_F, track->mPorts.checkExport(args[0])); return 0; } -s32 JASSeqParser::cmdWait(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdWait(JASTrack* track, u32* args) { track->mTimer = track->readMidiValue(); return 0; } -s32 JASSeqParser::cmdWaitByte(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdWaitByte(JASTrack* track, u32* args) { track->mTimer = args[0]; return 0; } -s32 JASSeqParser::cmdSetLastNote(JASTrack *track, u32 *args) { - if(args[0] < 0x100) track->setLatestKey(args[0]); +s32 JASSeqParser::cmdSetLastNote(JASTrack* track, u32* args) { + if (args[0] < 0x100) + track->setLatestKey(args[0]); return 0; } -s32 JASSeqParser::cmdEnvScaleSet(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdEnvScaleSet(JASTrack* track, u32* args) { track->setOscScale(args[0], args[1] / 16383f); return 0; } -s32 JASSeqParser::cmdEnvSet(JASTrack *track, u32 *args) { - track->setOscTable(args[0], (const JASOscillator::Point *)((u8 *)track->mSeqBuff + args[1])); +s32 JASSeqParser::cmdEnvSet(JASTrack* track, u32* args) { + track->setOscTable(args[0], (const JASOscillator::Point*)((u8*)track->mSeqBuff + args[1])); return 0; } -s32 JASSeqParser::cmdSimpleADSR(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdSimpleADSR(JASTrack* track, u32* args) { track->setOscAdsr(args[0], args[1], args[2], args[3], args[4]); return 0; } -s32 JASSeqParser::cmdBusConnect(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdBusConnect(JASTrack* track, u32* args) { track->connectBus(args[0], args[1]); return 0; } -s32 JASSeqParser::cmdSetIntTable(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdSetIntTable(JASTrack* track, u32* args) { track->_48 = args[0]; return 0; } -s32 JASSeqParser::cmdSetInterrupt(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdSetInterrupt(JASTrack* track, u32* args) { track->setIntrMask(args[0]); return 0; } -s32 JASSeqParser::cmdDisInterrupt(JASTrack *track, u32 *args) { - track->clrIntrMask(args[0]); - return 0; +s32 JASSeqParser::cmdDisInterrupt(JASTrack* track, u32* args) { + track->clrIntrMask(args[0]); + return 0; } -s32 JASSeqParser::cmdClrI(JASTrack *track, u32 *args) { - track->mCursorSwap = nullptr; +s32 JASSeqParser::cmdClrI(JASTrack* track, u32* args) { + track->mCursorSwap = nullptr; track->checkIntr(); return 0; } -s32 JASSeqParser::cmdRetI(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdRetI(JASTrack* track, u32* args) { track->retIntr(); track->checkIntr(); return 0; } -s32 JASSeqParser::cmdIntTimer(JASTrack *track, u32 *args) { - u32 arg0 = args[0], arg1 = args[1]; +s32 JASSeqParser::cmdIntTimer(JASTrack* track, u32* args) { + u32 arg0 = args[0], arg1 = args[1]; track->mIntTimer = arg0; track->_54 = arg1; - track->_58 = arg1; + track->_58 = arg1; return 0; } -s32 JASSeqParser::cmdSyncCPU(JASTrack *track, u32 *args) { - u16 value = -1; - if(sCallbackFunc) value = sCallbackFunc(track, args[0]); +s32 JASSeqParser::cmdSyncCPU(JASTrack* track, u32* args) { + u16 value = -1; + if (sCallbackFunc) + value = sCallbackFunc(track, args[0]); track->mRegs.write(JASRegisterParam::REG_F, value); return 0; } -s32 JASSeqParser::cmdTempo(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdTempo(JASTrack* track, u32* args) { track->setTempo(args[0]); return 0; } -s32 JASSeqParser::cmdFinish(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdFinish(JASTrack* track, u32* args) { return -1; } -s32 JASSeqParser::cmdNop(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdNop(JASTrack* track, u32* args) { return 0; } -s32 JASSeqParser::cmdFIRSet(JASTrack *track, u32 *args) { - track->setFIR((const s16 *)((u8 *)track->mSeqBuff + args[0])); +s32 JASSeqParser::cmdFIRSet(JASTrack* track, u32* args) { + track->setFIR((const s16*)((u8*)track->mSeqBuff + args[0])); return 0; } -s32 JASSeqParser::cmdIIRSet(JASTrack *track, u32 *args) { - s16 iir[4]; - for(u32 i = 0; i < 4; i++) { - iir[i] = args[i]; - } - track->setIIR(iir); +s32 JASSeqParser::cmdIIRSet(JASTrack* track, u32* args) { + s16 iir[4]; + for (u32 i = 0; i < 4; i++) { + iir[i] = args[i]; + } + track->setIIR(iir); return 0; } -s32 JASSeqParser::cmdIIRCutOff(JASTrack *track, u32 *args) { - if(args[0] < 0x80) track->setIIR(sIIRCutoff + args[0] * 4); +s32 JASSeqParser::cmdIIRCutOff(JASTrack* track, u32* args) { + if (args[0] < 0x80) + track->setIIR(sIIRCutoff + args[0] * 4); return 0; } -s32 JASSeqParser::cmdBankPrg(JASTrack *track, u32 *args) { - u32 arg0 = args[0]; +s32 JASSeqParser::cmdBankPrg(JASTrack* track, u32* args) { + u32 arg0 = args[0]; track->mBank = (u8)(arg0 >> 8); track->mPrg = (u8)arg0; return 0; } -s32 JASSeqParser::cmdBank(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdBank(JASTrack* track, u32* args) { track->mBank = (u8)args[0]; return 0; } -s32 JASSeqParser::cmdPrg(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdPrg(JASTrack* track, u32* args) { track->mPrg = (u8)args[0]; return 0; } -s32 JASSeqParser::cmdParamI(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdParamI(JASTrack* track, u32* args) { track->setParam(args[0], (s16)args[1] / 32767f, 0); return 0; } -s32 JASSeqParser::cmdParamII(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdParamII(JASTrack* track, u32* args) { track->setParam(args[0], (s16)args[1] / 32767f, args[2]); return 0; } -s32 JASSeqParser::cmdParamE(JASTrack *track, u32 *args) { - s16 arg1 = args[1] << 8; - if(!(args[1] & 0x80)) arg1 |= (s16)(args[1] << 1); - track->setParam(args[0], arg1 / 32767f, 0); - return 0; -} -s32 JASSeqParser::cmdParamEI(JASTrack *track, u32 *args) { - s16 arg1 = args[1] << 8; - if(!(args[1] & 0x80)) arg1 |= (s16)(args[1] << 1); - track->setParam(args[0], arg1 / 32767f, args[2]); - return 0; -} -s32 JASSeqParser::cmdReg(JASTrack *track, u32 *args) { - u32 arg1 = args[1], arg2 = args[2]; - switch(args[0]) { - case 0: - break; - case 1: - arg2 += readReg(track, arg1); - break; - case 2: - arg2 = readReg(track, arg1) - arg2; - break; - case 3: - arg2 = readReg(track, arg1) - arg2; - arg1 = 3; - break; - case 4: - arg2 *= readReg(track, arg1); - arg1 = 0x21; - break; - case 5: - arg2 &= readReg(track, arg1); - break; - case 6: - arg2 |= readReg(track, arg1); - break; - case 7: - arg2 ^= readReg(track, arg1); - break; - case 8: - static JMath::TRandom_fast_ oRandom(0); - arg2 = (oRandom.rand() >> 9) % arg2; - break; - case 9: - arg2 = readReg(track, arg1) << arg2; - break; - case 10: - arg2 = readReg(track, arg1) >> arg2; - break; - default: - return 0; - } - writeReg(track, arg1, arg2); +s32 JASSeqParser::cmdParamE(JASTrack* track, u32* args) { + s16 arg1 = args[1] << 8; + if (!(args[1] & 0x80)) + arg1 |= (s16)(args[1] << 1); + track->setParam(args[0], arg1 / 32767f, 0); return 0; } -s32 JASSeqParser::cmdRegLoad(JASTrack *track, u32 *args) { +s32 JASSeqParser::cmdParamEI(JASTrack* track, u32* args) { + s16 arg1 = args[1] << 8; + if (!(args[1] & 0x80)) + arg1 |= (s16)(args[1] << 1); + track->setParam(args[0], arg1 / 32767f, args[2]); + return 0; +} +s32 JASSeqParser::cmdReg(JASTrack* track, u32* args) { + u32 arg1 = args[1], arg2 = args[2]; + switch (args[0]) { + case 0: + break; + case 1: + arg2 += readReg(track, arg1); + break; + case 2: + arg2 = readReg(track, arg1) - arg2; + break; + case 3: + arg2 = readReg(track, arg1) - arg2; + arg1 = 3; + break; + case 4: + arg2 *= readReg(track, arg1); + arg1 = 0x21; + break; + case 5: + arg2 &= readReg(track, arg1); + break; + case 6: + arg2 |= readReg(track, arg1); + break; + case 7: + arg2 ^= readReg(track, arg1); + break; + case 8: + static JMath::TRandom_fast_ oRandom(0); + arg2 = (oRandom.rand() >> 9) % arg2; + break; + case 9: + arg2 = readReg(track, arg1) << arg2; + break; + case 10: + arg2 = readReg(track, arg1) >> arg2; + break; + default: + return 0; + } + writeReg(track, arg1, arg2); + return 0; +} +s32 JASSeqParser::cmdRegLoad(JASTrack* track, u32* args) { writeReg(track, args[0], args[1]); return 0; } -s32 JASSeqParser::cmdRegUni(JASTrack *track, u32 *args) { - u32 arg1 = args[1], reg; - switch(args[0]) { - case 0xb: - reg = -readReg(track, arg1); - break; - default: - return 0; - } - writeReg(track, arg1, reg); +s32 JASSeqParser::cmdRegUni(JASTrack* track, u32* args) { + u32 arg1 = args[1], reg; + switch (args[0]) { + case 0xb: + reg = -readReg(track, arg1); + break; + default: + return 0; + } + writeReg(track, arg1, reg); return 0; } -s32 JASSeqParser::cmdRegTblLoad(JASTrack *track, u32 *args) { - u32 arg1 = args[1], arg3 = args[2], arg2 = args[3]; - switch(args[0]) { - case 0xc: - arg3 = *((u8 *)track->mSeqBuff + arg3 + arg2); - break; - case 0xd: - arg3 = *((u16 *)((u8 *)track->mSeqBuff + arg3) + arg2); - break; - case 0xe: - mult3(arg2); - arg3 = track->calcSeekAmt(arg3 + arg2); - break; - case 0xf: - arg3 = *((u32 *)((u8 *)track->mSeqBuff + arg3) + arg2); - break; - case 0x10: - arg3 = *(u32 *)((u8 *)track->mSeqBuff + arg2 + arg3); - break; - default: - return 0; - } - writeReg(track, arg1, arg3); +s32 JASSeqParser::cmdRegTblLoad(JASTrack* track, u32* args) { + u32 arg1 = args[1], arg3 = args[2], arg2 = args[3]; + switch (args[0]) { + case 0xc: + arg3 = *((u8*)track->mSeqBuff + arg3 + arg2); + break; + case 0xd: + arg3 = *((u16*)((u8*)track->mSeqBuff + arg3) + arg2); + break; + case 0xe: + mult3(arg2); + arg3 = track->calcSeekAmt(arg3 + arg2); + break; + case 0xf: + arg3 = *((u32*)((u8*)track->mSeqBuff + arg3) + arg2); + break; + case 0x10: + arg3 = *(u32*)((u8*)track->mSeqBuff + arg2 + arg3); + break; + default: + return 0; + } + writeReg(track, arg1, arg3); return 0; } -s32 JASSeqParser::cmdDump(JASTrack *track, u32 *args) { - JASReport("--------------- JASTrack (%8x) dump ----------------", track); +s32 JASSeqParser::cmdDump(JASTrack* track, u32* args) { + JASReport("--------------- JASTrack (%8x) dump ----------------", track); - JASReport ( - " Base: 0x%08x Cur: 0x%08x(0x%06x)", - track->mSeqBuff, - track->mSeqCursor, - (u8 *)track->mSeqCursor - (u8 *)track->mSeqBuff - ); + JASReport( + " Base: 0x%08x Cur: 0x%08x(0x%06x)", + track->mSeqBuff, + track->mSeqCursor, + (u8*)track->mSeqCursor - (u8*)track->mSeqBuff); - JASReport(""); + JASReport(""); + u32 ra = track->mRegs.read(JASRegisterParam::REG_A), + rb = track->mRegs.read(JASRegisterParam::REG_B), + rs = track->mRegs.read(JASRegisterParam::REG_S); + JASReport(" REG_A: 0x%04x REG_B: 0x%04x REG_S: 0x%04x", ra, rb, rs); - u32 ra = track->mRegs.read(JASRegisterParam::REG_A), - rb = track->mRegs.read(JASRegisterParam::REG_B), - rs = track->mRegs.read(JASRegisterParam::REG_S); - JASReport(" REG_A: 0x%04x REG_B: 0x%04x REG_S: 0x%04x", ra, rb, rs); + u32 rx = track->mRegs.read(JASRegisterParam::REG_X), + ry = track->mRegs.read(JASRegisterParam::REG_Y), + rf = track->mRegs.read(JASRegisterParam::REG_F); + JASReport(" REG_X: 0x%04x REG_Y: 0x%04x REG_F: 0x%04x", rx, ry, rf); + JASReport(""); - u32 rx = track->mRegs.read(JASRegisterParam::REG_X), - ry = track->mRegs.read(JASRegisterParam::REG_Y), - rf = track->mRegs.read(JASRegisterParam::REG_F); - JASReport(" REG_X: 0x%04x REG_Y: 0x%04x REG_F: 0x%04x", rx, ry, rf); - JASReport(""); - - - JASReport( - " PORT 0-3: 0x%04x 0x%04x 0x%04x 0x%04x", - track->mPorts.mPorts[0], - track->mPorts.mPorts[1], - track->mPorts.mPorts[2], - track->mPorts.mPorts[3] - ); - JASReport( - " PORT 4-7: 0x%04x 0x%04x 0x%04x 0x%04x", - track->mPorts.mPorts[4], - track->mPorts.mPorts[5], - track->mPorts.mPorts[6], - track->mPorts.mPorts[7] - ); - JASReport( - " PORT 8-B: 0x%04x 0x%04x 0x%04x 0x%04x", - track->mPorts.mPorts[8], - track->mPorts.mPorts[9], - track->mPorts.mPorts[0xA], - track->mPorts.mPorts[0xB] - ); - JASReport( - " PORT C-F: 0x%04x 0x%04x 0x%04x 0x%04x", - track->mPorts.mPorts[0xC], - track->mPorts.mPorts[0xD], - track->mPorts.mPorts[0xE], - track->mPorts.mPorts[0xF] - ); - JASReport(""); + JASReport( + " PORT 0-3: 0x%04x 0x%04x 0x%04x 0x%04x", + track->mPorts.mPorts[0], + track->mPorts.mPorts[1], + track->mPorts.mPorts[2], + track->mPorts.mPorts[3]); + JASReport( + " PORT 4-7: 0x%04x 0x%04x 0x%04x 0x%04x", + track->mPorts.mPorts[4], + track->mPorts.mPorts[5], + track->mPorts.mPorts[6], + track->mPorts.mPorts[7]); + JASReport( + " PORT 8-B: 0x%04x 0x%04x 0x%04x 0x%04x", + track->mPorts.mPorts[8], + track->mPorts.mPorts[9], + track->mPorts.mPorts[0xA], + track->mPorts.mPorts[0xB]); + JASReport( + " PORT C-F: 0x%04x 0x%04x 0x%04x 0x%04x", + track->mPorts.mPorts[0xC], + track->mPorts.mPorts[0xD], + track->mPorts.mPorts[0xE], + track->mPorts.mPorts[0xF]); + JASReport(""); return 0; } -s32 JASSeqParser::cmdPrintf(JASTrack *track, u32 *args) { - char stack_1C[0x80]; - u32 stack_C[4]; - u8 stack_8[4]; - u32 r1f = 0, i; - for(i = 0; i < sizeof(stack_1C); i++) { - char currChar = *(((char *)track->mSeqCursor)++); - stack_1C[i] = currChar; - if(!currChar) break; - if(currChar == '\\') { - char currChar = *(((char *)track->mSeqCursor)++); - if(!(stack_1C[i] = currChar)) break; - switch(currChar) { - case 'n': - stack_1C[i] = 0xd; - continue; - default: - continue; - } - } - else if(currChar == '%') { - char currChar2 = *(((char *)track->mSeqCursor)++); - if(!(stack_1C[++i] = currChar2)) break; - switch(currChar2) { - case 'd': - stack_8[r1f] = 0; - break; - case 'x': - stack_8[r1f] = 1; - break; - case 's': - stack_8[r1f] = 2; - break; - case 'r': - stack_8[r1f] = 3; - stack_1C[i] = 'd'; - break; - case 'R': - stack_8[r1f] = 4; - stack_1C[i] = 'x'; - break; - } - } - else continue; - r1f++; - } - for(i = 0; i < r1f; i++) { - u8 curr = stack_8[i]; - u8 *tmp2 = (u8 *)track->mSeqCursor; - ((u8 *)track->mSeqCursor)++; - stack_C[i] = *tmp2; - switch(curr) { - case 2: - stack_C[i] = (u32)((u8 *)track->mSeqBuff + stack_C[i]); - break; - case 3: - case 4: - stack_C[i] = readReg(track, (u8)stack_C[i]); - break; - } - } - JASReport(stack_1C, stack_C[0], stack_C[1], stack_C[2], stack_C[3]); +s32 JASSeqParser::cmdPrintf(JASTrack* track, u32* args) { + char stack_1C[0x80]; + u32 stack_C[4]; + u8 stack_8[4]; + u32 r1f = 0, i; + for (i = 0; i < sizeof(stack_1C); i++) { + char currChar = *(((char*)track->mSeqCursor)++); + stack_1C[i] = currChar; + if (!currChar) + break; + if (currChar == '\\') { + char currChar = *(((char*)track->mSeqCursor)++); + if (!(stack_1C[i] = currChar)) + break; + switch (currChar) { + case 'n': + stack_1C[i] = 0xd; + continue; + default: + continue; + } + } else if (currChar == '%') { + char currChar2 = *(((char*)track->mSeqCursor)++); + if (!(stack_1C[++i] = currChar2)) + break; + switch (currChar2) { + case 'd': + stack_8[r1f] = 0; + break; + case 'x': + stack_8[r1f] = 1; + break; + case 's': + stack_8[r1f] = 2; + break; + case 'r': + stack_8[r1f] = 3; + stack_1C[i] = 'd'; + break; + case 'R': + stack_8[r1f] = 4; + stack_1C[i] = 'x'; + break; + } + } else + continue; + r1f++; + } + for (i = 0; i < r1f; i++) { + u8 curr = stack_8[i]; + u8* tmp2 = (u8*)track->mSeqCursor; + ((u8*)track->mSeqCursor)++; + stack_C[i] = *tmp2; + switch (curr) { + case 2: + stack_C[i] = (u32)((u8*)track->mSeqBuff + stack_C[i]); + break; + case 3: + case 4: + stack_C[i] = readReg(track, (u8)stack_C[i]); + break; + } + } + JASReport(stack_1C, stack_C[0], stack_C[1], stack_C[2], stack_C[3]); return 0; } -void JASSeqParser::execNoteOnGate(JASTrack *track, u32 a, u32 b, u32 c, u32 d) { - u32 arg = 0; - if(d >> 6 & 1) arg |= 2; - if(d >> 7 & 1) arg |= 1; - if(!c) arg |= 4; - track->gateOn(a, b, c, arg); - if(c) track->mTimer = c; - else track->_51 = true; +void JASSeqParser::execNoteOnGate(JASTrack* track, u32 a, u32 b, u32 c, u32 d) { + u32 arg = 0; + if (d >> 6 & 1) + arg |= 2; + if (d >> 7 & 1) + arg |= 1; + if (!c) + arg |= 4; + track->gateOn(a, b, c, arg); + if (c) + track->mTimer = c; + else + track->_51 = true; } -void JASSeqParser::execNoteOnMidi(JASTrack *track, u32 a, u32 b, u32 c) { - track->noteOn(a, b, c); +void JASSeqParser::execNoteOnMidi(JASTrack* track, u32 a, u32 b, u32 c) { + track->noteOn(a, b, c); } -void JASSeqParser::execNoteOff(JASTrack *track, u32 a) { - track->noteOff(a, 0); +void JASSeqParser::execNoteOff(JASTrack* track, u32 a) { + track->noteOff(a, 0); } -s32 JASSeqParser::execCommand(JASTrack *track, CommandFunc command, u32 a, u32 *args) { - return (this->*command)(track, args); +s32 JASSeqParser::execCommand(JASTrack* track, CommandFunc command, u32 a, u32* args) { + return (this->*command)(track, args); } -s32 JASSeqParser::parseNoteOff(JASTrack *track, u8 a) { - a &= 7; - if(a) execNoteOff(track, a); - return 0; +s32 JASSeqParser::parseNoteOff(JASTrack* track, u8 a) { + a &= 7; + if (a) + execNoteOff(track, a); + return 0; } -s32 JASSeqParser::parseNoteOn(JASTrack *track, u8 a) { - u8 note = *(((u8 *)track->mSeqCursor)++); - u8 lower = note & 7; - u8 note2 = *(((u8 *)track->mSeqCursor)++); - if(!lower) execNoteOnGate(track, a, note2, track->readMidiValue(), note); - else execNoteOnMidi(track, lower, a, note2); - return 0; +s32 JASSeqParser::parseNoteOn(JASTrack* track, u8 a) { + u8 note = *(((u8*)track->mSeqCursor)++); + u8 lower = note & 7; + u8 note2 = *(((u8*)track->mSeqCursor)++); + if (!lower) + execNoteOnGate(track, a, note2, track->readMidiValue(), note); + else + execNoteOnMidi(track, lower, a, note2); + return 0; } struct u24 { - u8 _0[3]; + u8 _0[3]; }; -s32 JASSeqParser::parseCommand(JASTrack *track, u8 cmdCode, u16 c) { - Command *cmd; - - if(cmdCode != 0xB0) { - cmd = sCmdInfo + (cmdCode - 0xA0); - } - else { - cmd = sExtCmdInfo + *(((u8 *)track->mSeqCursor)++); - } - - u32 b = cmd->argWidths | c; - u32 args[8]; - - for(int i = 0; i < cmd->numArgs; i++) { - u32 arg = 0; - switch(b & 3) { - case 0: - arg = *(((u8 *)track->mSeqCursor)++); - break; - case 1: - arg = *(((u16 *)track->mSeqCursor)++); - break; - case 2: - // Access a 24-bit field - arg = *((u32 *)((u8 *)(((u24 *)track->mSeqCursor)++) - 1)) & 0xffffff; - break; - case 3: - arg = readReg(track, *(((u8 *)track->mSeqCursor)++)); - break; - } - args[i] = arg; - b = (u16)b >> 2; - } - CommandFunc func = cmd->func; - if(func == nullptr) return 0; - return execCommand(track, func, cmd->numArgs, args); +s32 JASSeqParser::parseCommand(JASTrack* track, u8 cmdCode, u16 c) { + Command* cmd; + + if (cmdCode != 0xB0) { + cmd = sCmdInfo + (cmdCode - 0xA0); + } else { + cmd = sExtCmdInfo + *(((u8*)track->mSeqCursor)++); + } + + u32 b = cmd->argWidths | c; + u32 args[8]; + + for (int i = 0; i < cmd->numArgs; i++) { + u32 arg = 0; + switch (b & 3) { + case 0: + arg = *(((u8*)track->mSeqCursor)++); + break; + case 1: + arg = *(((u16*)track->mSeqCursor)++); + break; + case 2: + // Access a 24-bit field + arg = *((u32*)((u8*)(((u24*)track->mSeqCursor)++) - 1)) & 0xffffff; + break; + case 3: + arg = readReg(track, *(((u8*)track->mSeqCursor)++)); + break; + } + args[i] = arg; + b = (u16)b >> 2; + } + CommandFunc func = cmd->func; + if (func == nullptr) + return 0; + return execCommand(track, func, cmd->numArgs, args); } -s32 JASSeqParser::parseRegCommand(JASTrack *track, int a) { - u8 data = *(((u8 *)track->mSeqCursor)++); - u16 width = 0; - u16 b = 3; - for(int i = 0; i < a; i++) { - if(data & 0x80) width |= b; - data <<= 1; - b <<= 2; - } - return parseCommand(track, *(((u8 *)track->mSeqCursor)++), width); +s32 JASSeqParser::parseRegCommand(JASTrack* track, int a) { + u8 data = *(((u8*)track->mSeqCursor)++); + u16 width = 0; + u16 b = 3; + for (int i = 0; i < a; i++) { + if (data & 0x80) + width |= b; + data <<= 1; + b <<= 2; + } + return parseCommand(track, *(((u8*)track->mSeqCursor)++), width); } -s32 JASSeqParser::parse(JASTrack *track) { - u8 data = *(((u8 *)track->mSeqCursor)++); - if(!(data & 0x80)) return parseNoteOn(track, data); - switch(data & 0xf0) { - case 0x80: - return parseNoteOff(track, data & 0xf); - case 0x90: - return parseRegCommand(track, (data & 7) + 1); - default: - return parseCommand(track, data, 0); - } +s32 JASSeqParser::parse(JASTrack* track) { + u8 data = *(((u8*)track->mSeqCursor)++); + if (!(data & 0x80)) + return parseNoteOn(track, data); + switch (data & 0xf0) { + case 0x80: + return parseNoteOff(track, data & 0xf); + case 0x90: + return parseRegCommand(track, (data & 7) + 1); + default: + return parseCommand(track, data, 0); + } } diff --git a/src/JSystem/JAudio2/JASSeqReader.cpp b/src/JSystem/JAudio2/JASSeqReader.cpp index 6f2a1157f..558a3fcea 100644 --- a/src/JSystem/JAudio2/JASSeqReader.cpp +++ b/src/JSystem/JAudio2/JASSeqReader.cpp @@ -1,84 +1,94 @@ #include "JSystem/JAudio2/JASSeqReader.hpp" void JASSeqReader::init() { - mSeqBuff = nullptr; - mSeqCursor = nullptr; - mNumStacks = 0; - for(u32 i = 0; i < 8; i++) { - mStackPtrs[i] = nullptr; - mLoopTimers[i] = nullptr; - } + mSeqBuff = nullptr; + mSeqCursor = nullptr; + mNumStacks = 0; + for (u32 i = 0; i < 8; i++) { + mStackPtrs[i] = nullptr; + mLoopTimers[i] = nullptr; + } } -void JASSeqReader::init(void *buf) { - mSeqBuff = buf; - mSeqCursor = buf; - mNumStacks = 0; - for(u32 i = 0; i < 8; i++) { - mStackPtrs[i] = nullptr; - mLoopTimers[i] = nullptr; - } +void JASSeqReader::init(void* buf) { + mSeqBuff = buf; + mSeqCursor = buf; + mNumStacks = 0; + for (u32 i = 0; i < 8; i++) { + mStackPtrs[i] = nullptr; + mLoopTimers[i] = nullptr; + } } bool JASSeqReader::call(u32 num) { - if(mNumStacks >= 8) return false; - else { - mStackPtrs[mNumStacks++] = mSeqCursor; - mSeqCursor = (void *)((u8 *)mSeqBuff + num); - return true; - } + if (mNumStacks >= 8) + return false; + else { + mStackPtrs[mNumStacks++] = mSeqCursor; + mSeqCursor = (void*)((u8*)mSeqBuff + num); + return true; + } } bool JASSeqReader::loopStart(u32 loopTimer) { - if(mNumStacks >= 8) return false; - else { - mStackPtrs[mNumStacks] = mSeqCursor; - mLoopTimers[mNumStacks++] = loopTimer; - return true; - } + if (mNumStacks >= 8) + return false; + else { + mStackPtrs[mNumStacks] = mSeqCursor; + mLoopTimers[mNumStacks++] = loopTimer; + return true; + } } bool JASSeqReader::loopEnd() { - if(mNumStacks == 0) return false; - else { - u16 loopTimer = mLoopTimers[mNumStacks - 1]; - if(loopTimer > 0) loopTimer--; - if(loopTimer == 0) { - mNumStacks--; - return true; - } + if (mNumStacks == 0) + return false; + else { + u16 loopTimer = mLoopTimers[mNumStacks - 1]; + if (loopTimer > 0) + loopTimer--; + if (loopTimer == 0) { + mNumStacks--; + return true; + } mLoopTimers[mNumStacks - 1] = loopTimer; - mSeqCursor = mStackPtrs[mNumStacks - 1]; - return true; - } + mSeqCursor = mStackPtrs[mNumStacks - 1]; + return true; + } } bool JASSeqReader::ret() { - if(mNumStacks == 0) return false; - else { - mSeqCursor = mStackPtrs[--mNumStacks]; - return true; - } + if (mNumStacks == 0) + return false; + else { + mSeqCursor = mStackPtrs[--mNumStacks]; + return true; + } } u32 JASSeqReader::readMidiValue() { - u8 byte = *(((u8 *)mSeqCursor)++); - if(!(byte & 0x80)) return byte; - u32 byte2 = byte & 0x7f; - s32 i = 0; - u8 byte4; - while(true) { - if(i > 2) return 0; - byte2 = byte2 << 7; - byte4 = *(((u8 *)mSeqCursor)++); - byte2 |= byte4 & 0x7f; - if(!(byte4 & 0x80)) break; - i++; - } - return byte2; + u8 byte = *(((u8*)mSeqCursor)++); + if (!(byte & 0x80)) + return byte; + u32 byte2 = byte & 0x7f; + s32 i = 0; + u8 byte4; + while (true) { + if (i > 2) + return 0; + byte2 = byte2 << 7; + byte4 = *(((u8*)mSeqCursor)++); + byte2 |= byte4 & 0x7f; + if (!(byte4 & 0x80)) + break; + i++; + } + return byte2; } void* JASSeqReader::getStackPtr(u32 idx) const { - if(idx >= mNumStacks) return nullptr; - else return mStackPtrs[idx]; + if (idx >= mNumStacks) + return nullptr; + else + return mStackPtrs[idx]; } diff --git a/src/JSystem/JAudio2/JASTrack.cpp b/src/JSystem/JAudio2/JASTrack.cpp index 1a8333ccc..404b4967a 100644 --- a/src/JSystem/JAudio2/JASTrack.cpp +++ b/src/JSystem/JAudio2/JASTrack.cpp @@ -12,36 +12,37 @@ static const JASOscillator::Point sDefaultAdsr[4] = { {0, 0, 0x7fff}, {0, 0, 0x7fff}, {0, 0, 0}, - {0xe, 0, 0} -}; + {0xe, 0, 0}}; const JASOscillator::Data JASTrack::sEnvOsc = {0, 1.0f, 0, 0, 1.0f, 0.0f}; const JASOscillator::Data JASTrack::sPitchEnvOsc = {1, 1.0f, 0, 0, 1.0f, 0.0f}; -JASTrack::JASTrack() : JASSeqCtrl(), mRegs(), mInitialMgr(this), mNumChannels(1), _240(0), mNode() { +JASTrack::JASTrack() + : JASSeqCtrl(), mRegs(), mInitialMgr(this), mNumChannels(1), _240(0), mNode() { mMgrs[0] = &mInitialMgr; - for(u32 i = 1; i < 4; i++) { + for (u32 i = 1; i < 4; i++) { mMgrs[i] = nullptr; } init(); } - JASTrack::~JASTrack() { - for(int i = 1; i < 4; i++) { + for (int i = 1; i < 4; i++) { delete mMgrs[i]; } } void JASTrack::setChannelMgrCount(u32 count) { mNumChannels = 1; - for(u32 i = 1; i < count; i++, mNumChannels++) { - if(mMgrs[i]) continue; - if(!(mMgrs[i] = new TChannelMgr(this))) return; + for (u32 i = 1; i < count; i++, mNumChannels++) { + if (mMgrs[i]) + continue; + if (!(mMgrs[i] = new TChannelMgr(this))) + return; } - for(u32 i = mNumChannels; i < 4; i++) { - if(mMgrs[i]) { + for (u32 i = mNumChannels; i < 4; i++) { + if (mMgrs[i]) { delete mMgrs[i]; mMgrs[i] = nullptr; } @@ -53,23 +54,23 @@ void JASTrack::init() { mPorts.init(); initTimed(); mRegs.init(); - + memcpy(_E4, &sEnvOsc, 0x18); memcpy(_E4 + 1, &sPitchEnvOsc, 0x18); - for(int i = 0; i < 4; i++) { + for (int i = 0; i < 4; i++) { mAdsr[i] = sDefaultAdsr[i]; } - + mParent = nullptr; - for(u32 i = 0; i < 0x10; i++) { + for (u32 i = 0; i < 0x10; i++) { mChildren[i] = nullptr; } mMgrs[0]->init(); mNumChannels = 1; - for(int i = 1; i < 4; i++) { - if(mMgrs[i]) { + for (int i = 1; i < 4; i++) { + if (mMgrs[i]) { delete mMgrs[i]; mMgrs[i] = nullptr; } @@ -105,7 +106,7 @@ void JASTrack::init() { _231 = 0x40; _232 = 0; mGateLatency = 100; - + mBuses[0] = 0x150; mBuses[1] = 0x210; mBuses[2] = 0x352; @@ -113,11 +114,11 @@ void JASTrack::init() { mBuses[4] = 0; mBuses[5] = 0; - for(u32 i = 0; i < 8; i++) { + for (u32 i = 0; i < 8; i++) { mFIRFilter[i] = 0; } mFIRFilter[0] = 0x7fff; - for(u32 i = 0; i < 8; i++) { + for (u32 i = 0; i < 8; i++) { mIIRFilter[i] = 0; } mIIRFilter[0] = 0x7fff; @@ -141,16 +142,16 @@ void JASTrack::initTimed() { _9C[2]._0 = 0f; _9C[4]._0 = 0f; _9C[5]._0 = 0f; - - for(u32 i = 0; i < 6; i++) { + + for (u32 i = 0; i < 6; i++) { _9C[i]._8 = 0; _9C[i]._4 = _9C[i]._0; } } -void JASTrack::inherit(const JASTrack &rParent) { +void JASTrack::inherit(const JASTrack& rParent) { mIsDirectlyPlayed = rParent.mIsDirectlyPlayed; - + mBank = rParent.mBank; mPrg = rParent.mPrg; @@ -159,24 +160,24 @@ void JASTrack::inherit(const JASTrack &rParent) { _220 = rParent._220; - for(u32 i = 0; i < 8; i++) { + for (u32 i = 0; i < 8; i++) { mFIRFilter[i] = rParent.mFIRFilter[i]; } - for(u32 i = 0; i < 8; i++) { + for (u32 i = 0; i < 8; i++) { mIIRFilter[i] = rParent.mIIRFilter[i]; } mFilterMode = rParent.mFilterMode; - for(u32 i = 0; i < 6; i++) { + for (u32 i = 0; i < 6; i++) { mBuses[i] = rParent.mBuses[i]; } } -void JASTrack::assignExtBuffer(u32 mgr, JASSoundParams *buffer) { +void JASTrack::assignExtBuffer(u32 mgr, JASSoundParams* buffer) { mMgrs[mgr]->_48 = buffer; } -void JASTrack::setSeqData(void *data, u32 offset) { +void JASTrack::setSeqData(void* data, u32 offset) { JASSeqCtrl::start(data, offset); } @@ -186,7 +187,6 @@ void JASTrack::startSeq() { sTrackList.append(this); _240 = 1; } - } void JASTrack::stopSeq() { @@ -201,37 +201,39 @@ void JASTrack::start() { } void JASTrack::close() { - for(int i = 0; i < 0x10; i++) { - JASTrack *currChild; + for (int i = 0; i < 0x10; i++) { + JASTrack* currChild; currChild = mChildren[i]; - if(currChild) { + if (currChild) { currChild->close(); - if(currChild->mIsOwnedByParent) { + if (currChild->mIsOwnedByParent) { delete currChild; mChildren[i] = nullptr; } } } - for(u32 i = 0; i < mNumChannels; i++) { - if(mMgrs[i]) mMgrs[i]->releaseAll(); + for (u32 i = 0; i < mNumChannels; i++) { + if (mMgrs[i]) + mMgrs[i]->releaseAll(); } mParent = nullptr; _240 = 2; } -bool JASTrack::connectChild(u32 idx, JASTrack *child) { - if(mChildren[idx]) return false; +bool JASTrack::connectChild(u32 idx, JASTrack* child) { + if (mChildren[idx]) + return false; child->mParent = this; mChildren[idx] = child; return true; } void JASTrack::closeChild(u32 idx) { - JASTrack *child; - if(child = mChildren[idx]) { + JASTrack* child; + if (child = mChildren[idx]) { getRootTrack()->updateSeq(false, 1f); child->close(); - if(child->mIsOwnedByParent) { + if (child->mIsOwnedByParent) { delete child; mChildren[idx] = nullptr; } @@ -239,25 +241,26 @@ void JASTrack::closeChild(u32 idx) { } JASTrack* JASTrack::openChild(u32 idx) { - JASTrack *child; + JASTrack* child; child = mChildren[idx]; - if(child) { - switch(child->_240) { - case 0: break; - case 1: - getRootTrack()->updateSeq(false, 1f); - child->close(); - case 2: - bool tmp = child->mIsOwnedByParent; - child->init(); - child->mIsOwnedByParent = tmp; - mChildren[idx] = nullptr; - connectChild(idx, child); - break; + if (child) { + switch (child->_240) { + case 0: + break; + case 1: + getRootTrack()->updateSeq(false, 1f); + child->close(); + case 2: + bool tmp = child->mIsOwnedByParent; + child->init(); + child->mIsOwnedByParent = tmp; + mChildren[idx] = nullptr; + connectChild(idx, child); + break; } - } - else { - if(!(child = new JASTrack())) return nullptr; + } else { + if (!(child = new JASTrack())) + return nullptr; child->mIsOwnedByParent = true; connectChild(idx, child); } @@ -276,14 +279,16 @@ void JASTrack::setLatestKey(u8 key) { } bool JASTrack::noteOn(u32 channelNum, u32 pitch, u32 c) { - if(isMute()) return false; + if (isMute()) + return false; bool ret = true; pitch += getTransposeTotal(); - for(u32 i = 0; i < mNumChannels; i++) { - if(mMgrs[i]) { + for (u32 i = 0; i < mNumChannels; i++) { + if (mMgrs[i]) { mMgrs[i]->noteOff(channelNum, 0); - JASChannel *channel; - if(!(channel = channelStart(mMgrs[i], pitch, c, 0))) ret = false; + JASChannel* channel; + if (!(channel = channelStart(mMgrs[i], pitch, c, 0))) + ret = false; mMgrs[i]->mChannels[channelNum] = channel; } } @@ -291,9 +296,10 @@ bool JASTrack::noteOn(u32 channelNum, u32 pitch, u32 c) { } bool JASTrack::gateOn(u32 transposedPitch, u32 velocity, f32 seqTime, u32 flags) { - + transposedPitch += getTransposeTotal(); - if(mGateLatency != 100) seqTime *= mGateLatency / 100f; + if (mGateLatency != 100) + seqTime *= mGateLatency / 100f; s32 pitchDelta; u32 isSweep; u32 dspTime = seqTimeToDspTime(seqTime); @@ -303,28 +309,29 @@ bool JASTrack::gateOn(u32 transposedPitch, u32 velocity, f32 seqTime, u32 flags) u32 updateTimer = (flags & 6) != 0 ? 0 : dspTime; u32 pitch; - if(isSweep) pitch = mPitch; - else pitch = transposedPitch; + if (isSweep) + pitch = mPitch; + else + pitch = transposedPitch; pitchDelta = transposedPitch - pitch; - for(u32 i = 0; i < mNumChannels; i++) { - TChannelMgr *mgr = mMgrs[i]; - if(mgr) { - if(mReadyToPlay) { + for (u32 i = 0; i < mNumChannels; i++) { + TChannelMgr* mgr = mMgrs[i]; + if (mgr) { + if (mReadyToPlay) { mgr->noteOff(0, 0); - if(!isMute()) { + if (!isMute()) { mgr->mChannels[0] = channelStart(mgr, pitch, velocity, updateTimer); } - } - else { - JASChannel *channel = mgr->mChannels[0]; - if(channel) { + } else { + JASChannel* channel = mgr->mChannels[0]; + if (channel) { channel->setKey(pitch - channel->_E1); channel->setVelocity(velocity); channel->setUpdateTimer(updateTimer); } } - JASChannel *channel; - if(isSweep && (channel = mgr->mChannels[0])) { + JASChannel* channel; + if (isSweep && (channel = mgr->mChannels[0])) { channel->setKeySweepTarget(pitchDelta, dspTime); } } @@ -336,36 +343,38 @@ bool JASTrack::gateOn(u32 transposedPitch, u32 velocity, f32 seqTime, u32 flags) bool JASTrack::noteOff(u32 a, u16 b) { bool ret = true; - for(u32 i = 0; i < mNumChannels; i++) { - TChannelMgr *mgr = mMgrs[i]; - if(mgr) { - if(!mgr->noteOff(a, b)) ret = false; + for (u32 i = 0; i < mNumChannels; i++) { + TChannelMgr* mgr = mMgrs[i]; + if (mgr) { + if (!mgr->noteOff(a, b)) + ret = false; } } return ret; } bool JASTrack::checkNoteStop(u32 channel) const { - for(u32 i = 0; i < mNumChannels; i++) { - TChannelMgr *mgr = mMgrs[i]; - if(mgr) { - if(mgr->mChannels[channel]) return false; - } + for (u32 i = 0; i < mNumChannels; i++) { + TChannelMgr* mgr = mMgrs[i]; + if (mgr) { + if (mgr->mChannels[channel]) + return false; + } } return true; } -void JASTrack::overwriteOsc(JASChannel *channel) { - for(u32 i = 0; i < 2; i++) { - if(_E4[i]._8) { +void JASTrack::overwriteOsc(JASChannel* channel) { + for (u32 i = 0; i < 2; i++) { + if (_E4[i]._8) { channel->setOscInit(i, _E4 + i); } } } void JASTrack::updateTimedParam() { - for(u32 i = 0; i < 6; i++) { - if(_9C[i]._8) { + for (u32 i = 0; i < 6; i++) { + if (_9C[i]._8) { _9C[i]._0 += (_9C[i]._4 - _9C[i]._0) / _9C[i]._8; _9C[i]._8--; } @@ -374,18 +383,18 @@ void JASTrack::updateTimedParam() { void JASTrack::updateTrack(f32 num) { updateTempo(); - for(u32 i = 0; i < mNumChannels; i++) { - TChannelMgr *mgr = mMgrs[i]; - if(mgr) { + for (u32 i = 0; i < mNumChannels; i++) { + TChannelMgr* mgr = mMgrs[i]; + if (mgr) { f32 fr8 = _9C[0]._0; fr8 *= fr8; - f32 fr9 = 1f; - f32 fra = _9C[1]._0 * _230 * 0.333333343267f; - f32 frb = (_9C[3]._0 - 0.5f) * _218; - f32 frc = _9C[2]._0; - f32 frd = _9C[4]._0; - JASSoundParams *params = mgr->_48; - if(params) { + f32 fr9 = 1f; + f32 fra = _9C[1]._0 * _230 * 0.333333343267f; + f32 frb = (_9C[3]._0 - 0.5f) * _218; + f32 frc = _9C[2]._0; + f32 frd = _9C[4]._0; + JASSoundParams* params = mgr->_48; + if (params) { fr8 *= params->_0[0]; fr9 *= params->_0[2]; frb += params->_0[3] - 0.5f; @@ -393,17 +402,17 @@ void JASTrack::updateTrack(f32 num) { frd += params->_0[4]; } frb *= num; - if(!mParent) { + if (!mParent) { mgr->mChannelParams._0[0] = fr8; mgr->mChannelParams._0[1] = fr9; mgr->mChannelParams._0[3] = frb; mgr->mChannelParams._0[4] = frc; mgr->mChannelParams._0[5] = frd; mgr->mChannelParams._0[2] = fra; - } - else { - TChannelMgr *mgrParent = mParent->mMgrs[i]; - if(!mgrParent) mgrParent = mParent->mMgrs[0]; + } else { + TChannelMgr* mgrParent = mParent->mMgrs[i]; + if (!mgrParent) + mgrParent = mParent->mMgrs[0]; mgr->mChannelParams._0[0] = mgrParent->mChannelParams._0[0] * fr8; mgr->mChannelParams._0[1] = mgrParent->mChannelParams._0[1] * fr9; mgr->mChannelParams._0[3] = mgrParent->mChannelParams._0[3] - 0.5f + frb; @@ -417,11 +426,10 @@ void JASTrack::updateTrack(f32 num) { } void JASTrack::updateTempo() { - if(!mParent) { + if (!mParent) { f32 rate = JASDriver::getDacRate(); mSampleInterval = mTempoRate * (1.33333337307f * (mTimebase * mTempo) / rate); - } - else { + } else { mTempo = mParent->mTempo; mTimebase = mParent->mTimebase; mSampleInterval = mParent->mSampleInterval; @@ -429,18 +437,22 @@ void JASTrack::updateTempo() { } void JASTrack::updateSeq(bool update, f32 num) { - if(!update) update = mInvalidateSeq; + if (!update) + update = mInvalidateSeq; mInvalidateSeq = false; - if(update) updateTrack(num); + if (update) + updateTrack(num); num *= _218; - for(int i = 0; i < 0x10; i++) { - JASTrack *child = mChildren[i]; - if(child && child->_240 == 1) child->updateSeq(update, num); + for (int i = 0; i < 0x10; i++) { + JASTrack* child = mChildren[i]; + if (child && child->_240 == 1) + child->updateSeq(update, num); } } u32 JASTrack::seqTimeToDspTime(f32 seqTime) { - if(mIsDirectlyPlayed) seqTime /= mSampleInterval; + if (mIsDirectlyPlayed) + seqTime /= mSampleInterval; else { seqTime *= 120f / mTimebase; seqTime *= JASDriver::getSubFrames() / 10f; @@ -449,25 +461,28 @@ u32 JASTrack::seqTimeToDspTime(f32 seqTime) { } void JASTrack::setParam(u32 param, f32 value, u32 b) { - Timed &timed = _9C[param]; + Timed& timed = _9C[param]; timed._4 = value; - if(!b) timed._0 = timed._4; + if (!b) + timed._0 = timed._4; timed._8 = b; } void JASTrack::noteOffAll(u16 a) { - for(u32 i = 0; i < 8; i++) { + for (u32 i = 0; i < 8; i++) { noteOff((u8)i, a); } - for(int i = 0; i < 0x10; i++) { // Probably a template - JASTrack *child = mChildren[i]; - if(child && child->_240 == 1) child->noteOffAll(a); + for (int i = 0; i < 0x10; i++) { // Probably a template + JASTrack* child = mChildren[i]; + if (child && child->_240 == 1) + child->noteOffAll(a); } } void JASTrack::mute(bool isMute) { mIsMute = isMute; - if(!isMute) return; + if (!isMute) + return; noteOffAll(10); } @@ -475,9 +490,10 @@ void JASTrack::setOscScale(u32 a, f32 scale) { _E4[a]._10 = scale; } -void JASTrack::setOscTable(u32 a, const JASOscillator::Point *point) { +void JASTrack::setOscTable(u32 a, const JASOscillator::Point* point) { _E4[a]._8 = point; - if(a == 0) return; + if (a == 0) + return; _E4[a]._C = 0; } @@ -488,19 +504,19 @@ void JASTrack::setOscAdsr(s16 attack, s16 delay, s16 sustain, s16 release, u16 e mAdsr[1]._2 = delay; mAdsr[2]._2 = sustain; mAdsr[2]._4 = release; - _224 = e; + _224 = e; } -void JASTrack::setFIR(const s16 *FIRFilter) { - for(u32 i = 0; i < 8; i++) { +void JASTrack::setFIR(const s16* FIRFilter) { + for (u32 i = 0; i < 8; i++) { mFIRFilter[i] = FIRFilter[i]; } mFilterMode &= 0x20; mFilterMode |= 8; } -void JASTrack::setIIR(const s16 *IIRFilter) { - for(u32 i = 0; i < 8; i++) { +void JASTrack::setIIR(const s16* IIRFilter) { + for (u32 i = 0; i < 8; i++) { mIIRFilter[i] = IIRFilter[i]; } mFilterMode |= 0x20; @@ -516,7 +532,7 @@ void JASTrack::writePortSelf(u32 port, u16 value) { void JASTrack::writePort(u32 port, u16 value) { mPorts.writeImport(port, value); - if(port <= 1) { + if (port <= 1) { JASSeqCtrl::interrupt(port == 0 ? JASSeqCtrl::INTR_2 : JASSeqCtrl::INTR_3); } } @@ -526,18 +542,20 @@ u16 JASTrack::readPort(u32 port) { } void JASTrack::setChannelPauseFlag(bool pauseFlag) { - for(int i = 0; i < mNumChannels; i++) { - TChannelMgr *mgr = mMgrs[i]; - if(mgr) mgr->setPauseFlag(pauseFlag); + for (int i = 0; i < mNumChannels; i++) { + TChannelMgr* mgr = mMgrs[i]; + if (mgr) + mgr->setPauseFlag(pauseFlag); } - for(int i = 0; i < 0x10; i++) { - JASTrack *child = mChildren[i]; - if(child) child->setChannelPauseFlag(pauseFlag); + for (int i = 0; i < 0x10; i++) { + JASTrack* child = mChildren[i]; + if (child) + child->setChannelPauseFlag(pauseFlag); } } void JASTrack::pause(bool pauseFlag) { - if(mPauseFlag != pauseFlag) { + if (mPauseFlag != pauseFlag) { mPauseFlag = pauseFlag; setChannelPauseFlag(pauseFlag); JASSeqCtrl::interrupt((JASSeqCtrl::IntrType)!pauseFlag); @@ -545,17 +563,20 @@ void JASTrack::pause(bool pauseFlag) { } s32 JASTrack::getTransposeTotal() const { - if(mParent) return mParent->getTransposeTotal() + mTransposeAmt; - else return mTransposeAmt; + if (mParent) + return mParent->getTransposeTotal() + mTransposeAmt; + else + return mTransposeAmt; } bool JASTrack::isMute() const { bool ret; - if(mParent) { + if (mParent) { ret = false; - if(mIsMute || mParent->isMute()) ret = true; - } - else ret = mIsMute; + if (mIsMute || mParent->isMute()) + ret = true; + } else + ret = mIsMute; return ret; } @@ -577,61 +598,65 @@ void JASTrack::setTimebase(u16 timebase) { updateTempo(); } -void JASTrack::updateChannel(JASChannel *channel, JASDsp::TChannel *dspChannel) { +void JASTrack::updateChannel(JASChannel* channel, JASDsp::TChannel* dspChannel) { channel->setVibrate(_1E0, _1E4); channel->setTremolo(_1E8, _1EC); - if(mFilterMode & 0x20) dspChannel->setIIRFilterParam(mIIRFilter); - if(mFilterMode & 0x1F) dspChannel->setFIR8FilterParam(mFIRFilter); + if (mFilterMode & 0x20) + dspChannel->setIIRFilterParam(mIIRFilter); + if (mFilterMode & 0x1F) + dspChannel->setFIR8FilterParam(mFIRFilter); dspChannel->setFilterMode(mFilterMode); dspChannel->setDistFilter(32767f * _9C[5]._0); } -void JASTrack::channelUpdateCallback ( - u32 a, JASChannel *channel, JASDsp::TChannel *dspChannel, void *data -) { - TChannelMgr *mgr = (TChannelMgr *)data; - JASTrack *track = mgr->mParentTrack; - switch(a) { - case 0: - case 1: - channel->setParams(mgr->mChannelParams); - track->updateChannel(channel, dspChannel); - break; - case 3: - channel->release(0); - channel->free(); - mgr->mChannels[0] = nullptr; - break; - case 2: - for(u32 i = 0; i < 8; i++) { - if(channel == mgr->mChannels[i]) { - mgr->mChannels[i] = nullptr; - return; - } +void JASTrack::channelUpdateCallback( + u32 a, JASChannel* channel, JASDsp::TChannel* dspChannel, void* data) { + TChannelMgr* mgr = (TChannelMgr*)data; + JASTrack* track = mgr->mParentTrack; + switch (a) { + case 0: + case 1: + channel->setParams(mgr->mChannelParams); + track->updateChannel(channel, dspChannel); + break; + case 3: + channel->release(0); + channel->free(); + mgr->mChannels[0] = nullptr; + break; + case 2: + for (u32 i = 0; i < 8; i++) { + if (channel == mgr->mChannels[i]) { + mgr->mChannels[i] = nullptr; + return; } - break; + } + break; } } JASTrack* JASTrack::getRootTrack() { JASTrack *next, *parent = this; - for(; next = parent->mParent; parent = next); + for (; next = parent->mParent; parent = next) + ; return parent; } int JASTrack::tickProc() { - if(mPauseFlag) return 0; + if (mPauseFlag) + return 0; int succ = JASSeqCtrl::tickProc(this); updateTimedParam(); mInvalidateSeq = true; - if(succ < 0) return -1; - for(int i = 0; i < 0x10; i++) { - JASTrack *child = mChildren[i]; - if(child && child->_240 == 1) { - if(child->tickProc() < 0) { + if (succ < 0) + return -1; + for (int i = 0; i < 0x10; i++) { + JASTrack* child = mChildren[i]; + if (child && child->_240 == 1) { + if (child->tickProc() < 0) { getRootTrack()->updateSeq(false, 1f); child->close(); - if(child->mIsOwnedByParent) { + if (child->mIsOwnedByParent) { delete child; mChildren[i] = nullptr; } @@ -642,15 +667,15 @@ int JASTrack::tickProc() { } s32 JASTrack::seqMain() { - if(mIsStopped) { + if (mIsStopped) { updateSeq(true, 1f); close(); return -1; } f32 step = 1f; - while(mPlaytime >= step) { + while (mPlaytime >= step) { mPlaytime -= step; - if(tickProc() < 0) { + if (tickProc() < 0) { updateSeq(false, 1f); close(); return -1; @@ -661,14 +686,15 @@ s32 JASTrack::seqMain() { return 0; } -s32 JASTrack::TList::cbSeqMain(void *self) { - ((JASTrack::TList *)self)->seqMain(); +s32 JASTrack::TList::cbSeqMain(void* self) { + ((JASTrack::TList*)self)->seqMain(); return 0; } -void JASTrack::TList::append(JASTrack *track) { - if(!mIsInit) { - if(!JASDriver::registerSubFrameCallback(cbSeqMain, this)) return; +void JASTrack::TList::append(JASTrack* track) { + if (!mIsInit) { + if (!JASDriver::registerSubFrameCallback(cbSeqMain, this)) + return; mIsInit = true; } mList.Push_back(track); @@ -676,22 +702,23 @@ void JASTrack::TList::append(JASTrack *track) { void JASTrack::TList::seqMain() { InternalList::iterator iter, next; - for(iter = InternalList::iterator(mList.begin()); iter != mList.end(); iter = next) { + for (iter = InternalList::iterator(mList.begin()); iter != mList.end(); iter = next) { next = iter; ++next; - if(iter->seqMain() < 0) { + if (iter->seqMain() < 0) { mList.Remove(*iter); - if(iter->mIsOwnedByParent) delete *iter; + if (iter->mIsOwnedByParent) + delete *iter; } } } -JASTrack::TChannelMgr::TChannelMgr(JASTrack *track) +JASTrack::TChannelMgr::TChannelMgr(JASTrack* track) : mChannelParams(), _48(0), mParentTrack(track) { - for(u32 i = 0; i < 8; i++) { + for (u32 i = 0; i < 8; i++) { mChannels[i] = nullptr; } - for(u32 i = 0; i < 8; i++) { + for (u32 i = 0; i < 8; i++) { _38[i] = 0; } } @@ -699,18 +726,18 @@ JASTrack::TChannelMgr::TChannelMgr(JASTrack *track) void JASTrack::TChannelMgr::init() { _48 = nullptr; mChannelParams.init(); - for(u32 i = 0; i < 8; i++) { + for (u32 i = 0; i < 8; i++) { mChannels[i] = nullptr; } - for(u32 i = 0; i < 8; i++) { + for (u32 i = 0; i < 8; i++) { _38[i] = 0; } } void JASTrack::TChannelMgr::releaseAll() { - for(int i = 0; i < 8; i++) { - JASChannel *channel; - if(channel = mChannels[i]) { + for (int i = 0; i < 8; i++) { + JASChannel* channel; + if (channel = mChannels[i]) { channel->release(0); channel->free(); mChannels[i] = nullptr; @@ -719,11 +746,14 @@ void JASTrack::TChannelMgr::releaseAll() { } bool JASTrack::TChannelMgr::noteOff(u32 a, u16 b) { - JASChannel *channel = mChannels[a]; - if(!channel) return false; + JASChannel* channel = mChannels[a]; + if (!channel) + return false; - if(b == 0) channel->release(0); - else channel->release(b); + if (b == 0) + channel->release(0); + else + channel->release(b); channel->free(); mChannels[a] = nullptr; @@ -731,9 +761,10 @@ bool JASTrack::TChannelMgr::noteOff(u32 a, u16 b) { } void JASTrack::TChannelMgr::setPauseFlag(bool flag) { - for(int i = 0; i < 8; i++) { - JASChannel *channel = mChannels[i]; - if(channel) channel->setPauseFlag(flag); + for (int i = 0; i < 8; i++) { + JASChannel* channel = mChannels[i]; + if (channel) + channel->setPauseFlag(flag); } } @@ -742,18 +773,20 @@ JASDefaultBankTable JASTrack::sDefaultBankTable = JASDefaultBankTable(); JASTrack::TList JASTrack::sTrackList = JASTrack::TList(); namespace JGadget { - - TLinkListNode::TLinkListNode() : mPrev(nullptr), mNext(nullptr) {} - + + TLinkListNode::TLinkListNode() + : mPrev(nullptr), mNext(nullptr) {} + TLinkListNode* TNodeLinkList::end() { return iterator(&mEnd).curr; } - TNodeLinkList::iterator::iterator(TLinkListNode *node) { + TNodeLinkList::iterator::iterator(TLinkListNode* node) { curr = node; } - TNodeLinkList::iterator::iterator(const TNodeLinkList::iterator &rOther) : curr(rOther.curr) {} + TNodeLinkList::iterator::iterator(const TNodeLinkList::iterator& rOther) + : curr(rOther.curr) {} TNodeLinkList::iterator::iterator() {} @@ -774,39 +807,39 @@ namespace JGadget { return curr; } - bool operator!= ( + bool operator!=( JASTrack::TList::InternalList::iterator a, - JASTrack::TList::InternalList::iterator b - ) { + JASTrack::TList::InternalList::iterator b) { return !(a == b); } - bool operator== ( + bool operator==( JASTrack::TList::InternalList::iterator a, - JASTrack::TList::InternalList::iterator b - ) { - return CALL_INLINE_FUNC(TNodeLinkList::iterator, a.curr) - == CALL_INLINE_FUNC(TNodeLinkList::iterator, b.curr); + JASTrack::TList::InternalList::iterator b) { + return CALL_INLINE_FUNC(TNodeLinkList::iterator, a.curr) == CALL_INLINE_FUNC(TNodeLinkList::iterator, b.curr); } bool operator==(TNodeLinkList::iterator a, TNodeLinkList::iterator b) { return a.curr == b.curr; } - TNodeLinkList::TNodeLinkList() : mEnd() { + TNodeLinkList::TNodeLinkList() + : mEnd() { Initialize_(); } -} +} // namespace JGadget JASTrack::TList::~TList() {} -JASTrack::TList::TList() : mList(), mIsInit(false) {} +JASTrack::TList::TList() + : mList(), mIsInit(false) {} JASCriticalSection::JASCriticalSection() { success = OSDisableInterrupts(); } -JASDefaultBankTable::JASDefaultBankTable() : JASBankTable(), JASGlobalInstance(true) {} +JASDefaultBankTable::JASDefaultBankTable() + : JASBankTable(), JASGlobalInstance(true) {} JASDefaultBankTable::~JASDefaultBankTable() {} diff --git a/src/JSystem/JAudio2/JASTrackPort.cpp b/src/JSystem/JAudio2/JASTrackPort.cpp index 5f592b249..d8cc70c3f 100644 --- a/src/JSystem/JAudio2/JASTrackPort.cpp +++ b/src/JSystem/JAudio2/JASTrackPort.cpp @@ -1,7 +1,7 @@ #include "JSystem/JAudio2/JASTrackPort.hpp" void JASTrackPort::init() { - for(u32 i = 0; i < 0x10; i++) { + for (u32 i = 0; i < 0x10; i++) { mPorts[i] = 0; } mImport = 0; diff --git a/src/JSystem/JGadget/hashcode.cpp b/src/JSystem/JGadget/hashcode.cpp index b21ae72f4..03d3c107c 100644 --- a/src/JSystem/JGadget/hashcode.cpp +++ b/src/JSystem/JGadget/hashcode.cpp @@ -3,19 +3,19 @@ namespace JGadget { namespace { - template - inline u32 getHashCode_(const T *data, TPRIsEnd_value_ p) { + template + inline u32 getHashCode_(const T* data, TPRIsEnd_value_ p) { u32 hash = 0; - while(!p(*data)) { + while (!p(*data)) { hash = *data + hash * 31; data++; } return hash; } - } - u32 getHashCode(const char *data) { + } // namespace + u32 getHashCode(const char* data) { TPRIsEnd_value_ p('\0'); return getHashCode_(data, p); } - -} + +} // namespace JGadget diff --git a/src/JSystem/JGadget/linklist.cpp b/src/JSystem/JGadget/linklist.cpp index 68c4ba0ea..35fa5e7f2 100644 --- a/src/JSystem/JGadget/linklist.cpp +++ b/src/JSystem/JGadget/linklist.cpp @@ -2,29 +2,30 @@ #include "JSystem/JGadget/predicate.hpp" namespace JGadget { - - inline const JGadget::TLinkListNode *getNode(const JGadget::TNodeLinkList::iterator &self) { + + inline const JGadget::TLinkListNode* getNode(const JGadget::TNodeLinkList::iterator& self) { return self.curr; } TNodeLinkList::~TNodeLinkList() {} - void TNodeLinkList::splice(iterator a, TNodeLinkList &list, iterator b) { - TLinkListNode *&curr = b.curr; - TLinkListNode *&aCurr = a.curr; - TLinkListNode *next = curr->mNext; - bool flag = true; - if(aCurr != curr && aCurr != next) flag = false; - if(!flag) { - TLinkListNode *nodeB = b.curr; + void TNodeLinkList::splice(iterator a, TNodeLinkList& list, iterator b) { + TLinkListNode*& curr = b.curr; + TLinkListNode*& aCurr = a.curr; + TLinkListNode* next = curr->mNext; + bool flag = true; + if (aCurr != curr && aCurr != next) + flag = false; + if (!flag) { + TLinkListNode* nodeB = b.curr; list.Erase(nodeB); Insert(CALL_INLINE_FUNC(iterator, a.curr), nodeB); } } - - TLinkListNode* TNodeLinkList::Insert(iterator iter, TLinkListNode *node) { - TLinkListNode *next = iter.curr; - TLinkListNode *prev = next->mPrev; + + TLinkListNode* TNodeLinkList::Insert(iterator iter, TLinkListNode* node) { + TLinkListNode* next = iter.curr; + TLinkListNode* prev = next->mPrev; node->mNext = next; node->mPrev = prev; next->mPrev = node; @@ -33,7 +34,7 @@ namespace JGadget { return node; } - TLinkListNode* TNodeLinkList::Erase(TLinkListNode *node) { + TLinkListNode* TNodeLinkList::Erase(TLinkListNode* node) { TLinkListNode *next = node->mNext, *prev = node->mPrev; next->mPrev = prev; prev->mNext = next; @@ -41,7 +42,7 @@ namespace JGadget { return next; } - void TNodeLinkList::Remove(TLinkListNode *node) { + void TNodeLinkList::Remove(TLinkListNode* node) { remove_if(TPRIsEqual_pointer_(node)); } @@ -50,4 +51,4 @@ namespace JGadget { mEnd.mNext = &mEnd; mEnd.mPrev = &mEnd; } -} +} // namespace JGadget diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp index 146d87a36..192a7801a 100644 --- a/src/JSystem/JKernel/JKRAramArchive.cpp +++ b/src/JSystem/JKernel/JKRAramArchive.cpp @@ -2,7 +2,8 @@ #include "JSystem/JKernel/JKRAramArchive.hpp" #include "JSystem/JKernel/JKRHeap.hpp" -JKRAramArchive::JKRAramArchive(long entryNum, EMountDirection mountDir) : JKRArchive(entryNum, MOUNT_MODE_ARAM) { +JKRAramArchive::JKRAramArchive(long entryNum, EMountDirection mountDir) + : JKRArchive(entryNum, MOUNT_MODE_ARAM) { mMountDir = mountDir; if (!open(entryNum)) { diff --git a/src/JSystem/JKernel/JKRArchivePri.cpp b/src/JSystem/JKernel/JKRArchivePri.cpp index 5a7d7db54..0f13df919 100644 --- a/src/JSystem/JKernel/JKRArchivePri.cpp +++ b/src/JSystem/JKernel/JKRArchivePri.cpp @@ -4,7 +4,7 @@ #ifdef NON_MATCHING // tolower() is inlined -const char *JKRArchive::CArcName::store(const char *pName) { +const char* JKRArchive::CArcName::store(const char* pName) { mHash = 0; u32 length = 0; @@ -27,7 +27,7 @@ const char *JKRArchive::CArcName::store(const char *pName) { #ifdef NON_MATCHING // tolower() is inlined -const char *JKRArchive::CArcName::store(const char *pName, char stopChar) { +const char* JKRArchive::CArcName::store(const char* pName, char stopChar) { mHash = 0; u32 length = 0; @@ -77,10 +77,9 @@ JKRArchive::JKRArchive(long entryNum, EMountMode mountMode) { } JKRArchive::~JKRArchive() { - } -void JKRArchive::setExpandSize(SDIFileEntry *pFile, unsigned long size) { +void JKRArchive::setExpandSize(SDIFileEntry* pFile, unsigned long size) { u32 fileIndex = static_cast(pFile - mFiles); if (mExpandSizes == nullptr || fileIndex >= mInfoBlock->mNrFiles) { @@ -90,7 +89,7 @@ void JKRArchive::setExpandSize(SDIFileEntry *pFile, unsigned long size) { mExpandSizes[fileIndex] = size; } -u32 JKRArchive::getExpandSize(SDIFileEntry *pFile) const { +u32 JKRArchive::getExpandSize(SDIFileEntry* pFile) const { u32 fileIndex = static_cast(pFile - mFiles); if (mExpandSizes == nullptr || fileIndex >= mInfoBlock->mNrFiles) { @@ -100,8 +99,7 @@ u32 JKRArchive::getExpandSize(SDIFileEntry *pFile) const { return mExpandSizes[fileIndex]; } - -bool JKRArchive::isSameName(CArcName &rName, unsigned long nameOffset, unsigned short hash) const { +bool JKRArchive::isSameName(CArcName& rName, unsigned long nameOffset, unsigned short hash) const { if (rName.mHash != hash) { return false; } @@ -109,8 +107,8 @@ bool JKRArchive::isSameName(CArcName &rName, unsigned long nameOffset, unsigned return strcmp(mStringTable + nameOffset, rName.mName) == 0; } -JKRArchive::SDIDirEntry *JKRArchive::findResType(unsigned long a1) const { - SDIDirEntry *current = mDirs; +JKRArchive::SDIDirEntry* JKRArchive::findResType(unsigned long a1) const { + SDIDirEntry* current = mDirs; for (u32 i = 0; i < mInfoBlock->mNrDirs; i++) { if (current->mID == a1) { @@ -125,17 +123,17 @@ JKRArchive::SDIDirEntry *JKRArchive::findResType(unsigned long a1) const { #ifdef NON_MATCHING // Register mismatch -JKRArchive::SDIDirEntry *JKRArchive::findDirectory(const char *pName, unsigned long dirIndex) const { - SDIDirEntry *dir; - SDIFileEntry *currentFile; - s32 i; +JKRArchive::SDIDirEntry* JKRArchive::findDirectory(const char* pName, unsigned long dirIndex) const { + SDIDirEntry* dir; + SDIFileEntry* currentFile; + s32 i; if (pName == nullptr) { return &mDirs[dirIndex]; } - CArcName name; - const char *next = name.store(pName, '/'); + CArcName name; + const char* next = name.store(pName, '/'); dir = &mDirs[dirIndex]; currentFile = &mFiles[dir->mFirstFileIndex]; @@ -156,15 +154,15 @@ JKRArchive::SDIDirEntry *JKRArchive::findDirectory(const char *pName, unsigned l } #endif -JKRArchive::SDIFileEntry *JKRArchive::findTypeResource(unsigned long a1, const char *pName) const { +JKRArchive::SDIFileEntry* JKRArchive::findTypeResource(unsigned long a1, const char* pName) const { if (a1 != 0) { CArcName name; name.store(pName); - SDIDirEntry *dir = findResType(a1); + SDIDirEntry* dir = findResType(a1); if (dir != nullptr) { - SDIFileEntry *current = &mFiles[dir->mFirstFileIndex]; + SDIFileEntry* current = &mFiles[dir->mFirstFileIndex]; for (s32 i = 0; i < dir->mNrFiles; i++) { if (isSameName(name, current->mNameOffset, current->mHash)) { @@ -181,14 +179,14 @@ JKRArchive::SDIFileEntry *JKRArchive::findTypeResource(unsigned long a1, const c #ifdef NON_MATCHING // Register mismatch -JKRArchive::SDIFileEntry *JKRArchive::findFsResource(const char *pName, unsigned long dirIndex) const { +JKRArchive::SDIFileEntry* JKRArchive::findFsResource(const char* pName, unsigned long dirIndex) const { if (pName != nullptr) { - SDIDirEntry *dir; - SDIFileEntry *currentFile; - s32 i; + SDIDirEntry* dir; + SDIFileEntry* currentFile; + s32 i; - CArcName name; - const char *next = name.store(pName, '/'); + CArcName name; + const char* next = name.store(pName, '/'); dir = &mDirs[dirIndex]; currentFile = &mFiles[dir->mFirstFileIndex]; @@ -197,11 +195,9 @@ JKRArchive::SDIFileEntry *JKRArchive::findFsResource(const char *pName, unsigned if (isSameName(name, currentFile->mNameOffset, currentFile->mHash)) { if ((currentFile->mFlag & FILE_FLAG_FOLDER) != 0) { return findFsResource(next, currentFile->mDirIndex); - } - else if (next == nullptr) { + } else if (next == nullptr) { return currentFile; - } - else { + } else { return nullptr; } } @@ -214,7 +210,7 @@ JKRArchive::SDIFileEntry *JKRArchive::findFsResource(const char *pName, unsigned } #endif -JKRArchive::SDIFileEntry *JKRArchive::findIdxResource(unsigned long index) const { +JKRArchive::SDIFileEntry* JKRArchive::findIdxResource(unsigned long index) const { if (index < mInfoBlock->mNrFiles) { return &mFiles[index]; } @@ -222,8 +218,8 @@ JKRArchive::SDIFileEntry *JKRArchive::findIdxResource(unsigned long index) const return nullptr; } -JKRArchive::SDIFileEntry *JKRArchive::findNameResource(const char *pName) const { - SDIFileEntry *current = mFiles; +JKRArchive::SDIFileEntry* JKRArchive::findNameResource(const char* pName) const { + SDIFileEntry* current = mFiles; CArcName name; name.store(pName); @@ -239,8 +235,8 @@ JKRArchive::SDIFileEntry *JKRArchive::findNameResource(const char *pName) const return nullptr; } -JKRArchive::SDIFileEntry *JKRArchive::findPtrResource(const void *pResource) const { - SDIFileEntry *current = mFiles; +JKRArchive::SDIFileEntry* JKRArchive::findPtrResource(const void* pResource) const { + SDIFileEntry* current = mFiles; for (s32 i = 0; i < mInfoBlock->mNrFiles; i++) { if (current->mFileData == pResource) { @@ -253,10 +249,10 @@ JKRArchive::SDIFileEntry *JKRArchive::findPtrResource(const void *pResource) con return nullptr; } -JKRArchive::SDIFileEntry *JKRArchive::findIdResource(unsigned short fileID) const { +JKRArchive::SDIFileEntry* JKRArchive::findIdResource(unsigned short fileID) const { if (fileID != 0xFFFF) { - SDIFileEntry *current = mFiles; - SDIFileEntry *indexed = &mFiles[fileID]; + SDIFileEntry* current = mFiles; + SDIFileEntry* indexed = &mFiles[fileID]; if (indexed->mFileID == fileID && (indexed->mFlag & FILE_FLAG_FILE) != 0) { return indexed; diff --git a/src/JSystem/JKernel/JKRArchivePub.cpp b/src/JSystem/JKernel/JKRArchivePub.cpp index dc0851108..ad3fbbba8 100644 --- a/src/JSystem/JKernel/JKRArchivePub.cpp +++ b/src/JSystem/JKernel/JKRArchivePub.cpp @@ -7,19 +7,18 @@ #include "JSystem/JKernel/JKRMemArchive.hpp" #include "revolution.h" -bool JKRArchive::becomeCurrent(const char *pName) { - SDIDirEntry *dir; +bool JKRArchive::becomeCurrent(const char* pName) { + SDIDirEntry* dir; if (*pName == '/') { - const char *pDir = pName + 1; + const char* pDir = pName + 1; if (*pDir == 0) { pDir = nullptr; } dir = findDirectory(pDir, 0); - } - else { + } else { dir = findDirectory(pName, sCurrentDirIndex); } @@ -33,13 +32,12 @@ bool JKRArchive::becomeCurrent(const char *pName) { return validDir; } -void *JKRArchive::getResource(const char *pName) { - SDIFileEntry *file; +void* JKRArchive::getResource(const char* pName) { + SDIFileEntry* file; if (*pName == '/') { file = findFsResource(pName + 1, 0); - } - else { + } else { file = findFsResource(pName, sCurrentDirIndex); } @@ -50,13 +48,12 @@ void *JKRArchive::getResource(const char *pName) { return nullptr; } -void *JKRArchive::getResource(unsigned long a1, const char *pName) { - SDIFileEntry *file; +void* JKRArchive::getResource(unsigned long a1, const char* pName) { + SDIFileEntry* file; if (a1 == NULL_MAGIC || a1 == QUESTIONMARK_MAGIC) { file = findNameResource(pName); - } - else { + } else { file = findTypeResource(a1, pName); } @@ -67,13 +64,12 @@ void *JKRArchive::getResource(unsigned long a1, const char *pName) { return nullptr; } -u32 JKRArchive::readResource(void *a1, unsigned long a2, const char *pName) { - SDIFileEntry *file; +u32 JKRArchive::readResource(void* a1, unsigned long a2, const char* pName) { + SDIFileEntry* file; if (*pName == '/') { file = findFsResource(pName + 1, 0); - } - else { + } else { file = findFsResource(pName, sCurrentDirIndex); } @@ -87,13 +83,12 @@ u32 JKRArchive::readResource(void *a1, unsigned long a2, const char *pName) { return 0; } -u32 JKRArchive::readResource(void *a1, unsigned long a2, unsigned long a3, const char *pName) { - SDIFileEntry *file; +u32 JKRArchive::readResource(void* a1, unsigned long a2, unsigned long a3, const char* pName) { + SDIFileEntry* file; if (a3 == NULL_MAGIC || a3 == QUESTIONMARK_MAGIC) { file = findNameResource(pName); - } - else { + } else { file = findTypeResource(a3, pName); } @@ -109,7 +104,7 @@ u32 JKRArchive::readResource(void *a1, unsigned long a2, unsigned long a3, const void JKRArchive::removeResourceAll() { if (mInfoBlock != nullptr && mMountMode != MOUNT_MODE_DVD) { - SDIFileEntry *current = mFiles; + SDIFileEntry* current = mFiles; for (u32 i = 0; i < mInfoBlock->mNrFiles; i++) { if (current->mFileData != nullptr) { @@ -122,8 +117,8 @@ void JKRArchive::removeResourceAll() { } } -bool JKRArchive::removeResource(void *pResource) { - SDIFileEntry *file = findPtrResource(pResource); +bool JKRArchive::removeResource(void* pResource) { + SDIFileEntry* file = findPtrResource(pResource); if (file == nullptr) { return false; @@ -135,8 +130,8 @@ bool JKRArchive::removeResource(void *pResource) { return true; } -bool JKRArchive::detachResource(void *pResource) { - SDIFileEntry *file = findPtrResource(pResource); +bool JKRArchive::detachResource(void* pResource) { + SDIFileEntry* file = findPtrResource(pResource); if (file == nullptr) { return false; @@ -147,8 +142,8 @@ bool JKRArchive::detachResource(void *pResource) { return true; } -s32 JKRArchive::getResSize(const void *pResource) const { - SDIFileEntry *file = findPtrResource(pResource); +s32 JKRArchive::getResSize(const void* pResource) const { + SDIFileEntry* file = findPtrResource(pResource); if (file == nullptr) { return -1; @@ -157,8 +152,8 @@ s32 JKRArchive::getResSize(const void *pResource) const { return file->mDataSize; } -s32 JKRArchive::countFile(const char *pName) const { - SDIDirEntry *dir; +s32 JKRArchive::countFile(const char* pName) const { + SDIDirEntry* dir; if (*pName == '/') { pName++; @@ -168,8 +163,7 @@ s32 JKRArchive::countFile(const char *pName) const { } dir = findDirectory(pName, 0); - } - else { + } else { dir = findDirectory(pName, sCurrentDirIndex); } @@ -180,8 +174,8 @@ s32 JKRArchive::countFile(const char *pName) const { return 0; } -JKRArcFinder *JKRArchive::getFirstFile(const char *pName) const { - SDIDirEntry *dir; +JKRArcFinder* JKRArchive::getFirstFile(const char* pName) const { + SDIDirEntry* dir; if (*pName == '/') { pName++; @@ -191,24 +185,23 @@ JKRArcFinder *JKRArchive::getFirstFile(const char *pName) const { } dir = findDirectory(pName, 0); - } - else { + } else { dir = findDirectory(pName, sCurrentDirIndex); } if (dir != nullptr) { // Bad to cast to non-const - return new(JKRHeap::sGameHeap, 0) JKRArcFinder(const_cast(this), dir->mFirstFileIndex, dir->mNrFiles); + return new (JKRHeap::sGameHeap, 0) JKRArcFinder(const_cast(this), dir->mFirstFileIndex, dir->mNrFiles); } return nullptr; } -JKRArchive *JKRArchive::check_mount_already(long entryNum) { - JSUPtrLink *current = JKRFileLoader::sFileLoaderList.mHead; +JKRArchive* JKRArchive::check_mount_already(long entryNum) { + JSUPtrLink* current = JKRFileLoader::sFileLoaderList.mHead; while (current != nullptr) { - JKRArchive *archive = reinterpret_cast(current->mData); + JKRArchive* archive = reinterpret_cast(current->mData); if (archive->mLoaderType == RARC_MAGIC && archive->mEntryNum == entryNum) { archive->_34++; @@ -221,15 +214,15 @@ JKRArchive *JKRArchive::check_mount_already(long entryNum) { return nullptr; } -JKRArchive *JKRArchive::check_mount_already(long entryNum, JKRHeap *pHeap) { +JKRArchive* JKRArchive::check_mount_already(long entryNum, JKRHeap* pHeap) { if (pHeap == nullptr) { pHeap = JKRHeap::sCurrentHeap; } - JSUPtrLink *current = JKRFileLoader::sFileLoaderList.mHead; + JSUPtrLink* current = JKRFileLoader::sFileLoaderList.mHead; while (current != nullptr) { - JKRArchive *archive = reinterpret_cast(current->mData); + JKRArchive* archive = reinterpret_cast(current->mData); if (archive->mLoaderType == RARC_MAGIC && archive->mEntryNum == entryNum && archive->mHeap == pHeap) { archive->_34++; @@ -242,7 +235,7 @@ JKRArchive *JKRArchive::check_mount_already(long entryNum, JKRHeap *pHeap) { return nullptr; } -void JKRArchive::mount(const char *pName, EMountMode mountMode, JKRHeap *pHeap, EMountDirection mountDir) { +void JKRArchive::mount(const char* pName, EMountMode mountMode, JKRHeap* pHeap, EMountDirection mountDir) { s32 entryNum = DVDConvertPathToEntrynum(pName); if (entryNum >= 0) { @@ -250,8 +243,8 @@ void JKRArchive::mount(const char *pName, EMountMode mountMode, JKRHeap *pHeap, } } -JKRArchive *JKRArchive::mount(long entryNum, EMountMode mountMode, JKRHeap *pHeap, EMountDirection mountDir) { - JKRArchive *archive = check_mount_already(entryNum, pHeap); +JKRArchive* JKRArchive::mount(long entryNum, EMountMode mountMode, JKRHeap* pHeap, EMountDirection mountDir) { + JKRArchive* archive = check_mount_already(entryNum, pHeap); if (archive != nullptr) { return archive; @@ -264,18 +257,18 @@ JKRArchive *JKRArchive::mount(long entryNum, EMountMode mountMode, JKRHeap *pHea } switch (mountMode) { - case MOUNT_MODE_MEM: - archive = new(pHeap, uVar1) JKRMemArchive(entryNum, mountDir); - break; - case MOUNT_MODE_ARAM: - archive = new(pHeap, uVar1) JKRAramArchive(entryNum, mountDir); - break; - case MOUNT_MODE_DVD: - archive = new(pHeap, uVar1) JKRDvdArchive(entryNum, mountDir); - break; - case MOUNT_MODE_COMP: - archive = new(pHeap, uVar1) JKRCompArchive(entryNum, mountDir); - break; + case MOUNT_MODE_MEM: + archive = new (pHeap, uVar1) JKRMemArchive(entryNum, mountDir); + break; + case MOUNT_MODE_ARAM: + archive = new (pHeap, uVar1) JKRAramArchive(entryNum, mountDir); + break; + case MOUNT_MODE_DVD: + archive = new (pHeap, uVar1) JKRDvdArchive(entryNum, mountDir); + break; + case MOUNT_MODE_COMP: + archive = new (pHeap, uVar1) JKRCompArchive(entryNum, mountDir); + break; } if (archive != nullptr && archive->mMountMode == MOUNT_MODE_0) { @@ -286,8 +279,8 @@ JKRArchive *JKRArchive::mount(long entryNum, EMountMode mountMode, JKRHeap *pHea return archive; } -bool JKRArchive::getDirEntry(SDirEntry *pDir, unsigned long fileIndex) const { - SDIFileEntry *file = findIdxResource(fileIndex); +bool JKRArchive::getDirEntry(SDirEntry* pDir, unsigned long fileIndex) const { + SDIFileEntry* file = findIdxResource(fileIndex); if (file == nullptr) { return false; @@ -300,8 +293,8 @@ bool JKRArchive::getDirEntry(SDirEntry *pDir, unsigned long fileIndex) const { return true; } -void *JKRArchive::getIdxResource(unsigned long fileIndex) { - SDIFileEntry *file = findIdxResource(fileIndex); +void* JKRArchive::getIdxResource(unsigned long fileIndex) { + SDIFileEntry* file = findIdxResource(fileIndex); if (file != nullptr) { return fetchResource(file, 0); @@ -310,8 +303,8 @@ void *JKRArchive::getIdxResource(unsigned long fileIndex) { return nullptr; } -void *JKRArchive::getResource(unsigned short fileID) { - SDIFileEntry *file = findIdResource(fileID); +void* JKRArchive::getResource(unsigned short fileID) { + SDIFileEntry* file = findIdResource(fileID); if (file != nullptr) { return fetchResource(file, 0); @@ -320,8 +313,8 @@ void *JKRArchive::getResource(unsigned short fileID) { return nullptr; } -u32 JKRArchive::readResource(void *pResource, unsigned long a2, unsigned short fileID) { - SDIFileEntry *file = findIdResource(fileID); +u32 JKRArchive::readResource(void* pResource, unsigned long a2, unsigned short fileID) { + SDIFileEntry* file = findIdResource(fileID); if (file != nullptr) { u32 local_18; @@ -346,7 +339,7 @@ u32 JKRArchive::countResource() const { } u32 JKRArchive::getFileAttribute(unsigned long fileIndex) const { - SDIFileEntry *file = findIdxResource(fileIndex); + SDIFileEntry* file = findIdxResource(fileIndex); if (file != nullptr) { return file->mFlag; diff --git a/src/JSystem/JKernel/JKRDecomp.cpp b/src/JSystem/JKernel/JKRDecomp.cpp index b8ed5c135..ac91b6200 100644 --- a/src/JSystem/JKernel/JKRDecomp.cpp +++ b/src/JSystem/JKernel/JKRDecomp.cpp @@ -6,10 +6,10 @@ #define NR_MESSAGES 8 namespace { - JKRDecomp *gDecompInstance; // 0x806B71D8 - OSMessage gMessage[NR_MESSAGES]; // 0x8060D038 - OSMessageQueue gMessageQueue; // 0x8060D058 -} + JKRDecomp* gDecompInstance; // 0x806B71D8 + OSMessage gMessage[NR_MESSAGES]; // 0x8060D038 + OSMessageQueue gMessageQueue; // 0x8060D058 +} // namespace JKRDecompCommand::JKRDecompCommand() { OSInitMessageQueue(&mMessageQueue, &mMessage, 1); @@ -19,30 +19,29 @@ JKRDecompCommand::JKRDecompCommand() { _20 = 0; } -JKRDecomp::JKRDecomp(long a1) : JKRThread(0x4000, 0x10, a1) { +JKRDecomp::JKRDecomp(long a1) + : JKRThread(0x4000, 0x10, a1) { OSResumeThread(mThread); } JKRDecomp::~JKRDecomp() { - } s32 JKRDecomp::run() { OSInitMessageQueue(&gMessageQueue, &gMessage[0], NR_MESSAGES); - JKRDecompCommand *commandPtr; + JKRDecompCommand* commandPtr; while (true) { - OSReceiveMessage(&gMessageQueue, reinterpret_cast(&commandPtr), OS_MESSAGE_BLOCK); + OSReceiveMessage(&gMessageQueue, reinterpret_cast(&commandPtr), OS_MESSAGE_BLOCK); - JKRDecompCommand &command = *commandPtr; + JKRDecompCommand& command = *commandPtr; decode( command.mSrc, command.mDst, command.mCompressedSize, - command.mDecompressedSize - ); + command.mDecompressedSize); if (command._20 != 0) { if (command._20 == 1) { @@ -59,23 +58,22 @@ s32 JKRDecomp::run() { if (command._1C != nullptr) { OSSendMessage(command._1C, reinterpret_cast(1), OS_MESSAGE_NOBLOCK); - } - else { + } else { OSSendMessage(&command.mMessageQueue, reinterpret_cast(1), OS_MESSAGE_NOBLOCK); } } } -JKRDecomp *JKRDecomp::create(long a1) { +JKRDecomp* JKRDecomp::create(long a1) { if (gDecompInstance == nullptr) { - gDecompInstance = new(JKRHeap::sGameHeap, 0) JKRDecomp(a1); + gDecompInstance = new (JKRHeap::sGameHeap, 0) JKRDecomp(a1); } return gDecompInstance; } -JKRDecompCommand *JKRDecomp::prepareCommand(unsigned char *pSrc, unsigned char *pDst, unsigned long compressedSize, unsigned long decompressedSize, void (*a5)(unsigned long)) { - JKRDecompCommand *command = new(JKRHeap::sGameHeap, -4) JKRDecompCommand(); +JKRDecompCommand* JKRDecomp::prepareCommand(unsigned char* pSrc, unsigned char* pDst, unsigned long compressedSize, unsigned long decompressedSize, void (*a5)(unsigned long)) { + JKRDecompCommand* command = new (JKRHeap::sGameHeap, -4) JKRDecompCommand(); command->mSrc = pSrc; command->mDst = pDst; @@ -86,24 +84,23 @@ JKRDecompCommand *JKRDecomp::prepareCommand(unsigned char *pSrc, unsigned char * return command; } -void JKRDecomp::sendCommand(JKRDecompCommand *pCommand) { +void JKRDecomp::sendCommand(JKRDecompCommand* pCommand) { OSSendMessage(&gMessageQueue, pCommand, OS_MESSAGE_NOBLOCK); } -bool JKRDecomp::sync(JKRDecompCommand *pCommand, int noBlock) { +bool JKRDecomp::sync(JKRDecompCommand* pCommand, int noBlock) { OSMessage message; if (noBlock == 0) { OSReceiveMessage(&pCommand->mMessageQueue, &message, OS_MESSAGE_BLOCK); return true; - } - else { + } else { return OSReceiveMessage(&pCommand->mMessageQueue, &message, OS_MESSAGE_NOBLOCK) != 0; } } -bool JKRDecomp::orderSync(unsigned char *pSrc, unsigned char *pDst, unsigned long compressedSize, unsigned long decompressedSize) { - JKRDecompCommand *command = prepareCommand(pSrc, pDst, compressedSize, decompressedSize,nullptr); +bool JKRDecomp::orderSync(unsigned char* pSrc, unsigned char* pDst, unsigned long compressedSize, unsigned long decompressedSize) { + JKRDecompCommand* command = prepareCommand(pSrc, pDst, compressedSize, decompressedSize, nullptr); OSSendMessage(&gMessageQueue, command, OS_MESSAGE_NOBLOCK); bool received = sync(command, 0); @@ -113,13 +110,12 @@ bool JKRDecomp::orderSync(unsigned char *pSrc, unsigned char *pDst, unsigned lon return received; } -void JKRDecomp::decode(unsigned char *pSrc, unsigned char *pDst, unsigned long compressedSize, unsigned long decompressedSize) { +void JKRDecomp::decode(unsigned char* pSrc, unsigned char* pDst, unsigned long compressedSize, unsigned long decompressedSize) { EJKRCompression compression = checkCompressed(pSrc); if (compression == JKR_COMPRESSION_SZP) { decodeSZP(pSrc, pDst, compressedSize, decompressedSize); - } - else if (compression == JKR_COMPRESSION_SZS) { + } else if (compression == JKR_COMPRESSION_SZS) { decodeSZS(pSrc, pDst, compressedSize, decompressedSize); } } @@ -129,9 +125,9 @@ void JKRDecomp::decode(unsigned char *pSrc, unsigned char *pDst, unsigned long c }*/ #ifdef NON_MATCHING // Wrong registers -void JKRDecomp::decodeSZS(u8 *pSrc, u8 *pDst, u32 compressedSize, u32 a4) { +void JKRDecomp::decodeSZS(u8* pSrc, u8* pDst, u32 compressedSize, u32 a4) { u32 decompSize = ((s32)pDst + *(u32*)(pSrc + 4)) - a4; - u8 byte1, byte2; + u8 byte1, byte2; s32 validBitCount = 0; u32 curBlock; @@ -160,31 +156,29 @@ void JKRDecomp::decodeSZS(u8 *pSrc, u8 *pDst, u32 compressedSize, u32 a4) { if (compressedSize == 0) { return; } - } - else { + } else { a4--; } pSrc++; - } - else { + } else { // This bit specifically byte1 = *pSrc++; byte2 = *pSrc++; u8* copySrc = pDst; - copySrc -= ((byte1 & 0xF) << 8) | byte2;; + copySrc -= ((byte1 & 0xF) << 8) | byte2; + ; u32 numBytes = byte1 >> 4; if (numBytes == 0) { numBytes = *pSrc++ + 0x12; - } - else { + } else { numBytes += 2; } - + do { - if (a4 == 0) { + if (a4 == 0) { compressedSize--; *pDst = *(copySrc - 1); pDst++; @@ -192,8 +186,7 @@ void JKRDecomp::decodeSZS(u8 *pSrc, u8 *pDst, u32 compressedSize, u32 a4) { if (compressedSize == 0) { return; } - } - else { + } else { a4--; } @@ -207,12 +200,12 @@ void JKRDecomp::decodeSZS(u8 *pSrc, u8 *pDst, u32 compressedSize, u32 a4) { } #endif -EJKRCompression JKRDecomp::checkCompressed(unsigned char *pSrc) { +EJKRCompression JKRDecomp::checkCompressed(unsigned char* pSrc) { if (pSrc[0] == 'Y' && pSrc[1] == 'a' && pSrc[3] == '0') { if (pSrc[2] == 'y') { return JKR_COMPRESSION_SZP; } - + if (pSrc[2] == 'z') { return JKR_COMPRESSION_SZS; } diff --git a/src/JSystem/JKernel/JKRDisposer.cpp b/src/JSystem/JKernel/JKRDisposer.cpp index 895f03d15..8207c6b95 100644 --- a/src/JSystem/JKernel/JKRDisposer.cpp +++ b/src/JSystem/JKernel/JKRDisposer.cpp @@ -1,7 +1,8 @@ #include "JSystem/JKernel/JKRDisposer.hpp" #include "JSystem/JKernel/JKRHeap.hpp" -JKRDisposer::JKRDisposer() : mLink(this) { +JKRDisposer::JKRDisposer() + : mLink(this) { mHeap = JKRHeap::findFromRoot(this); if (mHeap) { diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp index b99927d98..517f457ee 100644 --- a/src/JSystem/JKernel/JKRDvdArchive.cpp +++ b/src/JSystem/JKernel/JKRDvdArchive.cpp @@ -1,6 +1,7 @@ #include "JSystem/JKernel/JKRDvdArchive.hpp" -JKRDvdArchive::JKRDvdArchive(long entryNum, EMountDirection mountDir) : JKRArchive(entryNum, MOUNT_MODE_DVD) { +JKRDvdArchive::JKRDvdArchive(long entryNum, EMountDirection mountDir) + : JKRArchive(entryNum, MOUNT_MODE_DVD) { mMountDir = mountDir; if (!open(entryNum)) { diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp index e1f10c57f..1a95394d5 100644 --- a/src/JSystem/JKernel/JKRExpHeap.cpp +++ b/src/JSystem/JKernel/JKRExpHeap.cpp @@ -5,8 +5,8 @@ #define ALIGN_PREV(X, N) ((X) & ~((N)-1)) #define ALIGN_NEXT(X, N) ALIGN_PREV(((X) + (N)-1), N) -static u32 DBfoundSize; -static u32 DBfoundOffset; +static u32 DBfoundSize; +static u32 DBfoundOffset; static JKRExpHeap::CMemBlock* DBfoundBlock; static JKRExpHeap::CMemBlock* DBnewFreeBlock; static JKRExpHeap::CMemBlock* DBnewUsedBlock; @@ -16,11 +16,11 @@ JKRExpHeap* JKRExpHeap::createRoot(int heapNum, bool a2) { if (!JKRHeap::sRootHeap) { char* stack_C; - u32 arenaSize; + u32 arenaSize; JKRHeap::initArena(&stack_C, &arenaSize, heapNum); char* area = stack_C + 0x90; - u32 size = arenaSize - 0x90; - heap = new(stack_C)JKRExpHeap(area, size, nullptr, a2); + u32 size = arenaSize - 0x90; + heap = new (stack_C) JKRExpHeap(area, size, nullptr, a2); JKRHeap::sRootHeap = heap; } @@ -36,7 +36,7 @@ JKRExpHeap* JKRExpHeap::create(u32 size, JKRHeap* pParent, bool errorFlag) { if (size == 0xFFFFFFFF) { size = pParent->getMaxAllocatableSize(0x10); } - + u32 alignedSize = ALIGN_PREV(size, 0x10); u32 heapSize = ALIGN_NEXT(sizeof(JKRExpHeap), 0x10); @@ -50,7 +50,7 @@ JKRExpHeap* JKRExpHeap::create(u32 size, JKRHeap* pParent, bool errorFlag) { return nullptr; } - JKRExpHeap* heap = new(mem)JKRExpHeap(data, alignedSize - heapSize, pParent, errorFlag); + JKRExpHeap* heap = new (mem) JKRExpHeap(data, alignedSize - heapSize, pParent, errorFlag); if (heap == nullptr) { JKRHeap::free(mem, nullptr); @@ -70,22 +70,21 @@ JKRExpHeap* JKRExpHeap::create(void* ptr, u32 size, JKRHeap* pParent, bool error if (parent == nullptr) { return nullptr; } - } - else { + } else { parent = pParent; } JKRExpHeap* heap = nullptr; - u32 heapSize = ALIGN_NEXT(sizeof(JKRExpHeap), 0x10); + u32 heapSize = ALIGN_NEXT(sizeof(JKRExpHeap), 0x10); if (size < heapSize) { return nullptr; } void* data = (u8*)ptr + heapSize; - u32 alignSize = ALIGN_PREV((u32)ptr + size - (u32)data, 0x10); + u32 alignSize = ALIGN_PREV((u32)ptr + size - (u32)data, 0x10); if (ptr != nullptr) { - heap = new(ptr)JKRExpHeap(data, alignSize, parent, errorFlag); + heap = new (ptr) JKRExpHeap(data, alignSize, parent, errorFlag); } heap->mAllocMode = 1; @@ -102,8 +101,7 @@ void JKRExpHeap::do_destroy() { this->~JKRExpHeap(); JKRHeap::free(this, heap); } - } - else { + } else { this->~JKRExpHeap(); } } @@ -119,16 +117,13 @@ void* JKRExpHeap::do_alloc(u32 size, int align) { if (align >= 0) { if (align <= 4) { ptr = allocFromHead(size); - } - else { + } else { ptr = allocFromHead(size, align); } - } - else { + } else { if (-align <= 4) { ptr = allocFromTail(size); - } - else { + } else { ptr = allocFromTail(size, -align); } } @@ -150,8 +145,6 @@ void* JKRExpHeap::do_alloc(u32 size, int align) { // JKRExpheap::allocFromHead // JKRExpHeap::allocFromTail - - JKRExpHeap::JKRExpHeap(void* data, u32 size, JKRHeap* parent, bool error) : JKRHeap(data, size, parent, error) { @@ -203,8 +196,7 @@ JKRExpHeap::CMemBlock* JKRExpHeap::CMemBlock::allocBack(u32 size, u8 group_1, u8 mGroupId = group_1; mFlags = align_1; mSize -= size + sizeof(CMemBlock); - } - else { + } else { mGroupId = group_2; mFlags = 0x80; } diff --git a/src/JSystem/JKernel/JKRFileFinder.cpp b/src/JSystem/JKernel/JKRFileFinder.cpp index 010ab91dc..c7adf6099 100644 --- a/src/JSystem/JKernel/JKRFileFinder.cpp +++ b/src/JSystem/JKernel/JKRFileFinder.cpp @@ -6,7 +6,7 @@ JKRFileFinder::JKRFileFinder() { mFileIsFolder = false; } -JKRArcFinder::JKRArcFinder(JKRArchive *pArchive, long firstFileIndex, long nrFiles) { +JKRArcFinder::JKRArcFinder(JKRArchive* pArchive, long firstFileIndex, long nrFiles) { mArchive = pArchive; mHasMoreFiles = nrFiles > 0; mFirstIndex = firstFileIndex; @@ -19,7 +19,6 @@ JKRArcFinder::JKRArcFinder(JKRArchive *pArchive, long firstFileIndex, long nrFil #ifdef NON_MATCHING // Looks identical to base destructor, does not call ~JKRFileFinder() JKRArcFinder::~JKRArcFinder() { - } #endif diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/src/JSystem/JKernel/JKRFileLoader.cpp index 179c0ff5c..dd0f41b69 100644 --- a/src/JSystem/JKernel/JKRFileLoader.cpp +++ b/src/JSystem/JKernel/JKRFileLoader.cpp @@ -7,7 +7,8 @@ namespace { JSUList JKRFileLoader::sFileLoaderList = JSUList(); -JKRFileLoader::JKRFileLoader() : JKRDisposer(), mLoaderLink(this) { +JKRFileLoader::JKRFileLoader() + : JKRDisposer(), mLoaderLink(this) { mLoaderName = nullptr; mLoaderType = 0; _34 = 0; @@ -31,17 +32,16 @@ void JKRFileLoader::unmount() { delete this; } -void *JKRFileLoader::getGlbResource(const char *pName, JKRFileLoader *pLoader) { - void *resource = nullptr; +void* JKRFileLoader::getGlbResource(const char* pName, JKRFileLoader* pLoader) { + void* resource = nullptr; if (pLoader != nullptr) { resource = pLoader->getResource(0, pName); - } - else { - JSUPtrLink *current = sFileLoaderList.mHead; + } else { + JSUPtrLink* current = sFileLoaderList.mHead; while (current != nullptr) { - resource = reinterpret_cast(current->mData)->getResource(0, pName); + resource = reinterpret_cast(current->mData)->getResource(0, pName); if (resource != nullptr) { break; @@ -58,7 +58,7 @@ void JKRFileLoader::initializeVolumeList() { OSInitMutex(&gLoaderMutex); } -void JKRFileLoader::prependVolumeList(JSULink *pLoader) { +void JKRFileLoader::prependVolumeList(JSULink* pLoader) { OSLockMutex(&gLoaderMutex); sFileLoaderList.prepend(pLoader); @@ -66,7 +66,7 @@ void JKRFileLoader::prependVolumeList(JSULink *pLoader) { OSUnlockMutex(&gLoaderMutex); } -void JKRFileLoader::removeVolumeList(JSULink *pLoader) { +void JKRFileLoader::removeVolumeList(JSULink* pLoader) { OSLockMutex(&gLoaderMutex); sFileLoaderList.remove(pLoader); diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp index b6584ec94..adf3c95f0 100644 --- a/src/JSystem/JKernel/JKRHeap.cpp +++ b/src/JSystem/JKernel/JKRHeap.cpp @@ -20,7 +20,8 @@ u32 JKRHeap::mMemorySize; u32 JKRHeap::ARALT_AramStartAddr = 0x90000000; -JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool error) : JKRDisposer(), mChildTree(this), mDisposerList() { +JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool error) + : JKRDisposer(), mChildTree(this), mDisposerList() { OSInitMutex(&mMutex); mSize = size; mStart = (u8*)data; @@ -29,9 +30,8 @@ JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool error) : JKRDispose if (parent == nullptr) { JKRHeap::sSystemHeap = this; JKRHeap::sCurrentHeap = this; - } - else { - parent->mChildTree.appendChild(&mChildTree); + } else { + parent->mChildTree.appendChild(&mChildTree); if (JKRHeap::sSystemHeap == JKRHeap::sRootHeap) { JKRHeap::sSystemHeap = this; @@ -50,7 +50,7 @@ JKRHeap::JKRHeap(void* data, u32 size, JKRHeap* parent, bool error) : JKRDispose _3C = byte_806B26D8; _3D = byte_806B70B8; - _69 = false; + _69 = false; } JKRHeap::~JKRHeap() { @@ -64,9 +64,8 @@ JKRHeap::~JKRHeap() { sSystemHeap = !nextRootHeap ? sRootHeap : nextRootHeap->getObject(); } - bool JKRHeap::initArena(char** memory, u32* size, int maxHeaps) { - void* ramStart, *ramEnd, *arenaStart; + void *ramStart, *ramEnd, *arenaStart; void* arenaLo = OSGetArenaLo(); void* arenaHi = OSGetArenaHi(); @@ -81,7 +80,7 @@ bool JKRHeap::initArena(char** memory, u32* size, int maxHeaps) { OSBootInfo* code = (OSBootInfo*)OSPhysicalToCached(0); ramStart = (void*)(((u32)arenaStart + 31) & 0xFFFFFFE0); ramEnd = (void*)((u32)arenaHi & 0xFFFFFFE0); - + JKRHeap::mCodeStart = code; JKRHeap::mCodeEnd = ramStart; JKRHeap::mUserRamStart = ramStart; @@ -98,21 +97,21 @@ bool JKRHeap::initArena(char** memory, u32* size, int maxHeaps) { JKRHeap* JKRHeap::becomeSystemHeap() { JKRHeap* sys = sSystemHeap; - sSystemHeap = this; + sSystemHeap = this; return sys; } JKRHeap* JKRHeap::becomeCurrentHeap() { JKRHeap* cur = sCurrentHeap; - sCurrentHeap = this; + sCurrentHeap = this; return cur; } -void JKRHeap::destroy(JKRHeap *pHeap) { +void JKRHeap::destroy(JKRHeap* pHeap) { pHeap->do_destroy(); } -void* JKRHeap::alloc(u32 size, int align, JKRHeap *pHeap) { +void* JKRHeap::alloc(u32 size, int align, JKRHeap* pHeap) { if (pHeap != nullptr) { return pHeap->alloc(size, align); } @@ -128,7 +127,7 @@ void* JKRHeap::alloc(u32 size, int align) { return do_alloc(size, align); } -void JKRHeap::free(void *pData, JKRHeap *pHeap) { +void JKRHeap::free(void* pData, JKRHeap* pHeap) { if (!pHeap) { pHeap = findFromRoot(pData); @@ -140,8 +139,8 @@ void JKRHeap::free(void *pData, JKRHeap *pHeap) { pHeap->do_free(pData); } -void JKRHeap::free(void *pData) { - do_free(pData); +void JKRHeap::free(void* pData) { + do_free(pData); } void JKRHeap::callAllDisposer() { @@ -158,7 +157,7 @@ void JKRHeap::freeTail() { do_freeTail(); } -s32 JKRHeap::resize(void *pData, u32 size) { +s32 JKRHeap::resize(void* pData, u32 size) { return do_resize(pData, size); } @@ -173,12 +172,12 @@ void* JKRHeap::getMaxFreeBlock() { s32 JKRHeap::getTotalFreeSize() { return do_getTotalFreeSize(); } - -JKRHeap* JKRHeap::findFromRoot(void *pData) { + +JKRHeap* JKRHeap::findFromRoot(void* pData) { JKRHeap* root = sRootHeap; - if (root == nullptr) { - return nullptr; + if (root == nullptr) { + return nullptr; } if ((void*)root->mStart <= pData && pData < (void*)root->mEnd) { @@ -187,26 +186,26 @@ JKRHeap* JKRHeap::findFromRoot(void *pData) { return root->findAllHeap(pData); } - + /* functionally equiv but not matching */ -JKRHeap* JKRHeap::find(void *pData) const { +JKRHeap* JKRHeap::find(void* pData) const { if (mStart <= pData && pData < mEnd) { const JSUTree& tree = mChildTree; if (tree.getNumChildren() != 0) { - for (JSUTreeIterator iterator(mChildTree.getFirstChild()); - iterator != mChildTree.getEndChild(); ++iterator) { - JKRHeap* result = iterator->find(pData); + for (JSUTreeIterator iterator(mChildTree.getFirstChild()); + iterator != mChildTree.getEndChild(); ++iterator) { + JKRHeap* result = iterator->find(pData); - if (result) { - return result; - } + if (result) { + return result; } + } } // this is to avoid returning a const JKRHeap ptr return const_cast(this); - } + } return nullptr; } @@ -243,13 +242,11 @@ void JKRHeap::dispose_subroutine(u32 start, u32 end) { if (last_it == nullptr) { next_it = mDisposerList.getFirst(); - } - else { + } else { next_it = last_it; next_it++; } - } - else { + } else { last_it = it; next_it = it; next_it++; @@ -269,7 +266,7 @@ void JKRHeap::dispose(void* begin, void* end) { } void JKRHeap::dispose() { - const JSUList& list = mDisposerList; + const JSUList& list = mDisposerList; JSUListIterator iterator; while (list.getFirst() != list.getEnd()) { @@ -278,10 +275,10 @@ void JKRHeap::dispose() { } } -void JKRHeap::copyMemory(void *pDst, void *pSrc, u32 size) { - u32 count = (size + 3) / 4; +void JKRHeap::copyMemory(void* pDst, void* pSrc, u32 size) { + u32 count = (size + 3) / 4; u32* dst_32 = (u32*)pDst; - u32* src_32 = (u32*)pSrc; + u32* src_32 = (u32*)pSrc; while (count > 0) { *dst_32 = *src_32; @@ -314,7 +311,7 @@ void* operator new(u32 size, int align) { return JKRHeap::alloc(size, align, nullptr); } -void* operator new(u32 size, JKRHeap *pHeap, int align) { +void* operator new(u32 size, JKRHeap* pHeap, int align) { return JKRHeap::alloc(size, align, pHeap); } @@ -326,27 +323,27 @@ void* operator new[](u32 size, int align) { return JKRHeap::alloc(size, align, nullptr); } -void* operator new[](u32 size, JKRHeap *pHeap, int align) { +void* operator new[](u32 size, JKRHeap* pHeap, int align) { return JKRHeap::alloc(size, align, pHeap); } -void operator delete(void *pData) { +void operator delete(void* pData) { JKRHeap::free(pData, nullptr); } -void operator delete[](void *pData) { +void operator delete[](void* pData) { JKRHeap::free(pData, nullptr); } -void JKRHeap::state_register(TState *, u32) const { +void JKRHeap::state_register(TState*, u32) const { return; } -bool JKRHeap::state_compare(const TState &lhs, const TState &rhs) const { +bool JKRHeap::state_compare(const TState& lhs, const TState& rhs) const { return lhs._4 == rhs._4; } -void JKRHeap::state_dump(const TState &) const { +void JKRHeap::state_dump(const TState&) const { return; } diff --git a/src/JSystem/JKernel/JKRMemArchive.cpp b/src/JSystem/JKernel/JKRMemArchive.cpp index a6b10029d..cbff62e9a 100644 --- a/src/JSystem/JKernel/JKRMemArchive.cpp +++ b/src/JSystem/JKernel/JKRMemArchive.cpp @@ -8,10 +8,10 @@ #include JKRMemArchive::JKRMemArchive() { - } -JKRMemArchive::JKRMemArchive(long entryNum, EMountDirection mountDir) : JKRArchive(entryNum, MOUNT_MODE_MEM) { +JKRMemArchive::JKRMemArchive(long entryNum, EMountDirection mountDir) + : JKRArchive(entryNum, MOUNT_MODE_MEM) { mIsMounted = false; mMountDir = mountDir; @@ -47,7 +47,7 @@ void JKRMemArchive::removeResourceAll() { return; } - SDIFileEntry *current = mFiles; + SDIFileEntry* current = mFiles; for (s32 i = 0; i < mInfoBlock->mNrFiles; i++) { if (current->mFileData != nullptr) { @@ -56,8 +56,8 @@ void JKRMemArchive::removeResourceAll() { } } -bool JKRMemArchive::removeResource(void *pResource) { - SDIFileEntry *file = findPtrResource(pResource); +bool JKRMemArchive::removeResource(void* pResource) { + SDIFileEntry* file = findPtrResource(pResource); if (file == nullptr) { return false; @@ -67,8 +67,8 @@ bool JKRMemArchive::removeResource(void *pResource) { return true; } -s32 JKRMemArchive::getExpandedResSize(const void *pResource) const { - SDIFileEntry *file = findPtrResource(pResource); +s32 JKRMemArchive::getExpandedResSize(const void* pResource) const { + SDIFileEntry* file = findPtrResource(pResource); if (file == nullptr) { return -1; @@ -78,10 +78,10 @@ s32 JKRMemArchive::getExpandedResSize(const void *pResource) const { return getResSize(pResource); } - return JKRDecompExpandSize(reinterpret_cast(const_cast(pResource))); + return JKRDecompExpandSize(reinterpret_cast(const_cast(pResource))); } -void *JKRMemArchive::fetchResource(SDIFileEntry *pFile, unsigned long *pSize) { +void* JKRMemArchive::fetchResource(SDIFileEntry* pFile, unsigned long* pSize) { if (pFile->mFileData == nullptr) { pFile->mFileData = mFileDataStart + pFile->mDataOffset; } @@ -93,7 +93,7 @@ void *JKRMemArchive::fetchResource(SDIFileEntry *pFile, unsigned long *pSize) { return pFile->mFileData; } -void *JKRMemArchive::fetchResource(void *pData, unsigned long dataSize, SDIFileEntry *pFile, unsigned long *pSize) { +void* JKRMemArchive::fetchResource(void* pData, unsigned long dataSize, SDIFileEntry* pFile, unsigned long* pSize) { u32 size = pFile->mDataSize; if (size > dataSize) { @@ -102,27 +102,23 @@ void *JKRMemArchive::fetchResource(void *pData, unsigned long dataSize, SDIFileE if (pFile->mFileData != nullptr) { memcpy(pData, pFile->mFileData, size); - } - else { + } else { s32 compression; if ((pFile->mFlag & FILE_FLAG_COMPRESSED) == 0) { compression = JKR_COMPRESSION_NONE; - } - else if ((pFile->mFlag & FILE_FLAG_IS_YAZ0) != 0) { + } else if ((pFile->mFlag & FILE_FLAG_IS_YAZ0) != 0) { compression = JKR_COMPRESSION_SZS; - } - else { + } else { compression = JKR_COMPRESSION_SZP; } size = fetchResource_subroutine( mFileDataStart + pFile->mDataOffset, size, - reinterpret_cast(pData), + reinterpret_cast(pData), dataSize, - compression - ); + compression); } if (pSize != nullptr) { @@ -148,7 +144,7 @@ void JKRMemArchive::fixedInit(long entryNum) { sCurrentDirIndex = 0; } -bool JKRMemArchive::mountFixed(void *a1, JKRMemBreakFlag breakFlag) { +bool JKRMemArchive::mountFixed(void* a1, JKRMemBreakFlag breakFlag) { if (check_mount_already(reinterpret_cast(a1)) != nullptr) { return false; } @@ -159,8 +155,8 @@ bool JKRMemArchive::mountFixed(void *a1, JKRMemBreakFlag breakFlag) { return false; } - SDIDirEntry *firstDir = mDirs; - char *stringTable = mStringTable; + SDIDirEntry* firstDir = mDirs; + char* stringTable = mStringTable; mLoaderType = RARC_MAGIC; mLoaderName = stringTable + firstDir->mNameOffset; @@ -188,7 +184,7 @@ bool JKRMemArchive::open(long entryNum, EMountDirection mountDir) { if (mountDir == MOUNT_DIRECTION_1) { u32 size; - u8 *pData = JKRDvdRipper::loadToMainRAM( + u8* pData = JKRDvdRipper::loadToMainRAM( entryNum, nullptr, JKR_EXPAND_SWITCH_1, @@ -196,20 +192,18 @@ bool JKRMemArchive::open(long entryNum, EMountDirection mountDir) { mHeap, JKRDvdRipper::ALLOC_DIRECTION_1, 0, - reinterpret_cast(&_5C), - &size - ); + reinterpret_cast(&_5C), + &size); - mHeader = reinterpret_cast(pData); + mHeader = reinterpret_cast(pData); if (pData != nullptr) { DCInvalidateRange(pData, size); } - } - else { + } else { u32 size; - u8 *pData = JKRDvdRipper::loadToMainRAM( + u8* pData = JKRDvdRipper::loadToMainRAM( entryNum, nullptr, JKR_EXPAND_SWITCH_1, @@ -217,11 +211,10 @@ bool JKRMemArchive::open(long entryNum, EMountDirection mountDir) { mHeap, JKRDvdRipper::ALLOC_DIRECTION_2, 0, - reinterpret_cast(&_5C), - &size - ); + reinterpret_cast(&_5C), + &size); - mHeader = reinterpret_cast(pData); + mHeader = reinterpret_cast(pData); if (pData != nullptr) { DCInvalidateRange(pData, size); @@ -230,13 +223,13 @@ bool JKRMemArchive::open(long entryNum, EMountDirection mountDir) { if (mHeader == nullptr) { mMountMode = MOUNT_MODE_0; - } - else { - mInfoBlock = reinterpret_cast(reinterpret_cast(mHeader) + mHeader->mHeaderSize);; - mDirs = reinterpret_cast(reinterpret_cast(mInfoBlock) + mInfoBlock->mDirOffset); - mFiles = reinterpret_cast(reinterpret_cast(mInfoBlock) + mInfoBlock->mFileOffset); - mStringTable = reinterpret_cast(reinterpret_cast(mInfoBlock) + mInfoBlock->mStringTableOffset); - mFileDataStart = reinterpret_cast(mHeader) + mHeader->mFileDataOffset + mHeader->mHeaderSize; + } else { + mInfoBlock = reinterpret_cast(reinterpret_cast(mHeader) + mHeader->mHeaderSize); + ; + mDirs = reinterpret_cast(reinterpret_cast(mInfoBlock) + mInfoBlock->mDirOffset); + mFiles = reinterpret_cast(reinterpret_cast(mInfoBlock) + mInfoBlock->mFileOffset); + mStringTable = reinterpret_cast(reinterpret_cast(mInfoBlock) + mInfoBlock->mStringTableOffset); + mFileDataStart = reinterpret_cast(mHeader) + mHeader->mFileDataOffset + mHeader->mHeaderSize; _6C = true; } @@ -246,13 +239,14 @@ bool JKRMemArchive::open(long entryNum, EMountDirection mountDir) { #ifdef NON_MATCHING // add r5, r4, r5 instead of add r5, r5, r4 -bool JKRMemArchive::open(void *pData, unsigned long a2, JKRMemBreakFlag breakFlag) { - mHeader = reinterpret_cast(pData); - mInfoBlock = reinterpret_cast(reinterpret_cast(mHeader) + mHeader->mHeaderSize);; - mDirs = reinterpret_cast(reinterpret_cast(mInfoBlock) + mInfoBlock->mDirOffset); - mFiles = reinterpret_cast(reinterpret_cast(mInfoBlock) + mInfoBlock->mFileOffset); - mStringTable = reinterpret_cast(reinterpret_cast(mInfoBlock) + mInfoBlock->mStringTableOffset); - mFileDataStart = reinterpret_cast(mHeader) + mHeader->mFileDataOffset + mHeader->mHeaderSize; +bool JKRMemArchive::open(void* pData, unsigned long a2, JKRMemBreakFlag breakFlag) { + mHeader = reinterpret_cast(pData); + mInfoBlock = reinterpret_cast(reinterpret_cast(mHeader) + mHeader->mHeaderSize); + ; + mDirs = reinterpret_cast(reinterpret_cast(mInfoBlock) + mInfoBlock->mDirOffset); + mFiles = reinterpret_cast(reinterpret_cast(mInfoBlock) + mInfoBlock->mFileOffset); + mStringTable = reinterpret_cast(reinterpret_cast(mInfoBlock) + mInfoBlock->mStringTableOffset); + mFileDataStart = reinterpret_cast(mHeader) + mHeader->mFileDataOffset + mHeader->mHeaderSize; _6C = breakFlag == JKR_MEM_BREAK_FLAG_1; mHeap = JKRHeap::findFromRoot(pData); _5C = 0; @@ -263,29 +257,30 @@ bool JKRMemArchive::open(void *pData, unsigned long a2, JKRMemBreakFlag breakFla #ifdef NON_MATCHING // Register mismatch -s32 JKRMemArchive::fetchResource_subroutine(unsigned char *pSrc, unsigned long srcSize, unsigned char *pDst, unsigned long dstSize, int compression) { +s32 JKRMemArchive::fetchResource_subroutine(unsigned char* pSrc, unsigned long srcSize, unsigned char* pDst, unsigned long dstSize, int compression) { switch (compression) { - case JKR_COMPRESSION_NONE: - if (srcSize > dstSize) { - srcSize = dstSize; - } + case JKR_COMPRESSION_NONE: + if (srcSize > dstSize) { + srcSize = dstSize; + } - memcpy(pDst, pSrc, srcSize); + memcpy(pDst, pSrc, srcSize); - return srcSize; - case JKR_COMPRESSION_SZP: - case JKR_COMPRESSION_SZS: - srcSize = JKRDecompExpandSize(pSrc);; + return srcSize; + case JKR_COMPRESSION_SZP: + case JKR_COMPRESSION_SZS: + srcSize = JKRDecompExpandSize(pSrc); + ; - if (srcSize > dstSize) { - srcSize = dstSize; - } + if (srcSize > dstSize) { + srcSize = dstSize; + } - JKRDecomp::orderSync(pSrc, pDst, srcSize, 0); - return srcSize; - default: - JUTException::panic_f(__FILE__, 723, "%s", "??? bad sequence\n"); - break; + JKRDecomp::orderSync(pSrc, pDst, srcSize, 0); + return srcSize; + default: + JUTException::panic_f(__FILE__, 723, "%s", "??? bad sequence\n"); + break; } return 0; diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp index ab7c18df6..ab7ff40a5 100644 --- a/src/JSystem/JKernel/JKRThread.cpp +++ b/src/JSystem/JKernel/JKRThread.cpp @@ -2,7 +2,7 @@ #include "JSystem/JKernel/JKRHeap.hpp" JSUList JKRThread::sThreadList = JSUList(false); -JSUList JKRThread::sTaskList = JSUList(); +JSUList JKRThread::sTaskList = JSUList(); JKRThread::TLoad::TLoad() { clear(); @@ -19,7 +19,7 @@ void JKRThread::TLoad::clear() { JKRThread::~JKRThread() { sThreadList.remove(&mDisposerList); - + if (_28) { if (!OSIsThreadTerminated(mThread)) { OSDetachThread(mThread); @@ -33,7 +33,7 @@ JKRThread::~JKRThread() { JKRHeap::free(mMessage, 0); } -void JKRThread::setCommon_mesgQueue(JKRHeap *pHeap, int msgCount) { +void JKRThread::setCommon_mesgQueue(JKRHeap* pHeap, int msgCount) { mMsgCount = msgCount; mMessage = reinterpret_cast(JKRHeap::alloc(mMsgCount * 4, 0, pHeap)); OSInitMessageQueue(&mQueue, mMessage, mMsgCount); @@ -54,11 +54,11 @@ void JKRThread::setCommon_heapSpecified(JKRHeap *pHeap, u32 a2, int a3) { } */ -s32 JKRThread::start(void *pData) { +s32 JKRThread::start(void* pData) { return run(); } -JKRThread* JKRThread::searchThread(OSThread *pThread) { +JKRThread* JKRThread::searchThread(OSThread* pThread) { for (JSUPtrLink* i = sThreadList.mHead; i; i = i->mNext) { JKRThread* thread = reinterpret_cast(i->mData); @@ -71,7 +71,7 @@ JKRThread* JKRThread::searchThread(OSThread *pThread) { } #ifdef NON_MATCHING -JKRThread* JKRThreadSwitch::enter(JKRThread *pThread, int a2) { +JKRThread* JKRThreadSwitch::enter(JKRThread* pThread, int a2) { JKRThread* thread = pThread; if (!pThread) { diff --git a/src/JSystem/JMath/random.cpp b/src/JSystem/JMath/random.cpp index d959e9660..3bf8e7040 100644 --- a/src/JSystem/JMath/random.cpp +++ b/src/JSystem/JMath/random.cpp @@ -1,5 +1,6 @@ #include "JSystem/JMath/random.hpp" namespace JMath { - TRandom_fast_::TRandom_fast_(u32 seed) : mSeed(seed) {} -}; + TRandom_fast_::TRandom_fast_(u32 seed) + : mSeed(seed) {} +}; // namespace JMath diff --git a/src/JSystem/JSupport/JSUInputStream.cpp b/src/JSystem/JSupport/JSUInputStream.cpp index 6c57be671..bd930d590 100644 --- a/src/JSystem/JSupport/JSUInputStream.cpp +++ b/src/JSystem/JSupport/JSUInputStream.cpp @@ -1,6 +1,6 @@ #include "JSystem/JSupport/JSURandomInputStream.hpp" -s32 JSUInputStream::read(void *pDest, s32 length) { +s32 JSUInputStream::read(void* pDest, s32 length) { s32 read = readData(pDest, length); if (read != length) { setState(IO_ERROR); diff --git a/src/JSystem/JSupport/JSUList.cpp b/src/JSystem/JSupport/JSUList.cpp index 42cdbe3ef..bda4dd56c 100644 --- a/src/JSystem/JSupport/JSUList.cpp +++ b/src/JSystem/JSupport/JSUList.cpp @@ -1,6 +1,6 @@ #include "JSystem/JSupport/JSUList.hpp" -JSUPtrLink::JSUPtrLink(void *pData) { +JSUPtrLink::JSUPtrLink(void* pData) { mData = pData; mPtrList = 0; mPrev = 0; @@ -34,7 +34,7 @@ void JSUPtrList::initiate() { mNodeCount = 0; } -void JSUPtrList::setFirst(JSUPtrLink *pLink) { +void JSUPtrList::setFirst(JSUPtrLink* pLink) { pLink->mPtrList = this; pLink->mPrev = 0; pLink->mNext = 0; @@ -43,7 +43,7 @@ void JSUPtrList::setFirst(JSUPtrLink *pLink) { mNodeCount = 1; } -bool JSUPtrList::append(JSUPtrLink *pLink) { +bool JSUPtrList::append(JSUPtrLink* pLink) { bool validity = (pLink->mPtrList == 0); if (!validity) { @@ -53,8 +53,7 @@ bool JSUPtrList::append(JSUPtrLink *pLink) { if (validity) { if (!mNodeCount) { setFirst(pLink); - } - else { + } else { pLink->mPtrList = this; pLink->mPrev = mTail; pLink->mNext = 0; @@ -67,7 +66,7 @@ bool JSUPtrList::append(JSUPtrLink *pLink) { return validity; } -bool JSUPtrList::prepend(JSUPtrLink *pLink) { +bool JSUPtrList::prepend(JSUPtrLink* pLink) { bool validity = (pLink->mPtrList == 0); if (!validity) { @@ -77,8 +76,7 @@ bool JSUPtrList::prepend(JSUPtrLink *pLink) { if (validity) { if (!mNodeCount) { setFirst(pLink); - } - else { + } else { pLink->mPtrList = this; pLink->mPrev = 0; pLink->mNext = mHead; @@ -91,7 +89,7 @@ bool JSUPtrList::prepend(JSUPtrLink *pLink) { return validity; } -bool JSUPtrList::insert(JSUPtrLink *pLink_1, JSUPtrLink *pLink_2) { +bool JSUPtrList::insert(JSUPtrLink* pLink_1, JSUPtrLink* pLink_2) { if (pLink_1 == mHead) { return prepend(pLink_2); } @@ -123,23 +121,20 @@ bool JSUPtrList::insert(JSUPtrLink *pLink_1, JSUPtrLink *pLink_2) { return validity; } -bool JSUPtrList::remove(JSUPtrLink *pLink) { +bool JSUPtrList::remove(JSUPtrLink* pLink) { bool isSameList = (pLink->mPtrList == this); if (isSameList) { if (mNodeCount == 1) { mHead = 0; mTail = 0; - } - else if (pLink == mHead) { + } else if (pLink == mHead) { pLink->mNext->mPrev = 0; mHead = pLink->mNext; - } - else if (pLink == mTail) { + } else if (pLink == mTail) { pLink->mPrev->mNext = 0; mTail = pLink->mPrev; - } - else { + } else { pLink->mPrev->mNext = pLink->mNext; pLink->mNext->mPrev = pLink->mPrev; } diff --git a/src/JSystem/JSupport/JSUMemoryStream.cpp b/src/JSystem/JSupport/JSUMemoryStream.cpp index 362b28f59..c7cd3e7e3 100644 --- a/src/JSystem/JSupport/JSUMemoryStream.cpp +++ b/src/JSystem/JSupport/JSUMemoryStream.cpp @@ -2,13 +2,13 @@ #include "JSystem/JSupport/JSUMemoryOutputStream.hpp" #include -void JSUMemoryInputStream::setBuffer(const void *pBuffer, s32 length) { +void JSUMemoryInputStream::setBuffer(const void* pBuffer, s32 length) { mBuffer = pBuffer; mLength = length; mPosition = 0; } -u32 JSUMemoryInputStream::readData(void *pDest, s32 length) { +u32 JSUMemoryInputStream::readData(void* pDest, s32 length) { if (mPosition + length > mLength) { length = mLength - mPosition; } @@ -22,15 +22,15 @@ u32 JSUMemoryInputStream::readData(void *pDest, s32 length) { s32 JSUMemoryInputStream::seekPos(s32 offset, JSUStreamSeekFrom whence) { s32 oldPosition = mPosition; switch (whence) { - case SEEK_FROM_START: - mPosition = offset; - break; - case SEEK_FROM_END: - mPosition = mLength - offset; - break; - case SEEK_FROM_POSITION: - mPosition += offset; - break; + case SEEK_FROM_START: + mPosition = offset; + break; + case SEEK_FROM_END: + mPosition = mLength - offset; + break; + case SEEK_FROM_POSITION: + mPosition += offset; + break; } if (mPosition < 0) { mPosition = 0; @@ -41,13 +41,13 @@ s32 JSUMemoryInputStream::seekPos(s32 offset, JSUStreamSeekFrom whence) { return mPosition - oldPosition; } -void JSUMemoryOutputStream::setBuffer(void *pBuffer, s32 length) { +void JSUMemoryOutputStream::setBuffer(void* pBuffer, s32 length) { mBuffer = pBuffer; mLength = length; mPosition = 0; } -s32 JSUMemoryOutputStream::writeData(const void *pSrc, s32 length) { +s32 JSUMemoryOutputStream::writeData(const void* pSrc, s32 length) { if (mPosition + length > mLength) { length = mLength - mPosition; } @@ -61,15 +61,15 @@ s32 JSUMemoryOutputStream::writeData(const void *pSrc, s32 length) { s32 JSUMemoryOutputStream::seekPos(s32 offset, JSUStreamSeekFrom whence) { s32 oldPosition = mPosition; switch (whence) { - case SEEK_FROM_START: - mPosition = offset; - break; - case SEEK_FROM_END: - mPosition = mLength - offset; - break; - case SEEK_FROM_POSITION: - mPosition += offset; - break; + case SEEK_FROM_START: + mPosition = offset; + break; + case SEEK_FROM_END: + mPosition = mLength - offset; + break; + case SEEK_FROM_POSITION: + mPosition += offset; + break; } if (mPosition < 0) { mPosition = 0; diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/src/JSystem/JUtility/JUTConsole.cpp index 573c22ab5..d9f30b653 100644 --- a/src/JSystem/JUtility/JUTConsole.cpp +++ b/src/JSystem/JUtility/JUTConsole.cpp @@ -3,13 +3,13 @@ void JUTConsoleManager::drawDirect(bool a1) const { if (mDirectConsole != nullptr) { - if (a1) { + if (a1) { BOOL en = OSEnableInterrupts(); - u32 startRetraceCount = VIGetRetraceCount(); - u32 curRetraceCount = startRetraceCount; + u32 startRetraceCount = VIGetRetraceCount(); + u32 curRetraceCount = startRetraceCount; do { curRetraceCount = VIGetRetraceCount(); - } while(startRetraceCount == curRetraceCount); + } while (startRetraceCount == curRetraceCount); OSRestoreInterrupts(en); } @@ -18,7 +18,7 @@ void JUTConsoleManager::drawDirect(bool a1) const { } } -void JUTConsoleManager::setDirectConsole(JUTConsole *pConsole) { +void JUTConsoleManager::setDirectConsole(JUTConsole* pConsole) { if (mDirectConsole != nullptr) { appendConsole(mDirectConsole); } diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp index bc29ce306..7c6fd33d2 100644 --- a/src/JSystem/JUtility/JUTException.cpp +++ b/src/JSystem/JUtility/JUTException.cpp @@ -3,20 +3,20 @@ #include #include -OSMessageQueue JUTException::sMessageQueue = { 0 }; -JUTException* JUTException::sErrorManager; +OSMessageQueue JUTException::sMessageQueue = {0}; +JUTException* JUTException::sErrorManager; struct CallbackObject { - CallbackFunc callback; // 0x0 - u16 error; // 0x4 - u16 pad; // 0x6 - OSContext* context; // 0x8 - int param_3; // 0xC - int param_4; // 0x10 + CallbackFunc callback; // 0x0 + u16 error; // 0x4 + u16 pad; // 0x6 + OSContext* context; // 0x8 + int param_3; // 0xC + int param_4; // 0x10 }; static CallbackObject exCallbackObject; -static OSContext context; +static OSContext context; s32 JUTException::run() { PPCMtmsr(PPCMfmsr() & 0xFFFFF6FF); @@ -29,11 +29,10 @@ s32 JUTException::run() { CallbackObject* obj = (CallbackObject*)msg; CallbackFunc hndlr = obj->callback; - u16 error = obj->error; - OSContext* ctxt = obj->context; - u32 param_3 = obj->param_3; - u32 param_4 = obj->param_4; - + u16 error = obj->error; + OSContext* ctxt = obj->context; + u32 param_3 = obj->param_3; + u32 param_4 = obj->param_4; if (error < 0x11) { mStackPointer = ctxt->gpr[1]; @@ -47,7 +46,7 @@ s32 JUTException::run() { } sErrorManager->mDirectPrint->changeFrameBuffer(mFrameMemory, sErrorManager->mDirectPrint->mFrameBufferWidth, sErrorManager->mDirectPrint->mFrameBufferHeight); - + if (hndlr != nullptr) { hndlr(error, ctxt, param_3, param_4); } @@ -60,7 +59,7 @@ s32 JUTException::run() { } } -void JUTException::errorHandler(u16 err, OSContext *pContext, u32 a3, u32 a4) { +void JUTException::errorHandler(u16 err, OSContext* pContext, u32 a3, u32 a4) { JUTException::msr = PPCMfmsr(); JUTException::fpscr = pContext->fpscr; OSFillFPUContext(pContext); @@ -114,13 +113,13 @@ void JUTException::panic_f_va(const char* file, int line, const char* format, va OSSuspendThread(current_thread); } -void JUTException::panic_f(const char *file, int line, const char *format, ...) { +void JUTException::panic_f(const char* file, int line, const char* format, ...) { va_list args; va_start(args, format); panic_f_va(file, line, format, args); va_end(); } - + // JUTException::showFloatSub // JUTException::showFloat // JUTException::searchPartialModule diff --git a/src/JSystem/JUtility/JUTTexture.cpp b/src/JSystem/JUtility/JUTTexture.cpp index 767ee8857..3c886d7f5 100644 --- a/src/JSystem/JUtility/JUTTexture.cpp +++ b/src/JSystem/JUtility/JUTTexture.cpp @@ -21,7 +21,7 @@ JUTTexture::JUTTexture(int width, int height, GXTexFmt format) { mFlag = mFlag & 2 | 1; u32 bufSize = GXGetTexBufferSize(width, height, format, GX_FALSE, 1); - ResTIMG* texBuf = reinterpret_cast(new(sizeof(ResTIMG)) u8[bufSize + sizeof(ResTIMG)]); + ResTIMG* texBuf = reinterpret_cast(new (sizeof(ResTIMG)) u8[bufSize + sizeof(ResTIMG)]); _3C = texBuf; texBuf->mFormat = format; texBuf->mTransparency = 0; @@ -68,8 +68,7 @@ void JUTTexture::storeTIMG(const ResTIMG* pTIMG, JUTPalette* pPalette) { if (pPalette != nullptr) { tlut = static_cast(pPalette->mName); - } - else { + } else { tlut = GX_TLUT0; } @@ -85,8 +84,7 @@ void JUTTexture::attachPalette(JUTPalette* pPalette) { if (pPalette == nullptr && mEmbPalette != nullptr) { mPalette = mEmbPalette; - } - else { + } else { mPalette = pPalette; } @@ -96,8 +94,7 @@ void JUTTexture::attachPalette(JUTPalette* pPalette) { void JUTTexture::init() { if (mTIMG->mPaletteNum == 0) { initTexObj(); - } - else if (mEmbPalette != nullptr) { + } else if (mEmbPalette != nullptr) { mPalette = mEmbPalette; initTexObj(static_cast(mPalette->mName)); @@ -146,8 +143,7 @@ void JUTTexture::capture(int width, int height, GXTexFmt format, bool mipmap, GX if (mFlag & 0x1) { if (mipmap) { GXSetTexCopySrc(width, height, mTIMG->mWidth * 2, mTIMG->mHeight * 2); - } - else { + } else { GXSetTexCopySrc(width, height, mTIMG->mWidth, mTIMG->mHeight); } diff --git a/src/MetroTRK/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.cpp b/src/MetroTRK/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.cpp index 8c2a5bd54..edf2a981d 100644 --- a/src/MetroTRK/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.cpp +++ b/src/MetroTRK/gamedev/cust_connection/utils/gc/MWCriticalSection_gc.cpp @@ -7,15 +7,15 @@ extern "C" { extern u32 OSRestoreInterrupts(u32); extern u32 OSDisableInterrupts(void); -u32 MWExitCriticalSection(u32 *level) { +u32 MWExitCriticalSection(u32* level) { return OSRestoreInterrupts(*level); } -void MWEnterCriticalSection(u32 *level) { +void MWEnterCriticalSection(u32* level) { *level = OSDisableInterrupts(); } -void MWInitializeCriticalSection(u32 *level) { +void MWInitializeCriticalSection(u32* level) { return; } diff --git a/src/RVL_SDK/os/init/__ppc_eabi_init.cpp b/src/RVL_SDK/os/init/__ppc_eabi_init.cpp index 5c7a51025..f9d0ba43f 100644 --- a/src/RVL_SDK/os/init/__ppc_eabi_init.cpp +++ b/src/RVL_SDK/os/init/__ppc_eabi_init.cpp @@ -4,7 +4,7 @@ extern "C" { #endif -typedef void (*funcPtr) (void); +typedef void (*funcPtr)(void); __declspec(section ".ctors") extern funcPtr _ctors[]; __declspec(section ".dtors") extern funcPtr _dtors[]; extern void exit(int); @@ -16,36 +16,30 @@ extern void __OSPSInit(void); asm void __init_hardware(void) { nofralloc - mfmsr r0 - ori r0, r0, 0x2000 - mtmsr r0 - mflr r31 - bl __OSPSInit - bl __OSFPRInit - bl __OSCacheInit - mtlr r31 - blr + mfmsr r0 + ori r0, + r0, 0x2000 mtmsr r0 mflr r31 bl __OSPSInit bl __OSFPRInit bl __OSCacheInit mtlr r31 blr } -asm void __flush_cache(void *, unsigned int) { +asm void __flush_cache(void*, unsigned int) { nofralloc - lis r5, 0xFFFF - ori r5, r5, 0xFFF1 - and r5, r5, r3 - subf r3, r5, r3 - add r4, r4, r3 + lis r5, + 0xFFFF ori r5, r5, 0xFFF1 and r5, r5, r3 subf r3, r5, r3 add r4, r4, r3 -loop: - dcbst 0,r5 - sync - icbi 0,r5 - addic r5,r5,0x8 - subic. r4,r4,0x8 - bge loop - isync + loop : dcbst 0, + r5 + sync + icbi 0, + r5 + addic r5, + r5, + 0x8 subic.r4, + r4, + 0x8 bge loop + isync - blr + blr } #ifdef __cplusplus diff --git a/src/Runtime/Gecko_ExceptionPPC.cpp b/src/Runtime/Gecko_ExceptionPPC.cpp index c2eecbdd6..340c17de7 100644 --- a/src/Runtime/Gecko_ExceptionPPC.cpp +++ b/src/Runtime/Gecko_ExceptionPPC.cpp @@ -1,16 +1,16 @@ #include typedef struct ProcessInfo { - __eti_init_info* exception_info; - char* TOC; - int active; + __eti_init_info* exception_info; + char* TOC; + int active; } ProcessInfo; static ProcessInfo fragmentinfo[1]; -int __register_fragment(struct __eti_init_info *pInfo, char *pTOC) { +int __register_fragment(struct __eti_init_info* pInfo, char* pTOC) { ProcessInfo* info; - int i; + int i; for (i = 0, info = fragmentinfo; i < 1; ++i, ++info) { if (info->active == 0) { @@ -20,7 +20,6 @@ int __register_fragment(struct __eti_init_info *pInfo, char *pTOC) { return i; } } - return -1; } diff --git a/src/Runtime/NMWException.cpp b/src/Runtime/NMWException.cpp index f8a533178..60a2246b6 100644 --- a/src/Runtime/NMWException.cpp +++ b/src/Runtime/NMWException.cpp @@ -2,13 +2,13 @@ class __partial_array_destructor { public: - void* mArrayStart; // 0x0 - size_t mElemSize; // 0x4 - size_t mArraySize; // 0x8 - ctor_dtor_ptr mDtorPtr; // 0xC - size_t mCurElement; // 0x10 + void* mArrayStart; // 0x0 + size_t mElemSize; // 0x4 + size_t mArraySize; // 0x8 + ctor_dtor_ptr mDtorPtr; // 0xC + size_t mCurElement; // 0x10 - __partial_array_destructor(void *arr, unsigned int size, unsigned int count, ctor_dtor_ptr ptr) { + __partial_array_destructor(void* arr, unsigned int size, unsigned int count, ctor_dtor_ptr ptr) { mArrayStart = arr; mElemSize = size; mArraySize = count; @@ -20,72 +20,71 @@ public: if (mCurElement < mArraySize && mDtorPtr) { for (char* cur = (char*)mArrayStart + (mElemSize * mCurElement); mCurElement > 0; mCurElement--) { cur -= mElemSize; - ((void (*)(void *, short))mDtorPtr)(cur,-1); + ((void (*)(void*, short))mDtorPtr)(cur, -1); } } } }; -extern "C" { +extern "C" { -void __construct_array(void *pBlock, ctor_dtor_ptr ctor, ctor_dtor_ptr dtor, size_t size, size_t n) { +void __construct_array(void* pBlock, ctor_dtor_ptr ctor, ctor_dtor_ptr dtor, size_t size, size_t n) { __partial_array_destructor pad(pBlock, size, n, dtor); char* p = (char*)pBlock; for (pad.mCurElement = 0; pad.mCurElement < n; p += size, pad.mCurElement++) { - ((void (*)(void *, short))ctor)(p,1); + ((void (*)(void*, short))ctor)(p, 1); } } -void *__construct_new_array(void *block, ctor_dtor_ptr ctor, ctor_dtor_ptr dtor, size_t size, size_t n) { - char *ptr = (char *)block; +void* __construct_new_array(void* block, ctor_dtor_ptr ctor, ctor_dtor_ptr dtor, size_t size, size_t n) { + char* ptr = (char*)block; - if (ptr != 0){ - *(size_t *)ptr = size; - *(size_t *)(ptr + 4) = n; + if (ptr != 0) { + *(size_t*)ptr = size; + *(size_t*)(ptr + 4) = n; ptr += 0x10; if (ctor) { - + __partial_array_destructor pad(ptr, size, n, dtor); char* p; for (pad.mCurElement = 0, p = ptr; pad.mCurElement < n; pad.mCurElement++, p += size) { - ((void (*)(void *, short))ctor)(p,1); + ((void (*)(void*, short))ctor)(p, 1); } } } return ptr; } -void __destroy_arr(void *pArraySource, ctor_dtor_ptr dtor, size_t size, size_t num) { +void __destroy_arr(void* pArraySource, ctor_dtor_ptr dtor, size_t size, size_t num) { char* cur; for (cur = (char*)pArraySource + (size * num); num > 0; num--) { cur -= size; - ((void (*)(void *, short))dtor)(cur,-1); + ((void (*)(void*, short))dtor)(cur, -1); } } -void __destroy_new_array(void *pArraySource, ctor_dtor_ptr dtor) { +void __destroy_new_array(void* pArraySource, ctor_dtor_ptr dtor) { if (pArraySource != 0) { if (dtor != 0) { size_t i, objs, obj_size; - char* cur; + char* cur; // why are the 8 and 12 important to match? obj_size = *(size_t*)((char*)pArraySource - 2 * 8); - objs = *(size_t*)((char *)pArraySource - 12); + objs = *(size_t*)((char*)pArraySource - 12); cur = (char*)pArraySource + obj_size * objs; for (i = 0; i < objs; i++) { cur -= obj_size; - ((void (*)(void *, short))dtor)(cur,-1); + ((void (*)(void*, short))dtor)(cur, -1); } } - ::operator delete[] ((char *)pArraySource-2*8); + ::operator delete[]((char*)pArraySource - 2 * 8); } -} - +} } diff --git a/src/Runtime/__init_cpp_exceptions.cpp b/src/Runtime/__init_cpp_exceptions.cpp index 3e1520d49..28e9917a9 100644 --- a/src/Runtime/__init_cpp_exceptions.cpp +++ b/src/Runtime/__init_cpp_exceptions.cpp @@ -16,7 +16,7 @@ static int fragmentID = -2; void __init_cpp_exceptions(void) { if (fragmentID == -2) { - register char *temp; + register char* temp; asm { mr temp,r2 } @@ -32,5 +32,4 @@ void __fini_cpp_exceptions(void) { } } -__declspec(section ".ctors") -extern void * const __init_cpp_exceptions_reference = __init_cpp_exceptions; \ No newline at end of file +__declspec(section ".ctors") extern void* const __init_cpp_exceptions_reference = __init_cpp_exceptions; \ No newline at end of file diff --git a/src/nw4r/lyt/lyt_animation.cpp b/src/nw4r/lyt/lyt_animation.cpp index 06765232e..4d2e63170 100644 --- a/src/nw4r/lyt/lyt_animation.cpp +++ b/src/nw4r/lyt/lyt_animation.cpp @@ -5,9 +5,10 @@ namespace nw4r { namespace lyt { - AnimTransform::AnimTransform() : mpRes(nullptr), mFrame(0) { } + AnimTransform::AnimTransform() + : mpRes(nullptr), mFrame(0) {} - AnimTransform::~AnimTransform() { } + AnimTransform::~AnimTransform() {} u16 AnimTransform::GetFrameSize() const { return mpRes->frameSize; @@ -17,8 +18,8 @@ namespace nw4r { return mpRes->loop != 0; } - AnimTransformBasic::AnimTransformBasic() : mpFileResAry(nullptr), mAnimLinkAry(nullptr), mAnimLinkNum(0) { - + AnimTransformBasic::AnimTransformBasic() + : mpFileResAry(nullptr), mAnimLinkAry(nullptr), mAnimLinkNum(0) { } AnimTransformBasic::~AnimTransformBasic() { @@ -26,11 +27,11 @@ namespace nw4r { Layout::DeletePrimArray(mpFileResAry); } - void AnimTransformBasic::SetResource(const res::AnimationBlock *pBlock, ResourceAccessor *pResAccessor) { + void AnimTransformBasic::SetResource(const res::AnimationBlock* pBlock, ResourceAccessor* pResAccessor) { SetResource(pBlock, pResAccessor, pBlock->animContNum); } - void AnimTransformBasic::SetResource(const res::AnimationBlock *pBlock, ResourceAccessor *pResAccessor, u16 animNum) { + void AnimTransformBasic::SetResource(const res::AnimationBlock* pBlock, ResourceAccessor* pResAccessor, u16 animNum) { mpRes = pBlock; mpFileResAry = nullptr; @@ -46,7 +47,7 @@ namespace nw4r { } mAnimLinkAry = Layout::NewArray(animNum); - if (mAnimLinkAry != nullptr) { + if (mAnimLinkAry != nullptr) { mAnimLinkNum = animNum; memset(mAnimLinkAry, 0, pBlock->animContNum * sizeof(AnimationLink)); @@ -55,5 +56,5 @@ namespace nw4r { } } } - }; -}; + }; // namespace lyt +}; // namespace nw4r diff --git a/src/nw4r/lyt/lyt_arcResourceAccessor.cpp b/src/nw4r/lyt/lyt_arcResourceAccessor.cpp index 574e7affa..e4316c5ea 100644 --- a/src/nw4r/lyt/lyt_arcResourceAccessor.cpp +++ b/src/nw4r/lyt/lyt_arcResourceAccessor.cpp @@ -4,8 +4,8 @@ #include namespace { - s32 FindNameResource(ARCHandle *pHandle, const char *pResName) { - s32 entryNum = -1; + s32 FindNameResource(ARCHandle* pHandle, const char* pResName) { + s32 entryNum = -1; ARCDir dir; ARCOpenDir(pHandle, ".", &dir); ARCDirEntry dirEntry; @@ -17,8 +17,7 @@ namespace { if (entryNum != -1) { break; } - } - else { + } else { if (0 == stricmp(pResName, dirEntry.name)) { entryNum = dirEntry.entryNum; break; @@ -30,19 +29,18 @@ namespace { return entryNum; } - void* GetResourceSub(ARCHandle *pHandle, const char *pRoot, nw4r::lyt::ResType resType, const char *pName, u32 *pSize) { + void* GetResourceSub(ARCHandle* pHandle, const char* pRoot, nw4r::lyt::ResType resType, const char* pName, u32* pSize) { s32 entryNum = -1; if (-1 != ARCConvertPathToEntrynum(pHandle, const_cast(pRoot))) { if (ARCChangeDir(pHandle, const_cast(pRoot))) { if (resType == 0) { entryNum = FindNameResource(pHandle, pName); - } - else { + } else { char resTypeStr[5]; resTypeStr[0] = char(resType >> 24); resTypeStr[1] = char(resType >> 16); - resTypeStr[2] = char(resType >> 8); - resTypeStr[3] = char(resType >> 0); + resTypeStr[2] = char(resType >> 8); + resTypeStr[3] = char(resType >> 0); resTypeStr[4] = 0; if (-1 != ARCConvertPathToEntrynum(pHandle, resTypeStr)) { @@ -70,12 +68,12 @@ namespace { return nullptr; } -}; +}; // namespace namespace nw4r { namespace lyt { namespace detail { - nw4r::ut::Font* FindFont(FontRefList *pList, const char *pName) { + nw4r::ut::Font* FindFont(FontRefList* pList, const char* pName) { for (FontRefList::Iterator it = pList->GetBeginIter(); it != pList->GetEndIter(); it++) { if (0 == strcmp(pName, it->GetFontName())) { return it->GetFont(); @@ -84,13 +82,13 @@ namespace nw4r { return nullptr; } - }; + }; // namespace detail - ArcResourceAccessor::ArcResourceAccessor() : mArcBuf(nullptr) { - + ArcResourceAccessor::ArcResourceAccessor() + : mArcBuf(nullptr) { } - bool ArcResourceAccessor::Attach(void *pArchive, const char *pRoot) { + bool ArcResourceAccessor::Attach(void* pArchive, const char* pRoot) { BOOL succcess = ARCInitHandle(pArchive, &mArcHandle); if (!succcess) { return false; @@ -102,16 +100,15 @@ namespace nw4r { return true; } - void* ArcResourceAccessor::GetResource(ResType type, const char *pName, u32 *pSize) { + void* ArcResourceAccessor::GetResource(ResType type, const char* pName, u32* pSize) { return GetResourceSub(&mArcHandle, mResRootDir, type, pName, pSize); } - ut::Font* ArcResourceAccessor::GetFont(const char *pName) { + ut::Font* ArcResourceAccessor::GetFont(const char* pName) { return detail::FindFont(&mFontList, pName); } ArcResourceAccessor::~ArcResourceAccessor() { - } - }; -}; + }; // namespace lyt +}; // namespace nw4r diff --git a/src/nw4r/lyt/lyt_common.cpp b/src/nw4r/lyt/lyt_common.cpp index f2462b875..fbd0f4444 100644 --- a/src/nw4r/lyt/lyt_common.cpp +++ b/src/nw4r/lyt/lyt_common.cpp @@ -8,15 +8,15 @@ namespace nw4r { namespace lyt { namespace detail { - bool EqualsResName(const char *a1, const char *a2) { + bool EqualsResName(const char* a1, const char* a2) { return strncmp(a1, a2, 0x10) == 0; } - bool EqualsMaterialName(const char *a1, const char *a2) { + bool EqualsMaterialName(const char* a1, const char* a2) { return strncmp(a1, a2, 0x14) == 0; } - bool TestFileHeader(const res::BinaryFileHeader &fileHeader, u32 sig) { + bool TestFileHeader(const res::BinaryFileHeader& fileHeader, u32 sig) { return GetSignatureInt(fileHeader.signature) == sig && fileHeader.byteOrder == 0xFEFF; } @@ -35,12 +35,12 @@ namespace nw4r { mNum = 0; } } - + void TexCoordAry::Reserve(u8 num) { if (mCap < num) { Free(); - const u32 coordNum = num; - math::VEC2 *const ary = Layout::NewArray(4 * coordNum); + const u32 coordNum = num; + math::VEC2* const ary = Layout::NewArray(4 * coordNum); mData = reinterpret_cast(ary); if (mData != nullptr) { mCap = num; @@ -50,7 +50,7 @@ namespace nw4r { void TexCoordAry::SetSize(u8 num) { if (mData != nullptr && num <= mCap) { - static const math::VEC2 texCoords[] = { math::VEC2(0.0f, 0.0f), math::VEC2(1.0f, 0.0f), math::VEC2(0.0f, 1.0f), math::VEC2(1.0f, 1.0f) }; + static const math::VEC2 texCoords[] = {math::VEC2(0.0f, 0.0f), math::VEC2(1.0f, 0.0f), math::VEC2(0.0f, 1.0f), math::VEC2(1.0f, 1.0f)}; for (int j = mNum; j < num; j++) { for (int i = 0; i < 4; i++) { @@ -61,9 +61,9 @@ namespace nw4r { } } - void TexCoordAry::Copy(const void *pResTex, u8 texCoordNum) { + void TexCoordAry::Copy(const void* pResTex, u8 texCoordNum) { mNum = ut::Max(mNum, texCoordNum); - const math::VEC2 (*src)[4] = reinterpret_cast(pResTex); + const math::VEC2(*src)[4] = reinterpret_cast(pResTex); for (int j = 0; j < texCoordNum; j++) { for (int i = 0; i < 4; i++) { mData[j][i] = src[j][i]; @@ -71,7 +71,7 @@ namespace nw4r { } } - bool IsModulateVertexColor(ut::Color *color, u8 alpha) { + bool IsModulateVertexColor(ut::Color* color, u8 alpha) { if (alpha != 0xFF) { return true; } @@ -94,7 +94,7 @@ namespace nw4r { return ret; } - void MultipleAlpha(ut::Color *dst, const ut::Color *src, u8 a) { + void MultipleAlpha(ut::Color* dst, const ut::Color* src, u8 a) { for (s32 i = 0; i < 4; i++) { dst[i] = MultipleAlpha(src[i], a); } @@ -144,7 +144,7 @@ namespace nw4r { } GXPosition2f32(basePt.x + size.width, basePt.y + size.height); - + if (vtxColors) { GXColor1u32(vtxColors[3]); } @@ -166,13 +166,13 @@ namespace nw4r { GXEnd(); } - void DrawQuad(const math::VEC2 &basePt, const Size& size, u8 num, const math::VEC2 (*texCoords)[4], const ut::Color *vtxColors, u8 alpha) { + void DrawQuad(const math::VEC2& basePt, const Size& size, u8 num, const math::VEC2 (*texCoords)[4], const ut::Color* vtxColors, u8 alpha) { ut::Color colors[4]; if (vtxColors) { MultipleAlpha(colors, vtxColors, alpha); } DrawQuad(basePt, size, num, texCoords, vtxColors ? colors : 0); } - }; - }; -}; + }; // namespace detail + }; // namespace lyt +}; // namespace nw4r diff --git a/src/nw4r/lyt/lyt_drawInfo.cpp b/src/nw4r/lyt/lyt_drawInfo.cpp index 7535bfd2e..50622ba2f 100644 --- a/src/nw4r/lyt/lyt_drawInfo.cpp +++ b/src/nw4r/lyt/lyt_drawInfo.cpp @@ -4,13 +4,13 @@ namespace nw4r { namespace lyt { - DrawInfo::DrawInfo() : mLocationAdjustScale(1.0f, 1.0f), mGlobalAlpha(1.0f) { + DrawInfo::DrawInfo() + : mLocationAdjustScale(1.0f, 1.0f), mGlobalAlpha(1.0f) { memset(&mFlag, 0, sizeof(mFlag)); MTX34Identity(&mViewMtx); } DrawInfo::~DrawInfo() { - } - }; -}; + }; // namespace lyt +}; // namespace nw4r diff --git a/src/nw4r/lyt/lyt_group.cpp b/src/nw4r/lyt/lyt_group.cpp index 82f4f2fba..cfb079bd5 100644 --- a/src/nw4r/lyt/lyt_group.cpp +++ b/src/nw4r/lyt/lyt_group.cpp @@ -4,7 +4,7 @@ namespace nw4r { namespace lyt { - void Group::AppendPane(Pane *pPane) { + void Group::AppendPane(Pane* pPane) { if (detail::PaneLink* pPaneLink = Layout::NewObj()) { pPaneLink->mTarget = pPane; mPaneLinkList.PushBack(pPaneLink); @@ -15,12 +15,12 @@ namespace nw4r { mbUserAllocated = false; } - Group::Group(const res::Group *pResGroup, Pane *pRootPane) { + Group::Group(const res::Group* pResGroup, Pane* pRootPane) { Init(); strncpy(mName, pResGroup->name, sizeof(mName) - 1); mName[sizeof(mName) - 1] = '\0'; - const char *const paneNameBase = detail::ConvertOffsToPtr(pResGroup, sizeof(res::Group)); + const char* const paneNameBase = detail::ConvertOffsToPtr(pResGroup, sizeof(res::Group)); for (int i = 0; i < pResGroup->paneNum; ++i) { if (Pane* pFindPane = pRootPane->FindPaneByName(paneNameBase + i * 16, true)) { @@ -47,11 +47,11 @@ namespace nw4r { } } - void GroupContainer::AppendGroup(Group *pGroup) { + void GroupContainer::AppendGroup(Group* pGroup) { mGroupList.PushBack(pGroup); } - Group* GroupContainer::FindGroupByName(const char *findName) { + Group* GroupContainer::FindGroupByName(const char* findName) { for (GroupList::Iterator it = mGroupList.GetBeginIter(); it != mGroupList.GetEndIter(); ++it) { if (detail::EqualsResName(it->GetName(), findName)) { return &(*it); @@ -60,5 +60,5 @@ namespace nw4r { return nullptr; } - }; -}; + }; // namespace lyt +}; // namespace nw4r diff --git a/src/nw4r/lyt/lyt_init.cpp b/src/nw4r/lyt/lyt_init.cpp index 2d3b2b807..5e30fb3dd 100644 --- a/src/nw4r/lyt/lyt_init.cpp +++ b/src/nw4r/lyt/lyt_init.cpp @@ -12,5 +12,5 @@ namespace nw4r { OSRegisterVersion(NW4R_LYT_Version_); OSInitFastCast(); } - }; -}; + }; // namespace lyt +}; // namespace nw4r diff --git a/src/nw4r/lyt/lyt_layout.cpp b/src/nw4r/lyt/lyt_layout.cpp index 8bb1b8552..bf1c68d6d 100644 --- a/src/nw4r/lyt/lyt_layout.cpp +++ b/src/nw4r/lyt/lyt_layout.cpp @@ -11,9 +11,9 @@ namespace nw4r { namespace lyt { namespace { - bool IsIncludeAnimationGroupRef(GroupContainer *pGroupContainer, const AnimationGroupRef *const groupRefs, u16 bindGroupNum, bool bDescendingBind, Pane *pTargetPane) { + bool IsIncludeAnimationGroupRef(GroupContainer* pGroupContainer, const AnimationGroupRef* const groupRefs, u16 bindGroupNum, bool bDescendingBind, Pane* pTargetPane) { for (u16 grpIdx = 0; grpIdx < bindGroupNum; ++grpIdx) { - Group* const pGroup = pGroupContainer->FindGroupByName(groupRefs[grpIdx].GetName()); + Group* const pGroup = pGroupContainer->FindGroupByName(groupRefs[grpIdx].GetName()); PaneLinkList& paneList = pGroup->GetPaneList(); for (PaneLinkList::Iterator it = paneList.GetBeginIter(); it != paneList.GetEndIter(); ++it) { if (it->mTarget == pTargetPane) { @@ -32,12 +32,12 @@ namespace nw4r { return false; } - }; + }; // namespace MEMAllocator* Layout::mspAllocator = nullptr; - Layout::Layout() : mpRootPane(nullptr), mpGroupContainer(nullptr), mLayoutSize(0.0f, 0.0f) { - + Layout::Layout() + : mpRootPane(nullptr), mpGroupContainer(nullptr), mLayoutSize(0.0f, 0.0f) { } Layout::~Layout() { @@ -54,8 +54,8 @@ namespace nw4r { } } - bool Layout::Build(const void *lytResBuf, ResourceAccessor *pResAcsr) { - const res::BinaryFileHeader *const pFileHead = static_cast(lytResBuf); + bool Layout::Build(const void* lytResBuf, ResourceAccessor* pResAcsr) { + const res::BinaryFileHeader* const pFileHead = static_cast(lytResBuf); if (!detail::TestFileHeader(*pFileHead, 'RLYT')) { return false; } @@ -64,88 +64,83 @@ namespace nw4r { return false; } - ResBlockSet resBlockSet = { 0 }; + ResBlockSet resBlockSet = {0}; resBlockSet.pResAccessor = pResAcsr; Pane* pParentPane = nullptr; Pane* pLastPane = nullptr; - bool bReadRootGroup = false; - int groupNestLevel = 0; + bool bReadRootGroup = false; + int groupNestLevel = 0; const void* dataPtr = static_cast(lytResBuf) + pFileHead->headerSize; for (int i = 0; i < pFileHead->dataBlocks; ++i) { const res::DataBlockHeader* pDataBlockHead = static_cast(dataPtr); switch (detail::GetSignatureInt(pDataBlockHead->kind)) { - case 'lyt1': - { - const res::Layout* pResLyt = static_cast(dataPtr); - mLayoutSize = pResLyt->layoutSize; - break; + case 'lyt1': { + const res::Layout* pResLyt = static_cast(dataPtr); + mLayoutSize = pResLyt->layoutSize; + break; + } + case 'txl1': + resBlockSet.pTextureList = static_cast(dataPtr); + break; + case 'fnl1': + resBlockSet.pFontList = static_cast(dataPtr); + break; + case 'mat1': + resBlockSet.pMaterialList = static_cast(dataPtr); + break; + + case 'pan1': + case 'pic1': + case 'txt1': + case 'wnd1': + case 'bnd1': { + Pane* pPane = BuildPaneObj(detail::GetSignatureInt(pDataBlockHead->kind), dataPtr, resBlockSet); + + if (pPane != nullptr) { + if (mpRootPane == nullptr) { + mpRootPane = pPane; + } + + if (pParentPane != nullptr) { + pParentPane->AppendChild(pPane); + } + + pLastPane = pPane; } - case 'txl1': - resBlockSet.pTextureList = static_cast(dataPtr); - break; - case 'fnl1': - resBlockSet.pFontList = static_cast(dataPtr); - break; - case 'mat1': - resBlockSet.pMaterialList = static_cast(dataPtr); - break; + } break; - case 'pan1': - case 'pic1': - case 'txt1': - case 'wnd1': - case 'bnd1': - { - Pane* pPane = BuildPaneObj(detail::GetSignatureInt(pDataBlockHead->kind), dataPtr, resBlockSet); - - if (pPane != nullptr) { - if (mpRootPane == nullptr) { - mpRootPane = pPane; + case 'usd1': + pLastPane->SetExtUserDataList(reinterpret_cast(pDataBlockHead)); + break; + case 'pas1': + pParentPane = pLastPane; + break; + case 'pae1': + pLastPane = pParentPane; + pParentPane = pLastPane->GetParent(); + break; + case 'grp1': { + if (!bReadRootGroup) { + bReadRootGroup = true; + mpGroupContainer = NewObj(); + } else { + if (mpGroupContainer != nullptr && groupNestLevel == 1) { + if (Group* pGroup = NewObj(reinterpret_cast(pDataBlockHead), mpRootPane)) { + mpGroupContainer->AppendGroup(pGroup); } - - if (pParentPane != nullptr) { - pParentPane->AppendChild(pPane); - } - - pLastPane = pPane; } } break; - - case 'usd1': - pLastPane->SetExtUserDataList(reinterpret_cast(pDataBlockHead)); - break; - case 'pas1': - pParentPane = pLastPane; - break; - case 'pae1': - pLastPane = pParentPane; - pParentPane = pLastPane->GetParent(); - break; - case 'grp1': - { - if (!bReadRootGroup) { - bReadRootGroup = true; - mpGroupContainer = NewObj(); - } - else { - if (mpGroupContainer != nullptr && groupNestLevel == 1) { - if (Group* pGroup = NewObj(reinterpret_cast(pDataBlockHead), mpRootPane)) { - mpGroupContainer->AppendGroup(pGroup); - } - } - } - break; - } - case 'grs1': - groupNestLevel++; - break; - case 'gre1': - groupNestLevel--; - break; - default: - break; + } + case 'grs1': + groupNestLevel++; + break; + case 'gre1': + groupNestLevel--; + break; + default: + break; } dataPtr = static_cast(dataPtr) + pDataBlockHead->size; @@ -155,18 +150,18 @@ namespace nw4r { } AnimTransform* Layout::CreateAnimTransform() { - AnimTransformBasic *const pAnimTrans = NewObj(); + AnimTransformBasic* const pAnimTrans = NewObj(); if (pAnimTrans != nullptr) { mAnimTransList.PushBack(pAnimTrans); } return pAnimTrans; } - AnimTransform* Layout::CreateAnimTransform(const void *animResBuf, ResourceAccessor *pResAcsr) { + AnimTransform* Layout::CreateAnimTransform(const void* animResBuf, ResourceAccessor* pResAcsr) { return CreateAnimTransform(AnimResource(animResBuf), pResAcsr); } - AnimTransform* Layout::CreateAnimTransform(const AnimResource &animRes, ResourceAccessor *pResAcsr) { + AnimTransform* Layout::CreateAnimTransform(const AnimResource& animRes, ResourceAccessor* pResAcsr) { const res::AnimationBlock* const pAnimBlock = animRes.GetResourceBlock(); if (pAnimBlock == nullptr) { @@ -180,13 +175,13 @@ namespace nw4r { return pAnimTrans; } - void Layout::BindAnimation(AnimTransform *pAnimTrans) { + void Layout::BindAnimation(AnimTransform* pAnimTrans) { if (mpRootPane != nullptr) { mpRootPane->BindAnimation(pAnimTrans, true); } } - void Layout::UnbindAnimation(AnimTransform *pAnimTrans) { + void Layout::UnbindAnimation(AnimTransform* pAnimTrans) { if (mpRootPane != nullptr) { mpRootPane->UnbindAnimation(pAnimTrans, true); } @@ -265,13 +260,13 @@ namespace nw4r { } */ - void Layout::SetAnimationEnable(AnimTransform *pAnimTrans, bool bEnable) { + void Layout::SetAnimationEnable(AnimTransform* pAnimTrans, bool bEnable) { if (mpRootPane != nullptr) { mpRootPane->SetAnimationEnable(pAnimTrans, bEnable, true); } } - void Layout::CalculateMtx(const DrawInfo &rInfo) { + void Layout::CalculateMtx(const DrawInfo& rInfo) { if (mpRootPane == nullptr) { return; } @@ -279,7 +274,7 @@ namespace nw4r { mpRootPane->CalculateMtx(rInfo); } - void Layout::Draw(const DrawInfo &rInfo) { + void Layout::Draw(const DrawInfo& rInfo) { if (mpRootPane == nullptr) { return; } @@ -296,11 +291,11 @@ namespace nw4r { } const ut::Rect Layout::GetLayoutRect() const { - return ut::Rect(- mLayoutSize.width / 2, mLayoutSize.height / 2, mLayoutSize.width / 2, - mLayoutSize.height / 2); + return ut::Rect(-mLayoutSize.width / 2, mLayoutSize.height / 2, mLayoutSize.width / 2, -mLayoutSize.height / 2); } // have to do more headers to decomp these two // nw4r::lyt::Layout::SetTagProcessor // nw4r::lyt::Layout::BuildPaneObj - }; -}; + }; // namespace lyt +}; // namespace nw4r diff --git a/src/nw4r/lyt/lyt_resourceAccessor.cpp b/src/nw4r/lyt/lyt_resourceAccessor.cpp index 04d6ed4bc..7dd7a6f1e 100644 --- a/src/nw4r/lyt/lyt_resourceAccessor.cpp +++ b/src/nw4r/lyt/lyt_resourceAccessor.cpp @@ -3,15 +3,13 @@ namespace nw4r { namespace lyt { ResourceAccessor::~ResourceAccessor() { - } ResourceAccessor::ResourceAccessor() { - } ut::Font* ResourceAccessor::GetFont(const char*) { return nullptr; } - }; -}; + }; // namespace lyt +}; // namespace nw4r diff --git a/src/nw4r/lyt/lyt_texMap.cpp b/src/nw4r/lyt/lyt_texMap.cpp index 35824faa7..9af82b8a1 100644 --- a/src/nw4r/lyt/lyt_texMap.cpp +++ b/src/nw4r/lyt/lyt_texMap.cpp @@ -7,29 +7,28 @@ namespace nw4r { namespace lyt { - void TexMap::Get(_GXTexObj *pTexObj) const { + void TexMap::Get(_GXTexObj* pTexObj) const { if (detail::IsCITexelFormat(GetTexelFormat())) { u32 tlutName = GXGetTexObjTlut(pTexObj); GXInitTexObjCI(pTexObj, mImage, mWidth, mHeight, GXCITexFmt(GetTexelFormat()), GetWrapModeS(), GetWrapModeT(), IsMipMap(), tlutName); - } - else { + } else { GXInitTexObj(pTexObj, mImage, mWidth, mHeight, GetTexelFormat(), GetWrapModeS(), GetWrapModeT(), IsMipMap()); } GXInitTexObjLOD(pTexObj, GetMinFilter(), GetMagFilter(), GetMinLOD(), GetMaxLOD(), GetLODBias(), IsBiasClampEnable(), IsEdgeLODEnable(), GetAnisotropy()); } - void TexMap::Get(_GXTlutObj *pTlutObj) const { + void TexMap::Get(_GXTlutObj* pTlutObj) const { GXInitTlutObj(pTlutObj, GetPalette(), GetPaletteFormat(), GetPaletteEntryNum()); } - void TexMap::Set(const GXTexObj &texObj) { - - void* image; - u16 width, height; - GXTexFmt format; + void TexMap::Set(const GXTexObj& texObj) { + + void* image; + u16 width, height; + GXTexFmt format; GXTexWrapMode wrapS, wrapT; - GXBool mipmap; + GXBool mipmap; GXGetTexObjAll(&texObj, &image, &width, &height, &format, &wrapS, &wrapT, &mipmap); @@ -39,9 +38,9 @@ namespace nw4r { SetWrapMode(wrapS, wrapT); SetMipMap(mipmap); - GXTexFilter minFilter, magFilter; - f32 minLOD, maxLOD, lodBias; - GXBool biasCLampEnable, edgeLODEnable; + GXTexFilter minFilter, magFilter; + f32 minLOD, maxLOD, lodBias; + GXBool biasCLampEnable, edgeLODEnable; GXAnisotropy aniso; GXGetTexObjLODAll(&texObj, &minFilter, &magFilter, &minLOD, &maxLOD, &lodBias, &biasCLampEnable, &edgeLODEnable, &aniso); @@ -53,30 +52,29 @@ namespace nw4r { mBits.anisotropy = aniso; } - void TexMap::ReplaceImage(const TPLDescriptor *pTPLDesc) { + void TexMap::ReplaceImage(const TPLDescriptor* pTPLDesc) { const TPLHeader& header = *pTPLDesc->textureHeader; mImage = header.data; SetSize(header.width, header.height); SetTexelFormat(GXTexFmt(header.format)); - if (const TPLClutHeader *const pClut = pTPLDesc->CLUTHeader) { + if (const TPLClutHeader* const pClut = pTPLDesc->CLUTHeader) { SetPalette(pClut->data); SetPaletteFormat(pClut->format); SetPaletteEntryNum(pClut->numEntries); - } - else { + } else { SetPalette(nullptr); SetPaletteFormat(GXTlutFmt(0)); SetPaletteEntryNum(0); } } - void TexMap::ReplaceImage(TPLPalette *p, u32 id) { + void TexMap::ReplaceImage(TPLPalette* p, u32 id) { if (reinterpret_cast(p->descriptorArray) < 0x80000000) { TPLBind(p); } ReplaceImage(TPLGet(p, id)); } - }; -}; + }; // namespace lyt +}; // namespace nw4r diff --git a/src/nw4r/ut/ut_CharStrmReader.cpp b/src/nw4r/ut/ut_CharStrmReader.cpp index e357796c1..ef95fb8d4 100644 --- a/src/nw4r/ut/ut_CharStrmReader.cpp +++ b/src/nw4r/ut/ut_CharStrmReader.cpp @@ -7,24 +7,19 @@ namespace nw4r { inline bool IsSJISLeadByte(u8 c) { return ((0x81 <= c) && (c < 0xA0)) || (0xE0 <= c); } - }; + }; // namespace u16 CharStrmReader::ReadNextCharUTF8() { u16 code; if ((GetChar() & 0x80) == 0) { code = GetChar(); StepStrm(); - } - else if ((GetChar() & 0xE0) == 0xC0) { + } else if ((GetChar() & 0xE0) == 0xC0) { code = static_cast(((GetChar(0) & 0x1F) << 6) | ((GetChar(1) & 0x3F))); StepStrm(2); - } - else { + } else { code = static_cast( - ((GetChar(0) & 0x1F) << 12) - | ((GetChar(1) & 0x3F) << 6) - | ((GetChar(2) & 0x3F)) - ); + ((GetChar(0) & 0x1F) << 12) | ((GetChar(1) & 0x3F) << 6) | ((GetChar(2) & 0x3F))); StepStrm(3); } @@ -49,13 +44,12 @@ namespace nw4r { if (IsSJISLeadByte(GetChar())) { code = static_cast((GetChar(0) << 8) | GetChar(1)); StepStrm(2); - } - else { + } else { code = GetChar(); StepStrm(); } return code; } - }; -}; + }; // namespace ut +}; // namespace nw4r diff --git a/src/nw4r/ut/ut_LinkList.cpp b/src/nw4r/ut/ut_LinkList.cpp index 36cc9bc22..d7b76f08f 100644 --- a/src/nw4r/ut/ut_LinkList.cpp +++ b/src/nw4r/ut/ut_LinkList.cpp @@ -8,36 +8,34 @@ namespace nw4r { Erase(GetBeginIter(), GetEndIter()); } - LinkListImpl::Iterator LinkListImpl::Insert(Iterator it,pointer p) - { - Node *const pIt=it.mPointer; - Node *const pItPrev=pIt->mPrev; - p->mNext=pIt; - p->mPrev=pItPrev; + LinkListImpl::Iterator LinkListImpl::Insert(Iterator it, pointer p) { + Node* const pIt = it.mPointer; + Node* const pItPrev = pIt->mPrev; + p->mNext = pIt; + p->mPrev = pItPrev; - pIt->mPrev=p; - pItPrev->mNext=p; + pIt->mPrev = p; + pItPrev->mNext = p; ++mSize; return Iterator(p); } - LinkListImpl::Iterator LinkListImpl::Erase(pointer p) - { - Node *const pNext=p->mNext,*const pPrev=p->mPrev; - pNext->mPrev=pPrev; - pPrev->mNext=pNext; + LinkListImpl::Iterator LinkListImpl::Erase(pointer p) { + Node *const pNext = p->mNext, *const pPrev = p->mPrev; + pNext->mPrev = pPrev; + pPrev->mNext = pNext; --mSize; p->mNext = nullptr; p->mPrev = nullptr; - + return Iterator(pNext); } - LinkListImpl::Iterator LinkListImpl::Erase(Iterator itFirst,Iterator itLast) { - Node *pIt=itFirst.mPointer,* const pItLast = itLast.mPointer,*pNext; - for (; pIt != pItLast; pIt=pNext) { + LinkListImpl::Iterator LinkListImpl::Erase(Iterator itFirst, Iterator itLast) { + Node *pIt = itFirst.mPointer, *const pItLast = itLast.mPointer, *pNext; + for (; pIt != pItLast; pIt = pNext) { pNext = pIt->mNext; Erase(pIt); } @@ -49,12 +47,11 @@ namespace nw4r { Clear(); } - LinkListImpl::Iterator LinkListImpl::Erase(Iterator it) { - Iterator itNext=it; + Iterator itNext = it; (void)++itNext; - return Erase(it,itNext); + return Erase(it, itNext); } - }; - }; -}; + }; // namespace detail + }; // namespace ut +}; // namespace nw4r diff --git a/src/nw4r/ut/ut_TagProcessorBase.cpp b/src/nw4r/ut/ut_TagProcessorBase.cpp index 3b27cf7ad..da6a44905 100644 --- a/src/nw4r/ut/ut_TagProcessorBase.cpp +++ b/src/nw4r/ut/ut_TagProcessorBase.cpp @@ -5,20 +5,18 @@ namespace nw4r { namespace ut { template TagProcessorBase::TagProcessorBase() { - } - template + template TagProcessorBase::~TagProcessorBase() { - } - template - void TagProcessorBase::ProcessLinefeed(ContextType *context) { + template + void TagProcessorBase::ProcessLinefeed(ContextType* context) { TextWriterBase& writer = *context->writer; - const f32 x = context->xOrigin; - const f32 y = writer.GetCursorY() + writer.GetLineHeight(); + const f32 x = context->xOrigin; + const f32 y = writer.GetCursorY() + writer.GetLineHeight(); writer.SetCursor(x, y); } - }; -}; + }; // namespace ut +}; // namespace nw4r diff --git a/src/nw4r/ut/ut_binaryFileFormat.cpp b/src/nw4r/ut/ut_binaryFileFormat.cpp index 271da81a9..c064ad7bf 100644 --- a/src/nw4r/ut/ut_binaryFileFormat.cpp +++ b/src/nw4r/ut/ut_binaryFileFormat.cpp @@ -2,7 +2,7 @@ namespace nw4r { namespace ut { - bool IsValidBinaryFile(const BinaryFileHeader *header, u32 signature, u16 version, u16 minBlocks) { + bool IsValidBinaryFile(const BinaryFileHeader* header, u32 signature, u16 version, u16 minBlocks) { if (header->signature != signature) { return false; } @@ -25,5 +25,5 @@ namespace nw4r { return true; } - }; -}; + }; // namespace ut +}; // namespace nw4r