More New API changes for MapChooser, Nominations, RockTheVote, RandomCycle, and NextMap by powerlord · Pull Request #226 · alliedmodders/sourcemod

powerlord · 2014-12-16T21:27:46Z

This depends on pull request 225 and mapchooser will not compile without it.

Changes include things like:

Converting old style variable declaration to new style
Converting old-style casts to view_as
Converting from Handle to ArrayList where adt_arrays are being used.

There are also misc cleanups that were missed prior to this:

Converting hard-coded iength for map names to be PLATFORM_MAX_PATH instead of 32, 33, or 64.
Converting hard-coded lengths for client names to MAX_NAME_LENGTH+1 (yay null terminator).

Note: This is only the first upgrade I have planned for MapChooser. I also have plans for introducing fixes for various issues with different games, but those need more testing.

…nto with Advanced Vote Callbacks.

…MethodMap stuff

powerlord · 2014-12-16T22:34:59Z

OK, question time to those who are looking at this code.

Is it better to continue passing INVALID_HANDLE to CreateTimer, or should I be passing view_as<DataPack>(null) when the Timer function is expecting a DataPack?

dvander · 2014-12-16T23:27:30Z

I'd be okay with allowing an implicit coercion from null to any, if that is the problem.

powerlord · 2014-12-17T15:30:52Z

@dvander Well, I guess the question is... do we want to get rid of the INVALID_HANDLE constant wherever possible? If we do, then we may want to allow an implicit conversion of null to any to allow us to use null in places like CreateTimer.

…yright header to mapchooser.inc (all .inc files use the same copyright header, so...)

powerlord · 2014-12-17T16:57:03Z

I realized I missed converting nextmap.inc despite converting nextmap.sp.

Also, updated the copyright years to 2014 to the files I've edited.

…nto mapchooser-updates

powerlord · 2014-12-19T16:24:30Z

er... ignore the newdecls warning commit (f500e20). I'm going to roll that back and make a new pull request for it.

…nto mapchooser-updates

…ments in mapchooser.sp to match the new mapchooser.inc signature.

…nto mapchooser-updates

powerlord · 2015-06-04T22:02:28Z

Side note: Since this hasn't been mentioned yet, this pull request also fixes a few locations that were still hard-coding 32, 64, or 65 for the map name string.

psychonic · 2015-06-04T22:26:07Z

Whoops! I completely forgot about this PR.

Side note: Since this hasn't been mentioned yet, this pull request also fixes a few locations that were still hard-coding 32, 64, or 65 for the map name string.

I took care of this yesterday in #343, landing shortly, but there shouldn't be a conflict since both use PLATFORM_MAX_PATH for the sizes now.

I do see a couple of error reported on this though, due to the added "#pragma newdecls required":

C:\projects\sourcemod\plugins\mapchooser.sp(562) : error 240: 'MenuAction:' is an old-style tag operation; use view_as(expression) instead
C:\projects\sourcemod\plugins\mapchooser.sp(794) : error 240: 'MenuAction:' is an old-style tag operation; use view_as(expression) instead

Do you mind fixing the errors and merging master back into your branch since it's been quite some time (our fault)?

powerlord · 2015-06-04T23:08:11Z

@psychonic The errors you're seeing are actually a bug in menus.inc and were fixed in master by PR #229.

psychonic · 2015-06-04T23:08:55Z

Touché.

powerlord · 2015-06-05T00:16:05Z

Urgh, attempting to merge master into this is introducing all sorts of... fun... conflicts.

powerlord · 2015-06-05T01:17:31Z

I seriously hope this didn't mess up the sourcepawn submodule. I had to Google how to resolve it. Which was to git revert sourcepawn it, then git rm sourcepawn.

Edit: Also, I didn't edit the commit message, which apparently listed the conflicts I had just manually resolved as not being resolved. :/

powerlord · 2015-06-05T01:30:35Z

sigh of course it f'ed it up. Time to rollback and try again.

…updates Conflicts: plugins/nominations.sp plugins/rockthevote.sp

psychonic · 2015-06-12T18:36:42Z

plugins/include/mapchooser.inc

You can ditch these noreturn tags for void returns if you want. They were necessary before it was clear whether a call even returned a value or not.

psychonic · 2015-06-12T18:48:21Z

All of the newdecl and buffer size updates look good. I still need to review the actual functionality changes, which is fortunately only a small minority of this.

psychonic · 2015-06-12T18:54:42Z

I misread the PR and some of the code I guess. "New API" is referring to the new-style syntax and methodmaps, not new mapchooser API. I thought that I had spotted some changes to the nominations API. Will take another look.

psychonic · 2015-06-12T18:58:07Z

I thought that I had spotted some changes to the nominations API. Will take another look.

It was the comments on the native impls that were throwing me off, making it look like changes that were really just updating a comment to match the prototype in the inc.

All looks good. Thanks for updating these.

More New API changes for MapChooser, Nominations, RockTheVote, RandomCycle, and NextMap.

powerlord added 6 commits December 16, 2014 13:38

Update MapChooser to use 1.7 syntax... except there's a bug you run i…

46839b9

…nto with Advanced Vote Callbacks.

Eliminate extraneous view_as calls and also update mapchooser.inc.

bc4d6b7

Update NextMap, Nominations, RandomCycle, and RockTheVote with newer …

1b79252

…MethodMap stuff

Convert the MapChooser VoteHandlers over to the new style.

8272151

Deleted comment... checked into it and its working as intended.

2d5b71c

Missed a few GetArrayCell and GetArraySizes in MapChooser.

032dde7

powerlord added 2 commits December 17, 2014 11:07

Change all view_as<>(null) back to INVALID_HANDLE for now.

ccf5aa6

Updated nextmap.inc. Also fixed copyright years and added missing cop…

f40bfbf

…yright header to mapchooser.inc (all .inc files use the same copyright header, so...)

powerlord added 2 commits December 17, 2014 16:05

Added two items missed in the original conversion with the Runoff vote.

01f4b20

Merge branch 'master' of https://github.com/alliedmodders/sourcemod i…

a0dd8cb

…nto mapchooser-updates

powerlord referenced this pull request Dec 19, 2014

Bump version to 1.8.0-dev.

4311dc3

powerlord added 6 commits December 22, 2014 15:56

Merge branch 'master' of https://github.com/alliedmodders/sourcemod i…

6dff44d

…nto mapchooser-updates

Merge branch 'master' of https://github.com/alliedmodders/sourcemod i…

84782a4

…nto mapchooser-updates

Fixes to make mapchooser.inc transitional compliant. Also updated com…

f69f4eb

…ments in mapchooser.sp to match the new mapchooser.inc signature.

Merge branch 'master' of https://github.com/alliedmodders/sourcemod i…

a9961d3

…nto mapchooser-updates

ClearArray was changed to Clear in recent SourceMod builds.

8567246

Merge branch 'master' of https://github.com/alliedmodders/sourcemod i…

691d891

…nto mapchooser-updates

powerlord closed this Jan 19, 2015

powerlord deleted the mapchooser-updates branch January 19, 2015 21:33

powerlord restored the mapchooser-updates branch March 30, 2015 20:51

powerlord reopened this Mar 30, 2015

powerlord mentioned this pull request May 14, 2015

Ported some includes over to new syntax #327

Closed

powerlord added 2 commits June 4, 2015 21:39

Merge remote-tracking branch 'remotes/origin/master' into mapchooser-…

338b4ed

…updates Conflicts: plugins/nominations.sp plugins/rockthevote.sp

One minor issue left from the merge

ba0bf56

psychonic reviewed Jun 12, 2015
View reviewed changes

psychonic added a commit that referenced this pull request Jun 12, 2015

Merge pull request #226 from powerlord/mapchooser-updates

d0574db

More New API changes for MapChooser, Nominations, RockTheVote, RandomCycle, and NextMap.

psychonic merged commit d0574db into alliedmodders:master Jun 12, 2015

powerlord mentioned this pull request Jun 24, 2015

FindMap plugins #350

Closed

Uh oh!

Conversation

powerlord commented Dec 16, 2014

Uh oh!

powerlord commented Dec 16, 2014

Uh oh!

dvander commented Dec 16, 2014

Uh oh!

powerlord commented Dec 17, 2014

Uh oh!

powerlord commented Dec 17, 2014

Uh oh!

powerlord commented Dec 19, 2014

Uh oh!

powerlord commented Jun 4, 2015

Uh oh!

psychonic commented Jun 4, 2015

Uh oh!

powerlord commented Jun 4, 2015

Uh oh!

psychonic commented Jun 4, 2015

Uh oh!

powerlord commented Jun 5, 2015

Uh oh!

powerlord commented Jun 5, 2015

Uh oh!

powerlord commented Jun 5, 2015

Uh oh!

psychonic Jun 12, 2015

Choose a reason for hiding this comment

Uh oh!

psychonic commented Jun 12, 2015

Uh oh!

psychonic commented Jun 12, 2015

Uh oh!

psychonic commented Jun 12, 2015

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants