diff --git a/plugins/nextmap.sp b/plugins/nextmap.sp index 0e9e118d..4f11925d 100644 --- a/plugins/nextmap.sp +++ b/plugins/nextmap.sp @@ -52,7 +52,7 @@ new g_MapListSerial = -1; new g_CurrentMapStartTime; -public APLRes:AskPluginLoad2(Handle:myself, bool:late, String:error[], err_max) +public APLRes:AskPluginLoad2(Handle myself, bool late, char[] error, int err_max) { decl String:game[128]; GetGameFolderName(game, sizeof(game)); @@ -75,7 +75,6 @@ public APLRes:AskPluginLoad2(Handle:myself, bool:late, String:error[], err_max) public OnPluginStart() { - LoadTranslations("common.phrases"); LoadTranslations("nextmap.phrases"); @@ -110,7 +109,7 @@ public OnConfigsExecuted() } } -public Action:Command_List(client, args) +public Action:Command_List(int client, int args) { PrintToConsole(client, "Map Cycle:"); @@ -170,7 +169,7 @@ FindAndSetNextMap() SetNextMap(mapName); } -public Action:Command_MapHistory(client, args) +public Action:Command_MapHistory(int client, int args) { new mapCount = GetMapHistorySize(); @@ -203,7 +202,7 @@ public Action:Command_MapHistory(client, args) return Plugin_Handled; } -FormatTimeDuration(String:buffer[], maxlen, time) +FormatTimeDuration(char[] buffer, int maxlen, int time) { new days = time / 86400; new hours = (time / 3600) % 24; diff --git a/sourcepawn/compiler/sc1.c b/sourcepawn/compiler/sc1.c index 0156b1f6..f12c3585 100644 --- a/sourcepawn/compiler/sc1.c +++ b/sourcepawn/compiler/sc1.c @@ -3302,7 +3302,9 @@ static int parse_new_typeexpr(typeinfo_t *type, const token_t *first, int flags) if (strcmp(tok.str, "float") == 0) { type->tag = sc_rationaltag; } else if (strcmp(tok.str, "bool") == 0) { - type->tag == pc_tag_bool; + type->tag = pc_tag_bool; + } else if (strcmp(tok.str, "char") == 0) { + type->tag = pc_tag_string; } else { type->tag = pc_findtag(tok.str); if (type->tag == sc_rationaltag) { @@ -4863,7 +4865,7 @@ static int check_operatortag(int opertok,int resulttag,char *opername) case tlNE: case tlLE: case tlGE: - if (resulttag!=pc_addtag("bool")) { + if (resulttag!=pc_tag_bool) { error(63,opername,"bool:"); /* operator X requires a "bool:" result tag */ return FALSE; } /* if */ @@ -6930,9 +6932,10 @@ static int test(int label,int parens,int invert) } /* if */ return testtype; } /* if */ - if (tag!=0 && tag!=pc_addtag("bool")) + if (tag!=0 && tag!=pc_tag_bool) { if (check_userop(lneg,tag,0,1,NULL,&tag)) invert= !invert; /* user-defined ! operator inverted result */ + } if (invert) jmp_ne0(label); /* jump to label if true (different from 0) */ else diff --git a/sourcepawn/compiler/sc5.c b/sourcepawn/compiler/sc5.c index 064267c7..e5db4db0 100644 --- a/sourcepawn/compiler/sc5.c +++ b/sourcepawn/compiler/sc5.c @@ -75,10 +75,6 @@ static short lastfile; char *msg,*pre; va_list argptr; - if (number == 47) { - printf("EGG\n"); - } - // sErrLine is used to temporarily change the line number of reported errors. // Pawn has an upstream bug where this is not reset on early-return, which // can lead to broken line numbers in error messages.