parent
852f893a81
commit
55f1b01bd8
@ -689,10 +689,6 @@ struct map_session_data {
|
||||
bool vars_ok;
|
||||
bool vars_dirty;
|
||||
|
||||
// temporary debugging of bug #3504
|
||||
const char* delunit_prevfile;
|
||||
int delunit_prevline;
|
||||
|
||||
uint16 dmglog[DAMAGELOG_SIZE_PC]; ///target ids
|
||||
|
||||
int c_marker[MAX_SKILL_CRIMSON_MARKER]; /// Store target that marked by Crimson Marker [Cydh]
|
||||
|
@ -12126,21 +12126,9 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
|
||||
break;
|
||||
case SC_DANCING:
|
||||
{
|
||||
const char* prevfile = "<unknown>";
|
||||
int prevline = 0;
|
||||
struct map_session_data *dsd;
|
||||
struct status_change_entry *dsc;
|
||||
|
||||
if( sd ) {
|
||||
if( sd->delunit_prevfile ) { // Initially this is NULL, when a character logs in
|
||||
prevfile = sd->delunit_prevfile;
|
||||
prevline = sd->delunit_prevline;
|
||||
} else
|
||||
prevfile = "<none>";
|
||||
sd->delunit_prevfile = file;
|
||||
sd->delunit_prevline = line;
|
||||
}
|
||||
|
||||
if(sce->val4 && sce->val4 != BCT_SELF && (dsd=map_id2sd(sce->val4))) { // End status on partner as well
|
||||
dsc = dsd->sc.data[SC_DANCING];
|
||||
if(dsc) {
|
||||
@ -12154,12 +12142,10 @@ int status_change_end_(struct block_list* bl, enum sc_type type, int tid, const
|
||||
struct skill_unit_group *group;
|
||||
group = skill_id2group(sce->val2);
|
||||
if( group == NULL ) {
|
||||
ShowDebug("status_change_end: SC_DANCING is missing skill unit group (val1=%d, val2=%d, val3=%d, val4=%d, timer=%d, tid=%d, char_id=%d, map=%s, x=%d, y=%d, prev=%s:%d, from=%s:%d). Please report this! (#3504)\n",
|
||||
ShowDebug("status_change_end: SC_DANCING is missing skill unit group (val1=%d, val2=%d, val3=%d, val4=%d, timer=%d, tid=%d, char_id=%d, map=%s, x=%d, y=%d). Please report this!\n",
|
||||
sce->val1, sce->val2, sce->val3, sce->val4, sce->timer, tid,
|
||||
sd ? sd->status.char_id : 0,
|
||||
mapindex_id2name(map_id2index(bl->m)), bl->x, bl->y,
|
||||
prevfile, prevline,
|
||||
file, line);
|
||||
mapindex_id2name(map_id2index(bl->m)), bl->x, bl->y);
|
||||
}
|
||||
sce->val2 = 0;
|
||||
skill_delunitgroup(group);
|
||||
|
Loading…
x
Reference in New Issue
Block a user