TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge 'D1 emulation issues' into unification/master

Browse source 
Requested by btb: https://github.com/dxx-rebirth/dxx-rebirth/pull/38
This commit is contained in:
Kp 2015-02-20 03:00:46 +00:00
parent 110a28e137 51de6c80b5
commit f2fb31a120
7 changed files with 30 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
common/main/ai.h
View file

@ -59,9 +59,11 @@ struct PHYSFS_File;
#define ROBOT_FIRE_AGITATION 94
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
#if defined(DXX_BUILD_DESCENT_I)
extern int Boss_hit_this_frame;
#elif defined(DXX_BUILD_DESCENT_II)
extern sbyte Boss_hit_this_frame;
#define BOSS_D1 1
#define BOSS_SUPER 2
#if defined(DXX_BUILD_DESCENT_II)
#define BOSS_D2 21 // Minimum D2 boss value.
#define BOSS_COOL 21
#define BOSS_WATER 22
@ -95,7 +97,7 @@ extern fix64 Boss_cloak_start_time, Boss_cloak_end_time;
extern boss_teleport_segment_array_t Boss_teleport_segs;
extern fix64 Last_teleport_time;
extern fix Boss_cloak_duration;
extern int Boss_dying;
extern sbyte Boss_dying;
extern vms_vector Believed_player_pos;
@ -244,7 +246,6 @@ extern fix Gate_interval;
extern fix64 Boss_dying_start_time;
extern sbyte Boss_dying_sound_playing;
extern fix64 Boss_hit_time;
// -- extern int Boss_been_hit;
// ------ John: End of variables which must be saved as part of gamesave. -----
// These globals are set by a call to find_vector_intersection, which is a slow routine,

37
similar/main/ai.cpp
View file

@ -160,8 +160,7 @@ fix Boss_cloak_duration = BOSS_CLOAK_DURATION;
fix64 Last_gate_time = 0;
fix Gate_interval = F1_0*6;
fix64 Boss_dying_start_time;
#if defined(DXX_BUILD_DESCENT_I)
int Boss_dying, Boss_dying_sound_playing, Boss_hit_this_frame;
sbyte Boss_dying, Boss_dying_sound_playing, Boss_hit_this_frame;
int Boss_been_hit=0;
// ------ John: End of variables which must be saved as part of gamesave. -----
@ -195,10 +194,8 @@ int Boss_been_hit=0;
static const sbyte Super_boss_gate_list[] = {0, 1, 8, 9, 10, 11, 12, 15, 16, 18, 19, 20, 22, 0, 8, 11, 19, 20, 8, 20, 8};
#define MAX_GATE_INDEX ( sizeof(Super_boss_gate_list) / sizeof(Super_boss_gate_list[0]) )
#elif defined(DXX_BUILD_DESCENT_II)
#if defined(DXX_BUILD_DESCENT_II)
fix64 Boss_hit_time;
int Boss_dying;
sbyte Boss_dying_sound_playing;
// ------ John: End of variables which must be saved as part of gamesave. -----
@ -407,9 +404,8 @@ int ai_behavior_to_mode(int behavior)
// Call every time the player starts a new ship.
void ai_init_boss_for_ship(void)
{
#if defined(DXX_BUILD_DESCENT_I)
Boss_been_hit = 0;
#elif defined(DXX_BUILD_DESCENT_II)
#if defined(DXX_BUILD_DESCENT_II)
Boss_hit_time = -F1_0*10;
#endif
}
@ -518,8 +514,8 @@ void init_ai_objects(void)
init_boss_segments(Boss_gate_segs, 0, 0);
init_boss_segments(Boss_teleport_segs, 1, 0);
#if defined(DXX_BUILD_DESCENT_I)
Boss_been_hit = 0;
#if defined(DXX_BUILD_DESCENT_I)
Gate_interval = F1_0*5 - Difficulty_level*F1_0/2;
#elif defined(DXX_BUILD_DESCENT_II)
Gate_interval = F1_0*4 - Difficulty_level*i2f(2)/3;
@ -1244,11 +1240,9 @@ player_led: ;
set_next_fire_time(obj, ailp, robptr, gun_num);
#if defined(DXX_BUILD_DESCENT_I)
// If the boss fired, allow him to teleport very soon (right after firing, cool!), pending other factors.
if (robptr->boss_flag)
if (robptr->boss_flag == BOSS_D1 || robptr->boss_flag == BOSS_SUPER)
Last_teleport_time -= Boss_teleport_interval/2;
#endif
}
// --------------------------------------------------------------------------------------------------------------------
@ -2015,13 +2009,11 @@ objptridx_t gate_in_robot(int type, segnum_t segnum)
return create_gated_robot(segnum, type, NULL);
}
#if defined(DXX_BUILD_DESCENT_I)
static objptridx_t gate_in_robot(int type)
{
auto segnum = Boss_gate_segs[(d_rand() * Boss_gate_segs.count()) >> 15];
return gate_in_robot(type, segnum);
}
#endif
// --------------------------------------------------------------------------------------------------------------------
static int boss_fits_in_seg(const vobjptridx_t boss_objp, const vsegptridx_t segp)
@ -2436,7 +2428,6 @@ fix Prev_boss_shields = -1;
// --------------------------------------------------------------------------------------------------------------------
// Do special stuff for a boss.
#if defined(DXX_BUILD_DESCENT_I)
static void do_boss_stuff(const vobjptridx_t objp)
{
#ifndef NDEBUG
@ -2523,7 +2514,7 @@ static void do_super_boss_stuff(const vobjptridx_t objp, fix dist_to_player, int
}
}
#elif defined(DXX_BUILD_DESCENT_II)
#if defined(DXX_BUILD_DESCENT_II)
static void do_boss_stuff(const vobjptridx_t objp, int player_visibility)
{
int boss_id, boss_index;
@ -3260,8 +3251,7 @@ _exit_cheat:
case 0:
break;
case 1:
#if defined(DXX_BUILD_DESCENT_I)
case BOSS_D1:
if (aip->GOAL_STATE == AIS_FLIN)
aip->GOAL_STATE = AIS_FIRE;
if (aip->CURRENT_STATE == AIS_FLIN)
@ -3271,10 +3261,7 @@ _exit_cheat:
do_boss_stuff(obj);
dist_to_player *= 4;
break;
#endif
case 2:
// FIXME!!!!
#if defined(DXX_BUILD_DESCENT_I)
case BOSS_SUPER:
if (aip->GOAL_STATE == AIS_FLIN)
aip->GOAL_STATE = AIS_FIRE;
if (aip->CURRENT_STATE == AIS_FLIN)
@ -3292,7 +3279,6 @@ _exit_cheat:
do_super_boss_stuff(obj, dtp, pv);
}
#endif
break;
default:
@ -4463,11 +4449,13 @@ int ai_save_state(PHYSFS_file *fp)
tmptime32 = -1;
}
PHYSFS_write(fp, &tmptime32, sizeof(fix), 1);
PHYSFS_write(fp, &Boss_dying, sizeof(int), 1);
int boss_dying = Boss_dying;
PHYSFS_write(fp, &boss_dying, sizeof(int), 1);
int boss_dying_sound_playing = Boss_dying_sound_playing;
PHYSFS_write(fp, &boss_dying_sound_playing, sizeof(int), 1);
#if defined(DXX_BUILD_DESCENT_I)
PHYSFS_write(fp, &Boss_hit_this_frame, sizeof(int), 1);
int boss_hit_this_frame = Boss_hit_this_frame;
PHYSFS_write(fp, &boss_hit_this_frame, sizeof(int), 1);
PHYSFS_write(fp, &Boss_been_hit, sizeof(int), 1);
#elif defined(DXX_BUILD_DESCENT_II)
if (Boss_hit_time - GameTime64 < F1_0*(-18000))
@ -4622,7 +4610,6 @@ int ai_restore_state(PHYSFS_file *fp, int version, int swap)
#elif defined(DXX_BUILD_DESCENT_II)
tmptime32 = PHYSFSX_readSXE32(fp, swap);
Boss_hit_time = (fix64)tmptime32;
// -- MK, 10/21/95, unused! -- PHYSFS_read(fp, &Boss_been_hit, sizeof(int), 1);
if (version >= 8) {
Escort_kill_object = PHYSFSX_readSXE32(fp, swap);

6
similar/main/collide.cpp
View file

@ -1350,9 +1350,8 @@ int apply_damage_to_robot(const vobjptridx_t robot, fix damage, objnum_t killer_
const robot_info *robptr = &Robot_info[get_robot_id(robot)];
if (robptr->boss_flag)
#if defined(DXX_BUILD_DESCENT_I)
Boss_been_hit = 1;
#elif defined(DXX_BUILD_DESCENT_II)
#if defined(DXX_BUILD_DESCENT_II)
Boss_hit_time = GameTime64;
// Buddy invulnerable on level 24 so he can give you his important messages. Bah.
@ -1578,9 +1577,8 @@ static void collide_robot_and_weapon(const vobjptridx_t robot, const vobjptridx
const robot_info *robptr = &Robot_info[get_robot_id(robot)];
if (robptr->boss_flag)
{
#if defined(DXX_BUILD_DESCENT_I)
Boss_hit_this_frame = 1;
#elif defined(DXX_BUILD_DESCENT_II)
#if defined(DXX_BUILD_DESCENT_II)
Boss_hit_time = GameTime64;
if (robptr->boss_flag >= BOSS_D2) {
damage_flag = do_boss_weapon_collision(robot, weapon, collision_point);

6
similar/main/mission.cpp
View file

@ -733,7 +733,7 @@ static int load_mission(const mle *mission)
if (EMULATING_D1)
#endif
{
if (!PHYSFSX_contfile_init("descent.hog", 1))
if (!PHYSFSX_contfile_init("descent.hog", 0))
#if defined(DXX_BUILD_DESCENT_I)
Error("descent.hog not available!\n");
#elif defined(DXX_BUILD_DESCENT_II)
@ -742,6 +742,10 @@ static int load_mission(const mle *mission)
if (!d_stricmp(Current_mission_filename, D1_MISSION_FILENAME))
return load_mission_d1();
}
#if defined(DXX_BUILD_DESCENT_II)
else
PHYSFSX_contfile_close("descent.hog");
#endif
#if defined(DXX_BUILD_DESCENT_II)
if (PLAYING_BUILTIN_MISSION) {

3
similar/main/multibot.cpp
View file

@ -991,9 +991,8 @@ void multi_do_boss_cloak(const ubyte *buf)
Int3(); // Got boss actions for a robot who's not a boss?
return;
}
#if defined(DXX_BUILD_DESCENT_I)
Boss_hit_this_frame = 0;
#elif defined(DXX_BUILD_DESCENT_II)
#if defined(DXX_BUILD_DESCENT_II)
Boss_hit_time = -F1_0*10;
#endif
Boss_cloak_start_time = GameTime64;

4
similar/main/paging.cpp
View file

@ -55,6 +55,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "powerup.h"
#include "fuelcen.h"
#include "mission.h"
#include "ai.h"
#include "compiler-range_for.h"
#include "highest_valid.h"
@ -166,7 +167,8 @@ static void paging_touch_robot( int robot_index )
paging_touch_weapon( Robot_info[robot_index].weapon_type );
// A super-boss can gate in robots...
if ( Robot_info[robot_index].boss_flag==2 ) {
if (Robot_info[robot_index].boss_flag == BOSS_SUPER)
{
range_for (const auto i, super_boss_gate_type_list)
paging_touch_robot(i);

2
similar/main/titles.cpp
View file

@ -684,7 +684,7 @@ static void put_char_delay(briefing *br, char ch)
br->text_x += w;
#if defined(DXX_BUILD_DESCENT_II)
if (!br->chattering) {
if (!EMULATING_D1 && !br->chattering) {
br->printing_channel = digi_start_sound( digi_xlat_sound(SOUND_BRIEFING_PRINTING), F1_0, 0xFFFF/2, 1, -1, -1, sound_object_none);
br->chattering=1;
}