Moved large control_info arrays to end - patch by Kp
This commit is contained in:
parent
07f3bac4cd
commit
7549ee8c51
|
@ -10,7 +10,8 @@ main/multi.h, main/net_udp.c: Moved multi_* declarations to multi.h - patch by K
|
|||
maths/rand.c: Included maths.h in rand.c to get d_rand prototype - patch by Kp
|
||||
arch/include/joy.h, arch/sdl/event.c, arch/sdl/joy.c: Moved joy_*_handler declarations to joy.h - patch by Kp
|
||||
editor/group.c, editor/medwall.c, editor/segment.c, main/gameseg.h, main/wall.h: Declared wall_close_door_num in wall.h; Declared validate_segment_side in gameseg.h - patches by Kp
|
||||
include/3d.h, main/gameseq.h, main/weapon.h: Removed redundant/obsolete declarations - patch by Kp
|
||||
include/3d.h, main/gameseq.h: Removed redundant/obsolete declarations - patch by Kp
|
||||
main/kconfig.h: Moved large control_info arrays to end - patch by Kp
|
||||
|
||||
20121102
|
||||
--------
|
||||
|
|
|
@ -29,7 +29,6 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|||
#include "mouse.h"
|
||||
|
||||
typedef struct _control_info {
|
||||
fix joy_axis[JOY_MAX_AXES], raw_joy_axis[JOY_MAX_AXES], mouse_axis[3], raw_mouse_axis[3];
|
||||
float key_pitch_forward_down_time, key_pitch_backward_down_time, key_heading_left_down_time, key_heading_right_down_time, key_slide_left_down_time, key_slide_right_down_time, key_slide_up_down_time, key_slide_down_down_time, key_bank_left_down_time, key_bank_right_down_time; // to scale movement depending on how long the key is pressed
|
||||
fix pitch_time, vertical_thrust_time, heading_time, sideways_thrust_time, bank_time, forward_thrust_time;
|
||||
ubyte key_pitch_forward_state, key_pitch_backward_state, key_heading_left_state, key_heading_right_state, key_slide_left_state, key_slide_right_state, key_slide_up_state, key_slide_down_state, key_bank_left_state, key_bank_right_state; // to scale movement for keys only we need them to be seperate from joystick/mouse buttons
|
||||
|
@ -40,6 +39,7 @@ typedef struct _control_info {
|
|||
ubyte fire_primary_state, fire_primary_count, fire_secondary_state, fire_secondary_count, fire_flare_count, drop_bomb_count;
|
||||
ubyte automap_state, automap_count;
|
||||
ubyte cycle_primary_count, cycle_secondary_count, select_weapon_count;
|
||||
fix joy_axis[JOY_MAX_AXES], raw_joy_axis[JOY_MAX_AXES], mouse_axis[3], raw_mouse_axis[3];
|
||||
} control_info;
|
||||
|
||||
#define CONTROL_USING_JOYSTICK 1
|
||||
|
|
Loading…
Reference in a new issue