From f69f4eb85fdf99f1b1c5b0e9a1a41715128f9b59 Mon Sep 17 00:00:00 2001
From: Ross Bemrose <rbemrose@gmail.com>
Date: Fri, 26 Dec 2014 12:36:12 -0500
Subject: [PATCH] Fixes to make mapchooser.inc transitional compliant.  Also
 updated comments in mapchooser.sp to match the new mapchooser.inc signature.

---
 plugins/include/mapchooser.inc | 10 +++++-----
 plugins/mapchooser.sp          |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/include/mapchooser.inc b/plugins/include/mapchooser.inc
index 6c4bb4ec..8fef0d9b 100644
--- a/plugins/include/mapchooser.inc
+++ b/plugins/include/mapchooser.inc
@@ -82,7 +82,7 @@ native bool RemoveNominationByOwner(int owner);
  * @param array		An ADT array handle to add the map strings to.
  * @noreturn
  */
-native GetExcludeMapList(ArrayList array);
+native void GetExcludeMapList(ArrayList array);
 
 /**
  * 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.
  * @noreturn
  */
-native GetNominatedMapList(ArrayList maparray, ArrayList ownerarray = null);
+native void GetNominatedMapList(ArrayList maparray, ArrayList ownerarray = null);
 
 /**
  * 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 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.
@@ -136,7 +136,7 @@ forward void OnNominationRemoved(const char[] map, int owner);
  */
 forward void OnMapVoteStarted();
 
-public SharedPlugin:__pl_mapchooser = 
+public SharedPlugin __pl_mapchooser = 
 {
 	name = "mapchooser",
 	file = "mapchooser.smx",
@@ -147,7 +147,7 @@ public SharedPlugin:__pl_mapchooser =
 #endif
 };
 
-public __pl_mapchooser_SetNTVOptional()
+public void __pl_mapchooser_SetNTVOptional()
 {
 	MarkNativeAsOptional("NominateMap");
 	MarkNativeAsOptional("RemoveNominationByMap");
diff --git a/plugins/mapchooser.sp b/plugins/mapchooser.sp
index 3d38b2e8..3934f9e3 100644
--- a/plugins/mapchooser.sp
+++ b/plugins/mapchooser.sp
@@ -1122,7 +1122,7 @@ public int Native_RemoveNominationByOwner(Handle plugin, int numParams)
 	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)
 {
 	MapChange when = view_as<MapChange>(GetNativeCell(1));
@@ -1150,7 +1150,7 @@ public int Native_EndOfMapVoteEnabled(Handle plugin, int numParams)
 	return g_Cvar_EndOfMapVote.BoolValue;
 }
 
-/* native GetExcludeMapList(ArrayList array); */
+/* native void GetExcludeMapList(ArrayList array); */
 public int Native_GetExcludeMapList(Handle plugin, int numParams)
 {
 	ArrayList array = view_as<ArrayList>(GetNativeCell(1));
@@ -1171,7 +1171,7 @@ public int Native_GetExcludeMapList(Handle plugin, int numParams)
 	return;
 }
 
-/* native GetNominatedMapList(ArrayList maparray, ArrayList ownerarray = null); */
+/* native void GetNominatedMapList(ArrayList maparray, ArrayList ownerarray = null); */
 public int Native_GetNominatedMapList(Handle plugin, int numParams)
 {
 	ArrayList maparray = view_as<ArrayList>(GetNativeCell(1));