Removed unused defines, changed method names case

diff --git a/Source/Objects/Weapons.cpp b/Source/Objects/Weapons.cpp
index 31ea8c16f4f76edcb3c8bb2948183ed14cb23baa..1cd4cea3f93c21ed6f77eac182afbc06b9354226 100644 (file)
--- a/Source/Objects/Weapons.cpp
+++ b/Source/Objects/Weapons.cpp
@@ -134,7 +134,7 @@ void Weapon::Load()
     staffmodel.CalculateNormals(1);
 }
 
     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;
 {
     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) {
     //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];
 {
     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) {
     glDepthMask(1);
 
     for (std::vector<Weapon>::iterator weapon = begin(); weapon != end(); ++weapon) {

-        weapon->Draw();
+        weapon->draw();

     }
     return 0;
 }
     }
     return 0;
 }

diff --git a/Source/Objects/Weapons.hpp b/Source/Objects/Weapons.hpp
index 4b40eb6e6baf29fb964d00f2a0ab5348a531a72c..de2f4d81829f81ff039a224fb755cc089369f988 100644 (file)
--- 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>
 
 
 #include <cmath>
 

-#define max_weapons 30
-#define max_weaponinstances 20
-

 #define knife 1
 #define sword 2
 #define staff 3
 #define knife 1
 #define sword 2
 #define staff 3


@@ -46,8 +43,8 @@ public:
 
     static void Load();
 
 
     static void Load();
 

-    void Draw();
-    void DoStuff(int);
+    void draw();
+    void doStuff(int);

 
     int getType() {
         return type;
 
     int getType() {
         return type;