Przeglądaj źródła

Follow up to 2043c95

Fixes #2102

Thanks to @whupdo
Lemongrass3110 8 lat temu
rodzic
commit
0fcc9b6be4
2 zmienionych plików z 9 dodań i 4 usunięć
  1. 8 3
      src/map/guild.c
  2. 1 1
      src/map/npc.c

+ 8 - 3
src/map/guild.c

@@ -2057,9 +2057,14 @@ int guild_castledataloadack(int len, struct guild_castle *gc) {
 			if( i != ev )
 				guild_request_info(c->guild_id);
 			else { // last owned one
-				guild_npc_request_info(c->guild_id, script_config.agit_init_event_name);
-				guild_npc_request_info(c->guild_id, script_config.agit_init2_event_name);
-				guild_npc_request_info(c->guild_id, script_config.agit_init3_event_name);
+				char event_name[EVENT_NAME_LENGTH];
+
+				snprintf( event_name, EVENT_NAME_LENGTH, "::%s", script_config.agit_init_event_name );
+				guild_npc_request_info(c->guild_id, event_name);
+				snprintf( event_name, EVENT_NAME_LENGTH, "::%s", script_config.agit_init2_event_name );
+				guild_npc_request_info(c->guild_id, event_name);
+				snprintf( event_name, EVENT_NAME_LENGTH, "::%s", script_config.agit_init3_event_name );
+				guild_npc_request_info(c->guild_id, event_name);
 			}
 		}
 	}

+ 1 - 1
src/map/npc.c

@@ -103,7 +103,7 @@ static struct view_data npc_viewdb2[MAX_NPC_CLASS2_END-MAX_NPC_CLASS2_START];
 static struct script_event_s
 {	//Holds pointers to the commonly executed scripts for speedup. [Skotlex]
 	struct event_data *event[UCHAR_MAX];
-	const char *event_name[UCHAR_MAX];
+	const char *event_name[EVENT_NAME_LENGTH];
 	uint8 event_count;
 } script_event[NPCE_MAX];