X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=blobdiff_plain;f=Source%2FObjects%2FWeapons.cpp;h=1cd4cea3f93c21ed6f77eac182afbc06b9354226;hp=31ea8c16f4f76edcb3c8bb2948183ed14cb23baa;hb=a3f060d7e5508cd032c4f1c320033a74e5d84009;hpb=fa715e9d69feb1dd832365c31be2a95835d798fc 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::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::iterator weapon = begin(); weapon != end(); ++weapon) { - weapon->Draw(); + weapon->draw(); } return 0; }