xonotic-data.pk3dir:terencehill/verbose_notification_fix: a S merge request: Fix verbose notifications not working properly
git-manager created issue #1933 on 2014-03-18T10:54:33Z:
Fix verbose notifications not working properly
Repository: xonotic/xonotic-data.pk3dir.git Commit: bc287d28 Branch: terencehill/verbose_notification_fix
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'bc287d283da6f4c7c4b4110f6110721c9dcd5def'..'origin/terencehill/verbose_notification_fix'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --edit --log --no-ff 'origin/terencehill/verbose_notification_fix'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'terencehill/verbose_notification_fix'
Diffstat:
qcsrc/common/notifications.qc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Revision log:
commit bc287d283da6f4c7c4b4110f6110721c9dcd5def
Author: terencehill
Commit: terencehill
Fix verbose notifications not working properly
User agreed to the license.
Diff:
diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index 4fd6e1f..8f21db7 100644
--- 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; \