Merge branch 'master' of ssh://deng.git.sourceforge.net/gitroot/deng/…

…deng
skyjake · Jul 10, 2012 · 12847fe · 12847fe
2 parents dc0799d + 0235523
commit 12847fe
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/doomsday/libdeng/src/memoryzone_private.h b/doomsday/libdeng/src/memoryzone_private.h
@@ -2,6 +2,13 @@
  * @file memoryzone_private.h
  * Memory zone (internal header). @ingroup memzone
  *
+ * This header file is separate from the public one because it defines the data
+ * structures used internally by the memory zone module. The private data
+ * should not be accessed under normal circumstances. In a debug build, the
+ * memzone_private_s struct can be used to examine the contents of the zone for
+ * debugging purposes -- however, doing so requires directly including this
+ * internal header file.
+ *
  * @authors Copyright © 1999-2012 Jaakko Keränen <jaakko.keranen@iki.fi>
  * @authors Copyright © 2006-2012 Daniel Swanson <danij@dengine.net>
  * @authors Copyright © 1993-1996 by id Software, Inc.

diff --git a/doomsday/plugins/common/include/r_common.h b/doomsday/plugins/common/include/r_common.h
@@ -46,6 +46,8 @@
 extern Size2Rawf viewScale;
 extern float aspectScale;
 
+void R_LoadColorPalettes(void);
+
 /**
  * @param flags  @ref resizeViewWindowFlags
  */
@@ -61,6 +63,7 @@ void R_UpdateConsoleView(int player);
 void R_PrecachePSprites(void);
 
 void R_GetGammaMessageStrings(void);
+
 void R_CycleGammaLevel(void);
 
 #endif /* LIBCOMMON_REFRESH_H */
diff --git a/doomsday/plugins/common/src/g_game.c b/doomsday/plugins/common/src/g_game.c
@@ -160,7 +160,6 @@ boolean G_ValidateMap(uint *episode, uint *map);
 
 void    G_StopDemo(void);
 
-void R_LoadColorPalettes(void);
 void R_LoadVectorGraphics(void);
 
 int Hook_DemoStop(int hookType, int val, void* paramaters);

diff --git a/doomsday/plugins/common/src/g_update.c b/doomsday/plugins/common/src/g_update.c
@@ -49,6 +49,7 @@
 #include "p_inventory.h"
 #include "p_sound.h"
 #include "p_start.h"
+#include "r_common.h"
 #if __JHEXEN__
 #  include "m_cheat.h"
 #endif
@@ -150,6 +151,7 @@ void G_UpdateState(int step)
     case DD_POST:
         G_RestoreState();
         R_InitRefresh();
+        R_LoadColorPalettes();
         P_Update();
 #if !__JHEXEN__
         XG_Update();

diff --git a/doomsday/plugins/jdoom/include/g_game.h b/doomsday/plugins/jdoom/include/g_game.h
@@ -66,6 +66,7 @@ void            G_Register(void);
 void            G_CommonPreInit(void);
 void            G_CommonPostInit(void);
 void            G_CommonShutdown(void);
+
 void            R_InitRefresh(void);
 
 void            G_PrintMapList(void);