Sync with latest Qt update.

6 files changed, 93 insertions, 0 deletions

diff --git a/games/nethack33-qt/files/patch-ab b/games/nethack33-qt/files/patch-ab
new file mode 100644
index 000000000000..b609686e6166
--- /dev/null
+++ b/games/nethack33-qt/files/patch-ab
@@ -0,0 +1,11 @@
+--- ./include/youprop.h.orig	Tue Oct 28 22:32:04 1997
++++ ./include/youprop.h	Tue Oct 28 22:33:08 1997
+@@ -79,7 +79,7 @@
+ #define Protection		u.uprops[PROTECTION].p_flgs
+ #define Protection_from_shape_changers \
+ 				u.uprops[PROT_FROM_SHAPE_CHANGERS].p_flgs
+-#define Warning			u.uprops[WARNING].p_flgs
++#define HWarning		u.uprops[WARNING].p_flgs
+ 
+ #define HTelepat		u.uprops[TELEPAT].p_flgs
+ #define Telepat			(HTelepat || telepathic(uasmon))
diff --git a/games/nethack33-qt/files/patch-ac b/games/nethack33-qt/files/patch-ac
new file mode 100644
index 000000000000..d5ece267d3a6
--- /dev/null
+++ b/games/nethack33-qt/files/patch-ac
@@ -0,0 +1,13 @@
+--- ./src/artifact.c.orig	Tue Oct 28 22:30:56 1997
++++ ./src/artifact.c	Tue Oct 28 22:34:10 1997
+@@ -382,8 +382,8 @@
+ 	    else HTeleport_control &= ~wp_mask;
+ 	}
+ 	if (spfx & SPFX_WARN) {
+-	    if (on) Warning |= wp_mask;
+-	    else Warning &= ~wp_mask;
++	    if (on) HWarning |= wp_mask;
++	    else HWarning &= ~wp_mask;
+ 	}
+ 	if (spfx & SPFX_EREGEN) {
+ 	    if (on) Energy_regeneration |= wp_mask;
diff --git a/games/nethack33-qt/files/patch-ad b/games/nethack33-qt/files/patch-ad
new file mode 100644
index 000000000000..66ff78506faa
--- /dev/null
+++ b/games/nethack33-qt/files/patch-ad
@@ -0,0 +1,36 @@
+--- ./src/attrib.c.orig	Tue Oct 28 22:31:02 1997
++++ ./src/attrib.c	Tue Oct 28 22:34:18 1997
+@@ -44,7 +44,7 @@
+ 		     {	 0, 0, 0, 0 } },
+ 
+ 	c_abil[] = { {	 7, &(Fast), "quick", "slow" },
+-		     {	15, &(Warning), "sensitive", "" },
++		     {	15, &(HWarning), "sensitive", "" },
+ 		     {	 0, 0, 0, 0 } },
+ 
+ 	e_abil[] = { {   1, &(Fast), "", "" },
+@@ -54,13 +54,13 @@
+ 		     {	 0, 0, 0, 0 } },
+ 
+ 	h_abil[] = { {	 1, &(HPoison_resistance), "", "" },
+-		     {	15, &(Warning), "sensitive", "" },
++		     {	15, &(HWarning), "sensitive", "" },
+ 		     {	 0, 0, 0, 0 } },
+ 
+ 	k_abil[] = { {	 7, &(Fast), "quick", "slow" },
+ 		     {	 0, 0, 0, 0 } },
+ 
+-	p_abil[] = { {	15, &(Warning), "sensitive", "" },
++	p_abil[] = { {	15, &(HWarning), "sensitive", "" },
+ 		     {  20, &(HFire_resistance), "cool", "warmer" },
+ 		     {	 0, 0, 0, 0 } },
+ 
+@@ -81,7 +81,7 @@
+ 		     {   7, &(Fast), "quick", "slow" },
+ 		     {	 0, 0, 0, 0 } },
+ 
+-	w_abil[] = { {	15, &(Warning), "sensitive", "" },
++	w_abil[] = { {	15, &(HWarning), "sensitive", "" },
+ 		     {  17, &(HTeleport_control), "controlled","uncontrolled" },
+ 		     {	 0, 0, 0, 0 } };
+ 
diff --git a/games/nethack33-qt/files/patch-ae b/games/nethack33-qt/files/patch-ae
new file mode 100644
index 000000000000..a8adb09592b3
--- /dev/null
+++ b/games/nethack33-qt/files/patch-ae
@@ -0,0 +1,11 @@
+--- ./src/cmd.c.orig	Tue Oct 28 22:31:09 1997
++++ ./src/cmd.c	Tue Oct 28 22:34:21 1997
+@@ -643,7 +643,7 @@
+ 	if (Lifesaved)
+ 		enl_msg("Your life ", "will be", "would have been", " saved");
+ 	if (Adornment) you_are("adorned");
+-	if (Warning) you_are("warned");
++	if (HWarning) you_are("warned");
+ 	if (Protection) you_are("protected");
+ 	if (Reflecting) you_have("reflection");
+ 	if ((HLevitation & (I_SPECIAL|W_ARTI)) != 0L &&
diff --git a/games/nethack33-qt/files/patch-af b/games/nethack33-qt/files/patch-af
new file mode 100644
index 000000000000..d188f9810bd1
--- /dev/null
+++ b/games/nethack33-qt/files/patch-af
@@ -0,0 +1,11 @@
+--- ./src/mon.c.orig	Tue Oct 28 22:31:23 1997
++++ ./src/mon.c	Tue Oct 28 22:34:29 1997
+@@ -212,7 +212,7 @@
+ 
+ 	    lastwarntime = moves;
+ 	    lastwarnlev = warnlevel;
+-	    switch((int) (Warning & (LEFT_RING | RIGHT_RING))) {
++	    switch((int) (HWarning & (LEFT_RING | RIGHT_RING))) {
+ 	    case LEFT_RING:
+ 		rr = Hallucination ? "left mood ring glows" : "left ring glows";
+ 		break;
diff --git a/games/nethack33-qt/files/patch-ag b/games/nethack33-qt/files/patch-ag
new file mode 100644
index 000000000000..779ef4482a5b
--- /dev/null
+++ b/games/nethack33-qt/files/patch-ag
@@ -0,0 +1,11 @@
+--- ./src/monmove.c.orig	Tue Oct 28 22:31:30 1997
++++ ./src/monmove.c	Tue Oct 28 22:34:36 1997
+@@ -83,7 +83,7 @@
+ 	int rd = dochug(mtmp);
+ 	int dd;
+ 
+-	if(Warning && !rd && !mtmp->mpeaceful &&
++	if(HWarning && !rd && !mtmp->mpeaceful &&
+ 			(dd = distu(mtmp->mx,mtmp->my)) < distu(x,y) &&
+ 			dd < 100 && !canseemon(mtmp)) {
+ 	    /* Note: this assumes we only want to warn against the monster to