Преглед на файлове

* Removed my EXP limit as it did not do what it was supposed to [Codemaster]

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5469 54d463be-8e91-2dee-dedb-b68131a5f0ec
codemaster преди 19 години
родител
ревизия
884419e850
променени са 2 файла, в които са добавени 20 реда и са изтрити 33 реда
  1. 1 0
      Changelog-Trunk.txt
  2. 19 33
      src/map/pc.c

+ 1 - 0
Changelog-Trunk.txt

@@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EV
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 
 2006/03/05
+	* Removed my EXP limit as it did not do what it was supposed to [Codemaster]
 	* Fixed remove-trap [Skotlex]
 	* Fixed animation of Redemptio [Skotlex]
 	* Some reorganization of how the skill check functions behave

+ 19 - 33
src/map/pc.c

@@ -4628,44 +4628,30 @@ int pc_gainexp(struct map_session_data *sd,unsigned int base_exp,unsigned int jo
 			}
 		}
 	}
-
-	// Do not give the player any EXP if they are at the highest level
-	// Prevents them from sharing excess EXP in a party
-	if(pc_maxbaselv(sd) > sd->status.base_level)
-	{	
-		//Overflow checks... think we'll ever really need'em? [Skotlex]
-		if (base_exp > 0 && sd->status.base_exp > UINT_MAX - base_exp)
-			sd->status.base_exp = UINT_MAX;
-		else if (base_exp < 0 && sd->status.base_exp > base_exp)
-			sd->status.base_exp = 0;
-		else
-			sd->status.base_exp += base_exp;
 	
-		while(pc_checkbaselevelup(sd)) ;
+	//Overflow checks... think we'll ever really need'em? [Skotlex]
+	if (base_exp > 0 && sd->status.base_exp > UINT_MAX - base_exp)
+		sd->status.base_exp = UINT_MAX;
+	else if (base_exp < 0 && sd->status.base_exp > base_exp)
+		sd->status.base_exp = 0;
+	else
+		sd->status.base_exp += base_exp;
+	
+	while(pc_checkbaselevelup(sd)) ;
 
-		clif_updatestatus(sd,SP_BASEEXP);
-	} else {
-		base_exp = 0;
-	}
+	clif_updatestatus(sd,SP_BASEEXP);
 
-	// Do not give the player any EXP if they are at the highest level
-	// Prevents them from sharing excess EXP in a party	
-	if(pc_maxjoblv(sd) > sd->status.job_level)
-	{
-		//Overflow checks... think we'll ever really need'em? [Skotlex]
-		if (job_exp > 0 && sd->status.job_exp > UINT_MAX - job_exp)
-			sd->status.job_exp = UINT_MAX;
-		else if (job_exp < 0 && sd->status.job_exp > job_exp)
-			sd->status.job_exp = 0;
-		else
-			sd->status.job_exp += job_exp;
+	//Overflow checks... think we'll ever really need'em? [Skotlex]
+	if (job_exp > 0 && sd->status.job_exp > UINT_MAX - job_exp)
+		sd->status.job_exp = UINT_MAX;
+	else if (job_exp < 0 && sd->status.job_exp > job_exp)
+		sd->status.job_exp = 0;
+	else
+		sd->status.job_exp += job_exp;
 
-		while(pc_checkjoblevelup(sd)) ;
+	while(pc_checkjoblevelup(sd)) ;
 
-		clif_updatestatus(sd,SP_JOBEXP);
-	} else {
-		job_exp = 0;
-	}
+	clif_updatestatus(sd,SP_JOBEXP);
 
 	if(sd->state.showexp){
 		sprintf(output,