| 修订版 | daee317dab0ede0e365719d2e447ba0d982b4882 (tree) |
|---|---|
| 时间 | 2023-03-18 23:28:46 |
| 作者 | Adam Kaminski <kaminskiadam9@gmai...> |
| Commiter | Adam Kaminski |
Renamed the ACS function "GetColumnDataType" to "GetCustomColumnDataType", which now only works for custom columns (users should already know the data types of native columns anyways).
src/p_acs.cpp (diff)| @@ -1863,25 +1863,6 @@ | ||
| 1863 | 1863 | |
| 1864 | 1864 | // ================================================================================================ |
| 1865 | 1865 | // |
| 1866 | -// [AK] GetDataScoreColumn | |
| 1867 | -// | |
| 1868 | -// Returns a pointer to a usable DataScoreColumn object, using its name as an argument. | |
| 1869 | -// | |
| 1870 | -// ================================================================================================ | |
| 1871 | - | |
| 1872 | -static DataScoreColumn *GetDataScoreColumn ( const char *pszColumnName ) | |
| 1873 | -{ | |
| 1874 | - ScoreColumn *pColumn = SCOREBOARD_GetColumn( pszColumnName, true ); | |
| 1875 | - | |
| 1876 | - // [AK] Return NULL if the column doesn't exist, isn't usable right now, or isn't a data column. | |
| 1877 | - if (( pColumn == NULL ) || ( pColumn->GetTemplate( ) != COLUMNTEMPLATE_DATA )) | |
| 1878 | - return NULL; | |
| 1879 | - | |
| 1880 | - return static_cast<DataScoreColumn *>( pColumn ); | |
| 1881 | -} | |
| 1882 | - | |
| 1883 | -// ================================================================================================ | |
| 1884 | -// | |
| 1885 | 1866 | // [AK] GetCustomScoreColumn |
| 1886 | 1867 | // |
| 1887 | 1868 | // Returns a pointer to a usable CustomScoreColumn object, using its name as an argument. |
| @@ -5413,7 +5394,7 @@ | ||
| 5413 | 5394 | ACSF_SetCustomColumnValue, |
| 5414 | 5395 | ACSF_GetCustomColumnValue, |
| 5415 | 5396 | ACSF_ResetCustomColumnToDefault, |
| 5416 | - ACSF_GetColumnDataType, | |
| 5397 | + ACSF_GetCustomColumnDataType, | |
| 5417 | 5398 | ACSF_IsColumnUsable, |
| 5418 | 5399 | |
| 5419 | 5400 | // ZDaemon |
| @@ -8010,10 +7991,10 @@ | ||
| 8010 | 7991 | return 0; |
| 8011 | 7992 | } |
| 8012 | 7993 | |
| 8013 | - case ACSF_GetColumnDataType: | |
| 8014 | - { | |
| 8015 | - DataScoreColumn *pDataColumn = GetDataScoreColumn( FBehavior::StaticLookupString( args[0] )); | |
| 8016 | - return pDataColumn != NULL ? pDataColumn->GetDataType( ) : COLUMNDATA_UNKNOWN; | |
| 7994 | + case ACSF_GetCustomColumnDataType: | |
| 7995 | + { | |
| 7996 | + CustomScoreColumn *pCustomColumn = GetCustomScoreColumn( FBehavior::StaticLookupString( args[0] )); | |
| 7997 | + return pCustomColumn != NULL ? pCustomColumn->GetDataType( ) : COLUMNDATA_UNKNOWN; | |
| 8017 | 7998 | } |
| 8018 | 7999 | |
| 8019 | 8000 | case ACSF_IsColumnUsable: |
Fork