summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-02-23 18:17:57 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2016-02-23 18:17:57 +0100
commit912ff43e9f59946fa304e0220070e04079bf2414 (patch)
treea7d9440ee0dab906ef58d324bcfaa2511cb823eb /core/src/ch/asynk/rustanddust
parent18db2f47e4808eda33f24e1a8571f62344524f71 (diff)
downloadRustAndDust-912ff43e9f59946fa304e0220070e04079bf2414.zip
RustAndDust-912ff43e9f59946fa304e0220070e04079bf2414.tar.gz
DB.NO_RECORDS -> DB.NO_RECORD
Diffstat (limited to 'core/src/ch/asynk/rustanddust')
-rw-r--r--core/src/ch/asynk/rustanddust/game/ctrl/Solo.java2
-rw-r--r--core/src/ch/asynk/rustanddust/menu/PlayMenu.java2
-rw-r--r--core/src/ch/asynk/rustanddust/util/DB.java6
3 files changed, 5 insertions, 5 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java b/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java
index bcafe29..cb90db5 100644
--- a/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java
+++ b/core/src/ch/asynk/rustanddust/game/ctrl/Solo.java
@@ -17,7 +17,7 @@ public class Solo extends Ctrl
public void init()
{
gameId = game.config.gameId;
- if (gameId == game.db.NO_RECORDS) {
+ if (gameId == game.db.NO_RECORD) {
int me = game.backend.getMyId();
int other = game.backend.getOpponentId();
gameId = game.db.storeGameGetId(me, other, battle.getId(), game.config.gameMode.i);
diff --git a/core/src/ch/asynk/rustanddust/menu/PlayMenu.java b/core/src/ch/asynk/rustanddust/menu/PlayMenu.java
index c442cd6..cad12dd 100644
--- a/core/src/ch/asynk/rustanddust/menu/PlayMenu.java
+++ b/core/src/ch/asynk/rustanddust/menu/PlayMenu.java
@@ -62,7 +62,7 @@ public class PlayMenu extends Patch implements MenuCtrl.Panel
public MenuCtrl.MenuType prepare()
{
game.db.loadGames();
- game.config.gameId = game.db.NO_RECORDS;
+ game.config.gameId = game.db.NO_RECORD;
if (GameRecord.list.size() <= 0)
return MenuCtrl.MenuType.NEW_GAME;
diff --git a/core/src/ch/asynk/rustanddust/util/DB.java b/core/src/ch/asynk/rustanddust/util/DB.java
index a55b682..cef1e52 100644
--- a/core/src/ch/asynk/rustanddust/util/DB.java
+++ b/core/src/ch/asynk/rustanddust/util/DB.java
@@ -17,7 +17,7 @@ public class DB
{
private static final int DB_SCHEMA_VERSION = 1;
- public static final int NO_RECORDS = -1;
+ public static final int NO_RECORD = -1;
private static final String DIGEST = "SHA-256";
private static final SimpleDateFormat df = new SimpleDateFormat("yyyy-mm-dd HH:mm:ss");
@@ -160,7 +160,7 @@ public class DB
public int getPlayerId(boolean hash, String s)
{
- int ret = NO_RECORDS;
+ int ret = NO_RECORD;
String sql = (hash ? GET_PLAYER_ID_FROM_HASH : GET_PLAYER_ID_FROM_GMAIL);
try {
DatabaseCursor cursor = query(String.format(sql, s));
@@ -194,7 +194,7 @@ public class DB
public int getGameId(int you, int opponent, int battle, int mode)
{
- int ret = NO_RECORDS;
+ int ret = NO_RECORD;
try {
DatabaseCursor cursor = query(String.format(GET_GAME_ID, you, opponent, battle, mode));
if (cursor.getCount() > 0) {