Browse Source

增加车卡超时状态

daiyueteng 6 years ago
parent
commit
f9afd95b9e
1 changed files with 3 additions and 2 deletions
  1. 3 2
      card.cpp

+ 3 - 2
card.cpp

@@ -672,11 +672,12 @@ int  card_location_base::get_stat()
     {
         return  (ES_DEAL_HELP == ev_ptr->m_status) ?  STATUS_HELP_DEALED : STATUS_HELP;
     }
-    else if(0 != get_mine_tool()->m_status_call)
+    else if(CALL_NONE != get_mine_tool()->m_status_call)
     {
         return  STATUS_CALL;
     }
-    else if(event_list::instance()->get(m_id, ET_CARD_AREA_OVER_TIME_PERSON))
+    else if(event_list::instance()->get(
+                m_id, is_person()? ET_CARD_AREA_OVER_TIME_PERSON: ET_CARD_AREA_OVER_TIME_VEHICLE))
     {
         return  STATUS_AREA_OVER_TIME;
     }