X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_modules.c;h=8021ade76fb46312c98e327eda819731a6ca02d7;hb=1844b8202f22125f8fd064dc4161274149c43199;hp=fc0186a3e852e50fe4b71a8992fa9bb5785dc30e;hpb=f8b424e28290c817a8602275f738362a1a4cdc1c;p=xonotic%2Fdarkplaces.git

diff --git a/r_modules.c b/r_modules.c
index fc0186a3..8021ade7 100644
--- a/r_modules.c
+++ b/r_modules.c
@@ -1,7 +1,7 @@
 
 #include "quakedef.h"
 
-#define MAXRENDERMODULES 64
+#define MAXRENDERMODULES 20
 
 typedef struct rendermodule_s
 {
@@ -17,7 +17,7 @@ rendermodule_t rendermodule[MAXRENDERMODULES];
 
 void R_Modules_Init(void)
 {
-	Cmd_AddCommand("r_restart", R_Modules_Restart);
+	Cmd_AddCommand("r_restart", R_Modules_Restart, "restarts renderer");
 }
 
 void R_RegisterModule(char *name, void(*start)(void), void(*shutdown)(void), void(*newmap)(void))
@@ -28,10 +28,13 @@ void R_RegisterModule(char *name, void(*start)(void), void(*shutdown)(void), voi
 		if (rendermodule[i].name == NULL)
 			break;
 		if (!strcmp(name, rendermodule[i].name))
-			Sys_Error("R_RegisterModule: module \"%s\" registered twice\n", name);
+		{
+			Con_Printf("R_RegisterModule: module \"%s\" registered twice\n", name);
+			return;
+		}
 	}
 	if (i >= MAXRENDERMODULES)
-		Sys_Error("R_RegisterModule: ran out of renderer module slots (%i)\n", MAXRENDERMODULES);
+		Sys_Error("R_RegisterModule: ran out of renderer module slots (%i)", MAXRENDERMODULES);
 	rendermodule[i].active = 0;
 	rendermodule[i].name = name;
 	rendermodule[i].start = start;
@@ -47,7 +50,10 @@ void R_Modules_Start(void)
 		if (rendermodule[i].name == NULL)
 			continue;
 		if (rendermodule[i].active)
-			Sys_Error("R_StartModules: module \"%s\" already active\n", rendermodule[i].name);
+		{
+			Con_Printf ("R_StartModules: module \"%s\" already active\n", rendermodule[i].name);
+			continue;
+		}
 		rendermodule[i].active = 1;
 		rendermodule[i].start();
 	}
@@ -70,6 +76,7 @@ void R_Modules_Shutdown(void)
 
 void R_Modules_Restart(void)
 {
+	Host_StartVideo();
 	Con_Print("restarting renderer\n");
 	R_Modules_Shutdown();
 	R_Modules_Start();
@@ -78,6 +85,7 @@ void R_Modules_Restart(void)
 void R_Modules_NewMap(void)
 {
 	int i;
+	R_SkinFrame_PrepareForPurge();
 	for (i = 0;i < MAXRENDERMODULES;i++)
 	{
 		if (rendermodule[i].name == NULL)
@@ -86,5 +94,6 @@ void R_Modules_NewMap(void)
 			continue;
 		rendermodule[i].newmap();
 	}
+	R_SkinFrame_Purge();
 }