X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fall.qh;h=43398e6a5de5b539b9c9cea2b2bf187e10e63fcf;hp=bdd8c8d6f8ee186f78b1dba032c8965bfe5df479;hb=e757068f0bf4ce3c5b29c9e52f251b39a4ef7470;hpb=ae104b5ca1b2fccc934cfda6e562029858186975

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index bdd8c8d6f8..43398e6a5d 100644
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -74,7 +74,7 @@ GENERIC_COMMAND(dumpweapons, "Dump all weapons into weapons_dump.txt") // WEAPON
                 LOG_INFOF("^1Error: ^7Could not open file '%s'!", filename);
             }
             #else
-            LOG_INFO(_("Weapons dump command only works with sv_cmd.\n"));
+            LOG_INFO(_("Weapons dump command only works with sv_cmd."));
             #endif
             return;
         }
@@ -83,9 +83,9 @@ GENERIC_COMMAND(dumpweapons, "Dump all weapons into weapons_dump.txt") // WEAPON
         case CMD_REQUEST_USAGE:
         {
             LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " dumpweapons [filename]");
-            LOG_INFO("  Where 'filename' is the file to write (default is weapons_dump.cfg),\n");
-            LOG_INFO("  if supplied with '-' output to console as well as default,\n");
-            LOG_INFO("  if left blank, it will only write to default.\n");
+            LOG_INFO("  Where 'filename' is the file to write (default is weapons_dump.cfg),");
+            LOG_INFO("  if supplied with '-' output to console as well as default,");
+            LOG_INFO("  if left blank, it will only write to default.");
             return;
         }
     }
@@ -130,10 +130,12 @@ REGISTER_WEAPON(Null, NEW(Weapon));
 Weapon Weapons_fromstr(string s)
 {
     FOREACH(Weapons, it != WEP_Null && it.netname == s, return it);
-    return NULL;
+    return WEP_Null;
 }
 
 
+#ifdef GAMEQC
+
 // legacy w_prop mappings
 #define X(fld, T) .T fld; .T wepvar_##fld = fld;
 X(switchdelay_drop, float)
@@ -144,12 +146,14 @@ X(weaponstart, float)
 X(weaponthrowable, float)
 #ifdef SVQC
 X(reload_ammo, float)
-.float reloading_ammo = reload_ammo;
+const .float reloading_ammo = reload_ammo;
 X(reload_time, float)
-.float reloading_time = reload_time;
+const .float reloading_time = reload_time;
 #endif
 #undef X
 
+#endif
+
 
 
 #define W_PROPS(L, class, prefix) \
@@ -167,12 +171,17 @@ X(reload_time, float)
     #define W_PROP_BOTH(class, fld, T, wepname) \
             W_PROP_PRI(class, fld, T, wepname) \
             W_PROP_SEC(class, fld, T, wepname)
-    #define W_PROP_BEGIN(class)
-        #define _W_PROP(class, fld, T, wepname) \
-            /* static */ T _W_PROP_CVAR(wepname, fld); \
-            ATTRIB(class, wepvar_##fld, T, _W_PROP_CVAR(wepname, fld));
-        #define _W_PROP_CVAR(wepname, fld) autocvar_g_balance_##wepname##_##fld
-    #define W_PROP_END()
+	#define W_PROP_BEGIN(class)
+		#ifdef GAMEQC
+			#define _W_PROP(class, fld, T, wepname) \
+				/* static */ T _W_PROP_CVAR(wepname, fld); \
+				ATTRIB(class, wepvar_##fld, T, _W_PROP_CVAR(wepname, fld));
+			#define _W_PROP_CVAR(wepname, fld) autocvar_g_balance_##wepname##_##fld
+		#else
+			#define _W_PROP(class, fld, T, wepname)
+			#define _W_PROP_CVAR(wepname, fld)
+		#endif
+	#define W_PROP_END()
 
 
 
@@ -183,13 +192,15 @@ X(reload_time, float)
     #define W_CONFIG_BOTH(class, fld, T, wepname) \
             W_CONFIG_PRI(class, fld, T, wepname) \
             W_CONFIG_SEC(class, fld, T, wepname)
-    #define W_CONFIG_BEGIN(class) METHOD(class, wr_config, void(class this)) {
-        #ifdef SVQC
-            #define _W_CONFIG(class, fld, T, wepname) if (#wepname == this.netname) WEP_CONFIG_WRITE_CVARS(wepname, fld, T);
-        #else
-            #define _W_CONFIG(class, fld, T, wepname)
-        #endif
-    #define W_CONFIG_END() }
+	#ifdef SVQC
+		#define W_CONFIG_BEGIN(class) METHOD(class, wr_config, void(class this)) {
+			#define _W_CONFIG(class, fld, T, wepname) if (#wepname == this.netname) WEP_CONFIG_WRITE_CVARS(wepname, fld, T);
+		#define W_CONFIG_END() }
+	#else
+		#define W_CONFIG_BEGIN(class)
+			#define _W_CONFIG(class, fld, T, wepname)
+		#define W_CONFIG_END()
+	#endif
 
 
     #define W_UPDATE(class, wepname, fld, T, m)     W_UPDATE_##m(class, fld, T, wepname)
@@ -199,27 +210,33 @@ X(reload_time, float)
     #define W_UPDATE_BOTH(class, fld, T, wepname) \
             W_UPDATE_PRI(class, fld, T, wepname) \
             W_UPDATE_SEC(class, fld, T, wepname)
-    .entity baseline, baseline_target;
-    #define W_UPDATE_BEGIN(class) \
-        METHOD(class, wr_update, void(class this)) \
-        { \
-            noref entity b = this.baseline; \
-            if (!b) \
-            { \
-                b = this.baseline = new_pure(baseline); \
-                b.baseline_target = this; \
-            }
-        #ifdef SVQC
-            #define _W_UPDATE(class, fld, T, wepname) \
-                { \
-                    T it = _W_PROP_CVAR(wepname, fld); \
-                    b.wepvar_##fld = this.wepvar_##fld; \
-                    this.wepvar_##fld = it; \
-                }
-        #else
-            #define _W_UPDATE(class, fld, T, wepname)
-        #endif
-    #define W_UPDATE_END() }
+	#ifdef GAMEQC
+		.entity baseline, baseline_target;
+		#define W_UPDATE_BEGIN(class) \
+			METHOD(class, wr_update, void(class this)) \
+			{ \
+				noref entity b = this.baseline; \
+				if (!b) \
+				{ \
+					b = this.baseline = new_pure(baseline); \
+					b.baseline_target = this; \
+				}
+			#ifdef SVQC
+				#define _W_UPDATE(class, fld, T, wepname) \
+					{ \
+						T it = _W_PROP_CVAR(wepname, fld); \
+						b.wepvar_##fld = this.wepvar_##fld; \
+						this.wepvar_##fld = it; \
+					}
+			#else
+				#define _W_UPDATE(class, fld, T, wepname)
+			#endif
+		#define W_UPDATE_END() }
+	#else
+		#define W_UPDATE_BEGIN(class)
+			#define _W_UPDATE(class, fld, T, wepname)
+		#define W_UPDATE_END()
+	#endif
 
 
     #define W_NET(class, wepname, fld, T, m)     W_NET_##m(class, fld, T, wepname)
@@ -229,8 +246,8 @@ X(reload_time, float)
     #define W_NET_BOTH(class, fld, T, wepname) \
             W_NET_PRI(class, fld, T, wepname) \
             W_NET_SEC(class, fld, T, wepname)
-    REGISTER_NET_TEMP(WeaponUpdate)
     #if defined(CSQC)
+        REGISTER_NET_TEMP(WeaponUpdate)
         #define W_NET_BEGIN(class) METHOD(class, wr_net, void(class this, int i)) { int n = 0;
             #define _W_NET(class, fld, T, wepname) \
             { \
@@ -248,12 +265,13 @@ X(reload_time, float)
             }
         #define W_NET_END() }
     #elif defined(SVQC)
+        REGISTER_NET_TEMP(WeaponUpdate)
         #define W_NET_BEGIN(class) \
             METHOD(class, wr_net, void(class this, int chan)) \
             { \
                 bool commit = false; \
                 int i = 0;
-    #define _W_NET(class, fld, T, wepname) \
+            #define _W_NET(class, fld, T, wepname) \
                 { \
                     ++i; \
                     T it = this.wepvar_##fld; \
@@ -263,9 +281,7 @@ X(reload_time, float)
                         WriteByte(chan, i); Write_##T(chan, it); \
                     } \
                 }
-    #define W_NET_END() \
-                if (commit) WriteByte(chan, 0); \
-            }
+        #define W_NET_END() if (commit) WriteByte(chan, 0); }
     #else
         #define W_NET_BEGIN(class)
             #define _W_NET(class, fld, T, wepname)
@@ -303,8 +319,7 @@ STATIC_INIT(register_weapons_done)
     FOREACH(Weapons, true, {
         WepSet set = it.m_wepset = _WepSet_FromWeapon(it.m_id = i);
         WEPSET_ALL |= set;
-        if ((it.spawnflags) & WEP_FLAG_SUPERWEAPON) WEPSET_SUPERWEAPONS |= set;
-        it.weapons = set;
+        if (it.spawnflags & WEP_FLAG_SUPERWEAPON) WEPSET_SUPERWEAPONS |= set;
         if (it == WEP_Null) continue;
         int imp = WEP_IMPULSE_BEGIN + it.m_id - 1;
         if (imp <= WEP_IMPULSE_END)
@@ -359,6 +374,17 @@ ENUMCLASS_END(WFRAME)
 
 .WFRAME wframe;
 
+#ifdef SVQC
+    #define G_SHOOTFROMFIXEDORIGIN autocvar_g_shootfromfixedorigin
+#elif defined(CSQC)
+    string autocvar_cl_shootfromfixedorigin;
+    #define G_SHOOTFROMFIXEDORIGIN autocvar_cl_shootfromfixedorigin
+#endif
+
 vector shotorg_adjust_values(vector vecs, bool y_is_right, bool visual, int algn);
 void CL_WeaponEntity_SetModel(entity this, string name, bool _anim);
+
+#ifdef SVQC
+void wframe_send(entity actor, entity weaponentity, vector a, bool restartanim);
+#endif
 #endif