Merge branch 'master' into terencehill/less_fields

# Conflicts:
#	qcsrc/common/notifications/all.qh

diff --cc qcsrc/common/notifications/all.qh
index 60b3874de233d369109b16c50a53e1fb3426fe48,6eabc983488d720ef43f7f40b2b3c0a7bb3c1f12..ee39b1881ab100937221ae3604d1cac68bb817ae
--- 1/qcsrc/common/notifications/all.qh
--- 2/qcsrc/common/notifications/all.qh
+++ b/qcsrc/common/notifications/all.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 */ \

diff --cc qcsrc/server/client.qh
Simple merge