Commit Graph

2869 Commits

Author SHA1 Message Date
Luke Street 3c48da0cdb Merge remote-tracking branch 'origin/trim' 2020-04-24 02:43:56 -04:00
Lioncash d7c9135d27 CBomb: Fix boolean parameter not being used within SetFuseDisabled()
Prevents silent logic bugs, particularly given this function is called
with true as well inside CTryclops::InMaxRange.
2020-04-24 01:12:04 -04:00
Lioncash 27861d5c78 CUVElement: Convert stateful structs into classes
Avoids exposing the internals of the data by default (since they were
previously fully accessible).
2020-04-24 00:59:51 -04:00
Lioncash b32bc296ad CUVElement/CVectorElement: Make use of [[maybe_unused]] where applicable 2020-04-24 00:58:44 -04:00
Lioncash 4a9095a2af CRealElement: Make use of [[maybe_unused]] where applicable 2020-04-24 00:57:13 -04:00
Lioncash f620b4325f CIntElement: Make use of [[maybe_unused]] where applicable 2020-04-24 00:55:43 -04:00
Lioncash 102d62846c CColorElement: Make use of [[maybe_unused]] where applicable 2020-04-24 00:54:08 -04:00
Lioncash 6d53912770 CStringTable: Make use of [[maybe_unused]] where applicable 2020-04-23 21:24:39 -04:00
Lioncash ee0762db32 CRasterFont: Make use of [[maybe_unused]] where applicable 2020-04-23 21:23:17 -04:00
Lioncash 5e9bf292d7 CTextureCache: Make use of [[maybe_unused]] where applicable 2020-04-23 21:15:30 -04:00
Lioncash 600076030f CStateManager: Make use of bool parameter in SetWarping()
Allows toggling the warping.
2020-04-23 21:12:52 -04:00
Lioncash 25b0c69818 CSaveWorld: Make use of [[maybe_unused]] where applicable
Prevents unused parameter warnings.
2020-04-23 20:51:59 -04:00
Lioncash 301eb24301 CInGameTweakManagerBase: Make internal members of CTweakValue private 2020-04-23 20:48:43 -04:00
Lioncash e4dedac2b6 CInGameTweakManagerBase: Make use of algorithms where applicable 2020-04-23 20:44:31 -04:00
Lioncash e1dfe9ff8e CGameOptionsTouchBar: Make use of [[maybe_unused]] where applicable
Silences unused parameter warnings
2020-04-23 20:34:05 -04:00
Lioncash 14e0067a97 CDependencyGroup: Make use of [[maybe_unused]] where applicable 2020-04-23 20:31:29 -04:00
Lioncash 4a6c3cde3c CWorldLight: Eliminate variable shadowing
While we're at it, we can make use of structured bindings.
2020-04-23 07:25:07 -04:00
Lioncash 4e3363a98b CScriptActorKeyframe: Eliminate variable shadowing 2020-04-23 07:22:10 -04:00
Lioncash 9ec9f42457 CPathFindSearch: Eliminate variable shadowing 2020-04-23 07:19:41 -04:00
Lioncash 078acce378 CMorphBall: Eliminate variable shadowing 2020-04-23 07:18:43 -04:00
Lioncash 31cf98646b CModVectorElement: Eliminate variable shadowing
Prevents "a" from clashing with a local variable.
2020-04-23 07:16:49 -04:00
Lioncash 9fa689a806 CMemoryCardSys: Eliminate variable shadowing
Prevents names from clashing with variables from outside the loop scope.
2020-04-23 07:13:22 -04:00
Lioncash e0bb66f7f0 CParticleElectricDataFactory: Remove unused includes 2020-04-23 03:58:10 -04:00
Lioncash eefeb5cd0b CGameArea: Remove undefined behavior type-punning in a few functions
We can make use of std::memcpy here to get around this.
2020-04-23 03:06:04 -04:00
Lioncash df3aed75fe CGameArea: Eliminate implicit sign conversions in Validate() 2020-04-23 02:53:24 -04:00
Lioncash 419d40051d CGuiTextSupport: Make enum formatting consistent 2020-04-23 02:41:22 -04:00
Lioncash b700da547e CGuiTextSupport: Invert conditionals where applicable
Unindents code and allows for easier placement of breakpoints when the
conditions are equal to the early exit path.
2020-04-23 02:39:39 -04:00
Lioncash 787fc3276f CGuiTextSupport: Use const references where applicable 2020-04-23 02:36:45 -04:00
Lioncash a21fb1da35 CGuiObject: Remove unused includes 2020-04-23 02:27:11 -04:00
Lioncash 2b2edfa871 CGrappleArm: Invert conditionals where applicable
Makes early-exit conditions nicer to follow and also unindents some
code.
2020-04-23 01:57:18 -04:00
Phillip Stephens 1b1907d910
CIceSheegoth: Minor fixes 2020-04-22 16:46:52 -07:00
Phillip Stephens 97a25f01e2
Initial state implementations 2020-04-22 15:06:15 -07:00
Phillip Stephens b1a897d246
CIceSheegoth: Implement Think 2020-04-22 15:06:15 -07:00
Phillip Stephens 3779b205b7
Initial CIceSheegoth stubout 2020-04-22 15:06:15 -07:00
Phillip Stephens 59f979db67
Actually implement AssetNameMap in DNAMP1 2020-04-22 03:38:48 -07:00
Lioncash 535717fbd8 CGameArea: Make use of std::array where applicable 2020-04-22 02:19:14 -04:00
Lioncash 664d08469c CEnvFxManager: Make use of std::array where applicable
Same behavior, less code.
2020-04-22 02:16:37 -04:00
Lioncash 52f51c111a CAmbientAI: Return std::nullopt in GetTouchBounds()
Allows implementations to avoid zeroing out the internal buffer of the
std::optional.
2020-04-22 02:10:55 -04:00
Lioncash 472e97aac0 CAreaOctTree: Make use of std::array where applicable 2020-04-22 02:05:22 -04:00
Lioncash f24559890a TSegIdMap: Make use of std::array where applicable
Stronger typing and eliminates array to pointer decay.
2020-04-22 01:59:29 -04:00
Lioncash fe642bde8b CCameraBlurFilter: Make use of std::array where applicable
Same behavior, less hardcoded sizes.
2020-04-22 00:13:43 -04:00
Luke Street 4741172f9f
Merge pull request #316 from lioncash/init2
RuntimeCommon: Make use of bitfield initializers where applicable
2020-04-21 22:52:25 -04:00
Luke Street 12d8d534c6 CParticleElectric: Fix CalculatePoints 2020-04-21 22:32:37 -04:00
Luke Street fc7e8d4993 CElectricBeamProjectile: Finish implementation 2020-04-21 22:04:37 -04:00
Luke Street 8488dca336 CPlayer: Long fall anim/dmg fix 2020-04-21 20:43:34 -04:00
Luke Street 82aa99f858 CScriptCameraWaypoint: Fix Arrived 2020-04-21 20:35:37 -04:00
Lioncash fa3e639a9d RuntimeCommon: Make use of bitfield initializers where applicable
Continues and finishes the migration towards initializing all bitfield
members where applicable
2020-04-21 17:16:19 -04:00
Luke Street 1571531cd7 CMagdolite: Renaming 2020-04-21 14:15:17 -04:00
Luke Street 449d8409d8 CMagdolite: Fix lock-on, retreat & loader 2020-04-21 04:46:07 -04:00
Luke Street b4dad2adf5 CMagdolite: Fix SetupCollisionActors 2020-04-21 02:15:02 -04:00
Luke Street 5f66ab2219 CMagdolite: Minor cleanup 2020-04-21 01:32:16 -04:00
Phillip Stephens 0c96380897 Minor fixes, start renaming member variables 2020-04-21 01:06:52 -04:00
Phillip Stephens d1c796f2a9 Initial CMagdolite imps 2020-04-21 01:06:52 -04:00
Luke Street d3a44259c3
Merge pull request #315 from lioncash/init
RuntimeCommonB: Make use of bitfield initializers where applicable
2020-04-21 00:56:39 -04:00
Lioncash 554893ef85 RuntimeCommonB: Make use of bitfield initializers where applicable
Given that we now target C++20, we can make use of bitfield initializers
where applicable.
2020-04-20 15:57:25 -04:00
Luke Street 7b1e041123
Merge pull request #301 from AxioDL/omegapirate
OmegaPirate implementation
2020-04-20 03:21:04 -04:00
Luke Street 2ee2bbc0c1 COmegaPirate: Fix CFlash rendering 2020-04-20 03:20:22 -04:00
Luke Street 3563a1c8c4 COmegaPirate: Fix UpdateScale & Landed; renaming 2020-04-20 02:14:17 -04:00
Lioncash 2103c38f54 CCompoundTargetReticle: Remove unused variable
This is only used in COrbitPointMarker.
2020-04-20 00:48:29 -04:00
Lioncash 1d0151ccbc General: Make use of lock deduction guides 2020-04-20 00:38:10 -04:00
Lioncash dca87e7dce CPlayerGun: Convert missed literal to a boolean literal
whoops.
2020-04-19 23:39:04 -04:00
Lioncash 1f8f3726e6 CPlayerGun: Make use of bool literal where appropriate
Avoids a conversion to bool from int.
2020-04-19 23:35:07 -04:00
Luke Street 32c44cbf05 Merge branch 'master' into omegapirate
# Conflicts:
#	Runtime/GuiSys/CAuiImagePane.cpp
2020-04-19 22:12:18 -04:00
Luke Street 1fd28d3fc3 CStateMachine: Use logvisor report for state logging 2020-04-19 22:11:09 -04:00
Lioncash f0133c9eef CAuiImagePane: Eliminate implicit conversions
We can make them explicit instead.
2020-04-19 22:06:30 -04:00
Lioncash ecdedb5d8f CActorModelParticles: Make IsMediumOrLarge() parameter a const reference
Nothing about the parameter is modified.
2020-04-19 21:44:31 -04:00
Luke Street 2185dc30f1 CStateManager: Fix seek again (I tested it this time) 2020-04-19 21:40:08 -04:00
Luke Street 764432882c CStateManager: Fix wrong stream position on error 2020-04-19 21:27:08 -04:00
Luke Street d5fcb4a917 CStateManager: Revert debug commit 2020-04-19 21:20:25 -04:00
Luke Street 24acb585f8 MSVC & zeus fixes; update hecl-gui 2020-04-19 21:09:30 -04:00
Luke Street de5513e277 COmegaPirate: Renaming & fixes 2020-04-19 19:26:25 -04:00
Luke Street 4e88f503ac COmegaPirate: Implement CFlash 2020-04-19 02:47:25 -04:00
Lioncash ec5d680be0 CBurstFire: Unindent conditionals where applicable
Makes it nicer to read early-exit conditions.
2020-04-19 00:40:46 -04:00
Luke Street e50d363e88 CPlayerGun: Rename EMissileState; minor CMotionState::Update fix 2020-04-19 00:26:53 -04:00
Luke Street a3e0c42794
Merge pull request #312 from lioncash/explicit
MkCastTo: Make operator bool instances explicit
2020-04-19 00:24:15 -04:00
Luke Street 025a989e12 CElementGen: Use x338_moduColor in RenderModels 2020-04-18 23:41:35 -04:00
Lioncash 2c3e5e205f MkCastTo: Make operator bool instances explicit
Prevents error prone implicit conversions.
2020-04-18 23:02:11 -04:00
Luke Street 0a2d0bcfe9
Merge pull request #313 from lioncash/bug
CToken: Amend incorrect return value of TToken's operator=
2020-04-18 18:16:42 -04:00
Luke Street 30f2ac3f26 Merge branch 'master' into omegapirate 2020-04-18 18:14:51 -04:00
Luke Street 7f15390d4f Editor: Only create Win32 console & redirect logging if not attached 2020-04-18 03:02:44 -04:00
Phillip Stephens df75c00203
Fix WideScreenFilter crash 2020-04-17 15:32:26 -07:00
Lioncash 76f0b57340 General: Use bool literals where applicable
More indicative of the passed in type compared to raw values.
2020-04-17 17:43:56 -04:00
Lioncash 8e5fc3668c CToken: Amend incorrect return value of TToken's operator=
This should be returning by reference, not the pointer of this.
2020-04-17 17:16:33 -04:00
Lioncash 0b05c906df CScriptEffect: Eliminate variable shadowing
Avoids clashing names.
2020-04-17 16:31:02 -04:00
Luke Street 8f5caca1e5 CMemoryCardSysWin: Add includes 2020-04-17 15:10:52 -04:00
Luke Street 61e656e732 CDvdFile: Remove const from auto type for MSVC 2020-04-17 15:01:31 -04:00
Luke Street 36bbc5004f CDvdFile: Use auto for string_view::begin 2020-04-17 14:52:25 -04:00
Luke Street 4a8f077d92 MP1: Use _SYS_STR where needed 2020-04-17 14:39:40 -04:00
Luke Street 248e7654fa MP1: char -> boo::SystemChar 2020-04-17 14:31:29 -04:00
Luke Street 73b9d2024b MP1: Use SystemStringConv for printing version string 2020-04-17 14:24:06 -04:00
Lioncash 5491f3ff23 CKnockBackController: Simplify initialization of x24_ in constructor
Same behavior, less code.
2020-04-17 13:17:27 -04:00
Lioncash 26ac3b166d CKnockBackController: Make use of braces where applicable
Makes code more consistent.

Where applicable we can also unindent code.
2020-04-17 13:17:27 -04:00
Phillip Stephens acf513c6bf
Merge branch 'master' of ssh+git://git.axiodl.com:6431/AxioDL/urde 2020-04-17 05:54:17 -07:00
Phillip Stephens a06594f404
Fix CAutoMapper strings, disable saving on non-USA/GC versions 2020-04-17 05:53:22 -07:00
Lioncash 58040eb53d CKnockBackController: Make CalculateExtraHurlVelocity() a const member function
This doesn't modify internal member state, so it can be marked const

While we're at it we can also invert the conditional to unindent the
main calculation.
2020-04-17 01:07:41 -04:00
Lioncash b55d1e4c77 CKnockBackController: Make use of const references where applicable
In many cases the CPatterned& parameter is only used for read-only
querying. We can make this explicit in the interface.
2020-04-17 01:03:12 -04:00
Lioncash 49cc019699 CKnockBackController: Make GetKnockBackCharacterState() a const member function
This doesn't modify internal instance state, so this can be made const.
2020-04-17 00:58:29 -04:00
Lioncash 529d7e58bd CFishCloud: Initialize x230_whichModel on construction
Provides a deterministic initial state.
2020-04-17 00:49:06 -04:00
Lioncash fa9f0fdc61 CFishCloud: Brace statements where applicable
Makes the code more uniform and consistent.

While we're in the same area, we can make use of const where applicable.
2020-04-17 00:47:25 -04:00
Lioncash 3715e6dcbb CFlameWarp: Make use of const where applicable
Makes algorithms easier to follow by explicitly marking immutable
state.
2020-04-17 00:27:22 -04:00
Lioncash ed125031f3 CFluidUVMotion: Collapse separate resize and assignment into a constructor call
We can pre-size and insert the elements all at the same time.
2020-04-16 21:11:31 -04:00
Phillip Stephens c85f1a64dd
Merge branch 'master' of ssh+git://git.axiodl.com:6431/AxioDL/urde 2020-04-16 17:20:25 -07:00
Phillip Stephens ba3b23edaa
Disable saving on non-NTSC-U versions 2020-04-16 17:19:55 -07:00
Lioncash 20e5595042 CGameState: Always initialize x80_
Provides a deterministic initial state.
2020-04-16 20:00:26 -04:00
Lioncash a551dbc21d CGameState: Silence implicit truncation warnings
Ensures boolean conditions are used where applicable.
2020-04-16 20:00:20 -04:00
Lioncash f844f2028b CGameOptions: Give all function prototype parameters a name
Makes the interface more self-documenting and also allows better IDE
introspection.
2020-04-16 19:49:35 -04:00
Lioncash e7ef1e0b5e CGameOptions: Make TuneScreenBrightness() a const member function
This member function doesn't modify internal class state.
2020-04-16 19:42:22 -04:00
Lioncash c32c42e12b CGameOptions: Amend wonky formatting of VisorOptsNew 2020-04-16 13:00:08 -04:00
Phillip Stephens be45be9d67
Fix FrontEnd options screen 2020-04-16 03:35:51 -07:00
Phillip Stephens 9365c35000
Finish fixing STRG indices 2020-04-16 03:25:59 -07:00
Phillip Stephens 8e2636c14c
Undo debug code 2020-04-15 23:58:00 -07:00
Phillip Stephens c64e3d2ba7
Initial string fixes 2020-04-15 23:57:04 -07:00
Phillip Stephens 582d8a6999
Initial PAL/JP/Trilogy imps, various cleanup 2020-04-15 22:26:14 -07:00
Phillip Stephens 52b4db2f00
Integrate URDEVersionInfo 2020-04-15 06:42:44 -07:00
Phillip Stephens e553a9022f
Fix CMemoryCardSys 2020-04-15 04:27:06 -07:00
Phillip Stephens 8a974d6e5e
Merge branch 'master' of ssh+git://git.axiodl.com:6431/AxioDL/urde 2020-04-15 00:57:37 -07:00
Phillip Stephens 1eade15395
Add version info to extracted data, clean up MP1.* 2020-04-15 00:56:59 -07:00
Luke Street b020904e84 Comment out printfs entirely 2020-04-14 22:14:27 -04:00
Luke Street eb89a17817 CDummyWorld: Fix IGetAreaId 2020-04-14 21:15:38 -04:00
Lioncash 6436184a3f CWorld: Make use of find_if in GetAreaIdForSaveId()
Same behavior minus any explicit mutable state.
2020-04-14 16:40:13 -04:00
Lioncash 86b94ad915 CWorld: Make use of std::find_if in IGetAreaId
Removes explicit mutable state. This can be further simplified in the
future with ranges.
2020-04-14 16:31:17 -04:00
Lioncash 655805ffcb CWorld: Add missing override specifier 2020-04-14 16:17:26 -04:00
Lioncash 8e89ac234f CElementGen: Initialize x80_timeDeltaScale on construction
Provides deterministic state upon construction, which is nicer for
debugging.
2020-04-14 16:11:38 -04:00
Lioncash 384efebf55 CElementGen: Collapse loop into a ranged-for loop
Same behavior, nicer syntax.
2020-04-14 16:08:21 -04:00
Lioncash c14721611b CEnergyProjectile: Make use of const where applicable
While we're at it, make use of consistent bracing, given some
conditionals traveled over one line.
2020-04-14 15:47:45 -04:00
Luke Street 9cf95b5c10 Editor: Move cvars to CVarCommons 2020-04-14 15:20:51 -04:00
Luke Street 94be460a1b MP1: Convert MP1_VARIABLE_DELTA_TIME to cvar 2020-04-14 14:41:02 -04:00
Lioncash 3c8ce3dc99 CGuiTextSupport: Amend typo in debug group label
This is within the Render() function, so we can rename the group name.
2020-04-14 13:34:50 -04:00
Lioncash 5381c011a0 CParticleElectric: Eliminate several sign conversion instances
Makes sign conversion cases explicit and eliminates them entirely in
other cases.
2020-04-14 12:30:38 -04:00
Lioncash 4cbf8ef513 CParticleElectric: Mark CGlobalRandom instance as maybe unused
This has a stateful destructor, so we mark it as unused to silence
unused variable warnings.
2020-04-14 12:16:25 -04:00
Lioncash 8aef2cf95d CParticleElectric: Make use of const where applicable
Makes it easier to read long functions by knowing which variables are
mutable.
2020-04-14 04:20:03 -04:00
Lioncash fed72614ef CParticleSwoosh: Use const where applicable
Given the length of some functions, this makes following flow nicer,
since it's easier to visually see which variables get modified.
2020-04-14 03:56:27 -04:00
Lioncash 6fbf6734c2 CParticleSwoosh: Eliminate variable shadowing 2020-04-14 03:31:31 -04:00
Lioncash 480d27e68c CParticleSwoosh: Initialize class data members
Makes for deterministic initial state.
2020-04-14 03:27:15 -04:00
Luke Street 112322be5a
Merge pull request #311 from lioncash/sign
CScanDisplay: Eliminate implicit sign conversions
2020-04-14 02:10:13 -04:00
Luke Street 594fe2fcbd
Merge pull request #310 from lioncash/table
CFluidPlane: Make use of std::array where applicable
2020-04-14 02:09:19 -04:00
Lioncash 59a788a987 CParticleGlobals: Eliminate implicit type conversions
Makes them all explicit for the reader.
2020-04-13 18:44:51 -04:00
Lioncash 2c7d10c4b4 CCompoundTargetReticle: Brace statements where applicable 2020-04-13 17:16:23 -04:00
Lioncash 85f930ef2e CCompoundTargetReticle: Convert unnecessary floats into bools
Using floats here is extremely suspect and almost certainly
unintentional.
2020-04-13 16:54:45 -04:00
Lioncash 1767338aba CCompoundTargetReticle: Make eliminate hardcoded size
We can just query the capacity to dehardcode it.
2020-04-13 16:52:01 -04:00
Lioncash e26afe887f CCompoundTargetReticle: Make use of std::array where applicable
Same behavior, stronger typing.

While we're at it, we can eliminate a case of variable shadowing.
2020-04-13 16:50:37 -04:00
Lioncash c6278c0e9f CCompoundTargetReticle: Initialize all data members
Provides deterministic initial state.
2020-04-13 16:41:28 -04:00
Lioncash 2850b7e7fb CWallCrawlerSwarm: Initialize all CBoid members
Provides a deterministic initial state.
2020-04-13 16:36:24 -04:00
Lioncash 7fcd6f41cf CStateMachine: Initialize data members where applicable
Provides a deterministic initial state.
2020-04-13 16:34:18 -04:00
Lioncash 0d97104cf2 CScriptSpindleCamera: Initialize x33c_24_inResetThink in constructor
Provides a deterministic initial state.
2020-04-13 16:32:41 -04:00
Lioncash 4341dfae50 CScriptPickup: Initialize x274_tractorTime in constructor
Provides a deterministic initial state upon construction.
2020-04-13 16:31:28 -04:00
Lioncash a554e5d4a6 CPathFindSearch: Initialize xcc_result in constructor
Provides a deterministic initial state upon construction.
2020-04-13 16:29:12 -04:00
Lioncash 9f21f8ef55 CFluidPlaneCPU: Initialize m_cachedDoubleLightmapBlend and m_cachedAdditive
Provides a deterministic initial state upon construction.
2020-04-13 16:27:21 -04:00
Lioncash 498c940479 CFluidPlane: Initialize all members of SRippleInfo
Provides a deterministic initial state, which is useful for debugging.
2020-04-13 16:25:36 -04:00
Lioncash 5b9a689703 CParticleSwoosh: Initialize x68_frame on construction
Provides a deterministic initial state, which makes for nicer debugging.
2020-04-13 16:23:07 -04:00
Lioncash 93622d9b4b CIntElement: Initialize x14_holdVal in CIESampleAndHold
Provides a deterministic initial state upon construction, which makes
for nicer debugging.
2020-04-13 16:20:51 -04:00
Lioncash 786675f307 CTextExecuteBuffer: Move initialization of xa8_curWordIt into initializer list 2020-04-13 16:18:38 -04:00
Lioncash 50ba80247b CTextExecuteBuffer: Initialize xac_curY and xb0_curX in the constructor
Provides a deterministic initial state upon construction for easier
debugging.
2020-04-13 16:18:02 -04:00
Luke Street 654e3e705e Update hecl; disable MP1_VARIABLE_DELTA_TIME 2020-04-13 15:02:07 -04:00
Lioncash 6806d4914c CHudBossEnergyInterface: Initialize x0_alpha on construction
Provides a deterministic initial state which is helpful for debugging.
2020-04-13 15:00:44 -04:00
Lioncash 67786721ff CHudBossEnergyInterface: Make use of structured bindings in constructor
Same behavior, minus a verbose type name.
2020-04-13 14:59:47 -04:00
Lioncash 4e6150acc4 CHudDecoInterface: Make missed virtual call in constructor explicit
Missed this one in the previous commit.
2020-04-13 14:54:15 -04:00
Lioncash c8be142846 CHudDecoInterface: Make virtual calls in constructor explicitly qualified
Virtual functions called in a constructor or destructor are statically
resolved. Given this is a potential source of bugs, we qualify these
functions to make it explicit that this is indeed the kind of behavior
desired.
2020-04-13 14:52:34 -04:00
Lioncash 3a5a3e2011 CHudRadarInterface: Make use of const where applicable
Same behavior, but makes it obvious some references are only used in a
read-only manner.
2020-04-13 14:25:59 -04:00
Lioncash 29cd228d03 CMorphBall: Eliminate hardcoded sizes
We can query the container capacity directly instead of hardcoding it
in.
2020-04-13 14:10:52 -04:00
Lioncash 2ad45e481f CAuxWeapon: Use names for sound IDs
Same behavior, but slightly more self-documenting on what they actually
are.
2020-04-13 10:36:38 -04:00
Phillip Stephens 5aae402149
Merge branch 'master' of ssh+git://git.axiodl.com:6431/AxioDL/urde 2020-04-13 00:48:15 -07:00
Phillip Stephens 6838515d3d
Fix ALPH default value 2020-04-13 00:48:00 -07:00
Lioncash 7d6e466b68 CDecalManager: Make use of std::nullopt where applicable
Same thing, less verbose.
2020-04-13 01:43:06 -04:00
Lioncash 6fc32f44df CRumbleGenerator: Make use of fmt::print instead of printf
Less need to care about formatting specifiers.
2020-04-12 22:41:19 -04:00
Lioncash 0a01a30bf5 CScanDisplay: Eliminate implicit sign conversions
Removes implicit sign conversions and also dehardcodes quite a bit of
sizes.
2020-04-12 22:05:52 -04:00
Lioncash 8000fb9e42 CScannableObjectInfo: Remove hardcoded capacity size
We can just query the container for this.
2020-04-12 21:45:11 -04:00
Lioncash e91432ebf0 CScannableObjectInfo: Make use of size_t in constructor
Gets rid of unnecessary zero extensions and keeps loop variables the
same sized type as the comparison type.

While we're at it we can collapse a loop into a ranged for and get rid
of some avoidable sign conversions.
2020-04-12 21:42:54 -04:00
Lioncash 414c06b33e CScriptDebris: Make use of std::array
Same behavior, stronger typing.
2020-04-12 21:07:17 -04:00
Lioncash 7df73b6f4c CScriptDock: Get rid of variable shadowing
Same behavior, less bug vectors.
2020-04-12 15:29:53 -04:00
Lioncash 7fb2b6ac0b CScriptDock: Make dock material list constexpr
Same behavior, no runtime overhead.
2020-04-12 15:28:18 -04:00
Lioncash 175502cb0d CScriptMazeNode: Make use of std::array where applicable
Same behavior, stronger typing.
2020-04-12 15:23:28 -04:00
Lioncash c84f430852 CScriptPlatform: Simplify IsRider()
Same behavior, less code.
2020-04-12 15:11:24 -04:00
Lioncash fd5c6f9e59 CScriptPlatform: Make use of TCastToConstPtr where applicable
Makes the read-only intent more explicit to the reader.
2020-04-12 14:59:59 -04:00
Lioncash ff847eaf41 CScriptPlatform: Make platform material list constexpr
Same behavior, no runtime overhead.
2020-04-12 14:11:11 -04:00
Lioncash 1d112134cf CScriptPlayerHint: Make use of std::any_of/std::find_if where applicable
Same behavior, can be simplified even further with ranges in the future.
2020-04-12 14:00:34 -04:00
Lioncash ff123f7820 General: Make use of static_cast within point generators
The more restrictive static_cast is permissable when casting from void*.
2020-04-12 13:29:34 -04:00
Lioncash 5d85cd496a CFluidPlane: Make use of std::array where applicable
Makes all the arrays strongly typed. We can also use type aliases to
greatly shorten some type definitions.
2020-04-12 12:17:12 -04:00
Lioncash fa1e4f38df CScriptWater: Mark SolidFilter as constexpr
Same behavior, minus runtime initializers.
2020-04-12 11:59:08 -04:00
Lioncash dfa206eda9 CScriptSpecialFunction: Make use of std::array where applicable
Same behavior, stronger typing.
2020-04-12 11:58:08 -04:00
Lioncash beaccf4f9e CScriptSound: Mark kSolidFilter as constexpr
Same behavior minus runtime initializers.
2020-04-12 11:56:37 -04:00
Lioncash 2e575c184e CPatterned: Make use of constexpr where applicable 2020-04-12 11:55:40 -04:00
Lioncash d8e7239bc6 CKnockBackController: Make use of std::array where applicable
Same behavior, stronger typing.
2020-04-12 11:53:17 -04:00
Lioncash b2ec3e7eac CGameArea: Make use of std::array where applicable
Same behavior, stronger typing, and optional runtime checking in debug
mode.
2020-04-12 11:36:19 -04:00
Lioncash a433a7852f CIceBeam/CPhazonBeam: Make use of std::array where applicable
Same behavior, stronger typing.
2020-04-12 11:34:59 -04:00
Lioncash b631b5f3a1 CGunWeapon: Mark skShootAnim as constexpr
Enforce it as constexpr. The initializer is likely optimized away
anyways, given the array only contains primitives, but this is more
consistent.
2020-04-12 11:31:28 -04:00
Lioncash 96e3eaf726 CSplashScreen: Make use of std::array where applicable
Same behavior, stronger typing.
2020-04-12 11:30:09 -04:00
Lioncash f74471f603 CWarWasp: Make use of std::array where applicable
Same behavior, no array to pointer decay.
2020-04-12 11:23:30 -04:00
Lioncash cb857bd737 CSpankWeed: Make use of std::array where applicable
Same behavior, but without array to pointer decay.
2020-04-12 11:21:08 -04:00
Lioncash 23bae06742 CNewIntroBoss: Make use of std::array where applicable
Same behavior but without implicit array to pointer decay.
2020-04-12 11:18:57 -04:00
Lioncash 02a684cfdf CFlaahgra: Migrate static data into the cpp file
Same behavior, but completely makes them internally linked.

We can also make use of std::array and dehardcode some array sizes.
2020-04-12 11:16:35 -04:00
Lioncash f5418d30aa CEyeBall: Move string_view instance to cpp file
Same behavior, but gives the string full internal linkage.
2020-04-12 11:08:20 -04:00
Lioncash bfea80fc4a CBabygoth: Mark IsDestinationObstructed() as const
This doesn't alter class state, so we can mark it as const.
2020-04-12 11:05:56 -04:00
Lioncash abd576a43a CBabygoth: Make use of std::array where applicable
Same behavior, no implicit array to pointer decay. We can also move all
this data into the cpp file fully.
2020-04-12 11:03:50 -04:00
Lioncash f1aca12e6b CQuitGameScreen: Make use of std::array where applicable
Same behavior, but more strongly typed and without any implicit array to
pointer decay.
2020-04-12 10:59:07 -04:00
Lioncash eba3270c14 CMFGame: Make use of std::array where applicable 2020-04-12 10:55:22 -04:00
Lioncash c296f0ab8f CInventoryScreen: Make use of std::array where applicable
Same behavior, stronger typing.
2020-04-12 10:52:03 -04:00
Lioncash aee2259972 CTexturedQuadFilter: Mark DefaultRect as constexpr
Same behavior, minus runtime initializers.
2020-04-12 10:40:36 -04:00
Lioncash 3efc8486a4 CColoredQuadFilter: Mark DefaultRect as constexpr
Same behavior, minus runtime initializers.
2020-04-12 10:39:02 -04:00
Lioncash e0c187c607 CModelBoo: Make use of std::array where applicable
Allows decoding some array sizes.
2020-04-12 10:35:56 -04:00
Lioncash c203a0de7c CGraphics: Mark skCubeBasisMats as constexpr
Same behavior, minus potential runtime initializers.
2020-04-12 10:31:07 -04:00
Lioncash 66f5685590 CMaterialFilter: Mark skPassEverything as constexpr
Removes any potential runtime initializers.
2020-04-12 10:28:02 -04:00
Lioncash 724505e6dc CAreaOctTree: Make use of std::array where applicable
Prevents any implicit array to pointer decay from occurring.
2020-04-12 10:25:41 -04:00
Lioncash 5fc0802373 CPathCamera: Mark kLineOfSightFilter as constexpr
Same behavior, minus any potential runtime initializers.
2020-04-12 10:21:35 -04:00
Lioncash 535c02abe8 CCameraShakeData: Mark skChargedShotCameraShakeData as constexpr
Same behavior, minus potential runtime initializers.
2020-04-12 10:20:24 -04:00
Lioncash c662634226 CBallCamera: Mark BallCameraFilter as constexpr
Allows removal of runtime initializers.
2020-04-12 10:19:13 -04:00
Lioncash 14f6dd2cd8 CFluidUVMotion: Return std::array by value from CalculateFluidTextureOffset()
Same behavior, but allows for easier use of API and makes it harder to
misuse. It also makes it easier for analysis to determine out of bounds,
given we leverage std::array rather than a pointer that causes arrays to
decay and lose their size information.
2020-04-12 09:23:52 -04:00
Lioncash 3c8619ba44 CFluidPlaneManager: Make use of std::array where applicable
Eliminates any potential implicit array to pointer decay.
2020-04-12 09:09:18 -04:00
Lioncash 2069694b59 CFluidPlane: Make use of HasReference() instead of operator bool
Looks a little less out of place while performing the same behavior.
IDE's can also do lookup more reliably on a regular function as opposed
to a conversion operator.
2020-04-12 08:52:23 -04:00
Lioncash aa8f17d847 CFire: Return std::nullopt in GetTouchBounds()
Avoids unnecessarily zeroing out the entire internal buffer in
std::optional in some implementations (libstdc++/libc++).
2020-04-12 08:46:23 -04:00
Lioncash 9e168d3497 CPlasmaProjectile: Make PlayerEffectResource instances contain CAssetIds
Uses the wrapper type instead of the raw type.
2020-04-12 07:30:00 -04:00
Lioncash 976bf0d83e CGameOption: Mark C-Pad arrays constexpr
Allows elision of runtime initializers.
2020-04-12 05:43:14 -04:00
Lioncash 1085600f30 CGameOption: Eliminate truncations to bool 2020-04-12 05:43:14 -04:00
Luke Street 5e748a0d7f Particle/C*EPulse: Fix implementations 2020-04-12 05:38:44 -04:00
Lioncash 3c9fef492a CGameOptions: Mark GameOptionsRegistry as constexpr
Same behavior but eliminates potential runtime initializers.
2020-04-12 05:27:44 -04:00
Lioncash d5e57b5348 CCompoundTargetReticle: Make skZeroRenderState constexpr
Allows eliding runtime initializers where applicable. Particularly for
the static data.
2020-04-12 04:19:53 -04:00
Luke Street 32134990c3
Merge pull request #309 from lioncash/constexpr8
CMorphBall: Make use of constexpr on file-scope arrays
2020-04-12 03:06:59 -04:00
Luke Street 56cebfbacd
Merge pull request #308 from AxioDL/fmtlib-update
Update fmtlib
2020-04-12 03:06:46 -04:00
Luke Street 9f8064b4a1
Merge pull request #307 from lioncash/constexpr7
CModel: Mark CModelFlag instances as constexpr where applicable
2020-04-12 03:06:12 -04:00
Lioncash 1fff540102 CAnimPlaybackParms: Make class constexpr constructible
Allows for removal of some trivial runtime initializers.
2020-04-11 20:55:46 -04:00
Lioncash fef6711ce8 CMorphBall: Make use of constexpr on file-scope arrays
Same behavior, but allows elision of runtime initializers.
2020-04-11 20:41:52 -04:00
Lioncash 1b42bda711 CParticleDataFactory: Make operator bool() instances explicit
Gets rid of implicit error-prone conversions to bool
2020-04-11 20:33:02 -04:00
Lioncash d6f2e27d8a CParticleGlobals: Make use of std::array where applicable 2020-04-11 20:29:36 -04:00
Lioncash 7d42b2d763 CParticleGlobals: Initialize all data members
Provides a deterministic initial state.
2020-04-11 20:23:40 -04:00
Lioncash 9d6b9142bb CParticleSwoosh: Make use of std::array where applicable
Same behavior, no implicit array to pointer decay.
2020-04-11 20:20:47 -04:00
Lioncash 76e226f831 CWorldTransManager: Convert one missed array over to std::array 2020-04-11 19:55:23 -04:00
Lioncash 58fdb64ab5 CWorldTransManager: Initialize all members on construction
Provides a deterministic initial state upon construction, making
debugging easier.
2020-04-11 19:53:30 -04:00
Lioncash e72507b20c CWorldTransManager: Make use of std::array where applicable
Provides stronger typing, and eliminates any potential implicit array to
pointer decay.
2020-04-11 19:50:49 -04:00
Lioncash 54dededb9b CNewFlameThrower: Make constructor take a std::array by reference
Same behavior, but enforces the size requirement instead of accepting
any arbitrary const CAssetId* pointer.
2020-04-11 19:37:42 -04:00
Lioncash fa0dcf5b12 WeaponCommon: Use string_view with get_asset_id_from_name()
Internal functions expect a std::string_view, so we can just make the
parameter a string_view as well to push the responsibility outwards into
the caller.
2020-04-11 19:33:00 -04:00
Lioncash ff6c1fdd3d IOStreams: Make constructors for CBitStreamReader and CZipInputStream explicit
Same behavior minus the error prone implicit constructions.
2020-04-11 19:23:28 -04:00
Jack Andersen 5b4441ac36 Update fmtlib 2020-04-11 12:51:39 -10:00
Lioncash 75c07677ed CModel: Mark CModelFlag instances as constexpr where applicable
Allows more runtime initializes to potentially be elided.
2020-04-11 16:56:13 -04:00
Luke Street 7055b6983f
Merge pull request #306 from lioncash/random
CRandom16: Make constructor explicit
2020-04-11 16:36:51 -04:00
Lioncash 4bdcc5efdb CModel: Make CModelFlags constexpr constructible.
Allows initializers to be elided where applicable.

While we're at it, we can make the conditional flag tests more explicit
and eliminate implicit truncation in the case of the second flag test.
2020-04-11 16:16:19 -04:00
Lioncash 75d8988ee8 CRandom16: Make constructor explicit
Same behavior, minus the implicit conversions upon construction.
2020-04-11 16:15:05 -04:00
Lioncash 01bb0f3840 CWorld: Separate enum definition from declaration
Allows more flexibility if anything ever gets moved around and is
arguably nicer to read.
2020-04-11 15:29:01 -04:00
Lioncash 515103aa92 CWeaponDescription: Make operator bool() explicit
Eliminates potential error-prone implicit conversions.
2020-04-11 15:04:55 -04:00
Lioncash 886d951736 CCameraShakeData: Make use of boolean literals where applicable in LoadCameraShakeData
Same behavior, minus the implicit conversions to bool.
2020-04-11 14:33:27 -04:00
Phillip Stephens 9375514868
Fix CRipper 2020-04-11 07:29:06 -07:00
Luke Street 072ac0df16 Runtime: Wrap printf calls in #ifndef NDEBUG 2020-04-11 02:35:55 -04:00
Luke Street e23c3d3705 Runtime: Wrap fmt::print calls in #ifndef NDEBUG 2020-04-11 02:25:41 -04:00
Luke Street 0fc53c91dc
Merge pull request #303 from lioncash/size
IAnimReader: Make use of size_t for capacity and iterators
2020-04-11 02:12:41 -04:00
Luke Street 304340bd35
Merge pull request #304 from AxioDL/remove-union-bitfields
Runtime: Replace bitfield unions with explicit initializers
2020-04-11 02:12:21 -04:00
Luke Street 22ac7d8099 CScriptCoverPoint: Fix GetAttackDirection return value 2020-04-11 02:09:58 -04:00
Luke Street 0339c16e20 CScriptCoverPoint: Fix GetAttackDirection 2020-04-11 02:02:28 -04:00
Luke Street bb7e94f304 Runtime/World: Replace bitfield unions with constructor initializers 2020-04-11 01:50:10 -04:00
Luke Street 22880abb7e Runtime/Weapon: Replace bitfield unions with constructor initializers 2020-04-11 00:49:02 -04:00
Luke Street c7ca8dc3a7 Runtime/Particle: Replace bitfield unions with constructor initializers 2020-04-11 00:39:49 -04:00
Lioncash 0414235e76 CTransitionDatabaseGame: Tidy up GetMetaTrans()
We can leverage auto here to make the lambda functions significantly
less verbose.
2020-04-10 23:51:18 -04:00