Fix show message
git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1401 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
parent
9ef261f8c4
commit
a66f0483b2
@ -2,6 +2,7 @@
|
|||||||
Date Added
|
Date Added
|
||||||
|
|
||||||
04/04
|
04/04
|
||||||
|
* Fix showmsg for Visual Studio [MouseJstr]
|
||||||
* Update base code for the UPNP plugin loading [celest]
|
* Update base code for the UPNP plugin loading [celest]
|
||||||
* Removed anti-freeze system for login and char -- Shinomori's update would
|
* Removed anti-freeze system for login and char -- Shinomori's update would
|
||||||
be enough to keep inter connections alive [celest]
|
be enough to keep inter connections alive [celest]
|
||||||
|
@ -7,7 +7,10 @@
|
|||||||
|
|
||||||
char tmp_output[1024] = {"\0"};
|
char tmp_output[1024] = {"\0"};
|
||||||
|
|
||||||
int _ShowMessage(enum msg_type flag, const char *string, ...){ // by MC Cameri
|
#undef ShowMessage
|
||||||
|
|
||||||
|
int _vShowMessage(enum msg_type flag, const char *string, va_list ap)
|
||||||
|
{ // by MC Cameri
|
||||||
/*
|
/*
|
||||||
_ShowMessage MUST be used instead of printf as of 10/24/2004.
|
_ShowMessage MUST be used instead of printf as of 10/24/2004.
|
||||||
Return: 0 = Successful, 1 = Failed.
|
Return: 0 = Successful, 1 = Failed.
|
||||||
@ -15,11 +18,9 @@ int _ShowMessage(enum msg_type flag, const char *string, ...){ // by MC Cameri
|
|||||||
// int ret = 0;
|
// int ret = 0;
|
||||||
char prefix[40];
|
char prefix[40];
|
||||||
char *output;
|
char *output;
|
||||||
va_list ap;
|
|
||||||
|
|
||||||
va_start(ap, string);
|
|
||||||
if (strlen(string) <= 0) {
|
if (strlen(string) <= 0) {
|
||||||
ShowError("Empty string passed to _ShowMessage().\n");
|
printf("Empty string passed to _ShowMessage().\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
switch (flag) {
|
switch (flag) {
|
||||||
@ -48,7 +49,7 @@ int _ShowMessage(enum msg_type flag, const char *string, ...){ // by MC Cameri
|
|||||||
strcpy(prefix,CL_RED"[Fatal Error]"CL_RESET":");
|
strcpy(prefix,CL_RED"[Fatal Error]"CL_RESET":");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
ShowError("In function _ShowMessage() -> Invalid flag passed.\n");
|
printf("In function _ShowMessage() -> Invalid flag passed.\n");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
if (!(flag == MSG_DEBUG && !SHOW_DEBUG_MSG)) {
|
if (!(flag == MSG_DEBUG && !SHOW_DEBUG_MSG)) {
|
||||||
@ -84,3 +85,60 @@ int _ShowMessage(enum msg_type flag, const char *string, ...){ // by MC Cameri
|
|||||||
*/
|
*/
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int _ShowMessage(enum msg_type flag, const char *string, ...)
|
||||||
|
{
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
va_start(ap, string);
|
||||||
|
return _vShowMessage(flag, string, ap);
|
||||||
|
}
|
||||||
|
|
||||||
|
int ShowStatus(const char *string, ...) {
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
va_start(ap, string);
|
||||||
|
return _vShowMessage(MSG_STATUS, string, ap);
|
||||||
|
}
|
||||||
|
int ShowSQL(const char *string, ...) {
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
va_start(ap, string);
|
||||||
|
return _vShowMessage(MSG_SQL, string, ap);
|
||||||
|
}
|
||||||
|
int ShowInfo(const char *string, ...) {
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
va_start(ap, string);
|
||||||
|
return _vShowMessage(MSG_INFORMATION, string, ap);
|
||||||
|
}
|
||||||
|
int ShowNotice(const char *string, ...) {
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
va_start(ap, string);
|
||||||
|
return _vShowMessage(MSG_NOTICE, string, ap);
|
||||||
|
}
|
||||||
|
int ShowWarning(const char *string, ...) {
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
va_start(ap, string);
|
||||||
|
return _vShowMessage(MSG_WARNING, string, ap);
|
||||||
|
}
|
||||||
|
int ShowDebug(const char *string, ...) {
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
va_start(ap, string);
|
||||||
|
return _vShowMessage(MSG_DEBUG, string, ap);
|
||||||
|
}
|
||||||
|
int ShowError(const char *string, ...) {
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
va_start(ap, string);
|
||||||
|
return _vShowMessage(MSG_ERROR, string, ap);
|
||||||
|
}
|
||||||
|
int ShowFatalError(const char *string, ...) {
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
va_start(ap, string);
|
||||||
|
return _vShowMessage(MSG_FATALERROR, string, ap);
|
||||||
|
}
|
||||||
|
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user