fixed warning from javac and added rule to build using only javac
parent
467c2d573c
commit
6ea717f608
10
Makefile
10
Makefile
|
@ -1,4 +1,6 @@
|
|||
DSC=java -ea -cp $^ magic.DeckStrCal
|
||||
BUILD=build
|
||||
JOPTS=-Xlint:all -d $(BUILD) -cp $(BUILD):.
|
||||
SRC=$(shell find -iname *.java)
|
||||
#MAG:=release/Magarena-$(shell hg id -n).jar
|
||||
MAG:=release/Magarena.jar
|
||||
|
@ -13,6 +15,11 @@ exe: $(EXE)
|
|||
$(MAG): $(SRC)
|
||||
ant
|
||||
|
||||
$(BUILD)/javac.last: $(SRC)
|
||||
-mkdir $(BUILD)
|
||||
javac $(JOPTS) $?
|
||||
touch $@
|
||||
|
||||
tags: $(SRC)
|
||||
ctags -R .
|
||||
|
||||
|
@ -20,7 +27,8 @@ $(EXE): $(MAG)
|
|||
cd launch4j; ./launch4j ../release/magarena.xml
|
||||
|
||||
clean:
|
||||
ant clean
|
||||
-ant clean
|
||||
-rm $(BUILD)/javac.last
|
||||
|
||||
test: $(MAG)
|
||||
$(DSC) \
|
||||
|
|
|
@ -2068,7 +2068,7 @@ public class CardEventDefinitions {
|
|||
@Override
|
||||
public MagicEvent getEvent(final MagicCardOnStack cardOnStack,final MagicPayedCost payedCost) {
|
||||
|
||||
final MagicPlayer player=(MagicPlayer)cardOnStack.getController();
|
||||
final MagicPlayer player=cardOnStack.getController();
|
||||
return new MagicEvent(cardOnStack.getCard(),player,MagicTargetChoice.NEG_TARGET_NONBLACK_CREATURE,
|
||||
new MagicDestroyTargetPicker(false),new Object[]{cardOnStack,player},this,
|
||||
"Destroy target nonblack creature$. Put two 0/1 colorless Eldrazi Spawn creature tokens onto the battlefield. "+
|
||||
|
@ -3413,4 +3413,4 @@ public class CardEventDefinitions {
|
|||
card.setCardEvent(cardEvent);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3372,7 +3372,7 @@ public class TriggerDefinitions {
|
|||
@Override
|
||||
public void executeEvent(final MagicGame game,final MagicEvent event,final Object data[],final Object[] choiceResults) {
|
||||
|
||||
final MagicPlayer player=(MagicPlayer)(MagicPlayer)data[0];
|
||||
final MagicPlayer player=(MagicPlayer)data[0];
|
||||
game.doAction(new MagicChangeLifeAction(player,-1));
|
||||
game.doAction(new MagicPlayTokenAction(player,TokenCardDefinitions.FAERIE_ROGUE_TOKEN_CARD));
|
||||
}
|
||||
|
@ -4335,4 +4335,4 @@ public class TriggerDefinitions {
|
|||
card.addTrigger(trigger);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -154,7 +154,7 @@ public class MagicManaCost {
|
|||
hasX=true;
|
||||
return true;
|
||||
} else if (symbol>='0'&&symbol<='9') {
|
||||
addType(MagicCostManaType.Colorless,(int)(symbol-'0'));
|
||||
addType(MagicCostManaType.Colorless,symbol-'0');
|
||||
return true;
|
||||
} else {
|
||||
for (final MagicCostManaType type : MagicCostManaType.values()) {
|
||||
|
@ -311,4 +311,4 @@ public class MagicManaCost {
|
|||
}
|
||||
return cost;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -30,7 +30,7 @@ public class MagicMayChoice extends MagicChoice {
|
|||
this.choices=choices;
|
||||
for (int index=0;index<choices.length;index++) {
|
||||
|
||||
final MagicChoice choice=(MagicChoice)choices[index];
|
||||
final MagicChoice choice=choices[index];
|
||||
if (choice instanceof MagicTargetChoice) {
|
||||
targetChoice=(MagicTargetChoice)choice;
|
||||
} else if (choice instanceof MagicPayManaCostChoice) {
|
||||
|
@ -147,4 +147,4 @@ public class MagicMayChoice extends MagicChoice {
|
|||
}
|
||||
return choiceResults;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@ public class MagicPlayCardEvent implements MagicCardEvent,MagicEventAction {
|
|||
@Override
|
||||
public void executeEvent(final MagicGame game,final MagicEvent event,final Object[] data,final Object[] choices) {
|
||||
|
||||
final MagicCardOnStack cardOnStack=(MagicCardOnStack)(MagicCardOnStack)data[0];
|
||||
final MagicCardOnStack cardOnStack=(MagicCardOnStack)data[0];
|
||||
game.doAction(new MagicPlayCardFromStackAction(cardOnStack,null));
|
||||
}
|
||||
|
||||
|
@ -31,4 +31,4 @@ public class MagicPlayCardEvent implements MagicCardEvent,MagicEventAction {
|
|||
|
||||
return INSTANCE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue