core/metamod_console.cpp
changeset 689 4065ba5e9155
parent 674 c4ed595f6248
child 705 a1001281dcb1
     1.1 --- a/core/metamod_console.cpp	Tue Nov 24 08:06:16 2009 -0600
     1.2 +++ b/core/metamod_console.cpp	Thu Dec 10 00:59:50 2009 -0600
     1.3 @@ -126,33 +126,26 @@
     1.4  #endif
     1.5  
     1.6  			// Display user messages
     1.7 +			const char *msgname;
     1.8 +			int msgsize;
     1.9  			int messages = g_Metamod.GetUserMessageCount();
    1.10 -			if (messages != -1)
    1.11 +
    1.12 +			if (messages > 0)
    1.13  			{
    1.14 -				const char *msgname;
    1.15 -				int msgsize;
    1.16 -
    1.17 -				if (messages > 0)
    1.18 -				{
    1.19 -					CONMSG("  User Messages:  %-32.31s  %-5s  %-5s\n", "Name", "Index", "Size");
    1.20 +				CONMSG("  User Messages:  %-32.31s  %-5s  %-5s\n", "Name", "Index", "Size");
    1.21  
    1.22 -					for (int i = 0; i < messages; i++)
    1.23 -					{
    1.24 -						msgname = g_Metamod.GetUserMessage(i, &msgsize);
    1.25 -
    1.26 -						CONMSG("                  %-32.31s  %-5d  %-5d\n", msgname, i, msgsize); 
    1.27 -					}
    1.28 +				for (int i = 0; i < messages; i++)
    1.29 +				{
    1.30 +					msgname = g_Metamod.GetUserMessage(i, &msgsize);
    1.31  
    1.32 -					CONMSG("  %d user message%s in total\n", messages, (messages > 1) ? "s" : "");
    1.33 +					CONMSG("                  %-32.31s  %-5d  %-5d\n", msgname, i, msgsize); 
    1.34  				}
    1.35 -				else
    1.36 -				{
    1.37 -					CONMSG("  User Messages: None\n");
    1.38 -				}
    1.39 +
    1.40 +				CONMSG("  %d user message%s in total\n", messages, (messages > 1) ? "s" : "");
    1.41  			}
    1.42  			else
    1.43  			{
    1.44 -				CONMSG("  User Messages: Failed to get list of user messages\n");
    1.45 +				CONMSG("  User Messages: None\n");
    1.46  			}
    1.47  
    1.48  			return true;