X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=r_modules.c;h=e3729796bad69bd58f1c884e5fa5292fed3a4d30;hb=e3272446d9f13cc12b1822a99b4e7cf512454db9;hp=0899b880d4cc2e71ed3d2e42a3a23dcbef2b8b70;hpb=ff46d6ff516fda192c5adc55a5c9b82007545bd2;p=xonotic%2Fdarkplaces.git diff --git a/r_modules.c b/r_modules.c index 0899b880..e3729796 100644 --- a/r_modules.c +++ b/r_modules.c @@ -17,10 +17,7 @@ rendermodule_t rendermodule[MAXRENDERMODULES]; void R_Modules_Init(void) { - int i; Cmd_AddCommand("r_restart", R_Modules_Restart); - for (i = 0;i < MAXRENDERMODULES;i++) - rendermodule[i].name = NULL; } void R_RegisterModule(char *name, void(*start)(void), void(*shutdown)(void), void(*newmap)(void)) @@ -31,7 +28,10 @@ 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); @@ -50,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(); }