Pārlūkot izejas kodu

Fixed scripts relying on older event calling methods.. Still searching for other scripts..

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6396 54d463be-8e91-2dee-dedb-b68131a5f0ec
Lance 19 gadi atpakaļ
vecāks
revīzija
2a6dc10d0b
3 mainītis faili ar 6 papildinājumiem un 5 dzēšanām
  1. 1 1
      npc/jobs/1-1/swordman.txt
  2. 4 3
      npc/jobs/2-1/knight.txt
  3. 1 1
      src/map/npc.c

+ 1 - 1
npc/jobs/1-1/swordman.txt

@@ -183,7 +183,7 @@ L_Done:
 
 // -- Swordsman --
 izlude_in.gat,65,171,5	script	Swordsman	85,{
-	doevent "Swordsman";
+	doevent "Swordsman::OnStart";
 	end;
 }
 

+ 4 - 3
npc/jobs/2-1/knight.txt

@@ -1383,7 +1383,7 @@ L_Test:
 	mes "Okay lets start the test now.";
 	next;
 	warp "job_knt.gat",143,57;
-	doevent "ev_Test";
+	doevent "ev_Test::OnStart";
 	end;
 
 	L_ReTest:
@@ -1395,10 +1395,10 @@ L_Test:
 		mes "This point shouldn't be kept just when you have tests, it should be kept when you're training in real life...";
 		next;
 		mes "[Sir Edmund]";
-		mes "OKay now, try again.";
+		mes "Okay now, try again.";
 		next;
 		warp "job_knt.gat",143,57;
-		doevent "ev_Test";
+		doevent "ev_Test::OnStart";
 		end;
 
 	L_Done:
@@ -1419,6 +1419,7 @@ L_Test:
 
 // Test -----------------------------
 job_knt.gat,1,1,1	script	ev_Test	-1,{
+OnStart:
 	killmonster "job_knt.gat","ev_Test::OnMyMobDead";
 	monster "job_knt.gat",141,57,"Poring",1002,1,"ev_Test::OnMyMobDead";
 	monster "job_knt.gat",145,57,"Poring",1002,1,"ev_Test::OnMyMobDead";

+ 1 - 1
src/map/npc.c

@@ -1887,7 +1887,7 @@ static int npc_parse_script (char *w1,char *w2,char *w3,char *w4,char *first_lin
 		unit_dataset(&nd->bl);
 		nd->ud.dir = dir;
 		map_addblock(&nd->bl);
-		// Unused. You can always use On::XXXX events. Have this removed to improve perfomance.
+		// Unused. You can always use xxx::OnXXXX events. Have this removed to improve perfomance.
 		/*if (evflag) {	// ƒCƒxƒ“ƒgŒ^
 			struct event_data *ev = (struct event_data *)aCalloc(1, sizeof(struct event_data));
 			ev->nd = nd;