[Pkg-allegro-commits] r53 - in atanks/trunk/debian: . patches
Mark Purcell
msp at alioth.debian.org
Sun Jan 21 20:45:59 CET 2007
Author: msp
Date: 2007-01-21 20:45:59 +0100 (Sun, 21 Jan 2007)
New Revision: 53
Removed:
atanks/trunk/debian/patches/00list
atanks/trunk/debian/patches/01_debian-patch.dpatch
Modified:
atanks/trunk/debian/changelog
atanks/trunk/debian/rules
atanks/trunk/debian/watch
Log:
* New upstream release
- Game crashes all the time (Closes: #324878)
- atanks bug fix: Ambiguous calls of abs(double) #318527 (Closes:
#376642)
Modified: atanks/trunk/debian/changelog
===================================================================
--- atanks/trunk/debian/changelog 2007-01-10 22:35:46 UTC (rev 52)
+++ atanks/trunk/debian/changelog 2007-01-21 19:45:59 UTC (rev 53)
@@ -1,10 +1,12 @@
-atanks (2.0~beta2-1) UNRELEASED; urgency=low
+atanks (2.0-1) unstable; urgency=low
- * (NOT RELEASED YET) New upstream release
+ * New upstream release
+ - Game crashes all the time (Closes: #324878)
+ - atanks bug fix: Ambiguous calls of abs(double) #318527 (Closes:
+ #376642)
* Update debian/watch
- * 01_debian.dpatch still needs work for this to compile
- -- Mark Purcell <msp at debian.org> Sun, 7 Jan 2007 21:03:10 +0000
+ -- Mark Purcell <msp at debian.org> Sun, 21 Jan 2007 19:25:12 +0000
atanks (1.1.0-6) unstable; urgency=low
Deleted: atanks/trunk/debian/patches/00list
===================================================================
--- atanks/trunk/debian/patches/00list 2007-01-10 22:35:46 UTC (rev 52)
+++ atanks/trunk/debian/patches/00list 2007-01-21 19:45:59 UTC (rev 53)
@@ -1 +0,0 @@
-01_debian-patch
Deleted: atanks/trunk/debian/patches/01_debian-patch.dpatch
===================================================================
--- atanks/trunk/debian/patches/01_debian-patch.dpatch 2007-01-10 22:35:46 UTC (rev 52)
+++ atanks/trunk/debian/patches/01_debian-patch.dpatch 2007-01-21 19:45:59 UTC (rev 53)
@@ -1,178 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_debian-patch.dpatch by <msp at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: New patch generated from atanks 1.1.0-6 diff.gz
-
- at DPATCH@
-
---- atanks-1.1.0.orig/src/atanks.cc
-+++ atanks-1.1.0/src/atanks.cc
-@@ -191,7 +191,7 @@
- }
- }
-
--int textEntryBox (GLOBALDATA *global, ENVIRONMENT *env, char modify, int x, int y, char *text, unsigned int textLength)
-+int textEntryBox (GLOBALDATA *global, ENVIRONMENT *env, int modify, int x, int y, char *text, unsigned int textLength)
- {
- int ke = 0;
- int fontWidth = text_length (font, "Z");
-@@ -2266,7 +2266,7 @@
- }
- }
-
--int setSlideColumnDimensions (GLOBALDATA *global, ENVIRONMENT *env, int x, char reset)
-+int setSlideColumnDimensions (GLOBALDATA *global, ENVIRONMENT *env, int x, bool reset)
- {
- int pixelHeight;
- char *done = env->done;
---- atanks-1.1.0.orig/src/beam.cc
-+++ atanks-1.1.0/src/beam.cc
-@@ -167,7 +167,7 @@
- if (targetX > ltank->x - TANKWIDTH - radius && targetX < ltank->x + TANKWIDTH + radius && targetY > ltank->y - radius && targetY < ltank->y + TANKHEIGHT + radius && ltank->l > 0) {
- //hitSomething = 1;
- ltank->requireUpdate ();
-- ltank->damage += damage * player->damageMultiplier;
-+ ltank->damage += damage * (player ? player->damageMultiplier : 1.0);
- ltank->creditTo = player;
- if (destroy)
- ltank->applyDamage ();
---- atanks-1.1.0.orig/src/environment.cc
-+++ atanks-1.1.0/src/environment.cc
-@@ -159,7 +159,7 @@
- combineUpdates = TRUE;
- }
-
--char ENVIRONMENT::isItemAvailable (int itemNum)
-+int ENVIRONMENT::isItemAvailable (int itemNum)
- {
- if (itemNum < WEAPONS) {
- if ((weapon[itemNum].warhead) ||
---- atanks-1.1.0.orig/src/explosion.cc
-+++ atanks-1.1.0/src/explosion.cc
-@@ -159,7 +159,7 @@
- }
- if (distance <= (radius + TANKHEIGHT/2) && tank->l > 0) {
- _global->updateMenu = 1;
-- tank->damage = (int) ((float) damage * ((float) 1 - ((fabs (distance) / (float)radius) / 2)) * player->damageMultiplier);
-+ tank->damage = (int) ((float) damage * ((float) 1 - ((fabs (distance) / (float)radius) / 2)) * (player ? player->damageMultiplier : 1.0));
-
- tank->creditTo = player;
- tank->applyDamage ();
---- atanks-1.1.0.orig/src/player.cc
-+++ atanks-1.1.0/src/player.cc
-@@ -613,7 +613,7 @@
- for (int count = 0; count < THINGS; count++) {
- int currItem = selectRandomItem ();
- int itemNum = currItem - WEAPONS;
-- char cumulative;
-+ int cumulative;
-
- //is item available for purchase or selected first item
- //first item is free
-@@ -714,7 +714,7 @@
- TANK *ltank;
- int hitSomething = 0;
- double distance;
-- char direction = (char)copysign (1, xv);
-+ int direction = (int)copysign (1, xv);
- double drag;
- int ticks = 0;
- int maxTicks = 500;
-@@ -1009,12 +1009,12 @@
- if (weapNum >= RIOT_CHARGE && weapNum <= RIOT_BLAST) {
- // add points only within range and above ctank
- if ( (cy > ctank->y - (radius / 2)) ||
-- (abs (ctank->x - cx) > radius))
-+ (fabs (ctank->x - cx) > radius))
- continue;
- } else if (weapNum >= SML_ROLLER && weapNum <= DTH_ROLLER) {
- // Only aim rollers above other tanks
- if (cy > tankY + TANKHEIGHT &&
-- abs (ctank->x - cx) > radius)
-+ fabs (ctank->x - cx) > radius)
- continue;
- } else if (weapNum >= SML_LAZER && weapNum <= LRG_LAZER) {
- // Lazer can only be aimed above horizontal
-@@ -1085,7 +1085,7 @@
- if (itemNum >= ITEM_VENGEANCE && itemNum <= ITEM_FATAL_FURY) {
- // add sqrt distances for each tank * potential damage
- long int totalEffectiveDamage = calcTotalEffectiveDamage (itemNum);
-- _targetMatrix[(int)ctank->x] += sqrt (abs (ctank->x - ltank->x)) * totalEffectiveDamage;
-+ _targetMatrix[(int)ctank->x] += sqrt (fabs (ctank->x - ltank->x)) * totalEffectiveDamage;
-
- }
- }
---- atanks-1.1.0.orig/src/virtobj.cc
-+++ atanks-1.1.0/src/virtobj.cc
-@@ -23,7 +23,7 @@
-
- void VIRTUAL_OBJECT::update ()
- {
-- char changed;
-+ int changed;
- if (!_requireUpdate)
- return;
-
---- atanks-1.1.0.orig/src/environment.h
-+++ atanks-1.1.0/src/environment.h
-@@ -83,7 +83,7 @@
- void initialise ();
- void setGlobaldata (GLOBALDATA *global) {_global = global;};
- void generateAvailableItemsList ();
-- char isItemAvailable (int itemNum);
-+ int isItemAvailable (int itemNum);
- int addObject (VIRTUAL_OBJECT *object);
- int removeObject (VIRTUAL_OBJECT *object);
- VIRTUAL_OBJECT *getNextOfClass (int classNum, int *index);
---- atanks-1.1.0.orig/src/main.h
-+++ atanks-1.1.0/src/main.h
-@@ -149,7 +149,7 @@
- int picpoint;
- int spread;
- int delay; // volleys etc.
-- char noimpact;
-+ int noimpact;
- int techLevel;
- char warhead; // Is it a warhead?
- int numSubmunitions;// Number of submunitions
-@@ -177,7 +177,7 @@
- char *description;
- int cost;
- int amt;
-- char selectable;
-+ int selectable;
- int techLevel;
- int sound;
- double vals[MAX_ITEMVALS];
-@@ -288,7 +288,7 @@
- class GLOBALDATA;
- class ENVIRONMENT;
- int drawFracture (GLOBALDATA *global, ENVIRONMENT *env, BITMAP *dest, BOX *updateArea, int x, int y, int angle, int width, int segmentLength, int maxRecurse, int recurseDepth);
--int setSlideColumnDimensions (GLOBALDATA *global, ENVIRONMENT *env, int x, char reset);
-+int setSlideColumnDimensions (GLOBALDATA *global, ENVIRONMENT *env, int x, bool reset);
- double Noise (int x);
- double Noise2D (int x, int y);
- double interpolate (double x1, double x2, double i);
---- atanks-1.1.0.orig/src/menu.h
-+++ atanks-1.1.0/src/menu.h
-@@ -36,7 +36,7 @@
- double defaultv;
- char **specialOpts;
- char type;
-- char viewonly;
-+ int viewonly;
- int x;
- int y;
- } MENUENTRY;
---- atanks-1.1.0.orig/src/Makefile
-+++ atanks-1.1.0/src/Makefile
-@@ -4,7 +4,7 @@
- globaldata.o environment.o player.o virtobj.o floattext.o teleport.o physobj.o decor.o explosion.o missile.o beam.o tank.o atanks.o fade.o perlin.o sky.o
-
- CC = g++
--FLAGS = -DLINUX -DVERSION=\"${VERSION}\" -DDATA_DIR=\".\"
-+FLAGS = -DLINUX -DVERSION=\"${VERSION}\" -DDATA_DIR=\"/usr/share/games/atanks\"
- OUTPUT = ../atanks
- WFLAGS =
- OFLAGS =
Modified: atanks/trunk/debian/rules
===================================================================
--- atanks/trunk/debian/rules 2007-01-10 22:35:46 UTC (rev 52)
+++ atanks/trunk/debian/rules 2007-01-21 19:45:59 UTC (rev 53)
@@ -11,7 +11,7 @@
build-stamp: patch
dh_testdir
- $(MAKE)
+ $(MAKE) -C src -f Makefile.debian
touch build-stamp
Modified: atanks/trunk/debian/watch
===================================================================
--- atanks/trunk/debian/watch 2007-01-10 22:35:46 UTC (rev 52)
+++ atanks/trunk/debian/watch 2007-01-21 19:45:59 UTC (rev 53)
@@ -1,3 +1,3 @@
version=3
opts=dversionmangle=s/~/-/
- http://sf.net/atanks/atanks-(.*)\.tar\.(?:gz|bz2) debian svn-upgrade
+ http://sf.net/atanks/atanks-([\d].[\d])\.tar\.(?:gz|bz2) debian svn-upgrade
More information about the Pkg-allegro-commits
mailing list