Skip to content

Commit f03f517

Browse files
authored
Merge pull request #12 from surftimer/SM1.11
Resolve SM1.11 compilation warnings/errors
2 parents ca8feb8 + c834e6c commit f03f517

File tree

4 files changed

+17
-5
lines changed

4 files changed

+17
-5
lines changed

addons/sourcemod/scripting/st-mapchooser.sp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,6 +1218,8 @@ public int Native_InitiateVote(Handle plugin, int numParams)
12181218

12191219
LogAction(-1, -1, "Starting map vote because outside request");
12201220
InitiateVote(when, inputarray);
1221+
1222+
return 0;
12211223
}
12221224

12231225
/* native bool CanMapChooserStartVote(); */
@@ -1245,8 +1247,9 @@ public int Native_GetExcludeMapList(Handle plugin, int numParams)
12451247

12461248
if (array == null)
12471249
{
1248-
return;
1250+
return 0;
12491251
}
1252+
12501253
int size = g_OldMapList.Length;
12511254
char map[PLATFORM_MAX_PATH];
12521255

@@ -1256,7 +1259,7 @@ public int Native_GetExcludeMapList(Handle plugin, int numParams)
12561259
array.PushString(map);
12571260
}
12581261

1259-
return;
1262+
return 0;
12601263
}
12611264

12621265
/* native void GetNominatedMapList(ArrayList maparray, ArrayList ownerarray = null); */
@@ -1266,7 +1269,7 @@ public int Native_GetNominatedMapList(Handle plugin, int numParams)
12661269
ArrayList ownerarray = view_as<ArrayList>(GetNativeCell(2));
12671270

12681271
if (maparray == null)
1269-
return;
1272+
return 0;
12701273

12711274
char map[PLATFORM_MAX_PATH];
12721275

@@ -1283,7 +1286,7 @@ public int Native_GetNominatedMapList(Handle plugin, int numParams)
12831286
}
12841287
}
12851288

1286-
return;
1289+
return 0;
12871290
}
12881291

12891292
public void db_setupDatabase()
@@ -1435,7 +1438,8 @@ public bool DisplayVoteToPros(int time, int flags, Menu menu)
14351438
players[total++] = i;
14361439
}
14371440
}
1438-
menu.DisplayVote(players, total, time, flags);
1441+
1442+
return menu.DisplayVote(players, total, time, flags);
14391443
}
14401444

14411445
stock bool VIPBypass(int client)

addons/sourcemod/scripting/st-nominations.sp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,8 @@ public int IncompleteNominate_SelectStyleHandler(Menu menu, MenuAction action, i
418418
{
419419
delete menu;
420420
}
421+
422+
return 0;
421423
}
422424

423425
void AttemptIncompleteNominate(int client, int style)
@@ -857,6 +859,8 @@ public int TiersMenuHandler(Menu menu, MenuAction action, int client, int param2
857859
DisplayMenu(g_aTierMenus.Get(StringToInt(option)-g_TierMin), client, MENU_TIME_FOREVER);
858860
}
859861
}
862+
863+
return 0;
860864
}
861865

862866
public void RemoveMapPath(const char[] map, char[] destination, any maxlen)

addons/sourcemod/scripting/st-rockthevote.sp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,7 @@ int GetRealClientCount()
340340
public Action Timer_DelayRTV(Handle timer)
341341
{
342342
g_RTVAllowed = true;
343+
return Plugin_Stop;
343344
}
344345

345346
void StartRTV()

addons/sourcemod/scripting/st-voteextend.sp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ public void OnConfigsExecuted()
8888
public Action Timer_Delay(Handle timer)
8989
{
9090
g_bVEAllowed = true;
91+
return Plugin_Stop;
9192
}
9293

9394
public Action Command_VoteExtend(int client, int args)
@@ -208,6 +209,8 @@ public int H_VoteExtend(Menu tMenu, MenuAction action, int client, int item)
208209
{
209210
CloseHandle(tMenu);
210211
}
212+
213+
return 0;
211214
}
212215

213216
stock bool IsValidClient(int client)

0 commit comments

Comments
 (0)