From 1dc74d484104c2c4f06ad254eea0f919a228d35f Mon Sep 17 00:00:00 2001 From: Dark Date: Thu, 24 Sep 2020 17:18:41 -0400 Subject: [PATCH] Add .clang-format and format existing code --- .clang-format | 110 ++++ src/CodeWarrior/cmath | 4 +- src/Core/p2/iCollideFast.cpp | 2 +- src/Core/p2/iCollideFast.h | 2 +- src/Core/x/xBase.h | 22 +- src/Core/x/xCounter.cpp | 4 +- src/Core/x/xCounter.h | 10 +- src/Core/x/xEvent.h | 1084 +++++++++++++++++----------------- src/Core/x/xLinkAsset.h | 12 +- src/Core/x/xScene.h | 1 - src/Game/zEvent.cpp | 3 +- src/Game/zEvent.h | 1 - 12 files changed, 682 insertions(+), 573 deletions(-) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 000000000..151a5da16 --- /dev/null +++ b/.clang-format @@ -0,0 +1,110 @@ +--- +AccessModifierOffset: -4 +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +#AlignEscapedNewlines: Left # Unknown to clang-format-4.0 +AlignOperands: true +AlignTrailingComments: false +AllowAllParametersOfDeclarationOnNextLine: false +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: None +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: false +BinPackArguments: true +BinPackParameters: true +BraceWrapping: + AfterClass: true + AfterCaseLabel: true + AfterControlStatement: true + AfterEnum: true + AfterFunction: true + AfterNamespace: true + AfterObjCDeclaration: true + AfterStruct: true + AfterUnion: true + AfterExternBlock: false + BeforeCatch: true + BeforeElse: true + IndentBraces: false + #SplitEmptyFunction: true # Unknown to clang-format-4.0 + #SplitEmptyRecord: true # Unknown to clang-format-4.0 + #SplitEmptyNamespace: true # Unknown to clang-format-4.0 +BreakBeforeBinaryOperators: None +BreakBeforeBraces: Custom +#BreakBeforeInheritanceComma: false # Unknown to clang-format-4.0 +BreakBeforeTernaryOperators: false +BreakConstructorInitializersBeforeComma: false +#BreakConstructorInitializers: BeforeComma # Unknown to clang-format-4.0 +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: false +ColumnLimit: 100 +CommentPragmas: '^ IWYU pragma:' +#CompactNamespaces: false # Unknown to clang-format-4.0 +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 4 +ContinuationIndentWidth: 4 +Cpp11BracedListStyle: false +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +FixNamespaceComments: true # Unknown to clang-format-4.0 + +ForEachMacros: + +#IncludeBlocks: Preserve # Unknown to clang-format-5.0 +IncludeCategories: + - Regex: '.*' + Priority: 1 +IncludeIsMainRegex: '(Test)?$' +IndentCaseLabels: false +#IndentPPDirectives: None # Unknown to clang-format-5.0 +IndentWidth: 4 +IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: false +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 1 +NamespaceIndentation: All +#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0 +ObjCBlockIndentWidth: 4 +ObjCSpaceAfterProperty: true +ObjCSpaceBeforeProtocolList: true + +#PenaltyBreakAssignment: 10 # Unknown to clang-format-4.0 +PenaltyBreakBeforeFirstCallParameter: 30 +PenaltyBreakComment: 10 +PenaltyBreakFirstLessLess: 0 +PenaltyBreakString: 10 +PenaltyExcessCharacter: 100 +PenaltyReturnTypeOnItsOwnLine: 60 + +PointerAlignment: Left +ReflowComments: false +SortIncludes: false +#SortUsingDeclarations: false # Unknown to clang-format-4.0 +SpaceAfterCStyleCast: false +SpaceAfterTemplateKeyword: true +SpaceBeforeAssignmentOperators: true +#SpaceBeforeCtorInitializerColon: true # Unknown to clang-format-5.0 +#SpaceBeforeInheritanceColon: true # Unknown to clang-format-5.0 +SpaceBeforeParens: ControlStatements +#SpaceBeforeRangeBasedForLoopColon: true # Unknown to clang-format-5.0 +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: false +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp03 +TabWidth: 4 +UseTab: Never +... diff --git a/src/CodeWarrior/cmath b/src/CodeWarrior/cmath index 03273a125..551aa5765 100644 --- a/src/CodeWarrior/cmath +++ b/src/CodeWarrior/cmath @@ -19,6 +19,6 @@ namespace std { return (float)tan((double)x); } -} +} // namespace std -#endif \ No newline at end of file +#endif diff --git a/src/Core/p2/iCollideFast.cpp b/src/Core/p2/iCollideFast.cpp index 659e413f1..945d8caad 100644 --- a/src/Core/p2/iCollideFast.cpp +++ b/src/Core/p2/iCollideFast.cpp @@ -1,6 +1,6 @@ #include "iCollideFast.h" -void iCollideFastInit(xScene *sc) +void iCollideFastInit(xScene* sc) { return; } \ No newline at end of file diff --git a/src/Core/p2/iCollideFast.h b/src/Core/p2/iCollideFast.h index 51193d0c9..2df3c137c 100644 --- a/src/Core/p2/iCollideFast.h +++ b/src/Core/p2/iCollideFast.h @@ -3,6 +3,6 @@ struct xScene; -void iCollideFastInit(xScene *sc); +void iCollideFastInit(xScene* sc); #endif \ No newline at end of file diff --git a/src/Core/x/xBase.h b/src/Core/x/xBase.h index de325af5a..231f4e215 100644 --- a/src/Core/x/xBase.h +++ b/src/Core/x/xBase.h @@ -6,24 +6,24 @@ struct xBaseAsset { - unsigned int id; - unsigned char baseType; - unsigned char linkCount; - unsigned short baseFlags; + unsigned int id; + unsigned char baseType; + unsigned char linkCount; + unsigned short baseFlags; }; struct xBase; -typedef int(*xBaseEventCB)(xBase*, xBase*, unsigned int, const float*, xBase*); +typedef int (*xBaseEventCB)(xBase*, xBase*, unsigned int, const float*, xBase*); struct xBase { - unsigned int id; - unsigned char baseType; - unsigned char linkCount; - unsigned short baseFlags; - xLinkAsset* link; - xBaseEventCB eventFunc; + unsigned int id; + unsigned char baseType; + unsigned char linkCount; + unsigned short baseFlags; + xLinkAsset* link; + xBaseEventCB eventFunc; }; void xBaseInit(xBase* xb, xBaseAsset* asset); diff --git a/src/Core/x/xCounter.cpp b/src/Core/x/xCounter.cpp index 99292eea1..aa366a9c9 100644 --- a/src/Core/x/xCounter.cpp +++ b/src/Core/x/xCounter.cpp @@ -9,7 +9,7 @@ namespace { return; } -} +} // namespace void xCounterInit() { @@ -26,7 +26,7 @@ void xCounterInit(xBase* b, xCounterAsset* asset) _xCounter* t = (_xCounter*)b; xBaseInit(t, asset); - + t->eventFunc = xCounterEventCB; t->asset = asset; diff --git a/src/Core/x/xCounter.h b/src/Core/x/xCounter.h index 824593eb9..eb9fa8710 100644 --- a/src/Core/x/xCounter.h +++ b/src/Core/x/xCounter.h @@ -5,15 +5,15 @@ struct xCounterAsset : xBaseAsset { - short count; + short count; }; struct _xCounter : xBase { - xCounterAsset* asset; - short count; - unsigned char state; - unsigned char counterFlags; + xCounterAsset* asset; + short count; + unsigned char state; + unsigned char counterFlags; }; void xCounterInit(); diff --git a/src/Core/x/xEvent.h b/src/Core/x/xEvent.h index 461c500bf..f86846ad0 100644 --- a/src/Core/x/xEvent.h +++ b/src/Core/x/xEvent.h @@ -5,548 +5,548 @@ enum en_xEventTags { - eEventUnknown, - eEventEnable, - eEventDisable, - eEventVisible, - eEventInvisible, - eEventEnterPlayer, - eEventExitPlayer, - eEventTouchPlayer, - eEventControlOff, - eEventControlOn, - eEventReset, - eEventIncrement, - eEventDecrement, - eEventOpen, - eEventClose, - eEventToggle, - eEventTeleportPlayer, - eEventOutOfBounds, - eEventRun, - eEventStop, - eEventExpired, - eEventMove, - eEventDestroy, - eEventPause, - eEventPlay, - eEventPlayOne, - eEventPlayMaybe, - eEventRoomStart, - eEventInvalidate, - eEventTilt, - eEventUntilt, - eEventArrive, - eEventMount, - eEventDismount, - eEventBreak, - eEventPickup, - eEventDeath, - eEventKill, - eEventOn, - eEventOff, - eEventNPCPatrolOn, - eEventNPCPatrolOff, - eEventNPCWanderOn, - eEventNPCWanderOff, - eEventNPCDetectOn, - eEventNPCDetectOff, - eEventNPCChaseOn, - eEventNPCChaseOff, - eEventNPCGoToSleep, - eEventNPCWakeUp, - eEventNPCRespawn, - eEventPlayerDeath, - eEventGiveChance, - eEventGiveShinyObjects, - eEventGiveHealth, - eEventPress, - eEventUnpress, - eEventArriveHalfway, - eEventHit, - eEventButtonPressAction, - eEventEvaluate, - eEventTrue, - eEventFalse, - eEventPadPressX, - eEventPadPressSquare, - eEventPadPressO, - eEventPadPressTriangle, - eEventPadPressL1, - eEventPadPressL2, - eEventPadPressR1, - eEventPadPressR2, - eEventPadPressStart, - eEventPadPressSelect, - eEventPadPressUp, - eEventPadPressDown, - eEventPadPressRight, - eEventPadPressLeft, - eEventFontBackdropOn, - eEventFontBackdropOff, - eEventUISelect, - eEventUIUnselect, - eEventUIFocusOn, - eEventUIFocusOff, - eEventCollisionOn, - eEventCollisionOff, - eEventCollision_Visible_On, - eEventCollision_Visible_Off, - eEventSceneBegin, - eEventSceneEnd, - eEventRoomBegin, - eEventRoomEnd, - eEventLobMasterShoot, - eEventLobMasterReset, - eEventFallToDeath, - eEventUIFocusOn_Select, - eEventUIFocusOff_Unselect, - eEventDispatcher_PadCfg_PresetA, - eEventDispatcher_PadCfg_PresetB, - eEventDispatcher_PadCfg_PresetC, - eEventDispatcher_PadCfg_PresetD, - eEventDispatcher_PadVibrateOn, - eEventDispatcher_PadVibrateOff, - eEventDispatcher_SoundMono, - eEventDispatcher_SoundStereo, - eEventDispatcher_SoundMasterIncrease, - eEventDispatcher_SoundMasterDecrease, - eEventDispatcher_SoundMusicIncrease, - eEventDispatcher_SoundMusicDecrease, - eEventDispatcher_SoundSFXIncrease, - eEventDispatcher_SoundSFXDecrease, - eEventDispatcher_IntroState_Sony, - eEventDispatcher_IntroState_Publisher, - eEventDispatcher_IntroState_Developer, - eEventDispatcher_IntroState_License, - eEventDispatcher_IntroState_Count, - eEventDispatcher_TitleState_Start, - eEventDispatcher_TitleState_Attract, - eEventDispatcher_TitleState_Count, - eEventDispatcher_LoadState_SelectMemCard, - eEventDispatcher_LoadState_SelectSlot, - eEventDispatcher_LoadState_Loading, - eEventDispatcher_LoadState_Count, - eEventDispatcher_OptionsState_Options, - eEventDispatcher_OptionsState_Count, - eEventDispatcher_SaveState_SelectMemCard, - eEventDispatcher_SaveState_SelectSlot, - eEventDispatcher_SaveState_Saving, - eEventDispatcher_SaveState_Count, - eEventDispatcher_PauseState_Pause, - eEventDispatcher_PauseState_Options, - eEventDispatcher_PauseState_Count, - eEventDispatcher_GameState_FirstTime, - eEventDispatcher_GameState_Play, - eEventDispatcher_GameState_LoseChance, - eEventDispatcher_GameState_GameOver, - eEventDispatcher_GameState_SceneSwitch, - eEventDispatcher_GameState_Dead, - eEventDispatcher_SetIntroState_Sony, - eEventDispatcher_SetIntroState_Publisher, - eEventDispatcher_SetIntroState_Developer, - eEventDispatcher_SetIntroState_License, - eEventDispatcher_SetIntroState_Count, - eEventDispatcher_SetTitleState_Start, - eEventDispatcher_SetTitleState_Attract, - eEventDispatcher_SetTitleState_Count, - eEventDispatcher_SetLoadState_SelectMemCard, - eEventDispatcher_SetLoadState_SelectSlot, - eEventDispatcher_SetLoadState_Loading, - eEventDispatcher_SetLoadState_Count, - eEventDispatcher_SetOptionsState_Options, - eEventDispatcher_SetOptionsState_Count, - eEventDispatcher_SetSaveState_SelectMemCard, - eEventDispatcher_SetSaveState_SelectSlot, - eEventDispatcher_SetSaveState_Saving, - eEventDispatcher_SetSaveState_Count, - eEventDispatcher_SetPauseState_Pause, - eEventDispatcher_SetPauseState_Options, - eEventDispatcher_SetPauseState_Count, - eEventDispatcher_SetGameState_FirstTime, - eEventDispatcher_SetGameState_Play, - eEventDispatcher_SetGameState_LoseChance, - eEventDispatcher_SetGameState_GameOver, - eEventDispatcher_SetGameState_SceneSwitch, - eEventDispatcher_SetGameState_Dead, - eEventDigup, - eEventDispatcher_GameState_Exit, - eEventDispatcher_SetGameState_Exit, - eEventLobMasterShootFromWidget, - eEventDispatcher_SLBack, - eEventDispatcher_SLCancel, - eEventDispatcher_SLRetry, - eEventDispatcher_SLSelectCard, - eEventDispatcher_SLSelectSlot, - eEventDispatcher_SLOkay, - eEventVilHurtBoss, - eEventAttack, - eEventAttackOn, - eEventAttackOff, - eEventDrop, - eEventVilReport_StartingIdle, - eEventVilReport_StartingSleep, - eEventVilReport_StartingGuard, - eEventVilReport_StartingPatrol, - eEventVilReport_StartingDazed, - eEventVilReport_StartingLook, - eEventVilReport_StartingListen, - eEventVilReport_StartingInvestigate, - eEventVilReport_StartingChase, - eEventVilReport_StartingAttack, - eEventVilReport_StartingRetreat, - eEventPreload, - eEventDone, - eEventArcto, - eEventDigupReaction, - eEventDispatcher_StoreCheckPoint, - eEventAnimPlay, - eEventAnimPlayLoop, - eEventAnimStop, - eEventAnimPause, - eEventAnimResume, - eEventAnimTogglePause, - eEventAnimPlayRandom, - eEventAnimPlayMaybe, - eEventSetSpeed, - eEventAccelerate, - eEventMoveToTarget, - eEventSwingerFollow, - eEventShaggyMount, - eEventShaggyWitchDrop, - eEventShaggySwap, - eEventShaggyState, - eEventShaggyAction, - eEventEnterEntity, - eEventExitEntity, - eEventEnterEntityFLAG, - eEventExitEntityFLAG, - eEventDrivenby, - eEventFollowTarget, - eEventFaceTarget, - eEventWatchTarget, - eEventShaggyCollideOnly, - eEventShaggy1_ThrowTarget, - eEventShaggy8_CallEnable, - eEventShaggy8_CallDisable, - eEventShaggy8_SetMagnet, - eEventShaggy8_ClearMagnet, - eEventStartMoving, - eEventStopMoving, - eEventSwoosh, - eEventShaggySetDown, - eEventShaggyGrabEnable, - eEventShaggyGrabDisable, - eEventShaggyGrabbed, - eEventShaggyThrown, - eEventVilDoAction, - eEventGangDoBossAction, - eEventVilFakeChaseOn, - eEventVilFakeChaseOff, - eEventBossMMPushButton, - eEventVilReport_DecayComplete, - eEventVilGuardWidget, - eEventTextureAnimateOn, - eEventTextureAnimateOff, - eEventTextureAnimateToggle, - eEventColorEffectOn, - eEventColorEffectOff, - eEventColorEffectToggle, - eEventSetTextureAnimGroup, - eEventSetTextureAnimSpeed, - eEventTextureAnimateStep, - eEventEmit, - eEventEmitted, - eEventTranslucentOn, - eEventTranslucentOff, - eEventTranslucentToggle, - eEventVilGangTalkOn, - eEventVilGangTalkOff, - eEventGivePowerUp, - eEventUnlockR001, - eEventUnlockS001, - eEventUnlockE001, - eEventUnlockF001, - eEventDisableGroupContents, - eEventShaggyPhysHack, - eEventOccludeOn, - eEventOccludeOff, - eEventWaveSetLinear, - eEventWaveSetRipple, - eEventSituationLaugh, - eEventSituationBossBattleGreenGhost, - eEventSituationBossBattleRedBeard, - eEventSituationBossBattleMasterMind, - eEventSituationBossBattleBlacknight, - eEventSituationPlayerScare, - eEventSituationPlayerSafe, - eEventSituationPlayerDanger, - eEventSituationPlayerChaseBegin, - eEventSituationPlayerChaseEnd, - eEventSituationPlayerSeeShaggy, - eEventSituationPlayerSeeFood, - eEventSituationPlayerSeeToken, - eEventSituationPlayerSeeScoobySnack, - eEventSituationPlayerSeePowerup, - eEventSituationPlayerSeeMonster, - eEventSituationPlayerSuccess, - eEventSituationPlayerFailure, - eEventDispatcher_ShowHud, - eEventDispatcher_HideHud, - eEventDispatcher_FadeOut, - eEventSetRain, - eEventSetSnow, - eEventShaggyMowerStopMode, - eEventScriptReset, - eEventWaitForInput, - eEventPlayMovie, - eEventDefeatedMM, - eEventDispatcher_SetGameState_GameStats, - eEventPlayMusic, - eEventForward, - eEventReverse, - eEventPlayerRumbleTest, - eEventPlayerRumbleLight, - eEventPlayerRumbleMedium, - eEventPlayerRumbleHeavy, - eEventDispatcherScreenAdjustON, - eEventDispatcherScreenAdjustOFF, - eEventSetSkyDome, - eEventConnectToChild, - eEventDuploWaveBegin, - eEventDuploWaveComplete, - eEventDuploNPCBorn, - eEventDuploNPCKilled, - eEventDuploExpiredMaxNPC, - eEventDuploPause, - eEventDuploResume, - eEventSetGoo, - eEventNPCScript_ScriptBegin, - eEventNPCScript_ScriptEnd, - eEventNPCScript_ScriptReady, - eEventNPCScript_Halt, - eEventNPCScript_SetPos, - eEventNPCScript_SetDir, - eEventNPCScript_LookNormal, - eEventNPCScript_LookAlert, - eEventNPCScript_FaceWidget, - eEventNPCScript_FaceWidgetDone, - eEventNPCScript_GotoWidget, - eEventNPCScript_GotoWidgetDone, - eEventNPCScript_AttackWidget, - eEventNPCScript_AttackWidgetDone, - eEventNPCScript_FollowWidget, - eEventNPCScript_PlayAnim, - eEventNPCScript_PlayAnimDone, - eEventNPCScript_LeadPlayer, - eEventSetText, - eEventStartConversation, - eEventEndConversation, - eEventSwitch, - eEventAddText, - eEventClearText, - eEventOpenTBox, - eEventCloseTBox, - eEventTalkBox_OnSignal0, - eEventTalkBox_OnSignal1, - eEventTalkBox_OnSignal2, - eEventTalkBox_OnSignal3, - eEventTalkBox_OnSignal4, - eEventTalkBox_OnSignal5, - eEventTalkBox_OnSignal6, - eEventTalkBox_OnSignal7, - eEventTalkBox_OnSignal8, - eEventTalkBox_OnSignal9, - eEventTalkBox_StopWait, - eEventTalkBox_OnStart, - eEventTalkBox_OnStop, - eEventHit_Melee, - eEventHit_BubbleBounce, - eEventHit_BubbleBash, - eEventHit_BubbleBowl, - eEventHit_PatrickSlam, - eEventHit_Throw, - eEventHit_PaddleLeft, - eEventHit_PaddleRight, - eEventTaskBox_Initiate, - eEventTaskBox_SetSuccess, - eEventTaskBox_SetFailure, - eEventTaskBox_OnAccept, - eEventTaskBox_OnDecline, - eEventTaskBox_OnComplete, - eEventGenerateBoulder, - eEventLaunchBoulderAtWidget, - eEventLaunchBoulderAtPoint, - eEventLaunchBoulderAtPlayer, - eEventDuploSuperDuperDone, - eEventDuploDuperIsDoner, - eEventBusStopSwitchChr, - eEventGroupUpdateTogether, - eEventSetUpdateDistance, - eEventTranslLocalX, - eEventTranslLocalY, - eEventTranslLocalZ, - eEventTranslWorldX, - eEventTranslWorldY, - eEventTranslWorldZ, - eEventRotLocalX, - eEventRotLocalY, - eEventRotLocalZ, - eEventRotWorldX, - eEventRotWorldY, - eEventRotWorldZ, - eEventTranslLocalXDone, - eEventTranslLocalYDone, - eEventTranslLocalZDone, - eEventTranslWorldXDone, - eEventTranslWorldYDone, - eEventTranslWorldZDone, - eEventRotLocalXDone, - eEventRotLocalYDone, - eEventRotLocalZDone, - eEventRotWorldXDone, - eEventRotWorldYDone, - eEventRotWorldZDone, - eEventCount1, - eEventCount2, - eEventCount3, - eEventCount4, - eEventCount5, - eEventCount6, - eEventCount7, - eEventCount8, - eEventCount9, - eEventCount10, - eEventCount11, - eEventCount12, - eEventCount13, - eEventCount14, - eEventCount15, - eEventCount16, - eEventCount17, - eEventCount18, - eEventCount19, - eEventCount20, - eEventSetState, - eEventEnterSpongeBob, - eEventEnterPatrick, - eEventEnterSandy, - eEventExitSpongeBob, - eEventExitPatrick, - eEventExitSandy, - eEventNPCSpecial_PlatformSnap, - eEventNPCSpecial_PlatformFall, - eEventGooSetWarb, - eEventGooSetFreezeDuration, - eEventGooMelt, - eEventSetStateRange, - eEventSetStateDelay, - eEventSetTransitionDelay, - eEventNPCFightOn, - eEventNPCFightOff, - eEventNPCSplineOKOn, - eEventNPCSplineOKOff, - eEventNPCKillQuietly, - eEventHitHead, - eEventHitUpperBody, - eEventHitLeftArm, - eEventHitRightArm, - eEventHitLeftLeg, - eEventHitRightLeg, - eEventHitLowerBody, - eEventGiveCurrLevelSocks, - eEventGiveCurrLevelPickup, - eEventSetCurrLevelSocks, - eEventSetCurrLevelPickup, - eEventTalkBox_OnYes, - eEventTalkBox_OnNo, - eEventHit_Cruise, - eEventDuploKillKids, - eEventTalkBox_OnSignal10, - eEventTalkBox_OnSignal11, - eEventTalkBox_OnSignal12, - eEventTalkBox_OnSignal13, - eEventTalkBox_OnSignal14, - eEventTalkBox_OnSignal15, - eEventTalkBox_OnSignal16, - eEventTalkBox_OnSignal17, - eEventTalkBox_OnSignal18, - eEventTalkBox_OnSignal19, - eEventSpongeballOn, - eEventSpongeballOff, - eEventLaunchShrapnel, - eEventNPCHPIncremented, - eEventNPCHPDecremented, - eEventNPCSetActiveOn, - eEventNPCSetActiveOff, - eEventPlrSwitchCharacter, - eEventLevelBegin, - eEventSceneReset, - eEventSceneEnter, - eEventSituationDestroyedTiki, - eEventSituationDestroyedRobot, - eEventSituationSeeWoodTiki, - eEventSituationSeeLoveyTiki, - eEventSituationSeeShhhTiki, - eEventSituationSeeThunderTiki, - eEventSituationSeeStoneTiki, - eEventSituationSeeFodder, - eEventSituationSeeHammer, - eEventSituationSeeTarTar, - eEventSituationSeeGLove, - eEventSituationSeeMonsoon, - eEventSituationSeeSleepyTime, - eEventSituationSeeArf, - eEventSituationSeeTubelets, - eEventSituationSeeSlick, - eEventSituationSeeKingJellyfish, - eEventSituationSeePrawn, - eEventSituationSeeDutchman, - eEventSituationSeeSandyBoss, - eEventSituationSeePatrickBoss, - eEventSituationSeeSpongeBobBoss, - eEventSituationSeeRobotPlankton, - eEventUIChangeTexture, - eEventNPCCheerForMe, - eEventFastVisible, - eEventFastInvisible, - eEventZipLineMount, - eEventZipLineDismount, - eEventTarget, - eEventFire, - eEventCameraFXShake, - eEventBulletTime, - eEventThrown, - eEventUpdateAnimMatrices, - eEventEnterCruise, - eEventExitCruise, - eEventCruiseFired, - eEventCruiseDied, - eEventCruiseAddLife, - eEventCruiseSetLife, - eEventCruiseResetLife, - eEventCameraCollideOff, - eEventCameraCollideOn, - eEventOnSliding, - eEventOffSliding, - eEventTimerSet, - eEventTimerAdd, - eEventNPCForceConverseStart, - eEventMakeASplash, - eEventCreditsStart, - eEventCreditsStop, - eEventCreditsEnded, - eEventBubbleWipe, - eEventSetLightKit, - eEventSetOpacity, - eEventTakeSocks, - eEventDispatcherAssert, - eEventBorn, - eEventPlatPause, - eEventPlatUnpause, - eEventStoreOptions, - eEventRestoreOptions, - eEventCount + eEventUnknown, + eEventEnable, + eEventDisable, + eEventVisible, + eEventInvisible, + eEventEnterPlayer, + eEventExitPlayer, + eEventTouchPlayer, + eEventControlOff, + eEventControlOn, + eEventReset, + eEventIncrement, + eEventDecrement, + eEventOpen, + eEventClose, + eEventToggle, + eEventTeleportPlayer, + eEventOutOfBounds, + eEventRun, + eEventStop, + eEventExpired, + eEventMove, + eEventDestroy, + eEventPause, + eEventPlay, + eEventPlayOne, + eEventPlayMaybe, + eEventRoomStart, + eEventInvalidate, + eEventTilt, + eEventUntilt, + eEventArrive, + eEventMount, + eEventDismount, + eEventBreak, + eEventPickup, + eEventDeath, + eEventKill, + eEventOn, + eEventOff, + eEventNPCPatrolOn, + eEventNPCPatrolOff, + eEventNPCWanderOn, + eEventNPCWanderOff, + eEventNPCDetectOn, + eEventNPCDetectOff, + eEventNPCChaseOn, + eEventNPCChaseOff, + eEventNPCGoToSleep, + eEventNPCWakeUp, + eEventNPCRespawn, + eEventPlayerDeath, + eEventGiveChance, + eEventGiveShinyObjects, + eEventGiveHealth, + eEventPress, + eEventUnpress, + eEventArriveHalfway, + eEventHit, + eEventButtonPressAction, + eEventEvaluate, + eEventTrue, + eEventFalse, + eEventPadPressX, + eEventPadPressSquare, + eEventPadPressO, + eEventPadPressTriangle, + eEventPadPressL1, + eEventPadPressL2, + eEventPadPressR1, + eEventPadPressR2, + eEventPadPressStart, + eEventPadPressSelect, + eEventPadPressUp, + eEventPadPressDown, + eEventPadPressRight, + eEventPadPressLeft, + eEventFontBackdropOn, + eEventFontBackdropOff, + eEventUISelect, + eEventUIUnselect, + eEventUIFocusOn, + eEventUIFocusOff, + eEventCollisionOn, + eEventCollisionOff, + eEventCollision_Visible_On, + eEventCollision_Visible_Off, + eEventSceneBegin, + eEventSceneEnd, + eEventRoomBegin, + eEventRoomEnd, + eEventLobMasterShoot, + eEventLobMasterReset, + eEventFallToDeath, + eEventUIFocusOn_Select, + eEventUIFocusOff_Unselect, + eEventDispatcher_PadCfg_PresetA, + eEventDispatcher_PadCfg_PresetB, + eEventDispatcher_PadCfg_PresetC, + eEventDispatcher_PadCfg_PresetD, + eEventDispatcher_PadVibrateOn, + eEventDispatcher_PadVibrateOff, + eEventDispatcher_SoundMono, + eEventDispatcher_SoundStereo, + eEventDispatcher_SoundMasterIncrease, + eEventDispatcher_SoundMasterDecrease, + eEventDispatcher_SoundMusicIncrease, + eEventDispatcher_SoundMusicDecrease, + eEventDispatcher_SoundSFXIncrease, + eEventDispatcher_SoundSFXDecrease, + eEventDispatcher_IntroState_Sony, + eEventDispatcher_IntroState_Publisher, + eEventDispatcher_IntroState_Developer, + eEventDispatcher_IntroState_License, + eEventDispatcher_IntroState_Count, + eEventDispatcher_TitleState_Start, + eEventDispatcher_TitleState_Attract, + eEventDispatcher_TitleState_Count, + eEventDispatcher_LoadState_SelectMemCard, + eEventDispatcher_LoadState_SelectSlot, + eEventDispatcher_LoadState_Loading, + eEventDispatcher_LoadState_Count, + eEventDispatcher_OptionsState_Options, + eEventDispatcher_OptionsState_Count, + eEventDispatcher_SaveState_SelectMemCard, + eEventDispatcher_SaveState_SelectSlot, + eEventDispatcher_SaveState_Saving, + eEventDispatcher_SaveState_Count, + eEventDispatcher_PauseState_Pause, + eEventDispatcher_PauseState_Options, + eEventDispatcher_PauseState_Count, + eEventDispatcher_GameState_FirstTime, + eEventDispatcher_GameState_Play, + eEventDispatcher_GameState_LoseChance, + eEventDispatcher_GameState_GameOver, + eEventDispatcher_GameState_SceneSwitch, + eEventDispatcher_GameState_Dead, + eEventDispatcher_SetIntroState_Sony, + eEventDispatcher_SetIntroState_Publisher, + eEventDispatcher_SetIntroState_Developer, + eEventDispatcher_SetIntroState_License, + eEventDispatcher_SetIntroState_Count, + eEventDispatcher_SetTitleState_Start, + eEventDispatcher_SetTitleState_Attract, + eEventDispatcher_SetTitleState_Count, + eEventDispatcher_SetLoadState_SelectMemCard, + eEventDispatcher_SetLoadState_SelectSlot, + eEventDispatcher_SetLoadState_Loading, + eEventDispatcher_SetLoadState_Count, + eEventDispatcher_SetOptionsState_Options, + eEventDispatcher_SetOptionsState_Count, + eEventDispatcher_SetSaveState_SelectMemCard, + eEventDispatcher_SetSaveState_SelectSlot, + eEventDispatcher_SetSaveState_Saving, + eEventDispatcher_SetSaveState_Count, + eEventDispatcher_SetPauseState_Pause, + eEventDispatcher_SetPauseState_Options, + eEventDispatcher_SetPauseState_Count, + eEventDispatcher_SetGameState_FirstTime, + eEventDispatcher_SetGameState_Play, + eEventDispatcher_SetGameState_LoseChance, + eEventDispatcher_SetGameState_GameOver, + eEventDispatcher_SetGameState_SceneSwitch, + eEventDispatcher_SetGameState_Dead, + eEventDigup, + eEventDispatcher_GameState_Exit, + eEventDispatcher_SetGameState_Exit, + eEventLobMasterShootFromWidget, + eEventDispatcher_SLBack, + eEventDispatcher_SLCancel, + eEventDispatcher_SLRetry, + eEventDispatcher_SLSelectCard, + eEventDispatcher_SLSelectSlot, + eEventDispatcher_SLOkay, + eEventVilHurtBoss, + eEventAttack, + eEventAttackOn, + eEventAttackOff, + eEventDrop, + eEventVilReport_StartingIdle, + eEventVilReport_StartingSleep, + eEventVilReport_StartingGuard, + eEventVilReport_StartingPatrol, + eEventVilReport_StartingDazed, + eEventVilReport_StartingLook, + eEventVilReport_StartingListen, + eEventVilReport_StartingInvestigate, + eEventVilReport_StartingChase, + eEventVilReport_StartingAttack, + eEventVilReport_StartingRetreat, + eEventPreload, + eEventDone, + eEventArcto, + eEventDigupReaction, + eEventDispatcher_StoreCheckPoint, + eEventAnimPlay, + eEventAnimPlayLoop, + eEventAnimStop, + eEventAnimPause, + eEventAnimResume, + eEventAnimTogglePause, + eEventAnimPlayRandom, + eEventAnimPlayMaybe, + eEventSetSpeed, + eEventAccelerate, + eEventMoveToTarget, + eEventSwingerFollow, + eEventShaggyMount, + eEventShaggyWitchDrop, + eEventShaggySwap, + eEventShaggyState, + eEventShaggyAction, + eEventEnterEntity, + eEventExitEntity, + eEventEnterEntityFLAG, + eEventExitEntityFLAG, + eEventDrivenby, + eEventFollowTarget, + eEventFaceTarget, + eEventWatchTarget, + eEventShaggyCollideOnly, + eEventShaggy1_ThrowTarget, + eEventShaggy8_CallEnable, + eEventShaggy8_CallDisable, + eEventShaggy8_SetMagnet, + eEventShaggy8_ClearMagnet, + eEventStartMoving, + eEventStopMoving, + eEventSwoosh, + eEventShaggySetDown, + eEventShaggyGrabEnable, + eEventShaggyGrabDisable, + eEventShaggyGrabbed, + eEventShaggyThrown, + eEventVilDoAction, + eEventGangDoBossAction, + eEventVilFakeChaseOn, + eEventVilFakeChaseOff, + eEventBossMMPushButton, + eEventVilReport_DecayComplete, + eEventVilGuardWidget, + eEventTextureAnimateOn, + eEventTextureAnimateOff, + eEventTextureAnimateToggle, + eEventColorEffectOn, + eEventColorEffectOff, + eEventColorEffectToggle, + eEventSetTextureAnimGroup, + eEventSetTextureAnimSpeed, + eEventTextureAnimateStep, + eEventEmit, + eEventEmitted, + eEventTranslucentOn, + eEventTranslucentOff, + eEventTranslucentToggle, + eEventVilGangTalkOn, + eEventVilGangTalkOff, + eEventGivePowerUp, + eEventUnlockR001, + eEventUnlockS001, + eEventUnlockE001, + eEventUnlockF001, + eEventDisableGroupContents, + eEventShaggyPhysHack, + eEventOccludeOn, + eEventOccludeOff, + eEventWaveSetLinear, + eEventWaveSetRipple, + eEventSituationLaugh, + eEventSituationBossBattleGreenGhost, + eEventSituationBossBattleRedBeard, + eEventSituationBossBattleMasterMind, + eEventSituationBossBattleBlacknight, + eEventSituationPlayerScare, + eEventSituationPlayerSafe, + eEventSituationPlayerDanger, + eEventSituationPlayerChaseBegin, + eEventSituationPlayerChaseEnd, + eEventSituationPlayerSeeShaggy, + eEventSituationPlayerSeeFood, + eEventSituationPlayerSeeToken, + eEventSituationPlayerSeeScoobySnack, + eEventSituationPlayerSeePowerup, + eEventSituationPlayerSeeMonster, + eEventSituationPlayerSuccess, + eEventSituationPlayerFailure, + eEventDispatcher_ShowHud, + eEventDispatcher_HideHud, + eEventDispatcher_FadeOut, + eEventSetRain, + eEventSetSnow, + eEventShaggyMowerStopMode, + eEventScriptReset, + eEventWaitForInput, + eEventPlayMovie, + eEventDefeatedMM, + eEventDispatcher_SetGameState_GameStats, + eEventPlayMusic, + eEventForward, + eEventReverse, + eEventPlayerRumbleTest, + eEventPlayerRumbleLight, + eEventPlayerRumbleMedium, + eEventPlayerRumbleHeavy, + eEventDispatcherScreenAdjustON, + eEventDispatcherScreenAdjustOFF, + eEventSetSkyDome, + eEventConnectToChild, + eEventDuploWaveBegin, + eEventDuploWaveComplete, + eEventDuploNPCBorn, + eEventDuploNPCKilled, + eEventDuploExpiredMaxNPC, + eEventDuploPause, + eEventDuploResume, + eEventSetGoo, + eEventNPCScript_ScriptBegin, + eEventNPCScript_ScriptEnd, + eEventNPCScript_ScriptReady, + eEventNPCScript_Halt, + eEventNPCScript_SetPos, + eEventNPCScript_SetDir, + eEventNPCScript_LookNormal, + eEventNPCScript_LookAlert, + eEventNPCScript_FaceWidget, + eEventNPCScript_FaceWidgetDone, + eEventNPCScript_GotoWidget, + eEventNPCScript_GotoWidgetDone, + eEventNPCScript_AttackWidget, + eEventNPCScript_AttackWidgetDone, + eEventNPCScript_FollowWidget, + eEventNPCScript_PlayAnim, + eEventNPCScript_PlayAnimDone, + eEventNPCScript_LeadPlayer, + eEventSetText, + eEventStartConversation, + eEventEndConversation, + eEventSwitch, + eEventAddText, + eEventClearText, + eEventOpenTBox, + eEventCloseTBox, + eEventTalkBox_OnSignal0, + eEventTalkBox_OnSignal1, + eEventTalkBox_OnSignal2, + eEventTalkBox_OnSignal3, + eEventTalkBox_OnSignal4, + eEventTalkBox_OnSignal5, + eEventTalkBox_OnSignal6, + eEventTalkBox_OnSignal7, + eEventTalkBox_OnSignal8, + eEventTalkBox_OnSignal9, + eEventTalkBox_StopWait, + eEventTalkBox_OnStart, + eEventTalkBox_OnStop, + eEventHit_Melee, + eEventHit_BubbleBounce, + eEventHit_BubbleBash, + eEventHit_BubbleBowl, + eEventHit_PatrickSlam, + eEventHit_Throw, + eEventHit_PaddleLeft, + eEventHit_PaddleRight, + eEventTaskBox_Initiate, + eEventTaskBox_SetSuccess, + eEventTaskBox_SetFailure, + eEventTaskBox_OnAccept, + eEventTaskBox_OnDecline, + eEventTaskBox_OnComplete, + eEventGenerateBoulder, + eEventLaunchBoulderAtWidget, + eEventLaunchBoulderAtPoint, + eEventLaunchBoulderAtPlayer, + eEventDuploSuperDuperDone, + eEventDuploDuperIsDoner, + eEventBusStopSwitchChr, + eEventGroupUpdateTogether, + eEventSetUpdateDistance, + eEventTranslLocalX, + eEventTranslLocalY, + eEventTranslLocalZ, + eEventTranslWorldX, + eEventTranslWorldY, + eEventTranslWorldZ, + eEventRotLocalX, + eEventRotLocalY, + eEventRotLocalZ, + eEventRotWorldX, + eEventRotWorldY, + eEventRotWorldZ, + eEventTranslLocalXDone, + eEventTranslLocalYDone, + eEventTranslLocalZDone, + eEventTranslWorldXDone, + eEventTranslWorldYDone, + eEventTranslWorldZDone, + eEventRotLocalXDone, + eEventRotLocalYDone, + eEventRotLocalZDone, + eEventRotWorldXDone, + eEventRotWorldYDone, + eEventRotWorldZDone, + eEventCount1, + eEventCount2, + eEventCount3, + eEventCount4, + eEventCount5, + eEventCount6, + eEventCount7, + eEventCount8, + eEventCount9, + eEventCount10, + eEventCount11, + eEventCount12, + eEventCount13, + eEventCount14, + eEventCount15, + eEventCount16, + eEventCount17, + eEventCount18, + eEventCount19, + eEventCount20, + eEventSetState, + eEventEnterSpongeBob, + eEventEnterPatrick, + eEventEnterSandy, + eEventExitSpongeBob, + eEventExitPatrick, + eEventExitSandy, + eEventNPCSpecial_PlatformSnap, + eEventNPCSpecial_PlatformFall, + eEventGooSetWarb, + eEventGooSetFreezeDuration, + eEventGooMelt, + eEventSetStateRange, + eEventSetStateDelay, + eEventSetTransitionDelay, + eEventNPCFightOn, + eEventNPCFightOff, + eEventNPCSplineOKOn, + eEventNPCSplineOKOff, + eEventNPCKillQuietly, + eEventHitHead, + eEventHitUpperBody, + eEventHitLeftArm, + eEventHitRightArm, + eEventHitLeftLeg, + eEventHitRightLeg, + eEventHitLowerBody, + eEventGiveCurrLevelSocks, + eEventGiveCurrLevelPickup, + eEventSetCurrLevelSocks, + eEventSetCurrLevelPickup, + eEventTalkBox_OnYes, + eEventTalkBox_OnNo, + eEventHit_Cruise, + eEventDuploKillKids, + eEventTalkBox_OnSignal10, + eEventTalkBox_OnSignal11, + eEventTalkBox_OnSignal12, + eEventTalkBox_OnSignal13, + eEventTalkBox_OnSignal14, + eEventTalkBox_OnSignal15, + eEventTalkBox_OnSignal16, + eEventTalkBox_OnSignal17, + eEventTalkBox_OnSignal18, + eEventTalkBox_OnSignal19, + eEventSpongeballOn, + eEventSpongeballOff, + eEventLaunchShrapnel, + eEventNPCHPIncremented, + eEventNPCHPDecremented, + eEventNPCSetActiveOn, + eEventNPCSetActiveOff, + eEventPlrSwitchCharacter, + eEventLevelBegin, + eEventSceneReset, + eEventSceneEnter, + eEventSituationDestroyedTiki, + eEventSituationDestroyedRobot, + eEventSituationSeeWoodTiki, + eEventSituationSeeLoveyTiki, + eEventSituationSeeShhhTiki, + eEventSituationSeeThunderTiki, + eEventSituationSeeStoneTiki, + eEventSituationSeeFodder, + eEventSituationSeeHammer, + eEventSituationSeeTarTar, + eEventSituationSeeGLove, + eEventSituationSeeMonsoon, + eEventSituationSeeSleepyTime, + eEventSituationSeeArf, + eEventSituationSeeTubelets, + eEventSituationSeeSlick, + eEventSituationSeeKingJellyfish, + eEventSituationSeePrawn, + eEventSituationSeeDutchman, + eEventSituationSeeSandyBoss, + eEventSituationSeePatrickBoss, + eEventSituationSeeSpongeBobBoss, + eEventSituationSeeRobotPlankton, + eEventUIChangeTexture, + eEventNPCCheerForMe, + eEventFastVisible, + eEventFastInvisible, + eEventZipLineMount, + eEventZipLineDismount, + eEventTarget, + eEventFire, + eEventCameraFXShake, + eEventBulletTime, + eEventThrown, + eEventUpdateAnimMatrices, + eEventEnterCruise, + eEventExitCruise, + eEventCruiseFired, + eEventCruiseDied, + eEventCruiseAddLife, + eEventCruiseSetLife, + eEventCruiseResetLife, + eEventCameraCollideOff, + eEventCameraCollideOn, + eEventOnSliding, + eEventOffSliding, + eEventTimerSet, + eEventTimerAdd, + eEventNPCForceConverseStart, + eEventMakeASplash, + eEventCreditsStart, + eEventCreditsStop, + eEventCreditsEnded, + eEventBubbleWipe, + eEventSetLightKit, + eEventSetOpacity, + eEventTakeSocks, + eEventDispatcherAssert, + eEventBorn, + eEventPlatPause, + eEventPlatUnpause, + eEventStoreOptions, + eEventRestoreOptions, + eEventCount }; void zEntEvent(xBase* from, xBase* to, unsigned int toEvent); diff --git a/src/Core/x/xLinkAsset.h b/src/Core/x/xLinkAsset.h index 48c94b397..1c03602b7 100644 --- a/src/Core/x/xLinkAsset.h +++ b/src/Core/x/xLinkAsset.h @@ -3,12 +3,12 @@ struct xLinkAsset { - unsigned short srcEvent; - unsigned short dstEvent; - unsigned int dstAssetID; - float param[4]; - unsigned int paramWidgetAssetID; - unsigned int chkAssetID; + unsigned short srcEvent; + unsigned short dstEvent; + unsigned int dstAssetID; + float param[4]; + unsigned int paramWidgetAssetID; + unsigned int chkAssetID; }; #endif \ No newline at end of file diff --git a/src/Core/x/xScene.h b/src/Core/x/xScene.h index 5216b6fdd..37d8b97b4 100644 --- a/src/Core/x/xScene.h +++ b/src/Core/x/xScene.h @@ -3,7 +3,6 @@ struct xScene { - }; #endif \ No newline at end of file diff --git a/src/Game/zEvent.cpp b/src/Game/zEvent.cpp index 27f50951e..630c04dca 100644 --- a/src/Game/zEvent.cpp +++ b/src/Game/zEvent.cpp @@ -3,6 +3,7 @@ extern char* sEventTable[eEventCount]; -char* zEventName(unsigned int eventEnum) { +char* zEventName(unsigned int eventEnum) +{ return sEventTable[eventEnum]; } \ No newline at end of file diff --git a/src/Game/zEvent.h b/src/Game/zEvent.h index 093b15e0a..94fb6173b 100644 --- a/src/Game/zEvent.h +++ b/src/Game/zEvent.h @@ -1,7 +1,6 @@ #ifndef ZEVENT_H #define ZEVENT_H - char* zEventName(unsigned int eventEnum); #endif \ No newline at end of file