b_gnd equivalent (#2340)

* b_gnd equivalent

* fix dEvt_info_c inlines

* fix some more inlines

1 files changed, 19 insertions, 19 deletions

diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp
index 1002a62f41..d053c9ee05 100644
--- a/src/d/actor/d_a_door_shutter.cpp
+++ b/src/d/actor/d_a_door_shutter.cpp
@@ -225,7 +225,7 @@ void daDoor20_c::setEventPrm() {
     }
     if (dComIfGp_roomControl_checkStatusFlag(roomNo, 1)) {
         if (door_param2_c::getKind(this) == 9) {
-            if (daPy_py_c::i_checkNowWolf()) {
+            if (daPy_py_c::checkNowWolf()) {
                 return;
             }
             int iStack_48;
@@ -256,7 +256,7 @@ void daDoor20_c::setEventPrm() {
                 }
             }
         } else {
-            if (daPy_py_c::i_checkNowWolf()) {
+            if (daPy_py_c::checkNowWolf()) {
                 if (!player->checkMidnaRide() || !daMidna_c::checkMidnaRealBody()) {
                     return;
                 }
@@ -279,7 +279,7 @@ void daDoor20_c::setEventPrm() {
             }
             if (chkMakeKey()) {
                 if (field_0x5f0) {
-                    if (daPy_py_c::i_checkNowWolf()) {
+                    if (daPy_py_c::checkNowWolf()) {
                         if (dComIfGs_getKeyNum() == 0) {
                             return;
                         }
@@ -318,7 +318,7 @@ void daDoor20_c::setEventPrm() {
             if (checkArea(getSize2X(), 12100.0f, 62500.0f)) {
                 eventInfo.setEventId(field_0x692[field_0x6cb]);
                 eventInfo.setMapToolId(field_0x6b8[field_0x6cb]);
-                eventInfo.i_onCondition(4);
+                eventInfo.onCondition(4);
             }
         }
     }
@@ -422,7 +422,7 @@ static u16 const l_eff_id_lv4[5] = {
 /* 80461A60-80461D24 000FA0 02C4+00 1/1 0/0 0/0 .text            openInit_0__10daDoor20_cFv */
 void daDoor20_c::openInit_0() {
     J3DAnmTransform* anm;
-    if (daPy_py_c::i_checkNowWolf()) {
+    if (daPy_py_c::checkNowWolf()) {
         if (door_param2_c::getKind(this) == 10) {
             anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "md_oj_DoorOpF.bck");
         } else {
@@ -462,7 +462,7 @@ void daDoor20_c::openInit_0() {
 /* 80461D24-80461EC4 001264 01A0+00 1/1 0/0 0/0 .text            openInit_1__10daDoor20_cFv */
 void daDoor20_c::openInit_1() {
     J3DAnmTransform* anm;
-    if (daPy_py_c::i_checkNowWolf()) {
+    if (daPy_py_c::checkNowWolf()) {
         anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "md_oj_DoorOpC.bck");
     } else {
         anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpC.bck");
@@ -518,7 +518,7 @@ int daDoor20_c::openProc(int param_1) {
             dComIfGp_getVibration().StartShock(4, 15, cXyz(0.0f, 1.0f, 0.0f));
         } else {
             if (field_0x584.getFrame() == 18.0f) {
-                if (daPy_py_c::i_checkNowWolf()) {
+                if (daPy_py_c::checkNowWolf()) {
                     u32 mdnfx;
                     if (field_0x672) {
                         mdnfx = Z2SE_OBJ_WOOD_DR_OP_MDN_FX;
@@ -546,7 +546,7 @@ int daDoor20_c::openProc(int param_1) {
         {
             dComIfGp_getVibration().StartShock(4, 15, cXyz(0.0f, 1.0f, 0.0f));
         }
-        if (daPy_py_c::i_checkNowWolf()) {
+        if (daPy_py_c::checkNowWolf()) {
             if (field_0x584.getFrame() == 20.0f) {
                 if (door_param2_c::getKind(this) == 2) {
                     sfx = Z2SE_OBJ_L8_SHTR_OP;
@@ -1211,7 +1211,7 @@ int daDoor20_c::orderStopEvent() {
 
 /* 80463FBC-80464118 0034FC 015C+00 2/2 0/0 0/0 .text            actionWait__10daDoor20_cFv */
 int daDoor20_c::actionWait() {
-    if (eventInfo.i_checkCommandDoor()) {
+    if (eventInfo.checkCommandDoor()) {
         initOpenDemo(1);
         setAction(ACTION_DEMO);
         demoProc();
@@ -1344,7 +1344,7 @@ int daDoor20_c::draw() {
         return 1;
     }
     calcMtx();
-    if (!eventInfo.i_checkCommandDoor() && field_0x5c8 != dComIfGp_roomControl_getStayNo()) {
+    if (!eventInfo.checkCommandDoor() && field_0x5c8 != dComIfGp_roomControl_getStayNo()) {
         field_0x5c4->Move();
         field_0x5c8 = dComIfGp_roomControl_getStayNo();
     }
@@ -1531,7 +1531,7 @@ int daDoor20_c::frontCheck() {
 
 /* 80464CEC-80464E18 00422C 012C+00 1/1 0/0 0/0 .text            drawCheck__10daDoor20_cFi */
 int daDoor20_c::drawCheck(int param_1) {
-    if (!adjoinPlayer() && !eventInfo.i_checkCommandDemoAccrpt() && !eventInfo.i_checkCommandDoor())
+    if (!adjoinPlayer() && !eventInfo.checkCommandDemoAccrpt() && !eventInfo.checkCommandDoor())
     {
         return 0;
     }
@@ -1566,7 +1566,7 @@ int daDoor20_c::checkExecute() {
     if (fopAcM_checkStatus(this, 0x1000)) {
         return 1;
     }
-    if (eventInfo.i_checkCommandDemoAccrpt() || eventInfo.i_checkCommandDoor()) {
+    if (eventInfo.checkCommandDemoAccrpt() || eventInfo.checkCommandDoor()) {
         return 2;
     }
     if (field_0x67d != dComIfGp_roomControl_getStayNo()) {
@@ -1720,7 +1720,7 @@ void daDoor20_c::makeEventId() {
     int i;
     switch (field_0x691) {
     case 1:
-        if (player != NULL && player->i_checkNowWolf()) {
+        if (player != NULL && player->checkNowWolf()) {
             int j = 0;
             for (i = 4; i < 8; i++, j++) {
                 field_0x692[i] =
@@ -1735,7 +1735,7 @@ void daDoor20_c::makeEventId() {
         }
         break;
     case 3:
-        if (player != NULL && player->i_checkNowWolf()) {
+        if (player != NULL && player->checkNowWolf()) {
             int j = 0;
             for (i = 4; i < 8; i++, j++) {
                 field_0x692[i] =
@@ -1750,7 +1750,7 @@ void daDoor20_c::makeEventId() {
         }
         break;
     case 2:
-        if (player != NULL && player->i_checkNowWolf()) {
+        if (player != NULL && player->checkNowWolf()) {
             int j = 0;
             for (i = 4; i < 8; i++, j++) {
                 field_0x692[i] =
@@ -1772,7 +1772,7 @@ void daDoor20_c::makeEventId() {
         }
         break;
     case 5:
-        if (player != NULL && player->i_checkNowWolf()) {
+        if (player != NULL && player->checkNowWolf()) {
             int j = 0;
             for (i = 4; i < 8; i++, j++) {
                 field_0x692[i] =
@@ -1787,7 +1787,7 @@ void daDoor20_c::makeEventId() {
         }
         break;
     case 6:
-        if (player != NULL && player->i_checkNowWolf()) {
+        if (player != NULL && player->checkNowWolf()) {
             int j = 0;
             for (i = 4; i < 8; i++, j++) {
                 field_0x692[i] =
@@ -1903,7 +1903,7 @@ void daDoor20_c::getRestartPos(cXyz* param_1) {
     cXyz acStack_78 = player->current.pos - current.pos;
     f32 dVar9 = acStack_78.inprodXZ(field_0x680);
     f32 fVar1;
-    if (daPy_py_c::i_checkNowWolf()) {
+    if (daPy_py_c::checkNowWolf()) {
         if (dVar9 < 0.0f) {
             fVar1 = 300.0f;
         } else {
@@ -1969,7 +1969,7 @@ void daDoor20_c::setGoal() {
     mDoMtx_stack_c::multVec(&local_1c, &local_1c);
     local_1c.x = local_1c.x * 0.8f;
     local_1c.y = 0.0f;
-    if (daPy_py_c::i_checkNowWolf()) {
+    if (daPy_py_c::checkNowWolf()) {
         local_1c.z = -300.0f;
     } else {
         local_1c.z = -200.0f;