Changed SString strQuality to enum eFontQuality

Author: Kernell

MTA10/mods/shared_logic/lua/CLuaFunctionDefs.Drawing.cpp

@@ -852,13 +852,13 @@ int CLuaFunctionDefs::dxUpdateScreenSource ( lua_State* luaVM )
 int CLuaFunctionDefs::dxCreateFont ( lua_State* luaVM )
 {
 //  element dxCreateFont( string filepath [, int size=9, bool bold=false ] )
-    SString strFilePath, strQuality; int iSize; bool bBold;
+    SString strFilePath; int iSize; bool bBold; eFontQuality ulFontQuality;
 
     CScriptArgReader argStream ( luaVM );
     argStream.ReadString ( strFilePath );
     argStream.ReadNumber ( iSize, 9 );
     argStream.ReadBool ( bBold, false );
-    argStream.ReadString ( strQuality, "proof" );
+    argStream.ReadEnumString ( ulFontQuality, FONT_QUALITY_PROOF );
 
     if ( !argStream.HasErrors () )
     {
@@ -872,53 +872,17 @@ int CLuaFunctionDefs::dxCreateFont ( lua_State* luaVM )
             {
                 if ( FileExists ( strPath ) )
                 {
-                    DWORD ulQuality = 0xFF;
-
-                    strQuality = strQuality.ToLower();
+                    CClientDxFont* pDxFont = g_pClientGame->GetManager()->GetRenderElementManager()->CreateDxFont( strPath, iSize, bBold, ulFontQuality );
 
-                    if( strQuality.compare( "default" ) == 0 )
-                    {
-                        ulQuality = DEFAULT_QUALITY;
-                    }
-                    else if( strQuality.compare( "draft" ) == 0 )
-                    {
-                        ulQuality = DRAFT_QUALITY;
-                    }
-                    else if( strQuality.compare( "proof" ) == 0 )
-                    {
-                        ulQuality = PROOF_QUALITY;
-                    }
-                    else if( strQuality.compare( "nonantialiased" ) == 0 )
-                    {
-                        ulQuality = NONANTIALIASED_QUALITY;
-                    }
-                    else if( strQuality.compare( "antialiased" ) == 0 )
+                    if( pDxFont )
                     {
-                        ulQuality = ANTIALIASED_QUALITY;
-                    }
-                    else if( strQuality.compare( "cleartype" ) == 0 )
-                    {
-                        ulQuality = CLEARTYPE_QUALITY;
-                    }
-                    else if( strQuality.compare( "cleartype_natural" ) == 0 )
-                    {
-                        ulQuality = CLEARTYPE_NATURAL_QUALITY;
-                    }
-
-                    if( ulQuality != 0xFF )
-                    {
-                        CClientDxFont* pDxFont = g_pClientGame->GetManager()->GetRenderElementManager()->CreateDxFont( strPath, iSize, bBold, ulQuality );
-                        if( pDxFont )
-                        {
-                            // Make it a child of the resource's file root ** CHECK  Should parent be pFileResource, and element added to pParentResource's ElementGroup? **
-                            pDxFont->SetParent( pParentResource->GetResourceDynamicEntity() );
-                            lua_pushelement( luaVM, pDxFont );
-                            return 1;
-                        }
-                        argStream.SetCustomError( strFilePath, "Error creating font" );
+                        // Make it a child of the resource's file root ** CHECK  Should parent be pFileResource, and element added to pParentResource's ElementGroup? **
+                        pDxFont->SetParent( pParentResource->GetResourceDynamicEntity() );
+                        lua_pushelement( luaVM, pDxFont );
+                        return 1;
                     }
-                    else
-                        argStream.SetCustomError( strFilePath, "Invalid font quality" );
+                    
+                    argStream.SetCustomError( strFilePath, "Error creating font" );
                 }
                 else
                     argStream.SetCustomError( strFilePath, "File not found" );

MTA10/mods/shared_logic/lua/CLuaFunctionParseHelpers.cpp

@@ -394,6 +394,20 @@ IMPLEMENT_ENUM_BEGIN( eFontType )
     ADD_ENUM( FONT_BECKETT,         "beckett" )
 IMPLEMENT_ENUM_END_DEFAULTS( "font-type", FONT_DEFAULT, "" )
 
+IMPLEMENT_ENUM_BEGIN( eFontQuality )
+    ADD_ENUM( FONT_QUALITY_DEFAULT,           "default" )
+    ADD_ENUM( FONT_QUALITY_DRAFT,             "draft" )
+    ADD_ENUM( FONT_QUALITY_PROOF,             "proof" )
+#if( WINVER >= 0x0400 )
+    ADD_ENUM( FONT_QUALITY_NONANTIALIASED,    "nonantialiased" )
+    ADD_ENUM( FONT_QUALITY_ANTIALIASED,       "antialiased" )
+#endif
+#if( _WIN32_WINNT >= _WIN32_WINNT_WINXP )
+    ADD_ENUM( FONT_QUALITY_CLEARTYPE,         "cleartype" )
+    ADD_ENUM( FONT_QUALITY_CLEARTYPE_NATURAL, "cleartype_natural" )
+#endif
+IMPLEMENT_ENUM_END_DEFAULTS( "font-quality", FONT_QUALITY_DEFAULT, "" )
+
 IMPLEMENT_ENUM_BEGIN ( eAudioLookupIndex )
     ADD_ENUM ( AUDIO_LOOKUP_FEET, "feet" )
     ADD_ENUM ( AUDIO_LOOKUP_GENRL, "genrl" )

MTA10/mods/shared_logic/lua/CLuaFunctionParseHelpers.h

@@ -36,6 +36,7 @@ DECLARE_ENUM( eWeaponState );
 DECLARE_ENUM( eWeaponFlags );
 DECLARE_ENUM( eVehicleComponent );
 DECLARE_ENUM( eFontType );
+DECLARE_ENUM( eFontQuality );
 DECLARE_ENUM( eAudioLookupIndex );
 DECLARE_ENUM( eAspectRatio );
 DECLARE_ENUM( eRadioStreamIndex );

MTA10/sdk/core/CGraphicsInterface.h

@@ -33,6 +33,25 @@ enum eFontType
     NUM_FONTS
 };
 
+enum eFontQuality
+{
+    FONT_QUALITY_DEFAULT = DEFAULT_QUALITY,
+    FONT_QUALITY_DRAFT = DRAFT_QUALITY,
+    FONT_QUALITY_PROOF = PROOF_QUALITY,
+
+#if( WINVER >= 0x0400 )
+    FONT_QUALITY_NONANTIALIASED = NONANTIALIASED_QUALITY,
+    FONT_QUALITY_ANTIALIASED = ANTIALIASED_QUALITY,
+#endif
+
+#if( _WIN32_WINNT >= _WIN32_WINNT_WINXP )
+    FONT_QUALITY_CLEARTYPE = CLEARTYPE_QUALITY,
+    FONT_QUALITY_CLEARTYPE_NATURAL = CLEARTYPE_NATURAL_QUALITY,
+#endif
+
+    NUM_QUALITIES
+};
+
 namespace EBlendMode
 {
     enum EBlendModeType