Package: xpilot-ng-server
Version: 1:4.7.3-1.2
Severity: minor

Hi,

The Xpilot server appears to ignore the +cannonsPickupItems switch.
The trivial patch (attached) seems to fix it.

Cheers,

Phil.

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-5-686 (SMP w/1 CPU core)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) (ignored: LC_ALL 
set to en_GB.UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages xpilot-ng-server depends on:
ii  adduser                 3.112            add and remove users and groups
ii  libc6                   2.11.2-5         Embedded GNU C Library: Shared lib
ii  libexpat1               2.0.1-7          XML parsing C library - runtime li
ii  zlib1g                  1:1.2.3.4.dfsg-3 compression library - runtime

xpilot-ng-server recommends no packages.

xpilot-ng-server suggests no packages.

-- no debconf information
diff -ur xpilot-ng-4.7.3.orig/src/server/cannon.c xpilot-ng-4.7.3.new/src/server/cannon.c
--- xpilot-ng-4.7.3.orig/src/server/cannon.c	2010-03-05 01:03:49.000000000 +0000
+++ xpilot-ng-4.7.3.new/src/server/cannon.c	2010-09-07 15:42:36.000000000 +0100
@@ -131,6 +131,7 @@
    fuel is given in 'units', but is stored in fuelpacks. */
 void Cannon_add_item(cannon_t *c, int item_type, int amount)
 {
+  if (options.cannonsPickupItems) {
     switch (item_type) {
     case ITEM_TANK:
 	c->item[ITEM_TANK] += amount;
@@ -147,6 +148,7 @@
 	LIMIT(c->item[item_type], 0, world->items[item_type].limit);
 	break;
     }
+  }
 }
 
 static inline int Cannon_get_initial_item(cannon_t *c, Item_t i)

Reply via email to