Patches #1300

Merge in xonotic/xonotic-data.pk3dir.git: ablu/invicible_fix

Added by git-manager almost 2 years ago. Updated almost 2 years ago.

Status:ResolvedStart date:09/01/2012
Priority:NormalDue date:
Assignee:-% Done:

100%

Category:-
Target version:-

Description

Purpose of the branch:

The purpose of the branch is/was to fix a complex bug that lead to mixing the time between strength and invincible for last one.
It is complex because i had to compile twice due to a typo of me :(

Repository: xonotic/xonotic-data.pk3dir.git
Commit: 5af992c71d375f7b4a25b2ebfff6faf646c526dd
Branch: ablu/invicible_fix

Merge commands:

cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '5af992c71d375f7b4a25b2ebfff6faf646c526dd'..'origin/ablu/invicible_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 --no-ff 'origin/ablu/invicible_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 'ablu/invicible_fix'

Diffstat:

 qcsrc/server/t_items.qc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Revision log:

commit 5af992c71d375f7b4a25b2ebfff6faf646c526dd
Author: Erik Schilling <ablu.erikschilling@googlemail.com>
Commit: Erik Schilling <ablu.erikschilling@googlemail.com>

    Fixed complex bug that lead to mixing the time between strength and invincible for last one

User agreed to the GPLv2+.

Diff:

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 9ed5acb..48b4fdd 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -667,7 +667,7 @@ float Item_GiveTo(entity item, entity player)
             pickedup = TRUE;
             // sound not available
             // AnnounceTo(player, "speed");
-            player.invincible_finished = max(player.invincible_finished, time) + autocvar_g_balance_powerup_strength_time;
+            player.invincible_finished = max(player.invincible_finished, time) + autocvar_g_balance_powerup_invincible_time;
         }
     }
     else

History

#1 Updated by merlijn almost 2 years ago

  • Status changed from New to Resolved

Merged, thanks!

Also available in: Atom PDF