From 680fe0f7e6d4a94d5ee7f95dd6a5926012196e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Mon, 25 Nov 2019 05:25:10 +0300 Subject: CCivilianPed done & restore peds running to phone --- src/control/Phones.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/control/Phones.h') diff --git a/src/control/Phones.h b/src/control/Phones.h index 99ec520c..62ea6f50 100644 --- a/src/control/Phones.h +++ b/src/control/Phones.h @@ -7,7 +7,7 @@ class CAnimBlendAssociation; enum { PHONE_STATE_FREE, - PHONE_STATE_1, + PHONE_STATE_REPORTING_CRIME, // CCivilianPed::ProcessControl sets it but unused PHONE_STATE_2, PHONE_STATE_MESSAGE_REMOVED, PHONE_STATE_ONETIME_MESSAGE_SET, @@ -18,14 +18,18 @@ enum { PHONE_STATE_9 }; -struct CPhone +class CPhone { +public: CVector m_vecPos; wchar *m_apMessages[6]; uint32 m_lastTimeRepeatedMsgShown; - CEntity *m_pEntity; // it's building pool index in save files + CEntity *m_pEntity; // stored as building pool index in save files int32 m_nState; uint8 field_30; + + CPhone() { } + ~CPhone() { } }; static_assert(sizeof(CPhone) == 0x34, "CPhone: error"); @@ -40,7 +44,7 @@ public: int32 m_nMax; int32 m_nNum; - CPhone m_aPhones[50]; + CPhone m_aPhones[NUMPHONES]; CPhoneInfo() { } ~CPhoneInfo() { } -- cgit v1.2.3