OSDN Git Service

Refer to a struct's member at offset by atoffset macro
authorhabu <habu@0568b783-4c39-0410-ac80-bf13821ea2a2>
Sat, 9 Mar 2013 03:02:55 +0000 (03:02 +0000)
committerhabu <habu@0568b783-4c39-0410-ac80-bf13821ea2a2>
Sat, 9 Mar 2013 03:02:55 +0000 (03:02 +0000)
src/cmd1.c

index 12c558f..d32dd7e 100644 (file)
@@ -251,11 +251,11 @@ static int mult_slaying(int mult, const u32b* flgs, const monster_type* m_ptr)
                const struct slay_table_t* p = &slay_table[i];
 
                if ((have_flag(flgs, p->slay_flag)) &&
-                   (*(u32b*)(((char*)r_ptr) + p->flag_offset) & p->affect_race_flag))
+                   (atoffset(u32b, r_ptr, p->flag_offset) & p->affect_race_flag))
                {
                        if (is_original_ap_and_seen(m_ptr))
                        {
-                               *(u32b*)(((char*)r_ptr) + p->r_flag_offset) |= p->affect_race_flag;
+                               atoffset(u32b, r_ptr, p->r_flag_offset) |= p->affect_race_flag;
                        }
 
                        mult = MAX(mult, p->slay_mult);