|
@@ -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;
|
|
|
}
|