Fixed the aliasing/confusion between the engine vs game side R_Init r…

…outines exhibited under gcc. Renamed the games' R_Init to R_InitRefresh, now called by G_PostInit.
skyjake · Dec 15, 2007 · e260c13 · e260c13
1 parent e6d6e6e
commit e260c13
Show file tree

Hide file tree

Showing 21 changed files with 18 additions and 29 deletions.
diff --git a/doomsday/engine/api/dd_api.h b/doomsday/engine/api/dd_api.h
@@ -98,7 +98,6 @@ typedef struct {
     void            (*G_Drawer) (void);
     void            (*G_Drawer2) (void);
     void            (*ConsoleBackground) (int *width, int *height);
-    void            (*R_Init) (void);
 
     // Miscellaneous.
     void            (*MobjThinker) ();

diff --git a/doomsday/engine/portable/src/r_main.c b/doomsday/engine/portable/src/r_main.c
@@ -175,9 +175,6 @@ void R_Init(void)
     R_InitModels();
     R_InitSkyMap();
     R_InitTranslationTables();
-    // Call the game DLL's refresh initialization, if necessary.
-    if(gx.R_Init)
-        gx.R_Init();
     Rend_Init();
     frameCount = 0;
     R_InitViewBorder();

diff --git a/doomsday/plugins/common/src/g_game.c b/doomsday/plugins/common/src/g_game.c
@@ -509,6 +509,9 @@ void G_PreInit(void)
  */
 void G_PostInit(void)
 {
+    Con_Message("R_InitRefresh: Loading data for referesh.\n");
+    R_InitRefresh();
+
     // Init the save system and create the game save directory
     SV_Init();
 

diff --git a/doomsday/plugins/common/src/g_update.c b/doomsday/plugins/common/src/g_update.c
@@ -151,7 +151,7 @@ void G_UpdateState(int step)
 
     case DD_POST:
         G_RestoreState();
-        R_Init();
+        R_InitRefresh();
         P_Init();
         //// \fixme Detect gamemode changes (GM_DOOM -> GM_DOOM2, for instance).
 #if !__JHEXEN__

diff --git a/doomsday/plugins/doom64tc/include/doomdef.h b/doomsday/plugins/doom64tc/include/doomdef.h
@@ -283,7 +283,7 @@ void        G_IdentifyVersion(void);
 int         G_GetInteger(int id);
 void       *G_GetVariable(int id);
 
-void        R_Init(void);
+void        R_InitRefresh(void);
 void        R_SetViewSize(int blocks, int detail);
 
 #endif
diff --git a/doomsday/plugins/doom64tc/src/d_api.c b/doomsday/plugins/doom64tc/src/d_api.c
@@ -45,7 +45,6 @@
 // Initialization
 void    D_PreInit(void);
 void    D_PostInit(void);
-void    R_Init(void);
 
 // Timeing loop
 void    D_Ticker(timespan_t ticLength);
@@ -215,7 +214,6 @@ game_export_t *GetGameAPI(game_import_t *imports)
 #undef Get
     gx.GetInteger = G_GetInteger;
     gx.GetVariable = G_GetVariable;
-    gx.R_Init = R_Init;
 
     gx.NetServerStart = D_NetServerStarted;
     gx.NetServerStop = D_NetServerClose;

diff --git a/doomsday/plugins/doom64tc/src/d_refresh.c b/doomsday/plugins/doom64tc/src/d_refresh.c
@@ -103,7 +103,7 @@ static void initTranslation(void)
     }
 }
 
-void R_Init(void)
+void R_InitRefresh(void)
 {
     initTranslation();
 }

diff --git a/doomsday/plugins/jdoom/include/doomdef.h b/doomsday/plugins/jdoom/include/doomdef.h
@@ -258,7 +258,7 @@ void        G_IdentifyVersion(void);
 int         G_GetInteger(int id);
 void       *G_GetVariable(int id);
 
-void        R_Init(void);
+void        R_InitRefresh(void);
 void        R_SetViewSize(int blocks, int detail);
 
 #endif
diff --git a/doomsday/plugins/jdoom/src/d_api.c b/doomsday/plugins/jdoom/src/d_api.c
@@ -45,7 +45,6 @@
 // Initialization
 void    D_PreInit(void);
 void    D_PostInit(void);
-void    R_Init(void);
 
 // Timeing loop
 void    D_Ticker(timespan_t ticLength);
@@ -215,7 +214,6 @@ game_export_t *GetGameAPI(game_import_t * imports)
 #undef Get
     gx.GetInteger = G_GetInteger;
     gx.GetVariable = G_GetVariable;
-    gx.R_Init = R_Init;
 
     gx.NetServerStart = D_NetServerStarted;
     gx.NetServerStop = D_NetServerClose;

diff --git a/doomsday/plugins/jdoom/src/d_refresh.c b/doomsday/plugins/jdoom/src/d_refresh.c
@@ -105,7 +105,7 @@ static void initTranslation(void)
     }
 }
 
-void R_Init(void)
+void R_InitRefresh(void)
 {
     initTranslation();
 }

diff --git a/doomsday/plugins/jheretic/include/doomdef.h b/doomsday/plugins/jheretic/include/doomdef.h
@@ -300,7 +300,7 @@ void        G_IdentifyVersion(void);
 int         G_GetInteger(int id);
 void       *G_GetVariable(int id);
 
-void        R_Init(void);
+void        R_InitRefresh(void);
 void        R_SetViewSize(int blocks, int detail);
 
 // Most damage defined using HITDICE

diff --git a/doomsday/plugins/jheretic/src/h_api.c b/doomsday/plugins/jheretic/src/h_api.c
@@ -56,7 +56,6 @@
 // Initialization
 void    H_PreInit(void);
 void    H_PostInit(void);
-void    R_Init(void);
 
 // Timeing loop
 void    H_Ticker(timespan_t ticLength);
@@ -231,7 +230,6 @@ game_export_t *GetGameAPI(game_import_t *imports)
 #undef Get
     gx.GetInteger = G_GetInteger;
     gx.GetVariable = G_GetVariable;
-    gx.R_Init = R_Init;
 
     gx.NetServerStart = D_NetServerStarted;
     gx.NetServerStop = D_NetServerClose;

diff --git a/doomsday/plugins/jheretic/src/h_refresh.c b/doomsday/plugins/jheretic/src/h_refresh.c
@@ -109,7 +109,7 @@ static void initTranslation(void)
     }
 }
 
-void R_Init(void)
+void R_InitRefresh(void)
 {
     initTranslation();
 }

diff --git a/doomsday/plugins/jhexen/include/h2def.h b/doomsday/plugins/jhexen/include/h2def.h
@@ -372,7 +372,7 @@ void            H2_Main(void);
 void            G_IdentifyVersion(void);
 void            R_SetFilter(int filter);
 int             R_GetFilterColor(int filter);
-void            R_Init(void);
+void            R_InitRefresh(void);
 
 int             G_GetInteger(int id);
 void           *G_GetVariable(int id);

diff --git a/doomsday/plugins/jhexen/src/hrefresh.c b/doomsday/plugins/jhexen/src/hrefresh.c
@@ -109,7 +109,7 @@ gamestate_t wipegamestate = GS_DEMOSCREEN;
 
 // CODE --------------------------------------------------------------------
 
-void R_Init(void)
+void R_InitRefresh(void)
 {
     // Nothing to do.
 }

diff --git a/doomsday/plugins/jhexen/src/p_mapinfo.c b/doomsday/plugins/jhexen/src/p_mapinfo.c
@@ -312,7 +312,7 @@ void P_InitMapInfo(void)
 }
 
 /**
- * Special early initializer needed to start sound before R_Init()
+ * Special early initializer needed to start sound before R_InitRefresh()
  */
 void P_InitMapMusicInfo(void)
 {

diff --git a/doomsday/plugins/jhexen/src/x_api.c b/doomsday/plugins/jhexen/src/x_api.c
@@ -56,7 +56,6 @@
 // Initialization
 void    H2_PreInit(void);
 void    H2_PostInit(void);
-void    R_Init(void);
 
 // Timeing loop
 void    H2_Ticker(timespan_t ticLength);
@@ -251,7 +250,6 @@ game_export_t *GetGameAPI(game_import_t *imports)
     gx.NetPlayerEvent = D_NetPlayerEvent;
     gx.NetWorldEvent = D_NetWorldEvent;
     gx.HandlePacket = D_HandlePacket;
-    gx.R_Init = R_Init;
 
     // The structure sizes.
     gx.ticcmd_size = sizeof(ticcmd_t);

diff --git a/doomsday/plugins/wolftc/include/doomdef.h b/doomsday/plugins/wolftc/include/doomdef.h
@@ -271,7 +271,7 @@ void        G_IdentifyVersion(void);
 int         G_GetInteger(int id);
 void       *G_GetVariable(int id);
 
-void        R_Init(void);
+void        R_InitRefresh(void);
 void        R_SetViewSize(int blocks, int detail);
 
 #endif                          // __DOOMDEF__
diff --git a/doomsday/plugins/wolftc/src/d_api.c b/doomsday/plugins/wolftc/src/d_api.c
@@ -45,7 +45,6 @@
 // Initialization
 void    D_PreInit(void);
 void    D_PostInit(void);
-void    R_Init(void);
 
 // Timeing loop
 void    D_Ticker(timespan_t ticLength);
@@ -215,7 +214,6 @@ game_export_t *GetGameAPI(game_import_t *imports)
 #undef Get
     gx.GetInteger = G_GetInteger;
     gx.GetVariable = G_GetVariable;
-    gx.R_Init = R_Init;
 
     gx.NetServerStart = D_NetServerStarted;
     gx.NetServerStop = D_NetServerClose;

diff --git a/doomsday/plugins/wolftc/src/d_main.c b/doomsday/plugins/wolftc/src/d_main.c
@@ -516,9 +516,9 @@ void D_PreInit(void)
     G_PreInit();
 }
 
-/*
- *  Post Engine Initialization routine.
- *    All game-specific actions that should take place at this time go here.
+/**
+ * Post Engine Initialization routine.
+ * All game-specific actions that should take place at this time go here.
  */
 void D_PostInit(void)
 {

diff --git a/doomsday/plugins/wolftc/src/d_refresh.c b/doomsday/plugins/wolftc/src/d_refresh.c
@@ -104,7 +104,7 @@ static void initTranslation(void)
     }
 }
 
-void R_Init(void)
+void R_InitRefresh(void)
 {
     initTranslation();
 }