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

Bug fixes.

Browse Source
This commit is contained in:
David Anderson 2014-07-03 00:34:11 -07:00
parent a15153e9b8
commit 438fade64f
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/nextmap.sp
View File

@ -52,7 +52,7 @@ new g_MapListSerial = -1;
new g_CurrentMapStartTime; 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]; decl String:game[128];
GetGameFolderName(game, sizeof(game)); GetGameFolderName(game, sizeof(game));
@ -75,7 +75,6 @@ public APLRes:AskPluginLoad2(Handle:myself, bool:late, String:error[], err_max)
public OnPluginStart() public OnPluginStart()
{ {
LoadTranslations("common.phrases"); LoadTranslations("common.phrases");
LoadTranslations("nextmap.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:"); PrintToConsole(client, "Map Cycle:");
@ -170,7 +169,7 @@ FindAndSetNextMap()
SetNextMap(mapName); SetNextMap(mapName);
} }
public Action:Command_MapHistory(client, args) public Action:Command_MapHistory(int client, int args)
{ {
new mapCount = GetMapHistorySize(); new mapCount = GetMapHistorySize();
@ -203,7 +202,7 @@ public Action:Command_MapHistory(client, args)
return Plugin_Handled; return Plugin_Handled;
} }
FormatTimeDuration(String:buffer[], maxlen, time) FormatTimeDuration(char[] buffer, int maxlen, int time)
{ {
new days = time / 86400; new days = time / 86400;
new hours = (time / 3600) % 24; new hours = (time / 3600) % 24;

9
sourcepawn/compiler/sc1.c
View File

@ -3302,7 +3302,9 @@ static int parse_new_typeexpr(typeinfo_t *type, const token_t *first, int flags)
if (strcmp(tok.str, "float") == 0) { if (strcmp(tok.str, "float") == 0) {
type->tag = sc_rationaltag; type->tag = sc_rationaltag;
} else if (strcmp(tok.str, "bool") == 0) { } 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 { } else {
type->tag = pc_findtag(tok.str); type->tag = pc_findtag(tok.str);
if (type->tag == sc_rationaltag) { if (type->tag == sc_rationaltag) {
@ -4863,7 +4865,7 @@ static int check_operatortag(int opertok,int resulttag,char *opername)
case tlNE: case tlNE:
case tlLE: case tlLE:
case tlGE: case tlGE:
if (resulttag!=pc_addtag("bool")) { if (resulttag!=pc_tag_bool) {
error(63,opername,"bool:"); /* operator X requires a "bool:" result tag */ error(63,opername,"bool:"); /* operator X requires a "bool:" result tag */
return FALSE; return FALSE;
} /* if */ } /* if */
@ -6930,9 +6932,10 @@ static int test(int label,int parens,int invert)
} /* if */ } /* if */
return testtype; return testtype;
} /* if */ } /* if */
if (tag!=0 && tag!=pc_addtag("bool")) if (tag!=0 && tag!=pc_tag_bool) {
if (check_userop(lneg,tag,0,1,NULL,&tag)) if (check_userop(lneg,tag,0,1,NULL,&tag))
invert= !invert; /* user-defined ! operator inverted result */ invert= !invert; /* user-defined ! operator inverted result */
}
if (invert) if (invert)
jmp_ne0(label); /* jump to label if true (different from 0) */ jmp_ne0(label); /* jump to label if true (different from 0) */
else else

4
sourcepawn/compiler/sc5.c
View File

@ -75,10 +75,6 @@ static short lastfile;
char *msg,*pre; char *msg,*pre;
va_list argptr; va_list argptr;
if (number == 47) {
printf("EGG\n");
}
// sErrLine is used to temporarily change the line number of reported errors. // 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 // Pawn has an upstream bug where this is not reset on early-return, which
// can lead to broken line numbers in error messages. // can lead to broken line numbers in error messages.