summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/game.cpp b/src/game.cpp
index c3157aab..b089b234 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -166,7 +166,6 @@ void do_input()
while (SDL_PollEvent(&event))
{
bool used = false;
-
// For discontinuous keys
if (event.type == SDL_KEYDOWN)
{
@@ -347,13 +346,12 @@ void do_input()
}
}
- }
- }
-
- // Push input to GUI when not used
- if (!used) {
- guiInput->pushInput(event);
- }
+ }
+ }
+ // Push input to GUI when not used
+ if (!used) {
+ guiInput->pushInput(event);
+ }
} // End while
@@ -1044,8 +1042,6 @@ void do_parse() {
floorItem->id = net_w_value(RFIFOW(6));
floorItem->x = net_w_value(RFIFOW(9));
floorItem->y = net_w_value(RFIFOW(11));
- floorItem->subx = net_b_value(RFIFOB(15));
- floorItem->suby = net_b_value(RFIFOB(16));
floorItem->int_id = net_l_value(RFIFOL(2));
add_floor_item(floorItem);
break;
@@ -1055,8 +1051,6 @@ void do_parse() {
floorItem->id = net_w_value(RFIFOW(6));
floorItem->x = net_w_value(RFIFOW(9));
floorItem->y = net_w_value(RFIFOW(11));
- floorItem->subx = net_b_value(RFIFOB(13));
- floorItem->suby = net_b_value(RFIFOB(14));
floorItem->int_id = net_l_value(RFIFOL(2));
add_floor_item(floorItem);
break;