dungeon_crawler

diff prototype/src/main.cc @ 63:7f52d6310317

fixed design issue with datafile_path
author John Tsiombikas <nuclear@member.fsf.org>
date Tue, 02 Oct 2012 04:52:59 +0300
parents aa86119e3295
children 45172d087ebe
line diff
     1.1 --- a/prototype/src/main.cc	Tue Sep 25 06:59:11 2012 +0300
     1.2 +++ b/prototype/src/main.cc	Tue Oct 02 04:52:59 2012 +0300
     1.3 @@ -109,7 +109,7 @@
     1.4  		move_sound->set_volume(0.4);
     1.5  
     1.6  		music = new OggVorbisStream;
     1.7 -		if(music->open(datafile_path("bgtrack.ogg"))) {
     1.8 +		if(music->open(datafile_path("bgtrack.ogg").c_str())) {
     1.9  			music->set_volume(0.6);
    1.10  			music->play(PlayMode::loop);
    1.11  		} else {
    1.12 @@ -175,14 +175,14 @@
    1.13  	// load a tileset
    1.14  	tileset = new TileSet;
    1.15  	printf("loading tileset: %s\n", cfg.tileset_file);
    1.16 -	if(!tileset->load(datafile_path(cfg.tileset_file))) {
    1.17 +	if(!tileset->load(datafile_path(cfg.tileset_file).c_str())) {
    1.18  		return false;
    1.19  	}
    1.20  	set_active_tileset(tileset);
    1.21  
    1.22  	level = new Level;
    1.23  	printf("loading level: %s\n", cfg.level_file);
    1.24 -	if(!level->load(datafile_path(cfg.level_file))) {
    1.25 +	if(!level->load(datafile_path(cfg.level_file).c_str())) {
    1.26  		return false;
    1.27  	}
    1.28