From 432afd9edffbbbf0587bc505923576c75eab0ea8 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sun, 10 Sep 2017 09:50:49 -0400 Subject: [PATCH] - privatized the namespace in r_videoscale.cpp completely --- src/r_videoscale.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/r_videoscale.cpp b/src/r_videoscale.cpp index 230006ed8..7add7450d 100644 --- a/src/r_videoscale.cpp +++ b/src/r_videoscale.cpp @@ -27,7 +27,7 @@ #define NUMSCALEMODES 11 -namespace vidscale +namespace { struct v_ScaleTable { @@ -56,7 +56,7 @@ namespace vidscale CUSTOM_CVAR(Int, vid_scalemode, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) { - if (self < 0 || self >= NUMSCALEMODES || vidscale::vScaleTable[self].isValid == false) + if (self < 0 || self >= NUMSCALEMODES || vScaleTable[self].isValid == false) { self = 0; } @@ -64,22 +64,22 @@ CUSTOM_CVAR(Int, vid_scalemode, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG) bool ViewportLinearScale() { - return vidscale::vScaleTable[vid_scalemode].isLinear; + return vScaleTable[vid_scalemode].isLinear; } int ViewportScaledWidth(int width) { - return vidscale::vScaleTable[vid_scalemode].GetScaledWidth(width); + return vScaleTable[vid_scalemode].GetScaledWidth(width); } int ViewportScaledHeight(int height) { - return vidscale::vScaleTable[vid_scalemode].GetScaledHeight(height); + return vScaleTable[vid_scalemode].GetScaledHeight(height); } bool ViewportIsScaled43() { - return vidscale::vScaleTable[vid_scalemode].isScaled43; + return vScaleTable[vid_scalemode].isScaled43; }