TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use valptr for ogl highest_valid

Browse source
This commit is contained in:
Kp 2015-06-13 22:42:18 +00:00
parent a4d3c55fe4
commit 94a86326b5
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
similar/arch/ogl/ogl.cpp
View file

@ -453,8 +453,8 @@ void ogl_cache_level_textures(void)
const auto objp = vcobjptridx(i);
if (objp->type == OBJ_POWERUP && objp->render_type==RT_POWERUP)
{
ogl_cache_vclipn_textures(Objects[i].rtype.vclip_info.vclip_num);
switch (get_powerup_id(&Objects[i])){
ogl_cache_vclipn_textures(objp->rtype.vclip_info.vclip_num);
switch (get_powerup_id(objp)){
case POW_VULCAN_WEAPON:
ogl_cache_weapon_textures(Primary_weapon_to_weapon_info[VULCAN_INDEX]);
break;
@ -523,16 +523,16 @@ void ogl_cache_level_textures(void)
}
else if (objp->type != OBJ_NONE && objp->render_type==RT_POLYOBJ)
{
if (Objects[i].type == OBJ_ROBOT)
if (objp->type == OBJ_ROBOT)
{
ogl_cache_vclipn_textures(Robot_info[get_robot_id(&Objects[i])].exp1_vclip_num);
ogl_cache_vclipn_textures(Robot_info[get_robot_id(&Objects[i])].exp2_vclip_num);
ogl_cache_weapon_textures(Robot_info[get_robot_id(&Objects[i])].weapon_type);
ogl_cache_vclipn_textures(Robot_info[get_robot_id(objp)].exp1_vclip_num);
ogl_cache_vclipn_textures(Robot_info[get_robot_id(objp)].exp2_vclip_num);
ogl_cache_weapon_textures(Robot_info[get_robot_id(objp)].weapon_type);
}
if (Objects[i].rtype.pobj_info.tmap_override != -1)
ogl_loadbmtexture(GameBitmaps[Textures[Objects[i].rtype.pobj_info.tmap_override].index]);
if (objp->rtype.pobj_info.tmap_override != -1)
ogl_loadbmtexture(GameBitmaps[Textures[objp->rtype.pobj_info.tmap_override].index]);
else
ogl_cache_polymodel_textures(Objects[i].rtype.pobj_info.model_num);
ogl_cache_polymodel_textures(objp->rtype.pobj_info.model_num);
}
}
}