From: black <black@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 11 Jun 2005 18:20:26 +0000 (+0000)
Subject: Increased maximum edict count to 4096
X-Git-Tag: xonotic-v0.1.0preview~4756
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7fb202a4d018e8039a420dc583d24cb903e3a60d;p=xonotic%2Fdarkplaces.git

Increased maximum edict count to 4096


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5426 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/keys.c b/keys.c
index 804d7370..6e362d16 100644
--- a/keys.c
+++ b/keys.c
@@ -833,7 +833,7 @@ Should NOT be called during an interrupt!
 void
 Key_Event (int key, char ascii, qboolean down)
 {
-#if 0
+#if 1
 #define USERPLAYING()	( !key_consoleactive && key_dest == key_game && (cls.state == ca_connected && cls.signon == SIGNONS) )
 	const char *bind;
 	static qboolean shift_down = false;
diff --git a/menu.h b/menu.h
index a63e6284..6f5952c0 100644
--- a/menu.h
+++ b/menu.h
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define M_PROG_FILENAME "menu.dat"
 #define M_NAME	"menu"
-#define M_MAX_EDICTS	(1 << 11) // should be enough for a menu
+#define M_MAX_EDICTS	(1 << 12) // should be enough for a menu
 
 enum m_state_e {
 	m_none,
diff --git a/progsvm.h b/progsvm.h
index 18768887..1ca690e1 100644
--- a/progsvm.h
+++ b/progsvm.h
@@ -272,6 +272,7 @@ typedef struct prvm_prog_s
 	// (simple optimization of the free string search)
 	int					firstfreeknownstring;
 	const char			**knownstrings;
+	const char			***stringshash;
 
 	// all memory allocations related to this vm_prog (code, edicts, strings)
 	mempool_t			*progs_mempool; // [INIT]