git repos / blockattack-game

commit a35ab74b

sago007 · 2016-04-02 10:26
a35ab74b6bb526bf23e337ace3f79aae9f900ae0 patch · browse files
parent 168ce738ec5dbac8a103b80b7a3133bdf1730407 

Executed runastyle to format all files

Changed files

M source/code/MenuSystem.cpp before
M source/code/gamecontroller.cpp before
M source/code/main.cpp before
diff --git a/source/code/MenuSystem.cpp b/source/code/MenuSystem.cpp index c8a7ec7..9d364c1 100644 --- a/source/code/MenuSystem.cpp +++ b/source/code/MenuSystem.cpp
@@ -193,7 +193,7 @@ bool isUpEvent(const SDL_Event& event) {
}
if (event.type == SDL_CONTROLLERAXISMOTION && event.caxis.axis == SDL_CONTROLLER_AXIS_LEFTY ) {
checkDeadZone(event);
- const SDL_ControllerAxisEvent &a = event.caxis;
+ const SDL_ControllerAxisEvent& a = event.caxis;
if (getDeadZone(a.which, a.axis)) {
if (event.caxis.value < -deadZoneLimit) {
setDeadZone(a.which,a.axis,false);
@@ -217,7 +217,7 @@ bool isDownEvent(const SDL_Event& event) {
}
if (event.type == SDL_CONTROLLERAXISMOTION && event.caxis.axis == SDL_CONTROLLER_AXIS_LEFTY ) {
checkDeadZone(event);
- const SDL_ControllerAxisEvent &a = event.caxis;
+ const SDL_ControllerAxisEvent& a = event.caxis;
if (getDeadZone(a.which, a.axis)) {
if (event.caxis.value > deadZoneLimit) {
setDeadZone(a.which,a.axis,false);
@@ -241,7 +241,7 @@ bool isLeftEvent(const SDL_Event& event) {
}
if (event.type == SDL_CONTROLLERAXISMOTION && event.caxis.axis == SDL_CONTROLLER_AXIS_LEFTX ) {
checkDeadZone(event);
- const SDL_ControllerAxisEvent &a = event.caxis;
+ const SDL_ControllerAxisEvent& a = event.caxis;
if (getDeadZone(a.which, a.axis)) {
if (event.caxis.value < -deadZoneLimit) {
setDeadZone(a.which,a.axis,false);
@@ -265,7 +265,7 @@ bool isRightEvent(const SDL_Event& event) {
}
if (event.type == SDL_CONTROLLERAXISMOTION && event.caxis.axis == SDL_CONTROLLER_AXIS_LEFTX ) {
checkDeadZone(event);
- const SDL_ControllerAxisEvent &a = event.caxis;
+ const SDL_ControllerAxisEvent& a = event.caxis;
if (getDeadZone(a.which, a.axis)) {
if (event.caxis.value > deadZoneLimit) {
setDeadZone(a.which,a.axis,false);
diff --git a/source/code/gamecontroller.cpp b/source/code/gamecontroller.cpp index 40b89e1..036edf3 100644 --- a/source/code/gamecontroller.cpp +++ b/source/code/gamecontroller.cpp
@@ -40,7 +40,7 @@ void GameControllerSetVerbose(bool value) {
verbose = value;
}
-static const char* GameControllerGetName(SDL_GameController *gamecontroller) {
+static const char* GameControllerGetName(SDL_GameController* gamecontroller) {
const char* result = SDL_GameControllerName(gamecontroller);
if (!result) {
result = "Unnamed";
@@ -97,7 +97,7 @@ bool isPlayerDownEvent(int playerNumber, const SDL_Event& event) {
}
if (event.type == SDL_CONTROLLERAXISMOTION && event.caxis.axis == SDL_CONTROLLER_AXIS_LEFTY ) {
checkDeadZone(event);
- const SDL_ControllerAxisEvent &a = event.caxis;
+ const SDL_ControllerAxisEvent& a = event.caxis;
if (getDeadZone(a.which, a.axis)) {
if (event.caxis.value > deadZoneLimit) {
setDeadZone(a.which,a.axis,false);
@@ -119,7 +119,7 @@ bool isPlayerUpEvent(int playerNumber, const SDL_Event& event) {
}
if (event.type == SDL_CONTROLLERAXISMOTION && event.caxis.axis == SDL_CONTROLLER_AXIS_LEFTY ) {
checkDeadZone(event);
- const SDL_ControllerAxisEvent &a = event.caxis;
+ const SDL_ControllerAxisEvent& a = event.caxis;
if (getDeadZone(a.which, a.axis)) {
if (event.caxis.value < -deadZoneLimit) {
setDeadZone(a.which,a.axis,false);
@@ -141,7 +141,7 @@ bool isPlayerLeftEvent(int playerNumber, const SDL_Event& event) {
}
if (event.type == SDL_CONTROLLERAXISMOTION && event.caxis.axis == SDL_CONTROLLER_AXIS_LEFTX ) {
checkDeadZone(event);
- const SDL_ControllerAxisEvent &a = event.caxis;
+ const SDL_ControllerAxisEvent& a = event.caxis;
if (getDeadZone(a.which, a.axis)) {
if (event.caxis.value < -deadZoneLimit) {
setDeadZone(a.which,a.axis,false);
@@ -163,7 +163,7 @@ bool isPlayerRightEvent(int playerNumber, const SDL_Event& event) {
}
if (event.type == SDL_CONTROLLERAXISMOTION && event.caxis.axis == SDL_CONTROLLER_AXIS_LEFTX ) {
checkDeadZone(event);
- const SDL_ControllerAxisEvent &a = event.caxis;
+ const SDL_ControllerAxisEvent& a = event.caxis;
if (getDeadZone(a.which, a.axis)) {
if (event.caxis.value > deadZoneLimit) {
setDeadZone(a.which,a.axis,false);
diff --git a/source/code/main.cpp b/source/code/main.cpp index 2c9d4a0..9fb4dbc 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp
@@ -1525,7 +1525,7 @@ int main(int argc, char* argv[]) {
}
if (vm.count("help")) {
cout << SPrintStringF("Block Attack - Rise of the blocks %s\n\n"
- "Block Attack - Rise of the Blocks is a puzzle/blockfall game inspired by Tetris Attack for the SNES.\n\n"
+ "Block Attack - Rise of the Blocks is a puzzle/blockfall game inspired by Tetris Attack for the SNES.\n\n"
"%s\n\n", VERSION_NUMBER, "www.blockattack.net");
cout << "Usage: "<< commandname << " [OPTION]..." << endl;
cout << desc << endl;