From b85a324793cc9baffb282e03a2f9b90e70255e61 Mon Sep 17 00:00:00 2001
From: wardje <wardje@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Fri, 23 Mar 2012 16:28:00 +0000
Subject: [PATCH] Fix #597.

Also change the #define in kart_animation.hpp's header in accordance
with coding style and the name change in r11012.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11013 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/Makefile.am              | 4 ++--
 src/karts/kart_animation.hpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 085003166..76dda89a5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -221,8 +221,8 @@ supertuxkart_SOURCES = \
  karts/controller/new_ai_controller.hpp \
  karts/controller/player_controller.cpp \
  karts/controller/player_controller.hpp \
- karts/emergency_animation.cpp \
- karts/emergency_animation.hpp \
+ karts/kart_animation.cpp \
+ karts/kart_animation.hpp \
  karts/ghost_kart.cpp \
  karts/ghost_lart.hpp \
  karts/kart.cpp \
diff --git a/src/karts/kart_animation.hpp b/src/karts/kart_animation.hpp
index 95ef5c777..5aa8f761c 100644
--- a/src/karts/kart_animation.hpp
+++ b/src/karts/kart_animation.hpp
@@ -16,8 +16,8 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_EMERGENCY_ANIMATION_HPP
-#define HEADER_EMERGENCY_ANIMATION_HPP
+#ifndef HEADER_KART_ANIMATION_HPP
+#define HEADER_KART_ANIMATION_HPP
 
 #include "utils/no_copy.hpp"
 #include "utils/vec3.hpp"