diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-16 15:33:59 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-16 15:33:59 +0000 |
| commit | d042f7cfd71139195cf43534e93df18b009b1070 (patch) | |
| tree | 32b141651c85b8989808804deb3f087aa51676bc /src/map/atcommand.c | |
| parent | e997d4f135355b1334f31242e9f76fae46a2deec (diff) | |
| download | hercules-d042f7cfd71139195cf43534e93df18b009b1070.tar.gz hercules-d042f7cfd71139195cf43534e93df18b009b1070.tar.bz2 hercules-d042f7cfd71139195cf43534e93df18b009b1070.tar.xz hercules-d042f7cfd71139195cf43534e93df18b009b1070.zip | |
- Fixed mysql ping setting being in minutes rather than hours.
- Removed npc_event_sub from npc.h and moved it to npc.c
- Cleaned up #warp to prevent spitting non-walkable tile warnings.
- Changed the meaning of msg_athena 2, it is now "invalid target cell, randomizing".
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6114 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/atcommand.c')
| -rw-r--r-- | src/map/atcommand.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 2501e633c..d32d0fa66 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -1248,9 +1248,10 @@ int atcommand_rura( return -1;
}
- if (map_getcell(m, x, y, CELL_CHKNOPASS))
+ if ((x || y) && map_getcell(m, x, y, CELL_CHKNOPASS)) {
+ clif_displaymessage(fd, msg_table[2]);
x = y = 0; //Invalid cell, use random spot.
-
+ }
if (map[m].flag.nowarpto && battle_config.any_warp_GM_min_level > pc_isGM(sd)) {
clif_displaymessage(fd, msg_table[247]);
return -1;
@@ -6004,6 +6005,7 @@ int atcommand_nuke( if ((pl_sd = map_nick2sd(atcmd_player_name)) != NULL) {
if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can kill only lower or same GM level
+ clif_skill_nodamage(&pl_sd->bl, &pl_sd->bl, NPC_SELFDESTRUCTION, -1, 1);
skill_castend_damage_id(&pl_sd->bl, &pl_sd->bl, NPC_SELFDESTRUCTION, 99, gettick(), 0);
clif_displaymessage(fd, msg_table[109]); // Player has been nuked!
} else {
|