Merge lp:~armagetronad-ap/armagetronad/0.2.9-armagetronad-sty+ct+ap into lp:~swag/armagetronad/0.2.9-sty+ct+ap-fork

[SwagTron]

[SwagTron (swag)]

Merge from 1079 sty+ct+ap

review: Approve

[lp:~armagetronad-ap/armagetronad/0.2.9-armagetronad-sty+ct+ap]

1080. By Armanelgtron on 2019-03-04

Merge in revisions 1079 and 1080 of lp:~swag/armagetronad/0.2.9-sty+ct+ap-fork

=== added file '.gitignore'
--- .gitignore	1970-01-01 00:00:00 +0000
+++ .gitignore	2019-03-04 01:04:48 +0000
@@ -0,0 +1,95 @@
+*.DS_Store
+Armagetron Advanced Dedicated
+Armagetron Advanced.app
+desktop/os-x/Info.plist
+.gdbinit
+batch/rcd_config
+batch/rcd_server
+batch/rcd_startstop
+batch/serverstarter
+./armagetronad-dedicated
+COPYING
+ChangeLog
+EclipseBuild
+/INSTALL
+/compile
+Makefile.in
+/aclocal.m4
+/autom4te.cache
+/config.h.in
+/config.sub
+/configure
+/depcomp
+/install-sh
+/ylwrap
+/missing
+/touch
+/version
+src/doc/commands.txt
+./.changetag
+Makefile
+/config.h
+/config.log
+/config.status
+/extrapaths
+/stamp-h1
+/universal_variable*
+batch/relocate
+batch/relocate.in
+batch/sysinstall
+config/Makefile
+config/aiplayers.cfg
+config/rc.config
+desktop/armagetronad-armagetronad.desktop
+language/languages.txt
+resource/included/
+resource/automatic/
+.deps
+src/armagetronad_main
+src/tTrueVersion.h
+src/tUniversalVariables.h
+src/tUniversalVariables.h.in
+.dummy.dep
+src/doc/Doxyfile
+*.html
+html.m4
+*.dep
+aa_config.h.in
+/aa_config.h
+*.pb.cc
+*.pb.h
+*.layout
+*.depend
+.objs
+/build
+.objs_release
+desktop/armagetronad.protocol
+src/vParser.cpp
+src/protobuf/.dir
+/armagetronad
+/armagetronad-dedicated
+/var
+src/test/chat_prefix_test
+leak.log
+memprofile1.txt
+memprofile2.txt
+a.out.dSYM
+src/tFakeVersion.h
+config/settings_custom.cfg
+config/server_info.cfg
+src/armagetronad-serverquery
+./rubbish
+__pycache__
+/src/armagetronad_serverquery
+src/armagetronad_main_master
+src/doc/COPYING.txt
+rubbish
+desktop/armagetronad-armagetronad-handler.desktop
+desktop/armagetronad-link.xml
+*.cbTemp
+/version.h
+*~
+*.pyc
+src/.cproject
+src/.project
+src/.settings

=== modified file 'batch/make/version'
--- batch/make/version	2015-04-01 11:44:48 +0000
+++ batch/make/version	2019-03-04 01:04:48 +0000
@@ -8,126 +8,117 @@
 
 # set version parts to defaults for CVS snapshot
 major_version=`cat ${srcdir}/major_version`
+minor_version_proto=`cat ${srcdir}/minor_version`
 DATE=`date +%Y%m%d`
 
 #echo $major_version
 #echo $minor_version
 
-if test -d "${srcdir}/CVS"; then
-    # get the date/branch/version tag
-    rawtag=`cat ${srcdir}/CVS/Entries | grep major_version | sed -e "s,/major_version/.*/.*/.*/,,"`
-    #echo $rawtag
-    # determine the type of the tag
-    echo $rawtag | grep "^D" > /dev/null && tagtype=D
-    #echo $rawtag | grep "^Tb" > /dev/null && tagtype=Tb
-    echo $rawtag | grep "^Tv" > /dev/null && tagtype=Tv
-    #echo $tagtype
-
-    # extract the raw tag
-    tag=`echo $rawtag | sed -e "s,^$tagtype,,"`
-    #echo $tag
-
-    # date tag: make it a date dagged alpha release
-    if test "$tagtype" = D; then
-        DATE=`echo $tag | sed -e "s,\...\...\...\$,," | sed -e "s,\.,,g"`
-        minor_version=`cat ${srcdir}/minor_version | sed -e "s,DATE,$DATE," -e "s,YYYYMMDD,$DATE,"`
-    fi
-
-    # version tag: take whole version, replace _[number] with .[number]
-    if test "$tagtype" = Tv; then
-        major_version=`echo $tag | sed -e "s,_\([0-9]\),\.\\1,g"`
-        minor_version=""
-        DATE=""
-    fi
-fi
-
-if test -d "${srcdir}/.svn" || test -d "${srcdir}/../.svn"; then
-    # get the inter-repository path by parsing the URL
-
-    URL=`svn info ${srcdir} | grep ^URL | sed -e 's,^URL: ,,'`
-
-    # uncomment the followint URLs to test various cases
-    # trunk
-    # URL=https://svn.sourceforge.net/svnroot/armagetronad/armagetronad/trunk/armagetronad
-    # branch 0.4
-    # URL=https://svn.sourceforge.net/svnroot/armagetronad/armagetronad/branches/0.4/armagetronad
-
-    # tag 0.2.8.2
-    # URL=https://svn.sourceforge.net/svnroot/armagetronad/armagetronad/tags/0.2.8.2/armagetronad
-
-    #echo URL=$URL
-    REPOPATH=`echo $URL | sed -e 's,/armagetronad$,,' -e 's,.*/armagetronad/,,'`
-    #echo REPOPATH=$REPOPATH
-
-    # is it a tag?
-    if echo $REPOPATH | grep '^tags/' > /dev/null; then
-        # echo Tag
-        major_version=`echo $REPOPATH | sed -e 's,^tags/,,'`
-        minor_version=""
-        DATE=""
-    else
-        # make revision the alpha tag
-        REVISION=`svn info ${srcdir} | grep ^Revision | sed -e 's,^Revision: ,,'`
-
-        # is it a branch?
-        if echo $REPOPATH | grep '^branches/' > /dev/null; then
-            # echo Branch
-            branch=`echo $REPOPATH | sed -e 's,^branches/,,'`
-            # branch 0.2.8 produces 0.2.9 versions. Confusing, yeah, but moving it
-            # in the repo is too risky.
-            if test ${branch} = "0.2.8"; then
-                # try to get revision ID from bzr using the magic bzr-svn marker
-                # (only works this way on 0.2.8)
-                REVISION=`svn propget bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs ${srcdir} | tail -n 4 | sed -e 's, .*,,' | grep [0-9] | tail -n 1`
-            else
-                major_version=${branch}
-            fi
-        fi
-        
-        # trunk or branch
-
-        #echo REVISION=$REVISION
-        minor_version=_alpha_r$REVISION
-        DATE=""
-    fi
-fi
+bzr_count_revisions()
+{
+    srcdir="$1"
+    limit="$2"
+
+    test -z "$limit" || limit="-l $limit"
+
+    count=$(bzr log --include-merges --line $limit "${srcdir}" 2>/dev/null | wc -l)
+    echo $count
+}
 
 # *TODO* once we get our superproject up on launchpad (and thus get saner branch nicks), use branch nicks for $major_version
 # Check if bzr is installed, and if the path is versionned
-bzr info ${srcdir} >/dev/null 2>&1
+bzr >/dev/null 2>&1
 # But for now, ignore it
-if test $? -eq 0
+if test $? -eq 0 && test -d ${srcdir}/.bzr
 #if test 1 -eq 0
 then
-    # get revno
-    revno=`bzr revno ${srcdir}`
-
+    # Crappily, we can't rely on revision numbers to do anything
+    # ( ie. when one merges then pushes, the last revno might be lower than originally)
+    # So we count revisions, including merged ones, also including fools which have empty
+    # lines with only "revno: 15" in their commit messages
+    revno=$( bzr revno ${srcdir} 2>/dev/null)    
+    revcount=$( bzr_count_revisions ${srcdir} )
+    lca=$revno
+    lcaz=$revcount
+    versioned=#
+    branchurl=$( bzr info ${srcdir} 2>/dev/null | sed -ne 's/^  parent branch: \(.*\)$/\1/p' )
+
+
+    # We will check this branch diverged, and/or if tree changed
+    bzrmissingcout=$( cd ${srcdir} && bzr missing --this 2>/dev/null )
+    missing=$?
     bzr diff ${srcdir} --quiet >/dev/null 2>&1
-    # Test for the return code of bzr diff (see bzr diff --help)
-    if test $? -eq 0
-    then
-        # If no change was made, use revision number (with offset to match svn revno)
-        # but first check if it's tagged
+    changed=$?
+        
+
+    if test ${missing} -eq 1
+    # if it diverged:
+    then
+        # Count the revisions we added locally
+        localrevisions=$( echo "${bzrmissingcout}" | sed -ne '2,1s/[^0-9]//gp' )
+        # See how many steps it is, with the fool's number
+        stepsbackwards=$( bzr_count_revisions ${srcdir} ${localrevisions} )
+        # And start dancing.
+        minor_version=_alpha_z$(( ${revcount} - ${stepsbackwards} ))_${DATE}
+        # Set last common ancestors
+        lca=$(( ${revno} - ${localrevisions}))
+        lcaz=$(( ${revcount} - ${stepsbackwards} ))
+        srcchanged=#
+    elif test ${missing} -eq 0 && ( test ${changed} -eq 1 || test ${changed} -eq 2 )
+    then
+        # If a change was made and no more revision was added, just use revision fool's number plus build date
+        minor_version=_alpha_z${revcount}_${DATE}
+        # And this is versionned too
+        srcchanged=#
+    elif test ${missing} -eq 0
+    then
+        # If really no change was made, use the fool's number, with tag if any
+        # So check if we have tags
+        revno=$(bzr revno ${srcdir})
         tag=$(bzr tags -r $revno | awk '{ print $1 }')
-        if test $tag
+        if test ${tag}
         then
             # If it is tagged, use the tag
-            DATE=_$tag
+            minor_version=_alpha_z${revcount}_${tag}
         else
-            # If not, use revision number
-            DATE=_r${revno}
+            # If not, use fool's number only
+            minor_version=_alpha_z${revcount}
         fi
-    elif test $? -lt 3
+        # That's versioned as well
+    else
+        # Otherwise, this is just not versionned
+        versioned=
+    fi
+
+    if test $versioned
     then
-        # If a change was made, use revision number plus build date
-        DATE=_r${revno}_$DATE
-    # It returns 3 if it's not versionned, so forget it
+        branchnick=$( cd ${srcdir}; bzr nick )
+        revid=$( bzr testament | sed -ne 's/^revision-id: \(.*\)/\1/p' )
+    fi
+fi
+
+if test -d "${srcdir}/.git"; then
+    # check for a tag
+    cd $srcdir
+    # todo: once we have make tags, consider just git describe --tags as version ID.
+    if tag=`git describe --tags --candidates=0` > /dev/null 2>&1; then
+        major_version=`echo ${tag} | sed -e s/version_// -e s/release_//`
+        minor_version=""
+        DATE=""
+    else
+        if git diff-index --quiet HEAD --; then
+            # local checkout clean, just use revno
+            DATE=_z`git rev-list HEAD --count`
+        else
+            # local changes, add date
+            DATE=_z`git rev-list HEAD --count`_$DATE
+        fi
     fi
 fi
 
 if test -z "$minor_version"
 then
-    test -z "$DATE" || minor_version=`cat ${srcdir}/minor_version | sed -e "s,DATE,$DATE," -e "s,YYYYMMDD,$DATE,"`
+    test -z "$DATE" || minor_version=`echo ${minor_version_proto} | sed -e "s,DATE,$DATE," -e "s,YYYYMMDD,$DATE,"`
 fi
 
 echo $major_version$minor_version

=== added file 'language/.gitignore'
--- language/.gitignore	1970-01-01 00:00:00 +0000
+++ language/.gitignore	2019-03-04 01:04:48 +0000
@@ -0,0 +1,1 @@
+/*.txt.bak
\ No newline at end of file

=== modified file 'language/english_base.txt'
--- language/english_base.txt	2019-03-04 00:50:01 +0000
+++ language/english_base.txt	2019-03-04 01:04:48 +0000
@@ -1957,6 +1957,8 @@
 vote_details_help                   This menu entry determines your vote. Details: \1
 vote_submitter_text                 This vote was submitted by \1.
 
+vote_expired                        \1 (Already resolved)
+
 #*************************************
 #*************************************
 #

=== modified file 'src/engine/ePlayer.cpp'
--- src/engine/ePlayer.cpp	2019-03-04 00:50:01 +0000
+++ src/engine/ePlayer.cpp	2019-03-04 01:04:48 +0000
@@ -1590,9 +1590,9 @@
         if ( p->CurrentTeam() )
         {
             if ( p->Object() && !p->Object()->Alive() )
-                con << tOutput("$dead_console_decoration");
+                con << tOutput("$dead_console_decoration") << " ";
         }
-        else con << tOutput("$spectator_console_decoration");
+        else con << tOutput("$spectator_console_decoration") << " ";
 
         if (se_highlightMyName && actualMessage.Contains(p->GetName()))
         {
@@ -4623,6 +4623,10 @@
 // a name is only legal if it contains at least one non-witespace character.
 static bool IsLegalPlayerName( tString const & name )
 {
+    tString userName = se_UnauthenticatedUserName( name );
+    if ( userName.Len() <= 1 )
+        return false;
+
     // strip colors
     tString stripped( tColoredString::RemoveColors( name ) );
 
@@ -7308,7 +7312,7 @@
 tSettingItem< bool > se_stripMiddleConf( "FILTER_NAME_MIDDLE", se_stripMiddle );
 
 // do the optional filtering steps
-static void se_OptionalNameFilters( tString & remoteName )
+static void se_OptionalNameFilters( tString & remoteName, int owner )
 {
     // filter colors
     if ( se_filterColorNames )
@@ -7375,7 +7379,8 @@
         else
         {
             // or replace it by a default value
-            remoteName = "Player 1";
+            remoteName = "Player ";
+            remoteName << owner;
         }
     }
 }
@@ -7411,7 +7416,7 @@
         m >> remoteName;
 
         // filter
-        se_OptionalNameFilters( remoteName );
+        se_OptionalNameFilters( remoteName, Owner() );
 
         //  remove all colors from name
         tString colorlessName = tColoredString::RemoveColors(remoteName, false);
@@ -10609,7 +10614,7 @@
     {
         // apply name filters only on remote players
         if ( Owner() != 0 )
-            se_OptionalNameFilters( nameFromClient_ );
+            se_OptionalNameFilters( nameFromClient_, Owner() );
 
         // nothing wrong ? proceed to renaming
         nameFromAdmin_ = nameFromServer_ = nameFromClient_;
@@ -11003,7 +11008,10 @@
 
     // replace empty name
     if ( !IsLegalPlayerName( nameFromClient_ ) )
-        nameFromClient_ = "Player 1";
+    {
+        nameFromClient_ = "Player ";
+        nameFromClient_ << Owner();
+    }
 
     if ( sn_GetNetState() != nCLIENT )
         nameFromServer_ = nameFromClient_;

=== modified file 'src/engine/eVoter.cpp'
--- src/engine/eVoter.cpp	2019-03-03 20:57:16 +0000
+++ src/engine/eVoter.cpp	2019-03-04 01:04:48 +0000
@@ -1003,12 +1003,22 @@
 
     virtual tString DoGetDescription() const		// returns the description of the voting item
     {
-        return expired_ ? tString("Expired vote") : description_;
+        return expired_ ? tString( tOutput( "$vote_expired", description_ ) ) : description_;
     }
 
     virtual tString DoGetDetails() const		    // returns the detailed description of the voting item
     {
-        return expired_ ? tString("Expired vote") : details_;
+        return expired_ ? tString( tOutput( "$vote_expired", details_ ) ) : details_;
+    }
+
+    bool Expired() const
+    {
+        return expired_;
+    }
+    
+    bool Pending() const
+    {
+        return !expired_;
     }
 protected:
     mutable tString description_;              //!< the description of the vote
@@ -1462,12 +1472,12 @@
 
     virtual tString DoGetDescription() const		// returns the description of the voting item
     {
-        return eVoteItemServerControlled::DoGetDescription();
+        return Pending() ?  eVoteItemHarm::DoGetDescription() : eVoteItemServerControlled::DoGetDescription();
     }
 
     virtual tString DoGetDetails() const		// returns the detailed description of the voting item
     {
-        return eVoteItemServerControlled::DoGetDetails();
+        return Pending() ? eVoteItemHarm::DoGetDetails() : eVoteItemServerControlled::DoGetDetails();
     }
 };
 

=== modified file 'src/network/nAuthentication.cpp'
--- src/network/nAuthentication.cpp	2019-03-03 20:57:16 +0000
+++ src/network/nAuthentication.cpp	2019-03-04 01:04:48 +0000
@@ -1301,7 +1301,7 @@
 // the finish task can also be triggered any time by this function:
 void nLoginProcess::Abort()
 {
-    nMemberFunctionRunner::ScheduleBackground( *this, &nLoginProcess::Finish );
+    nMemberFunctionRunner::ScheduleForeground( *this, &nLoginProcess::Finish );
 }
 
 // which, when finished, triggers the foreground task of updating the

=== removed directory 'src/thirdparty/shttpd'
=== modified file 'src/tron/gHud.cpp'
--- src/tron/gHud.cpp	2019-03-03 20:57:16 +0000
+++ src/tron/gHud.cpp	2019-03-04 01:04:48 +0000
@@ -581,9 +581,9 @@
         thisTime = localtime ( &rawtime );
 
         if(thisTime->tm_min != lastTime) {
-            char h[3];
-            char m[3];
-            char ampm[3] = " ";
+            char h[13];
+            char m[13];
+            char ampm[13] = " ";
 
             lastTime = thisTime->tm_min;