API tools faq
paste
Advertisement
Guest User

Pan nositting

a guest
Jan 27th, 2014
107
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 6.70 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/src/map/atcommand.c b/src/map/atcommand.c
  2. index 0cb552b..da09fff 100644
  3. --- a/src/map/atcommand.c
  4. +++ b/src/map/atcommand.c
  5. @@ -7480,7 +7480,7 @@ int atcommand_mutearea_sub(struct block_list *bl,va_list ap)
  6. CHECKFLAG(nojobexp); CHECKFLAG(nomobloot); CHECKFLAG(nomvploot); CHECKFLAG(nightenabled);
  7. CHECKFLAG(nodrop); CHECKFLAG(novending); CHECKFLAG(loadevent);
  8. CHECKFLAG(nochat); CHECKFLAG(partylock); CHECKFLAG(guildlock); CHECKFLAG(src4instance);
  9. - CHECKFLAG(notomb); CHECKFLAG(nocashshop);
  10. + CHECKFLAG(notomb); CHECKFLAG(nocashshop); CHECKFLAG(nositting);
  11. clif->message(sd->fd," ");
  12. clif->message(sd->fd,msg_txt(1312)); // Usage: "@mapflag monster_noteleport 1" (0=Off | 1=On)
  13. clif->message(sd->fd,msg_txt(1313)); // Type "@mapflag available" to list the available mapflags.
  14. @@ -7517,7 +7517,7 @@ int atcommand_mutearea_sub(struct block_list *bl,va_list ap)
  15. SETFLAG(nojobexp); SETFLAG(nomobloot); SETFLAG(nomvploot); SETFLAG(nightenabled);
  16. SETFLAG(nodrop); SETFLAG(novending); SETFLAG(loadevent);
  17. SETFLAG(nochat); SETFLAG(partylock); SETFLAG(guildlock); SETFLAG(src4instance);
  18. - SETFLAG(notomb); SETFLAG(nocashshop);
  19. + SETFLAG(notomb); SETFLAG(nocashshop); SETFLAG(nositting);
  20.  
  21. clif->message(sd->fd,msg_txt(1314)); // Invalid flag name or flag.
  22. clif->message(sd->fd,msg_txt(1312)); // Usage: "@mapflag monster_noteleport 1" (0=Off | 1=On)
  23. @@ -7529,7 +7529,7 @@ int atcommand_mutearea_sub(struct block_list *bl,va_list ap)
  24. clif->message(sd->fd,"nozenypenalty, notrade, noskill, nowarp, nowarpto, noicewall, snow, clouds, clouds2,");
  25. clif->message(sd->fd,"fog, fireworks, sakura, leaves, nobaseexp, nojobexp, nomobloot,");
  26. clif->message(sd->fd,"nomvploot, nightenabled, nodrop, novending, loadevent, nochat, partylock,");
  27. - clif->message(sd->fd,"guildlock, src4instance, notomb, nocashshop");
  28. + clif->message(sd->fd,"guildlock, src4instance, notomb, nocashshop, nositting");
  29.  
  30. #undef CHECKFLAG
  31. #undef SETFLAG
  32. diff --git a/src/map/clif.c b/src/map/clif.c
  33. index 975a5aa..e45d907 100644
  34. --- a/src/map/clif.c
  35. +++ b/src/map/clif.c
  36. @@ -10108,6 +10108,13 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type,
  37. break;
  38. }
  39.  
  40. + if( sd->bl.m >= 0 && map->list[sd->bl.m].flag.nositting
  41. + && !pc_has_permission(sd, PC_PERM_SIT_ANYWHERE))
  42. + {
  43. + clif->message(sd->fd,"You can't sit in this map!");
  44. + return;
  45. + }
  46. +
  47. if(pc_issit(sd)) {
  48. //Bugged client? Just refresh them.
  49. clif->sitting(&sd->bl);
  50. diff --git a/src/map/map.c b/src/map/map.c
  51. index 07881ea..187b48c 100644
  52. --- a/src/map/map.c
  53. +++ b/src/map/map.c
  54. @@ -4417,8 +4417,16 @@ bool map_zone_mf_cache(int m, char *flag, char *params) {
  55. else if( map->list[m].flag.nocashshop )
  56. map_zone_mf_cache_add(m,"nocashshop");
  57. }
  58. + } else if(!strcmpi(flag, "nossiting")) {
  59. + if( state && map->list[m].flag.nositting )
  60. + ; /* already set */
  61. + else {
  62. + if( state )
  63. + map_zone_mf_cache_add(m,"nositting\tooff");
  64. + else if( map->list[m].flag.nositting )
  65. + map_zone_mf_cache_add(m,"nositting");
  66. + }
  67. }
  68. -
  69. return false;
  70. }
  71. void map_zone_apply(int m, struct map_zone_data *zone, const char* start, const char* buffer, const char* filepath) {
  72. diff --git a/src/map/map.h b/src/map/map.h
  73. index 130b181..2a61649 100644
  74. --- a/src/map/map.h
  75. +++ b/src/map/map.h
  76. @@ -647,6 +647,7 @@ struct map_data {
  77. unsigned noknockback : 1;
  78. unsigned notomb : 1;
  79. unsigned nocashshop : 1;
  80. + unsigned nositting : 1;
  81. } flag;
  82. struct point save;
  83. struct npc_data *npc[MAX_NPC_PER_MAP];
  84. diff --git a/src/map/npc.c b/src/map/npc.c
  85. index 722e519..25970b3 100644
  86. --- a/src/map/npc.c
  87. +++ b/src/map/npc.c
  88. @@ -3908,6 +3908,8 @@ const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, const char
  89. map->list[m].flag.src4instance = (state) ? 1 : 0;
  90. } else if ( !strcmpi(w3,"nocashshop") ) {
  91. map->list[m].flag.nocashshop = (state) ? 1 : 0;
  92. + } else if ( !strcmpi(w3,"nositting") ) {
  93. + map->list[m].flag.nositting = (state) ? 1 : 0;
  94. } else
  95. ShowError("npc_parse_mapflag: unrecognized mapflag '%s' in file '%s', line '%d'.\n", w3, filepath, strline(buffer,start-buffer));
  96.  
  97. diff --git a/src/map/pc_groups.c b/src/map/pc_groups.c
  98. index 906462c..661a313 100644
  99. --- a/src/map/pc_groups.c
  100. +++ b/src/map/pc_groups.c
  101. @@ -418,6 +418,7 @@ void do_init_pc_groups(void) {
  102. { "disable_commands_when_dead", PC_PERM_DISABLE_CMD_DEAD },
  103. { "hchsys_admin", PC_PERM_HCHSYS_ADMIN },
  104. { "can_trade_bound", PC_PERM_TRADE_BOUND },
  105. + { "can_sit_anywhere", PC_PERM_SIT_ANYWHERE },
  106. };
  107. unsigned char i, len = ARRAYLENGTH(pc_g_defaults);
  108.  
  109. diff --git a/src/map/pc_groups.h b/src/map/pc_groups.h
  110. index 3396512..dddbcd0 100644
  111. --- a/src/map/pc_groups.h
  112. +++ b/src/map/pc_groups.h
  113. @@ -31,6 +31,7 @@ enum e_pc_permission {
  114. PC_PERM_DISABLE_CMD_DEAD = 0x100000,
  115. PC_PERM_HCHSYS_ADMIN = 0x200000,
  116. PC_PERM_TRADE_BOUND = 0x400000,
  117. + PC_PERM_SIT_ANYWHERE = 0x800000,
  118. };
  119.  
  120. // Cached config settings for quick lookup
  121. diff --git a/src/map/script.c b/src/map/script.c
  122. index 8e8f897..b82eae2 100644
  123. --- a/src/map/script.c
  124. +++ b/src/map/script.c
  125. @@ -10739,6 +10739,7 @@ void script_detach_rid(struct script_state* st) {
  126. case MF_RESET: script_pushint(st,map->list[m].flag.reset); break;
  127. case MF_NOTOMB: script_pushint(st,map->list[m].flag.notomb); break;
  128. case MF_NOCASHSHOP: script_pushint(st,map->list[m].flag.nocashshop); break;
  129. + case MF_NOSITTING: script_pushint(st,map->list[m].flag.nositting); break;
  130. }
  131. }
  132.  
  133. @@ -10855,6 +10856,7 @@ int script_mapflag_pvp_sub(struct block_list *bl,va_list ap) {
  134. case MF_RESET: map->list[m].flag.reset = 1; break;
  135. case MF_NOTOMB: map->list[m].flag.notomb = 1; break;
  136. case MF_NOCASHSHOP: map->list[m].flag.nocashshop = 1; break;
  137. + case MF_NOSITTING: map->list[m].flag.nositting = 1; break;
  138. }
  139. }
  140.  
  141. @@ -10941,6 +10943,7 @@ int script_mapflag_pvp_sub(struct block_list *bl,va_list ap) {
  142. case MF_RESET: map->list[m].flag.reset = 0; break;
  143. case MF_NOTOMB: map->list[m].flag.notomb = 0; break;
  144. case MF_NOCASHSHOP: map->list[m].flag.nocashshop = 0; break;
  145. + case MF_NOSITTING: map->list[m].flag.nositting = 0; break;
  146. }
  147. }
  148.  
  149. diff --git a/src/map/script.h b/src/map/script.h
  150. index 97db2a7..188fe7a 100644
  151. --- a/src/map/script.h
  152. +++ b/src/map/script.h
  153. @@ -303,7 +303,8 @@ enum {
  154. MF_BATTLEGROUND,
  155. MF_RESET,
  156. MF_NOTOMB,
  157. - MF_NOCASHSHOP
  158. + MF_NOCASHSHOP,
  159. + MF_NOSITTING
  160. };
  161.  
  162. /**
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!