summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/sec_pri/jailer.txt10
1 files changed, 0 insertions, 10 deletions
diff --git a/npc/sec_pri/jailer.txt b/npc/sec_pri/jailer.txt
index 5c0076481..751558f8b 100644
--- a/npc/sec_pri/jailer.txt
+++ b/npc/sec_pri/jailer.txt
@@ -18,7 +18,6 @@ sec_pri,22,21,0 script Warp Feltchstick NPC_PLAYER,{
if (.@v1 <= 1) end;
.@ti += 120000; // Penalty time for changing point: 2 minutes
.@v1 += 2;
- getmapxy(.@m$, .@x, .@y, 0);
mesc l("Do you want me to change where you'll respawn once you finish serving your sentence? This may increase the sentence duration, so be careful."), 1;
select
l("I'm fine, thanks."),
@@ -26,22 +25,13 @@ sec_pri,22,21,0 script Warp Feltchstick NPC_PLAYER,{
mes "";
closeclientdialog;
if (!getstatus(SC_JAILED,0)) end;
- debugmes "sc4 (%d, %d, %d, %d)", .@v1, .@v2, .@v3, .@v4;
- debugmes "003-9 (%d) -> 000-1 (3)", getmapinfo(MAPINFO_ID, "003-9");
- debugmes "Target %s (%d,%d)", getmapinfo(MAPINFO_NAME, .@v3 - 1), (.@v4|0xFFFF), (.@v4 >> 16);
switch (@menu) {
case 2:
- debugmes "Change MID from %d to %d", .@v2, getmapinfo(MAPINFO_ID, "000-1");
// When renewing status' information: val3 = map_index+1 val4 = coords
// coords are done with &0xFFFF and <<16
// (22&0xFFFF|22<<16)
// ...However, @v4 has other stuff, so at the moment only save point
sc_start4 SC_JAILED, .@ti, .@v1, .@v2, getmapinfo(MAPINFO_ID, "000-1")+1, .@v4, 10000, SCFLAG_FIXEDRATE|SCFLAG_FIXEDTICK|SCFLAG_NOAVOID;
- // Debug info
- .@v3=getstatus(SC_JAILED, 3);
- .@v4=getstatus(SC_JAILED, 4);
- debugmes "sc4 (%d, %d, %d, %d)", .@v1, .@v2, .@v3, .@v4;
- debugmes "Target %s (%d,%d)", getmapinfo(MAPINFO_NAME, .@v3 - 1), (.@v4|0xFFFF), (.@v4 >> 16);
break;
}
} else {