Merge branch 'master' into terencehill/less_fields 659/head
authorMario <mario@smbclan.net>
Thu, 29 Aug 2019 05:44:29 +0000 (15:44 +1000)
committerMario <mario@smbclan.net>
Thu, 29 Aug 2019 05:44:29 +0000 (15:44 +1000)
# Conflicts:
# qcsrc/common/notifications/all.qh

1  2 
qcsrc/common/notifications/all.qh
qcsrc/server/client.qh

@@@ -822,20 -821,18 +822,20 @@@ Notification Get_Notif_Ent(MSG net_type
                        centername); /* centername */ \
        }
  
- #define MSG_CHOICE_NOTIF_TEAM(teamnum, name, cvarname, default, challow, chtype, optiona, optionb) \
-       MSG_CHOICE_NOTIF_(teamnum, CHOICE_##name, CHOICE_##cvarname, default, challow, chtype, optiona, optionb)
+ #define MSG_CHOICE_NOTIF_TEAM(teamnum, name, cvarname, defaultvalue, challow, chtype, optiona, optionb) \
+       MSG_CHOICE_NOTIF_(teamnum, CHOICE_##name, CHOICE_##cvarname, defaultvalue, challow, chtype, optiona, optionb)
  
- #define MSG_CHOICE_NOTIF(name, default, challow, chtype, optiona, optionb) \
-       NOTIF_ADD_AUTOCVAR(CHOICE_##name, default) \
+ #define MSG_CHOICE_NOTIF(name, defaultvalue, challow, chtype, optiona, optionb) \
+       NOTIF_ADD_AUTOCVAR(CHOICE_##name, defaultvalue) \
        NOTIF_ADD_AUTOCVAR(CHOICE_##name##_ALLOWED, challow) \
-       MSG_CHOICE_NOTIF_(0, CHOICE_##name, CHOICE_##name, default, challow, chtype, optiona, optionb)
+       MSG_CHOICE_NOTIF_(0, CHOICE_##name, CHOICE_##name, defaultvalue, challow, chtype, optiona, optionb)
  
- #define MSG_CHOICE_NOTIF_(teamnum, name, cvarname, default, challow, chtype, optiona, optionb) \
+ #define MSG_CHOICE_NOTIF_(teamnum, name, cvarname, defaultvalue, challow, chtype, optiona, optionb) \
        REGISTER(Notifications, name, m_id, new_pure(msg_choice_notification)) { \
 -              this.nent_choice_idx = nent_choice_count++; \
 +              this.nent_choice_idx = nent_choice_count; \
 +              if (!teamnum || teamnum == NUM_TEAM_4) \
 +                      nent_choice_count++; \
-               Create_Notification_Entity       (this, default, ACVNN(cvarname), MSG_CHOICE, strtoupper(#name), teamnum); \
+               Create_Notification_Entity       (this, defaultvalue, ACVNN(cvarname), MSG_CHOICE, strtoupper(#name), teamnum); \
                Create_Notification_Entity_Choice(this, ACVNN(cvarname), strtoupper(#name), \
                        challow,                                 /* challow_def */ \
                        autocvar_notification_##cvarname##_ALLOWED,  /* challow_var */ \
Simple merge