[nullpomino] r893 committed - #Happy New Year! Sorry for lack of updates... I've been busy again.......

[nullp...@googlecode.com]

Revision: 893
Author: pbomql...@gmail.com
Date: Fri Jan 6 07:28:02 2012
Log: #Happy New Year! Sorry for lack of updates... I've been busy
again....
+nm8(NiftyGUI): Added NEURO support (actual NEURO support is provided by
new NFNEUROGame class in order to keep the code simple)
*nm8: Removed old NullpoMino game class, as it's no longer needed

http://code.google.com/p/nullpomino/source/detail?r=893

Added:
/branches/nm8/src/cx/it/nullpo/nm8/gui/framework/NFNEUROGame.java
Deleted:
/branches/nm8/src/cx/it/nullpo/nm8/gui/game/NullpoMino.java
Modified:
/branches/nm8/data/xml/game_main.xml
/branches/nm8/src/cx/it/nullpo/nm8/gui/game/NullpoMinoNiftyGUI.java
/branches/nm8/src/cx/it/nullpo/nm8/gui/slick/NullpoMinoSlick.java
/branches/nm8/src/cx/it/nullpo/nm8/gui/swing/NullpoMinoSwing.java

=======================================
--- /dev/null
+++ /branches/nm8/src/cx/it/nullpo/nm8/gui/framework/NFNEUROGame.java Fri
Jan 6 07:28:02 2012
@@ -0,0 +1,47 @@
+package cx.it.nullpo.nm8.gui.framework;
+
+import cx.it.nullpo.nm8.neuro.error.PluginInitializationException;
+import cx.it.nullpo.nm8.neuro.plugin.AbstractPlugin;
+
+/**
+ * A NFGame implementation that handles most NEURO-related stuff for you
+ * (Currently it's mostly empty)
+ */
+public class NFNEUROGame extends AbstractPlugin implements NFGame {
+ private static final long serialVersionUID = 4495602927839234542L;
+
+ public String getName() {
+ return "Untitled NEURO Game";
+ }
+
+ public float getVersion() {
+ return 0;
+ }
+
+ public String getAuthor() {
+ return "Unknown";
+ }
+
+ public void stop() {
+ }
+
+ public boolean isEnableNEURO() {
+ return true;
+ }
+
+ public void init(NFSystem sys) {
+ }
+
+ public void update(NFSystem sys, long delta) {
+ }
+
+ public void render(NFSystem sys, NFGraphics g) {
+ }
+
+ public void onExit(NFSystem sys) {
+ }
+
+ @Override
+ protected void init() throws PluginInitializationException {
+ }
+}
=======================================
--- /branches/nm8/src/cx/it/nullpo/nm8/gui/game/NullpoMino.java Wed Nov 9
19:30:07 2011
+++ /dev/null
@@ -1,433 +0,0 @@
-package cx.it.nullpo.nm8.gui.game;
-
-import java.awt.Point;
-import java.awt.event.KeyEvent;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.Iterator;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.jdom.Document;
-import org.jdom.input.SAXBuilder;
-
-import cx.it.nullpo.nm8.game.component.Block;
-import cx.it.nullpo.nm8.game.component.Controller;
-import cx.it.nullpo.nm8.game.component.Piece;
-import cx.it.nullpo.nm8.game.play.GameManager;
-import cx.it.nullpo.nm8.gui.framework.NFColor;
-import cx.it.nullpo.nm8.gui.framework.NFFont;
-import cx.it.nullpo.nm8.gui.framework.NFGame;
-import cx.it.nullpo.nm8.gui.framework.NFGraphics;
-import cx.it.nullpo.nm8.gui.framework.NFImage;
-import cx.it.nullpo.nm8.gui.framework.NFJoystick;
-import cx.it.nullpo.nm8.gui.framework.NFSystem;
-import cx.it.nullpo.nm8.neuro.error.PluginInitializationException;
-import cx.it.nullpo.nm8.neuro.event.DebugEvent;
-import cx.it.nullpo.nm8.neuro.event.JoyButtonEvent;
-import cx.it.nullpo.nm8.neuro.event.JoyPOVEvent;
-import cx.it.nullpo.nm8.neuro.event.JoyXYAxisEvent;
-import cx.it.nullpo.nm8.neuro.event.KeyInputEvent;
-import cx.it.nullpo.nm8.neuro.event.QuitEvent;
-import cx.it.nullpo.nm8.neuro.plugin.AbstractPlugin;
-import cx.it.nullpo.nm8.util.NGlobalConfig;
-import cx.it.nullpo.nm8.util.NUtil;
-
-public class NullpoMino extends AbstractPlugin implements NFGame {
- private static final long serialVersionUID = 4545597070306756443L;
-
- /** Log */
- private Log log = LogFactory.getLog(NullpoMino.class);
-
- // Constants for key config
- protected static final int MAX_PLAYERS = 2;
- protected static final int MAX_RULE_KIND = 2;
- protected static final int MAX_KEY_SLOTS = 4;
- protected static final int MAX_KEY_KINDS = 9;
-
- NFSystem sys;
- NFGraphics g;
- NFFont font;
- GameManager manager;
- long lastdelta;
-
- public boolean isEnableNEURO() {
- return true;
- }
-
- public void init(NFSystem sys) {
- // Game initialization
- this.sys = sys;
- sys.setWindowTitle("NullpoMino8 Alpha Test - Loading");
-
- try {
- if(sys.getJoystickManager() != null) {
- int numJoysticks = sys.getJoystickManager().initJoystick();
- log.info(numJoysticks + " joysticks found");
-
- if(numJoysticks > 0) {
- addListener(JoyXYAxisEvent.class);
- addListener(JoyPOVEvent.class);
- addListener(JoyButtonEvent.class);
- }
- }
- } catch (Throwable e) {
- log.warn("Failed to init joystick", e);
- }
-
- try {
- if(sys.isFontSupported()) {
- font = sys.loadFont("data/res/font/font.ttf");
- }
- if(sys.isSoundSupported() &&
NGlobalConfig.getConfig().getProperty("sys.enablesound", true)) {
- log.debug("Loading sound effects");
- ResourceHolder.loadSoundEffects(sys, "default");
- }
- g = sys.getGraphics();
-
- String strBlockSkinPathName = "nullpoworld";
- SAXBuilder builder = new SAXBuilder();
- Document doc = null;
- doc = builder.build(NUtil.getURL("data/res/graphics/block/" +
strBlockSkinPathName + "/blockindex.xml"));
- ResourceHolder.blockSkin = BlockSkin.loadByXML(sys,
strBlockSkinPathName, doc); // TODO: Load multiple block skin
-
- manager = new GameManager();
- manager.init();
- manager.start();
- } catch (Exception e) {
- log.error("Game init failed", e);
- }
- sys.setWindowTitle("NullpoMino8 Alpha Test");
- }
-
- public void render(NFSystem sys, NFGraphics g) {
- if(sys.hasFocus()) {
- try {
- this.g = g;
-
- g.setColor(NFColor.black);
- g.fillRect(0, 0, sys.getOriginalWidth(), sys.getOriginalHeight());
-
- g.setColor(NFColor.white);
- if(font != null) {
- g.setFont(font);
- }
- g.drawString("FPS:" + sys.getFPS(), 5, 10);
- String strTimer =
NUtil.getTime(manager.getGamePlay(0,0).statistics.time);
- g.drawString("Time:" + strTimer, 5, 30);
- g.drawString("Delta:" + lastdelta, 5, 50);
-
- if(sys.getMouse() != null) {
- if(sys.getMouse().isLeftButtonDown()) {
- g.drawString("LeftMouseButton", 5, 70);
- }
- if(sys.getMouse().isRightButtonDown()) {
- g.drawString("RightMouseButton", 5, 90);
- }
- if(sys.getMouse().isMiddleButtonDown()) {
- g.drawString("MiddleMouseButton", 5, 110);
- }
- Point p = sys.getMouse().getMousePosition();
- if(p != null) g.drawString("X:" + p.x + " Y:" + p.y, 5, 130);
- p = sys.getMouse().getAbsoluteMousePosition();
- if(p != null) g.drawString("AX:" + p.x + " AY:" + p.y, 5, 150);
- }
-
- int fldX = 200;
- int fldY = 80;
-
- // Field
- for(int y = 0; y < 20; y++) {
- for(int x = 0; x < 10; x++) {
- if(!manager.getGameEngine(0).field.getBlockEmpty(x, y)) {
- Block blk = manager.getGameEngine(0).field.getBlock(x, y);
- if(blk != null) drawBlock(blk, fldX + (x * 16), fldY + (y * 16));
- }
- }
- }
-
- // Ghost piece
- if(manager.getGamePlay(0,0).nowPieceObject != null) {
- int ghostY = manager.getGamePlay(0,0).nowPieceObject.getBottom(
- manager.getGamePlay(0,0).nowPieceX,
- manager.getGamePlay(0,0).nowPieceY,
- manager.getGameEngine(0).field);
-
- drawPiece(manager.getGamePlay(0,0).nowPieceObject,
- fldX + (manager.getGamePlay(0,0).nowPieceX * 16),
- fldY + (ghostY * 16),
- true);
- }
-
- // Current piece
- if(manager.getGamePlay(0,0).nowPieceObject != null) {
- drawPiece(manager.getGamePlay(0,0).nowPieceObject,
- fldX + (manager.getGamePlay(0,0).nowPieceX * 16),
- fldY + (manager.getGamePlay(0,0).nowPieceY * 16));
- }
-
- // Hold piece
- if(manager.getGamePlay(0,0).holdPieceObject != null) {
- drawPiece(manager.getGamePlay(0,0).holdPieceObject,
- fldX - (5 * 16),
- fldY);
- }
-
- // Next pieces
- if(manager.getGamePlay(0,0).nextPieceArray != null) {
- for(int i = 0; i < manager.getGamePlay(0,0).nextPieceArray.length;
i++) {
- drawPiece(manager.getGamePlay(0,0).nextPieceArray[i],
- fldX + 11*16,
- fldY + (i * 48));
- }
- }
-
- // Field box
- g.setColor(NFColor.white);
- g.drawRect(fldX, fldY, 10*16, 20*16);
- } catch (Exception e) {
- log.error("Render fail", e);
- }
- }
- }
-
- public void update(NFSystem sys, long delta) {
- if(sys.hasFocus()) {
- try {
- if(font != null) font.loadGlyphs();
- lastdelta = delta;
- manager.update(delta);
-
- // Play sound effects
- if(manager.getGamePlay(0,0) != null) {
- synchronized (manager.getGamePlay(0,0).seQueue) {
- Iterator<String> it = manager.getGamePlay(0,0).seQueue.iterator();
- while(it.hasNext()) {
- ResourceHolder.playSE(it.next());
- it.remove();
- }
- }
- }
- } catch (Exception e) {
- log.error("Game update fail", e);
- }
- }
- }
-
- public void onExit(NFSystem sys) {
- ResourceHolder.unloadSoundEffects();
- }
-
- public void drawBlock(Block blk, int x, int y) {
- drawBlock(blk, x, y, false);
- }
-
- public void drawBlock(Block blk, int x, int y, boolean isGhost) {
- if(ResourceHolder.blockSkin != null && !isGhost) {
- NFImage img =
ResourceHolder.blockSkin.mapImageNormal.get(Integer.valueOf(16));
-
- if(img != null) {
- g.drawImage(img, x, y, x + 16, y + 16, blk.color * 16, 0, (blk.color *
16) + 16, 16);
- return;
- }
- }
-
- switch(blk.color) {
- case Block.BLOCK_COLOR_GRAY:
- g.setColor(NFColor.gray);
- break;
- case Block.BLOCK_COLOR_RED:
- g.setColor(NFColor.red);
- break;
- case Block.BLOCK_COLOR_ORANGE:
- g.setColor(NFColor.orange);
- break;
- case Block.BLOCK_COLOR_YELLOW:
- g.setColor(NFColor.yellow);
- break;
- case Block.BLOCK_COLOR_GREEN:
- g.setColor(NFColor.green);
- break;
- case Block.BLOCK_COLOR_CYAN:
- g.setColor(NFColor.cyan);
- break;
- case Block.BLOCK_COLOR_BLUE:
- g.setColor(NFColor.blue);
- break;
- case Block.BLOCK_COLOR_PURPLE:
- g.setColor(NFColor.magenta);
- break;
- default:
- g.setColor(NFColor.white);
- }
-
- if(isGhost) g.drawRect(x, y, 16-1, 16-1);
- else g.fillRect(x, y, 16, 16);
-
- g.setColor(NFColor.white);
- }
-
- public void drawPiece(Piece piece, int x, int y) {
- drawPiece(piece, x, y, false);
- }
-
- public void drawPiece(Piece piece, int x, int y, boolean isGhost) {
- for(int i = 0; i < piece.getMaxBlock(); i++) {
- Block blk = piece.block[i];
- int x2 = piece.getDataX(i);
- int y2 = piece.getDataY(i);
- drawBlock(blk, x + (x2 * 16), y + (y2 * 16), isGhost);
- }
- }
-
- // NEURO PLUGIN FUNCTIONALITY
-
- public String getName() {
- return "NullpoMino";
- }
-
- public float getVersion() {
- return GameManager.getVersionMajor();
- }
-
- public String getAuthor() {
- return "The NullpoMino Dev Team";
- }
-
- @Override
- public void init() throws PluginInitializationException {
- addListener(KeyInputEvent.class);
- }
-
- public void stop() {
-
- }
-
- public void receiveEvent(KeyInputEvent e) {
- if (manager != null) {
- int player = 0;
- int rule = 0;
-
- Controller ctrl = manager.getGamePlay(0,0).ctrl;
- int key = e.getKey();
- boolean pressed = e.getPressed();
-
- for(int slot = 0; slot < MAX_KEY_SLOTS; slot++) {
- for(int keyKind = 0; keyKind < MAX_KEY_KINDS; keyKind++) {
- String strID = "key_" + player + "_" + rule + "_" + slot + "_" +
keyKind;
- int tempKeyCode = NGlobalConfig.getConfig().getProperty(strID,
KeyEvent.VK_UNDEFINED);
-
- if(key == tempKeyCode) {
- ctrl.setButtonState(keyKind, pressed);
- }
- }
- }
-
- switch(key) {
- case KeyEvent.VK_ESCAPE:
- dispatchEvent(new QuitEvent(this));
- break;
- case KeyEvent.VK_0:
- if(pressed) {
- try {
- FileOutputStream fos = new FileOutputStream("statesave.bin");
- ObjectOutputStream oos = new ObjectOutputStream(fos);
- oos.writeObject(manager);
- fos.close();
- // System.out.println("State saved!");
- dispatchEvent(new DebugEvent(this,DebugEvent.TYPE_DEBUG,"Game state
saved."));
- } catch (Exception e2) {
- dispatchEvent(new DebugEvent(this,DebugEvent.TYPE_ERROR,"Failed to
save game state."));
- }
- }
- break;
- case KeyEvent.VK_1:
- if(pressed) {
- try {
- FileInputStream fis = new FileInputStream("statesave.bin");
- ObjectInputStream ois = new ObjectInputStream(fis);
- manager = (GameManager)ois.readObject();
- fis.close();
- // System.out.println("State loaded!");
- dispatchEvent(new DebugEvent(this,DebugEvent.TYPE_DEBUG,"Game state
loaded."));
- } catch (FileNotFoundException e2) {
- // System.out.println("State file doesn't exist");
- dispatchEvent(new DebugEvent(this,DebugEvent.TYPE_WARNING,"Game
state not found."));
- } catch (Exception e2) {
- // e2.printStackTrace();
- dispatchEvent(new DebugEvent(this,DebugEvent.TYPE_ERROR,"Game state
failed to load."));
- }
- }
- break;
- }
- }
- }
-
- public void onJoystickMove(NFJoystick joy, boolean isY, float oldValue,
float newValue) {
- if (manager != null) {
- Controller ctrl = manager.getGamePlay(0,0).ctrl;
-
- if(isY) {
- if(newValue < 0f) {
- ctrl.setButtonState(Controller.BUTTON_HARD, true);
- ctrl.setButtonState(Controller.BUTTON_SOFT, false);
- } else if(newValue > 0f) {
- ctrl.setButtonState(Controller.BUTTON_HARD, false);
- ctrl.setButtonState(Controller.BUTTON_SOFT, true);
- } else {
- ctrl.setButtonState(Controller.BUTTON_HARD, false);
- ctrl.setButtonState(Controller.BUTTON_SOFT, false);
- }
- } else {
- if(newValue < 0f) {
- ctrl.setButtonState(Controller.BUTTON_LEFT, true);
- ctrl.setButtonState(Controller.BUTTON_RIGHT, false);
- } else if(newValue > 0f) {
- ctrl.setButtonState(Controller.BUTTON_LEFT, false);
- ctrl.setButtonState(Controller.BUTTON_RIGHT, true);
- } else {
- ctrl.setButtonState(Controller.BUTTON_LEFT, false);
- ctrl.setButtonState(Controller.BUTTON_RIGHT, false);
- }
- }
- }
- }
-
- public void receiveEvent(JoyXYAxisEvent e) {
- dispatchEvent(new DebugEvent(this,
DebugEvent.TYPE_DEBUG, "JoyXYAxisEvent isY:" + e.isYAxis() + " value:" +
e.getNewValue()));
- onJoystickMove(e.getJoystick(), e.isYAxis(), e.getOldValue(),
e.getNewValue());
- }
-
- public void receiveEvent(JoyPOVEvent e) {
- dispatchEvent(new DebugEvent(this, DebugEvent.TYPE_DEBUG, "JoyPOVEvent
isY:" + e.isYPov() + " value:" + e.getNewValue()));
- onJoystickMove(e.getJoystick(), e.isYPov(), e.getOldValue(),
e.getNewValue());
- }
-
- public void receiveEvent(JoyButtonEvent e) {
- dispatchEvent(new DebugEvent(this,
DebugEvent.TYPE_DEBUG, "JoyButtonEvent button:" + e.getButton() + "
isPressed:" + e.isPressed()));
-
- if (manager != null) {
- Controller ctrl = manager.getGamePlay(0,0).ctrl;
- int button = e.getButton();
- boolean pressed = e.isPressed();
-
- switch(button) {
- case 0:
- ctrl.setButtonState(Controller.BUTTON_LROTATE, pressed);
- break;
- case 1:
- ctrl.setButtonState(Controller.BUTTON_RROTATE, pressed);
- break;
- case 2:
- ctrl.setButtonState(Controller.BUTTON_DROTATE, pressed);
- break;
- case 3:
- ctrl.setButtonState(Controller.BUTTON_HOLD, pressed);
- break;
- }
- }
- }
-}
=======================================
--- /branches/nm8/data/xml/game_main.xml Thu Nov 10 01:23:35 2011
+++ /branches/nm8/data/xml/game_main.xml Fri Jan 6 07:28:02 2012
@@ -12,7 +12,7 @@
</controlDefinition>

<screen id="start"
controller="cx.it.nullpo.nm8.gui.game.MainScreenController">
- <layer childLayout="vertical" backgroundColor="#202020">
+ <layer childLayout="vertical" backgroundColor="#00000000">
<panel childLayout="horizontal" width="100%" height="10%" />

<panel backgroundColor="#FF0000" childLayout="center" width="162"
height="326" align="center" valign="center">
=======================================
--- /branches/nm8/src/cx/it/nullpo/nm8/gui/game/NullpoMinoNiftyGUI.java Thu
Nov 10 01:23:35 2011
+++ /branches/nm8/src/cx/it/nullpo/nm8/gui/game/NullpoMinoNiftyGUI.java Fri
Jan 6 07:28:02 2012
@@ -13,16 +13,14 @@
import cx.it.nullpo.nm8.game.play.GameManager;
import cx.it.nullpo.nm8.game.play.GamePlay;
import cx.it.nullpo.nm8.gui.framework.NFColor;
-import cx.it.nullpo.nm8.gui.framework.NFGame;
import cx.it.nullpo.nm8.gui.framework.NFGraphics;
-import cx.it.nullpo.nm8.gui.framework.NFKeyListener;
import cx.it.nullpo.nm8.gui.framework.NFKeyboard;
+import cx.it.nullpo.nm8.gui.framework.NFNEUROGame;
import cx.it.nullpo.nm8.gui.framework.NFSystem;
import cx.it.nullpo.nm8.gui.niftygui.NFInputSystem;
import cx.it.nullpo.nm8.gui.niftygui.NFRenderDevice;
import cx.it.nullpo.nm8.gui.niftygui.NFSoundDevice;
-import cx.it.nullpo.nm8.neuro.core.NEURO;
-import cx.it.nullpo.nm8.neuro.error.PluginInitializationException;
+import cx.it.nullpo.nm8.neuro.event.KeyInputEvent;
import cx.it.nullpo.nm8.util.NGlobalConfig;
import cx.it.nullpo.nm8.util.NUtil;
import de.lessvoid.nifty.Nifty;
@@ -33,7 +31,7 @@
/**
* NFGame implementation of NullpoMino (WIP)
*/
-public class NullpoMinoNiftyGUI implements NFGame, NFKeyListener {
+public class NullpoMinoNiftyGUI extends NFNEUROGame {
private static final long serialVersionUID = 612498635208267339L;

/** Log */
@@ -60,40 +58,32 @@
protected static final int MAX_KEY_SLOTS = 4;
protected static final int MAX_KEY_KINDS = 9;

+ @Override
public String getName() {
return "NullpoMino";
}

+ @Override
public float getVersion() {
return GameManager.getVersionMajor();
}

+ @Override
public String getAuthor() {
return "The NullpoMino Dev Team";
}

- public void init(NEURO parent) throws PluginInitializationException {
- }
-
- public void draw(NFGraphics g) {
- }
-
- public void stop() {
- }
-
- public boolean isEnableNEURO() {
- return false;
- }
-
+ @Override
public void init(NFSystem sys) {
log.trace("init");

this.sys = sys;
- sys.getKeyboard().addKeyListener(this);
+ addListener(KeyInputEvent.class);

sys.setWindowTitle("NullpoMino8 (NiftyGUI)");
}

+ @Override
public void update(NFSystem sys, long delta) {
if(!isResourceLoaded) {
isResourceLoaded = true;
@@ -138,7 +128,11 @@
}
}

+ @Override
public void render(NFSystem sys, NFGraphics g) {
+ g.setColor(NFColor.black);
+ g.fillRect(0, 0, sys.getOriginalWidth(), sys.getOriginalHeight());
+
if(!niftyInited && (nifty == null)) {
try {
nifty = new Nifty(new NFRenderDevice(sys),
@@ -146,6 +140,7 @@
new NFInputSystem(sys.getKeyboard(),
sys.getMouse()),
new TimeProvider());
log.trace("NiftyGUI created");
+ initGUI(nifty);

nifty.fromXml("data/xml/game_main.xml", "start", new
MainScreenController(this));
niftyInited = true;
@@ -155,7 +150,7 @@
}

if(niftyInited && (nifty != null)) {
- nifty.render(true);
+ nifty.render(false);

if((gameManager != null) && gameManager.isGameStarted()) {
Screen curScreen = nifty.getCurrentScreen();
@@ -183,6 +178,7 @@
g.drawString("FPS:" + sys.getFPS(), 0, 0);
}

+ @Override
public void onExit(NFSystem sys) {
try {
ResourceHolder.unloadSoundEffects();
@@ -214,6 +210,10 @@

log.trace("Started a new game");
}
+
+ public void receiveEvent(KeyInputEvent e) {
+ handleKeyEvent(e.getKeyboard(), e.getKey(), e.getChar(), e.getPressed());
+ }

public void handleKeyEvent(NFKeyboard keyboard, int key, char c, boolean
pressed) {
if(gameManager != null && gameManager.isGameActive()) {
@@ -243,11 +243,4 @@
}
}
}
-
- public void initGUI(Nifty n) {
- }
-
- public Nifty getGUI() {
- return null;
- }
-}
+}
=======================================
--- /branches/nm8/src/cx/it/nullpo/nm8/gui/slick/NullpoMinoSlick.java Thu
Nov 10 01:23:35 2011
+++ /branches/nm8/src/cx/it/nullpo/nm8/gui/slick/NullpoMinoSlick.java Fri
Jan 6 07:28:02 2012
@@ -4,7 +4,6 @@
import org.apache.commons.logging.LogFactory;

import cx.it.nullpo.nm8.gui.framework.NFGame;
-import cx.it.nullpo.nm8.gui.game.NullpoMino;
import cx.it.nullpo.nm8.gui.game.NullpoMinoNiftyGUI;
import cx.it.nullpo.nm8.gui.slick.framework.SlickNFSystem;
import cx.it.nullpo.nm8.util.CustomProperties;
@@ -30,13 +29,9 @@

NFGame game = null;
SlickNFSystem sys = null;
- if(args.length > 0 && args[0].equals("--guitest")) {
- game = new NullpoMinoNiftyGUI();
- sys = new SlickNFSystem(game, fullscreen, screenWidth, screenHeight,
screenWidth, screenHeight, true, args);
- } else {
- game = new NullpoMino();
- sys = new SlickNFSystem(game, fullscreen, screenWidth, screenHeight,
640, 480, true, args);
- }
+
+ game = new NullpoMinoNiftyGUI();
+ sys = new SlickNFSystem(game, fullscreen, screenWidth, screenHeight,
screenWidth, screenHeight, true, args);

NGlobalConfig.applyNFSystem(sys);
if(!fullscreen)
sys.setUseAWTKeyReceiver(propGlobal.getProperty("slick.awtkey", false));
=======================================
--- /branches/nm8/src/cx/it/nullpo/nm8/gui/swing/NullpoMinoSwing.java Thu
Nov 10 01:23:35 2011
+++ /branches/nm8/src/cx/it/nullpo/nm8/gui/swing/NullpoMinoSwing.java Fri
Jan 6 07:28:02 2012
@@ -4,7 +4,6 @@
import org.apache.commons.logging.LogFactory;

import cx.it.nullpo.nm8.gui.framework.NFGame;
-import cx.it.nullpo.nm8.gui.game.NullpoMino;
import cx.it.nullpo.nm8.gui.game.NullpoMinoNiftyGUI;
import cx.it.nullpo.nm8.gui.swing.framework.SwingNFSystem;
import cx.it.nullpo.nm8.util.CustomProperties;
@@ -28,13 +27,9 @@

NFGame game = null;
SwingNFSystem sys = null;
- if(args.length > 0 && args[0].equals("--guitest")) {
- game = new NullpoMinoNiftyGUI();
- sys = new SwingNFSystem(game, fullscreen, screenWidth, screenHeight,
screenWidth, screenHeight, true, args);
- } else {
- game = new NullpoMino();
- sys = new SwingNFSystem(game, fullscreen, screenWidth, screenHeight,
640, 480, true, args);
- }
+
+ game = new NullpoMinoNiftyGUI();
+ sys = new SwingNFSystem(game, fullscreen, screenWidth, screenHeight,
screenWidth, screenHeight, true, args);

NGlobalConfig.applyNFSystem(sys);

sys.setUseBufferStrategy(propGlobal.getProperty("swing.useBufferStrategy",
true));