diff options
| author | Haru <haru@dotalux.com> | 2018-08-26 20:53:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-26 20:53:05 +0200 |
| commit | a7bee2cdb8b4d4a2a250d611be4babd27043b6db (patch) | |
| tree | 0135aa01a07e4ca72ae035c3179da7c82a92b777 /src/map/atcommand.c | |
| parent | a1e841ccf13c63fefad02a1bfce0e50b92c649a0 (diff) | |
| parent | 4118b1135eb79c211aafb6408a4ad8cf9ce09b02 (diff) | |
| download | hercules-a7bee2cdb8b4d4a2a250d611be4babd27043b6db.tar.gz hercules-a7bee2cdb8b4d4a2a250d611be4babd27043b6db.tar.bz2 hercules-a7bee2cdb8b4d4a2a250d611be4babd27043b6db.tar.xz hercules-a7bee2cdb8b4d4a2a250d611be4babd27043b6db.zip | |
Merge pull request #2164 from mekolat/addvariable
always set the type to C_NAME when adding variables through script->add_str
Diffstat (limited to 'src/map/atcommand.c')
| -rw-r--r-- | src/map/atcommand.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 02b099742..6522f3013 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -8738,19 +8738,19 @@ ACMD(set) const char *str = NULL; switch (reg[0]) { case '@': - str = pc->readregstr(sd, script->add_str(reg)); + str = pc->readregstr(sd, script->add_variable(reg)); break; case '$': - str = mapreg->readregstr(script->add_str(reg)); + str = mapreg->readregstr(script->add_variable(reg)); break; case '#': if (reg[1] == '#') - str = pc_readaccountreg2str(sd, script->add_str(reg));// global + str = pc_readaccountreg2str(sd, script->add_variable(reg));// global else - str = pc_readaccountregstr(sd, script->add_str(reg));// local + str = pc_readaccountregstr(sd, script->add_variable(reg));// local break; default: - str = pc_readglobalreg_str(sd, script->add_str(reg)); + str = pc_readglobalreg_str(sd, script->add_variable(reg)); break; } if (str == NULL || str[0] == '\0') { @@ -8766,19 +8766,19 @@ ACMD(set) data->type = C_INT; switch( reg[0] ) { case '@': - data->u.num = pc->readreg(sd, script->add_str(reg)); + data->u.num = pc->readreg(sd, script->add_variable(reg)); break; case '$': - data->u.num = mapreg->readreg(script->add_str(reg)); + data->u.num = mapreg->readreg(script->add_variable(reg)); break; case '#': if( reg[1] == '#' ) - data->u.num = pc_readaccountreg2(sd, script->add_str(reg));// global + data->u.num = pc_readaccountreg2(sd, script->add_variable(reg));// global else - data->u.num = pc_readaccountreg(sd, script->add_str(reg));// local + data->u.num = pc_readaccountreg(sd, script->add_variable(reg));// local break; default: - data->u.num = pc_readglobalreg(sd, script->add_str(reg)); + data->u.num = pc_readglobalreg(sd, script->add_variable(reg)); break; } } |