Based on input from John S. from Valve, all plugins that use the ProduceResolvedMapList function should be rewritten and the ProduceResolvedMapList stock removed entirely.

This is based on his comments about how tf_workshop_map_sync can be delayed.

I will do this sometime tonight or tomorrow.

That last commit is to convert a ClearArray(g_NextMapList) to the more modern g_NextMapList.Clear(). This got missed when I was cleaning up the 1.6 to 1.7 syntax conversion in pull request #226.

This is now based on PR #351, but both it and this have Linux issues at the moment.

I'll do some plugin testing on my test server once this is fixed.

Not sure when it happened, but I'm seeing bugs in nominations... need to check other plugins as well.

D:

Nicholas Hastings

Ross Bemrose mailto:[email protected]
Wednesday, July 1, 2015 9:42 PM

Not sure when it happened, but I'm seeing bugs in nominations... need
to check other plugins as well.

—
Reply to this email directly or view it on GitHub
#350 (comment).

Ross Bemrose mailto:[email protected]
Thursday, June 18, 2015 11:52 PM

NOTE: Since this branch was based on the Fuzzymapnative branch, it
includes all the changes made in pull request #348
#348 as well.

This adds two new stocks to sourcemod.inc :

GetFriendlyMapName changes a CSGO or TF2 workshop path to just the
base mapname. This is intended for display purposes in various
plugins and/or plugins that need compatibility with existing names.

Note that in TF2, at this time you can't get the proper map path
for a workshop map unless you |tf_workshop_map_sync| the map after
the server start so that the server is actively tracking it.

ProduceResolvedMapList runs ResolveFuzzyMapName on every entry in
an ArrayList and places the resolved name in the second ArrayList.
Also has the side effect of clearing the target ArrayList first.

The following plugins have all been updated to make calls to
ResolveFuzzyMapName and GetFriendlyMapName as appropriate:

• MapChooser
• Nominations
• NextMap
• BaseVotes
• BaseTriggers

---

    You can view, comment on, or merge this pull request online at:

#350

    Commit Summary

• Add new ResolveFuzzyMapName native, modifying internal
  ResolveFuzzyMapName command to be a member function.

• Fix a typo and a bad description for the native

• Make it return true if the maps are the same.

• TF2 doesn't support engine->IsMapValid any more... it's failing
  for cp_dustbowl, for example. Therefore, don't waste time calling it.

• Add a way to use resolved maps to MapChooser. More plugins to go,
  as well as calling the new GetFriendlyMapName for displaying.

• Changes to a bunch of plugins. Still working on it and need to do
  a branch change.

• ResolveFuzzyMapName is now exposed as part of IGameHelpers and
  Bumped IGameHelpers to version 11.

• Merge branch 'fuzzymapnative' into fuzzymap-plugins

• Move the stocks from mapchooser.inc to sourcemod.inc (where
  ReadMapList is). This is because non-MapChooser plugins may also
  need them.

• Nominations now does the map resolving up front instead of one by one.

• GetFriendlyMapName now works for CS:GO.

• Fixed Mapchooser's "Nextmap Voting Finished" to use the map's
  info, which is the friendly name stored earlier.

• Update basetriggers to support friendly map names. Maps are
  assumed to be in friendly format in GetNextMap.

• The next map may not be in resolved format, so lets resolve it
  when asking for the friendly name.

• Change basetriggers back to not forcing resolve before
  GetFriendlyMapName.

• Fix issues with basetriggers chat commands using a different method.

• basevotes now displays the friendlyname

• Last change to basevotes won't work for single-item votes,
  implemented a different fix.

  File Changes
  

• M core/HalfLife2.cpp
  https://github.com/alliedmodders/sourcemod/pull/350/files#diff-0
  (26)

• M core/HalfLife2.h
  https://github.com/alliedmodders/sourcemod/pull/350/files#diff-1
  (1)

• M core/smn_halflife.cpp
  https://github.com/alliedmodders/sourcemod/pull/350/files#diff-2
  (17)

• M plugins/basecommands/map.sp
  https://github.com/alliedmodders/sourcemod/pull/350/files#diff-3
  (16)

• M plugins/basetriggers.sp
  https://github.com/alliedmodders/sourcemod/pull/350/files#diff-4
  (12)

• M plugins/basevotes.sp
  https://github.com/alliedmodders/sourcemod/pull/350/files#diff-5
  (7)

• M plugins/basevotes/votemap.sp
  https://github.com/alliedmodders/sourcemod/pull/350/files#diff-6
  (12)

• M plugins/include/halflife.inc
  https://github.com/alliedmodders/sourcemod/pull/350/files#diff-7
  (17)

• M plugins/include/sourcemod.inc
  https://github.com/alliedmodders/sourcemod/pull/350/files#diff-8
  (99)

• M plugins/mapchooser.sp
  https://github.com/alliedmodders/sourcemod/pull/350/files#diff-9
  (29)

• M plugins/nextmap.sp
  https://github.com/alliedmodders/sourcemod/pull/350/files#diff-10 (13)

• M plugins/nominations.sp
  https://github.com/alliedmodders/sourcemod/pull/350/files#diff-11 (86)

• M public/IGameHelpers.h
  https://github.com/alliedmodders/sourcemod/pull/350/files#diff-12 (15)

  Patch Links:
  

• https://github.com/alliedmodders/sourcemod/pull/350.patch

• https://github.com/alliedmodders/sourcemod/pull/350.diff

—
Reply to this email directly or view it on GitHub
#350.

@psychonic I thought I'd tested it since I switched it over to FindMap... maybe I didn't and just thought I did.

Then again, I'm testing it now.

FindMap itself is working as my mappath command is resolving these maps, they're just not being resolved in the current code for nominations/mapchooser/others

Oh wait, this may be because I'm not syncing workshop maps until AFTER plugins load due to a server crashing bug that should be fixed in tomorrow's update. Let me test it again.

Yup, sure enough, that's exactly what was causing the issue I was seeing.

It'll be nice if they add the mapcyclefile auto-sync to tomorrow's TF2 update so I can remove the plugin I'm using to late-sync these maps.

Yay, panicking over nothing.

I'm going to redo this pull request.

Not only is its history a mess because of the number of different methods I've done, but I think GetFriendlyMapName would be better served as a native.

In fact, I'm rewriting it as a native named GetWorkshopMapBaseName right now. The name is a bit verbose, but it does explain what it's for.

So, expect to see a new pull request with that soon. Not sure when as I'll need to do some testing on it after it's finished.

@powerlord Just for reference, if you rebase your branch you can clean it up quite easily. This isn't recommended for a number of reasons, but you can recover this way.

@KyleSanderson You can, but they recommend you don't do it if it's already been pushed to a public repository.