Comment out redundant calls to event_poll, fixing rapid bomb dropping bug (and probably others)
This commit is contained in:
parent
8f324ded75
commit
f1fb7c4ac0
|
@ -4,6 +4,7 @@ D2X-Rebirth Changelog
|
|||
--------
|
||||
main/menu.c: Properly specify number of items for do_options_menu, so the options menu actually shows
|
||||
arch/include/event.h, main/newmenu.h: Merge d_event and newmenu_event enum's, hopefully fixing compiler warnings in GCC 4.5.0
|
||||
arch/sdl/joy.c, arch/sdl/key.c, arch/sdl/mouse.c: Comment out redundant calls to event_poll, fixing rapid bomb dropping bug (and probably others)
|
||||
|
||||
20100405
|
||||
--------
|
||||
|
|
|
@ -230,7 +230,7 @@ int joy_get_button_down_cnt( int btn )
|
|||
if (!num_joysticks)
|
||||
return 0;
|
||||
|
||||
event_poll();
|
||||
// event_poll();
|
||||
|
||||
num_downs = Joystick.buttons[btn].num_downs;
|
||||
Joystick.buttons[btn].num_downs = 0;
|
||||
|
@ -245,7 +245,7 @@ fix joy_get_button_down_time(int btn)
|
|||
if (!num_joysticks)
|
||||
return 0;
|
||||
|
||||
event_poll();
|
||||
// event_poll();
|
||||
|
||||
switch (Joystick.buttons[btn].state) {
|
||||
case SDL_PRESSED:
|
||||
|
@ -267,7 +267,7 @@ void joystick_read_raw_axis( int * axis )
|
|||
if (!num_joysticks)
|
||||
return;
|
||||
|
||||
event_poll();
|
||||
// event_poll();
|
||||
|
||||
for (i = 0; i < Joystick.n_axes; i++)
|
||||
axis[i] = Joystick.axes[i].value;
|
||||
|
@ -296,7 +296,7 @@ int joy_get_button_state( int btn )
|
|||
if(btn >= Joystick.n_buttons)
|
||||
return 0;
|
||||
|
||||
event_poll();
|
||||
// event_poll();
|
||||
|
||||
return Joystick.buttons[btn].state;
|
||||
}
|
||||
|
|
|
@ -510,7 +510,7 @@ int add_one(int n)
|
|||
int key_checkch()
|
||||
{
|
||||
int is_one_waiting = 0;
|
||||
event_poll();
|
||||
// event_poll();
|
||||
if (key_data.keytail!=key_data.keyhead)
|
||||
is_one_waiting = 1;
|
||||
return is_one_waiting;
|
||||
|
@ -521,7 +521,7 @@ int key_inkey()
|
|||
int key = 0;
|
||||
if (!Installed)
|
||||
key_init();
|
||||
event_poll();
|
||||
// event_poll();
|
||||
if (key_data.keytail!=key_data.keyhead) {
|
||||
key = key_data.keybuffer[key_data.keyhead];
|
||||
key_data.keyhead = add_one(key_data.keyhead);
|
||||
|
@ -536,7 +536,7 @@ int key_inkey_time(fix * time)
|
|||
|
||||
if (!Installed)
|
||||
key_init();
|
||||
event_poll();
|
||||
// event_poll();
|
||||
if (key_data.keytail!=key_data.keyhead) {
|
||||
key = key_data.keybuffer[key_data.keyhead];
|
||||
*time = key_data.time_pressed[key_data.keyhead];
|
||||
|
@ -548,7 +548,7 @@ int key_inkey_time(fix * time)
|
|||
int key_peekkey()
|
||||
{
|
||||
int key = 0;
|
||||
event_poll();
|
||||
// event_poll();
|
||||
if (key_data.keytail!=key_data.keyhead)
|
||||
key = key_data.keybuffer[key_data.keyhead];
|
||||
|
||||
|
@ -594,7 +594,7 @@ fix key_down_time(int scancode)
|
|||
{
|
||||
fix time_down, time;
|
||||
|
||||
event_poll();
|
||||
// event_poll();
|
||||
if ((scancode<0)|| (scancode>255)) return 0;
|
||||
|
||||
if (!keyd_pressed[scancode]) {
|
||||
|
@ -612,7 +612,7 @@ fix key_down_time(int scancode)
|
|||
unsigned int key_down_count(int scancode)
|
||||
{
|
||||
int n;
|
||||
event_poll();
|
||||
// event_poll();
|
||||
if ((scancode<0)|| (scancode>255)) return 0;
|
||||
|
||||
n = key_data.keys[scancode].downcount;
|
||||
|
@ -624,7 +624,7 @@ unsigned int key_down_count(int scancode)
|
|||
unsigned int key_up_count(int scancode)
|
||||
{
|
||||
int n;
|
||||
event_poll();
|
||||
// event_poll();
|
||||
if ((scancode<0)|| (scancode>255)) return 0;
|
||||
|
||||
n = key_data.keys[scancode].upcount;
|
||||
|
|
|
@ -107,7 +107,7 @@ void mouse_flush() // clears all mice events...
|
|||
int i;
|
||||
fix current_time;
|
||||
|
||||
event_poll();
|
||||
// event_poll();
|
||||
|
||||
current_time = timer_get_fixed_seconds();
|
||||
for (i=0; i<MOUSE_MAX_BUTTONS; i++) {
|
||||
|
@ -171,7 +171,7 @@ int mouse_get_btns()
|
|||
uint flag=1;
|
||||
int status = 0;
|
||||
|
||||
event_poll();
|
||||
// event_poll();
|
||||
|
||||
for (i=0; i<MOUSE_MAX_BUTTONS; i++ ) {
|
||||
if (Mouse.buttons[i].pressed)
|
||||
|
@ -187,7 +187,7 @@ fix mouse_button_down_time(int button)
|
|||
{
|
||||
fix time_down, time;
|
||||
|
||||
event_poll();
|
||||
// event_poll();
|
||||
|
||||
if (!Mouse.buttons[button].pressed) {
|
||||
time_down = Mouse.buttons[button].time_held_down;
|
||||
|
@ -205,7 +205,7 @@ int mouse_button_down_count(int button)
|
|||
{
|
||||
int count;
|
||||
|
||||
event_poll();
|
||||
// event_poll();
|
||||
|
||||
count = Mouse.buttons[button].num_downs;
|
||||
Mouse.buttons[button].num_downs = 0;
|
||||
|
@ -216,6 +216,6 @@ int mouse_button_down_count(int button)
|
|||
// Returns 1 if this button is currently down
|
||||
int mouse_button_state(int button)
|
||||
{
|
||||
event_poll();
|
||||
// event_poll();
|
||||
return Mouse.buttons[button].pressed;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue