remove undefined macros

This commit is contained in:
Jenny White 2018-04-28 16:42:20 +03:00
parent 851a635ab1
commit b155f366e3
14 changed files with 4 additions and 33 deletions

View File

@ -9,7 +9,6 @@
#include "menu/ncc/Menu.hpp" #include "menu/ncc/Menu.hpp"
#include "common.hpp" #include "common.hpp"
#if TEXTMODE_VAC != 1
namespace menu namespace menu
{ {
namespace ncc namespace ncc
@ -49,4 +48,3 @@ void Item::HandleCustomEvent(KeyValues *event)
} }
} }
} }
#endif

View File

@ -9,7 +9,6 @@
#include "menu/ncc/Menu.hpp" #include "menu/ncc/Menu.hpp"
#include "common.hpp" #include "common.hpp"
#if TEXTMODE_VAC != 1
namespace menu namespace menu
{ {
namespace ncc namespace ncc
@ -97,4 +96,3 @@ void ItemSublist::OnMouseLeave()
} }
} }
} }
#endif

View File

@ -9,7 +9,6 @@
#include "menu/ncc/Menu.hpp" #include "menu/ncc/Menu.hpp"
#include "common.hpp" #include "common.hpp"
#if TEXTMODE_VAC != 1
namespace menu namespace menu
{ {
namespace ncc namespace ncc
@ -32,4 +31,3 @@ void ItemTitle::Draw(int x, int y)
} }
} }
} }
#endif

View File

@ -10,7 +10,6 @@
#include "menu/ncc/Menu.hpp" #include "menu/ncc/Menu.hpp"
#include "common.hpp" #include "common.hpp"
#if TEXTMODE_VAC != 1
namespace menu namespace menu
{ {
namespace ncc namespace ncc
@ -245,4 +244,3 @@ void ItemVariable::Draw(int x, int y)
} }
} }
} }
#endif

View File

@ -13,7 +13,6 @@
#include "menu/ncc/ItemSublist.hpp" #include "menu/ncc/ItemSublist.hpp"
#include "common.hpp" #include "common.hpp"
#if TEXTMODE_VAC != 1
namespace menu namespace menu
{ {
namespace ncc namespace ncc
@ -347,4 +346,3 @@ void List::MoveChildren()
} }
} }
} }
#endif

View File

@ -12,7 +12,6 @@
#include "menu/ncc/ItemSublist.hpp" #include "menu/ncc/ItemSublist.hpp"
#include "menu/ncc/Tooltip.hpp" #include "menu/ncc/Tooltip.hpp"
#if TEXTMODE_VAC != 1
namespace menu namespace menu
{ {
namespace ncc namespace ncc
@ -783,4 +782,3 @@ List &MainList()
} }
} }
} }
#endif

View File

@ -6,7 +6,6 @@
*/ */
#include "menu/ncc/Menu.hpp" #include "menu/ncc/Menu.hpp"
#if TEXTMODE_VAC != 1
namespace menu namespace menu
{ {
namespace ncc namespace ncc
@ -91,4 +90,3 @@ void PlayerList::MoveChildren()
} }
} }
} }
#endif

View File

@ -7,7 +7,6 @@
#include "menu/ncc/PlayerListEntry.hpp" #include "menu/ncc/PlayerListEntry.hpp"
#include "helpers.hpp" #include "helpers.hpp"
#if TEXTMODE_VAC != 1
namespace menu namespace menu
{ {
namespace ncc namespace ncc
@ -307,4 +306,3 @@ void SubState::OnKeyPress(ButtonCode_t key, bool repeat)
} }
} }
} }
#endif

View File

@ -9,7 +9,6 @@
#include "menu/ncc/Menu.hpp" #include "menu/ncc/Menu.hpp"
#include "menu/ncc/Tooltip.hpp" #include "menu/ncc/Tooltip.hpp"
#include "common.hpp" #include "common.hpp"
#if TEXTMODE_VAC != 1
namespace menu namespace menu
{ {
namespace ncc namespace ncc
@ -57,4 +56,3 @@ void Root::OnKeyPress(ButtonCode_t key, bool repeat)
} }
} }
} }
#endif

View File

@ -9,7 +9,6 @@
#include "menu/CTextLabel.h" #include "menu/CTextLabel.h"
#include "common.hpp" #include "common.hpp"
#include "GUI.h" #include "GUI.h"
#if TEXTMODE_VAC != 1
namespace menu namespace menu
{ {
namespace ncc namespace ncc
@ -57,4 +56,3 @@ void Tooltip::Draw(int x, int y)
} }
} }
} }
#endif

View File

@ -29,7 +29,6 @@
#define ALLOW_DEVELOPMENT_CVARS #define ALLOW_DEVELOPMENT_CVARS
#endif #endif
#define Q_snprintf snprintf
#include <logging.hpp> #include <logging.hpp>
#include <interfaces.hpp> #include <interfaces.hpp>

View File

@ -5,8 +5,6 @@
* Author: nullifiedcat * Author: nullifiedcat
*/ */
#if ENABLE_VISUALS == 1
#include "common.hpp" #include "common.hpp"
namespace textures namespace textures
@ -42,5 +40,3 @@ texture_atlas &atlas()
return object; return object;
} }
} }
#endif

View File

@ -5,8 +5,6 @@
* Author: nullifiedcat * Author: nullifiedcat
*/ */
#if ENABLE_VISUALS == 1
#include "common.hpp" #include "common.hpp"
#include <GL/gl.h> #include <GL/gl.h>
@ -134,5 +132,3 @@ bool draw::WorldToScreen(const Vector &origin, Vector &screen)
} }
return false; return false;
} }
#endif

View File

@ -27,9 +27,9 @@ void render_cheat_visuals()
void BeginCheatVisuals() void BeginCheatVisuals()
{ {
#if RENDERING_ENGINE_OPENGL /*#if RENDERING_ENGINE_OPENGL
std::lock_guard<std::mutex> draw_lock(drawing_mutex); std::lock_guard<std::mutex> draw_lock(drawing_mutex);
#endif #endif*/
draw_api::draw_begin(); draw_api::draw_begin();
ResetStrings(); ResetStrings();
} }
@ -45,9 +45,9 @@ CatVar enable_logo(CV_SWITCH, "nullcore_mode_logo", "1",
void DrawCheatVisuals() void DrawCheatVisuals()
{ {
#if RENDERING_ENGINE_OPENGL /*#if RENDERING_ENGINE_OPENGL
std::lock_guard<std::mutex> draw_lock(drawing_mutex); std::lock_guard<std::mutex> draw_lock(drawing_mutex);
#endif #endif*/
{ {
PROF_SECTION(DRAW_misc); PROF_SECTION(DRAW_misc);
hacks::shared::misc::DrawText(); hacks::shared::misc::DrawText();