Sync with latest Qt update.

This commit is contained in:
Jordan K. Hubbard 1997-10-29 06:47:00 +00:00
parent 2162d62650
commit c7b4a5cbf8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=8385
18 changed files with 279 additions and 0 deletions

View file

@ -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))

View file

@ -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;

View file

@ -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 } };

View file

@ -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 &&

View file

@ -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;

View file

@ -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

View file

@ -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))

View file

@ -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;

View file

@ -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 } };

View file

@ -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 &&

View file

@ -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;

View file

@ -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

View file

@ -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))

View file

@ -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;

View file

@ -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 } };

View file

@ -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 &&

View file

@ -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;

View file

@ -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