From c66eea328b39cb730318995e1ab0d06641fb4b6c Mon Sep 17 00:00:00 2001
From: Bittah <7165430+Bittah@users.noreply.github.com>
Date: Sat, 21 Sep 2024 19:04:26 +0200
Subject: [PATCH] Disable place_building_hotkey and repeat_last_building_hotkey
 for Vinifera builds

---
 Makefile          | 4 ++--
 src/hotkey_help.c | 2 ++
 src/hotkeys.c     | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 720f65ec..e11e2291 100644
--- a/Makefile
+++ b/Makefile
@@ -247,7 +247,6 @@ OBJS += src/online_optimizations.o
 #OBJS += src/only_the_host_may_change_gamespeed.o
 OBJS += src/override_colors.o
 OBJS += src/paradrop.o
-OBJS += src/place_building_hotkey.o
 OBJS += src/radar_event_hacks.o
 OBJS += src/rage_quit.o
 OBJS += src/recon_kick.o
@@ -257,7 +256,6 @@ OBJS += src/record_facing_changes_func.o
 OBJS += src/record_tarcom_changes_func.o
 OBJS += src/record_override_mission_func.o
 OBJS += src/reinforcements_player_specific.o
-OBJS += src/repeat_last_building_hotkey.o
 OBJS += src/response_time_func.o
 
 # Only include in: MOD_TO MOD_TI
@@ -381,6 +379,8 @@ OBJS += src/no_sidecd_mix.o
 OBJS += src/oil_derricks.o
 OBJS += src/random_loop_delay.o
 OBJS += src/remove_16bit_windowed_check.o
+OBJS += src/place_building_hotkey.o
+OBJS += src/repeat_last_building_hotkey.o
 
 # The logger is needed for certain client features
 ifneq ($(call ifdef_any_of,MOD_DTA MOD_TI MOD_TO MOD_RUBICON MOD_FD MOD_TM TSCLIENT),)
diff --git a/src/hotkey_help.c b/src/hotkey_help.c
index 82d856e0..72a2f52a 100644
--- a/src/hotkey_help.c
+++ b/src/hotkey_help.c
@@ -99,8 +99,10 @@ InfoPanelHotkeysInit()
         &TogglePowerCommandClass,
         &WaypointCommandClass,
         &DeleteWayPointCommandClass,
+#ifndef VINIFERA
         &vtPlaceBuildingCommand,
         &vtRepeatBuildingCommand,
+#endif
         &CenterBaseCommandClass,
         &SetView1CommandClass,
         &vtShowHelpCommand
diff --git a/src/hotkeys.c b/src/hotkeys.c
index f7c2b169..011d139f 100644
--- a/src/hotkeys.c
+++ b/src/hotkeys.c
@@ -20,8 +20,10 @@ HookInitCommands() {
                                  &GrantControlCommand,
 #endif
                                  &ToggleInfoPanelCommand,
+#ifndef VINIFERA
                                  &PlaceBuildingCommand,
                                  &RepeatBuildingCommand,
+#endif
                                  &ShowHelpCommand,
                                  &SelectOneLessCommand,
 #ifdef WWDEBUG