diff --git a/Rules.make.orig b/Rules.make.orig index 7b6146990..542b3f0f9 100644 --- a/Rules.make.orig +++ b/Rules.make.orig @@ -230,7 +230,7 @@ IFLAGS= -I$(TOPDIR)/src/include $(XIFLAGS) -I$(TOPDIR)/src/movie/vp31/include ## HIERARCHIC_PATHFINDER Use hierarchic pathfinder ## USE_LUA Lua scripting support DFLAGS= $(THREAD) $(CCL) $(VERSION) $(VIDEO) $(ZDEFS) $(DSOUND) $(DEBUG) \ - -DHAVE_EXPANSION -DUNIT_ON_MAP -DNEW_AI -DUSE_FLAC -DUSE_OGG -DUSE_MAD \ + -DUNIT_ON_MAP -DNEW_AI -DUSE_FLAC -DUSE_OGG -DUSE_MAD \ -DUSE_HP_FOR_XP -DNEW_FOW # -DNEW_MAPDRAW=1 -DNEW_SHIPS ## choose optimise level diff --git a/setup b/setup index b5efe1b59..f7df60c5b 100755 --- a/setup +++ b/setup @@ -1124,14 +1124,6 @@ echo " \$(VIDEO) \$(ZDEFS) \$(DSOUND) \\" >> $RULESFILE echo " \$(DEBUG) \$(SDLCD) \$(LIBCDA) \\" >> $RULESFILE echo -n " \$(ARTSC) \$(FLAC) \$(OGG) \$(MAD) " >> $RULESFILE -echo -echo -n "Are you using the WarCraft 2 Expansion CD? (n): " -read $N YESORNO -echo -if [ "$YESORNO" = "Y" -o "$YESORNO" = "y" ] ; then -echo -n " -DHAVE_EXPANSION" >> $RULESFILE -fi - echo "" >> $RULESFILE echo "CFLAGS=$CFLAGS $STATIC $EXTRA_CFLAGS $PROFILE" >> $RULESFILE diff --git a/src/stratagus/script.cpp b/src/stratagus/script.cpp index 30394dbd9..fff0c9058 100644 --- a/src/stratagus/script.cpp +++ b/src/stratagus/script.cpp @@ -749,9 +749,6 @@ global void InitCcl(void) #ifdef SLOW_INPUT gh_define("freecraft-feature-slow-input",SCM_BOOL_T); #endif -#ifdef HAVE_EXPANSION - gh_define("freecraft-feature-have-expansion",SCM_BOOL_T); -#endif #ifdef USE_FLAC gh_define("freecraft-feature-flac",SCM_BOOL_T); #endif diff --git a/src/stratagus/stratagus.cpp b/src/stratagus/stratagus.cpp index 1bf0f9db2..97b93d991 100644 --- a/src/stratagus/stratagus.cpp +++ b/src/stratagus/stratagus.cpp @@ -1221,9 +1221,6 @@ local void PrintHeader(void) #endif #ifdef SLOW_INPUT "SLOW-INPUT " -#endif -#ifdef HAVE_EXPANSION - "EXPANSION " #endif ,NameLine); } diff --git a/src/ui/menus.cpp b/src/ui/menus.cpp index 2790bec9e..1544154d0 100644 --- a/src/ui/menus.cpp +++ b/src/ui/menus.cpp @@ -6977,7 +6977,6 @@ global void InitMenuData(void) */ global void InitMenuFunctions(void) { -#ifdef HAVE_EXPANSION Menu *menu; // @@ -7001,13 +7000,6 @@ global void InitMenuFunctions(void) // build the menu from that.. menu->items[14].d.pulldown.noptions = 4; } -#else - // - // HACK_MOUSE - // - //menu->items[14].d.pulldown.noptions = 4; - // -#endif #ifdef SAVE_MENU_CCL {