From 84032eee3d54571b4adcb33d5c2499dc383037f7 Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Mon, 9 Mar 2009 18:04:50 +0000 Subject: [PATCH] OK, dies ist dann hoffentlich die final : --- Makefile | 6 +++--- TODO | 3 --- src/client/menu/menu.c | 11 +---------- src/common/qcommon.h | 2 +- 4 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 TODO diff --git a/Makefile b/Makefile index c344fdb7..e224a1f2 100644 --- a/Makefile +++ b/Makefile @@ -52,13 +52,13 @@ CC = gcc ifeq ($(ARCH),i386) CFLAGS_BASE = -O2 -ffast-math -funroll-loops -falign-loops=2 \ -falign-jumps=2 -falign-functions=2 -fno-strict-aliasing \ - -Wall -pipe + -Wall -pipe -g -mmmx -msse -msse2 -msse3 -m3dnow endif ifeq ($(ARCH),x86_64) CFLAGS_BASE = -O2 -ffast-math -funroll-loops -fomit-frame-pointer \ -fexpensive-optimizations -fno-strict-aliasing \ - -Wall -pipe + -Wall -pipe -g -mmmx -msse -msse2 -msse3 -m3dnow endif # SDL @@ -66,7 +66,7 @@ SDLCFLAGS = $(shell sdl-config --cflags) # Client CFLAGS_CLIENT = $(CFLAGS_BASE) -CFLAGS_CLIENT += -Werror -g +CFLAGS_CLIENT += -Werror # Dedicated Server CFLAGS_DEDICATED_SERVER = $(CFLAGS_BASE) diff --git a/TODO b/TODO deleted file mode 100644 index e9a3dc7d..00000000 --- a/TODO +++ /dev/null @@ -1,3 +0,0 @@ -- Nightmare im Menü freischalten -- Spwanflags auch für Coop per Menü anpassbar machen - diff --git a/src/client/menu/menu.c b/src/client/menu/menu.c index d4923073..81069ef1 100644 --- a/src/client/menu/menu.c +++ b/src/client/menu/menu.c @@ -1971,7 +1971,7 @@ void Game_MenuInit( void ) s_hardp_game_action.generic.flags = QMF_LEFT_JUSTIFY; s_hardp_game_action.generic.x = 0; s_hardp_game_action.generic.y = 30; - s_hardp_game_action.generic.name = "hard+"; + s_hardp_game_action.generic.name = "nightmare"; s_hardp_game_action.generic.callback = HardpGameFunc; s_blankline.generic.type = MTYPE_SEPARATOR; @@ -2390,8 +2390,6 @@ static menulist_s s_rules_box; static void DMOptionsFunc( void *self ) { - if (s_rules_box.curvalue == 1) - return; M_Menu_DMOptions_f(); } @@ -2403,13 +2401,6 @@ static void RulesChangeFunc ( void *self ) s_maxclients_field.generic.statusbar = NULL; s_startserver_dmoptions_action.generic.statusbar = NULL; } - else if(s_rules_box.curvalue == 1) // coop // PGM - { - s_maxclients_field.generic.statusbar = "4 maximum for cooperative"; - if (atoi(s_maxclients_field.buffer) > 4) - strcpy( s_maxclients_field.buffer, "4" ); - s_startserver_dmoptions_action.generic.statusbar = "N/A for cooperative"; - } //===== //PGM // ROGUE GAMES diff --git a/src/common/qcommon.h b/src/common/qcommon.h index 6cacfeb4..34d284f8 100644 --- a/src/common/qcommon.h +++ b/src/common/qcommon.h @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../game/quake2/q_shared.h" -#define VERSION 0.50 +#define VERSION 1.00 #define BASEDIRNAME "baseq2" #if defined __linux__