scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-11 04:31:35 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

1) complete (almost) changeover to reorganized texture mapping system 2) finally fix texture animation; textures now animate at the correct speed --Goober5000

Browse Source 
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3285 387891d4-d844-0410-90c0-e4c51a9137d3
This commit is contained in:
Goober5000 authored and niffiwan committed 2015-04-29 18:42:23 +10:00
1 parent 0f2daa67f1
commit 1f9f692bfd
13 files changed
+339 -174
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/parse/lua.cpp
+5 -5
View File
@@ -2929,9 +2929,9 @@ LUA_INDEXER(l_ShipTextures, "Texture name or index", "Texture", "Ship textures")
char *p;
for(i = 0; i < pm->n_textures; i++)
{
if(pm->map[i].texture > -1)
if(pm->maps[i].base_map.texture > -1)
{
bm_get_filename(pm->map[i].texture, fname);
bm_get_filename(pm->maps[i].base_map.texture, fname);
//Get rid of extension
p = strchr( fname, '.' );
@@ -2944,7 +2944,7 @@ LUA_INDEXER(l_ShipTextures, "Texture name or index", "Texture", "Ship textures")
}
}
if(shipp->replacement_textures != NULL && pm->map[i].texture > -1)
if(shipp->replacement_textures != NULL && pm->maps[i].base_map.texture > -1)
{
bm_get_filename(shipp->replacement_textures[i], fname);
//Get rid of extension
@@ -2976,8 +2976,8 @@ LUA_INDEXER(l_ShipTextures, "Texture name or index", "Texture", "Ship textures")
if(shipp->replacement_textures != NULL && shipp->replacement_textures[idx] > -1)
return lua_set_args(L, "o", l_Texture.Set(shipp->replacement_textures[idx]));
else if(pm->map[idx].texture > -1)
return lua_set_args(L, "o", l_Texture.Set(pm->map[idx].texture));
else if(pm->maps[idx].base_map.texture > -1)
return lua_set_args(L, "o", l_Texture.Set(pm->maps[idx].base_map.texture));
else
return LUA_RETURN_FALSE;
}