| version 1.2 | | version 1.3 |
|---|
| | |
| * object rendering | | * object rendering |
| * | | * |
| * $Log$ | | * $Log$ |
| | | * Revision 1.3 2000/04/19 21:27:57 sekmu |
| | | * movable death-cam from WraithX |
| | | * |
| * Revision 1.2 1999/11/21 14:05:00 sekmu | | * Revision 1.2 1999/11/21 14:05:00 sekmu |
| * observer mode | | * observer mode |
| * | | * |
| | |
| int objnum; | | int objnum; |
| object *player = &Objects[Players[Player_num].objnum]; | | object *player = &Objects[Players[Player_num].objnum]; |
| | | |
| objnum = obj_create(OBJ_CAMERA, 0, player->segnum, &player->pos, &player->orient, 0, CT_NONE, MT_NONE, RT_NONE); | | //this next line was changed by WraithX, instead of CT_FLYING, it was CT_NONE: instead of MT_PHYSICS, it was MT_NONE. |
| | | objnum = obj_create(OBJ_CAMERA, 0, player->segnum, &player->pos, &player->orient, 0, CT_FLYING, MT_PHYSICS, RT_NONE); |
| | | |
| mprintf((0, "Creating new dead player camera.\n")); | | mprintf((0, "Creating new dead player camera.\n")); |
| if (objnum != -1) | | if (objnum != -1) |
| | |
| | | |
| set_camera_pos(&Dead_player_camera->pos, ConsoleObject); | | set_camera_pos(&Dead_player_camera->pos, ConsoleObject); |
| | | |
| // if (time_dead < DEATH_SEQUENCE_EXPLODE_TIME+F1_0*2) { | | //the following line uncommented by WraithX, 4-12-00 |
| | | if (time_dead < DEATH_SEQUENCE_EXPLODE_TIME+F1_0*2) { |
| vm_vec_sub(&fvec, &ConsoleObject->pos, &Dead_player_camera->pos); | | vm_vec_sub(&fvec, &ConsoleObject->pos, &Dead_player_camera->pos); |
| vm_vector_2_matrix(&Dead_player_camera->orient, &fvec, NULL, NULL); | | vm_vector_2_matrix(&Dead_player_camera->orient, &fvec, NULL, NULL); |
| // } else { | | Dead_player_camera->mtype.phys_info = ConsoleObject->mtype.phys_info; |
| // Dead_player_camera->movement_type = MT_PHYSICS; | | |
| | | //the following "if" added by WraithX to get rid of camera "wiggle" |
| | | if (Dead_player_camera->mtype.phys_info.flags & PF_WIGGLE) |
| | | { |
| | | Dead_player_camera->mtype.phys_info.flags = (Dead_player_camera->mtype.phys_info.flags & ~PF_WIGGLE); |
| | | }//end "if" added by WraithX, 4/13/00 |
| | | |
| | | //the following line uncommented by WraithX, 4-12-00 |
| | | } else { |
| | | //the following line uncommented by WraithX, 4-11-00 |
| | | Dead_player_camera->movement_type = MT_PHYSICS; |
| // Dead_player_camera->mtype.phys_info.rotvel.y = F1_0/8; | | // Dead_player_camera->mtype.phys_info.rotvel.y = F1_0/8; |
| // } | | //the following line uncommented by WraithX, 4-12-00 |
| | | } |
| | | //end addition by WX |
| | | |
| if (time_dead > DEATH_SEQUENCE_EXPLODE_TIME) { | | if (time_dead > DEATH_SEQUENCE_EXPLODE_TIME) { |
| if (!Player_exploded) { | | if (!Player_exploded) { |
| | |
| Player_is_dead = 1; | | Player_is_dead = 1; |
| Players[Player_num].flags &= ~(PLAYER_FLAGS_AFTERBURNER); | | Players[Player_num].flags &= ~(PLAYER_FLAGS_AFTERBURNER); |
| | | |
| vm_vec_zero(&player->mtype.phys_info.rotthrust); | | vm_vec_zero(&player->mtype.phys_info.rotthrust); //this line commented by WraithX |
| vm_vec_zero(&player->mtype.phys_info.thrust); | | vm_vec_zero(&player->mtype.phys_info.thrust); |
| | | |
| Player_time_of_death = GameTime; | | Player_time_of_death = GameTime; |
| | | //this next line was changed by WraithX, instead of CT_FLYING, it was CT_NONE: instead of MT_PHYSICS, it was MT_NONE. |
| objnum = obj_create(OBJ_CAMERA, 0, player->segnum, &player->pos, &player->orient, 0, CT_NONE, MT_NONE, RT_NONE); | | objnum = obj_create(OBJ_CAMERA, 0, player->segnum, &player->pos, &player->orient, 0, CT_FLYING, MT_PHYSICS, RT_NONE); |
| Viewer_save = Viewer; | | Viewer_save = Viewer; |
| if (objnum != -1) | | if (objnum != -1) |
| Viewer = Dead_player_camera = &Objects[objnum]; | | Viewer = Dead_player_camera = &Objects[objnum]; |
| | |
| | | |
| player->flags &= ~OF_SHOULD_BE_DEAD; | | player->flags &= ~OF_SHOULD_BE_DEAD; |
| // Players[Player_num].flags |= PLAYER_FLAGS_INVULNERABLE; | | // Players[Player_num].flags |= PLAYER_FLAGS_INVULNERABLE; |
| player->control_type = CT_NONE; | | player->control_type = CT_FLYING; //change from CT_NONE to CT_FLYING by WraithX |
| player->shields = F1_0*1000; | | player->shields = F1_0*1000; |
| | | |
| PALETTE_FLASH_SET(0,0,0); | | PALETTE_FLASH_SET(0,0,0); |
| | |
| explode_badass_weapon(obj); | | explode_badass_weapon(obj); |
| } | | } |
| | | |
| | | //the following ( if !dead) statement added by WraithX |
| | | if (!Player_is_dead) |
| | | { |
| if (obj->type == OBJ_NONE || obj->flags&OF_SHOULD_BE_DEAD) | | if (obj->type == OBJ_NONE || obj->flags&OF_SHOULD_BE_DEAD) |
| return; //object has been deleted | | return; //object has been deleted |
| | | }//end addition by WraithX |
| | | |
| switch (obj->movement_type) { | | switch (obj->movement_type) { |
| | | |