diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-07-26 22:33:53 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-07-26 22:33:53 +0000 |
| commit | 9e4f25acd69489d949104eebec690ce5586849e6 (patch) | |
| tree | dc4fe4483ece1a374bc44280c72e43cfd5725feb /src/game.cpp | |
| parent | 34e18a818a7696629515c39b920ba35b64832748 (diff) | |
| download | mana-9e4f25acd69489d949104eebec690ce5586849e6.tar.gz mana-9e4f25acd69489d949104eebec690ce5586849e6.tar.bz2 mana-9e4f25acd69489d949104eebec690ce5586849e6.tar.xz mana-9e4f25acd69489d949104eebec690ce5586849e6.zip | |
OpenGL/SDL combined in the same exe. Not in the cutest way, but we'll find a
nicer approach after the release.
Diffstat (limited to 'src/game.cpp')
| -rw-r--r-- | src/game.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/game.cpp b/src/game.cpp index df5033be..98be0bc6 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -264,7 +264,7 @@ void do_input() // Get the state of the keyboard keys Uint8* keys; keys = SDL_GetKeyState(NULL); - + // Get the state of the joypad buttons // TODO: Only 6- buttons joypads are allowed bool joy[10]; @@ -619,7 +619,7 @@ void do_input() } } // End Mouse left button - + // Mouse button middle else if (event.button.button == SDL_BUTTON_MIDDLE) { @@ -628,7 +628,7 @@ void do_input() * right Usiu??? ;-) */ } - + // Mouse button right else if (event.button.button == SDL_BUTTON_RIGHT) { @@ -746,7 +746,7 @@ void do_input() player_node->direction = Direction; } } - + // Attacking monsters if (player_node->action == STAND) { @@ -763,12 +763,12 @@ void do_input() } } } - + if (joy[JOY_BTN1]) { unsigned short x = player_node->x; unsigned short y = player_node->y; int id = find_floor_item_by_cor(x, y); - + if (id != 0) { WFIFOW(0) = net_w_value(0x009f); @@ -1234,7 +1234,7 @@ void do_parse() logger->log("Warping to %s (%d, %d)", map_path, RFIFOW(18), RFIFOW(20)); strcpy(strrchr(map_path, '.') + 1, "tmx.gz"); - + Map *oldMap; oldMap = tiledMap; tiledMap = MapReader::readMap(map_path); @@ -1718,7 +1718,7 @@ void do_parse() break; case 0x0012: char_info->LUK = RFIFOB(5); - break; + break; } } break; |