more reductions in memory usage

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

diff --git a/gl_rmain.c b/gl_rmain.c
index 637e2b1660331a3481b042757752b57de770757f..bfa20f0ba248bc12703052d110feabc888d0fb41 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -11469,7 +11469,6 @@ typedef struct r_decalsystem_splatqueue_s
 r_decalsystem_splatqueue_t;
 
 int r_decalsystem_numqueued = 0;
-#define MAX_DECALSYSTEM_QUEUE 1024
 r_decalsystem_splatqueue_t r_decalsystem_queue[MAX_DECALSYSTEM_QUEUE];
 
 void R_DecalSystem_SplatEntities(const vec3_t worldorigin, const vec3_t worldnormal, float r, float g, float b, float a, float s1, float t1, float s2, float t2, float worldsize)

diff --git a/netconn.c b/netconn.c
index 9da54c77f1c2e4980d833d8b5032f645047330a9..28c2318f9a912b0cb504bd01cb2eff5fa01eb9af 100755 (executable)
--- a/netconn.c
+++ b/netconn.c
@@ -157,7 +157,7 @@ serverlist_entry_t *serverlist_cache = NULL;
 qboolean serverlist_consoleoutput;
 
 static int nFavorites = 0;
-static lhnetaddress_t favorites[256];
+static lhnetaddress_t favorites[MAX_FAVORITESERVERS];
 
 void NetConn_UpdateFavorites(void)
 {

diff --git a/sv_main.c b/sv_main.c
index 6def900a2e31a7b7ba9d43a475865c8b48fc2dad..8218c30b84a03cf3763f6997cff1b32289e35141 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -59,7 +59,7 @@ cvar_t sv_allowdownloads_archive = {0, "sv_allowdownloads_archive", "0", "whethe
 cvar_t sv_allowdownloads_config = {0, "sv_allowdownloads_config", "0", "whether to allow downloads of config files (cfg)"};
 cvar_t sv_allowdownloads_dlcache = {0, "sv_allowdownloads_dlcache", "0", "whether to allow downloads of dlcache files (dlcache/)"};
 cvar_t sv_allowdownloads_inarchive = {0, "sv_allowdownloads_inarchive", "0", "whether to allow downloads from archives (pak/pk3)"};
-cvar_t sv_areagrid_mingridsize = {CVAR_NOTIFY, "sv_areagrid_mingridsize", "64", "minimum areagrid cell size, smaller values work better for lots of small objects, higher values for large objects"};
+cvar_t sv_areagrid_mingridsize = {CVAR_NOTIFY, "sv_areagrid_mingridsize", "128", "minimum areagrid cell size, smaller values work better for lots of small objects, higher values for large objects"};
 cvar_t sv_checkforpacketsduringsleep = {0, "sv_checkforpacketsduringsleep", "0", "uses select() function to wait between frames which can be interrupted by packets being received, instead of Sleep()/usleep()/SDL_Sleep() functions which do not check for packets"};
 cvar_t sv_clmovement_enable = {0, "sv_clmovement_enable", "1", "whether to allow clients to use cl_movement prediction, which can cause choppy movement on the server which may annoy other players"};
 cvar_t sv_clmovement_minping = {0, "sv_clmovement_minping", "0", "if client ping is below this time in milliseconds, then their ability to use cl_movement prediction is disabled for a while (as they don't need it)"};

diff --git a/world.h b/world.h
index 2f2c8a787f2494d49191fd86b2a40f6f074581d4..451ad2f20b51e9a2b61640fd46f3e1794810df52 100644 (file)
--- a/world.h
+++ b/world.h
@@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define MOVE_WORLDONLY  3
 #define MOVE_HITMODEL   4
 
-#define AREA_GRID 128
+#define AREA_GRID 64
 #define AREA_GRIDNODES (AREA_GRID * AREA_GRID)
 
 typedef struct link_s