Merge in xonotic/xonotic-data.pk3dir.git: terencehill/m_toggle_fix
git-manager created issue #839 (closed) on 2011-11-28T16:26:10Z:
Purpose of the branch:
m_toggle takes a parameter, fix its definition and actually make use of that parameter. Now togglemenu 0/1 works as intended to switch the menu on/off.
Repository: xonotic/xonotic-data.pk3dir.git Commit: bb4343cc Branch: terencehill/m_toggle_fix
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'bb4343ccc698eb8b5ed8b87e808a0e75fd14a418'..'origin/terencehill/m_toggle_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/terencehill/m_toggle_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/m_toggle_fix'
Diffstat:
qcsrc/dpdefs/menudefs.qc | 2 +-
qcsrc/menu/menu.qc | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
Revision log:
commit bb4343ccc698eb8b5ed8b87e808a0e75fd14a418
Author: terencehill
Commit: terencehill
Remove msys.qh I've re-added in the previous merge commit :(
commit 63616e9884bee2592d61b70d313b8f269278fe23
Merge: b365116 524b025
Author: terencehill
Commit: terencehill
Merge remote-tracking branch 'origin' into terencehill/m_toggle_fix
Conflicts:
qcsrc/menu/msys.qh
commit b365116dca85ab32cb808dbd8d80e02250381da5
Author: terencehill
Commit: terencehill
m_toggle takes a parameter, fix its definition and actually make use of that parameter. Now togglemenu 0/1 works as intended to switch the menu on/off.
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/qcsrc/dpdefs/menudefs.qc b/qcsrc/dpdefs/menudefs.qc
index 0a7bd6a..4b56257 100644
— a/qcsrc/dpdefs/menudefs.qc
**+ b/qcsrc/dpdefs/menudefs.qc
@ -16,7 +16,7
@ void end\_sys\_fields;
void m\_init;
void m\_keydown;
void m\_draw;
-void m\_toggle;
*void(float mode) m\_toggle;
void() m\_shutdown;
/////////////////////////////////////////////////////////
diff —git a/qcsrc/menu/menu.qc b/qcsrc/menu/menu.qc
index f5c0f6d..2b0a636 100644
— a/qcsrc/menu/menu.qc
**+ b/qcsrc/menu/menu.qc
@ -819,12 +819,20
@ void m_hide
main.hideNotify;
}
-void m_toggle
*void m_toggle
{
if
- {
- if (mode 1)
-
return; m\_hide();
- } else
- {
-
if (mode 0)
- return; m_display();
- } }
void m_shutdown()