diff options
| author | shennetsind <shennetsind@users.noreply.github.com> | 2013-11-18 17:33:48 -0800 |
|---|---|---|
| committer | shennetsind <shennetsind@users.noreply.github.com> | 2013-11-18 17:33:48 -0800 |
| commit | 51cbaf27c96e874850588ddcfa13b656db45bb2e (patch) | |
| tree | 8e8eac3791a925ebb7a3136bfd2833e279ef5a85 /src/map/atcommand.c | |
| parent | 116e8b8a8727895010b85dfc332f3c5f95bb498f (diff) | |
| parent | 0a24a4bb6340459a6128c39d13ab1bf37a5bc6b8 (diff) | |
| download | hercules-51cbaf27c96e874850588ddcfa13b656db45bb2e.tar.gz hercules-51cbaf27c96e874850588ddcfa13b656db45bb2e.tar.bz2 hercules-51cbaf27c96e874850588ddcfa13b656db45bb2e.tar.xz hercules-51cbaf27c96e874850588ddcfa13b656db45bb2e.zip | |
Merge pull request #224 from datmumbles/size_changes
Corrected size-related constant names (closes #222).
Diffstat (limited to 'src/map/atcommand.c')
| -rw-r--r-- | src/map/atcommand.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index a2bea32a8..4a471fe5d 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -1931,11 +1931,11 @@ ACMD(monster) number = battle_config.atc_spawn_quantity_limit; if (strcmpi(info->command, "monstersmall") == 0) - size = SZ_MEDIUM; // This is just gorgeous [mkbu95] + size = SZ_SMALL; else if (strcmpi(info->command, "monsterbig") == 0) size = SZ_BIG; else - size = SZ_SMALL; + size = SZ_MEDIUM; if (battle_config.etc_log) ShowInfo("%s monster='%s' name='%s' id=%d count=%d (%d,%d)\n", command, monster, name, mob_id, number, sd->bl.x, sd->bl.y); @@ -6255,7 +6255,7 @@ ACMD(summon) return false; } - md = mob->once_spawn_sub(&sd->bl, sd->bl.m, -1, -1, "--ja--", mob_id, "", SZ_SMALL, AI_NONE); + md = mob->once_spawn_sub(&sd->bl, sd->bl.m, -1, -1, "--ja--", mob_id, "", SZ_MEDIUM, AI_NONE); if(!md) return false; @@ -7311,15 +7311,15 @@ ACMD(size) { int size = 0; - size = cap_value(atoi(message),SZ_SMALL,SZ_BIG); + size = cap_value(atoi(message),SZ_MEDIUM,SZ_BIG); if(sd->state.size) { - sd->state.size = SZ_SMALL; + sd->state.size = SZ_MEDIUM; pc->setpos(sd, sd->mapindex, sd->bl.x, sd->bl.y, CLR_TELEPORT); } sd->state.size = size; - if( size == SZ_MEDIUM ) + if( size == SZ_SMALL ) clif->specialeffect(&sd->bl,420,AREA); else if( size == SZ_BIG ) clif->specialeffect(&sd->bl,422,AREA); @@ -7341,12 +7341,12 @@ ACMD(sizeall) for( pl_sd = (TBL_PC*)mapit->first(iter); mapit->exists(iter); pl_sd = (TBL_PC*)mapit->next(iter) ) { if( pl_sd->state.size != size ) { if( pl_sd->state.size ) { - pl_sd->state.size = SZ_SMALL; + pl_sd->state.size = SZ_MEDIUM; pc->setpos(pl_sd, pl_sd->mapindex, pl_sd->bl.x, pl_sd->bl.y, CLR_TELEPORT); } pl_sd->state.size = size; - if( size == SZ_MEDIUM ) + if( size == SZ_SMALL ) clif->specialeffect(&pl_sd->bl,420,AREA); else if( size == SZ_BIG ) clif->specialeffect(&pl_sd->bl,422,AREA); @@ -7377,17 +7377,17 @@ ACMD(sizeguild) return false; } - size = cap_value(size,SZ_SMALL,SZ_BIG); + size = cap_value(size,SZ_MEDIUM,SZ_BIG); for( i = 0; i < g->max_member; i++ ) { if( (pl_sd = g->member[i].sd) && pl_sd->state.size != size ) { if( pl_sd->state.size ) { - pl_sd->state.size = SZ_SMALL; + pl_sd->state.size = SZ_MEDIUM; pc->setpos(pl_sd, pl_sd->mapindex, pl_sd->bl.x, pl_sd->bl.y, CLR_TELEPORT); } pl_sd->state.size = size; - if( size == SZ_MEDIUM ) + if( size == SZ_SMALL ) clif->specialeffect(&pl_sd->bl,420,AREA); else if( size == SZ_BIG ) clif->specialeffect(&pl_sd->bl,422,AREA); |