konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleaned up formatting:

Browse Source 
- removed trailing whitespace
- changed all leading whitespace to tabs
- removed IDE created author comments
This commit is contained in:
Evan Debenham
2015-06-12 16:22:26 -04:00
parent baa83b7e43
commit cebdff0221
335 changed files with 8555 additions and 8714 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/shatteredpixel/shatteredpixeldungeon/actors/Actor.java
+22 -22
View File
@@ -83,7 +83,7 @@ public abstract class Actor implements Bundlable {
id = bundle.getInt( ID );
}
private static int nextID = 1;
private static int nextID = 1;
public int id() {
if (id > 0) {
return id;
@@ -144,25 +144,25 @@ public abstract class Actor implements Bundlable {
current = null;
}
private static final String NEXTID = "nextid";
private static final String NEXTID = "nextid";
public static void storeNextID( Bundle bundle){
bundle.put( NEXTID, nextID );
}
public static void storeNextID( Bundle bundle){
bundle.put( NEXTID, nextID );
}
public static void restoreNextID( Bundle bundle){
nextID = bundle.getInt( NEXTID );
}
public static void restoreNextID( Bundle bundle){
nextID = bundle.getInt( NEXTID );
}
public static void resetNextID(){
nextID = 1;
}
public static void resetNextID(){
nextID = 1;
}
/*protected*/public void next() {
if (current == this) {
current = null;
}
}
/*protected*/public void next() {
if (current == this) {
current = null;
}
}
public static void process() {
@@ -190,12 +190,12 @@ public abstract class Actor implements Bundlable {
if (current != null) {
if (current instanceof Char && ((Char)current).sprite.isMoving) {
// If it's character's turn to act, but its sprite
// is moving, wait till the movement is over
current = null;
break;
}
if (current instanceof Char && ((Char)current).sprite.isMoving) {
// If it's character's turn to act, but its sprite
// is moving, wait till the movement is over
current = null;
break;
}
doNext = current.act();
if (doNext && !Dungeon.hero.isAlive()) {