diff -Nru warzone2100-3.1~rc2/debian/changelog warzone2100-3.1~rc2/debian/changelog --- warzone2100-3.1~rc2/debian/changelog 2012-09-09 20:14:40.000000000 +0000 +++ warzone2100-3.1~rc2/debian/changelog 2013-02-18 08:07:39.000000000 +0000 @@ -1,3 +1,9 @@ +warzone2100 (3.1~rc2-1ubuntu1+thjaeger1) quantal; urgency=low + + * Fix annoying commander bug + + -- Thomas Jaeger Mon, 18 Feb 2013 03:07:18 -0500 + warzone2100 (3.1~rc2-1ubuntu1) quantal; urgency=low * Resynchronize with Debian. diff -Nru warzone2100-3.1~rc2/debian/patches/af44e6a059857a661eb079949bf929fa4e6e1b15.patch warzone2100-3.1~rc2/debian/patches/af44e6a059857a661eb079949bf929fa4e6e1b15.patch --- warzone2100-3.1~rc2/debian/patches/af44e6a059857a661eb079949bf929fa4e6e1b15.patch 1970-01-01 00:00:00.000000000 +0000 +++ warzone2100-3.1~rc2/debian/patches/af44e6a059857a661eb079949bf929fa4e6e1b15.patch 2013-02-18 08:06:55.000000000 +0000 @@ -0,0 +1,28 @@ +From af44e6a059857a661eb079949bf929fa4e6e1b15 Mon Sep 17 00:00:00 2001 +From: mastersharp +Date: Wed, 5 Dec 2012 14:51:25 +0100 +Subject: [PATCH] Correctly restores command groups when loading games. + +Fixes #3571 +--- + src/objmem.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/objmem.cpp b/src/objmem.cpp +index 33bfaee..acb3dea 100644 +--- a/src/objmem.cpp ++++ b/src/objmem.cpp +@@ -395,8 +395,8 @@ void addDroid(DROID *psDroidToAdd, DROID *pList[MAX_PLAYERS]) + addObjectToFuncList(apsSensorList, (BASE_OBJECT*)psDroidToAdd, 0); + } + +- // commanders have to get their group back +- if (psDroidToAdd->droidType == DROID_COMMAND) ++ // commanders have to get their group back if not already assigned to a group ++ if (psDroidToAdd->droidType == DROID_COMMAND && !psDroidToAdd->psGroup) + { + psGroup = grpCreate(); + psGroup->add(psDroidToAdd); +-- +1.7.10 + diff -Nru warzone2100-3.1~rc2/debian/patches/series warzone2100-3.1~rc2/debian/patches/series --- warzone2100-3.1~rc2/debian/patches/series 2012-09-09 20:14:40.000000000 +0000 +++ warzone2100-3.1~rc2/debian/patches/series 2013-02-18 08:07:10.000000000 +0000 @@ -1,2 +1,3 @@ use-system-libraries.patch miniupnpc8-compat.patch +af44e6a059857a661eb079949bf929fa4e6e1b15.patch