summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-01-08 13:51:31 +0100
committeraap <aap@papnet.eu>2021-01-08 13:51:31 +0100
commita99457ee29331360e5088d07373d4a1e715862f3 (patch)
tree31ac50898e7b171e25df1cd902b63b147ac22e0a /src
parentMerge branch 'miami' into lcs (diff)
downloadre3-a99457ee29331360e5088d07373d4a1e715862f3.tar
re3-a99457ee29331360e5088d07373d4a1e715862f3.tar.gz
re3-a99457ee29331360e5088d07373d4a1e715862f3.tar.bz2
re3-a99457ee29331360e5088d07373d4a1e715862f3.tar.lz
re3-a99457ee29331360e5088d07373d4a1e715862f3.tar.xz
re3-a99457ee29331360e5088d07373d4a1e715862f3.tar.zst
re3-a99457ee29331360e5088d07373d4a1e715862f3.zip
Diffstat (limited to 'src')
-rw-r--r--src/control/Phones.cpp1
-rw-r--r--src/core/config.h2
-rw-r--r--src/core/main.cpp2
-rw-r--r--src/core/main.h2
4 files changed, 4 insertions, 3 deletions
diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp
index cc80360d..d25f146f 100644
--- a/src/control/Phones.cpp
+++ b/src/control/Phones.cpp
@@ -286,6 +286,7 @@ CPhoneInfo::Initialise(void)
CBuilding *building = pool->GetSlot(i);
if (building) {
if (building->GetModelIndex() == MI_PHONEBOOTH1) {
+ assert(m_nMax < ARRAY_SIZE(m_aPhones) && "NUMPHONES should be increased");
CPhone *maxPhone = &m_aPhones[m_nMax];
maxPhone->m_nState = PHONE_STATE_FREE;
maxPhone->m_vecPos = building->GetPosition();
diff --git a/src/core/config.h b/src/core/config.h
index 36387449..0f6ae5b7 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -111,7 +111,7 @@ enum Config {
NUM_WATERCANNONS = 3,
NUMPEDROUTES = 200,
- NUMPHONES = 50,
+ NUMPHONES = 60,
NUMPEDGROUPS = 67,
NUMMODELSPERPEDGROUP = 16,
MAXZONEPEDSLOADED = 8,
diff --git a/src/core/main.cpp b/src/core/main.cpp
index e3217fde..d9579fee 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -76,7 +76,7 @@
GlobalScene Scene;
-uint8 work_buff[55000 * 2];
+uint8 work_buff[55000];
char gString[256];
char gString2[512];
wchar gUString[256];
diff --git a/src/core/main.h b/src/core/main.h
index e1d3de9c..37a82fb2 100644
--- a/src/core/main.h
+++ b/src/core/main.h
@@ -7,7 +7,7 @@ struct GlobalScene
};
extern GlobalScene Scene;
-extern uint8 work_buff[55000 * 2];
+extern uint8 work_buff[55000];
extern char gString[256];
extern char gString2[512];
extern wchar gUString[256];