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 804d7370b2060d830f5a2568b6e0798d7c56bd28..6e362d16f4e3f01563b65211c2e154ca1c900bed 100644 (file)
--- 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 a63e62842f5ef41bc79ba5baa35e2212c2f4847e..6f5952c042ed32f34b40d8b0752a5a2d2826ec6f 100644 (file)
--- 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 18768887c00b9051a4f677e522b82d2cd8478605..1ca690e16668c675847acb343428cf33125bfa8d 100644 (file)
--- 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]