summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-07 03:17:09 +0000
committerLance <Lance@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-07 03:17:09 +0000
commit25f4ec1a6d1033116c95c8a9a8c524cb2b13c468 (patch)
tree3a5d7628fd7830d9c8754766dc32f12d3af47649
parent18b9549a0a8cfb0614c655d11f87f2acc7c8cc52 (diff)
downloadhercules-25f4ec1a6d1033116c95c8a9a8c524cb2b13c468.tar.gz
hercules-25f4ec1a6d1033116c95c8a9a8c524cb2b13c468.tar.bz2
hercules-25f4ec1a6d1033116c95c8a9a8c524cb2b13c468.tar.xz
hercules-25f4ec1a6d1033116c95c8a9a8c524cb2b13c468.zip
* Reapplied 'fix equipment scripts which are based on character variables not working.'
modified Changelog-Trunk.txt modified src/map/pc.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9160 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/pc.c9
2 files changed, 7 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 682258734..4c1371358 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/11/06
+ * Reapplied 'fix equipment scripts which are based on character variables not
+ working.' [Lance]
* Multiple Gunslinger skill corrections, refer to
http://ro.doddlercon.com/guides/gunslinger.html for information source:
[Skotlex]
diff --git a/src/map/pc.c b/src/map/pc.c
index f9415e9cd..818bd1b42 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -705,8 +705,6 @@ int pc_authok(struct map_session_data *sd, int login_id2, time_t connect_until_t
sd->state.event_kill_pc = 1;
sd->state.event_disconnect = 1;
sd->state.event_kill_mob = 1;
-
- status_calc_pc(sd,1);
sd->state.auth = 1; //Do not auth him until the initial stats have been placed.
{ //Add IP field
@@ -805,8 +803,11 @@ int pc_reg_received(struct map_session_data *sd)
sd->change_level = pc_readglobalreg(sd,"jobchange_level");
sd->die_counter = pc_readglobalreg(sd,"PC_DIE_COUNTER");
- if (!sd->die_counter && (sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE)
- status_calc_pc(sd, 0); //Check +10 to all stats bonus.
+ // The earliest I can get is here to prevent more failures of status_calc_pc
+ // while making equipment scripts with global_regs possible. [Lance]
+ status_calc_pc(sd,1);
+ //if (!sd->die_counter && (sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE)
+ // status_calc_pc(sd, 0); //Check +10 to all stats bonus.
if (pc_checkskill(sd, TK_MISSION)) {
sd->mission_mobid = pc_readglobalreg(sd,"TK_MISSION_ID");
sd->mission_count = pc_readglobalreg(sd,"TK_MISSION_COUNT");