Merge remote-tracking branch 'origin/nyov/remove-playermodeltokens'

diff --git a/qcsrc/common/mapinfo.qc b/qcsrc/common/mapinfo.qc
index 830c86db9019c6f52d9d7187d07c644a15e8502c..1c7f7163ce8ec4c33383bc69ce961cb295d0c6ee 100644 (file)
--- a/qcsrc/common/mapinfo.qc
+++ b/qcsrc/common/mapinfo.qc
@@ -688,6 +688,18 @@ float MapInfo_Type_FromString(string t)
                t = "inv";
                print("'. Should use '", t, "'.\n");
        }
+       if(t == "assault")
+       {
+               print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+               t = "as";
+               print("'. Should use '", t, "'.\n");
+       }
+       if(t == "race")
+       {
+               print("MapInfo_Type_FromString (probably ", MapInfo_Map_bspname, "): using deprecated name '", t);
+               t = "rc";
+               print("'. Should use '", t, "'.\n");
+       }
        if(t == "all")
                return MAPINFO_TYPE_ALL;
        for(e = MapInfo_Type_first; e; e = e.enemy)

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index 4fd6e1f25dcc37373a00a04a565aec114867ddb2..8f21db76ca870b0e6e0ebf182fd6693e4b4d75dc 100644 (file)
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -2027,7 +2027,7 @@ void Send_Notification(
                #define RECURSE_FROM_CHOICE(ent,action) \
                        if(notif.nent_challow_var && (warmup_stage || (notif.nent_challow_var == 2))) \
                        { \
-                               switch(ent.msg_choice_choices[net_name]) \
+                               switch(ent.msg_choice_choices[net_name - 1]) \
                                { \
                                        case 1: found_choice = notif.nent_optiona; break; \
                                        case 2: found_choice = notif.nent_optionb; break; \