Changeset 928

Timestamp:

05/17/08 11:10:26 (5 months ago)

Author:

takkaria

Message:

• Fix issue with monster term not being updated correctly in case of learning new spell info.
  
• Fix store_maint() not being exported
  
• Stop using an unnecessary (char *) cast in loadsave.c
  

Files:

• trunk/src/defines.h (modified) (1 diff)
• trunk/src/dungeon.c (modified) (3 diffs)
• trunk/src/externs.h (modified) (1 diff)
• trunk/src/loadsave.c (modified) (1 diff)

trunk/src/defines.h

@@ -1376 +1376 @@
-
-#define race_flags_differ(A,B) (0 != memcmp((A), (B), sizeof(u32b)*RACE_FLAG_STRICT_UB))
+#define race_flags_differ_spell(A,B) (0 != memcmp((A), (B), sizeof(u32b)*RACE_FLAG_SPELL_STRICT_UB))
-#define race_flags_assign(A,B) memmove((A), (B), sizeof(u32b)*RACE_FLAG_STRICT_UB)
-#define race_flags_assign_spell(A, B) memmove((A), (B), sizeof(u32b)*RACE_FLAG_SPELL_STRICT_UB)

trunk/src/dungeon.c

@@ -978 +978 @@
-        static int old_monster_race_idx = 0;
-
-
+
+
-
-        static byte old_blows[MONSTER_BLOW_MAX];
@@ -1000 +1001 @@
-                        }
-                }
-
+
-                /* Check for change of any kind */
-                if (changed ||
-                    (old_monster_race_idx != p_ptr->monster_race_idx) ||
-                    race_flags_differ(old_flags, l_ptr->flags) ||
+                    race_flags_differ_spell(old_spell_flags, l_ptr->spell_flags) ||
-                    (old_cast_innate != l_ptr->cast_innate) ||
-                    (old_cast_spell != l_ptr->cast_spell))
@@ -1013 +1015 @@
-                        /* Memorize flags */
-                        race_flags_assign(old_flags, l_ptr->flags);
+                        race_flags_assign_spell(old_spell_flags, l_ptr->spell_flags);
-
-                        /* Memorize blows */

trunk/src/externs.h

@@ -564 +564 @@
-void store_init(void);
-void store_shuffle(int which);
+void store_maint(int which);
-bool store_overflow(void);
-void do_cmd_store(void);

trunk/src/loadsave.c

@@ -1285 +1285 @@
-
-        if (o_ptr->note)
-(char*)
+
-
-        return s;