From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Sun, 9 Dec 2012 14:33:14 +0000 (+0100)
Subject: Merge branch 'master' into feature-33-capsules
X-Git-Url: http://git.localhorst.tv/?a=commitdiff_plain;h=60e0fe29ce6cd033edc78b181d9d07fa72c11172;hp=-c;p=l2e.git

Merge branch 'master' into feature-33-capsules

I am a dork
---

60e0fe29ce6cd033edc78b181d9d07fa72c11172
diff --combined l2e.cbp
index 18f6b88,33396a0..64f428d
--- a/l2e.cbp
+++ b/l2e.cbp
@@@ -11,7 -11,7 +11,7 @@@
  				<Option object_output="obj\W32_Debug\" />
  				<Option type="1" />
  				<Option compiler="gcc" />
 -				<Option parameters="test-data/constants.l2s  test-data/ikaris.l2s  test-data/items.l2s  test-data/maps.l2s  test-data/spells.l2s  test-data/test.l2s" />
 +				<Option parameters="test-data/capsules.l2s  test-data/constants.l2s  test-data/ikaris.l2s  test-data/items.l2s  test-data/maps.l2s  test-data/spells.l2s  test-data/test.l2s" />
  				<Option projectLinkerOptionsRelation="2" />
  				<Compiler>
  					<Add option="-g" />
@@@ -30,7 -30,7 +30,7 @@@
  				<Option object_output="obj\W32\" />
  				<Option type="1" />
  				<Option compiler="gcc" />
 -				<Option parameters="test-data/constants.l2s  test-data/ikaris.l2s  test-data/items.l2s  test-data/maps.l2s  test-data/spells.l2s  test-data/test.l2s" />
 +				<Option parameters="test-data/capsules.l2s  test-data/constants.l2s  test-data/ikaris.l2s  test-data/items.l2s  test-data/maps.l2s  test-data/spells.l2s  test-data/test.l2s" />
  				<Option projectLinkerOptionsRelation="2" />
  				<Compiler>
  					<Add option="-O3" />
@@@ -68,8 -68,6 +68,8 @@@
  		<Unit filename="src\battle\AttackTypeMenu.h" />
  		<Unit filename="src\battle\BattleState.cpp" />
  		<Unit filename="src\battle\BattleState.h" />
 +		<Unit filename="src\battle\Capsule.cpp" />
 +		<Unit filename="src\battle\Capsule.h" />
  		<Unit filename="src\battle\Hero.cpp" />
  		<Unit filename="src\battle\Hero.h" />
  		<Unit filename="src\battle\HeroTag.cpp" />
@@@ -107,8 -105,6 +107,8 @@@
  		<Unit filename="src\battle\states\SelectTarget.h" />
  		<Unit filename="src\battle\states\SwapHeroes.cpp" />
  		<Unit filename="src\battle\states\SwapHeroes.h" />
 +		<Unit filename="src\common\Capsule.cpp" />
 +		<Unit filename="src\common\Capsule.h" />
  		<Unit filename="src\common\GameConfig.cpp" />
  		<Unit filename="src\common\GameConfig.h" />
  		<Unit filename="src\common\GameState.cpp" />
@@@ -156,6 -152,8 +156,8 @@@
  		<Unit filename="src\graphics\SimpleAnimation.h" />
  		<Unit filename="src\graphics\Sprite.cpp" />
  		<Unit filename="src\graphics\Sprite.h" />
+ 		<Unit filename="src\graphics\Texture.cpp" />
+ 		<Unit filename="src\graphics\Texture.h" />
  		<Unit filename="src\graphics\fwd.h" />
  		<Unit filename="src\loader\Caster.cpp" />
  		<Unit filename="src\loader\Caster.h" />
@@@ -190,21 -188,12 +192,20 @@@
  		<Unit filename="src\map\Trigger.cpp" />
  		<Unit filename="src\map\Trigger.h" />
  		<Unit filename="src\map\fwd.h" />
 +		<Unit filename="src\menu\CapsuleChangeMenu.cpp" />
 +		<Unit filename="src\menu\CapsuleChangeMenu.h" />
 +		<Unit filename="src\menu\CapsuleFeedMenu.cpp" />
 +		<Unit filename="src\menu\CapsuleFeedMenu.h" />
 +		<Unit filename="src\menu\CapsuleNameMenu.cpp" />
 +		<Unit filename="src\menu\CapsuleNameMenu.h" />
 +		<Unit filename="src\menu\CapsuleMenu.cpp" />
 +		<Unit filename="src\menu\CapsuleMenu.h" />
  		<Unit filename="src\menu\ChangeHero.cpp" />
  		<Unit filename="src\menu\ChangeHero.h" />
  		<Unit filename="src\menu\ConfigMenu.cpp" />
  		<Unit filename="src\menu\ConfigMenu.h" />
  		<Unit filename="src\menu\EquipMenu.cpp" />
  		<Unit filename="src\menu\EquipMenu.h" />
- 		<Unit filename="src\menu\fwd.h" />
  		<Unit filename="src\menu\HeroStatus.cpp" />
  		<Unit filename="src\menu\HeroStatus.h" />
  		<Unit filename="src\menu\InventoryMenu.cpp" />
@@@ -221,6 -210,7 +222,7 @@@
  		<Unit filename="src\menu\SpellMenu.h" />
  		<Unit filename="src\menu\StatusMenu.cpp" />
  		<Unit filename="src\menu\StatusMenu.h" />
+ 		<Unit filename="src\menu\fwd.h" />
  		<Unit filename="src\sdl\InitImage.cpp" />
  		<Unit filename="src\sdl\InitImage.h" />
  		<Unit filename="src\sdl\InitSDL.cpp" />