From 5352131e01b387f736b61c709152a9cd43f9cdfd Mon Sep 17 00:00:00 2001 From: Jan Philipp Timme Date: Tue, 16 Dec 2014 12:34:48 +0100 Subject: [PATCH] Remove a superfluos "second" from method names. --- src/de/teamteamteam/spacescooter/brain/PlayerSession.java | 4 ++-- src/de/teamteamteam/spacescooter/entity/Player.java | 4 ++-- src/de/teamteamteam/spacescooter/entity/item/Item.java | 2 +- .../spacescooter/gui/SecondaryWeaponAmount.java | 2 +- src/de/teamteamteam/spacescooter/screen/ShopScreen.java | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/de/teamteamteam/spacescooter/brain/PlayerSession.java b/src/de/teamteamteam/spacescooter/brain/PlayerSession.java index 56d9787..373bbaf 100644 --- a/src/de/teamteamteam/spacescooter/brain/PlayerSession.java +++ b/src/de/teamteamteam/spacescooter/brain/PlayerSession.java @@ -231,14 +231,14 @@ public class PlayerSession { /** * Get the secondary weapon. */ - public static int getSecondsecondaryWeapon(){ + public static int getSecondaryWeapon(){ return PlayerSession.secondaryWeapon; } /** * Set the secondary weapon. */ - public static void setSecondsecondaryWeapon(int secondaryWeapon){ + public static void setSecondaryWeapon(int secondaryWeapon){ PlayerSession.secondaryWeapon = secondaryWeapon; } diff --git a/src/de/teamteamteam/spacescooter/entity/Player.java b/src/de/teamteamteam/spacescooter/entity/Player.java index 65972c4..f948047 100644 --- a/src/de/teamteamteam/spacescooter/entity/Player.java +++ b/src/de/teamteamteam/spacescooter/entity/Player.java @@ -108,9 +108,9 @@ public class Player extends ShootingEntity implements KeyboardListener { } if(Keyboard.isKeyDown(KeyEvent.VK_Y)) { if(this.secondaryWeaponAmount > 0){ - if(PlayerSession.getSecondsecondaryWeapon() == 1) { + if(PlayerSession.getSecondaryWeapon() == 1) { this.shootRocket(); - }else if(PlayerSession.getSecondsecondaryWeapon() == 2) { + }else if(PlayerSession.getSecondaryWeapon() == 2) { this.shootBeam(); } } diff --git a/src/de/teamteamteam/spacescooter/entity/item/Item.java b/src/de/teamteamteam/spacescooter/entity/item/Item.java index 88508da..ef8bd76 100644 --- a/src/de/teamteamteam/spacescooter/entity/item/Item.java +++ b/src/de/teamteamteam/spacescooter/entity/item/Item.java @@ -92,7 +92,7 @@ public abstract class Item extends CollidableEntity { new ItemShield(x, y); break; case 4: - if(PlayerSession.getSecondsecondaryWeapon() == 1){ + if(PlayerSession.getSecondaryWeapon() == 1){ new ItemRocket(x, y); }else{ new ItemBeam(x, y); diff --git a/src/de/teamteamteam/spacescooter/gui/SecondaryWeaponAmount.java b/src/de/teamteamteam/spacescooter/gui/SecondaryWeaponAmount.java index 3e175a8..f9da425 100644 --- a/src/de/teamteamteam/spacescooter/gui/SecondaryWeaponAmount.java +++ b/src/de/teamteamteam/spacescooter/gui/SecondaryWeaponAmount.java @@ -15,7 +15,7 @@ public class SecondaryWeaponAmount extends Entity{ */ public SecondaryWeaponAmount(int x, int y) { super(x, y); - if(PlayerSession.getSecondsecondaryWeapon() == 1){ + if(PlayerSession.getSecondaryWeapon() == 1){ new ImageEntity(this.getX(), this.getY(), "images/shots/rocket.png"); }else{ new ImageEntity(this.getX(), this.getY(), "images/shots/beamamount.png"); diff --git a/src/de/teamteamteam/spacescooter/screen/ShopScreen.java b/src/de/teamteamteam/spacescooter/screen/ShopScreen.java index 6118da2..491902a 100644 --- a/src/de/teamteamteam/spacescooter/screen/ShopScreen.java +++ b/src/de/teamteamteam/spacescooter/screen/ShopScreen.java @@ -35,7 +35,7 @@ public class ShopScreen extends Screen { life = new ShopOffer(100, 300, 15, PlayerSession.getBaseHealthUpgradesBought(), "Leben 10C"); new ImageEntity(GameConfig.windowWidth / 2 - 120, 365, "images/shop/shoprocket.png"); new ImageEntity(GameConfig.windowWidth / 2 + 30, 365, "images/shop/shopbeam.png"); - if(PlayerSession.getSecondsecondaryWeapon() == 1){ + if(PlayerSession.getSecondaryWeapon() == 1){ select = new ImageEntity(GameConfig.windowWidth / 2 - 130, 355, "images/shop/select.png"); }else{ select = new ImageEntity(GameConfig.windowWidth / 2 + 20, 355, "images/shop/select.png"); @@ -118,12 +118,12 @@ public class ShopScreen extends Screen { } break; case 3: - if(PlayerSession.getSecondsecondaryWeapon() == 1){ + if(PlayerSession.getSecondaryWeapon() == 1){ select.setPosition(GameConfig.windowWidth / 2 + 20, 355); - PlayerSession.setSecondsecondaryWeapon(2); + PlayerSession.setSecondaryWeapon(2); }else{ select.setPosition(GameConfig.windowWidth / 2 - 130, 355); - PlayerSession.setSecondsecondaryWeapon(1); + PlayerSession.setSecondaryWeapon(1); } break; case 4: