* [Fixed]

- Scripting system screwing up script position after mixing timers with menus. 
- NPC attached AI mobs display as alive when dead. 
- View data not updating after buildin_unitdeadsit. 
[Improved] 
- NPCE_LOADMAP to execute after all (area) objects are sent to the player. 
- Simplified scripting system. sd will now use pointer to the script state itself. 

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7388 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 1 insertions, 3 deletions

diff --git a/src/map/map.h b/src/map/map.h
index a0d19f04e..9e92dea70 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -526,11 +526,9 @@ struct map_session_data {
 	unsigned int client_tick;

 	int npc_id,areanpc_id,npc_shopid;

 	int npc_item_flag; //Marks the npc_id with which you can use items during interactions with said npc (see script command enable_itemuse)

-	int npc_pos;

 	int npc_menu;

 	int npc_amount;

-	struct script_stack *stack;

-	struct script_code *npc_script,*npc_scriptroot;

+	struct script_state *st;

 	int  npc_scriptstate;

 	char npc_str[256];

 	int npc_timer_id; //For player attached npc timers. [Skotlex]