Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Prefixed TIKI import functions

Browse source
This commit is contained in:
smallmodel 2023-09-27 23:21:34 +02:00
parent f6e6bf1d6b
commit f0e87cd85a
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
6 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
code/fgame/entity.cpp
View file

@ -2056,7 +2056,7 @@ void Entity::setModel(const str& mdl)
if (edict->tiki && !mins.length() && !maxs.length()) {
vec3_t tempmins, tempmaxs;
gi.CalculateBounds(edict->tiki, edict->s.scale, tempmins, tempmaxs);
gi.TIKI_CalculateBounds(edict->tiki, edict->s.scale, tempmins, tempmaxs);
setSize(tempmins, tempmaxs);
}
}
@ -2270,7 +2270,7 @@ void Entity::setSize(Vector min, Vector max)
vec3_t fullmins, fullmaxs;
Vector delta;
gi.CalculateBounds(edict->tiki, edict->s.scale, fullmins, fullmaxs);
gi.TIKI_CalculateBounds(edict->tiki, edict->s.scale, fullmins, fullmaxs);
delta = Vector(fullmaxs) - Vector(fullmins);
edict->r.radius = delta.length() * 0.5;
@ -4188,7 +4188,7 @@ void Entity::SurfaceCommand(const char *surf_name, const char *token)
int numsurfaces;
if (edict->tiki) {
numsurfaces = gi.NumSurfaces(edict->tiki);
numsurfaces = gi.TIKI_NumSurfaces(edict->tiki);
} else {
numsurfaces = 0;
}
@ -4531,7 +4531,7 @@ void Entity::Censor(Event *ev)
oldsize = size.length();
setSolidType(SOLID_NOT);
setModel("censored.tik");
gi.CalculateBounds(edict->tiki, 1, mins, maxs);
gi.TIKI_CalculateBounds(edict->tiki, 1, mins, maxs);
delta = maxs - mins;
newsize = delta.length();
edict->s.scale = oldsize / newsize;

6
code/fgame/g_public.h
View file

@ -324,9 +324,9 @@ typedef struct gameImport_s
qboolean ( *setmodel )( gentity_t *ent, const char *name );
void ( *clearmodel )( gentity_t *ent );
int ( *TIKI_NumAnims )( dtiki_t *tiki );
int ( *NumSurfaces )( dtiki_t *tiki );
int ( *NumTags )( dtiki_t *tiki );
void( *CalculateBounds )( dtiki_t *tiki, float scale, vec3_t mins, vec3_t maxs );
int ( *TIKI_NumSurfaces )( dtiki_t *tiki );
int ( *TIKI_NumTags )( dtiki_t *tiki );
void( *TIKI_CalculateBounds )( dtiki_t *tiki, float scale, vec3_t mins, vec3_t maxs );
void *( *TIKI_GetSkeletor )( dtiki_t *tiki, int entNum );
const char *( *Anim_NameForNum )( dtiki_t *tiki, int animNum );
int ( *Anim_NumForName )( dtiki_t *tiki, const char *name );

2
code/fgame/health.cpp
View file

@ -105,7 +105,7 @@ void Health::EventPostSpawn(Event *ev)
if (edict->tiki) {
vec3_t mins, maxs;
gi.CalculateBounds(edict->tiki, edict->s.scale, mins, maxs);
gi.TIKI_CalculateBounds(edict->tiki, edict->s.scale, mins, maxs);
setSize(mins, maxs);
link();

2
code/fgame/scriptslave.cpp
View file

@ -2137,7 +2137,7 @@ void ScriptModel::SetModelEvent
if( edict->tiki && !mins.length() && !maxs.length() )
{
gi.CalculateBounds( edict->tiki, edict->s.scale, mins, maxs );
gi.TIKI_CalculateBounds( edict->tiki, edict->s.scale, mins, maxs );
}
}

2
code/fgame/vehicle.cpp
View file

@ -4787,7 +4787,7 @@ void Vehicle::Postthink(void)
int numtags;
int tagnum;
numtags = gi.NumTags(edict->tiki);
numtags = gi.TIKI_NumTags(edict->tiki);
for (tagnum = 0; tagnum < numtags; tagnum++) {
const char *name = gi.Tag_NameForNum(edict->tiki, tagnum);
if (!strncmp(name, "tag", 3)) {

6
code/server/sv_game.c
View file

@ -1643,9 +1643,9 @@ void SV_InitGameProgs( void ) {
import.setmodel = PF_setmodel;
import.clearmodel = PF_clearmodel;
import.TIKI_NumAnims = PF_NumAnims;
import.NumSurfaces = PF_NumSurfaces;
import.NumTags = PF_NumTags;
import.CalculateBounds = PF_CalculateBounds;
import.TIKI_NumSurfaces = PF_NumSurfaces;
import.TIKI_NumTags = PF_NumTags;
import.TIKI_CalculateBounds = PF_CalculateBounds;
import.TIKI_GetSkeletor = PF_GetSkeletor;
import.Anim_NameForNum = PF_Anim_NameForNum;
import.Anim_NumForName = PF_Anim_NumForName;