diff options
| author | Trueffel <106771418+Trueffeloot@users.noreply.github.com> | 2023-09-19 22:43:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-19 13:43:05 -0700 |
| commit | febfd40837b1724f55f921f135310cae08801ebe (patch) | |
| tree | 7ee8a901cca0e4b56a88410ca69a17332a1ac329 /src/d/d_bomb.cpp | |
| parent | f123de29e6b19b765a25e829d0e9dc0c0e16b668 (diff) | |
make nbomb inherit instead of creating a fopAc_ac_c object (#1937)
* make nbomb inherit instead of creating an object
* add newline at the end of the cpp
Diffstat (limited to 'src/d/d_bomb.cpp')
| -rw-r--r-- | src/d/d_bomb.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/d/d_bomb.cpp b/src/d/d_bomb.cpp index 4eadd75cc8..34c4457194 100644 --- a/src/d/d_bomb.cpp +++ b/src/d/d_bomb.cpp @@ -7,8 +7,8 @@ #include "d/d_procname.h" bool dBomb_c::checkStateCarry() { - return (fopAcM_checkCarryNow(&mActor) || fopAcM_checkHookCarryNow(&mActor) || - fopAcM_GetParam(&mActor) == 2 || fopAcM_GetParam(&mActor) == 1); + return (fopAcM_checkCarryNow(this) || fopAcM_checkHookCarryNow(this) || + fopAcM_GetParam(this) == 2 || fopAcM_GetParam(this) == 1); } bool dBomb_c::checkFlowerBombWait(fopAc_ac_c* param_1) { @@ -16,9 +16,9 @@ bool dBomb_c::checkFlowerBombWait(fopAc_ac_c* param_1) { } bool dBomb_c::checkWaterBomb(fopAc_ac_c* param_1) { - return (fopAcM_GetName(&mActor) == PROC_NBOMB && daNbomb_c::checkWaterBomb()); + return (fopAcM_GetName(this) == PROC_NBOMB && daNbomb_c::checkWaterBomb()); } bool dBomb_c::checkInsectBombMove(fopAc_ac_c* param_1) { - return (fopAcM_GetName(&mActor) == PROC_NBOMB && fopAcM_GetParam(&mActor) == 7); -}
\ No newline at end of file + return (fopAcM_GetName(this) == PROC_NBOMB && fopAcM_GetParam(this) == 7); +} |