UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes to make mapchooser.inc transitional compliant. Also updated comments in mapchooser.sp to match the new mapchooser.inc signature.

Browse Source
This commit is contained in:
Ross Bemrose 2014-12-26 12:36:12 -05:00
parent 84782a40df
commit f69f4eb85f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/include/mapchooser.inc
View File

@ -82,7 +82,7 @@ native bool RemoveNominationByOwner(int owner);
* @param array An ADT array handle to add the map strings to. * @param array An ADT array handle to add the map strings to.
* @noreturn * @noreturn
*/ */
native GetExcludeMapList(ArrayList array); native void GetExcludeMapList(ArrayList array);
/** /**
* Gets the current list of nominated maps. * Gets the current list of nominated maps.
@ -91,7 +91,7 @@ native GetExcludeMapList(ArrayList array);
* @param ownerarray An optional ADT array handle to add the nominator client indexes to. * @param ownerarray An optional ADT array handle to add the nominator client indexes to.
* @noreturn * @noreturn
*/ */
native GetNominatedMapList(ArrayList maparray, ArrayList ownerarray = null); native void GetNominatedMapList(ArrayList maparray, ArrayList ownerarray = null);
/** /**
* Checks if MapChooser will allow a vote * Checks if MapChooser will allow a vote
@ -109,7 +109,7 @@ native bool CanMapChooserStartVote();
* @param when MapChange consant of when the resulting mapchange should occur. * @param when MapChange consant of when the resulting mapchange should occur.
* @param inputarray ADT array list of maps to add to the vote. * @param inputarray ADT array list of maps to add to the vote.
*/ */
native InitiateMapChooserVote(MapChange when, ArrayList inputarray=null); native void InitiateMapChooserVote(MapChange when, ArrayList inputarray=null);
/** /**
* Checks if MapChooser's end of map vote has completed. * Checks if MapChooser's end of map vote has completed.
@ -136,7 +136,7 @@ forward void OnNominationRemoved(const char[] map, int owner);
*/ */
forward void OnMapVoteStarted(); forward void OnMapVoteStarted();
public SharedPlugin:__pl_mapchooser = public SharedPlugin __pl_mapchooser =
{ {
name = "mapchooser", name = "mapchooser",
file = "mapchooser.smx", file = "mapchooser.smx",
@ -147,7 +147,7 @@ public SharedPlugin:__pl_mapchooser =
#endif #endif
}; };
public __pl_mapchooser_SetNTVOptional() public void __pl_mapchooser_SetNTVOptional()
{ {
MarkNativeAsOptional("NominateMap"); MarkNativeAsOptional("NominateMap");
MarkNativeAsOptional("RemoveNominationByMap"); MarkNativeAsOptional("RemoveNominationByMap");

6
plugins/mapchooser.sp
View File

@ -1122,7 +1122,7 @@ public int Native_RemoveNominationByOwner(Handle plugin, int numParams)
return InternalRemoveNominationByOwner(GetNativeCell(1)); return InternalRemoveNominationByOwner(GetNativeCell(1));
} }
/* native InitiateMapChooserVote(MapChange when, ArrayList inputarray=null); */ /* native void InitiateMapChooserVote(MapChange when, ArrayList inputarray=null); */
public int Native_InitiateVote(Handle plugin, int numParams) public int Native_InitiateVote(Handle plugin, int numParams)
{ {
MapChange when = view_as<MapChange>(GetNativeCell(1)); MapChange when = view_as<MapChange>(GetNativeCell(1));
@ -1150,7 +1150,7 @@ public int Native_EndOfMapVoteEnabled(Handle plugin, int numParams)
return g_Cvar_EndOfMapVote.BoolValue; return g_Cvar_EndOfMapVote.BoolValue;
} }
/* native GetExcludeMapList(ArrayList array); */ /* native void GetExcludeMapList(ArrayList array); */
public int Native_GetExcludeMapList(Handle plugin, int numParams) public int Native_GetExcludeMapList(Handle plugin, int numParams)
{ {
ArrayList array = view_as<ArrayList>(GetNativeCell(1)); ArrayList array = view_as<ArrayList>(GetNativeCell(1));
@ -1171,7 +1171,7 @@ public int Native_GetExcludeMapList(Handle plugin, int numParams)
return; return;
} }
/* native GetNominatedMapList(ArrayList maparray, ArrayList ownerarray = null); */ /* native void GetNominatedMapList(ArrayList maparray, ArrayList ownerarray = null); */
public int Native_GetNominatedMapList(Handle plugin, int numParams) public int Native_GetNominatedMapList(Handle plugin, int numParams)
{ {
ArrayList maparray = view_as<ArrayList>(GetNativeCell(1)); ArrayList maparray = view_as<ArrayList>(GetNativeCell(1));