summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-04-16 14:30:47 +0200
committerSergeanur <s.anureev@yandex.ua>2020-04-16 14:30:47 +0200
commit83cbe4e39ede4853e0d352e55aeddbd481b39948 (patch)
tree982648ce860ac1c50233df806798a8b9412819fe /src/core
parentadd textures in correct order (diff)
downloadre3-83cbe4e39ede4853e0d352e55aeddbd481b39948.tar
re3-83cbe4e39ede4853e0d352e55aeddbd481b39948.tar.gz
re3-83cbe4e39ede4853e0d352e55aeddbd481b39948.tar.bz2
re3-83cbe4e39ede4853e0d352e55aeddbd481b39948.tar.lz
re3-83cbe4e39ede4853e0d352e55aeddbd481b39948.tar.xz
re3-83cbe4e39ede4853e0d352e55aeddbd481b39948.tar.zst
re3-83cbe4e39ede4853e0d352e55aeddbd481b39948.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/IniFile.cpp4
-rw-r--r--src/core/IniFile.h4
-rw-r--r--src/core/Instance.cpp20
-rw-r--r--src/core/Instance.h14
4 files changed, 4 insertions, 38 deletions
diff --git a/src/core/IniFile.cpp b/src/core/IniFile.cpp
index 08b30876..744f4bd0 100644
--- a/src/core/IniFile.cpp
+++ b/src/core/IniFile.cpp
@@ -7,8 +7,8 @@
#include "main.h"
#include "Population.h"
-float &CIniFile::PedNumberMultiplier = *(float*)0x6182F4;
-float &CIniFile::CarNumberMultiplier = *(float*)0x6182F8;
+float CIniFile::PedNumberMultiplier = 1.0f;// = *(float*)0x6182F4;
+float CIniFile::CarNumberMultiplier = 1.0f;// = *(float*)0x6182F8;
void CIniFile::LoadIniFile()
{
diff --git a/src/core/IniFile.h b/src/core/IniFile.h
index 9a98151b..1e30c4de 100644
--- a/src/core/IniFile.h
+++ b/src/core/IniFile.h
@@ -5,6 +5,6 @@ class CIniFile
public:
static void LoadIniFile();
- static float& PedNumberMultiplier;
- static float& CarNumberMultiplier;
+ static float PedNumberMultiplier;
+ static float CarNumberMultiplier;
};
diff --git a/src/core/Instance.cpp b/src/core/Instance.cpp
deleted file mode 100644
index 775341be..00000000
--- a/src/core/Instance.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "common.h"
-#include "patcher.h"
-#include "Instance.h"
-
-void
-CInstance::Shutdown()
-{
- GetMatrix().Detach();
-}
-
-class CInstance_ : public CInstance
-{
-public:
- void dtor() { CInstance::~CInstance(); }
-};
-
-STARTPATCHES
- InjectHook(0x50BE90, &CInstance_::dtor, PATCH_JUMP);
- InjectHook(0x50B850, &CInstance::Shutdown, PATCH_JUMP);
-ENDPATCHES
diff --git a/src/core/Instance.h b/src/core/Instance.h
deleted file mode 100644
index 01dfb6a2..00000000
--- a/src/core/Instance.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "Placeable.h"
-
-// unused
-
-class CInstance : public CPlaceable
-{
-public:
- int m_modelIndex;
-public:
- ~CInstance() = default;
- void Shutdown();
-};