X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAnimation.cpp;h=b7e39952986e85f017ede4ec388b79852316f31e;hb=4f4771bb67958d2e9180ba24d422141b9069e363;hp=a01b9ead8cbcbf44071c82c006a7b6ca02657b0b;hpb=457bf24c8c59025657f24b62625145e72289177a;p=lugaru.git

diff --git a/Source/Animation.cpp b/Source/Animation.cpp
index a01b9ea..b7e3995 100644
--- a/Source/Animation.cpp
+++ b/Source/Animation.cpp
@@ -1,45 +1,41 @@
 /*
-Copyright (C) 2010 - Lugaru authors
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
-Lugaru is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+Lugaru is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+Lugaru is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "Skeleton.h"
 #include "Animation.h"
 
-struct animation_data_elt
-{
-  const char *filename;
-  int height;
-  int attack;
+struct animation_data_elt {
+    const std::string& filename;
+    int height;
+    int attack;
 };
 
 static animation_data_elt animation_data[animation_count] = {
-#define DECLARE_ANIM(id, file, height, attack) {file, height, attack},
+#define DECLARE_ANIM(id, file, height, attack, ...) {file, height, attack},
 #include "Animation.def"
 #undef DECLARE_ANIM
 };
 
 void loadAllAnimations()
 {
-  for (int i = 0; i < loadable_anim_end; i++)
-    {
-      animation_data_elt *e = animation_data + i;
-      animation[i].Load(e->filename, e->height, e->attack);
+    for (int i = 0; i < loadable_anim_end; i++) {
+        animation_data_elt *e = animation_data + i;
+        animation[i].Load(e->filename, e->height, e->attack);
     }
 }