Added .gitignore to ignore certain files + fixed access rights on Makefile* as

[quix0rs-blobwars.git] / src / CWeapon.cpp

diff --git a/src/CWeapon.cpp b/src/CWeapon.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 0fecc46..e0fc216
--- a/src/CWeapon.cpp
+++ b/src/CWeapon.cpp
@@ -1,5 +1,6 @@
 /*
-Copyright (C) 2004 Parallel Realities
+Copyright (C) 2004-2011 Parallel Realities
+Copyright (C) 2011-2015 Perpendicular Dimensions
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -22,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 Weapon::Weapon()
 {
-       strcpy(name, "");
+       name[0] = 0;
        id = 0;
        damage = 0;
        reload = 0;
@@ -34,10 +35,10 @@ Weapon::Weapon()
 
 void Weapon::setName(const char *name)
 {
-       strcpy(this->name, name);
+       strlcpy(this->name, name, sizeof this->name);
 }
 
-int Weapon::getSpeed(int face)
+int Weapon::getSpeed(int face) const
 {
        return (dx - ((dx * 2) * face));
 }