dungeon_crawler

diff prototype/src/material.cc @ 48:aa9e28670ae2

find changesets by author, revision, files, or words in the commit message
added sound playback, more to do
author John Tsiombikas <nuclear@member.fsf.org>
date Mon, 17 Sep 2012 08:40:59 +0300
parents acfe0c0110fc
children
line diff
     1.1 --- a/prototype/src/material.cc	Sun Sep 16 08:16:50 2012 +0300
     1.2 +++ b/prototype/src/material.cc	Mon Sep 17 08:40:59 2012 +0300
     1.3 @@ -48,7 +48,7 @@
     1.4  		for(int j=0; j<2; j++) {
     1.5  			aiString tex_name;
     1.6  			if(asstypes[i][j] > 0 && aiGetMaterialString(assmat, AI_MATKEY_TEXTURE(asstypes[i][j], 0), &tex_name) == 0) {
     1.7 -				tex[i] = texset->get_texture(tex_name.data);
     1.8 +				tex[i] = texset->get(tex_name.data);
     1.9  				break;
    1.10  			} else {
    1.11  				tex[i] = 0;