/[svn]/hlds/cstrike/addons/amxmodx/scripting/deagsmapmanager.sma

Diff of /hlds/cstrike/addons/amxmodx/scripting/deagsmapmanager.sma

Parent Directory | Revision Log | View Patch Patch

-revision 51 by cstrike,
Mon Jul 20 18:08:21 2009 UTC
+revision 53 by cstrike,
Wed Mar 17 16:35:49 2010 UTC
 Line 31
  *
  *********************************************************************************
  *
- *   Deagles Map Management v3.23
+ *   Deagles Map Manager v3.23
  *   Last Update: 2009-02-16
  *
  *   by Deagles/AMXX Community & Posting/Supporting by bmann_420
 Line 52
  new const PLUGIN[]  = "DeagsMapManager";
  new const VERSION[] = "3.23SVN";
  new const AUTHOR[]  = "Deags/AMXX Community";
- #define DMAP_EXPECTED_DV 510
+ #define DMAP_EXPECTED_DV 520
  // Comment out the following line to disable the dedicated log file
  #define DEDICATED_LOG_ENABLED
 Line 226
                          client_print(0, print_chat, "%L", LANG_PLAYER, "DMAP_NEXTMAP_VOTED", smap, timeleft);
                  } else {
                          if (minutesleft <= 2 && timeleft) {
-                                 client_print(0, print_chat, "%L", LANG_PLAYER, "DMAP_CURRENT_MAP", mapname);
+                                 client_print(0, print_chat, "%L", LANG_PLAYER, "DMAP_CURRENT_MAP_VOTE", mapname);
                          }
                  }
          }
 Line 311
  public change_maps() {
-         new map[51], curmap[51];
+         new map[32];
-         get_mapname(curmap,50);
          get_pcvar_string(pEmptyMap, map, 31);
          if (get_pcvar_num(pEmptymapAllowed) == 1 && strlen(map) > 0) {
-Line 324
+Line 323
          new m, iteration = 0;
          client_print(id, print_chat, "%L", id, "DMAP_LISTMAPS", totalmaps);
          if (totalmaps - (50 * iteration) >= 50) {
-                 console_print(id, "%L", id, "DMAP_LISTMAPS_MAPS", iteration * 50 + 1, iteration * 50 + 50);
+                 console_print(id, "%L", id, "DMAP_LISTMAPS_MAPS", iteration * 50 + 1, iteration * 50 + 50, totalmaps);
          } else {
-                 console_print(id, "%L", id, "DMAP_LISTMAPS_MAPS", iteration * 50 + 1, iteration * 50 + (totalmaps - iteration * 50));
+                 console_print(id, "%L", id, "DMAP_LISTMAPS_MAPS", iteration * 50 + 1, iteration * 50 + (totalmaps - iteration * 50), totalmaps);
          }
          for (m = 50 * iteration; (m < totalmaps && m < 50 * (iteration + 1)); m += 3)
-Line 357
+Line 356
          }       //Now idreal is the real id of client
          if (totalmaps - (50 * iteration) >= 50) {
-                 console_print(idreal, "%L", idreal, "DMAP_LISTMAPS_MAPS", iteration * 50 + 1, iteration * 50 + 50);
+                 console_print(idreal, "%L", idreal, "DMAP_LISTMAPS_MAPS", iteration * 50 + 1, iteration * 50 + 50, totalmaps);
          } else {
-                 console_print(idreal, "%L", idreal, "DMAP_LISTMAPS_MAPS", iteration * 50 + 1, iteration * 50 + (totalmaps - iteration * 50));
+                 console_print(idreal, "%L", idreal, "DMAP_LISTMAPS_MAPS", iteration * 50 + 1, iteration * 50 + (totalmaps - iteration * 50), totalmaps);
          }
          for (m = 50 * iteration; (m < totalmaps && m < 50 * (iteration + 1)); m += 3) {
-Line 401
+Line 400
                          client_print(0, print_chat, "%L", LANG_PLAYER, "DMAP_NEXTMAP_VOTED", smap, timeleft);
                  } else {
                          if (inprogress) {
-                                 client_print(0, print_chat, "%L", LANG_PLAYER, "DMAP_CURRENT_MAP", mapname);
+                                 client_print(0, print_chat, "%L", LANG_PLAYER, "DMAP_CURRENT_MAP_VOTE", mapname);
                          }
                  }
          }
-Line 571
+Line 570
                  return PLUGIN_HANDLED;
          }
-         new arg[32];
-         read_argv(1, arg, 31);
          new kName[32], timeleft = get_timeleft();
          get_user_name(id, kName, 31);
-Line 606
+Line 603
          remove_task(DMAP_TASKID_TIME_TO_VOTE);
          remove_task(DMAP_TASKID_GET_READY);
  #if defined DEDICATED_LOG_ENABLED
-         log_to_file(logfilename, "Admin: <%s> calls rockthevote with %d seconds left on map", kName, timeleft);
+         log_to_file(logfilename, "ADMIN <%s> calls rockthevote with %d seconds left on map", kName, timeleft);
  #endif
          inprogress = 1;
          mselected = false;
-Line 626
+Line 623
          if (nvotes[maps_to_select] > nvotes[b]) {
                  new mapname[32];
                  get_mapname(mapname, 31);
-                 new Float:steptime = get_pcvar_float(pExtendmapStep);
+                 new steptime = get_pcvar_num(pExtendmapStep);
                  set_cvar_float("mp_timelimit", get_cvar_float("mp_timelimit") + steptime);
-                 //oldtimelimit = get_cvar_float("mp_timelimit");
                  istimeset = 1;
                  if (quiet != 2) {
-Line 640
+Line 636
                  }
                  client_print(0, print_chat, "%L", LANG_PLAYER, "DMAP_MAP_EXTENDED2", steptime);
  #if defined DEDICATED_LOG_ENABLED
-                 log_to_file(logfilename, "Vote: Voting for the nextmap finished. Map %s will be extended to next %.0f minutes", mapname, steptime);
+                 log_to_file(logfilename, "Vote: Voting for the nextmap finished. Map %s will be extended to next %d minutes", mapname, steptime);
  #endif
                  inprogress = isend = 0;
                  nmaps_num = nbeforefill;
-Line 1446
+Line 1442
  show_vote_menu(bool:bFirstTime) {
          new menu[512], a, mkeys = (1 << maps_to_select + 1);
-         new Float:steptime = get_pcvar_float(pExtendmapStep);
+         new steptime = get_pcvar_num(pExtendmapStep);
-         new extendint = floatround(steptime);
          new pos;
-Line 1525
+Line 1520
          new mapname[32];
          get_mapname(mapname, 31);
          if (!mp_winlimit && get_cvar_float("mp_timelimit") < get_pcvar_float(pExtendmapMax)) {
-                 formatex(sMenuOption, 63, "%L", LANG_SERVER, "DMAP_MENU_EXTEND", maps_to_select + 1, mapname, extendint);
+                 formatex(sMenuOption, 63, "%L", LANG_SERVER, "DMAP_MENU_EXTEND", maps_to_select + 1, mapname, steptime);
                  append_vote_percent(sMenuOption, maps_to_select, true);
                  pos += formatex(menu[pos], 511, sMenuOption);
-Line 2430
+Line 2425
                  return PLUGIN_HANDLED;
          }
+         if (id == 0) {
+                 announce_config_error("dmap_rtvpercent");
+                 return PLUGIN_HANDLED;
+         }
          new arg[32];
          read_argv(1, arg, 3);
          new Float:percentage = float(str_to_num(arg)) / 100.0;
 Line 2449
                  return PLUGIN_HANDLED;
          }
+         if (id == 0) {
+                 announce_config_error("dmap_rtvplayers");
+                 return PLUGIN_HANDLED;
+         }
          new arg[32];
          read_argv(1, arg, 3);
          new players = str_to_num(arg);
-Line 2468
+Line 2473
                  return PLUGIN_HANDLED;
          }
+         if (id == 0) {
+                 announce_config_error("dmap_rtvwait");
+                 return PLUGIN_HANDLED;
+         }
          new arg[32];
          read_argv(1, arg, 3);
          new wait = str_to_num(arg);
-Line 2487
+Line 2497
                  return PLUGIN_HANDLED;
          }
+         if (id == 0) {
+                 announce_config_error("dmap_messages");
+                 return PLUGIN_HANDLED;
+         }
          new arg[32];
          read_argv(1, arg, 3);
          new wait = str_to_num(arg);
-Line 2506
+Line 2521
                  return PLUGIN_HANDLED;
          }
+         if (id == 0) {
+                 announce_config_error("dmap_mapsnum");
+                 return PLUGIN_HANDLED;
+         }
          new arg[32];
          read_argv(1, arg, 3);
          new maps = str_to_num(arg);
-Line 2521
+Line 2541
          return PLUGIN_HANDLED;
  }
- public dmapmaxnominations(id, level, cid) {
+ public dmapnominations(id, level, cid) {
          if (!cmd_access(id, level, cid, 2)) {
                  return PLUGIN_HANDLED;
          }
+         if (id == 0) {
+                 announce_config_error("dmap_nominations");
+                 return PLUGIN_HANDLED;
+         }
          new arg[32];
          read_argv(1, arg, 3);
          new thisnumber = str_to_num(arg);
-Line 2546
+Line 2571
                  return PLUGIN_HANDLED;
          }
+         if (id == 0) {
+                 announce_config_error("dmap_maxcustom");
+                 return PLUGIN_HANDLED;
+         }
          new arg[32];
          read_argv(1, arg, 3);
          new thisnumber = str_to_num(arg);
-Line 2560
+Line 2590
          return PLUGIN_HANDLED;
  }
- public dmapquiet(id, level, cid) {
+ public dmapquietmode(id, level, cid) {
          if (!cmd_access(id, level, cid, 2)) {
                  return PLUGIN_HANDLED;
          }
+         if (id == 0) {
+                 announce_config_error("dmap_quietmode");
+                 return PLUGIN_HANDLED;
+         }
          new arg[32];
          read_argv(1, arg, 31);
          if (containi(arg, "off") != -1) {
-Line 2590
+Line 2625
                  return PLUGIN_HANDLED;
          }
+         if (id == 0) {
+                 announce_config_error("dmap_rtvtoggle");
+                 return PLUGIN_HANDLED;
+         }
          if (enabled == 0) {
-                 console_print(id, "=========Rockthevote is now enabled==============");
+                 console_print(id, "=========Rockthevote is now enabled=========");
          } else {
-                 console_print(id, "=========Rockthevote is not disabled=================");
+                 console_print(id, "=========Rockthevote is now disabled=========");
          }
          enabled = !enabled;
          savesettings(id);
-Line 2601
+Line 2641
          return PLUGIN_HANDLED;
  }
- public changefreeze(id, level, cid) {
+ public dmapfreeze(id, level, cid) {
          if (!cmd_access(id, level, cid, 1)) {
                  return PLUGIN_HANDLED;
          }
+         if (id == 0) {
+                 announce_config_error("dmap_freeze");
+                 return PLUGIN_HANDLED;
+         }
          if (!bIsCstrike) {
                  console_print(id, "Freeze is always off on non-Counter Strike Servers");
                  return PLUGIN_HANDLED;
-Line 2635
+Line 2680
                  return PLUGIN_HANDLED;
          }
+         if (id == 0) {
+                 announce_config_error("dmap_cyclemode");
+                 return PLUGIN_HANDLED;
+         }
          if (!cycle) {
-                 console_print(id, "=========     Cylce mode is now ON, NO VOTE will take place!   =========");
+                 console_print(id, "=========     Cycle mode is now ON, NO VOTE will take place!   =========");
          } else {
                  console_print(id, "=========     Cycle Mode is already on, no change is made   =========");
                  console_print(id, "=========     If you are trying to enable voting, use command dmap_votemode");
-Line 2656
+Line 2706
                  return PLUGIN_HANDLED;
          }
+         if (id == 0) {
+                 announce_config_error("dmap_votemode");
+                 return PLUGIN_HANDLED;
+         }
          if (cycle) {
                  console_print(id, "=========     Voting mode is now ON, Votes WILL take place   =========");
          } else {
-Line 2674
+Line 2729
                  return PLUGIN_HANDLED;
          }
+         if (id == 0) {
+                 announce_config_error("dmap_banlastmaps");
+                 return PLUGIN_HANDLED;
+         }
          new arg[32];
          read_argv(1, arg, 4);
          new banamount;
-Line 2701
+Line 2761
          if (!(get_user_flags(id) & ADMIN_MAP)) {
                  new myversion[32];
                  get_cvar_string("Deags_Map_Manage", myversion, 31);
-                 console_print(id, "*****This server uses the plugin Deagles NextMap Management %s *****", myversion);
+                 console_print(id, "*****This server uses the plugin Deagles Map Manager %s *****", myversion);
                  console_print(id, "");
                  if (cycle) {
                          console_print(id, "===================  The plugin is set to cycle mode.  No vote will take place   =================");
-Line 2725
+Line 2785
                  }
                  return PLUGIN_HANDLED;
          }
-         //For CS 1.6, the following MOTD will display nicely, for 1.5, It will show html tags.
+         console_print(id, "%L", id, "DMAP_MOTD_LOADING");
          client_print(id, print_chat, "%L", id, "DMAP_MOTD_LOADING");
          showmotdhelp(id);
-Line 2781
+Line 2841
  showsettings(id) {
          console_print(id, "-----------------------------------------------------------------------------------------------");
-         console_print(id, "                 Status of Deagles Map Management Version %s", VERSION);
+         console_print(id, "                 Status of Deagles Map Manager Version %s", VERSION);
          if (cycle) {
                  console_print(id, "===================  Mode is Cycle Mode NO vote will take place   =================");
-Line 2841
+Line 2901
                  console_print(id, "URL to download maps from will not be shown (dmap_mapsurl)");
          }
          console_print(id, "------------------------------------------------------------------------------------------------");
-         console_print(id, "Commands: dmap_status; dmap_cyclemode; dmap_votemode; dmap_quietmode <OFF|NOSOUND|SILENT>;");
+         console_print(id, "Commands: dmap_banlastmaps <n>; dmap_cyclemode; dmap_default; dmap_freeze <ON|OFF>; dmap_mapsnum <n>;");
-         console_print(id, "Commands: dmap_banlastmaps <n>; dmap_default ; dmap_mapsurl <url>; dmap_mapsnum <n>; dmap_maxcustom <n>;");
+         console_print(id, "Commands: dmap_mapsurl <url>; dmap_maxcustom <n>; dmap_messages <n(minutes)>; dmap_nominate <map>;");
-         console_print(id, "Commands: dmap_rtvtoggle; dmap_rtvpercent <n>; dmap_rtvplayers <n>; dmap_rtvwait <n>;");
+         console_print(id, "Commands: dmap_nominations <n>; dmap_quietmode <OFF|NOSOUND|SILENT>; dmap_rockthevote; dmap_rtvpercent <n>;");
-         console_print(id, "Commands: dmap_rockthevote; dmap_freeze; dmap_nominations <n>; dmap_messages <n(minutes)>;");
+         console_print(id, "Commands: dmap_rtvplayers <n>; dmap_rtvtoggle; dmap_rtvwait <n>; dmap_status; dmap_votemode;");
          console_print(id, "Cvars:    amx_emptymap <map>; amx_idletime <n>; amx_staytime <n>; dmap_strict <0|1>;");
          console_print(id, "Cvars:    emptymap_allowed <0|1>; enforce_timelimit <0|1>; amx_extendmap_max <n>; amx_extendmap_step <n>;");
          console_print(id, "Cvars:    nominations_allowed <0|1>; weapon_delay <0|1>");
-Line 3011
+Line 3071
                  return PLUGIN_HANDLED;
          }
+         if (id == 0) {
+                 announce_config_error("dmap_mapsurl");
+                 return PLUGIN_HANDLED;
+         }
          new arg[64];
          read_argv(1, arg, 63);
          if (equali(arg, "http")) {
-Line 3064
+Line 3129
          isbuytime = 0;
  }
- public list_maps2() {
+ public listmaps_override(id) {
-         messagemaps();
+         //TODO: if some cvar = 0 then return
+         list_maps(id);
+         return PLUGIN_HANDLED;
  }
- public list_maps3() {
+ public votemap_override(id) {
-         messagenominated();
+         console_print(id, "%L", id, "DMAP_COMMAND_DISABLED");
+         return PLUGIN_HANDLED;
  }
- public listmaps_override(id) {
+ public say_currentmap(id) {
-         //TODO: if some cvar = 0 then return
+         new mapname[32];
-         list_maps(id);
+         get_mapname(mapname, 31);
+         client_print(id, print_chat, "%L", id, "DMAP_CURRENT_MAP", mapname);
+         return PLUGIN_HANDLED;
+ }
+ public say_recentmaps(id) {
+         if (bannedsofar <= 1) {
+                 client_print(id, print_chat, "%L", id, "DMAP_RECENT_NONE");
+                 return PLUGIN_HANDLED;
+         }
+         new sMaps[192];
+         for (new i=1; i < bannedsofar; i++) {   // Start at 1 to skip current map
+                 if (i == 1) {
+                         formatex(sMaps, 31, "%s", lastmaps[i]);
+                 } else {
+                         format(sMaps, 191, "%s, %s", sMaps, lastmaps[i]);
+                 }
+         }
+         client_print(id, print_chat, "%L", id, "DMAP_RECENT_MAPS", sMaps);
          return PLUGIN_HANDLED;
  }
  public check_conflict() {
          new sDV[8], iDV, bRepeat;
-Line 3123
+Line 3212
          client_print(0, print_chat, "[DMM] CONFLICT DETECTED! Disable %s in plugins.ini.", sPlugin);
  }
- public ff_status(id) {
+ announce_config_error(sCommand[]) {
+         console_print(0, "[DMM] ERROR: The %s command does not belong in any config file.", sCommand);
+         console_print(0, "[DMM] If you really want to run this command, do it from a client console.");
+ }
+ public say_ff(id) {
          client_print(id, print_chat, "%L: %L", LANG_PLAYER, "DMAP_FRIEND_FIRE", LANG_PLAYER, get_cvar_num("mp_friendlyfire") ? "ON" : "OFF");
          return PLUGIN_CONTINUE;
  }
-Line 3143
+Line 3237
          register_clcmd("say", "HandleSay", 0, "Say: vote mapname, nominate mapname, or just mapname to nominate a map, say: nominations");
          register_clcmd("say rockthevote", "rock_the_vote", 0, "Rocks the Vote");
          register_clcmd("say rtv", "rock_the_vote", 0, "Rocks the Vote");
-         register_clcmd("say ff", "ff_status", 0, "Displays friendly fire status");
+         register_clcmd("say ff", "say_ff", 0, "Displays friendly fire status");
-         register_clcmd("say listmaps", "list_maps", 0, "Lists all maps in a window and in console");
+         register_clcmd("say listmaps", "list_maps", 0, "Lists all maps in the console");
          register_clcmd("say nextmap", "say_nextmap", 0, "Shows nextmap information to players");
+         register_clcmd("say currentmap", "say_currentmap", 0, "Shows name of the current map");
+         register_clcmd("say recentmaps", "say_recentmaps", 0, "Shows names of recently played maps");
+         register_clcmd("votemap", "votemap_override", 0, "Override for votemap command in GoldSrc engine");
          register_concmd("dmap_help", "dmaphelp", 0, "Shows on-screen help information about Map Plugin");
          register_concmd("dmap_status", "dmapstatus", ADMIN_DMAP, "Shows settings/status/help of the map management variables");
          register_concmd("dmap_votemode", "dmapvotemode", ADMIN_SUPER_DMAP, "Enables Voting (This is default mode)");
          register_concmd("dmap_cyclemode", "dmapcyclemode", ADMIN_SUPER_DMAP, "Disables Voting (To restore voting use dmap_votemode)");
          register_concmd("dmap_banlastmaps", "dmapbanlastmaps", ADMIN_SUPER_DMAP, "Bans the last <n> maps played from being voted (0-99)");
-         register_concmd("dmap_quietmode", "dmapquiet", ADMIN_SUPER_DMAP, "Usage: <OFF|NOSOUND|SILENT>");
+         register_concmd("dmap_quietmode", "dmapquietmode", ADMIN_SUPER_DMAP, "Usage: <OFF|NOSOUND|SILENT>");
-         register_concmd("dmap_freeze", "changefreeze", ADMIN_SUPER_DMAP, "Toggles Freeze/Drop at end of round ON|off");
+         register_concmd("dmap_freeze", "dmapfreeze", ADMIN_SUPER_DMAP, "Toggles Freeze/Drop at end of round ON|off");
          register_concmd("dmap_messages", "dmapmessages", ADMIN_SUPER_DMAP, "Sets the time interval in minutes between messages");
          register_concmd("dmap_rtvtoggle", "dmaprtvtoggle", ADMIN_SUPER_DMAP, "Toggles on|off Ability of players to use rockthevote");
-         register_concmd("dmap_rockthevote", "admin_rockit", ADMIN_DMAP, "(option: now) Allows admins to force a vote");
+         register_concmd("dmap_rockthevote", "admin_rockit", ADMIN_DMAP, "Allows admins to force a vote");
-         register_concmd("amx_rockthevote", "admin_rockit", ADMIN_DMAP, "(option: now) Allows admins to force a vote");
+         register_concmd("amx_rockthevote", "admin_rockit", ADMIN_DMAP, "Allows admins to force a vote");
-         register_concmd("amx_rtv", "admin_rockit", ADMIN_DMAP, "(option: now) Allows admins to force a vote");
+         register_concmd("amx_rtv", "admin_rockit", ADMIN_DMAP, "Allows admins to force a vote");
          register_concmd("dmap_rtvpercent", "dmaprtvpercent", ADMIN_SUPER_DMAP, "Set the percent (3-100) of players for a rtv");
          register_concmd("dmap_rtvplayers", "dmaprtvplayers", ADMIN_SUPER_DMAP, "Sets the minimum number of players needed to rockthevote");
          register_concmd("dmap_rtvwait", "dmaprtvwait", ADMIN_SUPER_DMAP, "Sets the minimum time before rockthevote can occur (5-30)");
          register_concmd("dmap_default", "dmapdefaults", ADMIN_SUPER_DMAP, "Will restore settings to default");
          register_concmd("dmap_mapsurl", "dmapmapsurl", ADMIN_SUPER_DMAP, "Specify what website to get custom maps from");
          register_concmd("dmap_mapsnum", "dmapmapsnum", ADMIN_SUPER_DMAP, "Set number of maps in vote (will not take effect until next map");
-         register_concmd("dmap_nominations", "dmapmaxnominations", ADMIN_SUPER_DMAP, "Set maximum number of nominations for each person");
+         register_concmd("dmap_nominations", "dmapnominations", ADMIN_SUPER_DMAP, "Set maximum number of nominations for each person");
          register_concmd("dmap_maxcustom", "dmapmaxcustom", ADMIN_SUPER_DMAP, "Set maximum number of custom nominations that may be made");
          register_concmd("dmap_cancelvote", "dmapcancelvote", ADMIN_DMAP, "Cancels the rocked vote");
          register_concmd("dmap_nominate", "dmapnominate", ADMIN_DMAP, "<mapname> - Force nomination of a map by an admin");

 Legend:



Removed from v.51
 


changed lines


 
Added in v.53
 Legend:



Removed from v.51
 


changed lines


 
Added in v.53
-Removed from v.51
+Added in v.53

Contact webmaster	ViewVC Help
Powered by ViewVC