Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Reverted changes, moved status_calc_pc(sd,1) back to pc_authok since it causes problems.

Browse Source 
modified   Changelog-Trunk.txt
modified   src/map/pc.c
modified   src/map/script.c


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@9150 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
Lance 2006-11-06 05:01:41 +00:00
parent 8a5566dc47
commit 29dc8ea873
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -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. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/11/06 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 * Temperory fixed stability issue caused by initial status_calc_pc
being placed AFTER another status_calc_pc. [Lance] being placed AFTER another status_calc_pc. [Lance]
2006/11/05 2006/11/05

9
src/map/pc.c
View File

@ -706,6 +706,9 @@ int pc_authok(struct map_session_data *sd, int login_id2, time_t connect_until_t
sd->state.event_disconnect = 1; sd->state.event_disconnect = 1;
sd->state.event_kill_mob = 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. sd->state.auth = 1; //Do not auth him until the initial stats have been placed.
{ //Add IP field { //Add IP field
unsigned char *ip = (unsigned char *) &session[sd->fd]->client_addr.sin_addr; unsigned char *ip = (unsigned char *) &session[sd->fd]->client_addr.sin_addr;
@ -803,10 +806,8 @@ int pc_reg_received(struct map_session_data *sd)
sd->change_level = pc_readglobalreg(sd,"jobchange_level"); sd->change_level = pc_readglobalreg(sd,"jobchange_level");
sd->die_counter = pc_readglobalreg(sd,"PC_DIE_COUNTER"); sd->die_counter = pc_readglobalreg(sd,"PC_DIE_COUNTER");
//if (!sd->die_counter && (sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE) if (!sd->die_counter && (sd->class_&MAPID_UPPERMASK) == MAPID_SUPER_NOVICE)
// status_calc_pc(sd, 0); //Check +10 to all stats bonus. 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 (pc_checkskill(sd, TK_MISSION)) { if (pc_checkskill(sd, TK_MISSION)) {
sd->mission_mobid = pc_readglobalreg(sd,"TK_MISSION_ID"); sd->mission_mobid = pc_readglobalreg(sd,"TK_MISSION_ID");
sd->mission_count = pc_readglobalreg(sd,"TK_MISSION_COUNT"); sd->mission_count = pc_readglobalreg(sd,"TK_MISSION_COUNT");

3
src/map/script.c
View File

@ -7424,13 +7424,14 @@ int buildin_getmapguildusers(struct script_state *st) {
char *str; char *str;
int m, gid; int m, gid;
int i=0,c=0; int i=0,c=0;
struct guild *g = NULL;
str=conv_str(st, &(st->stack->stack_data[st->start+2])); str=conv_str(st, &(st->stack->stack_data[st->start+2]));
gid=conv_num(st, &(st->stack->stack_data[st->start+3])); 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) 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); push_val(st->stack, C_INT, -1);
return 0; return 0;
} }
struct guild *g = guild_search(gid); g = guild_search(gid);
if (g){ if (g){
for(i = 0; i < g->max_member; i++) for(i = 0; i < g->max_member; i++)