Changeset - r9901:73e98a4bb936
Parent rev.
Child rev.
[Not reviewed]
master
0 3 0
rubidium - 16 years ago 2008-08-12 11:21:37
rubidium@openttd.org
(svn r14051) -Codechange: enumify the DrawString buffer length.
3 files changed with 17 insertions and 10 deletions:
src/gfx.cpp
10
10
src/gfx_func.h
5
src/network/network_chat_gui.cpp
2
0 comments (0 inline, 0 general)
src/gfx.cpp
➞
Show inline comments
 
@@ -320,7 +320,7 @@ static inline int TruncateStringID(Strin
 
 */
 
int DrawString(int x, int y, StringID str, uint16 color)
 
{
 
	char buffer[512];
 
	char buffer[DRAW_STRING_BUFFER];
 

			




	
	
	
		
 
	GetString(buffer, str, lastof(buffer));

			




	
	
	
		
 
	return DoDrawString(buffer, x, y, color);

			




	
	
		
 
@@ -339,7 +339,7 @@ int DrawString(int x, int y, StringID st

			




	
	
	
		
 
 */

			




	
	
	
		
 
int DrawStringTruncated(int x, int y, StringID str, uint16 color, uint maxw)

			




	
	
	
		
 
{

			




	
	
	
		
 
	char buffer[512];

			




	
	
	
		
 
	char buffer[DRAW_STRING_BUFFER];

			




	
	
	
		
 
	TruncateStringID(str, buffer, maxw, lastof(buffer));

			




	
	
	
		
 
	return DoDrawString(buffer, x, y, color);

			




	
	
	
		
 
}

			




	
	
		
 
@@ -356,7 +356,7 @@ int DrawStringTruncated(int x, int y, St

			




	
	
	
		
 
 */

			




	
	
	
		
 
int DrawStringRightAligned(int x, int y, StringID str, uint16 color)

			




	
	
	
		
 
{

			




	
	
	
		
 
	char buffer[512];

			




	
	
	
		
 
	char buffer[DRAW_STRING_BUFFER];

			




	
	
	
		
 
	int w;

			




	
	
	
		
 

			




	
	
	
		
 
	GetString(buffer, str, lastof(buffer));

			




	
	
		
 
@@ -377,7 +377,7 @@ int DrawStringRightAligned(int x, int y,

			




	
	
	
		
 
 */

			




	
	
	
		
 
void DrawStringRightAlignedTruncated(int x, int y, StringID str, uint16 color, uint maxw)

			




	
	
	
		
 
{

			




	
	
	
		
 
	char buffer[512];

			




	
	
	
		
 
	char buffer[DRAW_STRING_BUFFER];

			




	
	
	
		
 

			




	
	
	
		
 
	TruncateStringID(str, buffer, maxw, lastof(buffer));

			




	
	
	
		
 
	DoDrawString(buffer, x - GetStringBoundingBox(buffer).width, y, color);

			




	
	
		
 
@@ -409,7 +409,7 @@ void DrawStringRightAlignedUnderline(int

			




	
	
	
		
 
 */

			




	
	
	
		
 
int DrawStringCentered(int x, int y, StringID str, uint16 color)

			




	
	
	
		
 
{

			




	
	
	
		
 
	char buffer[512];

			




	
	
	
		
 
	char buffer[DRAW_STRING_BUFFER];

			




	
	
	
		
 
	int w;

			




	
	
	
		
 

			




	
	
	
		
 
	GetString(buffer, str, lastof(buffer));

			




	
	
		
 
@@ -433,7 +433,7 @@ int DrawStringCentered(int x, int y, Str

			




	
	
	
		
 
 */

			




	
	
	
		
 
int DrawStringCenteredTruncated(int xl, int xr, int y, StringID str, uint16 color)

			




	
	
	
		
 
{

			




	
	
	
		
 
	char buffer[512];

			




	
	
	
		
 
	char buffer[DRAW_STRING_BUFFER];

			




	
	
	
		
 
	int w = TruncateStringID(str, buffer, xr - xl, lastof(buffer));

			




	
	
	
		
 
	return DoDrawString(buffer, (xl + xr - w) / 2, y, color);

			




	
	
	
		
 
}

			




	
	
		
 
@@ -595,7 +595,7 @@ static int GetMultilineStringHeight(cons

			




	
	
	
		
 
 */

			




	
	
	
		
 
int GetStringHeight(StringID str, int maxw)

			




	
	
	
		
 
{

			




	
	
	
		
 
	char buffer[512];

			




	
	
	
		
 
	char buffer[DRAW_STRING_BUFFER];

			




	
	
	
		
 

			




	
	
	
		
 
	GetString(buffer, str, lastof(buffer));

			




	
	
	
		
 

			




	
	
		
 
@@ -612,7 +612,7 @@ int GetStringHeight(StringID str, int ma

			




	
	
	
		
 
 * @param maxw Maximum width the string can have before it is wrapped */

			




	
	
	
		
 
void DrawStringMultiCenter(int x, int y, StringID str, int maxw)

			




	
	
	
		
 
{

			




	
	
	
		
 
	char buffer[512];

			




	
	
	
		
 
	char buffer[DRAW_STRING_BUFFER];

			




	
	
	
		
 
	uint32 tmp;

			




	
	
	
		
 
	int num, w, mt;

			




	
	
	
		
 
	const char *src;

			




	
	
		
 
@@ -655,7 +655,7 @@ void DrawStringMultiCenter(int x, int y,

			




	
	
	
		
 

			




	
	
	
		
 
uint DrawStringMultiLine(int x, int y, StringID str, int maxw, int maxh)

			




	
	
	
		
 
{

			




	
	
	
		
 
	char buffer[512];

			




	
	
	
		
 
	char buffer[DRAW_STRING_BUFFER];

			




	
	
	
		
 
	uint32 tmp;

			




	
	
	
		
 
	int num, mt;

			




	
	
	
		
 
	uint total_height;

			




	
	
		
 
@@ -878,7 +878,7 @@ skip_cont:;

			




	
	
	
		
 
 */

			




	
	
	
		
 
int DoDrawStringTruncated(const char *str, int x, int y, uint16 color, uint maxw)

			




	
	
	
		
 
{

			




	
	
	
		
 
	char buffer[512];

			




	
	
	
		
 
	char buffer[DRAW_STRING_BUFFER];

			




	
	
	
		
 
	ttd_strlcpy(buffer, str, sizeof(buffer));

			




	
	
	
		
 
	TruncateString(buffer, maxw);

			




	
	
	
		
 
	return DoDrawString(buffer, x, y, color);

			




        

    


    
    

    

        

                

                    src/gfx_func.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -75,6 +75,11 @@ void ScreenSizeChanged();

			




	
	
	
		
 
void GameSizeChanged();

			




	
	
	
		
 
void UndrawMouseCursor();

			




	
	
	
		
 

			




	
	
	
		
 
enum {

			




	
	
	
		
 
	/* Size of the buffer used for drawing strings. */

			




	
	
	
		
 
	DRAW_STRING_BUFFER = 1024,

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
void RedrawScreenRect(int left, int top, int right, int bottom);

			




	
	
	
		
 
void GfxScroll(int left, int top, int width, int height, int xo, int yo);

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/network/network_chat_gui.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -26,6 +26,8 @@

			




	
	
	
		
 

			




	
	
	
		
 
#include "table/strings.h"

			




	
	
	
		
 

			




	
	
	
		
 
assert_compile((int)DRAW_STRING_BUFFER >= (int)NETWORK_CHAT_LENGTH);

			




	
	
	
		
 

			




	
	
	
		
 
enum {

			




	
	
	
		
 
	MAX_CHAT_MESSAGES      =  10,

			




	
	
	
		
 
};

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: code.theleruby.com-48
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2022 by various authors & licensed under GPLv3.
            – Support