X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects%2FWeapons.hpp;h=e12b11e31e3ffe51179120963ce624606cccbefb;hb=6a8cb464330e92163c8feaf101b8b5837c973bba;hp=4b40eb6e6baf29fb964d00f2a0ab5348a531a72c;hpb=fa715e9d69feb1dd832365c31be2a95835d798fc;p=lugaru.git
diff --git a/Source/Objects/Weapons.hpp b/Source/Objects/Weapons.hpp
index 4b40eb6..e12b11e 100644
--- a/Source/Objects/Weapons.hpp
+++ b/Source/Objects/Weapons.hpp
@@ -1,6 +1,6 @@
/*
Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file)
This file is part of Lugaru.
@@ -23,18 +23,15 @@ along with Lugaru. If not, see .
#include "Animation/Skeleton.hpp"
#include "Environment/Terrain.hpp"
-#include "Graphic/gamegl.hpp"
#include "Graphic/Models.hpp"
#include "Graphic/Sprite.hpp"
#include "Graphic/Texture.hpp"
+#include "Graphic/gamegl.hpp"
#include "Math/XYZ.hpp"
#include "Objects/Person.hpp"
#include
-#define max_weapons 30
-#define max_weaponinstances 20
-
#define knife 1
#define sword 2
#define staff 3
@@ -46,10 +43,11 @@ public:
static void Load();
- void Draw();
- void DoStuff(int);
+ void draw();
+ void doStuff(int);
- int getType() {
+ int getType()
+ {
return type;
}
void setType(int);