Add monster support to the menu (may be used for a new monsters dialog)

diff --git a/commands.cfg b/commands.cfg
index e0d815f83826a0b69f483c9e44b0c8620f68a3ac..67f5f343e3e65a0d3d462bddc8438318f90a2f9b 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -104,7 +104,6 @@ alias menu_showhudexit "menu_cmd directmenu HUDExit"
 alias menu_showhudoptions "menu_cmd directpanelhudmenu ${* ?}"
 alias menu_showsandboxtools "menu_cmd directmenu SandboxTools"
 alias menu_showquitdialog "menu_cmd directmenu Quit"
-alias menu_showtdtools "menu_cmd directmenu TowerDefense"
 alias menu_showmonstertools "menu_cmd directmenu MonsterTools"
 
 // command executed before loading a map by the menu

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 81da63ffdd5d66bdd89ffa9e99e88b37a62637db..ff8caafb8ae99daee0420148e565f50cca27f3ec 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -425,9 +425,7 @@ seta menu_sandbox_edit_material ""
 bind f7 menu_showsandboxtools
 
 seta menu_monsters_edit_spawn ""
-seta menu_monsters_edit_name ""
 seta menu_monsters_edit_skin 0
-seta menu_monsters_edit_color ""
 seta menu_monsters_edit_movetarget 1
 
 set g_playerclip_collisions 1 "0 = disable collision testing against playerclips, might be useful on some defrag maps"

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index eca2961a21d59388d8dda5f8284e4401af7c2d45..241d84b4df23dddd195704aeebe3294cef82f07e 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -170,7 +170,7 @@ float autocvar_g_waypointsprite_timealphaexponent;
 var float autocvar_g_waypointsprite_turrets = TRUE;
 var float autocvar_g_waypointsprite_turrets_maxdist = 5000;
 var float autocvar_g_waypointsprite_monsters = TRUE;
-var float autocvar_g_waypointsprite_monsters_maxdist = 5000;
+var float autocvar_g_waypointsprite_monsters_maxdist = 2000;
 var float autocvar_hud_cursormode = TRUE;
 float autocvar_hud_colorflash_alpha;
 float autocvar_hud_configure_checkcollisions;

diff --git a/qcsrc/common/monsters/monsters.qc b/qcsrc/common/monsters/monsters.qc
index 7f43df51ff24c80cc3169467635f17573e43df0d..9cc7211b43f7f2ed9972e55f3fde0d7a3c67916e 100644 (file)
--- a/qcsrc/common/monsters/monsters.qc
+++ b/qcsrc/common/monsters/monsters.qc
@@ -19,7 +19,9 @@ void register_monster(float id, float(float) func, float monsterflags, vector mi
        e.maxs = max_s;
        e.model = strzone(strcat("models/monsters/", modelname));
        
+       #ifndef MENUQC
        func(MR_INIT);
+       #endif
 }
 float m_null(float dummy) { return 0; }
 void register_monsters_done()

diff --git a/qcsrc/common/monsters/monsters.qh b/qcsrc/common/monsters/monsters.qh
index 962a810bc2fc5882c9dec3fa4412da7ecefcb70f..d0f7a9ad31c9f315635eb847a5f706233405e861 100644 (file)
--- a/qcsrc/common/monsters/monsters.qh
+++ b/qcsrc/common/monsters/monsters.qh
@@ -25,6 +25,7 @@ const float MON_FLAG_MELEE = 1024;
 .string mdl; // currently a copy of the model
 .string model; // full name of model
 .float spawnflags;
+.vector mins, maxs; // monster hitbox size
 
 // csqc linking
 #ifndef MENUQC
@@ -67,8 +68,13 @@ float MON_LAST;
                register_monster(id,func,monsterflags,min_s,max_s,modelname,shortname,mname); \
        } \
        ACCUMULATE_FUNCTION(RegisterMonsters, RegisterMonsters_##id)
+#ifdef MENUQC
+#define REGISTER_MONSTER(id,func,monsterflags,min_s,max_s,modelname,shortname,mname) \
+       REGISTER_MONSTER_2(MON_##id,m_null,monsterflags,min_s,max_s,modelname,shortname,mname)
+#else
 #define REGISTER_MONSTER(id,func,monsterflags,min_s,max_s,modelname,shortname,mname) \
        REGISTER_MONSTER_2(MON_##id,func,monsterflags,min_s,max_s,modelname,shortname,mname)
+#endif
 
 #define MON_DUPECHECK(dupecheck,cvar) \
        #ifndef dupecheck \

diff --git a/qcsrc/menu/progs.src b/qcsrc/menu/progs.src
index 3036278c1fcfbe09ed31da9f56795e2be7f8dbe6..97e17ff3c0860e6bdb0eb83c4982b6e6f1c0eb38 100644 (file)
--- a/qcsrc/menu/progs.src
+++ b/qcsrc/menu/progs.src
@@ -25,6 +25,7 @@ oo/base.h
 ../common/command/generic.qh
 ../common/command/shared_defs.qh
 ../common/urllib.qh
+../common/monsters/monsters.qh
 
 command/menu_cmd.qh
 menu.qh
@@ -52,6 +53,7 @@ xonotic/util.qc
 ../common/mapinfo.qc
 ../common/items.qc
 ../common/urllib.qc
+../common/monsters/monsters.qc
 
 ../warpzonelib/mathlib.qc