s/#ifndef MENUQC/#ifdef GAMEQC/g

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdbce7d5ac19f8b20fd5990f9756af7773ea05ba..2f38e43ba2be7ad75167b6683b238baae72dbc1a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,11 +26,11 @@ set_source_files_properties(
 )
 
 add_executable(csprogs qcsrc/client/progs.inc)
-target_compile_definitions(csprogs PRIVATE -DCSQC)
+target_compile_definitions(csprogs PRIVATE -DGAMEQC -DCSQC)
 add_dependencies(csprogs gmqcc)
 
 add_executable(progs qcsrc/server/progs.inc)
-target_compile_definitions(progs PRIVATE -DSVQC)
+target_compile_definitions(progs PRIVATE -DGAMEQC -DSVQC)
 add_dependencies(progs gmqcc)
 
 add_executable(menu qcsrc/menu/progs.inc)

diff --git a/qcsrc/common/_all.inc b/qcsrc/common/_all.inc
index 7b284dc1dfebe766c5fa11a577bf463e30b050bd..f528eee6db46aab5a426d78d60739db50ae83f7d 100644 (file)
--- a/qcsrc/common/_all.inc
+++ b/qcsrc/common/_all.inc
@@ -1,6 +1,6 @@
 float autocvar_net_connecttimeout = 30;
 
-#ifndef MENUQC
+#ifdef GAMEQC
 #include "anim.qc"
 #include "animdecide.qc"
 #include "ent_cs.qc"
@@ -19,13 +19,13 @@ float autocvar_net_connecttimeout = 30;
 #include "campaign_setup.qc"
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 #include "physics/all.inc"
 #include "triggers/include.qc"
 #include "viewloc.qc"
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 #include "minigames/minigames.qc"
 #endif
 
@@ -33,7 +33,7 @@ float autocvar_net_connecttimeout = 30;
 
 #include "command/_mod.inc"
 
-#ifndef MENUQC
+#ifdef GAMEQC
 #include "deathtypes/all.qc"
 #include "effects/all.qc"
 #include "impulses/all.qc"

diff --git a/qcsrc/common/command/generic.qc b/qcsrc/common/command/generic.qc
index 2fcdf0c351052c30443ed871d2ea59d1e672fd82..bce5ea8e8d3457096dbf5f897426400b2ebf014b 100644 (file)
--- a/qcsrc/common/command/generic.qc
+++ b/qcsrc/common/command/generic.qc
@@ -6,7 +6,7 @@
 
 #include "../mapinfo.qh"
 
-#ifndef MENUQC
+#ifdef GAMEQC
        #include "../notifications/all.qh"
 #endif
 
@@ -372,7 +372,7 @@ void GenericCommand_restartnotifs(float request)
        {
                case CMD_REQUEST_COMMAND:
                {
-                       #ifndef MENUQC
+                       #ifdef GAMEQC
                        int NOTIF_ANNCE_COUNT   = 0; FOREACH(Notifications, it.nent_type == MSG_ANNCE,   { ++NOTIF_ANNCE_COUNT;  });
                        int NOTIF_INFO_COUNT    = 0; FOREACH(Notifications, it.nent_type == MSG_INFO,    { ++NOTIF_INFO_COUNT;   });
                        int NOTIF_CENTER_COUNT  = 0; FOREACH(Notifications, it.nent_type == MSG_CENTER,  { ++NOTIF_CENTER_COUNT; });

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index 6c775560394259816e14622b1584cb2843b34d59..80a3f5edddf0edc00831f13e54e22271a3a97bb2 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -126,7 +126,7 @@ const int SFL_SORT_PRIO_MASK = 12;
  * Score indices
  */
 
-#ifndef MENUQC
+#ifdef GAMEQC
 
 #define IS_INCREASING(x) ( (x) & SFL_LOWER_IS_BETTER )
 #define IS_DECREASING(x) ( !((x) & SFL_LOWER_IS_BETTER) )

diff --git a/qcsrc/common/debug.qh b/qcsrc/common/debug.qh
index 052e00f07c4df4e0548c5c3fdba01b02bceff18c..6d580bd2d69a8b65631a465d0adee730e6bca07d 100644 (file)
--- a/qcsrc/common/debug.qh
+++ b/qcsrc/common/debug.qh
@@ -4,7 +4,7 @@
 .entity tag_entity;
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 .bool debug;
 .int sv_entnum;
 REGISTER_NET_TEMP(net_debug)
@@ -47,7 +47,7 @@ REGISTER_NET_TEMP(net_debug)
        }
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 /**
  * 0: off
  * 1: on

diff --git a/qcsrc/common/effects/qc/damageeffects.qc b/qcsrc/common/effects/qc/damageeffects.qc
index b72f38e0882ceac7c1d11215c95baf26b098700b..71e1e2a7bcdd96dcf3f72629d7e147d4db03aab3 100644 (file)
--- a/qcsrc/common/effects/qc/damageeffects.qc
+++ b/qcsrc/common/effects/qc/damageeffects.qc
@@ -1,15 +1,4 @@
-#ifndef DAMAGEEFFECTS_H
-#define DAMAGEEFFECTS_H
-
-#ifdef CSQC
-#include <common/deathtypes/all.qh>
-#include <common/physics/movetypes/movetypes.qh>
-#include <client/mutators/events.qh>
-#include <common/vehicles/all.qh>
-#include <common/weapons/_all.qh>
-#endif
-
-#endif
+#include "damageeffects.qh"
 
 #ifdef IMPLEMENTATION
 

diff --git a/qcsrc/common/effects/qc/damageeffects.qh b/qcsrc/common/effects/qc/damageeffects.qh
index 6f70f09beec2219624baeca92e2cd7deaa104fb4..2a1d587ca497d3ee57680684ad5c88b547568149 100644 (file)
--- a/qcsrc/common/effects/qc/damageeffects.qh
+++ b/qcsrc/common/effects/qc/damageeffects.qh
@@ -1 +1,9 @@
 #pragma once
+
+#ifdef CSQC
+#include <common/deathtypes/all.qh>
+#include <common/physics/movetypes/movetypes.qh>
+#include <client/mutators/events.qh>
+#include <common/vehicles/all.qh>
+#include <common/weapons/_all.qh>
+#endif

diff --git a/qcsrc/common/items/all.qh b/qcsrc/common/items/all.qh
index 41cd424987fddd562b80a6a6d1ed7aa06b55b6e2..d377776cd554f0bc5c3b0467c755cf8fe641ad37 100644 (file)
--- a/qcsrc/common/items/all.qh
+++ b/qcsrc/common/items/all.qh
@@ -29,6 +29,6 @@ GENERIC_COMMAND(dumpitems, "Dump all items to the console") {
     }
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 string Item_Model(string item_mdl);
 #endif

diff --git a/qcsrc/common/items/item/ammo.qh b/qcsrc/common/items/item/ammo.qh
index d2ef10a4f96178a8d6ffa0a09af89d3adc25b096..e1d493fe975a7c50dfcd11af3d9fba717a67c1da 100644 (file)
--- a/qcsrc/common/items/item/ammo.qh
+++ b/qcsrc/common/items/item/ammo.qh
@@ -13,12 +13,12 @@ ENDCLASS(Ammo)
     #include <common/t_items.qh>
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(Bullets_ITEM, Item_Model("a_bullets.mdl"));
 #endif
 
 REGISTER_ITEM(Bullets, Ammo) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model    =   MDL_Bullets_ITEM;
 #endif
     this.m_name     =   "bullets";
@@ -29,12 +29,12 @@ REGISTER_ITEM(Bullets, Ammo) {
 #endif
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(Cells_ITEM, Item_Model("a_cells.md3"));
 #endif
 
 REGISTER_ITEM(Cells, Ammo) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model    =   MDL_Cells_ITEM;
 #endif
     this.m_name     =   "cells";
@@ -45,12 +45,12 @@ REGISTER_ITEM(Cells, Ammo) {
 #endif
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(Plasma_ITEM, Item_Model("a_cells.md3"));
 #endif
 
 REGISTER_ITEM(Plasma, Ammo) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model    =   MDL_Plasma_ITEM;
 #endif
     this.m_name     =   "plasma";
@@ -61,12 +61,12 @@ REGISTER_ITEM(Plasma, Ammo) {
 #endif
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(Rockets_ITEM, Item_Model("a_rockets.md3"));
 #endif
 
 REGISTER_ITEM(Rockets, Ammo) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model    =   MDL_Rockets_ITEM;
 #endif
     this.m_name     =   "rockets";
@@ -77,12 +77,12 @@ REGISTER_ITEM(Rockets, Ammo) {
 #endif
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(Shells_ITEM, Item_Model("a_shells.md3"));
 #endif
 
 REGISTER_ITEM(Shells, Ammo) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model    =   MDL_Shells_ITEM;
 #endif
     this.m_name     =   "shells";

diff --git a/qcsrc/common/items/item/armor.qh b/qcsrc/common/items/item/armor.qh
index cb41abc295618c3816c9028955fe79e65c3ff443..7946fb7b5d3cb651d074492e23687bf799b106a8 100644 (file)
--- a/qcsrc/common/items/item/armor.qh
+++ b/qcsrc/common/items/item/armor.qh
@@ -13,13 +13,13 @@ ENDCLASS(Armor)
     #include <common/t_items.qh>
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(ArmorSmall_ITEM, Item_Model("item_armor_small.md3"));
 SOUND(ArmorSmall, "misc/armor1");
 #endif
 
 REGISTER_ITEM(ArmorSmall, Armor) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model                =   MDL_ArmorSmall_ITEM;
     this.m_sound                =   SND_ArmorSmall;
 #endif
@@ -33,13 +33,13 @@ REGISTER_ITEM(ArmorSmall, Armor) {
 #endif
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(ArmorMedium_ITEM, Item_Model("item_armor_medium.md3"));
 SOUND(ArmorMedium, "misc/armor10");
 #endif
 
 REGISTER_ITEM(ArmorMedium, Armor) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model                =   MDL_ArmorMedium_ITEM;
     this.m_sound                =   SND_ArmorMedium;
 #endif
@@ -53,13 +53,13 @@ REGISTER_ITEM(ArmorMedium, Armor) {
 #endif
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(ArmorLarge_ITEM, Item_Model("item_armor_big.md3"));
 SOUND(ArmorLarge, "misc/armor17_5");
 #endif
 
 REGISTER_ITEM(ArmorLarge, Armor) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model                =   MDL_ArmorLarge_ITEM;
     this.m_sound                =   SND_ArmorLarge;
 #endif
@@ -75,13 +75,13 @@ REGISTER_ITEM(ArmorLarge, Armor) {
 #endif
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(ArmorMega_ITEM, Item_Model("item_armor_large.md3"));
 SOUND(ArmorMega, "misc/armor25");
 #endif
 
 REGISTER_ITEM(ArmorMega, Armor) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model                =   MDL_ArmorMega_ITEM;
     this.m_sound                =   SND_ArmorMega;
 #endif

diff --git a/qcsrc/common/items/item/health.qh b/qcsrc/common/items/item/health.qh
index 79933870fc2b5535995dfec18d244e76cd0c5c69..1597ba605708d944d69b76b10429c0357f0aec91 100644 (file)
--- a/qcsrc/common/items/item/health.qh
+++ b/qcsrc/common/items/item/health.qh
@@ -13,13 +13,13 @@ ENDCLASS(Health)
     #include <common/t_items.qh>
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(HealthSmall_ITEM, Item_Model("g_h1.md3"));
 SOUND(HealthSmall, "misc/minihealth");
 #endif
 
 REGISTER_ITEM(HealthSmall, Health) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model                =   MDL_HealthSmall_ITEM;
     this.m_sound                =   SND_HealthSmall;
 #endif
@@ -33,13 +33,13 @@ REGISTER_ITEM(HealthSmall, Health) {
 #endif
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(HealthMedium_ITEM, Item_Model("g_h25.md3"));
 SOUND(HealthMedium, "misc/mediumhealth");
 #endif
 
 REGISTER_ITEM(HealthMedium, Health) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model                =   MDL_HealthMedium_ITEM;
     this.m_sound                =   SND_HealthMedium;
 #endif
@@ -53,13 +53,13 @@ REGISTER_ITEM(HealthMedium, Health) {
 #endif
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(HealthLarge_ITEM, Item_Model("g_h50.md3"));
 SOUND(HealthLarge, "misc/mediumhealth");
 #endif
 
 REGISTER_ITEM(HealthLarge, Health) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model                =   MDL_HealthLarge_ITEM;
     this.m_sound                =   SND_HealthLarge;
 #endif
@@ -75,13 +75,13 @@ REGISTER_ITEM(HealthLarge, Health) {
 #endif
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(HealthMega_ITEM, Item_Model("g_h100.md3"));
 SOUND(HealthMega, "misc/megahealth");
 #endif
 
 REGISTER_ITEM(HealthMega, Health) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model                =   MDL_HealthMega_ITEM;
     this.m_sound                =   SND_HealthMega;
 #endif

diff --git a/qcsrc/common/items/item/jetpack.qh b/qcsrc/common/items/item/jetpack.qh
index 67f308c2a6820d8c8c913f2eb9c5d29d198f590e..8334c791ab11d99843595e2e54eaf57e6f922b15 100644 (file)
--- a/qcsrc/common/items/item/jetpack.qh
+++ b/qcsrc/common/items/item/jetpack.qh
@@ -11,12 +11,12 @@
 .int m_itemid;
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(Jetpack_ITEM, Item_Model("g_jetpack.md3"));
 #endif
 
 REGISTER_ITEM(Jetpack, Powerup) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model                =   MDL_Jetpack_ITEM;
     this.m_itemid               =   IT_JETPACK;
 #endif
@@ -31,12 +31,12 @@ REGISTER_ITEM(Jetpack, Powerup) {
 #endif
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(JetpackFuel_ITEM, Item_Model("g_fuel.md3"));
 #endif
 
 REGISTER_ITEM(JetpackFuel, Ammo) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model    =   MDL_JetpackFuel_ITEM;
 #endif
     this.m_name     =   "Fuel";
@@ -47,12 +47,12 @@ REGISTER_ITEM(JetpackFuel, Ammo) {
 #endif
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(JetpackRegen_ITEM, Item_Model("g_fuelregen.md3"));
 #endif
 
 REGISTER_ITEM(JetpackRegen, Powerup) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model                =   MDL_JetpackRegen_ITEM;
 #endif
     this.m_name                 =   "Fuel regenerator";

diff --git a/qcsrc/common/items/item/pickup.qh b/qcsrc/common/items/item/pickup.qh
index 5bd5da774d0ea09c205dcdd1da5048e63273ea51..204a49921d5f2b84fbc3f30aaff98d692dcbf9e7 100644 (file)
--- a/qcsrc/common/items/item/pickup.qh
+++ b/qcsrc/common/items/item/pickup.qh
@@ -27,7 +27,7 @@ const int BOT_PICKUP_RATING_HIGH = 10000;
 #include <common/t_items.qh>
 
 CLASS(Pickup, GameItem)
-#ifndef MENUQC
+#ifdef GAMEQC
     ATTRIB(Pickup, m_model, Model);
     ATTRIB(Pickup, m_sound, Sound, SND_ITEMPICKUP);
 #endif

diff --git a/qcsrc/common/items/item/powerup.qh b/qcsrc/common/items/item/powerup.qh
index f0745b6c294069460ab0068957e5c1181c7d53a6..002be54f805a91dc9b7d56e355a695f60d589b08 100644 (file)
--- a/qcsrc/common/items/item/powerup.qh
+++ b/qcsrc/common/items/item/powerup.qh
@@ -17,13 +17,13 @@ CLASS(Powerup, Pickup)
 #endif
 ENDCLASS(Powerup)
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(Strength_ITEM, Item_Model("g_strength.md3"));
 SOUND(Strength, "misc/powerup");
 #endif
 
 REGISTER_ITEM(Strength, Powerup) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model            =   MDL_Strength_ITEM;
     this.m_sound            =   SND_Strength;
 #endif
@@ -35,13 +35,13 @@ REGISTER_ITEM(Strength, Powerup) {
     this.m_itemid           =   IT_STRENGTH;
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(Shield_ITEM, Item_Model("g_invincible.md3"));
 SOUND(Shield, "misc/powerup_shield");
 #endif
 
 REGISTER_ITEM(Shield, Powerup) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model            =   MDL_Shield_ITEM;
     this.m_sound            =   SND_Shield;
 #endif

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 9ef75a6b294b63c46a4496a23f82a91ec713aaca..cffa348936904e03f518e7c4a2e71c5df93d3b92 100644 (file)
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -1298,7 +1298,7 @@ int MapInfo_ForbiddenFlags()
 {
        int f = MAPINFO_FLAG_FORBIDDEN;
 
-#ifndef MENUQC
+#ifdef GAMEQC
        if (!cvar("g_maplist_allow_hidden"))
 #endif
                f |= MAPINFO_FLAG_HIDDEN;

diff --git a/qcsrc/common/monsters/monster.qh b/qcsrc/common/monsters/monster.qh
index 5187c7f56b17f576771778ff3f2a7b0652b0bde2..341b92e7b53849b86b5a3b830c7d4173ec7062c5 100644 (file)
--- a/qcsrc/common/monsters/monster.qh
+++ b/qcsrc/common/monsters/monster.qh
@@ -11,7 +11,7 @@
 #include <lib/warpzone/server.qh>
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 #include "../animdecide.qh"
 #include "../anim.qh"
 vector animfixfps(entity e, vector a, vector b);

diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc
index e23f77a4d2e8b090fe8061d8fc2086b38cdd6922..08d1b7b5bed8bb730bc810368368e8394d9b6705 100644 (file)
--- a/qcsrc/common/monsters/monster/mage.qc
+++ b/qcsrc/common/monsters/monster/mage.qc
@@ -1,7 +1,7 @@
 #ifndef MAGE_H
 #define MAGE_H
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(MON_MAGE, M_Model("mage.dpm"));
 #endif
 
@@ -9,7 +9,7 @@ CLASS(Mage, Monster)
     ATTRIB(Mage, spawnflags, int, MON_FLAG_MELEE | MON_FLAG_RANGED);
     ATTRIB(Mage, mins, vector, '-36 -36 -24');
     ATTRIB(Mage, maxs, vector, '36 36 50');
-#ifndef MENUQC
+#ifdef GAMEQC
     ATTRIB(Mage, m_model, Model, MDL_MON_MAGE);
 #endif
     ATTRIB(Mage, netname, string, "mage");
@@ -17,7 +17,7 @@ CLASS(Mage, Monster)
 ENDCLASS(Mage)
 
 REGISTER_MONSTER(MAGE, NEW(Mage)) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.mr_precache(this);
 #endif
 }
@@ -459,7 +459,7 @@ METHOD(Mage, mr_death, bool(Mage this, entity actor))
 }
 
 #endif
-#ifndef MENUQC
+#ifdef GAMEQC
 METHOD(Mage, mr_anim, bool(Mage this, entity actor))
 {
     TC(Mage, this);

diff --git a/qcsrc/common/monsters/monster/shambler.qc b/qcsrc/common/monsters/monster/shambler.qc
index eb615fb55483d7e5665fe7f698d8472acbb206dd..8b2b2f39f4d8efc2329a84fe29bf542202670b0e 100644 (file)
--- a/qcsrc/common/monsters/monster/shambler.qc
+++ b/qcsrc/common/monsters/monster/shambler.qc
@@ -1,7 +1,7 @@
 #ifndef SHAMBLER_H
 #define SHAMBLER_H
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(MON_SHAMBLER, M_Model("shambler.mdl"));
 #endif
 
@@ -9,7 +9,7 @@ CLASS(Shambler, Monster)
     ATTRIB(Shambler, spawnflags, int, MONSTER_SIZE_BROKEN | MON_FLAG_SUPERMONSTER | MON_FLAG_MELEE | MON_FLAG_RANGED);
     ATTRIB(Shambler, mins, vector, '-41 -41 -31');
     ATTRIB(Shambler, maxs, vector, '41 41 65');
-#ifndef MENUQC
+#ifdef GAMEQC
     ATTRIB(Shambler, m_model, Model, MDL_MON_SHAMBLER);
 #endif
     ATTRIB(Shambler, netname, string, "shambler");
@@ -17,7 +17,7 @@ CLASS(Shambler, Monster)
 ENDCLASS(Shambler)
 
 REGISTER_MONSTER(SHAMBLER, NEW(Shambler)) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.mr_precache(this);
 #endif
 }
@@ -250,7 +250,7 @@ METHOD(Shambler, mr_death, bool(Shambler this, entity actor))
     return true;
 }
 #endif
-#ifndef MENUQC
+#ifdef GAMEQC
 METHOD(Shambler, mr_anim, bool(Shambler this, entity actor))
 {
     TC(Shambler, this);

diff --git a/qcsrc/common/monsters/monster/spider.qc b/qcsrc/common/monsters/monster/spider.qc
index ad7fb9ff320ae33eb2dfacd6698e5dec0c3fb52b..475914ebd8ff9cd9d123295fb056234c06ef0ebc 100644 (file)
--- a/qcsrc/common/monsters/monster/spider.qc
+++ b/qcsrc/common/monsters/monster/spider.qc
@@ -1,7 +1,7 @@
 #ifndef SPIDER_H
 #define SPIDER_H
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(MON_SPIDER, M_Model("spider.dpm"));
 #endif
 
@@ -9,7 +9,7 @@ CLASS(Spider, Monster)
     ATTRIB(Spider, spawnflags, int, MON_FLAG_MELEE | MON_FLAG_RANGED | MON_FLAG_RIDE);
     ATTRIB(Spider, mins, vector, '-18 -18 -25');
     ATTRIB(Spider, maxs, vector, '18 18 30');
-#ifndef MENUQC
+#ifdef GAMEQC
     ATTRIB(Spider, m_model, Model, MDL_MON_SPIDER);
 #endif
     ATTRIB(Spider, netname, string, "spider");
@@ -17,7 +17,7 @@ CLASS(Spider, Monster)
 ENDCLASS(Spider)
 
 REGISTER_MONSTER(SPIDER, NEW(Spider)) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.mr_precache(this);
 #endif
 }
@@ -249,7 +249,7 @@ METHOD(Spider, mr_death, bool(Spider this, entity actor))
     return true;
 }
 #endif
-#ifndef MENUQC
+#ifdef GAMEQC
 METHOD(Spider, mr_anim, bool(Spider this, entity actor))
 {
     TC(Spider, this);

diff --git a/qcsrc/common/monsters/monster/wyvern.qc b/qcsrc/common/monsters/monster/wyvern.qc
index eab14131da05a1f9c814c61f955cebc739112209..8b2e8768fbc1afd00a3a22ecc6089315fbd67d81 100644 (file)
--- a/qcsrc/common/monsters/monster/wyvern.qc
+++ b/qcsrc/common/monsters/monster/wyvern.qc
@@ -1,7 +1,7 @@
 #ifndef WYVERN_H
 #define WYVERN_H
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(MON_WYVERN, M_Model("wizard.mdl"));
 #endif
 
@@ -9,7 +9,7 @@ CLASS(Wyvern, Monster)
     ATTRIB(Wyvern, spawnflags, int, MONSTER_TYPE_FLY | MONSTER_SIZE_BROKEN | MON_FLAG_RANGED | MON_FLAG_RIDE);
     ATTRIB(Wyvern, mins, vector, '-20 -20 -58');
     ATTRIB(Wyvern, maxs, vector, '20 20 20');
-#ifndef MENUQC
+#ifdef GAMEQC
     ATTRIB(Wyvern, m_model, Model, MDL_MON_WYVERN);
 #endif
     ATTRIB(Wyvern, netname, string, "wyvern");
@@ -17,7 +17,7 @@ CLASS(Wyvern, Monster)
 ENDCLASS(Wyvern)
 
 REGISTER_MONSTER(WYVERN, NEW(Wyvern)) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.mr_precache(this);
 #endif
 }
@@ -170,7 +170,7 @@ METHOD(Wyvern, mr_death, bool(Wyvern this, entity actor))
     return true;
 }
 #endif
-#ifndef MENUQC
+#ifdef GAMEQC
 METHOD(Wyvern, mr_anim, bool(Wyvern this, entity actor))
 {
     TC(Wyvern, this);

diff --git a/qcsrc/common/monsters/monster/zombie.qc b/qcsrc/common/monsters/monster/zombie.qc
index fd270a1e1efaf2142ecea7a7fd0475b38c7ccae5..79b83b63e9aeeda4ffd6e39590b443ebe089f35b 100644 (file)
--- a/qcsrc/common/monsters/monster/zombie.qc
+++ b/qcsrc/common/monsters/monster/zombie.qc
@@ -1,7 +1,7 @@
 #ifndef ZOMBIE_H
 #define ZOMBIE_H
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(MON_ZOMBIE, M_Model("zombie.dpm"));
 #endif
 
@@ -9,7 +9,7 @@ CLASS(Zombie, Monster)
     ATTRIB(Zombie, spawnflags, int, MON_FLAG_MELEE | MON_FLAG_RIDE);
     ATTRIB(Zombie, mins, vector, '-18 -18 -25');
     ATTRIB(Zombie, maxs, vector, '18 18 47');
-#ifndef MENUQC
+#ifdef GAMEQC
     ATTRIB(Zombie, m_model, Model, MDL_MON_ZOMBIE);
 #endif
     ATTRIB(Zombie, netname, string, "zombie");
@@ -17,7 +17,7 @@ CLASS(Zombie, Monster)
 ENDCLASS(Zombie)
 
 REGISTER_MONSTER(ZOMBIE, NEW(Zombie)) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.mr_precache(this);
 #endif
 }
@@ -180,7 +180,7 @@ METHOD(Zombie, mr_death, bool(Zombie this, entity actor))
     return true;
 }
 #endif
-#ifndef MENUQC
+#ifdef GAMEQC
 METHOD(Zombie, mr_anim, bool(Zombie this, entity actor))
 {
     TC(Zombie, this);

diff --git a/qcsrc/common/mutators/base.qh b/qcsrc/common/mutators/base.qh
index 5187f7fe1ffeb12b8f397e170597ec398295b6ca..ee5dc4ab12b7ec974a2de6a508e0ac6086713eb4 100644 (file)
--- a/qcsrc/common/mutators/base.qh
+++ b/qcsrc/common/mutators/base.qh
@@ -1,5 +1,4 @@
-#ifndef MUTATORS_BASE_H
-#define MUTATORS_BASE_H
+#pragma once
 
 const int CBC_ORDER_FIRST = 1;
 const int CBC_ORDER_LAST = 2;
@@ -168,7 +167,7 @@ bool Mutator_Add(Mutator mut);
 void Mutator_Remove(Mutator mut);
 bool mutator_log = false;
 
-#ifndef MENUQC
+#ifdef GAMEQC
 /** server mutators activate corresponding client mutators for all clients */
 REGISTER_NET_LINKED(Mutator)
 
@@ -322,5 +321,3 @@ STATIC_INIT_LATE(Mutators) {
 } MACRO_END
 
 #include "events.qh"
-
-#endif

diff --git a/qcsrc/common/mutators/events.qh b/qcsrc/common/mutators/events.qh
index 0dbc9ea21857cffe72d144a258fbddc25e5dc837..6b16371a2cfa739a97325ad4a8f8c69a04c61657 100644 (file)
--- a/qcsrc/common/mutators/events.qh
+++ b/qcsrc/common/mutators/events.qh
@@ -1,5 +1,4 @@
-#ifndef COMMON_MUTATORS_EVENTS_H
-#define COMMON_MUTATORS_EVENTS_H
+#pragma once
 
 #define EV_NO_ARGS(i, o)
 
@@ -104,5 +103,3 @@ MUTATOR_HOOKABLE(PM_Physics, EV_PM_Physics);
     /**/          o(string, MUTATOR_ARGV_1_string) \
     /**/
 MUTATOR_HOOKABLE(WeaponModel, EV_WeaponModel);
-
-#endif

diff --git a/qcsrc/common/mutators/mutator/buffs/buffs.qh b/qcsrc/common/mutators/mutator/buffs/buffs.qh
index 2b4291ff3902401227fcf7d771f3217dcf0de73e..ae76d9f59ef6f9dc9e910389508d9f81a8417c21 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/buffs.qh
+++ b/qcsrc/common/mutators/mutator/buffs/buffs.qh
@@ -3,7 +3,7 @@
 #include <common/teams.qh>
 #include <common/util.qh>
 
-#ifndef MENUQC
+#ifdef GAMEQC
 REGISTER_WAYPOINT(Buff, _("Buff"), '1 0.5 0', 1);
 REGISTER_RADARICON(Buff, 1);
 #endif

diff --git a/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc b/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
index a7df2853c67bb0b24a35eae342df766e14ed0acb..a67e9455d9233640030bd1e0b879ff7b980ee0e8 100644 (file)
--- a/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
+++ b/qcsrc/common/mutators/mutator/bugrigs/bugrigs.qc
@@ -1,6 +1,6 @@
 #include "bugrigs.qh"
 
-#ifndef MENUQC
+#ifdef GAMEQC
 
 #ifdef SVQC
        #include <server/antilag.qh>

diff --git a/qcsrc/common/mutators/mutator/doublejump/doublejump.qc b/qcsrc/common/mutators/mutator/doublejump/doublejump.qc
index f9821b13a7ac16a82b12e62483414ec6070495a3..cc60ccc1fd8a9bccf1a9006ca0b46a86796d35f8 100644 (file)
--- a/qcsrc/common/mutators/mutator/doublejump/doublejump.qc
+++ b/qcsrc/common/mutators/mutator/doublejump/doublejump.qc
@@ -1,6 +1,6 @@
 #include "doublejump.qh"
 
-#ifndef MENUQC
+#ifdef GAMEQC
 #ifdef SVQC
        #include <server/antilag.qh>
 #endif

diff --git a/qcsrc/common/mutators/mutator/instagib/items.qh b/qcsrc/common/mutators/mutator/instagib/items.qh
index 65decbf40f10f79806d7ee08e9ed6ef989789ecf..7736fa7b30a1dea2d07f6305a5f55db19ef90b88 100644 (file)
--- a/qcsrc/common/mutators/mutator/instagib/items.qh
+++ b/qcsrc/common/mutators/mutator/instagib/items.qh
@@ -9,13 +9,13 @@ float instagib_respawntimejitter_ammo = 0;
 GETTER(float, instagib_respawntime_ammo)
 GETTER(float, instagib_respawntimejitter_ammo)
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(VaporizerCells_ITEM, Item_Model("a_cells.md3"));
 SOUND(VaporizerCells, "misc/itempickup");
 #endif
 
 REGISTER_ITEM(VaporizerCells, Ammo) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model                =   MDL_VaporizerCells_ITEM;
     this.m_sound                =   SND_VaporizerCells;
 #endif
@@ -29,13 +29,13 @@ REGISTER_ITEM(VaporizerCells, Ammo) {
 #endif
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(ExtraLife_ITEM, Item_Model("g_h100.md3"));
 SOUND(ExtraLife, "misc/megahealth");
 #endif
 
 REGISTER_ITEM(ExtraLife, Powerup) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model                =   MDL_ExtraLife_ITEM;
     this.m_sound                =   SND_ExtraLife;
 #endif
@@ -47,13 +47,13 @@ REGISTER_ITEM(ExtraLife, Powerup) {
     this.m_itemid               =   IT_NAILS;
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(Invisibility_ITEM, Item_Model("g_strength.md3"));
 SOUND(Invisibility, "misc/powerup");
 #endif
 
 REGISTER_ITEM(Invisibility, Powerup) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model            =   MDL_Invisibility_ITEM;
     this.m_sound            =   SND_Invisibility;
 #endif
@@ -65,13 +65,13 @@ REGISTER_ITEM(Invisibility, Powerup) {
     this.m_itemid           =   IT_STRENGTH;
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 MODEL(Speed_ITEM, Item_Model("g_invincible.md3"));
 SOUND(Speed, "misc/powerup_shield");
 #endif
 
 REGISTER_ITEM(Speed, Powerup) {
-#ifndef MENUQC
+#ifdef GAMEQC
     this.m_model            =   MDL_Speed_ITEM;
     this.m_sound            =   SND_Speed;
 #endif

diff --git a/qcsrc/common/mutators/mutator/multijump/multijump.qc b/qcsrc/common/mutators/mutator/multijump/multijump.qc
index aeee45e121430493692d62318ea955c17c02e501..ecedc475961585184fd61bad6785d2986f00f23e 100644 (file)
--- a/qcsrc/common/mutators/mutator/multijump/multijump.qc
+++ b/qcsrc/common/mutators/mutator/multijump/multijump.qc
@@ -1,6 +1,6 @@
 #include "multijump.qh"
 
-#ifndef MENUQC
+#ifdef GAMEQC
 
 #ifdef SVQC
        #include <server/antilag.qh>

diff --git a/qcsrc/common/mutators/mutator/nades/nades.inc b/qcsrc/common/mutators/mutator/nades/nades.inc
index 8a7337f6103a9020849196832b0e24484f9d21be..bcdbe0cd920973e256c142f27d1d216ef8e90f02 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.inc
+++ b/qcsrc/common/mutators/mutator/nades/nades.inc
@@ -1,4 +1,4 @@
-#ifndef MENUQC
+#ifdef GAMEQC
 #define NADE_PROJECTILE(i, projectile, trail) MACRO_BEGIN { \
     this.m_projectile[i] = projectile; \
     this.m_trail[i] = trail; \

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index d907864ef490c9ba5d7c5f530e4d8415701fb8a0..d15353745e694868381c0aaf589e015c697c78ad 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -7,7 +7,7 @@ float autocvar_g_nades_spread = 0.04;
 
 REGISTER_STAT(NADES_SMALL, int, autocvar_g_nades_nade_small)
 
-#ifndef MENUQC
+#ifdef GAMEQC
 entity Nade_TrailEffect(int proj, int nade_team)
 {
     switch (proj)

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qh b/qcsrc/common/mutators/mutator/nades/nades.qh
index 0402295e25c96c1417f4e50ebecec3f3e40e7216..fd8d26902a4f5b6665dd2238c83c4d0f9708a26d 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.qh
+++ b/qcsrc/common/mutators/mutator/nades/nades.qh
@@ -51,7 +51,7 @@ Nade Nade_FromProjectile(int proj)
     return NADE_TYPE_Null;
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 #include "effects.inc"
 #endif
 

diff --git a/qcsrc/common/mutators/mutator/nades/net.qc b/qcsrc/common/mutators/mutator/nades/net.qc
index ea78745808fea382bd298841bd5cfb325452e237..498d878d2d272341bd2ba9b04fd8908393a5e713 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/net.qc
+++ b/qcsrc/common/mutators/mutator/nades/net.qc
@@ -1,6 +1,6 @@
 #include "net.qh"
 
-#ifndef MENUQC
+#ifdef GAMEQC
 
 #include "nades.qh"
 

diff --git a/qcsrc/common/mutators/mutator/overkill/hmg.qh b/qcsrc/common/mutators/mutator/overkill/hmg.qh
index 671caa47b93efdedffe4fce5593300c3dd561565..7219fd1f80756bb0abb8fd88a984c7e18a1ae861 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/hmg.qh
+++ b/qcsrc/common/mutators/mutator/overkill/hmg.qh
@@ -7,7 +7,7 @@ CLASS(HeavyMachineGun, Weapon)
 /* rating    */ ATTRIB(HeavyMachineGun, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(HeavyMachineGun, wpcolor, vector, '0.5 0.5 0');
 /* modelname */ ATTRIB(HeavyMachineGun, mdl, string, "ok_hmg");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(HeavyMachineGun, m_model, Model, MDL_HMG_ITEM);
 #endif
 /* crosshair */ ATTRIB(HeavyMachineGun, w_crosshair, string, "gfx/crosshairuzi");

diff --git a/qcsrc/common/mutators/mutator/overkill/rpc.qh b/qcsrc/common/mutators/mutator/overkill/rpc.qh
index d68c9d9808d7dc44631009f9af6b64f854eb65a9..535fa5533a08f6ba0528db24938fce2db70c868e 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/rpc.qh
+++ b/qcsrc/common/mutators/mutator/overkill/rpc.qh
@@ -7,7 +7,7 @@ CLASS(RocketPropelledChainsaw, Weapon)
 /* rating    */ ATTRIB(RocketPropelledChainsaw, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(RocketPropelledChainsaw, wpcolor, vector, '0.5 0.5 0');
 /* modelname */ ATTRIB(RocketPropelledChainsaw, mdl, string, "ok_rl");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(RocketPropelledChainsaw, m_model, Model, MDL_RPC_ITEM);
 #endif
 /* crosshair */ ATTRIB(RocketPropelledChainsaw, w_crosshair, string, "gfx/crosshairrocketlauncher");

diff --git a/qcsrc/common/notifications/all.qh b/qcsrc/common/notifications/all.qh
index 1fd7f108f57f2cb3b3d2e79f6a6d5d869817da17..2715925944b6d16ae1701c4a3f0b5ba70db7c815 100644 (file)
--- a/qcsrc/common/notifications/all.qh
+++ b/qcsrc/common/notifications/all.qh
@@ -159,7 +159,7 @@ GENERIC_COMMAND(dumpnotifs, "Dump all notifications into notifications_dump.txt"
        {
                case CMD_REQUEST_COMMAND:
                {
-                       #ifndef MENUQC
+                       #ifdef GAMEQC
                        string filename = argv(1);
                        bool alsoprint = false;
                        if (filename == "")

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index 9cf439f52bdca0e9a33e93bb626246f8ba4a3886..716abaf9880f183d47d9a82cd8c3af52e9b0eeb4 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -18,7 +18,7 @@
     #include "mapinfo.qh"
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 /*
 * Get "real" origin, in worldspace, even if ent is attached to something else.
 */
@@ -55,8 +55,7 @@ string wordwrap(string s, float l)
        return r;
 }
 
-#ifndef MENUQC
-#ifndef CSQC
+#ifdef SVQC
 entity _wordwrap_buffer_sprint_ent;
 void wordwrap_buffer_sprint(string s)
 {
@@ -80,7 +79,6 @@ void wordwrap_sprint(entity to, string s, float l)
        return;
 }
 #endif
-#endif
 
 #ifndef SVQC
 string draw_UseSkinFor(string pic)
@@ -352,7 +350,7 @@ STATIC_INIT(compressShortVector)
        }
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 float CheckWireframeBox(entity forent, vector v0, vector dvx, vector dvy, vector dvz)
 {
        traceline(v0, v0 + dvx, true, forent); if(trace_fraction < 1) return 0;
@@ -448,7 +446,7 @@ string swapInPriorityList(string order, float i, float j)
        return order;
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 void get_mi_min_max(float mode)
 {
        vector mi, ma;
@@ -1113,7 +1111,7 @@ vector decompressShotOrigin(int f)
        return v;
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 vector healtharmor_maxdamage(float h, float a, float armorblock, int deathtype)
 {
        // NOTE: we'll always choose the SMALLER value...
@@ -1228,7 +1226,7 @@ float get_model_parameters(string m, float sk)
        }
        get_model_parameters_fixbone = 0;
 
-#ifndef MENUQC
+#ifdef GAMEQC
        MUTATOR_CALLHOOK(ClearModelParams);
 #endif
 
@@ -1293,7 +1291,7 @@ float get_model_parameters(string m, float sk)
                        get_model_parameters_bone_upperbody = s;
                if(c == "bone_weapon")
                        get_model_parameters_bone_weapon = s;
-       #ifndef MENUQC
+       #ifdef GAMEQC
                MUTATOR_CALLHOOK(GetModelParams, c, s);
        #endif
                for(int i = 0; i < MAX_AIM_BONES; ++i)
@@ -1386,7 +1384,7 @@ void m_shutdown()
        cvar_settemp_restore(); // this must be done LAST, but in any case
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 .float skeleton_bones_index;
 void Skeleton_SetBones(entity e)
 {
@@ -1464,7 +1462,7 @@ void FindConnectedComponent(entity e, .entity fld, findNextEntityNearFunction_t
                queue_start.FindConnectedComponent_processing = 0;
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 vector animfixfps(entity e, vector a, vector b)
 {
        // multi-frame anim: keep as-is
@@ -1483,7 +1481,7 @@ vector animfixfps(entity e, vector a, vector b)
 }
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 Notification Announcer_PickNumber(int type, int num)
 {
     return = NULL;
@@ -1595,7 +1593,7 @@ Notification Announcer_PickNumber(int type, int num)
 }
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 int Mod_Q1BSP_SuperContentsFromNativeContents(int nativecontents)
 {
        switch(nativecontents)

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index 599dd4d43c5b4bc5abd6f8be6d1a2e28608a0fa4..9e1d5a75be3f94cf418fca7aecb9e4459d28aa44 100644 (file)
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifndef MENUQC
+#ifdef GAMEQC
 
 vector real_origin(entity ent);
 #endif
@@ -8,11 +8,9 @@ vector real_origin(entity ent);
 // this returns a tempstring containing a copy of s with additional \n newlines added, it also replaces \n in the text with a real newline
 // NOTE: s IS allowed to be a tempstring
 string wordwrap(string s, float l);
-#ifndef MENUQC
-#ifndef CSQC
+#ifdef SVQC
 void wordwrap_sprint(entity to, string s, float l);
 #endif
-#endif
 void wordwrap_cb(string s, float l, void(string) callback);
 
 #ifndef SVQC
@@ -66,7 +64,7 @@ string ScoreString(float vflags, float value);
 vector decompressShortVector(float data);
 float compressShortVector(vector vec);
 
-#ifndef MENUQC
+#ifdef GAMEQC
 float CheckWireframeBox(entity forent, vector v0, vector dvx, vector dvy, vector dvz);
 #endif
 
@@ -79,7 +77,7 @@ float cvar_value_issafe(string s);
 float cvar_settemp(string pKey, string pValue);
 float cvar_settemp_restore();
 
-#ifndef MENUQC
+#ifdef GAMEQC
 // modes: 0 = trust q3map2 (_mini images)
 //        1 = trust tracebox (_radar images)
 // in both modes, mapinfo's "size" overrides
@@ -148,14 +146,14 @@ string rankings_reply, ladder_reply, lsmaps_reply, maplist_reply, monsterlist_re
 string records_reply[10];
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 vector healtharmor_maxdamage(float h, float a, float armorblock, int deathtype); // returns vector: maxdamage, armorideal, 1 if fully armored
 vector healtharmor_applydamage(float a, float armorblock, int deathtype, float damage); // returns vector: take, save, 0
 #endif
 
 string getcurrentmod();
 
-#ifndef MENUQC
+#ifdef GAMEQC
 #ifdef CSQC
 int ReadInt24_t();
 #else
@@ -190,7 +188,7 @@ float get_model_parameters_fixbone;
 string get_model_parameters_desc;
 float get_model_parameters(string mod, float skn); // call with string_null to clear; skin -1 means mod is the filename of the txt file and is to be split
 
-#ifndef MENUQC
+#ifdef GAMEQC
 vector NearestPointOnBox(entity box, vector org);
 #endif
 
@@ -205,7 +203,7 @@ const float XENCODE_LEN = 5;
 string xencode(float f);
 float xdecode(string s);
 
-#ifndef MENUQC
+#ifdef GAMEQC
 string strtolower(string s);
 #endif
 
@@ -214,7 +212,7 @@ string MakeConsoleSafe(string input);
 // generic shutdown handler
 void Shutdown();
 
-#ifndef MENUQC
+#ifdef GAMEQC
 .float skeleton_bones;
 void Skeleton_SetBones(entity e);
 // loops through the tags of model v using counter tagnum
@@ -256,7 +254,7 @@ void FindConnectedComponent(entity e, .entity fld, findNextEntityNearFunction_t
 
 string CCR(string input);
 
-#ifndef MENUQC
+#ifdef GAMEQC
        #ifdef CSQC
                #define GENTLE (autocvar_cl_gentle || autocvar_cl_gentle_messages)
        #else
@@ -265,11 +263,11 @@ string CCR(string input);
        #define normal_or_gentle(normal, gentle) (GENTLE ? ((gentle != "") ? gentle : normal) : normal)
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 vector animfixfps(entity e, vector a, vector b);
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 const float CNT_NORMAL = 1;
 const float CNT_GAMESTART = 2;
 const float CNT_IDLE = 3;
@@ -279,7 +277,7 @@ const float CNT_ROUNDSTART = 6;
 entity Announcer_PickNumber(float type, float num);
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 int Mod_Q1BSP_SuperContentsFromNativeContents(int nativecontents);
 int Mod_Q1BSP_NativeContentsFromSuperContents(int supercontents);
 #endif

diff --git a/qcsrc/common/vehicles/vehicle/bumblebee.qc b/qcsrc/common/vehicles/vehicle/bumblebee.qc
index 9f718e34b98a1ec28f22a8c01acf60970468ba85..98d853d2be14820c7d7bd6f69902aeb64170d9d4 100644 (file)
--- a/qcsrc/common/vehicles/vehicle/bumblebee.qc
+++ b/qcsrc/common/vehicles/vehicle/bumblebee.qc
@@ -23,7 +23,7 @@ CLASS(Bumblebee, Vehicle)
 ENDCLASS(Bumblebee)
 REGISTER_VEHICLE(BUMBLEBEE, NEW(Bumblebee));
 
-#ifndef MENUQC
+#ifdef GAMEQC
        MODEL(VEH_BUMBLEBEE_GUNCOCKPIT, "models/vehicles/wakizashi_cockpit.dpm");
 #endif
 

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 6547507864a632c1fe514f1f4746155fc8bef914..3e90bfe15548f016bd632f3c3d9b7a35988f1eec 100644 (file)
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -45,7 +45,7 @@
     #include <server/portals.qh>
     #include <server/g_hook.qh>
 #endif
-#ifndef MENUQC
+#ifdef GAMEQC
        #include "calculations.qc"
 #endif
 #ifdef SVQC
@@ -276,7 +276,7 @@ string W_Model(string w_mdl)
        return M_ARGV(1, string);
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 vector shotorg_adjustfromclient(vector vecs, float y_is_right, float algn)
 {
        switch (algn)
@@ -548,7 +548,7 @@ void CL_WeaponEntity_SetModel(entity this, string name, bool _anim)
 }
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 
 REGISTER_NET_TEMP(wframe)
 #ifdef CSQC

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 28fbd9c3cda64b2a95f105f8dd49117ab9683141..32b03a16be3605d5776bd9d630312cbbb2fac79b 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -18,7 +18,7 @@ WepSet ReadWepSet();
 
 #include "weapon.qh"
 
-#ifndef MENUQC
+#ifdef GAMEQC
 #include "calculations.qh"
 #include <common/models/all.qh>
 #endif
@@ -322,7 +322,7 @@ STATIC_INIT(register_weapons_done)
     weaponorder_byid = strzone(substring(weaponorder_byid, 1, -1));
 }
 
-#ifndef MENUQC
+#ifdef GAMEQC
 
 .entity weaponchild;
 .entity exteriorweaponentity;

diff --git a/qcsrc/common/weapons/weapon.qh b/qcsrc/common/weapons/weapon.qh
index c525bb81b954ef1d90a5fbe49c3547442a22708a..7b2f4b5b7a03b33073ecd0ba3c9d63e08dc1e6ce 100644 (file)
--- a/qcsrc/common/weapons/weapon.qh
+++ b/qcsrc/common/weapons/weapon.qh
@@ -134,7 +134,7 @@ ENDCLASS(Weapon)
 CLASS(WeaponPickup, Pickup)
     ATTRIB(WeaponPickup, m_weapon, Weapon);
     ATTRIB(WeaponPickup, m_name, string);
-#ifndef MENUQC
+#ifdef GAMEQC
     ATTRIB(WeaponPickup, m_sound, Sound, SND_WEAPONPICKUP);
 #endif
 #ifdef SVQC
@@ -146,7 +146,7 @@ CLASS(WeaponPickup, Pickup)
         CONSTRUCT(WeaponPickup);
         this.m_weapon = w;
         this.m_name = w.m_name;
-#ifndef MENUQC
+#ifdef GAMEQC
         this.m_model = w.m_model;
 #endif
 #ifdef SVQC

diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc
index c0d85831ae730be7dc9c9981d9f8b86150286bc5..fa8e83168d56538135e3c8ec41acb68243036d2a 100644 (file)
--- a/qcsrc/common/weapons/weapon/arc.qc
+++ b/qcsrc/common/weapons/weapon/arc.qc
@@ -6,7 +6,7 @@ CLASS(Arc, Weapon)
 /* rating    */ ATTRIB(Arc, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(Arc, wpcolor, vector, '1 1 1');
 /* modelname */ ATTRIB(Arc, mdl, string, "arc");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(Arc, m_model, Model, MDL_ARC_ITEM);
 #endif
 /* crosshair */ ATTRIB(Arc, w_crosshair, string, "gfx/crosshairhlac");
@@ -74,7 +74,7 @@ ENDCLASS(Arc)
 REGISTER_WEAPON(ARC, arc, NEW(Arc));
 
 
-#ifndef MENUQC
+#ifdef GAMEQC
 const float ARC_MAX_SEGMENTS = 20;
 vector arc_shotorigin[4];
 .vector beam_start;

diff --git a/qcsrc/common/weapons/weapon/blaster.qc b/qcsrc/common/weapons/weapon/blaster.qc
index 791b574817cfc1d6c8daa56c17889ac09057f33f..c5911b89f3bb6f35742154f323f53eac41f314f2 100644 (file)
--- a/qcsrc/common/weapons/weapon/blaster.qc
+++ b/qcsrc/common/weapons/weapon/blaster.qc
@@ -6,7 +6,7 @@ CLASS(Blaster, Weapon)
 /* rating    */ ATTRIB(Blaster, bot_pickupbasevalue, float, 0);
 /* color     */ ATTRIB(Blaster, wpcolor, vector, '1 0.5 0.5');
 /* modelname */ ATTRIB(Blaster, mdl, string, "laser");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(Blaster, m_model, Model, MDL_BLASTER_ITEM);
 #endif
 /* crosshair */ ATTRIB(Blaster, w_crosshair, string, "gfx/crosshairlaser");

diff --git a/qcsrc/common/weapons/weapon/crylink.qc b/qcsrc/common/weapons/weapon/crylink.qc
index 8865dbd02f1c253f87c902dfec48922aa4611370..1a3fb3fa414450fb02e9263ca0837a5f145392f7 100644 (file)
--- a/qcsrc/common/weapons/weapon/crylink.qc
+++ b/qcsrc/common/weapons/weapon/crylink.qc
@@ -6,7 +6,7 @@ CLASS(Crylink, Weapon)
 /* rating    */ ATTRIB(Crylink, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Crylink, wpcolor, vector, '1 0.5 1');
 /* modelname */ ATTRIB(Crylink, mdl, string, "crylink");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(Crylink, m_model, Model, MDL_CRYLINK_ITEM);
 #endif
 /* crosshair */ ATTRIB(Crylink, w_crosshair, string, "gfx/crosshaircrylink");

diff --git a/qcsrc/common/weapons/weapon/devastator.qc b/qcsrc/common/weapons/weapon/devastator.qc
index e02a474c2d43e817600595e22ae3725060020db6..9462070aad83ca8d7264e432f761a9d7ed230a86 100644 (file)
--- a/qcsrc/common/weapons/weapon/devastator.qc
+++ b/qcsrc/common/weapons/weapon/devastator.qc
@@ -6,7 +6,7 @@ CLASS(Devastator, Weapon)
 /* rating    */ ATTRIB(Devastator, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(Devastator, wpcolor, vector, '1 1 0');
 /* modelname */ ATTRIB(Devastator, mdl, string, "rl");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(Devastator, m_model, Model, MDL_DEVASTATOR_ITEM);
 #endif
 /* crosshair */ ATTRIB(Devastator, w_crosshair, string, "gfx/crosshairrocketlauncher");

diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc
index 2c74b3b451477c364232467a1792826c027cf994..aa66f50c8de71777316d954c6d80db515293aa44 100644 (file)
--- a/qcsrc/common/weapons/weapon/electro.qc
+++ b/qcsrc/common/weapons/weapon/electro.qc
@@ -6,7 +6,7 @@ CLASS(Electro, Weapon)
 /* rating    */ ATTRIB(Electro, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Electro, wpcolor, vector, '0 0.5 1');
 /* modelname */ ATTRIB(Electro, mdl, string, "electro");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(Electro, m_model, Model, MDL_ELECTRO_ITEM);
 #endif
 /* crosshair */ ATTRIB(Electro, w_crosshair, string, "gfx/crosshairelectro");

diff --git a/qcsrc/common/weapons/weapon/fireball.qc b/qcsrc/common/weapons/weapon/fireball.qc
index 8d17a247d4c36c8408473c8c7b595e96c168ca7b..bfc0207152796e574e5c2be32cc3ce889dc732aa 100644 (file)
--- a/qcsrc/common/weapons/weapon/fireball.qc
+++ b/qcsrc/common/weapons/weapon/fireball.qc
@@ -6,7 +6,7 @@ CLASS(Fireball, Weapon)
 /* rating    */ ATTRIB(Fireball, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Fireball, wpcolor, vector, '1 0.5 0');
 /* modelname */ ATTRIB(Fireball, mdl, string, "fireball");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(Fireball, m_model, Model, MDL_FIREBALL_ITEM);
 #endif
 /* crosshair */ ATTRIB(Fireball, w_crosshair, string, "gfx/crosshairfireball");

diff --git a/qcsrc/common/weapons/weapon/hagar.qc b/qcsrc/common/weapons/weapon/hagar.qc
index c83203272d8c935c1408dbeb087a2972b96c9f59..72fb60db62717054813e156fe6d27a342ecd7678 100644 (file)
--- a/qcsrc/common/weapons/weapon/hagar.qc
+++ b/qcsrc/common/weapons/weapon/hagar.qc
@@ -6,7 +6,7 @@ CLASS(Hagar, Weapon)
 /* rating    */ ATTRIB(Hagar, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Hagar, wpcolor, vector, '1 1 0.5');
 /* modelname */ ATTRIB(Hagar, mdl, string, "hagar");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(Hagar, m_model, Model, MDL_HAGAR_ITEM);
 #endif
 /* crosshair */ ATTRIB(Hagar, w_crosshair, string, "gfx/crosshairhagar");

diff --git a/qcsrc/common/weapons/weapon/hlac.qc b/qcsrc/common/weapons/weapon/hlac.qc
index b545f6ce1ea7d4a1cf52d9d8c55d7ce62d6995cd..4ed2ee9f4b3c6a13f8ffb768139676993d1fd793 100644 (file)
--- a/qcsrc/common/weapons/weapon/hlac.qc
+++ b/qcsrc/common/weapons/weapon/hlac.qc
@@ -6,7 +6,7 @@ CLASS(HLAC, Weapon)
 /* rating    */ ATTRIB(HLAC, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(HLAC, wpcolor, vector, '0 1 0');
 /* modelname */ ATTRIB(HLAC, mdl, string, "hlac");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(HLAC, m_model, Model, MDL_HLAC_ITEM);
 #endif
 /* crosshair */ ATTRIB(HLAC, w_crosshair, string, "gfx/crosshairhlac");

diff --git a/qcsrc/common/weapons/weapon/hook.qc b/qcsrc/common/weapons/weapon/hook.qc
index 5e8119e6a6a5bc74d2497fb019b9ac129d9c604f..6409e94ff1e0304774658281c58cce27413d1818 100644 (file)
--- a/qcsrc/common/weapons/weapon/hook.qc
+++ b/qcsrc/common/weapons/weapon/hook.qc
@@ -6,7 +6,7 @@ CLASS(Hook, Weapon)
 /* rating    */ ATTRIB(Hook, bot_pickupbasevalue, float, 0);
 /* color     */ ATTRIB(Hook, wpcolor, vector, '0 0.5 0');
 /* modelname */ ATTRIB(Hook, mdl, string, "hookgun");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(Hook, m_model, Model, MDL_HOOK_ITEM);
 #endif
 /* crosshair */ ATTRIB(Hook, w_crosshair, string, "gfx/crosshairhook");

diff --git a/qcsrc/common/weapons/weapon/machinegun.qc b/qcsrc/common/weapons/weapon/machinegun.qc
index e3d1da2fea86db9d6ad4cff51cbe881a45e5273e..96c873a07fe3d3eef2e8383273f607657aca6569 100644 (file)
--- a/qcsrc/common/weapons/weapon/machinegun.qc
+++ b/qcsrc/common/weapons/weapon/machinegun.qc
@@ -6,7 +6,7 @@ CLASS(MachineGun, Weapon)
 /* rating    */ ATTRIB(MachineGun, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(MachineGun, wpcolor, vector, '1 1 0');
 /* modelname */ ATTRIB(MachineGun, mdl, string, "uzi");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(MachineGun, m_model, Model, MDL_MACHINEGUN_ITEM);
 #endif
 /* crosshair */ ATTRIB(MachineGun, w_crosshair, string, "gfx/crosshairuzi");

diff --git a/qcsrc/common/weapons/weapon/minelayer.qc b/qcsrc/common/weapons/weapon/minelayer.qc
index 3021f47454500838ebcdded983139fdeaea55f85..c47838842540d0aba4e2563ab72c897f58d9d8f3 100644 (file)
--- a/qcsrc/common/weapons/weapon/minelayer.qc
+++ b/qcsrc/common/weapons/weapon/minelayer.qc
@@ -6,7 +6,7 @@ CLASS(MineLayer, Weapon)
 /* rating    */ ATTRIB(MineLayer, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(MineLayer, wpcolor, vector, '0.75 1 0');
 /* modelname */ ATTRIB(MineLayer, mdl, string, "minelayer");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(MineLayer, m_model, Model, MDL_MINELAYER_ITEM);
 #endif
 /* crosshair */ ATTRIB(MineLayer, w_crosshair, string, "gfx/crosshairminelayer");

diff --git a/qcsrc/common/weapons/weapon/mortar.qc b/qcsrc/common/weapons/weapon/mortar.qc
index 0a457f1a6be1730bfdef5642c529097d9cf16901..f3613e554dece88770d83278cfc044ddbd124702 100644 (file)
--- a/qcsrc/common/weapons/weapon/mortar.qc
+++ b/qcsrc/common/weapons/weapon/mortar.qc
@@ -6,7 +6,7 @@ CLASS(Mortar, Weapon)
 /* rating    */ ATTRIB(Mortar, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Mortar, wpcolor, vector, '1 0 0');
 /* modelname */ ATTRIB(Mortar, mdl, string, "gl");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(Mortar, m_model, Model, MDL_MORTAR_ITEM);
 #endif
 /* crosshair */ ATTRIB(Mortar, w_crosshair, string, "gfx/crosshairgrenadelauncher");

diff --git a/qcsrc/common/weapons/weapon/porto.qc b/qcsrc/common/weapons/weapon/porto.qc
index b5bc00353e025e75f765023654ab13266ff55e5b..98bebaac6ab888c7488f83df93bc273506508435 100644 (file)
--- a/qcsrc/common/weapons/weapon/porto.qc
+++ b/qcsrc/common/weapons/weapon/porto.qc
@@ -6,7 +6,7 @@ CLASS(PortoLaunch, Weapon)
 /* rating    */ ATTRIB(PortoLaunch, bot_pickupbasevalue, float, 0);
 /* color     */ ATTRIB(PortoLaunch, wpcolor, vector, '0.5 0.5 0.5');
 /* modelname */ ATTRIB(PortoLaunch, mdl, string, "porto");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(PortoLaunch, m_model, Model, MDL_PORTO_ITEM);
 #endif
 /* crosshair */ ATTRIB(PortoLaunch, w_crosshair, string, "gfx/crosshairporto");

diff --git a/qcsrc/common/weapons/weapon/rifle.qc b/qcsrc/common/weapons/weapon/rifle.qc
index 1b6faee7860ca6a4f0296ae7481af98db06ae3a7..3eee2d4ba6186f30a47cdaee24b85bbf053560be 100644 (file)
--- a/qcsrc/common/weapons/weapon/rifle.qc
+++ b/qcsrc/common/weapons/weapon/rifle.qc
@@ -6,7 +6,7 @@ CLASS(Rifle, Weapon)
 /* rating    */ ATTRIB(Rifle, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Rifle, wpcolor, vector, '0.5 1 0');
 /* modelname */ ATTRIB(Rifle, mdl, string, "campingrifle");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(Rifle, m_model, Model, MDL_RIFLE_ITEM);
 #endif
 /* crosshair */ ATTRIB(Rifle, w_crosshair, string, "gfx/crosshairrifle");

diff --git a/qcsrc/common/weapons/weapon/seeker.qc b/qcsrc/common/weapons/weapon/seeker.qc
index 9f0a326ff2d53da99691044fb3bd42f273ed3430..4b9e2d81a987c5c37b8f71d5e43fc8b0ea7df004 100644 (file)
--- a/qcsrc/common/weapons/weapon/seeker.qc
+++ b/qcsrc/common/weapons/weapon/seeker.qc
@@ -6,7 +6,7 @@ CLASS(Seeker, Weapon)
 /* rating    */ ATTRIB(Seeker, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(Seeker, wpcolor, vector, '0.5 1 0');
 /* modelname */ ATTRIB(Seeker, mdl, string, "seeker");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(Seeker, m_model, Model, MDL_SEEKER_ITEM);
 #endif
 /* crosshair */ ATTRIB(Seeker, w_crosshair, string, "gfx/crosshairseeker");

diff --git a/qcsrc/common/weapons/weapon/shockwave.qc b/qcsrc/common/weapons/weapon/shockwave.qc
index de7726f24f225b1d22d9586bf4b695d92bfa6093..ae44e907ee79b9a1a7b775a731e73fa2430e8a63 100644 (file)
--- a/qcsrc/common/weapons/weapon/shockwave.qc
+++ b/qcsrc/common/weapons/weapon/shockwave.qc
@@ -6,7 +6,7 @@ CLASS(Shockwave, Weapon)
 /* rating    */ ATTRIB(Shockwave, bot_pickupbasevalue, float, BOT_PICKUP_RATING_LOW);
 /* color     */ ATTRIB(Shockwave, wpcolor, vector, '0.5 0.25 0');
 /* modelname */ ATTRIB(Shockwave, mdl, string, "shotgun");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(Shockwave, m_model, Model, MDL_SHOCKWAVE_ITEM);
 #endif
 /* crosshair */ ATTRIB(Shockwave, w_crosshair, string, "gfx/crosshairshotgun");

diff --git a/qcsrc/common/weapons/weapon/shotgun.qc b/qcsrc/common/weapons/weapon/shotgun.qc
index 9c7aff3acab2af395a02bbb10313b025628d6ec3..fa166aee672e0d31cfadc46724c2d9c387e42838 100644 (file)
--- a/qcsrc/common/weapons/weapon/shotgun.qc
+++ b/qcsrc/common/weapons/weapon/shotgun.qc
@@ -6,7 +6,7 @@ CLASS(Shotgun, Weapon)
 /* rating    */ ATTRIB(Shotgun, bot_pickupbasevalue, float, BOT_PICKUP_RATING_LOW);
 /* color     */ ATTRIB(Shotgun, wpcolor, vector, '0.5 0.25 0');
 /* modelname */ ATTRIB(Shotgun, mdl, string, "shotgun");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(Shotgun, m_model, Model, MDL_SHOTGUN_ITEM);
 #endif
 /* crosshair */ ATTRIB(Shotgun, w_crosshair, string, "gfx/crosshairshotgun");

diff --git a/qcsrc/common/weapons/weapon/tuba.qc b/qcsrc/common/weapons/weapon/tuba.qc
index 31d2bf7a6299fcf735df432d93fa931ee31caf0d..2570c7ba783b0a9d50342b5c897a73bb735ff2af 100644 (file)
--- a/qcsrc/common/weapons/weapon/tuba.qc
+++ b/qcsrc/common/weapons/weapon/tuba.qc
@@ -5,7 +5,7 @@ CLASS(Tuba, Weapon)
 /* rating    */ ATTRIB(Tuba, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Tuba, wpcolor, vector, '0 1 0');
 /* modelname */ ATTRIB(Tuba, mdl, string, "tuba");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(Tuba, m_model, Model, MDL_TUBA_ITEM);
 #endif
 /* crosshair */ ATTRIB(Tuba, w_crosshair, string, "gfx/crosshairtuba");

diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc
index 8fa43c1d8c019e73f209a081a778f9c7950b0687..8289ccbbd09921b28ce49e319533f564d16fc9b9 100644 (file)
--- a/qcsrc/common/weapons/weapon/vaporizer.qc
+++ b/qcsrc/common/weapons/weapon/vaporizer.qc
@@ -6,7 +6,7 @@ CLASS(Vaporizer, Weapon)
 /* rating    */ ATTRIB(Vaporizer, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(Vaporizer, wpcolor, vector, '0.5 1 1');
 /* modelname */ ATTRIB(Vaporizer, mdl, string, "minstanex");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(Vaporizer, m_model, Model, MDL_VAPORIZER_ITEM);
 #endif
 /* crosshair */ ATTRIB(Vaporizer, w_crosshair, string, "gfx/crosshairminstanex");

diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc
index 0ca635b3ee32f1e21b8d996117c19bac39858ab8..cd493b493fa1acc70bd50cfbaef531f01c199bec 100644 (file)
--- a/qcsrc/common/weapons/weapon/vortex.qc
+++ b/qcsrc/common/weapons/weapon/vortex.qc
@@ -6,7 +6,7 @@ CLASS(Vortex, Weapon)
 /* rating    */ ATTRIB(Vortex, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(Vortex, wpcolor, vector, '0.5 1 1');
 /* modelname */ ATTRIB(Vortex, mdl, string, "nex");
-#ifndef MENUQC
+#ifdef GAMEQC
 /* model     */ ATTRIB(Vortex, m_model, Model, MDL_VORTEX_ITEM);
 #endif
 /* crosshair */ ATTRIB(Vortex, w_crosshair, string, "gfx/crosshairnex");

diff --git a/qcsrc/lib/_all.inc b/qcsrc/lib/_all.inc
index a5204fa052d6804677c912c8e5d789e8b2ff31a9..b6c3c9e01bea752c9d87f3d66685f3b9d596fedf 100644 (file)
--- a/qcsrc/lib/_all.inc
+++ b/qcsrc/lib/_all.inc
@@ -266,6 +266,6 @@ void make_safe_for_remove(entity this);
 #endif
 #undef ENGINE_EVENT
 
-#ifndef MENUQC
+#ifdef GAMEQC
        #include <ecs/_mod.qh>
 #endif

diff --git a/qcsrc/lib/defer.qh b/qcsrc/lib/defer.qh
index c20c53440785ceb09f8b236f6bfeef606794b6b2..4f34bb4853ade7f0149274ebdb3c325d4468147a 100644 (file)
--- a/qcsrc/lib/defer.qh
+++ b/qcsrc/lib/defer.qh
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifndef MENUQC
+#ifdef GAMEQC
 
        #include "oo.qh"
        #include "self.qh"

diff --git a/qcsrc/lib/iter.qh b/qcsrc/lib/iter.qh
index 7183e90feab6bad7a26ce4ba98f8e01886ea8bca..e3cf7410fba38b7177f6d6ee6c928c5f9e7ce122 100644 (file)
--- a/qcsrc/lib/iter.qh
+++ b/qcsrc/lib/iter.qh
@@ -159,7 +159,7 @@ MACRO_END
 .entity _FOREACH_ENTITY_FIND_flags_next; noref string _FOREACH_ENTITY_FIND_flags_mutex;
 #define FOREACH_ENTITY_FLAGS_UNORDERED(fld, match, body) _FOREACH_ENTITY_FIND_UNORDERED(, flags, fld, match, true, body)
 
-#ifndef MENUQC
+#ifdef GAMEQC
 entity(vector org, float rad, .entity tofield) _findchainradius_tofield = #22;
 #define FOREACH_ENTITY_RADIUS(org, dist, cond, body) ORDERED(FOREACH_ENTITY_RADIUS)(org, dist, cond, body)
 .entity _FOREACH_ENTITY_FIND_radius_next; noref string _FOREACH_ENTITY_FIND_radius_mutex;

diff --git a/qcsrc/lib/net.qh b/qcsrc/lib/net.qh
index 106f00998c3daac770fbbc562d583ba62441c99a..86c15ec473e1bcdee8ad4a29891b5f8462ea9194 100644 (file)
--- a/qcsrc/lib/net.qh
+++ b/qcsrc/lib/net.qh
@@ -287,7 +287,7 @@ USING(Stream, int);
 #define Read_string() ReadString()
 #define Write_string(to, f) WriteString(to, f)
 
-#ifndef MENUQC
+#ifdef GAMEQC
        const float APPROXPASTTIME_ACCURACY_REQUIREMENT = 0.05;
        #define APPROXPASTTIME_MAX (16384 * APPROXPASTTIME_ACCURACY_REQUIREMENT)
        #define APPROXPASTTIME_RANGE (64 * APPROXPASTTIME_ACCURACY_REQUIREMENT)

diff --git a/qcsrc/lib/replicate.qh b/qcsrc/lib/replicate.qh
index f69b6072bea77316d2b5154a20cf760e92cd3c54..a36466d2e0ffb8daca62e22bd35706bbeb5e761a 100644 (file)
--- a/qcsrc/lib/replicate.qh
+++ b/qcsrc/lib/replicate.qh
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifndef MENUQC
+#ifdef GAMEQC
 
     /**
      * Replicate a client cvar into a server field

diff --git a/qcsrc/lib/self.qh b/qcsrc/lib/self.qh
index bc545b0d0f53721c338fe7b9d6af93b6a5e8bc6b..43bd12314e53f246c25193e81a277dc53580f533 100644 (file)
--- a/qcsrc/lib/self.qh
+++ b/qcsrc/lib/self.qh
@@ -66,13 +66,13 @@ SELFWRAP(think, void, (), (entity this), (this))
 #define setthink(e, f) SELFWRAP_SET(think, e, f)
 #define getthink(e) SELFWRAP_GET(think, e)
 
-#ifndef MENUQC
+#ifdef GAMEQC
 SELFWRAP(touch, void, (), (entity this, entity toucher), (this, other))
 #define settouch(e, f) SELFWRAP_SET(touch, e, f)
 #define gettouch(e) SELFWRAP_GET(touch, e)
 #endif
 
-#ifndef MENUQC
+#ifdef GAMEQC
 SELFWRAP(blocked, void, (), (entity this, entity blocker), (this, other))
 #define setblocked(e, f) SELFWRAP_SET(blocked, e, f)
 #define blocked stopusingthis
@@ -81,7 +81,7 @@ SELFWRAP(blocked, void, (), (entity this, entity blocker), (this, other))
 SELFWRAP(predraw, void, (), (entity this), (this))
 #define setpredraw(e, f) SELFWRAP_SET(predraw, e, f)
 
-#ifndef MENUQC
+#ifdef GAMEQC
 SELFWRAP(customizeentityforclient, bool, (), (entity this, entity client), (this, other))
 #define setcefc(e, f) SELFWRAP_SET(customizeentityforclient, e, f)
 #define getcefc(e) SELFWRAP_GET(customizeentityforclient, e)
@@ -104,6 +104,6 @@ SELFWRAP(SendEntity, bool, (entity to, int sendflags), (entity this, entity to,
 #define movetogoal(e, ...) (__self = (e), builtin_movetogoal(__VA_ARGS__))
 #define walkmove(e, ...) (__self = (e), builtin_walkmove(__VA_ARGS__))
 
-#ifndef MENUQC
+#ifdef GAMEQC
 void adaptor_think2use(entity this) { if (this.use) this.use(this, NULL, NULL); }
 #endif

diff --git a/qcsrc/lib/vector.qh b/qcsrc/lib/vector.qh
index 10e8ed8c437f98983b55945e0e938bf9f5d73e0f..bb363c12ef26ba5b5dd765200ed08f28dc99519f 100644 (file)
--- a/qcsrc/lib/vector.qh
+++ b/qcsrc/lib/vector.qh
@@ -142,7 +142,7 @@ vector vec_epsilon(vector this, float eps)
 #define ClipVelocity(in, normal, out, overbounce) \
        (out = vec_epsilon(vec_reflect(in, normal, (overbounce) - 1), 0.1))
 
-#ifndef MENUQC
+#ifdef GAMEQC
        vector get_corner_position(entity box, int corner)
        {
                switch (corner)

diff --git a/qcsrc/tools/qcc.sh b/qcsrc/tools/qcc.sh
index b115c196ecc75f4bb1ea0bcef52c15f962b9169c..7df2fc4b3df025fc1d4b0dc705cc66b2847a8a2c 100755 (executable)
--- a/qcsrc/tools/qcc.sh
+++ b/qcsrc/tools/qcc.sh
@@ -39,14 +39,14 @@ $(return >/dev/null 2>&1) || {
     IN=$3
 
     case ${MODE} in
-        client) PROG=CSQC
+        client) DEFS="-DGAMEQC -DCSQC"
         ;;
-        menu) PROG=MENUQC
+        menu) DEFS="-DMENUQC"
         ;;
-        server) PROG=SVQC
+        server) DEFS="-DGAMEQC -DSVQC"
         ;;
     esac
 
-    qpp ${IN} ${OUT} -I. ${QCCIDENT} ${QCCDEFS} -D${PROG} > ${WORKDIR}/${MODE}.qc
+    qpp ${IN} ${OUT} -I. ${QCCIDENT} ${QCCDEFS} ${DEFS} > ${WORKDIR}/${MODE}.qc
     qcc ${QCCFLAGS} -o ${OUT} ../${WORKDIR}/${MODE}.qc
 }