Removed unused hairstyle frames and applied patch by Rogier Polak to solve the

problem with an OpenGL related redefinition.

1 files changed, 23 insertions, 48 deletions

diff --git a/ChangeLog b/ChangeLog
index b5e17fb7..188bab14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-25  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* data/graphics/sprites/hairstyle*.png,
+	data/graphics/sprites/hairstyle*.xml, tools/Reorganize.java: Removed
+	unused frames from the hairsets.
+	* src/resources/image.h: Defined NO_SDL_GLEXT to prevent a
+	redefinition when gl.h also tries to define OpenGL extensions (patch
+	accepted from Rogier Polak).
+
 2006-09-23  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
 	* data/maps/new_5-1.tmx.gz: Accepted new version by Matt Howe, fixing
@@ -13,63 +22,29 @@
 
 	* src/animation.cpp, src/animation.h, src/animatedsprite.cpp,
 	src/animatedsprite.h: Removed some obsolete code and implemented
-	the posibility to define an <end /> token in the <animation>s 
+	the posibility to define an <end /> token in the <animation>s
 	that allows to define an animation that doesn't loop and returns
 	to the STAND animation when finished.
-	* data/graphics/sprites/hairstyle1.xml,
-	data/graphics/sprites/hairstyle2.xml,
-	data/graphics/sprites/hairstyle3.xml,
-	data/graphics/sprites/hairstyle4.xml,
-	data/graphics/sprites/hairstyle5.xml,
-	data/graphics/sprites/hairstyle6.xml,
-	data/graphics/sprites/hairstyle7.xml,
-	data/graphics/sprites/item001.xml,
-	data/graphics/sprites/item002.xml,
-	data/graphics/sprites/item003.xml,
-	data/graphics/sprites/item004.xml,
-	data/graphics/sprites/item005.xml,
-	data/graphics/sprites/item006.xml,
-	data/graphics/sprites/item007.xml,
-	data/graphics/sprites/item008.xml,
-	data/graphics/sprites/item009.xml,
-	data/graphics/sprites/item010.xml,
-	data/graphics/sprites/monster0.xml,
-	data/graphics/sprites/monster1.xml,
-	data/graphics/sprites/monster2.xml,
-	data/graphics/sprites/monster3.xml,
-	data/graphics/sprites/monster4.xml,
-	data/graphics/sprites/monster5.xml,
-	data/graphics/sprites/monster6.xml,
-	data/graphics/sprites/monster7.xml,
-	data/graphics/sprites/monster8.xml,
-	data/graphics/sprites/monster9.xml,
-	data/graphics/sprites/monster10.xml,
-	data/graphics/sprites/monster11.xml,
-	data/graphics/sprites/monster12.xml,
-	data/graphics/sprites/monster13.xml,
-	data/graphics/sprites/monster14.xml,
-	data/graphics/sprites/monster15.xml,
-	data/graphics/sprites/monster16.xml,
-	data/graphics/sprites/monster17.xml,
-	data/graphics/sprites/monster18.xml,
-	data/graphics/sprites/monster19.xml,
-	data/graphics/sprites/weapons.xml:
-	Used the <end /> token for all attack animations fixing the problem
-	with looping monster attack animations.
+	* data/graphics/sprites/hairstyle*.xml,
+	data/graphics/sprites/item0*.xml,
+	data/graphics/sprites/monster*.xml,
+	data/graphics/sprites/weapons.xml: Used the <end /> token for all
+	attack animations fixing the problem with looping monster attack
+	animations.
 
 2006-09-20  Philipp Sehmisch  <tmw@crushnet.org>
 
-	* data/graphics/items/generic-whitefur.png, 
-	data/graphics/items/generic-cavesnakelamp.png, 
-	data/graphics/items/generic-hardspike.png, 
+	* data/graphics/items/generic-whitefur.png,
+	data/graphics/items/generic-cavesnakelamp.png,
+	data/graphics/items/generic-hardspike.png,
 	data/graphics/items/generic-pinkantennae.png,
-	data/graphics/items/Makefile.am, data/items.xml:
-	Added drops for new monsters.
+	data/graphics/items/Makefile.am, data/items.xml: Added drops for new
+	monsters.
 	* src/gui/setup.cpp, src/gui/setup_video.cpp,
 	src/gui/setup_video.h: Added a slider for controlling the overlay
 	detail to the video setup dialog based on a patch by VictorSan.
-	* data/maps/new_14-1.tmx.gz, data/maps/new_16-1.tmx.gz:
-	Added cloud effect and minimap.
+	* data/maps/new_14-1.tmx.gz, data/maps/new_16-1.tmx.gz: Added cloud
+	effect and minimap.
 	* data/images/Makefile.am: Updated makefile.
 
 2006-09-19  Bjørn Lindeijer  <bjorn@lindeijer.nl>