--- marsshooter/include/Specials/NoSpecial.hpp.orig 2014-05-07 17:32:52.000000000 +0600
+++ marsshooter/include/Specials/NoSpecial.hpp 2020-03-20 19:45:57.216497327 +0600
@@ -1,45 +1,45 @@
-/* NoSpecial.hpp
-
-Copyright (c) 2010 - 2011 by Felix Lauer and Simon Schneegans
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the Free
-Software Foundation, either version 3 of the License, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-more details.
-
-You should have received a copy of the GNU General Public License along with
-this program. If not, see . */
-
+/* NoSpecial.hpp
+
+Copyright (c) 2010 - 2011 by Felix Lauer and Simon Schneegans
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation, either version 3 of the License, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+more details.
+
+You should have received a copy of the GNU General Public License along with
+this program. If not, see . */
+
# ifndef NOSPECIAL_HPP_INCLUDED
# define NOSPECIAL_HPP_INCLUDED
-# include "Specials/Special.hpp"
-
-/// Special: NoSpecial.
-/// Nothing at all...
-
-class NoSpecial: public Special {
- public:
- /// Ctor which constructs the special.
- NoSpecial(Ship* parent):
- Special(specials::sNoSpecial, parent, sf::String("Nothing")) {};
-
- /// Does nothing.
- void activate() const {}
-
- float radius() const {}
-
- /// Draws the special.
- void draw(float alpha) const;
+# include "Specials/Special.hpp"
+
+/// Special: NoSpecial.
+/// Nothing at all...
+
+class NoSpecial: public Special {
+ public:
+ /// Ctor which constructs the special.
+ NoSpecial(Ship* parent):
+ Special(specials::sNoSpecial, parent, sf::String("Nothing")) {};
+
+ /// Does nothing.
+ void activate() const {}
+
+ float radius() const { return .0F; }
+
+ /// Draws the special.
+ void draw(float alpha) const;
};
# endif // NOSPECIAL_HPP_INCLUDED
-
-
-
-
+
+
+
+
--- marsshooter/include/Weapons/NoWeapon.hpp.orig 2014-05-07 17:32:52.000000000 +0600
+++ marsshooter/include/Weapons/NoWeapon.hpp 2020-03-20 19:46:39.677948161 +0600
@@ -1,50 +1,50 @@
-/* NoWeapon.hpp
-
-Copyright (c) 2010 - 2011 by Felix Lauer and Simon Schneegans
-
-This program is free software: you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the Free
-Software Foundation, either version 3 of the License, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-more details.
-
-You should have received a copy of the GNU General Public License along with
-this program. If not, see . */
-
+/* NoWeapon.hpp
+
+Copyright (c) 2010 - 2011 by Felix Lauer and Simon Schneegans
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the Free
+Software Foundation, either version 3 of the License, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+more details.
+
+You should have received a copy of the GNU General Public License along with
+this program. If not, see . */
+
# ifndef NOWEAPON_HPP_INCLUDED
# define NOWEAPON_HPP_INCLUDED
-# include "Weapons/Weapon.hpp"
-
-/// Weapon: NoWeapon.
-
-class NoWeapon: public Weapon {
- public:
- /// Ctor which constructs the weapon.
- NoWeapon(Ship* parent):
- Weapon(weapons::wNoWeapon, parent, sf::String("Nothing")) {};
-
- /// Does nothing.
- void fire() const {}
-
- /// Does nothing.
- void draw(float alpha) const {}
-
- /// Returns the maximum distance from which this weapon should be used.
- float maxDistance() const {}
-
- /// Returns the minimum distance from which this weapon should be used.
- float minDistance() const {}
-
- /// Returns the maximum angle from which this weapon should be used.
- float maxAngle() const {}
+# include "Weapons/Weapon.hpp"
+
+/// Weapon: NoWeapon.
+
+class NoWeapon: public Weapon {
+ public:
+ /// Ctor which constructs the weapon.
+ NoWeapon(Ship* parent):
+ Weapon(weapons::wNoWeapon, parent, sf::String("Nothing")) {};
+
+ /// Does nothing.
+ void fire() const {}
+
+ /// Does nothing.
+ void draw(float alpha) const {}
+
+ /// Returns the maximum distance from which this weapon should be used.
+ float maxDistance() const { return .0F; }
+
+ /// Returns the minimum distance from which this weapon should be used.
+ float minDistance() const { return .0F; }
+
+ /// Returns the maximum angle from which this weapon should be used.
+ float maxAngle() const { return .0F; }
};
# endif // NOWEAPON_HPP_INCLUDED
-
-
-
+
+
+
--- marsshooter/src/Interface/Tab.cpp.orig 2014-05-07 17:32:52.000000000 +0600
+++ marsshooter/src/Interface/Tab.cpp 2020-03-20 19:47:28.682314383 +0600
@@ -110,6 +110,7 @@ bool Tab::tabNext() {
return true;
}
}
+ return false;
}
bool Tab::tabPrevious() {
@@ -140,6 +141,7 @@ bool Tab::tabPrevious() {
return true;
}
}
+ return false;
}