summaryrefslogtreecommitdiffstats
path: root/src/peds/Population.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2020-03-28 15:47:52 +0100
committereray orçunus <erayorcunus@gmail.com>2020-03-28 16:52:25 +0100
commit112685ebac0a4f5da50fdc60ff71c35a5cddbdfa (patch)
treefb1223f514ddbf339bed0bed6a269ad1ad63c374 /src/peds/Population.cpp
parentremove include <new> from common.h (diff)
downloadre3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar.gz
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar.bz2
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar.lz
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar.xz
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.tar.zst
re3-112685ebac0a4f5da50fdc60ff71c35a5cddbdfa.zip
Diffstat (limited to 'src/peds/Population.cpp')
-rw-r--r--src/peds/Population.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp
index 6b674dd3..3bf81066 100644
--- a/src/peds/Population.cpp
+++ b/src/peds/Population.cpp
@@ -4,6 +4,8 @@
#include "General.h"
#include "World.h"
#include "Population.h"
+#include "CopPed.h"
+#include "Wanted.h"
#include "FileMgr.h"
#include "Gangs.h"
#include "ModelIndices.h"
@@ -11,6 +13,7 @@
#include "CivilianPed.h"
#include "EmergencyPed.h"
#include "Replay.h"
+#include "Camera.h"
#include "CutsceneMgr.h"
#include "CarCtrl.h"
#include "IniFile.h"
@@ -110,7 +113,8 @@ CPopulation::ChooseCivilianOccupation(int32 group)
return ms_pPedGroups[group].models[CGeneral::GetRandomNumberInRange(0, NUMMODELSPERPEDGROUP)];
}
-eCopType
+// returns eCopType
+int32
CPopulation::ChoosePolicePedOccupation()
{
CGeneral::GetRandomNumber();
@@ -512,9 +516,9 @@ CPopulation::AddPed(ePedType pedType, uint32 miOrCopType, CVector const &coors)
uint32 weapon;
if (CGeneral::GetRandomNumberInRange(0, 100) >= 50)
- weapon = ped->GiveWeapon(CGangs::GetGangInfo(pedType - PEDTYPE_GANG1)->m_Weapon2, 25001);
+ weapon = ped->GiveWeapon((eWeaponType)CGangs::GetGangInfo(pedType - PEDTYPE_GANG1)->m_Weapon2, 25001);
else
- weapon = ped->GiveWeapon(CGangs::GetGangInfo(pedType - PEDTYPE_GANG1)->m_Weapon1, 25001);
+ weapon = ped->GiveWeapon((eWeaponType)CGangs::GetGangInfo(pedType - PEDTYPE_GANG1)->m_Weapon1, 25001);
ped->SetCurrentWeapon(weapon);
return ped;
}