Patches #1281

Merge in xonotic/xonotic-data.pk3dir.git: mrbougo/simple_items_fix

Added by git-manager over 1 year ago. Updated over 1 year ago.

Status:ResolvedStart date:08/10/2012
Priority:NormalDue date:
Assignee:-% Done:

100%

Category:-
Target version:-

Description

Purpose of the branch:

Very simple fix for the simple items which were broken by 59c88c73 and c9de9b06, this branch undoes the accidental changes to this line back to what it was before 59c88c73.

Repository: xonotic/xonotic-data.pk3dir.git
Commit: 2edf2d628ab52514ab531976ee8b06479e56ace7
Branch: mrbougo/simple_items_fix

Merge commands:

cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '2edf2d628ab52514ab531976ee8b06479e56ace7'..'origin/mrbougo/simple_items_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/mrbougo/simple_items_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 'mrbougo/simple_items_fix'

Diffstat:

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

Revision log:

commit 2edf2d628ab52514ab531976ee8b06479e56ace7
Author: MrBougo <mrbougo@xonotic.org>
Commit: MrBougo <mrbougo@xonotic.org>

    tZork broke simple items with 59c88c73 and c9de9b06, undo this

User agreed to the GPLv2+.

Diff:

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 0a3d756..0abef68 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -22,7 +22,7 @@ var vector autocvar_cl_ghost_items_color = '-1 -1 -1';
 float  autocvar_cl_fullbright_items;
 vector autocvar_cl_weapon_stay_color = '2 0.5 0.5';
 float  autocvar_cl_weapon_stay_alpha = 0.75;
-float  autocvar_cl_simple_items = 0;
+float  autocvar_cl_simple_items;
 float  cl_simple_items;
 float  cl_ghost_items_alpha;

History

#1 Updated by MrBougo over 1 year ago

By the way, could anyone tell me if such simple branches are worth a merge request? I figured this was the only formal way to request a change to be made in the code, but it still seems excessive for a tiny one-liner fix.

#2 Updated by divVerent over 1 year ago

  • Status changed from New to Resolved

As for the bug:

float FOO = 0;

declares a constant, which breaks the autocvar. For an initialized variable, use

var float FOO = 0;

Yes, QC sucks. Carmack made this auto-constant behaviour, fteqcc adds the "var" keyword to turn it off.

#3 Updated by MrBougo over 1 year ago

This branch was not merged, I don't see my commit in history.

#4 Updated by merlijn over 1 year ago

  • Status changed from Resolved to In Progress

And I don't see your branch in git anymore :>

#5 Updated by divVerent over 1 year ago

No idea how this failed pushing, but the --delete worked.

But now it is pushed properly.

#6 Updated by tZork over 1 year ago

  • Status changed from In Progress to Resolved

Fixed by 900a3c09e97e21b6db27f930b20edd97f85d340a, thanks for the reminder.

Also available in: Atom PDF