diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/pc.c | 9 | ||||
| -rw-r--r-- | src/map/script.c | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 9c6d7fc27..d73157b19 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
+ * Reverted changes, moved status_calc_pc(sd,1) back to pc_authok
+ since it causes problems. [Lance]
* Temperory fixed stability issue caused by initial status_calc_pc
being placed AFTER another status_calc_pc. [Lance]
2006/11/05
diff --git a/src/map/pc.c b/src/map/pc.c index 875277dad..7aeaf2232 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -705,6 +705,9 @@ 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; + + // Reverted, since it causes tons of problems putting elsewhere. + status_calc_pc(sd,1); sd->state.auth = 1; //Do not auth him until the initial stats have been placed. { //Add IP field @@ -803,10 +806,8 @@ 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. - // Let's hope putting this here will end all misery. - 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"); diff --git a/src/map/script.c b/src/map/script.c index 40754c9f0..2df67fcb1 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -7424,13 +7424,14 @@ int buildin_getmapguildusers(struct script_state *st) { char *str;
int m, gid;
int i=0,c=0;
+ struct guild *g = NULL;
str=conv_str(st, &(st->stack->stack_data[st->start+2]));
gid=conv_num(st, &(st->stack->stack_data[st->start+3]));
if ((m = map_mapname2mapid(str)) < 0) { // map id on this server (m == -1 if not in actual map-server)
push_val(st->stack, C_INT, -1);
return 0;
}
- struct guild *g = guild_search(gid);
+ g = guild_search(gid);
if (g){
for(i = 0; i < g->max_member; i++)
|