Changeset 6b38a1a495f0a857715ab1f26cd003a70c1b6214

Show
Ignore:
Timestamp:
07/06/07 13:32:38 (1 year ago)
Author:
Christopher Jung <bktheg@web.de>
git-committer:
Christopher Jung <bktheg@web.de> 1183721558 +0200
git-parent:

[1df5786b78a47a2dcd61370d0f18b7d8bc63afbd]

git-author:
Christopher Jung <bktheg@web.de> 1183721558 +0200
Message:

Ships.DockMode? nach Ship.DockMode? geaendert *Eclipse tret*

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/net/driftingsouls/ds2/server/modules/FleetMgntController.java

    rfda8be0 r6b38a1a  
    4040import net.driftingsouls.ds2.server.ships.ShipTypeData; 
    4141import net.driftingsouls.ds2.server.ships.ShipTypes; 
    42 import net.driftingsouls.ds2.server.ships.Ships; 
    4342 
    4443import org.apache.commons.lang.StringUtils; 
    …… 
    641640                for( Iterator iter=ships.iterator(); iter.hasNext(); ) { 
    642641                        Ship aship = (Ship)iter.next(); 
    643                         aship.dock(Ships.DockMode.UNDOCK, (Ship[])null); 
     642                        aship.dock(Ship.DockMode.UNDOCK, (Ship[])null); 
    644643                } 
    645644                 
    …… 
    700699                        } 
    701700                         
    702                         ship.dock(Ships.DockMode.DOCK, list); 
     701                        ship.dock(Ship.DockMode.DOCK, list); 
    703702                } 
    704703 
    …… 
    722721                for( Iterator iter=ships.iterator(); iter.hasNext(); ) { 
    723722                        Ship aship = (Ship)iter.next(); 
    724                         aship.dock(Ships.DockMode.START, (Ship[])null); 
     723                        aship.dock(Ship.DockMode.START, (Ship[])null); 
    725724                } 
    726725                 
    …… 
    789788                        } 
    790789                         
    791                         ship.dock(Ships.DockMode.LAND, list); 
     790                        ship.dock(Ship.DockMode.LAND, list); 
    792791                } 
    793792 

  • src/net/driftingsouls/ds2/server/modules/SchiffController.java

    radac94a r6b38a1a  
    435435                } 
    436436                 
    437                 ship.dock(Ships.DockMode.LAND, shiplist); 
     437                ship.dock(Ship.DockMode.LAND, shiplist); 
    438438                t.set_var("ship.message", Ship.MESSAGE.getMessage()); 
    439439 
    …… 
    470470                } 
    471471                 
    472                 ship.dock(Ships.DockMode.START, shiplist); 
     472                ship.dock(Ship.DockMode.START, shiplist); 
    473473                t.set_var("ship.message", Ship.MESSAGE.getMessage()); 
    474474 
    …… 
    519519                        Ship targetShip = (Ship)db.get(Ship.class, targetID); 
    520520                         
    521                         targetShip.dock(Ships.DockMode.UNDOCK, docked); 
     521                        targetShip.dock(Ship.DockMode.UNDOCK, docked); 
    522522                } 
    523523                 
    …… 
    533533                } 
    534534                 
    535                 ship.dock(Ships.DockMode.DOCK, shiplist); 
     535                ship.dock(Ship.DockMode.DOCK, shiplist); 
    536536                t.set_var("ship.message", Ship.MESSAGE.getMessage()); 
    537537 
    …… 
    567567                } 
    568568                 
    569                 ship.dock(Ships.DockMode.UNDOCK, shiplist); 
     569                ship.dock(Ship.DockMode.UNDOCK, shiplist); 
    570570                t.set_var("ship.message", Ship.MESSAGE.getMessage()); 
    571571 

  • src/net/driftingsouls/ds2/server/scripting/ActionFunctions.java

    radac94a r6b38a1a  
    3535import net.driftingsouls.ds2.server.ships.Ship; 
    3636import net.driftingsouls.ds2.server.ships.ShipTypeData; 
    37 import net.driftingsouls.ds2.server.ships.Ships; 
    3837import net.driftingsouls.ds2.server.ships.Waypoint; 
    3938import net.driftingsouls.ds2.server.tasks.Taskmanager; 
    …… 
    5150                parser.registerCommand( "KJUMP", new KJump(), ScriptParser.Args.PLAIN_REG ); 
    5251                parser.registerCommand( "MSG", new Msg(), ScriptParser.Args.PLAIN_REG,ScriptParser.Args.REG,ScriptParser.Args.REG ); 
    53                 parser.registerCommand( "START", new Dock(Ships.DockMode.START, true), ScriptParser.Args.PLAIN_VARIABLE ); 
    54                 parser.registerCommand( "UNDOCK", new Dock(Ships.DockMode.UNDOCK, true), ScriptParser.Args.PLAIN_VARIABLE ); 
    55                 parser.registerCommand( "LAND", new Dock(Ships.DockMode.LAND, false), ScriptParser.Args.PLAIN_VARIABLE ); 
    56                 parser.registerCommand( "DOCK", new Dock(Ships.DockMode.DOCK, false), ScriptParser.Args.PLAIN_VARIABLE ); 
     52                parser.registerCommand( "START", new Dock(Ship.DockMode.START, true), ScriptParser.Args.PLAIN_VARIABLE ); 
     53                parser.registerCommand( "UNDOCK", new Dock(Ship.DockMode.UNDOCK, true), ScriptParser.Args.PLAIN_VARIABLE ); 
     54                parser.registerCommand( "LAND", new Dock(Ship.DockMode.LAND, false), ScriptParser.Args.PLAIN_VARIABLE ); 
     55                parser.registerCommand( "DOCK", new Dock(Ship.DockMode.DOCK, false), ScriptParser.Args.PLAIN_VARIABLE ); 
    5756                parser.registerCommand( "GETRESOURCE", new GetResource(), ScriptParser.Args.PLAIN_REG, ScriptParser.Args.PLAIN_REG ); 
    5857                parser.registerCommand( "TRANSFERCARGO", new TransferCargo(), ScriptParser.Args.PLAIN_REG, ScriptParser.Args.PLAIN_REG, ScriptParser.Args.PLAIN_REG, ScriptParser.Args.PLAIN_REG, ScriptParser.Args.PLAIN_REG ); 
    …… 
    225224        class Dock implements SPFunction { 
    226225                private boolean allowAll = false; 
    227                 private Ships.DockMode mode = Ships.DockMode.DOCK; 
     226                private Ship.DockMode mode = Ship.DockMode.DOCK; 
    228227                 
    229228                /** 
    …… 
    232231                 * @param allowAll Soll <code>all</code> (alle gedockten Schiffe) zugelassen werden? 
    233232                 */ 
    234                 public Dock(Ships.DockMode mode, boolean allowAll) { 
     233                public Dock(Ship.DockMode mode, boolean allowAll) { 
    235234                        this.allowAll = allowAll; 
    236235                        this.mode = mode; 

  • src/net/driftingsouls/ds2/server/werften/WerftObject.java

    radac94a r6b38a1a  
    6666import net.driftingsouls.ds2.server.ships.ShipType; 
    6767import net.driftingsouls.ds2.server.ships.ShipTypeData; 
    68 import net.driftingsouls.ds2.server.ships.Ships; 
    69 import net.driftingsouls.ds2.server.ships.Ship.ModuleEntry; 
    7068 
    7169import org.apache.commons.lang.StringUtils; 
    …… 
    667665                        output.append((jdockcount-shiptype.getJDocks())+" gelandete Schiffe wurden gestartet\n"); 
    668666                         
    669                         ship.dock(Ships.DockMode.START, undockarray); 
     667                        ship.dock(Ship.DockMode.START, undockarray); 
    670668                } 
    671669                                 
    …… 
    689687                        output.append((adockcount-shiptype.getADocks())+" extern gedockte Schiffe wurden abgedockt\n"); 
    690688                         
    691                         ship.dock(Ships.DockMode.UNDOCK, undockarray); 
     689                        ship.dock(Ship.DockMode.UNDOCK, undockarray); 
    692690                } 
    693691