X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fgrid.cpp;h=df1e1c1a2e0df41a3a0607f6813622a1f036c3f2;hb=5980dc6b064efa71c7f39597abdab0665c378885;hp=fa255b4406f3b54340204b57866f70701c60d8fb;hpb=1ede3dc63143af40210a3e9c1c601028359fac11;p=xonotic%2Fnetradiant.git diff --git a/radiant/grid.cpp b/radiant/grid.cpp index fa255b44..df1e1c1a 100644 --- a/radiant/grid.cpp +++ b/radiant/grid.cpp @@ -134,10 +134,10 @@ void set(){ setGridPower( m_id ); } typedef MemberCaller SetCaller; -void active( const BoolImportCallback& importCallback ){ +void active( const Callback &importCallback ){ importCallback( g_grid_power == m_id ); } -typedef MemberCaller ExportCaller; +typedef MemberCaller&), &GridMenuItem::active> ExportCaller; }; GridMenuItem g_gridMenu0125( GRIDPOWER_0125 ); @@ -254,7 +254,7 @@ void Grid_construct(){ g_grid_default = GridDefault_forGridPower( GRIDPOWER_8 ); - GlobalPreferenceSystem().registerPreference( "GridDefault", IntImportStringCaller( g_grid_default ), IntExportStringCaller( g_grid_default ) ); + GlobalPreferenceSystem().registerPreference( "GridDefault", make_property_string( g_grid_default ) ); g_grid_power = GridPower_forGridDefault( g_grid_default ); g_gridsize = GridSize_forGridPower( g_grid_power );