implemented real support for QW skins (pants, shirt, glow, cropped pcx

[xonotic/darkplaces.git] / r_modules.c

diff --git a/r_modules.c b/r_modules.c
index 69086f6771d81d795f973b1ff9ecc3ee1b4c90eb..df260db6780f1de6006ebd44c4877e12a9948c34 100644 (file)
--- a/r_modules.c
+++ b/r_modules.c
@@ -7,22 +7,20 @@ typedef struct rendermodule_s
 {
        int active; // set by start, cleared by shutdown
        char *name;
-       void(*start)();
-       void(*shutdown)();
-       void(*newmap)();
+       void(*start)(void);
+       void(*shutdown)(void);
+       void(*newmap)(void);
 }
 rendermodule_t;
 
 rendermodule_t rendermodule[MAXRENDERMODULES];
 
-void R_Modules_Init()
+void R_Modules_Init(void)
 {
-       int i;
-       for (i = 0;i < MAXRENDERMODULES;i++)
-               rendermodule[i].name = NULL;
+       Cmd_AddCommand("r_restart", R_Modules_Restart, "restarts renderer");
 }
 
-void R_RegisterModule(char *name, void(*start)(), void(*shutdown)(), void(*newmap)())
+void R_RegisterModule(char *name, void(*start)(void), void(*shutdown)(void), void(*newmap)(void))
 {
        int i;
        for (i = 0;i < MAXRENDERMODULES;i++)
@@ -30,10 +28,13 @@ void R_RegisterModule(char *name, void(*start)(), void(*shutdown)(), void(*newma
                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;
@@ -41,7 +42,7 @@ void R_RegisterModule(char *name, void(*start)(), void(*shutdown)(), void(*newma
        rendermodule[i].newmap = newmap;
 }
 
-void R_Modules_Start ()
+void R_Modules_Start(void)
 {
        int i;
        for (i = 0;i < MAXRENDERMODULES;i++)
@@ -49,16 +50,20 @@ void R_Modules_Start ()
                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();
        }
 }
 
-void R_Modules_Shutdown ()
+void R_Modules_Shutdown(void)
 {
        int i;
-       for (i = 0;i < MAXRENDERMODULES;i++)
+       // shutdown in reverse
+       for (i = MAXRENDERMODULES - 1;i >= 0;i--)
        {
                if (rendermodule[i].name == NULL)
                        continue;
@@ -69,13 +74,15 @@ void R_Modules_Shutdown ()
        }
 }
 
-void R_Modules_Restart ()
+void R_Modules_Restart(void)
 {
+       Host_StartVideo();
+       Con_Print("restarting renderer\n");
        R_Modules_Shutdown();
        R_Modules_Start();
 }
 
-void R_Modules_NewMap ()
+void R_Modules_NewMap(void)
 {
        int i;
        for (i = 0;i < MAXRENDERMODULES;i++)
@@ -87,3 +94,4 @@ void R_Modules_NewMap ()
                rendermodule[i].newmap();
        }
 }
+