compatible to new include files

This commit is contained in:
Felix Geyer 2004-03-07 14:30:53 +00:00
parent 4744f0dc0e
commit 9f6b206881
26 changed files with 51 additions and 26 deletions

View File

@ -33,6 +33,7 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
#define MAX_ADMINS 64 #define MAX_ADMINS 64

View File

@ -33,6 +33,8 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
#include <mysql>
#define MAX_ADMINS 64 #define MAX_ADMINS 64

View File

@ -33,6 +33,7 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
// Uncomment if you want to display // Uncomment if you want to display
// names with hud messages // names with hud messages

View File

@ -33,6 +33,8 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
#include <engine>
#define MAXRCONCVARS 16 #define MAXRCONCVARS 16
new g_cvarRcon[ MAXRCONCVARS ][32] new g_cvarRcon[ MAXRCONCVARS ][32]
@ -181,7 +183,7 @@ public cmdBan(id,level,cid){
name,get_user_userid(id),authid, name2,userid2,authid2,minutes,reason) name,get_user_userid(id),authid, name2,userid2,authid2,minutes,reason)
new temp[64] new temp[64]
if (strtonum(minutes)) if (str_to_int(minutes))
format(temp,63,"for %s min.",minutes) format(temp,63,"for %s min.",minutes)
else else
temp = "permanently" temp = "permanently"
@ -254,7 +256,7 @@ public cmdSlap(id,level,cid){
if (!player) return PLUGIN_HANDLED if (!player) return PLUGIN_HANDLED
new spower[32],authid[32],name2[32],authid2[32],name[32] new spower[32],authid[32],name2[32],authid2[32],name[32]
read_argv(2,spower,31) read_argv(2,spower,31)
new damage = strtonum(spower) new damage = str_to_int(spower)
user_slap(player,damage) user_slap(player,damage)
get_user_authid(id,authid,31) get_user_authid(id,authid,31)
get_user_name(id,name,31) get_user_name(id,name,31)

View File

@ -51,7 +51,7 @@ public client_putinserver(id)
public cmdHelp(id,level,cid){ public cmdHelp(id,level,cid){
new arg1[8],flags = get_user_flags(id) new arg1[8],flags = get_user_flags(id)
new start = read_argv(1,arg1,7) ? strtonum(arg1) : 1 new start = read_argv(1,arg1,7) ? str_to_int(arg1) : 1
if (--start < 0) start = 0 if (--start < 0) start = 0
new clcmdsnum = get_concmdsnum(flags,id) new clcmdsnum = get_concmdsnum(flags,id)
if (start >= clcmdsnum) start = clcmdsnum - 1 if (start >= clcmdsnum) start = clcmdsnum - 1

View File

@ -33,6 +33,7 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
// Comment if you don't want to hide not used reserved slots // Comment if you don't want to hide not used reserved slots
#define HIDE_RESERVED_SLOTS #define HIDE_RESERVED_SLOTS
@ -60,7 +61,7 @@ public client_authorized(id)
public client_connect(id) public client_connect(id)
#endif #endif
{ {
new maxplayers = get_maxplayers( ) new maxplayers = get_maxplayers()
new players = get_playersnum( 1 ) new players = get_playersnum( 1 )
new limit = maxplayers - get_cvar_num( "amx_reservation" ) new limit = maxplayers - get_cvar_num( "amx_reservation" )
@ -75,7 +76,7 @@ public client_connect(id)
#if !defined NO_STEAM #if !defined NO_STEAM
client_cmd(id,g_cmdLoopback) client_cmd(id,g_cmdLoopback)
#else #else
if ( is_user_bot(id) ) if ( is_user_bot(id) )
server_cmd("kick #%d", get_user_userid(id) ) server_cmd("kick #%d", get_user_userid(id) )
else else
client_cmd(id,"echo ^"Dropped due to slot reservation^";disconnect") client_cmd(id,"echo ^"Dropped due to slot reservation^";disconnect")

View File

@ -33,6 +33,7 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
new g_Answer[128] new g_Answer[128]
new g_optionName[4][32] new g_optionName[4][32]
@ -332,7 +333,7 @@ public cmdVoteKickBan(id,level,cid) {
if (voteban) if (voteban)
get_user_authid(player,g_optionName[0],31) get_user_authid(player,g_optionName[0],31)
else else
numtostr(get_user_userid(player),g_optionName[0],31) int_to_str(get_user_userid(player),g_optionName[0],31)
new authid[32],name[32] new authid[32],name[32]
get_user_authid(id,authid,31) get_user_authid(id,authid,31)
get_user_name(id,name,31) get_user_name(id,name,31)
@ -357,4 +358,4 @@ public cmdVoteKickBan(id,level,cid) {
console_print(id, g_votingStarted ) console_print(id, g_votingStarted )
g_voteCount = {0,0,0,0} g_voteCount = {0,0,0,0}
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }

View File

@ -33,6 +33,7 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
/* Commands Menus */ /* Commands Menus */

View File

@ -6,7 +6,7 @@ rem modified by the AMX Mod X Development Team
if not exist compiled mkdir compiled if not exist compiled mkdir compiled
if exist temp.txt del temp.txt if exist temp.txt del temp.txt
for %%i in (*.sma) do sc %%i -ocompiled\%%i >> temp.txt for %%i in (*.sma) do sc %%i -e%%i.txt -ocompiled\%%i >> temp.txt
copy compiled\*.sma compiled\*.amx copy compiled\*.sma compiled\*.amx
del compiled\*.sma del compiled\*.sma
cls cls

View File

@ -33,6 +33,7 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
#define MAX_MESSAGES 6 #define MAX_MESSAGES 6
#define X_POS -1.0 #define X_POS -1.0
@ -50,7 +51,7 @@ public plugin_init(){
register_cvar("amx_freq_imessage","10") register_cvar("amx_freq_imessage","10")
new lastinfo[8] new lastinfo[8]
get_localinfo("lastinfomsg",lastinfo,7) get_localinfo("lastinfomsg",lastinfo,7)
g_Current = strtonum(lastinfo) g_Current = str_to_int(lastinfo)
set_localinfo("lastinfomsg","") set_localinfo("lastinfomsg","")
} }
@ -81,11 +82,11 @@ public setMessage(id,level,cid) {
while(replace(g_Messages[g_MessagesNum],380,"\n","^n")){} while(replace(g_Messages[g_MessagesNum],380,"\n","^n")){}
new mycol[12] new mycol[12]
read_argv(2,mycol,11) // RRRGGGBBB read_argv(2,mycol,11) // RRRGGGBBB
g_Values[g_MessagesNum][2] = strtonum(mycol[6]) g_Values[g_MessagesNum][2] = str_to_int(mycol[6])
mycol[6] = 0 mycol[6] = 0
g_Values[g_MessagesNum][1] = strtonum(mycol[3]) g_Values[g_MessagesNum][1] = str_to_int(mycol[3])
mycol[3] = 0 mycol[3] = 0
g_Values[g_MessagesNum][0] = strtonum(mycol[0]) g_Values[g_MessagesNum][0] = str_to_int(mycol[0])
g_MessagesNum++ g_MessagesNum++
new Float:freq_im = get_cvar_float("amx_freq_imessage") new Float:freq_im = get_cvar_float("amx_freq_imessage")
if ( freq_im > 0.0 ) set_task( freq_im ,"infoMessage",12345) if ( freq_im > 0.0 ) set_task( freq_im ,"infoMessage",12345)
@ -94,6 +95,6 @@ public setMessage(id,level,cid) {
public plugin_end(){ public plugin_end(){
new lastinfo[8] new lastinfo[8]
numtostr(g_Current,lastinfo,7) int_to_str(g_Current,lastinfo,7)
set_localinfo("lastinfomsg",lastinfo) set_localinfo("lastinfomsg",lastinfo)
} }

View File

@ -42,7 +42,7 @@ stock cmd_target(id,const arg[],flags = 1) {
} }
} }
else if ( ( player = find_player("c",arg) )==0 && arg[0]=='#' && arg[1] ) else if ( ( player = find_player("c",arg) )==0 && arg[0]=='#' && arg[1] )
player = find_player("k",str_to_num(arg[1])) player = find_player("k",str_to_int(arg[1]))
if (!player) { if (!player) {
console_print(id,"Client with that name or userid not found") console_print(id,"Client with that name or userid not found")
return 0 return 0

View File

@ -33,6 +33,7 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
#define MAX_MAPS 128 #define MAX_MAPS 128
#define SELECTMAPS 5 #define SELECTMAPS 5

View File

@ -32,8 +32,9 @@
* version. * version.
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
#include <engine>
#define MAX_MAPS 64 #define MAX_MAPS 64

View File

@ -33,6 +33,7 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
new g_menuPosition[33] new g_menuPosition[33]

View File

@ -53,7 +53,7 @@ public plugin_init()
new szString[32], szString2[32], szString3[8] new szString[32], szString2[32], szString3[8]
get_localinfo( "lastmapcycle", szString , 31 ) get_localinfo( "lastmapcycle", szString , 31 )
parse( szString, szString2, 31, szString3 , 7 ) parse( szString, szString2, 31, szString3 , 7 )
g_pos = strtonum( szString3 ) g_pos = str_to_int( szString3 )
get_cvar_string( "mapcyclefile" , g_mapCycle , 31 ) get_cvar_string( "mapcyclefile" , g_mapCycle , 31 )
if ( !equal( g_mapCycle , szString2 ) ) if ( !equal( g_mapCycle , szString2 ) )

View File

@ -33,6 +33,7 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
// Uncomment if you want to have two new commands // Uncomment if you want to have two new commands
// amx_off - pause plugins not marked as unpauseable // amx_off - pause plugins not marked as unpauseable
@ -317,7 +318,7 @@ public cmdPlugin(id,level,cid){
} }
else if ( equal(cmds, "list" ) ) { else if ( equal(cmds, "list" ) ) {
new arg1[8], running = 0 new arg1[8], running = 0
new start = read_argv(2,arg1,7) ? strtonum(arg1) : 1 new start = read_argv(2,arg1,7) ? str_to_int(arg1) : 1
if (--start < 0) start = 0 if (--start < 0) start = 0
new plgnum = get_pluginsnum() new plgnum = get_pluginsnum()
if (start >= plgnum) start = plgnum - 1 if (start >= plgnum) start = plgnum - 1

View File

@ -32,7 +32,8 @@
* version. * version.
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
new g_menuPosition[33] new g_menuPosition[33]
new g_menuPlayers[33][32] new g_menuPlayers[33][32]
@ -574,7 +575,7 @@ public actionClcmdMenu(id,key)
copy(command,63,g_clcmdCmd[g_menuSelect[id][g_menuOption[id]]]) copy(command,63,g_clcmdCmd[g_menuSelect[id][g_menuOption[id]]])
get_user_authid(player,authid,31) get_user_authid(player,authid,31)
get_user_name(player,name,31) get_user_name(player,name,31)
numtostr(get_user_userid(player),userid,31) int_to_str(get_user_userid(player),userid,31)
replace(command,63,"%userid%",userid) replace(command,63,"%userid%",userid)
replace(command,63,"%authid%",authid) replace(command,63,"%authid%",authid)
replace(command,63,"%name%",name) replace(command,63,"%name%",name)

View File

@ -35,7 +35,8 @@
// Uncomment if you want to have seperate settings for each map // Uncomment if you want to have seperate settings for each map
//#define MAPSETTINGS //#define MAPSETTINGS
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
#if !defined NO_STEAM #if !defined NO_STEAM
#define MAXMENUPOS 34 #define MAXMENUPOS 34
@ -465,7 +466,7 @@ public cmdRest(id,level,cid){
switchCommand( id, 0 ) switchCommand( id, 0 )
else if ( equali( "list" , cmd ) ) { else if ( equali( "list" , cmd ) ) {
new arg1[8] new arg1[8]
new start = read_argv(2,arg1,7) ? strtonum(arg1) : 1 new start = read_argv(2,arg1,7) ? str_to_int(arg1) : 1
if (--start < 0) start = 0 if (--start < 0) start = 0
if (start >= MAXMENUPOS) start = MAXMENUPOS - 1 if (start >= MAXMENUPOS) start = MAXMENUPOS - 1
new end = start + 10 new end = start + 10

View File

@ -33,6 +33,7 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
#define SPEED 0.3 #define SPEED 0.3
@ -91,7 +92,7 @@ public setMessage(id,level,cid) {
g_Length = strlen(g_scrollMsg) g_Length = strlen(g_scrollMsg)
new mytime[32] new mytime[32]
read_argv(2,mytime,31) read_argv(2,mytime,31)
g_Frequency = strtonum(mytime) g_Frequency = str_to_int(mytime)
if (g_Frequency > 0) { if (g_Frequency > 0) {
new minimal = floatround((g_Length + 48) * (SPEED + 0.1)) new minimal = floatround((g_Length + 48) * (SPEED + 0.1))
if (g_Frequency < minimal) { if (g_Frequency < minimal) {

View File

@ -33,6 +33,8 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
#include <csstats>
// You can also manualy enable these options by setting them to 1 // You can also manualy enable these options by setting them to 1
// For example: // For example:

View File

@ -33,6 +33,7 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <csstats>
new g_pingSum[33] new g_pingSum[33]
new g_pingCount[33] new g_pingCount[33]

View File

@ -33,6 +33,7 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
#define MAX_MENU_DATA 64 #define MAX_MENU_DATA 64
@ -104,7 +105,7 @@ public cmdCfg( id,level,cid ){
} }
else if ( equali(cmds, "list" ) ) { else if ( equali(cmds, "list" ) ) {
new arg1[8] new arg1[8]
new start = read_argv(2,arg1,7) ? strtonum(arg1) : 1 new start = read_argv(2,arg1,7) ? str_to_int(arg1) : 1
if (--start < 0) start = 0 if (--start < 0) start = 0
if (start >= g_menuDataNum) start = g_menuDataNum - 1 if (start >= g_menuDataNum) start = g_menuDataNum - 1
new end = start + 10 new end = start + 10

View File

@ -33,6 +33,8 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
#include <fun>
new g_menuPosition[33] new g_menuPosition[33]
new g_menuPlayers[33][32] new g_menuPlayers[33][32]

View File

@ -54,8 +54,8 @@ public sayTheTime(id){
new mhours[6], mmins[6], whours[32], wmins[32], wpm[6] new mhours[6], mmins[6], whours[32], wmins[32], wpm[6]
get_time("%H",mhours,5) get_time("%H",mhours,5)
get_time("%M",mmins,5) get_time("%M",mmins,5)
new mins = strtonum(mmins) new mins = str_to_int(mmins)
new hrs = strtonum(mhours) new hrs = str_to_int(mhours)
if (mins) if (mins)
num_to_word(mins,wmins,31) num_to_word(mins,wmins,31)
else else
@ -154,7 +154,7 @@ public setDisplaying(){
while (i < argc && i < 32){ while (i < argc && i < 32){
read_argv(i+1,arg,31) read_argv(i+1,arg,31)
parse(arg,flags,31,num,31) parse(arg,flags,31,num,31)
g_TimeSet[i][0] = str_to_num(num) g_TimeSet[i][0] = str_to_int(num)
g_TimeSet[i][1] = read_flags(flags) g_TimeSet[i][1] = read_flags(flags)
i++ i++
} }

View File

@ -33,6 +33,7 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
#define MOTD_LENGTH 1024 #define MOTD_LENGTH 1024

View File

@ -33,6 +33,7 @@
*/ */
#include <amxmodx> #include <amxmodx>
#include <amxmisc>
// Settings (comment unwanted options) // Settings (comment unwanted options)
#define SHOW_MODS #define SHOW_MODS