svn commit: r401572 - in head/games/wyrmgus: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Sat Nov 14 15:02:40 UTC 2015
Author: amdmi3
Date: Sat Nov 14 15:02:38 2015
New Revision: 401572
URL: https://svnweb.freebsd.org/changeset/ports/401572
Log:
- Update to 1.6.0
Added:
head/games/wyrmgus/files/
head/games/wyrmgus/files/patch-src_include_unittype.h (contents, props changed)
head/games/wyrmgus/files/patch-src_unit_unittype.cpp (contents, props changed)
head/games/wyrmgus/files/patch-src_unit_upgrade.cpp (contents, props changed)
Modified:
head/games/wyrmgus/Makefile
head/games/wyrmgus/distinfo
Modified: head/games/wyrmgus/Makefile
==============================================================================
--- head/games/wyrmgus/Makefile Sat Nov 14 14:45:10 2015 (r401571)
+++ head/games/wyrmgus/Makefile Sat Nov 14 15:02:38 2015 (r401572)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= wyrmgus
-PORTVERSION= 1.4.1
+PORTVERSION= 1.6.0
DISTVERSIONPREFIX= v
CATEGORIES= games devel
Modified: head/games/wyrmgus/distinfo
==============================================================================
--- head/games/wyrmgus/distinfo Sat Nov 14 14:45:10 2015 (r401571)
+++ head/games/wyrmgus/distinfo Sat Nov 14 15:02:38 2015 (r401572)
@@ -1,2 +1,2 @@
-SHA256 (Andrettin-Wyrmgus-v1.4.1_GH0.tar.gz) = bee4c96ddd74e6c3105d725c37dfb774a6be53465355c7b578824b28719b89dc
-SIZE (Andrettin-Wyrmgus-v1.4.1_GH0.tar.gz) = 1176777
+SHA256 (Andrettin-Wyrmgus-v1.6.0_GH0.tar.gz) = f8710d2a258e1f1fcf7a47d29c70add0654c7fbcab615d2418e0157a688289bf
+SIZE (Andrettin-Wyrmgus-v1.6.0_GH0.tar.gz) = 1184771
Added: head/games/wyrmgus/files/patch-src_include_unittype.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/wyrmgus/files/patch-src_include_unittype.h Sat Nov 14 15:02:38 2015 (r401572)
@@ -0,0 +1,23 @@
+--- src/include/unittype.h.orig 2015-11-10 20:52:37 UTC
++++ src/include/unittype.h
+@@ -59,6 +59,7 @@
+ #include <vector>
+ #include <algorithm>
+ #include <map>
++#include <cstring>
+
+ /*----------------------------------------------------------------------------
+ -- Declarations
+@@ -132,9 +133,9 @@ public:
+ FrameWidth(0), FrameHeight(0),
+ Animations(NULL), Construction(NULL), Sprite(NULL), ShadowSprite(NULL), LeftArmSprite(NULL), RightArmSprite(NULL), HairSprite(NULL), ClothingSprite(NULL), ClothingLeftArmSprite(NULL), ClothingRightArmSprite(NULL), PantsSprite(NULL), ShoesSprite(NULL), WeaponSprite(NULL), ShieldSprite(NULL), HelmetSprite(NULL)
+ {
+- memset(SpriteWhenLoaded, NULL, sizeof(SpriteWhenLoaded));
+- memset(SpriteWhenEmpty, NULL, sizeof(SpriteWhenEmpty));
+- memset(ShieldAnimation, NULL, sizeof(ShieldAnimation));
++ memset(SpriteWhenLoaded, 0, sizeof(SpriteWhenLoaded));
++ memset(SpriteWhenEmpty, 0, sizeof(SpriteWhenEmpty));
++ memset(ShieldAnimation, 0, sizeof(ShieldAnimation));
+ }
+
+ ~VariationInfo();
Added: head/games/wyrmgus/files/patch-src_unit_unittype.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/wyrmgus/files/patch-src_unit_unittype.cpp Sat Nov 14 15:02:38 2015 (r401572)
@@ -0,0 +1,18 @@
+--- src/unit/unittype.cpp.orig 2015-11-10 20:52:37 UTC
++++ src/unit/unittype.cpp
+@@ -761,13 +761,13 @@ CUnitType::CUnitType() :
+ //Wyrmgus end
+ memset(ResInfo, 0, sizeof(ResInfo));
+ //Wyrmgus start
+- memset(VarInfo, NULL, sizeof(VarInfo));
++ memset(VarInfo, 0, sizeof(VarInfo));
+ memset(Drops, 0, sizeof(Drops));
+ // memset(ImproveIncomes, 0, sizeof(ImproveIncomes));
+ //Wyrmgus end
+ memset(MissileOffsets, 0, sizeof(MissileOffsets));
+ //Wyrmgus start
+- memset(ShieldAnimation, NULL, sizeof(ShieldAnimation));
++ memset(ShieldAnimation, 0, sizeof(ShieldAnimation));
+ //Wyrmgus end
+ }
+
Added: head/games/wyrmgus/files/patch-src_unit_upgrade.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/wyrmgus/files/patch-src_unit_upgrade.cpp Sat Nov 14 15:02:38 2015 (r401572)
@@ -0,0 +1,20 @@
+--- src/unit/upgrade.cpp.orig 2015-11-10 20:52:37 UTC
++++ src/unit/upgrade.cpp
+@@ -298,7 +298,7 @@ static int CclDefineModifier(lua_State *
+ um->UpgradeId = UpgradeIdByIdent(upgrade_name);
+
+ if (um->UpgradeId == -1) {
+- LuaError(l, "Error when defining upgrade modifier: upgrade \"%s\" doesn't exist." _C_ upgrade_name);
++ LuaError(l, "Error when defining upgrade modifier: upgrade \"%s\" doesn't exist." _C_ upgrade_name.c_str());
+ }
+ //Wyrmgus end
+
+@@ -546,7 +546,7 @@ static int CclAcquireTrait(lua_State *l)
+ if (!strncmp(ident, "upgrade-", 8)) {
+ TraitAcquire(*unit, CUpgrade::Get(ident));
+ unit->Trait = ident;
+- } else if (ident == "") {
++ } else if (strlen(ident) == 0) {
+ if (!unit->Trait.empty()) { //remove previous trait, if any
+ if (!GameSettings.NoRandomness || unit->Type->BoolFlag[HERO_INDEX].value) { // if in no randomness setting, only change trait modifiers if the unit is a hero
+ IndividualUpgradeLost(*unit, CUpgrade::Get(unit->Trait));
More information about the svn-ports-all
mailing list