From 397dd132b46a4ad6f20a1ef14b7b889113cdc09e Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Sat, 13 Sep 2014 21:59:11 +0200
Subject: [PATCH] Move font variable to d3d_w32_font.cpp

---
 gfx/d3d9/d3d.cpp           |  3 ---
 gfx/d3d9/d3d.hpp           |  3 ---
 gfx/fonts/d3d_w32_font.cpp | 16 +++++++++-------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/gfx/d3d9/d3d.cpp b/gfx/d3d9/d3d.cpp
index a9357973ae..3583eb4ca8 100644
--- a/gfx/d3d9/d3d.cpp
+++ b/gfx/d3d9/d3d.cpp
@@ -685,9 +685,6 @@ static void *d3d_init(const video_info_t *info,
    /* Default values */
    vid->g_pD3D               = NULL;
    vid->dev                  = NULL;
-#ifndef _XBOX
-   vid->font                 = NULL;
-#endif
    vid->dev_rotation         = 0;
    vid->needs_restore        = false;
 #ifdef HAVE_CG
diff --git a/gfx/d3d9/d3d.hpp b/gfx/d3d9/d3d.hpp
index 687094c541..16b3880d43 100644
--- a/gfx/d3d9/d3d.hpp
+++ b/gfx/d3d9/d3d.hpp
@@ -115,9 +115,6 @@ typedef struct d3d_video
       HWND hWnd;
       LPDIRECT3D g_pD3D;
       LPDIRECT3DDEVICE dev;
-#ifndef _XBOX
-      LPD3DXFONT font;
-#endif
 #if defined(HAVE_D3D9) && defined(_XBOX)
    LPDIRECT3DSURFACE lpSurface;
    LPDIRECT3DTEXTURE lpTexture_ot_as16srgb;
diff --git a/gfx/fonts/d3d_w32_font.cpp b/gfx/fonts/d3d_w32_font.cpp
index e56406f5f4..657ec71b9a 100644
--- a/gfx/fonts/d3d_w32_font.cpp
+++ b/gfx/fonts/d3d_w32_font.cpp
@@ -19,6 +19,8 @@
 #include "../gfx_common.h"
 #include "../../general.h"
 
+static LPD3DXFONT d3d_font;
+
 static bool d3dfonts_w32_init_font(void *data,
       const char *font_path, unsigned font_size)
 {
@@ -39,15 +41,15 @@ static bool d3dfonts_w32_init_font(void *data,
    uint32_t b = static_cast<uint32_t>(g_settings.video.msg_color_b * 255) & 0xff;
    d3d->font_color = D3DCOLOR_XRGB(r, g, b);
 
-   return SUCCEEDED(D3DXCreateFontIndirect(d3d->dev, &desc, &d3d->font));
+   return SUCCEEDED(D3DXCreateFontIndirect(d3d->dev, &desc, &d3d_font));
 }
 
 static void d3dfonts_w32_deinit_font(void *data)
 {
-   d3d_video_t *d3d = (d3d_video_t*)data;
-   if (d3d->font)
-      d3d->font->Release();
-   d3d->font = NULL;
+   (void)data;
+   if (d3d_font)
+      d3d_font->Release();
+   d3d_font = NULL;
 }
 
 static void d3dfonts_w32_render_msg(void *data, const char *msg,
@@ -57,14 +59,14 @@ static void d3dfonts_w32_render_msg(void *data, const char *msg,
 
    if (msg && SUCCEEDED(d3d->dev->BeginScene()))
    {
-      d3d->font->DrawTextA(NULL,
+      d3d_font->DrawTextA(NULL,
             msg,
             -1,
             &d3d->font_rect_shifted,
             DT_LEFT,
             ((d3d->font_color >> 2) & 0x3f3f3f) | 0xff000000);
 
-      d3d->font->DrawTextA(NULL,
+      d3d_font->DrawTextA(NULL,
             msg,
             -1,
             &d3d->font_rect,