summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-01-08 16:59:14 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2021-01-08 16:59:14 +0100
commit613d08d3e2a1613b9699a1af392e8a34291d1192 (patch)
tree4608944398b76a902bb1bb57283f186895b9314a /src/core
parentAllocator fix (diff)
parentmore stuff (diff)
downloadre3-613d08d3e2a1613b9699a1af392e8a34291d1192.tar
re3-613d08d3e2a1613b9699a1af392e8a34291d1192.tar.gz
re3-613d08d3e2a1613b9699a1af392e8a34291d1192.tar.bz2
re3-613d08d3e2a1613b9699a1af392e8a34291d1192.tar.lz
re3-613d08d3e2a1613b9699a1af392e8a34291d1192.tar.xz
re3-613d08d3e2a1613b9699a1af392e8a34291d1192.tar.zst
re3-613d08d3e2a1613b9699a1af392e8a34291d1192.zip
Diffstat (limited to '')
-rw-r--r--src/core/IniFile.cpp4
-rw-r--r--src/core/Pad.h2
-rw-r--r--src/core/Streaming.h1
3 files changed, 5 insertions, 2 deletions
diff --git a/src/core/IniFile.cpp b/src/core/IniFile.cpp
index f7e2bfdd..870e9a71 100644
--- a/src/core/IniFile.cpp
+++ b/src/core/IniFile.cpp
@@ -10,7 +10,7 @@
// --MIAMI: file done
float CIniFile::PedNumberMultiplier = 0.6f;
-float CIniFile::CarNumberMultiplier = 0.6f;
+float CIniFile::CarNumberMultiplier = 0.8f;
void CIniFile::LoadIniFile()
{
@@ -27,5 +27,5 @@ void CIniFile::LoadIniFile()
}
CPopulation::MaxNumberOfPedsInUse = 25.0f * PedNumberMultiplier;
CPopulation::MaxNumberOfPedsInUseInterior = 40.0f * PedNumberMultiplier;
- CCarCtrl::MaxNumberOfCarsInUse = 12.0f * CarNumberMultiplier;
+ CCarCtrl::MaxNumberOfCarsInUse = 30.0f * CarNumberMultiplier;
} \ No newline at end of file
diff --git a/src/core/Pad.h b/src/core/Pad.h
index 9f9f81b6..3a4f54b3 100644
--- a/src/core/Pad.h
+++ b/src/core/Pad.h
@@ -164,6 +164,8 @@ public:
int32 LastTimeTouched;
int32 AverageWeapon;
int32 AverageEntries;
+ float unk_B4;
+ float unk_B8;
#ifdef DETECT_PAD_INPUT_SWITCH
static bool IsAffectedByController;
diff --git a/src/core/Streaming.h b/src/core/Streaming.h
index a67384f6..f294a7c5 100644
--- a/src/core/Streaming.h
+++ b/src/core/Streaming.h
@@ -123,6 +123,7 @@ public:
static bool HasColLoaded(int32 id) { return HasModelLoaded(id+STREAM_OFFSET_COL); }
static bool HasAnimLoaded(int32 id) { return HasModelLoaded(id+STREAM_OFFSET_ANIM); }
static bool CanRemoveModel(int32 id) { return (ms_aInfoForModel[id].m_flags & STREAMFLAGS_CANT_REMOVE) == 0; }
+ static bool IsScriptOwnedModel(int32 id) { return (ms_aInfoForModel[id].m_flags & STREAMFLAGS_SCRIPTOWNED); }
static bool CanRemoveTxd(int32 id) { return CanRemoveModel(id+STREAM_OFFSET_TXD); }
static bool CanRemoveCol(int32 id) { return CanRemoveModel(id+STREAM_OFFSET_COL); }
static bool CanRemoveAnim(int32 id) { return CanRemoveModel(id+STREAM_OFFSET_ANIM); }