From 87218e07b2bc89593eae1cb4abe859cd1a7eaa0f Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 23 May 2013 15:14:29 -0700 Subject: Make block_list a base class --- src/map/magic-interpreter.hpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/map/magic-interpreter.hpp') diff --git a/src/map/magic-interpreter.hpp b/src/map/magic-interpreter.hpp index 22223ec..5d3d389 100644 --- a/src/map/magic-interpreter.hpp +++ b/src/map/magic-interpreter.hpp @@ -308,10 +308,9 @@ typedef struct status_change_ref int bl_id; } status_change_ref_t; -typedef struct invocation +typedef struct invocation invocation_t; +struct invocation : block_list { - struct block_list bl; - struct invocation *next_invocation; /* used for spells directly associated with a caster: they form a singly-linked list */ INVOCATION_FLAG flags; @@ -334,7 +333,7 @@ typedef struct invocation int status_change_refs_nr; status_change_ref_t *status_change_refs; -} invocation_t; +}; extern magic_conf_t magic_conf; /* Global magic conf */ extern env_t magic_default_env; /* Fake default environment */ -- cgit v1.2.3-60-g2f50