1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
From: =?utf-8?q?Bernhard_=C3=9Cbelacker?= <bernhardu@mailbox.org>
Date: Tue, 28 May 2019 10:30:01 +0200
Subject: Avoid crash because of missing return statement.
warning: no return statement in function returning non-void [-Wreturn-type]
warning: control reaches end of non-void function [-Wreturn-type]
Debian-Bug: https://bugs.debian.org/929513
---
include/Specials/NoSpecial.hpp | 2 +-
include/Weapons/NoWeapon.hpp | 6 +++---
src/Interface/Tab.cpp | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/Specials/NoSpecial.hpp b/include/Specials/NoSpecial.hpp
index 4c1c8d3..67c3fa4 100644
--- a/include/Specials/NoSpecial.hpp
+++ b/include/Specials/NoSpecial.hpp
@@ -32,7 +32,7 @@ class NoSpecial: public Special {
/// Does nothing.
void activate() const {}
- float radius() const {}
+ float radius() const { return 0.; }
/// Draws the special.
void draw(float alpha) const;
diff --git a/include/Weapons/NoWeapon.hpp b/include/Weapons/NoWeapon.hpp
index e739851..38c8b2c 100644
--- a/include/Weapons/NoWeapon.hpp
+++ b/include/Weapons/NoWeapon.hpp
@@ -35,13 +35,13 @@ class NoWeapon: public Weapon {
void draw(float alpha) const {}
/// Returns the maximum distance from which this weapon should be used.
- float maxDistance() const {}
+ float maxDistance() const { return 0.; }
/// Returns the minimum distance from which this weapon should be used.
- float minDistance() const {}
+ float minDistance() const { return 0.; }
/// Returns the maximum angle from which this weapon should be used.
- float maxAngle() const {}
+ float maxAngle() const { return 0.; }
};
# endif // NOWEAPON_HPP_INCLUDED
diff --git a/src/Interface/Tab.cpp b/src/Interface/Tab.cpp
index 19a7e26..e0dd57e 100644
--- a/src/Interface/Tab.cpp
+++ b/src/Interface/Tab.cpp
@@ -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;
}
|
