mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-22 06:20:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor Player Data Work

Browse Source 
Fix initialization/multiple definition errors, move some things to get sinit closer to matching
This commit is contained in:
SuperDude88
2024-05-18 21:10:24 -04:00
parent 4fe8a9bd46
commit 55ff1d4923
3 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_player_main_data.h
+41 -40
View File
@@ -1,46 +1,47 @@
#include "d/d_cc_d.h"
char l_arcName[];
extern char l_arcName[];
char l_tact_event_label[];
char l_tact_night_event_label[];
char l_tact_wind_change_event_label[];
char l_tact_wind_change_event_label2[];
extern char l_tact_event_label[];
extern char l_tact_night_event_label[];
extern char l_tact_wind_change_event_label[];
extern char l_tact_wind_change_event_label2[];
const Vec l_ship_offset;
const Vec l_ship_offset2;
const Vec l_ship_offset3;
const Vec l_ship_redge;
const Vec l_ship_ledge;
const Vec l_heel_pos;
const Vec l_toe_pos;
const Vec l_eye_offset;
const Vec l_head_center_offset;
const Vec l_neck_front;
const Vec l_neck_top;
const Vec l_land_smoke_offset;
const Vec l_ms_light_local_start;
const Vec l_ms_light_local_vec;
const Vec l_tact_top;
const Vec l_crawl_start_front_offset;
const Vec l_crawl_front_offset;
const Vec l_crawl_back_offset;
const Vec l_crawl_top_offset;
const Vec l_crawl_front_up_offset;
const Vec l_crawl_back_up_offset;
const Vec l_crawl_stand_up_offset;
const Vec l_crawl_top_up_offset;
const Vec l_crawl_side_offset;
const Vec l_crawl_lside_offset;
const Vec l_crawl_rside_offset;
const Vec l_crawl_lside_front_offset;
const Vec l_crawl_rside_front_offset;
const Vec l_crawl_min_side_offset;
extern const Vec l_ship_offset;
extern const Vec l_ship_offset2;
extern const Vec l_ship_offset3;
extern const Vec l_ship_redge;
extern const Vec l_ship_ledge;
extern const Vec l_heel_pos;
extern const Vec l_toe_pos;
extern const Vec l_eye_offset;
extern const Vec l_head_center_offset;
extern const Vec l_neck_front;
extern const Vec l_neck_top;
extern const Vec l_land_smoke_offset;
extern const Vec l_ms_light_local_start;
extern const Vec l_ms_light_local_vec;
extern const Vec l_tact_top;
extern const Vec l_crawl_start_front_offset;
extern const Vec l_crawl_front_offset;
extern const Vec l_crawl_back_offset;
extern const Vec l_crawl_top_offset;
extern const Vec l_crawl_front_up_offset;
extern const Vec l_crawl_back_up_offset;
extern const Vec l_crawl_stand_up_offset;
extern const Vec l_crawl_top_up_offset;
extern const Vec l_crawl_side_offset;
extern const Vec l_crawl_lside_offset;
extern const Vec l_crawl_rside_offset;
extern const Vec l_crawl_lside_front_offset;
extern const Vec l_crawl_rside_front_offset;
extern const Vec l_crawl_min_side_offset;
static dCcD_SrcCyl l_cyl_src;
static dCcD_SrcCyl l_wind_cyl_src;
static dCcD_SrcCyl l_at_cyl_src;
static dCcD_SrcCps l_at_cps_src;
static dCcD_SrcCps l_fan_wind_cps_src;
static dCcD_SrcSph l_fan_wind_sph_src;
// I believe these won't link properly with the static variables
//extern dCcD_SrcCyl l_cyl_src;
extern dCcD_SrcCyl l_wind_cyl_src;
extern dCcD_SrcCyl l_at_cyl_src;
//extern dCcD_SrcCps l_at_cps_src;
extern dCcD_SrcCps l_fan_wind_cps_src;
extern dCcD_SrcSph l_fan_wind_sph_src;