- The default event script behaviour is to trigger on labels rather than NPCs now.

- Removed several script config options which break NPC compatibility when you mess with them (event_script_type, event_requires_trigger, die_event_name, kill_pc_event_name, kill_mob_event_name, logout_event_name, login_event_name, loadmap_event_name, baselvup_event_name, joblvup_event_name)
- LoadMap events no longer set the variable "@maploaded$" to the name of the new map.
- Optimized/simplified the code now that the previous config options were removed.


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

1 files changed, 1 insertions, 10 deletions

diff --git a/src/map/map.h b/src/map/map.h
index 2608cee05..7a3e6ae02 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -531,16 +531,7 @@ struct map_session_data {
 		unsigned storage_flag : 2; //0: closed, 1: Normal Storage open, 2: guild storage open [Skotlex]
 		unsigned snovice_call_flag : 2; //Summon Angel (stage 1~3)
 		unsigned snovice_dead_flag : 2; //Explosion spirits on death: 0 off, 1 active, 2 used.
-		// originally by Qamera, adapted by celest
-		unsigned event_death : 1;
-		unsigned event_kill_pc : 1;
-		unsigned event_disconnect : 1;
-		unsigned event_kill_mob : 1;
-		unsigned event_baselvup : 1;
-		unsigned event_joblvup : 1;
-		unsigned event_loadmap : 1;
-		// Abracadabra bugfix by Aru
-		unsigned abra_flag : 1;
+		unsigned abra_flag : 1; // Abracadabra bugfix by Aru
 		unsigned autotrade : 1;	//By Fantik
 		unsigned reg_dirty : 3; //By Skotlex (marks whether registry variables have been saved or not yet)
 		unsigned showdelay :1;