mirror of https://github.com/UberGames/rpgxEF.git
update to g_utils.c
This commit is contained in:
Walter Julius Hennecke
parent
a848638e2a
commit
3ebc111102
|
|
@ -28,15 +28,18 @@ typedef struct {
|
|||
} shaderRemap_t;
|
||||
|
||||
/** The maximum count of shader remaps */
|
||||
#define MAX_SHADER_REMAPS 128
|
||||
enum g_utilsLimits_e {
|
||||
MAX_SHADER_REMAPS = 128,
|
||||
MAXCHOICES = 32
|
||||
};
|
||||
|
||||
/** Current count of remapped shaders */
|
||||
static int32_t remapCount = 0;
|
||||
static uint8_t remapCount = 0;
|
||||
/** List of shader remaps */
|
||||
static shaderRemap_t remappedShaders[MAX_SHADER_REMAPS];
|
||||
|
||||
void AddRemap(const char* oldShader, const char* newShader, float timeOffset) {
|
||||
int32_t i;
|
||||
uint8_t i;
|
||||
|
||||
G_LogFuncBegin();
|
||||
|
||||
|
|
@ -83,7 +86,7 @@ void AddRemap(const char* oldShader, const char* newShader, float timeOffset) {
|
|||
const char *BuildShaderStateConfig(void) {
|
||||
static char buff[MAX_STRING_CHARS * 4];
|
||||
char out[(MAX_QPATH * 2) + 5];
|
||||
int32_t i;
|
||||
uint8_t i;
|
||||
|
||||
G_LogFuncBegin();
|
||||
|
||||
|
|
@ -225,7 +228,8 @@ gentity_t* G_Find (gentity_t* from, size_t fieldofs, const char* match)
|
|||
|
||||
if (from == NULL) {
|
||||
from = g_entities;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
from++;
|
||||
}
|
||||
|
||||
|
|
@ -252,12 +256,11 @@ gentity_t* G_Find (gentity_t* from, size_t fieldofs, const char* match)
|
|||
|
||||
|
||||
/** Maximum number of possible choices for G_PickTarget. */
|
||||
#define MAXCHOICES 32
|
||||
|
||||
gentity_t* G_PickTarget(char* targetname)
|
||||
{
|
||||
gentity_t* ent = NULL;
|
||||
int32_t num_choices = 0;
|
||||
int32_t i = 0;
|
||||
gentity_t* choice[MAXCHOICES];
|
||||
|
||||
G_LogFuncBegin();
|
||||
|
|
@ -270,8 +273,7 @@ gentity_t* G_PickTarget (char* targetname)
|
|||
}
|
||||
|
||||
/* BOOKMARK */
|
||||
while(1)
|
||||
{
|
||||
for (; i < MAXCHOICES; i++) {
|
||||
ent = G_Find(ent, FOFS(targetname), targetname);
|
||||
if (ent == NULL) {
|
||||
break;
|
||||
|
|
@ -290,7 +292,7 @@ gentity_t* G_PickTarget (char* targetname)
|
|||
================*/
|
||||
if (num_choices == 0)
|
||||
{
|
||||
while(1)
|
||||
for (i = 0; i < MAXCHOICES; i++)
|
||||
{
|
||||
ent = G_Find(ent, FOFS(swapname), targetname);
|
||||
if (ent == NULL) {
|
||||
|
|
@ -307,7 +309,7 @@ gentity_t* G_PickTarget (char* targetname)
|
|||
|
||||
if (num_choices == 0)
|
||||
{
|
||||
while(1)
|
||||
for (i = 0; i < MAXCHOICES; i++)
|
||||
{
|
||||
ent = G_Find(ent, FOFS(truename), targetname);
|
||||
if (ent == NULL) {
|
||||
|
|
@ -324,7 +326,7 @@ gentity_t* G_PickTarget (char* targetname)
|
|||
|
||||
if (num_choices == 0)
|
||||
{
|
||||
while(1)
|
||||
for (i = 0; i < MAXCHOICES; i++)
|
||||
{
|
||||
ent = G_Find(ent, FOFS(falsename), targetname);
|
||||
if (ent == NULL) {
|
||||
|
|
@ -380,7 +382,8 @@ void G_UseTargets2( gentity_t* ent, gentity_t* activator, char* target ) {
|
|||
while ((t = G_Find(t, FOFS(targetname), target)) != NULL) {
|
||||
if (t == ent) {
|
||||
G_LocLogger(LL_WARN, "Entity %i used itself.\n", t->s.number); /* RPG-X | GSIO01 | 22.10.09: a little bit more information for the mapper */
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
if (t->use) {
|
||||
t->use(t, ent, activator);
|
||||
#ifdef G_LUA
|
||||
|
|
@ -414,7 +417,8 @@ void G_UseTargets2( gentity_t* ent, gentity_t* activator, char* target ) {
|
|||
while ((t = G_Find(t, FOFS(swapname), target)) != NULL) {
|
||||
if (t == ent) {
|
||||
G_LocLogger(LL_WARN, "Entity %i used itself.\n", t->s.number); /* RPG-X | GSIO01 | 22.10.09: a little bit more information for the mapper */
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
if (t->use) {
|
||||
t->use(t, ent, activator);
|
||||
#ifdef G_LUA
|
||||
|
|
@ -443,7 +447,8 @@ void G_UseTargets2( gentity_t* ent, gentity_t* activator, char* target ) {
|
|||
while ((t = G_Find(t, FOFS(truename), target)) != NULL) {
|
||||
if (t == ent) {
|
||||
G_LocLogger(LL_WARN, "Entity %i used itself.\n", t->s.number); /* RPG-X | GSIO01 | 22.10.09: a little bit more information for the mapper */
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
if (t->use) {
|
||||
t->use(t, ent, activator);
|
||||
#ifdef G_LUA
|
||||
|
|
@ -472,7 +477,8 @@ void G_UseTargets2( gentity_t* ent, gentity_t* activator, char* target ) {
|
|||
while ((t = G_Find(t, FOFS(falsename), target)) != NULL) {
|
||||
if (t == ent) {
|
||||
G_LocLogger(LL_WARN, "Entity %i used itself.\n", t->s.number); /* RPG-X | GSIO01 | 22.10.09: a little bit more information for the mapper */
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
if (t->use) {
|
||||
t->use(t, ent, activator);
|
||||
#ifdef G_LUA
|
||||
|
|
@ -508,7 +514,8 @@ void G_UseTargets2( gentity_t* ent, gentity_t* activator, char* target ) {
|
|||
while ((t = G_Find(t, FOFS(bluename), target)) != NULL) {
|
||||
if (t == ent) {
|
||||
G_LocLogger(LL_WARN, "Entity %i used itself.\n", t->s.number); /* RPG-X | GSIO01 | 22.10.09: a little bit more information for the mapper */
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
if (t->use) {
|
||||
t->use(t, ent, ent);
|
||||
#ifdef G_LUA
|
||||
|
|
@ -598,9 +605,11 @@ void G_SetMovedir( vec3_t angles, vec3_t movedir ) {
|
|||
|
||||
if (VectorCompare(angles, VEC_UP)) {
|
||||
VectorCopy(MOVEDIR_UP, movedir);
|
||||
} else if ( VectorCompare (angles, VEC_DOWN) ) {
|
||||
}
|
||||
else if (VectorCompare(angles, VEC_DOWN)) {
|
||||
VectorCopy(MOVEDIR_DOWN, movedir);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
AngleVectors(angles, movedir, NULL, NULL);
|
||||
}
|
||||
VectorClear(angles);
|
||||
|
|
@ -615,12 +624,15 @@ float vectoyaw( const vec3_t vec ) {
|
|||
|
||||
if (vec[YAW] == 0 && vec[PITCH] == 0) {
|
||||
yaw = 0;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
if (vec[PITCH]) {
|
||||
yaw = (atan2(vec[YAW], vec[PITCH]) * 180 / M_PI);
|
||||
} else if (vec[YAW] > 0) {
|
||||
}
|
||||
else if (vec[YAW] > 0) {
|
||||
yaw = 90;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
yaw = 270;
|
||||
}
|
||||
if (yaw < 0) {
|
||||
|
|
@ -716,7 +728,8 @@ gentity_t* G_Spawn( void ) {
|
|||
if (i == ENTITYNUM_MAX_NORMAL) {
|
||||
G_Error("G_Spawn: no free entities");
|
||||
}
|
||||
}else{
|
||||
}
|
||||
else{
|
||||
G_Error("G_Spawn: no free entities");
|
||||
}
|
||||
}
|
||||
|
|
@ -935,7 +948,8 @@ void G_AddEvent( gentity_t* ent, int32_t event, int32_t eventParm ) {
|
|||
ps->externalEvent = event | bits;
|
||||
ps->externalEventParm = eventParm;
|
||||
ps->externalEventTime = level.time;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
bits = ent->s.event & EV_EVENT_BITS;
|
||||
bits = (bits + EV_EVENT_BIT1) & EV_EVENT_BITS;
|
||||
ent->s.event = event | bits;
|
||||
|
|
@ -1038,7 +1052,7 @@ int32_t G_RadiusList ( vec3_t origin, double radius, list_p ignore, qboolean tak
|
|||
gentity_t* t = NULL;
|
||||
int32_t entityList[MAX_GENTITIES];
|
||||
int32_t numListedEntities = 0;
|
||||
int32_t i = 0;
|
||||
uint8_t i = 0;
|
||||
int32_t e = 0;
|
||||
vec3_t mins = { 0, 0, 0 };
|
||||
vec3_t maxs = { 0, 0, 0 };
|
||||
|
|
@ -1108,10 +1122,12 @@ int32_t G_RadiusList ( vec3_t origin, double radius, list_p ignore, qboolean tak
|
|||
if (origin[i] < ent->r.absmin[i])
|
||||
{
|
||||
v[i] = ent->r.absmin[i] - origin[i];
|
||||
} else if ( origin[i] > ent->r.absmax[i] )
|
||||
}
|
||||
else if (origin[i] > ent->r.absmax[i])
|
||||
{
|
||||
v[i] = origin[i] - ent->r.absmax[i];
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
v[i] = 0;
|
||||
}
|
||||
|
|
@ -1141,7 +1157,7 @@ int32_t G_RadiusListOfTypes(list_p classnames, vec3_t origin, double radius, lis
|
|||
vec3_t mins = { 0, 0, 0 };
|
||||
vec3_t maxs = { 0, 0, 0 };
|
||||
vec3_t v = { 0, 0, 0 };
|
||||
int32_t i = 0;
|
||||
uint8_t i = 0;
|
||||
int32_t e = 0;
|
||||
qboolean valid = qfalse;
|
||||
list_iter_p iter = NULL;
|
||||
|
|
@ -1232,10 +1248,12 @@ int32_t G_RadiusListOfTypes(list_p classnames, vec3_t origin, double radius, lis
|
|||
if (origin[i] < ent->r.absmin[i])
|
||||
{
|
||||
v[i] = ent->r.absmin[i] - origin[i];
|
||||
} else if ( origin[i] > ent->r.absmax[i] )
|
||||
}
|
||||
else if (origin[i] > ent->r.absmax[i])
|
||||
{
|
||||
v[i] = origin[i] - ent->r.absmax[i];
|
||||
} else
|
||||
}
|
||||
else
|
||||
{
|
||||
v[i] = 0;
|
||||
}
|
||||
|
|
@ -1301,11 +1319,14 @@ gentity_t* G_GetNearestEnt(char* classname, vec3_t origin, double radius, list_p
|
|||
|
||||
if (t->s.origin[0] || t->s.origin[1] || t->s.origin[2]) {
|
||||
VectorSubtract(origin, t->s.origin, dist);
|
||||
} else if(t->r.currentOrigin[0] || t->r.currentOrigin[1] || t->r.currentOrigin[2]) {
|
||||
}
|
||||
else if (t->r.currentOrigin[0] || t->r.currentOrigin[1] || t->r.currentOrigin[2]) {
|
||||
VectorSubtract(origin, t->r.currentOrigin, dist);
|
||||
} else if(t->s.pos.trBase[0] || t->s.pos.trBase[1] || t->s.pos.trBase[2]) {
|
||||
}
|
||||
else if (t->s.pos.trBase[0] || t->s.pos.trBase[1] || t->s.pos.trBase[2]) {
|
||||
VectorSubtract(origin, t->s.pos.trBase, dist);
|
||||
} else { /* wow none of above ... well then assume it's origin is 0 0 0*/
|
||||
}
|
||||
else { /* wow none of above ... well then assume it's origin is 0 0 0*/
|
||||
VectorCopy(origin, dist);
|
||||
}
|
||||
distance = VectorLength(dist);
|
||||
|
|
@ -1316,7 +1337,8 @@ gentity_t* G_GetNearestEnt(char* classname, vec3_t origin, double radius, list_p
|
|||
if (classname && !Q_stricmp(classname, t->classname)) {
|
||||
minDist = distance;
|
||||
nearest = t;
|
||||
} else if(!classname) {
|
||||
}
|
||||
else if (!classname) {
|
||||
minDist = distance;
|
||||
nearest = t;
|
||||
}
|
||||
|
|
@ -1420,7 +1442,7 @@ int32_t G_GetEntityByTargetname(const char* targetname, list_p entities) {
|
|||
}
|
||||
|
||||
int32_t G_GetEntityByTarget(const char* target, list_p entities) {
|
||||
int32_t i = 0;
|
||||
uint16_t i = 0;
|
||||
gentity_t* t = NULL;
|
||||
|
||||
G_LogFuncBegin();
|
||||
|
|
@ -1453,7 +1475,7 @@ int32_t G_GetEntityByTarget(const char* target, list_p entities) {
|
|||
}
|
||||
|
||||
int32_t G_GetEntityByBmodel(char* bmodel, list_p entities) {
|
||||
int32_t i = 0;
|
||||
uint16_t i = 0;
|
||||
gentity_t* t = NULL;
|
||||
|
||||
G_LogFuncBegin();
|
||||
|
|
|
|||
Loading…
Reference in New Issue