diff options
| author | codemaster <codemaster@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-05 22:41:52 +0000 |
|---|---|---|
| committer | codemaster <codemaster@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-03-05 22:41:52 +0000 |
| commit | 5916688ac78b543c938635236570035efff6b601 (patch) | |
| tree | 54fd0467051eaae2c70b7e9b7c631d4da8007e2d | |
| parent | 6cb1278f000d3a9a14d2a5d2c30d2b008894a6b7 (diff) | |
| download | hercules-5916688ac78b543c938635236570035efff6b601.tar.gz hercules-5916688ac78b543c938635236570035efff6b601.tar.bz2 hercules-5916688ac78b543c938635236570035efff6b601.tar.xz hercules-5916688ac78b543c938635236570035efff6b601.zip | |
* Removed my EXP limit as it did not do what it was supposed to [Codemaster]
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5469 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/pc.c | 52 |
2 files changed, 20 insertions, 33 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index bf206894a..8fe12bc72 100644 --- a/Changelog-Trunk.txt +++ b/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
diff --git a/src/map/pc.c b/src/map/pc.c index 31020bf6d..c9ac91d3e 100644 --- a/src/map/pc.c +++ b/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,
|