- Guild Castle code cleanup:

  - removed `MAX_GUILDCASTLE` limit
  - char-server now caches guild castles in `DBMap`
  - improved guild castle SQL queries to support non-default values of `MAX_GUARDIANS`
  - disallowed declaring guild castles on maps that are on other map-servers 
  - map-server now requests data for all guild castles from char-server on initial connect (bugreport:287)
  - removed ''guildcastleinfo events'' as they were esentially duplicated ''OnAgitInit''
  - optimized castle data load packets (bugreport:287)
  - updated WoE scripts to reflect source changes (scripts no longer need or should request castle or guild data)
  - updated related docs
- Added `db_size` macro.
- Replaced manual counting of castles occupied by a guild with `guild_checkcastles()` calls.

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

1 files changed, 2 insertions, 6 deletions

diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt
index 53b6002cf..e8274bc68 100644
--- a/npc/guild2/schg_cas04.txt
+++ b/npc/guild2/schg_cas04.txt
@@ -27,12 +27,8 @@
 schg_cas04,1,1,0	script	Manager#sch04_02	111,{
 	end;
 
-OnInterIfInitOnce:
-	GetCastleData "schg_cas04",0,"::OnRecvCastlesc04";
-	end;
-
+OnAgitInit2:
 OnRecvCastlesc04:
-	RequestGuildInfo GetCastleData("schg_cas04",1);
 	if (GetCastleData("schg_cas04",1) == 0) {
 		donpcevent "Manager#sch04_02::Onstart";
 	}
@@ -2723,7 +2719,7 @@ OnStartArena:
 		end;
 	}
 	MapRespawnGuildID "schg_cas04",GetCastleData("schg_cas04",1),2;
-	GetCastleData "schg_cas04",0,"::OnRecvCastlesc04";
+	donpcevent "::OnRecvCastlesc04";
 	end;
 
 OnTimer10000: