ubergames/rpg-x2
0
0
Fork 0
mirror of https://github.com/UberGames/RPG-X2.git synced 2025-03-13 03:12:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Have rewritten the spawn function of func_stasis_door.

Browse source 
Changed the complete setup so areaportal states can be adjusted now.
This entity still needs a lot of work but we are on a good way now.
You don't mind if I work a bit more on this entity do you Harry?
This commit is contained in:
Walter Julius Hennecke 2011-12-10 00:03:03 +01:00
parent 43d044fe4f
commit 166aa1db94
3 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
game/g_mover.c
View file

@ -3368,6 +3368,7 @@ void close2_stasis_door( gentity_t *ent )
// Now would be a good time to close the area portal.
trap_AdjustAreaPortalState( ent, qfalse );
trap_UnlinkEntity(ent);
ent->nextthink = -1;
return;
G_Printf( "^1Entity closed\n", 0 );
@ -3448,6 +3449,10 @@ void open2_stasis_door( gentity_t *ent )
ent->flags |= SVF_NOCLIENT;
ent->r.contents = 0;
ent->flags |= EF_NODRAW;
// Now would be a good time to open up the area portal..heh heh.
trap_AdjustAreaPortalState( ent, qtrue );
trap_LinkEntity(ent);
if ( ent->wait >= 0 )
{
@ -3481,9 +3486,6 @@ void open1_stasis_door( gentity_t *ent )
G_AddEvent( ent, EV_GENERAL_SOUND, G_SoundIndex( "sound/movers/doors/stasisdoor.wav" ));
// Now would be a good time to open up the area portal..heh heh.
trap_AdjustAreaPortalState( ent, qtrue );
ent->think = open2_stasis_door;
ent->nextthink = level.time + 1000;
G_Printf( "^1Entity opening\n", 0 );
@ -3680,37 +3682,24 @@ START_LOCKED: door is locked at spawn
*/
void SP_func_stasis_door( gentity_t *ent )
{
/* set the brush model */
trap_SetBrushModel( ent, ent->model );
G_SoundIndex( "sound/movers/doors/stasisdoor.wav" );
G_SoundIndex( "sound/movers/switches/stasisneg.wav" );
/* set the orgin */
G_SetOrigin(ent, ent->s.origin);
// Stasis doors have a model2, so precache me now
G_ModelIndex( "models/mapobjects/stasis/door2.md3" );
ent->model2 = G_NewString("models/mapobjects/stasis/door.md3");
// Now that we have the model precached, clear this out so it doesn't draw the model
// until we are ready to do the actual fade.
ent->s.modelindex2 = 0;
// sigh...ent->s.origin seems to be some kind of translational offset for the brush....so don't try and set
// the "correct" door origin because it should actually be <0 0 0>..hence the stashing of the origin in pos1.
VectorAdd( ent->r.absmax, ent->r.absmin, ent->pos1 );
VectorScale( ent->pos1, 0.5f, ent->pos1 );
VectorCopy( ent->pos1, ent->pos2 );
G_SetOrigin( ent, ent->s.origin );
// Auto create a door trigger so the designers don't have to
ent->think = spawn_trigger_stasis_door;
VectorCopy(ent->s.origin, ent->pos1);
InitMover(ent);
//G_SoundIndex( "sound/movers/doors/stasisdoor.wav" );
//G_SoundIndex( "sound/movers/switches/stasisneg.wav" );
// Auto create a door trigger so the designers don't have to
ent->think = spawn_trigger_stasis_door;
ent->nextthink = level.time + 50 * 5; // give the target a chance to spawn in
//ent->trigger_formation = qfalse;
ent->use = use_stasis_door;
//ent->flags |= SVF_STASIS_DOOR;
ent->count = 1;
if (!ent->wait)
{
@ -3724,5 +3713,6 @@ void SP_func_stasis_door( gentity_t *ent )
}
trap_LinkEntity (ent);
G_Printf( "^1Spawnage in progress\n", 0 );
}

6
game/lua_entity.c
View file

@ -2630,8 +2630,8 @@ static const luaL_Reg Entity_meta[] = {
{"GetNumber", Entity_GetNumber},
{"IsClient", Entity_IsClient},
{"GetClientname", Entity_GetClientName},
{"Print", Entity_Print},
{"CenterPrint", Entity_CenterPrint},
//{"Print", Entity_Print}, // why are these deleted?
//{"CenterPrint", Entity_CenterPrint},// why are these deleted?
{"GetClassname", Entity_GetClassName}, // args: none; return: string
{"SetClassname", Entity_SetClassName}, // args: string; return: nothing
@ -2639,7 +2639,7 @@ static const luaL_Reg Entity_meta[] = {
{"GetTargetname", Entity_GetTargetName}, // args: none; return: string
{"SetTargetname", Entity_SetTargetName}, // args: string; return: nothing
{"Rotate", Entity_Rotate},
//{"Rotate", Entity_Rotate},// why are these deleted?
{"IsRocket", Entity_IsRocket},
{"IsGrenade", Entity_IsGrenade},

BIN
stefgame.suo
View file

Binary file not shown.