WebSVN – Games.Carmageddon – Diff – /src/DETHRACE/dr_types.h

 #define DR_TYPES_H
+#include "brender/br_types.h"
 #include "constants.h"
 #include "macros.h"
-#include "brender.h"
 #include "s3/s3.h"
 #include <assert.h>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
     br_vector3 row1;
     br_vector3 row2;
     br_vector3 translation;
 } tReduced_matrix;
-typedef struct tCar_controls { // size: 0x4
+typedef struct tCar_controls {
     int joystick_acc : 8;
     int joystick_dec : 8;
     unsigned int left : 1;        // 0x10000   bit 17
     unsigned int right : 1;       // 0x20000   bit 18
     unsigned int acc : 1;         // 0x40000   bit 19
     unsigned int change_up : 1;   // 0x2000000   bit 26
     unsigned int change_down : 1; // 0x4000000   bit 27
     unsigned int horn : 1;        // 0x8000000   bit 28
 } tCar_controls;
-typedef struct tNet_message_mechanics_info { // size: 0x84
+typedef struct tNet_message_mechanics_info {
-    tU8 contents_size;                       // @0x0
+    tU8 contents_size;
-    tNet_message_type type;                  // @0x1
+    tNet_message_type type;
-    tU32 ID;                                 // @0x4
+    tU32 ID;
-    tU32 time;                               // @0x8
+    tU32 time;
-    tReduced_matrix mat;                     // @0xc
+    tReduced_matrix mat;
-    br_vector3 v;                            // @0x30
+    br_vector3 v;
-    br_vector3 omega;                        // @0x3c
+    br_vector3 omega;
-    tU8 d[4];                                // @0x48
+    tU8 d[4];
-    tCar_controls keys;                      // @0x4c
+    tCar_controls keys;
-    tU32 cc_coll_time;                       // @0x50
+    tU32 cc_coll_time;
-    tS16 curvature;                          // @0x54
+    tS16 curvature;
-    tU16 revs;                               // @0x56
+    tU16 revs;
-    br_scalar front;                         // @0x58
+    br_scalar front;
-    br_scalar back;                          // @0x5c
+    br_scalar back;
-    tU32 repair_time;                        // @0x60
+    tU32 repair_time;
-    tU8 damage[12];                          // @0x64
+    tU8 damage[12];
-    tU16 powerups;                           // @0x70
+    tU16 powerups;
-    br_scalar wheel_dam_offset[4];           // @0x74
+    br_scalar wheel_dam_offset[4];
 } tNet_message_mechanics_info;
 typedef struct tDamage_unit {
     int x_coord;
     int y_coord;
 typedef struct tComplete_race_data {
     tU8 finished_calcing_race_route;
     tU8 found_race_section;
 } tComplete_race_data;
 typedef struct tReturn_to_start_data {
     br_vector3 nearest_path_point;
     tS16 section_no;
     tU8 waiting_near_start;
 } tReturn_to_start_data;
     br_vector3 normal;
     int flags;
     br_scalar d;
 } tFace_ref;
-#pragma pack(push, 4)
 typedef struct tNet_game_player_info { // size: 0xc0
     tPD_net_player_info pd_net_info;   // @0x0
     tU32 this_players_time_stamp;      // @0x10
     tU32 last_heard_from_him;          // @0x14
     tU32 reposition_time;              // @0x18
     int games_score;                   // @0x84
     int last_score_index;              // @0x88
     br_matrix34 initial_position;      // @0x8c
     tCar_spec* car;                    // @0xbc
 } tNet_game_player_info;
-#pragma pack(pop)
 typedef struct tNet_game_options {         // size: 0x30
     int show_players_on_map;               // @0x0
     int show_peds_on_map;                  // @0x4
     int enable_text_messages;              // @0x8
     int number_of_players;
     int this_index;
     int batch_number;
     tNet_game_player_info player;
 } tNet_message_new_player_list;
 typedef struct tNet_message_race_over {
     tU8 contents_size;
     tNet_message_type type;
     tRace_over_reason reason;
 } tNet_message_race_over;
     int phys_width;
     int phys_height;
     void* base_addr;
 } tGraf_spec;
-typedef struct tCollision_info {          // size: 0x33c
+typedef struct tCollision_info {
-    int index;                            // @0x0
+    int index;
-    int disabled;                         // @0x4
+    int disabled;
-    tDriver driver;                       // @0x8
+    tDriver driver;
-    br_actor* car_master_actor;           // @0xc
+    br_actor* car_master_actor;
-    br_scalar min_torque_squared;         // @0x10
+    br_scalar min_torque_squared;
-    br_scalar break_off_radians_squared;  // @0x14
+    br_scalar break_off_radians_squared;
-    br_vector3 v;                         // @0x18
+    br_vector3 v;
-    br_vector3 old_v;                     // @0x24
+    br_vector3 old_v;
-    br_vector3 velocity_car_space;        // @0x30
+    br_vector3 velocity_car_space;
-    br_matrix34 oldmat;                   // @0x3c
+    br_matrix34 oldmat;
-    br_matrix34 old_frame_mat;            // @0x6c
+    br_matrix34 old_frame_mat;
-    br_vector3 pos;                       // @0x9c
+    br_vector3 pos;
-    br_vector3 omega;                     // @0xa8
+    br_vector3 omega;
-    br_vector3 oldomega;                  // @0xb4
+    br_vector3 oldomega;
-    br_scalar M;                          // @0xc0
+    br_scalar M;
-    int infinite_mass;                    // @0xc4
+    int infinite_mass;
-    br_vector3 I;                         // @0xc8
+    br_vector3 I;
-    br_vector3 cmpos;                     // @0xd4
+    br_vector3 cmpos;
-    int extra_point_num;                  // @0xe0
+    int extra_point_num;
-    br_bounds bounds[3];                  // @0xe4
+    br_bounds bounds[3];
-    br_bounds max_bounds[2];              // @0x12c
+    br_bounds max_bounds[2];
-    br_vector3 extra_points[6];           // @0x15c
+    br_vector3 extra_points[6];
-    br_scalar original_extra_points_z[6]; // @0x1a4
+    br_scalar original_extra_points_z[6];
-    br_vector3 old_point;                 // @0x1bc
+    br_vector3 old_point;
-    br_vector3 old_norm;                  // @0x1c8
+    br_vector3 old_norm;
-    int box_face_start;                   // @0x1d4
+    int box_face_start;
-    int box_face_end;                     // @0x1d8
+    int box_face_end;
-    int box_face_ref;                     // @0x1dc
+    int box_face_ref;
-    br_matrix34 last_box_inv_mat;         // @0x1e0
+    br_matrix34 last_box_inv_mat;
-    br_bounds last_box;                   // @0x210
+    br_bounds last_box;
-    int doing_nothing_flag;               // @0x228
+    int doing_nothing_flag;
-    tSpecial_volume* last_special_volume; // @0x22c
+    tSpecial_volume* last_special_volume;
-    tSpecial_volume* auto_special_volume; // @0x230
+    tSpecial_volume* auto_special_volume;
-    int frame_collision_flag;             // @0x234
+    int frame_collision_flag;
-    int collision_flag;                   // @0x238
+    int collision_flag;
-    int max_shrapnel_material;            // @0x23c
+    int max_shrapnel_material;
-    br_vector3 direction;                 // @0x240
+    br_vector3 direction;
-    float speed;                          // @0x24c
+    float speed;
-    tU16 car_ID;                          // @0x250
+    tU16 car_ID;
-    br_material* shrapnel_material[3];    // @0x254
+    br_material* shrapnel_material[3];
-    br_bounds bounds_world_space;         // @0x260
+    br_bounds bounds_world_space;
-    tBounds_type bounds_ws_type;          // @0x278
+    tBounds_type bounds_ws_type;
-    tU16 fire_vertex[12];                 // @0x27c
+    tU16 fire_vertex[12];
-    tU16 num_smoke_columns;               // @0x294
+    tU16 num_smoke_columns;
-    br_vector3 water_normal;              // @0x298
+    br_vector3 water_normal;
-    br_scalar water_d;                    // @0x2a4
+    br_scalar water_d;
-    br_scalar water_depth_factor;         // @0x2a8
+    br_scalar water_depth_factor;
-    tNet_message_mechanics_info message;  // @0x2ac
+    tNet_message_mechanics_info message;
-    tU32 last_car_car_collision;          // @0x330
+    tU32 last_car_car_collision;
-    br_scalar dt;                         // @0x334
+    br_scalar dt;
-    tCar_spec* who_last_hit_me;           // @0x338
+    tCar_spec* who_last_hit_me;
 } tCollision_info;
-typedef struct tNon_car_spec {      // size: 0x370
+typedef struct tNon_car_spec {
-    tCollision_info collision_info; // @0x0
+    tCollision_info collision_info;
-    br_scalar free_mass;            // @0x33c
+    br_scalar free_mass;
-    br_scalar attached_mass;        // @0x340
+    br_scalar attached_mass;
-    br_vector3 free_cmpos;          // @0x344
+    br_vector3 free_cmpos;
-    br_vector3 attached_cmpos;      // @0x350
+    br_vector3 attached_cmpos;
-    br_scalar min_torque_squared;   // @0x35c
+    br_scalar min_torque_squared;
-    br_scalar snap_off_cosine;      // @0x360
+    br_scalar snap_off_cosine;
-    br_vector3 I_over_M;            // @0x364
+    br_vector3 I_over_M;
 } tNon_car_spec;
-typedef struct tOpp_spec { // size: 0x10
+typedef struct tOpp_spec {
-    int index;             // @0x0
+    int index;
-    int ranking;           // @0x4
+    int ranking;
-    int net_player_index;  // @0x8
+    int net_player_index;
-    tCar_spec* car_spec;   // @0xc
+    tCar_spec* car_spec;
 } tOpp_spec;
 typedef struct tCheckpoint {
     int time_value[3];
     int quad_count;

Subversion Repositories Games.Carmageddon

Games.Carmageddon/src/DETHRACE/dr_types.h – Rev 18 → 20