mirror of
https://github.com/UberGames/RPG-X2-rpgxEF.git
synced 2025-02-12 15:15:42 +00:00
Updated DEVELOPER macro
Updated DEVELOPER macro: - now uses cvar g_developer instead of developer - now allows single statement, multistatement, block, and multiple blocks as argument
This commit is contained in:
parent
b2461f9868
commit
0d022b90e3
11 changed files with 60 additions and 54 deletions
|
@ -234,7 +234,7 @@ void breakable_spawn_trigger(gentity_t *ent) {
|
|||
other = G_Spawn();
|
||||
|
||||
if(!other) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] Unable to spawn trigger for func_breakable at %s!\n", vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] Unable to spawn trigger for func_breakable at %s!\n", vtos(ent->s.origin)););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
|
@ -713,7 +713,7 @@ void target_repair_link(gentity_t *ent) {
|
|||
if(!target) {
|
||||
target = G_Find(NULL, FOFS(targetname2), ent->target);
|
||||
if(!target) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_repair at %s with an unfound target: %s\n", vtos(ent->s.origin), ent->target));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_repair at %s with an unfound target: %s\n", vtos(ent->s.origin), ent->target););
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
@ -721,7 +721,7 @@ void target_repair_link(gentity_t *ent) {
|
|||
ent->lastEnemy = target;
|
||||
|
||||
if(Q_stricmp(target->classname, "func_breakable")) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_repair at %s with an invalid target entity %s\n", vtos(ent->s.origin), target->classname));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_repair at %s with an invalid target entity %s\n", vtos(ent->s.origin), target->classname););
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -733,7 +733,7 @@ void target_repair_link(gentity_t *ent) {
|
|||
*/
|
||||
void SP_target_repair(gentity_t *ent) {
|
||||
if(!ent->target) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_repair without target at %s\n", vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_repair without target at %s\n", vtos(ent->s.origin)););
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -894,7 +894,7 @@ void phaser_link(gentity_t *ent) {
|
|||
gentity_t *target = NULL;
|
||||
target = G_Find(target, FOFS(targetname), ent->target);
|
||||
if(!target) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Enity-Error] Could not find target %s for fx_phaser at %s!\n", ent->target, vtos(ent->r.currentOrigin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Enity-Error] Could not find target %s for fx_phaser at %s!\n", ent->target, vtos(ent->r.currentOrigin)););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
|
@ -911,7 +911,7 @@ void SP_fx_phaser(gentity_t *ent) {
|
|||
int impact;
|
||||
ent->count = PHASER_FX_UNLINKED;
|
||||
if(!ent->target) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] fx_phaser at %s without target!\n", vtos(ent->r.currentOrigin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] fx_phaser at %s without target!\n", vtos(ent->r.currentOrigin)););
|
||||
return;
|
||||
}
|
||||
G_SpawnFloat("scale", "20", &scale);
|
||||
|
@ -974,7 +974,7 @@ void fx_torpedo_link(gentity_t *ent) {
|
|||
gentity_t *target = NULL;
|
||||
target = G_Find(target, FOFS(targetname), ent->target);
|
||||
if(!target) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] Could not find target %s for fx_torpedo at %s!\n", ent->target, vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] Could not find target %s for fx_torpedo at %s!\n", ent->target, vtos(ent->s.origin)););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
|
@ -1000,7 +1000,7 @@ void fx_torpedo_link(gentity_t *ent) {
|
|||
void SP_fx_torpedo(gentity_t *ent) {
|
||||
char *sound;
|
||||
if(!ent->target) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] fx_torpedo at %s without target\n", vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] fx_torpedo at %s without target\n", vtos(ent->s.origin)););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -10,13 +10,6 @@
|
|||
|
||||
//==================================================================
|
||||
|
||||
|
||||
// developer tools:
|
||||
// Prevents a single statement from beeing executed if developer isn't set
|
||||
// Usage Example DEVELOPER(G_Printf("Some Debug Message"));
|
||||
// NOTE that the ; of the statement is after the closing ) of the macro
|
||||
#define DEVELOPER(X) trap_Cvar_VariableIntegerValue("developer") ? X : " "
|
||||
|
||||
// the "gameversion" client command will print this plus compile date
|
||||
//#define GAMEVERSION "RPG-X v",RPGX_VERSION
|
||||
//const char GAMEVERSION[] = strcat("RPG-X v",RPGX_VERSION);
|
||||
|
@ -1302,6 +1295,14 @@ extern vmCvar_t lua_allowedModules;
|
|||
extern vmCvar_t lua_modules;
|
||||
#endif
|
||||
|
||||
extern vmCvar_t g_developer;
|
||||
// developer tools:
|
||||
// Prevents a single statement from beeing executed if developer isn't set
|
||||
#define DEVELOPER(X) if(g_developer.integer != 0) { \
|
||||
X\
|
||||
} else
|
||||
|
||||
|
||||
#include "g_team.h" // teamplay specific stuff
|
||||
|
||||
|
||||
|
|
|
@ -357,6 +357,8 @@ vmCvar_t lua_modules;
|
|||
vmCvar_t lua_allowedModules;
|
||||
#endif
|
||||
|
||||
vmCvar_t g_developer;
|
||||
|
||||
// XPERIMENTAL
|
||||
//vmCvar_t rpg_useLanguages;
|
||||
|
||||
|
@ -637,7 +639,9 @@ static cvarTable_t gameCvarTable[] = {
|
|||
{ &rpg_grenadeAltDamage, "rpg_grenadeAltDamage", "80", CVAR_ARCHIVE, 0, qfalse },
|
||||
{ &rpg_tr116Damage, "rpg_tr116Damage", "150", CVAR_ARCHIVE, 0, qfalse },
|
||||
{ &rpg_photonDamage, "rpg_photonDamage", "140", CVAR_ARCHIVE, 0, qfalse },
|
||||
{ &rpg_photonAltDamage, "rpg_photonAltDamage", "140", CVAR_ARCHIVE, 0, qfalse }
|
||||
{ &rpg_photonAltDamage, "rpg_photonAltDamage", "140", CVAR_ARCHIVE, 0, qfalse },
|
||||
|
||||
{ &g_developer, "g_developer", "0", CVAR_ARCHIVE, 0, qfalse }
|
||||
};
|
||||
|
||||
static int gameCvarTableSize = sizeof( gameCvarTable ) / sizeof( gameCvarTable[0] );
|
||||
|
|
|
@ -338,7 +338,7 @@ void cycleCamera( gentity_t *self )
|
|||
owner = G_Find( owner, FOFS(targetname), self->target );
|
||||
if ( owner == NULL )
|
||||
{//still didn't find one
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] Couldn't find target for misc_portal_surface\n" ));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] Couldn't find target for misc_portal_surface\n" ););
|
||||
G_FreeEntity( self );
|
||||
return;
|
||||
}
|
||||
|
@ -370,7 +370,7 @@ void locateCamera( gentity_t *ent ) {
|
|||
owner = G_Find( NULL, FOFS(targetname), ent->target );
|
||||
if ( owner == NULL )
|
||||
{
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] Couldn't find target for misc_partal_surface\n" ));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] Couldn't find target for misc_partal_surface\n" ););
|
||||
G_FreeEntity( ent );
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -2045,7 +2045,7 @@ void Think_SetupTrainTargets( gentity_t *ent ) {
|
|||
ent->nextTrain = G_Find( NULL, FOFS(targetname), ent->target );
|
||||
if ( !ent->nextTrain ) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] func_train at %s with an unfound target\n",
|
||||
vtos(ent->r.absmin) ));
|
||||
vtos(ent->r.absmin) ););
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -2057,7 +2057,7 @@ void Think_SetupTrainTargets( gentity_t *ent ) {
|
|||
|
||||
if ( !path->target ) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] Train corner at %s without a target\n",
|
||||
vtos(path->s.origin) ));
|
||||
vtos(path->s.origin) ););
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -2069,7 +2069,7 @@ void Think_SetupTrainTargets( gentity_t *ent ) {
|
|||
next = G_Find( next, FOFS(targetname), path->target );
|
||||
if ( !next ) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] Train corner at %s without a target path_corner\n",
|
||||
vtos(path->s.origin) ));
|
||||
vtos(path->s.origin) ););
|
||||
return;
|
||||
}
|
||||
} while ( strcmp( next->classname, "path_corner" ) );
|
||||
|
@ -2091,7 +2091,7 @@ Target: next path corner and other targets to fire
|
|||
*/
|
||||
void SP_path_corner( gentity_t *self ) {
|
||||
if ( !self->targetname ) {
|
||||
DEVELOPER(G_Printf (S_COLOR_YELLOW "[Entity-Error] path_corner with no targetname at %s\n", vtos(self->s.origin)));
|
||||
DEVELOPER(G_Printf (S_COLOR_YELLOW "[Entity-Error] path_corner with no targetname at %s\n", vtos(self->s.origin)););
|
||||
G_FreeEntity( self );
|
||||
return;
|
||||
}
|
||||
|
@ -2129,7 +2129,7 @@ void SP_func_train (gentity_t *self) {
|
|||
}
|
||||
|
||||
if ( !self->target ) {
|
||||
DEVELOPER(G_Printf (S_COLOR_YELLOW "[Entity-Error] func_train without a target at %s\n", vtos(self->r.absmin)));
|
||||
DEVELOPER(G_Printf (S_COLOR_YELLOW "[Entity-Error] func_train without a target at %s\n", vtos(self->r.absmin)););
|
||||
G_FreeEntity( self );
|
||||
return;
|
||||
}
|
||||
|
@ -2726,7 +2726,7 @@ void SP_func_door_rotating ( gentity_t *ent ) {
|
|||
// leave out, so we'll tell him if he does.
|
||||
if ( !ent->distance ) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] %s at %s with no distance set.\n",
|
||||
ent->classname, vtos(ent->s.origin)));
|
||||
ent->classname, vtos(ent->s.origin)););
|
||||
ent->distance = 90.0;
|
||||
}
|
||||
|
||||
|
@ -2967,12 +2967,12 @@ void func_lightchange_setup(gentity_t *ent) {
|
|||
gentity_t *bmodel;
|
||||
bmodel = G_Find(NULL, FOFS(targetname), ent->target);
|
||||
if(!bmodel) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] Could not find target %s for func_lightchange at %s!\n", ent->target, vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] Could not find target %s for func_lightchange at %s!\n", ent->target, vtos(ent->s.origin)););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
if(Q_stricmp(bmodel->classname, "func_brushmodel")) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] func_lightchange with invalid target entity of class %s at %s!\n", bmodel->classname, vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] func_lightchange with invalid target entity of class %s at %s!\n", bmodel->classname, vtos(ent->s.origin)););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
|
@ -2990,7 +2990,7 @@ void func_lightchange_setup(gentity_t *ent) {
|
|||
|
||||
void SP_func_lightchange(gentity_t *ent) {
|
||||
if(!ent->target) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] func_lightchange without target at %s!\n", vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] func_lightchange without target at %s!\n", vtos(ent->s.origin)););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
|
@ -3029,7 +3029,7 @@ void func_targetmover_link(gentity_t *ent) {
|
|||
|
||||
target = G_Find(NULL, FOFS(targetname), ent->target);
|
||||
if(!target) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] func_targetmover with unfound target %s at %s!\n", ent->target, vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] func_targetmover with unfound target %s at %s!\n", ent->target, vtos(ent->s.origin)););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
|
@ -3077,7 +3077,7 @@ void SP_func_targetmover(gentity_t *ent) {
|
|||
//qboolean liftDoor=qfalse;
|
||||
|
||||
if(!ent->target) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] func_targetmover without target at %s!\n", vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] func_targetmover without target at %s!\n", vtos(ent->s.origin)););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
|
@ -3297,7 +3297,7 @@ void SP_func_mover(gentity_t *ent) {
|
|||
float aspeed;
|
||||
|
||||
if(!ent->target) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] func_mover without target at %s!\n", vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] func_mover without target at %s!\n", vtos(ent->s.origin)););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -510,7 +510,7 @@ qboolean G_CallSpawn( gentity_t *ent ) {
|
|||
|
||||
if ( Q_stricmp( "item_botroam", ent->classname ) != 0 )
|
||||
{//suppress error message about botroams as those are actually valid
|
||||
DEVELOPER(G_Printf (S_COLOR_RED "%s doesn't have a spawn function\n", ent->classname));
|
||||
DEVELOPER(G_Printf (S_COLOR_RED "%s doesn't have a spawn function\n", ent->classname););
|
||||
}
|
||||
|
||||
#ifdef G_LUA
|
||||
|
|
|
@ -269,7 +269,7 @@ void SP_target_speaker( gentity_t *ent ) {
|
|||
G_SpawnFloat( "random", "0", &ent->random );
|
||||
|
||||
if ( !G_SpawnString( "noise", "NOSOUND", &s ) && !ent->count ) { // if ent->count then it is a spawned sound, either by spawnEnt or *.spawn
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_speaker without a noise key at %s", vtos( ent->s.origin ) ));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_speaker without a noise key at %s", vtos( ent->s.origin ) ););
|
||||
G_FreeEntity(ent);//let's not error out so that we can use SP maps with their funky speakers.
|
||||
return;
|
||||
}
|
||||
|
@ -384,7 +384,7 @@ void target_laser_start (gentity_t *self)
|
|||
if (self->target) {
|
||||
ent = G_Find (NULL, FOFS(targetname), self->target);
|
||||
if (!ent) {
|
||||
DEVELOPER(G_Printf (S_COLOR_YELLOW "[Entity-Error] %s at %s: %s is a bad target\n", self->classname, vtos(self->s.origin), self->target));
|
||||
DEVELOPER(G_Printf (S_COLOR_YELLOW "[Entity-Error] %s at %s: %s is a bad target\n", self->classname, vtos(self->s.origin), self->target););
|
||||
G_FreeEntity(self);
|
||||
return;
|
||||
}
|
||||
|
@ -434,7 +434,7 @@ void target_teleporter_use( gentity_t *self, gentity_t *other, gentity_t *activa
|
|||
return;
|
||||
dest = G_PickTarget( self->target );
|
||||
if (!dest) {
|
||||
DEVELOPER(G_Printf (S_COLOR_YELLOW "[Entity-Error] Couldn't find teleporter destination\n"));
|
||||
DEVELOPER(G_Printf (S_COLOR_YELLOW "[Entity-Error] Couldn't find teleporter destination\n"););
|
||||
G_FreeEntity(self);
|
||||
return;
|
||||
}
|
||||
|
@ -488,8 +488,9 @@ the surface you want the player to appear on. It's been hardcoded to take this
|
|||
account only when the VISUAL_FX flag is on.
|
||||
*/
|
||||
void SP_target_teleporter( gentity_t *self ) {
|
||||
if (!self->targetname)
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] untargeted %s at %s\n", self->classname, vtos(self->s.origin)));
|
||||
if (!self->targetname) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] untargeted %s at %s\n", self->classname, vtos(self->s.origin)););
|
||||
}
|
||||
|
||||
if(self->spawnflags & 4)
|
||||
self->flags ^= FL_LOCKED;
|
||||
|
@ -1544,7 +1545,7 @@ void SP_target_turbolift ( gentity_t *self )
|
|||
//kill the ent if it isn't valid
|
||||
if ( i <= 0 && !(self->tmpEntity))
|
||||
{
|
||||
DEVELOPER(G_Printf( S_COLOR_YELLOW "[Entity-Error] A turbolift entity does not have a valid deck number!\n" ));
|
||||
DEVELOPER(G_Printf( S_COLOR_YELLOW "[Entity-Error] A turbolift entity does not have a valid deck number!\n" ););
|
||||
G_FreeEntity( self );
|
||||
return;
|
||||
}
|
||||
|
@ -1671,7 +1672,7 @@ void target_doorLock_use(gentity_t *ent, gentity_t *other, gentity_t* activator)
|
|||
if(!Q_stricmp(target->classname, "func_door") || !Q_stricmp(target->classname, "func_door_rotating")) {
|
||||
target->flags ^= FL_LOCKED;
|
||||
} else {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] Target %s of target_doorlock at %s is not a door!\n", ent->target, vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] Target %s of target_doorlock at %s is not a door!\n", ent->target, vtos(ent->s.origin)););
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
@ -1679,7 +1680,7 @@ void target_doorLock_use(gentity_t *ent, gentity_t *other, gentity_t* activator)
|
|||
void SP_target_doorLock(gentity_t *ent) {
|
||||
char *temp;
|
||||
if(!ent->target) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_doorlock at %s without target!\n"));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_doorlock at %s without target!\n"););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
|
@ -1779,7 +1780,7 @@ void target_alert_remapShaders(int target_condition) {
|
|||
|
||||
void target_alert_use(gentity_t *ent, gentity_t *other, gentity_t *activator) {
|
||||
if(!activator) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_alert_use called with NULL activator.\n"));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_alert_use called with NULL activator.\n"););
|
||||
return;
|
||||
}
|
||||
if(!Q_stricmp(activator->target, ent->swapname)) {
|
||||
|
@ -2167,7 +2168,7 @@ void SP_target_alert(gentity_t *ent) {
|
|||
|
||||
if(!ent->swapname || !ent->truename || !ent->falsename || !ent->bluename ||
|
||||
!ent->truetarget || !ent->falsetarget || !ent->paintarget || !ent->targetname2) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] One or more needed keys for target_alert at %s where not set.\n", vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] One or more needed keys for target_alert at %s where not set.\n", vtos(ent->s.origin)););
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -2224,7 +2225,7 @@ void target_warp_use(gentity_t *ent, gentity_t *other, gentity_t *activator) {
|
|||
gentity_t *target;
|
||||
|
||||
if(!activator) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_warp_use called with NULL activator!\n"));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_warp_use called with NULL activator!\n"););
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -2375,7 +2376,7 @@ void target_deactivate_use(gentity_t *ent, gentity_t *other, gentity_t *activato
|
|||
|
||||
void SP_target_deactivate(gentity_t *ent) {
|
||||
if(!ent->target) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_deactivate at %s without target!\n", vtos(ent->r.currentOrigin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_deactivate at %s without target!\n", vtos(ent->r.currentOrigin)););
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -2484,7 +2485,7 @@ void target_levelchange_use(gentity_t *ent, gentity_t *other, gentity_t *activat
|
|||
|
||||
void SP_target_levelchange(gentity_t *ent) {
|
||||
if(!ent->target) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_levelchange without target at %s!\n", vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_levelchange without target at %s!\n", vtos(ent->s.origin)););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
|
@ -2543,13 +2544,13 @@ void target_shaderremap_use(gentity_t *ent, gentity_t *other, gentity_t *activat
|
|||
|
||||
void SP_target_shaderremap(gentity_t *ent) {
|
||||
if(!ent->falsename) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_shaderremap without falsename-shader at %s!\n", vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_shaderremap without falsename-shader at %s!\n", vtos(ent->s.origin)););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
|
||||
if(!ent->truename) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_shaderremap without truename-shader at %s!\n", vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] target_shaderremap without truename-shader at %s!\n", vtos(ent->s.origin)););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -159,7 +159,7 @@ void SP_trigger_multiple( gentity_t *ent ) {
|
|||
|
||||
if ( ent->random >= ent->wait && ent->wait >= 0 ) {
|
||||
ent->random = ent->wait - FRAMETIME;
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Warning] trigger_multiple has random >= wait\n" ));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Warning] trigger_multiple has random >= wait\n" ););
|
||||
}
|
||||
|
||||
ent->touch = Touch_Multi;
|
||||
|
@ -489,7 +489,7 @@ void trigger_teleporter_touch (gentity_t *self, gentity_t *other, trace_t *trace
|
|||
}
|
||||
if (!dest)
|
||||
{
|
||||
DEVELOPER(G_Printf (S_COLOR_YELLOW "[Entity-Error] Couldn't find teleporter destination\n"));
|
||||
DEVELOPER(G_Printf (S_COLOR_YELLOW "[Entity-Error] Couldn't find teleporter destination\n"););
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -866,7 +866,7 @@ void SP_func_timer( gentity_t *self ) {
|
|||
|
||||
if ( self->random >= self->wait ) {
|
||||
self->random = self->wait - FRAMETIME;
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Warning] func_timer at %s has random >= wait\n", vtos( self->s.origin ) ));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Warning] func_timer at %s has random >= wait\n", vtos( self->s.origin ) ););
|
||||
}
|
||||
|
||||
if ( self->spawnflags & 1 ) {
|
||||
|
@ -998,7 +998,7 @@ void SP_trigger_transporter(gentity_t *ent) {
|
|||
InitTrigger(ent);
|
||||
|
||||
if(!ent->wait) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] trigger_transporter without wait at %s!\n", vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] trigger_transporter without wait at %s!\n", vtos(ent->s.origin)););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -71,7 +71,7 @@ void ui_transporter_setup(gentity_t *ent) {
|
|||
target = G_Find(target, FOFS(targetname), ent->target);
|
||||
|
||||
if(!target) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] ui_transporter without trigger_transporter as target at %s!\n", vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] ui_transporter without trigger_transporter as target at %s!\n", vtos(ent->s.origin)););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
|
@ -93,7 +93,7 @@ void ui_transporter_setup(gentity_t *ent) {
|
|||
void SP_ui_transporter(gentity_t *ent) {
|
||||
|
||||
if(!ent->target) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] ui_transporter without target at %s!\n", vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] ui_transporter without target at %s!\n", vtos(ent->s.origin)););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
|
@ -147,7 +147,7 @@ void ui_holodeck_setup(gentity_t *ent) {
|
|||
target = G_Find(NULL, FOFS(targetname), ent->target);
|
||||
|
||||
if(!target) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] ui_holodekc without trigger_holodeck as target at %s!\n", vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] ui_holodekc without trigger_holodeck as target at %s!\n", vtos(ent->s.origin)););
|
||||
G_FreeEntity(ent);
|
||||
return;
|
||||
}
|
||||
|
@ -161,7 +161,7 @@ void ui_holodeck_setup(gentity_t *ent) {
|
|||
|
||||
void SP_ui_holodeck(gentity_t *ent) {
|
||||
if(!ent->target) {
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] ui_holodeck without target at %s!\n", vtos(ent->s.origin)));
|
||||
DEVELOPER(G_Printf(S_COLOR_YELLOW "[Entity-Error] ui_holodeck without target at %s!\n", vtos(ent->s.origin)););
|
||||
G_FreeEntity(ent);
|
||||
}
|
||||
|
||||
|
|
BIN
stefgame.suo
BIN
stefgame.suo
Binary file not shown.
Loading…
Reference in a new issue