d_a_npc_worm matching (#2365)

* d_a_npc_worm matching

* Rename a_this

src/d/actor/d_a_e_nest.cpp

@@ -610,7 +610,7 @@ static void e_nest_hahen(e_nest_class* i_this) {
                         i_this->mTimers[0] = 60;
                     } else {
                         dComIfGp_att_CatchRequest(a_this, 0x76, 100.0f, 50.0f, -150.0f, 0x5000, 1);
-                        a_this->eventInfo.onCondition(0x40);
+                        a_this->eventInfo.onCondition(dEvtCnd_40_e);
                     }
                     break;
                 }

src/d/actor/d_a_obj_kiPot.cpp

@@ -73,7 +73,7 @@ void daKiPot_c::init_modeWait() {
 void daKiPot_c::modeWait() {
     if (chkEvent() && eventInfo.checkCommandCatch() == 0) {
         dComIfGp_att_CatchRequest(this, fpcNm_ITEM_UGLY_SOUP, 100.0f, 50.0f, -50.0f, 0x2000, 1);
-        eventInfo.onCondition(0x40);
+        eventInfo.onCondition(dEvtCnd_40_e);
     }
 }
 

src/d/actor/d_a_obj_oiltubo.cpp

@@ -290,7 +290,7 @@ int daObj_Oiltubo_c::wait(void* unused) {
     case 1:
         if (!eventInfo.checkCommandCatch()) {
             dComIfGp_att_CatchRequest(this, fpcNm_ITEM_OIL_BOTTLE_2, 100.0f, 50.0f, -50.0f, 0x2000, 1);
-            eventInfo.onCondition(0x40);
+            eventInfo.onCondition(dEvtCnd_40_e);
         }
         break;
     case 2:

src/d/actor/d_a_tag_bottle_item.cpp

@@ -165,7 +165,7 @@ int daTag_BottleItem_c::wait(void* param_0) {
             cXyz pos = attention_info.position - player->attention_info.position;
         
             dComIfGp_att_CatchRequest(this,mBottleItemType,140.0f,pos.y+100.0f,pos.y-100.0f,0x2000,1);
-            eventInfo.onCondition(0x40);
+            eventInfo.onCondition(dEvtCnd_40_e);
         }
     case 2:
     case 0:

src/d/actor/d_a_tag_ss_drink.cpp

@@ -215,7 +215,7 @@ int daTag_SSDrink_c::wait(void* param_0) {
                     cXyz local_28 = attention_info.position - player->attention_info.position;
                     dComIfGp_att_CatchRequest(this, field_0x5D3, 200.0f, local_28.y + 100.0f,
                                               local_28.y - 100.0f, 0x4000, 1);
-                    eventInfo.onCondition(0x40);
+                    eventInfo.onCondition(dEvtCnd_40_e);
                 }
                 if (field_0x5D4 != 0) {
                     field_0x5D4 = 0;

src/d/d_event.cpp

@@ -274,7 +274,7 @@ int dEvt_control_c::catchCheck(dEvt_order_c* p_order) {
     fopAc_ac_c* actor2 = p_order->mActor2;
     fopAc_ac_c* actor1 = p_order->mActor1;
 
-    if (actor1 == NULL || (actor2 != NULL && !actor2->eventInfo.chkCondition(0x40))) {
+    if (actor1 == NULL || (actor2 != NULL && !actor2->eventInfo.chkCondition(dEvtCnd_40_e))) {
         return 0;
     }