From: Côme Chilliet <come@chilliet.eu>
Date: Wed, 4 Jan 2017 17:34:32 +0000 (+0100)
Subject: Removed unused defines, changed method names case
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=a3f060d7e5508cd032c4f1c320033a74e5d84009;p=lugaru.git

Removed unused defines, changed method names case
---

diff --git a/Source/Objects/Weapons.cpp b/Source/Objects/Weapons.cpp
index 31ea8c1..1cd4cea 100644
--- a/Source/Objects/Weapons.cpp
+++ b/Source/Objects/Weapons.cpp
@@ -134,7 +134,7 @@ void Weapon::Load()
     staffmodel.CalculateNormals(1);
 }
 
-void Weapon::DoStuff(int i)
+void Weapon::doStuff(int i)
 {
     static int whichpatchx, whichpatchz, whichhit;
     static XYZ start, end, colpoint, normalrot, footvel, footpoint;
@@ -957,11 +957,11 @@ void Weapons::DoStuff()
     //Move
     int i = 0;
     for (std::vector<Weapon>::iterator weapon = begin(); weapon != end(); ++weapon) {
-        weapon->DoStuff(i++);
+        weapon->doStuff(i++);
     }
 }
 
-void Weapon::Draw()
+void Weapon::draw()
 {
     static XYZ terrainlight;
     static GLfloat M[16];
@@ -1140,7 +1140,7 @@ int Weapons::Draw()
     glDepthMask(1);
 
     for (std::vector<Weapon>::iterator weapon = begin(); weapon != end(); ++weapon) {
-        weapon->Draw();
+        weapon->draw();
     }
     return 0;
 }
diff --git a/Source/Objects/Weapons.hpp b/Source/Objects/Weapons.hpp
index 4b40eb6..de2f4d8 100644
--- a/Source/Objects/Weapons.hpp
+++ b/Source/Objects/Weapons.hpp
@@ -32,9 +32,6 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <cmath>
 
-#define max_weapons 30
-#define max_weaponinstances 20
-
 #define knife 1
 #define sword 2
 #define staff 3
@@ -46,8 +43,8 @@ public:
 
     static void Load();
 
-    void Draw();
-    void DoStuff(int);
+    void draw();
+    void doStuff(int);
 
     int getType() {
         return type;