Permalink
Browse files

ui: fix duplicate define

  • Loading branch information...
IR4T4 committed Oct 12, 2017
1 parent 1506389 commit 26787806895075791e41936d7c1a703c9a7f5fe9
Showing with 7 additions and 9 deletions.
  1. +0 −3 src/ui/ui_local.h
  2. +7 −6 src/ui/ui_shared.h
View
@@ -110,9 +110,6 @@ extern vmCvar_t cl_bypassMouseInput;
#define SLIDER_RANGE 10
#define MAX_EDIT_LINE 256
#define MAX_MENUDEPTH 8
#define MAX_MENUITEMS 128
/**
* @struct _tag_menuframework
* @typedef menuframework_s
View
@@ -42,12 +42,13 @@
#include "../../etmain/ui/menudef.h"
#define MAX_MENUDEFFILE 4096
#define MAX_MENUFILE 32768
#define MAX_MENUS 128
#define MAX_MENUITEMS 128 ///< ioquake3 has 96
#define MAX_COLOR_RANGES 10
#define MAX_MODAL_MENUS 16
#define MAX_MENUDEFFILE 4096
#define MAX_MENUFILE 32768
#define MAX_MENUS 128
#define MAX_MENUDEPTH 8
#define MAX_MENUITEMS 128 ///< ioquake3 has 96
#define MAX_COLOR_RANGES 10
#define MAX_MODAL_MENUS 16
#define WINDOW_MOUSEOVER 0x00000001 ///< mouse is over it, non exclusive
#define WINDOW_HASFOCUS 0x00000002 ///< has cursor focus, exclusive

0 comments on commit 2678780

Please sign in to comment.