Revision: 902
Author:
Pooch...@gmail.com
Date: Sat Nov 10 01:22:14 2012
Log: Oops, one of my replace all operations broke the netplay modes.
http://code.google.com/p/nullpomino/source/detail?r=902
Modified:
/trunk/src/mu/nu/nullpo/game/subsystem/mode/Avalanche1PDummyMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheFeverMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSBombBattleMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDigRaceMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDummyMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSFeverMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSSPFMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/ComboRaceMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/DigChallengeMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/DigRaceMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/ExtremeMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/FinalMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/GarbageManiaMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania2Mode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania3Mode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeManiaMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonPlusMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/NetVSBattleMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/PhantomManiaMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroManiaMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroMarathonMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreAttackMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreRaceMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedMania2Mode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedManiaMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/SquareMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/TechnicianMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/TimeAttackMode.java
/trunk/src/mu/nu/nullpo/game/subsystem/mode/UltraMode.java
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/Avalanche1PDummyMode.java
Sat Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/Avalanche1PDummyMode.java
Sat Nov 10 01:22:14 2012
@@ -167,7 +167,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
lastscore = 0;
lastmultiplier = 0;
scgettime = 0;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheFeverMode.java Sat
Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheFeverMode.java Sat
Nov 10 01:22:14 2012
@@ -140,7 +140,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
cleared = false;
boardsPlayed = 0;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheMode.java Sat Nov
10 01:22:14 2012
@@ -114,7 +114,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
showChains = true;
=======================================
---
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSBombBattleMode.java
Fri Feb 18 23:45:55 2011
+++
/trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSBombBattleMode.java
Sat Nov 10 01:22:14 2012
@@ -103,7 +103,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
if(engine.owner.replayMode == false) {
loadOtherSetting(engine, engine.owner.modeConfig);
loadPreset(engine, engine.owner.modeConfig, -1 -
playerID, "bombbattle");
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDigRaceMode.java
Thu Feb 24 21:33:35 2011
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDigRaceMode.java
Sat Nov 10 01:22:14 2012
@@ -98,7 +98,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
useMap[playerID] = false;
feverMapSet[playerID] = -1;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDummyMode.java
Sat Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSDummyMode.java
Sat Nov 10 01:22:14 2012
@@ -481,6 +481,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
if(playerID == 1) {
engine.randSeed = owner.engine[0].randSeed;
engine.random = new Random(owner.engine[0].randSeed);
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSFeverMode.java
Fri Feb 18 23:45:55 2011
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSFeverMode.java
Sat Nov 10 01:22:14 2012
@@ -120,7 +120,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
ojamaCounterMode[playerID] = OJAMA_COUNTER_FEVER;
ojama[playerID] = 0;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSMode.java Fri
Feb 18 23:45:55 2011
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSMode.java Sat
Nov 10 01:22:14 2012
@@ -239,7 +239,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
ojamaFever[playerID] = 0;
feverPoints[playerID] = 0;
feverTime[playerID] = feverTimeMin[playerID] * 60;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSSPFMode.java Thu
Feb 24 21:33:35 2011
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/AvalancheVSSPFMode.java Sat
Nov 10 01:22:14 2012
@@ -263,7 +263,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
numColors[playerID] = 4;
ojamaHard[playerID] = 4;
countdownDecremented[playerID] = true;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ComboRaceMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ComboRaceMode.java Sat Nov
10 01:22:14 2012
@@ -209,7 +209,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
scgettime = 0;
lastevent = EVENT_NONE;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/DigChallengeMode.java Sat
Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/DigChallengeMode.java Sat
Nov 10 01:22:14 2012
@@ -151,7 +151,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
lastscore = 0;
lastbonusscore = 0;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/DigRaceMode.java Sat Nov 10
00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/DigRaceMode.java Sat Nov 10
01:22:14 2012
@@ -99,7 +99,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
bgmno = 0;
big = false;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ExtremeMode.java Sat Nov 10
00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ExtremeMode.java Sat Nov 10
01:22:14 2012
@@ -168,7 +168,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
lastscore = 0;
scgettime = 0;
lastevent = EVENT_NONE;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/FinalMode.java Sat Nov 10
00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/FinalMode.java Sat Nov 10
01:22:14 2012
@@ -194,7 +194,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
nextseclv = 0;
lvupflag = true;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GarbageManiaMode.java Sat
Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GarbageManiaMode.java Sat
Nov 10 01:22:14 2012
@@ -242,7 +242,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
gravityindex = 0;
nextseclv = 0;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania2Mode.java Sat
Nov 10 01:05:35 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania2Mode.java Sat
Nov 10 01:22:14 2012
@@ -325,7 +325,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
gravityindex = 0;
nextseclv = 0;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania3Mode.java Sat
Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeMania3Mode.java Sat
Nov 10 01:22:14 2012
@@ -389,7 +389,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
gravityindex = 0;
nextseclv = 0;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeManiaMode.java Sat Nov
10 01:05:35 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/GradeManiaMode.java Sat Nov
10 01:22:14 2012
@@ -240,7 +240,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
gravityindex = 0;
nextseclv = 0;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonMode.java Sat Nov
10 01:22:14 2012
@@ -159,7 +159,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
lastscore = 0;
scgettime = 0;
lastevent = EVENT_NONE;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonPlusMode.java Sat
Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/MarathonPlusMode.java Sat
Nov 10 01:22:14 2012
@@ -170,7 +170,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
lastscore = 0;
scgettime = 0;
lastevent = EVENT_NONE;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetVSBattleMode.java Tue
Mar 1 04:39:13 2011
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/NetVSBattleMode.java Sat
Nov 10 01:22:14 2012
@@ -254,7 +254,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
if((playerID == 0) && (!netvsIsWatch())) {
lastHole = -1;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhantomManiaMode.java Sat
Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhantomManiaMode.java Sat
Nov 10 01:22:14 2012
@@ -232,7 +232,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
nextseclv = 0;
lvupflag = true;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/PhysicianMode.java Sat Nov
10 01:22:14 2012
@@ -129,7 +129,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
lastscore = 0;
scgettime = 0;
gemsClearedChainTotal = 0;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroManiaMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroManiaMode.java Sat Nov
10 01:22:14 2012
@@ -142,7 +142,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
lastscore = 0;
scgettime = 0;
levelTimer = 0;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroMarathonMode.java Sat
Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/RetroMarathonMode.java Sat
Nov 10 01:22:14 2012
@@ -183,7 +183,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
lastscore = 0;
scgettime = 0;
softdropscore = 0;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreAttackMode.java Sat
Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreAttackMode.java Sat
Nov 10 01:22:14 2012
@@ -172,7 +172,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
gravityindex = 0;
nextseclv = 0;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreRaceMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/ScoreRaceMode.java Sat Nov
10 01:22:14 2012
@@ -154,7 +154,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
lastscore = 0;
scgettime = 0;
lastevent = EVENT_NONE;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedMania2Mode.java Sat
Nov 10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedMania2Mode.java Sat
Nov 10 01:22:14 2012
@@ -224,7 +224,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
nextseclv = 0;
lvupflag = true;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedManiaMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/SpeedManiaMode.java Sat Nov
10 01:22:14 2012
@@ -207,7 +207,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
nextseclv = 0;
lvupflag = true;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/SquareMode.java Sat Nov 10
00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/SquareMode.java Sat Nov 10
01:22:14 2012
@@ -131,7 +131,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
lastscore = 0;
scgettime = 0;
squares = 0;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/TechnicianMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/TechnicianMode.java Sat Nov
10 01:22:14 2012
@@ -208,7 +208,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
goal = 0;
levelTimer = 0;
levelTimeOut = false;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/TimeAttackMode.java Sat Nov
10 00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/TimeAttackMode.java Sat Nov
10 01:22:14 2012
@@ -301,7 +301,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
norm = 0;
goaltype = 0;
=======================================
--- /trunk/src/mu/nu/nullpo/game/subsystem/mode/UltraMode.java Sat Nov 10
00:34:19 2012
+++ /trunk/src/mu/nu/nullpo/game/subsystem/mode/UltraMode.java Sat Nov 10
01:22:14 2012
@@ -144,7 +144,8 @@
*/
@Override
public void playerInit(GameEngine engine, int playerID) {
- super.playerInit(engine, playerID);
+ owner = engine.owner;
+ receiver = engine.owner.receiver;
lastscore = 0;
scgettime = 0;
lastevent = EVENT_NONE;