Packman Build Service PMBS

File openspades.patch of Package openspades (Revision 7)

Currently displaying revision 7 , Show latest

--- a/Resources/Unix/Debian/copyright.in
+++ b/Resources/Unix/Debian/copyright.in
@@ -4,7 +4,7 @@ Upstream-Contact: yvt <i@yvt.jp>
 Source: https://github.com/yvt/openspades
 
 Files: *
-Copyright: Copyright 2013-${CMAKE_CURRENT_YEAR} yvt <i@yvt.jp>
+Copyright: Copyright 2013 yvt <i@yvt.jp>
 License: GPL-3
  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
--- a/Sources/Client/Player.cpp
+++ b/Sources/Client/Player.cpp
@@ -1374,6 +1374,7 @@ namespace spades {
 				case ToolSpade: return true;
 				case ToolWeapon: return weapon->IsReadyToShoot();
 			}
+			return false;
 		}
 
 		bool Player::IsToolSelectable(ToolType type) {
@@ -1385,6 +1386,7 @@ namespace spades {
 				case ToolGrenade: return grenades > 0;
 				default: SPAssert(false);
 			}
+			return false;
 		}
 
 		bool Player::OverlapsWith(const spades::AABB3 &aabb) {
--- a/Sources/Core/CpuID.cpp
+++ b/Sources/Core/CpuID.cpp
@@ -76,6 +76,7 @@ namespace spades {
 			case CpuFeature::AVX512F: return subfeature & (1U << 16);
 			case CpuFeature::SimultaneousMT: return featureEdx & (1U << 28);
 		}
+		return false;
 	}
 
 #endif
--- a/Sources/Gui/SDLGLDevice.cpp
+++ b/Sources/Gui/SDLGLDevice.cpp
@@ -1476,12 +1476,14 @@ namespace spades {
 
 		IGLDevice::UInteger SDLGLDevice::CreateProgram() {
 #if GLEW
+			IGLDevice::UInteger r = 0;
 			if (glCreateProgram)
 				return glCreateProgram();
 			else if (glCreateProgramObjectARB)
 				return glCreateProgramObjectARB();
 			else
 				ReportMissingFunc("glCreateProgram");
+			return r;
 #else
 			CheckExistence(glCreateProgram);
 			return glCreateProgram();
@@ -1581,12 +1583,16 @@ namespace spades {
 
 		IGLDevice::Integer SDLGLDevice::GetAttribLocation(UInteger program, const char *name) {
 #if GLEW
+			IGLDevice::UInteger r = 0;
+
 			if (glGetAttribLocation)
 				return glGetAttribLocation(program, name);
 			else if (glGetAttribLocationARB)
 				return glGetAttribLocationARB(program, name);
 			else
 				ReportMissingFunc("glGetAttribLocation");
+
+			return r;
 #else
 			CheckExistence(glGetAttribLocation);
 			return glGetAttribLocation(program, name);
@@ -1610,12 +1616,16 @@ namespace spades {
 
 		IGLDevice::Integer SDLGLDevice::GetUniformLocation(UInteger program, const char *name) {
 #if GLEW
+			IGLDevice::UInteger r = 0;
+
 			if (glGetUniformLocation)
 				return glGetUniformLocation(program, name);
 			else if (glGetUniformLocationARB)
 				return glGetUniformLocationARB(program, name);
 			else
 				ReportMissingFunc("glGetUniformLocation");
+
+			return r;
 #else
 			CheckExistence(glGetUniformLocation);
 			return glGetUniformLocation(program, name);
@@ -1751,6 +1761,8 @@ namespace spades {
 		}
 
 		GLenum SDLGLDevice::parseFramebufferTarget(Enum v) {
+			GLenum r = 0;
+
 			SPADES_MARK_FUNCTION_DEBUG();
 			switch (v) {
 				case draw::IGLDevice::Framebuffer: return GL_FRAMEBUFFER;
@@ -1758,6 +1770,7 @@ namespace spades {
 				case draw::IGLDevice::DrawFramebuffer: return GL_DRAW_FRAMEBUFFER;
 				default: SPInvalidEnum("v", v);
 			}
+			return r;
 		}
 
 		IGLDevice::UInteger SDLGLDevice::GenFramebuffer() {