← Back to branch summary

~ubuntu-branches/ubuntu/natty/smc/natty

« back to all changes in this revision

Viewing changes to src/level/level_settings.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Muammar El Khatib
  • Date: 2009-08-18 11:28:01 UTC
  • mfrom: (1.1.7 upstream) (5.1.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090818112801-qfhdmqouq8m1fwab
Tags: 1.9-1
* New upstream release.
* Bumped standards version to 3.8.3. No changes were needed in order to 
  accomplish this.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/level/level_settings.cpp
20
20
#include "../level/level.h"
21
21
#include "../video/font.h"
22
22
#include "../video/renderer.h"
 
23
#include "../core/filesystem/filesystem.h"
23
24
 
24
25
namespace SMC
25
26
{
69
70
        // Main
70
71
        // level filename
71
72
        CEGUI::Editbox *editbox_level_filename = static_cast<CEGUI::Editbox *>(CEGUI::WindowManager::getSingleton().getWindow( "editbox_level_filename" ));
72
 
        editbox_level_filename->setText( Get_Filename( pActive_Level->data_file, 0, 0 ).c_str() );
 
73
        editbox_level_filename->setText( Trim_Filename( pActive_Level->data_file, 0, 0 ).c_str() );
73
74
        // music filename
74
75
        CEGUI::Editbox *editbox_music_filename = static_cast<CEGUI::Editbox *>(CEGUI::WindowManager::getSingleton().getWindow( "editbox_music_filename" ));
75
76
        editbox_music_filename->setText( pActive_Level->Get_Musicfile( 1 ).c_str() );
243
244
{
244
245
        // # Main Tab
245
246
        // filename
246
 
        if( Get_Filename( pActive_Level->data_file, 0, 0 ).compare( CEGUI::WindowManager::getSingleton().getWindow( "editbox_level_filename" )->getText().c_str() ) != 0 )
 
247
        if( Trim_Filename( pActive_Level->data_file, 0, 0 ).compare( CEGUI::WindowManager::getSingleton().getWindow( "editbox_level_filename" )->getText().c_str() ) != 0 )
247
248
        {
248
249
                pActive_Level->Set_Levelfile( CEGUI::WindowManager::getSingleton().getWindow( "editbox_level_filename" )->getText().c_str() );
249
250
                // show no level saved info text
270
271
        pActive_Level->m_background_manager->Get_Pointer(0)->Set_Color_2( bg_color_2 );
271
272
 
272
273
        // # Global Effect Tab
273
 
        pActive_Level->m_global_effect->image_filename = CEGUI::WindowManager::getSingleton().getWindow( "editbox_global_effect_file" )->getText().c_str();
 
274
        pActive_Level->m_global_effect->m_image_filename = CEGUI::WindowManager::getSingleton().getWindow( "editbox_global_effect_file" )->getText().c_str();
274
275
        pActive_Level->m_global_effect->Set_Pos_Z( string_to_float( ( static_cast<CEGUI::Editbox *>(CEGUI::WindowManager::getSingleton().getWindow( "editbox_global_effect_pos_z" )))->getText().c_str() ), string_to_float( ( static_cast<CEGUI::Editbox *>(CEGUI::WindowManager::getSingleton().getWindow( "editbox_global_effect_pos_z_rand" )))->getText().c_str() ) );
275
276
        pActive_Level->m_global_effect->Set_Type( CEGUI::WindowManager::getSingleton().getWindow( "combo_global_effect_type" )->getText().c_str() );
276
277
        pActive_Level->m_global_effect->Init_Anim();
661
662
void cLevel_Settings :: Load_Global_Effect( void )
662
663
{
663
664
        CEGUI::Editbox *editbox = static_cast<CEGUI::Editbox *>(CEGUI::WindowManager::getSingleton().getWindow( "editbox_global_effect_file" ));
664
 
        editbox->setText( pActive_Level->m_global_effect->image_filename.c_str() );
 
665
        editbox->setText( pActive_Level->m_global_effect->m_image_filename.c_str() );
665
666
 
666
667
        editbox = static_cast<CEGUI::Editbox *>(CEGUI::WindowManager::getSingleton().getWindow( "combo_global_effect_type" ));
667
668
        editbox->setText( pActive_Level->m_global_effect->Get_Type_Name().c_str() );