Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

getguildmember refactor #3310

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 61 additions & 24 deletions src/map/script.c
Original file line number Diff line number Diff line change
Expand Up @@ -10094,44 +10094,76 @@ static BUILDIN(getguildinfo)

/*==========================================
* Get the information of the members of a guild by type.
* getguildmember <guild_id>{,<type>};
* @param guild_id: ID of guild
* @param type:
* 0 : name (default)
* 1 : character ID
* 2 : account ID
* getguildmember(<guild_id>, <type>, <array>);
*------------------------------------------*/
static BUILDIN(getguildmember)
{
struct guild *g = NULL;
int j = 0;
struct map_session_data *sd = NULL;
struct guild *g = guild->search(script_getnum(st, 2));
enum guildmember_type type = script_getnum(st, 3);
struct script_data *data = script_getdata(st, 4);
const char *varname = reference_getname(data);
int id = reference_getid(data);
int num = 0;

g = guild->search(script_getnum(st,2));
if (!data_isreference(data) || reference_toconstant(data)) {
ShowError("buildin_getguildmember: Target argument is not a variable\n");
script->reportdata(data);
st->state = END;
return false;
}

if (type < GD_MEMBER_NAME || type > GD_MEMBER_ACCID) {
ShowError("buildin_getguildmember: Invalid type argument\n");
script->reportdata(data);
st->state = END;
return false;
}

if (g) {
int i, type = 0;
if (!is_int_variable(varname) && (type == GD_MEMBER_CHARID || type == GD_MEMBER_ACCID)) {
ShowError("buildin_getguildmember: Target argument is not an int variable\n");
script->reportdata(data);
st->state = END;
return false;
}

if (script_hasdata(st,3))
type = script_getnum(st,3);
if (!is_string_variable(varname) && type == GD_MEMBER_NAME) {
ShowError("buildin_getguildmember: Target argument is not a string variable\n");
script->reportdata(data);
st->state = END;
return false;
}

if (not_server_variable(*varname)) {
sd = script->rid2sd(st);

if (sd == NULL) {
script_pushint(st, 0);
return true; // player variable but no player attached
}
}

for ( i = 0; i < MAX_GUILD; i++ ) {
if ( g->member[i].account_id ) {
if (g != NULL) {
for (int i = 0; i < MAX_GUILD; i++) {
if (g->member[i].account_id != 0) {
switch (type) {
case 2:
mapreg->setreg(reference_uid(script->add_variable("$@guildmemberaid"), j),g->member[i].account_id);
case GD_MEMBER_NAME:
script->set_reg(st, sd, reference_uid(id, num), varname, (const void *)h64BPTRSIZE(g->member[i].name), reference_getref(data));
break;
case 1:
mapreg->setreg(reference_uid(script->add_variable("$@guildmembercid"), j), g->member[i].char_id);
case GD_MEMBER_CHARID:
script->set_reg(st, sd, reference_uid(id, num), varname, (const void *)h64BPTRSIZE(g->member[i].char_id), reference_getref(data));
break;
default:
mapreg->setregstr(reference_uid(script->add_variable("$@guildmembername$"), j), g->member[i].name);
case GD_MEMBER_ACCID:
script->set_reg(st, sd, reference_uid(id, num), varname, (const void *)h64BPTRSIZE(g->member[i].account_id), reference_getref(data));
break;
}
j++;
num++;
}
}
}
mapreg->setreg(script->add_variable("$@guildmembercount"), j);

script_pushint(st, num);

return true;
}

Expand Down Expand Up @@ -28869,7 +28901,7 @@ static void script_parse_builtin(void)
BUILDIN_DEF(getpartyname,"i"),
BUILDIN_DEF(getpartymember,"i?"),
BUILDIN_DEF(getpartyleader,"i?"),
BUILDIN_DEF(getguildmember,"i?"),
BUILDIN_DEF(getguildmember,"iir"),
BUILDIN_DEF(getguildinfo,"i?"),
BUILDIN_DEF(getguildonline, "i?"),
BUILDIN_DEF(strcharinfo,"i??"),
Expand Down Expand Up @@ -30121,6 +30153,11 @@ static void script_hardcoded_constants(void)
script->set_constant("SIEGE_TYPE_SE", SIEGE_TYPE_SE, false, false);
script->set_constant("SIEGE_TYPE_TE", SIEGE_TYPE_TE, false, false);

script->constdb_comment("guildmember types");
script->set_constant("GD_MEMBER_NAME", GD_MEMBER_NAME, false, false);
script->set_constant("GD_MEMBER_CHARID", GD_MEMBER_CHARID, false, false);
script->set_constant("GD_MEMBER_ACCID", GD_MEMBER_ACCID, false, false);

script->constdb_comment("guildinfo types");
script->set_constant("GUILDINFO_NAME", GUILDINFO_NAME, false, false);
script->set_constant("GUILDINFO_ID", GUILDINFO_ID, false, false);
Expand Down
6 changes: 6 additions & 0 deletions src/map/script.h
Original file line number Diff line number Diff line change
Expand Up @@ -619,6 +619,12 @@ enum script_hominfo_types {
HOMINFO_MAX
};

enum guildmember_type {
GD_MEMBER_NAME,
GD_MEMBER_CHARID,
GD_MEMBER_ACCID,
};

/**
* Structures
**/
Expand Down
Loading