AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,848 Commits 26 Branches 15 Tags 52 MiB
Commit Graph

2504 Commits

Author SHA1 Message Date
Luke Street 4ada5a00cb CElitePirate: Nearly complete implementation 2020-03-29 03:28:14 -04:00
Jack Andersen 3e07a06355 Merge branch 'master' of ssh://git.axiodl.com:6431/AxioDL/urde 2020-03-28 21:21:53 -10:00
Jack Andersen d1c2ae71c2 Ensure consistent override usage in TCachedToken 2020-03-28 21:20:44 -10:00
Jack Andersen eefb975f23 Merge branch 'noexcept' of https://github.com/lioncash/urde 2020-03-28 21:08:43 -10:00
Lioncash fda08db9b1 CHudVisorBeamMenu: Dehardcode array sizes 
Same behavior, but queries the container for the size rather than
hardcoding it in loop bounds.
 2020-03-29 03:08:41 -04:00
Lioncash 413483a996 CHudFreeLookInterfaceXRay: Assign free look and control held flags in SetFreeLookState() 
GM8Ev0 does this.
 2020-03-29 02:08:51 -04:00
Lioncash ad07b993c8 CHudFreeLookInterface: Collapse conditional within SetFreeLookState() 
Same behavior, less code.
 2020-03-29 02:03:20 -04:00
Lioncash 59fbefbd58 CGuiWidget: Provide names for all function prototypes 
Makes parameter introspection nicer with IDEs and also renames ambiguous
"v" names to something more self-descriptive.
 2020-03-29 01:52:23 -04:00
Lioncash 764dac0adc CToken: Add missing override specifiers 2020-03-28 05:55:17 -04:00
Phillip Stephens 0db6f96a17
Merge pull request #279 from lioncash/constexpr 
CScannableParameters: Mark CScannableParameters as constexpr
 2020-03-27 23:54:26 -07:00
Lioncash 54c6122cbd CToken: Mark move assignment operator as noexcept 
Allows containers and anything using std::move_if_noexcept to perform a
move instead of a copy.
 2020-03-27 20:56:04 -04:00
Lioncash 2558da714e Runtime: Remove unnecessary smart pointer .get() calls 
Same behavior, less code to read.
 2020-03-27 20:50:45 -04:00
Lioncash 194cdf145f Runtime: Use nullptr where applicable 
Same behavior, but no magic 0 value.

While we're in the same area, we can do minor cosmetic changes.
 2020-03-27 20:18:54 -04:00
Lioncash 05988ce31c CScannableParameters: Mark CScannableParameters as constexpr 
This only contains a single member, so this can trivially be marked
constexpr.
 2020-03-27 20:07:33 -04:00
Phillip Stephens e0fe365dfd
Merge pull request #278 from lioncash/explicit 
General: Make use of explicit constructors where applicable
 2020-03-27 14:10:19 -07:00
Lioncash 241a66dc0a General: Make use of explicit constructors where applicable 
Gets rid of potential error prone implicitly constructing constructors.
 2020-03-27 06:00:17 -04:00
Luke Street 4f7e0a85a3 CElitePirate: More function implementations 2020-03-27 02:47:34 -04:00
Lioncash e46a37e893 MP1: Make use of std::array where applicable 
Same behavior, stronger typing, and allows eliminating hardcoded sizes
in some places.
 2020-03-27 01:07:29 -04:00
Lioncash a77b9cb609 MP1: Join namespaces 
Same behavior, less code.
 2020-03-27 01:02:35 -04:00
Luke Street 108fd502bf CElitePirate/CFlyingPirate: Updates from symbol map 2020-03-26 21:42:18 -04:00
Luke Street 0886a39d81 CElitePirate: DoUserAnimEvent; create CShockWave 2020-03-26 18:09:50 -04:00
Luke Street 6150548e91 CElitePirate: Finish implementing AcceptScriptMsg 2020-03-26 15:24:56 -04:00
Lioncash fcf70aeb2a CGuiWidgetIdDB: Remove redundant std::make_pair funcs 
Same behavior, less code.
 2020-03-26 03:55:28 -04:00
Luke Street c33703bd93 CElitePirate: Start impl; create CGrenadeLauncher 2020-03-26 03:30:54 -04:00
Lioncash 74600588fa Add missing includes pt.2 
Some missing includes that actually need to be present.
 2020-03-26 03:14:03 -04:00
Lioncash be6b5406a9 CPatterned/ScriptLoader: Convert function typedefs to using aliases 
Same thing, but more readable.
 2020-03-26 03:09:56 -04:00
Lioncash d9a9e0f51e CEnvFxManager: Take std::vector by value and std::move 
Same behavior, but allows calling code to move into the parameter,
avoiding copies.
 2020-03-26 02:56:10 -04:00
Lioncash dd76e73e11 ITweak: Default virtual destructor 
Same behavor, but allows the destructor to be trivial.
 2020-03-26 01:14:41 -04:00
Lioncash 51afa94e8c Add missing includes where applicable 
Resolves a few required dependencies
 2020-03-26 01:10:55 -04:00
Lioncash 4169e3d91d CSnakeWeedSwarm: Mark several member functions as const 
These don't alter instance state, so they can be const member functions.
 2020-03-26 01:05:32 -04:00
Lioncash 43e0d16c5d CSnakeWeedSwarm: Use emplace_back in CreateBoid() 
Same behavior, but with in-place construction instead.
 2020-03-26 01:00:29 -04:00
Lioncash 2164854e87 CVisorFlare: Pass flares by value and use std::move 
Same behavior, but allows calling code to move into the parameter and
avoid copies entirely.
 2020-03-26 00:32:49 -04:00
Lioncash 477c5770c6 rstl: Add [[nodiscard]] to interface functions where applicable 
Not using the result of these functions is considered a bug and should
be signified as such by a compiler.
 2020-03-25 23:43:20 -04:00
Lioncash f4b3fb947e CScanDisplay: Make constructor explicit 
Prevents error-prone implicit construction from occurring.
 2020-03-25 20:46:08 -04:00
Lioncash 3c17336fb0 CSaveWorld: Make constructor explicit 
Prevents error-prone implicit constructions from occurring.
 2020-03-25 20:42:21 -04:00
Phillip Stephens 566c356612 Initial ElitePirate imps 2020-03-25 18:14:15 -04:00
Phillip Stephens e5df609673 CElitePirate: Initial stubbing 2020-03-25 18:14:15 -04:00
Lioncash 98b9556f3e CProjectileWeapon: Return std::nullopt instead of {} where applicable 
Prevents some implementations from zeroing out their internal buffer
unnecessarily (libstdc++ and libc++).
 2020-03-25 16:03:09 -04:00
Lioncash 6365f2ee1c CPowerBomb: Return std::nullopt in GetTouchBounds() 
Avoids unnecessary zeroing of the internal buffer of std::optional in
some implementations (libstdc++ and libc++).
 2020-03-25 15:56:59 -04:00
Lioncash cda5a48970 CRelayTracker: Add names to function prototypes 
Allows IDE introspections at call sites to function nicer.
 2020-03-25 15:53:49 -04:00
Lioncash c5c888daa6 CRippleManager: Rename Ripples() to GetRipples() 
Allows const overloading to work and prevents compilation errors from
occurring if the constness ever changes.
 2020-03-25 04:22:34 -04:00
Lioncash 4f9e53933e CPathFindArea: Amend bitset size 
The previous commit meant to contain this size.
 2020-03-25 04:15:55 -04:00
Lioncash d0292fdc5d CPathFindArea: Make use of std::bitmap with CPFBitSet 
Same behavior, but without the need to roll the operations ourselves.
 2020-03-25 04:12:55 -04:00
Lioncash 81dcc0604b CParticleElectric: Make use of std::array where applicable 
Prevents array to pointer decay.
 2020-03-25 03:58:37 -04:00
Lioncash c61bee13db CParticleElectric: Add parameters to function prototypes 
Makes the interface more self-documenting.
 2020-03-25 03:58:37 -04:00
Luke Street c08b5a4c98 CFlyingPirate: Fix Aqua Pirates 2020-03-25 03:48:10 -04:00
Luke Street da648b18d8 CSpankWeed: Fix collision manager null deref 2020-03-25 03:47:56 -04:00
Lioncash 90d61ae7ed CAutoMapper: Add names to function prototypes 2020-03-25 03:03:24 -04:00
Luke Street 7ee2a3b912
Merge pull request #254 from AxioDL/flyingpirate 
CFlyingPirate implementation
 2020-03-25 03:01:10 -04:00
Luke Street 815d83d843 CFlyingPirateRagDoll: Fix particles & length constraints 2020-03-25 02:57:57 -04:00
Lioncash 51c1ffecd6 CActorContraption: Add names to parameters in prototypes 
Makes it more self-documenting from the interface alone.
 2020-03-25 02:46:22 -04:00
Lioncash 20548ddeaa CCameraSpline: Make constructor explicit 
Same behavior, but prevents error-prone implicit constructions from
occurring.
 2020-03-25 02:41:07 -04:00
Lioncash f1fce0f631 CCameraSpline: Add names to prototypes 
More self-documenting from the interface alone.
 2020-03-25 02:40:03 -04:00
Lioncash 7bced5308b CCameraManager: Add names to parameters in prototypes 
More self documenting and allows IDE inspections to be better.
 2020-03-25 02:33:34 -04:00
Lioncash a862b792de CBoneTracking: Make use of parameter in SetActive() 
GM8E v0 makes use of the parameter and doesn't always set the value to
true.
 2020-03-25 02:12:56 -04:00
Luke Street 556f870dc8 Merge branch 'pr-277' 2020-03-25 02:09:09 -04:00
Luke Street f91536ebee Merge branch 'pr-276' 2020-03-25 02:09:05 -04:00
Luke Street 8314d5b6ef Merge branch 'pr-255' 2020-03-25 02:09:02 -04:00
Luke Street 3734a09ed3 CGuiWidget: Make GetIsFinishedLoading non-const 2020-03-25 02:01:47 -04:00
Lioncash 40fc3f9dd8 CModelBoo: Remove usages of const_cast 
Many functions are modifying internals of CBooModel and const-casting
is performed in order to work around functions being const when they
really shouldn't be.

This amends the function signatures in order to allow these functions to
exist without const_cast, making code much nicer to read.
 2020-03-25 02:01:46 -04:00
Lioncash e38d86fe59 CPhysicsActor: Amend constructor names for CPhysicsState 
These were previously undescriptive names despite the member variables
being fully named. We can amend the parameters here.
 2020-03-25 01:56:58 -04:00
Lioncash 81ae6bdda2 CPhysicsActor: Add names to parameters in prototypes 
Allows better introspection in IDEs and makes the interface itself more
self-documenting.
 2020-03-25 01:54:17 -04:00
Lioncash 22036859db CPASDatabase: Add names to parameters in prototypes 
Makes IDE introspection better.
 2020-03-25 01:43:27 -04:00
Lioncash fad980dc19 CBodyController: Make HasBodyInfo() accept a const reference 
This only queries state and doesn't actually modify it.
 2020-03-25 01:39:08 -04:00
Lioncash f875bdf024 CBodyController: Add names to parameters in interface 
Makes the interface more self-documenting and allows IDEs to perform
better introspection at call sites.
 2020-03-25 01:36:54 -04:00
Lioncash ab6c45c7a8 CWorld: Provide parameter names for prototypes 
More self-documenting from the interface alone and allows IDE
inspections at callsites to be better.
 2020-03-25 01:27:56 -04:00
Lioncash 985b85d9db CAudioGroupSet: Eliminate undefined behavior within LoadData() 
Eliminates aliasing violations.
 2020-03-25 01:14:27 -04:00
Lioncash 855fc0ced9 CAreaOctTree: Add names to parameters in prototypes 
Allows IDEs to perform better inspections at call sites.
 2020-03-25 00:45:33 -04:00
Lioncash f2b1e44ee1 CEntity: Rename ConnectionList() to GetConnectionList() 
Allows const overloading to function, preventing compilation errors from
occuring across constness changes.
 2020-03-24 21:29:44 -04:00
Lioncash 8644b8393b CEntity: Add parameter names to interface 
Allows IDEs to perform better parameter inspection.
 2020-03-24 21:28:15 -04:00
Lioncash f323638fb7 CCollisionActor: Provide parameter names in interface where applicable 
Makes the interface more self-documenting at a glance and allows IDEs to
do better parameter inspection at call sites.
 2020-03-24 21:16:30 -04:00
Phillip Stephens e8f0d29a3b
Merge pull request #275 from lioncash/const-over 
CPlayerState: Rename HealthInfo() to GetHealthInfo()
 2020-03-24 17:45:59 -07:00
Phillip Stephens 01a0c68db9
Merge pull request #274 from lioncash/health 
CGameState: Set HP value in LoadGameFileState()
 2020-03-24 17:45:43 -07:00
Phillip Stephens c72f388929
Merge pull request #273 from lioncash/team-uninit 
CTeamAiMgr: Initialize x90_timeSinceMelee and x90_timeSinceRanged to 0.0f in constructor
 2020-03-24 17:45:29 -07:00
Phillip Stephens 9aece39445
Merge pull request #272 from lioncash/uninit 
CFluidPlane: Always initialize mul to 0.0f in CalculateRippleIntensity()
 2020-03-24 17:45:15 -07:00
Lioncash ef93a601eb CPlayerState: Rename HealthInfo() to GetHealthInfo() 
Allows const overloading to function and prevents compilation errors
from occurring if constness changes through future changes of any sort.
 2020-03-24 06:20:37 -04:00
Lioncash 9fba0bf50b CGameState: Set HP value in LoadGameFileState() 
GM8E v0 stores the HP value of the loaded player state into the returned
GameFileStateInfo instance.

This prevents the health member from being returned uninitialized.
 2020-03-24 06:14:26 -04:00
Lioncash 64d0563872 CTeamAiMgr: Initialize x90_timeSinceMelee and x90_timeSinceRanged to 0.0f in constructor 
Makes all class members have a deterministic initial state.
 2020-03-24 05:19:05 -04:00
Lioncash f416a814a1 CFluidPlane: Always initialize mul to 0.0f in CalculateRippleIntensity() 
Avoids a -Wmaybe-uninitialized warning.
 2020-03-24 05:14:01 -04:00
Lioncash 35ea097028 CPlayer: Add parameter names to prototypes 
Makes them more self-documenting from the interface alone and also
allows IDEs to perform better parameter and argument inspection.
 2020-03-24 04:33:54 -04:00
Phillip Stephens fc87bd8022
Merge pull request #270 from lioncash/brace 
CPlayer: Un-nest code within FinishNewScan()
 2020-03-23 23:29:59 -07:00
Phillip Stephens af2738c7b1
Merge pull request #269 from lioncash/sconv 
CParticleSwoosh: Resolve sign-conversion warnings
 2020-03-23 23:29:44 -07:00
Phillip Stephens 00691c1175
Merge pull request #268 from lioncash/intconst 
CIntElement: Remove const_cast
 2020-03-23 23:29:26 -07:00
Phillip Stephens d62c163086
Merge pull request #267 from lioncash/iface 
CAnimData: Give names to function prototype parameters
 2020-03-23 23:29:12 -07:00
Phillip Stephens bb9359c579
Merge pull request #266 from lioncash/make 
CParticleElectric: Use std::make_unique where applicable
 2020-03-23 23:28:59 -07:00
Phillip Stephens 498df6588b
Merge pull request #265 from lioncash/type 
RetroTypes: Minor adjustments
 2020-03-23 23:28:38 -07:00
Phillip Stephens 734f1d2db5
Merge pull request #264 from lioncash/move 
General: Remove unnecessary std::move calls
 2020-03-23 23:28:24 -07:00
Phillip Stephens 425f8d4cc8
Merge pull request #263 from lioncash/array3 
CDecal: Make use of std::array where applicable
 2020-03-23 23:28:08 -07:00
Phillip Stephens dbbf9e33fd
Merge pull request #262 from lioncash/nullopt 
CBeamProjectile: Explicitly return std::nullopt in GetTouchBounds()
 2020-03-23 23:27:54 -07:00
Phillip Stephens 1c841d10f8
Merge pull request #261 from lioncash/const7 
CBomb: Make file-scope material filter constexpr
 2020-03-23 23:27:39 -07:00
Phillip Stephens dc6954491b
Merge pull request #260 from lioncash/array2 
CPlayerState: Make g_typeNameMap a compile-time array
 2020-03-23 23:27:19 -07:00
Phillip Stephens 4dc73e56a0
Merge pull request #259 from lioncash/default 
CPlayerState: Default CPowerUp constructor and also remove undefined behavior
 2020-03-23 23:27:06 -07:00
Phillip Stephens 2e43266714
Merge pull request #258 from lioncash/emplaced 
General: Make use of emplace_back where applicable
 2020-03-23 23:26:51 -07:00
Phillip Stephens 6c7fdc11a0
Merge pull request #257 from lioncash/virt 
CWorld: Rename IMapWorld to IGetMapWorld()
 2020-03-23 23:26:35 -07:00
Phillip Stephens 6c9d6bc38b
Merge pull request #256 from lioncash/binding 
CActorContraption: Make use of structured bindings where applicable
 2020-03-23 23:26:19 -07:00
Lioncash 70c51c3a86 CPlayer: Un-nest code within FinishNewScan() 
Makes this function much nicer to read.
 2020-03-23 02:44:44 -04:00
Lioncash 7a29f4bf52 CParticleSwoosh: Resolve sign-conversion warnings 
Resolves trivial warnings within loop condition checks.
 2020-03-23 00:38:23 -04:00
Lioncash a2517a504e CIntElement: Remove const_cast 
CIESampleAndHold caches values internally for use later in a non-visible
manner to the user of the class. This is a good place for mutable to be
used.

This improves the readability of the GetValue() implementation.
 2020-03-22 06:05:59 -04:00
Lioncash cd184daeba CAnimData: Give names to function prototype parameters 
Provides at least some form of name for all functions in the interface.
This allows IDEs to perform proper name inspection (as well as being
slightly more informative to the reader in some cases).
 2020-03-22 05:42:11 -04:00
Lioncash 34a0e9f23d CParticleElectric: Use std::make_unique where applicable 
Makes it obvious that std::unique_ptr instances are being created within the
implementation code.
 2020-03-22 05:27:49 -04:00
Lioncash 8cd27ac822 RetroTypes: Take types in comparisons by value where applicable 
CAssetId, TEditorId, and TUniqueId are all small enough to fit within
registers as is, so we can take these types by value, which allows for
eliminating unnecessary memory referencing.
 2020-03-22 04:44:45 -04:00
Lioncash 6ed2415f6f RetroTypes: Mark return types as [[nodiscard]] where applicable 
Given the types within this header are quite widely used within the
codebase, it's worth it in this scenario to annotate functions that
expect their return value to be used with the [[nodiscard]] attribute.
 2020-03-22 04:43:26 -04:00
Lioncash 0e54861455 General: Remove unnecessary std::move calls 
There's no real need to std::move a primitive type. A copy will be
performed either way. We can remove std::move in this case to improve
readability.
 2020-03-22 00:56:04 -04:00
Lioncash 2b4b7c36a5 CDecal: Make use of std::array where applicable 
Same behavior, but with stronger-typing and no implicit array to pointer
decay.
 2020-03-21 01:53:41 -04:00
Lioncash bf590dd855 CBeamProjectile: Explicitly return std::nullopt in GetTouchBounds() 
Allows some implementations to completely avoid zeroing out the internal
buffer within the std::optional instance.
 2020-03-21 01:46:59 -04:00
Lioncash 5b7e440ff7 CBomb: Make file-scope material filter constexpr 
Allows the data to be placed into the read-only segment.
 2020-03-21 01:42:46 -04:00
Lioncash 83c9af9153 CPlayerState: Make g_typeNameMap a compile-time array 
While useful as a map, this causes an allocation that occurs during
program start and lasts until the program terminates, even if the
relevant code is never executed.

Given the total number of elements is quite small, we can convert this
into a compile-time array and perform the lookup with that instead.
While we're at it, we can eliminate an unnecessary second lookup into
said array by reusing the iterator from the first find.
 2020-03-21 00:57:05 -04:00
Lioncash ff703b1189 CPlayerState: Remove undefined behavior within CPlayerState constructor 
Type-punning via a union is currently undefined behavior according to
the C++ standard, so we can use std::memcpy instead to accomplish the
same thing.
 2020-03-21 00:39:40 -04:00
Lioncash ba6f55a928 CPlayerState: Default CPowerUp constructor 
Same behavior but allows the constructor to be considered trivial.

While we're at it, we can make the constructors constexpr, considering
the data structure only holds two primitives.
 2020-03-21 00:34:16 -04:00
Lioncash fc4df76afc General: Make use of emplace_back where applicable 
Allows for in-place construction. Also results in less code to read in
certain usages.
 2020-03-21 00:30:12 -04:00
Lioncash 8a9e76a345 CWorld: Rename IMapWorld to IGetMapWorld() 
Allows const overloading to function properly and prevents potential
compilation errors from occurring if constness on functions is ever
changed.
 2020-03-20 23:27:07 -04:00
Lioncash 0cc8e76d64 CActorContraption: Make use of structured bindings where applicable 
Same behavior, but with better names than `first` or `second`.
 2020-03-20 23:13:29 -04:00
Luke Street 6d757f021f CFlyingPirateRagDoll: Implement Update 2020-03-18 04:50:41 -04:00
Luke Street 851304ded9 CFlyingPirate: Finish Think implementation 2020-03-18 02:53:53 -04:00
Phillip Stephens eb9efbf8c3
Initial PATH support for MP2 2020-03-17 23:12:43 -07:00
Luke Street 642bf379ce CFlyingPirate: Add CPathFindSearch flags 2020-03-18 01:39:32 -04:00
Luke Street 6f89dbb240 CFlyingPirate: More small fixes 2020-03-18 01:20:24 -04:00
Luke Street 932615593e CFlyingPirateRagDoll: Implement PreRender, Prime 2020-03-18 01:20:24 -04:00
Luke Street 57386e6269 CFlyingPirate: Small fixes 2020-03-18 01:19:23 -04:00
Luke Street 8897d38c6a CFlyingPirate: Fix Lurk state delay 2020-03-18 01:19:23 -04:00
Luke Street 651e28e921 CFlyingPirate: Fix TargetPatrol 2020-03-18 01:19:23 -04:00
Luke Street 26ae8beb74 CFlyingPirate: Small fixes 2020-03-18 01:19:23 -04:00
Luke Street 1bcd0916ca CFlyingPirate: Fixes; implement all functions 2020-03-18 01:18:48 -04:00
Luke Street 13d8c3fdd1 CFlyingPirate: First draft almost done 2020-03-18 01:18:48 -04:00
Luke Street 11ea9d3aa6 CFlyingPirate: More method implementations 2020-03-18 01:18:48 -04:00
Luke Street d4982270e8 CFlyingPirate: Start implementing methods 2020-03-18 01:18:48 -04:00
Luke Street 5765fd8951 CFlyingPirate: Method definitions & CFlyingPirateRagDoll constructor 2020-03-18 01:18:48 -04:00
Luke Street e925dc2628 CFlyingPirate: Start implementation 2020-03-18 01:18:48 -04:00
Luke Street 36ac0a8d78 CStateManager: Fix CMapWorld const reference 2020-03-18 01:18:00 -04:00
Luke Street 9e05819f05
Merge pull request #253 from lioncash/const4 
CRelayTracker: Make HasRelay() a const member function
 2020-03-18 01:09:31 -04:00
Luke Street f6e2f196ce
Merge pull request #252 from lioncash/resize2 
CRumbleVoice: Resize vectors within constructor initializer list
 2020-03-18 01:09:09 -04:00
Luke Street 92c9ec02e5
Merge pull request #251 from lioncash/rumble 
CInputGenerator: Make use of std::array where applicable
 2020-03-18 01:08:12 -04:00
Luke Street dcf96e9826
Merge pull request #250 from lioncash/statemgr 
CStateManager: Make use of std::array where applicable
 2020-03-18 01:07:21 -04:00
Luke Street 93be0fbc72
Merge pull request #249 from lioncash/list 
CObjectList: Make use of std::array where applicable
 2020-03-18 01:05:42 -04:00
Luke Street 44325a5ad4
Merge pull request #248 from lioncash/slider 
CGuiSliderGroup: Make use of std::array where applicable
 2020-03-18 01:05:30 -04:00
Luke Street a7b2ad15dc
Merge pull request #247 from lioncash/sign-mismatch 
CFlameThrower: Resolve sign-conversion warnings in DoCollisionCheck()
 2020-03-18 01:05:16 -04:00
Luke Street 66c321d4a8
Merge pull request #246 from lioncash/def 
CCollisionInfoList: Simplify definition of begin() and end()
 2020-03-18 01:04:19 -04:00
Luke Street b13a6b491b
Merge pull request #245 from lioncash/drawstring 
CDrawStringOptions: Resize vector within constructor
 2020-03-18 01:04:08 -04:00
Luke Street 7c8de88fd7
Merge pull request #244 from lioncash/pane 
CAui*: Make use of std::array where applicable
 2020-03-18 01:03:50 -04:00
Lioncash cb4884fcef CRelayTracker: Make HasRelay() a const member function 
While we're at it, we can make use of HasRelay() internally where
applicable to simplify code a little bit.
 2020-03-18 01:03:35 -04:00
Luke Street dcc7affb8f
Merge pull request #243 from lioncash/light 
CLight: Minor cleanup
 2020-03-18 01:03:04 -04:00
Luke Street b3b8c33006
Merge pull request #242 from lioncash/const2 
CMapWorld: Minor changes
 2020-03-18 01:01:45 -04:00
Luke Street cecac3472a
Merge pull request #241 from lioncash/float 
CMapArea: Minor changes
 2020-03-18 01:00:20 -04:00
Luke Street a1c8867e83
Merge pull request #240 from lioncash/move 
CMainFlow: std::move shared_ptr in SetGameState
 2020-03-18 00:59:24 -04:00
Luke Street 18ef68df2a
Merge pull request #239 from lioncash/line 
CLineRenderer: Minor changes
 2020-03-18 00:58:46 -04:00
Luke Street dc0c721af7
Merge pull request #238 from lioncash/array2 
CFogVolumeFilter: Make use of std::array where applicable
 2020-03-18 00:58:28 -04:00
Luke Street fcf7044bf2 Merge remote-tracking branch 'github/recovery' 2020-03-18 00:45:49 -04:00
Lioncash 488e377374 CRumbleVoice: Collapse repeated std::max calls in GetIntensity() 
We can make use of the std::max overload that takes an initializer list.
 2020-03-18 00:34:29 -04:00
Lioncash 71399d0944 CRumbleVoice: Correct bool->s16 conversion 
Given the return type of the function is an s16, we can just use 0
directly here.
 2020-03-18 00:32:51 -04:00
Lioncash 2701f060ee CRumbleVoice: Resize vectors within constructor initializer list 
Same behavior, but constructs in place with the size, rather than
constructing and then resizing.

x20_handleIds cannot be done the same way unfortunately, as
reserved_vector doesn't have a constructor accepting a size argument
like std::vector does.
 2020-03-18 00:28:44 -04:00
Lioncash e83d5caea6 CInputGenerator: Make use of std::array where applicable 
Allows removing hardcoded array sizes.
 2020-03-17 23:29:11 -04:00
Lioncash bf11be46ad CStateManager: Make use of std::array where applicable 
Same behavior, but allows dehardcoding array sizes and makes the array
types more strongly typed.
 2020-03-17 23:10:41 -04:00
Lioncash 9e6f86cb16 CObjectList: Make use of std::array where applicable 
Same behavior, but with stronger typing.
 2020-03-17 22:38:21 -04:00
Lioncash 9d5857e139 CGuiSliderGroup: Make use of std::array where applicable 
Same behavior, stronger typing.
 2020-03-17 22:22:06 -04:00
Lioncash fc466ff062 CFlameThrower: Resolve sign-conversion warnings in DoCollisionCheck() 
Resolves trivial sign conversion warnings and also makes some variables
const where applicable.
 2020-03-17 21:55:24 -04:00
Lioncash 457c116275 CCollisionInfoList: Simplify definition of begin() and end() 
Same behavior, but without a verbose return type.
 2020-03-17 21:41:54 -04:00
Lioncash 1d6354ba26 CDrawStringOptions: Resize vector within constructor 
Same behavior, but constructs the vector with the necessary size, rather
than constructing and resizing after the fact.
 2020-03-17 21:35:08 -04:00
Lioncash fa6006003d CAuiEnergyBarT01: Make use of std::array where applicable 
Same behavior, but allows dehardcoding array sizes.
 2020-03-17 21:26:57 -04:00
Lioncash e534f00706 CAuiEnergyBarT01: Convert typedef into using alias 
Same behavior, but nicer to read.
 2020-03-17 21:24:01 -04:00
Lioncash 15e4d4aa01 CAuiImagePane: Make use of std::array where applicable 
Same behavior, stronger typing.
 2020-03-17 21:22:17 -04:00
Lioncash ec7bca8c20 CLight: Collapse std::max calls into one 
We can use the overload that takes an initializer list to make it easier
to read.
 2020-03-17 20:54:56 -04:00
Lioncash e821f736de CLight: Mark caching member variables as mutable 
Member variables acting as caches is one of the areas where marking
variables as mutable makes sense.

We can do this to allow for the elimination of const_cast in some member
functions.
 2020-03-17 20:47:12 -04:00
Lioncash 9483b64c91 CLight: Mark kDefaultPosition and kDefaultDirection as constexpr 
Same behavior, but allows runtime constructors to be elided.
 2020-03-17 20:44:22 -04:00
Lioncash 17a1f90a89 CLight: Prevent implicit double->float truncations 
We can just mark these literals as floats to keep the arithmetic
operating on floats instead of doubles.
 2020-03-17 20:42:39 -04:00
Lioncash 1dd1542106 CLight: Remove unnecessary initializer list initializers 
These are already initialized within the class definition, so they don't
need to be respecified here.
 2020-03-17 20:39:29 -04:00
Lioncash 6077814a0e CMapWorld: Provide parameter names in header for functions 
Makes it more self-documenting from the interface alone and also allows
IDE inspections to be more convenient.
 2020-03-17 20:12:32 -04:00
Lioncash 1fa74087fc CMapWorld: Remove usages of const_cast 
Internals of this class are definitely being modified through some of
these calls, so they should be made non-const. This allows the
modifications to have their const_cast calls removed, making the code a
little nicer to read.
 2020-03-17 20:00:14 -04:00
Lioncash 03f7047549 CMapArea: Make use of std::array where applicable 2020-03-17 19:36:19 -04:00
Lioncash 62682fe19f CMapArea: Resolve variable name shadowing 2020-03-17 19:22:13 -04:00
Lioncash b570168359 CMapArea: Remove type-punning undefined behavior within PostConstruct() 
Casting up from unsigned char or char to an unrelated type isn't
permitted by the C++ standard in the manner it's currently being done.

We can utilize std::memcpy to mitigate this.
 2020-03-17 19:20:37 -04:00
Lioncash b52e8dc6aa CMainFlow: std::move shared_ptr in SetGameState 
Same behavior, but without a redundant atomic reference count
increment/decrement.
 2020-03-17 19:15:09 -04:00
Lioncash e5e4a6482c CLineRenderer: Make use of std::array where applicable 
Same behavior, but without the potential for unintentional array to
pointer decay.
 2020-03-17 19:07:27 -04:00
Lioncash 858162e0c1 CLineRenderer: Remove unnecessary casts to bool 
These constructs function identically without the need for casting.
 2020-03-17 19:04:01 -04:00
Lioncash b1e5bf72b6 CFogVolumeFilter: Make use of std::array where applicable 
Makes data strongly typed and also allows for the removal of some
hardcoded array sizes.
 2020-03-17 18:52:47 -04:00
Luke Street 6ddbd15cfc
Merge pull request #237 from lioncash/state 
CStateManager: Casting-related cleanups
 2020-03-16 20:19:31 -04:00
Luke Street 488614563e
Merge pull request #236 from lioncash/sign 
CGrappleArm: Minor changes
 2020-03-16 20:18:31 -04:00
Lioncash 179f0b5f08 CStateManager: Remove instances of const_cast where applicable 
Eliminates trivial casts that don't require much modifications to other
existing interfaces.
 2020-03-16 20:16:15 -04:00
Luke Street 87eeafe0b0 CSnakeWeedSwarm: Renaming & cleanup 2020-03-16 20:15:22 -04:00
Lioncash 58b112dbe6 CStateManager: Convert reinterpret_cast instances over to static_cast 
Conversions from void* can be done with static_cast.
 2020-03-16 20:05:41 -04:00
Lioncash 0ae2364b24 CStateManager: Remove unnecessary casts 2020-03-16 20:01:57 -04:00
Lioncash 258409bc7d CGrappleArm: Remove const_cast within RenderXRayModel() 
Same behavior, but without a cast.
 2020-03-16 19:53:04 -04:00
Lioncash 9063b16d36 CGrappleArm: Convert reinterpret_cast to static_cast in PointGenerator() 
It's permissible to use static_cast when converting from void* to
another type.
 2020-03-16 19:16:46 -04:00
Lioncash 0cbfc6d169 CGrappleArm: Move skDependencyNames into BuildSuitDependencyList() 
Same behavior, but narrows the visible scope of the array.
 2020-03-16 19:12:55 -04:00
Lioncash d0d6210ccd CGrappleArm: Resolve sign mismatch warnings in loops 2020-03-16 19:11:16 -04:00
Luke Street dc77fb0c41
Merge pull request #234 from lioncash/puddle 
CPuddleSpore: Make static const class data internally linked
 2020-03-16 19:11:04 -04:00
Lioncash ff8e4c18a1 CPuffer: Make use of std::array where applicable 
Allows direct size querying, which allows removing the use of direct
hardcoded array sizes.
 2020-03-16 16:37:40 -04:00
Lioncash 2ae02eefb0 CPuddleSpore: Make static const class data internally linked 
Makes the data an implementation detail and also allows for the
string_view array to be declared constexpr.
 2020-03-16 16:26:19 -04:00
Luke Street 7039232a95
Merge pull request #233 from lioncash/pos 
CPoseAsTransforms: Make use of std::array where applicable
 2020-03-16 16:14:40 -04:00
Luke Street 4a64d92433
Merge pull request #232 from lioncash/blur2 
CPhazonSuitFilter: Convert define into local variable
 2020-03-16 16:14:25 -04:00
Luke Street 2f7e2dd85e
Merge pull request #231 from lioncash/blur 
CPauseScreenBlur: Remove const_cast in Draw()
 2020-03-16 16:14:03 -04:00
Luke Street 6ea64becb4
Merge pull request #230 from lioncash/pause2 
CPauseScreenBase: Minor cleanup
 2020-03-16 16:13:42 -04:00
Lioncash f45e2362c5 CPoseAsTransforms: Make use of std::array where applicable 2020-03-16 16:08:25 -04:00
Lioncash cc6d50a1aa CPoseAsTransforms: Mark constructor as explicit 
Prevents potentially error-prone implicit constructions.
 2020-03-16 16:05:52 -04:00
Lioncash b9be092635 CPauseScreenBlur: Remove const_cast in Draw() 
Draw() clearly modifies the internals of the class in a non-caching
manner, so this member function should really not have a const qualifier
on it.
 2020-03-16 16:00:12 -04:00
Lioncash bb075d51ed CPhazonSuitFilter: Convert define into local variable 
Same behavior, but with a more localized scope.
 2020-03-16 15:57:21 -04:00
Phillip Stephens 574fc9b840
CJellyZap fixes 2020-03-15 19:00:52 -07:00
Lioncash 1a7ad1a7f6 CPauseScreenBase: Make use of std::array in GetImagePaneName() 
We can make use of std::array here and also make the array constexpr.
This can also be moved into the function in order to hide its scope.
 2020-03-15 21:26:59 -04:00
Lioncash 6e921e3258 CPauseScreenBase: Mark colors as constexpr within UpdateSideTable() 
Same behavior, but allows eliding construction at runtime.
 2020-03-15 21:26:47 -04:00
Lioncash a9082bc445 CCollisionActor: Mark gkDefaultCollisionActorMaterials as constexpr 
While we're at it, change the g to s, since it's internally linked.
 2020-03-15 20:04:15 -04:00
Luke Street eeb09f512d
Merge pull request #220 from lioncash/array 
CHud*: Make use of std::array where applicable
 2020-03-15 19:56:33 -04:00
Luke Street 79f6dbac73
Merge pull request #228 from lioncash/time 
CCharAnimTime: Make constructors constexpr where applicable
 2020-03-15 19:46:39 -04:00
Luke Street 76f12c5c38
Merge pull request #227 from lioncash/pair 
CAnimSourceReader: Minor cleanup
 2020-03-15 19:46:21 -04:00
Luke Street 797c583ed7
Merge pull request #226 from lioncash/clamp 
CAnimSource: Simplify ClampZeroToOne()
 2020-03-15 19:45:37 -04:00
Luke Street 70c60ecf2f
Merge pull request #225 from lioncash/bool 
CArchitectureQueue: Make operator bool explicit
 2020-03-15 19:45:22 -04:00
Luke Street 04c226e645
Merge pull request #224 from lioncash/explicit2 
CMemoryCardSys: Make CardResult's conversion operator explicit
 2020-03-15 19:45:13 -04:00
Luke Street 5804032fb4
Merge pull request #223 from lioncash/ref 
CGameHintInfo: Take CVParamTransfer parameter by const reference
 2020-03-15 19:45:02 -04:00
Luke Street 4eaed95c11
Merge pull request #222 from lioncash/view 
CGameOptions: Make use of std::string_view where applicable
 2020-03-15 19:44:47 -04:00
Luke Street e1d622d47b
Merge pull request #221 from lioncash/emplace 
CFontImageDef: Make use of emplace_back where applicable
 2020-03-15 19:44:23 -04:00
Lioncash 1926966d21 CCharAnimTime: Make constructors constexpr where applicable 
These can be made constexpr to allow use at compile-time, given these
only hold an enum and a floating point value.
 2020-03-15 19:41:54 -04:00
Lioncash 15db1b2647 CAnimSourceReader: Make use of std::find_if where applicable 2020-03-15 18:55:30 -04:00
Lioncash 9541ed1919 CAnimSourceReader: Make use of emplace() where applicable 
Same behavior, but with less code.
 2020-03-15 18:42:19 -04:00
Lioncash 7c1528688b CAnimSource: Simplify ClampZeroToOne() 
We can make use of std::clamp instead of std::min and std::max
 2020-03-15 18:30:58 -04:00
Lioncash ff92b72f91 CMemoryCardSys: Make CardResult's conversion operator explicit 
Prevents implicit error-prone conversions to bool
 2020-03-14 22:18:42 -04:00
Lioncash e6812a7cd9 CArchitectureQueue: Make operator bool explicit 
Prevents potentially error-prone implicit conversion contexts.
 2020-03-14 21:42:38 -04:00
Lioncash f5cc056a9e CGameHintInfo: Take CVParamTransfer parameter by const reference 
Avoids trivial unnecessary copies.
 2020-03-14 21:28:46 -04:00
Lioncash 659b8a43d3 CGameOptions: Make use of std::string_view where applicable 
Enforces the use of valid strings in the interface. Also reduces c_str()
noise a little bit.
 2020-03-14 20:09:23 -04:00
Lioncash e64dfe76b2 CFontImageDef: Make use of emplace_back where applicable 
Same behavior, but constructs the instances directly within the
container.
 2020-03-14 18:45:37 -04:00
Lioncash e0392d69c4 CHudEnergyInterface: Make use of std::array where applicable 2020-03-14 17:59:39 -04:00
Lioncash c4796ed090 CHudMissileInterface: Make use of std::array where applicable 2020-03-14 17:57:05 -04:00
Lioncash 9fafb24fb9 CHudVisorBeamMenu: Make use of std::array where applicable 2020-03-14 17:52:30 -04:00
Lioncash 07542ff335 CHudThreatInterface: Make use of std::array where applicable 
Same behavior, but with stronger typing.
 2020-03-14 17:38:57 -04:00
Phillip Stephens f7fdbc07ba
Merge pull request #219 from lioncash/false 
CPathCamera: Change 0 to false in CPathCamera constructor
 2020-03-13 15:30:59 -07:00
Phillip Stephens 6567ae8d42
Merge pull request #218 from lioncash/emplace 
Runtime: Collapse emplace_back() calls where applicable
 2020-03-13 15:30:43 -07:00
Phillip Stephens 55955973a1
Merge pull request #217 from lioncash/sign 
AutoMapper/*: Resolve sign conversion warnings
 2020-03-13 15:30:24 -07:00
Phillip Stephens 0c17e4fdd7
Merge pull request #216 from lioncash/line 
CLineRenderer: Silence -Wmaybe-uninitialized warning
 2020-03-13 15:30:14 -07:00
Phillip Stephens 75c184d710
CHierarchyPoseBuilder corrections 2020-03-13 15:29:20 -07:00
Lioncash 92fb31fd40 CPathCamera: Change 0 to false in CPathCamera constructor 
Same thing, but without implicit conversion to bool
 2020-03-13 17:38:14 -04:00
Lioncash 097d4a4422 Runtime: Collapse emplace_back() calls where applicable 
Same behavior, but with less code.
 2020-03-13 17:14:44 -04:00
Lioncash 7c1e468d31 CMapWorldInfo: Rename IsAreaVisted -> IsAreaVisted 
Same thing, but without the typo.
 2020-03-13 16:19:02 -04:00
Lioncash ddcbf51260 CMapUniverse: Resolve sign conversion warning in Draw() 
Resolves a trivial implicit sign conversion warning.
 2020-03-13 16:11:40 -04:00
Lioncash 014601cf67 CMapWorldInfo: Resolve sign conversion warnings 
Resolves trivial implicit sign conversion warnings.
 2020-03-13 16:10:23 -04:00
Lioncash 4601abf5df CMapArea: Resolve sign conversion warning in Draw() 
Resolves a trivial sign-conversion warning.
 2020-03-13 16:07:41 -04:00
Lioncash c37b3df27b CLineRenderer: Silence -Wmaybe-uninitialized warning 
We can just initialize maxTriVerts to zero to prevent warnings from
occurring.
 2020-03-12 19:15:51 -04:00
Phillip Stephens df4487bae8
Merge pull request #215 from lioncash/none 
CFrontEndUI: Default initialize SFrontEndFrame's x4_action to EAction::None
 2020-03-12 15:11:11 -07:00
Phillip Stephens eb38d96d9a
Merge pull request #214 from lioncash/virtual 
CGunWeapon: Make destructor virtual
 2020-03-12 15:11:02 -07:00
Phillip Stephens 97e33bdf11
Merge pull request #213 from lioncash/unique 
CProjectileWeaponDataFactory: Make GetGeneratorDesc() return a unique_ptr
 2020-03-12 15:10:49 -07:00
Phillip Stephens 7601888e34
Merge pull request #212 from lioncash/power-color 
CPowerBomb: Make kFadeColor internally linked
 2020-03-12 15:10:40 -07:00
Phillip Stephens 8badbd3f35
Merge pull request #211 from lioncash/init 
CPlayerEnergyDrain: Initialize x10_energyDrainTime on construction
 2020-03-12 15:10:28 -07:00
Phillip Stephens ce5ce35743
Merge pull request #210 from lioncash/bob 
CPlayerCameraBob: Minor cleanup
 2020-03-12 15:10:19 -07:00
Phillip Stephens 2a2b471671
Merge pull request #209 from lioncash/cast 
CPlayerGun: Minor cleanup
 2020-03-12 15:10:07 -07:00
Phillip Stephens ac46b898bc
Merge pull request #208 from lioncash/wave 
CWaveBuster: Implement GetTouchBounds()
 2020-03-12 15:09:57 -07:00
Phillip Stephens 196a545f9a
Merge pull request #207 from lioncash/get 
CElectricBeamProjectile: Remove unnecessary get() calls in PreRender()
 2020-03-12 15:09:47 -07:00
Phillip Stephens bb8e33461d
Merge pull request #206 from lioncash/gen 
CElementGen: Minor cleanup
 2020-03-12 15:09:36 -07:00
Phillip Stephens 5f2db40528
Merge pull request #205 from lioncash/fn 
CFactoryMgr: Minor cleanup
 2020-03-12 15:09:11 -07:00
Phillip Stephens 12ad192436
Merge pull request #204 from lioncash/move 
Character/*: std::move constructor parameters where applicable
 2020-03-12 15:09:00 -07:00
Phillip Stephens 3a37be9d27
Minor CFlaahgra fixes 2020-03-12 15:06:01 -07:00
Lioncash 90e866d2d5 CFrontEndUI: Default initialize SFrontEndFrame's x4_action to EAction::None 
This is the initial value that GM8E v0 assigns to this member variable.
Previously it was being left uninitialized on construction.
 2020-03-12 17:35:36 -04:00
Lioncash 2c091ac124 CGunWeapon: Make destructor virtual 
This class is used as polymorphic type, so the destructor should be
marked as virtual to prevent any potential undefined behavior.

This also more closely matches the GM8E v0 binary itself.
 2020-03-12 17:20:45 -04:00
Lioncash 05bccae70e CDecalDataFactory: Make GetGeneratorDesc() return a unique_ptr 
Same behavior, but with safer memory management.
 2020-03-12 14:46:02 -04:00
Lioncash 1f42b9be93 CParticleElectricDataFactory: Make GetGeneratorDesc() return a unique_ptr 
Same behavior, but with safer memory management.
 2020-03-12 14:20:48 -04:00
Lioncash 59bbbdf41c CParticleSwooshDataFactory: Make GetGeneratorDesc() return a unique_ptr 
Same behavior, but with safer memory management.
 2020-03-12 14:17:42 -04:00
Lioncash 93121c38f7 CProjectileWeaponDataFactory: Make GetGeneratorDesc() return a unique_ptr 
Same behavior, but with safer memory management.
 2020-03-12 14:00:23 -04:00
Lioncash ee952b9c99 CPowerBomb: Make kFadeColor internally linked 
Hides the name from external view entirely and allows the color instance
to be constexpr.
 2020-03-12 10:13:37 -04:00
Lioncash d51518dc57 CPlayerEnergyDrain: Make constructor explicit 
Prevents error-prone implicit constructions from occurring.
 2020-03-12 10:01:31 -04:00
Lioncash e628cbf1be CPlayerEnergyDrain: Initialize x10_energyDrainTime on construction 
GM8E v0 initializes this to zero when constructing the class. This also
makes the entire class have a consistent initial state.
 2020-03-12 09:57:43 -04:00
Luke Street cfd568bb39 Merge branch 'chozoghosts' 2020-03-11 17:17:00 -04:00
Phillip Stephens 190c369aeb
Fix crashes with FusionSuit active 2020-03-11 06:48:30 -07:00
Luke Street 860f7c7f33 CChozoGhost: Minor fixes & renaming 2020-03-11 02:16:55 -04:00
Luke Street 123ddfd33a CChozoGhost: InPosition -> ShouldAttack 2020-03-11 00:22:03 -04:00
Luke Street 155cd3759f CChozoGhost: Minor FindBestAnchor fixes 2020-03-10 23:47:14 -04:00
Lioncash 179d19412b CPlayerCameraBob: Make static non-const member variables private 
Prevents accidental modification of the values from occurring in code
that makes use of them. Many of these constants aren't even used outside
of the class itself in the first place.
 2020-03-09 20:55:12 -04:00
Lioncash f622ed364d CPlayerCameraBob: Make use of std::array where applicable 2020-03-09 20:33:37 -04:00
Lioncash 73f11a6132 CPlayerGun: Make use of std::array where applicable 2020-03-09 16:33:10 -04:00
Lioncash 1838e43078 CPlayerGun: Relocate file-static variables and constants into a single anonymous namespace 
Keeps all file-static variables organized together.
 2020-03-09 16:15:55 -04:00
Lioncash 3abaccb238 CPlayerGun: Resolve trivial implicit sign conversion warnings 2020-03-09 16:04:13 -04:00
Lioncash 9e5dc627ea CWaveBuster: Implement GetTouchBounds() 
Implements GetTouchBounds() according to the implementation within the
GM8E v0 binary.

Fills out the implementation of CWaveBuster a little bit.
 2020-03-09 14:51:04 -04:00
Lioncash 06dfc3406e CElectricBeamProjectile: Remove unnecessary get() calls in PreRender() 
Same behavior, less code.
 2020-03-09 13:55:26 -04:00
Lioncash 15dce1683e CElementGen: std::move TToken instance in constructor 
Allows the parameter to be moved into via calling code.
 2020-03-09 13:07:53 -04:00
Lioncash af2a82b5a7 CElementGen: Make GetSystemCount() a const member function 
This doesn't modify internal member state, so this can be made a const
member function.
 2020-03-09 13:03:42 -04:00
Lioncash a8486cf479 CElementGen: Resolve sign-conversion warnings in loops 
Prevents implicit truncation to int from occurring.
 2020-03-09 13:01:42 -04:00
Lioncash 9db07b037a CElementGen: Make use of std::array where applicable 2020-03-09 12:53:28 -04:00
Lioncash 35adfe8abf CElementGen: Alphabetize forward declarations 
Makes them nicer to visually scan over.
 2020-03-09 12:33:24 -04:00
Luke Street 985daa3092 CCharAnimTime: Re-add algorithm include 2020-03-09 12:21:08 -04:00
Lioncash 0a158af0cb CFactoryMgr: Resolve variable shadowing warning in MakeObjectFromMemory() 
Resolvable with a trivial variable renaming.
 2020-03-09 12:19:58 -04:00
Lioncash 91a2562fff CFactoryMgr: Make use of std::array 
Same behavior, with stronger typing. We can also leverage the iterator
member functions directly.
 2020-03-09 12:17:18 -04:00
Luke Street 24817d6b01 CCharAnimTime: Fixes & cleanup 2020-03-09 12:09:54 -04:00
Lioncash 34eb507a9d CFactoryMgr: std::move function instances in AddFactory() 
std::function is allowed to allocate on the heap, so this potentially
prevents unnecessary allocations.

We can also use insert_or_assign() to prevent unnecessary default
initialization of std::function that immediately get overridden.
 2020-03-09 12:04:51 -04:00
Lioncash 39b561b089 CTransitionManager: std::move constructor parameters where applicable 
Allows calling code to move into the constructor
 2020-03-09 11:58:10 -04:00
Lioncash 3a96c574b2 CTransitionDatabaseGame: std::move constructor parameters where applicable 
Same behavior, but allows the parameters to be moved into from calling
code.
 2020-03-09 11:58:10 -04:00
Lioncash 815f492e0f CSequenceHelper: std::move constructor parameters where applicable 
Same behavior, but allows for calling code to move into the interface.
 2020-03-09 11:58:10 -04:00
Lioncash cff12f0986 TAnimSourceInfo: std::move constructor parameter where applicable 
Allows calling code to move into the constructor.
 2020-03-09 11:58:10 -04:00
Lioncash 9fe671af99 CAnimTreeSequence: std::move constructor parameters where applicable 
Allows the constructor arguments to be moved into the constructor.
 2020-03-09 11:58:07 -04:00
Lioncash fa23d0bb9c CAnimTreeLoopIn: std::move constructor parameters where applicable 
Allows the constructor parameters to be moved into.
 2020-03-09 11:31:53 -04:00
Lioncash ab17c1cf2f CAnimationManager: std::move parameters to constructor where applicable 
Allows calling code to move into the respective arguments.
 2020-03-09 11:27:36 -04:00
Lioncash e289643742 CAnimData: std::move constructor arguments where applicable 
Same behavior, but allows calling code to move into the respective
parameters now.
 2020-03-09 11:25:23 -04:00
Lioncash 79565d7f52 CAnimSourceInfo: std::move TSubAnimTypeToken instance in constructor 
Provides the same behavior, but allows calling code to move into the
constructor.
 2020-03-09 11:11:27 -04:00
Lioncash 3cec19437a CAnimSysContext: std::move TToken instance in constructor 
Provides the same interface, but allows for calling code to move into
the constructor.
 2020-03-09 11:08:17 -04:00
Lioncash 280e4ce07d CAnimTreeAnimReaderContainer: std::move shared_ptr in constructor 
Provides the same behavior, but without a redundant atomic reference
count increment and decrement.
 2020-03-09 11:06:20 -04:00
Luke Street 5c9dd55b80 CChozoGhost: Fix IsOnGround 2020-03-09 10:41:34 -04:00
Luke Street 830db8772d Merge remote-tracking branch 'origin/master' into chozoghosts 2020-03-09 10:12:40 -04:00
Phillip Stephens d93df18a37
Fix `CScriptDistanceFog::AcceptScriptMessage` 2020-03-08 23:18:57 -07:00
Luke Street 7b9a037c95
Merge pull request #203 from lioncash/identical 
CBallCamera: Collapse identical switch cases within AvoidGeometry()
 2020-03-08 23:45:52 -04:00
Luke Street 6e9a80de5d CVisorFlare: Rename "near" to avoid MSVC conflict 2020-03-08 23:44:44 -04:00
Lioncash 363386cbd9 CBallCamera: Collapse identical switch cases within AvoidGeometry() 
Same behavior, but less code.

This is identical in behavior to the code within the GM8E v0 binary.
 2020-03-08 23:40:22 -04:00
Lioncash 45c1bc9652 CStaticRes: Make use of CAssetId's IsValid() member function within operator bool 
We should be testing against IsValid() here to handle all cases that
indicate invalid values, as opposed to only handling the zero case.
 2020-03-08 22:49:33 -04:00
Lioncash 209cd4a54e CStaticRes: Make operator bool explicit 
Prevents potentially error-prone conversions to bool. Similar to the
changes recently made to CToken.
 2020-03-08 21:20:08 -04:00
Lioncash 2233a78fe2 CToken: Add HasReference() member function 
Has the same semantics of operator bool(), but explains at the call site
what is actually being tested for in the relation to the object itself.

Aims to make readability slightly better (and removed the need for
casts).
 2020-03-08 21:13:37 -04:00
Phillip Stephens fc5170ede9
Merge pull request #200 from lioncash/temp 
CLogBookScreen: Remove unconditional return true in IsScanComplete()
 2020-03-08 18:03:54 -07:00
Phillip Stephens a28b7a8df7
Merge pull request #199 from lioncash/octree 
CPVSVisOctree: Use static qualifying name for ReadBoundingBoxBig()
 2020-03-08 18:03:44 -07:00
Phillip Stephens f07d4e9630
Merge pull request #198 from lioncash/move 
CResFactory: Resolve use-after-move in AddToLoadList()
 2020-03-08 18:03:28 -07:00
Phillip Stephens b492c91ccf
Merge pull request #197 from lioncash/cond 
CFontRenderState: Collapse common switch cases in RefreshColor()
 2020-03-08 18:03:17 -07:00
Phillip Stephens b01fa0c5bf
Merge pull request #196 from lioncash/saveable 
CSaveableState: Initialize vectors in the constructor initializer list
 2020-03-08 18:03:01 -07:00
Phillip Stephens dd54f93da4
Merge pull request #195 from lioncash/unused 
CPlayer: Make use of unused CCollidableAABox in ProcessInput()
 2020-03-08 18:02:52 -07:00
Phillip Stephens 3011a839eb
Merge pull request #194 from lioncash/init 
CProjectileInfo: Initialize result variable to false within PredictInterceptPos
 2020-03-08 18:02:41 -07:00
Phillip Stephens 51bb2244da
Merge pull request #193 from lioncash/explicit 
CToken: Make operator bool explicit
 2020-03-08 18:02:30 -07:00
Phillip Stephens 3e59f7a455
Prepare for pr-193 2020-03-08 18:01:29 -07:00
Lioncash 2a1df559a9 CLogBookScreen: Remove unconditional return true in IsScanComplete() 
This was temporarily added in for debugging purposes in the past but was
never removed.
 2020-03-08 11:15:13 -04:00
Phillip Stephens f06c26e7d6
Fix infinite loop in CObjectList, and add an assert to detect invalid assignments 2020-03-07 09:14:07 -08:00
Lioncash 8d42eb4287 CPVSVisOctree: Initialize in-class member variables where applicable 
Provides a deterministic initial state for the default constructor.
 2020-03-07 05:01:29 -05:00
Lioncash 4034e3b31f CPVSVisOctree: Make use of std::array where applicable 
Makes the arrays strongly typed.
 2020-03-07 04:50:19 -05:00
Lioncash 969bcdba35 CPVSVisOctree: Use static qualifying name for ReadBoundingBoxBig() 
It looks very odd using the name of the object being initialized to call
through to a static member function. We can disambiguate this by making
use of the qualifying name directly.
 2020-03-07 04:46:19 -05:00
Lioncash 0a47e623fd CResFactory: Resolve use-after-move in AddToLoadList() 
The behavior on the right hand side would occur before the actual
assignment, making the tag value invalidated. Instead, we copy the tag
before the move is performed to keep the data valid when inserting it
into the map.
 2020-03-07 03:56:16 -05:00
Lioncash a490eaf8ff CFontRenderState: Collapse common switch cases in RefreshColor() 
Same behavior, less code.
 2020-03-07 03:44:54 -05:00
Lioncash 815a38288a CSaveableState: Initialize vectors in the constructor initializer list 
Initializes the vectors in place, rather than constructing them and then
resizing.
 2020-03-06 22:47:39 -05:00
Lioncash 830e1c59d2 CPlayer: Make nearby variables const 
Makes nearby variables from the previous change const to make their
immutability explicit.
 2020-03-06 22:08:56 -05:00
Lioncash a2b6b4515d CPlayer: Make use of unused CCollidableAABox in ProcessInput() 
GM8E v0 makes use of the temporary collidable AA box. This amends the
code to make use of it.
 2020-03-06 22:06:44 -05:00
Lioncash 27fb2008dc CProjectileInfo: Initialize result variable to false within PredictInterceptPos() 
GM8E v0 sets this to false before performing any further calculations.
This also prevents accidental uninitialized usages from occurring if
this is ever changed in the future.

While we're in the same area we can make bracing consistent.
 2020-03-06 21:57:39 -05:00
Lioncash a6367c0688 CToken: Make operator bool explicit 
Prevents potential error-prone conversions from occurring
 2020-03-06 21:42:07 -05:00
Phillip Stephens 052aa80bac
Fix initial AI issues 2020-03-06 18:03:13 -08:00
Phillip Stephens 4daa8ac374
CModelBoo: Fix missing cast 2020-03-06 16:27:33 -08:00
Phillip Stephens 17f25457c5
CGameArea::CAreaObjectList fix 2020-03-06 16:20:52 -08:00
Phillip Stephens 76e0a1f8f5
Merge pull request #192 from lioncash/init 
CEyeball: Eliminate unnecessary runtime initializer in Think()
 2020-03-06 16:15:15 -08:00
Phillip Stephens 7358570d51
Merge pull request #191 from lioncash/const 
CObjectList: Make IsQualified() a const member function
 2020-03-06 16:14:59 -08:00
Phillip Stephens 24baafb996
Merge pull request #190 from lioncash/render 
CBooRenderer: Minor cleanup
 2020-03-06 16:14:47 -08:00
Phillip Stephens ae25392d19
Merge pull request #189 from lioncash/model 
CModelBoo: Make static data constexpr where applicable
 2020-03-06 16:14:05 -08:00
Phillip Stephens f8e40e600f
Merge pull request #188 from lioncash/class 
CModelShaders: Make EExtendedShader an enum class
 2020-03-06 16:13:54 -08:00
Phillip Stephens b44e43c7c0
Merge pull request #187 from lioncash/make 
CThardus: Minor tidying changes
 2020-03-06 16:13:42 -08:00
Phillip Stephens ab65fae969
Merge pull request #186 from lioncash/array 
CInGameGuiManager: Make use of std::array where applicable
 2020-03-06 16:13:33 -08:00
Phillip Stephens c9e7b2c2ff
Merge pull request #185 from lioncash/reference2 
CParticleGenInfo: Fix missing ampersand in GetParticleSystem() member function
 2020-03-06 16:13:22 -08:00
Phillip Stephens 915a0785a5
Merge pull request #184 from lioncash/reference 
CHierarchyPoseBuilder: Fix missing ampersand in CharLayoutInfo() return value
 2020-03-06 16:13:05 -08:00
Phillip Stephens 96af6157bd
Merge pull request #183 from lioncash/move 
CThardus: std::move vector instances in constructor
 2020-03-06 16:12:53 -08:00
Phillip Stephens 4b13f8768b
Merge pull request #181 from lioncash/ref 
CInGameGuiManager: Take std::shared_ptr by const reference in DoStateTransition()
 2020-03-06 16:12:35 -08:00
Phillip Stephens 1cccaac115
Final CChozoGhost imps 2020-03-06 07:16:55 -08:00
Lioncash 00ff91eece CEyeball: Remove unnecessary .get() call 
Dereferencing is already supported on smart pointers, so we don't need
to call .get() here.
 2020-03-06 07:30:27 -05:00
Lioncash c3809162bf CEyeball: Eliminate unnecessary runtime initialzer in Think() 
We can just fold the result into the constant directly, which allows us
to avoid the need for a static runtime initializer. This is bit-exact
with what the result would be, so this is fine.
 2020-03-06 07:30:05 -05:00
Lioncash 80e2e97dc4 CObjectList: Make IsQualified() a const member function 
None of the implementations modify object instance state, so this can be
made const qualified.
 2020-03-06 04:36:39 -05:00
Lioncash b1426867bf CBooRenderer: Make use of std::array where applicable 
Makes the data strongly typed and allows eliminating some hardcoded
sizes.
 2020-03-06 02:25:40 -05:00
Lioncash 4f7f5cf09a CBooRenderer: Make Buckets class mostly internal 
This is only ever functionally used within this translation unit, so we
can hide the class internally.
 2020-03-06 01:16:02 -05:00
Lioncash 3c4e25062d CModelBoo: Make static data constexpr where applicable 
Gets rid of potential runtime-initializers.
 2020-03-06 00:46:30 -05:00
Lioncash d9664d165f CModelShaders: Make EExtendedShader an enum class 
Prevents pollution of the urde namespace with general names like Flat,
etc.
 2020-03-06 00:16:31 -05:00
Lioncash 3717480eeb CThardus: Make use of std::array where applicable 
Dehardcodes some sizes and gets rid of two instances of implicit sign
conversions.
 2020-03-05 23:22:30 -05:00
Lioncash 3b6218fa67 CThardus: Make use of std::make_unique where applicable 
Same thing, but more straightforward.
 2020-03-05 23:15:24 -05:00
Lioncash 84fde9ceca CInGameGuiManager: Make use of std::array where applicable 
Allows us to eliminate some hardcoded array sizes.
 2020-03-05 22:02:29 -05:00
Lioncash 40277bedac CParticleGenInfo: Fix missing ampersand in GetParticleSystem() member function 
Previously the particle system shared pointer would always be returned
by value, rather than by reference.
 2020-03-05 21:36:04 -05:00
Lioncash 4c90adf074 CHierarchyPoseBuilder: Fix missing ampersand in CharLayoutInfo() return value 
Previously this function was always returning by value, rather than by
reference, like what its contained called function does.
 2020-03-05 21:28:23 -05:00
Lioncash 6917132a94 CThardus: std::move vector instances in constructor 
Previously the std::move calls wouldn't do anything, as the parameters
were constant references, so we can take them by value and move into the
constructor and then move the parameters into the member variables.

While we're at it, we can initialize the vectors in place instead of
constructing and then assigning to them.
 2020-03-05 21:19:32 -05:00
Lioncash 50f8f3e17e CInGameGuiManager: Take std::shared_ptr by const reference in DoStateTransition() 
Trivially avoids an atomic reference count increment and decrement.
 2020-03-05 20:47:07 -05:00
Phillip Stephens e43bfe1e58
More CChozoGhost imps 2020-03-05 07:42:12 -08:00
Phillip Stephens 58cca6ffa8
More chozoghost imps 2020-03-05 01:56:04 -08:00
Phillip Stephens 50a20d7322
More CChozoGhost imps 2020-03-04 18:41:11 -08:00
Phillip Stephens 9d77d7313c
More ChozoGhost imps 2020-03-04 18:41:10 -08:00
Phillip Stephens d91e86a94a
Initial CChozoGhost stubs 2020-03-04 18:41:10 -08:00
Phillip Stephens 2f9dd38bbe
Silence discard errors 2020-03-04 18:40:03 -08:00
Luke Street 74d01debe1
Merge pull request #180 from lioncash/flamethrower 
CFlameThrower: Amend virtual interface discrepancies
 2020-03-04 13:42:21 -05:00
Lioncash 88cb5acdca CFlameThrower: Amend virtual interface discrepancies 
GM8E v0 overrides Render(), GetTouchBounds() and Touch() and does
nothing within them. This updates the interface to match it.
 2020-03-04 06:52:50 -05:00
Lioncash f0c3903951 CSpacePirate: Make use of std::array with constexpr data 
Makes data strongly typed, making pointer decay explicit.
 2020-03-04 04:44:54 -05:00
Lioncash 4b3d48ebc1 CSpacePirate: Make static const data internally linked 
Makes the symbols fully internally linked and also allows marking them
constexpr.
 2020-03-04 04:33:11 -05:00
Phillip Stephens 09f7096913
Disable variable delta time 2020-03-03 16:50:25 -08:00
Phillip Stephens 80dbc1920c
Update submodules 2020-03-03 16:49:13 -08:00
Phillip Stephens 366d6b96ee
Merge pull request #178 from lioncash/data 
CScriptGunTurret: Remove unnecessary data() call in AcceptScriptMsg()
 2020-03-03 16:43:43 -08:00
Phillip Stephens abfd77c3ba
Merge pull request #177 from lioncash/burst 
CScriptGunTurret: Move static const data into the cpp file
 2020-03-03 16:43:34 -08:00
Lioncash 70c3a7ddf5 CScriptGunTurret: Remove unnecessary data() call in AcceptScriptMsg() 
We can use append() instead of data(). This allows the size of the
string view instance to be used directly instead of redundantly doing a
string size lookup.
 2020-03-03 06:30:20 -05:00
Luke Street 9e0e053906 CScriptSpecialFunction: Further ThinkSpinnerController implementation 2020-03-03 03:31:58 -05:00
Lioncash 245a8145c7 CScriptGunTurret: Make use of std::array with file-static data 2020-03-03 03:12:35 -05:00
Lioncash f4fc17bee0 CScriptGunTurret: Move static const data into the cpp file 
Makes the data fully internally linked and also allows making said data
constexpr.
 2020-03-03 03:05:02 -05:00
Luke Street 12393d4c4d CSnakeWeedSwarm: Fix lighting 2020-03-01 03:05:16 -05:00
Luke Street 17b9813b3e CSnakeWeedSwarm: Rendering & state fixes 2020-03-01 02:52:17 -05:00
Luke Street f064bc2f7b CSnakeWeedSwarm: Initialize bitfields; some more cleanup 2020-03-01 01:59:12 -05:00
Luke Street 046fbe7760 CSnakeWeedSwarm: Cleanup, renaming & fixes 2020-03-01 01:59:12 -05:00
Luke Street 34a80aab81 CSnakeWeedSwarm: Implement ApplyRadiusDamage 2020-03-01 01:59:12 -05:00
Luke Street f50f5cedef CSnakeWeedSwarm: Implement remaining methods 2020-03-01 01:59:12 -05:00
Phillip Stephens 9f5f0abab4
More CThardus imps, add reference CTevPass imps 2020-02-29 17:11:41 -08:00
Luke S 617844efce
Merge pull request #175 from lioncash/fixme 
CFlaahgraTentacle: Remove FIXME comment in ShouldAttack()
 2020-02-29 16:56:50 -05:00
Lioncash 5e705515ed CFlaahgraTentacle: Remove FIXME comment in ShouldAttack() 
GM8E v0 does exactly this, so we can consider this double-checked
 2020-02-29 06:18:30 -05:00
Lioncash 9434be8562 CFlaahgraTentacle: Amend floating point value within Play case in AcceptScriptMsg() 
GM8E v0 sets this to 0.04f.
 2020-02-29 05:54:38 -05:00
Luke S 58a2f6aeb2
Merge pull request #173 from lioncash/c_str 
Runtime: Remove unnecessary c_str() calls
 2020-02-28 11:16:57 -05:00
Luke S e0b84df5de
Merge pull request #172 from lioncash/move 
CCharacterInfo: Minor allocation related changes
 2020-02-28 10:39:35 -05:00
Luke S e7de5311c2
Merge pull request #171 from lioncash/const 
CPAS*: Minor cleanup
 2020-02-28 10:37:36 -05:00
Luke S 55521fb5df
Merge pull request #170 from lioncash/collision 
CollisionUtil: Replace FINDMINMAX macro with std::minmax()
 2020-02-28 10:36:46 -05:00
Lioncash f1256faeb7 Runtime: Remove unnecessary c_str() calls 
Makes for less noisy code and also gets rid of unnecessary std::strlen
calls in the case things are passed to a std::string_view parameter.
 2020-02-28 05:26:41 -05:00
Lioncash 718d8d5d6f CPASParmInfo: Make data members private 
These aren't used outside of the class, we only need to make
EWeightFunction public.
 2020-02-28 05:00:16 -05:00
Lioncash 9524208cd2 CCharacterInfo: Remove unnecessary top-level const in return value of GetAnimationIndex() 
Same behavior, less code.
 2020-02-28 04:56:45 -05:00
Lioncash 63cf485f27 CCharacterInfo: std::move std::string instance where applicable 
Avoids potentially reallocating strings where it's not necessary to do
so.
 2020-02-28 04:55:09 -05:00
Lioncash 435a6ea1d4 CCharacterInfo: Make use of emplace_back() where applicable 
We can construct these elements in place. While we're at it, we can mark
the count variables at const to be explicit.
 2020-02-28 04:51:18 -05:00
Lioncash d2c86f98d1 CCharacterInfo: std::move vectors in CParticleResData's constructor 
Same behavior, but allows the caller to move into the constructor,
potentially avoiding copies altogether.
 2020-02-28 04:49:07 -05:00
Lioncash d79b9d925e CPAS*: Make constructors explicit 
Prevents undesirable implicit constructions from occurring.
 2020-02-28 04:38:23 -05:00
Lioncash fe05c42be4 CPASAnimState: Remove const_cast usages 
A cache is typically a use case for mutable (as the outside user of the
class wouldn't directly rely on the cache as part of the API, this would
only function to assist the API perform better), so we can mark the
selection cache as mutable and make the code nicer to read overall.
 2020-02-28 04:33:42 -05:00
Lioncash 9cb5d11405 CollisionUtil: Replace FINDMINMAX macro with std::minmax() 
Same thing, but already provided by the language.
 2020-02-28 02:27:24 -05:00
Luke S 751838f00e
Merge pull request #166 from lioncash/redundant 
CGroundMovement: Collapse 'dampUnderwater ? 0.2f : 0.2f' conditional
 2020-02-26 13:19:22 -05:00
Luke S 5fa244a058
Merge pull request #165 from lioncash/elastic 
CGroundMovement: Set optsCopy's wall elastic constant to 0.03f
 2020-02-26 13:17:18 -05:00
Lioncash 62330903cc CGroundMovement: Collapse 'dampUnderwater ? 0.2f : 0.2f' conditional 
The conditional itself aside, in GM8E v0, this is always assigned as
0.2f.
 2020-02-26 04:18:58 -05:00
Lioncash 6afcf634b0 CGroundMovement: Set optsCopy's wall elastic constant to 0.03f 
In GM8E v0, the wall elastic constant of the copied SMovementOptions
instance is set to 0.03f.
 2020-02-26 04:12:09 -05:00
Lioncash 2b4888dcb6 CMidiManager: std::move sequencer within SetAudioSysHandle() 
Provides the same behavior but without a redundant reference count
increment and then decrement.
 2020-02-26 03:16:11 -05:00
Luke S 08604d770a
Merge pull request #163 from lioncash/data 
ITweakGunRes: Minor cleanup
 2020-02-25 22:32:25 -05:00
Lioncash e80d9c7192 ITweakGunRes: Make use of std::array where applicable 
Deduplicates a few array sizes and makes the member variables more
strongly typed.
 2020-02-25 15:50:37 -05:00
Luke S 83507f0226
Merge pull request #162 from lioncash/false 
CAuxWeapon: Replace always false condition with false in Fire()
 2020-02-25 14:42:14 -05:00
Luke S 5454fc213b
Merge pull request #161 from lioncash/return 
CPlayer: Add missing return within UpdateOrbitModeTimer()
 2020-02-25 14:19:32 -05:00
Luke Street ae591d4817 Add MP1_VARIABLE_DELTA_TIME option (for high refresh rates; buggy) 2020-02-25 14:15:53 -05:00
Lioncash 450bcd019e CAuxWeapon: Replace always false condition with false in Fire() 
Given we already check if chargeState is Normal previously, there's no
way that this can also be Charged at the same time.
 2020-02-25 04:36:10 -05:00
Lioncash 79c409c5e0 CPlayer: Add missing return within UpdateOrbitModeTimer() 
Previously, any call to this function would always reset the timer to
0.0, rather than potentially decrement it.

GM8E v0 always returns within the conditional.
 2020-02-25 02:17:22 -05:00