ATTRIB: overload default value, require semicolon

diff --git a/qcsrc/Doxyfile b/qcsrc/Doxyfile
index cb9ca2a883afc26501bec16c6ebcf17687241cfc..09d0128578d272c49812442b4d840efc7eede915 100644 (file)
--- a/qcsrc/Doxyfile
+++ b/qcsrc/Doxyfile
@@ -2002,10 +2002,11 @@ PREDEFINED             = \
     "INIT(class)=class::class()" \
     "CONSTRUCTOR(class)=class::class(" \
     "DESTRUCTOR(class)=class::~class()" \
     "INIT(class)=class::class()" \
     "CONSTRUCTOR(class)=class::class(" \
     "DESTRUCTOR(class)=class::~class()" \

-    "ATTRIB(class, name, T, val)=T name = val;" \
-    "ATTRIB_STRZONE(class, name, T, val)=T name = val;" \
-    "STATIC_ATTRIB(class, name, T, val)=static T name = val;" \
-    "STATIC_ATTRIB_STRZONE(class, name, T, val)=static T name = val;" \
+    "ATTRIB(class, name, T, val)=T name = val" \
+    "ATTRIB_STRZONE(class, name, T, val)=T name = val" \
+    "ATTRIBARRAY(class, name, T, val)=T name[val]" \
+    "STATIC_ATTRIB(class, name, T, val)=static T name = val" \
+    "STATIC_ATTRIB_STRZONE(class, name, T, val)=static T name = val" \

     "METHOD(class, name, prototype)=virtual void class::name()" \
     "ENDCLASS(class)=};" \
     __STDC__
     "METHOD(class, name, prototype)=virtual void class::name()" \
     "ENDCLASS(class)=};" \
     __STDC__

diff --git a/qcsrc/common/animdecide.qh b/qcsrc/common/animdecide.qh
index 25106b2b944e80b404df0f1eccbe1be567e7595c..16feb948c35d5c2264b9bdc21329c531c47ae2d9 100644 (file)
--- a/qcsrc/common/animdecide.qh
+++ b/qcsrc/common/animdecide.qh
@@ -8,7 +8,7 @@ void animdecide_setimplicitstate(entity e, float onground);
 void animdecide_setframes(entity e, bool support_blending, .int fld_frame, .int fld_frame1time, .int fld_frame2, .int fld_frame2time);
 
 CLASS(Animation, Object)
 void animdecide_setframes(entity e, bool support_blending, .int fld_frame, .int fld_frame1time, .int fld_frame2, .int fld_frame2time);
 
 CLASS(Animation, Object)

-       ATTRIB(Animation, m_framenames, string, string_null)
+       ATTRIB(Animation, m_framenames, string);

        STATIC_METHOD(Animation, getframe, int(Animation this, int mdlidx))
        {
                FOREACH_WORD(this.m_framenames, true, {
        STATIC_METHOD(Animation, getframe, int(Animation this, int mdlidx))
        {
                FOREACH_WORD(this.m_framenames, true, {

diff --git a/qcsrc/common/command/command.qh b/qcsrc/common/command/command.qh
index 0b3741a06cd2976007bc34dfd38da44d1eab8a0e..349d492da82b4169113ecde8989e764f06690f22 100644 (file)
--- a/qcsrc/common/command/command.qh
+++ b/qcsrc/common/command/command.qh
@@ -4,8 +4,8 @@ const int CMD_REQUEST_COMMAND = 1;
 const int CMD_REQUEST_USAGE = 2;
 
 CLASS(Command, Object)
 const int CMD_REQUEST_USAGE = 2;
 
 CLASS(Command, Object)

-       ATTRIB(Command, m_name, string, string_null);
-       ATTRIB(Command, m_description, string, string_null);
+       ATTRIB(Command, m_name, string);
+       ATTRIB(Command, m_description, string);

        METHOD(Command, m_invokecmd, void(Command this, int request, entity caller, int arguments, string command))
        {
         TC(Command, this);
        METHOD(Command, m_invokecmd, void(Command this, int request, entity caller, int arguments, string command))
        {
         TC(Command, this);

diff --git a/qcsrc/common/effects/effectinfo.qc b/qcsrc/common/effects/effectinfo.qc
index cc87b31a1ff01ecfec301e3854a9264bbe760ac2..cf6d5fca9395a29b8985a1e059522bd1a5f8206e 100644 (file)
--- a/qcsrc/common/effects/effectinfo.qc
+++ b/qcsrc/common/effects/effectinfo.qc
@@ -138,7 +138,7 @@
     /**/
 
 CLASS(EffectInfo, Object)
     /**/
 
 CLASS(EffectInfo, Object)

-    ATTRIB(EffectInfo, effectinfo_name, string, string_null)
+    ATTRIB(EffectInfo, effectinfo_name, string);

     CONSTRUCTOR(EffectInfo, string s) {
         CONSTRUCT(EffectInfo);
         this.effectinfo_name = s;
     CONSTRUCTOR(EffectInfo, string s) {
         CONSTRUCT(EffectInfo);
         this.effectinfo_name = s;


@@ -193,7 +193,7 @@ CLASS(EffectInfo, Object)
     MY(velocityoffset, vector, '0 0 0') \
     /**/
 
     MY(velocityoffset, vector, '0 0 0') \
     /**/
 

-    #define MY(f, type, val) ATTRIB(EffectInfo, effectinfo_##f, type, val)
+    #define MY(f, type, val) ATTRIB(EffectInfo, effectinfo_##f, type, val);

     FIELDS(MY)
     #undef MY
 
     FIELDS(MY)
     #undef MY
 


@@ -227,8 +227,8 @@ CLASS(EffectInfo, Object)
 ENDCLASS(EffectInfo)
 
 CLASS(EffectInfoGroup, Object)
 ENDCLASS(EffectInfo)
 
 CLASS(EffectInfoGroup, Object)

-    ATTRIBARRAY(EffectInfoGroup, children, EffectInfo, 16)
-    ATTRIB(EffectInfoGroup, children_count, int, 0)
+    ATTRIBARRAY(EffectInfoGroup, children, EffectInfo, 16);
+    ATTRIB(EffectInfoGroup, children_count, int, 0);

 ENDCLASS(EffectInfoGroup)
 
 void effectinfo_read()
 ENDCLASS(EffectInfoGroup)
 
 void effectinfo_read()

diff --git a/qcsrc/common/items/inventory.qh b/qcsrc/common/items/inventory.qh
index 0cd365ff02b2ee7fb3d62470ae6ee818740924aa..811f716fb84bccad19e7cf9044c6f56ffafaa0d0 100644 (file)
--- a/qcsrc/common/items/inventory.qh
+++ b/qcsrc/common/items/inventory.qh
@@ -5,9 +5,9 @@
 
 CLASS(Inventory, Object)
     /** Stores counts of items, the id being the index */
 
 CLASS(Inventory, Object)
     /** Stores counts of items, the id being the index */

-    ATTRIBARRAY(Inventory, inv_items, int, Items_MAX)
+    ATTRIBARRAY(Inventory, inv_items, int, Items_MAX);

     /** Previous state */
     /** Previous state */

-    ATTRIB(Inventory, inventory, Inventory, NULL)
+    ATTRIB(Inventory, inventory, Inventory);

 ENDCLASS(Inventory)
 
 /** Player inventory */
 ENDCLASS(Inventory)
 
 /** Player inventory */

diff --git a/qcsrc/common/items/item.qh b/qcsrc/common/items/item.qh
index ed33169fcdb2b7e97714fb8fe9b3737e08d88e47..e46df6b3c31d8374ff0b5fc8084c84e78a5c1d64 100644 (file)
--- a/qcsrc/common/items/item.qh
+++ b/qcsrc/common/items/item.qh
@@ -39,12 +39,12 @@ const int IT_PICKUPMASK                     = IT_UNLIMITED_AMMO | IT_JETPACK | IT_FU
 
 #define ITEM_HANDLE(signal, ...) __Item_Send_##signal(__VA_ARGS__)
 CLASS(GameItem, Object)
 
 #define ITEM_HANDLE(signal, ...) __Item_Send_##signal(__VA_ARGS__)
 CLASS(GameItem, Object)

-    ATTRIB(GameItem, m_id, int, 0)
-    ATTRIB(GameItem, m_name, string, string_null)
-    ATTRIB(GameItem, m_icon, string, string_null)
-    ATTRIB(GameItem, m_color, vector, '1 1 1')
-    ATTRIB(GameItem, m_waypoint, string, string_null)
-    ATTRIB(GameItem, m_waypointblink, int, 1)
+    ATTRIB(GameItem, m_id, int, 0);
+    ATTRIB(GameItem, m_name, string);
+    ATTRIB(GameItem, m_icon, string);
+    ATTRIB(GameItem, m_color, vector, '1 1 1');
+    ATTRIB(GameItem, m_waypoint, string);
+    ATTRIB(GameItem, m_waypointblink, int, 1);

     METHOD(GameItem, display, void(GameItem this, void(string name, string icon) returns))
     {
         TC(GameItem, this);
     METHOD(GameItem, display, void(GameItem this, void(string name, string icon) returns))
     {
         TC(GameItem, this);

diff --git a/qcsrc/common/items/item/ammo.qh b/qcsrc/common/items/item/ammo.qh
index ed2ada7cf4ad36a5be5714a650a58a53c1a53051..56c9369192899010fdbabda6d5408028410ae4bd 100644 (file)
--- a/qcsrc/common/items/item/ammo.qh
+++ b/qcsrc/common/items/item/ammo.qh
@@ -3,8 +3,8 @@
 #include "pickup.qh"
 CLASS(Ammo, Pickup)
 #ifdef SVQC
 #include "pickup.qh"
 CLASS(Ammo, Pickup)
 #ifdef SVQC

-    ATTRIB(Ammo, m_pickupevalfunc, float(entity player, entity item), commodity_pickupevalfunc)
-    ATTRIB(Ammo, m_respawntime, float(), GET(g_pickup_respawntime_ammo))
-    ATTRIB(Ammo, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_ammo))
+    ATTRIB(Ammo, m_pickupevalfunc, float(entity player, entity item), commodity_pickupevalfunc);
+    ATTRIB(Ammo, m_respawntime, float(), GET(g_pickup_respawntime_ammo));
+    ATTRIB(Ammo, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_ammo));

 #endif
 ENDCLASS(Ammo)
 #endif
 ENDCLASS(Ammo)

diff --git a/qcsrc/common/items/item/armor.qh b/qcsrc/common/items/item/armor.qh
index 6e79a2200a7ced73104807c1bbe83a5631f943b3..9078b636d4322b0ac369f8b4dbc2f44f4189baa1 100644 (file)
--- a/qcsrc/common/items/item/armor.qh
+++ b/qcsrc/common/items/item/armor.qh
@@ -3,8 +3,8 @@
 #include "pickup.qh"
 CLASS(Armor, Pickup)
 #ifdef SVQC
 #include "pickup.qh"
 CLASS(Armor, Pickup)
 #ifdef SVQC

-    ATTRIB(Armor, m_mins, vector, '-16 -16 0')
-    ATTRIB(Armor, m_maxs, vector, '16 16 48')
-    ATTRIB(Armor, m_pickupevalfunc, float(entity player, entity item), commodity_pickupevalfunc)
+    ATTRIB(Armor, m_mins, vector, '-16 -16 0');
+    ATTRIB(Armor, m_maxs, vector, '16 16 48');
+    ATTRIB(Armor, m_pickupevalfunc, float(entity player, entity item), commodity_pickupevalfunc);

 #endif
 ENDCLASS(Armor)
 #endif
 ENDCLASS(Armor)

diff --git a/qcsrc/common/items/item/health.qh b/qcsrc/common/items/item/health.qh
index 3a0249d5132084ac1f7a1157e5ff22ebaa716ca9..8eb463a8f97ddc9ed66c562748c1fe0732fe8ad3 100644 (file)
--- a/qcsrc/common/items/item/health.qh
+++ b/qcsrc/common/items/item/health.qh
@@ -3,8 +3,8 @@
 #include "pickup.qh"
 CLASS(Health, Pickup)
 #ifdef SVQC
 #include "pickup.qh"
 CLASS(Health, Pickup)
 #ifdef SVQC

-    ATTRIB(Health, m_mins, vector, '-16 -16 0')
-    ATTRIB(Health, m_maxs, vector, '16 16 48')
-    ATTRIB(Health, m_pickupevalfunc, float(entity player, entity item), commodity_pickupevalfunc)
+    ATTRIB(Health, m_mins, vector, '-16 -16 0');
+    ATTRIB(Health, m_maxs, vector, '16 16 48');
+    ATTRIB(Health, m_pickupevalfunc, float(entity player, entity item), commodity_pickupevalfunc);

 #endif
 ENDCLASS(Health)
 #endif
 ENDCLASS(Health)

diff --git a/qcsrc/common/items/item/pickup.qh b/qcsrc/common/items/item/pickup.qh
index 684e6dde9970c5e9333a6f884c1c22030a709b3c..136c8dab6dbf73c633ab35b548134611e6c9b7a3 100644 (file)
--- a/qcsrc/common/items/item/pickup.qh
+++ b/qcsrc/common/items/item/pickup.qh
@@ -4,25 +4,25 @@
 #include <common/items/item.qh>
 CLASS(Pickup, GameItem)
 #ifndef MENUQC
 #include <common/items/item.qh>
 CLASS(Pickup, GameItem)
 #ifndef MENUQC

-    ATTRIB(Pickup, m_model, Model, NULL)
-    ATTRIB(Pickup, m_sound, Sound, SND_ITEMPICKUP)
+    ATTRIB(Pickup, m_model, Model);
+    ATTRIB(Pickup, m_sound, Sound, SND_ITEMPICKUP);

 #endif
 #endif

-    ATTRIB(Pickup, m_name, string, string_null)
+    ATTRIB(Pickup, m_name, string);

     METHOD(Pickup, show, void(Pickup this))
     {
         TC(Pickup, this);
         LOG_INFOF("%s: %s\n", etos(this), this.m_name);
     }
 #ifdef SVQC
     METHOD(Pickup, show, void(Pickup this))
     {
         TC(Pickup, this);
         LOG_INFOF("%s: %s\n", etos(this), this.m_name);
     }
 #ifdef SVQC

-    ATTRIB(Pickup, m_mins, vector, '-16 -16 0')
-    ATTRIB(Pickup, m_maxs, vector, '16 16 32')
-    ATTRIB(Pickup, m_botvalue, int, 0)
-    ATTRIB(Pickup, m_itemflags, int, 0)
-    ATTRIB(Pickup, m_itemid, int, 0)
+    ATTRIB(Pickup, m_mins, vector, '-16 -16 0');
+    ATTRIB(Pickup, m_maxs, vector, '16 16 32');
+    ATTRIB(Pickup, m_botvalue, int, 0);
+    ATTRIB(Pickup, m_itemflags, int, 0);
+    ATTRIB(Pickup, m_itemid, int, 0);

     float generic_pickupevalfunc(entity player, entity item);
     float generic_pickupevalfunc(entity player, entity item);

-    ATTRIB(Pickup, m_pickupevalfunc, float(entity player, entity item), generic_pickupevalfunc)
-    ATTRIB(Pickup, m_respawntime, float(), func_null)
-    ATTRIB(Pickup, m_respawntimejitter, float(), func_null)
+    ATTRIB(Pickup, m_pickupevalfunc, float(entity player, entity item), generic_pickupevalfunc);
+    ATTRIB(Pickup, m_respawntime, float());
+    ATTRIB(Pickup, m_respawntimejitter, float());

     float Item_GiveTo(entity item, entity player);
     METHOD(Pickup, giveTo, bool(Pickup this, entity item, entity player))
     {
     float Item_GiveTo(entity item, entity player);
     METHOD(Pickup, giveTo, bool(Pickup this, entity item, entity player))
     {

diff --git a/qcsrc/common/items/item/powerup.qh b/qcsrc/common/items/item/powerup.qh
index 0a3d907288a203cee53c8e61575de30ebd0cfb87..ca17c970bab7aa01066c61e04f0289062314b82e 100644 (file)
--- a/qcsrc/common/items/item/powerup.qh
+++ b/qcsrc/common/items/item/powerup.qh
@@ -8,11 +8,11 @@
 #include "pickup.qh"
 CLASS(Powerup, Pickup)
 #ifdef SVQC
 #include "pickup.qh"
 CLASS(Powerup, Pickup)
 #ifdef SVQC

-    ATTRIB(Powerup, m_mins, vector, '-16 -16 0')
-    ATTRIB(Powerup, m_maxs, vector, '16 16 48')
-    ATTRIB(Powerup, m_botvalue, int, 100000)
-    ATTRIB(Powerup, m_itemflags, int, FL_POWERUP)
-    ATTRIB(Powerup, m_respawntime, float(), GET(g_pickup_respawntime_powerup))
-    ATTRIB(Powerup, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_powerup))
+    ATTRIB(Powerup, m_mins, vector, '-16 -16 0');
+    ATTRIB(Powerup, m_maxs, vector, '16 16 48');
+    ATTRIB(Powerup, m_botvalue, int, 100000);
+    ATTRIB(Powerup, m_itemflags, int, FL_POWERUP);
+    ATTRIB(Powerup, m_respawntime, float(), GET(g_pickup_respawntime_powerup));
+    ATTRIB(Powerup, m_respawntimejitter, float(), GET(g_pickup_respawntimejitter_powerup));

 #endif
 ENDCLASS(Powerup)
 #endif
 ENDCLASS(Powerup)

diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh
index 34fa0ee35cfa610d1723a15464b8666f4e8523a3..c4c9e69c5e888eeaa251a572bbfa5eb683ed5ac3 100644 (file)
--- a/qcsrc/common/mapinfo.qh
+++ b/qcsrc/common/mapinfo.qh
@@ -8,24 +8,24 @@ bool autocvar_developer_mapper;
 #include "util.qh"
 
 CLASS(Gametype, Object)
 #include "util.qh"
 
 CLASS(Gametype, Object)

-    ATTRIB(Gametype, m_id, int, 0)
+    ATTRIB(Gametype, m_id, int, 0);

     /** game type ID */
     /** game type ID */

-    ATTRIB(Gametype, items, int, 0)
+    ATTRIB(Gametype, items, int, 0);

     /** game type name as in cvar (with g_ prefix) */
     /** game type name as in cvar (with g_ prefix) */

-    ATTRIB(Gametype, netname, string, string_null)
+    ATTRIB(Gametype, netname, string);

     /** game type short name */
     /** game type short name */

-    ATTRIB(Gametype, mdl, string, string_null)
+    ATTRIB(Gametype, mdl, string);

     /** human readable name */
     /** human readable name */

-    ATTRIB(Gametype, message, string, string_null)
+    ATTRIB(Gametype, message, string);

     /** does this gametype support teamplay? */
     /** does this gametype support teamplay? */

-    ATTRIB(Gametype, team, bool, false)
+    ATTRIB(Gametype, team, bool, false);

     /** game type defaults */
     /** game type defaults */

-    ATTRIB(Gametype, model2, string, string_null)
+    ATTRIB(Gametype, model2, string);

     /** game type description */
     /** game type description */

-    ATTRIB(Gametype, gametype_description, string, string_null)
+    ATTRIB(Gametype, gametype_description, string);

 
 

-    ATTRIB(Gametype, m_mutators, string, string_null)
-    ATTRIB(Gametype, m_parse_mapinfo, bool(string k, string v), func_null)
+    ATTRIB(Gametype, m_mutators, string);
+    ATTRIB(Gametype, m_parse_mapinfo, bool(string k, string v));

 
     METHOD(Gametype, describe, string(Gametype this))
     {
 
     METHOD(Gametype, describe, string(Gametype this))
     {

diff --git a/qcsrc/common/models/model.qh b/qcsrc/common/models/model.qh
index 7f20dc00478d3474f3d0c6a84178db1c8535497a..7a1e7d73c2a471c802a1cf496d9a68e15c0d49e9 100644 (file)
--- a/qcsrc/common/models/model.qh
+++ b/qcsrc/common/models/model.qh
@@ -3,8 +3,8 @@
 #define setmodel(e, m) _setmodel((e), (m).model_str())
 
 CLASS(Model, Object)
 #define setmodel(e, m) _setmodel((e), (m).model_str())
 
 CLASS(Model, Object)

-    ATTRIB(Model, m_id, int, 0)
-    ATTRIB(Model, model_str, string(), func_null)
+    ATTRIB(Model, m_id, int, 0);
+    ATTRIB(Model, model_str, string());

     CONSTRUCTOR(Model, string() path)
     {
         CONSTRUCT(Model);
     CONSTRUCTOR(Model, string() path)
     {
         CONSTRUCT(Model);

diff --git a/qcsrc/common/monsters/monster.qh b/qcsrc/common/monsters/monster.qh
index b345fa6fc155cc4039b47bcc122c91b1365fe062..5187c7f56b17f576771778ff3f2a7b0652b0bde2 100644 (file)
--- a/qcsrc/common/monsters/monster.qh
+++ b/qcsrc/common/monsters/monster.qh
@@ -45,19 +45,19 @@ const int MONSTER_SIZE_QUAKE = 8192;
 .vector anim_spawn;
 
 CLASS(Monster, Object)
 .vector anim_spawn;
 
 CLASS(Monster, Object)

-    ATTRIB(Monster, monsterid, int, 0)
+    ATTRIB(Monster, monsterid, int, 0);

     /** attributes */
     /** attributes */

-    ATTRIB(Monster, spawnflags, int, 0)
+    ATTRIB(Monster, spawnflags, int, 0);

     /** human readable name */
     /** human readable name */

-    ATTRIB(Monster, monster_name, string, "Monster")
+    ATTRIB(Monster, monster_name, string, "Monster");

     /** short name */
     /** short name */

-    ATTRIB(Monster, netname, string, "")
+    ATTRIB(Monster, netname, string, "");

     /** model */
     /** model */

-    ATTRIB(Monster, m_model, entity, NULL)
+    ATTRIB(Monster, m_model, entity);

     /** hitbox size */
     /** hitbox size */

-    ATTRIB(Monster, mins, vector, '-0 -0 -0')
+    ATTRIB(Monster, mins, vector, '-0 -0 -0');

     /** hitbox size */
     /** hitbox size */

-    ATTRIB(Monster, maxs, vector, '0 0 0')
+    ATTRIB(Monster, maxs, vector, '0 0 0');

 
     /** (SERVER) setup monster data */
     METHOD(Monster, mr_setup, bool(Monster this, entity actor)) { TC(Monster, this); return false; }
 
     /** (SERVER) setup monster data */
     METHOD(Monster, mr_setup, bool(Monster this, entity actor)) { TC(Monster, this); return false; }

diff --git a/qcsrc/common/mutators/base.qh b/qcsrc/common/mutators/base.qh
index 119014b08887af051aee45b70ca584621c14de8d..5187f7fe1ffeb12b8f397e170597ec398295b6ca 100644 (file)
--- a/qcsrc/common/mutators/base.qh
+++ b/qcsrc/common/mutators/base.qh
@@ -20,7 +20,7 @@ CLASS(Callback, Object)
      *     return false;
      * }
      */
      *     return false;
      * }
      */

-    ATTRIB(Callback, cbc_func, bool(), func_null)
+    ATTRIB(Callback, cbc_func, bool());

     CONSTRUCTOR(Callback, bool() func) {
         CONSTRUCT(Callback);
         this.cbc_func = func;
     CONSTRUCTOR(Callback, bool() func) {
         CONSTRUCT(Callback);
         this.cbc_func = func;


@@ -32,9 +32,9 @@ ENDCLASS(Callback)
  */
 CLASS(CallbackChain, Object)
     CLASS(CallbackNode, Object)
  */
 CLASS(CallbackChain, Object)
     CLASS(CallbackNode, Object)

-        ATTRIB(CallbackNode, cbc, Callback, NULL)
-        ATTRIB(CallbackNode, cbc_next, CallbackNode, NULL)
-        ATTRIB(CallbackNode, cbc_order, int, 0)
+        ATTRIB(CallbackNode, cbc, Callback);
+        ATTRIB(CallbackNode, cbc_next, CallbackNode);
+        ATTRIB(CallbackNode, cbc_order, int, 0);

         CONSTRUCTOR(CallbackNode, Callback it, int order) {
             CONSTRUCT(CallbackNode);
             this.cbc = it;
         CONSTRUCTOR(CallbackNode, Callback it, int order) {
             CONSTRUCT(CallbackNode);
             this.cbc = it;


@@ -42,8 +42,8 @@ CLASS(CallbackChain, Object)
         }
     ENDCLASS(CallbackNode)
 
         }
     ENDCLASS(CallbackNode)
 

-    ATTRIB(CallbackChain, cbc_next, CallbackNode, NULL)
-    ATTRIB(CallbackChain, cbc_order, int, 0)
+    ATTRIB(CallbackChain, cbc_next, CallbackNode);
+    ATTRIB(CallbackChain, cbc_order, int, 0);

     CONSTRUCTOR(CallbackChain, string _name) {
         CONSTRUCT(CallbackChain);
         this.netname = _name;
     CONSTRUCTOR(CallbackChain, string _name) {
         CONSTRUCT(CallbackChain);
         this.netname = _name;


@@ -150,10 +150,10 @@ enum {
 USING(mutatorfunc_t, bool(int));
 
 CLASS(Mutator, Object)
 USING(mutatorfunc_t, bool(int));
 
 CLASS(Mutator, Object)

-    ATTRIB(Mutator, m_id, int, 0)
-    ATTRIB(Mutator, m_name, string, string_null)
-    ATTRIB(Mutator, mutatorfunc, mutatorfunc_t, func_null)
-    ATTRIB(Mutator, mutatorcheck, bool(), func_null)
+    ATTRIB(Mutator, m_id, int, 0);
+    ATTRIB(Mutator, m_name, string);
+    ATTRIB(Mutator, mutatorfunc, mutatorfunc_t);
+    ATTRIB(Mutator, mutatorcheck, bool());

     CONSTRUCTOR(Mutator, string _name, mutatorfunc_t func) {
         CONSTRUCT(Mutator);
         this.m_name = _name;
     CONSTRUCTOR(Mutator, string _name, mutatorfunc_t func) {
         CONSTRUCT(Mutator);
         this.m_name = _name;

diff --git a/qcsrc/common/mutators/mutator/buffs/all.qh b/qcsrc/common/mutators/mutator/buffs/all.qh
index 66f83d1c517c03705af2508787f4f0eeef4f46f9..79117c95a811f852ac7e6a6eb3ef8b29b3464486 100644 (file)
--- a/qcsrc/common/mutators/mutator/buffs/all.qh
+++ b/qcsrc/common/mutators/mutator/buffs/all.qh
@@ -18,12 +18,12 @@ REGISTRY_CHECK(Buffs)
 #include <common/items/item/pickup.qh>
 CLASS(Buff, Pickup)
        /** bit index */
 #include <common/items/item/pickup.qh>
 CLASS(Buff, Pickup)
        /** bit index */

-       ATTRIB(Buff, m_itemid, int, 0)
-       ATTRIB(Buff, m_name, string, "buff")
-       ATTRIB(Buff, m_color, vector, '1 1 1')
-       ATTRIB(Buff, m_prettyName, string, "Buff")
-       ATTRIB(Buff, m_skin, int, 0)
-       ATTRIB(Buff, m_sprite, string, "")
+       ATTRIB(Buff, m_itemid, int, 0);
+       ATTRIB(Buff, m_name, string, "buff");
+       ATTRIB(Buff, m_color, vector, '1 1 1');
+       ATTRIB(Buff, m_prettyName, string, "Buff");
+       ATTRIB(Buff, m_skin, int, 0);
+       ATTRIB(Buff, m_sprite, string, "");

        METHOD(Buff, display, void(entity this, void(string name, string icon) returns)) {
                returns(this.m_prettyName, sprintf("/gfx/hud/%s/buff_%s", cvar_string("menu_skin"), this.m_name));
        }
        METHOD(Buff, display, void(entity this, void(string name, string icon) returns)) {
                returns(this.m_prettyName, sprintf("/gfx/hud/%s/buff_%s", cvar_string("menu_skin"), this.m_name));
        }

diff --git a/qcsrc/common/mutators/mutator/campcheck/campcheck.qc b/qcsrc/common/mutators/mutator/campcheck/campcheck.qc
index b39a2c1650003d616e95ac73e62e851add50645a..1ab6fb4624eb246b027319a8685f12dc54081bac 100644 (file)
--- a/qcsrc/common/mutators/mutator/campcheck/campcheck.qc
+++ b/qcsrc/common/mutators/mutator/campcheck/campcheck.qc
@@ -86,6 +86,6 @@ MUTATOR_HOOKFUNCTION(campcheck, PlayerSpawn)
 
 MUTATOR_HOOKFUNCTION(campcheck, BuildMutatorsString)
 {
 
 MUTATOR_HOOKFUNCTION(campcheck, BuildMutatorsString)
 {

-       M_ARGV(0, string) = strcat(M_ARGV(0, string), ":CampCheck");;
+       M_ARGV(0, string) = strcat(M_ARGV(0, string), ":CampCheck");

 }
 #endif
 }
 #endif

diff --git a/qcsrc/common/mutators/mutator/damagetext/damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/damagetext.qc
index c705ea0d1c03ff67eb4e75ac5bf77e4a8987bdf5..878a854fb79ccc27bcbe6ffdd7c1fe7a7900a76e 100644 (file)
--- a/qcsrc/common/mutators/mutator/damagetext/damagetext.qc
+++ b/qcsrc/common/mutators/mutator/damagetext/damagetext.qc
@@ -31,18 +31,18 @@ AUTOCVAR_SAVE(cl_damagetext_friendlyfire_color, vector, '1 0 0',    "Damage text
 
 #ifdef CSQC
 CLASS(DamageText, Object)
 
 #ifdef CSQC
 CLASS(DamageText, Object)

-    ATTRIB(DamageText, m_color, vector, autocvar_cl_damagetext_color)
-    ATTRIB(DamageText, m_color_friendlyfire, vector, autocvar_cl_damagetext_friendlyfire_color)
-    ATTRIB(DamageText, m_size, float, autocvar_cl_damagetext_size)
-    ATTRIB(DamageText, alpha, float, autocvar_cl_damagetext_alpha_start)
-    ATTRIB(DamageText, fade_rate, float, 1 / autocvar_cl_damagetext_alpha_lifetime)
-    ATTRIB(DamageText, velocity, vector, autocvar_cl_damagetext_velocity)
-    ATTRIB(DamageText, m_group, int, 0)
-    ATTRIB(DamageText, m_friendlyfire, bool, false)
-    ATTRIB(DamageText, m_damage, int, 0)
-    ATTRIB(DamageText, m_armordamage, int, 0)
-    ATTRIB(DamageText, m_deathtype, int, 0)
-    ATTRIB(DamageText, time_prev, float, time)
+    ATTRIB(DamageText, m_color, vector, autocvar_cl_damagetext_color);
+    ATTRIB(DamageText, m_color_friendlyfire, vector, autocvar_cl_damagetext_friendlyfire_color);
+    ATTRIB(DamageText, m_size, float, autocvar_cl_damagetext_size);
+    ATTRIB(DamageText, alpha, float, autocvar_cl_damagetext_alpha_start);
+    ATTRIB(DamageText, fade_rate, float, 1 / autocvar_cl_damagetext_alpha_lifetime);
+    ATTRIB(DamageText, velocity, vector, autocvar_cl_damagetext_velocity);
+    ATTRIB(DamageText, m_group, int, 0);
+    ATTRIB(DamageText, m_friendlyfire, bool, false);
+    ATTRIB(DamageText, m_damage, int, 0);
+    ATTRIB(DamageText, m_armordamage, int, 0);
+    ATTRIB(DamageText, m_deathtype, int, 0);
+    ATTRIB(DamageText, time_prev, float, time);

 
     void DamageText_draw2d(DamageText this) {
         float dt = time - this.time_prev;
 
     void DamageText_draw2d(DamageText this) {
         float dt = time - this.time_prev;


@@ -71,7 +71,7 @@ CLASS(DamageText, Object)
             drawcolorcodedstring2_builtin(pos, s, this.m_size * '1 1 0', rgb, this.alpha, DRAWFLAG_NORMAL);
         }
     }
             drawcolorcodedstring2_builtin(pos, s, this.m_size * '1 1 0', rgb, this.alpha, DRAWFLAG_NORMAL);
         }
     }

-    ATTRIB(DamageText, draw2d, void(DamageText), DamageText_draw2d)
+    ATTRIB(DamageText, draw2d, void(DamageText), DamageText_draw2d);

 
     void DamageText_update(DamageText this, vector _origin, int _health, int _armor, int _deathtype) {
         this.m_damage = _health;
 
     void DamageText_update(DamageText this, vector _origin, int _health, int _armor, int _deathtype) {
         this.m_damage = _health;


@@ -160,10 +160,10 @@ NET_HANDLE(damagetext, bool isNew)
 CLASS(XonoticDamageTextSettings, XonoticTab)
     #include <menu/gamesettings.qh>
     REGISTER_SETTINGS(damagetext, NEW(XonoticDamageTextSettings));
 CLASS(XonoticDamageTextSettings, XonoticTab)
     #include <menu/gamesettings.qh>
     REGISTER_SETTINGS(damagetext, NEW(XonoticDamageTextSettings));

-    ATTRIB(XonoticDamageTextSettings, title, string, _("Damage text"))
-    ATTRIB(XonoticDamageTextSettings, intendedWidth, float, 0.9)
-    ATTRIB(XonoticDamageTextSettings, rows, float, 15.5)
-    ATTRIB(XonoticDamageTextSettings, columns, float, 5)
+    ATTRIB(XonoticDamageTextSettings, title, string, _("Damage text"));
+    ATTRIB(XonoticDamageTextSettings, intendedWidth, float, 0.9);
+    ATTRIB(XonoticDamageTextSettings, rows, float, 15.5);
+    ATTRIB(XonoticDamageTextSettings, columns, float, 5);

     INIT(XonoticDamageTextSettings) { this.configureDialog(this); }
     METHOD(XonoticDamageTextSettings, showNotify, void(entity this)) { loadAllCvars(this); }
     METHOD(XonoticDamageTextSettings, fill, void(entity this))
     INIT(XonoticDamageTextSettings) { this.configureDialog(this); }
     METHOD(XonoticDamageTextSettings, showNotify, void(entity this)) { loadAllCvars(this); }
     METHOD(XonoticDamageTextSettings, fill, void(entity this))

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qh b/qcsrc/common/mutators/mutator/nades/nades.qh
index 2f48d9579cba95cfb8272464fc3a8df0f54433f2..a7eed65d33aceb29f20ee28d94228ad3eb2a4331 100644 (file)
--- a/qcsrc/common/mutators/mutator/nades/nades.qh
+++ b/qcsrc/common/mutators/mutator/nades/nades.qh
@@ -28,12 +28,12 @@ REGISTRY_CHECK(Nades)
 #define REGISTER_NADE(id) REGISTER(Nades, NADE_TYPE, id, m_id, NEW(Nade))
 
 CLASS(Nade, Object)
 #define REGISTER_NADE(id) REGISTER(Nades, NADE_TYPE, id, m_id, NEW(Nade))
 
 CLASS(Nade, Object)

-    ATTRIB(Nade, m_id, int, 0)
-    ATTRIB(Nade, m_color, vector, '0 0 0')
-    ATTRIB(Nade, m_name, string, _("Grenade"))
-    ATTRIB(Nade, m_icon, string, "nade_normal")
-    ATTRIBARRAY(Nade, m_projectile, int, 2)
-    ATTRIBARRAY(Nade, m_trail, entity, 2)
+    ATTRIB(Nade, m_id, int, 0);
+    ATTRIB(Nade, m_color, vector, '0 0 0');
+    ATTRIB(Nade, m_name, string, _("Grenade"));
+    ATTRIB(Nade, m_icon, string, "nade_normal");
+    ATTRIBARRAY(Nade, m_projectile, int, 2);
+    ATTRIBARRAY(Nade, m_trail, entity, 2);

     METHOD(Nade, display, void(entity this, void(string name, string icon) returns)) {
         returns(this.m_name, sprintf("/gfx/hud/%s/%s", cvar_string("menu_skin"), this.m_icon));
     }
     METHOD(Nade, display, void(entity this, void(string name, string icon) returns)) {
         returns(this.m_name, sprintf("/gfx/hud/%s/%s", cvar_string("menu_skin"), this.m_icon));
     }

diff --git a/qcsrc/common/mutators/mutator/overkill/hmg.qc b/qcsrc/common/mutators/mutator/overkill/hmg.qc
index 6fbc485b156ec28a0407ab903b9ebdec02240099..1512992c250f1e75b508fc0e3eb62ea07afdef59 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/hmg.qc
+++ b/qcsrc/common/mutators/mutator/overkill/hmg.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(HeavyMachineGun, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(HeavyMachineGun, Weapon)

-/* ammotype  */ ATTRIB(HeavyMachineGun, ammo_field, .int, ammo_nails)
-/* impulse   */ ATTRIB(HeavyMachineGun, impulse, int, 3)
+/* ammotype  */ ATTRIB(HeavyMachineGun, ammo_field, .int, ammo_nails);
+/* impulse   */ ATTRIB(HeavyMachineGun, impulse, int, 3);

 /* flags     */ ATTRIB(HeavyMachineGun, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_SUPERWEAPON);
 /* rating    */ ATTRIB(HeavyMachineGun, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(HeavyMachineGun, wpcolor, vector, '0.5 0.5 0');
 /* flags     */ ATTRIB(HeavyMachineGun, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_FLAG_SUPERWEAPON);
 /* rating    */ ATTRIB(HeavyMachineGun, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(HeavyMachineGun, wpcolor, vector, '0.5 0.5 0');

diff --git a/qcsrc/common/mutators/mutator/overkill/rpc.qc b/qcsrc/common/mutators/mutator/overkill/rpc.qc
index 62e997b6390f2dbc0f6606c82e4b433d423c45f6..f9be2ad9f58c4dd41e660e8e775954cfad0c8777 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/rpc.qc
+++ b/qcsrc/common/mutators/mutator/overkill/rpc.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(RocketPropelledChainsaw, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(RocketPropelledChainsaw, Weapon)

-/* ammotype  */ ATTRIB(RocketPropelledChainsaw, ammo_field, .int, ammo_rockets)
-/* impulse   */ ATTRIB(RocketPropelledChainsaw, impulse, int, 7)
+/* ammotype  */ ATTRIB(RocketPropelledChainsaw, ammo_field, .int, ammo_rockets);
+/* impulse   */ ATTRIB(RocketPropelledChainsaw, impulse, int, 7);

 /* flags     */ ATTRIB(RocketPropelledChainsaw, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH | WEP_FLAG_SUPERWEAPON);
 /* rating    */ ATTRIB(RocketPropelledChainsaw, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(RocketPropelledChainsaw, wpcolor, vector, '0.5 0.5 0');
 /* flags     */ ATTRIB(RocketPropelledChainsaw, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_HIDDEN | WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH | WEP_FLAG_SUPERWEAPON);
 /* rating    */ ATTRIB(RocketPropelledChainsaw, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(RocketPropelledChainsaw, wpcolor, vector, '0.5 0.5 0');

diff --git a/qcsrc/common/mutators/mutator/waypoints/all.qh b/qcsrc/common/mutators/mutator/waypoints/all.qh
index 2b28784b7cdb284e24ed71fa300f3ebf0b24c701..4645130551a3c1f4b6be52fb83771a790ee0de8f 100644 (file)
--- a/qcsrc/common/mutators/mutator/waypoints/all.qh
+++ b/qcsrc/common/mutators/mutator/waypoints/all.qh
@@ -12,11 +12,11 @@ REGISTRY_CHECK(Waypoints)
 #define REGISTER_WAYPOINT_(id, init) REGISTER(Waypoints, WP, id, m_id, init)
 
 CLASS(Waypoint, Object)
 #define REGISTER_WAYPOINT_(id, init) REGISTER(Waypoints, WP, id, m_id, init)
 
 CLASS(Waypoint, Object)

-    ATTRIB(Waypoint, m_id, int, 0)
-    ATTRIB(Waypoint, netname, string, string_null)
-    ATTRIB(Waypoint, m_name, string, string_null)
-    ATTRIB(Waypoint, m_color, vector, '1 1 1')
-    ATTRIB(Waypoint, m_blink, int, 1)
+    ATTRIB(Waypoint, m_id, int, 0);
+    ATTRIB(Waypoint, netname, string);
+    ATTRIB(Waypoint, m_name, string);
+    ATTRIB(Waypoint, m_color, vector, '1 1 1');
+    ATTRIB(Waypoint, m_blink, int, 1);

     CONSTRUCTOR(Waypoint, string _netname, string _name, vector _color, int _blink) {
         CONSTRUCT(Waypoint);
         this.netname = _netname;
     CONSTRUCTOR(Waypoint, string _netname, string _name, vector _color, int _blink) {
         CONSTRUCT(Waypoint);
         this.netname = _netname;

diff --git a/qcsrc/common/sounds/sound.qh b/qcsrc/common/sounds/sound.qh
index a8aa94edfe1f2b375103e9323e708969e4f4db9b..8c4aecbda029829c753e9b1641ceeb490cc04259 100644 (file)
--- a/qcsrc/common/sounds/sound.qh
+++ b/qcsrc/common/sounds/sound.qh
@@ -93,8 +93,8 @@ const float VOL_MUFFLED = 0.35;
        } MACRO_END
 
 CLASS(Sound, Object)
        } MACRO_END
 
 CLASS(Sound, Object)

-       ATTRIB(Sound, m_id, int, 0)
-       ATTRIB(Sound, sound_str, string(), func_null)
+       ATTRIB(Sound, m_id, int, 0);
+       ATTRIB(Sound, sound_str, string());

        CONSTRUCTOR(Sound, string() path)
        {
                CONSTRUCT(Sound);
        CONSTRUCTOR(Sound, string() path)
        {
                CONSTRUCT(Sound);

diff --git a/qcsrc/common/state.qh b/qcsrc/common/state.qh
index 110df1c575840421fb05a47ebb66cc16c89f8efa..94b9bc325f26288ebe8ccc8ff8cf67756366c334 100644 (file)
--- a/qcsrc/common/state.qh
+++ b/qcsrc/common/state.qh
@@ -6,15 +6,15 @@
  * Server: instance per client, clients decoupled from players
  */
 CLASS(PlayerState, Object)
  * Server: instance per client, clients decoupled from players
  */
 CLASS(PlayerState, Object)

-       ATTRIB(PlayerState, m_client, entity, NULL)
+       ATTRIB(PlayerState, m_client, entity);

        CONSTRUCTOR(PlayerState, entity client)
        {
                CONSTRUCT(PlayerState);
                this.m_client = client;
        }
        CONSTRUCTOR(PlayerState, entity client)
        {
                CONSTRUCT(PlayerState);
                this.m_client = client;
        }

-       ATTRIB(PlayerState, m_switchingweapon, Weapon, Weapons_from(-1))
-       ATTRIB(PlayerState, m_switchweapon, Weapon, Weapons_from(-1))
-       ATTRIB(PlayerState, m_weapon, Weapon, Weapons_from(-1))
+       ATTRIB(PlayerState, m_switchingweapon, Weapon, Weapons_from(-1));
+       ATTRIB(PlayerState, m_switchweapon, Weapon, Weapons_from(-1));
+       ATTRIB(PlayerState, m_weapon, Weapon, Weapons_from(-1));

        METHOD(PlayerState, ps_push, void(PlayerState this, entity cl))
        {
            TC(PlayerState, this);
        METHOD(PlayerState, ps_push, void(PlayerState this, entity cl))
        {
            TC(PlayerState, this);


@@ -37,7 +37,7 @@ void PlayerState_detach(entity this);
  * Server: instance per client
  */
 CLASS(ClientState, Object)
  * Server: instance per client
  */
 CLASS(ClientState, Object)

-       ATTRIB(ClientState, m_client, entity, NULL)
+       ATTRIB(ClientState, m_client, entity);

        CONSTRUCTOR(ClientState, entity client)
        {
                CONSTRUCT(ClientState);
        CONSTRUCTOR(ClientState, entity client)
        {
                CONSTRUCT(ClientState);

diff --git a/qcsrc/common/turrets/turret.qh b/qcsrc/common/turrets/turret.qh
index dc84acc7401b7457508fcb85429f696204c595d6..649fd51ae697eb4454871b8aa063cb1612f49419 100644 (file)
--- a/qcsrc/common/turrets/turret.qh
+++ b/qcsrc/common/turrets/turret.qh
@@ -3,24 +3,24 @@
 #include <common/weapons/all.qh>
 
 CLASS(Turret, Object)
 #include <common/weapons/all.qh>
 
 CLASS(Turret, Object)

-    ATTRIB(Turret, m_id, int, 0)
+    ATTRIB(Turret, m_id, int, 0);

 
     /** short name */
 
     /** short name */

-    ATTRIB(Turret, netname, string, string_null)
+    ATTRIB(Turret, netname, string);

     /** human readable name */
     /** human readable name */

-    ATTRIB(Turret, turret_name, string, _("Turret"))
+    ATTRIB(Turret, turret_name, string, _("Turret"));

     /** currently a copy of the model */
     /** currently a copy of the model */

-    ATTRIB(Turret, mdl, string, string_null)
+    ATTRIB(Turret, mdl, string);

     /** full name of model */
     /** full name of model */

-    ATTRIB(Turret, model, string, string_null)
+    ATTRIB(Turret, model, string);

     /** full name of tur_head model */
     /** full name of tur_head model */

-    ATTRIB(Turret, head_model, string, string_null)
+    ATTRIB(Turret, head_model, string);

 
 

-    ATTRIB(Turret, spawnflags, int, 0)
+    ATTRIB(Turret, spawnflags, int, 0);

     /** turret hitbox size */
     /** turret hitbox size */

-    ATTRIB(Turret, mins, vector, '-0 -0 -0')
+    ATTRIB(Turret, mins, vector, '-0 -0 -0');

     /** turret hitbox size */
     /** turret hitbox size */

-    ATTRIB(Turret, maxs, vector, '0 0 0')
+    ATTRIB(Turret, maxs, vector, '0 0 0');

 
     METHOD(Turret, display, void(Turret this, void(string name, string icon) returns)) {
         returns(this.turret_name, string_null);
 
     METHOD(Turret, display, void(Turret this, void(string name, string icon) returns)) {
         returns(this.turret_name, string_null);


@@ -41,7 +41,7 @@ CLASS(Turret, Object)
     METHOD(Turret, tr_precache, void(Turret this)) {
 
     }
     METHOD(Turret, tr_precache, void(Turret this)) {
 
     }

-    ATTRIB(Turret, m_weapon, Weapon, WEP_Null)
+    ATTRIB(Turret, m_weapon, Weapon);

 #ifdef SVQC
     /** (SERVER) called when turret attacks */
     METHOD(Turret, tr_attack, void(Turret this, entity it)) {
 #ifdef SVQC
     /** (SERVER) called when turret attacks */
     METHOD(Turret, tr_attack, void(Turret this, entity it)) {

diff --git a/qcsrc/common/vehicles/vehicle.qh b/qcsrc/common/vehicles/vehicle.qh
index 1578e0a7d549832e8aa33f548dabd213c49b50d9..cb4225a27df3030664b3b0e624de795433f1be23 100644 (file)
--- a/qcsrc/common/vehicles/vehicle.qh
+++ b/qcsrc/common/vehicles/vehicle.qh
@@ -1,39 +1,39 @@
 #pragma once
 
 CLASS(Vehicle, Object)
 #pragma once
 
 CLASS(Vehicle, Object)

-    ATTRIB(Vehicle, vehicleid, int, 0)
+    ATTRIB(Vehicle, vehicleid, int, 0);

     /** hud icon */
     /** hud icon */

-    ATTRIB(Vehicle, m_icon, string, string_null)
+    ATTRIB(Vehicle, m_icon, string);

     /** short name */
     /** short name */

-    ATTRIB(Vehicle, netname, string, "")
+    ATTRIB(Vehicle, netname, string, "");

     /** human readable name */
     /** human readable name */

-    ATTRIB(Vehicle, vehicle_name, string, "Vehicle")
+    ATTRIB(Vehicle, vehicle_name, string, "Vehicle");

     /** full name of model */
     /** full name of model */

-    ATTRIB(Vehicle, model, string, "")
+    ATTRIB(Vehicle, model, string, "");

     /** currently a copy of the model */
     /** currently a copy of the model */

-    ATTRIB(Vehicle, mdl, string, "")
+    ATTRIB(Vehicle, mdl, string, "");

     /** full name of tur_head model */
     /** full name of tur_head model */

-    ATTRIB(Vehicle, head_model, string, "")
+    ATTRIB(Vehicle, head_model, string, "");

     /** cockpit model */
     /** cockpit model */

-    ATTRIB(Vehicle, hud_model, string, "")
+    ATTRIB(Vehicle, hud_model, string, "");

     /** tur_head model tag */
     /** tur_head model tag */

-    ATTRIB(Vehicle, tag_head, string, string_null)
+    ATTRIB(Vehicle, tag_head, string);

     /** hud model tag */
     /** hud model tag */

-    ATTRIB(Vehicle, tag_hud, string, string_null)
+    ATTRIB(Vehicle, tag_hud, string);

     /** cockpit model tag */
     /** cockpit model tag */

-    ATTRIB(Vehicle, tag_view, string, string_null)
+    ATTRIB(Vehicle, tag_view, string);

     /** player physics mod */
     /** player physics mod */

-    ATTRIB(Vehicle, PlayerPhysplug, bool(entity,float), func_null)
+    ATTRIB(Vehicle, PlayerPhysplug, bool(entity,float));

     /**  */
     /**  */

-    ATTRIB(Vehicle, spawnflags, int, 0)
+    ATTRIB(Vehicle, spawnflags, int, 0);

     /** vehicle hitbox size */
     /** vehicle hitbox size */

-    ATTRIB(Vehicle, mins, vector, '-0 -0 -0')
+    ATTRIB(Vehicle, mins, vector, '-0 -0 -0');

     /** vehicle hitbox size */
     /** vehicle hitbox size */

-    ATTRIB(Vehicle, maxs, vector, '0 0 0')
+    ATTRIB(Vehicle, maxs, vector, '0 0 0');

     /** vehicle 3rd person view offset */
     /** vehicle 3rd person view offset */

-    ATTRIB(Vehicle, view_ofs, vector, '0 0 0')
+    ATTRIB(Vehicle, view_ofs, vector, '0 0 0');

     /** vehicle 3rd person view distance */
     /** vehicle 3rd person view distance */

-    ATTRIB(Vehicle, height, float, 0)
+    ATTRIB(Vehicle, height, float, 0);

 
     /** (BOTH) setup vehicle data */
     METHOD(Vehicle, vr_setup, void(Vehicle this, entity instance)) { }
 
     /** (BOTH) setup vehicle data */
     METHOD(Vehicle, vr_setup, void(Vehicle this, entity instance)) { }

diff --git a/qcsrc/common/weapons/weapon.qh b/qcsrc/common/weapons/weapon.qh
index 9465d5dcba6b70c5760cf023509650fa9a41840d..a08be2e61d5391c406668e6f5039146ba4748518 100644 (file)
--- a/qcsrc/common/weapons/weapon.qh
+++ b/qcsrc/common/weapons/weapon.qh
@@ -54,7 +54,7 @@ const int WS_READY  = 4;
 
 /** fields which are explicitly/manually set are marked with "M", fields set automatically are marked with "A" */
 CLASS(Weapon, Object)
 
 /** fields which are explicitly/manually set are marked with "M", fields set automatically are marked with "A" */
 CLASS(Weapon, Object)

-       ATTRIB(Weapon, m_id, int, 0)
+       ATTRIB(Weapon, m_id, int, 0);

     /** A: WEPSET_id : WEPSET_... */
     ATTRIB(Weapon, weapons, WepSet, '0 0 0');
     /** M: ammotype  : main ammo field */
     /** A: WEPSET_id : WEPSET_... */
     ATTRIB(Weapon, weapons, WepSet, '0 0 0');
     /** M: ammotype  : main ammo field */


@@ -70,7 +70,7 @@ CLASS(Weapon, Object)
     /** M: modelname : name of model (without g_ v_ or h_ prefixes) */
     ATTRIB(Weapon, mdl, string, "");
     /** M: model MDL_id_ITEM */
     /** M: modelname : name of model (without g_ v_ or h_ prefixes) */
     ATTRIB(Weapon, mdl, string, "");
     /** M: model MDL_id_ITEM */

-    ATTRIB(Weapon, m_model, entity, NULL);
+    ATTRIB(Weapon, m_model, entity);

     /** M: crosshair : per-weapon crosshair: "CrosshairImage Size" */
     ATTRIB(Weapon, w_crosshair, string, "gfx/crosshair1");
     /** A: crosshair : per-weapon crosshair size (argument two of "crosshair" field) */
     /** M: crosshair : per-weapon crosshair: "CrosshairImage Size" */
     ATTRIB(Weapon, w_crosshair, string, "gfx/crosshair1");
     /** A: crosshair : per-weapon crosshair size (argument two of "crosshair" field) */


@@ -82,7 +82,7 @@ CLASS(Weapon, Object)
     /** M: wepname   : human readable name */
     ATTRIB(Weapon, m_name, string, "AOL CD Thrower");
 
     /** M: wepname   : human readable name */
     ATTRIB(Weapon, m_name, string, "AOL CD Thrower");
 

-    ATTRIB(Weapon, m_pickup, entity, NULL);
+    ATTRIB(Weapon, m_pickup, entity);

 
     /** (SERVER) setup weapon data */
     METHOD(Weapon, wr_setup, void(Weapon this, entity actor)) {}
 
     /** (SERVER) setup weapon data */
     METHOD(Weapon, wr_setup, void(Weapon this, entity actor)) {}


@@ -132,15 +132,15 @@ ENDCLASS(Weapon)
 
 #include <common/items/all.qh>
 CLASS(WeaponPickup, Pickup)
 
 #include <common/items/all.qh>
 CLASS(WeaponPickup, Pickup)

-    ATTRIB(WeaponPickup, m_weapon, Weapon, NULL)
-    ATTRIB(WeaponPickup, m_name, string, string_null)
+    ATTRIB(WeaponPickup, m_weapon, Weapon);
+    ATTRIB(WeaponPickup, m_name, string);

 #ifndef MENUQC
 #ifndef MENUQC

-    ATTRIB(WeaponPickup, m_sound, Sound, SND_WEAPONPICKUP)
+    ATTRIB(WeaponPickup, m_sound, Sound, SND_WEAPONPICKUP);

 #endif
 #ifdef SVQC
 #endif
 #ifdef SVQC

-    ATTRIB(WeaponPickup, m_itemflags, int, FL_WEAPON)
+    ATTRIB(WeaponPickup, m_itemflags, int, FL_WEAPON);

     float weapon_pickupevalfunc(entity player, entity item);
     float weapon_pickupevalfunc(entity player, entity item);

-    ATTRIB(WeaponPickup, m_pickupevalfunc, float(entity player, entity item), weapon_pickupevalfunc)
+    ATTRIB(WeaponPickup, m_pickupevalfunc, float(entity player, entity item), weapon_pickupevalfunc);

 #endif
     CONSTRUCTOR(WeaponPickup, Weapon w) {
         CONSTRUCT(WeaponPickup);
 #endif
     CONSTRUCTOR(WeaponPickup, Weapon w) {
         CONSTRUCT(WeaponPickup);

diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc
index d606567a111d129bec916a82ff6fd67ce2ca371c..c0d85831ae730be7dc9c9981d9f8b86150286bc5 100644 (file)
--- a/qcsrc/common/weapons/weapon/arc.qc
+++ b/qcsrc/common/weapons/weapon/arc.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(Arc, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(Arc, Weapon)

-/* ammotype  */ ATTRIB(Arc, ammo_field, .int, ammo_cells)
-/* impulse   */ ATTRIB(Arc, impulse, int, 3)
+/* ammotype  */ ATTRIB(Arc, ammo_field, .int, ammo_cells);
+/* impulse   */ ATTRIB(Arc, impulse, int, 3);

 /* flags     */ ATTRIB(Arc, spawnflags, int, WEP_FLAG_NORMAL);
 /* rating    */ ATTRIB(Arc, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(Arc, wpcolor, vector, '1 1 1');
 /* flags     */ ATTRIB(Arc, spawnflags, int, WEP_FLAG_NORMAL);
 /* rating    */ ATTRIB(Arc, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(Arc, wpcolor, vector, '1 1 1');

diff --git a/qcsrc/common/weapons/weapon/blaster.qc b/qcsrc/common/weapons/weapon/blaster.qc
index d5387f4bd1ebb06467508665ffefc027a7fdbb2a..791b574817cfc1d6c8daa56c17889ac09057f33f 100644 (file)
--- a/qcsrc/common/weapons/weapon/blaster.qc
+++ b/qcsrc/common/weapons/weapon/blaster.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(Blaster, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(Blaster, Weapon)

-/* ammotype  */ //ATTRIB(Blaster, ammo_field, .int, ammo_none)
-/* impulse   */ ATTRIB(Blaster, impulse, int, 1)
+/* ammotype  */ //ATTRIB(Blaster, ammo_field, .int, ammo_none);
+/* impulse   */ ATTRIB(Blaster, impulse, int, 1);

 /* flags     */ ATTRIB(Blaster, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Blaster, bot_pickupbasevalue, float, 0);
 /* color     */ ATTRIB(Blaster, wpcolor, vector, '1 0.5 0.5');
 /* flags     */ ATTRIB(Blaster, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Blaster, bot_pickupbasevalue, float, 0);
 /* color     */ ATTRIB(Blaster, wpcolor, vector, '1 0.5 0.5');

diff --git a/qcsrc/common/weapons/weapon/crylink.qc b/qcsrc/common/weapons/weapon/crylink.qc
index 1b192881e14c73b2470997e2e1a8582ea580d98d..8865dbd02f1c253f87c902dfec48922aa4611370 100644 (file)
--- a/qcsrc/common/weapons/weapon/crylink.qc
+++ b/qcsrc/common/weapons/weapon/crylink.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(Crylink, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(Crylink, Weapon)

-/* ammotype  */ ATTRIB(Crylink, ammo_field, .int, ammo_cells)
-/* impulse   */ ATTRIB(Crylink, impulse, int, 6)
+/* ammotype  */ ATTRIB(Crylink, ammo_field, .int, ammo_cells);
+/* impulse   */ ATTRIB(Crylink, impulse, int, 6);

 /* flags     */ ATTRIB(Crylink, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Crylink, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Crylink, wpcolor, vector, '1 0.5 1');
 /* flags     */ ATTRIB(Crylink, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Crylink, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Crylink, wpcolor, vector, '1 0.5 1');

diff --git a/qcsrc/common/weapons/weapon/devastator.qc b/qcsrc/common/weapons/weapon/devastator.qc
index d834bc4e3b437ae5e2a627903647d37125047c9d..e02a474c2d43e817600595e22ae3725060020db6 100644 (file)
--- a/qcsrc/common/weapons/weapon/devastator.qc
+++ b/qcsrc/common/weapons/weapon/devastator.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(Devastator, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(Devastator, Weapon)

-/* ammotype  */ ATTRIB(Devastator, ammo_field, .int, ammo_rockets)
-/* impulse   */ ATTRIB(Devastator, impulse, int, 9)
+/* ammotype  */ ATTRIB(Devastator, ammo_field, .int, ammo_rockets);
+/* impulse   */ ATTRIB(Devastator, impulse, int, 9);

 /* flags     */ ATTRIB(Devastator, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Devastator, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(Devastator, wpcolor, vector, '1 1 0');
 /* flags     */ ATTRIB(Devastator, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Devastator, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(Devastator, wpcolor, vector, '1 1 0');

diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc
index c5da549533bf5c3eb7870dfc3b9c326799b42453..2c74b3b451477c364232467a1792826c027cf994 100644 (file)
--- a/qcsrc/common/weapons/weapon/electro.qc
+++ b/qcsrc/common/weapons/weapon/electro.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(Electro, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(Electro, Weapon)

-/* ammotype  */ ATTRIB(Electro, ammo_field, .int, ammo_cells)
-/* impulse   */ ATTRIB(Electro, impulse, int, 5)
+/* ammotype  */ ATTRIB(Electro, ammo_field, .int, ammo_cells);
+/* impulse   */ ATTRIB(Electro, impulse, int, 5);

 /* flags     */ ATTRIB(Electro, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Electro, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Electro, wpcolor, vector, '0 0.5 1');
 /* flags     */ ATTRIB(Electro, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Electro, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Electro, wpcolor, vector, '0 0.5 1');

diff --git a/qcsrc/common/weapons/weapon/fireball.qc b/qcsrc/common/weapons/weapon/fireball.qc
index 8c671444343e8fcf511343e7c91fb8f7900ddc92..8d17a247d4c36c8408473c8c7b595e96c168ca7b 100644 (file)
--- a/qcsrc/common/weapons/weapon/fireball.qc
+++ b/qcsrc/common/weapons/weapon/fireball.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(Fireball, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(Fireball, Weapon)

-/* ammotype  */ //ATTRIB(Fireball, ammo_field, .int, ammo_none)
-/* impulse   */ ATTRIB(Fireball, impulse, int, 9)
+/* ammotype  */ //ATTRIB(Fireball, ammo_field, .int, ammo_none);
+/* impulse   */ ATTRIB(Fireball, impulse, int, 9);

 /* flags     */ ATTRIB(Fireball, spawnflags, int, WEP_FLAG_SUPERWEAPON | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Fireball, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Fireball, wpcolor, vector, '1 0.5 0');
 /* flags     */ ATTRIB(Fireball, spawnflags, int, WEP_FLAG_SUPERWEAPON | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Fireball, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Fireball, wpcolor, vector, '1 0.5 0');

diff --git a/qcsrc/common/weapons/weapon/hagar.qc b/qcsrc/common/weapons/weapon/hagar.qc
index 8fb7fb253260955bf41ea93b55fa8d3e4dce9293..c83203272d8c935c1408dbeb087a2972b96c9f59 100644 (file)
--- a/qcsrc/common/weapons/weapon/hagar.qc
+++ b/qcsrc/common/weapons/weapon/hagar.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(Hagar, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(Hagar, Weapon)

-/* ammotype  */ ATTRIB(Hagar, ammo_field, .int, ammo_rockets)
-/* impulse   */ ATTRIB(Hagar, impulse, int, 8)
+/* ammotype  */ ATTRIB(Hagar, ammo_field, .int, ammo_rockets);
+/* impulse   */ ATTRIB(Hagar, impulse, int, 8);

 /* flags     */ ATTRIB(Hagar, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Hagar, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Hagar, wpcolor, vector, '1 1 0.5');
 /* flags     */ ATTRIB(Hagar, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Hagar, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Hagar, wpcolor, vector, '1 1 0.5');

diff --git a/qcsrc/common/weapons/weapon/hlac.qc b/qcsrc/common/weapons/weapon/hlac.qc
index 5d3463df93f9f27e1c3c20ecaca64c835883c35e..b545f6ce1ea7d4a1cf52d9d8c55d7ce62d6995cd 100644 (file)
--- a/qcsrc/common/weapons/weapon/hlac.qc
+++ b/qcsrc/common/weapons/weapon/hlac.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(HLAC, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(HLAC, Weapon)

-/* ammotype  */ ATTRIB(HLAC, ammo_field, .int, ammo_cells)
-/* impulse   */ ATTRIB(HLAC, impulse, int, 6)
+/* ammotype  */ ATTRIB(HLAC, ammo_field, .int, ammo_cells);
+/* impulse   */ ATTRIB(HLAC, impulse, int, 6);

 /* flags     */ ATTRIB(HLAC, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(HLAC, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(HLAC, wpcolor, vector, '0 1 0');
 /* flags     */ ATTRIB(HLAC, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(HLAC, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(HLAC, wpcolor, vector, '0 1 0');

diff --git a/qcsrc/common/weapons/weapon/hook.qc b/qcsrc/common/weapons/weapon/hook.qc
index b2b38e04c01ea542a913f01d9e133edab01cb125..5e8119e6a6a5bc74d2497fb019b9ac129d9c604f 100644 (file)
--- a/qcsrc/common/weapons/weapon/hook.qc
+++ b/qcsrc/common/weapons/weapon/hook.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(Hook, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(Hook, Weapon)

-/* ammotype  */ ATTRIB(Hook, ammo_field, .int, ammo_fuel)
-/* impulse   */ ATTRIB(Hook, impulse, int, 0)
+/* ammotype  */ ATTRIB(Hook, ammo_field, .int, ammo_fuel);
+/* impulse   */ ATTRIB(Hook, impulse, int, 0);

 /* flags     */ ATTRIB(Hook, spawnflags, int, WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Hook, bot_pickupbasevalue, float, 0);
 /* color     */ ATTRIB(Hook, wpcolor, vector, '0 0.5 0');
 /* flags     */ ATTRIB(Hook, spawnflags, int, WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Hook, bot_pickupbasevalue, float, 0);
 /* color     */ ATTRIB(Hook, wpcolor, vector, '0 0.5 0');


@@ -14,7 +14,7 @@ CLASS(Hook, Weapon)
 /* wepimg    */ ATTRIB(Hook, model2, string, "weaponhook");
 /* refname   */ ATTRIB(Hook, netname, string, "hook");
 /* wepname   */ ATTRIB(Hook, m_name, string, _("Grappling Hook"));
 /* wepimg    */ ATTRIB(Hook, model2, string, "weaponhook");
 /* refname   */ ATTRIB(Hook, netname, string, "hook");
 /* wepname   */ ATTRIB(Hook, m_name, string, _("Grappling Hook"));

-       ATTRIB(Hook, ammo_factor, float, 1)
+       ATTRIB(Hook, ammo_factor, float, 1);

 
 #define X(BEGIN, P, END, class, prefix) \
        BEGIN(class) \
 
 #define X(BEGIN, P, END, class, prefix) \
        BEGIN(class) \

diff --git a/qcsrc/common/weapons/weapon/machinegun.qc b/qcsrc/common/weapons/weapon/machinegun.qc
index bb74e7f7bf6d5d2417ea2252dc00b930ea694134..e3d1da2fea86db9d6ad4cff51cbe881a45e5273e 100644 (file)
--- a/qcsrc/common/weapons/weapon/machinegun.qc
+++ b/qcsrc/common/weapons/weapon/machinegun.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(MachineGun, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(MachineGun, Weapon)

-/* ammotype  */ ATTRIB(MachineGun, ammo_field, .int, ammo_nails)
-/* impulse   */ ATTRIB(MachineGun, impulse, int, 3)
+/* ammotype  */ ATTRIB(MachineGun, ammo_field, .int, ammo_nails);
+/* impulse   */ ATTRIB(MachineGun, impulse, int, 3);

 /* flags     */ ATTRIB(MachineGun, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN);
 /* rating    */ ATTRIB(MachineGun, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(MachineGun, wpcolor, vector, '1 1 0');
 /* flags     */ ATTRIB(MachineGun, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN);
 /* rating    */ ATTRIB(MachineGun, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(MachineGun, wpcolor, vector, '1 1 0');

diff --git a/qcsrc/common/weapons/weapon/minelayer.qc b/qcsrc/common/weapons/weapon/minelayer.qc
index f58a8f254927d10b1e4b596f5983b6e593c41c9b..3021f47454500838ebcdded983139fdeaea55f85 100644 (file)
--- a/qcsrc/common/weapons/weapon/minelayer.qc
+++ b/qcsrc/common/weapons/weapon/minelayer.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(MineLayer, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(MineLayer, Weapon)

-/* ammotype  */ ATTRIB(MineLayer, ammo_field, .int, ammo_rockets)
-/* impulse   */ ATTRIB(MineLayer, impulse, int, 4)
+/* ammotype  */ ATTRIB(MineLayer, ammo_field, .int, ammo_rockets);
+/* impulse   */ ATTRIB(MineLayer, impulse, int, 4);

 /* flags     */ ATTRIB(MineLayer, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(MineLayer, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(MineLayer, wpcolor, vector, '0.75 1 0');
 /* flags     */ ATTRIB(MineLayer, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(MineLayer, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(MineLayer, wpcolor, vector, '0.75 1 0');

diff --git a/qcsrc/common/weapons/weapon/mortar.qc b/qcsrc/common/weapons/weapon/mortar.qc
index 61fa98b4b5544df6233fd595973be9e35b957f9e..0a457f1a6be1730bfdef5642c529097d9cf16901 100644 (file)
--- a/qcsrc/common/weapons/weapon/mortar.qc
+++ b/qcsrc/common/weapons/weapon/mortar.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(Mortar, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(Mortar, Weapon)

-/* ammotype  */ ATTRIB(Mortar, ammo_field, .int, ammo_rockets)
-/* impulse   */ ATTRIB(Mortar, impulse, int, 4)
+/* ammotype  */ ATTRIB(Mortar, ammo_field, .int, ammo_rockets);
+/* impulse   */ ATTRIB(Mortar, impulse, int, 4);

 /* flags     */ ATTRIB(Mortar, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Mortar, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Mortar, wpcolor, vector, '1 0 0');
 /* flags     */ ATTRIB(Mortar, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Mortar, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Mortar, wpcolor, vector, '1 0 0');

diff --git a/qcsrc/common/weapons/weapon/porto.qc b/qcsrc/common/weapons/weapon/porto.qc
index fcb8952ef7bb1d0c9c96ea6780fc8c014148c954..b5bc00353e025e75f765023654ab13266ff55e5b 100644 (file)
--- a/qcsrc/common/weapons/weapon/porto.qc
+++ b/qcsrc/common/weapons/weapon/porto.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(PortoLaunch, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(PortoLaunch, Weapon)

-/* ammotype  */ ATTRIB(PortoLaunch, ammo_field, .int, ammo_none)
-/* impulse   */ ATTRIB(PortoLaunch, impulse, int, 0)
+/* ammotype  */ ATTRIB(PortoLaunch, ammo_field, .int, ammo_none);
+/* impulse   */ ATTRIB(PortoLaunch, impulse, int, 0);

 /* flags     */ ATTRIB(PortoLaunch, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_SUPERWEAPON);
 /* rating    */ ATTRIB(PortoLaunch, bot_pickupbasevalue, float, 0);
 /* color     */ ATTRIB(PortoLaunch, wpcolor, vector, '0.5 0.5 0.5');
 /* flags     */ ATTRIB(PortoLaunch, spawnflags, int, WEP_TYPE_OTHER | WEP_FLAG_SUPERWEAPON);
 /* rating    */ ATTRIB(PortoLaunch, bot_pickupbasevalue, float, 0);
 /* color     */ ATTRIB(PortoLaunch, wpcolor, vector, '0.5 0.5 0.5');

diff --git a/qcsrc/common/weapons/weapon/rifle.qc b/qcsrc/common/weapons/weapon/rifle.qc
index e8c89cb7579eb7e459b3462da2d2fd61dec3d5ff..1b6faee7860ca6a4f0296ae7481af98db06ae3a7 100644 (file)
--- a/qcsrc/common/weapons/weapon/rifle.qc
+++ b/qcsrc/common/weapons/weapon/rifle.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(Rifle, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(Rifle, Weapon)

-/* ammotype  */ ATTRIB(Rifle, ammo_field, .int, ammo_nails)
-/* impulse   */ ATTRIB(Rifle, impulse, int, 7)
+/* ammotype  */ ATTRIB(Rifle, ammo_field, .int, ammo_nails);
+/* impulse   */ ATTRIB(Rifle, impulse, int, 7);

 /* flags     */ ATTRIB(Rifle, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN);
 /* rating    */ ATTRIB(Rifle, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Rifle, wpcolor, vector, '0.5 1 0');
 /* flags     */ ATTRIB(Rifle, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN);
 /* rating    */ ATTRIB(Rifle, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Rifle, wpcolor, vector, '0.5 1 0');

diff --git a/qcsrc/common/weapons/weapon/seeker.qc b/qcsrc/common/weapons/weapon/seeker.qc
index a772283a2ed8f9a950c3eac11724498499f164a2..9f0a326ff2d53da99691044fb3bd42f273ed3430 100644 (file)
--- a/qcsrc/common/weapons/weapon/seeker.qc
+++ b/qcsrc/common/weapons/weapon/seeker.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(Seeker, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(Seeker, Weapon)

-/* ammotype  */ ATTRIB(Seeker, ammo_field, .int, ammo_rockets)
-/* impulse   */ ATTRIB(Seeker, impulse, int, 8)
+/* ammotype  */ ATTRIB(Seeker, ammo_field, .int, ammo_rockets);
+/* impulse   */ ATTRIB(Seeker, impulse, int, 8);

 /* flags     */ ATTRIB(Seeker, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Seeker, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(Seeker, wpcolor, vector, '0.5 1 0');
 /* flags     */ ATTRIB(Seeker, spawnflags, int, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_RELOADABLE | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Seeker, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(Seeker, wpcolor, vector, '0.5 1 0');

diff --git a/qcsrc/common/weapons/weapon/shockwave.qc b/qcsrc/common/weapons/weapon/shockwave.qc
index af8fe79bb8bc88ac560562ed9e7b29d8c7d3f8b2..55652bb2326d9bc0004d7a00f6e5c41727334a0e 100644 (file)
--- a/qcsrc/common/weapons/weapon/shockwave.qc
+++ b/qcsrc/common/weapons/weapon/shockwave.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(Shockwave, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(Shockwave, Weapon)

-/* ammotype  */ //ATTRIB(Shockwave, ammo_field, .int, ammo_none)
-/* impulse   */ ATTRIB(Shockwave, impulse, int, 2)
+/* ammotype  */ //ATTRIB(Shockwave, ammo_field, .int, ammo_none);
+/* impulse   */ ATTRIB(Shockwave, impulse, int, 2);

 /* flags     */ ATTRIB(Shockwave, spawnflags, int, WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN | WEP_FLAG_CANCLIMB | WEP_TYPE_MELEE_SEC);
 /* rating    */ ATTRIB(Shockwave, bot_pickupbasevalue, float, BOT_PICKUP_RATING_LOW);
 /* color     */ ATTRIB(Shockwave, wpcolor, vector, '0.5 0.25 0');
 /* flags     */ ATTRIB(Shockwave, spawnflags, int, WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN | WEP_FLAG_CANCLIMB | WEP_TYPE_MELEE_SEC);
 /* rating    */ ATTRIB(Shockwave, bot_pickupbasevalue, float, BOT_PICKUP_RATING_LOW);
 /* color     */ ATTRIB(Shockwave, wpcolor, vector, '0.5 0.25 0');

diff --git a/qcsrc/common/weapons/weapon/shotgun.qc b/qcsrc/common/weapons/weapon/shotgun.qc
index f3677877ab3be0ca317517021487ae22c6517e29..9c7aff3acab2af395a02bbb10313b025628d6ec3 100644 (file)
--- a/qcsrc/common/weapons/weapon/shotgun.qc
+++ b/qcsrc/common/weapons/weapon/shotgun.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(Shotgun, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(Shotgun, Weapon)

-/* ammotype  */ ATTRIB(Shotgun, ammo_field, .int, ammo_shells)
-/* impulse   */ ATTRIB(Shotgun, impulse, int, 2)
+/* ammotype  */ ATTRIB(Shotgun, ammo_field, .int, ammo_shells);
+/* impulse   */ ATTRIB(Shotgun, impulse, int, 2);

 /* flags     */ ATTRIB(Shotgun, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_TYPE_MELEE_SEC);
 /* rating    */ ATTRIB(Shotgun, bot_pickupbasevalue, float, BOT_PICKUP_RATING_LOW);
 /* color     */ ATTRIB(Shotgun, wpcolor, vector, '0.5 0.25 0');
 /* flags     */ ATTRIB(Shotgun, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN | WEP_TYPE_MELEE_SEC);
 /* rating    */ ATTRIB(Shotgun, bot_pickupbasevalue, float, BOT_PICKUP_RATING_LOW);
 /* color     */ ATTRIB(Shotgun, wpcolor, vector, '0.5 0.25 0');

diff --git a/qcsrc/common/weapons/weapon/tuba.qc b/qcsrc/common/weapons/weapon/tuba.qc
index 036181ca412e8d93bc855bface3facbdc7c191d6..31d2bf7a6299fcf735df432d93fa931ee31caf0d 100644 (file)
--- a/qcsrc/common/weapons/weapon/tuba.qc
+++ b/qcsrc/common/weapons/weapon/tuba.qc
@@ -1,6 +1,6 @@
 #ifndef IMPLEMENTATION
 CLASS(Tuba, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(Tuba, Weapon)

-/* impulse   */ ATTRIB(Tuba, impulse, int, 1)
+/* impulse   */ ATTRIB(Tuba, impulse, int, 1);

 /* flags     */ ATTRIB(Tuba, spawnflags, int, WEP_FLAG_HIDDEN | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Tuba, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Tuba, wpcolor, vector, '0 1 0');
 /* flags     */ ATTRIB(Tuba, spawnflags, int, WEP_FLAG_HIDDEN | WEP_TYPE_SPLASH);
 /* rating    */ ATTRIB(Tuba, bot_pickupbasevalue, float, BOT_PICKUP_RATING_MID);
 /* color     */ ATTRIB(Tuba, wpcolor, vector, '0 1 0');

diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc
index df95007ae04f6f5e1124b0693c2f181cf1a3e4e6..8fa43c1d8c019e73f209a081a778f9c7950b0687 100644 (file)
--- a/qcsrc/common/weapons/weapon/vaporizer.qc
+++ b/qcsrc/common/weapons/weapon/vaporizer.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(Vaporizer, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(Vaporizer, Weapon)

-/* ammotype  */ ATTRIB(Vaporizer, ammo_field, .int, ammo_cells)
-/* impulse   */ ATTRIB(Vaporizer, impulse, int, 7)
+/* ammotype  */ ATTRIB(Vaporizer, ammo_field, .int, ammo_cells);
+/* impulse   */ ATTRIB(Vaporizer, impulse, int, 7);

 /* flags     */ ATTRIB(Vaporizer, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_FLAG_SUPERWEAPON | WEP_TYPE_HITSCAN);
 /* rating    */ ATTRIB(Vaporizer, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(Vaporizer, wpcolor, vector, '0.5 1 1');
 /* flags     */ ATTRIB(Vaporizer, spawnflags, int, WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_FLAG_SUPERWEAPON | WEP_TYPE_HITSCAN);
 /* rating    */ ATTRIB(Vaporizer, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(Vaporizer, wpcolor, vector, '0.5 1 1');

diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc
index 0c6b1f3c8a865b5ade50e8071c82c55dcc152652..0ca635b3ee32f1e21b8d996117c19bac39858ab8 100644 (file)
--- a/qcsrc/common/weapons/weapon/vortex.qc
+++ b/qcsrc/common/weapons/weapon/vortex.qc
@@ -1,7 +1,7 @@
 #ifndef IMPLEMENTATION
 CLASS(Vortex, Weapon)
 #ifndef IMPLEMENTATION
 CLASS(Vortex, Weapon)

-/* ammotype  */ ATTRIB(Vortex, ammo_field, .int, ammo_cells)
-/* impulse   */ ATTRIB(Vortex, impulse, int, 7)
+/* ammotype  */ ATTRIB(Vortex, ammo_field, .int, ammo_cells);
+/* impulse   */ ATTRIB(Vortex, impulse, int, 7);

 /* flags     */ ATTRIB(Vortex, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN);
 /* rating    */ ATTRIB(Vortex, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(Vortex, wpcolor, vector, '0.5 1 1');
 /* flags     */ ATTRIB(Vortex, spawnflags, int, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN);
 /* rating    */ ATTRIB(Vortex, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH);
 /* color     */ ATTRIB(Vortex, wpcolor, vector, '0.5 1 1');

diff --git a/qcsrc/lib/intrusivelist.qh b/qcsrc/lib/intrusivelist.qh
index de445934a74c0ac89e1740988d315a20a075c17c..2927a62fe667f9f65484186e7ac9b47c5163f62a 100644 (file)
--- a/qcsrc/lib/intrusivelist.qh
+++ b/qcsrc/lib/intrusivelist.qh
@@ -16,8 +16,8 @@ void IL_ENDFRAME();
  *   freed entities must be removed from the list
  */
 CLASS(IntrusiveList, Object)
  *   freed entities must be removed from the list
  */
 CLASS(IntrusiveList, Object)

-       ATTRIB(IntrusiveList, il_head, entity, NULL);
-       ATTRIB(IntrusiveList, il_tail, entity, NULL);
+       ATTRIB(IntrusiveList, il_head, entity);
+       ATTRIB(IntrusiveList, il_tail, entity);

        ATTRIB(IntrusiveList, il_nextfld, .entity, nil);
        ATTRIB(IntrusiveList, il_prevfld, .entity, nil);
        INIT(IntrusiveList) { IL_INIT(this); }
        ATTRIB(IntrusiveList, il_nextfld, .entity, nil);
        ATTRIB(IntrusiveList, il_prevfld, .entity, nil);
        INIT(IntrusiveList) { IL_INIT(this); }

diff --git a/qcsrc/lib/lazy.qh b/qcsrc/lib/lazy.qh
index ad30115a2e74c3fb00e25564cfe0e998816d42a9..62d04b32e909bb741b55a74f77c37f9bccfa084c 100644 (file)
--- a/qcsrc/lib/lazy.qh
+++ b/qcsrc/lib/lazy.qh
@@ -3,7 +3,7 @@
 #include "oo.qh"
 
 CLASS(Lazy, Object)
 #include "oo.qh"
 
 CLASS(Lazy, Object)

-       ATTRIB(Lazy, m_get, entity(), func_null);
+       ATTRIB(Lazy, m_get, entity());

        CONSTRUCTOR(Lazy, entity() _compute)
        {
                this.m_get = _compute;
        CONSTRUCTOR(Lazy, entity() _compute)
        {
                this.m_get = _compute;

diff --git a/qcsrc/lib/linkedlist.qh b/qcsrc/lib/linkedlist.qh
index c518de14132fd84890b66342d41d4a75c41c10f9..0dd430722f755218f5f796883a5dcf4317caf885 100644 (file)
--- a/qcsrc/lib/linkedlist.qh
+++ b/qcsrc/lib/linkedlist.qh
@@ -1,14 +1,14 @@
 #pragma once
 
 CLASS(LinkedListNode, Object)
 #pragma once
 
 CLASS(LinkedListNode, Object)

-       ATTRIB(LinkedListNode, ll_data, entity, NULL)
-       ATTRIB(LinkedListNode, ll_prev, LinkedListNode, NULL)
-       ATTRIB(LinkedListNode, ll_next, LinkedListNode, NULL)
+       ATTRIB(LinkedListNode, ll_data, entity);
+       ATTRIB(LinkedListNode, ll_prev, LinkedListNode);
+       ATTRIB(LinkedListNode, ll_next, LinkedListNode);

 ENDCLASS(LinkedListNode)
 
 CLASS(LinkedList, Object)
 ENDCLASS(LinkedListNode)
 
 CLASS(LinkedList, Object)

-       ATTRIB(LinkedList, ll_head, LinkedListNode, NULL);
-       ATTRIB(LinkedList, ll_tail, LinkedListNode, NULL);
+       ATTRIB(LinkedList, ll_head, LinkedListNode);
+       ATTRIB(LinkedList, ll_tail, LinkedListNode);

 ENDCLASS(LinkedList)
 
 #define LL_NEW() NEW(LinkedList)
 ENDCLASS(LinkedList)
 
 #define LL_NEW() NEW(LinkedList)

diff --git a/qcsrc/lib/oo.qh b/qcsrc/lib/oo.qh
index e3206dcf3ee799b584e85bf71457fbe44d20ee3e..7a7a72641a0601a1d857a0654631223d452275dd 100644 (file)
--- a/qcsrc/lib/oo.qh
+++ b/qcsrc/lib/oo.qh
@@ -227,13 +227,17 @@ STATIC_INIT(RegisterClasses)
     } \
        STATIC_METHOD(cname, dtorimpl, void(cname this))
 
     } \
        STATIC_METHOD(cname, dtorimpl, void(cname this))
 

-#define ATTRIB(cname, name, type, val)      \
-       class(cname).type name;                \
+#define ATTRIB(...) EVAL_ATTRIB(OVERLOAD_(ATTRIB, __VA_ARGS__))
+#define EVAL_ATTRIB(...) __VA_ARGS__
+#define ATTRIB_3(cname, name, type) INIT(cname) {} class(cname) .type name
+#define ATTRIB_4(cname, name, type, val) \
+       ATTRIB_3(cname, name, type); \

        INIT(cname) \
        { \
                noref bool strzone; /* Error on strzone() calls. */ \
                this.name = val; \
        INIT(cname) \
        { \
                noref bool strzone; /* Error on strzone() calls. */ \
                this.name = val; \

-       }
+       } \
+       ATTRIB_3(cname, name, type)

 
 #define STATIC_ATTRIB(cname, name, type, val) \
        type cname##_##name; \
 
 #define STATIC_ATTRIB(cname, name, type, val) \
        type cname##_##name; \


@@ -264,7 +268,7 @@ STATIC_INIT(RegisterClasses)
        }
 
 #define ATTRIBARRAY(cname, name, type, cnt) \
        }
 
 #define ATTRIBARRAY(cname, name, type, cnt) \

-       class(cname).type name[cnt];
+       class(cname) .type name[cnt]

 
 #define ENDCLASS(cname) \
        INIT(cname) \
 
 #define ENDCLASS(cname) \
        INIT(cname) \

diff --git a/qcsrc/lib/registry.qh b/qcsrc/lib/registry.qh
index bbe612309a1a86ef2a225ad7329c70f9c3fb299d..9d171e031ab4391090341737d675574a0154aca2 100644 (file)
--- a/qcsrc/lib/registry.qh
+++ b/qcsrc/lib/registry.qh
@@ -181,8 +181,8 @@ void Registry_send(string id, string hash);
 #define REGISTER_REGISTRY_2(id, str) \
        ACCUMULATE_FUNCTION(__static_init, Register##id) \
        CLASS(id##Registry, Object) \
 #define REGISTER_REGISTRY_2(id, str) \
        ACCUMULATE_FUNCTION(__static_init, Register##id) \
        CLASS(id##Registry, Object) \

-               ATTRIB(id##Registry, m_name, string, str) \
-               ATTRIB(id##Registry, REGISTRY_NEXT, entity, id##_first) \
+               ATTRIB(id##Registry, m_name, string, str); \
+               ATTRIB(id##Registry, REGISTRY_NEXT, entity, id##_first); \

                METHOD(id##Registry, m_reload, void()); \
        ENDCLASS(id##Registry) \
        REGISTER(Registries, REGISTRY, id, m_id, NEW(id##Registry)); \
                METHOD(id##Registry, m_reload, void()); \
        ENDCLASS(id##Registry) \
        REGISTER(Registries, REGISTRY, id, m_id, NEW(id##Registry)); \

diff --git a/qcsrc/menu/anim/animation.qh b/qcsrc/menu/anim/animation.qh
index 0427f322ae3884c451f0954ba3cafcc3b962660b..009feb577c00fbaa1454ed373845f7cd6998fedb 100644 (file)
--- a/qcsrc/menu/anim/animation.qh
+++ b/qcsrc/menu/anim/animation.qh
@@ -15,14 +15,14 @@ CLASS(Animation, Object)
        METHOD(Animation, resumeAnim, void(Animation this));
        METHOD(Animation, isFinished, float(Animation this));
        METHOD(Animation, finishAnim, void(Animation this));
        METHOD(Animation, resumeAnim, void(Animation this));
        METHOD(Animation, isFinished, float(Animation this));
        METHOD(Animation, finishAnim, void(Animation this));

-       ATTRIB(Animation, object, entity, NULL)
+       ATTRIB(Animation, object, entity);

        void setterDummy(Animation this, float) {}
        void setterDummy(Animation this, float) {}

-       ATTRIB(Animation, setter, void(Animation this, float), setterDummy)
-       ATTRIB(Animation, value, float, 0)
-       ATTRIB(Animation, startTime, float, 0)
-       ATTRIB(Animation, duration, float, 0)
-       ATTRIB(Animation, startValue, float, 0)
-       ATTRIB(Animation, delta, float, 0)
-       ATTRIB(Animation, stopped, float, false)
-       ATTRIB(Animation, finished, float, false)
+       ATTRIB(Animation, setter, void(Animation this, float), setterDummy);
+       ATTRIB(Animation, value, float, 0);
+       ATTRIB(Animation, startTime, float, 0);
+       ATTRIB(Animation, duration, float, 0);
+       ATTRIB(Animation, startValue, float, 0);
+       ATTRIB(Animation, delta, float, 0);
+       ATTRIB(Animation, stopped, float, false);
+       ATTRIB(Animation, finished, float, false);

 ENDCLASS(Animation)
 ENDCLASS(Animation)

diff --git a/qcsrc/menu/anim/animhost.qh b/qcsrc/menu/anim/animhost.qh
index 1292b7d8b4e25380f57edb8cd89b4ce1c287460d..85b03aecf35cf7ae93ee5050dde2efe3108cfd48 100644 (file)
--- a/qcsrc/menu/anim/animhost.qh
+++ b/qcsrc/menu/anim/animhost.qh
@@ -14,6 +14,6 @@ CLASS(AnimHost, Object)
        METHOD(AnimHost, finishAllAnim, void(entity));
        METHOD(AnimHost, finishObjAnim, void(entity, entity));
        METHOD(AnimHost, tickAll, void(entity));
        METHOD(AnimHost, finishAllAnim, void(entity));
        METHOD(AnimHost, finishObjAnim, void(entity, entity));
        METHOD(AnimHost, tickAll, void(entity));

-       ATTRIB(AnimHost, firstChild, entity, NULL)
-       ATTRIB(AnimHost, lastChild, entity, NULL)
+       ATTRIB(AnimHost, firstChild, entity);
+       ATTRIB(AnimHost, lastChild, entity);

 ENDCLASS(AnimHost)
 ENDCLASS(AnimHost)

diff --git a/qcsrc/menu/anim/easing.qh b/qcsrc/menu/anim/easing.qh
index 832a87c73bc070d069ab376e3e8e0832e3bcfcb9..bb2c0dbc0a6c39076ca516994aac715625763853 100644 (file)
--- a/qcsrc/menu/anim/easing.qh
+++ b/qcsrc/menu/anim/easing.qh
@@ -10,5 +10,5 @@ float easingQuadInOut(float, float, float, float);
 CLASS(Easing, Animation)
        METHOD(Easing, calcValue, float(entity, float, float, float, float));
        METHOD(Easing, setMath, void(entity, float(float, float, float, float)));
 CLASS(Easing, Animation)
        METHOD(Easing, calcValue, float(entity, float, float, float, float));
        METHOD(Easing, setMath, void(entity, float(float, float, float, float)));

-       ATTRIB(Easing, math, float(float, float, float, float), easingLinear)
+       ATTRIB(Easing, math, float(float, float, float, float), easingLinear);

 ENDCLASS(Easing)
 ENDCLASS(Easing)

diff --git a/qcsrc/menu/anim/keyframe.qh b/qcsrc/menu/anim/keyframe.qh
index d21db6920bb198be95815379f4a7adc61c98de7b..abf18de96fcc7598d9d8b100a8893c4a8f52a56b 100644 (file)
--- a/qcsrc/menu/anim/keyframe.qh
+++ b/qcsrc/menu/anim/keyframe.qh
@@ -5,9 +5,9 @@ CLASS(Keyframe, Animation)
        METHOD(Keyframe, addEasing, entity(entity, float, float, float(float, float, float, float)));
        METHOD(Keyframe, addAnim, void(entity, entity));
        METHOD(Keyframe, calcValue, float(entity, float, float, float, float));
        METHOD(Keyframe, addEasing, entity(entity, float, float, float(float, float, float, float)));
        METHOD(Keyframe, addAnim, void(entity, entity));
        METHOD(Keyframe, calcValue, float(entity, float, float, float, float));

-       ATTRIB(Keyframe, currentChild, entity, NULL)
-       ATTRIB(Keyframe, firstChild, entity, NULL)
-       ATTRIB(Keyframe, lastChild, entity, NULL)
+       ATTRIB(Keyframe, currentChild, entity);
+       ATTRIB(Keyframe, firstChild, entity);
+       ATTRIB(Keyframe, lastChild, entity);

 ENDCLASS(Keyframe)
 entity makeHostedKeyframe(entity, void(entity, float), float, float, float);
 entity makeKeyframe(entity, void(entity, float), float, float, float);
 ENDCLASS(Keyframe)
 entity makeHostedKeyframe(entity, void(entity, float), float, float, float);
 entity makeKeyframe(entity, void(entity, float), float, float, float);

diff --git a/qcsrc/menu/item.qh b/qcsrc/menu/item.qh
index 118a45426788a044479e882f2961a7ae0ede0605..00dae2ed37db4ae2eb84c01977b2a78917831ebb 100644 (file)
--- a/qcsrc/menu/item.qh
+++ b/qcsrc/menu/item.qh
@@ -19,12 +19,12 @@ CLASS(Item, Object)
        METHOD(Item, hideNotify, void(Item));
        METHOD(Item, toString, string(Item));
        METHOD(Item, destroy, void(Item));
        METHOD(Item, hideNotify, void(Item));
        METHOD(Item, toString, string(Item));
        METHOD(Item, destroy, void(Item));

-       ATTRIB(Item, focused, float, 0)
-       ATTRIB(Item, focusable, float, 0)
-       ATTRIB(Item, allowFocusSound, float, 0)
-       ATTRIB(Item, parent, entity, NULL)
-       ATTRIB(Item, preferredFocusPriority, float, 0)
-       ATTRIB(Item, origin, vector, '0 0 0')
-       ATTRIB(Item, size, vector, '0 0 0')
-       ATTRIB(Item, tooltip, string, string_null)
+       ATTRIB(Item, focused, float, 0);
+       ATTRIB(Item, focusable, float, 0);
+       ATTRIB(Item, allowFocusSound, float, 0);
+       ATTRIB(Item, parent, entity);
+       ATTRIB(Item, preferredFocusPriority, float, 0);
+       ATTRIB(Item, origin, vector, '0 0 0');
+       ATTRIB(Item, size, vector, '0 0 0');
+       ATTRIB(Item, tooltip, string);

 ENDCLASS(Item)
 ENDCLASS(Item)

diff --git a/qcsrc/menu/item/borderimage.qh b/qcsrc/menu/item/borderimage.qh
index c956d362d22827af30204d1c7f2e45d561512ea7..9db9360f8f08a2fd2236a5ef17e7dbbf0f3c4ec0 100644 (file)
--- a/qcsrc/menu/item/borderimage.qh
+++ b/qcsrc/menu/item/borderimage.qh
@@ -5,21 +5,21 @@ CLASS(BorderImage, Label)
        METHOD(BorderImage, configureBorderImage, void(entity, string, float, vector, string, float));
        METHOD(BorderImage, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(BorderImage, recalcPositionWithText, void(entity, string));
        METHOD(BorderImage, configureBorderImage, void(entity, string, float, vector, string, float));
        METHOD(BorderImage, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(BorderImage, recalcPositionWithText, void(entity, string));

-       ATTRIB(BorderImage, isBold, float, 1)
+       ATTRIB(BorderImage, isBold, float, 1);

        METHOD(BorderImage, draw, void(entity));
        METHOD(BorderImage, draw, void(entity));

-       ATTRIB(BorderImage, src, string, string_null)
-       ATTRIB(BorderImage, borderHeight, float, 0)
-       ATTRIB(BorderImage, borderVec, vector, '0 0 0')
-       ATTRIB(BorderImage, color, vector, '1 1 1')
-       ATTRIB(BorderImage, closeButton, entity, NULL)
-       ATTRIB(BorderImage, realFontSize_Nexposeed, vector, '0 0 0')
-       ATTRIB(BorderImage, realOrigin_Nexposeed, vector, '0 0 0')
-       ATTRIB(BorderImage, isNexposeeTitleBar, float, 0)
-       ATTRIB(BorderImage, zoomedOutTitleBarPosition, float, 0)
-       ATTRIB(BorderImage, zoomedOutTitleBar, float, 0)
-       ATTRIB(BorderImage, overrideRealOrigin, vector, '0 1 0')
-       ATTRIB(BorderImage, saveRelOrigin, vector, '0 0 0')
-       ATTRIB(BorderImage, saveRelSize, vector, '0 0 0')
+       ATTRIB(BorderImage, src, string);
+       ATTRIB(BorderImage, borderHeight, float, 0);
+       ATTRIB(BorderImage, borderVec, vector, '0 0 0');
+       ATTRIB(BorderImage, color, vector, '1 1 1');
+       ATTRIB(BorderImage, closeButton, entity);
+       ATTRIB(BorderImage, realFontSize_Nexposeed, vector, '0 0 0');
+       ATTRIB(BorderImage, realOrigin_Nexposeed, vector, '0 0 0');
+       ATTRIB(BorderImage, isNexposeeTitleBar, float, 0);
+       ATTRIB(BorderImage, zoomedOutTitleBarPosition, float, 0);
+       ATTRIB(BorderImage, zoomedOutTitleBar, float, 0);
+       ATTRIB(BorderImage, overrideRealOrigin, vector, '0 1 0');
+       ATTRIB(BorderImage, saveRelOrigin, vector, '0 0 0');
+       ATTRIB(BorderImage, saveRelSize, vector, '0 0 0');

 ENDCLASS(BorderImage)
 
 .vector colorC, colorF;
 ENDCLASS(BorderImage)
 
 .vector colorC, colorF;

diff --git a/qcsrc/menu/item/button.qh b/qcsrc/menu/item/button.qh
index 6fd2bc8882b032c00b924765c8cee27015bdbccb..1a164245c8f269368067b3b43c4ae6f92fd9066f 100644 (file)
--- a/qcsrc/menu/item/button.qh
+++ b/qcsrc/menu/item/button.qh
@@ -13,30 +13,30 @@ CLASS(Button, Label)
        METHOD(Button, mouseDrag, float(entity, vector));
        METHOD(Button, mouseRelease, float(entity, vector));
        METHOD(Button, playClickSound, void(entity));
        METHOD(Button, mouseDrag, float(entity, vector));
        METHOD(Button, mouseRelease, float(entity, vector));
        METHOD(Button, playClickSound, void(entity));

-       ATTRIB(Button, onClick, void(entity, entity), func_null)
-       ATTRIB(Button, onClickEntity, entity, NULL)
-       ATTRIB(Button, src, string, string_null)
-       ATTRIB(Button, srcSuffix, string, string_null)
-       ATTRIB(Button, src2, string, string_null) // is centered, same aspect, and stretched to label size
-       ATTRIB(Button, src2scale, float, 1)
-       ATTRIB(Button, srcMulti, float, 1)        // 0: button square left, text right; 1: button stretched, text over it
-       ATTRIB(Button, buttonLeftOfText, float, 0)
-       ATTRIB(Button, focusable, float, 1)
-       ATTRIB(Button, allowFocusSound, float, 1)
-       ATTRIB(Button, pressed, float, 0)
-       ATTRIB(Button, clickTime, float, 0)
-       ATTRIB(Button, applyButton, entity, NULL)
-       ATTRIB(Button, disableOnClick, bool, false)
-       ATTRIB(Button, disabled, float, 0)
-       ATTRIB(Button, disabledAlpha, float, 0.3)
-       ATTRIB(Button, forcePressed, float, 0)
-       ATTRIB(Button, color, vector, '1 1 1')
-       ATTRIB(Button, colorC, vector, '1 1 1')
-       ATTRIB(Button, colorF, vector, '1 1 1')
-       ATTRIB(Button, colorD, vector, '1 1 1')
-       ATTRIB(Button, color2, vector, '1 1 1')
-       ATTRIB(Button, alpha2, float, 1)
+       ATTRIB(Button, onClick, void(entity, entity));
+       ATTRIB(Button, onClickEntity, entity);
+       ATTRIB(Button, src, string);
+       ATTRIB(Button, srcSuffix, string);
+       ATTRIB(Button, src2, string); // is centered, same aspect, and stretched to label size
+       ATTRIB(Button, src2scale, float, 1);
+       ATTRIB(Button, srcMulti, float, 1);        // 0: button square left, text right; 1: button stretched, text over it
+       ATTRIB(Button, buttonLeftOfText, float, 0);
+       ATTRIB(Button, focusable, float, 1);
+       ATTRIB(Button, allowFocusSound, float, 1);
+       ATTRIB(Button, pressed, float, 0);
+       ATTRIB(Button, clickTime, float, 0);
+       ATTRIB(Button, applyButton, entity);
+       ATTRIB(Button, disableOnClick, bool, false);
+       ATTRIB(Button, disabled, float, 0);
+       ATTRIB(Button, disabledAlpha, float, 0.3);
+       ATTRIB(Button, forcePressed, float, 0);
+       ATTRIB(Button, color, vector, '1 1 1');
+       ATTRIB(Button, colorC, vector, '1 1 1');
+       ATTRIB(Button, colorF, vector, '1 1 1');
+       ATTRIB(Button, colorD, vector, '1 1 1');
+       ATTRIB(Button, color2, vector, '1 1 1');
+       ATTRIB(Button, alpha2, float, 1);

 
 

-       ATTRIB(Button, origin, vector, '0 0 0')
-       ATTRIB(Button, size, vector, '0 0 0')
+       ATTRIB(Button, origin, vector, '0 0 0');
+       ATTRIB(Button, size, vector, '0 0 0');

 ENDCLASS(Button)
 ENDCLASS(Button)

diff --git a/qcsrc/menu/item/checkbox.qh b/qcsrc/menu/item/checkbox.qh
index 32f6b0f5023a22eb89698851804093ce07956789..931e4f79c8f1c09f32270b9ae8aa1c5b2b23f12d 100644 (file)
--- a/qcsrc/menu/item/checkbox.qh
+++ b/qcsrc/menu/item/checkbox.qh
@@ -7,10 +7,10 @@ CLASS(CheckBox, Button)
        METHOD(CheckBox, playClickSound, void(entity));
        METHOD(CheckBox, toString, string(entity));
        METHOD(CheckBox, setChecked, void(entity, float));
        METHOD(CheckBox, playClickSound, void(entity));
        METHOD(CheckBox, toString, string(entity));
        METHOD(CheckBox, setChecked, void(entity, float));

-       ATTRIB(CheckBox, useDownAsChecked, float, 0)
-       ATTRIB(CheckBox, checked, float, 0)
+       ATTRIB(CheckBox, useDownAsChecked, float, 0);
+       ATTRIB(CheckBox, checked, float, 0);

     void CheckBox_Click(entity me, entity other);
     void CheckBox_Click(entity me, entity other);

-       ATTRIB(CheckBox, onClick, void(entity, entity), CheckBox_Click)
-       ATTRIB(CheckBox, srcMulti, float, 0)
-       ATTRIB(CheckBox, disabled, float, 0)
+       ATTRIB(CheckBox, onClick, void(entity, entity), CheckBox_Click);
+       ATTRIB(CheckBox, srcMulti, float, 0);
+       ATTRIB(CheckBox, disabled, float, 0);

 ENDCLASS(CheckBox)
 ENDCLASS(CheckBox)

diff --git a/qcsrc/menu/item/container.qh b/qcsrc/menu/item/container.qh
index dbb4cf2211c27f2b641c9d017e42fe353cfa512e..8273f5ddde38a43ec3e153d3a5f02247f452a775 100644 (file)
--- a/qcsrc/menu/item/container.qh
+++ b/qcsrc/menu/item/container.qh
@@ -25,12 +25,12 @@ CLASS(Container, Item)
        METHOD(Container, showNotify, void(entity));
        METHOD(Container, hideNotify, void(entity));
        METHOD(Container, preferredFocusedGrandChild, entity(entity));
        METHOD(Container, showNotify, void(entity));
        METHOD(Container, hideNotify, void(entity));
        METHOD(Container, preferredFocusedGrandChild, entity(entity));

-       ATTRIB(Container, focusable, float, 0)
-       ATTRIB(Container, firstChild, entity, NULL)
-       ATTRIB(Container, lastChild, entity, NULL)
-       ATTRIB(Container, focusedChild, entity, NULL)
-       ATTRIB(Container, savedFocus, entity, NULL)
-       ATTRIB(Container, shown, float, 0)
+       ATTRIB(Container, focusable, float, 0);
+       ATTRIB(Container, firstChild, entity);
+       ATTRIB(Container, lastChild, entity);
+       ATTRIB(Container, focusedChild, entity);
+       ATTRIB(Container, savedFocus, entity);
+       ATTRIB(Container, shown, float, 0);

 
        METHOD(Container, enterSubitem, void(entity, entity));
        METHOD(Container, enterLieSubitem, void(entity, vector, vector, vector, float));
 
        METHOD(Container, enterSubitem, void(entity, entity));
        METHOD(Container, enterLieSubitem, void(entity, vector, vector, vector, float));

diff --git a/qcsrc/menu/item/dialog.qh b/qcsrc/menu/item/dialog.qh
index 17343e7cd2f3697d7914f8d29742ddf125465ea2..6099fea22d77f28de06cad990d54b597717f45e3 100644 (file)
--- a/qcsrc/menu/item/dialog.qh
+++ b/qcsrc/menu/item/dialog.qh
@@ -30,43 +30,43 @@ CLASS(Dialog, InputContainer)
        METHOD(Dialog, TR, void(entity));
        METHOD(Dialog, gotoRC, void(entity, float, float));
 
        METHOD(Dialog, TR, void(entity));
        METHOD(Dialog, gotoRC, void(entity, float, float));
 

-       ATTRIB(Dialog, isTabRoot, float, 1)
-       ATTRIB(Dialog, closeButton, entity, NULL)
-       ATTRIB(Dialog, intendedHeight, float, 0)
-       ATTRIB(Dialog, itemOrigin, vector, '0 0 0')
-       ATTRIB(Dialog, itemSize, vector, '0 0 0')
-       ATTRIB(Dialog, itemSpacing, vector, '0 0 0')
-       ATTRIB(Dialog, currentRow, float, 0)
-       ATTRIB(Dialog, currentColumn, float, 0)
-       ATTRIB(Dialog, firstColumn, float, 0)
+       ATTRIB(Dialog, isTabRoot, float, 1);
+       ATTRIB(Dialog, closeButton, entity);
+       ATTRIB(Dialog, intendedHeight, float, 0);
+       ATTRIB(Dialog, itemOrigin, vector, '0 0 0');
+       ATTRIB(Dialog, itemSize, vector, '0 0 0');
+       ATTRIB(Dialog, itemSpacing, vector, '0 0 0');
+       ATTRIB(Dialog, currentRow, float, 0);
+       ATTRIB(Dialog, currentColumn, float, 0);
+       ATTRIB(Dialog, firstColumn, float, 0);

 
        // to be customized
 
        // to be customized

-       ATTRIB(Dialog, closable, float, 1)
-       ATTRIB(Dialog, title, string, "Form1")  // ;)
-       ATTRIB(Dialog, color, vector, '1 0.5 1')
-       ATTRIB(Dialog, intendedWidth, float, 0)
-       ATTRIB(Dialog, rows, float, 3)
-       ATTRIB(Dialog, columns, float, 2)
+       ATTRIB(Dialog, closable, float, 1);
+       ATTRIB(Dialog, title, string, "Form1");
+       ATTRIB(Dialog, color, vector, '1 0.5 1');
+       ATTRIB(Dialog, intendedWidth, float, 0);
+       ATTRIB(Dialog, rows, float, 3);
+       ATTRIB(Dialog, columns, float, 2);

 
 

-       ATTRIB(Dialog, marginTop, float, 0)     // pixels
-       ATTRIB(Dialog, marginBottom, float, 0)  // pixels
-       ATTRIB(Dialog, marginLeft, float, 0)    // pixels
-       ATTRIB(Dialog, marginRight, float, 0)   // pixels
-       ATTRIB(Dialog, columnSpacing, float, 0) // pixels
-       ATTRIB(Dialog, rowSpacing, float, 0)    // pixels
-       ATTRIB(Dialog, rowHeight, float, 0)     // pixels
-       ATTRIB(Dialog, titleHeight, float, 0)   // pixels
-       ATTRIB(Dialog, titleFontSize, float, 0) // pixels; if 0, title causes no margin
-       ATTRIB(Dialog, zoomedOutTitleBarPosition, float, 0)
-       ATTRIB(Dialog, zoomedOutTitleBar, float, 0)
+       ATTRIB(Dialog, marginTop, float, 0);     // pixels
+       ATTRIB(Dialog, marginBottom, float, 0);  // pixels
+       ATTRIB(Dialog, marginLeft, float, 0);    // pixels
+       ATTRIB(Dialog, marginRight, float, 0);   // pixels
+       ATTRIB(Dialog, columnSpacing, float, 0); // pixels
+       ATTRIB(Dialog, rowSpacing, float, 0);    // pixels
+       ATTRIB(Dialog, rowHeight, float, 0);     // pixels
+       ATTRIB(Dialog, titleHeight, float, 0);   // pixels
+       ATTRIB(Dialog, titleFontSize, float, 0); // pixels; if 0, title causes no margin
+       ATTRIB(Dialog, zoomedOutTitleBarPosition, float, 0);
+       ATTRIB(Dialog, zoomedOutTitleBar, float, 0);

 
 

-       ATTRIB(Dialog, requiresConnection, float, 0)  // set to true if the dialog requires a connection to be opened
+       ATTRIB(Dialog, requiresConnection, float, 0);  // set to true if the dialog requires a connection to be opened

 
 

-       ATTRIB(Dialog, backgroundImage, string, string_null)
-       ATTRIB(Dialog, borderLines, float, 1)
-       ATTRIB(Dialog, closeButtonImage, string, string_null)
+       ATTRIB(Dialog, backgroundImage, string);
+       ATTRIB(Dialog, borderLines, float, 1);
+       ATTRIB(Dialog, closeButtonImage, string);

 
 

-       ATTRIB(Dialog, frame, entity, NULL)
+       ATTRIB(Dialog, frame, entity);

 ENDCLASS(Dialog)
 
 void Dialog_Close(entity button, entity me);
 ENDCLASS(Dialog)
 
 void Dialog_Close(entity button, entity me);

diff --git a/qcsrc/menu/item/image.qh b/qcsrc/menu/item/image.qh
index 35bca5985a056c7fc949d027caaa8f655d486cbb..726f328600d79b570c210b3bb234006868ef2982 100644 (file)
--- a/qcsrc/menu/item/image.qh
+++ b/qcsrc/menu/item/image.qh
@@ -11,18 +11,18 @@ CLASS(Image, Item)
        METHOD(Image, setZoom, void(entity, float, float));
        METHOD(Image, drag_setStartPos, float(entity, vector));
        METHOD(Image, drag, float(entity, vector));
        METHOD(Image, setZoom, void(entity, float, float));
        METHOD(Image, drag_setStartPos, float(entity, vector));
        METHOD(Image, drag, float(entity, vector));

-       ATTRIB(Image, src, string, string_null)
-       ATTRIB(Image, color, vector, '1 1 1')
-       ATTRIB(Image, forcedAspect, float, 0)        // special values: -1 keep image aspect ratio, -2 keep image size but bound to the containing box, -3 always keep image size
-       ATTRIB(Image, zoomBox, float, 0)             // used by forcedAspect -2 when the image is larger than the containing box
-       ATTRIB(Image, zoomFactor, float, 1)
-       ATTRIB(Image, zoomOffset, vector, '0.5 0.5 0')
-       ATTRIB(Image, zoomSnapToTheBox, float, 1)    // snap the zoomed in image to the box borders when zooming/dragging it
-       ATTRIB(Image, zoomTime, float, 0)
-       ATTRIB(Image, zoomLimitedByTheBox, float, 0) // forbids zoom if image would be larger than the containing box
-       ATTRIB(Image, zoomMax, float, 0)
-       ATTRIB(Image, start_zoomOffset, vector, '0 0 0')
-       ATTRIB(Image, start_coords, vector, '0 0 0')
-       ATTRIB(Image, imgOrigin, vector, '0 0 0')
-       ATTRIB(Image, imgSize, vector, '0 0 0')
+       ATTRIB(Image, src, string);
+       ATTRIB(Image, color, vector, '1 1 1');
+       ATTRIB(Image, forcedAspect, float, 0);        // special values: -1 keep image aspect ratio, -2 keep image size but bound to the containing box, -3 always keep image size
+       ATTRIB(Image, zoomBox, float, 0);             // used by forcedAspect -2 when the image is larger than the containing box
+       ATTRIB(Image, zoomFactor, float, 1);
+       ATTRIB(Image, zoomOffset, vector, '0.5 0.5 0');
+       ATTRIB(Image, zoomSnapToTheBox, float, 1);    // snap the zoomed in image to the box borders when zooming/dragging it
+       ATTRIB(Image, zoomTime, float, 0);
+       ATTRIB(Image, zoomLimitedByTheBox, float, 0); // forbids zoom if image would be larger than the containing box
+       ATTRIB(Image, zoomMax, float, 0);
+       ATTRIB(Image, start_zoomOffset, vector, '0 0 0');
+       ATTRIB(Image, start_coords, vector, '0 0 0');
+       ATTRIB(Image, imgOrigin, vector, '0 0 0');
+       ATTRIB(Image, imgSize, vector, '0 0 0');

 ENDCLASS(Image)
 ENDCLASS(Image)

diff --git a/qcsrc/menu/item/inputbox.qh b/qcsrc/menu/item/inputbox.qh
index cfb576cfaa3c4544fec21fd9b286bb9cc7c90553..e3eede653b9c0c297bf698b36ed1b4108ae5035b 100644 (file)
--- a/qcsrc/menu/item/inputbox.qh
+++ b/qcsrc/menu/item/inputbox.qh
@@ -14,31 +14,31 @@ CLASS(InputBox, Label)
        METHOD(InputBox, showNotify, void(entity));
        METHOD(InputBox, resizeNotify, void(entity, vector, vector, vector, vector));
 
        METHOD(InputBox, showNotify, void(entity));
        METHOD(InputBox, resizeNotify, void(entity, vector, vector, vector, vector));
 

-       ATTRIB(InputBox, src, string, string_null)
+       ATTRIB(InputBox, src, string);

 
 

-       ATTRIB(InputBox, cursorPos, float, 0)  // characters
-       ATTRIB(InputBox, scrollPos, float, 0)  // widths
+       ATTRIB(InputBox, cursorPos, float, 0);  // characters
+       ATTRIB(InputBox, scrollPos, float, 0);  // widths

 
 

-       ATTRIB(InputBox, focusable, float, 1)
-       ATTRIB(InputBox, allowFocusSound, float, 1)
-       ATTRIB(InputBox, disabled, float, 0)
-       ATTRIB(InputBox, lastChangeTime, float, 0)
-       ATTRIB(InputBox, dragScrollTimer, float, 0)
-       ATTRIB(InputBox, dragScrollPos, vector, '0 0 0')
-       ATTRIB(InputBox, pressed, float, 0)
-       ATTRIB(InputBox, editColorCodes, float, 1)
-       ATTRIB(InputBox, forbiddenCharacters, string, "")
-       ATTRIB(InputBox, color, vector, '1 1 1')
-       ATTRIB(InputBox, colorF, vector, '1 1 1')
-       ATTRIB(InputBox, maxLength, float, 255)  // if negative, it counts bytes, not chars
-       ATTRIB(InputBox, applyButton, entity, NULL)
+       ATTRIB(InputBox, focusable, float, 1);
+       ATTRIB(InputBox, allowFocusSound, float, 1);
+       ATTRIB(InputBox, disabled, float, 0);
+       ATTRIB(InputBox, lastChangeTime, float, 0);
+       ATTRIB(InputBox, dragScrollTimer, float, 0);
+       ATTRIB(InputBox, dragScrollPos, vector, '0 0 0');
+       ATTRIB(InputBox, pressed, float, 0);
+       ATTRIB(InputBox, editColorCodes, float, 1);
+       ATTRIB(InputBox, forbiddenCharacters, string, "");
+       ATTRIB(InputBox, color, vector, '1 1 1');
+       ATTRIB(InputBox, colorF, vector, '1 1 1');
+       ATTRIB(InputBox, maxLength, float, 255);  // if negative, it counts bytes, not chars
+       ATTRIB(InputBox, applyButton, entity);

 
 

-       ATTRIB(InputBox, enableClearButton, float, 1)
-       ATTRIB(InputBox, clearButton, entity, NULL)
-       ATTRIB(InputBox, cb_width, float, 0)
-       ATTRIB(InputBox, cb_pressed, float, 0)
-       ATTRIB(InputBox, cb_focused, float, 0)
-       ATTRIB(InputBox, cb_color, vector, '1 1 1')
-       ATTRIB(InputBox, cb_colorF, vector, '1 1 1')
-       ATTRIB(InputBox, cb_colorC, vector, '1 1 1')
+       ATTRIB(InputBox, enableClearButton, float, 1);
+       ATTRIB(InputBox, clearButton, entity);
+       ATTRIB(InputBox, cb_width, float, 0);
+       ATTRIB(InputBox, cb_pressed, float, 0);
+       ATTRIB(InputBox, cb_focused, float, 0);
+       ATTRIB(InputBox, cb_color, vector, '1 1 1');
+       ATTRIB(InputBox, cb_colorF, vector, '1 1 1');
+       ATTRIB(InputBox, cb_colorC, vector, '1 1 1');

 ENDCLASS(InputBox)
 ENDCLASS(InputBox)

diff --git a/qcsrc/menu/item/inputcontainer.qh b/qcsrc/menu/item/inputcontainer.qh
index 5d84189fafeb34653d352b98699be757bea5b51f..9ae4a537506bcad1a54fb7721b7816dd74685d35 100644 (file)
--- a/qcsrc/menu/item/inputcontainer.qh
+++ b/qcsrc/menu/item/inputcontainer.qh
@@ -11,6 +11,6 @@ CLASS(InputContainer, Container)
        METHOD(InputContainer, resizeNotify, void(entity, vector, vector, vector, vector));
 
        METHOD(InputContainer, _changeFocusXY, bool(entity this, vector pos));
        METHOD(InputContainer, resizeNotify, void(entity, vector, vector, vector, vector));
 
        METHOD(InputContainer, _changeFocusXY, bool(entity this, vector pos));

-       ATTRIB(InputContainer, mouseFocusedChild, entity, NULL)
-       ATTRIB(InputContainer, isTabRoot, float, 0)
+       ATTRIB(InputContainer, mouseFocusedChild, entity);
+       ATTRIB(InputContainer, isTabRoot, float, 0);

 ENDCLASS(InputContainer)
 ENDCLASS(InputContainer)

diff --git a/qcsrc/menu/item/label.qh b/qcsrc/menu/item/label.qh
index 428958c20107c0fbf52dfbabe7304ee9b45765bf..f91ae8ad3cb12a13265d085fe937cf32959f2a95 100644 (file)
--- a/qcsrc/menu/item/label.qh
+++ b/qcsrc/menu/item/label.qh
@@ -8,27 +8,27 @@ CLASS(Label, Item)
        METHOD(Label, setText, void(entity, string));
        METHOD(Label, toString, string(entity));
        METHOD(Label, recalcPositionWithText, void(entity, string));
        METHOD(Label, setText, void(entity, string));
        METHOD(Label, toString, string(entity));
        METHOD(Label, recalcPositionWithText, void(entity, string));

-       ATTRIB(Label, isBold, float, 0)
-       ATTRIB(Label, text, string, string_null)
-       ATTRIB(Label, currentText, string, string_null)
-       ATTRIB(Label, fontSize, float, 8)
-       ATTRIB(Label, align, float, 0.5)
-       ATTRIB(Label, allowCut, float, 0)
-       ATTRIB(Label, allowColors, float, 0)
-       ATTRIB(Label, keepspaceLeft, float, 0) // for use by subclasses (radiobuttons for example)
-       ATTRIB(Label, keepspaceRight, float, 0)
-       ATTRIB(Label, marginLeft, float, 0)    // alternate way to specify keepspace* (in characters from the font)
-       ATTRIB(Label, marginRight, float, 0)
-       ATTRIB(Label, realFontSize, vector, '0 0 0')
-       ATTRIB(Label, realOrigin, vector, '0 0 0')
-       ATTRIB(Label, alpha, float, 0.7)
-       ATTRIB(Label, colorL, vector, SKINCOLOR_TEXT)
-       ATTRIB(Label, disabled, float, 0)
-       ATTRIB(Label, disabledAlpha, float, 0.3)
-       ATTRIB(Label, textEntity, entity, NULL)
-       ATTRIB(Label, allowWrap, float, 0)
-       ATTRIB(Label, recalcPos, float, 0)
-       ATTRIB(Label, condenseFactor, float, 1)
-       ATTRIB(Label, overrideRealOrigin, vector, '0 0 0')
-       ATTRIB(Label, overrideCondenseFactor, float, 0)
+       ATTRIB(Label, isBold, float, 0);
+       ATTRIB(Label, text, string);
+       ATTRIB(Label, currentText, string);
+       ATTRIB(Label, fontSize, float, 8);
+       ATTRIB(Label, align, float, 0.5);
+       ATTRIB(Label, allowCut, float, 0);
+       ATTRIB(Label, allowColors, float, 0);
+       ATTRIB(Label, keepspaceLeft, float, 0); // for use by subclasses (radiobuttons for example);
+       ATTRIB(Label, keepspaceRight, float, 0);
+       ATTRIB(Label, marginLeft, float, 0);    // alternate way to specify keepspace* (in characters from the font);
+       ATTRIB(Label, marginRight, float, 0);
+       ATTRIB(Label, realFontSize, vector, '0 0 0');
+       ATTRIB(Label, realOrigin, vector, '0 0 0');
+       ATTRIB(Label, alpha, float, 0.7);
+       ATTRIB(Label, colorL, vector, SKINCOLOR_TEXT);
+       ATTRIB(Label, disabled, float, 0);
+       ATTRIB(Label, disabledAlpha, float, 0.3);
+       ATTRIB(Label, textEntity, entity);
+       ATTRIB(Label, allowWrap, float, 0);
+       ATTRIB(Label, recalcPos, float, 0);
+       ATTRIB(Label, condenseFactor, float, 1);
+       ATTRIB(Label, overrideRealOrigin, vector, '0 0 0');
+       ATTRIB(Label, overrideCondenseFactor, float, 0);

 ENDCLASS(Label)
 ENDCLASS(Label)

diff --git a/qcsrc/menu/item/listbox.qh b/qcsrc/menu/item/listbox.qh
index 461125e303fbc34bb2e41c9c2344f5cdf21a450d..56fda91cc15d82e163e362e9a250c38a8c1bb525 100644 (file)
--- a/qcsrc/menu/item/listbox.qh
+++ b/qcsrc/menu/item/listbox.qh
@@ -11,46 +11,46 @@ CLASS(ListBox, Item)
        METHOD(ListBox, mouseDrag, float(entity, vector));
        METHOD(ListBox, mouseRelease, float(entity, vector));
        METHOD(ListBox, focusLeave, void(entity));
        METHOD(ListBox, mouseDrag, float(entity, vector));
        METHOD(ListBox, mouseRelease, float(entity, vector));
        METHOD(ListBox, focusLeave, void(entity));

-       ATTRIB(ListBox, focusable, float, 1)
-       ATTRIB(ListBox, focusedItem, int, -1)
-       ATTRIB(ListBox, focusedItemAlpha, float, 0.3)
+       ATTRIB(ListBox, focusable, float, 1);
+       ATTRIB(ListBox, focusedItem, int, -1);
+       ATTRIB(ListBox, focusedItemAlpha, float, 0.3);

        METHOD(ListBox, setFocusedItem, void(entity, int));
        METHOD(ListBox, setFocusedItem, void(entity, int));

-       ATTRIB(ListBox, mouseMoveOffset, float, -1)  // let know where the cursor is when the list scrolls without moving the cursor
-       ATTRIB(ListBox, allowFocusSound, float, 1)
-       ATTRIB(ListBox, selectedItem, int, 0)
-       ATTRIB(ListBox, size, vector, '0 0 0')
-       ATTRIB(ListBox, origin, vector, '0 0 0')
-       ATTRIB(ListBox, scrollPos, float, 0)  // measured in window heights, fixed when needed
-       ATTRIB(ListBox, scrollPosTarget, float, 0)
+       ATTRIB(ListBox, mouseMoveOffset, float, -1);  // let know where the cursor is when the list scrolls without moving the cursor
+       ATTRIB(ListBox, allowFocusSound, float, 1);
+       ATTRIB(ListBox, selectedItem, int, 0);
+       ATTRIB(ListBox, size, vector, '0 0 0');
+       ATTRIB(ListBox, origin, vector, '0 0 0');
+       ATTRIB(ListBox, scrollPos, float, 0);  // measured in window heights, fixed when needed
+       ATTRIB(ListBox, scrollPosTarget, float, 0);

        METHOD(ListBox, isScrolling, bool(entity));
        METHOD(ListBox, isScrolling, bool(entity));

-       ATTRIB(ListBox, needScrollToItem, float, -1)
+       ATTRIB(ListBox, needScrollToItem, float, -1);

        METHOD(ListBox, scrollToItem, void(entity, int));
        METHOD(ListBox, scrollToItem, void(entity, int));

-       ATTRIB(ListBox, previousValue, float, 0)
-       ATTRIB(ListBox, pressed, float, 0)  // 0 = normal, 1 = scrollbar dragging, 2 = item dragging, 3 = released
-       ATTRIB(ListBox, pressOffset, float, 0)
+       ATTRIB(ListBox, previousValue, float, 0);
+       ATTRIB(ListBox, pressed, float, 0);  // 0 = normal, 1 = scrollbar dragging, 2 = item dragging, 3 = released
+       ATTRIB(ListBox, pressOffset, float, 0);

 
        METHOD(ListBox, updateControlTopBottom, void(entity));
 
        METHOD(ListBox, updateControlTopBottom, void(entity));

-       ATTRIB(ListBox, controlTop, float, 0)
-       ATTRIB(ListBox, controlBottom, float, 0)
-       ATTRIB(ListBox, controlWidth, float, 0)
-       ATTRIB(ListBox, dragScrollPos, vector, '0 0 0')
-       ATTRIB(ListBox, selectionDoesntMatter, bool, false) // improves scrolling by keys for lists that don't need to show an active selection
+       ATTRIB(ListBox, controlTop, float, 0);
+       ATTRIB(ListBox, controlBottom, float, 0);
+       ATTRIB(ListBox, controlWidth, float, 0);
+       ATTRIB(ListBox, dragScrollPos, vector, '0 0 0');
+       ATTRIB(ListBox, selectionDoesntMatter, bool, false); // improves scrolling by keys for lists that don't need to show an active selection

 
 

-       ATTRIB(ListBox, src, string, string_null)           // scrollbar
-       ATTRIB(ListBox, color, vector, '1 1 1')
-       ATTRIB(ListBox, color2, vector, '1 1 1')
-       ATTRIB(ListBox, colorC, vector, '1 1 1')
-       ATTRIB(ListBox, colorF, vector, '1 1 1')
-       ATTRIB(ListBox, tolerance, vector, '0 0 0') // drag tolerance
-       ATTRIB(ListBox, scrollbarWidth, float, 0)   // pixels
-       ATTRIB(ListBox, nItems, float, 42)          // FIXME: why?!?
-       ATTRIB(ListBox, itemHeight, float, 0)
-    ATTRIB(ListBox, itemAbsSize, vector, '0 0 0')
-       ATTRIB(ListBox, colorBG, vector, '0 0 0')
-       ATTRIB(ListBox, alphaBG, float, 0)
+       ATTRIB(ListBox, src, string);           // scrollbar
+       ATTRIB(ListBox, color, vector, '1 1 1');
+       ATTRIB(ListBox, color2, vector, '1 1 1');
+       ATTRIB(ListBox, colorC, vector, '1 1 1');
+       ATTRIB(ListBox, colorF, vector, '1 1 1');
+       ATTRIB(ListBox, tolerance, vector, '0 0 0'); // drag tolerance
+       ATTRIB(ListBox, scrollbarWidth, float, 0);   // pixels
+       ATTRIB(ListBox, nItems, float, 42);          // FIXME: why?!?
+       ATTRIB(ListBox, itemHeight, float, 0);
+    ATTRIB(ListBox, itemAbsSize, vector, '0 0 0');
+       ATTRIB(ListBox, colorBG, vector, '0 0 0');
+       ATTRIB(ListBox, alphaBG, float, 0);

 
 

-       ATTRIB(ListBox, lastClickedItem, float, -1)
-       ATTRIB(ListBox, lastClickedTime, float, 0)
+       ATTRIB(ListBox, lastClickedItem, float, -1);
+       ATTRIB(ListBox, lastClickedTime, float, 0);

 
        METHOD(ListBox, drawListBoxItem, void(entity, int, vector, bool, bool)); // item number, width/height, isSelected, isFocused
        METHOD(ListBox, clickListBoxItem, void(entity, float, vector));          // item number, relative clickpos
 
        METHOD(ListBox, drawListBoxItem, void(entity, int, vector, bool, bool)); // item number, width/height, isSelected, isFocused
        METHOD(ListBox, clickListBoxItem, void(entity, float, vector));          // item number, relative clickpos

diff --git a/qcsrc/menu/item/modalcontroller.qh b/qcsrc/menu/item/modalcontroller.qh
index 27faaa86bfbc15b2df1e97d163198e35c1cd4d96..e950b8d87ebc99cbb5e00e030e995e72a6c9f55c 100644 (file)
--- a/qcsrc/menu/item/modalcontroller.qh
+++ b/qcsrc/menu/item/modalcontroller.qh
@@ -34,10 +34,10 @@ CLASS(ModalController, Container)
        METHOD(ModalController, initializeDialog, void(entity, entity));
 
        METHOD(ModalController, switchState, void(entity, entity, float, float));
        METHOD(ModalController, initializeDialog, void(entity, entity));
 
        METHOD(ModalController, switchState, void(entity, entity, float, float));

-       ATTRIB(ModalController, origin, vector, '0 0 0')
-       ATTRIB(ModalController, size, vector, '0 0 0')
-       ATTRIB(ModalController, previousButton, entity, NULL)
-       ATTRIB(ModalController, fadedAlpha, float, 0.3)
+       ATTRIB(ModalController, origin, vector, '0 0 0');
+       ATTRIB(ModalController, size, vector, '0 0 0');
+       ATTRIB(ModalController, previousButton, entity);
+       ATTRIB(ModalController, fadedAlpha, float, 0.3);

 ENDCLASS(ModalController)
 
 .float ModalController_state;
 ENDCLASS(ModalController)
 
 .float ModalController_state;

diff --git a/qcsrc/menu/item/nexposee.qh b/qcsrc/menu/item/nexposee.qh
index 2d8e3ec49dfc1d8ea60bfdd23440bdaff74c548e..4159648f974207260d502ab8efb4ad90907258f4 100644 (file)
--- a/qcsrc/menu/item/nexposee.qh
+++ b/qcsrc/menu/item/nexposee.qh
@@ -13,14 +13,14 @@ CLASS(Nexposee, Container)
        METHOD(Nexposee, focusEnter, void(entity));
        METHOD(Nexposee, close, void(entity));
 
        METHOD(Nexposee, focusEnter, void(entity));
        METHOD(Nexposee, close, void(entity));
 

-       ATTRIB(Nexposee, animationState, float, -1)
-       ATTRIB(Nexposee, animationFactor, float, 0)
-       ATTRIB(Nexposee, selectedChild, entity, NULL)
-       ATTRIB(Nexposee, mouseFocusedChild, entity, NULL)
+       ATTRIB(Nexposee, animationState, float, -1);
+       ATTRIB(Nexposee, animationFactor, float, 0);
+       ATTRIB(Nexposee, selectedChild, entity);
+       ATTRIB(Nexposee, mouseFocusedChild, entity);

        METHOD(Nexposee, addItem, void(entity, entity, vector, vector, float));
        METHOD(Nexposee, calc, void(entity));
        METHOD(Nexposee, setNexposee, void(entity, entity, vector, float, float));
        METHOD(Nexposee, addItem, void(entity, entity, vector, vector, float));
        METHOD(Nexposee, calc, void(entity));
        METHOD(Nexposee, setNexposee, void(entity, entity, vector, float, float));

-       ATTRIB(Nexposee, mousePosition, vector, '0 0 0')
+       ATTRIB(Nexposee, mousePosition, vector, '0 0 0');

        METHOD(Nexposee, pullNexposee, void(entity, entity, vector));
 ENDCLASS(Nexposee)
 
        METHOD(Nexposee, pullNexposee, void(entity, entity, vector));
 ENDCLASS(Nexposee)
 

diff --git a/qcsrc/menu/item/radiobutton.qh b/qcsrc/menu/item/radiobutton.qh
index 53aa7ff2e8af8da330637c597c3ddf4b5db021d7..7bd737787657ff8f74eb642c5a22f600f69e8a2d 100644 (file)
--- a/qcsrc/menu/item/radiobutton.qh
+++ b/qcsrc/menu/item/radiobutton.qh
@@ -4,8 +4,8 @@
 void RadioButton_Click(entity me, entity other);
 CLASS(RadioButton, CheckBox)
        METHOD(RadioButton, configureRadioButton, void(entity, string, float, string, float, float));
 void RadioButton_Click(entity me, entity other);
 CLASS(RadioButton, CheckBox)
        METHOD(RadioButton, configureRadioButton, void(entity, string, float, string, float, float));

-       ATTRIB(RadioButton, checked, float, 0)
-       ATTRIB(RadioButton, group, float, 0)
-       ATTRIB(RadioButton, allowDeselect, float, 0)
-       ATTRIB(RadioButton, onClick, void(entity, entity), RadioButton_Click)
+       ATTRIB(RadioButton, checked, float, 0);
+       ATTRIB(RadioButton, group, float, 0);
+       ATTRIB(RadioButton, allowDeselect, float, 0);
+       ATTRIB(RadioButton, onClick, void(entity, entity), RadioButton_Click);

 ENDCLASS(RadioButton)
 ENDCLASS(RadioButton)

diff --git a/qcsrc/menu/item/slider.qh b/qcsrc/menu/item/slider.qh
index f5e8fd496f7f446092d752ecb026ae6da762827e..3b7327788c0d130afb230471b076b8b8262587e9 100644 (file)
--- a/qcsrc/menu/item/slider.qh
+++ b/qcsrc/menu/item/slider.qh
@@ -20,31 +20,31 @@ CLASS(Slider, Label)
        METHOD(Slider, setValue, void(entity, float));
        METHOD(Slider, setSliderValue, void(entity, float));
        METHOD(Slider, showNotify, void(entity));
        METHOD(Slider, setValue, void(entity, float));
        METHOD(Slider, setSliderValue, void(entity, float));
        METHOD(Slider, showNotify, void(entity));

-       ATTRIB(Slider, src, string, string_null)
-       ATTRIB(Slider, focusable, float, 1)
-       ATTRIB(Slider, allowFocusSound, float, 1)
-       ATTRIB(Slider, value, float, 0)
-       ATTRIB(Slider, animated, float, 1)
-       ATTRIB(Slider, sliderValue, float, 0)
-       ATTRIB(Slider, sliderAnim, entity, NULL)
-       ATTRIB(Slider, valueMin, float, 0)
-       ATTRIB(Slider, valueMax, float, 0)
-       ATTRIB(Slider, valueStep, float, 0)
-       ATTRIB(Slider, valueDigits, float, 0)
-       ATTRIB(Slider, valueKeyStep, float, 0)
-       ATTRIB(Slider, valuePageStep, float, 0)
-       ATTRIB(Slider, valueDisplayMultiplier, float, 1.0)
-       ATTRIB(Slider, textSpace, float, 0)
-       ATTRIB(Slider, controlWidth, float, 0)
-       ATTRIB(Slider, pressed, float, 0)
-       ATTRIB(Slider, pressOffset, float, 0)
-       ATTRIB(Slider, previousValue, float, 0)
-       ATTRIB(Slider, tolerance, vector, '0 0 0')
-       ATTRIB(Slider, disabled, float, 0)
-       ATTRIB(Slider, color, vector, '1 1 1')
-       ATTRIB(Slider, color2, vector, '1 1 1')
-       ATTRIB(Slider, colorD, vector, '1 1 1')
-       ATTRIB(Slider, colorC, vector, '1 1 1')
-       ATTRIB(Slider, colorF, vector, '1 1 1')
-       ATTRIB(Slider, disabledAlpha, float, 0.3)
+       ATTRIB(Slider, src, string);
+       ATTRIB(Slider, focusable, float, 1);
+       ATTRIB(Slider, allowFocusSound, float, 1);
+       ATTRIB(Slider, value, float, 0);
+       ATTRIB(Slider, animated, float, 1);
+       ATTRIB(Slider, sliderValue, float, 0);
+       ATTRIB(Slider, sliderAnim, entity);
+       ATTRIB(Slider, valueMin, float, 0);
+       ATTRIB(Slider, valueMax, float, 0);
+       ATTRIB(Slider, valueStep, float, 0);
+       ATTRIB(Slider, valueDigits, float, 0);
+       ATTRIB(Slider, valueKeyStep, float, 0);
+       ATTRIB(Slider, valuePageStep, float, 0);
+       ATTRIB(Slider, valueDisplayMultiplier, float, 1.0);
+       ATTRIB(Slider, textSpace, float, 0);
+       ATTRIB(Slider, controlWidth, float, 0);
+       ATTRIB(Slider, pressed, float, 0);
+       ATTRIB(Slider, pressOffset, float, 0);
+       ATTRIB(Slider, previousValue, float, 0);
+       ATTRIB(Slider, tolerance, vector, '0 0 0');
+       ATTRIB(Slider, disabled, float, 0);
+       ATTRIB(Slider, color, vector, '1 1 1');
+       ATTRIB(Slider, color2, vector, '1 1 1');
+       ATTRIB(Slider, colorD, vector, '1 1 1');
+       ATTRIB(Slider, colorC, vector, '1 1 1');
+       ATTRIB(Slider, colorF, vector, '1 1 1');
+       ATTRIB(Slider, disabledAlpha, float, 0.3);

 ENDCLASS(Slider)
 ENDCLASS(Slider)

diff --git a/qcsrc/menu/item/tab.qh b/qcsrc/menu/item/tab.qh
index e9ba81a90387f1d71cce1aabba9d4f584bf4feda..18c9e495979f1ae24a5b2a495bf575c4571006eb 100644 (file)
--- a/qcsrc/menu/item/tab.qh
+++ b/qcsrc/menu/item/tab.qh
@@ -2,25 +2,25 @@
 
 #include "dialog.qh"
 CLASS(Tab, Dialog)
 
 #include "dialog.qh"
 CLASS(Tab, Dialog)

-       ATTRIB(Tab, isTabRoot, float, 0)
-       ATTRIB(Tab, closable, float, 0)
-       ATTRIB(Tab, rootDialog, float, 0)
-       ATTRIB(Tab, title, string, string_null)
-       ATTRIB(Tab, titleFontSize, float, 0)  // pixels
+       ATTRIB(Tab, isTabRoot, float, 0);
+       ATTRIB(Tab, closable, float, 0);
+       ATTRIB(Tab, rootDialog, float, 0);
+       ATTRIB(Tab, title, string);
+       ATTRIB(Tab, titleFontSize, float, 0);  // pixels

 
        // still to be customized
 
        // still to be customized

-       ATTRIB(Tab, intendedWidth, float, 0)
-       ATTRIB(Tab, rows, float, 3)
-       ATTRIB(Tab, columns, float, 2)
+       ATTRIB(Tab, intendedWidth, float, 0);
+       ATTRIB(Tab, rows, float, 3);
+       ATTRIB(Tab, columns, float, 2);

 
 

-       ATTRIB(Tab, marginTop, float, 0)     // pixels
-       ATTRIB(Tab, marginBottom, float, 0)  // pixels
-       ATTRIB(Tab, marginLeft, float, 0)    // pixels
-       ATTRIB(Tab, marginRight, float, 0)   // pixels
-       ATTRIB(Tab, columnSpacing, float, 0) // pixels
-       ATTRIB(Tab, rowSpacing, float, 0)    // pixels
-       ATTRIB(Tab, rowHeight, float, 0)     // pixels
-       ATTRIB(Tab, titleHeight, float, 0)   // pixels
+       ATTRIB(Tab, marginTop, float, 0);     // pixels
+       ATTRIB(Tab, marginBottom, float, 0);  // pixels
+       ATTRIB(Tab, marginLeft, float, 0);    // pixels
+       ATTRIB(Tab, marginRight, float, 0);   // pixels
+       ATTRIB(Tab, columnSpacing, float, 0); // pixels
+       ATTRIB(Tab, rowSpacing, float, 0);    // pixels
+       ATTRIB(Tab, rowHeight, float, 0);     // pixels
+       ATTRIB(Tab, titleHeight, float, 0);   // pixels

 
 

-       ATTRIB(Tab, backgroundImage, string, string_null)
+       ATTRIB(Tab, backgroundImage, string);

 ENDCLASS(Tab)
 ENDCLASS(Tab)

diff --git a/qcsrc/menu/item/textslider.qh b/qcsrc/menu/item/textslider.qh
index 0703942f95b03b5b733741416a55a5c082c0a72e..9a6a586a16c9bd2eed839628d4ccb8f44cf8e109 100644 (file)
--- a/qcsrc/menu/item/textslider.qh
+++ b/qcsrc/menu/item/textslider.qh
@@ -14,7 +14,7 @@ CLASS(TextSlider, Slider)
        METHOD(TextSlider, addValue, void(entity, string, string));
        METHOD(TextSlider, insertValue, void(entity, float, string, string));
        METHOD(TextSlider, configureTextSliderValues, void(entity, string));
        METHOD(TextSlider, addValue, void(entity, string, string));
        METHOD(TextSlider, insertValue, void(entity, float, string, string));
        METHOD(TextSlider, configureTextSliderValues, void(entity, string));

-       ATTRIBARRAY(TextSlider, valueStrings, string, 256)
-       ATTRIBARRAY(TextSlider, valueIdentifiers, string, 256)
-       ATTRIB(TextSlider, nValues, int, 0)
+       ATTRIBARRAY(TextSlider, valueStrings, string, 256);
+       ATTRIBARRAY(TextSlider, valueIdentifiers, string, 256);
+       ATTRIB(TextSlider, nValues, int, 0);

 ENDCLASS(TextSlider)
 ENDCLASS(TextSlider)

diff --git a/qcsrc/menu/xonotic/bigbutton.qh b/qcsrc/menu/xonotic/bigbutton.qh
index 14b6893a7d16f93a56725c737c49563ce8cd7746..b34014bc3879fb4497642a0304d50966e90f5d9b 100644 (file)
--- a/qcsrc/menu/xonotic/bigbutton.qh
+++ b/qcsrc/menu/xonotic/bigbutton.qh
@@ -3,7 +3,7 @@
 #include "button.qh"
 CLASS(XonoticBigButton, XonoticButton)
        METHOD(XonoticBigButton, configureXonoticBigButton, void(entity, string, vector));
 #include "button.qh"
 CLASS(XonoticBigButton, XonoticButton)
        METHOD(XonoticBigButton, configureXonoticBigButton, void(entity, string, vector));

-       ATTRIB(XonoticBigButton, image, string, SKINGFX_BUTTON_BIG)
-       ATTRIB(XonoticBigButton, grayImage, string, SKINGFX_BUTTON_BIG_GRAY)
+       ATTRIB(XonoticBigButton, image, string, SKINGFX_BUTTON_BIG);
+       ATTRIB(XonoticBigButton, grayImage, string, SKINGFX_BUTTON_BIG_GRAY);

 ENDCLASS(XonoticBigButton)
 entity makeXonoticBigButton(string theText, vector theColor);
 ENDCLASS(XonoticBigButton)
 entity makeXonoticBigButton(string theText, vector theColor);

diff --git a/qcsrc/menu/xonotic/bigcommandbutton.qh b/qcsrc/menu/xonotic/bigcommandbutton.qh
index 4713fa3709765d050bc70576282975c23d8b37c7..b6bb782aee8639335411309dec8a31dacdff8d7d 100644 (file)
--- a/qcsrc/menu/xonotic/bigcommandbutton.qh
+++ b/qcsrc/menu/xonotic/bigcommandbutton.qh
@@ -3,8 +3,8 @@
 #include "commandbutton.qh"
 CLASS(XonoticBigCommandButton, XonoticCommandButton)
        METHOD(XonoticBigCommandButton, configureXonoticBigCommandButton, void(entity, string, vector, string, float, string));
 #include "commandbutton.qh"
 CLASS(XonoticBigCommandButton, XonoticCommandButton)
        METHOD(XonoticBigCommandButton, configureXonoticBigCommandButton, void(entity, string, vector, string, float, string));

-       ATTRIB(XonoticBigCommandButton, image, string, SKINGFX_BUTTON_BIG)
-       ATTRIB(XonoticBigCommandButton, grayImage, string, SKINGFX_BUTTON_BIG_GRAY)
+       ATTRIB(XonoticBigCommandButton, image, string, SKINGFX_BUTTON_BIG);
+       ATTRIB(XonoticBigCommandButton, grayImage, string, SKINGFX_BUTTON_BIG_GRAY);

 ENDCLASS(XonoticBigCommandButton)
 entity makeXonoticBigCommandButton_T(string theText, vector theColor, string theCommand, float closesMenu, string theTooltip);
 entity makeXonoticBigCommandButton(string theText, vector theColor, string theCommand, float closesMenu);
 ENDCLASS(XonoticBigCommandButton)
 entity makeXonoticBigCommandButton_T(string theText, vector theColor, string theCommand, float closesMenu, string theTooltip);
 entity makeXonoticBigCommandButton(string theText, vector theColor, string theCommand, float closesMenu);

diff --git a/qcsrc/menu/xonotic/button.qh b/qcsrc/menu/xonotic/button.qh
index c7e85fabe0838b8c9659d379c32e40c4258e8283..e4a520d2b67afcee5d76610999e4231e6faeedf9 100644 (file)
--- a/qcsrc/menu/xonotic/button.qh
+++ b/qcsrc/menu/xonotic/button.qh
@@ -3,17 +3,17 @@
 #include "../item/button.qh"
 CLASS(XonoticButton, Button)
        METHOD(XonoticButton, configureXonoticButton, void(entity, string, vector, string));
 #include "../item/button.qh"
 CLASS(XonoticButton, Button)
        METHOD(XonoticButton, configureXonoticButton, void(entity, string, vector, string));

-       ATTRIB(XonoticButton, fontSize, float, SKINFONTSIZE_NORMAL)
-       ATTRIB(XonoticButton, image, string, SKINGFX_BUTTON)
-       ATTRIB(XonoticButton, grayImage, string, SKINGFX_BUTTON_GRAY)
-       ATTRIB(XonoticButton, color, vector, SKINCOLOR_BUTTON_N)
-       ATTRIB(XonoticButton, colorC, vector, SKINCOLOR_BUTTON_C)
-       ATTRIB(XonoticButton, colorF, vector, SKINCOLOR_BUTTON_F)
-       ATTRIB(XonoticButton, colorD, vector, SKINCOLOR_BUTTON_D)
-       ATTRIB(XonoticButton, alpha, float, SKINALPHA_TEXT)
-       ATTRIB(XonoticButton, disabledAlpha, float, SKINALPHA_DISABLED)
-       ATTRIB(XonoticButton, marginLeft, float, SKINMARGIN_BUTTON)  // chars
-       ATTRIB(XonoticButton, marginRight, float, SKINMARGIN_BUTTON) // chars
+       ATTRIB(XonoticButton, fontSize, float, SKINFONTSIZE_NORMAL);
+       ATTRIB(XonoticButton, image, string, SKINGFX_BUTTON);
+       ATTRIB(XonoticButton, grayImage, string, SKINGFX_BUTTON_GRAY);
+       ATTRIB(XonoticButton, color, vector, SKINCOLOR_BUTTON_N);
+       ATTRIB(XonoticButton, colorC, vector, SKINCOLOR_BUTTON_C);
+       ATTRIB(XonoticButton, colorF, vector, SKINCOLOR_BUTTON_F);
+       ATTRIB(XonoticButton, colorD, vector, SKINCOLOR_BUTTON_D);
+       ATTRIB(XonoticButton, alpha, float, SKINALPHA_TEXT);
+       ATTRIB(XonoticButton, disabledAlpha, float, SKINALPHA_DISABLED);
+       ATTRIB(XonoticButton, marginLeft, float, SKINMARGIN_BUTTON);  // chars
+       ATTRIB(XonoticButton, marginRight, float, SKINMARGIN_BUTTON); // chars

 ENDCLASS(XonoticButton)
 
 entity makeXonoticButton_T(string theText, vector theColor, string theTooltip);
 ENDCLASS(XonoticButton)
 
 entity makeXonoticButton_T(string theText, vector theColor, string theTooltip);

diff --git a/qcsrc/menu/xonotic/campaign.qh b/qcsrc/menu/xonotic/campaign.qh
index 17585a86d4f51233f0d6963b3dee85d4ec1d81db..784926f7df8636cd58d8513a24e5aed8b0dc475c 100644 (file)
--- a/qcsrc/menu/xonotic/campaign.qh
+++ b/qcsrc/menu/xonotic/campaign.qh
@@ -3,7 +3,7 @@
 #include "listbox.qh"
 CLASS(XonoticCampaignList, XonoticListBox)
        METHOD(XonoticCampaignList, configureXonoticCampaignList, void(entity));
 #include "listbox.qh"
 CLASS(XonoticCampaignList, XonoticListBox)
        METHOD(XonoticCampaignList, configureXonoticCampaignList, void(entity));

-       ATTRIB(XonoticCampaignList, rowsPerItem, float, 10)
+       ATTRIB(XonoticCampaignList, rowsPerItem, float, 10);

        METHOD(XonoticCampaignList, draw, void(entity));
        METHOD(XonoticCampaignList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticCampaignList, doubleClickListBoxItem, void(entity, float, vector));
        METHOD(XonoticCampaignList, draw, void(entity));
        METHOD(XonoticCampaignList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticCampaignList, doubleClickListBoxItem, void(entity, float, vector));


@@ -13,31 +13,31 @@ CLASS(XonoticCampaignList, XonoticListBox)
        METHOD(XonoticCampaignList, campaignGo, void(entity, float));
        METHOD(XonoticCampaignList, destroy, void(entity));
 
        METHOD(XonoticCampaignList, campaignGo, void(entity, float));
        METHOD(XonoticCampaignList, destroy, void(entity));
 

-       ATTRIB(XonoticCampaignList, campaignGlob, float, 0)
-       ATTRIB(XonoticCampaignList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticCampaignList, columnPreviewOrigin, float, 0)
-       ATTRIB(XonoticCampaignList, columnPreviewSize, float, 0)
-       ATTRIB(XonoticCampaignList, columnNameOrigin, float, 0)
-       ATTRIB(XonoticCampaignList, columnNameSize, float, 0)
-       ATTRIB(XonoticCampaignList, columnCheckMarkOrigin, float, 0)
-       ATTRIB(XonoticCampaignList, columnCheckMarkSize, float, 0)
-       ATTRIB(XonoticCampaignList, checkMarkOrigin, vector, '0 0 0')
-       ATTRIB(XonoticCampaignList, checkMarkSize, vector, '0 0 0')
-       ATTRIB(XonoticCampaignList, realUpperMargin1, float, 0)
-       ATTRIB(XonoticCampaignList, realUpperMargin2, float, 0)
+       ATTRIB(XonoticCampaignList, campaignGlob, float, 0);
+       ATTRIB(XonoticCampaignList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticCampaignList, columnPreviewOrigin, float, 0);
+       ATTRIB(XonoticCampaignList, columnPreviewSize, float, 0);
+       ATTRIB(XonoticCampaignList, columnNameOrigin, float, 0);
+       ATTRIB(XonoticCampaignList, columnNameSize, float, 0);
+       ATTRIB(XonoticCampaignList, columnCheckMarkOrigin, float, 0);
+       ATTRIB(XonoticCampaignList, columnCheckMarkSize, float, 0);
+       ATTRIB(XonoticCampaignList, checkMarkOrigin, vector, '0 0 0');
+       ATTRIB(XonoticCampaignList, checkMarkSize, vector, '0 0 0');
+       ATTRIB(XonoticCampaignList, realUpperMargin1, float, 0);
+       ATTRIB(XonoticCampaignList, realUpperMargin2, float, 0);

 
 

-       ATTRIB(XonoticCampaignList, origin, vector, '0 0 0')
-       ATTRIB(XonoticCampaignList, itemAbsSize, vector, '0 0 0')
-       ATTRIB(XonoticCampaignList, emptyLineHeight, float, 0.5)
+       ATTRIB(XonoticCampaignList, origin, vector, '0 0 0');
+       ATTRIB(XonoticCampaignList, itemAbsSize, vector, '0 0 0');
+       ATTRIB(XonoticCampaignList, emptyLineHeight, float, 0.5);

 
 

-       ATTRIB(XonoticCampaignList, campaignIndex, float, 0)
-       ATTRIB(XonoticCampaignList, cvarName, string, string_null)
+       ATTRIB(XonoticCampaignList, campaignIndex, float, 0);
+       ATTRIB(XonoticCampaignList, cvarName, string);

        METHOD(XonoticCampaignList, loadCvars, void(entity));
        METHOD(XonoticCampaignList, saveCvars, void(entity));
 
        METHOD(XonoticCampaignList, loadCvars, void(entity));
        METHOD(XonoticCampaignList, saveCvars, void(entity));
 

-       ATTRIB(XonoticCampaignList, buttonNext, entity, NULL)
-       ATTRIB(XonoticCampaignList, buttonPrev, entity, NULL)
-       ATTRIB(XonoticCampaignList, labelTitle, entity, NULL)
+       ATTRIB(XonoticCampaignList, buttonNext, entity);
+       ATTRIB(XonoticCampaignList, buttonPrev, entity);
+       ATTRIB(XonoticCampaignList, labelTitle, entity);

 ENDCLASS(XonoticCampaignList)
 entity makeXonoticCampaignList();
 void CampaignList_LoadMap(entity btn, entity me);
 ENDCLASS(XonoticCampaignList)
 entity makeXonoticCampaignList();
 void CampaignList_LoadMap(entity btn, entity me);

diff --git a/qcsrc/menu/xonotic/charmap.qh b/qcsrc/menu/xonotic/charmap.qh
index c8d5b313492076922bd4fdf026069aa6d39ba8e1..3993e1dbc0a727c1ba3272a21ce8ae1b53eda8e1 100644 (file)
--- a/qcsrc/menu/xonotic/charmap.qh
+++ b/qcsrc/menu/xonotic/charmap.qh
@@ -6,15 +6,15 @@ CLASS(XonoticCharmap, XonoticPicker)
        METHOD(XonoticCharmap, focusLeave, void(entity));
        METHOD(XonoticCharmap, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticCharmap, keyDown, float(entity, float, float, float));
        METHOD(XonoticCharmap, focusLeave, void(entity));
        METHOD(XonoticCharmap, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticCharmap, keyDown, float(entity, float, float, float));

-       ATTRIB(XonoticCharmap, inputBox, entity, NULL)
-       ATTRIB(XonoticCharmap, realFontSize, vector, '0 0 0')
+       ATTRIB(XonoticCharmap, inputBox, entity);
+       ATTRIB(XonoticCharmap, realFontSize, vector, '0 0 0');

 
 

-       ATTRIB(XonoticCharmap, rows, float, 10)
-       ATTRIB(XonoticCharmap, columns, float, 14)
+       ATTRIB(XonoticCharmap, rows, float, 10);
+       ATTRIB(XonoticCharmap, columns, float, 14);

 
        METHOD(XonoticCharmap, cellSelect, void(entity, vector));
        METHOD(XonoticCharmap, cellIsValid, bool(entity, vector));
        METHOD(XonoticCharmap, cellDraw, void(entity, vector, vector));
 
        METHOD(XonoticCharmap, cellSelect, void(entity, vector));
        METHOD(XonoticCharmap, cellIsValid, bool(entity, vector));
        METHOD(XonoticCharmap, cellDraw, void(entity, vector, vector));

-       ATTRIB(XonoticCharmap, charOffset, vector, '0 0 0')
+       ATTRIB(XonoticCharmap, charOffset, vector, '0 0 0');

 ENDCLASS(XonoticCharmap)
 entity makeXonoticCharmap(entity controlledInputBox);
 ENDCLASS(XonoticCharmap)
 entity makeXonoticCharmap(entity controlledInputBox);

diff --git a/qcsrc/menu/xonotic/checkbox.qh b/qcsrc/menu/xonotic/checkbox.qh
index 90a1bf5d4b67e4906223b4c8bf5392e5e82e0dab..e46c9ce4a0bb0f20c342c7f5737cc7ec531ffeb9 100644 (file)
--- a/qcsrc/menu/xonotic/checkbox.qh
+++ b/qcsrc/menu/xonotic/checkbox.qh
@@ -4,24 +4,24 @@
 CLASS(XonoticCheckBox, CheckBox)
        METHOD(XonoticCheckBox, configureXonoticCheckBox, void(entity, float, float, string, string, string));
        METHOD(XonoticCheckBox, setChecked, void(entity, float));
 CLASS(XonoticCheckBox, CheckBox)
        METHOD(XonoticCheckBox, configureXonoticCheckBox, void(entity, float, float, string, string, string));
        METHOD(XonoticCheckBox, setChecked, void(entity, float));

-       ATTRIB(XonoticCheckBox, fontSize, float, SKINFONTSIZE_NORMAL)
-       ATTRIB(XonoticCheckBox, image, string, SKINGFX_CHECKBOX)
-       ATTRIB(XonoticCheckBox, yesValue, float, 1)
-       ATTRIB(XonoticCheckBox, noValue, float, 0)
+       ATTRIB(XonoticCheckBox, fontSize, float, SKINFONTSIZE_NORMAL);
+       ATTRIB(XonoticCheckBox, image, string, SKINGFX_CHECKBOX);
+       ATTRIB(XonoticCheckBox, yesValue, float, 1);
+       ATTRIB(XonoticCheckBox, noValue, float, 0);

 
 

-       ATTRIB(XonoticCheckBox, color, vector, SKINCOLOR_CHECKBOX_N)
-       ATTRIB(XonoticCheckBox, colorC, vector, SKINCOLOR_CHECKBOX_C)
-       ATTRIB(XonoticCheckBox, colorF, vector, SKINCOLOR_CHECKBOX_F)
-       ATTRIB(XonoticCheckBox, colorD, vector, SKINCOLOR_CHECKBOX_D)
+       ATTRIB(XonoticCheckBox, color, vector, SKINCOLOR_CHECKBOX_N);
+       ATTRIB(XonoticCheckBox, colorC, vector, SKINCOLOR_CHECKBOX_C);
+       ATTRIB(XonoticCheckBox, colorF, vector, SKINCOLOR_CHECKBOX_F);
+       ATTRIB(XonoticCheckBox, colorD, vector, SKINCOLOR_CHECKBOX_D);

 
 

-       ATTRIB(XonoticCheckBox, cvarName, string, string_null)
+       ATTRIB(XonoticCheckBox, cvarName, string);

        METHOD(XonoticCheckBox, loadCvars, void(entity));
        METHOD(XonoticCheckBox, saveCvars, void(entity));
        METHOD(XonoticCheckBox, loadCvars, void(entity));
        METHOD(XonoticCheckBox, saveCvars, void(entity));

-       ATTRIB(XonoticCheckBox, sendCvars, float, 0)
+       ATTRIB(XonoticCheckBox, sendCvars, float, 0);

 
 

-       ATTRIB(XonoticCheckBox, alpha, float, SKINALPHA_TEXT)
-       ATTRIB(XonoticCheckBox, disabledAlpha, float, SKINALPHA_DISABLED)
-       ATTRIB(XonoticCheckBox, linkedCheckBox, entity, NULL)
+       ATTRIB(XonoticCheckBox, alpha, float, SKINALPHA_TEXT);
+       ATTRIB(XonoticCheckBox, disabledAlpha, float, SKINALPHA_DISABLED);
+       ATTRIB(XonoticCheckBox, linkedCheckBox, entity);

 ENDCLASS(XonoticCheckBox)
 entity makeXonoticCheckBox_T(float, string, string, string);
 entity makeXonoticCheckBox(float, string, string);
 ENDCLASS(XonoticCheckBox)
 entity makeXonoticCheckBox_T(float, string, string, string);
 entity makeXonoticCheckBox(float, string, string);

diff --git a/qcsrc/menu/xonotic/checkbox_slider_invalid.qh b/qcsrc/menu/xonotic/checkbox_slider_invalid.qh
index d9c144c6ab763c35616db64d97b54d8e8f8b5f7f..259c2104fea2ac2abd33a232ace783c0f02ea2f4 100644 (file)
--- a/qcsrc/menu/xonotic/checkbox_slider_invalid.qh
+++ b/qcsrc/menu/xonotic/checkbox_slider_invalid.qh
@@ -5,20 +5,20 @@ CLASS(XonoticSliderCheckBox, CheckBox)
        METHOD(XonoticSliderCheckBox, configureXonoticSliderCheckBox, void(entity, float, float, entity, string));
        METHOD(XonoticSliderCheckBox, setChecked, void(entity, float));
        METHOD(XonoticSliderCheckBox, draw, void(entity));
        METHOD(XonoticSliderCheckBox, configureXonoticSliderCheckBox, void(entity, float, float, entity, string));
        METHOD(XonoticSliderCheckBox, setChecked, void(entity, float));
        METHOD(XonoticSliderCheckBox, draw, void(entity));

-       ATTRIB(XonoticSliderCheckBox, fontSize, float, SKINFONTSIZE_NORMAL)
-       ATTRIB(XonoticSliderCheckBox, image, string, SKINGFX_CHECKBOX)
+       ATTRIB(XonoticSliderCheckBox, fontSize, float, SKINFONTSIZE_NORMAL);
+       ATTRIB(XonoticSliderCheckBox, image, string, SKINGFX_CHECKBOX);

 
 

-       ATTRIB(XonoticSliderCheckBox, color, vector, SKINCOLOR_CHECKBOX_N)
-       ATTRIB(XonoticSliderCheckBox, colorC, vector, SKINCOLOR_CHECKBOX_C)
-       ATTRIB(XonoticSliderCheckBox, colorF, vector, SKINCOLOR_CHECKBOX_F)
-       ATTRIB(XonoticSliderCheckBox, colorD, vector, SKINCOLOR_CHECKBOX_D)
+       ATTRIB(XonoticSliderCheckBox, color, vector, SKINCOLOR_CHECKBOX_N);
+       ATTRIB(XonoticSliderCheckBox, colorC, vector, SKINCOLOR_CHECKBOX_C);
+       ATTRIB(XonoticSliderCheckBox, colorF, vector, SKINCOLOR_CHECKBOX_F);
+       ATTRIB(XonoticSliderCheckBox, colorD, vector, SKINCOLOR_CHECKBOX_D);

 
 

-       ATTRIB(XonoticSliderCheckBox, alpha, float, SKINALPHA_TEXT)
-       ATTRIB(XonoticSliderCheckBox, disabledAlpha, float, SKINALPHA_DISABLED)
+       ATTRIB(XonoticSliderCheckBox, alpha, float, SKINALPHA_TEXT);
+       ATTRIB(XonoticSliderCheckBox, disabledAlpha, float, SKINALPHA_DISABLED);

 
 

-       ATTRIB(XonoticSliderCheckBox, controlledSlider, entity, NULL)
-       ATTRIB(XonoticSliderCheckBox, offValue, float, -1)
-       ATTRIB(XonoticSliderCheckBox, inverted, float, 0)
-       ATTRIB(XonoticSliderCheckBox, savedValue, float, -1)
+       ATTRIB(XonoticSliderCheckBox, controlledSlider, entity);
+       ATTRIB(XonoticSliderCheckBox, offValue, float, -1);
+       ATTRIB(XonoticSliderCheckBox, inverted, float, 0);
+       ATTRIB(XonoticSliderCheckBox, savedValue, float, -1);

 ENDCLASS(XonoticSliderCheckBox)
 entity makeXonoticSliderCheckBox(float, float, entity, string);
 ENDCLASS(XonoticSliderCheckBox)
 entity makeXonoticSliderCheckBox(float, float, entity, string);

diff --git a/qcsrc/menu/xonotic/checkbox_string.qh b/qcsrc/menu/xonotic/checkbox_string.qh
index b4dc8e5d20e6aefe2db6657dd1982e4ace9d64fe..e73a7144fc4a0cdd0ff643e600832b5ac2bd775c 100644 (file)
--- a/qcsrc/menu/xonotic/checkbox_string.qh
+++ b/qcsrc/menu/xonotic/checkbox_string.qh
@@ -4,22 +4,22 @@
 CLASS(XonoticCheckBoxString, CheckBox)
        METHOD(XonoticCheckBoxString, configureXonoticCheckBoxString, void(entity, string, string, string, string));
        METHOD(XonoticCheckBoxString, setChecked, void(entity, float));
 CLASS(XonoticCheckBoxString, CheckBox)
        METHOD(XonoticCheckBoxString, configureXonoticCheckBoxString, void(entity, string, string, string, string));
        METHOD(XonoticCheckBoxString, setChecked, void(entity, float));

-       ATTRIB(XonoticCheckBoxString, fontSize, float, SKINFONTSIZE_NORMAL)
-       ATTRIB(XonoticCheckBoxString, image, string, SKINGFX_CHECKBOX)
-       ATTRIB(XonoticCheckBoxString, yesString, string, string_null)
-       ATTRIB(XonoticCheckBoxString, noString, string, string_null)
+       ATTRIB(XonoticCheckBoxString, fontSize, float, SKINFONTSIZE_NORMAL);
+       ATTRIB(XonoticCheckBoxString, image, string, SKINGFX_CHECKBOX);
+       ATTRIB(XonoticCheckBoxString, yesString, string);
+       ATTRIB(XonoticCheckBoxString, noString, string);

 
 

-       ATTRIB(XonoticCheckBoxString, color, vector, SKINCOLOR_CHECKBOX_N)
-       ATTRIB(XonoticCheckBoxString, colorC, vector, SKINCOLOR_CHECKBOX_C)
-       ATTRIB(XonoticCheckBoxString, colorF, vector, SKINCOLOR_CHECKBOX_F)
-       ATTRIB(XonoticCheckBoxString, colorD, vector, SKINCOLOR_CHECKBOX_D)
+       ATTRIB(XonoticCheckBoxString, color, vector, SKINCOLOR_CHECKBOX_N);
+       ATTRIB(XonoticCheckBoxString, colorC, vector, SKINCOLOR_CHECKBOX_C);
+       ATTRIB(XonoticCheckBoxString, colorF, vector, SKINCOLOR_CHECKBOX_F);
+       ATTRIB(XonoticCheckBoxString, colorD, vector, SKINCOLOR_CHECKBOX_D);

 
 

-       ATTRIB(XonoticCheckBoxString, cvarName, string, string_null)
+       ATTRIB(XonoticCheckBoxString, cvarName, string);

        METHOD(XonoticCheckBoxString, loadCvars, void(entity));
        METHOD(XonoticCheckBoxString, saveCvars, void(entity));
        METHOD(XonoticCheckBoxString, loadCvars, void(entity));
        METHOD(XonoticCheckBoxString, saveCvars, void(entity));

-       ATTRIB(XonoticCheckBoxString, sendCvars, float, 0)
+       ATTRIB(XonoticCheckBoxString, sendCvars, float, 0);

 
 

-       ATTRIB(XonoticCheckBoxString, alpha, float, SKINALPHA_TEXT)
-       ATTRIB(XonoticCheckBoxString, disabledAlpha, float, SKINALPHA_DISABLED)
+       ATTRIB(XonoticCheckBoxString, alpha, float, SKINALPHA_TEXT);
+       ATTRIB(XonoticCheckBoxString, disabledAlpha, float, SKINALPHA_DISABLED);

 ENDCLASS(XonoticCheckBoxString)
 entity makeXonoticCheckBoxString(string, string, string, string);
 ENDCLASS(XonoticCheckBoxString)
 entity makeXonoticCheckBoxString(string, string, string, string);

diff --git a/qcsrc/menu/xonotic/colorbutton.qh b/qcsrc/menu/xonotic/colorbutton.qh
index c253f8f11293329bcf1faeb0573f897061a251c9..9ff9639c588b0d0100ff36617ed45365c02a5885 100644 (file)
--- a/qcsrc/menu/xonotic/colorbutton.qh
+++ b/qcsrc/menu/xonotic/colorbutton.qh
@@ -5,14 +5,14 @@ CLASS(XonoticColorButton, RadioButton)
        METHOD(XonoticColorButton, configureXonoticColorButton, void(entity, float, float, float));
        METHOD(XonoticColorButton, setChecked, void(entity, float));
        METHOD(XonoticColorButton, draw, void(entity));
        METHOD(XonoticColorButton, configureXonoticColorButton, void(entity, float, float, float));
        METHOD(XonoticColorButton, setChecked, void(entity, float));
        METHOD(XonoticColorButton, draw, void(entity));

-       ATTRIB(XonoticColorButton, fontSize, float, 0)
-       ATTRIB(XonoticColorButton, image, string, SKINGFX_COLORBUTTON)
+       ATTRIB(XonoticColorButton, fontSize, float, 0);
+       ATTRIB(XonoticColorButton, image, string, SKINGFX_COLORBUTTON);

 
 

-       ATTRIB(XonoticColorButton, useDownAsChecked, float, 1)
+       ATTRIB(XonoticColorButton, useDownAsChecked, float, 1);

 
 

-       ATTRIB(XonoticColorButton, cvarPart, float, 0)
-       ATTRIB(XonoticColorButton, cvarName, string, string_null)
-       ATTRIB(XonoticColorButton, cvarValueFloat, float, 0)
+       ATTRIB(XonoticColorButton, cvarPart, float, 0);
+       ATTRIB(XonoticColorButton, cvarName, string);
+       ATTRIB(XonoticColorButton, cvarValueFloat, float, 0);

        METHOD(XonoticColorButton, loadCvars, void(entity));
        METHOD(XonoticColorButton, saveCvars, void(entity));
 ENDCLASS(XonoticColorButton)
        METHOD(XonoticColorButton, loadCvars, void(entity));
        METHOD(XonoticColorButton, saveCvars, void(entity));
 ENDCLASS(XonoticColorButton)

diff --git a/qcsrc/menu/xonotic/colorpicker.qh b/qcsrc/menu/xonotic/colorpicker.qh
index 03567dfa45d929d5f2f60c55fbcb24d444fda602..b1c9d1e80ae566dd5a5dcddc8fb569f46bb3f3b3 100644 (file)
--- a/qcsrc/menu/xonotic/colorpicker.qh
+++ b/qcsrc/menu/xonotic/colorpicker.qh
@@ -6,10 +6,10 @@ CLASS(XonoticColorpicker, Image)
        METHOD(XonoticColorpicker, mousePress, float(entity, vector));
        METHOD(XonoticColorpicker, mouseRelease, float(entity, vector));
        METHOD(XonoticColorpicker, mouseDrag, float(entity, vector));
        METHOD(XonoticColorpicker, mousePress, float(entity, vector));
        METHOD(XonoticColorpicker, mouseRelease, float(entity, vector));
        METHOD(XonoticColorpicker, mouseDrag, float(entity, vector));

-       ATTRIB(XonoticColorpicker, controlledTextbox, entity, NULL)
-       ATTRIB(XonoticColorpicker, image, string, SKINGFX_COLORPICKER)
-       ATTRIB(XonoticColorpicker, imagemargin, vector, SKINMARGIN_COLORPICKER)
-       ATTRIB(XonoticColorpicker, focusable, float, 1)
+       ATTRIB(XonoticColorpicker, controlledTextbox, entity);
+       ATTRIB(XonoticColorpicker, image, string, SKINGFX_COLORPICKER);
+       ATTRIB(XonoticColorpicker, imagemargin, vector, SKINMARGIN_COLORPICKER);
+       ATTRIB(XonoticColorpicker, focusable, float, 1);

        METHOD(XonoticColorpicker, focusLeave, void(entity));
        METHOD(XonoticColorpicker, keyDown, float(entity, float, float, float));
        METHOD(XonoticColorpicker, draw, void(entity));
        METHOD(XonoticColorpicker, focusLeave, void(entity));
        METHOD(XonoticColorpicker, keyDown, float(entity, float, float, float));
        METHOD(XonoticColorpicker, draw, void(entity));

diff --git a/qcsrc/menu/xonotic/colorpicker_string.qh b/qcsrc/menu/xonotic/colorpicker_string.qh
index 3caf9d9bf0d5a9d891a828527cefa6bd3aa6c570..e990234b3f0a24779b9e3b40da6850b31299cd82 100644 (file)
--- a/qcsrc/menu/xonotic/colorpicker_string.qh
+++ b/qcsrc/menu/xonotic/colorpicker_string.qh
@@ -9,15 +9,15 @@ CLASS(XonoticColorpickerString, Image)
        METHOD(XonoticColorpickerString, mouseRelease, float(entity, vector));
        METHOD(XonoticColorpickerString, mouseDrag, float(entity, vector));
 
        METHOD(XonoticColorpickerString, mouseRelease, float(entity, vector));
        METHOD(XonoticColorpickerString, mouseDrag, float(entity, vector));
 

-       ATTRIB(XonoticColorpickerString, cvarName, string, string_null)
+       ATTRIB(XonoticColorpickerString, cvarName, string);

        METHOD(XonoticColorpickerString, loadCvars, void(entity));
        METHOD(XonoticColorpickerString, saveCvars, void(entity));
 
        METHOD(XonoticColorpickerString, loadCvars, void(entity));
        METHOD(XonoticColorpickerString, saveCvars, void(entity));
 

-       ATTRIB(XonoticColorpickerString, prevcoords, vector, '0 0 0')
-       ATTRIB(XonoticColorpickerString, image, string, SKINGFX_COLORPICKER)
-       ATTRIB(XonoticColorpickerString, imagemargin, vector, SKINMARGIN_COLORPICKER)
-       ATTRIB(XonoticColorpickerString, focusable, float, 1)
+       ATTRIB(XonoticColorpickerString, prevcoords, vector, '0 0 0');
+       ATTRIB(XonoticColorpickerString, image, string, SKINGFX_COLORPICKER);
+       ATTRIB(XonoticColorpickerString, imagemargin, vector, SKINMARGIN_COLORPICKER);
+       ATTRIB(XonoticColorpickerString, focusable, float, 1);

        METHOD(XonoticColorpickerString, draw, void(entity));
        METHOD(XonoticColorpickerString, draw, void(entity));

-       ATTRIB(XonoticColorpickerString, disabledAlpha, float, 0.3)
+       ATTRIB(XonoticColorpickerString, disabledAlpha, float, 0.3);

 ENDCLASS(XonoticColorpickerString)
 entity makeXonoticColorpickerString(string theCvar, string theDefaultCvar);
 ENDCLASS(XonoticColorpickerString)
 entity makeXonoticColorpickerString(string theCvar, string theDefaultCvar);

diff --git a/qcsrc/menu/xonotic/commandbutton.qh b/qcsrc/menu/xonotic/commandbutton.qh
index 072890ab1e23b60738f631fed68e61c8a8556169..5de59ee07b9e6d3d6d80920422e807b260255dcd 100644 (file)
--- a/qcsrc/menu/xonotic/commandbutton.qh
+++ b/qcsrc/menu/xonotic/commandbutton.qh
@@ -3,8 +3,8 @@
 #include "button.qh"
 CLASS(XonoticCommandButton, XonoticButton)
        METHOD(XonoticCommandButton, configureXonoticCommandButton, void(entity, string, vector, string, float, string));
 #include "button.qh"
 CLASS(XonoticCommandButton, XonoticButton)
        METHOD(XonoticCommandButton, configureXonoticCommandButton, void(entity, string, vector, string, float, string));

-       ATTRIB(XonoticCommandButton, onClickCommand, string, string_null)
-       ATTRIB(XonoticCommandButton, flags, float, 0)
+       ATTRIB(XonoticCommandButton, onClickCommand, string);
+       ATTRIB(XonoticCommandButton, flags, float, 0);

 ENDCLASS(XonoticCommandButton)
 
 entity makeXonoticCommandButton_T(string theText, vector theColor, string theCommand, float closesMenu, string theTooltip);
 ENDCLASS(XonoticCommandButton)
 
 entity makeXonoticCommandButton_T(string theText, vector theColor, string theCommand, float closesMenu, string theTooltip);

diff --git a/qcsrc/menu/xonotic/credits.qh b/qcsrc/menu/xonotic/credits.qh
index d376beaa774adecd6e6fd7c91991548fd17d5ddc..8abc12c1998bc675d3c68f4fb2ca4dec751cd90b 100644 (file)
--- a/qcsrc/menu/xonotic/credits.qh
+++ b/qcsrc/menu/xonotic/credits.qh
@@ -3,20 +3,20 @@
 #include "listbox.qh"
 CLASS(XonoticCreditsList, XonoticListBox)
        METHOD(XonoticCreditsList, configureXonoticCreditsList, void(entity));
 #include "listbox.qh"
 CLASS(XonoticCreditsList, XonoticListBox)
        METHOD(XonoticCreditsList, configureXonoticCreditsList, void(entity));

-       ATTRIB(XonoticCreditsList, rowsPerItem, float, 1)
+       ATTRIB(XonoticCreditsList, rowsPerItem, float, 1);

        METHOD(XonoticCreditsList, draw, void(entity));
        METHOD(XonoticCreditsList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticCreditsList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticCreditsList, keyDown, float(entity, float, float, float));
        METHOD(XonoticCreditsList, destroy, void(entity));
        METHOD(XonoticCreditsList, draw, void(entity));
        METHOD(XonoticCreditsList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticCreditsList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticCreditsList, keyDown, float(entity, float, float, float));
        METHOD(XonoticCreditsList, destroy, void(entity));

-       ATTRIB(XonoticCreditsList, selectionDoesntMatter, bool, true)
+       ATTRIB(XonoticCreditsList, selectionDoesntMatter, bool, true);

 
 

-       ATTRIB(XonoticCreditsList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticCreditsList, realUpperMargin, float, 0)
-       ATTRIB(XonoticCreditsList, bufferIndex, float, 0)
-       ATTRIB(XonoticCreditsList, scrolling, float, 0)
+       ATTRIB(XonoticCreditsList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticCreditsList, realUpperMargin, float, 0);
+       ATTRIB(XonoticCreditsList, bufferIndex, float, 0);
+       ATTRIB(XonoticCreditsList, scrolling, float, 0);

 
 

-       ATTRIB(XonoticCreditsList, alphaBG, float, 0)
+       ATTRIB(XonoticCreditsList, alphaBG, float, 0);

 ENDCLASS(XonoticCreditsList)
 entity makeXonoticCreditsList();
 
 ENDCLASS(XonoticCreditsList)
 entity makeXonoticCreditsList();
 

diff --git a/qcsrc/menu/xonotic/crosshairpicker.qh b/qcsrc/menu/xonotic/crosshairpicker.qh
index b6f39457d2ff30a6b2de249422015b3d88e22870..78cb5df0c50ce601a9299f52dca8a996638cd260 100644 (file)
--- a/qcsrc/menu/xonotic/crosshairpicker.qh
+++ b/qcsrc/menu/xonotic/crosshairpicker.qh
@@ -4,8 +4,8 @@
 CLASS(XonoticCrosshairPicker, XonoticPicker)
        METHOD(XonoticCrosshairPicker, configureXonoticCrosshairPicker, void(entity));
 
 CLASS(XonoticCrosshairPicker, XonoticPicker)
        METHOD(XonoticCrosshairPicker, configureXonoticCrosshairPicker, void(entity));
 

-       ATTRIB(XonoticCrosshairPicker, rows, float, 3)
-       ATTRIB(XonoticCrosshairPicker, columns, float, 12)
+       ATTRIB(XonoticCrosshairPicker, rows, float, 3);
+       ATTRIB(XonoticCrosshairPicker, columns, float, 12);

 
        METHOD(XonoticCrosshairPicker, cellSelect, void(entity, vector));
        METHOD(XonoticCrosshairPicker, cellIsValid, bool(entity, vector));
 
        METHOD(XonoticCrosshairPicker, cellSelect, void(entity, vector));
        METHOD(XonoticCrosshairPicker, cellIsValid, bool(entity, vector));

diff --git a/qcsrc/menu/xonotic/crosshairpreview.qh b/qcsrc/menu/xonotic/crosshairpreview.qh
index dcc7be5ac6bff16490b6f72b7fe0c7018b1c74b4..7bf363def7f4b42ebf413bcea99b7871a7418a39 100644 (file)
--- a/qcsrc/menu/xonotic/crosshairpreview.qh
+++ b/qcsrc/menu/xonotic/crosshairpreview.qh
@@ -4,9 +4,9 @@
 CLASS(XonoticCrosshairPreview, Item)
        METHOD(XonoticCrosshairPreview, configureXonoticCrosshairPreview, void(entity));
        METHOD(XonoticCrosshairPreview, draw, void(entity));
 CLASS(XonoticCrosshairPreview, Item)
        METHOD(XonoticCrosshairPreview, configureXonoticCrosshairPreview, void(entity));
        METHOD(XonoticCrosshairPreview, draw, void(entity));

-       ATTRIB(XonoticCrosshairPreview, src, string, string_null)
-       ATTRIB(XonoticCrosshairPreview, src2, string, string_null)
-       ATTRIB(XonoticCrosshairPreview, disabled, float, 0)
-       ATTRIB(XonoticCrosshairPreview, disabledAlpha, float, SKINALPHA_DISABLED)
+       ATTRIB(XonoticCrosshairPreview, src, string);
+       ATTRIB(XonoticCrosshairPreview, src2, string);
+       ATTRIB(XonoticCrosshairPreview, disabled, float, 0);
+       ATTRIB(XonoticCrosshairPreview, disabledAlpha, float, SKINALPHA_DISABLED);

 ENDCLASS(XonoticCrosshairPreview)
 entity makeXonoticCrosshairPreview();
 ENDCLASS(XonoticCrosshairPreview)
 entity makeXonoticCrosshairPreview();

diff --git a/qcsrc/menu/xonotic/cvarlist.qh b/qcsrc/menu/xonotic/cvarlist.qh
index 2c99866cf7671d7bf35c9cdf438c7f2dbcdeeea7..1260ae447a42d0162c4b9969e06217886fe7675a 100644 (file)
--- a/qcsrc/menu/xonotic/cvarlist.qh
+++ b/qcsrc/menu/xonotic/cvarlist.qh
@@ -3,7 +3,7 @@
 #include "listbox.qh"
 CLASS(XonoticCvarList, XonoticListBox)
        METHOD(XonoticCvarList, configureXonoticCvarList, void(entity));
 #include "listbox.qh"
 CLASS(XonoticCvarList, XonoticListBox)
        METHOD(XonoticCvarList, configureXonoticCvarList, void(entity));

-       ATTRIB(XonoticCvarList, rowsPerItem, float, 1)
+       ATTRIB(XonoticCvarList, rowsPerItem, float, 1);

        METHOD(XonoticCvarList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticCvarList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticCvarList, keyDown, float(entity, float, float, float));
        METHOD(XonoticCvarList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticCvarList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticCvarList, keyDown, float(entity, float, float, float));


@@ -12,30 +12,30 @@ CLASS(XonoticCvarList, XonoticListBox)
 
        METHOD(XonoticCvarList, destroy, void(entity));
 
 
        METHOD(XonoticCvarList, destroy, void(entity));
 

-       ATTRIB(XonoticCvarList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticCvarList, realUpperMargin, float, 0)
-       ATTRIB(XonoticCvarList, columnNameOrigin, float, 0)
-       ATTRIB(XonoticCvarList, columnNameSize, float, 0)
-       ATTRIB(XonoticCvarList, columnValueOrigin, float, 0)
-       ATTRIB(XonoticCvarList, columnValueSize, float, 0)
+       ATTRIB(XonoticCvarList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticCvarList, realUpperMargin, float, 0);
+       ATTRIB(XonoticCvarList, columnNameOrigin, float, 0);
+       ATTRIB(XonoticCvarList, columnNameSize, float, 0);
+       ATTRIB(XonoticCvarList, columnValueOrigin, float, 0);
+       ATTRIB(XonoticCvarList, columnValueSize, float, 0);

 
        METHOD(XonoticCvarList, mouseRelease, float(entity, vector));
        METHOD(XonoticCvarList, setSelected, void(entity, float));
        METHOD(XonoticCvarList, updateCvarType, float(entity));
 
 
        METHOD(XonoticCvarList, mouseRelease, float(entity, vector));
        METHOD(XonoticCvarList, setSelected, void(entity, float));
        METHOD(XonoticCvarList, updateCvarType, float(entity));
 

-       ATTRIB(XonoticCvarList, controlledTextbox, entity, NULL)
-       ATTRIB(XonoticCvarList, cvarNameBox, entity, NULL)
-       ATTRIB(XonoticCvarList, cvarDescriptionBox, entity, NULL)
-       ATTRIB(XonoticCvarList, cvarTypeBox, entity, NULL)
-       ATTRIB(XonoticCvarList, cvarValueBox, entity, NULL)
-       ATTRIB(XonoticCvarList, cvarDefaultBox, entity, NULL)
-       ATTRIB(XonoticCvarList, cvarNeedsForcing, float, 0)
+       ATTRIB(XonoticCvarList, controlledTextbox, entity);
+       ATTRIB(XonoticCvarList, cvarNameBox, entity);
+       ATTRIB(XonoticCvarList, cvarDescriptionBox, entity);
+       ATTRIB(XonoticCvarList, cvarTypeBox, entity);
+       ATTRIB(XonoticCvarList, cvarValueBox, entity);
+       ATTRIB(XonoticCvarList, cvarDefaultBox, entity);
+       ATTRIB(XonoticCvarList, cvarNeedsForcing, float, 0);

 
 

-       ATTRIB(XonoticCvarList, handle, float, -1)
-       ATTRIB(XonoticCvarList, cvarName, string, string_null)
-       ATTRIB(XonoticCvarList, cvarDescription, string, string_null)
-       ATTRIB(XonoticCvarList, cvarType, string, string_null)
-       ATTRIB(XonoticCvarList, cvarDefault, string, string_null)
+       ATTRIB(XonoticCvarList, handle, float, -1);
+       ATTRIB(XonoticCvarList, cvarName, string);
+       ATTRIB(XonoticCvarList, cvarDescription, string);
+       ATTRIB(XonoticCvarList, cvarType, string);
+       ATTRIB(XonoticCvarList, cvarDefault, string);

 ENDCLASS(XonoticCvarList)
 entity makeXonoticCvarList();
 void CvarList_Filter_Change(entity box, entity me);
 ENDCLASS(XonoticCvarList)
 entity makeXonoticCvarList();
 void CvarList_Filter_Change(entity box, entity me);

diff --git a/qcsrc/menu/xonotic/datasource.qh b/qcsrc/menu/xonotic/datasource.qh
index 1ca3d5811fd316192c7ca4b86bbf5b10ada6ca5c..87c614ab737b31a34d5a2c447693b69679e6a3a7 100644 (file)
--- a/qcsrc/menu/xonotic/datasource.qh
+++ b/qcsrc/menu/xonotic/datasource.qh
@@ -19,15 +19,15 @@ ENDCLASS(DataSource)
 
 
 CLASS(StringSource, DataSource)
 
 
 CLASS(StringSource, DataSource)

-    ATTRIB(StringSource, StringSource_str, string, string_null)
-    ATTRIB(StringSource, StringSource_sep, string, string_null)
+    ATTRIB(StringSource, StringSource_str, string);
+    ATTRIB(StringSource, StringSource_sep, string);

     CONSTRUCTOR(StringSource, string str, string sep);
     METHOD(StringSource, getEntry, entity(entity this, int i, void(string name, string icon) returns));
     METHOD(StringSource, reload, int(entity this, string filter));
 ENDCLASS(StringSource)
 
 CLASS(CvarStringSource, StringSource)
     CONSTRUCTOR(StringSource, string str, string sep);
     METHOD(StringSource, getEntry, entity(entity this, int i, void(string name, string icon) returns));
     METHOD(StringSource, reload, int(entity this, string filter));
 ENDCLASS(StringSource)
 
 CLASS(CvarStringSource, StringSource)

-    ATTRIB(CvarStringSource, CvarStringSource_cvar, string, string_null)
+    ATTRIB(CvarStringSource, CvarStringSource_cvar, string);

     CONSTRUCTOR(CvarStringSource, string cv, string sep);
     METHOD(CvarStringSource, getEntry, entity(entity this, int i, void(string name, string icon) returns));
     METHOD(CvarStringSource, reload, int(entity this, string filter));
     CONSTRUCTOR(CvarStringSource, string cv, string sep);
     METHOD(CvarStringSource, getEntry, entity(entity this, int i, void(string name, string icon) returns));
     METHOD(CvarStringSource, reload, int(entity this, string filter));

diff --git a/qcsrc/menu/xonotic/demolist.qh b/qcsrc/menu/xonotic/demolist.qh
index 547bf6695dff6ea62df429f7432679e3a204fe77..6341db1a3e1da23f081c28044d4b057e43d0243d 100644 (file)
--- a/qcsrc/menu/xonotic/demolist.qh
+++ b/qcsrc/menu/xonotic/demolist.qh
@@ -4,7 +4,7 @@
 #include "listbox.qh"
 CLASS(XonoticDemoList, XonoticListBox)
        METHOD(XonoticDemoList, configureXonoticDemoList, void(entity));
 #include "listbox.qh"
 CLASS(XonoticDemoList, XonoticListBox)
        METHOD(XonoticDemoList, configureXonoticDemoList, void(entity));

-       ATTRIB(XonoticDemoList, rowsPerItem, float, 1)
+       ATTRIB(XonoticDemoList, rowsPerItem, float, 1);

        METHOD(XonoticDemoList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticDemoList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticDemoList, getDemos, void(entity));
        METHOD(XonoticDemoList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticDemoList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticDemoList, getDemos, void(entity));


@@ -16,15 +16,15 @@ CLASS(XonoticDemoList, XonoticListBox)
        METHOD(XonoticDemoList, destroy, void(entity));
        METHOD(XonoticDemoList, showNotify, void(entity));
 
        METHOD(XonoticDemoList, destroy, void(entity));
        METHOD(XonoticDemoList, showNotify, void(entity));
 

-       ATTRIB(XonoticDemoList, listDemo, float, -1)
-       ATTRIB(XonoticDemoList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticDemoList, columnNameOrigin, float, 0)
-       ATTRIB(XonoticDemoList, columnNameSize, float, 0)
-       ATTRIB(XonoticDemoList, realUpperMargin, float, 0)
-       ATTRIB(XonoticDemoList, origin, vector, '0 0 0')
-       ATTRIB(XonoticDemoList, itemAbsSize, vector, '0 0 0')
+       ATTRIB(XonoticDemoList, listDemo, float, -1);
+       ATTRIB(XonoticDemoList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticDemoList, columnNameOrigin, float, 0);
+       ATTRIB(XonoticDemoList, columnNameSize, float, 0);
+       ATTRIB(XonoticDemoList, realUpperMargin, float, 0);
+       ATTRIB(XonoticDemoList, origin, vector, '0 0 0');
+       ATTRIB(XonoticDemoList, itemAbsSize, vector, '0 0 0');

 
 

-       ATTRIB(XonoticDemoList, filterString, string, string_null)
+       ATTRIB(XonoticDemoList, filterString, string);

 ENDCLASS(XonoticDemoList)
 
 entity demolist;  // for reference elsewhere
 ENDCLASS(XonoticDemoList)
 
 entity demolist;  // for reference elsewhere

diff --git a/qcsrc/menu/xonotic/dialog.qh b/qcsrc/menu/xonotic/dialog.qh
index a3612698ff80e93a8f1b0236b9c952abb93f9da8..847233d6ac908615abcf348d4e49dfe1ba2b7721 100644 (file)
--- a/qcsrc/menu/xonotic/dialog.qh
+++ b/qcsrc/menu/xonotic/dialog.qh
@@ -4,30 +4,30 @@
 CLASS(XonoticDialog, Dialog)
        // still to be customized by user
        /*
 CLASS(XonoticDialog, Dialog)
        // still to be customized by user
        /*

-       ATTRIB(XonoticDialog, closable, float, 1)
-       ATTRIB(XonoticDialog, title, string, _("Form1")) // ;)
-       ATTRIB(XonoticDialog, color, vector, '1 0.5 1')
-       ATTRIB(XonoticDialog, intendedWidth, float, 0)
-       ATTRIB(XonoticDialog, rows, float, 3)
-       ATTRIB(XonoticDialog, columns, float, 2)
+       ATTRIB(XonoticDialog, closable, float, 1);
+       ATTRIB(XonoticDialog, title, string, _("Form1")); // ;);
+       ATTRIB(XonoticDialog, color, vector, '1 0.5 1');
+       ATTRIB(XonoticDialog, intendedWidth, float, 0);
+       ATTRIB(XonoticDialog, rows, float, 3);
+       ATTRIB(XonoticDialog, columns, float, 2);

        */
        */

-       ATTRIB(XonoticDialog, marginTop, float, SKINMARGIN_TOP)                          // pixels
-       ATTRIB(XonoticDialog, marginBottom, float, SKINMARGIN_BOTTOM)                    // pixels
-       ATTRIB(XonoticDialog, marginLeft, float, SKINMARGIN_LEFT)                        // pixels
-       ATTRIB(XonoticDialog, marginRight, float, SKINMARGIN_RIGHT)                      // pixels
-       ATTRIB(XonoticDialog, columnSpacing, float, SKINMARGIN_COLUMNS)                  // pixels
-       ATTRIB(XonoticDialog, rowSpacing, float, SKINMARGIN_ROWS)                        // pixels
-       ATTRIB(XonoticDialog, rowHeight, float, SKINFONTSIZE_NORMAL * SKINHEIGHT_NORMAL) // pixels
-       ATTRIB(XonoticDialog, titleHeight, float, SKINFONTSIZE_TITLE * SKINHEIGHT_TITLE) // pixels
-       ATTRIB(XonoticDialog, titleFontSize, float, SKINFONTSIZE_TITLE)                  // pixels
+       ATTRIB(XonoticDialog, marginTop, float, SKINMARGIN_TOP);                          // pixels
+       ATTRIB(XonoticDialog, marginBottom, float, SKINMARGIN_BOTTOM);                    // pixels
+       ATTRIB(XonoticDialog, marginLeft, float, SKINMARGIN_LEFT);                        // pixels
+       ATTRIB(XonoticDialog, marginRight, float, SKINMARGIN_RIGHT);                      // pixels
+       ATTRIB(XonoticDialog, columnSpacing, float, SKINMARGIN_COLUMNS);                  // pixels
+       ATTRIB(XonoticDialog, rowSpacing, float, SKINMARGIN_ROWS);                        // pixels
+       ATTRIB(XonoticDialog, rowHeight, float, SKINFONTSIZE_NORMAL * SKINHEIGHT_NORMAL); // pixels
+       ATTRIB(XonoticDialog, titleHeight, float, SKINFONTSIZE_TITLE * SKINHEIGHT_TITLE); // pixels
+       ATTRIB(XonoticDialog, titleFontSize, float, SKINFONTSIZE_TITLE);                  // pixels

 
 

-       ATTRIB(XonoticDialog, backgroundImage, string, SKINGFX_DIALOGBORDER)
-       ATTRIB(XonoticDialog, borderLines, float, SKINHEIGHT_DIALOGBORDER)
-       ATTRIB(XonoticDialog, closeButtonImage, string, SKINGFX_CLOSEBUTTON)
-       ATTRIB(XonoticDialog, zoomedOutTitleBarPosition, float, SKINHEIGHT_ZOOMEDTITLE * 0.5 - 0.5)
-       ATTRIB(XonoticDialog, zoomedOutTitleBar, float, SKINHEIGHT_ZOOMEDTITLE != 0)
+       ATTRIB(XonoticDialog, backgroundImage, string, SKINGFX_DIALOGBORDER);
+       ATTRIB(XonoticDialog, borderLines, float, SKINHEIGHT_DIALOGBORDER);
+       ATTRIB(XonoticDialog, closeButtonImage, string, SKINGFX_CLOSEBUTTON);
+       ATTRIB(XonoticDialog, zoomedOutTitleBarPosition, float, SKINHEIGHT_ZOOMEDTITLE * 0.5 - 0.5);
+       ATTRIB(XonoticDialog, zoomedOutTitleBar, float, SKINHEIGHT_ZOOMEDTITLE != 0);

 
 

-       ATTRIB(XonoticDialog, alpha, float, SKINALPHA_TEXT)
+       ATTRIB(XonoticDialog, alpha, float, SKINALPHA_TEXT);

 
        METHOD(XonoticDialog, configureDialog, void(entity));
 ENDCLASS(XonoticDialog)
 
        METHOD(XonoticDialog, configureDialog, void(entity));
 ENDCLASS(XonoticDialog)

diff --git a/qcsrc/menu/xonotic/dialog_credits.qh b/qcsrc/menu/xonotic/dialog_credits.qh
index 90d722ed35aa3fe624274e83f4eee5f1fc0a7fca..3be2e2b3f5873b5e3f7160c32150caa4383c6b4d 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_credits.qh
+++ b/qcsrc/menu/xonotic/dialog_credits.qh
@@ -4,11 +4,11 @@
 CLASS(XonoticCreditsDialog, XonoticDialog)
        METHOD(XonoticCreditsDialog, fill, void(entity));
        METHOD(XonoticCreditsDialog, focusEnter, void(entity));
 CLASS(XonoticCreditsDialog, XonoticDialog)
        METHOD(XonoticCreditsDialog, fill, void(entity));
        METHOD(XonoticCreditsDialog, focusEnter, void(entity));

-       ATTRIB(XonoticCreditsDialog, title, string, _("Credits"))
-       ATTRIB(XonoticCreditsDialog, tooltip, string, _("The Xonotic credits"))
-       ATTRIB(XonoticCreditsDialog, color, vector, SKINCOLOR_DIALOG_CREDITS)
-       ATTRIB(XonoticCreditsDialog, intendedWidth, float, SKINWIDTH_CREDITS)
-       ATTRIB(XonoticCreditsDialog, rows, float, SKINROWS_CREDITS)
-       ATTRIB(XonoticCreditsDialog, columns, float, 2)
-       ATTRIB(XonoticCreditsDialog, creditsList, entity, NULL)
+       ATTRIB(XonoticCreditsDialog, title, string, _("Credits"));
+       ATTRIB(XonoticCreditsDialog, tooltip, string, _("The Xonotic credits"));
+       ATTRIB(XonoticCreditsDialog, color, vector, SKINCOLOR_DIALOG_CREDITS);
+       ATTRIB(XonoticCreditsDialog, intendedWidth, float, SKINWIDTH_CREDITS);
+       ATTRIB(XonoticCreditsDialog, rows, float, SKINROWS_CREDITS);
+       ATTRIB(XonoticCreditsDialog, columns, float, 2);
+       ATTRIB(XonoticCreditsDialog, creditsList, entity);

 ENDCLASS(XonoticCreditsDialog)
 ENDCLASS(XonoticCreditsDialog)

diff --git a/qcsrc/menu/xonotic/dialog_firstrun.qh b/qcsrc/menu/xonotic/dialog_firstrun.qh
index ff7099b6b98b398a90da70dc3cba3273eaea275e..51a56bb6aa66a7e3d9b1411d5351015a1904c11f 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_firstrun.qh
+++ b/qcsrc/menu/xonotic/dialog_firstrun.qh
@@ -3,14 +3,14 @@
 #include "rootdialog.qh"
 CLASS(XonoticFirstRunDialog, XonoticRootDialog)
        METHOD(XonoticFirstRunDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticFirstRunDialog, XonoticRootDialog)
        METHOD(XonoticFirstRunDialog, fill, void(entity));

-       ATTRIB(XonoticFirstRunDialog, title, string, _("Welcome"))
-       ATTRIB(XonoticFirstRunDialog, color, vector, SKINCOLOR_DIALOG_FIRSTRUN)
-       ATTRIB(XonoticFirstRunDialog, intendedWidth, float, 0.7)
-       ATTRIB(XonoticFirstRunDialog, rows, float, 16)
-       ATTRIB(XonoticFirstRunDialog, columns, float, 6)
-       ATTRIB(XonoticFirstRunDialog, name, string, "FirstRun")
-       ATTRIB(XonoticFirstRunDialog, playerNameLabel, entity, NULL)
-       ATTRIB(XonoticFirstRunDialog, playerNameLabelAlpha, float, 0)
+       ATTRIB(XonoticFirstRunDialog, title, string, _("Welcome"));
+       ATTRIB(XonoticFirstRunDialog, color, vector, SKINCOLOR_DIALOG_FIRSTRUN);
+       ATTRIB(XonoticFirstRunDialog, intendedWidth, float, 0.7);
+       ATTRIB(XonoticFirstRunDialog, rows, float, 16);
+       ATTRIB(XonoticFirstRunDialog, columns, float, 6);
+       ATTRIB(XonoticFirstRunDialog, name, string, "FirstRun");
+       ATTRIB(XonoticFirstRunDialog, playerNameLabel, entity);
+       ATTRIB(XonoticFirstRunDialog, playerNameLabelAlpha, float, 0);

 
 

-       ATTRIB(XonoticFirstRunDialog, closable, float, 0)
+       ATTRIB(XonoticFirstRunDialog, closable, float, 0);

 ENDCLASS(XonoticFirstRunDialog)
 ENDCLASS(XonoticFirstRunDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_ammo.qh b/qcsrc/menu/xonotic/dialog_hudpanel_ammo.qh
index 237bcbbd152c923f700ce01952b95a68ece3e97c..9113a02794b1b08f810b009dd491c06fd8be7ab6 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_ammo.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_ammo.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDAmmoDialog, XonoticRootDialog)
        METHOD(XonoticHUDAmmoDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDAmmoDialog, XonoticRootDialog)
        METHOD(XonoticHUDAmmoDialog, fill, void(entity));

-       ATTRIB(XonoticHUDAmmoDialog, title, string, _("Ammo Panel"))
-       ATTRIB(XonoticHUDAmmoDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDAmmoDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDAmmoDialog, rows, float, 15)
-       ATTRIB(XonoticHUDAmmoDialog, columns, float, 4)
-       ATTRIB(XonoticHUDAmmoDialog, name, string, "HUDammo")
-       ATTRIB(XonoticHUDAmmoDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDAmmoDialog, title, string, _("Ammo Panel"));
+       ATTRIB(XonoticHUDAmmoDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDAmmoDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDAmmoDialog, rows, float, 15);
+       ATTRIB(XonoticHUDAmmoDialog, columns, float, 4);
+       ATTRIB(XonoticHUDAmmoDialog, name, string, "HUDammo");
+       ATTRIB(XonoticHUDAmmoDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDAmmoDialog)
 ENDCLASS(XonoticHUDAmmoDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qh b/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qh
index 370dbe4eb84d098ad4a21dab582f4c5164d3b74e..9fc6846eb9a0d5d044a27ed4c99937190ab3137c 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_centerprint.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDCenterprintDialog, XonoticRootDialog)
        METHOD(XonoticHUDCenterprintDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDCenterprintDialog, XonoticRootDialog)
        METHOD(XonoticHUDCenterprintDialog, fill, void(entity));

-       ATTRIB(XonoticHUDCenterprintDialog, title, string, _("Centerprint Panel"))
-       ATTRIB(XonoticHUDCenterprintDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDCenterprintDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDCenterprintDialog, rows, float, 15)
-       ATTRIB(XonoticHUDCenterprintDialog, columns, float, 4)
-       ATTRIB(XonoticHUDCenterprintDialog, name, string, "HUDcenterprint")
-       ATTRIB(XonoticHUDCenterprintDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDCenterprintDialog, title, string, _("Centerprint Panel"));
+       ATTRIB(XonoticHUDCenterprintDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDCenterprintDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDCenterprintDialog, rows, float, 15);
+       ATTRIB(XonoticHUDCenterprintDialog, columns, float, 4);
+       ATTRIB(XonoticHUDCenterprintDialog, name, string, "HUDcenterprint");
+       ATTRIB(XonoticHUDCenterprintDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDCenterprintDialog)
 ENDCLASS(XonoticHUDCenterprintDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_chat.qh b/qcsrc/menu/xonotic/dialog_hudpanel_chat.qh
index b30ea9fb2cc435bc616e8bfe49e06632b1bc11a6..570c2d616cde334e7402acc4d061ccad7c299d5d 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_chat.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_chat.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDChatDialog, XonoticRootDialog)
        METHOD(XonoticHUDChatDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDChatDialog, XonoticRootDialog)
        METHOD(XonoticHUDChatDialog, fill, void(entity));

-       ATTRIB(XonoticHUDChatDialog, title, string, _("Chat Panel"))
-       ATTRIB(XonoticHUDChatDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDChatDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDChatDialog, rows, float, 15)
-       ATTRIB(XonoticHUDChatDialog, columns, float, 4)
-       ATTRIB(XonoticHUDChatDialog, name, string, "HUDchat")
-       ATTRIB(XonoticHUDChatDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDChatDialog, title, string, _("Chat Panel"));
+       ATTRIB(XonoticHUDChatDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDChatDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDChatDialog, rows, float, 15);
+       ATTRIB(XonoticHUDChatDialog, columns, float, 4);
+       ATTRIB(XonoticHUDChatDialog, name, string, "HUDchat");
+       ATTRIB(XonoticHUDChatDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDChatDialog)
 ENDCLASS(XonoticHUDChatDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qh b/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qh
index a28897d8c526f6e581ec7b7d0a80a8d8c7b757ef..b741465024d78a9917639aedabd61c209ae026ca 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDEngineInfoDialog, XonoticRootDialog)
        METHOD(XonoticHUDEngineInfoDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDEngineInfoDialog, XonoticRootDialog)
        METHOD(XonoticHUDEngineInfoDialog, fill, void(entity));

-       ATTRIB(XonoticHUDEngineInfoDialog, title, string, _("Engine Info Panel"))
-       ATTRIB(XonoticHUDEngineInfoDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDEngineInfoDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDEngineInfoDialog, rows, float, 15)
-       ATTRIB(XonoticHUDEngineInfoDialog, columns, float, 4)
-       ATTRIB(XonoticHUDEngineInfoDialog, name, string, "HUDengineinfo")
-       ATTRIB(XonoticHUDEngineInfoDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDEngineInfoDialog, title, string, _("Engine Info Panel"));
+       ATTRIB(XonoticHUDEngineInfoDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDEngineInfoDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDEngineInfoDialog, rows, float, 15);
+       ATTRIB(XonoticHUDEngineInfoDialog, columns, float, 4);
+       ATTRIB(XonoticHUDEngineInfoDialog, name, string, "HUDengineinfo");
+       ATTRIB(XonoticHUDEngineInfoDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDEngineInfoDialog)
 ENDCLASS(XonoticHUDEngineInfoDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qh b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qh
index 495047c5fca1788ff6cb4e21b338fd0c8b0e9878..b37f41b76ef5f1ecf91a8d2056d2fe8cab68a98e 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDHealthArmorDialog, XonoticRootDialog)
        METHOD(XonoticHUDHealthArmorDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDHealthArmorDialog, XonoticRootDialog)
        METHOD(XonoticHUDHealthArmorDialog, fill, void(entity));

-       ATTRIB(XonoticHUDHealthArmorDialog, title, string, _("Health/Armor Panel"))
-       ATTRIB(XonoticHUDHealthArmorDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDHealthArmorDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDHealthArmorDialog, rows, float, 16)
-       ATTRIB(XonoticHUDHealthArmorDialog, columns, float, 4)
-       ATTRIB(XonoticHUDHealthArmorDialog, name, string, "HUDhealtharmor")
-       ATTRIB(XonoticHUDHealthArmorDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDHealthArmorDialog, title, string, _("Health/Armor Panel"));
+       ATTRIB(XonoticHUDHealthArmorDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDHealthArmorDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDHealthArmorDialog, rows, float, 16);
+       ATTRIB(XonoticHUDHealthArmorDialog, columns, float, 4);
+       ATTRIB(XonoticHUDHealthArmorDialog, name, string, "HUDhealtharmor");
+       ATTRIB(XonoticHUDHealthArmorDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDHealthArmorDialog)
 ENDCLASS(XonoticHUDHealthArmorDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qh b/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qh
index 093bc00dfdf522c4ce0f2d0f266e352f51cd08ab..5d9032ffb0fdf3e307190fd5a77353b425b5a099 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDInfoMessagesDialog, XonoticRootDialog)
        METHOD(XonoticHUDInfoMessagesDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDInfoMessagesDialog, XonoticRootDialog)
        METHOD(XonoticHUDInfoMessagesDialog, fill, void(entity));

-       ATTRIB(XonoticHUDInfoMessagesDialog, title, string, _("Info Messages Panel"))
-       ATTRIB(XonoticHUDInfoMessagesDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDInfoMessagesDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDInfoMessagesDialog, rows, float, 15)
-       ATTRIB(XonoticHUDInfoMessagesDialog, columns, float, 4)
-       ATTRIB(XonoticHUDInfoMessagesDialog, name, string, "HUDinfomessages")
-       ATTRIB(XonoticHUDInfoMessagesDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDInfoMessagesDialog, title, string, _("Info Messages Panel"));
+       ATTRIB(XonoticHUDInfoMessagesDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDInfoMessagesDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDInfoMessagesDialog, rows, float, 15);
+       ATTRIB(XonoticHUDInfoMessagesDialog, columns, float, 4);
+       ATTRIB(XonoticHUDInfoMessagesDialog, name, string, "HUDinfomessages");
+       ATTRIB(XonoticHUDInfoMessagesDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDInfoMessagesDialog)
 ENDCLASS(XonoticHUDInfoMessagesDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qh b/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qh
index 71b53e6909aa43c5a504207adc57ecc274e4e608..507dedb7c95cc068adc2d478cf4a83795c72e620 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_itemstime.qh
@@ -3,10 +3,10 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDItemsTimeDialog, XonoticRootDialog)
        METHOD(XonoticHUDItemsTimeDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDItemsTimeDialog, XonoticRootDialog)
        METHOD(XonoticHUDItemsTimeDialog, fill, void(entity));

-       ATTRIB(XonoticHUDItemsTimeDialog, title, string, _("Items Time Panel"))
-       ATTRIB(XonoticHUDItemsTimeDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDItemsTimeDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDItemsTimeDialog, rows, float, 15)
-       ATTRIB(XonoticHUDItemsTimeDialog, columns, float, 4)
-       ATTRIB(XonoticHUDItemsTimeDialog, name, string, "HUDitemstime")
+       ATTRIB(XonoticHUDItemsTimeDialog, title, string, _("Items Time Panel"));
+       ATTRIB(XonoticHUDItemsTimeDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDItemsTimeDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDItemsTimeDialog, rows, float, 15);
+       ATTRIB(XonoticHUDItemsTimeDialog, columns, float, 4);
+       ATTRIB(XonoticHUDItemsTimeDialog, name, string, "HUDitemstime");

 ENDCLASS(XonoticHUDItemsTimeDialog)
 ENDCLASS(XonoticHUDItemsTimeDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_modicons.qh b/qcsrc/menu/xonotic/dialog_hudpanel_modicons.qh
index feb36e206cb3765d15c8479b8e0fe1fad5f8c8c8..3a3b72f6c9989df94d4695b135ed30f96f6186e5 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_modicons.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_modicons.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDModIconsDialog, XonoticRootDialog)
        METHOD(XonoticHUDModIconsDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDModIconsDialog, XonoticRootDialog)
        METHOD(XonoticHUDModIconsDialog, fill, void(entity));

-       ATTRIB(XonoticHUDModIconsDialog, title, string, _("Mod Icons Panel"))
-       ATTRIB(XonoticHUDModIconsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDModIconsDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDModIconsDialog, rows, float, 15)
-       ATTRIB(XonoticHUDModIconsDialog, columns, float, 4)
-       ATTRIB(XonoticHUDModIconsDialog, name, string, "HUDmodicons")
-       ATTRIB(XonoticHUDModIconsDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDModIconsDialog, title, string, _("Mod Icons Panel"));
+       ATTRIB(XonoticHUDModIconsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDModIconsDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDModIconsDialog, rows, float, 15);
+       ATTRIB(XonoticHUDModIconsDialog, columns, float, 4);
+       ATTRIB(XonoticHUDModIconsDialog, name, string, "HUDmodicons");
+       ATTRIB(XonoticHUDModIconsDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDModIconsDialog)
 ENDCLASS(XonoticHUDModIconsDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_notification.qh b/qcsrc/menu/xonotic/dialog_hudpanel_notification.qh
index ad150076d04f936f0fda499222480d07c3c949d5..f816e4ffe042fd9d6f6f6ba84c46cecbdddc97b6 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_notification.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_notification.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDNotificationDialog, XonoticRootDialog)
        METHOD(XonoticHUDNotificationDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDNotificationDialog, XonoticRootDialog)
        METHOD(XonoticHUDNotificationDialog, fill, void(entity));

-       ATTRIB(XonoticHUDNotificationDialog, title, string, _("Notification Panel"))
-       ATTRIB(XonoticHUDNotificationDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDNotificationDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDNotificationDialog, rows, float, 15)
-       ATTRIB(XonoticHUDNotificationDialog, columns, float, 4)
-       ATTRIB(XonoticHUDNotificationDialog, name, string, "HUDnotify")
-       ATTRIB(XonoticHUDNotificationDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDNotificationDialog, title, string, _("Notification Panel"));
+       ATTRIB(XonoticHUDNotificationDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDNotificationDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDNotificationDialog, rows, float, 15);
+       ATTRIB(XonoticHUDNotificationDialog, columns, float, 4);
+       ATTRIB(XonoticHUDNotificationDialog, name, string, "HUDnotify");
+       ATTRIB(XonoticHUDNotificationDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDNotificationDialog)
 ENDCLASS(XonoticHUDNotificationDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_physics.qh b/qcsrc/menu/xonotic/dialog_hudpanel_physics.qh
index 1d9c29289c285325cdf78c685dcd69d403995e82..f6f19135d1f7a257d001d4af567bd01d50d03adc 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_physics.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_physics.qh
@@ -3,12 +3,12 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDPhysicsDialog, XonoticRootDialog)
        METHOD(XonoticHUDPhysicsDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDPhysicsDialog, XonoticRootDialog)
        METHOD(XonoticHUDPhysicsDialog, fill, void(entity));

-       ATTRIB(XonoticHUDPhysicsDialog, title, string, _("Physics Panel"))
-       ATTRIB(XonoticHUDPhysicsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDPhysicsDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDPhysicsDialog, rows, float, 15)
-       ATTRIB(XonoticHUDPhysicsDialog, columns, float, 4)
-       ATTRIB(XonoticHUDPhysicsDialog, name, string, "HUDphysics")
-       ATTRIB(XonoticHUDPhysicsDialog, sliderTopspeedTime, entity, NULL)
-       ATTRIB(XonoticHUDPhysicsDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDPhysicsDialog, title, string, _("Physics Panel"));
+       ATTRIB(XonoticHUDPhysicsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDPhysicsDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDPhysicsDialog, rows, float, 15);
+       ATTRIB(XonoticHUDPhysicsDialog, columns, float, 4);
+       ATTRIB(XonoticHUDPhysicsDialog, name, string, "HUDphysics");
+       ATTRIB(XonoticHUDPhysicsDialog, sliderTopspeedTime, entity);
+       ATTRIB(XonoticHUDPhysicsDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDPhysicsDialog)
 ENDCLASS(XonoticHUDPhysicsDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qh b/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qh
index ebb09b0ba5cf7118fb0d7bdc52f7c2470421adfb..7f67fa6007b6f2423dfd54158ead5a20f038f36d 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_powerups.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDPowerupsDialog, XonoticRootDialog)
        METHOD(XonoticHUDPowerupsDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDPowerupsDialog, XonoticRootDialog)
        METHOD(XonoticHUDPowerupsDialog, fill, void(entity));

-       ATTRIB(XonoticHUDPowerupsDialog, title, string, _("Powerups Panel"))
-       ATTRIB(XonoticHUDPowerupsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDPowerupsDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDPowerupsDialog, rows, float, 14)
-       ATTRIB(XonoticHUDPowerupsDialog, columns, float, 4)
-       ATTRIB(XonoticHUDPowerupsDialog, name, string, "HUDpowerups")
-       ATTRIB(XonoticHUDPowerupsDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDPowerupsDialog, title, string, _("Powerups Panel"));
+       ATTRIB(XonoticHUDPowerupsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDPowerupsDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDPowerupsDialog, rows, float, 14);
+       ATTRIB(XonoticHUDPowerupsDialog, columns, float, 4);
+       ATTRIB(XonoticHUDPowerupsDialog, name, string, "HUDpowerups");
+       ATTRIB(XonoticHUDPowerupsDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDPowerupsDialog)
 ENDCLASS(XonoticHUDPowerupsDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qh b/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qh
index c4b7a90969b10498b62cc0b99137c814e86fef02..cc82959e6443af3c3ffc594da63504f66cf399dd 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDPressedKeysDialog, XonoticRootDialog)
        METHOD(XonoticHUDPressedKeysDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDPressedKeysDialog, XonoticRootDialog)
        METHOD(XonoticHUDPressedKeysDialog, fill, void(entity));

-       ATTRIB(XonoticHUDPressedKeysDialog, title, string, _("Pressed Keys Panel"))
-       ATTRIB(XonoticHUDPressedKeysDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDPressedKeysDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDPressedKeysDialog, rows, float, 15)
-       ATTRIB(XonoticHUDPressedKeysDialog, columns, float, 4)
-       ATTRIB(XonoticHUDPressedKeysDialog, name, string, "HUDpressedkeys")
-       ATTRIB(XonoticHUDPressedKeysDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDPressedKeysDialog, title, string, _("Pressed Keys Panel"));
+       ATTRIB(XonoticHUDPressedKeysDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDPressedKeysDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDPressedKeysDialog, rows, float, 15);
+       ATTRIB(XonoticHUDPressedKeysDialog, columns, float, 4);
+       ATTRIB(XonoticHUDPressedKeysDialog, name, string, "HUDpressedkeys");
+       ATTRIB(XonoticHUDPressedKeysDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDPressedKeysDialog)
 ENDCLASS(XonoticHUDPressedKeysDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qh b/qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qh
index 396f62b2638579ece5c2e21cccf89c3b0f9b775a..16f93c13d584579397f754ca3a78ec9dcdba7de4 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.qh
@@ -3,10 +3,10 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDQuickMenuDialog, XonoticRootDialog)
        METHOD(XonoticHUDQuickMenuDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDQuickMenuDialog, XonoticRootDialog)
        METHOD(XonoticHUDQuickMenuDialog, fill, void(entity));

-       ATTRIB(XonoticHUDQuickMenuDialog, title, string, _("Quick Menu Panel"))
-       ATTRIB(XonoticHUDQuickMenuDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDQuickMenuDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDQuickMenuDialog, rows, float, 15)
-       ATTRIB(XonoticHUDQuickMenuDialog, columns, float, 4)
-       ATTRIB(XonoticHUDQuickMenuDialog, name, string, "HUDquickmenu")
+       ATTRIB(XonoticHUDQuickMenuDialog, title, string, _("Quick Menu Panel"));
+       ATTRIB(XonoticHUDQuickMenuDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDQuickMenuDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDQuickMenuDialog, rows, float, 15);
+       ATTRIB(XonoticHUDQuickMenuDialog, columns, float, 4);
+       ATTRIB(XonoticHUDQuickMenuDialog, name, string, "HUDquickmenu");

 ENDCLASS(XonoticHUDQuickMenuDialog)
 ENDCLASS(XonoticHUDQuickMenuDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qh b/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qh
index 81dca5126162f20b85c66deef4828c4dc6ca8d2a..7c814e3823e3586d7a2c9d14edb9a2a688f67cd0 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDRaceTimerDialog, XonoticRootDialog)
        METHOD(XonoticHUDRaceTimerDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDRaceTimerDialog, XonoticRootDialog)
        METHOD(XonoticHUDRaceTimerDialog, fill, void(entity));

-       ATTRIB(XonoticHUDRaceTimerDialog, title, string, _("Race Timer Panel"))
-       ATTRIB(XonoticHUDRaceTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDRaceTimerDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDRaceTimerDialog, rows, float, 15)
-       ATTRIB(XonoticHUDRaceTimerDialog, columns, float, 4)
-       ATTRIB(XonoticHUDRaceTimerDialog, name, string, "HUDracetimer")
-       ATTRIB(XonoticHUDRaceTimerDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDRaceTimerDialog, title, string, _("Race Timer Panel"));
+       ATTRIB(XonoticHUDRaceTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDRaceTimerDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDRaceTimerDialog, rows, float, 15);
+       ATTRIB(XonoticHUDRaceTimerDialog, columns, float, 4);
+       ATTRIB(XonoticHUDRaceTimerDialog, name, string, "HUDracetimer");
+       ATTRIB(XonoticHUDRaceTimerDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDRaceTimerDialog)
 ENDCLASS(XonoticHUDRaceTimerDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_radar.qh b/qcsrc/menu/xonotic/dialog_hudpanel_radar.qh
index 6744e22741e4837fdb5c8d04272297ab775cfab9..04617b677f4c04a7444cf5de08444c1c67532f25 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_radar.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_radar.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDRadarDialog, XonoticRootDialog)
        METHOD(XonoticHUDRadarDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDRadarDialog, XonoticRootDialog)
        METHOD(XonoticHUDRadarDialog, fill, void(entity));

-       ATTRIB(XonoticHUDRadarDialog, title, string, _("Radar Panel"))
-       ATTRIB(XonoticHUDRadarDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDRadarDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDRadarDialog, rows, float, 15)
-       ATTRIB(XonoticHUDRadarDialog, columns, float, 4)
-       ATTRIB(XonoticHUDRadarDialog, name, string, "HUDradar")
-       ATTRIB(XonoticHUDRadarDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDRadarDialog, title, string, _("Radar Panel"));
+       ATTRIB(XonoticHUDRadarDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDRadarDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDRadarDialog, rows, float, 15);
+       ATTRIB(XonoticHUDRadarDialog, columns, float, 4);
+       ATTRIB(XonoticHUDRadarDialog, name, string, "HUDradar");
+       ATTRIB(XonoticHUDRadarDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDRadarDialog)
 ENDCLASS(XonoticHUDRadarDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_score.qh b/qcsrc/menu/xonotic/dialog_hudpanel_score.qh
index 68015eaa648d7abcc48894fb91965bb80e6c4eed..d97787404e921121ce3453be7f8a42bfd1a940fb 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_score.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_score.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDScoreDialog, XonoticRootDialog)
        METHOD(XonoticHUDScoreDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDScoreDialog, XonoticRootDialog)
        METHOD(XonoticHUDScoreDialog, fill, void(entity));

-       ATTRIB(XonoticHUDScoreDialog, title, string, _("Score Panel"))
-       ATTRIB(XonoticHUDScoreDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDScoreDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDScoreDialog, rows, float, 15)
-       ATTRIB(XonoticHUDScoreDialog, columns, float, 4)
-       ATTRIB(XonoticHUDScoreDialog, name, string, "HUDscore")
-       ATTRIB(XonoticHUDScoreDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDScoreDialog, title, string, _("Score Panel"));
+       ATTRIB(XonoticHUDScoreDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDScoreDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDScoreDialog, rows, float, 15);
+       ATTRIB(XonoticHUDScoreDialog, columns, float, 4);
+       ATTRIB(XonoticHUDScoreDialog, name, string, "HUDscore");
+       ATTRIB(XonoticHUDScoreDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDScoreDialog)
 ENDCLASS(XonoticHUDScoreDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_timer.qh b/qcsrc/menu/xonotic/dialog_hudpanel_timer.qh
index 7f750971312ba5069c2b44da2e33b7ed781414eb..61955495edd4c7ac985ee989c39fe2d23b27cf3c 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_timer.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_timer.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDTimerDialog, XonoticRootDialog)
        METHOD(XonoticHUDTimerDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDTimerDialog, XonoticRootDialog)
        METHOD(XonoticHUDTimerDialog, fill, void(entity));

-       ATTRIB(XonoticHUDTimerDialog, title, string, _("Timer Panel"))
-       ATTRIB(XonoticHUDTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDTimerDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDTimerDialog, rows, float, 15)
-       ATTRIB(XonoticHUDTimerDialog, columns, float, 4)
-       ATTRIB(XonoticHUDTimerDialog, name, string, "HUDtimer")
-       ATTRIB(XonoticHUDTimerDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDTimerDialog, title, string, _("Timer Panel"));
+       ATTRIB(XonoticHUDTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDTimerDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDTimerDialog, rows, float, 15);
+       ATTRIB(XonoticHUDTimerDialog, columns, float, 4);
+       ATTRIB(XonoticHUDTimerDialog, name, string, "HUDtimer");
+       ATTRIB(XonoticHUDTimerDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDTimerDialog)
 ENDCLASS(XonoticHUDTimerDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_vote.qh b/qcsrc/menu/xonotic/dialog_hudpanel_vote.qh
index 1ee05a2f882708a7a3c2940431bc18fa4bcc325b..061c69e56c4797b3d904739b0adcedfe97d79bba 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_vote.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_vote.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDVoteDialog, XonoticRootDialog)
        METHOD(XonoticHUDVoteDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDVoteDialog, XonoticRootDialog)
        METHOD(XonoticHUDVoteDialog, fill, void(entity));

-       ATTRIB(XonoticHUDVoteDialog, title, string, _("Vote Panel"))
-       ATTRIB(XonoticHUDVoteDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDVoteDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDVoteDialog, rows, float, 15)
-       ATTRIB(XonoticHUDVoteDialog, columns, float, 4)
-       ATTRIB(XonoticHUDVoteDialog, name, string, "HUDvote")
-       ATTRIB(XonoticHUDVoteDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDVoteDialog, title, string, _("Vote Panel"));
+       ATTRIB(XonoticHUDVoteDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDVoteDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDVoteDialog, rows, float, 15);
+       ATTRIB(XonoticHUDVoteDialog, columns, float, 4);
+       ATTRIB(XonoticHUDVoteDialog, name, string, "HUDvote");
+       ATTRIB(XonoticHUDVoteDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDVoteDialog)
 ENDCLASS(XonoticHUDVoteDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qh b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qh
index 649f7ddd1c1e5dea99df638b5b5e43a3e45544cc..fad14749e6f4665f00b4c460c238a018811d0f37 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qh
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDWeaponsDialog, XonoticRootDialog)
        METHOD(XonoticHUDWeaponsDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDWeaponsDialog, XonoticRootDialog)
        METHOD(XonoticHUDWeaponsDialog, fill, void(entity));

-       ATTRIB(XonoticHUDWeaponsDialog, title, string, _("Weapons Panel"))
-       ATTRIB(XonoticHUDWeaponsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDWeaponsDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticHUDWeaponsDialog, rows, float, 21)
-       ATTRIB(XonoticHUDWeaponsDialog, columns, float, 4)
-       ATTRIB(XonoticHUDWeaponsDialog, name, string, "HUDweapons")
-       ATTRIB(XonoticHUDWeaponsDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDWeaponsDialog, title, string, _("Weapons Panel"));
+       ATTRIB(XonoticHUDWeaponsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDWeaponsDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticHUDWeaponsDialog, rows, float, 21);
+       ATTRIB(XonoticHUDWeaponsDialog, columns, float, 4);
+       ATTRIB(XonoticHUDWeaponsDialog, name, string, "HUDweapons");
+       ATTRIB(XonoticHUDWeaponsDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDWeaponsDialog)
 ENDCLASS(XonoticHUDWeaponsDialog)

diff --git a/qcsrc/menu/xonotic/dialog_hudsetup_exit.qh b/qcsrc/menu/xonotic/dialog_hudsetup_exit.qh
index e26cfad9b649b607ba467d55ad28880902e8b4ad..8a4479c6f88cc0ce8ed71e8880fa63602fb3c64a 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudsetup_exit.qh
+++ b/qcsrc/menu/xonotic/dialog_hudsetup_exit.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticHUDExitDialog, XonoticRootDialog)
        METHOD(XonoticHUDExitDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticHUDExitDialog, XonoticRootDialog)
        METHOD(XonoticHUDExitDialog, fill, void(entity));

-       ATTRIB(XonoticHUDExitDialog, title, string, _("Panel HUD Setup"))
-       ATTRIB(XonoticHUDExitDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticHUDExitDialog, intendedWidth, float, 0.8)
-       ATTRIB(XonoticHUDExitDialog, rows, float, 18)
-       ATTRIB(XonoticHUDExitDialog, columns, float, 8.2)
-       ATTRIB(XonoticHUDExitDialog, name, string, "HUDExit")
-       ATTRIB(XonoticHUDExitDialog, requiresConnection, float, true)
+       ATTRIB(XonoticHUDExitDialog, title, string, _("Panel HUD Setup"));
+       ATTRIB(XonoticHUDExitDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticHUDExitDialog, intendedWidth, float, 0.8);
+       ATTRIB(XonoticHUDExitDialog, rows, float, 18);
+       ATTRIB(XonoticHUDExitDialog, columns, float, 8.2);
+       ATTRIB(XonoticHUDExitDialog, name, string, "HUDExit");
+       ATTRIB(XonoticHUDExitDialog, requiresConnection, float, true);

 ENDCLASS(XonoticHUDExitDialog)
 ENDCLASS(XonoticHUDExitDialog)

diff --git a/qcsrc/menu/xonotic/dialog_monstertools.qh b/qcsrc/menu/xonotic/dialog_monstertools.qh
index 2b6f8b44da22eae4aa39be869ff9b4e0a8df6e15..1a6b3388abf4db6cd6003e4cddefe15fa9ce2501 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_monstertools.qh
+++ b/qcsrc/menu/xonotic/dialog_monstertools.qh
@@ -3,10 +3,10 @@
 #include "rootdialog.qh"
 CLASS(XonoticMonsterToolsDialog, XonoticRootDialog)
        METHOD(XonoticMonsterToolsDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticMonsterToolsDialog, XonoticRootDialog)
        METHOD(XonoticMonsterToolsDialog, fill, void(entity));

-       ATTRIB(XonoticMonsterToolsDialog, title, string, _("Monster Tools"))
-       ATTRIB(XonoticMonsterToolsDialog, color, vector, SKINCOLOR_DIALOG_SANDBOXTOOLS)
-       ATTRIB(XonoticMonsterToolsDialog, intendedWidth, float, 0.8)
-       ATTRIB(XonoticMonsterToolsDialog, rows, float, 16)
-       ATTRIB(XonoticMonsterToolsDialog, columns, float, 4)
-       ATTRIB(XonoticMonsterToolsDialog, name, string, "MonsterTools")
+       ATTRIB(XonoticMonsterToolsDialog, title, string, _("Monster Tools"));
+       ATTRIB(XonoticMonsterToolsDialog, color, vector, SKINCOLOR_DIALOG_SANDBOXTOOLS);
+       ATTRIB(XonoticMonsterToolsDialog, intendedWidth, float, 0.8);
+       ATTRIB(XonoticMonsterToolsDialog, rows, float, 16);
+       ATTRIB(XonoticMonsterToolsDialog, columns, float, 4);
+       ATTRIB(XonoticMonsterToolsDialog, name, string, "MonsterTools");

 ENDCLASS(XonoticMonsterToolsDialog)
 ENDCLASS(XonoticMonsterToolsDialog)

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer.qh b/qcsrc/menu/xonotic/dialog_multiplayer.qh
index b18ca55607085d5bd3390eceb6ab9e52535cd87f..74b5285942c18238c3c72c3483dde736c64c1e4f 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer.qh
@@ -3,10 +3,10 @@
 #include "dialog.qh"
 CLASS(XonoticMultiplayerDialog, XonoticDialog)
        METHOD(XonoticMultiplayerDialog, fill, void(entity));
 #include "dialog.qh"
 CLASS(XonoticMultiplayerDialog, XonoticDialog)
        METHOD(XonoticMultiplayerDialog, fill, void(entity));

-       ATTRIB(XonoticMultiplayerDialog, title, string, _("Multiplayer"))
-       ATTRIB(XonoticMultiplayerDialog, tooltip, string, _("Play online, against your friends in LAN, view demos or change player settings"))
-       ATTRIB(XonoticMultiplayerDialog, color, vector, SKINCOLOR_DIALOG_MULTIPLAYER)
-       ATTRIB(XonoticMultiplayerDialog, intendedWidth, float, 0.96)
-       ATTRIB(XonoticMultiplayerDialog, rows, float, 24)
-       ATTRIB(XonoticMultiplayerDialog, columns, float, 4)
+       ATTRIB(XonoticMultiplayerDialog, title, string, _("Multiplayer"));
+       ATTRIB(XonoticMultiplayerDialog, tooltip, string, _("Play online, against your friends in LAN, view demos or change player settings"));
+       ATTRIB(XonoticMultiplayerDialog, color, vector, SKINCOLOR_DIALOG_MULTIPLAYER);
+       ATTRIB(XonoticMultiplayerDialog, intendedWidth, float, 0.96);
+       ATTRIB(XonoticMultiplayerDialog, rows, float, 24);
+       ATTRIB(XonoticMultiplayerDialog, columns, float, 4);

 ENDCLASS(XonoticMultiplayerDialog)
 ENDCLASS(XonoticMultiplayerDialog)

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.qh b/qcsrc/menu/xonotic/dialog_multiplayer_create.qh
index 5a747a94530c041a7f630500dc61d02de8a954bb..e275522864a84ee9af820e0cb6f55f7323df9efb 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.qh
@@ -5,15 +5,15 @@ CLASS(XonoticServerCreateTab, XonoticTab)
        METHOD(XonoticServerCreateTab, fill, void(entity));
        METHOD(XonoticServerCreateTab, gameTypeChangeNotify, void(entity));
        METHOD(XonoticServerCreateTab, gameTypeSelectNotify, void(entity));
        METHOD(XonoticServerCreateTab, fill, void(entity));
        METHOD(XonoticServerCreateTab, gameTypeChangeNotify, void(entity));
        METHOD(XonoticServerCreateTab, gameTypeSelectNotify, void(entity));

-       ATTRIB(XonoticServerCreateTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticServerCreateTab, rows, float, 23)
-       ATTRIB(XonoticServerCreateTab, columns, float, 6.2)  // added extra .2 for center space
+       ATTRIB(XonoticServerCreateTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticServerCreateTab, rows, float, 23);
+       ATTRIB(XonoticServerCreateTab, columns, float, 6.2);  // added extra .2 for center space

 
 

-       ATTRIB(XonoticServerCreateTab, mapListBox, entity, NULL)
-       ATTRIB(XonoticServerCreateTab, sliderFraglimit, entity, NULL)
-       ATTRIB(XonoticServerCreateTab, sliderTeams, entity, NULL)
-       ATTRIB(XonoticServerCreateTab, sliderTimelimit, entity, NULL)
-       ATTRIB(XonoticServerCreateTab, labelFraglimit, entity, NULL)
-       ATTRIB(XonoticServerCreateTab, labelTeams, entity, NULL)
+       ATTRIB(XonoticServerCreateTab, mapListBox, entity);
+       ATTRIB(XonoticServerCreateTab, sliderFraglimit, entity);
+       ATTRIB(XonoticServerCreateTab, sliderTeams, entity);
+       ATTRIB(XonoticServerCreateTab, sliderTimelimit, entity);
+       ATTRIB(XonoticServerCreateTab, labelFraglimit, entity);
+       ATTRIB(XonoticServerCreateTab, labelTeams, entity);

 ENDCLASS(XonoticServerCreateTab)
 entity makeXonoticServerCreateTab();
 ENDCLASS(XonoticServerCreateTab)
 entity makeXonoticServerCreateTab();

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qh b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qh
index 13acfcc777b744066d82ab074942091bef85ee40..b2efb97619c8c8b7d7ea1d47482e669e1deabb6a 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mapinfo.qh
@@ -4,24 +4,24 @@
 CLASS(XonoticMapInfoDialog, XonoticDialog)
        METHOD(XonoticMapInfoDialog, fill, void(entity));
        METHOD(XonoticMapInfoDialog, loadMapInfo, void(entity, float, entity));
 CLASS(XonoticMapInfoDialog, XonoticDialog)
        METHOD(XonoticMapInfoDialog, fill, void(entity));
        METHOD(XonoticMapInfoDialog, loadMapInfo, void(entity, float, entity));

-       ATTRIB(XonoticMapInfoDialog, title, string, _("Map Information"))
-       ATTRIB(XonoticMapInfoDialog, color, vector, SKINCOLOR_DIALOG_MAPINFO)
-       ATTRIB(XonoticMapInfoDialog, intendedWidth, float, 1.0)
-       ATTRIB(XonoticMapInfoDialog, rows, float, 11)
-       ATTRIB(XonoticMapInfoDialog, columns, float, 10)
+       ATTRIB(XonoticMapInfoDialog, title, string, _("Map Information"));
+       ATTRIB(XonoticMapInfoDialog, color, vector, SKINCOLOR_DIALOG_MAPINFO);
+       ATTRIB(XonoticMapInfoDialog, intendedWidth, float, 1.0);
+       ATTRIB(XonoticMapInfoDialog, rows, float, 11);
+       ATTRIB(XonoticMapInfoDialog, columns, float, 10);

 
 

-       ATTRIB(XonoticMapInfoDialog, previewImage, entity, NULL)
-       ATTRIB(XonoticMapInfoDialog, titleLabel, entity, NULL)
-       ATTRIB(XonoticMapInfoDialog, authorLabel, entity, NULL)
-       ATTRIB(XonoticMapInfoDialog, descriptionLabel, entity, NULL)
-       ATTRIB(XonoticMapInfoDialog, featuresLabel, entity, NULL)
+       ATTRIB(XonoticMapInfoDialog, previewImage, entity);
+       ATTRIB(XonoticMapInfoDialog, titleLabel, entity);
+       ATTRIB(XonoticMapInfoDialog, authorLabel, entity);
+       ATTRIB(XonoticMapInfoDialog, descriptionLabel, entity);
+       ATTRIB(XonoticMapInfoDialog, featuresLabel, entity);

 
 

-       ATTRIBARRAY(XonoticMapInfoDialog, typeLabels, entity, 24)
+       ATTRIBARRAY(XonoticMapInfoDialog, typeLabels, entity, 24);

 
 

-       ATTRIB(XonoticMapInfoDialog, currentMapIndex, float, 0)
-       ATTRIB(XonoticMapInfoDialog, currentMapBSPName, string, string_null)
-       ATTRIB(XonoticMapInfoDialog, currentMapTitle, string, string_null)
-       ATTRIB(XonoticMapInfoDialog, currentMapAuthor, string, string_null)
-       ATTRIB(XonoticMapInfoDialog, currentMapDescription, string, string_null)
-       ATTRIB(XonoticMapInfoDialog, currentMapPreviewImage, string, string_null)
+       ATTRIB(XonoticMapInfoDialog, currentMapIndex, float, 0);
+       ATTRIB(XonoticMapInfoDialog, currentMapBSPName, string);
+       ATTRIB(XonoticMapInfoDialog, currentMapTitle, string);
+       ATTRIB(XonoticMapInfoDialog, currentMapAuthor, string);
+       ATTRIB(XonoticMapInfoDialog, currentMapDescription, string);
+       ATTRIB(XonoticMapInfoDialog, currentMapPreviewImage, string);

 ENDCLASS(XonoticMapInfoDialog)
 ENDCLASS(XonoticMapInfoDialog)

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qh b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qh
index ede8f4cb1fcdab15a2cfe91b3282093b774cc142..48ccc6b48ea0ca853e7710efcf18210af2662ef4 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qh
@@ -6,10 +6,10 @@ CLASS(XonoticMutatorsDialog, XonoticDialog)
        METHOD(XonoticMutatorsDialog, fill, void(entity));
        METHOD(XonoticMutatorsDialog, showNotify, void(entity));
        METHOD(XonoticMutatorsDialog, close, void(entity));
        METHOD(XonoticMutatorsDialog, fill, void(entity));
        METHOD(XonoticMutatorsDialog, showNotify, void(entity));
        METHOD(XonoticMutatorsDialog, close, void(entity));

-       ATTRIB(XonoticMutatorsDialog, title, string, _("Mutators"))
-       ATTRIB(XonoticMutatorsDialog, color, vector, SKINCOLOR_DIALOG_MUTATORS)
-       ATTRIB(XonoticMutatorsDialog, intendedWidth, float, 0.9)
-       ATTRIB(XonoticMutatorsDialog, rows, float, 20)
-       ATTRIB(XonoticMutatorsDialog, columns, float, 6)
-       ATTRIB(XonoticMutatorsDialog, refilterEntity, entity, NULL)
+       ATTRIB(XonoticMutatorsDialog, title, string, _("Mutators"));
+       ATTRIB(XonoticMutatorsDialog, color, vector, SKINCOLOR_DIALOG_MUTATORS);
+       ATTRIB(XonoticMutatorsDialog, intendedWidth, float, 0.9);
+       ATTRIB(XonoticMutatorsDialog, rows, float, 20);
+       ATTRIB(XonoticMutatorsDialog, columns, float, 6);
+       ATTRIB(XonoticMutatorsDialog, refilterEntity, entity);

 ENDCLASS(XonoticMutatorsDialog)
 ENDCLASS(XonoticMutatorsDialog)

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join.qh b/qcsrc/menu/xonotic/dialog_multiplayer_join.qh
index 7fa837976cfb506f2303cbed9c0ef856f65e4b06..a663eb527be116ba9e0b75bf953e6aba47f2dc2c 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join.qh
@@ -3,8 +3,8 @@
 #include "tab.qh"
 CLASS(XonoticServerListTab, XonoticTab)
        METHOD(XonoticServerListTab, fill, void(entity));
 #include "tab.qh"
 CLASS(XonoticServerListTab, XonoticTab)
        METHOD(XonoticServerListTab, fill, void(entity));

-       ATTRIB(XonoticServerListTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticServerListTab, rows, float, 23)
-       ATTRIB(XonoticServerListTab, columns, float, 6.5)
+       ATTRIB(XonoticServerListTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticServerListTab, rows, float, 23);
+       ATTRIB(XonoticServerListTab, columns, float, 6.5);

 ENDCLASS(XonoticServerListTab)
 entity makeXonoticServerListTab();
 ENDCLASS(XonoticServerListTab)
 entity makeXonoticServerListTab();

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh
index 201f737e9125c80f80b93b66775e215386634fad..68f5ab8ca0c08cc95084715202fbb9ec5e442f36 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.qh
@@ -4,42 +4,42 @@
 CLASS(XonoticServerInfoDialog, XonoticDialog)
        METHOD(XonoticServerInfoDialog, fill, void(entity));
        METHOD(XonoticServerInfoDialog, loadServerInfo, void(entity, float));
 CLASS(XonoticServerInfoDialog, XonoticDialog)
        METHOD(XonoticServerInfoDialog, fill, void(entity));
        METHOD(XonoticServerInfoDialog, loadServerInfo, void(entity, float));

-       ATTRIB(XonoticServerInfoDialog, title, string, _("Server Information"))
-       ATTRIB(XonoticServerInfoDialog, color, vector, SKINCOLOR_DIALOG_SERVERINFO)
-       ATTRIB(XonoticServerInfoDialog, intendedWidth, float, 0.8)
-       ATTRIB(XonoticServerInfoDialog, rows, float, 18)
-       ATTRIB(XonoticServerInfoDialog, columns, float, 6.2)
+       ATTRIB(XonoticServerInfoDialog, title, string, _("Server Information"));
+       ATTRIB(XonoticServerInfoDialog, color, vector, SKINCOLOR_DIALOG_SERVERINFO);
+       ATTRIB(XonoticServerInfoDialog, intendedWidth, float, 0.8);
+       ATTRIB(XonoticServerInfoDialog, rows, float, 18);
+       ATTRIB(XonoticServerInfoDialog, columns, float, 6.2);

 
 

-       ATTRIB(XonoticServerInfoDialog, currentServerName, string, string_null)
-       ATTRIB(XonoticServerInfoDialog, currentServerCName, string, string_null)
-       ATTRIB(XonoticServerInfoDialog, currentServerType, string, string_null)
-       ATTRIB(XonoticServerInfoDialog, currentServerMap, string, string_null)
-       ATTRIB(XonoticServerInfoDialog, currentServerPlayers, string, string_null)
-       ATTRIB(XonoticServerInfoDialog, currentServerNumPlayers, string, string_null)
-       ATTRIB(XonoticServerInfoDialog, currentServerNumBots, string, string_null)
-       ATTRIB(XonoticServerInfoDialog, currentServerNumFreeSlots, string, string_null)
-       ATTRIB(XonoticServerInfoDialog, currentServerMod, string, string_null)
-       ATTRIB(XonoticServerInfoDialog, currentServerVersion, string, string_null)
-       ATTRIB(XonoticServerInfoDialog, currentServerKey, string, string_null)
-       ATTRIB(XonoticServerInfoDialog, currentServerID, string, string_null)
-       ATTRIB(XonoticServerInfoDialog, currentServerEncrypt, string, string_null)
-       ATTRIB(XonoticServerInfoDialog, currentServerPure, string, string_null)
+       ATTRIB(XonoticServerInfoDialog, currentServerName, string);
+       ATTRIB(XonoticServerInfoDialog, currentServerCName, string);
+       ATTRIB(XonoticServerInfoDialog, currentServerType, string);
+       ATTRIB(XonoticServerInfoDialog, currentServerMap, string);
+       ATTRIB(XonoticServerInfoDialog, currentServerPlayers, string);
+       ATTRIB(XonoticServerInfoDialog, currentServerNumPlayers, string);
+       ATTRIB(XonoticServerInfoDialog, currentServerNumBots, string);
+       ATTRIB(XonoticServerInfoDialog, currentServerNumFreeSlots, string);
+       ATTRIB(XonoticServerInfoDialog, currentServerMod, string);
+       ATTRIB(XonoticServerInfoDialog, currentServerVersion, string);
+       ATTRIB(XonoticServerInfoDialog, currentServerKey, string);
+       ATTRIB(XonoticServerInfoDialog, currentServerID, string);
+       ATTRIB(XonoticServerInfoDialog, currentServerEncrypt, string);
+       ATTRIB(XonoticServerInfoDialog, currentServerPure, string);

 
 

-       ATTRIB(XonoticServerInfoDialog, nameLabel, entity, NULL)
-       ATTRIB(XonoticServerInfoDialog, cnameLabel, entity, NULL)
-       ATTRIB(XonoticServerInfoDialog, typeLabel, entity, NULL)
-       ATTRIB(XonoticServerInfoDialog, mapLabel, entity, NULL)
-       ATTRIB(XonoticServerInfoDialog, rawPlayerList, entity, NULL)
-       ATTRIB(XonoticServerInfoDialog, numPlayersLabel, entity, NULL)
-       ATTRIB(XonoticServerInfoDialog, numBotsLabel, entity, NULL)
-       ATTRIB(XonoticServerInfoDialog, numFreeSlotsLabel, entity, NULL)
-       ATTRIB(XonoticServerInfoDialog, modLabel, entity, NULL)
-       ATTRIB(XonoticServerInfoDialog, versionLabel, entity, NULL)
-       ATTRIB(XonoticServerInfoDialog, keyLabel, entity, NULL)
-       ATTRIB(XonoticServerInfoDialog, idLabel, entity, NULL)
-       ATTRIB(XonoticServerInfoDialog, encryptLabel, entity, NULL)
-       ATTRIB(XonoticServerInfoDialog, canConnectLabel, entity, NULL)
-       ATTRIB(XonoticServerInfoDialog, pureLabel, entity, NULL)
+       ATTRIB(XonoticServerInfoDialog, nameLabel, entity);
+       ATTRIB(XonoticServerInfoDialog, cnameLabel, entity);
+       ATTRIB(XonoticServerInfoDialog, typeLabel, entity);
+       ATTRIB(XonoticServerInfoDialog, mapLabel, entity);
+       ATTRIB(XonoticServerInfoDialog, rawPlayerList, entity);
+       ATTRIB(XonoticServerInfoDialog, numPlayersLabel, entity);
+       ATTRIB(XonoticServerInfoDialog, numBotsLabel, entity);
+       ATTRIB(XonoticServerInfoDialog, numFreeSlotsLabel, entity);
+       ATTRIB(XonoticServerInfoDialog, modLabel, entity);
+       ATTRIB(XonoticServerInfoDialog, versionLabel, entity);
+       ATTRIB(XonoticServerInfoDialog, keyLabel, entity);
+       ATTRIB(XonoticServerInfoDialog, idLabel, entity);
+       ATTRIB(XonoticServerInfoDialog, encryptLabel, entity);
+       ATTRIB(XonoticServerInfoDialog, canConnectLabel, entity);
+       ATTRIB(XonoticServerInfoDialog, pureLabel, entity);

 ENDCLASS(XonoticServerInfoDialog)
 
 void Join_Click(entity btn, entity me);
 ENDCLASS(XonoticServerInfoDialog)
 
 void Join_Click(entity btn, entity me);

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media.qh b/qcsrc/menu/xonotic/dialog_multiplayer_media.qh
index 96c1aeb75dd74a4aac9d279557fb582ac7bcca91..9713e82c2da595fc6833dc287021a00cae5f7f00 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media.qh
@@ -3,9 +3,9 @@
 #include "tab.qh"
 CLASS(XonoticMediaTab, XonoticTab)
        METHOD(XonoticMediaTab, fill, void(entity));
 #include "tab.qh"
 CLASS(XonoticMediaTab, XonoticTab)
        METHOD(XonoticMediaTab, fill, void(entity));

-       ATTRIB(XonoticMediaTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticMediaTab, rows, float, 23)
-       ATTRIB(XonoticMediaTab, columns, float, 3)
-       ATTRIB(XonoticMediaTab, name, string, "Media")
+       ATTRIB(XonoticMediaTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticMediaTab, rows, float, 23);
+       ATTRIB(XonoticMediaTab, columns, float, 3);
+       ATTRIB(XonoticMediaTab, name, string, "Media");

 ENDCLASS(XonoticMediaTab)
 entity makeXonoticMediaTab();
 ENDCLASS(XonoticMediaTab)
 entity makeXonoticMediaTab();

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qh b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qh
index f41bb9e812f31ef0567bc655b478c551429057d5..cf3548d77409e791fecf40d9bf1caec2cab8371d 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo.qh
@@ -3,10 +3,10 @@
 #include "tab.qh"
 CLASS(XonoticDemoBrowserTab, XonoticTab)
        METHOD(XonoticDemoBrowserTab, fill, void(entity));
 #include "tab.qh"
 CLASS(XonoticDemoBrowserTab, XonoticTab)
        METHOD(XonoticDemoBrowserTab, fill, void(entity));

-       ATTRIB(XonoticDemoBrowserTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticDemoBrowserTab, rows, float, 21)
-       ATTRIB(XonoticDemoBrowserTab, columns, float, 6.5)
-       ATTRIB(XonoticDemoBrowserTab, name, string, "DemoBrowser")
-       ATTRIB(XonoticDemoBrowserTab, democlicktype, float, 0)
+       ATTRIB(XonoticDemoBrowserTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticDemoBrowserTab, rows, float, 21);
+       ATTRIB(XonoticDemoBrowserTab, columns, float, 6.5);
+       ATTRIB(XonoticDemoBrowserTab, name, string, "DemoBrowser");
+       ATTRIB(XonoticDemoBrowserTab, democlicktype, float, 0);

 ENDCLASS(XonoticDemoBrowserTab)
 entity makeXonoticDemoBrowserTab();
 ENDCLASS(XonoticDemoBrowserTab)
 entity makeXonoticDemoBrowserTab();

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qh b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qh
index 598dd5503f8f918f333a14a42d665ce26b8c23f6..934490f755ece18731820912a21228671fec5109 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qh
@@ -3,9 +3,9 @@
 #include "dialog.qh"
 CLASS(XonoticDemoStartConfirmDialog, XonoticDialog)
        METHOD(XonoticDemoStartConfirmDialog, fill, void(entity));
 #include "dialog.qh"
 CLASS(XonoticDemoStartConfirmDialog, XonoticDialog)
        METHOD(XonoticDemoStartConfirmDialog, fill, void(entity));

-       ATTRIB(XonoticDemoStartConfirmDialog, title, string, _("Disconnect"))
-       ATTRIB(XonoticDemoStartConfirmDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM)
-       ATTRIB(XonoticDemoStartConfirmDialog, intendedWidth, float, 0.5)
-       ATTRIB(XonoticDemoStartConfirmDialog, rows, float, 4)
-       ATTRIB(XonoticDemoStartConfirmDialog, columns, float, 2)
+       ATTRIB(XonoticDemoStartConfirmDialog, title, string, _("Disconnect"));
+       ATTRIB(XonoticDemoStartConfirmDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM);
+       ATTRIB(XonoticDemoStartConfirmDialog, intendedWidth, float, 0.5);
+       ATTRIB(XonoticDemoStartConfirmDialog, rows, float, 4);
+       ATTRIB(XonoticDemoStartConfirmDialog, columns, float, 2);

 ENDCLASS(XonoticDemoStartConfirmDialog)
 ENDCLASS(XonoticDemoStartConfirmDialog)

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qh b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qh
index 96e2d631036698fa71441f70f3618e632da72ef1..80c2766de2e4047b20f6df735863d823efc22439 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qh
@@ -3,9 +3,9 @@
 #include "dialog.qh"
 CLASS(XonoticDemoTimeConfirmDialog, XonoticDialog)
        METHOD(XonoticDemoTimeConfirmDialog, fill, void(entity));
 #include "dialog.qh"
 CLASS(XonoticDemoTimeConfirmDialog, XonoticDialog)
        METHOD(XonoticDemoTimeConfirmDialog, fill, void(entity));

-       ATTRIB(XonoticDemoTimeConfirmDialog, title, string, _("Disconnect"))
-       ATTRIB(XonoticDemoTimeConfirmDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM)
-       ATTRIB(XonoticDemoTimeConfirmDialog, intendedWidth, float, 0.5)
-       ATTRIB(XonoticDemoTimeConfirmDialog, rows, float, 4)
-       ATTRIB(XonoticDemoTimeConfirmDialog, columns, float, 2)
+       ATTRIB(XonoticDemoTimeConfirmDialog, title, string, _("Disconnect"));
+       ATTRIB(XonoticDemoTimeConfirmDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM);
+       ATTRIB(XonoticDemoTimeConfirmDialog, intendedWidth, float, 0.5);
+       ATTRIB(XonoticDemoTimeConfirmDialog, rows, float, 4);
+       ATTRIB(XonoticDemoTimeConfirmDialog, columns, float, 2);

 ENDCLASS(XonoticDemoTimeConfirmDialog)
 ENDCLASS(XonoticDemoTimeConfirmDialog)

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qh b/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qh
index 4d98f6ec17ba051ae165a2ee0e6995e7fe583460..6172dae03cbff4bffadab55e694ab68fd9859c72 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_musicplayer.qh
@@ -3,9 +3,9 @@
 #include "tab.qh"
 CLASS(XonoticMusicPlayerTab, XonoticTab)
        METHOD(XonoticMusicPlayerTab, fill, void(entity));
 #include "tab.qh"
 CLASS(XonoticMusicPlayerTab, XonoticTab)
        METHOD(XonoticMusicPlayerTab, fill, void(entity));

-       ATTRIB(XonoticMusicPlayerTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticMusicPlayerTab, rows, float, 21)
-       ATTRIB(XonoticMusicPlayerTab, columns, float, 6.5)
-       ATTRIB(XonoticMusicPlayerTab, name, string, "MusicPlayer")
+       ATTRIB(XonoticMusicPlayerTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticMusicPlayerTab, rows, float, 21);
+       ATTRIB(XonoticMusicPlayerTab, columns, float, 6.5);
+       ATTRIB(XonoticMusicPlayerTab, name, string, "MusicPlayer");

 ENDCLASS(XonoticMusicPlayerTab)
 entity makeXonoticMusicPlayerTab();
 ENDCLASS(XonoticMusicPlayerTab)
 entity makeXonoticMusicPlayerTab();

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qh b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qh
index 62ea8438a069a65cc5e1cdb70c6f8f30f1079f61..66dc3cf077fac5591b20881fcb52d70cf53b8575 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot.qh
@@ -3,13 +3,13 @@
 #include "tab.qh"
 CLASS(XonoticScreenshotBrowserTab, XonoticTab)
        METHOD(XonoticScreenshotBrowserTab, fill, void(entity));
 #include "tab.qh"
 CLASS(XonoticScreenshotBrowserTab, XonoticTab)
        METHOD(XonoticScreenshotBrowserTab, fill, void(entity));

-       ATTRIB(XonoticScreenshotBrowserTab, intendedWidth, float, 1)
-       ATTRIB(XonoticScreenshotBrowserTab, rows, float, 21)
-       ATTRIB(XonoticScreenshotBrowserTab, columns, float, 6.5)
-       ATTRIB(XonoticScreenshotBrowserTab, name, string, "ScreenshotBrowser")
+       ATTRIB(XonoticScreenshotBrowserTab, intendedWidth, float, 1);
+       ATTRIB(XonoticScreenshotBrowserTab, rows, float, 21);
+       ATTRIB(XonoticScreenshotBrowserTab, columns, float, 6.5);
+       ATTRIB(XonoticScreenshotBrowserTab, name, string, "ScreenshotBrowser");

 
        METHOD(XonoticScreenshotBrowserTab, loadPreviewScreenshot, void(entity, string));
 
        METHOD(XonoticScreenshotBrowserTab, loadPreviewScreenshot, void(entity, string));

-       ATTRIB(XonoticScreenshotBrowserTab, screenshotImage, entity, NULL)
-       ATTRIB(XonoticScreenshotBrowserTab, currentScrPath, string, string_null)
+       ATTRIB(XonoticScreenshotBrowserTab, screenshotImage, entity);
+       ATTRIB(XonoticScreenshotBrowserTab, currentScrPath, string);

 ENDCLASS(XonoticScreenshotBrowserTab)
 entity makeXonoticScreenshotBrowserTab();
 ENDCLASS(XonoticScreenshotBrowserTab)
 entity makeXonoticScreenshotBrowserTab();

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qh b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qh
index c4f7e61262eca64c609e94d117853a91ad566a27..ad1656e4f71555e28b268adcf5a1316fcd0aa3f0 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qh
@@ -9,14 +9,14 @@ CLASS(XonoticScreenshotViewerDialog, XonoticDialog)
        METHOD(XonoticScreenshotViewerDialog, keyDown, float(entity, float, float, float));
        METHOD(XonoticScreenshotViewerDialog, loadScreenshot, void(entity, string));
        METHOD(XonoticScreenshotViewerDialog, close, void(entity));
        METHOD(XonoticScreenshotViewerDialog, keyDown, float(entity, float, float, float));
        METHOD(XonoticScreenshotViewerDialog, loadScreenshot, void(entity, string));
        METHOD(XonoticScreenshotViewerDialog, close, void(entity));

-       ATTRIB(XonoticScreenshotViewerDialog, title, string, "Screenshot Viewer")
-       ATTRIB(XonoticScreenshotViewerDialog, name, string, "ScreenshotViewer")
-       ATTRIB(XonoticScreenshotViewerDialog, intendedWidth, float, 1)
-       ATTRIB(XonoticScreenshotViewerDialog, rows, float, 25)
-       ATTRIB(XonoticScreenshotViewerDialog, columns, float, 4)
-       ATTRIB(XonoticScreenshotViewerDialog, color, vector, SKINCOLOR_DIALOG_SCREENSHOTVIEWER)
-       ATTRIB(XonoticScreenshotViewerDialog, scrList, entity, NULL)
-       ATTRIB(XonoticScreenshotViewerDialog, screenshotImage, entity, NULL)
-       ATTRIB(XonoticScreenshotViewerDialog, slideShowButton, entity, NULL)
-       ATTRIB(XonoticScreenshotViewerDialog, currentScrPath, string, string_null)
+       ATTRIB(XonoticScreenshotViewerDialog, title, string, "Screenshot Viewer");
+       ATTRIB(XonoticScreenshotViewerDialog, name, string, "ScreenshotViewer");
+       ATTRIB(XonoticScreenshotViewerDialog, intendedWidth, float, 1);
+       ATTRIB(XonoticScreenshotViewerDialog, rows, float, 25);
+       ATTRIB(XonoticScreenshotViewerDialog, columns, float, 4);
+       ATTRIB(XonoticScreenshotViewerDialog, color, vector, SKINCOLOR_DIALOG_SCREENSHOTVIEWER);
+       ATTRIB(XonoticScreenshotViewerDialog, scrList, entity);
+       ATTRIB(XonoticScreenshotViewerDialog, screenshotImage, entity);
+       ATTRIB(XonoticScreenshotViewerDialog, slideShowButton, entity);
+       ATTRIB(XonoticScreenshotViewerDialog, currentScrPath, string);

 ENDCLASS(XonoticScreenshotViewerDialog)
 ENDCLASS(XonoticScreenshotViewerDialog)

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qh b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qh
index f60e9e0bb3450b59a28a8a5e3725654506a86a63..2285efcafa370cb6a2da6e8a0cc6c895176b96b6 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qh
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qh
@@ -4,10 +4,10 @@
 CLASS(XonoticProfileTab, XonoticTab)
        METHOD(XonoticProfileTab, fill, void(entity));
        METHOD(XonoticProfileTab, draw, void(entity));
 CLASS(XonoticProfileTab, XonoticTab)
        METHOD(XonoticProfileTab, fill, void(entity));
        METHOD(XonoticProfileTab, draw, void(entity));

-       ATTRIB(XonoticProfileTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticProfileTab, rows, float, 23)
-       ATTRIB(XonoticProfileTab, columns, float, 6.1)  // added extra .2 for center space
-       ATTRIB(XonoticProfileTab, playerNameLabel, entity, NULL)
-       ATTRIB(XonoticProfileTab, playerNameLabelAlpha, float, SKINALPHA_HEADER)
+       ATTRIB(XonoticProfileTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticProfileTab, rows, float, 23);
+       ATTRIB(XonoticProfileTab, columns, float, 6.1);  // added extra .2 for center space
+       ATTRIB(XonoticProfileTab, playerNameLabel, entity);
+       ATTRIB(XonoticProfileTab, playerNameLabelAlpha, float, SKINALPHA_HEADER);

 ENDCLASS(XonoticProfileTab)
 entity makeXonoticProfileTab();
 ENDCLASS(XonoticProfileTab)
 entity makeXonoticProfileTab();

diff --git a/qcsrc/menu/xonotic/dialog_quit.qh b/qcsrc/menu/xonotic/dialog_quit.qh
index 0b06c30d6a41e236db274c220dbf7906b675801d..6e8c9fea9a9748d7346f6969f4be0ace5b4fe635 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_quit.qh
+++ b/qcsrc/menu/xonotic/dialog_quit.qh
@@ -3,11 +3,11 @@
 #include "dialog.qh"
 CLASS(XonoticQuitDialog, XonoticDialog)
        METHOD(XonoticQuitDialog, fill, void(entity));
 #include "dialog.qh"
 CLASS(XonoticQuitDialog, XonoticDialog)
        METHOD(XonoticQuitDialog, fill, void(entity));

-       ATTRIB(XonoticQuitDialog, title, string, _("Quit"))
-       ATTRIB(XonoticQuitDialog, tooltip, string, _("Quit the game"))
-       ATTRIB(XonoticQuitDialog, color, vector, SKINCOLOR_DIALOG_QUIT)
-       ATTRIB(XonoticQuitDialog, intendedWidth, float, 0.5)
-       ATTRIB(XonoticQuitDialog, rows, float, 3)
-       ATTRIB(XonoticQuitDialog, columns, float, 2)
-       ATTRIB(XonoticQuitDialog, name, string, "Quit")
+       ATTRIB(XonoticQuitDialog, title, string, _("Quit"));
+       ATTRIB(XonoticQuitDialog, tooltip, string, _("Quit the game"));
+       ATTRIB(XonoticQuitDialog, color, vector, SKINCOLOR_DIALOG_QUIT);
+       ATTRIB(XonoticQuitDialog, intendedWidth, float, 0.5);
+       ATTRIB(XonoticQuitDialog, rows, float, 3);
+       ATTRIB(XonoticQuitDialog, columns, float, 2);
+       ATTRIB(XonoticQuitDialog, name, string, "Quit");

 ENDCLASS(XonoticQuitDialog)
 ENDCLASS(XonoticQuitDialog)

diff --git a/qcsrc/menu/xonotic/dialog_sandboxtools.qh b/qcsrc/menu/xonotic/dialog_sandboxtools.qh
index ab49ec867d688a694b62df1aaaad1ac545c2b6b2..2ef0d797390a218dcf2e4b6d0c46be595f4cc947 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_sandboxtools.qh
+++ b/qcsrc/menu/xonotic/dialog_sandboxtools.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticSandboxToolsDialog, XonoticRootDialog)
        METHOD(XonoticSandboxToolsDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticSandboxToolsDialog, XonoticRootDialog)
        METHOD(XonoticSandboxToolsDialog, fill, void(entity));

-       ATTRIB(XonoticSandboxToolsDialog, title, string, _("Sandbox Tools"))
-       ATTRIB(XonoticSandboxToolsDialog, color, vector, SKINCOLOR_DIALOG_SANDBOXTOOLS)
-       ATTRIB(XonoticSandboxToolsDialog, intendedWidth, float, 0.8)
-       ATTRIB(XonoticSandboxToolsDialog, rows, float, 16)
-       ATTRIB(XonoticSandboxToolsDialog, columns, float, 4)
-       ATTRIB(XonoticSandboxToolsDialog, name, string, "SandboxTools")
-       ATTRIB(XonoticSandboxToolsDialog, requiresConnection, float, true)
+       ATTRIB(XonoticSandboxToolsDialog, title, string, _("Sandbox Tools"));
+       ATTRIB(XonoticSandboxToolsDialog, color, vector, SKINCOLOR_DIALOG_SANDBOXTOOLS);
+       ATTRIB(XonoticSandboxToolsDialog, intendedWidth, float, 0.8);
+       ATTRIB(XonoticSandboxToolsDialog, rows, float, 16);
+       ATTRIB(XonoticSandboxToolsDialog, columns, float, 4);
+       ATTRIB(XonoticSandboxToolsDialog, name, string, "SandboxTools");
+       ATTRIB(XonoticSandboxToolsDialog, requiresConnection, float, true);

 ENDCLASS(XonoticSandboxToolsDialog)
 ENDCLASS(XonoticSandboxToolsDialog)

diff --git a/qcsrc/menu/xonotic/dialog_settings.qh b/qcsrc/menu/xonotic/dialog_settings.qh
index 6c7eacb7ca42328fb5ff5236a981f78139bc559d..3564a02e87dd5bb9140f60d7216198992cd6969e 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings.qh
+++ b/qcsrc/menu/xonotic/dialog_settings.qh
@@ -3,10 +3,10 @@
 #include "dialog.qh"
 CLASS(XonoticSettingsDialog, XonoticDialog)
        METHOD(XonoticSettingsDialog, fill, void(entity));
 #include "dialog.qh"
 CLASS(XonoticSettingsDialog, XonoticDialog)
        METHOD(XonoticSettingsDialog, fill, void(entity));

-       ATTRIB(XonoticSettingsDialog, title, string, _("Settings"))
-       ATTRIB(XonoticSettingsDialog, tooltip, string, _("Change the game settings"))
-       ATTRIB(XonoticSettingsDialog, color, vector, SKINCOLOR_DIALOG_SETTINGS)
-       ATTRIB(XonoticSettingsDialog, intendedWidth, float, 0.96)
-       ATTRIB(XonoticSettingsDialog, rows, float, 18)
-       ATTRIB(XonoticSettingsDialog, columns, float, 6)
+       ATTRIB(XonoticSettingsDialog, title, string, _("Settings"));
+       ATTRIB(XonoticSettingsDialog, tooltip, string, _("Change the game settings"));
+       ATTRIB(XonoticSettingsDialog, color, vector, SKINCOLOR_DIALOG_SETTINGS);
+       ATTRIB(XonoticSettingsDialog, intendedWidth, float, 0.96);
+       ATTRIB(XonoticSettingsDialog, rows, float, 18);
+       ATTRIB(XonoticSettingsDialog, columns, float, 6);

 ENDCLASS(XonoticSettingsDialog)
 ENDCLASS(XonoticSettingsDialog)

diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.qh b/qcsrc/menu/xonotic/dialog_settings_audio.qh
index a3e8a8c532d8566a65d5a66cd217d6995ec7b0a2..5794a70ccfb8e1852b59dc15b226d24fbdf846e0 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_audio.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_audio.qh
@@ -3,9 +3,9 @@
 #include "tab.qh"
 CLASS(XonoticAudioSettingsTab, XonoticTab)
        METHOD(XonoticAudioSettingsTab, fill, void(entity));
 #include "tab.qh"
 CLASS(XonoticAudioSettingsTab, XonoticTab)
        METHOD(XonoticAudioSettingsTab, fill, void(entity));

-       ATTRIB(XonoticAudioSettingsTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticAudioSettingsTab, rows, float, 15.5)
-       ATTRIB(XonoticAudioSettingsTab, columns, float, 6.2)  // added extra .2 for center space
-       ATTRIB(XonoticAudioSettingsTab, hiddenMenuSoundsSlider, entity, NULL)
+       ATTRIB(XonoticAudioSettingsTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticAudioSettingsTab, rows, float, 15.5);
+       ATTRIB(XonoticAudioSettingsTab, columns, float, 6.2);  // added extra .2 for center space
+       ATTRIB(XonoticAudioSettingsTab, hiddenMenuSoundsSlider, entity);

 ENDCLASS(XonoticAudioSettingsTab)
 entity makeXonoticAudioSettingsTab();
 ENDCLASS(XonoticAudioSettingsTab)
 entity makeXonoticAudioSettingsTab();

diff --git a/qcsrc/menu/xonotic/dialog_settings_effects.qh b/qcsrc/menu/xonotic/dialog_settings_effects.qh
index 97f3854fbba89c73f07321951ffa6b5964a51411..369c68d9132932d434315e3b630098b57807fbfb 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_effects.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_effects.qh
@@ -3,8 +3,8 @@
 #include "tab.qh"
 CLASS(XonoticEffectsSettingsTab, XonoticTab)
        METHOD(XonoticEffectsSettingsTab, fill, void(entity));
 #include "tab.qh"
 CLASS(XonoticEffectsSettingsTab, XonoticTab)
        METHOD(XonoticEffectsSettingsTab, fill, void(entity));

-       ATTRIB(XonoticEffectsSettingsTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticEffectsSettingsTab, rows, float, 15.5)
-       ATTRIB(XonoticEffectsSettingsTab, columns, float, 6.2)  // added extra .2 for center space
+       ATTRIB(XonoticEffectsSettingsTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticEffectsSettingsTab, rows, float, 15.5);
+       ATTRIB(XonoticEffectsSettingsTab, columns, float, 6.2);  // added extra .2 for center space

 ENDCLASS(XonoticEffectsSettingsTab)
 entity makeXonoticEffectsSettingsTab();
 ENDCLASS(XonoticEffectsSettingsTab)
 entity makeXonoticEffectsSettingsTab();

diff --git a/qcsrc/menu/xonotic/dialog_settings_game.qh b/qcsrc/menu/xonotic/dialog_settings_game.qh
index c415e96732cee4c6c796ae4d8cc64bde5006be3c..b9231642b18e9b016afb5277531a6e15fe1bea84 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game.qh
@@ -9,19 +9,19 @@ ENDCLASS(SettingSource)
 
 #include "listbox.qh"
 CLASS(XonoticRegisteredSettingsList, XonoticListBox)
 
 #include "listbox.qh"
 CLASS(XonoticRegisteredSettingsList, XonoticListBox)

-       ATTRIB(XonoticRegisteredSettingsList, alphaBG, float, 0)
-       ATTRIB(XonoticRegisteredSettingsList, itemAbsSize, vector, '0 0 0')
-       ATTRIB(XonoticRegisteredSettingsList, origin, vector, '0 0 0')
-       ATTRIB(XonoticRegisteredSettingsList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticRegisteredSettingsList, realUpperMargin, float, 0)
-       ATTRIB(XonoticRegisteredSettingsList, rowsPerItem, float, 2)
-       ATTRIB(XonoticRegisteredSettingsList, stringFilterBox, entity, NULL)
-       ATTRIB(XonoticRegisteredSettingsList, stringFilter, string, string_null)
-       ATTRIB(XonoticRegisteredSettingsList, typeToSearchString, string, string_null)
-       ATTRIB(XonoticRegisteredSettingsList, typeToSearchTime, float, 0)
-       ATTRIB(XonoticRegisteredSettingsList, source, DataSource, NULL)
-       ATTRIB(XonoticRegisteredSettingsList, onChange, void(entity, entity), func_null)
-       ATTRIB(XonoticRegisteredSettingsList, onChangeEntity, entity, NULL)
+       ATTRIB(XonoticRegisteredSettingsList, alphaBG, float, 0);
+       ATTRIB(XonoticRegisteredSettingsList, itemAbsSize, vector, '0 0 0');
+       ATTRIB(XonoticRegisteredSettingsList, origin, vector, '0 0 0');
+       ATTRIB(XonoticRegisteredSettingsList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticRegisteredSettingsList, realUpperMargin, float, 0);
+       ATTRIB(XonoticRegisteredSettingsList, rowsPerItem, float, 2);
+       ATTRIB(XonoticRegisteredSettingsList, stringFilterBox, entity);
+       ATTRIB(XonoticRegisteredSettingsList, stringFilter, string);
+       ATTRIB(XonoticRegisteredSettingsList, typeToSearchString, string);
+       ATTRIB(XonoticRegisteredSettingsList, typeToSearchTime, float, 0);
+       ATTRIB(XonoticRegisteredSettingsList, source, DataSource);
+       ATTRIB(XonoticRegisteredSettingsList, onChange, void(entity, entity));
+       ATTRIB(XonoticRegisteredSettingsList, onChangeEntity, entity);

        METHOD(XonoticRegisteredSettingsList, focusedItemChangeNotify, void(entity));
        METHOD(XonoticRegisteredSettingsList, drawListBoxItem, void(entity this, int i, vector absSize, bool isSelected, bool isFocused));
        METHOD(XonoticRegisteredSettingsList, focusedItemChangeNotify, void(entity this));
        METHOD(XonoticRegisteredSettingsList, focusedItemChangeNotify, void(entity));
        METHOD(XonoticRegisteredSettingsList, drawListBoxItem, void(entity this, int i, vector absSize, bool isSelected, bool isFocused));
        METHOD(XonoticRegisteredSettingsList, focusedItemChangeNotify, void(entity this));


@@ -33,13 +33,13 @@ ENDCLASS(XonoticRegisteredSettingsList)
 
 #include "tab.qh"
 CLASS(XonoticGameSettingsTab, XonoticTab)
 
 #include "tab.qh"
 CLASS(XonoticGameSettingsTab, XonoticTab)

-       ATTRIB(XonoticGameSettingsTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticGameSettingsTab, rows, float, 15.5)
-       ATTRIB(XonoticGameSettingsTab, columns, float, 6.5)
-       ATTRIB(XonoticGameSettingsTab, source, DataSource, NEW(SettingSource))
-       ATTRIB(XonoticGameSettingsTab, topicList, entity, NEW(XonoticRegisteredSettingsList, this.source))
-       ATTRIB(XonoticGameSettingsTab, currentPanel, entity, NEW(XonoticTab))
-       ATTRIB(XonoticGameSettingsTab, currentItem, entity, NULL)
+       ATTRIB(XonoticGameSettingsTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticGameSettingsTab, rows, float, 15.5);
+       ATTRIB(XonoticGameSettingsTab, columns, float, 6.5);
+       ATTRIB(XonoticGameSettingsTab, source, DataSource, NEW(SettingSource));
+       ATTRIB(XonoticGameSettingsTab, topicList, entity, NEW(XonoticRegisteredSettingsList, this.source));
+       ATTRIB(XonoticGameSettingsTab, currentPanel, entity, NEW(XonoticTab));
+       ATTRIB(XonoticGameSettingsTab, currentItem, entity);

        METHOD(XonoticGameSettingsTab, topicChangeNotify, void(entity, entity this));
        METHOD(XonoticGameSettingsTab, fill, void(entity this));
        INIT(XonoticGameSettingsTab)
        METHOD(XonoticGameSettingsTab, topicChangeNotify, void(entity, entity this));
        METHOD(XonoticGameSettingsTab, fill, void(entity this));
        INIT(XonoticGameSettingsTab)

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qh b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qh
index 3e1222056143917af19b0d8f2c1299407a639260..33576a3ec0a3ffdd0a5bd5ce7f59f4b07afb51fa 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qh
@@ -4,10 +4,10 @@
 CLASS(XonoticGameCrosshairSettingsTab, XonoticTab)
        METHOD(XonoticGameCrosshairSettingsTab, fill, void(entity));
        METHOD(XonoticGameCrosshairSettingsTab, showNotify, void(entity));
 CLASS(XonoticGameCrosshairSettingsTab, XonoticTab)
        METHOD(XonoticGameCrosshairSettingsTab, fill, void(entity));
        METHOD(XonoticGameCrosshairSettingsTab, showNotify, void(entity));

-       ATTRIB(XonoticGameCrosshairSettingsTab, title, string, _("Crosshair"))
-       ATTRIB(XonoticGameCrosshairSettingsTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticGameCrosshairSettingsTab, rows, float, 15.5)
-       ATTRIB(XonoticGameCrosshairSettingsTab, columns, float, 6.2)
+       ATTRIB(XonoticGameCrosshairSettingsTab, title, string, _("Crosshair"));
+       ATTRIB(XonoticGameCrosshairSettingsTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticGameCrosshairSettingsTab, rows, float, 15.5);
+       ATTRIB(XonoticGameCrosshairSettingsTab, columns, float, 6.2);

 ENDCLASS(XonoticGameCrosshairSettingsTab)
 entity makeXonoticGameCrosshairSettingsTab();
 
 ENDCLASS(XonoticGameCrosshairSettingsTab)
 entity makeXonoticGameCrosshairSettingsTab();
 

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hud.qh b/qcsrc/menu/xonotic/dialog_settings_game_hud.qh
index 1db5890be8d0e013ea6f086e206cf8d482f62129..a9851dc63414255e95a64b301797ee9c8d9c0462 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_hud.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.qh
@@ -4,10 +4,10 @@
 CLASS(XonoticGameHUDSettingsTab, XonoticTab)
        METHOD(XonoticGameHUDSettingsTab, fill, void(entity));
        METHOD(XonoticGameHUDSettingsTab, showNotify, void(entity));
 CLASS(XonoticGameHUDSettingsTab, XonoticTab)
        METHOD(XonoticGameHUDSettingsTab, fill, void(entity));
        METHOD(XonoticGameHUDSettingsTab, showNotify, void(entity));

-       ATTRIB(XonoticGameHUDSettingsTab, title, string, _("HUD"))
-       ATTRIB(XonoticGameHUDSettingsTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticGameHUDSettingsTab, rows, float, 15.5)
-       ATTRIB(XonoticGameHUDSettingsTab, columns, float, 6.2)
+       ATTRIB(XonoticGameHUDSettingsTab, title, string, _("HUD"));
+       ATTRIB(XonoticGameHUDSettingsTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticGameHUDSettingsTab, rows, float, 15.5);
+       ATTRIB(XonoticGameHUDSettingsTab, columns, float, 6.2);

 ENDCLASS(XonoticGameHUDSettingsTab)
 entity makeXonoticGameHUDSettingsTab();
 void HUDSetup_Start(entity me, entity btn);
 ENDCLASS(XonoticGameHUDSettingsTab)
 entity makeXonoticGameHUDSettingsTab();
 void HUDSetup_Start(entity me, entity btn);

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qh b/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qh
index 6e8421eecd0877d444742cc99af40cd49701713f..bef13432ecf44b87b5fbfda5e22d4f274fd60272 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_hudconfirm.qh
@@ -3,9 +3,9 @@
 #include "dialog.qh"
 CLASS(XonoticHUDConfirmDialog, XonoticDialog)
        METHOD(XonoticHUDConfirmDialog, fill, void(entity));
 #include "dialog.qh"
 CLASS(XonoticHUDConfirmDialog, XonoticDialog)
        METHOD(XonoticHUDConfirmDialog, fill, void(entity));

-       ATTRIB(XonoticHUDConfirmDialog, title, string, _("Enter HUD editor"))
-       ATTRIB(XonoticHUDConfirmDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM)
-       ATTRIB(XonoticHUDConfirmDialog, intendedWidth, float, 0.5)
-       ATTRIB(XonoticHUDConfirmDialog, rows, float, 4)
-       ATTRIB(XonoticHUDConfirmDialog, columns, float, 2)
+       ATTRIB(XonoticHUDConfirmDialog, title, string, _("Enter HUD editor"));
+       ATTRIB(XonoticHUDConfirmDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM);
+       ATTRIB(XonoticHUDConfirmDialog, intendedWidth, float, 0.5);
+       ATTRIB(XonoticHUDConfirmDialog, rows, float, 4);
+       ATTRIB(XonoticHUDConfirmDialog, columns, float, 2);

 ENDCLASS(XonoticHUDConfirmDialog)
 ENDCLASS(XonoticHUDConfirmDialog)

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_messages.qh b/qcsrc/menu/xonotic/dialog_settings_game_messages.qh
index 56d13bcb960e4d6dfe8011f2119358e28be9c9b6..28a7698626368175b407ae3b2e2accc7c26084e8 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_messages.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_messages.qh
@@ -4,11 +4,11 @@
 CLASS(XonoticGameMessageSettingsTab, XonoticTab)
        METHOD(XonoticGameMessageSettingsTab, fill, void(entity));
        METHOD(XonoticGameMessageSettingsTab, showNotify, void(entity));
 CLASS(XonoticGameMessageSettingsTab, XonoticTab)
        METHOD(XonoticGameMessageSettingsTab, fill, void(entity));
        METHOD(XonoticGameMessageSettingsTab, showNotify, void(entity));

-       ATTRIB(XonoticGameMessageSettingsTab, title, string, _("Messages"))
-       ATTRIB(XonoticGameMessageSettingsTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticGameMessageSettingsTab, rows, float, 15.5)
-       ATTRIB(XonoticGameMessageSettingsTab, columns, float, 6)
-       ATTRIB(XonoticGameMessageSettingsTab, weaponsList, entity, NULL)
+       ATTRIB(XonoticGameMessageSettingsTab, title, string, _("Messages"));
+       ATTRIB(XonoticGameMessageSettingsTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticGameMessageSettingsTab, rows, float, 15.5);
+       ATTRIB(XonoticGameMessageSettingsTab, columns, float, 6);
+       ATTRIB(XonoticGameMessageSettingsTab, weaponsList, entity);

 ENDCLASS(XonoticGameMessageSettingsTab)
 entity makeXonoticGameMessageSettingsTab();
 #include "../gamesettings.qh"
 ENDCLASS(XonoticGameMessageSettingsTab)
 entity makeXonoticGameMessageSettingsTab();
 #include "../gamesettings.qh"

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_model.qh b/qcsrc/menu/xonotic/dialog_settings_game_model.qh
index 8dd6eaecb321cbb50f490e9de0c7b25d6c4f0ada..c3caabee724b3f4a4c7bc620a0e09f1e7f55d93b 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_model.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_model.qh
@@ -4,11 +4,11 @@
 CLASS(XonoticGameModelSettingsTab, XonoticTab)
        METHOD(XonoticGameModelSettingsTab, fill, void(entity));
        METHOD(XonoticGameModelSettingsTab, showNotify, void(entity));
 CLASS(XonoticGameModelSettingsTab, XonoticTab)
        METHOD(XonoticGameModelSettingsTab, fill, void(entity));
        METHOD(XonoticGameModelSettingsTab, showNotify, void(entity));

-       ATTRIB(XonoticGameModelSettingsTab, title, string, _("Models"))
-       ATTRIB(XonoticGameModelSettingsTab, titleTooltip, string, _("Customize how players and items are displayed in game"))
-       ATTRIB(XonoticGameModelSettingsTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticGameModelSettingsTab, rows, float, 15.5)
-       ATTRIB(XonoticGameModelSettingsTab, columns, float, 5)
+       ATTRIB(XonoticGameModelSettingsTab, title, string, _("Models"));
+       ATTRIB(XonoticGameModelSettingsTab, titleTooltip, string, _("Customize how players and items are displayed in game"));
+       ATTRIB(XonoticGameModelSettingsTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticGameModelSettingsTab, rows, float, 15.5);
+       ATTRIB(XonoticGameModelSettingsTab, columns, float, 5);

 ENDCLASS(XonoticGameModelSettingsTab)
 entity makeXonoticGameModelSettingsTab();
 #include "../gamesettings.qh"
 ENDCLASS(XonoticGameModelSettingsTab)
 entity makeXonoticGameModelSettingsTab();
 #include "../gamesettings.qh"

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_view.qh b/qcsrc/menu/xonotic/dialog_settings_game_view.qh
index 7ec4c79366b9ffcb2cddad2f29b49a44c83a9a63..f9d6001199b740f6555230112c19fd616fc22971 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_view.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_view.qh
@@ -4,10 +4,10 @@
 CLASS(XonoticGameViewSettingsTab, XonoticTab)
        METHOD(XonoticGameViewSettingsTab, fill, void(entity));
        METHOD(XonoticGameViewSettingsTab, showNotify, void(entity));
 CLASS(XonoticGameViewSettingsTab, XonoticTab)
        METHOD(XonoticGameViewSettingsTab, fill, void(entity));
        METHOD(XonoticGameViewSettingsTab, showNotify, void(entity));

-       ATTRIB(XonoticGameViewSettingsTab, title, string, _("View"))
-       ATTRIB(XonoticGameViewSettingsTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticGameViewSettingsTab, rows, float, 15.5)
-       ATTRIB(XonoticGameViewSettingsTab, columns, float, 6.2)
+       ATTRIB(XonoticGameViewSettingsTab, title, string, _("View"));
+       ATTRIB(XonoticGameViewSettingsTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticGameViewSettingsTab, rows, float, 15.5);
+       ATTRIB(XonoticGameViewSettingsTab, columns, float, 6.2);

 ENDCLASS(XonoticGameViewSettingsTab)
 entity makeXonoticGameViewSettingsTab();
 #include "../gamesettings.qh"
 ENDCLASS(XonoticGameViewSettingsTab)
 entity makeXonoticGameViewSettingsTab();
 #include "../gamesettings.qh"

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qh b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qh
index 73ee66fb27e42138e926ffeb15127130a7000242..ded41a5abdeb25963cccdef129ba591642df879a 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qh
@@ -4,11 +4,11 @@
 CLASS(XonoticGameWeaponsSettingsTab, XonoticTab)
        METHOD(XonoticGameWeaponsSettingsTab, fill, void(entity));
        METHOD(XonoticGameWeaponsSettingsTab, showNotify, void(entity));
 CLASS(XonoticGameWeaponsSettingsTab, XonoticTab)
        METHOD(XonoticGameWeaponsSettingsTab, fill, void(entity));
        METHOD(XonoticGameWeaponsSettingsTab, showNotify, void(entity));

-       ATTRIB(XonoticGameWeaponsSettingsTab, title, string, _("Weapons"))
-       ATTRIB(XonoticGameWeaponsSettingsTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticGameWeaponsSettingsTab, rows, float, 15.5)
-       ATTRIB(XonoticGameWeaponsSettingsTab, columns, float, 6)
-       ATTRIB(XonoticGameWeaponsSettingsTab, weaponsList, entity, NULL)
+       ATTRIB(XonoticGameWeaponsSettingsTab, title, string, _("Weapons"));
+       ATTRIB(XonoticGameWeaponsSettingsTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticGameWeaponsSettingsTab, rows, float, 15.5);
+       ATTRIB(XonoticGameWeaponsSettingsTab, columns, float, 6);
+       ATTRIB(XonoticGameWeaponsSettingsTab, weaponsList, entity);

 ENDCLASS(XonoticGameWeaponsSettingsTab)
 entity makeXonoticGameWeaponsSettingsTab();
 #include "../gamesettings.qh"
 ENDCLASS(XonoticGameWeaponsSettingsTab)
 entity makeXonoticGameWeaponsSettingsTab();
 #include "../gamesettings.qh"

diff --git a/qcsrc/menu/xonotic/dialog_settings_input.qh b/qcsrc/menu/xonotic/dialog_settings_input.qh
index f8e6feda6c9489f080da7db1d3451b5dcdf6b432..040908298976dd5784f3b7708ba6af6ae2d9e530 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_input.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_input.qh
@@ -3,8 +3,8 @@
 #include "tab.qh"
 CLASS(XonoticInputSettingsTab, XonoticTab)
        METHOD(XonoticInputSettingsTab, fill, void(entity));
 #include "tab.qh"
 CLASS(XonoticInputSettingsTab, XonoticTab)
        METHOD(XonoticInputSettingsTab, fill, void(entity));

-       ATTRIB(XonoticInputSettingsTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticInputSettingsTab, rows, float, 15.5)
-       ATTRIB(XonoticInputSettingsTab, columns, float, 6.2)  // added extra .2 for center space
+       ATTRIB(XonoticInputSettingsTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticInputSettingsTab, rows, float, 15.5);
+       ATTRIB(XonoticInputSettingsTab, columns, float, 6.2);  // added extra .2 for center space

 ENDCLASS(XonoticInputSettingsTab)
 entity makeXonoticInputSettingsTab();
 ENDCLASS(XonoticInputSettingsTab)
 entity makeXonoticInputSettingsTab();

diff --git a/qcsrc/menu/xonotic/dialog_settings_input_userbind.qh b/qcsrc/menu/xonotic/dialog_settings_input_userbind.qh
index 5ff3a2e0bcc2edbce1936036fbc7c2423cf91223..561a04b32b2326f0a9a9226df550a1b8d2790a5c 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_input_userbind.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_input_userbind.qh
@@ -4,14 +4,14 @@
 CLASS(XonoticUserbindEditDialog, XonoticDialog)
        METHOD(XonoticUserbindEditDialog, loadUserBind, void(entity, string, string, string));
        METHOD(XonoticUserbindEditDialog, fill, void(entity));
 CLASS(XonoticUserbindEditDialog, XonoticDialog)
        METHOD(XonoticUserbindEditDialog, loadUserBind, void(entity, string, string, string));
        METHOD(XonoticUserbindEditDialog, fill, void(entity));

-       ATTRIB(XonoticUserbindEditDialog, title, string, _("User defined key bind"))
-       ATTRIB(XonoticUserbindEditDialog, color, vector, SKINCOLOR_DIALOG_USERBIND)
-       ATTRIB(XonoticUserbindEditDialog, intendedWidth, float, 0.7)
-       ATTRIB(XonoticUserbindEditDialog, rows, float, 4)
-       ATTRIB(XonoticUserbindEditDialog, columns, float, 3)
-       ATTRIB(XonoticUserbindEditDialog, keybindBox, entity, NULL)
+       ATTRIB(XonoticUserbindEditDialog, title, string, _("User defined key bind"));
+       ATTRIB(XonoticUserbindEditDialog, color, vector, SKINCOLOR_DIALOG_USERBIND);
+       ATTRIB(XonoticUserbindEditDialog, intendedWidth, float, 0.7);
+       ATTRIB(XonoticUserbindEditDialog, rows, float, 4);
+       ATTRIB(XonoticUserbindEditDialog, columns, float, 3);
+       ATTRIB(XonoticUserbindEditDialog, keybindBox, entity);

 
 

-       ATTRIB(XonoticUserbindEditDialog, nameBox, entity, NULL)
-       ATTRIB(XonoticUserbindEditDialog, commandPressBox, entity, NULL)
-       ATTRIB(XonoticUserbindEditDialog, commandReleaseBox, entity, NULL)
+       ATTRIB(XonoticUserbindEditDialog, nameBox, entity);
+       ATTRIB(XonoticUserbindEditDialog, commandPressBox, entity);
+       ATTRIB(XonoticUserbindEditDialog, commandReleaseBox, entity);

 ENDCLASS(XonoticUserbindEditDialog)
 ENDCLASS(XonoticUserbindEditDialog)

diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.qh b/qcsrc/menu/xonotic/dialog_settings_misc.qh
index f3f367e686626a8b8b9f2dd30ff856d5126e41d7..a2a86b7e1fb956adbbb750f090168cbe8df3650d 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_misc.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.qh
@@ -3,8 +3,8 @@
 #include "tab.qh"
 CLASS(XonoticMiscSettingsTab, XonoticTab)
        METHOD(XonoticMiscSettingsTab, fill, void(entity));
 #include "tab.qh"
 CLASS(XonoticMiscSettingsTab, XonoticTab)
        METHOD(XonoticMiscSettingsTab, fill, void(entity));

-       ATTRIB(XonoticMiscSettingsTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticMiscSettingsTab, rows, float, 15.5)
-       ATTRIB(XonoticMiscSettingsTab, columns, float, 6.2)
+       ATTRIB(XonoticMiscSettingsTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticMiscSettingsTab, rows, float, 15.5);
+       ATTRIB(XonoticMiscSettingsTab, columns, float, 6.2);

 ENDCLASS(XonoticMiscSettingsTab)
 entity makeXonoticMiscSettingsTab();
 ENDCLASS(XonoticMiscSettingsTab)
 entity makeXonoticMiscSettingsTab();

diff --git a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qh b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qh
index f5011f77170e5a14a02421b83ab34425df3d7d12..4fddf65867ce4a9f808eac3fba2cdc912835fec0 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_misc_cvars.qh
@@ -4,9 +4,9 @@
 CLASS(XonoticCvarsDialog, XonoticDialog)
        METHOD(XonoticCvarsDialog, fill, void(entity));
        METHOD(XonoticCvarsDialog, showNotify, void(entity));
 CLASS(XonoticCvarsDialog, XonoticDialog)
        METHOD(XonoticCvarsDialog, fill, void(entity));
        METHOD(XonoticCvarsDialog, showNotify, void(entity));

-       ATTRIB(XonoticCvarsDialog, title, string, _("Advanced settings"))
-       ATTRIB(XonoticCvarsDialog, color, vector, SKINCOLOR_DIALOG_CVARS)
-       ATTRIB(XonoticCvarsDialog, intendedWidth, float, 0.8)
-       ATTRIB(XonoticCvarsDialog, rows, float, 24)
-       ATTRIB(XonoticCvarsDialog, columns, float, 6)
+       ATTRIB(XonoticCvarsDialog, title, string, _("Advanced settings"));
+       ATTRIB(XonoticCvarsDialog, color, vector, SKINCOLOR_DIALOG_CVARS);
+       ATTRIB(XonoticCvarsDialog, intendedWidth, float, 0.8);
+       ATTRIB(XonoticCvarsDialog, rows, float, 24);
+       ATTRIB(XonoticCvarsDialog, columns, float, 6);

 ENDCLASS(XonoticCvarsDialog)
 ENDCLASS(XonoticCvarsDialog)

diff --git a/qcsrc/menu/xonotic/dialog_settings_misc_reset.qh b/qcsrc/menu/xonotic/dialog_settings_misc_reset.qh
index 1cbc7773ab9091016ba1a978bf03f9545ce36164..f1d02ff90917365cb050a5d84b8fcb93f502e2bf 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_misc_reset.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_misc_reset.qh
@@ -3,10 +3,10 @@
 #include "dialog.qh"
 CLASS(XonoticResetDialog, XonoticDialog)
        METHOD(XonoticResetDialog, fill, void(entity));
 #include "dialog.qh"
 CLASS(XonoticResetDialog, XonoticDialog)
        METHOD(XonoticResetDialog, fill, void(entity));

-       ATTRIB(XonoticResetDialog, title, string, _("Factory reset"))
-       ATTRIB(XonoticResetDialog, color, vector, SKINCOLOR_DIALOG_QUIT)
-       ATTRIB(XonoticResetDialog, intendedWidth, float, 0.5)
-       ATTRIB(XonoticResetDialog, rows, float, 4)
-       ATTRIB(XonoticResetDialog, columns, float, 2)
-       ATTRIB(XonoticResetDialog, name, string, "Factory reset")
+       ATTRIB(XonoticResetDialog, title, string, _("Factory reset"));
+       ATTRIB(XonoticResetDialog, color, vector, SKINCOLOR_DIALOG_QUIT);
+       ATTRIB(XonoticResetDialog, intendedWidth, float, 0.5);
+       ATTRIB(XonoticResetDialog, rows, float, 4);
+       ATTRIB(XonoticResetDialog, columns, float, 2);
+       ATTRIB(XonoticResetDialog, name, string, "Factory reset");

 ENDCLASS(XonoticResetDialog)
 ENDCLASS(XonoticResetDialog)

diff --git a/qcsrc/menu/xonotic/dialog_settings_user.qh b/qcsrc/menu/xonotic/dialog_settings_user.qh
index 3a5ccc3b652a79a7bc9cac35f5b0b03a40a2382b..22f84d0f0b7c024b5247f17a28c46efa9848bfab 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_user.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_user.qh
@@ -3,8 +3,8 @@
 #include "tab.qh"
 CLASS(XonoticUserSettingsTab, XonoticTab)
        METHOD(XonoticUserSettingsTab, fill, void(entity));
 #include "tab.qh"
 CLASS(XonoticUserSettingsTab, XonoticTab)
        METHOD(XonoticUserSettingsTab, fill, void(entity));

-       ATTRIB(XonoticUserSettingsTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticUserSettingsTab, rows, float, 15.5)
-       ATTRIB(XonoticUserSettingsTab, columns, float, 6)
+       ATTRIB(XonoticUserSettingsTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticUserSettingsTab, rows, float, 15.5);
+       ATTRIB(XonoticUserSettingsTab, columns, float, 6);

 ENDCLASS(XonoticUserSettingsTab)
 entity makeXonoticUserSettingsTab();
 ENDCLASS(XonoticUserSettingsTab)
 entity makeXonoticUserSettingsTab();

diff --git a/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qh b/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qh
index 6028a441cae0b65c5acbc3e2f08f033f0a3db944..ba5c8a5d1c0bc0f129e006da2a5f06ce5e23aa8f 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_user_languagewarning.qh
@@ -3,9 +3,9 @@
 #include "dialog.qh"
 CLASS(XonoticLanguageWarningDialog, XonoticDialog)
        METHOD(XonoticLanguageWarningDialog, fill, void(entity));
 #include "dialog.qh"
 CLASS(XonoticLanguageWarningDialog, XonoticDialog)
        METHOD(XonoticLanguageWarningDialog, fill, void(entity));

-       ATTRIB(XonoticLanguageWarningDialog, title, string, _("Warning"))
-       ATTRIB(XonoticLanguageWarningDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM)
-       ATTRIB(XonoticLanguageWarningDialog, intendedWidth, float, 0.6)
-       ATTRIB(XonoticLanguageWarningDialog, rows, float, 5)
-       ATTRIB(XonoticLanguageWarningDialog, columns, float, 4)
+       ATTRIB(XonoticLanguageWarningDialog, title, string, _("Warning"));
+       ATTRIB(XonoticLanguageWarningDialog, color, vector, SKINCOLOR_DIALOG_HUDCONFIRM);
+       ATTRIB(XonoticLanguageWarningDialog, intendedWidth, float, 0.6);
+       ATTRIB(XonoticLanguageWarningDialog, rows, float, 5);
+       ATTRIB(XonoticLanguageWarningDialog, columns, float, 4);

 ENDCLASS(XonoticLanguageWarningDialog)
 ENDCLASS(XonoticLanguageWarningDialog)

diff --git a/qcsrc/menu/xonotic/dialog_settings_video.qh b/qcsrc/menu/xonotic/dialog_settings_video.qh
index 0abe322c38da0a3ccf3b47fd0f04345f198a08ee..61d8a368e0e67edd06003e6b6966fb9525f298fa 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_video.qh
+++ b/qcsrc/menu/xonotic/dialog_settings_video.qh
@@ -3,9 +3,9 @@
 #include "tab.qh"
 CLASS(XonoticVideoSettingsTab, XonoticTab)
        METHOD(XonoticVideoSettingsTab, fill, void(entity));
 #include "tab.qh"
 CLASS(XonoticVideoSettingsTab, XonoticTab)
        METHOD(XonoticVideoSettingsTab, fill, void(entity));

-       ATTRIB(XonoticVideoSettingsTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticVideoSettingsTab, rows, float, 15.5)
-       ATTRIB(XonoticVideoSettingsTab, columns, float, 6.2)  // added extra .2 for center space
-       ATTRIB(XonoticVideoSettingsTab, name, string, "videosettings")
+       ATTRIB(XonoticVideoSettingsTab, intendedWidth, float, 0.9);
+       ATTRIB(XonoticVideoSettingsTab, rows, float, 15.5);
+       ATTRIB(XonoticVideoSettingsTab, columns, float, 6.2);  // added extra .2 for center space
+       ATTRIB(XonoticVideoSettingsTab, name, string, "videosettings");

 ENDCLASS(XonoticVideoSettingsTab)
 entity makeXonoticVideoSettingsTab();
 ENDCLASS(XonoticVideoSettingsTab)
 entity makeXonoticVideoSettingsTab();

diff --git a/qcsrc/menu/xonotic/dialog_singleplayer.qh b/qcsrc/menu/xonotic/dialog_singleplayer.qh
index b3dabaf6ce160ee59c3852bec89c8492b4b04e6f..c7691fbba4e16ba81eb483b8c0f748c9e6d4f2ba 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_singleplayer.qh
+++ b/qcsrc/menu/xonotic/dialog_singleplayer.qh
@@ -3,11 +3,11 @@
 #include "dialog.qh"
 CLASS(XonoticSingleplayerDialog, XonoticDialog)
        METHOD(XonoticSingleplayerDialog, fill, void(entity));
 #include "dialog.qh"
 CLASS(XonoticSingleplayerDialog, XonoticDialog)
        METHOD(XonoticSingleplayerDialog, fill, void(entity));

-       ATTRIB(XonoticSingleplayerDialog, title, string, _("Singleplayer"))
-       ATTRIB(XonoticSingleplayerDialog, tooltip, string, _("Play the singleplayer campaign or instant action matches against bots"))
-       ATTRIB(XonoticSingleplayerDialog, color, vector, SKINCOLOR_DIALOG_SINGLEPLAYER)
-       ATTRIB(XonoticSingleplayerDialog, intendedWidth, float, 0.80)
-       ATTRIB(XonoticSingleplayerDialog, rows, float, 24)
-       ATTRIB(XonoticSingleplayerDialog, columns, float, 5)
-       ATTRIB(XonoticSingleplayerDialog, campaignBox, entity, NULL)
+       ATTRIB(XonoticSingleplayerDialog, title, string, _("Singleplayer"));
+       ATTRIB(XonoticSingleplayerDialog, tooltip, string, _("Play the singleplayer campaign or instant action matches against bots"));
+       ATTRIB(XonoticSingleplayerDialog, color, vector, SKINCOLOR_DIALOG_SINGLEPLAYER);
+       ATTRIB(XonoticSingleplayerDialog, intendedWidth, float, 0.80);
+       ATTRIB(XonoticSingleplayerDialog, rows, float, 24);
+       ATTRIB(XonoticSingleplayerDialog, columns, float, 5);
+       ATTRIB(XonoticSingleplayerDialog, campaignBox, entity);

 ENDCLASS(XonoticSingleplayerDialog)
 ENDCLASS(XonoticSingleplayerDialog)

diff --git a/qcsrc/menu/xonotic/dialog_singleplayer_winner.qh b/qcsrc/menu/xonotic/dialog_singleplayer_winner.qh
index 1de958b8b7ebe6103ad72e6bd11d3feffb45b7b8..6a6b2d37bf7988956fb66de009dec5b79550a943 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_singleplayer_winner.qh
+++ b/qcsrc/menu/xonotic/dialog_singleplayer_winner.qh
@@ -4,9 +4,9 @@
 CLASS(XonoticWinnerDialog, XonoticDialog)
        METHOD(XonoticWinnerDialog, fill, void(entity));
        METHOD(XonoticWinnerDialog, focusEnter, void(entity));
 CLASS(XonoticWinnerDialog, XonoticDialog)
        METHOD(XonoticWinnerDialog, fill, void(entity));
        METHOD(XonoticWinnerDialog, focusEnter, void(entity));

-       ATTRIB(XonoticWinnerDialog, title, string, _("Winner"))
-       ATTRIB(XonoticWinnerDialog, color, vector, SKINCOLOR_DIALOG_SINGLEPLAYER)
-       ATTRIB(XonoticWinnerDialog, intendedWidth, float, 0.32)
-       ATTRIB(XonoticWinnerDialog, rows, float, 12)
-       ATTRIB(XonoticWinnerDialog, columns, float, 3)
+       ATTRIB(XonoticWinnerDialog, title, string, _("Winner"));
+       ATTRIB(XonoticWinnerDialog, color, vector, SKINCOLOR_DIALOG_SINGLEPLAYER);
+       ATTRIB(XonoticWinnerDialog, intendedWidth, float, 0.32);
+       ATTRIB(XonoticWinnerDialog, rows, float, 12);
+       ATTRIB(XonoticWinnerDialog, columns, float, 3);

 ENDCLASS(XonoticWinnerDialog)
 ENDCLASS(XonoticWinnerDialog)

diff --git a/qcsrc/menu/xonotic/dialog_teamselect.qh b/qcsrc/menu/xonotic/dialog_teamselect.qh
index b4056bb3b1947c936566e6120ece605d562eff4b..0bb0c306e388e35e8f30d5069957e631277db572 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_teamselect.qh
+++ b/qcsrc/menu/xonotic/dialog_teamselect.qh
@@ -4,15 +4,15 @@
 CLASS(XonoticTeamSelectDialog, XonoticRootDialog)
        METHOD(XonoticTeamSelectDialog, fill, void(entity));
        METHOD(XonoticTeamSelectDialog, showNotify, void(entity));
 CLASS(XonoticTeamSelectDialog, XonoticRootDialog)
        METHOD(XonoticTeamSelectDialog, fill, void(entity));
        METHOD(XonoticTeamSelectDialog, showNotify, void(entity));

-       ATTRIB(XonoticTeamSelectDialog, title, string, _("Team Selection"))
-       ATTRIB(XonoticTeamSelectDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticTeamSelectDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticTeamSelectDialog, rows, float, 5)
-       ATTRIB(XonoticTeamSelectDialog, columns, float, 4)
-       ATTRIB(XonoticTeamSelectDialog, name, string, "TeamSelect")
-       ATTRIB(XonoticTeamSelectDialog, team1, entity, NULL)
-       ATTRIB(XonoticTeamSelectDialog, team2, entity, NULL)
-       ATTRIB(XonoticTeamSelectDialog, team3, entity, NULL)
-       ATTRIB(XonoticTeamSelectDialog, team4, entity, NULL)
-       ATTRIB(XonoticTeamSelectDialog, requiresConnection, float, true)
+       ATTRIB(XonoticTeamSelectDialog, title, string, _("Team Selection"));
+       ATTRIB(XonoticTeamSelectDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticTeamSelectDialog, intendedWidth, float, 0.4);
+       ATTRIB(XonoticTeamSelectDialog, rows, float, 5);
+       ATTRIB(XonoticTeamSelectDialog, columns, float, 4);
+       ATTRIB(XonoticTeamSelectDialog, name, string, "TeamSelect");
+       ATTRIB(XonoticTeamSelectDialog, team1, entity);
+       ATTRIB(XonoticTeamSelectDialog, team2, entity);
+       ATTRIB(XonoticTeamSelectDialog, team3, entity);
+       ATTRIB(XonoticTeamSelectDialog, team4, entity);
+       ATTRIB(XonoticTeamSelectDialog, requiresConnection, float, true);

 ENDCLASS(XonoticTeamSelectDialog)
 ENDCLASS(XonoticTeamSelectDialog)

diff --git a/qcsrc/menu/xonotic/dialog_uid2name.qh b/qcsrc/menu/xonotic/dialog_uid2name.qh
index 4bec3d1f9c0c2a4e434cef390a6724875ba663da..7b5f23b694ba6991ebf52b1512376d227345188e 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_uid2name.qh
+++ b/qcsrc/menu/xonotic/dialog_uid2name.qh
@@ -3,11 +3,11 @@
 #include "rootdialog.qh"
 CLASS(XonoticUid2NameDialog, XonoticRootDialog)
        METHOD(XonoticUid2NameDialog, fill, void(entity));
 #include "rootdialog.qh"
 CLASS(XonoticUid2NameDialog, XonoticRootDialog)
        METHOD(XonoticUid2NameDialog, fill, void(entity));

-       ATTRIB(XonoticUid2NameDialog, title, string, string_null)
-       ATTRIB(XonoticUid2NameDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-       ATTRIB(XonoticUid2NameDialog, intendedWidth, float, 0.5)
-       ATTRIB(XonoticUid2NameDialog, rows, float, 4)
-       ATTRIB(XonoticUid2NameDialog, columns, float, 2)
-       ATTRIB(XonoticUid2NameDialog, name, string, "Uid2Name")
-       ATTRIB(XonoticUid2NameDialog, closable, float, 0)
+       ATTRIB(XonoticUid2NameDialog, title, string);
+       ATTRIB(XonoticUid2NameDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT);
+       ATTRIB(XonoticUid2NameDialog, intendedWidth, float, 0.5);
+       ATTRIB(XonoticUid2NameDialog, rows, float, 4);
+       ATTRIB(XonoticUid2NameDialog, columns, float, 2);
+       ATTRIB(XonoticUid2NameDialog, name, string, "Uid2Name");
+       ATTRIB(XonoticUid2NameDialog, closable, float, 0);

 ENDCLASS(XonoticUid2NameDialog)
 ENDCLASS(XonoticUid2NameDialog)

diff --git a/qcsrc/menu/xonotic/gametypelist.qh b/qcsrc/menu/xonotic/gametypelist.qh
index 9e17c5c85523e5008d275f80687688951cf19448..bbc50aba4357baed2496662563891d07a3eb2136 100644 (file)
--- a/qcsrc/menu/xonotic/gametypelist.qh
+++ b/qcsrc/menu/xonotic/gametypelist.qh
@@ -3,7 +3,7 @@
 #include "listbox.qh"
 CLASS(XonoticGametypeList, XonoticListBox)
        METHOD(XonoticGametypeList, configureXonoticGametypeList, void(entity));
 #include "listbox.qh"
 CLASS(XonoticGametypeList, XonoticListBox)
        METHOD(XonoticGametypeList, configureXonoticGametypeList, void(entity));

-       ATTRIB(XonoticGametypeList, rowsPerItem, float, 2)
+       ATTRIB(XonoticGametypeList, rowsPerItem, float, 2);

        METHOD(XonoticGametypeList, draw, void(entity));
        METHOD(XonoticGametypeList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticGametypeList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticGametypeList, draw, void(entity));
        METHOD(XonoticGametypeList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticGametypeList, resizeNotify, void(entity, vector, vector, vector, vector));


@@ -14,11 +14,11 @@ CLASS(XonoticGametypeList, XonoticListBox)
        METHOD(XonoticGametypeList, clickListBoxItem, void(entity, float, vector));
        METHOD(XonoticGametypeList, focusedItemChangeNotify, void(entity));
 
        METHOD(XonoticGametypeList, clickListBoxItem, void(entity, float, vector));
        METHOD(XonoticGametypeList, focusedItemChangeNotify, void(entity));
 

-       ATTRIB(XonoticGametypeList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticGametypeList, realUpperMargin, float, 0)
-       ATTRIB(XonoticGametypeList, columnIconOrigin, float, 0)
-       ATTRIB(XonoticGametypeList, columnIconSize, float, 0)
-       ATTRIB(XonoticGametypeList, columnNameOrigin, float, 0)
-       ATTRIB(XonoticGametypeList, columnNameSize, float, 0)
+       ATTRIB(XonoticGametypeList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticGametypeList, realUpperMargin, float, 0);
+       ATTRIB(XonoticGametypeList, columnIconOrigin, float, 0);
+       ATTRIB(XonoticGametypeList, columnIconSize, float, 0);
+       ATTRIB(XonoticGametypeList, columnNameOrigin, float, 0);
+       ATTRIB(XonoticGametypeList, columnNameSize, float, 0);

 ENDCLASS(XonoticGametypeList)
 entity makeXonoticGametypeList();
 ENDCLASS(XonoticGametypeList)
 entity makeXonoticGametypeList();

diff --git a/qcsrc/menu/xonotic/hudskinlist.qh b/qcsrc/menu/xonotic/hudskinlist.qh
index f5808698cce5885254ff02bb1b4f0536b0d83b72..557f2e165c6c4d823c6ca81798eaf49b95e0e01a 100644 (file)
--- a/qcsrc/menu/xonotic/hudskinlist.qh
+++ b/qcsrc/menu/xonotic/hudskinlist.qh
@@ -3,7 +3,7 @@
 #include "listbox.qh"
 CLASS(XonoticHUDSkinList, XonoticListBox)
        METHOD(XonoticHUDSkinList, configureXonoticHUDSkinList, void(entity));
 #include "listbox.qh"
 CLASS(XonoticHUDSkinList, XonoticListBox)
        METHOD(XonoticHUDSkinList, configureXonoticHUDSkinList, void(entity));

-       ATTRIB(XonoticHUDSkinList, rowsPerItem, float, 1)
+       ATTRIB(XonoticHUDSkinList, rowsPerItem, float, 1);

        METHOD(XonoticHUDSkinList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticHUDSkinList, draw, void(entity));
        METHOD(XonoticHUDSkinList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticHUDSkinList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticHUDSkinList, draw, void(entity));
        METHOD(XonoticHUDSkinList, drawListBoxItem, void(entity, int, vector, bool, bool));


@@ -18,17 +18,17 @@ CLASS(XonoticHUDSkinList, XonoticListBox)
        METHOD(XonoticHUDSkinList, destroy, void(entity));
        METHOD(XonoticHUDSkinList, showNotify, void(entity));
 
        METHOD(XonoticHUDSkinList, destroy, void(entity));
        METHOD(XonoticHUDSkinList, showNotify, void(entity));
 

-       ATTRIB(XonoticHUDSkinList, listHUDSkin, float, -1)
-       ATTRIB(XonoticHUDSkinList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticHUDSkinList, columnNameOrigin, float, 0)
-       ATTRIB(XonoticHUDSkinList, columnNameSize, float, 0)
-       ATTRIB(XonoticHUDSkinList, realUpperMargin, float, 0)
-       ATTRIB(XonoticHUDSkinList, origin, vector, '0 0 0')
-       ATTRIB(XonoticHUDSkinList, itemAbsSize, vector, '0 0 0')
+       ATTRIB(XonoticHUDSkinList, listHUDSkin, float, -1);
+       ATTRIB(XonoticHUDSkinList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticHUDSkinList, columnNameOrigin, float, 0);
+       ATTRIB(XonoticHUDSkinList, columnNameSize, float, 0);
+       ATTRIB(XonoticHUDSkinList, realUpperMargin, float, 0);
+       ATTRIB(XonoticHUDSkinList, origin, vector, '0 0 0');
+       ATTRIB(XonoticHUDSkinList, itemAbsSize, vector, '0 0 0');

 
 

-       ATTRIB(XonoticHUDSkinList, filterString, string, string_null)
-       ATTRIB(XonoticHUDSkinList, delayedRefreshTime, float, 0)
-       ATTRIB(XonoticHUDSkinList, savedName, string, string_null)
+       ATTRIB(XonoticHUDSkinList, filterString, string);
+       ATTRIB(XonoticHUDSkinList, delayedRefreshTime, float, 0);
+       ATTRIB(XonoticHUDSkinList, savedName, string);

 ENDCLASS(XonoticHUDSkinList)
 entity hudskinlist;
 entity makeXonoticHUDSkinList();
 ENDCLASS(XonoticHUDSkinList)
 entity hudskinlist;
 entity makeXonoticHUDSkinList();

diff --git a/qcsrc/menu/xonotic/inputbox.qh b/qcsrc/menu/xonotic/inputbox.qh
index c09817943b31cbb7748db9a7cf2d0200aee59519..7be855cd9d4667c2f42d05d44561e51e63b14623 100644 (file)
--- a/qcsrc/menu/xonotic/inputbox.qh
+++ b/qcsrc/menu/xonotic/inputbox.qh
@@ -6,32 +6,32 @@ CLASS(XonoticInputBox, InputBox)
        METHOD(XonoticInputBox, focusLeave, void(entity));
        METHOD(XonoticInputBox, setText, void(entity, string));
        METHOD(XonoticInputBox, keyDown, float(entity, float, float, float));
        METHOD(XonoticInputBox, focusLeave, void(entity));
        METHOD(XonoticInputBox, setText, void(entity, string));
        METHOD(XonoticInputBox, keyDown, float(entity, float, float, float));

-       ATTRIB(XonoticInputBox, fontSize, float, SKINFONTSIZE_NORMAL)
-       ATTRIB(XonoticInputBox, image, string, SKINGFX_INPUTBOX)
-       ATTRIB(XonoticInputBox, onChange, void(entity, entity), func_null)
-       ATTRIB(XonoticInputBox, onChangeEntity, entity, NULL)
-       ATTRIB(XonoticInputBox, onEnter, void(entity, entity), func_null)
-       ATTRIB(XonoticInputBox, onEnterEntity, entity, NULL)
-       ATTRIB(XonoticInputBox, marginLeft, float, SKINMARGIN_INPUTBOX_CHARS)
-       ATTRIB(XonoticInputBox, marginRight, float, SKINMARGIN_INPUTBOX_CHARS)
-       ATTRIB(XonoticInputBox, color, vector, SKINCOLOR_INPUTBOX_N)
-       ATTRIB(XonoticInputBox, colorF, vector, SKINCOLOR_INPUTBOX_F)
+       ATTRIB(XonoticInputBox, fontSize, float, SKINFONTSIZE_NORMAL);
+       ATTRIB(XonoticInputBox, image, string, SKINGFX_INPUTBOX);
+       ATTRIB(XonoticInputBox, onChange, void(entity, entity));
+       ATTRIB(XonoticInputBox, onChangeEntity, entity);
+       ATTRIB(XonoticInputBox, onEnter, void(entity, entity));
+       ATTRIB(XonoticInputBox, onEnterEntity, entity);
+       ATTRIB(XonoticInputBox, marginLeft, float, SKINMARGIN_INPUTBOX_CHARS);
+       ATTRIB(XonoticInputBox, marginRight, float, SKINMARGIN_INPUTBOX_CHARS);
+       ATTRIB(XonoticInputBox, color, vector, SKINCOLOR_INPUTBOX_N);
+       ATTRIB(XonoticInputBox, colorF, vector, SKINCOLOR_INPUTBOX_F);

 
 

-       ATTRIB(XonoticInputBox, alpha, float, SKINALPHA_TEXT)
+       ATTRIB(XonoticInputBox, alpha, float, SKINALPHA_TEXT);

 
        // Clear button attributes
 
        // Clear button attributes

-       ATTRIB(XonoticInputBox, cb_offset, float, SKINOFFSET_CLEARBUTTON)  // bound to range -1, 0
-       ATTRIB(XonoticInputBox, cb_src, string, SKINGFX_CLEARBUTTON)
-       ATTRIB(XonoticInputBox, cb_color, vector, SKINCOLOR_CLEARBUTTON_N)
-       ATTRIB(XonoticInputBox, cb_colorF, vector, SKINCOLOR_CLEARBUTTON_F)
-       ATTRIB(XonoticInputBox, cb_colorC, vector, SKINCOLOR_CLEARBUTTON_C)
+       ATTRIB(XonoticInputBox, cb_offset, float, SKINOFFSET_CLEARBUTTON);  // bound to range -1, 0
+       ATTRIB(XonoticInputBox, cb_src, string, SKINGFX_CLEARBUTTON);
+       ATTRIB(XonoticInputBox, cb_color, vector, SKINCOLOR_CLEARBUTTON_N);
+       ATTRIB(XonoticInputBox, cb_colorF, vector, SKINCOLOR_CLEARBUTTON_F);
+       ATTRIB(XonoticInputBox, cb_colorC, vector, SKINCOLOR_CLEARBUTTON_C);

 
 

-       ATTRIB(XonoticInputBox, cvarName, string, string_null)
+       ATTRIB(XonoticInputBox, cvarName, string);

        METHOD(XonoticInputBox, loadCvars, void(entity));
        METHOD(XonoticInputBox, saveCvars, void(entity));
        METHOD(XonoticInputBox, loadCvars, void(entity));
        METHOD(XonoticInputBox, saveCvars, void(entity));

-       ATTRIB(XonoticInputBox, sendCvars, float, 0)
+       ATTRIB(XonoticInputBox, sendCvars, float, 0);

 
 

-       ATTRIB(XonoticInputBox, saveImmediately, float, 0)
+       ATTRIB(XonoticInputBox, saveImmediately, float, 0);

 ENDCLASS(XonoticInputBox)
 entity makeXonoticInputBox_T(float, string, string theTooltip);
 entity makeXonoticInputBox(float, string);
 ENDCLASS(XonoticInputBox)
 entity makeXonoticInputBox_T(float, string, string theTooltip);
 entity makeXonoticInputBox(float, string);

diff --git a/qcsrc/menu/xonotic/keybinder.qh b/qcsrc/menu/xonotic/keybinder.qh
index 4d0482dd9dfcbf9e1e0770ebd393a31327853185..764059f768df6d8feffedd929d164fa4d182a9e0 100644 (file)
--- a/qcsrc/menu/xonotic/keybinder.qh
+++ b/qcsrc/menu/xonotic/keybinder.qh
@@ -3,7 +3,7 @@
 #include "listbox.qh"
 CLASS(XonoticKeyBinder, XonoticListBox)
        METHOD(XonoticKeyBinder, configureXonoticKeyBinder, void(entity));
 #include "listbox.qh"
 CLASS(XonoticKeyBinder, XonoticListBox)
        METHOD(XonoticKeyBinder, configureXonoticKeyBinder, void(entity));

-       ATTRIB(XonoticKeyBinder, rowsPerItem, int, 1)
+       ATTRIB(XonoticKeyBinder, rowsPerItem, int, 1);

        METHOD(XonoticKeyBinder, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticKeyBinder, doubleClickListBoxItem, void(entity, float, vector));
        METHOD(XonoticKeyBinder, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticKeyBinder, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticKeyBinder, doubleClickListBoxItem, void(entity, float, vector));
        METHOD(XonoticKeyBinder, resizeNotify, void(entity, vector, vector, vector, vector));


@@ -13,20 +13,20 @@ CLASS(XonoticKeyBinder, XonoticListBox)
        METHOD(XonoticKeyBinder, keyGrabbed, void(entity, float, float));
        METHOD(XonoticKeyBinder, destroy, void(entity));
 
        METHOD(XonoticKeyBinder, keyGrabbed, void(entity, float, float));
        METHOD(XonoticKeyBinder, destroy, void(entity));
 

-       ATTRIB(XonoticKeyBinder, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticKeyBinder, realUpperMargin, float, 0)
-       ATTRIB(XonoticKeyBinder, columnFunctionOrigin, float, 0)
-       ATTRIB(XonoticKeyBinder, columnFunctionSize, float, 0)
-       ATTRIB(XonoticKeyBinder, columnKeysOrigin, float, 0)
-       ATTRIB(XonoticKeyBinder, columnKeysSize, float, 0)
+       ATTRIB(XonoticKeyBinder, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticKeyBinder, realUpperMargin, float, 0);
+       ATTRIB(XonoticKeyBinder, columnFunctionOrigin, float, 0);
+       ATTRIB(XonoticKeyBinder, columnFunctionSize, float, 0);
+       ATTRIB(XonoticKeyBinder, columnKeysOrigin, float, 0);
+       ATTRIB(XonoticKeyBinder, columnKeysSize, float, 0);

 
        METHOD(XonoticKeyBinder, loadKeyBinds, void(entity));
 
        METHOD(XonoticKeyBinder, loadKeyBinds, void(entity));

-       ATTRIB(XonoticKeyBinder, previouslySelected, int, -1)
-       ATTRIB(XonoticKeyBinder, inMouseHandler, float, 0)
-       ATTRIB(XonoticKeyBinder, userbindEditButton, entity, NULL)
-       ATTRIB(XonoticKeyBinder, keyGrabButton, entity, NULL)
-       ATTRIB(XonoticKeyBinder, clearButton, entity, NULL)
-       ATTRIB(XonoticKeyBinder, userbindEditDialog, entity, NULL)
+       ATTRIB(XonoticKeyBinder, previouslySelected, int, -1);
+       ATTRIB(XonoticKeyBinder, inMouseHandler, float, 0);
+       ATTRIB(XonoticKeyBinder, userbindEditButton, entity);
+       ATTRIB(XonoticKeyBinder, keyGrabButton, entity);
+       ATTRIB(XonoticKeyBinder, clearButton, entity);
+       ATTRIB(XonoticKeyBinder, userbindEditDialog, entity);

        METHOD(XonoticKeyBinder, editUserbind, void(entity, string, string, string));
 ENDCLASS(XonoticKeyBinder)
 entity makeXonoticKeyBinder();
        METHOD(XonoticKeyBinder, editUserbind, void(entity, string, string, string));
 ENDCLASS(XonoticKeyBinder)
 entity makeXonoticKeyBinder();

diff --git a/qcsrc/menu/xonotic/languagelist.qh b/qcsrc/menu/xonotic/languagelist.qh
index 8febd646781e4a1e8e94414c1048d88e7de721b9..daf249e450069f22f6a184c27bab04781dab4f9c 100644 (file)
--- a/qcsrc/menu/xonotic/languagelist.qh
+++ b/qcsrc/menu/xonotic/languagelist.qh
@@ -3,31 +3,31 @@
 #include "listbox.qh"
 CLASS(XonoticLanguageList, XonoticListBox)
        METHOD(XonoticLanguageList, configureXonoticLanguageList, void(entity));
 #include "listbox.qh"
 CLASS(XonoticLanguageList, XonoticListBox)
        METHOD(XonoticLanguageList, configureXonoticLanguageList, void(entity));

-       ATTRIB(XonoticLanguageList, rowsPerItem, float, 1)
+       ATTRIB(XonoticLanguageList, rowsPerItem, float, 1);

        METHOD(XonoticLanguageList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticLanguageList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticLanguageList, setSelected, void(entity, float));
        METHOD(XonoticLanguageList, loadCvars, void(entity));
        METHOD(XonoticLanguageList, saveCvars, void(entity));
 
        METHOD(XonoticLanguageList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticLanguageList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticLanguageList, setSelected, void(entity, float));
        METHOD(XonoticLanguageList, loadCvars, void(entity));
        METHOD(XonoticLanguageList, saveCvars, void(entity));
 

-       ATTRIB(XonoticLanguageList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticLanguageList, realUpperMargin, float, 0)
-       ATTRIB(XonoticLanguageList, columnNameOrigin, float, 0)
-       ATTRIB(XonoticLanguageList, columnNameSize, float, 0)
-       ATTRIB(XonoticLanguageList, columnPercentageOrigin, float, 0)
-       ATTRIB(XonoticLanguageList, columnPercentageSize, float, 0)
+       ATTRIB(XonoticLanguageList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticLanguageList, realUpperMargin, float, 0);
+       ATTRIB(XonoticLanguageList, columnNameOrigin, float, 0);
+       ATTRIB(XonoticLanguageList, columnNameSize, float, 0);
+       ATTRIB(XonoticLanguageList, columnPercentageOrigin, float, 0);
+       ATTRIB(XonoticLanguageList, columnPercentageSize, float, 0);

 
        METHOD(XonoticLanguageList, doubleClickListBoxItem, void(entity, float, vector));
        METHOD(XonoticLanguageList, keyDown, float(entity, float, float, float));  // enter handling
 
        METHOD(XonoticLanguageList, destroy, void(entity));
 
 
        METHOD(XonoticLanguageList, doubleClickListBoxItem, void(entity, float, vector));
        METHOD(XonoticLanguageList, keyDown, float(entity, float, float, float));  // enter handling
 
        METHOD(XonoticLanguageList, destroy, void(entity));
 

-       ATTRIB(XonoticLanguageList, languagelist, float, -1)
+       ATTRIB(XonoticLanguageList, languagelist, float, -1);

        METHOD(XonoticLanguageList, getLanguages, void(entity));
        METHOD(XonoticLanguageList, setLanguage, void(entity));
        METHOD(XonoticLanguageList, languageParameter, string(entity, float, float));
 
        METHOD(XonoticLanguageList, getLanguages, void(entity));
        METHOD(XonoticLanguageList, setLanguage, void(entity));
        METHOD(XonoticLanguageList, languageParameter, string(entity, float, float));
 

-       ATTRIB(XonoticLanguageList, name, string, "languageselector")  // change this to make it noninteractive (for first run dialog)
+       ATTRIB(XonoticLanguageList, name, string, "languageselector");  // change this to make it noninteractive (for first run dialog);

 ENDCLASS(XonoticLanguageList)
 
 entity makeXonoticLanguageList();
 ENDCLASS(XonoticLanguageList)
 
 entity makeXonoticLanguageList();

diff --git a/qcsrc/menu/xonotic/listbox.qh b/qcsrc/menu/xonotic/listbox.qh
index 3e789e772dd1b2372bee4fad53f0ccf7fa332758..14272cb19ba9f8e6db66f2a309daf000430adc10 100644 (file)
--- a/qcsrc/menu/xonotic/listbox.qh
+++ b/qcsrc/menu/xonotic/listbox.qh
@@ -3,17 +3,17 @@
 #include "../item/listbox.qh"
 CLASS(XonoticListBox, ListBox)
        METHOD(XonoticListBox, configureXonoticListBox, void(entity));
 #include "../item/listbox.qh"
 CLASS(XonoticListBox, ListBox)
        METHOD(XonoticListBox, configureXonoticListBox, void(entity));

-       ATTRIB(XonoticListBox, fontSize, float, SKINFONTSIZE_NORMAL)
-       ATTRIB(XonoticListBox, scrollbarWidth, float, SKINWIDTH_SCROLLBAR)
-       ATTRIB(XonoticListBox, src, string, SKINGFX_SCROLLBAR)
-       ATTRIB(XonoticListBox, tolerance, vector, SKINTOLERANCE_SLIDER)
-       ATTRIB(XonoticListBox, rowsPerItem, float, 1)
+       ATTRIB(XonoticListBox, fontSize, float, SKINFONTSIZE_NORMAL);
+       ATTRIB(XonoticListBox, scrollbarWidth, float, SKINWIDTH_SCROLLBAR);
+       ATTRIB(XonoticListBox, src, string, SKINGFX_SCROLLBAR);
+       ATTRIB(XonoticListBox, tolerance, vector, SKINTOLERANCE_SLIDER);
+       ATTRIB(XonoticListBox, rowsPerItem, float, 1);

        METHOD(XonoticListBox, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticListBox, resizeNotify, void(entity, vector, vector, vector, vector));

-       ATTRIB(XonoticListBox, color, vector, SKINCOLOR_SCROLLBAR_N)
-       ATTRIB(XonoticListBox, colorF, vector, SKINCOLOR_SCROLLBAR_F)
-       ATTRIB(XonoticListBox, color2, vector, SKINCOLOR_SCROLLBAR_S)
-       ATTRIB(XonoticListBox, colorC, vector, SKINCOLOR_SCROLLBAR_C)
-       ATTRIB(XonoticListBox, colorBG, vector, SKINCOLOR_LISTBOX_BACKGROUND)
-       ATTRIB(XonoticListBox, alphaBG, float, SKINALPHA_LISTBOX_BACKGROUND)
+       ATTRIB(XonoticListBox, color, vector, SKINCOLOR_SCROLLBAR_N);
+       ATTRIB(XonoticListBox, colorF, vector, SKINCOLOR_SCROLLBAR_F);
+       ATTRIB(XonoticListBox, color2, vector, SKINCOLOR_SCROLLBAR_S);
+       ATTRIB(XonoticListBox, colorC, vector, SKINCOLOR_SCROLLBAR_C);
+       ATTRIB(XonoticListBox, colorBG, vector, SKINCOLOR_LISTBOX_BACKGROUND);
+       ATTRIB(XonoticListBox, alphaBG, float, SKINALPHA_LISTBOX_BACKGROUND);

 ENDCLASS(XonoticListBox)
 entity makeXonoticListBox();
 ENDCLASS(XonoticListBox)
 entity makeXonoticListBox();

diff --git a/qcsrc/menu/xonotic/mainwindow.qh b/qcsrc/menu/xonotic/mainwindow.qh
index daf5e0571cf4616af7fd4c9c3d1e476686612d8b..2397d41431605a6d59b36df2b996ded9d56bed65 100644 (file)
--- a/qcsrc/menu/xonotic/mainwindow.qh
+++ b/qcsrc/menu/xonotic/mainwindow.qh
@@ -5,22 +5,22 @@
 CLASS(MainWindow, ModalController)
        METHOD(MainWindow, configureMainWindow, void(entity));
        METHOD(MainWindow, draw, void(entity));
 CLASS(MainWindow, ModalController)
        METHOD(MainWindow, configureMainWindow, void(entity));
        METHOD(MainWindow, draw, void(entity));

-       ATTRIB(MainWindow, firstRunDialog, entity, NULL)
-       ATTRIB(MainWindow, advancedDialog, entity, NULL)
-       ATTRIB(MainWindow, mutatorsDialog, entity, NULL)
-       ATTRIB(MainWindow, mapInfoDialog, entity, NULL)
-       ATTRIB(MainWindow, userbindEditDialog, entity, NULL)
-       ATTRIB(MainWindow, winnerDialog, entity, NULL)
-       ATTRIB(MainWindow, serverInfoDialog, entity, NULL)
-       ATTRIB(MainWindow, cvarsDialog, entity, NULL)
-       ATTRIB(MainWindow, screenshotViewerDialog, entity, NULL)
-       ATTRIB(MainWindow, viewDialog, entity, NULL)
-       ATTRIB(MainWindow, hudconfirmDialog, entity, NULL)
-       ATTRIB(MainWindow, languageWarningDialog, entity, NULL)
-       ATTRIB(MainWindow, mainNexposee, entity, NULL)
-       ATTRIB(MainWindow, fadedAlpha, float, SKINALPHA_BEHIND)
-       ATTRIB(MainWindow, dialogToShow, entity, NULL)
-       ATTRIB(MainWindow, demostartconfirmDialog, entity, NULL)
-       ATTRIB(MainWindow, demotimeconfirmDialog, entity, NULL)
-       ATTRIB(MainWindow, resetDialog, entity, NULL)
+       ATTRIB(MainWindow, firstRunDialog, entity);
+       ATTRIB(MainWindow, advancedDialog, entity);
+       ATTRIB(MainWindow, mutatorsDialog, entity);
+       ATTRIB(MainWindow, mapInfoDialog, entity);
+       ATTRIB(MainWindow, userbindEditDialog, entity);
+       ATTRIB(MainWindow, winnerDialog, entity);
+       ATTRIB(MainWindow, serverInfoDialog, entity);
+       ATTRIB(MainWindow, cvarsDialog, entity);
+       ATTRIB(MainWindow, screenshotViewerDialog, entity);
+       ATTRIB(MainWindow, viewDialog, entity);
+       ATTRIB(MainWindow, hudconfirmDialog, entity);
+       ATTRIB(MainWindow, languageWarningDialog, entity);
+       ATTRIB(MainWindow, mainNexposee, entity);
+       ATTRIB(MainWindow, fadedAlpha, float, SKINALPHA_BEHIND);
+       ATTRIB(MainWindow, dialogToShow, entity);
+       ATTRIB(MainWindow, demostartconfirmDialog, entity);
+       ATTRIB(MainWindow, demotimeconfirmDialog, entity);
+       ATTRIB(MainWindow, resetDialog, entity);

 ENDCLASS(MainWindow)
 ENDCLASS(MainWindow)

diff --git a/qcsrc/menu/xonotic/maplist.qh b/qcsrc/menu/xonotic/maplist.qh
index 452e17cd882fdc7ee6b7c35bc0e5d08d5dc172db..ae6f6185e54e79dd2aa30c708f1054c8adecb813 100644 (file)
--- a/qcsrc/menu/xonotic/maplist.qh
+++ b/qcsrc/menu/xonotic/maplist.qh
@@ -3,7 +3,7 @@
 #include "listbox.qh"
 CLASS(XonoticMapList, XonoticListBox)
        METHOD(XonoticMapList, configureXonoticMapList, void(entity));
 #include "listbox.qh"
 CLASS(XonoticMapList, XonoticListBox)
        METHOD(XonoticMapList, configureXonoticMapList, void(entity));

-       ATTRIB(XonoticMapList, rowsPerItem, float, 4)
+       ATTRIB(XonoticMapList, rowsPerItem, float, 4);

        METHOD(XonoticMapList, draw, void(entity));
        METHOD(XonoticMapList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticMapList, clickListBoxItem, void(entity, float, vector));
        METHOD(XonoticMapList, draw, void(entity));
        METHOD(XonoticMapList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticMapList, clickListBoxItem, void(entity, float, vector));


@@ -13,39 +13,39 @@ CLASS(XonoticMapList, XonoticListBox)
        METHOD(XonoticMapList, refilterCallback, void(entity, entity));
        METHOD(XonoticMapList, keyDown, float(entity, float, float, float));
 
        METHOD(XonoticMapList, refilterCallback, void(entity, entity));
        METHOD(XonoticMapList, keyDown, float(entity, float, float, float));
 

-       ATTRIB(XonoticMapList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticMapList, columnPreviewOrigin, float, 0)
-       ATTRIB(XonoticMapList, columnPreviewSize, float, 0)
-       ATTRIB(XonoticMapList, columnNameOrigin, float, 0)
-       ATTRIB(XonoticMapList, columnNameSize, float, 0)
-       ATTRIB(XonoticMapList, checkMarkOrigin, vector, '0 0 0')
-       ATTRIB(XonoticMapList, checkMarkSize, vector, '0 0 0')
-       ATTRIB(XonoticMapList, realUpperMargin1, float, 0)
-       ATTRIB(XonoticMapList, realUpperMargin2, float, 0)
+       ATTRIB(XonoticMapList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticMapList, columnPreviewOrigin, float, 0);
+       ATTRIB(XonoticMapList, columnPreviewSize, float, 0);
+       ATTRIB(XonoticMapList, columnNameOrigin, float, 0);
+       ATTRIB(XonoticMapList, columnNameSize, float, 0);
+       ATTRIB(XonoticMapList, checkMarkOrigin, vector, '0 0 0');
+       ATTRIB(XonoticMapList, checkMarkSize, vector, '0 0 0');
+       ATTRIB(XonoticMapList, realUpperMargin1, float, 0);
+       ATTRIB(XonoticMapList, realUpperMargin2, float, 0);

 
 

-       ATTRIB(XonoticMapList, lastGametype, entity, NULL)
-       ATTRIB(XonoticMapList, lastFeatures, float, 0)
+       ATTRIB(XonoticMapList, lastGametype, entity);
+       ATTRIB(XonoticMapList, lastFeatures, float, 0);

 
 

-       ATTRIB(XonoticMapList, origin, vector, '0 0 0')
-       ATTRIB(XonoticMapList, itemAbsSize, vector, '0 0 0')
+       ATTRIB(XonoticMapList, origin, vector, '0 0 0');
+       ATTRIB(XonoticMapList, itemAbsSize, vector, '0 0 0');

 
 

-       ATTRIB(XonoticMapList, g_maplistCache, string, string_null)
+       ATTRIB(XonoticMapList, g_maplistCache, string);

        METHOD(XonoticMapList, g_maplistCacheToggle, void(entity, float));
        METHOD(XonoticMapList, g_maplistCacheQuery, float(entity, float));
 
        METHOD(XonoticMapList, g_maplistCacheToggle, void(entity, float));
        METHOD(XonoticMapList, g_maplistCacheQuery, float(entity, float));
 

-       ATTRIB(XonoticMapList, stringFilter, string, string_null)
-       ATTRIB(XonoticMapList, stringFilterBox, entity, NULL)
+       ATTRIB(XonoticMapList, stringFilter, string);
+       ATTRIB(XonoticMapList, stringFilterBox, entity);

 
 

-       ATTRIB(XonoticMapList, startButton, entity, NULL)
+       ATTRIB(XonoticMapList, startButton, entity);

 
        METHOD(XonoticMapList, loadCvars, void(entity));
 
 
        METHOD(XonoticMapList, loadCvars, void(entity));
 

-       ATTRIB(XonoticMapList, typeToSearchString, string, string_null)
-       ATTRIB(XonoticMapList, typeToSearchTime, float, 0)
+       ATTRIB(XonoticMapList, typeToSearchString, string);
+       ATTRIB(XonoticMapList, typeToSearchTime, float, 0);

 
        METHOD(XonoticMapList, destroy, void(entity));
 
 
        METHOD(XonoticMapList, destroy, void(entity));
 

-       ATTRIB(XonoticMapList, alphaBG, float, 0)
+       ATTRIB(XonoticMapList, alphaBG, float, 0);

 ENDCLASS(XonoticMapList)
 entity makeXonoticMapList();
 void MapList_StringFilterBox_Change(entity box, entity me);
 ENDCLASS(XonoticMapList)
 entity makeXonoticMapList();
 void MapList_StringFilterBox_Change(entity box, entity me);

diff --git a/qcsrc/menu/xonotic/picker.qh b/qcsrc/menu/xonotic/picker.qh
index c530c7ca9cda274a197448aab1085ad1187d3e50..b8e19cf19ebaedf19a3fcb0f440f877ae3006012 100644 (file)
--- a/qcsrc/menu/xonotic/picker.qh
+++ b/qcsrc/menu/xonotic/picker.qh
@@ -9,23 +9,23 @@ CLASS(XonoticPicker, Item)
        METHOD(XonoticPicker, mouseDrag, float(entity, vector));
        METHOD(XonoticPicker, keyDown, float(entity, float, float, float));
        METHOD(XonoticPicker, draw, void(entity));
        METHOD(XonoticPicker, mouseDrag, float(entity, vector));
        METHOD(XonoticPicker, keyDown, float(entity, float, float, float));
        METHOD(XonoticPicker, draw, void(entity));

-       ATTRIB(XonoticPicker, focusable, float, 1)
-       ATTRIB(XonoticPicker, disabled, float, 0)
-       ATTRIB(XonoticPicker, alpha, float, 1)
-       ATTRIB(XonoticPicker, disabledAlpha, float, SKINALPHA_DISABLED)
+       ATTRIB(XonoticPicker, focusable, float, 1);
+       ATTRIB(XonoticPicker, disabled, float, 0);
+       ATTRIB(XonoticPicker, alpha, float, 1);
+       ATTRIB(XonoticPicker, disabledAlpha, float, SKINALPHA_DISABLED);

 
 

-       ATTRIB(XonoticPicker, rows, float, 3)
-       ATTRIB(XonoticPicker, columns, float, 2)
+       ATTRIB(XonoticPicker, rows, float, 3);
+       ATTRIB(XonoticPicker, columns, float, 2);

 
        METHOD(XonoticPicker, moveFocus, void(entity, vector, vector));
        METHOD(XonoticPicker, cellSelect, void(entity, vector));
        METHOD(XonoticPicker, cellDraw, void(entity, vector, vector));
        METHOD(XonoticPicker, cellIsValid, bool(entity, vector));
 
        METHOD(XonoticPicker, moveFocus, void(entity, vector, vector));
        METHOD(XonoticPicker, cellSelect, void(entity, vector));
        METHOD(XonoticPicker, cellDraw, void(entity, vector, vector));
        METHOD(XonoticPicker, cellIsValid, bool(entity, vector));

-       ATTRIB(XonoticPicker, realCellSize, vector, '0 0 0')
-       ATTRIB(XonoticPicker, selectedCell, vector, '-1 -1 0')
-       ATTRIB(XonoticPicker, focusedCell, vector, '-1 -1 0')
-       ATTRIB(XonoticPicker, focusedCellAlpha, float, 0)
-       ATTRIB(XonoticPicker, focusedCellTime, float, 0)
-       ATTRIB(XonoticPicker, pressedCell, vector, '-1 -1 0')
+       ATTRIB(XonoticPicker, realCellSize, vector, '0 0 0');
+       ATTRIB(XonoticPicker, selectedCell, vector, '-1 -1 0');
+       ATTRIB(XonoticPicker, focusedCell, vector, '-1 -1 0');
+       ATTRIB(XonoticPicker, focusedCellAlpha, float, 0);
+       ATTRIB(XonoticPicker, focusedCellTime, float, 0);
+       ATTRIB(XonoticPicker, pressedCell, vector, '-1 -1 0');

 ENDCLASS(XonoticPicker)
 entity makeXonoticPicker();
 ENDCLASS(XonoticPicker)
 entity makeXonoticPicker();

diff --git a/qcsrc/menu/xonotic/playerlist.qh b/qcsrc/menu/xonotic/playerlist.qh
index 8474b9140d8f1d86f9b579f5fc44fce2dc73d68e..a35ed966d9360d22dcf9b62505cccd97450ddc53 100644 (file)
--- a/qcsrc/menu/xonotic/playerlist.qh
+++ b/qcsrc/menu/xonotic/playerlist.qh
@@ -2,21 +2,21 @@
 
 #include "listbox.qh"
 CLASS(XonoticPlayerList, XonoticListBox)
 
 #include "listbox.qh"
 CLASS(XonoticPlayerList, XonoticListBox)

-       ATTRIB(XonoticPlayerList, rowsPerItem, float, 1)
+       ATTRIB(XonoticPlayerList, rowsPerItem, float, 1);

        METHOD(XonoticPlayerList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticPlayerList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticPlayerList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticPlayerList, drawListBoxItem, void(entity, int, vector, bool, bool));

-       ATTRIB(XonoticPlayerList, allowFocusSound, float, 0)
-       ATTRIB(XonoticPlayerList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticPlayerList, columnNameOrigin, float, 0)
-       ATTRIB(XonoticPlayerList, columnNameSize, float, 0)
-       ATTRIB(XonoticPlayerList, columnScoreOrigin, float, 0)
-       ATTRIB(XonoticPlayerList, columnScoreSize, float, 0)
-       ATTRIB(XonoticPlayerList, realUpperMargin, float, 0)
-       ATTRIB(XonoticPlayerList, origin, vector, '0 0 0')
-       ATTRIB(XonoticPlayerList, itemAbsSize, vector, '0 0 0')
+       ATTRIB(XonoticPlayerList, allowFocusSound, float, 0);
+       ATTRIB(XonoticPlayerList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticPlayerList, columnNameOrigin, float, 0);
+       ATTRIB(XonoticPlayerList, columnNameSize, float, 0);
+       ATTRIB(XonoticPlayerList, columnScoreOrigin, float, 0);
+       ATTRIB(XonoticPlayerList, columnScoreSize, float, 0);
+       ATTRIB(XonoticPlayerList, realUpperMargin, float, 0);
+       ATTRIB(XonoticPlayerList, origin, vector, '0 0 0');
+       ATTRIB(XonoticPlayerList, itemAbsSize, vector, '0 0 0');

        METHOD(XonoticPlayerList, setPlayerList, void(entity, string));
        METHOD(XonoticPlayerList, getPlayerList, string(entity, float, float));
        METHOD(XonoticPlayerList, setPlayerList, void(entity, string));
        METHOD(XonoticPlayerList, getPlayerList, string(entity, float, float));

-       ATTRIB(XonoticPlayerList, playerList, float, -1)
-       ATTRIB(XonoticPlayerList, selectionDoesntMatter, bool, true)
+       ATTRIB(XonoticPlayerList, playerList, float, -1);
+       ATTRIB(XonoticPlayerList, selectionDoesntMatter, bool, true);

 ENDCLASS(XonoticPlayerList)
 entity makeXonoticPlayerList();
 ENDCLASS(XonoticPlayerList)
 entity makeXonoticPlayerList();

diff --git a/qcsrc/menu/xonotic/playermodel.qh b/qcsrc/menu/xonotic/playermodel.qh
index 664f22c7c0e2c9d3970e94c9f7403ddfdab49ca0..4635c6ccdb65b438edffe6d28d71b2a492765445 100644 (file)
--- a/qcsrc/menu/xonotic/playermodel.qh
+++ b/qcsrc/menu/xonotic/playermodel.qh
@@ -9,21 +9,21 @@ CLASS(XonoticPlayerModelSelector, XonoticImage)
        METHOD(XonoticPlayerModelSelector, draw, void(entity));
        METHOD(XonoticPlayerModelSelector, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticPlayerModelSelector, showNotify, void(entity));
        METHOD(XonoticPlayerModelSelector, draw, void(entity));
        METHOD(XonoticPlayerModelSelector, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticPlayerModelSelector, showNotify, void(entity));

-       ATTRIB(XonoticPlayerModelSelector, currentModel, string, string_null)
-       ATTRIB(XonoticPlayerModelSelector, currentSkin, float, 0)
-       ATTRIB(XonoticPlayerModelSelector, currentModelImage, string, string_null)
-       ATTRIB(XonoticPlayerModelSelector, currentModelTitle, string, string_null)
-       ATTRIB(XonoticPlayerModelSelector, currentModelDescription, string, string_null)
+       ATTRIB(XonoticPlayerModelSelector, currentModel, string);
+       ATTRIB(XonoticPlayerModelSelector, currentSkin, float, 0);
+       ATTRIB(XonoticPlayerModelSelector, currentModelImage, string);
+       ATTRIB(XonoticPlayerModelSelector, currentModelTitle, string);
+       ATTRIB(XonoticPlayerModelSelector, currentModelDescription, string);

        METHOD(XonoticPlayerModelSelector, go, void(entity, float));
        METHOD(XonoticPlayerModelSelector, destroy, void(entity));
        METHOD(XonoticPlayerModelSelector, go, void(entity, float));
        METHOD(XonoticPlayerModelSelector, destroy, void(entity));

-       ATTRIB(XonoticPlayerModelSelector, origin, vector, '0 0 0')
-       ATTRIB(XonoticPlayerModelSelector, size, vector, '0 0 0')
-       ATTRIB(XonoticPlayerModelSelector, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticPlayerModelSelector, fontSize, float, SKINFONTSIZE_NORMAL)
-       ATTRIB(XonoticPlayerModelSelector, titleFontSize, float, SKINFONTSIZE_TITLE)
-       ATTRIB(XonoticPlayerModelSelector, bufModels, float, -1)
-       ATTRIB(XonoticPlayerModelSelector, numModels, float, -1)
-       ATTRIB(XonoticPlayerModelSelector, idxModels, float, -1)
+       ATTRIB(XonoticPlayerModelSelector, origin, vector, '0 0 0');
+       ATTRIB(XonoticPlayerModelSelector, size, vector, '0 0 0');
+       ATTRIB(XonoticPlayerModelSelector, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticPlayerModelSelector, fontSize, float, SKINFONTSIZE_NORMAL);
+       ATTRIB(XonoticPlayerModelSelector, titleFontSize, float, SKINFONTSIZE_TITLE);
+       ATTRIB(XonoticPlayerModelSelector, bufModels, float, -1);
+       ATTRIB(XonoticPlayerModelSelector, numModels, float, -1);
+       ATTRIB(XonoticPlayerModelSelector, idxModels, float, -1);

 ENDCLASS(XonoticPlayerModelSelector)
 entity makeXonoticPlayerModelSelector();
 void PlayerModelSelector_Next_Click(entity btn, entity me);
 ENDCLASS(XonoticPlayerModelSelector)
 entity makeXonoticPlayerModelSelector();
 void PlayerModelSelector_Next_Click(entity btn, entity me);

diff --git a/qcsrc/menu/xonotic/playlist.qh b/qcsrc/menu/xonotic/playlist.qh
index 6bee05bbc88f3961ba6bce22bbe50613b4177d09..bd9f71988fdc59e12dcf51cf43231a158795bff4 100644 (file)
--- a/qcsrc/menu/xonotic/playlist.qh
+++ b/qcsrc/menu/xonotic/playlist.qh
@@ -3,7 +3,7 @@
 #include "listbox.qh"
 CLASS(XonoticPlayList, XonoticListBox)
        METHOD(XonoticPlayList, configureXonoticPlayList, void(entity));
 #include "listbox.qh"
 CLASS(XonoticPlayList, XonoticListBox)
        METHOD(XonoticPlayList, configureXonoticPlayList, void(entity));

-       ATTRIB(XonoticPlayList, rowsPerItem, float, 1)
+       ATTRIB(XonoticPlayList, rowsPerItem, float, 1);

        METHOD(XonoticPlayList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticPlayList, draw, void(entity));
        METHOD(XonoticPlayList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticPlayList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticPlayList, draw, void(entity));
        METHOD(XonoticPlayList, drawListBoxItem, void(entity, int, vector, bool, bool));


@@ -17,16 +17,16 @@ CLASS(XonoticPlayList, XonoticListBox)
 
        METHOD(XonoticPlayList, addToPlayList, void(entity, string));
        METHOD(XonoticPlayList, removeSelectedFromPlayList, void(entity));
 
        METHOD(XonoticPlayList, addToPlayList, void(entity, string));
        METHOD(XonoticPlayList, removeSelectedFromPlayList, void(entity));

-       ATTRIB(XonoticPlayList, playingTrack, float, -1)
+       ATTRIB(XonoticPlayList, playingTrack, float, -1);

 
 

-       ATTRIB(XonoticPlayList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticPlayList, columnNameOrigin, float, 0)
-       ATTRIB(XonoticPlayList, columnNameSize, float, 0)
-       ATTRIB(XonoticPlayList, columnNumberOrigin, float, 0)
-       ATTRIB(XonoticPlayList, columnNumberSize, float, 0)
-       ATTRIB(XonoticPlayList, realUpperMargin, float, 0)
-       ATTRIB(XonoticPlayList, origin, vector, '0 0 0')
-       ATTRIB(XonoticPlayList, itemAbsSize, vector, '0 0 0')
+       ATTRIB(XonoticPlayList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticPlayList, columnNameOrigin, float, 0);
+       ATTRIB(XonoticPlayList, columnNameSize, float, 0);
+       ATTRIB(XonoticPlayList, columnNumberOrigin, float, 0);
+       ATTRIB(XonoticPlayList, columnNumberSize, float, 0);
+       ATTRIB(XonoticPlayList, realUpperMargin, float, 0);
+       ATTRIB(XonoticPlayList, origin, vector, '0 0 0');
+       ATTRIB(XonoticPlayList, itemAbsSize, vector, '0 0 0');

 ENDCLASS(XonoticPlayList)
 
 entity makeXonoticPlayList();
 ENDCLASS(XonoticPlayList)
 
 entity makeXonoticPlayList();

diff --git a/qcsrc/menu/xonotic/radiobutton.qh b/qcsrc/menu/xonotic/radiobutton.qh
index 36c228fcf41ae8202e86d20d953443ca90a729ce..cd671a338f296f73ee8a8eb124f03aa1dd50872c 100644 (file)
--- a/qcsrc/menu/xonotic/radiobutton.qh
+++ b/qcsrc/menu/xonotic/radiobutton.qh
@@ -5,22 +5,22 @@ CLASS(XonoticRadioButton, RadioButton)
        METHOD(XonoticRadioButton, configureXonoticRadioButton, void(entity, float, string, string, string, string));
        METHOD(XonoticRadioButton, draw, void(entity));
        METHOD(XonoticRadioButton, setChecked, void(entity, float));
        METHOD(XonoticRadioButton, configureXonoticRadioButton, void(entity, float, string, string, string, string));
        METHOD(XonoticRadioButton, draw, void(entity));
        METHOD(XonoticRadioButton, setChecked, void(entity, float));

-       ATTRIB(XonoticRadioButton, fontSize, float, SKINFONTSIZE_NORMAL)
-       ATTRIB(XonoticRadioButton, image, string, SKINGFX_RADIOBUTTON)
-       ATTRIB(XonoticRadioButton, color, vector, SKINCOLOR_RADIOBUTTON_N)
-       ATTRIB(XonoticRadioButton, colorC, vector, SKINCOLOR_RADIOBUTTON_C)
-       ATTRIB(XonoticRadioButton, colorF, vector, SKINCOLOR_RADIOBUTTON_F)
-       ATTRIB(XonoticRadioButton, colorD, vector, SKINCOLOR_RADIOBUTTON_D)
+       ATTRIB(XonoticRadioButton, fontSize, float, SKINFONTSIZE_NORMAL);
+       ATTRIB(XonoticRadioButton, image, string, SKINGFX_RADIOBUTTON);
+       ATTRIB(XonoticRadioButton, color, vector, SKINCOLOR_RADIOBUTTON_N);
+       ATTRIB(XonoticRadioButton, colorC, vector, SKINCOLOR_RADIOBUTTON_C);
+       ATTRIB(XonoticRadioButton, colorF, vector, SKINCOLOR_RADIOBUTTON_F);
+       ATTRIB(XonoticRadioButton, colorD, vector, SKINCOLOR_RADIOBUTTON_D);

 
 

-       ATTRIB(XonoticRadioButton, cvarName, string, string_null)
-       ATTRIB(XonoticRadioButton, cvarValue, string, string_null)
-       ATTRIB(XonoticRadioButton, cvarOffValue, string, string_null)
-       ATTRIB(XonoticRadioButton, cvarValueIsAnotherCvar, float, 0)
+       ATTRIB(XonoticRadioButton, cvarName, string);
+       ATTRIB(XonoticRadioButton, cvarValue, string);
+       ATTRIB(XonoticRadioButton, cvarOffValue, string);
+       ATTRIB(XonoticRadioButton, cvarValueIsAnotherCvar, float, 0);

        METHOD(XonoticRadioButton, loadCvars, void(entity));
        METHOD(XonoticRadioButton, saveCvars, void(entity));
 
        METHOD(XonoticRadioButton, loadCvars, void(entity));
        METHOD(XonoticRadioButton, saveCvars, void(entity));
 

-       ATTRIB(XonoticRadioButton, alpha, float, SKINALPHA_TEXT)
-       ATTRIB(XonoticRadioButton, disabledAlpha, float, SKINALPHA_DISABLED)
+       ATTRIB(XonoticRadioButton, alpha, float, SKINALPHA_TEXT);
+       ATTRIB(XonoticRadioButton, disabledAlpha, float, SKINALPHA_DISABLED);

 ENDCLASS(XonoticRadioButton)
 entity makeXonoticRadioButton_T(float, string, string, string, string theTooltip);
 entity makeXonoticRadioButton(float, string, string, string);
 ENDCLASS(XonoticRadioButton)
 entity makeXonoticRadioButton_T(float, string, string, string, string theTooltip);
 entity makeXonoticRadioButton(float, string, string, string);

diff --git a/qcsrc/menu/xonotic/rootdialog.qh b/qcsrc/menu/xonotic/rootdialog.qh
index 0bfd3364cbd801c62c8e8fa3617d8dc4fdf54e35..a2efa672e9174c9f733113b7765e937237380f0b 100644 (file)
--- a/qcsrc/menu/xonotic/rootdialog.qh
+++ b/qcsrc/menu/xonotic/rootdialog.qh
@@ -4,12 +4,12 @@
 CLASS(XonoticRootDialog, XonoticDialog)
        // still to be customized by user
        /*
 CLASS(XonoticRootDialog, XonoticDialog)
        // still to be customized by user
        /*

-       ATTRIB(XonoticDialog, closable, float, 1)
-       ATTRIB(XonoticDialog, title, string, _("Form1")) // ;)
-       ATTRIB(XonoticDialog, color, vector, '1 0.5 1')
-       ATTRIB(XonoticDialog, intendedWidth, float, 0)
-       ATTRIB(XonoticDialog, rows, float, 3)
-       ATTRIB(XonoticDialog, columns, float, 2)
+       ATTRIB(XonoticDialog, closable, float, 1);
+       ATTRIB(XonoticDialog, title, string, _("Form1")); // ;);
+       ATTRIB(XonoticDialog, color, vector, '1 0.5 1');
+       ATTRIB(XonoticDialog, intendedWidth, float, 0);
+       ATTRIB(XonoticDialog, rows, float, 3);
+       ATTRIB(XonoticDialog, columns, float, 2);

        */
        METHOD(XonoticRootDialog, close, void(entity));
 ENDCLASS(XonoticRootDialog)
        */
        METHOD(XonoticRootDialog, close, void(entity));
 ENDCLASS(XonoticRootDialog)

diff --git a/qcsrc/menu/xonotic/screenshotimage.qh b/qcsrc/menu/xonotic/screenshotimage.qh
index eb20c73a243a2d2691c8fee4bd5317a68e458188..8920bed287f50fceed2527f56646d36a8599f812 100644 (file)
--- a/qcsrc/menu/xonotic/screenshotimage.qh
+++ b/qcsrc/menu/xonotic/screenshotimage.qh
@@ -5,15 +5,15 @@ CLASS(XonoticScreenshotImage, XonoticImage)
        METHOD(XonoticScreenshotImage, configureXonoticScreenshotImage, void(entity));
        METHOD(XonoticScreenshotImage, load, void(entity, string));
        METHOD(XonoticScreenshotImage, draw, void(entity));
        METHOD(XonoticScreenshotImage, configureXonoticScreenshotImage, void(entity));
        METHOD(XonoticScreenshotImage, load, void(entity, string));
        METHOD(XonoticScreenshotImage, draw, void(entity));

-       ATTRIB(XonoticScreenshotImage, focusable, float, 1)  // mousePress and mouseDrag work only if focusable is set
+       ATTRIB(XonoticScreenshotImage, focusable, float, 1);  // mousePress and mouseDrag work only if focusable is set

        METHOD(XonoticScreenshotImage, mousePress, float(entity, vector));
        METHOD(XonoticScreenshotImage, mouseDrag, float(entity, vector));
        METHOD(XonoticScreenshotImage, mouseMove, float(entity, vector));
        METHOD(XonoticScreenshotImage, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticScreenshotImage, mousePress, float(entity, vector));
        METHOD(XonoticScreenshotImage, mouseDrag, float(entity, vector));
        METHOD(XonoticScreenshotImage, mouseMove, float(entity, vector));
        METHOD(XonoticScreenshotImage, resizeNotify, void(entity, vector, vector, vector, vector));

-       ATTRIB(XonoticScreenshotImage, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticScreenshotImage, fontSize, float, SKINFONTSIZE_NORMAL)
-       ATTRIB(XonoticScreenshotImage, showTitle, float, 1)
-       ATTRIB(XonoticScreenshotImage, screenshotTime, float, 0)
-       ATTRIB(XonoticScreenshotImage, screenshotTitle, string, string_null)
+       ATTRIB(XonoticScreenshotImage, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticScreenshotImage, fontSize, float, SKINFONTSIZE_NORMAL);
+       ATTRIB(XonoticScreenshotImage, showTitle, float, 1);
+       ATTRIB(XonoticScreenshotImage, screenshotTime, float, 0);
+       ATTRIB(XonoticScreenshotImage, screenshotTitle, string);

 ENDCLASS(XonoticScreenshotImage)
 entity makeXonoticScreenshotImage();
 ENDCLASS(XonoticScreenshotImage)
 entity makeXonoticScreenshotImage();

diff --git a/qcsrc/menu/xonotic/screenshotlist.qh b/qcsrc/menu/xonotic/screenshotlist.qh
index 1279c4ad9cf6de503d576127d700a5517c84637e..63071fc74081a92434d234599e80992e4189ed11 100644 (file)
--- a/qcsrc/menu/xonotic/screenshotlist.qh
+++ b/qcsrc/menu/xonotic/screenshotlist.qh
@@ -3,7 +3,7 @@
 #include "listbox.qh"
 CLASS(XonoticScreenshotList, XonoticListBox)
        METHOD(XonoticScreenshotList, configureXonoticScreenshotList, void(entity));
 #include "listbox.qh"
 CLASS(XonoticScreenshotList, XonoticListBox)
        METHOD(XonoticScreenshotList, configureXonoticScreenshotList, void(entity));

-       ATTRIB(XonoticScreenshotList, rowsPerItem, float, 1)
+       ATTRIB(XonoticScreenshotList, rowsPerItem, float, 1);

        METHOD(XonoticScreenshotList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticScreenshotList, setSelected, void(entity, float));
        METHOD(XonoticScreenshotList, draw, void(entity));
        METHOD(XonoticScreenshotList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticScreenshotList, setSelected, void(entity, float));
        METHOD(XonoticScreenshotList, draw, void(entity));


@@ -16,23 +16,23 @@ CLASS(XonoticScreenshotList, XonoticListBox)
        METHOD(XonoticScreenshotList, keyDown, float(entity, float, float, float));
        METHOD(XonoticScreenshotList, destroy, void(entity));
        METHOD(XonoticScreenshotList, showNotify, void(entity));
        METHOD(XonoticScreenshotList, keyDown, float(entity, float, float, float));
        METHOD(XonoticScreenshotList, destroy, void(entity));
        METHOD(XonoticScreenshotList, showNotify, void(entity));

-       ATTRIB(XonoticScreenshotList, listScreenshot, float, -1)
-       ATTRIB(XonoticScreenshotList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticScreenshotList, columnNameOrigin, float, 0)
-       ATTRIB(XonoticScreenshotList, columnNameSize, float, 0)
-       ATTRIB(XonoticScreenshotList, realUpperMargin, float, 0)
-       ATTRIB(XonoticScreenshotList, origin, vector, '0 0 0')
-       ATTRIB(XonoticScreenshotList, itemAbsSize, vector, '0 0 0')
-       ATTRIB(XonoticScreenshotList, filterString, string, string_null)
-       ATTRIB(XonoticScreenshotList, filterBox, entity, NULL)
-       ATTRIB(XonoticScreenshotList, filterTime, float, 0)
+       ATTRIB(XonoticScreenshotList, listScreenshot, float, -1);
+       ATTRIB(XonoticScreenshotList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticScreenshotList, columnNameOrigin, float, 0);
+       ATTRIB(XonoticScreenshotList, columnNameSize, float, 0);
+       ATTRIB(XonoticScreenshotList, realUpperMargin, float, 0);
+       ATTRIB(XonoticScreenshotList, origin, vector, '0 0 0');
+       ATTRIB(XonoticScreenshotList, itemAbsSize, vector, '0 0 0');
+       ATTRIB(XonoticScreenshotList, filterString, string);
+       ATTRIB(XonoticScreenshotList, filterBox, entity);
+       ATTRIB(XonoticScreenshotList, filterTime, float, 0);

 
 

-       ATTRIB(XonoticScreenshotList, newScreenshotTime, float, 0)
-       ATTRIB(XonoticScreenshotList, newSlideShowScreenshotTime, float, 0)
+       ATTRIB(XonoticScreenshotList, newScreenshotTime, float, 0);
+       ATTRIB(XonoticScreenshotList, newSlideShowScreenshotTime, float, 0);

 
 

-       ATTRIB(XonoticScreenshotList, screenshotBrowserDialog, entity, NULL)
-       ATTRIB(XonoticScreenshotList, screenshotPreview, entity, NULL)
-       ATTRIB(XonoticScreenshotList, screenshotViewerDialog, entity, NULL)
+       ATTRIB(XonoticScreenshotList, screenshotBrowserDialog, entity);
+       ATTRIB(XonoticScreenshotList, screenshotPreview, entity);
+       ATTRIB(XonoticScreenshotList, screenshotViewerDialog, entity);

        METHOD(XonoticScreenshotList, goScreenshot, void(entity, float));
        METHOD(XonoticScreenshotList, startSlideShow, void(entity));
        METHOD(XonoticScreenshotList, stopSlideShow, void(entity));
        METHOD(XonoticScreenshotList, goScreenshot, void(entity, float));
        METHOD(XonoticScreenshotList, startSlideShow, void(entity));
        METHOD(XonoticScreenshotList, stopSlideShow, void(entity));

diff --git a/qcsrc/menu/xonotic/serverlist.qh b/qcsrc/menu/xonotic/serverlist.qh
index ac726b222ad055e16b0bf6b2ffd5cb37d1aed751..50c766e69051527be55929f7b4524c22ab228f14 100644 (file)
--- a/qcsrc/menu/xonotic/serverlist.qh
+++ b/qcsrc/menu/xonotic/serverlist.qh
@@ -3,7 +3,7 @@
 #include "listbox.qh"
 CLASS(XonoticServerList, XonoticListBox)
        METHOD(XonoticServerList, configureXonoticServerList, void(entity));
 #include "listbox.qh"
 CLASS(XonoticServerList, XonoticListBox)
        METHOD(XonoticServerList, configureXonoticServerList, void(entity));

-       ATTRIB(XonoticServerList, rowsPerItem, float, 1)
+       ATTRIB(XonoticServerList, rowsPerItem, float, 1);

        METHOD(XonoticServerList, draw, void(entity));
        METHOD(XonoticServerList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticServerList, doubleClickListBoxItem, void(entity, float, vector));
        METHOD(XonoticServerList, draw, void(entity));
        METHOD(XonoticServerList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticServerList, doubleClickListBoxItem, void(entity, float, vector));


@@ -11,56 +11,56 @@ CLASS(XonoticServerList, XonoticListBox)
        METHOD(XonoticServerList, keyDown, float(entity, float, float, float));
        METHOD(XonoticServerList, toggleFavorite, void(entity, string));
 
        METHOD(XonoticServerList, keyDown, float(entity, float, float, float));
        METHOD(XonoticServerList, toggleFavorite, void(entity, string));
 

-       ATTRIB(XonoticServerList, iconsSizeFactor, float, 0.85)
+       ATTRIB(XonoticServerList, iconsSizeFactor, float, 0.85);

        METHOD(XonoticServerList, mouseMove, float(entity, vector));
        METHOD(XonoticServerList, mouseMove, float(entity, vector));

-       ATTRIB(XonoticServerList, mouseOverIcons, bool, false)
+       ATTRIB(XonoticServerList, mouseOverIcons, bool, false);

        METHOD(XonoticServerList, focusedItemChangeNotify, void(entity));
 
        METHOD(XonoticServerList, focusedItemChangeNotify, void(entity));
 

-       ATTRIB(XonoticServerList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticServerList, realUpperMargin, float, 0)
-       ATTRIB(XonoticServerList, columnIconsOrigin, float, 0)
-       ATTRIB(XonoticServerList, columnIconsSize, float, 0)
-       ATTRIB(XonoticServerList, columnPingOrigin, float, 0)
-       ATTRIB(XonoticServerList, columnPingSize, float, 0)
-       ATTRIB(XonoticServerList, columnNameOrigin, float, 0)
-       ATTRIB(XonoticServerList, columnNameSize, float, 0)
-       ATTRIB(XonoticServerList, columnMapOrigin, float, 0)
-       ATTRIB(XonoticServerList, columnMapSize, float, 0)
-       ATTRIB(XonoticServerList, columnTypeOrigin, float, 0)
-       ATTRIB(XonoticServerList, columnTypeSize, float, 0)
-       ATTRIB(XonoticServerList, columnPlayersOrigin, float, 0)
-       ATTRIB(XonoticServerList, columnPlayersSize, float, 0)
-       ATTRIB(XonoticServerList, lockedSelectedItem, bool, true)      // initially keep selected the first item of the list, avoiding an unwanted scrolling
-
-       ATTRIB(XonoticServerList, selectedServer, string, string_null) // to restore selected server when needed
+       ATTRIB(XonoticServerList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticServerList, realUpperMargin, float, 0);
+       ATTRIB(XonoticServerList, columnIconsOrigin, float, 0);
+       ATTRIB(XonoticServerList, columnIconsSize, float, 0);
+       ATTRIB(XonoticServerList, columnPingOrigin, float, 0);
+       ATTRIB(XonoticServerList, columnPingSize, float, 0);
+       ATTRIB(XonoticServerList, columnNameOrigin, float, 0);
+       ATTRIB(XonoticServerList, columnNameSize, float, 0);
+       ATTRIB(XonoticServerList, columnMapOrigin, float, 0);
+       ATTRIB(XonoticServerList, columnMapSize, float, 0);
+       ATTRIB(XonoticServerList, columnTypeOrigin, float, 0);
+       ATTRIB(XonoticServerList, columnTypeSize, float, 0);
+       ATTRIB(XonoticServerList, columnPlayersOrigin, float, 0);
+       ATTRIB(XonoticServerList, columnPlayersSize, float, 0);
+       ATTRIB(XonoticServerList, lockedSelectedItem, bool, true);      // initially keep selected the first item of the list, avoiding an unwanted scrolling
+
+       ATTRIB(XonoticServerList, selectedServer, string); // to restore selected server when needed

        METHOD(XonoticServerList, setSelected, void(entity, float));
        METHOD(XonoticServerList, setSortOrder, void(entity, float, float));
        METHOD(XonoticServerList, setSelected, void(entity, float));
        METHOD(XonoticServerList, setSortOrder, void(entity, float, float));

-       ATTRIB(XonoticServerList, filterShowEmpty, float, 1)
-       ATTRIB(XonoticServerList, filterShowFull, float, 1)
-       ATTRIB(XonoticServerList, filterString, string, string_null)
-       ATTRIB(XonoticServerList, controlledTextbox, entity, NULL)
-       ATTRIB(XonoticServerList, ipAddressBox, entity, NULL)
-       ATTRIB(XonoticServerList, favoriteButton, entity, NULL)
-       ATTRIB(XonoticServerList, nextRefreshTime, float, 0)
+       ATTRIB(XonoticServerList, filterShowEmpty, float, 1);
+       ATTRIB(XonoticServerList, filterShowFull, float, 1);
+       ATTRIB(XonoticServerList, filterString, string);
+       ATTRIB(XonoticServerList, controlledTextbox, entity);
+       ATTRIB(XonoticServerList, ipAddressBox, entity);
+       ATTRIB(XonoticServerList, favoriteButton, entity);
+       ATTRIB(XonoticServerList, nextRefreshTime, float, 0);

        METHOD(XonoticServerList, refreshServerList, void(entity, float));  // refresh mode: REFRESHSERVERLIST_*
        METHOD(XonoticServerList, refreshServerList, void(entity, float));  // refresh mode: REFRESHSERVERLIST_*

-       ATTRIB(XonoticServerList, needsRefresh, float, 1)
+       ATTRIB(XonoticServerList, needsRefresh, float, 1);

        METHOD(XonoticServerList, focusEnter, void(entity));
        METHOD(XonoticServerList, positionSortButton, void(entity, entity, float, float, string, void(entity, entity)));
        METHOD(XonoticServerList, focusEnter, void(entity));
        METHOD(XonoticServerList, positionSortButton, void(entity, entity, float, float, string, void(entity, entity)));

-       ATTRIB(XonoticServerList, sortButton1, entity, NULL)
-       ATTRIB(XonoticServerList, sortButton2, entity, NULL)
-       ATTRIB(XonoticServerList, sortButton3, entity, NULL)
-       ATTRIB(XonoticServerList, sortButton4, entity, NULL)
-       ATTRIB(XonoticServerList, sortButton5, entity, NULL)
-       ATTRIB(XonoticServerList, connectButton, entity, NULL)
-       ATTRIB(XonoticServerList, infoButton, entity, NULL)
-       ATTRIB(XonoticServerList, currentSortOrder, float, 0)
-       ATTRIB(XonoticServerList, currentSortField, float, -1)
-
-       ATTRIB(XonoticServerList, ipAddressBoxFocused, float, -1)
-
-       ATTRIB(XonoticServerList, seenIPv4, float, 0)
-       ATTRIB(XonoticServerList, seenIPv6, float, 0)
-       ATTRIB(XonoticServerList, categoriesHeight, float, 1.25)
+       ATTRIB(XonoticServerList, sortButton1, entity);
+       ATTRIB(XonoticServerList, sortButton2, entity);
+       ATTRIB(XonoticServerList, sortButton3, entity);
+       ATTRIB(XonoticServerList, sortButton4, entity);
+       ATTRIB(XonoticServerList, sortButton5, entity);
+       ATTRIB(XonoticServerList, connectButton, entity);
+       ATTRIB(XonoticServerList, infoButton, entity);
+       ATTRIB(XonoticServerList, currentSortOrder, float, 0);
+       ATTRIB(XonoticServerList, currentSortField, float, -1);
+
+       ATTRIB(XonoticServerList, ipAddressBoxFocused, float, -1);
+
+       ATTRIB(XonoticServerList, seenIPv4, float, 0);
+       ATTRIB(XonoticServerList, seenIPv6, float, 0);
+       ATTRIB(XonoticServerList, categoriesHeight, float, 1.25);

 
        METHOD(XonoticServerList, getTotalHeight, float(entity));
        METHOD(XonoticServerList, getItemAtPos, float(entity, float));
 
        METHOD(XonoticServerList, getTotalHeight, float(entity));
        METHOD(XonoticServerList, getItemAtPos, float(entity, float));

diff --git a/qcsrc/menu/xonotic/skinlist.qh b/qcsrc/menu/xonotic/skinlist.qh
index 616fc233dcdd6a9bac92d9f0c66ae628a022ac56..9ea9aa54c6d1a80afa31d5f215de8b89ba8c9fb0 100644 (file)
--- a/qcsrc/menu/xonotic/skinlist.qh
+++ b/qcsrc/menu/xonotic/skinlist.qh
@@ -3,7 +3,7 @@
 #include "listbox.qh"
 CLASS(XonoticSkinList, XonoticListBox)
        METHOD(XonoticSkinList, configureXonoticSkinList, void(entity));
 #include "listbox.qh"
 CLASS(XonoticSkinList, XonoticListBox)
        METHOD(XonoticSkinList, configureXonoticSkinList, void(entity));

-       ATTRIB(XonoticSkinList, rowsPerItem, float, 4)
+       ATTRIB(XonoticSkinList, rowsPerItem, float, 4);

        METHOD(XonoticSkinList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticSkinList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticSkinList, getSkins, void(entity));
        METHOD(XonoticSkinList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticSkinList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticSkinList, getSkins, void(entity));


@@ -15,18 +15,18 @@ CLASS(XonoticSkinList, XonoticListBox)
        METHOD(XonoticSkinList, keyDown, float(entity, float, float, float));
        METHOD(XonoticSkinList, destroy, void(entity));
 
        METHOD(XonoticSkinList, keyDown, float(entity, float, float, float));
        METHOD(XonoticSkinList, destroy, void(entity));
 

-       ATTRIB(XonoticSkinList, skinlist, float, -1)
-       ATTRIB(XonoticSkinList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticSkinList, columnPreviewOrigin, float, 0)
-       ATTRIB(XonoticSkinList, columnPreviewSize, float, 0)
-       ATTRIB(XonoticSkinList, columnNameOrigin, float, 0)
-       ATTRIB(XonoticSkinList, columnNameSize, float, 0)
-       ATTRIB(XonoticSkinList, realUpperMargin1, float, 0)
-       ATTRIB(XonoticSkinList, realUpperMargin2, float, 0)
-       ATTRIB(XonoticSkinList, origin, vector, '0 0 0')
-       ATTRIB(XonoticSkinList, itemAbsSize, vector, '0 0 0')
+       ATTRIB(XonoticSkinList, skinlist, float, -1);
+       ATTRIB(XonoticSkinList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticSkinList, columnPreviewOrigin, float, 0);
+       ATTRIB(XonoticSkinList, columnPreviewSize, float, 0);
+       ATTRIB(XonoticSkinList, columnNameOrigin, float, 0);
+       ATTRIB(XonoticSkinList, columnNameSize, float, 0);
+       ATTRIB(XonoticSkinList, realUpperMargin1, float, 0);
+       ATTRIB(XonoticSkinList, realUpperMargin2, float, 0);
+       ATTRIB(XonoticSkinList, origin, vector, '0 0 0');
+       ATTRIB(XonoticSkinList, itemAbsSize, vector, '0 0 0');

 
 

-       ATTRIB(XonoticSkinList, name, string, "skinselector")
+       ATTRIB(XonoticSkinList, name, string, "skinselector");

 ENDCLASS(XonoticSkinList)
 
 entity makeXonoticSkinList();
 ENDCLASS(XonoticSkinList)
 
 entity makeXonoticSkinList();

diff --git a/qcsrc/menu/xonotic/slider.qh b/qcsrc/menu/xonotic/slider.qh
index 17287c42841cc3b8f164ad6ab0090a750517fc8e..9204c5eb35b501481d2be533c53c361b18b10245 100644 (file)
--- a/qcsrc/menu/xonotic/slider.qh
+++ b/qcsrc/menu/xonotic/slider.qh
@@ -5,24 +5,24 @@ CLASS(XonoticSlider, Slider)
        METHOD(XonoticSlider, configureXonoticSlider, void(entity, float, float, float, string, string));
        METHOD(XonoticSlider, setValue, void(entity, float));
        METHOD(XonoticSlider, setValue_noAnim, void(entity, float));
        METHOD(XonoticSlider, configureXonoticSlider, void(entity, float, float, float, string, string));
        METHOD(XonoticSlider, setValue, void(entity, float));
        METHOD(XonoticSlider, setValue_noAnim, void(entity, float));

-       ATTRIB(XonoticSlider, fontSize, float, SKINFONTSIZE_NORMAL)
-       ATTRIB(XonoticSlider, valueSpace, float, SKINWIDTH_SLIDERTEXT)
-       ATTRIB(XonoticSlider, image, string, SKINGFX_SLIDER)
-       ATTRIB(XonoticSlider, tolerance, vector, SKINTOLERANCE_SLIDER)
-       ATTRIB(XonoticSlider, align, float, 0.5)
-       ATTRIB(XonoticSlider, color, vector, SKINCOLOR_SLIDER_N)
-       ATTRIB(XonoticSlider, colorC, vector, SKINCOLOR_SLIDER_C)
-       ATTRIB(XonoticSlider, colorF, vector, SKINCOLOR_SLIDER_F)
-       ATTRIB(XonoticSlider, colorD, vector, SKINCOLOR_SLIDER_D)
-       ATTRIB(XonoticSlider, color2, vector, SKINCOLOR_SLIDER_S)
+       ATTRIB(XonoticSlider, fontSize, float, SKINFONTSIZE_NORMAL);
+       ATTRIB(XonoticSlider, valueSpace, float, SKINWIDTH_SLIDERTEXT);
+       ATTRIB(XonoticSlider, image, string, SKINGFX_SLIDER);
+       ATTRIB(XonoticSlider, tolerance, vector, SKINTOLERANCE_SLIDER);
+       ATTRIB(XonoticSlider, align, float, 0.5);
+       ATTRIB(XonoticSlider, color, vector, SKINCOLOR_SLIDER_N);
+       ATTRIB(XonoticSlider, colorC, vector, SKINCOLOR_SLIDER_C);
+       ATTRIB(XonoticSlider, colorF, vector, SKINCOLOR_SLIDER_F);
+       ATTRIB(XonoticSlider, colorD, vector, SKINCOLOR_SLIDER_D);
+       ATTRIB(XonoticSlider, color2, vector, SKINCOLOR_SLIDER_S);

 
 

-       ATTRIB(XonoticSlider, cvarName, string, string_null)
+       ATTRIB(XonoticSlider, cvarName, string);

        METHOD(XonoticSlider, loadCvars, void(entity));
        METHOD(XonoticSlider, saveCvars, void(entity));
        METHOD(XonoticSlider, loadCvars, void(entity));
        METHOD(XonoticSlider, saveCvars, void(entity));

-       ATTRIB(XonoticSlider, sendCvars, float, 0)
+       ATTRIB(XonoticSlider, sendCvars, float, 0);

 
 

-       ATTRIB(XonoticSlider, alpha, float, SKINALPHA_TEXT)
-       ATTRIB(XonoticSlider, disabledAlpha, float, SKINALPHA_DISABLED)
+       ATTRIB(XonoticSlider, alpha, float, SKINALPHA_TEXT);
+       ATTRIB(XonoticSlider, disabledAlpha, float, SKINALPHA_DISABLED);

 ENDCLASS(XonoticSlider)
 entity makeXonoticSlider_T(float, float, float, string, string theTooltip);
 entity makeXonoticSlider(float, float, float, string);
 ENDCLASS(XonoticSlider)
 entity makeXonoticSlider_T(float, float, float, string, string theTooltip);
 entity makeXonoticSlider(float, float, float, string);

diff --git a/qcsrc/menu/xonotic/slider_picmip.qh b/qcsrc/menu/xonotic/slider_picmip.qh
index d25ba994befebe50917885258f9e72905c49a407..3661fd4936e13281d41d3d2a3237ecf30b849455 100644 (file)
--- a/qcsrc/menu/xonotic/slider_picmip.qh
+++ b/qcsrc/menu/xonotic/slider_picmip.qh
@@ -5,6 +5,6 @@ CLASS(XonoticPicmipSlider, XonoticTextSlider)
        METHOD(XonoticPicmipSlider, configureXonoticPicmipSlider, void(entity));
        METHOD(XonoticPicmipSlider, draw, void(entity));
        METHOD(XonoticPicmipSlider, autofix, void(entity));
        METHOD(XonoticPicmipSlider, configureXonoticPicmipSlider, void(entity));
        METHOD(XonoticPicmipSlider, draw, void(entity));
        METHOD(XonoticPicmipSlider, autofix, void(entity));

-       ATTRIB(XonoticPicmipSlider, have_s3tc, float, 0)
+       ATTRIB(XonoticPicmipSlider, have_s3tc, float, 0);

 ENDCLASS(XonoticPicmipSlider)
 entity makeXonoticPicmipSlider();  // note: you still need to call addValue and configureXonoticTextSliderValues!
 ENDCLASS(XonoticPicmipSlider)
 entity makeXonoticPicmipSlider();  // note: you still need to call addValue and configureXonoticTextSliderValues!

diff --git a/qcsrc/menu/xonotic/slider_resolution.qh b/qcsrc/menu/xonotic/slider_resolution.qh
index 40b7bbbc246764e24f4b20a7fcb3d07f53aaa994..3b56c2a8fdb27c9511f7dc3856ba2dd0ae18abfd 100644 (file)
--- a/qcsrc/menu/xonotic/slider_resolution.qh
+++ b/qcsrc/menu/xonotic/slider_resolution.qh
@@ -8,9 +8,9 @@ CLASS(XonoticResolutionSlider, XonoticTextSlider)
        METHOD(XonoticResolutionSlider, loadCvars, void(entity));
        METHOD(XonoticResolutionSlider, saveCvars, void(entity));
        METHOD(XonoticResolutionSlider, draw, void(entity));
        METHOD(XonoticResolutionSlider, loadCvars, void(entity));
        METHOD(XonoticResolutionSlider, saveCvars, void(entity));
        METHOD(XonoticResolutionSlider, draw, void(entity));

-       ATTRIB(XonoticResolutionSlider, vid_fullscreen, float, -1)
-       ATTRIB(XonoticResolutionSlider, maxAllowedWidth, float, 0)
-       ATTRIB(XonoticResolutionSlider, maxAllowedHeight, float, 0)
+       ATTRIB(XonoticResolutionSlider, vid_fullscreen, float, -1);
+       ATTRIB(XonoticResolutionSlider, maxAllowedWidth, float, 0);
+       ATTRIB(XonoticResolutionSlider, maxAllowedHeight, float, 0);

 ENDCLASS(XonoticResolutionSlider)
 entity makeXonoticResolutionSlider();
 float updateConwidths(float width, float height, float pixelheight);
 ENDCLASS(XonoticResolutionSlider)
 entity makeXonoticResolutionSlider();
 float updateConwidths(float width, float height, float pixelheight);

diff --git a/qcsrc/menu/xonotic/soundlist.qh b/qcsrc/menu/xonotic/soundlist.qh
index 86dc4c773f8f1afa62b3011ecc20c8e788cf5bbc..1e30baa11d773f9cf00617b0786f8ed3a4f51728 100644 (file)
--- a/qcsrc/menu/xonotic/soundlist.qh
+++ b/qcsrc/menu/xonotic/soundlist.qh
@@ -3,7 +3,7 @@
 #include "listbox.qh"
 CLASS(XonoticSoundList, XonoticListBox)
        METHOD(XonoticSoundList, configureXonoticSoundList, void(entity));
 #include "listbox.qh"
 CLASS(XonoticSoundList, XonoticListBox)
        METHOD(XonoticSoundList, configureXonoticSoundList, void(entity));

-       ATTRIB(XonoticSoundList, rowsPerItem, float, 1)
+       ATTRIB(XonoticSoundList, rowsPerItem, float, 1);

        METHOD(XonoticSoundList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticSoundList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticSoundList, getSounds, void(entity));
        METHOD(XonoticSoundList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticSoundList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticSoundList, getSounds, void(entity));


@@ -13,18 +13,18 @@ CLASS(XonoticSoundList, XonoticListBox)
        METHOD(XonoticSoundList, destroy, void(entity));
        METHOD(XonoticSoundList, showNotify, void(entity));
 
        METHOD(XonoticSoundList, destroy, void(entity));
        METHOD(XonoticSoundList, showNotify, void(entity));
 

-       ATTRIB(XonoticSoundList, listSound, int, -1)
-       ATTRIB(XonoticSoundList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticSoundList, columnNameOrigin, float, 0)
-       ATTRIB(XonoticSoundList, columnNameSize, float, 0)
-       ATTRIB(XonoticSoundList, columnNumberOrigin, float, 0)
-       ATTRIB(XonoticSoundList, columnNumberSize, float, 0)
-       ATTRIB(XonoticSoundList, realUpperMargin, float, 0)
-       ATTRIB(XonoticSoundList, origin, vector, '0 0 0')
-       ATTRIB(XonoticSoundList, itemAbsSize, vector, '0 0 0')
+       ATTRIB(XonoticSoundList, listSound, int, -1);
+       ATTRIB(XonoticSoundList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticSoundList, columnNameOrigin, float, 0);
+       ATTRIB(XonoticSoundList, columnNameSize, float, 0);
+       ATTRIB(XonoticSoundList, columnNumberOrigin, float, 0);
+       ATTRIB(XonoticSoundList, columnNumberSize, float, 0);
+       ATTRIB(XonoticSoundList, realUpperMargin, float, 0);
+       ATTRIB(XonoticSoundList, origin, vector, '0 0 0');
+       ATTRIB(XonoticSoundList, itemAbsSize, vector, '0 0 0');

 
 

-       ATTRIB(XonoticSoundList, filterString, string, string_null)
-       ATTRIB(XonoticSoundList, playlist, entity, NULL)
+       ATTRIB(XonoticSoundList, filterString, string);
+       ATTRIB(XonoticSoundList, playlist, entity);

 ENDCLASS(XonoticSoundList)
 
 entity makeXonoticSoundList();
 ENDCLASS(XonoticSoundList)
 
 entity makeXonoticSoundList();

diff --git a/qcsrc/menu/xonotic/statslist.qh b/qcsrc/menu/xonotic/statslist.qh
index ebef28ac0140a34a9d17813389b7deda95653f47..01fb93645bf6aeb92991805cb4d642e1b2bed5b1 100644 (file)
--- a/qcsrc/menu/xonotic/statslist.qh
+++ b/qcsrc/menu/xonotic/statslist.qh
@@ -3,7 +3,7 @@
 #include "listbox.qh"
 CLASS(XonoticStatsList, XonoticListBox)
        METHOD(XonoticStatsList, configureXonoticStatsList, void(entity));
 #include "listbox.qh"
 CLASS(XonoticStatsList, XonoticListBox)
        METHOD(XonoticStatsList, configureXonoticStatsList, void(entity));

-       ATTRIB(XonoticStatsList, rowsPerItem, float, 1.4)
+       ATTRIB(XonoticStatsList, rowsPerItem, float, 1.4);

        METHOD(XonoticStatsList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticStatsList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticStatsList, getStats, void(entity));
        METHOD(XonoticStatsList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticStatsList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticStatsList, getStats, void(entity));


@@ -11,13 +11,13 @@ CLASS(XonoticStatsList, XonoticListBox)
        METHOD(XonoticStatsList, keyDown, float(entity, float, float, float));
        METHOD(XonoticStatsList, destroy, void(entity));
        METHOD(XonoticStatsList, showNotify, void(entity));
        METHOD(XonoticStatsList, keyDown, float(entity, float, float, float));
        METHOD(XonoticStatsList, destroy, void(entity));
        METHOD(XonoticStatsList, showNotify, void(entity));

-       ATTRIB(XonoticStatsList, selectionDoesntMatter, bool, true)
+       ATTRIB(XonoticStatsList, selectionDoesntMatter, bool, true);

 
 

-       ATTRIB(XonoticStatsList, listStats, float, -1)
-       ATTRIB(XonoticStatsList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticStatsList, realUpperMargin, float, 0)
-       ATTRIB(XonoticStatsList, columnNameOrigin, float, 0)
-       ATTRIB(XonoticStatsList, columnNameSize, float, 0)
+       ATTRIB(XonoticStatsList, listStats, float, -1);
+       ATTRIB(XonoticStatsList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticStatsList, realUpperMargin, float, 0);
+       ATTRIB(XonoticStatsList, columnNameOrigin, float, 0);
+       ATTRIB(XonoticStatsList, columnNameSize, float, 0);

 ENDCLASS(XonoticStatsList)
 
 entity statslist;  // for reference elsewhere
 ENDCLASS(XonoticStatsList)
 
 entity statslist;  // for reference elsewhere

diff --git a/qcsrc/menu/xonotic/tab.qh b/qcsrc/menu/xonotic/tab.qh
index b296d2491846c5f27ca20b45847397d631699b6f..ff561d57e68d139dcb404e97270e4c6befc9e277 100644 (file)
--- a/qcsrc/menu/xonotic/tab.qh
+++ b/qcsrc/menu/xonotic/tab.qh
@@ -4,24 +4,24 @@
 CLASS(XonoticTab, Tab)
        // still to be customized by user
        /*
 CLASS(XonoticTab, Tab)
        // still to be customized by user
        /*

-       ATTRIB(XonoticTab, intendedWidth, float, 0)
-       ATTRIB(XonoticTab, rows, float, 3)
-       ATTRIB(XonoticTab, columns, float, 2)
+       ATTRIB(XonoticTab, intendedWidth, float, 0);
+       ATTRIB(XonoticTab, rows, float, 3);
+       ATTRIB(XonoticTab, columns, float, 2);

        */
        METHOD(XonoticTab, showNotify, void(entity));
 
        */
        METHOD(XonoticTab, showNotify, void(entity));
 

-       ATTRIB(XonoticTab, marginTop, float, 0)                                       // pixels
-       ATTRIB(XonoticTab, marginBottom, float, 0)                                    // pixels
-       ATTRIB(XonoticTab, marginLeft, float, 0)                                      // pixels
-       ATTRIB(XonoticTab, marginRight, float, 0)                                     // pixels
-       ATTRIB(XonoticTab, columnSpacing, float, SKINMARGIN_COLUMNS)                  // pixels
-       ATTRIB(XonoticTab, rowSpacing, float, SKINMARGIN_ROWS)                        // pixels
-       ATTRIB(XonoticTab, rowHeight, float, SKINFONTSIZE_NORMAL * SKINHEIGHT_NORMAL) // pixels
+       ATTRIB(XonoticTab, marginTop, float, 0);                                       // pixels
+       ATTRIB(XonoticTab, marginBottom, float, 0);                                    // pixels
+       ATTRIB(XonoticTab, marginLeft, float, 0);                                      // pixels
+       ATTRIB(XonoticTab, marginRight, float, 0);                                     // pixels
+       ATTRIB(XonoticTab, columnSpacing, float, SKINMARGIN_COLUMNS);                  // pixels
+       ATTRIB(XonoticTab, rowSpacing, float, SKINMARGIN_ROWS);                        // pixels
+       ATTRIB(XonoticTab, rowHeight, float, SKINFONTSIZE_NORMAL * SKINHEIGHT_NORMAL); // pixels

 
 

-       ATTRIB(XonoticTab, backgroundImage, string, string_null)
+       ATTRIB(XonoticTab, backgroundImage, string);

 
        // using "titleTooltip" instead of "tooltip" so that
        // the tooltip search function doesn't find it
        // .tooltip should be set only in the item displaying the tab title
 
        // using "titleTooltip" instead of "tooltip" so that
        // the tooltip search function doesn't find it
        // .tooltip should be set only in the item displaying the tab title

-       ATTRIB(XonoticTab, titleTooltip, string, string_null)
+       ATTRIB(XonoticTab, titleTooltip, string);

 ENDCLASS(XonoticTab)
 ENDCLASS(XonoticTab)

diff --git a/qcsrc/menu/xonotic/tabcontroller.qh b/qcsrc/menu/xonotic/tabcontroller.qh
index eb4d48f8d96efa436bb35d05e570e2f1e3723ee6..46d140eb08d8023c6450ad3b4a03c7e7892ff5fb 100644 (file)
--- a/qcsrc/menu/xonotic/tabcontroller.qh
+++ b/qcsrc/menu/xonotic/tabcontroller.qh
@@ -5,8 +5,8 @@ CLASS(XonoticTabController, ModalController)
        METHOD(XonoticTabController, configureXonoticTabController, void(entity, float));
        METHOD(XonoticTabController, makeTabButton_T, entity(entity, string, entity, string));
        METHOD(XonoticTabController, makeTabButton, entity(entity, string, entity));
        METHOD(XonoticTabController, configureXonoticTabController, void(entity, float));
        METHOD(XonoticTabController, makeTabButton_T, entity(entity, string, entity, string));
        METHOD(XonoticTabController, makeTabButton, entity(entity, string, entity));

-       ATTRIB(XonoticTabController, rows, float, 0)
-       ATTRIB(XonoticTabController, fontSize, float, SKINFONTSIZE_NORMAL)
-       ATTRIB(XonoticTabController, image, string, SKINGFX_BUTTON)
+       ATTRIB(XonoticTabController, rows, float, 0);
+       ATTRIB(XonoticTabController, fontSize, float, SKINFONTSIZE_NORMAL);
+       ATTRIB(XonoticTabController, image, string, SKINGFX_BUTTON);

 ENDCLASS(XonoticTabController)
 entity makeXonoticTabController(float theRows);
 ENDCLASS(XonoticTabController)
 entity makeXonoticTabController(float theRows);

diff --git a/qcsrc/menu/xonotic/textlabel.qh b/qcsrc/menu/xonotic/textlabel.qh
index fde05de8a34bd6b0897c0f093f8668547cc5f2b5..94f7a74228ef45c58f5b9055241b9271bf9abba1 100644 (file)
--- a/qcsrc/menu/xonotic/textlabel.qh
+++ b/qcsrc/menu/xonotic/textlabel.qh
@@ -4,9 +4,9 @@
 CLASS(XonoticTextLabel, Label)
        METHOD(XonoticTextLabel, configureXonoticTextLabel, void(entity, float, string));
        METHOD(XonoticTextLabel, draw, void(entity));
 CLASS(XonoticTextLabel, Label)
        METHOD(XonoticTextLabel, configureXonoticTextLabel, void(entity, float, string));
        METHOD(XonoticTextLabel, draw, void(entity));

-       ATTRIB(XonoticTextLabel, fontSize, float, SKINFONTSIZE_NORMAL)
-       ATTRIB(XonoticTextLabel, alpha, float, SKINALPHA_TEXT)
-       ATTRIB(XonoticTextLabel, disabledAlpha, float, SKINALPHA_DISABLED)
+       ATTRIB(XonoticTextLabel, fontSize, float, SKINFONTSIZE_NORMAL);
+       ATTRIB(XonoticTextLabel, alpha, float, SKINALPHA_TEXT);
+       ATTRIB(XonoticTextLabel, disabledAlpha, float, SKINALPHA_DISABLED);

 ENDCLASS(XonoticTextLabel)
 entity makeXonoticTextLabel(float theAlign, string theText);
 entity makeXonoticHeaderLabel(string theText);
 ENDCLASS(XonoticTextLabel)
 entity makeXonoticTextLabel(float theAlign, string theText);
 entity makeXonoticHeaderLabel(string theText);

diff --git a/qcsrc/menu/xonotic/textslider.qh b/qcsrc/menu/xonotic/textslider.qh
index ae81f36e87ba44e5e8d52f024ce33fe154abdf50..58fe8e86bbe4a0becaac10ea463fe493f50b2d72 100644 (file)
--- a/qcsrc/menu/xonotic/textslider.qh
+++ b/qcsrc/menu/xonotic/textslider.qh
@@ -6,24 +6,24 @@ CLASS(XonoticTextSlider, TextSlider)
        METHOD(XonoticTextSlider, setValue, void(entity, float));
        METHOD(XonoticTextSlider, setValue_noAnim, void(entity, float));
        METHOD(XonoticTextSlider, configureXonoticTextSliderValues, void(entity));
        METHOD(XonoticTextSlider, setValue, void(entity, float));
        METHOD(XonoticTextSlider, setValue_noAnim, void(entity, float));
        METHOD(XonoticTextSlider, configureXonoticTextSliderValues, void(entity));

-       ATTRIB(XonoticTextSlider, fontSize, float, SKINFONTSIZE_NORMAL)
-       ATTRIB(XonoticTextSlider, valueSpace, float, SKINWIDTH_SLIDERTEXT)
-       ATTRIB(XonoticTextSlider, image, string, SKINGFX_SLIDER)
-       ATTRIB(XonoticTextSlider, tolerance, vector, SKINTOLERANCE_SLIDER)
-       ATTRIB(XonoticTextSlider, align, float, 0.5)
-       ATTRIB(XonoticTextSlider, color, vector, SKINCOLOR_SLIDER_N)
-       ATTRIB(XonoticTextSlider, colorC, vector, SKINCOLOR_SLIDER_C)
-       ATTRIB(XonoticTextSlider, colorF, vector, SKINCOLOR_SLIDER_F)
-       ATTRIB(XonoticTextSlider, colorD, vector, SKINCOLOR_SLIDER_D)
-       ATTRIB(XonoticTextSlider, color2, vector, SKINCOLOR_SLIDER_S)
+       ATTRIB(XonoticTextSlider, fontSize, float, SKINFONTSIZE_NORMAL);
+       ATTRIB(XonoticTextSlider, valueSpace, float, SKINWIDTH_SLIDERTEXT);
+       ATTRIB(XonoticTextSlider, image, string, SKINGFX_SLIDER);
+       ATTRIB(XonoticTextSlider, tolerance, vector, SKINTOLERANCE_SLIDER);
+       ATTRIB(XonoticTextSlider, align, float, 0.5);
+       ATTRIB(XonoticTextSlider, color, vector, SKINCOLOR_SLIDER_N);
+       ATTRIB(XonoticTextSlider, colorC, vector, SKINCOLOR_SLIDER_C);
+       ATTRIB(XonoticTextSlider, colorF, vector, SKINCOLOR_SLIDER_F);
+       ATTRIB(XonoticTextSlider, colorD, vector, SKINCOLOR_SLIDER_D);
+       ATTRIB(XonoticTextSlider, color2, vector, SKINCOLOR_SLIDER_S);

 
 

-       ATTRIB(XonoticTextSlider, cvarName, string, string_null)
+       ATTRIB(XonoticTextSlider, cvarName, string);

        METHOD(XonoticTextSlider, loadCvars, void(entity));
        METHOD(XonoticTextSlider, saveCvars, void(entity));
        METHOD(XonoticTextSlider, loadCvars, void(entity));
        METHOD(XonoticTextSlider, saveCvars, void(entity));

-       ATTRIB(XonoticTextSlider, sendCvars, float, 0)
+       ATTRIB(XonoticTextSlider, sendCvars, float, 0);

 
 

-       ATTRIB(XonoticTextSlider, alpha, float, SKINALPHA_TEXT)
-       ATTRIB(XonoticTextSlider, disabledAlpha, float, SKINALPHA_DISABLED)
+       ATTRIB(XonoticTextSlider, alpha, float, SKINALPHA_TEXT);
+       ATTRIB(XonoticTextSlider, disabledAlpha, float, SKINALPHA_DISABLED);

 ENDCLASS(XonoticTextSlider)
 entity makeXonoticTextSlider_T(string, string theTooltip);
 entity makeXonoticTextSlider(string);  // note: you still need to call addValue and configureXonoticTextSliderValues!
 ENDCLASS(XonoticTextSlider)
 entity makeXonoticTextSlider_T(string, string theTooltip);
 entity makeXonoticTextSlider(string);  // note: you still need to call addValue and configureXonoticTextSliderValues!

diff --git a/qcsrc/menu/xonotic/weaponarenacheckbox.qh b/qcsrc/menu/xonotic/weaponarenacheckbox.qh
index 0b8e214c8097916f2b58fa74e837a956a5920837..c3c155bb2b83dde97c56c552fb16759431aa38ab 100644 (file)
--- a/qcsrc/menu/xonotic/weaponarenacheckbox.qh
+++ b/qcsrc/menu/xonotic/weaponarenacheckbox.qh
@@ -4,9 +4,9 @@
 CLASS(XonoticWeaponarenaCheckBox, CheckBox)
        METHOD(XonoticWeaponarenaCheckBox, configureXonoticWeaponarenaCheckBox, void(entity, string, string));
        METHOD(XonoticWeaponarenaCheckBox, setChecked, void(entity, float));
 CLASS(XonoticWeaponarenaCheckBox, CheckBox)
        METHOD(XonoticWeaponarenaCheckBox, configureXonoticWeaponarenaCheckBox, void(entity, string, string));
        METHOD(XonoticWeaponarenaCheckBox, setChecked, void(entity, float));

-       ATTRIB(XonoticWeaponarenaCheckBox, fontSize, float, SKINFONTSIZE_NORMAL)
-       ATTRIB(XonoticWeaponarenaCheckBox, image, string, SKINGFX_CHECKBOX)
-       ATTRIB(XonoticWeaponarenaCheckBox, netname, string, string_null)
+       ATTRIB(XonoticWeaponarenaCheckBox, fontSize, float, SKINFONTSIZE_NORMAL);
+       ATTRIB(XonoticWeaponarenaCheckBox, image, string, SKINGFX_CHECKBOX);
+       ATTRIB(XonoticWeaponarenaCheckBox, netname, string);

 
        METHOD(XonoticWeaponarenaCheckBox, loadCvars, void(entity));
        METHOD(XonoticWeaponarenaCheckBox, saveCvars, void(entity));
 
        METHOD(XonoticWeaponarenaCheckBox, loadCvars, void(entity));
        METHOD(XonoticWeaponarenaCheckBox, saveCvars, void(entity));

diff --git a/qcsrc/menu/xonotic/weaponslist.qh b/qcsrc/menu/xonotic/weaponslist.qh
index 953a40cc0dd39a9f921fd7b2162a62015fc66130..4726d8553dc1a765fbc03672cc4137180a5135c7 100644 (file)
--- a/qcsrc/menu/xonotic/weaponslist.qh
+++ b/qcsrc/menu/xonotic/weaponslist.qh
@@ -4,16 +4,16 @@
 CLASS(XonoticWeaponsList, XonoticListBox)
        METHOD(XonoticWeaponsList, configureXonoticWeaponsList, void(entity));
        METHOD(XonoticWeaponsList, toString, string(entity));
 CLASS(XonoticWeaponsList, XonoticListBox)
        METHOD(XonoticWeaponsList, configureXonoticWeaponsList, void(entity));
        METHOD(XonoticWeaponsList, toString, string(entity));

-       ATTRIB(XonoticWeaponsList, rowsPerItem, float, 1)
+       ATTRIB(XonoticWeaponsList, rowsPerItem, float, 1);

        METHOD(XonoticWeaponsList, draw, void(entity));
        METHOD(XonoticWeaponsList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticWeaponsList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticWeaponsList, keyDown, float(entity, float, float, float));
        METHOD(XonoticWeaponsList, draw, void(entity));
        METHOD(XonoticWeaponsList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticWeaponsList, resizeNotify, void(entity, vector, vector, vector, vector));
        METHOD(XonoticWeaponsList, keyDown, float(entity, float, float, float));

-       ATTRIB(XonoticWeaponsList, realFontSize, vector, '0 0 0')
-       ATTRIB(XonoticWeaponsList, realUpperMargin, float, 0)
+       ATTRIB(XonoticWeaponsList, realFontSize, vector, '0 0 0');
+       ATTRIB(XonoticWeaponsList, realUpperMargin, float, 0);

        METHOD(XonoticWeaponsList, mouseDrag, float(entity, vector));
 
        METHOD(XonoticWeaponsList, mouseDrag, float(entity, vector));
 

-       ATTRIB(XonoticWeaponsList, applyButton, entity, NULL)
+       ATTRIB(XonoticWeaponsList, applyButton, entity);

 ENDCLASS(XonoticWeaponsList)
 entity makeXonoticWeaponsList();
 void WeaponsList_MoveUp_Click(entity btn, entity me);
 ENDCLASS(XonoticWeaponsList)
 entity makeXonoticWeaponsList();
 void WeaponsList_MoveUp_Click(entity btn, entity me);

diff --git a/qcsrc/server/cl_client.qh b/qcsrc/server/cl_client.qh
index d540bb16ac8bcc8aee6484da3b4c850ea853aa51..35ff6e961c61808a8f5f3cdd0f87e288653bd4f5 100644 (file)
--- a/qcsrc/server/cl_client.qh
+++ b/qcsrc/server/cl_client.qh
@@ -4,31 +4,31 @@ void ClientState_attach(entity this);
 
 CLASS(Client, Object)
     /** Client name */
 
 CLASS(Client, Object)
     /** Client name */

-    ATTRIB(Client, netname, string, this.netname)
-    ATTRIB(Client, colormap, int, this.colormap)
-    ATTRIB(Client, team, int, this.team)
-    ATTRIB(Client, clientcolors, int, this.clientcolors)
+    ATTRIB(Client, netname, string, this.netname);
+    ATTRIB(Client, colormap, int, this.colormap);
+    ATTRIB(Client, team, int, this.team);
+    ATTRIB(Client, clientcolors, int, this.clientcolors);

     /** Client IP */
     /** Client IP */

-    ATTRIB(Client, netaddress, string, this.netaddress)
-    ATTRIB(Client, playermodel, string, this.playermodel)
-    ATTRIB(Client, playerskin, int, this.playerskin)
+    ATTRIB(Client, netaddress, string, this.netaddress);
+    ATTRIB(Client, playermodel, string, this.playermodel);
+    ATTRIB(Client, playerskin, int, this.playerskin);

 
     /** fingerprint of CA key the player used to authenticate */
 
     /** fingerprint of CA key the player used to authenticate */

-    ATTRIB(Client, crypto_keyfp, string, this.crypto_keyfp)
+    ATTRIB(Client, crypto_keyfp, string, this.crypto_keyfp);

     /** fingerprint of CA key the server used to authenticate to the player */
     /** fingerprint of CA key the server used to authenticate to the player */

-    ATTRIB(Client, crypto_mykeyfp, string, this.crypto_mykeyfp)
+    ATTRIB(Client, crypto_mykeyfp, string, this.crypto_mykeyfp);

     /** fingerprint of ID used by the player entity, or string_null if not identified */
     /** fingerprint of ID used by the player entity, or string_null if not identified */

-    ATTRIB(Client, crypto_idfp, string, this.crypto_idfp)
+    ATTRIB(Client, crypto_idfp, string, this.crypto_idfp);

     /** set if the player's ID has been signed */
     /** set if the player's ID has been signed */

-    ATTRIB(Client, crypto_idfp_signed, bool, this.crypto_idfp_signed)
+    ATTRIB(Client, crypto_idfp_signed, bool, this.crypto_idfp_signed);

     /** the string "AES128" if encrypting, and string_null if plaintext */
     /** the string "AES128" if encrypting, and string_null if plaintext */

-    ATTRIB(Client, crypto_encryptmethod, string, this.crypto_encryptmethod)
+    ATTRIB(Client, crypto_encryptmethod, string, this.crypto_encryptmethod);

     /** the string "HMAC-SHA256" if signing, and string_null if plaintext */
     /** the string "HMAC-SHA256" if signing, and string_null if plaintext */

-    ATTRIB(Client, crypto_signmethod, string, this.crypto_signmethod)
+    ATTRIB(Client, crypto_signmethod, string, this.crypto_signmethod);

 
     // custom
 
 
     // custom
 

-    ATTRIB(Client, playerid, int, this.playerid)
+    ATTRIB(Client, playerid, int, this.playerid);

 
     METHOD(Client, m_unwind, bool(Client this));
 
 
     METHOD(Client, m_unwind, bool(Client this));
 

diff --git a/qcsrc/server/mutators/mutator/gamemode_ctf.qh b/qcsrc/server/mutators/mutator/gamemode_ctf.qh
index c9d5b5aedcce94b2a64755784f120131295c43af..65f2937fd978351104f35027d5d81cfd7eb38824 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_ctf.qh
+++ b/qcsrc/server/mutators/mutator/gamemode_ctf.qh
@@ -10,8 +10,8 @@ void ctf_RespawnFlag(entity flag);
 const int ST_CTF_CAPS = 1;
 
 CLASS(Flag, Pickup)
 const int ST_CTF_CAPS = 1;
 
 CLASS(Flag, Pickup)

-    ATTRIB(Flag, m_mins, vector, PL_MIN_CONST + '0 0 -13')
-    ATTRIB(Flag, m_maxs, vector, PL_MAX_CONST + '0 0 -13')
+    ATTRIB(Flag, m_mins, vector, PL_MIN_CONST + '0 0 -13');
+    ATTRIB(Flag, m_maxs, vector, PL_MAX_CONST + '0 0 -13');

 ENDCLASS(Flag)
 Flag CTF_FLAG; STATIC_INIT(Flag) { CTF_FLAG = NEW(Flag); }
 void ctf_FlagTouch(entity this, entity toucher) { ITEM_HANDLE(Pickup, CTF_FLAG, this, toucher); }
 ENDCLASS(Flag)
 Flag CTF_FLAG; STATIC_INIT(Flag) { CTF_FLAG = NEW(Flag); }
 void ctf_FlagTouch(entity this, entity toucher) { ITEM_HANDLE(Pickup, CTF_FLAG, this, toucher); }