summaryrefslogtreecommitdiff
path: root/src/d/map/d_map.cpp
diff options
context:
space:
mode:
authorTakaRikka <38417346+TakaRikka@users.noreply.github.com>2024-03-19 04:31:53 -0700
committerGitHub <noreply@github.com>2024-03-19 13:31:53 +0200
commit25d51079a315a7e8e1b745f06ca857b2c48cf532 (patch)
tree70108224ec24446fc9cd44a6cfaed83bdd23c2ab /src/d/map/d_map.cpp
parent38e0f8927a7f14af61748d0226b4eb89513cb2a9 (diff)
remove "duplicated" inlines (#2099)
* fix f_op_actor_mng inlines * fix f_pc inlines * fix d_a_alink weak func signatures * fix d_com_inf_game inlines * fix some more inlines * fix rest of player inlines * m_Do / JSystem inlines fixed * fix upstream changes
Diffstat (limited to 'src/d/map/d_map.cpp')
-rw-r--r--src/d/map/d_map.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/d/map/d_map.cpp b/src/d/map/d_map.cpp
index b4d44a065f..196ea2df26 100644
--- a/src/d/map/d_map.cpp
+++ b/src/d/map/d_map.cpp
@@ -119,7 +119,7 @@ void renderingAmap_c::draw() {
int renderingAmap_c::getDispType() const {
int disp_type;
- switch (dStage_stagInfo_GetUpButton(i_dComIfGp_getStage()->getStagInfo())) {
+ switch (dStage_stagInfo_GetUpButton(dComIfGp_getStage()->getStagInfo())) {
case 7:
disp_type = 1;
break;
@@ -525,7 +525,7 @@ bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para
if (dComIfGp_getStartStageDarkArea() == 2) {
int temp_r3 = i_data->mNo;
if (temp_r3 == 0x33 || temp_r3 == 0x34 || temp_r3 == 0x35) {
- if (i_dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[119])) {
+ if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[119])) {
temp_r23_2 = true;
}
} else {
@@ -937,7 +937,7 @@ void dMap_c::calcMapCmPerTexel(int i_roomNo, f32* ip_cmPerTexel) {
} else {
f32 var_f31 = 0.0f;
- stage_stag_info_class* pstag = i_dComIfGp_getStage()->getStagInfo();
+ stage_stag_info_class* pstag = dComIfGp_getStage()->getStagInfo();
JUT_ASSERT(pstag != 0);
if (pstag != NULL) {