Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

working on stuff

  • Loading branch information...
commit dafb84e852ab2da07c492dafc7c4052ba716b941 1 parent 5d99da8
fluffymormegil authored November 26, 2009
7  README
... ...
@@ -1,4 +1,9 @@
1  
-Top-level directory structure:
  1
+Advice to would-be committers
  2
+=============================
  3
+1) This is a BSD-licensed project.
  4
+
  5
+Top-level directory structure
  6
+=============================
2 7
 
3 8
 audio/
4 9
     does not exist yet; will eventually contain Csound scores and orchestras
4  src/player.hh
@@ -65,6 +65,10 @@ struct Player {
65 65
     Obj_handle ring;		/* For now, you can only wear one magic ring. */
66 66
     bool farmoving;
67 67
     libmrl::Coord farmove_direction;
  68
+    // Persistent effect handling
  69
+    std::list<Perseff_data> perseffs;
  70
+    Status_flags status;
  71
+    // computed-value functions
68 72
     int net_body() const { return body - bdam; }
69 73
     int net_agility() const { return agility - adam; }
70 74
 };
6  src/u.cc
@@ -51,14 +51,14 @@ void recalc_defence(void)
51 51
     {
52 52
 	u.resistances[i] &= RESIST_MASK_TEMPORARY;
53 53
     }
54  
-    u.speed = (u.leadfoot ? SPEED_SLOW : SPEED_NORMAL);
55  
-    int defshift = !!u.leadfoot + !!u.withering;
  54
+    u.speed = (u.status.test_flag(Malus_withered)) ? SPEED_SLOW : SPEED_NORMAL;
  55
+    int defshift = !!u.status.test_flag(Malus_leadfooted) + !!u.status.test_flag(Malus_withered);
56 56
     u.defence = u.net_agility() / 5;
57 57
     u.defence >>= defshift;
58 58
     u.evasion = u.net_agility();
59 59
     if (armptr)
60 60
     {
61  
-	u.defence += u.armourmelt ? 0 : permobjs[armptr->obj_id].power;
  61
+	u.defence += u.status.test_flag(Malus_armourmelted) ? 0 : permobjs[armptr->obj_id].power;
62 62
         u.evasion *= EVASION_PRESCALE - evasion_penalty(u.armour);
63 63
 	switch (armptr->obj_id)
64 64
 	{

0 notes on commit dafb84e

Please sign in to comment.
Something went wrong with that request. Please try again.