File fix-gcc-6.patch of Package scorched3d

Overview Repositories Revisions Requests Users Attributes Meta

File fix-gcc-6.patch of Package scorched3d

diff -Nur scorched/src/common/common/RollingAverage.cpp new/src/common/common/RollingAverage.cpp
--- scorched/src/common/common/RollingAverage.cpp	2014-08-01 18:47:31.000000000 +0200
+++ new/src/common/common/RollingAverage.cpp	2016-07-29 18:38:07.075394283 +0200
@@ -46,7 +46,7 @@
 
 void RollingAverage::addValue(fixed value)
 {
-	index_ = (++index_ % numberAverages_);
+	index_ = (++index_) % numberAverages_;
 
 	total_ -= averages_[index_];
 	averages_[index_] = value;
diff -Nur scorched/src/common/weapons/AccessoryStore.cpp new/src/common/weapons/AccessoryStore.cpp
--- scorched/src/common/weapons/AccessoryStore.cpp	2014-08-01 18:47:31.000000000 +0200
+++ new/src/common/weapons/AccessoryStore.cpp	2016-07-29 16:41:25.184316488 +0200
@@ -156,7 +156,7 @@
 	Accessory *parent, XMLNode *currentNode)
 {
 	XMLNode *typeNode = 0;
-	if (!currentNode->getNamedParameter("type", typeNode)) return false;
+	if (!currentNode->getNamedParameter("type", typeNode)) return NULL;
 
 	AccessoryPart *accessoryPart = 
 		AccessoryMetaRegistration::getNewAccessory(typeNode->getContent(), this);
@@ -165,7 +165,7 @@
 		S3D::dialogMessage("AccessoryStore", S3D::formatStringBuffer(
 						"Failed to find accessory part type \"%s\"",
 						typeNode->getContent()));
-		return 0;
+		return NULL;
 	}
 	// Set the parent accessory
 	accessoryPart->setParent(parent);

Places

File fix-gcc-6.patch of Package scorched3d

Places