[ 1184039 ] passwall and pits don't quite mesh

[likeyou dontknow]

This patch would make it such that when falling into a pit with passwall you still fall into the pit as normal (you already take damage from falling in, seems you should be able to pick things up). When getting out of the pit, it has a simular setting to that of if you have flying. Where you will be able to get out of the trap the first turn, but you are just at the top of it, not on the direction that you moved. If you should be in the direction that you moved, I'll see what I can do to make it that way instead.

--- slashem-0.0.8E0F1/src/hack.c        2006-12-30 05:04:53.000000000 -0800
+++ ../slashem/slashem-0.0.8E0F1/src/hack.c     2007-04-23 13:35:19.000000000 -0700
@@ -1528,6 +1528,9 @@
                        u.utrap = 0;
                        fill_pit(u.ux, u.uy);
                        vision_full_recalc = 1; /* vision limits change */
+                   } else if (Passes_walls) {
+                       You("phase through the wall and out of the pit.");
+                       u.utrap = 0;
                    } else if (!(--u.utrap)) {
                        You("%s to the edge of the pit.",
                                (In_sokoban(&u.uz) && Levitation) ?



--- slashem-0.0.8E0F1/src/trap.c        2006-12-30 05:04:53.000000000 -0800
+++ ../slashem/slashem-0.0.8E0F1/src/trap.c     2007-04-23 13:58:04.000000000 -0700
@@ -933,8 +933,7 @@
 #endif
                    You("land %s!", predicament);
                }
-               if (!Passes_walls)
-                   u.utrap = rn1(6,2);
+               u.utrap = rn1(6,2);
                u.utraptype = TT_PIT;
 #ifdef STEED
                if (!steedintrap(trap, (struct obj *)0)) {



Cheers,
Michael

---

Ahhh...imagining that irresistible "new car" smell?
Check out new cars at Yahoo! Autos.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Slashem-devel mailing list
Slashem-devel@...
https://lists.sourceforge.net/lists/listinfo/slashem-devel

[J. Ali Harlow-2]

On 2007-04-23 10:17:27 PM, likeyou dontknow wrote:
> This patch would make it such that when falling into a pit with
> passwall you still fall into the pit as normal (you already take
> damage from falling in, seems you should be able to pick things up).
> When getting out of the pit, it has a simular setting to that of if
> you have flying. Where you will be able to get out of the trap the
> first turn, but you are just at the top of it, not on the direction
> that you moved. If you should be in the direction that you moved,  
> I'll see what I can do to make it that way instead.

Thanks for the patch. I'm hesitant to take fixes for bugs that we know  
the vanilla dev-team already have a fix in place for, however[1]. It  
makes for more work when we next merge with them. A compromise might be  
to accept the patch for 0.0.7 only and leave 0.0.8 to pick up the  
vanilla fix in due course.

Cheers,

Ali.

[1] It's debatable whether 1184039 is just another dup of C343-17, but  
even if its not, the fix for C343-17 will affect what, if any,  
additional fix is needed.

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Slashem-devel mailing list
Slashem-devel@...
https://lists.sourceforge.net/lists/listinfo/slashem-devel